From 64d1a1b38ec263308366e956e93b6182fcfd3886 Mon Sep 17 00:00:00 2001 From: jessevz Date: Thu, 14 Nov 2024 16:40:49 +0100 Subject: [PATCH 001/691] Apiv2 (#1128) * Add compression support JSON:API responses can be potentially be quite large, especially since no minification to the JSON output is performed. Adding deflate compression with reduce transfer sizes. * WIP: Add extra development tooling * WIP: Start conversion of hashtopolis to new JSON:API standard * WIP: Start of GET of JSON:API implementation Focus on working on Users, GlobalPermissionGroups and AccessGroups * Fix ensure consistent composer packages get installed. This file was never commited and missed, due to the wildcard *.lock pattern set in .gitigore https://getcomposer.org/doc/01-basic-usage.md#commit-your-composer-lock-file-to-version-control * Fix expansion parameter not working. Rename to reflect new naming (include) * Cosmetic: Rename variables to match new meaning It is confusing to mix expand with include. Thus rename all variables in python test code from expand to include. * Add interactive debugging of pytest unit files The hashtopolis.py cannot be debugged with default Interactive debugging of VScode debugging of pytests. Thus make a small workaround based of the idea: https://stackoverflow.com/questions/62419998/how-can-i-get-pytest-to-not-catch-exceptions/62563106#62563106 * WIP: Start working on delete and creation actions * Fix 500 returned when page is not found Should be 404, how-ever this trow was not captured, due to incorrect ordering. * WIP: Innitial support for PATCH/CREATE operations * WIP: All unit tests complete. GET mostly implemented - PATCH/DELETE requires mapping to new format. - Helpers need some thinking on request/response. - Relation updates needs to be implemented. * WIP: Need ER relations for CREATE When creating an object the ER relations are sent via JSON:API how-ever without an formal definition, there is no way of knowing whether something is considered an relation. * WIP: Example model for CREATE in client Add PoC conversion using Django tooling for reference purposes. This could be used as base for creating objects within the python libary (also to do some client-side checking as well). * Updated PHP dependencies * Refactor pagination to adhere to JSON:API standards - Updated pagination parameters from 'page[after]' and 'page[size]' to 'page[offset] and 'page[limit'] - This change aligns with the JSON:API specification for pagination (https://jsonapi.org/format/#fetching-pagination) * Refactored links object to adhere to JSON:API standard -changed 'page[after]' and 'page[size] to 'page[offset]' and 'page[limit]' in the link objects * feat: Add support for limit queries in ORM * Made pagination and sorting working by fixing some logic bugs * Added more input filtering for the Limit filter * Fixed the location header to comply to the JSON API standard in case of an POST request * WIP: Made start to link first and last attribute in json response to GET requests for pagination * Added page size exceeded error handling and started implementing link next and previous for pagination * FEAT: Implemented first and last in paginated json response * FEAT: Implemented previous and next within JSON pagination response * FEAT: Made PATCH request compliant to JSON API 1.1 * FEAT made patch To-One relationship compliant to JSON API standard * FEAT made get request to relationship working also throught intermediate tables * FEAT made pagination in to many relationships work * FEAT implemented patching to many relationships * FEAT added to many relationship from cracker to task in API * FEAT added to many relationship from crackerType to task in API * FEAT implemented delete to many relationship link and fixed bug in patch to many relationship link * FEAT fixed bug in PATCH to many relation and implemented POST to many relation * FEAT made patchOne compliant to JSON API 1.1 standard * FEAT fix a bug withing pagination and ordering and made Post one compliant to JSON API 1.1 * FEAT updated the tests to adhere to JSON API spec * FEAT added tests for pagination * clean up pagination test * Added range validation to validating data * Added a json response moduel for the responses * Added function to validate if its allowed to mutate DBA fields * Fixed inconsitency in color len in task feautures * Added test that will verify database size constraint * FEAT: made helper API endpoints compliant to json API standard, by putting no resource record responses in the metadata --------- Co-authored-by: Rick van der Zwet Co-authored-by: Rick van der Zwet Co-authored-by: Jesse van Zutphen (DBS) --- .devcontainer/devcontainer.json | 1 + .editorconfig | 1800 +++---- .vscode/launch.json | 37 +- ci/apiv2/HACKING.md | 8 +- ci/apiv2/conftest.py | 12 + ci/apiv2/create_crackertype_001.json | 2 +- ci/apiv2/dummy.yaml | 14 + ci/apiv2/hashtopolis.py | 444 +- ci/apiv2/htcli.py | 19 +- ci/apiv2/test_agent.py | 11 +- ci/apiv2/test_agentassignment.py | 2 +- ci/apiv2/test_attributes.py | 9 +- ci/apiv2/test_expand.py | 6 +- ci/apiv2/test_filter_and_ordering.py | 27 +- ci/apiv2/test_globalpermissiongroup.py | 2 +- ci/apiv2/test_hash.py | 6 +- ci/apiv2/test_hashlist.py | 2 +- ci/apiv2/test_http_methods.py | 7 +- ci/apiv2/test_pagination.py | 25 + ci/apiv2/test_speed.py | 4 +- ci/apiv2/test_supertask.py | 4 +- ci/apiv2/test_task.py | 2 +- ci/apiv2/test_taskwrapper.py | 2 +- ci/apiv2/utils.py | 4 +- composer.json | 5 +- composer.lock | 4167 +++++++++++++++++ src/api/v2/index.php | 17 +- src/dba/AbstractModelFactory.class.php | 10 + src/dba/Factory.class.php | 1 + src/dba/Limit.class.php | 11 + src/dba/LimitFilter.class.php | 34 + src/dba/init.php | 2 + src/dba/models.py | 614 +++ src/dba/models/Task.class.php | 2 +- src/dba/models/generator.php | 102 +- .../apiv2/common/AbstractBaseAPI.class.php | 471 +- .../apiv2/common/AbstractHelperAPI.class.php | 41 +- .../apiv2/common/AbstractModelAPI.class.php | 1080 ++++- src/inc/apiv2/common/openAPISchema.routes.php | 11 + src/inc/apiv2/helper/abortChunk.routes.php | 2 +- src/inc/apiv2/helper/assignAgent.routes.php | 2 +- .../helper/createSuperHashlist.routes.php | 5 +- .../apiv2/helper/createSupertask.routes.php | 4 +- .../helper/exportCrackedHashes.routes.php | 4 +- .../apiv2/helper/exportLeftHashes.routes.php | 4 +- .../apiv2/helper/exportWordlist.routes.php | 4 +- .../helper/importCrackedHashes.routes.php | 3 +- src/inc/apiv2/helper/purgeTask.routes.php | 2 +- .../apiv2/helper/recountFileLines.routes.php | 2 +- src/inc/apiv2/helper/resetChunk.routes.php | 2 +- .../apiv2/helper/setUserPassword.routes.php | 2 +- src/inc/apiv2/helper/unassignAgent.routes.php | 2 +- src/inc/apiv2/model/accessgroups.routes.php | 53 +- .../apiv2/model/agentassignments.routes.php | 40 +- src/inc/apiv2/model/agents.routes.php | 49 +- src/inc/apiv2/model/agentstats.routes.php | 4 +- src/inc/apiv2/model/chunks.routes.php | 40 +- src/inc/apiv2/model/configs.routes.php | 29 +- src/inc/apiv2/model/crackers.routes.php | 38 +- src/inc/apiv2/model/crackertypes.routes.php | 36 +- src/inc/apiv2/model/files.routes.php | 27 +- .../model/globalpermissiongroups.routes.php | 35 +- src/inc/apiv2/model/hashes.routes.php | 44 +- src/inc/apiv2/model/hashlists.routes.php | 100 +- .../apiv2/model/healthcheckagents.routes.php | 42 +- src/inc/apiv2/model/healthchecks.routes.php | 46 +- src/inc/apiv2/model/notifications.routes.php | 30 +- src/inc/apiv2/model/pretasks.routes.php | 33 +- src/inc/apiv2/model/speeds.routes.php | 41 +- src/inc/apiv2/model/supertasks.routes.php | 35 +- src/inc/apiv2/model/tasks.routes.php | 114 +- src/inc/apiv2/model/taskwrappers.routes.php | 48 +- src/inc/apiv2/model/users.routes.php | 36 +- 73 files changed, 7955 insertions(+), 2021 deletions(-) create mode 100644 ci/apiv2/conftest.py create mode 100644 ci/apiv2/dummy.yaml create mode 100644 ci/apiv2/test_pagination.py create mode 100644 composer.lock create mode 100644 src/dba/Limit.class.php create mode 100644 src/dba/LimitFilter.class.php create mode 100644 src/dba/models.py diff --git a/.devcontainer/devcontainer.json b/.devcontainer/devcontainer.json index 767d20b98..7d48a8074 100644 --- a/.devcontainer/devcontainer.json +++ b/.devcontainer/devcontainer.json @@ -13,6 +13,7 @@ "xdebug.php-debug", "bmewburn.vscode-intelephense-client", "editorconfig.editorconfig", + "eamodio.gitlens", "github.vscode-pull-request-github", "ms-python.python", "ms-python.flake8", diff --git a/.editorconfig b/.editorconfig index 89a2b9576..c298d1bcd 100644 --- a/.editorconfig +++ b/.editorconfig @@ -1,900 +1,900 @@ -[*] -charset = utf-8 -end_of_line = lf -indent_size = 4 -indent_style = space -insert_final_newline = false -max_line_length = 120 -tab_width = 4 -ij_continuation_indent_size = 8 -ij_formatter_off_tag = @formatter:off -ij_formatter_on_tag = @formatter:on -ij_formatter_tags_enabled = false -ij_smart_tabs = false -ij_visual_guides = none -ij_wrap_on_typing = false - -[*.blade.php] -ij_blade_keep_indents_on_empty_lines = false - -[*.css] -ij_css_align_closing_brace_with_properties = false -ij_css_blank_lines_around_nested_selector = 1 -ij_css_blank_lines_between_blocks = 1 -ij_css_block_comment_add_space = false -ij_css_brace_placement = end_of_line -ij_css_enforce_quotes_on_format = false -ij_css_hex_color_long_format = false -ij_css_hex_color_lower_case = false -ij_css_hex_color_short_format = false -ij_css_hex_color_upper_case = false -ij_css_keep_blank_lines_in_code = 2 -ij_css_keep_indents_on_empty_lines = false -ij_css_keep_single_line_blocks = false -ij_css_properties_order = font,font-family,font-size,font-weight,font-style,font-variant,font-size-adjust,font-stretch,line-height,position,z-index,top,right,bottom,left,display,visibility,float,clear,overflow,overflow-x,overflow-y,clip,zoom,align-content,align-items,align-self,flex,flex-flow,flex-basis,flex-direction,flex-grow,flex-shrink,flex-wrap,justify-content,order,box-sizing,width,min-width,max-width,height,min-height,max-height,margin,margin-top,margin-right,margin-bottom,margin-left,padding,padding-top,padding-right,padding-bottom,padding-left,table-layout,empty-cells,caption-side,border-spacing,border-collapse,list-style,list-style-position,list-style-type,list-style-image,content,quotes,counter-reset,counter-increment,resize,cursor,user-select,nav-index,nav-up,nav-right,nav-down,nav-left,transition,transition-delay,transition-timing-function,transition-duration,transition-property,transform,transform-origin,animation,animation-name,animation-duration,animation-play-state,animation-timing-function,animation-delay,animation-iteration-count,animation-direction,text-align,text-align-last,vertical-align,white-space,text-decoration,text-emphasis,text-emphasis-color,text-emphasis-style,text-emphasis-position,text-indent,text-justify,letter-spacing,word-spacing,text-outline,text-transform,text-wrap,text-overflow,text-overflow-ellipsis,text-overflow-mode,word-wrap,word-break,tab-size,hyphens,pointer-events,opacity,color,border,border-width,border-style,border-color,border-top,border-top-width,border-top-style,border-top-color,border-right,border-right-width,border-right-style,border-right-color,border-bottom,border-bottom-width,border-bottom-style,border-bottom-color,border-left,border-left-width,border-left-style,border-left-color,border-radius,border-top-left-radius,border-top-right-radius,border-bottom-right-radius,border-bottom-left-radius,border-image,border-image-source,border-image-slice,border-image-width,border-image-outset,border-image-repeat,outline,outline-width,outline-style,outline-color,outline-offset,background,background-color,background-image,background-repeat,background-attachment,background-position,background-position-x,background-position-y,background-clip,background-origin,background-size,box-decoration-break,box-shadow,text-shadow -ij_css_space_after_colon = true -ij_css_space_before_opening_brace = true -ij_css_use_double_quotes = true -ij_css_value_alignment = do_not_align - -[*.feature] -indent_size = 2 -ij_gherkin_keep_indents_on_empty_lines = false - -[*.haml] -indent_size = 2 -ij_haml_keep_indents_on_empty_lines = false - -[*.less] -indent_size = 2 -ij_less_align_closing_brace_with_properties = false -ij_less_blank_lines_around_nested_selector = 1 -ij_less_blank_lines_between_blocks = 1 -ij_less_block_comment_add_space = false -ij_less_brace_placement = 0 -ij_less_enforce_quotes_on_format = false -ij_less_hex_color_long_format = false -ij_less_hex_color_lower_case = false -ij_less_hex_color_short_format = false -ij_less_hex_color_upper_case = false -ij_less_keep_blank_lines_in_code = 2 -ij_less_keep_indents_on_empty_lines = false -ij_less_keep_single_line_blocks = false -ij_less_line_comment_add_space = false -ij_less_line_comment_at_first_column = false -ij_less_properties_order = font,font-family,font-size,font-weight,font-style,font-variant,font-size-adjust,font-stretch,line-height,position,z-index,top,right,bottom,left,display,visibility,float,clear,overflow,overflow-x,overflow-y,clip,zoom,align-content,align-items,align-self,flex,flex-flow,flex-basis,flex-direction,flex-grow,flex-shrink,flex-wrap,justify-content,order,box-sizing,width,min-width,max-width,height,min-height,max-height,margin,margin-top,margin-right,margin-bottom,margin-left,padding,padding-top,padding-right,padding-bottom,padding-left,table-layout,empty-cells,caption-side,border-spacing,border-collapse,list-style,list-style-position,list-style-type,list-style-image,content,quotes,counter-reset,counter-increment,resize,cursor,user-select,nav-index,nav-up,nav-right,nav-down,nav-left,transition,transition-delay,transition-timing-function,transition-duration,transition-property,transform,transform-origin,animation,animation-name,animation-duration,animation-play-state,animation-timing-function,animation-delay,animation-iteration-count,animation-direction,text-align,text-align-last,vertical-align,white-space,text-decoration,text-emphasis,text-emphasis-color,text-emphasis-style,text-emphasis-position,text-indent,text-justify,letter-spacing,word-spacing,text-outline,text-transform,text-wrap,text-overflow,text-overflow-ellipsis,text-overflow-mode,word-wrap,word-break,tab-size,hyphens,pointer-events,opacity,color,border,border-width,border-style,border-color,border-top,border-top-width,border-top-style,border-top-color,border-right,border-right-width,border-right-style,border-right-color,border-bottom,border-bottom-width,border-bottom-style,border-bottom-color,border-left,border-left-width,border-left-style,border-left-color,border-radius,border-top-left-radius,border-top-right-radius,border-bottom-right-radius,border-bottom-left-radius,border-image,border-image-source,border-image-slice,border-image-width,border-image-outset,border-image-repeat,outline,outline-width,outline-style,outline-color,outline-offset,background,background-color,background-image,background-repeat,background-attachment,background-position,background-position-x,background-position-y,background-clip,background-origin,background-size,box-decoration-break,box-shadow,text-shadow -ij_less_space_after_colon = true -ij_less_space_before_opening_brace = true -ij_less_use_double_quotes = true -ij_less_value_alignment = 0 - -[*.sass] -indent_size = 2 -ij_sass_align_closing_brace_with_properties = false -ij_sass_blank_lines_around_nested_selector = 1 -ij_sass_blank_lines_between_blocks = 1 -ij_sass_brace_placement = 0 -ij_sass_enforce_quotes_on_format = false -ij_sass_hex_color_long_format = false -ij_sass_hex_color_lower_case = false -ij_sass_hex_color_short_format = false -ij_sass_hex_color_upper_case = false -ij_sass_keep_blank_lines_in_code = 2 -ij_sass_keep_indents_on_empty_lines = false -ij_sass_keep_single_line_blocks = false -ij_sass_line_comment_add_space = false -ij_sass_line_comment_at_first_column = false -ij_sass_properties_order = font,font-family,font-size,font-weight,font-style,font-variant,font-size-adjust,font-stretch,line-height,position,z-index,top,right,bottom,left,display,visibility,float,clear,overflow,overflow-x,overflow-y,clip,zoom,align-content,align-items,align-self,flex,flex-flow,flex-basis,flex-direction,flex-grow,flex-shrink,flex-wrap,justify-content,order,box-sizing,width,min-width,max-width,height,min-height,max-height,margin,margin-top,margin-right,margin-bottom,margin-left,padding,padding-top,padding-right,padding-bottom,padding-left,table-layout,empty-cells,caption-side,border-spacing,border-collapse,list-style,list-style-position,list-style-type,list-style-image,content,quotes,counter-reset,counter-increment,resize,cursor,user-select,nav-index,nav-up,nav-right,nav-down,nav-left,transition,transition-delay,transition-timing-function,transition-duration,transition-property,transform,transform-origin,animation,animation-name,animation-duration,animation-play-state,animation-timing-function,animation-delay,animation-iteration-count,animation-direction,text-align,text-align-last,vertical-align,white-space,text-decoration,text-emphasis,text-emphasis-color,text-emphasis-style,text-emphasis-position,text-indent,text-justify,letter-spacing,word-spacing,text-outline,text-transform,text-wrap,text-overflow,text-overflow-ellipsis,text-overflow-mode,word-wrap,word-break,tab-size,hyphens,pointer-events,opacity,color,border,border-width,border-style,border-color,border-top,border-top-width,border-top-style,border-top-color,border-right,border-right-width,border-right-style,border-right-color,border-bottom,border-bottom-width,border-bottom-style,border-bottom-color,border-left,border-left-width,border-left-style,border-left-color,border-radius,border-top-left-radius,border-top-right-radius,border-bottom-right-radius,border-bottom-left-radius,border-image,border-image-source,border-image-slice,border-image-width,border-image-outset,border-image-repeat,outline,outline-width,outline-style,outline-color,outline-offset,background,background-color,background-image,background-repeat,background-attachment,background-position,background-position-x,background-position-y,background-clip,background-origin,background-size,box-decoration-break,box-shadow,text-shadow -ij_sass_space_after_colon = true -ij_sass_space_before_opening_brace = true -ij_sass_use_double_quotes = true -ij_sass_value_alignment = 0 - -[*.scss] -indent_size = 2 -ij_scss_align_closing_brace_with_properties = false -ij_scss_blank_lines_around_nested_selector = 1 -ij_scss_blank_lines_between_blocks = 1 -ij_scss_block_comment_add_space = false -ij_scss_brace_placement = 0 -ij_scss_enforce_quotes_on_format = false -ij_scss_hex_color_long_format = false -ij_scss_hex_color_lower_case = false -ij_scss_hex_color_short_format = false -ij_scss_hex_color_upper_case = false -ij_scss_keep_blank_lines_in_code = 2 -ij_scss_keep_indents_on_empty_lines = false -ij_scss_keep_single_line_blocks = false -ij_scss_line_comment_add_space = false -ij_scss_line_comment_at_first_column = false -ij_scss_properties_order = font,font-family,font-size,font-weight,font-style,font-variant,font-size-adjust,font-stretch,line-height,position,z-index,top,right,bottom,left,display,visibility,float,clear,overflow,overflow-x,overflow-y,clip,zoom,align-content,align-items,align-self,flex,flex-flow,flex-basis,flex-direction,flex-grow,flex-shrink,flex-wrap,justify-content,order,box-sizing,width,min-width,max-width,height,min-height,max-height,margin,margin-top,margin-right,margin-bottom,margin-left,padding,padding-top,padding-right,padding-bottom,padding-left,table-layout,empty-cells,caption-side,border-spacing,border-collapse,list-style,list-style-position,list-style-type,list-style-image,content,quotes,counter-reset,counter-increment,resize,cursor,user-select,nav-index,nav-up,nav-right,nav-down,nav-left,transition,transition-delay,transition-timing-function,transition-duration,transition-property,transform,transform-origin,animation,animation-name,animation-duration,animation-play-state,animation-timing-function,animation-delay,animation-iteration-count,animation-direction,text-align,text-align-last,vertical-align,white-space,text-decoration,text-emphasis,text-emphasis-color,text-emphasis-style,text-emphasis-position,text-indent,text-justify,letter-spacing,word-spacing,text-outline,text-transform,text-wrap,text-overflow,text-overflow-ellipsis,text-overflow-mode,word-wrap,word-break,tab-size,hyphens,pointer-events,opacity,color,border,border-width,border-style,border-color,border-top,border-top-width,border-top-style,border-top-color,border-right,border-right-width,border-right-style,border-right-color,border-bottom,border-bottom-width,border-bottom-style,border-bottom-color,border-left,border-left-width,border-left-style,border-left-color,border-radius,border-top-left-radius,border-top-right-radius,border-bottom-right-radius,border-bottom-left-radius,border-image,border-image-source,border-image-slice,border-image-width,border-image-outset,border-image-repeat,outline,outline-width,outline-style,outline-color,outline-offset,background,background-color,background-image,background-repeat,background-attachment,background-position,background-position-x,background-position-y,background-clip,background-origin,background-size,box-decoration-break,box-shadow,text-shadow -ij_scss_space_after_colon = true -ij_scss_space_before_opening_brace = true -ij_scss_use_double_quotes = true -ij_scss_value_alignment = 0 - -[*.twig] -ij_twig_keep_indents_on_empty_lines = false -ij_twig_spaces_inside_comments_delimiters = true -ij_twig_spaces_inside_delimiters = true -ij_twig_spaces_inside_variable_delimiters = true - -[*.vue] -indent_size = 2 -tab_width = 2 -ij_continuation_indent_size = 4 -ij_vue_indent_children_of_top_level = template -ij_vue_interpolation_new_line_after_start_delimiter = true -ij_vue_interpolation_new_line_before_end_delimiter = true -ij_vue_interpolation_wrap = off -ij_vue_keep_indents_on_empty_lines = false -ij_vue_spaces_within_interpolation_expressions = true - -[.editorconfig] -ij_editorconfig_align_group_field_declarations = false -ij_editorconfig_space_after_colon = false -ij_editorconfig_space_after_comma = true -ij_editorconfig_space_before_colon = false -ij_editorconfig_space_before_comma = false -ij_editorconfig_spaces_around_assignment_operators = true - -[{*.ant,*.fxml,*.jhm,*.jnlp,*.jrxml,*.rng,*.tld,*.wsdl,*.xml,*.xsd,*.xsl,*.xslt,*.xul,phpunit.xml.dist}] -ij_xml_align_attributes = true -ij_xml_align_text = false -ij_xml_attribute_wrap = normal -ij_xml_block_comment_add_space = false -ij_xml_block_comment_at_first_column = true -ij_xml_keep_blank_lines = 2 -ij_xml_keep_indents_on_empty_lines = false -ij_xml_keep_line_breaks = true -ij_xml_keep_line_breaks_in_text = true -ij_xml_keep_whitespaces = false -ij_xml_keep_whitespaces_around_cdata = preserve -ij_xml_keep_whitespaces_inside_cdata = false -ij_xml_line_comment_at_first_column = true -ij_xml_space_after_tag_name = false -ij_xml_space_around_equals_in_attribute = false -ij_xml_space_inside_empty_tag = false -ij_xml_text_wrap = normal - -[{*.ats,*.cts,*.mts,*.ts}] -ij_continuation_indent_size = 4 -ij_typescript_align_imports = false -ij_typescript_align_multiline_array_initializer_expression = false -ij_typescript_align_multiline_binary_operation = false -ij_typescript_align_multiline_chained_methods = false -ij_typescript_align_multiline_extends_list = false -ij_typescript_align_multiline_for = true -ij_typescript_align_multiline_parameters = true -ij_typescript_align_multiline_parameters_in_calls = false -ij_typescript_align_multiline_ternary_operation = false -ij_typescript_align_object_properties = 0 -ij_typescript_align_union_types = false -ij_typescript_align_var_statements = 0 -ij_typescript_array_initializer_new_line_after_left_brace = false -ij_typescript_array_initializer_right_brace_on_new_line = false -ij_typescript_array_initializer_wrap = off -ij_typescript_assignment_wrap = off -ij_typescript_binary_operation_sign_on_next_line = false -ij_typescript_binary_operation_wrap = off -ij_typescript_blacklist_imports = rxjs/Rx,node_modules/**,**/node_modules/**,@angular/material,@angular/material/typings/** -ij_typescript_blank_lines_after_imports = 1 -ij_typescript_blank_lines_around_class = 1 -ij_typescript_blank_lines_around_field = 0 -ij_typescript_blank_lines_around_field_in_interface = 0 -ij_typescript_blank_lines_around_function = 1 -ij_typescript_blank_lines_around_method = 1 -ij_typescript_blank_lines_around_method_in_interface = 1 -ij_typescript_block_brace_style = end_of_line -ij_typescript_block_comment_add_space = false -ij_typescript_block_comment_at_first_column = true -ij_typescript_call_parameters_new_line_after_left_paren = false -ij_typescript_call_parameters_right_paren_on_new_line = false -ij_typescript_call_parameters_wrap = off -ij_typescript_catch_on_new_line = false -ij_typescript_chained_call_dot_on_new_line = true -ij_typescript_class_brace_style = end_of_line -ij_typescript_comma_on_new_line = false -ij_typescript_do_while_brace_force = never -ij_typescript_else_on_new_line = false -ij_typescript_enforce_trailing_comma = keep -ij_typescript_enum_constants_wrap = on_every_item -ij_typescript_extends_keyword_wrap = off -ij_typescript_extends_list_wrap = off -ij_typescript_field_prefix = _ -ij_typescript_file_name_style = relaxed -ij_typescript_finally_on_new_line = false -ij_typescript_for_brace_force = never -ij_typescript_for_statement_new_line_after_left_paren = false -ij_typescript_for_statement_right_paren_on_new_line = false -ij_typescript_for_statement_wrap = off -ij_typescript_force_quote_style = false -ij_typescript_force_semicolon_style = false -ij_typescript_function_expression_brace_style = end_of_line -ij_typescript_if_brace_force = never -ij_typescript_import_merge_members = global -ij_typescript_import_prefer_absolute_path = global -ij_typescript_import_sort_members = true -ij_typescript_import_sort_module_name = false -ij_typescript_import_use_node_resolution = true -ij_typescript_imports_wrap = on_every_item -ij_typescript_indent_case_from_switch = true -ij_typescript_indent_chained_calls = true -ij_typescript_indent_package_children = 0 -ij_typescript_jsdoc_include_types = false -ij_typescript_jsx_attribute_value = braces -ij_typescript_keep_blank_lines_in_code = 2 -ij_typescript_keep_first_column_comment = true -ij_typescript_keep_indents_on_empty_lines = false -ij_typescript_keep_line_breaks = true -ij_typescript_keep_simple_blocks_in_one_line = false -ij_typescript_keep_simple_methods_in_one_line = false -ij_typescript_line_comment_add_space = true -ij_typescript_line_comment_at_first_column = false -ij_typescript_method_brace_style = end_of_line -ij_typescript_method_call_chain_wrap = off -ij_typescript_method_parameters_new_line_after_left_paren = false -ij_typescript_method_parameters_right_paren_on_new_line = false -ij_typescript_method_parameters_wrap = off -ij_typescript_object_literal_wrap = on_every_item -ij_typescript_parentheses_expression_new_line_after_left_paren = false -ij_typescript_parentheses_expression_right_paren_on_new_line = false -ij_typescript_place_assignment_sign_on_next_line = false -ij_typescript_prefer_as_type_cast = false -ij_typescript_prefer_explicit_types_function_expression_returns = false -ij_typescript_prefer_explicit_types_function_returns = false -ij_typescript_prefer_explicit_types_vars_fields = false -ij_typescript_prefer_parameters_wrap = false -ij_typescript_reformat_c_style_comments = false -ij_typescript_space_after_colon = true -ij_typescript_space_after_comma = true -ij_typescript_space_after_dots_in_rest_parameter = false -ij_typescript_space_after_generator_mult = true -ij_typescript_space_after_property_colon = true -ij_typescript_space_after_quest = true -ij_typescript_space_after_type_colon = true -ij_typescript_space_after_unary_not = false -ij_typescript_space_before_async_arrow_lparen = true -ij_typescript_space_before_catch_keyword = true -ij_typescript_space_before_catch_left_brace = true -ij_typescript_space_before_catch_parentheses = true -ij_typescript_space_before_class_lbrace = true -ij_typescript_space_before_class_left_brace = true -ij_typescript_space_before_colon = true -ij_typescript_space_before_comma = false -ij_typescript_space_before_do_left_brace = true -ij_typescript_space_before_else_keyword = true -ij_typescript_space_before_else_left_brace = true -ij_typescript_space_before_finally_keyword = true -ij_typescript_space_before_finally_left_brace = true -ij_typescript_space_before_for_left_brace = true -ij_typescript_space_before_for_parentheses = true -ij_typescript_space_before_for_semicolon = false -ij_typescript_space_before_function_left_parenth = true -ij_typescript_space_before_generator_mult = false -ij_typescript_space_before_if_left_brace = true -ij_typescript_space_before_if_parentheses = true -ij_typescript_space_before_method_call_parentheses = false -ij_typescript_space_before_method_left_brace = true -ij_typescript_space_before_method_parentheses = false -ij_typescript_space_before_property_colon = false -ij_typescript_space_before_quest = true -ij_typescript_space_before_switch_left_brace = true -ij_typescript_space_before_switch_parentheses = true -ij_typescript_space_before_try_left_brace = true -ij_typescript_space_before_type_colon = false -ij_typescript_space_before_unary_not = false -ij_typescript_space_before_while_keyword = true -ij_typescript_space_before_while_left_brace = true -ij_typescript_space_before_while_parentheses = true -ij_typescript_spaces_around_additive_operators = true -ij_typescript_spaces_around_arrow_function_operator = true -ij_typescript_spaces_around_assignment_operators = true -ij_typescript_spaces_around_bitwise_operators = true -ij_typescript_spaces_around_equality_operators = true -ij_typescript_spaces_around_logical_operators = true -ij_typescript_spaces_around_multiplicative_operators = true -ij_typescript_spaces_around_relational_operators = true -ij_typescript_spaces_around_shift_operators = true -ij_typescript_spaces_around_unary_operator = false -ij_typescript_spaces_within_array_initializer_brackets = false -ij_typescript_spaces_within_brackets = false -ij_typescript_spaces_within_catch_parentheses = false -ij_typescript_spaces_within_for_parentheses = false -ij_typescript_spaces_within_if_parentheses = false -ij_typescript_spaces_within_imports = false -ij_typescript_spaces_within_interpolation_expressions = false -ij_typescript_spaces_within_method_call_parentheses = false -ij_typescript_spaces_within_method_parentheses = false -ij_typescript_spaces_within_object_literal_braces = false -ij_typescript_spaces_within_object_type_braces = true -ij_typescript_spaces_within_parentheses = false -ij_typescript_spaces_within_switch_parentheses = false -ij_typescript_spaces_within_type_assertion = false -ij_typescript_spaces_within_union_types = true -ij_typescript_spaces_within_while_parentheses = false -ij_typescript_special_else_if_treatment = true -ij_typescript_ternary_operation_signs_on_next_line = false -ij_typescript_ternary_operation_wrap = off -ij_typescript_union_types_wrap = on_every_item -ij_typescript_use_chained_calls_group_indents = false -ij_typescript_use_double_quotes = true -ij_typescript_use_explicit_js_extension = auto -ij_typescript_use_path_mapping = always -ij_typescript_use_public_modifier = false -ij_typescript_use_semicolon_after_statement = true -ij_typescript_var_declaration_wrap = normal -ij_typescript_while_brace_force = never -ij_typescript_while_on_new_line = false -ij_typescript_wrap_comments = false - -[{*.bash,*.sh,*.zsh}] -indent_size = 2 -tab_width = 2 -ij_shell_binary_ops_start_line = false -ij_shell_keep_column_alignment_padding = false -ij_shell_minify_program = false -ij_shell_redirect_followed_by_space = false -ij_shell_switch_cases_indented = false -ij_shell_use_unix_line_separator = true - -[{*.cjs,*.js}] -ij_continuation_indent_size = 4 -ij_javascript_align_imports = false -ij_javascript_align_multiline_array_initializer_expression = false -ij_javascript_align_multiline_binary_operation = false -ij_javascript_align_multiline_chained_methods = false -ij_javascript_align_multiline_extends_list = false -ij_javascript_align_multiline_for = true -ij_javascript_align_multiline_parameters = true -ij_javascript_align_multiline_parameters_in_calls = false -ij_javascript_align_multiline_ternary_operation = false -ij_javascript_align_object_properties = 0 -ij_javascript_align_union_types = false -ij_javascript_align_var_statements = 0 -ij_javascript_array_initializer_new_line_after_left_brace = false -ij_javascript_array_initializer_right_brace_on_new_line = false -ij_javascript_array_initializer_wrap = off -ij_javascript_assignment_wrap = off -ij_javascript_binary_operation_sign_on_next_line = false -ij_javascript_binary_operation_wrap = off -ij_javascript_blacklist_imports = rxjs/Rx,node_modules/**,**/node_modules/**,@angular/material,@angular/material/typings/** -ij_javascript_blank_lines_after_imports = 1 -ij_javascript_blank_lines_around_class = 1 -ij_javascript_blank_lines_around_field = 0 -ij_javascript_blank_lines_around_function = 1 -ij_javascript_blank_lines_around_method = 1 -ij_javascript_block_brace_style = end_of_line -ij_javascript_block_comment_add_space = false -ij_javascript_block_comment_at_first_column = true -ij_javascript_call_parameters_new_line_after_left_paren = false -ij_javascript_call_parameters_right_paren_on_new_line = false -ij_javascript_call_parameters_wrap = off -ij_javascript_catch_on_new_line = false -ij_javascript_chained_call_dot_on_new_line = true -ij_javascript_class_brace_style = end_of_line -ij_javascript_comma_on_new_line = false -ij_javascript_do_while_brace_force = never -ij_javascript_else_on_new_line = false -ij_javascript_enforce_trailing_comma = keep -ij_javascript_extends_keyword_wrap = off -ij_javascript_extends_list_wrap = off -ij_javascript_field_prefix = _ -ij_javascript_file_name_style = relaxed -ij_javascript_finally_on_new_line = false -ij_javascript_for_brace_force = never -ij_javascript_for_statement_new_line_after_left_paren = false -ij_javascript_for_statement_right_paren_on_new_line = false -ij_javascript_for_statement_wrap = off -ij_javascript_force_quote_style = false -ij_javascript_force_semicolon_style = false -ij_javascript_function_expression_brace_style = end_of_line -ij_javascript_if_brace_force = never -ij_javascript_import_merge_members = global -ij_javascript_import_prefer_absolute_path = global -ij_javascript_import_sort_members = true -ij_javascript_import_sort_module_name = false -ij_javascript_import_use_node_resolution = true -ij_javascript_imports_wrap = on_every_item -ij_javascript_indent_case_from_switch = true -ij_javascript_indent_chained_calls = true -ij_javascript_indent_package_children = 0 -ij_javascript_jsx_attribute_value = braces -ij_javascript_keep_blank_lines_in_code = 2 -ij_javascript_keep_first_column_comment = true -ij_javascript_keep_indents_on_empty_lines = false -ij_javascript_keep_line_breaks = true -ij_javascript_keep_simple_blocks_in_one_line = false -ij_javascript_keep_simple_methods_in_one_line = false -ij_javascript_line_comment_add_space = true -ij_javascript_line_comment_at_first_column = false -ij_javascript_method_brace_style = end_of_line -ij_javascript_method_call_chain_wrap = off -ij_javascript_method_parameters_new_line_after_left_paren = false -ij_javascript_method_parameters_right_paren_on_new_line = false -ij_javascript_method_parameters_wrap = off -ij_javascript_object_literal_wrap = on_every_item -ij_javascript_parentheses_expression_new_line_after_left_paren = false -ij_javascript_parentheses_expression_right_paren_on_new_line = false -ij_javascript_place_assignment_sign_on_next_line = false -ij_javascript_prefer_as_type_cast = false -ij_javascript_prefer_explicit_types_function_expression_returns = false -ij_javascript_prefer_explicit_types_function_returns = false -ij_javascript_prefer_explicit_types_vars_fields = false -ij_javascript_prefer_parameters_wrap = false -ij_javascript_reformat_c_style_comments = false -ij_javascript_space_after_colon = true -ij_javascript_space_after_comma = true -ij_javascript_space_after_dots_in_rest_parameter = false -ij_javascript_space_after_generator_mult = true -ij_javascript_space_after_property_colon = true -ij_javascript_space_after_quest = true -ij_javascript_space_after_type_colon = true -ij_javascript_space_after_unary_not = false -ij_javascript_space_before_async_arrow_lparen = true -ij_javascript_space_before_catch_keyword = true -ij_javascript_space_before_catch_left_brace = true -ij_javascript_space_before_catch_parentheses = true -ij_javascript_space_before_class_lbrace = true -ij_javascript_space_before_class_left_brace = true -ij_javascript_space_before_colon = true -ij_javascript_space_before_comma = false -ij_javascript_space_before_do_left_brace = true -ij_javascript_space_before_else_keyword = true -ij_javascript_space_before_else_left_brace = true -ij_javascript_space_before_finally_keyword = true -ij_javascript_space_before_finally_left_brace = true -ij_javascript_space_before_for_left_brace = true -ij_javascript_space_before_for_parentheses = true -ij_javascript_space_before_for_semicolon = false -ij_javascript_space_before_function_left_parenth = true -ij_javascript_space_before_generator_mult = false -ij_javascript_space_before_if_left_brace = true -ij_javascript_space_before_if_parentheses = true -ij_javascript_space_before_method_call_parentheses = false -ij_javascript_space_before_method_left_brace = true -ij_javascript_space_before_method_parentheses = false -ij_javascript_space_before_property_colon = false -ij_javascript_space_before_quest = true -ij_javascript_space_before_switch_left_brace = true -ij_javascript_space_before_switch_parentheses = true -ij_javascript_space_before_try_left_brace = true -ij_javascript_space_before_type_colon = false -ij_javascript_space_before_unary_not = false -ij_javascript_space_before_while_keyword = true -ij_javascript_space_before_while_left_brace = true -ij_javascript_space_before_while_parentheses = true -ij_javascript_spaces_around_additive_operators = true -ij_javascript_spaces_around_arrow_function_operator = true -ij_javascript_spaces_around_assignment_operators = true -ij_javascript_spaces_around_bitwise_operators = true -ij_javascript_spaces_around_equality_operators = true -ij_javascript_spaces_around_logical_operators = true -ij_javascript_spaces_around_multiplicative_operators = true -ij_javascript_spaces_around_relational_operators = true -ij_javascript_spaces_around_shift_operators = true -ij_javascript_spaces_around_unary_operator = false -ij_javascript_spaces_within_array_initializer_brackets = false -ij_javascript_spaces_within_brackets = false -ij_javascript_spaces_within_catch_parentheses = false -ij_javascript_spaces_within_for_parentheses = false -ij_javascript_spaces_within_if_parentheses = false -ij_javascript_spaces_within_imports = false -ij_javascript_spaces_within_interpolation_expressions = false -ij_javascript_spaces_within_method_call_parentheses = false -ij_javascript_spaces_within_method_parentheses = false -ij_javascript_spaces_within_object_literal_braces = false -ij_javascript_spaces_within_object_type_braces = true -ij_javascript_spaces_within_parentheses = false -ij_javascript_spaces_within_switch_parentheses = false -ij_javascript_spaces_within_type_assertion = false -ij_javascript_spaces_within_union_types = true -ij_javascript_spaces_within_while_parentheses = false -ij_javascript_special_else_if_treatment = true -ij_javascript_ternary_operation_signs_on_next_line = false -ij_javascript_ternary_operation_wrap = off -ij_javascript_union_types_wrap = on_every_item -ij_javascript_use_chained_calls_group_indents = false -ij_javascript_use_double_quotes = true -ij_javascript_use_explicit_js_extension = auto -ij_javascript_use_path_mapping = always -ij_javascript_use_public_modifier = false -ij_javascript_use_semicolon_after_statement = true -ij_javascript_var_declaration_wrap = normal -ij_javascript_while_brace_force = never -ij_javascript_while_on_new_line = false -ij_javascript_wrap_comments = false - -[{*.cjsx,*.coffee}] -indent_size = 2 -tab_width = 2 -ij_continuation_indent_size = 2 -ij_coffeescript_align_function_body = false -ij_coffeescript_align_imports = false -ij_coffeescript_align_multiline_array_initializer_expression = true -ij_coffeescript_align_multiline_parameters = true -ij_coffeescript_align_multiline_parameters_in_calls = false -ij_coffeescript_align_object_properties = 0 -ij_coffeescript_align_union_types = false -ij_coffeescript_align_var_statements = 0 -ij_coffeescript_array_initializer_new_line_after_left_brace = false -ij_coffeescript_array_initializer_right_brace_on_new_line = false -ij_coffeescript_array_initializer_wrap = normal -ij_coffeescript_blacklist_imports = rxjs/Rx,node_modules/**,**/node_modules/**,@angular/material,@angular/material/typings/** -ij_coffeescript_blank_lines_around_function = 1 -ij_coffeescript_call_parameters_new_line_after_left_paren = false -ij_coffeescript_call_parameters_right_paren_on_new_line = false -ij_coffeescript_call_parameters_wrap = normal -ij_coffeescript_chained_call_dot_on_new_line = true -ij_coffeescript_comma_on_new_line = false -ij_coffeescript_enforce_trailing_comma = keep -ij_coffeescript_field_prefix = _ -ij_coffeescript_file_name_style = relaxed -ij_coffeescript_force_quote_style = false -ij_coffeescript_force_semicolon_style = false -ij_coffeescript_function_expression_brace_style = end_of_line -ij_coffeescript_import_merge_members = global -ij_coffeescript_import_prefer_absolute_path = global -ij_coffeescript_import_sort_members = true -ij_coffeescript_import_sort_module_name = false -ij_coffeescript_import_use_node_resolution = true -ij_coffeescript_imports_wrap = on_every_item -ij_coffeescript_indent_chained_calls = true -ij_coffeescript_indent_package_children = 0 -ij_coffeescript_jsx_attribute_value = braces -ij_coffeescript_keep_blank_lines_in_code = 2 -ij_coffeescript_keep_first_column_comment = true -ij_coffeescript_keep_indents_on_empty_lines = false -ij_coffeescript_keep_line_breaks = true -ij_coffeescript_keep_simple_methods_in_one_line = false -ij_coffeescript_method_parameters_new_line_after_left_paren = false -ij_coffeescript_method_parameters_right_paren_on_new_line = false -ij_coffeescript_method_parameters_wrap = off -ij_coffeescript_object_literal_wrap = on_every_item -ij_coffeescript_prefer_as_type_cast = false -ij_coffeescript_prefer_explicit_types_function_expression_returns = false -ij_coffeescript_prefer_explicit_types_function_returns = false -ij_coffeescript_prefer_explicit_types_vars_fields = false -ij_coffeescript_reformat_c_style_comments = false -ij_coffeescript_space_after_comma = true -ij_coffeescript_space_after_dots_in_rest_parameter = false -ij_coffeescript_space_after_generator_mult = true -ij_coffeescript_space_after_property_colon = true -ij_coffeescript_space_after_type_colon = true -ij_coffeescript_space_after_unary_not = false -ij_coffeescript_space_before_async_arrow_lparen = true -ij_coffeescript_space_before_class_lbrace = true -ij_coffeescript_space_before_comma = false -ij_coffeescript_space_before_function_left_parenth = true -ij_coffeescript_space_before_generator_mult = false -ij_coffeescript_space_before_property_colon = false -ij_coffeescript_space_before_type_colon = false -ij_coffeescript_space_before_unary_not = false -ij_coffeescript_spaces_around_additive_operators = true -ij_coffeescript_spaces_around_arrow_function_operator = true -ij_coffeescript_spaces_around_assignment_operators = true -ij_coffeescript_spaces_around_bitwise_operators = true -ij_coffeescript_spaces_around_equality_operators = true -ij_coffeescript_spaces_around_logical_operators = true -ij_coffeescript_spaces_around_multiplicative_operators = true -ij_coffeescript_spaces_around_relational_operators = true -ij_coffeescript_spaces_around_shift_operators = true -ij_coffeescript_spaces_around_unary_operator = false -ij_coffeescript_spaces_within_array_initializer_braces = false -ij_coffeescript_spaces_within_array_initializer_brackets = false -ij_coffeescript_spaces_within_imports = false -ij_coffeescript_spaces_within_index_brackets = false -ij_coffeescript_spaces_within_interpolation_expressions = false -ij_coffeescript_spaces_within_method_call_parentheses = false -ij_coffeescript_spaces_within_method_parentheses = false -ij_coffeescript_spaces_within_object_braces = false -ij_coffeescript_spaces_within_object_literal_braces = false -ij_coffeescript_spaces_within_object_type_braces = true -ij_coffeescript_spaces_within_range_brackets = false -ij_coffeescript_spaces_within_type_assertion = false -ij_coffeescript_spaces_within_union_types = true -ij_coffeescript_union_types_wrap = on_every_item -ij_coffeescript_use_chained_calls_group_indents = false -ij_coffeescript_use_double_quotes = true -ij_coffeescript_use_explicit_js_extension = auto -ij_coffeescript_use_path_mapping = always -ij_coffeescript_use_public_modifier = false -ij_coffeescript_use_semicolon_after_statement = false -ij_coffeescript_var_declaration_wrap = normal - -[{*.ctp,*.hphp,*.inc,*.module,*.php,*.php4,*.php5,*.phtml}] -indent_size = 2 -tab_width = 2 -ij_continuation_indent_size = 2 -ij_php_align_assignments = false -ij_php_align_class_constants = true -ij_php_align_group_field_declarations = true -ij_php_align_inline_comments = false -ij_php_align_key_value_pairs = false -ij_php_align_match_arm_bodies = false -ij_php_align_multiline_array_initializer_expression = true -ij_php_align_multiline_binary_operation = false -ij_php_align_multiline_chained_methods = false -ij_php_align_multiline_extends_list = false -ij_php_align_multiline_for = false -ij_php_align_multiline_parameters = false -ij_php_align_multiline_parameters_in_calls = false -ij_php_align_multiline_ternary_operation = false -ij_php_align_named_arguments = false -ij_php_align_phpdoc_comments = false -ij_php_align_phpdoc_param_names = false -ij_php_anonymous_brace_style = end_of_line -ij_php_api_weight = 28 -ij_php_array_initializer_new_line_after_left_brace = false -ij_php_array_initializer_right_brace_on_new_line = true -ij_php_array_initializer_wrap = off -ij_php_assignment_wrap = off -ij_php_attributes_wrap = off -ij_php_author_weight = 28 -ij_php_binary_operation_sign_on_next_line = false -ij_php_binary_operation_wrap = off -ij_php_blank_lines_after_class_header = 0 -ij_php_blank_lines_after_function = 1 -ij_php_blank_lines_after_imports = 1 -ij_php_blank_lines_after_opening_tag = 0 -ij_php_blank_lines_after_package = 0 -ij_php_blank_lines_around_class = 1 -ij_php_blank_lines_around_constants = 0 -ij_php_blank_lines_around_field = 0 -ij_php_blank_lines_around_method = 1 -ij_php_blank_lines_before_class_end = 0 -ij_php_blank_lines_before_imports = 1 -ij_php_blank_lines_before_method_body = 0 -ij_php_blank_lines_before_package = 1 -ij_php_blank_lines_before_return_statement = 0 -ij_php_blank_lines_between_imports = 0 -ij_php_block_brace_style = end_of_line -ij_php_call_parameters_new_line_after_left_paren = false -ij_php_call_parameters_right_paren_on_new_line = true -ij_php_call_parameters_wrap = off -ij_php_catch_on_new_line = true -ij_php_category_weight = 28 -ij_php_class_brace_style = end_of_line -ij_php_comma_after_last_array_element = false -ij_php_concat_spaces = true -ij_php_copyright_weight = 28 -ij_php_deprecated_weight = 28 -ij_php_do_while_brace_force = always -ij_php_else_if_style = as_is -ij_php_else_on_new_line = true -ij_php_example_weight = 28 -ij_php_extends_keyword_wrap = off -ij_php_extends_list_wrap = off -ij_php_fields_default_visibility = private -ij_php_filesource_weight = 28 -ij_php_finally_on_new_line = true -ij_php_for_brace_force = always -ij_php_for_statement_new_line_after_left_paren = false -ij_php_for_statement_right_paren_on_new_line = false -ij_php_for_statement_wrap = off -ij_php_force_empty_methods_in_one_line = false -ij_php_force_short_declaration_array_style = false -ij_php_getters_setters_naming_style = camel_case -ij_php_getters_setters_order_style = getters_first -ij_php_global_weight = 28 -ij_php_group_use_wrap = on_every_item -ij_php_if_brace_force = always -ij_php_if_lparen_on_next_line = false -ij_php_if_rparen_on_next_line = false -ij_php_ignore_weight = 28 -ij_php_import_sorting = alphabetic -ij_php_indent_break_from_case = true -ij_php_indent_case_from_switch = true -ij_php_indent_code_in_php_tags = false -ij_php_internal_weight = 28 -ij_php_keep_blank_lines_after_lbrace = 2 -ij_php_keep_blank_lines_before_right_brace = 2 -ij_php_keep_blank_lines_in_code = 2 -ij_php_keep_blank_lines_in_declarations = 2 -ij_php_keep_control_statement_in_one_line = true -ij_php_keep_first_column_comment = true -ij_php_keep_indents_on_empty_lines = true -ij_php_keep_line_breaks = true -ij_php_keep_rparen_and_lbrace_on_one_line = true -ij_php_keep_simple_classes_in_one_line = false -ij_php_keep_simple_methods_in_one_line = false -ij_php_lambda_brace_style = end_of_line -ij_php_license_weight = 28 -ij_php_line_comment_add_space = false -ij_php_line_comment_at_first_column = true -ij_php_link_weight = 28 -ij_php_lower_case_boolean_const = false -ij_php_lower_case_keywords = true -ij_php_lower_case_null_const = false -ij_php_method_brace_style = end_of_line -ij_php_method_call_chain_wrap = off -ij_php_method_parameters_new_line_after_left_paren = false -ij_php_method_parameters_right_paren_on_new_line = false -ij_php_method_parameters_wrap = off -ij_php_method_weight = 28 -ij_php_modifier_list_wrap = false -ij_php_multiline_chained_calls_semicolon_on_new_line = false -ij_php_namespace_brace_style = 1 -ij_php_new_line_after_php_opening_tag = false -ij_php_null_type_position = in_the_end -ij_php_package_weight = 28 -ij_php_param_weight = 0 -ij_php_parameters_attributes_wrap = off -ij_php_parentheses_expression_new_line_after_left_paren = false -ij_php_parentheses_expression_right_paren_on_new_line = false -ij_php_phpdoc_blank_line_before_tags = false -ij_php_phpdoc_blank_lines_around_parameters = false -ij_php_phpdoc_keep_blank_lines = true -ij_php_phpdoc_param_spaces_between_name_and_description = 1 -ij_php_phpdoc_param_spaces_between_tag_and_type = 1 -ij_php_phpdoc_param_spaces_between_type_and_name = 1 -ij_php_phpdoc_use_fqcn = false -ij_php_phpdoc_wrap_long_lines = false -ij_php_place_assignment_sign_on_next_line = false -ij_php_place_parens_for_constructor = 0 -ij_php_property_read_weight = 28 -ij_php_property_weight = 28 -ij_php_property_write_weight = 28 -ij_php_return_type_on_new_line = false -ij_php_return_weight = 1 -ij_php_see_weight = 28 -ij_php_since_weight = 28 -ij_php_sort_phpdoc_elements = true -ij_php_space_after_colon = true -ij_php_space_after_colon_in_enum_backed_type = true -ij_php_space_after_colon_in_named_argument = true -ij_php_space_after_colon_in_return_type = true -ij_php_space_after_comma = true -ij_php_space_after_for_semicolon = true -ij_php_space_after_quest = true -ij_php_space_after_type_cast = false -ij_php_space_after_unary_not = false -ij_php_space_before_array_initializer_left_brace = false -ij_php_space_before_catch_keyword = true -ij_php_space_before_catch_left_brace = true -ij_php_space_before_catch_parentheses = true -ij_php_space_before_class_left_brace = true -ij_php_space_before_closure_left_parenthesis = true -ij_php_space_before_colon = true -ij_php_space_before_colon_in_enum_backed_type = false -ij_php_space_before_colon_in_named_argument = false -ij_php_space_before_colon_in_return_type = false -ij_php_space_before_comma = false -ij_php_space_before_do_left_brace = true -ij_php_space_before_else_keyword = true -ij_php_space_before_else_left_brace = true -ij_php_space_before_finally_keyword = true -ij_php_space_before_finally_left_brace = true -ij_php_space_before_for_left_brace = true -ij_php_space_before_for_parentheses = true -ij_php_space_before_for_semicolon = false -ij_php_space_before_if_left_brace = true -ij_php_space_before_if_parentheses = true -ij_php_space_before_method_call_parentheses = false -ij_php_space_before_method_left_brace = true -ij_php_space_before_method_parentheses = false -ij_php_space_before_quest = true -ij_php_space_before_short_closure_left_parenthesis = false -ij_php_space_before_switch_left_brace = true -ij_php_space_before_switch_parentheses = true -ij_php_space_before_try_left_brace = true -ij_php_space_before_unary_not = false -ij_php_space_before_while_keyword = true -ij_php_space_before_while_left_brace = true -ij_php_space_before_while_parentheses = true -ij_php_space_between_ternary_quest_and_colon = false -ij_php_spaces_around_additive_operators = true -ij_php_spaces_around_arrow = false -ij_php_spaces_around_assignment_in_declare = false -ij_php_spaces_around_assignment_operators = true -ij_php_spaces_around_bitwise_operators = true -ij_php_spaces_around_equality_operators = true -ij_php_spaces_around_logical_operators = true -ij_php_spaces_around_multiplicative_operators = true -ij_php_spaces_around_null_coalesce_operator = true -ij_php_spaces_around_pipe_in_union_type = false -ij_php_spaces_around_relational_operators = true -ij_php_spaces_around_shift_operators = true -ij_php_spaces_around_unary_operator = false -ij_php_spaces_around_var_within_brackets = false -ij_php_spaces_within_array_initializer_braces = false -ij_php_spaces_within_brackets = false -ij_php_spaces_within_catch_parentheses = false -ij_php_spaces_within_for_parentheses = false -ij_php_spaces_within_if_parentheses = false -ij_php_spaces_within_method_call_parentheses = false -ij_php_spaces_within_method_parentheses = false -ij_php_spaces_within_parentheses = false -ij_php_spaces_within_short_echo_tags = true -ij_php_spaces_within_switch_parentheses = false -ij_php_spaces_within_while_parentheses = false -ij_php_special_else_if_treatment = true -ij_php_subpackage_weight = 28 -ij_php_ternary_operation_signs_on_next_line = false -ij_php_ternary_operation_wrap = off -ij_php_throws_weight = 2 -ij_php_todo_weight = 28 -ij_php_treat_multiline_arrays_and_lambdas_multiline = false -ij_php_unknown_tag_weight = 28 -ij_php_upper_case_boolean_const = false -ij_php_upper_case_null_const = false -ij_php_uses_weight = 28 -ij_php_var_weight = 28 -ij_php_variable_naming_style = mixed -ij_php_version_weight = 28 -ij_php_while_brace_force = always -ij_php_while_on_new_line = false - -[{*.har,*.jsb2,*.jsb3,*.json,.babelrc,.eslintrc,.stylelintrc,bowerrc,composer.lock,jest.config}] -indent_size = 2 -ij_json_keep_blank_lines_in_code = 0 -ij_json_keep_indents_on_empty_lines = false -ij_json_keep_line_breaks = true -ij_json_space_after_colon = true -ij_json_space_after_comma = true -ij_json_space_before_colon = true -ij_json_space_before_comma = false -ij_json_spaces_within_braces = false -ij_json_spaces_within_brackets = false -ij_json_wrap_long_lines = false - -[{*.htm,*.html,*.ng,*.sht,*.shtm,*.shtml}] -indent_size = 2 -tab_width = 2 -ij_continuation_indent_size = 2 -ij_html_add_new_line_before_tags = body,div,p,form,h1,h2,h3 -ij_html_align_attributes = true -ij_html_align_text = false -ij_html_attribute_wrap = normal -ij_html_block_comment_add_space = false -ij_html_block_comment_at_first_column = true -ij_html_do_not_align_children_of_min_lines = 0 -ij_html_do_not_break_if_inline_tags = title,h1,h2,h3,h4,h5,h6,p -ij_html_do_not_indent_children_of_tags = html,body,thead,tbody,tfoot -ij_html_enforce_quotes = false -ij_html_inline_tags = a,abbr,acronym,b,basefont,bdo,big,br,cite,cite,code,dfn,em,font,i,img,input,kbd,label,q,s,samp,select,small,span,strike,strong,sub,sup,textarea,tt,u,var -ij_html_keep_blank_lines = 2 -ij_html_keep_indents_on_empty_lines = false -ij_html_keep_line_breaks = true -ij_html_keep_line_breaks_in_text = true -ij_html_keep_whitespaces = false -ij_html_keep_whitespaces_inside = span,pre,textarea -ij_html_line_comment_at_first_column = true -ij_html_new_line_after_last_attribute = never -ij_html_new_line_before_first_attribute = never -ij_html_quote_style = double -ij_html_remove_new_line_before_tags = br -ij_html_space_after_tag_name = false -ij_html_space_around_equality_in_attribute = false -ij_html_space_inside_empty_tag = false -ij_html_text_wrap = normal - -[{*.markdown,*.md}] -ij_markdown_force_one_space_after_blockquote_symbol = true -ij_markdown_force_one_space_after_header_symbol = true -ij_markdown_force_one_space_after_list_bullet = true -ij_markdown_force_one_space_between_words = true -ij_markdown_insert_quote_arrows_on_wrap = true -ij_markdown_keep_indents_on_empty_lines = false -ij_markdown_keep_line_breaks_inside_text_blocks = true -ij_markdown_max_lines_around_block_elements = 1 -ij_markdown_max_lines_around_header = 1 -ij_markdown_max_lines_between_paragraphs = 1 -ij_markdown_min_lines_around_block_elements = 1 -ij_markdown_min_lines_around_header = 1 -ij_markdown_min_lines_between_paragraphs = 1 -ij_markdown_wrap_text_if_long = true -ij_markdown_wrap_text_inside_blockquotes = true - -[{*.yaml,*.yml}] -indent_size = 2 -ij_yaml_align_values_properties = do_not_align -ij_yaml_autoinsert_sequence_marker = true -ij_yaml_block_mapping_on_new_line = false -ij_yaml_indent_sequence_value = true -ij_yaml_keep_indents_on_empty_lines = false -ij_yaml_keep_line_breaks = true -ij_yaml_sequence_on_new_line = false -ij_yaml_space_before_colon = false -ij_yaml_spaces_within_braces = true -ij_yaml_spaces_within_brackets = true +[*] +charset = utf-8 +end_of_line = lf +indent_size = 4 +indent_style = space +insert_final_newline = false +max_line_length = 120 +tab_width = 4 +ij_continuation_indent_size = 8 +ij_formatter_off_tag = @formatter:off +ij_formatter_on_tag = @formatter:on +ij_formatter_tags_enabled = false +ij_smart_tabs = false +ij_visual_guides = none +ij_wrap_on_typing = false + +[*.blade.php] +ij_blade_keep_indents_on_empty_lines = false + +[*.css] +ij_css_align_closing_brace_with_properties = false +ij_css_blank_lines_around_nested_selector = 1 +ij_css_blank_lines_between_blocks = 1 +ij_css_block_comment_add_space = false +ij_css_brace_placement = end_of_line +ij_css_enforce_quotes_on_format = false +ij_css_hex_color_long_format = false +ij_css_hex_color_lower_case = false +ij_css_hex_color_short_format = false +ij_css_hex_color_upper_case = false +ij_css_keep_blank_lines_in_code = 2 +ij_css_keep_indents_on_empty_lines = false +ij_css_keep_single_line_blocks = false +ij_css_properties_order = font,font-family,font-size,font-weight,font-style,font-variant,font-size-adjust,font-stretch,line-height,position,z-index,top,right,bottom,left,display,visibility,float,clear,overflow,overflow-x,overflow-y,clip,zoom,align-content,align-items,align-self,flex,flex-flow,flex-basis,flex-direction,flex-grow,flex-shrink,flex-wrap,justify-content,order,box-sizing,width,min-width,max-width,height,min-height,max-height,margin,margin-top,margin-right,margin-bottom,margin-left,padding,padding-top,padding-right,padding-bottom,padding-left,table-layout,empty-cells,caption-side,border-spacing,border-collapse,list-style,list-style-position,list-style-type,list-style-image,content,quotes,counter-reset,counter-increment,resize,cursor,user-select,nav-index,nav-up,nav-right,nav-down,nav-left,transition,transition-delay,transition-timing-function,transition-duration,transition-property,transform,transform-origin,animation,animation-name,animation-duration,animation-play-state,animation-timing-function,animation-delay,animation-iteration-count,animation-direction,text-align,text-align-last,vertical-align,white-space,text-decoration,text-emphasis,text-emphasis-color,text-emphasis-style,text-emphasis-position,text-indent,text-justify,letter-spacing,word-spacing,text-outline,text-transform,text-wrap,text-overflow,text-overflow-ellipsis,text-overflow-mode,word-wrap,word-break,tab-size,hyphens,pointer-events,opacity,color,border,border-width,border-style,border-color,border-top,border-top-width,border-top-style,border-top-color,border-right,border-right-width,border-right-style,border-right-color,border-bottom,border-bottom-width,border-bottom-style,border-bottom-color,border-left,border-left-width,border-left-style,border-left-color,border-radius,border-top-left-radius,border-top-right-radius,border-bottom-right-radius,border-bottom-left-radius,border-image,border-image-source,border-image-slice,border-image-width,border-image-outset,border-image-repeat,outline,outline-width,outline-style,outline-color,outline-offset,background,background-color,background-image,background-repeat,background-attachment,background-position,background-position-x,background-position-y,background-clip,background-origin,background-size,box-decoration-break,box-shadow,text-shadow +ij_css_space_after_colon = true +ij_css_space_before_opening_brace = true +ij_css_use_double_quotes = true +ij_css_value_alignment = do_not_align + +[*.feature] +indent_size = 2 +ij_gherkin_keep_indents_on_empty_lines = false + +[*.haml] +indent_size = 2 +ij_haml_keep_indents_on_empty_lines = false + +[*.less] +indent_size = 2 +ij_less_align_closing_brace_with_properties = false +ij_less_blank_lines_around_nested_selector = 1 +ij_less_blank_lines_between_blocks = 1 +ij_less_block_comment_add_space = false +ij_less_brace_placement = 0 +ij_less_enforce_quotes_on_format = false +ij_less_hex_color_long_format = false +ij_less_hex_color_lower_case = false +ij_less_hex_color_short_format = false +ij_less_hex_color_upper_case = false +ij_less_keep_blank_lines_in_code = 2 +ij_less_keep_indents_on_empty_lines = false +ij_less_keep_single_line_blocks = false +ij_less_line_comment_add_space = false +ij_less_line_comment_at_first_column = false +ij_less_properties_order = font,font-family,font-size,font-weight,font-style,font-variant,font-size-adjust,font-stretch,line-height,position,z-index,top,right,bottom,left,display,visibility,float,clear,overflow,overflow-x,overflow-y,clip,zoom,align-content,align-items,align-self,flex,flex-flow,flex-basis,flex-direction,flex-grow,flex-shrink,flex-wrap,justify-content,order,box-sizing,width,min-width,max-width,height,min-height,max-height,margin,margin-top,margin-right,margin-bottom,margin-left,padding,padding-top,padding-right,padding-bottom,padding-left,table-layout,empty-cells,caption-side,border-spacing,border-collapse,list-style,list-style-position,list-style-type,list-style-image,content,quotes,counter-reset,counter-increment,resize,cursor,user-select,nav-index,nav-up,nav-right,nav-down,nav-left,transition,transition-delay,transition-timing-function,transition-duration,transition-property,transform,transform-origin,animation,animation-name,animation-duration,animation-play-state,animation-timing-function,animation-delay,animation-iteration-count,animation-direction,text-align,text-align-last,vertical-align,white-space,text-decoration,text-emphasis,text-emphasis-color,text-emphasis-style,text-emphasis-position,text-indent,text-justify,letter-spacing,word-spacing,text-outline,text-transform,text-wrap,text-overflow,text-overflow-ellipsis,text-overflow-mode,word-wrap,word-break,tab-size,hyphens,pointer-events,opacity,color,border,border-width,border-style,border-color,border-top,border-top-width,border-top-style,border-top-color,border-right,border-right-width,border-right-style,border-right-color,border-bottom,border-bottom-width,border-bottom-style,border-bottom-color,border-left,border-left-width,border-left-style,border-left-color,border-radius,border-top-left-radius,border-top-right-radius,border-bottom-right-radius,border-bottom-left-radius,border-image,border-image-source,border-image-slice,border-image-width,border-image-outset,border-image-repeat,outline,outline-width,outline-style,outline-color,outline-offset,background,background-color,background-image,background-repeat,background-attachment,background-position,background-position-x,background-position-y,background-clip,background-origin,background-size,box-decoration-break,box-shadow,text-shadow +ij_less_space_after_colon = true +ij_less_space_before_opening_brace = true +ij_less_use_double_quotes = true +ij_less_value_alignment = 0 + +[*.sass] +indent_size = 2 +ij_sass_align_closing_brace_with_properties = false +ij_sass_blank_lines_around_nested_selector = 1 +ij_sass_blank_lines_between_blocks = 1 +ij_sass_brace_placement = 0 +ij_sass_enforce_quotes_on_format = false +ij_sass_hex_color_long_format = false +ij_sass_hex_color_lower_case = false +ij_sass_hex_color_short_format = false +ij_sass_hex_color_upper_case = false +ij_sass_keep_blank_lines_in_code = 2 +ij_sass_keep_indents_on_empty_lines = false +ij_sass_keep_single_line_blocks = false +ij_sass_line_comment_add_space = false +ij_sass_line_comment_at_first_column = false +ij_sass_properties_order = font,font-family,font-size,font-weight,font-style,font-variant,font-size-adjust,font-stretch,line-height,position,z-index,top,right,bottom,left,display,visibility,float,clear,overflow,overflow-x,overflow-y,clip,zoom,align-content,align-items,align-self,flex,flex-flow,flex-basis,flex-direction,flex-grow,flex-shrink,flex-wrap,justify-content,order,box-sizing,width,min-width,max-width,height,min-height,max-height,margin,margin-top,margin-right,margin-bottom,margin-left,padding,padding-top,padding-right,padding-bottom,padding-left,table-layout,empty-cells,caption-side,border-spacing,border-collapse,list-style,list-style-position,list-style-type,list-style-image,content,quotes,counter-reset,counter-increment,resize,cursor,user-select,nav-index,nav-up,nav-right,nav-down,nav-left,transition,transition-delay,transition-timing-function,transition-duration,transition-property,transform,transform-origin,animation,animation-name,animation-duration,animation-play-state,animation-timing-function,animation-delay,animation-iteration-count,animation-direction,text-align,text-align-last,vertical-align,white-space,text-decoration,text-emphasis,text-emphasis-color,text-emphasis-style,text-emphasis-position,text-indent,text-justify,letter-spacing,word-spacing,text-outline,text-transform,text-wrap,text-overflow,text-overflow-ellipsis,text-overflow-mode,word-wrap,word-break,tab-size,hyphens,pointer-events,opacity,color,border,border-width,border-style,border-color,border-top,border-top-width,border-top-style,border-top-color,border-right,border-right-width,border-right-style,border-right-color,border-bottom,border-bottom-width,border-bottom-style,border-bottom-color,border-left,border-left-width,border-left-style,border-left-color,border-radius,border-top-left-radius,border-top-right-radius,border-bottom-right-radius,border-bottom-left-radius,border-image,border-image-source,border-image-slice,border-image-width,border-image-outset,border-image-repeat,outline,outline-width,outline-style,outline-color,outline-offset,background,background-color,background-image,background-repeat,background-attachment,background-position,background-position-x,background-position-y,background-clip,background-origin,background-size,box-decoration-break,box-shadow,text-shadow +ij_sass_space_after_colon = true +ij_sass_space_before_opening_brace = true +ij_sass_use_double_quotes = true +ij_sass_value_alignment = 0 + +[*.scss] +indent_size = 2 +ij_scss_align_closing_brace_with_properties = false +ij_scss_blank_lines_around_nested_selector = 1 +ij_scss_blank_lines_between_blocks = 1 +ij_scss_block_comment_add_space = false +ij_scss_brace_placement = 0 +ij_scss_enforce_quotes_on_format = false +ij_scss_hex_color_long_format = false +ij_scss_hex_color_lower_case = false +ij_scss_hex_color_short_format = false +ij_scss_hex_color_upper_case = false +ij_scss_keep_blank_lines_in_code = 2 +ij_scss_keep_indents_on_empty_lines = false +ij_scss_keep_single_line_blocks = false +ij_scss_line_comment_add_space = false +ij_scss_line_comment_at_first_column = false +ij_scss_properties_order = font,font-family,font-size,font-weight,font-style,font-variant,font-size-adjust,font-stretch,line-height,position,z-index,top,right,bottom,left,display,visibility,float,clear,overflow,overflow-x,overflow-y,clip,zoom,align-content,align-items,align-self,flex,flex-flow,flex-basis,flex-direction,flex-grow,flex-shrink,flex-wrap,justify-content,order,box-sizing,width,min-width,max-width,height,min-height,max-height,margin,margin-top,margin-right,margin-bottom,margin-left,padding,padding-top,padding-right,padding-bottom,padding-left,table-layout,empty-cells,caption-side,border-spacing,border-collapse,list-style,list-style-position,list-style-type,list-style-image,content,quotes,counter-reset,counter-increment,resize,cursor,user-select,nav-index,nav-up,nav-right,nav-down,nav-left,transition,transition-delay,transition-timing-function,transition-duration,transition-property,transform,transform-origin,animation,animation-name,animation-duration,animation-play-state,animation-timing-function,animation-delay,animation-iteration-count,animation-direction,text-align,text-align-last,vertical-align,white-space,text-decoration,text-emphasis,text-emphasis-color,text-emphasis-style,text-emphasis-position,text-indent,text-justify,letter-spacing,word-spacing,text-outline,text-transform,text-wrap,text-overflow,text-overflow-ellipsis,text-overflow-mode,word-wrap,word-break,tab-size,hyphens,pointer-events,opacity,color,border,border-width,border-style,border-color,border-top,border-top-width,border-top-style,border-top-color,border-right,border-right-width,border-right-style,border-right-color,border-bottom,border-bottom-width,border-bottom-style,border-bottom-color,border-left,border-left-width,border-left-style,border-left-color,border-radius,border-top-left-radius,border-top-right-radius,border-bottom-right-radius,border-bottom-left-radius,border-image,border-image-source,border-image-slice,border-image-width,border-image-outset,border-image-repeat,outline,outline-width,outline-style,outline-color,outline-offset,background,background-color,background-image,background-repeat,background-attachment,background-position,background-position-x,background-position-y,background-clip,background-origin,background-size,box-decoration-break,box-shadow,text-shadow +ij_scss_space_after_colon = true +ij_scss_space_before_opening_brace = true +ij_scss_use_double_quotes = true +ij_scss_value_alignment = 0 + +[*.twig] +ij_twig_keep_indents_on_empty_lines = false +ij_twig_spaces_inside_comments_delimiters = true +ij_twig_spaces_inside_delimiters = true +ij_twig_spaces_inside_variable_delimiters = true + +[*.vue] +indent_size = 2 +tab_width = 2 +ij_continuation_indent_size = 4 +ij_vue_indent_children_of_top_level = template +ij_vue_interpolation_new_line_after_start_delimiter = true +ij_vue_interpolation_new_line_before_end_delimiter = true +ij_vue_interpolation_wrap = off +ij_vue_keep_indents_on_empty_lines = false +ij_vue_spaces_within_interpolation_expressions = true + +[.editorconfig] +ij_editorconfig_align_group_field_declarations = false +ij_editorconfig_space_after_colon = false +ij_editorconfig_space_after_comma = true +ij_editorconfig_space_before_colon = false +ij_editorconfig_space_before_comma = false +ij_editorconfig_spaces_around_assignment_operators = true + +[{*.ant,*.fxml,*.jhm,*.jnlp,*.jrxml,*.rng,*.tld,*.wsdl,*.xml,*.xsd,*.xsl,*.xslt,*.xul,phpunit.xml.dist}] +ij_xml_align_attributes = true +ij_xml_align_text = false +ij_xml_attribute_wrap = normal +ij_xml_block_comment_add_space = false +ij_xml_block_comment_at_first_column = true +ij_xml_keep_blank_lines = 2 +ij_xml_keep_indents_on_empty_lines = false +ij_xml_keep_line_breaks = true +ij_xml_keep_line_breaks_in_text = true +ij_xml_keep_whitespaces = false +ij_xml_keep_whitespaces_around_cdata = preserve +ij_xml_keep_whitespaces_inside_cdata = false +ij_xml_line_comment_at_first_column = true +ij_xml_space_after_tag_name = false +ij_xml_space_around_equals_in_attribute = false +ij_xml_space_inside_empty_tag = false +ij_xml_text_wrap = normal + +[{*.ats,*.cts,*.mts,*.ts}] +ij_continuation_indent_size = 4 +ij_typescript_align_imports = false +ij_typescript_align_multiline_array_initializer_expression = false +ij_typescript_align_multiline_binary_operation = false +ij_typescript_align_multiline_chained_methods = false +ij_typescript_align_multiline_extends_list = false +ij_typescript_align_multiline_for = true +ij_typescript_align_multiline_parameters = true +ij_typescript_align_multiline_parameters_in_calls = false +ij_typescript_align_multiline_ternary_operation = false +ij_typescript_align_object_properties = 0 +ij_typescript_align_union_types = false +ij_typescript_align_var_statements = 0 +ij_typescript_array_initializer_new_line_after_left_brace = false +ij_typescript_array_initializer_right_brace_on_new_line = false +ij_typescript_array_initializer_wrap = off +ij_typescript_assignment_wrap = off +ij_typescript_binary_operation_sign_on_next_line = false +ij_typescript_binary_operation_wrap = off +ij_typescript_blacklist_imports = rxjs/Rx,node_modules/**,**/node_modules/**,@angular/material,@angular/material/typings/** +ij_typescript_blank_lines_after_imports = 1 +ij_typescript_blank_lines_around_class = 1 +ij_typescript_blank_lines_around_field = 0 +ij_typescript_blank_lines_around_field_in_interface = 0 +ij_typescript_blank_lines_around_function = 1 +ij_typescript_blank_lines_around_method = 1 +ij_typescript_blank_lines_around_method_in_interface = 1 +ij_typescript_block_brace_style = end_of_line +ij_typescript_block_comment_add_space = false +ij_typescript_block_comment_at_first_column = true +ij_typescript_call_parameters_new_line_after_left_paren = false +ij_typescript_call_parameters_right_paren_on_new_line = false +ij_typescript_call_parameters_wrap = off +ij_typescript_catch_on_new_line = false +ij_typescript_chained_call_dot_on_new_line = true +ij_typescript_class_brace_style = end_of_line +ij_typescript_comma_on_new_line = false +ij_typescript_do_while_brace_force = never +ij_typescript_else_on_new_line = false +ij_typescript_enforce_trailing_comma = keep +ij_typescript_enum_constants_wrap = on_every_item +ij_typescript_extends_keyword_wrap = off +ij_typescript_extends_list_wrap = off +ij_typescript_field_prefix = _ +ij_typescript_file_name_style = relaxed +ij_typescript_finally_on_new_line = false +ij_typescript_for_brace_force = never +ij_typescript_for_statement_new_line_after_left_paren = false +ij_typescript_for_statement_right_paren_on_new_line = false +ij_typescript_for_statement_wrap = off +ij_typescript_force_quote_style = false +ij_typescript_force_semicolon_style = false +ij_typescript_function_expression_brace_style = end_of_line +ij_typescript_if_brace_force = never +ij_typescript_import_merge_members = global +ij_typescript_import_prefer_absolute_path = global +ij_typescript_import_sort_members = true +ij_typescript_import_sort_module_name = false +ij_typescript_import_use_node_resolution = true +ij_typescript_imports_wrap = on_every_item +ij_typescript_indent_case_from_switch = true +ij_typescript_indent_chained_calls = true +ij_typescript_indent_package_children = 0 +ij_typescript_jsdoc_include_types = false +ij_typescript_jsx_attribute_value = braces +ij_typescript_keep_blank_lines_in_code = 2 +ij_typescript_keep_first_column_comment = true +ij_typescript_keep_indents_on_empty_lines = false +ij_typescript_keep_line_breaks = true +ij_typescript_keep_simple_blocks_in_one_line = false +ij_typescript_keep_simple_methods_in_one_line = false +ij_typescript_line_comment_add_space = true +ij_typescript_line_comment_at_first_column = false +ij_typescript_method_brace_style = end_of_line +ij_typescript_method_call_chain_wrap = off +ij_typescript_method_parameters_new_line_after_left_paren = false +ij_typescript_method_parameters_right_paren_on_new_line = false +ij_typescript_method_parameters_wrap = off +ij_typescript_object_literal_wrap = on_every_item +ij_typescript_parentheses_expression_new_line_after_left_paren = false +ij_typescript_parentheses_expression_right_paren_on_new_line = false +ij_typescript_place_assignment_sign_on_next_line = false +ij_typescript_prefer_as_type_cast = false +ij_typescript_prefer_explicit_types_function_expression_returns = false +ij_typescript_prefer_explicit_types_function_returns = false +ij_typescript_prefer_explicit_types_vars_fields = false +ij_typescript_prefer_parameters_wrap = false +ij_typescript_reformat_c_style_comments = false +ij_typescript_space_after_colon = true +ij_typescript_space_after_comma = true +ij_typescript_space_after_dots_in_rest_parameter = false +ij_typescript_space_after_generator_mult = true +ij_typescript_space_after_property_colon = true +ij_typescript_space_after_quest = true +ij_typescript_space_after_type_colon = true +ij_typescript_space_after_unary_not = false +ij_typescript_space_before_async_arrow_lparen = true +ij_typescript_space_before_catch_keyword = true +ij_typescript_space_before_catch_left_brace = true +ij_typescript_space_before_catch_parentheses = true +ij_typescript_space_before_class_lbrace = true +ij_typescript_space_before_class_left_brace = true +ij_typescript_space_before_colon = true +ij_typescript_space_before_comma = false +ij_typescript_space_before_do_left_brace = true +ij_typescript_space_before_else_keyword = true +ij_typescript_space_before_else_left_brace = true +ij_typescript_space_before_finally_keyword = true +ij_typescript_space_before_finally_left_brace = true +ij_typescript_space_before_for_left_brace = true +ij_typescript_space_before_for_parentheses = true +ij_typescript_space_before_for_semicolon = false +ij_typescript_space_before_function_left_parenth = true +ij_typescript_space_before_generator_mult = false +ij_typescript_space_before_if_left_brace = true +ij_typescript_space_before_if_parentheses = true +ij_typescript_space_before_method_call_parentheses = false +ij_typescript_space_before_method_left_brace = true +ij_typescript_space_before_method_parentheses = false +ij_typescript_space_before_property_colon = false +ij_typescript_space_before_quest = true +ij_typescript_space_before_switch_left_brace = true +ij_typescript_space_before_switch_parentheses = true +ij_typescript_space_before_try_left_brace = true +ij_typescript_space_before_type_colon = false +ij_typescript_space_before_unary_not = false +ij_typescript_space_before_while_keyword = true +ij_typescript_space_before_while_left_brace = true +ij_typescript_space_before_while_parentheses = true +ij_typescript_spaces_around_additive_operators = true +ij_typescript_spaces_around_arrow_function_operator = true +ij_typescript_spaces_around_assignment_operators = true +ij_typescript_spaces_around_bitwise_operators = true +ij_typescript_spaces_around_equality_operators = true +ij_typescript_spaces_around_logical_operators = true +ij_typescript_spaces_around_multiplicative_operators = true +ij_typescript_spaces_around_relational_operators = true +ij_typescript_spaces_around_shift_operators = true +ij_typescript_spaces_around_unary_operator = false +ij_typescript_spaces_within_array_initializer_brackets = false +ij_typescript_spaces_within_brackets = false +ij_typescript_spaces_within_catch_parentheses = false +ij_typescript_spaces_within_for_parentheses = false +ij_typescript_spaces_within_if_parentheses = false +ij_typescript_spaces_within_imports = false +ij_typescript_spaces_within_interpolation_expressions = false +ij_typescript_spaces_within_method_call_parentheses = false +ij_typescript_spaces_within_method_parentheses = false +ij_typescript_spaces_within_object_literal_braces = false +ij_typescript_spaces_within_object_type_braces = true +ij_typescript_spaces_within_parentheses = false +ij_typescript_spaces_within_switch_parentheses = false +ij_typescript_spaces_within_type_assertion = false +ij_typescript_spaces_within_union_types = true +ij_typescript_spaces_within_while_parentheses = false +ij_typescript_special_else_if_treatment = true +ij_typescript_ternary_operation_signs_on_next_line = false +ij_typescript_ternary_operation_wrap = off +ij_typescript_union_types_wrap = on_every_item +ij_typescript_use_chained_calls_group_indents = false +ij_typescript_use_double_quotes = true +ij_typescript_use_explicit_js_extension = auto +ij_typescript_use_path_mapping = always +ij_typescript_use_public_modifier = false +ij_typescript_use_semicolon_after_statement = true +ij_typescript_var_declaration_wrap = normal +ij_typescript_while_brace_force = never +ij_typescript_while_on_new_line = false +ij_typescript_wrap_comments = false + +[{*.bash,*.sh,*.zsh}] +indent_size = 2 +tab_width = 2 +ij_shell_binary_ops_start_line = false +ij_shell_keep_column_alignment_padding = false +ij_shell_minify_program = false +ij_shell_redirect_followed_by_space = false +ij_shell_switch_cases_indented = false +ij_shell_use_unix_line_separator = true + +[{*.cjs,*.js}] +ij_continuation_indent_size = 4 +ij_javascript_align_imports = false +ij_javascript_align_multiline_array_initializer_expression = false +ij_javascript_align_multiline_binary_operation = false +ij_javascript_align_multiline_chained_methods = false +ij_javascript_align_multiline_extends_list = false +ij_javascript_align_multiline_for = true +ij_javascript_align_multiline_parameters = true +ij_javascript_align_multiline_parameters_in_calls = false +ij_javascript_align_multiline_ternary_operation = false +ij_javascript_align_object_properties = 0 +ij_javascript_align_union_types = false +ij_javascript_align_var_statements = 0 +ij_javascript_array_initializer_new_line_after_left_brace = false +ij_javascript_array_initializer_right_brace_on_new_line = false +ij_javascript_array_initializer_wrap = off +ij_javascript_assignment_wrap = off +ij_javascript_binary_operation_sign_on_next_line = false +ij_javascript_binary_operation_wrap = off +ij_javascript_blacklist_imports = rxjs/Rx,node_modules/**,**/node_modules/**,@angular/material,@angular/material/typings/** +ij_javascript_blank_lines_after_imports = 1 +ij_javascript_blank_lines_around_class = 1 +ij_javascript_blank_lines_around_field = 0 +ij_javascript_blank_lines_around_function = 1 +ij_javascript_blank_lines_around_method = 1 +ij_javascript_block_brace_style = end_of_line +ij_javascript_block_comment_add_space = false +ij_javascript_block_comment_at_first_column = true +ij_javascript_call_parameters_new_line_after_left_paren = false +ij_javascript_call_parameters_right_paren_on_new_line = false +ij_javascript_call_parameters_wrap = off +ij_javascript_catch_on_new_line = false +ij_javascript_chained_call_dot_on_new_line = true +ij_javascript_class_brace_style = end_of_line +ij_javascript_comma_on_new_line = false +ij_javascript_do_while_brace_force = never +ij_javascript_else_on_new_line = false +ij_javascript_enforce_trailing_comma = keep +ij_javascript_extends_keyword_wrap = off +ij_javascript_extends_list_wrap = off +ij_javascript_field_prefix = _ +ij_javascript_file_name_style = relaxed +ij_javascript_finally_on_new_line = false +ij_javascript_for_brace_force = never +ij_javascript_for_statement_new_line_after_left_paren = false +ij_javascript_for_statement_right_paren_on_new_line = false +ij_javascript_for_statement_wrap = off +ij_javascript_force_quote_style = false +ij_javascript_force_semicolon_style = false +ij_javascript_function_expression_brace_style = end_of_line +ij_javascript_if_brace_force = never +ij_javascript_import_merge_members = global +ij_javascript_import_prefer_absolute_path = global +ij_javascript_import_sort_members = true +ij_javascript_import_sort_module_name = false +ij_javascript_import_use_node_resolution = true +ij_javascript_imports_wrap = on_every_item +ij_javascript_indent_case_from_switch = true +ij_javascript_indent_chained_calls = true +ij_javascript_indent_package_children = 0 +ij_javascript_jsx_attribute_value = braces +ij_javascript_keep_blank_lines_in_code = 2 +ij_javascript_keep_first_column_comment = true +ij_javascript_keep_indents_on_empty_lines = false +ij_javascript_keep_line_breaks = true +ij_javascript_keep_simple_blocks_in_one_line = false +ij_javascript_keep_simple_methods_in_one_line = false +ij_javascript_line_comment_add_space = true +ij_javascript_line_comment_at_first_column = false +ij_javascript_method_brace_style = end_of_line +ij_javascript_method_call_chain_wrap = off +ij_javascript_method_parameters_new_line_after_left_paren = false +ij_javascript_method_parameters_right_paren_on_new_line = false +ij_javascript_method_parameters_wrap = off +ij_javascript_object_literal_wrap = on_every_item +ij_javascript_parentheses_expression_new_line_after_left_paren = false +ij_javascript_parentheses_expression_right_paren_on_new_line = false +ij_javascript_place_assignment_sign_on_next_line = false +ij_javascript_prefer_as_type_cast = false +ij_javascript_prefer_explicit_types_function_expression_returns = false +ij_javascript_prefer_explicit_types_function_returns = false +ij_javascript_prefer_explicit_types_vars_fields = false +ij_javascript_prefer_parameters_wrap = false +ij_javascript_reformat_c_style_comments = false +ij_javascript_space_after_colon = true +ij_javascript_space_after_comma = true +ij_javascript_space_after_dots_in_rest_parameter = false +ij_javascript_space_after_generator_mult = true +ij_javascript_space_after_property_colon = true +ij_javascript_space_after_quest = true +ij_javascript_space_after_type_colon = true +ij_javascript_space_after_unary_not = false +ij_javascript_space_before_async_arrow_lparen = true +ij_javascript_space_before_catch_keyword = true +ij_javascript_space_before_catch_left_brace = true +ij_javascript_space_before_catch_parentheses = true +ij_javascript_space_before_class_lbrace = true +ij_javascript_space_before_class_left_brace = true +ij_javascript_space_before_colon = true +ij_javascript_space_before_comma = false +ij_javascript_space_before_do_left_brace = true +ij_javascript_space_before_else_keyword = true +ij_javascript_space_before_else_left_brace = true +ij_javascript_space_before_finally_keyword = true +ij_javascript_space_before_finally_left_brace = true +ij_javascript_space_before_for_left_brace = true +ij_javascript_space_before_for_parentheses = true +ij_javascript_space_before_for_semicolon = false +ij_javascript_space_before_function_left_parenth = true +ij_javascript_space_before_generator_mult = false +ij_javascript_space_before_if_left_brace = true +ij_javascript_space_before_if_parentheses = true +ij_javascript_space_before_method_call_parentheses = false +ij_javascript_space_before_method_left_brace = true +ij_javascript_space_before_method_parentheses = false +ij_javascript_space_before_property_colon = false +ij_javascript_space_before_quest = true +ij_javascript_space_before_switch_left_brace = true +ij_javascript_space_before_switch_parentheses = true +ij_javascript_space_before_try_left_brace = true +ij_javascript_space_before_type_colon = false +ij_javascript_space_before_unary_not = false +ij_javascript_space_before_while_keyword = true +ij_javascript_space_before_while_left_brace = true +ij_javascript_space_before_while_parentheses = true +ij_javascript_spaces_around_additive_operators = true +ij_javascript_spaces_around_arrow_function_operator = true +ij_javascript_spaces_around_assignment_operators = true +ij_javascript_spaces_around_bitwise_operators = true +ij_javascript_spaces_around_equality_operators = true +ij_javascript_spaces_around_logical_operators = true +ij_javascript_spaces_around_multiplicative_operators = true +ij_javascript_spaces_around_relational_operators = true +ij_javascript_spaces_around_shift_operators = true +ij_javascript_spaces_around_unary_operator = false +ij_javascript_spaces_within_array_initializer_brackets = false +ij_javascript_spaces_within_brackets = false +ij_javascript_spaces_within_catch_parentheses = false +ij_javascript_spaces_within_for_parentheses = false +ij_javascript_spaces_within_if_parentheses = false +ij_javascript_spaces_within_imports = false +ij_javascript_spaces_within_interpolation_expressions = false +ij_javascript_spaces_within_method_call_parentheses = false +ij_javascript_spaces_within_method_parentheses = false +ij_javascript_spaces_within_object_literal_braces = false +ij_javascript_spaces_within_object_type_braces = true +ij_javascript_spaces_within_parentheses = false +ij_javascript_spaces_within_switch_parentheses = false +ij_javascript_spaces_within_type_assertion = false +ij_javascript_spaces_within_union_types = true +ij_javascript_spaces_within_while_parentheses = false +ij_javascript_special_else_if_treatment = true +ij_javascript_ternary_operation_signs_on_next_line = false +ij_javascript_ternary_operation_wrap = off +ij_javascript_union_types_wrap = on_every_item +ij_javascript_use_chained_calls_group_indents = false +ij_javascript_use_double_quotes = true +ij_javascript_use_explicit_js_extension = auto +ij_javascript_use_path_mapping = always +ij_javascript_use_public_modifier = false +ij_javascript_use_semicolon_after_statement = true +ij_javascript_var_declaration_wrap = normal +ij_javascript_while_brace_force = never +ij_javascript_while_on_new_line = false +ij_javascript_wrap_comments = false + +[{*.cjsx,*.coffee}] +indent_size = 2 +tab_width = 2 +ij_continuation_indent_size = 2 +ij_coffeescript_align_function_body = false +ij_coffeescript_align_imports = false +ij_coffeescript_align_multiline_array_initializer_expression = true +ij_coffeescript_align_multiline_parameters = true +ij_coffeescript_align_multiline_parameters_in_calls = false +ij_coffeescript_align_object_properties = 0 +ij_coffeescript_align_union_types = false +ij_coffeescript_align_var_statements = 0 +ij_coffeescript_array_initializer_new_line_after_left_brace = false +ij_coffeescript_array_initializer_right_brace_on_new_line = false +ij_coffeescript_array_initializer_wrap = normal +ij_coffeescript_blacklist_imports = rxjs/Rx,node_modules/**,**/node_modules/**,@angular/material,@angular/material/typings/** +ij_coffeescript_blank_lines_around_function = 1 +ij_coffeescript_call_parameters_new_line_after_left_paren = false +ij_coffeescript_call_parameters_right_paren_on_new_line = false +ij_coffeescript_call_parameters_wrap = normal +ij_coffeescript_chained_call_dot_on_new_line = true +ij_coffeescript_comma_on_new_line = false +ij_coffeescript_enforce_trailing_comma = keep +ij_coffeescript_field_prefix = _ +ij_coffeescript_file_name_style = relaxed +ij_coffeescript_force_quote_style = false +ij_coffeescript_force_semicolon_style = false +ij_coffeescript_function_expression_brace_style = end_of_line +ij_coffeescript_import_merge_members = global +ij_coffeescript_import_prefer_absolute_path = global +ij_coffeescript_import_sort_members = true +ij_coffeescript_import_sort_module_name = false +ij_coffeescript_import_use_node_resolution = true +ij_coffeescript_imports_wrap = on_every_item +ij_coffeescript_indent_chained_calls = true +ij_coffeescript_indent_package_children = 0 +ij_coffeescript_jsx_attribute_value = braces +ij_coffeescript_keep_blank_lines_in_code = 2 +ij_coffeescript_keep_first_column_comment = true +ij_coffeescript_keep_indents_on_empty_lines = false +ij_coffeescript_keep_line_breaks = true +ij_coffeescript_keep_simple_methods_in_one_line = false +ij_coffeescript_method_parameters_new_line_after_left_paren = false +ij_coffeescript_method_parameters_right_paren_on_new_line = false +ij_coffeescript_method_parameters_wrap = off +ij_coffeescript_object_literal_wrap = on_every_item +ij_coffeescript_prefer_as_type_cast = false +ij_coffeescript_prefer_explicit_types_function_expression_returns = false +ij_coffeescript_prefer_explicit_types_function_returns = false +ij_coffeescript_prefer_explicit_types_vars_fields = false +ij_coffeescript_reformat_c_style_comments = false +ij_coffeescript_space_after_comma = true +ij_coffeescript_space_after_dots_in_rest_parameter = false +ij_coffeescript_space_after_generator_mult = true +ij_coffeescript_space_after_property_colon = true +ij_coffeescript_space_after_type_colon = true +ij_coffeescript_space_after_unary_not = false +ij_coffeescript_space_before_async_arrow_lparen = true +ij_coffeescript_space_before_class_lbrace = true +ij_coffeescript_space_before_comma = false +ij_coffeescript_space_before_function_left_parenth = true +ij_coffeescript_space_before_generator_mult = false +ij_coffeescript_space_before_property_colon = false +ij_coffeescript_space_before_type_colon = false +ij_coffeescript_space_before_unary_not = false +ij_coffeescript_spaces_around_additive_operators = true +ij_coffeescript_spaces_around_arrow_function_operator = true +ij_coffeescript_spaces_around_assignment_operators = true +ij_coffeescript_spaces_around_bitwise_operators = true +ij_coffeescript_spaces_around_equality_operators = true +ij_coffeescript_spaces_around_logical_operators = true +ij_coffeescript_spaces_around_multiplicative_operators = true +ij_coffeescript_spaces_around_relational_operators = true +ij_coffeescript_spaces_around_shift_operators = true +ij_coffeescript_spaces_around_unary_operator = false +ij_coffeescript_spaces_within_array_initializer_braces = false +ij_coffeescript_spaces_within_array_initializer_brackets = false +ij_coffeescript_spaces_within_imports = false +ij_coffeescript_spaces_within_index_brackets = false +ij_coffeescript_spaces_within_interpolation_expressions = false +ij_coffeescript_spaces_within_method_call_parentheses = false +ij_coffeescript_spaces_within_method_parentheses = false +ij_coffeescript_spaces_within_object_braces = false +ij_coffeescript_spaces_within_object_literal_braces = false +ij_coffeescript_spaces_within_object_type_braces = true +ij_coffeescript_spaces_within_range_brackets = false +ij_coffeescript_spaces_within_type_assertion = false +ij_coffeescript_spaces_within_union_types = true +ij_coffeescript_union_types_wrap = on_every_item +ij_coffeescript_use_chained_calls_group_indents = false +ij_coffeescript_use_double_quotes = true +ij_coffeescript_use_explicit_js_extension = auto +ij_coffeescript_use_path_mapping = always +ij_coffeescript_use_public_modifier = false +ij_coffeescript_use_semicolon_after_statement = false +ij_coffeescript_var_declaration_wrap = normal + +[{*.ctp,*.hphp,*.inc,*.module,*.php,*.php4,*.php5,*.phtml}] +indent_size = 2 +tab_width = 2 +ij_continuation_indent_size = 2 +ij_php_align_assignments = false +ij_php_align_class_constants = true +ij_php_align_group_field_declarations = true +ij_php_align_inline_comments = false +ij_php_align_key_value_pairs = false +ij_php_align_match_arm_bodies = false +ij_php_align_multiline_array_initializer_expression = true +ij_php_align_multiline_binary_operation = false +ij_php_align_multiline_chained_methods = false +ij_php_align_multiline_extends_list = false +ij_php_align_multiline_for = false +ij_php_align_multiline_parameters = false +ij_php_align_multiline_parameters_in_calls = false +ij_php_align_multiline_ternary_operation = false +ij_php_align_named_arguments = false +ij_php_align_phpdoc_comments = false +ij_php_align_phpdoc_param_names = false +ij_php_anonymous_brace_style = end_of_line +ij_php_api_weight = 28 +ij_php_array_initializer_new_line_after_left_brace = false +ij_php_array_initializer_right_brace_on_new_line = true +ij_php_array_initializer_wrap = off +ij_php_assignment_wrap = off +ij_php_attributes_wrap = off +ij_php_author_weight = 28 +ij_php_binary_operation_sign_on_next_line = false +ij_php_binary_operation_wrap = off +ij_php_blank_lines_after_class_header = 0 +ij_php_blank_lines_after_function = 1 +ij_php_blank_lines_after_imports = 1 +ij_php_blank_lines_after_opening_tag = 0 +ij_php_blank_lines_after_package = 0 +ij_php_blank_lines_around_class = 1 +ij_php_blank_lines_around_constants = 0 +ij_php_blank_lines_around_field = 0 +ij_php_blank_lines_around_method = 1 +ij_php_blank_lines_before_class_end = 0 +ij_php_blank_lines_before_imports = 1 +ij_php_blank_lines_before_method_body = 0 +ij_php_blank_lines_before_package = 1 +ij_php_blank_lines_before_return_statement = 0 +ij_php_blank_lines_between_imports = 0 +ij_php_block_brace_style = end_of_line +ij_php_call_parameters_new_line_after_left_paren = false +ij_php_call_parameters_right_paren_on_new_line = true +ij_php_call_parameters_wrap = off +ij_php_catch_on_new_line = true +ij_php_category_weight = 28 +ij_php_class_brace_style = end_of_line +ij_php_comma_after_last_array_element = false +ij_php_concat_spaces = true +ij_php_copyright_weight = 28 +ij_php_deprecated_weight = 28 +ij_php_do_while_brace_force = always +ij_php_else_if_style = as_is +ij_php_else_on_new_line = true +ij_php_example_weight = 28 +ij_php_extends_keyword_wrap = off +ij_php_extends_list_wrap = off +ij_php_fields_default_visibility = private +ij_php_filesource_weight = 28 +ij_php_finally_on_new_line = true +ij_php_for_brace_force = always +ij_php_for_statement_new_line_after_left_paren = false +ij_php_for_statement_right_paren_on_new_line = false +ij_php_for_statement_wrap = off +ij_php_force_empty_methods_in_one_line = false +ij_php_force_short_declaration_array_style = false +ij_php_getters_setters_naming_style = camel_case +ij_php_getters_setters_order_style = getters_first +ij_php_global_weight = 28 +ij_php_group_use_wrap = on_every_item +ij_php_if_brace_force = always +ij_php_if_lparen_on_next_line = false +ij_php_if_rparen_on_next_line = false +ij_php_ignore_weight = 28 +ij_php_import_sorting = alphabetic +ij_php_indent_break_from_case = true +ij_php_indent_case_from_switch = true +ij_php_indent_code_in_php_tags = false +ij_php_internal_weight = 28 +ij_php_keep_blank_lines_after_lbrace = 2 +ij_php_keep_blank_lines_before_right_brace = 2 +ij_php_keep_blank_lines_in_code = 2 +ij_php_keep_blank_lines_in_declarations = 2 +ij_php_keep_control_statement_in_one_line = true +ij_php_keep_first_column_comment = true +ij_php_keep_indents_on_empty_lines = true +ij_php_keep_line_breaks = true +ij_php_keep_rparen_and_lbrace_on_one_line = true +ij_php_keep_simple_classes_in_one_line = false +ij_php_keep_simple_methods_in_one_line = false +ij_php_lambda_brace_style = end_of_line +ij_php_license_weight = 28 +ij_php_line_comment_add_space = false +ij_php_line_comment_at_first_column = true +ij_php_link_weight = 28 +ij_php_lower_case_boolean_const = false +ij_php_lower_case_keywords = true +ij_php_lower_case_null_const = false +ij_php_method_brace_style = end_of_line +ij_php_method_call_chain_wrap = off +ij_php_method_parameters_new_line_after_left_paren = false +ij_php_method_parameters_right_paren_on_new_line = false +ij_php_method_parameters_wrap = off +ij_php_method_weight = 28 +ij_php_modifier_list_wrap = false +ij_php_multiline_chained_calls_semicolon_on_new_line = false +ij_php_namespace_brace_style = 1 +ij_php_new_line_after_php_opening_tag = false +ij_php_null_type_position = in_the_end +ij_php_package_weight = 28 +ij_php_param_weight = 0 +ij_php_parameters_attributes_wrap = off +ij_php_parentheses_expression_new_line_after_left_paren = false +ij_php_parentheses_expression_right_paren_on_new_line = false +ij_php_phpdoc_blank_line_before_tags = false +ij_php_phpdoc_blank_lines_around_parameters = false +ij_php_phpdoc_keep_blank_lines = true +ij_php_phpdoc_param_spaces_between_name_and_description = 1 +ij_php_phpdoc_param_spaces_between_tag_and_type = 1 +ij_php_phpdoc_param_spaces_between_type_and_name = 1 +ij_php_phpdoc_use_fqcn = false +ij_php_phpdoc_wrap_long_lines = false +ij_php_place_assignment_sign_on_next_line = false +ij_php_place_parens_for_constructor = 0 +ij_php_property_read_weight = 28 +ij_php_property_weight = 28 +ij_php_property_write_weight = 28 +ij_php_return_type_on_new_line = false +ij_php_return_weight = 1 +ij_php_see_weight = 28 +ij_php_since_weight = 28 +ij_php_sort_phpdoc_elements = true +ij_php_space_after_colon = true +ij_php_space_after_colon_in_enum_backed_type = true +ij_php_space_after_colon_in_named_argument = true +ij_php_space_after_colon_in_return_type = true +ij_php_space_after_comma = true +ij_php_space_after_for_semicolon = true +ij_php_space_after_quest = true +ij_php_space_after_type_cast = false +ij_php_space_after_unary_not = false +ij_php_space_before_array_initializer_left_brace = false +ij_php_space_before_catch_keyword = true +ij_php_space_before_catch_left_brace = true +ij_php_space_before_catch_parentheses = true +ij_php_space_before_class_left_brace = true +ij_php_space_before_closure_left_parenthesis = true +ij_php_space_before_colon = true +ij_php_space_before_colon_in_enum_backed_type = false +ij_php_space_before_colon_in_named_argument = false +ij_php_space_before_colon_in_return_type = false +ij_php_space_before_comma = false +ij_php_space_before_do_left_brace = true +ij_php_space_before_else_keyword = true +ij_php_space_before_else_left_brace = true +ij_php_space_before_finally_keyword = true +ij_php_space_before_finally_left_brace = true +ij_php_space_before_for_left_brace = true +ij_php_space_before_for_parentheses = true +ij_php_space_before_for_semicolon = false +ij_php_space_before_if_left_brace = true +ij_php_space_before_if_parentheses = true +ij_php_space_before_method_call_parentheses = false +ij_php_space_before_method_left_brace = true +ij_php_space_before_method_parentheses = false +ij_php_space_before_quest = true +ij_php_space_before_short_closure_left_parenthesis = false +ij_php_space_before_switch_left_brace = true +ij_php_space_before_switch_parentheses = true +ij_php_space_before_try_left_brace = true +ij_php_space_before_unary_not = false +ij_php_space_before_while_keyword = true +ij_php_space_before_while_left_brace = true +ij_php_space_before_while_parentheses = true +ij_php_space_between_ternary_quest_and_colon = false +ij_php_spaces_around_additive_operators = true +ij_php_spaces_around_arrow = false +ij_php_spaces_around_assignment_in_declare = false +ij_php_spaces_around_assignment_operators = true +ij_php_spaces_around_bitwise_operators = true +ij_php_spaces_around_equality_operators = true +ij_php_spaces_around_logical_operators = true +ij_php_spaces_around_multiplicative_operators = true +ij_php_spaces_around_null_coalesce_operator = true +ij_php_spaces_around_pipe_in_union_type = false +ij_php_spaces_around_relational_operators = true +ij_php_spaces_around_shift_operators = true +ij_php_spaces_around_unary_operator = false +ij_php_spaces_around_var_within_brackets = false +ij_php_spaces_within_array_initializer_braces = false +ij_php_spaces_within_brackets = false +ij_php_spaces_within_catch_parentheses = false +ij_php_spaces_within_for_parentheses = false +ij_php_spaces_within_if_parentheses = false +ij_php_spaces_within_method_call_parentheses = false +ij_php_spaces_within_method_parentheses = false +ij_php_spaces_within_parentheses = false +ij_php_spaces_within_short_echo_tags = true +ij_php_spaces_within_switch_parentheses = false +ij_php_spaces_within_while_parentheses = false +ij_php_special_else_if_treatment = true +ij_php_subpackage_weight = 28 +ij_php_ternary_operation_signs_on_next_line = false +ij_php_ternary_operation_wrap = off +ij_php_throws_weight = 2 +ij_php_todo_weight = 28 +ij_php_treat_multiline_arrays_and_lambdas_multiline = false +ij_php_unknown_tag_weight = 28 +ij_php_upper_case_boolean_const = false +ij_php_upper_case_null_const = false +ij_php_uses_weight = 28 +ij_php_var_weight = 28 +ij_php_variable_naming_style = mixed +ij_php_version_weight = 28 +ij_php_while_brace_force = always +ij_php_while_on_new_line = false + +[{*.har,*.jsb2,*.jsb3,*.json,.babelrc,.eslintrc,.stylelintrc,bowerrc,composer.lock,jest.config}] +indent_size = 2 +ij_json_keep_blank_lines_in_code = 0 +ij_json_keep_indents_on_empty_lines = false +ij_json_keep_line_breaks = true +ij_json_space_after_colon = true +ij_json_space_after_comma = true +ij_json_space_before_colon = true +ij_json_space_before_comma = false +ij_json_spaces_within_braces = false +ij_json_spaces_within_brackets = false +ij_json_wrap_long_lines = false + +[{*.htm,*.html,*.ng,*.sht,*.shtm,*.shtml}] +indent_size = 2 +tab_width = 2 +ij_continuation_indent_size = 2 +ij_html_add_new_line_before_tags = body,div,p,form,h1,h2,h3 +ij_html_align_attributes = true +ij_html_align_text = false +ij_html_attribute_wrap = normal +ij_html_block_comment_add_space = false +ij_html_block_comment_at_first_column = true +ij_html_do_not_align_children_of_min_lines = 0 +ij_html_do_not_break_if_inline_tags = title,h1,h2,h3,h4,h5,h6,p +ij_html_do_not_indent_children_of_tags = html,body,thead,tbody,tfoot +ij_html_enforce_quotes = false +ij_html_inline_tags = a,abbr,acronym,b,basefont,bdo,big,br,cite,cite,code,dfn,em,font,i,img,input,kbd,label,q,s,samp,select,small,span,strike,strong,sub,sup,textarea,tt,u,var +ij_html_keep_blank_lines = 2 +ij_html_keep_indents_on_empty_lines = false +ij_html_keep_line_breaks = true +ij_html_keep_line_breaks_in_text = true +ij_html_keep_whitespaces = false +ij_html_keep_whitespaces_inside = span,pre,textarea +ij_html_line_comment_at_first_column = true +ij_html_new_line_after_last_attribute = never +ij_html_new_line_before_first_attribute = never +ij_html_quote_style = double +ij_html_remove_new_line_before_tags = br +ij_html_space_after_tag_name = false +ij_html_space_around_equality_in_attribute = false +ij_html_space_inside_empty_tag = false +ij_html_text_wrap = normal + +[{*.markdown,*.md}] +ij_markdown_force_one_space_after_blockquote_symbol = true +ij_markdown_force_one_space_after_header_symbol = true +ij_markdown_force_one_space_after_list_bullet = true +ij_markdown_force_one_space_between_words = true +ij_markdown_insert_quote_arrows_on_wrap = true +ij_markdown_keep_indents_on_empty_lines = false +ij_markdown_keep_line_breaks_inside_text_blocks = true +ij_markdown_max_lines_around_block_elements = 1 +ij_markdown_max_lines_around_header = 1 +ij_markdown_max_lines_between_paragraphs = 1 +ij_markdown_min_lines_around_block_elements = 1 +ij_markdown_min_lines_around_header = 1 +ij_markdown_min_lines_between_paragraphs = 1 +ij_markdown_wrap_text_if_long = true +ij_markdown_wrap_text_inside_blockquotes = true + +[{*.yaml,*.yml}] +indent_size = 2 +ij_yaml_align_values_properties = do_not_align +ij_yaml_autoinsert_sequence_marker = true +ij_yaml_block_mapping_on_new_line = false +ij_yaml_indent_sequence_value = true +ij_yaml_keep_indents_on_empty_lines = false +ij_yaml_keep_line_breaks = true +ij_yaml_sequence_on_new_line = false +ij_yaml_space_before_colon = false +ij_yaml_spaces_within_braces = true +ij_yaml_spaces_within_brackets = true diff --git a/.vscode/launch.json b/.vscode/launch.json index aab8f11d5..289bc8cb9 100644 --- a/.vscode/launch.json +++ b/.vscode/launch.json @@ -63,11 +63,38 @@ } }, { - "name": "Python: File", - "type": "python", - "request": "launch", - "program": "${file}", - "justMyCode": true + "name": "Python: htcli (list Users with Include)", + "type": "python", + "request": "launch", + "program": "./ci/apiv2/htcli.py", + "args": ["list", "Users", "-v", "DEBUG", "--include", "globalPermissionGroup"], + "justMyCode": true + }, + { + "name": "Python: htcli run delete-test-data", + "type": "python", + "request": "launch", + "program": "./ci/apiv2/htcli.py", + "args": ["run", "delete-test-data", "--commit"], + "justMyCode": true + }, + { + "name": "Python: Debug pytest file", + "type": "python", + "request": "launch", + "module": "pytest", + "args": ["${file}", "--exitfirst"], + "justMyCode": true, + "env": { + "_PYTEST_RAISE": "1" + }, + }, + { + "name": "Python: File", + "type": "python", + "request": "launch", + "program": "${file}", + "justMyCode": true } ], "inputs": [ diff --git a/ci/apiv2/HACKING.md b/ci/apiv2/HACKING.md index 079b3e1a5..83cd9f97d 100644 --- a/ci/apiv2/HACKING.md +++ b/ci/apiv2/HACKING.md @@ -9,7 +9,7 @@ TOKEN=$(curl -X POST --user admin:hashtopolis http://localhost:8080/api/v2/auth/ Fetch object: ``` -curl --header "Content-Type: application/json" -X GET --header "Authorization: Bearer $TOKEN" 'http://localhost:8080/api/v2/ui/hashlists/1?expand=hashes' -d '{}' +curl --compressed --header "Authorization: Bearer $TOKEN" -g 'http://localhost:8080/api/v2/ui/hashtypes?page[size]=5' ``` Access database: @@ -23,6 +23,12 @@ docker exec $(docker ps -aqf "ancestor=mysql:8.0") mysql -u root -phashtopolis - docker exec $(docker ps -aqf "ancestor=mysql:8.0") tail -f /tmp/mysql_all.log ``` +Shortcut for testing within development setup: +``` +cd ~/src/hashtopolis/server/ci/apiv2 +pytest --exitfirst --last-failed +``` + ### paper flipchart scribbles #### v2 beta diff --git a/ci/apiv2/conftest.py b/ci/apiv2/conftest.py new file mode 100644 index 000000000..bd563400d --- /dev/null +++ b/ci/apiv2/conftest.py @@ -0,0 +1,12 @@ +import os +import pytest + +if os.getenv('_PYTEST_RAISE', "0") != "0": + + @pytest.hookimpl(tryfirst=True) + def pytest_exception_interact(call): + raise call.excinfo.value + + @pytest.hookimpl(tryfirst=True) + def pytest_internalerror(excinfo): + raise excinfo.value \ No newline at end of file diff --git a/ci/apiv2/create_crackertype_001.json b/ci/apiv2/create_crackertype_001.json index fc72c8144..9082b7f34 100644 --- a/ci/apiv2/create_crackertype_001.json +++ b/ci/apiv2/create_crackertype_001.json @@ -1,4 +1,4 @@ { - "typeName": "generic", + "typeName": "generic2", "isChunkingAvailable": true } diff --git a/ci/apiv2/dummy.yaml b/ci/apiv2/dummy.yaml new file mode 100644 index 000000000..6c44265e8 --- /dev/null +++ b/ci/apiv2/dummy.yaml @@ -0,0 +1,14 @@ +components: + schemas: + Hash: + type: object + properties: + id: + type: integer + minimum: 1 + readOnly: true + userMembers: + type: array + items: + $ref: #/components/schemas/User + uniqueItems: true diff --git a/ci/apiv2/hashtopolis.py b/ci/apiv2/hashtopolis.py index 600fa7abb..27723bdf3 100644 --- a/ci/apiv2/hashtopolis.py +++ b/ci/apiv2/hashtopolis.py @@ -6,10 +6,11 @@ # import copy import json -import requests -from pathlib import Path - import logging +from pathlib import Path +import requests +import sys +import urllib import http import confidence @@ -55,6 +56,25 @@ class HashtopolisResponseError(HashtopolisError): pass +class IncludedCache(object): + """ + Cast (potentially) included objects to object structure which + allows for caching and easier retrival + """ + def __init__(self, included_objects): + self._cache = {} + for included_obj in included_objects: + self._cache[self.get_object_uuid(included_obj)] = included_obj + + @staticmethod + def get_object_uuid(obj): + """ Generate unique key identifier for object """ + return "%s.%i" % (obj['type'], obj['id']) + + def get(self, obj): + return self._cache[self.get_object_uuid(obj)] + + class HashtopolisConnector(object): # Cache authorisation token per endpoint token = {} @@ -63,7 +83,7 @@ class HashtopolisConnector(object): @staticmethod def resp_to_json(response): content_type_header = response.headers.get('Content-Type', '') - if 'application/json' in content_type_header: + if any([x in content_type_header for x in ('application/vnd.api+json', 'application/json')]): return response.json() else: raise HashtopolisResponseError("Response type '%s' is not valid JSON document, text='%s'" % @@ -94,9 +114,17 @@ def authenticate(self): self._token_expires = HashtopolisConnector.token_expires[self._api_endpoint] self._headers = { - 'Authorization': 'Bearer ' + self._token, - 'Content-Type': 'application/json' + 'Authorization': 'Bearer ' + self._token } + + def create_payload(self, obj, attributes, id=None): + payload = {"data": { + "type": type(obj).__name__, + "attributes": attributes + }} + if id is not None: + payload["data"]["id"] = id + return payload def validate_status_code(self, r, expected_status_code, error_msg): """ Validate response and convert to python exception """ @@ -110,44 +138,99 @@ def validate_status_code(self, r, expected_status_code, error_msg): # Application hits a problem if r.status_code not in expected_status_code: - raise HashtopolisError( + raise HashtopolisResponseError( "%s (status_code=%s): %s" % (error_msg, r.status_code, r.text), status_code=r.status_code, exception_details=r_json.get('exception', []), message=r_json.get('message', None)) + + def validate_pagination_links(self, response, page): + """Validate all the links that are used for paginated data""" + data = response["data"] + highest_id = max(data, key=lambda obj: obj['id'])['id'] + lowest_id = min(data, key=lambda obj: obj['id'])['id'] + + links = response["links"] + query_params = urllib.parse.parse_qs(urllib.parse.urlparse(links["next"]).query) + assert (int(query_params["page[size]"][0]) == page["size"]) + assert (int(query_params["page[after]"][0]) == highest_id) + query_params = urllib.parse.parse_qs(urllib.parse.urlparse(links["prev"]).query) + assert (int(query_params["page[size]"][0]) == page["size"]) + assert (int(query_params["page[before]"][0]) == lowest_id) + query_params = urllib.parse.parse_qs(urllib.parse.urlparse(links["first"]).query) + assert (int(query_params["page[size]"][0]) == page["size"]) + assert (int(query_params["page[after]"][0]) == 0) + # query_params = urllib.parse.parse_qs(urllib.parse.urlparse(links["last"]).query) + # TODO not really a straightforward way to validate the last link + + def get_single_page(self, page, filter): + """Gets a single page by using the page parameters""" + self.authenticate() + headers = self._headers + request_uri = self._api_endpoint + self._model_uri + payload = {} - def filter(self, expand, max_results, ordering, filter): + for k, v in page.items(): + payload[f"page[{k}]"] = v + if filter: + for k, v in filter.items(): + payload[f"filter[{k}]"] = v + + request_uri = self._api_endpoint + self._model_uri + '?' + urllib.parse.urlencode(payload) + r = requests.get(request_uri, headers=headers) + logger.debug("Request URI: %s", urllib.parse.unquote(r.url)) + self.validate_status_code(r, [200], "paging failed") + response = self.resp_to_json(r) + logger.debug("Response %s", json.dumps(response, indent=4)) + + # validate page links + self.validate_pagination_links(response, page) + return response["data"] + + # todo refactor start_offset into page variable + def filter(self, include, ordering, filter, start_offset): self.authenticate() - uri = self._api_endpoint + self._model_uri headers = self._headers - filter_list = [f'{k}={v}' for k, v in filter.items()] - payload = { - 'filter': filter_list, - 'maxResults': max_results if max_results is not None else 999, - } - if expand is not None: - payload['expand'] = expand - if ordering is not None: - if type(ordering) is not list: - payload['ordering'] = [ordering] - else: - payload['ordering'] = ordering + payload = {'page[after]': start_offset} + if filter: + for k, v in filter.items(): + payload[f"filter[{k}]"] = v + + if include: + payload['include'] = ','.join(include) if type(include) in (list, tuple) else include + if ordering: + payload['sort'] = ','.join(ordering) if type(ordering) in (list, tuple) else ordering + + request_uri = self._api_endpoint + self._model_uri + '?' + urllib.parse.urlencode(payload) + while True: + r = requests.get(request_uri, headers=headers) + logger.debug("Request URI: %s", urllib.parse.unquote(r.url)) + self.validate_status_code(r, [200], "Filtering failed") + response = self.resp_to_json(r) + logger.debug("Response %s", json.dumps(response, indent=4)) + + # Buffer all included objects + included_cache = IncludedCache(response.get('included', [])) - r = requests.get(uri, headers=headers, data=json.dumps(payload)) - self.validate_status_code(r, [200], "Filtering failed") - return self.resp_to_json(r).get('values') + # Iterate over response objects + for obj in response['data']: + yield (obj, included_cache) - def get_one(self, pk, expand): + if 'links' not in response or 'next' not in response['links'] or not response['links']['next']: + break + request_uri = self._hashtopolis_uri + response['links']['next'] + + def get_one(self, pk, include): self.authenticate() uri = self._api_endpoint + self._model_uri + f'/{pk}' headers = self._headers payload = {} - if expand is not None: - payload['expand'] = expand + if include is not None: + payload['include'] = ','.join(include) if type(include) in (list, tuple) else include - r = requests.get(uri, headers=headers, data=json.dumps(payload)) + r = requests.get(uri, headers=headers, data=payload) self.validate_status_code(r, [200], "Get single object failed") return self.resp_to_json(r) @@ -157,43 +240,49 @@ def patch_one(self, obj): return self.authenticate() - uri = self._hashtopolis_uri + obj._self + uri = self._hashtopolis_uri + obj.uri headers = self._headers - payload = {} + headers['Content-Type'] = 'application/json' + attributes = {} for k, v in obj.diff().items(): logger.debug("Going to patch object '%s' property '%s' from '%s' to '%s'", obj, k, v[0], v[1]) - payload[k] = v[1] - + attributes[k] = v[1] + + payload = self.create_payload(obj, attributes, id=obj.id) logger.debug("Sending PATCH payload: %s to %s", json.dumps(payload), uri) r = requests.patch(uri, headers=headers, data=json.dumps(payload)) self.validate_status_code(r, [201], "Patching failed") # TODO: Validate if return objects matches digital twin - obj.set_initial(self.resp_to_json(r).copy()) + obj.set_initial(self.resp_to_json(r)['data'].copy()) def create(self, obj): # Check if object to be created is new - assert not hasattr(obj, '_self') + assert obj._new_model is True self.authenticate() uri = self._api_endpoint + self._model_uri headers = self._headers - payload = obj.get_fields() + headers['Content-Type'] = 'application/json' + + attributes = obj.get_fields() + payload = self.create_payload(obj, attributes) + logger.debug("Sending POST payload: %s to %s", json.dumps(payload), uri) r = requests.post(uri, headers=headers, data=json.dumps(payload)) self.validate_status_code(r, [201], "Creation of object failed") # TODO: Validate if return objects matches digital twin - obj.set_initial(self.resp_to_json(r).copy()) + obj.set_initial(self.resp_to_json(r)['data'].copy()) def delete(self, obj): """ Delete object from database """ # TODO: Check if object to be deleted actually exists - assert hasattr(obj, '_self') + assert obj._new_model is False self.authenticate() - uri = self._hashtopolis_uri + obj._self + uri = self._hashtopolis_uri + obj.uri headers = self._headers payload = {} @@ -203,11 +292,109 @@ def delete(self, obj): # TODO: Cleanup object to allow re-creation +# Build Django ORM style django.query interface +class QuerySet(): + def __init__(self, cls, include=None, ordering=None, filters=None, pages=None): + self.cls = cls + self.include = include + self.ordering = ordering + self.filters = filters + self.pages = pages + + def __iter__(self): + yield from self.__getitem__(slice(None, None, 1)) + + def __getitem__(self, k): + if isinstance(k, int): + return list(self.filter_(k, k + 1, 1))[0] + + if isinstance(k, slice): + return self.filter_(k.start or 0, k.stop or sys.maxsize, k.step or 1) + + def get_pagination(self): + objs = self.cls.get_conn().get_single_page(self.pages, self.filters) + parsed_objs = [] + for obj in objs: + parsed_objs.append(self.cls._model(**obj)) + return parsed_objs + + def filter_(self, start, stop, step): + index = start or 0 + cursor = index + + # pk field is special and should be translated + if self.filters is None: + filters = None + else: + filters = self.filters.copy() + if 'pk' in filters: + filters['_id'] = filters['pk'] + del filters['pk'] + + filter_generator = self.cls.get_conn().filter(self.include, self.ordering, filters, start_offset=cursor) + + while index < stop: + # Fetch new entries in chunks default to server + try: + (obj, included_cache) = next(filter_generator) + except StopIteration: + return + + # Return value + model_obj = self.cls._model(**obj) + model_obj.set_prefetched_relationships(included_cache) + yield model_obj + + index += 1 + + # Remove items skipped by step + for _ in range(step - 1): + try: + _ = next(filter_generator) + except StopIteration: + return + + def order_by(self, *ordering): + self.ordering = ordering + return self + + def filter(self, **filters): + self.filters = filters + return self + + def page(self, **pages): + self.pages = pages + return self + + def all(self): + # yield from self + return self + + def get(self, **filters): + if filters: + self.filters = filters + + # Generiek retrival, only need two entries to find out failures + objs = list(self.__getitem__(slice(0, 2, 1))) + if len(objs) == 0: + raise self.cls._model.DoesNotExist + elif len(objs) > 1: + raise self.cls._model.MultipleObjectsReturned + return objs[0] + + def __len__(self): + return len(list(iter(self))) + + class ManagerBase(type): conn = {} # Cache configuration values config = None + @classmethod + def prefetch_related(cls, *include): + return QuerySet(cls, include=include) + @classmethod def get_conn(cls): if cls.config is None: @@ -218,12 +405,11 @@ def get_conn(cls): return cls.conn[cls._model_uri] @classmethod - def all(cls, expand=None, max_results=None, ordering=None): + def all(cls): """ Retrieve all backend objects - TODO: Make iterator supporting loading of objects via pages """ - return cls.filter(expand, max_results, ordering) + return cls.filter() @classmethod def patch(cls, obj): @@ -242,43 +428,20 @@ def get_first(cls): """ Retrieve first object TODO: Error handling if first object does not exists - TODO: Request object with limit parameter instead """ return cls.all()[0] @classmethod - def get(cls, expand=None, ordering=None, **kwargs): - if 'pk' in kwargs: - try: - api_obj = cls.get_conn().get_one(kwargs['pk'], expand) - except HashtopolisError as e: - if e.status_code == 404: - raise cls._model.DoesNotExist - else: - # Re-raise error if generic failure took place - raise - new_obj = cls._model(**api_obj) - return new_obj - else: - objs = cls.filter(expand, ordering, **kwargs) - if len(objs) == 0: - raise cls._model.DoesNotExist - elif len(objs) > 1: - raise cls._model.MultipleObjectsReturned - return objs[0] + def get(cls, **filters): + return QuerySet(cls, filters=filters).get() @classmethod - def filter(cls, expand=None, max_results=None, ordering=None, **kwargs): - # Get all objects - api_objs = cls.get_conn().filter(expand, max_results, ordering, kwargs) + def paginate(cls, **pages): + return QuerySet(cls, pages=pages) - # Convert into class - objs = [] - if api_objs: - for api_obj in api_objs: - new_obj = cls._model(**api_obj) - objs.append(new_obj) - return objs + @classmethod + def filter(cls, **filters): + return QuerySet(cls, filters=filters) class ObjectDoesNotExist(Exception): @@ -306,7 +469,7 @@ def add_to_class(class_name, class_type): class_name, type(class_name, (class_type,), { "__qualname__": "%s.%s" % (new_class.__qualname__, class_name), - '__module__': "%s.%s" % (__name__, new_class.__name__) + '__module__': "%s" % (__name__) })) add_to_class('DoesNotExist', ObjectDoesNotExist) add_to_class('MultipleObjectsReturned', MultipleObjectsReturned) @@ -331,78 +494,91 @@ def add_to_class(class_name, class_type): class Model(metaclass=ModelBase): def __init__(self, *args, **kwargs): - self.set_initial(kwargs) + if 'links' in kwargs: + # Loading of existing model + self.set_initial(kwargs) + else: + self.set_initial({'attributes': kwargs}) super().__init__() def __repr__(self): - return self._self + return self.__uri def __eq__(self, other): return (self.get_fields() == other.get_fields()) def _dict2obj(self, dict): - # Function to convert a dict to an object. - uri = dict.get('_self') + """ + Convert resource object dictionary to an model Object + """ + uri = dict['links']['self'] + uri_without_id = '/'.join(uri.split('/')[:-1]) # Loop through all the registers classes for _, model in cls_registry.items(): model_uri = model.objects._model_uri # Check if part of the uri is in the model uri - if model_uri in uri: + if uri_without_id.endswith(model_uri): return model(**dict) # If we are here, it means that no uri matched, thus we don't know the object. - raise TypeError('Object not valid model') + raise TypeError(f"Object identifier '{uri}' not valid/defined model") def set_initial(self, kv): self.__fields = [] - self.__expanded = [] + self.__included = [] + self._new_model = True # Store fields allowing us to detect changed values - if '_self' in kv: + if 'links' in kv: self.__initial = copy.deepcopy(kv) + self.__uri = kv['links']['self'] + self.__id = kv['id'] + self._new_model = False else: # New model self.__initial = {} + self.__relationships = kv.get('relationships', {}) + # Create attribute values - for k, v in kv.items(): - # In case expand is true, there can be a attribute which also is an object. - # Example: Users in AccessGroups. This part will convert the returned data. - # Into proper objects. - if type(v) is list and len(v) > 0: - # Many-to-Many relation - obj_list = [] - # Loop through all the values in the list and convert them to objects. - for dict_v in v: - if type(dict_v) is dict and dict_v.get('_self'): - # Double check that it really is an object - obj = self._dict2obj(dict_v) - obj_list.append(obj) - # Set the attribute of the current object to a set object (like Django) - # Also check if it really were objects - if len(obj_list) > 0: - setattr(self, f"{k}_set", obj_list) - self.__expanded.append(f"{k}_set") - continue - # This does the same as above, only one-to-one relations - if type(v) is dict and v.get('_self'): - setattr(self, f"{k}", self._dict2obj(v)) - self.__expanded.append(f"{k}") - continue + for k, v in kv['attributes'].items(): + setattr(self, k, v) + self.__fields.append(k) - # Skip over field 'id', as it is automatic property of model itself. - # This should be removed if there is a concensus on the full model. - # Example: not rightgroupName but name, and not rightgroupId but id - if k != 'id': - setattr(self, k, v) + def set_prefetched_relationships(self, included_cache): + """ + Populate prefetched relationships + """ + for relationship_name, resource_identifier_object in self.__relationships.items(): + if 'data' not in resource_identifier_object: + # TODO Deal with 'link' type related relationships + continue - if not k.startswith('_'): - self.__fields.append(k) + resource_identifier_object_data_type = type(resource_identifier_object['data']) + if resource_identifier_object_data_type is type(None): + # Empty to-one relationship + setattr(self, relationship_name, None) + self.__included.append(relationship_name) + elif resource_identifier_object_data_type is dict: + # Non-empty to-one relationship + to_one_relation_obj = self._dict2obj(included_cache.get(resource_identifier_object['data'])) + setattr(self, relationship_name, to_one_relation_obj) + self.__included.append(relationship_name) + elif resource_identifier_object_data_type is list: + to_many_relation_objs = [] + # to-many relationship + for obj in resource_identifier_object['data']: + to_many_relation_objs.append(self._dict2obj(included_cache.get(obj))) + setattr(self, relationship_name + '_set', to_many_relation_objs) + self.__included.append(relationship_name + "_set") + else: + raise AssertionError("Invalid resource indentifier object class type=%s" % + resource_identifier_object_data_type) def get_fields(self): return dict([(k, getattr(self, k)) for k in sorted(self.__fields)]) def diff(self): # Stored database values - d_initial = self.__initial + d_initial = self.__initial['attributes'] # Possible changes values d_current = self.get_fields() diffs = [] @@ -411,15 +587,15 @@ def diff(self): if v_current != v_innitial: diffs.append((key, (v_innitial, v_current))) - # Find expandables sets which have changed - for expand in self.__expanded: - if expand.endswith('_set'): - innitial_name = expand[:-4] + # Find includeables sets which have changed + for include in self.__included: + if include.endswith('_set'): + innitial_name = include[:-4] # Retrieve innitial keys - v_innitial = self.__initial[innitial_name] - v_innitial_ids = [x['_id'] for x in v_innitial] + v_innitial = self.__initial['relationships'][innitial_name]['data'] + v_innitial_ids = [x['id'] for x in v_innitial] # Retrieve new/current keys - v_current = getattr(self, expand) + v_current = getattr(self, include) v_current_ids = [x.id for x in v_current] # Use ID of ojbects as new current/update identifiers if sorted(v_innitial_ids) != sorted(v_current_ids): @@ -431,28 +607,36 @@ def has_changed(self): return bool(self.diff()) def save(self): - if hasattr(self, '_self'): - self.objects.patch(self) - else: + if self._new_model: self.objects.create(self) + else: + self.objects.patch(self) return self def delete(self): - if hasattr(self, '_self'): + if not self._new_model: self.objects.delete(self) def serialize(self): - retval = dict([(x, getattr(self, x)) for x in self.__fields] + [('_self', self._self), ('_id', self._id)]) - for expandable in self.__expanded: - if expandable.endswith('_set'): - retval[expandable] = [x.serialize() for x in getattr(self, expandable)] + retval = dict([(x, getattr(self, x)) for x in self.__fields] + [('_self', self.__uri), ('_id', self.__id)]) + for includeable in self.__included: + if includeable.endswith('_set'): + retval[includeable] = [x.serialize() for x in getattr(self, includeable)] else: - retval[expandable] = getattr(self, expandable).serialize() + retval[includeable] = getattr(self, includeable).serialize() return retval @property def id(self): - return self._id + return self.__id + + @property + def pk(self): + return self.__id + + @property + def uri(self): + return self.__uri ## @@ -585,7 +769,6 @@ def do_upload(self, filename, file_stream, chunk_size=1000000000): uri = self._api_endpoint + self._model_uri my_client = tusclient.client.TusClient(uri) - del self._headers['Content-Type'] my_client.set_headers(self._headers) metadata = {"filename": filename, @@ -625,6 +808,7 @@ def _helper_request(self, helper_uri, payload): self.authenticate() uri = self._api_endpoint + self._model_uri + helper_uri headers = self._headers + headers['Content-Type'] = 'application/json' logging.debug(f"Makeing POST request to {uri}, headers={headers} payload={payload}") r = requests.post(uri, headers=headers, data=json.dumps(payload)) diff --git a/ci/apiv2/htcli.py b/ci/apiv2/htcli.py index 4b9575caa..e71e5264c 100755 --- a/ci/apiv2/htcli.py +++ b/ci/apiv2/htcli.py @@ -21,7 +21,9 @@ from utils import find_stale_test_objects logger = logging.getLogger(__name__) -click_log.basic_config(logger) + +root_logger = logging.getLogger() +click_log.basic_config(root_logger) ALL_MODELS = [x[1] for x in inspect.getmembers(hashtopolis, inspect.isclass) if issubclass(x[1], hashtopolis.Model) and x[1] is not hashtopolis.Model] @@ -39,7 +41,7 @@ def run(): @run.command() @click.option('-c', '--commit', is_flag=True, help="Non-interactive mode") -@click_log.simple_verbosity_option(logger) +@click_log.simple_verbosity_option(root_logger) def delete_test_data(commit): if commit is False: prefix = '[DRY-RUN]' @@ -59,13 +61,13 @@ def delete_test_data(commit): @main.command() @click.argument('model_plural', type=click.Choice([x.verbose_name_plural for x in ALL_MODELS], case_sensitive=True)) @click.option('-b', '--brief', 'is_brief', is_flag=True, help="Condense output to list of items") -@click.option('--expand', 'opt_expand', help="Comma seperated list of items to expand", multiple=True) +@click.option('--include', 'opt_include', help="Comma seperated list of relations to include", multiple=True) @click.option('--fields', 'opt_fields', help="Comma seperated list of fields to display", multiple=True) @click.option('--filter', 'opt_filter', help="Filter objects based on filter provided", multiple=True) @click.option('--ordering', 'opt_ordering', help="Field to select for ordering output", multiple=True) @click.option('--max_results', 'opt_max_results', default=None, help="Maximum results to display", type=int) -@click_log.simple_verbosity_option(logger) -def list(model_plural, is_brief, opt_expand, opt_fields, opt_filter, opt_max_results, opt_ordering): +@click_log.simple_verbosity_option(root_logger) +def list(model_plural, is_brief, opt_include, opt_fields, opt_filter, opt_max_results, opt_ordering): model_class = [x for x in ALL_MODELS if x.verbose_name_plural == model_plural][0] def get_opt_list(options): @@ -76,7 +78,7 @@ def get_opt_list(options): return () # Parse options and arguments - expand = get_opt_list(opt_expand) + include = get_opt_list(opt_include) filter = dict([filter_item.split('=', 1) for filter_item in get_opt_list(opt_filter) if filter_item]) display_field_filter = get_opt_list(opt_fields) @@ -85,9 +87,9 @@ def get_opt_list(options): # Retrieve objects if not opt_filter: - objs = model_class.objects.all(expand, max_results=opt_max_results) + objs = model_class.objects.prefetch_related(*include).all()[:opt_max_results] else: - objs = model_class.objects.filter(expand, max_results=opt_max_results, **filter) + objs = model_class.objects.prefetch_related(*include).filter(**filter)[:opt_max_results] # Display objects if is_brief is True: @@ -113,5 +115,4 @@ def get_opt_list(options): if __name__ == '__main__': - logging.basicConfig() main() diff --git a/ci/apiv2/test_agent.py b/ci/apiv2/test_agent.py index 1aae2c315..a4e833c2e 100644 --- a/ci/apiv2/test_agent.py +++ b/ci/apiv2/test_agent.py @@ -25,9 +25,18 @@ def test_patch_field_ignorerrors_invalid_choice(self): self._test_patch(model_obj, 'ignoreErrors', 5) self.assertEqual(e.exception.status_code, 500) + def test_name_too_long(self): + model_obj = self.create_test_object() + too_long_name = "a" * 101 + with self.assertRaises(HashtopolisError) as e: + self._test_patch(model_obj, 'agentName', too_long_name) # name exceeds max size of 100 + self.assertEqual(e.exception.status_code, 500) + self.assertEqual(e.exception.exception_details[0]["message"], + f"The string value: '{too_long_name}' is too long. The max size is '100'") + def test_expandables(self): model_obj = self.create_test_object() - expandables = ['accessGroups', 'agentstats'] + expandables = ['accessGroups', 'agentStats'] self._test_expandables(model_obj, expandables) def test_assign_unassign_agent(self): diff --git a/ci/apiv2/test_agentassignment.py b/ci/apiv2/test_agentassignment.py index ee8a44106..fd94f1ca8 100644 --- a/ci/apiv2/test_agentassignment.py +++ b/ci/apiv2/test_agentassignment.py @@ -17,7 +17,7 @@ def test_patch(self): model_obj = self.create_test_object() with self.assertRaises(HashtopolisResponseError) as e: self._test_patch(model_obj, 'agentId', 1234) - self.assertEqual(e.exception.status_code, 500) + self.assertEqual(e.exception.status_code, 405) def test_delete(self): model_obj = self.create_test_object(delete=False) diff --git a/ci/apiv2/test_attributes.py b/ci/apiv2/test_attributes.py index 2ade1600c..278c7dda1 100644 --- a/ci/apiv2/test_attributes.py +++ b/ci/apiv2/test_attributes.py @@ -24,13 +24,15 @@ def test_patch_read_only(self): conn.authenticate() headers = conn._headers + headers['Content-Type'] = 'application/json' uri = conn._api_endpoint + conn._model_uri + f'/{user.id}' - payload = {} - payload['passwordHash'] = 'test' + attributes = {} + attributes['passwordHash'] = 'test' + payload = conn.create_payload(user, attributes, id=user.id) r = requests.patch(uri, headers=headers, data=json.dumps(payload)) - self.assertEqual(r.status_code, 500) + self.assertEqual(r.status_code, 403) self.assertIn('immutable', r.json().get('exception')[0].get('message')) user.delete() @@ -46,6 +48,7 @@ def test_create_protected(self): ) with self.assertRaises(HashtopolisError) as e: user.save() + self.assertEqual(e.exception.status_code, 500) self.assertIn(' not valid input ', e.exception.exception_details[0]['message']) diff --git a/ci/apiv2/test_expand.py b/ci/apiv2/test_expand.py index 080397d8b..fcbbdfa27 100644 --- a/ci/apiv2/test_expand.py +++ b/ci/apiv2/test_expand.py @@ -5,7 +5,7 @@ class ExpandTest(BaseTest): def test_accessgroups_usermembers_m2m(self): # Many-to-many casting - objs = AccessGroup.objects.all(expand='userMembers') + objs = AccessGroup.objects.prefetch_related('userMembers').all() # Check the default account self.assertEqual(objs[0].userMembers_set[0].name, 'admin') @@ -14,11 +14,11 @@ def test_crackerbinary_o2o(self): hashlist = self.create_hashlist() task = self.create_task(hashlist) - objs = Task.objects.filter(taskId=task.id, expand='crackerBinary') + objs = Task.objects.prefetch_related('crackerBinary').filter(taskId=task.id) self.assertEqual(objs[0].crackerBinary.binaryName, 'hashcat') def test_individual_object_expanding(self): hashlist = self.create_hashlist() - obj = Hashlist.objects.get(pk=hashlist.id, expand='hashes') + obj = Hashlist.objects.prefetch_related('hashes').get(pk=hashlist.id) self.assertEqual('cc03e747a6afbbcbf8be7668acfebee5', obj.hashes_set[0].hash) diff --git a/ci/apiv2/test_filter_and_ordering.py b/ci/apiv2/test_filter_and_ordering.py index 5597e35a5..a43819d66 100644 --- a/ci/apiv2/test_filter_and_ordering.py +++ b/ci/apiv2/test_filter_and_ordering.py @@ -1,6 +1,5 @@ from hashtopolis import HashType from utils import BaseTest -import pytest class FilterTest(BaseTest): @@ -44,21 +43,21 @@ def test_filter__eq(self): objs = HashType.objects.filter(hashTypeId__eq=100) all_objs = HashType.objects.all() self.assertEqual( - [x.id for x in all_objs if x.hashTypeId == 100], + [x.id for x in all_objs if x.id == 100], [x.id for x in objs]) def test_filter__gt(self): objs = HashType.objects.filter(hashTypeId__gt=8000) all_objs = HashType.objects.all() self.assertEqual( - [x.id for x in all_objs if x.hashTypeId > 8000], + [x.id for x in all_objs if x.id > 8000], [x.id for x in objs]) def test_filter__gte(self): objs = HashType.objects.filter(hashTypeId__gte=8000) all_objs = HashType.objects.all() self.assertEqual( - [x.id for x in all_objs if x.hashTypeId >= 8000], + [x.id for x in all_objs if x.id >= 8000], [x.id for x in objs]) def test_filter__icontains(self): @@ -89,23 +88,24 @@ def test_filter__lt(self): objs = HashType.objects.filter(hashTypeId__lt=100) all_objs = HashType.objects.all() self.assertEqual( - [x.id for x in all_objs if x.hashTypeId < 100], + [x.id for x in all_objs if x.id < 100], [x.id for x in objs]) def test_filter__lte(self): objs = HashType.objects.filter(hashTypeId__lte=100) all_objs = HashType.objects.all() self.assertEqual( - [x.id for x in all_objs if x.hashTypeId <= 100], + [x.id for x in all_objs if x.id <= 100], [x.id for x in objs]) def test_filter__ne(self): objs = HashType.objects.filter(hashTypeId__ne=100) all_objs = HashType.objects.all() self.assertEqual( - [x.id for x in all_objs if x.hashTypeId != 100], + [x.id for x in all_objs if x.id != 100], [x.id for x in objs]) + # is this test correct? No description starts with net so just an empty array gets compared to an empty array def test_filter__startswith(self): objs = HashType.objects.filter(description__startswith="net") all_objs = HashType.objects.all() @@ -115,18 +115,19 @@ def test_filter__startswith(self): def test_ordering(self): model_objs = self.create_test_objects() - objs = HashType.objects.filter(hashTypeId__gte=90000, hashTypeId__lte=91000, - ordering=['-hashTypeId']) - sorted_model_objs = sorted(model_objs, key=lambda x: x.hashTypeId, reverse=True) + objs = HashType.objects.filter(hashTypeId__gte=90000, hashTypeId__lte=91000).order_by('-hashTypeId') + sorted_model_objs = sorted(model_objs, key=lambda x: x.id, reverse=True) self.assertEqual( [x.id for x in sorted_model_objs], [x.id for x in objs]) def test_ordering_twice(self): model_objs = self.create_test_objects() - objs = HashType.objects.filter(hashTypeId__gte=90000, hashTypeId__lte=91000, - ordering=['-isSalted', '-hashTypeId']) - sorted_model_objs = sorted(model_objs, key=lambda x: (x.isSalted, x.hashTypeId), reverse=True) + objs = ( + HashType.objects.filter(hashTypeId__gte=90000, hashTypeId__lte=91000) + .order_by('-isSalted', '-hashTypeId') + ) + sorted_model_objs = sorted(model_objs, key=lambda x: (x.isSalted, x.id), reverse=True) self.assertEqual( [x.id for x in sorted_model_objs], [x.id for x in objs]) diff --git a/ci/apiv2/test_globalpermissiongroup.py b/ci/apiv2/test_globalpermissiongroup.py index de3b20233..ebe6e4741 100644 --- a/ci/apiv2/test_globalpermissiongroup.py +++ b/ci/apiv2/test_globalpermissiongroup.py @@ -29,5 +29,5 @@ def test_delete(self): def test_expand(self): model_obj = self.create_test_object() - expandables = ['user'] + expandables = ['userMembers'] self._test_expandables(model_obj, expandables) diff --git a/ci/apiv2/test_hash.py b/ci/apiv2/test_hash.py index 34f4c7e72..4eabf03da 100644 --- a/ci/apiv2/test_hash.py +++ b/ci/apiv2/test_hash.py @@ -1,4 +1,4 @@ -from hashtopolis import Hash, HashtopolisResponseError +from hashtopolis import Hash, HashtopolisResponseError, HashtopolisError from utils import BaseTest @@ -20,14 +20,14 @@ def test_patch(self): model_obj = self.create_test_object() with self.assertRaises(HashtopolisResponseError) as e: self._test_patch(model_obj, 'isCracked', True) - self.assertEqual(e.exception.status_code, 500) + self.assertEqual(e.exception.status_code, 405) def test_delete(self): # Deleting Hashes is not possible via API model_obj = self.create_test_object() with self.assertRaises(HashtopolisResponseError) as e: self._test_delete(model_obj) - self.assertEqual(e.exception.status_code, 500) + self.assertEqual(e.exception.status_code, 405) def test_expandables(self): model_obj = self.create_test_object() diff --git a/ci/apiv2/test_hashlist.py b/ci/apiv2/test_hashlist.py index 5ddd36d1a..d48567ffa 100644 --- a/ci/apiv2/test_hashlist.py +++ b/ci/apiv2/test_hashlist.py @@ -147,5 +147,5 @@ def test_helper_create_superhashlist(self): self.assertEqual(hashlist.format, 3) # Validate if created with provided hashlists - obj = Hashlist.objects.get(pk=hashlist.id, expand='hashlists') + obj = Hashlist.objects.prefetch_related('hashlists').get(pk=hashlist.id) self.assertListEqual(hashlists, obj.hashlists_set) diff --git a/ci/apiv2/test_http_methods.py b/ci/apiv2/test_http_methods.py index 7bdc790d9..d70e2d47b 100644 --- a/ci/apiv2/test_http_methods.py +++ b/ci/apiv2/test_http_methods.py @@ -11,11 +11,12 @@ def test_empty_body(self): conn.authenticate() headers = conn._headers - del headers['Content-Type'] - uri = conn._api_endpoint + conn._model_uri r = requests.get(uri, headers=headers) - values = r.json().get('values') + values = r.json().get('jsonapi') self.assertGreaterEqual(len(values), 1) + + # TODO: Test for non-empty body which should fail + # TODO: Test for invalid parameters \ No newline at end of file diff --git a/ci/apiv2/test_pagination.py b/ci/apiv2/test_pagination.py new file mode 100644 index 000000000..deb8af57a --- /dev/null +++ b/ci/apiv2/test_pagination.py @@ -0,0 +1,25 @@ +from hashtopolis import HashType +from utils import BaseTest + + +class PaginationTest(BaseTest): + model_class = HashType + + def pagination_test_helper(self, after, size): + objs = HashType.objects.paginate(size=size, after=after).get_pagination() + all_objs = list(HashType.objects.all()) + index = None + for idx, obj in enumerate(all_objs): + if obj.id > after: + index = idx + break + + self.assertIsNotNone(index) + self.assertEqual(objs, all_objs[index:index+size]) + pass + + def test_get_page(self): + # TODO test can be randomised to get more coverage + self.pagination_test_helper(1200, 25) + self.pagination_test_helper(2500, 50) + self.pagination_test_helper(20, 10) diff --git a/ci/apiv2/test_speed.py b/ci/apiv2/test_speed.py index 78b8e549d..2026e809f 100644 --- a/ci/apiv2/test_speed.py +++ b/ci/apiv2/test_speed.py @@ -18,14 +18,14 @@ def test_patch(self): model_obj = self.create_test_object() with self.assertRaises(HashtopolisResponseError) as e: self._test_patch(model_obj, 'speed', 1234) - self.assertEqual(e.exception.status_code, 500) + self.assertEqual(e.exception.status_code, 405) def test_delete(self): # Delete should not be possible via API model_obj = self.create_test_object() with self.assertRaises(HashtopolisResponseError) as e: self._test_delete(model_obj) - self.assertEqual(e.exception.status_code, 500) + self.assertEqual(e.exception.status_code, 405) def test_expandables(self): model_obj = self.create_test_object() diff --git a/ci/apiv2/test_supertask.py b/ci/apiv2/test_supertask.py index 1ea89eb97..2214e2a53 100644 --- a/ci/apiv2/test_supertask.py +++ b/ci/apiv2/test_supertask.py @@ -30,11 +30,11 @@ def test_new_pretasks(self): model_obj = self.create_test_object() # Quirk for expanding object to allow update to take place - work_obj = Supertask.objects.get(pk=model_obj.id, expand='pretasks') + work_obj = Supertask.objects.prefetch_related('pretasks').get(pk=model_obj.id) new_pretasks = [self.create_pretask() for i in range(2)] selected_pretasks = [work_obj.pretasks_set[0], new_pretasks[1]] work_obj.pretasks_set = selected_pretasks work_obj.save() - obj = Supertask.objects.get(pk=model_obj.id, expand='pretasks') + obj = Supertask.objects.prefetch_related('pretasks').get(pk=model_obj.id) self.assertListEqual(selected_pretasks, obj.pretasks_set) diff --git a/ci/apiv2/test_task.py b/ci/apiv2/test_task.py index ab3b9fb96..b58a4d7e5 100644 --- a/ci/apiv2/test_task.py +++ b/ci/apiv2/test_task.py @@ -73,7 +73,7 @@ def test_task_with_file(self): # Not part of default model fields, how-ever expanded field extra_payload = dict(files=[x.id for x in files]) task = self.create_task(hashlist, extra_payload=extra_payload) - obj = Task.objects.get(pk=task.id, expand='files') + obj = Task.objects.prefetch_related('files').get(pk=task.id) self.assertListEqual([x.id for x in files], [x.id for x in obj.files_set]) def test_task_update_priority(self): diff --git a/ci/apiv2/test_taskwrapper.py b/ci/apiv2/test_taskwrapper.py index 4eadc8d29..51421a40b 100644 --- a/ci/apiv2/test_taskwrapper.py +++ b/ci/apiv2/test_taskwrapper.py @@ -27,7 +27,7 @@ def test_patch_immutable(self): model_obj = self.create_test_object() with self.assertRaises(HashtopolisError) as e: self._test_patch(model_obj, 'taskType', 2) - self.assertEqual(e.exception.status_code, 500) + self.assertEqual(e.exception.status_code, 403) def test_delete(self): model_obj = self.create_test_object(delete=False) diff --git a/ci/apiv2/utils.py b/ci/apiv2/utils.py index 04bd33a89..53ed89601 100644 --- a/ci/apiv2/utils.py +++ b/ci/apiv2/utils.py @@ -57,7 +57,7 @@ def do_create_dummy_agent(): dummy_agent.update_information() # Validate automatically deleted when an test-agent claims the voucher - assert Voucher.objects.filter(_id=voucher.id) == [] + assert list(Voucher.objects.filter(_id=voucher.id)) == [] agent = Agent.objects.get(agentName=dummy_agent.name) return (dummy_agent, agent) @@ -369,7 +369,7 @@ def _test_delete(self, model_obj): def _test_expandables(self, model_obj, expandables): """ Generic test worker to test expandables""" # Retrieve object expanded and check if exists - obj = self.model_class.objects.get(pk=model_obj.id, expand=expandables) + obj = self.model_class.objects.prefetch_related(*expandables).get(pk=model_obj.id) self.assertIsNotNone(obj) for expandable in expandables: self.assertTrue(hasattr(obj, expandable) or hasattr(obj, f"{expandable}_set"), diff --git a/composer.json b/composer.json index 10277d800..31dbf3031 100644 --- a/composer.json +++ b/composer.json @@ -19,15 +19,16 @@ "require": { "php": "^7.4 || ^8.0", "ext-json": "*", + "ext-pdo": "*", "crell/api-problem": "^3.6", + "middlewares/encoder": "^2.1", "middlewares/negotiation": "^2.1", "monolog/monolog": "^2.8", "php-di/php-di": "^6.4", "slim/psr7": "^1.5", "slim/slim": "^4.10", "tuupola/slim-basic-auth": "^3.3", - "tuupola/slim-jwt-auth": "^3.6", - "ext-pdo" : "*" + "tuupola/slim-jwt-auth": "^3.6" }, "require-dev": { "jangregor/phpstan-prophecy": "^1.0.0", diff --git a/composer.lock b/composer.lock new file mode 100644 index 000000000..eb6982d8c --- /dev/null +++ b/composer.lock @@ -0,0 +1,4167 @@ +{ + "_readme": [ + "This file locks the dependencies of your project to a known state", + "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies", + "This file is @generated automatically" + ], + "content-hash": "2a07cc9c28bff6ab34aa2b4db3e30a69", + "packages": [ + { + "name": "crell/api-problem", + "version": "3.6.1", + "source": { + "type": "git", + "url": "https://github.com/Crell/ApiProblem.git", + "reference": "5acb0a8cc13ea740f631a60e5e73271c18e45803" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/Crell/ApiProblem/zipball/5acb0a8cc13ea740f631a60e5e73271c18e45803", + "reference": "5acb0a8cc13ea740f631a60e5e73271c18e45803", + "shasum": "" + }, + "require": { + "php": "^7.1 || ^8.0" + }, + "require-dev": { + "laminas/laminas-diactoros": "^2.0", + "phpstan/phpstan": "^1.3", + "phpunit/phpunit": "^7.0 || ^8.0 || ^9.0", + "psr/http-factory": "^1.0", + "psr/http-message": "1.*" + }, + "suggest": { + "psr/http-factory": "Common interfaces for PSR-7 HTTP message factories", + "psr/http-message": "Common interface for HTTP messages" + }, + "type": "library", + "extra": { + "branch-alias": { + "dev-master": "2.0.x-dev" + } + }, + "autoload": { + "psr-4": { + "Crell\\ApiProblem\\": "src/" + } + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "authors": [ + { + "name": "Larry Garfield", + "email": "larry@garfieldtech.com", + "homepage": "http://www.garfieldtech.com/" + } + ], + "description": "PHP wrapper for the api-problem IETF specification", + "homepage": "https://github.com/Crell/ApiProblem", + "keywords": [ + "api-problem", + "http", + "json", + "rest", + "xml" + ], + "support": { + "issues": "https://github.com/Crell/ApiProblem/issues", + "source": "https://github.com/Crell/ApiProblem/tree/3.6.1" + }, + "funding": [ + { + "url": "https://github.com/Crell", + "type": "github" + } + ], + "time": "2022-01-04T15:47:30+00:00" + }, + { + "name": "fig/http-message-util", + "version": "1.1.5", + "source": { + "type": "git", + "url": "https://github.com/php-fig/http-message-util.git", + "reference": "9d94dc0154230ac39e5bf89398b324a86f63f765" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/php-fig/http-message-util/zipball/9d94dc0154230ac39e5bf89398b324a86f63f765", + "reference": "9d94dc0154230ac39e5bf89398b324a86f63f765", + "shasum": "" + }, + "require": { + "php": "^5.3 || ^7.0 || ^8.0" + }, + "suggest": { + "psr/http-message": "The package containing the PSR-7 interfaces" + }, + "type": "library", + "extra": { + "branch-alias": { + "dev-master": "1.1.x-dev" + } + }, + "autoload": { + "psr-4": { + "Fig\\Http\\Message\\": "src/" + } + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "authors": [ + { + "name": "PHP-FIG", + "homepage": "https://www.php-fig.org/" + } + ], + "description": "Utility classes and constants for use with PSR-7 (psr/http-message)", + "keywords": [ + "http", + "http-message", + "psr", + "psr-7", + "request", + "response" + ], + "support": { + "issues": "https://github.com/php-fig/http-message-util/issues", + "source": "https://github.com/php-fig/http-message-util/tree/1.1.5" + }, + "time": "2020-11-24T22:02:12+00:00" + }, + { + "name": "firebase/php-jwt", + "version": "v5.5.1", + "source": { + "type": "git", + "url": "https://github.com/firebase/php-jwt.git", + "reference": "83b609028194aa042ea33b5af2d41a7427de80e6" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/firebase/php-jwt/zipball/83b609028194aa042ea33b5af2d41a7427de80e6", + "reference": "83b609028194aa042ea33b5af2d41a7427de80e6", + "shasum": "" + }, + "require": { + "php": ">=5.3.0" + }, + "require-dev": { + "phpunit/phpunit": ">=4.8 <=9" + }, + "suggest": { + "paragonie/sodium_compat": "Support EdDSA (Ed25519) signatures when libsodium is not present" + }, + "type": "library", + "autoload": { + "psr-4": { + "Firebase\\JWT\\": "src" + } + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "BSD-3-Clause" + ], + "authors": [ + { + "name": "Neuman Vong", + "email": "neuman+pear@twilio.com", + "role": "Developer" + }, + { + "name": "Anant Narayanan", + "email": "anant@php.net", + "role": "Developer" + } + ], + "description": "A simple library to encode and decode JSON Web Tokens (JWT) in PHP. Should conform to the current spec.", + "homepage": "https://github.com/firebase/php-jwt", + "keywords": [ + "jwt", + "php" + ], + "support": { + "issues": "https://github.com/firebase/php-jwt/issues", + "source": "https://github.com/firebase/php-jwt/tree/v5.5.1" + }, + "time": "2021-11-08T20:18:51+00:00" + }, + { + "name": "laravel/serializable-closure", + "version": "v1.3.4", + "source": { + "type": "git", + "url": "https://github.com/laravel/serializable-closure.git", + "reference": "61b87392d986dc49ad5ef64e75b1ff5fee24ef81" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/laravel/serializable-closure/zipball/61b87392d986dc49ad5ef64e75b1ff5fee24ef81", + "reference": "61b87392d986dc49ad5ef64e75b1ff5fee24ef81", + "shasum": "" + }, + "require": { + "php": "^7.3|^8.0" + }, + "require-dev": { + "illuminate/support": "^8.0|^9.0|^10.0|^11.0", + "nesbot/carbon": "^2.61|^3.0", + "pestphp/pest": "^1.21.3", + "phpstan/phpstan": "^1.8.2", + "symfony/var-dumper": "^5.4.11|^6.2.0|^7.0.0" + }, + "type": "library", + "extra": { + "branch-alias": { + "dev-master": "1.x-dev" + } + }, + "autoload": { + "psr-4": { + "Laravel\\SerializableClosure\\": "src/" + } + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "authors": [ + { + "name": "Taylor Otwell", + "email": "taylor@laravel.com" + }, + { + "name": "Nuno Maduro", + "email": "nuno@laravel.com" + } + ], + "description": "Laravel Serializable Closure provides an easy and secure way to serialize closures in PHP.", + "keywords": [ + "closure", + "laravel", + "serializable" + ], + "support": { + "issues": "https://github.com/laravel/serializable-closure/issues", + "source": "https://github.com/laravel/serializable-closure" + }, + "time": "2024-08-02T07:48:17+00:00" + }, + { + "name": "middlewares/encoder", + "version": "v2.1.1", + "source": { + "type": "git", + "url": "https://github.com/middlewares/encoder.git", + "reference": "6fd1744bcf88bec4e3dea0ca98ed6f900cc41ce0" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/middlewares/encoder/zipball/6fd1744bcf88bec4e3dea0ca98ed6f900cc41ce0", + "reference": "6fd1744bcf88bec4e3dea0ca98ed6f900cc41ce0", + "shasum": "" + }, + "require": { + "ext-zlib": "*", + "middlewares/utils": "^3.0", + "php": "^7.2 || ^8.0", + "psr/http-server-middleware": "^1.0" + }, + "require-dev": { + "friendsofphp/php-cs-fixer": "^2.0", + "laminas/laminas-diactoros": "^2.2", + "oscarotero/php-cs-fixer-config": "^1.0", + "phpstan/phpstan": "^0.12", + "phpunit/phpunit": "^8|^9", + "squizlabs/php_codesniffer": "^3.0" + }, + "type": "library", + "autoload": { + "psr-4": { + "Middlewares\\": "src/" + } + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "description": "Middleware to encode the response body to gzip or deflate", + "homepage": "https://github.com/middlewares/encoder", + "keywords": [ + "compression", + "deflate", + "encoding", + "gzip", + "http", + "middleware", + "psr-15", + "psr-7" + ], + "support": { + "issues": "https://github.com/middlewares/encoder/issues", + "source": "https://github.com/middlewares/encoder/tree/v2.1.1" + }, + "time": "2020-12-03T01:13:28+00:00" + }, + { + "name": "middlewares/negotiation", + "version": "v2.1.1", + "source": { + "type": "git", + "url": "https://github.com/middlewares/negotiation.git", + "reference": "d2d44ea744109216ef9569653c179b2005c77a85" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/middlewares/negotiation/zipball/d2d44ea744109216ef9569653c179b2005c77a85", + "reference": "d2d44ea744109216ef9569653c179b2005c77a85", + "shasum": "" + }, + "require": { + "middlewares/utils": "^3.0 || ^4.0", + "php": "^7.2 || ^8.0", + "psr/http-server-middleware": "^1.0", + "willdurand/negotiation": "^3.0" + }, + "require-dev": { + "friendsofphp/php-cs-fixer": "^2.0", + "laminas/laminas-diactoros": "^2.2", + "oscarotero/php-cs-fixer-config": "^1.0", + "phpstan/phpstan": "^0.12", + "phpunit/phpunit": "^8|^9|^10|^11", + "squizlabs/php_codesniffer": "^3.0" + }, + "type": "library", + "autoload": { + "psr-4": { + "Middlewares\\": "src/" + } + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "description": "Middleware to implement content negotiation", + "homepage": "https://github.com/middlewares/negotiation", + "keywords": [ + "content", + "encoding", + "http", + "language", + "middleware", + "negotiation", + "psr-15", + "psr-7", + "server" + ], + "support": { + "issues": "https://github.com/middlewares/negotiation/issues", + "source": "https://github.com/middlewares/negotiation/tree/v2.1.1" + }, + "time": "2024-03-24T14:24:30+00:00" + }, + { + "name": "middlewares/utils", + "version": "v3.3.0", + "source": { + "type": "git", + "url": "https://github.com/middlewares/utils.git", + "reference": "670b135ce0dbd040eadb025a9388f9bd617cc010" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/middlewares/utils/zipball/670b135ce0dbd040eadb025a9388f9bd617cc010", + "reference": "670b135ce0dbd040eadb025a9388f9bd617cc010", + "shasum": "" + }, + "require": { + "php": "^7.2 || ^8.0", + "psr/container": "^1.0 || ^2.0", + "psr/http-factory": "^1.0", + "psr/http-message": "^1.0", + "psr/http-server-middleware": "^1.0" + }, + "require-dev": { + "friendsofphp/php-cs-fixer": "^v2.16", + "guzzlehttp/psr7": "^2.0", + "laminas/laminas-diactoros": "^2.4", + "nyholm/psr7": "^1.0", + "oscarotero/php-cs-fixer-config": "^1.0", + "phpstan/phpstan": "^0.12", + "phpunit/phpunit": "^8|^9", + "slim/psr7": "^1.4", + "squizlabs/php_codesniffer": "^3.5", + "sunrise/http-message": "^1.0", + "sunrise/http-server-request": "^1.0", + "sunrise/stream": "^1.0.15", + "sunrise/uri": "^1.0.15" + }, + "type": "library", + "autoload": { + "psr-4": { + "Middlewares\\Utils\\": "src/" + } + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "description": "Common utils for PSR-15 middleware packages", + "homepage": "https://github.com/middlewares/utils", + "keywords": [ + "PSR-11", + "http", + "middleware", + "psr-15", + "psr-17", + "psr-7" + ], + "support": { + "issues": "https://github.com/middlewares/utils/issues", + "source": "https://github.com/middlewares/utils/tree/v3.3.0" + }, + "time": "2021-07-04T17:56:23+00:00" + }, + { + "name": "monolog/monolog", + "version": "2.9.3", + "source": { + "type": "git", + "url": "https://github.com/Seldaek/monolog.git", + "reference": "a30bfe2e142720dfa990d0a7e573997f5d884215" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/Seldaek/monolog/zipball/a30bfe2e142720dfa990d0a7e573997f5d884215", + "reference": "a30bfe2e142720dfa990d0a7e573997f5d884215", + "shasum": "" + }, + "require": { + "php": ">=7.2", + "psr/log": "^1.0.1 || ^2.0 || ^3.0" + }, + "provide": { + "psr/log-implementation": "1.0.0 || 2.0.0 || 3.0.0" + }, + "require-dev": { + "aws/aws-sdk-php": "^2.4.9 || ^3.0", + "doctrine/couchdb": "~1.0@dev", + "elasticsearch/elasticsearch": "^7 || ^8", + "ext-json": "*", + "graylog2/gelf-php": "^1.4.2 || ^2@dev", + "guzzlehttp/guzzle": "^7.4", + "guzzlehttp/psr7": "^2.2", + "mongodb/mongodb": "^1.8", + "php-amqplib/php-amqplib": "~2.4 || ^3", + "phpspec/prophecy": "^1.15", + "phpstan/phpstan": "^1.10", + "phpunit/phpunit": "^8.5.38 || ^9.6.19", + "predis/predis": "^1.1 || ^2.0", + "rollbar/rollbar": "^1.3 || ^2 || ^3", + "ruflin/elastica": "^7", + "swiftmailer/swiftmailer": "^5.3|^6.0", + "symfony/mailer": "^5.4 || ^6", + "symfony/mime": "^5.4 || ^6" + }, + "suggest": { + "aws/aws-sdk-php": "Allow sending log messages to AWS services like DynamoDB", + "doctrine/couchdb": "Allow sending log messages to a CouchDB server", + "elasticsearch/elasticsearch": "Allow sending log messages to an Elasticsearch server via official client", + "ext-amqp": "Allow sending log messages to an AMQP server (1.0+ required)", + "ext-curl": "Required to send log messages using the IFTTTHandler, the LogglyHandler, the SendGridHandler, the SlackWebhookHandler or the TelegramBotHandler", + "ext-mbstring": "Allow to work properly with unicode symbols", + "ext-mongodb": "Allow sending log messages to a MongoDB server (via driver)", + "ext-openssl": "Required to send log messages using SSL", + "ext-sockets": "Allow sending log messages to a Syslog server (via UDP driver)", + "graylog2/gelf-php": "Allow sending log messages to a GrayLog2 server", + "mongodb/mongodb": "Allow sending log messages to a MongoDB server (via library)", + "php-amqplib/php-amqplib": "Allow sending log messages to an AMQP server using php-amqplib", + "rollbar/rollbar": "Allow sending log messages to Rollbar", + "ruflin/elastica": "Allow sending log messages to an Elastic Search server" + }, + "type": "library", + "extra": { + "branch-alias": { + "dev-main": "2.x-dev" + } + }, + "autoload": { + "psr-4": { + "Monolog\\": "src/Monolog" + } + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "authors": [ + { + "name": "Jordi Boggiano", + "email": "j.boggiano@seld.be", + "homepage": "https://seld.be" + } + ], + "description": "Sends your logs to files, sockets, inboxes, databases and various web services", + "homepage": "https://github.com/Seldaek/monolog", + "keywords": [ + "log", + "logging", + "psr-3" + ], + "support": { + "issues": "https://github.com/Seldaek/monolog/issues", + "source": "https://github.com/Seldaek/monolog/tree/2.9.3" + }, + "funding": [ + { + "url": "https://github.com/Seldaek", + "type": "github" + }, + { + "url": "https://tidelift.com/funding/github/packagist/monolog/monolog", + "type": "tidelift" + } + ], + "time": "2024-04-12T20:52:51+00:00" + }, + { + "name": "nikic/fast-route", + "version": "v1.3.0", + "source": { + "type": "git", + "url": "https://github.com/nikic/FastRoute.git", + "reference": "181d480e08d9476e61381e04a71b34dc0432e812" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/nikic/FastRoute/zipball/181d480e08d9476e61381e04a71b34dc0432e812", + "reference": "181d480e08d9476e61381e04a71b34dc0432e812", + "shasum": "" + }, + "require": { + "php": ">=5.4.0" + }, + "require-dev": { + "phpunit/phpunit": "^4.8.35|~5.7" + }, + "type": "library", + "autoload": { + "files": [ + "src/functions.php" + ], + "psr-4": { + "FastRoute\\": "src/" + } + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "BSD-3-Clause" + ], + "authors": [ + { + "name": "Nikita Popov", + "email": "nikic@php.net" + } + ], + "description": "Fast request router for PHP", + "keywords": [ + "router", + "routing" + ], + "support": { + "issues": "https://github.com/nikic/FastRoute/issues", + "source": "https://github.com/nikic/FastRoute/tree/master" + }, + "time": "2018-02-13T20:26:39+00:00" + }, + { + "name": "php-di/invoker", + "version": "2.3.4", + "source": { + "type": "git", + "url": "https://github.com/PHP-DI/Invoker.git", + "reference": "33234b32dafa8eb69202f950a1fc92055ed76a86" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/PHP-DI/Invoker/zipball/33234b32dafa8eb69202f950a1fc92055ed76a86", + "reference": "33234b32dafa8eb69202f950a1fc92055ed76a86", + "shasum": "" + }, + "require": { + "php": ">=7.3", + "psr/container": "^1.0|^2.0" + }, + "require-dev": { + "athletic/athletic": "~0.1.8", + "mnapoli/hard-mode": "~0.3.0", + "phpunit/phpunit": "^9.0" + }, + "type": "library", + "autoload": { + "psr-4": { + "Invoker\\": "src/" + } + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "description": "Generic and extensible callable invoker", + "homepage": "https://github.com/PHP-DI/Invoker", + "keywords": [ + "callable", + "dependency", + "dependency-injection", + "injection", + "invoke", + "invoker" + ], + "support": { + "issues": "https://github.com/PHP-DI/Invoker/issues", + "source": "https://github.com/PHP-DI/Invoker/tree/2.3.4" + }, + "funding": [ + { + "url": "https://github.com/mnapoli", + "type": "github" + } + ], + "time": "2023-09-08T09:24:21+00:00" + }, + { + "name": "php-di/php-di", + "version": "6.4.0", + "source": { + "type": "git", + "url": "https://github.com/PHP-DI/PHP-DI.git", + "reference": "ae0f1b3b03d8b29dff81747063cbfd6276246cc4" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/PHP-DI/PHP-DI/zipball/ae0f1b3b03d8b29dff81747063cbfd6276246cc4", + "reference": "ae0f1b3b03d8b29dff81747063cbfd6276246cc4", + "shasum": "" + }, + "require": { + "laravel/serializable-closure": "^1.0", + "php": ">=7.4.0", + "php-di/invoker": "^2.0", + "php-di/phpdoc-reader": "^2.0.1", + "psr/container": "^1.0" + }, + "provide": { + "psr/container-implementation": "^1.0" + }, + "require-dev": { + "doctrine/annotations": "~1.10", + "friendsofphp/php-cs-fixer": "^2.4", + "mnapoli/phpunit-easymock": "^1.2", + "ocramius/proxy-manager": "^2.11.2", + "phpstan/phpstan": "^0.12", + "phpunit/phpunit": "^9.5" + }, + "suggest": { + "doctrine/annotations": "Install it if you want to use annotations (version ~1.2)", + "ocramius/proxy-manager": "Install it if you want to use lazy injection (version ~2.0)" + }, + "type": "library", + "autoload": { + "files": [ + "src/functions.php" + ], + "psr-4": { + "DI\\": "src/" + } + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "description": "The dependency injection container for humans", + "homepage": "https://php-di.org/", + "keywords": [ + "PSR-11", + "container", + "container-interop", + "dependency injection", + "di", + "ioc", + "psr11" + ], + "support": { + "issues": "https://github.com/PHP-DI/PHP-DI/issues", + "source": "https://github.com/PHP-DI/PHP-DI/tree/6.4.0" + }, + "funding": [ + { + "url": "https://github.com/mnapoli", + "type": "github" + }, + { + "url": "https://tidelift.com/funding/github/packagist/php-di/php-di", + "type": "tidelift" + } + ], + "time": "2022-04-09T16:46:38+00:00" + }, + { + "name": "php-di/phpdoc-reader", + "version": "2.2.1", + "source": { + "type": "git", + "url": "https://github.com/PHP-DI/PhpDocReader.git", + "reference": "66daff34cbd2627740ffec9469ffbac9f8c8185c" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/PHP-DI/PhpDocReader/zipball/66daff34cbd2627740ffec9469ffbac9f8c8185c", + "reference": "66daff34cbd2627740ffec9469ffbac9f8c8185c", + "shasum": "" + }, + "require": { + "php": ">=7.2.0" + }, + "require-dev": { + "mnapoli/hard-mode": "~0.3.0", + "phpunit/phpunit": "^8.5|^9.0" + }, + "type": "library", + "autoload": { + "psr-4": { + "PhpDocReader\\": "src/PhpDocReader" + } + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "description": "PhpDocReader parses @var and @param values in PHP docblocks (supports namespaced class names with the same resolution rules as PHP)", + "keywords": [ + "phpdoc", + "reflection" + ], + "support": { + "issues": "https://github.com/PHP-DI/PhpDocReader/issues", + "source": "https://github.com/PHP-DI/PhpDocReader/tree/2.2.1" + }, + "time": "2020-10-12T12:39:22+00:00" + }, + { + "name": "psr/container", + "version": "1.1.2", + "source": { + "type": "git", + "url": "https://github.com/php-fig/container.git", + "reference": "513e0666f7216c7459170d56df27dfcefe1689ea" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/php-fig/container/zipball/513e0666f7216c7459170d56df27dfcefe1689ea", + "reference": "513e0666f7216c7459170d56df27dfcefe1689ea", + "shasum": "" + }, + "require": { + "php": ">=7.4.0" + }, + "type": "library", + "autoload": { + "psr-4": { + "Psr\\Container\\": "src/" + } + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "authors": [ + { + "name": "PHP-FIG", + "homepage": "https://www.php-fig.org/" + } + ], + "description": "Common Container Interface (PHP FIG PSR-11)", + "homepage": "https://github.com/php-fig/container", + "keywords": [ + "PSR-11", + "container", + "container-interface", + "container-interop", + "psr" + ], + "support": { + "issues": "https://github.com/php-fig/container/issues", + "source": "https://github.com/php-fig/container/tree/1.1.2" + }, + "time": "2021-11-05T16:50:12+00:00" + }, + { + "name": "psr/http-factory", + "version": "1.1.0", + "source": { + "type": "git", + "url": "https://github.com/php-fig/http-factory.git", + "reference": "2b4765fddfe3b508ac62f829e852b1501d3f6e8a" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/php-fig/http-factory/zipball/2b4765fddfe3b508ac62f829e852b1501d3f6e8a", + "reference": "2b4765fddfe3b508ac62f829e852b1501d3f6e8a", + "shasum": "" + }, + "require": { + "php": ">=7.1", + "psr/http-message": "^1.0 || ^2.0" + }, + "type": "library", + "extra": { + "branch-alias": { + "dev-master": "1.0.x-dev" + } + }, + "autoload": { + "psr-4": { + "Psr\\Http\\Message\\": "src/" + } + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "authors": [ + { + "name": "PHP-FIG", + "homepage": "https://www.php-fig.org/" + } + ], + "description": "PSR-17: Common interfaces for PSR-7 HTTP message factories", + "keywords": [ + "factory", + "http", + "message", + "psr", + "psr-17", + "psr-7", + "request", + "response" + ], + "support": { + "source": "https://github.com/php-fig/http-factory" + }, + "time": "2024-04-15T12:06:14+00:00" + }, + { + "name": "psr/http-message", + "version": "1.1", + "source": { + "type": "git", + "url": "https://github.com/php-fig/http-message.git", + "reference": "cb6ce4845ce34a8ad9e68117c10ee90a29919eba" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/php-fig/http-message/zipball/cb6ce4845ce34a8ad9e68117c10ee90a29919eba", + "reference": "cb6ce4845ce34a8ad9e68117c10ee90a29919eba", + "shasum": "" + }, + "require": { + "php": "^7.2 || ^8.0" + }, + "type": "library", + "extra": { + "branch-alias": { + "dev-master": "1.1.x-dev" + } + }, + "autoload": { + "psr-4": { + "Psr\\Http\\Message\\": "src/" + } + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "authors": [ + { + "name": "PHP-FIG", + "homepage": "http://www.php-fig.org/" + } + ], + "description": "Common interface for HTTP messages", + "homepage": "https://github.com/php-fig/http-message", + "keywords": [ + "http", + "http-message", + "psr", + "psr-7", + "request", + "response" + ], + "support": { + "source": "https://github.com/php-fig/http-message/tree/1.1" + }, + "time": "2023-04-04T09:50:52+00:00" + }, + { + "name": "psr/http-server-handler", + "version": "1.0.2", + "source": { + "type": "git", + "url": "https://github.com/php-fig/http-server-handler.git", + "reference": "84c4fb66179be4caaf8e97bd239203245302e7d4" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/php-fig/http-server-handler/zipball/84c4fb66179be4caaf8e97bd239203245302e7d4", + "reference": "84c4fb66179be4caaf8e97bd239203245302e7d4", + "shasum": "" + }, + "require": { + "php": ">=7.0", + "psr/http-message": "^1.0 || ^2.0" + }, + "type": "library", + "extra": { + "branch-alias": { + "dev-master": "1.0.x-dev" + } + }, + "autoload": { + "psr-4": { + "Psr\\Http\\Server\\": "src/" + } + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "authors": [ + { + "name": "PHP-FIG", + "homepage": "https://www.php-fig.org/" + } + ], + "description": "Common interface for HTTP server-side request handler", + "keywords": [ + "handler", + "http", + "http-interop", + "psr", + "psr-15", + "psr-7", + "request", + "response", + "server" + ], + "support": { + "source": "https://github.com/php-fig/http-server-handler/tree/1.0.2" + }, + "time": "2023-04-10T20:06:20+00:00" + }, + { + "name": "psr/http-server-middleware", + "version": "1.0.2", + "source": { + "type": "git", + "url": "https://github.com/php-fig/http-server-middleware.git", + "reference": "c1481f747daaa6a0782775cd6a8c26a1bf4a3829" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/php-fig/http-server-middleware/zipball/c1481f747daaa6a0782775cd6a8c26a1bf4a3829", + "reference": "c1481f747daaa6a0782775cd6a8c26a1bf4a3829", + "shasum": "" + }, + "require": { + "php": ">=7.0", + "psr/http-message": "^1.0 || ^2.0", + "psr/http-server-handler": "^1.0" + }, + "type": "library", + "extra": { + "branch-alias": { + "dev-master": "1.0.x-dev" + } + }, + "autoload": { + "psr-4": { + "Psr\\Http\\Server\\": "src/" + } + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "authors": [ + { + "name": "PHP-FIG", + "homepage": "https://www.php-fig.org/" + } + ], + "description": "Common interface for HTTP server-side middleware", + "keywords": [ + "http", + "http-interop", + "middleware", + "psr", + "psr-15", + "psr-7", + "request", + "response" + ], + "support": { + "issues": "https://github.com/php-fig/http-server-middleware/issues", + "source": "https://github.com/php-fig/http-server-middleware/tree/1.0.2" + }, + "time": "2023-04-11T06:14:47+00:00" + }, + { + "name": "psr/log", + "version": "3.0.2", + "source": { + "type": "git", + "url": "https://github.com/php-fig/log.git", + "reference": "f16e1d5863e37f8d8c2a01719f5b34baa2b714d3" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/php-fig/log/zipball/f16e1d5863e37f8d8c2a01719f5b34baa2b714d3", + "reference": "f16e1d5863e37f8d8c2a01719f5b34baa2b714d3", + "shasum": "" + }, + "require": { + "php": ">=8.0.0" + }, + "type": "library", + "extra": { + "branch-alias": { + "dev-master": "3.x-dev" + } + }, + "autoload": { + "psr-4": { + "Psr\\Log\\": "src" + } + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "authors": [ + { + "name": "PHP-FIG", + "homepage": "https://www.php-fig.org/" + } + ], + "description": "Common interface for logging libraries", + "homepage": "https://github.com/php-fig/log", + "keywords": [ + "log", + "psr", + "psr-3" + ], + "support": { + "source": "https://github.com/php-fig/log/tree/3.0.2" + }, + "time": "2024-09-11T13:17:53+00:00" + }, + { + "name": "ralouphie/getallheaders", + "version": "3.0.3", + "source": { + "type": "git", + "url": "https://github.com/ralouphie/getallheaders.git", + "reference": "120b605dfeb996808c31b6477290a714d356e822" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/ralouphie/getallheaders/zipball/120b605dfeb996808c31b6477290a714d356e822", + "reference": "120b605dfeb996808c31b6477290a714d356e822", + "shasum": "" + }, + "require": { + "php": ">=5.6" + }, + "require-dev": { + "php-coveralls/php-coveralls": "^2.1", + "phpunit/phpunit": "^5 || ^6.5" + }, + "type": "library", + "autoload": { + "files": [ + "src/getallheaders.php" + ] + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "authors": [ + { + "name": "Ralph Khattar", + "email": "ralph.khattar@gmail.com" + } + ], + "description": "A polyfill for getallheaders.", + "support": { + "issues": "https://github.com/ralouphie/getallheaders/issues", + "source": "https://github.com/ralouphie/getallheaders/tree/develop" + }, + "time": "2019-03-08T08:55:37+00:00" + }, + { + "name": "slim/psr7", + "version": "1.7.0", + "source": { + "type": "git", + "url": "https://github.com/slimphp/Slim-Psr7.git", + "reference": "753e9646def5ff4db1a06e5cf4ef539bfd30f467" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/slimphp/Slim-Psr7/zipball/753e9646def5ff4db1a06e5cf4ef539bfd30f467", + "reference": "753e9646def5ff4db1a06e5cf4ef539bfd30f467", + "shasum": "" + }, + "require": { + "fig/http-message-util": "^1.1.5", + "php": "^8.0", + "psr/http-factory": "^1.1", + "psr/http-message": "^1.0 || ^2.0", + "ralouphie/getallheaders": "^3.0", + "symfony/polyfill-php80": "^1.29" + }, + "provide": { + "psr/http-factory-implementation": "^1.0", + "psr/http-message-implementation": "^1.0 || ^2.0" + }, + "require-dev": { + "adriansuter/php-autoload-override": "^1.4", + "ext-json": "*", + "http-interop/http-factory-tests": "^1.1.0", + "php-http/psr7-integration-tests": "1.3.0", + "phpspec/prophecy": "^1.19", + "phpspec/prophecy-phpunit": "^2.2", + "phpstan/phpstan": "^1.11", + "phpunit/phpunit": "^9.6", + "squizlabs/php_codesniffer": "^3.10" + }, + "type": "library", + "autoload": { + "psr-4": { + "Slim\\Psr7\\": "src" + } + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "authors": [ + { + "name": "Josh Lockhart", + "email": "hello@joshlockhart.com", + "homepage": "http://joshlockhart.com" + }, + { + "name": "Andrew Smith", + "email": "a.smith@silentworks.co.uk", + "homepage": "http://silentworks.co.uk" + }, + { + "name": "Rob Allen", + "email": "rob@akrabat.com", + "homepage": "http://akrabat.com" + }, + { + "name": "Pierre Berube", + "email": "pierre@lgse.com", + "homepage": "http://www.lgse.com" + } + ], + "description": "Strict PSR-7 implementation", + "homepage": "https://www.slimframework.com", + "keywords": [ + "http", + "psr-7", + "psr7" + ], + "support": { + "issues": "https://github.com/slimphp/Slim-Psr7/issues", + "source": "https://github.com/slimphp/Slim-Psr7/tree/1.7.0" + }, + "time": "2024-06-08T14:48:17+00:00" + }, + { + "name": "slim/slim", + "version": "4.14.0", + "source": { + "type": "git", + "url": "https://github.com/slimphp/Slim.git", + "reference": "5943393b88716eb9e82c4161caa956af63423913" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/slimphp/Slim/zipball/5943393b88716eb9e82c4161caa956af63423913", + "reference": "5943393b88716eb9e82c4161caa956af63423913", + "shasum": "" + }, + "require": { + "ext-json": "*", + "nikic/fast-route": "^1.3", + "php": "^7.4 || ^8.0", + "psr/container": "^1.0 || ^2.0", + "psr/http-factory": "^1.1", + "psr/http-message": "^1.1 || ^2.0", + "psr/http-server-handler": "^1.0", + "psr/http-server-middleware": "^1.0", + "psr/log": "^1.1 || ^2.0 || ^3.0" + }, + "require-dev": { + "adriansuter/php-autoload-override": "^1.4", + "ext-simplexml": "*", + "guzzlehttp/psr7": "^2.6", + "httpsoft/http-message": "^1.1", + "httpsoft/http-server-request": "^1.1", + "laminas/laminas-diactoros": "^2.17 || ^3", + "nyholm/psr7": "^1.8", + "nyholm/psr7-server": "^1.1", + "phpspec/prophecy": "^1.19", + "phpspec/prophecy-phpunit": "^2.1", + "phpstan/phpstan": "^1.11", + "phpunit/phpunit": "^9.6", + "slim/http": "^1.3", + "slim/psr7": "^1.6", + "squizlabs/php_codesniffer": "^3.10", + "vimeo/psalm": "^5.24" + }, + "suggest": { + "ext-simplexml": "Needed to support XML format in BodyParsingMiddleware", + "ext-xml": "Needed to support XML format in BodyParsingMiddleware", + "php-di/php-di": "PHP-DI is the recommended container library to be used with Slim", + "slim/psr7": "Slim PSR-7 implementation. See https://www.slimframework.com/docs/v4/start/installation.html for more information." + }, + "type": "library", + "autoload": { + "psr-4": { + "Slim\\": "Slim" + } + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "authors": [ + { + "name": "Josh Lockhart", + "email": "hello@joshlockhart.com", + "homepage": "https://joshlockhart.com" + }, + { + "name": "Andrew Smith", + "email": "a.smith@silentworks.co.uk", + "homepage": "http://silentworks.co.uk" + }, + { + "name": "Rob Allen", + "email": "rob@akrabat.com", + "homepage": "http://akrabat.com" + }, + { + "name": "Pierre Berube", + "email": "pierre@lgse.com", + "homepage": "http://www.lgse.com" + }, + { + "name": "Gabriel Manricks", + "email": "gmanricks@me.com", + "homepage": "http://gabrielmanricks.com" + } + ], + "description": "Slim is a PHP micro framework that helps you quickly write simple yet powerful web applications and APIs", + "homepage": "https://www.slimframework.com", + "keywords": [ + "api", + "framework", + "micro", + "router" + ], + "support": { + "docs": "https://www.slimframework.com/docs/v4/", + "forum": "https://discourse.slimframework.com/", + "irc": "irc://irc.freenode.net:6667/slimphp", + "issues": "https://github.com/slimphp/Slim/issues", + "rss": "https://www.slimframework.com/blog/feed.rss", + "slack": "https://slimphp.slack.com/", + "source": "https://github.com/slimphp/Slim", + "wiki": "https://github.com/slimphp/Slim/wiki" + }, + "funding": [ + { + "url": "https://opencollective.com/slimphp", + "type": "open_collective" + }, + { + "url": "https://tidelift.com/funding/github/packagist/slim/slim", + "type": "tidelift" + } + ], + "time": "2024-06-13T08:54:48+00:00" + }, + { + "name": "symfony/polyfill-php80", + "version": "v1.31.0", + "source": { + "type": "git", + "url": "https://github.com/symfony/polyfill-php80.git", + "reference": "60328e362d4c2c802a54fcbf04f9d3fb892b4cf8" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/symfony/polyfill-php80/zipball/60328e362d4c2c802a54fcbf04f9d3fb892b4cf8", + "reference": "60328e362d4c2c802a54fcbf04f9d3fb892b4cf8", + "shasum": "" + }, + "require": { + "php": ">=7.2" + }, + "type": "library", + "extra": { + "thanks": { + "name": "symfony/polyfill", + "url": "https://github.com/symfony/polyfill" + } + }, + "autoload": { + "files": [ + "bootstrap.php" + ], + "psr-4": { + "Symfony\\Polyfill\\Php80\\": "" + }, + "classmap": [ + "Resources/stubs" + ] + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "authors": [ + { + "name": "Ion Bazan", + "email": "ion.bazan@gmail.com" + }, + { + "name": "Nicolas Grekas", + "email": "p@tchwork.com" + }, + { + "name": "Symfony Community", + "homepage": "https://symfony.com/contributors" + } + ], + "description": "Symfony polyfill backporting some PHP 8.0+ features to lower PHP versions", + "homepage": "https://symfony.com", + "keywords": [ + "compatibility", + "polyfill", + "portable", + "shim" + ], + "support": { + "source": "https://github.com/symfony/polyfill-php80/tree/v1.31.0" + }, + "funding": [ + { + "url": "https://symfony.com/sponsor", + "type": "custom" + }, + { + "url": "https://github.com/fabpot", + "type": "github" + }, + { + "url": "https://tidelift.com/funding/github/packagist/symfony/symfony", + "type": "tidelift" + } + ], + "time": "2024-09-09T11:45:10+00:00" + }, + { + "name": "tuupola/callable-handler", + "version": "1.1.0", + "source": { + "type": "git", + "url": "https://github.com/tuupola/callable-handler.git", + "reference": "0bc7b88630ca753de9aba8f411046856f5ca6f8c" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/tuupola/callable-handler/zipball/0bc7b88630ca753de9aba8f411046856f5ca6f8c", + "reference": "0bc7b88630ca753de9aba8f411046856f5ca6f8c", + "shasum": "" + }, + "require": { + "php": "^7.1|^8.0", + "psr/http-server-middleware": "^1.0" + }, + "require-dev": { + "overtrue/phplint": "^1.0", + "phpunit/phpunit": "^7.0|^8.0|^9.0", + "squizlabs/php_codesniffer": "^3.2", + "tuupola/http-factory": "^0.4.0|^1.0", + "zendframework/zend-diactoros": "^1.6.0|^2.0" + }, + "type": "library", + "autoload": { + "psr-4": { + "Tuupola\\Middleware\\": "src" + } + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "authors": [ + { + "name": "Mika Tuupola", + "email": "tuupola@appelsiini.net", + "homepage": "https://appelsiini.net/", + "role": "Developer" + } + ], + "description": "Compatibility layer for PSR-7 double pass and PSR-15 middlewares.", + "homepage": "https://github.com/tuupola/callable-handler", + "keywords": [ + "middleware", + "psr-15", + "psr-7" + ], + "support": { + "issues": "https://github.com/tuupola/callable-handler/issues", + "source": "https://github.com/tuupola/callable-handler/tree/1.1.0" + }, + "funding": [ + { + "url": "https://github.com/tuupola", + "type": "github" + } + ], + "time": "2020-09-09T08:31:54+00:00" + }, + { + "name": "tuupola/http-factory", + "version": "1.4.0", + "source": { + "type": "git", + "url": "https://github.com/tuupola/http-factory.git", + "reference": "ae3f8fbdd31cf2f1bbe920b38963c5e4d1e9c454" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/tuupola/http-factory/zipball/ae3f8fbdd31cf2f1bbe920b38963c5e4d1e9c454", + "reference": "ae3f8fbdd31cf2f1bbe920b38963c5e4d1e9c454", + "shasum": "" + }, + "require": { + "php": "^7.1|^8.0", + "psr/http-factory": "^1.0" + }, + "conflict": { + "nyholm/psr7": "<1.0" + }, + "provide": { + "psr/http-factory-implementation": "^1.0" + }, + "require-dev": { + "http-interop/http-factory-tests": "^0.9.0", + "overtrue/phplint": "^3.0", + "phpunit/phpunit": "^7.0|^8.0|^9.0", + "squizlabs/php_codesniffer": "^3.0" + }, + "type": "library", + "autoload": { + "psr-4": { + "Tuupola\\Http\\Factory\\": "src" + } + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "authors": [ + { + "name": "Mika Tuupola", + "email": "tuupola@appelsiini.net", + "homepage": "https://appelsiini.net/", + "role": "Developer" + } + ], + "description": "Lightweight autodiscovering PSR-17 HTTP factories", + "homepage": "https://github.com/tuupola/http-factory", + "keywords": [ + "http", + "psr-17", + "psr-7" + ], + "support": { + "issues": "https://github.com/tuupola/http-factory/issues", + "source": "https://github.com/tuupola/http-factory/tree/1.4.0" + }, + "funding": [ + { + "url": "https://github.com/tuupola", + "type": "github" + } + ], + "time": "2021-09-14T12:46:25+00:00" + }, + { + "name": "tuupola/slim-basic-auth", + "version": "3.3.1", + "source": { + "type": "git", + "url": "https://github.com/tuupola/slim-basic-auth.git", + "reference": "18e49c18f5648b05bb6169d166ccb6f797f0fbc4" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/tuupola/slim-basic-auth/zipball/18e49c18f5648b05bb6169d166ccb6f797f0fbc4", + "reference": "18e49c18f5648b05bb6169d166ccb6f797f0fbc4", + "shasum": "" + }, + "require": { + "php": "^7.1|^8.0", + "psr/http-message": "^1.0.1", + "psr/http-server-middleware": "^1.0", + "tuupola/callable-handler": "^0.3.0|^0.4.0|^1.0", + "tuupola/http-factory": "^0.4.0|^1.0.2" + }, + "require-dev": { + "equip/dispatch": "^2.0", + "overtrue/phplint": "^2.0.2", + "phpstan/phpstan": "^0.12.43", + "phpunit/phpunit": "^7.0|^8.0|^9.0", + "squizlabs/php_codesniffer": "^3.3.2", + "symfony/process": "^3.3", + "zendframework/zend-diactoros": "^1.3|^2.0" + }, + "type": "library", + "autoload": { + "psr-4": { + "Tuupola\\Middleware\\": "src" + } + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "authors": [ + { + "name": "Mika Tuupola", + "email": "tuupola@appelsiini.net", + "homepage": "https://appelsiini.net/" + } + ], + "description": "PSR-7 and PSR-15 HTTP Basic Authentication Middleware", + "homepage": "https://appelsiini.net/projects/slim-basic-auth", + "keywords": [ + "auth", + "middleware", + "psr-15", + "psr-7" + ], + "support": { + "issues": "https://github.com/tuupola/slim-basic-auth/issues", + "source": "https://github.com/tuupola/slim-basic-auth/tree/3.3.1" + }, + "funding": [ + { + "url": "https://github.com/tuupola", + "type": "github" + } + ], + "time": "2020-10-28T15:22:12+00:00" + }, + { + "name": "tuupola/slim-jwt-auth", + "version": "3.8.0", + "source": { + "type": "git", + "url": "https://github.com/tuupola/slim-jwt-auth.git", + "reference": "7829d4482034e9eb5e051f3a1619db0c704ba7e7" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/tuupola/slim-jwt-auth/zipball/7829d4482034e9eb5e051f3a1619db0c704ba7e7", + "reference": "7829d4482034e9eb5e051f3a1619db0c704ba7e7", + "shasum": "" + }, + "require": { + "firebase/php-jwt": "^3.0|^4.0|^5.0", + "php": "^7.4|^8.0", + "psr/http-message": "^1.0|^2.0", + "psr/http-server-middleware": "^1.0", + "psr/log": "^1.0|^2.0|^3.0", + "tuupola/callable-handler": "^1.0", + "tuupola/http-factory": "^1.3" + }, + "require-dev": { + "equip/dispatch": "^2.0", + "laminas/laminas-diactoros": "^2.0|^3.0", + "overtrue/phplint": "^1.0", + "phpstan/phpstan": "^1.10", + "phpunit/phpunit": "^7.0|^8.5.30|^9.0", + "squizlabs/php_codesniffer": "^3.7" + }, + "type": "library", + "extra": { + "branch-alias": { + "dev-3.x": "3.0.x-dev" + } + }, + "autoload": { + "psr-4": { + "Tuupola\\Middleware\\": "src" + } + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "authors": [ + { + "name": "Mika Tuupola", + "email": "tuupola@appelsiini.net", + "homepage": "https://appelsiini.net/", + "role": "Developer" + } + ], + "description": "PSR-7 and PSR-15 JWT Authentication Middleware", + "homepage": "https://github.com/tuupola/slim-jwt-auth", + "keywords": [ + "auth", + "json", + "jwt", + "middleware", + "psr-15", + "psr-7" + ], + "support": { + "issues": "https://github.com/tuupola/slim-jwt-auth/issues", + "source": "https://github.com/tuupola/slim-jwt-auth/tree/3.8.0" + }, + "abandoned": "jimtools/jwt-auth", + "time": "2023-10-20T09:51:26+00:00" + }, + { + "name": "willdurand/negotiation", + "version": "3.1.0", + "source": { + "type": "git", + "url": "https://github.com/willdurand/Negotiation.git", + "reference": "68e9ea0553ef6e2ee8db5c1d98829f111e623ec2" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/willdurand/Negotiation/zipball/68e9ea0553ef6e2ee8db5c1d98829f111e623ec2", + "reference": "68e9ea0553ef6e2ee8db5c1d98829f111e623ec2", + "shasum": "" + }, + "require": { + "php": ">=7.1.0" + }, + "require-dev": { + "symfony/phpunit-bridge": "^5.0" + }, + "type": "library", + "extra": { + "branch-alias": { + "dev-master": "3.0-dev" + } + }, + "autoload": { + "psr-4": { + "Negotiation\\": "src/Negotiation" + } + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "authors": [ + { + "name": "William Durand", + "email": "will+git@drnd.me" + } + ], + "description": "Content Negotiation tools for PHP provided as a standalone library.", + "homepage": "http://williamdurand.fr/Negotiation/", + "keywords": [ + "accept", + "content", + "format", + "header", + "negotiation" + ], + "support": { + "issues": "https://github.com/willdurand/Negotiation/issues", + "source": "https://github.com/willdurand/Negotiation/tree/3.1.0" + }, + "time": "2022-01-30T20:08:53+00:00" + } + ], + "packages-dev": [ + { + "name": "doctrine/deprecations", + "version": "1.1.3", + "source": { + "type": "git", + "url": "https://github.com/doctrine/deprecations.git", + "reference": "dfbaa3c2d2e9a9df1118213f3b8b0c597bb99fab" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/doctrine/deprecations/zipball/dfbaa3c2d2e9a9df1118213f3b8b0c597bb99fab", + "reference": "dfbaa3c2d2e9a9df1118213f3b8b0c597bb99fab", + "shasum": "" + }, + "require": { + "php": "^7.1 || ^8.0" + }, + "require-dev": { + "doctrine/coding-standard": "^9", + "phpstan/phpstan": "1.4.10 || 1.10.15", + "phpstan/phpstan-phpunit": "^1.0", + "phpunit/phpunit": "^7.5 || ^8.5 || ^9.5", + "psalm/plugin-phpunit": "0.18.4", + "psr/log": "^1 || ^2 || ^3", + "vimeo/psalm": "4.30.0 || 5.12.0" + }, + "suggest": { + "psr/log": "Allows logging deprecations via PSR-3 logger implementation" + }, + "type": "library", + "autoload": { + "psr-4": { + "Doctrine\\Deprecations\\": "lib/Doctrine/Deprecations" + } + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "description": "A small layer on top of trigger_error(E_USER_DEPRECATED) or PSR-3 logging with options to disable all deprecations or selectively for packages.", + "homepage": "https://www.doctrine-project.org/", + "support": { + "issues": "https://github.com/doctrine/deprecations/issues", + "source": "https://github.com/doctrine/deprecations/tree/1.1.3" + }, + "time": "2024-01-30T19:34:25+00:00" + }, + { + "name": "doctrine/instantiator", + "version": "2.0.0", + "source": { + "type": "git", + "url": "https://github.com/doctrine/instantiator.git", + "reference": "c6222283fa3f4ac679f8b9ced9a4e23f163e80d0" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/doctrine/instantiator/zipball/c6222283fa3f4ac679f8b9ced9a4e23f163e80d0", + "reference": "c6222283fa3f4ac679f8b9ced9a4e23f163e80d0", + "shasum": "" + }, + "require": { + "php": "^8.1" + }, + "require-dev": { + "doctrine/coding-standard": "^11", + "ext-pdo": "*", + "ext-phar": "*", + "phpbench/phpbench": "^1.2", + "phpstan/phpstan": "^1.9.4", + "phpstan/phpstan-phpunit": "^1.3", + "phpunit/phpunit": "^9.5.27", + "vimeo/psalm": "^5.4" + }, + "type": "library", + "autoload": { + "psr-4": { + "Doctrine\\Instantiator\\": "src/Doctrine/Instantiator/" + } + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "authors": [ + { + "name": "Marco Pivetta", + "email": "ocramius@gmail.com", + "homepage": "https://ocramius.github.io/" + } + ], + "description": "A small, lightweight utility to instantiate objects in PHP without invoking their constructors", + "homepage": "https://www.doctrine-project.org/projects/instantiator.html", + "keywords": [ + "constructor", + "instantiate" + ], + "support": { + "issues": "https://github.com/doctrine/instantiator/issues", + "source": "https://github.com/doctrine/instantiator/tree/2.0.0" + }, + "funding": [ + { + "url": "https://www.doctrine-project.org/sponsorship.html", + "type": "custom" + }, + { + "url": "https://www.patreon.com/phpdoctrine", + "type": "patreon" + }, + { + "url": "https://tidelift.com/funding/github/packagist/doctrine%2Finstantiator", + "type": "tidelift" + } + ], + "time": "2022-12-30T00:23:10+00:00" + }, + { + "name": "jangregor/phpstan-prophecy", + "version": "1.0.2", + "source": { + "type": "git", + "url": "https://github.com/Jan0707/phpstan-prophecy.git", + "reference": "5ee56c7db1d58f0578c82a35e3c1befe840e85a9" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/Jan0707/phpstan-prophecy/zipball/5ee56c7db1d58f0578c82a35e3c1befe840e85a9", + "reference": "5ee56c7db1d58f0578c82a35e3c1befe840e85a9", + "shasum": "" + }, + "require": { + "php": "^7.1 || ^8.0", + "phpstan/phpstan": "^1.0.0" + }, + "conflict": { + "phpspec/prophecy": "<1.7.0 || >=2.0.0", + "phpunit/phpunit": "<6.0.0 || >=12.0.0" + }, + "require-dev": { + "ergebnis/composer-normalize": "^2.1.1", + "ergebnis/license": "^1.0.0", + "ergebnis/php-cs-fixer-config": "~2.2.0", + "phpspec/prophecy": "^1.7.0", + "phpunit/phpunit": "^6.0.0 || ^7.0.0 || ^8.0.0 || ^9.0.0" + }, + "type": "phpstan-extension", + "extra": { + "phpstan": { + "includes": [ + "extension.neon" + ] + } + }, + "autoload": { + "psr-4": { + "JanGregor\\Prophecy\\": "src/" + } + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "authors": [ + { + "name": "Jan Gregor Emge-Triebel", + "email": "jan@jangregor.me" + } + ], + "description": "Provides a phpstan/phpstan extension for phpspec/prophecy", + "support": { + "issues": "https://github.com/Jan0707/phpstan-prophecy/issues", + "source": "https://github.com/Jan0707/phpstan-prophecy/tree/1.0.2" + }, + "time": "2024-04-03T08:15:54+00:00" + }, + { + "name": "myclabs/deep-copy", + "version": "1.12.0", + "source": { + "type": "git", + "url": "https://github.com/myclabs/DeepCopy.git", + "reference": "3a6b9a42cd8f8771bd4295d13e1423fa7f3d942c" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/myclabs/DeepCopy/zipball/3a6b9a42cd8f8771bd4295d13e1423fa7f3d942c", + "reference": "3a6b9a42cd8f8771bd4295d13e1423fa7f3d942c", + "shasum": "" + }, + "require": { + "php": "^7.1 || ^8.0" + }, + "conflict": { + "doctrine/collections": "<1.6.8", + "doctrine/common": "<2.13.3 || >=3 <3.2.2" + }, + "require-dev": { + "doctrine/collections": "^1.6.8", + "doctrine/common": "^2.13.3 || ^3.2.2", + "phpspec/prophecy": "^1.10", + "phpunit/phpunit": "^7.5.20 || ^8.5.23 || ^9.5.13" + }, + "type": "library", + "autoload": { + "files": [ + "src/DeepCopy/deep_copy.php" + ], + "psr-4": { + "DeepCopy\\": "src/DeepCopy/" + } + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "description": "Create deep copies (clones) of your objects", + "keywords": [ + "clone", + "copy", + "duplicate", + "object", + "object graph" + ], + "support": { + "issues": "https://github.com/myclabs/DeepCopy/issues", + "source": "https://github.com/myclabs/DeepCopy/tree/1.12.0" + }, + "funding": [ + { + "url": "https://tidelift.com/funding/github/packagist/myclabs/deep-copy", + "type": "tidelift" + } + ], + "time": "2024-06-12T14:39:25+00:00" + }, + { + "name": "nikic/php-parser", + "version": "v5.2.0", + "source": { + "type": "git", + "url": "https://github.com/nikic/PHP-Parser.git", + "reference": "23c79fbbfb725fb92af9bcf41065c8e9a0d49ddb" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/nikic/PHP-Parser/zipball/23c79fbbfb725fb92af9bcf41065c8e9a0d49ddb", + "reference": "23c79fbbfb725fb92af9bcf41065c8e9a0d49ddb", + "shasum": "" + }, + "require": { + "ext-ctype": "*", + "ext-json": "*", + "ext-tokenizer": "*", + "php": ">=7.4" + }, + "require-dev": { + "ircmaxell/php-yacc": "^0.0.7", + "phpunit/phpunit": "^9.0" + }, + "bin": [ + "bin/php-parse" + ], + "type": "library", + "extra": { + "branch-alias": { + "dev-master": "5.0-dev" + } + }, + "autoload": { + "psr-4": { + "PhpParser\\": "lib/PhpParser" + } + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "BSD-3-Clause" + ], + "authors": [ + { + "name": "Nikita Popov" + } + ], + "description": "A PHP parser written in PHP", + "keywords": [ + "parser", + "php" + ], + "support": { + "issues": "https://github.com/nikic/PHP-Parser/issues", + "source": "https://github.com/nikic/PHP-Parser/tree/v5.2.0" + }, + "time": "2024-09-15T16:40:33+00:00" + }, + { + "name": "phar-io/manifest", + "version": "2.0.4", + "source": { + "type": "git", + "url": "https://github.com/phar-io/manifest.git", + "reference": "54750ef60c58e43759730615a392c31c80e23176" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/phar-io/manifest/zipball/54750ef60c58e43759730615a392c31c80e23176", + "reference": "54750ef60c58e43759730615a392c31c80e23176", + "shasum": "" + }, + "require": { + "ext-dom": "*", + "ext-libxml": "*", + "ext-phar": "*", + "ext-xmlwriter": "*", + "phar-io/version": "^3.0.1", + "php": "^7.2 || ^8.0" + }, + "type": "library", + "extra": { + "branch-alias": { + "dev-master": "2.0.x-dev" + } + }, + "autoload": { + "classmap": [ + "src/" + ] + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "BSD-3-Clause" + ], + "authors": [ + { + "name": "Arne Blankerts", + "email": "arne@blankerts.de", + "role": "Developer" + }, + { + "name": "Sebastian Heuer", + "email": "sebastian@phpeople.de", + "role": "Developer" + }, + { + "name": "Sebastian Bergmann", + "email": "sebastian@phpunit.de", + "role": "Developer" + } + ], + "description": "Component for reading phar.io manifest information from a PHP Archive (PHAR)", + "support": { + "issues": "https://github.com/phar-io/manifest/issues", + "source": "https://github.com/phar-io/manifest/tree/2.0.4" + }, + "funding": [ + { + "url": "https://github.com/theseer", + "type": "github" + } + ], + "time": "2024-03-03T12:33:53+00:00" + }, + { + "name": "phar-io/version", + "version": "3.2.1", + "source": { + "type": "git", + "url": "https://github.com/phar-io/version.git", + "reference": "4f7fd7836c6f332bb2933569e566a0d6c4cbed74" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/phar-io/version/zipball/4f7fd7836c6f332bb2933569e566a0d6c4cbed74", + "reference": "4f7fd7836c6f332bb2933569e566a0d6c4cbed74", + "shasum": "" + }, + "require": { + "php": "^7.2 || ^8.0" + }, + "type": "library", + "autoload": { + "classmap": [ + "src/" + ] + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "BSD-3-Clause" + ], + "authors": [ + { + "name": "Arne Blankerts", + "email": "arne@blankerts.de", + "role": "Developer" + }, + { + "name": "Sebastian Heuer", + "email": "sebastian@phpeople.de", + "role": "Developer" + }, + { + "name": "Sebastian Bergmann", + "email": "sebastian@phpunit.de", + "role": "Developer" + } + ], + "description": "Library for handling version information and constraints", + "support": { + "issues": "https://github.com/phar-io/version/issues", + "source": "https://github.com/phar-io/version/tree/3.2.1" + }, + "time": "2022-02-21T01:04:05+00:00" + }, + { + "name": "phpdocumentor/reflection-common", + "version": "2.2.0", + "source": { + "type": "git", + "url": "https://github.com/phpDocumentor/ReflectionCommon.git", + "reference": "1d01c49d4ed62f25aa84a747ad35d5a16924662b" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/phpDocumentor/ReflectionCommon/zipball/1d01c49d4ed62f25aa84a747ad35d5a16924662b", + "reference": "1d01c49d4ed62f25aa84a747ad35d5a16924662b", + "shasum": "" + }, + "require": { + "php": "^7.2 || ^8.0" + }, + "type": "library", + "extra": { + "branch-alias": { + "dev-2.x": "2.x-dev" + } + }, + "autoload": { + "psr-4": { + "phpDocumentor\\Reflection\\": "src/" + } + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "authors": [ + { + "name": "Jaap van Otterdijk", + "email": "opensource@ijaap.nl" + } + ], + "description": "Common reflection classes used by phpdocumentor to reflect the code structure", + "homepage": "http://www.phpdoc.org", + "keywords": [ + "FQSEN", + "phpDocumentor", + "phpdoc", + "reflection", + "static analysis" + ], + "support": { + "issues": "https://github.com/phpDocumentor/ReflectionCommon/issues", + "source": "https://github.com/phpDocumentor/ReflectionCommon/tree/2.x" + }, + "time": "2020-06-27T09:03:43+00:00" + }, + { + "name": "phpdocumentor/reflection-docblock", + "version": "5.4.1", + "source": { + "type": "git", + "url": "https://github.com/phpDocumentor/ReflectionDocBlock.git", + "reference": "9d07b3f7fdcf5efec5d1609cba3c19c5ea2bdc9c" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/phpDocumentor/ReflectionDocBlock/zipball/9d07b3f7fdcf5efec5d1609cba3c19c5ea2bdc9c", + "reference": "9d07b3f7fdcf5efec5d1609cba3c19c5ea2bdc9c", + "shasum": "" + }, + "require": { + "doctrine/deprecations": "^1.1", + "ext-filter": "*", + "php": "^7.4 || ^8.0", + "phpdocumentor/reflection-common": "^2.2", + "phpdocumentor/type-resolver": "^1.7", + "phpstan/phpdoc-parser": "^1.7", + "webmozart/assert": "^1.9.1" + }, + "require-dev": { + "mockery/mockery": "~1.3.5", + "phpstan/extension-installer": "^1.1", + "phpstan/phpstan": "^1.8", + "phpstan/phpstan-mockery": "^1.1", + "phpstan/phpstan-webmozart-assert": "^1.2", + "phpunit/phpunit": "^9.5", + "vimeo/psalm": "^5.13" + }, + "type": "library", + "extra": { + "branch-alias": { + "dev-master": "5.x-dev" + } + }, + "autoload": { + "psr-4": { + "phpDocumentor\\Reflection\\": "src" + } + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "authors": [ + { + "name": "Mike van Riel", + "email": "me@mikevanriel.com" + }, + { + "name": "Jaap van Otterdijk", + "email": "opensource@ijaap.nl" + } + ], + "description": "With this component, a library can provide support for annotations via DocBlocks or otherwise retrieve information that is embedded in a DocBlock.", + "support": { + "issues": "https://github.com/phpDocumentor/ReflectionDocBlock/issues", + "source": "https://github.com/phpDocumentor/ReflectionDocBlock/tree/5.4.1" + }, + "time": "2024-05-21T05:55:05+00:00" + }, + { + "name": "phpdocumentor/type-resolver", + "version": "1.8.2", + "source": { + "type": "git", + "url": "https://github.com/phpDocumentor/TypeResolver.git", + "reference": "153ae662783729388a584b4361f2545e4d841e3c" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/phpDocumentor/TypeResolver/zipball/153ae662783729388a584b4361f2545e4d841e3c", + "reference": "153ae662783729388a584b4361f2545e4d841e3c", + "shasum": "" + }, + "require": { + "doctrine/deprecations": "^1.0", + "php": "^7.3 || ^8.0", + "phpdocumentor/reflection-common": "^2.0", + "phpstan/phpdoc-parser": "^1.13" + }, + "require-dev": { + "ext-tokenizer": "*", + "phpbench/phpbench": "^1.2", + "phpstan/extension-installer": "^1.1", + "phpstan/phpstan": "^1.8", + "phpstan/phpstan-phpunit": "^1.1", + "phpunit/phpunit": "^9.5", + "rector/rector": "^0.13.9", + "vimeo/psalm": "^4.25" + }, + "type": "library", + "extra": { + "branch-alias": { + "dev-1.x": "1.x-dev" + } + }, + "autoload": { + "psr-4": { + "phpDocumentor\\Reflection\\": "src" + } + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "authors": [ + { + "name": "Mike van Riel", + "email": "me@mikevanriel.com" + } + ], + "description": "A PSR-5 based resolver of Class names, Types and Structural Element Names", + "support": { + "issues": "https://github.com/phpDocumentor/TypeResolver/issues", + "source": "https://github.com/phpDocumentor/TypeResolver/tree/1.8.2" + }, + "time": "2024-02-23T11:10:43+00:00" + }, + { + "name": "phpspec/prophecy", + "version": "v1.19.0", + "source": { + "type": "git", + "url": "https://github.com/phpspec/prophecy.git", + "reference": "67a759e7d8746d501c41536ba40cd9c0a07d6a87" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/phpspec/prophecy/zipball/67a759e7d8746d501c41536ba40cd9c0a07d6a87", + "reference": "67a759e7d8746d501c41536ba40cd9c0a07d6a87", + "shasum": "" + }, + "require": { + "doctrine/instantiator": "^1.2 || ^2.0", + "php": "^7.2 || 8.0.* || 8.1.* || 8.2.* || 8.3.*", + "phpdocumentor/reflection-docblock": "^5.2", + "sebastian/comparator": "^3.0 || ^4.0 || ^5.0 || ^6.0", + "sebastian/recursion-context": "^3.0 || ^4.0 || ^5.0 || ^6.0" + }, + "require-dev": { + "phpspec/phpspec": "^6.0 || ^7.0", + "phpstan/phpstan": "^1.9", + "phpunit/phpunit": "^8.0 || ^9.0 || ^10.0" + }, + "type": "library", + "extra": { + "branch-alias": { + "dev-master": "1.x-dev" + } + }, + "autoload": { + "psr-4": { + "Prophecy\\": "src/Prophecy" + } + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "authors": [ + { + "name": "Konstantin Kudryashov", + "email": "ever.zet@gmail.com", + "homepage": "http://everzet.com" + }, + { + "name": "Marcello Duarte", + "email": "marcello.duarte@gmail.com" + } + ], + "description": "Highly opinionated mocking framework for PHP 5.3+", + "homepage": "https://github.com/phpspec/prophecy", + "keywords": [ + "Double", + "Dummy", + "dev", + "fake", + "mock", + "spy", + "stub" + ], + "support": { + "issues": "https://github.com/phpspec/prophecy/issues", + "source": "https://github.com/phpspec/prophecy/tree/v1.19.0" + }, + "time": "2024-02-29T11:52:51+00:00" + }, + { + "name": "phpspec/prophecy-phpunit", + "version": "v2.2.0", + "source": { + "type": "git", + "url": "https://github.com/phpspec/prophecy-phpunit.git", + "reference": "16e1247e139434bce0bac09848bc5c8d882940fc" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/phpspec/prophecy-phpunit/zipball/16e1247e139434bce0bac09848bc5c8d882940fc", + "reference": "16e1247e139434bce0bac09848bc5c8d882940fc", + "shasum": "" + }, + "require": { + "php": "^7.3 || ^8", + "phpspec/prophecy": "^1.18", + "phpunit/phpunit": "^9.1 || ^10.1 || ^11.0" + }, + "type": "library", + "extra": { + "branch-alias": { + "dev-master": "2.x-dev" + } + }, + "autoload": { + "psr-4": { + "Prophecy\\PhpUnit\\": "src" + } + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "authors": [ + { + "name": "Christophe Coevoet", + "email": "stof@notk.org" + } + ], + "description": "Integrating the Prophecy mocking library in PHPUnit test cases", + "homepage": "http://phpspec.net", + "keywords": [ + "phpunit", + "prophecy" + ], + "support": { + "issues": "https://github.com/phpspec/prophecy-phpunit/issues", + "source": "https://github.com/phpspec/prophecy-phpunit/tree/v2.2.0" + }, + "time": "2024-03-01T08:33:58+00:00" + }, + { + "name": "phpstan/extension-installer", + "version": "1.4.3", + "source": { + "type": "git", + "url": "https://github.com/phpstan/extension-installer.git", + "reference": "85e90b3942d06b2326fba0403ec24fe912372936" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/phpstan/extension-installer/zipball/85e90b3942d06b2326fba0403ec24fe912372936", + "reference": "85e90b3942d06b2326fba0403ec24fe912372936", + "shasum": "" + }, + "require": { + "composer-plugin-api": "^2.0", + "php": "^7.2 || ^8.0", + "phpstan/phpstan": "^1.9.0 || ^2.0" + }, + "require-dev": { + "composer/composer": "^2.0", + "php-parallel-lint/php-parallel-lint": "^1.2.0", + "phpstan/phpstan-strict-rules": "^0.11 || ^0.12 || ^1.0" + }, + "type": "composer-plugin", + "extra": { + "class": "PHPStan\\ExtensionInstaller\\Plugin" + }, + "autoload": { + "psr-4": { + "PHPStan\\ExtensionInstaller\\": "src/" + } + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "description": "Composer plugin for automatic installation of PHPStan extensions", + "keywords": [ + "dev", + "static analysis" + ], + "support": { + "issues": "https://github.com/phpstan/extension-installer/issues", + "source": "https://github.com/phpstan/extension-installer/tree/1.4.3" + }, + "time": "2024-09-04T20:21:43+00:00" + }, + { + "name": "phpstan/phpdoc-parser", + "version": "1.30.1", + "source": { + "type": "git", + "url": "https://github.com/phpstan/phpdoc-parser.git", + "reference": "51b95ec8670af41009e2b2b56873bad96682413e" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/phpstan/phpdoc-parser/zipball/51b95ec8670af41009e2b2b56873bad96682413e", + "reference": "51b95ec8670af41009e2b2b56873bad96682413e", + "shasum": "" + }, + "require": { + "php": "^7.2 || ^8.0" + }, + "require-dev": { + "doctrine/annotations": "^2.0", + "nikic/php-parser": "^4.15", + "php-parallel-lint/php-parallel-lint": "^1.2", + "phpstan/extension-installer": "^1.0", + "phpstan/phpstan": "^1.5", + "phpstan/phpstan-phpunit": "^1.1", + "phpstan/phpstan-strict-rules": "^1.0", + "phpunit/phpunit": "^9.5", + "symfony/process": "^5.2" + }, + "type": "library", + "autoload": { + "psr-4": { + "PHPStan\\PhpDocParser\\": [ + "src/" + ] + } + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "description": "PHPDoc parser with support for nullable, intersection and generic types", + "support": { + "issues": "https://github.com/phpstan/phpdoc-parser/issues", + "source": "https://github.com/phpstan/phpdoc-parser/tree/1.30.1" + }, + "time": "2024-09-07T20:13:05+00:00" + }, + { + "name": "phpstan/phpstan", + "version": "1.12.3", + "source": { + "type": "git", + "url": "https://github.com/phpstan/phpstan.git", + "reference": "0fcbf194ab63d8159bb70d9aa3e1350051632009" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/phpstan/phpstan/zipball/0fcbf194ab63d8159bb70d9aa3e1350051632009", + "reference": "0fcbf194ab63d8159bb70d9aa3e1350051632009", + "shasum": "" + }, + "require": { + "php": "^7.2|^8.0" + }, + "conflict": { + "phpstan/phpstan-shim": "*" + }, + "bin": [ + "phpstan", + "phpstan.phar" + ], + "type": "library", + "autoload": { + "files": [ + "bootstrap.php" + ] + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "description": "PHPStan - PHP Static Analysis Tool", + "keywords": [ + "dev", + "static analysis" + ], + "support": { + "docs": "https://phpstan.org/user-guide/getting-started", + "forum": "https://github.com/phpstan/phpstan/discussions", + "issues": "https://github.com/phpstan/phpstan/issues", + "security": "https://github.com/phpstan/phpstan/security/policy", + "source": "https://github.com/phpstan/phpstan-src" + }, + "funding": [ + { + "url": "https://github.com/ondrejmirtes", + "type": "github" + }, + { + "url": "https://github.com/phpstan", + "type": "github" + } + ], + "time": "2024-09-09T08:10:35+00:00" + }, + { + "name": "phpunit/php-code-coverage", + "version": "9.2.32", + "source": { + "type": "git", + "url": "https://github.com/sebastianbergmann/php-code-coverage.git", + "reference": "85402a822d1ecf1db1096959413d35e1c37cf1a5" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/sebastianbergmann/php-code-coverage/zipball/85402a822d1ecf1db1096959413d35e1c37cf1a5", + "reference": "85402a822d1ecf1db1096959413d35e1c37cf1a5", + "shasum": "" + }, + "require": { + "ext-dom": "*", + "ext-libxml": "*", + "ext-xmlwriter": "*", + "nikic/php-parser": "^4.19.1 || ^5.1.0", + "php": ">=7.3", + "phpunit/php-file-iterator": "^3.0.6", + "phpunit/php-text-template": "^2.0.4", + "sebastian/code-unit-reverse-lookup": "^2.0.3", + "sebastian/complexity": "^2.0.3", + "sebastian/environment": "^5.1.5", + "sebastian/lines-of-code": "^1.0.4", + "sebastian/version": "^3.0.2", + "theseer/tokenizer": "^1.2.3" + }, + "require-dev": { + "phpunit/phpunit": "^9.6" + }, + "suggest": { + "ext-pcov": "PHP extension that provides line coverage", + "ext-xdebug": "PHP extension that provides line coverage as well as branch and path coverage" + }, + "type": "library", + "extra": { + "branch-alias": { + "dev-main": "9.2.x-dev" + } + }, + "autoload": { + "classmap": [ + "src/" + ] + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "BSD-3-Clause" + ], + "authors": [ + { + "name": "Sebastian Bergmann", + "email": "sebastian@phpunit.de", + "role": "lead" + } + ], + "description": "Library that provides collection, processing, and rendering functionality for PHP code coverage information.", + "homepage": "https://github.com/sebastianbergmann/php-code-coverage", + "keywords": [ + "coverage", + "testing", + "xunit" + ], + "support": { + "issues": "https://github.com/sebastianbergmann/php-code-coverage/issues", + "security": "https://github.com/sebastianbergmann/php-code-coverage/security/policy", + "source": "https://github.com/sebastianbergmann/php-code-coverage/tree/9.2.32" + }, + "funding": [ + { + "url": "https://github.com/sebastianbergmann", + "type": "github" + } + ], + "time": "2024-08-22T04:23:01+00:00" + }, + { + "name": "phpunit/php-file-iterator", + "version": "3.0.6", + "source": { + "type": "git", + "url": "https://github.com/sebastianbergmann/php-file-iterator.git", + "reference": "cf1c2e7c203ac650e352f4cc675a7021e7d1b3cf" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/sebastianbergmann/php-file-iterator/zipball/cf1c2e7c203ac650e352f4cc675a7021e7d1b3cf", + "reference": "cf1c2e7c203ac650e352f4cc675a7021e7d1b3cf", + "shasum": "" + }, + "require": { + "php": ">=7.3" + }, + "require-dev": { + "phpunit/phpunit": "^9.3" + }, + "type": "library", + "extra": { + "branch-alias": { + "dev-master": "3.0-dev" + } + }, + "autoload": { + "classmap": [ + "src/" + ] + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "BSD-3-Clause" + ], + "authors": [ + { + "name": "Sebastian Bergmann", + "email": "sebastian@phpunit.de", + "role": "lead" + } + ], + "description": "FilterIterator implementation that filters files based on a list of suffixes.", + "homepage": "https://github.com/sebastianbergmann/php-file-iterator/", + "keywords": [ + "filesystem", + "iterator" + ], + "support": { + "issues": "https://github.com/sebastianbergmann/php-file-iterator/issues", + "source": "https://github.com/sebastianbergmann/php-file-iterator/tree/3.0.6" + }, + "funding": [ + { + "url": "https://github.com/sebastianbergmann", + "type": "github" + } + ], + "time": "2021-12-02T12:48:52+00:00" + }, + { + "name": "phpunit/php-invoker", + "version": "3.1.1", + "source": { + "type": "git", + "url": "https://github.com/sebastianbergmann/php-invoker.git", + "reference": "5a10147d0aaf65b58940a0b72f71c9ac0423cc67" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/sebastianbergmann/php-invoker/zipball/5a10147d0aaf65b58940a0b72f71c9ac0423cc67", + "reference": "5a10147d0aaf65b58940a0b72f71c9ac0423cc67", + "shasum": "" + }, + "require": { + "php": ">=7.3" + }, + "require-dev": { + "ext-pcntl": "*", + "phpunit/phpunit": "^9.3" + }, + "suggest": { + "ext-pcntl": "*" + }, + "type": "library", + "extra": { + "branch-alias": { + "dev-master": "3.1-dev" + } + }, + "autoload": { + "classmap": [ + "src/" + ] + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "BSD-3-Clause" + ], + "authors": [ + { + "name": "Sebastian Bergmann", + "email": "sebastian@phpunit.de", + "role": "lead" + } + ], + "description": "Invoke callables with a timeout", + "homepage": "https://github.com/sebastianbergmann/php-invoker/", + "keywords": [ + "process" + ], + "support": { + "issues": "https://github.com/sebastianbergmann/php-invoker/issues", + "source": "https://github.com/sebastianbergmann/php-invoker/tree/3.1.1" + }, + "funding": [ + { + "url": "https://github.com/sebastianbergmann", + "type": "github" + } + ], + "time": "2020-09-28T05:58:55+00:00" + }, + { + "name": "phpunit/php-text-template", + "version": "2.0.4", + "source": { + "type": "git", + "url": "https://github.com/sebastianbergmann/php-text-template.git", + "reference": "5da5f67fc95621df9ff4c4e5a84d6a8a2acf7c28" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/sebastianbergmann/php-text-template/zipball/5da5f67fc95621df9ff4c4e5a84d6a8a2acf7c28", + "reference": "5da5f67fc95621df9ff4c4e5a84d6a8a2acf7c28", + "shasum": "" + }, + "require": { + "php": ">=7.3" + }, + "require-dev": { + "phpunit/phpunit": "^9.3" + }, + "type": "library", + "extra": { + "branch-alias": { + "dev-master": "2.0-dev" + } + }, + "autoload": { + "classmap": [ + "src/" + ] + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "BSD-3-Clause" + ], + "authors": [ + { + "name": "Sebastian Bergmann", + "email": "sebastian@phpunit.de", + "role": "lead" + } + ], + "description": "Simple template engine.", + "homepage": "https://github.com/sebastianbergmann/php-text-template/", + "keywords": [ + "template" + ], + "support": { + "issues": "https://github.com/sebastianbergmann/php-text-template/issues", + "source": "https://github.com/sebastianbergmann/php-text-template/tree/2.0.4" + }, + "funding": [ + { + "url": "https://github.com/sebastianbergmann", + "type": "github" + } + ], + "time": "2020-10-26T05:33:50+00:00" + }, + { + "name": "phpunit/php-timer", + "version": "5.0.3", + "source": { + "type": "git", + "url": "https://github.com/sebastianbergmann/php-timer.git", + "reference": "5a63ce20ed1b5bf577850e2c4e87f4aa902afbd2" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/sebastianbergmann/php-timer/zipball/5a63ce20ed1b5bf577850e2c4e87f4aa902afbd2", + "reference": "5a63ce20ed1b5bf577850e2c4e87f4aa902afbd2", + "shasum": "" + }, + "require": { + "php": ">=7.3" + }, + "require-dev": { + "phpunit/phpunit": "^9.3" + }, + "type": "library", + "extra": { + "branch-alias": { + "dev-master": "5.0-dev" + } + }, + "autoload": { + "classmap": [ + "src/" + ] + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "BSD-3-Clause" + ], + "authors": [ + { + "name": "Sebastian Bergmann", + "email": "sebastian@phpunit.de", + "role": "lead" + } + ], + "description": "Utility class for timing", + "homepage": "https://github.com/sebastianbergmann/php-timer/", + "keywords": [ + "timer" + ], + "support": { + "issues": "https://github.com/sebastianbergmann/php-timer/issues", + "source": "https://github.com/sebastianbergmann/php-timer/tree/5.0.3" + }, + "funding": [ + { + "url": "https://github.com/sebastianbergmann", + "type": "github" + } + ], + "time": "2020-10-26T13:16:10+00:00" + }, + { + "name": "phpunit/phpunit", + "version": "9.6.20", + "source": { + "type": "git", + "url": "https://github.com/sebastianbergmann/phpunit.git", + "reference": "49d7820565836236411f5dc002d16dd689cde42f" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/sebastianbergmann/phpunit/zipball/49d7820565836236411f5dc002d16dd689cde42f", + "reference": "49d7820565836236411f5dc002d16dd689cde42f", + "shasum": "" + }, + "require": { + "doctrine/instantiator": "^1.5.0 || ^2", + "ext-dom": "*", + "ext-json": "*", + "ext-libxml": "*", + "ext-mbstring": "*", + "ext-xml": "*", + "ext-xmlwriter": "*", + "myclabs/deep-copy": "^1.12.0", + "phar-io/manifest": "^2.0.4", + "phar-io/version": "^3.2.1", + "php": ">=7.3", + "phpunit/php-code-coverage": "^9.2.31", + "phpunit/php-file-iterator": "^3.0.6", + "phpunit/php-invoker": "^3.1.1", + "phpunit/php-text-template": "^2.0.4", + "phpunit/php-timer": "^5.0.3", + "sebastian/cli-parser": "^1.0.2", + "sebastian/code-unit": "^1.0.8", + "sebastian/comparator": "^4.0.8", + "sebastian/diff": "^4.0.6", + "sebastian/environment": "^5.1.5", + "sebastian/exporter": "^4.0.6", + "sebastian/global-state": "^5.0.7", + "sebastian/object-enumerator": "^4.0.4", + "sebastian/resource-operations": "^3.0.4", + "sebastian/type": "^3.2.1", + "sebastian/version": "^3.0.2" + }, + "suggest": { + "ext-soap": "To be able to generate mocks based on WSDL files", + "ext-xdebug": "PHP extension that provides line coverage as well as branch and path coverage" + }, + "bin": [ + "phpunit" + ], + "type": "library", + "extra": { + "branch-alias": { + "dev-master": "9.6-dev" + } + }, + "autoload": { + "files": [ + "src/Framework/Assert/Functions.php" + ], + "classmap": [ + "src/" + ] + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "BSD-3-Clause" + ], + "authors": [ + { + "name": "Sebastian Bergmann", + "email": "sebastian@phpunit.de", + "role": "lead" + } + ], + "description": "The PHP Unit Testing framework.", + "homepage": "https://phpunit.de/", + "keywords": [ + "phpunit", + "testing", + "xunit" + ], + "support": { + "issues": "https://github.com/sebastianbergmann/phpunit/issues", + "security": "https://github.com/sebastianbergmann/phpunit/security/policy", + "source": "https://github.com/sebastianbergmann/phpunit/tree/9.6.20" + }, + "funding": [ + { + "url": "https://phpunit.de/sponsors.html", + "type": "custom" + }, + { + "url": "https://github.com/sebastianbergmann", + "type": "github" + }, + { + "url": "https://tidelift.com/funding/github/packagist/phpunit/phpunit", + "type": "tidelift" + } + ], + "time": "2024-07-10T11:45:39+00:00" + }, + { + "name": "sebastian/cli-parser", + "version": "1.0.2", + "source": { + "type": "git", + "url": "https://github.com/sebastianbergmann/cli-parser.git", + "reference": "2b56bea83a09de3ac06bb18b92f068e60cc6f50b" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/sebastianbergmann/cli-parser/zipball/2b56bea83a09de3ac06bb18b92f068e60cc6f50b", + "reference": "2b56bea83a09de3ac06bb18b92f068e60cc6f50b", + "shasum": "" + }, + "require": { + "php": ">=7.3" + }, + "require-dev": { + "phpunit/phpunit": "^9.3" + }, + "type": "library", + "extra": { + "branch-alias": { + "dev-master": "1.0-dev" + } + }, + "autoload": { + "classmap": [ + "src/" + ] + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "BSD-3-Clause" + ], + "authors": [ + { + "name": "Sebastian Bergmann", + "email": "sebastian@phpunit.de", + "role": "lead" + } + ], + "description": "Library for parsing CLI options", + "homepage": "https://github.com/sebastianbergmann/cli-parser", + "support": { + "issues": "https://github.com/sebastianbergmann/cli-parser/issues", + "source": "https://github.com/sebastianbergmann/cli-parser/tree/1.0.2" + }, + "funding": [ + { + "url": "https://github.com/sebastianbergmann", + "type": "github" + } + ], + "time": "2024-03-02T06:27:43+00:00" + }, + { + "name": "sebastian/code-unit", + "version": "1.0.8", + "source": { + "type": "git", + "url": "https://github.com/sebastianbergmann/code-unit.git", + "reference": "1fc9f64c0927627ef78ba436c9b17d967e68e120" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/sebastianbergmann/code-unit/zipball/1fc9f64c0927627ef78ba436c9b17d967e68e120", + "reference": "1fc9f64c0927627ef78ba436c9b17d967e68e120", + "shasum": "" + }, + "require": { + "php": ">=7.3" + }, + "require-dev": { + "phpunit/phpunit": "^9.3" + }, + "type": "library", + "extra": { + "branch-alias": { + "dev-master": "1.0-dev" + } + }, + "autoload": { + "classmap": [ + "src/" + ] + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "BSD-3-Clause" + ], + "authors": [ + { + "name": "Sebastian Bergmann", + "email": "sebastian@phpunit.de", + "role": "lead" + } + ], + "description": "Collection of value objects that represent the PHP code units", + "homepage": "https://github.com/sebastianbergmann/code-unit", + "support": { + "issues": "https://github.com/sebastianbergmann/code-unit/issues", + "source": "https://github.com/sebastianbergmann/code-unit/tree/1.0.8" + }, + "funding": [ + { + "url": "https://github.com/sebastianbergmann", + "type": "github" + } + ], + "time": "2020-10-26T13:08:54+00:00" + }, + { + "name": "sebastian/code-unit-reverse-lookup", + "version": "2.0.3", + "source": { + "type": "git", + "url": "https://github.com/sebastianbergmann/code-unit-reverse-lookup.git", + "reference": "ac91f01ccec49fb77bdc6fd1e548bc70f7faa3e5" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/sebastianbergmann/code-unit-reverse-lookup/zipball/ac91f01ccec49fb77bdc6fd1e548bc70f7faa3e5", + "reference": "ac91f01ccec49fb77bdc6fd1e548bc70f7faa3e5", + "shasum": "" + }, + "require": { + "php": ">=7.3" + }, + "require-dev": { + "phpunit/phpunit": "^9.3" + }, + "type": "library", + "extra": { + "branch-alias": { + "dev-master": "2.0-dev" + } + }, + "autoload": { + "classmap": [ + "src/" + ] + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "BSD-3-Clause" + ], + "authors": [ + { + "name": "Sebastian Bergmann", + "email": "sebastian@phpunit.de" + } + ], + "description": "Looks up which function or method a line of code belongs to", + "homepage": "https://github.com/sebastianbergmann/code-unit-reverse-lookup/", + "support": { + "issues": "https://github.com/sebastianbergmann/code-unit-reverse-lookup/issues", + "source": "https://github.com/sebastianbergmann/code-unit-reverse-lookup/tree/2.0.3" + }, + "funding": [ + { + "url": "https://github.com/sebastianbergmann", + "type": "github" + } + ], + "time": "2020-09-28T05:30:19+00:00" + }, + { + "name": "sebastian/comparator", + "version": "4.0.8", + "source": { + "type": "git", + "url": "https://github.com/sebastianbergmann/comparator.git", + "reference": "fa0f136dd2334583309d32b62544682ee972b51a" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/sebastianbergmann/comparator/zipball/fa0f136dd2334583309d32b62544682ee972b51a", + "reference": "fa0f136dd2334583309d32b62544682ee972b51a", + "shasum": "" + }, + "require": { + "php": ">=7.3", + "sebastian/diff": "^4.0", + "sebastian/exporter": "^4.0" + }, + "require-dev": { + "phpunit/phpunit": "^9.3" + }, + "type": "library", + "extra": { + "branch-alias": { + "dev-master": "4.0-dev" + } + }, + "autoload": { + "classmap": [ + "src/" + ] + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "BSD-3-Clause" + ], + "authors": [ + { + "name": "Sebastian Bergmann", + "email": "sebastian@phpunit.de" + }, + { + "name": "Jeff Welch", + "email": "whatthejeff@gmail.com" + }, + { + "name": "Volker Dusch", + "email": "github@wallbash.com" + }, + { + "name": "Bernhard Schussek", + "email": "bschussek@2bepublished.at" + } + ], + "description": "Provides the functionality to compare PHP values for equality", + "homepage": "https://github.com/sebastianbergmann/comparator", + "keywords": [ + "comparator", + "compare", + "equality" + ], + "support": { + "issues": "https://github.com/sebastianbergmann/comparator/issues", + "source": "https://github.com/sebastianbergmann/comparator/tree/4.0.8" + }, + "funding": [ + { + "url": "https://github.com/sebastianbergmann", + "type": "github" + } + ], + "time": "2022-09-14T12:41:17+00:00" + }, + { + "name": "sebastian/complexity", + "version": "2.0.3", + "source": { + "type": "git", + "url": "https://github.com/sebastianbergmann/complexity.git", + "reference": "25f207c40d62b8b7aa32f5ab026c53561964053a" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/sebastianbergmann/complexity/zipball/25f207c40d62b8b7aa32f5ab026c53561964053a", + "reference": "25f207c40d62b8b7aa32f5ab026c53561964053a", + "shasum": "" + }, + "require": { + "nikic/php-parser": "^4.18 || ^5.0", + "php": ">=7.3" + }, + "require-dev": { + "phpunit/phpunit": "^9.3" + }, + "type": "library", + "extra": { + "branch-alias": { + "dev-master": "2.0-dev" + } + }, + "autoload": { + "classmap": [ + "src/" + ] + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "BSD-3-Clause" + ], + "authors": [ + { + "name": "Sebastian Bergmann", + "email": "sebastian@phpunit.de", + "role": "lead" + } + ], + "description": "Library for calculating the complexity of PHP code units", + "homepage": "https://github.com/sebastianbergmann/complexity", + "support": { + "issues": "https://github.com/sebastianbergmann/complexity/issues", + "source": "https://github.com/sebastianbergmann/complexity/tree/2.0.3" + }, + "funding": [ + { + "url": "https://github.com/sebastianbergmann", + "type": "github" + } + ], + "time": "2023-12-22T06:19:30+00:00" + }, + { + "name": "sebastian/diff", + "version": "4.0.6", + "source": { + "type": "git", + "url": "https://github.com/sebastianbergmann/diff.git", + "reference": "ba01945089c3a293b01ba9badc29ad55b106b0bc" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/sebastianbergmann/diff/zipball/ba01945089c3a293b01ba9badc29ad55b106b0bc", + "reference": "ba01945089c3a293b01ba9badc29ad55b106b0bc", + "shasum": "" + }, + "require": { + "php": ">=7.3" + }, + "require-dev": { + "phpunit/phpunit": "^9.3", + "symfony/process": "^4.2 || ^5" + }, + "type": "library", + "extra": { + "branch-alias": { + "dev-master": "4.0-dev" + } + }, + "autoload": { + "classmap": [ + "src/" + ] + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "BSD-3-Clause" + ], + "authors": [ + { + "name": "Sebastian Bergmann", + "email": "sebastian@phpunit.de" + }, + { + "name": "Kore Nordmann", + "email": "mail@kore-nordmann.de" + } + ], + "description": "Diff implementation", + "homepage": "https://github.com/sebastianbergmann/diff", + "keywords": [ + "diff", + "udiff", + "unidiff", + "unified diff" + ], + "support": { + "issues": "https://github.com/sebastianbergmann/diff/issues", + "source": "https://github.com/sebastianbergmann/diff/tree/4.0.6" + }, + "funding": [ + { + "url": "https://github.com/sebastianbergmann", + "type": "github" + } + ], + "time": "2024-03-02T06:30:58+00:00" + }, + { + "name": "sebastian/environment", + "version": "5.1.5", + "source": { + "type": "git", + "url": "https://github.com/sebastianbergmann/environment.git", + "reference": "830c43a844f1f8d5b7a1f6d6076b784454d8b7ed" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/sebastianbergmann/environment/zipball/830c43a844f1f8d5b7a1f6d6076b784454d8b7ed", + "reference": "830c43a844f1f8d5b7a1f6d6076b784454d8b7ed", + "shasum": "" + }, + "require": { + "php": ">=7.3" + }, + "require-dev": { + "phpunit/phpunit": "^9.3" + }, + "suggest": { + "ext-posix": "*" + }, + "type": "library", + "extra": { + "branch-alias": { + "dev-master": "5.1-dev" + } + }, + "autoload": { + "classmap": [ + "src/" + ] + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "BSD-3-Clause" + ], + "authors": [ + { + "name": "Sebastian Bergmann", + "email": "sebastian@phpunit.de" + } + ], + "description": "Provides functionality to handle HHVM/PHP environments", + "homepage": "http://www.github.com/sebastianbergmann/environment", + "keywords": [ + "Xdebug", + "environment", + "hhvm" + ], + "support": { + "issues": "https://github.com/sebastianbergmann/environment/issues", + "source": "https://github.com/sebastianbergmann/environment/tree/5.1.5" + }, + "funding": [ + { + "url": "https://github.com/sebastianbergmann", + "type": "github" + } + ], + "time": "2023-02-03T06:03:51+00:00" + }, + { + "name": "sebastian/exporter", + "version": "4.0.6", + "source": { + "type": "git", + "url": "https://github.com/sebastianbergmann/exporter.git", + "reference": "78c00df8f170e02473b682df15bfcdacc3d32d72" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/sebastianbergmann/exporter/zipball/78c00df8f170e02473b682df15bfcdacc3d32d72", + "reference": "78c00df8f170e02473b682df15bfcdacc3d32d72", + "shasum": "" + }, + "require": { + "php": ">=7.3", + "sebastian/recursion-context": "^4.0" + }, + "require-dev": { + "ext-mbstring": "*", + "phpunit/phpunit": "^9.3" + }, + "type": "library", + "extra": { + "branch-alias": { + "dev-master": "4.0-dev" + } + }, + "autoload": { + "classmap": [ + "src/" + ] + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "BSD-3-Clause" + ], + "authors": [ + { + "name": "Sebastian Bergmann", + "email": "sebastian@phpunit.de" + }, + { + "name": "Jeff Welch", + "email": "whatthejeff@gmail.com" + }, + { + "name": "Volker Dusch", + "email": "github@wallbash.com" + }, + { + "name": "Adam Harvey", + "email": "aharvey@php.net" + }, + { + "name": "Bernhard Schussek", + "email": "bschussek@gmail.com" + } + ], + "description": "Provides the functionality to export PHP variables for visualization", + "homepage": "https://www.github.com/sebastianbergmann/exporter", + "keywords": [ + "export", + "exporter" + ], + "support": { + "issues": "https://github.com/sebastianbergmann/exporter/issues", + "source": "https://github.com/sebastianbergmann/exporter/tree/4.0.6" + }, + "funding": [ + { + "url": "https://github.com/sebastianbergmann", + "type": "github" + } + ], + "time": "2024-03-02T06:33:00+00:00" + }, + { + "name": "sebastian/global-state", + "version": "5.0.7", + "source": { + "type": "git", + "url": "https://github.com/sebastianbergmann/global-state.git", + "reference": "bca7df1f32ee6fe93b4d4a9abbf69e13a4ada2c9" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/sebastianbergmann/global-state/zipball/bca7df1f32ee6fe93b4d4a9abbf69e13a4ada2c9", + "reference": "bca7df1f32ee6fe93b4d4a9abbf69e13a4ada2c9", + "shasum": "" + }, + "require": { + "php": ">=7.3", + "sebastian/object-reflector": "^2.0", + "sebastian/recursion-context": "^4.0" + }, + "require-dev": { + "ext-dom": "*", + "phpunit/phpunit": "^9.3" + }, + "suggest": { + "ext-uopz": "*" + }, + "type": "library", + "extra": { + "branch-alias": { + "dev-master": "5.0-dev" + } + }, + "autoload": { + "classmap": [ + "src/" + ] + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "BSD-3-Clause" + ], + "authors": [ + { + "name": "Sebastian Bergmann", + "email": "sebastian@phpunit.de" + } + ], + "description": "Snapshotting of global state", + "homepage": "http://www.github.com/sebastianbergmann/global-state", + "keywords": [ + "global state" + ], + "support": { + "issues": "https://github.com/sebastianbergmann/global-state/issues", + "source": "https://github.com/sebastianbergmann/global-state/tree/5.0.7" + }, + "funding": [ + { + "url": "https://github.com/sebastianbergmann", + "type": "github" + } + ], + "time": "2024-03-02T06:35:11+00:00" + }, + { + "name": "sebastian/lines-of-code", + "version": "1.0.4", + "source": { + "type": "git", + "url": "https://github.com/sebastianbergmann/lines-of-code.git", + "reference": "e1e4a170560925c26d424b6a03aed157e7dcc5c5" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/sebastianbergmann/lines-of-code/zipball/e1e4a170560925c26d424b6a03aed157e7dcc5c5", + "reference": "e1e4a170560925c26d424b6a03aed157e7dcc5c5", + "shasum": "" + }, + "require": { + "nikic/php-parser": "^4.18 || ^5.0", + "php": ">=7.3" + }, + "require-dev": { + "phpunit/phpunit": "^9.3" + }, + "type": "library", + "extra": { + "branch-alias": { + "dev-master": "1.0-dev" + } + }, + "autoload": { + "classmap": [ + "src/" + ] + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "BSD-3-Clause" + ], + "authors": [ + { + "name": "Sebastian Bergmann", + "email": "sebastian@phpunit.de", + "role": "lead" + } + ], + "description": "Library for counting the lines of code in PHP source code", + "homepage": "https://github.com/sebastianbergmann/lines-of-code", + "support": { + "issues": "https://github.com/sebastianbergmann/lines-of-code/issues", + "source": "https://github.com/sebastianbergmann/lines-of-code/tree/1.0.4" + }, + "funding": [ + { + "url": "https://github.com/sebastianbergmann", + "type": "github" + } + ], + "time": "2023-12-22T06:20:34+00:00" + }, + { + "name": "sebastian/object-enumerator", + "version": "4.0.4", + "source": { + "type": "git", + "url": "https://github.com/sebastianbergmann/object-enumerator.git", + "reference": "5c9eeac41b290a3712d88851518825ad78f45c71" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/sebastianbergmann/object-enumerator/zipball/5c9eeac41b290a3712d88851518825ad78f45c71", + "reference": "5c9eeac41b290a3712d88851518825ad78f45c71", + "shasum": "" + }, + "require": { + "php": ">=7.3", + "sebastian/object-reflector": "^2.0", + "sebastian/recursion-context": "^4.0" + }, + "require-dev": { + "phpunit/phpunit": "^9.3" + }, + "type": "library", + "extra": { + "branch-alias": { + "dev-master": "4.0-dev" + } + }, + "autoload": { + "classmap": [ + "src/" + ] + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "BSD-3-Clause" + ], + "authors": [ + { + "name": "Sebastian Bergmann", + "email": "sebastian@phpunit.de" + } + ], + "description": "Traverses array structures and object graphs to enumerate all referenced objects", + "homepage": "https://github.com/sebastianbergmann/object-enumerator/", + "support": { + "issues": "https://github.com/sebastianbergmann/object-enumerator/issues", + "source": "https://github.com/sebastianbergmann/object-enumerator/tree/4.0.4" + }, + "funding": [ + { + "url": "https://github.com/sebastianbergmann", + "type": "github" + } + ], + "time": "2020-10-26T13:12:34+00:00" + }, + { + "name": "sebastian/object-reflector", + "version": "2.0.4", + "source": { + "type": "git", + "url": "https://github.com/sebastianbergmann/object-reflector.git", + "reference": "b4f479ebdbf63ac605d183ece17d8d7fe49c15c7" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/sebastianbergmann/object-reflector/zipball/b4f479ebdbf63ac605d183ece17d8d7fe49c15c7", + "reference": "b4f479ebdbf63ac605d183ece17d8d7fe49c15c7", + "shasum": "" + }, + "require": { + "php": ">=7.3" + }, + "require-dev": { + "phpunit/phpunit": "^9.3" + }, + "type": "library", + "extra": { + "branch-alias": { + "dev-master": "2.0-dev" + } + }, + "autoload": { + "classmap": [ + "src/" + ] + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "BSD-3-Clause" + ], + "authors": [ + { + "name": "Sebastian Bergmann", + "email": "sebastian@phpunit.de" + } + ], + "description": "Allows reflection of object attributes, including inherited and non-public ones", + "homepage": "https://github.com/sebastianbergmann/object-reflector/", + "support": { + "issues": "https://github.com/sebastianbergmann/object-reflector/issues", + "source": "https://github.com/sebastianbergmann/object-reflector/tree/2.0.4" + }, + "funding": [ + { + "url": "https://github.com/sebastianbergmann", + "type": "github" + } + ], + "time": "2020-10-26T13:14:26+00:00" + }, + { + "name": "sebastian/recursion-context", + "version": "4.0.5", + "source": { + "type": "git", + "url": "https://github.com/sebastianbergmann/recursion-context.git", + "reference": "e75bd0f07204fec2a0af9b0f3cfe97d05f92efc1" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/sebastianbergmann/recursion-context/zipball/e75bd0f07204fec2a0af9b0f3cfe97d05f92efc1", + "reference": "e75bd0f07204fec2a0af9b0f3cfe97d05f92efc1", + "shasum": "" + }, + "require": { + "php": ">=7.3" + }, + "require-dev": { + "phpunit/phpunit": "^9.3" + }, + "type": "library", + "extra": { + "branch-alias": { + "dev-master": "4.0-dev" + } + }, + "autoload": { + "classmap": [ + "src/" + ] + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "BSD-3-Clause" + ], + "authors": [ + { + "name": "Sebastian Bergmann", + "email": "sebastian@phpunit.de" + }, + { + "name": "Jeff Welch", + "email": "whatthejeff@gmail.com" + }, + { + "name": "Adam Harvey", + "email": "aharvey@php.net" + } + ], + "description": "Provides functionality to recursively process PHP variables", + "homepage": "https://github.com/sebastianbergmann/recursion-context", + "support": { + "issues": "https://github.com/sebastianbergmann/recursion-context/issues", + "source": "https://github.com/sebastianbergmann/recursion-context/tree/4.0.5" + }, + "funding": [ + { + "url": "https://github.com/sebastianbergmann", + "type": "github" + } + ], + "time": "2023-02-03T06:07:39+00:00" + }, + { + "name": "sebastian/resource-operations", + "version": "3.0.4", + "source": { + "type": "git", + "url": "https://github.com/sebastianbergmann/resource-operations.git", + "reference": "05d5692a7993ecccd56a03e40cd7e5b09b1d404e" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/sebastianbergmann/resource-operations/zipball/05d5692a7993ecccd56a03e40cd7e5b09b1d404e", + "reference": "05d5692a7993ecccd56a03e40cd7e5b09b1d404e", + "shasum": "" + }, + "require": { + "php": ">=7.3" + }, + "require-dev": { + "phpunit/phpunit": "^9.0" + }, + "type": "library", + "extra": { + "branch-alias": { + "dev-main": "3.0-dev" + } + }, + "autoload": { + "classmap": [ + "src/" + ] + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "BSD-3-Clause" + ], + "authors": [ + { + "name": "Sebastian Bergmann", + "email": "sebastian@phpunit.de" + } + ], + "description": "Provides a list of PHP built-in functions that operate on resources", + "homepage": "https://www.github.com/sebastianbergmann/resource-operations", + "support": { + "source": "https://github.com/sebastianbergmann/resource-operations/tree/3.0.4" + }, + "funding": [ + { + "url": "https://github.com/sebastianbergmann", + "type": "github" + } + ], + "time": "2024-03-14T16:00:52+00:00" + }, + { + "name": "sebastian/type", + "version": "3.2.1", + "source": { + "type": "git", + "url": "https://github.com/sebastianbergmann/type.git", + "reference": "75e2c2a32f5e0b3aef905b9ed0b179b953b3d7c7" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/sebastianbergmann/type/zipball/75e2c2a32f5e0b3aef905b9ed0b179b953b3d7c7", + "reference": "75e2c2a32f5e0b3aef905b9ed0b179b953b3d7c7", + "shasum": "" + }, + "require": { + "php": ">=7.3" + }, + "require-dev": { + "phpunit/phpunit": "^9.5" + }, + "type": "library", + "extra": { + "branch-alias": { + "dev-master": "3.2-dev" + } + }, + "autoload": { + "classmap": [ + "src/" + ] + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "BSD-3-Clause" + ], + "authors": [ + { + "name": "Sebastian Bergmann", + "email": "sebastian@phpunit.de", + "role": "lead" + } + ], + "description": "Collection of value objects that represent the types of the PHP type system", + "homepage": "https://github.com/sebastianbergmann/type", + "support": { + "issues": "https://github.com/sebastianbergmann/type/issues", + "source": "https://github.com/sebastianbergmann/type/tree/3.2.1" + }, + "funding": [ + { + "url": "https://github.com/sebastianbergmann", + "type": "github" + } + ], + "time": "2023-02-03T06:13:03+00:00" + }, + { + "name": "sebastian/version", + "version": "3.0.2", + "source": { + "type": "git", + "url": "https://github.com/sebastianbergmann/version.git", + "reference": "c6c1022351a901512170118436c764e473f6de8c" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/sebastianbergmann/version/zipball/c6c1022351a901512170118436c764e473f6de8c", + "reference": "c6c1022351a901512170118436c764e473f6de8c", + "shasum": "" + }, + "require": { + "php": ">=7.3" + }, + "type": "library", + "extra": { + "branch-alias": { + "dev-master": "3.0-dev" + } + }, + "autoload": { + "classmap": [ + "src/" + ] + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "BSD-3-Clause" + ], + "authors": [ + { + "name": "Sebastian Bergmann", + "email": "sebastian@phpunit.de", + "role": "lead" + } + ], + "description": "Library that helps with managing the version number of Git-hosted PHP projects", + "homepage": "https://github.com/sebastianbergmann/version", + "support": { + "issues": "https://github.com/sebastianbergmann/version/issues", + "source": "https://github.com/sebastianbergmann/version/tree/3.0.2" + }, + "funding": [ + { + "url": "https://github.com/sebastianbergmann", + "type": "github" + } + ], + "time": "2020-09-28T06:39:44+00:00" + }, + { + "name": "squizlabs/php_codesniffer", + "version": "3.10.2", + "source": { + "type": "git", + "url": "https://github.com/PHPCSStandards/PHP_CodeSniffer.git", + "reference": "86e5f5dd9a840c46810ebe5ff1885581c42a3017" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/PHPCSStandards/PHP_CodeSniffer/zipball/86e5f5dd9a840c46810ebe5ff1885581c42a3017", + "reference": "86e5f5dd9a840c46810ebe5ff1885581c42a3017", + "shasum": "" + }, + "require": { + "ext-simplexml": "*", + "ext-tokenizer": "*", + "ext-xmlwriter": "*", + "php": ">=5.4.0" + }, + "require-dev": { + "phpunit/phpunit": "^4.0 || ^5.0 || ^6.0 || ^7.0 || ^8.0 || ^9.3.4" + }, + "bin": [ + "bin/phpcbf", + "bin/phpcs" + ], + "type": "library", + "extra": { + "branch-alias": { + "dev-master": "3.x-dev" + } + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "BSD-3-Clause" + ], + "authors": [ + { + "name": "Greg Sherwood", + "role": "Former lead" + }, + { + "name": "Juliette Reinders Folmer", + "role": "Current lead" + }, + { + "name": "Contributors", + "homepage": "https://github.com/PHPCSStandards/PHP_CodeSniffer/graphs/contributors" + } + ], + "description": "PHP_CodeSniffer tokenizes PHP, JavaScript and CSS files and detects violations of a defined set of coding standards.", + "homepage": "https://github.com/PHPCSStandards/PHP_CodeSniffer", + "keywords": [ + "phpcs", + "standards", + "static analysis" + ], + "support": { + "issues": "https://github.com/PHPCSStandards/PHP_CodeSniffer/issues", + "security": "https://github.com/PHPCSStandards/PHP_CodeSniffer/security/policy", + "source": "https://github.com/PHPCSStandards/PHP_CodeSniffer", + "wiki": "https://github.com/PHPCSStandards/PHP_CodeSniffer/wiki" + }, + "funding": [ + { + "url": "https://github.com/PHPCSStandards", + "type": "github" + }, + { + "url": "https://github.com/jrfnl", + "type": "github" + }, + { + "url": "https://opencollective.com/php_codesniffer", + "type": "open_collective" + } + ], + "time": "2024-07-21T23:26:44+00:00" + }, + { + "name": "theseer/tokenizer", + "version": "1.2.3", + "source": { + "type": "git", + "url": "https://github.com/theseer/tokenizer.git", + "reference": "737eda637ed5e28c3413cb1ebe8bb52cbf1ca7a2" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/theseer/tokenizer/zipball/737eda637ed5e28c3413cb1ebe8bb52cbf1ca7a2", + "reference": "737eda637ed5e28c3413cb1ebe8bb52cbf1ca7a2", + "shasum": "" + }, + "require": { + "ext-dom": "*", + "ext-tokenizer": "*", + "ext-xmlwriter": "*", + "php": "^7.2 || ^8.0" + }, + "type": "library", + "autoload": { + "classmap": [ + "src/" + ] + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "BSD-3-Clause" + ], + "authors": [ + { + "name": "Arne Blankerts", + "email": "arne@blankerts.de", + "role": "Developer" + } + ], + "description": "A small library for converting tokenized PHP source code into XML and potentially other formats", + "support": { + "issues": "https://github.com/theseer/tokenizer/issues", + "source": "https://github.com/theseer/tokenizer/tree/1.2.3" + }, + "funding": [ + { + "url": "https://github.com/theseer", + "type": "github" + } + ], + "time": "2024-03-03T12:36:25+00:00" + }, + { + "name": "webmozart/assert", + "version": "1.11.0", + "source": { + "type": "git", + "url": "https://github.com/webmozarts/assert.git", + "reference": "11cb2199493b2f8a3b53e7f19068fc6aac760991" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/webmozarts/assert/zipball/11cb2199493b2f8a3b53e7f19068fc6aac760991", + "reference": "11cb2199493b2f8a3b53e7f19068fc6aac760991", + "shasum": "" + }, + "require": { + "ext-ctype": "*", + "php": "^7.2 || ^8.0" + }, + "conflict": { + "phpstan/phpstan": "<0.12.20", + "vimeo/psalm": "<4.6.1 || 4.6.2" + }, + "require-dev": { + "phpunit/phpunit": "^8.5.13" + }, + "type": "library", + "extra": { + "branch-alias": { + "dev-master": "1.10-dev" + } + }, + "autoload": { + "psr-4": { + "Webmozart\\Assert\\": "src/" + } + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "authors": [ + { + "name": "Bernhard Schussek", + "email": "bschussek@gmail.com" + } + ], + "description": "Assertions to validate method input/output with nice error messages.", + "keywords": [ + "assert", + "check", + "validate" + ], + "support": { + "issues": "https://github.com/webmozarts/assert/issues", + "source": "https://github.com/webmozarts/assert/tree/1.11.0" + }, + "time": "2022-06-03T18:03:27+00:00" + } + ], + "aliases": [], + "minimum-stability": "stable", + "stability-flags": [], + "prefer-stable": false, + "prefer-lowest": false, + "platform": { + "php": "^7.4 || ^8.0", + "ext-json": "*", + "ext-pdo": "*" + }, + "platform-dev": [], + "plugin-api-version": "2.3.0" +} diff --git a/src/api/v2/index.php b/src/api/v2/index.php index ef3a6b0ab..42240c00f 100644 --- a/src/api/v2/index.php +++ b/src/api/v2/index.php @@ -36,6 +36,8 @@ use Tuupola\Middleware\HttpBasicAuthentication\AuthenticatorInterface; use Tuupola\Middleware\CorsMiddleware; +use Middlewares\DeflateEncoder; + use Skeleton\Application\Response\UnauthorizedResponse; use Psr\Http\Message\ResponseInterface; @@ -154,7 +156,7 @@ public function process(Request $request, RequestHandler $handler): Response { $contentType = $request->getHeaderLine('Content-Type'); - if (strstr($contentType, 'application/json')) { + if (strstr($contentType, 'application/json') || strstr($contentType, 'application/vnd.api+json')) { $contents = json_decode(file_get_contents('php://input'), true); if (json_last_error() === JSON_ERROR_NONE) { $request = $request->withParsedBody($contents); @@ -225,11 +227,9 @@ public function process(Request $request, RequestHandler $handler): Response { $app->add("JwtAuthentication"); $app->add(new TokenAsParameterMiddleware()); $app->add(new ContentLengthMiddleware()); // NOTE: Add any middleware which may modify the response body before adding the ContentLengthMiddleware - -// NOTE: The ErrorMiddleware should be added after any middleware which may modify the response body -$errorMiddleware = $app->addErrorMiddleware(true, true, true); -$errorHandler = $errorMiddleware->getDefaultErrorHandler(); -$errorHandler->forceContentType('application/json'); +$app->add((new DeflateEncoder())->contentType( + '/^(image\/svg\\+xml|text\/.*|application\/json|"application\/vnd\.api+json)(;.*)?$/' +)); $app->add(new CorsHackMiddleware()); // NOTE: The RoutingMiddleware should be added after our CORS middleware so routing is performed first $app->addRoutingMiddleware(); @@ -281,4 +281,9 @@ public function process(Request $request, RequestHandler $handler): Response { require __DIR__ . "/../../inc/apiv2/helper/setUserPassword.routes.php"; require __DIR__ . "/../../inc/apiv2/helper/unassignAgent.routes.php"; +// NOTE: The ErrorMiddleware should be added after any middleware which may modify the response body +$errorMiddleware = $app->addErrorMiddleware(true, true, true); +$errorHandler = $errorMiddleware->getDefaultErrorHandler(); +$errorHandler->forceContentType('application/json'); + $app->run(); diff --git a/src/dba/AbstractModelFactory.class.php b/src/dba/AbstractModelFactory.class.php index c6c596e84..e1326d16f 100755 --- a/src/dba/AbstractModelFactory.class.php +++ b/src/dba/AbstractModelFactory.class.php @@ -658,6 +658,10 @@ public function filter($options, $single = false) { $options['order'] = $orderOptions; } $query .= $this->applyOrder($options['order']); + + if (array_key_exists("limit", $options)) { + $query .= $this->applyLimit($options['limit']); + } $dbh = self::getDB(); $stmt = $dbh->prepare($query); @@ -720,6 +724,12 @@ private function applyOrder($orders) { } return " ORDER BY " . implode(", ", $orderQueries); } + + //applylimit is slightly different than the other apply functions, since you can only limit by a single value + //the $limit argument is a single object LimitFilter object instead of an array of objects. + private function applyLimit($limit) { + return " LIMIT " . $limit->getQueryString(); + } private function applyGroups($groups) { $groupsQueries = array(); diff --git a/src/dba/Factory.class.php b/src/dba/Factory.class.php index 76c7d02fe..8a38f879d 100644 --- a/src/dba/Factory.class.php +++ b/src/dba/Factory.class.php @@ -493,4 +493,5 @@ public static function getHashlistHashlistFactory() { const ORDER = "order"; const UPDATE = "update"; const GROUP = "group"; + const LIMIT = "limit"; } diff --git a/src/dba/Limit.class.php b/src/dba/Limit.class.php new file mode 100644 index 000000000..4d26ecf4c --- /dev/null +++ b/src/dba/Limit.class.php @@ -0,0 +1,11 @@ +limit = intval($limit); + $this->offset = $offset !== null ? intval($offset) : null; +} + + function getQueryString() { + $queryString = $this->limit; + if ($this->offset != null) { + $queryString = $queryString . " OFFSET " . $this->offset; + } + return $queryString; + } +} + + diff --git a/src/dba/init.php b/src/dba/init.php index 99bb86bff..eb8ef1a11 100644 --- a/src/dba/init.php +++ b/src/dba/init.php @@ -13,12 +13,14 @@ require_once(dirname(__FILE__) . "/Order.class.php"); require_once(dirname(__FILE__) . "/Join.class.php"); require_once(dirname(__FILE__) . "/Group.class.php"); +require_once(dirname(__FILE__) . "/Limit.class.php"); require_once(dirname(__FILE__) . "/ComparisonFilter.class.php"); require_once(dirname(__FILE__) . "/ContainFilter.class.php"); require_once(dirname(__FILE__) . "/JoinFilter.class.php"); require_once(dirname(__FILE__) . "/OrderFilter.class.php"); require_once(dirname(__FILE__) . "/QueryFilter.class.php"); require_once(dirname(__FILE__) . "/GroupFilter.class.php"); +require_once(dirname(__FILE__) . "/LimitFilter.class.php"); require_once(dirname(__FILE__) . "/Util.class.php"); require_once(dirname(__FILE__) . "/UpdateSet.class.php"); require_once(dirname(__FILE__) . "/MassUpdateSet.class.php"); diff --git a/src/dba/models.py b/src/dba/models.py new file mode 100644 index 000000000..d0d63c3c7 --- /dev/null +++ b/src/dba/models.py @@ -0,0 +1,614 @@ +# This is an auto-generated Django model module. +# You'll have to do the following manually to clean this up: +# * Rearrange models' order +# * Make sure each model has one field with primary_key=True +# * Make sure each ForeignKey and OneToOneField has `on_delete` set to the desired behavior +# * Remove `managed = False` lines if you wish to allow Django to create, modify, and delete the table +# Feel free to rename the models, but don't rename db_table values or field names. +#from django.db import models + +class models: + DO_NOTHING = 'do_nothing' + class Field: + def __init__(self, **kwargs): + pass + class Model: + pass + class AutoField(Field): + pass + + class CharField(Field): + pass + class IntegerField(Field): + pass + class TextField(Field): + pass + class BigIntegerField(Field): + pass + class ForeignKey(Field): + def __init__(self, related_model, on_cascade, **kwargs): + pass + +class Accessgroup(models.Model): + accessgroupid = models.AutoField(db_column='accessGroupId', primary_key=True) + groupname = models.CharField(db_column='groupName', max_length=50) + + class Meta: + managed = False + db_table = 'AccessGroup' + + +class Accessgroupagent(models.Model): + accessgroupagentid = models.AutoField(db_column='accessGroupAgentId', primary_key=True) + accessgroupid = models.ForeignKey(Accessgroup, models.DO_NOTHING, db_column='accessGroupId') + agentid = models.ForeignKey('Agent', models.DO_NOTHING, db_column='agentId') + + class Meta: + managed = False + db_table = 'AccessGroupAgent' + + +class Accessgroupuser(models.Model): + accessgroupuserid = models.AutoField(db_column='accessGroupUserId', primary_key=True) + accessgroupid = models.ForeignKey(Accessgroup, models.DO_NOTHING, db_column='accessGroupId') + userid = models.ForeignKey('User', models.DO_NOTHING, db_column='userId') + + class Meta: + managed = False + db_table = 'AccessGroupUser' + + +class Agent(models.Model): + agentid = models.AutoField(db_column='agentId', primary_key=True) + agentname = models.CharField(db_column='agentName', max_length=100) + uid = models.CharField(max_length=100) + os = models.IntegerField() + devices = models.TextField() + cmdpars = models.CharField(db_column='cmdPars', max_length=256) + ignoreerrors = models.IntegerField(db_column='ignoreErrors') + isactive = models.IntegerField(db_column='isActive') + istrusted = models.IntegerField(db_column='isTrusted') + token = models.CharField(max_length=30) + lastact = models.CharField(db_column='lastAct', max_length=50) + lasttime = models.BigIntegerField(db_column='lastTime') + lastip = models.CharField(db_column='lastIp', max_length=50) + userid = models.ForeignKey('User', models.DO_NOTHING, db_column='userId', blank=True, null=True) + cpuonly = models.IntegerField(db_column='cpuOnly') + clientsignature = models.CharField(db_column='clientSignature', max_length=50) + + class Meta: + managed = False + db_table = 'Agent' + + +class Agentbinary(models.Model): + agentbinaryid = models.AutoField(db_column='agentBinaryId', primary_key=True) + type = models.CharField(max_length=20) + version = models.CharField(max_length=20) + operatingsystems = models.CharField(db_column='operatingSystems', max_length=50) + filename = models.CharField(max_length=50) + updatetrack = models.CharField(db_column='updateTrack', max_length=20) + updateavailable = models.CharField(db_column='updateAvailable', max_length=20) + + class Meta: + managed = False + db_table = 'AgentBinary' + + +class Agenterror(models.Model): + agenterrorid = models.AutoField(db_column='agentErrorId', primary_key=True) + agentid = models.ForeignKey(Agent, models.DO_NOTHING, db_column='agentId') + taskid = models.ForeignKey('Task', models.DO_NOTHING, db_column='taskId', blank=True, null=True) + time = models.BigIntegerField() + error = models.TextField() + chunkid = models.IntegerField(db_column='chunkId', blank=True, null=True) + + class Meta: + managed = False + db_table = 'AgentError' + + +class Agentstat(models.Model): + agentstatid = models.AutoField(db_column='agentStatId', primary_key=True) + agentid = models.ForeignKey(Agent, models.DO_NOTHING, db_column='agentId') + stattype = models.IntegerField(db_column='statType') + time = models.BigIntegerField() + value = models.CharField(max_length=128) + + class Meta: + managed = False + db_table = 'AgentStat' + + +class Agentzap(models.Model): + agentzapid = models.AutoField(db_column='agentZapId', primary_key=True) + agentid = models.ForeignKey(Agent, models.DO_NOTHING, db_column='agentId') + lastzapid = models.ForeignKey('Zap', models.DO_NOTHING, db_column='lastZapId', blank=True, null=True) + + class Meta: + managed = False + db_table = 'AgentZap' + + +class Apigroup(models.Model): + apigroupid = models.AutoField(db_column='apiGroupId', primary_key=True) + name = models.CharField(max_length=100) + permissions = models.TextField() + + class Meta: + managed = False + db_table = 'ApiGroup' + + +class Apikey(models.Model): + apikeyid = models.AutoField(db_column='apiKeyId', primary_key=True) + startvalid = models.BigIntegerField(db_column='startValid') + endvalid = models.BigIntegerField(db_column='endValid') + accesskey = models.CharField(db_column='accessKey', max_length=256) + accesscount = models.IntegerField(db_column='accessCount') + userid = models.ForeignKey('User', models.DO_NOTHING, db_column='userId') + apigroupid = models.ForeignKey(Apigroup, models.DO_NOTHING, db_column='apiGroupId') + + class Meta: + managed = False + db_table = 'ApiKey' + + +class Assignment(models.Model): + assignmentid = models.AutoField(db_column='assignmentId', primary_key=True) + taskid = models.ForeignKey('Task', models.DO_NOTHING, db_column='taskId') + agentid = models.ForeignKey(Agent, models.DO_NOTHING, db_column='agentId') + benchmark = models.CharField(max_length=50) + + class Meta: + managed = False + db_table = 'Assignment' + + +class Chunk(models.Model): + chunkid = models.AutoField(db_column='chunkId', primary_key=True) + taskid = models.ForeignKey('Task', models.DO_NOTHING, db_column='taskId') + skip = models.PositiveBigIntegerField() + length = models.PositiveBigIntegerField() + agentid = models.ForeignKey(Agent, models.DO_NOTHING, db_column='agentId', blank=True, null=True) + dispatchtime = models.BigIntegerField(db_column='dispatchTime') + solvetime = models.BigIntegerField(db_column='solveTime') + checkpoint = models.PositiveBigIntegerField() + progress = models.IntegerField(blank=True, null=True) + state = models.IntegerField() + cracked = models.IntegerField() + speed = models.BigIntegerField() + + class Meta: + managed = False + db_table = 'Chunk' + + +class Config(models.Model): + configid = models.AutoField(db_column='configId', primary_key=True) + configsectionid = models.ForeignKey('Configsection', models.DO_NOTHING, db_column='configSectionId') + item = models.CharField(max_length=80) + value = models.TextField() + + class Meta: + managed = False + db_table = 'Config' + + +class Configsection(models.Model): + configsectionid = models.AutoField(db_column='configSectionId', primary_key=True) + sectionname = models.CharField(db_column='sectionName', max_length=100) + + class Meta: + managed = False + db_table = 'ConfigSection' + + +class Crackerbinary(models.Model): + crackerbinaryid = models.AutoField(db_column='crackerBinaryId', primary_key=True) + crackerbinarytypeid = models.ForeignKey('Crackerbinarytype', models.DO_NOTHING, db_column='crackerBinaryTypeId') + version = models.CharField(max_length=20) + downloadurl = models.CharField(db_column='downloadUrl', max_length=150) + binaryname = models.CharField(db_column='binaryName', max_length=50) + + class Meta: + managed = False + db_table = 'CrackerBinary' + + +class Crackerbinarytype(models.Model): + crackerbinarytypeid = models.AutoField(db_column='crackerBinaryTypeId', primary_key=True) + typename = models.CharField(db_column='typeName', max_length=30) + ischunkingavailable = models.IntegerField(db_column='isChunkingAvailable') + + class Meta: + managed = False + db_table = 'CrackerBinaryType' + + +class File(models.Model): + fileid = models.AutoField(db_column='fileId', primary_key=True) + filename = models.CharField(max_length=100) + size = models.BigIntegerField() + issecret = models.IntegerField(db_column='isSecret') + filetype = models.IntegerField(db_column='fileType') + accessgroupid = models.ForeignKey(Accessgroup, models.DO_NOTHING, db_column='accessGroupId') + linecount = models.BigIntegerField(db_column='lineCount', blank=True, null=True) + + class Meta: + managed = False + db_table = 'File' + + +class Filedelete(models.Model): + filedeleteid = models.AutoField(db_column='fileDeleteId', primary_key=True) + filename = models.CharField(max_length=256) + time = models.BigIntegerField() + + class Meta: + managed = False + db_table = 'FileDelete' + + +class Filedownload(models.Model): + filedownloadid = models.AutoField(db_column='fileDownloadId', primary_key=True) + time = models.BigIntegerField() + fileid = models.ForeignKey(File, models.DO_NOTHING, db_column='fileId') + status = models.IntegerField() + + class Meta: + managed = False + db_table = 'FileDownload' + + +class Filepretask(models.Model): + filepretaskid = models.AutoField(db_column='filePretaskId', primary_key=True) + fileid = models.ForeignKey(File, models.DO_NOTHING, db_column='fileId') + pretaskid = models.ForeignKey('Pretask', models.DO_NOTHING, db_column='pretaskId') + + class Meta: + managed = False + db_table = 'FilePretask' + + +class Filetask(models.Model): + filetaskid = models.AutoField(db_column='fileTaskId', primary_key=True) + fileid = models.ForeignKey(File, models.DO_NOTHING, db_column='fileId') + taskid = models.ForeignKey('Task', models.DO_NOTHING, db_column='taskId') + + class Meta: + managed = False + db_table = 'FileTask' + + +class Hash(models.Model): + hashid = models.AutoField(db_column='hashId', primary_key=True) + hashlistid = models.ForeignKey('Hashlist', models.DO_NOTHING, db_column='hashlistId') + hash = models.TextField() + salt = models.CharField(max_length=256, blank=True, null=True) + plaintext = models.CharField(max_length=256, blank=True, null=True) + timecracked = models.BigIntegerField(db_column='timeCracked', blank=True, null=True) + chunkid = models.ForeignKey(Chunk, models.DO_NOTHING, db_column='chunkId', blank=True, null=True) + iscracked = models.IntegerField(db_column='isCracked') + crackpos = models.BigIntegerField(db_column='crackPos') + + class Meta: + managed = False + db_table = 'Hash' + + +class Hashbinary(models.Model): + hashbinaryid = models.AutoField(db_column='hashBinaryId', primary_key=True) + hashlistid = models.ForeignKey('Hashlist', models.DO_NOTHING, db_column='hashlistId') + essid = models.CharField(max_length=100) + hash = models.TextField() + plaintext = models.CharField(max_length=1024, blank=True, null=True) + timecracked = models.BigIntegerField(db_column='timeCracked', blank=True, null=True) + chunkid = models.ForeignKey(Chunk, models.DO_NOTHING, db_column='chunkId', blank=True, null=True) + iscracked = models.IntegerField(db_column='isCracked') + crackpos = models.BigIntegerField(db_column='crackPos') + + class Meta: + managed = False + db_table = 'HashBinary' + + +class Hashtype(models.Model): + hashtypeid = models.IntegerField(db_column='hashTypeId', primary_key=True) + description = models.CharField(max_length=256) + issalted = models.IntegerField(db_column='isSalted') + isslowhash = models.IntegerField(db_column='isSlowHash') + + class Meta: + managed = False + db_table = 'HashType' + + +class Hashlist(models.Model): + hashlistid = models.AutoField(db_column='hashlistId', primary_key=True) + hashlistname = models.CharField(db_column='hashlistName', max_length=100) + format = models.IntegerField() + hashtypeid = models.ForeignKey(Hashtype, models.DO_NOTHING, db_column='hashTypeId') + hashcount = models.IntegerField(db_column='hashCount') + saltseparator = models.CharField(db_column='saltSeparator', max_length=10, blank=True, null=True) + cracked = models.IntegerField() + issecret = models.IntegerField(db_column='isSecret') + hexsalt = models.IntegerField(db_column='hexSalt') + issalted = models.IntegerField(db_column='isSalted') + accessgroupid = models.ForeignKey(Accessgroup, models.DO_NOTHING, db_column='accessGroupId') + notes = models.TextField() + brainid = models.IntegerField(db_column='brainId') + brainfeatures = models.IntegerField(db_column='brainFeatures') + isarchived = models.IntegerField(db_column='isArchived') + + class Meta: + managed = False + db_table = 'Hashlist' + + +class Hashlisthashlist(models.Model): + hashlisthashlistid = models.AutoField(db_column='hashlistHashlistId', primary_key=True) + parenthashlistid = models.ForeignKey(Hashlist, models.DO_NOTHING, db_column='parentHashlistId') + hashlistid = models.ForeignKey(Hashlist, models.DO_NOTHING, db_column='hashlistId') + + class Meta: + managed = False + db_table = 'HashlistHashlist' + + +class Healthcheck(models.Model): + healthcheckid = models.AutoField(db_column='healthCheckId', primary_key=True) + time = models.BigIntegerField() + status = models.IntegerField() + checktype = models.IntegerField(db_column='checkType') + hashtypeid = models.IntegerField(db_column='hashtypeId') + crackerbinaryid = models.ForeignKey(Crackerbinary, models.DO_NOTHING, db_column='crackerBinaryId') + expectedcracks = models.IntegerField(db_column='expectedCracks') + attackcmd = models.CharField(db_column='attackCmd', max_length=256) + + class Meta: + managed = False + db_table = 'HealthCheck' + + +class Healthcheckagent(models.Model): + healthcheckagentid = models.AutoField(db_column='healthCheckAgentId', primary_key=True) + healthcheckid = models.ForeignKey(Healthcheck, models.DO_NOTHING, db_column='healthCheckId') + agentid = models.ForeignKey(Agent, models.DO_NOTHING, db_column='agentId') + status = models.IntegerField() + cracked = models.IntegerField() + numgpus = models.IntegerField(db_column='numGpus') + start = models.BigIntegerField() + end = models.BigIntegerField() + errors = models.TextField() + + class Meta: + managed = False + db_table = 'HealthCheckAgent' + + +class Logentry(models.Model): + logentryid = models.AutoField(db_column='logEntryId', primary_key=True) + issuer = models.CharField(max_length=50) + issuerid = models.CharField(db_column='issuerId', max_length=50) + level = models.CharField(max_length=50) + message = models.TextField() + time = models.BigIntegerField() + + class Meta: + managed = False + db_table = 'LogEntry' + + +class Notificationsetting(models.Model): + notificationsettingid = models.AutoField(db_column='notificationSettingId', primary_key=True) + action = models.CharField(max_length=50) + objectid = models.IntegerField(db_column='objectId', blank=True, null=True) + notification = models.CharField(max_length=50) + userid = models.ForeignKey('User', models.DO_NOTHING, db_column='userId') + receiver = models.CharField(max_length=256) + isactive = models.IntegerField(db_column='isActive') + + class Meta: + managed = False + db_table = 'NotificationSetting' + + +class Preprocessor(models.Model): + preprocessorid = models.AutoField(db_column='preprocessorId', primary_key=True) + name = models.CharField(max_length=256) + url = models.CharField(max_length=512) + binaryname = models.CharField(db_column='binaryName', max_length=256) + keyspacecommand = models.CharField(db_column='keyspaceCommand', max_length=256, blank=True, null=True) + skipcommand = models.CharField(db_column='skipCommand', max_length=256, blank=True, null=True) + limitcommand = models.CharField(db_column='limitCommand', max_length=256, blank=True, null=True) + + class Meta: + managed = False + db_table = 'Preprocessor' + + +class Pretask(models.Model): + pretaskid = models.AutoField(db_column='pretaskId', primary_key=True) + taskname = models.CharField(db_column='taskName', max_length=100) + attackcmd = models.CharField(db_column='attackCmd', max_length=256) + chunktime = models.IntegerField(db_column='chunkTime') + statustimer = models.IntegerField(db_column='statusTimer') + color = models.CharField(max_length=20, blank=True, null=True) + issmall = models.IntegerField(db_column='isSmall') + iscputask = models.IntegerField(db_column='isCpuTask') + usenewbench = models.IntegerField(db_column='useNewBench') + priority = models.IntegerField() + maxagents = models.IntegerField(db_column='maxAgents') + ismaskimport = models.IntegerField(db_column='isMaskImport') + crackerbinarytypeid = models.ForeignKey(Crackerbinarytype, models.DO_NOTHING, db_column='crackerBinaryTypeId') + + class Meta: + managed = False + db_table = 'Pretask' + + +class Regvoucher(models.Model): + regvoucherid = models.AutoField(db_column='regVoucherId', primary_key=True) + voucher = models.CharField(max_length=100) + time = models.BigIntegerField() + + class Meta: + managed = False + db_table = 'RegVoucher' + + +class Rightgroup(models.Model): + rightgroupid = models.AutoField(db_column='rightGroupId', primary_key=True) + groupname = models.CharField(db_column='groupName', max_length=50) + permissions = models.TextField() + + class Meta: + managed = False + db_table = 'RightGroup' + + +class Session(models.Model): + sessionid = models.AutoField(db_column='sessionId', primary_key=True) + userid = models.ForeignKey('User', models.DO_NOTHING, db_column='userId') + sessionstartdate = models.BigIntegerField(db_column='sessionStartDate') + lastactiondate = models.BigIntegerField(db_column='lastActionDate') + isopen = models.IntegerField(db_column='isOpen') + sessionlifetime = models.IntegerField(db_column='sessionLifetime') + sessionkey = models.CharField(db_column='sessionKey', max_length=256) + + class Meta: + managed = False + db_table = 'Session' + + +class Speed(models.Model): + speedid = models.AutoField(db_column='speedId', primary_key=True) + agentid = models.ForeignKey(Agent, models.DO_NOTHING, db_column='agentId') + taskid = models.ForeignKey('Task', models.DO_NOTHING, db_column='taskId') + speed = models.BigIntegerField() + time = models.BigIntegerField() + + class Meta: + managed = False + db_table = 'Speed' + + +class Storedvalue(models.Model): + storedvalueid = models.CharField(db_column='storedValueId', primary_key=True, max_length=50) + val = models.CharField(max_length=256) + + class Meta: + managed = False + db_table = 'StoredValue' + + +class Supertask(models.Model): + supertaskid = models.AutoField(db_column='supertaskId', primary_key=True) + supertaskname = models.CharField(db_column='supertaskName', max_length=50) + + class Meta: + managed = False + db_table = 'Supertask' + + +class Supertaskpretask(models.Model): + supertaskpretaskid = models.AutoField(db_column='supertaskPretaskId', primary_key=True) + supertaskid = models.ForeignKey(Supertask, models.DO_NOTHING, db_column='supertaskId') + pretaskid = models.ForeignKey(Pretask, models.DO_NOTHING, db_column='pretaskId') + + class Meta: + managed = False + db_table = 'SupertaskPretask' + + +class Task(models.Model): + taskid = models.AutoField(db_column='taskId', primary_key=True) + taskname = models.CharField(db_column='taskName', max_length=256) + attackcmd = models.CharField(db_column='attackCmd', max_length=256) + chunktime = models.IntegerField(db_column='chunkTime') + statustimer = models.IntegerField(db_column='statusTimer') + keyspace = models.BigIntegerField() + keyspaceprogress = models.BigIntegerField(db_column='keyspaceProgress') + priority = models.IntegerField() + maxagents = models.IntegerField(db_column='maxAgents') + color = models.CharField(max_length=20, blank=True, null=True) + issmall = models.IntegerField(db_column='isSmall') + iscputask = models.IntegerField(db_column='isCpuTask') + usenewbench = models.IntegerField(db_column='useNewBench') + skipkeyspace = models.BigIntegerField(db_column='skipKeyspace') + crackerbinaryid = models.ForeignKey(Crackerbinary, models.DO_NOTHING, db_column='crackerBinaryId', blank=True, null=True) + crackerbinarytypeid = models.ForeignKey(Crackerbinarytype, models.DO_NOTHING, db_column='crackerBinaryTypeId', blank=True, null=True) + taskwrapperid = models.ForeignKey('Taskwrapper', models.DO_NOTHING, db_column='taskWrapperId') + isarchived = models.IntegerField(db_column='isArchived') + notes = models.TextField() + staticchunks = models.IntegerField(db_column='staticChunks') + chunksize = models.BigIntegerField(db_column='chunkSize') + forcepipe = models.IntegerField(db_column='forcePipe') + usepreprocessor = models.IntegerField(db_column='usePreprocessor') + preprocessorcommand = models.CharField(db_column='preprocessorCommand', max_length=256) + + class Meta: + managed = False + db_table = 'Task' + + +class Taskdebugoutput(models.Model): + taskdebugoutputid = models.AutoField(db_column='taskDebugOutputId', primary_key=True) + taskid = models.ForeignKey(Task, models.DO_NOTHING, db_column='taskId') + output = models.CharField(max_length=256) + + class Meta: + managed = False + db_table = 'TaskDebugOutput' + + +class Taskwrapper(models.Model): + taskwrapperid = models.AutoField(db_column='taskWrapperId', primary_key=True) + priority = models.IntegerField() + maxagents = models.IntegerField(db_column='maxAgents') + tasktype = models.IntegerField(db_column='taskType') + hashlistid = models.ForeignKey(Hashlist, models.DO_NOTHING, db_column='hashlistId') + accessgroupid = models.ForeignKey(Accessgroup, models.DO_NOTHING, db_column='accessGroupId', blank=True, null=True) + taskwrappername = models.CharField(db_column='taskWrapperName', max_length=100) + isarchived = models.IntegerField(db_column='isArchived') + cracked = models.IntegerField() + + class Meta: + managed = False + db_table = 'TaskWrapper' + + +class User(models.Model): + userid = models.AutoField(db_column='userId', primary_key=True) + username = models.CharField(unique=True, max_length=100) + email = models.CharField(max_length=150) + passwordhash = models.CharField(db_column='passwordHash', max_length=256) + passwordsalt = models.CharField(db_column='passwordSalt', max_length=256) + isvalid = models.IntegerField(db_column='isValid') + iscomputedpassword = models.IntegerField(db_column='isComputedPassword') + lastlogindate = models.BigIntegerField(db_column='lastLoginDate') + registeredsince = models.BigIntegerField(db_column='registeredSince') + sessionlifetime = models.IntegerField(db_column='sessionLifetime') + rightgroupid = models.ForeignKey(Rightgroup, models.DO_NOTHING, db_column='rightGroupId') + yubikey = models.CharField(max_length=256, blank=True, null=True) + otp1 = models.CharField(max_length=256, blank=True, null=True) + otp2 = models.CharField(max_length=256, blank=True, null=True) + otp3 = models.CharField(max_length=256, blank=True, null=True) + otp4 = models.CharField(max_length=256, blank=True, null=True) + + class Meta: + managed = False + db_table = 'User' + + +class Zap(models.Model): + zapid = models.AutoField(db_column='zapId', primary_key=True) + hash = models.TextField() + solvetime = models.BigIntegerField(db_column='solveTime') + agentid = models.ForeignKey(Agent, models.DO_NOTHING, db_column='agentId', blank=True, null=True) + hashlistid = models.ForeignKey(Hashlist, models.DO_NOTHING, db_column='hashlistId') + + class Meta: + managed = False + db_table = 'Zap' diff --git a/src/dba/models/Task.class.php b/src/dba/models/Task.class.php index f62750433..9635e2f62 100644 --- a/src/dba/models/Task.class.php +++ b/src/dba/models/Task.class.php @@ -96,7 +96,7 @@ static function getFeatures() { $dict['keyspaceProgress'] = ['read_only' => True, "type" => "int64", "subtype" => "unset", "choices" => "unset", "null" => False, "pk" => False, "protected" => True, "private" => False, "alias" => "keyspaceProgress"]; $dict['priority'] = ['read_only' => False, "type" => "int", "subtype" => "unset", "choices" => "unset", "null" => False, "pk" => False, "protected" => False, "private" => False, "alias" => "priority"]; $dict['maxAgents'] = ['read_only' => False, "type" => "int", "subtype" => "unset", "choices" => "unset", "null" => False, "pk" => False, "protected" => False, "private" => False, "alias" => "maxAgents"]; - $dict['color'] = ['read_only' => False, "type" => "str(50)", "subtype" => "unset", "choices" => "unset", "null" => True, "pk" => False, "protected" => False, "private" => False, "alias" => "color"]; + $dict['color'] = ['read_only' => False, "type" => "str(20)", "subtype" => "unset", "choices" => "unset", "null" => True, "pk" => False, "protected" => False, "private" => False, "alias" => "color"]; $dict['isSmall'] = ['read_only' => False, "type" => "bool", "subtype" => "unset", "choices" => "unset", "null" => False, "pk" => False, "protected" => False, "private" => False, "alias" => "isSmall"]; $dict['isCpuTask'] = ['read_only' => False, "type" => "bool", "subtype" => "unset", "choices" => "unset", "null" => False, "pk" => False, "protected" => False, "private" => False, "alias" => "isCpuTask"]; $dict['useNewBench'] = ['read_only' => True, "type" => "bool", "subtype" => "unset", "choices" => "unset", "null" => False, "pk" => False, "protected" => False, "private" => False, "alias" => "useNewBench"]; diff --git a/src/dba/models/generator.php b/src/dba/models/generator.php index 870589a8a..77086d171 100644 --- a/src/dba/models/generator.php +++ b/src/dba/models/generator.php @@ -64,7 +64,7 @@ ['name' => 'lastAct', 'read_only' => True, 'type' => 'str(50)', 'protected' => True], ['name' => 'lastTime', 'read_only' => True, 'type' => 'int64', 'protected' => True], ['name' => 'lastIp', 'read_only' => True, 'type' => 'str(50)', 'protected' => True], - ['name' => 'userId', 'read_only' => False, 'type' => 'int', 'null' => True], + ['name' => 'userId', 'read_only' => False, 'type' => 'int', 'null' => True, 'relation' => 'User'], ['name' => 'cpuOnly', 'read_only' => False, 'type' => 'bool'], ['name' => 'clientSignature', 'read_only' => False, 'type' => 'str(50)'], ], @@ -83,9 +83,9 @@ $CONF['AgentError'] = [ 'columns' => [ ['name' => 'agentErrorId', 'read_only' => True, 'type' => 'int', 'protected' => True], - ['name' => 'agentId', 'read_only' => True, 'type' => 'int', 'protected' => True], - ['name' => 'taskId', 'read_only' => True, 'type' => 'int', 'protected' => True], - ['name' => 'chunkId', 'read_only' => True, 'type' => 'int', 'protected' => True], + ['name' => 'agentId', 'read_only' => True, 'type' => 'int', 'protected' => True, 'relation' => 'Agent'], + ['name' => 'taskId', 'read_only' => True, 'type' => 'int', 'protected' => True, 'relation' => 'Task'], + ['name' => 'chunkId', 'read_only' => True, 'type' => 'int', 'protected' => True, 'relation' => 'Chunk'], ['name' => 'time', 'read_only' => True, 'type' => 'int64', 'protected' => True], ['name' => 'error', 'read_only' => True, 'type' => 'str(65535)', 'protected' => True], ], @@ -93,7 +93,7 @@ $CONF['AgentStat'] = [ 'columns' => [ ['name' => 'agentStatId', 'read_only' => True, 'type' => 'int', 'protected' => True], - ['name' => 'agentId', 'read_only' => True, 'protected' => True, 'type' => 'int', 'protected' => True], + ['name' => 'agentId', 'read_only' => True, 'protected' => True, 'type' => 'int', 'protected' => True, 'relation' => 'Agent'], ['name' => 'statType', 'read_only' => True, 'protected' => True, 'type' => 'int', 'protected' => True], ['name' => 'time', 'read_only' => True, 'protected' => True, 'type' => 'int64', 'protected' => True], ['name' => 'value', 'read_only' => True, 'protected' => True, 'type' => 'array', 'subtype' => 'int', 'protected' => True], @@ -102,7 +102,7 @@ $CONF['AgentZap'] = [ 'columns' => [ ['name' => 'agentZapId', 'read_only' => True, 'type' => 'int', 'protected' => True], - ['name' => 'agentId', 'read_only' => True, 'type' => 'int', 'protected' => True], + ['name' => 'agentId', 'read_only' => True, 'type' => 'int', 'protected' => True, 'relation' => 'Agent'], ['name' => 'lastZapId', 'read_only' => True, 'type' => 'str(128)', 'protected' => True], ], ]; @@ -113,8 +113,8 @@ ['name' => 'endValid', 'read_only' => False, 'type' => 'int64'], ['name' => 'accessKey', 'read_only' => True, 'type' => 'str(256)', 'protected' => True], ['name' => 'accessCount', 'read_only' => True, 'type' => 'int', 'protected' => True], - ['name' => 'userId', 'read_only' => False, 'type' => 'int'], - ['name' => 'apiGroupId', 'read_only' => False, 'type' => 'int'], + ['name' => 'userId', 'read_only' => False, 'type' => 'int', 'relation' => 'User'], + ['name' => 'apiGroupId', 'read_only' => False, 'type' => 'int', 'relation' => 'ApiGroup'], ], ]; $CONF['ApiGroup'] = [ @@ -128,18 +128,18 @@ 'permission_alias' => 'AgentAssignment', 'columns' => [ ['name' => 'assignmentId', 'read_only' => True, 'type' => 'int', 'protected' => True], - ['name' => 'taskId', 'read_only' => False, 'type' => 'int'], - ['name' => 'agentId', 'read_only' => False, 'type' => 'int'], + ['name' => 'taskId', 'read_only' => False, 'type' => 'int', 'relation' => 'Task'], + ['name' => 'agentId', 'read_only' => False, 'type' => 'int', 'relation' => 'Agent'], ['name' => 'benchmark', 'read_only' => True, 'type' => 'str(50)', 'protected' => True], ], ]; $CONF['Chunk'] = [ 'columns' => [ ['name' => 'chunkId', 'read_only' => True, 'type' => 'int', 'protected' => True], - ['name' => 'taskId', 'read_only' => True, 'type' => 'int', 'protected' => True], + ['name' => 'taskId', 'read_only' => True, 'type' => 'int', 'protected' => True, 'relation' => 'Task'], ['name' => 'skip', 'read_only' => True, 'type' => 'uint64', 'protected' => True], ['name' => 'length', 'read_only' => True, 'type' => 'uint64', 'protected' => True], - ['name' => 'agentId', 'read_only' => True, 'type' => 'int', 'protected' => True], + ['name' => 'agentId', 'read_only' => True, 'type' => 'int', 'protected' => True, 'relation' => 'Agent'], ['name' => 'dispatchTime', 'read_only' => True, 'type' => 'int64', 'protected' => True], ['name' => 'solveTime', 'read_only' => True, 'type' => 'int64', 'protected' => True], ['name' => 'checkpoint', 'read_only' => True, 'type' => 'int64', 'protected' => True], @@ -152,7 +152,7 @@ $CONF['Config'] = [ 'columns' => [ ['name' => 'configId', 'read_only' => True, 'type' => 'int', 'protected' => True], - ['name' => 'configSectionId', 'read_only' => False, 'type' => 'int'], + ['name' => 'configSectionId', 'read_only' => False, 'type' => 'int', 'relation' => 'ConfigSecion'], ['name' => 'item', 'read_only' => False, 'type' => 'str(128)'], ['name' => 'value', 'read_only' => False, 'type' => 'str(65535)'], ], @@ -166,7 +166,7 @@ $CONF['CrackerBinary'] = [ 'columns' => [ ['name' => 'crackerBinaryId', 'read_only' => True, 'type' => 'int', 'protected' => True], - ['name' => 'crackerBinaryTypeId', 'read_only' => False, 'type' => 'int'], + ['name' => 'crackerBinaryTypeId', 'read_only' => False, 'type' => 'int', 'relation' => 'CrackerBinaryType'], ['name' => 'version', 'read_only' => False, 'type' => 'str(20)'], ['name' => 'downloadUrl', 'read_only' => False, 'type' => 'str(150)'], ['name' => 'binaryName', 'read_only' => False, 'type' => 'str(50)'], @@ -186,7 +186,7 @@ ['name' => 'size', 'read_only' => True, 'type' => 'int64', 'protected' => True], ['name' => 'isSecret', 'read_only' => False, 'type' => 'bool'], ['name' => 'fileType', 'read_only' => False, 'type' => 'int'], - ['name' => 'accessGroupId', 'read_only' => False, 'type' => 'int'], + ['name' => 'accessGroupId', 'read_only' => False, 'type' => 'int', 'relation' => 'AccessGroup'], ['name' => 'lineCount', 'read_only' => True, 'type' => 'int64', 'protected' => True], ], ]; @@ -201,19 +201,19 @@ 'columns' => [ ['name' => 'fileDownloadId', 'read_only' => True, 'type' => 'int', 'protected' => True], ['name' => 'time', 'read_only' => True, 'type' => 'int64', 'protected' => True], - ['name' => 'fileId', 'read_only' => True, 'type' => 'int', 'protected' => True], + ['name' => 'fileId', 'read_only' => True, 'type' => 'int', 'protected' => True, 'relation' => 'File'], ['name' => 'status', 'read_only' => True, 'type' => 'int', 'protected' => True], ], ]; $CONF['Hash'] = [ 'columns' => [ ['name' => 'hashId', 'read_only' => True, 'type' => 'int', 'protected' => True], - ['name' => 'hashlistId', 'read_only' => False, 'type' => 'int'], + ['name' => 'hashlistId', 'read_only' => False, 'type' => 'int', 'relation' => 'Hashlist'], ['name' => 'hash', 'read_only' => False, 'type' => 'str(65535)'], ['name' => 'salt', 'read_only' => False, 'type' => 'str(256)'], ['name' => 'plaintext', 'read_only' => False, 'type' => 'str(256)'], ['name' => 'timeCracked', 'read_only' => False, 'type' => 'int64'], - ['name' => 'chunkId', 'read_only' => False, 'type' => 'int'], + ['name' => 'chunkId', 'read_only' => False, 'type' => 'int', 'relation' => 'Chunk'], ['name' => 'isCracked', 'read_only' => False, 'type' => 'bool'], ['name' => 'crackPos', 'read_only' => False, 'type' => 'int64'], ], @@ -221,12 +221,12 @@ $CONF['HashBinary'] = [ 'columns' => [ ['name' => 'hashBinaryId', 'read_only' => True, 'type' => 'int', 'protected' => True], - ['name' => 'hashlistId', 'read_only' => False, 'type' => 'int'], + ['name' => 'hashlistId', 'read_only' => False, 'type' => 'int', 'relation' => 'Hashlist'], ['name' => 'essid', 'read_only' => False, 'type' => 'str(100)'], ['name' => 'hash', 'read_only' => False, 'type' => 'str(4294967295)'], ['name' => 'plaintext', 'read_only' => False, 'type' => 'str(1024)'], ['name' => 'timeCracked', 'read_only' => False, 'type' => 'int64'], - ['name' => 'chunkId', 'read_only' => False, 'type' => 'int'], + ['name' => 'chunkId', 'read_only' => False, 'type' => 'int', 'relation' => 'Chunk'], ['name' => 'isCracked', 'read_only' => False, 'type' => 'bool'], ['name' => 'crackPos', 'read_only' => False, 'type' => 'int64'], ], @@ -236,14 +236,14 @@ ['name' => 'hashlistId', 'read_only' => True, 'type' => 'int', 'protected' => True], ['name' => 'hashlistName', 'read_only' => False, 'type' => 'str(100)', 'alias' => UQueryHashlist::HASHLIST_NAME], ['name' => 'format', 'read_only' => True, 'type' => 'int', 'choices' => $FieldHashlistFormatChoices], - ['name' => 'hashTypeId', 'read_only' => True, 'type' => 'int'], + ['name' => 'hashTypeId', 'read_only' => True, 'type' => 'int', 'relation' => 'HashType'], ['name' => 'hashCount', 'read_only' => True, 'type' => 'int'], ['name' => 'saltSeparator', 'read_only' => True, 'type' => 'str(10)', 'null' => True, 'alias' => UQueryHashlist::HASHLIST_SEPARATOR], ['name' => 'cracked', 'read_only' => true, 'type' => 'int', 'protected' => True], ['name' => 'isSecret', 'read_only' => False, 'type' => 'bool'], ['name' => 'hexSalt', 'read_only' => True, 'type' => 'bool', 'alias' => UQueryHashlist::HASHLIST_HEX_SALTED], ['name' => 'isSalted', 'read_only' => True, 'type' => 'bool'], - ['name' => 'accessGroupId', 'read_only' => False, 'type' => 'int'], + ['name' => 'accessGroupId', 'read_only' => False, 'type' => 'int', , 'relation' => 'AccessGroup'], ['name' => 'notes', 'read_only' => False, 'type' => 'str(65535)'], ['name' => 'brainId', 'read_only' => True, 'type' => 'bool', 'alias' => UQueryHashlist::HASHLIST_USE_BRAIN], ['name' => 'brainFeatures', 'read_only' => True, 'type' => 'int'], @@ -264,8 +264,8 @@ ['name' => 'time', 'read_only' => True, 'type' => 'int64', 'protected' => True], ['name' => 'status', 'read_only' => True, 'type' => 'int', 'protected' => True], ['name' => 'checkType', 'read_only' => False, 'type' => 'int'], - ['name' => 'hashtypeId', 'read_only' => False, 'type' => 'int'], - ['name' => 'crackerBinaryId', 'read_only' => False, 'type' => 'int'], + ['name' => 'hashtypeId', 'read_only' => False, 'type' => 'int', 'relation' => 'HashType'], + ['name' => 'crackerBinaryId', 'read_only' => False, 'type' => 'int', 'relation' => 'CrackerBinary'], ['name' => 'expectedCracks', 'read_only' => True, 'type' => 'int', 'protected' => True], ['name' => 'attackCmd', 'read_only' => True, 'type' => 'str(65535)', 'protected' => True], ], @@ -273,8 +273,8 @@ $CONF['HealthCheckAgent'] = [ 'columns' => [ ['name' => 'healthCheckAgentId', 'read_only' => True, 'type' => 'int', 'protected' => True], - ['name' => 'healthCheckId', 'read_only' => True, 'type' => 'int', 'protected' => True], - ['name' => 'agentId', 'read_only' => True, 'type' => 'int', 'protected' => True], + ['name' => 'healthCheckId', 'read_only' => True, 'type' => 'int', 'protected' => True, 'relation' => 'HealthCheck'], + ['name' => 'agentId', 'read_only' => True, 'type' => 'int', 'protected' => True, 'relation' => 'Agent'], ['name' => 'status', 'read_only' => True, 'type' => 'int', 'protected' => True], ['name' => 'cracked', 'read_only' => True, 'type' => 'int', 'protected' => True], ['name' => 'numGpus', 'read_only' => True, 'type' => 'int', 'protected' => True], @@ -299,7 +299,7 @@ ['name' => 'action', 'read_only' => False, 'type' => 'str(50)'], ['name' => 'objectId', 'read_only' => True, 'type' => 'int', 'protected' => True], ['name' => 'notification', 'read_only' => False, 'type' => 'str(50)'], - ['name' => 'userId', 'read_only' => True, 'type' => 'int', 'protected' => True], + ['name' => 'userId', 'read_only' => True, 'type' => 'int', 'protected' => True, 'relation' => 'User'], ['name' => 'receiver', 'read_only' => False, 'type' => 'str(256)'], ['name' => 'isActive', 'read_only' => False, 'type' => 'bool'], ], @@ -349,7 +349,7 @@ $CONF['Session'] = [ 'columns' => [ ['name' => 'sessionId', 'read_only' => True, 'type' => 'int', 'protected' => True], - ['name' => 'userId', 'read_only' => True, 'type' => 'int', 'protected' => True], + ['name' => 'userId', 'read_only' => True, 'type' => 'int', 'protected' => True, , 'relation' => 'User'], ['name' => 'sessionStartDate', 'read_only' => True, 'type' => 'int64', 'protected' => True], ['name' => 'lastActionDate', 'read_only' => True, 'type' => 'int64', 'protected' => True], ['name' => 'isOpen', 'read_only' => True, 'type' => 'bool', 'protected' => True], @@ -360,8 +360,8 @@ $CONF['Speed'] = [ 'columns' => [ ['name' => 'speedId', 'read_only' => True, 'type' => 'int', 'protected' => True], - ['name' => 'agentId', 'read_only' => True, 'type' => 'int', 'protected' => True], - ['name' => 'taskId', 'read_only' => True, 'type' => 'int', 'protected' => True], + ['name' => 'agentId', 'read_only' => True, 'type' => 'int', 'protected' => True, 'relation' => 'Agent'], + ['name' => 'taskId', 'read_only' => True, 'type' => 'int', 'protected' => True, 'relation' => 'Task'], ['name' => 'speed', 'read_only' => True, 'type' => 'int64', 'protected' => True], ['name' => 'time', 'read_only' => True, 'type' => 'int64', 'protected' => True], ], @@ -394,9 +394,9 @@ ['name' => 'isCpuTask', 'read_only' => False, 'type' => 'bool'], ['name' => 'useNewBench', 'read_only' => True, 'type' => 'bool'], ['name' => 'skipKeyspace', 'read_only' => True, 'type' => 'int64'], - ['name' => 'crackerBinaryId', 'read_only' => True, 'type' => 'int'], - ['name' => 'crackerBinaryTypeId', 'read_only' => True, 'type' => 'int'], - ['name' => 'taskWrapperId', 'read_only' => True, 'type' => 'int', 'protected' => True], + ['name' => 'crackerBinaryId', 'read_only' => True, 'type' => 'int', 'relation' => 'CrackerBinary'], + ['name' => 'crackerBinaryTypeId', 'read_only' => True, 'type' => 'int', 'relation' => 'CrackerBinaryType'], + ['name' => 'taskWrapperId', 'read_only' => True, 'type' => 'int', 'protected' => True, , 'relation' => 'TaskWrapper'], ['name' => 'isArchived', 'read_only' => False, 'type' => 'bool'], ['name' => 'notes', 'read_only' => False, 'type' => 'str(65535)'], ['name' => 'staticChunks', 'read_only' => True, 'type' => 'int'], @@ -409,7 +409,7 @@ $CONF['TaskDebugOutput'] = [ 'columns' => [ ['name' => 'taskDebugOutputId', 'read_only' => True, 'type' => 'int', 'protected' => True], - ['name' => 'taskId', 'read_only' => True, 'type' => 'int'], + ['name' => 'taskId', 'read_only' => True, 'type' => 'int', 'relation' => 'Task'], ['name' => 'output', 'read_only' => True, 'type' => 'str(256)'], ], ]; @@ -419,8 +419,8 @@ ['name' => 'priority', 'read_only' => False, 'type' => 'int'], ['name' => 'maxAgents', 'read_only' => False, 'type' => 'int'], ['name' => 'taskType', 'read_only' => True, 'type' => 'int', 'protected' => True, 'choices' => $FieldTaskTypeChoices], - ['name' => 'hashlistId', 'read_only' => True, 'type' => 'int', 'protected' => True], - ['name' => 'accessGroupId', 'read_only' => False, 'type' => 'int'], + ['name' => 'hashlistId', 'read_only' => True, 'type' => 'int', 'protected' => True, 'relation' => 'Hashlist'], + ['name' => 'accessGroupId', 'read_only' => False, 'type' => 'int', 'relation' => 'AccessGroup'], ['name' => 'taskWrapperName', 'read_only' => False, 'type' => 'str(100)'], ['name' => 'isArchived', 'read_only' => False, 'type' => 'bool'], ['name' => 'cracked', 'read_only' => False, 'type' => 'int', 'protected' => True], @@ -438,7 +438,7 @@ ['name' => 'lastLoginDate', 'read_only' => True, 'type' => 'int64', 'protected' => True], ['name' => 'registeredSince', 'read_only' => True, 'type' => 'int64', 'protected' => True], ['name' => 'sessionLifetime', 'read_only' => True, 'type' => 'int', 'protected' => True], - ['name' => 'rightGroupId', 'read_only' => False, 'type' => 'int', 'alias' => 'globalPermissionGroupId'], + ['name' => 'rightGroupId', 'read_only' => False, 'type' => 'int', 'alias' => 'globalPermissionGroupId', 'relation' => 'RightGroup' ], ['name' => 'yubikey', 'read_only' => True, 'type' => 'str(256)', 'protected' => True], ['name' => 'otp1', 'read_only' => True, 'type' => 'str(256)', 'protected' => True], ['name' => 'otp2', 'read_only' => True, 'type' => 'str(256)', 'protected' => True], @@ -451,8 +451,8 @@ ['name' => 'zapId', 'read_only' => True, 'type' => 'int', 'protected' => True], ['name' => 'hash', 'read_only' => True, 'type' => 'str(65535)', 'protected' => True], ['name' => 'solveTime', 'read_only' => True, 'type' => 'int64', 'protected' => True], - ['name' => 'agentId', 'read_only' => True, 'type' => 'int', 'protected' => True], - ['name' => 'hashlistId', 'read_only' => True, 'type' => 'int', 'protected' => True], + ['name' => 'agentId', 'read_only' => True, 'type' => 'int', 'protected' => True, 'relation' => 'Agent'], + ['name' => 'hashlistId', 'read_only' => True, 'type' => 'int', 'protected' => True, 'relation' => 'Hashlist'], ], ]; // @@ -461,43 +461,43 @@ $CONF['AccessGroupUser'] = [ 'columns' => [ ['name' => 'accessGroupUserId', 'read_only' => True, 'type' => 'int', 'protected' => True], - ['name' => 'accessGroupId', 'read_only' => True, 'type' => 'int'], - ['name' => 'userId', 'read_only' => True, 'type' => 'int'], + ['name' => 'accessGroupId', 'read_only' => True, 'type' => 'int', 'relation' => 'AccessGroup'], + ['name' => 'userId', 'read_only' => True, 'type' => 'int', 'relation' => 'User'], ], ]; $CONF['AccessGroupAgent'] = [ 'columns' => [ ['name' => 'accessGroupAgentId', 'read_only' => True, 'type' => 'int', 'protected' => True], - ['name' => 'accessGroupId', 'read_only' => True, 'type' => 'int'], - ['name' => 'agentId', 'read_only' => True, 'type' => 'int'], + ['name' => 'accessGroupId', 'read_only' => True, 'type' => 'int', 'relation' => 'accessGroup'], + ['name' => 'agentId', 'read_only' => True, 'type' => 'int', 'relation' => 'Agent'], ], ]; $CONF['FileTask'] = [ 'columns' => [ ['name' => 'fileTaskId', 'read_only' => True, 'type' => 'int', 'protected' => True], - ['name' => 'fileId', 'read_only' => True, 'type' => 'int'], - ['name' => 'taskId', 'read_only' => True, 'type' => 'int'], + ['name' => 'fileId', 'read_only' => True, 'type' => 'int', 'relation' => 'File'], + ['name' => 'taskId', 'read_only' => True, 'type' => 'int', 'relation' => 'Task'], ], ]; $CONF['FilePretask'] = [ 'columns' => [ ['name' => 'filePretaskId', 'read_only' => True, 'type' => 'int', 'protected' => True], - ['name' => 'fileId', 'read_only' => True, 'type' => 'int'], - ['name' => 'pretaskId', 'read_only' => True, 'type' => 'int'], + ['name' => 'fileId', 'read_only' => True, 'type' => 'int', 'relation' => 'File'], + ['name' => 'pretaskId', 'read_only' => True, 'type' => 'int', 'relation' => 'PreTask'], ], ]; $CONF['SupertaskPretask'] = [ 'columns' => [ ['name' => 'supertaskPretaskId', 'read_only' => True, 'type' => 'int', 'protected' => True], - ['name' => 'supertaskId', 'read_only' => True, 'type' => 'int'], - ['name' => 'pretaskId', 'read_only' => True, 'type' => 'int'], + ['name' => 'supertaskId', 'read_only' => True, 'type' => 'int', 'relation' => 'Supertask'], + ['name' => 'pretaskId', 'read_only' => True, 'type' => 'int', 'relation' => 'Pretask'], ], ]; $CONF['HashlistHashlist'] = [ 'columns' => [ ['name' => 'hashlistHashlistId', 'read_only' => True, 'type' => 'int', 'protected' => True], - ['name' => 'parentHashlistId', 'read_only' => True, 'type' => 'int'], - ['name' => 'hashlistId', 'read_only' => True, 'type' => 'int'], + ['name' => 'parentHashlistId', 'read_only' => True, 'type' => 'int', 'relation' => 'Hashlist'], + ['name' => 'hashlistId', 'read_only' => True, 'type' => 'int', 'relation' => 'Hashlist'], ], ]; diff --git a/src/inc/apiv2/common/AbstractBaseAPI.class.php b/src/inc/apiv2/common/AbstractBaseAPI.class.php index c5018ace3..1a15e1df0 100644 --- a/src/inc/apiv2/common/AbstractBaseAPI.class.php +++ b/src/inc/apiv2/common/AbstractBaseAPI.class.php @@ -1,11 +1,15 @@ user; } - /** - * Available 'expand' parameters on $object - */ - public function getExpandables(): array { - return []; - } - - /** - * Fetch objects for $expand on $objects - */ - protected function fetchExpandObjects(array $objects, string $expand): mixed { - } - protected static function getModelFactory(string $model): object { switch($model) { case AccessGroup::class: return Factory::getAccessGroupFactory(); + case AccessGroupAgent::class: + return Factory::getAccessGroupAgentFactory(); + case AccessGroupUser::class: + return Factory::getAccessGroupUserFactory(); case Agent::class: return Factory::getAgentFactory(); case AgentBinary::class: @@ -173,6 +172,10 @@ protected static function getModelFactory(string $model): object { return Factory::getCrackerBinaryTypeFactory(); case File::class: return Factory::getFileFactory(); + case FileTask::class: + return Factory::getFileTaskFactory(); + case FilePretask::class: + return Factory::getFilePretaskFactory(); case Hash::class: return Factory::getHashFactory(); case Hashlist::class: @@ -201,6 +204,8 @@ protected static function getModelFactory(string $model): object { return Factory::getSpeedFactory(); case Supertask::class: return Factory::getSupertaskFactory(); + case SupertaskPretask::class: + return Factory::getSupertaskPretaskFactory(); case Task::class: return Factory::getTaskFactory(); case TaskWrapper::class: @@ -261,9 +266,29 @@ final protected static function getUser(int $pk): User return self::fetchOne(User::class, $pk); } + /** + * Return Object Resource Type Identifier of API object. + * + * @param mixed $obj + * @return string + */ + final protected function getObjectTypeName($obj): string + { + + $container = $this->container->get('classMapper'); + + if (is_string($obj)) { + $apiClass = $this->container->get('classMapper')->get($obj); + } else { + $apiClass = $this->container->get('classMapper')->get(get_class($obj)); + } + + /* Use the API class Name as type identifier written in camelCase*/ + return lcfirst(substr($apiClass, 0, -3)); + } /** - * Retrieve permissions based on expand section + * Retrieve permissions based on expand section */ protected static function getExpandPermissions(string $expand): array { @@ -271,7 +296,7 @@ protected static function getExpandPermissions(string $expand): array 'assignedAgents' => [Agent::PERM_READ], 'agent' => [Agent::PERM_READ], 'agents' => [AccessGroup::PERM_READ], - 'agentstats' => [AgentStat::PERM_READ], + 'agentStats' => [AgentStat::PERM_READ], 'accessGroups' => [AccessGroup::PERM_READ], 'accessGroup' => [AccessGroup::PERM_READ], 'chunk' => [Chunk::PERM_READ], @@ -293,6 +318,7 @@ protected static function getExpandPermissions(string $expand): array 'files' => [FileTask::PERM_READ, File::PERM_READ], 'pretasks' => [Supertask::PERM_READ, Pretask::PERM_READ], 'user' => [User::PERM_READ], + 'users' => [User::PERM_READ], 'userMembers' => [User::PERM_READ], 'agentMembers' => [Agent::PERM_READ], ); @@ -396,8 +422,6 @@ protected static function db2json(array $feature, mixed $val): mixed } } elseif ($feature['type'] == 'array' && $feature['subtype'] == 'int') { $obj = array_map('intval', preg_split("/,/", $val, -1, PREG_SPLIT_NO_EMPTY)); - } elseif ($feature['type'] == 'dict' && $feature['subtype'] = 'bool') { - $obj = unserialize($val); } elseif (str_starts_with($feature['type'], 'str') && $val !== null) { $obj = html_entity_decode($val, ENT_COMPAT, "UTF-8"); } @@ -457,6 +481,110 @@ protected function obj2Array(object $obj) return $item; } + /** + * Convert DB object JSON:API Resource Object + */ + protected function obj2Resource(object $obj, array $expandResult = []) + { + // Convert values to JSON supported types + $features = $obj->getFeatures(); + $kv = $obj->getKeyValueDict(); + + $apiClass = $this->container->get('classMapper')->get(get_class($obj)); + $linkSelf = $this->routeParser->urlFor($apiClass . ':getOne', ['id' => $obj->getId()]); + + $attributes = []; + $relationships = []; + + /* Collect attributes */ + foreach ($features as $name => $feature) { + // If a attribute is set to private, it should be hidden and not returned. + // Example of this is the password hash. + if ($feature['private'] === true) { + continue; + } + // Hide the primaryKey from the attributes since this is used as indentifier (id) in response + if ($feature['pk'] === true) { + continue; + } + $attributes[$feature['alias']] = $apiClass::db2json($feature, $kv[$name]); + } + + + /* Build JSON::API relationship resource */ + $toManyRelationships = $apiClass::getToManyRelationships(); + $toOneRelationships = $apiClass::getToOneRelationships(); + + $relationshipsNames = array_merge(array_keys($toOneRelationships), array_keys($toManyRelationships)); + sort($relationshipsNames); + foreach ($relationshipsNames as $relationshipName) { + $relationships[$relationshipName] = [ + "links" => [ + "self" => $linkSelf . "/relationships/" . $relationshipName, + "related" => $linkSelf . "/" . $relationshipName, + ] + ]; + } + + /* Generate to-many relationships entries */ + foreach ($toManyRelationships as $relationshipName => $toManyRelationship) { + // Build (optional) compound document resource linkage + if (array_key_exists($relationshipName, $expandResult)) { + $relationships[$relationshipName]["data"] = []; + + // Empty to-many relationship + if (array_key_exists($obj->getId(), $expandResult[$relationshipName]) === false) { + continue; + } + + // Fetch to-many-objects + $expandObjects = $expandResult[$relationshipName][$obj->getId()]; + foreach($expandObjects as $relationObject) { + $relationships[$relationshipName]["data"][] = [ + "type" => $this->getObjectTypeName($relationObject), + "id" => $relationObject->getId() + ]; + } + } + } + + /* Generate to-one relationships entries */ + foreach ($toOneRelationships as $relationshipName => $toOneRelationship) { + // Build (optional) compound document resource linkage + if (array_key_exists($relationshipName, $expandResult)) { + // Empty to-one relationship + if (array_key_exists($obj->getId(), $expandResult[$relationshipName]) === false) { + $relationships[$relationshipName]["data"] = null; + continue; + } + + // Fetch to-one-objects + $expandObject = $expandResult[$relationshipName][$obj->getId()]; + + $relationships[$relationshipName]["data"] = [ + "type" => $this->getObjectTypeName($expandObject), + "id" => $expandObject->getId() + ]; + } + } + + + $newObject = [ + "type" => $this->getObjectTypeName($obj), + "id" => $obj->getId(), + "attributes" => $attributes, + "links" => [ + "self" => $linkSelf, + ], + ]; + + if (sizeof($relationships) > 0) { + $newObject['relationships'] = $relationships; + } + + return $newObject; + } + /** * Quirck to resolve objects via ManyToMany relation table */ @@ -531,7 +659,7 @@ protected function object2Array(object $object, array $expands = []): array /** * Uniform conversion of php array to JSON output */ - protected function ret2json(array $result): string + protected static function ret2json(array $result): string { return json_encode($result, JSON_UNESCAPED_SLASHES | JSON_PRETTY_PRINT | JSON_THROW_ON_ERROR) . PHP_EOL; } @@ -556,6 +684,37 @@ protected function unaliasData(array $data, array $features): array { return $mappedData; } + /** + * Validate the Permission of a DBA column and check if it key may be altered + * + * @param Request $request Current request that is being handled + * @param string $key Field to use as base for $objects + * @param array $features The features of the DBA object of the child + * + * @throws HttpForbiddenException when it is not allowed to alter the key + * + * @return void + */ + protected function isAllowedToMutate(Request $request, array $features, string $key) { + if (is_string($key) == False) { + throw new HttpErrorException("Key '$key' invalid", 403); + } + // Ensure key exists in target array + if (array_key_exists($key, $features) == False) { + throw new HttpErrorException("Key '$key' does not exists!", 403); + } + + if ($features[$key]['read_only'] == True) { + throw new HttpForbiddenException($request, "Key '$key' is immutable"); + } + if ($features[$key]['protected'] == True) { + throw new HttpForbiddenException($request, "Key '$key' is protected"); + } + if ($features[$key]['private'] == True) { + throw new HttpForbiddenException($request, "Key '$key' is private"); + } + } + /** * Validate incoming data */ @@ -581,15 +740,24 @@ protected function validateData(array $data, array $features) } // Int } elseif (str_starts_with($features[$key]['type'], 'int')) { - // TODO: int32, int64 range validation if (is_integer($value) == False) { throw new HttpErrorException("Key '$key' is not of type integer"); } + $maxValue = ($features[$key]['type'] === 'int64') ? 9223372036854775807 : 2147483647; + if ($value > $maxValue || $value < -$maxValue) { + throw new HttpErrorException("The value exceeds the limit for a {$features[$key]['type']} integer."); + } // Str } elseif (str_starts_with($features[$key]['type'], 'str')) { if (is_string($value) == False) { throw new HttpErrorException("Key '$key' is not of type string"); } + if (preg_match('/str\((\d+)\)/', $features[$key]['type'], $matches)) { + $max_string_len = (int) $matches[1]; + if (strlen($value) > $max_string_len) { + throw new HttpErrorException("The string value: '$value' is too long. The max size is '$max_string_len'"); + } + } // TODO: Length validation // Array } elseif (str_starts_with($features[$key]['type'], 'array')) { @@ -629,7 +797,6 @@ protected function validateData(array $data, array $features) } } - /** * Validate incoming parameter keys */ @@ -654,7 +821,7 @@ protected function validateParameters(array $data, array $allFeatures): void { ksort($invalidKeys); ksort($validFeatures); throw new HTException("Parameter(s) '" . join(", ", $invalidKeys) . "' not valid input " . - "(valid key(s) : '" . join(", ", $validFeatures) . ")'"); + "(valid key(s) : '" . join(", ", $validFeatures) . ")'", 403); } // Find out about mandatory parameters which are not provided @@ -666,30 +833,17 @@ protected function validateParameters(array $data, array $allFeatures): void { } } - - /** * Check for valid expand parameters. */ + //TODO: nice to have would be to be able to include objects that are further away in the relationship + //ex. from Hash include=hashlist.task to include all tasks from a hash (section 8.3 JSON API) protected function makeExpandables(Request $request, array $validExpandables): array { $data = $request->getParsedBody(); + $queryExpands = (array_key_exists('include', $request->getQueryParams())) ? preg_split("/[,\ ]+/", $request->getQueryParams()['include']) : []; - // Body expand can be specified as single item or array of items - $bodyExpands = []; - if (!is_null($data) and array_key_exists('expand', $data)) { - if (is_array($data['expand'])) { - array_push($bodyExpands, ...$data['expand']); - } else if (is_string($data['expand'])) { - array_push($bodyExpands, ...preg_split("/[,\ ]+/", $data['expand'])); - } else { - assert(False, "Parameter expand type: '" . gettype($data['expand']) . "' not allowed"); - } - } - $queryExpands = (array_key_exists('expand', $request->getQueryParams())) ? preg_split("/[,\ ]+/", $request->getQueryParams()['expand']) : []; - - $mergedExpands = array_merge($bodyExpands, $queryExpands); - foreach ($mergedExpands as $expand) { + foreach ($queryExpands as $expand) { if (in_array($expand, $validExpandables) == false) { throw new HTException("Parameter '" . $expand . "' is not valid expand key (valid keys are: " . join(", ", array_values($validExpandables)) . ")"); } @@ -697,14 +851,14 @@ protected function makeExpandables(Request $request, array $validExpandables): a /* Validate expand parameters for required permissions */ $required_perms = []; - foreach ($mergedExpands as $expand) { + foreach ($queryExpands as $expand) { array_push($required_perms, ...self::getExpandPermissions($expand)); } if ($this->validatePermissions($required_perms) === FALSE) { throw new HttpForbiddenException($request, 'Permissions missing on expand parameter objects! || ' . join('||', $this->permissionErrors)); } - return $mergedExpands; + return $queryExpands; } /** @@ -721,20 +875,6 @@ protected function getPrimaryKey(): string } } - private function getFilterParameters(Request $request, string $key): array { - $data = $request->getParsedBody(); - if (!is_null(($data))) { - $bodyFilter = (array_key_exists($key, $data)) ? $data[$key] : []; - } else { - $bodyFilter = []; - } - - $queryFilter = (array_key_exists($key, $request->getQueryParams())) ? preg_split("/[,\ ]+/", $request->getQueryParams()[$key]) : []; - $mergedFilters = array_merge($bodyFilter, $queryFilter); - - return $mergedFilters; - } - /** * Check for valid filter parameters and build QueryFilter */ @@ -742,16 +882,16 @@ protected function makeFilter(Request $request, array $features): array { $qFs = []; - $mergedFilters = $this->getFilterParameters($request, 'filter'); - foreach ($mergedFilters as $filter) { - // TODO: Add sanity checking - if (preg_match('/^(?P[_a-zA-Z0-9]+?)(?=|__eq=|!=|__ne=|>|__lt=|>=|__lte=|<|__gt=|<=|__gte=|__contains=|__startswith=|__endswith=|__icontains=|__istartswith=|__iendswith=)(?P[^=]+)$/', $filter, $matches) == 0) { + $filters = $this->getQueryParameterFamily($request, 'filter'); + foreach ($filters as $filter => $value) { + + if (preg_match('/^(?P[_a-zA-Z0-9]+?)(?|__eq|__ne|__lt|__lte|__gt|__gte|__contains|__startswith|__endswith|__icontains|__istartswith|__iendswith)$/', $filter, $matches) == 0) { throw new HTException("Filter parameter '" . $filter . "' is not valid"); } // Special filtering of _id to use for uniform access to model primary key - $cast_key = $matches['key'] == '_id' ? $this->getPrimaryKey() : $matches['key']; - + $cast_key = $matches['key'] == '_id' ? array_column($features, 'alias', 'dbname')[$this->getPrimaryKey()] : $matches['key']; + if (array_key_exists($cast_key, $features) == false) { throw new HTException("Filter parameter '" . $filter . "' is not valid (key not valid field)"); }; @@ -759,64 +899,59 @@ protected function makeFilter(Request $request, array $features): array // TODO Merge/Combine with validate parameters switch($features[$cast_key]['type']) { case 'bool': - $val = filter_var($matches['value'], FILTER_VALIDATE_BOOLEAN, FILTER_NULL_ON_FAILURE); + $val = filter_var($value, FILTER_VALIDATE_BOOLEAN, FILTER_NULL_ON_FAILURE); if (is_null($val)) { throw new HTException("Filter parameter '" . $filter . "' is not valid boolean value"); } break; case 'int': - $val = filter_var($matches['value'], FILTER_VALIDATE_INT, FILTER_NULL_ON_FAILURE); + $val = filter_var($value, FILTER_VALIDATE_INT, FILTER_NULL_ON_FAILURE); if (is_null($val)) { throw new HTException("Filter parameter '" . $filter . "' is not valid integer value"); } default: - $val = $matches['value']; + $val = $value; } // We need to remap any aliased key to the key as it appears in the database. $remappedKey = $features[$cast_key]['dbname']; switch($matches['operator']) { - case '=': - case '__eq=': + case '': + case '__eq': array_push($qFs, new QueryFilter($remappedKey, $val, '=')); break; - case '!=': - case '__ne=': + case '__ne': array_push($qFs, new QueryFilter($remappedKey, $val, '!=')); break; - case '<': - case '__lt=': + case '__lt': array_push($qFs, new QueryFilter($remappedKey, $val, '<')); break; - case '<=': - case '__lte=': + case '__lte': array_push($qFs, new QueryFilter($remappedKey, $val, '<=')); break; - case '>': - case '__gt=': + case '__gt': array_push($qFs, new QueryFilter($remappedKey, $val, '>')); break; - case '>=': - case '__gte=': + case '__gte': array_push($qFs, new QueryFilter($remappedKey, $val, '>=')); break; - case '__contains=': + case '__contains': array_push($qFs, new LikeFilter($remappedKey, "%" . $val . "%")); break; - case '__startswith=': + case '__startswith': array_push($qFs, new LikeFilter($remappedKey, $val . "%")); break; - case '__endswith=': + case '__endswith': array_push($qFs, new LikeFilter($remappedKey, "%" . $val)); break; - case '__icontains=': + case '__icontains': array_push($qFs, new LikeFilterInsensitive($remappedKey, "%" . $val . "%")); break; - case '__istartswith=': + case '__istartswith': array_push($qFs, new LikeFilterInsensitive($remappedKey, $val . "%")); break; - case '__iendswith=': + case '__iendswith': array_push($qFs, new LikeFilterInsensitive($remappedKey, "%" . $val)); break; default: @@ -830,18 +965,22 @@ protected function makeFilter(Request $request, array $features): array /** * Check for valid ordering parameters and build QueryFilter */ - protected function makeOrderFilter(Request $request, array $features): array + protected function makeOrderFilterTemplates(Request $request, array $features, $defaultSort = 'ASC'): array { - $oFs = []; + $orderTemplates = []; - $mergedOrdering = $this->getFilterParameters($request, 'ordering'); - foreach ($mergedOrdering as $order) { + $orderings = $this->getQueryParameterAsList($request, 'sort'); + $contains_primary_key = false; + foreach ($orderings as $order) { if (preg_match('/^(?P[-])?(?P[_a-zA-Z]+)$/', $order, $matches)) { // Special filtering of _id to use for uniform access to model primary key $cast_key = $matches['key'] == '_id' ? $this->getPrimaryKey() : $matches['key']; + if ($cast_key == $this->getPrimaryKey()) { + $contains_primary_key = true; + } if (array_key_exists($cast_key, $features)) { $remappedKey = $features[$cast_key]['dbname']; - $oFs[] = new OrderFilter($remappedKey, ($matches['operator'] == '-') ? "DESC" : "ASC"); + array_push($orderTemplates, ['by' => $remappedKey, 'type' => ($matches['operator'] == '-') ? "DESC" : "ASC" ]); } else { throw new HTException("Ordering parameter '" . $order . "' is not valid"); } @@ -850,9 +989,14 @@ protected function makeOrderFilter(Request $request, array $features): array } } - return $oFs; - } + //when no primary key has been added in the sort parameter, add the default case of sorting on primary key as last sort + if ($contains_primary_key == false) { + array_push($orderTemplates, ['by' =>$this->getPrimaryKey(), 'type' => $defaultSort]); + } + return $orderTemplates; + } + /** * Validate if user is allowed to access hashlist @@ -973,6 +1117,153 @@ protected function getParam(Request $request, string $param, int $default): int } } + + protected function getQueryParameterAsList(Request $request, string $name): array + { + $queryParams = $request->getQueryParams(); + if (is_array($queryParams) && array_key_exists($name, $queryParams)) { + return preg_split("/[,\ ]+/", $queryParams[$name]); + } else { + return []; + } + } + + + /* + * Return requested parameter, prioritize query parameter over inline payload parameter + */ + protected function getQueryParameterFamilyMember(Request $request, string $family, string $member): string|null + { + $queryParams = $request->getQueryParams(); + // Check query parameters and make sure it is an array + if (is_array($queryParams) && array_key_exists($family, $queryParams) && array_key_exists($member, $queryParams[$family])) { + return $queryParams[$family][$member]; + } + + return null; + } + + + /* + * Return requested parameter, prioritize query parameter over inline payload parameter + */ + protected function getQueryParameterFamily(Request $request, string $family): array + { + $retval = []; + $queryParams = $request->getQueryParams(); + if (array_key_exists($family, $queryParams) and is_array($queryParams[$family])) { + // TODO: Enhance validation + return $queryParams[$family]; + } + + return $retval; + } + + static function createJsonResponse(array $data = [], array $links = [], array $included = [], array $meta = []) { + $response = [ + "jsonapi" => [ + "version" => "1.1", + "ext" => [ + "https://jsonapi.org/profiles/ethanresnick/cursor-pagination" + ], + ], + ]; + + if (!empty($links)) { + $response["links"] = $links; + } + + if(!empty($meta)) { + $response["meta"] = $meta; + } + + $response["data"] = $data; + + if (!empty($included)) { + $response["included"] = $included; + } + + return $response; +} + + /** + * Get single Resource + */ + protected static function getOneResource(object $apiClass, object $object, Request $request, Response $response, int $statusCode=200): Response + { + $apiClass->preCommon($request); + + $validExpandables = $apiClass->getExpandables(); + $expands = $apiClass->makeExpandables($request, $validExpandables); + + $objects = [$object]; + + /* Resolve all expandables */ + $expandResult = []; + foreach ($expands as $expand) { + // mapping from $objectId -> result objects in + $expandResult[$expand] = $apiClass->fetchExpandObjects($objects, $expand); + } + + /* Convert objects to JSON:API */ + $dataResources = []; + $includedResources = []; + + // Convert objects to data resources + foreach ($objects as $object) { + // Create object + $newObject = $apiClass->obj2Resource($object, $expandResult); + + // For compound document, included resources + foreach ($expands as $expand) { + if (array_key_exists($object->getId(), $expandResult[$expand])) { + $expandResultObject = $expandResult[$expand][$object->getId()]; + if (is_array($expandResultObject)) { + foreach($expandResultObject as $expandObject) { + $includedResources[] = $apiClass->obj2Resource($expandObject); + } + } else { + if ($expandResultObject === null) { + // to-only relation which is nullable + continue; + } + $includedResources[] = $apiClass->obj2Resource($expandResultObject); + } + } + } + + // Add to result output + $dataResources[] = $newObject; + } + + $selfParams = $request->getQueryParams(); + $linksQuery = urldecode(http_build_query($selfParams)); + + $linksSelf = $request->getUri()->getPath() . ((!empty($linksQuery)) ? '?' . $linksQuery : ''); + $links = ["self" => $linksSelf]; + + // Generate JSON:API GET output + $ret = self::createJsonResponse($dataResources[0], $links, $includedResources); + + $body = $response->getBody(); + $body->write($apiClass->ret2json($ret)); + + return $response->withStatus($statusCode) + ->withHeader("Content-Type", "application/vnd.api+json") + ->withHeader("Location", $dataResources[0]["links"]["self"]); + //for location we use links value from $dataresources because if we use $linksSelf, the wrong location gets returned in + //case of a POST request + } + + //Meta response for helper functions that do not respond with resource records + protected static function getMetaResponse(array $meta, Request $request, Response $response, int $statusCode=200) { + $ret = self::createJsonResponse($meta=$meta); + $body = $response->getBody(); + $body->write(self::ret2json($ret)); + + return $response->withStatus($statusCode)->withHeader("Content-Type", "application/vnd.api+json"); + } + /** * Override-able activated methods */ diff --git a/src/inc/apiv2/common/AbstractHelperAPI.class.php b/src/inc/apiv2/common/AbstractHelperAPI.class.php index 62f4fa0fe..ce57cc37e 100644 --- a/src/inc/apiv2/common/AbstractHelperAPI.class.php +++ b/src/inc/apiv2/common/AbstractHelperAPI.class.php @@ -17,8 +17,9 @@ use DBA\User; abstract class AbstractHelperAPI extends AbstractBaseAPI { - abstract public function actionPost(array $data): array|null; + abstract public function actionPost(array $data): object|array|null; + /* Chunk API endpoint specific call to abort chunk */ public function processPost(Request $request, Response $response, array $args): Response { @@ -35,28 +36,22 @@ public function processPost(Request $request, Response $response, array $args): $this->validateData($data, $allFeatures); /* All creation of object */ - try { - // TODO: Validate data is compliant with https://jsonapi.org/format/#document-top-level 'Primary data' - $returnData = $this->actionPost($data); - $status = ($returnData) ? 200 : 204; - $retval['data'] = $returnData; - } catch (Error | Exception $e) { - // https://jsonapi.org/format/#error-objects - $status = 400; - $retval['errors'] = [ - 'status' => $e->getCode(), - 'source' => $e->getFile() . ':' . $e->getLine(), - 'title' => $e->getMessage(), - ]; - } finally { - if ($status == 204) { - return $response->withStatus($status); - } else { - $response->getBody()->write($this->ret2json($retval)); - return $response->withStatus($status) - ->withHeader("Content-Type", "application/json"); - } - } + $newObject = $this->actionPost($data); + + /* Successfully executed action of type update/delete */ + if ($newObject == null) { + return $response->withStatus(204); + } + + + /* Succesful executed action of create */ + if (is_object($newObject)) { + $apiClass = new ($this->container->get('classMapper')->get($newObject::class))($this->container); + return self::getOneResource($apiClass, $newObject, $request, $response); + /* A meta response of a helper function */ + } elseif (is_array($newObject)) { + return self::getMetaResponse($newObject, $request, $response); + } } /** diff --git a/src/inc/apiv2/common/AbstractModelAPI.class.php b/src/inc/apiv2/common/AbstractModelAPI.class.php index a9a5bad15..9a07c6ec9 100644 --- a/src/inc/apiv2/common/AbstractModelAPI.class.php +++ b/src/inc/apiv2/common/AbstractModelAPI.class.php @@ -5,31 +5,105 @@ use Psr\Http\Message\ServerRequestInterface as Request; use Slim\Exception\HttpNotFoundException; - +use Slim\Exception\HttpForbiddenException; +use Middlewares\Utils\HttpErrorException; use DBA\AbstractModelFactory; use DBA\JoinFilter; use DBA\Factory; use DBA\ContainFilter; +use DBA\LimitFilter; use DBA\OrderFilter; use DBA\QueryFilter; -use Middlewares\Utils\HttpErrorException; +use Psr\Http\Message\ServerRequestInterface; - -abstract class AbstractModelAPI extends AbstractBaseAPI { - abstract static public function getDBAClass(): string; +abstract class AbstractModelAPI extends AbstractBaseAPI +{ + abstract static public function getDBAClass(); abstract protected function createObject(array $data): int; abstract protected function deleteObject(object $object): void; - protected function getFactory(): object { - return self::getModelFactory($this->getDBAclass()); + public static function getToOneRelationships(): array + { + return []; + } + public static function getToManyRelationships(): array + { + return []; + } + + + /** + * Available 'expand' parameters on $object + */ + public static function getExpandables(): array + { + $expandables = array_merge(array_keys(static::getToOneRelationships()), array_keys(static::getToManyRelationships())); + return $expandables; + } + + // /** + // * Fetch objects for $expand on $objects + // */ + protected static function fetchExpandObjects(array $objects, string $expand): mixed + { + //disabled the check because with intermediate objects its possible to fetch a different model + /* Ensure we receive the proper type */ + // $baseModel = static::getDBAClass(); + // array_walk($objects, function ($obj) use ($baseModel) { + // assert($obj instanceof $baseModel); + // }); + + $toOneRelationships = static::getToOneRelationships(); + if (array_key_exists($expand, $toOneRelationships)) { + $relationFactory = self::getModelFactory($toOneRelationships[$expand]['relationType']); + return self::getForeignKeyRelation( + $objects, + $toOneRelationships[$expand]['key'], + $relationFactory, + $toOneRelationships[$expand]['relationKey'], + ); + }; + + $toManyRelationships = static::getToManyRelationships(); + if (array_key_exists($expand, $toManyRelationships)) { + $relationFactory = self::getModelFactory($toManyRelationships[$expand]['relationType']); + + /* Associative entity */ + if (array_key_exists('junctionTableType', $toManyRelationships[$expand])) { + $junctionTableFactory = self::getModelFactory($toManyRelationships[$expand]['junctionTableType']); + return self::getManyToOneRelationViaIntermediate( + $objects, + $toManyRelationships[$expand]['key'], + $junctionTableFactory, + $toManyRelationships[$expand]['junctionTableFilterField'], + $relationFactory, + $toManyRelationships[$expand]['relationKey'], + ); + }; + + return self::getManyToOneRelation( + $objects, + $toManyRelationships[$expand]['key'], + $relationFactory, + $toManyRelationships[$expand]['relationKey'], + ); + }; + + throw new BadFunctionCallException("Internal error: Expansion '$expand' not implemented!"); + } + + + final protected static function getFactory(): object + { + return self::getModelFactory(static::getDBAclass()); } /** * Get features based on Formfields and DBA model features */ final protected function getFeatures(): array - { + { return array_merge( parent::getFeatures(), call_user_func($this->getDBAclass() . '::getFeatures'), @@ -37,140 +111,168 @@ final protected function getFeatures(): array } /** - * Retrieve ForeignKey Relation - * - * @param array $objects Objects Fetch relation for selected Objects - * @param string $objectField Field to use as base for $objects - * @param object $factory Factory used to retrieve objects - * @param string $filterField Filter field of $field to filter against $objects field - * - * @return array - */ - final protected static function getForeignKeyRelation( - array $objects, - string $objectField, - object $factory, - string $filterField - ): array { - assert($factory instanceof AbstractModelFactory); - $retval = array(); - - /* Fetch required objects */ - $objectIds = []; - foreach($objects as $object) { - $kv = $object->getKeyValueDict(); - $objectIds[] = $kv[$objectField]; - } - $qF = new ContainFilter($filterField, $objectIds, $factory); - $hO = $factory->filter([Factory::FILTER => $qF]); - - /* Objects are uniquely identified by fields, create mapping to speed-up further processing */ - $f2o = []; - foreach ($hO as $relationObject) { - $f2o[$relationObject->getKeyValueDict()[$filterField]] = $relationObject; - }; + * Get features based on DBA model features + * + * @param string $dbaClass is the dba class to get the features from + */ + //TODO doesnt retrieve features based on formfields, could be done by adding api class in relationship objects + final protected function getFeaturesOther(string $dbaClass): array + { + return call_user_func($dbaClass . '::getFeatures'); + } - /* Map objects */ - foreach ($objects as $object) { - $fieldId = $object->getKeyValueDict()[$objectField]; - if (array_key_exists($fieldId, $f2o) == true) { - $retval[$object->getId()] = $f2o[$fieldId]; - } + /** + * Find primary key for another DBA object + * A little bit hacky because the getPrimaryKey function in dbaClass is not static + * + * @param string $dbaClass is the dba class to get the primarykey from + */ + protected function getPrimaryKeyOther(string $dbaClass): string + { + $features = $this->getFeaturesOther($dbaClass); + # Work-around required since getPrimaryKey is not static in dba/models/*.php + foreach ($features as $key => $value) { + if ($value['pk'] == True) { + return $key; } + } + } - return $retval; + /** + * Retrieve ForeignKey Relation + * + * @param array $objects Objects Fetch relation for selected Objects + * @param string $objectField Field to use as base for $objects + * @param object $factory Factory used to retrieve objects + * @param string $filterField Filter field of $field to filter against $objects field + * + * @return array + */ + final protected static function getForeignKeyRelation( + array $objects, + string $objectField, + object $factory, + string $filterField + ): array { + assert($factory instanceof AbstractModelFactory); + $retval = array(); + + /* Fetch required objects */ + $objectIds = []; + foreach ($objects as $object) { + $kv = $object->getKeyValueDict(); + $objectIds[] = $kv[$objectField]; } + $qF = new ContainFilter($filterField, $objectIds, $factory); + $hO = $factory->filter([Factory::FILTER => $qF]); - /** - * Retrieve ManyToOneRelation (reverse ForeignKey) - * - * @param array $objects Objects Fetch relation for selected Objects - * @param string $objectField Field to use as base for $objects - * @param object $factory Factory used to retrieve objects - * @param string $filterField Filter field of $field to filter against $objects field - * - * @return array - */ - final protected static function getManyToOneRelation( - array $objects, - string $objectField, - object $factory, - string $filterField - ): array { - assert($factory instanceof AbstractModelFactory); - $retval = array(); - - /* Fetch required objects */ - $objectIds = []; - foreach($objects as $object) { - $kv = $object->getKeyValueDict(); - $objectIds[] = $kv[$objectField]; - } - $qF = new ContainFilter($filterField, $objectIds, $factory); - $hO = $factory->filter([Factory::FILTER => $qF]); + /* Objects are uniquely identified by fields, create mapping to speed-up further processing */ + $f2o = []; + foreach ($hO as $relationObject) { + $f2o[$relationObject->getKeyValueDict()[$filterField]] = $relationObject; + }; - /* Map (multiple) objects to base objects */ - foreach ($hO as $relationObject) { - $kv = $relationObject->getKeyValueDict(); - $retval[$kv[$filterField]][] = $relationObject; + /* Map objects */ + foreach ($objects as $object) { + $fieldId = $object->getKeyValueDict()[$objectField]; + if (array_key_exists($fieldId, $f2o) == true) { + $retval[$object->getId()] = $f2o[$fieldId]; } + } + + return $retval; + } - return $retval; + /** + * Retrieve ManyToOneRelation (reverse ForeignKey) + * + * @param array $objects Objects Fetch relation for selected Objects + * @param string $objectField Field to use as base for $objects + * @param object $factory Factory used to retrieve objects + * @param string $filterField Filter field of $field to filter against $objects field + * + * @return array + */ + final protected static function getManyToOneRelation( + array $objects, + string $objectField, + object $factory, + string $filterField + ): array { + assert($factory instanceof AbstractModelFactory); + $retval = array(); + + /* Fetch required objects */ + $objectIds = []; + foreach ($objects as $object) { + $kv = $object->getKeyValueDict(); + $objectIds[] = $kv[$objectField]; } - + $qF = new ContainFilter($filterField, $objectIds, $factory); + $hO = $factory->filter([Factory::FILTER => $qF]); - /** - * Retrieve ManyToOne relalation for $objects ('parents') of type $targetFactory via 'intermidate' - * of $intermediateFactory joining on $joinField (between 'intermediate' and 'target'). Filtered by - * $filterField at $intermediateFactory. - * - * @param array $objects Objects Fetch relation for selected Objects - * @param string $objectField Field to use as base for $objects - * @param object $intermediateFactory Factory used as intermediate between parentObject and targetObject - * @param string $filterField Filter field of intermadiateObject to filter against $objects field - * @param object $targetFactory Object properties of objects returned - * @param string $joinField Field to connect 'intermediate' to 'target' - - * @return array - */ - final protected static function getManyToOneRelationViaIntermediate( - array $objects, - string $objectField, - object $intermediateFactory, - string $filterField, - object $targetFactory, - string $joinField, - ): array { - assert($intermediateFactory instanceof AbstractModelFactory); - assert($targetFactory instanceof AbstractModelFactory); - $retval = array(); - - - /* Retrieve Parent -> Intermediate -> Target objects */ - $objectIds = []; - foreach($objects as $object) { - $kv = $object->getKeyValueDict(); - $objectIds[] = $kv[$objectField]; - } - $qF = new ContainFilter($filterField, $objectIds, $intermediateFactory); - $jF = new JoinFilter($intermediateFactory, $joinField, $joinField); - $hO = $targetFactory->filter([Factory::FILTER => $qF, Factory::JOIN => $jF]); - - /* Build mapping Parent -> Intermediate */ - $i2p = []; - foreach($hO[$intermediateFactory->getModelName()] as $intermidiateObject) { - $kv = $intermidiateObject->getKeyValueDict(); - $i2p[$kv[$joinField]] = $kv[$filterField]; - } + /* Map (multiple) objects to base objects */ + foreach ($hO as $relationObject) { + $kv = $relationObject->getKeyValueDict(); + $retval[$kv[$filterField]][] = $relationObject; + } + + return $retval; + } - /* Associate Target -> Parent (via Intermediate) */ - foreach($hO[$targetFactory->getModelName()] as $targetObject) { - $parent = $i2p[$targetObject->getKeyValueDict()[$joinField]]; - $retval[$parent][] = $targetObject; - } - return $retval; + /** + * Retrieve ManyToOne relalation for $objects ('parents') of type $targetFactory via 'intermidate' + * of $intermediateFactory joining on $joinField (between 'intermediate' and 'target'). Filtered by + * $filterField at $intermediateFactory. + * + * @param array $objects Objects Fetch relation for selected Objects + * @param string $objectField Field to use as base for $objects + * @param object $intermediateFactory Factory used as intermediate between parentObject and targetObject + * @param string $filterField Filter field of intermadiateObject to filter against $objects field + * @param object $targetFactory Object properties of objects returned + * @param string $joinField Field to connect 'intermediate' to 'target' + + * @return array + */ + final protected static function getManyToOneRelationViaIntermediate( + array $objects, + string $objectField, + object $intermediateFactory, + string $filterField, + object $targetFactory, + string $joinField, + ): array { + assert($intermediateFactory instanceof AbstractModelFactory); + assert($targetFactory instanceof AbstractModelFactory); + $retval = array(); + + + /* Retrieve Parent -> Intermediate -> Target objects */ + $objectIds = []; + foreach ($objects as $object) { + $kv = $object->getKeyValueDict(); + $objectIds[] = $kv[$objectField]; } + $qF = new ContainFilter($filterField, $objectIds, $intermediateFactory); + $jF = new JoinFilter($intermediateFactory, $joinField, $joinField); + $hO = $targetFactory->filter([Factory::FILTER => $qF, Factory::JOIN => $jF]); + + /* Build mapping Parent -> Intermediate */ + $i2p = []; + foreach ($hO[$intermediateFactory->getModelName()] as $intermidiateObject) { + $kv = $intermidiateObject->getKeyValueDict(); + $i2p[$kv[$joinField]] = $kv[$filterField]; + } + + /* Associate Target -> Parent (via Intermediate) */ + foreach ($hO[$targetFactory->getModelName()] as $targetObject) { + $parent = $i2p[$targetObject->getKeyValueDict()[$joinField]]; + $retval[$parent][] = $targetObject; + } + + return $retval; + } /** * Retrieve permissions based on class and method requested @@ -179,7 +281,7 @@ public function getRequiredPermissions(string $method): array { $model = $this->getDBAclass(); # Get required permission based on API method type - switch(strtoupper($method)) { + switch (strtoupper($method)) { case "GET": $required_perm = $model::PERM_READ; break; @@ -198,11 +300,15 @@ public function getRequiredPermissions(string $method): array return array($required_perm); } - /** * API entry point for deletion of single object */ public function deleteOne(Request $request, Response $response, array $args): Response + // TODO how to handle cascading deletes? + // ex. Hash foreignkey to hashlist can't be null, but hashlist delete doesnt cascade to Hash + // Which effectively means that we cant delete a hashlist because of foreingkey constraints + // Solution 1: make cascading rules in Database + // Solution 2: implement delete logic in every api model { $this->preCommon($request); $object = $this->doFetch($request, $args['id']); @@ -214,7 +320,6 @@ public function deleteOne(Request $request, Response $response, array $args): Re ->withHeader("Content-Type", "application/json"); } - /** * Request single object from database & validate permissons */ @@ -231,78 +336,227 @@ protected function doFetch(Request $request, string $pk): mixed /** * Additional filtering required for limiting access to objects */ - protected function getFilterACL(): array { + protected function getFilterACL(): array + { return []; } + /** + * Helper function to determine if $resourceRecord is a valid resource record + * returns true if it is a valid resource record and false if it is an invallid resource record + */ + final protected function validateResourceRecord(mixed $resourceRecord): bool + { + return (isset($resourceRecord['type']) && is_numeric($resourceRecord['id'])); + } - /** + final protected function ResourceRecordArrayToUpdateArray($data, $parentId) + { + $updates = []; + foreach ($data as $item) { + if (!$this->validateResourceRecord($item)) { + $encoded_item = json_encode($item); + throw new HttpErrorException('Invallid resource record given in list! invalid resource record: ' . $encoded_item); + } + $updates[] = new MassUpdateSet($item["id"], $parentId); + } + return $updates; + } + + /** * API entry point for requesting multiple objects */ - public function get(Request $request, Response $response, array $args): Response + public static function getManyResources(object $apiClass, Request $request, Response $response, array $relationFs = []): Response { - $this->preCommon($request); + $apiClass->preCommon($request); - $aliasedfeatures = $this->getAliasedFeatures(); - $factory = $this->getFactory(); + $aliasedfeatures = $apiClass->getAliasedFeatures(); + $factory = $apiClass->getFactory(); + + // TODO: Maximum and default should be configurable per server instance + $defaultPageSize = 10000; + $maxPageSize = 50000; - $startAt = $this->getParam($request, 'startsAt', 0); - $maxResults = $this->getParam($request, 'maxResults', 5); + $pageAfter = $apiClass->getQueryParameterFamilyMember($request, 'page', 'after') ?? 0; + $pageSize = $apiClass->getQueryParameterFamilyMember($request, 'page', 'size') ?? $defaultPageSize; + if ($pageSize < 0) { + throw new HttpErrorException("Invallid parameter, page[size] must be a positive integer", 400); + } elseif ($pageSize > $maxPageSize) { + throw new HttpErrorException(sprintf("You requested a size of %d, but %d is the maximum.", $pageSize, $maxPageSize), 400); + } + + $validExpandables = $apiClass::getExpandables(); + $expands = $apiClass->makeExpandables($request, $validExpandables); - $validExpandables = $this->getExpandables(); - $expands = $this->makeExpandables($request, $validExpandables); - $expandable = array_diff($validExpandables, $expands); + /* Object filter definition */ + $aFs = []; /* Generate filters */ - $qFs_Filter = $this->makeFilter($request, $aliasedfeatures); - $qFs_ACL = $this->getFilterACL(); + $qFs_Filter = $apiClass->makeFilter($request, $aliasedfeatures); + $qFs_ACL = $apiClass->getFilterACL(); $qFs = array_merge($qFs_ACL, $qFs_Filter); + if (count($qFs) > 0) { + $aFs[Factory::FILTER] = $qFs; + } - $oFs = $this->makeOrderFilter($request, $aliasedfeatures); + /** + * Create pagination + * + * TODO: Deny pagination with un-stable sorting + */ + $defaultSort = $apiClass->getQueryParameterFamilyMember($request, 'page', 'after') == null && + $apiClass->getQueryParameterFamilyMember($request, 'page', 'before') != null ? 'DESC' : 'ASC'; + $orderTemplates = $apiClass->makeOrderFilterTemplates($request, $aliasedfeatures, $defaultSort); - /* Generate query */ - $allFilters = []; - if (count($qFs) > 0) { - $allFilters[Factory::FILTER] = $qFs; + // Build actual order filters + foreach ($orderTemplates as $orderTemplate) { + $aFs[Factory::ORDER][] = new OrderFilter($orderTemplate['by'], $orderTemplate['type']); } - if (count($oFs) > 0) { - $allFilters[Factory::ORDER] = $oFs; + + /* Include relation filters */ + $finalFs = array_merge($aFs, $relationFs); + + //according to JSON API spec, first and last have to be calculated if inexpensive to compute + //(https://jsonapi.org/profiles/ethanresnick/cursor-pagination/#auto-id-links)) + //if this query is too expensive for big tables, it should be removed + $max = $factory->minMaxFilter($finalFs, $apiClass->getPrimaryKey(), "MAX"); + + //pagination filters need to be added after max has been calculated + $finalFs[Factory::LIMIT] = new LimitFilter($pageSize); + + $finalFs[Factory::FILTER][] = new QueryFilter($apiClass->getPrimaryKey(), $pageAfter, '>', $factory); + $pageBefore = $apiClass->getQueryParameterFamilyMember($request, 'page', 'before'); + if (isset($pageBefore)) { + $finalFs[Factory::FILTER][] = new QueryFilter($apiClass->getPrimaryKey(), $pageBefore, '<', $factory); } /* Request objects */ - $objects = $factory->filter($allFilters); + $filterObjects = $factory->filter($finalFs); + + /* JOIN statements will return related modules as well, discard for now */ + if (array_key_exists(Factory::JOIN, $finalFs)) { + $objects = $filterObjects[$factory->getModelname()]; + } else { + $objects = $filterObjects; + } /* Resolve all expandables */ $expandResult = []; foreach ($expands as $expand) { // mapping from $objectId -> result objects in - $expandResult[$expand] = $this->fetchExpandObjects($objects, $expand); + $expandResult[$expand] = $apiClass->fetchExpandObjects($objects, $expand); } - /* Convert objects to JSON */ - $lists = []; + /* Convert objects to JSON:API */ + $dataResources = []; + $includedResources = []; + + // Convert objects to data resources foreach ($objects as $object) { - $newObject = $this->applyExpansions($object, $expands, $expandResult); - $lists[] = $newObject; + // Create object + $newObject = $apiClass->obj2Resource($object, $expandResult); + + // For compound document, included resources + foreach ($expands as $expand) { + if (array_key_exists($object->getId(), $expandResult[$expand])) { + $expandResultObject = $expandResult[$expand][$object->getId()]; + if (is_array($expandResultObject)) { + foreach ($expandResultObject as $expandObject) { + $includedResources[] = $apiClass->obj2Resource($expandObject); + } + } else { + if ($expandResultObject === null) { + // to-only relation which is nullable + continue; + } + $includedResources[] = $apiClass->obj2Resource($expandResultObject); + } + } + } + + // Add to result output + $dataResources[] = $newObject; } - // TODO: Implement actual expanding - $total = count($objects); + //build last link + $lastParams = $request->getQueryParams(); + unset($lastParams['page']['after']); + $lastParams['page']['size'] = $pageSize; + $lastParams['page']['before'] = $max + 1; + $linksLast = $request->getUri()->getPath() . '?' . urldecode(http_build_query($lastParams)); + + // Build self link + $selfParams = $request->getQueryParams(); + $selfParams['page']['size'] = $pageSize; + $linksSelf = $request->getUri()->getPath() . '?' . urldecode(http_build_query($selfParams)); + + $linksNext = null; + $linksPrev = null; + + // Build next link + if (!empty($objects)) { + $minId = $maxId = $objects[0]->getId() ?? null; + foreach ($objects as $obj) { + $cur_id = $obj->getId(); + if ($cur_id < $minId) { + $minId = $cur_id; + } + if ($cur_id > $maxId) { + $maxId = $cur_id; + } + } + $nextId = $defaultSort == "ASC" ? $maxId : $minId; + + if ($nextId < $max) { //only set next page when its not the last page + $nextParams = $selfParams; + $nextParams['page']['after'] = $nextId; + unset($nextParams['page']['before']); + $linksNext = $request->getUri()->getPath() . '?' . urldecode(http_build_query($nextParams)); + } + // Build prev link + $prevId = $defaultSort == "DESC" ? $maxId : $minId; + if ($prevId != 1) { //only set previous page when its not the first page + $prevParams = $selfParams; + //This scenario might return a link to an empty array if the elements with the lowest id are deleted, but this is allowed according + //to the json API spec https://jsonapi.org/profiles/ethanresnick/cursor-pagination/#auto-id-links + //We could also get the lowest id the same way we got the max, but this is probably unnecessary expensive. + //But pull request: https://github.com/hashtopolis/server/pull/1069 would create a cheaper way of doing this in a single query + $prevParams['page']['before'] = $prevId; + unset($prevParams['page']['after']); + $linksPrev = $request->getUri()->getPath() . '?' . urldecode(http_build_query($prevParams)); + } + } - $ret = [ - "_expandable" => join(",", $expandable), - "startAt" => $startAt, - "maxResults" => $maxResults, - "total" => $total, - "isLast" => ($total <= ($startAt + $maxResults)), - "values" => array_slice($lists, $startAt, $maxResults) - ]; + //build first link + $firstParams = $request->getQueryParams(); + unset($firstParams['page']['before']); + $firstParams['page']['size'] = $pageSize; + $firstParams['page']['after'] = 0; + $linksFirst = $request->getUri()->getPath() . '?' . urldecode(http_build_query($firstParams)); + $links = [ + "self" => $linksSelf, + "first" => $linksFirst, + "last" => $linksLast, + "next" => $linksNext, + "prev" => $linksPrev, + ]; + + // Generate JSON:API GET output + $ret = self::createJsonResponse($dataResources, $links, $includedResources); $body = $response->getBody(); - $body->write($this->ret2json($ret)); + $body->write($apiClass->ret2json($ret)); return $response->withStatus(200) - ->withHeader("Content-Type", "application/json"); + ->withHeader("Content-Type", 'application/vnd.api+json; ext="https://jsonapi.org/profiles/ethanresnick/cursor-pagination"'); + } + + /** + * API entry point for requesting multiple objects + */ + public function get(Request $request, Response $response, array $args): Response + { + return self::getManyResources($this, $request, $response); } /** @@ -313,29 +567,17 @@ final public function getCreateValidFeatures(): array return $this->getAliasedFeatures(); } - /** * API entry point for requests of single object */ public function getOne(Request $request, Response $response, array $args): Response { $this->preCommon($request); - - $validExpandables = $this->getExpandables(); - $expands = $this->makeExpandables($request, $validExpandables); - $expandable = array_diff($validExpandables, $expands); - $object = $this->doFetch($request, $args['id']); - $ret = $this->object2Array($object, $expands); - $ret["_expandable"] = join(",", $expandable); - ksort($ret); + $classMapper = $this->container->get('classMapper'); - $body = $response->getBody(); - $body->write($this->ret2json($ret)); - - return $response->withStatus(200) - ->withHeader("Content-Type", "application/json"); + return self::getOneResource($this, $object, $request, $response); } @@ -347,46 +589,28 @@ public function patchOne(Request $request, Response $response, array $args): Res $this->preCommon($request); $object = $this->doFetch($request, $args['id']); - $data = $request->getParsedBody(); + $data = $request->getParsedBody()['data']; + if (!$this->validateResourceRecord($data)) { + throw new HttpErrorException('No valid resource identifier object was given as data!', 403); + } $aliasedfeatures = $this->getAliasedFeatures(); - - // Validate incoming data - foreach (array_keys($data) as $key) { - // Ensure key is a regular string - if (is_string($key) == False) { - throw new HttpErrorException("Key '$key' invalid"); - } - // Ensure key exists in target array - if (array_key_exists($key, $aliasedfeatures) == False) { - throw new HttpErrorException("Key '$key' does not exists!"); - } + $attributes = $data['attributes']; + // Validate incoming data + foreach (array_keys($attributes) as $key) { // Ensure key can be updated - if ($aliasedfeatures[$key]['read_only'] == True) { - throw new HttpErrorException("Key '$key' is immutable"); - } - if ($aliasedfeatures[$key]['protected'] == True) { - throw new HttpErrorException("Key '$key' is protected"); - } - if ($aliasedfeatures[$key]['private'] == True) { - throw new HttpErrorException("Key '$key' is private"); - } + $this->isAllowedToMutate($request, $aliasedfeatures, $key); } // Validate input data if it matches the correct type or subtype - $this->validateData($data, $aliasedfeatures); + $this->validateData($attributes, $aliasedfeatures); // This does the real things, patch the values that were sent in the data. - $mappedData = $this->unaliasData($data, $aliasedfeatures); - $this->updateObject($object, $mappedData); + $mappedData = $this->unaliasData($attributes, $aliasedfeatures); + $this->updateObject($object, $mappedData); //TODO updateObject not implemented in every route? // Return updated object $newObject = $this->getFactory()->get($object->getId()); - - $body = $response->getBody(); - $body->write($this->object2JSON($newObject)); - - return $response->withStatus(201) - ->withHeader("Content-Type", "application/json"); + return self::getOneResource($this, $newObject, $request, $response, 201); } @@ -397,32 +621,423 @@ public function post(Request $request, Response $response, array $args): Respons { $this->preCommon($request); - $data = $request->getParsedBody(); + $data = $request->getParsedBody()["data"]; + if ($data == null) { + throw new HttpErrorException("POST request requires data to be present", 403); + } + //POST request RR only needs type, no ID + if (!isset($data['type'])) { + throw new HttpErrorException('No valid resource identifier object with type was given as data!', 403); + } + $attributes = $data["attributes"]; + $allFeatures = $this->getAliasedFeatures(); // Validate incoming parameters - $this->validateParameters($data, $allFeatures); + $this->validateParameters($attributes, $allFeatures); // Validate incoming data by value - $this->validateData($data, $allFeatures); + $this->validateData($attributes, $allFeatures); // Remove key aliases and sanitize to 'db values and request creation - $mappedData = $this->unaliasData($data, $allFeatures); + $mappedData = $this->unaliasData($attributes, $allFeatures); $pk = $this->createObject($mappedData); + // TODO: Return 409 (conflict) if resource already exists or cannot be created + // Request object again, since post-modified entries are not reflected into object. + $object = $this->getFactory()->get($pk); + return self::getOneResource($this, $object, $request, $response, 201); + } + + + /** + * API endpoint to get a to one related resource record + */ + public function getToOneRelatedResource(Request $request, Response $response, array $args): Response + { + $this->preCommon($request); + + $relation = $args['relation']; + + $relationMapper = $this->getToOneRelationships()[$relation]; + $intermediate = $relationMapper["intermediateType"]; + //if there is an intermediate table join on that + if ($intermediate !== null) { + $intermediateFactory = self::getModelFactory($intermediate); + $aFs[Factory::JOIN][] = new JoinFilter( + $intermediateFactory, + $relationMapper['joinField'], + $relationMapper['joinFieldRelation'], + ); + + $factory = $this->getFactory(); + $object = $factory->filter($aFs)[$intermediateFactory->getModelName()][0]; + } else { + // Base object + $object = $this->doFetch($request, $args['id']); + } + + // Relation object + $relationObjects = $this->fetchExpandObjects([$object], $relation); + $relationObject = $relationObjects[$args['id']]; + + $relationClass = $relationMapper['relationType']; + $relationApiClass = new ($this->container->get('classMapper')->get($relationClass))($this->container); + + return self::getOneResource($relationApiClass, $relationObject, $request, $response); + } + + /** + * API endpoint to get a to one relationship link + */ + public function getToOneRelationshipLink(Request $request, Response $response, array $args): Response + { + $this->preCommon($request); + + $relation = $this->getToOneRelationships()[$args['relation']]; + + /* Prepare filter for to-one relations */ + + // Example for Task: + // 'Hashlist' => [ + // 'intermediateType' => TaskWrapper::class, + // 'joinField' => Task::TASK_WRAPPER_ID, + // 'joinFieldRelation' => TaskWrapper::TASK_WRAPPER_ID, + // ], + if (array_key_exists('intermediateType', $relation)) { + $aFs = []; + $intermediateFactory = self::getModelFactory($relation['intermediateType']); + + $aFs[Factory::FILTER][] = new QueryFilter( + $relation['joinField'], + $args['id'], + '=', + $intermediateFactory + ); + + $aFs[Factory::JOIN][] = new JoinFilter( + $intermediateFactory, + $relation['joinField'], + $relation['joinFieldRelation'], + ); + + $factory = $this->getFactory(); + //retrieve the only element of the intermediate table, which contains the data for the relatedResource + $object = $factory->filter($aFs)[$intermediateFactory->getModelName()][0]; + } else { + $object = $this->doFetch($request, $args['id']); + }; + + $id = $object->getKeyValueDict()[$relation['key']]; + + if (is_null($id)) { + $dataResource = null; + } else { + $dataResource = [ + 'type' => $this->getObjectTypeName($relation['relationType']), + 'id' => $id, + ]; + } + + $selfParams = $request->getQueryParams(); + $linksQuery = urldecode(http_build_query($selfParams)); + $linksSelf = $request->getUri()->getPath() . ((!empty($linksQuery)) ? '?' . $linksQuery : ''); + + $apiClass = $this->container->get('classMapper')->get(get_class($object)); + $linksRelated = $this->routeParser->urlFor($apiClass . ':getToOneRelatedResource', $args); + + $links = [ + "self" => $linksSelf, + "related" => $linksRelated, + ]; + + // Generate JSON:API GET output + $ret = self::createJsonResponse($dataResource, $links); + $body = $response->getBody(); - $body->write($this->object2JSON($this->getFactory()->get($pk))); + $body->write($this->ret2json($ret)); + + return $response->withStatus(200) + ->withHeader("Content-Type", 'application/vnd.api+json'); + } + + /* + * API endpoint to patch a to one relationship link + */ + //This works as intended but it can give weird behaviour. ex. it allows you to put an MD5 hash to a SHA1 hashlist + //by patching the foreingkey. Simple fix could be to make foreignkey immutable for cases like this. + public function patchToOneRelationshipLink(Request $request, Response $response, array $args): Response + { + $this->preCommon($request); + $jsonBody = $request->getParsedBody(); + + if ($jsonBody === null || !array_key_exists('data', $jsonBody)) { + throw new HttpErrorException('No data was sent! Send the json data in the following format: {"data": {"type": "foo", "id": 1}}'); + } + $data = $jsonBody['data']; + + $relationKey = $this->getToOneRelationships()[$args['relation']]['relationKey']; + if ($relationKey == null) { + throw new HttpErrorException("Relation does not exist!"); + } + + $features = $this->getFeatures(); + $this->isAllowedToMutate($request, $features, $relationKey); + + $factory = $this->getFactory(); + $object = $this->doFetch($request, intval($args['id'])); + if ($data == null) { + $factory->set($object, $relationKey, null); + } elseif (!$this->validateResourceRecord($data)) { + throw new HttpErrorException('No valid resource identifier object was given as data!'); + } else { + $factory->set($object, $relationKey, $data["id"]); + } + //TODO catch database exceptions like failed foreignkey constraint and return correct error response return $response->withStatus(201) - ->withHeader("Content-Type", "application/json"); + ->withHeader("Content-Type", "application/vnd.api+json"); + } + + + /** + * API endpoint for retrieving to many relationship resource records + */ + public function getToManyRelatedResource(Request $request, Response $response, array $args): Response + { + $this->preCommon($request); + + // Base object -> Relation objects + // $object = $this->doFetch($request, $args['id']); + + $toManyRelation = $this->getToManyRelationships()[$args['relation']]; + $relationClass = $toManyRelation['relationType']; + $relationApiClass = new ($this->container->get('classMapper')->get($relationClass))($this->container); + + $aFs = []; + $filterField = $toManyRelation['relationKey']; + $filterFactory = null; + + if (array_key_exists('junctionTableType', $toManyRelation)) { + $filterField = $toManyRelation['junctionTableFilterField']; + $filterFactory = self::getModelFactory($toManyRelation['junctionTableType']); + + $aFs[Factory::JOIN][] = new JoinFilter( + self::getModelFactory($toManyRelation['junctionTableType']), + $toManyRelation['junctionTableJoinField'], + $toManyRelation['key'], + ); + } + + $aFs[Factory::FILTER][] = new QueryFilter( + $filterField, + $args['id'], + '=', + $filterFactory + ); + + return self::getManyResources($relationApiClass, $request, $response, $aFs); + } + + + /** + * API get request to retrieve the to many relationship links + */ + public function getToManyRelationshipLink(Request $request, Response $response, array $args): Response + { + $this->preCommon($request); + + // Base object -> Relationship objects + $object = $this->doFetch($request, $args['id']); + $expandObjects = $this->fetchExpandObjects([$object], $args['relation']); + + $dataResources = []; + if (array_key_exists($object->getId(), $expandObjects)) { + foreach ($expandObjects[$object->getId()] as $relationshipObject) { + $dataResources[] = [ + 'type' => $this->getObjectTypeName($relationshipObject), + 'id' => $relationshipObject->getId(), + ]; + } + } + + $selfParams = $request->getQueryParams(); + $linksQuery = urldecode(http_build_query($selfParams)); + $linksSelf = $request->getUri()->getPath() . ((!empty($linksQuery)) ? '?' . $linksQuery : ''); + + $apiClass = $this->container->get('classMapper')->get(get_class($object)); + $linksRelated = $this->routeParser->urlFor($apiClass . ':getToManyRelatedResource', $args); + + + // TODO implement pagination support + $linksNext = null; + + // Generate JSON:API GET output + $links = [ + "self" => $linksSelf, + "related" => $linksRelated, + "next" => $linksNext, + ]; + $ret = self::createJsonResponse($dataResources, $links); + + $body = $response->getBody(); + $body->write($this->ret2json($ret)); + + return $response->withStatus(200) + ->withHeader("Content-Type", 'application/vnd.api+json; ext="https://jsonapi.org/profiles/ethanresnick/cursor-pagination"'); + } + + /** + * PATCH request to patch the to many relationship link TODO: handle intermediate tables + */ + public function patchToManyRelationshipLink(Request $request, Response $response, array $args): Response + { + $this->preCommon($request); + $jsonBody = $request->getParsedBody(); + + if ($jsonBody === null || !array_key_exists('data', $jsonBody) || !is_array($jsonBody['data'])) { + throw new HttpErrorException('No data was sent! Send the json data in the following format: {"data":[{"type": "foo", "id": 1}}]'); + } + $data = $jsonBody['data']; + + $relation = $this->getToManyRelationships()[$args['relation']]; + $primaryKey = $this->getPrimaryKeyOther($relation['relationType']); + $relationKey = $relation['relationKey']; + if ($relationKey == null) { + throw new HttpErrorException("Relation does not exist!"); + } + + $relationType = $relation['relationType']; + $features = $this->getFeaturesOther($relationType); + $this->isAllowedToMutate($request, $features, $relationKey); + + $factory = self::getModelFactory($relationType); + + $qF = new QueryFilter($relationKey, $args['id'], "="); + $models = $factory->filter([Factory::FILTER => $qF]); + //TODO Would be nicer if filter/factory could return a dict based on primarykeys directly + $modelsDict = array(); + foreach ($models as $item) { + $modelsDict[$item->getPrimaryKeyValue()] = $item; + } + + $updates = []; + foreach ($data as $item) { + if (!$this->validateResourceRecord($item)) { + $encoded_item = json_encode($item); + throw new HttpErrorException('Invallid resource record given in list! invalid resource record: ' . $encoded_item); + } + $updates[] = new MassUpdateSet($item["id"], $args["id"]); + unset($modelsDict[$item["id"]]); + } + + $leftover_primarykeys = array_keys($modelsDict); + if ($features[$relationKey]["null"] == False && count($leftover_primarykeys) > 0) { + throw new HttpErrorException("Not all current relationship objects have been included, + but the foreignkey can't be set to null. Either add all objects or delete the not needed objects"); + } + foreach ($leftover_primarykeys as $key) { + //set all foreignkeys of current relationships to null that have not been included + $updates[] = new MassUpdateSet($key, null); + } + $factory->getDB()->beginTransaction(); //start transaction to be able roll back + $factory->massSingleUpdate($primaryKey, $relationKey, $updates); + if (!$factory->getDB()->commit()) { + throw new HttpErrorException("Was not able to update to many relationship"); + } + + return $response->withStatus(204) + ->withHeader("Content-Type", "application/vnd.api+json"); + } + + /** + * POST request for the to many relationship link TODO + */ + public function postToManyRelationshipLink(Request $request, Response $response, array $args): Response + { + $this->preCommon($request); + + $jsonBody = $request->getParsedBody(); + if ($jsonBody === null || !array_key_exists('data', $jsonBody) || !is_array($jsonBody['data'])) { + throw new HttpErrorException('No data was sent! Send the json data in the following format: {"data":[{"type": "foo", "id": 1}}]'); + } + $data = $jsonBody['data']; + + $relation = $this->getToManyRelationships()[$args['relation']]; + $relationKey = $relation['relationKey']; + if ($relationKey == null) { + throw new HttpErrorException("Relation does not exist!"); + } + + $relationType = $relation['relationType']; + $primaryKey = $this->getPrimaryKeyOther($relationType); + $features = $this->getFeaturesOther($relationType); + + // $this->checkForeignkeyPermission($request, $relationKey, $features); + $this->isAllowedToMutate($request, $features, $relationKey); + + $factory = self::getModelFactory($relationType); + $updates = self::ResourceRecordArrayToUpdateArray($data, $args["id"]); + $factory->massSingleUpdate($primaryKey, $relationKey, $updates); + + return $response->withStatus(201) + ->withHeader("Content-Type", "application/vnd.api+json"); + } + + /** + * DELETE request for the to many relationship link + * currently there is no object that can be altered this way because of constraints + */ + public function deleteToManyRelationshipLink(Request $request, Response $response, array $args): Response + { + $this->preCommon($request); + $jsonBody = $request->getParsedBody(); + + if ($jsonBody === null || !array_key_exists('data', $jsonBody) && is_array($jsonBody['data'])) { + throw new HttpErrorException('No data was sent! Send the json data in the following format: {"data":[{"type": "foo", "id": 1}}]'); + } + + $relation = $this->getToManyRelationships()[$args['relation']]; + $primaryKey = $relation['key']; + $relationKey = $relation['relationKey']; + if ($relationKey == null) { + throw new HttpErrorException("Relation does not exist!"); + } + + $relationType = $relation['relationType']; + $features = $this->getFeaturesOther($relationType); + $this->isAllowedToMutate($request, $features, $relationKey); + if ($features[$relationKey]['null'] == False) { + // In this scenario another solution could be to delete object TODO? + throw new HttpForbiddenException($request, "Key '$relationKey' cant be set to null"); + } + + $data = $jsonBody['data']; + + foreach ($data as $item) { + if (!$this->validateResourceRecord($item)) { + $encoded_item = json_encode($item); + throw new HttpErrorException('Invalid resource record given in list! invalid resource record: ' . $encoded_item); + } + $updates[] = new MassUpdateSet($item["id"], null); + } + $factory = self::getModelFactory($relationType); + $factory->getDB()->beginTransaction(); //start transaction to be able roll back + $factory->massSingleUpdate($primaryKey, $relationKey, $updates); + if (!$factory->getDB()->commit()) { + throw new HttpErrorException("Some resources failed updating"); + } + + return $response->withStatus(201) + ->withHeader("Content-Type", "application/vnd.api+json"); } /** * Update object with provided values */ - public function updateObject(object $object, array $data, array $processed = []): void + protected function updateObject(object $object, array $data, array $processed = []): void { // Apply changes foreach ($data as $key => $value) { @@ -454,7 +1069,7 @@ final public function getPatchValidFeatures(): array if ($feature['private'] == True) { continue; } - + $validFeatures[$name] = $feature; }; @@ -470,9 +1085,12 @@ final public function getPatchValidFeatures(): array static public function register($app): void { $me = get_called_class(); + $foo = $me::getDBAClass(); $baseUri = $me::getBaseUri(); $baseUriOne = $baseUri . '/{id:[0-9]+}'; + $baseUriRelationships = $baseUri . '/{id:[0-9]+}/relationships'; + $classMapper = $app->getContainer()->get('classMapper'); $classMapper->add($me::getDBAclass(), $me); @@ -490,6 +1108,22 @@ static public function register($app): void $app->get($baseUri, $me . ':get')->setname($me . ':get'); } + foreach ($me::getToOneRelationships() as $name => $relationship) { + $relationUri = '{relation:' . $name . '}'; + $app->get($baseUriOne . '/' . $relationUri, $me . ':getToOneRelatedResource')->setname($me . ':getToOneRelatedResource'); + $app->get($baseUriRelationships . '/' . $relationUri, $me . ':getToOneRelationshipLink')->setname($me . ':getToOneRelationshipLink'); + $app->patch($baseUriRelationships . '/' . $relationUri, $me . ':patchToOneRelationshipLink')->setname($me . ':patchToOneRelationshipLink'); + } + + foreach ($me::getToManyRelationships() as $name => $relationship) { + $relationUri = '{relation:' . $name . '}'; + $app->get($baseUriOne . '/' . $relationUri, $me . ':getToManyRelatedResource')->setname($me . ':getToManyRelatedResource'); + $app->get($baseUriRelationships . '/' . $relationUri, $me . ':getToManyRelationshipLink')->setname($me . ':getToManyRelationshipLink'); + $app->patch($baseUriRelationships . '/' . $relationUri, $me . ':patchToManyRelationshipLink')->setname($me . ':patchToManyRelationshipLink'); + $app->post($baseUriRelationships . '/' . $relationUri, $me . ':postToManyRelationshipLink')->setname($me . ':postToManyRelationshipLink'); + $app->delete($baseUriRelationships . '/' . $relationUri, $me . ':deleteToManyRelationshipLink')->setname($me . ':deleteToManyRelationshipLink'); + } + if (in_array("POST", $available_methods)) { $app->post($baseUri, $me . ':post')->setname($me . ':post'); } @@ -507,5 +1141,3 @@ static public function register($app): void } } } - - diff --git a/src/inc/apiv2/common/openAPISchema.routes.php b/src/inc/apiv2/common/openAPISchema.routes.php index caaa2b04b..b70fcefe7 100644 --- a/src/inc/apiv2/common/openAPISchema.routes.php +++ b/src/inc/apiv2/common/openAPISchema.routes.php @@ -349,6 +349,17 @@ function makeProperties($features): array { "description" => "successfully deleted", ]; + /* Empty JSON object required */ + $paths[$path][$method]["requestBody"] = [ + "required" => true, + "content" => [ + "application/json" => [], + ]]; + } elseif ($method == 'post') { + $paths[$path][$method]["responses"]["204"] = [ + "description" => "successfully created", + ]; + /* Empty JSON object required */ $paths[$path][$method]["requestBody"] = [ "required" => true, diff --git a/src/inc/apiv2/helper/abortChunk.routes.php b/src/inc/apiv2/helper/abortChunk.routes.php index 5d44c7058..9978b4a29 100644 --- a/src/inc/apiv2/helper/abortChunk.routes.php +++ b/src/inc/apiv2/helper/abortChunk.routes.php @@ -24,7 +24,7 @@ public function getFormFields(): array { ]; } - public function actionPost(array $data): array|null { + public function actionPost(array $data): object|array|null { $chunk = self::getChunk($data[Chunk::CHUNK_ID]); TaskUtils::abortChunk($chunk->getId(), $this->getCurrentUser()); diff --git a/src/inc/apiv2/helper/assignAgent.routes.php b/src/inc/apiv2/helper/assignAgent.routes.php index 7597412b0..7abef2223 100644 --- a/src/inc/apiv2/helper/assignAgent.routes.php +++ b/src/inc/apiv2/helper/assignAgent.routes.php @@ -25,7 +25,7 @@ public function getFormFields(): array { ]; } - public function actionPost($data): array|null { + public function actionPost($data): object|array|null { AgentUtils::assign($data[Agent::AGENT_ID], $data[Task::TASK_ID], $this->getCurrentUser()); # TODO: Check how to handle custom return messages that are not object, probably we want that to be in some kind of standardized form. diff --git a/src/inc/apiv2/helper/createSuperHashlist.routes.php b/src/inc/apiv2/helper/createSuperHashlist.routes.php index 09717f0e4..a2139b761 100644 --- a/src/inc/apiv2/helper/createSuperHashlist.routes.php +++ b/src/inc/apiv2/helper/createSuperHashlist.routes.php @@ -34,7 +34,7 @@ public function getFormFields(): array ]; } - public function actionPost($data): array|null { + public function actionPost($data): object|array|null { /* Validate incoming hashlists */ $hashlistIds = []; foreach($data["hashlistIds"] as $hashlistId) { @@ -53,7 +53,8 @@ public function actionPost($data): array|null { assert(count($objects) > 0); /* TODO: Make it bit more transparant and auto-expands hashlists by default */ - return $this->object2Array($objects[0]); + return $objects[0]; + } } diff --git a/src/inc/apiv2/helper/createSupertask.routes.php b/src/inc/apiv2/helper/createSupertask.routes.php index 64499ab72..8ac7de5d0 100644 --- a/src/inc/apiv2/helper/createSupertask.routes.php +++ b/src/inc/apiv2/helper/createSupertask.routes.php @@ -34,7 +34,7 @@ public function getFormFields(): array ]; } - public function actionPost($data): array|null { + public function actionPost($data): object|array|null { $supertaskTemplate = self::getSupertask($data["supertaskTemplateId"]); $hashlist = self::getHashlist($data[Hashlist::HASHLIST_ID]); $crackerBinary = self::getCrackerBinary($data["crackerVersionId"]); @@ -55,7 +55,7 @@ public function actionPost($data): array|null { $objects = self::getModelFactory(TaskWrapper::class)->filter([Factory::FILTER => $qFs, Factory::ORDER => $oF]); assert(count($objects) > 0); - return $this->object2Array($objects[0]); + return $objects[0]; } } diff --git a/src/inc/apiv2/helper/exportCrackedHashes.routes.php b/src/inc/apiv2/helper/exportCrackedHashes.routes.php index 9721b82c6..7050d571a 100644 --- a/src/inc/apiv2/helper/exportCrackedHashes.routes.php +++ b/src/inc/apiv2/helper/exportCrackedHashes.routes.php @@ -26,11 +26,11 @@ public function getFormFields(): array ]; } - public function actionPost($data): array|null { + public function actionPost($data): object|array|null { $hashlist = self::getHashlist($data[Hashlist::HASHLIST_ID]); $file = HashlistUtils::export($hashlist->getId(), $this->getCurrentUser()); - return $this->object2Array($file); + return $file; } } diff --git a/src/inc/apiv2/helper/exportLeftHashes.routes.php b/src/inc/apiv2/helper/exportLeftHashes.routes.php index fc19578c3..582404ad1 100644 --- a/src/inc/apiv2/helper/exportLeftHashes.routes.php +++ b/src/inc/apiv2/helper/exportLeftHashes.routes.php @@ -26,12 +26,12 @@ public function getFormFields(): array ]; } - public function actionPost($data): array|null { + public function actionPost($data): object|array|null { $hashlist = self::getHashlist($data[Hashlist::HASHLIST_ID]); $file = HashlistUtils::leftlist($hashlist->getId(), $this->getCurrentUser()); - return $this->object2Array($file); + return $file; } } diff --git a/src/inc/apiv2/helper/exportWordlist.routes.php b/src/inc/apiv2/helper/exportWordlist.routes.php index 9f53e1d83..56d1b58be 100644 --- a/src/inc/apiv2/helper/exportWordlist.routes.php +++ b/src/inc/apiv2/helper/exportWordlist.routes.php @@ -26,12 +26,12 @@ public function getFormFields(): array ]; } - public function actionPost($data): array|null { + public function actionPost($data): object|array|null { $hashlist = self::getHashlist($data[Hashlist::HASHLIST_ID]); $arr = HashlistUtils::createWordlists($hashlist->getId(), $this->getCurrentUser()); - return $this->object2Array($arr[2]); + return $arr[2]; } } diff --git a/src/inc/apiv2/helper/importCrackedHashes.routes.php b/src/inc/apiv2/helper/importCrackedHashes.routes.php index ee375d2d3..6f99e0481 100644 --- a/src/inc/apiv2/helper/importCrackedHashes.routes.php +++ b/src/inc/apiv2/helper/importCrackedHashes.routes.php @@ -26,12 +26,11 @@ public function getFormFields(): array { ]; } - public function actionPost($data): array|null { + public function actionPost($data): object|array|null { $hashlist = self::getHashlist($data[Hashlist::HASHLIST_ID]); $result = HashlistUtils::processZap($hashlist->getId(), $data["separator"], "paste", ["hashfield" => $data["sourceData"]], [], $this->getCurrentUser()); - # TODO: Check how to handle custom return messages that are not object, probably we want that to be in some kind of standardized form. return [ "totalLines" => $result[0], "newCracked" => $result[1], diff --git a/src/inc/apiv2/helper/purgeTask.routes.php b/src/inc/apiv2/helper/purgeTask.routes.php index 1bd264b21..d7f308d57 100644 --- a/src/inc/apiv2/helper/purgeTask.routes.php +++ b/src/inc/apiv2/helper/purgeTask.routes.php @@ -25,7 +25,7 @@ public function getFormFields(): array ]; } - public function actionPost($data): array|null { + public function actionPost($data): object|array|null { $task = self::getTask($data[Task::TASK_ID]); TaskUtils::purgeTask($task->getId(), $this->getCurrentUser()); diff --git a/src/inc/apiv2/helper/recountFileLines.routes.php b/src/inc/apiv2/helper/recountFileLines.routes.php index f737b984e..d3bb0fd63 100644 --- a/src/inc/apiv2/helper/recountFileLines.routes.php +++ b/src/inc/apiv2/helper/recountFileLines.routes.php @@ -24,7 +24,7 @@ public function getFormFields(): array ]; } - public function actionPost($data): array|null { + public function actionPost($data): object|array|null { // first retrieve the file, as fileCountLines does not check any permissions, therfore to be sure call getFile() first, even if it is not required technically FileUtils::getFile($data[File::FILE_ID], $this->getCurrentUser()); diff --git a/src/inc/apiv2/helper/resetChunk.routes.php b/src/inc/apiv2/helper/resetChunk.routes.php index 00870b5ba..1cec7e7fa 100644 --- a/src/inc/apiv2/helper/resetChunk.routes.php +++ b/src/inc/apiv2/helper/resetChunk.routes.php @@ -24,7 +24,7 @@ public function getFormFields(): array { ]; } - public function actionPost(array $data): array|null { + public function actionPost(array $data): object|array|null { $chunk = self::getChunk($data[Chunk::CHUNK_ID]); TaskUtils::resetChunk($chunk->getId(), $this->getCurrentUser()); return null; diff --git a/src/inc/apiv2/helper/setUserPassword.routes.php b/src/inc/apiv2/helper/setUserPassword.routes.php index a05d466b7..5a19326f7 100644 --- a/src/inc/apiv2/helper/setUserPassword.routes.php +++ b/src/inc/apiv2/helper/setUserPassword.routes.php @@ -28,7 +28,7 @@ public function getFormFields(): array ]; } - public function actionPost($data): array|null { + public function actionPost($data): object|array|null { $user = self::getUser($data[User::USER_ID]); /* Set user password if provided */ diff --git a/src/inc/apiv2/helper/unassignAgent.routes.php b/src/inc/apiv2/helper/unassignAgent.routes.php index cfdda8080..53cd43e40 100644 --- a/src/inc/apiv2/helper/unassignAgent.routes.php +++ b/src/inc/apiv2/helper/unassignAgent.routes.php @@ -24,7 +24,7 @@ public function getFormFields(): array { ]; } - public function actionPost($data): array|null { + public function actionPost($data): object|array|null { AgentUtils::assign($data[Agent::AGENT_ID], 0, $this->getCurrentUser()); # TODO: Check how to handle custom return messages that are not object, probably we want that to be in some kind of standardized form. diff --git a/src/inc/apiv2/model/accessgroups.routes.php b/src/inc/apiv2/model/accessgroups.routes.php index 50d8a4fa5..f6f5cb5cb 100644 --- a/src/inc/apiv2/model/accessgroups.routes.php +++ b/src/inc/apiv2/model/accessgroups.routes.php @@ -19,38 +19,31 @@ public static function getDBAclass(): string { return AccessGroup::class; } - public function getExpandables(): array { - return ["userMembers", "agentMembers"]; + public static function getToManyRelationships(): array { + return [ + 'userMembers' => [ + 'key' => AccessGroup::ACCESS_GROUP_ID, + + 'junctionTableType' => AccessGroupUser::class, + 'junctionTableFilterField' => AccessGroupUser::ACCESS_GROUP_ID, + 'junctionTableJoinField' => AccessGroupUser::USER_ID, + + 'relationType' => User::class, + 'relationKey' => User::USER_ID, + ], + 'agentMembers' => [ + 'key' => AccessGroup::ACCESS_GROUP_ID, + + 'junctionTableType' =>AccessGroupAgent::class, + 'junctionTableFilterField' => AccessGroupAgent::ACCESS_GROUP_ID, + 'junctionTableJoinField' => AccessGroupAgent::AGENT_ID, + + 'relationType' => Agent::class, + 'relationKey' => Agent::AGENT_ID, + ], + ]; } - protected function fetchExpandObjects(array $objects, string $expand): mixed { - /* Ensure we receive the proper type */ - array_walk($objects, function($obj) { assert($obj instanceof AccessGroup); }); - - /* Expand requested section */ - switch($expand) { - case 'userMembers': - return $this->getManyToOneRelationViaIntermediate( - $objects, - AccessGroup::ACCESS_GROUP_ID, - Factory::getAccessGroupUserFactory(), - AccessGroupUser::ACCESS_GROUP_ID, - Factory::getUserFactory(), - User::USER_ID - ); - case 'agentMembers': - return $this->getManyToOneRelationViaIntermediate( - $objects, - AccessGroup::ACCESS_GROUP_ID, - Factory::getAccessGroupAgentFactory(), - AccessGroupAgent::ACCESS_GROUP_ID, - Factory::getAgentFactory(), - Agent::AGENT_ID - ); - default: - throw new BadFunctionCallException("Internal error: Expansion '$expand' not implemented!"); - } - } protected function createObject(array $data): int { $object = AccessGroupUtils::createGroup($data[AccessGroup::GROUP_NAME]); diff --git a/src/inc/apiv2/model/agentassignments.routes.php b/src/inc/apiv2/model/agentassignments.routes.php index d66a3dfa6..05e1645b8 100644 --- a/src/inc/apiv2/model/agentassignments.routes.php +++ b/src/inc/apiv2/model/agentassignments.routes.php @@ -23,34 +23,22 @@ public static function getDBAclass(): string { return Assignment::class; } - public function getExpandables(): array { - return ["task", "agent"]; - } + public static function getToOneRelationships(): array { + return [ + 'agent' => [ + 'key' => Assignment::AGENT_ID, - protected function fetchExpandObjects(array $objects, string $expand): mixed { - /* Ensure we receive the proper type */ - array_walk($objects, function($obj) { assert($obj instanceof Assignment); }); + 'relationType' => Agent::class, + 'relationKey' => Agent::AGENT_ID, + ], + 'task' => [ + 'key' => Assignment::TASK_ID, - /* Expand requested section */ - switch($expand) { - case 'task': - return $this->getForeignKeyRelation( - $objects, - Assignment::TASK_ID, - Factory::getTaskFactory(), - Task::TASK_ID - ); - case 'agent': - return $this->getForeignKeyRelation( - $objects, - Assignment::AGENT_ID, - Factory::getAgentFactory(), - Agent::AGENT_ID - ); - default: - throw new BadFunctionCallException("Internal error: Expansion '$expand' not implemented!"); - } - } + 'relationType' => Task::class, + 'relationKey' => Task::TASK_ID, + ], + ]; + } protected function createObject(array $data): int { AgentUtils::assign($data[Assignment::AGENT_ID], $data[Assignment::TASK_ID], $this->getCurrentUser()); diff --git a/src/inc/apiv2/model/agents.routes.php b/src/inc/apiv2/model/agents.routes.php index b46a4779b..3dbc00c1f 100644 --- a/src/inc/apiv2/model/agents.routes.php +++ b/src/inc/apiv2/model/agents.routes.php @@ -22,36 +22,27 @@ public static function getDBAclass(): string { return Agent::class; } - public function getExpandables(): array { - return ['accessGroups', 'agentstats']; + public static function getToManyRelationships(): array { + return [ + 'accessGroups' => [ + 'key' => Agent::AGENT_ID, + + 'junctionTableType' => AccessGroupAgent::class, + 'junctionTableFilterField' => AccessGroupAgent::AGENT_ID, + 'junctionTableJoinField' => AccessGroupAgent::ACCESS_GROUP_ID, + + 'relationType' => AccessGroup::class, + 'relationKey' => AccessGroup::ACCESS_GROUP_ID, + ], + 'agentStats' => [ + 'key' => Agent::AGENT_ID, + + 'relationType' => AgentStat::class, + 'relationKey' => AgentStat::AGENT_ID, + ], + + ]; } - - protected function fetchExpandObjects(array $objects, string $expand): mixed { - /* Ensure we receive the proper type */ - array_walk($objects, function($obj) { assert($obj instanceof Agent); }); - - /* Expand requested section */ - switch($expand) { - case 'accessGroups': - return $this->getManyToOneRelationViaIntermediate( - $objects, - Agent::AGENT_ID, - Factory::getAccessGroupAgentFactory(), - AccessGroupAgent::AGENT_ID, - Factory::getAccessGroupFactory(), - AccessGroup::ACCESS_GROUP_ID - ); - case 'agentstats': - return $this->getManyToOneRelation( - $objects, - Agent::AGENT_ID, - Factory::getAgentStatFactory(), - AgentStat::AGENT_ID - ); - default: - throw new BadFunctionCallException("Internal error: Expansion '$expand' not implemented!"); - } - } protected function createObject(array $data): int { assert(False, "Chunks cannot be created via API"); diff --git a/src/inc/apiv2/model/agentstats.routes.php b/src/inc/apiv2/model/agentstats.routes.php index 11c9a4c3a..5aa59b823 100644 --- a/src/inc/apiv2/model/agentstats.routes.php +++ b/src/inc/apiv2/model/agentstats.routes.php @@ -6,7 +6,7 @@ require_once(dirname(__FILE__) . "/../common/AbstractModelAPI.class.php"); -class AgentStatsAPI extends AbstractModelAPI { +class AgentStatAPI extends AbstractModelAPI { public static function getBaseUri(): string { return "/api/v2/ui/agentstats"; } @@ -33,4 +33,4 @@ protected function deleteObject(object $object): void { } } -AgentStatsAPI::register($app); \ No newline at end of file +AgentStatAPI::register($app); \ No newline at end of file diff --git a/src/inc/apiv2/model/chunks.routes.php b/src/inc/apiv2/model/chunks.routes.php index a4d2310c9..92df57022 100644 --- a/src/inc/apiv2/model/chunks.routes.php +++ b/src/inc/apiv2/model/chunks.routes.php @@ -1,6 +1,7 @@ getForeignKeyRelation( - $objects, - Chunk::TASK_ID, - Factory::getTaskFactory(), - Task::TASK_ID - ); - default: - throw new BadFunctionCallException("Internal error: Expansion '$expand' not implemented!"); - } - } + public static function getToOneRelationships(): array { + return [ + 'agent' => [ + 'key' => Chunk::AGENT_ID, + + 'relationType' => Agent::class, + 'relationKey' => Agent::AGENT_ID, + ], + 'task' => [ + 'key' => Chunk::TASK_ID, + + 'relationType' => Task::class, + 'relationKey' => Task::TASK_ID, + ], + ]; + } protected function createObject(array $data): int { /* Dummy code to implement abstract functions */ @@ -48,7 +44,7 @@ protected function createObject(array $data): int { return -1; } - public function updateObject(object $object, array $data, array $processed = []): void { + protected function updateObject(object $object, array $data, array $processed = []): void { assert(False, "Chunks cannot be updated via API"); } diff --git a/src/inc/apiv2/model/configs.routes.php b/src/inc/apiv2/model/configs.routes.php index 94a6a216f..958944182 100644 --- a/src/inc/apiv2/model/configs.routes.php +++ b/src/inc/apiv2/model/configs.routes.php @@ -20,26 +20,15 @@ public static function getDBAclass(): string { return Config::class; } - public function getExpandables(): array { - return ['configSection']; - } - - protected function fetchExpandObjects(array $objects, string $expand): mixed { - /* Ensure we receive the proper type */ - array_walk($objects, function($obj) { assert($obj instanceof Config); }); - - /* Expand requested section */ - switch($expand) { - case 'configSection': - return $this->getForeignKeyRelation( - $objects, - Config::CONFIG_SECTION_ID, - Factory::getConfigSectionFactory(), - ConfigSection::CONFIG_SECTION_ID, - ); - default: - throw new BadFunctionCallException("Internal error: Expansion '$expand' not implemented!"); - } + public static function getToOneRelationships(): array { + return [ + 'configSection' => [ + 'key' => Config::CONFIG_SECTION_ID, + + 'relationType' => ConfigSection::class, + 'relationKey' => ConfigSection::CONFIG_SECTION_ID, + ], + ]; } protected function createObject(array $data): int { diff --git a/src/inc/apiv2/model/crackers.routes.php b/src/inc/apiv2/model/crackers.routes.php index cd97773b3..119b48bf4 100644 --- a/src/inc/apiv2/model/crackers.routes.php +++ b/src/inc/apiv2/model/crackers.routes.php @@ -5,6 +5,7 @@ use DBA\CrackerBinary; use DBA\CrackerBinaryType; +use DBA\Task; require_once(dirname(__FILE__) . "/../common/AbstractModelAPI.class.php"); @@ -18,26 +19,27 @@ public static function getDBAclass(): string { return CrackerBinary::class; } - public function getExpandables(): array { - return ["crackerBinaryType"]; - } + public static function getToOneRelationships(): array { + return [ + 'crackerBinaryType' => [ + 'key' => CrackerBinary::CRACKER_BINARY_TYPE_ID, - protected function fetchExpandObjects(array $objects, string $expand): mixed { - /* Ensure we receive the proper type */ - array_walk($objects, function($obj) { assert($obj instanceof CrackerBinary); }); + 'relationType' => CrackerBinaryType::class, + 'relationKey' => CrackerBinaryType::CRACKER_BINARY_TYPE_ID, + ], + ]; + } - /* Expand requested section */ - switch($expand) { - case 'crackerBinaryType': - return $this->getForeignKeyRelation( - $objects, - CrackerBinary::CRACKER_BINARY_TYPE_ID, - Factory::getCrackerBinaryTypeFactory(), - CrackerBinaryType::CRACKER_BINARY_TYPE_ID, - ); - default: - throw new BadFunctionCallException("Internal error: Expansion '$expand' not implemented!"); - } + public static function getToManyRelationships(): array + { + return [ + 'tasks' => [ + 'key' => CrackerBinary::CRACKER_BINARY_ID, + + 'relationType' => Task::class, + 'relationKey' => Task::CRACKER_BINARY_ID, + ], + ]; } protected function createObject(array $data): int { diff --git a/src/inc/apiv2/model/crackertypes.routes.php b/src/inc/apiv2/model/crackertypes.routes.php index 6e7a730dc..47dec3eb3 100644 --- a/src/inc/apiv2/model/crackertypes.routes.php +++ b/src/inc/apiv2/model/crackertypes.routes.php @@ -5,6 +5,7 @@ use DBA\CrackerBinary; use DBA\CrackerBinaryType; +use DBA\Task; require_once(dirname(__FILE__) . "/../common/AbstractModelAPI.class.php"); @@ -18,27 +19,24 @@ public static function getDBAclass(): string { return CrackerBinaryType::class; } - public function getExpandables(): array { - return ["crackerVersions"]; - } - - protected function fetchExpandObjects(array $objects, string $expand): mixed { - /* Ensure we receive the proper type */ - array_walk($objects, function($obj) { assert($obj instanceof CrackerBinaryType); }); - /* Expand requested section */ - switch($expand) { - case 'crackerVersions': - return $this->getManyToOneRelation( - $objects, - CrackerBinaryType::CRACKER_BINARY_TYPE_ID, - Factory::getCrackerBinaryFactory(), - CrackerBinary::CRACKER_BINARY_TYPE_ID - ); - default: - throw new BadFunctionCallException("Internal error: Expansion '$expand' not implemented!"); - } + public static function getToManyRelationships(): array { + return [ + 'crackerVersions' => [ + 'key' => CrackerBinaryType::CRACKER_BINARY_TYPE_ID, + + 'relationType' => CrackerBinary::class, + 'relationKey' => CrackerBinary::CRACKER_BINARY_TYPE_ID, + ], + 'tasks' => [ + 'key' => CrackerBinaryType::CRACKER_BINARY_TYPE_ID, + + 'relationType' => Task::class, + 'relationKey' => Task::CRACKER_BINARY_TYPE_ID, + ] + ]; } + protected function createObject(array $data): int { CrackerUtils::createBinaryType($data[CrackerBinaryType::TYPE_NAME]); diff --git a/src/inc/apiv2/model/files.routes.php b/src/inc/apiv2/model/files.routes.php index 8926c1fed..088b309e7 100644 --- a/src/inc/apiv2/model/files.routes.php +++ b/src/inc/apiv2/model/files.routes.php @@ -20,26 +20,15 @@ public static function getDBAclass(): string { return File::class; } - public function getExpandables(): array { - return ["accessGroup"]; - } + public static function getToOneRelationships(): array { + return [ + 'accessGroup' => [ + 'key' => File::ACCESS_GROUP_ID, - protected function fetchExpandObjects(array $objects, string $expand): mixed { - /* Ensure we receive the proper type */ - array_walk($objects, function($obj) { assert($obj instanceof File); }); - - /* Expand requested section */ - switch($expand) { - case 'accessGroup': - return $this->getForeignKeyRelation( - $objects, - File::ACCESS_GROUP_ID, - Factory::getAccessGroupFactory(), - AccessGroup::ACCESS_GROUP_ID - ); - default: - throw new BadFunctionCallException("Internal error: Expansion '$expand' not implemented!"); - } + 'relationType' => AccessGroup::class, + 'relationKey' => AccessGroup::ACCESS_GROUP_ID, + ], + ]; } public function getFormFields(): array { diff --git a/src/inc/apiv2/model/globalpermissiongroups.routes.php b/src/inc/apiv2/model/globalpermissiongroups.routes.php index e99c69868..75ed789b6 100644 --- a/src/inc/apiv2/model/globalpermissiongroups.routes.php +++ b/src/inc/apiv2/model/globalpermissiongroups.routes.php @@ -7,36 +7,25 @@ require_once(dirname(__FILE__) . "/../common/AbstractModelAPI.class.php"); -class GlobalPermissionGroupsAPI extends AbstractModelAPI { +class GlobalPermissionGroupAPI extends AbstractModelAPI { public static function getBaseUri(): string { return "/api/v2/ui/globalpermissiongroups"; } public static function getDBAclass(): string { return RightGroup::class; - } - - public function getExpandables(): array { - return ['user']; } - protected function fetchExpandObjects(array $objects, string $expand): mixed { - /* Ensure we receive the proper type */ - array_walk($objects, function($obj) { assert($obj instanceof RightGroup); }); - - /* Expand requested section */ - switch($expand) { - case 'user': - return $this->getManyToOneRelation( - $objects, - RightGroup::RIGHT_GROUP_ID, - Factory::getUserFactory(), - User::RIGHT_GROUP_ID - ); - default: - throw new BadFunctionCallException("Internal error: Expansion '$expand' not implemented!"); - } - } + public static function getToManyRelationships(): array { + return [ + 'userMembers' => [ + 'key' => RightGroup::RIGHT_GROUP_ID, + + 'relationType' => User::class, + 'relationKey' => User::RIGHT_GROUP_ID, + ], + ]; + } /** * Rewrite permissions DB values to CRUD field values @@ -133,4 +122,4 @@ public function updateObject(object $object, $data, $processed = []): void { } } -GlobalPermissionGroupsAPI::register($app); \ No newline at end of file +GlobalPermissionGroupAPI::register($app); \ No newline at end of file diff --git a/src/inc/apiv2/model/hashes.routes.php b/src/inc/apiv2/model/hashes.routes.php index 97d44cce7..8a1a207b3 100644 --- a/src/inc/apiv2/model/hashes.routes.php +++ b/src/inc/apiv2/model/hashes.routes.php @@ -19,35 +19,23 @@ public static function getAvailableMethods(): array { public static function getDBAclass(): string { return Hash::class; - } - - public function getExpandables(): array { - return ["hashlist", "chunk"]; } - - protected function fetchExpandObjects(array $objects, string $expand): mixed { - /* Ensure we receive the proper type */ - array_walk($objects, function($obj) { assert($obj instanceof Hash); }); - - /* Expand requested section */ - switch($expand) { - case 'hashlist': - return $this->getForeignKeyRelation( - $objects, - Hash::HASHLIST_ID, - Factory::getHashListFactory(), - HashList::HASHLIST_ID - ); - case 'chunk': - return $this->getForeignKeyRelation( - $objects, - Hash::CHUNK_ID, - Factory::getChunkFactory(), - Chunk::CHUNK_ID - ); - default: - throw new BadFunctionCallException("Internal error: Expansion '$expand' not implemented!"); - } + + public static function getToOneRelationships(): array { + return [ + 'chunk' => [ + 'key' => Hash::CHUNK_ID, + + 'relationType' => Chunk::class, + 'relationKey' => Chunk::CHUNK_ID, + ], + 'hashlist' => [ + 'key' => Hash::HASHLIST_ID, + + 'relationType' => Hashlist::class, + 'relationKey' => Hashlist::HASHLIST_ID, + ], + ]; } protected function createObject(array $data): int { diff --git a/src/inc/apiv2/model/hashlists.routes.php b/src/inc/apiv2/model/hashlists.routes.php index 159b4eeef..a44c54c4f 100644 --- a/src/inc/apiv2/model/hashlists.routes.php +++ b/src/inc/apiv2/model/hashlists.routes.php @@ -25,59 +25,55 @@ public static function getDBAclass(): string { return Hashlist::class; } - public function getExpandables(): array { - return ["accessGroup", "hashType", "hashes", "tasks", "hashlists"]; + + public static function getToOneRelationships(): array { + return [ + 'accessGroup' => [ + 'key' => Hashlist::ACCESS_GROUP_ID, + + 'relationType' => AccessGroup::class, + 'relationKey' => AccessGroup::ACCESS_GROUP_ID, + ], + 'hashType' => [ + 'key' => Hashlist::HASH_TYPE_ID, + + 'relationType' => HashType::class, + 'relationKey' => HashType::HASH_TYPE_ID, + ], + ]; } - - protected function fetchExpandObjects(array $objects, string $expand): mixed { - /* Ensure we receive the proper type */ - array_walk($objects, function($obj) { assert($obj instanceof Hashlist); }); - - /* Expand requested section */ - switch($expand) { - case 'accessGroup': - return $this->getForeignKeyRelation( - $objects, - Hashlist::ACCESS_GROUP_ID, - Factory::getAccessGroupFactory(), - AccessGroup::ACCESS_GROUP_ID - ); - case 'hashType': - return $this->getForeignKeyRelation( - $objects, - Hashlist::HASH_TYPE_ID, - Factory::getHashTypeFactory(), - HashType::HASH_TYPE_ID - ); - case 'hashes': - return $this->getManyToOneRelation( - $objects, - Hashlist::HASHLIST_ID, - Factory::getHashFactory(), - Hash::HASHLIST_ID - ); - case 'hashlists': - /* PARENT_HASHLIST_ID in use in intermediate table */ - return $this->getManyToOneRelationViaIntermediate( - $objects, - Hashlist::HASHLIST_ID, - Factory::getHashlistHashlistFactory(), - HashlistHashlist::PARENT_HASHLIST_ID, - Factory::getHashlistFactory(), - Hashlist::HASHLIST_ID, - ); - case 'tasks': - return $this->getManyToOneRelationViaIntermediate( - $objects, - Hashlist::HASHLIST_ID, - Factory::getTaskWrapperFactory(), - TaskWrapper::HASHLIST_ID, - Factory::getTaskFactory(), - Task::TASK_WRAPPER_ID, - ); - default: - throw new BadFunctionCallException("Internal error: Expansion '$expand' not implemented!"); - } + + + public static function getToManyRelationships(): array { + return [ + 'hashes' => [ + 'key' => Hashlist::HASHLIST_ID, + + 'relationType' => Hash::class, + 'relationKey' => Hash::HASHLIST_ID, + ], + /* Special case due to superhashlist setup. PARENT_HASHLIST_ID in use in intermediate table */ + 'hashlists' => [ + 'key' => Hashlist::HASHLIST_ID, + + 'junctionTableType' => HashlistHashlist::class, + 'junctionTableFilterField' => HashlistHashlist::PARENT_HASHLIST_ID, + 'junctionTableJoinField' => HashlistHashlist::HASHLIST_ID, + + 'relationType' => Hashlist::class, + 'relationKey' => Hashlist::HASHLIST_ID, + ], + 'tasks' => [ + 'key' => Hashlist::HASHLIST_ID, + + 'junctionTableType' => TaskWrapper::class, + 'junctionTableFilterField' => TaskWrapper::HASHLIST_ID, + 'junctionTableJoinField' => TaskWrapper::TASK_WRAPPER_ID, + + 'relationType' => Task::class, + 'relationKey' => Task::TASK_WRAPPER_ID, + ], + ]; } protected function getFilterACL(): array { diff --git a/src/inc/apiv2/model/healthcheckagents.routes.php b/src/inc/apiv2/model/healthcheckagents.routes.php index a09d43ad9..e21a312fd 100644 --- a/src/inc/apiv2/model/healthcheckagents.routes.php +++ b/src/inc/apiv2/model/healthcheckagents.routes.php @@ -21,33 +21,21 @@ public static function getDBAclass(): string { return HealthCheckAgent::class; } - public function getExpandables(): array { - return ['agent', 'healthCheck']; - } - - protected function fetchExpandObjects(array $objects, string $expand): mixed { - /* Ensure we receive the proper type */ - array_walk($objects, function($obj) { assert($obj instanceof HealthCheckAgent); }); - - /* Expand requested section */ - switch($expand) { - case 'agent': - return $this->getForeignKeyRelation( - $objects, - HealthCheckAgent::AGENT_ID, - Factory::getAgentFactory(), - Agent::AGENT_ID - ); - case 'healthCheck': - return $this->getForeignKeyRelation( - $objects, - HealthCheckAgent::HEALTH_CHECK_ID, - Factory::getHealthCheckFactory(), - HealthCheck::HEALTH_CHECK_ID - ); - default: - throw new BadFunctionCallException("Internal error: Expansion '$expand' not implemented!"); - } + public static function getToOneRelationships(): array { + return [ + 'agent' => [ + 'key' => HealthCheckAgent::AGENT_ID, + + 'relationType' => Agent::class, + 'relationKey' => Agent::AGENT_ID, + ], + 'healthCheck' => [ + 'key' => HealthCheckAgent::HEALTH_CHECK_ID, + + 'relationType' => HealthCheck::class, + 'relationKey' => HealthCheck::HEALTH_CHECK_ID, + ], + ]; } protected function createObject(array $object): int { diff --git a/src/inc/apiv2/model/healthchecks.routes.php b/src/inc/apiv2/model/healthchecks.routes.php index 0a608d3a4..5d9ba9622 100644 --- a/src/inc/apiv2/model/healthchecks.routes.php +++ b/src/inc/apiv2/model/healthchecks.routes.php @@ -17,35 +17,29 @@ public static function getDBAclass(): string { return HealthCheck::class; } - public function getExpandables(): array { - return ['crackerBinary', 'healthCheckAgents']; + + public static function getToOneRelationships(): array { + return [ + 'crackerBinary' => [ + 'key' => HealthCheck::CRACKER_BINARY_ID, + + 'relationType' => CrackerBinary::class, + 'relationKey' => CrackerBinary::CRACKER_BINARY_ID, + ], + ]; } - - protected function fetchExpandObjects(array $objects, string $expand): mixed { - /* Ensure we receive the proper type */ - array_walk($objects, function($obj) { assert($obj instanceof HealthCheck); }); - /* Expand requested section */ - switch($expand) { - case 'crackerBinary': - return $this->getForeignKeyRelation( - $objects, - HealthCheck::CRACKER_BINARY_ID, - Factory::getCrackerBinaryFactory(), - CrackerBinary::CRACKER_BINARY_ID - ); - case 'healthCheckAgents': - return $this->getManyToOneRelation( - $objects, - HealthCheck::HEALTH_CHECK_ID, - Factory::getHealthCheckAgentFactory(), - HealthCheckAgent::HEALTH_CHECK_ID - ); - default: - throw new BadFunctionCallException("Internal error: Expansion '$expand' not implemented!"); - } + public static function getToManyRelationships(): array { + return [ + 'healthCheckAgents' => [ + 'key' => HealthCheck::HEALTH_CHECK_ID, + + 'relationType' => HealthCheckAgent::class, + 'relationKey' => HealthCheckAgent::HEALTH_CHECK_ID, + ], + ]; } - + protected function createObject(array $data): int { $obj = HealthUtils::createHealthCheck( $data[HealthCheck::HASHTYPE_ID], diff --git a/src/inc/apiv2/model/notifications.routes.php b/src/inc/apiv2/model/notifications.routes.php index a3a262ce9..9c0646be1 100644 --- a/src/inc/apiv2/model/notifications.routes.php +++ b/src/inc/apiv2/model/notifications.routes.php @@ -17,28 +17,18 @@ public static function getDBAclass(): string { return NotificationSetting::class; } - public function getExpandables(): array { - return ['user']; - } - - protected function fetchExpandObjects(array $objects, string $expand): mixed { - /* Ensure we receive the proper type */ - array_walk($objects, function($obj) { assert($obj instanceof NotificationSetting); }); + public static function getToOneRelationships(): array { + return [ + 'user' => [ + 'key' => NotificationSetting::USER_ID, - /* Expand requested section */ - switch($expand) { - case 'user': - return $this->getForeignKeyRelation( - $objects, - NotificationSetting::USER_ID, - Factory::getUserFactory(), - User::USER_ID - ); - default: - throw new BadFunctionCallException("Internal error: Expansion '$expand' not implemented!"); - } + 'relationType' => User::class, + 'relationKey' => User::USER_ID, + ], + ]; } - + + public function getFormFields(): array { return ['actionFilter' => ['type' => 'str(256)']]; } diff --git a/src/inc/apiv2/model/pretasks.routes.php b/src/inc/apiv2/model/pretasks.routes.php index 89a091c7f..34361cbc6 100644 --- a/src/inc/apiv2/model/pretasks.routes.php +++ b/src/inc/apiv2/model/pretasks.routes.php @@ -20,28 +20,19 @@ public static function getDBAclass(): string { return Pretask::class; } - public function getExpandables(): array { - return ["pretaskFiles"]; - } - - protected function fetchExpandObjects(array $objects, string $expand): mixed { - /* Ensure we receive the proper type */ - array_walk($objects, function($obj) { assert($obj instanceof PreTask); }); + public static function getToManyRelationships(): array { + return [ + 'pretaskFiles' => [ + 'key' => Pretask::PRETASK_ID, + + 'junctionTableType' => FilePretask::class, + 'junctionTableFilterField' => FilePretask::PRETASK_ID, + 'junctionTableJoinField' => FilePretask::FILE_ID, - /* Expand requested section */ - switch($expand) { - case 'pretaskFiles': - return $this->getManyToOneRelationViaIntermediate( - $objects, - Pretask::PRETASK_ID, - Factory::getFilePretaskFactory(), - FilePretask::PRETASK_ID, - Factory::getFileFactory(), - File::FILE_ID - ); - default: - throw new BadFunctionCallException("Internal error: Expansion '$expand' not implemented!"); - } + 'relationType' => File::class, + 'relationKey' => File::FILE_ID, + ], + ]; } public function getFormFields(): array { diff --git a/src/inc/apiv2/model/speeds.routes.php b/src/inc/apiv2/model/speeds.routes.php index 3a2761bae..8bbaed5da 100644 --- a/src/inc/apiv2/model/speeds.routes.php +++ b/src/inc/apiv2/model/speeds.routes.php @@ -26,33 +26,22 @@ public static function getDBAclass(): string { return Speed::class; } - public function getExpandables(): array { - return [ 'agent', 'task' ]; - } - - protected function fetchExpandObjects(array $objects, string $expand): mixed { - /* Ensure we receive the proper type */ - array_walk($objects, function($obj) { assert($obj instanceof Speed); }); - /* Expand requested section */ - switch($expand) { - case 'agent': - return $this->getForeignKeyRelation( - $objects, - Speed::AGENT_ID, - Factory::getAgentFactory(), - Agent::AGENT_ID - ); - case 'task': - return $this->getForeignKeyRelation( - $objects, - Speed::TASK_ID, - Factory::getTaskFactory(), - Task::TASK_ID - ); - default: - throw new BadFunctionCallException("Internal error: Expansion '$expand' not implemented!"); - } + public static function getToOneRelationships(): array { + return [ + 'agent' => [ + 'key' => Speed::AGENT_ID, + + 'relationType' => Agent::class, + 'relationKey' => Agent::AGENT_ID, + ], + 'task' => [ + 'key' => Speed::TASK_ID, + + 'relationType' => Task::class, + 'relationKey' => Task::TASK_ID, + ], + ]; } protected function createObject(array $data): int { diff --git a/src/inc/apiv2/model/supertasks.routes.php b/src/inc/apiv2/model/supertasks.routes.php index deec64475..d4d37e146 100644 --- a/src/inc/apiv2/model/supertasks.routes.php +++ b/src/inc/apiv2/model/supertasks.routes.php @@ -19,28 +19,19 @@ public static function getDBAclass(): string { return Supertask::class; } - public function getExpandables(): array { - return [ "pretasks" ]; - } - - protected function fetchExpandObjects(array $objects, string $expand): mixed { - /* Ensure we receive the proper type */ - array_walk($objects, function($obj) { assert($obj instanceof Supertask); }); - - /* Expand requested section */ - switch($expand) { - case 'pretasks': - return $this->getManyToOneRelationViaIntermediate( - $objects, - Supertask::SUPERTASK_ID, - Factory::getSupertaskPretaskFactory(), - SupertaskPretask::SUPERTASK_ID, - Factory::getPretaskFactory(), - Pretask::PRETASK_ID - ); - default: - throw new BadFunctionCallException("Internal error: Expansion '$expand' not implemented!"); - } + public static function getToManyRelationships(): array { + return [ + 'pretasks' => [ + 'key' => Supertask::SUPERTASK_ID, + + 'junctionTableType' => SupertaskPretask::class, + 'junctionTableFilterField' => SupertaskPretask::SUPERTASK_ID, + 'junctionTableJoinField' => SupertaskPretask::PRETASK_ID, + + 'relationType' => Pretask::class, + 'relationKey' => Pretask::PRETASK_ID, + ], + ]; } public function getFormFields(): array { diff --git a/src/inc/apiv2/model/tasks.routes.php b/src/inc/apiv2/model/tasks.routes.php index 4244ac679..978a14dc1 100644 --- a/src/inc/apiv2/model/tasks.routes.php +++ b/src/inc/apiv2/model/tasks.routes.php @@ -23,67 +23,63 @@ public static function getDBAclass(): string { return Task::class; } - public function getExpandables(): array { - return ["assignedAgents", "crackerBinary", "crackerBinaryType", "hashlist", "speeds", "files"]; + public static function getToOneRelationships(): array { + return [ + 'crackerBinary' => [ + 'key' => Task::CRACKER_BINARY_ID, + + 'relationType' => CrackerBinary::class, + 'relationKey' => CrackerBinary::CRACKER_BINARY_ID, + ], + 'crackerBinaryType' => [ + 'key' => Task::CRACKER_BINARY_TYPE_ID, + + 'relationType' => CrackerBinaryType::class, + 'relationKey' => CrackerBinaryType::CRACKER_BINARY_TYPE_ID, + ], + 'hashlist' => [ + 'key' => TaskWrapper::HASHLIST_ID, + + 'relationType' => Hashlist::class, + 'relationKey' => Hashlist::HASHLIST_ID, + + //because task doesnt have a direct connection to hashlist + 'intermediateType' => TaskWrapper::class, + 'joinField' => Task::TASK_WRAPPER_ID, + 'joinFieldRelation' => TaskWrapper::TASK_WRAPPER_ID, + ], + ]; } - protected function fetchExpandObjects(array $objects, string $expand): mixed { - /* Ensure we receive the proper type */ - array_walk($objects, function($obj) { assert($obj instanceof Task); }); - - /* Expand requested section */ - switch($expand) { - case 'assignedAgents': - return $this->getManyToOneRelationViaIntermediate( - $objects, - Task::TASK_ID, - Factory::getAssignmentFactory(), - Assignment::TASK_ID, - Factory::getAgentFactory(), - Agent::AGENT_ID - ); - case 'crackerBinary': - return $this->getForeignKeyRelation( - $objects, - Task::CRACKER_BINARY_ID, - Factory::getCrackerBinaryFactory(), - CrackerBinary::CRACKER_BINARY_ID - ); - case 'crackerBinaryType': - return $this->getForeignKeyRelation( - $objects, - Task::CRACKER_BINARY_TYPE_ID, - Factory::getCrackerBinaryTypeFactory(), - CrackerBinaryType::CRACKER_BINARY_TYPE_ID - ); - case 'hashlist': - return $this->getManyToOneRelationViaIntermediate( - $objects, - Task::TASK_WRAPPER_ID, - Factory::getTaskWrapperFactory(), - TaskWrapper::TASK_WRAPPER_ID, - Factory::getHashlistFactory(), - Hashlist::HASHLIST_ID - ); - case 'speeds': - return $this->getManyToOneRelation( - $objects, - Task::TASK_ID, - Factory::getSpeedFactory(), - Speed::TASK_ID - ); - case 'files': - return $this->getManyToOneRelationViaIntermediate( - $objects, - Task::TASK_ID, - Factory::getFileTaskFactory(), - FileTask::TASK_ID, - Factory::getFileFactory(), - File::FILE_ID - ); - default: - throw new BadFunctionCallException("Internal error: Expansion '$expand' not implemented!"); - } + public static function getToManyRelationships(): array { + return [ + 'assignedAgents' => [ + 'key' => Task::TASK_ID, + + 'junctionTableType' => Assignment::class, + 'junctionTableFilterField' => Assignment::TASK_ID, + 'junctionTableJoinField' => Assignment::AGENT_ID, + + 'relationType' => Agent::class, + 'relationKey' => Agent::AGENT_ID, + ], + 'files' => [ + 'key' => Task::TASK_ID, + + 'junctionTableType' => FileTask::class, + 'junctionTableFilterField' => FileTask::TASK_ID, + 'junctionTableJoinField' => FileTask::FILE_ID, + + 'relationType' => File::class, + 'relationKey' => File::FILE_ID, + ], + 'speeds' => [ + 'key' => Task::TASK_ID, + + 'relationType' => Speed::class, + 'relationKey' => Speed::TASK_ID, + ] + ]; } public function getFormFields(): array { diff --git a/src/inc/apiv2/model/taskwrappers.routes.php b/src/inc/apiv2/model/taskwrappers.routes.php index 9d03f0007..6bd5b7faa 100644 --- a/src/inc/apiv2/model/taskwrappers.routes.php +++ b/src/inc/apiv2/model/taskwrappers.routes.php @@ -11,7 +11,7 @@ require_once(dirname(__FILE__) . "/../common/AbstractModelAPI.class.php"); -class TaskWrappersAPI extends AbstractModelAPI { +class TaskWrapperAPI extends AbstractModelAPI { public static function getBaseUri(): string { return "/api/v2/ui/taskwrappers"; } @@ -24,35 +24,29 @@ public static function getDBAclass(): string { return TaskWrapper::class; } - public function getExpandables(): array { - return ['accessGroup', 'tasks']; - } + public static function getToOneRelationships(): array { + return [ + 'accessGroup' => [ + 'key' => TaskWrapper::ACCESS_GROUP_ID, - protected function fetchExpandObjects(array $objects, string $expand): mixed { - /* Ensure we receive the proper type */ - array_walk($objects, function($obj) { assert($obj instanceof TaskWrapper); }); + 'relationType' => AccessGroup::class, + 'relationKey' => AccessGroup::ACCESS_GROUP_ID, + ], + ]; + } - /* Expand requested section */ - switch($expand) { - case 'accessGroup': - return $this->getForeignKeyRelation( - $objects, - TaskWrapper::ACCESS_GROUP_ID, - Factory::getAccessGroupFactory(), - AccessGroup::ACCESS_GROUP_ID - ); - case 'tasks': - return $this->getManyToOneRelation( - $objects, - TaskWrapper::TASK_WRAPPER_ID, - Factory::getTaskFactory(), - Task::TASK_WRAPPER_ID - ); - default: - throw new BadFunctionCallException("Internal error: Expansion '$expand' not implemented!"); - } + public static function getToManyRelationships(): array { + return [ + 'tasks' => [ + 'key' => TaskWrapper::TASK_WRAPPER_ID, + + 'relationType' => Task::class, + 'relationKey' => Task::TASK_WRAPPER_ID, + ], + ]; } + protected function createObject(array $data): int { assert(False, "TaskWrappers cannot be created via API"); return -1; @@ -104,4 +98,4 @@ protected function deleteObject(object $object): void { } } -TaskWrappersAPI::register($app); \ No newline at end of file +TaskWrapperAPI::register($app); \ No newline at end of file diff --git a/src/inc/apiv2/model/users.routes.php b/src/inc/apiv2/model/users.routes.php index d1214fe5a..2f92db5ef 100644 --- a/src/inc/apiv2/model/users.routes.php +++ b/src/inc/apiv2/model/users.routes.php @@ -20,18 +20,42 @@ public static function getDBAclass(): string { return User::class; } - public function getExpandables(): array { - return ["accessGroups", "globalPermissionGroup"]; + public static function getToOneRelationships(): array { + return [ + 'globalPermissionGroup' => [ + 'key' => User::RIGHT_GROUP_ID, + + 'relationType' => RightGroup::class, + 'relationKey' => RightGroup::RIGHT_GROUP_ID, + ], + ]; + } + + public static function getToManyRelationships(): array { + return [ + 'accessGroups' => [ + 'key' => User::USER_ID, + + 'junctionTableType' => AccessGroupUser::class, + 'junctionTableFilterField' => AccessGroupUser::USER_ID, + 'junctionTableJoinField' => AccessGroupUser::ACCESS_GROUP_ID, + + 'relationType' => AccessGroup::class, + 'relationKey' => AccessGroup::ACCESS_GROUP_ID, + ], + ]; } - protected function fetchExpandObjects(array $objects, string $expand): mixed { - /* Ensure we receive the proper type */ + + + + protected static function fetchExpandObjects(array $objects, string $expand): mixed { array_walk($objects, function($obj) { assert($obj instanceof User); }); /* Expand requested section */ switch($expand) { case 'accessGroups': - return $this->getManyToOneRelationViaIntermediate( + return self::getManyToOneRelationViaIntermediate( $objects, User::USER_ID, Factory::getAccessGroupUserFactory(), @@ -40,7 +64,7 @@ protected function fetchExpandObjects(array $objects, string $expand): mixed { AccessGroup::ACCESS_GROUP_ID ); case 'globalPermissionGroup': - return $this->getForeignKeyRelation( + return self::getForeignKeyRelation( $objects, User::RIGHT_GROUP_ID, Factory::getRightGroupFactory(), From fd5ba50dc6c4d95f03700c46dddd9bff4845ec54 Mon Sep 17 00:00:00 2001 From: jessevz Date: Thu, 21 Nov 2024 12:03:04 +0100 Subject: [PATCH 002/691] Bug/999 download file via new api (#1130) * FEAT added getFile helper endpoint to download files in new API * FEAT add etag support on getFile * cleaned up getFile helper * FEAT added test for getFile helper * FEAT added tests for Range request in getFile helper * Fixed code style suggestion in ci/apiv2/hashtopolis.py --- ci/apiv2/hashtopolis.py | 21 +++ ci/apiv2/test_file.py | 14 ++ src/api/v2/index.php | 1 + src/inc/apiv2/helper/getFile.routes.php | 175 ++++++++++++++++++++++++ 4 files changed, 211 insertions(+) create mode 100644 src/inc/apiv2/helper/getFile.routes.php diff --git a/ci/apiv2/hashtopolis.py b/ci/apiv2/hashtopolis.py index 27723bdf3..66b7aa953 100644 --- a/ci/apiv2/hashtopolis.py +++ b/ci/apiv2/hashtopolis.py @@ -818,6 +818,22 @@ def _helper_request(self, helper_uri, payload): else: return self.resp_to_json(r) + def _helper_get_request_file(self, helper_uri, payload, range=None): + self.authenticate() + uri = self._api_endpoint + self._model_uri + helper_uri + headers = self._headers + if range: + headers["Range"] = range + + logging.debug(f"Sending GET request to {uri}, with params:{payload}") + r = requests.get(uri, headers=headers, params=payload) + if range is None: + assert r.status_code == 200 + else: + assert r.status_code == 206 + logging.debug(f"received file contents: \n {r.text}") + return r.text + def _test_authentication(self, username, password): auth_uri = self._api_endpoint + '/auth/token' auth = (username, password) @@ -898,6 +914,11 @@ def import_cracked_hashes(self, hashlist, source_data, separator): response = self._helper_request("importCrackedHashes", payload) return response['data'] + def get_file(self, file, range=None): + payload = { + 'file': file.id + } + return self._helper_get_request_file("getFile", payload, range) def recount_file_lines(self, file): payload = { diff --git a/ci/apiv2/test_file.py b/ci/apiv2/test_file.py index 2262ed6cd..a884015a9 100644 --- a/ci/apiv2/test_file.py +++ b/ci/apiv2/test_file.py @@ -39,3 +39,17 @@ def test_recount_wordlist(self): file = helper.recount_file_lines(file=model_obj) self.assertEqual(file.lineCount, 3) + + def test_helper_get_file(self): + model_obj = self.create_test_object() + + helper = Helper() + file_data = helper.get_file(file=model_obj) + self.assertEqual(file_data, "12345678\n123456\nprincess\n") + + def test_range_request_get_file(self): + model_obj = self.create_test_object() + + helper = Helper() + file_data = helper.get_file(file=model_obj, range="bytes=9-15") + self.assertEqual(file_data, "123456\n") diff --git a/src/api/v2/index.php b/src/api/v2/index.php index 42240c00f..21debec76 100644 --- a/src/api/v2/index.php +++ b/src/api/v2/index.php @@ -273,6 +273,7 @@ public function process(Request $request, RequestHandler $handler): Response { require __DIR__ . "/../../inc/apiv2/helper/exportCrackedHashes.routes.php"; require __DIR__ . "/../../inc/apiv2/helper/exportLeftHashes.routes.php"; require __DIR__ . "/../../inc/apiv2/helper/exportWordlist.routes.php"; +require __DIR__ . "/../../inc/apiv2/helper/getFile.routes.php"; require __DIR__ . "/../../inc/apiv2/helper/importCrackedHashes.routes.php"; require __DIR__ . "/../../inc/apiv2/helper/importFile.routes.php"; require __DIR__ . "/../../inc/apiv2/helper/purgeTask.routes.php"; diff --git a/src/inc/apiv2/helper/getFile.routes.php b/src/inc/apiv2/helper/getFile.routes.php new file mode 100644 index 000000000..2e685bdc8 --- /dev/null +++ b/src/inc/apiv2/helper/getFile.routes.php @@ -0,0 +1,175 @@ +get($file_id); + if (!$file) { + throw new HttpNotFoundException($request, "No file with id: " . $file_id); + } + $filename = Factory::getStoredValueFactory()->get(DDirectories::FILES)->getVal() . "/" . $file->getFilename(); + //checks below should never trigger + if (!file_exists($filename)) { + throw new HttpNotFoundException($request, "File not found at filesystem"); + } + if (!is_readable($filename)) { + throw new HttpForbiddenException($request, "Not allowed to read file"); + } + + return $filename; + } + + /** + * Handles HTTP range requests for partial conten delivery + * + * This method processes the `Range` header from the HTTP request + * to determine the start and end byte positions for the response, + * ensuring the range is valid and updates the file pointer accordingly. + * + * @param int &$start A reference to the starting byte of the range. This value will be updated. + * @param int &$end A reference to the ending byte of the range. This value will be updated. + * @param int &$size The total size of the content in bytes. + * @param resource &$fp A file pointer resource to seek to the correct position for the range. + * @return bool Returns `true` if the range request is valid and successfully processed, or `false` otherwise. + * + * @throws InvalidArgumentException If the `Range` header is malformed. + * + * @note This function assumes the presence of the `HTTP_RANGE` header in the `$_SERVER` superglobal. + */ + protected function handleRangeRequest(int &$start, int &$end, int &$size, &$fp): bool { + + $c_start = $start; + $c_end = $end; + + list(, $range) = explode('=', $_SERVER['HTTP_RANGE'], 2); + + if (strpos($range, ',') !== false) { + return false; + } + if ($range == '-') { + $c_start = $size - substr($range, 1); + } + else { + $range = explode('-', $range); + $c_start = $range[0]; + if ((isset($range[1]) && is_numeric($range[1]))) { + $c_end = $range[1]; + } + else { + $c_end = $size; + } + } + if ($c_end > $end) { + $c_end = $end; + } + if ($c_start > $c_end || $c_start > $size - 1 || $c_end >= $size) { + return false; + } + $start = $c_start; + $end = $c_end; + fseek($fp, $start); + return true; + } + + public function handleGet(Request $request, Response $response): Response { + $this->preCommon($request); + $file_id = intval($request->getQueryParams()['file']); + + $filename = $this->validateFile($request, $file_id); + + $size = Util::filesize($filename); + $lastModified = filemtime($filename); + + $etag = md5($lastModified . $size); + $ifNoneMatch = $request->getHeaderLine('If-None-Match'); + if ($ifNoneMatch === $etag) { + return $response->withStatus(304); + } + + $exp = explode(".", $filename); + if ($exp[sizeof($exp) - 1] == '7z') { + $contentType = "application/x-7z-compressed"; + } else { + $contentType = "application/force-download"; + } + $fp = @fopen($filename, "rb"); + + if (!$fp) { + throw new HttpForbiddenException($request, "Can't open the file"); + } + + $start = 0; // Start byte + $end = $size - 1; // End byte + + $status = 200; + if (isset($_SERVER['HTTP_RANGE'])) { + if(!$this->handleRangeRequest($start, $end, $size, $fp)) { + fclose($fp); + return $response->withStatus(416) + ->withHeader("Content-Range", "bytes $start-$end/$size"); + } else { + $status = 206; + } + } + + $length = $end - $start + 1; //content-length + $buffer = 1024 * 100; + $stream = $response->getBody(); + while (!feof($fp) && ($p = ftell($fp)) <= $end) { + if ($p + $buffer > $end) { + $buffer = $end - $p + 1; + } + $stream->write(fread($fp, $buffer)); + } + fclose($fp); + + return $response->withStatus($status) + ->withHeader("Content-Type", $contentType) + ->withHeader("Content-Description", $filename) + ->withHeader("Content-Disposition", "attachment; filename=\"" . $filename . "\"") + ->withHeader("Accept-Ranges", "Byte") + ->withHeader("Content-Range", "bytes $start-$end/$size") + ->withHeader("Content-Length", $length) + ->withHeader("ETag", $etag); + } + + static public function register($app): void + { + $baseUri = getFileHelperAPI::getBaseUri(); + + /* Allow CORS preflight requests */ + $app->options($baseUri, function (Request $request, Response $response): Response { + return $response; + }); + $app->get($baseUri, "getFileHelperAPI:handleGet"); + } +} + +getFileHelperAPI::register($app); \ No newline at end of file From fe16f39ee32150ca4cd02ba2d7ebcb3cab32760c Mon Sep 17 00:00:00 2001 From: Sein Coray Date: Thu, 21 Nov 2024 14:27:51 +0100 Subject: [PATCH 003/691] added multicolumn aggregation to DBA and improved three essential parts which suffer from many chunks (#1069) * Adding loops to scan through lines to support importing hashes longer then 1024 bytes * added multicolumn aggregation to DBA and improved three essential parts which suffer from many chunks * applied requested changes (constants and query merge) for pull request #1069 --------- Co-authored-by: Jesse van Zutphen --- src/dba/AbstractModelFactory.class.php | 25 ++++++++++++ src/dba/Aggregation.class.php | 42 ++++++++++++++++++++ src/dba/init.php | 1 + src/inc/Util.class.php | 53 ++++++++++++++------------ src/inc/api/APIGetChunk.class.php | 18 +++++---- src/inc/utils/TaskUtils.class.php | 20 +++++----- 6 files changed, 118 insertions(+), 41 deletions(-) create mode 100755 src/dba/Aggregation.class.php diff --git a/src/dba/AbstractModelFactory.class.php b/src/dba/AbstractModelFactory.class.php index e1326d16f..8eb63ba98 100755 --- a/src/dba/AbstractModelFactory.class.php +++ b/src/dba/AbstractModelFactory.class.php @@ -411,6 +411,31 @@ public function minMaxFilter($options, $sumColumn, $op) { return $row['column_' . strtolower($op)]; } + public function multicolAggregationFilter($options, $aggregations) { + //$options: as usual + //$columns: array of Aggregation objects + + $elements = []; + foreach ($aggregations as $aggregation) { + $elements[] = $aggregation->getQueryString(); + } + + $query = "SELECT " . join(",", $elements); + $query = $query . " FROM " . $this->getModelTable(); + + $vals = array(); + + if (array_key_exists("filter", $options)) { + $query .= $this->applyFilters($vals, $options['filter']); + } + + $dbh = self::getDB(); + $stmt = $dbh->prepare($query); + $stmt->execute($vals); + + return $stmt->fetch(PDO::FETCH_ASSOC); + } + public function sumFilter($options, $sumColumn) { $query = "SELECT SUM($sumColumn) AS sum "; $query = $query . " FROM " . $this->getModelTable(); diff --git a/src/dba/Aggregation.class.php b/src/dba/Aggregation.class.php new file mode 100755 index 000000000..be775c434 --- /dev/null +++ b/src/dba/Aggregation.class.php @@ -0,0 +1,42 @@ +column = $column; + $this->function = $function; + $this->factory = $factory; + } + + function getName() { + return strtolower($this->function) . "_" . $this->column; + } + + function getQueryString($table = "") { + if ($table != "") { + $table = $table . "."; + } + if ($this->factory != null) { + $table = $this->factory->getModelTable() . "."; + } + + return $this->function . "(" . $table . $this->column . ") AS " . $this->getName(); + } +} + + diff --git a/src/dba/init.php b/src/dba/init.php index eb8ef1a11..834f846e7 100644 --- a/src/dba/init.php +++ b/src/dba/init.php @@ -9,6 +9,7 @@ require_once(dirname(__FILE__) . "/AbstractModel.class.php"); require_once(dirname(__FILE__) . "/AbstractModelFactory.class.php"); +require_once(dirname(__FILE__) . "/Aggregation.class.php"); require_once(dirname(__FILE__) . "/Filter.class.php"); require_once(dirname(__FILE__) . "/Order.class.php"); require_once(dirname(__FILE__) . "/Join.class.php"); diff --git a/src/inc/Util.class.php b/src/inc/Util.class.php index e64073a9a..1a659eb03 100755 --- a/src/inc/Util.class.php +++ b/src/inc/Util.class.php @@ -1,5 +1,6 @@ getId(), "="); - $chunks = Factory::getChunkFactory()->filter([Factory::FILTER => $qF]); - $progress = 0; - $cracked = 0; - $maxTime = 0; - $totalTimeSpent = 0; - $speed = 0; - foreach ($chunks as $chunk) { - if ($chunk->getDispatchTime() > 0 && $chunk->getSolveTime() > 0) { - $totalTimeSpent += $chunk->getSolveTime() - $chunk->getDispatchTime(); - } - $progress += $chunk->getCheckpoint() - $chunk->getSkip(); - $cracked += $chunk->getCracked(); - if ($chunk->getDispatchTime() > $maxTime) { - $maxTime = $chunk->getDispatchTime(); - } - if ($chunk->getSolveTime() > $maxTime) { - $maxTime = $chunk->getSolveTime(); - } - $speed += $chunk->getSpeed(); - } + $qF1 = new QueryFilter(Chunk::TASK_ID, $task->getId(), "="); + + $agg1 = new Aggregation(Chunk::CHECKPOINT, Aggregation::SUM); + $agg2 = new Aggregation(Chunk::SKIP, Aggregation::SUM); + $agg3 = new Aggregation(Chunk::CRACKED, Aggregation::SUM); + $agg4 = new Aggregation(Chunk::SPEED, Aggregation::SUM); + $agg5 = new Aggregation(Chunk::DISPATCH_TIME, Aggregation::MAX); + $agg6 = new Aggregation(Chunk::SOLVE_TIME, Aggregation::MAX); + $agg7 = new Aggregation(Chunk::CHUNK_ID, Aggregation::COUNT); + $agg8 = new Aggregation(Chunk::SOLVE_TIME, Aggregation::SUM); + $agg9 = new Aggregation(Chunk::DISPATCH_TIME, Aggregation::SUM); + + $results = Factory::getChunkFactory()->multicolAggregationFilter([Factory::FILTER => $qF1], [$agg1, $agg2, $agg3, $agg4, $agg5, $agg6, $agg7, $agg8, $agg9]); + + $totalTimeSpent = $results[$agg8->getName()] - $results[$agg9->getName()]; + + $progress = $results[$agg1->getName()] - $results[$agg2->getName()]; + $cracked = $results[$agg3->getName()]; + $speed = $results[$agg4->getName()]; + $maxTime = max($results[$agg5->getName()], $results[$agg6->getName()]); + $numChunks = $results[$agg7->getName()]; $isActive = false; if (time() - $maxTime < SConfig::getInstance()->getVal(DConfig::CHUNK_TIMEOUT) && ($progress < $task->getKeyspace() || $task->getUsePreprocessor() && $task->getKeyspace() == DPrince::PRINCE_KEYSPACE)) { $isActive = true; } - return array($progress, $cracked, $isActive, sizeof($chunks), ($totalTimeSpent > 0) ? round($cracked * 60 / $totalTimeSpent, 2) : 0, $speed); + return array($progress, $cracked, $isActive, $numChunks, ($totalTimeSpent > 0) ? round($cracked * 60 / $totalTimeSpent, 2) : 0, $speed); } /** @@ -438,8 +439,12 @@ public static function getFileInfo($task, $accessGroups) { */ public static function getChunkInfo($task) { $qF = new QueryFilter(Chunk::TASK_ID, $task->getId(), "="); - $cracked = Factory::getChunkFactory()->sumFilter([Factory::FILTER => $qF], Chunk::CRACKED); - $numChunks = Factory::getChunkFactory()->countFilter([Factory::FILTER => $qF]); + $agg1 = new Aggregation(Chunk::CRACKED, "SUM"); + $agg2 = new Aggregation(Chunk::CHUNK_ID, "COUNT"); + $results = Factory::getChunkFactory()->multicolAggregationFilter([Factory::FILTER => $qF], [$agg1, $agg2]); + + $cracked = $results[$agg1->getName()]; + $numChunks = $results[$agg2->getName()]; $qF = new QueryFilter(Assignment::TASK_ID, $task->getId(), "="); $numAssignments = Factory::getAssignmentFactory()->countFilter([Factory::FILTER => $qF]); diff --git a/src/inc/api/APIGetChunk.class.php b/src/inc/api/APIGetChunk.class.php index 79af89730..5da386640 100644 --- a/src/inc/api/APIGetChunk.class.php +++ b/src/inc/api/APIGetChunk.class.php @@ -66,8 +66,10 @@ public function execute($QUERY = array()) { DServerLog::log(DServerLog::TRACE, "Agent is inactive!", [$this->agent]); $this->sendErrorResponse(PActions::GET_CHUNK, "Agent is inactive!"); } + + $LOCKFILE = LOCK::CHUNKING.$task->getId(); - LockUtils::get(Lock::CHUNKING); + LockUtils::get($LOCKFILE); DServerLog::log(DServerLog::TRACE, "Retrieved lock for chunking!", [$this->agent]); $task = Factory::getTaskFactory()->get($task->getId()); Factory::getAgentFactory()->getDB()->beginTransaction(); @@ -76,7 +78,7 @@ public function execute($QUERY = array()) { if ($task == null) { // agent needs a new task DServerLog::log(DServerLog::DEBUG, "Task is fully dispatched", [$this->agent]); Factory::getAgentFactory()->getDB()->commit(); - LockUtils::release(Lock::CHUNKING); + LockUtils::release($LOCKFILE); DServerLog::log(DServerLog::TRACE, "Released lock for chunking!", [$this->agent]); $this->sendResponse(array( PResponseGetChunk::ACTION => PActions::GET_CHUNK, @@ -93,14 +95,14 @@ public function execute($QUERY = array()) { // this is a special case where this task is either not allowed anymore, or it has priority 0 so it doesn't get auto assigned if (!AccessUtils::agentCanAccessTask($this->agent, $task)) { Factory::getAgentFactory()->getDB()->commit(); - LockUtils::release(Lock::CHUNKING); + LockUtils::release($LOCKFILE); DServerLog::log(DServerLog::INFO, "Not allowed to work on requested task", [$this->agent, $task]); DServerLog::log(DServerLog::TRACE, "Released lock for chunking!", [$this->agent]); $this->sendErrorResponse(PActions::GET_CHUNK, "Not allowed to work on this task!"); } if (TaskUtils::isSaturatedByOtherAgents($task, $this->agent)) { Factory::getAgentFactory()->getDB()->commit(); - LockUtils::release(Lock::CHUNKING); + LockUtils::release($LOCKFILE); DServerLog::log(DServerLog::TRACE, "Released lock for chunking!", [$this->agent]); $this->sendErrorResponse(PActions::GET_CHUNK, "Task already saturated by other agents, no other task available!"); } @@ -108,7 +110,7 @@ public function execute($QUERY = array()) { if (TaskUtils::isSaturatedByOtherAgents($task, $this->agent)) { Factory::getAgentFactory()->getDB()->commit(); - LockUtils::release(Lock::CHUNKING); + LockUtils::release($LOCKFILE); DServerLog::log(DServerLog::TRACE, "Released lock for chunking!", [$this->agent]); $this->sendErrorResponse(PActions::GET_CHUNK, "Task already saturated by other agents, other tasks available!"); } @@ -119,7 +121,7 @@ public function execute($QUERY = array()) { if ($bestTask->getId() != $task->getId()) { Factory::getAgentFactory()->getDB()->commit(); DServerLog::log(DServerLog::INFO, "Task with higher priority available!", [$this->agent]); - LockUtils::release(Lock::CHUNKING); + LockUtils::release($LOCKFILE); DServerLog::log(DServerLog::TRACE, "Released lock for chunking!", [$this->agent]); $this->sendErrorResponse(PActions::GET_CHUNK, "Task with higher priority available!"); } @@ -150,7 +152,7 @@ public function execute($QUERY = array()) { if ($chunk == null) { DServerLog::log(DServerLog::DEBUG, "Could not create a chunk, task is fully dispatched", [$this->agent, $task]); Factory::getAgentFactory()->getDB()->commit(); - LockUtils::release(Lock::CHUNKING); + LockUtils::release($LOCKFILE); DServerLog::log(DServerLog::TRACE, "Released lock for chunking!", [$this->agent]); $this->sendResponse(array( PResponseGetChunk::ACTION => PActions::GET_CHUNK, @@ -171,7 +173,7 @@ protected function sendChunk($chunk) { return; // this can be safely done before the commit/release, because the only sendChunk which comes really at the end check for null before, so a lock which is not released cannot happen } Factory::getAgentFactory()->getDB()->commit(); - LockUtils::release(Lock::CHUNKING); + LockUtils::release(Lock::CHUNKING.$chunk->getTaskId()); DServerLog::log(DServerLog::TRACE, "Released lock for chunking!", [$this->agent]); $this->sendResponse(array( PResponseGetChunk::ACTION => PActions::GET_CHUNK, diff --git a/src/inc/utils/TaskUtils.class.php b/src/inc/utils/TaskUtils.class.php index b8a4850ba..5e765e15d 100644 --- a/src/inc/utils/TaskUtils.class.php +++ b/src/inc/utils/TaskUtils.class.php @@ -1152,18 +1152,20 @@ public static function checkTask($task, $agent = null) { else if ($task->getUsePreprocessor() && $task->getKeyspace() == DPrince::PRINCE_KEYSPACE) { return $task; } + + $qF1 = new QueryFilter(Chunk::TASK_ID, $task->getId(), "="); + $qF2 = new QueryFilter(Chunk::PROGRESS, 10000, ">="); + $sum = Factory::getChunkFactory()->sumFilter([Factory::FILTER => [$qF1, $qF2]], Chunk::LENGTH); + + $dispatched = $task->getSkipKeyspace() + $sum; + $completed = $task->getSkipKeyspace() + $sum; // check chunks - $qF = new QueryFilter(Chunk::TASK_ID, $task->getId(), "="); - $chunks = Factory::getChunkFactory()->filter([Factory::FILTER => $qF]); - $dispatched = $task->getSkipKeyspace(); - $completed = $task->getSkipKeyspace(); + $qF1 = new QueryFilter(Chunk::TASK_ID, $task->getId(), "="); + $qF2 = new QueryFilter(Chunk::PROGRESS, 10000, "<"); + $chunks = Factory::getChunkFactory()->filter([Factory::FILTER => [$qF1, $qF2]]); foreach ($chunks as $chunk) { - if ($chunk->getProgress() >= 10000) { - $dispatched += $chunk->getLength(); - $completed += $chunk->getLength(); - } - else if ($chunk->getAgentId() == null) { + if ($chunk->getAgentId() == null) { return $task; // at least one chunk is not assigned } else if (time() - max($chunk->getSolveTime(), $chunk->getDispatchTime()) > SConfig::getInstance()->getVal(DConfig::AGENT_TIMEOUT)) { From c3cf92b7ad1df64ad7a0311f0af119c43cab0b02 Mon Sep 17 00:00:00 2001 From: jessevz Date: Thu, 28 Nov 2024 12:35:57 +0100 Subject: [PATCH 004/691] Bug fixes in master into dev (#1137) * FIXED error for unsupported php 8.4 in xdebug (#1134) * FIXED error for unsuported php 8.4 version by upgrading xdebug to version 3.4.0beta1 * temporarily fix by disabling php 8.4 deprecation warnings in apiv2 * Fixed preprocessor skip command bug. (#1126) * Fixed preprocessor skip command bug. * Added changelog entry. * Updated changelog entry version. * Use utf8mb4 as default encoding (#1127) * Use utf8mb4. * Added comment, added changelog entry. --------- Co-authored-by: jessevz --------- Co-authored-by: gochujang-c <105731402+gochujang-c@users.noreply.github.com> --- Dockerfile | 2 +- doc/changelog.md | 12 ++++++++++++ src/api/v2/index.php | 2 +- src/dba/AbstractModelFactory.class.php | 4 +++- src/inc/utils/PreprocessorUtils.class.php | 2 +- 5 files changed, 18 insertions(+), 4 deletions(-) diff --git a/Dockerfile b/Dockerfile index bcea9c17c..6828f40b3 100644 --- a/Dockerfile +++ b/Dockerfile @@ -93,7 +93,7 @@ ENTRYPOINT [ "docker-entrypoint.sh" ] FROM hashtopolis-server-base as hashtopolis-server-dev # Setting up development requirements, install xdebug -RUN yes | pecl install xdebug && docker-php-ext-enable xdebug \ +RUN yes | pecl install xdebug-3.4.0beta1 && docker-php-ext-enable xdebug \ && echo "zend_extension=$(find /usr/local/lib/php/extensions/ -name xdebug.so)" > /usr/local/etc/php/conf.d/xdebug.ini \ && echo "xdebug.mode = debug" >> /usr/local/etc/php/conf.d/xdebug.ini \ && echo "xdebug.start_with_request = yes" >> /usr/local/etc/php/conf.d/xdebug.ini \ diff --git a/doc/changelog.md b/doc/changelog.md index ae76dbe52..182ebba60 100644 --- a/doc/changelog.md +++ b/doc/changelog.md @@ -1,3 +1,15 @@ +# v0.14.3 -> v0.14.4 + + +## Enhancements + +- Use utf8mb4 as default encoding in order to support the full unicode range + +## Bugfixes + +- Fixed a bug where creating a new preprocessor would copy the configured limit command over the configured skip command + + # v0.14.2 -> v0.14.3 ## Tech Preview New API diff --git a/src/api/v2/index.php b/src/api/v2/index.php index 21debec76..ea89c1d63 100644 --- a/src/api/v2/index.php +++ b/src/api/v2/index.php @@ -7,7 +7,7 @@ } date_default_timezone_set("UTC"); -error_reporting(E_ALL); +error_reporting(E_ALL ^ E_DEPRECATED); ini_set("display_errors", '1'); /** * Treat warnings as error, very usefull during unit testing. diff --git a/src/dba/AbstractModelFactory.class.php b/src/dba/AbstractModelFactory.class.php index 8eb63ba98..1a0612a07 100755 --- a/src/dba/AbstractModelFactory.class.php +++ b/src/dba/AbstractModelFactory.class.php @@ -890,7 +890,9 @@ public function getDB($test = false) { } else { global $CONN; - $dsn = 'mysql:dbname=' . $CONN['db'] . ";host=" . $CONN['server'] . ";port=" . $CONN['port'] . ";charset=utf8"; + // The utf8mb4 is here to force php to connect with that encoding, so you can save emoji's or other non ascii chars (specifically, unicode characters outside of the BMP) into the database. + // If you are running into issues with this line, we could make this configurable. + $dsn = 'mysql:dbname=' . $CONN['db'] . ";host=" . $CONN['server'] . ";port=" . $CONN['port'] . ";charset=utf8mb4"; $user = $CONN['user']; $password = $CONN['pass']; } diff --git a/src/inc/utils/PreprocessorUtils.class.php b/src/inc/utils/PreprocessorUtils.class.php index ed8fab317..75fda032e 100644 --- a/src/inc/utils/PreprocessorUtils.class.php +++ b/src/inc/utils/PreprocessorUtils.class.php @@ -54,7 +54,7 @@ public static function addPreprocessor($name, $binaryName, $url, $keyspaceComman $limitCommand = null; } - $preprocessor = new Preprocessor(null, $name, $url, $binaryName, $keyspaceCommand, $limitCommand, $limitCommand); + $preprocessor = new Preprocessor(null, $name, $url, $binaryName, $keyspaceCommand, $skipCommand, $limitCommand); Factory::getPreprocessorFactory()->save($preprocessor); } From bd19ec1acb17d9a2633e0c4e31115dd92fffd220 Mon Sep 17 00:00:00 2001 From: jessevz Date: Thu, 28 Nov 2024 14:25:01 +0100 Subject: [PATCH 005/691] Updated composer packages for php 8.4 support (#1138) --- composer.json | 2 +- composer.lock | 308 ++++++++++++++++++++++---------------------------- 2 files changed, 134 insertions(+), 176 deletions(-) diff --git a/composer.json b/composer.json index 31dbf3031..a94940c31 100644 --- a/composer.json +++ b/composer.json @@ -24,7 +24,7 @@ "middlewares/encoder": "^2.1", "middlewares/negotiation": "^2.1", "monolog/monolog": "^2.8", - "php-di/php-di": "^6.4", + "php-di/php-di": "7.0.7", "slim/psr7": "^1.5", "slim/slim": "^4.10", "tuupola/slim-basic-auth": "^3.3", diff --git a/composer.lock b/composer.lock index eb6982d8c..3bbc94cea 100644 --- a/composer.lock +++ b/composer.lock @@ -4,27 +4,27 @@ "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies", "This file is @generated automatically" ], - "content-hash": "2a07cc9c28bff6ab34aa2b4db3e30a69", + "content-hash": "6a357741d92415a1fe0b0b8344e3c53c", "packages": [ { "name": "crell/api-problem", - "version": "3.6.1", + "version": "3.7.0", "source": { "type": "git", "url": "https://github.com/Crell/ApiProblem.git", - "reference": "5acb0a8cc13ea740f631a60e5e73271c18e45803" + "reference": "b41d66dc1d403b2d406699e2e05bb2b48efe3b7f" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/Crell/ApiProblem/zipball/5acb0a8cc13ea740f631a60e5e73271c18e45803", - "reference": "5acb0a8cc13ea740f631a60e5e73271c18e45803", + "url": "https://api.github.com/repos/Crell/ApiProblem/zipball/b41d66dc1d403b2d406699e2e05bb2b48efe3b7f", + "reference": "b41d66dc1d403b2d406699e2e05bb2b48efe3b7f", "shasum": "" }, "require": { - "php": "^7.1 || ^8.0" + "php": "^7.4 || ^8.0" }, "require-dev": { - "laminas/laminas-diactoros": "^2.0", + "nyholm/psr7": "^1.8", "phpstan/phpstan": "^1.3", "phpunit/phpunit": "^7.0 || ^8.0 || ^9.0", "psr/http-factory": "^1.0", @@ -67,7 +67,7 @@ ], "support": { "issues": "https://github.com/Crell/ApiProblem/issues", - "source": "https://github.com/Crell/ApiProblem/tree/3.6.1" + "source": "https://github.com/Crell/ApiProblem/tree/3.7.0" }, "funding": [ { @@ -75,7 +75,7 @@ "type": "github" } ], - "time": "2022-01-04T15:47:30+00:00" + "time": "2024-09-30T22:47:27+00:00" }, { "name": "fig/http-message-util", @@ -192,16 +192,16 @@ }, { "name": "laravel/serializable-closure", - "version": "v1.3.4", + "version": "v1.3.7", "source": { "type": "git", "url": "https://github.com/laravel/serializable-closure.git", - "reference": "61b87392d986dc49ad5ef64e75b1ff5fee24ef81" + "reference": "4f48ade902b94323ca3be7646db16209ec76be3d" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/laravel/serializable-closure/zipball/61b87392d986dc49ad5ef64e75b1ff5fee24ef81", - "reference": "61b87392d986dc49ad5ef64e75b1ff5fee24ef81", + "url": "https://api.github.com/repos/laravel/serializable-closure/zipball/4f48ade902b94323ca3be7646db16209ec76be3d", + "reference": "4f48ade902b94323ca3be7646db16209ec76be3d", "shasum": "" }, "require": { @@ -249,7 +249,7 @@ "issues": "https://github.com/laravel/serializable-closure/issues", "source": "https://github.com/laravel/serializable-closure" }, - "time": "2024-08-02T07:48:17+00:00" + "time": "2024-11-14T18:34:49+00:00" }, { "name": "middlewares/encoder", @@ -428,16 +428,16 @@ }, { "name": "monolog/monolog", - "version": "2.9.3", + "version": "2.10.0", "source": { "type": "git", "url": "https://github.com/Seldaek/monolog.git", - "reference": "a30bfe2e142720dfa990d0a7e573997f5d884215" + "reference": "5cf826f2991858b54d5c3809bee745560a1042a7" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/Seldaek/monolog/zipball/a30bfe2e142720dfa990d0a7e573997f5d884215", - "reference": "a30bfe2e142720dfa990d0a7e573997f5d884215", + "url": "https://api.github.com/repos/Seldaek/monolog/zipball/5cf826f2991858b54d5c3809bee745560a1042a7", + "reference": "5cf826f2991858b54d5c3809bee745560a1042a7", "shasum": "" }, "require": { @@ -514,7 +514,7 @@ ], "support": { "issues": "https://github.com/Seldaek/monolog/issues", - "source": "https://github.com/Seldaek/monolog/tree/2.9.3" + "source": "https://github.com/Seldaek/monolog/tree/2.10.0" }, "funding": [ { @@ -526,7 +526,7 @@ "type": "tidelift" } ], - "time": "2024-04-12T20:52:51+00:00" + "time": "2024-11-12T12:43:37+00:00" }, { "name": "nikic/fast-route", @@ -635,39 +635,36 @@ }, { "name": "php-di/php-di", - "version": "6.4.0", + "version": "7.0.7", "source": { "type": "git", "url": "https://github.com/PHP-DI/PHP-DI.git", - "reference": "ae0f1b3b03d8b29dff81747063cbfd6276246cc4" + "reference": "e87435e3c0e8f22977adc5af0d5cdcc467e15cf1" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/PHP-DI/PHP-DI/zipball/ae0f1b3b03d8b29dff81747063cbfd6276246cc4", - "reference": "ae0f1b3b03d8b29dff81747063cbfd6276246cc4", + "url": "https://api.github.com/repos/PHP-DI/PHP-DI/zipball/e87435e3c0e8f22977adc5af0d5cdcc467e15cf1", + "reference": "e87435e3c0e8f22977adc5af0d5cdcc467e15cf1", "shasum": "" }, "require": { "laravel/serializable-closure": "^1.0", - "php": ">=7.4.0", + "php": ">=8.0", "php-di/invoker": "^2.0", - "php-di/phpdoc-reader": "^2.0.1", - "psr/container": "^1.0" + "psr/container": "^1.1 || ^2.0" }, "provide": { "psr/container-implementation": "^1.0" }, "require-dev": { - "doctrine/annotations": "~1.10", - "friendsofphp/php-cs-fixer": "^2.4", - "mnapoli/phpunit-easymock": "^1.2", - "ocramius/proxy-manager": "^2.11.2", - "phpstan/phpstan": "^0.12", - "phpunit/phpunit": "^9.5" + "friendsofphp/php-cs-fixer": "^3", + "friendsofphp/proxy-manager-lts": "^1", + "mnapoli/phpunit-easymock": "^1.3", + "phpunit/phpunit": "^9.5", + "vimeo/psalm": "^4.6" }, "suggest": { - "doctrine/annotations": "Install it if you want to use annotations (version ~1.2)", - "ocramius/proxy-manager": "Install it if you want to use lazy injection (version ~2.0)" + "friendsofphp/proxy-manager-lts": "Install it if you want to use lazy injection (version ^1)" }, "type": "library", "autoload": { @@ -695,7 +692,7 @@ ], "support": { "issues": "https://github.com/PHP-DI/PHP-DI/issues", - "source": "https://github.com/PHP-DI/PHP-DI/tree/6.4.0" + "source": "https://github.com/PHP-DI/PHP-DI/tree/7.0.7" }, "funding": [ { @@ -707,68 +704,31 @@ "type": "tidelift" } ], - "time": "2022-04-09T16:46:38+00:00" - }, - { - "name": "php-di/phpdoc-reader", - "version": "2.2.1", - "source": { - "type": "git", - "url": "https://github.com/PHP-DI/PhpDocReader.git", - "reference": "66daff34cbd2627740ffec9469ffbac9f8c8185c" - }, - "dist": { - "type": "zip", - "url": "https://api.github.com/repos/PHP-DI/PhpDocReader/zipball/66daff34cbd2627740ffec9469ffbac9f8c8185c", - "reference": "66daff34cbd2627740ffec9469ffbac9f8c8185c", - "shasum": "" - }, - "require": { - "php": ">=7.2.0" - }, - "require-dev": { - "mnapoli/hard-mode": "~0.3.0", - "phpunit/phpunit": "^8.5|^9.0" - }, - "type": "library", - "autoload": { - "psr-4": { - "PhpDocReader\\": "src/PhpDocReader" - } - }, - "notification-url": "https://packagist.org/downloads/", - "license": [ - "MIT" - ], - "description": "PhpDocReader parses @var and @param values in PHP docblocks (supports namespaced class names with the same resolution rules as PHP)", - "keywords": [ - "phpdoc", - "reflection" - ], - "support": { - "issues": "https://github.com/PHP-DI/PhpDocReader/issues", - "source": "https://github.com/PHP-DI/PhpDocReader/tree/2.2.1" - }, - "time": "2020-10-12T12:39:22+00:00" + "time": "2024-07-21T15:55:45+00:00" }, { "name": "psr/container", - "version": "1.1.2", + "version": "2.0.2", "source": { "type": "git", "url": "https://github.com/php-fig/container.git", - "reference": "513e0666f7216c7459170d56df27dfcefe1689ea" + "reference": "c71ecc56dfe541dbd90c5360474fbc405f8d5963" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/php-fig/container/zipball/513e0666f7216c7459170d56df27dfcefe1689ea", - "reference": "513e0666f7216c7459170d56df27dfcefe1689ea", + "url": "https://api.github.com/repos/php-fig/container/zipball/c71ecc56dfe541dbd90c5360474fbc405f8d5963", + "reference": "c71ecc56dfe541dbd90c5360474fbc405f8d5963", "shasum": "" }, "require": { "php": ">=7.4.0" }, "type": "library", + "extra": { + "branch-alias": { + "dev-master": "2.0.x-dev" + } + }, "autoload": { "psr-4": { "Psr\\Container\\": "src/" @@ -795,9 +755,9 @@ ], "support": { "issues": "https://github.com/php-fig/container/issues", - "source": "https://github.com/php-fig/container/tree/1.1.2" + "source": "https://github.com/php-fig/container/tree/2.0.2" }, - "time": "2021-11-05T16:50:12+00:00" + "time": "2021-11-05T16:47:00+00:00" }, { "name": "psr/http-factory", @@ -1523,33 +1483,33 @@ }, { "name": "tuupola/slim-basic-auth", - "version": "3.3.1", + "version": "3.4.0", "source": { "type": "git", "url": "https://github.com/tuupola/slim-basic-auth.git", - "reference": "18e49c18f5648b05bb6169d166ccb6f797f0fbc4" + "reference": "4f3061cd1632a28aa7342495011b3467fe0fe1d1" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/tuupola/slim-basic-auth/zipball/18e49c18f5648b05bb6169d166ccb6f797f0fbc4", - "reference": "18e49c18f5648b05bb6169d166ccb6f797f0fbc4", + "url": "https://api.github.com/repos/tuupola/slim-basic-auth/zipball/4f3061cd1632a28aa7342495011b3467fe0fe1d1", + "reference": "4f3061cd1632a28aa7342495011b3467fe0fe1d1", "shasum": "" }, "require": { - "php": "^7.1|^8.0", - "psr/http-message": "^1.0.1", + "php": "^7.2|^8.0", + "psr/http-message": "^1.0.1|^2.0", "psr/http-server-middleware": "^1.0", "tuupola/callable-handler": "^0.3.0|^0.4.0|^1.0", "tuupola/http-factory": "^0.4.0|^1.0.2" }, "require-dev": { "equip/dispatch": "^2.0", - "overtrue/phplint": "^2.0.2", - "phpstan/phpstan": "^0.12.43", - "phpunit/phpunit": "^7.0|^8.0|^9.0", - "squizlabs/php_codesniffer": "^3.3.2", - "symfony/process": "^3.3", - "zendframework/zend-diactoros": "^1.3|^2.0" + "laminas/laminas-diactoros": "^1.3|^2.0|^3.0", + "overtrue/phplint": "^3.0|^4.0|^5.0|^6.0", + "phpstan/phpstan": "^1.11", + "phpunit/phpunit": "^8.5.30|^9.0", + "rector/rector": "^0.14.5", + "symplify/easy-coding-standard": "^11.1" }, "type": "library", "autoload": { @@ -1578,15 +1538,9 @@ ], "support": { "issues": "https://github.com/tuupola/slim-basic-auth/issues", - "source": "https://github.com/tuupola/slim-basic-auth/tree/3.3.1" + "source": "https://github.com/tuupola/slim-basic-auth/tree/3.4.0" }, - "funding": [ - { - "url": "https://github.com/tuupola", - "type": "github" - } - ], - "time": "2020-10-28T15:22:12+00:00" + "time": "2024-10-01T09:13:06+00:00" }, { "name": "tuupola/slim-jwt-auth", @@ -1895,16 +1849,16 @@ }, { "name": "myclabs/deep-copy", - "version": "1.12.0", + "version": "1.12.1", "source": { "type": "git", "url": "https://github.com/myclabs/DeepCopy.git", - "reference": "3a6b9a42cd8f8771bd4295d13e1423fa7f3d942c" + "reference": "123267b2c49fbf30d78a7b2d333f6be754b94845" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/myclabs/DeepCopy/zipball/3a6b9a42cd8f8771bd4295d13e1423fa7f3d942c", - "reference": "3a6b9a42cd8f8771bd4295d13e1423fa7f3d942c", + "url": "https://api.github.com/repos/myclabs/DeepCopy/zipball/123267b2c49fbf30d78a7b2d333f6be754b94845", + "reference": "123267b2c49fbf30d78a7b2d333f6be754b94845", "shasum": "" }, "require": { @@ -1943,7 +1897,7 @@ ], "support": { "issues": "https://github.com/myclabs/DeepCopy/issues", - "source": "https://github.com/myclabs/DeepCopy/tree/1.12.0" + "source": "https://github.com/myclabs/DeepCopy/tree/1.12.1" }, "funding": [ { @@ -1951,20 +1905,20 @@ "type": "tidelift" } ], - "time": "2024-06-12T14:39:25+00:00" + "time": "2024-11-08T17:47:46+00:00" }, { "name": "nikic/php-parser", - "version": "v5.2.0", + "version": "v5.3.1", "source": { "type": "git", "url": "https://github.com/nikic/PHP-Parser.git", - "reference": "23c79fbbfb725fb92af9bcf41065c8e9a0d49ddb" + "reference": "8eea230464783aa9671db8eea6f8c6ac5285794b" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/nikic/PHP-Parser/zipball/23c79fbbfb725fb92af9bcf41065c8e9a0d49ddb", - "reference": "23c79fbbfb725fb92af9bcf41065c8e9a0d49ddb", + "url": "https://api.github.com/repos/nikic/PHP-Parser/zipball/8eea230464783aa9671db8eea6f8c6ac5285794b", + "reference": "8eea230464783aa9671db8eea6f8c6ac5285794b", "shasum": "" }, "require": { @@ -2007,9 +1961,9 @@ ], "support": { "issues": "https://github.com/nikic/PHP-Parser/issues", - "source": "https://github.com/nikic/PHP-Parser/tree/v5.2.0" + "source": "https://github.com/nikic/PHP-Parser/tree/v5.3.1" }, - "time": "2024-09-15T16:40:33+00:00" + "time": "2024-10-08T18:51:32+00:00" }, { "name": "phar-io/manifest", @@ -2184,16 +2138,16 @@ }, { "name": "phpdocumentor/reflection-docblock", - "version": "5.4.1", + "version": "5.6.0", "source": { "type": "git", "url": "https://github.com/phpDocumentor/ReflectionDocBlock.git", - "reference": "9d07b3f7fdcf5efec5d1609cba3c19c5ea2bdc9c" + "reference": "f3558a4c23426d12bffeaab463f8a8d8b681193c" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/phpDocumentor/ReflectionDocBlock/zipball/9d07b3f7fdcf5efec5d1609cba3c19c5ea2bdc9c", - "reference": "9d07b3f7fdcf5efec5d1609cba3c19c5ea2bdc9c", + "url": "https://api.github.com/repos/phpDocumentor/ReflectionDocBlock/zipball/f3558a4c23426d12bffeaab463f8a8d8b681193c", + "reference": "f3558a4c23426d12bffeaab463f8a8d8b681193c", "shasum": "" }, "require": { @@ -2202,17 +2156,17 @@ "php": "^7.4 || ^8.0", "phpdocumentor/reflection-common": "^2.2", "phpdocumentor/type-resolver": "^1.7", - "phpstan/phpdoc-parser": "^1.7", + "phpstan/phpdoc-parser": "^1.7|^2.0", "webmozart/assert": "^1.9.1" }, "require-dev": { - "mockery/mockery": "~1.3.5", + "mockery/mockery": "~1.3.5 || ~1.6.0", "phpstan/extension-installer": "^1.1", "phpstan/phpstan": "^1.8", "phpstan/phpstan-mockery": "^1.1", "phpstan/phpstan-webmozart-assert": "^1.2", "phpunit/phpunit": "^9.5", - "vimeo/psalm": "^5.13" + "psalm/phar": "^5.26" }, "type": "library", "extra": { @@ -2242,29 +2196,29 @@ "description": "With this component, a library can provide support for annotations via DocBlocks or otherwise retrieve information that is embedded in a DocBlock.", "support": { "issues": "https://github.com/phpDocumentor/ReflectionDocBlock/issues", - "source": "https://github.com/phpDocumentor/ReflectionDocBlock/tree/5.4.1" + "source": "https://github.com/phpDocumentor/ReflectionDocBlock/tree/5.6.0" }, - "time": "2024-05-21T05:55:05+00:00" + "time": "2024-11-12T11:25:25+00:00" }, { "name": "phpdocumentor/type-resolver", - "version": "1.8.2", + "version": "1.10.0", "source": { "type": "git", "url": "https://github.com/phpDocumentor/TypeResolver.git", - "reference": "153ae662783729388a584b4361f2545e4d841e3c" + "reference": "679e3ce485b99e84c775d28e2e96fade9a7fb50a" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/phpDocumentor/TypeResolver/zipball/153ae662783729388a584b4361f2545e4d841e3c", - "reference": "153ae662783729388a584b4361f2545e4d841e3c", + "url": "https://api.github.com/repos/phpDocumentor/TypeResolver/zipball/679e3ce485b99e84c775d28e2e96fade9a7fb50a", + "reference": "679e3ce485b99e84c775d28e2e96fade9a7fb50a", "shasum": "" }, "require": { "doctrine/deprecations": "^1.0", "php": "^7.3 || ^8.0", "phpdocumentor/reflection-common": "^2.0", - "phpstan/phpdoc-parser": "^1.13" + "phpstan/phpdoc-parser": "^1.18|^2.0" }, "require-dev": { "ext-tokenizer": "*", @@ -2300,32 +2254,33 @@ "description": "A PSR-5 based resolver of Class names, Types and Structural Element Names", "support": { "issues": "https://github.com/phpDocumentor/TypeResolver/issues", - "source": "https://github.com/phpDocumentor/TypeResolver/tree/1.8.2" + "source": "https://github.com/phpDocumentor/TypeResolver/tree/1.10.0" }, - "time": "2024-02-23T11:10:43+00:00" + "time": "2024-11-09T15:12:26+00:00" }, { "name": "phpspec/prophecy", - "version": "v1.19.0", + "version": "v1.20.0", "source": { "type": "git", "url": "https://github.com/phpspec/prophecy.git", - "reference": "67a759e7d8746d501c41536ba40cd9c0a07d6a87" + "reference": "a0165c648cab6a80311c74ffc708a07bb53ecc93" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/phpspec/prophecy/zipball/67a759e7d8746d501c41536ba40cd9c0a07d6a87", - "reference": "67a759e7d8746d501c41536ba40cd9c0a07d6a87", + "url": "https://api.github.com/repos/phpspec/prophecy/zipball/a0165c648cab6a80311c74ffc708a07bb53ecc93", + "reference": "a0165c648cab6a80311c74ffc708a07bb53ecc93", "shasum": "" }, "require": { "doctrine/instantiator": "^1.2 || ^2.0", - "php": "^7.2 || 8.0.* || 8.1.* || 8.2.* || 8.3.*", + "php": "^7.2 || 8.0.* || 8.1.* || 8.2.* || 8.3.* || 8.4.*", "phpdocumentor/reflection-docblock": "^5.2", "sebastian/comparator": "^3.0 || ^4.0 || ^5.0 || ^6.0", "sebastian/recursion-context": "^3.0 || ^4.0 || ^5.0 || ^6.0" }, "require-dev": { + "friendsofphp/php-cs-fixer": "^3.40", "phpspec/phpspec": "^6.0 || ^7.0", "phpstan/phpstan": "^1.9", "phpunit/phpunit": "^8.0 || ^9.0 || ^10.0" @@ -2369,22 +2324,22 @@ ], "support": { "issues": "https://github.com/phpspec/prophecy/issues", - "source": "https://github.com/phpspec/prophecy/tree/v1.19.0" + "source": "https://github.com/phpspec/prophecy/tree/v1.20.0" }, - "time": "2024-02-29T11:52:51+00:00" + "time": "2024-11-19T13:12:41+00:00" }, { "name": "phpspec/prophecy-phpunit", - "version": "v2.2.0", + "version": "v2.3.0", "source": { "type": "git", "url": "https://github.com/phpspec/prophecy-phpunit.git", - "reference": "16e1247e139434bce0bac09848bc5c8d882940fc" + "reference": "8819516c1b489ecee4c60db5f5432fac1ea8ac6f" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/phpspec/prophecy-phpunit/zipball/16e1247e139434bce0bac09848bc5c8d882940fc", - "reference": "16e1247e139434bce0bac09848bc5c8d882940fc", + "url": "https://api.github.com/repos/phpspec/prophecy-phpunit/zipball/8819516c1b489ecee4c60db5f5432fac1ea8ac6f", + "reference": "8819516c1b489ecee4c60db5f5432fac1ea8ac6f", "shasum": "" }, "require": { @@ -2392,6 +2347,9 @@ "phpspec/prophecy": "^1.18", "phpunit/phpunit": "^9.1 || ^10.1 || ^11.0" }, + "require-dev": { + "phpstan/phpstan": "^1.10" + }, "type": "library", "extra": { "branch-alias": { @@ -2421,9 +2379,9 @@ ], "support": { "issues": "https://github.com/phpspec/prophecy-phpunit/issues", - "source": "https://github.com/phpspec/prophecy-phpunit/tree/v2.2.0" + "source": "https://github.com/phpspec/prophecy-phpunit/tree/v2.3.0" }, - "time": "2024-03-01T08:33:58+00:00" + "time": "2024-11-19T13:24:17+00:00" }, { "name": "phpstan/extension-installer", @@ -2475,30 +2433,30 @@ }, { "name": "phpstan/phpdoc-parser", - "version": "1.30.1", + "version": "2.0.0", "source": { "type": "git", "url": "https://github.com/phpstan/phpdoc-parser.git", - "reference": "51b95ec8670af41009e2b2b56873bad96682413e" + "reference": "c00d78fb6b29658347f9d37ebe104bffadf36299" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/phpstan/phpdoc-parser/zipball/51b95ec8670af41009e2b2b56873bad96682413e", - "reference": "51b95ec8670af41009e2b2b56873bad96682413e", + "url": "https://api.github.com/repos/phpstan/phpdoc-parser/zipball/c00d78fb6b29658347f9d37ebe104bffadf36299", + "reference": "c00d78fb6b29658347f9d37ebe104bffadf36299", "shasum": "" }, "require": { - "php": "^7.2 || ^8.0" + "php": "^7.4 || ^8.0" }, "require-dev": { "doctrine/annotations": "^2.0", - "nikic/php-parser": "^4.15", + "nikic/php-parser": "^5.3.0", "php-parallel-lint/php-parallel-lint": "^1.2", "phpstan/extension-installer": "^1.0", - "phpstan/phpstan": "^1.5", - "phpstan/phpstan-phpunit": "^1.1", - "phpstan/phpstan-strict-rules": "^1.0", - "phpunit/phpunit": "^9.5", + "phpstan/phpstan": "^2.0", + "phpstan/phpstan-phpunit": "^2.0", + "phpstan/phpstan-strict-rules": "^2.0", + "phpunit/phpunit": "^9.6", "symfony/process": "^5.2" }, "type": "library", @@ -2516,22 +2474,22 @@ "description": "PHPDoc parser with support for nullable, intersection and generic types", "support": { "issues": "https://github.com/phpstan/phpdoc-parser/issues", - "source": "https://github.com/phpstan/phpdoc-parser/tree/1.30.1" + "source": "https://github.com/phpstan/phpdoc-parser/tree/2.0.0" }, - "time": "2024-09-07T20:13:05+00:00" + "time": "2024-10-13T11:29:49+00:00" }, { "name": "phpstan/phpstan", - "version": "1.12.3", + "version": "1.12.11", "source": { "type": "git", "url": "https://github.com/phpstan/phpstan.git", - "reference": "0fcbf194ab63d8159bb70d9aa3e1350051632009" + "reference": "0d1fc20a962a91be578bcfe7cf939e6e1a2ff733" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/phpstan/phpstan/zipball/0fcbf194ab63d8159bb70d9aa3e1350051632009", - "reference": "0fcbf194ab63d8159bb70d9aa3e1350051632009", + "url": "https://api.github.com/repos/phpstan/phpstan/zipball/0d1fc20a962a91be578bcfe7cf939e6e1a2ff733", + "reference": "0d1fc20a962a91be578bcfe7cf939e6e1a2ff733", "shasum": "" }, "require": { @@ -2576,7 +2534,7 @@ "type": "github" } ], - "time": "2024-09-09T08:10:35+00:00" + "time": "2024-11-17T14:08:01+00:00" }, { "name": "phpunit/php-code-coverage", @@ -2899,16 +2857,16 @@ }, { "name": "phpunit/phpunit", - "version": "9.6.20", + "version": "9.6.21", "source": { "type": "git", "url": "https://github.com/sebastianbergmann/phpunit.git", - "reference": "49d7820565836236411f5dc002d16dd689cde42f" + "reference": "de6abf3b6f8dd955fac3caad3af7a9504e8c2ffa" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/sebastianbergmann/phpunit/zipball/49d7820565836236411f5dc002d16dd689cde42f", - "reference": "49d7820565836236411f5dc002d16dd689cde42f", + "url": "https://api.github.com/repos/sebastianbergmann/phpunit/zipball/de6abf3b6f8dd955fac3caad3af7a9504e8c2ffa", + "reference": "de6abf3b6f8dd955fac3caad3af7a9504e8c2ffa", "shasum": "" }, "require": { @@ -2923,7 +2881,7 @@ "phar-io/manifest": "^2.0.4", "phar-io/version": "^3.2.1", "php": ">=7.3", - "phpunit/php-code-coverage": "^9.2.31", + "phpunit/php-code-coverage": "^9.2.32", "phpunit/php-file-iterator": "^3.0.6", "phpunit/php-invoker": "^3.1.1", "phpunit/php-text-template": "^2.0.4", @@ -2982,7 +2940,7 @@ "support": { "issues": "https://github.com/sebastianbergmann/phpunit/issues", "security": "https://github.com/sebastianbergmann/phpunit/security/policy", - "source": "https://github.com/sebastianbergmann/phpunit/tree/9.6.20" + "source": "https://github.com/sebastianbergmann/phpunit/tree/9.6.21" }, "funding": [ { @@ -2998,7 +2956,7 @@ "type": "tidelift" } ], - "time": "2024-07-10T11:45:39+00:00" + "time": "2024-09-19T10:50:18+00:00" }, { "name": "sebastian/cli-parser", @@ -3965,16 +3923,16 @@ }, { "name": "squizlabs/php_codesniffer", - "version": "3.10.2", + "version": "3.11.1", "source": { "type": "git", "url": "https://github.com/PHPCSStandards/PHP_CodeSniffer.git", - "reference": "86e5f5dd9a840c46810ebe5ff1885581c42a3017" + "reference": "19473c30efe4f7b3cd42522d0b2e6e7f243c6f87" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/PHPCSStandards/PHP_CodeSniffer/zipball/86e5f5dd9a840c46810ebe5ff1885581c42a3017", - "reference": "86e5f5dd9a840c46810ebe5ff1885581c42a3017", + "url": "https://api.github.com/repos/PHPCSStandards/PHP_CodeSniffer/zipball/19473c30efe4f7b3cd42522d0b2e6e7f243c6f87", + "reference": "19473c30efe4f7b3cd42522d0b2e6e7f243c6f87", "shasum": "" }, "require": { @@ -4041,7 +3999,7 @@ "type": "open_collective" } ], - "time": "2024-07-21T23:26:44+00:00" + "time": "2024-11-16T12:02:36+00:00" }, { "name": "theseer/tokenizer", From bfd39df2123c24e8b547a3e6570356c52e6f5e73 Mon Sep 17 00:00:00 2001 From: jessevz Date: Thu, 5 Dec 2024 09:46:16 +0100 Subject: [PATCH 006/691] Ipv6 support in buildServerUrl() (#1076) * Adding loops to scan through lines to support importing hashes longer then 1024 bytes * Made ipv6 working in server utils --------- Co-authored-by: Romke van Dijk Co-authored-by: Sein Coray --- src/inc/Util.class.php | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/src/inc/Util.class.php b/src/inc/Util.class.php index 1a659eb03..c92f606d5 100755 --- a/src/inc/Util.class.php +++ b/src/inc/Util.class.php @@ -1153,14 +1153,13 @@ public static function buildServerUrl() { $protocol = (isset($_SERVER['HTTPS']) && (strcasecmp('off', $_SERVER['HTTPS']) !== 0)) ? "https://" : "http://"; $hostname = $_SERVER['HTTP_HOST']; $port = $_SERVER['SERVER_PORT']; - if (strpos($hostname, ":") !== false) { - $hostname = substr($hostname, 0, strpos($hostname, ":")); - } + if ($protocol == "https://" && $port == 443 || $protocol == "http://" && $port == 80) { $port = ""; } else { $port = ":$port"; + $hostname = substr($hostname, 0, strrpos($hostname, ":")); //Needs to use strrpos in case of ipv6 because of multiple ':' characters } return $protocol . $hostname . $port; } From eed46ff22fe453e897bf35c74ea270debfc28153 Mon Sep 17 00:00:00 2001 From: jessevz Date: Fri, 6 Dec 2024 08:55:09 +0100 Subject: [PATCH 007/691] Count (#1145) * FEAT added count endpoint * Fixed bug in count endpoint when no filters have been provided * Fixed helper tests * FEAT made test for count endpoint * FEAT added possibility to join in count filters * FEAT added the possibility to create complex filters in count endpoint. By adding the possibility to expand and filter on expanded objects * Removed commented out code --- ci/apiv2/hashtopolis.py | 26 ++++- ci/apiv2/test_count.py | 23 ++++ src/dba/AbstractModelFactory.class.php | 19 ++++ .../apiv2/common/AbstractBaseAPI.class.php | 48 +++++--- .../apiv2/common/AbstractModelAPI.class.php | 106 +++++++++++++++++- 5 files changed, 200 insertions(+), 22 deletions(-) create mode 100644 ci/apiv2/test_count.py diff --git a/ci/apiv2/hashtopolis.py b/ci/apiv2/hashtopolis.py index 66b7aa953..b29d4fe39 100644 --- a/ci/apiv2/hashtopolis.py +++ b/ci/apiv2/hashtopolis.py @@ -291,6 +291,19 @@ def delete(self, obj): # TODO: Cleanup object to allow re-creation + def count(self, filter): + self.authenticate() + uri = self._api_endpoint + self._model_uri + "/count" + headers = self._headers + payload = {} + if filter: + for k, v in filter.items(): + payload[f"filter[{k}]"] = v + + logger.debug("Sending GET payload: %s to %s", json.dumps(payload), uri) + r = requests.get(uri, headers=headers, params=payload) + self.validate_status_code(r, [200], "Getting count failed") + return self.resp_to_json(r)['meta'] # Build Django ORM style django.query interface class QuerySet(): @@ -434,6 +447,11 @@ def get_first(cls): @classmethod def get(cls, **filters): return QuerySet(cls, filters=filters).get() + + @classmethod + def count(cls, **filters): + return cls.get_conn().count(filter=filters) + @classmethod def paginate(cls, **pages): @@ -912,7 +930,7 @@ def import_cracked_hashes(self, hashlist, source_data, separator): 'separator': separator, } response = self._helper_request("importCrackedHashes", payload) - return response['data'] + return response['meta'] def get_file(self, file, range=None): payload = { @@ -925,14 +943,14 @@ def recount_file_lines(self, file): 'fileId': file.id, } response = self._helper_request("recountFileLines", payload) - return File(**response['data']) + return File(**response['meta']) def unassign_agent(self, agent): payload = { 'agentId': agent.id, } response = self._helper_request("unassignAgent", payload) - return response['data'] + return response['meta'] def assign_agent(self, agent, task): payload = { @@ -940,4 +958,4 @@ def assign_agent(self, agent, task): 'taskId': task.id, } response = self._helper_request("assignAgent", payload) - return response['data'] + return response['meta'] diff --git a/ci/apiv2/test_count.py b/ci/apiv2/test_count.py new file mode 100644 index 000000000..82c0312d5 --- /dev/null +++ b/ci/apiv2/test_count.py @@ -0,0 +1,23 @@ +from hashtopolis import HashType +from utils import BaseTest + + +class CountTest(BaseTest): + model_class = HashType + + def create_test_objects(self, **kwargs): + objs = [] + for i in range(90000, 90100, 10): + obj = HashType(hashTypeId=i, + description=f"Dummy HashType {i}", + isSalted=(i < 90050), + isSlowHash=False).save() + objs.append(obj) + self.delete_after_test(obj) + return objs + + def test_count(self): + model_objs = self.create_test_objects() + model_count = len(model_objs) + api_count = HashType.objects.count(hashTypeId__gte=90000, hashTypeId__lte=91000)['count'] + self.assertEqual(model_count, api_count) diff --git a/src/dba/AbstractModelFactory.class.php b/src/dba/AbstractModelFactory.class.php index 1a0612a07..b7d2bc16c 100755 --- a/src/dba/AbstractModelFactory.class.php +++ b/src/dba/AbstractModelFactory.class.php @@ -471,6 +471,10 @@ public function countFilter($options) { $query = $query . " FROM " . $this->getModelTable(); $vals = array(); + + if (array_key_exists('join', $options)) { + $query .= $this->applyJoins($options['join']); + } if (array_key_exists("filter", $options)) { $query .= $this->applyFilters($vals, $options['filter']); @@ -750,6 +754,21 @@ private function applyOrder($orders) { return " ORDER BY " . implode(", ", $orderQueries); } + private function applyJoins($joins) { + $query = ""; + foreach ($joins as $join) { + $joinFactory = $join->getOtherFactory(); + $localFactory = $this; + if ($join->getOverrideOwnFactory() != null) { + $localFactory = $join->getOverrideOwnFactory(); + } + $match1 = $join->getMatch1(); + $match2 = $join->getMatch2(); + $query .= " INNER JOIN " . $joinFactory->getModelTable() . " ON " . $localFactory->getModelTable() . "." . $match1 . "=" . $joinFactory->getModelTable() . "." . $match2 . " "; + } + return $query; + } + //applylimit is slightly different than the other apply functions, since you can only limit by a single value //the $limit argument is a single object LimitFilter object instead of an array of objects. private function applyLimit($limit) { diff --git a/src/inc/apiv2/common/AbstractBaseAPI.class.php b/src/inc/apiv2/common/AbstractBaseAPI.class.php index 1a15e1df0..87d0ccb5c 100644 --- a/src/inc/apiv2/common/AbstractBaseAPI.class.php +++ b/src/inc/apiv2/common/AbstractBaseAPI.class.php @@ -15,6 +15,7 @@ use DBA\AgentStat; use DBA\Assignment; use DBA\Chunk; +use DBA\ComparisonFilter; use DBA\Config; use DBA\ConfigSection; use DBA\CrackerBinary; @@ -875,14 +876,19 @@ protected function getPrimaryKey(): string } } + function getFilters(Request $request) { + return $this->getQueryParameterFamily($request, 'filter'); + } + /** * Check for valid filter parameters and build QueryFilter */ - protected function makeFilter(Request $request, array $features): array + // protected function makeFilter(Request $request, array $features): array + protected function makeFilter(array $filters, object $apiClass): array { - $qFs = []; - - $filters = $this->getQueryParameterFamily($request, 'filter'); + $qFs = []; + $features = $apiClass->getAliasedFeatures(); + $factory = $apiClass->getFactory(); foreach ($filters as $filter => $value) { if (preg_match('/^(?P[_a-zA-Z0-9]+?)(?|__eq|__ne|__lt|__lte|__gt|__gte|__contains|__startswith|__endswith|__icontains|__istartswith|__iendswith)$/', $filter, $matches) == 0) { @@ -919,44 +925,52 @@ protected function makeFilter(Request $request, array $features): array switch($matches['operator']) { case '': case '__eq': - array_push($qFs, new QueryFilter($remappedKey, $val, '=')); + $operator = '='; break; case '__ne': - array_push($qFs, new QueryFilter($remappedKey, $val, '!=')); + $operator = '!='; break; case '__lt': - array_push($qFs, new QueryFilter($remappedKey, $val, '<')); + $operator = '<'; break; case '__lte': - array_push($qFs, new QueryFilter($remappedKey, $val, '<=')); + $operator = '<='; break; case '__gt': - array_push($qFs, new QueryFilter($remappedKey, $val, '>')); + $operator = '>'; break; case '__gte': - array_push($qFs, new QueryFilter($remappedKey, $val, '>=')); + $operator = '>='; break; case '__contains': - array_push($qFs, new LikeFilter($remappedKey, "%" . $val . "%")); + array_push($qFs, new LikeFilter($remappedKey, "%" . $val . "%", $factory)); break; case '__startswith': - array_push($qFs, new LikeFilter($remappedKey, $val . "%")); + array_push($qFs, new LikeFilter($remappedKey, $val . "%", $factory)); break; case '__endswith': - array_push($qFs, new LikeFilter($remappedKey, "%" . $val)); + array_push($qFs, new LikeFilter($remappedKey, "%" . $val, $factory)); break; case '__icontains': - array_push($qFs, new LikeFilterInsensitive($remappedKey, "%" . $val . "%")); + array_push($qFs, new LikeFilterInsensitive($remappedKey, "%" . $val . "%", $factory)); break; case '__istartswith': - array_push($qFs, new LikeFilterInsensitive($remappedKey, $val . "%")); + array_push($qFs, new LikeFilterInsensitive($remappedKey, $val . "%", $factory)); break; case '__iendswith': - array_push($qFs, new LikeFilterInsensitive($remappedKey, "%" . $val)); + array_push($qFs, new LikeFilterInsensitive($remappedKey, "%" . $val, $factory)); break; default: assert(False, "Operator '" . $matches['operator'] . "' not implemented"); } + + if ($operator) { + if (array_key_exists($val, $features)) { + array_push($qFs, new ComparisonFilter($remappedKey, $val, $operator, $factory)); + } else { + array_push($qFs, new QueryFilter($remappedKey, $val, $operator, $factory)); + } + } } return $qFs; } @@ -1257,7 +1271,7 @@ protected static function getOneResource(object $apiClass, object $object, Reque //Meta response for helper functions that do not respond with resource records protected static function getMetaResponse(array $meta, Request $request, Response $response, int $statusCode=200) { - $ret = self::createJsonResponse($meta=$meta); + $ret = self::createJsonResponse(meta: $meta); $body = $response->getBody(); $body->write(self::ret2json($ret)); diff --git a/src/inc/apiv2/common/AbstractModelAPI.class.php b/src/inc/apiv2/common/AbstractModelAPI.class.php index 9a07c6ec9..4caea6340 100644 --- a/src/inc/apiv2/common/AbstractModelAPI.class.php +++ b/src/inc/apiv2/common/AbstractModelAPI.class.php @@ -392,7 +392,8 @@ public static function getManyResources(object $apiClass, Request $request, Resp $aFs = []; /* Generate filters */ - $qFs_Filter = $apiClass->makeFilter($request, $aliasedfeatures); + $filters = $apiClass->getFilters($request); + $qFs_Filter = $apiClass->makeFilter($filters, $apiClass); $qFs_ACL = $apiClass->getFilterACL(); $qFs = array_merge($qFs_ACL, $qFs_Filter); if (count($qFs) > 0) { @@ -559,6 +560,108 @@ public function get(Request $request, Response $response, array $args): Response return self::getManyResources($this, $request, $response); } + /** + * Maps filters to the appropiate models based on their feautures. + * + * Helper function to get valid filters for the models. This is usefull when multiple objects + * have been included and the correct filters need to be mapped to the correct objects. + * Currently used to make complex filters for counting objects + * + * @param array $filters An associative array of filters where the key is the filter + * name and the value is the filter value. Filters should match + * the pattern ``, where `` can be + * one of the supported suffixes (e.g., `__eq`, `__ne`). + * @param array $models An array of model objects. Each model must have a `getFeatures()` + * method that returns an associative array of model features. + * The features should map filter keys to their respective + * attributes or aliases. + * + * @return array An associative array mapping model classes to their respective valid filters. + * The structure is: + * [ + * ModelClassName => [ + * 'filter' => 'value', + * ... + * ], + * ... + * ] + * + * @throws HTException If a filter key does not match the expected format or is invalid. + */ + public function filterObjectMap(array $filters, array $models) { + + $modelFilterMap = []; + foreach ($filters as $filter => $value) { + if (preg_match('/^(?P[_a-zA-Z0-9]+?)(?|__eq|__ne|__lt|__lte|__gt|__gte|__contains|__startswith|__endswith|__icontains|__istartswith|__iendswith)$/', $filter, $matches) == 0) { + throw new HTException("Filter parameter '" . $filter . "' is not valid"); + } + + foreach($models as $model) { + $features = $model->getFeatures(); + // Special filtering of _id to use for uniform access to model primary key + $cast_key = $matches['key'] == '_id' ? array_column($features, 'alias', 'dbname')[$this->getPrimaryKey()] : $matches['key']; + if (array_key_exists($cast_key, $features) == false) { + continue; //not a valid filter for current model + }; + $modelFilterMap[$model::class][$filter] = $value; + break; //filter has been found for current model, so break to go to next filter + } + } + return $modelFilterMap; + } + + /** + * API entry point for retrieving count information of data + */ + public function count(Request $request, Response $response, array $args): Response + { + $this->preCommon($request); + $factory = $this->getFactory(); + + //resolve all expandables + $validExpandables = $this::getExpandables(); + $expands = $this->makeExpandables($request, $validExpandables); + + $objects = [$factory->getNullObject()]; + //build join filters + foreach ($expands as $expand) { + $relation = $this->getToManyRelationships()[$expand]; + $objects[] = $this->getModelFactory($relation["relationType"])->getNullObject(); + $otherFactory = $this->getModelFactory($relation["relationType"]); + $primaryKey = $this->getPrimaryKey(); + $aFs[Factory::JOIN][] = new JoinFilter($otherFactory, $relation["relationKey"], $primaryKey, $factory); + } + + $filters = $this->getFilters($request); + $filterObjectMap = $this->filterObjectMap($filters, $objects); + $qFs = []; + foreach($filterObjectMap as $class => $cur_filters) { + $relationApiClass = new ($this->container->get('classMapper')->get($class))($this->container); + $current_qFs = $this->makeFilter($cur_filters, $relationApiClass); + $qFs = array_merge($qFs, $current_qFs); + } + + if (count($qFs) > 0) { + $aFs[Factory::FILTER] = $qFs; + } + + $count = $factory->countFilter($aFs); + $meta = ["count" => $count]; + + $include_total = $request->getQueryParams()['include_total']; + if ($include_total == "true") { + $meta["total_count"] = $factory->countFilter([]); + } + + $ret = self::createJsonResponse(meta: $meta); + + $body = $response->getBody(); + $body->write($this->ret2json($ret)); + + return $response->withStatus(200) + ->withHeader("Content-Type", 'application/vnd.api+json'); + } + /** * Get input field names valid for creation of object */ @@ -1106,6 +1209,7 @@ static public function register($app): void if (in_array("GET", $available_methods)) { $app->get($baseUri, $me . ':get')->setname($me . ':get'); + $app->get($baseUri . "/count", $me . ':count')->setname($me . ':count'); } foreach ($me::getToOneRelationships() as $name => $relationship) { From 880d58f0cd9403333e5e31839d0e3bb44c7e141a Mon Sep 17 00:00:00 2001 From: jessevz Date: Fri, 6 Dec 2024 08:59:45 +0100 Subject: [PATCH 008/691] Changed to xdebug stable release (#1150) --- Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index 6828f40b3..bcea9c17c 100644 --- a/Dockerfile +++ b/Dockerfile @@ -93,7 +93,7 @@ ENTRYPOINT [ "docker-entrypoint.sh" ] FROM hashtopolis-server-base as hashtopolis-server-dev # Setting up development requirements, install xdebug -RUN yes | pecl install xdebug-3.4.0beta1 && docker-php-ext-enable xdebug \ +RUN yes | pecl install xdebug && docker-php-ext-enable xdebug \ && echo "zend_extension=$(find /usr/local/lib/php/extensions/ -name xdebug.so)" > /usr/local/etc/php/conf.d/xdebug.ini \ && echo "xdebug.mode = debug" >> /usr/local/etc/php/conf.d/xdebug.ini \ && echo "xdebug.start_with_request = yes" >> /usr/local/etc/php/conf.d/xdebug.ini \ From 2efe4cfe19d8d4a20dd210b700208e1cbad8ac30 Mon Sep 17 00:00:00 2001 From: jessevz Date: Tue, 7 Jan 2025 09:57:00 +0100 Subject: [PATCH 009/691] Fixed bug when no filters have been provided to count endpoint (#1165) --- src/inc/apiv2/common/AbstractModelAPI.class.php | 1 + 1 file changed, 1 insertion(+) diff --git a/src/inc/apiv2/common/AbstractModelAPI.class.php b/src/inc/apiv2/common/AbstractModelAPI.class.php index 4caea6340..e4974d37d 100644 --- a/src/inc/apiv2/common/AbstractModelAPI.class.php +++ b/src/inc/apiv2/common/AbstractModelAPI.class.php @@ -623,6 +623,7 @@ public function count(Request $request, Response $response, array $args): Respon $expands = $this->makeExpandables($request, $validExpandables); $objects = [$factory->getNullObject()]; + $aFs = []; //build join filters foreach ($expands as $expand) { $relation = $this->getToManyRelationships()[$expand]; From 73ac675e2939efe7b99ce36c2b58cccb8e699505 Mon Sep 17 00:00:00 2001 From: jessevz Date: Wed, 8 Jan 2025 10:20:55 +0100 Subject: [PATCH 010/691] 1139 enhancement cleanup lock files (#1151) * Added new format of lock files to .gitignore * FEAT remove lockfile when task is finished or deleted --- .gitignore | 2 +- src/inc/utils/LockUtils.class.php | 14 ++++++++++++++ src/inc/utils/TaskUtils.class.php | 2 ++ 3 files changed, 17 insertions(+), 1 deletion(-) diff --git a/.gitignore b/.gitignore index c73d3b49a..cdd203e14 100755 --- a/.gitignore +++ b/.gitignore @@ -11,7 +11,7 @@ src/files/* *.phpproj *.sln *.phpproj.user -*.lock +*.lock* # dynamically created by installer src/install/.htaccess diff --git a/src/inc/utils/LockUtils.class.php b/src/inc/utils/LockUtils.class.php index 422e2eb76..cae46d844 100644 --- a/src/inc/utils/LockUtils.class.php +++ b/src/inc/utils/LockUtils.class.php @@ -41,4 +41,18 @@ public static function release($lockFile) { } } } + + /** + * Deletes a lock file associated with a specific task ID if it exists. + * + * @param int $taskId The unique identifier of the task associated with the lock file. + * + * @return void + */ + public static function deleteLockFile($taskId) { + $lockFile = dirname(__FILE__) . "/locks/" . LOCK::CHUNKING . $taskId; + if(file_exists($lockFile)) { + unlink($lockFile); + } + } } \ No newline at end of file diff --git a/src/inc/utils/TaskUtils.class.php b/src/inc/utils/TaskUtils.class.php index 5e765e15d..6ba148114 100644 --- a/src/inc/utils/TaskUtils.class.php +++ b/src/inc/utils/TaskUtils.class.php @@ -1114,6 +1114,7 @@ public static function deleteTask($task) { $qF = new QueryFilter(Chunk::TASK_ID, $task->getId(), "="); Factory::getChunkFactory()->massDeletion([Factory::FILTER => $qF]); Factory::getTaskFactory()->delete($task); + LockUtils::deleteLockFile($task->getId()); } /** @@ -1188,6 +1189,7 @@ public static function checkTask($task, $agent = null) { if ($taskWrapper->getTaskType() != DTaskTypes::SUPERTASK) { Factory::getTaskWrapperFactory()->set($taskWrapper, TaskWrapper::PRIORITY, 0); } + LockUtils::deleteLockFile($task->getId()); return null; } else if ($dispatched >= $task->getKeyspace()) { From ba5c1a0ee0b755869e1304055721f7b8424e0020 Mon Sep 17 00:00:00 2001 From: jessevz Date: Wed, 8 Jan 2025 16:09:28 +0100 Subject: [PATCH 011/691] 1153 enhancement update swagger api docs (#1169) * FEAT updated openAPI schema to latest API updates * Fixed bug where openAPI scheme would show formfields in API responses * Fixed bug in creating description for endpoints * FEAT: added overidable patch to many relationship function to change logic where needed in model endpoints ex. supertasks route --- ci/apiv2/hashtopolis.py | 29 +- ci/apiv2/test_supertask.py | 2 +- doc/changelog.md | 1 + .../apiv2/common/AbstractBaseAPI.class.php | 6 +- .../apiv2/common/AbstractModelAPI.class.php | 34 +- src/inc/apiv2/common/openAPISchema.routes.php | 320 +++++++++++++++--- src/inc/apiv2/model/supertasks.routes.php | 36 +- 7 files changed, 361 insertions(+), 67 deletions(-) diff --git a/ci/apiv2/hashtopolis.py b/ci/apiv2/hashtopolis.py index b29d4fe39..03c548a5b 100644 --- a/ci/apiv2/hashtopolis.py +++ b/ci/apiv2/hashtopolis.py @@ -252,11 +252,29 @@ def patch_one(self, obj): payload = self.create_payload(obj, attributes, id=obj.id) logger.debug("Sending PATCH payload: %s to %s", json.dumps(payload), uri) r = requests.patch(uri, headers=headers, data=json.dumps(payload)) - self.validate_status_code(r, [201], "Patching failed") + self.validate_status_code(r, [200], "Patching failed") # TODO: Validate if return objects matches digital twin obj.set_initial(self.resp_to_json(r)['data'].copy()) + def send_patch(self, uri, data): + self.authenticate() + headers = self._headers + headers['Content-Type'] = 'application/json' + logger.debug("Sending PATCH payload: %s to %s", json.dumps(data), uri) + r = requests.patch(uri, headers=headers, data=json.dumps(data)) + self.validate_status_code(r, [204], "Patching failed") + + def patch_to_many_relationships(self, obj): + for k, v in obj.diff_includes().items(): + attributes = [] + logger.debug("Going to patch object '%s' property '%s' from '%s' to '%s'", obj, k, v[0], v[1]) + for include_id in v[1]: + attributes.append({"type": k, "id": include_id}) + data = {"data": attributes} + uri = self._hashtopolis_uri + obj.uri + "/relationships/" + k + self.send_patch(uri, data) + def create(self, obj): # Check if object to be created is new assert obj._new_model is True @@ -426,6 +444,8 @@ def all(cls): @classmethod def patch(cls, obj): + # TODO also patch to one relationships + cls.get_conn().patch_to_many_relationships(obj) cls.get_conn().patch_one(obj) @classmethod @@ -452,7 +472,6 @@ def get(cls, **filters): def count(cls, **filters): return cls.get_conn().count(filter=filters) - @classmethod def paginate(cls, **pages): return QuerySet(cls, pages=pages) @@ -605,6 +624,10 @@ def diff(self): if v_current != v_innitial: diffs.append((key, (v_innitial, v_current))) + return dict(diffs) + + def diff_includes(self): + diffs = [] # Find includeables sets which have changed for include in self.__included: if include.endswith('_set'): @@ -618,7 +641,7 @@ def diff(self): # Use ID of ojbects as new current/update identifiers if sorted(v_innitial_ids) != sorted(v_current_ids): diffs.append((innitial_name, (v_innitial_ids, v_current_ids))) - + return dict(diffs) def has_changed(self): diff --git a/ci/apiv2/test_supertask.py b/ci/apiv2/test_supertask.py index 2214e2a53..ac8874bea 100644 --- a/ci/apiv2/test_supertask.py +++ b/ci/apiv2/test_supertask.py @@ -31,7 +31,7 @@ def test_new_pretasks(self): # Quirk for expanding object to allow update to take place work_obj = Supertask.objects.prefetch_related('pretasks').get(pk=model_obj.id) - new_pretasks = [self.create_pretask() for i in range(2)] + new_pretasks = [self.create_pretask(file_id="003") for i in range(2)] selected_pretasks = [work_obj.pretasks_set[0], new_pretasks[1]] work_obj.pretasks_set = selected_pretasks work_obj.save() diff --git a/doc/changelog.md b/doc/changelog.md index 182ebba60..54b5d5382 100644 --- a/doc/changelog.md +++ b/doc/changelog.md @@ -4,6 +4,7 @@ ## Enhancements - Use utf8mb4 as default encoding in order to support the full unicode range +- Updated OpenAPI docs to latest API updates ## Bugfixes diff --git a/src/inc/apiv2/common/AbstractBaseAPI.class.php b/src/inc/apiv2/common/AbstractBaseAPI.class.php index 87d0ccb5c..7c355b438 100644 --- a/src/inc/apiv2/common/AbstractBaseAPI.class.php +++ b/src/inc/apiv2/common/AbstractBaseAPI.class.php @@ -112,7 +112,7 @@ protected function getFeatures(): array $features = []; foreach($this->getFormFields() as $key => $feature) { /* Innitate default values */ - $features[$key] = $feature + ['null' => False, 'protected' => False, 'private' => False, 'choices' => "unset", 'pk' => False]; + $features[$key] = $feature + ['null' => False, 'protected' => False, 'private' => False, 'choices' => "unset", 'pk' => False, 'read_only' => True]; if (!array_key_exists('alias', $feature)) { $features[$key]['alias'] = $key; } @@ -128,6 +128,10 @@ protected function getFeatures(): array public function getAliasedFeatures(): array { $features = $this->getFeatures(); + return $this->mapFeatures($features); + } + + final protected function mapFeatures($features) { $mappedFeatures = []; foreach ($features as $key => $value) { $mappedFeatures[$value['alias']] = $value; diff --git a/src/inc/apiv2/common/AbstractModelAPI.class.php b/src/inc/apiv2/common/AbstractModelAPI.class.php index e4974d37d..ffd117b84 100644 --- a/src/inc/apiv2/common/AbstractModelAPI.class.php +++ b/src/inc/apiv2/common/AbstractModelAPI.class.php @@ -110,6 +110,15 @@ final protected function getFeatures(): array ); } + /** + * Seperate get features function to get features without the formfields. This is needed to generate the openAPI documentation + * TODO: This function could probably be used in the patch endpoints aswell, since formfields are not relevant there. + */ + public function getFeaturesWithoutFormfields(): array { + $features = call_user_func($this->getDBAclass() . '::getFeatures'); + return $this->mapFeatures($features); + } + /** * Get features based on DBA model features * @@ -343,7 +352,7 @@ protected function getFilterACL(): array /** * Helper function to determine if $resourceRecord is a valid resource record - * returns true if it is a valid resource record and false if it is an invallid resource record + * returns true if it is a valid resource record and false if it is an invalid resource record */ final protected function validateResourceRecord(mixed $resourceRecord): bool { @@ -356,7 +365,7 @@ final protected function ResourceRecordArrayToUpdateArray($data, $parentId) foreach ($data as $item) { if (!$this->validateResourceRecord($item)) { $encoded_item = json_encode($item); - throw new HttpErrorException('Invallid resource record given in list! invalid resource record: ' . $encoded_item); + throw new HttpErrorException('Invalid resource record given in list! invalid resource record: ' . $encoded_item); } $updates[] = new MassUpdateSet($item["id"], $parentId); } @@ -380,7 +389,7 @@ public static function getManyResources(object $apiClass, Request $request, Resp $pageAfter = $apiClass->getQueryParameterFamilyMember($request, 'page', 'after') ?? 0; $pageSize = $apiClass->getQueryParameterFamilyMember($request, 'page', 'size') ?? $defaultPageSize; if ($pageSize < 0) { - throw new HttpErrorException("Invallid parameter, page[size] must be a positive integer", 400); + throw new HttpErrorException("Invalid parameter, page[size] must be a positive integer", 400); } elseif ($pageSize > $maxPageSize) { throw new HttpErrorException(sprintf("You requested a size of %d, but %d is the maximum.", $pageSize, $maxPageSize), 400); } @@ -714,7 +723,7 @@ public function patchOne(Request $request, Response $response, array $args): Res // Return updated object $newObject = $this->getFactory()->get($object->getId()); - return self::getOneResource($this, $newObject, $request, $response, 201); + return self::getOneResource($this, $newObject, $request, $response, 200); } @@ -1003,8 +1012,18 @@ public function patchToManyRelationshipLink(Request $request, Response $response if ($jsonBody === null || !array_key_exists('data', $jsonBody) || !is_array($jsonBody['data'])) { throw new HttpErrorException('No data was sent! Send the json data in the following format: {"data":[{"type": "foo", "id": 1}}]'); } + $data = $jsonBody['data']; + $this->updateToManyRelationship($request, $data, $args); + return $response->withStatus(204) + ->withHeader("Content-Type", "application/vnd.api+json"); + } + + /** + * Overidable function to update the to many relationship + */ + protected function updateToManyRelationship(Request $request, array $data, array $args): void { $relation = $this->getToManyRelationships()[$args['relation']]; $primaryKey = $this->getPrimaryKeyOther($relation['relationType']); $relationKey = $relation['relationKey']; @@ -1030,7 +1049,7 @@ public function patchToManyRelationshipLink(Request $request, Response $response foreach ($data as $item) { if (!$this->validateResourceRecord($item)) { $encoded_item = json_encode($item); - throw new HttpErrorException('Invallid resource record given in list! invalid resource record: ' . $encoded_item); + throw new HttpErrorException('Invalid resource record given in list! invalid resource record: ' . $encoded_item); } $updates[] = new MassUpdateSet($item["id"], $args["id"]); unset($modelsDict[$item["id"]]); @@ -1050,9 +1069,6 @@ public function patchToManyRelationshipLink(Request $request, Response $response if (!$factory->getDB()->commit()) { throw new HttpErrorException("Was not able to update to many relationship"); } - - return $response->withStatus(204) - ->withHeader("Content-Type", "application/vnd.api+json"); } /** @@ -1158,7 +1174,7 @@ protected function updateObject(object $object, array $data, array $processed = */ final public function getPatchValidFeatures(): array { - $aliasedfeatures = $this->getAliasedFeatures(); + $aliasedfeatures = $this->getFeaturesWithoutFormfields(); $validFeatures = []; // Generate listing of validFeatures diff --git a/src/inc/apiv2/common/openAPISchema.routes.php b/src/inc/apiv2/common/openAPISchema.routes.php index b70fcefe7..f7d372306 100644 --- a/src/inc/apiv2/common/openAPISchema.routes.php +++ b/src/inc/apiv2/common/openAPISchema.routes.php @@ -47,9 +47,135 @@ function typeLookup($feature): array { return $result; }; -function makeProperties($features): array { + +// "jsonapi": { +// "version": "1.1", +// "ext": [ +// "https://jsonapi.org/profiles/ethanresnick/cursor-pagination" +// ] +// }, +function makeJsonApiHeader(): array { + return ["jsonapi" => [ + "type" => "object", + "properties" => [ + "version" => [ + "type" => "string", + "default" => "1.1" + ], + "ext" => [ + "type" => "string", + "default" => "https://jsonapi.org/profiles/ethanresnick/cursor-pagination" + ] + ] + ]]; +} + +// "links": { +// "self": "/api/v2/ui/hashlists?page[size]=10000", +// "first": "/api/v2/ui/hashlists?page[size]=10000&page[after]=0", +// "last": "/api/v2/ui/hashlists?page[size]=10000&page[before]=345", +// "next": null, +// "prev": "/api/v2/ui/hashlists?page[size]=10000&page[before]=114" +// }, +function makeLinks($uri): array { + $self = $uri . "?page[size]=25"; + return ["links" => [ + "type" => "object", + "properties" => [ + "self" => [ + "type" => "string", + "default" => $self + ], + "first" => [ + "type" => "string", + "default" => $self . "&page[after]=0" + ], + "last" => [ + "type" => "string", + "default" => $self . "&page[before]=500" + ], + "next" => [ + "type" => "string", + "default" => $self . "&page[after]=25" + ], + "previous" => [ + "type" => "string", + "default" => $self . "&page[before]=25" + ] + ] + ]]; +} + +//TODO relationship array is unnecessarily indexed in the swagger UI +function makeRelationships($class, $uri): array { + $properties = []; + $relationshipsNames = array_merge(array_keys($class->getToOneRelationships()), array_keys($class->getToManyRelationships())); + sort($relationshipsNames); + foreach ($relationshipsNames as $relationshipName) { + $self = $uri . "/relationships/" . $relationshipName; + $related = $uri . "/" . $relationshipName; + array_push($properties, + [ + "properties" => [ + $relationshipName => [ + "type" => "object", + "properties" => [ + "links" => [ + "type" => "object", + "properties" => [ + "self" => [ + "type" => "string", + "default" => $self + ], + "related" => [ + "type" => "string", + "default" => $related + ] + ] + ] + ] + ] + + ] + ]); + } + return $properties; +} + +//TODO expandables array is unnecessarily indexed in the swagger UI +function makeExpandables($class, $container): array { + $properties = []; + $expandables = array_merge($class->getToOneRelationships(), $class->getToManyRelationships()); + foreach ($expandables as $expand => $expandVal) { + $expandClass = $expandVal["relationType"]; + $expandApiClass = new ($container->get('classMapper')->get($expandClass))($container); + array_push($properties, + [ + "properties" => [ + "id" => [ + "type" => "integer" + ], + "type" => [ + "type" => "string", + "default" => $expand + ], + "attributes" => [ + "type" => "object", + "properties" => makeProperties($expandApiClass->getAliasedFeatures()) + ] + ] + ] + ); + }; + return $properties; +} + +function makeProperties($features, $skipPK=false): array { $propertyVal = []; foreach ($features as $feature) { + if ($skipPK && $feature['pk']) { + continue; + } $ret = typeLookup($feature); $propertyVal[$feature['alias']]["type"] = $ret["type"]; if ($ret["type_format"] !== null) { @@ -62,6 +188,73 @@ function makeProperties($features): array { return $propertyVal; }; +function buildPatchPost($properties, $id=null): array { + $result = ["data" => [ + "type" => "object", + "properties" => [ + "type" => [ + "type" => "string" + ], + "attributes" => [ + "type" => "object", + "properties" => $properties + ] + ] + ] + ]; + + if ($id) { + $result["data"]["properties"]["id"] = [ + "type" => "integer", + ]; + } + return $result; +} + +function makeDescription($isRelation, $method, $singleObject): string { + $description = ""; + switch ($method) { + case "get": + if ($isRelation) { + if($singleObject) { + $description = "GET request for for a to-one relationship link. Returns the resource record of the object that is part of the specified relation."; + } else { + $description = "GET request for a to-many relationship link. Returns a list of resource records of objects that are part of the specified relation."; + } + } else { + if ($singleObject) { + $description = "GET request to retrieve a single object."; + } else { + $description = "GET many request to retrieve multiple objects."; + } + } + break; + case "post": + if ($isRelation) { + if ($singleObject) { + "POST request to create a to-one relationship link."; + } else { + "POST request to create a to-many relationship link."; + } + } else { + $description = "POST request to create a new object. The request must contain the resource record as data with the attributes of the new object." + . "To add relationships, a relationships object can be added with the resource records of the relations that are part of this object."; + } + break; + case "patch": + if ($isRelation) { + if ($singleObject) { + "PATCH request to update a to one relationship."; + } else { + "PATCH request to update a to-many relationship link."; + } + } else { + $description = "PATCH request to update attributes of a single object." ; + } + } + return $description; +} + $app->group("/api/v2/openapi.json", function (RouteCollectorProxy $group) use ($app) { /* Allow CORS preflight requests */ $group->options('', function (Request $request, Response $response): Response { @@ -80,17 +273,17 @@ function makeProperties($features): array { "type" => "string", "example" => "hashlist", ], - "startsAt" => [ + "page[after]" => [ "type" => "integer", "example" => 0 ], - "maxResults" => [ + "page[before]" => [ "type" => "integer", - "example" => 100 + "example" => 0 ], - "total" => [ + "page[size]" => [ "type" => "integer", - "example" => 200 + "example" => 100 ] ] ]; @@ -178,39 +371,63 @@ function makeProperties($features): array { /* Quick to find out if single parameter object is used */ $singleObject = ((strstr($path, '/{id:')) !== false); $name = substr($class->getDBAClass(), 4); + $uri = $class->getBaseUri(); + $isRelation = (strstr($path , "{relation:")) !== false; + + $expandables = implode(",", $class->getExpandables()); /** * Create component objects */ if (array_key_exists($name, $components) == false) { - $properties_get = [ - "_id" => [ + $properties_return_post_patch = [ + "id" => [ "type" => "integer", ], - "_self" => [ + "type" => [ "type" => "string", + "default" => $name ], - "_expandables" => [ - "type" => "string", - "default" => $class->getExpandables(), + "data" => [ + "type" => "object", + "properties" => makeProperties($class->getFeaturesWithoutFormfields(), true) ] ]; - $properties_create = makeProperties($class->getCreateValidFeatures()); - $properties_get = array_merge($properties_get, makeProperties($class->getAliasedFeatures())); - $properties_patch = makeProperties($class->getPatchValidFeatures()); - - $components[$name . "Create"] = - [ + $relationships = ["relationships" =>[ "type" => "object", - "properties" => $properties_create, + "properties" => makeRelationships($class, $uri) + ] ]; + $included = ["included" => [ + "type" => "array", + "items" => [ + "type" => "object", + "properties" => makeExpandables($class, $app->getContainer()) + ], + ] + ]; + + $properties_get_single = array_merge($properties_return_post_patch, $relationships, $included); + + $json_api_header = makeJsonApiHeader(); + $links = makeLinks($uri); + $properties_return_post_patch = array_merge($json_api_header, $properties_return_post_patch); + $properties_create = buildPatchPost(makeProperties($class->getCreateValidFeatures(), true)); + $properties_get = array_merge($json_api_header, $links, $properties_get_single, $included); + $properties_patch = buildPatchPost(makeProperties($class->getPatchValidFeatures(), true)); + + $components[$name . "Create"] = + [ + "type" => "object", + "properties" => $properties_create, + ]; $components[$name . "Patch"] = - [ - "type" => "object", - "properties" => $properties_patch, - ]; + [ + "type" => "object", + "properties" => $properties_patch, + ]; $components[$name . "Response"] = [ @@ -218,6 +435,18 @@ function makeProperties($features): array { "properties" => $properties_get, ]; + $components[$name . "SingleResponse"] = + [ + "type" => "object", + "properties" => $properties_get_single + ]; + + $components[$name . "PostPatchResponse"] = + [ + "type" => "object", + "properties" => $properties_return_post_patch + ]; + $components[$name . "ListResponse"] = [ "allOf" => [ @@ -283,6 +512,8 @@ function makeProperties($features): array { ] ]; + $paths[$path][$method]["description"] = makeDescription($isRelation, $method, $singleObject); + if ($singleObject) { /* Single objects could not exists */ $paths[$path][$method]["responses"]["404"] = @@ -323,12 +554,12 @@ function makeProperties($features): array { // ]]; } elseif ($method == 'patch') { - $paths[$path][$method]["responses"]["201"] = [ + $paths[$path][$method]["responses"]["200"] = [ "description" => "successful operation", "content" => [ "application/json" => [ "schema" => [ - '$ref' => "#/components/schemas/" . $name . "Response" + '$ref' => "#/components/schemas/" . $name . "PostPatchResponse" ] ] ] @@ -403,7 +634,7 @@ function makeProperties($features): array { "content" => [ "application/json" => [ "schema" => [ - '$ref' => "#/components/schemas/" . $name . "Response" + '$ref' => "#/components/schemas/" . $name . "PostPatchResponse" ] ] ] @@ -423,9 +654,8 @@ function makeProperties($features): array { throw new HttpErrorException("Method '$method' not implemented"); } } - - if ($singleObject) { + if ($singleObject && $method == 'get') { $paths[$path][$method]["responses"]["200"] = [ "description" => "successful operation", "content" => [ @@ -451,52 +681,65 @@ function makeProperties($features): array { if ($method == 'get') { array_push($parameters, [ - "name" => "expand", + "name" => "include", "in" => "query", "schema" => [ "type" => "string" ], - "description" => "Items to expand" + "description" => "Items to include. Comma seperated" ]); }; } else { if ($method == 'get') { $parameters = [ [ - "name" => "startsAt", + "name" => "page[after]", + "in" => "query", + "schema" => [ + "type" => "integer", + "format" => "int32" + ], + "example" => 0, + "description" => "Pointer to paginate to retrieve the data after the value provided" + ], + [ + "name" => "page[before]", "in" => "query", "schema" => [ "type" => "integer", "format" => "int32" ], "example" => 0, - "description" => "The starting index of the values" + "description" => "Pointer to paginate to retrieve the data before the value provided" ], [ - "name" => "maxResults", + "name" => "page[size]", "in" => "query", "schema" => [ "type" => "integer", "format" => "int32" ], "example" => 100, - "description" => "The maximum number of issues to return per page." + "description" => "Amout of data to retrieve inside a single page" ], [ "name" => "filter", "in" => "query", + "style" => "deepobject", + "explode" => true, "schema" => [ - "type" => "string" + "type" => "object", ], - "description" => "Filters results using a query." + "description" => "Filters results using a query", + "example" => '"filter[hashlistId__gt]": 200' ], [ - "name" => "expand", + "name" => "include", "in" => "query", "schema" => [ "type" => "string" ], - "description" => "Items to expand" + "description" => "Items to include, comma seperated. Possible options: " . $expandables ] ]; } else { @@ -506,7 +749,6 @@ function makeProperties($features): array { $paths[$path][$method]["parameters"] = $parameters; }; - /** * Build static entries */ diff --git a/src/inc/apiv2/model/supertasks.routes.php b/src/inc/apiv2/model/supertasks.routes.php index d4d37e146..b6b193296 100644 --- a/src/inc/apiv2/model/supertasks.routes.php +++ b/src/inc/apiv2/model/supertasks.routes.php @@ -7,6 +7,10 @@ use DBA\Supertask; use DBA\SupertaskPretask; +use Middlewares\Utils\HttpErrorException; + +use Psr\Http\Message\ServerRequestInterface as Request; + require_once(dirname(__FILE__) . "/../common/AbstractModelAPI.class.php"); @@ -61,19 +65,19 @@ protected function createObject(array $data): int { return $objects[0]->getId(); } - public function updateObject(object $object, $data, $processed = []): void { - $key = "pretasks"; - if (array_key_exists($key, $data)) { - array_push($processed, $key); - - // Retrieve requested pretasks + public function updateToManyRelationship(Request $request, array $data, array $args): void { + $id = $args['id']; $wantedPretasks = []; - foreach(self::db2json($this->getAliasedFeatures()['pretasks'], $data[$key]) as $pretaskId) { - array_push($wantedPretasks, self::getPretask($pretaskId)); + foreach($data as $pretask) { + if (!$this->validateResourceRecord($pretask)) { + $encoded_pretask = json_encode($pretask); + throw new HttpErrorException('Invalid resource record given in list! invalid resource record: ' . $encoded_pretask); + } + array_push($wantedPretasks, self::getPretask($pretask["id"])); } // Find out which to add and remove - $currentPretasks = SupertaskUtils::getPretasksOfSupertask($object->getId()); + $currentPretasks = SupertaskUtils::getPretasksOfSupertask($id); function compare_ids($a, $b) { return ($a->getId() - $b->getId()); @@ -81,16 +85,20 @@ function compare_ids($a, $b) $toAddPretasks = array_udiff($wantedPretasks, $currentPretasks, 'compare_ids'); $toRemovePretasks = array_udiff($currentPretasks, $wantedPretasks, 'compare_ids'); - // Update model + $factory = $this->getFactory(); + $factory->getDB()->beginTransaction(); //start transaction to be able roll back + + // Update models foreach($toAddPretasks as $pretask) { - SupertaskUtils::addPretaskToSupertask($object->getId(), $pretask->getId()); + SupertaskUtils::addPretaskToSupertask($id, $pretask->getId()); } foreach($toRemovePretasks as $pretask) { - SupertaskUtils::removePretaskFromSupertask($object->getId(), $pretask->getId()); + SupertaskUtils::removePretaskFromSupertask($id, $pretask->getId()); } - } - parent::updateObject($object, $data, $processed); + if (!$factory->getDB()->commit()) { + throw new HttpErrorException("Was not able to update to many relationship"); + } } protected function deleteObject(object $object): void { From f269948044b6d6763424258ef075060ce2d5dfe4 Mon Sep 17 00:00:00 2001 From: jessevz Date: Wed, 8 Jan 2025 20:24:23 +0100 Subject: [PATCH 012/691] FEAT: Added missing option endpoints (#1171) --- .../apiv2/common/AbstractModelAPI.class.php | 18 ++++++++++-------- 1 file changed, 10 insertions(+), 8 deletions(-) diff --git a/src/inc/apiv2/common/AbstractModelAPI.class.php b/src/inc/apiv2/common/AbstractModelAPI.class.php index ffd117b84..ea9c2c3d2 100644 --- a/src/inc/apiv2/common/AbstractModelAPI.class.php +++ b/src/inc/apiv2/common/AbstractModelAPI.class.php @@ -878,8 +878,9 @@ public function getToOneRelationshipLink(Request $request, Response $response, a /* * API endpoint to patch a to one relationship link */ - //This works as intended but it can give weird behaviour. ex. it allows you to put an MD5 hash to a SHA1 hashlist + // TODO This works as intended but it can give weird behaviour. ex. it allows you to put an MD5 hash to a SHA1 hashlist //by patching the foreingkey. Simple fix could be to make foreignkey immutable for cases like this. + //Or just like with the patch many, create an overrideable function to add more logic in child public function patchToOneRelationshipLink(Request $request, Response $response, array $args): Response { $this->preCommon($request); @@ -1208,25 +1209,26 @@ static public function register($app): void $foo = $me::getDBAClass(); $baseUri = $me::getBaseUri(); $baseUriOne = $baseUri . '/{id:[0-9]+}'; + $baseUriCount = $baseUri . "/count"; $baseUriRelationships = $baseUri . '/{id:[0-9]+}/relationships'; + $uris = [$baseUri, $baseUriOne, $baseUriCount, $baseUriRelationships]; $classMapper = $app->getContainer()->get('classMapper'); $classMapper->add($me::getDBAclass(), $me); /* Allow CORS preflight requests */ - $app->options($baseUri, function (Request $request, Response $response): Response { - return $response; - }); - $app->options($baseUriOne, function (Request $request, Response $response): Response { - return $response; - }); + foreach ($uris as $uri) { + $app->options($uri, function (Request $request, Response $response): Response { + return $response; + }); + } $available_methods = $me::getAvailableMethods(); if (in_array("GET", $available_methods)) { $app->get($baseUri, $me . ':get')->setname($me . ':get'); - $app->get($baseUri . "/count", $me . ':count')->setname($me . ':count'); + $app->get($baseUriCount, $me . ':count')->setname($me . ':count'); } foreach ($me::getToOneRelationships() as $name => $relationship) { From df3c2338709667a75c4baa25a44ea25d13444447 Mon Sep 17 00:00:00 2001 From: jessevz Date: Thu, 9 Jan 2025 14:07:50 +0100 Subject: [PATCH 013/691] 1154 enhancement apiv2 return total amount of pages for paginated api calls (#1173) * FEAT: Added total page size in meta data and get correct first page for pagination * FEAT: made pagination default page size and maximum page size configurable through config * Fixed bug in upgrade script --- .../apiv2/common/AbstractModelAPI.class.php | 34 ++++++++++++------- src/inc/defines/config.php | 10 ++++++ src/install/hashtopolis.sql | 5 ++- .../updates/update_v0.14.3_v0.14.x.php | 20 +++++++++++ 4 files changed, 56 insertions(+), 13 deletions(-) create mode 100644 src/install/updates/update_v0.14.3_v0.14.x.php diff --git a/src/inc/apiv2/common/AbstractModelAPI.class.php b/src/inc/apiv2/common/AbstractModelAPI.class.php index ea9c2c3d2..3497ca5d0 100644 --- a/src/inc/apiv2/common/AbstractModelAPI.class.php +++ b/src/inc/apiv2/common/AbstractModelAPI.class.php @@ -9,6 +9,7 @@ use Middlewares\Utils\HttpErrorException; use DBA\AbstractModelFactory; +use DBA\Aggregation; use DBA\JoinFilter; use DBA\Factory; use DBA\ContainFilter; @@ -382,9 +383,11 @@ public static function getManyResources(object $apiClass, Request $request, Resp $aliasedfeatures = $apiClass->getAliasedFeatures(); $factory = $apiClass->getFactory(); - // TODO: Maximum and default should be configurable per server instance $defaultPageSize = 10000; $maxPageSize = 50000; + // TODO: if 0.14.4 release has happened, following parameters can be retrieved from config + // $defaultPageSize = SConfig::getInstance()->getVal(DConfig::DEFAULT_PAGE_SIZE); + // $maxPageSize = SConfig::getInstance()->getVal(DConfig::MAX_PAGE_SIZE); $pageAfter = $apiClass->getQueryParameterFamilyMember($request, 'page', 'after') ?? 0; $pageSize = $apiClass->getQueryParameterFamilyMember($request, 'page', 'size') ?? $defaultPageSize; @@ -426,18 +429,28 @@ public static function getManyResources(object $apiClass, Request $request, Resp /* Include relation filters */ $finalFs = array_merge($aFs, $relationFs); + $primaryKey = $apiClass->getPrimaryKey(); //according to JSON API spec, first and last have to be calculated if inexpensive to compute //(https://jsonapi.org/profiles/ethanresnick/cursor-pagination/#auto-id-links)) - //if this query is too expensive for big tables, it should be removed - $max = $factory->minMaxFilter($finalFs, $apiClass->getPrimaryKey(), "MAX"); + //if this query is too expensive for big tables, it can be removed + $agg1 = new Aggregation($primaryKey, Aggregation::MAX); + $agg2 = new Aggregation($primaryKey, Aggregation::MIN); + $agg3 = new Aggregation($primaryKey, Aggregation::COUNT); + $aggregation_results = $factory->multicolAggregationFilter($finalFs, [$agg1, $agg2, $agg3]); + + $max = $aggregation_results[$agg1->getName()]; + $min = $aggregation_results[$agg2->getName()]; + $total = $aggregation_results[$agg3->getName()]; + + $totalPages = ceil($total / $pageSize); //pagination filters need to be added after max has been calculated $finalFs[Factory::LIMIT] = new LimitFilter($pageSize); - $finalFs[Factory::FILTER][] = new QueryFilter($apiClass->getPrimaryKey(), $pageAfter, '>', $factory); + $finalFs[Factory::FILTER][] = new QueryFilter($primaryKey, $pageAfter, '>', $factory); $pageBefore = $apiClass->getQueryParameterFamilyMember($request, 'page', 'before'); if (isset($pageBefore)) { - $finalFs[Factory::FILTER][] = new QueryFilter($apiClass->getPrimaryKey(), $pageBefore, '<', $factory); + $finalFs[Factory::FILTER][] = new QueryFilter($primaryKey, $pageBefore, '<', $factory); } /* Request objects */ @@ -525,12 +538,8 @@ public static function getManyResources(object $apiClass, Request $request, Resp } // Build prev link $prevId = $defaultSort == "DESC" ? $maxId : $minId; - if ($prevId != 1) { //only set previous page when its not the first page + if ($prevId != $min) { //only set previous page when its not the first page $prevParams = $selfParams; - //This scenario might return a link to an empty array if the elements with the lowest id are deleted, but this is allowed according - //to the json API spec https://jsonapi.org/profiles/ethanresnick/cursor-pagination/#auto-id-links - //We could also get the lowest id the same way we got the max, but this is probably unnecessary expensive. - //But pull request: https://github.com/hashtopolis/server/pull/1069 would create a cheaper way of doing this in a single query $prevParams['page']['before'] = $prevId; unset($prevParams['page']['after']); $linksPrev = $request->getUri()->getPath() . '?' . urldecode(http_build_query($prevParams)); @@ -541,7 +550,7 @@ public static function getManyResources(object $apiClass, Request $request, Resp $firstParams = $request->getQueryParams(); unset($firstParams['page']['before']); $firstParams['page']['size'] = $pageSize; - $firstParams['page']['after'] = 0; + $firstParams['page']['after'] = $min; $linksFirst = $request->getUri()->getPath() . '?' . urldecode(http_build_query($firstParams)); $links = [ "self" => $linksSelf, @@ -551,8 +560,9 @@ public static function getManyResources(object $apiClass, Request $request, Resp "prev" => $linksPrev, ]; + $metadata = ["page" => ["total_pages" => $totalPages]]; // Generate JSON:API GET output - $ret = self::createJsonResponse($dataResources, $links, $includedResources); + $ret = self::createJsonResponse($dataResources, $links, $includedResources, $metadata); $body = $response->getBody(); $body->write($apiClass->ret2json($ret)); diff --git a/src/inc/defines/config.php b/src/inc/defines/config.php index b72d25672..3d78005b6 100644 --- a/src/inc/defines/config.php +++ b/src/inc/defines/config.php @@ -68,6 +68,8 @@ class DConfig { const HASH_MAX_LENGTH = "hashMaxLength"; const MAX_HASHLIST_SIZE = "maxHashlistSize"; const UAPI_SEND_TASK_IS_COMPLETE = "uApiSendTaskIsComplete"; + const DEFAULT_PAGE_SIZE = "defaultPageSize"; + const MAX_PAGE_SIZE = "maxPageSize"; // Section: UI const TIME_FORMAT = "timefmt"; @@ -272,6 +274,10 @@ public static function getConfigType($config) { return DConfigType::TICKBOX; case DConfig::HC_ERROR_IGNORE: return DConfigType::STRING_INPUT; + case DConfig::DEFAULT_PAGE_SIZE: + return DConfigType::NUMBER_INPUT; + case DConfig::MAX_PAGE_SIZE: + return DConfigType::NUMBER_INPUT; } return DConfigType::STRING_INPUT; } @@ -406,6 +412,10 @@ public static function getConfigDescription($config) { return "Also send 'isComplete' for each task on the User API when listing all tasks (might affect performance)"; case DConfig::HC_ERROR_IGNORE: return "Ignore error messages from crackers which contain given strings (multiple values separated by comma)"; + case DConfig::DEFAULT_PAGE_SIZE: + return "The default page size of items that are returned in API calls."; + case DConfig::MAX_PAGE_SIZE: + return "The maximum page size of items that are allowed to return in an API call."; } return $config; } diff --git a/src/install/hashtopolis.sql b/src/install/hashtopolis.sql index e1f72f2b7..3e0ba2d7f 100644 --- a/src/install/hashtopolis.sql +++ b/src/install/hashtopolis.sql @@ -170,7 +170,10 @@ INSERT INTO `Config` (`configId`, `configSectionId`, `item`, `value`) VALUES (74, 4, 'agentUtilThreshold1', '90'), (75, 4, 'agentUtilThreshold2', '75'), (76, 3, 'uApiSendTaskIsComplete', '0'), - (77, 1, 'hcErrorIgnore', 'DeviceGetFanSpeed'); + (77, 1, 'hcErrorIgnore', 'DeviceGetFanSpeed'), + (78, 3, 'defaultPageSize', '10000'), + (79, 3, 'maxPageSize', '50000'); + CREATE TABLE `ConfigSection` ( `configSectionId` INT(11) NOT NULL, diff --git a/src/install/updates/update_v0.14.3_v0.14.x.php b/src/install/updates/update_v0.14.3_v0.14.x.php new file mode 100644 index 000000000..f65f84ae9 --- /dev/null +++ b/src/install/updates/update_v0.14.3_v0.14.x.php @@ -0,0 +1,20 @@ +filter([Factory::FILTER => $qF], true); + if (!$item) { + $config = new Config(null, 3, DConfig::DEFAULT_PAGE_SIZE, '10000'); + Factory::getConfigFactory()->save($config); + } + $qF = new QueryFilter(Config::ITEM, DConfig::MAX_PAGE_SIZE, "="); + $item = Factory::getConfigFactory()->filter([Factory::FILTER => $qF], true); + if (!$item) { + $config = new Config(null, 3, DConfig::MAX_PAGE_SIZE, '50000'); + Factory::getConfigFactory()->save($config); + } +} \ No newline at end of file From cc204003fdd00f5eac8709c571d2421860e65066 Mon Sep 17 00:00:00 2001 From: Romke van Dijk Date: Tue, 14 Jan 2025 15:43:37 +0100 Subject: [PATCH 014/691] Tryout of documentation --- .github/workflows/docs.yml | 34 + .gitignore | 2 + doc/install.md | 14 + mkdocs.yml | 8 + openapi.json | 36875 +++++++++++++++++++++++++++++++++++ 5 files changed, 36933 insertions(+) create mode 100644 .github/workflows/docs.yml create mode 100644 doc/install.md create mode 100644 mkdocs.yml create mode 100644 openapi.json diff --git a/.github/workflows/docs.yml b/.github/workflows/docs.yml new file mode 100644 index 000000000..f32a89f23 --- /dev/null +++ b/.github/workflows/docs.yml @@ -0,0 +1,34 @@ +name: Generate MkDocs and upload + +on: + push: + branches: + - docs +jobs: + build: + runs-on: ubuntu-latest + + steps: + - name: Check out the repository + uses: actions/checkout@v2 + - name: Set up Python + uses: actions/setup-python@v2 + with: + python-version: 3.10 + - name: Install dependencies + run: | + python -m pip install --upgrade pip + pip install mkdocs + sudo apt-get update + sudo apt-get install -y lftp + + - name: Build MkDocs site + run: | + mkdocs build + - name: Upload HTML files to FTP server + env: + FTP_SERVER: ${{ secrets.FTP_SERVER }} + FTP_USERNAME: ${{ secrets.FTP_USERNAME }} + FTP_PASSWORD: ${{ secrets.FTP_PASSWORD }} + run: | + lftp -e "mirror -R site/ /home/godesig/www/docs.hashtopolis.org/; quit" -u $FTP_USERNAME,$FTP_PASSWORD $FTP_SERVER diff --git a/.gitignore b/.gitignore index cdd203e14..8ffd0597b 100755 --- a/.gitignore +++ b/.gitignore @@ -25,3 +25,5 @@ vendor # For python cache files __pycache__ .pytest_cache + +site/ diff --git a/doc/install.md b/doc/install.md new file mode 100644 index 000000000..744925de6 --- /dev/null +++ b/doc/install.md @@ -0,0 +1,14 @@ +# Installation Guidelines +## Basic installation +### Server installation + +_NOTE: The instructions provided in this section have only been tested on Ubuntu 22.04 and Windows 11 with WSL2_ + +To install Hashtopolis server, ensure that the following prerequisites are met: +1. *Docker*: Follow the instructions available on the Docker website: + - Install Docker on Ubuntu + - Install Docker on Windows +2. *Docker Compose v2*: Follow the instructions available on the Docker website: + - [Install Docker Compose on Linux](https://docs.docker.com/compose/install/linux/#install-using-the-repository) + + diff --git a/mkdocs.yml b/mkdocs.yml new file mode 100644 index 000000000..43055d29d --- /dev/null +++ b/mkdocs.yml @@ -0,0 +1,8 @@ +site_name: Hashtopolis +site_url: https://docs.hashtopolis.org +repo_url: https://github.com/hashtopolis/server +docs_dir: doc +theme: + name: readthedocs +nav: + - 'install.md' diff --git a/openapi.json b/openapi.json new file mode 100644 index 000000000..caa52a0be --- /dev/null +++ b/openapi.json @@ -0,0 +1,36875 @@ +{ + "openapi": "3.0.1", + "info": { + "title": "Hashtopolis API", + "version": "v2" + }, + "servers": [ + { + "url": "/" + } + ], + "paths": { + "/api/v2/ui/accessgroups": { + "get": { + "tags": [ + "AccessGroups" + ], + "responses": { + "400": { + "description": "Invalid request", + "content": { + "application/json": { + "schema": { + "$ref": "#/components/schemas/ErrorResponse" + } + } + } + }, + "401": { + "description": "Authentication failed", + "content": { + "application/json": { + "schema": { + "$ref": "#/components/schemas/ErrorResponse" + } + } + } + }, + "200": { + "description": "successful operation", + "content": { + "application/json": { + "schema": { + "type": "array", + "items": { + "$ref": "#/components/schemas/AccessGroupResponse" + } + } + } + } + } + }, + "security": [ + { + "bearerAuth": [ + [ + "permAccessGroupRead" + ] + ] + } + ], + "description": "GET many request to retrieve multiple objects.", + "parameters": [ + { + "name": "page[after]", + "in": "query", + "schema": { + "type": "integer", + "format": "int32" + }, + "example": 0, + "description": "Pointer to paginate to retrieve the data after the value provided" + }, + { + "name": "page[before]", + "in": "query", + "schema": { + "type": "integer", + "format": "int32" + }, + "example": 0, + "description": "Pointer to paginate to retrieve the data before the value provided" + }, + { + "name": "page[size]", + "in": "query", + "schema": { + "type": "integer", + "format": "int32" + }, + "example": 100, + "description": "Amout of data to retrieve inside a single page" + }, + { + "name": "filter", + "in": "query", + "style": "deepobject", + "explode": true, + "schema": { + "type": "object" + }, + "description": "Filters results using a query", + "example": "\"filter[hashlistId__gt]\": 200" + }, + { + "name": "include", + "in": "query", + "schema": { + "type": "string" + }, + "description": "Items to include, comma seperated. Possible options: userMembers,agentMembers" + } + ] + }, + "post": { + "tags": [ + "AccessGroups" + ], + "responses": { + "400": { + "description": "Invalid request", + "content": { + "application/json": { + "schema": { + "$ref": "#/components/schemas/ErrorResponse" + } + } + } + }, + "401": { + "description": "Authentication failed", + "content": { + "application/json": { + "schema": { + "$ref": "#/components/schemas/ErrorResponse" + } + } + } + }, + "201": { + "description": "successful operation", + "content": { + "application/json": { + "schema": { + "$ref": "#/components/schemas/AccessGroupPostPatchResponse" + } + } + } + } + }, + "security": [ + { + "bearerAuth": [ + [ + "permAccessGroupCreate" + ] + ] + } + ], + "description": "POST request to create a new object. The request must contain the resource record as data with the attributes of the new object.To add relationships, a relationships object can be added with the resource records of the relations that are part of this object.", + "requestBody": { + "required": true, + "content": { + "application/json": { + "schema": { + "$ref": "#/components/schemas/AccessGroupCreate" + } + } + } + }, + "parameters": [] + } + }, + "/api/v2/ui/accessgroups/count": { + "get": { + "tags": [ + "AccessGroups" + ], + "responses": { + "400": { + "description": "Invalid request", + "content": { + "application/json": { + "schema": { + "$ref": "#/components/schemas/ErrorResponse" + } + } + } + }, + "401": { + "description": "Authentication failed", + "content": { + "application/json": { + "schema": { + "$ref": "#/components/schemas/ErrorResponse" + } + } + } + }, + "200": { + "description": "successful operation", + "content": { + "application/json": { + "schema": { + "type": "array", + "items": { + "$ref": "#/components/schemas/AccessGroupResponse" + } + } + } + } + } + }, + "security": [ + { + "bearerAuth": [ + [ + "permAccessGroupRead" + ] + ] + } + ], + "description": "GET many request to retrieve multiple objects.", + "parameters": [ + { + "name": "page[after]", + "in": "query", + "schema": { + "type": "integer", + "format": "int32" + }, + "example": 0, + "description": "Pointer to paginate to retrieve the data after the value provided" + }, + { + "name": "page[before]", + "in": "query", + "schema": { + "type": "integer", + "format": "int32" + }, + "example": 0, + "description": "Pointer to paginate to retrieve the data before the value provided" + }, + { + "name": "page[size]", + "in": "query", + "schema": { + "type": "integer", + "format": "int32" + }, + "example": 100, + "description": "Amout of data to retrieve inside a single page" + }, + { + "name": "filter", + "in": "query", + "style": "deepobject", + "explode": true, + "schema": { + "type": "object" + }, + "description": "Filters results using a query", + "example": "\"filter[hashlistId__gt]\": 200" + }, + { + "name": "include", + "in": "query", + "schema": { + "type": "string" + }, + "description": "Items to include, comma seperated. Possible options: userMembers,agentMembers" + } + ] + } + }, + "/api/v2/ui/accessgroups/{id:[0-9]+}/{relation:userMembers}": { + "get": { + "tags": [ + "AccessGroups" + ], + "responses": { + "400": { + "description": "Invalid request", + "content": { + "application/json": { + "schema": { + "$ref": "#/components/schemas/ErrorResponse" + } + } + } + }, + "401": { + "description": "Authentication failed", + "content": { + "application/json": { + "schema": { + "$ref": "#/components/schemas/ErrorResponse" + } + } + } + }, + "404": { + "description": "Not Found", + "content": { + "application/json": { + "schema": { + "$ref": "#/components/schemas/NotFoundResponse" + } + } + } + }, + "200": { + "description": "successful operation", + "content": { + "application/json": { + "schema": { + "$ref": "#/components/schemas/AccessGroupResponse" + } + } + } + } + }, + "security": [ + { + "bearerAuth": [ + [ + "permAccessGroupRead" + ] + ] + } + ], + "description": "GET request for for a to-one relationship link. Returns the resource record of the object that is part of the specified relation.", + "parameters": [ + { + "name": "id", + "in": "path", + "required": true, + "schema": { + "type": "integer", + "format": "int32", + "example": 10 + } + }, + { + "name": "include", + "in": "query", + "schema": { + "type": "string" + }, + "description": "Items to include. Comma seperated" + } + ] + } + }, + "/api/v2/ui/accessgroups/{id:[0-9]+}/relationships/{relation:userMembers}": { + "get": { + "tags": [ + "AccessGroups" + ], + "responses": { + "400": { + "description": "Invalid request", + "content": { + "application/json": { + "schema": { + "$ref": "#/components/schemas/ErrorResponse" + } + } + } + }, + "401": { + "description": "Authentication failed", + "content": { + "application/json": { + "schema": { + "$ref": "#/components/schemas/ErrorResponse" + } + } + } + }, + "404": { + "description": "Not Found", + "content": { + "application/json": { + "schema": { + "$ref": "#/components/schemas/NotFoundResponse" + } + } + } + }, + "200": { + "description": "successful operation", + "content": { + "application/json": { + "schema": { + "$ref": "#/components/schemas/AccessGroupResponse" + } + } + } + } + }, + "security": [ + { + "bearerAuth": [ + [ + "permAccessGroupRead" + ] + ] + } + ], + "description": "GET request for for a to-one relationship link. Returns the resource record of the object that is part of the specified relation.", + "parameters": [ + { + "name": "id", + "in": "path", + "required": true, + "schema": { + "type": "integer", + "format": "int32", + "example": 10 + } + }, + { + "name": "include", + "in": "query", + "schema": { + "type": "string" + }, + "description": "Items to include. Comma seperated" + } + ] + }, + "patch": { + "tags": [ + "AccessGroups" + ], + "responses": { + "400": { + "description": "Invalid request", + "content": { + "application/json": { + "schema": { + "$ref": "#/components/schemas/ErrorResponse" + } + } + } + }, + "401": { + "description": "Authentication failed", + "content": { + "application/json": { + "schema": { + "$ref": "#/components/schemas/ErrorResponse" + } + } + } + }, + "404": { + "description": "Not Found", + "content": { + "application/json": { + "schema": { + "$ref": "#/components/schemas/NotFoundResponse" + } + } + } + }, + "200": { + "description": "successful operation", + "content": { + "application/json": { + "schema": { + "$ref": "#/components/schemas/AccessGroupPostPatchResponse" + } + } + } + } + }, + "security": [ + { + "bearerAuth": [ + [ + "permAccessGroupUpdate" + ] + ] + } + ], + "description": "", + "requestBody": { + "required": true, + "content": { + "application/json": { + "schema": { + "$ref": "#/components/schemas/AccessGroupPatch" + } + } + } + }, + "parameters": [] + }, + "post": { + "tags": [ + "AccessGroups" + ], + "responses": { + "400": { + "description": "Invalid request", + "content": { + "application/json": { + "schema": { + "$ref": "#/components/schemas/ErrorResponse" + } + } + } + }, + "401": { + "description": "Authentication failed", + "content": { + "application/json": { + "schema": { + "$ref": "#/components/schemas/ErrorResponse" + } + } + } + }, + "404": { + "description": "Not Found", + "content": { + "application/json": { + "schema": { + "$ref": "#/components/schemas/NotFoundResponse" + } + } + } + }, + "204": { + "description": "successfully created" + } + }, + "security": [ + { + "bearerAuth": [ + [ + "permAccessGroupCreate" + ] + ] + } + ], + "description": "", + "requestBody": { + "required": true, + "content": { + "application/json": [] + } + }, + "parameters": [] + }, + "delete": { + "tags": [ + "AccessGroups" + ], + "responses": { + "400": { + "description": "Invalid request", + "content": { + "application/json": { + "schema": { + "$ref": "#/components/schemas/ErrorResponse" + } + } + } + }, + "401": { + "description": "Authentication failed", + "content": { + "application/json": { + "schema": { + "$ref": "#/components/schemas/ErrorResponse" + } + } + } + }, + "404": { + "description": "Not Found", + "content": { + "application/json": { + "schema": { + "$ref": "#/components/schemas/NotFoundResponse" + } + } + } + }, + "204": { + "description": "successfully deleted" + } + }, + "security": [ + { + "bearerAuth": [ + [ + "permAccessGroupDelete" + ] + ] + } + ], + "description": "", + "requestBody": { + "required": true, + "content": { + "application/json": [] + } + }, + "parameters": [] + } + }, + "/api/v2/ui/accessgroups/{id:[0-9]+}/{relation:agentMembers}": { + "get": { + "tags": [ + "AccessGroups" + ], + "responses": { + "400": { + "description": "Invalid request", + "content": { + "application/json": { + "schema": { + "$ref": "#/components/schemas/ErrorResponse" + } + } + } + }, + "401": { + "description": "Authentication failed", + "content": { + "application/json": { + "schema": { + "$ref": "#/components/schemas/ErrorResponse" + } + } + } + }, + "404": { + "description": "Not Found", + "content": { + "application/json": { + "schema": { + "$ref": "#/components/schemas/NotFoundResponse" + } + } + } + }, + "200": { + "description": "successful operation", + "content": { + "application/json": { + "schema": { + "$ref": "#/components/schemas/AccessGroupResponse" + } + } + } + } + }, + "security": [ + { + "bearerAuth": [ + [ + "permAccessGroupRead" + ] + ] + } + ], + "description": "GET request for for a to-one relationship link. Returns the resource record of the object that is part of the specified relation.", + "parameters": [ + { + "name": "id", + "in": "path", + "required": true, + "schema": { + "type": "integer", + "format": "int32", + "example": 10 + } + }, + { + "name": "include", + "in": "query", + "schema": { + "type": "string" + }, + "description": "Items to include. Comma seperated" + } + ] + } + }, + "/api/v2/ui/accessgroups/{id:[0-9]+}/relationships/{relation:agentMembers}": { + "get": { + "tags": [ + "AccessGroups" + ], + "responses": { + "400": { + "description": "Invalid request", + "content": { + "application/json": { + "schema": { + "$ref": "#/components/schemas/ErrorResponse" + } + } + } + }, + "401": { + "description": "Authentication failed", + "content": { + "application/json": { + "schema": { + "$ref": "#/components/schemas/ErrorResponse" + } + } + } + }, + "404": { + "description": "Not Found", + "content": { + "application/json": { + "schema": { + "$ref": "#/components/schemas/NotFoundResponse" + } + } + } + }, + "200": { + "description": "successful operation", + "content": { + "application/json": { + "schema": { + "$ref": "#/components/schemas/AccessGroupResponse" + } + } + } + } + }, + "security": [ + { + "bearerAuth": [ + [ + "permAccessGroupRead" + ] + ] + } + ], + "description": "GET request for for a to-one relationship link. Returns the resource record of the object that is part of the specified relation.", + "parameters": [ + { + "name": "id", + "in": "path", + "required": true, + "schema": { + "type": "integer", + "format": "int32", + "example": 10 + } + }, + { + "name": "include", + "in": "query", + "schema": { + "type": "string" + }, + "description": "Items to include. Comma seperated" + } + ] + }, + "patch": { + "tags": [ + "AccessGroups" + ], + "responses": { + "400": { + "description": "Invalid request", + "content": { + "application/json": { + "schema": { + "$ref": "#/components/schemas/ErrorResponse" + } + } + } + }, + "401": { + "description": "Authentication failed", + "content": { + "application/json": { + "schema": { + "$ref": "#/components/schemas/ErrorResponse" + } + } + } + }, + "404": { + "description": "Not Found", + "content": { + "application/json": { + "schema": { + "$ref": "#/components/schemas/NotFoundResponse" + } + } + } + }, + "200": { + "description": "successful operation", + "content": { + "application/json": { + "schema": { + "$ref": "#/components/schemas/AccessGroupPostPatchResponse" + } + } + } + } + }, + "security": [ + { + "bearerAuth": [ + [ + "permAccessGroupUpdate" + ] + ] + } + ], + "description": "", + "requestBody": { + "required": true, + "content": { + "application/json": { + "schema": { + "$ref": "#/components/schemas/AccessGroupPatch" + } + } + } + }, + "parameters": [] + }, + "post": { + "tags": [ + "AccessGroups" + ], + "responses": { + "400": { + "description": "Invalid request", + "content": { + "application/json": { + "schema": { + "$ref": "#/components/schemas/ErrorResponse" + } + } + } + }, + "401": { + "description": "Authentication failed", + "content": { + "application/json": { + "schema": { + "$ref": "#/components/schemas/ErrorResponse" + } + } + } + }, + "404": { + "description": "Not Found", + "content": { + "application/json": { + "schema": { + "$ref": "#/components/schemas/NotFoundResponse" + } + } + } + }, + "204": { + "description": "successfully created" + } + }, + "security": [ + { + "bearerAuth": [ + [ + "permAccessGroupCreate" + ] + ] + } + ], + "description": "", + "requestBody": { + "required": true, + "content": { + "application/json": [] + } + }, + "parameters": [] + }, + "delete": { + "tags": [ + "AccessGroups" + ], + "responses": { + "400": { + "description": "Invalid request", + "content": { + "application/json": { + "schema": { + "$ref": "#/components/schemas/ErrorResponse" + } + } + } + }, + "401": { + "description": "Authentication failed", + "content": { + "application/json": { + "schema": { + "$ref": "#/components/schemas/ErrorResponse" + } + } + } + }, + "404": { + "description": "Not Found", + "content": { + "application/json": { + "schema": { + "$ref": "#/components/schemas/NotFoundResponse" + } + } + } + }, + "204": { + "description": "successfully deleted" + } + }, + "security": [ + { + "bearerAuth": [ + [ + "permAccessGroupDelete" + ] + ] + } + ], + "description": "", + "requestBody": { + "required": true, + "content": { + "application/json": [] + } + }, + "parameters": [] + } + }, + "/api/v2/ui/accessgroups/{id:[0-9]+}": { + "get": { + "tags": [ + "AccessGroups" + ], + "responses": { + "400": { + "description": "Invalid request", + "content": { + "application/json": { + "schema": { + "$ref": "#/components/schemas/ErrorResponse" + } + } + } + }, + "401": { + "description": "Authentication failed", + "content": { + "application/json": { + "schema": { + "$ref": "#/components/schemas/ErrorResponse" + } + } + } + }, + "404": { + "description": "Not Found", + "content": { + "application/json": { + "schema": { + "$ref": "#/components/schemas/NotFoundResponse" + } + } + } + }, + "200": { + "description": "successful operation", + "content": { + "application/json": { + "schema": { + "$ref": "#/components/schemas/AccessGroupResponse" + } + } + } + } + }, + "security": [ + { + "bearerAuth": [ + [ + "permAccessGroupRead" + ] + ] + } + ], + "description": "GET request to retrieve a single object.", + "parameters": [ + { + "name": "id", + "in": "path", + "required": true, + "schema": { + "type": "integer", + "format": "int32", + "example": 10 + } + }, + { + "name": "include", + "in": "query", + "schema": { + "type": "string" + }, + "description": "Items to include. Comma seperated" + } + ] + }, + "patch": { + "tags": [ + "AccessGroups" + ], + "responses": { + "400": { + "description": "Invalid request", + "content": { + "application/json": { + "schema": { + "$ref": "#/components/schemas/ErrorResponse" + } + } + } + }, + "401": { + "description": "Authentication failed", + "content": { + "application/json": { + "schema": { + "$ref": "#/components/schemas/ErrorResponse" + } + } + } + }, + "404": { + "description": "Not Found", + "content": { + "application/json": { + "schema": { + "$ref": "#/components/schemas/NotFoundResponse" + } + } + } + }, + "200": { + "description": "successful operation", + "content": { + "application/json": { + "schema": { + "$ref": "#/components/schemas/AccessGroupPostPatchResponse" + } + } + } + } + }, + "security": [ + { + "bearerAuth": [ + [ + "permAccessGroupUpdate" + ] + ] + } + ], + "description": "PATCH request to update attributes of a single object.", + "requestBody": { + "required": true, + "content": { + "application/json": { + "schema": { + "$ref": "#/components/schemas/AccessGroupPatch" + } + } + } + }, + "parameters": [] + }, + "delete": { + "tags": [ + "AccessGroups" + ], + "responses": { + "400": { + "description": "Invalid request", + "content": { + "application/json": { + "schema": { + "$ref": "#/components/schemas/ErrorResponse" + } + } + } + }, + "401": { + "description": "Authentication failed", + "content": { + "application/json": { + "schema": { + "$ref": "#/components/schemas/ErrorResponse" + } + } + } + }, + "404": { + "description": "Not Found", + "content": { + "application/json": { + "schema": { + "$ref": "#/components/schemas/NotFoundResponse" + } + } + } + }, + "204": { + "description": "successfully deleted" + } + }, + "security": [ + { + "bearerAuth": [ + [ + "permAccessGroupDelete" + ] + ] + } + ], + "description": "", + "requestBody": { + "required": true, + "content": { + "application/json": [] + } + }, + "parameters": [] + } + }, + "/api/v2/ui/agentassignments": { + "get": { + "tags": [ + "Assignments" + ], + "responses": { + "400": { + "description": "Invalid request", + "content": { + "application/json": { + "schema": { + "$ref": "#/components/schemas/ErrorResponse" + } + } + } + }, + "401": { + "description": "Authentication failed", + "content": { + "application/json": { + "schema": { + "$ref": "#/components/schemas/ErrorResponse" + } + } + } + }, + "200": { + "description": "successful operation", + "content": { + "application/json": { + "schema": { + "type": "array", + "items": { + "$ref": "#/components/schemas/AssignmentResponse" + } + } + } + } + } + }, + "security": [ + { + "bearerAuth": [ + [ + "permAgentAssignmentRead" + ] + ] + } + ], + "description": "GET many request to retrieve multiple objects.", + "parameters": [ + { + "name": "page[after]", + "in": "query", + "schema": { + "type": "integer", + "format": "int32" + }, + "example": 0, + "description": "Pointer to paginate to retrieve the data after the value provided" + }, + { + "name": "page[before]", + "in": "query", + "schema": { + "type": "integer", + "format": "int32" + }, + "example": 0, + "description": "Pointer to paginate to retrieve the data before the value provided" + }, + { + "name": "page[size]", + "in": "query", + "schema": { + "type": "integer", + "format": "int32" + }, + "example": 100, + "description": "Amout of data to retrieve inside a single page" + }, + { + "name": "filter", + "in": "query", + "style": "deepobject", + "explode": true, + "schema": { + "type": "object" + }, + "description": "Filters results using a query", + "example": "\"filter[hashlistId__gt]\": 200" + }, + { + "name": "include", + "in": "query", + "schema": { + "type": "string" + }, + "description": "Items to include, comma seperated. Possible options: agent,task" + } + ] + }, + "post": { + "tags": [ + "Assignments" + ], + "responses": { + "400": { + "description": "Invalid request", + "content": { + "application/json": { + "schema": { + "$ref": "#/components/schemas/ErrorResponse" + } + } + } + }, + "401": { + "description": "Authentication failed", + "content": { + "application/json": { + "schema": { + "$ref": "#/components/schemas/ErrorResponse" + } + } + } + }, + "201": { + "description": "successful operation", + "content": { + "application/json": { + "schema": { + "$ref": "#/components/schemas/AssignmentPostPatchResponse" + } + } + } + } + }, + "security": [ + { + "bearerAuth": [ + [ + "permAgentAssignmentCreate" + ] + ] + } + ], + "description": "POST request to create a new object. The request must contain the resource record as data with the attributes of the new object.To add relationships, a relationships object can be added with the resource records of the relations that are part of this object.", + "requestBody": { + "required": true, + "content": { + "application/json": { + "schema": { + "$ref": "#/components/schemas/AssignmentCreate" + } + } + } + }, + "parameters": [] + } + }, + "/api/v2/ui/agentassignments/count": { + "get": { + "tags": [ + "Assignments" + ], + "responses": { + "400": { + "description": "Invalid request", + "content": { + "application/json": { + "schema": { + "$ref": "#/components/schemas/ErrorResponse" + } + } + } + }, + "401": { + "description": "Authentication failed", + "content": { + "application/json": { + "schema": { + "$ref": "#/components/schemas/ErrorResponse" + } + } + } + }, + "200": { + "description": "successful operation", + "content": { + "application/json": { + "schema": { + "type": "array", + "items": { + "$ref": "#/components/schemas/AssignmentResponse" + } + } + } + } + } + }, + "security": [ + { + "bearerAuth": [ + [ + "permAgentAssignmentRead" + ] + ] + } + ], + "description": "GET many request to retrieve multiple objects.", + "parameters": [ + { + "name": "page[after]", + "in": "query", + "schema": { + "type": "integer", + "format": "int32" + }, + "example": 0, + "description": "Pointer to paginate to retrieve the data after the value provided" + }, + { + "name": "page[before]", + "in": "query", + "schema": { + "type": "integer", + "format": "int32" + }, + "example": 0, + "description": "Pointer to paginate to retrieve the data before the value provided" + }, + { + "name": "page[size]", + "in": "query", + "schema": { + "type": "integer", + "format": "int32" + }, + "example": 100, + "description": "Amout of data to retrieve inside a single page" + }, + { + "name": "filter", + "in": "query", + "style": "deepobject", + "explode": true, + "schema": { + "type": "object" + }, + "description": "Filters results using a query", + "example": "\"filter[hashlistId__gt]\": 200" + }, + { + "name": "include", + "in": "query", + "schema": { + "type": "string" + }, + "description": "Items to include, comma seperated. Possible options: agent,task" + } + ] + } + }, + "/api/v2/ui/agentassignments/{id:[0-9]+}/{relation:agent}": { + "get": { + "tags": [ + "Assignments" + ], + "responses": { + "400": { + "description": "Invalid request", + "content": { + "application/json": { + "schema": { + "$ref": "#/components/schemas/ErrorResponse" + } + } + } + }, + "401": { + "description": "Authentication failed", + "content": { + "application/json": { + "schema": { + "$ref": "#/components/schemas/ErrorResponse" + } + } + } + }, + "404": { + "description": "Not Found", + "content": { + "application/json": { + "schema": { + "$ref": "#/components/schemas/NotFoundResponse" + } + } + } + }, + "200": { + "description": "successful operation", + "content": { + "application/json": { + "schema": { + "$ref": "#/components/schemas/AssignmentResponse" + } + } + } + } + }, + "security": [ + { + "bearerAuth": [ + [ + "permAgentAssignmentRead" + ] + ] + } + ], + "description": "GET request for for a to-one relationship link. Returns the resource record of the object that is part of the specified relation.", + "parameters": [ + { + "name": "id", + "in": "path", + "required": true, + "schema": { + "type": "integer", + "format": "int32", + "example": 10 + } + }, + { + "name": "include", + "in": "query", + "schema": { + "type": "string" + }, + "description": "Items to include. Comma seperated" + } + ] + } + }, + "/api/v2/ui/agentassignments/{id:[0-9]+}/relationships/{relation:agent}": { + "get": { + "tags": [ + "Assignments" + ], + "responses": { + "400": { + "description": "Invalid request", + "content": { + "application/json": { + "schema": { + "$ref": "#/components/schemas/ErrorResponse" + } + } + } + }, + "401": { + "description": "Authentication failed", + "content": { + "application/json": { + "schema": { + "$ref": "#/components/schemas/ErrorResponse" + } + } + } + }, + "404": { + "description": "Not Found", + "content": { + "application/json": { + "schema": { + "$ref": "#/components/schemas/NotFoundResponse" + } + } + } + }, + "200": { + "description": "successful operation", + "content": { + "application/json": { + "schema": { + "$ref": "#/components/schemas/AssignmentResponse" + } + } + } + } + }, + "security": [ + { + "bearerAuth": [ + [ + "permAgentAssignmentRead" + ] + ] + } + ], + "description": "GET request for for a to-one relationship link. Returns the resource record of the object that is part of the specified relation.", + "parameters": [ + { + "name": "id", + "in": "path", + "required": true, + "schema": { + "type": "integer", + "format": "int32", + "example": 10 + } + }, + { + "name": "include", + "in": "query", + "schema": { + "type": "string" + }, + "description": "Items to include. Comma seperated" + } + ] + }, + "patch": { + "tags": [ + "Assignments" + ], + "responses": { + "400": { + "description": "Invalid request", + "content": { + "application/json": { + "schema": { + "$ref": "#/components/schemas/ErrorResponse" + } + } + } + }, + "401": { + "description": "Authentication failed", + "content": { + "application/json": { + "schema": { + "$ref": "#/components/schemas/ErrorResponse" + } + } + } + }, + "404": { + "description": "Not Found", + "content": { + "application/json": { + "schema": { + "$ref": "#/components/schemas/NotFoundResponse" + } + } + } + }, + "200": { + "description": "successful operation", + "content": { + "application/json": { + "schema": { + "$ref": "#/components/schemas/AssignmentPostPatchResponse" + } + } + } + } + }, + "security": [ + { + "bearerAuth": [ + [ + "permAgentAssignmentUpdate" + ] + ] + } + ], + "description": "", + "requestBody": { + "required": true, + "content": { + "application/json": { + "schema": { + "$ref": "#/components/schemas/AssignmentPatch" + } + } + } + }, + "parameters": [] + } + }, + "/api/v2/ui/agentassignments/{id:[0-9]+}/{relation:task}": { + "get": { + "tags": [ + "Assignments" + ], + "responses": { + "400": { + "description": "Invalid request", + "content": { + "application/json": { + "schema": { + "$ref": "#/components/schemas/ErrorResponse" + } + } + } + }, + "401": { + "description": "Authentication failed", + "content": { + "application/json": { + "schema": { + "$ref": "#/components/schemas/ErrorResponse" + } + } + } + }, + "404": { + "description": "Not Found", + "content": { + "application/json": { + "schema": { + "$ref": "#/components/schemas/NotFoundResponse" + } + } + } + }, + "200": { + "description": "successful operation", + "content": { + "application/json": { + "schema": { + "$ref": "#/components/schemas/AssignmentResponse" + } + } + } + } + }, + "security": [ + { + "bearerAuth": [ + [ + "permAgentAssignmentRead" + ] + ] + } + ], + "description": "GET request for for a to-one relationship link. Returns the resource record of the object that is part of the specified relation.", + "parameters": [ + { + "name": "id", + "in": "path", + "required": true, + "schema": { + "type": "integer", + "format": "int32", + "example": 10 + } + }, + { + "name": "include", + "in": "query", + "schema": { + "type": "string" + }, + "description": "Items to include. Comma seperated" + } + ] + } + }, + "/api/v2/ui/agentassignments/{id:[0-9]+}/relationships/{relation:task}": { + "get": { + "tags": [ + "Assignments" + ], + "responses": { + "400": { + "description": "Invalid request", + "content": { + "application/json": { + "schema": { + "$ref": "#/components/schemas/ErrorResponse" + } + } + } + }, + "401": { + "description": "Authentication failed", + "content": { + "application/json": { + "schema": { + "$ref": "#/components/schemas/ErrorResponse" + } + } + } + }, + "404": { + "description": "Not Found", + "content": { + "application/json": { + "schema": { + "$ref": "#/components/schemas/NotFoundResponse" + } + } + } + }, + "200": { + "description": "successful operation", + "content": { + "application/json": { + "schema": { + "$ref": "#/components/schemas/AssignmentResponse" + } + } + } + } + }, + "security": [ + { + "bearerAuth": [ + [ + "permAgentAssignmentRead" + ] + ] + } + ], + "description": "GET request for for a to-one relationship link. Returns the resource record of the object that is part of the specified relation.", + "parameters": [ + { + "name": "id", + "in": "path", + "required": true, + "schema": { + "type": "integer", + "format": "int32", + "example": 10 + } + }, + { + "name": "include", + "in": "query", + "schema": { + "type": "string" + }, + "description": "Items to include. Comma seperated" + } + ] + }, + "patch": { + "tags": [ + "Assignments" + ], + "responses": { + "400": { + "description": "Invalid request", + "content": { + "application/json": { + "schema": { + "$ref": "#/components/schemas/ErrorResponse" + } + } + } + }, + "401": { + "description": "Authentication failed", + "content": { + "application/json": { + "schema": { + "$ref": "#/components/schemas/ErrorResponse" + } + } + } + }, + "404": { + "description": "Not Found", + "content": { + "application/json": { + "schema": { + "$ref": "#/components/schemas/NotFoundResponse" + } + } + } + }, + "200": { + "description": "successful operation", + "content": { + "application/json": { + "schema": { + "$ref": "#/components/schemas/AssignmentPostPatchResponse" + } + } + } + } + }, + "security": [ + { + "bearerAuth": [ + [ + "permAgentAssignmentUpdate" + ] + ] + } + ], + "description": "", + "requestBody": { + "required": true, + "content": { + "application/json": { + "schema": { + "$ref": "#/components/schemas/AssignmentPatch" + } + } + } + }, + "parameters": [] + } + }, + "/api/v2/ui/agentassignments/{id:[0-9]+}": { + "get": { + "tags": [ + "Assignments" + ], + "responses": { + "400": { + "description": "Invalid request", + "content": { + "application/json": { + "schema": { + "$ref": "#/components/schemas/ErrorResponse" + } + } + } + }, + "401": { + "description": "Authentication failed", + "content": { + "application/json": { + "schema": { + "$ref": "#/components/schemas/ErrorResponse" + } + } + } + }, + "404": { + "description": "Not Found", + "content": { + "application/json": { + "schema": { + "$ref": "#/components/schemas/NotFoundResponse" + } + } + } + }, + "200": { + "description": "successful operation", + "content": { + "application/json": { + "schema": { + "$ref": "#/components/schemas/AssignmentResponse" + } + } + } + } + }, + "security": [ + { + "bearerAuth": [ + [ + "permAgentAssignmentRead" + ] + ] + } + ], + "description": "GET request to retrieve a single object.", + "parameters": [ + { + "name": "id", + "in": "path", + "required": true, + "schema": { + "type": "integer", + "format": "int32", + "example": 10 + } + }, + { + "name": "include", + "in": "query", + "schema": { + "type": "string" + }, + "description": "Items to include. Comma seperated" + } + ] + }, + "delete": { + "tags": [ + "Assignments" + ], + "responses": { + "400": { + "description": "Invalid request", + "content": { + "application/json": { + "schema": { + "$ref": "#/components/schemas/ErrorResponse" + } + } + } + }, + "401": { + "description": "Authentication failed", + "content": { + "application/json": { + "schema": { + "$ref": "#/components/schemas/ErrorResponse" + } + } + } + }, + "404": { + "description": "Not Found", + "content": { + "application/json": { + "schema": { + "$ref": "#/components/schemas/NotFoundResponse" + } + } + } + }, + "204": { + "description": "successfully deleted" + } + }, + "security": [ + { + "bearerAuth": [ + [ + "permAgentAssignmentDelete" + ] + ] + } + ], + "description": "", + "requestBody": { + "required": true, + "content": { + "application/json": [] + } + }, + "parameters": [] + } + }, + "/api/v2/ui/agentbinaries": { + "get": { + "tags": [ + "AgentBinarys" + ], + "responses": { + "400": { + "description": "Invalid request", + "content": { + "application/json": { + "schema": { + "$ref": "#/components/schemas/ErrorResponse" + } + } + } + }, + "401": { + "description": "Authentication failed", + "content": { + "application/json": { + "schema": { + "$ref": "#/components/schemas/ErrorResponse" + } + } + } + }, + "200": { + "description": "successful operation", + "content": { + "application/json": { + "schema": { + "type": "array", + "items": { + "$ref": "#/components/schemas/AgentBinaryResponse" + } + } + } + } + } + }, + "security": [ + { + "bearerAuth": [ + [ + "permAgentBinaryRead" + ] + ] + } + ], + "description": "GET many request to retrieve multiple objects.", + "parameters": [ + { + "name": "page[after]", + "in": "query", + "schema": { + "type": "integer", + "format": "int32" + }, + "example": 0, + "description": "Pointer to paginate to retrieve the data after the value provided" + }, + { + "name": "page[before]", + "in": "query", + "schema": { + "type": "integer", + "format": "int32" + }, + "example": 0, + "description": "Pointer to paginate to retrieve the data before the value provided" + }, + { + "name": "page[size]", + "in": "query", + "schema": { + "type": "integer", + "format": "int32" + }, + "example": 100, + "description": "Amout of data to retrieve inside a single page" + }, + { + "name": "filter", + "in": "query", + "style": "deepobject", + "explode": true, + "schema": { + "type": "object" + }, + "description": "Filters results using a query", + "example": "\"filter[hashlistId__gt]\": 200" + }, + { + "name": "include", + "in": "query", + "schema": { + "type": "string" + }, + "description": "Items to include, comma seperated. Possible options: " + } + ] + }, + "post": { + "tags": [ + "AgentBinarys" + ], + "responses": { + "400": { + "description": "Invalid request", + "content": { + "application/json": { + "schema": { + "$ref": "#/components/schemas/ErrorResponse" + } + } + } + }, + "401": { + "description": "Authentication failed", + "content": { + "application/json": { + "schema": { + "$ref": "#/components/schemas/ErrorResponse" + } + } + } + }, + "201": { + "description": "successful operation", + "content": { + "application/json": { + "schema": { + "$ref": "#/components/schemas/AgentBinaryPostPatchResponse" + } + } + } + } + }, + "security": [ + { + "bearerAuth": [ + [ + "permAgentBinaryCreate" + ] + ] + } + ], + "description": "POST request to create a new object. The request must contain the resource record as data with the attributes of the new object.To add relationships, a relationships object can be added with the resource records of the relations that are part of this object.", + "requestBody": { + "required": true, + "content": { + "application/json": { + "schema": { + "$ref": "#/components/schemas/AgentBinaryCreate" + } + } + } + }, + "parameters": [] + } + }, + "/api/v2/ui/agentbinaries/count": { + "get": { + "tags": [ + "AgentBinarys" + ], + "responses": { + "400": { + "description": "Invalid request", + "content": { + "application/json": { + "schema": { + "$ref": "#/components/schemas/ErrorResponse" + } + } + } + }, + "401": { + "description": "Authentication failed", + "content": { + "application/json": { + "schema": { + "$ref": "#/components/schemas/ErrorResponse" + } + } + } + }, + "200": { + "description": "successful operation", + "content": { + "application/json": { + "schema": { + "type": "array", + "items": { + "$ref": "#/components/schemas/AgentBinaryResponse" + } + } + } + } + } + }, + "security": [ + { + "bearerAuth": [ + [ + "permAgentBinaryRead" + ] + ] + } + ], + "description": "GET many request to retrieve multiple objects.", + "parameters": [ + { + "name": "page[after]", + "in": "query", + "schema": { + "type": "integer", + "format": "int32" + }, + "example": 0, + "description": "Pointer to paginate to retrieve the data after the value provided" + }, + { + "name": "page[before]", + "in": "query", + "schema": { + "type": "integer", + "format": "int32" + }, + "example": 0, + "description": "Pointer to paginate to retrieve the data before the value provided" + }, + { + "name": "page[size]", + "in": "query", + "schema": { + "type": "integer", + "format": "int32" + }, + "example": 100, + "description": "Amout of data to retrieve inside a single page" + }, + { + "name": "filter", + "in": "query", + "style": "deepobject", + "explode": true, + "schema": { + "type": "object" + }, + "description": "Filters results using a query", + "example": "\"filter[hashlistId__gt]\": 200" + }, + { + "name": "include", + "in": "query", + "schema": { + "type": "string" + }, + "description": "Items to include, comma seperated. Possible options: " + } + ] + } + }, + "/api/v2/ui/agentbinaries/{id:[0-9]+}": { + "get": { + "tags": [ + "AgentBinarys" + ], + "responses": { + "400": { + "description": "Invalid request", + "content": { + "application/json": { + "schema": { + "$ref": "#/components/schemas/ErrorResponse" + } + } + } + }, + "401": { + "description": "Authentication failed", + "content": { + "application/json": { + "schema": { + "$ref": "#/components/schemas/ErrorResponse" + } + } + } + }, + "404": { + "description": "Not Found", + "content": { + "application/json": { + "schema": { + "$ref": "#/components/schemas/NotFoundResponse" + } + } + } + }, + "200": { + "description": "successful operation", + "content": { + "application/json": { + "schema": { + "$ref": "#/components/schemas/AgentBinaryResponse" + } + } + } + } + }, + "security": [ + { + "bearerAuth": [ + [ + "permAgentBinaryRead" + ] + ] + } + ], + "description": "GET request to retrieve a single object.", + "parameters": [ + { + "name": "id", + "in": "path", + "required": true, + "schema": { + "type": "integer", + "format": "int32", + "example": 10 + } + }, + { + "name": "include", + "in": "query", + "schema": { + "type": "string" + }, + "description": "Items to include. Comma seperated" + } + ] + }, + "patch": { + "tags": [ + "AgentBinarys" + ], + "responses": { + "400": { + "description": "Invalid request", + "content": { + "application/json": { + "schema": { + "$ref": "#/components/schemas/ErrorResponse" + } + } + } + }, + "401": { + "description": "Authentication failed", + "content": { + "application/json": { + "schema": { + "$ref": "#/components/schemas/ErrorResponse" + } + } + } + }, + "404": { + "description": "Not Found", + "content": { + "application/json": { + "schema": { + "$ref": "#/components/schemas/NotFoundResponse" + } + } + } + }, + "200": { + "description": "successful operation", + "content": { + "application/json": { + "schema": { + "$ref": "#/components/schemas/AgentBinaryPostPatchResponse" + } + } + } + } + }, + "security": [ + { + "bearerAuth": [ + [ + "permAgentBinaryUpdate" + ] + ] + } + ], + "description": "PATCH request to update attributes of a single object.", + "requestBody": { + "required": true, + "content": { + "application/json": { + "schema": { + "$ref": "#/components/schemas/AgentBinaryPatch" + } + } + } + }, + "parameters": [] + }, + "delete": { + "tags": [ + "AgentBinarys" + ], + "responses": { + "400": { + "description": "Invalid request", + "content": { + "application/json": { + "schema": { + "$ref": "#/components/schemas/ErrorResponse" + } + } + } + }, + "401": { + "description": "Authentication failed", + "content": { + "application/json": { + "schema": { + "$ref": "#/components/schemas/ErrorResponse" + } + } + } + }, + "404": { + "description": "Not Found", + "content": { + "application/json": { + "schema": { + "$ref": "#/components/schemas/NotFoundResponse" + } + } + } + }, + "204": { + "description": "successfully deleted" + } + }, + "security": [ + { + "bearerAuth": [ + [ + "permAgentBinaryDelete" + ] + ] + } + ], + "description": "", + "requestBody": { + "required": true, + "content": { + "application/json": [] + } + }, + "parameters": [] + } + }, + "/api/v2/ui/agents": { + "get": { + "tags": [ + "Agents" + ], + "responses": { + "400": { + "description": "Invalid request", + "content": { + "application/json": { + "schema": { + "$ref": "#/components/schemas/ErrorResponse" + } + } + } + }, + "401": { + "description": "Authentication failed", + "content": { + "application/json": { + "schema": { + "$ref": "#/components/schemas/ErrorResponse" + } + } + } + }, + "200": { + "description": "successful operation", + "content": { + "application/json": { + "schema": { + "type": "array", + "items": { + "$ref": "#/components/schemas/AgentResponse" + } + } + } + } + } + }, + "security": [ + { + "bearerAuth": [ + [ + "permAgentRead" + ] + ] + } + ], + "description": "GET many request to retrieve multiple objects.", + "parameters": [ + { + "name": "page[after]", + "in": "query", + "schema": { + "type": "integer", + "format": "int32" + }, + "example": 0, + "description": "Pointer to paginate to retrieve the data after the value provided" + }, + { + "name": "page[before]", + "in": "query", + "schema": { + "type": "integer", + "format": "int32" + }, + "example": 0, + "description": "Pointer to paginate to retrieve the data before the value provided" + }, + { + "name": "page[size]", + "in": "query", + "schema": { + "type": "integer", + "format": "int32" + }, + "example": 100, + "description": "Amout of data to retrieve inside a single page" + }, + { + "name": "filter", + "in": "query", + "style": "deepobject", + "explode": true, + "schema": { + "type": "object" + }, + "description": "Filters results using a query", + "example": "\"filter[hashlistId__gt]\": 200" + }, + { + "name": "include", + "in": "query", + "schema": { + "type": "string" + }, + "description": "Items to include, comma seperated. Possible options: accessGroups,agentStats" + } + ] + } + }, + "/api/v2/ui/agents/count": { + "get": { + "tags": [ + "Agents" + ], + "responses": { + "400": { + "description": "Invalid request", + "content": { + "application/json": { + "schema": { + "$ref": "#/components/schemas/ErrorResponse" + } + } + } + }, + "401": { + "description": "Authentication failed", + "content": { + "application/json": { + "schema": { + "$ref": "#/components/schemas/ErrorResponse" + } + } + } + }, + "200": { + "description": "successful operation", + "content": { + "application/json": { + "schema": { + "type": "array", + "items": { + "$ref": "#/components/schemas/AgentResponse" + } + } + } + } + } + }, + "security": [ + { + "bearerAuth": [ + [ + "permAgentRead" + ] + ] + } + ], + "description": "GET many request to retrieve multiple objects.", + "parameters": [ + { + "name": "page[after]", + "in": "query", + "schema": { + "type": "integer", + "format": "int32" + }, + "example": 0, + "description": "Pointer to paginate to retrieve the data after the value provided" + }, + { + "name": "page[before]", + "in": "query", + "schema": { + "type": "integer", + "format": "int32" + }, + "example": 0, + "description": "Pointer to paginate to retrieve the data before the value provided" + }, + { + "name": "page[size]", + "in": "query", + "schema": { + "type": "integer", + "format": "int32" + }, + "example": 100, + "description": "Amout of data to retrieve inside a single page" + }, + { + "name": "filter", + "in": "query", + "style": "deepobject", + "explode": true, + "schema": { + "type": "object" + }, + "description": "Filters results using a query", + "example": "\"filter[hashlistId__gt]\": 200" + }, + { + "name": "include", + "in": "query", + "schema": { + "type": "string" + }, + "description": "Items to include, comma seperated. Possible options: accessGroups,agentStats" + } + ] + } + }, + "/api/v2/ui/agents/{id:[0-9]+}/{relation:accessGroups}": { + "get": { + "tags": [ + "Agents" + ], + "responses": { + "400": { + "description": "Invalid request", + "content": { + "application/json": { + "schema": { + "$ref": "#/components/schemas/ErrorResponse" + } + } + } + }, + "401": { + "description": "Authentication failed", + "content": { + "application/json": { + "schema": { + "$ref": "#/components/schemas/ErrorResponse" + } + } + } + }, + "404": { + "description": "Not Found", + "content": { + "application/json": { + "schema": { + "$ref": "#/components/schemas/NotFoundResponse" + } + } + } + }, + "200": { + "description": "successful operation", + "content": { + "application/json": { + "schema": { + "$ref": "#/components/schemas/AgentResponse" + } + } + } + } + }, + "security": [ + { + "bearerAuth": [ + [ + "permAgentRead" + ] + ] + } + ], + "description": "GET request for for a to-one relationship link. Returns the resource record of the object that is part of the specified relation.", + "parameters": [ + { + "name": "id", + "in": "path", + "required": true, + "schema": { + "type": "integer", + "format": "int32", + "example": 10 + } + }, + { + "name": "include", + "in": "query", + "schema": { + "type": "string" + }, + "description": "Items to include. Comma seperated" + } + ] + } + }, + "/api/v2/ui/agents/{id:[0-9]+}/relationships/{relation:accessGroups}": { + "get": { + "tags": [ + "Agents" + ], + "responses": { + "400": { + "description": "Invalid request", + "content": { + "application/json": { + "schema": { + "$ref": "#/components/schemas/ErrorResponse" + } + } + } + }, + "401": { + "description": "Authentication failed", + "content": { + "application/json": { + "schema": { + "$ref": "#/components/schemas/ErrorResponse" + } + } + } + }, + "404": { + "description": "Not Found", + "content": { + "application/json": { + "schema": { + "$ref": "#/components/schemas/NotFoundResponse" + } + } + } + }, + "200": { + "description": "successful operation", + "content": { + "application/json": { + "schema": { + "$ref": "#/components/schemas/AgentResponse" + } + } + } + } + }, + "security": [ + { + "bearerAuth": [ + [ + "permAgentRead" + ] + ] + } + ], + "description": "GET request for for a to-one relationship link. Returns the resource record of the object that is part of the specified relation.", + "parameters": [ + { + "name": "id", + "in": "path", + "required": true, + "schema": { + "type": "integer", + "format": "int32", + "example": 10 + } + }, + { + "name": "include", + "in": "query", + "schema": { + "type": "string" + }, + "description": "Items to include. Comma seperated" + } + ] + }, + "patch": { + "tags": [ + "Agents" + ], + "responses": { + "400": { + "description": "Invalid request", + "content": { + "application/json": { + "schema": { + "$ref": "#/components/schemas/ErrorResponse" + } + } + } + }, + "401": { + "description": "Authentication failed", + "content": { + "application/json": { + "schema": { + "$ref": "#/components/schemas/ErrorResponse" + } + } + } + }, + "404": { + "description": "Not Found", + "content": { + "application/json": { + "schema": { + "$ref": "#/components/schemas/NotFoundResponse" + } + } + } + }, + "200": { + "description": "successful operation", + "content": { + "application/json": { + "schema": { + "$ref": "#/components/schemas/AgentPostPatchResponse" + } + } + } + } + }, + "security": [ + { + "bearerAuth": [ + [ + "permAgentUpdate" + ] + ] + } + ], + "description": "", + "requestBody": { + "required": true, + "content": { + "application/json": { + "schema": { + "$ref": "#/components/schemas/AgentPatch" + } + } + } + }, + "parameters": [] + }, + "post": { + "tags": [ + "Agents" + ], + "responses": { + "400": { + "description": "Invalid request", + "content": { + "application/json": { + "schema": { + "$ref": "#/components/schemas/ErrorResponse" + } + } + } + }, + "401": { + "description": "Authentication failed", + "content": { + "application/json": { + "schema": { + "$ref": "#/components/schemas/ErrorResponse" + } + } + } + }, + "404": { + "description": "Not Found", + "content": { + "application/json": { + "schema": { + "$ref": "#/components/schemas/NotFoundResponse" + } + } + } + }, + "204": { + "description": "successfully created" + } + }, + "security": [ + { + "bearerAuth": [ + [ + "permAgentCreate" + ] + ] + } + ], + "description": "", + "requestBody": { + "required": true, + "content": { + "application/json": [] + } + }, + "parameters": [] + }, + "delete": { + "tags": [ + "Agents" + ], + "responses": { + "400": { + "description": "Invalid request", + "content": { + "application/json": { + "schema": { + "$ref": "#/components/schemas/ErrorResponse" + } + } + } + }, + "401": { + "description": "Authentication failed", + "content": { + "application/json": { + "schema": { + "$ref": "#/components/schemas/ErrorResponse" + } + } + } + }, + "404": { + "description": "Not Found", + "content": { + "application/json": { + "schema": { + "$ref": "#/components/schemas/NotFoundResponse" + } + } + } + }, + "204": { + "description": "successfully deleted" + } + }, + "security": [ + { + "bearerAuth": [ + [ + "permAgentDelete" + ] + ] + } + ], + "description": "", + "requestBody": { + "required": true, + "content": { + "application/json": [] + } + }, + "parameters": [] + } + }, + "/api/v2/ui/agents/{id:[0-9]+}/{relation:agentStats}": { + "get": { + "tags": [ + "Agents" + ], + "responses": { + "400": { + "description": "Invalid request", + "content": { + "application/json": { + "schema": { + "$ref": "#/components/schemas/ErrorResponse" + } + } + } + }, + "401": { + "description": "Authentication failed", + "content": { + "application/json": { + "schema": { + "$ref": "#/components/schemas/ErrorResponse" + } + } + } + }, + "404": { + "description": "Not Found", + "content": { + "application/json": { + "schema": { + "$ref": "#/components/schemas/NotFoundResponse" + } + } + } + }, + "200": { + "description": "successful operation", + "content": { + "application/json": { + "schema": { + "$ref": "#/components/schemas/AgentResponse" + } + } + } + } + }, + "security": [ + { + "bearerAuth": [ + [ + "permAgentRead" + ] + ] + } + ], + "description": "GET request for for a to-one relationship link. Returns the resource record of the object that is part of the specified relation.", + "parameters": [ + { + "name": "id", + "in": "path", + "required": true, + "schema": { + "type": "integer", + "format": "int32", + "example": 10 + } + }, + { + "name": "include", + "in": "query", + "schema": { + "type": "string" + }, + "description": "Items to include. Comma seperated" + } + ] + } + }, + "/api/v2/ui/agents/{id:[0-9]+}/relationships/{relation:agentStats}": { + "get": { + "tags": [ + "Agents" + ], + "responses": { + "400": { + "description": "Invalid request", + "content": { + "application/json": { + "schema": { + "$ref": "#/components/schemas/ErrorResponse" + } + } + } + }, + "401": { + "description": "Authentication failed", + "content": { + "application/json": { + "schema": { + "$ref": "#/components/schemas/ErrorResponse" + } + } + } + }, + "404": { + "description": "Not Found", + "content": { + "application/json": { + "schema": { + "$ref": "#/components/schemas/NotFoundResponse" + } + } + } + }, + "200": { + "description": "successful operation", + "content": { + "application/json": { + "schema": { + "$ref": "#/components/schemas/AgentResponse" + } + } + } + } + }, + "security": [ + { + "bearerAuth": [ + [ + "permAgentRead" + ] + ] + } + ], + "description": "GET request for for a to-one relationship link. Returns the resource record of the object that is part of the specified relation.", + "parameters": [ + { + "name": "id", + "in": "path", + "required": true, + "schema": { + "type": "integer", + "format": "int32", + "example": 10 + } + }, + { + "name": "include", + "in": "query", + "schema": { + "type": "string" + }, + "description": "Items to include. Comma seperated" + } + ] + }, + "patch": { + "tags": [ + "Agents" + ], + "responses": { + "400": { + "description": "Invalid request", + "content": { + "application/json": { + "schema": { + "$ref": "#/components/schemas/ErrorResponse" + } + } + } + }, + "401": { + "description": "Authentication failed", + "content": { + "application/json": { + "schema": { + "$ref": "#/components/schemas/ErrorResponse" + } + } + } + }, + "404": { + "description": "Not Found", + "content": { + "application/json": { + "schema": { + "$ref": "#/components/schemas/NotFoundResponse" + } + } + } + }, + "200": { + "description": "successful operation", + "content": { + "application/json": { + "schema": { + "$ref": "#/components/schemas/AgentPostPatchResponse" + } + } + } + } + }, + "security": [ + { + "bearerAuth": [ + [ + "permAgentUpdate" + ] + ] + } + ], + "description": "", + "requestBody": { + "required": true, + "content": { + "application/json": { + "schema": { + "$ref": "#/components/schemas/AgentPatch" + } + } + } + }, + "parameters": [] + }, + "post": { + "tags": [ + "Agents" + ], + "responses": { + "400": { + "description": "Invalid request", + "content": { + "application/json": { + "schema": { + "$ref": "#/components/schemas/ErrorResponse" + } + } + } + }, + "401": { + "description": "Authentication failed", + "content": { + "application/json": { + "schema": { + "$ref": "#/components/schemas/ErrorResponse" + } + } + } + }, + "404": { + "description": "Not Found", + "content": { + "application/json": { + "schema": { + "$ref": "#/components/schemas/NotFoundResponse" + } + } + } + }, + "204": { + "description": "successfully created" + } + }, + "security": [ + { + "bearerAuth": [ + [ + "permAgentCreate" + ] + ] + } + ], + "description": "", + "requestBody": { + "required": true, + "content": { + "application/json": [] + } + }, + "parameters": [] + }, + "delete": { + "tags": [ + "Agents" + ], + "responses": { + "400": { + "description": "Invalid request", + "content": { + "application/json": { + "schema": { + "$ref": "#/components/schemas/ErrorResponse" + } + } + } + }, + "401": { + "description": "Authentication failed", + "content": { + "application/json": { + "schema": { + "$ref": "#/components/schemas/ErrorResponse" + } + } + } + }, + "404": { + "description": "Not Found", + "content": { + "application/json": { + "schema": { + "$ref": "#/components/schemas/NotFoundResponse" + } + } + } + }, + "204": { + "description": "successfully deleted" + } + }, + "security": [ + { + "bearerAuth": [ + [ + "permAgentDelete" + ] + ] + } + ], + "description": "", + "requestBody": { + "required": true, + "content": { + "application/json": [] + } + }, + "parameters": [] + } + }, + "/api/v2/ui/agents/{id:[0-9]+}": { + "get": { + "tags": [ + "Agents" + ], + "responses": { + "400": { + "description": "Invalid request", + "content": { + "application/json": { + "schema": { + "$ref": "#/components/schemas/ErrorResponse" + } + } + } + }, + "401": { + "description": "Authentication failed", + "content": { + "application/json": { + "schema": { + "$ref": "#/components/schemas/ErrorResponse" + } + } + } + }, + "404": { + "description": "Not Found", + "content": { + "application/json": { + "schema": { + "$ref": "#/components/schemas/NotFoundResponse" + } + } + } + }, + "200": { + "description": "successful operation", + "content": { + "application/json": { + "schema": { + "$ref": "#/components/schemas/AgentResponse" + } + } + } + } + }, + "security": [ + { + "bearerAuth": [ + [ + "permAgentRead" + ] + ] + } + ], + "description": "GET request to retrieve a single object.", + "parameters": [ + { + "name": "id", + "in": "path", + "required": true, + "schema": { + "type": "integer", + "format": "int32", + "example": 10 + } + }, + { + "name": "include", + "in": "query", + "schema": { + "type": "string" + }, + "description": "Items to include. Comma seperated" + } + ] + }, + "patch": { + "tags": [ + "Agents" + ], + "responses": { + "400": { + "description": "Invalid request", + "content": { + "application/json": { + "schema": { + "$ref": "#/components/schemas/ErrorResponse" + } + } + } + }, + "401": { + "description": "Authentication failed", + "content": { + "application/json": { + "schema": { + "$ref": "#/components/schemas/ErrorResponse" + } + } + } + }, + "404": { + "description": "Not Found", + "content": { + "application/json": { + "schema": { + "$ref": "#/components/schemas/NotFoundResponse" + } + } + } + }, + "200": { + "description": "successful operation", + "content": { + "application/json": { + "schema": { + "$ref": "#/components/schemas/AgentPostPatchResponse" + } + } + } + } + }, + "security": [ + { + "bearerAuth": [ + [ + "permAgentUpdate" + ] + ] + } + ], + "description": "PATCH request to update attributes of a single object.", + "requestBody": { + "required": true, + "content": { + "application/json": { + "schema": { + "$ref": "#/components/schemas/AgentPatch" + } + } + } + }, + "parameters": [] + }, + "delete": { + "tags": [ + "Agents" + ], + "responses": { + "400": { + "description": "Invalid request", + "content": { + "application/json": { + "schema": { + "$ref": "#/components/schemas/ErrorResponse" + } + } + } + }, + "401": { + "description": "Authentication failed", + "content": { + "application/json": { + "schema": { + "$ref": "#/components/schemas/ErrorResponse" + } + } + } + }, + "404": { + "description": "Not Found", + "content": { + "application/json": { + "schema": { + "$ref": "#/components/schemas/NotFoundResponse" + } + } + } + }, + "204": { + "description": "successfully deleted" + } + }, + "security": [ + { + "bearerAuth": [ + [ + "permAgentDelete" + ] + ] + } + ], + "description": "", + "requestBody": { + "required": true, + "content": { + "application/json": [] + } + }, + "parameters": [] + } + }, + "/api/v2/ui/agentstats": { + "get": { + "tags": [ + "AgentStats" + ], + "responses": { + "400": { + "description": "Invalid request", + "content": { + "application/json": { + "schema": { + "$ref": "#/components/schemas/ErrorResponse" + } + } + } + }, + "401": { + "description": "Authentication failed", + "content": { + "application/json": { + "schema": { + "$ref": "#/components/schemas/ErrorResponse" + } + } + } + }, + "200": { + "description": "successful operation", + "content": { + "application/json": { + "schema": { + "type": "array", + "items": { + "$ref": "#/components/schemas/AgentStatResponse" + } + } + } + } + } + }, + "security": [ + { + "bearerAuth": [ + [ + "permAgentStatRead" + ] + ] + } + ], + "description": "GET many request to retrieve multiple objects.", + "parameters": [ + { + "name": "page[after]", + "in": "query", + "schema": { + "type": "integer", + "format": "int32" + }, + "example": 0, + "description": "Pointer to paginate to retrieve the data after the value provided" + }, + { + "name": "page[before]", + "in": "query", + "schema": { + "type": "integer", + "format": "int32" + }, + "example": 0, + "description": "Pointer to paginate to retrieve the data before the value provided" + }, + { + "name": "page[size]", + "in": "query", + "schema": { + "type": "integer", + "format": "int32" + }, + "example": 100, + "description": "Amout of data to retrieve inside a single page" + }, + { + "name": "filter", + "in": "query", + "style": "deepobject", + "explode": true, + "schema": { + "type": "object" + }, + "description": "Filters results using a query", + "example": "\"filter[hashlistId__gt]\": 200" + }, + { + "name": "include", + "in": "query", + "schema": { + "type": "string" + }, + "description": "Items to include, comma seperated. Possible options: " + } + ] + } + }, + "/api/v2/ui/agentstats/count": { + "get": { + "tags": [ + "AgentStats" + ], + "responses": { + "400": { + "description": "Invalid request", + "content": { + "application/json": { + "schema": { + "$ref": "#/components/schemas/ErrorResponse" + } + } + } + }, + "401": { + "description": "Authentication failed", + "content": { + "application/json": { + "schema": { + "$ref": "#/components/schemas/ErrorResponse" + } + } + } + }, + "200": { + "description": "successful operation", + "content": { + "application/json": { + "schema": { + "type": "array", + "items": { + "$ref": "#/components/schemas/AgentStatResponse" + } + } + } + } + } + }, + "security": [ + { + "bearerAuth": [ + [ + "permAgentStatRead" + ] + ] + } + ], + "description": "GET many request to retrieve multiple objects.", + "parameters": [ + { + "name": "page[after]", + "in": "query", + "schema": { + "type": "integer", + "format": "int32" + }, + "example": 0, + "description": "Pointer to paginate to retrieve the data after the value provided" + }, + { + "name": "page[before]", + "in": "query", + "schema": { + "type": "integer", + "format": "int32" + }, + "example": 0, + "description": "Pointer to paginate to retrieve the data before the value provided" + }, + { + "name": "page[size]", + "in": "query", + "schema": { + "type": "integer", + "format": "int32" + }, + "example": 100, + "description": "Amout of data to retrieve inside a single page" + }, + { + "name": "filter", + "in": "query", + "style": "deepobject", + "explode": true, + "schema": { + "type": "object" + }, + "description": "Filters results using a query", + "example": "\"filter[hashlistId__gt]\": 200" + }, + { + "name": "include", + "in": "query", + "schema": { + "type": "string" + }, + "description": "Items to include, comma seperated. Possible options: " + } + ] + } + }, + "/api/v2/ui/agentstats/{id:[0-9]+}": { + "get": { + "tags": [ + "AgentStats" + ], + "responses": { + "400": { + "description": "Invalid request", + "content": { + "application/json": { + "schema": { + "$ref": "#/components/schemas/ErrorResponse" + } + } + } + }, + "401": { + "description": "Authentication failed", + "content": { + "application/json": { + "schema": { + "$ref": "#/components/schemas/ErrorResponse" + } + } + } + }, + "404": { + "description": "Not Found", + "content": { + "application/json": { + "schema": { + "$ref": "#/components/schemas/NotFoundResponse" + } + } + } + }, + "200": { + "description": "successful operation", + "content": { + "application/json": { + "schema": { + "$ref": "#/components/schemas/AgentStatResponse" + } + } + } + } + }, + "security": [ + { + "bearerAuth": [ + [ + "permAgentStatRead" + ] + ] + } + ], + "description": "GET request to retrieve a single object.", + "parameters": [ + { + "name": "id", + "in": "path", + "required": true, + "schema": { + "type": "integer", + "format": "int32", + "example": 10 + } + }, + { + "name": "include", + "in": "query", + "schema": { + "type": "string" + }, + "description": "Items to include. Comma seperated" + } + ] + }, + "delete": { + "tags": [ + "AgentStats" + ], + "responses": { + "400": { + "description": "Invalid request", + "content": { + "application/json": { + "schema": { + "$ref": "#/components/schemas/ErrorResponse" + } + } + } + }, + "401": { + "description": "Authentication failed", + "content": { + "application/json": { + "schema": { + "$ref": "#/components/schemas/ErrorResponse" + } + } + } + }, + "404": { + "description": "Not Found", + "content": { + "application/json": { + "schema": { + "$ref": "#/components/schemas/NotFoundResponse" + } + } + } + }, + "204": { + "description": "successfully deleted" + } + }, + "security": [ + { + "bearerAuth": [ + [ + "permAgentStatDelete" + ] + ] + } + ], + "description": "", + "requestBody": { + "required": true, + "content": { + "application/json": [] + } + }, + "parameters": [] + } + }, + "/api/v2/ui/chunks": { + "get": { + "tags": [ + "Chunks" + ], + "responses": { + "400": { + "description": "Invalid request", + "content": { + "application/json": { + "schema": { + "$ref": "#/components/schemas/ErrorResponse" + } + } + } + }, + "401": { + "description": "Authentication failed", + "content": { + "application/json": { + "schema": { + "$ref": "#/components/schemas/ErrorResponse" + } + } + } + }, + "200": { + "description": "successful operation", + "content": { + "application/json": { + "schema": { + "type": "array", + "items": { + "$ref": "#/components/schemas/ChunkResponse" + } + } + } + } + } + }, + "security": [ + { + "bearerAuth": [ + [ + "permChunkRead" + ] + ] + } + ], + "description": "GET many request to retrieve multiple objects.", + "parameters": [ + { + "name": "page[after]", + "in": "query", + "schema": { + "type": "integer", + "format": "int32" + }, + "example": 0, + "description": "Pointer to paginate to retrieve the data after the value provided" + }, + { + "name": "page[before]", + "in": "query", + "schema": { + "type": "integer", + "format": "int32" + }, + "example": 0, + "description": "Pointer to paginate to retrieve the data before the value provided" + }, + { + "name": "page[size]", + "in": "query", + "schema": { + "type": "integer", + "format": "int32" + }, + "example": 100, + "description": "Amout of data to retrieve inside a single page" + }, + { + "name": "filter", + "in": "query", + "style": "deepobject", + "explode": true, + "schema": { + "type": "object" + }, + "description": "Filters results using a query", + "example": "\"filter[hashlistId__gt]\": 200" + }, + { + "name": "include", + "in": "query", + "schema": { + "type": "string" + }, + "description": "Items to include, comma seperated. Possible options: agent,task" + } + ] + } + }, + "/api/v2/ui/chunks/count": { + "get": { + "tags": [ + "Chunks" + ], + "responses": { + "400": { + "description": "Invalid request", + "content": { + "application/json": { + "schema": { + "$ref": "#/components/schemas/ErrorResponse" + } + } + } + }, + "401": { + "description": "Authentication failed", + "content": { + "application/json": { + "schema": { + "$ref": "#/components/schemas/ErrorResponse" + } + } + } + }, + "200": { + "description": "successful operation", + "content": { + "application/json": { + "schema": { + "type": "array", + "items": { + "$ref": "#/components/schemas/ChunkResponse" + } + } + } + } + } + }, + "security": [ + { + "bearerAuth": [ + [ + "permChunkRead" + ] + ] + } + ], + "description": "GET many request to retrieve multiple objects.", + "parameters": [ + { + "name": "page[after]", + "in": "query", + "schema": { + "type": "integer", + "format": "int32" + }, + "example": 0, + "description": "Pointer to paginate to retrieve the data after the value provided" + }, + { + "name": "page[before]", + "in": "query", + "schema": { + "type": "integer", + "format": "int32" + }, + "example": 0, + "description": "Pointer to paginate to retrieve the data before the value provided" + }, + { + "name": "page[size]", + "in": "query", + "schema": { + "type": "integer", + "format": "int32" + }, + "example": 100, + "description": "Amout of data to retrieve inside a single page" + }, + { + "name": "filter", + "in": "query", + "style": "deepobject", + "explode": true, + "schema": { + "type": "object" + }, + "description": "Filters results using a query", + "example": "\"filter[hashlistId__gt]\": 200" + }, + { + "name": "include", + "in": "query", + "schema": { + "type": "string" + }, + "description": "Items to include, comma seperated. Possible options: agent,task" + } + ] + } + }, + "/api/v2/ui/chunks/{id:[0-9]+}/{relation:agent}": { + "get": { + "tags": [ + "Chunks" + ], + "responses": { + "400": { + "description": "Invalid request", + "content": { + "application/json": { + "schema": { + "$ref": "#/components/schemas/ErrorResponse" + } + } + } + }, + "401": { + "description": "Authentication failed", + "content": { + "application/json": { + "schema": { + "$ref": "#/components/schemas/ErrorResponse" + } + } + } + }, + "404": { + "description": "Not Found", + "content": { + "application/json": { + "schema": { + "$ref": "#/components/schemas/NotFoundResponse" + } + } + } + }, + "200": { + "description": "successful operation", + "content": { + "application/json": { + "schema": { + "$ref": "#/components/schemas/ChunkResponse" + } + } + } + } + }, + "security": [ + { + "bearerAuth": [ + [ + "permChunkRead" + ] + ] + } + ], + "description": "GET request for for a to-one relationship link. Returns the resource record of the object that is part of the specified relation.", + "parameters": [ + { + "name": "id", + "in": "path", + "required": true, + "schema": { + "type": "integer", + "format": "int32", + "example": 10 + } + }, + { + "name": "include", + "in": "query", + "schema": { + "type": "string" + }, + "description": "Items to include. Comma seperated" + } + ] + } + }, + "/api/v2/ui/chunks/{id:[0-9]+}/relationships/{relation:agent}": { + "get": { + "tags": [ + "Chunks" + ], + "responses": { + "400": { + "description": "Invalid request", + "content": { + "application/json": { + "schema": { + "$ref": "#/components/schemas/ErrorResponse" + } + } + } + }, + "401": { + "description": "Authentication failed", + "content": { + "application/json": { + "schema": { + "$ref": "#/components/schemas/ErrorResponse" + } + } + } + }, + "404": { + "description": "Not Found", + "content": { + "application/json": { + "schema": { + "$ref": "#/components/schemas/NotFoundResponse" + } + } + } + }, + "200": { + "description": "successful operation", + "content": { + "application/json": { + "schema": { + "$ref": "#/components/schemas/ChunkResponse" + } + } + } + } + }, + "security": [ + { + "bearerAuth": [ + [ + "permChunkRead" + ] + ] + } + ], + "description": "GET request for for a to-one relationship link. Returns the resource record of the object that is part of the specified relation.", + "parameters": [ + { + "name": "id", + "in": "path", + "required": true, + "schema": { + "type": "integer", + "format": "int32", + "example": 10 + } + }, + { + "name": "include", + "in": "query", + "schema": { + "type": "string" + }, + "description": "Items to include. Comma seperated" + } + ] + }, + "patch": { + "tags": [ + "Chunks" + ], + "responses": { + "400": { + "description": "Invalid request", + "content": { + "application/json": { + "schema": { + "$ref": "#/components/schemas/ErrorResponse" + } + } + } + }, + "401": { + "description": "Authentication failed", + "content": { + "application/json": { + "schema": { + "$ref": "#/components/schemas/ErrorResponse" + } + } + } + }, + "404": { + "description": "Not Found", + "content": { + "application/json": { + "schema": { + "$ref": "#/components/schemas/NotFoundResponse" + } + } + } + }, + "200": { + "description": "successful operation", + "content": { + "application/json": { + "schema": { + "$ref": "#/components/schemas/ChunkPostPatchResponse" + } + } + } + } + }, + "security": [ + { + "bearerAuth": [ + [ + "permChunkUpdate" + ] + ] + } + ], + "description": "", + "requestBody": { + "required": true, + "content": { + "application/json": { + "schema": { + "$ref": "#/components/schemas/ChunkPatch" + } + } + } + }, + "parameters": [] + } + }, + "/api/v2/ui/chunks/{id:[0-9]+}/{relation:task}": { + "get": { + "tags": [ + "Chunks" + ], + "responses": { + "400": { + "description": "Invalid request", + "content": { + "application/json": { + "schema": { + "$ref": "#/components/schemas/ErrorResponse" + } + } + } + }, + "401": { + "description": "Authentication failed", + "content": { + "application/json": { + "schema": { + "$ref": "#/components/schemas/ErrorResponse" + } + } + } + }, + "404": { + "description": "Not Found", + "content": { + "application/json": { + "schema": { + "$ref": "#/components/schemas/NotFoundResponse" + } + } + } + }, + "200": { + "description": "successful operation", + "content": { + "application/json": { + "schema": { + "$ref": "#/components/schemas/ChunkResponse" + } + } + } + } + }, + "security": [ + { + "bearerAuth": [ + [ + "permChunkRead" + ] + ] + } + ], + "description": "GET request for for a to-one relationship link. Returns the resource record of the object that is part of the specified relation.", + "parameters": [ + { + "name": "id", + "in": "path", + "required": true, + "schema": { + "type": "integer", + "format": "int32", + "example": 10 + } + }, + { + "name": "include", + "in": "query", + "schema": { + "type": "string" + }, + "description": "Items to include. Comma seperated" + } + ] + } + }, + "/api/v2/ui/chunks/{id:[0-9]+}/relationships/{relation:task}": { + "get": { + "tags": [ + "Chunks" + ], + "responses": { + "400": { + "description": "Invalid request", + "content": { + "application/json": { + "schema": { + "$ref": "#/components/schemas/ErrorResponse" + } + } + } + }, + "401": { + "description": "Authentication failed", + "content": { + "application/json": { + "schema": { + "$ref": "#/components/schemas/ErrorResponse" + } + } + } + }, + "404": { + "description": "Not Found", + "content": { + "application/json": { + "schema": { + "$ref": "#/components/schemas/NotFoundResponse" + } + } + } + }, + "200": { + "description": "successful operation", + "content": { + "application/json": { + "schema": { + "$ref": "#/components/schemas/ChunkResponse" + } + } + } + } + }, + "security": [ + { + "bearerAuth": [ + [ + "permChunkRead" + ] + ] + } + ], + "description": "GET request for for a to-one relationship link. Returns the resource record of the object that is part of the specified relation.", + "parameters": [ + { + "name": "id", + "in": "path", + "required": true, + "schema": { + "type": "integer", + "format": "int32", + "example": 10 + } + }, + { + "name": "include", + "in": "query", + "schema": { + "type": "string" + }, + "description": "Items to include. Comma seperated" + } + ] + }, + "patch": { + "tags": [ + "Chunks" + ], + "responses": { + "400": { + "description": "Invalid request", + "content": { + "application/json": { + "schema": { + "$ref": "#/components/schemas/ErrorResponse" + } + } + } + }, + "401": { + "description": "Authentication failed", + "content": { + "application/json": { + "schema": { + "$ref": "#/components/schemas/ErrorResponse" + } + } + } + }, + "404": { + "description": "Not Found", + "content": { + "application/json": { + "schema": { + "$ref": "#/components/schemas/NotFoundResponse" + } + } + } + }, + "200": { + "description": "successful operation", + "content": { + "application/json": { + "schema": { + "$ref": "#/components/schemas/ChunkPostPatchResponse" + } + } + } + } + }, + "security": [ + { + "bearerAuth": [ + [ + "permChunkUpdate" + ] + ] + } + ], + "description": "", + "requestBody": { + "required": true, + "content": { + "application/json": { + "schema": { + "$ref": "#/components/schemas/ChunkPatch" + } + } + } + }, + "parameters": [] + } + }, + "/api/v2/ui/chunks/{id:[0-9]+}": { + "get": { + "tags": [ + "Chunks" + ], + "responses": { + "400": { + "description": "Invalid request", + "content": { + "application/json": { + "schema": { + "$ref": "#/components/schemas/ErrorResponse" + } + } + } + }, + "401": { + "description": "Authentication failed", + "content": { + "application/json": { + "schema": { + "$ref": "#/components/schemas/ErrorResponse" + } + } + } + }, + "404": { + "description": "Not Found", + "content": { + "application/json": { + "schema": { + "$ref": "#/components/schemas/NotFoundResponse" + } + } + } + }, + "200": { + "description": "successful operation", + "content": { + "application/json": { + "schema": { + "$ref": "#/components/schemas/ChunkResponse" + } + } + } + } + }, + "security": [ + { + "bearerAuth": [ + [ + "permChunkRead" + ] + ] + } + ], + "description": "GET request to retrieve a single object.", + "parameters": [ + { + "name": "id", + "in": "path", + "required": true, + "schema": { + "type": "integer", + "format": "int32", + "example": 10 + } + }, + { + "name": "include", + "in": "query", + "schema": { + "type": "string" + }, + "description": "Items to include. Comma seperated" + } + ] + } + }, + "/api/v2/ui/configs": { + "get": { + "tags": [ + "Configs" + ], + "responses": { + "400": { + "description": "Invalid request", + "content": { + "application/json": { + "schema": { + "$ref": "#/components/schemas/ErrorResponse" + } + } + } + }, + "401": { + "description": "Authentication failed", + "content": { + "application/json": { + "schema": { + "$ref": "#/components/schemas/ErrorResponse" + } + } + } + }, + "200": { + "description": "successful operation", + "content": { + "application/json": { + "schema": { + "type": "array", + "items": { + "$ref": "#/components/schemas/ConfigResponse" + } + } + } + } + } + }, + "security": [ + { + "bearerAuth": [ + [ + "permConfigRead" + ] + ] + } + ], + "description": "GET many request to retrieve multiple objects.", + "parameters": [ + { + "name": "page[after]", + "in": "query", + "schema": { + "type": "integer", + "format": "int32" + }, + "example": 0, + "description": "Pointer to paginate to retrieve the data after the value provided" + }, + { + "name": "page[before]", + "in": "query", + "schema": { + "type": "integer", + "format": "int32" + }, + "example": 0, + "description": "Pointer to paginate to retrieve the data before the value provided" + }, + { + "name": "page[size]", + "in": "query", + "schema": { + "type": "integer", + "format": "int32" + }, + "example": 100, + "description": "Amout of data to retrieve inside a single page" + }, + { + "name": "filter", + "in": "query", + "style": "deepobject", + "explode": true, + "schema": { + "type": "object" + }, + "description": "Filters results using a query", + "example": "\"filter[hashlistId__gt]\": 200" + }, + { + "name": "include", + "in": "query", + "schema": { + "type": "string" + }, + "description": "Items to include, comma seperated. Possible options: configSection" + } + ] + } + }, + "/api/v2/ui/configs/count": { + "get": { + "tags": [ + "Configs" + ], + "responses": { + "400": { + "description": "Invalid request", + "content": { + "application/json": { + "schema": { + "$ref": "#/components/schemas/ErrorResponse" + } + } + } + }, + "401": { + "description": "Authentication failed", + "content": { + "application/json": { + "schema": { + "$ref": "#/components/schemas/ErrorResponse" + } + } + } + }, + "200": { + "description": "successful operation", + "content": { + "application/json": { + "schema": { + "type": "array", + "items": { + "$ref": "#/components/schemas/ConfigResponse" + } + } + } + } + } + }, + "security": [ + { + "bearerAuth": [ + [ + "permConfigRead" + ] + ] + } + ], + "description": "GET many request to retrieve multiple objects.", + "parameters": [ + { + "name": "page[after]", + "in": "query", + "schema": { + "type": "integer", + "format": "int32" + }, + "example": 0, + "description": "Pointer to paginate to retrieve the data after the value provided" + }, + { + "name": "page[before]", + "in": "query", + "schema": { + "type": "integer", + "format": "int32" + }, + "example": 0, + "description": "Pointer to paginate to retrieve the data before the value provided" + }, + { + "name": "page[size]", + "in": "query", + "schema": { + "type": "integer", + "format": "int32" + }, + "example": 100, + "description": "Amout of data to retrieve inside a single page" + }, + { + "name": "filter", + "in": "query", + "style": "deepobject", + "explode": true, + "schema": { + "type": "object" + }, + "description": "Filters results using a query", + "example": "\"filter[hashlistId__gt]\": 200" + }, + { + "name": "include", + "in": "query", + "schema": { + "type": "string" + }, + "description": "Items to include, comma seperated. Possible options: configSection" + } + ] + } + }, + "/api/v2/ui/configs/{id:[0-9]+}/{relation:configSection}": { + "get": { + "tags": [ + "Configs" + ], + "responses": { + "400": { + "description": "Invalid request", + "content": { + "application/json": { + "schema": { + "$ref": "#/components/schemas/ErrorResponse" + } + } + } + }, + "401": { + "description": "Authentication failed", + "content": { + "application/json": { + "schema": { + "$ref": "#/components/schemas/ErrorResponse" + } + } + } + }, + "404": { + "description": "Not Found", + "content": { + "application/json": { + "schema": { + "$ref": "#/components/schemas/NotFoundResponse" + } + } + } + }, + "200": { + "description": "successful operation", + "content": { + "application/json": { + "schema": { + "$ref": "#/components/schemas/ConfigResponse" + } + } + } + } + }, + "security": [ + { + "bearerAuth": [ + [ + "permConfigRead" + ] + ] + } + ], + "description": "GET request for for a to-one relationship link. Returns the resource record of the object that is part of the specified relation.", + "parameters": [ + { + "name": "id", + "in": "path", + "required": true, + "schema": { + "type": "integer", + "format": "int32", + "example": 10 + } + }, + { + "name": "include", + "in": "query", + "schema": { + "type": "string" + }, + "description": "Items to include. Comma seperated" + } + ] + } + }, + "/api/v2/ui/configs/{id:[0-9]+}/relationships/{relation:configSection}": { + "get": { + "tags": [ + "Configs" + ], + "responses": { + "400": { + "description": "Invalid request", + "content": { + "application/json": { + "schema": { + "$ref": "#/components/schemas/ErrorResponse" + } + } + } + }, + "401": { + "description": "Authentication failed", + "content": { + "application/json": { + "schema": { + "$ref": "#/components/schemas/ErrorResponse" + } + } + } + }, + "404": { + "description": "Not Found", + "content": { + "application/json": { + "schema": { + "$ref": "#/components/schemas/NotFoundResponse" + } + } + } + }, + "200": { + "description": "successful operation", + "content": { + "application/json": { + "schema": { + "$ref": "#/components/schemas/ConfigResponse" + } + } + } + } + }, + "security": [ + { + "bearerAuth": [ + [ + "permConfigRead" + ] + ] + } + ], + "description": "GET request for for a to-one relationship link. Returns the resource record of the object that is part of the specified relation.", + "parameters": [ + { + "name": "id", + "in": "path", + "required": true, + "schema": { + "type": "integer", + "format": "int32", + "example": 10 + } + }, + { + "name": "include", + "in": "query", + "schema": { + "type": "string" + }, + "description": "Items to include. Comma seperated" + } + ] + }, + "patch": { + "tags": [ + "Configs" + ], + "responses": { + "400": { + "description": "Invalid request", + "content": { + "application/json": { + "schema": { + "$ref": "#/components/schemas/ErrorResponse" + } + } + } + }, + "401": { + "description": "Authentication failed", + "content": { + "application/json": { + "schema": { + "$ref": "#/components/schemas/ErrorResponse" + } + } + } + }, + "404": { + "description": "Not Found", + "content": { + "application/json": { + "schema": { + "$ref": "#/components/schemas/NotFoundResponse" + } + } + } + }, + "200": { + "description": "successful operation", + "content": { + "application/json": { + "schema": { + "$ref": "#/components/schemas/ConfigPostPatchResponse" + } + } + } + } + }, + "security": [ + { + "bearerAuth": [ + [ + "permConfigUpdate" + ] + ] + } + ], + "description": "", + "requestBody": { + "required": true, + "content": { + "application/json": { + "schema": { + "$ref": "#/components/schemas/ConfigPatch" + } + } + } + }, + "parameters": [] + } + }, + "/api/v2/ui/configs/{id:[0-9]+}": { + "get": { + "tags": [ + "Configs" + ], + "responses": { + "400": { + "description": "Invalid request", + "content": { + "application/json": { + "schema": { + "$ref": "#/components/schemas/ErrorResponse" + } + } + } + }, + "401": { + "description": "Authentication failed", + "content": { + "application/json": { + "schema": { + "$ref": "#/components/schemas/ErrorResponse" + } + } + } + }, + "404": { + "description": "Not Found", + "content": { + "application/json": { + "schema": { + "$ref": "#/components/schemas/NotFoundResponse" + } + } + } + }, + "200": { + "description": "successful operation", + "content": { + "application/json": { + "schema": { + "$ref": "#/components/schemas/ConfigResponse" + } + } + } + } + }, + "security": [ + { + "bearerAuth": [ + [ + "permConfigRead" + ] + ] + } + ], + "description": "GET request to retrieve a single object.", + "parameters": [ + { + "name": "id", + "in": "path", + "required": true, + "schema": { + "type": "integer", + "format": "int32", + "example": 10 + } + }, + { + "name": "include", + "in": "query", + "schema": { + "type": "string" + }, + "description": "Items to include. Comma seperated" + } + ] + }, + "patch": { + "tags": [ + "Configs" + ], + "responses": { + "400": { + "description": "Invalid request", + "content": { + "application/json": { + "schema": { + "$ref": "#/components/schemas/ErrorResponse" + } + } + } + }, + "401": { + "description": "Authentication failed", + "content": { + "application/json": { + "schema": { + "$ref": "#/components/schemas/ErrorResponse" + } + } + } + }, + "404": { + "description": "Not Found", + "content": { + "application/json": { + "schema": { + "$ref": "#/components/schemas/NotFoundResponse" + } + } + } + }, + "200": { + "description": "successful operation", + "content": { + "application/json": { + "schema": { + "$ref": "#/components/schemas/ConfigPostPatchResponse" + } + } + } + } + }, + "security": [ + { + "bearerAuth": [ + [ + "permConfigUpdate" + ] + ] + } + ], + "description": "PATCH request to update attributes of a single object.", + "requestBody": { + "required": true, + "content": { + "application/json": { + "schema": { + "$ref": "#/components/schemas/ConfigPatch" + } + } + } + }, + "parameters": [] + } + }, + "/api/v2/ui/configsections": { + "get": { + "tags": [ + "ConfigSections" + ], + "responses": { + "400": { + "description": "Invalid request", + "content": { + "application/json": { + "schema": { + "$ref": "#/components/schemas/ErrorResponse" + } + } + } + }, + "401": { + "description": "Authentication failed", + "content": { + "application/json": { + "schema": { + "$ref": "#/components/schemas/ErrorResponse" + } + } + } + }, + "200": { + "description": "successful operation", + "content": { + "application/json": { + "schema": { + "type": "array", + "items": { + "$ref": "#/components/schemas/ConfigSectionResponse" + } + } + } + } + } + }, + "security": [ + { + "bearerAuth": [ + [ + "permConfigSectionRead" + ] + ] + } + ], + "description": "GET many request to retrieve multiple objects.", + "parameters": [ + { + "name": "page[after]", + "in": "query", + "schema": { + "type": "integer", + "format": "int32" + }, + "example": 0, + "description": "Pointer to paginate to retrieve the data after the value provided" + }, + { + "name": "page[before]", + "in": "query", + "schema": { + "type": "integer", + "format": "int32" + }, + "example": 0, + "description": "Pointer to paginate to retrieve the data before the value provided" + }, + { + "name": "page[size]", + "in": "query", + "schema": { + "type": "integer", + "format": "int32" + }, + "example": 100, + "description": "Amout of data to retrieve inside a single page" + }, + { + "name": "filter", + "in": "query", + "style": "deepobject", + "explode": true, + "schema": { + "type": "object" + }, + "description": "Filters results using a query", + "example": "\"filter[hashlistId__gt]\": 200" + }, + { + "name": "include", + "in": "query", + "schema": { + "type": "string" + }, + "description": "Items to include, comma seperated. Possible options: " + } + ] + } + }, + "/api/v2/ui/configsections/count": { + "get": { + "tags": [ + "ConfigSections" + ], + "responses": { + "400": { + "description": "Invalid request", + "content": { + "application/json": { + "schema": { + "$ref": "#/components/schemas/ErrorResponse" + } + } + } + }, + "401": { + "description": "Authentication failed", + "content": { + "application/json": { + "schema": { + "$ref": "#/components/schemas/ErrorResponse" + } + } + } + }, + "200": { + "description": "successful operation", + "content": { + "application/json": { + "schema": { + "type": "array", + "items": { + "$ref": "#/components/schemas/ConfigSectionResponse" + } + } + } + } + } + }, + "security": [ + { + "bearerAuth": [ + [ + "permConfigSectionRead" + ] + ] + } + ], + "description": "GET many request to retrieve multiple objects.", + "parameters": [ + { + "name": "page[after]", + "in": "query", + "schema": { + "type": "integer", + "format": "int32" + }, + "example": 0, + "description": "Pointer to paginate to retrieve the data after the value provided" + }, + { + "name": "page[before]", + "in": "query", + "schema": { + "type": "integer", + "format": "int32" + }, + "example": 0, + "description": "Pointer to paginate to retrieve the data before the value provided" + }, + { + "name": "page[size]", + "in": "query", + "schema": { + "type": "integer", + "format": "int32" + }, + "example": 100, + "description": "Amout of data to retrieve inside a single page" + }, + { + "name": "filter", + "in": "query", + "style": "deepobject", + "explode": true, + "schema": { + "type": "object" + }, + "description": "Filters results using a query", + "example": "\"filter[hashlistId__gt]\": 200" + }, + { + "name": "include", + "in": "query", + "schema": { + "type": "string" + }, + "description": "Items to include, comma seperated. Possible options: " + } + ] + } + }, + "/api/v2/ui/configsections/{id:[0-9]+}": { + "get": { + "tags": [ + "ConfigSections" + ], + "responses": { + "400": { + "description": "Invalid request", + "content": { + "application/json": { + "schema": { + "$ref": "#/components/schemas/ErrorResponse" + } + } + } + }, + "401": { + "description": "Authentication failed", + "content": { + "application/json": { + "schema": { + "$ref": "#/components/schemas/ErrorResponse" + } + } + } + }, + "404": { + "description": "Not Found", + "content": { + "application/json": { + "schema": { + "$ref": "#/components/schemas/NotFoundResponse" + } + } + } + }, + "200": { + "description": "successful operation", + "content": { + "application/json": { + "schema": { + "$ref": "#/components/schemas/ConfigSectionResponse" + } + } + } + } + }, + "security": [ + { + "bearerAuth": [ + [ + "permConfigSectionRead" + ] + ] + } + ], + "description": "GET request to retrieve a single object.", + "parameters": [ + { + "name": "id", + "in": "path", + "required": true, + "schema": { + "type": "integer", + "format": "int32", + "example": 10 + } + }, + { + "name": "include", + "in": "query", + "schema": { + "type": "string" + }, + "description": "Items to include. Comma seperated" + } + ] + } + }, + "/api/v2/ui/crackers": { + "get": { + "tags": [ + "CrackerBinarys" + ], + "responses": { + "400": { + "description": "Invalid request", + "content": { + "application/json": { + "schema": { + "$ref": "#/components/schemas/ErrorResponse" + } + } + } + }, + "401": { + "description": "Authentication failed", + "content": { + "application/json": { + "schema": { + "$ref": "#/components/schemas/ErrorResponse" + } + } + } + }, + "200": { + "description": "successful operation", + "content": { + "application/json": { + "schema": { + "type": "array", + "items": { + "$ref": "#/components/schemas/CrackerBinaryResponse" + } + } + } + } + } + }, + "security": [ + { + "bearerAuth": [ + [ + "permCrackerBinaryRead" + ] + ] + } + ], + "description": "GET many request to retrieve multiple objects.", + "parameters": [ + { + "name": "page[after]", + "in": "query", + "schema": { + "type": "integer", + "format": "int32" + }, + "example": 0, + "description": "Pointer to paginate to retrieve the data after the value provided" + }, + { + "name": "page[before]", + "in": "query", + "schema": { + "type": "integer", + "format": "int32" + }, + "example": 0, + "description": "Pointer to paginate to retrieve the data before the value provided" + }, + { + "name": "page[size]", + "in": "query", + "schema": { + "type": "integer", + "format": "int32" + }, + "example": 100, + "description": "Amout of data to retrieve inside a single page" + }, + { + "name": "filter", + "in": "query", + "style": "deepobject", + "explode": true, + "schema": { + "type": "object" + }, + "description": "Filters results using a query", + "example": "\"filter[hashlistId__gt]\": 200" + }, + { + "name": "include", + "in": "query", + "schema": { + "type": "string" + }, + "description": "Items to include, comma seperated. Possible options: crackerBinaryType,tasks" + } + ] + }, + "post": { + "tags": [ + "CrackerBinarys" + ], + "responses": { + "400": { + "description": "Invalid request", + "content": { + "application/json": { + "schema": { + "$ref": "#/components/schemas/ErrorResponse" + } + } + } + }, + "401": { + "description": "Authentication failed", + "content": { + "application/json": { + "schema": { + "$ref": "#/components/schemas/ErrorResponse" + } + } + } + }, + "201": { + "description": "successful operation", + "content": { + "application/json": { + "schema": { + "$ref": "#/components/schemas/CrackerBinaryPostPatchResponse" + } + } + } + } + }, + "security": [ + { + "bearerAuth": [ + [ + "permCrackerBinaryCreate" + ] + ] + } + ], + "description": "POST request to create a new object. The request must contain the resource record as data with the attributes of the new object.To add relationships, a relationships object can be added with the resource records of the relations that are part of this object.", + "requestBody": { + "required": true, + "content": { + "application/json": { + "schema": { + "$ref": "#/components/schemas/CrackerBinaryCreate" + } + } + } + }, + "parameters": [] + } + }, + "/api/v2/ui/crackers/count": { + "get": { + "tags": [ + "CrackerBinarys" + ], + "responses": { + "400": { + "description": "Invalid request", + "content": { + "application/json": { + "schema": { + "$ref": "#/components/schemas/ErrorResponse" + } + } + } + }, + "401": { + "description": "Authentication failed", + "content": { + "application/json": { + "schema": { + "$ref": "#/components/schemas/ErrorResponse" + } + } + } + }, + "200": { + "description": "successful operation", + "content": { + "application/json": { + "schema": { + "type": "array", + "items": { + "$ref": "#/components/schemas/CrackerBinaryResponse" + } + } + } + } + } + }, + "security": [ + { + "bearerAuth": [ + [ + "permCrackerBinaryRead" + ] + ] + } + ], + "description": "GET many request to retrieve multiple objects.", + "parameters": [ + { + "name": "page[after]", + "in": "query", + "schema": { + "type": "integer", + "format": "int32" + }, + "example": 0, + "description": "Pointer to paginate to retrieve the data after the value provided" + }, + { + "name": "page[before]", + "in": "query", + "schema": { + "type": "integer", + "format": "int32" + }, + "example": 0, + "description": "Pointer to paginate to retrieve the data before the value provided" + }, + { + "name": "page[size]", + "in": "query", + "schema": { + "type": "integer", + "format": "int32" + }, + "example": 100, + "description": "Amout of data to retrieve inside a single page" + }, + { + "name": "filter", + "in": "query", + "style": "deepobject", + "explode": true, + "schema": { + "type": "object" + }, + "description": "Filters results using a query", + "example": "\"filter[hashlistId__gt]\": 200" + }, + { + "name": "include", + "in": "query", + "schema": { + "type": "string" + }, + "description": "Items to include, comma seperated. Possible options: crackerBinaryType,tasks" + } + ] + } + }, + "/api/v2/ui/crackers/{id:[0-9]+}/{relation:crackerBinaryType}": { + "get": { + "tags": [ + "CrackerBinarys" + ], + "responses": { + "400": { + "description": "Invalid request", + "content": { + "application/json": { + "schema": { + "$ref": "#/components/schemas/ErrorResponse" + } + } + } + }, + "401": { + "description": "Authentication failed", + "content": { + "application/json": { + "schema": { + "$ref": "#/components/schemas/ErrorResponse" + } + } + } + }, + "404": { + "description": "Not Found", + "content": { + "application/json": { + "schema": { + "$ref": "#/components/schemas/NotFoundResponse" + } + } + } + }, + "200": { + "description": "successful operation", + "content": { + "application/json": { + "schema": { + "$ref": "#/components/schemas/CrackerBinaryResponse" + } + } + } + } + }, + "security": [ + { + "bearerAuth": [ + [ + "permCrackerBinaryRead" + ] + ] + } + ], + "description": "GET request for for a to-one relationship link. Returns the resource record of the object that is part of the specified relation.", + "parameters": [ + { + "name": "id", + "in": "path", + "required": true, + "schema": { + "type": "integer", + "format": "int32", + "example": 10 + } + }, + { + "name": "include", + "in": "query", + "schema": { + "type": "string" + }, + "description": "Items to include. Comma seperated" + } + ] + } + }, + "/api/v2/ui/crackers/{id:[0-9]+}/relationships/{relation:crackerBinaryType}": { + "get": { + "tags": [ + "CrackerBinarys" + ], + "responses": { + "400": { + "description": "Invalid request", + "content": { + "application/json": { + "schema": { + "$ref": "#/components/schemas/ErrorResponse" + } + } + } + }, + "401": { + "description": "Authentication failed", + "content": { + "application/json": { + "schema": { + "$ref": "#/components/schemas/ErrorResponse" + } + } + } + }, + "404": { + "description": "Not Found", + "content": { + "application/json": { + "schema": { + "$ref": "#/components/schemas/NotFoundResponse" + } + } + } + }, + "200": { + "description": "successful operation", + "content": { + "application/json": { + "schema": { + "$ref": "#/components/schemas/CrackerBinaryResponse" + } + } + } + } + }, + "security": [ + { + "bearerAuth": [ + [ + "permCrackerBinaryRead" + ] + ] + } + ], + "description": "GET request for for a to-one relationship link. Returns the resource record of the object that is part of the specified relation.", + "parameters": [ + { + "name": "id", + "in": "path", + "required": true, + "schema": { + "type": "integer", + "format": "int32", + "example": 10 + } + }, + { + "name": "include", + "in": "query", + "schema": { + "type": "string" + }, + "description": "Items to include. Comma seperated" + } + ] + }, + "patch": { + "tags": [ + "CrackerBinarys" + ], + "responses": { + "400": { + "description": "Invalid request", + "content": { + "application/json": { + "schema": { + "$ref": "#/components/schemas/ErrorResponse" + } + } + } + }, + "401": { + "description": "Authentication failed", + "content": { + "application/json": { + "schema": { + "$ref": "#/components/schemas/ErrorResponse" + } + } + } + }, + "404": { + "description": "Not Found", + "content": { + "application/json": { + "schema": { + "$ref": "#/components/schemas/NotFoundResponse" + } + } + } + }, + "200": { + "description": "successful operation", + "content": { + "application/json": { + "schema": { + "$ref": "#/components/schemas/CrackerBinaryPostPatchResponse" + } + } + } + } + }, + "security": [ + { + "bearerAuth": [ + [ + "permCrackerBinaryUpdate" + ] + ] + } + ], + "description": "", + "requestBody": { + "required": true, + "content": { + "application/json": { + "schema": { + "$ref": "#/components/schemas/CrackerBinaryPatch" + } + } + } + }, + "parameters": [] + } + }, + "/api/v2/ui/crackers/{id:[0-9]+}/{relation:tasks}": { + "get": { + "tags": [ + "CrackerBinarys" + ], + "responses": { + "400": { + "description": "Invalid request", + "content": { + "application/json": { + "schema": { + "$ref": "#/components/schemas/ErrorResponse" + } + } + } + }, + "401": { + "description": "Authentication failed", + "content": { + "application/json": { + "schema": { + "$ref": "#/components/schemas/ErrorResponse" + } + } + } + }, + "404": { + "description": "Not Found", + "content": { + "application/json": { + "schema": { + "$ref": "#/components/schemas/NotFoundResponse" + } + } + } + }, + "200": { + "description": "successful operation", + "content": { + "application/json": { + "schema": { + "$ref": "#/components/schemas/CrackerBinaryResponse" + } + } + } + } + }, + "security": [ + { + "bearerAuth": [ + [ + "permCrackerBinaryRead" + ] + ] + } + ], + "description": "GET request for for a to-one relationship link. Returns the resource record of the object that is part of the specified relation.", + "parameters": [ + { + "name": "id", + "in": "path", + "required": true, + "schema": { + "type": "integer", + "format": "int32", + "example": 10 + } + }, + { + "name": "include", + "in": "query", + "schema": { + "type": "string" + }, + "description": "Items to include. Comma seperated" + } + ] + } + }, + "/api/v2/ui/crackers/{id:[0-9]+}/relationships/{relation:tasks}": { + "get": { + "tags": [ + "CrackerBinarys" + ], + "responses": { + "400": { + "description": "Invalid request", + "content": { + "application/json": { + "schema": { + "$ref": "#/components/schemas/ErrorResponse" + } + } + } + }, + "401": { + "description": "Authentication failed", + "content": { + "application/json": { + "schema": { + "$ref": "#/components/schemas/ErrorResponse" + } + } + } + }, + "404": { + "description": "Not Found", + "content": { + "application/json": { + "schema": { + "$ref": "#/components/schemas/NotFoundResponse" + } + } + } + }, + "200": { + "description": "successful operation", + "content": { + "application/json": { + "schema": { + "$ref": "#/components/schemas/CrackerBinaryResponse" + } + } + } + } + }, + "security": [ + { + "bearerAuth": [ + [ + "permCrackerBinaryRead" + ] + ] + } + ], + "description": "GET request for for a to-one relationship link. Returns the resource record of the object that is part of the specified relation.", + "parameters": [ + { + "name": "id", + "in": "path", + "required": true, + "schema": { + "type": "integer", + "format": "int32", + "example": 10 + } + }, + { + "name": "include", + "in": "query", + "schema": { + "type": "string" + }, + "description": "Items to include. Comma seperated" + } + ] + }, + "patch": { + "tags": [ + "CrackerBinarys" + ], + "responses": { + "400": { + "description": "Invalid request", + "content": { + "application/json": { + "schema": { + "$ref": "#/components/schemas/ErrorResponse" + } + } + } + }, + "401": { + "description": "Authentication failed", + "content": { + "application/json": { + "schema": { + "$ref": "#/components/schemas/ErrorResponse" + } + } + } + }, + "404": { + "description": "Not Found", + "content": { + "application/json": { + "schema": { + "$ref": "#/components/schemas/NotFoundResponse" + } + } + } + }, + "200": { + "description": "successful operation", + "content": { + "application/json": { + "schema": { + "$ref": "#/components/schemas/CrackerBinaryPostPatchResponse" + } + } + } + } + }, + "security": [ + { + "bearerAuth": [ + [ + "permCrackerBinaryUpdate" + ] + ] + } + ], + "description": "", + "requestBody": { + "required": true, + "content": { + "application/json": { + "schema": { + "$ref": "#/components/schemas/CrackerBinaryPatch" + } + } + } + }, + "parameters": [] + }, + "post": { + "tags": [ + "CrackerBinarys" + ], + "responses": { + "400": { + "description": "Invalid request", + "content": { + "application/json": { + "schema": { + "$ref": "#/components/schemas/ErrorResponse" + } + } + } + }, + "401": { + "description": "Authentication failed", + "content": { + "application/json": { + "schema": { + "$ref": "#/components/schemas/ErrorResponse" + } + } + } + }, + "404": { + "description": "Not Found", + "content": { + "application/json": { + "schema": { + "$ref": "#/components/schemas/NotFoundResponse" + } + } + } + }, + "204": { + "description": "successfully created" + } + }, + "security": [ + { + "bearerAuth": [ + [ + "permCrackerBinaryCreate" + ] + ] + } + ], + "description": "", + "requestBody": { + "required": true, + "content": { + "application/json": [] + } + }, + "parameters": [] + }, + "delete": { + "tags": [ + "CrackerBinarys" + ], + "responses": { + "400": { + "description": "Invalid request", + "content": { + "application/json": { + "schema": { + "$ref": "#/components/schemas/ErrorResponse" + } + } + } + }, + "401": { + "description": "Authentication failed", + "content": { + "application/json": { + "schema": { + "$ref": "#/components/schemas/ErrorResponse" + } + } + } + }, + "404": { + "description": "Not Found", + "content": { + "application/json": { + "schema": { + "$ref": "#/components/schemas/NotFoundResponse" + } + } + } + }, + "204": { + "description": "successfully deleted" + } + }, + "security": [ + { + "bearerAuth": [ + [ + "permCrackerBinaryDelete" + ] + ] + } + ], + "description": "", + "requestBody": { + "required": true, + "content": { + "application/json": [] + } + }, + "parameters": [] + } + }, + "/api/v2/ui/crackers/{id:[0-9]+}": { + "get": { + "tags": [ + "CrackerBinarys" + ], + "responses": { + "400": { + "description": "Invalid request", + "content": { + "application/json": { + "schema": { + "$ref": "#/components/schemas/ErrorResponse" + } + } + } + }, + "401": { + "description": "Authentication failed", + "content": { + "application/json": { + "schema": { + "$ref": "#/components/schemas/ErrorResponse" + } + } + } + }, + "404": { + "description": "Not Found", + "content": { + "application/json": { + "schema": { + "$ref": "#/components/schemas/NotFoundResponse" + } + } + } + }, + "200": { + "description": "successful operation", + "content": { + "application/json": { + "schema": { + "$ref": "#/components/schemas/CrackerBinaryResponse" + } + } + } + } + }, + "security": [ + { + "bearerAuth": [ + [ + "permCrackerBinaryRead" + ] + ] + } + ], + "description": "GET request to retrieve a single object.", + "parameters": [ + { + "name": "id", + "in": "path", + "required": true, + "schema": { + "type": "integer", + "format": "int32", + "example": 10 + } + }, + { + "name": "include", + "in": "query", + "schema": { + "type": "string" + }, + "description": "Items to include. Comma seperated" + } + ] + }, + "patch": { + "tags": [ + "CrackerBinarys" + ], + "responses": { + "400": { + "description": "Invalid request", + "content": { + "application/json": { + "schema": { + "$ref": "#/components/schemas/ErrorResponse" + } + } + } + }, + "401": { + "description": "Authentication failed", + "content": { + "application/json": { + "schema": { + "$ref": "#/components/schemas/ErrorResponse" + } + } + } + }, + "404": { + "description": "Not Found", + "content": { + "application/json": { + "schema": { + "$ref": "#/components/schemas/NotFoundResponse" + } + } + } + }, + "200": { + "description": "successful operation", + "content": { + "application/json": { + "schema": { + "$ref": "#/components/schemas/CrackerBinaryPostPatchResponse" + } + } + } + } + }, + "security": [ + { + "bearerAuth": [ + [ + "permCrackerBinaryUpdate" + ] + ] + } + ], + "description": "PATCH request to update attributes of a single object.", + "requestBody": { + "required": true, + "content": { + "application/json": { + "schema": { + "$ref": "#/components/schemas/CrackerBinaryPatch" + } + } + } + }, + "parameters": [] + }, + "delete": { + "tags": [ + "CrackerBinarys" + ], + "responses": { + "400": { + "description": "Invalid request", + "content": { + "application/json": { + "schema": { + "$ref": "#/components/schemas/ErrorResponse" + } + } + } + }, + "401": { + "description": "Authentication failed", + "content": { + "application/json": { + "schema": { + "$ref": "#/components/schemas/ErrorResponse" + } + } + } + }, + "404": { + "description": "Not Found", + "content": { + "application/json": { + "schema": { + "$ref": "#/components/schemas/NotFoundResponse" + } + } + } + }, + "204": { + "description": "successfully deleted" + } + }, + "security": [ + { + "bearerAuth": [ + [ + "permCrackerBinaryDelete" + ] + ] + } + ], + "description": "", + "requestBody": { + "required": true, + "content": { + "application/json": [] + } + }, + "parameters": [] + } + }, + "/api/v2/ui/crackertypes": { + "get": { + "tags": [ + "CrackerBinaryTypes" + ], + "responses": { + "400": { + "description": "Invalid request", + "content": { + "application/json": { + "schema": { + "$ref": "#/components/schemas/ErrorResponse" + } + } + } + }, + "401": { + "description": "Authentication failed", + "content": { + "application/json": { + "schema": { + "$ref": "#/components/schemas/ErrorResponse" + } + } + } + }, + "200": { + "description": "successful operation", + "content": { + "application/json": { + "schema": { + "type": "array", + "items": { + "$ref": "#/components/schemas/CrackerBinaryTypeResponse" + } + } + } + } + } + }, + "security": [ + { + "bearerAuth": [ + [ + "permCrackerBinaryTypeRead" + ] + ] + } + ], + "description": "GET many request to retrieve multiple objects.", + "parameters": [ + { + "name": "page[after]", + "in": "query", + "schema": { + "type": "integer", + "format": "int32" + }, + "example": 0, + "description": "Pointer to paginate to retrieve the data after the value provided" + }, + { + "name": "page[before]", + "in": "query", + "schema": { + "type": "integer", + "format": "int32" + }, + "example": 0, + "description": "Pointer to paginate to retrieve the data before the value provided" + }, + { + "name": "page[size]", + "in": "query", + "schema": { + "type": "integer", + "format": "int32" + }, + "example": 100, + "description": "Amout of data to retrieve inside a single page" + }, + { + "name": "filter", + "in": "query", + "style": "deepobject", + "explode": true, + "schema": { + "type": "object" + }, + "description": "Filters results using a query", + "example": "\"filter[hashlistId__gt]\": 200" + }, + { + "name": "include", + "in": "query", + "schema": { + "type": "string" + }, + "description": "Items to include, comma seperated. Possible options: crackerVersions,tasks" + } + ] + }, + "post": { + "tags": [ + "CrackerBinaryTypes" + ], + "responses": { + "400": { + "description": "Invalid request", + "content": { + "application/json": { + "schema": { + "$ref": "#/components/schemas/ErrorResponse" + } + } + } + }, + "401": { + "description": "Authentication failed", + "content": { + "application/json": { + "schema": { + "$ref": "#/components/schemas/ErrorResponse" + } + } + } + }, + "201": { + "description": "successful operation", + "content": { + "application/json": { + "schema": { + "$ref": "#/components/schemas/CrackerBinaryTypePostPatchResponse" + } + } + } + } + }, + "security": [ + { + "bearerAuth": [ + [ + "permCrackerBinaryTypeCreate" + ] + ] + } + ], + "description": "POST request to create a new object. The request must contain the resource record as data with the attributes of the new object.To add relationships, a relationships object can be added with the resource records of the relations that are part of this object.", + "requestBody": { + "required": true, + "content": { + "application/json": { + "schema": { + "$ref": "#/components/schemas/CrackerBinaryTypeCreate" + } + } + } + }, + "parameters": [] + } + }, + "/api/v2/ui/crackertypes/count": { + "get": { + "tags": [ + "CrackerBinaryTypes" + ], + "responses": { + "400": { + "description": "Invalid request", + "content": { + "application/json": { + "schema": { + "$ref": "#/components/schemas/ErrorResponse" + } + } + } + }, + "401": { + "description": "Authentication failed", + "content": { + "application/json": { + "schema": { + "$ref": "#/components/schemas/ErrorResponse" + } + } + } + }, + "200": { + "description": "successful operation", + "content": { + "application/json": { + "schema": { + "type": "array", + "items": { + "$ref": "#/components/schemas/CrackerBinaryTypeResponse" + } + } + } + } + } + }, + "security": [ + { + "bearerAuth": [ + [ + "permCrackerBinaryTypeRead" + ] + ] + } + ], + "description": "GET many request to retrieve multiple objects.", + "parameters": [ + { + "name": "page[after]", + "in": "query", + "schema": { + "type": "integer", + "format": "int32" + }, + "example": 0, + "description": "Pointer to paginate to retrieve the data after the value provided" + }, + { + "name": "page[before]", + "in": "query", + "schema": { + "type": "integer", + "format": "int32" + }, + "example": 0, + "description": "Pointer to paginate to retrieve the data before the value provided" + }, + { + "name": "page[size]", + "in": "query", + "schema": { + "type": "integer", + "format": "int32" + }, + "example": 100, + "description": "Amout of data to retrieve inside a single page" + }, + { + "name": "filter", + "in": "query", + "style": "deepobject", + "explode": true, + "schema": { + "type": "object" + }, + "description": "Filters results using a query", + "example": "\"filter[hashlistId__gt]\": 200" + }, + { + "name": "include", + "in": "query", + "schema": { + "type": "string" + }, + "description": "Items to include, comma seperated. Possible options: crackerVersions,tasks" + } + ] + } + }, + "/api/v2/ui/crackertypes/{id:[0-9]+}/{relation:crackerVersions}": { + "get": { + "tags": [ + "CrackerBinaryTypes" + ], + "responses": { + "400": { + "description": "Invalid request", + "content": { + "application/json": { + "schema": { + "$ref": "#/components/schemas/ErrorResponse" + } + } + } + }, + "401": { + "description": "Authentication failed", + "content": { + "application/json": { + "schema": { + "$ref": "#/components/schemas/ErrorResponse" + } + } + } + }, + "404": { + "description": "Not Found", + "content": { + "application/json": { + "schema": { + "$ref": "#/components/schemas/NotFoundResponse" + } + } + } + }, + "200": { + "description": "successful operation", + "content": { + "application/json": { + "schema": { + "$ref": "#/components/schemas/CrackerBinaryTypeResponse" + } + } + } + } + }, + "security": [ + { + "bearerAuth": [ + [ + "permCrackerBinaryTypeRead" + ] + ] + } + ], + "description": "GET request for for a to-one relationship link. Returns the resource record of the object that is part of the specified relation.", + "parameters": [ + { + "name": "id", + "in": "path", + "required": true, + "schema": { + "type": "integer", + "format": "int32", + "example": 10 + } + }, + { + "name": "include", + "in": "query", + "schema": { + "type": "string" + }, + "description": "Items to include. Comma seperated" + } + ] + } + }, + "/api/v2/ui/crackertypes/{id:[0-9]+}/relationships/{relation:crackerVersions}": { + "get": { + "tags": [ + "CrackerBinaryTypes" + ], + "responses": { + "400": { + "description": "Invalid request", + "content": { + "application/json": { + "schema": { + "$ref": "#/components/schemas/ErrorResponse" + } + } + } + }, + "401": { + "description": "Authentication failed", + "content": { + "application/json": { + "schema": { + "$ref": "#/components/schemas/ErrorResponse" + } + } + } + }, + "404": { + "description": "Not Found", + "content": { + "application/json": { + "schema": { + "$ref": "#/components/schemas/NotFoundResponse" + } + } + } + }, + "200": { + "description": "successful operation", + "content": { + "application/json": { + "schema": { + "$ref": "#/components/schemas/CrackerBinaryTypeResponse" + } + } + } + } + }, + "security": [ + { + "bearerAuth": [ + [ + "permCrackerBinaryTypeRead" + ] + ] + } + ], + "description": "GET request for for a to-one relationship link. Returns the resource record of the object that is part of the specified relation.", + "parameters": [ + { + "name": "id", + "in": "path", + "required": true, + "schema": { + "type": "integer", + "format": "int32", + "example": 10 + } + }, + { + "name": "include", + "in": "query", + "schema": { + "type": "string" + }, + "description": "Items to include. Comma seperated" + } + ] + }, + "patch": { + "tags": [ + "CrackerBinaryTypes" + ], + "responses": { + "400": { + "description": "Invalid request", + "content": { + "application/json": { + "schema": { + "$ref": "#/components/schemas/ErrorResponse" + } + } + } + }, + "401": { + "description": "Authentication failed", + "content": { + "application/json": { + "schema": { + "$ref": "#/components/schemas/ErrorResponse" + } + } + } + }, + "404": { + "description": "Not Found", + "content": { + "application/json": { + "schema": { + "$ref": "#/components/schemas/NotFoundResponse" + } + } + } + }, + "200": { + "description": "successful operation", + "content": { + "application/json": { + "schema": { + "$ref": "#/components/schemas/CrackerBinaryTypePostPatchResponse" + } + } + } + } + }, + "security": [ + { + "bearerAuth": [ + [ + "permCrackerBinaryTypeUpdate" + ] + ] + } + ], + "description": "", + "requestBody": { + "required": true, + "content": { + "application/json": { + "schema": { + "$ref": "#/components/schemas/CrackerBinaryTypePatch" + } + } + } + }, + "parameters": [] + }, + "post": { + "tags": [ + "CrackerBinaryTypes" + ], + "responses": { + "400": { + "description": "Invalid request", + "content": { + "application/json": { + "schema": { + "$ref": "#/components/schemas/ErrorResponse" + } + } + } + }, + "401": { + "description": "Authentication failed", + "content": { + "application/json": { + "schema": { + "$ref": "#/components/schemas/ErrorResponse" + } + } + } + }, + "404": { + "description": "Not Found", + "content": { + "application/json": { + "schema": { + "$ref": "#/components/schemas/NotFoundResponse" + } + } + } + }, + "204": { + "description": "successfully created" + } + }, + "security": [ + { + "bearerAuth": [ + [ + "permCrackerBinaryTypeCreate" + ] + ] + } + ], + "description": "", + "requestBody": { + "required": true, + "content": { + "application/json": [] + } + }, + "parameters": [] + }, + "delete": { + "tags": [ + "CrackerBinaryTypes" + ], + "responses": { + "400": { + "description": "Invalid request", + "content": { + "application/json": { + "schema": { + "$ref": "#/components/schemas/ErrorResponse" + } + } + } + }, + "401": { + "description": "Authentication failed", + "content": { + "application/json": { + "schema": { + "$ref": "#/components/schemas/ErrorResponse" + } + } + } + }, + "404": { + "description": "Not Found", + "content": { + "application/json": { + "schema": { + "$ref": "#/components/schemas/NotFoundResponse" + } + } + } + }, + "204": { + "description": "successfully deleted" + } + }, + "security": [ + { + "bearerAuth": [ + [ + "permCrackerBinaryTypeDelete" + ] + ] + } + ], + "description": "", + "requestBody": { + "required": true, + "content": { + "application/json": [] + } + }, + "parameters": [] + } + }, + "/api/v2/ui/crackertypes/{id:[0-9]+}/{relation:tasks}": { + "get": { + "tags": [ + "CrackerBinaryTypes" + ], + "responses": { + "400": { + "description": "Invalid request", + "content": { + "application/json": { + "schema": { + "$ref": "#/components/schemas/ErrorResponse" + } + } + } + }, + "401": { + "description": "Authentication failed", + "content": { + "application/json": { + "schema": { + "$ref": "#/components/schemas/ErrorResponse" + } + } + } + }, + "404": { + "description": "Not Found", + "content": { + "application/json": { + "schema": { + "$ref": "#/components/schemas/NotFoundResponse" + } + } + } + }, + "200": { + "description": "successful operation", + "content": { + "application/json": { + "schema": { + "$ref": "#/components/schemas/CrackerBinaryTypeResponse" + } + } + } + } + }, + "security": [ + { + "bearerAuth": [ + [ + "permCrackerBinaryTypeRead" + ] + ] + } + ], + "description": "GET request for for a to-one relationship link. Returns the resource record of the object that is part of the specified relation.", + "parameters": [ + { + "name": "id", + "in": "path", + "required": true, + "schema": { + "type": "integer", + "format": "int32", + "example": 10 + } + }, + { + "name": "include", + "in": "query", + "schema": { + "type": "string" + }, + "description": "Items to include. Comma seperated" + } + ] + } + }, + "/api/v2/ui/crackertypes/{id:[0-9]+}/relationships/{relation:tasks}": { + "get": { + "tags": [ + "CrackerBinaryTypes" + ], + "responses": { + "400": { + "description": "Invalid request", + "content": { + "application/json": { + "schema": { + "$ref": "#/components/schemas/ErrorResponse" + } + } + } + }, + "401": { + "description": "Authentication failed", + "content": { + "application/json": { + "schema": { + "$ref": "#/components/schemas/ErrorResponse" + } + } + } + }, + "404": { + "description": "Not Found", + "content": { + "application/json": { + "schema": { + "$ref": "#/components/schemas/NotFoundResponse" + } + } + } + }, + "200": { + "description": "successful operation", + "content": { + "application/json": { + "schema": { + "$ref": "#/components/schemas/CrackerBinaryTypeResponse" + } + } + } + } + }, + "security": [ + { + "bearerAuth": [ + [ + "permCrackerBinaryTypeRead" + ] + ] + } + ], + "description": "GET request for for a to-one relationship link. Returns the resource record of the object that is part of the specified relation.", + "parameters": [ + { + "name": "id", + "in": "path", + "required": true, + "schema": { + "type": "integer", + "format": "int32", + "example": 10 + } + }, + { + "name": "include", + "in": "query", + "schema": { + "type": "string" + }, + "description": "Items to include. Comma seperated" + } + ] + }, + "patch": { + "tags": [ + "CrackerBinaryTypes" + ], + "responses": { + "400": { + "description": "Invalid request", + "content": { + "application/json": { + "schema": { + "$ref": "#/components/schemas/ErrorResponse" + } + } + } + }, + "401": { + "description": "Authentication failed", + "content": { + "application/json": { + "schema": { + "$ref": "#/components/schemas/ErrorResponse" + } + } + } + }, + "404": { + "description": "Not Found", + "content": { + "application/json": { + "schema": { + "$ref": "#/components/schemas/NotFoundResponse" + } + } + } + }, + "200": { + "description": "successful operation", + "content": { + "application/json": { + "schema": { + "$ref": "#/components/schemas/CrackerBinaryTypePostPatchResponse" + } + } + } + } + }, + "security": [ + { + "bearerAuth": [ + [ + "permCrackerBinaryTypeUpdate" + ] + ] + } + ], + "description": "", + "requestBody": { + "required": true, + "content": { + "application/json": { + "schema": { + "$ref": "#/components/schemas/CrackerBinaryTypePatch" + } + } + } + }, + "parameters": [] + }, + "post": { + "tags": [ + "CrackerBinaryTypes" + ], + "responses": { + "400": { + "description": "Invalid request", + "content": { + "application/json": { + "schema": { + "$ref": "#/components/schemas/ErrorResponse" + } + } + } + }, + "401": { + "description": "Authentication failed", + "content": { + "application/json": { + "schema": { + "$ref": "#/components/schemas/ErrorResponse" + } + } + } + }, + "404": { + "description": "Not Found", + "content": { + "application/json": { + "schema": { + "$ref": "#/components/schemas/NotFoundResponse" + } + } + } + }, + "204": { + "description": "successfully created" + } + }, + "security": [ + { + "bearerAuth": [ + [ + "permCrackerBinaryTypeCreate" + ] + ] + } + ], + "description": "", + "requestBody": { + "required": true, + "content": { + "application/json": [] + } + }, + "parameters": [] + }, + "delete": { + "tags": [ + "CrackerBinaryTypes" + ], + "responses": { + "400": { + "description": "Invalid request", + "content": { + "application/json": { + "schema": { + "$ref": "#/components/schemas/ErrorResponse" + } + } + } + }, + "401": { + "description": "Authentication failed", + "content": { + "application/json": { + "schema": { + "$ref": "#/components/schemas/ErrorResponse" + } + } + } + }, + "404": { + "description": "Not Found", + "content": { + "application/json": { + "schema": { + "$ref": "#/components/schemas/NotFoundResponse" + } + } + } + }, + "204": { + "description": "successfully deleted" + } + }, + "security": [ + { + "bearerAuth": [ + [ + "permCrackerBinaryTypeDelete" + ] + ] + } + ], + "description": "", + "requestBody": { + "required": true, + "content": { + "application/json": [] + } + }, + "parameters": [] + } + }, + "/api/v2/ui/crackertypes/{id:[0-9]+}": { + "get": { + "tags": [ + "CrackerBinaryTypes" + ], + "responses": { + "400": { + "description": "Invalid request", + "content": { + "application/json": { + "schema": { + "$ref": "#/components/schemas/ErrorResponse" + } + } + } + }, + "401": { + "description": "Authentication failed", + "content": { + "application/json": { + "schema": { + "$ref": "#/components/schemas/ErrorResponse" + } + } + } + }, + "404": { + "description": "Not Found", + "content": { + "application/json": { + "schema": { + "$ref": "#/components/schemas/NotFoundResponse" + } + } + } + }, + "200": { + "description": "successful operation", + "content": { + "application/json": { + "schema": { + "$ref": "#/components/schemas/CrackerBinaryTypeResponse" + } + } + } + } + }, + "security": [ + { + "bearerAuth": [ + [ + "permCrackerBinaryTypeRead" + ] + ] + } + ], + "description": "GET request to retrieve a single object.", + "parameters": [ + { + "name": "id", + "in": "path", + "required": true, + "schema": { + "type": "integer", + "format": "int32", + "example": 10 + } + }, + { + "name": "include", + "in": "query", + "schema": { + "type": "string" + }, + "description": "Items to include. Comma seperated" + } + ] + }, + "patch": { + "tags": [ + "CrackerBinaryTypes" + ], + "responses": { + "400": { + "description": "Invalid request", + "content": { + "application/json": { + "schema": { + "$ref": "#/components/schemas/ErrorResponse" + } + } + } + }, + "401": { + "description": "Authentication failed", + "content": { + "application/json": { + "schema": { + "$ref": "#/components/schemas/ErrorResponse" + } + } + } + }, + "404": { + "description": "Not Found", + "content": { + "application/json": { + "schema": { + "$ref": "#/components/schemas/NotFoundResponse" + } + } + } + }, + "200": { + "description": "successful operation", + "content": { + "application/json": { + "schema": { + "$ref": "#/components/schemas/CrackerBinaryTypePostPatchResponse" + } + } + } + } + }, + "security": [ + { + "bearerAuth": [ + [ + "permCrackerBinaryTypeUpdate" + ] + ] + } + ], + "description": "PATCH request to update attributes of a single object.", + "requestBody": { + "required": true, + "content": { + "application/json": { + "schema": { + "$ref": "#/components/schemas/CrackerBinaryTypePatch" + } + } + } + }, + "parameters": [] + }, + "delete": { + "tags": [ + "CrackerBinaryTypes" + ], + "responses": { + "400": { + "description": "Invalid request", + "content": { + "application/json": { + "schema": { + "$ref": "#/components/schemas/ErrorResponse" + } + } + } + }, + "401": { + "description": "Authentication failed", + "content": { + "application/json": { + "schema": { + "$ref": "#/components/schemas/ErrorResponse" + } + } + } + }, + "404": { + "description": "Not Found", + "content": { + "application/json": { + "schema": { + "$ref": "#/components/schemas/NotFoundResponse" + } + } + } + }, + "204": { + "description": "successfully deleted" + } + }, + "security": [ + { + "bearerAuth": [ + [ + "permCrackerBinaryTypeDelete" + ] + ] + } + ], + "description": "", + "requestBody": { + "required": true, + "content": { + "application/json": [] + } + }, + "parameters": [] + } + }, + "/api/v2/ui/files": { + "get": { + "tags": [ + "Files" + ], + "responses": { + "400": { + "description": "Invalid request", + "content": { + "application/json": { + "schema": { + "$ref": "#/components/schemas/ErrorResponse" + } + } + } + }, + "401": { + "description": "Authentication failed", + "content": { + "application/json": { + "schema": { + "$ref": "#/components/schemas/ErrorResponse" + } + } + } + }, + "200": { + "description": "successful operation", + "content": { + "application/json": { + "schema": { + "type": "array", + "items": { + "$ref": "#/components/schemas/FileResponse" + } + } + } + } + } + }, + "security": [ + { + "bearerAuth": [ + [ + "permFileRead" + ] + ] + } + ], + "description": "GET many request to retrieve multiple objects.", + "parameters": [ + { + "name": "page[after]", + "in": "query", + "schema": { + "type": "integer", + "format": "int32" + }, + "example": 0, + "description": "Pointer to paginate to retrieve the data after the value provided" + }, + { + "name": "page[before]", + "in": "query", + "schema": { + "type": "integer", + "format": "int32" + }, + "example": 0, + "description": "Pointer to paginate to retrieve the data before the value provided" + }, + { + "name": "page[size]", + "in": "query", + "schema": { + "type": "integer", + "format": "int32" + }, + "example": 100, + "description": "Amout of data to retrieve inside a single page" + }, + { + "name": "filter", + "in": "query", + "style": "deepobject", + "explode": true, + "schema": { + "type": "object" + }, + "description": "Filters results using a query", + "example": "\"filter[hashlistId__gt]\": 200" + }, + { + "name": "include", + "in": "query", + "schema": { + "type": "string" + }, + "description": "Items to include, comma seperated. Possible options: accessGroup" + } + ] + }, + "post": { + "tags": [ + "Files" + ], + "responses": { + "400": { + "description": "Invalid request", + "content": { + "application/json": { + "schema": { + "$ref": "#/components/schemas/ErrorResponse" + } + } + } + }, + "401": { + "description": "Authentication failed", + "content": { + "application/json": { + "schema": { + "$ref": "#/components/schemas/ErrorResponse" + } + } + } + }, + "201": { + "description": "successful operation", + "content": { + "application/json": { + "schema": { + "$ref": "#/components/schemas/FilePostPatchResponse" + } + } + } + } + }, + "security": [ + { + "bearerAuth": [ + [ + "permFileCreate" + ] + ] + } + ], + "description": "POST request to create a new object. The request must contain the resource record as data with the attributes of the new object.To add relationships, a relationships object can be added with the resource records of the relations that are part of this object.", + "requestBody": { + "required": true, + "content": { + "application/json": { + "schema": { + "$ref": "#/components/schemas/FileCreate" + } + } + } + }, + "parameters": [] + } + }, + "/api/v2/ui/files/count": { + "get": { + "tags": [ + "Files" + ], + "responses": { + "400": { + "description": "Invalid request", + "content": { + "application/json": { + "schema": { + "$ref": "#/components/schemas/ErrorResponse" + } + } + } + }, + "401": { + "description": "Authentication failed", + "content": { + "application/json": { + "schema": { + "$ref": "#/components/schemas/ErrorResponse" + } + } + } + }, + "200": { + "description": "successful operation", + "content": { + "application/json": { + "schema": { + "type": "array", + "items": { + "$ref": "#/components/schemas/FileResponse" + } + } + } + } + } + }, + "security": [ + { + "bearerAuth": [ + [ + "permFileRead" + ] + ] + } + ], + "description": "GET many request to retrieve multiple objects.", + "parameters": [ + { + "name": "page[after]", + "in": "query", + "schema": { + "type": "integer", + "format": "int32" + }, + "example": 0, + "description": "Pointer to paginate to retrieve the data after the value provided" + }, + { + "name": "page[before]", + "in": "query", + "schema": { + "type": "integer", + "format": "int32" + }, + "example": 0, + "description": "Pointer to paginate to retrieve the data before the value provided" + }, + { + "name": "page[size]", + "in": "query", + "schema": { + "type": "integer", + "format": "int32" + }, + "example": 100, + "description": "Amout of data to retrieve inside a single page" + }, + { + "name": "filter", + "in": "query", + "style": "deepobject", + "explode": true, + "schema": { + "type": "object" + }, + "description": "Filters results using a query", + "example": "\"filter[hashlistId__gt]\": 200" + }, + { + "name": "include", + "in": "query", + "schema": { + "type": "string" + }, + "description": "Items to include, comma seperated. Possible options: accessGroup" + } + ] + } + }, + "/api/v2/ui/files/{id:[0-9]+}/{relation:accessGroup}": { + "get": { + "tags": [ + "Files" + ], + "responses": { + "400": { + "description": "Invalid request", + "content": { + "application/json": { + "schema": { + "$ref": "#/components/schemas/ErrorResponse" + } + } + } + }, + "401": { + "description": "Authentication failed", + "content": { + "application/json": { + "schema": { + "$ref": "#/components/schemas/ErrorResponse" + } + } + } + }, + "404": { + "description": "Not Found", + "content": { + "application/json": { + "schema": { + "$ref": "#/components/schemas/NotFoundResponse" + } + } + } + }, + "200": { + "description": "successful operation", + "content": { + "application/json": { + "schema": { + "$ref": "#/components/schemas/FileResponse" + } + } + } + } + }, + "security": [ + { + "bearerAuth": [ + [ + "permFileRead" + ] + ] + } + ], + "description": "GET request for for a to-one relationship link. Returns the resource record of the object that is part of the specified relation.", + "parameters": [ + { + "name": "id", + "in": "path", + "required": true, + "schema": { + "type": "integer", + "format": "int32", + "example": 10 + } + }, + { + "name": "include", + "in": "query", + "schema": { + "type": "string" + }, + "description": "Items to include. Comma seperated" + } + ] + } + }, + "/api/v2/ui/files/{id:[0-9]+}/relationships/{relation:accessGroup}": { + "get": { + "tags": [ + "Files" + ], + "responses": { + "400": { + "description": "Invalid request", + "content": { + "application/json": { + "schema": { + "$ref": "#/components/schemas/ErrorResponse" + } + } + } + }, + "401": { + "description": "Authentication failed", + "content": { + "application/json": { + "schema": { + "$ref": "#/components/schemas/ErrorResponse" + } + } + } + }, + "404": { + "description": "Not Found", + "content": { + "application/json": { + "schema": { + "$ref": "#/components/schemas/NotFoundResponse" + } + } + } + }, + "200": { + "description": "successful operation", + "content": { + "application/json": { + "schema": { + "$ref": "#/components/schemas/FileResponse" + } + } + } + } + }, + "security": [ + { + "bearerAuth": [ + [ + "permFileRead" + ] + ] + } + ], + "description": "GET request for for a to-one relationship link. Returns the resource record of the object that is part of the specified relation.", + "parameters": [ + { + "name": "id", + "in": "path", + "required": true, + "schema": { + "type": "integer", + "format": "int32", + "example": 10 + } + }, + { + "name": "include", + "in": "query", + "schema": { + "type": "string" + }, + "description": "Items to include. Comma seperated" + } + ] + }, + "patch": { + "tags": [ + "Files" + ], + "responses": { + "400": { + "description": "Invalid request", + "content": { + "application/json": { + "schema": { + "$ref": "#/components/schemas/ErrorResponse" + } + } + } + }, + "401": { + "description": "Authentication failed", + "content": { + "application/json": { + "schema": { + "$ref": "#/components/schemas/ErrorResponse" + } + } + } + }, + "404": { + "description": "Not Found", + "content": { + "application/json": { + "schema": { + "$ref": "#/components/schemas/NotFoundResponse" + } + } + } + }, + "200": { + "description": "successful operation", + "content": { + "application/json": { + "schema": { + "$ref": "#/components/schemas/FilePostPatchResponse" + } + } + } + } + }, + "security": [ + { + "bearerAuth": [ + [ + "permFileUpdate" + ] + ] + } + ], + "description": "", + "requestBody": { + "required": true, + "content": { + "application/json": { + "schema": { + "$ref": "#/components/schemas/FilePatch" + } + } + } + }, + "parameters": [] + } + }, + "/api/v2/ui/files/{id:[0-9]+}": { + "get": { + "tags": [ + "Files" + ], + "responses": { + "400": { + "description": "Invalid request", + "content": { + "application/json": { + "schema": { + "$ref": "#/components/schemas/ErrorResponse" + } + } + } + }, + "401": { + "description": "Authentication failed", + "content": { + "application/json": { + "schema": { + "$ref": "#/components/schemas/ErrorResponse" + } + } + } + }, + "404": { + "description": "Not Found", + "content": { + "application/json": { + "schema": { + "$ref": "#/components/schemas/NotFoundResponse" + } + } + } + }, + "200": { + "description": "successful operation", + "content": { + "application/json": { + "schema": { + "$ref": "#/components/schemas/FileResponse" + } + } + } + } + }, + "security": [ + { + "bearerAuth": [ + [ + "permFileRead" + ] + ] + } + ], + "description": "GET request to retrieve a single object.", + "parameters": [ + { + "name": "id", + "in": "path", + "required": true, + "schema": { + "type": "integer", + "format": "int32", + "example": 10 + } + }, + { + "name": "include", + "in": "query", + "schema": { + "type": "string" + }, + "description": "Items to include. Comma seperated" + } + ] + }, + "patch": { + "tags": [ + "Files" + ], + "responses": { + "400": { + "description": "Invalid request", + "content": { + "application/json": { + "schema": { + "$ref": "#/components/schemas/ErrorResponse" + } + } + } + }, + "401": { + "description": "Authentication failed", + "content": { + "application/json": { + "schema": { + "$ref": "#/components/schemas/ErrorResponse" + } + } + } + }, + "404": { + "description": "Not Found", + "content": { + "application/json": { + "schema": { + "$ref": "#/components/schemas/NotFoundResponse" + } + } + } + }, + "200": { + "description": "successful operation", + "content": { + "application/json": { + "schema": { + "$ref": "#/components/schemas/FilePostPatchResponse" + } + } + } + } + }, + "security": [ + { + "bearerAuth": [ + [ + "permFileUpdate" + ] + ] + } + ], + "description": "PATCH request to update attributes of a single object.", + "requestBody": { + "required": true, + "content": { + "application/json": { + "schema": { + "$ref": "#/components/schemas/FilePatch" + } + } + } + }, + "parameters": [] + }, + "delete": { + "tags": [ + "Files" + ], + "responses": { + "400": { + "description": "Invalid request", + "content": { + "application/json": { + "schema": { + "$ref": "#/components/schemas/ErrorResponse" + } + } + } + }, + "401": { + "description": "Authentication failed", + "content": { + "application/json": { + "schema": { + "$ref": "#/components/schemas/ErrorResponse" + } + } + } + }, + "404": { + "description": "Not Found", + "content": { + "application/json": { + "schema": { + "$ref": "#/components/schemas/NotFoundResponse" + } + } + } + }, + "204": { + "description": "successfully deleted" + } + }, + "security": [ + { + "bearerAuth": [ + [ + "permFileDelete" + ] + ] + } + ], + "description": "", + "requestBody": { + "required": true, + "content": { + "application/json": [] + } + }, + "parameters": [] + } + }, + "/api/v2/ui/globalpermissiongroups": { + "get": { + "tags": [ + "RightGroups" + ], + "responses": { + "400": { + "description": "Invalid request", + "content": { + "application/json": { + "schema": { + "$ref": "#/components/schemas/ErrorResponse" + } + } + } + }, + "401": { + "description": "Authentication failed", + "content": { + "application/json": { + "schema": { + "$ref": "#/components/schemas/ErrorResponse" + } + } + } + }, + "200": { + "description": "successful operation", + "content": { + "application/json": { + "schema": { + "type": "array", + "items": { + "$ref": "#/components/schemas/RightGroupResponse" + } + } + } + } + } + }, + "security": [ + { + "bearerAuth": [ + [ + "permRightGroupRead" + ] + ] + } + ], + "description": "GET many request to retrieve multiple objects.", + "parameters": [ + { + "name": "page[after]", + "in": "query", + "schema": { + "type": "integer", + "format": "int32" + }, + "example": 0, + "description": "Pointer to paginate to retrieve the data after the value provided" + }, + { + "name": "page[before]", + "in": "query", + "schema": { + "type": "integer", + "format": "int32" + }, + "example": 0, + "description": "Pointer to paginate to retrieve the data before the value provided" + }, + { + "name": "page[size]", + "in": "query", + "schema": { + "type": "integer", + "format": "int32" + }, + "example": 100, + "description": "Amout of data to retrieve inside a single page" + }, + { + "name": "filter", + "in": "query", + "style": "deepobject", + "explode": true, + "schema": { + "type": "object" + }, + "description": "Filters results using a query", + "example": "\"filter[hashlistId__gt]\": 200" + }, + { + "name": "include", + "in": "query", + "schema": { + "type": "string" + }, + "description": "Items to include, comma seperated. Possible options: userMembers" + } + ] + }, + "post": { + "tags": [ + "RightGroups" + ], + "responses": { + "400": { + "description": "Invalid request", + "content": { + "application/json": { + "schema": { + "$ref": "#/components/schemas/ErrorResponse" + } + } + } + }, + "401": { + "description": "Authentication failed", + "content": { + "application/json": { + "schema": { + "$ref": "#/components/schemas/ErrorResponse" + } + } + } + }, + "201": { + "description": "successful operation", + "content": { + "application/json": { + "schema": { + "$ref": "#/components/schemas/RightGroupPostPatchResponse" + } + } + } + } + }, + "security": [ + { + "bearerAuth": [ + [ + "permRightGroupCreate" + ] + ] + } + ], + "description": "POST request to create a new object. The request must contain the resource record as data with the attributes of the new object.To add relationships, a relationships object can be added with the resource records of the relations that are part of this object.", + "requestBody": { + "required": true, + "content": { + "application/json": { + "schema": { + "$ref": "#/components/schemas/RightGroupCreate" + } + } + } + }, + "parameters": [] + } + }, + "/api/v2/ui/globalpermissiongroups/count": { + "get": { + "tags": [ + "RightGroups" + ], + "responses": { + "400": { + "description": "Invalid request", + "content": { + "application/json": { + "schema": { + "$ref": "#/components/schemas/ErrorResponse" + } + } + } + }, + "401": { + "description": "Authentication failed", + "content": { + "application/json": { + "schema": { + "$ref": "#/components/schemas/ErrorResponse" + } + } + } + }, + "200": { + "description": "successful operation", + "content": { + "application/json": { + "schema": { + "type": "array", + "items": { + "$ref": "#/components/schemas/RightGroupResponse" + } + } + } + } + } + }, + "security": [ + { + "bearerAuth": [ + [ + "permRightGroupRead" + ] + ] + } + ], + "description": "GET many request to retrieve multiple objects.", + "parameters": [ + { + "name": "page[after]", + "in": "query", + "schema": { + "type": "integer", + "format": "int32" + }, + "example": 0, + "description": "Pointer to paginate to retrieve the data after the value provided" + }, + { + "name": "page[before]", + "in": "query", + "schema": { + "type": "integer", + "format": "int32" + }, + "example": 0, + "description": "Pointer to paginate to retrieve the data before the value provided" + }, + { + "name": "page[size]", + "in": "query", + "schema": { + "type": "integer", + "format": "int32" + }, + "example": 100, + "description": "Amout of data to retrieve inside a single page" + }, + { + "name": "filter", + "in": "query", + "style": "deepobject", + "explode": true, + "schema": { + "type": "object" + }, + "description": "Filters results using a query", + "example": "\"filter[hashlistId__gt]\": 200" + }, + { + "name": "include", + "in": "query", + "schema": { + "type": "string" + }, + "description": "Items to include, comma seperated. Possible options: userMembers" + } + ] + } + }, + "/api/v2/ui/globalpermissiongroups/{id:[0-9]+}/{relation:userMembers}": { + "get": { + "tags": [ + "RightGroups" + ], + "responses": { + "400": { + "description": "Invalid request", + "content": { + "application/json": { + "schema": { + "$ref": "#/components/schemas/ErrorResponse" + } + } + } + }, + "401": { + "description": "Authentication failed", + "content": { + "application/json": { + "schema": { + "$ref": "#/components/schemas/ErrorResponse" + } + } + } + }, + "404": { + "description": "Not Found", + "content": { + "application/json": { + "schema": { + "$ref": "#/components/schemas/NotFoundResponse" + } + } + } + }, + "200": { + "description": "successful operation", + "content": { + "application/json": { + "schema": { + "$ref": "#/components/schemas/RightGroupResponse" + } + } + } + } + }, + "security": [ + { + "bearerAuth": [ + [ + "permRightGroupRead" + ] + ] + } + ], + "description": "GET request for for a to-one relationship link. Returns the resource record of the object that is part of the specified relation.", + "parameters": [ + { + "name": "id", + "in": "path", + "required": true, + "schema": { + "type": "integer", + "format": "int32", + "example": 10 + } + }, + { + "name": "include", + "in": "query", + "schema": { + "type": "string" + }, + "description": "Items to include. Comma seperated" + } + ] + } + }, + "/api/v2/ui/globalpermissiongroups/{id:[0-9]+}/relationships/{relation:userMembers}": { + "get": { + "tags": [ + "RightGroups" + ], + "responses": { + "400": { + "description": "Invalid request", + "content": { + "application/json": { + "schema": { + "$ref": "#/components/schemas/ErrorResponse" + } + } + } + }, + "401": { + "description": "Authentication failed", + "content": { + "application/json": { + "schema": { + "$ref": "#/components/schemas/ErrorResponse" + } + } + } + }, + "404": { + "description": "Not Found", + "content": { + "application/json": { + "schema": { + "$ref": "#/components/schemas/NotFoundResponse" + } + } + } + }, + "200": { + "description": "successful operation", + "content": { + "application/json": { + "schema": { + "$ref": "#/components/schemas/RightGroupResponse" + } + } + } + } + }, + "security": [ + { + "bearerAuth": [ + [ + "permRightGroupRead" + ] + ] + } + ], + "description": "GET request for for a to-one relationship link. Returns the resource record of the object that is part of the specified relation.", + "parameters": [ + { + "name": "id", + "in": "path", + "required": true, + "schema": { + "type": "integer", + "format": "int32", + "example": 10 + } + }, + { + "name": "include", + "in": "query", + "schema": { + "type": "string" + }, + "description": "Items to include. Comma seperated" + } + ] + }, + "patch": { + "tags": [ + "RightGroups" + ], + "responses": { + "400": { + "description": "Invalid request", + "content": { + "application/json": { + "schema": { + "$ref": "#/components/schemas/ErrorResponse" + } + } + } + }, + "401": { + "description": "Authentication failed", + "content": { + "application/json": { + "schema": { + "$ref": "#/components/schemas/ErrorResponse" + } + } + } + }, + "404": { + "description": "Not Found", + "content": { + "application/json": { + "schema": { + "$ref": "#/components/schemas/NotFoundResponse" + } + } + } + }, + "200": { + "description": "successful operation", + "content": { + "application/json": { + "schema": { + "$ref": "#/components/schemas/RightGroupPostPatchResponse" + } + } + } + } + }, + "security": [ + { + "bearerAuth": [ + [ + "permRightGroupUpdate" + ] + ] + } + ], + "description": "", + "requestBody": { + "required": true, + "content": { + "application/json": { + "schema": { + "$ref": "#/components/schemas/RightGroupPatch" + } + } + } + }, + "parameters": [] + }, + "post": { + "tags": [ + "RightGroups" + ], + "responses": { + "400": { + "description": "Invalid request", + "content": { + "application/json": { + "schema": { + "$ref": "#/components/schemas/ErrorResponse" + } + } + } + }, + "401": { + "description": "Authentication failed", + "content": { + "application/json": { + "schema": { + "$ref": "#/components/schemas/ErrorResponse" + } + } + } + }, + "404": { + "description": "Not Found", + "content": { + "application/json": { + "schema": { + "$ref": "#/components/schemas/NotFoundResponse" + } + } + } + }, + "204": { + "description": "successfully created" + } + }, + "security": [ + { + "bearerAuth": [ + [ + "permRightGroupCreate" + ] + ] + } + ], + "description": "", + "requestBody": { + "required": true, + "content": { + "application/json": [] + } + }, + "parameters": [] + }, + "delete": { + "tags": [ + "RightGroups" + ], + "responses": { + "400": { + "description": "Invalid request", + "content": { + "application/json": { + "schema": { + "$ref": "#/components/schemas/ErrorResponse" + } + } + } + }, + "401": { + "description": "Authentication failed", + "content": { + "application/json": { + "schema": { + "$ref": "#/components/schemas/ErrorResponse" + } + } + } + }, + "404": { + "description": "Not Found", + "content": { + "application/json": { + "schema": { + "$ref": "#/components/schemas/NotFoundResponse" + } + } + } + }, + "204": { + "description": "successfully deleted" + } + }, + "security": [ + { + "bearerAuth": [ + [ + "permRightGroupDelete" + ] + ] + } + ], + "description": "", + "requestBody": { + "required": true, + "content": { + "application/json": [] + } + }, + "parameters": [] + } + }, + "/api/v2/ui/globalpermissiongroups/{id:[0-9]+}": { + "get": { + "tags": [ + "RightGroups" + ], + "responses": { + "400": { + "description": "Invalid request", + "content": { + "application/json": { + "schema": { + "$ref": "#/components/schemas/ErrorResponse" + } + } + } + }, + "401": { + "description": "Authentication failed", + "content": { + "application/json": { + "schema": { + "$ref": "#/components/schemas/ErrorResponse" + } + } + } + }, + "404": { + "description": "Not Found", + "content": { + "application/json": { + "schema": { + "$ref": "#/components/schemas/NotFoundResponse" + } + } + } + }, + "200": { + "description": "successful operation", + "content": { + "application/json": { + "schema": { + "$ref": "#/components/schemas/RightGroupResponse" + } + } + } + } + }, + "security": [ + { + "bearerAuth": [ + [ + "permRightGroupRead" + ] + ] + } + ], + "description": "GET request to retrieve a single object.", + "parameters": [ + { + "name": "id", + "in": "path", + "required": true, + "schema": { + "type": "integer", + "format": "int32", + "example": 10 + } + }, + { + "name": "include", + "in": "query", + "schema": { + "type": "string" + }, + "description": "Items to include. Comma seperated" + } + ] + }, + "patch": { + "tags": [ + "RightGroups" + ], + "responses": { + "400": { + "description": "Invalid request", + "content": { + "application/json": { + "schema": { + "$ref": "#/components/schemas/ErrorResponse" + } + } + } + }, + "401": { + "description": "Authentication failed", + "content": { + "application/json": { + "schema": { + "$ref": "#/components/schemas/ErrorResponse" + } + } + } + }, + "404": { + "description": "Not Found", + "content": { + "application/json": { + "schema": { + "$ref": "#/components/schemas/NotFoundResponse" + } + } + } + }, + "200": { + "description": "successful operation", + "content": { + "application/json": { + "schema": { + "$ref": "#/components/schemas/RightGroupPostPatchResponse" + } + } + } + } + }, + "security": [ + { + "bearerAuth": [ + [ + "permRightGroupUpdate" + ] + ] + } + ], + "description": "PATCH request to update attributes of a single object.", + "requestBody": { + "required": true, + "content": { + "application/json": { + "schema": { + "$ref": "#/components/schemas/RightGroupPatch" + } + } + } + }, + "parameters": [] + }, + "delete": { + "tags": [ + "RightGroups" + ], + "responses": { + "400": { + "description": "Invalid request", + "content": { + "application/json": { + "schema": { + "$ref": "#/components/schemas/ErrorResponse" + } + } + } + }, + "401": { + "description": "Authentication failed", + "content": { + "application/json": { + "schema": { + "$ref": "#/components/schemas/ErrorResponse" + } + } + } + }, + "404": { + "description": "Not Found", + "content": { + "application/json": { + "schema": { + "$ref": "#/components/schemas/NotFoundResponse" + } + } + } + }, + "204": { + "description": "successfully deleted" + } + }, + "security": [ + { + "bearerAuth": [ + [ + "permRightGroupDelete" + ] + ] + } + ], + "description": "", + "requestBody": { + "required": true, + "content": { + "application/json": [] + } + }, + "parameters": [] + } + }, + "/api/v2/ui/hashes": { + "get": { + "tags": [ + "Hashs" + ], + "responses": { + "400": { + "description": "Invalid request", + "content": { + "application/json": { + "schema": { + "$ref": "#/components/schemas/ErrorResponse" + } + } + } + }, + "401": { + "description": "Authentication failed", + "content": { + "application/json": { + "schema": { + "$ref": "#/components/schemas/ErrorResponse" + } + } + } + }, + "200": { + "description": "successful operation", + "content": { + "application/json": { + "schema": { + "type": "array", + "items": { + "$ref": "#/components/schemas/HashResponse" + } + } + } + } + } + }, + "security": [ + { + "bearerAuth": [ + [ + "permHashRead" + ] + ] + } + ], + "description": "GET many request to retrieve multiple objects.", + "parameters": [ + { + "name": "page[after]", + "in": "query", + "schema": { + "type": "integer", + "format": "int32" + }, + "example": 0, + "description": "Pointer to paginate to retrieve the data after the value provided" + }, + { + "name": "page[before]", + "in": "query", + "schema": { + "type": "integer", + "format": "int32" + }, + "example": 0, + "description": "Pointer to paginate to retrieve the data before the value provided" + }, + { + "name": "page[size]", + "in": "query", + "schema": { + "type": "integer", + "format": "int32" + }, + "example": 100, + "description": "Amout of data to retrieve inside a single page" + }, + { + "name": "filter", + "in": "query", + "style": "deepobject", + "explode": true, + "schema": { + "type": "object" + }, + "description": "Filters results using a query", + "example": "\"filter[hashlistId__gt]\": 200" + }, + { + "name": "include", + "in": "query", + "schema": { + "type": "string" + }, + "description": "Items to include, comma seperated. Possible options: chunk,hashlist" + } + ] + } + }, + "/api/v2/ui/hashes/count": { + "get": { + "tags": [ + "Hashs" + ], + "responses": { + "400": { + "description": "Invalid request", + "content": { + "application/json": { + "schema": { + "$ref": "#/components/schemas/ErrorResponse" + } + } + } + }, + "401": { + "description": "Authentication failed", + "content": { + "application/json": { + "schema": { + "$ref": "#/components/schemas/ErrorResponse" + } + } + } + }, + "200": { + "description": "successful operation", + "content": { + "application/json": { + "schema": { + "type": "array", + "items": { + "$ref": "#/components/schemas/HashResponse" + } + } + } + } + } + }, + "security": [ + { + "bearerAuth": [ + [ + "permHashRead" + ] + ] + } + ], + "description": "GET many request to retrieve multiple objects.", + "parameters": [ + { + "name": "page[after]", + "in": "query", + "schema": { + "type": "integer", + "format": "int32" + }, + "example": 0, + "description": "Pointer to paginate to retrieve the data after the value provided" + }, + { + "name": "page[before]", + "in": "query", + "schema": { + "type": "integer", + "format": "int32" + }, + "example": 0, + "description": "Pointer to paginate to retrieve the data before the value provided" + }, + { + "name": "page[size]", + "in": "query", + "schema": { + "type": "integer", + "format": "int32" + }, + "example": 100, + "description": "Amout of data to retrieve inside a single page" + }, + { + "name": "filter", + "in": "query", + "style": "deepobject", + "explode": true, + "schema": { + "type": "object" + }, + "description": "Filters results using a query", + "example": "\"filter[hashlistId__gt]\": 200" + }, + { + "name": "include", + "in": "query", + "schema": { + "type": "string" + }, + "description": "Items to include, comma seperated. Possible options: chunk,hashlist" + } + ] + } + }, + "/api/v2/ui/hashes/{id:[0-9]+}/{relation:chunk}": { + "get": { + "tags": [ + "Hashs" + ], + "responses": { + "400": { + "description": "Invalid request", + "content": { + "application/json": { + "schema": { + "$ref": "#/components/schemas/ErrorResponse" + } + } + } + }, + "401": { + "description": "Authentication failed", + "content": { + "application/json": { + "schema": { + "$ref": "#/components/schemas/ErrorResponse" + } + } + } + }, + "404": { + "description": "Not Found", + "content": { + "application/json": { + "schema": { + "$ref": "#/components/schemas/NotFoundResponse" + } + } + } + }, + "200": { + "description": "successful operation", + "content": { + "application/json": { + "schema": { + "$ref": "#/components/schemas/HashResponse" + } + } + } + } + }, + "security": [ + { + "bearerAuth": [ + [ + "permHashRead" + ] + ] + } + ], + "description": "GET request for for a to-one relationship link. Returns the resource record of the object that is part of the specified relation.", + "parameters": [ + { + "name": "id", + "in": "path", + "required": true, + "schema": { + "type": "integer", + "format": "int32", + "example": 10 + } + }, + { + "name": "include", + "in": "query", + "schema": { + "type": "string" + }, + "description": "Items to include. Comma seperated" + } + ] + } + }, + "/api/v2/ui/hashes/{id:[0-9]+}/relationships/{relation:chunk}": { + "get": { + "tags": [ + "Hashs" + ], + "responses": { + "400": { + "description": "Invalid request", + "content": { + "application/json": { + "schema": { + "$ref": "#/components/schemas/ErrorResponse" + } + } + } + }, + "401": { + "description": "Authentication failed", + "content": { + "application/json": { + "schema": { + "$ref": "#/components/schemas/ErrorResponse" + } + } + } + }, + "404": { + "description": "Not Found", + "content": { + "application/json": { + "schema": { + "$ref": "#/components/schemas/NotFoundResponse" + } + } + } + }, + "200": { + "description": "successful operation", + "content": { + "application/json": { + "schema": { + "$ref": "#/components/schemas/HashResponse" + } + } + } + } + }, + "security": [ + { + "bearerAuth": [ + [ + "permHashRead" + ] + ] + } + ], + "description": "GET request for for a to-one relationship link. Returns the resource record of the object that is part of the specified relation.", + "parameters": [ + { + "name": "id", + "in": "path", + "required": true, + "schema": { + "type": "integer", + "format": "int32", + "example": 10 + } + }, + { + "name": "include", + "in": "query", + "schema": { + "type": "string" + }, + "description": "Items to include. Comma seperated" + } + ] + }, + "patch": { + "tags": [ + "Hashs" + ], + "responses": { + "400": { + "description": "Invalid request", + "content": { + "application/json": { + "schema": { + "$ref": "#/components/schemas/ErrorResponse" + } + } + } + }, + "401": { + "description": "Authentication failed", + "content": { + "application/json": { + "schema": { + "$ref": "#/components/schemas/ErrorResponse" + } + } + } + }, + "404": { + "description": "Not Found", + "content": { + "application/json": { + "schema": { + "$ref": "#/components/schemas/NotFoundResponse" + } + } + } + }, + "200": { + "description": "successful operation", + "content": { + "application/json": { + "schema": { + "$ref": "#/components/schemas/HashPostPatchResponse" + } + } + } + } + }, + "security": [ + { + "bearerAuth": [ + [ + "permHashUpdate" + ] + ] + } + ], + "description": "", + "requestBody": { + "required": true, + "content": { + "application/json": { + "schema": { + "$ref": "#/components/schemas/HashPatch" + } + } + } + }, + "parameters": [] + } + }, + "/api/v2/ui/hashes/{id:[0-9]+}/{relation:hashlist}": { + "get": { + "tags": [ + "Hashs" + ], + "responses": { + "400": { + "description": "Invalid request", + "content": { + "application/json": { + "schema": { + "$ref": "#/components/schemas/ErrorResponse" + } + } + } + }, + "401": { + "description": "Authentication failed", + "content": { + "application/json": { + "schema": { + "$ref": "#/components/schemas/ErrorResponse" + } + } + } + }, + "404": { + "description": "Not Found", + "content": { + "application/json": { + "schema": { + "$ref": "#/components/schemas/NotFoundResponse" + } + } + } + }, + "200": { + "description": "successful operation", + "content": { + "application/json": { + "schema": { + "$ref": "#/components/schemas/HashResponse" + } + } + } + } + }, + "security": [ + { + "bearerAuth": [ + [ + "permHashRead" + ] + ] + } + ], + "description": "GET request for for a to-one relationship link. Returns the resource record of the object that is part of the specified relation.", + "parameters": [ + { + "name": "id", + "in": "path", + "required": true, + "schema": { + "type": "integer", + "format": "int32", + "example": 10 + } + }, + { + "name": "include", + "in": "query", + "schema": { + "type": "string" + }, + "description": "Items to include. Comma seperated" + } + ] + } + }, + "/api/v2/ui/hashes/{id:[0-9]+}/relationships/{relation:hashlist}": { + "get": { + "tags": [ + "Hashs" + ], + "responses": { + "400": { + "description": "Invalid request", + "content": { + "application/json": { + "schema": { + "$ref": "#/components/schemas/ErrorResponse" + } + } + } + }, + "401": { + "description": "Authentication failed", + "content": { + "application/json": { + "schema": { + "$ref": "#/components/schemas/ErrorResponse" + } + } + } + }, + "404": { + "description": "Not Found", + "content": { + "application/json": { + "schema": { + "$ref": "#/components/schemas/NotFoundResponse" + } + } + } + }, + "200": { + "description": "successful operation", + "content": { + "application/json": { + "schema": { + "$ref": "#/components/schemas/HashResponse" + } + } + } + } + }, + "security": [ + { + "bearerAuth": [ + [ + "permHashRead" + ] + ] + } + ], + "description": "GET request for for a to-one relationship link. Returns the resource record of the object that is part of the specified relation.", + "parameters": [ + { + "name": "id", + "in": "path", + "required": true, + "schema": { + "type": "integer", + "format": "int32", + "example": 10 + } + }, + { + "name": "include", + "in": "query", + "schema": { + "type": "string" + }, + "description": "Items to include. Comma seperated" + } + ] + }, + "patch": { + "tags": [ + "Hashs" + ], + "responses": { + "400": { + "description": "Invalid request", + "content": { + "application/json": { + "schema": { + "$ref": "#/components/schemas/ErrorResponse" + } + } + } + }, + "401": { + "description": "Authentication failed", + "content": { + "application/json": { + "schema": { + "$ref": "#/components/schemas/ErrorResponse" + } + } + } + }, + "404": { + "description": "Not Found", + "content": { + "application/json": { + "schema": { + "$ref": "#/components/schemas/NotFoundResponse" + } + } + } + }, + "200": { + "description": "successful operation", + "content": { + "application/json": { + "schema": { + "$ref": "#/components/schemas/HashPostPatchResponse" + } + } + } + } + }, + "security": [ + { + "bearerAuth": [ + [ + "permHashUpdate" + ] + ] + } + ], + "description": "", + "requestBody": { + "required": true, + "content": { + "application/json": { + "schema": { + "$ref": "#/components/schemas/HashPatch" + } + } + } + }, + "parameters": [] + } + }, + "/api/v2/ui/hashes/{id:[0-9]+}": { + "get": { + "tags": [ + "Hashs" + ], + "responses": { + "400": { + "description": "Invalid request", + "content": { + "application/json": { + "schema": { + "$ref": "#/components/schemas/ErrorResponse" + } + } + } + }, + "401": { + "description": "Authentication failed", + "content": { + "application/json": { + "schema": { + "$ref": "#/components/schemas/ErrorResponse" + } + } + } + }, + "404": { + "description": "Not Found", + "content": { + "application/json": { + "schema": { + "$ref": "#/components/schemas/NotFoundResponse" + } + } + } + }, + "200": { + "description": "successful operation", + "content": { + "application/json": { + "schema": { + "$ref": "#/components/schemas/HashResponse" + } + } + } + } + }, + "security": [ + { + "bearerAuth": [ + [ + "permHashRead" + ] + ] + } + ], + "description": "GET request to retrieve a single object.", + "parameters": [ + { + "name": "id", + "in": "path", + "required": true, + "schema": { + "type": "integer", + "format": "int32", + "example": 10 + } + }, + { + "name": "include", + "in": "query", + "schema": { + "type": "string" + }, + "description": "Items to include. Comma seperated" + } + ] + } + }, + "/api/v2/ui/hashlists": { + "get": { + "tags": [ + "Hashlists" + ], + "responses": { + "400": { + "description": "Invalid request", + "content": { + "application/json": { + "schema": { + "$ref": "#/components/schemas/ErrorResponse" + } + } + } + }, + "401": { + "description": "Authentication failed", + "content": { + "application/json": { + "schema": { + "$ref": "#/components/schemas/ErrorResponse" + } + } + } + }, + "200": { + "description": "successful operation", + "content": { + "application/json": { + "schema": { + "type": "array", + "items": { + "$ref": "#/components/schemas/HashlistResponse" + } + } + } + } + } + }, + "security": [ + { + "bearerAuth": [ + [ + "permHashlistRead" + ] + ] + } + ], + "description": "GET many request to retrieve multiple objects.", + "parameters": [ + { + "name": "page[after]", + "in": "query", + "schema": { + "type": "integer", + "format": "int32" + }, + "example": 0, + "description": "Pointer to paginate to retrieve the data after the value provided" + }, + { + "name": "page[before]", + "in": "query", + "schema": { + "type": "integer", + "format": "int32" + }, + "example": 0, + "description": "Pointer to paginate to retrieve the data before the value provided" + }, + { + "name": "page[size]", + "in": "query", + "schema": { + "type": "integer", + "format": "int32" + }, + "example": 100, + "description": "Amout of data to retrieve inside a single page" + }, + { + "name": "filter", + "in": "query", + "style": "deepobject", + "explode": true, + "schema": { + "type": "object" + }, + "description": "Filters results using a query", + "example": "\"filter[hashlistId__gt]\": 200" + }, + { + "name": "include", + "in": "query", + "schema": { + "type": "string" + }, + "description": "Items to include, comma seperated. Possible options: accessGroup,hashType,hashes,hashlists,tasks" + } + ] + }, + "post": { + "tags": [ + "Hashlists" + ], + "responses": { + "400": { + "description": "Invalid request", + "content": { + "application/json": { + "schema": { + "$ref": "#/components/schemas/ErrorResponse" + } + } + } + }, + "401": { + "description": "Authentication failed", + "content": { + "application/json": { + "schema": { + "$ref": "#/components/schemas/ErrorResponse" + } + } + } + }, + "201": { + "description": "successful operation", + "content": { + "application/json": { + "schema": { + "$ref": "#/components/schemas/HashlistPostPatchResponse" + } + } + } + } + }, + "security": [ + { + "bearerAuth": [ + [ + "permHashlistCreate" + ] + ] + } + ], + "description": "POST request to create a new object. The request must contain the resource record as data with the attributes of the new object.To add relationships, a relationships object can be added with the resource records of the relations that are part of this object.", + "requestBody": { + "required": true, + "content": { + "application/json": { + "schema": { + "$ref": "#/components/schemas/HashlistCreate" + } + } + } + }, + "parameters": [] + } + }, + "/api/v2/ui/hashlists/count": { + "get": { + "tags": [ + "Hashlists" + ], + "responses": { + "400": { + "description": "Invalid request", + "content": { + "application/json": { + "schema": { + "$ref": "#/components/schemas/ErrorResponse" + } + } + } + }, + "401": { + "description": "Authentication failed", + "content": { + "application/json": { + "schema": { + "$ref": "#/components/schemas/ErrorResponse" + } + } + } + }, + "200": { + "description": "successful operation", + "content": { + "application/json": { + "schema": { + "type": "array", + "items": { + "$ref": "#/components/schemas/HashlistResponse" + } + } + } + } + } + }, + "security": [ + { + "bearerAuth": [ + [ + "permHashlistRead" + ] + ] + } + ], + "description": "GET many request to retrieve multiple objects.", + "parameters": [ + { + "name": "page[after]", + "in": "query", + "schema": { + "type": "integer", + "format": "int32" + }, + "example": 0, + "description": "Pointer to paginate to retrieve the data after the value provided" + }, + { + "name": "page[before]", + "in": "query", + "schema": { + "type": "integer", + "format": "int32" + }, + "example": 0, + "description": "Pointer to paginate to retrieve the data before the value provided" + }, + { + "name": "page[size]", + "in": "query", + "schema": { + "type": "integer", + "format": "int32" + }, + "example": 100, + "description": "Amout of data to retrieve inside a single page" + }, + { + "name": "filter", + "in": "query", + "style": "deepobject", + "explode": true, + "schema": { + "type": "object" + }, + "description": "Filters results using a query", + "example": "\"filter[hashlistId__gt]\": 200" + }, + { + "name": "include", + "in": "query", + "schema": { + "type": "string" + }, + "description": "Items to include, comma seperated. Possible options: accessGroup,hashType,hashes,hashlists,tasks" + } + ] + } + }, + "/api/v2/ui/hashlists/{id:[0-9]+}/{relation:accessGroup}": { + "get": { + "tags": [ + "Hashlists" + ], + "responses": { + "400": { + "description": "Invalid request", + "content": { + "application/json": { + "schema": { + "$ref": "#/components/schemas/ErrorResponse" + } + } + } + }, + "401": { + "description": "Authentication failed", + "content": { + "application/json": { + "schema": { + "$ref": "#/components/schemas/ErrorResponse" + } + } + } + }, + "404": { + "description": "Not Found", + "content": { + "application/json": { + "schema": { + "$ref": "#/components/schemas/NotFoundResponse" + } + } + } + }, + "200": { + "description": "successful operation", + "content": { + "application/json": { + "schema": { + "$ref": "#/components/schemas/HashlistResponse" + } + } + } + } + }, + "security": [ + { + "bearerAuth": [ + [ + "permHashlistRead" + ] + ] + } + ], + "description": "GET request for for a to-one relationship link. Returns the resource record of the object that is part of the specified relation.", + "parameters": [ + { + "name": "id", + "in": "path", + "required": true, + "schema": { + "type": "integer", + "format": "int32", + "example": 10 + } + }, + { + "name": "include", + "in": "query", + "schema": { + "type": "string" + }, + "description": "Items to include. Comma seperated" + } + ] + } + }, + "/api/v2/ui/hashlists/{id:[0-9]+}/relationships/{relation:accessGroup}": { + "get": { + "tags": [ + "Hashlists" + ], + "responses": { + "400": { + "description": "Invalid request", + "content": { + "application/json": { + "schema": { + "$ref": "#/components/schemas/ErrorResponse" + } + } + } + }, + "401": { + "description": "Authentication failed", + "content": { + "application/json": { + "schema": { + "$ref": "#/components/schemas/ErrorResponse" + } + } + } + }, + "404": { + "description": "Not Found", + "content": { + "application/json": { + "schema": { + "$ref": "#/components/schemas/NotFoundResponse" + } + } + } + }, + "200": { + "description": "successful operation", + "content": { + "application/json": { + "schema": { + "$ref": "#/components/schemas/HashlistResponse" + } + } + } + } + }, + "security": [ + { + "bearerAuth": [ + [ + "permHashlistRead" + ] + ] + } + ], + "description": "GET request for for a to-one relationship link. Returns the resource record of the object that is part of the specified relation.", + "parameters": [ + { + "name": "id", + "in": "path", + "required": true, + "schema": { + "type": "integer", + "format": "int32", + "example": 10 + } + }, + { + "name": "include", + "in": "query", + "schema": { + "type": "string" + }, + "description": "Items to include. Comma seperated" + } + ] + }, + "patch": { + "tags": [ + "Hashlists" + ], + "responses": { + "400": { + "description": "Invalid request", + "content": { + "application/json": { + "schema": { + "$ref": "#/components/schemas/ErrorResponse" + } + } + } + }, + "401": { + "description": "Authentication failed", + "content": { + "application/json": { + "schema": { + "$ref": "#/components/schemas/ErrorResponse" + } + } + } + }, + "404": { + "description": "Not Found", + "content": { + "application/json": { + "schema": { + "$ref": "#/components/schemas/NotFoundResponse" + } + } + } + }, + "200": { + "description": "successful operation", + "content": { + "application/json": { + "schema": { + "$ref": "#/components/schemas/HashlistPostPatchResponse" + } + } + } + } + }, + "security": [ + { + "bearerAuth": [ + [ + "permHashlistUpdate" + ] + ] + } + ], + "description": "", + "requestBody": { + "required": true, + "content": { + "application/json": { + "schema": { + "$ref": "#/components/schemas/HashlistPatch" + } + } + } + }, + "parameters": [] + } + }, + "/api/v2/ui/hashlists/{id:[0-9]+}/{relation:hashType}": { + "get": { + "tags": [ + "Hashlists" + ], + "responses": { + "400": { + "description": "Invalid request", + "content": { + "application/json": { + "schema": { + "$ref": "#/components/schemas/ErrorResponse" + } + } + } + }, + "401": { + "description": "Authentication failed", + "content": { + "application/json": { + "schema": { + "$ref": "#/components/schemas/ErrorResponse" + } + } + } + }, + "404": { + "description": "Not Found", + "content": { + "application/json": { + "schema": { + "$ref": "#/components/schemas/NotFoundResponse" + } + } + } + }, + "200": { + "description": "successful operation", + "content": { + "application/json": { + "schema": { + "$ref": "#/components/schemas/HashlistResponse" + } + } + } + } + }, + "security": [ + { + "bearerAuth": [ + [ + "permHashlistRead" + ] + ] + } + ], + "description": "GET request for for a to-one relationship link. Returns the resource record of the object that is part of the specified relation.", + "parameters": [ + { + "name": "id", + "in": "path", + "required": true, + "schema": { + "type": "integer", + "format": "int32", + "example": 10 + } + }, + { + "name": "include", + "in": "query", + "schema": { + "type": "string" + }, + "description": "Items to include. Comma seperated" + } + ] + } + }, + "/api/v2/ui/hashlists/{id:[0-9]+}/relationships/{relation:hashType}": { + "get": { + "tags": [ + "Hashlists" + ], + "responses": { + "400": { + "description": "Invalid request", + "content": { + "application/json": { + "schema": { + "$ref": "#/components/schemas/ErrorResponse" + } + } + } + }, + "401": { + "description": "Authentication failed", + "content": { + "application/json": { + "schema": { + "$ref": "#/components/schemas/ErrorResponse" + } + } + } + }, + "404": { + "description": "Not Found", + "content": { + "application/json": { + "schema": { + "$ref": "#/components/schemas/NotFoundResponse" + } + } + } + }, + "200": { + "description": "successful operation", + "content": { + "application/json": { + "schema": { + "$ref": "#/components/schemas/HashlistResponse" + } + } + } + } + }, + "security": [ + { + "bearerAuth": [ + [ + "permHashlistRead" + ] + ] + } + ], + "description": "GET request for for a to-one relationship link. Returns the resource record of the object that is part of the specified relation.", + "parameters": [ + { + "name": "id", + "in": "path", + "required": true, + "schema": { + "type": "integer", + "format": "int32", + "example": 10 + } + }, + { + "name": "include", + "in": "query", + "schema": { + "type": "string" + }, + "description": "Items to include. Comma seperated" + } + ] + }, + "patch": { + "tags": [ + "Hashlists" + ], + "responses": { + "400": { + "description": "Invalid request", + "content": { + "application/json": { + "schema": { + "$ref": "#/components/schemas/ErrorResponse" + } + } + } + }, + "401": { + "description": "Authentication failed", + "content": { + "application/json": { + "schema": { + "$ref": "#/components/schemas/ErrorResponse" + } + } + } + }, + "404": { + "description": "Not Found", + "content": { + "application/json": { + "schema": { + "$ref": "#/components/schemas/NotFoundResponse" + } + } + } + }, + "200": { + "description": "successful operation", + "content": { + "application/json": { + "schema": { + "$ref": "#/components/schemas/HashlistPostPatchResponse" + } + } + } + } + }, + "security": [ + { + "bearerAuth": [ + [ + "permHashlistUpdate" + ] + ] + } + ], + "description": "", + "requestBody": { + "required": true, + "content": { + "application/json": { + "schema": { + "$ref": "#/components/schemas/HashlistPatch" + } + } + } + }, + "parameters": [] + } + }, + "/api/v2/ui/hashlists/{id:[0-9]+}/{relation:hashes}": { + "get": { + "tags": [ + "Hashlists" + ], + "responses": { + "400": { + "description": "Invalid request", + "content": { + "application/json": { + "schema": { + "$ref": "#/components/schemas/ErrorResponse" + } + } + } + }, + "401": { + "description": "Authentication failed", + "content": { + "application/json": { + "schema": { + "$ref": "#/components/schemas/ErrorResponse" + } + } + } + }, + "404": { + "description": "Not Found", + "content": { + "application/json": { + "schema": { + "$ref": "#/components/schemas/NotFoundResponse" + } + } + } + }, + "200": { + "description": "successful operation", + "content": { + "application/json": { + "schema": { + "$ref": "#/components/schemas/HashlistResponse" + } + } + } + } + }, + "security": [ + { + "bearerAuth": [ + [ + "permHashlistRead" + ] + ] + } + ], + "description": "GET request for for a to-one relationship link. Returns the resource record of the object that is part of the specified relation.", + "parameters": [ + { + "name": "id", + "in": "path", + "required": true, + "schema": { + "type": "integer", + "format": "int32", + "example": 10 + } + }, + { + "name": "include", + "in": "query", + "schema": { + "type": "string" + }, + "description": "Items to include. Comma seperated" + } + ] + } + }, + "/api/v2/ui/hashlists/{id:[0-9]+}/relationships/{relation:hashes}": { + "get": { + "tags": [ + "Hashlists" + ], + "responses": { + "400": { + "description": "Invalid request", + "content": { + "application/json": { + "schema": { + "$ref": "#/components/schemas/ErrorResponse" + } + } + } + }, + "401": { + "description": "Authentication failed", + "content": { + "application/json": { + "schema": { + "$ref": "#/components/schemas/ErrorResponse" + } + } + } + }, + "404": { + "description": "Not Found", + "content": { + "application/json": { + "schema": { + "$ref": "#/components/schemas/NotFoundResponse" + } + } + } + }, + "200": { + "description": "successful operation", + "content": { + "application/json": { + "schema": { + "$ref": "#/components/schemas/HashlistResponse" + } + } + } + } + }, + "security": [ + { + "bearerAuth": [ + [ + "permHashlistRead" + ] + ] + } + ], + "description": "GET request for for a to-one relationship link. Returns the resource record of the object that is part of the specified relation.", + "parameters": [ + { + "name": "id", + "in": "path", + "required": true, + "schema": { + "type": "integer", + "format": "int32", + "example": 10 + } + }, + { + "name": "include", + "in": "query", + "schema": { + "type": "string" + }, + "description": "Items to include. Comma seperated" + } + ] + }, + "patch": { + "tags": [ + "Hashlists" + ], + "responses": { + "400": { + "description": "Invalid request", + "content": { + "application/json": { + "schema": { + "$ref": "#/components/schemas/ErrorResponse" + } + } + } + }, + "401": { + "description": "Authentication failed", + "content": { + "application/json": { + "schema": { + "$ref": "#/components/schemas/ErrorResponse" + } + } + } + }, + "404": { + "description": "Not Found", + "content": { + "application/json": { + "schema": { + "$ref": "#/components/schemas/NotFoundResponse" + } + } + } + }, + "200": { + "description": "successful operation", + "content": { + "application/json": { + "schema": { + "$ref": "#/components/schemas/HashlistPostPatchResponse" + } + } + } + } + }, + "security": [ + { + "bearerAuth": [ + [ + "permHashlistUpdate" + ] + ] + } + ], + "description": "", + "requestBody": { + "required": true, + "content": { + "application/json": { + "schema": { + "$ref": "#/components/schemas/HashlistPatch" + } + } + } + }, + "parameters": [] + }, + "post": { + "tags": [ + "Hashlists" + ], + "responses": { + "400": { + "description": "Invalid request", + "content": { + "application/json": { + "schema": { + "$ref": "#/components/schemas/ErrorResponse" + } + } + } + }, + "401": { + "description": "Authentication failed", + "content": { + "application/json": { + "schema": { + "$ref": "#/components/schemas/ErrorResponse" + } + } + } + }, + "404": { + "description": "Not Found", + "content": { + "application/json": { + "schema": { + "$ref": "#/components/schemas/NotFoundResponse" + } + } + } + }, + "204": { + "description": "successfully created" + } + }, + "security": [ + { + "bearerAuth": [ + [ + "permHashlistCreate" + ] + ] + } + ], + "description": "", + "requestBody": { + "required": true, + "content": { + "application/json": [] + } + }, + "parameters": [] + }, + "delete": { + "tags": [ + "Hashlists" + ], + "responses": { + "400": { + "description": "Invalid request", + "content": { + "application/json": { + "schema": { + "$ref": "#/components/schemas/ErrorResponse" + } + } + } + }, + "401": { + "description": "Authentication failed", + "content": { + "application/json": { + "schema": { + "$ref": "#/components/schemas/ErrorResponse" + } + } + } + }, + "404": { + "description": "Not Found", + "content": { + "application/json": { + "schema": { + "$ref": "#/components/schemas/NotFoundResponse" + } + } + } + }, + "204": { + "description": "successfully deleted" + } + }, + "security": [ + { + "bearerAuth": [ + [ + "permHashlistDelete" + ] + ] + } + ], + "description": "", + "requestBody": { + "required": true, + "content": { + "application/json": [] + } + }, + "parameters": [] + } + }, + "/api/v2/ui/hashlists/{id:[0-9]+}/{relation:hashlists}": { + "get": { + "tags": [ + "Hashlists" + ], + "responses": { + "400": { + "description": "Invalid request", + "content": { + "application/json": { + "schema": { + "$ref": "#/components/schemas/ErrorResponse" + } + } + } + }, + "401": { + "description": "Authentication failed", + "content": { + "application/json": { + "schema": { + "$ref": "#/components/schemas/ErrorResponse" + } + } + } + }, + "404": { + "description": "Not Found", + "content": { + "application/json": { + "schema": { + "$ref": "#/components/schemas/NotFoundResponse" + } + } + } + }, + "200": { + "description": "successful operation", + "content": { + "application/json": { + "schema": { + "$ref": "#/components/schemas/HashlistResponse" + } + } + } + } + }, + "security": [ + { + "bearerAuth": [ + [ + "permHashlistRead" + ] + ] + } + ], + "description": "GET request for for a to-one relationship link. Returns the resource record of the object that is part of the specified relation.", + "parameters": [ + { + "name": "id", + "in": "path", + "required": true, + "schema": { + "type": "integer", + "format": "int32", + "example": 10 + } + }, + { + "name": "include", + "in": "query", + "schema": { + "type": "string" + }, + "description": "Items to include. Comma seperated" + } + ] + } + }, + "/api/v2/ui/hashlists/{id:[0-9]+}/relationships/{relation:hashlists}": { + "get": { + "tags": [ + "Hashlists" + ], + "responses": { + "400": { + "description": "Invalid request", + "content": { + "application/json": { + "schema": { + "$ref": "#/components/schemas/ErrorResponse" + } + } + } + }, + "401": { + "description": "Authentication failed", + "content": { + "application/json": { + "schema": { + "$ref": "#/components/schemas/ErrorResponse" + } + } + } + }, + "404": { + "description": "Not Found", + "content": { + "application/json": { + "schema": { + "$ref": "#/components/schemas/NotFoundResponse" + } + } + } + }, + "200": { + "description": "successful operation", + "content": { + "application/json": { + "schema": { + "$ref": "#/components/schemas/HashlistResponse" + } + } + } + } + }, + "security": [ + { + "bearerAuth": [ + [ + "permHashlistRead" + ] + ] + } + ], + "description": "GET request for for a to-one relationship link. Returns the resource record of the object that is part of the specified relation.", + "parameters": [ + { + "name": "id", + "in": "path", + "required": true, + "schema": { + "type": "integer", + "format": "int32", + "example": 10 + } + }, + { + "name": "include", + "in": "query", + "schema": { + "type": "string" + }, + "description": "Items to include. Comma seperated" + } + ] + }, + "patch": { + "tags": [ + "Hashlists" + ], + "responses": { + "400": { + "description": "Invalid request", + "content": { + "application/json": { + "schema": { + "$ref": "#/components/schemas/ErrorResponse" + } + } + } + }, + "401": { + "description": "Authentication failed", + "content": { + "application/json": { + "schema": { + "$ref": "#/components/schemas/ErrorResponse" + } + } + } + }, + "404": { + "description": "Not Found", + "content": { + "application/json": { + "schema": { + "$ref": "#/components/schemas/NotFoundResponse" + } + } + } + }, + "200": { + "description": "successful operation", + "content": { + "application/json": { + "schema": { + "$ref": "#/components/schemas/HashlistPostPatchResponse" + } + } + } + } + }, + "security": [ + { + "bearerAuth": [ + [ + "permHashlistUpdate" + ] + ] + } + ], + "description": "", + "requestBody": { + "required": true, + "content": { + "application/json": { + "schema": { + "$ref": "#/components/schemas/HashlistPatch" + } + } + } + }, + "parameters": [] + }, + "post": { + "tags": [ + "Hashlists" + ], + "responses": { + "400": { + "description": "Invalid request", + "content": { + "application/json": { + "schema": { + "$ref": "#/components/schemas/ErrorResponse" + } + } + } + }, + "401": { + "description": "Authentication failed", + "content": { + "application/json": { + "schema": { + "$ref": "#/components/schemas/ErrorResponse" + } + } + } + }, + "404": { + "description": "Not Found", + "content": { + "application/json": { + "schema": { + "$ref": "#/components/schemas/NotFoundResponse" + } + } + } + }, + "204": { + "description": "successfully created" + } + }, + "security": [ + { + "bearerAuth": [ + [ + "permHashlistCreate" + ] + ] + } + ], + "description": "", + "requestBody": { + "required": true, + "content": { + "application/json": [] + } + }, + "parameters": [] + }, + "delete": { + "tags": [ + "Hashlists" + ], + "responses": { + "400": { + "description": "Invalid request", + "content": { + "application/json": { + "schema": { + "$ref": "#/components/schemas/ErrorResponse" + } + } + } + }, + "401": { + "description": "Authentication failed", + "content": { + "application/json": { + "schema": { + "$ref": "#/components/schemas/ErrorResponse" + } + } + } + }, + "404": { + "description": "Not Found", + "content": { + "application/json": { + "schema": { + "$ref": "#/components/schemas/NotFoundResponse" + } + } + } + }, + "204": { + "description": "successfully deleted" + } + }, + "security": [ + { + "bearerAuth": [ + [ + "permHashlistDelete" + ] + ] + } + ], + "description": "", + "requestBody": { + "required": true, + "content": { + "application/json": [] + } + }, + "parameters": [] + } + }, + "/api/v2/ui/hashlists/{id:[0-9]+}/{relation:tasks}": { + "get": { + "tags": [ + "Hashlists" + ], + "responses": { + "400": { + "description": "Invalid request", + "content": { + "application/json": { + "schema": { + "$ref": "#/components/schemas/ErrorResponse" + } + } + } + }, + "401": { + "description": "Authentication failed", + "content": { + "application/json": { + "schema": { + "$ref": "#/components/schemas/ErrorResponse" + } + } + } + }, + "404": { + "description": "Not Found", + "content": { + "application/json": { + "schema": { + "$ref": "#/components/schemas/NotFoundResponse" + } + } + } + }, + "200": { + "description": "successful operation", + "content": { + "application/json": { + "schema": { + "$ref": "#/components/schemas/HashlistResponse" + } + } + } + } + }, + "security": [ + { + "bearerAuth": [ + [ + "permHashlistRead" + ] + ] + } + ], + "description": "GET request for for a to-one relationship link. Returns the resource record of the object that is part of the specified relation.", + "parameters": [ + { + "name": "id", + "in": "path", + "required": true, + "schema": { + "type": "integer", + "format": "int32", + "example": 10 + } + }, + { + "name": "include", + "in": "query", + "schema": { + "type": "string" + }, + "description": "Items to include. Comma seperated" + } + ] + } + }, + "/api/v2/ui/hashlists/{id:[0-9]+}/relationships/{relation:tasks}": { + "get": { + "tags": [ + "Hashlists" + ], + "responses": { + "400": { + "description": "Invalid request", + "content": { + "application/json": { + "schema": { + "$ref": "#/components/schemas/ErrorResponse" + } + } + } + }, + "401": { + "description": "Authentication failed", + "content": { + "application/json": { + "schema": { + "$ref": "#/components/schemas/ErrorResponse" + } + } + } + }, + "404": { + "description": "Not Found", + "content": { + "application/json": { + "schema": { + "$ref": "#/components/schemas/NotFoundResponse" + } + } + } + }, + "200": { + "description": "successful operation", + "content": { + "application/json": { + "schema": { + "$ref": "#/components/schemas/HashlistResponse" + } + } + } + } + }, + "security": [ + { + "bearerAuth": [ + [ + "permHashlistRead" + ] + ] + } + ], + "description": "GET request for for a to-one relationship link. Returns the resource record of the object that is part of the specified relation.", + "parameters": [ + { + "name": "id", + "in": "path", + "required": true, + "schema": { + "type": "integer", + "format": "int32", + "example": 10 + } + }, + { + "name": "include", + "in": "query", + "schema": { + "type": "string" + }, + "description": "Items to include. Comma seperated" + } + ] + }, + "patch": { + "tags": [ + "Hashlists" + ], + "responses": { + "400": { + "description": "Invalid request", + "content": { + "application/json": { + "schema": { + "$ref": "#/components/schemas/ErrorResponse" + } + } + } + }, + "401": { + "description": "Authentication failed", + "content": { + "application/json": { + "schema": { + "$ref": "#/components/schemas/ErrorResponse" + } + } + } + }, + "404": { + "description": "Not Found", + "content": { + "application/json": { + "schema": { + "$ref": "#/components/schemas/NotFoundResponse" + } + } + } + }, + "200": { + "description": "successful operation", + "content": { + "application/json": { + "schema": { + "$ref": "#/components/schemas/HashlistPostPatchResponse" + } + } + } + } + }, + "security": [ + { + "bearerAuth": [ + [ + "permHashlistUpdate" + ] + ] + } + ], + "description": "", + "requestBody": { + "required": true, + "content": { + "application/json": { + "schema": { + "$ref": "#/components/schemas/HashlistPatch" + } + } + } + }, + "parameters": [] + }, + "post": { + "tags": [ + "Hashlists" + ], + "responses": { + "400": { + "description": "Invalid request", + "content": { + "application/json": { + "schema": { + "$ref": "#/components/schemas/ErrorResponse" + } + } + } + }, + "401": { + "description": "Authentication failed", + "content": { + "application/json": { + "schema": { + "$ref": "#/components/schemas/ErrorResponse" + } + } + } + }, + "404": { + "description": "Not Found", + "content": { + "application/json": { + "schema": { + "$ref": "#/components/schemas/NotFoundResponse" + } + } + } + }, + "204": { + "description": "successfully created" + } + }, + "security": [ + { + "bearerAuth": [ + [ + "permHashlistCreate" + ] + ] + } + ], + "description": "", + "requestBody": { + "required": true, + "content": { + "application/json": [] + } + }, + "parameters": [] + }, + "delete": { + "tags": [ + "Hashlists" + ], + "responses": { + "400": { + "description": "Invalid request", + "content": { + "application/json": { + "schema": { + "$ref": "#/components/schemas/ErrorResponse" + } + } + } + }, + "401": { + "description": "Authentication failed", + "content": { + "application/json": { + "schema": { + "$ref": "#/components/schemas/ErrorResponse" + } + } + } + }, + "404": { + "description": "Not Found", + "content": { + "application/json": { + "schema": { + "$ref": "#/components/schemas/NotFoundResponse" + } + } + } + }, + "204": { + "description": "successfully deleted" + } + }, + "security": [ + { + "bearerAuth": [ + [ + "permHashlistDelete" + ] + ] + } + ], + "description": "", + "requestBody": { + "required": true, + "content": { + "application/json": [] + } + }, + "parameters": [] + } + }, + "/api/v2/ui/hashlists/{id:[0-9]+}": { + "get": { + "tags": [ + "Hashlists" + ], + "responses": { + "400": { + "description": "Invalid request", + "content": { + "application/json": { + "schema": { + "$ref": "#/components/schemas/ErrorResponse" + } + } + } + }, + "401": { + "description": "Authentication failed", + "content": { + "application/json": { + "schema": { + "$ref": "#/components/schemas/ErrorResponse" + } + } + } + }, + "404": { + "description": "Not Found", + "content": { + "application/json": { + "schema": { + "$ref": "#/components/schemas/NotFoundResponse" + } + } + } + }, + "200": { + "description": "successful operation", + "content": { + "application/json": { + "schema": { + "$ref": "#/components/schemas/HashlistResponse" + } + } + } + } + }, + "security": [ + { + "bearerAuth": [ + [ + "permHashlistRead" + ] + ] + } + ], + "description": "GET request to retrieve a single object.", + "parameters": [ + { + "name": "id", + "in": "path", + "required": true, + "schema": { + "type": "integer", + "format": "int32", + "example": 10 + } + }, + { + "name": "include", + "in": "query", + "schema": { + "type": "string" + }, + "description": "Items to include. Comma seperated" + } + ] + }, + "patch": { + "tags": [ + "Hashlists" + ], + "responses": { + "400": { + "description": "Invalid request", + "content": { + "application/json": { + "schema": { + "$ref": "#/components/schemas/ErrorResponse" + } + } + } + }, + "401": { + "description": "Authentication failed", + "content": { + "application/json": { + "schema": { + "$ref": "#/components/schemas/ErrorResponse" + } + } + } + }, + "404": { + "description": "Not Found", + "content": { + "application/json": { + "schema": { + "$ref": "#/components/schemas/NotFoundResponse" + } + } + } + }, + "200": { + "description": "successful operation", + "content": { + "application/json": { + "schema": { + "$ref": "#/components/schemas/HashlistPostPatchResponse" + } + } + } + } + }, + "security": [ + { + "bearerAuth": [ + [ + "permHashlistUpdate" + ] + ] + } + ], + "description": "PATCH request to update attributes of a single object.", + "requestBody": { + "required": true, + "content": { + "application/json": { + "schema": { + "$ref": "#/components/schemas/HashlistPatch" + } + } + } + }, + "parameters": [] + }, + "delete": { + "tags": [ + "Hashlists" + ], + "responses": { + "400": { + "description": "Invalid request", + "content": { + "application/json": { + "schema": { + "$ref": "#/components/schemas/ErrorResponse" + } + } + } + }, + "401": { + "description": "Authentication failed", + "content": { + "application/json": { + "schema": { + "$ref": "#/components/schemas/ErrorResponse" + } + } + } + }, + "404": { + "description": "Not Found", + "content": { + "application/json": { + "schema": { + "$ref": "#/components/schemas/NotFoundResponse" + } + } + } + }, + "204": { + "description": "successfully deleted" + } + }, + "security": [ + { + "bearerAuth": [ + [ + "permHashlistDelete" + ] + ] + } + ], + "description": "", + "requestBody": { + "required": true, + "content": { + "application/json": [] + } + }, + "parameters": [] + } + }, + "/api/v2/ui/hashtypes": { + "get": { + "tags": [ + "HashTypes" + ], + "responses": { + "400": { + "description": "Invalid request", + "content": { + "application/json": { + "schema": { + "$ref": "#/components/schemas/ErrorResponse" + } + } + } + }, + "401": { + "description": "Authentication failed", + "content": { + "application/json": { + "schema": { + "$ref": "#/components/schemas/ErrorResponse" + } + } + } + }, + "200": { + "description": "successful operation", + "content": { + "application/json": { + "schema": { + "type": "array", + "items": { + "$ref": "#/components/schemas/HashTypeResponse" + } + } + } + } + } + }, + "security": [ + { + "bearerAuth": [ + [ + "permHashTypeRead" + ] + ] + } + ], + "description": "GET many request to retrieve multiple objects.", + "parameters": [ + { + "name": "page[after]", + "in": "query", + "schema": { + "type": "integer", + "format": "int32" + }, + "example": 0, + "description": "Pointer to paginate to retrieve the data after the value provided" + }, + { + "name": "page[before]", + "in": "query", + "schema": { + "type": "integer", + "format": "int32" + }, + "example": 0, + "description": "Pointer to paginate to retrieve the data before the value provided" + }, + { + "name": "page[size]", + "in": "query", + "schema": { + "type": "integer", + "format": "int32" + }, + "example": 100, + "description": "Amout of data to retrieve inside a single page" + }, + { + "name": "filter", + "in": "query", + "style": "deepobject", + "explode": true, + "schema": { + "type": "object" + }, + "description": "Filters results using a query", + "example": "\"filter[hashlistId__gt]\": 200" + }, + { + "name": "include", + "in": "query", + "schema": { + "type": "string" + }, + "description": "Items to include, comma seperated. Possible options: " + } + ] + }, + "post": { + "tags": [ + "HashTypes" + ], + "responses": { + "400": { + "description": "Invalid request", + "content": { + "application/json": { + "schema": { + "$ref": "#/components/schemas/ErrorResponse" + } + } + } + }, + "401": { + "description": "Authentication failed", + "content": { + "application/json": { + "schema": { + "$ref": "#/components/schemas/ErrorResponse" + } + } + } + }, + "201": { + "description": "successful operation", + "content": { + "application/json": { + "schema": { + "$ref": "#/components/schemas/HashTypePostPatchResponse" + } + } + } + } + }, + "security": [ + { + "bearerAuth": [ + [ + "permHashTypeCreate" + ] + ] + } + ], + "description": "POST request to create a new object. The request must contain the resource record as data with the attributes of the new object.To add relationships, a relationships object can be added with the resource records of the relations that are part of this object.", + "requestBody": { + "required": true, + "content": { + "application/json": { + "schema": { + "$ref": "#/components/schemas/HashTypeCreate" + } + } + } + }, + "parameters": [] + } + }, + "/api/v2/ui/hashtypes/count": { + "get": { + "tags": [ + "HashTypes" + ], + "responses": { + "400": { + "description": "Invalid request", + "content": { + "application/json": { + "schema": { + "$ref": "#/components/schemas/ErrorResponse" + } + } + } + }, + "401": { + "description": "Authentication failed", + "content": { + "application/json": { + "schema": { + "$ref": "#/components/schemas/ErrorResponse" + } + } + } + }, + "200": { + "description": "successful operation", + "content": { + "application/json": { + "schema": { + "type": "array", + "items": { + "$ref": "#/components/schemas/HashTypeResponse" + } + } + } + } + } + }, + "security": [ + { + "bearerAuth": [ + [ + "permHashTypeRead" + ] + ] + } + ], + "description": "GET many request to retrieve multiple objects.", + "parameters": [ + { + "name": "page[after]", + "in": "query", + "schema": { + "type": "integer", + "format": "int32" + }, + "example": 0, + "description": "Pointer to paginate to retrieve the data after the value provided" + }, + { + "name": "page[before]", + "in": "query", + "schema": { + "type": "integer", + "format": "int32" + }, + "example": 0, + "description": "Pointer to paginate to retrieve the data before the value provided" + }, + { + "name": "page[size]", + "in": "query", + "schema": { + "type": "integer", + "format": "int32" + }, + "example": 100, + "description": "Amout of data to retrieve inside a single page" + }, + { + "name": "filter", + "in": "query", + "style": "deepobject", + "explode": true, + "schema": { + "type": "object" + }, + "description": "Filters results using a query", + "example": "\"filter[hashlistId__gt]\": 200" + }, + { + "name": "include", + "in": "query", + "schema": { + "type": "string" + }, + "description": "Items to include, comma seperated. Possible options: " + } + ] + } + }, + "/api/v2/ui/hashtypes/{id:[0-9]+}": { + "get": { + "tags": [ + "HashTypes" + ], + "responses": { + "400": { + "description": "Invalid request", + "content": { + "application/json": { + "schema": { + "$ref": "#/components/schemas/ErrorResponse" + } + } + } + }, + "401": { + "description": "Authentication failed", + "content": { + "application/json": { + "schema": { + "$ref": "#/components/schemas/ErrorResponse" + } + } + } + }, + "404": { + "description": "Not Found", + "content": { + "application/json": { + "schema": { + "$ref": "#/components/schemas/NotFoundResponse" + } + } + } + }, + "200": { + "description": "successful operation", + "content": { + "application/json": { + "schema": { + "$ref": "#/components/schemas/HashTypeResponse" + } + } + } + } + }, + "security": [ + { + "bearerAuth": [ + [ + "permHashTypeRead" + ] + ] + } + ], + "description": "GET request to retrieve a single object.", + "parameters": [ + { + "name": "id", + "in": "path", + "required": true, + "schema": { + "type": "integer", + "format": "int32", + "example": 10 + } + }, + { + "name": "include", + "in": "query", + "schema": { + "type": "string" + }, + "description": "Items to include. Comma seperated" + } + ] + }, + "patch": { + "tags": [ + "HashTypes" + ], + "responses": { + "400": { + "description": "Invalid request", + "content": { + "application/json": { + "schema": { + "$ref": "#/components/schemas/ErrorResponse" + } + } + } + }, + "401": { + "description": "Authentication failed", + "content": { + "application/json": { + "schema": { + "$ref": "#/components/schemas/ErrorResponse" + } + } + } + }, + "404": { + "description": "Not Found", + "content": { + "application/json": { + "schema": { + "$ref": "#/components/schemas/NotFoundResponse" + } + } + } + }, + "200": { + "description": "successful operation", + "content": { + "application/json": { + "schema": { + "$ref": "#/components/schemas/HashTypePostPatchResponse" + } + } + } + } + }, + "security": [ + { + "bearerAuth": [ + [ + "permHashTypeUpdate" + ] + ] + } + ], + "description": "PATCH request to update attributes of a single object.", + "requestBody": { + "required": true, + "content": { + "application/json": { + "schema": { + "$ref": "#/components/schemas/HashTypePatch" + } + } + } + }, + "parameters": [] + }, + "delete": { + "tags": [ + "HashTypes" + ], + "responses": { + "400": { + "description": "Invalid request", + "content": { + "application/json": { + "schema": { + "$ref": "#/components/schemas/ErrorResponse" + } + } + } + }, + "401": { + "description": "Authentication failed", + "content": { + "application/json": { + "schema": { + "$ref": "#/components/schemas/ErrorResponse" + } + } + } + }, + "404": { + "description": "Not Found", + "content": { + "application/json": { + "schema": { + "$ref": "#/components/schemas/NotFoundResponse" + } + } + } + }, + "204": { + "description": "successfully deleted" + } + }, + "security": [ + { + "bearerAuth": [ + [ + "permHashTypeDelete" + ] + ] + } + ], + "description": "", + "requestBody": { + "required": true, + "content": { + "application/json": [] + } + }, + "parameters": [] + } + }, + "/api/v2/ui/healthcheckagents": { + "get": { + "tags": [ + "HealthCheckAgents" + ], + "responses": { + "400": { + "description": "Invalid request", + "content": { + "application/json": { + "schema": { + "$ref": "#/components/schemas/ErrorResponse" + } + } + } + }, + "401": { + "description": "Authentication failed", + "content": { + "application/json": { + "schema": { + "$ref": "#/components/schemas/ErrorResponse" + } + } + } + }, + "200": { + "description": "successful operation", + "content": { + "application/json": { + "schema": { + "type": "array", + "items": { + "$ref": "#/components/schemas/HealthCheckAgentResponse" + } + } + } + } + } + }, + "security": [ + { + "bearerAuth": [ + [ + "permHealthCheckAgentRead" + ] + ] + } + ], + "description": "GET many request to retrieve multiple objects.", + "parameters": [ + { + "name": "page[after]", + "in": "query", + "schema": { + "type": "integer", + "format": "int32" + }, + "example": 0, + "description": "Pointer to paginate to retrieve the data after the value provided" + }, + { + "name": "page[before]", + "in": "query", + "schema": { + "type": "integer", + "format": "int32" + }, + "example": 0, + "description": "Pointer to paginate to retrieve the data before the value provided" + }, + { + "name": "page[size]", + "in": "query", + "schema": { + "type": "integer", + "format": "int32" + }, + "example": 100, + "description": "Amout of data to retrieve inside a single page" + }, + { + "name": "filter", + "in": "query", + "style": "deepobject", + "explode": true, + "schema": { + "type": "object" + }, + "description": "Filters results using a query", + "example": "\"filter[hashlistId__gt]\": 200" + }, + { + "name": "include", + "in": "query", + "schema": { + "type": "string" + }, + "description": "Items to include, comma seperated. Possible options: agent,healthCheck" + } + ] + } + }, + "/api/v2/ui/healthcheckagents/count": { + "get": { + "tags": [ + "HealthCheckAgents" + ], + "responses": { + "400": { + "description": "Invalid request", + "content": { + "application/json": { + "schema": { + "$ref": "#/components/schemas/ErrorResponse" + } + } + } + }, + "401": { + "description": "Authentication failed", + "content": { + "application/json": { + "schema": { + "$ref": "#/components/schemas/ErrorResponse" + } + } + } + }, + "200": { + "description": "successful operation", + "content": { + "application/json": { + "schema": { + "type": "array", + "items": { + "$ref": "#/components/schemas/HealthCheckAgentResponse" + } + } + } + } + } + }, + "security": [ + { + "bearerAuth": [ + [ + "permHealthCheckAgentRead" + ] + ] + } + ], + "description": "GET many request to retrieve multiple objects.", + "parameters": [ + { + "name": "page[after]", + "in": "query", + "schema": { + "type": "integer", + "format": "int32" + }, + "example": 0, + "description": "Pointer to paginate to retrieve the data after the value provided" + }, + { + "name": "page[before]", + "in": "query", + "schema": { + "type": "integer", + "format": "int32" + }, + "example": 0, + "description": "Pointer to paginate to retrieve the data before the value provided" + }, + { + "name": "page[size]", + "in": "query", + "schema": { + "type": "integer", + "format": "int32" + }, + "example": 100, + "description": "Amout of data to retrieve inside a single page" + }, + { + "name": "filter", + "in": "query", + "style": "deepobject", + "explode": true, + "schema": { + "type": "object" + }, + "description": "Filters results using a query", + "example": "\"filter[hashlistId__gt]\": 200" + }, + { + "name": "include", + "in": "query", + "schema": { + "type": "string" + }, + "description": "Items to include, comma seperated. Possible options: agent,healthCheck" + } + ] + } + }, + "/api/v2/ui/healthcheckagents/{id:[0-9]+}/{relation:agent}": { + "get": { + "tags": [ + "HealthCheckAgents" + ], + "responses": { + "400": { + "description": "Invalid request", + "content": { + "application/json": { + "schema": { + "$ref": "#/components/schemas/ErrorResponse" + } + } + } + }, + "401": { + "description": "Authentication failed", + "content": { + "application/json": { + "schema": { + "$ref": "#/components/schemas/ErrorResponse" + } + } + } + }, + "404": { + "description": "Not Found", + "content": { + "application/json": { + "schema": { + "$ref": "#/components/schemas/NotFoundResponse" + } + } + } + }, + "200": { + "description": "successful operation", + "content": { + "application/json": { + "schema": { + "$ref": "#/components/schemas/HealthCheckAgentResponse" + } + } + } + } + }, + "security": [ + { + "bearerAuth": [ + [ + "permHealthCheckAgentRead" + ] + ] + } + ], + "description": "GET request for for a to-one relationship link. Returns the resource record of the object that is part of the specified relation.", + "parameters": [ + { + "name": "id", + "in": "path", + "required": true, + "schema": { + "type": "integer", + "format": "int32", + "example": 10 + } + }, + { + "name": "include", + "in": "query", + "schema": { + "type": "string" + }, + "description": "Items to include. Comma seperated" + } + ] + } + }, + "/api/v2/ui/healthcheckagents/{id:[0-9]+}/relationships/{relation:agent}": { + "get": { + "tags": [ + "HealthCheckAgents" + ], + "responses": { + "400": { + "description": "Invalid request", + "content": { + "application/json": { + "schema": { + "$ref": "#/components/schemas/ErrorResponse" + } + } + } + }, + "401": { + "description": "Authentication failed", + "content": { + "application/json": { + "schema": { + "$ref": "#/components/schemas/ErrorResponse" + } + } + } + }, + "404": { + "description": "Not Found", + "content": { + "application/json": { + "schema": { + "$ref": "#/components/schemas/NotFoundResponse" + } + } + } + }, + "200": { + "description": "successful operation", + "content": { + "application/json": { + "schema": { + "$ref": "#/components/schemas/HealthCheckAgentResponse" + } + } + } + } + }, + "security": [ + { + "bearerAuth": [ + [ + "permHealthCheckAgentRead" + ] + ] + } + ], + "description": "GET request for for a to-one relationship link. Returns the resource record of the object that is part of the specified relation.", + "parameters": [ + { + "name": "id", + "in": "path", + "required": true, + "schema": { + "type": "integer", + "format": "int32", + "example": 10 + } + }, + { + "name": "include", + "in": "query", + "schema": { + "type": "string" + }, + "description": "Items to include. Comma seperated" + } + ] + }, + "patch": { + "tags": [ + "HealthCheckAgents" + ], + "responses": { + "400": { + "description": "Invalid request", + "content": { + "application/json": { + "schema": { + "$ref": "#/components/schemas/ErrorResponse" + } + } + } + }, + "401": { + "description": "Authentication failed", + "content": { + "application/json": { + "schema": { + "$ref": "#/components/schemas/ErrorResponse" + } + } + } + }, + "404": { + "description": "Not Found", + "content": { + "application/json": { + "schema": { + "$ref": "#/components/schemas/NotFoundResponse" + } + } + } + }, + "200": { + "description": "successful operation", + "content": { + "application/json": { + "schema": { + "$ref": "#/components/schemas/HealthCheckAgentPostPatchResponse" + } + } + } + } + }, + "security": [ + { + "bearerAuth": [ + [ + "permHealthCheckAgentUpdate" + ] + ] + } + ], + "description": "", + "requestBody": { + "required": true, + "content": { + "application/json": { + "schema": { + "$ref": "#/components/schemas/HealthCheckAgentPatch" + } + } + } + }, + "parameters": [] + } + }, + "/api/v2/ui/healthcheckagents/{id:[0-9]+}/{relation:healthCheck}": { + "get": { + "tags": [ + "HealthCheckAgents" + ], + "responses": { + "400": { + "description": "Invalid request", + "content": { + "application/json": { + "schema": { + "$ref": "#/components/schemas/ErrorResponse" + } + } + } + }, + "401": { + "description": "Authentication failed", + "content": { + "application/json": { + "schema": { + "$ref": "#/components/schemas/ErrorResponse" + } + } + } + }, + "404": { + "description": "Not Found", + "content": { + "application/json": { + "schema": { + "$ref": "#/components/schemas/NotFoundResponse" + } + } + } + }, + "200": { + "description": "successful operation", + "content": { + "application/json": { + "schema": { + "$ref": "#/components/schemas/HealthCheckAgentResponse" + } + } + } + } + }, + "security": [ + { + "bearerAuth": [ + [ + "permHealthCheckAgentRead" + ] + ] + } + ], + "description": "GET request for for a to-one relationship link. Returns the resource record of the object that is part of the specified relation.", + "parameters": [ + { + "name": "id", + "in": "path", + "required": true, + "schema": { + "type": "integer", + "format": "int32", + "example": 10 + } + }, + { + "name": "include", + "in": "query", + "schema": { + "type": "string" + }, + "description": "Items to include. Comma seperated" + } + ] + } + }, + "/api/v2/ui/healthcheckagents/{id:[0-9]+}/relationships/{relation:healthCheck}": { + "get": { + "tags": [ + "HealthCheckAgents" + ], + "responses": { + "400": { + "description": "Invalid request", + "content": { + "application/json": { + "schema": { + "$ref": "#/components/schemas/ErrorResponse" + } + } + } + }, + "401": { + "description": "Authentication failed", + "content": { + "application/json": { + "schema": { + "$ref": "#/components/schemas/ErrorResponse" + } + } + } + }, + "404": { + "description": "Not Found", + "content": { + "application/json": { + "schema": { + "$ref": "#/components/schemas/NotFoundResponse" + } + } + } + }, + "200": { + "description": "successful operation", + "content": { + "application/json": { + "schema": { + "$ref": "#/components/schemas/HealthCheckAgentResponse" + } + } + } + } + }, + "security": [ + { + "bearerAuth": [ + [ + "permHealthCheckAgentRead" + ] + ] + } + ], + "description": "GET request for for a to-one relationship link. Returns the resource record of the object that is part of the specified relation.", + "parameters": [ + { + "name": "id", + "in": "path", + "required": true, + "schema": { + "type": "integer", + "format": "int32", + "example": 10 + } + }, + { + "name": "include", + "in": "query", + "schema": { + "type": "string" + }, + "description": "Items to include. Comma seperated" + } + ] + }, + "patch": { + "tags": [ + "HealthCheckAgents" + ], + "responses": { + "400": { + "description": "Invalid request", + "content": { + "application/json": { + "schema": { + "$ref": "#/components/schemas/ErrorResponse" + } + } + } + }, + "401": { + "description": "Authentication failed", + "content": { + "application/json": { + "schema": { + "$ref": "#/components/schemas/ErrorResponse" + } + } + } + }, + "404": { + "description": "Not Found", + "content": { + "application/json": { + "schema": { + "$ref": "#/components/schemas/NotFoundResponse" + } + } + } + }, + "200": { + "description": "successful operation", + "content": { + "application/json": { + "schema": { + "$ref": "#/components/schemas/HealthCheckAgentPostPatchResponse" + } + } + } + } + }, + "security": [ + { + "bearerAuth": [ + [ + "permHealthCheckAgentUpdate" + ] + ] + } + ], + "description": "", + "requestBody": { + "required": true, + "content": { + "application/json": { + "schema": { + "$ref": "#/components/schemas/HealthCheckAgentPatch" + } + } + } + }, + "parameters": [] + } + }, + "/api/v2/ui/healthcheckagents/{id:[0-9]+}": { + "get": { + "tags": [ + "HealthCheckAgents" + ], + "responses": { + "400": { + "description": "Invalid request", + "content": { + "application/json": { + "schema": { + "$ref": "#/components/schemas/ErrorResponse" + } + } + } + }, + "401": { + "description": "Authentication failed", + "content": { + "application/json": { + "schema": { + "$ref": "#/components/schemas/ErrorResponse" + } + } + } + }, + "404": { + "description": "Not Found", + "content": { + "application/json": { + "schema": { + "$ref": "#/components/schemas/NotFoundResponse" + } + } + } + }, + "200": { + "description": "successful operation", + "content": { + "application/json": { + "schema": { + "$ref": "#/components/schemas/HealthCheckAgentResponse" + } + } + } + } + }, + "security": [ + { + "bearerAuth": [ + [ + "permHealthCheckAgentRead" + ] + ] + } + ], + "description": "GET request to retrieve a single object.", + "parameters": [ + { + "name": "id", + "in": "path", + "required": true, + "schema": { + "type": "integer", + "format": "int32", + "example": 10 + } + }, + { + "name": "include", + "in": "query", + "schema": { + "type": "string" + }, + "description": "Items to include. Comma seperated" + } + ] + } + }, + "/api/v2/ui/healthchecks": { + "get": { + "tags": [ + "HealthChecks" + ], + "responses": { + "400": { + "description": "Invalid request", + "content": { + "application/json": { + "schema": { + "$ref": "#/components/schemas/ErrorResponse" + } + } + } + }, + "401": { + "description": "Authentication failed", + "content": { + "application/json": { + "schema": { + "$ref": "#/components/schemas/ErrorResponse" + } + } + } + }, + "200": { + "description": "successful operation", + "content": { + "application/json": { + "schema": { + "type": "array", + "items": { + "$ref": "#/components/schemas/HealthCheckResponse" + } + } + } + } + } + }, + "security": [ + { + "bearerAuth": [ + [ + "permHealthCheckRead" + ] + ] + } + ], + "description": "GET many request to retrieve multiple objects.", + "parameters": [ + { + "name": "page[after]", + "in": "query", + "schema": { + "type": "integer", + "format": "int32" + }, + "example": 0, + "description": "Pointer to paginate to retrieve the data after the value provided" + }, + { + "name": "page[before]", + "in": "query", + "schema": { + "type": "integer", + "format": "int32" + }, + "example": 0, + "description": "Pointer to paginate to retrieve the data before the value provided" + }, + { + "name": "page[size]", + "in": "query", + "schema": { + "type": "integer", + "format": "int32" + }, + "example": 100, + "description": "Amout of data to retrieve inside a single page" + }, + { + "name": "filter", + "in": "query", + "style": "deepobject", + "explode": true, + "schema": { + "type": "object" + }, + "description": "Filters results using a query", + "example": "\"filter[hashlistId__gt]\": 200" + }, + { + "name": "include", + "in": "query", + "schema": { + "type": "string" + }, + "description": "Items to include, comma seperated. Possible options: crackerBinary,healthCheckAgents" + } + ] + }, + "post": { + "tags": [ + "HealthChecks" + ], + "responses": { + "400": { + "description": "Invalid request", + "content": { + "application/json": { + "schema": { + "$ref": "#/components/schemas/ErrorResponse" + } + } + } + }, + "401": { + "description": "Authentication failed", + "content": { + "application/json": { + "schema": { + "$ref": "#/components/schemas/ErrorResponse" + } + } + } + }, + "201": { + "description": "successful operation", + "content": { + "application/json": { + "schema": { + "$ref": "#/components/schemas/HealthCheckPostPatchResponse" + } + } + } + } + }, + "security": [ + { + "bearerAuth": [ + [ + "permHealthCheckCreate" + ] + ] + } + ], + "description": "POST request to create a new object. The request must contain the resource record as data with the attributes of the new object.To add relationships, a relationships object can be added with the resource records of the relations that are part of this object.", + "requestBody": { + "required": true, + "content": { + "application/json": { + "schema": { + "$ref": "#/components/schemas/HealthCheckCreate" + } + } + } + }, + "parameters": [] + } + }, + "/api/v2/ui/healthchecks/count": { + "get": { + "tags": [ + "HealthChecks" + ], + "responses": { + "400": { + "description": "Invalid request", + "content": { + "application/json": { + "schema": { + "$ref": "#/components/schemas/ErrorResponse" + } + } + } + }, + "401": { + "description": "Authentication failed", + "content": { + "application/json": { + "schema": { + "$ref": "#/components/schemas/ErrorResponse" + } + } + } + }, + "200": { + "description": "successful operation", + "content": { + "application/json": { + "schema": { + "type": "array", + "items": { + "$ref": "#/components/schemas/HealthCheckResponse" + } + } + } + } + } + }, + "security": [ + { + "bearerAuth": [ + [ + "permHealthCheckRead" + ] + ] + } + ], + "description": "GET many request to retrieve multiple objects.", + "parameters": [ + { + "name": "page[after]", + "in": "query", + "schema": { + "type": "integer", + "format": "int32" + }, + "example": 0, + "description": "Pointer to paginate to retrieve the data after the value provided" + }, + { + "name": "page[before]", + "in": "query", + "schema": { + "type": "integer", + "format": "int32" + }, + "example": 0, + "description": "Pointer to paginate to retrieve the data before the value provided" + }, + { + "name": "page[size]", + "in": "query", + "schema": { + "type": "integer", + "format": "int32" + }, + "example": 100, + "description": "Amout of data to retrieve inside a single page" + }, + { + "name": "filter", + "in": "query", + "style": "deepobject", + "explode": true, + "schema": { + "type": "object" + }, + "description": "Filters results using a query", + "example": "\"filter[hashlistId__gt]\": 200" + }, + { + "name": "include", + "in": "query", + "schema": { + "type": "string" + }, + "description": "Items to include, comma seperated. Possible options: crackerBinary,healthCheckAgents" + } + ] + } + }, + "/api/v2/ui/healthchecks/{id:[0-9]+}/{relation:crackerBinary}": { + "get": { + "tags": [ + "HealthChecks" + ], + "responses": { + "400": { + "description": "Invalid request", + "content": { + "application/json": { + "schema": { + "$ref": "#/components/schemas/ErrorResponse" + } + } + } + }, + "401": { + "description": "Authentication failed", + "content": { + "application/json": { + "schema": { + "$ref": "#/components/schemas/ErrorResponse" + } + } + } + }, + "404": { + "description": "Not Found", + "content": { + "application/json": { + "schema": { + "$ref": "#/components/schemas/NotFoundResponse" + } + } + } + }, + "200": { + "description": "successful operation", + "content": { + "application/json": { + "schema": { + "$ref": "#/components/schemas/HealthCheckResponse" + } + } + } + } + }, + "security": [ + { + "bearerAuth": [ + [ + "permHealthCheckRead" + ] + ] + } + ], + "description": "GET request for for a to-one relationship link. Returns the resource record of the object that is part of the specified relation.", + "parameters": [ + { + "name": "id", + "in": "path", + "required": true, + "schema": { + "type": "integer", + "format": "int32", + "example": 10 + } + }, + { + "name": "include", + "in": "query", + "schema": { + "type": "string" + }, + "description": "Items to include. Comma seperated" + } + ] + } + }, + "/api/v2/ui/healthchecks/{id:[0-9]+}/relationships/{relation:crackerBinary}": { + "get": { + "tags": [ + "HealthChecks" + ], + "responses": { + "400": { + "description": "Invalid request", + "content": { + "application/json": { + "schema": { + "$ref": "#/components/schemas/ErrorResponse" + } + } + } + }, + "401": { + "description": "Authentication failed", + "content": { + "application/json": { + "schema": { + "$ref": "#/components/schemas/ErrorResponse" + } + } + } + }, + "404": { + "description": "Not Found", + "content": { + "application/json": { + "schema": { + "$ref": "#/components/schemas/NotFoundResponse" + } + } + } + }, + "200": { + "description": "successful operation", + "content": { + "application/json": { + "schema": { + "$ref": "#/components/schemas/HealthCheckResponse" + } + } + } + } + }, + "security": [ + { + "bearerAuth": [ + [ + "permHealthCheckRead" + ] + ] + } + ], + "description": "GET request for for a to-one relationship link. Returns the resource record of the object that is part of the specified relation.", + "parameters": [ + { + "name": "id", + "in": "path", + "required": true, + "schema": { + "type": "integer", + "format": "int32", + "example": 10 + } + }, + { + "name": "include", + "in": "query", + "schema": { + "type": "string" + }, + "description": "Items to include. Comma seperated" + } + ] + }, + "patch": { + "tags": [ + "HealthChecks" + ], + "responses": { + "400": { + "description": "Invalid request", + "content": { + "application/json": { + "schema": { + "$ref": "#/components/schemas/ErrorResponse" + } + } + } + }, + "401": { + "description": "Authentication failed", + "content": { + "application/json": { + "schema": { + "$ref": "#/components/schemas/ErrorResponse" + } + } + } + }, + "404": { + "description": "Not Found", + "content": { + "application/json": { + "schema": { + "$ref": "#/components/schemas/NotFoundResponse" + } + } + } + }, + "200": { + "description": "successful operation", + "content": { + "application/json": { + "schema": { + "$ref": "#/components/schemas/HealthCheckPostPatchResponse" + } + } + } + } + }, + "security": [ + { + "bearerAuth": [ + [ + "permHealthCheckUpdate" + ] + ] + } + ], + "description": "", + "requestBody": { + "required": true, + "content": { + "application/json": { + "schema": { + "$ref": "#/components/schemas/HealthCheckPatch" + } + } + } + }, + "parameters": [] + } + }, + "/api/v2/ui/healthchecks/{id:[0-9]+}/{relation:healthCheckAgents}": { + "get": { + "tags": [ + "HealthChecks" + ], + "responses": { + "400": { + "description": "Invalid request", + "content": { + "application/json": { + "schema": { + "$ref": "#/components/schemas/ErrorResponse" + } + } + } + }, + "401": { + "description": "Authentication failed", + "content": { + "application/json": { + "schema": { + "$ref": "#/components/schemas/ErrorResponse" + } + } + } + }, + "404": { + "description": "Not Found", + "content": { + "application/json": { + "schema": { + "$ref": "#/components/schemas/NotFoundResponse" + } + } + } + }, + "200": { + "description": "successful operation", + "content": { + "application/json": { + "schema": { + "$ref": "#/components/schemas/HealthCheckResponse" + } + } + } + } + }, + "security": [ + { + "bearerAuth": [ + [ + "permHealthCheckRead" + ] + ] + } + ], + "description": "GET request for for a to-one relationship link. Returns the resource record of the object that is part of the specified relation.", + "parameters": [ + { + "name": "id", + "in": "path", + "required": true, + "schema": { + "type": "integer", + "format": "int32", + "example": 10 + } + }, + { + "name": "include", + "in": "query", + "schema": { + "type": "string" + }, + "description": "Items to include. Comma seperated" + } + ] + } + }, + "/api/v2/ui/healthchecks/{id:[0-9]+}/relationships/{relation:healthCheckAgents}": { + "get": { + "tags": [ + "HealthChecks" + ], + "responses": { + "400": { + "description": "Invalid request", + "content": { + "application/json": { + "schema": { + "$ref": "#/components/schemas/ErrorResponse" + } + } + } + }, + "401": { + "description": "Authentication failed", + "content": { + "application/json": { + "schema": { + "$ref": "#/components/schemas/ErrorResponse" + } + } + } + }, + "404": { + "description": "Not Found", + "content": { + "application/json": { + "schema": { + "$ref": "#/components/schemas/NotFoundResponse" + } + } + } + }, + "200": { + "description": "successful operation", + "content": { + "application/json": { + "schema": { + "$ref": "#/components/schemas/HealthCheckResponse" + } + } + } + } + }, + "security": [ + { + "bearerAuth": [ + [ + "permHealthCheckRead" + ] + ] + } + ], + "description": "GET request for for a to-one relationship link. Returns the resource record of the object that is part of the specified relation.", + "parameters": [ + { + "name": "id", + "in": "path", + "required": true, + "schema": { + "type": "integer", + "format": "int32", + "example": 10 + } + }, + { + "name": "include", + "in": "query", + "schema": { + "type": "string" + }, + "description": "Items to include. Comma seperated" + } + ] + }, + "patch": { + "tags": [ + "HealthChecks" + ], + "responses": { + "400": { + "description": "Invalid request", + "content": { + "application/json": { + "schema": { + "$ref": "#/components/schemas/ErrorResponse" + } + } + } + }, + "401": { + "description": "Authentication failed", + "content": { + "application/json": { + "schema": { + "$ref": "#/components/schemas/ErrorResponse" + } + } + } + }, + "404": { + "description": "Not Found", + "content": { + "application/json": { + "schema": { + "$ref": "#/components/schemas/NotFoundResponse" + } + } + } + }, + "200": { + "description": "successful operation", + "content": { + "application/json": { + "schema": { + "$ref": "#/components/schemas/HealthCheckPostPatchResponse" + } + } + } + } + }, + "security": [ + { + "bearerAuth": [ + [ + "permHealthCheckUpdate" + ] + ] + } + ], + "description": "", + "requestBody": { + "required": true, + "content": { + "application/json": { + "schema": { + "$ref": "#/components/schemas/HealthCheckPatch" + } + } + } + }, + "parameters": [] + }, + "post": { + "tags": [ + "HealthChecks" + ], + "responses": { + "400": { + "description": "Invalid request", + "content": { + "application/json": { + "schema": { + "$ref": "#/components/schemas/ErrorResponse" + } + } + } + }, + "401": { + "description": "Authentication failed", + "content": { + "application/json": { + "schema": { + "$ref": "#/components/schemas/ErrorResponse" + } + } + } + }, + "404": { + "description": "Not Found", + "content": { + "application/json": { + "schema": { + "$ref": "#/components/schemas/NotFoundResponse" + } + } + } + }, + "204": { + "description": "successfully created" + } + }, + "security": [ + { + "bearerAuth": [ + [ + "permHealthCheckCreate" + ] + ] + } + ], + "description": "", + "requestBody": { + "required": true, + "content": { + "application/json": [] + } + }, + "parameters": [] + }, + "delete": { + "tags": [ + "HealthChecks" + ], + "responses": { + "400": { + "description": "Invalid request", + "content": { + "application/json": { + "schema": { + "$ref": "#/components/schemas/ErrorResponse" + } + } + } + }, + "401": { + "description": "Authentication failed", + "content": { + "application/json": { + "schema": { + "$ref": "#/components/schemas/ErrorResponse" + } + } + } + }, + "404": { + "description": "Not Found", + "content": { + "application/json": { + "schema": { + "$ref": "#/components/schemas/NotFoundResponse" + } + } + } + }, + "204": { + "description": "successfully deleted" + } + }, + "security": [ + { + "bearerAuth": [ + [ + "permHealthCheckDelete" + ] + ] + } + ], + "description": "", + "requestBody": { + "required": true, + "content": { + "application/json": [] + } + }, + "parameters": [] + } + }, + "/api/v2/ui/healthchecks/{id:[0-9]+}": { + "get": { + "tags": [ + "HealthChecks" + ], + "responses": { + "400": { + "description": "Invalid request", + "content": { + "application/json": { + "schema": { + "$ref": "#/components/schemas/ErrorResponse" + } + } + } + }, + "401": { + "description": "Authentication failed", + "content": { + "application/json": { + "schema": { + "$ref": "#/components/schemas/ErrorResponse" + } + } + } + }, + "404": { + "description": "Not Found", + "content": { + "application/json": { + "schema": { + "$ref": "#/components/schemas/NotFoundResponse" + } + } + } + }, + "200": { + "description": "successful operation", + "content": { + "application/json": { + "schema": { + "$ref": "#/components/schemas/HealthCheckResponse" + } + } + } + } + }, + "security": [ + { + "bearerAuth": [ + [ + "permHealthCheckRead" + ] + ] + } + ], + "description": "GET request to retrieve a single object.", + "parameters": [ + { + "name": "id", + "in": "path", + "required": true, + "schema": { + "type": "integer", + "format": "int32", + "example": 10 + } + }, + { + "name": "include", + "in": "query", + "schema": { + "type": "string" + }, + "description": "Items to include. Comma seperated" + } + ] + }, + "patch": { + "tags": [ + "HealthChecks" + ], + "responses": { + "400": { + "description": "Invalid request", + "content": { + "application/json": { + "schema": { + "$ref": "#/components/schemas/ErrorResponse" + } + } + } + }, + "401": { + "description": "Authentication failed", + "content": { + "application/json": { + "schema": { + "$ref": "#/components/schemas/ErrorResponse" + } + } + } + }, + "404": { + "description": "Not Found", + "content": { + "application/json": { + "schema": { + "$ref": "#/components/schemas/NotFoundResponse" + } + } + } + }, + "200": { + "description": "successful operation", + "content": { + "application/json": { + "schema": { + "$ref": "#/components/schemas/HealthCheckPostPatchResponse" + } + } + } + } + }, + "security": [ + { + "bearerAuth": [ + [ + "permHealthCheckUpdate" + ] + ] + } + ], + "description": "PATCH request to update attributes of a single object.", + "requestBody": { + "required": true, + "content": { + "application/json": { + "schema": { + "$ref": "#/components/schemas/HealthCheckPatch" + } + } + } + }, + "parameters": [] + }, + "delete": { + "tags": [ + "HealthChecks" + ], + "responses": { + "400": { + "description": "Invalid request", + "content": { + "application/json": { + "schema": { + "$ref": "#/components/schemas/ErrorResponse" + } + } + } + }, + "401": { + "description": "Authentication failed", + "content": { + "application/json": { + "schema": { + "$ref": "#/components/schemas/ErrorResponse" + } + } + } + }, + "404": { + "description": "Not Found", + "content": { + "application/json": { + "schema": { + "$ref": "#/components/schemas/NotFoundResponse" + } + } + } + }, + "204": { + "description": "successfully deleted" + } + }, + "security": [ + { + "bearerAuth": [ + [ + "permHealthCheckDelete" + ] + ] + } + ], + "description": "", + "requestBody": { + "required": true, + "content": { + "application/json": [] + } + }, + "parameters": [] + } + }, + "/api/v2/ui/logentries": { + "get": { + "tags": [ + "LogEntrys" + ], + "responses": { + "400": { + "description": "Invalid request", + "content": { + "application/json": { + "schema": { + "$ref": "#/components/schemas/ErrorResponse" + } + } + } + }, + "401": { + "description": "Authentication failed", + "content": { + "application/json": { + "schema": { + "$ref": "#/components/schemas/ErrorResponse" + } + } + } + }, + "200": { + "description": "successful operation", + "content": { + "application/json": { + "schema": { + "type": "array", + "items": { + "$ref": "#/components/schemas/LogEntryResponse" + } + } + } + } + } + }, + "security": [ + { + "bearerAuth": [ + [ + "permLogEntryRead" + ] + ] + } + ], + "description": "GET many request to retrieve multiple objects.", + "parameters": [ + { + "name": "page[after]", + "in": "query", + "schema": { + "type": "integer", + "format": "int32" + }, + "example": 0, + "description": "Pointer to paginate to retrieve the data after the value provided" + }, + { + "name": "page[before]", + "in": "query", + "schema": { + "type": "integer", + "format": "int32" + }, + "example": 0, + "description": "Pointer to paginate to retrieve the data before the value provided" + }, + { + "name": "page[size]", + "in": "query", + "schema": { + "type": "integer", + "format": "int32" + }, + "example": 100, + "description": "Amout of data to retrieve inside a single page" + }, + { + "name": "filter", + "in": "query", + "style": "deepobject", + "explode": true, + "schema": { + "type": "object" + }, + "description": "Filters results using a query", + "example": "\"filter[hashlistId__gt]\": 200" + }, + { + "name": "include", + "in": "query", + "schema": { + "type": "string" + }, + "description": "Items to include, comma seperated. Possible options: " + } + ] + }, + "post": { + "tags": [ + "LogEntrys" + ], + "responses": { + "400": { + "description": "Invalid request", + "content": { + "application/json": { + "schema": { + "$ref": "#/components/schemas/ErrorResponse" + } + } + } + }, + "401": { + "description": "Authentication failed", + "content": { + "application/json": { + "schema": { + "$ref": "#/components/schemas/ErrorResponse" + } + } + } + }, + "201": { + "description": "successful operation", + "content": { + "application/json": { + "schema": { + "$ref": "#/components/schemas/LogEntryPostPatchResponse" + } + } + } + } + }, + "security": [ + { + "bearerAuth": [ + [ + "permLogEntryCreate" + ] + ] + } + ], + "description": "POST request to create a new object. The request must contain the resource record as data with the attributes of the new object.To add relationships, a relationships object can be added with the resource records of the relations that are part of this object.", + "requestBody": { + "required": true, + "content": { + "application/json": { + "schema": { + "$ref": "#/components/schemas/LogEntryCreate" + } + } + } + }, + "parameters": [] + } + }, + "/api/v2/ui/logentries/count": { + "get": { + "tags": [ + "LogEntrys" + ], + "responses": { + "400": { + "description": "Invalid request", + "content": { + "application/json": { + "schema": { + "$ref": "#/components/schemas/ErrorResponse" + } + } + } + }, + "401": { + "description": "Authentication failed", + "content": { + "application/json": { + "schema": { + "$ref": "#/components/schemas/ErrorResponse" + } + } + } + }, + "200": { + "description": "successful operation", + "content": { + "application/json": { + "schema": { + "type": "array", + "items": { + "$ref": "#/components/schemas/LogEntryResponse" + } + } + } + } + } + }, + "security": [ + { + "bearerAuth": [ + [ + "permLogEntryRead" + ] + ] + } + ], + "description": "GET many request to retrieve multiple objects.", + "parameters": [ + { + "name": "page[after]", + "in": "query", + "schema": { + "type": "integer", + "format": "int32" + }, + "example": 0, + "description": "Pointer to paginate to retrieve the data after the value provided" + }, + { + "name": "page[before]", + "in": "query", + "schema": { + "type": "integer", + "format": "int32" + }, + "example": 0, + "description": "Pointer to paginate to retrieve the data before the value provided" + }, + { + "name": "page[size]", + "in": "query", + "schema": { + "type": "integer", + "format": "int32" + }, + "example": 100, + "description": "Amout of data to retrieve inside a single page" + }, + { + "name": "filter", + "in": "query", + "style": "deepobject", + "explode": true, + "schema": { + "type": "object" + }, + "description": "Filters results using a query", + "example": "\"filter[hashlistId__gt]\": 200" + }, + { + "name": "include", + "in": "query", + "schema": { + "type": "string" + }, + "description": "Items to include, comma seperated. Possible options: " + } + ] + } + }, + "/api/v2/ui/logentries/{id:[0-9]+}": { + "get": { + "tags": [ + "LogEntrys" + ], + "responses": { + "400": { + "description": "Invalid request", + "content": { + "application/json": { + "schema": { + "$ref": "#/components/schemas/ErrorResponse" + } + } + } + }, + "401": { + "description": "Authentication failed", + "content": { + "application/json": { + "schema": { + "$ref": "#/components/schemas/ErrorResponse" + } + } + } + }, + "404": { + "description": "Not Found", + "content": { + "application/json": { + "schema": { + "$ref": "#/components/schemas/NotFoundResponse" + } + } + } + }, + "200": { + "description": "successful operation", + "content": { + "application/json": { + "schema": { + "$ref": "#/components/schemas/LogEntryResponse" + } + } + } + } + }, + "security": [ + { + "bearerAuth": [ + [ + "permLogEntryRead" + ] + ] + } + ], + "description": "GET request to retrieve a single object.", + "parameters": [ + { + "name": "id", + "in": "path", + "required": true, + "schema": { + "type": "integer", + "format": "int32", + "example": 10 + } + }, + { + "name": "include", + "in": "query", + "schema": { + "type": "string" + }, + "description": "Items to include. Comma seperated" + } + ] + }, + "patch": { + "tags": [ + "LogEntrys" + ], + "responses": { + "400": { + "description": "Invalid request", + "content": { + "application/json": { + "schema": { + "$ref": "#/components/schemas/ErrorResponse" + } + } + } + }, + "401": { + "description": "Authentication failed", + "content": { + "application/json": { + "schema": { + "$ref": "#/components/schemas/ErrorResponse" + } + } + } + }, + "404": { + "description": "Not Found", + "content": { + "application/json": { + "schema": { + "$ref": "#/components/schemas/NotFoundResponse" + } + } + } + }, + "200": { + "description": "successful operation", + "content": { + "application/json": { + "schema": { + "$ref": "#/components/schemas/LogEntryPostPatchResponse" + } + } + } + } + }, + "security": [ + { + "bearerAuth": [ + [ + "permLogEntryUpdate" + ] + ] + } + ], + "description": "PATCH request to update attributes of a single object.", + "requestBody": { + "required": true, + "content": { + "application/json": { + "schema": { + "$ref": "#/components/schemas/LogEntryPatch" + } + } + } + }, + "parameters": [] + }, + "delete": { + "tags": [ + "LogEntrys" + ], + "responses": { + "400": { + "description": "Invalid request", + "content": { + "application/json": { + "schema": { + "$ref": "#/components/schemas/ErrorResponse" + } + } + } + }, + "401": { + "description": "Authentication failed", + "content": { + "application/json": { + "schema": { + "$ref": "#/components/schemas/ErrorResponse" + } + } + } + }, + "404": { + "description": "Not Found", + "content": { + "application/json": { + "schema": { + "$ref": "#/components/schemas/NotFoundResponse" + } + } + } + }, + "204": { + "description": "successfully deleted" + } + }, + "security": [ + { + "bearerAuth": [ + [ + "permLogEntryDelete" + ] + ] + } + ], + "description": "", + "requestBody": { + "required": true, + "content": { + "application/json": [] + } + }, + "parameters": [] + } + }, + "/api/v2/ui/notifications": { + "get": { + "tags": [ + "NotificationSettings" + ], + "responses": { + "400": { + "description": "Invalid request", + "content": { + "application/json": { + "schema": { + "$ref": "#/components/schemas/ErrorResponse" + } + } + } + }, + "401": { + "description": "Authentication failed", + "content": { + "application/json": { + "schema": { + "$ref": "#/components/schemas/ErrorResponse" + } + } + } + }, + "200": { + "description": "successful operation", + "content": { + "application/json": { + "schema": { + "type": "array", + "items": { + "$ref": "#/components/schemas/NotificationSettingResponse" + } + } + } + } + } + }, + "security": [ + { + "bearerAuth": [ + [ + "permNotificationSettingRead" + ] + ] + } + ], + "description": "GET many request to retrieve multiple objects.", + "parameters": [ + { + "name": "page[after]", + "in": "query", + "schema": { + "type": "integer", + "format": "int32" + }, + "example": 0, + "description": "Pointer to paginate to retrieve the data after the value provided" + }, + { + "name": "page[before]", + "in": "query", + "schema": { + "type": "integer", + "format": "int32" + }, + "example": 0, + "description": "Pointer to paginate to retrieve the data before the value provided" + }, + { + "name": "page[size]", + "in": "query", + "schema": { + "type": "integer", + "format": "int32" + }, + "example": 100, + "description": "Amout of data to retrieve inside a single page" + }, + { + "name": "filter", + "in": "query", + "style": "deepobject", + "explode": true, + "schema": { + "type": "object" + }, + "description": "Filters results using a query", + "example": "\"filter[hashlistId__gt]\": 200" + }, + { + "name": "include", + "in": "query", + "schema": { + "type": "string" + }, + "description": "Items to include, comma seperated. Possible options: user" + } + ] + }, + "post": { + "tags": [ + "NotificationSettings" + ], + "responses": { + "400": { + "description": "Invalid request", + "content": { + "application/json": { + "schema": { + "$ref": "#/components/schemas/ErrorResponse" + } + } + } + }, + "401": { + "description": "Authentication failed", + "content": { + "application/json": { + "schema": { + "$ref": "#/components/schemas/ErrorResponse" + } + } + } + }, + "201": { + "description": "successful operation", + "content": { + "application/json": { + "schema": { + "$ref": "#/components/schemas/NotificationSettingPostPatchResponse" + } + } + } + } + }, + "security": [ + { + "bearerAuth": [ + [ + "permNotificationSettingCreate" + ] + ] + } + ], + "description": "POST request to create a new object. The request must contain the resource record as data with the attributes of the new object.To add relationships, a relationships object can be added with the resource records of the relations that are part of this object.", + "requestBody": { + "required": true, + "content": { + "application/json": { + "schema": { + "$ref": "#/components/schemas/NotificationSettingCreate" + } + } + } + }, + "parameters": [] + } + }, + "/api/v2/ui/notifications/count": { + "get": { + "tags": [ + "NotificationSettings" + ], + "responses": { + "400": { + "description": "Invalid request", + "content": { + "application/json": { + "schema": { + "$ref": "#/components/schemas/ErrorResponse" + } + } + } + }, + "401": { + "description": "Authentication failed", + "content": { + "application/json": { + "schema": { + "$ref": "#/components/schemas/ErrorResponse" + } + } + } + }, + "200": { + "description": "successful operation", + "content": { + "application/json": { + "schema": { + "type": "array", + "items": { + "$ref": "#/components/schemas/NotificationSettingResponse" + } + } + } + } + } + }, + "security": [ + { + "bearerAuth": [ + [ + "permNotificationSettingRead" + ] + ] + } + ], + "description": "GET many request to retrieve multiple objects.", + "parameters": [ + { + "name": "page[after]", + "in": "query", + "schema": { + "type": "integer", + "format": "int32" + }, + "example": 0, + "description": "Pointer to paginate to retrieve the data after the value provided" + }, + { + "name": "page[before]", + "in": "query", + "schema": { + "type": "integer", + "format": "int32" + }, + "example": 0, + "description": "Pointer to paginate to retrieve the data before the value provided" + }, + { + "name": "page[size]", + "in": "query", + "schema": { + "type": "integer", + "format": "int32" + }, + "example": 100, + "description": "Amout of data to retrieve inside a single page" + }, + { + "name": "filter", + "in": "query", + "style": "deepobject", + "explode": true, + "schema": { + "type": "object" + }, + "description": "Filters results using a query", + "example": "\"filter[hashlistId__gt]\": 200" + }, + { + "name": "include", + "in": "query", + "schema": { + "type": "string" + }, + "description": "Items to include, comma seperated. Possible options: user" + } + ] + } + }, + "/api/v2/ui/notifications/{id:[0-9]+}/{relation:user}": { + "get": { + "tags": [ + "NotificationSettings" + ], + "responses": { + "400": { + "description": "Invalid request", + "content": { + "application/json": { + "schema": { + "$ref": "#/components/schemas/ErrorResponse" + } + } + } + }, + "401": { + "description": "Authentication failed", + "content": { + "application/json": { + "schema": { + "$ref": "#/components/schemas/ErrorResponse" + } + } + } + }, + "404": { + "description": "Not Found", + "content": { + "application/json": { + "schema": { + "$ref": "#/components/schemas/NotFoundResponse" + } + } + } + }, + "200": { + "description": "successful operation", + "content": { + "application/json": { + "schema": { + "$ref": "#/components/schemas/NotificationSettingResponse" + } + } + } + } + }, + "security": [ + { + "bearerAuth": [ + [ + "permNotificationSettingRead" + ] + ] + } + ], + "description": "GET request for for a to-one relationship link. Returns the resource record of the object that is part of the specified relation.", + "parameters": [ + { + "name": "id", + "in": "path", + "required": true, + "schema": { + "type": "integer", + "format": "int32", + "example": 10 + } + }, + { + "name": "include", + "in": "query", + "schema": { + "type": "string" + }, + "description": "Items to include. Comma seperated" + } + ] + } + }, + "/api/v2/ui/notifications/{id:[0-9]+}/relationships/{relation:user}": { + "get": { + "tags": [ + "NotificationSettings" + ], + "responses": { + "400": { + "description": "Invalid request", + "content": { + "application/json": { + "schema": { + "$ref": "#/components/schemas/ErrorResponse" + } + } + } + }, + "401": { + "description": "Authentication failed", + "content": { + "application/json": { + "schema": { + "$ref": "#/components/schemas/ErrorResponse" + } + } + } + }, + "404": { + "description": "Not Found", + "content": { + "application/json": { + "schema": { + "$ref": "#/components/schemas/NotFoundResponse" + } + } + } + }, + "200": { + "description": "successful operation", + "content": { + "application/json": { + "schema": { + "$ref": "#/components/schemas/NotificationSettingResponse" + } + } + } + } + }, + "security": [ + { + "bearerAuth": [ + [ + "permNotificationSettingRead" + ] + ] + } + ], + "description": "GET request for for a to-one relationship link. Returns the resource record of the object that is part of the specified relation.", + "parameters": [ + { + "name": "id", + "in": "path", + "required": true, + "schema": { + "type": "integer", + "format": "int32", + "example": 10 + } + }, + { + "name": "include", + "in": "query", + "schema": { + "type": "string" + }, + "description": "Items to include. Comma seperated" + } + ] + }, + "patch": { + "tags": [ + "NotificationSettings" + ], + "responses": { + "400": { + "description": "Invalid request", + "content": { + "application/json": { + "schema": { + "$ref": "#/components/schemas/ErrorResponse" + } + } + } + }, + "401": { + "description": "Authentication failed", + "content": { + "application/json": { + "schema": { + "$ref": "#/components/schemas/ErrorResponse" + } + } + } + }, + "404": { + "description": "Not Found", + "content": { + "application/json": { + "schema": { + "$ref": "#/components/schemas/NotFoundResponse" + } + } + } + }, + "200": { + "description": "successful operation", + "content": { + "application/json": { + "schema": { + "$ref": "#/components/schemas/NotificationSettingPostPatchResponse" + } + } + } + } + }, + "security": [ + { + "bearerAuth": [ + [ + "permNotificationSettingUpdate" + ] + ] + } + ], + "description": "", + "requestBody": { + "required": true, + "content": { + "application/json": { + "schema": { + "$ref": "#/components/schemas/NotificationSettingPatch" + } + } + } + }, + "parameters": [] + } + }, + "/api/v2/ui/notifications/{id:[0-9]+}": { + "get": { + "tags": [ + "NotificationSettings" + ], + "responses": { + "400": { + "description": "Invalid request", + "content": { + "application/json": { + "schema": { + "$ref": "#/components/schemas/ErrorResponse" + } + } + } + }, + "401": { + "description": "Authentication failed", + "content": { + "application/json": { + "schema": { + "$ref": "#/components/schemas/ErrorResponse" + } + } + } + }, + "404": { + "description": "Not Found", + "content": { + "application/json": { + "schema": { + "$ref": "#/components/schemas/NotFoundResponse" + } + } + } + }, + "200": { + "description": "successful operation", + "content": { + "application/json": { + "schema": { + "$ref": "#/components/schemas/NotificationSettingResponse" + } + } + } + } + }, + "security": [ + { + "bearerAuth": [ + [ + "permNotificationSettingRead" + ] + ] + } + ], + "description": "GET request to retrieve a single object.", + "parameters": [ + { + "name": "id", + "in": "path", + "required": true, + "schema": { + "type": "integer", + "format": "int32", + "example": 10 + } + }, + { + "name": "include", + "in": "query", + "schema": { + "type": "string" + }, + "description": "Items to include. Comma seperated" + } + ] + }, + "patch": { + "tags": [ + "NotificationSettings" + ], + "responses": { + "400": { + "description": "Invalid request", + "content": { + "application/json": { + "schema": { + "$ref": "#/components/schemas/ErrorResponse" + } + } + } + }, + "401": { + "description": "Authentication failed", + "content": { + "application/json": { + "schema": { + "$ref": "#/components/schemas/ErrorResponse" + } + } + } + }, + "404": { + "description": "Not Found", + "content": { + "application/json": { + "schema": { + "$ref": "#/components/schemas/NotFoundResponse" + } + } + } + }, + "200": { + "description": "successful operation", + "content": { + "application/json": { + "schema": { + "$ref": "#/components/schemas/NotificationSettingPostPatchResponse" + } + } + } + } + }, + "security": [ + { + "bearerAuth": [ + [ + "permNotificationSettingUpdate" + ] + ] + } + ], + "description": "PATCH request to update attributes of a single object.", + "requestBody": { + "required": true, + "content": { + "application/json": { + "schema": { + "$ref": "#/components/schemas/NotificationSettingPatch" + } + } + } + }, + "parameters": [] + }, + "delete": { + "tags": [ + "NotificationSettings" + ], + "responses": { + "400": { + "description": "Invalid request", + "content": { + "application/json": { + "schema": { + "$ref": "#/components/schemas/ErrorResponse" + } + } + } + }, + "401": { + "description": "Authentication failed", + "content": { + "application/json": { + "schema": { + "$ref": "#/components/schemas/ErrorResponse" + } + } + } + }, + "404": { + "description": "Not Found", + "content": { + "application/json": { + "schema": { + "$ref": "#/components/schemas/NotFoundResponse" + } + } + } + }, + "204": { + "description": "successfully deleted" + } + }, + "security": [ + { + "bearerAuth": [ + [ + "permNotificationSettingDelete" + ] + ] + } + ], + "description": "", + "requestBody": { + "required": true, + "content": { + "application/json": [] + } + }, + "parameters": [] + } + }, + "/api/v2/ui/preprocessors": { + "get": { + "tags": [ + "Preprocessors" + ], + "responses": { + "400": { + "description": "Invalid request", + "content": { + "application/json": { + "schema": { + "$ref": "#/components/schemas/ErrorResponse" + } + } + } + }, + "401": { + "description": "Authentication failed", + "content": { + "application/json": { + "schema": { + "$ref": "#/components/schemas/ErrorResponse" + } + } + } + }, + "200": { + "description": "successful operation", + "content": { + "application/json": { + "schema": { + "type": "array", + "items": { + "$ref": "#/components/schemas/PreprocessorResponse" + } + } + } + } + } + }, + "security": [ + { + "bearerAuth": [ + [ + "permPreprocessorRead" + ] + ] + } + ], + "description": "GET many request to retrieve multiple objects.", + "parameters": [ + { + "name": "page[after]", + "in": "query", + "schema": { + "type": "integer", + "format": "int32" + }, + "example": 0, + "description": "Pointer to paginate to retrieve the data after the value provided" + }, + { + "name": "page[before]", + "in": "query", + "schema": { + "type": "integer", + "format": "int32" + }, + "example": 0, + "description": "Pointer to paginate to retrieve the data before the value provided" + }, + { + "name": "page[size]", + "in": "query", + "schema": { + "type": "integer", + "format": "int32" + }, + "example": 100, + "description": "Amout of data to retrieve inside a single page" + }, + { + "name": "filter", + "in": "query", + "style": "deepobject", + "explode": true, + "schema": { + "type": "object" + }, + "description": "Filters results using a query", + "example": "\"filter[hashlistId__gt]\": 200" + }, + { + "name": "include", + "in": "query", + "schema": { + "type": "string" + }, + "description": "Items to include, comma seperated. Possible options: " + } + ] + }, + "post": { + "tags": [ + "Preprocessors" + ], + "responses": { + "400": { + "description": "Invalid request", + "content": { + "application/json": { + "schema": { + "$ref": "#/components/schemas/ErrorResponse" + } + } + } + }, + "401": { + "description": "Authentication failed", + "content": { + "application/json": { + "schema": { + "$ref": "#/components/schemas/ErrorResponse" + } + } + } + }, + "201": { + "description": "successful operation", + "content": { + "application/json": { + "schema": { + "$ref": "#/components/schemas/PreprocessorPostPatchResponse" + } + } + } + } + }, + "security": [ + { + "bearerAuth": [ + [ + "permPreprocessorCreate" + ] + ] + } + ], + "description": "POST request to create a new object. The request must contain the resource record as data with the attributes of the new object.To add relationships, a relationships object can be added with the resource records of the relations that are part of this object.", + "requestBody": { + "required": true, + "content": { + "application/json": { + "schema": { + "$ref": "#/components/schemas/PreprocessorCreate" + } + } + } + }, + "parameters": [] + } + }, + "/api/v2/ui/preprocessors/count": { + "get": { + "tags": [ + "Preprocessors" + ], + "responses": { + "400": { + "description": "Invalid request", + "content": { + "application/json": { + "schema": { + "$ref": "#/components/schemas/ErrorResponse" + } + } + } + }, + "401": { + "description": "Authentication failed", + "content": { + "application/json": { + "schema": { + "$ref": "#/components/schemas/ErrorResponse" + } + } + } + }, + "200": { + "description": "successful operation", + "content": { + "application/json": { + "schema": { + "type": "array", + "items": { + "$ref": "#/components/schemas/PreprocessorResponse" + } + } + } + } + } + }, + "security": [ + { + "bearerAuth": [ + [ + "permPreprocessorRead" + ] + ] + } + ], + "description": "GET many request to retrieve multiple objects.", + "parameters": [ + { + "name": "page[after]", + "in": "query", + "schema": { + "type": "integer", + "format": "int32" + }, + "example": 0, + "description": "Pointer to paginate to retrieve the data after the value provided" + }, + { + "name": "page[before]", + "in": "query", + "schema": { + "type": "integer", + "format": "int32" + }, + "example": 0, + "description": "Pointer to paginate to retrieve the data before the value provided" + }, + { + "name": "page[size]", + "in": "query", + "schema": { + "type": "integer", + "format": "int32" + }, + "example": 100, + "description": "Amout of data to retrieve inside a single page" + }, + { + "name": "filter", + "in": "query", + "style": "deepobject", + "explode": true, + "schema": { + "type": "object" + }, + "description": "Filters results using a query", + "example": "\"filter[hashlistId__gt]\": 200" + }, + { + "name": "include", + "in": "query", + "schema": { + "type": "string" + }, + "description": "Items to include, comma seperated. Possible options: " + } + ] + } + }, + "/api/v2/ui/preprocessors/{id:[0-9]+}": { + "get": { + "tags": [ + "Preprocessors" + ], + "responses": { + "400": { + "description": "Invalid request", + "content": { + "application/json": { + "schema": { + "$ref": "#/components/schemas/ErrorResponse" + } + } + } + }, + "401": { + "description": "Authentication failed", + "content": { + "application/json": { + "schema": { + "$ref": "#/components/schemas/ErrorResponse" + } + } + } + }, + "404": { + "description": "Not Found", + "content": { + "application/json": { + "schema": { + "$ref": "#/components/schemas/NotFoundResponse" + } + } + } + }, + "200": { + "description": "successful operation", + "content": { + "application/json": { + "schema": { + "$ref": "#/components/schemas/PreprocessorResponse" + } + } + } + } + }, + "security": [ + { + "bearerAuth": [ + [ + "permPreprocessorRead" + ] + ] + } + ], + "description": "GET request to retrieve a single object.", + "parameters": [ + { + "name": "id", + "in": "path", + "required": true, + "schema": { + "type": "integer", + "format": "int32", + "example": 10 + } + }, + { + "name": "include", + "in": "query", + "schema": { + "type": "string" + }, + "description": "Items to include. Comma seperated" + } + ] + }, + "patch": { + "tags": [ + "Preprocessors" + ], + "responses": { + "400": { + "description": "Invalid request", + "content": { + "application/json": { + "schema": { + "$ref": "#/components/schemas/ErrorResponse" + } + } + } + }, + "401": { + "description": "Authentication failed", + "content": { + "application/json": { + "schema": { + "$ref": "#/components/schemas/ErrorResponse" + } + } + } + }, + "404": { + "description": "Not Found", + "content": { + "application/json": { + "schema": { + "$ref": "#/components/schemas/NotFoundResponse" + } + } + } + }, + "200": { + "description": "successful operation", + "content": { + "application/json": { + "schema": { + "$ref": "#/components/schemas/PreprocessorPostPatchResponse" + } + } + } + } + }, + "security": [ + { + "bearerAuth": [ + [ + "permPreprocessorUpdate" + ] + ] + } + ], + "description": "PATCH request to update attributes of a single object.", + "requestBody": { + "required": true, + "content": { + "application/json": { + "schema": { + "$ref": "#/components/schemas/PreprocessorPatch" + } + } + } + }, + "parameters": [] + }, + "delete": { + "tags": [ + "Preprocessors" + ], + "responses": { + "400": { + "description": "Invalid request", + "content": { + "application/json": { + "schema": { + "$ref": "#/components/schemas/ErrorResponse" + } + } + } + }, + "401": { + "description": "Authentication failed", + "content": { + "application/json": { + "schema": { + "$ref": "#/components/schemas/ErrorResponse" + } + } + } + }, + "404": { + "description": "Not Found", + "content": { + "application/json": { + "schema": { + "$ref": "#/components/schemas/NotFoundResponse" + } + } + } + }, + "204": { + "description": "successfully deleted" + } + }, + "security": [ + { + "bearerAuth": [ + [ + "permPreprocessorDelete" + ] + ] + } + ], + "description": "", + "requestBody": { + "required": true, + "content": { + "application/json": [] + } + }, + "parameters": [] + } + }, + "/api/v2/ui/pretasks": { + "get": { + "tags": [ + "Pretasks" + ], + "responses": { + "400": { + "description": "Invalid request", + "content": { + "application/json": { + "schema": { + "$ref": "#/components/schemas/ErrorResponse" + } + } + } + }, + "401": { + "description": "Authentication failed", + "content": { + "application/json": { + "schema": { + "$ref": "#/components/schemas/ErrorResponse" + } + } + } + }, + "200": { + "description": "successful operation", + "content": { + "application/json": { + "schema": { + "type": "array", + "items": { + "$ref": "#/components/schemas/PretaskResponse" + } + } + } + } + } + }, + "security": [ + { + "bearerAuth": [ + [ + "permPretaskRead" + ] + ] + } + ], + "description": "GET many request to retrieve multiple objects.", + "parameters": [ + { + "name": "page[after]", + "in": "query", + "schema": { + "type": "integer", + "format": "int32" + }, + "example": 0, + "description": "Pointer to paginate to retrieve the data after the value provided" + }, + { + "name": "page[before]", + "in": "query", + "schema": { + "type": "integer", + "format": "int32" + }, + "example": 0, + "description": "Pointer to paginate to retrieve the data before the value provided" + }, + { + "name": "page[size]", + "in": "query", + "schema": { + "type": "integer", + "format": "int32" + }, + "example": 100, + "description": "Amout of data to retrieve inside a single page" + }, + { + "name": "filter", + "in": "query", + "style": "deepobject", + "explode": true, + "schema": { + "type": "object" + }, + "description": "Filters results using a query", + "example": "\"filter[hashlistId__gt]\": 200" + }, + { + "name": "include", + "in": "query", + "schema": { + "type": "string" + }, + "description": "Items to include, comma seperated. Possible options: pretaskFiles" + } + ] + }, + "post": { + "tags": [ + "Pretasks" + ], + "responses": { + "400": { + "description": "Invalid request", + "content": { + "application/json": { + "schema": { + "$ref": "#/components/schemas/ErrorResponse" + } + } + } + }, + "401": { + "description": "Authentication failed", + "content": { + "application/json": { + "schema": { + "$ref": "#/components/schemas/ErrorResponse" + } + } + } + }, + "201": { + "description": "successful operation", + "content": { + "application/json": { + "schema": { + "$ref": "#/components/schemas/PretaskPostPatchResponse" + } + } + } + } + }, + "security": [ + { + "bearerAuth": [ + [ + "permPretaskCreate" + ] + ] + } + ], + "description": "POST request to create a new object. The request must contain the resource record as data with the attributes of the new object.To add relationships, a relationships object can be added with the resource records of the relations that are part of this object.", + "requestBody": { + "required": true, + "content": { + "application/json": { + "schema": { + "$ref": "#/components/schemas/PretaskCreate" + } + } + } + }, + "parameters": [] + } + }, + "/api/v2/ui/pretasks/count": { + "get": { + "tags": [ + "Pretasks" + ], + "responses": { + "400": { + "description": "Invalid request", + "content": { + "application/json": { + "schema": { + "$ref": "#/components/schemas/ErrorResponse" + } + } + } + }, + "401": { + "description": "Authentication failed", + "content": { + "application/json": { + "schema": { + "$ref": "#/components/schemas/ErrorResponse" + } + } + } + }, + "200": { + "description": "successful operation", + "content": { + "application/json": { + "schema": { + "type": "array", + "items": { + "$ref": "#/components/schemas/PretaskResponse" + } + } + } + } + } + }, + "security": [ + { + "bearerAuth": [ + [ + "permPretaskRead" + ] + ] + } + ], + "description": "GET many request to retrieve multiple objects.", + "parameters": [ + { + "name": "page[after]", + "in": "query", + "schema": { + "type": "integer", + "format": "int32" + }, + "example": 0, + "description": "Pointer to paginate to retrieve the data after the value provided" + }, + { + "name": "page[before]", + "in": "query", + "schema": { + "type": "integer", + "format": "int32" + }, + "example": 0, + "description": "Pointer to paginate to retrieve the data before the value provided" + }, + { + "name": "page[size]", + "in": "query", + "schema": { + "type": "integer", + "format": "int32" + }, + "example": 100, + "description": "Amout of data to retrieve inside a single page" + }, + { + "name": "filter", + "in": "query", + "style": "deepobject", + "explode": true, + "schema": { + "type": "object" + }, + "description": "Filters results using a query", + "example": "\"filter[hashlistId__gt]\": 200" + }, + { + "name": "include", + "in": "query", + "schema": { + "type": "string" + }, + "description": "Items to include, comma seperated. Possible options: pretaskFiles" + } + ] + } + }, + "/api/v2/ui/pretasks/{id:[0-9]+}/{relation:pretaskFiles}": { + "get": { + "tags": [ + "Pretasks" + ], + "responses": { + "400": { + "description": "Invalid request", + "content": { + "application/json": { + "schema": { + "$ref": "#/components/schemas/ErrorResponse" + } + } + } + }, + "401": { + "description": "Authentication failed", + "content": { + "application/json": { + "schema": { + "$ref": "#/components/schemas/ErrorResponse" + } + } + } + }, + "404": { + "description": "Not Found", + "content": { + "application/json": { + "schema": { + "$ref": "#/components/schemas/NotFoundResponse" + } + } + } + }, + "200": { + "description": "successful operation", + "content": { + "application/json": { + "schema": { + "$ref": "#/components/schemas/PretaskResponse" + } + } + } + } + }, + "security": [ + { + "bearerAuth": [ + [ + "permPretaskRead" + ] + ] + } + ], + "description": "GET request for for a to-one relationship link. Returns the resource record of the object that is part of the specified relation.", + "parameters": [ + { + "name": "id", + "in": "path", + "required": true, + "schema": { + "type": "integer", + "format": "int32", + "example": 10 + } + }, + { + "name": "include", + "in": "query", + "schema": { + "type": "string" + }, + "description": "Items to include. Comma seperated" + } + ] + } + }, + "/api/v2/ui/pretasks/{id:[0-9]+}/relationships/{relation:pretaskFiles}": { + "get": { + "tags": [ + "Pretasks" + ], + "responses": { + "400": { + "description": "Invalid request", + "content": { + "application/json": { + "schema": { + "$ref": "#/components/schemas/ErrorResponse" + } + } + } + }, + "401": { + "description": "Authentication failed", + "content": { + "application/json": { + "schema": { + "$ref": "#/components/schemas/ErrorResponse" + } + } + } + }, + "404": { + "description": "Not Found", + "content": { + "application/json": { + "schema": { + "$ref": "#/components/schemas/NotFoundResponse" + } + } + } + }, + "200": { + "description": "successful operation", + "content": { + "application/json": { + "schema": { + "$ref": "#/components/schemas/PretaskResponse" + } + } + } + } + }, + "security": [ + { + "bearerAuth": [ + [ + "permPretaskRead" + ] + ] + } + ], + "description": "GET request for for a to-one relationship link. Returns the resource record of the object that is part of the specified relation.", + "parameters": [ + { + "name": "id", + "in": "path", + "required": true, + "schema": { + "type": "integer", + "format": "int32", + "example": 10 + } + }, + { + "name": "include", + "in": "query", + "schema": { + "type": "string" + }, + "description": "Items to include. Comma seperated" + } + ] + }, + "patch": { + "tags": [ + "Pretasks" + ], + "responses": { + "400": { + "description": "Invalid request", + "content": { + "application/json": { + "schema": { + "$ref": "#/components/schemas/ErrorResponse" + } + } + } + }, + "401": { + "description": "Authentication failed", + "content": { + "application/json": { + "schema": { + "$ref": "#/components/schemas/ErrorResponse" + } + } + } + }, + "404": { + "description": "Not Found", + "content": { + "application/json": { + "schema": { + "$ref": "#/components/schemas/NotFoundResponse" + } + } + } + }, + "200": { + "description": "successful operation", + "content": { + "application/json": { + "schema": { + "$ref": "#/components/schemas/PretaskPostPatchResponse" + } + } + } + } + }, + "security": [ + { + "bearerAuth": [ + [ + "permPretaskUpdate" + ] + ] + } + ], + "description": "", + "requestBody": { + "required": true, + "content": { + "application/json": { + "schema": { + "$ref": "#/components/schemas/PretaskPatch" + } + } + } + }, + "parameters": [] + }, + "post": { + "tags": [ + "Pretasks" + ], + "responses": { + "400": { + "description": "Invalid request", + "content": { + "application/json": { + "schema": { + "$ref": "#/components/schemas/ErrorResponse" + } + } + } + }, + "401": { + "description": "Authentication failed", + "content": { + "application/json": { + "schema": { + "$ref": "#/components/schemas/ErrorResponse" + } + } + } + }, + "404": { + "description": "Not Found", + "content": { + "application/json": { + "schema": { + "$ref": "#/components/schemas/NotFoundResponse" + } + } + } + }, + "204": { + "description": "successfully created" + } + }, + "security": [ + { + "bearerAuth": [ + [ + "permPretaskCreate" + ] + ] + } + ], + "description": "", + "requestBody": { + "required": true, + "content": { + "application/json": [] + } + }, + "parameters": [] + }, + "delete": { + "tags": [ + "Pretasks" + ], + "responses": { + "400": { + "description": "Invalid request", + "content": { + "application/json": { + "schema": { + "$ref": "#/components/schemas/ErrorResponse" + } + } + } + }, + "401": { + "description": "Authentication failed", + "content": { + "application/json": { + "schema": { + "$ref": "#/components/schemas/ErrorResponse" + } + } + } + }, + "404": { + "description": "Not Found", + "content": { + "application/json": { + "schema": { + "$ref": "#/components/schemas/NotFoundResponse" + } + } + } + }, + "204": { + "description": "successfully deleted" + } + }, + "security": [ + { + "bearerAuth": [ + [ + "permPretaskDelete" + ] + ] + } + ], + "description": "", + "requestBody": { + "required": true, + "content": { + "application/json": [] + } + }, + "parameters": [] + } + }, + "/api/v2/ui/pretasks/{id:[0-9]+}": { + "get": { + "tags": [ + "Pretasks" + ], + "responses": { + "400": { + "description": "Invalid request", + "content": { + "application/json": { + "schema": { + "$ref": "#/components/schemas/ErrorResponse" + } + } + } + }, + "401": { + "description": "Authentication failed", + "content": { + "application/json": { + "schema": { + "$ref": "#/components/schemas/ErrorResponse" + } + } + } + }, + "404": { + "description": "Not Found", + "content": { + "application/json": { + "schema": { + "$ref": "#/components/schemas/NotFoundResponse" + } + } + } + }, + "200": { + "description": "successful operation", + "content": { + "application/json": { + "schema": { + "$ref": "#/components/schemas/PretaskResponse" + } + } + } + } + }, + "security": [ + { + "bearerAuth": [ + [ + "permPretaskRead" + ] + ] + } + ], + "description": "GET request to retrieve a single object.", + "parameters": [ + { + "name": "id", + "in": "path", + "required": true, + "schema": { + "type": "integer", + "format": "int32", + "example": 10 + } + }, + { + "name": "include", + "in": "query", + "schema": { + "type": "string" + }, + "description": "Items to include. Comma seperated" + } + ] + }, + "patch": { + "tags": [ + "Pretasks" + ], + "responses": { + "400": { + "description": "Invalid request", + "content": { + "application/json": { + "schema": { + "$ref": "#/components/schemas/ErrorResponse" + } + } + } + }, + "401": { + "description": "Authentication failed", + "content": { + "application/json": { + "schema": { + "$ref": "#/components/schemas/ErrorResponse" + } + } + } + }, + "404": { + "description": "Not Found", + "content": { + "application/json": { + "schema": { + "$ref": "#/components/schemas/NotFoundResponse" + } + } + } + }, + "200": { + "description": "successful operation", + "content": { + "application/json": { + "schema": { + "$ref": "#/components/schemas/PretaskPostPatchResponse" + } + } + } + } + }, + "security": [ + { + "bearerAuth": [ + [ + "permPretaskUpdate" + ] + ] + } + ], + "description": "PATCH request to update attributes of a single object.", + "requestBody": { + "required": true, + "content": { + "application/json": { + "schema": { + "$ref": "#/components/schemas/PretaskPatch" + } + } + } + }, + "parameters": [] + }, + "delete": { + "tags": [ + "Pretasks" + ], + "responses": { + "400": { + "description": "Invalid request", + "content": { + "application/json": { + "schema": { + "$ref": "#/components/schemas/ErrorResponse" + } + } + } + }, + "401": { + "description": "Authentication failed", + "content": { + "application/json": { + "schema": { + "$ref": "#/components/schemas/ErrorResponse" + } + } + } + }, + "404": { + "description": "Not Found", + "content": { + "application/json": { + "schema": { + "$ref": "#/components/schemas/NotFoundResponse" + } + } + } + }, + "204": { + "description": "successfully deleted" + } + }, + "security": [ + { + "bearerAuth": [ + [ + "permPretaskDelete" + ] + ] + } + ], + "description": "", + "requestBody": { + "required": true, + "content": { + "application/json": [] + } + }, + "parameters": [] + } + }, + "/api/v2/ui/speeds": { + "get": { + "tags": [ + "Speeds" + ], + "responses": { + "400": { + "description": "Invalid request", + "content": { + "application/json": { + "schema": { + "$ref": "#/components/schemas/ErrorResponse" + } + } + } + }, + "401": { + "description": "Authentication failed", + "content": { + "application/json": { + "schema": { + "$ref": "#/components/schemas/ErrorResponse" + } + } + } + }, + "200": { + "description": "successful operation", + "content": { + "application/json": { + "schema": { + "type": "array", + "items": { + "$ref": "#/components/schemas/SpeedResponse" + } + } + } + } + } + }, + "security": [ + { + "bearerAuth": [ + [ + "permSpeedRead" + ] + ] + } + ], + "description": "GET many request to retrieve multiple objects.", + "parameters": [ + { + "name": "page[after]", + "in": "query", + "schema": { + "type": "integer", + "format": "int32" + }, + "example": 0, + "description": "Pointer to paginate to retrieve the data after the value provided" + }, + { + "name": "page[before]", + "in": "query", + "schema": { + "type": "integer", + "format": "int32" + }, + "example": 0, + "description": "Pointer to paginate to retrieve the data before the value provided" + }, + { + "name": "page[size]", + "in": "query", + "schema": { + "type": "integer", + "format": "int32" + }, + "example": 100, + "description": "Amout of data to retrieve inside a single page" + }, + { + "name": "filter", + "in": "query", + "style": "deepobject", + "explode": true, + "schema": { + "type": "object" + }, + "description": "Filters results using a query", + "example": "\"filter[hashlistId__gt]\": 200" + }, + { + "name": "include", + "in": "query", + "schema": { + "type": "string" + }, + "description": "Items to include, comma seperated. Possible options: agent,task" + } + ] + } + }, + "/api/v2/ui/speeds/count": { + "get": { + "tags": [ + "Speeds" + ], + "responses": { + "400": { + "description": "Invalid request", + "content": { + "application/json": { + "schema": { + "$ref": "#/components/schemas/ErrorResponse" + } + } + } + }, + "401": { + "description": "Authentication failed", + "content": { + "application/json": { + "schema": { + "$ref": "#/components/schemas/ErrorResponse" + } + } + } + }, + "200": { + "description": "successful operation", + "content": { + "application/json": { + "schema": { + "type": "array", + "items": { + "$ref": "#/components/schemas/SpeedResponse" + } + } + } + } + } + }, + "security": [ + { + "bearerAuth": [ + [ + "permSpeedRead" + ] + ] + } + ], + "description": "GET many request to retrieve multiple objects.", + "parameters": [ + { + "name": "page[after]", + "in": "query", + "schema": { + "type": "integer", + "format": "int32" + }, + "example": 0, + "description": "Pointer to paginate to retrieve the data after the value provided" + }, + { + "name": "page[before]", + "in": "query", + "schema": { + "type": "integer", + "format": "int32" + }, + "example": 0, + "description": "Pointer to paginate to retrieve the data before the value provided" + }, + { + "name": "page[size]", + "in": "query", + "schema": { + "type": "integer", + "format": "int32" + }, + "example": 100, + "description": "Amout of data to retrieve inside a single page" + }, + { + "name": "filter", + "in": "query", + "style": "deepobject", + "explode": true, + "schema": { + "type": "object" + }, + "description": "Filters results using a query", + "example": "\"filter[hashlistId__gt]\": 200" + }, + { + "name": "include", + "in": "query", + "schema": { + "type": "string" + }, + "description": "Items to include, comma seperated. Possible options: agent,task" + } + ] + } + }, + "/api/v2/ui/speeds/{id:[0-9]+}/{relation:agent}": { + "get": { + "tags": [ + "Speeds" + ], + "responses": { + "400": { + "description": "Invalid request", + "content": { + "application/json": { + "schema": { + "$ref": "#/components/schemas/ErrorResponse" + } + } + } + }, + "401": { + "description": "Authentication failed", + "content": { + "application/json": { + "schema": { + "$ref": "#/components/schemas/ErrorResponse" + } + } + } + }, + "404": { + "description": "Not Found", + "content": { + "application/json": { + "schema": { + "$ref": "#/components/schemas/NotFoundResponse" + } + } + } + }, + "200": { + "description": "successful operation", + "content": { + "application/json": { + "schema": { + "$ref": "#/components/schemas/SpeedResponse" + } + } + } + } + }, + "security": [ + { + "bearerAuth": [ + [ + "permSpeedRead" + ] + ] + } + ], + "description": "GET request for for a to-one relationship link. Returns the resource record of the object that is part of the specified relation.", + "parameters": [ + { + "name": "id", + "in": "path", + "required": true, + "schema": { + "type": "integer", + "format": "int32", + "example": 10 + } + }, + { + "name": "include", + "in": "query", + "schema": { + "type": "string" + }, + "description": "Items to include. Comma seperated" + } + ] + } + }, + "/api/v2/ui/speeds/{id:[0-9]+}/relationships/{relation:agent}": { + "get": { + "tags": [ + "Speeds" + ], + "responses": { + "400": { + "description": "Invalid request", + "content": { + "application/json": { + "schema": { + "$ref": "#/components/schemas/ErrorResponse" + } + } + } + }, + "401": { + "description": "Authentication failed", + "content": { + "application/json": { + "schema": { + "$ref": "#/components/schemas/ErrorResponse" + } + } + } + }, + "404": { + "description": "Not Found", + "content": { + "application/json": { + "schema": { + "$ref": "#/components/schemas/NotFoundResponse" + } + } + } + }, + "200": { + "description": "successful operation", + "content": { + "application/json": { + "schema": { + "$ref": "#/components/schemas/SpeedResponse" + } + } + } + } + }, + "security": [ + { + "bearerAuth": [ + [ + "permSpeedRead" + ] + ] + } + ], + "description": "GET request for for a to-one relationship link. Returns the resource record of the object that is part of the specified relation.", + "parameters": [ + { + "name": "id", + "in": "path", + "required": true, + "schema": { + "type": "integer", + "format": "int32", + "example": 10 + } + }, + { + "name": "include", + "in": "query", + "schema": { + "type": "string" + }, + "description": "Items to include. Comma seperated" + } + ] + }, + "patch": { + "tags": [ + "Speeds" + ], + "responses": { + "400": { + "description": "Invalid request", + "content": { + "application/json": { + "schema": { + "$ref": "#/components/schemas/ErrorResponse" + } + } + } + }, + "401": { + "description": "Authentication failed", + "content": { + "application/json": { + "schema": { + "$ref": "#/components/schemas/ErrorResponse" + } + } + } + }, + "404": { + "description": "Not Found", + "content": { + "application/json": { + "schema": { + "$ref": "#/components/schemas/NotFoundResponse" + } + } + } + }, + "200": { + "description": "successful operation", + "content": { + "application/json": { + "schema": { + "$ref": "#/components/schemas/SpeedPostPatchResponse" + } + } + } + } + }, + "security": [ + { + "bearerAuth": [ + [ + "permSpeedUpdate" + ] + ] + } + ], + "description": "", + "requestBody": { + "required": true, + "content": { + "application/json": { + "schema": { + "$ref": "#/components/schemas/SpeedPatch" + } + } + } + }, + "parameters": [] + } + }, + "/api/v2/ui/speeds/{id:[0-9]+}/{relation:task}": { + "get": { + "tags": [ + "Speeds" + ], + "responses": { + "400": { + "description": "Invalid request", + "content": { + "application/json": { + "schema": { + "$ref": "#/components/schemas/ErrorResponse" + } + } + } + }, + "401": { + "description": "Authentication failed", + "content": { + "application/json": { + "schema": { + "$ref": "#/components/schemas/ErrorResponse" + } + } + } + }, + "404": { + "description": "Not Found", + "content": { + "application/json": { + "schema": { + "$ref": "#/components/schemas/NotFoundResponse" + } + } + } + }, + "200": { + "description": "successful operation", + "content": { + "application/json": { + "schema": { + "$ref": "#/components/schemas/SpeedResponse" + } + } + } + } + }, + "security": [ + { + "bearerAuth": [ + [ + "permSpeedRead" + ] + ] + } + ], + "description": "GET request for for a to-one relationship link. Returns the resource record of the object that is part of the specified relation.", + "parameters": [ + { + "name": "id", + "in": "path", + "required": true, + "schema": { + "type": "integer", + "format": "int32", + "example": 10 + } + }, + { + "name": "include", + "in": "query", + "schema": { + "type": "string" + }, + "description": "Items to include. Comma seperated" + } + ] + } + }, + "/api/v2/ui/speeds/{id:[0-9]+}/relationships/{relation:task}": { + "get": { + "tags": [ + "Speeds" + ], + "responses": { + "400": { + "description": "Invalid request", + "content": { + "application/json": { + "schema": { + "$ref": "#/components/schemas/ErrorResponse" + } + } + } + }, + "401": { + "description": "Authentication failed", + "content": { + "application/json": { + "schema": { + "$ref": "#/components/schemas/ErrorResponse" + } + } + } + }, + "404": { + "description": "Not Found", + "content": { + "application/json": { + "schema": { + "$ref": "#/components/schemas/NotFoundResponse" + } + } + } + }, + "200": { + "description": "successful operation", + "content": { + "application/json": { + "schema": { + "$ref": "#/components/schemas/SpeedResponse" + } + } + } + } + }, + "security": [ + { + "bearerAuth": [ + [ + "permSpeedRead" + ] + ] + } + ], + "description": "GET request for for a to-one relationship link. Returns the resource record of the object that is part of the specified relation.", + "parameters": [ + { + "name": "id", + "in": "path", + "required": true, + "schema": { + "type": "integer", + "format": "int32", + "example": 10 + } + }, + { + "name": "include", + "in": "query", + "schema": { + "type": "string" + }, + "description": "Items to include. Comma seperated" + } + ] + }, + "patch": { + "tags": [ + "Speeds" + ], + "responses": { + "400": { + "description": "Invalid request", + "content": { + "application/json": { + "schema": { + "$ref": "#/components/schemas/ErrorResponse" + } + } + } + }, + "401": { + "description": "Authentication failed", + "content": { + "application/json": { + "schema": { + "$ref": "#/components/schemas/ErrorResponse" + } + } + } + }, + "404": { + "description": "Not Found", + "content": { + "application/json": { + "schema": { + "$ref": "#/components/schemas/NotFoundResponse" + } + } + } + }, + "200": { + "description": "successful operation", + "content": { + "application/json": { + "schema": { + "$ref": "#/components/schemas/SpeedPostPatchResponse" + } + } + } + } + }, + "security": [ + { + "bearerAuth": [ + [ + "permSpeedUpdate" + ] + ] + } + ], + "description": "", + "requestBody": { + "required": true, + "content": { + "application/json": { + "schema": { + "$ref": "#/components/schemas/SpeedPatch" + } + } + } + }, + "parameters": [] + } + }, + "/api/v2/ui/speeds/{id:[0-9]+}": { + "get": { + "tags": [ + "Speeds" + ], + "responses": { + "400": { + "description": "Invalid request", + "content": { + "application/json": { + "schema": { + "$ref": "#/components/schemas/ErrorResponse" + } + } + } + }, + "401": { + "description": "Authentication failed", + "content": { + "application/json": { + "schema": { + "$ref": "#/components/schemas/ErrorResponse" + } + } + } + }, + "404": { + "description": "Not Found", + "content": { + "application/json": { + "schema": { + "$ref": "#/components/schemas/NotFoundResponse" + } + } + } + }, + "200": { + "description": "successful operation", + "content": { + "application/json": { + "schema": { + "$ref": "#/components/schemas/SpeedResponse" + } + } + } + } + }, + "security": [ + { + "bearerAuth": [ + [ + "permSpeedRead" + ] + ] + } + ], + "description": "GET request to retrieve a single object.", + "parameters": [ + { + "name": "id", + "in": "path", + "required": true, + "schema": { + "type": "integer", + "format": "int32", + "example": 10 + } + }, + { + "name": "include", + "in": "query", + "schema": { + "type": "string" + }, + "description": "Items to include. Comma seperated" + } + ] + } + }, + "/api/v2/ui/supertasks": { + "get": { + "tags": [ + "Supertasks" + ], + "responses": { + "400": { + "description": "Invalid request", + "content": { + "application/json": { + "schema": { + "$ref": "#/components/schemas/ErrorResponse" + } + } + } + }, + "401": { + "description": "Authentication failed", + "content": { + "application/json": { + "schema": { + "$ref": "#/components/schemas/ErrorResponse" + } + } + } + }, + "200": { + "description": "successful operation", + "content": { + "application/json": { + "schema": { + "type": "array", + "items": { + "$ref": "#/components/schemas/SupertaskResponse" + } + } + } + } + } + }, + "security": [ + { + "bearerAuth": [ + [ + "permSupertaskRead" + ] + ] + } + ], + "description": "GET many request to retrieve multiple objects.", + "parameters": [ + { + "name": "page[after]", + "in": "query", + "schema": { + "type": "integer", + "format": "int32" + }, + "example": 0, + "description": "Pointer to paginate to retrieve the data after the value provided" + }, + { + "name": "page[before]", + "in": "query", + "schema": { + "type": "integer", + "format": "int32" + }, + "example": 0, + "description": "Pointer to paginate to retrieve the data before the value provided" + }, + { + "name": "page[size]", + "in": "query", + "schema": { + "type": "integer", + "format": "int32" + }, + "example": 100, + "description": "Amout of data to retrieve inside a single page" + }, + { + "name": "filter", + "in": "query", + "style": "deepobject", + "explode": true, + "schema": { + "type": "object" + }, + "description": "Filters results using a query", + "example": "\"filter[hashlistId__gt]\": 200" + }, + { + "name": "include", + "in": "query", + "schema": { + "type": "string" + }, + "description": "Items to include, comma seperated. Possible options: pretasks" + } + ] + }, + "post": { + "tags": [ + "Supertasks" + ], + "responses": { + "400": { + "description": "Invalid request", + "content": { + "application/json": { + "schema": { + "$ref": "#/components/schemas/ErrorResponse" + } + } + } + }, + "401": { + "description": "Authentication failed", + "content": { + "application/json": { + "schema": { + "$ref": "#/components/schemas/ErrorResponse" + } + } + } + }, + "201": { + "description": "successful operation", + "content": { + "application/json": { + "schema": { + "$ref": "#/components/schemas/SupertaskPostPatchResponse" + } + } + } + } + }, + "security": [ + { + "bearerAuth": [ + [ + "permSupertaskCreate" + ] + ] + } + ], + "description": "POST request to create a new object. The request must contain the resource record as data with the attributes of the new object.To add relationships, a relationships object can be added with the resource records of the relations that are part of this object.", + "requestBody": { + "required": true, + "content": { + "application/json": { + "schema": { + "$ref": "#/components/schemas/SupertaskCreate" + } + } + } + }, + "parameters": [] + } + }, + "/api/v2/ui/supertasks/count": { + "get": { + "tags": [ + "Supertasks" + ], + "responses": { + "400": { + "description": "Invalid request", + "content": { + "application/json": { + "schema": { + "$ref": "#/components/schemas/ErrorResponse" + } + } + } + }, + "401": { + "description": "Authentication failed", + "content": { + "application/json": { + "schema": { + "$ref": "#/components/schemas/ErrorResponse" + } + } + } + }, + "200": { + "description": "successful operation", + "content": { + "application/json": { + "schema": { + "type": "array", + "items": { + "$ref": "#/components/schemas/SupertaskResponse" + } + } + } + } + } + }, + "security": [ + { + "bearerAuth": [ + [ + "permSupertaskRead" + ] + ] + } + ], + "description": "GET many request to retrieve multiple objects.", + "parameters": [ + { + "name": "page[after]", + "in": "query", + "schema": { + "type": "integer", + "format": "int32" + }, + "example": 0, + "description": "Pointer to paginate to retrieve the data after the value provided" + }, + { + "name": "page[before]", + "in": "query", + "schema": { + "type": "integer", + "format": "int32" + }, + "example": 0, + "description": "Pointer to paginate to retrieve the data before the value provided" + }, + { + "name": "page[size]", + "in": "query", + "schema": { + "type": "integer", + "format": "int32" + }, + "example": 100, + "description": "Amout of data to retrieve inside a single page" + }, + { + "name": "filter", + "in": "query", + "style": "deepobject", + "explode": true, + "schema": { + "type": "object" + }, + "description": "Filters results using a query", + "example": "\"filter[hashlistId__gt]\": 200" + }, + { + "name": "include", + "in": "query", + "schema": { + "type": "string" + }, + "description": "Items to include, comma seperated. Possible options: pretasks" + } + ] + } + }, + "/api/v2/ui/supertasks/{id:[0-9]+}/{relation:pretasks}": { + "get": { + "tags": [ + "Supertasks" + ], + "responses": { + "400": { + "description": "Invalid request", + "content": { + "application/json": { + "schema": { + "$ref": "#/components/schemas/ErrorResponse" + } + } + } + }, + "401": { + "description": "Authentication failed", + "content": { + "application/json": { + "schema": { + "$ref": "#/components/schemas/ErrorResponse" + } + } + } + }, + "404": { + "description": "Not Found", + "content": { + "application/json": { + "schema": { + "$ref": "#/components/schemas/NotFoundResponse" + } + } + } + }, + "200": { + "description": "successful operation", + "content": { + "application/json": { + "schema": { + "$ref": "#/components/schemas/SupertaskResponse" + } + } + } + } + }, + "security": [ + { + "bearerAuth": [ + [ + "permSupertaskRead" + ] + ] + } + ], + "description": "GET request for for a to-one relationship link. Returns the resource record of the object that is part of the specified relation.", + "parameters": [ + { + "name": "id", + "in": "path", + "required": true, + "schema": { + "type": "integer", + "format": "int32", + "example": 10 + } + }, + { + "name": "include", + "in": "query", + "schema": { + "type": "string" + }, + "description": "Items to include. Comma seperated" + } + ] + } + }, + "/api/v2/ui/supertasks/{id:[0-9]+}/relationships/{relation:pretasks}": { + "get": { + "tags": [ + "Supertasks" + ], + "responses": { + "400": { + "description": "Invalid request", + "content": { + "application/json": { + "schema": { + "$ref": "#/components/schemas/ErrorResponse" + } + } + } + }, + "401": { + "description": "Authentication failed", + "content": { + "application/json": { + "schema": { + "$ref": "#/components/schemas/ErrorResponse" + } + } + } + }, + "404": { + "description": "Not Found", + "content": { + "application/json": { + "schema": { + "$ref": "#/components/schemas/NotFoundResponse" + } + } + } + }, + "200": { + "description": "successful operation", + "content": { + "application/json": { + "schema": { + "$ref": "#/components/schemas/SupertaskResponse" + } + } + } + } + }, + "security": [ + { + "bearerAuth": [ + [ + "permSupertaskRead" + ] + ] + } + ], + "description": "GET request for for a to-one relationship link. Returns the resource record of the object that is part of the specified relation.", + "parameters": [ + { + "name": "id", + "in": "path", + "required": true, + "schema": { + "type": "integer", + "format": "int32", + "example": 10 + } + }, + { + "name": "include", + "in": "query", + "schema": { + "type": "string" + }, + "description": "Items to include. Comma seperated" + } + ] + }, + "patch": { + "tags": [ + "Supertasks" + ], + "responses": { + "400": { + "description": "Invalid request", + "content": { + "application/json": { + "schema": { + "$ref": "#/components/schemas/ErrorResponse" + } + } + } + }, + "401": { + "description": "Authentication failed", + "content": { + "application/json": { + "schema": { + "$ref": "#/components/schemas/ErrorResponse" + } + } + } + }, + "404": { + "description": "Not Found", + "content": { + "application/json": { + "schema": { + "$ref": "#/components/schemas/NotFoundResponse" + } + } + } + }, + "200": { + "description": "successful operation", + "content": { + "application/json": { + "schema": { + "$ref": "#/components/schemas/SupertaskPostPatchResponse" + } + } + } + } + }, + "security": [ + { + "bearerAuth": [ + [ + "permSupertaskUpdate" + ] + ] + } + ], + "description": "", + "requestBody": { + "required": true, + "content": { + "application/json": { + "schema": { + "$ref": "#/components/schemas/SupertaskPatch" + } + } + } + }, + "parameters": [] + }, + "post": { + "tags": [ + "Supertasks" + ], + "responses": { + "400": { + "description": "Invalid request", + "content": { + "application/json": { + "schema": { + "$ref": "#/components/schemas/ErrorResponse" + } + } + } + }, + "401": { + "description": "Authentication failed", + "content": { + "application/json": { + "schema": { + "$ref": "#/components/schemas/ErrorResponse" + } + } + } + }, + "404": { + "description": "Not Found", + "content": { + "application/json": { + "schema": { + "$ref": "#/components/schemas/NotFoundResponse" + } + } + } + }, + "204": { + "description": "successfully created" + } + }, + "security": [ + { + "bearerAuth": [ + [ + "permSupertaskCreate" + ] + ] + } + ], + "description": "", + "requestBody": { + "required": true, + "content": { + "application/json": [] + } + }, + "parameters": [] + }, + "delete": { + "tags": [ + "Supertasks" + ], + "responses": { + "400": { + "description": "Invalid request", + "content": { + "application/json": { + "schema": { + "$ref": "#/components/schemas/ErrorResponse" + } + } + } + }, + "401": { + "description": "Authentication failed", + "content": { + "application/json": { + "schema": { + "$ref": "#/components/schemas/ErrorResponse" + } + } + } + }, + "404": { + "description": "Not Found", + "content": { + "application/json": { + "schema": { + "$ref": "#/components/schemas/NotFoundResponse" + } + } + } + }, + "204": { + "description": "successfully deleted" + } + }, + "security": [ + { + "bearerAuth": [ + [ + "permSupertaskDelete" + ] + ] + } + ], + "description": "", + "requestBody": { + "required": true, + "content": { + "application/json": [] + } + }, + "parameters": [] + } + }, + "/api/v2/ui/supertasks/{id:[0-9]+}": { + "get": { + "tags": [ + "Supertasks" + ], + "responses": { + "400": { + "description": "Invalid request", + "content": { + "application/json": { + "schema": { + "$ref": "#/components/schemas/ErrorResponse" + } + } + } + }, + "401": { + "description": "Authentication failed", + "content": { + "application/json": { + "schema": { + "$ref": "#/components/schemas/ErrorResponse" + } + } + } + }, + "404": { + "description": "Not Found", + "content": { + "application/json": { + "schema": { + "$ref": "#/components/schemas/NotFoundResponse" + } + } + } + }, + "200": { + "description": "successful operation", + "content": { + "application/json": { + "schema": { + "$ref": "#/components/schemas/SupertaskResponse" + } + } + } + } + }, + "security": [ + { + "bearerAuth": [ + [ + "permSupertaskRead" + ] + ] + } + ], + "description": "GET request to retrieve a single object.", + "parameters": [ + { + "name": "id", + "in": "path", + "required": true, + "schema": { + "type": "integer", + "format": "int32", + "example": 10 + } + }, + { + "name": "include", + "in": "query", + "schema": { + "type": "string" + }, + "description": "Items to include. Comma seperated" + } + ] + }, + "patch": { + "tags": [ + "Supertasks" + ], + "responses": { + "400": { + "description": "Invalid request", + "content": { + "application/json": { + "schema": { + "$ref": "#/components/schemas/ErrorResponse" + } + } + } + }, + "401": { + "description": "Authentication failed", + "content": { + "application/json": { + "schema": { + "$ref": "#/components/schemas/ErrorResponse" + } + } + } + }, + "404": { + "description": "Not Found", + "content": { + "application/json": { + "schema": { + "$ref": "#/components/schemas/NotFoundResponse" + } + } + } + }, + "200": { + "description": "successful operation", + "content": { + "application/json": { + "schema": { + "$ref": "#/components/schemas/SupertaskPostPatchResponse" + } + } + } + } + }, + "security": [ + { + "bearerAuth": [ + [ + "permSupertaskUpdate" + ] + ] + } + ], + "description": "PATCH request to update attributes of a single object.", + "requestBody": { + "required": true, + "content": { + "application/json": { + "schema": { + "$ref": "#/components/schemas/SupertaskPatch" + } + } + } + }, + "parameters": [] + }, + "delete": { + "tags": [ + "Supertasks" + ], + "responses": { + "400": { + "description": "Invalid request", + "content": { + "application/json": { + "schema": { + "$ref": "#/components/schemas/ErrorResponse" + } + } + } + }, + "401": { + "description": "Authentication failed", + "content": { + "application/json": { + "schema": { + "$ref": "#/components/schemas/ErrorResponse" + } + } + } + }, + "404": { + "description": "Not Found", + "content": { + "application/json": { + "schema": { + "$ref": "#/components/schemas/NotFoundResponse" + } + } + } + }, + "204": { + "description": "successfully deleted" + } + }, + "security": [ + { + "bearerAuth": [ + [ + "permSupertaskDelete" + ] + ] + } + ], + "description": "", + "requestBody": { + "required": true, + "content": { + "application/json": [] + } + }, + "parameters": [] + } + }, + "/api/v2/ui/tasks": { + "get": { + "tags": [ + "Tasks" + ], + "responses": { + "400": { + "description": "Invalid request", + "content": { + "application/json": { + "schema": { + "$ref": "#/components/schemas/ErrorResponse" + } + } + } + }, + "401": { + "description": "Authentication failed", + "content": { + "application/json": { + "schema": { + "$ref": "#/components/schemas/ErrorResponse" + } + } + } + }, + "200": { + "description": "successful operation", + "content": { + "application/json": { + "schema": { + "type": "array", + "items": { + "$ref": "#/components/schemas/TaskResponse" + } + } + } + } + } + }, + "security": [ + { + "bearerAuth": [ + [ + "permTaskRead" + ] + ] + } + ], + "description": "GET many request to retrieve multiple objects.", + "parameters": [ + { + "name": "page[after]", + "in": "query", + "schema": { + "type": "integer", + "format": "int32" + }, + "example": 0, + "description": "Pointer to paginate to retrieve the data after the value provided" + }, + { + "name": "page[before]", + "in": "query", + "schema": { + "type": "integer", + "format": "int32" + }, + "example": 0, + "description": "Pointer to paginate to retrieve the data before the value provided" + }, + { + "name": "page[size]", + "in": "query", + "schema": { + "type": "integer", + "format": "int32" + }, + "example": 100, + "description": "Amout of data to retrieve inside a single page" + }, + { + "name": "filter", + "in": "query", + "style": "deepobject", + "explode": true, + "schema": { + "type": "object" + }, + "description": "Filters results using a query", + "example": "\"filter[hashlistId__gt]\": 200" + }, + { + "name": "include", + "in": "query", + "schema": { + "type": "string" + }, + "description": "Items to include, comma seperated. Possible options: crackerBinary,crackerBinaryType,hashlist,assignedAgents,files,speeds" + } + ] + }, + "post": { + "tags": [ + "Tasks" + ], + "responses": { + "400": { + "description": "Invalid request", + "content": { + "application/json": { + "schema": { + "$ref": "#/components/schemas/ErrorResponse" + } + } + } + }, + "401": { + "description": "Authentication failed", + "content": { + "application/json": { + "schema": { + "$ref": "#/components/schemas/ErrorResponse" + } + } + } + }, + "201": { + "description": "successful operation", + "content": { + "application/json": { + "schema": { + "$ref": "#/components/schemas/TaskPostPatchResponse" + } + } + } + } + }, + "security": [ + { + "bearerAuth": [ + [ + "permTaskCreate" + ] + ] + } + ], + "description": "POST request to create a new object. The request must contain the resource record as data with the attributes of the new object.To add relationships, a relationships object can be added with the resource records of the relations that are part of this object.", + "requestBody": { + "required": true, + "content": { + "application/json": { + "schema": { + "$ref": "#/components/schemas/TaskCreate" + } + } + } + }, + "parameters": [] + } + }, + "/api/v2/ui/tasks/count": { + "get": { + "tags": [ + "Tasks" + ], + "responses": { + "400": { + "description": "Invalid request", + "content": { + "application/json": { + "schema": { + "$ref": "#/components/schemas/ErrorResponse" + } + } + } + }, + "401": { + "description": "Authentication failed", + "content": { + "application/json": { + "schema": { + "$ref": "#/components/schemas/ErrorResponse" + } + } + } + }, + "200": { + "description": "successful operation", + "content": { + "application/json": { + "schema": { + "type": "array", + "items": { + "$ref": "#/components/schemas/TaskResponse" + } + } + } + } + } + }, + "security": [ + { + "bearerAuth": [ + [ + "permTaskRead" + ] + ] + } + ], + "description": "GET many request to retrieve multiple objects.", + "parameters": [ + { + "name": "page[after]", + "in": "query", + "schema": { + "type": "integer", + "format": "int32" + }, + "example": 0, + "description": "Pointer to paginate to retrieve the data after the value provided" + }, + { + "name": "page[before]", + "in": "query", + "schema": { + "type": "integer", + "format": "int32" + }, + "example": 0, + "description": "Pointer to paginate to retrieve the data before the value provided" + }, + { + "name": "page[size]", + "in": "query", + "schema": { + "type": "integer", + "format": "int32" + }, + "example": 100, + "description": "Amout of data to retrieve inside a single page" + }, + { + "name": "filter", + "in": "query", + "style": "deepobject", + "explode": true, + "schema": { + "type": "object" + }, + "description": "Filters results using a query", + "example": "\"filter[hashlistId__gt]\": 200" + }, + { + "name": "include", + "in": "query", + "schema": { + "type": "string" + }, + "description": "Items to include, comma seperated. Possible options: crackerBinary,crackerBinaryType,hashlist,assignedAgents,files,speeds" + } + ] + } + }, + "/api/v2/ui/tasks/{id:[0-9]+}/{relation:crackerBinary}": { + "get": { + "tags": [ + "Tasks" + ], + "responses": { + "400": { + "description": "Invalid request", + "content": { + "application/json": { + "schema": { + "$ref": "#/components/schemas/ErrorResponse" + } + } + } + }, + "401": { + "description": "Authentication failed", + "content": { + "application/json": { + "schema": { + "$ref": "#/components/schemas/ErrorResponse" + } + } + } + }, + "404": { + "description": "Not Found", + "content": { + "application/json": { + "schema": { + "$ref": "#/components/schemas/NotFoundResponse" + } + } + } + }, + "200": { + "description": "successful operation", + "content": { + "application/json": { + "schema": { + "$ref": "#/components/schemas/TaskResponse" + } + } + } + } + }, + "security": [ + { + "bearerAuth": [ + [ + "permTaskRead" + ] + ] + } + ], + "description": "GET request for for a to-one relationship link. Returns the resource record of the object that is part of the specified relation.", + "parameters": [ + { + "name": "id", + "in": "path", + "required": true, + "schema": { + "type": "integer", + "format": "int32", + "example": 10 + } + }, + { + "name": "include", + "in": "query", + "schema": { + "type": "string" + }, + "description": "Items to include. Comma seperated" + } + ] + } + }, + "/api/v2/ui/tasks/{id:[0-9]+}/relationships/{relation:crackerBinary}": { + "get": { + "tags": [ + "Tasks" + ], + "responses": { + "400": { + "description": "Invalid request", + "content": { + "application/json": { + "schema": { + "$ref": "#/components/schemas/ErrorResponse" + } + } + } + }, + "401": { + "description": "Authentication failed", + "content": { + "application/json": { + "schema": { + "$ref": "#/components/schemas/ErrorResponse" + } + } + } + }, + "404": { + "description": "Not Found", + "content": { + "application/json": { + "schema": { + "$ref": "#/components/schemas/NotFoundResponse" + } + } + } + }, + "200": { + "description": "successful operation", + "content": { + "application/json": { + "schema": { + "$ref": "#/components/schemas/TaskResponse" + } + } + } + } + }, + "security": [ + { + "bearerAuth": [ + [ + "permTaskRead" + ] + ] + } + ], + "description": "GET request for for a to-one relationship link. Returns the resource record of the object that is part of the specified relation.", + "parameters": [ + { + "name": "id", + "in": "path", + "required": true, + "schema": { + "type": "integer", + "format": "int32", + "example": 10 + } + }, + { + "name": "include", + "in": "query", + "schema": { + "type": "string" + }, + "description": "Items to include. Comma seperated" + } + ] + }, + "patch": { + "tags": [ + "Tasks" + ], + "responses": { + "400": { + "description": "Invalid request", + "content": { + "application/json": { + "schema": { + "$ref": "#/components/schemas/ErrorResponse" + } + } + } + }, + "401": { + "description": "Authentication failed", + "content": { + "application/json": { + "schema": { + "$ref": "#/components/schemas/ErrorResponse" + } + } + } + }, + "404": { + "description": "Not Found", + "content": { + "application/json": { + "schema": { + "$ref": "#/components/schemas/NotFoundResponse" + } + } + } + }, + "200": { + "description": "successful operation", + "content": { + "application/json": { + "schema": { + "$ref": "#/components/schemas/TaskPostPatchResponse" + } + } + } + } + }, + "security": [ + { + "bearerAuth": [ + [ + "permTaskUpdate" + ] + ] + } + ], + "description": "", + "requestBody": { + "required": true, + "content": { + "application/json": { + "schema": { + "$ref": "#/components/schemas/TaskPatch" + } + } + } + }, + "parameters": [] + } + }, + "/api/v2/ui/tasks/{id:[0-9]+}/{relation:crackerBinaryType}": { + "get": { + "tags": [ + "Tasks" + ], + "responses": { + "400": { + "description": "Invalid request", + "content": { + "application/json": { + "schema": { + "$ref": "#/components/schemas/ErrorResponse" + } + } + } + }, + "401": { + "description": "Authentication failed", + "content": { + "application/json": { + "schema": { + "$ref": "#/components/schemas/ErrorResponse" + } + } + } + }, + "404": { + "description": "Not Found", + "content": { + "application/json": { + "schema": { + "$ref": "#/components/schemas/NotFoundResponse" + } + } + } + }, + "200": { + "description": "successful operation", + "content": { + "application/json": { + "schema": { + "$ref": "#/components/schemas/TaskResponse" + } + } + } + } + }, + "security": [ + { + "bearerAuth": [ + [ + "permTaskRead" + ] + ] + } + ], + "description": "GET request for for a to-one relationship link. Returns the resource record of the object that is part of the specified relation.", + "parameters": [ + { + "name": "id", + "in": "path", + "required": true, + "schema": { + "type": "integer", + "format": "int32", + "example": 10 + } + }, + { + "name": "include", + "in": "query", + "schema": { + "type": "string" + }, + "description": "Items to include. Comma seperated" + } + ] + } + }, + "/api/v2/ui/tasks/{id:[0-9]+}/relationships/{relation:crackerBinaryType}": { + "get": { + "tags": [ + "Tasks" + ], + "responses": { + "400": { + "description": "Invalid request", + "content": { + "application/json": { + "schema": { + "$ref": "#/components/schemas/ErrorResponse" + } + } + } + }, + "401": { + "description": "Authentication failed", + "content": { + "application/json": { + "schema": { + "$ref": "#/components/schemas/ErrorResponse" + } + } + } + }, + "404": { + "description": "Not Found", + "content": { + "application/json": { + "schema": { + "$ref": "#/components/schemas/NotFoundResponse" + } + } + } + }, + "200": { + "description": "successful operation", + "content": { + "application/json": { + "schema": { + "$ref": "#/components/schemas/TaskResponse" + } + } + } + } + }, + "security": [ + { + "bearerAuth": [ + [ + "permTaskRead" + ] + ] + } + ], + "description": "GET request for for a to-one relationship link. Returns the resource record of the object that is part of the specified relation.", + "parameters": [ + { + "name": "id", + "in": "path", + "required": true, + "schema": { + "type": "integer", + "format": "int32", + "example": 10 + } + }, + { + "name": "include", + "in": "query", + "schema": { + "type": "string" + }, + "description": "Items to include. Comma seperated" + } + ] + }, + "patch": { + "tags": [ + "Tasks" + ], + "responses": { + "400": { + "description": "Invalid request", + "content": { + "application/json": { + "schema": { + "$ref": "#/components/schemas/ErrorResponse" + } + } + } + }, + "401": { + "description": "Authentication failed", + "content": { + "application/json": { + "schema": { + "$ref": "#/components/schemas/ErrorResponse" + } + } + } + }, + "404": { + "description": "Not Found", + "content": { + "application/json": { + "schema": { + "$ref": "#/components/schemas/NotFoundResponse" + } + } + } + }, + "200": { + "description": "successful operation", + "content": { + "application/json": { + "schema": { + "$ref": "#/components/schemas/TaskPostPatchResponse" + } + } + } + } + }, + "security": [ + { + "bearerAuth": [ + [ + "permTaskUpdate" + ] + ] + } + ], + "description": "", + "requestBody": { + "required": true, + "content": { + "application/json": { + "schema": { + "$ref": "#/components/schemas/TaskPatch" + } + } + } + }, + "parameters": [] + } + }, + "/api/v2/ui/tasks/{id:[0-9]+}/{relation:hashlist}": { + "get": { + "tags": [ + "Tasks" + ], + "responses": { + "400": { + "description": "Invalid request", + "content": { + "application/json": { + "schema": { + "$ref": "#/components/schemas/ErrorResponse" + } + } + } + }, + "401": { + "description": "Authentication failed", + "content": { + "application/json": { + "schema": { + "$ref": "#/components/schemas/ErrorResponse" + } + } + } + }, + "404": { + "description": "Not Found", + "content": { + "application/json": { + "schema": { + "$ref": "#/components/schemas/NotFoundResponse" + } + } + } + }, + "200": { + "description": "successful operation", + "content": { + "application/json": { + "schema": { + "$ref": "#/components/schemas/TaskResponse" + } + } + } + } + }, + "security": [ + { + "bearerAuth": [ + [ + "permTaskRead" + ] + ] + } + ], + "description": "GET request for for a to-one relationship link. Returns the resource record of the object that is part of the specified relation.", + "parameters": [ + { + "name": "id", + "in": "path", + "required": true, + "schema": { + "type": "integer", + "format": "int32", + "example": 10 + } + }, + { + "name": "include", + "in": "query", + "schema": { + "type": "string" + }, + "description": "Items to include. Comma seperated" + } + ] + } + }, + "/api/v2/ui/tasks/{id:[0-9]+}/relationships/{relation:hashlist}": { + "get": { + "tags": [ + "Tasks" + ], + "responses": { + "400": { + "description": "Invalid request", + "content": { + "application/json": { + "schema": { + "$ref": "#/components/schemas/ErrorResponse" + } + } + } + }, + "401": { + "description": "Authentication failed", + "content": { + "application/json": { + "schema": { + "$ref": "#/components/schemas/ErrorResponse" + } + } + } + }, + "404": { + "description": "Not Found", + "content": { + "application/json": { + "schema": { + "$ref": "#/components/schemas/NotFoundResponse" + } + } + } + }, + "200": { + "description": "successful operation", + "content": { + "application/json": { + "schema": { + "$ref": "#/components/schemas/TaskResponse" + } + } + } + } + }, + "security": [ + { + "bearerAuth": [ + [ + "permTaskRead" + ] + ] + } + ], + "description": "GET request for for a to-one relationship link. Returns the resource record of the object that is part of the specified relation.", + "parameters": [ + { + "name": "id", + "in": "path", + "required": true, + "schema": { + "type": "integer", + "format": "int32", + "example": 10 + } + }, + { + "name": "include", + "in": "query", + "schema": { + "type": "string" + }, + "description": "Items to include. Comma seperated" + } + ] + }, + "patch": { + "tags": [ + "Tasks" + ], + "responses": { + "400": { + "description": "Invalid request", + "content": { + "application/json": { + "schema": { + "$ref": "#/components/schemas/ErrorResponse" + } + } + } + }, + "401": { + "description": "Authentication failed", + "content": { + "application/json": { + "schema": { + "$ref": "#/components/schemas/ErrorResponse" + } + } + } + }, + "404": { + "description": "Not Found", + "content": { + "application/json": { + "schema": { + "$ref": "#/components/schemas/NotFoundResponse" + } + } + } + }, + "200": { + "description": "successful operation", + "content": { + "application/json": { + "schema": { + "$ref": "#/components/schemas/TaskPostPatchResponse" + } + } + } + } + }, + "security": [ + { + "bearerAuth": [ + [ + "permTaskUpdate" + ] + ] + } + ], + "description": "", + "requestBody": { + "required": true, + "content": { + "application/json": { + "schema": { + "$ref": "#/components/schemas/TaskPatch" + } + } + } + }, + "parameters": [] + } + }, + "/api/v2/ui/tasks/{id:[0-9]+}/{relation:assignedAgents}": { + "get": { + "tags": [ + "Tasks" + ], + "responses": { + "400": { + "description": "Invalid request", + "content": { + "application/json": { + "schema": { + "$ref": "#/components/schemas/ErrorResponse" + } + } + } + }, + "401": { + "description": "Authentication failed", + "content": { + "application/json": { + "schema": { + "$ref": "#/components/schemas/ErrorResponse" + } + } + } + }, + "404": { + "description": "Not Found", + "content": { + "application/json": { + "schema": { + "$ref": "#/components/schemas/NotFoundResponse" + } + } + } + }, + "200": { + "description": "successful operation", + "content": { + "application/json": { + "schema": { + "$ref": "#/components/schemas/TaskResponse" + } + } + } + } + }, + "security": [ + { + "bearerAuth": [ + [ + "permTaskRead" + ] + ] + } + ], + "description": "GET request for for a to-one relationship link. Returns the resource record of the object that is part of the specified relation.", + "parameters": [ + { + "name": "id", + "in": "path", + "required": true, + "schema": { + "type": "integer", + "format": "int32", + "example": 10 + } + }, + { + "name": "include", + "in": "query", + "schema": { + "type": "string" + }, + "description": "Items to include. Comma seperated" + } + ] + } + }, + "/api/v2/ui/tasks/{id:[0-9]+}/relationships/{relation:assignedAgents}": { + "get": { + "tags": [ + "Tasks" + ], + "responses": { + "400": { + "description": "Invalid request", + "content": { + "application/json": { + "schema": { + "$ref": "#/components/schemas/ErrorResponse" + } + } + } + }, + "401": { + "description": "Authentication failed", + "content": { + "application/json": { + "schema": { + "$ref": "#/components/schemas/ErrorResponse" + } + } + } + }, + "404": { + "description": "Not Found", + "content": { + "application/json": { + "schema": { + "$ref": "#/components/schemas/NotFoundResponse" + } + } + } + }, + "200": { + "description": "successful operation", + "content": { + "application/json": { + "schema": { + "$ref": "#/components/schemas/TaskResponse" + } + } + } + } + }, + "security": [ + { + "bearerAuth": [ + [ + "permTaskRead" + ] + ] + } + ], + "description": "GET request for for a to-one relationship link. Returns the resource record of the object that is part of the specified relation.", + "parameters": [ + { + "name": "id", + "in": "path", + "required": true, + "schema": { + "type": "integer", + "format": "int32", + "example": 10 + } + }, + { + "name": "include", + "in": "query", + "schema": { + "type": "string" + }, + "description": "Items to include. Comma seperated" + } + ] + }, + "patch": { + "tags": [ + "Tasks" + ], + "responses": { + "400": { + "description": "Invalid request", + "content": { + "application/json": { + "schema": { + "$ref": "#/components/schemas/ErrorResponse" + } + } + } + }, + "401": { + "description": "Authentication failed", + "content": { + "application/json": { + "schema": { + "$ref": "#/components/schemas/ErrorResponse" + } + } + } + }, + "404": { + "description": "Not Found", + "content": { + "application/json": { + "schema": { + "$ref": "#/components/schemas/NotFoundResponse" + } + } + } + }, + "200": { + "description": "successful operation", + "content": { + "application/json": { + "schema": { + "$ref": "#/components/schemas/TaskPostPatchResponse" + } + } + } + } + }, + "security": [ + { + "bearerAuth": [ + [ + "permTaskUpdate" + ] + ] + } + ], + "description": "", + "requestBody": { + "required": true, + "content": { + "application/json": { + "schema": { + "$ref": "#/components/schemas/TaskPatch" + } + } + } + }, + "parameters": [] + }, + "post": { + "tags": [ + "Tasks" + ], + "responses": { + "400": { + "description": "Invalid request", + "content": { + "application/json": { + "schema": { + "$ref": "#/components/schemas/ErrorResponse" + } + } + } + }, + "401": { + "description": "Authentication failed", + "content": { + "application/json": { + "schema": { + "$ref": "#/components/schemas/ErrorResponse" + } + } + } + }, + "404": { + "description": "Not Found", + "content": { + "application/json": { + "schema": { + "$ref": "#/components/schemas/NotFoundResponse" + } + } + } + }, + "204": { + "description": "successfully created" + } + }, + "security": [ + { + "bearerAuth": [ + [ + "permTaskCreate" + ] + ] + } + ], + "description": "", + "requestBody": { + "required": true, + "content": { + "application/json": [] + } + }, + "parameters": [] + }, + "delete": { + "tags": [ + "Tasks" + ], + "responses": { + "400": { + "description": "Invalid request", + "content": { + "application/json": { + "schema": { + "$ref": "#/components/schemas/ErrorResponse" + } + } + } + }, + "401": { + "description": "Authentication failed", + "content": { + "application/json": { + "schema": { + "$ref": "#/components/schemas/ErrorResponse" + } + } + } + }, + "404": { + "description": "Not Found", + "content": { + "application/json": { + "schema": { + "$ref": "#/components/schemas/NotFoundResponse" + } + } + } + }, + "204": { + "description": "successfully deleted" + } + }, + "security": [ + { + "bearerAuth": [ + [ + "permTaskDelete" + ] + ] + } + ], + "description": "", + "requestBody": { + "required": true, + "content": { + "application/json": [] + } + }, + "parameters": [] + } + }, + "/api/v2/ui/tasks/{id:[0-9]+}/{relation:files}": { + "get": { + "tags": [ + "Tasks" + ], + "responses": { + "400": { + "description": "Invalid request", + "content": { + "application/json": { + "schema": { + "$ref": "#/components/schemas/ErrorResponse" + } + } + } + }, + "401": { + "description": "Authentication failed", + "content": { + "application/json": { + "schema": { + "$ref": "#/components/schemas/ErrorResponse" + } + } + } + }, + "404": { + "description": "Not Found", + "content": { + "application/json": { + "schema": { + "$ref": "#/components/schemas/NotFoundResponse" + } + } + } + }, + "200": { + "description": "successful operation", + "content": { + "application/json": { + "schema": { + "$ref": "#/components/schemas/TaskResponse" + } + } + } + } + }, + "security": [ + { + "bearerAuth": [ + [ + "permTaskRead" + ] + ] + } + ], + "description": "GET request for for a to-one relationship link. Returns the resource record of the object that is part of the specified relation.", + "parameters": [ + { + "name": "id", + "in": "path", + "required": true, + "schema": { + "type": "integer", + "format": "int32", + "example": 10 + } + }, + { + "name": "include", + "in": "query", + "schema": { + "type": "string" + }, + "description": "Items to include. Comma seperated" + } + ] + } + }, + "/api/v2/ui/tasks/{id:[0-9]+}/relationships/{relation:files}": { + "get": { + "tags": [ + "Tasks" + ], + "responses": { + "400": { + "description": "Invalid request", + "content": { + "application/json": { + "schema": { + "$ref": "#/components/schemas/ErrorResponse" + } + } + } + }, + "401": { + "description": "Authentication failed", + "content": { + "application/json": { + "schema": { + "$ref": "#/components/schemas/ErrorResponse" + } + } + } + }, + "404": { + "description": "Not Found", + "content": { + "application/json": { + "schema": { + "$ref": "#/components/schemas/NotFoundResponse" + } + } + } + }, + "200": { + "description": "successful operation", + "content": { + "application/json": { + "schema": { + "$ref": "#/components/schemas/TaskResponse" + } + } + } + } + }, + "security": [ + { + "bearerAuth": [ + [ + "permTaskRead" + ] + ] + } + ], + "description": "GET request for for a to-one relationship link. Returns the resource record of the object that is part of the specified relation.", + "parameters": [ + { + "name": "id", + "in": "path", + "required": true, + "schema": { + "type": "integer", + "format": "int32", + "example": 10 + } + }, + { + "name": "include", + "in": "query", + "schema": { + "type": "string" + }, + "description": "Items to include. Comma seperated" + } + ] + }, + "patch": { + "tags": [ + "Tasks" + ], + "responses": { + "400": { + "description": "Invalid request", + "content": { + "application/json": { + "schema": { + "$ref": "#/components/schemas/ErrorResponse" + } + } + } + }, + "401": { + "description": "Authentication failed", + "content": { + "application/json": { + "schema": { + "$ref": "#/components/schemas/ErrorResponse" + } + } + } + }, + "404": { + "description": "Not Found", + "content": { + "application/json": { + "schema": { + "$ref": "#/components/schemas/NotFoundResponse" + } + } + } + }, + "200": { + "description": "successful operation", + "content": { + "application/json": { + "schema": { + "$ref": "#/components/schemas/TaskPostPatchResponse" + } + } + } + } + }, + "security": [ + { + "bearerAuth": [ + [ + "permTaskUpdate" + ] + ] + } + ], + "description": "", + "requestBody": { + "required": true, + "content": { + "application/json": { + "schema": { + "$ref": "#/components/schemas/TaskPatch" + } + } + } + }, + "parameters": [] + }, + "post": { + "tags": [ + "Tasks" + ], + "responses": { + "400": { + "description": "Invalid request", + "content": { + "application/json": { + "schema": { + "$ref": "#/components/schemas/ErrorResponse" + } + } + } + }, + "401": { + "description": "Authentication failed", + "content": { + "application/json": { + "schema": { + "$ref": "#/components/schemas/ErrorResponse" + } + } + } + }, + "404": { + "description": "Not Found", + "content": { + "application/json": { + "schema": { + "$ref": "#/components/schemas/NotFoundResponse" + } + } + } + }, + "204": { + "description": "successfully created" + } + }, + "security": [ + { + "bearerAuth": [ + [ + "permTaskCreate" + ] + ] + } + ], + "description": "", + "requestBody": { + "required": true, + "content": { + "application/json": [] + } + }, + "parameters": [] + }, + "delete": { + "tags": [ + "Tasks" + ], + "responses": { + "400": { + "description": "Invalid request", + "content": { + "application/json": { + "schema": { + "$ref": "#/components/schemas/ErrorResponse" + } + } + } + }, + "401": { + "description": "Authentication failed", + "content": { + "application/json": { + "schema": { + "$ref": "#/components/schemas/ErrorResponse" + } + } + } + }, + "404": { + "description": "Not Found", + "content": { + "application/json": { + "schema": { + "$ref": "#/components/schemas/NotFoundResponse" + } + } + } + }, + "204": { + "description": "successfully deleted" + } + }, + "security": [ + { + "bearerAuth": [ + [ + "permTaskDelete" + ] + ] + } + ], + "description": "", + "requestBody": { + "required": true, + "content": { + "application/json": [] + } + }, + "parameters": [] + } + }, + "/api/v2/ui/tasks/{id:[0-9]+}/{relation:speeds}": { + "get": { + "tags": [ + "Tasks" + ], + "responses": { + "400": { + "description": "Invalid request", + "content": { + "application/json": { + "schema": { + "$ref": "#/components/schemas/ErrorResponse" + } + } + } + }, + "401": { + "description": "Authentication failed", + "content": { + "application/json": { + "schema": { + "$ref": "#/components/schemas/ErrorResponse" + } + } + } + }, + "404": { + "description": "Not Found", + "content": { + "application/json": { + "schema": { + "$ref": "#/components/schemas/NotFoundResponse" + } + } + } + }, + "200": { + "description": "successful operation", + "content": { + "application/json": { + "schema": { + "$ref": "#/components/schemas/TaskResponse" + } + } + } + } + }, + "security": [ + { + "bearerAuth": [ + [ + "permTaskRead" + ] + ] + } + ], + "description": "GET request for for a to-one relationship link. Returns the resource record of the object that is part of the specified relation.", + "parameters": [ + { + "name": "id", + "in": "path", + "required": true, + "schema": { + "type": "integer", + "format": "int32", + "example": 10 + } + }, + { + "name": "include", + "in": "query", + "schema": { + "type": "string" + }, + "description": "Items to include. Comma seperated" + } + ] + } + }, + "/api/v2/ui/tasks/{id:[0-9]+}/relationships/{relation:speeds}": { + "get": { + "tags": [ + "Tasks" + ], + "responses": { + "400": { + "description": "Invalid request", + "content": { + "application/json": { + "schema": { + "$ref": "#/components/schemas/ErrorResponse" + } + } + } + }, + "401": { + "description": "Authentication failed", + "content": { + "application/json": { + "schema": { + "$ref": "#/components/schemas/ErrorResponse" + } + } + } + }, + "404": { + "description": "Not Found", + "content": { + "application/json": { + "schema": { + "$ref": "#/components/schemas/NotFoundResponse" + } + } + } + }, + "200": { + "description": "successful operation", + "content": { + "application/json": { + "schema": { + "$ref": "#/components/schemas/TaskResponse" + } + } + } + } + }, + "security": [ + { + "bearerAuth": [ + [ + "permTaskRead" + ] + ] + } + ], + "description": "GET request for for a to-one relationship link. Returns the resource record of the object that is part of the specified relation.", + "parameters": [ + { + "name": "id", + "in": "path", + "required": true, + "schema": { + "type": "integer", + "format": "int32", + "example": 10 + } + }, + { + "name": "include", + "in": "query", + "schema": { + "type": "string" + }, + "description": "Items to include. Comma seperated" + } + ] + }, + "patch": { + "tags": [ + "Tasks" + ], + "responses": { + "400": { + "description": "Invalid request", + "content": { + "application/json": { + "schema": { + "$ref": "#/components/schemas/ErrorResponse" + } + } + } + }, + "401": { + "description": "Authentication failed", + "content": { + "application/json": { + "schema": { + "$ref": "#/components/schemas/ErrorResponse" + } + } + } + }, + "404": { + "description": "Not Found", + "content": { + "application/json": { + "schema": { + "$ref": "#/components/schemas/NotFoundResponse" + } + } + } + }, + "200": { + "description": "successful operation", + "content": { + "application/json": { + "schema": { + "$ref": "#/components/schemas/TaskPostPatchResponse" + } + } + } + } + }, + "security": [ + { + "bearerAuth": [ + [ + "permTaskUpdate" + ] + ] + } + ], + "description": "", + "requestBody": { + "required": true, + "content": { + "application/json": { + "schema": { + "$ref": "#/components/schemas/TaskPatch" + } + } + } + }, + "parameters": [] + }, + "post": { + "tags": [ + "Tasks" + ], + "responses": { + "400": { + "description": "Invalid request", + "content": { + "application/json": { + "schema": { + "$ref": "#/components/schemas/ErrorResponse" + } + } + } + }, + "401": { + "description": "Authentication failed", + "content": { + "application/json": { + "schema": { + "$ref": "#/components/schemas/ErrorResponse" + } + } + } + }, + "404": { + "description": "Not Found", + "content": { + "application/json": { + "schema": { + "$ref": "#/components/schemas/NotFoundResponse" + } + } + } + }, + "204": { + "description": "successfully created" + } + }, + "security": [ + { + "bearerAuth": [ + [ + "permTaskCreate" + ] + ] + } + ], + "description": "", + "requestBody": { + "required": true, + "content": { + "application/json": [] + } + }, + "parameters": [] + }, + "delete": { + "tags": [ + "Tasks" + ], + "responses": { + "400": { + "description": "Invalid request", + "content": { + "application/json": { + "schema": { + "$ref": "#/components/schemas/ErrorResponse" + } + } + } + }, + "401": { + "description": "Authentication failed", + "content": { + "application/json": { + "schema": { + "$ref": "#/components/schemas/ErrorResponse" + } + } + } + }, + "404": { + "description": "Not Found", + "content": { + "application/json": { + "schema": { + "$ref": "#/components/schemas/NotFoundResponse" + } + } + } + }, + "204": { + "description": "successfully deleted" + } + }, + "security": [ + { + "bearerAuth": [ + [ + "permTaskDelete" + ] + ] + } + ], + "description": "", + "requestBody": { + "required": true, + "content": { + "application/json": [] + } + }, + "parameters": [] + } + }, + "/api/v2/ui/tasks/{id:[0-9]+}": { + "get": { + "tags": [ + "Tasks" + ], + "responses": { + "400": { + "description": "Invalid request", + "content": { + "application/json": { + "schema": { + "$ref": "#/components/schemas/ErrorResponse" + } + } + } + }, + "401": { + "description": "Authentication failed", + "content": { + "application/json": { + "schema": { + "$ref": "#/components/schemas/ErrorResponse" + } + } + } + }, + "404": { + "description": "Not Found", + "content": { + "application/json": { + "schema": { + "$ref": "#/components/schemas/NotFoundResponse" + } + } + } + }, + "200": { + "description": "successful operation", + "content": { + "application/json": { + "schema": { + "$ref": "#/components/schemas/TaskResponse" + } + } + } + } + }, + "security": [ + { + "bearerAuth": [ + [ + "permTaskRead" + ] + ] + } + ], + "description": "GET request to retrieve a single object.", + "parameters": [ + { + "name": "id", + "in": "path", + "required": true, + "schema": { + "type": "integer", + "format": "int32", + "example": 10 + } + }, + { + "name": "include", + "in": "query", + "schema": { + "type": "string" + }, + "description": "Items to include. Comma seperated" + } + ] + }, + "patch": { + "tags": [ + "Tasks" + ], + "responses": { + "400": { + "description": "Invalid request", + "content": { + "application/json": { + "schema": { + "$ref": "#/components/schemas/ErrorResponse" + } + } + } + }, + "401": { + "description": "Authentication failed", + "content": { + "application/json": { + "schema": { + "$ref": "#/components/schemas/ErrorResponse" + } + } + } + }, + "404": { + "description": "Not Found", + "content": { + "application/json": { + "schema": { + "$ref": "#/components/schemas/NotFoundResponse" + } + } + } + }, + "200": { + "description": "successful operation", + "content": { + "application/json": { + "schema": { + "$ref": "#/components/schemas/TaskPostPatchResponse" + } + } + } + } + }, + "security": [ + { + "bearerAuth": [ + [ + "permTaskUpdate" + ] + ] + } + ], + "description": "PATCH request to update attributes of a single object.", + "requestBody": { + "required": true, + "content": { + "application/json": { + "schema": { + "$ref": "#/components/schemas/TaskPatch" + } + } + } + }, + "parameters": [] + }, + "delete": { + "tags": [ + "Tasks" + ], + "responses": { + "400": { + "description": "Invalid request", + "content": { + "application/json": { + "schema": { + "$ref": "#/components/schemas/ErrorResponse" + } + } + } + }, + "401": { + "description": "Authentication failed", + "content": { + "application/json": { + "schema": { + "$ref": "#/components/schemas/ErrorResponse" + } + } + } + }, + "404": { + "description": "Not Found", + "content": { + "application/json": { + "schema": { + "$ref": "#/components/schemas/NotFoundResponse" + } + } + } + }, + "204": { + "description": "successfully deleted" + } + }, + "security": [ + { + "bearerAuth": [ + [ + "permTaskDelete" + ] + ] + } + ], + "description": "", + "requestBody": { + "required": true, + "content": { + "application/json": [] + } + }, + "parameters": [] + } + }, + "/api/v2/ui/taskwrappers": { + "get": { + "tags": [ + "TaskWrappers" + ], + "responses": { + "400": { + "description": "Invalid request", + "content": { + "application/json": { + "schema": { + "$ref": "#/components/schemas/ErrorResponse" + } + } + } + }, + "401": { + "description": "Authentication failed", + "content": { + "application/json": { + "schema": { + "$ref": "#/components/schemas/ErrorResponse" + } + } + } + }, + "200": { + "description": "successful operation", + "content": { + "application/json": { + "schema": { + "type": "array", + "items": { + "$ref": "#/components/schemas/TaskWrapperResponse" + } + } + } + } + } + }, + "security": [ + { + "bearerAuth": [ + [ + "permTaskWrapperRead" + ] + ] + } + ], + "description": "GET many request to retrieve multiple objects.", + "parameters": [ + { + "name": "page[after]", + "in": "query", + "schema": { + "type": "integer", + "format": "int32" + }, + "example": 0, + "description": "Pointer to paginate to retrieve the data after the value provided" + }, + { + "name": "page[before]", + "in": "query", + "schema": { + "type": "integer", + "format": "int32" + }, + "example": 0, + "description": "Pointer to paginate to retrieve the data before the value provided" + }, + { + "name": "page[size]", + "in": "query", + "schema": { + "type": "integer", + "format": "int32" + }, + "example": 100, + "description": "Amout of data to retrieve inside a single page" + }, + { + "name": "filter", + "in": "query", + "style": "deepobject", + "explode": true, + "schema": { + "type": "object" + }, + "description": "Filters results using a query", + "example": "\"filter[hashlistId__gt]\": 200" + }, + { + "name": "include", + "in": "query", + "schema": { + "type": "string" + }, + "description": "Items to include, comma seperated. Possible options: accessGroup,tasks" + } + ] + } + }, + "/api/v2/ui/taskwrappers/count": { + "get": { + "tags": [ + "TaskWrappers" + ], + "responses": { + "400": { + "description": "Invalid request", + "content": { + "application/json": { + "schema": { + "$ref": "#/components/schemas/ErrorResponse" + } + } + } + }, + "401": { + "description": "Authentication failed", + "content": { + "application/json": { + "schema": { + "$ref": "#/components/schemas/ErrorResponse" + } + } + } + }, + "200": { + "description": "successful operation", + "content": { + "application/json": { + "schema": { + "type": "array", + "items": { + "$ref": "#/components/schemas/TaskWrapperResponse" + } + } + } + } + } + }, + "security": [ + { + "bearerAuth": [ + [ + "permTaskWrapperRead" + ] + ] + } + ], + "description": "GET many request to retrieve multiple objects.", + "parameters": [ + { + "name": "page[after]", + "in": "query", + "schema": { + "type": "integer", + "format": "int32" + }, + "example": 0, + "description": "Pointer to paginate to retrieve the data after the value provided" + }, + { + "name": "page[before]", + "in": "query", + "schema": { + "type": "integer", + "format": "int32" + }, + "example": 0, + "description": "Pointer to paginate to retrieve the data before the value provided" + }, + { + "name": "page[size]", + "in": "query", + "schema": { + "type": "integer", + "format": "int32" + }, + "example": 100, + "description": "Amout of data to retrieve inside a single page" + }, + { + "name": "filter", + "in": "query", + "style": "deepobject", + "explode": true, + "schema": { + "type": "object" + }, + "description": "Filters results using a query", + "example": "\"filter[hashlistId__gt]\": 200" + }, + { + "name": "include", + "in": "query", + "schema": { + "type": "string" + }, + "description": "Items to include, comma seperated. Possible options: accessGroup,tasks" + } + ] + } + }, + "/api/v2/ui/taskwrappers/{id:[0-9]+}/{relation:accessGroup}": { + "get": { + "tags": [ + "TaskWrappers" + ], + "responses": { + "400": { + "description": "Invalid request", + "content": { + "application/json": { + "schema": { + "$ref": "#/components/schemas/ErrorResponse" + } + } + } + }, + "401": { + "description": "Authentication failed", + "content": { + "application/json": { + "schema": { + "$ref": "#/components/schemas/ErrorResponse" + } + } + } + }, + "404": { + "description": "Not Found", + "content": { + "application/json": { + "schema": { + "$ref": "#/components/schemas/NotFoundResponse" + } + } + } + }, + "200": { + "description": "successful operation", + "content": { + "application/json": { + "schema": { + "$ref": "#/components/schemas/TaskWrapperResponse" + } + } + } + } + }, + "security": [ + { + "bearerAuth": [ + [ + "permTaskWrapperRead" + ] + ] + } + ], + "description": "GET request for for a to-one relationship link. Returns the resource record of the object that is part of the specified relation.", + "parameters": [ + { + "name": "id", + "in": "path", + "required": true, + "schema": { + "type": "integer", + "format": "int32", + "example": 10 + } + }, + { + "name": "include", + "in": "query", + "schema": { + "type": "string" + }, + "description": "Items to include. Comma seperated" + } + ] + } + }, + "/api/v2/ui/taskwrappers/{id:[0-9]+}/relationships/{relation:accessGroup}": { + "get": { + "tags": [ + "TaskWrappers" + ], + "responses": { + "400": { + "description": "Invalid request", + "content": { + "application/json": { + "schema": { + "$ref": "#/components/schemas/ErrorResponse" + } + } + } + }, + "401": { + "description": "Authentication failed", + "content": { + "application/json": { + "schema": { + "$ref": "#/components/schemas/ErrorResponse" + } + } + } + }, + "404": { + "description": "Not Found", + "content": { + "application/json": { + "schema": { + "$ref": "#/components/schemas/NotFoundResponse" + } + } + } + }, + "200": { + "description": "successful operation", + "content": { + "application/json": { + "schema": { + "$ref": "#/components/schemas/TaskWrapperResponse" + } + } + } + } + }, + "security": [ + { + "bearerAuth": [ + [ + "permTaskWrapperRead" + ] + ] + } + ], + "description": "GET request for for a to-one relationship link. Returns the resource record of the object that is part of the specified relation.", + "parameters": [ + { + "name": "id", + "in": "path", + "required": true, + "schema": { + "type": "integer", + "format": "int32", + "example": 10 + } + }, + { + "name": "include", + "in": "query", + "schema": { + "type": "string" + }, + "description": "Items to include. Comma seperated" + } + ] + }, + "patch": { + "tags": [ + "TaskWrappers" + ], + "responses": { + "400": { + "description": "Invalid request", + "content": { + "application/json": { + "schema": { + "$ref": "#/components/schemas/ErrorResponse" + } + } + } + }, + "401": { + "description": "Authentication failed", + "content": { + "application/json": { + "schema": { + "$ref": "#/components/schemas/ErrorResponse" + } + } + } + }, + "404": { + "description": "Not Found", + "content": { + "application/json": { + "schema": { + "$ref": "#/components/schemas/NotFoundResponse" + } + } + } + }, + "200": { + "description": "successful operation", + "content": { + "application/json": { + "schema": { + "$ref": "#/components/schemas/TaskWrapperPostPatchResponse" + } + } + } + } + }, + "security": [ + { + "bearerAuth": [ + [ + "permTaskWrapperUpdate" + ] + ] + } + ], + "description": "", + "requestBody": { + "required": true, + "content": { + "application/json": { + "schema": { + "$ref": "#/components/schemas/TaskWrapperPatch" + } + } + } + }, + "parameters": [] + } + }, + "/api/v2/ui/taskwrappers/{id:[0-9]+}/{relation:tasks}": { + "get": { + "tags": [ + "TaskWrappers" + ], + "responses": { + "400": { + "description": "Invalid request", + "content": { + "application/json": { + "schema": { + "$ref": "#/components/schemas/ErrorResponse" + } + } + } + }, + "401": { + "description": "Authentication failed", + "content": { + "application/json": { + "schema": { + "$ref": "#/components/schemas/ErrorResponse" + } + } + } + }, + "404": { + "description": "Not Found", + "content": { + "application/json": { + "schema": { + "$ref": "#/components/schemas/NotFoundResponse" + } + } + } + }, + "200": { + "description": "successful operation", + "content": { + "application/json": { + "schema": { + "$ref": "#/components/schemas/TaskWrapperResponse" + } + } + } + } + }, + "security": [ + { + "bearerAuth": [ + [ + "permTaskWrapperRead" + ] + ] + } + ], + "description": "GET request for for a to-one relationship link. Returns the resource record of the object that is part of the specified relation.", + "parameters": [ + { + "name": "id", + "in": "path", + "required": true, + "schema": { + "type": "integer", + "format": "int32", + "example": 10 + } + }, + { + "name": "include", + "in": "query", + "schema": { + "type": "string" + }, + "description": "Items to include. Comma seperated" + } + ] + } + }, + "/api/v2/ui/taskwrappers/{id:[0-9]+}/relationships/{relation:tasks}": { + "get": { + "tags": [ + "TaskWrappers" + ], + "responses": { + "400": { + "description": "Invalid request", + "content": { + "application/json": { + "schema": { + "$ref": "#/components/schemas/ErrorResponse" + } + } + } + }, + "401": { + "description": "Authentication failed", + "content": { + "application/json": { + "schema": { + "$ref": "#/components/schemas/ErrorResponse" + } + } + } + }, + "404": { + "description": "Not Found", + "content": { + "application/json": { + "schema": { + "$ref": "#/components/schemas/NotFoundResponse" + } + } + } + }, + "200": { + "description": "successful operation", + "content": { + "application/json": { + "schema": { + "$ref": "#/components/schemas/TaskWrapperResponse" + } + } + } + } + }, + "security": [ + { + "bearerAuth": [ + [ + "permTaskWrapperRead" + ] + ] + } + ], + "description": "GET request for for a to-one relationship link. Returns the resource record of the object that is part of the specified relation.", + "parameters": [ + { + "name": "id", + "in": "path", + "required": true, + "schema": { + "type": "integer", + "format": "int32", + "example": 10 + } + }, + { + "name": "include", + "in": "query", + "schema": { + "type": "string" + }, + "description": "Items to include. Comma seperated" + } + ] + }, + "patch": { + "tags": [ + "TaskWrappers" + ], + "responses": { + "400": { + "description": "Invalid request", + "content": { + "application/json": { + "schema": { + "$ref": "#/components/schemas/ErrorResponse" + } + } + } + }, + "401": { + "description": "Authentication failed", + "content": { + "application/json": { + "schema": { + "$ref": "#/components/schemas/ErrorResponse" + } + } + } + }, + "404": { + "description": "Not Found", + "content": { + "application/json": { + "schema": { + "$ref": "#/components/schemas/NotFoundResponse" + } + } + } + }, + "200": { + "description": "successful operation", + "content": { + "application/json": { + "schema": { + "$ref": "#/components/schemas/TaskWrapperPostPatchResponse" + } + } + } + } + }, + "security": [ + { + "bearerAuth": [ + [ + "permTaskWrapperUpdate" + ] + ] + } + ], + "description": "", + "requestBody": { + "required": true, + "content": { + "application/json": { + "schema": { + "$ref": "#/components/schemas/TaskWrapperPatch" + } + } + } + }, + "parameters": [] + }, + "post": { + "tags": [ + "TaskWrappers" + ], + "responses": { + "400": { + "description": "Invalid request", + "content": { + "application/json": { + "schema": { + "$ref": "#/components/schemas/ErrorResponse" + } + } + } + }, + "401": { + "description": "Authentication failed", + "content": { + "application/json": { + "schema": { + "$ref": "#/components/schemas/ErrorResponse" + } + } + } + }, + "404": { + "description": "Not Found", + "content": { + "application/json": { + "schema": { + "$ref": "#/components/schemas/NotFoundResponse" + } + } + } + }, + "204": { + "description": "successfully created" + } + }, + "security": [ + { + "bearerAuth": [ + [ + "permTaskWrapperCreate" + ] + ] + } + ], + "description": "", + "requestBody": { + "required": true, + "content": { + "application/json": [] + } + }, + "parameters": [] + }, + "delete": { + "tags": [ + "TaskWrappers" + ], + "responses": { + "400": { + "description": "Invalid request", + "content": { + "application/json": { + "schema": { + "$ref": "#/components/schemas/ErrorResponse" + } + } + } + }, + "401": { + "description": "Authentication failed", + "content": { + "application/json": { + "schema": { + "$ref": "#/components/schemas/ErrorResponse" + } + } + } + }, + "404": { + "description": "Not Found", + "content": { + "application/json": { + "schema": { + "$ref": "#/components/schemas/NotFoundResponse" + } + } + } + }, + "204": { + "description": "successfully deleted" + } + }, + "security": [ + { + "bearerAuth": [ + [ + "permTaskWrapperDelete" + ] + ] + } + ], + "description": "", + "requestBody": { + "required": true, + "content": { + "application/json": [] + } + }, + "parameters": [] + } + }, + "/api/v2/ui/taskwrappers/{id:[0-9]+}": { + "get": { + "tags": [ + "TaskWrappers" + ], + "responses": { + "400": { + "description": "Invalid request", + "content": { + "application/json": { + "schema": { + "$ref": "#/components/schemas/ErrorResponse" + } + } + } + }, + "401": { + "description": "Authentication failed", + "content": { + "application/json": { + "schema": { + "$ref": "#/components/schemas/ErrorResponse" + } + } + } + }, + "404": { + "description": "Not Found", + "content": { + "application/json": { + "schema": { + "$ref": "#/components/schemas/NotFoundResponse" + } + } + } + }, + "200": { + "description": "successful operation", + "content": { + "application/json": { + "schema": { + "$ref": "#/components/schemas/TaskWrapperResponse" + } + } + } + } + }, + "security": [ + { + "bearerAuth": [ + [ + "permTaskWrapperRead" + ] + ] + } + ], + "description": "GET request to retrieve a single object.", + "parameters": [ + { + "name": "id", + "in": "path", + "required": true, + "schema": { + "type": "integer", + "format": "int32", + "example": 10 + } + }, + { + "name": "include", + "in": "query", + "schema": { + "type": "string" + }, + "description": "Items to include. Comma seperated" + } + ] + }, + "patch": { + "tags": [ + "TaskWrappers" + ], + "responses": { + "400": { + "description": "Invalid request", + "content": { + "application/json": { + "schema": { + "$ref": "#/components/schemas/ErrorResponse" + } + } + } + }, + "401": { + "description": "Authentication failed", + "content": { + "application/json": { + "schema": { + "$ref": "#/components/schemas/ErrorResponse" + } + } + } + }, + "404": { + "description": "Not Found", + "content": { + "application/json": { + "schema": { + "$ref": "#/components/schemas/NotFoundResponse" + } + } + } + }, + "200": { + "description": "successful operation", + "content": { + "application/json": { + "schema": { + "$ref": "#/components/schemas/TaskWrapperPostPatchResponse" + } + } + } + } + }, + "security": [ + { + "bearerAuth": [ + [ + "permTaskWrapperUpdate" + ] + ] + } + ], + "description": "PATCH request to update attributes of a single object.", + "requestBody": { + "required": true, + "content": { + "application/json": { + "schema": { + "$ref": "#/components/schemas/TaskWrapperPatch" + } + } + } + }, + "parameters": [] + }, + "delete": { + "tags": [ + "TaskWrappers" + ], + "responses": { + "400": { + "description": "Invalid request", + "content": { + "application/json": { + "schema": { + "$ref": "#/components/schemas/ErrorResponse" + } + } + } + }, + "401": { + "description": "Authentication failed", + "content": { + "application/json": { + "schema": { + "$ref": "#/components/schemas/ErrorResponse" + } + } + } + }, + "404": { + "description": "Not Found", + "content": { + "application/json": { + "schema": { + "$ref": "#/components/schemas/NotFoundResponse" + } + } + } + }, + "204": { + "description": "successfully deleted" + } + }, + "security": [ + { + "bearerAuth": [ + [ + "permTaskWrapperDelete" + ] + ] + } + ], + "description": "", + "requestBody": { + "required": true, + "content": { + "application/json": [] + } + }, + "parameters": [] + } + }, + "/api/v2/ui/users": { + "get": { + "tags": [ + "Users" + ], + "responses": { + "400": { + "description": "Invalid request", + "content": { + "application/json": { + "schema": { + "$ref": "#/components/schemas/ErrorResponse" + } + } + } + }, + "401": { + "description": "Authentication failed", + "content": { + "application/json": { + "schema": { + "$ref": "#/components/schemas/ErrorResponse" + } + } + } + }, + "200": { + "description": "successful operation", + "content": { + "application/json": { + "schema": { + "type": "array", + "items": { + "$ref": "#/components/schemas/UserResponse" + } + } + } + } + } + }, + "security": [ + { + "bearerAuth": [ + [ + "permUserRead" + ] + ] + } + ], + "description": "GET many request to retrieve multiple objects.", + "parameters": [ + { + "name": "page[after]", + "in": "query", + "schema": { + "type": "integer", + "format": "int32" + }, + "example": 0, + "description": "Pointer to paginate to retrieve the data after the value provided" + }, + { + "name": "page[before]", + "in": "query", + "schema": { + "type": "integer", + "format": "int32" + }, + "example": 0, + "description": "Pointer to paginate to retrieve the data before the value provided" + }, + { + "name": "page[size]", + "in": "query", + "schema": { + "type": "integer", + "format": "int32" + }, + "example": 100, + "description": "Amout of data to retrieve inside a single page" + }, + { + "name": "filter", + "in": "query", + "style": "deepobject", + "explode": true, + "schema": { + "type": "object" + }, + "description": "Filters results using a query", + "example": "\"filter[hashlistId__gt]\": 200" + }, + { + "name": "include", + "in": "query", + "schema": { + "type": "string" + }, + "description": "Items to include, comma seperated. Possible options: globalPermissionGroup,accessGroups" + } + ] + }, + "post": { + "tags": [ + "Users" + ], + "responses": { + "400": { + "description": "Invalid request", + "content": { + "application/json": { + "schema": { + "$ref": "#/components/schemas/ErrorResponse" + } + } + } + }, + "401": { + "description": "Authentication failed", + "content": { + "application/json": { + "schema": { + "$ref": "#/components/schemas/ErrorResponse" + } + } + } + }, + "201": { + "description": "successful operation", + "content": { + "application/json": { + "schema": { + "$ref": "#/components/schemas/UserPostPatchResponse" + } + } + } + } + }, + "security": [ + { + "bearerAuth": [ + [ + "permUserCreate" + ] + ] + } + ], + "description": "POST request to create a new object. The request must contain the resource record as data with the attributes of the new object.To add relationships, a relationships object can be added with the resource records of the relations that are part of this object.", + "requestBody": { + "required": true, + "content": { + "application/json": { + "schema": { + "$ref": "#/components/schemas/UserCreate" + } + } + } + }, + "parameters": [] + } + }, + "/api/v2/ui/users/count": { + "get": { + "tags": [ + "Users" + ], + "responses": { + "400": { + "description": "Invalid request", + "content": { + "application/json": { + "schema": { + "$ref": "#/components/schemas/ErrorResponse" + } + } + } + }, + "401": { + "description": "Authentication failed", + "content": { + "application/json": { + "schema": { + "$ref": "#/components/schemas/ErrorResponse" + } + } + } + }, + "200": { + "description": "successful operation", + "content": { + "application/json": { + "schema": { + "type": "array", + "items": { + "$ref": "#/components/schemas/UserResponse" + } + } + } + } + } + }, + "security": [ + { + "bearerAuth": [ + [ + "permUserRead" + ] + ] + } + ], + "description": "GET many request to retrieve multiple objects.", + "parameters": [ + { + "name": "page[after]", + "in": "query", + "schema": { + "type": "integer", + "format": "int32" + }, + "example": 0, + "description": "Pointer to paginate to retrieve the data after the value provided" + }, + { + "name": "page[before]", + "in": "query", + "schema": { + "type": "integer", + "format": "int32" + }, + "example": 0, + "description": "Pointer to paginate to retrieve the data before the value provided" + }, + { + "name": "page[size]", + "in": "query", + "schema": { + "type": "integer", + "format": "int32" + }, + "example": 100, + "description": "Amout of data to retrieve inside a single page" + }, + { + "name": "filter", + "in": "query", + "style": "deepobject", + "explode": true, + "schema": { + "type": "object" + }, + "description": "Filters results using a query", + "example": "\"filter[hashlistId__gt]\": 200" + }, + { + "name": "include", + "in": "query", + "schema": { + "type": "string" + }, + "description": "Items to include, comma seperated. Possible options: globalPermissionGroup,accessGroups" + } + ] + } + }, + "/api/v2/ui/users/{id:[0-9]+}/{relation:globalPermissionGroup}": { + "get": { + "tags": [ + "Users" + ], + "responses": { + "400": { + "description": "Invalid request", + "content": { + "application/json": { + "schema": { + "$ref": "#/components/schemas/ErrorResponse" + } + } + } + }, + "401": { + "description": "Authentication failed", + "content": { + "application/json": { + "schema": { + "$ref": "#/components/schemas/ErrorResponse" + } + } + } + }, + "404": { + "description": "Not Found", + "content": { + "application/json": { + "schema": { + "$ref": "#/components/schemas/NotFoundResponse" + } + } + } + }, + "200": { + "description": "successful operation", + "content": { + "application/json": { + "schema": { + "$ref": "#/components/schemas/UserResponse" + } + } + } + } + }, + "security": [ + { + "bearerAuth": [ + [ + "permUserRead" + ] + ] + } + ], + "description": "GET request for for a to-one relationship link. Returns the resource record of the object that is part of the specified relation.", + "parameters": [ + { + "name": "id", + "in": "path", + "required": true, + "schema": { + "type": "integer", + "format": "int32", + "example": 10 + } + }, + { + "name": "include", + "in": "query", + "schema": { + "type": "string" + }, + "description": "Items to include. Comma seperated" + } + ] + } + }, + "/api/v2/ui/users/{id:[0-9]+}/relationships/{relation:globalPermissionGroup}": { + "get": { + "tags": [ + "Users" + ], + "responses": { + "400": { + "description": "Invalid request", + "content": { + "application/json": { + "schema": { + "$ref": "#/components/schemas/ErrorResponse" + } + } + } + }, + "401": { + "description": "Authentication failed", + "content": { + "application/json": { + "schema": { + "$ref": "#/components/schemas/ErrorResponse" + } + } + } + }, + "404": { + "description": "Not Found", + "content": { + "application/json": { + "schema": { + "$ref": "#/components/schemas/NotFoundResponse" + } + } + } + }, + "200": { + "description": "successful operation", + "content": { + "application/json": { + "schema": { + "$ref": "#/components/schemas/UserResponse" + } + } + } + } + }, + "security": [ + { + "bearerAuth": [ + [ + "permUserRead" + ] + ] + } + ], + "description": "GET request for for a to-one relationship link. Returns the resource record of the object that is part of the specified relation.", + "parameters": [ + { + "name": "id", + "in": "path", + "required": true, + "schema": { + "type": "integer", + "format": "int32", + "example": 10 + } + }, + { + "name": "include", + "in": "query", + "schema": { + "type": "string" + }, + "description": "Items to include. Comma seperated" + } + ] + }, + "patch": { + "tags": [ + "Users" + ], + "responses": { + "400": { + "description": "Invalid request", + "content": { + "application/json": { + "schema": { + "$ref": "#/components/schemas/ErrorResponse" + } + } + } + }, + "401": { + "description": "Authentication failed", + "content": { + "application/json": { + "schema": { + "$ref": "#/components/schemas/ErrorResponse" + } + } + } + }, + "404": { + "description": "Not Found", + "content": { + "application/json": { + "schema": { + "$ref": "#/components/schemas/NotFoundResponse" + } + } + } + }, + "200": { + "description": "successful operation", + "content": { + "application/json": { + "schema": { + "$ref": "#/components/schemas/UserPostPatchResponse" + } + } + } + } + }, + "security": [ + { + "bearerAuth": [ + [ + "permUserUpdate" + ] + ] + } + ], + "description": "", + "requestBody": { + "required": true, + "content": { + "application/json": { + "schema": { + "$ref": "#/components/schemas/UserPatch" + } + } + } + }, + "parameters": [] + } + }, + "/api/v2/ui/users/{id:[0-9]+}/{relation:accessGroups}": { + "get": { + "tags": [ + "Users" + ], + "responses": { + "400": { + "description": "Invalid request", + "content": { + "application/json": { + "schema": { + "$ref": "#/components/schemas/ErrorResponse" + } + } + } + }, + "401": { + "description": "Authentication failed", + "content": { + "application/json": { + "schema": { + "$ref": "#/components/schemas/ErrorResponse" + } + } + } + }, + "404": { + "description": "Not Found", + "content": { + "application/json": { + "schema": { + "$ref": "#/components/schemas/NotFoundResponse" + } + } + } + }, + "200": { + "description": "successful operation", + "content": { + "application/json": { + "schema": { + "$ref": "#/components/schemas/UserResponse" + } + } + } + } + }, + "security": [ + { + "bearerAuth": [ + [ + "permUserRead" + ] + ] + } + ], + "description": "GET request for for a to-one relationship link. Returns the resource record of the object that is part of the specified relation.", + "parameters": [ + { + "name": "id", + "in": "path", + "required": true, + "schema": { + "type": "integer", + "format": "int32", + "example": 10 + } + }, + { + "name": "include", + "in": "query", + "schema": { + "type": "string" + }, + "description": "Items to include. Comma seperated" + } + ] + } + }, + "/api/v2/ui/users/{id:[0-9]+}/relationships/{relation:accessGroups}": { + "get": { + "tags": [ + "Users" + ], + "responses": { + "400": { + "description": "Invalid request", + "content": { + "application/json": { + "schema": { + "$ref": "#/components/schemas/ErrorResponse" + } + } + } + }, + "401": { + "description": "Authentication failed", + "content": { + "application/json": { + "schema": { + "$ref": "#/components/schemas/ErrorResponse" + } + } + } + }, + "404": { + "description": "Not Found", + "content": { + "application/json": { + "schema": { + "$ref": "#/components/schemas/NotFoundResponse" + } + } + } + }, + "200": { + "description": "successful operation", + "content": { + "application/json": { + "schema": { + "$ref": "#/components/schemas/UserResponse" + } + } + } + } + }, + "security": [ + { + "bearerAuth": [ + [ + "permUserRead" + ] + ] + } + ], + "description": "GET request for for a to-one relationship link. Returns the resource record of the object that is part of the specified relation.", + "parameters": [ + { + "name": "id", + "in": "path", + "required": true, + "schema": { + "type": "integer", + "format": "int32", + "example": 10 + } + }, + { + "name": "include", + "in": "query", + "schema": { + "type": "string" + }, + "description": "Items to include. Comma seperated" + } + ] + }, + "patch": { + "tags": [ + "Users" + ], + "responses": { + "400": { + "description": "Invalid request", + "content": { + "application/json": { + "schema": { + "$ref": "#/components/schemas/ErrorResponse" + } + } + } + }, + "401": { + "description": "Authentication failed", + "content": { + "application/json": { + "schema": { + "$ref": "#/components/schemas/ErrorResponse" + } + } + } + }, + "404": { + "description": "Not Found", + "content": { + "application/json": { + "schema": { + "$ref": "#/components/schemas/NotFoundResponse" + } + } + } + }, + "200": { + "description": "successful operation", + "content": { + "application/json": { + "schema": { + "$ref": "#/components/schemas/UserPostPatchResponse" + } + } + } + } + }, + "security": [ + { + "bearerAuth": [ + [ + "permUserUpdate" + ] + ] + } + ], + "description": "", + "requestBody": { + "required": true, + "content": { + "application/json": { + "schema": { + "$ref": "#/components/schemas/UserPatch" + } + } + } + }, + "parameters": [] + }, + "post": { + "tags": [ + "Users" + ], + "responses": { + "400": { + "description": "Invalid request", + "content": { + "application/json": { + "schema": { + "$ref": "#/components/schemas/ErrorResponse" + } + } + } + }, + "401": { + "description": "Authentication failed", + "content": { + "application/json": { + "schema": { + "$ref": "#/components/schemas/ErrorResponse" + } + } + } + }, + "404": { + "description": "Not Found", + "content": { + "application/json": { + "schema": { + "$ref": "#/components/schemas/NotFoundResponse" + } + } + } + }, + "204": { + "description": "successfully created" + } + }, + "security": [ + { + "bearerAuth": [ + [ + "permUserCreate" + ] + ] + } + ], + "description": "", + "requestBody": { + "required": true, + "content": { + "application/json": [] + } + }, + "parameters": [] + }, + "delete": { + "tags": [ + "Users" + ], + "responses": { + "400": { + "description": "Invalid request", + "content": { + "application/json": { + "schema": { + "$ref": "#/components/schemas/ErrorResponse" + } + } + } + }, + "401": { + "description": "Authentication failed", + "content": { + "application/json": { + "schema": { + "$ref": "#/components/schemas/ErrorResponse" + } + } + } + }, + "404": { + "description": "Not Found", + "content": { + "application/json": { + "schema": { + "$ref": "#/components/schemas/NotFoundResponse" + } + } + } + }, + "204": { + "description": "successfully deleted" + } + }, + "security": [ + { + "bearerAuth": [ + [ + "permUserDelete" + ] + ] + } + ], + "description": "", + "requestBody": { + "required": true, + "content": { + "application/json": [] + } + }, + "parameters": [] + } + }, + "/api/v2/ui/users/{id:[0-9]+}": { + "get": { + "tags": [ + "Users" + ], + "responses": { + "400": { + "description": "Invalid request", + "content": { + "application/json": { + "schema": { + "$ref": "#/components/schemas/ErrorResponse" + } + } + } + }, + "401": { + "description": "Authentication failed", + "content": { + "application/json": { + "schema": { + "$ref": "#/components/schemas/ErrorResponse" + } + } + } + }, + "404": { + "description": "Not Found", + "content": { + "application/json": { + "schema": { + "$ref": "#/components/schemas/NotFoundResponse" + } + } + } + }, + "200": { + "description": "successful operation", + "content": { + "application/json": { + "schema": { + "$ref": "#/components/schemas/UserResponse" + } + } + } + } + }, + "security": [ + { + "bearerAuth": [ + [ + "permUserRead" + ] + ] + } + ], + "description": "GET request to retrieve a single object.", + "parameters": [ + { + "name": "id", + "in": "path", + "required": true, + "schema": { + "type": "integer", + "format": "int32", + "example": 10 + } + }, + { + "name": "include", + "in": "query", + "schema": { + "type": "string" + }, + "description": "Items to include. Comma seperated" + } + ] + }, + "patch": { + "tags": [ + "Users" + ], + "responses": { + "400": { + "description": "Invalid request", + "content": { + "application/json": { + "schema": { + "$ref": "#/components/schemas/ErrorResponse" + } + } + } + }, + "401": { + "description": "Authentication failed", + "content": { + "application/json": { + "schema": { + "$ref": "#/components/schemas/ErrorResponse" + } + } + } + }, + "404": { + "description": "Not Found", + "content": { + "application/json": { + "schema": { + "$ref": "#/components/schemas/NotFoundResponse" + } + } + } + }, + "200": { + "description": "successful operation", + "content": { + "application/json": { + "schema": { + "$ref": "#/components/schemas/UserPostPatchResponse" + } + } + } + } + }, + "security": [ + { + "bearerAuth": [ + [ + "permUserUpdate" + ] + ] + } + ], + "description": "PATCH request to update attributes of a single object.", + "requestBody": { + "required": true, + "content": { + "application/json": { + "schema": { + "$ref": "#/components/schemas/UserPatch" + } + } + } + }, + "parameters": [] + }, + "delete": { + "tags": [ + "Users" + ], + "responses": { + "400": { + "description": "Invalid request", + "content": { + "application/json": { + "schema": { + "$ref": "#/components/schemas/ErrorResponse" + } + } + } + }, + "401": { + "description": "Authentication failed", + "content": { + "application/json": { + "schema": { + "$ref": "#/components/schemas/ErrorResponse" + } + } + } + }, + "404": { + "description": "Not Found", + "content": { + "application/json": { + "schema": { + "$ref": "#/components/schemas/NotFoundResponse" + } + } + } + }, + "204": { + "description": "successfully deleted" + } + }, + "security": [ + { + "bearerAuth": [ + [ + "permUserDelete" + ] + ] + } + ], + "description": "", + "requestBody": { + "required": true, + "content": { + "application/json": [] + } + }, + "parameters": [] + } + }, + "/api/v2/ui/vouchers": { + "get": { + "tags": [ + "RegVouchers" + ], + "responses": { + "400": { + "description": "Invalid request", + "content": { + "application/json": { + "schema": { + "$ref": "#/components/schemas/ErrorResponse" + } + } + } + }, + "401": { + "description": "Authentication failed", + "content": { + "application/json": { + "schema": { + "$ref": "#/components/schemas/ErrorResponse" + } + } + } + }, + "200": { + "description": "successful operation", + "content": { + "application/json": { + "schema": { + "type": "array", + "items": { + "$ref": "#/components/schemas/RegVoucherResponse" + } + } + } + } + } + }, + "security": [ + { + "bearerAuth": [ + [ + "permRegVoucherRead" + ] + ] + } + ], + "description": "GET many request to retrieve multiple objects.", + "parameters": [ + { + "name": "page[after]", + "in": "query", + "schema": { + "type": "integer", + "format": "int32" + }, + "example": 0, + "description": "Pointer to paginate to retrieve the data after the value provided" + }, + { + "name": "page[before]", + "in": "query", + "schema": { + "type": "integer", + "format": "int32" + }, + "example": 0, + "description": "Pointer to paginate to retrieve the data before the value provided" + }, + { + "name": "page[size]", + "in": "query", + "schema": { + "type": "integer", + "format": "int32" + }, + "example": 100, + "description": "Amout of data to retrieve inside a single page" + }, + { + "name": "filter", + "in": "query", + "style": "deepobject", + "explode": true, + "schema": { + "type": "object" + }, + "description": "Filters results using a query", + "example": "\"filter[hashlistId__gt]\": 200" + }, + { + "name": "include", + "in": "query", + "schema": { + "type": "string" + }, + "description": "Items to include, comma seperated. Possible options: " + } + ] + }, + "post": { + "tags": [ + "RegVouchers" + ], + "responses": { + "400": { + "description": "Invalid request", + "content": { + "application/json": { + "schema": { + "$ref": "#/components/schemas/ErrorResponse" + } + } + } + }, + "401": { + "description": "Authentication failed", + "content": { + "application/json": { + "schema": { + "$ref": "#/components/schemas/ErrorResponse" + } + } + } + }, + "201": { + "description": "successful operation", + "content": { + "application/json": { + "schema": { + "$ref": "#/components/schemas/RegVoucherPostPatchResponse" + } + } + } + } + }, + "security": [ + { + "bearerAuth": [ + [ + "permRegVoucherCreate" + ] + ] + } + ], + "description": "POST request to create a new object. The request must contain the resource record as data with the attributes of the new object.To add relationships, a relationships object can be added with the resource records of the relations that are part of this object.", + "requestBody": { + "required": true, + "content": { + "application/json": { + "schema": { + "$ref": "#/components/schemas/RegVoucherCreate" + } + } + } + }, + "parameters": [] + } + }, + "/api/v2/ui/vouchers/count": { + "get": { + "tags": [ + "RegVouchers" + ], + "responses": { + "400": { + "description": "Invalid request", + "content": { + "application/json": { + "schema": { + "$ref": "#/components/schemas/ErrorResponse" + } + } + } + }, + "401": { + "description": "Authentication failed", + "content": { + "application/json": { + "schema": { + "$ref": "#/components/schemas/ErrorResponse" + } + } + } + }, + "200": { + "description": "successful operation", + "content": { + "application/json": { + "schema": { + "type": "array", + "items": { + "$ref": "#/components/schemas/RegVoucherResponse" + } + } + } + } + } + }, + "security": [ + { + "bearerAuth": [ + [ + "permRegVoucherRead" + ] + ] + } + ], + "description": "GET many request to retrieve multiple objects.", + "parameters": [ + { + "name": "page[after]", + "in": "query", + "schema": { + "type": "integer", + "format": "int32" + }, + "example": 0, + "description": "Pointer to paginate to retrieve the data after the value provided" + }, + { + "name": "page[before]", + "in": "query", + "schema": { + "type": "integer", + "format": "int32" + }, + "example": 0, + "description": "Pointer to paginate to retrieve the data before the value provided" + }, + { + "name": "page[size]", + "in": "query", + "schema": { + "type": "integer", + "format": "int32" + }, + "example": 100, + "description": "Amout of data to retrieve inside a single page" + }, + { + "name": "filter", + "in": "query", + "style": "deepobject", + "explode": true, + "schema": { + "type": "object" + }, + "description": "Filters results using a query", + "example": "\"filter[hashlistId__gt]\": 200" + }, + { + "name": "include", + "in": "query", + "schema": { + "type": "string" + }, + "description": "Items to include, comma seperated. Possible options: " + } + ] + } + }, + "/api/v2/ui/vouchers/{id:[0-9]+}": { + "get": { + "tags": [ + "RegVouchers" + ], + "responses": { + "400": { + "description": "Invalid request", + "content": { + "application/json": { + "schema": { + "$ref": "#/components/schemas/ErrorResponse" + } + } + } + }, + "401": { + "description": "Authentication failed", + "content": { + "application/json": { + "schema": { + "$ref": "#/components/schemas/ErrorResponse" + } + } + } + }, + "404": { + "description": "Not Found", + "content": { + "application/json": { + "schema": { + "$ref": "#/components/schemas/NotFoundResponse" + } + } + } + }, + "200": { + "description": "successful operation", + "content": { + "application/json": { + "schema": { + "$ref": "#/components/schemas/RegVoucherResponse" + } + } + } + } + }, + "security": [ + { + "bearerAuth": [ + [ + "permRegVoucherRead" + ] + ] + } + ], + "description": "GET request to retrieve a single object.", + "parameters": [ + { + "name": "id", + "in": "path", + "required": true, + "schema": { + "type": "integer", + "format": "int32", + "example": 10 + } + }, + { + "name": "include", + "in": "query", + "schema": { + "type": "string" + }, + "description": "Items to include. Comma seperated" + } + ] + }, + "patch": { + "tags": [ + "RegVouchers" + ], + "responses": { + "400": { + "description": "Invalid request", + "content": { + "application/json": { + "schema": { + "$ref": "#/components/schemas/ErrorResponse" + } + } + } + }, + "401": { + "description": "Authentication failed", + "content": { + "application/json": { + "schema": { + "$ref": "#/components/schemas/ErrorResponse" + } + } + } + }, + "404": { + "description": "Not Found", + "content": { + "application/json": { + "schema": { + "$ref": "#/components/schemas/NotFoundResponse" + } + } + } + }, + "200": { + "description": "successful operation", + "content": { + "application/json": { + "schema": { + "$ref": "#/components/schemas/RegVoucherPostPatchResponse" + } + } + } + } + }, + "security": [ + { + "bearerAuth": [ + [ + "permRegVoucherUpdate" + ] + ] + } + ], + "description": "PATCH request to update attributes of a single object.", + "requestBody": { + "required": true, + "content": { + "application/json": { + "schema": { + "$ref": "#/components/schemas/RegVoucherPatch" + } + } + } + }, + "parameters": [] + }, + "delete": { + "tags": [ + "RegVouchers" + ], + "responses": { + "400": { + "description": "Invalid request", + "content": { + "application/json": { + "schema": { + "$ref": "#/components/schemas/ErrorResponse" + } + } + } + }, + "401": { + "description": "Authentication failed", + "content": { + "application/json": { + "schema": { + "$ref": "#/components/schemas/ErrorResponse" + } + } + } + }, + "404": { + "description": "Not Found", + "content": { + "application/json": { + "schema": { + "$ref": "#/components/schemas/NotFoundResponse" + } + } + } + }, + "204": { + "description": "successfully deleted" + } + }, + "security": [ + { + "bearerAuth": [ + [ + "permRegVoucherDelete" + ] + ] + } + ], + "description": "", + "requestBody": { + "required": true, + "content": { + "application/json": [] + } + }, + "parameters": [] + } + }, + "/api/v2/auth/token": { + "post": { + "tags": [ + "Login" + ], + "requestBody": { + "required": true, + "content": { + "application/json": { + "schema": { + "$ref": "#/components/schemas/TokenRequest" + } + } + } + }, + "responses": { + "200": { + "description": "Success", + "content": { + "application/json": { + "schema": { + "$ref": "#/components/schemas/Token" + } + } + } + }, + "401": { + "description": "Authentication failed", + "content": { + "application/json": { + "schema": { + "$ref": "#/components/schemas/ErrorResponse" + } + } + } + }, + "404": { + "description": "Not Found", + "content": { + "application/json": { + "schema": { + "$ref": "#/components/schemas/NotFoundResponse" + } + } + } + } + }, + "security": [ + { + "basicAuth": [] + } + ] + } + } + }, + "components": { + "schemas": { + "ListResponse": { + "type": "object", + "properties": { + "expand": { + "type": "string", + "example": "hashlist" + }, + "page[after]": { + "type": "integer", + "example": 0 + }, + "page[before]": { + "type": "integer", + "example": 0 + }, + "page[size]": { + "type": "integer", + "example": 100 + } + } + }, + "ErrorResponse": { + "type": "object", + "properties": { + "title": { + "type": "string", + "example": "about=>blank" + }, + "type": { + "type": "string", + "example": "Error details here" + }, + "status": { + "type": "integer", + "example": 400 + } + } + }, + "NotFoundResponse": { + "type": "object", + "properties": { + "message": { + "type": "string", + "example": "404 Not Found" + }, + "exception": { + "type": "object", + "properties": { + "type": { + "type": "string", + "example": "Slim\\Exception\\HttpNotFoundException" + }, + "code": { + "type": "integer", + "example": 404 + }, + "message": { + "type": "string", + "example": "Not Found" + }, + "file": { + "type": "string", + "example": "../hashtopolis/server/vendor/slim/slim/Slim/Middleware/RoutingMiddleware.php" + }, + "line": { + "type": "integer", + "example": 91 + } + } + } + } + }, + "AccessGroupCreate": { + "type": "object", + "properties": { + "data": { + "type": "object", + "properties": { + "type": { + "type": "string" + }, + "attributes": { + "type": "object", + "properties": { + "groupName": { + "type": "string" + } + } + } + } + } + } + }, + "AccessGroupPatch": { + "type": "object", + "properties": { + "data": { + "type": "object", + "properties": { + "type": { + "type": "string" + }, + "attributes": { + "type": "object", + "properties": { + "groupName": { + "type": "string" + } + } + } + } + } + } + }, + "AccessGroupResponse": { + "type": "object", + "properties": { + "jsonapi": { + "type": "object", + "properties": { + "version": { + "type": "string", + "default": "1.1" + }, + "ext": { + "type": "string", + "default": "https://jsonapi.org/profiles/ethanresnick/cursor-pagination" + } + } + }, + "links": { + "type": "object", + "properties": { + "self": { + "type": "string", + "default": "/api/v2/ui/accessgroups?page[size]=25" + }, + "first": { + "type": "string", + "default": "/api/v2/ui/accessgroups?page[size]=25&page[after]=0" + }, + "last": { + "type": "string", + "default": "/api/v2/ui/accessgroups?page[size]=25&page[before]=500" + }, + "next": { + "type": "string", + "default": "/api/v2/ui/accessgroups?page[size]=25&page[after]=25" + }, + "previous": { + "type": "string", + "default": "/api/v2/ui/accessgroups?page[size]=25&page[before]=25" + } + } + }, + "id": { + "type": "integer" + }, + "type": { + "type": "string", + "default": "AccessGroup" + }, + "data": { + "type": "object", + "properties": { + "groupName": { + "type": "string" + } + } + }, + "relationships": { + "type": "object", + "properties": [ + { + "properties": { + "agentMembers": { + "type": "object", + "properties": { + "links": { + "type": "object", + "properties": { + "self": { + "type": "string", + "default": "/api/v2/ui/accessgroups/relationships/agentMembers" + }, + "related": { + "type": "string", + "default": "/api/v2/ui/accessgroups/agentMembers" + } + } + } + } + } + } + }, + { + "properties": { + "userMembers": { + "type": "object", + "properties": { + "links": { + "type": "object", + "properties": { + "self": { + "type": "string", + "default": "/api/v2/ui/accessgroups/relationships/userMembers" + }, + "related": { + "type": "string", + "default": "/api/v2/ui/accessgroups/userMembers" + } + } + } + } + } + } + } + ] + }, + "included": { + "type": "array", + "items": { + "type": "object", + "properties": [ + { + "properties": { + "id": { + "type": "integer" + }, + "type": { + "type": "string", + "default": "userMembers" + }, + "attributes": { + "type": "object", + "properties": { + "id": { + "type": "integer" + }, + "name": { + "type": "string" + }, + "email": { + "type": "string" + }, + "passwordHash": { + "type": "string" + }, + "passwordSalt": { + "type": "string" + }, + "isValid": { + "type": "boolean" + }, + "isComputedPassword": { + "type": "boolean" + }, + "lastLoginDate": { + "type": "integer", + "format": "int64" + }, + "registeredSince": { + "type": "integer", + "format": "int64" + }, + "sessionLifetime": { + "type": "integer" + }, + "globalPermissionGroupId": { + "type": "integer" + }, + "yubikey": { + "type": "string" + }, + "otp1": { + "type": "string" + }, + "otp2": { + "type": "string" + }, + "otp3": { + "type": "string" + }, + "otp4": { + "type": "string" + } + } + } + } + }, + { + "properties": { + "id": { + "type": "integer" + }, + "type": { + "type": "string", + "default": "agentMembers" + }, + "attributes": { + "type": "object", + "properties": { + "agentId": { + "type": "integer" + }, + "agentName": { + "type": "string" + }, + "uid": { + "type": "string" + }, + "os": { + "type": "integer" + }, + "devices": { + "type": "string" + }, + "cmdPars": { + "type": "string" + }, + "ignoreErrors": { + "type": "integer", + "enum": [ + 0, + 1, + 2 + ] + }, + "isActive": { + "type": "boolean" + }, + "isTrusted": { + "type": "boolean" + }, + "token": { + "type": "string" + }, + "lastAct": { + "type": "string" + }, + "lastTime": { + "type": "integer", + "format": "int64" + }, + "lastIp": { + "type": "string" + }, + "userId": { + "type": "integer" + }, + "cpuOnly": { + "type": "boolean" + }, + "clientSignature": { + "type": "string" + } + } + } + } + } + ] + } + } + } + }, + "AccessGroupSingleResponse": { + "type": "object", + "properties": { + "id": { + "type": "integer" + }, + "type": { + "type": "string", + "default": "AccessGroup" + }, + "data": { + "type": "object", + "properties": { + "groupName": { + "type": "string" + } + } + }, + "relationships": { + "type": "object", + "properties": [ + { + "properties": { + "agentMembers": { + "type": "object", + "properties": { + "links": { + "type": "object", + "properties": { + "self": { + "type": "string", + "default": "/api/v2/ui/accessgroups/relationships/agentMembers" + }, + "related": { + "type": "string", + "default": "/api/v2/ui/accessgroups/agentMembers" + } + } + } + } + } + } + }, + { + "properties": { + "userMembers": { + "type": "object", + "properties": { + "links": { + "type": "object", + "properties": { + "self": { + "type": "string", + "default": "/api/v2/ui/accessgroups/relationships/userMembers" + }, + "related": { + "type": "string", + "default": "/api/v2/ui/accessgroups/userMembers" + } + } + } + } + } + } + } + ] + }, + "included": { + "type": "array", + "items": { + "type": "object", + "properties": [ + { + "properties": { + "id": { + "type": "integer" + }, + "type": { + "type": "string", + "default": "userMembers" + }, + "attributes": { + "type": "object", + "properties": { + "id": { + "type": "integer" + }, + "name": { + "type": "string" + }, + "email": { + "type": "string" + }, + "passwordHash": { + "type": "string" + }, + "passwordSalt": { + "type": "string" + }, + "isValid": { + "type": "boolean" + }, + "isComputedPassword": { + "type": "boolean" + }, + "lastLoginDate": { + "type": "integer", + "format": "int64" + }, + "registeredSince": { + "type": "integer", + "format": "int64" + }, + "sessionLifetime": { + "type": "integer" + }, + "globalPermissionGroupId": { + "type": "integer" + }, + "yubikey": { + "type": "string" + }, + "otp1": { + "type": "string" + }, + "otp2": { + "type": "string" + }, + "otp3": { + "type": "string" + }, + "otp4": { + "type": "string" + } + } + } + } + }, + { + "properties": { + "id": { + "type": "integer" + }, + "type": { + "type": "string", + "default": "agentMembers" + }, + "attributes": { + "type": "object", + "properties": { + "agentId": { + "type": "integer" + }, + "agentName": { + "type": "string" + }, + "uid": { + "type": "string" + }, + "os": { + "type": "integer" + }, + "devices": { + "type": "string" + }, + "cmdPars": { + "type": "string" + }, + "ignoreErrors": { + "type": "integer", + "enum": [ + 0, + 1, + 2 + ] + }, + "isActive": { + "type": "boolean" + }, + "isTrusted": { + "type": "boolean" + }, + "token": { + "type": "string" + }, + "lastAct": { + "type": "string" + }, + "lastTime": { + "type": "integer", + "format": "int64" + }, + "lastIp": { + "type": "string" + }, + "userId": { + "type": "integer" + }, + "cpuOnly": { + "type": "boolean" + }, + "clientSignature": { + "type": "string" + } + } + } + } + } + ] + } + } + } + }, + "AccessGroupPostPatchResponse": { + "type": "object", + "properties": { + "jsonapi": { + "type": "object", + "properties": { + "version": { + "type": "string", + "default": "1.1" + }, + "ext": { + "type": "string", + "default": "https://jsonapi.org/profiles/ethanresnick/cursor-pagination" + } + } + }, + "id": { + "type": "integer" + }, + "type": { + "type": "string", + "default": "AccessGroup" + }, + "data": { + "type": "object", + "properties": { + "groupName": { + "type": "string" + } + } + } + } + }, + "AccessGroupListResponse": { + "allOf": [ + { + "$ref": "#/components/schemas/ListResponse" + }, + { + "type": "object", + "properties": { + "values": { + "type": "array", + "items": { + "$ref": "#/components/schemas/AccessGroupResponse" + } + } + } + } + ] + }, + "AssignmentCreate": { + "type": "object", + "properties": { + "data": { + "type": "object", + "properties": { + "type": { + "type": "string" + }, + "attributes": { + "type": "object", + "properties": { + "taskId": { + "type": "integer" + }, + "agentId": { + "type": "integer" + }, + "benchmark": { + "type": "string" + } + } + } + } + } + } + }, + "AssignmentPatch": { + "type": "object", + "properties": { + "data": { + "type": "object", + "properties": { + "type": { + "type": "string" + }, + "attributes": { + "type": "object", + "properties": { + "agentId": { + "type": "integer" + }, + "taskId": { + "type": "integer" + } + } + } + } + } + } + }, + "AssignmentResponse": { + "type": "object", + "properties": { + "jsonapi": { + "type": "object", + "properties": { + "version": { + "type": "string", + "default": "1.1" + }, + "ext": { + "type": "string", + "default": "https://jsonapi.org/profiles/ethanresnick/cursor-pagination" + } + } + }, + "links": { + "type": "object", + "properties": { + "self": { + "type": "string", + "default": "/api/v2/ui/agentassignments?page[size]=25" + }, + "first": { + "type": "string", + "default": "/api/v2/ui/agentassignments?page[size]=25&page[after]=0" + }, + "last": { + "type": "string", + "default": "/api/v2/ui/agentassignments?page[size]=25&page[before]=500" + }, + "next": { + "type": "string", + "default": "/api/v2/ui/agentassignments?page[size]=25&page[after]=25" + }, + "previous": { + "type": "string", + "default": "/api/v2/ui/agentassignments?page[size]=25&page[before]=25" + } + } + }, + "id": { + "type": "integer" + }, + "type": { + "type": "string", + "default": "Assignment" + }, + "data": { + "type": "object", + "properties": { + "taskId": { + "type": "integer" + }, + "agentId": { + "type": "integer" + }, + "benchmark": { + "type": "string" + } + } + }, + "relationships": { + "type": "object", + "properties": [ + { + "properties": { + "agent": { + "type": "object", + "properties": { + "links": { + "type": "object", + "properties": { + "self": { + "type": "string", + "default": "/api/v2/ui/agentassignments/relationships/agent" + }, + "related": { + "type": "string", + "default": "/api/v2/ui/agentassignments/agent" + } + } + } + } + } + } + }, + { + "properties": { + "task": { + "type": "object", + "properties": { + "links": { + "type": "object", + "properties": { + "self": { + "type": "string", + "default": "/api/v2/ui/agentassignments/relationships/task" + }, + "related": { + "type": "string", + "default": "/api/v2/ui/agentassignments/task" + } + } + } + } + } + } + } + ] + }, + "included": { + "type": "array", + "items": { + "type": "object", + "properties": [ + { + "properties": { + "id": { + "type": "integer" + }, + "type": { + "type": "string", + "default": "agent" + }, + "attributes": { + "type": "object", + "properties": { + "agentId": { + "type": "integer" + }, + "agentName": { + "type": "string" + }, + "uid": { + "type": "string" + }, + "os": { + "type": "integer" + }, + "devices": { + "type": "string" + }, + "cmdPars": { + "type": "string" + }, + "ignoreErrors": { + "type": "integer", + "enum": [ + 0, + 1, + 2 + ] + }, + "isActive": { + "type": "boolean" + }, + "isTrusted": { + "type": "boolean" + }, + "token": { + "type": "string" + }, + "lastAct": { + "type": "string" + }, + "lastTime": { + "type": "integer", + "format": "int64" + }, + "lastIp": { + "type": "string" + }, + "userId": { + "type": "integer" + }, + "cpuOnly": { + "type": "boolean" + }, + "clientSignature": { + "type": "string" + } + } + } + } + }, + { + "properties": { + "id": { + "type": "integer" + }, + "type": { + "type": "string", + "default": "task" + }, + "attributes": { + "type": "object", + "properties": { + "hashlistId": { + "type": "integer" + }, + "files": { + "type": "array" + }, + "taskId": { + "type": "integer" + }, + "taskName": { + "type": "string" + }, + "attackCmd": { + "type": "string" + }, + "chunkTime": { + "type": "integer" + }, + "statusTimer": { + "type": "integer" + }, + "keyspace": { + "type": "integer", + "format": "int64" + }, + "keyspaceProgress": { + "type": "integer", + "format": "int64" + }, + "priority": { + "type": "integer" + }, + "maxAgents": { + "type": "integer" + }, + "color": { + "type": "string" + }, + "isSmall": { + "type": "boolean" + }, + "isCpuTask": { + "type": "boolean" + }, + "useNewBench": { + "type": "boolean" + }, + "skipKeyspace": { + "type": "integer", + "format": "int64" + }, + "crackerBinaryId": { + "type": "integer" + }, + "crackerBinaryTypeId": { + "type": "integer" + }, + "taskWrapperId": { + "type": "integer" + }, + "isArchived": { + "type": "boolean" + }, + "notes": { + "type": "string" + }, + "staticChunks": { + "type": "integer" + }, + "chunkSize": { + "type": "integer", + "format": "int64" + }, + "forcePipe": { + "type": "boolean" + }, + "preprocessorId": { + "type": "integer" + }, + "preprocessorCommand": { + "type": "string" + } + } + } + } + } + ] + } + } + } + }, + "AssignmentSingleResponse": { + "type": "object", + "properties": { + "id": { + "type": "integer" + }, + "type": { + "type": "string", + "default": "Assignment" + }, + "data": { + "type": "object", + "properties": { + "taskId": { + "type": "integer" + }, + "agentId": { + "type": "integer" + }, + "benchmark": { + "type": "string" + } + } + }, + "relationships": { + "type": "object", + "properties": [ + { + "properties": { + "agent": { + "type": "object", + "properties": { + "links": { + "type": "object", + "properties": { + "self": { + "type": "string", + "default": "/api/v2/ui/agentassignments/relationships/agent" + }, + "related": { + "type": "string", + "default": "/api/v2/ui/agentassignments/agent" + } + } + } + } + } + } + }, + { + "properties": { + "task": { + "type": "object", + "properties": { + "links": { + "type": "object", + "properties": { + "self": { + "type": "string", + "default": "/api/v2/ui/agentassignments/relationships/task" + }, + "related": { + "type": "string", + "default": "/api/v2/ui/agentassignments/task" + } + } + } + } + } + } + } + ] + }, + "included": { + "type": "array", + "items": { + "type": "object", + "properties": [ + { + "properties": { + "id": { + "type": "integer" + }, + "type": { + "type": "string", + "default": "agent" + }, + "attributes": { + "type": "object", + "properties": { + "agentId": { + "type": "integer" + }, + "agentName": { + "type": "string" + }, + "uid": { + "type": "string" + }, + "os": { + "type": "integer" + }, + "devices": { + "type": "string" + }, + "cmdPars": { + "type": "string" + }, + "ignoreErrors": { + "type": "integer", + "enum": [ + 0, + 1, + 2 + ] + }, + "isActive": { + "type": "boolean" + }, + "isTrusted": { + "type": "boolean" + }, + "token": { + "type": "string" + }, + "lastAct": { + "type": "string" + }, + "lastTime": { + "type": "integer", + "format": "int64" + }, + "lastIp": { + "type": "string" + }, + "userId": { + "type": "integer" + }, + "cpuOnly": { + "type": "boolean" + }, + "clientSignature": { + "type": "string" + } + } + } + } + }, + { + "properties": { + "id": { + "type": "integer" + }, + "type": { + "type": "string", + "default": "task" + }, + "attributes": { + "type": "object", + "properties": { + "hashlistId": { + "type": "integer" + }, + "files": { + "type": "array" + }, + "taskId": { + "type": "integer" + }, + "taskName": { + "type": "string" + }, + "attackCmd": { + "type": "string" + }, + "chunkTime": { + "type": "integer" + }, + "statusTimer": { + "type": "integer" + }, + "keyspace": { + "type": "integer", + "format": "int64" + }, + "keyspaceProgress": { + "type": "integer", + "format": "int64" + }, + "priority": { + "type": "integer" + }, + "maxAgents": { + "type": "integer" + }, + "color": { + "type": "string" + }, + "isSmall": { + "type": "boolean" + }, + "isCpuTask": { + "type": "boolean" + }, + "useNewBench": { + "type": "boolean" + }, + "skipKeyspace": { + "type": "integer", + "format": "int64" + }, + "crackerBinaryId": { + "type": "integer" + }, + "crackerBinaryTypeId": { + "type": "integer" + }, + "taskWrapperId": { + "type": "integer" + }, + "isArchived": { + "type": "boolean" + }, + "notes": { + "type": "string" + }, + "staticChunks": { + "type": "integer" + }, + "chunkSize": { + "type": "integer", + "format": "int64" + }, + "forcePipe": { + "type": "boolean" + }, + "preprocessorId": { + "type": "integer" + }, + "preprocessorCommand": { + "type": "string" + } + } + } + } + } + ] + } + } + } + }, + "AssignmentPostPatchResponse": { + "type": "object", + "properties": { + "jsonapi": { + "type": "object", + "properties": { + "version": { + "type": "string", + "default": "1.1" + }, + "ext": { + "type": "string", + "default": "https://jsonapi.org/profiles/ethanresnick/cursor-pagination" + } + } + }, + "id": { + "type": "integer" + }, + "type": { + "type": "string", + "default": "Assignment" + }, + "data": { + "type": "object", + "properties": { + "taskId": { + "type": "integer" + }, + "agentId": { + "type": "integer" + }, + "benchmark": { + "type": "string" + } + } + } + } + }, + "AssignmentListResponse": { + "allOf": [ + { + "$ref": "#/components/schemas/ListResponse" + }, + { + "type": "object", + "properties": { + "values": { + "type": "array", + "items": { + "$ref": "#/components/schemas/AssignmentResponse" + } + } + } + } + ] + }, + "AgentBinaryCreate": { + "type": "object", + "properties": { + "data": { + "type": "object", + "properties": { + "type": { + "type": "string" + }, + "attributes": { + "type": "object", + "properties": { + "type": { + "type": "string" + }, + "version": { + "type": "string" + }, + "operatingSystems": { + "type": "string" + }, + "filename": { + "type": "string" + }, + "updateTrack": { + "type": "string" + }, + "updateAvailable": { + "type": "string" + } + } + } + } + } + } + }, + "AgentBinaryPatch": { + "type": "object", + "properties": { + "data": { + "type": "object", + "properties": { + "type": { + "type": "string" + }, + "attributes": { + "type": "object", + "properties": { + "filename": { + "type": "string" + }, + "operatingSystems": { + "type": "string" + }, + "type": { + "type": "string" + }, + "updateTrack": { + "type": "string" + }, + "version": { + "type": "string" + } + } + } + } + } + } + }, + "AgentBinaryResponse": { + "type": "object", + "properties": { + "jsonapi": { + "type": "object", + "properties": { + "version": { + "type": "string", + "default": "1.1" + }, + "ext": { + "type": "string", + "default": "https://jsonapi.org/profiles/ethanresnick/cursor-pagination" + } + } + }, + "links": { + "type": "object", + "properties": { + "self": { + "type": "string", + "default": "/api/v2/ui/agentbinaries?page[size]=25" + }, + "first": { + "type": "string", + "default": "/api/v2/ui/agentbinaries?page[size]=25&page[after]=0" + }, + "last": { + "type": "string", + "default": "/api/v2/ui/agentbinaries?page[size]=25&page[before]=500" + }, + "next": { + "type": "string", + "default": "/api/v2/ui/agentbinaries?page[size]=25&page[after]=25" + }, + "previous": { + "type": "string", + "default": "/api/v2/ui/agentbinaries?page[size]=25&page[before]=25" + } + } + }, + "id": { + "type": "integer" + }, + "type": { + "type": "string", + "default": "AgentBinary" + }, + "data": { + "type": "object", + "properties": { + "type": { + "type": "string" + }, + "version": { + "type": "string" + }, + "operatingSystems": { + "type": "string" + }, + "filename": { + "type": "string" + }, + "updateTrack": { + "type": "string" + }, + "updateAvailable": { + "type": "string" + } + } + }, + "relationships": { + "type": "object", + "properties": [] + }, + "included": { + "type": "array", + "items": { + "type": "object", + "properties": [] + } + } + } + }, + "AgentBinarySingleResponse": { + "type": "object", + "properties": { + "id": { + "type": "integer" + }, + "type": { + "type": "string", + "default": "AgentBinary" + }, + "data": { + "type": "object", + "properties": { + "type": { + "type": "string" + }, + "version": { + "type": "string" + }, + "operatingSystems": { + "type": "string" + }, + "filename": { + "type": "string" + }, + "updateTrack": { + "type": "string" + }, + "updateAvailable": { + "type": "string" + } + } + }, + "relationships": { + "type": "object", + "properties": [] + }, + "included": { + "type": "array", + "items": { + "type": "object", + "properties": [] + } + } + } + }, + "AgentBinaryPostPatchResponse": { + "type": "object", + "properties": { + "jsonapi": { + "type": "object", + "properties": { + "version": { + "type": "string", + "default": "1.1" + }, + "ext": { + "type": "string", + "default": "https://jsonapi.org/profiles/ethanresnick/cursor-pagination" + } + } + }, + "id": { + "type": "integer" + }, + "type": { + "type": "string", + "default": "AgentBinary" + }, + "data": { + "type": "object", + "properties": { + "type": { + "type": "string" + }, + "version": { + "type": "string" + }, + "operatingSystems": { + "type": "string" + }, + "filename": { + "type": "string" + }, + "updateTrack": { + "type": "string" + }, + "updateAvailable": { + "type": "string" + } + } + } + } + }, + "AgentBinaryListResponse": { + "allOf": [ + { + "$ref": "#/components/schemas/ListResponse" + }, + { + "type": "object", + "properties": { + "values": { + "type": "array", + "items": { + "$ref": "#/components/schemas/AgentBinaryResponse" + } + } + } + } + ] + }, + "AgentCreate": { + "type": "object", + "properties": { + "data": { + "type": "object", + "properties": { + "type": { + "type": "string" + }, + "attributes": { + "type": "object", + "properties": { + "agentName": { + "type": "string" + }, + "uid": { + "type": "string" + }, + "os": { + "type": "integer" + }, + "devices": { + "type": "string" + }, + "cmdPars": { + "type": "string" + }, + "ignoreErrors": { + "type": "integer", + "enum": [ + 0, + 1, + 2 + ] + }, + "isActive": { + "type": "boolean" + }, + "isTrusted": { + "type": "boolean" + }, + "token": { + "type": "string" + }, + "lastAct": { + "type": "string" + }, + "lastTime": { + "type": "integer", + "format": "int64" + }, + "lastIp": { + "type": "string" + }, + "userId": { + "type": "integer" + }, + "cpuOnly": { + "type": "boolean" + }, + "clientSignature": { + "type": "string" + } + } + } + } + } + } + }, + "AgentPatch": { + "type": "object", + "properties": { + "data": { + "type": "object", + "properties": { + "type": { + "type": "string" + }, + "attributes": { + "type": "object", + "properties": { + "agentName": { + "type": "string" + }, + "clientSignature": { + "type": "string" + }, + "cmdPars": { + "type": "string" + }, + "cpuOnly": { + "type": "boolean" + }, + "devices": { + "type": "string" + }, + "ignoreErrors": { + "type": "integer", + "enum": [ + 0, + 1, + 2 + ] + }, + "isActive": { + "type": "boolean" + }, + "isTrusted": { + "type": "boolean" + }, + "os": { + "type": "integer" + }, + "token": { + "type": "string" + }, + "uid": { + "type": "string" + }, + "userId": { + "type": "integer" + } + } + } + } + } + } + }, + "AgentResponse": { + "type": "object", + "properties": { + "jsonapi": { + "type": "object", + "properties": { + "version": { + "type": "string", + "default": "1.1" + }, + "ext": { + "type": "string", + "default": "https://jsonapi.org/profiles/ethanresnick/cursor-pagination" + } + } + }, + "links": { + "type": "object", + "properties": { + "self": { + "type": "string", + "default": "/api/v2/ui/agents?page[size]=25" + }, + "first": { + "type": "string", + "default": "/api/v2/ui/agents?page[size]=25&page[after]=0" + }, + "last": { + "type": "string", + "default": "/api/v2/ui/agents?page[size]=25&page[before]=500" + }, + "next": { + "type": "string", + "default": "/api/v2/ui/agents?page[size]=25&page[after]=25" + }, + "previous": { + "type": "string", + "default": "/api/v2/ui/agents?page[size]=25&page[before]=25" + } + } + }, + "id": { + "type": "integer" + }, + "type": { + "type": "string", + "default": "Agent" + }, + "data": { + "type": "object", + "properties": { + "agentName": { + "type": "string" + }, + "uid": { + "type": "string" + }, + "os": { + "type": "integer" + }, + "devices": { + "type": "string" + }, + "cmdPars": { + "type": "string" + }, + "ignoreErrors": { + "type": "integer", + "enum": [ + 0, + 1, + 2 + ] + }, + "isActive": { + "type": "boolean" + }, + "isTrusted": { + "type": "boolean" + }, + "token": { + "type": "string" + }, + "lastAct": { + "type": "string" + }, + "lastTime": { + "type": "integer", + "format": "int64" + }, + "lastIp": { + "type": "string" + }, + "userId": { + "type": "integer" + }, + "cpuOnly": { + "type": "boolean" + }, + "clientSignature": { + "type": "string" + } + } + }, + "relationships": { + "type": "object", + "properties": [ + { + "properties": { + "accessGroups": { + "type": "object", + "properties": { + "links": { + "type": "object", + "properties": { + "self": { + "type": "string", + "default": "/api/v2/ui/agents/relationships/accessGroups" + }, + "related": { + "type": "string", + "default": "/api/v2/ui/agents/accessGroups" + } + } + } + } + } + } + }, + { + "properties": { + "agentStats": { + "type": "object", + "properties": { + "links": { + "type": "object", + "properties": { + "self": { + "type": "string", + "default": "/api/v2/ui/agents/relationships/agentStats" + }, + "related": { + "type": "string", + "default": "/api/v2/ui/agents/agentStats" + } + } + } + } + } + } + } + ] + }, + "included": { + "type": "array", + "items": { + "type": "object", + "properties": [ + { + "properties": { + "id": { + "type": "integer" + }, + "type": { + "type": "string", + "default": "accessGroups" + }, + "attributes": { + "type": "object", + "properties": { + "accessGroupId": { + "type": "integer" + }, + "groupName": { + "type": "string" + } + } + } + } + }, + { + "properties": { + "id": { + "type": "integer" + }, + "type": { + "type": "string", + "default": "agentStats" + }, + "attributes": { + "type": "object", + "properties": { + "agentStatId": { + "type": "integer" + }, + "agentId": { + "type": "integer" + }, + "statType": { + "type": "integer" + }, + "time": { + "type": "integer", + "format": "int64" + }, + "value": { + "type": "array" + } + } + } + } + } + ] + } + } + } + }, + "AgentSingleResponse": { + "type": "object", + "properties": { + "id": { + "type": "integer" + }, + "type": { + "type": "string", + "default": "Agent" + }, + "data": { + "type": "object", + "properties": { + "agentName": { + "type": "string" + }, + "uid": { + "type": "string" + }, + "os": { + "type": "integer" + }, + "devices": { + "type": "string" + }, + "cmdPars": { + "type": "string" + }, + "ignoreErrors": { + "type": "integer", + "enum": [ + 0, + 1, + 2 + ] + }, + "isActive": { + "type": "boolean" + }, + "isTrusted": { + "type": "boolean" + }, + "token": { + "type": "string" + }, + "lastAct": { + "type": "string" + }, + "lastTime": { + "type": "integer", + "format": "int64" + }, + "lastIp": { + "type": "string" + }, + "userId": { + "type": "integer" + }, + "cpuOnly": { + "type": "boolean" + }, + "clientSignature": { + "type": "string" + } + } + }, + "relationships": { + "type": "object", + "properties": [ + { + "properties": { + "accessGroups": { + "type": "object", + "properties": { + "links": { + "type": "object", + "properties": { + "self": { + "type": "string", + "default": "/api/v2/ui/agents/relationships/accessGroups" + }, + "related": { + "type": "string", + "default": "/api/v2/ui/agents/accessGroups" + } + } + } + } + } + } + }, + { + "properties": { + "agentStats": { + "type": "object", + "properties": { + "links": { + "type": "object", + "properties": { + "self": { + "type": "string", + "default": "/api/v2/ui/agents/relationships/agentStats" + }, + "related": { + "type": "string", + "default": "/api/v2/ui/agents/agentStats" + } + } + } + } + } + } + } + ] + }, + "included": { + "type": "array", + "items": { + "type": "object", + "properties": [ + { + "properties": { + "id": { + "type": "integer" + }, + "type": { + "type": "string", + "default": "accessGroups" + }, + "attributes": { + "type": "object", + "properties": { + "accessGroupId": { + "type": "integer" + }, + "groupName": { + "type": "string" + } + } + } + } + }, + { + "properties": { + "id": { + "type": "integer" + }, + "type": { + "type": "string", + "default": "agentStats" + }, + "attributes": { + "type": "object", + "properties": { + "agentStatId": { + "type": "integer" + }, + "agentId": { + "type": "integer" + }, + "statType": { + "type": "integer" + }, + "time": { + "type": "integer", + "format": "int64" + }, + "value": { + "type": "array" + } + } + } + } + } + ] + } + } + } + }, + "AgentPostPatchResponse": { + "type": "object", + "properties": { + "jsonapi": { + "type": "object", + "properties": { + "version": { + "type": "string", + "default": "1.1" + }, + "ext": { + "type": "string", + "default": "https://jsonapi.org/profiles/ethanresnick/cursor-pagination" + } + } + }, + "id": { + "type": "integer" + }, + "type": { + "type": "string", + "default": "Agent" + }, + "data": { + "type": "object", + "properties": { + "agentName": { + "type": "string" + }, + "uid": { + "type": "string" + }, + "os": { + "type": "integer" + }, + "devices": { + "type": "string" + }, + "cmdPars": { + "type": "string" + }, + "ignoreErrors": { + "type": "integer", + "enum": [ + 0, + 1, + 2 + ] + }, + "isActive": { + "type": "boolean" + }, + "isTrusted": { + "type": "boolean" + }, + "token": { + "type": "string" + }, + "lastAct": { + "type": "string" + }, + "lastTime": { + "type": "integer", + "format": "int64" + }, + "lastIp": { + "type": "string" + }, + "userId": { + "type": "integer" + }, + "cpuOnly": { + "type": "boolean" + }, + "clientSignature": { + "type": "string" + } + } + } + } + }, + "AgentListResponse": { + "allOf": [ + { + "$ref": "#/components/schemas/ListResponse" + }, + { + "type": "object", + "properties": { + "values": { + "type": "array", + "items": { + "$ref": "#/components/schemas/AgentResponse" + } + } + } + } + ] + }, + "AgentStatCreate": { + "type": "object", + "properties": { + "data": { + "type": "object", + "properties": { + "type": { + "type": "string" + }, + "attributes": { + "type": "object", + "properties": { + "agentId": { + "type": "integer" + }, + "statType": { + "type": "integer" + }, + "time": { + "type": "integer", + "format": "int64" + }, + "value": { + "type": "array" + } + } + } + } + } + } + }, + "AgentStatPatch": { + "type": "object", + "properties": { + "data": { + "type": "object", + "properties": { + "type": { + "type": "string" + }, + "attributes": { + "type": "object", + "properties": [] + } + } + } + } + }, + "AgentStatResponse": { + "type": "object", + "properties": { + "jsonapi": { + "type": "object", + "properties": { + "version": { + "type": "string", + "default": "1.1" + }, + "ext": { + "type": "string", + "default": "https://jsonapi.org/profiles/ethanresnick/cursor-pagination" + } + } + }, + "links": { + "type": "object", + "properties": { + "self": { + "type": "string", + "default": "/api/v2/ui/agentstats?page[size]=25" + }, + "first": { + "type": "string", + "default": "/api/v2/ui/agentstats?page[size]=25&page[after]=0" + }, + "last": { + "type": "string", + "default": "/api/v2/ui/agentstats?page[size]=25&page[before]=500" + }, + "next": { + "type": "string", + "default": "/api/v2/ui/agentstats?page[size]=25&page[after]=25" + }, + "previous": { + "type": "string", + "default": "/api/v2/ui/agentstats?page[size]=25&page[before]=25" + } + } + }, + "id": { + "type": "integer" + }, + "type": { + "type": "string", + "default": "AgentStat" + }, + "data": { + "type": "object", + "properties": { + "agentId": { + "type": "integer" + }, + "statType": { + "type": "integer" + }, + "time": { + "type": "integer", + "format": "int64" + }, + "value": { + "type": "array" + } + } + }, + "relationships": { + "type": "object", + "properties": [] + }, + "included": { + "type": "array", + "items": { + "type": "object", + "properties": [] + } + } + } + }, + "AgentStatSingleResponse": { + "type": "object", + "properties": { + "id": { + "type": "integer" + }, + "type": { + "type": "string", + "default": "AgentStat" + }, + "data": { + "type": "object", + "properties": { + "agentId": { + "type": "integer" + }, + "statType": { + "type": "integer" + }, + "time": { + "type": "integer", + "format": "int64" + }, + "value": { + "type": "array" + } + } + }, + "relationships": { + "type": "object", + "properties": [] + }, + "included": { + "type": "array", + "items": { + "type": "object", + "properties": [] + } + } + } + }, + "AgentStatPostPatchResponse": { + "type": "object", + "properties": { + "jsonapi": { + "type": "object", + "properties": { + "version": { + "type": "string", + "default": "1.1" + }, + "ext": { + "type": "string", + "default": "https://jsonapi.org/profiles/ethanresnick/cursor-pagination" + } + } + }, + "id": { + "type": "integer" + }, + "type": { + "type": "string", + "default": "AgentStat" + }, + "data": { + "type": "object", + "properties": { + "agentId": { + "type": "integer" + }, + "statType": { + "type": "integer" + }, + "time": { + "type": "integer", + "format": "int64" + }, + "value": { + "type": "array" + } + } + } + } + }, + "AgentStatListResponse": { + "allOf": [ + { + "$ref": "#/components/schemas/ListResponse" + }, + { + "type": "object", + "properties": { + "values": { + "type": "array", + "items": { + "$ref": "#/components/schemas/AgentStatResponse" + } + } + } + } + ] + }, + "ChunkCreate": { + "type": "object", + "properties": { + "data": { + "type": "object", + "properties": { + "type": { + "type": "string" + }, + "attributes": { + "type": "object", + "properties": { + "taskId": { + "type": "integer" + }, + "skip": { + "type": "integer" + }, + "length": { + "type": "integer" + }, + "agentId": { + "type": "integer" + }, + "dispatchTime": { + "type": "integer", + "format": "int64" + }, + "solveTime": { + "type": "integer", + "format": "int64" + }, + "checkpoint": { + "type": "integer", + "format": "int64" + }, + "progress": { + "type": "integer" + }, + "state": { + "type": "integer" + }, + "cracked": { + "type": "integer" + }, + "speed": { + "type": "integer", + "format": "int64" + } + } + } + } + } + } + }, + "ChunkPatch": { + "type": "object", + "properties": { + "data": { + "type": "object", + "properties": { + "type": { + "type": "string" + }, + "attributes": { + "type": "object", + "properties": [] + } + } + } + } + }, + "ChunkResponse": { + "type": "object", + "properties": { + "jsonapi": { + "type": "object", + "properties": { + "version": { + "type": "string", + "default": "1.1" + }, + "ext": { + "type": "string", + "default": "https://jsonapi.org/profiles/ethanresnick/cursor-pagination" + } + } + }, + "links": { + "type": "object", + "properties": { + "self": { + "type": "string", + "default": "/api/v2/ui/chunks?page[size]=25" + }, + "first": { + "type": "string", + "default": "/api/v2/ui/chunks?page[size]=25&page[after]=0" + }, + "last": { + "type": "string", + "default": "/api/v2/ui/chunks?page[size]=25&page[before]=500" + }, + "next": { + "type": "string", + "default": "/api/v2/ui/chunks?page[size]=25&page[after]=25" + }, + "previous": { + "type": "string", + "default": "/api/v2/ui/chunks?page[size]=25&page[before]=25" + } + } + }, + "id": { + "type": "integer" + }, + "type": { + "type": "string", + "default": "Chunk" + }, + "data": { + "type": "object", + "properties": { + "taskId": { + "type": "integer" + }, + "skip": { + "type": "integer" + }, + "length": { + "type": "integer" + }, + "agentId": { + "type": "integer" + }, + "dispatchTime": { + "type": "integer", + "format": "int64" + }, + "solveTime": { + "type": "integer", + "format": "int64" + }, + "checkpoint": { + "type": "integer", + "format": "int64" + }, + "progress": { + "type": "integer" + }, + "state": { + "type": "integer" + }, + "cracked": { + "type": "integer" + }, + "speed": { + "type": "integer", + "format": "int64" + } + } + }, + "relationships": { + "type": "object", + "properties": [ + { + "properties": { + "agent": { + "type": "object", + "properties": { + "links": { + "type": "object", + "properties": { + "self": { + "type": "string", + "default": "/api/v2/ui/chunks/relationships/agent" + }, + "related": { + "type": "string", + "default": "/api/v2/ui/chunks/agent" + } + } + } + } + } + } + }, + { + "properties": { + "task": { + "type": "object", + "properties": { + "links": { + "type": "object", + "properties": { + "self": { + "type": "string", + "default": "/api/v2/ui/chunks/relationships/task" + }, + "related": { + "type": "string", + "default": "/api/v2/ui/chunks/task" + } + } + } + } + } + } + } + ] + }, + "included": { + "type": "array", + "items": { + "type": "object", + "properties": [ + { + "properties": { + "id": { + "type": "integer" + }, + "type": { + "type": "string", + "default": "agent" + }, + "attributes": { + "type": "object", + "properties": { + "agentId": { + "type": "integer" + }, + "agentName": { + "type": "string" + }, + "uid": { + "type": "string" + }, + "os": { + "type": "integer" + }, + "devices": { + "type": "string" + }, + "cmdPars": { + "type": "string" + }, + "ignoreErrors": { + "type": "integer", + "enum": [ + 0, + 1, + 2 + ] + }, + "isActive": { + "type": "boolean" + }, + "isTrusted": { + "type": "boolean" + }, + "token": { + "type": "string" + }, + "lastAct": { + "type": "string" + }, + "lastTime": { + "type": "integer", + "format": "int64" + }, + "lastIp": { + "type": "string" + }, + "userId": { + "type": "integer" + }, + "cpuOnly": { + "type": "boolean" + }, + "clientSignature": { + "type": "string" + } + } + } + } + }, + { + "properties": { + "id": { + "type": "integer" + }, + "type": { + "type": "string", + "default": "task" + }, + "attributes": { + "type": "object", + "properties": { + "hashlistId": { + "type": "integer" + }, + "files": { + "type": "array" + }, + "taskId": { + "type": "integer" + }, + "taskName": { + "type": "string" + }, + "attackCmd": { + "type": "string" + }, + "chunkTime": { + "type": "integer" + }, + "statusTimer": { + "type": "integer" + }, + "keyspace": { + "type": "integer", + "format": "int64" + }, + "keyspaceProgress": { + "type": "integer", + "format": "int64" + }, + "priority": { + "type": "integer" + }, + "maxAgents": { + "type": "integer" + }, + "color": { + "type": "string" + }, + "isSmall": { + "type": "boolean" + }, + "isCpuTask": { + "type": "boolean" + }, + "useNewBench": { + "type": "boolean" + }, + "skipKeyspace": { + "type": "integer", + "format": "int64" + }, + "crackerBinaryId": { + "type": "integer" + }, + "crackerBinaryTypeId": { + "type": "integer" + }, + "taskWrapperId": { + "type": "integer" + }, + "isArchived": { + "type": "boolean" + }, + "notes": { + "type": "string" + }, + "staticChunks": { + "type": "integer" + }, + "chunkSize": { + "type": "integer", + "format": "int64" + }, + "forcePipe": { + "type": "boolean" + }, + "preprocessorId": { + "type": "integer" + }, + "preprocessorCommand": { + "type": "string" + } + } + } + } + } + ] + } + } + } + }, + "ChunkSingleResponse": { + "type": "object", + "properties": { + "id": { + "type": "integer" + }, + "type": { + "type": "string", + "default": "Chunk" + }, + "data": { + "type": "object", + "properties": { + "taskId": { + "type": "integer" + }, + "skip": { + "type": "integer" + }, + "length": { + "type": "integer" + }, + "agentId": { + "type": "integer" + }, + "dispatchTime": { + "type": "integer", + "format": "int64" + }, + "solveTime": { + "type": "integer", + "format": "int64" + }, + "checkpoint": { + "type": "integer", + "format": "int64" + }, + "progress": { + "type": "integer" + }, + "state": { + "type": "integer" + }, + "cracked": { + "type": "integer" + }, + "speed": { + "type": "integer", + "format": "int64" + } + } + }, + "relationships": { + "type": "object", + "properties": [ + { + "properties": { + "agent": { + "type": "object", + "properties": { + "links": { + "type": "object", + "properties": { + "self": { + "type": "string", + "default": "/api/v2/ui/chunks/relationships/agent" + }, + "related": { + "type": "string", + "default": "/api/v2/ui/chunks/agent" + } + } + } + } + } + } + }, + { + "properties": { + "task": { + "type": "object", + "properties": { + "links": { + "type": "object", + "properties": { + "self": { + "type": "string", + "default": "/api/v2/ui/chunks/relationships/task" + }, + "related": { + "type": "string", + "default": "/api/v2/ui/chunks/task" + } + } + } + } + } + } + } + ] + }, + "included": { + "type": "array", + "items": { + "type": "object", + "properties": [ + { + "properties": { + "id": { + "type": "integer" + }, + "type": { + "type": "string", + "default": "agent" + }, + "attributes": { + "type": "object", + "properties": { + "agentId": { + "type": "integer" + }, + "agentName": { + "type": "string" + }, + "uid": { + "type": "string" + }, + "os": { + "type": "integer" + }, + "devices": { + "type": "string" + }, + "cmdPars": { + "type": "string" + }, + "ignoreErrors": { + "type": "integer", + "enum": [ + 0, + 1, + 2 + ] + }, + "isActive": { + "type": "boolean" + }, + "isTrusted": { + "type": "boolean" + }, + "token": { + "type": "string" + }, + "lastAct": { + "type": "string" + }, + "lastTime": { + "type": "integer", + "format": "int64" + }, + "lastIp": { + "type": "string" + }, + "userId": { + "type": "integer" + }, + "cpuOnly": { + "type": "boolean" + }, + "clientSignature": { + "type": "string" + } + } + } + } + }, + { + "properties": { + "id": { + "type": "integer" + }, + "type": { + "type": "string", + "default": "task" + }, + "attributes": { + "type": "object", + "properties": { + "hashlistId": { + "type": "integer" + }, + "files": { + "type": "array" + }, + "taskId": { + "type": "integer" + }, + "taskName": { + "type": "string" + }, + "attackCmd": { + "type": "string" + }, + "chunkTime": { + "type": "integer" + }, + "statusTimer": { + "type": "integer" + }, + "keyspace": { + "type": "integer", + "format": "int64" + }, + "keyspaceProgress": { + "type": "integer", + "format": "int64" + }, + "priority": { + "type": "integer" + }, + "maxAgents": { + "type": "integer" + }, + "color": { + "type": "string" + }, + "isSmall": { + "type": "boolean" + }, + "isCpuTask": { + "type": "boolean" + }, + "useNewBench": { + "type": "boolean" + }, + "skipKeyspace": { + "type": "integer", + "format": "int64" + }, + "crackerBinaryId": { + "type": "integer" + }, + "crackerBinaryTypeId": { + "type": "integer" + }, + "taskWrapperId": { + "type": "integer" + }, + "isArchived": { + "type": "boolean" + }, + "notes": { + "type": "string" + }, + "staticChunks": { + "type": "integer" + }, + "chunkSize": { + "type": "integer", + "format": "int64" + }, + "forcePipe": { + "type": "boolean" + }, + "preprocessorId": { + "type": "integer" + }, + "preprocessorCommand": { + "type": "string" + } + } + } + } + } + ] + } + } + } + }, + "ChunkPostPatchResponse": { + "type": "object", + "properties": { + "jsonapi": { + "type": "object", + "properties": { + "version": { + "type": "string", + "default": "1.1" + }, + "ext": { + "type": "string", + "default": "https://jsonapi.org/profiles/ethanresnick/cursor-pagination" + } + } + }, + "id": { + "type": "integer" + }, + "type": { + "type": "string", + "default": "Chunk" + }, + "data": { + "type": "object", + "properties": { + "taskId": { + "type": "integer" + }, + "skip": { + "type": "integer" + }, + "length": { + "type": "integer" + }, + "agentId": { + "type": "integer" + }, + "dispatchTime": { + "type": "integer", + "format": "int64" + }, + "solveTime": { + "type": "integer", + "format": "int64" + }, + "checkpoint": { + "type": "integer", + "format": "int64" + }, + "progress": { + "type": "integer" + }, + "state": { + "type": "integer" + }, + "cracked": { + "type": "integer" + }, + "speed": { + "type": "integer", + "format": "int64" + } + } + } + } + }, + "ChunkListResponse": { + "allOf": [ + { + "$ref": "#/components/schemas/ListResponse" + }, + { + "type": "object", + "properties": { + "values": { + "type": "array", + "items": { + "$ref": "#/components/schemas/ChunkResponse" + } + } + } + } + ] + }, + "ConfigCreate": { + "type": "object", + "properties": { + "data": { + "type": "object", + "properties": { + "type": { + "type": "string" + }, + "attributes": { + "type": "object", + "properties": { + "configSectionId": { + "type": "integer" + }, + "item": { + "type": "string" + }, + "value": { + "type": "string" + } + } + } + } + } + } + }, + "ConfigPatch": { + "type": "object", + "properties": { + "data": { + "type": "object", + "properties": { + "type": { + "type": "string" + }, + "attributes": { + "type": "object", + "properties": { + "configSectionId": { + "type": "integer" + }, + "item": { + "type": "string" + }, + "value": { + "type": "string" + } + } + } + } + } + } + }, + "ConfigResponse": { + "type": "object", + "properties": { + "jsonapi": { + "type": "object", + "properties": { + "version": { + "type": "string", + "default": "1.1" + }, + "ext": { + "type": "string", + "default": "https://jsonapi.org/profiles/ethanresnick/cursor-pagination" + } + } + }, + "links": { + "type": "object", + "properties": { + "self": { + "type": "string", + "default": "/api/v2/ui/configs?page[size]=25" + }, + "first": { + "type": "string", + "default": "/api/v2/ui/configs?page[size]=25&page[after]=0" + }, + "last": { + "type": "string", + "default": "/api/v2/ui/configs?page[size]=25&page[before]=500" + }, + "next": { + "type": "string", + "default": "/api/v2/ui/configs?page[size]=25&page[after]=25" + }, + "previous": { + "type": "string", + "default": "/api/v2/ui/configs?page[size]=25&page[before]=25" + } + } + }, + "id": { + "type": "integer" + }, + "type": { + "type": "string", + "default": "Config" + }, + "data": { + "type": "object", + "properties": { + "configSectionId": { + "type": "integer" + }, + "item": { + "type": "string" + }, + "value": { + "type": "string" + } + } + }, + "relationships": { + "type": "object", + "properties": [ + { + "properties": { + "configSection": { + "type": "object", + "properties": { + "links": { + "type": "object", + "properties": { + "self": { + "type": "string", + "default": "/api/v2/ui/configs/relationships/configSection" + }, + "related": { + "type": "string", + "default": "/api/v2/ui/configs/configSection" + } + } + } + } + } + } + } + ] + }, + "included": { + "type": "array", + "items": { + "type": "object", + "properties": [ + { + "properties": { + "id": { + "type": "integer" + }, + "type": { + "type": "string", + "default": "configSection" + }, + "attributes": { + "type": "object", + "properties": { + "configSectionId": { + "type": "integer" + }, + "sectionName": { + "type": "string" + } + } + } + } + } + ] + } + } + } + }, + "ConfigSingleResponse": { + "type": "object", + "properties": { + "id": { + "type": "integer" + }, + "type": { + "type": "string", + "default": "Config" + }, + "data": { + "type": "object", + "properties": { + "configSectionId": { + "type": "integer" + }, + "item": { + "type": "string" + }, + "value": { + "type": "string" + } + } + }, + "relationships": { + "type": "object", + "properties": [ + { + "properties": { + "configSection": { + "type": "object", + "properties": { + "links": { + "type": "object", + "properties": { + "self": { + "type": "string", + "default": "/api/v2/ui/configs/relationships/configSection" + }, + "related": { + "type": "string", + "default": "/api/v2/ui/configs/configSection" + } + } + } + } + } + } + } + ] + }, + "included": { + "type": "array", + "items": { + "type": "object", + "properties": [ + { + "properties": { + "id": { + "type": "integer" + }, + "type": { + "type": "string", + "default": "configSection" + }, + "attributes": { + "type": "object", + "properties": { + "configSectionId": { + "type": "integer" + }, + "sectionName": { + "type": "string" + } + } + } + } + } + ] + } + } + } + }, + "ConfigPostPatchResponse": { + "type": "object", + "properties": { + "jsonapi": { + "type": "object", + "properties": { + "version": { + "type": "string", + "default": "1.1" + }, + "ext": { + "type": "string", + "default": "https://jsonapi.org/profiles/ethanresnick/cursor-pagination" + } + } + }, + "id": { + "type": "integer" + }, + "type": { + "type": "string", + "default": "Config" + }, + "data": { + "type": "object", + "properties": { + "configSectionId": { + "type": "integer" + }, + "item": { + "type": "string" + }, + "value": { + "type": "string" + } + } + } + } + }, + "ConfigListResponse": { + "allOf": [ + { + "$ref": "#/components/schemas/ListResponse" + }, + { + "type": "object", + "properties": { + "values": { + "type": "array", + "items": { + "$ref": "#/components/schemas/ConfigResponse" + } + } + } + } + ] + }, + "ConfigSectionCreate": { + "type": "object", + "properties": { + "data": { + "type": "object", + "properties": { + "type": { + "type": "string" + }, + "attributes": { + "type": "object", + "properties": { + "sectionName": { + "type": "string" + } + } + } + } + } + } + }, + "ConfigSectionPatch": { + "type": "object", + "properties": { + "data": { + "type": "object", + "properties": { + "type": { + "type": "string" + }, + "attributes": { + "type": "object", + "properties": { + "sectionName": { + "type": "string" + } + } + } + } + } + } + }, + "ConfigSectionResponse": { + "type": "object", + "properties": { + "jsonapi": { + "type": "object", + "properties": { + "version": { + "type": "string", + "default": "1.1" + }, + "ext": { + "type": "string", + "default": "https://jsonapi.org/profiles/ethanresnick/cursor-pagination" + } + } + }, + "links": { + "type": "object", + "properties": { + "self": { + "type": "string", + "default": "/api/v2/ui/configsections?page[size]=25" + }, + "first": { + "type": "string", + "default": "/api/v2/ui/configsections?page[size]=25&page[after]=0" + }, + "last": { + "type": "string", + "default": "/api/v2/ui/configsections?page[size]=25&page[before]=500" + }, + "next": { + "type": "string", + "default": "/api/v2/ui/configsections?page[size]=25&page[after]=25" + }, + "previous": { + "type": "string", + "default": "/api/v2/ui/configsections?page[size]=25&page[before]=25" + } + } + }, + "id": { + "type": "integer" + }, + "type": { + "type": "string", + "default": "ConfigSection" + }, + "data": { + "type": "object", + "properties": { + "sectionName": { + "type": "string" + } + } + }, + "relationships": { + "type": "object", + "properties": [] + }, + "included": { + "type": "array", + "items": { + "type": "object", + "properties": [] + } + } + } + }, + "ConfigSectionSingleResponse": { + "type": "object", + "properties": { + "id": { + "type": "integer" + }, + "type": { + "type": "string", + "default": "ConfigSection" + }, + "data": { + "type": "object", + "properties": { + "sectionName": { + "type": "string" + } + } + }, + "relationships": { + "type": "object", + "properties": [] + }, + "included": { + "type": "array", + "items": { + "type": "object", + "properties": [] + } + } + } + }, + "ConfigSectionPostPatchResponse": { + "type": "object", + "properties": { + "jsonapi": { + "type": "object", + "properties": { + "version": { + "type": "string", + "default": "1.1" + }, + "ext": { + "type": "string", + "default": "https://jsonapi.org/profiles/ethanresnick/cursor-pagination" + } + } + }, + "id": { + "type": "integer" + }, + "type": { + "type": "string", + "default": "ConfigSection" + }, + "data": { + "type": "object", + "properties": { + "sectionName": { + "type": "string" + } + } + } + } + }, + "ConfigSectionListResponse": { + "allOf": [ + { + "$ref": "#/components/schemas/ListResponse" + }, + { + "type": "object", + "properties": { + "values": { + "type": "array", + "items": { + "$ref": "#/components/schemas/ConfigSectionResponse" + } + } + } + } + ] + }, + "CrackerBinaryCreate": { + "type": "object", + "properties": { + "data": { + "type": "object", + "properties": { + "type": { + "type": "string" + }, + "attributes": { + "type": "object", + "properties": { + "crackerBinaryTypeId": { + "type": "integer" + }, + "version": { + "type": "string" + }, + "downloadUrl": { + "type": "string" + }, + "binaryName": { + "type": "string" + } + } + } + } + } + } + }, + "CrackerBinaryPatch": { + "type": "object", + "properties": { + "data": { + "type": "object", + "properties": { + "type": { + "type": "string" + }, + "attributes": { + "type": "object", + "properties": { + "binaryName": { + "type": "string" + }, + "crackerBinaryTypeId": { + "type": "integer" + }, + "downloadUrl": { + "type": "string" + }, + "version": { + "type": "string" + } + } + } + } + } + } + }, + "CrackerBinaryResponse": { + "type": "object", + "properties": { + "jsonapi": { + "type": "object", + "properties": { + "version": { + "type": "string", + "default": "1.1" + }, + "ext": { + "type": "string", + "default": "https://jsonapi.org/profiles/ethanresnick/cursor-pagination" + } + } + }, + "links": { + "type": "object", + "properties": { + "self": { + "type": "string", + "default": "/api/v2/ui/crackers?page[size]=25" + }, + "first": { + "type": "string", + "default": "/api/v2/ui/crackers?page[size]=25&page[after]=0" + }, + "last": { + "type": "string", + "default": "/api/v2/ui/crackers?page[size]=25&page[before]=500" + }, + "next": { + "type": "string", + "default": "/api/v2/ui/crackers?page[size]=25&page[after]=25" + }, + "previous": { + "type": "string", + "default": "/api/v2/ui/crackers?page[size]=25&page[before]=25" + } + } + }, + "id": { + "type": "integer" + }, + "type": { + "type": "string", + "default": "CrackerBinary" + }, + "data": { + "type": "object", + "properties": { + "crackerBinaryTypeId": { + "type": "integer" + }, + "version": { + "type": "string" + }, + "downloadUrl": { + "type": "string" + }, + "binaryName": { + "type": "string" + } + } + }, + "relationships": { + "type": "object", + "properties": [ + { + "properties": { + "crackerBinaryType": { + "type": "object", + "properties": { + "links": { + "type": "object", + "properties": { + "self": { + "type": "string", + "default": "/api/v2/ui/crackers/relationships/crackerBinaryType" + }, + "related": { + "type": "string", + "default": "/api/v2/ui/crackers/crackerBinaryType" + } + } + } + } + } + } + }, + { + "properties": { + "tasks": { + "type": "object", + "properties": { + "links": { + "type": "object", + "properties": { + "self": { + "type": "string", + "default": "/api/v2/ui/crackers/relationships/tasks" + }, + "related": { + "type": "string", + "default": "/api/v2/ui/crackers/tasks" + } + } + } + } + } + } + } + ] + }, + "included": { + "type": "array", + "items": { + "type": "object", + "properties": [ + { + "properties": { + "id": { + "type": "integer" + }, + "type": { + "type": "string", + "default": "crackerBinaryType" + }, + "attributes": { + "type": "object", + "properties": { + "crackerBinaryTypeId": { + "type": "integer" + }, + "typeName": { + "type": "string" + }, + "isChunkingAvailable": { + "type": "boolean" + } + } + } + } + }, + { + "properties": { + "id": { + "type": "integer" + }, + "type": { + "type": "string", + "default": "tasks" + }, + "attributes": { + "type": "object", + "properties": { + "hashlistId": { + "type": "integer" + }, + "files": { + "type": "array" + }, + "taskId": { + "type": "integer" + }, + "taskName": { + "type": "string" + }, + "attackCmd": { + "type": "string" + }, + "chunkTime": { + "type": "integer" + }, + "statusTimer": { + "type": "integer" + }, + "keyspace": { + "type": "integer", + "format": "int64" + }, + "keyspaceProgress": { + "type": "integer", + "format": "int64" + }, + "priority": { + "type": "integer" + }, + "maxAgents": { + "type": "integer" + }, + "color": { + "type": "string" + }, + "isSmall": { + "type": "boolean" + }, + "isCpuTask": { + "type": "boolean" + }, + "useNewBench": { + "type": "boolean" + }, + "skipKeyspace": { + "type": "integer", + "format": "int64" + }, + "crackerBinaryId": { + "type": "integer" + }, + "crackerBinaryTypeId": { + "type": "integer" + }, + "taskWrapperId": { + "type": "integer" + }, + "isArchived": { + "type": "boolean" + }, + "notes": { + "type": "string" + }, + "staticChunks": { + "type": "integer" + }, + "chunkSize": { + "type": "integer", + "format": "int64" + }, + "forcePipe": { + "type": "boolean" + }, + "preprocessorId": { + "type": "integer" + }, + "preprocessorCommand": { + "type": "string" + } + } + } + } + } + ] + } + } + } + }, + "CrackerBinarySingleResponse": { + "type": "object", + "properties": { + "id": { + "type": "integer" + }, + "type": { + "type": "string", + "default": "CrackerBinary" + }, + "data": { + "type": "object", + "properties": { + "crackerBinaryTypeId": { + "type": "integer" + }, + "version": { + "type": "string" + }, + "downloadUrl": { + "type": "string" + }, + "binaryName": { + "type": "string" + } + } + }, + "relationships": { + "type": "object", + "properties": [ + { + "properties": { + "crackerBinaryType": { + "type": "object", + "properties": { + "links": { + "type": "object", + "properties": { + "self": { + "type": "string", + "default": "/api/v2/ui/crackers/relationships/crackerBinaryType" + }, + "related": { + "type": "string", + "default": "/api/v2/ui/crackers/crackerBinaryType" + } + } + } + } + } + } + }, + { + "properties": { + "tasks": { + "type": "object", + "properties": { + "links": { + "type": "object", + "properties": { + "self": { + "type": "string", + "default": "/api/v2/ui/crackers/relationships/tasks" + }, + "related": { + "type": "string", + "default": "/api/v2/ui/crackers/tasks" + } + } + } + } + } + } + } + ] + }, + "included": { + "type": "array", + "items": { + "type": "object", + "properties": [ + { + "properties": { + "id": { + "type": "integer" + }, + "type": { + "type": "string", + "default": "crackerBinaryType" + }, + "attributes": { + "type": "object", + "properties": { + "crackerBinaryTypeId": { + "type": "integer" + }, + "typeName": { + "type": "string" + }, + "isChunkingAvailable": { + "type": "boolean" + } + } + } + } + }, + { + "properties": { + "id": { + "type": "integer" + }, + "type": { + "type": "string", + "default": "tasks" + }, + "attributes": { + "type": "object", + "properties": { + "hashlistId": { + "type": "integer" + }, + "files": { + "type": "array" + }, + "taskId": { + "type": "integer" + }, + "taskName": { + "type": "string" + }, + "attackCmd": { + "type": "string" + }, + "chunkTime": { + "type": "integer" + }, + "statusTimer": { + "type": "integer" + }, + "keyspace": { + "type": "integer", + "format": "int64" + }, + "keyspaceProgress": { + "type": "integer", + "format": "int64" + }, + "priority": { + "type": "integer" + }, + "maxAgents": { + "type": "integer" + }, + "color": { + "type": "string" + }, + "isSmall": { + "type": "boolean" + }, + "isCpuTask": { + "type": "boolean" + }, + "useNewBench": { + "type": "boolean" + }, + "skipKeyspace": { + "type": "integer", + "format": "int64" + }, + "crackerBinaryId": { + "type": "integer" + }, + "crackerBinaryTypeId": { + "type": "integer" + }, + "taskWrapperId": { + "type": "integer" + }, + "isArchived": { + "type": "boolean" + }, + "notes": { + "type": "string" + }, + "staticChunks": { + "type": "integer" + }, + "chunkSize": { + "type": "integer", + "format": "int64" + }, + "forcePipe": { + "type": "boolean" + }, + "preprocessorId": { + "type": "integer" + }, + "preprocessorCommand": { + "type": "string" + } + } + } + } + } + ] + } + } + } + }, + "CrackerBinaryPostPatchResponse": { + "type": "object", + "properties": { + "jsonapi": { + "type": "object", + "properties": { + "version": { + "type": "string", + "default": "1.1" + }, + "ext": { + "type": "string", + "default": "https://jsonapi.org/profiles/ethanresnick/cursor-pagination" + } + } + }, + "id": { + "type": "integer" + }, + "type": { + "type": "string", + "default": "CrackerBinary" + }, + "data": { + "type": "object", + "properties": { + "crackerBinaryTypeId": { + "type": "integer" + }, + "version": { + "type": "string" + }, + "downloadUrl": { + "type": "string" + }, + "binaryName": { + "type": "string" + } + } + } + } + }, + "CrackerBinaryListResponse": { + "allOf": [ + { + "$ref": "#/components/schemas/ListResponse" + }, + { + "type": "object", + "properties": { + "values": { + "type": "array", + "items": { + "$ref": "#/components/schemas/CrackerBinaryResponse" + } + } + } + } + ] + }, + "CrackerBinaryTypeCreate": { + "type": "object", + "properties": { + "data": { + "type": "object", + "properties": { + "type": { + "type": "string" + }, + "attributes": { + "type": "object", + "properties": { + "typeName": { + "type": "string" + }, + "isChunkingAvailable": { + "type": "boolean" + } + } + } + } + } + } + }, + "CrackerBinaryTypePatch": { + "type": "object", + "properties": { + "data": { + "type": "object", + "properties": { + "type": { + "type": "string" + }, + "attributes": { + "type": "object", + "properties": { + "isChunkingAvailable": { + "type": "boolean" + }, + "typeName": { + "type": "string" + } + } + } + } + } + } + }, + "CrackerBinaryTypeResponse": { + "type": "object", + "properties": { + "jsonapi": { + "type": "object", + "properties": { + "version": { + "type": "string", + "default": "1.1" + }, + "ext": { + "type": "string", + "default": "https://jsonapi.org/profiles/ethanresnick/cursor-pagination" + } + } + }, + "links": { + "type": "object", + "properties": { + "self": { + "type": "string", + "default": "/api/v2/ui/crackertypes?page[size]=25" + }, + "first": { + "type": "string", + "default": "/api/v2/ui/crackertypes?page[size]=25&page[after]=0" + }, + "last": { + "type": "string", + "default": "/api/v2/ui/crackertypes?page[size]=25&page[before]=500" + }, + "next": { + "type": "string", + "default": "/api/v2/ui/crackertypes?page[size]=25&page[after]=25" + }, + "previous": { + "type": "string", + "default": "/api/v2/ui/crackertypes?page[size]=25&page[before]=25" + } + } + }, + "id": { + "type": "integer" + }, + "type": { + "type": "string", + "default": "CrackerBinaryType" + }, + "data": { + "type": "object", + "properties": { + "typeName": { + "type": "string" + }, + "isChunkingAvailable": { + "type": "boolean" + } + } + }, + "relationships": { + "type": "object", + "properties": [ + { + "properties": { + "crackerVersions": { + "type": "object", + "properties": { + "links": { + "type": "object", + "properties": { + "self": { + "type": "string", + "default": "/api/v2/ui/crackertypes/relationships/crackerVersions" + }, + "related": { + "type": "string", + "default": "/api/v2/ui/crackertypes/crackerVersions" + } + } + } + } + } + } + }, + { + "properties": { + "tasks": { + "type": "object", + "properties": { + "links": { + "type": "object", + "properties": { + "self": { + "type": "string", + "default": "/api/v2/ui/crackertypes/relationships/tasks" + }, + "related": { + "type": "string", + "default": "/api/v2/ui/crackertypes/tasks" + } + } + } + } + } + } + } + ] + }, + "included": { + "type": "array", + "items": { + "type": "object", + "properties": [ + { + "properties": { + "id": { + "type": "integer" + }, + "type": { + "type": "string", + "default": "crackerVersions" + }, + "attributes": { + "type": "object", + "properties": { + "crackerBinaryId": { + "type": "integer" + }, + "crackerBinaryTypeId": { + "type": "integer" + }, + "version": { + "type": "string" + }, + "downloadUrl": { + "type": "string" + }, + "binaryName": { + "type": "string" + } + } + } + } + }, + { + "properties": { + "id": { + "type": "integer" + }, + "type": { + "type": "string", + "default": "tasks" + }, + "attributes": { + "type": "object", + "properties": { + "hashlistId": { + "type": "integer" + }, + "files": { + "type": "array" + }, + "taskId": { + "type": "integer" + }, + "taskName": { + "type": "string" + }, + "attackCmd": { + "type": "string" + }, + "chunkTime": { + "type": "integer" + }, + "statusTimer": { + "type": "integer" + }, + "keyspace": { + "type": "integer", + "format": "int64" + }, + "keyspaceProgress": { + "type": "integer", + "format": "int64" + }, + "priority": { + "type": "integer" + }, + "maxAgents": { + "type": "integer" + }, + "color": { + "type": "string" + }, + "isSmall": { + "type": "boolean" + }, + "isCpuTask": { + "type": "boolean" + }, + "useNewBench": { + "type": "boolean" + }, + "skipKeyspace": { + "type": "integer", + "format": "int64" + }, + "crackerBinaryId": { + "type": "integer" + }, + "crackerBinaryTypeId": { + "type": "integer" + }, + "taskWrapperId": { + "type": "integer" + }, + "isArchived": { + "type": "boolean" + }, + "notes": { + "type": "string" + }, + "staticChunks": { + "type": "integer" + }, + "chunkSize": { + "type": "integer", + "format": "int64" + }, + "forcePipe": { + "type": "boolean" + }, + "preprocessorId": { + "type": "integer" + }, + "preprocessorCommand": { + "type": "string" + } + } + } + } + } + ] + } + } + } + }, + "CrackerBinaryTypeSingleResponse": { + "type": "object", + "properties": { + "id": { + "type": "integer" + }, + "type": { + "type": "string", + "default": "CrackerBinaryType" + }, + "data": { + "type": "object", + "properties": { + "typeName": { + "type": "string" + }, + "isChunkingAvailable": { + "type": "boolean" + } + } + }, + "relationships": { + "type": "object", + "properties": [ + { + "properties": { + "crackerVersions": { + "type": "object", + "properties": { + "links": { + "type": "object", + "properties": { + "self": { + "type": "string", + "default": "/api/v2/ui/crackertypes/relationships/crackerVersions" + }, + "related": { + "type": "string", + "default": "/api/v2/ui/crackertypes/crackerVersions" + } + } + } + } + } + } + }, + { + "properties": { + "tasks": { + "type": "object", + "properties": { + "links": { + "type": "object", + "properties": { + "self": { + "type": "string", + "default": "/api/v2/ui/crackertypes/relationships/tasks" + }, + "related": { + "type": "string", + "default": "/api/v2/ui/crackertypes/tasks" + } + } + } + } + } + } + } + ] + }, + "included": { + "type": "array", + "items": { + "type": "object", + "properties": [ + { + "properties": { + "id": { + "type": "integer" + }, + "type": { + "type": "string", + "default": "crackerVersions" + }, + "attributes": { + "type": "object", + "properties": { + "crackerBinaryId": { + "type": "integer" + }, + "crackerBinaryTypeId": { + "type": "integer" + }, + "version": { + "type": "string" + }, + "downloadUrl": { + "type": "string" + }, + "binaryName": { + "type": "string" + } + } + } + } + }, + { + "properties": { + "id": { + "type": "integer" + }, + "type": { + "type": "string", + "default": "tasks" + }, + "attributes": { + "type": "object", + "properties": { + "hashlistId": { + "type": "integer" + }, + "files": { + "type": "array" + }, + "taskId": { + "type": "integer" + }, + "taskName": { + "type": "string" + }, + "attackCmd": { + "type": "string" + }, + "chunkTime": { + "type": "integer" + }, + "statusTimer": { + "type": "integer" + }, + "keyspace": { + "type": "integer", + "format": "int64" + }, + "keyspaceProgress": { + "type": "integer", + "format": "int64" + }, + "priority": { + "type": "integer" + }, + "maxAgents": { + "type": "integer" + }, + "color": { + "type": "string" + }, + "isSmall": { + "type": "boolean" + }, + "isCpuTask": { + "type": "boolean" + }, + "useNewBench": { + "type": "boolean" + }, + "skipKeyspace": { + "type": "integer", + "format": "int64" + }, + "crackerBinaryId": { + "type": "integer" + }, + "crackerBinaryTypeId": { + "type": "integer" + }, + "taskWrapperId": { + "type": "integer" + }, + "isArchived": { + "type": "boolean" + }, + "notes": { + "type": "string" + }, + "staticChunks": { + "type": "integer" + }, + "chunkSize": { + "type": "integer", + "format": "int64" + }, + "forcePipe": { + "type": "boolean" + }, + "preprocessorId": { + "type": "integer" + }, + "preprocessorCommand": { + "type": "string" + } + } + } + } + } + ] + } + } + } + }, + "CrackerBinaryTypePostPatchResponse": { + "type": "object", + "properties": { + "jsonapi": { + "type": "object", + "properties": { + "version": { + "type": "string", + "default": "1.1" + }, + "ext": { + "type": "string", + "default": "https://jsonapi.org/profiles/ethanresnick/cursor-pagination" + } + } + }, + "id": { + "type": "integer" + }, + "type": { + "type": "string", + "default": "CrackerBinaryType" + }, + "data": { + "type": "object", + "properties": { + "typeName": { + "type": "string" + }, + "isChunkingAvailable": { + "type": "boolean" + } + } + } + } + }, + "CrackerBinaryTypeListResponse": { + "allOf": [ + { + "$ref": "#/components/schemas/ListResponse" + }, + { + "type": "object", + "properties": { + "values": { + "type": "array", + "items": { + "$ref": "#/components/schemas/CrackerBinaryTypeResponse" + } + } + } + } + ] + }, + "FileCreate": { + "type": "object", + "properties": { + "data": { + "type": "object", + "properties": { + "type": { + "type": "string" + }, + "attributes": { + "type": "object", + "properties": { + "sourceType": { + "type": "string" + }, + "sourceData": { + "type": "string" + }, + "filename": { + "type": "string" + }, + "size": { + "type": "integer", + "format": "int64" + }, + "isSecret": { + "type": "boolean" + }, + "fileType": { + "type": "integer" + }, + "accessGroupId": { + "type": "integer" + }, + "lineCount": { + "type": "integer", + "format": "int64" + } + } + } + } + } + } + }, + "FilePatch": { + "type": "object", + "properties": { + "data": { + "type": "object", + "properties": { + "type": { + "type": "string" + }, + "attributes": { + "type": "object", + "properties": { + "accessGroupId": { + "type": "integer" + }, + "fileType": { + "type": "integer" + }, + "filename": { + "type": "string" + }, + "isSecret": { + "type": "boolean" + } + } + } + } + } + } + }, + "FileResponse": { + "type": "object", + "properties": { + "jsonapi": { + "type": "object", + "properties": { + "version": { + "type": "string", + "default": "1.1" + }, + "ext": { + "type": "string", + "default": "https://jsonapi.org/profiles/ethanresnick/cursor-pagination" + } + } + }, + "links": { + "type": "object", + "properties": { + "self": { + "type": "string", + "default": "/api/v2/ui/files?page[size]=25" + }, + "first": { + "type": "string", + "default": "/api/v2/ui/files?page[size]=25&page[after]=0" + }, + "last": { + "type": "string", + "default": "/api/v2/ui/files?page[size]=25&page[before]=500" + }, + "next": { + "type": "string", + "default": "/api/v2/ui/files?page[size]=25&page[after]=25" + }, + "previous": { + "type": "string", + "default": "/api/v2/ui/files?page[size]=25&page[before]=25" + } + } + }, + "id": { + "type": "integer" + }, + "type": { + "type": "string", + "default": "File" + }, + "data": { + "type": "object", + "properties": { + "filename": { + "type": "string" + }, + "size": { + "type": "integer", + "format": "int64" + }, + "isSecret": { + "type": "boolean" + }, + "fileType": { + "type": "integer" + }, + "accessGroupId": { + "type": "integer" + }, + "lineCount": { + "type": "integer", + "format": "int64" + } + } + }, + "relationships": { + "type": "object", + "properties": [ + { + "properties": { + "accessGroup": { + "type": "object", + "properties": { + "links": { + "type": "object", + "properties": { + "self": { + "type": "string", + "default": "/api/v2/ui/files/relationships/accessGroup" + }, + "related": { + "type": "string", + "default": "/api/v2/ui/files/accessGroup" + } + } + } + } + } + } + } + ] + }, + "included": { + "type": "array", + "items": { + "type": "object", + "properties": [ + { + "properties": { + "id": { + "type": "integer" + }, + "type": { + "type": "string", + "default": "accessGroup" + }, + "attributes": { + "type": "object", + "properties": { + "accessGroupId": { + "type": "integer" + }, + "groupName": { + "type": "string" + } + } + } + } + } + ] + } + } + } + }, + "FileSingleResponse": { + "type": "object", + "properties": { + "id": { + "type": "integer" + }, + "type": { + "type": "string", + "default": "File" + }, + "data": { + "type": "object", + "properties": { + "filename": { + "type": "string" + }, + "size": { + "type": "integer", + "format": "int64" + }, + "isSecret": { + "type": "boolean" + }, + "fileType": { + "type": "integer" + }, + "accessGroupId": { + "type": "integer" + }, + "lineCount": { + "type": "integer", + "format": "int64" + } + } + }, + "relationships": { + "type": "object", + "properties": [ + { + "properties": { + "accessGroup": { + "type": "object", + "properties": { + "links": { + "type": "object", + "properties": { + "self": { + "type": "string", + "default": "/api/v2/ui/files/relationships/accessGroup" + }, + "related": { + "type": "string", + "default": "/api/v2/ui/files/accessGroup" + } + } + } + } + } + } + } + ] + }, + "included": { + "type": "array", + "items": { + "type": "object", + "properties": [ + { + "properties": { + "id": { + "type": "integer" + }, + "type": { + "type": "string", + "default": "accessGroup" + }, + "attributes": { + "type": "object", + "properties": { + "accessGroupId": { + "type": "integer" + }, + "groupName": { + "type": "string" + } + } + } + } + } + ] + } + } + } + }, + "FilePostPatchResponse": { + "type": "object", + "properties": { + "jsonapi": { + "type": "object", + "properties": { + "version": { + "type": "string", + "default": "1.1" + }, + "ext": { + "type": "string", + "default": "https://jsonapi.org/profiles/ethanresnick/cursor-pagination" + } + } + }, + "id": { + "type": "integer" + }, + "type": { + "type": "string", + "default": "File" + }, + "data": { + "type": "object", + "properties": { + "filename": { + "type": "string" + }, + "size": { + "type": "integer", + "format": "int64" + }, + "isSecret": { + "type": "boolean" + }, + "fileType": { + "type": "integer" + }, + "accessGroupId": { + "type": "integer" + }, + "lineCount": { + "type": "integer", + "format": "int64" + } + } + } + } + }, + "FileListResponse": { + "allOf": [ + { + "$ref": "#/components/schemas/ListResponse" + }, + { + "type": "object", + "properties": { + "values": { + "type": "array", + "items": { + "$ref": "#/components/schemas/FileResponse" + } + } + } + } + ] + }, + "RightGroupCreate": { + "type": "object", + "properties": { + "data": { + "type": "object", + "properties": { + "type": { + "type": "string" + }, + "attributes": { + "type": "object", + "properties": { + "name": { + "type": "string" + }, + "permissions": { + "type": "object" + } + } + } + } + } + } + }, + "RightGroupPatch": { + "type": "object", + "properties": { + "data": { + "type": "object", + "properties": { + "type": { + "type": "string" + }, + "attributes": { + "type": "object", + "properties": { + "name": { + "type": "string" + }, + "permissions": { + "type": "object" + } + } + } + } + } + } + }, + "RightGroupResponse": { + "type": "object", + "properties": { + "jsonapi": { + "type": "object", + "properties": { + "version": { + "type": "string", + "default": "1.1" + }, + "ext": { + "type": "string", + "default": "https://jsonapi.org/profiles/ethanresnick/cursor-pagination" + } + } + }, + "links": { + "type": "object", + "properties": { + "self": { + "type": "string", + "default": "/api/v2/ui/globalpermissiongroups?page[size]=25" + }, + "first": { + "type": "string", + "default": "/api/v2/ui/globalpermissiongroups?page[size]=25&page[after]=0" + }, + "last": { + "type": "string", + "default": "/api/v2/ui/globalpermissiongroups?page[size]=25&page[before]=500" + }, + "next": { + "type": "string", + "default": "/api/v2/ui/globalpermissiongroups?page[size]=25&page[after]=25" + }, + "previous": { + "type": "string", + "default": "/api/v2/ui/globalpermissiongroups?page[size]=25&page[before]=25" + } + } + }, + "id": { + "type": "integer" + }, + "type": { + "type": "string", + "default": "RightGroup" + }, + "data": { + "type": "object", + "properties": { + "name": { + "type": "string" + }, + "permissions": { + "type": "object" + } + } + }, + "relationships": { + "type": "object", + "properties": [ + { + "properties": { + "userMembers": { + "type": "object", + "properties": { + "links": { + "type": "object", + "properties": { + "self": { + "type": "string", + "default": "/api/v2/ui/globalpermissiongroups/relationships/userMembers" + }, + "related": { + "type": "string", + "default": "/api/v2/ui/globalpermissiongroups/userMembers" + } + } + } + } + } + } + } + ] + }, + "included": { + "type": "array", + "items": { + "type": "object", + "properties": [ + { + "properties": { + "id": { + "type": "integer" + }, + "type": { + "type": "string", + "default": "userMembers" + }, + "attributes": { + "type": "object", + "properties": { + "id": { + "type": "integer" + }, + "name": { + "type": "string" + }, + "email": { + "type": "string" + }, + "passwordHash": { + "type": "string" + }, + "passwordSalt": { + "type": "string" + }, + "isValid": { + "type": "boolean" + }, + "isComputedPassword": { + "type": "boolean" + }, + "lastLoginDate": { + "type": "integer", + "format": "int64" + }, + "registeredSince": { + "type": "integer", + "format": "int64" + }, + "sessionLifetime": { + "type": "integer" + }, + "globalPermissionGroupId": { + "type": "integer" + }, + "yubikey": { + "type": "string" + }, + "otp1": { + "type": "string" + }, + "otp2": { + "type": "string" + }, + "otp3": { + "type": "string" + }, + "otp4": { + "type": "string" + } + } + } + } + } + ] + } + } + } + }, + "RightGroupSingleResponse": { + "type": "object", + "properties": { + "id": { + "type": "integer" + }, + "type": { + "type": "string", + "default": "RightGroup" + }, + "data": { + "type": "object", + "properties": { + "name": { + "type": "string" + }, + "permissions": { + "type": "object" + } + } + }, + "relationships": { + "type": "object", + "properties": [ + { + "properties": { + "userMembers": { + "type": "object", + "properties": { + "links": { + "type": "object", + "properties": { + "self": { + "type": "string", + "default": "/api/v2/ui/globalpermissiongroups/relationships/userMembers" + }, + "related": { + "type": "string", + "default": "/api/v2/ui/globalpermissiongroups/userMembers" + } + } + } + } + } + } + } + ] + }, + "included": { + "type": "array", + "items": { + "type": "object", + "properties": [ + { + "properties": { + "id": { + "type": "integer" + }, + "type": { + "type": "string", + "default": "userMembers" + }, + "attributes": { + "type": "object", + "properties": { + "id": { + "type": "integer" + }, + "name": { + "type": "string" + }, + "email": { + "type": "string" + }, + "passwordHash": { + "type": "string" + }, + "passwordSalt": { + "type": "string" + }, + "isValid": { + "type": "boolean" + }, + "isComputedPassword": { + "type": "boolean" + }, + "lastLoginDate": { + "type": "integer", + "format": "int64" + }, + "registeredSince": { + "type": "integer", + "format": "int64" + }, + "sessionLifetime": { + "type": "integer" + }, + "globalPermissionGroupId": { + "type": "integer" + }, + "yubikey": { + "type": "string" + }, + "otp1": { + "type": "string" + }, + "otp2": { + "type": "string" + }, + "otp3": { + "type": "string" + }, + "otp4": { + "type": "string" + } + } + } + } + } + ] + } + } + } + }, + "RightGroupPostPatchResponse": { + "type": "object", + "properties": { + "jsonapi": { + "type": "object", + "properties": { + "version": { + "type": "string", + "default": "1.1" + }, + "ext": { + "type": "string", + "default": "https://jsonapi.org/profiles/ethanresnick/cursor-pagination" + } + } + }, + "id": { + "type": "integer" + }, + "type": { + "type": "string", + "default": "RightGroup" + }, + "data": { + "type": "object", + "properties": { + "name": { + "type": "string" + }, + "permissions": { + "type": "object" + } + } + } + } + }, + "RightGroupListResponse": { + "allOf": [ + { + "$ref": "#/components/schemas/ListResponse" + }, + { + "type": "object", + "properties": { + "values": { + "type": "array", + "items": { + "$ref": "#/components/schemas/RightGroupResponse" + } + } + } + } + ] + }, + "HashCreate": { + "type": "object", + "properties": { + "data": { + "type": "object", + "properties": { + "type": { + "type": "string" + }, + "attributes": { + "type": "object", + "properties": { + "hashlistId": { + "type": "integer" + }, + "hash": { + "type": "string" + }, + "salt": { + "type": "string" + }, + "plaintext": { + "type": "string" + }, + "timeCracked": { + "type": "integer", + "format": "int64" + }, + "chunkId": { + "type": "integer" + }, + "isCracked": { + "type": "boolean" + }, + "crackPos": { + "type": "integer", + "format": "int64" + } + } + } + } + } + } + }, + "HashPatch": { + "type": "object", + "properties": { + "data": { + "type": "object", + "properties": { + "type": { + "type": "string" + }, + "attributes": { + "type": "object", + "properties": { + "chunkId": { + "type": "integer" + }, + "crackPos": { + "type": "integer", + "format": "int64" + }, + "hash": { + "type": "string" + }, + "hashlistId": { + "type": "integer" + }, + "isCracked": { + "type": "boolean" + }, + "plaintext": { + "type": "string" + }, + "salt": { + "type": "string" + }, + "timeCracked": { + "type": "integer", + "format": "int64" + } + } + } + } + } + } + }, + "HashResponse": { + "type": "object", + "properties": { + "jsonapi": { + "type": "object", + "properties": { + "version": { + "type": "string", + "default": "1.1" + }, + "ext": { + "type": "string", + "default": "https://jsonapi.org/profiles/ethanresnick/cursor-pagination" + } + } + }, + "links": { + "type": "object", + "properties": { + "self": { + "type": "string", + "default": "/api/v2/ui/hashes?page[size]=25" + }, + "first": { + "type": "string", + "default": "/api/v2/ui/hashes?page[size]=25&page[after]=0" + }, + "last": { + "type": "string", + "default": "/api/v2/ui/hashes?page[size]=25&page[before]=500" + }, + "next": { + "type": "string", + "default": "/api/v2/ui/hashes?page[size]=25&page[after]=25" + }, + "previous": { + "type": "string", + "default": "/api/v2/ui/hashes?page[size]=25&page[before]=25" + } + } + }, + "id": { + "type": "integer" + }, + "type": { + "type": "string", + "default": "Hash" + }, + "data": { + "type": "object", + "properties": { + "hashlistId": { + "type": "integer" + }, + "hash": { + "type": "string" + }, + "salt": { + "type": "string" + }, + "plaintext": { + "type": "string" + }, + "timeCracked": { + "type": "integer", + "format": "int64" + }, + "chunkId": { + "type": "integer" + }, + "isCracked": { + "type": "boolean" + }, + "crackPos": { + "type": "integer", + "format": "int64" + } + } + }, + "relationships": { + "type": "object", + "properties": [ + { + "properties": { + "chunk": { + "type": "object", + "properties": { + "links": { + "type": "object", + "properties": { + "self": { + "type": "string", + "default": "/api/v2/ui/hashes/relationships/chunk" + }, + "related": { + "type": "string", + "default": "/api/v2/ui/hashes/chunk" + } + } + } + } + } + } + }, + { + "properties": { + "hashlist": { + "type": "object", + "properties": { + "links": { + "type": "object", + "properties": { + "self": { + "type": "string", + "default": "/api/v2/ui/hashes/relationships/hashlist" + }, + "related": { + "type": "string", + "default": "/api/v2/ui/hashes/hashlist" + } + } + } + } + } + } + } + ] + }, + "included": { + "type": "array", + "items": { + "type": "object", + "properties": [ + { + "properties": { + "id": { + "type": "integer" + }, + "type": { + "type": "string", + "default": "chunk" + }, + "attributes": { + "type": "object", + "properties": { + "chunkId": { + "type": "integer" + }, + "taskId": { + "type": "integer" + }, + "skip": { + "type": "integer" + }, + "length": { + "type": "integer" + }, + "agentId": { + "type": "integer" + }, + "dispatchTime": { + "type": "integer", + "format": "int64" + }, + "solveTime": { + "type": "integer", + "format": "int64" + }, + "checkpoint": { + "type": "integer", + "format": "int64" + }, + "progress": { + "type": "integer" + }, + "state": { + "type": "integer" + }, + "cracked": { + "type": "integer" + }, + "speed": { + "type": "integer", + "format": "int64" + } + } + } + } + }, + { + "properties": { + "id": { + "type": "integer" + }, + "type": { + "type": "string", + "default": "hashlist" + }, + "attributes": { + "type": "object", + "properties": { + "hashlistSeperator": { + "type": "string" + }, + "sourceType": { + "type": "string" + }, + "sourceData": { + "type": "string" + }, + "hashlistId": { + "type": "integer" + }, + "name": { + "type": "string" + }, + "format": { + "type": "integer", + "enum": [ + 0, + 1, + 2, + 3 + ] + }, + "hashTypeId": { + "type": "integer" + }, + "hashCount": { + "type": "integer" + }, + "separator": { + "type": "string" + }, + "cracked": { + "type": "integer" + }, + "isSecret": { + "type": "boolean" + }, + "isHexSalt": { + "type": "boolean" + }, + "isSalted": { + "type": "boolean" + }, + "accessGroupId": { + "type": "integer" + }, + "notes": { + "type": "string" + }, + "useBrain": { + "type": "boolean" + }, + "brainFeatures": { + "type": "integer" + }, + "isArchived": { + "type": "boolean" + } + } + } + } + } + ] + } + } + } + }, + "HashSingleResponse": { + "type": "object", + "properties": { + "id": { + "type": "integer" + }, + "type": { + "type": "string", + "default": "Hash" + }, + "data": { + "type": "object", + "properties": { + "hashlistId": { + "type": "integer" + }, + "hash": { + "type": "string" + }, + "salt": { + "type": "string" + }, + "plaintext": { + "type": "string" + }, + "timeCracked": { + "type": "integer", + "format": "int64" + }, + "chunkId": { + "type": "integer" + }, + "isCracked": { + "type": "boolean" + }, + "crackPos": { + "type": "integer", + "format": "int64" + } + } + }, + "relationships": { + "type": "object", + "properties": [ + { + "properties": { + "chunk": { + "type": "object", + "properties": { + "links": { + "type": "object", + "properties": { + "self": { + "type": "string", + "default": "/api/v2/ui/hashes/relationships/chunk" + }, + "related": { + "type": "string", + "default": "/api/v2/ui/hashes/chunk" + } + } + } + } + } + } + }, + { + "properties": { + "hashlist": { + "type": "object", + "properties": { + "links": { + "type": "object", + "properties": { + "self": { + "type": "string", + "default": "/api/v2/ui/hashes/relationships/hashlist" + }, + "related": { + "type": "string", + "default": "/api/v2/ui/hashes/hashlist" + } + } + } + } + } + } + } + ] + }, + "included": { + "type": "array", + "items": { + "type": "object", + "properties": [ + { + "properties": { + "id": { + "type": "integer" + }, + "type": { + "type": "string", + "default": "chunk" + }, + "attributes": { + "type": "object", + "properties": { + "chunkId": { + "type": "integer" + }, + "taskId": { + "type": "integer" + }, + "skip": { + "type": "integer" + }, + "length": { + "type": "integer" + }, + "agentId": { + "type": "integer" + }, + "dispatchTime": { + "type": "integer", + "format": "int64" + }, + "solveTime": { + "type": "integer", + "format": "int64" + }, + "checkpoint": { + "type": "integer", + "format": "int64" + }, + "progress": { + "type": "integer" + }, + "state": { + "type": "integer" + }, + "cracked": { + "type": "integer" + }, + "speed": { + "type": "integer", + "format": "int64" + } + } + } + } + }, + { + "properties": { + "id": { + "type": "integer" + }, + "type": { + "type": "string", + "default": "hashlist" + }, + "attributes": { + "type": "object", + "properties": { + "hashlistSeperator": { + "type": "string" + }, + "sourceType": { + "type": "string" + }, + "sourceData": { + "type": "string" + }, + "hashlistId": { + "type": "integer" + }, + "name": { + "type": "string" + }, + "format": { + "type": "integer", + "enum": [ + 0, + 1, + 2, + 3 + ] + }, + "hashTypeId": { + "type": "integer" + }, + "hashCount": { + "type": "integer" + }, + "separator": { + "type": "string" + }, + "cracked": { + "type": "integer" + }, + "isSecret": { + "type": "boolean" + }, + "isHexSalt": { + "type": "boolean" + }, + "isSalted": { + "type": "boolean" + }, + "accessGroupId": { + "type": "integer" + }, + "notes": { + "type": "string" + }, + "useBrain": { + "type": "boolean" + }, + "brainFeatures": { + "type": "integer" + }, + "isArchived": { + "type": "boolean" + } + } + } + } + } + ] + } + } + } + }, + "HashPostPatchResponse": { + "type": "object", + "properties": { + "jsonapi": { + "type": "object", + "properties": { + "version": { + "type": "string", + "default": "1.1" + }, + "ext": { + "type": "string", + "default": "https://jsonapi.org/profiles/ethanresnick/cursor-pagination" + } + } + }, + "id": { + "type": "integer" + }, + "type": { + "type": "string", + "default": "Hash" + }, + "data": { + "type": "object", + "properties": { + "hashlistId": { + "type": "integer" + }, + "hash": { + "type": "string" + }, + "salt": { + "type": "string" + }, + "plaintext": { + "type": "string" + }, + "timeCracked": { + "type": "integer", + "format": "int64" + }, + "chunkId": { + "type": "integer" + }, + "isCracked": { + "type": "boolean" + }, + "crackPos": { + "type": "integer", + "format": "int64" + } + } + } + } + }, + "HashListResponse": { + "allOf": [ + { + "$ref": "#/components/schemas/ListResponse" + }, + { + "type": "object", + "properties": { + "values": { + "type": "array", + "items": { + "$ref": "#/components/schemas/HashResponse" + } + } + } + } + ] + }, + "HashlistCreate": { + "type": "object", + "properties": { + "data": { + "type": "object", + "properties": { + "type": { + "type": "string" + }, + "attributes": { + "type": "object", + "properties": { + "hashlistSeperator": { + "type": "string" + }, + "sourceType": { + "type": "string" + }, + "sourceData": { + "type": "string" + }, + "name": { + "type": "string" + }, + "format": { + "type": "integer", + "enum": [ + 0, + 1, + 2, + 3 + ] + }, + "hashTypeId": { + "type": "integer" + }, + "hashCount": { + "type": "integer" + }, + "separator": { + "type": "string" + }, + "cracked": { + "type": "integer" + }, + "isSecret": { + "type": "boolean" + }, + "isHexSalt": { + "type": "boolean" + }, + "isSalted": { + "type": "boolean" + }, + "accessGroupId": { + "type": "integer" + }, + "notes": { + "type": "string" + }, + "useBrain": { + "type": "boolean" + }, + "brainFeatures": { + "type": "integer" + }, + "isArchived": { + "type": "boolean" + } + } + } + } + } + } + }, + "HashlistPatch": { + "type": "object", + "properties": { + "data": { + "type": "object", + "properties": { + "type": { + "type": "string" + }, + "attributes": { + "type": "object", + "properties": { + "accessGroupId": { + "type": "integer" + }, + "isArchived": { + "type": "boolean" + }, + "isSecret": { + "type": "boolean" + }, + "name": { + "type": "string" + }, + "notes": { + "type": "string" + } + } + } + } + } + } + }, + "HashlistResponse": { + "type": "object", + "properties": { + "jsonapi": { + "type": "object", + "properties": { + "version": { + "type": "string", + "default": "1.1" + }, + "ext": { + "type": "string", + "default": "https://jsonapi.org/profiles/ethanresnick/cursor-pagination" + } + } + }, + "links": { + "type": "object", + "properties": { + "self": { + "type": "string", + "default": "/api/v2/ui/hashlists?page[size]=25" + }, + "first": { + "type": "string", + "default": "/api/v2/ui/hashlists?page[size]=25&page[after]=0" + }, + "last": { + "type": "string", + "default": "/api/v2/ui/hashlists?page[size]=25&page[before]=500" + }, + "next": { + "type": "string", + "default": "/api/v2/ui/hashlists?page[size]=25&page[after]=25" + }, + "previous": { + "type": "string", + "default": "/api/v2/ui/hashlists?page[size]=25&page[before]=25" + } + } + }, + "id": { + "type": "integer" + }, + "type": { + "type": "string", + "default": "Hashlist" + }, + "data": { + "type": "object", + "properties": { + "name": { + "type": "string" + }, + "format": { + "type": "integer", + "enum": [ + 0, + 1, + 2, + 3 + ] + }, + "hashTypeId": { + "type": "integer" + }, + "hashCount": { + "type": "integer" + }, + "separator": { + "type": "string" + }, + "cracked": { + "type": "integer" + }, + "isSecret": { + "type": "boolean" + }, + "isHexSalt": { + "type": "boolean" + }, + "isSalted": { + "type": "boolean" + }, + "accessGroupId": { + "type": "integer" + }, + "notes": { + "type": "string" + }, + "useBrain": { + "type": "boolean" + }, + "brainFeatures": { + "type": "integer" + }, + "isArchived": { + "type": "boolean" + } + } + }, + "relationships": { + "type": "object", + "properties": [ + { + "properties": { + "accessGroup": { + "type": "object", + "properties": { + "links": { + "type": "object", + "properties": { + "self": { + "type": "string", + "default": "/api/v2/ui/hashlists/relationships/accessGroup" + }, + "related": { + "type": "string", + "default": "/api/v2/ui/hashlists/accessGroup" + } + } + } + } + } + } + }, + { + "properties": { + "hashType": { + "type": "object", + "properties": { + "links": { + "type": "object", + "properties": { + "self": { + "type": "string", + "default": "/api/v2/ui/hashlists/relationships/hashType" + }, + "related": { + "type": "string", + "default": "/api/v2/ui/hashlists/hashType" + } + } + } + } + } + } + }, + { + "properties": { + "hashes": { + "type": "object", + "properties": { + "links": { + "type": "object", + "properties": { + "self": { + "type": "string", + "default": "/api/v2/ui/hashlists/relationships/hashes" + }, + "related": { + "type": "string", + "default": "/api/v2/ui/hashlists/hashes" + } + } + } + } + } + } + }, + { + "properties": { + "hashlists": { + "type": "object", + "properties": { + "links": { + "type": "object", + "properties": { + "self": { + "type": "string", + "default": "/api/v2/ui/hashlists/relationships/hashlists" + }, + "related": { + "type": "string", + "default": "/api/v2/ui/hashlists/hashlists" + } + } + } + } + } + } + }, + { + "properties": { + "tasks": { + "type": "object", + "properties": { + "links": { + "type": "object", + "properties": { + "self": { + "type": "string", + "default": "/api/v2/ui/hashlists/relationships/tasks" + }, + "related": { + "type": "string", + "default": "/api/v2/ui/hashlists/tasks" + } + } + } + } + } + } + } + ] + }, + "included": { + "type": "array", + "items": { + "type": "object", + "properties": [ + { + "properties": { + "id": { + "type": "integer" + }, + "type": { + "type": "string", + "default": "accessGroup" + }, + "attributes": { + "type": "object", + "properties": { + "accessGroupId": { + "type": "integer" + }, + "groupName": { + "type": "string" + } + } + } + } + }, + { + "properties": { + "id": { + "type": "integer" + }, + "type": { + "type": "string", + "default": "hashType" + }, + "attributes": { + "type": "object", + "properties": { + "hashTypeId": { + "type": "integer" + }, + "description": { + "type": "string" + }, + "isSalted": { + "type": "boolean" + }, + "isSlowHash": { + "type": "boolean" + } + } + } + } + }, + { + "properties": { + "id": { + "type": "integer" + }, + "type": { + "type": "string", + "default": "hashes" + }, + "attributes": { + "type": "object", + "properties": { + "hashId": { + "type": "integer" + }, + "hashlistId": { + "type": "integer" + }, + "hash": { + "type": "string" + }, + "salt": { + "type": "string" + }, + "plaintext": { + "type": "string" + }, + "timeCracked": { + "type": "integer", + "format": "int64" + }, + "chunkId": { + "type": "integer" + }, + "isCracked": { + "type": "boolean" + }, + "crackPos": { + "type": "integer", + "format": "int64" + } + } + } + } + }, + { + "properties": { + "id": { + "type": "integer" + }, + "type": { + "type": "string", + "default": "hashlists" + }, + "attributes": { + "type": "object", + "properties": { + "hashlistSeperator": { + "type": "string" + }, + "sourceType": { + "type": "string" + }, + "sourceData": { + "type": "string" + }, + "hashlistId": { + "type": "integer" + }, + "name": { + "type": "string" + }, + "format": { + "type": "integer", + "enum": [ + 0, + 1, + 2, + 3 + ] + }, + "hashTypeId": { + "type": "integer" + }, + "hashCount": { + "type": "integer" + }, + "separator": { + "type": "string" + }, + "cracked": { + "type": "integer" + }, + "isSecret": { + "type": "boolean" + }, + "isHexSalt": { + "type": "boolean" + }, + "isSalted": { + "type": "boolean" + }, + "accessGroupId": { + "type": "integer" + }, + "notes": { + "type": "string" + }, + "useBrain": { + "type": "boolean" + }, + "brainFeatures": { + "type": "integer" + }, + "isArchived": { + "type": "boolean" + } + } + } + } + }, + { + "properties": { + "id": { + "type": "integer" + }, + "type": { + "type": "string", + "default": "tasks" + }, + "attributes": { + "type": "object", + "properties": { + "hashlistId": { + "type": "integer" + }, + "files": { + "type": "array" + }, + "taskId": { + "type": "integer" + }, + "taskName": { + "type": "string" + }, + "attackCmd": { + "type": "string" + }, + "chunkTime": { + "type": "integer" + }, + "statusTimer": { + "type": "integer" + }, + "keyspace": { + "type": "integer", + "format": "int64" + }, + "keyspaceProgress": { + "type": "integer", + "format": "int64" + }, + "priority": { + "type": "integer" + }, + "maxAgents": { + "type": "integer" + }, + "color": { + "type": "string" + }, + "isSmall": { + "type": "boolean" + }, + "isCpuTask": { + "type": "boolean" + }, + "useNewBench": { + "type": "boolean" + }, + "skipKeyspace": { + "type": "integer", + "format": "int64" + }, + "crackerBinaryId": { + "type": "integer" + }, + "crackerBinaryTypeId": { + "type": "integer" + }, + "taskWrapperId": { + "type": "integer" + }, + "isArchived": { + "type": "boolean" + }, + "notes": { + "type": "string" + }, + "staticChunks": { + "type": "integer" + }, + "chunkSize": { + "type": "integer", + "format": "int64" + }, + "forcePipe": { + "type": "boolean" + }, + "preprocessorId": { + "type": "integer" + }, + "preprocessorCommand": { + "type": "string" + } + } + } + } + } + ] + } + } + } + }, + "HashlistSingleResponse": { + "type": "object", + "properties": { + "id": { + "type": "integer" + }, + "type": { + "type": "string", + "default": "Hashlist" + }, + "data": { + "type": "object", + "properties": { + "name": { + "type": "string" + }, + "format": { + "type": "integer", + "enum": [ + 0, + 1, + 2, + 3 + ] + }, + "hashTypeId": { + "type": "integer" + }, + "hashCount": { + "type": "integer" + }, + "separator": { + "type": "string" + }, + "cracked": { + "type": "integer" + }, + "isSecret": { + "type": "boolean" + }, + "isHexSalt": { + "type": "boolean" + }, + "isSalted": { + "type": "boolean" + }, + "accessGroupId": { + "type": "integer" + }, + "notes": { + "type": "string" + }, + "useBrain": { + "type": "boolean" + }, + "brainFeatures": { + "type": "integer" + }, + "isArchived": { + "type": "boolean" + } + } + }, + "relationships": { + "type": "object", + "properties": [ + { + "properties": { + "accessGroup": { + "type": "object", + "properties": { + "links": { + "type": "object", + "properties": { + "self": { + "type": "string", + "default": "/api/v2/ui/hashlists/relationships/accessGroup" + }, + "related": { + "type": "string", + "default": "/api/v2/ui/hashlists/accessGroup" + } + } + } + } + } + } + }, + { + "properties": { + "hashType": { + "type": "object", + "properties": { + "links": { + "type": "object", + "properties": { + "self": { + "type": "string", + "default": "/api/v2/ui/hashlists/relationships/hashType" + }, + "related": { + "type": "string", + "default": "/api/v2/ui/hashlists/hashType" + } + } + } + } + } + } + }, + { + "properties": { + "hashes": { + "type": "object", + "properties": { + "links": { + "type": "object", + "properties": { + "self": { + "type": "string", + "default": "/api/v2/ui/hashlists/relationships/hashes" + }, + "related": { + "type": "string", + "default": "/api/v2/ui/hashlists/hashes" + } + } + } + } + } + } + }, + { + "properties": { + "hashlists": { + "type": "object", + "properties": { + "links": { + "type": "object", + "properties": { + "self": { + "type": "string", + "default": "/api/v2/ui/hashlists/relationships/hashlists" + }, + "related": { + "type": "string", + "default": "/api/v2/ui/hashlists/hashlists" + } + } + } + } + } + } + }, + { + "properties": { + "tasks": { + "type": "object", + "properties": { + "links": { + "type": "object", + "properties": { + "self": { + "type": "string", + "default": "/api/v2/ui/hashlists/relationships/tasks" + }, + "related": { + "type": "string", + "default": "/api/v2/ui/hashlists/tasks" + } + } + } + } + } + } + } + ] + }, + "included": { + "type": "array", + "items": { + "type": "object", + "properties": [ + { + "properties": { + "id": { + "type": "integer" + }, + "type": { + "type": "string", + "default": "accessGroup" + }, + "attributes": { + "type": "object", + "properties": { + "accessGroupId": { + "type": "integer" + }, + "groupName": { + "type": "string" + } + } + } + } + }, + { + "properties": { + "id": { + "type": "integer" + }, + "type": { + "type": "string", + "default": "hashType" + }, + "attributes": { + "type": "object", + "properties": { + "hashTypeId": { + "type": "integer" + }, + "description": { + "type": "string" + }, + "isSalted": { + "type": "boolean" + }, + "isSlowHash": { + "type": "boolean" + } + } + } + } + }, + { + "properties": { + "id": { + "type": "integer" + }, + "type": { + "type": "string", + "default": "hashes" + }, + "attributes": { + "type": "object", + "properties": { + "hashId": { + "type": "integer" + }, + "hashlistId": { + "type": "integer" + }, + "hash": { + "type": "string" + }, + "salt": { + "type": "string" + }, + "plaintext": { + "type": "string" + }, + "timeCracked": { + "type": "integer", + "format": "int64" + }, + "chunkId": { + "type": "integer" + }, + "isCracked": { + "type": "boolean" + }, + "crackPos": { + "type": "integer", + "format": "int64" + } + } + } + } + }, + { + "properties": { + "id": { + "type": "integer" + }, + "type": { + "type": "string", + "default": "hashlists" + }, + "attributes": { + "type": "object", + "properties": { + "hashlistSeperator": { + "type": "string" + }, + "sourceType": { + "type": "string" + }, + "sourceData": { + "type": "string" + }, + "hashlistId": { + "type": "integer" + }, + "name": { + "type": "string" + }, + "format": { + "type": "integer", + "enum": [ + 0, + 1, + 2, + 3 + ] + }, + "hashTypeId": { + "type": "integer" + }, + "hashCount": { + "type": "integer" + }, + "separator": { + "type": "string" + }, + "cracked": { + "type": "integer" + }, + "isSecret": { + "type": "boolean" + }, + "isHexSalt": { + "type": "boolean" + }, + "isSalted": { + "type": "boolean" + }, + "accessGroupId": { + "type": "integer" + }, + "notes": { + "type": "string" + }, + "useBrain": { + "type": "boolean" + }, + "brainFeatures": { + "type": "integer" + }, + "isArchived": { + "type": "boolean" + } + } + } + } + }, + { + "properties": { + "id": { + "type": "integer" + }, + "type": { + "type": "string", + "default": "tasks" + }, + "attributes": { + "type": "object", + "properties": { + "hashlistId": { + "type": "integer" + }, + "files": { + "type": "array" + }, + "taskId": { + "type": "integer" + }, + "taskName": { + "type": "string" + }, + "attackCmd": { + "type": "string" + }, + "chunkTime": { + "type": "integer" + }, + "statusTimer": { + "type": "integer" + }, + "keyspace": { + "type": "integer", + "format": "int64" + }, + "keyspaceProgress": { + "type": "integer", + "format": "int64" + }, + "priority": { + "type": "integer" + }, + "maxAgents": { + "type": "integer" + }, + "color": { + "type": "string" + }, + "isSmall": { + "type": "boolean" + }, + "isCpuTask": { + "type": "boolean" + }, + "useNewBench": { + "type": "boolean" + }, + "skipKeyspace": { + "type": "integer", + "format": "int64" + }, + "crackerBinaryId": { + "type": "integer" + }, + "crackerBinaryTypeId": { + "type": "integer" + }, + "taskWrapperId": { + "type": "integer" + }, + "isArchived": { + "type": "boolean" + }, + "notes": { + "type": "string" + }, + "staticChunks": { + "type": "integer" + }, + "chunkSize": { + "type": "integer", + "format": "int64" + }, + "forcePipe": { + "type": "boolean" + }, + "preprocessorId": { + "type": "integer" + }, + "preprocessorCommand": { + "type": "string" + } + } + } + } + } + ] + } + } + } + }, + "HashlistPostPatchResponse": { + "type": "object", + "properties": { + "jsonapi": { + "type": "object", + "properties": { + "version": { + "type": "string", + "default": "1.1" + }, + "ext": { + "type": "string", + "default": "https://jsonapi.org/profiles/ethanresnick/cursor-pagination" + } + } + }, + "id": { + "type": "integer" + }, + "type": { + "type": "string", + "default": "Hashlist" + }, + "data": { + "type": "object", + "properties": { + "name": { + "type": "string" + }, + "format": { + "type": "integer", + "enum": [ + 0, + 1, + 2, + 3 + ] + }, + "hashTypeId": { + "type": "integer" + }, + "hashCount": { + "type": "integer" + }, + "separator": { + "type": "string" + }, + "cracked": { + "type": "integer" + }, + "isSecret": { + "type": "boolean" + }, + "isHexSalt": { + "type": "boolean" + }, + "isSalted": { + "type": "boolean" + }, + "accessGroupId": { + "type": "integer" + }, + "notes": { + "type": "string" + }, + "useBrain": { + "type": "boolean" + }, + "brainFeatures": { + "type": "integer" + }, + "isArchived": { + "type": "boolean" + } + } + } + } + }, + "HashlistListResponse": { + "allOf": [ + { + "$ref": "#/components/schemas/ListResponse" + }, + { + "type": "object", + "properties": { + "values": { + "type": "array", + "items": { + "$ref": "#/components/schemas/HashlistResponse" + } + } + } + } + ] + }, + "HashTypeCreate": { + "type": "object", + "properties": { + "data": { + "type": "object", + "properties": { + "type": { + "type": "string" + }, + "attributes": { + "type": "object", + "properties": { + "description": { + "type": "string" + }, + "isSalted": { + "type": "boolean" + }, + "isSlowHash": { + "type": "boolean" + } + } + } + } + } + } + }, + "HashTypePatch": { + "type": "object", + "properties": { + "data": { + "type": "object", + "properties": { + "type": { + "type": "string" + }, + "attributes": { + "type": "object", + "properties": { + "description": { + "type": "string" + }, + "isSalted": { + "type": "boolean" + }, + "isSlowHash": { + "type": "boolean" + } + } + } + } + } + } + }, + "HashTypeResponse": { + "type": "object", + "properties": { + "jsonapi": { + "type": "object", + "properties": { + "version": { + "type": "string", + "default": "1.1" + }, + "ext": { + "type": "string", + "default": "https://jsonapi.org/profiles/ethanresnick/cursor-pagination" + } + } + }, + "links": { + "type": "object", + "properties": { + "self": { + "type": "string", + "default": "/api/v2/ui/hashtypes?page[size]=25" + }, + "first": { + "type": "string", + "default": "/api/v2/ui/hashtypes?page[size]=25&page[after]=0" + }, + "last": { + "type": "string", + "default": "/api/v2/ui/hashtypes?page[size]=25&page[before]=500" + }, + "next": { + "type": "string", + "default": "/api/v2/ui/hashtypes?page[size]=25&page[after]=25" + }, + "previous": { + "type": "string", + "default": "/api/v2/ui/hashtypes?page[size]=25&page[before]=25" + } + } + }, + "id": { + "type": "integer" + }, + "type": { + "type": "string", + "default": "HashType" + }, + "data": { + "type": "object", + "properties": { + "description": { + "type": "string" + }, + "isSalted": { + "type": "boolean" + }, + "isSlowHash": { + "type": "boolean" + } + } + }, + "relationships": { + "type": "object", + "properties": [] + }, + "included": { + "type": "array", + "items": { + "type": "object", + "properties": [] + } + } + } + }, + "HashTypeSingleResponse": { + "type": "object", + "properties": { + "id": { + "type": "integer" + }, + "type": { + "type": "string", + "default": "HashType" + }, + "data": { + "type": "object", + "properties": { + "description": { + "type": "string" + }, + "isSalted": { + "type": "boolean" + }, + "isSlowHash": { + "type": "boolean" + } + } + }, + "relationships": { + "type": "object", + "properties": [] + }, + "included": { + "type": "array", + "items": { + "type": "object", + "properties": [] + } + } + } + }, + "HashTypePostPatchResponse": { + "type": "object", + "properties": { + "jsonapi": { + "type": "object", + "properties": { + "version": { + "type": "string", + "default": "1.1" + }, + "ext": { + "type": "string", + "default": "https://jsonapi.org/profiles/ethanresnick/cursor-pagination" + } + } + }, + "id": { + "type": "integer" + }, + "type": { + "type": "string", + "default": "HashType" + }, + "data": { + "type": "object", + "properties": { + "description": { + "type": "string" + }, + "isSalted": { + "type": "boolean" + }, + "isSlowHash": { + "type": "boolean" + } + } + } + } + }, + "HashTypeListResponse": { + "allOf": [ + { + "$ref": "#/components/schemas/ListResponse" + }, + { + "type": "object", + "properties": { + "values": { + "type": "array", + "items": { + "$ref": "#/components/schemas/HashTypeResponse" + } + } + } + } + ] + }, + "HealthCheckAgentCreate": { + "type": "object", + "properties": { + "data": { + "type": "object", + "properties": { + "type": { + "type": "string" + }, + "attributes": { + "type": "object", + "properties": { + "healthCheckId": { + "type": "integer" + }, + "agentId": { + "type": "integer" + }, + "status": { + "type": "integer" + }, + "cracked": { + "type": "integer" + }, + "numGpus": { + "type": "integer" + }, + "start": { + "type": "integer", + "format": "int64" + }, + "end": { + "type": "integer", + "format": "int64" + }, + "errors": { + "type": "string" + } + } + } + } + } + } + }, + "HealthCheckAgentPatch": { + "type": "object", + "properties": { + "data": { + "type": "object", + "properties": { + "type": { + "type": "string" + }, + "attributes": { + "type": "object", + "properties": [] + } + } + } + } + }, + "HealthCheckAgentResponse": { + "type": "object", + "properties": { + "jsonapi": { + "type": "object", + "properties": { + "version": { + "type": "string", + "default": "1.1" + }, + "ext": { + "type": "string", + "default": "https://jsonapi.org/profiles/ethanresnick/cursor-pagination" + } + } + }, + "links": { + "type": "object", + "properties": { + "self": { + "type": "string", + "default": "/api/v2/ui/healthcheckagents?page[size]=25" + }, + "first": { + "type": "string", + "default": "/api/v2/ui/healthcheckagents?page[size]=25&page[after]=0" + }, + "last": { + "type": "string", + "default": "/api/v2/ui/healthcheckagents?page[size]=25&page[before]=500" + }, + "next": { + "type": "string", + "default": "/api/v2/ui/healthcheckagents?page[size]=25&page[after]=25" + }, + "previous": { + "type": "string", + "default": "/api/v2/ui/healthcheckagents?page[size]=25&page[before]=25" + } + } + }, + "id": { + "type": "integer" + }, + "type": { + "type": "string", + "default": "HealthCheckAgent" + }, + "data": { + "type": "object", + "properties": { + "healthCheckId": { + "type": "integer" + }, + "agentId": { + "type": "integer" + }, + "status": { + "type": "integer" + }, + "cracked": { + "type": "integer" + }, + "numGpus": { + "type": "integer" + }, + "start": { + "type": "integer", + "format": "int64" + }, + "end": { + "type": "integer", + "format": "int64" + }, + "errors": { + "type": "string" + } + } + }, + "relationships": { + "type": "object", + "properties": [ + { + "properties": { + "agent": { + "type": "object", + "properties": { + "links": { + "type": "object", + "properties": { + "self": { + "type": "string", + "default": "/api/v2/ui/healthcheckagents/relationships/agent" + }, + "related": { + "type": "string", + "default": "/api/v2/ui/healthcheckagents/agent" + } + } + } + } + } + } + }, + { + "properties": { + "healthCheck": { + "type": "object", + "properties": { + "links": { + "type": "object", + "properties": { + "self": { + "type": "string", + "default": "/api/v2/ui/healthcheckagents/relationships/healthCheck" + }, + "related": { + "type": "string", + "default": "/api/v2/ui/healthcheckagents/healthCheck" + } + } + } + } + } + } + } + ] + }, + "included": { + "type": "array", + "items": { + "type": "object", + "properties": [ + { + "properties": { + "id": { + "type": "integer" + }, + "type": { + "type": "string", + "default": "agent" + }, + "attributes": { + "type": "object", + "properties": { + "agentId": { + "type": "integer" + }, + "agentName": { + "type": "string" + }, + "uid": { + "type": "string" + }, + "os": { + "type": "integer" + }, + "devices": { + "type": "string" + }, + "cmdPars": { + "type": "string" + }, + "ignoreErrors": { + "type": "integer", + "enum": [ + 0, + 1, + 2 + ] + }, + "isActive": { + "type": "boolean" + }, + "isTrusted": { + "type": "boolean" + }, + "token": { + "type": "string" + }, + "lastAct": { + "type": "string" + }, + "lastTime": { + "type": "integer", + "format": "int64" + }, + "lastIp": { + "type": "string" + }, + "userId": { + "type": "integer" + }, + "cpuOnly": { + "type": "boolean" + }, + "clientSignature": { + "type": "string" + } + } + } + } + }, + { + "properties": { + "id": { + "type": "integer" + }, + "type": { + "type": "string", + "default": "healthCheck" + }, + "attributes": { + "type": "object", + "properties": { + "healthCheckId": { + "type": "integer" + }, + "time": { + "type": "integer", + "format": "int64" + }, + "status": { + "type": "integer" + }, + "checkType": { + "type": "integer" + }, + "hashtypeId": { + "type": "integer" + }, + "crackerBinaryId": { + "type": "integer" + }, + "expectedCracks": { + "type": "integer" + }, + "attackCmd": { + "type": "string" + } + } + } + } + } + ] + } + } + } + }, + "HealthCheckAgentSingleResponse": { + "type": "object", + "properties": { + "id": { + "type": "integer" + }, + "type": { + "type": "string", + "default": "HealthCheckAgent" + }, + "data": { + "type": "object", + "properties": { + "healthCheckId": { + "type": "integer" + }, + "agentId": { + "type": "integer" + }, + "status": { + "type": "integer" + }, + "cracked": { + "type": "integer" + }, + "numGpus": { + "type": "integer" + }, + "start": { + "type": "integer", + "format": "int64" + }, + "end": { + "type": "integer", + "format": "int64" + }, + "errors": { + "type": "string" + } + } + }, + "relationships": { + "type": "object", + "properties": [ + { + "properties": { + "agent": { + "type": "object", + "properties": { + "links": { + "type": "object", + "properties": { + "self": { + "type": "string", + "default": "/api/v2/ui/healthcheckagents/relationships/agent" + }, + "related": { + "type": "string", + "default": "/api/v2/ui/healthcheckagents/agent" + } + } + } + } + } + } + }, + { + "properties": { + "healthCheck": { + "type": "object", + "properties": { + "links": { + "type": "object", + "properties": { + "self": { + "type": "string", + "default": "/api/v2/ui/healthcheckagents/relationships/healthCheck" + }, + "related": { + "type": "string", + "default": "/api/v2/ui/healthcheckagents/healthCheck" + } + } + } + } + } + } + } + ] + }, + "included": { + "type": "array", + "items": { + "type": "object", + "properties": [ + { + "properties": { + "id": { + "type": "integer" + }, + "type": { + "type": "string", + "default": "agent" + }, + "attributes": { + "type": "object", + "properties": { + "agentId": { + "type": "integer" + }, + "agentName": { + "type": "string" + }, + "uid": { + "type": "string" + }, + "os": { + "type": "integer" + }, + "devices": { + "type": "string" + }, + "cmdPars": { + "type": "string" + }, + "ignoreErrors": { + "type": "integer", + "enum": [ + 0, + 1, + 2 + ] + }, + "isActive": { + "type": "boolean" + }, + "isTrusted": { + "type": "boolean" + }, + "token": { + "type": "string" + }, + "lastAct": { + "type": "string" + }, + "lastTime": { + "type": "integer", + "format": "int64" + }, + "lastIp": { + "type": "string" + }, + "userId": { + "type": "integer" + }, + "cpuOnly": { + "type": "boolean" + }, + "clientSignature": { + "type": "string" + } + } + } + } + }, + { + "properties": { + "id": { + "type": "integer" + }, + "type": { + "type": "string", + "default": "healthCheck" + }, + "attributes": { + "type": "object", + "properties": { + "healthCheckId": { + "type": "integer" + }, + "time": { + "type": "integer", + "format": "int64" + }, + "status": { + "type": "integer" + }, + "checkType": { + "type": "integer" + }, + "hashtypeId": { + "type": "integer" + }, + "crackerBinaryId": { + "type": "integer" + }, + "expectedCracks": { + "type": "integer" + }, + "attackCmd": { + "type": "string" + } + } + } + } + } + ] + } + } + } + }, + "HealthCheckAgentPostPatchResponse": { + "type": "object", + "properties": { + "jsonapi": { + "type": "object", + "properties": { + "version": { + "type": "string", + "default": "1.1" + }, + "ext": { + "type": "string", + "default": "https://jsonapi.org/profiles/ethanresnick/cursor-pagination" + } + } + }, + "id": { + "type": "integer" + }, + "type": { + "type": "string", + "default": "HealthCheckAgent" + }, + "data": { + "type": "object", + "properties": { + "healthCheckId": { + "type": "integer" + }, + "agentId": { + "type": "integer" + }, + "status": { + "type": "integer" + }, + "cracked": { + "type": "integer" + }, + "numGpus": { + "type": "integer" + }, + "start": { + "type": "integer", + "format": "int64" + }, + "end": { + "type": "integer", + "format": "int64" + }, + "errors": { + "type": "string" + } + } + } + } + }, + "HealthCheckAgentListResponse": { + "allOf": [ + { + "$ref": "#/components/schemas/ListResponse" + }, + { + "type": "object", + "properties": { + "values": { + "type": "array", + "items": { + "$ref": "#/components/schemas/HealthCheckAgentResponse" + } + } + } + } + ] + }, + "HealthCheckCreate": { + "type": "object", + "properties": { + "data": { + "type": "object", + "properties": { + "type": { + "type": "string" + }, + "attributes": { + "type": "object", + "properties": { + "time": { + "type": "integer", + "format": "int64" + }, + "status": { + "type": "integer" + }, + "checkType": { + "type": "integer" + }, + "hashtypeId": { + "type": "integer" + }, + "crackerBinaryId": { + "type": "integer" + }, + "expectedCracks": { + "type": "integer" + }, + "attackCmd": { + "type": "string" + } + } + } + } + } + } + }, + "HealthCheckPatch": { + "type": "object", + "properties": { + "data": { + "type": "object", + "properties": { + "type": { + "type": "string" + }, + "attributes": { + "type": "object", + "properties": { + "checkType": { + "type": "integer" + }, + "crackerBinaryId": { + "type": "integer" + }, + "hashtypeId": { + "type": "integer" + } + } + } + } + } + } + }, + "HealthCheckResponse": { + "type": "object", + "properties": { + "jsonapi": { + "type": "object", + "properties": { + "version": { + "type": "string", + "default": "1.1" + }, + "ext": { + "type": "string", + "default": "https://jsonapi.org/profiles/ethanresnick/cursor-pagination" + } + } + }, + "links": { + "type": "object", + "properties": { + "self": { + "type": "string", + "default": "/api/v2/ui/healthchecks?page[size]=25" + }, + "first": { + "type": "string", + "default": "/api/v2/ui/healthchecks?page[size]=25&page[after]=0" + }, + "last": { + "type": "string", + "default": "/api/v2/ui/healthchecks?page[size]=25&page[before]=500" + }, + "next": { + "type": "string", + "default": "/api/v2/ui/healthchecks?page[size]=25&page[after]=25" + }, + "previous": { + "type": "string", + "default": "/api/v2/ui/healthchecks?page[size]=25&page[before]=25" + } + } + }, + "id": { + "type": "integer" + }, + "type": { + "type": "string", + "default": "HealthCheck" + }, + "data": { + "type": "object", + "properties": { + "time": { + "type": "integer", + "format": "int64" + }, + "status": { + "type": "integer" + }, + "checkType": { + "type": "integer" + }, + "hashtypeId": { + "type": "integer" + }, + "crackerBinaryId": { + "type": "integer" + }, + "expectedCracks": { + "type": "integer" + }, + "attackCmd": { + "type": "string" + } + } + }, + "relationships": { + "type": "object", + "properties": [ + { + "properties": { + "crackerBinary": { + "type": "object", + "properties": { + "links": { + "type": "object", + "properties": { + "self": { + "type": "string", + "default": "/api/v2/ui/healthchecks/relationships/crackerBinary" + }, + "related": { + "type": "string", + "default": "/api/v2/ui/healthchecks/crackerBinary" + } + } + } + } + } + } + }, + { + "properties": { + "healthCheckAgents": { + "type": "object", + "properties": { + "links": { + "type": "object", + "properties": { + "self": { + "type": "string", + "default": "/api/v2/ui/healthchecks/relationships/healthCheckAgents" + }, + "related": { + "type": "string", + "default": "/api/v2/ui/healthchecks/healthCheckAgents" + } + } + } + } + } + } + } + ] + }, + "included": { + "type": "array", + "items": { + "type": "object", + "properties": [ + { + "properties": { + "id": { + "type": "integer" + }, + "type": { + "type": "string", + "default": "crackerBinary" + }, + "attributes": { + "type": "object", + "properties": { + "crackerBinaryId": { + "type": "integer" + }, + "crackerBinaryTypeId": { + "type": "integer" + }, + "version": { + "type": "string" + }, + "downloadUrl": { + "type": "string" + }, + "binaryName": { + "type": "string" + } + } + } + } + }, + { + "properties": { + "id": { + "type": "integer" + }, + "type": { + "type": "string", + "default": "healthCheckAgents" + }, + "attributes": { + "type": "object", + "properties": { + "healthCheckAgentId": { + "type": "integer" + }, + "healthCheckId": { + "type": "integer" + }, + "agentId": { + "type": "integer" + }, + "status": { + "type": "integer" + }, + "cracked": { + "type": "integer" + }, + "numGpus": { + "type": "integer" + }, + "start": { + "type": "integer", + "format": "int64" + }, + "end": { + "type": "integer", + "format": "int64" + }, + "errors": { + "type": "string" + } + } + } + } + } + ] + } + } + } + }, + "HealthCheckSingleResponse": { + "type": "object", + "properties": { + "id": { + "type": "integer" + }, + "type": { + "type": "string", + "default": "HealthCheck" + }, + "data": { + "type": "object", + "properties": { + "time": { + "type": "integer", + "format": "int64" + }, + "status": { + "type": "integer" + }, + "checkType": { + "type": "integer" + }, + "hashtypeId": { + "type": "integer" + }, + "crackerBinaryId": { + "type": "integer" + }, + "expectedCracks": { + "type": "integer" + }, + "attackCmd": { + "type": "string" + } + } + }, + "relationships": { + "type": "object", + "properties": [ + { + "properties": { + "crackerBinary": { + "type": "object", + "properties": { + "links": { + "type": "object", + "properties": { + "self": { + "type": "string", + "default": "/api/v2/ui/healthchecks/relationships/crackerBinary" + }, + "related": { + "type": "string", + "default": "/api/v2/ui/healthchecks/crackerBinary" + } + } + } + } + } + } + }, + { + "properties": { + "healthCheckAgents": { + "type": "object", + "properties": { + "links": { + "type": "object", + "properties": { + "self": { + "type": "string", + "default": "/api/v2/ui/healthchecks/relationships/healthCheckAgents" + }, + "related": { + "type": "string", + "default": "/api/v2/ui/healthchecks/healthCheckAgents" + } + } + } + } + } + } + } + ] + }, + "included": { + "type": "array", + "items": { + "type": "object", + "properties": [ + { + "properties": { + "id": { + "type": "integer" + }, + "type": { + "type": "string", + "default": "crackerBinary" + }, + "attributes": { + "type": "object", + "properties": { + "crackerBinaryId": { + "type": "integer" + }, + "crackerBinaryTypeId": { + "type": "integer" + }, + "version": { + "type": "string" + }, + "downloadUrl": { + "type": "string" + }, + "binaryName": { + "type": "string" + } + } + } + } + }, + { + "properties": { + "id": { + "type": "integer" + }, + "type": { + "type": "string", + "default": "healthCheckAgents" + }, + "attributes": { + "type": "object", + "properties": { + "healthCheckAgentId": { + "type": "integer" + }, + "healthCheckId": { + "type": "integer" + }, + "agentId": { + "type": "integer" + }, + "status": { + "type": "integer" + }, + "cracked": { + "type": "integer" + }, + "numGpus": { + "type": "integer" + }, + "start": { + "type": "integer", + "format": "int64" + }, + "end": { + "type": "integer", + "format": "int64" + }, + "errors": { + "type": "string" + } + } + } + } + } + ] + } + } + } + }, + "HealthCheckPostPatchResponse": { + "type": "object", + "properties": { + "jsonapi": { + "type": "object", + "properties": { + "version": { + "type": "string", + "default": "1.1" + }, + "ext": { + "type": "string", + "default": "https://jsonapi.org/profiles/ethanresnick/cursor-pagination" + } + } + }, + "id": { + "type": "integer" + }, + "type": { + "type": "string", + "default": "HealthCheck" + }, + "data": { + "type": "object", + "properties": { + "time": { + "type": "integer", + "format": "int64" + }, + "status": { + "type": "integer" + }, + "checkType": { + "type": "integer" + }, + "hashtypeId": { + "type": "integer" + }, + "crackerBinaryId": { + "type": "integer" + }, + "expectedCracks": { + "type": "integer" + }, + "attackCmd": { + "type": "string" + } + } + } + } + }, + "HealthCheckListResponse": { + "allOf": [ + { + "$ref": "#/components/schemas/ListResponse" + }, + { + "type": "object", + "properties": { + "values": { + "type": "array", + "items": { + "$ref": "#/components/schemas/HealthCheckResponse" + } + } + } + } + ] + }, + "LogEntryCreate": { + "type": "object", + "properties": { + "data": { + "type": "object", + "properties": { + "type": { + "type": "string" + }, + "attributes": { + "type": "object", + "properties": { + "issuer": { + "type": "string" + }, + "issuerId": { + "type": "string" + }, + "level": { + "type": "string" + }, + "message": { + "type": "string" + }, + "time": { + "type": "integer", + "format": "int64" + } + } + } + } + } + } + }, + "LogEntryPatch": { + "type": "object", + "properties": { + "data": { + "type": "object", + "properties": { + "type": { + "type": "string" + }, + "attributes": { + "type": "object", + "properties": [] + } + } + } + } + }, + "LogEntryResponse": { + "type": "object", + "properties": { + "jsonapi": { + "type": "object", + "properties": { + "version": { + "type": "string", + "default": "1.1" + }, + "ext": { + "type": "string", + "default": "https://jsonapi.org/profiles/ethanresnick/cursor-pagination" + } + } + }, + "links": { + "type": "object", + "properties": { + "self": { + "type": "string", + "default": "/api/v2/ui/logentries?page[size]=25" + }, + "first": { + "type": "string", + "default": "/api/v2/ui/logentries?page[size]=25&page[after]=0" + }, + "last": { + "type": "string", + "default": "/api/v2/ui/logentries?page[size]=25&page[before]=500" + }, + "next": { + "type": "string", + "default": "/api/v2/ui/logentries?page[size]=25&page[after]=25" + }, + "previous": { + "type": "string", + "default": "/api/v2/ui/logentries?page[size]=25&page[before]=25" + } + } + }, + "id": { + "type": "integer" + }, + "type": { + "type": "string", + "default": "LogEntry" + }, + "data": { + "type": "object", + "properties": { + "issuer": { + "type": "string" + }, + "issuerId": { + "type": "string" + }, + "level": { + "type": "string" + }, + "message": { + "type": "string" + }, + "time": { + "type": "integer", + "format": "int64" + } + } + }, + "relationships": { + "type": "object", + "properties": [] + }, + "included": { + "type": "array", + "items": { + "type": "object", + "properties": [] + } + } + } + }, + "LogEntrySingleResponse": { + "type": "object", + "properties": { + "id": { + "type": "integer" + }, + "type": { + "type": "string", + "default": "LogEntry" + }, + "data": { + "type": "object", + "properties": { + "issuer": { + "type": "string" + }, + "issuerId": { + "type": "string" + }, + "level": { + "type": "string" + }, + "message": { + "type": "string" + }, + "time": { + "type": "integer", + "format": "int64" + } + } + }, + "relationships": { + "type": "object", + "properties": [] + }, + "included": { + "type": "array", + "items": { + "type": "object", + "properties": [] + } + } + } + }, + "LogEntryPostPatchResponse": { + "type": "object", + "properties": { + "jsonapi": { + "type": "object", + "properties": { + "version": { + "type": "string", + "default": "1.1" + }, + "ext": { + "type": "string", + "default": "https://jsonapi.org/profiles/ethanresnick/cursor-pagination" + } + } + }, + "id": { + "type": "integer" + }, + "type": { + "type": "string", + "default": "LogEntry" + }, + "data": { + "type": "object", + "properties": { + "issuer": { + "type": "string" + }, + "issuerId": { + "type": "string" + }, + "level": { + "type": "string" + }, + "message": { + "type": "string" + }, + "time": { + "type": "integer", + "format": "int64" + } + } + } + } + }, + "LogEntryListResponse": { + "allOf": [ + { + "$ref": "#/components/schemas/ListResponse" + }, + { + "type": "object", + "properties": { + "values": { + "type": "array", + "items": { + "$ref": "#/components/schemas/LogEntryResponse" + } + } + } + } + ] + }, + "NotificationSettingCreate": { + "type": "object", + "properties": { + "data": { + "type": "object", + "properties": { + "type": { + "type": "string" + }, + "attributes": { + "type": "object", + "properties": { + "actionFilter": { + "type": "string" + }, + "action": { + "type": "string" + }, + "objectId": { + "type": "integer" + }, + "notification": { + "type": "string" + }, + "userId": { + "type": "integer" + }, + "receiver": { + "type": "string" + }, + "isActive": { + "type": "boolean" + } + } + } + } + } + } + }, + "NotificationSettingPatch": { + "type": "object", + "properties": { + "data": { + "type": "object", + "properties": { + "type": { + "type": "string" + }, + "attributes": { + "type": "object", + "properties": { + "action": { + "type": "string" + }, + "isActive": { + "type": "boolean" + }, + "notification": { + "type": "string" + }, + "receiver": { + "type": "string" + } + } + } + } + } + } + }, + "NotificationSettingResponse": { + "type": "object", + "properties": { + "jsonapi": { + "type": "object", + "properties": { + "version": { + "type": "string", + "default": "1.1" + }, + "ext": { + "type": "string", + "default": "https://jsonapi.org/profiles/ethanresnick/cursor-pagination" + } + } + }, + "links": { + "type": "object", + "properties": { + "self": { + "type": "string", + "default": "/api/v2/ui/notifications?page[size]=25" + }, + "first": { + "type": "string", + "default": "/api/v2/ui/notifications?page[size]=25&page[after]=0" + }, + "last": { + "type": "string", + "default": "/api/v2/ui/notifications?page[size]=25&page[before]=500" + }, + "next": { + "type": "string", + "default": "/api/v2/ui/notifications?page[size]=25&page[after]=25" + }, + "previous": { + "type": "string", + "default": "/api/v2/ui/notifications?page[size]=25&page[before]=25" + } + } + }, + "id": { + "type": "integer" + }, + "type": { + "type": "string", + "default": "NotificationSetting" + }, + "data": { + "type": "object", + "properties": { + "action": { + "type": "string" + }, + "objectId": { + "type": "integer" + }, + "notification": { + "type": "string" + }, + "userId": { + "type": "integer" + }, + "receiver": { + "type": "string" + }, + "isActive": { + "type": "boolean" + } + } + }, + "relationships": { + "type": "object", + "properties": [ + { + "properties": { + "user": { + "type": "object", + "properties": { + "links": { + "type": "object", + "properties": { + "self": { + "type": "string", + "default": "/api/v2/ui/notifications/relationships/user" + }, + "related": { + "type": "string", + "default": "/api/v2/ui/notifications/user" + } + } + } + } + } + } + } + ] + }, + "included": { + "type": "array", + "items": { + "type": "object", + "properties": [ + { + "properties": { + "id": { + "type": "integer" + }, + "type": { + "type": "string", + "default": "user" + }, + "attributes": { + "type": "object", + "properties": { + "id": { + "type": "integer" + }, + "name": { + "type": "string" + }, + "email": { + "type": "string" + }, + "passwordHash": { + "type": "string" + }, + "passwordSalt": { + "type": "string" + }, + "isValid": { + "type": "boolean" + }, + "isComputedPassword": { + "type": "boolean" + }, + "lastLoginDate": { + "type": "integer", + "format": "int64" + }, + "registeredSince": { + "type": "integer", + "format": "int64" + }, + "sessionLifetime": { + "type": "integer" + }, + "globalPermissionGroupId": { + "type": "integer" + }, + "yubikey": { + "type": "string" + }, + "otp1": { + "type": "string" + }, + "otp2": { + "type": "string" + }, + "otp3": { + "type": "string" + }, + "otp4": { + "type": "string" + } + } + } + } + } + ] + } + } + } + }, + "NotificationSettingSingleResponse": { + "type": "object", + "properties": { + "id": { + "type": "integer" + }, + "type": { + "type": "string", + "default": "NotificationSetting" + }, + "data": { + "type": "object", + "properties": { + "action": { + "type": "string" + }, + "objectId": { + "type": "integer" + }, + "notification": { + "type": "string" + }, + "userId": { + "type": "integer" + }, + "receiver": { + "type": "string" + }, + "isActive": { + "type": "boolean" + } + } + }, + "relationships": { + "type": "object", + "properties": [ + { + "properties": { + "user": { + "type": "object", + "properties": { + "links": { + "type": "object", + "properties": { + "self": { + "type": "string", + "default": "/api/v2/ui/notifications/relationships/user" + }, + "related": { + "type": "string", + "default": "/api/v2/ui/notifications/user" + } + } + } + } + } + } + } + ] + }, + "included": { + "type": "array", + "items": { + "type": "object", + "properties": [ + { + "properties": { + "id": { + "type": "integer" + }, + "type": { + "type": "string", + "default": "user" + }, + "attributes": { + "type": "object", + "properties": { + "id": { + "type": "integer" + }, + "name": { + "type": "string" + }, + "email": { + "type": "string" + }, + "passwordHash": { + "type": "string" + }, + "passwordSalt": { + "type": "string" + }, + "isValid": { + "type": "boolean" + }, + "isComputedPassword": { + "type": "boolean" + }, + "lastLoginDate": { + "type": "integer", + "format": "int64" + }, + "registeredSince": { + "type": "integer", + "format": "int64" + }, + "sessionLifetime": { + "type": "integer" + }, + "globalPermissionGroupId": { + "type": "integer" + }, + "yubikey": { + "type": "string" + }, + "otp1": { + "type": "string" + }, + "otp2": { + "type": "string" + }, + "otp3": { + "type": "string" + }, + "otp4": { + "type": "string" + } + } + } + } + } + ] + } + } + } + }, + "NotificationSettingPostPatchResponse": { + "type": "object", + "properties": { + "jsonapi": { + "type": "object", + "properties": { + "version": { + "type": "string", + "default": "1.1" + }, + "ext": { + "type": "string", + "default": "https://jsonapi.org/profiles/ethanresnick/cursor-pagination" + } + } + }, + "id": { + "type": "integer" + }, + "type": { + "type": "string", + "default": "NotificationSetting" + }, + "data": { + "type": "object", + "properties": { + "action": { + "type": "string" + }, + "objectId": { + "type": "integer" + }, + "notification": { + "type": "string" + }, + "userId": { + "type": "integer" + }, + "receiver": { + "type": "string" + }, + "isActive": { + "type": "boolean" + } + } + } + } + }, + "NotificationSettingListResponse": { + "allOf": [ + { + "$ref": "#/components/schemas/ListResponse" + }, + { + "type": "object", + "properties": { + "values": { + "type": "array", + "items": { + "$ref": "#/components/schemas/NotificationSettingResponse" + } + } + } + } + ] + }, + "PreprocessorCreate": { + "type": "object", + "properties": { + "data": { + "type": "object", + "properties": { + "type": { + "type": "string" + }, + "attributes": { + "type": "object", + "properties": { + "name": { + "type": "string" + }, + "url": { + "type": "string" + }, + "binaryName": { + "type": "string" + }, + "keyspaceCommand": { + "type": "string" + }, + "skipCommand": { + "type": "string" + }, + "limitCommand": { + "type": "string" + } + } + } + } + } + } + }, + "PreprocessorPatch": { + "type": "object", + "properties": { + "data": { + "type": "object", + "properties": { + "type": { + "type": "string" + }, + "attributes": { + "type": "object", + "properties": { + "binaryName": { + "type": "string" + }, + "keyspaceCommand": { + "type": "string" + }, + "limitCommand": { + "type": "string" + }, + "name": { + "type": "string" + }, + "skipCommand": { + "type": "string" + }, + "url": { + "type": "string" + } + } + } + } + } + } + }, + "PreprocessorResponse": { + "type": "object", + "properties": { + "jsonapi": { + "type": "object", + "properties": { + "version": { + "type": "string", + "default": "1.1" + }, + "ext": { + "type": "string", + "default": "https://jsonapi.org/profiles/ethanresnick/cursor-pagination" + } + } + }, + "links": { + "type": "object", + "properties": { + "self": { + "type": "string", + "default": "/api/v2/ui/preprocessors?page[size]=25" + }, + "first": { + "type": "string", + "default": "/api/v2/ui/preprocessors?page[size]=25&page[after]=0" + }, + "last": { + "type": "string", + "default": "/api/v2/ui/preprocessors?page[size]=25&page[before]=500" + }, + "next": { + "type": "string", + "default": "/api/v2/ui/preprocessors?page[size]=25&page[after]=25" + }, + "previous": { + "type": "string", + "default": "/api/v2/ui/preprocessors?page[size]=25&page[before]=25" + } + } + }, + "id": { + "type": "integer" + }, + "type": { + "type": "string", + "default": "Preprocessor" + }, + "data": { + "type": "object", + "properties": { + "name": { + "type": "string" + }, + "url": { + "type": "string" + }, + "binaryName": { + "type": "string" + }, + "keyspaceCommand": { + "type": "string" + }, + "skipCommand": { + "type": "string" + }, + "limitCommand": { + "type": "string" + } + } + }, + "relationships": { + "type": "object", + "properties": [] + }, + "included": { + "type": "array", + "items": { + "type": "object", + "properties": [] + } + } + } + }, + "PreprocessorSingleResponse": { + "type": "object", + "properties": { + "id": { + "type": "integer" + }, + "type": { + "type": "string", + "default": "Preprocessor" + }, + "data": { + "type": "object", + "properties": { + "name": { + "type": "string" + }, + "url": { + "type": "string" + }, + "binaryName": { + "type": "string" + }, + "keyspaceCommand": { + "type": "string" + }, + "skipCommand": { + "type": "string" + }, + "limitCommand": { + "type": "string" + } + } + }, + "relationships": { + "type": "object", + "properties": [] + }, + "included": { + "type": "array", + "items": { + "type": "object", + "properties": [] + } + } + } + }, + "PreprocessorPostPatchResponse": { + "type": "object", + "properties": { + "jsonapi": { + "type": "object", + "properties": { + "version": { + "type": "string", + "default": "1.1" + }, + "ext": { + "type": "string", + "default": "https://jsonapi.org/profiles/ethanresnick/cursor-pagination" + } + } + }, + "id": { + "type": "integer" + }, + "type": { + "type": "string", + "default": "Preprocessor" + }, + "data": { + "type": "object", + "properties": { + "name": { + "type": "string" + }, + "url": { + "type": "string" + }, + "binaryName": { + "type": "string" + }, + "keyspaceCommand": { + "type": "string" + }, + "skipCommand": { + "type": "string" + }, + "limitCommand": { + "type": "string" + } + } + } + } + }, + "PreprocessorListResponse": { + "allOf": [ + { + "$ref": "#/components/schemas/ListResponse" + }, + { + "type": "object", + "properties": { + "values": { + "type": "array", + "items": { + "$ref": "#/components/schemas/PreprocessorResponse" + } + } + } + } + ] + }, + "PretaskCreate": { + "type": "object", + "properties": { + "data": { + "type": "object", + "properties": { + "type": { + "type": "string" + }, + "attributes": { + "type": "object", + "properties": { + "files": { + "type": "array" + }, + "taskName": { + "type": "string" + }, + "attackCmd": { + "type": "string" + }, + "chunkTime": { + "type": "integer" + }, + "statusTimer": { + "type": "integer" + }, + "color": { + "type": "string" + }, + "isSmall": { + "type": "boolean" + }, + "isCpuTask": { + "type": "boolean" + }, + "useNewBench": { + "type": "boolean" + }, + "priority": { + "type": "integer" + }, + "maxAgents": { + "type": "integer" + }, + "isMaskImport": { + "type": "boolean" + }, + "crackerBinaryTypeId": { + "type": "integer" + } + } + } + } + } + } + }, + "PretaskPatch": { + "type": "object", + "properties": { + "data": { + "type": "object", + "properties": { + "type": { + "type": "string" + }, + "attributes": { + "type": "object", + "properties": { + "attackCmd": { + "type": "string" + }, + "chunkTime": { + "type": "integer" + }, + "color": { + "type": "string" + }, + "crackerBinaryTypeId": { + "type": "integer" + }, + "isCpuTask": { + "type": "boolean" + }, + "isMaskImport": { + "type": "boolean" + }, + "isSmall": { + "type": "boolean" + }, + "maxAgents": { + "type": "integer" + }, + "priority": { + "type": "integer" + }, + "statusTimer": { + "type": "integer" + }, + "taskName": { + "type": "string" + } + } + } + } + } + } + }, + "PretaskResponse": { + "type": "object", + "properties": { + "jsonapi": { + "type": "object", + "properties": { + "version": { + "type": "string", + "default": "1.1" + }, + "ext": { + "type": "string", + "default": "https://jsonapi.org/profiles/ethanresnick/cursor-pagination" + } + } + }, + "links": { + "type": "object", + "properties": { + "self": { + "type": "string", + "default": "/api/v2/ui/pretasks?page[size]=25" + }, + "first": { + "type": "string", + "default": "/api/v2/ui/pretasks?page[size]=25&page[after]=0" + }, + "last": { + "type": "string", + "default": "/api/v2/ui/pretasks?page[size]=25&page[before]=500" + }, + "next": { + "type": "string", + "default": "/api/v2/ui/pretasks?page[size]=25&page[after]=25" + }, + "previous": { + "type": "string", + "default": "/api/v2/ui/pretasks?page[size]=25&page[before]=25" + } + } + }, + "id": { + "type": "integer" + }, + "type": { + "type": "string", + "default": "Pretask" + }, + "data": { + "type": "object", + "properties": { + "taskName": { + "type": "string" + }, + "attackCmd": { + "type": "string" + }, + "chunkTime": { + "type": "integer" + }, + "statusTimer": { + "type": "integer" + }, + "color": { + "type": "string" + }, + "isSmall": { + "type": "boolean" + }, + "isCpuTask": { + "type": "boolean" + }, + "useNewBench": { + "type": "boolean" + }, + "priority": { + "type": "integer" + }, + "maxAgents": { + "type": "integer" + }, + "isMaskImport": { + "type": "boolean" + }, + "crackerBinaryTypeId": { + "type": "integer" + } + } + }, + "relationships": { + "type": "object", + "properties": [ + { + "properties": { + "pretaskFiles": { + "type": "object", + "properties": { + "links": { + "type": "object", + "properties": { + "self": { + "type": "string", + "default": "/api/v2/ui/pretasks/relationships/pretaskFiles" + }, + "related": { + "type": "string", + "default": "/api/v2/ui/pretasks/pretaskFiles" + } + } + } + } + } + } + } + ] + }, + "included": { + "type": "array", + "items": { + "type": "object", + "properties": [ + { + "properties": { + "id": { + "type": "integer" + }, + "type": { + "type": "string", + "default": "pretaskFiles" + }, + "attributes": { + "type": "object", + "properties": { + "sourceType": { + "type": "string" + }, + "sourceData": { + "type": "string" + }, + "fileId": { + "type": "integer" + }, + "filename": { + "type": "string" + }, + "size": { + "type": "integer", + "format": "int64" + }, + "isSecret": { + "type": "boolean" + }, + "fileType": { + "type": "integer" + }, + "accessGroupId": { + "type": "integer" + }, + "lineCount": { + "type": "integer", + "format": "int64" + } + } + } + } + } + ] + } + } + } + }, + "PretaskSingleResponse": { + "type": "object", + "properties": { + "id": { + "type": "integer" + }, + "type": { + "type": "string", + "default": "Pretask" + }, + "data": { + "type": "object", + "properties": { + "taskName": { + "type": "string" + }, + "attackCmd": { + "type": "string" + }, + "chunkTime": { + "type": "integer" + }, + "statusTimer": { + "type": "integer" + }, + "color": { + "type": "string" + }, + "isSmall": { + "type": "boolean" + }, + "isCpuTask": { + "type": "boolean" + }, + "useNewBench": { + "type": "boolean" + }, + "priority": { + "type": "integer" + }, + "maxAgents": { + "type": "integer" + }, + "isMaskImport": { + "type": "boolean" + }, + "crackerBinaryTypeId": { + "type": "integer" + } + } + }, + "relationships": { + "type": "object", + "properties": [ + { + "properties": { + "pretaskFiles": { + "type": "object", + "properties": { + "links": { + "type": "object", + "properties": { + "self": { + "type": "string", + "default": "/api/v2/ui/pretasks/relationships/pretaskFiles" + }, + "related": { + "type": "string", + "default": "/api/v2/ui/pretasks/pretaskFiles" + } + } + } + } + } + } + } + ] + }, + "included": { + "type": "array", + "items": { + "type": "object", + "properties": [ + { + "properties": { + "id": { + "type": "integer" + }, + "type": { + "type": "string", + "default": "pretaskFiles" + }, + "attributes": { + "type": "object", + "properties": { + "sourceType": { + "type": "string" + }, + "sourceData": { + "type": "string" + }, + "fileId": { + "type": "integer" + }, + "filename": { + "type": "string" + }, + "size": { + "type": "integer", + "format": "int64" + }, + "isSecret": { + "type": "boolean" + }, + "fileType": { + "type": "integer" + }, + "accessGroupId": { + "type": "integer" + }, + "lineCount": { + "type": "integer", + "format": "int64" + } + } + } + } + } + ] + } + } + } + }, + "PretaskPostPatchResponse": { + "type": "object", + "properties": { + "jsonapi": { + "type": "object", + "properties": { + "version": { + "type": "string", + "default": "1.1" + }, + "ext": { + "type": "string", + "default": "https://jsonapi.org/profiles/ethanresnick/cursor-pagination" + } + } + }, + "id": { + "type": "integer" + }, + "type": { + "type": "string", + "default": "Pretask" + }, + "data": { + "type": "object", + "properties": { + "taskName": { + "type": "string" + }, + "attackCmd": { + "type": "string" + }, + "chunkTime": { + "type": "integer" + }, + "statusTimer": { + "type": "integer" + }, + "color": { + "type": "string" + }, + "isSmall": { + "type": "boolean" + }, + "isCpuTask": { + "type": "boolean" + }, + "useNewBench": { + "type": "boolean" + }, + "priority": { + "type": "integer" + }, + "maxAgents": { + "type": "integer" + }, + "isMaskImport": { + "type": "boolean" + }, + "crackerBinaryTypeId": { + "type": "integer" + } + } + } + } + }, + "PretaskListResponse": { + "allOf": [ + { + "$ref": "#/components/schemas/ListResponse" + }, + { + "type": "object", + "properties": { + "values": { + "type": "array", + "items": { + "$ref": "#/components/schemas/PretaskResponse" + } + } + } + } + ] + }, + "SpeedCreate": { + "type": "object", + "properties": { + "data": { + "type": "object", + "properties": { + "type": { + "type": "string" + }, + "attributes": { + "type": "object", + "properties": { + "agentId": { + "type": "integer" + }, + "taskId": { + "type": "integer" + }, + "speed": { + "type": "integer", + "format": "int64" + }, + "time": { + "type": "integer", + "format": "int64" + } + } + } + } + } + } + }, + "SpeedPatch": { + "type": "object", + "properties": { + "data": { + "type": "object", + "properties": { + "type": { + "type": "string" + }, + "attributes": { + "type": "object", + "properties": [] + } + } + } + } + }, + "SpeedResponse": { + "type": "object", + "properties": { + "jsonapi": { + "type": "object", + "properties": { + "version": { + "type": "string", + "default": "1.1" + }, + "ext": { + "type": "string", + "default": "https://jsonapi.org/profiles/ethanresnick/cursor-pagination" + } + } + }, + "links": { + "type": "object", + "properties": { + "self": { + "type": "string", + "default": "/api/v2/ui/speeds?page[size]=25" + }, + "first": { + "type": "string", + "default": "/api/v2/ui/speeds?page[size]=25&page[after]=0" + }, + "last": { + "type": "string", + "default": "/api/v2/ui/speeds?page[size]=25&page[before]=500" + }, + "next": { + "type": "string", + "default": "/api/v2/ui/speeds?page[size]=25&page[after]=25" + }, + "previous": { + "type": "string", + "default": "/api/v2/ui/speeds?page[size]=25&page[before]=25" + } + } + }, + "id": { + "type": "integer" + }, + "type": { + "type": "string", + "default": "Speed" + }, + "data": { + "type": "object", + "properties": { + "agentId": { + "type": "integer" + }, + "taskId": { + "type": "integer" + }, + "speed": { + "type": "integer", + "format": "int64" + }, + "time": { + "type": "integer", + "format": "int64" + } + } + }, + "relationships": { + "type": "object", + "properties": [ + { + "properties": { + "agent": { + "type": "object", + "properties": { + "links": { + "type": "object", + "properties": { + "self": { + "type": "string", + "default": "/api/v2/ui/speeds/relationships/agent" + }, + "related": { + "type": "string", + "default": "/api/v2/ui/speeds/agent" + } + } + } + } + } + } + }, + { + "properties": { + "task": { + "type": "object", + "properties": { + "links": { + "type": "object", + "properties": { + "self": { + "type": "string", + "default": "/api/v2/ui/speeds/relationships/task" + }, + "related": { + "type": "string", + "default": "/api/v2/ui/speeds/task" + } + } + } + } + } + } + } + ] + }, + "included": { + "type": "array", + "items": { + "type": "object", + "properties": [ + { + "properties": { + "id": { + "type": "integer" + }, + "type": { + "type": "string", + "default": "agent" + }, + "attributes": { + "type": "object", + "properties": { + "agentId": { + "type": "integer" + }, + "agentName": { + "type": "string" + }, + "uid": { + "type": "string" + }, + "os": { + "type": "integer" + }, + "devices": { + "type": "string" + }, + "cmdPars": { + "type": "string" + }, + "ignoreErrors": { + "type": "integer", + "enum": [ + 0, + 1, + 2 + ] + }, + "isActive": { + "type": "boolean" + }, + "isTrusted": { + "type": "boolean" + }, + "token": { + "type": "string" + }, + "lastAct": { + "type": "string" + }, + "lastTime": { + "type": "integer", + "format": "int64" + }, + "lastIp": { + "type": "string" + }, + "userId": { + "type": "integer" + }, + "cpuOnly": { + "type": "boolean" + }, + "clientSignature": { + "type": "string" + } + } + } + } + }, + { + "properties": { + "id": { + "type": "integer" + }, + "type": { + "type": "string", + "default": "task" + }, + "attributes": { + "type": "object", + "properties": { + "hashlistId": { + "type": "integer" + }, + "files": { + "type": "array" + }, + "taskId": { + "type": "integer" + }, + "taskName": { + "type": "string" + }, + "attackCmd": { + "type": "string" + }, + "chunkTime": { + "type": "integer" + }, + "statusTimer": { + "type": "integer" + }, + "keyspace": { + "type": "integer", + "format": "int64" + }, + "keyspaceProgress": { + "type": "integer", + "format": "int64" + }, + "priority": { + "type": "integer" + }, + "maxAgents": { + "type": "integer" + }, + "color": { + "type": "string" + }, + "isSmall": { + "type": "boolean" + }, + "isCpuTask": { + "type": "boolean" + }, + "useNewBench": { + "type": "boolean" + }, + "skipKeyspace": { + "type": "integer", + "format": "int64" + }, + "crackerBinaryId": { + "type": "integer" + }, + "crackerBinaryTypeId": { + "type": "integer" + }, + "taskWrapperId": { + "type": "integer" + }, + "isArchived": { + "type": "boolean" + }, + "notes": { + "type": "string" + }, + "staticChunks": { + "type": "integer" + }, + "chunkSize": { + "type": "integer", + "format": "int64" + }, + "forcePipe": { + "type": "boolean" + }, + "preprocessorId": { + "type": "integer" + }, + "preprocessorCommand": { + "type": "string" + } + } + } + } + } + ] + } + } + } + }, + "SpeedSingleResponse": { + "type": "object", + "properties": { + "id": { + "type": "integer" + }, + "type": { + "type": "string", + "default": "Speed" + }, + "data": { + "type": "object", + "properties": { + "agentId": { + "type": "integer" + }, + "taskId": { + "type": "integer" + }, + "speed": { + "type": "integer", + "format": "int64" + }, + "time": { + "type": "integer", + "format": "int64" + } + } + }, + "relationships": { + "type": "object", + "properties": [ + { + "properties": { + "agent": { + "type": "object", + "properties": { + "links": { + "type": "object", + "properties": { + "self": { + "type": "string", + "default": "/api/v2/ui/speeds/relationships/agent" + }, + "related": { + "type": "string", + "default": "/api/v2/ui/speeds/agent" + } + } + } + } + } + } + }, + { + "properties": { + "task": { + "type": "object", + "properties": { + "links": { + "type": "object", + "properties": { + "self": { + "type": "string", + "default": "/api/v2/ui/speeds/relationships/task" + }, + "related": { + "type": "string", + "default": "/api/v2/ui/speeds/task" + } + } + } + } + } + } + } + ] + }, + "included": { + "type": "array", + "items": { + "type": "object", + "properties": [ + { + "properties": { + "id": { + "type": "integer" + }, + "type": { + "type": "string", + "default": "agent" + }, + "attributes": { + "type": "object", + "properties": { + "agentId": { + "type": "integer" + }, + "agentName": { + "type": "string" + }, + "uid": { + "type": "string" + }, + "os": { + "type": "integer" + }, + "devices": { + "type": "string" + }, + "cmdPars": { + "type": "string" + }, + "ignoreErrors": { + "type": "integer", + "enum": [ + 0, + 1, + 2 + ] + }, + "isActive": { + "type": "boolean" + }, + "isTrusted": { + "type": "boolean" + }, + "token": { + "type": "string" + }, + "lastAct": { + "type": "string" + }, + "lastTime": { + "type": "integer", + "format": "int64" + }, + "lastIp": { + "type": "string" + }, + "userId": { + "type": "integer" + }, + "cpuOnly": { + "type": "boolean" + }, + "clientSignature": { + "type": "string" + } + } + } + } + }, + { + "properties": { + "id": { + "type": "integer" + }, + "type": { + "type": "string", + "default": "task" + }, + "attributes": { + "type": "object", + "properties": { + "hashlistId": { + "type": "integer" + }, + "files": { + "type": "array" + }, + "taskId": { + "type": "integer" + }, + "taskName": { + "type": "string" + }, + "attackCmd": { + "type": "string" + }, + "chunkTime": { + "type": "integer" + }, + "statusTimer": { + "type": "integer" + }, + "keyspace": { + "type": "integer", + "format": "int64" + }, + "keyspaceProgress": { + "type": "integer", + "format": "int64" + }, + "priority": { + "type": "integer" + }, + "maxAgents": { + "type": "integer" + }, + "color": { + "type": "string" + }, + "isSmall": { + "type": "boolean" + }, + "isCpuTask": { + "type": "boolean" + }, + "useNewBench": { + "type": "boolean" + }, + "skipKeyspace": { + "type": "integer", + "format": "int64" + }, + "crackerBinaryId": { + "type": "integer" + }, + "crackerBinaryTypeId": { + "type": "integer" + }, + "taskWrapperId": { + "type": "integer" + }, + "isArchived": { + "type": "boolean" + }, + "notes": { + "type": "string" + }, + "staticChunks": { + "type": "integer" + }, + "chunkSize": { + "type": "integer", + "format": "int64" + }, + "forcePipe": { + "type": "boolean" + }, + "preprocessorId": { + "type": "integer" + }, + "preprocessorCommand": { + "type": "string" + } + } + } + } + } + ] + } + } + } + }, + "SpeedPostPatchResponse": { + "type": "object", + "properties": { + "jsonapi": { + "type": "object", + "properties": { + "version": { + "type": "string", + "default": "1.1" + }, + "ext": { + "type": "string", + "default": "https://jsonapi.org/profiles/ethanresnick/cursor-pagination" + } + } + }, + "id": { + "type": "integer" + }, + "type": { + "type": "string", + "default": "Speed" + }, + "data": { + "type": "object", + "properties": { + "agentId": { + "type": "integer" + }, + "taskId": { + "type": "integer" + }, + "speed": { + "type": "integer", + "format": "int64" + }, + "time": { + "type": "integer", + "format": "int64" + } + } + } + } + }, + "SpeedListResponse": { + "allOf": [ + { + "$ref": "#/components/schemas/ListResponse" + }, + { + "type": "object", + "properties": { + "values": { + "type": "array", + "items": { + "$ref": "#/components/schemas/SpeedResponse" + } + } + } + } + ] + }, + "SupertaskCreate": { + "type": "object", + "properties": { + "data": { + "type": "object", + "properties": { + "type": { + "type": "string" + }, + "attributes": { + "type": "object", + "properties": { + "pretasks": { + "type": "array" + }, + "supertaskName": { + "type": "string" + } + } + } + } + } + } + }, + "SupertaskPatch": { + "type": "object", + "properties": { + "data": { + "type": "object", + "properties": { + "type": { + "type": "string" + }, + "attributes": { + "type": "object", + "properties": { + "supertaskName": { + "type": "string" + } + } + } + } + } + } + }, + "SupertaskResponse": { + "type": "object", + "properties": { + "jsonapi": { + "type": "object", + "properties": { + "version": { + "type": "string", + "default": "1.1" + }, + "ext": { + "type": "string", + "default": "https://jsonapi.org/profiles/ethanresnick/cursor-pagination" + } + } + }, + "links": { + "type": "object", + "properties": { + "self": { + "type": "string", + "default": "/api/v2/ui/supertasks?page[size]=25" + }, + "first": { + "type": "string", + "default": "/api/v2/ui/supertasks?page[size]=25&page[after]=0" + }, + "last": { + "type": "string", + "default": "/api/v2/ui/supertasks?page[size]=25&page[before]=500" + }, + "next": { + "type": "string", + "default": "/api/v2/ui/supertasks?page[size]=25&page[after]=25" + }, + "previous": { + "type": "string", + "default": "/api/v2/ui/supertasks?page[size]=25&page[before]=25" + } + } + }, + "id": { + "type": "integer" + }, + "type": { + "type": "string", + "default": "Supertask" + }, + "data": { + "type": "object", + "properties": { + "supertaskName": { + "type": "string" + } + } + }, + "relationships": { + "type": "object", + "properties": [ + { + "properties": { + "pretasks": { + "type": "object", + "properties": { + "links": { + "type": "object", + "properties": { + "self": { + "type": "string", + "default": "/api/v2/ui/supertasks/relationships/pretasks" + }, + "related": { + "type": "string", + "default": "/api/v2/ui/supertasks/pretasks" + } + } + } + } + } + } + } + ] + }, + "included": { + "type": "array", + "items": { + "type": "object", + "properties": [ + { + "properties": { + "id": { + "type": "integer" + }, + "type": { + "type": "string", + "default": "pretasks" + }, + "attributes": { + "type": "object", + "properties": { + "files": { + "type": "array" + }, + "pretaskId": { + "type": "integer" + }, + "taskName": { + "type": "string" + }, + "attackCmd": { + "type": "string" + }, + "chunkTime": { + "type": "integer" + }, + "statusTimer": { + "type": "integer" + }, + "color": { + "type": "string" + }, + "isSmall": { + "type": "boolean" + }, + "isCpuTask": { + "type": "boolean" + }, + "useNewBench": { + "type": "boolean" + }, + "priority": { + "type": "integer" + }, + "maxAgents": { + "type": "integer" + }, + "isMaskImport": { + "type": "boolean" + }, + "crackerBinaryTypeId": { + "type": "integer" + } + } + } + } + } + ] + } + } + } + }, + "SupertaskSingleResponse": { + "type": "object", + "properties": { + "id": { + "type": "integer" + }, + "type": { + "type": "string", + "default": "Supertask" + }, + "data": { + "type": "object", + "properties": { + "supertaskName": { + "type": "string" + } + } + }, + "relationships": { + "type": "object", + "properties": [ + { + "properties": { + "pretasks": { + "type": "object", + "properties": { + "links": { + "type": "object", + "properties": { + "self": { + "type": "string", + "default": "/api/v2/ui/supertasks/relationships/pretasks" + }, + "related": { + "type": "string", + "default": "/api/v2/ui/supertasks/pretasks" + } + } + } + } + } + } + } + ] + }, + "included": { + "type": "array", + "items": { + "type": "object", + "properties": [ + { + "properties": { + "id": { + "type": "integer" + }, + "type": { + "type": "string", + "default": "pretasks" + }, + "attributes": { + "type": "object", + "properties": { + "files": { + "type": "array" + }, + "pretaskId": { + "type": "integer" + }, + "taskName": { + "type": "string" + }, + "attackCmd": { + "type": "string" + }, + "chunkTime": { + "type": "integer" + }, + "statusTimer": { + "type": "integer" + }, + "color": { + "type": "string" + }, + "isSmall": { + "type": "boolean" + }, + "isCpuTask": { + "type": "boolean" + }, + "useNewBench": { + "type": "boolean" + }, + "priority": { + "type": "integer" + }, + "maxAgents": { + "type": "integer" + }, + "isMaskImport": { + "type": "boolean" + }, + "crackerBinaryTypeId": { + "type": "integer" + } + } + } + } + } + ] + } + } + } + }, + "SupertaskPostPatchResponse": { + "type": "object", + "properties": { + "jsonapi": { + "type": "object", + "properties": { + "version": { + "type": "string", + "default": "1.1" + }, + "ext": { + "type": "string", + "default": "https://jsonapi.org/profiles/ethanresnick/cursor-pagination" + } + } + }, + "id": { + "type": "integer" + }, + "type": { + "type": "string", + "default": "Supertask" + }, + "data": { + "type": "object", + "properties": { + "supertaskName": { + "type": "string" + } + } + } + } + }, + "SupertaskListResponse": { + "allOf": [ + { + "$ref": "#/components/schemas/ListResponse" + }, + { + "type": "object", + "properties": { + "values": { + "type": "array", + "items": { + "$ref": "#/components/schemas/SupertaskResponse" + } + } + } + } + ] + }, + "TaskCreate": { + "type": "object", + "properties": { + "data": { + "type": "object", + "properties": { + "type": { + "type": "string" + }, + "attributes": { + "type": "object", + "properties": { + "hashlistId": { + "type": "integer" + }, + "files": { + "type": "array" + }, + "taskName": { + "type": "string" + }, + "attackCmd": { + "type": "string" + }, + "chunkTime": { + "type": "integer" + }, + "statusTimer": { + "type": "integer" + }, + "keyspace": { + "type": "integer", + "format": "int64" + }, + "keyspaceProgress": { + "type": "integer", + "format": "int64" + }, + "priority": { + "type": "integer" + }, + "maxAgents": { + "type": "integer" + }, + "color": { + "type": "string" + }, + "isSmall": { + "type": "boolean" + }, + "isCpuTask": { + "type": "boolean" + }, + "useNewBench": { + "type": "boolean" + }, + "skipKeyspace": { + "type": "integer", + "format": "int64" + }, + "crackerBinaryId": { + "type": "integer" + }, + "crackerBinaryTypeId": { + "type": "integer" + }, + "taskWrapperId": { + "type": "integer" + }, + "isArchived": { + "type": "boolean" + }, + "notes": { + "type": "string" + }, + "staticChunks": { + "type": "integer" + }, + "chunkSize": { + "type": "integer", + "format": "int64" + }, + "forcePipe": { + "type": "boolean" + }, + "preprocessorId": { + "type": "integer" + }, + "preprocessorCommand": { + "type": "string" + } + } + } + } + } + } + }, + "TaskPatch": { + "type": "object", + "properties": { + "data": { + "type": "object", + "properties": { + "type": { + "type": "string" + }, + "attributes": { + "type": "object", + "properties": { + "attackCmd": { + "type": "string" + }, + "chunkTime": { + "type": "integer" + }, + "color": { + "type": "string" + }, + "isArchived": { + "type": "boolean" + }, + "isCpuTask": { + "type": "boolean" + }, + "isSmall": { + "type": "boolean" + }, + "maxAgents": { + "type": "integer" + }, + "notes": { + "type": "string" + }, + "priority": { + "type": "integer" + }, + "statusTimer": { + "type": "integer" + }, + "taskName": { + "type": "string" + } + } + } + } + } + } + }, + "TaskResponse": { + "type": "object", + "properties": { + "jsonapi": { + "type": "object", + "properties": { + "version": { + "type": "string", + "default": "1.1" + }, + "ext": { + "type": "string", + "default": "https://jsonapi.org/profiles/ethanresnick/cursor-pagination" + } + } + }, + "links": { + "type": "object", + "properties": { + "self": { + "type": "string", + "default": "/api/v2/ui/tasks?page[size]=25" + }, + "first": { + "type": "string", + "default": "/api/v2/ui/tasks?page[size]=25&page[after]=0" + }, + "last": { + "type": "string", + "default": "/api/v2/ui/tasks?page[size]=25&page[before]=500" + }, + "next": { + "type": "string", + "default": "/api/v2/ui/tasks?page[size]=25&page[after]=25" + }, + "previous": { + "type": "string", + "default": "/api/v2/ui/tasks?page[size]=25&page[before]=25" + } + } + }, + "id": { + "type": "integer" + }, + "type": { + "type": "string", + "default": "Task" + }, + "data": { + "type": "object", + "properties": { + "taskName": { + "type": "string" + }, + "attackCmd": { + "type": "string" + }, + "chunkTime": { + "type": "integer" + }, + "statusTimer": { + "type": "integer" + }, + "keyspace": { + "type": "integer", + "format": "int64" + }, + "keyspaceProgress": { + "type": "integer", + "format": "int64" + }, + "priority": { + "type": "integer" + }, + "maxAgents": { + "type": "integer" + }, + "color": { + "type": "string" + }, + "isSmall": { + "type": "boolean" + }, + "isCpuTask": { + "type": "boolean" + }, + "useNewBench": { + "type": "boolean" + }, + "skipKeyspace": { + "type": "integer", + "format": "int64" + }, + "crackerBinaryId": { + "type": "integer" + }, + "crackerBinaryTypeId": { + "type": "integer" + }, + "taskWrapperId": { + "type": "integer" + }, + "isArchived": { + "type": "boolean" + }, + "notes": { + "type": "string" + }, + "staticChunks": { + "type": "integer" + }, + "chunkSize": { + "type": "integer", + "format": "int64" + }, + "forcePipe": { + "type": "boolean" + }, + "preprocessorId": { + "type": "integer" + }, + "preprocessorCommand": { + "type": "string" + } + } + }, + "relationships": { + "type": "object", + "properties": [ + { + "properties": { + "assignedAgents": { + "type": "object", + "properties": { + "links": { + "type": "object", + "properties": { + "self": { + "type": "string", + "default": "/api/v2/ui/tasks/relationships/assignedAgents" + }, + "related": { + "type": "string", + "default": "/api/v2/ui/tasks/assignedAgents" + } + } + } + } + } + } + }, + { + "properties": { + "crackerBinary": { + "type": "object", + "properties": { + "links": { + "type": "object", + "properties": { + "self": { + "type": "string", + "default": "/api/v2/ui/tasks/relationships/crackerBinary" + }, + "related": { + "type": "string", + "default": "/api/v2/ui/tasks/crackerBinary" + } + } + } + } + } + } + }, + { + "properties": { + "crackerBinaryType": { + "type": "object", + "properties": { + "links": { + "type": "object", + "properties": { + "self": { + "type": "string", + "default": "/api/v2/ui/tasks/relationships/crackerBinaryType" + }, + "related": { + "type": "string", + "default": "/api/v2/ui/tasks/crackerBinaryType" + } + } + } + } + } + } + }, + { + "properties": { + "files": { + "type": "object", + "properties": { + "links": { + "type": "object", + "properties": { + "self": { + "type": "string", + "default": "/api/v2/ui/tasks/relationships/files" + }, + "related": { + "type": "string", + "default": "/api/v2/ui/tasks/files" + } + } + } + } + } + } + }, + { + "properties": { + "hashlist": { + "type": "object", + "properties": { + "links": { + "type": "object", + "properties": { + "self": { + "type": "string", + "default": "/api/v2/ui/tasks/relationships/hashlist" + }, + "related": { + "type": "string", + "default": "/api/v2/ui/tasks/hashlist" + } + } + } + } + } + } + }, + { + "properties": { + "speeds": { + "type": "object", + "properties": { + "links": { + "type": "object", + "properties": { + "self": { + "type": "string", + "default": "/api/v2/ui/tasks/relationships/speeds" + }, + "related": { + "type": "string", + "default": "/api/v2/ui/tasks/speeds" + } + } + } + } + } + } + } + ] + }, + "included": { + "type": "array", + "items": { + "type": "object", + "properties": [ + { + "properties": { + "id": { + "type": "integer" + }, + "type": { + "type": "string", + "default": "crackerBinary" + }, + "attributes": { + "type": "object", + "properties": { + "crackerBinaryId": { + "type": "integer" + }, + "crackerBinaryTypeId": { + "type": "integer" + }, + "version": { + "type": "string" + }, + "downloadUrl": { + "type": "string" + }, + "binaryName": { + "type": "string" + } + } + } + } + }, + { + "properties": { + "id": { + "type": "integer" + }, + "type": { + "type": "string", + "default": "crackerBinaryType" + }, + "attributes": { + "type": "object", + "properties": { + "crackerBinaryTypeId": { + "type": "integer" + }, + "typeName": { + "type": "string" + }, + "isChunkingAvailable": { + "type": "boolean" + } + } + } + } + }, + { + "properties": { + "id": { + "type": "integer" + }, + "type": { + "type": "string", + "default": "hashlist" + }, + "attributes": { + "type": "object", + "properties": { + "hashlistSeperator": { + "type": "string" + }, + "sourceType": { + "type": "string" + }, + "sourceData": { + "type": "string" + }, + "hashlistId": { + "type": "integer" + }, + "name": { + "type": "string" + }, + "format": { + "type": "integer", + "enum": [ + 0, + 1, + 2, + 3 + ] + }, + "hashTypeId": { + "type": "integer" + }, + "hashCount": { + "type": "integer" + }, + "separator": { + "type": "string" + }, + "cracked": { + "type": "integer" + }, + "isSecret": { + "type": "boolean" + }, + "isHexSalt": { + "type": "boolean" + }, + "isSalted": { + "type": "boolean" + }, + "accessGroupId": { + "type": "integer" + }, + "notes": { + "type": "string" + }, + "useBrain": { + "type": "boolean" + }, + "brainFeatures": { + "type": "integer" + }, + "isArchived": { + "type": "boolean" + } + } + } + } + }, + { + "properties": { + "id": { + "type": "integer" + }, + "type": { + "type": "string", + "default": "assignedAgents" + }, + "attributes": { + "type": "object", + "properties": { + "agentId": { + "type": "integer" + }, + "agentName": { + "type": "string" + }, + "uid": { + "type": "string" + }, + "os": { + "type": "integer" + }, + "devices": { + "type": "string" + }, + "cmdPars": { + "type": "string" + }, + "ignoreErrors": { + "type": "integer", + "enum": [ + 0, + 1, + 2 + ] + }, + "isActive": { + "type": "boolean" + }, + "isTrusted": { + "type": "boolean" + }, + "token": { + "type": "string" + }, + "lastAct": { + "type": "string" + }, + "lastTime": { + "type": "integer", + "format": "int64" + }, + "lastIp": { + "type": "string" + }, + "userId": { + "type": "integer" + }, + "cpuOnly": { + "type": "boolean" + }, + "clientSignature": { + "type": "string" + } + } + } + } + }, + { + "properties": { + "id": { + "type": "integer" + }, + "type": { + "type": "string", + "default": "files" + }, + "attributes": { + "type": "object", + "properties": { + "sourceType": { + "type": "string" + }, + "sourceData": { + "type": "string" + }, + "fileId": { + "type": "integer" + }, + "filename": { + "type": "string" + }, + "size": { + "type": "integer", + "format": "int64" + }, + "isSecret": { + "type": "boolean" + }, + "fileType": { + "type": "integer" + }, + "accessGroupId": { + "type": "integer" + }, + "lineCount": { + "type": "integer", + "format": "int64" + } + } + } + } + }, + { + "properties": { + "id": { + "type": "integer" + }, + "type": { + "type": "string", + "default": "speeds" + }, + "attributes": { + "type": "object", + "properties": { + "speedId": { + "type": "integer" + }, + "agentId": { + "type": "integer" + }, + "taskId": { + "type": "integer" + }, + "speed": { + "type": "integer", + "format": "int64" + }, + "time": { + "type": "integer", + "format": "int64" + } + } + } + } + } + ] + } + } + } + }, + "TaskSingleResponse": { + "type": "object", + "properties": { + "id": { + "type": "integer" + }, + "type": { + "type": "string", + "default": "Task" + }, + "data": { + "type": "object", + "properties": { + "taskName": { + "type": "string" + }, + "attackCmd": { + "type": "string" + }, + "chunkTime": { + "type": "integer" + }, + "statusTimer": { + "type": "integer" + }, + "keyspace": { + "type": "integer", + "format": "int64" + }, + "keyspaceProgress": { + "type": "integer", + "format": "int64" + }, + "priority": { + "type": "integer" + }, + "maxAgents": { + "type": "integer" + }, + "color": { + "type": "string" + }, + "isSmall": { + "type": "boolean" + }, + "isCpuTask": { + "type": "boolean" + }, + "useNewBench": { + "type": "boolean" + }, + "skipKeyspace": { + "type": "integer", + "format": "int64" + }, + "crackerBinaryId": { + "type": "integer" + }, + "crackerBinaryTypeId": { + "type": "integer" + }, + "taskWrapperId": { + "type": "integer" + }, + "isArchived": { + "type": "boolean" + }, + "notes": { + "type": "string" + }, + "staticChunks": { + "type": "integer" + }, + "chunkSize": { + "type": "integer", + "format": "int64" + }, + "forcePipe": { + "type": "boolean" + }, + "preprocessorId": { + "type": "integer" + }, + "preprocessorCommand": { + "type": "string" + } + } + }, + "relationships": { + "type": "object", + "properties": [ + { + "properties": { + "assignedAgents": { + "type": "object", + "properties": { + "links": { + "type": "object", + "properties": { + "self": { + "type": "string", + "default": "/api/v2/ui/tasks/relationships/assignedAgents" + }, + "related": { + "type": "string", + "default": "/api/v2/ui/tasks/assignedAgents" + } + } + } + } + } + } + }, + { + "properties": { + "crackerBinary": { + "type": "object", + "properties": { + "links": { + "type": "object", + "properties": { + "self": { + "type": "string", + "default": "/api/v2/ui/tasks/relationships/crackerBinary" + }, + "related": { + "type": "string", + "default": "/api/v2/ui/tasks/crackerBinary" + } + } + } + } + } + } + }, + { + "properties": { + "crackerBinaryType": { + "type": "object", + "properties": { + "links": { + "type": "object", + "properties": { + "self": { + "type": "string", + "default": "/api/v2/ui/tasks/relationships/crackerBinaryType" + }, + "related": { + "type": "string", + "default": "/api/v2/ui/tasks/crackerBinaryType" + } + } + } + } + } + } + }, + { + "properties": { + "files": { + "type": "object", + "properties": { + "links": { + "type": "object", + "properties": { + "self": { + "type": "string", + "default": "/api/v2/ui/tasks/relationships/files" + }, + "related": { + "type": "string", + "default": "/api/v2/ui/tasks/files" + } + } + } + } + } + } + }, + { + "properties": { + "hashlist": { + "type": "object", + "properties": { + "links": { + "type": "object", + "properties": { + "self": { + "type": "string", + "default": "/api/v2/ui/tasks/relationships/hashlist" + }, + "related": { + "type": "string", + "default": "/api/v2/ui/tasks/hashlist" + } + } + } + } + } + } + }, + { + "properties": { + "speeds": { + "type": "object", + "properties": { + "links": { + "type": "object", + "properties": { + "self": { + "type": "string", + "default": "/api/v2/ui/tasks/relationships/speeds" + }, + "related": { + "type": "string", + "default": "/api/v2/ui/tasks/speeds" + } + } + } + } + } + } + } + ] + }, + "included": { + "type": "array", + "items": { + "type": "object", + "properties": [ + { + "properties": { + "id": { + "type": "integer" + }, + "type": { + "type": "string", + "default": "crackerBinary" + }, + "attributes": { + "type": "object", + "properties": { + "crackerBinaryId": { + "type": "integer" + }, + "crackerBinaryTypeId": { + "type": "integer" + }, + "version": { + "type": "string" + }, + "downloadUrl": { + "type": "string" + }, + "binaryName": { + "type": "string" + } + } + } + } + }, + { + "properties": { + "id": { + "type": "integer" + }, + "type": { + "type": "string", + "default": "crackerBinaryType" + }, + "attributes": { + "type": "object", + "properties": { + "crackerBinaryTypeId": { + "type": "integer" + }, + "typeName": { + "type": "string" + }, + "isChunkingAvailable": { + "type": "boolean" + } + } + } + } + }, + { + "properties": { + "id": { + "type": "integer" + }, + "type": { + "type": "string", + "default": "hashlist" + }, + "attributes": { + "type": "object", + "properties": { + "hashlistSeperator": { + "type": "string" + }, + "sourceType": { + "type": "string" + }, + "sourceData": { + "type": "string" + }, + "hashlistId": { + "type": "integer" + }, + "name": { + "type": "string" + }, + "format": { + "type": "integer", + "enum": [ + 0, + 1, + 2, + 3 + ] + }, + "hashTypeId": { + "type": "integer" + }, + "hashCount": { + "type": "integer" + }, + "separator": { + "type": "string" + }, + "cracked": { + "type": "integer" + }, + "isSecret": { + "type": "boolean" + }, + "isHexSalt": { + "type": "boolean" + }, + "isSalted": { + "type": "boolean" + }, + "accessGroupId": { + "type": "integer" + }, + "notes": { + "type": "string" + }, + "useBrain": { + "type": "boolean" + }, + "brainFeatures": { + "type": "integer" + }, + "isArchived": { + "type": "boolean" + } + } + } + } + }, + { + "properties": { + "id": { + "type": "integer" + }, + "type": { + "type": "string", + "default": "assignedAgents" + }, + "attributes": { + "type": "object", + "properties": { + "agentId": { + "type": "integer" + }, + "agentName": { + "type": "string" + }, + "uid": { + "type": "string" + }, + "os": { + "type": "integer" + }, + "devices": { + "type": "string" + }, + "cmdPars": { + "type": "string" + }, + "ignoreErrors": { + "type": "integer", + "enum": [ + 0, + 1, + 2 + ] + }, + "isActive": { + "type": "boolean" + }, + "isTrusted": { + "type": "boolean" + }, + "token": { + "type": "string" + }, + "lastAct": { + "type": "string" + }, + "lastTime": { + "type": "integer", + "format": "int64" + }, + "lastIp": { + "type": "string" + }, + "userId": { + "type": "integer" + }, + "cpuOnly": { + "type": "boolean" + }, + "clientSignature": { + "type": "string" + } + } + } + } + }, + { + "properties": { + "id": { + "type": "integer" + }, + "type": { + "type": "string", + "default": "files" + }, + "attributes": { + "type": "object", + "properties": { + "sourceType": { + "type": "string" + }, + "sourceData": { + "type": "string" + }, + "fileId": { + "type": "integer" + }, + "filename": { + "type": "string" + }, + "size": { + "type": "integer", + "format": "int64" + }, + "isSecret": { + "type": "boolean" + }, + "fileType": { + "type": "integer" + }, + "accessGroupId": { + "type": "integer" + }, + "lineCount": { + "type": "integer", + "format": "int64" + } + } + } + } + }, + { + "properties": { + "id": { + "type": "integer" + }, + "type": { + "type": "string", + "default": "speeds" + }, + "attributes": { + "type": "object", + "properties": { + "speedId": { + "type": "integer" + }, + "agentId": { + "type": "integer" + }, + "taskId": { + "type": "integer" + }, + "speed": { + "type": "integer", + "format": "int64" + }, + "time": { + "type": "integer", + "format": "int64" + } + } + } + } + } + ] + } + } + } + }, + "TaskPostPatchResponse": { + "type": "object", + "properties": { + "jsonapi": { + "type": "object", + "properties": { + "version": { + "type": "string", + "default": "1.1" + }, + "ext": { + "type": "string", + "default": "https://jsonapi.org/profiles/ethanresnick/cursor-pagination" + } + } + }, + "id": { + "type": "integer" + }, + "type": { + "type": "string", + "default": "Task" + }, + "data": { + "type": "object", + "properties": { + "taskName": { + "type": "string" + }, + "attackCmd": { + "type": "string" + }, + "chunkTime": { + "type": "integer" + }, + "statusTimer": { + "type": "integer" + }, + "keyspace": { + "type": "integer", + "format": "int64" + }, + "keyspaceProgress": { + "type": "integer", + "format": "int64" + }, + "priority": { + "type": "integer" + }, + "maxAgents": { + "type": "integer" + }, + "color": { + "type": "string" + }, + "isSmall": { + "type": "boolean" + }, + "isCpuTask": { + "type": "boolean" + }, + "useNewBench": { + "type": "boolean" + }, + "skipKeyspace": { + "type": "integer", + "format": "int64" + }, + "crackerBinaryId": { + "type": "integer" + }, + "crackerBinaryTypeId": { + "type": "integer" + }, + "taskWrapperId": { + "type": "integer" + }, + "isArchived": { + "type": "boolean" + }, + "notes": { + "type": "string" + }, + "staticChunks": { + "type": "integer" + }, + "chunkSize": { + "type": "integer", + "format": "int64" + }, + "forcePipe": { + "type": "boolean" + }, + "preprocessorId": { + "type": "integer" + }, + "preprocessorCommand": { + "type": "string" + } + } + } + } + }, + "TaskListResponse": { + "allOf": [ + { + "$ref": "#/components/schemas/ListResponse" + }, + { + "type": "object", + "properties": { + "values": { + "type": "array", + "items": { + "$ref": "#/components/schemas/TaskResponse" + } + } + } + } + ] + }, + "TaskWrapperCreate": { + "type": "object", + "properties": { + "data": { + "type": "object", + "properties": { + "type": { + "type": "string" + }, + "attributes": { + "type": "object", + "properties": { + "priority": { + "type": "integer" + }, + "maxAgents": { + "type": "integer" + }, + "taskType": { + "type": "integer", + "enum": [ + 0, + 1 + ] + }, + "hashlistId": { + "type": "integer" + }, + "accessGroupId": { + "type": "integer" + }, + "taskWrapperName": { + "type": "string" + }, + "isArchived": { + "type": "boolean" + }, + "cracked": { + "type": "integer" + } + } + } + } + } + } + }, + "TaskWrapperPatch": { + "type": "object", + "properties": { + "data": { + "type": "object", + "properties": { + "type": { + "type": "string" + }, + "attributes": { + "type": "object", + "properties": { + "accessGroupId": { + "type": "integer" + }, + "isArchived": { + "type": "boolean" + }, + "maxAgents": { + "type": "integer" + }, + "priority": { + "type": "integer" + }, + "taskWrapperName": { + "type": "string" + } + } + } + } + } + } + }, + "TaskWrapperResponse": { + "type": "object", + "properties": { + "jsonapi": { + "type": "object", + "properties": { + "version": { + "type": "string", + "default": "1.1" + }, + "ext": { + "type": "string", + "default": "https://jsonapi.org/profiles/ethanresnick/cursor-pagination" + } + } + }, + "links": { + "type": "object", + "properties": { + "self": { + "type": "string", + "default": "/api/v2/ui/taskwrappers?page[size]=25" + }, + "first": { + "type": "string", + "default": "/api/v2/ui/taskwrappers?page[size]=25&page[after]=0" + }, + "last": { + "type": "string", + "default": "/api/v2/ui/taskwrappers?page[size]=25&page[before]=500" + }, + "next": { + "type": "string", + "default": "/api/v2/ui/taskwrappers?page[size]=25&page[after]=25" + }, + "previous": { + "type": "string", + "default": "/api/v2/ui/taskwrappers?page[size]=25&page[before]=25" + } + } + }, + "id": { + "type": "integer" + }, + "type": { + "type": "string", + "default": "TaskWrapper" + }, + "data": { + "type": "object", + "properties": { + "priority": { + "type": "integer" + }, + "maxAgents": { + "type": "integer" + }, + "taskType": { + "type": "integer", + "enum": [ + 0, + 1 + ] + }, + "hashlistId": { + "type": "integer" + }, + "accessGroupId": { + "type": "integer" + }, + "taskWrapperName": { + "type": "string" + }, + "isArchived": { + "type": "boolean" + }, + "cracked": { + "type": "integer" + } + } + }, + "relationships": { + "type": "object", + "properties": [ + { + "properties": { + "accessGroup": { + "type": "object", + "properties": { + "links": { + "type": "object", + "properties": { + "self": { + "type": "string", + "default": "/api/v2/ui/taskwrappers/relationships/accessGroup" + }, + "related": { + "type": "string", + "default": "/api/v2/ui/taskwrappers/accessGroup" + } + } + } + } + } + } + }, + { + "properties": { + "tasks": { + "type": "object", + "properties": { + "links": { + "type": "object", + "properties": { + "self": { + "type": "string", + "default": "/api/v2/ui/taskwrappers/relationships/tasks" + }, + "related": { + "type": "string", + "default": "/api/v2/ui/taskwrappers/tasks" + } + } + } + } + } + } + } + ] + }, + "included": { + "type": "array", + "items": { + "type": "object", + "properties": [ + { + "properties": { + "id": { + "type": "integer" + }, + "type": { + "type": "string", + "default": "accessGroup" + }, + "attributes": { + "type": "object", + "properties": { + "accessGroupId": { + "type": "integer" + }, + "groupName": { + "type": "string" + } + } + } + } + }, + { + "properties": { + "id": { + "type": "integer" + }, + "type": { + "type": "string", + "default": "tasks" + }, + "attributes": { + "type": "object", + "properties": { + "hashlistId": { + "type": "integer" + }, + "files": { + "type": "array" + }, + "taskId": { + "type": "integer" + }, + "taskName": { + "type": "string" + }, + "attackCmd": { + "type": "string" + }, + "chunkTime": { + "type": "integer" + }, + "statusTimer": { + "type": "integer" + }, + "keyspace": { + "type": "integer", + "format": "int64" + }, + "keyspaceProgress": { + "type": "integer", + "format": "int64" + }, + "priority": { + "type": "integer" + }, + "maxAgents": { + "type": "integer" + }, + "color": { + "type": "string" + }, + "isSmall": { + "type": "boolean" + }, + "isCpuTask": { + "type": "boolean" + }, + "useNewBench": { + "type": "boolean" + }, + "skipKeyspace": { + "type": "integer", + "format": "int64" + }, + "crackerBinaryId": { + "type": "integer" + }, + "crackerBinaryTypeId": { + "type": "integer" + }, + "taskWrapperId": { + "type": "integer" + }, + "isArchived": { + "type": "boolean" + }, + "notes": { + "type": "string" + }, + "staticChunks": { + "type": "integer" + }, + "chunkSize": { + "type": "integer", + "format": "int64" + }, + "forcePipe": { + "type": "boolean" + }, + "preprocessorId": { + "type": "integer" + }, + "preprocessorCommand": { + "type": "string" + } + } + } + } + } + ] + } + } + } + }, + "TaskWrapperSingleResponse": { + "type": "object", + "properties": { + "id": { + "type": "integer" + }, + "type": { + "type": "string", + "default": "TaskWrapper" + }, + "data": { + "type": "object", + "properties": { + "priority": { + "type": "integer" + }, + "maxAgents": { + "type": "integer" + }, + "taskType": { + "type": "integer", + "enum": [ + 0, + 1 + ] + }, + "hashlistId": { + "type": "integer" + }, + "accessGroupId": { + "type": "integer" + }, + "taskWrapperName": { + "type": "string" + }, + "isArchived": { + "type": "boolean" + }, + "cracked": { + "type": "integer" + } + } + }, + "relationships": { + "type": "object", + "properties": [ + { + "properties": { + "accessGroup": { + "type": "object", + "properties": { + "links": { + "type": "object", + "properties": { + "self": { + "type": "string", + "default": "/api/v2/ui/taskwrappers/relationships/accessGroup" + }, + "related": { + "type": "string", + "default": "/api/v2/ui/taskwrappers/accessGroup" + } + } + } + } + } + } + }, + { + "properties": { + "tasks": { + "type": "object", + "properties": { + "links": { + "type": "object", + "properties": { + "self": { + "type": "string", + "default": "/api/v2/ui/taskwrappers/relationships/tasks" + }, + "related": { + "type": "string", + "default": "/api/v2/ui/taskwrappers/tasks" + } + } + } + } + } + } + } + ] + }, + "included": { + "type": "array", + "items": { + "type": "object", + "properties": [ + { + "properties": { + "id": { + "type": "integer" + }, + "type": { + "type": "string", + "default": "accessGroup" + }, + "attributes": { + "type": "object", + "properties": { + "accessGroupId": { + "type": "integer" + }, + "groupName": { + "type": "string" + } + } + } + } + }, + { + "properties": { + "id": { + "type": "integer" + }, + "type": { + "type": "string", + "default": "tasks" + }, + "attributes": { + "type": "object", + "properties": { + "hashlistId": { + "type": "integer" + }, + "files": { + "type": "array" + }, + "taskId": { + "type": "integer" + }, + "taskName": { + "type": "string" + }, + "attackCmd": { + "type": "string" + }, + "chunkTime": { + "type": "integer" + }, + "statusTimer": { + "type": "integer" + }, + "keyspace": { + "type": "integer", + "format": "int64" + }, + "keyspaceProgress": { + "type": "integer", + "format": "int64" + }, + "priority": { + "type": "integer" + }, + "maxAgents": { + "type": "integer" + }, + "color": { + "type": "string" + }, + "isSmall": { + "type": "boolean" + }, + "isCpuTask": { + "type": "boolean" + }, + "useNewBench": { + "type": "boolean" + }, + "skipKeyspace": { + "type": "integer", + "format": "int64" + }, + "crackerBinaryId": { + "type": "integer" + }, + "crackerBinaryTypeId": { + "type": "integer" + }, + "taskWrapperId": { + "type": "integer" + }, + "isArchived": { + "type": "boolean" + }, + "notes": { + "type": "string" + }, + "staticChunks": { + "type": "integer" + }, + "chunkSize": { + "type": "integer", + "format": "int64" + }, + "forcePipe": { + "type": "boolean" + }, + "preprocessorId": { + "type": "integer" + }, + "preprocessorCommand": { + "type": "string" + } + } + } + } + } + ] + } + } + } + }, + "TaskWrapperPostPatchResponse": { + "type": "object", + "properties": { + "jsonapi": { + "type": "object", + "properties": { + "version": { + "type": "string", + "default": "1.1" + }, + "ext": { + "type": "string", + "default": "https://jsonapi.org/profiles/ethanresnick/cursor-pagination" + } + } + }, + "id": { + "type": "integer" + }, + "type": { + "type": "string", + "default": "TaskWrapper" + }, + "data": { + "type": "object", + "properties": { + "priority": { + "type": "integer" + }, + "maxAgents": { + "type": "integer" + }, + "taskType": { + "type": "integer", + "enum": [ + 0, + 1 + ] + }, + "hashlistId": { + "type": "integer" + }, + "accessGroupId": { + "type": "integer" + }, + "taskWrapperName": { + "type": "string" + }, + "isArchived": { + "type": "boolean" + }, + "cracked": { + "type": "integer" + } + } + } + } + }, + "TaskWrapperListResponse": { + "allOf": [ + { + "$ref": "#/components/schemas/ListResponse" + }, + { + "type": "object", + "properties": { + "values": { + "type": "array", + "items": { + "$ref": "#/components/schemas/TaskWrapperResponse" + } + } + } + } + ] + }, + "UserCreate": { + "type": "object", + "properties": { + "data": { + "type": "object", + "properties": { + "type": { + "type": "string" + }, + "attributes": { + "type": "object", + "properties": { + "name": { + "type": "string" + }, + "email": { + "type": "string" + }, + "passwordHash": { + "type": "string" + }, + "passwordSalt": { + "type": "string" + }, + "isValid": { + "type": "boolean" + }, + "isComputedPassword": { + "type": "boolean" + }, + "lastLoginDate": { + "type": "integer", + "format": "int64" + }, + "registeredSince": { + "type": "integer", + "format": "int64" + }, + "sessionLifetime": { + "type": "integer" + }, + "globalPermissionGroupId": { + "type": "integer" + }, + "yubikey": { + "type": "string" + }, + "otp1": { + "type": "string" + }, + "otp2": { + "type": "string" + }, + "otp3": { + "type": "string" + }, + "otp4": { + "type": "string" + } + } + } + } + } + } + }, + "UserPatch": { + "type": "object", + "properties": { + "data": { + "type": "object", + "properties": { + "type": { + "type": "string" + }, + "attributes": { + "type": "object", + "properties": { + "email": { + "type": "string" + }, + "globalPermissionGroupId": { + "type": "integer" + }, + "isValid": { + "type": "boolean" + }, + "name": { + "type": "string" + } + } + } + } + } + } + }, + "UserResponse": { + "type": "object", + "properties": { + "jsonapi": { + "type": "object", + "properties": { + "version": { + "type": "string", + "default": "1.1" + }, + "ext": { + "type": "string", + "default": "https://jsonapi.org/profiles/ethanresnick/cursor-pagination" + } + } + }, + "links": { + "type": "object", + "properties": { + "self": { + "type": "string", + "default": "/api/v2/ui/users?page[size]=25" + }, + "first": { + "type": "string", + "default": "/api/v2/ui/users?page[size]=25&page[after]=0" + }, + "last": { + "type": "string", + "default": "/api/v2/ui/users?page[size]=25&page[before]=500" + }, + "next": { + "type": "string", + "default": "/api/v2/ui/users?page[size]=25&page[after]=25" + }, + "previous": { + "type": "string", + "default": "/api/v2/ui/users?page[size]=25&page[before]=25" + } + } + }, + "id": { + "type": "integer" + }, + "type": { + "type": "string", + "default": "User" + }, + "data": { + "type": "object", + "properties": { + "name": { + "type": "string" + }, + "email": { + "type": "string" + }, + "passwordHash": { + "type": "string" + }, + "passwordSalt": { + "type": "string" + }, + "isValid": { + "type": "boolean" + }, + "isComputedPassword": { + "type": "boolean" + }, + "lastLoginDate": { + "type": "integer", + "format": "int64" + }, + "registeredSince": { + "type": "integer", + "format": "int64" + }, + "sessionLifetime": { + "type": "integer" + }, + "globalPermissionGroupId": { + "type": "integer" + }, + "yubikey": { + "type": "string" + }, + "otp1": { + "type": "string" + }, + "otp2": { + "type": "string" + }, + "otp3": { + "type": "string" + }, + "otp4": { + "type": "string" + } + } + }, + "relationships": { + "type": "object", + "properties": [ + { + "properties": { + "accessGroups": { + "type": "object", + "properties": { + "links": { + "type": "object", + "properties": { + "self": { + "type": "string", + "default": "/api/v2/ui/users/relationships/accessGroups" + }, + "related": { + "type": "string", + "default": "/api/v2/ui/users/accessGroups" + } + } + } + } + } + } + }, + { + "properties": { + "globalPermissionGroup": { + "type": "object", + "properties": { + "links": { + "type": "object", + "properties": { + "self": { + "type": "string", + "default": "/api/v2/ui/users/relationships/globalPermissionGroup" + }, + "related": { + "type": "string", + "default": "/api/v2/ui/users/globalPermissionGroup" + } + } + } + } + } + } + } + ] + }, + "included": { + "type": "array", + "items": { + "type": "object", + "properties": [ + { + "properties": { + "id": { + "type": "integer" + }, + "type": { + "type": "string", + "default": "globalPermissionGroup" + }, + "attributes": { + "type": "object", + "properties": { + "id": { + "type": "integer" + }, + "name": { + "type": "string" + }, + "permissions": { + "type": "object" + } + } + } + } + }, + { + "properties": { + "id": { + "type": "integer" + }, + "type": { + "type": "string", + "default": "accessGroups" + }, + "attributes": { + "type": "object", + "properties": { + "accessGroupId": { + "type": "integer" + }, + "groupName": { + "type": "string" + } + } + } + } + } + ] + } + } + } + }, + "UserSingleResponse": { + "type": "object", + "properties": { + "id": { + "type": "integer" + }, + "type": { + "type": "string", + "default": "User" + }, + "data": { + "type": "object", + "properties": { + "name": { + "type": "string" + }, + "email": { + "type": "string" + }, + "passwordHash": { + "type": "string" + }, + "passwordSalt": { + "type": "string" + }, + "isValid": { + "type": "boolean" + }, + "isComputedPassword": { + "type": "boolean" + }, + "lastLoginDate": { + "type": "integer", + "format": "int64" + }, + "registeredSince": { + "type": "integer", + "format": "int64" + }, + "sessionLifetime": { + "type": "integer" + }, + "globalPermissionGroupId": { + "type": "integer" + }, + "yubikey": { + "type": "string" + }, + "otp1": { + "type": "string" + }, + "otp2": { + "type": "string" + }, + "otp3": { + "type": "string" + }, + "otp4": { + "type": "string" + } + } + }, + "relationships": { + "type": "object", + "properties": [ + { + "properties": { + "accessGroups": { + "type": "object", + "properties": { + "links": { + "type": "object", + "properties": { + "self": { + "type": "string", + "default": "/api/v2/ui/users/relationships/accessGroups" + }, + "related": { + "type": "string", + "default": "/api/v2/ui/users/accessGroups" + } + } + } + } + } + } + }, + { + "properties": { + "globalPermissionGroup": { + "type": "object", + "properties": { + "links": { + "type": "object", + "properties": { + "self": { + "type": "string", + "default": "/api/v2/ui/users/relationships/globalPermissionGroup" + }, + "related": { + "type": "string", + "default": "/api/v2/ui/users/globalPermissionGroup" + } + } + } + } + } + } + } + ] + }, + "included": { + "type": "array", + "items": { + "type": "object", + "properties": [ + { + "properties": { + "id": { + "type": "integer" + }, + "type": { + "type": "string", + "default": "globalPermissionGroup" + }, + "attributes": { + "type": "object", + "properties": { + "id": { + "type": "integer" + }, + "name": { + "type": "string" + }, + "permissions": { + "type": "object" + } + } + } + } + }, + { + "properties": { + "id": { + "type": "integer" + }, + "type": { + "type": "string", + "default": "accessGroups" + }, + "attributes": { + "type": "object", + "properties": { + "accessGroupId": { + "type": "integer" + }, + "groupName": { + "type": "string" + } + } + } + } + } + ] + } + } + } + }, + "UserPostPatchResponse": { + "type": "object", + "properties": { + "jsonapi": { + "type": "object", + "properties": { + "version": { + "type": "string", + "default": "1.1" + }, + "ext": { + "type": "string", + "default": "https://jsonapi.org/profiles/ethanresnick/cursor-pagination" + } + } + }, + "id": { + "type": "integer" + }, + "type": { + "type": "string", + "default": "User" + }, + "data": { + "type": "object", + "properties": { + "name": { + "type": "string" + }, + "email": { + "type": "string" + }, + "passwordHash": { + "type": "string" + }, + "passwordSalt": { + "type": "string" + }, + "isValid": { + "type": "boolean" + }, + "isComputedPassword": { + "type": "boolean" + }, + "lastLoginDate": { + "type": "integer", + "format": "int64" + }, + "registeredSince": { + "type": "integer", + "format": "int64" + }, + "sessionLifetime": { + "type": "integer" + }, + "globalPermissionGroupId": { + "type": "integer" + }, + "yubikey": { + "type": "string" + }, + "otp1": { + "type": "string" + }, + "otp2": { + "type": "string" + }, + "otp3": { + "type": "string" + }, + "otp4": { + "type": "string" + } + } + } + } + }, + "UserListResponse": { + "allOf": [ + { + "$ref": "#/components/schemas/ListResponse" + }, + { + "type": "object", + "properties": { + "values": { + "type": "array", + "items": { + "$ref": "#/components/schemas/UserResponse" + } + } + } + } + ] + }, + "RegVoucherCreate": { + "type": "object", + "properties": { + "data": { + "type": "object", + "properties": { + "type": { + "type": "string" + }, + "attributes": { + "type": "object", + "properties": { + "voucher": { + "type": "string" + }, + "time": { + "type": "integer", + "format": "int64" + } + } + } + } + } + } + }, + "RegVoucherPatch": { + "type": "object", + "properties": { + "data": { + "type": "object", + "properties": { + "type": { + "type": "string" + }, + "attributes": { + "type": "object", + "properties": { + "voucher": { + "type": "string" + } + } + } + } + } + } + }, + "RegVoucherResponse": { + "type": "object", + "properties": { + "jsonapi": { + "type": "object", + "properties": { + "version": { + "type": "string", + "default": "1.1" + }, + "ext": { + "type": "string", + "default": "https://jsonapi.org/profiles/ethanresnick/cursor-pagination" + } + } + }, + "links": { + "type": "object", + "properties": { + "self": { + "type": "string", + "default": "/api/v2/ui/vouchers?page[size]=25" + }, + "first": { + "type": "string", + "default": "/api/v2/ui/vouchers?page[size]=25&page[after]=0" + }, + "last": { + "type": "string", + "default": "/api/v2/ui/vouchers?page[size]=25&page[before]=500" + }, + "next": { + "type": "string", + "default": "/api/v2/ui/vouchers?page[size]=25&page[after]=25" + }, + "previous": { + "type": "string", + "default": "/api/v2/ui/vouchers?page[size]=25&page[before]=25" + } + } + }, + "id": { + "type": "integer" + }, + "type": { + "type": "string", + "default": "RegVoucher" + }, + "data": { + "type": "object", + "properties": { + "voucher": { + "type": "string" + }, + "time": { + "type": "integer", + "format": "int64" + } + } + }, + "relationships": { + "type": "object", + "properties": [] + }, + "included": { + "type": "array", + "items": { + "type": "object", + "properties": [] + } + } + } + }, + "RegVoucherSingleResponse": { + "type": "object", + "properties": { + "id": { + "type": "integer" + }, + "type": { + "type": "string", + "default": "RegVoucher" + }, + "data": { + "type": "object", + "properties": { + "voucher": { + "type": "string" + }, + "time": { + "type": "integer", + "format": "int64" + } + } + }, + "relationships": { + "type": "object", + "properties": [] + }, + "included": { + "type": "array", + "items": { + "type": "object", + "properties": [] + } + } + } + }, + "RegVoucherPostPatchResponse": { + "type": "object", + "properties": { + "jsonapi": { + "type": "object", + "properties": { + "version": { + "type": "string", + "default": "1.1" + }, + "ext": { + "type": "string", + "default": "https://jsonapi.org/profiles/ethanresnick/cursor-pagination" + } + } + }, + "id": { + "type": "integer" + }, + "type": { + "type": "string", + "default": "RegVoucher" + }, + "data": { + "type": "object", + "properties": { + "voucher": { + "type": "string" + }, + "time": { + "type": "integer", + "format": "int64" + } + } + } + } + }, + "RegVoucherListResponse": { + "allOf": [ + { + "$ref": "#/components/schemas/ListResponse" + }, + { + "type": "object", + "properties": { + "values": { + "type": "array", + "items": { + "$ref": "#/components/schemas/RegVoucherResponse" + } + } + } + } + ] + }, + "Token": { + "type": "object", + "properties": { + "token": { + "type": "string" + }, + "expires": { + "type": "integer" + } + }, + "additionalProperties": false + }, + "TokenRequest": { + "type": "array", + "items": { + "type": "string", + "example": "role.all" + } + }, + "ObjectRequest": { + "type": "object", + "properties": { + "expand": { + "type": "string" + }, + "expires": { + "type": "integer" + } + }, + "additionalProperties": false + }, + "ObjectListRequest": { + "type": "object", + "properties": { + "expand": { + "type": "string" + }, + "filter": { + "type": "array", + "items": { + "type": "string", + "example": "" + } + } + }, + "additionalProperties": false + } + }, + "securitySchemes": { + "bearerAuth": { + "type": "http", + "description": "JWT Authorization header using the Bearer scheme.", + "scheme": "bearer", + "bearerFormat": "JWT", + "scopes": [ + "permAccessGroupCreate", + "permAccessGroupDelete", + "permAccessGroupRead", + "permAccessGroupUpdate", + "permAgentAssignmentCreate", + "permAgentAssignmentDelete", + "permAgentAssignmentRead", + "permAgentAssignmentUpdate", + "permAgentBinaryCreate", + "permAgentBinaryDelete", + "permAgentBinaryRead", + "permAgentBinaryUpdate", + "permAgentCreate", + "permAgentDelete", + "permAgentRead", + "permAgentStatDelete", + "permAgentStatRead", + "permAgentUpdate", + "permChunkRead", + "permChunkUpdate", + "permConfigRead", + "permConfigSectionRead", + "permConfigUpdate", + "permCrackerBinaryCreate", + "permCrackerBinaryDelete", + "permCrackerBinaryRead", + "permCrackerBinaryTypeCreate", + "permCrackerBinaryTypeDelete", + "permCrackerBinaryTypeRead", + "permCrackerBinaryTypeUpdate", + "permCrackerBinaryUpdate", + "permFileCreate", + "permFileDelete", + "permFileRead", + "permFileUpdate", + "permHashRead", + "permHashTypeCreate", + "permHashTypeDelete", + "permHashTypeRead", + "permHashTypeUpdate", + "permHashUpdate", + "permHashlistCreate", + "permHashlistDelete", + "permHashlistRead", + "permHashlistUpdate", + "permHealthCheckAgentRead", + "permHealthCheckAgentUpdate", + "permHealthCheckCreate", + "permHealthCheckDelete", + "permHealthCheckRead", + "permHealthCheckUpdate", + "permLogEntryCreate", + "permLogEntryDelete", + "permLogEntryRead", + "permLogEntryUpdate", + "permNotificationSettingCreate", + "permNotificationSettingDelete", + "permNotificationSettingRead", + "permNotificationSettingUpdate", + "permPreprocessorCreate", + "permPreprocessorDelete", + "permPreprocessorRead", + "permPreprocessorUpdate", + "permPretaskCreate", + "permPretaskDelete", + "permPretaskRead", + "permPretaskUpdate", + "permRegVoucherCreate", + "permRegVoucherDelete", + "permRegVoucherRead", + "permRegVoucherUpdate", + "permRightGroupCreate", + "permRightGroupDelete", + "permRightGroupRead", + "permRightGroupUpdate", + "permSpeedRead", + "permSpeedUpdate", + "permSupertaskCreate", + "permSupertaskDelete", + "permSupertaskRead", + "permSupertaskUpdate", + "permTaskCreate", + "permTaskDelete", + "permTaskRead", + "permTaskUpdate", + "permTaskWrapperCreate", + "permTaskWrapperDelete", + "permTaskWrapperRead", + "permTaskWrapperUpdate", + "permUserCreate", + "permUserDelete", + "permUserRead", + "permUserUpdate" + ] + }, + "basicAuth": { + "type": "http", + "description": "Basic Authorization header.", + "scheme": "basic" + } + } + } +} \ No newline at end of file From 302a0107f7ee35c2b28abbbe44e670e98ccf91a9 Mon Sep 17 00:00:00 2001 From: Romke van Dijk Date: Tue, 14 Jan 2025 15:48:12 +0100 Subject: [PATCH 015/691] Retry --- .github/workflows/docs.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/docs.yml b/.github/workflows/docs.yml index f32a89f23..f947e07be 100644 --- a/.github/workflows/docs.yml +++ b/.github/workflows/docs.yml @@ -10,11 +10,11 @@ jobs: steps: - name: Check out the repository - uses: actions/checkout@v2 + uses: actions/checkout@v4 - name: Set up Python - uses: actions/setup-python@v2 + uses: actions/setup-python@v5 with: - python-version: 3.10 + python-version: "3.10" - name: Install dependencies run: | python -m pip install --upgrade pip From 16c365b720d7961f6660f6951b7a297f5bf5211d Mon Sep 17 00:00:00 2001 From: Romke van Dijk Date: Tue, 14 Jan 2025 15:52:19 +0100 Subject: [PATCH 016/691] Updating dest --- .github/workflows/docs.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/docs.yml b/.github/workflows/docs.yml index f947e07be..ec4449af5 100644 --- a/.github/workflows/docs.yml +++ b/.github/workflows/docs.yml @@ -31,4 +31,4 @@ jobs: FTP_USERNAME: ${{ secrets.FTP_USERNAME }} FTP_PASSWORD: ${{ secrets.FTP_PASSWORD }} run: | - lftp -e "mirror -R site/ /home/godesig/www/docs.hashtopolis.org/; quit" -u $FTP_USERNAME,$FTP_PASSWORD $FTP_SERVER + lftp -e "mirror -R site/ /; quit" -u $FTP_USERNAME,$FTP_PASSWORD $FTP_SERVER From 5f165354c9241450aa28e69e0289b500ab34958c Mon Sep 17 00:00:00 2001 From: Romke van Dijk Date: Tue, 14 Jan 2025 15:55:49 +0100 Subject: [PATCH 017/691] Adding new line --- doc/install.md | 1 + 1 file changed, 1 insertion(+) diff --git a/doc/install.md b/doc/install.md index 744925de6..064f8e5c9 100644 --- a/doc/install.md +++ b/doc/install.md @@ -5,6 +5,7 @@ _NOTE: The instructions provided in this section have only been tested on Ubuntu 22.04 and Windows 11 with WSL2_ To install Hashtopolis server, ensure that the following prerequisites are met: + 1. *Docker*: Follow the instructions available on the Docker website: - Install Docker on Ubuntu - Install Docker on Windows From c726785b9710f5735f1110146b08c22a8505294c Mon Sep 17 00:00:00 2001 From: coiseiw Date: Wed, 15 Jan 2025 10:34:10 +0100 Subject: [PATCH 018/691] Adding a first version of install.md --- doc/install.md | 125 ++++++++++++++++++++++++++++++++++++++++++++++--- 1 file changed, 119 insertions(+), 6 deletions(-) diff --git a/doc/install.md b/doc/install.md index 064f8e5c9..7e3543180 100644 --- a/doc/install.md +++ b/doc/install.md @@ -1,15 +1,128 @@ -# Installation Guidelines +# Installation Guidelines (Work in Progress) ## Basic installation ### Server installation +This guide details installing Hashtopolis using Docker, the recommended method since version 0.14.0. Docker offers a faster, more consistent setup process. +#### Prerequisites: -_NOTE: The instructions provided in this section have only been tested on Ubuntu 22.04 and Windows 11 with WSL2_ +> [!NOTE] +> The instructions provided in this section have only been tested on Ubuntu 22.04 and Windows 11 with WSL2. To install Hashtopolis server, ensure that the following prerequisites are met: - -1. *Docker*: Follow the instructions available on the Docker website: +1. Docker: Follow the instructions available on the Docker website: - Install Docker on Ubuntu - Install Docker on Windows -2. *Docker Compose v2*: Follow the instructions available on the Docker website: - - [Install Docker Compose on Linux](https://docs.docker.com/compose/install/linux/#install-using-the-repository) +2. Docker Compose v2: Follow the instructions available on the Docker website: + - Install Docker Compose on Linux + +#### Setup Hashtopolis Server +The official Docker images can be found on Docker Hub at: https://hub.docker.com/u/hashtopolis. Two Docker images are needed to run Hashtopolis: hashtopolis/frontend (setting up the web user interface), and hashtopolis/backend (taking care of the Hashtopolis database). + +A docker-compose file allowing to configure the docker containers for Hashtopolis is available in this repository. Here are the steps to follow to run Hashtopolis using that docker-compose file: + +1. Create a folder and change into the folder +``` +mkdir hashtopolis +cd hashtopolis +``` +2. Download docker-compose.yml and env.example + ``` + wget https://raw.githubusercontent.com/hashtopolis/server/master/docker-compose.yml + wget https://raw.githubusercontent.com/hashtopolis/server/master/env.example -O .env + ``` +3. Edit the .env file and change the settings to your likings. + ``` + nano .env + ``` +4. Start the containers: + ``` + docker compose up --detach + ``` +5. Access the Hashtopolis UI through: http://127.0.0.1:8080 using the credentials (user=admin, password=hashtopolis) +6. If you want to play around with a preview of the version 2 of the UI, consult the New user interface: technical preview section. + +#### New user interface: technical preview + +> [!NOTE] +> The APIv2 and UIv2 are a technical preview. Currently, when enabled, everyone through the new API will be fully admin! + +To enable 'version 2' of the API: + +1. Stop your containers + +2. set the HASHTOPOLIS_APIV2_ENABLE to 1 inside the .env file. + +3. Relaunch the containers + ``` + docker compose up --detach + ``` + +4. Access the technical preview via: http://127.0.0.1:4200 using the credentials user=admin and password=hashtopolis, unless modified in the .env file. + +### Agent installation +#### Prerequisites +To install the agent, ensure that the following prerequisites are met: +1. Python: Python 3 must be installed on the agent system. You can verify the installation by running the following command in your terminal: + ``` + python3 --version + ``` + If Python 3 is not installed, refer to the official Python installation guide. +2. Python Packages: The Hashtopolis agents depends on the following Python packages: + - requests + - psutil + +[***To be checked***] +It is recommended to use a virtual environment for installing the required packages to avoid conflicts with system-wide packages. You can create and activate a virtual environment with the following commands: +``` +python3 -m venv hastopolis_env +source hashtopolis_env/bin/activate +``` + +Then, install the packages: +``` +pip install requests psutil +``` + +#### Download the Hashtopolis agent +1. Connect to the Hashtopolis server: http://:8080 and log in. Navigate to the Agents tab > New Agent. +2. From that page, you can either download the agent by clicking on the Download button, or copy and paste the provided url to download the agent using wget/curl: + ``` + curl -o hastopolis.zip "http://:8080/agents.php?download=1" + ``` + +#### Start and register a new agent + +1. Activate your python virtual environment if not done before: + ``` + source hashtopolis_env/bin/activate + ``` +2. Start the agent: + ``` + python hashtopolis.zip + ``` + +3. When prompted, provide the URL to the server API as provided in the Agents page of Hashtopolis (http://:8080/api/server.php). + ``` + Starting client 's3-python-0.7.2.4'... + Please enter the url to the API of your Hashtopolis installation: + http://localhost:8080/api/server.php + ``` +4. On the server Agents page of Hashtopolis, create a new Voucher and copy it. +5. Register the agent by providing the newly created token. + ``` + No token found! Please enter a voucher to register your agent: + peKxylVY + Successfully registered! + Collecting agent data... + Login successful! + ``` +Your agent is now ready to receive new tasks. If you wish to finetune the configuration of your agent, please consult the section related to the agent configuration file or the command line arguments in the Advanced installation section. Otherwise, to start using Hashtopolis, consult the Basic workflow section. +## Advanced installation +- Installation in an airgapped/offline/oil-gapped system (make a note about the binary) +- Installation with local folders +- Installation of TLS X.509 certificate +- Agent configuration file and command line arguments +- (Boot from PXE) and run HtP as a service (voucher, local disk,...) +- Misc. +- Upgrade of the install From a7c4f953f217ee6644ae8e1891b10352123e55b9 Mon Sep 17 00:00:00 2001 From: Romke van Dijk Date: Wed, 15 Jan 2025 12:50:12 +0100 Subject: [PATCH 019/691] Adding some fixes --- .github/workflows/docs.yml | 1 + doc/install.md | 20 ++++++++++---------- mkdocs.yml | 6 ++++-- 3 files changed, 15 insertions(+), 12 deletions(-) diff --git a/.github/workflows/docs.yml b/.github/workflows/docs.yml index ec4449af5..605cfb851 100644 --- a/.github/workflows/docs.yml +++ b/.github/workflows/docs.yml @@ -19,6 +19,7 @@ jobs: run: | python -m pip install --upgrade pip pip install mkdocs + pip install markdown-callouts sudo apt-get update sudo apt-get install -y lftp diff --git a/doc/install.md b/doc/install.md index 7e3543180..8593635f7 100644 --- a/doc/install.md +++ b/doc/install.md @@ -25,18 +25,18 @@ mkdir hashtopolis cd hashtopolis ``` 2. Download docker-compose.yml and env.example - ``` - wget https://raw.githubusercontent.com/hashtopolis/server/master/docker-compose.yml - wget https://raw.githubusercontent.com/hashtopolis/server/master/env.example -O .env - ``` +``` +wget https://raw.githubusercontent.com/hashtopolis/server/master/docker-compose.yml +wget https://raw.githubusercontent.com/hashtopolis/server/master/env.example -O .env +``` 3. Edit the .env file and change the settings to your likings. - ``` - nano .env - ``` +``` +nano .env +``` 4. Start the containers: - ``` - docker compose up --detach - ``` +``` +docker compose up --detach +``` 5. Access the Hashtopolis UI through: http://127.0.0.1:8080 using the credentials (user=admin, password=hashtopolis) 6. If you want to play around with a preview of the version 2 of the UI, consult the New user interface: technical preview section. diff --git a/mkdocs.yml b/mkdocs.yml index 43055d29d..d1eeacfba 100644 --- a/mkdocs.yml +++ b/mkdocs.yml @@ -4,5 +4,7 @@ repo_url: https://github.com/hashtopolis/server docs_dir: doc theme: name: readthedocs -nav: - - 'install.md' +edit_uri: blob/docs/doc/ # Edit the URL to the static branch and folder +markdown_extensions: + - github-callouts # Add the ability of notes, warnings, etc. + - sane_lists # Make the numbered lists continue \ No newline at end of file From e98aafbaa4623e3a0a87406fac151d1f6df748c6 Mon Sep 17 00:00:00 2001 From: Romke van Dijk Date: Wed, 15 Jan 2025 13:08:38 +0100 Subject: [PATCH 020/691] Changing to material --- .github/workflows/docs.yml | 3 +-- doc/changelog.md | 2 ++ mkdocs.yml | 2 +- 3 files changed, 4 insertions(+), 3 deletions(-) diff --git a/.github/workflows/docs.yml b/.github/workflows/docs.yml index 605cfb851..d8a36df3d 100644 --- a/.github/workflows/docs.yml +++ b/.github/workflows/docs.yml @@ -18,8 +18,7 @@ jobs: - name: Install dependencies run: | python -m pip install --upgrade pip - pip install mkdocs - pip install markdown-callouts + pip install mkdocs markdown-callouts mkdocs-material sudo apt-get update sudo apt-get install -y lftp diff --git a/doc/changelog.md b/doc/changelog.md index 54b5d5382..238964a2a 100644 --- a/doc/changelog.md +++ b/doc/changelog.md @@ -1,3 +1,5 @@ +# Changelog + # v0.14.3 -> v0.14.4 diff --git a/mkdocs.yml b/mkdocs.yml index d1eeacfba..8fdf35d09 100644 --- a/mkdocs.yml +++ b/mkdocs.yml @@ -3,7 +3,7 @@ site_url: https://docs.hashtopolis.org repo_url: https://github.com/hashtopolis/server docs_dir: doc theme: - name: readthedocs + name: material edit_uri: blob/docs/doc/ # Edit the URL to the static branch and folder markdown_extensions: - github-callouts # Add the ability of notes, warnings, etc. From 90d5c8d13e25ab95734fd808d852b9ed226a3148 Mon Sep 17 00:00:00 2001 From: Romke van Dijk Date: Wed, 15 Jan 2025 13:10:36 +0100 Subject: [PATCH 021/691] Adding warning --- doc/README.md | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/doc/README.md b/doc/README.md index 48cbf867f..bb58e2ad8 100644 --- a/doc/README.md +++ b/doc/README.md @@ -1,4 +1,9 @@ -# Documentation +# Hashtopolis + +> [!CAUTION] +> This is a new page that will be used for documentation. It is work in progress, so use with care! + + ## Hashtopolis Protocol From 00196e1d7c0471679df2091f2267fe785a22a200 Mon Sep 17 00:00:00 2001 From: coiseiw Date: Wed, 15 Jan 2025 13:58:48 +0100 Subject: [PATCH 022/691] Update of install.md + adding user_manual.md --- doc/install.md | 58 +++++++++++----------- doc/user_manual.md | 121 +++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 150 insertions(+), 29 deletions(-) create mode 100644 doc/user_manual.md diff --git a/doc/install.md b/doc/install.md index 8593635f7..4fe37d904 100644 --- a/doc/install.md +++ b/doc/install.md @@ -19,7 +19,7 @@ The official Docker images can be found on Docker Hub at: https://hub.docker.com A docker-compose file allowing to configure the docker containers for Hashtopolis is available in this repository. Here are the steps to follow to run Hashtopolis using that docker-compose file: -1. Create a folder and change into the folder +1. Create a folder and change into the folder ``` mkdir hashtopolis cd hashtopolis @@ -52,9 +52,9 @@ To enable 'version 2' of the API: 2. set the HASHTOPOLIS_APIV2_ENABLE to 1 inside the .env file. 3. Relaunch the containers - ``` - docker compose up --detach - ``` +``` +docker compose up --detach +``` 4. Access the technical preview via: http://127.0.0.1:4200 using the credentials user=admin and password=hashtopolis, unless modified in the .env file. @@ -62,10 +62,10 @@ To enable 'version 2' of the API: #### Prerequisites To install the agent, ensure that the following prerequisites are met: 1. Python: Python 3 must be installed on the agent system. You can verify the installation by running the following command in your terminal: - ``` - python3 --version - ``` - If Python 3 is not installed, refer to the official Python installation guide. +``` +python3 --version +``` +If Python 3 is not installed, refer to the official Python installation guide. 2. Python Packages: The Hashtopolis agents depends on the following Python packages: - requests - psutil @@ -85,36 +85,36 @@ pip install requests psutil #### Download the Hashtopolis agent 1. Connect to the Hashtopolis server: http://:8080 and log in. Navigate to the Agents tab > New Agent. 2. From that page, you can either download the agent by clicking on the Download button, or copy and paste the provided url to download the agent using wget/curl: - ``` - curl -o hastopolis.zip "http://:8080/agents.php?download=1" - ``` +``` +curl -o hastopolis.zip "http://:8080/agents.php?download=1" +``` #### Start and register a new agent 1. Activate your python virtual environment if not done before: - ``` - source hashtopolis_env/bin/activate - ``` +``` +source hashtopolis_env/bin/activate +``` 2. Start the agent: - ``` - python hashtopolis.zip - ``` +``` +python hashtopolis.zip +``` 3. When prompted, provide the URL to the server API as provided in the Agents page of Hashtopolis (http://:8080/api/server.php). - ``` - Starting client 's3-python-0.7.2.4'... - Please enter the url to the API of your Hashtopolis installation: - http://localhost:8080/api/server.php - ``` +``` +Starting client 's3-python-0.7.2.4'... +Please enter the url to the API of your Hashtopolis installation: +http://localhost:8080/api/server.php +``` 4. On the server Agents page of Hashtopolis, create a new Voucher and copy it. 5. Register the agent by providing the newly created token. - ``` - No token found! Please enter a voucher to register your agent: - peKxylVY - Successfully registered! - Collecting agent data... - Login successful! - ``` +``` +No token found! Please enter a voucher to register your agent: +peKxylVY +Successfully registered! +Collecting agent data... +Login successful! +``` Your agent is now ready to receive new tasks. If you wish to finetune the configuration of your agent, please consult the section related to the agent configuration file or the command line arguments in the Advanced installation section. Otherwise, to start using Hashtopolis, consult the Basic workflow section. diff --git a/doc/user_manual.md b/doc/user_manual.md new file mode 100644 index 000000000..2be94874f --- /dev/null +++ b/doc/user_manual.md @@ -0,0 +1,121 @@ +# Basic Workflow +Basic workflow highlighting the main point. The goal is that with such workflow a new user is able to run a task on a new hashlist with files or with masks. +- New Hashlist +- New Files, wordlist/rules/others +- New Task +- Monitoring + +## Hashlists +Hashtopolis utilizes hashlists to store password hashes you want to crack. These lists can be in plain text, HCCAPX, or binary format. Some hashes might include additional information like salts, depending on the format. +This section details the creation of a hashlist within the Hashtopolis interface. Note that at least one hashlist is required for creating tasks. +Refer to the Hashcat documentation for detailed information on supported hash types and their expected formats. You can also use the example hashes provided there as a test to create your first hashlist. + +### Create a hashlist +In the Hashtopolis web interface, navigate to *Lists > New Hashlist*. You will get the following window: + +Here is how to fill in the different fields: +1. **Name**: Provide a descriptive name for your hashlist. +2. **Hash Type**: Select the appropriate hash type from the dropdown menu. Suggestions will appear as you enter text. +3. **Hashlist Format**: Choose the format for your hashlist: + - Text File: Paste or upload a plain text file containing one hash per line. + - HCCAPX/PMKID: Upload a HCCAPX file containing password hashes. + - Binary File: Upload a binary file containing password hashes. +4. **Salted Hashes**: Tick the box related to salted hashes if appropriate and provide the correct separator for your hashlist. +5. **Hash source**: Select one of the following hash source types. +6. **Providing the hash**: The last field of the form will automatically adapt depending on the chosen source type. You’ll be asked to provide additional details: + - **Paste**: Copy and paste the hashes directly into the "Input" field. + - **Upload**: Select a file containing the hashes from your computer. + - **URL Download**: Provide a URL to download the hashlist. + - **Import**: This option can be used as a workaround in case of upload errors with the first version of the user interface. To import a file, first copy it to the import folder as described in the section Import a new file. +7. **Access Group**: Modify the access group associated with the hashlist if needed. +8. **Create Hashlist**: Click "Create Hashlist" to finalize the process. This will open a new page displaying the details of your newly created hashlist. + +## Files: Rules, Wordlist and other +When creating a password recovery task in Hashtopolis, you may need to upload additional files to the server, depending on the type of attack you want to perform. These files fall into three main categories: +1. **Rules** + Rules files contain sets of instructions for dynamically modifying entries in a wordlist during an attack. By applying rules, you can generate variations of passwords without the need for additional wordlist files. For example, rules can: + - Append numbers or special characters. + - Replace or capitalize specific characters. + - Reverse words or combine entries. + + Rules are commonly used alongside wordlist attacks to increase the range of password candidates efficiently. + +2. **Wordlist** + Wordlists, also known as dictionaries, are used in dictionary attacks. Each line in a wordlist is treated as a potential password candidate. Examples include: collections of commonly used passwords, specialized dictionaries tailored to a specific target or context. + +3. **Others:** + This category includes any additional files required for specific attack types or configurations. Examples include … These files vary depending on the nature of the task and the tools being used. +Files can be uploaded to the Hashtopolis server from the Files page. To begin, select the appropriate file category by clicking on one of the tabs: Rules, Wordlists, or Other. The following figure illustrates the selection of the Rules category. + +Once a category is selected, files can be added to the server using one of the following methods: +- **Upload from your computer** – Directly upload files stored on your local machine. +- **Import from an import directory** – Use files that have been preloaded into the server’s import directory. +- **Download from a URL** – Provide a URL to fetch files from an external source. +Detailed instructions for each upload method are provided in the following subsections. + +### Upload a new file from the computer + +1. **Add file**: Click this button to enable file upload.. After clicking, a new field labeled Choose file will appear. Each time you click on Add File, an additional Choose file field will be added, allowing you to upload multiple files simultaneously.. +2. **Associated Access Group**: Define the access group that will have permissions to access the file(s) you are uploading. +3. **Choose file**: Click this button to open your computer’s file explorer. Select the file you wish to upload. +4. **Upload files**: Once you have selected all the files you wanted to upload, click the Upload files button. + +### Import a new file +When dealing with large files, such as wordlists, rules, or hashlists, you may encounter issues uploading them via the v1 of the Hashtopolis User Interface.. Common errors include exceeding the maximum upload size or experiencing a connection timeout. To bypass these limitations, you can use the import functionality of Hashtopolis. +- **Copy the file to the import folder**: Place the file in the designated import directory on the Hashtopolis server. If you are using the default Docker Compose setup, you can achieve this with the following command: +``` +docker cp hashtopolis-backend:/usr/local/share/hashtopolis/import/ +``` +- **Import the file**: + +1. **Associated Access Group**: Define the access group that will have permissions to access the file(s) you are uploading. +2. **Select the files to import** by ticking the box in front of them. Alternatively, use Select All below. +3. **Import files**. + +### Download new file from URL + +1. **Associated Access Group**: Define the access group that will have permissions to access the file(s) you are uploading. +2. **URL**: Provide the URL to download from.. +3. **Download file**. + +### Manage Files +Navigating to the Files page of the Hashtopolis User Interface, you can manage the files uploaded to the server. + +1. **Select Category**. +2. **Secret**: Files that are marked as secret will only be sent to trusted agents. +Line count: Reprocess the file and update the line count with the number of lines contained in the file. +3. **Edit**: Edit the parameters of the file (name, file type and associated group). +4. **Delete**: Removes the file from Hashtopolis. + +## Tasks + +## Monitoring + +# Advanced options/Features + +## Advanced Hashlist + +- Super Hashlist + +- New Hashmode + +## Advanced tasks + +- Advanced option in task creation +- Preconfigured tasks (including from existing task) +- Super Task +- Import Super task + +## New Binary + +# Settings and Configuration + +# Access Management + +Under construction + +# Future Work +- Project structure +- LDAP +- Permission Scheme +- (Ref to the sprints) From 3e84c99780375050fe2d94646890e60ad07b38b8 Mon Sep 17 00:00:00 2001 From: Romke van Dijk Date: Wed, 15 Jan 2025 14:12:59 +0100 Subject: [PATCH 023/691] Adding additional docs --- .github/workflows/docs.yml | 3 ++- doc/README.md | 53 +++++++++++-------------------------- doc/advanced.md | 33 +++++++++++++++++++++++ doc/assets/images/logo.png | Bin 0 -> 55786 bytes doc/index.md | 6 +++++ mkdocs.yml | 1 + 6 files changed, 57 insertions(+), 39 deletions(-) create mode 100644 doc/advanced.md create mode 100644 doc/assets/images/logo.png create mode 100644 doc/index.md diff --git a/.github/workflows/docs.yml b/.github/workflows/docs.yml index d8a36df3d..f5302a6eb 100644 --- a/.github/workflows/docs.yml +++ b/.github/workflows/docs.yml @@ -18,7 +18,8 @@ jobs: - name: Install dependencies run: | python -m pip install --upgrade pip - pip install mkdocs markdown-callouts mkdocs-material + pip install mkdocs + pip3 install $(mkdocs get-deps) sudo apt-get update sudo apt-get install -y lftp diff --git a/doc/README.md b/doc/README.md index bb58e2ad8..028dd3cff 100644 --- a/doc/README.md +++ b/doc/README.md @@ -1,43 +1,20 @@ -# Hashtopolis +# Documentation Development -> [!CAUTION] -> This is a new page that will be used for documentation. It is work in progress, so use with care! +This page describes howto use the documentation locally or how to contribute to it. +## Setup +1. Make sure you are in the root of the server project and setup a virtual enviroment there. +2. Install mkdocs +3. Install required mkdocs extensions +4. Start the server +5. Browse to http://127.0.0.1:8000 -## Hashtopolis Protocol - -The current up-to-date protocol version which Hashtopolis uses to communicate with clients is contained in the `protocol.pdf` file. -The documentation for the User API can be found in `user-api/user-api.pdf`, listing all functions which can be called. - -## Generic Crackers - -Custom crackers which should be able to get distributed with Hashtopolis need to fulfill some minimal requirements as command line options. Shown here with the help function of a generic example implementation (which is available [here](https://github.com/hashtopolis/generic-cracker)): - -``` -cracker.exe [options] action -Generic Cracker compatible with Hashtopolis - -Options: - -m, --mask Use mask for attack - -w, --wordlist Use wordlist for attack - -a, --attacked-hashlist Hashlist to attack - -s, --skip Keyspace to skip at the beginning - -l, --length Length of the keyspace to run - --timeout Stop cracking process after fixed amount of time - -Arguments: - action Action to execute ('keyspace' or 'crack') -``` - -`-m` and `-w` are used to specify the type of attack, but these options are not mandatory to look like this. - -Please note that not all Hashtopolis clients are compatible with generic cracker binaries (check their README) and if there are slight differences in the cracker compared to the generic requirements there might be changes required on the client to adapt to another handling schema. - -## Slow Algorithms - -To extract all Hashcat modes which are flagged as slow hashes, following command can be run inside the hashcat directory: - -``` -grep -Hr SLOW_HASH src/modules/ | cut -d: -f1 | sort | cut -d'.' -f1 | sed 's/src\/modules\/module_[0]\?//g' +``` bash +cd hashtopolis +virtualenv venv +source venv/bin/activate +pip3 install mkdocs +pip3 install $(mkdocs get-deps) +mkdocs server ``` diff --git a/doc/advanced.md b/doc/advanced.md new file mode 100644 index 000000000..136325196 --- /dev/null +++ b/doc/advanced.md @@ -0,0 +1,33 @@ +# Advanced usage + +## Generic Crackers + +Custom crackers which should be able to get distributed with Hashtopolis need to fulfill some minimal requirements as command line options. Shown here with the help function of a generic example implementation (which is available [here](https://github.com/hashtopolis/generic-cracker)): + +``` +cracker.exe [options] action +Generic Cracker compatible with Hashtopolis + +Options: + -m, --mask Use mask for attack + -w, --wordlist Use wordlist for attack + -a, --attacked-hashlist Hashlist to attack + -s, --skip Keyspace to skip at the beginning + -l, --length Length of the keyspace to run + --timeout Stop cracking process after fixed amount of time + +Arguments: + action Action to execute ('keyspace' or 'crack') +``` + +`-m` and `-w` are used to specify the type of attack, but these options are not mandatory to look like this. + +Please note that not all Hashtopolis clients are compatible with generic cracker binaries (check their README) and if there are slight differences in the cracker compared to the generic requirements there might be changes required on the client to adapt to another handling schema. + +## Slow Algorithms + +To extract all Hashcat modes which are flagged as slow hashes, following command can be run inside the hashcat directory: + +``` +grep -Hr SLOW_HASH src/modules/ | cut -d: -f1 | sort | cut -d'.' -f1 | sed 's/src\/modules\/module_[0]\?//g' +``` diff --git a/doc/assets/images/logo.png b/doc/assets/images/logo.png new file mode 100644 index 0000000000000000000000000000000000000000..c93f261a46d484acd5b3554e14c8fbc04e970fce GIT binary patch literal 55786 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 ZHbB0&qIrDBJX@yUxcpy5}m$m=^ literal 0 HcmV?d00001 diff --git a/doc/index.md b/doc/index.md new file mode 100644 index 000000000..a3db9dd33 --- /dev/null +++ b/doc/index.md @@ -0,0 +1,6 @@ +# Hashtopolis documentation + +> [!CAUTION] +> This is the new documentation of Hashtopolis. It is work in progress, so use with care! + +You can find the old documentation still inside this folder, please check the [Hashtopolis Communication Protocol (V2)](protocol.pdf) docs. The user api documentation can be found here: [Hashtopolis User API (V1)](user-api/user-api.pdf). diff --git a/mkdocs.yml b/mkdocs.yml index 8fdf35d09..678b7bddf 100644 --- a/mkdocs.yml +++ b/mkdocs.yml @@ -4,6 +4,7 @@ repo_url: https://github.com/hashtopolis/server docs_dir: doc theme: name: material + logo: assests/images/logo.png edit_uri: blob/docs/doc/ # Edit the URL to the static branch and folder markdown_extensions: - github-callouts # Add the ability of notes, warnings, etc. From 62cfe2fe253d16e87107285c419c18ad44e7e7d6 Mon Sep 17 00:00:00 2001 From: Romke van Dijk Date: Wed, 15 Jan 2025 14:14:08 +0100 Subject: [PATCH 024/691] Fixing typo --- mkdocs.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/mkdocs.yml b/mkdocs.yml index 678b7bddf..f410c5093 100644 --- a/mkdocs.yml +++ b/mkdocs.yml @@ -4,7 +4,7 @@ repo_url: https://github.com/hashtopolis/server docs_dir: doc theme: name: material - logo: assests/images/logo.png + logo: assets/images/logo.png edit_uri: blob/docs/doc/ # Edit the URL to the static branch and folder markdown_extensions: - github-callouts # Add the ability of notes, warnings, etc. From 363fd27acab39b0c51b9356fb18eb0ce12621317 Mon Sep 17 00:00:00 2001 From: coiseiw Date: Wed, 15 Jan 2025 14:22:05 +0100 Subject: [PATCH 025/691] Include nav in mkdocs + fix typo in user_manual --- doc/user_manual.md | 10 ++++++++++ mkdocs.yml | 12 ++++++++++++ 2 files changed, 22 insertions(+) diff --git a/doc/user_manual.md b/doc/user_manual.md index 2be94874f..531cab13f 100644 --- a/doc/user_manual.md +++ b/doc/user_manual.md @@ -1,5 +1,7 @@ # Basic Workflow + Basic workflow highlighting the main point. The goal is that with such workflow a new user is able to run a task on a new hashlist with files or with masks. + - New Hashlist - New Files, wordlist/rules/others - New Task @@ -13,7 +15,10 @@ Refer to the Hashcat documentation for detailed information on supported hash ty ### Create a hashlist In the Hashtopolis web interface, navigate to *Lists > New Hashlist*. You will get the following window: +![screenshot_hashlist](https://upload.wikimedia.org/wikipedia/commons/8/80/Comingsoon.png?20120228065200) + Here is how to fill in the different fields: + 1. **Name**: Provide a descriptive name for your hashlist. 2. **Hash Type**: Select the appropriate hash type from the dropdown menu. Suggestions will appear as you enter text. 3. **Hashlist Format**: Choose the format for your hashlist: @@ -32,8 +37,10 @@ Here is how to fill in the different fields: ## Files: Rules, Wordlist and other When creating a password recovery task in Hashtopolis, you may need to upload additional files to the server, depending on the type of attack you want to perform. These files fall into three main categories: + 1. **Rules** Rules files contain sets of instructions for dynamically modifying entries in a wordlist during an attack. By applying rules, you can generate variations of passwords without the need for additional wordlist files. For example, rules can: + - Append numbers or special characters. - Replace or capitalize specific characters. - Reverse words or combine entries. @@ -48,6 +55,7 @@ When creating a password recovery task in Hashtopolis, you may need to upload ad Files can be uploaded to the Hashtopolis server from the Files page. To begin, select the appropriate file category by clicking on one of the tabs: Rules, Wordlists, or Other. The following figure illustrates the selection of the Rules category. Once a category is selected, files can be added to the server using one of the following methods: + - **Upload from your computer** – Directly upload files stored on your local machine. - **Import from an import directory** – Use files that have been preloaded into the server’s import directory. - **Download from a URL** – Provide a URL to fetch files from an external source. @@ -62,10 +70,12 @@ Detailed instructions for each upload method are provided in the following subse ### Import a new file When dealing with large files, such as wordlists, rules, or hashlists, you may encounter issues uploading them via the v1 of the Hashtopolis User Interface.. Common errors include exceeding the maximum upload size or experiencing a connection timeout. To bypass these limitations, you can use the import functionality of Hashtopolis. + - **Copy the file to the import folder**: Place the file in the designated import directory on the Hashtopolis server. If you are using the default Docker Compose setup, you can achieve this with the following command: ``` docker cp hashtopolis-backend:/usr/local/share/hashtopolis/import/ ``` + - **Import the file**: 1. **Associated Access Group**: Define the access group that will have permissions to access the file(s) you are uploading. diff --git a/mkdocs.yml b/mkdocs.yml index f410c5093..7ff057aa9 100644 --- a/mkdocs.yml +++ b/mkdocs.yml @@ -2,6 +2,18 @@ site_name: Hashtopolis site_url: https://docs.hashtopolis.org repo_url: https://github.com/hashtopolis/server docs_dir: doc +nav: + - index.md + - install.md + - user_manual.md + - advanced.md + - changelog.md +nav: + - index.md + - install.md + - user_manual.md + - advanced.md + - changelog.md theme: name: material logo: assets/images/logo.png From ca1ad75b548bbf00c51bb145d097a419581a2c49 Mon Sep 17 00:00:00 2001 From: coiseiw Date: Wed, 15 Jan 2025 14:43:35 +0100 Subject: [PATCH 026/691] include placeholder_for_images --- doc/user_manual.md | 24 +++++++++++++++++++++++- mkdocs.yml | 10 +++------- 2 files changed, 26 insertions(+), 8 deletions(-) diff --git a/doc/user_manual.md b/doc/user_manual.md index 531cab13f..93037fda0 100644 --- a/doc/user_manual.md +++ b/doc/user_manual.md @@ -15,7 +15,9 @@ Refer to the Hashcat documentation for detailed information on supported hash ty ### Create a hashlist In the Hashtopolis web interface, navigate to *Lists > New Hashlist*. You will get the following window: -![screenshot_hashlist](https://upload.wikimedia.org/wikipedia/commons/8/80/Comingsoon.png?20120228065200) +

+ ![screenshot_hashlist](https://upload.wikimedia.org/wikipedia/commons/8/80/Comingsoon.png?20120228065200){ width="300" } +
Here is how to fill in the different fields: @@ -54,6 +56,10 @@ When creating a password recovery task in Hashtopolis, you may need to upload ad This category includes any additional files required for specific attack types or configurations. Examples include … These files vary depending on the nature of the task and the tools being used. Files can be uploaded to the Hashtopolis server from the Files page. To begin, select the appropriate file category by clicking on one of the tabs: Rules, Wordlists, or Other. The following figure illustrates the selection of the Rules category. +
+ ![screenshot_files](https://upload.wikimedia.org/wikipedia/commons/8/80/Comingsoon.png?20120228065200){ width="300" } +
+ Once a category is selected, files can be added to the server using one of the following methods: - **Upload from your computer** – Directly upload files stored on your local machine. @@ -63,6 +69,10 @@ Detailed instructions for each upload method are provided in the following subse ### Upload a new file from the computer +
+ ![screenshot_new_file](https://upload.wikimedia.org/wikipedia/commons/8/80/Comingsoon.png?20120228065200){ width="300" } +
+ 1. **Add file**: Click this button to enable file upload.. After clicking, a new field labeled Choose file will appear. Each time you click on Add File, an additional Choose file field will be added, allowing you to upload multiple files simultaneously.. 2. **Associated Access Group**: Define the access group that will have permissions to access the file(s) you are uploading. 3. **Choose file**: Click this button to open your computer’s file explorer. Select the file you wish to upload. @@ -78,12 +88,20 @@ docker cp hashtopolis-backend:/usr/local/share/hashtopolis/import/ - **Import the file**: +
+ ![screenshot_import_file](https://upload.wikimedia.org/wikipedia/commons/8/80/Comingsoon.png?20120228065200){ width="300" } +
+ 1. **Associated Access Group**: Define the access group that will have permissions to access the file(s) you are uploading. 2. **Select the files to import** by ticking the box in front of them. Alternatively, use Select All below. 3. **Import files**. ### Download new file from URL +
+ ![screenshot_download_file](https://upload.wikimedia.org/wikipedia/commons/8/80/Comingsoon.png?20120228065200){ width="300" } +
+ 1. **Associated Access Group**: Define the access group that will have permissions to access the file(s) you are uploading. 2. **URL**: Provide the URL to download from.. 3. **Download file**. @@ -91,6 +109,10 @@ docker cp hashtopolis-backend:/usr/local/share/hashtopolis/import/ ### Manage Files Navigating to the Files page of the Hashtopolis User Interface, you can manage the files uploaded to the server. +
+ ![screenshot_manage_file](https://upload.wikimedia.org/wikipedia/commons/8/80/Comingsoon.png?20120228065200){ width="300" } +
+ 1. **Select Category**. 2. **Secret**: Files that are marked as secret will only be sent to trusted agents. Line count: Reprocess the file and update the line count with the number of lines contained in the file. diff --git a/mkdocs.yml b/mkdocs.yml index 7ff057aa9..e61220c99 100644 --- a/mkdocs.yml +++ b/mkdocs.yml @@ -2,12 +2,6 @@ site_name: Hashtopolis site_url: https://docs.hashtopolis.org repo_url: https://github.com/hashtopolis/server docs_dir: doc -nav: - - index.md - - install.md - - user_manual.md - - advanced.md - - changelog.md nav: - index.md - install.md @@ -20,4 +14,6 @@ theme: edit_uri: blob/docs/doc/ # Edit the URL to the static branch and folder markdown_extensions: - github-callouts # Add the ability of notes, warnings, etc. - - sane_lists # Make the numbered lists continue \ No newline at end of file + - sane_lists # Make the numbered lists continue + - attr_list # allows to add HTML attributes and CSS classes + - md_in_html # allows for writing Markdown inside of HTML \ No newline at end of file From 8ed46714661bbc73f5fba992a194d81dd709e8ce Mon Sep 17 00:00:00 2001 From: jessevz Date: Wed, 15 Jan 2025 15:08:17 +0100 Subject: [PATCH 027/691] Fixed type in readme and added auto generation of apiv2 docs --- .github/workflows/docs.yml | 13 +- doc/README.md | 2 +- doc/apiv2.md | 30491 +++++++++++++++++++++++++++++++++++ 3 files changed, 30504 insertions(+), 2 deletions(-) create mode 100644 doc/apiv2.md diff --git a/.github/workflows/docs.yml b/.github/workflows/docs.yml index f5302a6eb..bf3421659 100644 --- a/.github/workflows/docs.yml +++ b/.github/workflows/docs.yml @@ -22,7 +22,18 @@ jobs: pip3 install $(mkdocs get-deps) sudo apt-get update sudo apt-get install -y lftp - + sudo apt-get install nodejs + sudo apt-get install npm + sudo npm i openapi-to-md -g + - name: Start application containers #same steps as in ci.yml, might make it more modular in the future + working-directory: .devcontainer + run: docker compose up -d + - name: Wait until entrypoint is finished and Hashtopolis is started + run: bash .github/scripts/await-hashtopolis-startup.sh + - name: Download newest apiv2 spec + run: | + wget http://localhost:8080/api/v2/openapi.json -P /tmp/ + openapi-to-md /tmp/openapi.json /docs/api/ - name: Build MkDocs site run: | mkdocs build diff --git a/doc/README.md b/doc/README.md index 028dd3cff..c7fea709c 100644 --- a/doc/README.md +++ b/doc/README.md @@ -16,5 +16,5 @@ virtualenv venv source venv/bin/activate pip3 install mkdocs pip3 install $(mkdocs get-deps) -mkdocs server +mkdocs serve ``` diff --git a/doc/apiv2.md b/doc/apiv2.md new file mode 100644 index 000000000..a7e822934 --- /dev/null +++ b/doc/apiv2.md @@ -0,0 +1,30491 @@ +# Hashtopolis API + +> Version v2 + +## Path Table + +| Method | Path | Description | +| --- | --- | --- | +| GET | [/api/v2/ui/accessgroups](#getapiv2uiaccessgroups) | | +| POST | [/api/v2/ui/accessgroups](#postapiv2uiaccessgroups) | | +| GET | [/api/v2/ui/accessgroups/count](#getapiv2uiaccessgroupscount) | | +| GET | [/api/v2/ui/accessgroups/{id:[0-9]+}/{relation:userMembers}](#getapiv2uiaccessgroupsid0-9relationusermembers) | | +| GET | [/api/v2/ui/accessgroups/{id:[0-9]+}/relationships/{relation:userMembers}](#getapiv2uiaccessgroupsid0-9relationshipsrelationusermembers) | | +| PATCH | [/api/v2/ui/accessgroups/{id:[0-9]+}/relationships/{relation:userMembers}](#patchapiv2uiaccessgroupsid0-9relationshipsrelationusermembers) | | +| POST | [/api/v2/ui/accessgroups/{id:[0-9]+}/relationships/{relation:userMembers}](#postapiv2uiaccessgroupsid0-9relationshipsrelationusermembers) | | +| DELETE | [/api/v2/ui/accessgroups/{id:[0-9]+}/relationships/{relation:userMembers}](#deleteapiv2uiaccessgroupsid0-9relationshipsrelationusermembers) | | +| GET | [/api/v2/ui/accessgroups/{id:[0-9]+}/{relation:agentMembers}](#getapiv2uiaccessgroupsid0-9relationagentmembers) | | +| GET | [/api/v2/ui/accessgroups/{id:[0-9]+}/relationships/{relation:agentMembers}](#getapiv2uiaccessgroupsid0-9relationshipsrelationagentmembers) | | +| PATCH | [/api/v2/ui/accessgroups/{id:[0-9]+}/relationships/{relation:agentMembers}](#patchapiv2uiaccessgroupsid0-9relationshipsrelationagentmembers) | | +| POST | [/api/v2/ui/accessgroups/{id:[0-9]+}/relationships/{relation:agentMembers}](#postapiv2uiaccessgroupsid0-9relationshipsrelationagentmembers) | | +| DELETE | [/api/v2/ui/accessgroups/{id:[0-9]+}/relationships/{relation:agentMembers}](#deleteapiv2uiaccessgroupsid0-9relationshipsrelationagentmembers) | | +| GET | [/api/v2/ui/accessgroups/{id:[0-9]+}](#getapiv2uiaccessgroupsid0-9) | | +| PATCH | [/api/v2/ui/accessgroups/{id:[0-9]+}](#patchapiv2uiaccessgroupsid0-9) | | +| DELETE | [/api/v2/ui/accessgroups/{id:[0-9]+}](#deleteapiv2uiaccessgroupsid0-9) | | +| GET | [/api/v2/ui/agentassignments](#getapiv2uiagentassignments) | | +| POST | [/api/v2/ui/agentassignments](#postapiv2uiagentassignments) | | +| GET | [/api/v2/ui/agentassignments/count](#getapiv2uiagentassignmentscount) | | +| GET | [/api/v2/ui/agentassignments/{id:[0-9]+}/{relation:agent}](#getapiv2uiagentassignmentsid0-9relationagent) | | +| GET | [/api/v2/ui/agentassignments/{id:[0-9]+}/relationships/{relation:agent}](#getapiv2uiagentassignmentsid0-9relationshipsrelationagent) | | +| PATCH | [/api/v2/ui/agentassignments/{id:[0-9]+}/relationships/{relation:agent}](#patchapiv2uiagentassignmentsid0-9relationshipsrelationagent) | | +| GET | [/api/v2/ui/agentassignments/{id:[0-9]+}/{relation:task}](#getapiv2uiagentassignmentsid0-9relationtask) | | +| GET | [/api/v2/ui/agentassignments/{id:[0-9]+}/relationships/{relation:task}](#getapiv2uiagentassignmentsid0-9relationshipsrelationtask) | | +| PATCH | [/api/v2/ui/agentassignments/{id:[0-9]+}/relationships/{relation:task}](#patchapiv2uiagentassignmentsid0-9relationshipsrelationtask) | | +| GET | [/api/v2/ui/agentassignments/{id:[0-9]+}](#getapiv2uiagentassignmentsid0-9) | | +| DELETE | [/api/v2/ui/agentassignments/{id:[0-9]+}](#deleteapiv2uiagentassignmentsid0-9) | | +| GET | [/api/v2/ui/agentbinaries](#getapiv2uiagentbinaries) | | +| POST | [/api/v2/ui/agentbinaries](#postapiv2uiagentbinaries) | | +| GET | [/api/v2/ui/agentbinaries/count](#getapiv2uiagentbinariescount) | | +| GET | [/api/v2/ui/agentbinaries/{id:[0-9]+}](#getapiv2uiagentbinariesid0-9) | | +| PATCH | [/api/v2/ui/agentbinaries/{id:[0-9]+}](#patchapiv2uiagentbinariesid0-9) | | +| DELETE | [/api/v2/ui/agentbinaries/{id:[0-9]+}](#deleteapiv2uiagentbinariesid0-9) | | +| GET | [/api/v2/ui/agents](#getapiv2uiagents) | | +| GET | [/api/v2/ui/agents/count](#getapiv2uiagentscount) | | +| GET | [/api/v2/ui/agents/{id:[0-9]+}/{relation:accessGroups}](#getapiv2uiagentsid0-9relationaccessgroups) | | +| GET | [/api/v2/ui/agents/{id:[0-9]+}/relationships/{relation:accessGroups}](#getapiv2uiagentsid0-9relationshipsrelationaccessgroups) | | +| PATCH | [/api/v2/ui/agents/{id:[0-9]+}/relationships/{relation:accessGroups}](#patchapiv2uiagentsid0-9relationshipsrelationaccessgroups) | | +| POST | [/api/v2/ui/agents/{id:[0-9]+}/relationships/{relation:accessGroups}](#postapiv2uiagentsid0-9relationshipsrelationaccessgroups) | | +| DELETE | [/api/v2/ui/agents/{id:[0-9]+}/relationships/{relation:accessGroups}](#deleteapiv2uiagentsid0-9relationshipsrelationaccessgroups) | | +| GET | [/api/v2/ui/agents/{id:[0-9]+}/{relation:agentStats}](#getapiv2uiagentsid0-9relationagentstats) | | +| GET | [/api/v2/ui/agents/{id:[0-9]+}/relationships/{relation:agentStats}](#getapiv2uiagentsid0-9relationshipsrelationagentstats) | | +| PATCH | [/api/v2/ui/agents/{id:[0-9]+}/relationships/{relation:agentStats}](#patchapiv2uiagentsid0-9relationshipsrelationagentstats) | | +| POST | [/api/v2/ui/agents/{id:[0-9]+}/relationships/{relation:agentStats}](#postapiv2uiagentsid0-9relationshipsrelationagentstats) | | +| DELETE | [/api/v2/ui/agents/{id:[0-9]+}/relationships/{relation:agentStats}](#deleteapiv2uiagentsid0-9relationshipsrelationagentstats) | | +| GET | [/api/v2/ui/agents/{id:[0-9]+}](#getapiv2uiagentsid0-9) | | +| PATCH | [/api/v2/ui/agents/{id:[0-9]+}](#patchapiv2uiagentsid0-9) | | +| DELETE | [/api/v2/ui/agents/{id:[0-9]+}](#deleteapiv2uiagentsid0-9) | | +| GET | [/api/v2/ui/agentstats](#getapiv2uiagentstats) | | +| GET | [/api/v2/ui/agentstats/count](#getapiv2uiagentstatscount) | | +| GET | [/api/v2/ui/agentstats/{id:[0-9]+}](#getapiv2uiagentstatsid0-9) | | +| DELETE | [/api/v2/ui/agentstats/{id:[0-9]+}](#deleteapiv2uiagentstatsid0-9) | | +| GET | [/api/v2/ui/chunks](#getapiv2uichunks) | | +| GET | [/api/v2/ui/chunks/count](#getapiv2uichunkscount) | | +| GET | [/api/v2/ui/chunks/{id:[0-9]+}/{relation:agent}](#getapiv2uichunksid0-9relationagent) | | +| GET | [/api/v2/ui/chunks/{id:[0-9]+}/relationships/{relation:agent}](#getapiv2uichunksid0-9relationshipsrelationagent) | | +| PATCH | [/api/v2/ui/chunks/{id:[0-9]+}/relationships/{relation:agent}](#patchapiv2uichunksid0-9relationshipsrelationagent) | | +| GET | [/api/v2/ui/chunks/{id:[0-9]+}/{relation:task}](#getapiv2uichunksid0-9relationtask) | | +| GET | [/api/v2/ui/chunks/{id:[0-9]+}/relationships/{relation:task}](#getapiv2uichunksid0-9relationshipsrelationtask) | | +| PATCH | [/api/v2/ui/chunks/{id:[0-9]+}/relationships/{relation:task}](#patchapiv2uichunksid0-9relationshipsrelationtask) | | +| GET | [/api/v2/ui/chunks/{id:[0-9]+}](#getapiv2uichunksid0-9) | | +| GET | [/api/v2/ui/configs](#getapiv2uiconfigs) | | +| GET | [/api/v2/ui/configs/count](#getapiv2uiconfigscount) | | +| GET | [/api/v2/ui/configs/{id:[0-9]+}/{relation:configSection}](#getapiv2uiconfigsid0-9relationconfigsection) | | +| GET | [/api/v2/ui/configs/{id:[0-9]+}/relationships/{relation:configSection}](#getapiv2uiconfigsid0-9relationshipsrelationconfigsection) | | +| PATCH | [/api/v2/ui/configs/{id:[0-9]+}/relationships/{relation:configSection}](#patchapiv2uiconfigsid0-9relationshipsrelationconfigsection) | | +| GET | [/api/v2/ui/configs/{id:[0-9]+}](#getapiv2uiconfigsid0-9) | | +| PATCH | [/api/v2/ui/configs/{id:[0-9]+}](#patchapiv2uiconfigsid0-9) | | +| GET | [/api/v2/ui/configsections](#getapiv2uiconfigsections) | | +| GET | [/api/v2/ui/configsections/count](#getapiv2uiconfigsectionscount) | | +| GET | [/api/v2/ui/configsections/{id:[0-9]+}](#getapiv2uiconfigsectionsid0-9) | | +| GET | [/api/v2/ui/crackers](#getapiv2uicrackers) | | +| POST | [/api/v2/ui/crackers](#postapiv2uicrackers) | | +| GET | [/api/v2/ui/crackers/count](#getapiv2uicrackerscount) | | +| GET | [/api/v2/ui/crackers/{id:[0-9]+}/{relation:crackerBinaryType}](#getapiv2uicrackersid0-9relationcrackerbinarytype) | | +| GET | [/api/v2/ui/crackers/{id:[0-9]+}/relationships/{relation:crackerBinaryType}](#getapiv2uicrackersid0-9relationshipsrelationcrackerbinarytype) | | +| PATCH | [/api/v2/ui/crackers/{id:[0-9]+}/relationships/{relation:crackerBinaryType}](#patchapiv2uicrackersid0-9relationshipsrelationcrackerbinarytype) | | +| GET | [/api/v2/ui/crackers/{id:[0-9]+}/{relation:tasks}](#getapiv2uicrackersid0-9relationtasks) | | +| GET | [/api/v2/ui/crackers/{id:[0-9]+}/relationships/{relation:tasks}](#getapiv2uicrackersid0-9relationshipsrelationtasks) | | +| PATCH | [/api/v2/ui/crackers/{id:[0-9]+}/relationships/{relation:tasks}](#patchapiv2uicrackersid0-9relationshipsrelationtasks) | | +| POST | [/api/v2/ui/crackers/{id:[0-9]+}/relationships/{relation:tasks}](#postapiv2uicrackersid0-9relationshipsrelationtasks) | | +| DELETE | [/api/v2/ui/crackers/{id:[0-9]+}/relationships/{relation:tasks}](#deleteapiv2uicrackersid0-9relationshipsrelationtasks) | | +| GET | [/api/v2/ui/crackers/{id:[0-9]+}](#getapiv2uicrackersid0-9) | | +| PATCH | [/api/v2/ui/crackers/{id:[0-9]+}](#patchapiv2uicrackersid0-9) | | +| DELETE | [/api/v2/ui/crackers/{id:[0-9]+}](#deleteapiv2uicrackersid0-9) | | +| GET | [/api/v2/ui/crackertypes](#getapiv2uicrackertypes) | | +| POST | [/api/v2/ui/crackertypes](#postapiv2uicrackertypes) | | +| GET | [/api/v2/ui/crackertypes/count](#getapiv2uicrackertypescount) | | +| GET | [/api/v2/ui/crackertypes/{id:[0-9]+}/{relation:crackerVersions}](#getapiv2uicrackertypesid0-9relationcrackerversions) | | +| GET | [/api/v2/ui/crackertypes/{id:[0-9]+}/relationships/{relation:crackerVersions}](#getapiv2uicrackertypesid0-9relationshipsrelationcrackerversions) | | +| PATCH | [/api/v2/ui/crackertypes/{id:[0-9]+}/relationships/{relation:crackerVersions}](#patchapiv2uicrackertypesid0-9relationshipsrelationcrackerversions) | | +| POST | [/api/v2/ui/crackertypes/{id:[0-9]+}/relationships/{relation:crackerVersions}](#postapiv2uicrackertypesid0-9relationshipsrelationcrackerversions) | | +| DELETE | [/api/v2/ui/crackertypes/{id:[0-9]+}/relationships/{relation:crackerVersions}](#deleteapiv2uicrackertypesid0-9relationshipsrelationcrackerversions) | | +| GET | [/api/v2/ui/crackertypes/{id:[0-9]+}/{relation:tasks}](#getapiv2uicrackertypesid0-9relationtasks) | | +| GET | [/api/v2/ui/crackertypes/{id:[0-9]+}/relationships/{relation:tasks}](#getapiv2uicrackertypesid0-9relationshipsrelationtasks) | | +| PATCH | [/api/v2/ui/crackertypes/{id:[0-9]+}/relationships/{relation:tasks}](#patchapiv2uicrackertypesid0-9relationshipsrelationtasks) | | +| POST | [/api/v2/ui/crackertypes/{id:[0-9]+}/relationships/{relation:tasks}](#postapiv2uicrackertypesid0-9relationshipsrelationtasks) | | +| DELETE | [/api/v2/ui/crackertypes/{id:[0-9]+}/relationships/{relation:tasks}](#deleteapiv2uicrackertypesid0-9relationshipsrelationtasks) | | +| GET | [/api/v2/ui/crackertypes/{id:[0-9]+}](#getapiv2uicrackertypesid0-9) | | +| PATCH | [/api/v2/ui/crackertypes/{id:[0-9]+}](#patchapiv2uicrackertypesid0-9) | | +| DELETE | [/api/v2/ui/crackertypes/{id:[0-9]+}](#deleteapiv2uicrackertypesid0-9) | | +| GET | [/api/v2/ui/files](#getapiv2uifiles) | | +| POST | [/api/v2/ui/files](#postapiv2uifiles) | | +| GET | [/api/v2/ui/files/count](#getapiv2uifilescount) | | +| GET | [/api/v2/ui/files/{id:[0-9]+}/{relation:accessGroup}](#getapiv2uifilesid0-9relationaccessgroup) | | +| GET | [/api/v2/ui/files/{id:[0-9]+}/relationships/{relation:accessGroup}](#getapiv2uifilesid0-9relationshipsrelationaccessgroup) | | +| PATCH | [/api/v2/ui/files/{id:[0-9]+}/relationships/{relation:accessGroup}](#patchapiv2uifilesid0-9relationshipsrelationaccessgroup) | | +| GET | [/api/v2/ui/files/{id:[0-9]+}](#getapiv2uifilesid0-9) | | +| PATCH | [/api/v2/ui/files/{id:[0-9]+}](#patchapiv2uifilesid0-9) | | +| DELETE | [/api/v2/ui/files/{id:[0-9]+}](#deleteapiv2uifilesid0-9) | | +| GET | [/api/v2/ui/globalpermissiongroups](#getapiv2uiglobalpermissiongroups) | | +| POST | [/api/v2/ui/globalpermissiongroups](#postapiv2uiglobalpermissiongroups) | | +| GET | [/api/v2/ui/globalpermissiongroups/count](#getapiv2uiglobalpermissiongroupscount) | | +| GET | [/api/v2/ui/globalpermissiongroups/{id:[0-9]+}/{relation:userMembers}](#getapiv2uiglobalpermissiongroupsid0-9relationusermembers) | | +| GET | [/api/v2/ui/globalpermissiongroups/{id:[0-9]+}/relationships/{relation:userMembers}](#getapiv2uiglobalpermissiongroupsid0-9relationshipsrelationusermembers) | | +| PATCH | [/api/v2/ui/globalpermissiongroups/{id:[0-9]+}/relationships/{relation:userMembers}](#patchapiv2uiglobalpermissiongroupsid0-9relationshipsrelationusermembers) | | +| POST | [/api/v2/ui/globalpermissiongroups/{id:[0-9]+}/relationships/{relation:userMembers}](#postapiv2uiglobalpermissiongroupsid0-9relationshipsrelationusermembers) | | +| DELETE | [/api/v2/ui/globalpermissiongroups/{id:[0-9]+}/relationships/{relation:userMembers}](#deleteapiv2uiglobalpermissiongroupsid0-9relationshipsrelationusermembers) | | +| GET | [/api/v2/ui/globalpermissiongroups/{id:[0-9]+}](#getapiv2uiglobalpermissiongroupsid0-9) | | +| PATCH | [/api/v2/ui/globalpermissiongroups/{id:[0-9]+}](#patchapiv2uiglobalpermissiongroupsid0-9) | | +| DELETE | [/api/v2/ui/globalpermissiongroups/{id:[0-9]+}](#deleteapiv2uiglobalpermissiongroupsid0-9) | | +| GET | [/api/v2/ui/hashes](#getapiv2uihashes) | | +| GET | [/api/v2/ui/hashes/count](#getapiv2uihashescount) | | +| GET | [/api/v2/ui/hashes/{id:[0-9]+}/{relation:chunk}](#getapiv2uihashesid0-9relationchunk) | | +| GET | [/api/v2/ui/hashes/{id:[0-9]+}/relationships/{relation:chunk}](#getapiv2uihashesid0-9relationshipsrelationchunk) | | +| PATCH | [/api/v2/ui/hashes/{id:[0-9]+}/relationships/{relation:chunk}](#patchapiv2uihashesid0-9relationshipsrelationchunk) | | +| GET | [/api/v2/ui/hashes/{id:[0-9]+}/{relation:hashlist}](#getapiv2uihashesid0-9relationhashlist) | | +| GET | [/api/v2/ui/hashes/{id:[0-9]+}/relationships/{relation:hashlist}](#getapiv2uihashesid0-9relationshipsrelationhashlist) | | +| PATCH | [/api/v2/ui/hashes/{id:[0-9]+}/relationships/{relation:hashlist}](#patchapiv2uihashesid0-9relationshipsrelationhashlist) | | +| GET | [/api/v2/ui/hashes/{id:[0-9]+}](#getapiv2uihashesid0-9) | | +| GET | [/api/v2/ui/hashlists](#getapiv2uihashlists) | | +| POST | [/api/v2/ui/hashlists](#postapiv2uihashlists) | | +| GET | [/api/v2/ui/hashlists/count](#getapiv2uihashlistscount) | | +| GET | [/api/v2/ui/hashlists/{id:[0-9]+}/{relation:accessGroup}](#getapiv2uihashlistsid0-9relationaccessgroup) | | +| GET | [/api/v2/ui/hashlists/{id:[0-9]+}/relationships/{relation:accessGroup}](#getapiv2uihashlistsid0-9relationshipsrelationaccessgroup) | | +| PATCH | [/api/v2/ui/hashlists/{id:[0-9]+}/relationships/{relation:accessGroup}](#patchapiv2uihashlistsid0-9relationshipsrelationaccessgroup) | | +| GET | [/api/v2/ui/hashlists/{id:[0-9]+}/{relation:hashType}](#getapiv2uihashlistsid0-9relationhashtype) | | +| GET | [/api/v2/ui/hashlists/{id:[0-9]+}/relationships/{relation:hashType}](#getapiv2uihashlistsid0-9relationshipsrelationhashtype) | | +| PATCH | [/api/v2/ui/hashlists/{id:[0-9]+}/relationships/{relation:hashType}](#patchapiv2uihashlistsid0-9relationshipsrelationhashtype) | | +| GET | [/api/v2/ui/hashlists/{id:[0-9]+}/{relation:hashes}](#getapiv2uihashlistsid0-9relationhashes) | | +| GET | [/api/v2/ui/hashlists/{id:[0-9]+}/relationships/{relation:hashes}](#getapiv2uihashlistsid0-9relationshipsrelationhashes) | | +| PATCH | [/api/v2/ui/hashlists/{id:[0-9]+}/relationships/{relation:hashes}](#patchapiv2uihashlistsid0-9relationshipsrelationhashes) | | +| POST | [/api/v2/ui/hashlists/{id:[0-9]+}/relationships/{relation:hashes}](#postapiv2uihashlistsid0-9relationshipsrelationhashes) | | +| DELETE | [/api/v2/ui/hashlists/{id:[0-9]+}/relationships/{relation:hashes}](#deleteapiv2uihashlistsid0-9relationshipsrelationhashes) | | +| GET | [/api/v2/ui/hashlists/{id:[0-9]+}/{relation:hashlists}](#getapiv2uihashlistsid0-9relationhashlists) | | +| GET | [/api/v2/ui/hashlists/{id:[0-9]+}/relationships/{relation:hashlists}](#getapiv2uihashlistsid0-9relationshipsrelationhashlists) | | +| PATCH | [/api/v2/ui/hashlists/{id:[0-9]+}/relationships/{relation:hashlists}](#patchapiv2uihashlistsid0-9relationshipsrelationhashlists) | | +| POST | [/api/v2/ui/hashlists/{id:[0-9]+}/relationships/{relation:hashlists}](#postapiv2uihashlistsid0-9relationshipsrelationhashlists) | | +| DELETE | [/api/v2/ui/hashlists/{id:[0-9]+}/relationships/{relation:hashlists}](#deleteapiv2uihashlistsid0-9relationshipsrelationhashlists) | | +| GET | [/api/v2/ui/hashlists/{id:[0-9]+}/{relation:tasks}](#getapiv2uihashlistsid0-9relationtasks) | | +| GET | [/api/v2/ui/hashlists/{id:[0-9]+}/relationships/{relation:tasks}](#getapiv2uihashlistsid0-9relationshipsrelationtasks) | | +| PATCH | [/api/v2/ui/hashlists/{id:[0-9]+}/relationships/{relation:tasks}](#patchapiv2uihashlistsid0-9relationshipsrelationtasks) | | +| POST | [/api/v2/ui/hashlists/{id:[0-9]+}/relationships/{relation:tasks}](#postapiv2uihashlistsid0-9relationshipsrelationtasks) | | +| DELETE | [/api/v2/ui/hashlists/{id:[0-9]+}/relationships/{relation:tasks}](#deleteapiv2uihashlistsid0-9relationshipsrelationtasks) | | +| GET | [/api/v2/ui/hashlists/{id:[0-9]+}](#getapiv2uihashlistsid0-9) | | +| PATCH | [/api/v2/ui/hashlists/{id:[0-9]+}](#patchapiv2uihashlistsid0-9) | | +| DELETE | [/api/v2/ui/hashlists/{id:[0-9]+}](#deleteapiv2uihashlistsid0-9) | | +| GET | [/api/v2/ui/hashtypes](#getapiv2uihashtypes) | | +| POST | [/api/v2/ui/hashtypes](#postapiv2uihashtypes) | | +| GET | [/api/v2/ui/hashtypes/count](#getapiv2uihashtypescount) | | +| GET | [/api/v2/ui/hashtypes/{id:[0-9]+}](#getapiv2uihashtypesid0-9) | | +| PATCH | [/api/v2/ui/hashtypes/{id:[0-9]+}](#patchapiv2uihashtypesid0-9) | | +| DELETE | [/api/v2/ui/hashtypes/{id:[0-9]+}](#deleteapiv2uihashtypesid0-9) | | +| GET | [/api/v2/ui/healthcheckagents](#getapiv2uihealthcheckagents) | | +| GET | [/api/v2/ui/healthcheckagents/count](#getapiv2uihealthcheckagentscount) | | +| GET | [/api/v2/ui/healthcheckagents/{id:[0-9]+}/{relation:agent}](#getapiv2uihealthcheckagentsid0-9relationagent) | | +| GET | [/api/v2/ui/healthcheckagents/{id:[0-9]+}/relationships/{relation:agent}](#getapiv2uihealthcheckagentsid0-9relationshipsrelationagent) | | +| PATCH | [/api/v2/ui/healthcheckagents/{id:[0-9]+}/relationships/{relation:agent}](#patchapiv2uihealthcheckagentsid0-9relationshipsrelationagent) | | +| GET | [/api/v2/ui/healthcheckagents/{id:[0-9]+}/{relation:healthCheck}](#getapiv2uihealthcheckagentsid0-9relationhealthcheck) | | +| GET | [/api/v2/ui/healthcheckagents/{id:[0-9]+}/relationships/{relation:healthCheck}](#getapiv2uihealthcheckagentsid0-9relationshipsrelationhealthcheck) | | +| PATCH | [/api/v2/ui/healthcheckagents/{id:[0-9]+}/relationships/{relation:healthCheck}](#patchapiv2uihealthcheckagentsid0-9relationshipsrelationhealthcheck) | | +| GET | [/api/v2/ui/healthcheckagents/{id:[0-9]+}](#getapiv2uihealthcheckagentsid0-9) | | +| GET | [/api/v2/ui/healthchecks](#getapiv2uihealthchecks) | | +| POST | [/api/v2/ui/healthchecks](#postapiv2uihealthchecks) | | +| GET | [/api/v2/ui/healthchecks/count](#getapiv2uihealthcheckscount) | | +| GET | [/api/v2/ui/healthchecks/{id:[0-9]+}/{relation:crackerBinary}](#getapiv2uihealthchecksid0-9relationcrackerbinary) | | +| GET | [/api/v2/ui/healthchecks/{id:[0-9]+}/relationships/{relation:crackerBinary}](#getapiv2uihealthchecksid0-9relationshipsrelationcrackerbinary) | | +| PATCH | [/api/v2/ui/healthchecks/{id:[0-9]+}/relationships/{relation:crackerBinary}](#patchapiv2uihealthchecksid0-9relationshipsrelationcrackerbinary) | | +| GET | [/api/v2/ui/healthchecks/{id:[0-9]+}/{relation:healthCheckAgents}](#getapiv2uihealthchecksid0-9relationhealthcheckagents) | | +| GET | [/api/v2/ui/healthchecks/{id:[0-9]+}/relationships/{relation:healthCheckAgents}](#getapiv2uihealthchecksid0-9relationshipsrelationhealthcheckagents) | | +| PATCH | [/api/v2/ui/healthchecks/{id:[0-9]+}/relationships/{relation:healthCheckAgents}](#patchapiv2uihealthchecksid0-9relationshipsrelationhealthcheckagents) | | +| POST | [/api/v2/ui/healthchecks/{id:[0-9]+}/relationships/{relation:healthCheckAgents}](#postapiv2uihealthchecksid0-9relationshipsrelationhealthcheckagents) | | +| DELETE | [/api/v2/ui/healthchecks/{id:[0-9]+}/relationships/{relation:healthCheckAgents}](#deleteapiv2uihealthchecksid0-9relationshipsrelationhealthcheckagents) | | +| GET | [/api/v2/ui/healthchecks/{id:[0-9]+}](#getapiv2uihealthchecksid0-9) | | +| PATCH | [/api/v2/ui/healthchecks/{id:[0-9]+}](#patchapiv2uihealthchecksid0-9) | | +| DELETE | [/api/v2/ui/healthchecks/{id:[0-9]+}](#deleteapiv2uihealthchecksid0-9) | | +| GET | [/api/v2/ui/logentries](#getapiv2uilogentries) | | +| POST | [/api/v2/ui/logentries](#postapiv2uilogentries) | | +| GET | [/api/v2/ui/logentries/count](#getapiv2uilogentriescount) | | +| GET | [/api/v2/ui/logentries/{id:[0-9]+}](#getapiv2uilogentriesid0-9) | | +| PATCH | [/api/v2/ui/logentries/{id:[0-9]+}](#patchapiv2uilogentriesid0-9) | | +| DELETE | [/api/v2/ui/logentries/{id:[0-9]+}](#deleteapiv2uilogentriesid0-9) | | +| GET | [/api/v2/ui/notifications](#getapiv2uinotifications) | | +| POST | [/api/v2/ui/notifications](#postapiv2uinotifications) | | +| GET | [/api/v2/ui/notifications/count](#getapiv2uinotificationscount) | | +| GET | [/api/v2/ui/notifications/{id:[0-9]+}/{relation:user}](#getapiv2uinotificationsid0-9relationuser) | | +| GET | [/api/v2/ui/notifications/{id:[0-9]+}/relationships/{relation:user}](#getapiv2uinotificationsid0-9relationshipsrelationuser) | | +| PATCH | [/api/v2/ui/notifications/{id:[0-9]+}/relationships/{relation:user}](#patchapiv2uinotificationsid0-9relationshipsrelationuser) | | +| GET | [/api/v2/ui/notifications/{id:[0-9]+}](#getapiv2uinotificationsid0-9) | | +| PATCH | [/api/v2/ui/notifications/{id:[0-9]+}](#patchapiv2uinotificationsid0-9) | | +| DELETE | [/api/v2/ui/notifications/{id:[0-9]+}](#deleteapiv2uinotificationsid0-9) | | +| GET | [/api/v2/ui/preprocessors](#getapiv2uipreprocessors) | | +| POST | [/api/v2/ui/preprocessors](#postapiv2uipreprocessors) | | +| GET | [/api/v2/ui/preprocessors/count](#getapiv2uipreprocessorscount) | | +| GET | [/api/v2/ui/preprocessors/{id:[0-9]+}](#getapiv2uipreprocessorsid0-9) | | +| PATCH | [/api/v2/ui/preprocessors/{id:[0-9]+}](#patchapiv2uipreprocessorsid0-9) | | +| DELETE | [/api/v2/ui/preprocessors/{id:[0-9]+}](#deleteapiv2uipreprocessorsid0-9) | | +| GET | [/api/v2/ui/pretasks](#getapiv2uipretasks) | | +| POST | [/api/v2/ui/pretasks](#postapiv2uipretasks) | | +| GET | [/api/v2/ui/pretasks/count](#getapiv2uipretaskscount) | | +| GET | [/api/v2/ui/pretasks/{id:[0-9]+}/{relation:pretaskFiles}](#getapiv2uipretasksid0-9relationpretaskfiles) | | +| GET | [/api/v2/ui/pretasks/{id:[0-9]+}/relationships/{relation:pretaskFiles}](#getapiv2uipretasksid0-9relationshipsrelationpretaskfiles) | | +| PATCH | [/api/v2/ui/pretasks/{id:[0-9]+}/relationships/{relation:pretaskFiles}](#patchapiv2uipretasksid0-9relationshipsrelationpretaskfiles) | | +| POST | [/api/v2/ui/pretasks/{id:[0-9]+}/relationships/{relation:pretaskFiles}](#postapiv2uipretasksid0-9relationshipsrelationpretaskfiles) | | +| DELETE | [/api/v2/ui/pretasks/{id:[0-9]+}/relationships/{relation:pretaskFiles}](#deleteapiv2uipretasksid0-9relationshipsrelationpretaskfiles) | | +| GET | [/api/v2/ui/pretasks/{id:[0-9]+}](#getapiv2uipretasksid0-9) | | +| PATCH | [/api/v2/ui/pretasks/{id:[0-9]+}](#patchapiv2uipretasksid0-9) | | +| DELETE | [/api/v2/ui/pretasks/{id:[0-9]+}](#deleteapiv2uipretasksid0-9) | | +| GET | [/api/v2/ui/speeds](#getapiv2uispeeds) | | +| GET | [/api/v2/ui/speeds/count](#getapiv2uispeedscount) | | +| GET | [/api/v2/ui/speeds/{id:[0-9]+}/{relation:agent}](#getapiv2uispeedsid0-9relationagent) | | +| GET | [/api/v2/ui/speeds/{id:[0-9]+}/relationships/{relation:agent}](#getapiv2uispeedsid0-9relationshipsrelationagent) | | +| PATCH | [/api/v2/ui/speeds/{id:[0-9]+}/relationships/{relation:agent}](#patchapiv2uispeedsid0-9relationshipsrelationagent) | | +| GET | [/api/v2/ui/speeds/{id:[0-9]+}/{relation:task}](#getapiv2uispeedsid0-9relationtask) | | +| GET | [/api/v2/ui/speeds/{id:[0-9]+}/relationships/{relation:task}](#getapiv2uispeedsid0-9relationshipsrelationtask) | | +| PATCH | [/api/v2/ui/speeds/{id:[0-9]+}/relationships/{relation:task}](#patchapiv2uispeedsid0-9relationshipsrelationtask) | | +| GET | [/api/v2/ui/speeds/{id:[0-9]+}](#getapiv2uispeedsid0-9) | | +| GET | [/api/v2/ui/supertasks](#getapiv2uisupertasks) | | +| POST | [/api/v2/ui/supertasks](#postapiv2uisupertasks) | | +| GET | [/api/v2/ui/supertasks/count](#getapiv2uisupertaskscount) | | +| GET | [/api/v2/ui/supertasks/{id:[0-9]+}/{relation:pretasks}](#getapiv2uisupertasksid0-9relationpretasks) | | +| GET | [/api/v2/ui/supertasks/{id:[0-9]+}/relationships/{relation:pretasks}](#getapiv2uisupertasksid0-9relationshipsrelationpretasks) | | +| PATCH | [/api/v2/ui/supertasks/{id:[0-9]+}/relationships/{relation:pretasks}](#patchapiv2uisupertasksid0-9relationshipsrelationpretasks) | | +| POST | [/api/v2/ui/supertasks/{id:[0-9]+}/relationships/{relation:pretasks}](#postapiv2uisupertasksid0-9relationshipsrelationpretasks) | | +| DELETE | [/api/v2/ui/supertasks/{id:[0-9]+}/relationships/{relation:pretasks}](#deleteapiv2uisupertasksid0-9relationshipsrelationpretasks) | | +| GET | [/api/v2/ui/supertasks/{id:[0-9]+}](#getapiv2uisupertasksid0-9) | | +| PATCH | [/api/v2/ui/supertasks/{id:[0-9]+}](#patchapiv2uisupertasksid0-9) | | +| DELETE | [/api/v2/ui/supertasks/{id:[0-9]+}](#deleteapiv2uisupertasksid0-9) | | +| GET | [/api/v2/ui/tasks](#getapiv2uitasks) | | +| POST | [/api/v2/ui/tasks](#postapiv2uitasks) | | +| GET | [/api/v2/ui/tasks/count](#getapiv2uitaskscount) | | +| GET | [/api/v2/ui/tasks/{id:[0-9]+}/{relation:crackerBinary}](#getapiv2uitasksid0-9relationcrackerbinary) | | +| GET | [/api/v2/ui/tasks/{id:[0-9]+}/relationships/{relation:crackerBinary}](#getapiv2uitasksid0-9relationshipsrelationcrackerbinary) | | +| PATCH | [/api/v2/ui/tasks/{id:[0-9]+}/relationships/{relation:crackerBinary}](#patchapiv2uitasksid0-9relationshipsrelationcrackerbinary) | | +| GET | [/api/v2/ui/tasks/{id:[0-9]+}/{relation:crackerBinaryType}](#getapiv2uitasksid0-9relationcrackerbinarytype) | | +| GET | [/api/v2/ui/tasks/{id:[0-9]+}/relationships/{relation:crackerBinaryType}](#getapiv2uitasksid0-9relationshipsrelationcrackerbinarytype) | | +| PATCH | [/api/v2/ui/tasks/{id:[0-9]+}/relationships/{relation:crackerBinaryType}](#patchapiv2uitasksid0-9relationshipsrelationcrackerbinarytype) | | +| GET | [/api/v2/ui/tasks/{id:[0-9]+}/{relation:hashlist}](#getapiv2uitasksid0-9relationhashlist) | | +| GET | [/api/v2/ui/tasks/{id:[0-9]+}/relationships/{relation:hashlist}](#getapiv2uitasksid0-9relationshipsrelationhashlist) | | +| PATCH | [/api/v2/ui/tasks/{id:[0-9]+}/relationships/{relation:hashlist}](#patchapiv2uitasksid0-9relationshipsrelationhashlist) | | +| GET | [/api/v2/ui/tasks/{id:[0-9]+}/{relation:assignedAgents}](#getapiv2uitasksid0-9relationassignedagents) | | +| GET | [/api/v2/ui/tasks/{id:[0-9]+}/relationships/{relation:assignedAgents}](#getapiv2uitasksid0-9relationshipsrelationassignedagents) | | +| PATCH | [/api/v2/ui/tasks/{id:[0-9]+}/relationships/{relation:assignedAgents}](#patchapiv2uitasksid0-9relationshipsrelationassignedagents) | | +| POST | [/api/v2/ui/tasks/{id:[0-9]+}/relationships/{relation:assignedAgents}](#postapiv2uitasksid0-9relationshipsrelationassignedagents) | | +| DELETE | [/api/v2/ui/tasks/{id:[0-9]+}/relationships/{relation:assignedAgents}](#deleteapiv2uitasksid0-9relationshipsrelationassignedagents) | | +| GET | [/api/v2/ui/tasks/{id:[0-9]+}/{relation:files}](#getapiv2uitasksid0-9relationfiles) | | +| GET | [/api/v2/ui/tasks/{id:[0-9]+}/relationships/{relation:files}](#getapiv2uitasksid0-9relationshipsrelationfiles) | | +| PATCH | [/api/v2/ui/tasks/{id:[0-9]+}/relationships/{relation:files}](#patchapiv2uitasksid0-9relationshipsrelationfiles) | | +| POST | [/api/v2/ui/tasks/{id:[0-9]+}/relationships/{relation:files}](#postapiv2uitasksid0-9relationshipsrelationfiles) | | +| DELETE | [/api/v2/ui/tasks/{id:[0-9]+}/relationships/{relation:files}](#deleteapiv2uitasksid0-9relationshipsrelationfiles) | | +| GET | [/api/v2/ui/tasks/{id:[0-9]+}/{relation:speeds}](#getapiv2uitasksid0-9relationspeeds) | | +| GET | [/api/v2/ui/tasks/{id:[0-9]+}/relationships/{relation:speeds}](#getapiv2uitasksid0-9relationshipsrelationspeeds) | | +| PATCH | [/api/v2/ui/tasks/{id:[0-9]+}/relationships/{relation:speeds}](#patchapiv2uitasksid0-9relationshipsrelationspeeds) | | +| POST | [/api/v2/ui/tasks/{id:[0-9]+}/relationships/{relation:speeds}](#postapiv2uitasksid0-9relationshipsrelationspeeds) | | +| DELETE | [/api/v2/ui/tasks/{id:[0-9]+}/relationships/{relation:speeds}](#deleteapiv2uitasksid0-9relationshipsrelationspeeds) | | +| GET | [/api/v2/ui/tasks/{id:[0-9]+}](#getapiv2uitasksid0-9) | | +| PATCH | [/api/v2/ui/tasks/{id:[0-9]+}](#patchapiv2uitasksid0-9) | | +| DELETE | [/api/v2/ui/tasks/{id:[0-9]+}](#deleteapiv2uitasksid0-9) | | +| GET | [/api/v2/ui/taskwrappers](#getapiv2uitaskwrappers) | | +| GET | [/api/v2/ui/taskwrappers/count](#getapiv2uitaskwrapperscount) | | +| GET | [/api/v2/ui/taskwrappers/{id:[0-9]+}/{relation:accessGroup}](#getapiv2uitaskwrappersid0-9relationaccessgroup) | | +| GET | [/api/v2/ui/taskwrappers/{id:[0-9]+}/relationships/{relation:accessGroup}](#getapiv2uitaskwrappersid0-9relationshipsrelationaccessgroup) | | +| PATCH | [/api/v2/ui/taskwrappers/{id:[0-9]+}/relationships/{relation:accessGroup}](#patchapiv2uitaskwrappersid0-9relationshipsrelationaccessgroup) | | +| GET | [/api/v2/ui/taskwrappers/{id:[0-9]+}/{relation:tasks}](#getapiv2uitaskwrappersid0-9relationtasks) | | +| GET | [/api/v2/ui/taskwrappers/{id:[0-9]+}/relationships/{relation:tasks}](#getapiv2uitaskwrappersid0-9relationshipsrelationtasks) | | +| PATCH | [/api/v2/ui/taskwrappers/{id:[0-9]+}/relationships/{relation:tasks}](#patchapiv2uitaskwrappersid0-9relationshipsrelationtasks) | | +| POST | [/api/v2/ui/taskwrappers/{id:[0-9]+}/relationships/{relation:tasks}](#postapiv2uitaskwrappersid0-9relationshipsrelationtasks) | | +| DELETE | [/api/v2/ui/taskwrappers/{id:[0-9]+}/relationships/{relation:tasks}](#deleteapiv2uitaskwrappersid0-9relationshipsrelationtasks) | | +| GET | [/api/v2/ui/taskwrappers/{id:[0-9]+}](#getapiv2uitaskwrappersid0-9) | | +| PATCH | [/api/v2/ui/taskwrappers/{id:[0-9]+}](#patchapiv2uitaskwrappersid0-9) | | +| DELETE | [/api/v2/ui/taskwrappers/{id:[0-9]+}](#deleteapiv2uitaskwrappersid0-9) | | +| GET | [/api/v2/ui/users](#getapiv2uiusers) | | +| POST | [/api/v2/ui/users](#postapiv2uiusers) | | +| GET | [/api/v2/ui/users/count](#getapiv2uiuserscount) | | +| GET | [/api/v2/ui/users/{id:[0-9]+}/{relation:globalPermissionGroup}](#getapiv2uiusersid0-9relationglobalpermissiongroup) | | +| GET | [/api/v2/ui/users/{id:[0-9]+}/relationships/{relation:globalPermissionGroup}](#getapiv2uiusersid0-9relationshipsrelationglobalpermissiongroup) | | +| PATCH | [/api/v2/ui/users/{id:[0-9]+}/relationships/{relation:globalPermissionGroup}](#patchapiv2uiusersid0-9relationshipsrelationglobalpermissiongroup) | | +| GET | [/api/v2/ui/users/{id:[0-9]+}/{relation:accessGroups}](#getapiv2uiusersid0-9relationaccessgroups) | | +| GET | [/api/v2/ui/users/{id:[0-9]+}/relationships/{relation:accessGroups}](#getapiv2uiusersid0-9relationshipsrelationaccessgroups) | | +| PATCH | [/api/v2/ui/users/{id:[0-9]+}/relationships/{relation:accessGroups}](#patchapiv2uiusersid0-9relationshipsrelationaccessgroups) | | +| POST | [/api/v2/ui/users/{id:[0-9]+}/relationships/{relation:accessGroups}](#postapiv2uiusersid0-9relationshipsrelationaccessgroups) | | +| DELETE | [/api/v2/ui/users/{id:[0-9]+}/relationships/{relation:accessGroups}](#deleteapiv2uiusersid0-9relationshipsrelationaccessgroups) | | +| GET | [/api/v2/ui/users/{id:[0-9]+}](#getapiv2uiusersid0-9) | | +| PATCH | [/api/v2/ui/users/{id:[0-9]+}](#patchapiv2uiusersid0-9) | | +| DELETE | [/api/v2/ui/users/{id:[0-9]+}](#deleteapiv2uiusersid0-9) | | +| GET | [/api/v2/ui/vouchers](#getapiv2uivouchers) | | +| POST | [/api/v2/ui/vouchers](#postapiv2uivouchers) | | +| GET | [/api/v2/ui/vouchers/count](#getapiv2uivoucherscount) | | +| GET | [/api/v2/ui/vouchers/{id:[0-9]+}](#getapiv2uivouchersid0-9) | | +| PATCH | [/api/v2/ui/vouchers/{id:[0-9]+}](#patchapiv2uivouchersid0-9) | | +| DELETE | [/api/v2/ui/vouchers/{id:[0-9]+}](#deleteapiv2uivouchersid0-9) | | +| POST | [/api/v2/auth/token](#postapiv2authtoken) | | + +## Reference Table + +| Name | Path | Description | +| --- | --- | --- | +| ListResponse | [#/components/schemas/ListResponse](#componentsschemaslistresponse) | | +| ErrorResponse | [#/components/schemas/ErrorResponse](#componentsschemaserrorresponse) | | +| NotFoundResponse | [#/components/schemas/NotFoundResponse](#componentsschemasnotfoundresponse) | | +| AccessGroupCreate | [#/components/schemas/AccessGroupCreate](#componentsschemasaccessgroupcreate) | | +| AccessGroupPatch | [#/components/schemas/AccessGroupPatch](#componentsschemasaccessgrouppatch) | | +| AccessGroupResponse | [#/components/schemas/AccessGroupResponse](#componentsschemasaccessgroupresponse) | | +| AccessGroupSingleResponse | [#/components/schemas/AccessGroupSingleResponse](#componentsschemasaccessgroupsingleresponse) | | +| AccessGroupPostPatchResponse | [#/components/schemas/AccessGroupPostPatchResponse](#componentsschemasaccessgrouppostpatchresponse) | | +| AccessGroupListResponse | [#/components/schemas/AccessGroupListResponse](#componentsschemasaccessgrouplistresponse) | | +| AssignmentCreate | [#/components/schemas/AssignmentCreate](#componentsschemasassignmentcreate) | | +| AssignmentPatch | [#/components/schemas/AssignmentPatch](#componentsschemasassignmentpatch) | | +| AssignmentResponse | [#/components/schemas/AssignmentResponse](#componentsschemasassignmentresponse) | | +| AssignmentSingleResponse | [#/components/schemas/AssignmentSingleResponse](#componentsschemasassignmentsingleresponse) | | +| AssignmentPostPatchResponse | [#/components/schemas/AssignmentPostPatchResponse](#componentsschemasassignmentpostpatchresponse) | | +| AssignmentListResponse | [#/components/schemas/AssignmentListResponse](#componentsschemasassignmentlistresponse) | | +| AgentBinaryCreate | [#/components/schemas/AgentBinaryCreate](#componentsschemasagentbinarycreate) | | +| AgentBinaryPatch | [#/components/schemas/AgentBinaryPatch](#componentsschemasagentbinarypatch) | | +| AgentBinaryResponse | [#/components/schemas/AgentBinaryResponse](#componentsschemasagentbinaryresponse) | | +| AgentBinarySingleResponse | [#/components/schemas/AgentBinarySingleResponse](#componentsschemasagentbinarysingleresponse) | | +| AgentBinaryPostPatchResponse | [#/components/schemas/AgentBinaryPostPatchResponse](#componentsschemasagentbinarypostpatchresponse) | | +| AgentBinaryListResponse | [#/components/schemas/AgentBinaryListResponse](#componentsschemasagentbinarylistresponse) | | +| AgentCreate | [#/components/schemas/AgentCreate](#componentsschemasagentcreate) | | +| AgentPatch | [#/components/schemas/AgentPatch](#componentsschemasagentpatch) | | +| AgentResponse | [#/components/schemas/AgentResponse](#componentsschemasagentresponse) | | +| AgentSingleResponse | [#/components/schemas/AgentSingleResponse](#componentsschemasagentsingleresponse) | | +| AgentPostPatchResponse | [#/components/schemas/AgentPostPatchResponse](#componentsschemasagentpostpatchresponse) | | +| AgentListResponse | [#/components/schemas/AgentListResponse](#componentsschemasagentlistresponse) | | +| AgentStatCreate | [#/components/schemas/AgentStatCreate](#componentsschemasagentstatcreate) | | +| AgentStatPatch | [#/components/schemas/AgentStatPatch](#componentsschemasagentstatpatch) | | +| AgentStatResponse | [#/components/schemas/AgentStatResponse](#componentsschemasagentstatresponse) | | +| AgentStatSingleResponse | [#/components/schemas/AgentStatSingleResponse](#componentsschemasagentstatsingleresponse) | | +| AgentStatPostPatchResponse | [#/components/schemas/AgentStatPostPatchResponse](#componentsschemasagentstatpostpatchresponse) | | +| AgentStatListResponse | [#/components/schemas/AgentStatListResponse](#componentsschemasagentstatlistresponse) | | +| ChunkCreate | [#/components/schemas/ChunkCreate](#componentsschemaschunkcreate) | | +| ChunkPatch | [#/components/schemas/ChunkPatch](#componentsschemaschunkpatch) | | +| ChunkResponse | [#/components/schemas/ChunkResponse](#componentsschemaschunkresponse) | | +| ChunkSingleResponse | [#/components/schemas/ChunkSingleResponse](#componentsschemaschunksingleresponse) | | +| ChunkPostPatchResponse | [#/components/schemas/ChunkPostPatchResponse](#componentsschemaschunkpostpatchresponse) | | +| ChunkListResponse | [#/components/schemas/ChunkListResponse](#componentsschemaschunklistresponse) | | +| ConfigCreate | [#/components/schemas/ConfigCreate](#componentsschemasconfigcreate) | | +| ConfigPatch | [#/components/schemas/ConfigPatch](#componentsschemasconfigpatch) | | +| ConfigResponse | [#/components/schemas/ConfigResponse](#componentsschemasconfigresponse) | | +| ConfigSingleResponse | [#/components/schemas/ConfigSingleResponse](#componentsschemasconfigsingleresponse) | | +| ConfigPostPatchResponse | [#/components/schemas/ConfigPostPatchResponse](#componentsschemasconfigpostpatchresponse) | | +| ConfigListResponse | [#/components/schemas/ConfigListResponse](#componentsschemasconfiglistresponse) | | +| ConfigSectionCreate | [#/components/schemas/ConfigSectionCreate](#componentsschemasconfigsectioncreate) | | +| ConfigSectionPatch | [#/components/schemas/ConfigSectionPatch](#componentsschemasconfigsectionpatch) | | +| ConfigSectionResponse | [#/components/schemas/ConfigSectionResponse](#componentsschemasconfigsectionresponse) | | +| ConfigSectionSingleResponse | [#/components/schemas/ConfigSectionSingleResponse](#componentsschemasconfigsectionsingleresponse) | | +| ConfigSectionPostPatchResponse | [#/components/schemas/ConfigSectionPostPatchResponse](#componentsschemasconfigsectionpostpatchresponse) | | +| ConfigSectionListResponse | [#/components/schemas/ConfigSectionListResponse](#componentsschemasconfigsectionlistresponse) | | +| CrackerBinaryCreate | [#/components/schemas/CrackerBinaryCreate](#componentsschemascrackerbinarycreate) | | +| CrackerBinaryPatch | [#/components/schemas/CrackerBinaryPatch](#componentsschemascrackerbinarypatch) | | +| CrackerBinaryResponse | [#/components/schemas/CrackerBinaryResponse](#componentsschemascrackerbinaryresponse) | | +| CrackerBinarySingleResponse | [#/components/schemas/CrackerBinarySingleResponse](#componentsschemascrackerbinarysingleresponse) | | +| CrackerBinaryPostPatchResponse | [#/components/schemas/CrackerBinaryPostPatchResponse](#componentsschemascrackerbinarypostpatchresponse) | | +| CrackerBinaryListResponse | [#/components/schemas/CrackerBinaryListResponse](#componentsschemascrackerbinarylistresponse) | | +| CrackerBinaryTypeCreate | [#/components/schemas/CrackerBinaryTypeCreate](#componentsschemascrackerbinarytypecreate) | | +| CrackerBinaryTypePatch | [#/components/schemas/CrackerBinaryTypePatch](#componentsschemascrackerbinarytypepatch) | | +| CrackerBinaryTypeResponse | [#/components/schemas/CrackerBinaryTypeResponse](#componentsschemascrackerbinarytyperesponse) | | +| CrackerBinaryTypeSingleResponse | [#/components/schemas/CrackerBinaryTypeSingleResponse](#componentsschemascrackerbinarytypesingleresponse) | | +| CrackerBinaryTypePostPatchResponse | [#/components/schemas/CrackerBinaryTypePostPatchResponse](#componentsschemascrackerbinarytypepostpatchresponse) | | +| CrackerBinaryTypeListResponse | [#/components/schemas/CrackerBinaryTypeListResponse](#componentsschemascrackerbinarytypelistresponse) | | +| FileCreate | [#/components/schemas/FileCreate](#componentsschemasfilecreate) | | +| FilePatch | [#/components/schemas/FilePatch](#componentsschemasfilepatch) | | +| FileResponse | [#/components/schemas/FileResponse](#componentsschemasfileresponse) | | +| FileSingleResponse | [#/components/schemas/FileSingleResponse](#componentsschemasfilesingleresponse) | | +| FilePostPatchResponse | [#/components/schemas/FilePostPatchResponse](#componentsschemasfilepostpatchresponse) | | +| FileListResponse | [#/components/schemas/FileListResponse](#componentsschemasfilelistresponse) | | +| RightGroupCreate | [#/components/schemas/RightGroupCreate](#componentsschemasrightgroupcreate) | | +| RightGroupPatch | [#/components/schemas/RightGroupPatch](#componentsschemasrightgrouppatch) | | +| RightGroupResponse | [#/components/schemas/RightGroupResponse](#componentsschemasrightgroupresponse) | | +| RightGroupSingleResponse | [#/components/schemas/RightGroupSingleResponse](#componentsschemasrightgroupsingleresponse) | | +| RightGroupPostPatchResponse | [#/components/schemas/RightGroupPostPatchResponse](#componentsschemasrightgrouppostpatchresponse) | | +| RightGroupListResponse | [#/components/schemas/RightGroupListResponse](#componentsschemasrightgrouplistresponse) | | +| HashCreate | [#/components/schemas/HashCreate](#componentsschemashashcreate) | | +| HashPatch | [#/components/schemas/HashPatch](#componentsschemashashpatch) | | +| HashResponse | [#/components/schemas/HashResponse](#componentsschemashashresponse) | | +| HashSingleResponse | [#/components/schemas/HashSingleResponse](#componentsschemashashsingleresponse) | | +| HashPostPatchResponse | [#/components/schemas/HashPostPatchResponse](#componentsschemashashpostpatchresponse) | | +| HashListResponse | [#/components/schemas/HashListResponse](#componentsschemashashlistresponse) | | +| HashlistCreate | [#/components/schemas/HashlistCreate](#componentsschemashashlistcreate) | | +| HashlistPatch | [#/components/schemas/HashlistPatch](#componentsschemashashlistpatch) | | +| HashlistResponse | [#/components/schemas/HashlistResponse](#componentsschemashashlistresponse) | | +| HashlistSingleResponse | [#/components/schemas/HashlistSingleResponse](#componentsschemashashlistsingleresponse) | | +| HashlistPostPatchResponse | [#/components/schemas/HashlistPostPatchResponse](#componentsschemashashlistpostpatchresponse) | | +| HashlistListResponse | [#/components/schemas/HashlistListResponse](#componentsschemashashlistlistresponse) | | +| HashTypeCreate | [#/components/schemas/HashTypeCreate](#componentsschemashashtypecreate) | | +| HashTypePatch | [#/components/schemas/HashTypePatch](#componentsschemashashtypepatch) | | +| HashTypeResponse | [#/components/schemas/HashTypeResponse](#componentsschemashashtyperesponse) | | +| HashTypeSingleResponse | [#/components/schemas/HashTypeSingleResponse](#componentsschemashashtypesingleresponse) | | +| HashTypePostPatchResponse | [#/components/schemas/HashTypePostPatchResponse](#componentsschemashashtypepostpatchresponse) | | +| HashTypeListResponse | [#/components/schemas/HashTypeListResponse](#componentsschemashashtypelistresponse) | | +| HealthCheckAgentCreate | [#/components/schemas/HealthCheckAgentCreate](#componentsschemashealthcheckagentcreate) | | +| HealthCheckAgentPatch | [#/components/schemas/HealthCheckAgentPatch](#componentsschemashealthcheckagentpatch) | | +| HealthCheckAgentResponse | [#/components/schemas/HealthCheckAgentResponse](#componentsschemashealthcheckagentresponse) | | +| HealthCheckAgentSingleResponse | [#/components/schemas/HealthCheckAgentSingleResponse](#componentsschemashealthcheckagentsingleresponse) | | +| HealthCheckAgentPostPatchResponse | [#/components/schemas/HealthCheckAgentPostPatchResponse](#componentsschemashealthcheckagentpostpatchresponse) | | +| HealthCheckAgentListResponse | [#/components/schemas/HealthCheckAgentListResponse](#componentsschemashealthcheckagentlistresponse) | | +| HealthCheckCreate | [#/components/schemas/HealthCheckCreate](#componentsschemashealthcheckcreate) | | +| HealthCheckPatch | [#/components/schemas/HealthCheckPatch](#componentsschemashealthcheckpatch) | | +| HealthCheckResponse | [#/components/schemas/HealthCheckResponse](#componentsschemashealthcheckresponse) | | +| HealthCheckSingleResponse | [#/components/schemas/HealthCheckSingleResponse](#componentsschemashealthchecksingleresponse) | | +| HealthCheckPostPatchResponse | [#/components/schemas/HealthCheckPostPatchResponse](#componentsschemashealthcheckpostpatchresponse) | | +| HealthCheckListResponse | [#/components/schemas/HealthCheckListResponse](#componentsschemashealthchecklistresponse) | | +| LogEntryCreate | [#/components/schemas/LogEntryCreate](#componentsschemaslogentrycreate) | | +| LogEntryPatch | [#/components/schemas/LogEntryPatch](#componentsschemaslogentrypatch) | | +| LogEntryResponse | [#/components/schemas/LogEntryResponse](#componentsschemaslogentryresponse) | | +| LogEntrySingleResponse | [#/components/schemas/LogEntrySingleResponse](#componentsschemaslogentrysingleresponse) | | +| LogEntryPostPatchResponse | [#/components/schemas/LogEntryPostPatchResponse](#componentsschemaslogentrypostpatchresponse) | | +| LogEntryListResponse | [#/components/schemas/LogEntryListResponse](#componentsschemaslogentrylistresponse) | | +| NotificationSettingCreate | [#/components/schemas/NotificationSettingCreate](#componentsschemasnotificationsettingcreate) | | +| NotificationSettingPatch | [#/components/schemas/NotificationSettingPatch](#componentsschemasnotificationsettingpatch) | | +| NotificationSettingResponse | [#/components/schemas/NotificationSettingResponse](#componentsschemasnotificationsettingresponse) | | +| NotificationSettingSingleResponse | [#/components/schemas/NotificationSettingSingleResponse](#componentsschemasnotificationsettingsingleresponse) | | +| NotificationSettingPostPatchResponse | [#/components/schemas/NotificationSettingPostPatchResponse](#componentsschemasnotificationsettingpostpatchresponse) | | +| NotificationSettingListResponse | [#/components/schemas/NotificationSettingListResponse](#componentsschemasnotificationsettinglistresponse) | | +| PreprocessorCreate | [#/components/schemas/PreprocessorCreate](#componentsschemaspreprocessorcreate) | | +| PreprocessorPatch | [#/components/schemas/PreprocessorPatch](#componentsschemaspreprocessorpatch) | | +| PreprocessorResponse | [#/components/schemas/PreprocessorResponse](#componentsschemaspreprocessorresponse) | | +| PreprocessorSingleResponse | [#/components/schemas/PreprocessorSingleResponse](#componentsschemaspreprocessorsingleresponse) | | +| PreprocessorPostPatchResponse | [#/components/schemas/PreprocessorPostPatchResponse](#componentsschemaspreprocessorpostpatchresponse) | | +| PreprocessorListResponse | [#/components/schemas/PreprocessorListResponse](#componentsschemaspreprocessorlistresponse) | | +| PretaskCreate | [#/components/schemas/PretaskCreate](#componentsschemaspretaskcreate) | | +| PretaskPatch | [#/components/schemas/PretaskPatch](#componentsschemaspretaskpatch) | | +| PretaskResponse | [#/components/schemas/PretaskResponse](#componentsschemaspretaskresponse) | | +| PretaskSingleResponse | [#/components/schemas/PretaskSingleResponse](#componentsschemaspretasksingleresponse) | | +| PretaskPostPatchResponse | [#/components/schemas/PretaskPostPatchResponse](#componentsschemaspretaskpostpatchresponse) | | +| PretaskListResponse | [#/components/schemas/PretaskListResponse](#componentsschemaspretasklistresponse) | | +| SpeedCreate | [#/components/schemas/SpeedCreate](#componentsschemasspeedcreate) | | +| SpeedPatch | [#/components/schemas/SpeedPatch](#componentsschemasspeedpatch) | | +| SpeedResponse | [#/components/schemas/SpeedResponse](#componentsschemasspeedresponse) | | +| SpeedSingleResponse | [#/components/schemas/SpeedSingleResponse](#componentsschemasspeedsingleresponse) | | +| SpeedPostPatchResponse | [#/components/schemas/SpeedPostPatchResponse](#componentsschemasspeedpostpatchresponse) | | +| SpeedListResponse | [#/components/schemas/SpeedListResponse](#componentsschemasspeedlistresponse) | | +| SupertaskCreate | [#/components/schemas/SupertaskCreate](#componentsschemassupertaskcreate) | | +| SupertaskPatch | [#/components/schemas/SupertaskPatch](#componentsschemassupertaskpatch) | | +| SupertaskResponse | [#/components/schemas/SupertaskResponse](#componentsschemassupertaskresponse) | | +| SupertaskSingleResponse | [#/components/schemas/SupertaskSingleResponse](#componentsschemassupertasksingleresponse) | | +| SupertaskPostPatchResponse | [#/components/schemas/SupertaskPostPatchResponse](#componentsschemassupertaskpostpatchresponse) | | +| SupertaskListResponse | [#/components/schemas/SupertaskListResponse](#componentsschemassupertasklistresponse) | | +| TaskCreate | [#/components/schemas/TaskCreate](#componentsschemastaskcreate) | | +| TaskPatch | [#/components/schemas/TaskPatch](#componentsschemastaskpatch) | | +| TaskResponse | [#/components/schemas/TaskResponse](#componentsschemastaskresponse) | | +| TaskSingleResponse | [#/components/schemas/TaskSingleResponse](#componentsschemastasksingleresponse) | | +| TaskPostPatchResponse | [#/components/schemas/TaskPostPatchResponse](#componentsschemastaskpostpatchresponse) | | +| TaskListResponse | [#/components/schemas/TaskListResponse](#componentsschemastasklistresponse) | | +| TaskWrapperCreate | [#/components/schemas/TaskWrapperCreate](#componentsschemastaskwrappercreate) | | +| TaskWrapperPatch | [#/components/schemas/TaskWrapperPatch](#componentsschemastaskwrapperpatch) | | +| TaskWrapperResponse | [#/components/schemas/TaskWrapperResponse](#componentsschemastaskwrapperresponse) | | +| TaskWrapperSingleResponse | [#/components/schemas/TaskWrapperSingleResponse](#componentsschemastaskwrappersingleresponse) | | +| TaskWrapperPostPatchResponse | [#/components/schemas/TaskWrapperPostPatchResponse](#componentsschemastaskwrapperpostpatchresponse) | | +| TaskWrapperListResponse | [#/components/schemas/TaskWrapperListResponse](#componentsschemastaskwrapperlistresponse) | | +| UserCreate | [#/components/schemas/UserCreate](#componentsschemasusercreate) | | +| UserPatch | [#/components/schemas/UserPatch](#componentsschemasuserpatch) | | +| UserResponse | [#/components/schemas/UserResponse](#componentsschemasuserresponse) | | +| UserSingleResponse | [#/components/schemas/UserSingleResponse](#componentsschemasusersingleresponse) | | +| UserPostPatchResponse | [#/components/schemas/UserPostPatchResponse](#componentsschemasuserpostpatchresponse) | | +| UserListResponse | [#/components/schemas/UserListResponse](#componentsschemasuserlistresponse) | | +| RegVoucherCreate | [#/components/schemas/RegVoucherCreate](#componentsschemasregvouchercreate) | | +| RegVoucherPatch | [#/components/schemas/RegVoucherPatch](#componentsschemasregvoucherpatch) | | +| RegVoucherResponse | [#/components/schemas/RegVoucherResponse](#componentsschemasregvoucherresponse) | | +| RegVoucherSingleResponse | [#/components/schemas/RegVoucherSingleResponse](#componentsschemasregvouchersingleresponse) | | +| RegVoucherPostPatchResponse | [#/components/schemas/RegVoucherPostPatchResponse](#componentsschemasregvoucherpostpatchresponse) | | +| RegVoucherListResponse | [#/components/schemas/RegVoucherListResponse](#componentsschemasregvoucherlistresponse) | | +| Token | [#/components/schemas/Token](#componentsschemastoken) | | +| TokenRequest | [#/components/schemas/TokenRequest](#componentsschemastokenrequest) | | +| ObjectRequest | [#/components/schemas/ObjectRequest](#componentsschemasobjectrequest) | | +| ObjectListRequest | [#/components/schemas/ObjectListRequest](#componentsschemasobjectlistrequest) | | +| bearerAuth | [#/components/securitySchemes/bearerAuth](#componentssecurityschemesbearerauth) | JWT Authorization header using the Bearer scheme. | +| basicAuth | [#/components/securitySchemes/basicAuth](#componentssecurityschemesbasicauth) | Basic Authorization header. | + +## Path Details + +*** + +### [GET]/api/v2/ui/accessgroups + +- Description +GET many request to retrieve multiple objects. + +- Security +bearerAuth + +#### Parameters(Query) + +```ts +page[after]?: integer +``` + +```ts +page[before]?: integer +``` + +```ts +page[size]?: integer +``` + +```ts +filter: { +} +``` + +```ts +include?: string +``` + +#### Responses + +- 200 successful operation + +`application/json` + +```ts +{ + jsonapi: { + version?: string //default: 1.1 + ext?: string //default: https://jsonapi.org/profiles/ethanresnick/cursor-pagination + } + links: { + self?: string //default: /api/v2/ui/accessgroups?page[size]=25 + first?: string //default: /api/v2/ui/accessgroups?page[size]=25&page[after]=0 + last?: string //default: /api/v2/ui/accessgroups?page[size]=25&page[before]=500 + next?: string //default: /api/v2/ui/accessgroups?page[size]=25&page[after]=25 + previous?: string //default: /api/v2/ui/accessgroups?page[size]=25&page[before]=25 + } + id?: integer + type?: string //default: AccessGroup + data: { + groupName?: string + } + relationships: { + } + included: { + }[] +}[] +``` + +- 400 Invalid request + +`application/json` + +```ts +{ + title?: string + type?: string + status?: integer +} +``` + +- 401 Authentication failed + +`application/json` + +```ts +{ + title?: string + type?: string + status?: integer +} +``` + +*** + +### [POST]/api/v2/ui/accessgroups + +- Description +POST request to create a new object. The request must contain the resource record as data with the attributes of the new object.To add relationships, a relationships object can be added with the resource records of the relations that are part of this object. + +- Security +bearerAuth + +#### RequestBody + +- application/json + +```ts +{ + data: { + type?: string + attributes: { + groupName?: string + } + } +} +``` + +#### Responses + +- 201 successful operation + +`application/json` + +```ts +{ + jsonapi: { + version?: string //default: 1.1 + ext?: string //default: https://jsonapi.org/profiles/ethanresnick/cursor-pagination + } + id?: integer + type?: string //default: AccessGroup + data: { + groupName?: string + } +} +``` + +- 400 Invalid request + +`application/json` + +```ts +{ + title?: string + type?: string + status?: integer +} +``` + +- 401 Authentication failed + +`application/json` + +```ts +{ + title?: string + type?: string + status?: integer +} +``` + +*** + +### [GET]/api/v2/ui/accessgroups/count + +- Description +GET many request to retrieve multiple objects. + +- Security +bearerAuth + +#### Parameters(Query) + +```ts +page[after]?: integer +``` + +```ts +page[before]?: integer +``` + +```ts +page[size]?: integer +``` + +```ts +filter: { +} +``` + +```ts +include?: string +``` + +#### Responses + +- 200 successful operation + +`application/json` + +```ts +{ + jsonapi: { + version?: string //default: 1.1 + ext?: string //default: https://jsonapi.org/profiles/ethanresnick/cursor-pagination + } + links: { + self?: string //default: /api/v2/ui/accessgroups?page[size]=25 + first?: string //default: /api/v2/ui/accessgroups?page[size]=25&page[after]=0 + last?: string //default: /api/v2/ui/accessgroups?page[size]=25&page[before]=500 + next?: string //default: /api/v2/ui/accessgroups?page[size]=25&page[after]=25 + previous?: string //default: /api/v2/ui/accessgroups?page[size]=25&page[before]=25 + } + id?: integer + type?: string //default: AccessGroup + data: { + groupName?: string + } + relationships: { + } + included: { + }[] +}[] +``` + +- 400 Invalid request + +`application/json` + +```ts +{ + title?: string + type?: string + status?: integer +} +``` + +- 401 Authentication failed + +`application/json` + +```ts +{ + title?: string + type?: string + status?: integer +} +``` + +*** + +### [GET]/api/v2/ui/accessgroups/{id:[0-9]+}/{relation:userMembers} + +- Description +GET request for for a to-one relationship link. Returns the resource record of the object that is part of the specified relation. + +- Security +bearerAuth + +#### Parameters(Query) + +```ts +include?: string +``` + +#### Responses + +- 200 successful operation + +`application/json` + +```ts +{ + jsonapi: { + version?: string //default: 1.1 + ext?: string //default: https://jsonapi.org/profiles/ethanresnick/cursor-pagination + } + links: { + self?: string //default: /api/v2/ui/accessgroups?page[size]=25 + first?: string //default: /api/v2/ui/accessgroups?page[size]=25&page[after]=0 + last?: string //default: /api/v2/ui/accessgroups?page[size]=25&page[before]=500 + next?: string //default: /api/v2/ui/accessgroups?page[size]=25&page[after]=25 + previous?: string //default: /api/v2/ui/accessgroups?page[size]=25&page[before]=25 + } + id?: integer + type?: string //default: AccessGroup + data: { + groupName?: string + } + relationships: { + } + included: { + }[] +} +``` + +- 400 Invalid request + +`application/json` + +```ts +{ + title?: string + type?: string + status?: integer +} +``` + +- 401 Authentication failed + +`application/json` + +```ts +{ + title?: string + type?: string + status?: integer +} +``` + +- 404 Not Found + +`application/json` + +```ts +{ + message?: string + exception: { + type?: string + code?: integer + message?: string + file?: string + line?: integer + } +} +``` + +*** + +### [GET]/api/v2/ui/accessgroups/{id:[0-9]+}/relationships/{relation:userMembers} + +- Description +GET request for for a to-one relationship link. Returns the resource record of the object that is part of the specified relation. + +- Security +bearerAuth + +#### Parameters(Query) + +```ts +include?: string +``` + +#### Responses + +- 200 successful operation + +`application/json` + +```ts +{ + jsonapi: { + version?: string //default: 1.1 + ext?: string //default: https://jsonapi.org/profiles/ethanresnick/cursor-pagination + } + links: { + self?: string //default: /api/v2/ui/accessgroups?page[size]=25 + first?: string //default: /api/v2/ui/accessgroups?page[size]=25&page[after]=0 + last?: string //default: /api/v2/ui/accessgroups?page[size]=25&page[before]=500 + next?: string //default: /api/v2/ui/accessgroups?page[size]=25&page[after]=25 + previous?: string //default: /api/v2/ui/accessgroups?page[size]=25&page[before]=25 + } + id?: integer + type?: string //default: AccessGroup + data: { + groupName?: string + } + relationships: { + } + included: { + }[] +} +``` + +- 400 Invalid request + +`application/json` + +```ts +{ + title?: string + type?: string + status?: integer +} +``` + +- 401 Authentication failed + +`application/json` + +```ts +{ + title?: string + type?: string + status?: integer +} +``` + +- 404 Not Found + +`application/json` + +```ts +{ + message?: string + exception: { + type?: string + code?: integer + message?: string + file?: string + line?: integer + } +} +``` + +*** + +### [PATCH]/api/v2/ui/accessgroups/{id:[0-9]+}/relationships/{relation:userMembers} + +- Security +bearerAuth + +#### RequestBody + +- application/json + +```ts +{ + data: { + type?: string + attributes: { + groupName?: string + } + } +} +``` + +#### Responses + +- 200 successful operation + +`application/json` + +```ts +{ + jsonapi: { + version?: string //default: 1.1 + ext?: string //default: https://jsonapi.org/profiles/ethanresnick/cursor-pagination + } + id?: integer + type?: string //default: AccessGroup + data: { + groupName?: string + } +} +``` + +- 400 Invalid request + +`application/json` + +```ts +{ + title?: string + type?: string + status?: integer +} +``` + +- 401 Authentication failed + +`application/json` + +```ts +{ + title?: string + type?: string + status?: integer +} +``` + +- 404 Not Found + +`application/json` + +```ts +{ + message?: string + exception: { + type?: string + code?: integer + message?: string + file?: string + line?: integer + } +} +``` + +*** + +### [POST]/api/v2/ui/accessgroups/{id:[0-9]+}/relationships/{relation:userMembers} + +- Security +bearerAuth + +#### RequestBody + +- application/json + +#### Responses + +- 204 successfully created + +- 400 Invalid request + +`application/json` + +```ts +{ + title?: string + type?: string + status?: integer +} +``` + +- 401 Authentication failed + +`application/json` + +```ts +{ + title?: string + type?: string + status?: integer +} +``` + +- 404 Not Found + +`application/json` + +```ts +{ + message?: string + exception: { + type?: string + code?: integer + message?: string + file?: string + line?: integer + } +} +``` + +*** + +### [DELETE]/api/v2/ui/accessgroups/{id:[0-9]+}/relationships/{relation:userMembers} + +- Security +bearerAuth + +#### RequestBody + +- application/json + +#### Responses + +- 204 successfully deleted + +- 400 Invalid request + +`application/json` + +```ts +{ + title?: string + type?: string + status?: integer +} +``` + +- 401 Authentication failed + +`application/json` + +```ts +{ + title?: string + type?: string + status?: integer +} +``` + +- 404 Not Found + +`application/json` + +```ts +{ + message?: string + exception: { + type?: string + code?: integer + message?: string + file?: string + line?: integer + } +} +``` + +*** + +### [GET]/api/v2/ui/accessgroups/{id:[0-9]+}/{relation:agentMembers} + +- Description +GET request for for a to-one relationship link. Returns the resource record of the object that is part of the specified relation. + +- Security +bearerAuth + +#### Parameters(Query) + +```ts +include?: string +``` + +#### Responses + +- 200 successful operation + +`application/json` + +```ts +{ + jsonapi: { + version?: string //default: 1.1 + ext?: string //default: https://jsonapi.org/profiles/ethanresnick/cursor-pagination + } + links: { + self?: string //default: /api/v2/ui/accessgroups?page[size]=25 + first?: string //default: /api/v2/ui/accessgroups?page[size]=25&page[after]=0 + last?: string //default: /api/v2/ui/accessgroups?page[size]=25&page[before]=500 + next?: string //default: /api/v2/ui/accessgroups?page[size]=25&page[after]=25 + previous?: string //default: /api/v2/ui/accessgroups?page[size]=25&page[before]=25 + } + id?: integer + type?: string //default: AccessGroup + data: { + groupName?: string + } + relationships: { + } + included: { + }[] +} +``` + +- 400 Invalid request + +`application/json` + +```ts +{ + title?: string + type?: string + status?: integer +} +``` + +- 401 Authentication failed + +`application/json` + +```ts +{ + title?: string + type?: string + status?: integer +} +``` + +- 404 Not Found + +`application/json` + +```ts +{ + message?: string + exception: { + type?: string + code?: integer + message?: string + file?: string + line?: integer + } +} +``` + +*** + +### [GET]/api/v2/ui/accessgroups/{id:[0-9]+}/relationships/{relation:agentMembers} + +- Description +GET request for for a to-one relationship link. Returns the resource record of the object that is part of the specified relation. + +- Security +bearerAuth + +#### Parameters(Query) + +```ts +include?: string +``` + +#### Responses + +- 200 successful operation + +`application/json` + +```ts +{ + jsonapi: { + version?: string //default: 1.1 + ext?: string //default: https://jsonapi.org/profiles/ethanresnick/cursor-pagination + } + links: { + self?: string //default: /api/v2/ui/accessgroups?page[size]=25 + first?: string //default: /api/v2/ui/accessgroups?page[size]=25&page[after]=0 + last?: string //default: /api/v2/ui/accessgroups?page[size]=25&page[before]=500 + next?: string //default: /api/v2/ui/accessgroups?page[size]=25&page[after]=25 + previous?: string //default: /api/v2/ui/accessgroups?page[size]=25&page[before]=25 + } + id?: integer + type?: string //default: AccessGroup + data: { + groupName?: string + } + relationships: { + } + included: { + }[] +} +``` + +- 400 Invalid request + +`application/json` + +```ts +{ + title?: string + type?: string + status?: integer +} +``` + +- 401 Authentication failed + +`application/json` + +```ts +{ + title?: string + type?: string + status?: integer +} +``` + +- 404 Not Found + +`application/json` + +```ts +{ + message?: string + exception: { + type?: string + code?: integer + message?: string + file?: string + line?: integer + } +} +``` + +*** + +### [PATCH]/api/v2/ui/accessgroups/{id:[0-9]+}/relationships/{relation:agentMembers} + +- Security +bearerAuth + +#### RequestBody + +- application/json + +```ts +{ + data: { + type?: string + attributes: { + groupName?: string + } + } +} +``` + +#### Responses + +- 200 successful operation + +`application/json` + +```ts +{ + jsonapi: { + version?: string //default: 1.1 + ext?: string //default: https://jsonapi.org/profiles/ethanresnick/cursor-pagination + } + id?: integer + type?: string //default: AccessGroup + data: { + groupName?: string + } +} +``` + +- 400 Invalid request + +`application/json` + +```ts +{ + title?: string + type?: string + status?: integer +} +``` + +- 401 Authentication failed + +`application/json` + +```ts +{ + title?: string + type?: string + status?: integer +} +``` + +- 404 Not Found + +`application/json` + +```ts +{ + message?: string + exception: { + type?: string + code?: integer + message?: string + file?: string + line?: integer + } +} +``` + +*** + +### [POST]/api/v2/ui/accessgroups/{id:[0-9]+}/relationships/{relation:agentMembers} + +- Security +bearerAuth + +#### RequestBody + +- application/json + +#### Responses + +- 204 successfully created + +- 400 Invalid request + +`application/json` + +```ts +{ + title?: string + type?: string + status?: integer +} +``` + +- 401 Authentication failed + +`application/json` + +```ts +{ + title?: string + type?: string + status?: integer +} +``` + +- 404 Not Found + +`application/json` + +```ts +{ + message?: string + exception: { + type?: string + code?: integer + message?: string + file?: string + line?: integer + } +} +``` + +*** + +### [DELETE]/api/v2/ui/accessgroups/{id:[0-9]+}/relationships/{relation:agentMembers} + +- Security +bearerAuth + +#### RequestBody + +- application/json + +#### Responses + +- 204 successfully deleted + +- 400 Invalid request + +`application/json` + +```ts +{ + title?: string + type?: string + status?: integer +} +``` + +- 401 Authentication failed + +`application/json` + +```ts +{ + title?: string + type?: string + status?: integer +} +``` + +- 404 Not Found + +`application/json` + +```ts +{ + message?: string + exception: { + type?: string + code?: integer + message?: string + file?: string + line?: integer + } +} +``` + +*** + +### [GET]/api/v2/ui/accessgroups/{id:[0-9]+} + +- Description +GET request to retrieve a single object. + +- Security +bearerAuth + +#### Parameters(Query) + +```ts +include?: string +``` + +#### Responses + +- 200 successful operation + +`application/json` + +```ts +{ + jsonapi: { + version?: string //default: 1.1 + ext?: string //default: https://jsonapi.org/profiles/ethanresnick/cursor-pagination + } + links: { + self?: string //default: /api/v2/ui/accessgroups?page[size]=25 + first?: string //default: /api/v2/ui/accessgroups?page[size]=25&page[after]=0 + last?: string //default: /api/v2/ui/accessgroups?page[size]=25&page[before]=500 + next?: string //default: /api/v2/ui/accessgroups?page[size]=25&page[after]=25 + previous?: string //default: /api/v2/ui/accessgroups?page[size]=25&page[before]=25 + } + id?: integer + type?: string //default: AccessGroup + data: { + groupName?: string + } + relationships: { + } + included: { + }[] +} +``` + +- 400 Invalid request + +`application/json` + +```ts +{ + title?: string + type?: string + status?: integer +} +``` + +- 401 Authentication failed + +`application/json` + +```ts +{ + title?: string + type?: string + status?: integer +} +``` + +- 404 Not Found + +`application/json` + +```ts +{ + message?: string + exception: { + type?: string + code?: integer + message?: string + file?: string + line?: integer + } +} +``` + +*** + +### [PATCH]/api/v2/ui/accessgroups/{id:[0-9]+} + +- Description +PATCH request to update attributes of a single object. + +- Security +bearerAuth + +#### RequestBody + +- application/json + +```ts +{ + data: { + type?: string + attributes: { + groupName?: string + } + } +} +``` + +#### Responses + +- 200 successful operation + +`application/json` + +```ts +{ + jsonapi: { + version?: string //default: 1.1 + ext?: string //default: https://jsonapi.org/profiles/ethanresnick/cursor-pagination + } + id?: integer + type?: string //default: AccessGroup + data: { + groupName?: string + } +} +``` + +- 400 Invalid request + +`application/json` + +```ts +{ + title?: string + type?: string + status?: integer +} +``` + +- 401 Authentication failed + +`application/json` + +```ts +{ + title?: string + type?: string + status?: integer +} +``` + +- 404 Not Found + +`application/json` + +```ts +{ + message?: string + exception: { + type?: string + code?: integer + message?: string + file?: string + line?: integer + } +} +``` + +*** + +### [DELETE]/api/v2/ui/accessgroups/{id:[0-9]+} + +- Security +bearerAuth + +#### RequestBody + +- application/json + +#### Responses + +- 204 successfully deleted + +- 400 Invalid request + +`application/json` + +```ts +{ + title?: string + type?: string + status?: integer +} +``` + +- 401 Authentication failed + +`application/json` + +```ts +{ + title?: string + type?: string + status?: integer +} +``` + +- 404 Not Found + +`application/json` + +```ts +{ + message?: string + exception: { + type?: string + code?: integer + message?: string + file?: string + line?: integer + } +} +``` + +*** + +### [GET]/api/v2/ui/agentassignments + +- Description +GET many request to retrieve multiple objects. + +- Security +bearerAuth + +#### Parameters(Query) + +```ts +page[after]?: integer +``` + +```ts +page[before]?: integer +``` + +```ts +page[size]?: integer +``` + +```ts +filter: { +} +``` + +```ts +include?: string +``` + +#### Responses + +- 200 successful operation + +`application/json` + +```ts +{ + jsonapi: { + version?: string //default: 1.1 + ext?: string //default: https://jsonapi.org/profiles/ethanresnick/cursor-pagination + } + links: { + self?: string //default: /api/v2/ui/agentassignments?page[size]=25 + first?: string //default: /api/v2/ui/agentassignments?page[size]=25&page[after]=0 + last?: string //default: /api/v2/ui/agentassignments?page[size]=25&page[before]=500 + next?: string //default: /api/v2/ui/agentassignments?page[size]=25&page[after]=25 + previous?: string //default: /api/v2/ui/agentassignments?page[size]=25&page[before]=25 + } + id?: integer + type?: string //default: Assignment + data: { + taskId?: integer + agentId?: integer + benchmark?: string + } + relationships: { + } + included: { + }[] +}[] +``` + +- 400 Invalid request + +`application/json` + +```ts +{ + title?: string + type?: string + status?: integer +} +``` + +- 401 Authentication failed + +`application/json` + +```ts +{ + title?: string + type?: string + status?: integer +} +``` + +*** + +### [POST]/api/v2/ui/agentassignments + +- Description +POST request to create a new object. The request must contain the resource record as data with the attributes of the new object.To add relationships, a relationships object can be added with the resource records of the relations that are part of this object. + +- Security +bearerAuth + +#### RequestBody + +- application/json + +```ts +{ + data: { + type?: string + attributes: { + taskId?: integer + agentId?: integer + benchmark?: string + } + } +} +``` + +#### Responses + +- 201 successful operation + +`application/json` + +```ts +{ + jsonapi: { + version?: string //default: 1.1 + ext?: string //default: https://jsonapi.org/profiles/ethanresnick/cursor-pagination + } + id?: integer + type?: string //default: Assignment + data: { + taskId?: integer + agentId?: integer + benchmark?: string + } +} +``` + +- 400 Invalid request + +`application/json` + +```ts +{ + title?: string + type?: string + status?: integer +} +``` + +- 401 Authentication failed + +`application/json` + +```ts +{ + title?: string + type?: string + status?: integer +} +``` + +*** + +### [GET]/api/v2/ui/agentassignments/count + +- Description +GET many request to retrieve multiple objects. + +- Security +bearerAuth + +#### Parameters(Query) + +```ts +page[after]?: integer +``` + +```ts +page[before]?: integer +``` + +```ts +page[size]?: integer +``` + +```ts +filter: { +} +``` + +```ts +include?: string +``` + +#### Responses + +- 200 successful operation + +`application/json` + +```ts +{ + jsonapi: { + version?: string //default: 1.1 + ext?: string //default: https://jsonapi.org/profiles/ethanresnick/cursor-pagination + } + links: { + self?: string //default: /api/v2/ui/agentassignments?page[size]=25 + first?: string //default: /api/v2/ui/agentassignments?page[size]=25&page[after]=0 + last?: string //default: /api/v2/ui/agentassignments?page[size]=25&page[before]=500 + next?: string //default: /api/v2/ui/agentassignments?page[size]=25&page[after]=25 + previous?: string //default: /api/v2/ui/agentassignments?page[size]=25&page[before]=25 + } + id?: integer + type?: string //default: Assignment + data: { + taskId?: integer + agentId?: integer + benchmark?: string + } + relationships: { + } + included: { + }[] +}[] +``` + +- 400 Invalid request + +`application/json` + +```ts +{ + title?: string + type?: string + status?: integer +} +``` + +- 401 Authentication failed + +`application/json` + +```ts +{ + title?: string + type?: string + status?: integer +} +``` + +*** + +### [GET]/api/v2/ui/agentassignments/{id:[0-9]+}/{relation:agent} + +- Description +GET request for for a to-one relationship link. Returns the resource record of the object that is part of the specified relation. + +- Security +bearerAuth + +#### Parameters(Query) + +```ts +include?: string +``` + +#### Responses + +- 200 successful operation + +`application/json` + +```ts +{ + jsonapi: { + version?: string //default: 1.1 + ext?: string //default: https://jsonapi.org/profiles/ethanresnick/cursor-pagination + } + links: { + self?: string //default: /api/v2/ui/agentassignments?page[size]=25 + first?: string //default: /api/v2/ui/agentassignments?page[size]=25&page[after]=0 + last?: string //default: /api/v2/ui/agentassignments?page[size]=25&page[before]=500 + next?: string //default: /api/v2/ui/agentassignments?page[size]=25&page[after]=25 + previous?: string //default: /api/v2/ui/agentassignments?page[size]=25&page[before]=25 + } + id?: integer + type?: string //default: Assignment + data: { + taskId?: integer + agentId?: integer + benchmark?: string + } + relationships: { + } + included: { + }[] +} +``` + +- 400 Invalid request + +`application/json` + +```ts +{ + title?: string + type?: string + status?: integer +} +``` + +- 401 Authentication failed + +`application/json` + +```ts +{ + title?: string + type?: string + status?: integer +} +``` + +- 404 Not Found + +`application/json` + +```ts +{ + message?: string + exception: { + type?: string + code?: integer + message?: string + file?: string + line?: integer + } +} +``` + +*** + +### [GET]/api/v2/ui/agentassignments/{id:[0-9]+}/relationships/{relation:agent} + +- Description +GET request for for a to-one relationship link. Returns the resource record of the object that is part of the specified relation. + +- Security +bearerAuth + +#### Parameters(Query) + +```ts +include?: string +``` + +#### Responses + +- 200 successful operation + +`application/json` + +```ts +{ + jsonapi: { + version?: string //default: 1.1 + ext?: string //default: https://jsonapi.org/profiles/ethanresnick/cursor-pagination + } + links: { + self?: string //default: /api/v2/ui/agentassignments?page[size]=25 + first?: string //default: /api/v2/ui/agentassignments?page[size]=25&page[after]=0 + last?: string //default: /api/v2/ui/agentassignments?page[size]=25&page[before]=500 + next?: string //default: /api/v2/ui/agentassignments?page[size]=25&page[after]=25 + previous?: string //default: /api/v2/ui/agentassignments?page[size]=25&page[before]=25 + } + id?: integer + type?: string //default: Assignment + data: { + taskId?: integer + agentId?: integer + benchmark?: string + } + relationships: { + } + included: { + }[] +} +``` + +- 400 Invalid request + +`application/json` + +```ts +{ + title?: string + type?: string + status?: integer +} +``` + +- 401 Authentication failed + +`application/json` + +```ts +{ + title?: string + type?: string + status?: integer +} +``` + +- 404 Not Found + +`application/json` + +```ts +{ + message?: string + exception: { + type?: string + code?: integer + message?: string + file?: string + line?: integer + } +} +``` + +*** + +### [PATCH]/api/v2/ui/agentassignments/{id:[0-9]+}/relationships/{relation:agent} + +- Security +bearerAuth + +#### RequestBody + +- application/json + +```ts +{ + data: { + type?: string + attributes: { + agentId?: integer + taskId?: integer + } + } +} +``` + +#### Responses + +- 200 successful operation + +`application/json` + +```ts +{ + jsonapi: { + version?: string //default: 1.1 + ext?: string //default: https://jsonapi.org/profiles/ethanresnick/cursor-pagination + } + id?: integer + type?: string //default: Assignment + data: { + taskId?: integer + agentId?: integer + benchmark?: string + } +} +``` + +- 400 Invalid request + +`application/json` + +```ts +{ + title?: string + type?: string + status?: integer +} +``` + +- 401 Authentication failed + +`application/json` + +```ts +{ + title?: string + type?: string + status?: integer +} +``` + +- 404 Not Found + +`application/json` + +```ts +{ + message?: string + exception: { + type?: string + code?: integer + message?: string + file?: string + line?: integer + } +} +``` + +*** + +### [GET]/api/v2/ui/agentassignments/{id:[0-9]+}/{relation:task} + +- Description +GET request for for a to-one relationship link. Returns the resource record of the object that is part of the specified relation. + +- Security +bearerAuth + +#### Parameters(Query) + +```ts +include?: string +``` + +#### Responses + +- 200 successful operation + +`application/json` + +```ts +{ + jsonapi: { + version?: string //default: 1.1 + ext?: string //default: https://jsonapi.org/profiles/ethanresnick/cursor-pagination + } + links: { + self?: string //default: /api/v2/ui/agentassignments?page[size]=25 + first?: string //default: /api/v2/ui/agentassignments?page[size]=25&page[after]=0 + last?: string //default: /api/v2/ui/agentassignments?page[size]=25&page[before]=500 + next?: string //default: /api/v2/ui/agentassignments?page[size]=25&page[after]=25 + previous?: string //default: /api/v2/ui/agentassignments?page[size]=25&page[before]=25 + } + id?: integer + type?: string //default: Assignment + data: { + taskId?: integer + agentId?: integer + benchmark?: string + } + relationships: { + } + included: { + }[] +} +``` + +- 400 Invalid request + +`application/json` + +```ts +{ + title?: string + type?: string + status?: integer +} +``` + +- 401 Authentication failed + +`application/json` + +```ts +{ + title?: string + type?: string + status?: integer +} +``` + +- 404 Not Found + +`application/json` + +```ts +{ + message?: string + exception: { + type?: string + code?: integer + message?: string + file?: string + line?: integer + } +} +``` + +*** + +### [GET]/api/v2/ui/agentassignments/{id:[0-9]+}/relationships/{relation:task} + +- Description +GET request for for a to-one relationship link. Returns the resource record of the object that is part of the specified relation. + +- Security +bearerAuth + +#### Parameters(Query) + +```ts +include?: string +``` + +#### Responses + +- 200 successful operation + +`application/json` + +```ts +{ + jsonapi: { + version?: string //default: 1.1 + ext?: string //default: https://jsonapi.org/profiles/ethanresnick/cursor-pagination + } + links: { + self?: string //default: /api/v2/ui/agentassignments?page[size]=25 + first?: string //default: /api/v2/ui/agentassignments?page[size]=25&page[after]=0 + last?: string //default: /api/v2/ui/agentassignments?page[size]=25&page[before]=500 + next?: string //default: /api/v2/ui/agentassignments?page[size]=25&page[after]=25 + previous?: string //default: /api/v2/ui/agentassignments?page[size]=25&page[before]=25 + } + id?: integer + type?: string //default: Assignment + data: { + taskId?: integer + agentId?: integer + benchmark?: string + } + relationships: { + } + included: { + }[] +} +``` + +- 400 Invalid request + +`application/json` + +```ts +{ + title?: string + type?: string + status?: integer +} +``` + +- 401 Authentication failed + +`application/json` + +```ts +{ + title?: string + type?: string + status?: integer +} +``` + +- 404 Not Found + +`application/json` + +```ts +{ + message?: string + exception: { + type?: string + code?: integer + message?: string + file?: string + line?: integer + } +} +``` + +*** + +### [PATCH]/api/v2/ui/agentassignments/{id:[0-9]+}/relationships/{relation:task} + +- Security +bearerAuth + +#### RequestBody + +- application/json + +```ts +{ + data: { + type?: string + attributes: { + agentId?: integer + taskId?: integer + } + } +} +``` + +#### Responses + +- 200 successful operation + +`application/json` + +```ts +{ + jsonapi: { + version?: string //default: 1.1 + ext?: string //default: https://jsonapi.org/profiles/ethanresnick/cursor-pagination + } + id?: integer + type?: string //default: Assignment + data: { + taskId?: integer + agentId?: integer + benchmark?: string + } +} +``` + +- 400 Invalid request + +`application/json` + +```ts +{ + title?: string + type?: string + status?: integer +} +``` + +- 401 Authentication failed + +`application/json` + +```ts +{ + title?: string + type?: string + status?: integer +} +``` + +- 404 Not Found + +`application/json` + +```ts +{ + message?: string + exception: { + type?: string + code?: integer + message?: string + file?: string + line?: integer + } +} +``` + +*** + +### [GET]/api/v2/ui/agentassignments/{id:[0-9]+} + +- Description +GET request to retrieve a single object. + +- Security +bearerAuth + +#### Parameters(Query) + +```ts +include?: string +``` + +#### Responses + +- 200 successful operation + +`application/json` + +```ts +{ + jsonapi: { + version?: string //default: 1.1 + ext?: string //default: https://jsonapi.org/profiles/ethanresnick/cursor-pagination + } + links: { + self?: string //default: /api/v2/ui/agentassignments?page[size]=25 + first?: string //default: /api/v2/ui/agentassignments?page[size]=25&page[after]=0 + last?: string //default: /api/v2/ui/agentassignments?page[size]=25&page[before]=500 + next?: string //default: /api/v2/ui/agentassignments?page[size]=25&page[after]=25 + previous?: string //default: /api/v2/ui/agentassignments?page[size]=25&page[before]=25 + } + id?: integer + type?: string //default: Assignment + data: { + taskId?: integer + agentId?: integer + benchmark?: string + } + relationships: { + } + included: { + }[] +} +``` + +- 400 Invalid request + +`application/json` + +```ts +{ + title?: string + type?: string + status?: integer +} +``` + +- 401 Authentication failed + +`application/json` + +```ts +{ + title?: string + type?: string + status?: integer +} +``` + +- 404 Not Found + +`application/json` + +```ts +{ + message?: string + exception: { + type?: string + code?: integer + message?: string + file?: string + line?: integer + } +} +``` + +*** + +### [DELETE]/api/v2/ui/agentassignments/{id:[0-9]+} + +- Security +bearerAuth + +#### RequestBody + +- application/json + +#### Responses + +- 204 successfully deleted + +- 400 Invalid request + +`application/json` + +```ts +{ + title?: string + type?: string + status?: integer +} +``` + +- 401 Authentication failed + +`application/json` + +```ts +{ + title?: string + type?: string + status?: integer +} +``` + +- 404 Not Found + +`application/json` + +```ts +{ + message?: string + exception: { + type?: string + code?: integer + message?: string + file?: string + line?: integer + } +} +``` + +*** + +### [GET]/api/v2/ui/agentbinaries + +- Description +GET many request to retrieve multiple objects. + +- Security +bearerAuth + +#### Parameters(Query) + +```ts +page[after]?: integer +``` + +```ts +page[before]?: integer +``` + +```ts +page[size]?: integer +``` + +```ts +filter: { +} +``` + +```ts +include?: string +``` + +#### Responses + +- 200 successful operation + +`application/json` + +```ts +{ + jsonapi: { + version?: string //default: 1.1 + ext?: string //default: https://jsonapi.org/profiles/ethanresnick/cursor-pagination + } + links: { + self?: string //default: /api/v2/ui/agentbinaries?page[size]=25 + first?: string //default: /api/v2/ui/agentbinaries?page[size]=25&page[after]=0 + last?: string //default: /api/v2/ui/agentbinaries?page[size]=25&page[before]=500 + next?: string //default: /api/v2/ui/agentbinaries?page[size]=25&page[after]=25 + previous?: string //default: /api/v2/ui/agentbinaries?page[size]=25&page[before]=25 + } + id?: integer + type?: string //default: AgentBinary + data: { + type?: string + version?: string + operatingSystems?: string + filename?: string + updateTrack?: string + updateAvailable?: string + } + relationships: { + } + included: { + }[] +}[] +``` + +- 400 Invalid request + +`application/json` + +```ts +{ + title?: string + type?: string + status?: integer +} +``` + +- 401 Authentication failed + +`application/json` + +```ts +{ + title?: string + type?: string + status?: integer +} +``` + +*** + +### [POST]/api/v2/ui/agentbinaries + +- Description +POST request to create a new object. The request must contain the resource record as data with the attributes of the new object.To add relationships, a relationships object can be added with the resource records of the relations that are part of this object. + +- Security +bearerAuth + +#### RequestBody + +- application/json + +```ts +{ + data: { + type?: string + attributes: { + type?: string + version?: string + operatingSystems?: string + filename?: string + updateTrack?: string + updateAvailable?: string + } + } +} +``` + +#### Responses + +- 201 successful operation + +`application/json` + +```ts +{ + jsonapi: { + version?: string //default: 1.1 + ext?: string //default: https://jsonapi.org/profiles/ethanresnick/cursor-pagination + } + id?: integer + type?: string //default: AgentBinary + data: { + type?: string + version?: string + operatingSystems?: string + filename?: string + updateTrack?: string + updateAvailable?: string + } +} +``` + +- 400 Invalid request + +`application/json` + +```ts +{ + title?: string + type?: string + status?: integer +} +``` + +- 401 Authentication failed + +`application/json` + +```ts +{ + title?: string + type?: string + status?: integer +} +``` + +*** + +### [GET]/api/v2/ui/agentbinaries/count + +- Description +GET many request to retrieve multiple objects. + +- Security +bearerAuth + +#### Parameters(Query) + +```ts +page[after]?: integer +``` + +```ts +page[before]?: integer +``` + +```ts +page[size]?: integer +``` + +```ts +filter: { +} +``` + +```ts +include?: string +``` + +#### Responses + +- 200 successful operation + +`application/json` + +```ts +{ + jsonapi: { + version?: string //default: 1.1 + ext?: string //default: https://jsonapi.org/profiles/ethanresnick/cursor-pagination + } + links: { + self?: string //default: /api/v2/ui/agentbinaries?page[size]=25 + first?: string //default: /api/v2/ui/agentbinaries?page[size]=25&page[after]=0 + last?: string //default: /api/v2/ui/agentbinaries?page[size]=25&page[before]=500 + next?: string //default: /api/v2/ui/agentbinaries?page[size]=25&page[after]=25 + previous?: string //default: /api/v2/ui/agentbinaries?page[size]=25&page[before]=25 + } + id?: integer + type?: string //default: AgentBinary + data: { + type?: string + version?: string + operatingSystems?: string + filename?: string + updateTrack?: string + updateAvailable?: string + } + relationships: { + } + included: { + }[] +}[] +``` + +- 400 Invalid request + +`application/json` + +```ts +{ + title?: string + type?: string + status?: integer +} +``` + +- 401 Authentication failed + +`application/json` + +```ts +{ + title?: string + type?: string + status?: integer +} +``` + +*** + +### [GET]/api/v2/ui/agentbinaries/{id:[0-9]+} + +- Description +GET request to retrieve a single object. + +- Security +bearerAuth + +#### Parameters(Query) + +```ts +include?: string +``` + +#### Responses + +- 200 successful operation + +`application/json` + +```ts +{ + jsonapi: { + version?: string //default: 1.1 + ext?: string //default: https://jsonapi.org/profiles/ethanresnick/cursor-pagination + } + links: { + self?: string //default: /api/v2/ui/agentbinaries?page[size]=25 + first?: string //default: /api/v2/ui/agentbinaries?page[size]=25&page[after]=0 + last?: string //default: /api/v2/ui/agentbinaries?page[size]=25&page[before]=500 + next?: string //default: /api/v2/ui/agentbinaries?page[size]=25&page[after]=25 + previous?: string //default: /api/v2/ui/agentbinaries?page[size]=25&page[before]=25 + } + id?: integer + type?: string //default: AgentBinary + data: { + type?: string + version?: string + operatingSystems?: string + filename?: string + updateTrack?: string + updateAvailable?: string + } + relationships: { + } + included: { + }[] +} +``` + +- 400 Invalid request + +`application/json` + +```ts +{ + title?: string + type?: string + status?: integer +} +``` + +- 401 Authentication failed + +`application/json` + +```ts +{ + title?: string + type?: string + status?: integer +} +``` + +- 404 Not Found + +`application/json` + +```ts +{ + message?: string + exception: { + type?: string + code?: integer + message?: string + file?: string + line?: integer + } +} +``` + +*** + +### [PATCH]/api/v2/ui/agentbinaries/{id:[0-9]+} + +- Description +PATCH request to update attributes of a single object. + +- Security +bearerAuth + +#### RequestBody + +- application/json + +```ts +{ + data: { + type?: string + attributes: { + filename?: string + operatingSystems?: string + type?: string + updateTrack?: string + version?: string + } + } +} +``` + +#### Responses + +- 200 successful operation + +`application/json` + +```ts +{ + jsonapi: { + version?: string //default: 1.1 + ext?: string //default: https://jsonapi.org/profiles/ethanresnick/cursor-pagination + } + id?: integer + type?: string //default: AgentBinary + data: { + type?: string + version?: string + operatingSystems?: string + filename?: string + updateTrack?: string + updateAvailable?: string + } +} +``` + +- 400 Invalid request + +`application/json` + +```ts +{ + title?: string + type?: string + status?: integer +} +``` + +- 401 Authentication failed + +`application/json` + +```ts +{ + title?: string + type?: string + status?: integer +} +``` + +- 404 Not Found + +`application/json` + +```ts +{ + message?: string + exception: { + type?: string + code?: integer + message?: string + file?: string + line?: integer + } +} +``` + +*** + +### [DELETE]/api/v2/ui/agentbinaries/{id:[0-9]+} + +- Security +bearerAuth + +#### RequestBody + +- application/json + +#### Responses + +- 204 successfully deleted + +- 400 Invalid request + +`application/json` + +```ts +{ + title?: string + type?: string + status?: integer +} +``` + +- 401 Authentication failed + +`application/json` + +```ts +{ + title?: string + type?: string + status?: integer +} +``` + +- 404 Not Found + +`application/json` + +```ts +{ + message?: string + exception: { + type?: string + code?: integer + message?: string + file?: string + line?: integer + } +} +``` + +*** + +### [GET]/api/v2/ui/agents + +- Description +GET many request to retrieve multiple objects. + +- Security +bearerAuth + +#### Parameters(Query) + +```ts +page[after]?: integer +``` + +```ts +page[before]?: integer +``` + +```ts +page[size]?: integer +``` + +```ts +filter: { +} +``` + +```ts +include?: string +``` + +#### Responses + +- 200 successful operation + +`application/json` + +```ts +{ + jsonapi: { + version?: string //default: 1.1 + ext?: string //default: https://jsonapi.org/profiles/ethanresnick/cursor-pagination + } + links: { + self?: string //default: /api/v2/ui/agents?page[size]=25 + first?: string //default: /api/v2/ui/agents?page[size]=25&page[after]=0 + last?: string //default: /api/v2/ui/agents?page[size]=25&page[before]=500 + next?: string //default: /api/v2/ui/agents?page[size]=25&page[after]=25 + previous?: string //default: /api/v2/ui/agents?page[size]=25&page[before]=25 + } + id?: integer + type?: string //default: Agent + data: { + agentName?: string + uid?: string + os?: integer + devices?: string + cmdPars?: string + ignoreErrors?: enum[0, 1, 2] + isActive?: boolean + isTrusted?: boolean + token?: string + lastAct?: string + lastTime?: integer + lastIp?: string + userId?: integer + cpuOnly?: boolean + clientSignature?: string + } + relationships: { + } + included: { + }[] +}[] +``` + +- 400 Invalid request + +`application/json` + +```ts +{ + title?: string + type?: string + status?: integer +} +``` + +- 401 Authentication failed + +`application/json` + +```ts +{ + title?: string + type?: string + status?: integer +} +``` + +*** + +### [GET]/api/v2/ui/agents/count + +- Description +GET many request to retrieve multiple objects. + +- Security +bearerAuth + +#### Parameters(Query) + +```ts +page[after]?: integer +``` + +```ts +page[before]?: integer +``` + +```ts +page[size]?: integer +``` + +```ts +filter: { +} +``` + +```ts +include?: string +``` + +#### Responses + +- 200 successful operation + +`application/json` + +```ts +{ + jsonapi: { + version?: string //default: 1.1 + ext?: string //default: https://jsonapi.org/profiles/ethanresnick/cursor-pagination + } + links: { + self?: string //default: /api/v2/ui/agents?page[size]=25 + first?: string //default: /api/v2/ui/agents?page[size]=25&page[after]=0 + last?: string //default: /api/v2/ui/agents?page[size]=25&page[before]=500 + next?: string //default: /api/v2/ui/agents?page[size]=25&page[after]=25 + previous?: string //default: /api/v2/ui/agents?page[size]=25&page[before]=25 + } + id?: integer + type?: string //default: Agent + data: { + agentName?: string + uid?: string + os?: integer + devices?: string + cmdPars?: string + ignoreErrors?: enum[0, 1, 2] + isActive?: boolean + isTrusted?: boolean + token?: string + lastAct?: string + lastTime?: integer + lastIp?: string + userId?: integer + cpuOnly?: boolean + clientSignature?: string + } + relationships: { + } + included: { + }[] +}[] +``` + +- 400 Invalid request + +`application/json` + +```ts +{ + title?: string + type?: string + status?: integer +} +``` + +- 401 Authentication failed + +`application/json` + +```ts +{ + title?: string + type?: string + status?: integer +} +``` + +*** + +### [GET]/api/v2/ui/agents/{id:[0-9]+}/{relation:accessGroups} + +- Description +GET request for for a to-one relationship link. Returns the resource record of the object that is part of the specified relation. + +- Security +bearerAuth + +#### Parameters(Query) + +```ts +include?: string +``` + +#### Responses + +- 200 successful operation + +`application/json` + +```ts +{ + jsonapi: { + version?: string //default: 1.1 + ext?: string //default: https://jsonapi.org/profiles/ethanresnick/cursor-pagination + } + links: { + self?: string //default: /api/v2/ui/agents?page[size]=25 + first?: string //default: /api/v2/ui/agents?page[size]=25&page[after]=0 + last?: string //default: /api/v2/ui/agents?page[size]=25&page[before]=500 + next?: string //default: /api/v2/ui/agents?page[size]=25&page[after]=25 + previous?: string //default: /api/v2/ui/agents?page[size]=25&page[before]=25 + } + id?: integer + type?: string //default: Agent + data: { + agentName?: string + uid?: string + os?: integer + devices?: string + cmdPars?: string + ignoreErrors?: enum[0, 1, 2] + isActive?: boolean + isTrusted?: boolean + token?: string + lastAct?: string + lastTime?: integer + lastIp?: string + userId?: integer + cpuOnly?: boolean + clientSignature?: string + } + relationships: { + } + included: { + }[] +} +``` + +- 400 Invalid request + +`application/json` + +```ts +{ + title?: string + type?: string + status?: integer +} +``` + +- 401 Authentication failed + +`application/json` + +```ts +{ + title?: string + type?: string + status?: integer +} +``` + +- 404 Not Found + +`application/json` + +```ts +{ + message?: string + exception: { + type?: string + code?: integer + message?: string + file?: string + line?: integer + } +} +``` + +*** + +### [GET]/api/v2/ui/agents/{id:[0-9]+}/relationships/{relation:accessGroups} + +- Description +GET request for for a to-one relationship link. Returns the resource record of the object that is part of the specified relation. + +- Security +bearerAuth + +#### Parameters(Query) + +```ts +include?: string +``` + +#### Responses + +- 200 successful operation + +`application/json` + +```ts +{ + jsonapi: { + version?: string //default: 1.1 + ext?: string //default: https://jsonapi.org/profiles/ethanresnick/cursor-pagination + } + links: { + self?: string //default: /api/v2/ui/agents?page[size]=25 + first?: string //default: /api/v2/ui/agents?page[size]=25&page[after]=0 + last?: string //default: /api/v2/ui/agents?page[size]=25&page[before]=500 + next?: string //default: /api/v2/ui/agents?page[size]=25&page[after]=25 + previous?: string //default: /api/v2/ui/agents?page[size]=25&page[before]=25 + } + id?: integer + type?: string //default: Agent + data: { + agentName?: string + uid?: string + os?: integer + devices?: string + cmdPars?: string + ignoreErrors?: enum[0, 1, 2] + isActive?: boolean + isTrusted?: boolean + token?: string + lastAct?: string + lastTime?: integer + lastIp?: string + userId?: integer + cpuOnly?: boolean + clientSignature?: string + } + relationships: { + } + included: { + }[] +} +``` + +- 400 Invalid request + +`application/json` + +```ts +{ + title?: string + type?: string + status?: integer +} +``` + +- 401 Authentication failed + +`application/json` + +```ts +{ + title?: string + type?: string + status?: integer +} +``` + +- 404 Not Found + +`application/json` + +```ts +{ + message?: string + exception: { + type?: string + code?: integer + message?: string + file?: string + line?: integer + } +} +``` + +*** + +### [PATCH]/api/v2/ui/agents/{id:[0-9]+}/relationships/{relation:accessGroups} + +- Security +bearerAuth + +#### RequestBody + +- application/json + +```ts +{ + data: { + type?: string + attributes: { + agentName?: string + clientSignature?: string + cmdPars?: string + cpuOnly?: boolean + devices?: string + ignoreErrors?: enum[0, 1, 2] + isActive?: boolean + isTrusted?: boolean + os?: integer + token?: string + uid?: string + userId?: integer + } + } +} +``` + +#### Responses + +- 200 successful operation + +`application/json` + +```ts +{ + jsonapi: { + version?: string //default: 1.1 + ext?: string //default: https://jsonapi.org/profiles/ethanresnick/cursor-pagination + } + id?: integer + type?: string //default: Agent + data: { + agentName?: string + uid?: string + os?: integer + devices?: string + cmdPars?: string + ignoreErrors?: enum[0, 1, 2] + isActive?: boolean + isTrusted?: boolean + token?: string + lastAct?: string + lastTime?: integer + lastIp?: string + userId?: integer + cpuOnly?: boolean + clientSignature?: string + } +} +``` + +- 400 Invalid request + +`application/json` + +```ts +{ + title?: string + type?: string + status?: integer +} +``` + +- 401 Authentication failed + +`application/json` + +```ts +{ + title?: string + type?: string + status?: integer +} +``` + +- 404 Not Found + +`application/json` + +```ts +{ + message?: string + exception: { + type?: string + code?: integer + message?: string + file?: string + line?: integer + } +} +``` + +*** + +### [POST]/api/v2/ui/agents/{id:[0-9]+}/relationships/{relation:accessGroups} + +- Security +bearerAuth + +#### RequestBody + +- application/json + +#### Responses + +- 204 successfully created + +- 400 Invalid request + +`application/json` + +```ts +{ + title?: string + type?: string + status?: integer +} +``` + +- 401 Authentication failed + +`application/json` + +```ts +{ + title?: string + type?: string + status?: integer +} +``` + +- 404 Not Found + +`application/json` + +```ts +{ + message?: string + exception: { + type?: string + code?: integer + message?: string + file?: string + line?: integer + } +} +``` + +*** + +### [DELETE]/api/v2/ui/agents/{id:[0-9]+}/relationships/{relation:accessGroups} + +- Security +bearerAuth + +#### RequestBody + +- application/json + +#### Responses + +- 204 successfully deleted + +- 400 Invalid request + +`application/json` + +```ts +{ + title?: string + type?: string + status?: integer +} +``` + +- 401 Authentication failed + +`application/json` + +```ts +{ + title?: string + type?: string + status?: integer +} +``` + +- 404 Not Found + +`application/json` + +```ts +{ + message?: string + exception: { + type?: string + code?: integer + message?: string + file?: string + line?: integer + } +} +``` + +*** + +### [GET]/api/v2/ui/agents/{id:[0-9]+}/{relation:agentStats} + +- Description +GET request for for a to-one relationship link. Returns the resource record of the object that is part of the specified relation. + +- Security +bearerAuth + +#### Parameters(Query) + +```ts +include?: string +``` + +#### Responses + +- 200 successful operation + +`application/json` + +```ts +{ + jsonapi: { + version?: string //default: 1.1 + ext?: string //default: https://jsonapi.org/profiles/ethanresnick/cursor-pagination + } + links: { + self?: string //default: /api/v2/ui/agents?page[size]=25 + first?: string //default: /api/v2/ui/agents?page[size]=25&page[after]=0 + last?: string //default: /api/v2/ui/agents?page[size]=25&page[before]=500 + next?: string //default: /api/v2/ui/agents?page[size]=25&page[after]=25 + previous?: string //default: /api/v2/ui/agents?page[size]=25&page[before]=25 + } + id?: integer + type?: string //default: Agent + data: { + agentName?: string + uid?: string + os?: integer + devices?: string + cmdPars?: string + ignoreErrors?: enum[0, 1, 2] + isActive?: boolean + isTrusted?: boolean + token?: string + lastAct?: string + lastTime?: integer + lastIp?: string + userId?: integer + cpuOnly?: boolean + clientSignature?: string + } + relationships: { + } + included: { + }[] +} +``` + +- 400 Invalid request + +`application/json` + +```ts +{ + title?: string + type?: string + status?: integer +} +``` + +- 401 Authentication failed + +`application/json` + +```ts +{ + title?: string + type?: string + status?: integer +} +``` + +- 404 Not Found + +`application/json` + +```ts +{ + message?: string + exception: { + type?: string + code?: integer + message?: string + file?: string + line?: integer + } +} +``` + +*** + +### [GET]/api/v2/ui/agents/{id:[0-9]+}/relationships/{relation:agentStats} + +- Description +GET request for for a to-one relationship link. Returns the resource record of the object that is part of the specified relation. + +- Security +bearerAuth + +#### Parameters(Query) + +```ts +include?: string +``` + +#### Responses + +- 200 successful operation + +`application/json` + +```ts +{ + jsonapi: { + version?: string //default: 1.1 + ext?: string //default: https://jsonapi.org/profiles/ethanresnick/cursor-pagination + } + links: { + self?: string //default: /api/v2/ui/agents?page[size]=25 + first?: string //default: /api/v2/ui/agents?page[size]=25&page[after]=0 + last?: string //default: /api/v2/ui/agents?page[size]=25&page[before]=500 + next?: string //default: /api/v2/ui/agents?page[size]=25&page[after]=25 + previous?: string //default: /api/v2/ui/agents?page[size]=25&page[before]=25 + } + id?: integer + type?: string //default: Agent + data: { + agentName?: string + uid?: string + os?: integer + devices?: string + cmdPars?: string + ignoreErrors?: enum[0, 1, 2] + isActive?: boolean + isTrusted?: boolean + token?: string + lastAct?: string + lastTime?: integer + lastIp?: string + userId?: integer + cpuOnly?: boolean + clientSignature?: string + } + relationships: { + } + included: { + }[] +} +``` + +- 400 Invalid request + +`application/json` + +```ts +{ + title?: string + type?: string + status?: integer +} +``` + +- 401 Authentication failed + +`application/json` + +```ts +{ + title?: string + type?: string + status?: integer +} +``` + +- 404 Not Found + +`application/json` + +```ts +{ + message?: string + exception: { + type?: string + code?: integer + message?: string + file?: string + line?: integer + } +} +``` + +*** + +### [PATCH]/api/v2/ui/agents/{id:[0-9]+}/relationships/{relation:agentStats} + +- Security +bearerAuth + +#### RequestBody + +- application/json + +```ts +{ + data: { + type?: string + attributes: { + agentName?: string + clientSignature?: string + cmdPars?: string + cpuOnly?: boolean + devices?: string + ignoreErrors?: enum[0, 1, 2] + isActive?: boolean + isTrusted?: boolean + os?: integer + token?: string + uid?: string + userId?: integer + } + } +} +``` + +#### Responses + +- 200 successful operation + +`application/json` + +```ts +{ + jsonapi: { + version?: string //default: 1.1 + ext?: string //default: https://jsonapi.org/profiles/ethanresnick/cursor-pagination + } + id?: integer + type?: string //default: Agent + data: { + agentName?: string + uid?: string + os?: integer + devices?: string + cmdPars?: string + ignoreErrors?: enum[0, 1, 2] + isActive?: boolean + isTrusted?: boolean + token?: string + lastAct?: string + lastTime?: integer + lastIp?: string + userId?: integer + cpuOnly?: boolean + clientSignature?: string + } +} +``` + +- 400 Invalid request + +`application/json` + +```ts +{ + title?: string + type?: string + status?: integer +} +``` + +- 401 Authentication failed + +`application/json` + +```ts +{ + title?: string + type?: string + status?: integer +} +``` + +- 404 Not Found + +`application/json` + +```ts +{ + message?: string + exception: { + type?: string + code?: integer + message?: string + file?: string + line?: integer + } +} +``` + +*** + +### [POST]/api/v2/ui/agents/{id:[0-9]+}/relationships/{relation:agentStats} + +- Security +bearerAuth + +#### RequestBody + +- application/json + +#### Responses + +- 204 successfully created + +- 400 Invalid request + +`application/json` + +```ts +{ + title?: string + type?: string + status?: integer +} +``` + +- 401 Authentication failed + +`application/json` + +```ts +{ + title?: string + type?: string + status?: integer +} +``` + +- 404 Not Found + +`application/json` + +```ts +{ + message?: string + exception: { + type?: string + code?: integer + message?: string + file?: string + line?: integer + } +} +``` + +*** + +### [DELETE]/api/v2/ui/agents/{id:[0-9]+}/relationships/{relation:agentStats} + +- Security +bearerAuth + +#### RequestBody + +- application/json + +#### Responses + +- 204 successfully deleted + +- 400 Invalid request + +`application/json` + +```ts +{ + title?: string + type?: string + status?: integer +} +``` + +- 401 Authentication failed + +`application/json` + +```ts +{ + title?: string + type?: string + status?: integer +} +``` + +- 404 Not Found + +`application/json` + +```ts +{ + message?: string + exception: { + type?: string + code?: integer + message?: string + file?: string + line?: integer + } +} +``` + +*** + +### [GET]/api/v2/ui/agents/{id:[0-9]+} + +- Description +GET request to retrieve a single object. + +- Security +bearerAuth + +#### Parameters(Query) + +```ts +include?: string +``` + +#### Responses + +- 200 successful operation + +`application/json` + +```ts +{ + jsonapi: { + version?: string //default: 1.1 + ext?: string //default: https://jsonapi.org/profiles/ethanresnick/cursor-pagination + } + links: { + self?: string //default: /api/v2/ui/agents?page[size]=25 + first?: string //default: /api/v2/ui/agents?page[size]=25&page[after]=0 + last?: string //default: /api/v2/ui/agents?page[size]=25&page[before]=500 + next?: string //default: /api/v2/ui/agents?page[size]=25&page[after]=25 + previous?: string //default: /api/v2/ui/agents?page[size]=25&page[before]=25 + } + id?: integer + type?: string //default: Agent + data: { + agentName?: string + uid?: string + os?: integer + devices?: string + cmdPars?: string + ignoreErrors?: enum[0, 1, 2] + isActive?: boolean + isTrusted?: boolean + token?: string + lastAct?: string + lastTime?: integer + lastIp?: string + userId?: integer + cpuOnly?: boolean + clientSignature?: string + } + relationships: { + } + included: { + }[] +} +``` + +- 400 Invalid request + +`application/json` + +```ts +{ + title?: string + type?: string + status?: integer +} +``` + +- 401 Authentication failed + +`application/json` + +```ts +{ + title?: string + type?: string + status?: integer +} +``` + +- 404 Not Found + +`application/json` + +```ts +{ + message?: string + exception: { + type?: string + code?: integer + message?: string + file?: string + line?: integer + } +} +``` + +*** + +### [PATCH]/api/v2/ui/agents/{id:[0-9]+} + +- Description +PATCH request to update attributes of a single object. + +- Security +bearerAuth + +#### RequestBody + +- application/json + +```ts +{ + data: { + type?: string + attributes: { + agentName?: string + clientSignature?: string + cmdPars?: string + cpuOnly?: boolean + devices?: string + ignoreErrors?: enum[0, 1, 2] + isActive?: boolean + isTrusted?: boolean + os?: integer + token?: string + uid?: string + userId?: integer + } + } +} +``` + +#### Responses + +- 200 successful operation + +`application/json` + +```ts +{ + jsonapi: { + version?: string //default: 1.1 + ext?: string //default: https://jsonapi.org/profiles/ethanresnick/cursor-pagination + } + id?: integer + type?: string //default: Agent + data: { + agentName?: string + uid?: string + os?: integer + devices?: string + cmdPars?: string + ignoreErrors?: enum[0, 1, 2] + isActive?: boolean + isTrusted?: boolean + token?: string + lastAct?: string + lastTime?: integer + lastIp?: string + userId?: integer + cpuOnly?: boolean + clientSignature?: string + } +} +``` + +- 400 Invalid request + +`application/json` + +```ts +{ + title?: string + type?: string + status?: integer +} +``` + +- 401 Authentication failed + +`application/json` + +```ts +{ + title?: string + type?: string + status?: integer +} +``` + +- 404 Not Found + +`application/json` + +```ts +{ + message?: string + exception: { + type?: string + code?: integer + message?: string + file?: string + line?: integer + } +} +``` + +*** + +### [DELETE]/api/v2/ui/agents/{id:[0-9]+} + +- Security +bearerAuth + +#### RequestBody + +- application/json + +#### Responses + +- 204 successfully deleted + +- 400 Invalid request + +`application/json` + +```ts +{ + title?: string + type?: string + status?: integer +} +``` + +- 401 Authentication failed + +`application/json` + +```ts +{ + title?: string + type?: string + status?: integer +} +``` + +- 404 Not Found + +`application/json` + +```ts +{ + message?: string + exception: { + type?: string + code?: integer + message?: string + file?: string + line?: integer + } +} +``` + +*** + +### [GET]/api/v2/ui/agentstats + +- Description +GET many request to retrieve multiple objects. + +- Security +bearerAuth + +#### Parameters(Query) + +```ts +page[after]?: integer +``` + +```ts +page[before]?: integer +``` + +```ts +page[size]?: integer +``` + +```ts +filter: { +} +``` + +```ts +include?: string +``` + +#### Responses + +- 200 successful operation + +`application/json` + +```ts +{ + jsonapi: { + version?: string //default: 1.1 + ext?: string //default: https://jsonapi.org/profiles/ethanresnick/cursor-pagination + } + links: { + self?: string //default: /api/v2/ui/agentstats?page[size]=25 + first?: string //default: /api/v2/ui/agentstats?page[size]=25&page[after]=0 + last?: string //default: /api/v2/ui/agentstats?page[size]=25&page[before]=500 + next?: string //default: /api/v2/ui/agentstats?page[size]=25&page[after]=25 + previous?: string //default: /api/v2/ui/agentstats?page[size]=25&page[before]=25 + } + id?: integer + type?: string //default: AgentStat + data: { + agentId?: integer + statType?: integer + time?: integer +[] + } + relationships: { + } + included: { + }[] +}[] +``` + +- 400 Invalid request + +`application/json` + +```ts +{ + title?: string + type?: string + status?: integer +} +``` + +- 401 Authentication failed + +`application/json` + +```ts +{ + title?: string + type?: string + status?: integer +} +``` + +*** + +### [GET]/api/v2/ui/agentstats/count + +- Description +GET many request to retrieve multiple objects. + +- Security +bearerAuth + +#### Parameters(Query) + +```ts +page[after]?: integer +``` + +```ts +page[before]?: integer +``` + +```ts +page[size]?: integer +``` + +```ts +filter: { +} +``` + +```ts +include?: string +``` + +#### Responses + +- 200 successful operation + +`application/json` + +```ts +{ + jsonapi: { + version?: string //default: 1.1 + ext?: string //default: https://jsonapi.org/profiles/ethanresnick/cursor-pagination + } + links: { + self?: string //default: /api/v2/ui/agentstats?page[size]=25 + first?: string //default: /api/v2/ui/agentstats?page[size]=25&page[after]=0 + last?: string //default: /api/v2/ui/agentstats?page[size]=25&page[before]=500 + next?: string //default: /api/v2/ui/agentstats?page[size]=25&page[after]=25 + previous?: string //default: /api/v2/ui/agentstats?page[size]=25&page[before]=25 + } + id?: integer + type?: string //default: AgentStat + data: { + agentId?: integer + statType?: integer + time?: integer +[] + } + relationships: { + } + included: { + }[] +}[] +``` + +- 400 Invalid request + +`application/json` + +```ts +{ + title?: string + type?: string + status?: integer +} +``` + +- 401 Authentication failed + +`application/json` + +```ts +{ + title?: string + type?: string + status?: integer +} +``` + +*** + +### [GET]/api/v2/ui/agentstats/{id:[0-9]+} + +- Description +GET request to retrieve a single object. + +- Security +bearerAuth + +#### Parameters(Query) + +```ts +include?: string +``` + +#### Responses + +- 200 successful operation + +`application/json` + +```ts +{ + jsonapi: { + version?: string //default: 1.1 + ext?: string //default: https://jsonapi.org/profiles/ethanresnick/cursor-pagination + } + links: { + self?: string //default: /api/v2/ui/agentstats?page[size]=25 + first?: string //default: /api/v2/ui/agentstats?page[size]=25&page[after]=0 + last?: string //default: /api/v2/ui/agentstats?page[size]=25&page[before]=500 + next?: string //default: /api/v2/ui/agentstats?page[size]=25&page[after]=25 + previous?: string //default: /api/v2/ui/agentstats?page[size]=25&page[before]=25 + } + id?: integer + type?: string //default: AgentStat + data: { + agentId?: integer + statType?: integer + time?: integer +[] + } + relationships: { + } + included: { + }[] +} +``` + +- 400 Invalid request + +`application/json` + +```ts +{ + title?: string + type?: string + status?: integer +} +``` + +- 401 Authentication failed + +`application/json` + +```ts +{ + title?: string + type?: string + status?: integer +} +``` + +- 404 Not Found + +`application/json` + +```ts +{ + message?: string + exception: { + type?: string + code?: integer + message?: string + file?: string + line?: integer + } +} +``` + +*** + +### [DELETE]/api/v2/ui/agentstats/{id:[0-9]+} + +- Security +bearerAuth + +#### RequestBody + +- application/json + +#### Responses + +- 204 successfully deleted + +- 400 Invalid request + +`application/json` + +```ts +{ + title?: string + type?: string + status?: integer +} +``` + +- 401 Authentication failed + +`application/json` + +```ts +{ + title?: string + type?: string + status?: integer +} +``` + +- 404 Not Found + +`application/json` + +```ts +{ + message?: string + exception: { + type?: string + code?: integer + message?: string + file?: string + line?: integer + } +} +``` + +*** + +### [GET]/api/v2/ui/chunks + +- Description +GET many request to retrieve multiple objects. + +- Security +bearerAuth + +#### Parameters(Query) + +```ts +page[after]?: integer +``` + +```ts +page[before]?: integer +``` + +```ts +page[size]?: integer +``` + +```ts +filter: { +} +``` + +```ts +include?: string +``` + +#### Responses + +- 200 successful operation + +`application/json` + +```ts +{ + jsonapi: { + version?: string //default: 1.1 + ext?: string //default: https://jsonapi.org/profiles/ethanresnick/cursor-pagination + } + links: { + self?: string //default: /api/v2/ui/chunks?page[size]=25 + first?: string //default: /api/v2/ui/chunks?page[size]=25&page[after]=0 + last?: string //default: /api/v2/ui/chunks?page[size]=25&page[before]=500 + next?: string //default: /api/v2/ui/chunks?page[size]=25&page[after]=25 + previous?: string //default: /api/v2/ui/chunks?page[size]=25&page[before]=25 + } + id?: integer + type?: string //default: Chunk + data: { + taskId?: integer + skip?: integer + length?: integer + agentId?: integer + dispatchTime?: integer + solveTime?: integer + checkpoint?: integer + progress?: integer + state?: integer + cracked?: integer + speed?: integer + } + relationships: { + } + included: { + }[] +}[] +``` + +- 400 Invalid request + +`application/json` + +```ts +{ + title?: string + type?: string + status?: integer +} +``` + +- 401 Authentication failed + +`application/json` + +```ts +{ + title?: string + type?: string + status?: integer +} +``` + +*** + +### [GET]/api/v2/ui/chunks/count + +- Description +GET many request to retrieve multiple objects. + +- Security +bearerAuth + +#### Parameters(Query) + +```ts +page[after]?: integer +``` + +```ts +page[before]?: integer +``` + +```ts +page[size]?: integer +``` + +```ts +filter: { +} +``` + +```ts +include?: string +``` + +#### Responses + +- 200 successful operation + +`application/json` + +```ts +{ + jsonapi: { + version?: string //default: 1.1 + ext?: string //default: https://jsonapi.org/profiles/ethanresnick/cursor-pagination + } + links: { + self?: string //default: /api/v2/ui/chunks?page[size]=25 + first?: string //default: /api/v2/ui/chunks?page[size]=25&page[after]=0 + last?: string //default: /api/v2/ui/chunks?page[size]=25&page[before]=500 + next?: string //default: /api/v2/ui/chunks?page[size]=25&page[after]=25 + previous?: string //default: /api/v2/ui/chunks?page[size]=25&page[before]=25 + } + id?: integer + type?: string //default: Chunk + data: { + taskId?: integer + skip?: integer + length?: integer + agentId?: integer + dispatchTime?: integer + solveTime?: integer + checkpoint?: integer + progress?: integer + state?: integer + cracked?: integer + speed?: integer + } + relationships: { + } + included: { + }[] +}[] +``` + +- 400 Invalid request + +`application/json` + +```ts +{ + title?: string + type?: string + status?: integer +} +``` + +- 401 Authentication failed + +`application/json` + +```ts +{ + title?: string + type?: string + status?: integer +} +``` + +*** + +### [GET]/api/v2/ui/chunks/{id:[0-9]+}/{relation:agent} + +- Description +GET request for for a to-one relationship link. Returns the resource record of the object that is part of the specified relation. + +- Security +bearerAuth + +#### Parameters(Query) + +```ts +include?: string +``` + +#### Responses + +- 200 successful operation + +`application/json` + +```ts +{ + jsonapi: { + version?: string //default: 1.1 + ext?: string //default: https://jsonapi.org/profiles/ethanresnick/cursor-pagination + } + links: { + self?: string //default: /api/v2/ui/chunks?page[size]=25 + first?: string //default: /api/v2/ui/chunks?page[size]=25&page[after]=0 + last?: string //default: /api/v2/ui/chunks?page[size]=25&page[before]=500 + next?: string //default: /api/v2/ui/chunks?page[size]=25&page[after]=25 + previous?: string //default: /api/v2/ui/chunks?page[size]=25&page[before]=25 + } + id?: integer + type?: string //default: Chunk + data: { + taskId?: integer + skip?: integer + length?: integer + agentId?: integer + dispatchTime?: integer + solveTime?: integer + checkpoint?: integer + progress?: integer + state?: integer + cracked?: integer + speed?: integer + } + relationships: { + } + included: { + }[] +} +``` + +- 400 Invalid request + +`application/json` + +```ts +{ + title?: string + type?: string + status?: integer +} +``` + +- 401 Authentication failed + +`application/json` + +```ts +{ + title?: string + type?: string + status?: integer +} +``` + +- 404 Not Found + +`application/json` + +```ts +{ + message?: string + exception: { + type?: string + code?: integer + message?: string + file?: string + line?: integer + } +} +``` + +*** + +### [GET]/api/v2/ui/chunks/{id:[0-9]+}/relationships/{relation:agent} + +- Description +GET request for for a to-one relationship link. Returns the resource record of the object that is part of the specified relation. + +- Security +bearerAuth + +#### Parameters(Query) + +```ts +include?: string +``` + +#### Responses + +- 200 successful operation + +`application/json` + +```ts +{ + jsonapi: { + version?: string //default: 1.1 + ext?: string //default: https://jsonapi.org/profiles/ethanresnick/cursor-pagination + } + links: { + self?: string //default: /api/v2/ui/chunks?page[size]=25 + first?: string //default: /api/v2/ui/chunks?page[size]=25&page[after]=0 + last?: string //default: /api/v2/ui/chunks?page[size]=25&page[before]=500 + next?: string //default: /api/v2/ui/chunks?page[size]=25&page[after]=25 + previous?: string //default: /api/v2/ui/chunks?page[size]=25&page[before]=25 + } + id?: integer + type?: string //default: Chunk + data: { + taskId?: integer + skip?: integer + length?: integer + agentId?: integer + dispatchTime?: integer + solveTime?: integer + checkpoint?: integer + progress?: integer + state?: integer + cracked?: integer + speed?: integer + } + relationships: { + } + included: { + }[] +} +``` + +- 400 Invalid request + +`application/json` + +```ts +{ + title?: string + type?: string + status?: integer +} +``` + +- 401 Authentication failed + +`application/json` + +```ts +{ + title?: string + type?: string + status?: integer +} +``` + +- 404 Not Found + +`application/json` + +```ts +{ + message?: string + exception: { + type?: string + code?: integer + message?: string + file?: string + line?: integer + } +} +``` + +*** + +### [PATCH]/api/v2/ui/chunks/{id:[0-9]+}/relationships/{relation:agent} + +- Security +bearerAuth + +#### RequestBody + +- application/json + +```ts +{ + data: { + type?: string + attributes: { + } + } +} +``` + +#### Responses + +- 200 successful operation + +`application/json` + +```ts +{ + jsonapi: { + version?: string //default: 1.1 + ext?: string //default: https://jsonapi.org/profiles/ethanresnick/cursor-pagination + } + id?: integer + type?: string //default: Chunk + data: { + taskId?: integer + skip?: integer + length?: integer + agentId?: integer + dispatchTime?: integer + solveTime?: integer + checkpoint?: integer + progress?: integer + state?: integer + cracked?: integer + speed?: integer + } +} +``` + +- 400 Invalid request + +`application/json` + +```ts +{ + title?: string + type?: string + status?: integer +} +``` + +- 401 Authentication failed + +`application/json` + +```ts +{ + title?: string + type?: string + status?: integer +} +``` + +- 404 Not Found + +`application/json` + +```ts +{ + message?: string + exception: { + type?: string + code?: integer + message?: string + file?: string + line?: integer + } +} +``` + +*** + +### [GET]/api/v2/ui/chunks/{id:[0-9]+}/{relation:task} + +- Description +GET request for for a to-one relationship link. Returns the resource record of the object that is part of the specified relation. + +- Security +bearerAuth + +#### Parameters(Query) + +```ts +include?: string +``` + +#### Responses + +- 200 successful operation + +`application/json` + +```ts +{ + jsonapi: { + version?: string //default: 1.1 + ext?: string //default: https://jsonapi.org/profiles/ethanresnick/cursor-pagination + } + links: { + self?: string //default: /api/v2/ui/chunks?page[size]=25 + first?: string //default: /api/v2/ui/chunks?page[size]=25&page[after]=0 + last?: string //default: /api/v2/ui/chunks?page[size]=25&page[before]=500 + next?: string //default: /api/v2/ui/chunks?page[size]=25&page[after]=25 + previous?: string //default: /api/v2/ui/chunks?page[size]=25&page[before]=25 + } + id?: integer + type?: string //default: Chunk + data: { + taskId?: integer + skip?: integer + length?: integer + agentId?: integer + dispatchTime?: integer + solveTime?: integer + checkpoint?: integer + progress?: integer + state?: integer + cracked?: integer + speed?: integer + } + relationships: { + } + included: { + }[] +} +``` + +- 400 Invalid request + +`application/json` + +```ts +{ + title?: string + type?: string + status?: integer +} +``` + +- 401 Authentication failed + +`application/json` + +```ts +{ + title?: string + type?: string + status?: integer +} +``` + +- 404 Not Found + +`application/json` + +```ts +{ + message?: string + exception: { + type?: string + code?: integer + message?: string + file?: string + line?: integer + } +} +``` + +*** + +### [GET]/api/v2/ui/chunks/{id:[0-9]+}/relationships/{relation:task} + +- Description +GET request for for a to-one relationship link. Returns the resource record of the object that is part of the specified relation. + +- Security +bearerAuth + +#### Parameters(Query) + +```ts +include?: string +``` + +#### Responses + +- 200 successful operation + +`application/json` + +```ts +{ + jsonapi: { + version?: string //default: 1.1 + ext?: string //default: https://jsonapi.org/profiles/ethanresnick/cursor-pagination + } + links: { + self?: string //default: /api/v2/ui/chunks?page[size]=25 + first?: string //default: /api/v2/ui/chunks?page[size]=25&page[after]=0 + last?: string //default: /api/v2/ui/chunks?page[size]=25&page[before]=500 + next?: string //default: /api/v2/ui/chunks?page[size]=25&page[after]=25 + previous?: string //default: /api/v2/ui/chunks?page[size]=25&page[before]=25 + } + id?: integer + type?: string //default: Chunk + data: { + taskId?: integer + skip?: integer + length?: integer + agentId?: integer + dispatchTime?: integer + solveTime?: integer + checkpoint?: integer + progress?: integer + state?: integer + cracked?: integer + speed?: integer + } + relationships: { + } + included: { + }[] +} +``` + +- 400 Invalid request + +`application/json` + +```ts +{ + title?: string + type?: string + status?: integer +} +``` + +- 401 Authentication failed + +`application/json` + +```ts +{ + title?: string + type?: string + status?: integer +} +``` + +- 404 Not Found + +`application/json` + +```ts +{ + message?: string + exception: { + type?: string + code?: integer + message?: string + file?: string + line?: integer + } +} +``` + +*** + +### [PATCH]/api/v2/ui/chunks/{id:[0-9]+}/relationships/{relation:task} + +- Security +bearerAuth + +#### RequestBody + +- application/json + +```ts +{ + data: { + type?: string + attributes: { + } + } +} +``` + +#### Responses + +- 200 successful operation + +`application/json` + +```ts +{ + jsonapi: { + version?: string //default: 1.1 + ext?: string //default: https://jsonapi.org/profiles/ethanresnick/cursor-pagination + } + id?: integer + type?: string //default: Chunk + data: { + taskId?: integer + skip?: integer + length?: integer + agentId?: integer + dispatchTime?: integer + solveTime?: integer + checkpoint?: integer + progress?: integer + state?: integer + cracked?: integer + speed?: integer + } +} +``` + +- 400 Invalid request + +`application/json` + +```ts +{ + title?: string + type?: string + status?: integer +} +``` + +- 401 Authentication failed + +`application/json` + +```ts +{ + title?: string + type?: string + status?: integer +} +``` + +- 404 Not Found + +`application/json` + +```ts +{ + message?: string + exception: { + type?: string + code?: integer + message?: string + file?: string + line?: integer + } +} +``` + +*** + +### [GET]/api/v2/ui/chunks/{id:[0-9]+} + +- Description +GET request to retrieve a single object. + +- Security +bearerAuth + +#### Parameters(Query) + +```ts +include?: string +``` + +#### Responses + +- 200 successful operation + +`application/json` + +```ts +{ + jsonapi: { + version?: string //default: 1.1 + ext?: string //default: https://jsonapi.org/profiles/ethanresnick/cursor-pagination + } + links: { + self?: string //default: /api/v2/ui/chunks?page[size]=25 + first?: string //default: /api/v2/ui/chunks?page[size]=25&page[after]=0 + last?: string //default: /api/v2/ui/chunks?page[size]=25&page[before]=500 + next?: string //default: /api/v2/ui/chunks?page[size]=25&page[after]=25 + previous?: string //default: /api/v2/ui/chunks?page[size]=25&page[before]=25 + } + id?: integer + type?: string //default: Chunk + data: { + taskId?: integer + skip?: integer + length?: integer + agentId?: integer + dispatchTime?: integer + solveTime?: integer + checkpoint?: integer + progress?: integer + state?: integer + cracked?: integer + speed?: integer + } + relationships: { + } + included: { + }[] +} +``` + +- 400 Invalid request + +`application/json` + +```ts +{ + title?: string + type?: string + status?: integer +} +``` + +- 401 Authentication failed + +`application/json` + +```ts +{ + title?: string + type?: string + status?: integer +} +``` + +- 404 Not Found + +`application/json` + +```ts +{ + message?: string + exception: { + type?: string + code?: integer + message?: string + file?: string + line?: integer + } +} +``` + +*** + +### [GET]/api/v2/ui/configs + +- Description +GET many request to retrieve multiple objects. + +- Security +bearerAuth + +#### Parameters(Query) + +```ts +page[after]?: integer +``` + +```ts +page[before]?: integer +``` + +```ts +page[size]?: integer +``` + +```ts +filter: { +} +``` + +```ts +include?: string +``` + +#### Responses + +- 200 successful operation + +`application/json` + +```ts +{ + jsonapi: { + version?: string //default: 1.1 + ext?: string //default: https://jsonapi.org/profiles/ethanresnick/cursor-pagination + } + links: { + self?: string //default: /api/v2/ui/configs?page[size]=25 + first?: string //default: /api/v2/ui/configs?page[size]=25&page[after]=0 + last?: string //default: /api/v2/ui/configs?page[size]=25&page[before]=500 + next?: string //default: /api/v2/ui/configs?page[size]=25&page[after]=25 + previous?: string //default: /api/v2/ui/configs?page[size]=25&page[before]=25 + } + id?: integer + type?: string //default: Config + data: { + configSectionId?: integer + item?: string + value?: string + } + relationships: { + } + included: { + }[] +}[] +``` + +- 400 Invalid request + +`application/json` + +```ts +{ + title?: string + type?: string + status?: integer +} +``` + +- 401 Authentication failed + +`application/json` + +```ts +{ + title?: string + type?: string + status?: integer +} +``` + +*** + +### [GET]/api/v2/ui/configs/count + +- Description +GET many request to retrieve multiple objects. + +- Security +bearerAuth + +#### Parameters(Query) + +```ts +page[after]?: integer +``` + +```ts +page[before]?: integer +``` + +```ts +page[size]?: integer +``` + +```ts +filter: { +} +``` + +```ts +include?: string +``` + +#### Responses + +- 200 successful operation + +`application/json` + +```ts +{ + jsonapi: { + version?: string //default: 1.1 + ext?: string //default: https://jsonapi.org/profiles/ethanresnick/cursor-pagination + } + links: { + self?: string //default: /api/v2/ui/configs?page[size]=25 + first?: string //default: /api/v2/ui/configs?page[size]=25&page[after]=0 + last?: string //default: /api/v2/ui/configs?page[size]=25&page[before]=500 + next?: string //default: /api/v2/ui/configs?page[size]=25&page[after]=25 + previous?: string //default: /api/v2/ui/configs?page[size]=25&page[before]=25 + } + id?: integer + type?: string //default: Config + data: { + configSectionId?: integer + item?: string + value?: string + } + relationships: { + } + included: { + }[] +}[] +``` + +- 400 Invalid request + +`application/json` + +```ts +{ + title?: string + type?: string + status?: integer +} +``` + +- 401 Authentication failed + +`application/json` + +```ts +{ + title?: string + type?: string + status?: integer +} +``` + +*** + +### [GET]/api/v2/ui/configs/{id:[0-9]+}/{relation:configSection} + +- Description +GET request for for a to-one relationship link. Returns the resource record of the object that is part of the specified relation. + +- Security +bearerAuth + +#### Parameters(Query) + +```ts +include?: string +``` + +#### Responses + +- 200 successful operation + +`application/json` + +```ts +{ + jsonapi: { + version?: string //default: 1.1 + ext?: string //default: https://jsonapi.org/profiles/ethanresnick/cursor-pagination + } + links: { + self?: string //default: /api/v2/ui/configs?page[size]=25 + first?: string //default: /api/v2/ui/configs?page[size]=25&page[after]=0 + last?: string //default: /api/v2/ui/configs?page[size]=25&page[before]=500 + next?: string //default: /api/v2/ui/configs?page[size]=25&page[after]=25 + previous?: string //default: /api/v2/ui/configs?page[size]=25&page[before]=25 + } + id?: integer + type?: string //default: Config + data: { + configSectionId?: integer + item?: string + value?: string + } + relationships: { + } + included: { + }[] +} +``` + +- 400 Invalid request + +`application/json` + +```ts +{ + title?: string + type?: string + status?: integer +} +``` + +- 401 Authentication failed + +`application/json` + +```ts +{ + title?: string + type?: string + status?: integer +} +``` + +- 404 Not Found + +`application/json` + +```ts +{ + message?: string + exception: { + type?: string + code?: integer + message?: string + file?: string + line?: integer + } +} +``` + +*** + +### [GET]/api/v2/ui/configs/{id:[0-9]+}/relationships/{relation:configSection} + +- Description +GET request for for a to-one relationship link. Returns the resource record of the object that is part of the specified relation. + +- Security +bearerAuth + +#### Parameters(Query) + +```ts +include?: string +``` + +#### Responses + +- 200 successful operation + +`application/json` + +```ts +{ + jsonapi: { + version?: string //default: 1.1 + ext?: string //default: https://jsonapi.org/profiles/ethanresnick/cursor-pagination + } + links: { + self?: string //default: /api/v2/ui/configs?page[size]=25 + first?: string //default: /api/v2/ui/configs?page[size]=25&page[after]=0 + last?: string //default: /api/v2/ui/configs?page[size]=25&page[before]=500 + next?: string //default: /api/v2/ui/configs?page[size]=25&page[after]=25 + previous?: string //default: /api/v2/ui/configs?page[size]=25&page[before]=25 + } + id?: integer + type?: string //default: Config + data: { + configSectionId?: integer + item?: string + value?: string + } + relationships: { + } + included: { + }[] +} +``` + +- 400 Invalid request + +`application/json` + +```ts +{ + title?: string + type?: string + status?: integer +} +``` + +- 401 Authentication failed + +`application/json` + +```ts +{ + title?: string + type?: string + status?: integer +} +``` + +- 404 Not Found + +`application/json` + +```ts +{ + message?: string + exception: { + type?: string + code?: integer + message?: string + file?: string + line?: integer + } +} +``` + +*** + +### [PATCH]/api/v2/ui/configs/{id:[0-9]+}/relationships/{relation:configSection} + +- Security +bearerAuth + +#### RequestBody + +- application/json + +```ts +{ + data: { + type?: string + attributes: { + configSectionId?: integer + item?: string + value?: string + } + } +} +``` + +#### Responses + +- 200 successful operation + +`application/json` + +```ts +{ + jsonapi: { + version?: string //default: 1.1 + ext?: string //default: https://jsonapi.org/profiles/ethanresnick/cursor-pagination + } + id?: integer + type?: string //default: Config + data: { + configSectionId?: integer + item?: string + value?: string + } +} +``` + +- 400 Invalid request + +`application/json` + +```ts +{ + title?: string + type?: string + status?: integer +} +``` + +- 401 Authentication failed + +`application/json` + +```ts +{ + title?: string + type?: string + status?: integer +} +``` + +- 404 Not Found + +`application/json` + +```ts +{ + message?: string + exception: { + type?: string + code?: integer + message?: string + file?: string + line?: integer + } +} +``` + +*** + +### [GET]/api/v2/ui/configs/{id:[0-9]+} + +- Description +GET request to retrieve a single object. + +- Security +bearerAuth + +#### Parameters(Query) + +```ts +include?: string +``` + +#### Responses + +- 200 successful operation + +`application/json` + +```ts +{ + jsonapi: { + version?: string //default: 1.1 + ext?: string //default: https://jsonapi.org/profiles/ethanresnick/cursor-pagination + } + links: { + self?: string //default: /api/v2/ui/configs?page[size]=25 + first?: string //default: /api/v2/ui/configs?page[size]=25&page[after]=0 + last?: string //default: /api/v2/ui/configs?page[size]=25&page[before]=500 + next?: string //default: /api/v2/ui/configs?page[size]=25&page[after]=25 + previous?: string //default: /api/v2/ui/configs?page[size]=25&page[before]=25 + } + id?: integer + type?: string //default: Config + data: { + configSectionId?: integer + item?: string + value?: string + } + relationships: { + } + included: { + }[] +} +``` + +- 400 Invalid request + +`application/json` + +```ts +{ + title?: string + type?: string + status?: integer +} +``` + +- 401 Authentication failed + +`application/json` + +```ts +{ + title?: string + type?: string + status?: integer +} +``` + +- 404 Not Found + +`application/json` + +```ts +{ + message?: string + exception: { + type?: string + code?: integer + message?: string + file?: string + line?: integer + } +} +``` + +*** + +### [PATCH]/api/v2/ui/configs/{id:[0-9]+} + +- Description +PATCH request to update attributes of a single object. + +- Security +bearerAuth + +#### RequestBody + +- application/json + +```ts +{ + data: { + type?: string + attributes: { + configSectionId?: integer + item?: string + value?: string + } + } +} +``` + +#### Responses + +- 200 successful operation + +`application/json` + +```ts +{ + jsonapi: { + version?: string //default: 1.1 + ext?: string //default: https://jsonapi.org/profiles/ethanresnick/cursor-pagination + } + id?: integer + type?: string //default: Config + data: { + configSectionId?: integer + item?: string + value?: string + } +} +``` + +- 400 Invalid request + +`application/json` + +```ts +{ + title?: string + type?: string + status?: integer +} +``` + +- 401 Authentication failed + +`application/json` + +```ts +{ + title?: string + type?: string + status?: integer +} +``` + +- 404 Not Found + +`application/json` + +```ts +{ + message?: string + exception: { + type?: string + code?: integer + message?: string + file?: string + line?: integer + } +} +``` + +*** + +### [GET]/api/v2/ui/configsections + +- Description +GET many request to retrieve multiple objects. + +- Security +bearerAuth + +#### Parameters(Query) + +```ts +page[after]?: integer +``` + +```ts +page[before]?: integer +``` + +```ts +page[size]?: integer +``` + +```ts +filter: { +} +``` + +```ts +include?: string +``` + +#### Responses + +- 200 successful operation + +`application/json` + +```ts +{ + jsonapi: { + version?: string //default: 1.1 + ext?: string //default: https://jsonapi.org/profiles/ethanresnick/cursor-pagination + } + links: { + self?: string //default: /api/v2/ui/configsections?page[size]=25 + first?: string //default: /api/v2/ui/configsections?page[size]=25&page[after]=0 + last?: string //default: /api/v2/ui/configsections?page[size]=25&page[before]=500 + next?: string //default: /api/v2/ui/configsections?page[size]=25&page[after]=25 + previous?: string //default: /api/v2/ui/configsections?page[size]=25&page[before]=25 + } + id?: integer + type?: string //default: ConfigSection + data: { + sectionName?: string + } + relationships: { + } + included: { + }[] +}[] +``` + +- 400 Invalid request + +`application/json` + +```ts +{ + title?: string + type?: string + status?: integer +} +``` + +- 401 Authentication failed + +`application/json` + +```ts +{ + title?: string + type?: string + status?: integer +} +``` + +*** + +### [GET]/api/v2/ui/configsections/count + +- Description +GET many request to retrieve multiple objects. + +- Security +bearerAuth + +#### Parameters(Query) + +```ts +page[after]?: integer +``` + +```ts +page[before]?: integer +``` + +```ts +page[size]?: integer +``` + +```ts +filter: { +} +``` + +```ts +include?: string +``` + +#### Responses + +- 200 successful operation + +`application/json` + +```ts +{ + jsonapi: { + version?: string //default: 1.1 + ext?: string //default: https://jsonapi.org/profiles/ethanresnick/cursor-pagination + } + links: { + self?: string //default: /api/v2/ui/configsections?page[size]=25 + first?: string //default: /api/v2/ui/configsections?page[size]=25&page[after]=0 + last?: string //default: /api/v2/ui/configsections?page[size]=25&page[before]=500 + next?: string //default: /api/v2/ui/configsections?page[size]=25&page[after]=25 + previous?: string //default: /api/v2/ui/configsections?page[size]=25&page[before]=25 + } + id?: integer + type?: string //default: ConfigSection + data: { + sectionName?: string + } + relationships: { + } + included: { + }[] +}[] +``` + +- 400 Invalid request + +`application/json` + +```ts +{ + title?: string + type?: string + status?: integer +} +``` + +- 401 Authentication failed + +`application/json` + +```ts +{ + title?: string + type?: string + status?: integer +} +``` + +*** + +### [GET]/api/v2/ui/configsections/{id:[0-9]+} + +- Description +GET request to retrieve a single object. + +- Security +bearerAuth + +#### Parameters(Query) + +```ts +include?: string +``` + +#### Responses + +- 200 successful operation + +`application/json` + +```ts +{ + jsonapi: { + version?: string //default: 1.1 + ext?: string //default: https://jsonapi.org/profiles/ethanresnick/cursor-pagination + } + links: { + self?: string //default: /api/v2/ui/configsections?page[size]=25 + first?: string //default: /api/v2/ui/configsections?page[size]=25&page[after]=0 + last?: string //default: /api/v2/ui/configsections?page[size]=25&page[before]=500 + next?: string //default: /api/v2/ui/configsections?page[size]=25&page[after]=25 + previous?: string //default: /api/v2/ui/configsections?page[size]=25&page[before]=25 + } + id?: integer + type?: string //default: ConfigSection + data: { + sectionName?: string + } + relationships: { + } + included: { + }[] +} +``` + +- 400 Invalid request + +`application/json` + +```ts +{ + title?: string + type?: string + status?: integer +} +``` + +- 401 Authentication failed + +`application/json` + +```ts +{ + title?: string + type?: string + status?: integer +} +``` + +- 404 Not Found + +`application/json` + +```ts +{ + message?: string + exception: { + type?: string + code?: integer + message?: string + file?: string + line?: integer + } +} +``` + +*** + +### [GET]/api/v2/ui/crackers + +- Description +GET many request to retrieve multiple objects. + +- Security +bearerAuth + +#### Parameters(Query) + +```ts +page[after]?: integer +``` + +```ts +page[before]?: integer +``` + +```ts +page[size]?: integer +``` + +```ts +filter: { +} +``` + +```ts +include?: string +``` + +#### Responses + +- 200 successful operation + +`application/json` + +```ts +{ + jsonapi: { + version?: string //default: 1.1 + ext?: string //default: https://jsonapi.org/profiles/ethanresnick/cursor-pagination + } + links: { + self?: string //default: /api/v2/ui/crackers?page[size]=25 + first?: string //default: /api/v2/ui/crackers?page[size]=25&page[after]=0 + last?: string //default: /api/v2/ui/crackers?page[size]=25&page[before]=500 + next?: string //default: /api/v2/ui/crackers?page[size]=25&page[after]=25 + previous?: string //default: /api/v2/ui/crackers?page[size]=25&page[before]=25 + } + id?: integer + type?: string //default: CrackerBinary + data: { + crackerBinaryTypeId?: integer + version?: string + downloadUrl?: string + binaryName?: string + } + relationships: { + } + included: { + }[] +}[] +``` + +- 400 Invalid request + +`application/json` + +```ts +{ + title?: string + type?: string + status?: integer +} +``` + +- 401 Authentication failed + +`application/json` + +```ts +{ + title?: string + type?: string + status?: integer +} +``` + +*** + +### [POST]/api/v2/ui/crackers + +- Description +POST request to create a new object. The request must contain the resource record as data with the attributes of the new object.To add relationships, a relationships object can be added with the resource records of the relations that are part of this object. + +- Security +bearerAuth + +#### RequestBody + +- application/json + +```ts +{ + data: { + type?: string + attributes: { + crackerBinaryTypeId?: integer + version?: string + downloadUrl?: string + binaryName?: string + } + } +} +``` + +#### Responses + +- 201 successful operation + +`application/json` + +```ts +{ + jsonapi: { + version?: string //default: 1.1 + ext?: string //default: https://jsonapi.org/profiles/ethanresnick/cursor-pagination + } + id?: integer + type?: string //default: CrackerBinary + data: { + crackerBinaryTypeId?: integer + version?: string + downloadUrl?: string + binaryName?: string + } +} +``` + +- 400 Invalid request + +`application/json` + +```ts +{ + title?: string + type?: string + status?: integer +} +``` + +- 401 Authentication failed + +`application/json` + +```ts +{ + title?: string + type?: string + status?: integer +} +``` + +*** + +### [GET]/api/v2/ui/crackers/count + +- Description +GET many request to retrieve multiple objects. + +- Security +bearerAuth + +#### Parameters(Query) + +```ts +page[after]?: integer +``` + +```ts +page[before]?: integer +``` + +```ts +page[size]?: integer +``` + +```ts +filter: { +} +``` + +```ts +include?: string +``` + +#### Responses + +- 200 successful operation + +`application/json` + +```ts +{ + jsonapi: { + version?: string //default: 1.1 + ext?: string //default: https://jsonapi.org/profiles/ethanresnick/cursor-pagination + } + links: { + self?: string //default: /api/v2/ui/crackers?page[size]=25 + first?: string //default: /api/v2/ui/crackers?page[size]=25&page[after]=0 + last?: string //default: /api/v2/ui/crackers?page[size]=25&page[before]=500 + next?: string //default: /api/v2/ui/crackers?page[size]=25&page[after]=25 + previous?: string //default: /api/v2/ui/crackers?page[size]=25&page[before]=25 + } + id?: integer + type?: string //default: CrackerBinary + data: { + crackerBinaryTypeId?: integer + version?: string + downloadUrl?: string + binaryName?: string + } + relationships: { + } + included: { + }[] +}[] +``` + +- 400 Invalid request + +`application/json` + +```ts +{ + title?: string + type?: string + status?: integer +} +``` + +- 401 Authentication failed + +`application/json` + +```ts +{ + title?: string + type?: string + status?: integer +} +``` + +*** + +### [GET]/api/v2/ui/crackers/{id:[0-9]+}/{relation:crackerBinaryType} + +- Description +GET request for for a to-one relationship link. Returns the resource record of the object that is part of the specified relation. + +- Security +bearerAuth + +#### Parameters(Query) + +```ts +include?: string +``` + +#### Responses + +- 200 successful operation + +`application/json` + +```ts +{ + jsonapi: { + version?: string //default: 1.1 + ext?: string //default: https://jsonapi.org/profiles/ethanresnick/cursor-pagination + } + links: { + self?: string //default: /api/v2/ui/crackers?page[size]=25 + first?: string //default: /api/v2/ui/crackers?page[size]=25&page[after]=0 + last?: string //default: /api/v2/ui/crackers?page[size]=25&page[before]=500 + next?: string //default: /api/v2/ui/crackers?page[size]=25&page[after]=25 + previous?: string //default: /api/v2/ui/crackers?page[size]=25&page[before]=25 + } + id?: integer + type?: string //default: CrackerBinary + data: { + crackerBinaryTypeId?: integer + version?: string + downloadUrl?: string + binaryName?: string + } + relationships: { + } + included: { + }[] +} +``` + +- 400 Invalid request + +`application/json` + +```ts +{ + title?: string + type?: string + status?: integer +} +``` + +- 401 Authentication failed + +`application/json` + +```ts +{ + title?: string + type?: string + status?: integer +} +``` + +- 404 Not Found + +`application/json` + +```ts +{ + message?: string + exception: { + type?: string + code?: integer + message?: string + file?: string + line?: integer + } +} +``` + +*** + +### [GET]/api/v2/ui/crackers/{id:[0-9]+}/relationships/{relation:crackerBinaryType} + +- Description +GET request for for a to-one relationship link. Returns the resource record of the object that is part of the specified relation. + +- Security +bearerAuth + +#### Parameters(Query) + +```ts +include?: string +``` + +#### Responses + +- 200 successful operation + +`application/json` + +```ts +{ + jsonapi: { + version?: string //default: 1.1 + ext?: string //default: https://jsonapi.org/profiles/ethanresnick/cursor-pagination + } + links: { + self?: string //default: /api/v2/ui/crackers?page[size]=25 + first?: string //default: /api/v2/ui/crackers?page[size]=25&page[after]=0 + last?: string //default: /api/v2/ui/crackers?page[size]=25&page[before]=500 + next?: string //default: /api/v2/ui/crackers?page[size]=25&page[after]=25 + previous?: string //default: /api/v2/ui/crackers?page[size]=25&page[before]=25 + } + id?: integer + type?: string //default: CrackerBinary + data: { + crackerBinaryTypeId?: integer + version?: string + downloadUrl?: string + binaryName?: string + } + relationships: { + } + included: { + }[] +} +``` + +- 400 Invalid request + +`application/json` + +```ts +{ + title?: string + type?: string + status?: integer +} +``` + +- 401 Authentication failed + +`application/json` + +```ts +{ + title?: string + type?: string + status?: integer +} +``` + +- 404 Not Found + +`application/json` + +```ts +{ + message?: string + exception: { + type?: string + code?: integer + message?: string + file?: string + line?: integer + } +} +``` + +*** + +### [PATCH]/api/v2/ui/crackers/{id:[0-9]+}/relationships/{relation:crackerBinaryType} + +- Security +bearerAuth + +#### RequestBody + +- application/json + +```ts +{ + data: { + type?: string + attributes: { + binaryName?: string + crackerBinaryTypeId?: integer + downloadUrl?: string + version?: string + } + } +} +``` + +#### Responses + +- 200 successful operation + +`application/json` + +```ts +{ + jsonapi: { + version?: string //default: 1.1 + ext?: string //default: https://jsonapi.org/profiles/ethanresnick/cursor-pagination + } + id?: integer + type?: string //default: CrackerBinary + data: { + crackerBinaryTypeId?: integer + version?: string + downloadUrl?: string + binaryName?: string + } +} +``` + +- 400 Invalid request + +`application/json` + +```ts +{ + title?: string + type?: string + status?: integer +} +``` + +- 401 Authentication failed + +`application/json` + +```ts +{ + title?: string + type?: string + status?: integer +} +``` + +- 404 Not Found + +`application/json` + +```ts +{ + message?: string + exception: { + type?: string + code?: integer + message?: string + file?: string + line?: integer + } +} +``` + +*** + +### [GET]/api/v2/ui/crackers/{id:[0-9]+}/{relation:tasks} + +- Description +GET request for for a to-one relationship link. Returns the resource record of the object that is part of the specified relation. + +- Security +bearerAuth + +#### Parameters(Query) + +```ts +include?: string +``` + +#### Responses + +- 200 successful operation + +`application/json` + +```ts +{ + jsonapi: { + version?: string //default: 1.1 + ext?: string //default: https://jsonapi.org/profiles/ethanresnick/cursor-pagination + } + links: { + self?: string //default: /api/v2/ui/crackers?page[size]=25 + first?: string //default: /api/v2/ui/crackers?page[size]=25&page[after]=0 + last?: string //default: /api/v2/ui/crackers?page[size]=25&page[before]=500 + next?: string //default: /api/v2/ui/crackers?page[size]=25&page[after]=25 + previous?: string //default: /api/v2/ui/crackers?page[size]=25&page[before]=25 + } + id?: integer + type?: string //default: CrackerBinary + data: { + crackerBinaryTypeId?: integer + version?: string + downloadUrl?: string + binaryName?: string + } + relationships: { + } + included: { + }[] +} +``` + +- 400 Invalid request + +`application/json` + +```ts +{ + title?: string + type?: string + status?: integer +} +``` + +- 401 Authentication failed + +`application/json` + +```ts +{ + title?: string + type?: string + status?: integer +} +``` + +- 404 Not Found + +`application/json` + +```ts +{ + message?: string + exception: { + type?: string + code?: integer + message?: string + file?: string + line?: integer + } +} +``` + +*** + +### [GET]/api/v2/ui/crackers/{id:[0-9]+}/relationships/{relation:tasks} + +- Description +GET request for for a to-one relationship link. Returns the resource record of the object that is part of the specified relation. + +- Security +bearerAuth + +#### Parameters(Query) + +```ts +include?: string +``` + +#### Responses + +- 200 successful operation + +`application/json` + +```ts +{ + jsonapi: { + version?: string //default: 1.1 + ext?: string //default: https://jsonapi.org/profiles/ethanresnick/cursor-pagination + } + links: { + self?: string //default: /api/v2/ui/crackers?page[size]=25 + first?: string //default: /api/v2/ui/crackers?page[size]=25&page[after]=0 + last?: string //default: /api/v2/ui/crackers?page[size]=25&page[before]=500 + next?: string //default: /api/v2/ui/crackers?page[size]=25&page[after]=25 + previous?: string //default: /api/v2/ui/crackers?page[size]=25&page[before]=25 + } + id?: integer + type?: string //default: CrackerBinary + data: { + crackerBinaryTypeId?: integer + version?: string + downloadUrl?: string + binaryName?: string + } + relationships: { + } + included: { + }[] +} +``` + +- 400 Invalid request + +`application/json` + +```ts +{ + title?: string + type?: string + status?: integer +} +``` + +- 401 Authentication failed + +`application/json` + +```ts +{ + title?: string + type?: string + status?: integer +} +``` + +- 404 Not Found + +`application/json` + +```ts +{ + message?: string + exception: { + type?: string + code?: integer + message?: string + file?: string + line?: integer + } +} +``` + +*** + +### [PATCH]/api/v2/ui/crackers/{id:[0-9]+}/relationships/{relation:tasks} + +- Security +bearerAuth + +#### RequestBody + +- application/json + +```ts +{ + data: { + type?: string + attributes: { + binaryName?: string + crackerBinaryTypeId?: integer + downloadUrl?: string + version?: string + } + } +} +``` + +#### Responses + +- 200 successful operation + +`application/json` + +```ts +{ + jsonapi: { + version?: string //default: 1.1 + ext?: string //default: https://jsonapi.org/profiles/ethanresnick/cursor-pagination + } + id?: integer + type?: string //default: CrackerBinary + data: { + crackerBinaryTypeId?: integer + version?: string + downloadUrl?: string + binaryName?: string + } +} +``` + +- 400 Invalid request + +`application/json` + +```ts +{ + title?: string + type?: string + status?: integer +} +``` + +- 401 Authentication failed + +`application/json` + +```ts +{ + title?: string + type?: string + status?: integer +} +``` + +- 404 Not Found + +`application/json` + +```ts +{ + message?: string + exception: { + type?: string + code?: integer + message?: string + file?: string + line?: integer + } +} +``` + +*** + +### [POST]/api/v2/ui/crackers/{id:[0-9]+}/relationships/{relation:tasks} + +- Security +bearerAuth + +#### RequestBody + +- application/json + +#### Responses + +- 204 successfully created + +- 400 Invalid request + +`application/json` + +```ts +{ + title?: string + type?: string + status?: integer +} +``` + +- 401 Authentication failed + +`application/json` + +```ts +{ + title?: string + type?: string + status?: integer +} +``` + +- 404 Not Found + +`application/json` + +```ts +{ + message?: string + exception: { + type?: string + code?: integer + message?: string + file?: string + line?: integer + } +} +``` + +*** + +### [DELETE]/api/v2/ui/crackers/{id:[0-9]+}/relationships/{relation:tasks} + +- Security +bearerAuth + +#### RequestBody + +- application/json + +#### Responses + +- 204 successfully deleted + +- 400 Invalid request + +`application/json` + +```ts +{ + title?: string + type?: string + status?: integer +} +``` + +- 401 Authentication failed + +`application/json` + +```ts +{ + title?: string + type?: string + status?: integer +} +``` + +- 404 Not Found + +`application/json` + +```ts +{ + message?: string + exception: { + type?: string + code?: integer + message?: string + file?: string + line?: integer + } +} +``` + +*** + +### [GET]/api/v2/ui/crackers/{id:[0-9]+} + +- Description +GET request to retrieve a single object. + +- Security +bearerAuth + +#### Parameters(Query) + +```ts +include?: string +``` + +#### Responses + +- 200 successful operation + +`application/json` + +```ts +{ + jsonapi: { + version?: string //default: 1.1 + ext?: string //default: https://jsonapi.org/profiles/ethanresnick/cursor-pagination + } + links: { + self?: string //default: /api/v2/ui/crackers?page[size]=25 + first?: string //default: /api/v2/ui/crackers?page[size]=25&page[after]=0 + last?: string //default: /api/v2/ui/crackers?page[size]=25&page[before]=500 + next?: string //default: /api/v2/ui/crackers?page[size]=25&page[after]=25 + previous?: string //default: /api/v2/ui/crackers?page[size]=25&page[before]=25 + } + id?: integer + type?: string //default: CrackerBinary + data: { + crackerBinaryTypeId?: integer + version?: string + downloadUrl?: string + binaryName?: string + } + relationships: { + } + included: { + }[] +} +``` + +- 400 Invalid request + +`application/json` + +```ts +{ + title?: string + type?: string + status?: integer +} +``` + +- 401 Authentication failed + +`application/json` + +```ts +{ + title?: string + type?: string + status?: integer +} +``` + +- 404 Not Found + +`application/json` + +```ts +{ + message?: string + exception: { + type?: string + code?: integer + message?: string + file?: string + line?: integer + } +} +``` + +*** + +### [PATCH]/api/v2/ui/crackers/{id:[0-9]+} + +- Description +PATCH request to update attributes of a single object. + +- Security +bearerAuth + +#### RequestBody + +- application/json + +```ts +{ + data: { + type?: string + attributes: { + binaryName?: string + crackerBinaryTypeId?: integer + downloadUrl?: string + version?: string + } + } +} +``` + +#### Responses + +- 200 successful operation + +`application/json` + +```ts +{ + jsonapi: { + version?: string //default: 1.1 + ext?: string //default: https://jsonapi.org/profiles/ethanresnick/cursor-pagination + } + id?: integer + type?: string //default: CrackerBinary + data: { + crackerBinaryTypeId?: integer + version?: string + downloadUrl?: string + binaryName?: string + } +} +``` + +- 400 Invalid request + +`application/json` + +```ts +{ + title?: string + type?: string + status?: integer +} +``` + +- 401 Authentication failed + +`application/json` + +```ts +{ + title?: string + type?: string + status?: integer +} +``` + +- 404 Not Found + +`application/json` + +```ts +{ + message?: string + exception: { + type?: string + code?: integer + message?: string + file?: string + line?: integer + } +} +``` + +*** + +### [DELETE]/api/v2/ui/crackers/{id:[0-9]+} + +- Security +bearerAuth + +#### RequestBody + +- application/json + +#### Responses + +- 204 successfully deleted + +- 400 Invalid request + +`application/json` + +```ts +{ + title?: string + type?: string + status?: integer +} +``` + +- 401 Authentication failed + +`application/json` + +```ts +{ + title?: string + type?: string + status?: integer +} +``` + +- 404 Not Found + +`application/json` + +```ts +{ + message?: string + exception: { + type?: string + code?: integer + message?: string + file?: string + line?: integer + } +} +``` + +*** + +### [GET]/api/v2/ui/crackertypes + +- Description +GET many request to retrieve multiple objects. + +- Security +bearerAuth + +#### Parameters(Query) + +```ts +page[after]?: integer +``` + +```ts +page[before]?: integer +``` + +```ts +page[size]?: integer +``` + +```ts +filter: { +} +``` + +```ts +include?: string +``` + +#### Responses + +- 200 successful operation + +`application/json` + +```ts +{ + jsonapi: { + version?: string //default: 1.1 + ext?: string //default: https://jsonapi.org/profiles/ethanresnick/cursor-pagination + } + links: { + self?: string //default: /api/v2/ui/crackertypes?page[size]=25 + first?: string //default: /api/v2/ui/crackertypes?page[size]=25&page[after]=0 + last?: string //default: /api/v2/ui/crackertypes?page[size]=25&page[before]=500 + next?: string //default: /api/v2/ui/crackertypes?page[size]=25&page[after]=25 + previous?: string //default: /api/v2/ui/crackertypes?page[size]=25&page[before]=25 + } + id?: integer + type?: string //default: CrackerBinaryType + data: { + typeName?: string + isChunkingAvailable?: boolean + } + relationships: { + } + included: { + }[] +}[] +``` + +- 400 Invalid request + +`application/json` + +```ts +{ + title?: string + type?: string + status?: integer +} +``` + +- 401 Authentication failed + +`application/json` + +```ts +{ + title?: string + type?: string + status?: integer +} +``` + +*** + +### [POST]/api/v2/ui/crackertypes + +- Description +POST request to create a new object. The request must contain the resource record as data with the attributes of the new object.To add relationships, a relationships object can be added with the resource records of the relations that are part of this object. + +- Security +bearerAuth + +#### RequestBody + +- application/json + +```ts +{ + data: { + type?: string + attributes: { + typeName?: string + isChunkingAvailable?: boolean + } + } +} +``` + +#### Responses + +- 201 successful operation + +`application/json` + +```ts +{ + jsonapi: { + version?: string //default: 1.1 + ext?: string //default: https://jsonapi.org/profiles/ethanresnick/cursor-pagination + } + id?: integer + type?: string //default: CrackerBinaryType + data: { + typeName?: string + isChunkingAvailable?: boolean + } +} +``` + +- 400 Invalid request + +`application/json` + +```ts +{ + title?: string + type?: string + status?: integer +} +``` + +- 401 Authentication failed + +`application/json` + +```ts +{ + title?: string + type?: string + status?: integer +} +``` + +*** + +### [GET]/api/v2/ui/crackertypes/count + +- Description +GET many request to retrieve multiple objects. + +- Security +bearerAuth + +#### Parameters(Query) + +```ts +page[after]?: integer +``` + +```ts +page[before]?: integer +``` + +```ts +page[size]?: integer +``` + +```ts +filter: { +} +``` + +```ts +include?: string +``` + +#### Responses + +- 200 successful operation + +`application/json` + +```ts +{ + jsonapi: { + version?: string //default: 1.1 + ext?: string //default: https://jsonapi.org/profiles/ethanresnick/cursor-pagination + } + links: { + self?: string //default: /api/v2/ui/crackertypes?page[size]=25 + first?: string //default: /api/v2/ui/crackertypes?page[size]=25&page[after]=0 + last?: string //default: /api/v2/ui/crackertypes?page[size]=25&page[before]=500 + next?: string //default: /api/v2/ui/crackertypes?page[size]=25&page[after]=25 + previous?: string //default: /api/v2/ui/crackertypes?page[size]=25&page[before]=25 + } + id?: integer + type?: string //default: CrackerBinaryType + data: { + typeName?: string + isChunkingAvailable?: boolean + } + relationships: { + } + included: { + }[] +}[] +``` + +- 400 Invalid request + +`application/json` + +```ts +{ + title?: string + type?: string + status?: integer +} +``` + +- 401 Authentication failed + +`application/json` + +```ts +{ + title?: string + type?: string + status?: integer +} +``` + +*** + +### [GET]/api/v2/ui/crackertypes/{id:[0-9]+}/{relation:crackerVersions} + +- Description +GET request for for a to-one relationship link. Returns the resource record of the object that is part of the specified relation. + +- Security +bearerAuth + +#### Parameters(Query) + +```ts +include?: string +``` + +#### Responses + +- 200 successful operation + +`application/json` + +```ts +{ + jsonapi: { + version?: string //default: 1.1 + ext?: string //default: https://jsonapi.org/profiles/ethanresnick/cursor-pagination + } + links: { + self?: string //default: /api/v2/ui/crackertypes?page[size]=25 + first?: string //default: /api/v2/ui/crackertypes?page[size]=25&page[after]=0 + last?: string //default: /api/v2/ui/crackertypes?page[size]=25&page[before]=500 + next?: string //default: /api/v2/ui/crackertypes?page[size]=25&page[after]=25 + previous?: string //default: /api/v2/ui/crackertypes?page[size]=25&page[before]=25 + } + id?: integer + type?: string //default: CrackerBinaryType + data: { + typeName?: string + isChunkingAvailable?: boolean + } + relationships: { + } + included: { + }[] +} +``` + +- 400 Invalid request + +`application/json` + +```ts +{ + title?: string + type?: string + status?: integer +} +``` + +- 401 Authentication failed + +`application/json` + +```ts +{ + title?: string + type?: string + status?: integer +} +``` + +- 404 Not Found + +`application/json` + +```ts +{ + message?: string + exception: { + type?: string + code?: integer + message?: string + file?: string + line?: integer + } +} +``` + +*** + +### [GET]/api/v2/ui/crackertypes/{id:[0-9]+}/relationships/{relation:crackerVersions} + +- Description +GET request for for a to-one relationship link. Returns the resource record of the object that is part of the specified relation. + +- Security +bearerAuth + +#### Parameters(Query) + +```ts +include?: string +``` + +#### Responses + +- 200 successful operation + +`application/json` + +```ts +{ + jsonapi: { + version?: string //default: 1.1 + ext?: string //default: https://jsonapi.org/profiles/ethanresnick/cursor-pagination + } + links: { + self?: string //default: /api/v2/ui/crackertypes?page[size]=25 + first?: string //default: /api/v2/ui/crackertypes?page[size]=25&page[after]=0 + last?: string //default: /api/v2/ui/crackertypes?page[size]=25&page[before]=500 + next?: string //default: /api/v2/ui/crackertypes?page[size]=25&page[after]=25 + previous?: string //default: /api/v2/ui/crackertypes?page[size]=25&page[before]=25 + } + id?: integer + type?: string //default: CrackerBinaryType + data: { + typeName?: string + isChunkingAvailable?: boolean + } + relationships: { + } + included: { + }[] +} +``` + +- 400 Invalid request + +`application/json` + +```ts +{ + title?: string + type?: string + status?: integer +} +``` + +- 401 Authentication failed + +`application/json` + +```ts +{ + title?: string + type?: string + status?: integer +} +``` + +- 404 Not Found + +`application/json` + +```ts +{ + message?: string + exception: { + type?: string + code?: integer + message?: string + file?: string + line?: integer + } +} +``` + +*** + +### [PATCH]/api/v2/ui/crackertypes/{id:[0-9]+}/relationships/{relation:crackerVersions} + +- Security +bearerAuth + +#### RequestBody + +- application/json + +```ts +{ + data: { + type?: string + attributes: { + isChunkingAvailable?: boolean + typeName?: string + } + } +} +``` + +#### Responses + +- 200 successful operation + +`application/json` + +```ts +{ + jsonapi: { + version?: string //default: 1.1 + ext?: string //default: https://jsonapi.org/profiles/ethanresnick/cursor-pagination + } + id?: integer + type?: string //default: CrackerBinaryType + data: { + typeName?: string + isChunkingAvailable?: boolean + } +} +``` + +- 400 Invalid request + +`application/json` + +```ts +{ + title?: string + type?: string + status?: integer +} +``` + +- 401 Authentication failed + +`application/json` + +```ts +{ + title?: string + type?: string + status?: integer +} +``` + +- 404 Not Found + +`application/json` + +```ts +{ + message?: string + exception: { + type?: string + code?: integer + message?: string + file?: string + line?: integer + } +} +``` + +*** + +### [POST]/api/v2/ui/crackertypes/{id:[0-9]+}/relationships/{relation:crackerVersions} + +- Security +bearerAuth + +#### RequestBody + +- application/json + +#### Responses + +- 204 successfully created + +- 400 Invalid request + +`application/json` + +```ts +{ + title?: string + type?: string + status?: integer +} +``` + +- 401 Authentication failed + +`application/json` + +```ts +{ + title?: string + type?: string + status?: integer +} +``` + +- 404 Not Found + +`application/json` + +```ts +{ + message?: string + exception: { + type?: string + code?: integer + message?: string + file?: string + line?: integer + } +} +``` + +*** + +### [DELETE]/api/v2/ui/crackertypes/{id:[0-9]+}/relationships/{relation:crackerVersions} + +- Security +bearerAuth + +#### RequestBody + +- application/json + +#### Responses + +- 204 successfully deleted + +- 400 Invalid request + +`application/json` + +```ts +{ + title?: string + type?: string + status?: integer +} +``` + +- 401 Authentication failed + +`application/json` + +```ts +{ + title?: string + type?: string + status?: integer +} +``` + +- 404 Not Found + +`application/json` + +```ts +{ + message?: string + exception: { + type?: string + code?: integer + message?: string + file?: string + line?: integer + } +} +``` + +*** + +### [GET]/api/v2/ui/crackertypes/{id:[0-9]+}/{relation:tasks} + +- Description +GET request for for a to-one relationship link. Returns the resource record of the object that is part of the specified relation. + +- Security +bearerAuth + +#### Parameters(Query) + +```ts +include?: string +``` + +#### Responses + +- 200 successful operation + +`application/json` + +```ts +{ + jsonapi: { + version?: string //default: 1.1 + ext?: string //default: https://jsonapi.org/profiles/ethanresnick/cursor-pagination + } + links: { + self?: string //default: /api/v2/ui/crackertypes?page[size]=25 + first?: string //default: /api/v2/ui/crackertypes?page[size]=25&page[after]=0 + last?: string //default: /api/v2/ui/crackertypes?page[size]=25&page[before]=500 + next?: string //default: /api/v2/ui/crackertypes?page[size]=25&page[after]=25 + previous?: string //default: /api/v2/ui/crackertypes?page[size]=25&page[before]=25 + } + id?: integer + type?: string //default: CrackerBinaryType + data: { + typeName?: string + isChunkingAvailable?: boolean + } + relationships: { + } + included: { + }[] +} +``` + +- 400 Invalid request + +`application/json` + +```ts +{ + title?: string + type?: string + status?: integer +} +``` + +- 401 Authentication failed + +`application/json` + +```ts +{ + title?: string + type?: string + status?: integer +} +``` + +- 404 Not Found + +`application/json` + +```ts +{ + message?: string + exception: { + type?: string + code?: integer + message?: string + file?: string + line?: integer + } +} +``` + +*** + +### [GET]/api/v2/ui/crackertypes/{id:[0-9]+}/relationships/{relation:tasks} + +- Description +GET request for for a to-one relationship link. Returns the resource record of the object that is part of the specified relation. + +- Security +bearerAuth + +#### Parameters(Query) + +```ts +include?: string +``` + +#### Responses + +- 200 successful operation + +`application/json` + +```ts +{ + jsonapi: { + version?: string //default: 1.1 + ext?: string //default: https://jsonapi.org/profiles/ethanresnick/cursor-pagination + } + links: { + self?: string //default: /api/v2/ui/crackertypes?page[size]=25 + first?: string //default: /api/v2/ui/crackertypes?page[size]=25&page[after]=0 + last?: string //default: /api/v2/ui/crackertypes?page[size]=25&page[before]=500 + next?: string //default: /api/v2/ui/crackertypes?page[size]=25&page[after]=25 + previous?: string //default: /api/v2/ui/crackertypes?page[size]=25&page[before]=25 + } + id?: integer + type?: string //default: CrackerBinaryType + data: { + typeName?: string + isChunkingAvailable?: boolean + } + relationships: { + } + included: { + }[] +} +``` + +- 400 Invalid request + +`application/json` + +```ts +{ + title?: string + type?: string + status?: integer +} +``` + +- 401 Authentication failed + +`application/json` + +```ts +{ + title?: string + type?: string + status?: integer +} +``` + +- 404 Not Found + +`application/json` + +```ts +{ + message?: string + exception: { + type?: string + code?: integer + message?: string + file?: string + line?: integer + } +} +``` + +*** + +### [PATCH]/api/v2/ui/crackertypes/{id:[0-9]+}/relationships/{relation:tasks} + +- Security +bearerAuth + +#### RequestBody + +- application/json + +```ts +{ + data: { + type?: string + attributes: { + isChunkingAvailable?: boolean + typeName?: string + } + } +} +``` + +#### Responses + +- 200 successful operation + +`application/json` + +```ts +{ + jsonapi: { + version?: string //default: 1.1 + ext?: string //default: https://jsonapi.org/profiles/ethanresnick/cursor-pagination + } + id?: integer + type?: string //default: CrackerBinaryType + data: { + typeName?: string + isChunkingAvailable?: boolean + } +} +``` + +- 400 Invalid request + +`application/json` + +```ts +{ + title?: string + type?: string + status?: integer +} +``` + +- 401 Authentication failed + +`application/json` + +```ts +{ + title?: string + type?: string + status?: integer +} +``` + +- 404 Not Found + +`application/json` + +```ts +{ + message?: string + exception: { + type?: string + code?: integer + message?: string + file?: string + line?: integer + } +} +``` + +*** + +### [POST]/api/v2/ui/crackertypes/{id:[0-9]+}/relationships/{relation:tasks} + +- Security +bearerAuth + +#### RequestBody + +- application/json + +#### Responses + +- 204 successfully created + +- 400 Invalid request + +`application/json` + +```ts +{ + title?: string + type?: string + status?: integer +} +``` + +- 401 Authentication failed + +`application/json` + +```ts +{ + title?: string + type?: string + status?: integer +} +``` + +- 404 Not Found + +`application/json` + +```ts +{ + message?: string + exception: { + type?: string + code?: integer + message?: string + file?: string + line?: integer + } +} +``` + +*** + +### [DELETE]/api/v2/ui/crackertypes/{id:[0-9]+}/relationships/{relation:tasks} + +- Security +bearerAuth + +#### RequestBody + +- application/json + +#### Responses + +- 204 successfully deleted + +- 400 Invalid request + +`application/json` + +```ts +{ + title?: string + type?: string + status?: integer +} +``` + +- 401 Authentication failed + +`application/json` + +```ts +{ + title?: string + type?: string + status?: integer +} +``` + +- 404 Not Found + +`application/json` + +```ts +{ + message?: string + exception: { + type?: string + code?: integer + message?: string + file?: string + line?: integer + } +} +``` + +*** + +### [GET]/api/v2/ui/crackertypes/{id:[0-9]+} + +- Description +GET request to retrieve a single object. + +- Security +bearerAuth + +#### Parameters(Query) + +```ts +include?: string +``` + +#### Responses + +- 200 successful operation + +`application/json` + +```ts +{ + jsonapi: { + version?: string //default: 1.1 + ext?: string //default: https://jsonapi.org/profiles/ethanresnick/cursor-pagination + } + links: { + self?: string //default: /api/v2/ui/crackertypes?page[size]=25 + first?: string //default: /api/v2/ui/crackertypes?page[size]=25&page[after]=0 + last?: string //default: /api/v2/ui/crackertypes?page[size]=25&page[before]=500 + next?: string //default: /api/v2/ui/crackertypes?page[size]=25&page[after]=25 + previous?: string //default: /api/v2/ui/crackertypes?page[size]=25&page[before]=25 + } + id?: integer + type?: string //default: CrackerBinaryType + data: { + typeName?: string + isChunkingAvailable?: boolean + } + relationships: { + } + included: { + }[] +} +``` + +- 400 Invalid request + +`application/json` + +```ts +{ + title?: string + type?: string + status?: integer +} +``` + +- 401 Authentication failed + +`application/json` + +```ts +{ + title?: string + type?: string + status?: integer +} +``` + +- 404 Not Found + +`application/json` + +```ts +{ + message?: string + exception: { + type?: string + code?: integer + message?: string + file?: string + line?: integer + } +} +``` + +*** + +### [PATCH]/api/v2/ui/crackertypes/{id:[0-9]+} + +- Description +PATCH request to update attributes of a single object. + +- Security +bearerAuth + +#### RequestBody + +- application/json + +```ts +{ + data: { + type?: string + attributes: { + isChunkingAvailable?: boolean + typeName?: string + } + } +} +``` + +#### Responses + +- 200 successful operation + +`application/json` + +```ts +{ + jsonapi: { + version?: string //default: 1.1 + ext?: string //default: https://jsonapi.org/profiles/ethanresnick/cursor-pagination + } + id?: integer + type?: string //default: CrackerBinaryType + data: { + typeName?: string + isChunkingAvailable?: boolean + } +} +``` + +- 400 Invalid request + +`application/json` + +```ts +{ + title?: string + type?: string + status?: integer +} +``` + +- 401 Authentication failed + +`application/json` + +```ts +{ + title?: string + type?: string + status?: integer +} +``` + +- 404 Not Found + +`application/json` + +```ts +{ + message?: string + exception: { + type?: string + code?: integer + message?: string + file?: string + line?: integer + } +} +``` + +*** + +### [DELETE]/api/v2/ui/crackertypes/{id:[0-9]+} + +- Security +bearerAuth + +#### RequestBody + +- application/json + +#### Responses + +- 204 successfully deleted + +- 400 Invalid request + +`application/json` + +```ts +{ + title?: string + type?: string + status?: integer +} +``` + +- 401 Authentication failed + +`application/json` + +```ts +{ + title?: string + type?: string + status?: integer +} +``` + +- 404 Not Found + +`application/json` + +```ts +{ + message?: string + exception: { + type?: string + code?: integer + message?: string + file?: string + line?: integer + } +} +``` + +*** + +### [GET]/api/v2/ui/files + +- Description +GET many request to retrieve multiple objects. + +- Security +bearerAuth + +#### Parameters(Query) + +```ts +page[after]?: integer +``` + +```ts +page[before]?: integer +``` + +```ts +page[size]?: integer +``` + +```ts +filter: { +} +``` + +```ts +include?: string +``` + +#### Responses + +- 200 successful operation + +`application/json` + +```ts +{ + jsonapi: { + version?: string //default: 1.1 + ext?: string //default: https://jsonapi.org/profiles/ethanresnick/cursor-pagination + } + links: { + self?: string //default: /api/v2/ui/files?page[size]=25 + first?: string //default: /api/v2/ui/files?page[size]=25&page[after]=0 + last?: string //default: /api/v2/ui/files?page[size]=25&page[before]=500 + next?: string //default: /api/v2/ui/files?page[size]=25&page[after]=25 + previous?: string //default: /api/v2/ui/files?page[size]=25&page[before]=25 + } + id?: integer + type?: string //default: File + data: { + filename?: string + size?: integer + isSecret?: boolean + fileType?: integer + accessGroupId?: integer + lineCount?: integer + } + relationships: { + } + included: { + }[] +}[] +``` + +- 400 Invalid request + +`application/json` + +```ts +{ + title?: string + type?: string + status?: integer +} +``` + +- 401 Authentication failed + +`application/json` + +```ts +{ + title?: string + type?: string + status?: integer +} +``` + +*** + +### [POST]/api/v2/ui/files + +- Description +POST request to create a new object. The request must contain the resource record as data with the attributes of the new object.To add relationships, a relationships object can be added with the resource records of the relations that are part of this object. + +- Security +bearerAuth + +#### RequestBody + +- application/json + +```ts +{ + data: { + type?: string + attributes: { + sourceType?: string + sourceData?: string + filename?: string + size?: integer + isSecret?: boolean + fileType?: integer + accessGroupId?: integer + lineCount?: integer + } + } +} +``` + +#### Responses + +- 201 successful operation + +`application/json` + +```ts +{ + jsonapi: { + version?: string //default: 1.1 + ext?: string //default: https://jsonapi.org/profiles/ethanresnick/cursor-pagination + } + id?: integer + type?: string //default: File + data: { + filename?: string + size?: integer + isSecret?: boolean + fileType?: integer + accessGroupId?: integer + lineCount?: integer + } +} +``` + +- 400 Invalid request + +`application/json` + +```ts +{ + title?: string + type?: string + status?: integer +} +``` + +- 401 Authentication failed + +`application/json` + +```ts +{ + title?: string + type?: string + status?: integer +} +``` + +*** + +### [GET]/api/v2/ui/files/count + +- Description +GET many request to retrieve multiple objects. + +- Security +bearerAuth + +#### Parameters(Query) + +```ts +page[after]?: integer +``` + +```ts +page[before]?: integer +``` + +```ts +page[size]?: integer +``` + +```ts +filter: { +} +``` + +```ts +include?: string +``` + +#### Responses + +- 200 successful operation + +`application/json` + +```ts +{ + jsonapi: { + version?: string //default: 1.1 + ext?: string //default: https://jsonapi.org/profiles/ethanresnick/cursor-pagination + } + links: { + self?: string //default: /api/v2/ui/files?page[size]=25 + first?: string //default: /api/v2/ui/files?page[size]=25&page[after]=0 + last?: string //default: /api/v2/ui/files?page[size]=25&page[before]=500 + next?: string //default: /api/v2/ui/files?page[size]=25&page[after]=25 + previous?: string //default: /api/v2/ui/files?page[size]=25&page[before]=25 + } + id?: integer + type?: string //default: File + data: { + filename?: string + size?: integer + isSecret?: boolean + fileType?: integer + accessGroupId?: integer + lineCount?: integer + } + relationships: { + } + included: { + }[] +}[] +``` + +- 400 Invalid request + +`application/json` + +```ts +{ + title?: string + type?: string + status?: integer +} +``` + +- 401 Authentication failed + +`application/json` + +```ts +{ + title?: string + type?: string + status?: integer +} +``` + +*** + +### [GET]/api/v2/ui/files/{id:[0-9]+}/{relation:accessGroup} + +- Description +GET request for for a to-one relationship link. Returns the resource record of the object that is part of the specified relation. + +- Security +bearerAuth + +#### Parameters(Query) + +```ts +include?: string +``` + +#### Responses + +- 200 successful operation + +`application/json` + +```ts +{ + jsonapi: { + version?: string //default: 1.1 + ext?: string //default: https://jsonapi.org/profiles/ethanresnick/cursor-pagination + } + links: { + self?: string //default: /api/v2/ui/files?page[size]=25 + first?: string //default: /api/v2/ui/files?page[size]=25&page[after]=0 + last?: string //default: /api/v2/ui/files?page[size]=25&page[before]=500 + next?: string //default: /api/v2/ui/files?page[size]=25&page[after]=25 + previous?: string //default: /api/v2/ui/files?page[size]=25&page[before]=25 + } + id?: integer + type?: string //default: File + data: { + filename?: string + size?: integer + isSecret?: boolean + fileType?: integer + accessGroupId?: integer + lineCount?: integer + } + relationships: { + } + included: { + }[] +} +``` + +- 400 Invalid request + +`application/json` + +```ts +{ + title?: string + type?: string + status?: integer +} +``` + +- 401 Authentication failed + +`application/json` + +```ts +{ + title?: string + type?: string + status?: integer +} +``` + +- 404 Not Found + +`application/json` + +```ts +{ + message?: string + exception: { + type?: string + code?: integer + message?: string + file?: string + line?: integer + } +} +``` + +*** + +### [GET]/api/v2/ui/files/{id:[0-9]+}/relationships/{relation:accessGroup} + +- Description +GET request for for a to-one relationship link. Returns the resource record of the object that is part of the specified relation. + +- Security +bearerAuth + +#### Parameters(Query) + +```ts +include?: string +``` + +#### Responses + +- 200 successful operation + +`application/json` + +```ts +{ + jsonapi: { + version?: string //default: 1.1 + ext?: string //default: https://jsonapi.org/profiles/ethanresnick/cursor-pagination + } + links: { + self?: string //default: /api/v2/ui/files?page[size]=25 + first?: string //default: /api/v2/ui/files?page[size]=25&page[after]=0 + last?: string //default: /api/v2/ui/files?page[size]=25&page[before]=500 + next?: string //default: /api/v2/ui/files?page[size]=25&page[after]=25 + previous?: string //default: /api/v2/ui/files?page[size]=25&page[before]=25 + } + id?: integer + type?: string //default: File + data: { + filename?: string + size?: integer + isSecret?: boolean + fileType?: integer + accessGroupId?: integer + lineCount?: integer + } + relationships: { + } + included: { + }[] +} +``` + +- 400 Invalid request + +`application/json` + +```ts +{ + title?: string + type?: string + status?: integer +} +``` + +- 401 Authentication failed + +`application/json` + +```ts +{ + title?: string + type?: string + status?: integer +} +``` + +- 404 Not Found + +`application/json` + +```ts +{ + message?: string + exception: { + type?: string + code?: integer + message?: string + file?: string + line?: integer + } +} +``` + +*** + +### [PATCH]/api/v2/ui/files/{id:[0-9]+}/relationships/{relation:accessGroup} + +- Security +bearerAuth + +#### RequestBody + +- application/json + +```ts +{ + data: { + type?: string + attributes: { + accessGroupId?: integer + fileType?: integer + filename?: string + isSecret?: boolean + } + } +} +``` + +#### Responses + +- 200 successful operation + +`application/json` + +```ts +{ + jsonapi: { + version?: string //default: 1.1 + ext?: string //default: https://jsonapi.org/profiles/ethanresnick/cursor-pagination + } + id?: integer + type?: string //default: File + data: { + filename?: string + size?: integer + isSecret?: boolean + fileType?: integer + accessGroupId?: integer + lineCount?: integer + } +} +``` + +- 400 Invalid request + +`application/json` + +```ts +{ + title?: string + type?: string + status?: integer +} +``` + +- 401 Authentication failed + +`application/json` + +```ts +{ + title?: string + type?: string + status?: integer +} +``` + +- 404 Not Found + +`application/json` + +```ts +{ + message?: string + exception: { + type?: string + code?: integer + message?: string + file?: string + line?: integer + } +} +``` + +*** + +### [GET]/api/v2/ui/files/{id:[0-9]+} + +- Description +GET request to retrieve a single object. + +- Security +bearerAuth + +#### Parameters(Query) + +```ts +include?: string +``` + +#### Responses + +- 200 successful operation + +`application/json` + +```ts +{ + jsonapi: { + version?: string //default: 1.1 + ext?: string //default: https://jsonapi.org/profiles/ethanresnick/cursor-pagination + } + links: { + self?: string //default: /api/v2/ui/files?page[size]=25 + first?: string //default: /api/v2/ui/files?page[size]=25&page[after]=0 + last?: string //default: /api/v2/ui/files?page[size]=25&page[before]=500 + next?: string //default: /api/v2/ui/files?page[size]=25&page[after]=25 + previous?: string //default: /api/v2/ui/files?page[size]=25&page[before]=25 + } + id?: integer + type?: string //default: File + data: { + filename?: string + size?: integer + isSecret?: boolean + fileType?: integer + accessGroupId?: integer + lineCount?: integer + } + relationships: { + } + included: { + }[] +} +``` + +- 400 Invalid request + +`application/json` + +```ts +{ + title?: string + type?: string + status?: integer +} +``` + +- 401 Authentication failed + +`application/json` + +```ts +{ + title?: string + type?: string + status?: integer +} +``` + +- 404 Not Found + +`application/json` + +```ts +{ + message?: string + exception: { + type?: string + code?: integer + message?: string + file?: string + line?: integer + } +} +``` + +*** + +### [PATCH]/api/v2/ui/files/{id:[0-9]+} + +- Description +PATCH request to update attributes of a single object. + +- Security +bearerAuth + +#### RequestBody + +- application/json + +```ts +{ + data: { + type?: string + attributes: { + accessGroupId?: integer + fileType?: integer + filename?: string + isSecret?: boolean + } + } +} +``` + +#### Responses + +- 200 successful operation + +`application/json` + +```ts +{ + jsonapi: { + version?: string //default: 1.1 + ext?: string //default: https://jsonapi.org/profiles/ethanresnick/cursor-pagination + } + id?: integer + type?: string //default: File + data: { + filename?: string + size?: integer + isSecret?: boolean + fileType?: integer + accessGroupId?: integer + lineCount?: integer + } +} +``` + +- 400 Invalid request + +`application/json` + +```ts +{ + title?: string + type?: string + status?: integer +} +``` + +- 401 Authentication failed + +`application/json` + +```ts +{ + title?: string + type?: string + status?: integer +} +``` + +- 404 Not Found + +`application/json` + +```ts +{ + message?: string + exception: { + type?: string + code?: integer + message?: string + file?: string + line?: integer + } +} +``` + +*** + +### [DELETE]/api/v2/ui/files/{id:[0-9]+} + +- Security +bearerAuth + +#### RequestBody + +- application/json + +#### Responses + +- 204 successfully deleted + +- 400 Invalid request + +`application/json` + +```ts +{ + title?: string + type?: string + status?: integer +} +``` + +- 401 Authentication failed + +`application/json` + +```ts +{ + title?: string + type?: string + status?: integer +} +``` + +- 404 Not Found + +`application/json` + +```ts +{ + message?: string + exception: { + type?: string + code?: integer + message?: string + file?: string + line?: integer + } +} +``` + +*** + +### [GET]/api/v2/ui/globalpermissiongroups + +- Description +GET many request to retrieve multiple objects. + +- Security +bearerAuth + +#### Parameters(Query) + +```ts +page[after]?: integer +``` + +```ts +page[before]?: integer +``` + +```ts +page[size]?: integer +``` + +```ts +filter: { +} +``` + +```ts +include?: string +``` + +#### Responses + +- 200 successful operation + +`application/json` + +```ts +{ + jsonapi: { + version?: string //default: 1.1 + ext?: string //default: https://jsonapi.org/profiles/ethanresnick/cursor-pagination + } + links: { + self?: string //default: /api/v2/ui/globalpermissiongroups?page[size]=25 + first?: string //default: /api/v2/ui/globalpermissiongroups?page[size]=25&page[after]=0 + last?: string //default: /api/v2/ui/globalpermissiongroups?page[size]=25&page[before]=500 + next?: string //default: /api/v2/ui/globalpermissiongroups?page[size]=25&page[after]=25 + previous?: string //default: /api/v2/ui/globalpermissiongroups?page[size]=25&page[before]=25 + } + id?: integer + type?: string //default: RightGroup + data: { + name?: string + permissions: { + } + } + relationships: { + } + included: { + }[] +}[] +``` + +- 400 Invalid request + +`application/json` + +```ts +{ + title?: string + type?: string + status?: integer +} +``` + +- 401 Authentication failed + +`application/json` + +```ts +{ + title?: string + type?: string + status?: integer +} +``` + +*** + +### [POST]/api/v2/ui/globalpermissiongroups + +- Description +POST request to create a new object. The request must contain the resource record as data with the attributes of the new object.To add relationships, a relationships object can be added with the resource records of the relations that are part of this object. + +- Security +bearerAuth + +#### RequestBody + +- application/json + +```ts +{ + data: { + type?: string + attributes: { + name?: string + permissions: { + } + } + } +} +``` + +#### Responses + +- 201 successful operation + +`application/json` + +```ts +{ + jsonapi: { + version?: string //default: 1.1 + ext?: string //default: https://jsonapi.org/profiles/ethanresnick/cursor-pagination + } + id?: integer + type?: string //default: RightGroup + data: { + name?: string + permissions: { + } + } +} +``` + +- 400 Invalid request + +`application/json` + +```ts +{ + title?: string + type?: string + status?: integer +} +``` + +- 401 Authentication failed + +`application/json` + +```ts +{ + title?: string + type?: string + status?: integer +} +``` + +*** + +### [GET]/api/v2/ui/globalpermissiongroups/count + +- Description +GET many request to retrieve multiple objects. + +- Security +bearerAuth + +#### Parameters(Query) + +```ts +page[after]?: integer +``` + +```ts +page[before]?: integer +``` + +```ts +page[size]?: integer +``` + +```ts +filter: { +} +``` + +```ts +include?: string +``` + +#### Responses + +- 200 successful operation + +`application/json` + +```ts +{ + jsonapi: { + version?: string //default: 1.1 + ext?: string //default: https://jsonapi.org/profiles/ethanresnick/cursor-pagination + } + links: { + self?: string //default: /api/v2/ui/globalpermissiongroups?page[size]=25 + first?: string //default: /api/v2/ui/globalpermissiongroups?page[size]=25&page[after]=0 + last?: string //default: /api/v2/ui/globalpermissiongroups?page[size]=25&page[before]=500 + next?: string //default: /api/v2/ui/globalpermissiongroups?page[size]=25&page[after]=25 + previous?: string //default: /api/v2/ui/globalpermissiongroups?page[size]=25&page[before]=25 + } + id?: integer + type?: string //default: RightGroup + data: { + name?: string + permissions: { + } + } + relationships: { + } + included: { + }[] +}[] +``` + +- 400 Invalid request + +`application/json` + +```ts +{ + title?: string + type?: string + status?: integer +} +``` + +- 401 Authentication failed + +`application/json` + +```ts +{ + title?: string + type?: string + status?: integer +} +``` + +*** + +### [GET]/api/v2/ui/globalpermissiongroups/{id:[0-9]+}/{relation:userMembers} + +- Description +GET request for for a to-one relationship link. Returns the resource record of the object that is part of the specified relation. + +- Security +bearerAuth + +#### Parameters(Query) + +```ts +include?: string +``` + +#### Responses + +- 200 successful operation + +`application/json` + +```ts +{ + jsonapi: { + version?: string //default: 1.1 + ext?: string //default: https://jsonapi.org/profiles/ethanresnick/cursor-pagination + } + links: { + self?: string //default: /api/v2/ui/globalpermissiongroups?page[size]=25 + first?: string //default: /api/v2/ui/globalpermissiongroups?page[size]=25&page[after]=0 + last?: string //default: /api/v2/ui/globalpermissiongroups?page[size]=25&page[before]=500 + next?: string //default: /api/v2/ui/globalpermissiongroups?page[size]=25&page[after]=25 + previous?: string //default: /api/v2/ui/globalpermissiongroups?page[size]=25&page[before]=25 + } + id?: integer + type?: string //default: RightGroup + data: { + name?: string + permissions: { + } + } + relationships: { + } + included: { + }[] +} +``` + +- 400 Invalid request + +`application/json` + +```ts +{ + title?: string + type?: string + status?: integer +} +``` + +- 401 Authentication failed + +`application/json` + +```ts +{ + title?: string + type?: string + status?: integer +} +``` + +- 404 Not Found + +`application/json` + +```ts +{ + message?: string + exception: { + type?: string + code?: integer + message?: string + file?: string + line?: integer + } +} +``` + +*** + +### [GET]/api/v2/ui/globalpermissiongroups/{id:[0-9]+}/relationships/{relation:userMembers} + +- Description +GET request for for a to-one relationship link. Returns the resource record of the object that is part of the specified relation. + +- Security +bearerAuth + +#### Parameters(Query) + +```ts +include?: string +``` + +#### Responses + +- 200 successful operation + +`application/json` + +```ts +{ + jsonapi: { + version?: string //default: 1.1 + ext?: string //default: https://jsonapi.org/profiles/ethanresnick/cursor-pagination + } + links: { + self?: string //default: /api/v2/ui/globalpermissiongroups?page[size]=25 + first?: string //default: /api/v2/ui/globalpermissiongroups?page[size]=25&page[after]=0 + last?: string //default: /api/v2/ui/globalpermissiongroups?page[size]=25&page[before]=500 + next?: string //default: /api/v2/ui/globalpermissiongroups?page[size]=25&page[after]=25 + previous?: string //default: /api/v2/ui/globalpermissiongroups?page[size]=25&page[before]=25 + } + id?: integer + type?: string //default: RightGroup + data: { + name?: string + permissions: { + } + } + relationships: { + } + included: { + }[] +} +``` + +- 400 Invalid request + +`application/json` + +```ts +{ + title?: string + type?: string + status?: integer +} +``` + +- 401 Authentication failed + +`application/json` + +```ts +{ + title?: string + type?: string + status?: integer +} +``` + +- 404 Not Found + +`application/json` + +```ts +{ + message?: string + exception: { + type?: string + code?: integer + message?: string + file?: string + line?: integer + } +} +``` + +*** + +### [PATCH]/api/v2/ui/globalpermissiongroups/{id:[0-9]+}/relationships/{relation:userMembers} + +- Security +bearerAuth + +#### RequestBody + +- application/json + +```ts +{ + data: { + type?: string + attributes: { + name?: string + permissions: { + } + } + } +} +``` + +#### Responses + +- 200 successful operation + +`application/json` + +```ts +{ + jsonapi: { + version?: string //default: 1.1 + ext?: string //default: https://jsonapi.org/profiles/ethanresnick/cursor-pagination + } + id?: integer + type?: string //default: RightGroup + data: { + name?: string + permissions: { + } + } +} +``` + +- 400 Invalid request + +`application/json` + +```ts +{ + title?: string + type?: string + status?: integer +} +``` + +- 401 Authentication failed + +`application/json` + +```ts +{ + title?: string + type?: string + status?: integer +} +``` + +- 404 Not Found + +`application/json` + +```ts +{ + message?: string + exception: { + type?: string + code?: integer + message?: string + file?: string + line?: integer + } +} +``` + +*** + +### [POST]/api/v2/ui/globalpermissiongroups/{id:[0-9]+}/relationships/{relation:userMembers} + +- Security +bearerAuth + +#### RequestBody + +- application/json + +#### Responses + +- 204 successfully created + +- 400 Invalid request + +`application/json` + +```ts +{ + title?: string + type?: string + status?: integer +} +``` + +- 401 Authentication failed + +`application/json` + +```ts +{ + title?: string + type?: string + status?: integer +} +``` + +- 404 Not Found + +`application/json` + +```ts +{ + message?: string + exception: { + type?: string + code?: integer + message?: string + file?: string + line?: integer + } +} +``` + +*** + +### [DELETE]/api/v2/ui/globalpermissiongroups/{id:[0-9]+}/relationships/{relation:userMembers} + +- Security +bearerAuth + +#### RequestBody + +- application/json + +#### Responses + +- 204 successfully deleted + +- 400 Invalid request + +`application/json` + +```ts +{ + title?: string + type?: string + status?: integer +} +``` + +- 401 Authentication failed + +`application/json` + +```ts +{ + title?: string + type?: string + status?: integer +} +``` + +- 404 Not Found + +`application/json` + +```ts +{ + message?: string + exception: { + type?: string + code?: integer + message?: string + file?: string + line?: integer + } +} +``` + +*** + +### [GET]/api/v2/ui/globalpermissiongroups/{id:[0-9]+} + +- Description +GET request to retrieve a single object. + +- Security +bearerAuth + +#### Parameters(Query) + +```ts +include?: string +``` + +#### Responses + +- 200 successful operation + +`application/json` + +```ts +{ + jsonapi: { + version?: string //default: 1.1 + ext?: string //default: https://jsonapi.org/profiles/ethanresnick/cursor-pagination + } + links: { + self?: string //default: /api/v2/ui/globalpermissiongroups?page[size]=25 + first?: string //default: /api/v2/ui/globalpermissiongroups?page[size]=25&page[after]=0 + last?: string //default: /api/v2/ui/globalpermissiongroups?page[size]=25&page[before]=500 + next?: string //default: /api/v2/ui/globalpermissiongroups?page[size]=25&page[after]=25 + previous?: string //default: /api/v2/ui/globalpermissiongroups?page[size]=25&page[before]=25 + } + id?: integer + type?: string //default: RightGroup + data: { + name?: string + permissions: { + } + } + relationships: { + } + included: { + }[] +} +``` + +- 400 Invalid request + +`application/json` + +```ts +{ + title?: string + type?: string + status?: integer +} +``` + +- 401 Authentication failed + +`application/json` + +```ts +{ + title?: string + type?: string + status?: integer +} +``` + +- 404 Not Found + +`application/json` + +```ts +{ + message?: string + exception: { + type?: string + code?: integer + message?: string + file?: string + line?: integer + } +} +``` + +*** + +### [PATCH]/api/v2/ui/globalpermissiongroups/{id:[0-9]+} + +- Description +PATCH request to update attributes of a single object. + +- Security +bearerAuth + +#### RequestBody + +- application/json + +```ts +{ + data: { + type?: string + attributes: { + name?: string + permissions: { + } + } + } +} +``` + +#### Responses + +- 200 successful operation + +`application/json` + +```ts +{ + jsonapi: { + version?: string //default: 1.1 + ext?: string //default: https://jsonapi.org/profiles/ethanresnick/cursor-pagination + } + id?: integer + type?: string //default: RightGroup + data: { + name?: string + permissions: { + } + } +} +``` + +- 400 Invalid request + +`application/json` + +```ts +{ + title?: string + type?: string + status?: integer +} +``` + +- 401 Authentication failed + +`application/json` + +```ts +{ + title?: string + type?: string + status?: integer +} +``` + +- 404 Not Found + +`application/json` + +```ts +{ + message?: string + exception: { + type?: string + code?: integer + message?: string + file?: string + line?: integer + } +} +``` + +*** + +### [DELETE]/api/v2/ui/globalpermissiongroups/{id:[0-9]+} + +- Security +bearerAuth + +#### RequestBody + +- application/json + +#### Responses + +- 204 successfully deleted + +- 400 Invalid request + +`application/json` + +```ts +{ + title?: string + type?: string + status?: integer +} +``` + +- 401 Authentication failed + +`application/json` + +```ts +{ + title?: string + type?: string + status?: integer +} +``` + +- 404 Not Found + +`application/json` + +```ts +{ + message?: string + exception: { + type?: string + code?: integer + message?: string + file?: string + line?: integer + } +} +``` + +*** + +### [GET]/api/v2/ui/hashes + +- Description +GET many request to retrieve multiple objects. + +- Security +bearerAuth + +#### Parameters(Query) + +```ts +page[after]?: integer +``` + +```ts +page[before]?: integer +``` + +```ts +page[size]?: integer +``` + +```ts +filter: { +} +``` + +```ts +include?: string +``` + +#### Responses + +- 200 successful operation + +`application/json` + +```ts +{ + jsonapi: { + version?: string //default: 1.1 + ext?: string //default: https://jsonapi.org/profiles/ethanresnick/cursor-pagination + } + links: { + self?: string //default: /api/v2/ui/hashes?page[size]=25 + first?: string //default: /api/v2/ui/hashes?page[size]=25&page[after]=0 + last?: string //default: /api/v2/ui/hashes?page[size]=25&page[before]=500 + next?: string //default: /api/v2/ui/hashes?page[size]=25&page[after]=25 + previous?: string //default: /api/v2/ui/hashes?page[size]=25&page[before]=25 + } + id?: integer + type?: string //default: Hash + data: { + hashlistId?: integer + hash?: string + salt?: string + plaintext?: string + timeCracked?: integer + chunkId?: integer + isCracked?: boolean + crackPos?: integer + } + relationships: { + } + included: { + }[] +}[] +``` + +- 400 Invalid request + +`application/json` + +```ts +{ + title?: string + type?: string + status?: integer +} +``` + +- 401 Authentication failed + +`application/json` + +```ts +{ + title?: string + type?: string + status?: integer +} +``` + +*** + +### [GET]/api/v2/ui/hashes/count + +- Description +GET many request to retrieve multiple objects. + +- Security +bearerAuth + +#### Parameters(Query) + +```ts +page[after]?: integer +``` + +```ts +page[before]?: integer +``` + +```ts +page[size]?: integer +``` + +```ts +filter: { +} +``` + +```ts +include?: string +``` + +#### Responses + +- 200 successful operation + +`application/json` + +```ts +{ + jsonapi: { + version?: string //default: 1.1 + ext?: string //default: https://jsonapi.org/profiles/ethanresnick/cursor-pagination + } + links: { + self?: string //default: /api/v2/ui/hashes?page[size]=25 + first?: string //default: /api/v2/ui/hashes?page[size]=25&page[after]=0 + last?: string //default: /api/v2/ui/hashes?page[size]=25&page[before]=500 + next?: string //default: /api/v2/ui/hashes?page[size]=25&page[after]=25 + previous?: string //default: /api/v2/ui/hashes?page[size]=25&page[before]=25 + } + id?: integer + type?: string //default: Hash + data: { + hashlistId?: integer + hash?: string + salt?: string + plaintext?: string + timeCracked?: integer + chunkId?: integer + isCracked?: boolean + crackPos?: integer + } + relationships: { + } + included: { + }[] +}[] +``` + +- 400 Invalid request + +`application/json` + +```ts +{ + title?: string + type?: string + status?: integer +} +``` + +- 401 Authentication failed + +`application/json` + +```ts +{ + title?: string + type?: string + status?: integer +} +``` + +*** + +### [GET]/api/v2/ui/hashes/{id:[0-9]+}/{relation:chunk} + +- Description +GET request for for a to-one relationship link. Returns the resource record of the object that is part of the specified relation. + +- Security +bearerAuth + +#### Parameters(Query) + +```ts +include?: string +``` + +#### Responses + +- 200 successful operation + +`application/json` + +```ts +{ + jsonapi: { + version?: string //default: 1.1 + ext?: string //default: https://jsonapi.org/profiles/ethanresnick/cursor-pagination + } + links: { + self?: string //default: /api/v2/ui/hashes?page[size]=25 + first?: string //default: /api/v2/ui/hashes?page[size]=25&page[after]=0 + last?: string //default: /api/v2/ui/hashes?page[size]=25&page[before]=500 + next?: string //default: /api/v2/ui/hashes?page[size]=25&page[after]=25 + previous?: string //default: /api/v2/ui/hashes?page[size]=25&page[before]=25 + } + id?: integer + type?: string //default: Hash + data: { + hashlistId?: integer + hash?: string + salt?: string + plaintext?: string + timeCracked?: integer + chunkId?: integer + isCracked?: boolean + crackPos?: integer + } + relationships: { + } + included: { + }[] +} +``` + +- 400 Invalid request + +`application/json` + +```ts +{ + title?: string + type?: string + status?: integer +} +``` + +- 401 Authentication failed + +`application/json` + +```ts +{ + title?: string + type?: string + status?: integer +} +``` + +- 404 Not Found + +`application/json` + +```ts +{ + message?: string + exception: { + type?: string + code?: integer + message?: string + file?: string + line?: integer + } +} +``` + +*** + +### [GET]/api/v2/ui/hashes/{id:[0-9]+}/relationships/{relation:chunk} + +- Description +GET request for for a to-one relationship link. Returns the resource record of the object that is part of the specified relation. + +- Security +bearerAuth + +#### Parameters(Query) + +```ts +include?: string +``` + +#### Responses + +- 200 successful operation + +`application/json` + +```ts +{ + jsonapi: { + version?: string //default: 1.1 + ext?: string //default: https://jsonapi.org/profiles/ethanresnick/cursor-pagination + } + links: { + self?: string //default: /api/v2/ui/hashes?page[size]=25 + first?: string //default: /api/v2/ui/hashes?page[size]=25&page[after]=0 + last?: string //default: /api/v2/ui/hashes?page[size]=25&page[before]=500 + next?: string //default: /api/v2/ui/hashes?page[size]=25&page[after]=25 + previous?: string //default: /api/v2/ui/hashes?page[size]=25&page[before]=25 + } + id?: integer + type?: string //default: Hash + data: { + hashlistId?: integer + hash?: string + salt?: string + plaintext?: string + timeCracked?: integer + chunkId?: integer + isCracked?: boolean + crackPos?: integer + } + relationships: { + } + included: { + }[] +} +``` + +- 400 Invalid request + +`application/json` + +```ts +{ + title?: string + type?: string + status?: integer +} +``` + +- 401 Authentication failed + +`application/json` + +```ts +{ + title?: string + type?: string + status?: integer +} +``` + +- 404 Not Found + +`application/json` + +```ts +{ + message?: string + exception: { + type?: string + code?: integer + message?: string + file?: string + line?: integer + } +} +``` + +*** + +### [PATCH]/api/v2/ui/hashes/{id:[0-9]+}/relationships/{relation:chunk} + +- Security +bearerAuth + +#### RequestBody + +- application/json + +```ts +{ + data: { + type?: string + attributes: { + chunkId?: integer + crackPos?: integer + hash?: string + hashlistId?: integer + isCracked?: boolean + plaintext?: string + salt?: string + timeCracked?: integer + } + } +} +``` + +#### Responses + +- 200 successful operation + +`application/json` + +```ts +{ + jsonapi: { + version?: string //default: 1.1 + ext?: string //default: https://jsonapi.org/profiles/ethanresnick/cursor-pagination + } + id?: integer + type?: string //default: Hash + data: { + hashlistId?: integer + hash?: string + salt?: string + plaintext?: string + timeCracked?: integer + chunkId?: integer + isCracked?: boolean + crackPos?: integer + } +} +``` + +- 400 Invalid request + +`application/json` + +```ts +{ + title?: string + type?: string + status?: integer +} +``` + +- 401 Authentication failed + +`application/json` + +```ts +{ + title?: string + type?: string + status?: integer +} +``` + +- 404 Not Found + +`application/json` + +```ts +{ + message?: string + exception: { + type?: string + code?: integer + message?: string + file?: string + line?: integer + } +} +``` + +*** + +### [GET]/api/v2/ui/hashes/{id:[0-9]+}/{relation:hashlist} + +- Description +GET request for for a to-one relationship link. Returns the resource record of the object that is part of the specified relation. + +- Security +bearerAuth + +#### Parameters(Query) + +```ts +include?: string +``` + +#### Responses + +- 200 successful operation + +`application/json` + +```ts +{ + jsonapi: { + version?: string //default: 1.1 + ext?: string //default: https://jsonapi.org/profiles/ethanresnick/cursor-pagination + } + links: { + self?: string //default: /api/v2/ui/hashes?page[size]=25 + first?: string //default: /api/v2/ui/hashes?page[size]=25&page[after]=0 + last?: string //default: /api/v2/ui/hashes?page[size]=25&page[before]=500 + next?: string //default: /api/v2/ui/hashes?page[size]=25&page[after]=25 + previous?: string //default: /api/v2/ui/hashes?page[size]=25&page[before]=25 + } + id?: integer + type?: string //default: Hash + data: { + hashlistId?: integer + hash?: string + salt?: string + plaintext?: string + timeCracked?: integer + chunkId?: integer + isCracked?: boolean + crackPos?: integer + } + relationships: { + } + included: { + }[] +} +``` + +- 400 Invalid request + +`application/json` + +```ts +{ + title?: string + type?: string + status?: integer +} +``` + +- 401 Authentication failed + +`application/json` + +```ts +{ + title?: string + type?: string + status?: integer +} +``` + +- 404 Not Found + +`application/json` + +```ts +{ + message?: string + exception: { + type?: string + code?: integer + message?: string + file?: string + line?: integer + } +} +``` + +*** + +### [GET]/api/v2/ui/hashes/{id:[0-9]+}/relationships/{relation:hashlist} + +- Description +GET request for for a to-one relationship link. Returns the resource record of the object that is part of the specified relation. + +- Security +bearerAuth + +#### Parameters(Query) + +```ts +include?: string +``` + +#### Responses + +- 200 successful operation + +`application/json` + +```ts +{ + jsonapi: { + version?: string //default: 1.1 + ext?: string //default: https://jsonapi.org/profiles/ethanresnick/cursor-pagination + } + links: { + self?: string //default: /api/v2/ui/hashes?page[size]=25 + first?: string //default: /api/v2/ui/hashes?page[size]=25&page[after]=0 + last?: string //default: /api/v2/ui/hashes?page[size]=25&page[before]=500 + next?: string //default: /api/v2/ui/hashes?page[size]=25&page[after]=25 + previous?: string //default: /api/v2/ui/hashes?page[size]=25&page[before]=25 + } + id?: integer + type?: string //default: Hash + data: { + hashlistId?: integer + hash?: string + salt?: string + plaintext?: string + timeCracked?: integer + chunkId?: integer + isCracked?: boolean + crackPos?: integer + } + relationships: { + } + included: { + }[] +} +``` + +- 400 Invalid request + +`application/json` + +```ts +{ + title?: string + type?: string + status?: integer +} +``` + +- 401 Authentication failed + +`application/json` + +```ts +{ + title?: string + type?: string + status?: integer +} +``` + +- 404 Not Found + +`application/json` + +```ts +{ + message?: string + exception: { + type?: string + code?: integer + message?: string + file?: string + line?: integer + } +} +``` + +*** + +### [PATCH]/api/v2/ui/hashes/{id:[0-9]+}/relationships/{relation:hashlist} + +- Security +bearerAuth + +#### RequestBody + +- application/json + +```ts +{ + data: { + type?: string + attributes: { + chunkId?: integer + crackPos?: integer + hash?: string + hashlistId?: integer + isCracked?: boolean + plaintext?: string + salt?: string + timeCracked?: integer + } + } +} +``` + +#### Responses + +- 200 successful operation + +`application/json` + +```ts +{ + jsonapi: { + version?: string //default: 1.1 + ext?: string //default: https://jsonapi.org/profiles/ethanresnick/cursor-pagination + } + id?: integer + type?: string //default: Hash + data: { + hashlistId?: integer + hash?: string + salt?: string + plaintext?: string + timeCracked?: integer + chunkId?: integer + isCracked?: boolean + crackPos?: integer + } +} +``` + +- 400 Invalid request + +`application/json` + +```ts +{ + title?: string + type?: string + status?: integer +} +``` + +- 401 Authentication failed + +`application/json` + +```ts +{ + title?: string + type?: string + status?: integer +} +``` + +- 404 Not Found + +`application/json` + +```ts +{ + message?: string + exception: { + type?: string + code?: integer + message?: string + file?: string + line?: integer + } +} +``` + +*** + +### [GET]/api/v2/ui/hashes/{id:[0-9]+} + +- Description +GET request to retrieve a single object. + +- Security +bearerAuth + +#### Parameters(Query) + +```ts +include?: string +``` + +#### Responses + +- 200 successful operation + +`application/json` + +```ts +{ + jsonapi: { + version?: string //default: 1.1 + ext?: string //default: https://jsonapi.org/profiles/ethanresnick/cursor-pagination + } + links: { + self?: string //default: /api/v2/ui/hashes?page[size]=25 + first?: string //default: /api/v2/ui/hashes?page[size]=25&page[after]=0 + last?: string //default: /api/v2/ui/hashes?page[size]=25&page[before]=500 + next?: string //default: /api/v2/ui/hashes?page[size]=25&page[after]=25 + previous?: string //default: /api/v2/ui/hashes?page[size]=25&page[before]=25 + } + id?: integer + type?: string //default: Hash + data: { + hashlistId?: integer + hash?: string + salt?: string + plaintext?: string + timeCracked?: integer + chunkId?: integer + isCracked?: boolean + crackPos?: integer + } + relationships: { + } + included: { + }[] +} +``` + +- 400 Invalid request + +`application/json` + +```ts +{ + title?: string + type?: string + status?: integer +} +``` + +- 401 Authentication failed + +`application/json` + +```ts +{ + title?: string + type?: string + status?: integer +} +``` + +- 404 Not Found + +`application/json` + +```ts +{ + message?: string + exception: { + type?: string + code?: integer + message?: string + file?: string + line?: integer + } +} +``` + +*** + +### [GET]/api/v2/ui/hashlists + +- Description +GET many request to retrieve multiple objects. + +- Security +bearerAuth + +#### Parameters(Query) + +```ts +page[after]?: integer +``` + +```ts +page[before]?: integer +``` + +```ts +page[size]?: integer +``` + +```ts +filter: { +} +``` + +```ts +include?: string +``` + +#### Responses + +- 200 successful operation + +`application/json` + +```ts +{ + jsonapi: { + version?: string //default: 1.1 + ext?: string //default: https://jsonapi.org/profiles/ethanresnick/cursor-pagination + } + links: { + self?: string //default: /api/v2/ui/hashlists?page[size]=25 + first?: string //default: /api/v2/ui/hashlists?page[size]=25&page[after]=0 + last?: string //default: /api/v2/ui/hashlists?page[size]=25&page[before]=500 + next?: string //default: /api/v2/ui/hashlists?page[size]=25&page[after]=25 + previous?: string //default: /api/v2/ui/hashlists?page[size]=25&page[before]=25 + } + id?: integer + type?: string //default: Hashlist + data: { + name?: string + format?: enum[0, 1, 2, 3] + hashTypeId?: integer + hashCount?: integer + separator?: string + cracked?: integer + isSecret?: boolean + isHexSalt?: boolean + isSalted?: boolean + accessGroupId?: integer + notes?: string + useBrain?: boolean + brainFeatures?: integer + isArchived?: boolean + } + relationships: { + } + included: { + }[] +}[] +``` + +- 400 Invalid request + +`application/json` + +```ts +{ + title?: string + type?: string + status?: integer +} +``` + +- 401 Authentication failed + +`application/json` + +```ts +{ + title?: string + type?: string + status?: integer +} +``` + +*** + +### [POST]/api/v2/ui/hashlists + +- Description +POST request to create a new object. The request must contain the resource record as data with the attributes of the new object.To add relationships, a relationships object can be added with the resource records of the relations that are part of this object. + +- Security +bearerAuth + +#### RequestBody + +- application/json + +```ts +{ + data: { + type?: string + attributes: { + hashlistSeperator?: string + sourceType?: string + sourceData?: string + name?: string + format?: enum[0, 1, 2, 3] + hashTypeId?: integer + hashCount?: integer + separator?: string + cracked?: integer + isSecret?: boolean + isHexSalt?: boolean + isSalted?: boolean + accessGroupId?: integer + notes?: string + useBrain?: boolean + brainFeatures?: integer + isArchived?: boolean + } + } +} +``` + +#### Responses + +- 201 successful operation + +`application/json` + +```ts +{ + jsonapi: { + version?: string //default: 1.1 + ext?: string //default: https://jsonapi.org/profiles/ethanresnick/cursor-pagination + } + id?: integer + type?: string //default: Hashlist + data: { + name?: string + format?: enum[0, 1, 2, 3] + hashTypeId?: integer + hashCount?: integer + separator?: string + cracked?: integer + isSecret?: boolean + isHexSalt?: boolean + isSalted?: boolean + accessGroupId?: integer + notes?: string + useBrain?: boolean + brainFeatures?: integer + isArchived?: boolean + } +} +``` + +- 400 Invalid request + +`application/json` + +```ts +{ + title?: string + type?: string + status?: integer +} +``` + +- 401 Authentication failed + +`application/json` + +```ts +{ + title?: string + type?: string + status?: integer +} +``` + +*** + +### [GET]/api/v2/ui/hashlists/count + +- Description +GET many request to retrieve multiple objects. + +- Security +bearerAuth + +#### Parameters(Query) + +```ts +page[after]?: integer +``` + +```ts +page[before]?: integer +``` + +```ts +page[size]?: integer +``` + +```ts +filter: { +} +``` + +```ts +include?: string +``` + +#### Responses + +- 200 successful operation + +`application/json` + +```ts +{ + jsonapi: { + version?: string //default: 1.1 + ext?: string //default: https://jsonapi.org/profiles/ethanresnick/cursor-pagination + } + links: { + self?: string //default: /api/v2/ui/hashlists?page[size]=25 + first?: string //default: /api/v2/ui/hashlists?page[size]=25&page[after]=0 + last?: string //default: /api/v2/ui/hashlists?page[size]=25&page[before]=500 + next?: string //default: /api/v2/ui/hashlists?page[size]=25&page[after]=25 + previous?: string //default: /api/v2/ui/hashlists?page[size]=25&page[before]=25 + } + id?: integer + type?: string //default: Hashlist + data: { + name?: string + format?: enum[0, 1, 2, 3] + hashTypeId?: integer + hashCount?: integer + separator?: string + cracked?: integer + isSecret?: boolean + isHexSalt?: boolean + isSalted?: boolean + accessGroupId?: integer + notes?: string + useBrain?: boolean + brainFeatures?: integer + isArchived?: boolean + } + relationships: { + } + included: { + }[] +}[] +``` + +- 400 Invalid request + +`application/json` + +```ts +{ + title?: string + type?: string + status?: integer +} +``` + +- 401 Authentication failed + +`application/json` + +```ts +{ + title?: string + type?: string + status?: integer +} +``` + +*** + +### [GET]/api/v2/ui/hashlists/{id:[0-9]+}/{relation:accessGroup} + +- Description +GET request for for a to-one relationship link. Returns the resource record of the object that is part of the specified relation. + +- Security +bearerAuth + +#### Parameters(Query) + +```ts +include?: string +``` + +#### Responses + +- 200 successful operation + +`application/json` + +```ts +{ + jsonapi: { + version?: string //default: 1.1 + ext?: string //default: https://jsonapi.org/profiles/ethanresnick/cursor-pagination + } + links: { + self?: string //default: /api/v2/ui/hashlists?page[size]=25 + first?: string //default: /api/v2/ui/hashlists?page[size]=25&page[after]=0 + last?: string //default: /api/v2/ui/hashlists?page[size]=25&page[before]=500 + next?: string //default: /api/v2/ui/hashlists?page[size]=25&page[after]=25 + previous?: string //default: /api/v2/ui/hashlists?page[size]=25&page[before]=25 + } + id?: integer + type?: string //default: Hashlist + data: { + name?: string + format?: enum[0, 1, 2, 3] + hashTypeId?: integer + hashCount?: integer + separator?: string + cracked?: integer + isSecret?: boolean + isHexSalt?: boolean + isSalted?: boolean + accessGroupId?: integer + notes?: string + useBrain?: boolean + brainFeatures?: integer + isArchived?: boolean + } + relationships: { + } + included: { + }[] +} +``` + +- 400 Invalid request + +`application/json` + +```ts +{ + title?: string + type?: string + status?: integer +} +``` + +- 401 Authentication failed + +`application/json` + +```ts +{ + title?: string + type?: string + status?: integer +} +``` + +- 404 Not Found + +`application/json` + +```ts +{ + message?: string + exception: { + type?: string + code?: integer + message?: string + file?: string + line?: integer + } +} +``` + +*** + +### [GET]/api/v2/ui/hashlists/{id:[0-9]+}/relationships/{relation:accessGroup} + +- Description +GET request for for a to-one relationship link. Returns the resource record of the object that is part of the specified relation. + +- Security +bearerAuth + +#### Parameters(Query) + +```ts +include?: string +``` + +#### Responses + +- 200 successful operation + +`application/json` + +```ts +{ + jsonapi: { + version?: string //default: 1.1 + ext?: string //default: https://jsonapi.org/profiles/ethanresnick/cursor-pagination + } + links: { + self?: string //default: /api/v2/ui/hashlists?page[size]=25 + first?: string //default: /api/v2/ui/hashlists?page[size]=25&page[after]=0 + last?: string //default: /api/v2/ui/hashlists?page[size]=25&page[before]=500 + next?: string //default: /api/v2/ui/hashlists?page[size]=25&page[after]=25 + previous?: string //default: /api/v2/ui/hashlists?page[size]=25&page[before]=25 + } + id?: integer + type?: string //default: Hashlist + data: { + name?: string + format?: enum[0, 1, 2, 3] + hashTypeId?: integer + hashCount?: integer + separator?: string + cracked?: integer + isSecret?: boolean + isHexSalt?: boolean + isSalted?: boolean + accessGroupId?: integer + notes?: string + useBrain?: boolean + brainFeatures?: integer + isArchived?: boolean + } + relationships: { + } + included: { + }[] +} +``` + +- 400 Invalid request + +`application/json` + +```ts +{ + title?: string + type?: string + status?: integer +} +``` + +- 401 Authentication failed + +`application/json` + +```ts +{ + title?: string + type?: string + status?: integer +} +``` + +- 404 Not Found + +`application/json` + +```ts +{ + message?: string + exception: { + type?: string + code?: integer + message?: string + file?: string + line?: integer + } +} +``` + +*** + +### [PATCH]/api/v2/ui/hashlists/{id:[0-9]+}/relationships/{relation:accessGroup} + +- Security +bearerAuth + +#### RequestBody + +- application/json + +```ts +{ + data: { + type?: string + attributes: { + accessGroupId?: integer + isArchived?: boolean + isSecret?: boolean + name?: string + notes?: string + } + } +} +``` + +#### Responses + +- 200 successful operation + +`application/json` + +```ts +{ + jsonapi: { + version?: string //default: 1.1 + ext?: string //default: https://jsonapi.org/profiles/ethanresnick/cursor-pagination + } + id?: integer + type?: string //default: Hashlist + data: { + name?: string + format?: enum[0, 1, 2, 3] + hashTypeId?: integer + hashCount?: integer + separator?: string + cracked?: integer + isSecret?: boolean + isHexSalt?: boolean + isSalted?: boolean + accessGroupId?: integer + notes?: string + useBrain?: boolean + brainFeatures?: integer + isArchived?: boolean + } +} +``` + +- 400 Invalid request + +`application/json` + +```ts +{ + title?: string + type?: string + status?: integer +} +``` + +- 401 Authentication failed + +`application/json` + +```ts +{ + title?: string + type?: string + status?: integer +} +``` + +- 404 Not Found + +`application/json` + +```ts +{ + message?: string + exception: { + type?: string + code?: integer + message?: string + file?: string + line?: integer + } +} +``` + +*** + +### [GET]/api/v2/ui/hashlists/{id:[0-9]+}/{relation:hashType} + +- Description +GET request for for a to-one relationship link. Returns the resource record of the object that is part of the specified relation. + +- Security +bearerAuth + +#### Parameters(Query) + +```ts +include?: string +``` + +#### Responses + +- 200 successful operation + +`application/json` + +```ts +{ + jsonapi: { + version?: string //default: 1.1 + ext?: string //default: https://jsonapi.org/profiles/ethanresnick/cursor-pagination + } + links: { + self?: string //default: /api/v2/ui/hashlists?page[size]=25 + first?: string //default: /api/v2/ui/hashlists?page[size]=25&page[after]=0 + last?: string //default: /api/v2/ui/hashlists?page[size]=25&page[before]=500 + next?: string //default: /api/v2/ui/hashlists?page[size]=25&page[after]=25 + previous?: string //default: /api/v2/ui/hashlists?page[size]=25&page[before]=25 + } + id?: integer + type?: string //default: Hashlist + data: { + name?: string + format?: enum[0, 1, 2, 3] + hashTypeId?: integer + hashCount?: integer + separator?: string + cracked?: integer + isSecret?: boolean + isHexSalt?: boolean + isSalted?: boolean + accessGroupId?: integer + notes?: string + useBrain?: boolean + brainFeatures?: integer + isArchived?: boolean + } + relationships: { + } + included: { + }[] +} +``` + +- 400 Invalid request + +`application/json` + +```ts +{ + title?: string + type?: string + status?: integer +} +``` + +- 401 Authentication failed + +`application/json` + +```ts +{ + title?: string + type?: string + status?: integer +} +``` + +- 404 Not Found + +`application/json` + +```ts +{ + message?: string + exception: { + type?: string + code?: integer + message?: string + file?: string + line?: integer + } +} +``` + +*** + +### [GET]/api/v2/ui/hashlists/{id:[0-9]+}/relationships/{relation:hashType} + +- Description +GET request for for a to-one relationship link. Returns the resource record of the object that is part of the specified relation. + +- Security +bearerAuth + +#### Parameters(Query) + +```ts +include?: string +``` + +#### Responses + +- 200 successful operation + +`application/json` + +```ts +{ + jsonapi: { + version?: string //default: 1.1 + ext?: string //default: https://jsonapi.org/profiles/ethanresnick/cursor-pagination + } + links: { + self?: string //default: /api/v2/ui/hashlists?page[size]=25 + first?: string //default: /api/v2/ui/hashlists?page[size]=25&page[after]=0 + last?: string //default: /api/v2/ui/hashlists?page[size]=25&page[before]=500 + next?: string //default: /api/v2/ui/hashlists?page[size]=25&page[after]=25 + previous?: string //default: /api/v2/ui/hashlists?page[size]=25&page[before]=25 + } + id?: integer + type?: string //default: Hashlist + data: { + name?: string + format?: enum[0, 1, 2, 3] + hashTypeId?: integer + hashCount?: integer + separator?: string + cracked?: integer + isSecret?: boolean + isHexSalt?: boolean + isSalted?: boolean + accessGroupId?: integer + notes?: string + useBrain?: boolean + brainFeatures?: integer + isArchived?: boolean + } + relationships: { + } + included: { + }[] +} +``` + +- 400 Invalid request + +`application/json` + +```ts +{ + title?: string + type?: string + status?: integer +} +``` + +- 401 Authentication failed + +`application/json` + +```ts +{ + title?: string + type?: string + status?: integer +} +``` + +- 404 Not Found + +`application/json` + +```ts +{ + message?: string + exception: { + type?: string + code?: integer + message?: string + file?: string + line?: integer + } +} +``` + +*** + +### [PATCH]/api/v2/ui/hashlists/{id:[0-9]+}/relationships/{relation:hashType} + +- Security +bearerAuth + +#### RequestBody + +- application/json + +```ts +{ + data: { + type?: string + attributes: { + accessGroupId?: integer + isArchived?: boolean + isSecret?: boolean + name?: string + notes?: string + } + } +} +``` + +#### Responses + +- 200 successful operation + +`application/json` + +```ts +{ + jsonapi: { + version?: string //default: 1.1 + ext?: string //default: https://jsonapi.org/profiles/ethanresnick/cursor-pagination + } + id?: integer + type?: string //default: Hashlist + data: { + name?: string + format?: enum[0, 1, 2, 3] + hashTypeId?: integer + hashCount?: integer + separator?: string + cracked?: integer + isSecret?: boolean + isHexSalt?: boolean + isSalted?: boolean + accessGroupId?: integer + notes?: string + useBrain?: boolean + brainFeatures?: integer + isArchived?: boolean + } +} +``` + +- 400 Invalid request + +`application/json` + +```ts +{ + title?: string + type?: string + status?: integer +} +``` + +- 401 Authentication failed + +`application/json` + +```ts +{ + title?: string + type?: string + status?: integer +} +``` + +- 404 Not Found + +`application/json` + +```ts +{ + message?: string + exception: { + type?: string + code?: integer + message?: string + file?: string + line?: integer + } +} +``` + +*** + +### [GET]/api/v2/ui/hashlists/{id:[0-9]+}/{relation:hashes} + +- Description +GET request for for a to-one relationship link. Returns the resource record of the object that is part of the specified relation. + +- Security +bearerAuth + +#### Parameters(Query) + +```ts +include?: string +``` + +#### Responses + +- 200 successful operation + +`application/json` + +```ts +{ + jsonapi: { + version?: string //default: 1.1 + ext?: string //default: https://jsonapi.org/profiles/ethanresnick/cursor-pagination + } + links: { + self?: string //default: /api/v2/ui/hashlists?page[size]=25 + first?: string //default: /api/v2/ui/hashlists?page[size]=25&page[after]=0 + last?: string //default: /api/v2/ui/hashlists?page[size]=25&page[before]=500 + next?: string //default: /api/v2/ui/hashlists?page[size]=25&page[after]=25 + previous?: string //default: /api/v2/ui/hashlists?page[size]=25&page[before]=25 + } + id?: integer + type?: string //default: Hashlist + data: { + name?: string + format?: enum[0, 1, 2, 3] + hashTypeId?: integer + hashCount?: integer + separator?: string + cracked?: integer + isSecret?: boolean + isHexSalt?: boolean + isSalted?: boolean + accessGroupId?: integer + notes?: string + useBrain?: boolean + brainFeatures?: integer + isArchived?: boolean + } + relationships: { + } + included: { + }[] +} +``` + +- 400 Invalid request + +`application/json` + +```ts +{ + title?: string + type?: string + status?: integer +} +``` + +- 401 Authentication failed + +`application/json` + +```ts +{ + title?: string + type?: string + status?: integer +} +``` + +- 404 Not Found + +`application/json` + +```ts +{ + message?: string + exception: { + type?: string + code?: integer + message?: string + file?: string + line?: integer + } +} +``` + +*** + +### [GET]/api/v2/ui/hashlists/{id:[0-9]+}/relationships/{relation:hashes} + +- Description +GET request for for a to-one relationship link. Returns the resource record of the object that is part of the specified relation. + +- Security +bearerAuth + +#### Parameters(Query) + +```ts +include?: string +``` + +#### Responses + +- 200 successful operation + +`application/json` + +```ts +{ + jsonapi: { + version?: string //default: 1.1 + ext?: string //default: https://jsonapi.org/profiles/ethanresnick/cursor-pagination + } + links: { + self?: string //default: /api/v2/ui/hashlists?page[size]=25 + first?: string //default: /api/v2/ui/hashlists?page[size]=25&page[after]=0 + last?: string //default: /api/v2/ui/hashlists?page[size]=25&page[before]=500 + next?: string //default: /api/v2/ui/hashlists?page[size]=25&page[after]=25 + previous?: string //default: /api/v2/ui/hashlists?page[size]=25&page[before]=25 + } + id?: integer + type?: string //default: Hashlist + data: { + name?: string + format?: enum[0, 1, 2, 3] + hashTypeId?: integer + hashCount?: integer + separator?: string + cracked?: integer + isSecret?: boolean + isHexSalt?: boolean + isSalted?: boolean + accessGroupId?: integer + notes?: string + useBrain?: boolean + brainFeatures?: integer + isArchived?: boolean + } + relationships: { + } + included: { + }[] +} +``` + +- 400 Invalid request + +`application/json` + +```ts +{ + title?: string + type?: string + status?: integer +} +``` + +- 401 Authentication failed + +`application/json` + +```ts +{ + title?: string + type?: string + status?: integer +} +``` + +- 404 Not Found + +`application/json` + +```ts +{ + message?: string + exception: { + type?: string + code?: integer + message?: string + file?: string + line?: integer + } +} +``` + +*** + +### [PATCH]/api/v2/ui/hashlists/{id:[0-9]+}/relationships/{relation:hashes} + +- Security +bearerAuth + +#### RequestBody + +- application/json + +```ts +{ + data: { + type?: string + attributes: { + accessGroupId?: integer + isArchived?: boolean + isSecret?: boolean + name?: string + notes?: string + } + } +} +``` + +#### Responses + +- 200 successful operation + +`application/json` + +```ts +{ + jsonapi: { + version?: string //default: 1.1 + ext?: string //default: https://jsonapi.org/profiles/ethanresnick/cursor-pagination + } + id?: integer + type?: string //default: Hashlist + data: { + name?: string + format?: enum[0, 1, 2, 3] + hashTypeId?: integer + hashCount?: integer + separator?: string + cracked?: integer + isSecret?: boolean + isHexSalt?: boolean + isSalted?: boolean + accessGroupId?: integer + notes?: string + useBrain?: boolean + brainFeatures?: integer + isArchived?: boolean + } +} +``` + +- 400 Invalid request + +`application/json` + +```ts +{ + title?: string + type?: string + status?: integer +} +``` + +- 401 Authentication failed + +`application/json` + +```ts +{ + title?: string + type?: string + status?: integer +} +``` + +- 404 Not Found + +`application/json` + +```ts +{ + message?: string + exception: { + type?: string + code?: integer + message?: string + file?: string + line?: integer + } +} +``` + +*** + +### [POST]/api/v2/ui/hashlists/{id:[0-9]+}/relationships/{relation:hashes} + +- Security +bearerAuth + +#### RequestBody + +- application/json + +#### Responses + +- 204 successfully created + +- 400 Invalid request + +`application/json` + +```ts +{ + title?: string + type?: string + status?: integer +} +``` + +- 401 Authentication failed + +`application/json` + +```ts +{ + title?: string + type?: string + status?: integer +} +``` + +- 404 Not Found + +`application/json` + +```ts +{ + message?: string + exception: { + type?: string + code?: integer + message?: string + file?: string + line?: integer + } +} +``` + +*** + +### [DELETE]/api/v2/ui/hashlists/{id:[0-9]+}/relationships/{relation:hashes} + +- Security +bearerAuth + +#### RequestBody + +- application/json + +#### Responses + +- 204 successfully deleted + +- 400 Invalid request + +`application/json` + +```ts +{ + title?: string + type?: string + status?: integer +} +``` + +- 401 Authentication failed + +`application/json` + +```ts +{ + title?: string + type?: string + status?: integer +} +``` + +- 404 Not Found + +`application/json` + +```ts +{ + message?: string + exception: { + type?: string + code?: integer + message?: string + file?: string + line?: integer + } +} +``` + +*** + +### [GET]/api/v2/ui/hashlists/{id:[0-9]+}/{relation:hashlists} + +- Description +GET request for for a to-one relationship link. Returns the resource record of the object that is part of the specified relation. + +- Security +bearerAuth + +#### Parameters(Query) + +```ts +include?: string +``` + +#### Responses + +- 200 successful operation + +`application/json` + +```ts +{ + jsonapi: { + version?: string //default: 1.1 + ext?: string //default: https://jsonapi.org/profiles/ethanresnick/cursor-pagination + } + links: { + self?: string //default: /api/v2/ui/hashlists?page[size]=25 + first?: string //default: /api/v2/ui/hashlists?page[size]=25&page[after]=0 + last?: string //default: /api/v2/ui/hashlists?page[size]=25&page[before]=500 + next?: string //default: /api/v2/ui/hashlists?page[size]=25&page[after]=25 + previous?: string //default: /api/v2/ui/hashlists?page[size]=25&page[before]=25 + } + id?: integer + type?: string //default: Hashlist + data: { + name?: string + format?: enum[0, 1, 2, 3] + hashTypeId?: integer + hashCount?: integer + separator?: string + cracked?: integer + isSecret?: boolean + isHexSalt?: boolean + isSalted?: boolean + accessGroupId?: integer + notes?: string + useBrain?: boolean + brainFeatures?: integer + isArchived?: boolean + } + relationships: { + } + included: { + }[] +} +``` + +- 400 Invalid request + +`application/json` + +```ts +{ + title?: string + type?: string + status?: integer +} +``` + +- 401 Authentication failed + +`application/json` + +```ts +{ + title?: string + type?: string + status?: integer +} +``` + +- 404 Not Found + +`application/json` + +```ts +{ + message?: string + exception: { + type?: string + code?: integer + message?: string + file?: string + line?: integer + } +} +``` + +*** + +### [GET]/api/v2/ui/hashlists/{id:[0-9]+}/relationships/{relation:hashlists} + +- Description +GET request for for a to-one relationship link. Returns the resource record of the object that is part of the specified relation. + +- Security +bearerAuth + +#### Parameters(Query) + +```ts +include?: string +``` + +#### Responses + +- 200 successful operation + +`application/json` + +```ts +{ + jsonapi: { + version?: string //default: 1.1 + ext?: string //default: https://jsonapi.org/profiles/ethanresnick/cursor-pagination + } + links: { + self?: string //default: /api/v2/ui/hashlists?page[size]=25 + first?: string //default: /api/v2/ui/hashlists?page[size]=25&page[after]=0 + last?: string //default: /api/v2/ui/hashlists?page[size]=25&page[before]=500 + next?: string //default: /api/v2/ui/hashlists?page[size]=25&page[after]=25 + previous?: string //default: /api/v2/ui/hashlists?page[size]=25&page[before]=25 + } + id?: integer + type?: string //default: Hashlist + data: { + name?: string + format?: enum[0, 1, 2, 3] + hashTypeId?: integer + hashCount?: integer + separator?: string + cracked?: integer + isSecret?: boolean + isHexSalt?: boolean + isSalted?: boolean + accessGroupId?: integer + notes?: string + useBrain?: boolean + brainFeatures?: integer + isArchived?: boolean + } + relationships: { + } + included: { + }[] +} +``` + +- 400 Invalid request + +`application/json` + +```ts +{ + title?: string + type?: string + status?: integer +} +``` + +- 401 Authentication failed + +`application/json` + +```ts +{ + title?: string + type?: string + status?: integer +} +``` + +- 404 Not Found + +`application/json` + +```ts +{ + message?: string + exception: { + type?: string + code?: integer + message?: string + file?: string + line?: integer + } +} +``` + +*** + +### [PATCH]/api/v2/ui/hashlists/{id:[0-9]+}/relationships/{relation:hashlists} + +- Security +bearerAuth + +#### RequestBody + +- application/json + +```ts +{ + data: { + type?: string + attributes: { + accessGroupId?: integer + isArchived?: boolean + isSecret?: boolean + name?: string + notes?: string + } + } +} +``` + +#### Responses + +- 200 successful operation + +`application/json` + +```ts +{ + jsonapi: { + version?: string //default: 1.1 + ext?: string //default: https://jsonapi.org/profiles/ethanresnick/cursor-pagination + } + id?: integer + type?: string //default: Hashlist + data: { + name?: string + format?: enum[0, 1, 2, 3] + hashTypeId?: integer + hashCount?: integer + separator?: string + cracked?: integer + isSecret?: boolean + isHexSalt?: boolean + isSalted?: boolean + accessGroupId?: integer + notes?: string + useBrain?: boolean + brainFeatures?: integer + isArchived?: boolean + } +} +``` + +- 400 Invalid request + +`application/json` + +```ts +{ + title?: string + type?: string + status?: integer +} +``` + +- 401 Authentication failed + +`application/json` + +```ts +{ + title?: string + type?: string + status?: integer +} +``` + +- 404 Not Found + +`application/json` + +```ts +{ + message?: string + exception: { + type?: string + code?: integer + message?: string + file?: string + line?: integer + } +} +``` + +*** + +### [POST]/api/v2/ui/hashlists/{id:[0-9]+}/relationships/{relation:hashlists} + +- Security +bearerAuth + +#### RequestBody + +- application/json + +#### Responses + +- 204 successfully created + +- 400 Invalid request + +`application/json` + +```ts +{ + title?: string + type?: string + status?: integer +} +``` + +- 401 Authentication failed + +`application/json` + +```ts +{ + title?: string + type?: string + status?: integer +} +``` + +- 404 Not Found + +`application/json` + +```ts +{ + message?: string + exception: { + type?: string + code?: integer + message?: string + file?: string + line?: integer + } +} +``` + +*** + +### [DELETE]/api/v2/ui/hashlists/{id:[0-9]+}/relationships/{relation:hashlists} + +- Security +bearerAuth + +#### RequestBody + +- application/json + +#### Responses + +- 204 successfully deleted + +- 400 Invalid request + +`application/json` + +```ts +{ + title?: string + type?: string + status?: integer +} +``` + +- 401 Authentication failed + +`application/json` + +```ts +{ + title?: string + type?: string + status?: integer +} +``` + +- 404 Not Found + +`application/json` + +```ts +{ + message?: string + exception: { + type?: string + code?: integer + message?: string + file?: string + line?: integer + } +} +``` + +*** + +### [GET]/api/v2/ui/hashlists/{id:[0-9]+}/{relation:tasks} + +- Description +GET request for for a to-one relationship link. Returns the resource record of the object that is part of the specified relation. + +- Security +bearerAuth + +#### Parameters(Query) + +```ts +include?: string +``` + +#### Responses + +- 200 successful operation + +`application/json` + +```ts +{ + jsonapi: { + version?: string //default: 1.1 + ext?: string //default: https://jsonapi.org/profiles/ethanresnick/cursor-pagination + } + links: { + self?: string //default: /api/v2/ui/hashlists?page[size]=25 + first?: string //default: /api/v2/ui/hashlists?page[size]=25&page[after]=0 + last?: string //default: /api/v2/ui/hashlists?page[size]=25&page[before]=500 + next?: string //default: /api/v2/ui/hashlists?page[size]=25&page[after]=25 + previous?: string //default: /api/v2/ui/hashlists?page[size]=25&page[before]=25 + } + id?: integer + type?: string //default: Hashlist + data: { + name?: string + format?: enum[0, 1, 2, 3] + hashTypeId?: integer + hashCount?: integer + separator?: string + cracked?: integer + isSecret?: boolean + isHexSalt?: boolean + isSalted?: boolean + accessGroupId?: integer + notes?: string + useBrain?: boolean + brainFeatures?: integer + isArchived?: boolean + } + relationships: { + } + included: { + }[] +} +``` + +- 400 Invalid request + +`application/json` + +```ts +{ + title?: string + type?: string + status?: integer +} +``` + +- 401 Authentication failed + +`application/json` + +```ts +{ + title?: string + type?: string + status?: integer +} +``` + +- 404 Not Found + +`application/json` + +```ts +{ + message?: string + exception: { + type?: string + code?: integer + message?: string + file?: string + line?: integer + } +} +``` + +*** + +### [GET]/api/v2/ui/hashlists/{id:[0-9]+}/relationships/{relation:tasks} + +- Description +GET request for for a to-one relationship link. Returns the resource record of the object that is part of the specified relation. + +- Security +bearerAuth + +#### Parameters(Query) + +```ts +include?: string +``` + +#### Responses + +- 200 successful operation + +`application/json` + +```ts +{ + jsonapi: { + version?: string //default: 1.1 + ext?: string //default: https://jsonapi.org/profiles/ethanresnick/cursor-pagination + } + links: { + self?: string //default: /api/v2/ui/hashlists?page[size]=25 + first?: string //default: /api/v2/ui/hashlists?page[size]=25&page[after]=0 + last?: string //default: /api/v2/ui/hashlists?page[size]=25&page[before]=500 + next?: string //default: /api/v2/ui/hashlists?page[size]=25&page[after]=25 + previous?: string //default: /api/v2/ui/hashlists?page[size]=25&page[before]=25 + } + id?: integer + type?: string //default: Hashlist + data: { + name?: string + format?: enum[0, 1, 2, 3] + hashTypeId?: integer + hashCount?: integer + separator?: string + cracked?: integer + isSecret?: boolean + isHexSalt?: boolean + isSalted?: boolean + accessGroupId?: integer + notes?: string + useBrain?: boolean + brainFeatures?: integer + isArchived?: boolean + } + relationships: { + } + included: { + }[] +} +``` + +- 400 Invalid request + +`application/json` + +```ts +{ + title?: string + type?: string + status?: integer +} +``` + +- 401 Authentication failed + +`application/json` + +```ts +{ + title?: string + type?: string + status?: integer +} +``` + +- 404 Not Found + +`application/json` + +```ts +{ + message?: string + exception: { + type?: string + code?: integer + message?: string + file?: string + line?: integer + } +} +``` + +*** + +### [PATCH]/api/v2/ui/hashlists/{id:[0-9]+}/relationships/{relation:tasks} + +- Security +bearerAuth + +#### RequestBody + +- application/json + +```ts +{ + data: { + type?: string + attributes: { + accessGroupId?: integer + isArchived?: boolean + isSecret?: boolean + name?: string + notes?: string + } + } +} +``` + +#### Responses + +- 200 successful operation + +`application/json` + +```ts +{ + jsonapi: { + version?: string //default: 1.1 + ext?: string //default: https://jsonapi.org/profiles/ethanresnick/cursor-pagination + } + id?: integer + type?: string //default: Hashlist + data: { + name?: string + format?: enum[0, 1, 2, 3] + hashTypeId?: integer + hashCount?: integer + separator?: string + cracked?: integer + isSecret?: boolean + isHexSalt?: boolean + isSalted?: boolean + accessGroupId?: integer + notes?: string + useBrain?: boolean + brainFeatures?: integer + isArchived?: boolean + } +} +``` + +- 400 Invalid request + +`application/json` + +```ts +{ + title?: string + type?: string + status?: integer +} +``` + +- 401 Authentication failed + +`application/json` + +```ts +{ + title?: string + type?: string + status?: integer +} +``` + +- 404 Not Found + +`application/json` + +```ts +{ + message?: string + exception: { + type?: string + code?: integer + message?: string + file?: string + line?: integer + } +} +``` + +*** + +### [POST]/api/v2/ui/hashlists/{id:[0-9]+}/relationships/{relation:tasks} + +- Security +bearerAuth + +#### RequestBody + +- application/json + +#### Responses + +- 204 successfully created + +- 400 Invalid request + +`application/json` + +```ts +{ + title?: string + type?: string + status?: integer +} +``` + +- 401 Authentication failed + +`application/json` + +```ts +{ + title?: string + type?: string + status?: integer +} +``` + +- 404 Not Found + +`application/json` + +```ts +{ + message?: string + exception: { + type?: string + code?: integer + message?: string + file?: string + line?: integer + } +} +``` + +*** + +### [DELETE]/api/v2/ui/hashlists/{id:[0-9]+}/relationships/{relation:tasks} + +- Security +bearerAuth + +#### RequestBody + +- application/json + +#### Responses + +- 204 successfully deleted + +- 400 Invalid request + +`application/json` + +```ts +{ + title?: string + type?: string + status?: integer +} +``` + +- 401 Authentication failed + +`application/json` + +```ts +{ + title?: string + type?: string + status?: integer +} +``` + +- 404 Not Found + +`application/json` + +```ts +{ + message?: string + exception: { + type?: string + code?: integer + message?: string + file?: string + line?: integer + } +} +``` + +*** + +### [GET]/api/v2/ui/hashlists/{id:[0-9]+} + +- Description +GET request to retrieve a single object. + +- Security +bearerAuth + +#### Parameters(Query) + +```ts +include?: string +``` + +#### Responses + +- 200 successful operation + +`application/json` + +```ts +{ + jsonapi: { + version?: string //default: 1.1 + ext?: string //default: https://jsonapi.org/profiles/ethanresnick/cursor-pagination + } + links: { + self?: string //default: /api/v2/ui/hashlists?page[size]=25 + first?: string //default: /api/v2/ui/hashlists?page[size]=25&page[after]=0 + last?: string //default: /api/v2/ui/hashlists?page[size]=25&page[before]=500 + next?: string //default: /api/v2/ui/hashlists?page[size]=25&page[after]=25 + previous?: string //default: /api/v2/ui/hashlists?page[size]=25&page[before]=25 + } + id?: integer + type?: string //default: Hashlist + data: { + name?: string + format?: enum[0, 1, 2, 3] + hashTypeId?: integer + hashCount?: integer + separator?: string + cracked?: integer + isSecret?: boolean + isHexSalt?: boolean + isSalted?: boolean + accessGroupId?: integer + notes?: string + useBrain?: boolean + brainFeatures?: integer + isArchived?: boolean + } + relationships: { + } + included: { + }[] +} +``` + +- 400 Invalid request + +`application/json` + +```ts +{ + title?: string + type?: string + status?: integer +} +``` + +- 401 Authentication failed + +`application/json` + +```ts +{ + title?: string + type?: string + status?: integer +} +``` + +- 404 Not Found + +`application/json` + +```ts +{ + message?: string + exception: { + type?: string + code?: integer + message?: string + file?: string + line?: integer + } +} +``` + +*** + +### [PATCH]/api/v2/ui/hashlists/{id:[0-9]+} + +- Description +PATCH request to update attributes of a single object. + +- Security +bearerAuth + +#### RequestBody + +- application/json + +```ts +{ + data: { + type?: string + attributes: { + accessGroupId?: integer + isArchived?: boolean + isSecret?: boolean + name?: string + notes?: string + } + } +} +``` + +#### Responses + +- 200 successful operation + +`application/json` + +```ts +{ + jsonapi: { + version?: string //default: 1.1 + ext?: string //default: https://jsonapi.org/profiles/ethanresnick/cursor-pagination + } + id?: integer + type?: string //default: Hashlist + data: { + name?: string + format?: enum[0, 1, 2, 3] + hashTypeId?: integer + hashCount?: integer + separator?: string + cracked?: integer + isSecret?: boolean + isHexSalt?: boolean + isSalted?: boolean + accessGroupId?: integer + notes?: string + useBrain?: boolean + brainFeatures?: integer + isArchived?: boolean + } +} +``` + +- 400 Invalid request + +`application/json` + +```ts +{ + title?: string + type?: string + status?: integer +} +``` + +- 401 Authentication failed + +`application/json` + +```ts +{ + title?: string + type?: string + status?: integer +} +``` + +- 404 Not Found + +`application/json` + +```ts +{ + message?: string + exception: { + type?: string + code?: integer + message?: string + file?: string + line?: integer + } +} +``` + +*** + +### [DELETE]/api/v2/ui/hashlists/{id:[0-9]+} + +- Security +bearerAuth + +#### RequestBody + +- application/json + +#### Responses + +- 204 successfully deleted + +- 400 Invalid request + +`application/json` + +```ts +{ + title?: string + type?: string + status?: integer +} +``` + +- 401 Authentication failed + +`application/json` + +```ts +{ + title?: string + type?: string + status?: integer +} +``` + +- 404 Not Found + +`application/json` + +```ts +{ + message?: string + exception: { + type?: string + code?: integer + message?: string + file?: string + line?: integer + } +} +``` + +*** + +### [GET]/api/v2/ui/hashtypes + +- Description +GET many request to retrieve multiple objects. + +- Security +bearerAuth + +#### Parameters(Query) + +```ts +page[after]?: integer +``` + +```ts +page[before]?: integer +``` + +```ts +page[size]?: integer +``` + +```ts +filter: { +} +``` + +```ts +include?: string +``` + +#### Responses + +- 200 successful operation + +`application/json` + +```ts +{ + jsonapi: { + version?: string //default: 1.1 + ext?: string //default: https://jsonapi.org/profiles/ethanresnick/cursor-pagination + } + links: { + self?: string //default: /api/v2/ui/hashtypes?page[size]=25 + first?: string //default: /api/v2/ui/hashtypes?page[size]=25&page[after]=0 + last?: string //default: /api/v2/ui/hashtypes?page[size]=25&page[before]=500 + next?: string //default: /api/v2/ui/hashtypes?page[size]=25&page[after]=25 + previous?: string //default: /api/v2/ui/hashtypes?page[size]=25&page[before]=25 + } + id?: integer + type?: string //default: HashType + data: { + description?: string + isSalted?: boolean + isSlowHash?: boolean + } + relationships: { + } + included: { + }[] +}[] +``` + +- 400 Invalid request + +`application/json` + +```ts +{ + title?: string + type?: string + status?: integer +} +``` + +- 401 Authentication failed + +`application/json` + +```ts +{ + title?: string + type?: string + status?: integer +} +``` + +*** + +### [POST]/api/v2/ui/hashtypes + +- Description +POST request to create a new object. The request must contain the resource record as data with the attributes of the new object.To add relationships, a relationships object can be added with the resource records of the relations that are part of this object. + +- Security +bearerAuth + +#### RequestBody + +- application/json + +```ts +{ + data: { + type?: string + attributes: { + description?: string + isSalted?: boolean + isSlowHash?: boolean + } + } +} +``` + +#### Responses + +- 201 successful operation + +`application/json` + +```ts +{ + jsonapi: { + version?: string //default: 1.1 + ext?: string //default: https://jsonapi.org/profiles/ethanresnick/cursor-pagination + } + id?: integer + type?: string //default: HashType + data: { + description?: string + isSalted?: boolean + isSlowHash?: boolean + } +} +``` + +- 400 Invalid request + +`application/json` + +```ts +{ + title?: string + type?: string + status?: integer +} +``` + +- 401 Authentication failed + +`application/json` + +```ts +{ + title?: string + type?: string + status?: integer +} +``` + +*** + +### [GET]/api/v2/ui/hashtypes/count + +- Description +GET many request to retrieve multiple objects. + +- Security +bearerAuth + +#### Parameters(Query) + +```ts +page[after]?: integer +``` + +```ts +page[before]?: integer +``` + +```ts +page[size]?: integer +``` + +```ts +filter: { +} +``` + +```ts +include?: string +``` + +#### Responses + +- 200 successful operation + +`application/json` + +```ts +{ + jsonapi: { + version?: string //default: 1.1 + ext?: string //default: https://jsonapi.org/profiles/ethanresnick/cursor-pagination + } + links: { + self?: string //default: /api/v2/ui/hashtypes?page[size]=25 + first?: string //default: /api/v2/ui/hashtypes?page[size]=25&page[after]=0 + last?: string //default: /api/v2/ui/hashtypes?page[size]=25&page[before]=500 + next?: string //default: /api/v2/ui/hashtypes?page[size]=25&page[after]=25 + previous?: string //default: /api/v2/ui/hashtypes?page[size]=25&page[before]=25 + } + id?: integer + type?: string //default: HashType + data: { + description?: string + isSalted?: boolean + isSlowHash?: boolean + } + relationships: { + } + included: { + }[] +}[] +``` + +- 400 Invalid request + +`application/json` + +```ts +{ + title?: string + type?: string + status?: integer +} +``` + +- 401 Authentication failed + +`application/json` + +```ts +{ + title?: string + type?: string + status?: integer +} +``` + +*** + +### [GET]/api/v2/ui/hashtypes/{id:[0-9]+} + +- Description +GET request to retrieve a single object. + +- Security +bearerAuth + +#### Parameters(Query) + +```ts +include?: string +``` + +#### Responses + +- 200 successful operation + +`application/json` + +```ts +{ + jsonapi: { + version?: string //default: 1.1 + ext?: string //default: https://jsonapi.org/profiles/ethanresnick/cursor-pagination + } + links: { + self?: string //default: /api/v2/ui/hashtypes?page[size]=25 + first?: string //default: /api/v2/ui/hashtypes?page[size]=25&page[after]=0 + last?: string //default: /api/v2/ui/hashtypes?page[size]=25&page[before]=500 + next?: string //default: /api/v2/ui/hashtypes?page[size]=25&page[after]=25 + previous?: string //default: /api/v2/ui/hashtypes?page[size]=25&page[before]=25 + } + id?: integer + type?: string //default: HashType + data: { + description?: string + isSalted?: boolean + isSlowHash?: boolean + } + relationships: { + } + included: { + }[] +} +``` + +- 400 Invalid request + +`application/json` + +```ts +{ + title?: string + type?: string + status?: integer +} +``` + +- 401 Authentication failed + +`application/json` + +```ts +{ + title?: string + type?: string + status?: integer +} +``` + +- 404 Not Found + +`application/json` + +```ts +{ + message?: string + exception: { + type?: string + code?: integer + message?: string + file?: string + line?: integer + } +} +``` + +*** + +### [PATCH]/api/v2/ui/hashtypes/{id:[0-9]+} + +- Description +PATCH request to update attributes of a single object. + +- Security +bearerAuth + +#### RequestBody + +- application/json + +```ts +{ + data: { + type?: string + attributes: { + description?: string + isSalted?: boolean + isSlowHash?: boolean + } + } +} +``` + +#### Responses + +- 200 successful operation + +`application/json` + +```ts +{ + jsonapi: { + version?: string //default: 1.1 + ext?: string //default: https://jsonapi.org/profiles/ethanresnick/cursor-pagination + } + id?: integer + type?: string //default: HashType + data: { + description?: string + isSalted?: boolean + isSlowHash?: boolean + } +} +``` + +- 400 Invalid request + +`application/json` + +```ts +{ + title?: string + type?: string + status?: integer +} +``` + +- 401 Authentication failed + +`application/json` + +```ts +{ + title?: string + type?: string + status?: integer +} +``` + +- 404 Not Found + +`application/json` + +```ts +{ + message?: string + exception: { + type?: string + code?: integer + message?: string + file?: string + line?: integer + } +} +``` + +*** + +### [DELETE]/api/v2/ui/hashtypes/{id:[0-9]+} + +- Security +bearerAuth + +#### RequestBody + +- application/json + +#### Responses + +- 204 successfully deleted + +- 400 Invalid request + +`application/json` + +```ts +{ + title?: string + type?: string + status?: integer +} +``` + +- 401 Authentication failed + +`application/json` + +```ts +{ + title?: string + type?: string + status?: integer +} +``` + +- 404 Not Found + +`application/json` + +```ts +{ + message?: string + exception: { + type?: string + code?: integer + message?: string + file?: string + line?: integer + } +} +``` + +*** + +### [GET]/api/v2/ui/healthcheckagents + +- Description +GET many request to retrieve multiple objects. + +- Security +bearerAuth + +#### Parameters(Query) + +```ts +page[after]?: integer +``` + +```ts +page[before]?: integer +``` + +```ts +page[size]?: integer +``` + +```ts +filter: { +} +``` + +```ts +include?: string +``` + +#### Responses + +- 200 successful operation + +`application/json` + +```ts +{ + jsonapi: { + version?: string //default: 1.1 + ext?: string //default: https://jsonapi.org/profiles/ethanresnick/cursor-pagination + } + links: { + self?: string //default: /api/v2/ui/healthcheckagents?page[size]=25 + first?: string //default: /api/v2/ui/healthcheckagents?page[size]=25&page[after]=0 + last?: string //default: /api/v2/ui/healthcheckagents?page[size]=25&page[before]=500 + next?: string //default: /api/v2/ui/healthcheckagents?page[size]=25&page[after]=25 + previous?: string //default: /api/v2/ui/healthcheckagents?page[size]=25&page[before]=25 + } + id?: integer + type?: string //default: HealthCheckAgent + data: { + healthCheckId?: integer + agentId?: integer + status?: integer + cracked?: integer + numGpus?: integer + start?: integer + end?: integer + errors?: string + } + relationships: { + } + included: { + }[] +}[] +``` + +- 400 Invalid request + +`application/json` + +```ts +{ + title?: string + type?: string + status?: integer +} +``` + +- 401 Authentication failed + +`application/json` + +```ts +{ + title?: string + type?: string + status?: integer +} +``` + +*** + +### [GET]/api/v2/ui/healthcheckagents/count + +- Description +GET many request to retrieve multiple objects. + +- Security +bearerAuth + +#### Parameters(Query) + +```ts +page[after]?: integer +``` + +```ts +page[before]?: integer +``` + +```ts +page[size]?: integer +``` + +```ts +filter: { +} +``` + +```ts +include?: string +``` + +#### Responses + +- 200 successful operation + +`application/json` + +```ts +{ + jsonapi: { + version?: string //default: 1.1 + ext?: string //default: https://jsonapi.org/profiles/ethanresnick/cursor-pagination + } + links: { + self?: string //default: /api/v2/ui/healthcheckagents?page[size]=25 + first?: string //default: /api/v2/ui/healthcheckagents?page[size]=25&page[after]=0 + last?: string //default: /api/v2/ui/healthcheckagents?page[size]=25&page[before]=500 + next?: string //default: /api/v2/ui/healthcheckagents?page[size]=25&page[after]=25 + previous?: string //default: /api/v2/ui/healthcheckagents?page[size]=25&page[before]=25 + } + id?: integer + type?: string //default: HealthCheckAgent + data: { + healthCheckId?: integer + agentId?: integer + status?: integer + cracked?: integer + numGpus?: integer + start?: integer + end?: integer + errors?: string + } + relationships: { + } + included: { + }[] +}[] +``` + +- 400 Invalid request + +`application/json` + +```ts +{ + title?: string + type?: string + status?: integer +} +``` + +- 401 Authentication failed + +`application/json` + +```ts +{ + title?: string + type?: string + status?: integer +} +``` + +*** + +### [GET]/api/v2/ui/healthcheckagents/{id:[0-9]+}/{relation:agent} + +- Description +GET request for for a to-one relationship link. Returns the resource record of the object that is part of the specified relation. + +- Security +bearerAuth + +#### Parameters(Query) + +```ts +include?: string +``` + +#### Responses + +- 200 successful operation + +`application/json` + +```ts +{ + jsonapi: { + version?: string //default: 1.1 + ext?: string //default: https://jsonapi.org/profiles/ethanresnick/cursor-pagination + } + links: { + self?: string //default: /api/v2/ui/healthcheckagents?page[size]=25 + first?: string //default: /api/v2/ui/healthcheckagents?page[size]=25&page[after]=0 + last?: string //default: /api/v2/ui/healthcheckagents?page[size]=25&page[before]=500 + next?: string //default: /api/v2/ui/healthcheckagents?page[size]=25&page[after]=25 + previous?: string //default: /api/v2/ui/healthcheckagents?page[size]=25&page[before]=25 + } + id?: integer + type?: string //default: HealthCheckAgent + data: { + healthCheckId?: integer + agentId?: integer + status?: integer + cracked?: integer + numGpus?: integer + start?: integer + end?: integer + errors?: string + } + relationships: { + } + included: { + }[] +} +``` + +- 400 Invalid request + +`application/json` + +```ts +{ + title?: string + type?: string + status?: integer +} +``` + +- 401 Authentication failed + +`application/json` + +```ts +{ + title?: string + type?: string + status?: integer +} +``` + +- 404 Not Found + +`application/json` + +```ts +{ + message?: string + exception: { + type?: string + code?: integer + message?: string + file?: string + line?: integer + } +} +``` + +*** + +### [GET]/api/v2/ui/healthcheckagents/{id:[0-9]+}/relationships/{relation:agent} + +- Description +GET request for for a to-one relationship link. Returns the resource record of the object that is part of the specified relation. + +- Security +bearerAuth + +#### Parameters(Query) + +```ts +include?: string +``` + +#### Responses + +- 200 successful operation + +`application/json` + +```ts +{ + jsonapi: { + version?: string //default: 1.1 + ext?: string //default: https://jsonapi.org/profiles/ethanresnick/cursor-pagination + } + links: { + self?: string //default: /api/v2/ui/healthcheckagents?page[size]=25 + first?: string //default: /api/v2/ui/healthcheckagents?page[size]=25&page[after]=0 + last?: string //default: /api/v2/ui/healthcheckagents?page[size]=25&page[before]=500 + next?: string //default: /api/v2/ui/healthcheckagents?page[size]=25&page[after]=25 + previous?: string //default: /api/v2/ui/healthcheckagents?page[size]=25&page[before]=25 + } + id?: integer + type?: string //default: HealthCheckAgent + data: { + healthCheckId?: integer + agentId?: integer + status?: integer + cracked?: integer + numGpus?: integer + start?: integer + end?: integer + errors?: string + } + relationships: { + } + included: { + }[] +} +``` + +- 400 Invalid request + +`application/json` + +```ts +{ + title?: string + type?: string + status?: integer +} +``` + +- 401 Authentication failed + +`application/json` + +```ts +{ + title?: string + type?: string + status?: integer +} +``` + +- 404 Not Found + +`application/json` + +```ts +{ + message?: string + exception: { + type?: string + code?: integer + message?: string + file?: string + line?: integer + } +} +``` + +*** + +### [PATCH]/api/v2/ui/healthcheckagents/{id:[0-9]+}/relationships/{relation:agent} + +- Security +bearerAuth + +#### RequestBody + +- application/json + +```ts +{ + data: { + type?: string + attributes: { + } + } +} +``` + +#### Responses + +- 200 successful operation + +`application/json` + +```ts +{ + jsonapi: { + version?: string //default: 1.1 + ext?: string //default: https://jsonapi.org/profiles/ethanresnick/cursor-pagination + } + id?: integer + type?: string //default: HealthCheckAgent + data: { + healthCheckId?: integer + agentId?: integer + status?: integer + cracked?: integer + numGpus?: integer + start?: integer + end?: integer + errors?: string + } +} +``` + +- 400 Invalid request + +`application/json` + +```ts +{ + title?: string + type?: string + status?: integer +} +``` + +- 401 Authentication failed + +`application/json` + +```ts +{ + title?: string + type?: string + status?: integer +} +``` + +- 404 Not Found + +`application/json` + +```ts +{ + message?: string + exception: { + type?: string + code?: integer + message?: string + file?: string + line?: integer + } +} +``` + +*** + +### [GET]/api/v2/ui/healthcheckagents/{id:[0-9]+}/{relation:healthCheck} + +- Description +GET request for for a to-one relationship link. Returns the resource record of the object that is part of the specified relation. + +- Security +bearerAuth + +#### Parameters(Query) + +```ts +include?: string +``` + +#### Responses + +- 200 successful operation + +`application/json` + +```ts +{ + jsonapi: { + version?: string //default: 1.1 + ext?: string //default: https://jsonapi.org/profiles/ethanresnick/cursor-pagination + } + links: { + self?: string //default: /api/v2/ui/healthcheckagents?page[size]=25 + first?: string //default: /api/v2/ui/healthcheckagents?page[size]=25&page[after]=0 + last?: string //default: /api/v2/ui/healthcheckagents?page[size]=25&page[before]=500 + next?: string //default: /api/v2/ui/healthcheckagents?page[size]=25&page[after]=25 + previous?: string //default: /api/v2/ui/healthcheckagents?page[size]=25&page[before]=25 + } + id?: integer + type?: string //default: HealthCheckAgent + data: { + healthCheckId?: integer + agentId?: integer + status?: integer + cracked?: integer + numGpus?: integer + start?: integer + end?: integer + errors?: string + } + relationships: { + } + included: { + }[] +} +``` + +- 400 Invalid request + +`application/json` + +```ts +{ + title?: string + type?: string + status?: integer +} +``` + +- 401 Authentication failed + +`application/json` + +```ts +{ + title?: string + type?: string + status?: integer +} +``` + +- 404 Not Found + +`application/json` + +```ts +{ + message?: string + exception: { + type?: string + code?: integer + message?: string + file?: string + line?: integer + } +} +``` + +*** + +### [GET]/api/v2/ui/healthcheckagents/{id:[0-9]+}/relationships/{relation:healthCheck} + +- Description +GET request for for a to-one relationship link. Returns the resource record of the object that is part of the specified relation. + +- Security +bearerAuth + +#### Parameters(Query) + +```ts +include?: string +``` + +#### Responses + +- 200 successful operation + +`application/json` + +```ts +{ + jsonapi: { + version?: string //default: 1.1 + ext?: string //default: https://jsonapi.org/profiles/ethanresnick/cursor-pagination + } + links: { + self?: string //default: /api/v2/ui/healthcheckagents?page[size]=25 + first?: string //default: /api/v2/ui/healthcheckagents?page[size]=25&page[after]=0 + last?: string //default: /api/v2/ui/healthcheckagents?page[size]=25&page[before]=500 + next?: string //default: /api/v2/ui/healthcheckagents?page[size]=25&page[after]=25 + previous?: string //default: /api/v2/ui/healthcheckagents?page[size]=25&page[before]=25 + } + id?: integer + type?: string //default: HealthCheckAgent + data: { + healthCheckId?: integer + agentId?: integer + status?: integer + cracked?: integer + numGpus?: integer + start?: integer + end?: integer + errors?: string + } + relationships: { + } + included: { + }[] +} +``` + +- 400 Invalid request + +`application/json` + +```ts +{ + title?: string + type?: string + status?: integer +} +``` + +- 401 Authentication failed + +`application/json` + +```ts +{ + title?: string + type?: string + status?: integer +} +``` + +- 404 Not Found + +`application/json` + +```ts +{ + message?: string + exception: { + type?: string + code?: integer + message?: string + file?: string + line?: integer + } +} +``` + +*** + +### [PATCH]/api/v2/ui/healthcheckagents/{id:[0-9]+}/relationships/{relation:healthCheck} + +- Security +bearerAuth + +#### RequestBody + +- application/json + +```ts +{ + data: { + type?: string + attributes: { + } + } +} +``` + +#### Responses + +- 200 successful operation + +`application/json` + +```ts +{ + jsonapi: { + version?: string //default: 1.1 + ext?: string //default: https://jsonapi.org/profiles/ethanresnick/cursor-pagination + } + id?: integer + type?: string //default: HealthCheckAgent + data: { + healthCheckId?: integer + agentId?: integer + status?: integer + cracked?: integer + numGpus?: integer + start?: integer + end?: integer + errors?: string + } +} +``` + +- 400 Invalid request + +`application/json` + +```ts +{ + title?: string + type?: string + status?: integer +} +``` + +- 401 Authentication failed + +`application/json` + +```ts +{ + title?: string + type?: string + status?: integer +} +``` + +- 404 Not Found + +`application/json` + +```ts +{ + message?: string + exception: { + type?: string + code?: integer + message?: string + file?: string + line?: integer + } +} +``` + +*** + +### [GET]/api/v2/ui/healthcheckagents/{id:[0-9]+} + +- Description +GET request to retrieve a single object. + +- Security +bearerAuth + +#### Parameters(Query) + +```ts +include?: string +``` + +#### Responses + +- 200 successful operation + +`application/json` + +```ts +{ + jsonapi: { + version?: string //default: 1.1 + ext?: string //default: https://jsonapi.org/profiles/ethanresnick/cursor-pagination + } + links: { + self?: string //default: /api/v2/ui/healthcheckagents?page[size]=25 + first?: string //default: /api/v2/ui/healthcheckagents?page[size]=25&page[after]=0 + last?: string //default: /api/v2/ui/healthcheckagents?page[size]=25&page[before]=500 + next?: string //default: /api/v2/ui/healthcheckagents?page[size]=25&page[after]=25 + previous?: string //default: /api/v2/ui/healthcheckagents?page[size]=25&page[before]=25 + } + id?: integer + type?: string //default: HealthCheckAgent + data: { + healthCheckId?: integer + agentId?: integer + status?: integer + cracked?: integer + numGpus?: integer + start?: integer + end?: integer + errors?: string + } + relationships: { + } + included: { + }[] +} +``` + +- 400 Invalid request + +`application/json` + +```ts +{ + title?: string + type?: string + status?: integer +} +``` + +- 401 Authentication failed + +`application/json` + +```ts +{ + title?: string + type?: string + status?: integer +} +``` + +- 404 Not Found + +`application/json` + +```ts +{ + message?: string + exception: { + type?: string + code?: integer + message?: string + file?: string + line?: integer + } +} +``` + +*** + +### [GET]/api/v2/ui/healthchecks + +- Description +GET many request to retrieve multiple objects. + +- Security +bearerAuth + +#### Parameters(Query) + +```ts +page[after]?: integer +``` + +```ts +page[before]?: integer +``` + +```ts +page[size]?: integer +``` + +```ts +filter: { +} +``` + +```ts +include?: string +``` + +#### Responses + +- 200 successful operation + +`application/json` + +```ts +{ + jsonapi: { + version?: string //default: 1.1 + ext?: string //default: https://jsonapi.org/profiles/ethanresnick/cursor-pagination + } + links: { + self?: string //default: /api/v2/ui/healthchecks?page[size]=25 + first?: string //default: /api/v2/ui/healthchecks?page[size]=25&page[after]=0 + last?: string //default: /api/v2/ui/healthchecks?page[size]=25&page[before]=500 + next?: string //default: /api/v2/ui/healthchecks?page[size]=25&page[after]=25 + previous?: string //default: /api/v2/ui/healthchecks?page[size]=25&page[before]=25 + } + id?: integer + type?: string //default: HealthCheck + data: { + time?: integer + status?: integer + checkType?: integer + hashtypeId?: integer + crackerBinaryId?: integer + expectedCracks?: integer + attackCmd?: string + } + relationships: { + } + included: { + }[] +}[] +``` + +- 400 Invalid request + +`application/json` + +```ts +{ + title?: string + type?: string + status?: integer +} +``` + +- 401 Authentication failed + +`application/json` + +```ts +{ + title?: string + type?: string + status?: integer +} +``` + +*** + +### [POST]/api/v2/ui/healthchecks + +- Description +POST request to create a new object. The request must contain the resource record as data with the attributes of the new object.To add relationships, a relationships object can be added with the resource records of the relations that are part of this object. + +- Security +bearerAuth + +#### RequestBody + +- application/json + +```ts +{ + data: { + type?: string + attributes: { + time?: integer + status?: integer + checkType?: integer + hashtypeId?: integer + crackerBinaryId?: integer + expectedCracks?: integer + attackCmd?: string + } + } +} +``` + +#### Responses + +- 201 successful operation + +`application/json` + +```ts +{ + jsonapi: { + version?: string //default: 1.1 + ext?: string //default: https://jsonapi.org/profiles/ethanresnick/cursor-pagination + } + id?: integer + type?: string //default: HealthCheck + data: { + time?: integer + status?: integer + checkType?: integer + hashtypeId?: integer + crackerBinaryId?: integer + expectedCracks?: integer + attackCmd?: string + } +} +``` + +- 400 Invalid request + +`application/json` + +```ts +{ + title?: string + type?: string + status?: integer +} +``` + +- 401 Authentication failed + +`application/json` + +```ts +{ + title?: string + type?: string + status?: integer +} +``` + +*** + +### [GET]/api/v2/ui/healthchecks/count + +- Description +GET many request to retrieve multiple objects. + +- Security +bearerAuth + +#### Parameters(Query) + +```ts +page[after]?: integer +``` + +```ts +page[before]?: integer +``` + +```ts +page[size]?: integer +``` + +```ts +filter: { +} +``` + +```ts +include?: string +``` + +#### Responses + +- 200 successful operation + +`application/json` + +```ts +{ + jsonapi: { + version?: string //default: 1.1 + ext?: string //default: https://jsonapi.org/profiles/ethanresnick/cursor-pagination + } + links: { + self?: string //default: /api/v2/ui/healthchecks?page[size]=25 + first?: string //default: /api/v2/ui/healthchecks?page[size]=25&page[after]=0 + last?: string //default: /api/v2/ui/healthchecks?page[size]=25&page[before]=500 + next?: string //default: /api/v2/ui/healthchecks?page[size]=25&page[after]=25 + previous?: string //default: /api/v2/ui/healthchecks?page[size]=25&page[before]=25 + } + id?: integer + type?: string //default: HealthCheck + data: { + time?: integer + status?: integer + checkType?: integer + hashtypeId?: integer + crackerBinaryId?: integer + expectedCracks?: integer + attackCmd?: string + } + relationships: { + } + included: { + }[] +}[] +``` + +- 400 Invalid request + +`application/json` + +```ts +{ + title?: string + type?: string + status?: integer +} +``` + +- 401 Authentication failed + +`application/json` + +```ts +{ + title?: string + type?: string + status?: integer +} +``` + +*** + +### [GET]/api/v2/ui/healthchecks/{id:[0-9]+}/{relation:crackerBinary} + +- Description +GET request for for a to-one relationship link. Returns the resource record of the object that is part of the specified relation. + +- Security +bearerAuth + +#### Parameters(Query) + +```ts +include?: string +``` + +#### Responses + +- 200 successful operation + +`application/json` + +```ts +{ + jsonapi: { + version?: string //default: 1.1 + ext?: string //default: https://jsonapi.org/profiles/ethanresnick/cursor-pagination + } + links: { + self?: string //default: /api/v2/ui/healthchecks?page[size]=25 + first?: string //default: /api/v2/ui/healthchecks?page[size]=25&page[after]=0 + last?: string //default: /api/v2/ui/healthchecks?page[size]=25&page[before]=500 + next?: string //default: /api/v2/ui/healthchecks?page[size]=25&page[after]=25 + previous?: string //default: /api/v2/ui/healthchecks?page[size]=25&page[before]=25 + } + id?: integer + type?: string //default: HealthCheck + data: { + time?: integer + status?: integer + checkType?: integer + hashtypeId?: integer + crackerBinaryId?: integer + expectedCracks?: integer + attackCmd?: string + } + relationships: { + } + included: { + }[] +} +``` + +- 400 Invalid request + +`application/json` + +```ts +{ + title?: string + type?: string + status?: integer +} +``` + +- 401 Authentication failed + +`application/json` + +```ts +{ + title?: string + type?: string + status?: integer +} +``` + +- 404 Not Found + +`application/json` + +```ts +{ + message?: string + exception: { + type?: string + code?: integer + message?: string + file?: string + line?: integer + } +} +``` + +*** + +### [GET]/api/v2/ui/healthchecks/{id:[0-9]+}/relationships/{relation:crackerBinary} + +- Description +GET request for for a to-one relationship link. Returns the resource record of the object that is part of the specified relation. + +- Security +bearerAuth + +#### Parameters(Query) + +```ts +include?: string +``` + +#### Responses + +- 200 successful operation + +`application/json` + +```ts +{ + jsonapi: { + version?: string //default: 1.1 + ext?: string //default: https://jsonapi.org/profiles/ethanresnick/cursor-pagination + } + links: { + self?: string //default: /api/v2/ui/healthchecks?page[size]=25 + first?: string //default: /api/v2/ui/healthchecks?page[size]=25&page[after]=0 + last?: string //default: /api/v2/ui/healthchecks?page[size]=25&page[before]=500 + next?: string //default: /api/v2/ui/healthchecks?page[size]=25&page[after]=25 + previous?: string //default: /api/v2/ui/healthchecks?page[size]=25&page[before]=25 + } + id?: integer + type?: string //default: HealthCheck + data: { + time?: integer + status?: integer + checkType?: integer + hashtypeId?: integer + crackerBinaryId?: integer + expectedCracks?: integer + attackCmd?: string + } + relationships: { + } + included: { + }[] +} +``` + +- 400 Invalid request + +`application/json` + +```ts +{ + title?: string + type?: string + status?: integer +} +``` + +- 401 Authentication failed + +`application/json` + +```ts +{ + title?: string + type?: string + status?: integer +} +``` + +- 404 Not Found + +`application/json` + +```ts +{ + message?: string + exception: { + type?: string + code?: integer + message?: string + file?: string + line?: integer + } +} +``` + +*** + +### [PATCH]/api/v2/ui/healthchecks/{id:[0-9]+}/relationships/{relation:crackerBinary} + +- Security +bearerAuth + +#### RequestBody + +- application/json + +```ts +{ + data: { + type?: string + attributes: { + checkType?: integer + crackerBinaryId?: integer + hashtypeId?: integer + } + } +} +``` + +#### Responses + +- 200 successful operation + +`application/json` + +```ts +{ + jsonapi: { + version?: string //default: 1.1 + ext?: string //default: https://jsonapi.org/profiles/ethanresnick/cursor-pagination + } + id?: integer + type?: string //default: HealthCheck + data: { + time?: integer + status?: integer + checkType?: integer + hashtypeId?: integer + crackerBinaryId?: integer + expectedCracks?: integer + attackCmd?: string + } +} +``` + +- 400 Invalid request + +`application/json` + +```ts +{ + title?: string + type?: string + status?: integer +} +``` + +- 401 Authentication failed + +`application/json` + +```ts +{ + title?: string + type?: string + status?: integer +} +``` + +- 404 Not Found + +`application/json` + +```ts +{ + message?: string + exception: { + type?: string + code?: integer + message?: string + file?: string + line?: integer + } +} +``` + +*** + +### [GET]/api/v2/ui/healthchecks/{id:[0-9]+}/{relation:healthCheckAgents} + +- Description +GET request for for a to-one relationship link. Returns the resource record of the object that is part of the specified relation. + +- Security +bearerAuth + +#### Parameters(Query) + +```ts +include?: string +``` + +#### Responses + +- 200 successful operation + +`application/json` + +```ts +{ + jsonapi: { + version?: string //default: 1.1 + ext?: string //default: https://jsonapi.org/profiles/ethanresnick/cursor-pagination + } + links: { + self?: string //default: /api/v2/ui/healthchecks?page[size]=25 + first?: string //default: /api/v2/ui/healthchecks?page[size]=25&page[after]=0 + last?: string //default: /api/v2/ui/healthchecks?page[size]=25&page[before]=500 + next?: string //default: /api/v2/ui/healthchecks?page[size]=25&page[after]=25 + previous?: string //default: /api/v2/ui/healthchecks?page[size]=25&page[before]=25 + } + id?: integer + type?: string //default: HealthCheck + data: { + time?: integer + status?: integer + checkType?: integer + hashtypeId?: integer + crackerBinaryId?: integer + expectedCracks?: integer + attackCmd?: string + } + relationships: { + } + included: { + }[] +} +``` + +- 400 Invalid request + +`application/json` + +```ts +{ + title?: string + type?: string + status?: integer +} +``` + +- 401 Authentication failed + +`application/json` + +```ts +{ + title?: string + type?: string + status?: integer +} +``` + +- 404 Not Found + +`application/json` + +```ts +{ + message?: string + exception: { + type?: string + code?: integer + message?: string + file?: string + line?: integer + } +} +``` + +*** + +### [GET]/api/v2/ui/healthchecks/{id:[0-9]+}/relationships/{relation:healthCheckAgents} + +- Description +GET request for for a to-one relationship link. Returns the resource record of the object that is part of the specified relation. + +- Security +bearerAuth + +#### Parameters(Query) + +```ts +include?: string +``` + +#### Responses + +- 200 successful operation + +`application/json` + +```ts +{ + jsonapi: { + version?: string //default: 1.1 + ext?: string //default: https://jsonapi.org/profiles/ethanresnick/cursor-pagination + } + links: { + self?: string //default: /api/v2/ui/healthchecks?page[size]=25 + first?: string //default: /api/v2/ui/healthchecks?page[size]=25&page[after]=0 + last?: string //default: /api/v2/ui/healthchecks?page[size]=25&page[before]=500 + next?: string //default: /api/v2/ui/healthchecks?page[size]=25&page[after]=25 + previous?: string //default: /api/v2/ui/healthchecks?page[size]=25&page[before]=25 + } + id?: integer + type?: string //default: HealthCheck + data: { + time?: integer + status?: integer + checkType?: integer + hashtypeId?: integer + crackerBinaryId?: integer + expectedCracks?: integer + attackCmd?: string + } + relationships: { + } + included: { + }[] +} +``` + +- 400 Invalid request + +`application/json` + +```ts +{ + title?: string + type?: string + status?: integer +} +``` + +- 401 Authentication failed + +`application/json` + +```ts +{ + title?: string + type?: string + status?: integer +} +``` + +- 404 Not Found + +`application/json` + +```ts +{ + message?: string + exception: { + type?: string + code?: integer + message?: string + file?: string + line?: integer + } +} +``` + +*** + +### [PATCH]/api/v2/ui/healthchecks/{id:[0-9]+}/relationships/{relation:healthCheckAgents} + +- Security +bearerAuth + +#### RequestBody + +- application/json + +```ts +{ + data: { + type?: string + attributes: { + checkType?: integer + crackerBinaryId?: integer + hashtypeId?: integer + } + } +} +``` + +#### Responses + +- 200 successful operation + +`application/json` + +```ts +{ + jsonapi: { + version?: string //default: 1.1 + ext?: string //default: https://jsonapi.org/profiles/ethanresnick/cursor-pagination + } + id?: integer + type?: string //default: HealthCheck + data: { + time?: integer + status?: integer + checkType?: integer + hashtypeId?: integer + crackerBinaryId?: integer + expectedCracks?: integer + attackCmd?: string + } +} +``` + +- 400 Invalid request + +`application/json` + +```ts +{ + title?: string + type?: string + status?: integer +} +``` + +- 401 Authentication failed + +`application/json` + +```ts +{ + title?: string + type?: string + status?: integer +} +``` + +- 404 Not Found + +`application/json` + +```ts +{ + message?: string + exception: { + type?: string + code?: integer + message?: string + file?: string + line?: integer + } +} +``` + +*** + +### [POST]/api/v2/ui/healthchecks/{id:[0-9]+}/relationships/{relation:healthCheckAgents} + +- Security +bearerAuth + +#### RequestBody + +- application/json + +#### Responses + +- 204 successfully created + +- 400 Invalid request + +`application/json` + +```ts +{ + title?: string + type?: string + status?: integer +} +``` + +- 401 Authentication failed + +`application/json` + +```ts +{ + title?: string + type?: string + status?: integer +} +``` + +- 404 Not Found + +`application/json` + +```ts +{ + message?: string + exception: { + type?: string + code?: integer + message?: string + file?: string + line?: integer + } +} +``` + +*** + +### [DELETE]/api/v2/ui/healthchecks/{id:[0-9]+}/relationships/{relation:healthCheckAgents} + +- Security +bearerAuth + +#### RequestBody + +- application/json + +#### Responses + +- 204 successfully deleted + +- 400 Invalid request + +`application/json` + +```ts +{ + title?: string + type?: string + status?: integer +} +``` + +- 401 Authentication failed + +`application/json` + +```ts +{ + title?: string + type?: string + status?: integer +} +``` + +- 404 Not Found + +`application/json` + +```ts +{ + message?: string + exception: { + type?: string + code?: integer + message?: string + file?: string + line?: integer + } +} +``` + +*** + +### [GET]/api/v2/ui/healthchecks/{id:[0-9]+} + +- Description +GET request to retrieve a single object. + +- Security +bearerAuth + +#### Parameters(Query) + +```ts +include?: string +``` + +#### Responses + +- 200 successful operation + +`application/json` + +```ts +{ + jsonapi: { + version?: string //default: 1.1 + ext?: string //default: https://jsonapi.org/profiles/ethanresnick/cursor-pagination + } + links: { + self?: string //default: /api/v2/ui/healthchecks?page[size]=25 + first?: string //default: /api/v2/ui/healthchecks?page[size]=25&page[after]=0 + last?: string //default: /api/v2/ui/healthchecks?page[size]=25&page[before]=500 + next?: string //default: /api/v2/ui/healthchecks?page[size]=25&page[after]=25 + previous?: string //default: /api/v2/ui/healthchecks?page[size]=25&page[before]=25 + } + id?: integer + type?: string //default: HealthCheck + data: { + time?: integer + status?: integer + checkType?: integer + hashtypeId?: integer + crackerBinaryId?: integer + expectedCracks?: integer + attackCmd?: string + } + relationships: { + } + included: { + }[] +} +``` + +- 400 Invalid request + +`application/json` + +```ts +{ + title?: string + type?: string + status?: integer +} +``` + +- 401 Authentication failed + +`application/json` + +```ts +{ + title?: string + type?: string + status?: integer +} +``` + +- 404 Not Found + +`application/json` + +```ts +{ + message?: string + exception: { + type?: string + code?: integer + message?: string + file?: string + line?: integer + } +} +``` + +*** + +### [PATCH]/api/v2/ui/healthchecks/{id:[0-9]+} + +- Description +PATCH request to update attributes of a single object. + +- Security +bearerAuth + +#### RequestBody + +- application/json + +```ts +{ + data: { + type?: string + attributes: { + checkType?: integer + crackerBinaryId?: integer + hashtypeId?: integer + } + } +} +``` + +#### Responses + +- 200 successful operation + +`application/json` + +```ts +{ + jsonapi: { + version?: string //default: 1.1 + ext?: string //default: https://jsonapi.org/profiles/ethanresnick/cursor-pagination + } + id?: integer + type?: string //default: HealthCheck + data: { + time?: integer + status?: integer + checkType?: integer + hashtypeId?: integer + crackerBinaryId?: integer + expectedCracks?: integer + attackCmd?: string + } +} +``` + +- 400 Invalid request + +`application/json` + +```ts +{ + title?: string + type?: string + status?: integer +} +``` + +- 401 Authentication failed + +`application/json` + +```ts +{ + title?: string + type?: string + status?: integer +} +``` + +- 404 Not Found + +`application/json` + +```ts +{ + message?: string + exception: { + type?: string + code?: integer + message?: string + file?: string + line?: integer + } +} +``` + +*** + +### [DELETE]/api/v2/ui/healthchecks/{id:[0-9]+} + +- Security +bearerAuth + +#### RequestBody + +- application/json + +#### Responses + +- 204 successfully deleted + +- 400 Invalid request + +`application/json` + +```ts +{ + title?: string + type?: string + status?: integer +} +``` + +- 401 Authentication failed + +`application/json` + +```ts +{ + title?: string + type?: string + status?: integer +} +``` + +- 404 Not Found + +`application/json` + +```ts +{ + message?: string + exception: { + type?: string + code?: integer + message?: string + file?: string + line?: integer + } +} +``` + +*** + +### [GET]/api/v2/ui/logentries + +- Description +GET many request to retrieve multiple objects. + +- Security +bearerAuth + +#### Parameters(Query) + +```ts +page[after]?: integer +``` + +```ts +page[before]?: integer +``` + +```ts +page[size]?: integer +``` + +```ts +filter: { +} +``` + +```ts +include?: string +``` + +#### Responses + +- 200 successful operation + +`application/json` + +```ts +{ + jsonapi: { + version?: string //default: 1.1 + ext?: string //default: https://jsonapi.org/profiles/ethanresnick/cursor-pagination + } + links: { + self?: string //default: /api/v2/ui/logentries?page[size]=25 + first?: string //default: /api/v2/ui/logentries?page[size]=25&page[after]=0 + last?: string //default: /api/v2/ui/logentries?page[size]=25&page[before]=500 + next?: string //default: /api/v2/ui/logentries?page[size]=25&page[after]=25 + previous?: string //default: /api/v2/ui/logentries?page[size]=25&page[before]=25 + } + id?: integer + type?: string //default: LogEntry + data: { + issuer?: string + issuerId?: string + level?: string + message?: string + time?: integer + } + relationships: { + } + included: { + }[] +}[] +``` + +- 400 Invalid request + +`application/json` + +```ts +{ + title?: string + type?: string + status?: integer +} +``` + +- 401 Authentication failed + +`application/json` + +```ts +{ + title?: string + type?: string + status?: integer +} +``` + +*** + +### [POST]/api/v2/ui/logentries + +- Description +POST request to create a new object. The request must contain the resource record as data with the attributes of the new object.To add relationships, a relationships object can be added with the resource records of the relations that are part of this object. + +- Security +bearerAuth + +#### RequestBody + +- application/json + +```ts +{ + data: { + type?: string + attributes: { + issuer?: string + issuerId?: string + level?: string + message?: string + time?: integer + } + } +} +``` + +#### Responses + +- 201 successful operation + +`application/json` + +```ts +{ + jsonapi: { + version?: string //default: 1.1 + ext?: string //default: https://jsonapi.org/profiles/ethanresnick/cursor-pagination + } + id?: integer + type?: string //default: LogEntry + data: { + issuer?: string + issuerId?: string + level?: string + message?: string + time?: integer + } +} +``` + +- 400 Invalid request + +`application/json` + +```ts +{ + title?: string + type?: string + status?: integer +} +``` + +- 401 Authentication failed + +`application/json` + +```ts +{ + title?: string + type?: string + status?: integer +} +``` + +*** + +### [GET]/api/v2/ui/logentries/count + +- Description +GET many request to retrieve multiple objects. + +- Security +bearerAuth + +#### Parameters(Query) + +```ts +page[after]?: integer +``` + +```ts +page[before]?: integer +``` + +```ts +page[size]?: integer +``` + +```ts +filter: { +} +``` + +```ts +include?: string +``` + +#### Responses + +- 200 successful operation + +`application/json` + +```ts +{ + jsonapi: { + version?: string //default: 1.1 + ext?: string //default: https://jsonapi.org/profiles/ethanresnick/cursor-pagination + } + links: { + self?: string //default: /api/v2/ui/logentries?page[size]=25 + first?: string //default: /api/v2/ui/logentries?page[size]=25&page[after]=0 + last?: string //default: /api/v2/ui/logentries?page[size]=25&page[before]=500 + next?: string //default: /api/v2/ui/logentries?page[size]=25&page[after]=25 + previous?: string //default: /api/v2/ui/logentries?page[size]=25&page[before]=25 + } + id?: integer + type?: string //default: LogEntry + data: { + issuer?: string + issuerId?: string + level?: string + message?: string + time?: integer + } + relationships: { + } + included: { + }[] +}[] +``` + +- 400 Invalid request + +`application/json` + +```ts +{ + title?: string + type?: string + status?: integer +} +``` + +- 401 Authentication failed + +`application/json` + +```ts +{ + title?: string + type?: string + status?: integer +} +``` + +*** + +### [GET]/api/v2/ui/logentries/{id:[0-9]+} + +- Description +GET request to retrieve a single object. + +- Security +bearerAuth + +#### Parameters(Query) + +```ts +include?: string +``` + +#### Responses + +- 200 successful operation + +`application/json` + +```ts +{ + jsonapi: { + version?: string //default: 1.1 + ext?: string //default: https://jsonapi.org/profiles/ethanresnick/cursor-pagination + } + links: { + self?: string //default: /api/v2/ui/logentries?page[size]=25 + first?: string //default: /api/v2/ui/logentries?page[size]=25&page[after]=0 + last?: string //default: /api/v2/ui/logentries?page[size]=25&page[before]=500 + next?: string //default: /api/v2/ui/logentries?page[size]=25&page[after]=25 + previous?: string //default: /api/v2/ui/logentries?page[size]=25&page[before]=25 + } + id?: integer + type?: string //default: LogEntry + data: { + issuer?: string + issuerId?: string + level?: string + message?: string + time?: integer + } + relationships: { + } + included: { + }[] +} +``` + +- 400 Invalid request + +`application/json` + +```ts +{ + title?: string + type?: string + status?: integer +} +``` + +- 401 Authentication failed + +`application/json` + +```ts +{ + title?: string + type?: string + status?: integer +} +``` + +- 404 Not Found + +`application/json` + +```ts +{ + message?: string + exception: { + type?: string + code?: integer + message?: string + file?: string + line?: integer + } +} +``` + +*** + +### [PATCH]/api/v2/ui/logentries/{id:[0-9]+} + +- Description +PATCH request to update attributes of a single object. + +- Security +bearerAuth + +#### RequestBody + +- application/json + +```ts +{ + data: { + type?: string + attributes: { + } + } +} +``` + +#### Responses + +- 200 successful operation + +`application/json` + +```ts +{ + jsonapi: { + version?: string //default: 1.1 + ext?: string //default: https://jsonapi.org/profiles/ethanresnick/cursor-pagination + } + id?: integer + type?: string //default: LogEntry + data: { + issuer?: string + issuerId?: string + level?: string + message?: string + time?: integer + } +} +``` + +- 400 Invalid request + +`application/json` + +```ts +{ + title?: string + type?: string + status?: integer +} +``` + +- 401 Authentication failed + +`application/json` + +```ts +{ + title?: string + type?: string + status?: integer +} +``` + +- 404 Not Found + +`application/json` + +```ts +{ + message?: string + exception: { + type?: string + code?: integer + message?: string + file?: string + line?: integer + } +} +``` + +*** + +### [DELETE]/api/v2/ui/logentries/{id:[0-9]+} + +- Security +bearerAuth + +#### RequestBody + +- application/json + +#### Responses + +- 204 successfully deleted + +- 400 Invalid request + +`application/json` + +```ts +{ + title?: string + type?: string + status?: integer +} +``` + +- 401 Authentication failed + +`application/json` + +```ts +{ + title?: string + type?: string + status?: integer +} +``` + +- 404 Not Found + +`application/json` + +```ts +{ + message?: string + exception: { + type?: string + code?: integer + message?: string + file?: string + line?: integer + } +} +``` + +*** + +### [GET]/api/v2/ui/notifications + +- Description +GET many request to retrieve multiple objects. + +- Security +bearerAuth + +#### Parameters(Query) + +```ts +page[after]?: integer +``` + +```ts +page[before]?: integer +``` + +```ts +page[size]?: integer +``` + +```ts +filter: { +} +``` + +```ts +include?: string +``` + +#### Responses + +- 200 successful operation + +`application/json` + +```ts +{ + jsonapi: { + version?: string //default: 1.1 + ext?: string //default: https://jsonapi.org/profiles/ethanresnick/cursor-pagination + } + links: { + self?: string //default: /api/v2/ui/notifications?page[size]=25 + first?: string //default: /api/v2/ui/notifications?page[size]=25&page[after]=0 + last?: string //default: /api/v2/ui/notifications?page[size]=25&page[before]=500 + next?: string //default: /api/v2/ui/notifications?page[size]=25&page[after]=25 + previous?: string //default: /api/v2/ui/notifications?page[size]=25&page[before]=25 + } + id?: integer + type?: string //default: NotificationSetting + data: { + action?: string + objectId?: integer + notification?: string + userId?: integer + receiver?: string + isActive?: boolean + } + relationships: { + } + included: { + }[] +}[] +``` + +- 400 Invalid request + +`application/json` + +```ts +{ + title?: string + type?: string + status?: integer +} +``` + +- 401 Authentication failed + +`application/json` + +```ts +{ + title?: string + type?: string + status?: integer +} +``` + +*** + +### [POST]/api/v2/ui/notifications + +- Description +POST request to create a new object. The request must contain the resource record as data with the attributes of the new object.To add relationships, a relationships object can be added with the resource records of the relations that are part of this object. + +- Security +bearerAuth + +#### RequestBody + +- application/json + +```ts +{ + data: { + type?: string + attributes: { + actionFilter?: string + action?: string + objectId?: integer + notification?: string + userId?: integer + receiver?: string + isActive?: boolean + } + } +} +``` + +#### Responses + +- 201 successful operation + +`application/json` + +```ts +{ + jsonapi: { + version?: string //default: 1.1 + ext?: string //default: https://jsonapi.org/profiles/ethanresnick/cursor-pagination + } + id?: integer + type?: string //default: NotificationSetting + data: { + action?: string + objectId?: integer + notification?: string + userId?: integer + receiver?: string + isActive?: boolean + } +} +``` + +- 400 Invalid request + +`application/json` + +```ts +{ + title?: string + type?: string + status?: integer +} +``` + +- 401 Authentication failed + +`application/json` + +```ts +{ + title?: string + type?: string + status?: integer +} +``` + +*** + +### [GET]/api/v2/ui/notifications/count + +- Description +GET many request to retrieve multiple objects. + +- Security +bearerAuth + +#### Parameters(Query) + +```ts +page[after]?: integer +``` + +```ts +page[before]?: integer +``` + +```ts +page[size]?: integer +``` + +```ts +filter: { +} +``` + +```ts +include?: string +``` + +#### Responses + +- 200 successful operation + +`application/json` + +```ts +{ + jsonapi: { + version?: string //default: 1.1 + ext?: string //default: https://jsonapi.org/profiles/ethanresnick/cursor-pagination + } + links: { + self?: string //default: /api/v2/ui/notifications?page[size]=25 + first?: string //default: /api/v2/ui/notifications?page[size]=25&page[after]=0 + last?: string //default: /api/v2/ui/notifications?page[size]=25&page[before]=500 + next?: string //default: /api/v2/ui/notifications?page[size]=25&page[after]=25 + previous?: string //default: /api/v2/ui/notifications?page[size]=25&page[before]=25 + } + id?: integer + type?: string //default: NotificationSetting + data: { + action?: string + objectId?: integer + notification?: string + userId?: integer + receiver?: string + isActive?: boolean + } + relationships: { + } + included: { + }[] +}[] +``` + +- 400 Invalid request + +`application/json` + +```ts +{ + title?: string + type?: string + status?: integer +} +``` + +- 401 Authentication failed + +`application/json` + +```ts +{ + title?: string + type?: string + status?: integer +} +``` + +*** + +### [GET]/api/v2/ui/notifications/{id:[0-9]+}/{relation:user} + +- Description +GET request for for a to-one relationship link. Returns the resource record of the object that is part of the specified relation. + +- Security +bearerAuth + +#### Parameters(Query) + +```ts +include?: string +``` + +#### Responses + +- 200 successful operation + +`application/json` + +```ts +{ + jsonapi: { + version?: string //default: 1.1 + ext?: string //default: https://jsonapi.org/profiles/ethanresnick/cursor-pagination + } + links: { + self?: string //default: /api/v2/ui/notifications?page[size]=25 + first?: string //default: /api/v2/ui/notifications?page[size]=25&page[after]=0 + last?: string //default: /api/v2/ui/notifications?page[size]=25&page[before]=500 + next?: string //default: /api/v2/ui/notifications?page[size]=25&page[after]=25 + previous?: string //default: /api/v2/ui/notifications?page[size]=25&page[before]=25 + } + id?: integer + type?: string //default: NotificationSetting + data: { + action?: string + objectId?: integer + notification?: string + userId?: integer + receiver?: string + isActive?: boolean + } + relationships: { + } + included: { + }[] +} +``` + +- 400 Invalid request + +`application/json` + +```ts +{ + title?: string + type?: string + status?: integer +} +``` + +- 401 Authentication failed + +`application/json` + +```ts +{ + title?: string + type?: string + status?: integer +} +``` + +- 404 Not Found + +`application/json` + +```ts +{ + message?: string + exception: { + type?: string + code?: integer + message?: string + file?: string + line?: integer + } +} +``` + +*** + +### [GET]/api/v2/ui/notifications/{id:[0-9]+}/relationships/{relation:user} + +- Description +GET request for for a to-one relationship link. Returns the resource record of the object that is part of the specified relation. + +- Security +bearerAuth + +#### Parameters(Query) + +```ts +include?: string +``` + +#### Responses + +- 200 successful operation + +`application/json` + +```ts +{ + jsonapi: { + version?: string //default: 1.1 + ext?: string //default: https://jsonapi.org/profiles/ethanresnick/cursor-pagination + } + links: { + self?: string //default: /api/v2/ui/notifications?page[size]=25 + first?: string //default: /api/v2/ui/notifications?page[size]=25&page[after]=0 + last?: string //default: /api/v2/ui/notifications?page[size]=25&page[before]=500 + next?: string //default: /api/v2/ui/notifications?page[size]=25&page[after]=25 + previous?: string //default: /api/v2/ui/notifications?page[size]=25&page[before]=25 + } + id?: integer + type?: string //default: NotificationSetting + data: { + action?: string + objectId?: integer + notification?: string + userId?: integer + receiver?: string + isActive?: boolean + } + relationships: { + } + included: { + }[] +} +``` + +- 400 Invalid request + +`application/json` + +```ts +{ + title?: string + type?: string + status?: integer +} +``` + +- 401 Authentication failed + +`application/json` + +```ts +{ + title?: string + type?: string + status?: integer +} +``` + +- 404 Not Found + +`application/json` + +```ts +{ + message?: string + exception: { + type?: string + code?: integer + message?: string + file?: string + line?: integer + } +} +``` + +*** + +### [PATCH]/api/v2/ui/notifications/{id:[0-9]+}/relationships/{relation:user} + +- Security +bearerAuth + +#### RequestBody + +- application/json + +```ts +{ + data: { + type?: string + attributes: { + action?: string + isActive?: boolean + notification?: string + receiver?: string + } + } +} +``` + +#### Responses + +- 200 successful operation + +`application/json` + +```ts +{ + jsonapi: { + version?: string //default: 1.1 + ext?: string //default: https://jsonapi.org/profiles/ethanresnick/cursor-pagination + } + id?: integer + type?: string //default: NotificationSetting + data: { + action?: string + objectId?: integer + notification?: string + userId?: integer + receiver?: string + isActive?: boolean + } +} +``` + +- 400 Invalid request + +`application/json` + +```ts +{ + title?: string + type?: string + status?: integer +} +``` + +- 401 Authentication failed + +`application/json` + +```ts +{ + title?: string + type?: string + status?: integer +} +``` + +- 404 Not Found + +`application/json` + +```ts +{ + message?: string + exception: { + type?: string + code?: integer + message?: string + file?: string + line?: integer + } +} +``` + +*** + +### [GET]/api/v2/ui/notifications/{id:[0-9]+} + +- Description +GET request to retrieve a single object. + +- Security +bearerAuth + +#### Parameters(Query) + +```ts +include?: string +``` + +#### Responses + +- 200 successful operation + +`application/json` + +```ts +{ + jsonapi: { + version?: string //default: 1.1 + ext?: string //default: https://jsonapi.org/profiles/ethanresnick/cursor-pagination + } + links: { + self?: string //default: /api/v2/ui/notifications?page[size]=25 + first?: string //default: /api/v2/ui/notifications?page[size]=25&page[after]=0 + last?: string //default: /api/v2/ui/notifications?page[size]=25&page[before]=500 + next?: string //default: /api/v2/ui/notifications?page[size]=25&page[after]=25 + previous?: string //default: /api/v2/ui/notifications?page[size]=25&page[before]=25 + } + id?: integer + type?: string //default: NotificationSetting + data: { + action?: string + objectId?: integer + notification?: string + userId?: integer + receiver?: string + isActive?: boolean + } + relationships: { + } + included: { + }[] +} +``` + +- 400 Invalid request + +`application/json` + +```ts +{ + title?: string + type?: string + status?: integer +} +``` + +- 401 Authentication failed + +`application/json` + +```ts +{ + title?: string + type?: string + status?: integer +} +``` + +- 404 Not Found + +`application/json` + +```ts +{ + message?: string + exception: { + type?: string + code?: integer + message?: string + file?: string + line?: integer + } +} +``` + +*** + +### [PATCH]/api/v2/ui/notifications/{id:[0-9]+} + +- Description +PATCH request to update attributes of a single object. + +- Security +bearerAuth + +#### RequestBody + +- application/json + +```ts +{ + data: { + type?: string + attributes: { + action?: string + isActive?: boolean + notification?: string + receiver?: string + } + } +} +``` + +#### Responses + +- 200 successful operation + +`application/json` + +```ts +{ + jsonapi: { + version?: string //default: 1.1 + ext?: string //default: https://jsonapi.org/profiles/ethanresnick/cursor-pagination + } + id?: integer + type?: string //default: NotificationSetting + data: { + action?: string + objectId?: integer + notification?: string + userId?: integer + receiver?: string + isActive?: boolean + } +} +``` + +- 400 Invalid request + +`application/json` + +```ts +{ + title?: string + type?: string + status?: integer +} +``` + +- 401 Authentication failed + +`application/json` + +```ts +{ + title?: string + type?: string + status?: integer +} +``` + +- 404 Not Found + +`application/json` + +```ts +{ + message?: string + exception: { + type?: string + code?: integer + message?: string + file?: string + line?: integer + } +} +``` + +*** + +### [DELETE]/api/v2/ui/notifications/{id:[0-9]+} + +- Security +bearerAuth + +#### RequestBody + +- application/json + +#### Responses + +- 204 successfully deleted + +- 400 Invalid request + +`application/json` + +```ts +{ + title?: string + type?: string + status?: integer +} +``` + +- 401 Authentication failed + +`application/json` + +```ts +{ + title?: string + type?: string + status?: integer +} +``` + +- 404 Not Found + +`application/json` + +```ts +{ + message?: string + exception: { + type?: string + code?: integer + message?: string + file?: string + line?: integer + } +} +``` + +*** + +### [GET]/api/v2/ui/preprocessors + +- Description +GET many request to retrieve multiple objects. + +- Security +bearerAuth + +#### Parameters(Query) + +```ts +page[after]?: integer +``` + +```ts +page[before]?: integer +``` + +```ts +page[size]?: integer +``` + +```ts +filter: { +} +``` + +```ts +include?: string +``` + +#### Responses + +- 200 successful operation + +`application/json` + +```ts +{ + jsonapi: { + version?: string //default: 1.1 + ext?: string //default: https://jsonapi.org/profiles/ethanresnick/cursor-pagination + } + links: { + self?: string //default: /api/v2/ui/preprocessors?page[size]=25 + first?: string //default: /api/v2/ui/preprocessors?page[size]=25&page[after]=0 + last?: string //default: /api/v2/ui/preprocessors?page[size]=25&page[before]=500 + next?: string //default: /api/v2/ui/preprocessors?page[size]=25&page[after]=25 + previous?: string //default: /api/v2/ui/preprocessors?page[size]=25&page[before]=25 + } + id?: integer + type?: string //default: Preprocessor + data: { + name?: string + url?: string + binaryName?: string + keyspaceCommand?: string + skipCommand?: string + limitCommand?: string + } + relationships: { + } + included: { + }[] +}[] +``` + +- 400 Invalid request + +`application/json` + +```ts +{ + title?: string + type?: string + status?: integer +} +``` + +- 401 Authentication failed + +`application/json` + +```ts +{ + title?: string + type?: string + status?: integer +} +``` + +*** + +### [POST]/api/v2/ui/preprocessors + +- Description +POST request to create a new object. The request must contain the resource record as data with the attributes of the new object.To add relationships, a relationships object can be added with the resource records of the relations that are part of this object. + +- Security +bearerAuth + +#### RequestBody + +- application/json + +```ts +{ + data: { + type?: string + attributes: { + name?: string + url?: string + binaryName?: string + keyspaceCommand?: string + skipCommand?: string + limitCommand?: string + } + } +} +``` + +#### Responses + +- 201 successful operation + +`application/json` + +```ts +{ + jsonapi: { + version?: string //default: 1.1 + ext?: string //default: https://jsonapi.org/profiles/ethanresnick/cursor-pagination + } + id?: integer + type?: string //default: Preprocessor + data: { + name?: string + url?: string + binaryName?: string + keyspaceCommand?: string + skipCommand?: string + limitCommand?: string + } +} +``` + +- 400 Invalid request + +`application/json` + +```ts +{ + title?: string + type?: string + status?: integer +} +``` + +- 401 Authentication failed + +`application/json` + +```ts +{ + title?: string + type?: string + status?: integer +} +``` + +*** + +### [GET]/api/v2/ui/preprocessors/count + +- Description +GET many request to retrieve multiple objects. + +- Security +bearerAuth + +#### Parameters(Query) + +```ts +page[after]?: integer +``` + +```ts +page[before]?: integer +``` + +```ts +page[size]?: integer +``` + +```ts +filter: { +} +``` + +```ts +include?: string +``` + +#### Responses + +- 200 successful operation + +`application/json` + +```ts +{ + jsonapi: { + version?: string //default: 1.1 + ext?: string //default: https://jsonapi.org/profiles/ethanresnick/cursor-pagination + } + links: { + self?: string //default: /api/v2/ui/preprocessors?page[size]=25 + first?: string //default: /api/v2/ui/preprocessors?page[size]=25&page[after]=0 + last?: string //default: /api/v2/ui/preprocessors?page[size]=25&page[before]=500 + next?: string //default: /api/v2/ui/preprocessors?page[size]=25&page[after]=25 + previous?: string //default: /api/v2/ui/preprocessors?page[size]=25&page[before]=25 + } + id?: integer + type?: string //default: Preprocessor + data: { + name?: string + url?: string + binaryName?: string + keyspaceCommand?: string + skipCommand?: string + limitCommand?: string + } + relationships: { + } + included: { + }[] +}[] +``` + +- 400 Invalid request + +`application/json` + +```ts +{ + title?: string + type?: string + status?: integer +} +``` + +- 401 Authentication failed + +`application/json` + +```ts +{ + title?: string + type?: string + status?: integer +} +``` + +*** + +### [GET]/api/v2/ui/preprocessors/{id:[0-9]+} + +- Description +GET request to retrieve a single object. + +- Security +bearerAuth + +#### Parameters(Query) + +```ts +include?: string +``` + +#### Responses + +- 200 successful operation + +`application/json` + +```ts +{ + jsonapi: { + version?: string //default: 1.1 + ext?: string //default: https://jsonapi.org/profiles/ethanresnick/cursor-pagination + } + links: { + self?: string //default: /api/v2/ui/preprocessors?page[size]=25 + first?: string //default: /api/v2/ui/preprocessors?page[size]=25&page[after]=0 + last?: string //default: /api/v2/ui/preprocessors?page[size]=25&page[before]=500 + next?: string //default: /api/v2/ui/preprocessors?page[size]=25&page[after]=25 + previous?: string //default: /api/v2/ui/preprocessors?page[size]=25&page[before]=25 + } + id?: integer + type?: string //default: Preprocessor + data: { + name?: string + url?: string + binaryName?: string + keyspaceCommand?: string + skipCommand?: string + limitCommand?: string + } + relationships: { + } + included: { + }[] +} +``` + +- 400 Invalid request + +`application/json` + +```ts +{ + title?: string + type?: string + status?: integer +} +``` + +- 401 Authentication failed + +`application/json` + +```ts +{ + title?: string + type?: string + status?: integer +} +``` + +- 404 Not Found + +`application/json` + +```ts +{ + message?: string + exception: { + type?: string + code?: integer + message?: string + file?: string + line?: integer + } +} +``` + +*** + +### [PATCH]/api/v2/ui/preprocessors/{id:[0-9]+} + +- Description +PATCH request to update attributes of a single object. + +- Security +bearerAuth + +#### RequestBody + +- application/json + +```ts +{ + data: { + type?: string + attributes: { + binaryName?: string + keyspaceCommand?: string + limitCommand?: string + name?: string + skipCommand?: string + url?: string + } + } +} +``` + +#### Responses + +- 200 successful operation + +`application/json` + +```ts +{ + jsonapi: { + version?: string //default: 1.1 + ext?: string //default: https://jsonapi.org/profiles/ethanresnick/cursor-pagination + } + id?: integer + type?: string //default: Preprocessor + data: { + name?: string + url?: string + binaryName?: string + keyspaceCommand?: string + skipCommand?: string + limitCommand?: string + } +} +``` + +- 400 Invalid request + +`application/json` + +```ts +{ + title?: string + type?: string + status?: integer +} +``` + +- 401 Authentication failed + +`application/json` + +```ts +{ + title?: string + type?: string + status?: integer +} +``` + +- 404 Not Found + +`application/json` + +```ts +{ + message?: string + exception: { + type?: string + code?: integer + message?: string + file?: string + line?: integer + } +} +``` + +*** + +### [DELETE]/api/v2/ui/preprocessors/{id:[0-9]+} + +- Security +bearerAuth + +#### RequestBody + +- application/json + +#### Responses + +- 204 successfully deleted + +- 400 Invalid request + +`application/json` + +```ts +{ + title?: string + type?: string + status?: integer +} +``` + +- 401 Authentication failed + +`application/json` + +```ts +{ + title?: string + type?: string + status?: integer +} +``` + +- 404 Not Found + +`application/json` + +```ts +{ + message?: string + exception: { + type?: string + code?: integer + message?: string + file?: string + line?: integer + } +} +``` + +*** + +### [GET]/api/v2/ui/pretasks + +- Description +GET many request to retrieve multiple objects. + +- Security +bearerAuth + +#### Parameters(Query) + +```ts +page[after]?: integer +``` + +```ts +page[before]?: integer +``` + +```ts +page[size]?: integer +``` + +```ts +filter: { +} +``` + +```ts +include?: string +``` + +#### Responses + +- 200 successful operation + +`application/json` + +```ts +{ + jsonapi: { + version?: string //default: 1.1 + ext?: string //default: https://jsonapi.org/profiles/ethanresnick/cursor-pagination + } + links: { + self?: string //default: /api/v2/ui/pretasks?page[size]=25 + first?: string //default: /api/v2/ui/pretasks?page[size]=25&page[after]=0 + last?: string //default: /api/v2/ui/pretasks?page[size]=25&page[before]=500 + next?: string //default: /api/v2/ui/pretasks?page[size]=25&page[after]=25 + previous?: string //default: /api/v2/ui/pretasks?page[size]=25&page[before]=25 + } + id?: integer + type?: string //default: Pretask + data: { + taskName?: string + attackCmd?: string + chunkTime?: integer + statusTimer?: integer + color?: string + isSmall?: boolean + isCpuTask?: boolean + useNewBench?: boolean + priority?: integer + maxAgents?: integer + isMaskImport?: boolean + crackerBinaryTypeId?: integer + } + relationships: { + } + included: { + }[] +}[] +``` + +- 400 Invalid request + +`application/json` + +```ts +{ + title?: string + type?: string + status?: integer +} +``` + +- 401 Authentication failed + +`application/json` + +```ts +{ + title?: string + type?: string + status?: integer +} +``` + +*** + +### [POST]/api/v2/ui/pretasks + +- Description +POST request to create a new object. The request must contain the resource record as data with the attributes of the new object.To add relationships, a relationships object can be added with the resource records of the relations that are part of this object. + +- Security +bearerAuth + +#### RequestBody + +- application/json + +```ts +{ + data: { + type?: string + attributes: { +[] + taskName?: string + attackCmd?: string + chunkTime?: integer + statusTimer?: integer + color?: string + isSmall?: boolean + isCpuTask?: boolean + useNewBench?: boolean + priority?: integer + maxAgents?: integer + isMaskImport?: boolean + crackerBinaryTypeId?: integer + } + } +} +``` + +#### Responses + +- 201 successful operation + +`application/json` + +```ts +{ + jsonapi: { + version?: string //default: 1.1 + ext?: string //default: https://jsonapi.org/profiles/ethanresnick/cursor-pagination + } + id?: integer + type?: string //default: Pretask + data: { + taskName?: string + attackCmd?: string + chunkTime?: integer + statusTimer?: integer + color?: string + isSmall?: boolean + isCpuTask?: boolean + useNewBench?: boolean + priority?: integer + maxAgents?: integer + isMaskImport?: boolean + crackerBinaryTypeId?: integer + } +} +``` + +- 400 Invalid request + +`application/json` + +```ts +{ + title?: string + type?: string + status?: integer +} +``` + +- 401 Authentication failed + +`application/json` + +```ts +{ + title?: string + type?: string + status?: integer +} +``` + +*** + +### [GET]/api/v2/ui/pretasks/count + +- Description +GET many request to retrieve multiple objects. + +- Security +bearerAuth + +#### Parameters(Query) + +```ts +page[after]?: integer +``` + +```ts +page[before]?: integer +``` + +```ts +page[size]?: integer +``` + +```ts +filter: { +} +``` + +```ts +include?: string +``` + +#### Responses + +- 200 successful operation + +`application/json` + +```ts +{ + jsonapi: { + version?: string //default: 1.1 + ext?: string //default: https://jsonapi.org/profiles/ethanresnick/cursor-pagination + } + links: { + self?: string //default: /api/v2/ui/pretasks?page[size]=25 + first?: string //default: /api/v2/ui/pretasks?page[size]=25&page[after]=0 + last?: string //default: /api/v2/ui/pretasks?page[size]=25&page[before]=500 + next?: string //default: /api/v2/ui/pretasks?page[size]=25&page[after]=25 + previous?: string //default: /api/v2/ui/pretasks?page[size]=25&page[before]=25 + } + id?: integer + type?: string //default: Pretask + data: { + taskName?: string + attackCmd?: string + chunkTime?: integer + statusTimer?: integer + color?: string + isSmall?: boolean + isCpuTask?: boolean + useNewBench?: boolean + priority?: integer + maxAgents?: integer + isMaskImport?: boolean + crackerBinaryTypeId?: integer + } + relationships: { + } + included: { + }[] +}[] +``` + +- 400 Invalid request + +`application/json` + +```ts +{ + title?: string + type?: string + status?: integer +} +``` + +- 401 Authentication failed + +`application/json` + +```ts +{ + title?: string + type?: string + status?: integer +} +``` + +*** + +### [GET]/api/v2/ui/pretasks/{id:[0-9]+}/{relation:pretaskFiles} + +- Description +GET request for for a to-one relationship link. Returns the resource record of the object that is part of the specified relation. + +- Security +bearerAuth + +#### Parameters(Query) + +```ts +include?: string +``` + +#### Responses + +- 200 successful operation + +`application/json` + +```ts +{ + jsonapi: { + version?: string //default: 1.1 + ext?: string //default: https://jsonapi.org/profiles/ethanresnick/cursor-pagination + } + links: { + self?: string //default: /api/v2/ui/pretasks?page[size]=25 + first?: string //default: /api/v2/ui/pretasks?page[size]=25&page[after]=0 + last?: string //default: /api/v2/ui/pretasks?page[size]=25&page[before]=500 + next?: string //default: /api/v2/ui/pretasks?page[size]=25&page[after]=25 + previous?: string //default: /api/v2/ui/pretasks?page[size]=25&page[before]=25 + } + id?: integer + type?: string //default: Pretask + data: { + taskName?: string + attackCmd?: string + chunkTime?: integer + statusTimer?: integer + color?: string + isSmall?: boolean + isCpuTask?: boolean + useNewBench?: boolean + priority?: integer + maxAgents?: integer + isMaskImport?: boolean + crackerBinaryTypeId?: integer + } + relationships: { + } + included: { + }[] +} +``` + +- 400 Invalid request + +`application/json` + +```ts +{ + title?: string + type?: string + status?: integer +} +``` + +- 401 Authentication failed + +`application/json` + +```ts +{ + title?: string + type?: string + status?: integer +} +``` + +- 404 Not Found + +`application/json` + +```ts +{ + message?: string + exception: { + type?: string + code?: integer + message?: string + file?: string + line?: integer + } +} +``` + +*** + +### [GET]/api/v2/ui/pretasks/{id:[0-9]+}/relationships/{relation:pretaskFiles} + +- Description +GET request for for a to-one relationship link. Returns the resource record of the object that is part of the specified relation. + +- Security +bearerAuth + +#### Parameters(Query) + +```ts +include?: string +``` + +#### Responses + +- 200 successful operation + +`application/json` + +```ts +{ + jsonapi: { + version?: string //default: 1.1 + ext?: string //default: https://jsonapi.org/profiles/ethanresnick/cursor-pagination + } + links: { + self?: string //default: /api/v2/ui/pretasks?page[size]=25 + first?: string //default: /api/v2/ui/pretasks?page[size]=25&page[after]=0 + last?: string //default: /api/v2/ui/pretasks?page[size]=25&page[before]=500 + next?: string //default: /api/v2/ui/pretasks?page[size]=25&page[after]=25 + previous?: string //default: /api/v2/ui/pretasks?page[size]=25&page[before]=25 + } + id?: integer + type?: string //default: Pretask + data: { + taskName?: string + attackCmd?: string + chunkTime?: integer + statusTimer?: integer + color?: string + isSmall?: boolean + isCpuTask?: boolean + useNewBench?: boolean + priority?: integer + maxAgents?: integer + isMaskImport?: boolean + crackerBinaryTypeId?: integer + } + relationships: { + } + included: { + }[] +} +``` + +- 400 Invalid request + +`application/json` + +```ts +{ + title?: string + type?: string + status?: integer +} +``` + +- 401 Authentication failed + +`application/json` + +```ts +{ + title?: string + type?: string + status?: integer +} +``` + +- 404 Not Found + +`application/json` + +```ts +{ + message?: string + exception: { + type?: string + code?: integer + message?: string + file?: string + line?: integer + } +} +``` + +*** + +### [PATCH]/api/v2/ui/pretasks/{id:[0-9]+}/relationships/{relation:pretaskFiles} + +- Security +bearerAuth + +#### RequestBody + +- application/json + +```ts +{ + data: { + type?: string + attributes: { + attackCmd?: string + chunkTime?: integer + color?: string + crackerBinaryTypeId?: integer + isCpuTask?: boolean + isMaskImport?: boolean + isSmall?: boolean + maxAgents?: integer + priority?: integer + statusTimer?: integer + taskName?: string + } + } +} +``` + +#### Responses + +- 200 successful operation + +`application/json` + +```ts +{ + jsonapi: { + version?: string //default: 1.1 + ext?: string //default: https://jsonapi.org/profiles/ethanresnick/cursor-pagination + } + id?: integer + type?: string //default: Pretask + data: { + taskName?: string + attackCmd?: string + chunkTime?: integer + statusTimer?: integer + color?: string + isSmall?: boolean + isCpuTask?: boolean + useNewBench?: boolean + priority?: integer + maxAgents?: integer + isMaskImport?: boolean + crackerBinaryTypeId?: integer + } +} +``` + +- 400 Invalid request + +`application/json` + +```ts +{ + title?: string + type?: string + status?: integer +} +``` + +- 401 Authentication failed + +`application/json` + +```ts +{ + title?: string + type?: string + status?: integer +} +``` + +- 404 Not Found + +`application/json` + +```ts +{ + message?: string + exception: { + type?: string + code?: integer + message?: string + file?: string + line?: integer + } +} +``` + +*** + +### [POST]/api/v2/ui/pretasks/{id:[0-9]+}/relationships/{relation:pretaskFiles} + +- Security +bearerAuth + +#### RequestBody + +- application/json + +#### Responses + +- 204 successfully created + +- 400 Invalid request + +`application/json` + +```ts +{ + title?: string + type?: string + status?: integer +} +``` + +- 401 Authentication failed + +`application/json` + +```ts +{ + title?: string + type?: string + status?: integer +} +``` + +- 404 Not Found + +`application/json` + +```ts +{ + message?: string + exception: { + type?: string + code?: integer + message?: string + file?: string + line?: integer + } +} +``` + +*** + +### [DELETE]/api/v2/ui/pretasks/{id:[0-9]+}/relationships/{relation:pretaskFiles} + +- Security +bearerAuth + +#### RequestBody + +- application/json + +#### Responses + +- 204 successfully deleted + +- 400 Invalid request + +`application/json` + +```ts +{ + title?: string + type?: string + status?: integer +} +``` + +- 401 Authentication failed + +`application/json` + +```ts +{ + title?: string + type?: string + status?: integer +} +``` + +- 404 Not Found + +`application/json` + +```ts +{ + message?: string + exception: { + type?: string + code?: integer + message?: string + file?: string + line?: integer + } +} +``` + +*** + +### [GET]/api/v2/ui/pretasks/{id:[0-9]+} + +- Description +GET request to retrieve a single object. + +- Security +bearerAuth + +#### Parameters(Query) + +```ts +include?: string +``` + +#### Responses + +- 200 successful operation + +`application/json` + +```ts +{ + jsonapi: { + version?: string //default: 1.1 + ext?: string //default: https://jsonapi.org/profiles/ethanresnick/cursor-pagination + } + links: { + self?: string //default: /api/v2/ui/pretasks?page[size]=25 + first?: string //default: /api/v2/ui/pretasks?page[size]=25&page[after]=0 + last?: string //default: /api/v2/ui/pretasks?page[size]=25&page[before]=500 + next?: string //default: /api/v2/ui/pretasks?page[size]=25&page[after]=25 + previous?: string //default: /api/v2/ui/pretasks?page[size]=25&page[before]=25 + } + id?: integer + type?: string //default: Pretask + data: { + taskName?: string + attackCmd?: string + chunkTime?: integer + statusTimer?: integer + color?: string + isSmall?: boolean + isCpuTask?: boolean + useNewBench?: boolean + priority?: integer + maxAgents?: integer + isMaskImport?: boolean + crackerBinaryTypeId?: integer + } + relationships: { + } + included: { + }[] +} +``` + +- 400 Invalid request + +`application/json` + +```ts +{ + title?: string + type?: string + status?: integer +} +``` + +- 401 Authentication failed + +`application/json` + +```ts +{ + title?: string + type?: string + status?: integer +} +``` + +- 404 Not Found + +`application/json` + +```ts +{ + message?: string + exception: { + type?: string + code?: integer + message?: string + file?: string + line?: integer + } +} +``` + +*** + +### [PATCH]/api/v2/ui/pretasks/{id:[0-9]+} + +- Description +PATCH request to update attributes of a single object. + +- Security +bearerAuth + +#### RequestBody + +- application/json + +```ts +{ + data: { + type?: string + attributes: { + attackCmd?: string + chunkTime?: integer + color?: string + crackerBinaryTypeId?: integer + isCpuTask?: boolean + isMaskImport?: boolean + isSmall?: boolean + maxAgents?: integer + priority?: integer + statusTimer?: integer + taskName?: string + } + } +} +``` + +#### Responses + +- 200 successful operation + +`application/json` + +```ts +{ + jsonapi: { + version?: string //default: 1.1 + ext?: string //default: https://jsonapi.org/profiles/ethanresnick/cursor-pagination + } + id?: integer + type?: string //default: Pretask + data: { + taskName?: string + attackCmd?: string + chunkTime?: integer + statusTimer?: integer + color?: string + isSmall?: boolean + isCpuTask?: boolean + useNewBench?: boolean + priority?: integer + maxAgents?: integer + isMaskImport?: boolean + crackerBinaryTypeId?: integer + } +} +``` + +- 400 Invalid request + +`application/json` + +```ts +{ + title?: string + type?: string + status?: integer +} +``` + +- 401 Authentication failed + +`application/json` + +```ts +{ + title?: string + type?: string + status?: integer +} +``` + +- 404 Not Found + +`application/json` + +```ts +{ + message?: string + exception: { + type?: string + code?: integer + message?: string + file?: string + line?: integer + } +} +``` + +*** + +### [DELETE]/api/v2/ui/pretasks/{id:[0-9]+} + +- Security +bearerAuth + +#### RequestBody + +- application/json + +#### Responses + +- 204 successfully deleted + +- 400 Invalid request + +`application/json` + +```ts +{ + title?: string + type?: string + status?: integer +} +``` + +- 401 Authentication failed + +`application/json` + +```ts +{ + title?: string + type?: string + status?: integer +} +``` + +- 404 Not Found + +`application/json` + +```ts +{ + message?: string + exception: { + type?: string + code?: integer + message?: string + file?: string + line?: integer + } +} +``` + +*** + +### [GET]/api/v2/ui/speeds + +- Description +GET many request to retrieve multiple objects. + +- Security +bearerAuth + +#### Parameters(Query) + +```ts +page[after]?: integer +``` + +```ts +page[before]?: integer +``` + +```ts +page[size]?: integer +``` + +```ts +filter: { +} +``` + +```ts +include?: string +``` + +#### Responses + +- 200 successful operation + +`application/json` + +```ts +{ + jsonapi: { + version?: string //default: 1.1 + ext?: string //default: https://jsonapi.org/profiles/ethanresnick/cursor-pagination + } + links: { + self?: string //default: /api/v2/ui/speeds?page[size]=25 + first?: string //default: /api/v2/ui/speeds?page[size]=25&page[after]=0 + last?: string //default: /api/v2/ui/speeds?page[size]=25&page[before]=500 + next?: string //default: /api/v2/ui/speeds?page[size]=25&page[after]=25 + previous?: string //default: /api/v2/ui/speeds?page[size]=25&page[before]=25 + } + id?: integer + type?: string //default: Speed + data: { + agentId?: integer + taskId?: integer + speed?: integer + time?: integer + } + relationships: { + } + included: { + }[] +}[] +``` + +- 400 Invalid request + +`application/json` + +```ts +{ + title?: string + type?: string + status?: integer +} +``` + +- 401 Authentication failed + +`application/json` + +```ts +{ + title?: string + type?: string + status?: integer +} +``` + +*** + +### [GET]/api/v2/ui/speeds/count + +- Description +GET many request to retrieve multiple objects. + +- Security +bearerAuth + +#### Parameters(Query) + +```ts +page[after]?: integer +``` + +```ts +page[before]?: integer +``` + +```ts +page[size]?: integer +``` + +```ts +filter: { +} +``` + +```ts +include?: string +``` + +#### Responses + +- 200 successful operation + +`application/json` + +```ts +{ + jsonapi: { + version?: string //default: 1.1 + ext?: string //default: https://jsonapi.org/profiles/ethanresnick/cursor-pagination + } + links: { + self?: string //default: /api/v2/ui/speeds?page[size]=25 + first?: string //default: /api/v2/ui/speeds?page[size]=25&page[after]=0 + last?: string //default: /api/v2/ui/speeds?page[size]=25&page[before]=500 + next?: string //default: /api/v2/ui/speeds?page[size]=25&page[after]=25 + previous?: string //default: /api/v2/ui/speeds?page[size]=25&page[before]=25 + } + id?: integer + type?: string //default: Speed + data: { + agentId?: integer + taskId?: integer + speed?: integer + time?: integer + } + relationships: { + } + included: { + }[] +}[] +``` + +- 400 Invalid request + +`application/json` + +```ts +{ + title?: string + type?: string + status?: integer +} +``` + +- 401 Authentication failed + +`application/json` + +```ts +{ + title?: string + type?: string + status?: integer +} +``` + +*** + +### [GET]/api/v2/ui/speeds/{id:[0-9]+}/{relation:agent} + +- Description +GET request for for a to-one relationship link. Returns the resource record of the object that is part of the specified relation. + +- Security +bearerAuth + +#### Parameters(Query) + +```ts +include?: string +``` + +#### Responses + +- 200 successful operation + +`application/json` + +```ts +{ + jsonapi: { + version?: string //default: 1.1 + ext?: string //default: https://jsonapi.org/profiles/ethanresnick/cursor-pagination + } + links: { + self?: string //default: /api/v2/ui/speeds?page[size]=25 + first?: string //default: /api/v2/ui/speeds?page[size]=25&page[after]=0 + last?: string //default: /api/v2/ui/speeds?page[size]=25&page[before]=500 + next?: string //default: /api/v2/ui/speeds?page[size]=25&page[after]=25 + previous?: string //default: /api/v2/ui/speeds?page[size]=25&page[before]=25 + } + id?: integer + type?: string //default: Speed + data: { + agentId?: integer + taskId?: integer + speed?: integer + time?: integer + } + relationships: { + } + included: { + }[] +} +``` + +- 400 Invalid request + +`application/json` + +```ts +{ + title?: string + type?: string + status?: integer +} +``` + +- 401 Authentication failed + +`application/json` + +```ts +{ + title?: string + type?: string + status?: integer +} +``` + +- 404 Not Found + +`application/json` + +```ts +{ + message?: string + exception: { + type?: string + code?: integer + message?: string + file?: string + line?: integer + } +} +``` + +*** + +### [GET]/api/v2/ui/speeds/{id:[0-9]+}/relationships/{relation:agent} + +- Description +GET request for for a to-one relationship link. Returns the resource record of the object that is part of the specified relation. + +- Security +bearerAuth + +#### Parameters(Query) + +```ts +include?: string +``` + +#### Responses + +- 200 successful operation + +`application/json` + +```ts +{ + jsonapi: { + version?: string //default: 1.1 + ext?: string //default: https://jsonapi.org/profiles/ethanresnick/cursor-pagination + } + links: { + self?: string //default: /api/v2/ui/speeds?page[size]=25 + first?: string //default: /api/v2/ui/speeds?page[size]=25&page[after]=0 + last?: string //default: /api/v2/ui/speeds?page[size]=25&page[before]=500 + next?: string //default: /api/v2/ui/speeds?page[size]=25&page[after]=25 + previous?: string //default: /api/v2/ui/speeds?page[size]=25&page[before]=25 + } + id?: integer + type?: string //default: Speed + data: { + agentId?: integer + taskId?: integer + speed?: integer + time?: integer + } + relationships: { + } + included: { + }[] +} +``` + +- 400 Invalid request + +`application/json` + +```ts +{ + title?: string + type?: string + status?: integer +} +``` + +- 401 Authentication failed + +`application/json` + +```ts +{ + title?: string + type?: string + status?: integer +} +``` + +- 404 Not Found + +`application/json` + +```ts +{ + message?: string + exception: { + type?: string + code?: integer + message?: string + file?: string + line?: integer + } +} +``` + +*** + +### [PATCH]/api/v2/ui/speeds/{id:[0-9]+}/relationships/{relation:agent} + +- Security +bearerAuth + +#### RequestBody + +- application/json + +```ts +{ + data: { + type?: string + attributes: { + } + } +} +``` + +#### Responses + +- 200 successful operation + +`application/json` + +```ts +{ + jsonapi: { + version?: string //default: 1.1 + ext?: string //default: https://jsonapi.org/profiles/ethanresnick/cursor-pagination + } + id?: integer + type?: string //default: Speed + data: { + agentId?: integer + taskId?: integer + speed?: integer + time?: integer + } +} +``` + +- 400 Invalid request + +`application/json` + +```ts +{ + title?: string + type?: string + status?: integer +} +``` + +- 401 Authentication failed + +`application/json` + +```ts +{ + title?: string + type?: string + status?: integer +} +``` + +- 404 Not Found + +`application/json` + +```ts +{ + message?: string + exception: { + type?: string + code?: integer + message?: string + file?: string + line?: integer + } +} +``` + +*** + +### [GET]/api/v2/ui/speeds/{id:[0-9]+}/{relation:task} + +- Description +GET request for for a to-one relationship link. Returns the resource record of the object that is part of the specified relation. + +- Security +bearerAuth + +#### Parameters(Query) + +```ts +include?: string +``` + +#### Responses + +- 200 successful operation + +`application/json` + +```ts +{ + jsonapi: { + version?: string //default: 1.1 + ext?: string //default: https://jsonapi.org/profiles/ethanresnick/cursor-pagination + } + links: { + self?: string //default: /api/v2/ui/speeds?page[size]=25 + first?: string //default: /api/v2/ui/speeds?page[size]=25&page[after]=0 + last?: string //default: /api/v2/ui/speeds?page[size]=25&page[before]=500 + next?: string //default: /api/v2/ui/speeds?page[size]=25&page[after]=25 + previous?: string //default: /api/v2/ui/speeds?page[size]=25&page[before]=25 + } + id?: integer + type?: string //default: Speed + data: { + agentId?: integer + taskId?: integer + speed?: integer + time?: integer + } + relationships: { + } + included: { + }[] +} +``` + +- 400 Invalid request + +`application/json` + +```ts +{ + title?: string + type?: string + status?: integer +} +``` + +- 401 Authentication failed + +`application/json` + +```ts +{ + title?: string + type?: string + status?: integer +} +``` + +- 404 Not Found + +`application/json` + +```ts +{ + message?: string + exception: { + type?: string + code?: integer + message?: string + file?: string + line?: integer + } +} +``` + +*** + +### [GET]/api/v2/ui/speeds/{id:[0-9]+}/relationships/{relation:task} + +- Description +GET request for for a to-one relationship link. Returns the resource record of the object that is part of the specified relation. + +- Security +bearerAuth + +#### Parameters(Query) + +```ts +include?: string +``` + +#### Responses + +- 200 successful operation + +`application/json` + +```ts +{ + jsonapi: { + version?: string //default: 1.1 + ext?: string //default: https://jsonapi.org/profiles/ethanresnick/cursor-pagination + } + links: { + self?: string //default: /api/v2/ui/speeds?page[size]=25 + first?: string //default: /api/v2/ui/speeds?page[size]=25&page[after]=0 + last?: string //default: /api/v2/ui/speeds?page[size]=25&page[before]=500 + next?: string //default: /api/v2/ui/speeds?page[size]=25&page[after]=25 + previous?: string //default: /api/v2/ui/speeds?page[size]=25&page[before]=25 + } + id?: integer + type?: string //default: Speed + data: { + agentId?: integer + taskId?: integer + speed?: integer + time?: integer + } + relationships: { + } + included: { + }[] +} +``` + +- 400 Invalid request + +`application/json` + +```ts +{ + title?: string + type?: string + status?: integer +} +``` + +- 401 Authentication failed + +`application/json` + +```ts +{ + title?: string + type?: string + status?: integer +} +``` + +- 404 Not Found + +`application/json` + +```ts +{ + message?: string + exception: { + type?: string + code?: integer + message?: string + file?: string + line?: integer + } +} +``` + +*** + +### [PATCH]/api/v2/ui/speeds/{id:[0-9]+}/relationships/{relation:task} + +- Security +bearerAuth + +#### RequestBody + +- application/json + +```ts +{ + data: { + type?: string + attributes: { + } + } +} +``` + +#### Responses + +- 200 successful operation + +`application/json` + +```ts +{ + jsonapi: { + version?: string //default: 1.1 + ext?: string //default: https://jsonapi.org/profiles/ethanresnick/cursor-pagination + } + id?: integer + type?: string //default: Speed + data: { + agentId?: integer + taskId?: integer + speed?: integer + time?: integer + } +} +``` + +- 400 Invalid request + +`application/json` + +```ts +{ + title?: string + type?: string + status?: integer +} +``` + +- 401 Authentication failed + +`application/json` + +```ts +{ + title?: string + type?: string + status?: integer +} +``` + +- 404 Not Found + +`application/json` + +```ts +{ + message?: string + exception: { + type?: string + code?: integer + message?: string + file?: string + line?: integer + } +} +``` + +*** + +### [GET]/api/v2/ui/speeds/{id:[0-9]+} + +- Description +GET request to retrieve a single object. + +- Security +bearerAuth + +#### Parameters(Query) + +```ts +include?: string +``` + +#### Responses + +- 200 successful operation + +`application/json` + +```ts +{ + jsonapi: { + version?: string //default: 1.1 + ext?: string //default: https://jsonapi.org/profiles/ethanresnick/cursor-pagination + } + links: { + self?: string //default: /api/v2/ui/speeds?page[size]=25 + first?: string //default: /api/v2/ui/speeds?page[size]=25&page[after]=0 + last?: string //default: /api/v2/ui/speeds?page[size]=25&page[before]=500 + next?: string //default: /api/v2/ui/speeds?page[size]=25&page[after]=25 + previous?: string //default: /api/v2/ui/speeds?page[size]=25&page[before]=25 + } + id?: integer + type?: string //default: Speed + data: { + agentId?: integer + taskId?: integer + speed?: integer + time?: integer + } + relationships: { + } + included: { + }[] +} +``` + +- 400 Invalid request + +`application/json` + +```ts +{ + title?: string + type?: string + status?: integer +} +``` + +- 401 Authentication failed + +`application/json` + +```ts +{ + title?: string + type?: string + status?: integer +} +``` + +- 404 Not Found + +`application/json` + +```ts +{ + message?: string + exception: { + type?: string + code?: integer + message?: string + file?: string + line?: integer + } +} +``` + +*** + +### [GET]/api/v2/ui/supertasks + +- Description +GET many request to retrieve multiple objects. + +- Security +bearerAuth + +#### Parameters(Query) + +```ts +page[after]?: integer +``` + +```ts +page[before]?: integer +``` + +```ts +page[size]?: integer +``` + +```ts +filter: { +} +``` + +```ts +include?: string +``` + +#### Responses + +- 200 successful operation + +`application/json` + +```ts +{ + jsonapi: { + version?: string //default: 1.1 + ext?: string //default: https://jsonapi.org/profiles/ethanresnick/cursor-pagination + } + links: { + self?: string //default: /api/v2/ui/supertasks?page[size]=25 + first?: string //default: /api/v2/ui/supertasks?page[size]=25&page[after]=0 + last?: string //default: /api/v2/ui/supertasks?page[size]=25&page[before]=500 + next?: string //default: /api/v2/ui/supertasks?page[size]=25&page[after]=25 + previous?: string //default: /api/v2/ui/supertasks?page[size]=25&page[before]=25 + } + id?: integer + type?: string //default: Supertask + data: { + supertaskName?: string + } + relationships: { + } + included: { + }[] +}[] +``` + +- 400 Invalid request + +`application/json` + +```ts +{ + title?: string + type?: string + status?: integer +} +``` + +- 401 Authentication failed + +`application/json` + +```ts +{ + title?: string + type?: string + status?: integer +} +``` + +*** + +### [POST]/api/v2/ui/supertasks + +- Description +POST request to create a new object. The request must contain the resource record as data with the attributes of the new object.To add relationships, a relationships object can be added with the resource records of the relations that are part of this object. + +- Security +bearerAuth + +#### RequestBody + +- application/json + +```ts +{ + data: { + type?: string + attributes: { +[] + supertaskName?: string + } + } +} +``` + +#### Responses + +- 201 successful operation + +`application/json` + +```ts +{ + jsonapi: { + version?: string //default: 1.1 + ext?: string //default: https://jsonapi.org/profiles/ethanresnick/cursor-pagination + } + id?: integer + type?: string //default: Supertask + data: { + supertaskName?: string + } +} +``` + +- 400 Invalid request + +`application/json` + +```ts +{ + title?: string + type?: string + status?: integer +} +``` + +- 401 Authentication failed + +`application/json` + +```ts +{ + title?: string + type?: string + status?: integer +} +``` + +*** + +### [GET]/api/v2/ui/supertasks/count + +- Description +GET many request to retrieve multiple objects. + +- Security +bearerAuth + +#### Parameters(Query) + +```ts +page[after]?: integer +``` + +```ts +page[before]?: integer +``` + +```ts +page[size]?: integer +``` + +```ts +filter: { +} +``` + +```ts +include?: string +``` + +#### Responses + +- 200 successful operation + +`application/json` + +```ts +{ + jsonapi: { + version?: string //default: 1.1 + ext?: string //default: https://jsonapi.org/profiles/ethanresnick/cursor-pagination + } + links: { + self?: string //default: /api/v2/ui/supertasks?page[size]=25 + first?: string //default: /api/v2/ui/supertasks?page[size]=25&page[after]=0 + last?: string //default: /api/v2/ui/supertasks?page[size]=25&page[before]=500 + next?: string //default: /api/v2/ui/supertasks?page[size]=25&page[after]=25 + previous?: string //default: /api/v2/ui/supertasks?page[size]=25&page[before]=25 + } + id?: integer + type?: string //default: Supertask + data: { + supertaskName?: string + } + relationships: { + } + included: { + }[] +}[] +``` + +- 400 Invalid request + +`application/json` + +```ts +{ + title?: string + type?: string + status?: integer +} +``` + +- 401 Authentication failed + +`application/json` + +```ts +{ + title?: string + type?: string + status?: integer +} +``` + +*** + +### [GET]/api/v2/ui/supertasks/{id:[0-9]+}/{relation:pretasks} + +- Description +GET request for for a to-one relationship link. Returns the resource record of the object that is part of the specified relation. + +- Security +bearerAuth + +#### Parameters(Query) + +```ts +include?: string +``` + +#### Responses + +- 200 successful operation + +`application/json` + +```ts +{ + jsonapi: { + version?: string //default: 1.1 + ext?: string //default: https://jsonapi.org/profiles/ethanresnick/cursor-pagination + } + links: { + self?: string //default: /api/v2/ui/supertasks?page[size]=25 + first?: string //default: /api/v2/ui/supertasks?page[size]=25&page[after]=0 + last?: string //default: /api/v2/ui/supertasks?page[size]=25&page[before]=500 + next?: string //default: /api/v2/ui/supertasks?page[size]=25&page[after]=25 + previous?: string //default: /api/v2/ui/supertasks?page[size]=25&page[before]=25 + } + id?: integer + type?: string //default: Supertask + data: { + supertaskName?: string + } + relationships: { + } + included: { + }[] +} +``` + +- 400 Invalid request + +`application/json` + +```ts +{ + title?: string + type?: string + status?: integer +} +``` + +- 401 Authentication failed + +`application/json` + +```ts +{ + title?: string + type?: string + status?: integer +} +``` + +- 404 Not Found + +`application/json` + +```ts +{ + message?: string + exception: { + type?: string + code?: integer + message?: string + file?: string + line?: integer + } +} +``` + +*** + +### [GET]/api/v2/ui/supertasks/{id:[0-9]+}/relationships/{relation:pretasks} + +- Description +GET request for for a to-one relationship link. Returns the resource record of the object that is part of the specified relation. + +- Security +bearerAuth + +#### Parameters(Query) + +```ts +include?: string +``` + +#### Responses + +- 200 successful operation + +`application/json` + +```ts +{ + jsonapi: { + version?: string //default: 1.1 + ext?: string //default: https://jsonapi.org/profiles/ethanresnick/cursor-pagination + } + links: { + self?: string //default: /api/v2/ui/supertasks?page[size]=25 + first?: string //default: /api/v2/ui/supertasks?page[size]=25&page[after]=0 + last?: string //default: /api/v2/ui/supertasks?page[size]=25&page[before]=500 + next?: string //default: /api/v2/ui/supertasks?page[size]=25&page[after]=25 + previous?: string //default: /api/v2/ui/supertasks?page[size]=25&page[before]=25 + } + id?: integer + type?: string //default: Supertask + data: { + supertaskName?: string + } + relationships: { + } + included: { + }[] +} +``` + +- 400 Invalid request + +`application/json` + +```ts +{ + title?: string + type?: string + status?: integer +} +``` + +- 401 Authentication failed + +`application/json` + +```ts +{ + title?: string + type?: string + status?: integer +} +``` + +- 404 Not Found + +`application/json` + +```ts +{ + message?: string + exception: { + type?: string + code?: integer + message?: string + file?: string + line?: integer + } +} +``` + +*** + +### [PATCH]/api/v2/ui/supertasks/{id:[0-9]+}/relationships/{relation:pretasks} + +- Security +bearerAuth + +#### RequestBody + +- application/json + +```ts +{ + data: { + type?: string + attributes: { + supertaskName?: string + } + } +} +``` + +#### Responses + +- 200 successful operation + +`application/json` + +```ts +{ + jsonapi: { + version?: string //default: 1.1 + ext?: string //default: https://jsonapi.org/profiles/ethanresnick/cursor-pagination + } + id?: integer + type?: string //default: Supertask + data: { + supertaskName?: string + } +} +``` + +- 400 Invalid request + +`application/json` + +```ts +{ + title?: string + type?: string + status?: integer +} +``` + +- 401 Authentication failed + +`application/json` + +```ts +{ + title?: string + type?: string + status?: integer +} +``` + +- 404 Not Found + +`application/json` + +```ts +{ + message?: string + exception: { + type?: string + code?: integer + message?: string + file?: string + line?: integer + } +} +``` + +*** + +### [POST]/api/v2/ui/supertasks/{id:[0-9]+}/relationships/{relation:pretasks} + +- Security +bearerAuth + +#### RequestBody + +- application/json + +#### Responses + +- 204 successfully created + +- 400 Invalid request + +`application/json` + +```ts +{ + title?: string + type?: string + status?: integer +} +``` + +- 401 Authentication failed + +`application/json` + +```ts +{ + title?: string + type?: string + status?: integer +} +``` + +- 404 Not Found + +`application/json` + +```ts +{ + message?: string + exception: { + type?: string + code?: integer + message?: string + file?: string + line?: integer + } +} +``` + +*** + +### [DELETE]/api/v2/ui/supertasks/{id:[0-9]+}/relationships/{relation:pretasks} + +- Security +bearerAuth + +#### RequestBody + +- application/json + +#### Responses + +- 204 successfully deleted + +- 400 Invalid request + +`application/json` + +```ts +{ + title?: string + type?: string + status?: integer +} +``` + +- 401 Authentication failed + +`application/json` + +```ts +{ + title?: string + type?: string + status?: integer +} +``` + +- 404 Not Found + +`application/json` + +```ts +{ + message?: string + exception: { + type?: string + code?: integer + message?: string + file?: string + line?: integer + } +} +``` + +*** + +### [GET]/api/v2/ui/supertasks/{id:[0-9]+} + +- Description +GET request to retrieve a single object. + +- Security +bearerAuth + +#### Parameters(Query) + +```ts +include?: string +``` + +#### Responses + +- 200 successful operation + +`application/json` + +```ts +{ + jsonapi: { + version?: string //default: 1.1 + ext?: string //default: https://jsonapi.org/profiles/ethanresnick/cursor-pagination + } + links: { + self?: string //default: /api/v2/ui/supertasks?page[size]=25 + first?: string //default: /api/v2/ui/supertasks?page[size]=25&page[after]=0 + last?: string //default: /api/v2/ui/supertasks?page[size]=25&page[before]=500 + next?: string //default: /api/v2/ui/supertasks?page[size]=25&page[after]=25 + previous?: string //default: /api/v2/ui/supertasks?page[size]=25&page[before]=25 + } + id?: integer + type?: string //default: Supertask + data: { + supertaskName?: string + } + relationships: { + } + included: { + }[] +} +``` + +- 400 Invalid request + +`application/json` + +```ts +{ + title?: string + type?: string + status?: integer +} +``` + +- 401 Authentication failed + +`application/json` + +```ts +{ + title?: string + type?: string + status?: integer +} +``` + +- 404 Not Found + +`application/json` + +```ts +{ + message?: string + exception: { + type?: string + code?: integer + message?: string + file?: string + line?: integer + } +} +``` + +*** + +### [PATCH]/api/v2/ui/supertasks/{id:[0-9]+} + +- Description +PATCH request to update attributes of a single object. + +- Security +bearerAuth + +#### RequestBody + +- application/json + +```ts +{ + data: { + type?: string + attributes: { + supertaskName?: string + } + } +} +``` + +#### Responses + +- 200 successful operation + +`application/json` + +```ts +{ + jsonapi: { + version?: string //default: 1.1 + ext?: string //default: https://jsonapi.org/profiles/ethanresnick/cursor-pagination + } + id?: integer + type?: string //default: Supertask + data: { + supertaskName?: string + } +} +``` + +- 400 Invalid request + +`application/json` + +```ts +{ + title?: string + type?: string + status?: integer +} +``` + +- 401 Authentication failed + +`application/json` + +```ts +{ + title?: string + type?: string + status?: integer +} +``` + +- 404 Not Found + +`application/json` + +```ts +{ + message?: string + exception: { + type?: string + code?: integer + message?: string + file?: string + line?: integer + } +} +``` + +*** + +### [DELETE]/api/v2/ui/supertasks/{id:[0-9]+} + +- Security +bearerAuth + +#### RequestBody + +- application/json + +#### Responses + +- 204 successfully deleted + +- 400 Invalid request + +`application/json` + +```ts +{ + title?: string + type?: string + status?: integer +} +``` + +- 401 Authentication failed + +`application/json` + +```ts +{ + title?: string + type?: string + status?: integer +} +``` + +- 404 Not Found + +`application/json` + +```ts +{ + message?: string + exception: { + type?: string + code?: integer + message?: string + file?: string + line?: integer + } +} +``` + +*** + +### [GET]/api/v2/ui/tasks + +- Description +GET many request to retrieve multiple objects. + +- Security +bearerAuth + +#### Parameters(Query) + +```ts +page[after]?: integer +``` + +```ts +page[before]?: integer +``` + +```ts +page[size]?: integer +``` + +```ts +filter: { +} +``` + +```ts +include?: string +``` + +#### Responses + +- 200 successful operation + +`application/json` + +```ts +{ + jsonapi: { + version?: string //default: 1.1 + ext?: string //default: https://jsonapi.org/profiles/ethanresnick/cursor-pagination + } + links: { + self?: string //default: /api/v2/ui/tasks?page[size]=25 + first?: string //default: /api/v2/ui/tasks?page[size]=25&page[after]=0 + last?: string //default: /api/v2/ui/tasks?page[size]=25&page[before]=500 + next?: string //default: /api/v2/ui/tasks?page[size]=25&page[after]=25 + previous?: string //default: /api/v2/ui/tasks?page[size]=25&page[before]=25 + } + id?: integer + type?: string //default: Task + data: { + taskName?: string + attackCmd?: string + chunkTime?: integer + statusTimer?: integer + keyspace?: integer + keyspaceProgress?: integer + priority?: integer + maxAgents?: integer + color?: string + isSmall?: boolean + isCpuTask?: boolean + useNewBench?: boolean + skipKeyspace?: integer + crackerBinaryId?: integer + crackerBinaryTypeId?: integer + taskWrapperId?: integer + isArchived?: boolean + notes?: string + staticChunks?: integer + chunkSize?: integer + forcePipe?: boolean + preprocessorId?: integer + preprocessorCommand?: string + } + relationships: { + } + included: { + }[] +}[] +``` + +- 400 Invalid request + +`application/json` + +```ts +{ + title?: string + type?: string + status?: integer +} +``` + +- 401 Authentication failed + +`application/json` + +```ts +{ + title?: string + type?: string + status?: integer +} +``` + +*** + +### [POST]/api/v2/ui/tasks + +- Description +POST request to create a new object. The request must contain the resource record as data with the attributes of the new object.To add relationships, a relationships object can be added with the resource records of the relations that are part of this object. + +- Security +bearerAuth + +#### RequestBody + +- application/json + +```ts +{ + data: { + type?: string + attributes: { + hashlistId?: integer +[] + taskName?: string + attackCmd?: string + chunkTime?: integer + statusTimer?: integer + keyspace?: integer + keyspaceProgress?: integer + priority?: integer + maxAgents?: integer + color?: string + isSmall?: boolean + isCpuTask?: boolean + useNewBench?: boolean + skipKeyspace?: integer + crackerBinaryId?: integer + crackerBinaryTypeId?: integer + taskWrapperId?: integer + isArchived?: boolean + notes?: string + staticChunks?: integer + chunkSize?: integer + forcePipe?: boolean + preprocessorId?: integer + preprocessorCommand?: string + } + } +} +``` + +#### Responses + +- 201 successful operation + +`application/json` + +```ts +{ + jsonapi: { + version?: string //default: 1.1 + ext?: string //default: https://jsonapi.org/profiles/ethanresnick/cursor-pagination + } + id?: integer + type?: string //default: Task + data: { + taskName?: string + attackCmd?: string + chunkTime?: integer + statusTimer?: integer + keyspace?: integer + keyspaceProgress?: integer + priority?: integer + maxAgents?: integer + color?: string + isSmall?: boolean + isCpuTask?: boolean + useNewBench?: boolean + skipKeyspace?: integer + crackerBinaryId?: integer + crackerBinaryTypeId?: integer + taskWrapperId?: integer + isArchived?: boolean + notes?: string + staticChunks?: integer + chunkSize?: integer + forcePipe?: boolean + preprocessorId?: integer + preprocessorCommand?: string + } +} +``` + +- 400 Invalid request + +`application/json` + +```ts +{ + title?: string + type?: string + status?: integer +} +``` + +- 401 Authentication failed + +`application/json` + +```ts +{ + title?: string + type?: string + status?: integer +} +``` + +*** + +### [GET]/api/v2/ui/tasks/count + +- Description +GET many request to retrieve multiple objects. + +- Security +bearerAuth + +#### Parameters(Query) + +```ts +page[after]?: integer +``` + +```ts +page[before]?: integer +``` + +```ts +page[size]?: integer +``` + +```ts +filter: { +} +``` + +```ts +include?: string +``` + +#### Responses + +- 200 successful operation + +`application/json` + +```ts +{ + jsonapi: { + version?: string //default: 1.1 + ext?: string //default: https://jsonapi.org/profiles/ethanresnick/cursor-pagination + } + links: { + self?: string //default: /api/v2/ui/tasks?page[size]=25 + first?: string //default: /api/v2/ui/tasks?page[size]=25&page[after]=0 + last?: string //default: /api/v2/ui/tasks?page[size]=25&page[before]=500 + next?: string //default: /api/v2/ui/tasks?page[size]=25&page[after]=25 + previous?: string //default: /api/v2/ui/tasks?page[size]=25&page[before]=25 + } + id?: integer + type?: string //default: Task + data: { + taskName?: string + attackCmd?: string + chunkTime?: integer + statusTimer?: integer + keyspace?: integer + keyspaceProgress?: integer + priority?: integer + maxAgents?: integer + color?: string + isSmall?: boolean + isCpuTask?: boolean + useNewBench?: boolean + skipKeyspace?: integer + crackerBinaryId?: integer + crackerBinaryTypeId?: integer + taskWrapperId?: integer + isArchived?: boolean + notes?: string + staticChunks?: integer + chunkSize?: integer + forcePipe?: boolean + preprocessorId?: integer + preprocessorCommand?: string + } + relationships: { + } + included: { + }[] +}[] +``` + +- 400 Invalid request + +`application/json` + +```ts +{ + title?: string + type?: string + status?: integer +} +``` + +- 401 Authentication failed + +`application/json` + +```ts +{ + title?: string + type?: string + status?: integer +} +``` + +*** + +### [GET]/api/v2/ui/tasks/{id:[0-9]+}/{relation:crackerBinary} + +- Description +GET request for for a to-one relationship link. Returns the resource record of the object that is part of the specified relation. + +- Security +bearerAuth + +#### Parameters(Query) + +```ts +include?: string +``` + +#### Responses + +- 200 successful operation + +`application/json` + +```ts +{ + jsonapi: { + version?: string //default: 1.1 + ext?: string //default: https://jsonapi.org/profiles/ethanresnick/cursor-pagination + } + links: { + self?: string //default: /api/v2/ui/tasks?page[size]=25 + first?: string //default: /api/v2/ui/tasks?page[size]=25&page[after]=0 + last?: string //default: /api/v2/ui/tasks?page[size]=25&page[before]=500 + next?: string //default: /api/v2/ui/tasks?page[size]=25&page[after]=25 + previous?: string //default: /api/v2/ui/tasks?page[size]=25&page[before]=25 + } + id?: integer + type?: string //default: Task + data: { + taskName?: string + attackCmd?: string + chunkTime?: integer + statusTimer?: integer + keyspace?: integer + keyspaceProgress?: integer + priority?: integer + maxAgents?: integer + color?: string + isSmall?: boolean + isCpuTask?: boolean + useNewBench?: boolean + skipKeyspace?: integer + crackerBinaryId?: integer + crackerBinaryTypeId?: integer + taskWrapperId?: integer + isArchived?: boolean + notes?: string + staticChunks?: integer + chunkSize?: integer + forcePipe?: boolean + preprocessorId?: integer + preprocessorCommand?: string + } + relationships: { + } + included: { + }[] +} +``` + +- 400 Invalid request + +`application/json` + +```ts +{ + title?: string + type?: string + status?: integer +} +``` + +- 401 Authentication failed + +`application/json` + +```ts +{ + title?: string + type?: string + status?: integer +} +``` + +- 404 Not Found + +`application/json` + +```ts +{ + message?: string + exception: { + type?: string + code?: integer + message?: string + file?: string + line?: integer + } +} +``` + +*** + +### [GET]/api/v2/ui/tasks/{id:[0-9]+}/relationships/{relation:crackerBinary} + +- Description +GET request for for a to-one relationship link. Returns the resource record of the object that is part of the specified relation. + +- Security +bearerAuth + +#### Parameters(Query) + +```ts +include?: string +``` + +#### Responses + +- 200 successful operation + +`application/json` + +```ts +{ + jsonapi: { + version?: string //default: 1.1 + ext?: string //default: https://jsonapi.org/profiles/ethanresnick/cursor-pagination + } + links: { + self?: string //default: /api/v2/ui/tasks?page[size]=25 + first?: string //default: /api/v2/ui/tasks?page[size]=25&page[after]=0 + last?: string //default: /api/v2/ui/tasks?page[size]=25&page[before]=500 + next?: string //default: /api/v2/ui/tasks?page[size]=25&page[after]=25 + previous?: string //default: /api/v2/ui/tasks?page[size]=25&page[before]=25 + } + id?: integer + type?: string //default: Task + data: { + taskName?: string + attackCmd?: string + chunkTime?: integer + statusTimer?: integer + keyspace?: integer + keyspaceProgress?: integer + priority?: integer + maxAgents?: integer + color?: string + isSmall?: boolean + isCpuTask?: boolean + useNewBench?: boolean + skipKeyspace?: integer + crackerBinaryId?: integer + crackerBinaryTypeId?: integer + taskWrapperId?: integer + isArchived?: boolean + notes?: string + staticChunks?: integer + chunkSize?: integer + forcePipe?: boolean + preprocessorId?: integer + preprocessorCommand?: string + } + relationships: { + } + included: { + }[] +} +``` + +- 400 Invalid request + +`application/json` + +```ts +{ + title?: string + type?: string + status?: integer +} +``` + +- 401 Authentication failed + +`application/json` + +```ts +{ + title?: string + type?: string + status?: integer +} +``` + +- 404 Not Found + +`application/json` + +```ts +{ + message?: string + exception: { + type?: string + code?: integer + message?: string + file?: string + line?: integer + } +} +``` + +*** + +### [PATCH]/api/v2/ui/tasks/{id:[0-9]+}/relationships/{relation:crackerBinary} + +- Security +bearerAuth + +#### RequestBody + +- application/json + +```ts +{ + data: { + type?: string + attributes: { + attackCmd?: string + chunkTime?: integer + color?: string + isArchived?: boolean + isCpuTask?: boolean + isSmall?: boolean + maxAgents?: integer + notes?: string + priority?: integer + statusTimer?: integer + taskName?: string + } + } +} +``` + +#### Responses + +- 200 successful operation + +`application/json` + +```ts +{ + jsonapi: { + version?: string //default: 1.1 + ext?: string //default: https://jsonapi.org/profiles/ethanresnick/cursor-pagination + } + id?: integer + type?: string //default: Task + data: { + taskName?: string + attackCmd?: string + chunkTime?: integer + statusTimer?: integer + keyspace?: integer + keyspaceProgress?: integer + priority?: integer + maxAgents?: integer + color?: string + isSmall?: boolean + isCpuTask?: boolean + useNewBench?: boolean + skipKeyspace?: integer + crackerBinaryId?: integer + crackerBinaryTypeId?: integer + taskWrapperId?: integer + isArchived?: boolean + notes?: string + staticChunks?: integer + chunkSize?: integer + forcePipe?: boolean + preprocessorId?: integer + preprocessorCommand?: string + } +} +``` + +- 400 Invalid request + +`application/json` + +```ts +{ + title?: string + type?: string + status?: integer +} +``` + +- 401 Authentication failed + +`application/json` + +```ts +{ + title?: string + type?: string + status?: integer +} +``` + +- 404 Not Found + +`application/json` + +```ts +{ + message?: string + exception: { + type?: string + code?: integer + message?: string + file?: string + line?: integer + } +} +``` + +*** + +### [GET]/api/v2/ui/tasks/{id:[0-9]+}/{relation:crackerBinaryType} + +- Description +GET request for for a to-one relationship link. Returns the resource record of the object that is part of the specified relation. + +- Security +bearerAuth + +#### Parameters(Query) + +```ts +include?: string +``` + +#### Responses + +- 200 successful operation + +`application/json` + +```ts +{ + jsonapi: { + version?: string //default: 1.1 + ext?: string //default: https://jsonapi.org/profiles/ethanresnick/cursor-pagination + } + links: { + self?: string //default: /api/v2/ui/tasks?page[size]=25 + first?: string //default: /api/v2/ui/tasks?page[size]=25&page[after]=0 + last?: string //default: /api/v2/ui/tasks?page[size]=25&page[before]=500 + next?: string //default: /api/v2/ui/tasks?page[size]=25&page[after]=25 + previous?: string //default: /api/v2/ui/tasks?page[size]=25&page[before]=25 + } + id?: integer + type?: string //default: Task + data: { + taskName?: string + attackCmd?: string + chunkTime?: integer + statusTimer?: integer + keyspace?: integer + keyspaceProgress?: integer + priority?: integer + maxAgents?: integer + color?: string + isSmall?: boolean + isCpuTask?: boolean + useNewBench?: boolean + skipKeyspace?: integer + crackerBinaryId?: integer + crackerBinaryTypeId?: integer + taskWrapperId?: integer + isArchived?: boolean + notes?: string + staticChunks?: integer + chunkSize?: integer + forcePipe?: boolean + preprocessorId?: integer + preprocessorCommand?: string + } + relationships: { + } + included: { + }[] +} +``` + +- 400 Invalid request + +`application/json` + +```ts +{ + title?: string + type?: string + status?: integer +} +``` + +- 401 Authentication failed + +`application/json` + +```ts +{ + title?: string + type?: string + status?: integer +} +``` + +- 404 Not Found + +`application/json` + +```ts +{ + message?: string + exception: { + type?: string + code?: integer + message?: string + file?: string + line?: integer + } +} +``` + +*** + +### [GET]/api/v2/ui/tasks/{id:[0-9]+}/relationships/{relation:crackerBinaryType} + +- Description +GET request for for a to-one relationship link. Returns the resource record of the object that is part of the specified relation. + +- Security +bearerAuth + +#### Parameters(Query) + +```ts +include?: string +``` + +#### Responses + +- 200 successful operation + +`application/json` + +```ts +{ + jsonapi: { + version?: string //default: 1.1 + ext?: string //default: https://jsonapi.org/profiles/ethanresnick/cursor-pagination + } + links: { + self?: string //default: /api/v2/ui/tasks?page[size]=25 + first?: string //default: /api/v2/ui/tasks?page[size]=25&page[after]=0 + last?: string //default: /api/v2/ui/tasks?page[size]=25&page[before]=500 + next?: string //default: /api/v2/ui/tasks?page[size]=25&page[after]=25 + previous?: string //default: /api/v2/ui/tasks?page[size]=25&page[before]=25 + } + id?: integer + type?: string //default: Task + data: { + taskName?: string + attackCmd?: string + chunkTime?: integer + statusTimer?: integer + keyspace?: integer + keyspaceProgress?: integer + priority?: integer + maxAgents?: integer + color?: string + isSmall?: boolean + isCpuTask?: boolean + useNewBench?: boolean + skipKeyspace?: integer + crackerBinaryId?: integer + crackerBinaryTypeId?: integer + taskWrapperId?: integer + isArchived?: boolean + notes?: string + staticChunks?: integer + chunkSize?: integer + forcePipe?: boolean + preprocessorId?: integer + preprocessorCommand?: string + } + relationships: { + } + included: { + }[] +} +``` + +- 400 Invalid request + +`application/json` + +```ts +{ + title?: string + type?: string + status?: integer +} +``` + +- 401 Authentication failed + +`application/json` + +```ts +{ + title?: string + type?: string + status?: integer +} +``` + +- 404 Not Found + +`application/json` + +```ts +{ + message?: string + exception: { + type?: string + code?: integer + message?: string + file?: string + line?: integer + } +} +``` + +*** + +### [PATCH]/api/v2/ui/tasks/{id:[0-9]+}/relationships/{relation:crackerBinaryType} + +- Security +bearerAuth + +#### RequestBody + +- application/json + +```ts +{ + data: { + type?: string + attributes: { + attackCmd?: string + chunkTime?: integer + color?: string + isArchived?: boolean + isCpuTask?: boolean + isSmall?: boolean + maxAgents?: integer + notes?: string + priority?: integer + statusTimer?: integer + taskName?: string + } + } +} +``` + +#### Responses + +- 200 successful operation + +`application/json` + +```ts +{ + jsonapi: { + version?: string //default: 1.1 + ext?: string //default: https://jsonapi.org/profiles/ethanresnick/cursor-pagination + } + id?: integer + type?: string //default: Task + data: { + taskName?: string + attackCmd?: string + chunkTime?: integer + statusTimer?: integer + keyspace?: integer + keyspaceProgress?: integer + priority?: integer + maxAgents?: integer + color?: string + isSmall?: boolean + isCpuTask?: boolean + useNewBench?: boolean + skipKeyspace?: integer + crackerBinaryId?: integer + crackerBinaryTypeId?: integer + taskWrapperId?: integer + isArchived?: boolean + notes?: string + staticChunks?: integer + chunkSize?: integer + forcePipe?: boolean + preprocessorId?: integer + preprocessorCommand?: string + } +} +``` + +- 400 Invalid request + +`application/json` + +```ts +{ + title?: string + type?: string + status?: integer +} +``` + +- 401 Authentication failed + +`application/json` + +```ts +{ + title?: string + type?: string + status?: integer +} +``` + +- 404 Not Found + +`application/json` + +```ts +{ + message?: string + exception: { + type?: string + code?: integer + message?: string + file?: string + line?: integer + } +} +``` + +*** + +### [GET]/api/v2/ui/tasks/{id:[0-9]+}/{relation:hashlist} + +- Description +GET request for for a to-one relationship link. Returns the resource record of the object that is part of the specified relation. + +- Security +bearerAuth + +#### Parameters(Query) + +```ts +include?: string +``` + +#### Responses + +- 200 successful operation + +`application/json` + +```ts +{ + jsonapi: { + version?: string //default: 1.1 + ext?: string //default: https://jsonapi.org/profiles/ethanresnick/cursor-pagination + } + links: { + self?: string //default: /api/v2/ui/tasks?page[size]=25 + first?: string //default: /api/v2/ui/tasks?page[size]=25&page[after]=0 + last?: string //default: /api/v2/ui/tasks?page[size]=25&page[before]=500 + next?: string //default: /api/v2/ui/tasks?page[size]=25&page[after]=25 + previous?: string //default: /api/v2/ui/tasks?page[size]=25&page[before]=25 + } + id?: integer + type?: string //default: Task + data: { + taskName?: string + attackCmd?: string + chunkTime?: integer + statusTimer?: integer + keyspace?: integer + keyspaceProgress?: integer + priority?: integer + maxAgents?: integer + color?: string + isSmall?: boolean + isCpuTask?: boolean + useNewBench?: boolean + skipKeyspace?: integer + crackerBinaryId?: integer + crackerBinaryTypeId?: integer + taskWrapperId?: integer + isArchived?: boolean + notes?: string + staticChunks?: integer + chunkSize?: integer + forcePipe?: boolean + preprocessorId?: integer + preprocessorCommand?: string + } + relationships: { + } + included: { + }[] +} +``` + +- 400 Invalid request + +`application/json` + +```ts +{ + title?: string + type?: string + status?: integer +} +``` + +- 401 Authentication failed + +`application/json` + +```ts +{ + title?: string + type?: string + status?: integer +} +``` + +- 404 Not Found + +`application/json` + +```ts +{ + message?: string + exception: { + type?: string + code?: integer + message?: string + file?: string + line?: integer + } +} +``` + +*** + +### [GET]/api/v2/ui/tasks/{id:[0-9]+}/relationships/{relation:hashlist} + +- Description +GET request for for a to-one relationship link. Returns the resource record of the object that is part of the specified relation. + +- Security +bearerAuth + +#### Parameters(Query) + +```ts +include?: string +``` + +#### Responses + +- 200 successful operation + +`application/json` + +```ts +{ + jsonapi: { + version?: string //default: 1.1 + ext?: string //default: https://jsonapi.org/profiles/ethanresnick/cursor-pagination + } + links: { + self?: string //default: /api/v2/ui/tasks?page[size]=25 + first?: string //default: /api/v2/ui/tasks?page[size]=25&page[after]=0 + last?: string //default: /api/v2/ui/tasks?page[size]=25&page[before]=500 + next?: string //default: /api/v2/ui/tasks?page[size]=25&page[after]=25 + previous?: string //default: /api/v2/ui/tasks?page[size]=25&page[before]=25 + } + id?: integer + type?: string //default: Task + data: { + taskName?: string + attackCmd?: string + chunkTime?: integer + statusTimer?: integer + keyspace?: integer + keyspaceProgress?: integer + priority?: integer + maxAgents?: integer + color?: string + isSmall?: boolean + isCpuTask?: boolean + useNewBench?: boolean + skipKeyspace?: integer + crackerBinaryId?: integer + crackerBinaryTypeId?: integer + taskWrapperId?: integer + isArchived?: boolean + notes?: string + staticChunks?: integer + chunkSize?: integer + forcePipe?: boolean + preprocessorId?: integer + preprocessorCommand?: string + } + relationships: { + } + included: { + }[] +} +``` + +- 400 Invalid request + +`application/json` + +```ts +{ + title?: string + type?: string + status?: integer +} +``` + +- 401 Authentication failed + +`application/json` + +```ts +{ + title?: string + type?: string + status?: integer +} +``` + +- 404 Not Found + +`application/json` + +```ts +{ + message?: string + exception: { + type?: string + code?: integer + message?: string + file?: string + line?: integer + } +} +``` + +*** + +### [PATCH]/api/v2/ui/tasks/{id:[0-9]+}/relationships/{relation:hashlist} + +- Security +bearerAuth + +#### RequestBody + +- application/json + +```ts +{ + data: { + type?: string + attributes: { + attackCmd?: string + chunkTime?: integer + color?: string + isArchived?: boolean + isCpuTask?: boolean + isSmall?: boolean + maxAgents?: integer + notes?: string + priority?: integer + statusTimer?: integer + taskName?: string + } + } +} +``` + +#### Responses + +- 200 successful operation + +`application/json` + +```ts +{ + jsonapi: { + version?: string //default: 1.1 + ext?: string //default: https://jsonapi.org/profiles/ethanresnick/cursor-pagination + } + id?: integer + type?: string //default: Task + data: { + taskName?: string + attackCmd?: string + chunkTime?: integer + statusTimer?: integer + keyspace?: integer + keyspaceProgress?: integer + priority?: integer + maxAgents?: integer + color?: string + isSmall?: boolean + isCpuTask?: boolean + useNewBench?: boolean + skipKeyspace?: integer + crackerBinaryId?: integer + crackerBinaryTypeId?: integer + taskWrapperId?: integer + isArchived?: boolean + notes?: string + staticChunks?: integer + chunkSize?: integer + forcePipe?: boolean + preprocessorId?: integer + preprocessorCommand?: string + } +} +``` + +- 400 Invalid request + +`application/json` + +```ts +{ + title?: string + type?: string + status?: integer +} +``` + +- 401 Authentication failed + +`application/json` + +```ts +{ + title?: string + type?: string + status?: integer +} +``` + +- 404 Not Found + +`application/json` + +```ts +{ + message?: string + exception: { + type?: string + code?: integer + message?: string + file?: string + line?: integer + } +} +``` + +*** + +### [GET]/api/v2/ui/tasks/{id:[0-9]+}/{relation:assignedAgents} + +- Description +GET request for for a to-one relationship link. Returns the resource record of the object that is part of the specified relation. + +- Security +bearerAuth + +#### Parameters(Query) + +```ts +include?: string +``` + +#### Responses + +- 200 successful operation + +`application/json` + +```ts +{ + jsonapi: { + version?: string //default: 1.1 + ext?: string //default: https://jsonapi.org/profiles/ethanresnick/cursor-pagination + } + links: { + self?: string //default: /api/v2/ui/tasks?page[size]=25 + first?: string //default: /api/v2/ui/tasks?page[size]=25&page[after]=0 + last?: string //default: /api/v2/ui/tasks?page[size]=25&page[before]=500 + next?: string //default: /api/v2/ui/tasks?page[size]=25&page[after]=25 + previous?: string //default: /api/v2/ui/tasks?page[size]=25&page[before]=25 + } + id?: integer + type?: string //default: Task + data: { + taskName?: string + attackCmd?: string + chunkTime?: integer + statusTimer?: integer + keyspace?: integer + keyspaceProgress?: integer + priority?: integer + maxAgents?: integer + color?: string + isSmall?: boolean + isCpuTask?: boolean + useNewBench?: boolean + skipKeyspace?: integer + crackerBinaryId?: integer + crackerBinaryTypeId?: integer + taskWrapperId?: integer + isArchived?: boolean + notes?: string + staticChunks?: integer + chunkSize?: integer + forcePipe?: boolean + preprocessorId?: integer + preprocessorCommand?: string + } + relationships: { + } + included: { + }[] +} +``` + +- 400 Invalid request + +`application/json` + +```ts +{ + title?: string + type?: string + status?: integer +} +``` + +- 401 Authentication failed + +`application/json` + +```ts +{ + title?: string + type?: string + status?: integer +} +``` + +- 404 Not Found + +`application/json` + +```ts +{ + message?: string + exception: { + type?: string + code?: integer + message?: string + file?: string + line?: integer + } +} +``` + +*** + +### [GET]/api/v2/ui/tasks/{id:[0-9]+}/relationships/{relation:assignedAgents} + +- Description +GET request for for a to-one relationship link. Returns the resource record of the object that is part of the specified relation. + +- Security +bearerAuth + +#### Parameters(Query) + +```ts +include?: string +``` + +#### Responses + +- 200 successful operation + +`application/json` + +```ts +{ + jsonapi: { + version?: string //default: 1.1 + ext?: string //default: https://jsonapi.org/profiles/ethanresnick/cursor-pagination + } + links: { + self?: string //default: /api/v2/ui/tasks?page[size]=25 + first?: string //default: /api/v2/ui/tasks?page[size]=25&page[after]=0 + last?: string //default: /api/v2/ui/tasks?page[size]=25&page[before]=500 + next?: string //default: /api/v2/ui/tasks?page[size]=25&page[after]=25 + previous?: string //default: /api/v2/ui/tasks?page[size]=25&page[before]=25 + } + id?: integer + type?: string //default: Task + data: { + taskName?: string + attackCmd?: string + chunkTime?: integer + statusTimer?: integer + keyspace?: integer + keyspaceProgress?: integer + priority?: integer + maxAgents?: integer + color?: string + isSmall?: boolean + isCpuTask?: boolean + useNewBench?: boolean + skipKeyspace?: integer + crackerBinaryId?: integer + crackerBinaryTypeId?: integer + taskWrapperId?: integer + isArchived?: boolean + notes?: string + staticChunks?: integer + chunkSize?: integer + forcePipe?: boolean + preprocessorId?: integer + preprocessorCommand?: string + } + relationships: { + } + included: { + }[] +} +``` + +- 400 Invalid request + +`application/json` + +```ts +{ + title?: string + type?: string + status?: integer +} +``` + +- 401 Authentication failed + +`application/json` + +```ts +{ + title?: string + type?: string + status?: integer +} +``` + +- 404 Not Found + +`application/json` + +```ts +{ + message?: string + exception: { + type?: string + code?: integer + message?: string + file?: string + line?: integer + } +} +``` + +*** + +### [PATCH]/api/v2/ui/tasks/{id:[0-9]+}/relationships/{relation:assignedAgents} + +- Security +bearerAuth + +#### RequestBody + +- application/json + +```ts +{ + data: { + type?: string + attributes: { + attackCmd?: string + chunkTime?: integer + color?: string + isArchived?: boolean + isCpuTask?: boolean + isSmall?: boolean + maxAgents?: integer + notes?: string + priority?: integer + statusTimer?: integer + taskName?: string + } + } +} +``` + +#### Responses + +- 200 successful operation + +`application/json` + +```ts +{ + jsonapi: { + version?: string //default: 1.1 + ext?: string //default: https://jsonapi.org/profiles/ethanresnick/cursor-pagination + } + id?: integer + type?: string //default: Task + data: { + taskName?: string + attackCmd?: string + chunkTime?: integer + statusTimer?: integer + keyspace?: integer + keyspaceProgress?: integer + priority?: integer + maxAgents?: integer + color?: string + isSmall?: boolean + isCpuTask?: boolean + useNewBench?: boolean + skipKeyspace?: integer + crackerBinaryId?: integer + crackerBinaryTypeId?: integer + taskWrapperId?: integer + isArchived?: boolean + notes?: string + staticChunks?: integer + chunkSize?: integer + forcePipe?: boolean + preprocessorId?: integer + preprocessorCommand?: string + } +} +``` + +- 400 Invalid request + +`application/json` + +```ts +{ + title?: string + type?: string + status?: integer +} +``` + +- 401 Authentication failed + +`application/json` + +```ts +{ + title?: string + type?: string + status?: integer +} +``` + +- 404 Not Found + +`application/json` + +```ts +{ + message?: string + exception: { + type?: string + code?: integer + message?: string + file?: string + line?: integer + } +} +``` + +*** + +### [POST]/api/v2/ui/tasks/{id:[0-9]+}/relationships/{relation:assignedAgents} + +- Security +bearerAuth + +#### RequestBody + +- application/json + +#### Responses + +- 204 successfully created + +- 400 Invalid request + +`application/json` + +```ts +{ + title?: string + type?: string + status?: integer +} +``` + +- 401 Authentication failed + +`application/json` + +```ts +{ + title?: string + type?: string + status?: integer +} +``` + +- 404 Not Found + +`application/json` + +```ts +{ + message?: string + exception: { + type?: string + code?: integer + message?: string + file?: string + line?: integer + } +} +``` + +*** + +### [DELETE]/api/v2/ui/tasks/{id:[0-9]+}/relationships/{relation:assignedAgents} + +- Security +bearerAuth + +#### RequestBody + +- application/json + +#### Responses + +- 204 successfully deleted + +- 400 Invalid request + +`application/json` + +```ts +{ + title?: string + type?: string + status?: integer +} +``` + +- 401 Authentication failed + +`application/json` + +```ts +{ + title?: string + type?: string + status?: integer +} +``` + +- 404 Not Found + +`application/json` + +```ts +{ + message?: string + exception: { + type?: string + code?: integer + message?: string + file?: string + line?: integer + } +} +``` + +*** + +### [GET]/api/v2/ui/tasks/{id:[0-9]+}/{relation:files} + +- Description +GET request for for a to-one relationship link. Returns the resource record of the object that is part of the specified relation. + +- Security +bearerAuth + +#### Parameters(Query) + +```ts +include?: string +``` + +#### Responses + +- 200 successful operation + +`application/json` + +```ts +{ + jsonapi: { + version?: string //default: 1.1 + ext?: string //default: https://jsonapi.org/profiles/ethanresnick/cursor-pagination + } + links: { + self?: string //default: /api/v2/ui/tasks?page[size]=25 + first?: string //default: /api/v2/ui/tasks?page[size]=25&page[after]=0 + last?: string //default: /api/v2/ui/tasks?page[size]=25&page[before]=500 + next?: string //default: /api/v2/ui/tasks?page[size]=25&page[after]=25 + previous?: string //default: /api/v2/ui/tasks?page[size]=25&page[before]=25 + } + id?: integer + type?: string //default: Task + data: { + taskName?: string + attackCmd?: string + chunkTime?: integer + statusTimer?: integer + keyspace?: integer + keyspaceProgress?: integer + priority?: integer + maxAgents?: integer + color?: string + isSmall?: boolean + isCpuTask?: boolean + useNewBench?: boolean + skipKeyspace?: integer + crackerBinaryId?: integer + crackerBinaryTypeId?: integer + taskWrapperId?: integer + isArchived?: boolean + notes?: string + staticChunks?: integer + chunkSize?: integer + forcePipe?: boolean + preprocessorId?: integer + preprocessorCommand?: string + } + relationships: { + } + included: { + }[] +} +``` + +- 400 Invalid request + +`application/json` + +```ts +{ + title?: string + type?: string + status?: integer +} +``` + +- 401 Authentication failed + +`application/json` + +```ts +{ + title?: string + type?: string + status?: integer +} +``` + +- 404 Not Found + +`application/json` + +```ts +{ + message?: string + exception: { + type?: string + code?: integer + message?: string + file?: string + line?: integer + } +} +``` + +*** + +### [GET]/api/v2/ui/tasks/{id:[0-9]+}/relationships/{relation:files} + +- Description +GET request for for a to-one relationship link. Returns the resource record of the object that is part of the specified relation. + +- Security +bearerAuth + +#### Parameters(Query) + +```ts +include?: string +``` + +#### Responses + +- 200 successful operation + +`application/json` + +```ts +{ + jsonapi: { + version?: string //default: 1.1 + ext?: string //default: https://jsonapi.org/profiles/ethanresnick/cursor-pagination + } + links: { + self?: string //default: /api/v2/ui/tasks?page[size]=25 + first?: string //default: /api/v2/ui/tasks?page[size]=25&page[after]=0 + last?: string //default: /api/v2/ui/tasks?page[size]=25&page[before]=500 + next?: string //default: /api/v2/ui/tasks?page[size]=25&page[after]=25 + previous?: string //default: /api/v2/ui/tasks?page[size]=25&page[before]=25 + } + id?: integer + type?: string //default: Task + data: { + taskName?: string + attackCmd?: string + chunkTime?: integer + statusTimer?: integer + keyspace?: integer + keyspaceProgress?: integer + priority?: integer + maxAgents?: integer + color?: string + isSmall?: boolean + isCpuTask?: boolean + useNewBench?: boolean + skipKeyspace?: integer + crackerBinaryId?: integer + crackerBinaryTypeId?: integer + taskWrapperId?: integer + isArchived?: boolean + notes?: string + staticChunks?: integer + chunkSize?: integer + forcePipe?: boolean + preprocessorId?: integer + preprocessorCommand?: string + } + relationships: { + } + included: { + }[] +} +``` + +- 400 Invalid request + +`application/json` + +```ts +{ + title?: string + type?: string + status?: integer +} +``` + +- 401 Authentication failed + +`application/json` + +```ts +{ + title?: string + type?: string + status?: integer +} +``` + +- 404 Not Found + +`application/json` + +```ts +{ + message?: string + exception: { + type?: string + code?: integer + message?: string + file?: string + line?: integer + } +} +``` + +*** + +### [PATCH]/api/v2/ui/tasks/{id:[0-9]+}/relationships/{relation:files} + +- Security +bearerAuth + +#### RequestBody + +- application/json + +```ts +{ + data: { + type?: string + attributes: { + attackCmd?: string + chunkTime?: integer + color?: string + isArchived?: boolean + isCpuTask?: boolean + isSmall?: boolean + maxAgents?: integer + notes?: string + priority?: integer + statusTimer?: integer + taskName?: string + } + } +} +``` + +#### Responses + +- 200 successful operation + +`application/json` + +```ts +{ + jsonapi: { + version?: string //default: 1.1 + ext?: string //default: https://jsonapi.org/profiles/ethanresnick/cursor-pagination + } + id?: integer + type?: string //default: Task + data: { + taskName?: string + attackCmd?: string + chunkTime?: integer + statusTimer?: integer + keyspace?: integer + keyspaceProgress?: integer + priority?: integer + maxAgents?: integer + color?: string + isSmall?: boolean + isCpuTask?: boolean + useNewBench?: boolean + skipKeyspace?: integer + crackerBinaryId?: integer + crackerBinaryTypeId?: integer + taskWrapperId?: integer + isArchived?: boolean + notes?: string + staticChunks?: integer + chunkSize?: integer + forcePipe?: boolean + preprocessorId?: integer + preprocessorCommand?: string + } +} +``` + +- 400 Invalid request + +`application/json` + +```ts +{ + title?: string + type?: string + status?: integer +} +``` + +- 401 Authentication failed + +`application/json` + +```ts +{ + title?: string + type?: string + status?: integer +} +``` + +- 404 Not Found + +`application/json` + +```ts +{ + message?: string + exception: { + type?: string + code?: integer + message?: string + file?: string + line?: integer + } +} +``` + +*** + +### [POST]/api/v2/ui/tasks/{id:[0-9]+}/relationships/{relation:files} + +- Security +bearerAuth + +#### RequestBody + +- application/json + +#### Responses + +- 204 successfully created + +- 400 Invalid request + +`application/json` + +```ts +{ + title?: string + type?: string + status?: integer +} +``` + +- 401 Authentication failed + +`application/json` + +```ts +{ + title?: string + type?: string + status?: integer +} +``` + +- 404 Not Found + +`application/json` + +```ts +{ + message?: string + exception: { + type?: string + code?: integer + message?: string + file?: string + line?: integer + } +} +``` + +*** + +### [DELETE]/api/v2/ui/tasks/{id:[0-9]+}/relationships/{relation:files} + +- Security +bearerAuth + +#### RequestBody + +- application/json + +#### Responses + +- 204 successfully deleted + +- 400 Invalid request + +`application/json` + +```ts +{ + title?: string + type?: string + status?: integer +} +``` + +- 401 Authentication failed + +`application/json` + +```ts +{ + title?: string + type?: string + status?: integer +} +``` + +- 404 Not Found + +`application/json` + +```ts +{ + message?: string + exception: { + type?: string + code?: integer + message?: string + file?: string + line?: integer + } +} +``` + +*** + +### [GET]/api/v2/ui/tasks/{id:[0-9]+}/{relation:speeds} + +- Description +GET request for for a to-one relationship link. Returns the resource record of the object that is part of the specified relation. + +- Security +bearerAuth + +#### Parameters(Query) + +```ts +include?: string +``` + +#### Responses + +- 200 successful operation + +`application/json` + +```ts +{ + jsonapi: { + version?: string //default: 1.1 + ext?: string //default: https://jsonapi.org/profiles/ethanresnick/cursor-pagination + } + links: { + self?: string //default: /api/v2/ui/tasks?page[size]=25 + first?: string //default: /api/v2/ui/tasks?page[size]=25&page[after]=0 + last?: string //default: /api/v2/ui/tasks?page[size]=25&page[before]=500 + next?: string //default: /api/v2/ui/tasks?page[size]=25&page[after]=25 + previous?: string //default: /api/v2/ui/tasks?page[size]=25&page[before]=25 + } + id?: integer + type?: string //default: Task + data: { + taskName?: string + attackCmd?: string + chunkTime?: integer + statusTimer?: integer + keyspace?: integer + keyspaceProgress?: integer + priority?: integer + maxAgents?: integer + color?: string + isSmall?: boolean + isCpuTask?: boolean + useNewBench?: boolean + skipKeyspace?: integer + crackerBinaryId?: integer + crackerBinaryTypeId?: integer + taskWrapperId?: integer + isArchived?: boolean + notes?: string + staticChunks?: integer + chunkSize?: integer + forcePipe?: boolean + preprocessorId?: integer + preprocessorCommand?: string + } + relationships: { + } + included: { + }[] +} +``` + +- 400 Invalid request + +`application/json` + +```ts +{ + title?: string + type?: string + status?: integer +} +``` + +- 401 Authentication failed + +`application/json` + +```ts +{ + title?: string + type?: string + status?: integer +} +``` + +- 404 Not Found + +`application/json` + +```ts +{ + message?: string + exception: { + type?: string + code?: integer + message?: string + file?: string + line?: integer + } +} +``` + +*** + +### [GET]/api/v2/ui/tasks/{id:[0-9]+}/relationships/{relation:speeds} + +- Description +GET request for for a to-one relationship link. Returns the resource record of the object that is part of the specified relation. + +- Security +bearerAuth + +#### Parameters(Query) + +```ts +include?: string +``` + +#### Responses + +- 200 successful operation + +`application/json` + +```ts +{ + jsonapi: { + version?: string //default: 1.1 + ext?: string //default: https://jsonapi.org/profiles/ethanresnick/cursor-pagination + } + links: { + self?: string //default: /api/v2/ui/tasks?page[size]=25 + first?: string //default: /api/v2/ui/tasks?page[size]=25&page[after]=0 + last?: string //default: /api/v2/ui/tasks?page[size]=25&page[before]=500 + next?: string //default: /api/v2/ui/tasks?page[size]=25&page[after]=25 + previous?: string //default: /api/v2/ui/tasks?page[size]=25&page[before]=25 + } + id?: integer + type?: string //default: Task + data: { + taskName?: string + attackCmd?: string + chunkTime?: integer + statusTimer?: integer + keyspace?: integer + keyspaceProgress?: integer + priority?: integer + maxAgents?: integer + color?: string + isSmall?: boolean + isCpuTask?: boolean + useNewBench?: boolean + skipKeyspace?: integer + crackerBinaryId?: integer + crackerBinaryTypeId?: integer + taskWrapperId?: integer + isArchived?: boolean + notes?: string + staticChunks?: integer + chunkSize?: integer + forcePipe?: boolean + preprocessorId?: integer + preprocessorCommand?: string + } + relationships: { + } + included: { + }[] +} +``` + +- 400 Invalid request + +`application/json` + +```ts +{ + title?: string + type?: string + status?: integer +} +``` + +- 401 Authentication failed + +`application/json` + +```ts +{ + title?: string + type?: string + status?: integer +} +``` + +- 404 Not Found + +`application/json` + +```ts +{ + message?: string + exception: { + type?: string + code?: integer + message?: string + file?: string + line?: integer + } +} +``` + +*** + +### [PATCH]/api/v2/ui/tasks/{id:[0-9]+}/relationships/{relation:speeds} + +- Security +bearerAuth + +#### RequestBody + +- application/json + +```ts +{ + data: { + type?: string + attributes: { + attackCmd?: string + chunkTime?: integer + color?: string + isArchived?: boolean + isCpuTask?: boolean + isSmall?: boolean + maxAgents?: integer + notes?: string + priority?: integer + statusTimer?: integer + taskName?: string + } + } +} +``` + +#### Responses + +- 200 successful operation + +`application/json` + +```ts +{ + jsonapi: { + version?: string //default: 1.1 + ext?: string //default: https://jsonapi.org/profiles/ethanresnick/cursor-pagination + } + id?: integer + type?: string //default: Task + data: { + taskName?: string + attackCmd?: string + chunkTime?: integer + statusTimer?: integer + keyspace?: integer + keyspaceProgress?: integer + priority?: integer + maxAgents?: integer + color?: string + isSmall?: boolean + isCpuTask?: boolean + useNewBench?: boolean + skipKeyspace?: integer + crackerBinaryId?: integer + crackerBinaryTypeId?: integer + taskWrapperId?: integer + isArchived?: boolean + notes?: string + staticChunks?: integer + chunkSize?: integer + forcePipe?: boolean + preprocessorId?: integer + preprocessorCommand?: string + } +} +``` + +- 400 Invalid request + +`application/json` + +```ts +{ + title?: string + type?: string + status?: integer +} +``` + +- 401 Authentication failed + +`application/json` + +```ts +{ + title?: string + type?: string + status?: integer +} +``` + +- 404 Not Found + +`application/json` + +```ts +{ + message?: string + exception: { + type?: string + code?: integer + message?: string + file?: string + line?: integer + } +} +``` + +*** + +### [POST]/api/v2/ui/tasks/{id:[0-9]+}/relationships/{relation:speeds} + +- Security +bearerAuth + +#### RequestBody + +- application/json + +#### Responses + +- 204 successfully created + +- 400 Invalid request + +`application/json` + +```ts +{ + title?: string + type?: string + status?: integer +} +``` + +- 401 Authentication failed + +`application/json` + +```ts +{ + title?: string + type?: string + status?: integer +} +``` + +- 404 Not Found + +`application/json` + +```ts +{ + message?: string + exception: { + type?: string + code?: integer + message?: string + file?: string + line?: integer + } +} +``` + +*** + +### [DELETE]/api/v2/ui/tasks/{id:[0-9]+}/relationships/{relation:speeds} + +- Security +bearerAuth + +#### RequestBody + +- application/json + +#### Responses + +- 204 successfully deleted + +- 400 Invalid request + +`application/json` + +```ts +{ + title?: string + type?: string + status?: integer +} +``` + +- 401 Authentication failed + +`application/json` + +```ts +{ + title?: string + type?: string + status?: integer +} +``` + +- 404 Not Found + +`application/json` + +```ts +{ + message?: string + exception: { + type?: string + code?: integer + message?: string + file?: string + line?: integer + } +} +``` + +*** + +### [GET]/api/v2/ui/tasks/{id:[0-9]+} + +- Description +GET request to retrieve a single object. + +- Security +bearerAuth + +#### Parameters(Query) + +```ts +include?: string +``` + +#### Responses + +- 200 successful operation + +`application/json` + +```ts +{ + jsonapi: { + version?: string //default: 1.1 + ext?: string //default: https://jsonapi.org/profiles/ethanresnick/cursor-pagination + } + links: { + self?: string //default: /api/v2/ui/tasks?page[size]=25 + first?: string //default: /api/v2/ui/tasks?page[size]=25&page[after]=0 + last?: string //default: /api/v2/ui/tasks?page[size]=25&page[before]=500 + next?: string //default: /api/v2/ui/tasks?page[size]=25&page[after]=25 + previous?: string //default: /api/v2/ui/tasks?page[size]=25&page[before]=25 + } + id?: integer + type?: string //default: Task + data: { + taskName?: string + attackCmd?: string + chunkTime?: integer + statusTimer?: integer + keyspace?: integer + keyspaceProgress?: integer + priority?: integer + maxAgents?: integer + color?: string + isSmall?: boolean + isCpuTask?: boolean + useNewBench?: boolean + skipKeyspace?: integer + crackerBinaryId?: integer + crackerBinaryTypeId?: integer + taskWrapperId?: integer + isArchived?: boolean + notes?: string + staticChunks?: integer + chunkSize?: integer + forcePipe?: boolean + preprocessorId?: integer + preprocessorCommand?: string + } + relationships: { + } + included: { + }[] +} +``` + +- 400 Invalid request + +`application/json` + +```ts +{ + title?: string + type?: string + status?: integer +} +``` + +- 401 Authentication failed + +`application/json` + +```ts +{ + title?: string + type?: string + status?: integer +} +``` + +- 404 Not Found + +`application/json` + +```ts +{ + message?: string + exception: { + type?: string + code?: integer + message?: string + file?: string + line?: integer + } +} +``` + +*** + +### [PATCH]/api/v2/ui/tasks/{id:[0-9]+} + +- Description +PATCH request to update attributes of a single object. + +- Security +bearerAuth + +#### RequestBody + +- application/json + +```ts +{ + data: { + type?: string + attributes: { + attackCmd?: string + chunkTime?: integer + color?: string + isArchived?: boolean + isCpuTask?: boolean + isSmall?: boolean + maxAgents?: integer + notes?: string + priority?: integer + statusTimer?: integer + taskName?: string + } + } +} +``` + +#### Responses + +- 200 successful operation + +`application/json` + +```ts +{ + jsonapi: { + version?: string //default: 1.1 + ext?: string //default: https://jsonapi.org/profiles/ethanresnick/cursor-pagination + } + id?: integer + type?: string //default: Task + data: { + taskName?: string + attackCmd?: string + chunkTime?: integer + statusTimer?: integer + keyspace?: integer + keyspaceProgress?: integer + priority?: integer + maxAgents?: integer + color?: string + isSmall?: boolean + isCpuTask?: boolean + useNewBench?: boolean + skipKeyspace?: integer + crackerBinaryId?: integer + crackerBinaryTypeId?: integer + taskWrapperId?: integer + isArchived?: boolean + notes?: string + staticChunks?: integer + chunkSize?: integer + forcePipe?: boolean + preprocessorId?: integer + preprocessorCommand?: string + } +} +``` + +- 400 Invalid request + +`application/json` + +```ts +{ + title?: string + type?: string + status?: integer +} +``` + +- 401 Authentication failed + +`application/json` + +```ts +{ + title?: string + type?: string + status?: integer +} +``` + +- 404 Not Found + +`application/json` + +```ts +{ + message?: string + exception: { + type?: string + code?: integer + message?: string + file?: string + line?: integer + } +} +``` + +*** + +### [DELETE]/api/v2/ui/tasks/{id:[0-9]+} + +- Security +bearerAuth + +#### RequestBody + +- application/json + +#### Responses + +- 204 successfully deleted + +- 400 Invalid request + +`application/json` + +```ts +{ + title?: string + type?: string + status?: integer +} +``` + +- 401 Authentication failed + +`application/json` + +```ts +{ + title?: string + type?: string + status?: integer +} +``` + +- 404 Not Found + +`application/json` + +```ts +{ + message?: string + exception: { + type?: string + code?: integer + message?: string + file?: string + line?: integer + } +} +``` + +*** + +### [GET]/api/v2/ui/taskwrappers + +- Description +GET many request to retrieve multiple objects. + +- Security +bearerAuth + +#### Parameters(Query) + +```ts +page[after]?: integer +``` + +```ts +page[before]?: integer +``` + +```ts +page[size]?: integer +``` + +```ts +filter: { +} +``` + +```ts +include?: string +``` + +#### Responses + +- 200 successful operation + +`application/json` + +```ts +{ + jsonapi: { + version?: string //default: 1.1 + ext?: string //default: https://jsonapi.org/profiles/ethanresnick/cursor-pagination + } + links: { + self?: string //default: /api/v2/ui/taskwrappers?page[size]=25 + first?: string //default: /api/v2/ui/taskwrappers?page[size]=25&page[after]=0 + last?: string //default: /api/v2/ui/taskwrappers?page[size]=25&page[before]=500 + next?: string //default: /api/v2/ui/taskwrappers?page[size]=25&page[after]=25 + previous?: string //default: /api/v2/ui/taskwrappers?page[size]=25&page[before]=25 + } + id?: integer + type?: string //default: TaskWrapper + data: { + priority?: integer + maxAgents?: integer + taskType?: enum[0, 1] + hashlistId?: integer + accessGroupId?: integer + taskWrapperName?: string + isArchived?: boolean + cracked?: integer + } + relationships: { + } + included: { + }[] +}[] +``` + +- 400 Invalid request + +`application/json` + +```ts +{ + title?: string + type?: string + status?: integer +} +``` + +- 401 Authentication failed + +`application/json` + +```ts +{ + title?: string + type?: string + status?: integer +} +``` + +*** + +### [GET]/api/v2/ui/taskwrappers/count + +- Description +GET many request to retrieve multiple objects. + +- Security +bearerAuth + +#### Parameters(Query) + +```ts +page[after]?: integer +``` + +```ts +page[before]?: integer +``` + +```ts +page[size]?: integer +``` + +```ts +filter: { +} +``` + +```ts +include?: string +``` + +#### Responses + +- 200 successful operation + +`application/json` + +```ts +{ + jsonapi: { + version?: string //default: 1.1 + ext?: string //default: https://jsonapi.org/profiles/ethanresnick/cursor-pagination + } + links: { + self?: string //default: /api/v2/ui/taskwrappers?page[size]=25 + first?: string //default: /api/v2/ui/taskwrappers?page[size]=25&page[after]=0 + last?: string //default: /api/v2/ui/taskwrappers?page[size]=25&page[before]=500 + next?: string //default: /api/v2/ui/taskwrappers?page[size]=25&page[after]=25 + previous?: string //default: /api/v2/ui/taskwrappers?page[size]=25&page[before]=25 + } + id?: integer + type?: string //default: TaskWrapper + data: { + priority?: integer + maxAgents?: integer + taskType?: enum[0, 1] + hashlistId?: integer + accessGroupId?: integer + taskWrapperName?: string + isArchived?: boolean + cracked?: integer + } + relationships: { + } + included: { + }[] +}[] +``` + +- 400 Invalid request + +`application/json` + +```ts +{ + title?: string + type?: string + status?: integer +} +``` + +- 401 Authentication failed + +`application/json` + +```ts +{ + title?: string + type?: string + status?: integer +} +``` + +*** + +### [GET]/api/v2/ui/taskwrappers/{id:[0-9]+}/{relation:accessGroup} + +- Description +GET request for for a to-one relationship link. Returns the resource record of the object that is part of the specified relation. + +- Security +bearerAuth + +#### Parameters(Query) + +```ts +include?: string +``` + +#### Responses + +- 200 successful operation + +`application/json` + +```ts +{ + jsonapi: { + version?: string //default: 1.1 + ext?: string //default: https://jsonapi.org/profiles/ethanresnick/cursor-pagination + } + links: { + self?: string //default: /api/v2/ui/taskwrappers?page[size]=25 + first?: string //default: /api/v2/ui/taskwrappers?page[size]=25&page[after]=0 + last?: string //default: /api/v2/ui/taskwrappers?page[size]=25&page[before]=500 + next?: string //default: /api/v2/ui/taskwrappers?page[size]=25&page[after]=25 + previous?: string //default: /api/v2/ui/taskwrappers?page[size]=25&page[before]=25 + } + id?: integer + type?: string //default: TaskWrapper + data: { + priority?: integer + maxAgents?: integer + taskType?: enum[0, 1] + hashlistId?: integer + accessGroupId?: integer + taskWrapperName?: string + isArchived?: boolean + cracked?: integer + } + relationships: { + } + included: { + }[] +} +``` + +- 400 Invalid request + +`application/json` + +```ts +{ + title?: string + type?: string + status?: integer +} +``` + +- 401 Authentication failed + +`application/json` + +```ts +{ + title?: string + type?: string + status?: integer +} +``` + +- 404 Not Found + +`application/json` + +```ts +{ + message?: string + exception: { + type?: string + code?: integer + message?: string + file?: string + line?: integer + } +} +``` + +*** + +### [GET]/api/v2/ui/taskwrappers/{id:[0-9]+}/relationships/{relation:accessGroup} + +- Description +GET request for for a to-one relationship link. Returns the resource record of the object that is part of the specified relation. + +- Security +bearerAuth + +#### Parameters(Query) + +```ts +include?: string +``` + +#### Responses + +- 200 successful operation + +`application/json` + +```ts +{ + jsonapi: { + version?: string //default: 1.1 + ext?: string //default: https://jsonapi.org/profiles/ethanresnick/cursor-pagination + } + links: { + self?: string //default: /api/v2/ui/taskwrappers?page[size]=25 + first?: string //default: /api/v2/ui/taskwrappers?page[size]=25&page[after]=0 + last?: string //default: /api/v2/ui/taskwrappers?page[size]=25&page[before]=500 + next?: string //default: /api/v2/ui/taskwrappers?page[size]=25&page[after]=25 + previous?: string //default: /api/v2/ui/taskwrappers?page[size]=25&page[before]=25 + } + id?: integer + type?: string //default: TaskWrapper + data: { + priority?: integer + maxAgents?: integer + taskType?: enum[0, 1] + hashlistId?: integer + accessGroupId?: integer + taskWrapperName?: string + isArchived?: boolean + cracked?: integer + } + relationships: { + } + included: { + }[] +} +``` + +- 400 Invalid request + +`application/json` + +```ts +{ + title?: string + type?: string + status?: integer +} +``` + +- 401 Authentication failed + +`application/json` + +```ts +{ + title?: string + type?: string + status?: integer +} +``` + +- 404 Not Found + +`application/json` + +```ts +{ + message?: string + exception: { + type?: string + code?: integer + message?: string + file?: string + line?: integer + } +} +``` + +*** + +### [PATCH]/api/v2/ui/taskwrappers/{id:[0-9]+}/relationships/{relation:accessGroup} + +- Security +bearerAuth + +#### RequestBody + +- application/json + +```ts +{ + data: { + type?: string + attributes: { + accessGroupId?: integer + isArchived?: boolean + maxAgents?: integer + priority?: integer + taskWrapperName?: string + } + } +} +``` + +#### Responses + +- 200 successful operation + +`application/json` + +```ts +{ + jsonapi: { + version?: string //default: 1.1 + ext?: string //default: https://jsonapi.org/profiles/ethanresnick/cursor-pagination + } + id?: integer + type?: string //default: TaskWrapper + data: { + priority?: integer + maxAgents?: integer + taskType?: enum[0, 1] + hashlistId?: integer + accessGroupId?: integer + taskWrapperName?: string + isArchived?: boolean + cracked?: integer + } +} +``` + +- 400 Invalid request + +`application/json` + +```ts +{ + title?: string + type?: string + status?: integer +} +``` + +- 401 Authentication failed + +`application/json` + +```ts +{ + title?: string + type?: string + status?: integer +} +``` + +- 404 Not Found + +`application/json` + +```ts +{ + message?: string + exception: { + type?: string + code?: integer + message?: string + file?: string + line?: integer + } +} +``` + +*** + +### [GET]/api/v2/ui/taskwrappers/{id:[0-9]+}/{relation:tasks} + +- Description +GET request for for a to-one relationship link. Returns the resource record of the object that is part of the specified relation. + +- Security +bearerAuth + +#### Parameters(Query) + +```ts +include?: string +``` + +#### Responses + +- 200 successful operation + +`application/json` + +```ts +{ + jsonapi: { + version?: string //default: 1.1 + ext?: string //default: https://jsonapi.org/profiles/ethanresnick/cursor-pagination + } + links: { + self?: string //default: /api/v2/ui/taskwrappers?page[size]=25 + first?: string //default: /api/v2/ui/taskwrappers?page[size]=25&page[after]=0 + last?: string //default: /api/v2/ui/taskwrappers?page[size]=25&page[before]=500 + next?: string //default: /api/v2/ui/taskwrappers?page[size]=25&page[after]=25 + previous?: string //default: /api/v2/ui/taskwrappers?page[size]=25&page[before]=25 + } + id?: integer + type?: string //default: TaskWrapper + data: { + priority?: integer + maxAgents?: integer + taskType?: enum[0, 1] + hashlistId?: integer + accessGroupId?: integer + taskWrapperName?: string + isArchived?: boolean + cracked?: integer + } + relationships: { + } + included: { + }[] +} +``` + +- 400 Invalid request + +`application/json` + +```ts +{ + title?: string + type?: string + status?: integer +} +``` + +- 401 Authentication failed + +`application/json` + +```ts +{ + title?: string + type?: string + status?: integer +} +``` + +- 404 Not Found + +`application/json` + +```ts +{ + message?: string + exception: { + type?: string + code?: integer + message?: string + file?: string + line?: integer + } +} +``` + +*** + +### [GET]/api/v2/ui/taskwrappers/{id:[0-9]+}/relationships/{relation:tasks} + +- Description +GET request for for a to-one relationship link. Returns the resource record of the object that is part of the specified relation. + +- Security +bearerAuth + +#### Parameters(Query) + +```ts +include?: string +``` + +#### Responses + +- 200 successful operation + +`application/json` + +```ts +{ + jsonapi: { + version?: string //default: 1.1 + ext?: string //default: https://jsonapi.org/profiles/ethanresnick/cursor-pagination + } + links: { + self?: string //default: /api/v2/ui/taskwrappers?page[size]=25 + first?: string //default: /api/v2/ui/taskwrappers?page[size]=25&page[after]=0 + last?: string //default: /api/v2/ui/taskwrappers?page[size]=25&page[before]=500 + next?: string //default: /api/v2/ui/taskwrappers?page[size]=25&page[after]=25 + previous?: string //default: /api/v2/ui/taskwrappers?page[size]=25&page[before]=25 + } + id?: integer + type?: string //default: TaskWrapper + data: { + priority?: integer + maxAgents?: integer + taskType?: enum[0, 1] + hashlistId?: integer + accessGroupId?: integer + taskWrapperName?: string + isArchived?: boolean + cracked?: integer + } + relationships: { + } + included: { + }[] +} +``` + +- 400 Invalid request + +`application/json` + +```ts +{ + title?: string + type?: string + status?: integer +} +``` + +- 401 Authentication failed + +`application/json` + +```ts +{ + title?: string + type?: string + status?: integer +} +``` + +- 404 Not Found + +`application/json` + +```ts +{ + message?: string + exception: { + type?: string + code?: integer + message?: string + file?: string + line?: integer + } +} +``` + +*** + +### [PATCH]/api/v2/ui/taskwrappers/{id:[0-9]+}/relationships/{relation:tasks} + +- Security +bearerAuth + +#### RequestBody + +- application/json + +```ts +{ + data: { + type?: string + attributes: { + accessGroupId?: integer + isArchived?: boolean + maxAgents?: integer + priority?: integer + taskWrapperName?: string + } + } +} +``` + +#### Responses + +- 200 successful operation + +`application/json` + +```ts +{ + jsonapi: { + version?: string //default: 1.1 + ext?: string //default: https://jsonapi.org/profiles/ethanresnick/cursor-pagination + } + id?: integer + type?: string //default: TaskWrapper + data: { + priority?: integer + maxAgents?: integer + taskType?: enum[0, 1] + hashlistId?: integer + accessGroupId?: integer + taskWrapperName?: string + isArchived?: boolean + cracked?: integer + } +} +``` + +- 400 Invalid request + +`application/json` + +```ts +{ + title?: string + type?: string + status?: integer +} +``` + +- 401 Authentication failed + +`application/json` + +```ts +{ + title?: string + type?: string + status?: integer +} +``` + +- 404 Not Found + +`application/json` + +```ts +{ + message?: string + exception: { + type?: string + code?: integer + message?: string + file?: string + line?: integer + } +} +``` + +*** + +### [POST]/api/v2/ui/taskwrappers/{id:[0-9]+}/relationships/{relation:tasks} + +- Security +bearerAuth + +#### RequestBody + +- application/json + +#### Responses + +- 204 successfully created + +- 400 Invalid request + +`application/json` + +```ts +{ + title?: string + type?: string + status?: integer +} +``` + +- 401 Authentication failed + +`application/json` + +```ts +{ + title?: string + type?: string + status?: integer +} +``` + +- 404 Not Found + +`application/json` + +```ts +{ + message?: string + exception: { + type?: string + code?: integer + message?: string + file?: string + line?: integer + } +} +``` + +*** + +### [DELETE]/api/v2/ui/taskwrappers/{id:[0-9]+}/relationships/{relation:tasks} + +- Security +bearerAuth + +#### RequestBody + +- application/json + +#### Responses + +- 204 successfully deleted + +- 400 Invalid request + +`application/json` + +```ts +{ + title?: string + type?: string + status?: integer +} +``` + +- 401 Authentication failed + +`application/json` + +```ts +{ + title?: string + type?: string + status?: integer +} +``` + +- 404 Not Found + +`application/json` + +```ts +{ + message?: string + exception: { + type?: string + code?: integer + message?: string + file?: string + line?: integer + } +} +``` + +*** + +### [GET]/api/v2/ui/taskwrappers/{id:[0-9]+} + +- Description +GET request to retrieve a single object. + +- Security +bearerAuth + +#### Parameters(Query) + +```ts +include?: string +``` + +#### Responses + +- 200 successful operation + +`application/json` + +```ts +{ + jsonapi: { + version?: string //default: 1.1 + ext?: string //default: https://jsonapi.org/profiles/ethanresnick/cursor-pagination + } + links: { + self?: string //default: /api/v2/ui/taskwrappers?page[size]=25 + first?: string //default: /api/v2/ui/taskwrappers?page[size]=25&page[after]=0 + last?: string //default: /api/v2/ui/taskwrappers?page[size]=25&page[before]=500 + next?: string //default: /api/v2/ui/taskwrappers?page[size]=25&page[after]=25 + previous?: string //default: /api/v2/ui/taskwrappers?page[size]=25&page[before]=25 + } + id?: integer + type?: string //default: TaskWrapper + data: { + priority?: integer + maxAgents?: integer + taskType?: enum[0, 1] + hashlistId?: integer + accessGroupId?: integer + taskWrapperName?: string + isArchived?: boolean + cracked?: integer + } + relationships: { + } + included: { + }[] +} +``` + +- 400 Invalid request + +`application/json` + +```ts +{ + title?: string + type?: string + status?: integer +} +``` + +- 401 Authentication failed + +`application/json` + +```ts +{ + title?: string + type?: string + status?: integer +} +``` + +- 404 Not Found + +`application/json` + +```ts +{ + message?: string + exception: { + type?: string + code?: integer + message?: string + file?: string + line?: integer + } +} +``` + +*** + +### [PATCH]/api/v2/ui/taskwrappers/{id:[0-9]+} + +- Description +PATCH request to update attributes of a single object. + +- Security +bearerAuth + +#### RequestBody + +- application/json + +```ts +{ + data: { + type?: string + attributes: { + accessGroupId?: integer + isArchived?: boolean + maxAgents?: integer + priority?: integer + taskWrapperName?: string + } + } +} +``` + +#### Responses + +- 200 successful operation + +`application/json` + +```ts +{ + jsonapi: { + version?: string //default: 1.1 + ext?: string //default: https://jsonapi.org/profiles/ethanresnick/cursor-pagination + } + id?: integer + type?: string //default: TaskWrapper + data: { + priority?: integer + maxAgents?: integer + taskType?: enum[0, 1] + hashlistId?: integer + accessGroupId?: integer + taskWrapperName?: string + isArchived?: boolean + cracked?: integer + } +} +``` + +- 400 Invalid request + +`application/json` + +```ts +{ + title?: string + type?: string + status?: integer +} +``` + +- 401 Authentication failed + +`application/json` + +```ts +{ + title?: string + type?: string + status?: integer +} +``` + +- 404 Not Found + +`application/json` + +```ts +{ + message?: string + exception: { + type?: string + code?: integer + message?: string + file?: string + line?: integer + } +} +``` + +*** + +### [DELETE]/api/v2/ui/taskwrappers/{id:[0-9]+} + +- Security +bearerAuth + +#### RequestBody + +- application/json + +#### Responses + +- 204 successfully deleted + +- 400 Invalid request + +`application/json` + +```ts +{ + title?: string + type?: string + status?: integer +} +``` + +- 401 Authentication failed + +`application/json` + +```ts +{ + title?: string + type?: string + status?: integer +} +``` + +- 404 Not Found + +`application/json` + +```ts +{ + message?: string + exception: { + type?: string + code?: integer + message?: string + file?: string + line?: integer + } +} +``` + +*** + +### [GET]/api/v2/ui/users + +- Description +GET many request to retrieve multiple objects. + +- Security +bearerAuth + +#### Parameters(Query) + +```ts +page[after]?: integer +``` + +```ts +page[before]?: integer +``` + +```ts +page[size]?: integer +``` + +```ts +filter: { +} +``` + +```ts +include?: string +``` + +#### Responses + +- 200 successful operation + +`application/json` + +```ts +{ + jsonapi: { + version?: string //default: 1.1 + ext?: string //default: https://jsonapi.org/profiles/ethanresnick/cursor-pagination + } + links: { + self?: string //default: /api/v2/ui/users?page[size]=25 + first?: string //default: /api/v2/ui/users?page[size]=25&page[after]=0 + last?: string //default: /api/v2/ui/users?page[size]=25&page[before]=500 + next?: string //default: /api/v2/ui/users?page[size]=25&page[after]=25 + previous?: string //default: /api/v2/ui/users?page[size]=25&page[before]=25 + } + id?: integer + type?: string //default: User + data: { + name?: string + email?: string + passwordHash?: string + passwordSalt?: string + isValid?: boolean + isComputedPassword?: boolean + lastLoginDate?: integer + registeredSince?: integer + sessionLifetime?: integer + globalPermissionGroupId?: integer + yubikey?: string + otp1?: string + otp2?: string + otp3?: string + otp4?: string + } + relationships: { + } + included: { + }[] +}[] +``` + +- 400 Invalid request + +`application/json` + +```ts +{ + title?: string + type?: string + status?: integer +} +``` + +- 401 Authentication failed + +`application/json` + +```ts +{ + title?: string + type?: string + status?: integer +} +``` + +*** + +### [POST]/api/v2/ui/users + +- Description +POST request to create a new object. The request must contain the resource record as data with the attributes of the new object.To add relationships, a relationships object can be added with the resource records of the relations that are part of this object. + +- Security +bearerAuth + +#### RequestBody + +- application/json + +```ts +{ + data: { + type?: string + attributes: { + name?: string + email?: string + passwordHash?: string + passwordSalt?: string + isValid?: boolean + isComputedPassword?: boolean + lastLoginDate?: integer + registeredSince?: integer + sessionLifetime?: integer + globalPermissionGroupId?: integer + yubikey?: string + otp1?: string + otp2?: string + otp3?: string + otp4?: string + } + } +} +``` + +#### Responses + +- 201 successful operation + +`application/json` + +```ts +{ + jsonapi: { + version?: string //default: 1.1 + ext?: string //default: https://jsonapi.org/profiles/ethanresnick/cursor-pagination + } + id?: integer + type?: string //default: User + data: { + name?: string + email?: string + passwordHash?: string + passwordSalt?: string + isValid?: boolean + isComputedPassword?: boolean + lastLoginDate?: integer + registeredSince?: integer + sessionLifetime?: integer + globalPermissionGroupId?: integer + yubikey?: string + otp1?: string + otp2?: string + otp3?: string + otp4?: string + } +} +``` + +- 400 Invalid request + +`application/json` + +```ts +{ + title?: string + type?: string + status?: integer +} +``` + +- 401 Authentication failed + +`application/json` + +```ts +{ + title?: string + type?: string + status?: integer +} +``` + +*** + +### [GET]/api/v2/ui/users/count + +- Description +GET many request to retrieve multiple objects. + +- Security +bearerAuth + +#### Parameters(Query) + +```ts +page[after]?: integer +``` + +```ts +page[before]?: integer +``` + +```ts +page[size]?: integer +``` + +```ts +filter: { +} +``` + +```ts +include?: string +``` + +#### Responses + +- 200 successful operation + +`application/json` + +```ts +{ + jsonapi: { + version?: string //default: 1.1 + ext?: string //default: https://jsonapi.org/profiles/ethanresnick/cursor-pagination + } + links: { + self?: string //default: /api/v2/ui/users?page[size]=25 + first?: string //default: /api/v2/ui/users?page[size]=25&page[after]=0 + last?: string //default: /api/v2/ui/users?page[size]=25&page[before]=500 + next?: string //default: /api/v2/ui/users?page[size]=25&page[after]=25 + previous?: string //default: /api/v2/ui/users?page[size]=25&page[before]=25 + } + id?: integer + type?: string //default: User + data: { + name?: string + email?: string + passwordHash?: string + passwordSalt?: string + isValid?: boolean + isComputedPassword?: boolean + lastLoginDate?: integer + registeredSince?: integer + sessionLifetime?: integer + globalPermissionGroupId?: integer + yubikey?: string + otp1?: string + otp2?: string + otp3?: string + otp4?: string + } + relationships: { + } + included: { + }[] +}[] +``` + +- 400 Invalid request + +`application/json` + +```ts +{ + title?: string + type?: string + status?: integer +} +``` + +- 401 Authentication failed + +`application/json` + +```ts +{ + title?: string + type?: string + status?: integer +} +``` + +*** + +### [GET]/api/v2/ui/users/{id:[0-9]+}/{relation:globalPermissionGroup} + +- Description +GET request for for a to-one relationship link. Returns the resource record of the object that is part of the specified relation. + +- Security +bearerAuth + +#### Parameters(Query) + +```ts +include?: string +``` + +#### Responses + +- 200 successful operation + +`application/json` + +```ts +{ + jsonapi: { + version?: string //default: 1.1 + ext?: string //default: https://jsonapi.org/profiles/ethanresnick/cursor-pagination + } + links: { + self?: string //default: /api/v2/ui/users?page[size]=25 + first?: string //default: /api/v2/ui/users?page[size]=25&page[after]=0 + last?: string //default: /api/v2/ui/users?page[size]=25&page[before]=500 + next?: string //default: /api/v2/ui/users?page[size]=25&page[after]=25 + previous?: string //default: /api/v2/ui/users?page[size]=25&page[before]=25 + } + id?: integer + type?: string //default: User + data: { + name?: string + email?: string + passwordHash?: string + passwordSalt?: string + isValid?: boolean + isComputedPassword?: boolean + lastLoginDate?: integer + registeredSince?: integer + sessionLifetime?: integer + globalPermissionGroupId?: integer + yubikey?: string + otp1?: string + otp2?: string + otp3?: string + otp4?: string + } + relationships: { + } + included: { + }[] +} +``` + +- 400 Invalid request + +`application/json` + +```ts +{ + title?: string + type?: string + status?: integer +} +``` + +- 401 Authentication failed + +`application/json` + +```ts +{ + title?: string + type?: string + status?: integer +} +``` + +- 404 Not Found + +`application/json` + +```ts +{ + message?: string + exception: { + type?: string + code?: integer + message?: string + file?: string + line?: integer + } +} +``` + +*** + +### [GET]/api/v2/ui/users/{id:[0-9]+}/relationships/{relation:globalPermissionGroup} + +- Description +GET request for for a to-one relationship link. Returns the resource record of the object that is part of the specified relation. + +- Security +bearerAuth + +#### Parameters(Query) + +```ts +include?: string +``` + +#### Responses + +- 200 successful operation + +`application/json` + +```ts +{ + jsonapi: { + version?: string //default: 1.1 + ext?: string //default: https://jsonapi.org/profiles/ethanresnick/cursor-pagination + } + links: { + self?: string //default: /api/v2/ui/users?page[size]=25 + first?: string //default: /api/v2/ui/users?page[size]=25&page[after]=0 + last?: string //default: /api/v2/ui/users?page[size]=25&page[before]=500 + next?: string //default: /api/v2/ui/users?page[size]=25&page[after]=25 + previous?: string //default: /api/v2/ui/users?page[size]=25&page[before]=25 + } + id?: integer + type?: string //default: User + data: { + name?: string + email?: string + passwordHash?: string + passwordSalt?: string + isValid?: boolean + isComputedPassword?: boolean + lastLoginDate?: integer + registeredSince?: integer + sessionLifetime?: integer + globalPermissionGroupId?: integer + yubikey?: string + otp1?: string + otp2?: string + otp3?: string + otp4?: string + } + relationships: { + } + included: { + }[] +} +``` + +- 400 Invalid request + +`application/json` + +```ts +{ + title?: string + type?: string + status?: integer +} +``` + +- 401 Authentication failed + +`application/json` + +```ts +{ + title?: string + type?: string + status?: integer +} +``` + +- 404 Not Found + +`application/json` + +```ts +{ + message?: string + exception: { + type?: string + code?: integer + message?: string + file?: string + line?: integer + } +} +``` + +*** + +### [PATCH]/api/v2/ui/users/{id:[0-9]+}/relationships/{relation:globalPermissionGroup} + +- Security +bearerAuth + +#### RequestBody + +- application/json + +```ts +{ + data: { + type?: string + attributes: { + email?: string + globalPermissionGroupId?: integer + isValid?: boolean + name?: string + } + } +} +``` + +#### Responses + +- 200 successful operation + +`application/json` + +```ts +{ + jsonapi: { + version?: string //default: 1.1 + ext?: string //default: https://jsonapi.org/profiles/ethanresnick/cursor-pagination + } + id?: integer + type?: string //default: User + data: { + name?: string + email?: string + passwordHash?: string + passwordSalt?: string + isValid?: boolean + isComputedPassword?: boolean + lastLoginDate?: integer + registeredSince?: integer + sessionLifetime?: integer + globalPermissionGroupId?: integer + yubikey?: string + otp1?: string + otp2?: string + otp3?: string + otp4?: string + } +} +``` + +- 400 Invalid request + +`application/json` + +```ts +{ + title?: string + type?: string + status?: integer +} +``` + +- 401 Authentication failed + +`application/json` + +```ts +{ + title?: string + type?: string + status?: integer +} +``` + +- 404 Not Found + +`application/json` + +```ts +{ + message?: string + exception: { + type?: string + code?: integer + message?: string + file?: string + line?: integer + } +} +``` + +*** + +### [GET]/api/v2/ui/users/{id:[0-9]+}/{relation:accessGroups} + +- Description +GET request for for a to-one relationship link. Returns the resource record of the object that is part of the specified relation. + +- Security +bearerAuth + +#### Parameters(Query) + +```ts +include?: string +``` + +#### Responses + +- 200 successful operation + +`application/json` + +```ts +{ + jsonapi: { + version?: string //default: 1.1 + ext?: string //default: https://jsonapi.org/profiles/ethanresnick/cursor-pagination + } + links: { + self?: string //default: /api/v2/ui/users?page[size]=25 + first?: string //default: /api/v2/ui/users?page[size]=25&page[after]=0 + last?: string //default: /api/v2/ui/users?page[size]=25&page[before]=500 + next?: string //default: /api/v2/ui/users?page[size]=25&page[after]=25 + previous?: string //default: /api/v2/ui/users?page[size]=25&page[before]=25 + } + id?: integer + type?: string //default: User + data: { + name?: string + email?: string + passwordHash?: string + passwordSalt?: string + isValid?: boolean + isComputedPassword?: boolean + lastLoginDate?: integer + registeredSince?: integer + sessionLifetime?: integer + globalPermissionGroupId?: integer + yubikey?: string + otp1?: string + otp2?: string + otp3?: string + otp4?: string + } + relationships: { + } + included: { + }[] +} +``` + +- 400 Invalid request + +`application/json` + +```ts +{ + title?: string + type?: string + status?: integer +} +``` + +- 401 Authentication failed + +`application/json` + +```ts +{ + title?: string + type?: string + status?: integer +} +``` + +- 404 Not Found + +`application/json` + +```ts +{ + message?: string + exception: { + type?: string + code?: integer + message?: string + file?: string + line?: integer + } +} +``` + +*** + +### [GET]/api/v2/ui/users/{id:[0-9]+}/relationships/{relation:accessGroups} + +- Description +GET request for for a to-one relationship link. Returns the resource record of the object that is part of the specified relation. + +- Security +bearerAuth + +#### Parameters(Query) + +```ts +include?: string +``` + +#### Responses + +- 200 successful operation + +`application/json` + +```ts +{ + jsonapi: { + version?: string //default: 1.1 + ext?: string //default: https://jsonapi.org/profiles/ethanresnick/cursor-pagination + } + links: { + self?: string //default: /api/v2/ui/users?page[size]=25 + first?: string //default: /api/v2/ui/users?page[size]=25&page[after]=0 + last?: string //default: /api/v2/ui/users?page[size]=25&page[before]=500 + next?: string //default: /api/v2/ui/users?page[size]=25&page[after]=25 + previous?: string //default: /api/v2/ui/users?page[size]=25&page[before]=25 + } + id?: integer + type?: string //default: User + data: { + name?: string + email?: string + passwordHash?: string + passwordSalt?: string + isValid?: boolean + isComputedPassword?: boolean + lastLoginDate?: integer + registeredSince?: integer + sessionLifetime?: integer + globalPermissionGroupId?: integer + yubikey?: string + otp1?: string + otp2?: string + otp3?: string + otp4?: string + } + relationships: { + } + included: { + }[] +} +``` + +- 400 Invalid request + +`application/json` + +```ts +{ + title?: string + type?: string + status?: integer +} +``` + +- 401 Authentication failed + +`application/json` + +```ts +{ + title?: string + type?: string + status?: integer +} +``` + +- 404 Not Found + +`application/json` + +```ts +{ + message?: string + exception: { + type?: string + code?: integer + message?: string + file?: string + line?: integer + } +} +``` + +*** + +### [PATCH]/api/v2/ui/users/{id:[0-9]+}/relationships/{relation:accessGroups} + +- Security +bearerAuth + +#### RequestBody + +- application/json + +```ts +{ + data: { + type?: string + attributes: { + email?: string + globalPermissionGroupId?: integer + isValid?: boolean + name?: string + } + } +} +``` + +#### Responses + +- 200 successful operation + +`application/json` + +```ts +{ + jsonapi: { + version?: string //default: 1.1 + ext?: string //default: https://jsonapi.org/profiles/ethanresnick/cursor-pagination + } + id?: integer + type?: string //default: User + data: { + name?: string + email?: string + passwordHash?: string + passwordSalt?: string + isValid?: boolean + isComputedPassword?: boolean + lastLoginDate?: integer + registeredSince?: integer + sessionLifetime?: integer + globalPermissionGroupId?: integer + yubikey?: string + otp1?: string + otp2?: string + otp3?: string + otp4?: string + } +} +``` + +- 400 Invalid request + +`application/json` + +```ts +{ + title?: string + type?: string + status?: integer +} +``` + +- 401 Authentication failed + +`application/json` + +```ts +{ + title?: string + type?: string + status?: integer +} +``` + +- 404 Not Found + +`application/json` + +```ts +{ + message?: string + exception: { + type?: string + code?: integer + message?: string + file?: string + line?: integer + } +} +``` + +*** + +### [POST]/api/v2/ui/users/{id:[0-9]+}/relationships/{relation:accessGroups} + +- Security +bearerAuth + +#### RequestBody + +- application/json + +#### Responses + +- 204 successfully created + +- 400 Invalid request + +`application/json` + +```ts +{ + title?: string + type?: string + status?: integer +} +``` + +- 401 Authentication failed + +`application/json` + +```ts +{ + title?: string + type?: string + status?: integer +} +``` + +- 404 Not Found + +`application/json` + +```ts +{ + message?: string + exception: { + type?: string + code?: integer + message?: string + file?: string + line?: integer + } +} +``` + +*** + +### [DELETE]/api/v2/ui/users/{id:[0-9]+}/relationships/{relation:accessGroups} + +- Security +bearerAuth + +#### RequestBody + +- application/json + +#### Responses + +- 204 successfully deleted + +- 400 Invalid request + +`application/json` + +```ts +{ + title?: string + type?: string + status?: integer +} +``` + +- 401 Authentication failed + +`application/json` + +```ts +{ + title?: string + type?: string + status?: integer +} +``` + +- 404 Not Found + +`application/json` + +```ts +{ + message?: string + exception: { + type?: string + code?: integer + message?: string + file?: string + line?: integer + } +} +``` + +*** + +### [GET]/api/v2/ui/users/{id:[0-9]+} + +- Description +GET request to retrieve a single object. + +- Security +bearerAuth + +#### Parameters(Query) + +```ts +include?: string +``` + +#### Responses + +- 200 successful operation + +`application/json` + +```ts +{ + jsonapi: { + version?: string //default: 1.1 + ext?: string //default: https://jsonapi.org/profiles/ethanresnick/cursor-pagination + } + links: { + self?: string //default: /api/v2/ui/users?page[size]=25 + first?: string //default: /api/v2/ui/users?page[size]=25&page[after]=0 + last?: string //default: /api/v2/ui/users?page[size]=25&page[before]=500 + next?: string //default: /api/v2/ui/users?page[size]=25&page[after]=25 + previous?: string //default: /api/v2/ui/users?page[size]=25&page[before]=25 + } + id?: integer + type?: string //default: User + data: { + name?: string + email?: string + passwordHash?: string + passwordSalt?: string + isValid?: boolean + isComputedPassword?: boolean + lastLoginDate?: integer + registeredSince?: integer + sessionLifetime?: integer + globalPermissionGroupId?: integer + yubikey?: string + otp1?: string + otp2?: string + otp3?: string + otp4?: string + } + relationships: { + } + included: { + }[] +} +``` + +- 400 Invalid request + +`application/json` + +```ts +{ + title?: string + type?: string + status?: integer +} +``` + +- 401 Authentication failed + +`application/json` + +```ts +{ + title?: string + type?: string + status?: integer +} +``` + +- 404 Not Found + +`application/json` + +```ts +{ + message?: string + exception: { + type?: string + code?: integer + message?: string + file?: string + line?: integer + } +} +``` + +*** + +### [PATCH]/api/v2/ui/users/{id:[0-9]+} + +- Description +PATCH request to update attributes of a single object. + +- Security +bearerAuth + +#### RequestBody + +- application/json + +```ts +{ + data: { + type?: string + attributes: { + email?: string + globalPermissionGroupId?: integer + isValid?: boolean + name?: string + } + } +} +``` + +#### Responses + +- 200 successful operation + +`application/json` + +```ts +{ + jsonapi: { + version?: string //default: 1.1 + ext?: string //default: https://jsonapi.org/profiles/ethanresnick/cursor-pagination + } + id?: integer + type?: string //default: User + data: { + name?: string + email?: string + passwordHash?: string + passwordSalt?: string + isValid?: boolean + isComputedPassword?: boolean + lastLoginDate?: integer + registeredSince?: integer + sessionLifetime?: integer + globalPermissionGroupId?: integer + yubikey?: string + otp1?: string + otp2?: string + otp3?: string + otp4?: string + } +} +``` + +- 400 Invalid request + +`application/json` + +```ts +{ + title?: string + type?: string + status?: integer +} +``` + +- 401 Authentication failed + +`application/json` + +```ts +{ + title?: string + type?: string + status?: integer +} +``` + +- 404 Not Found + +`application/json` + +```ts +{ + message?: string + exception: { + type?: string + code?: integer + message?: string + file?: string + line?: integer + } +} +``` + +*** + +### [DELETE]/api/v2/ui/users/{id:[0-9]+} + +- Security +bearerAuth + +#### RequestBody + +- application/json + +#### Responses + +- 204 successfully deleted + +- 400 Invalid request + +`application/json` + +```ts +{ + title?: string + type?: string + status?: integer +} +``` + +- 401 Authentication failed + +`application/json` + +```ts +{ + title?: string + type?: string + status?: integer +} +``` + +- 404 Not Found + +`application/json` + +```ts +{ + message?: string + exception: { + type?: string + code?: integer + message?: string + file?: string + line?: integer + } +} +``` + +*** + +### [GET]/api/v2/ui/vouchers + +- Description +GET many request to retrieve multiple objects. + +- Security +bearerAuth + +#### Parameters(Query) + +```ts +page[after]?: integer +``` + +```ts +page[before]?: integer +``` + +```ts +page[size]?: integer +``` + +```ts +filter: { +} +``` + +```ts +include?: string +``` + +#### Responses + +- 200 successful operation + +`application/json` + +```ts +{ + jsonapi: { + version?: string //default: 1.1 + ext?: string //default: https://jsonapi.org/profiles/ethanresnick/cursor-pagination + } + links: { + self?: string //default: /api/v2/ui/vouchers?page[size]=25 + first?: string //default: /api/v2/ui/vouchers?page[size]=25&page[after]=0 + last?: string //default: /api/v2/ui/vouchers?page[size]=25&page[before]=500 + next?: string //default: /api/v2/ui/vouchers?page[size]=25&page[after]=25 + previous?: string //default: /api/v2/ui/vouchers?page[size]=25&page[before]=25 + } + id?: integer + type?: string //default: RegVoucher + data: { + voucher?: string + time?: integer + } + relationships: { + } + included: { + }[] +}[] +``` + +- 400 Invalid request + +`application/json` + +```ts +{ + title?: string + type?: string + status?: integer +} +``` + +- 401 Authentication failed + +`application/json` + +```ts +{ + title?: string + type?: string + status?: integer +} +``` + +*** + +### [POST]/api/v2/ui/vouchers + +- Description +POST request to create a new object. The request must contain the resource record as data with the attributes of the new object.To add relationships, a relationships object can be added with the resource records of the relations that are part of this object. + +- Security +bearerAuth + +#### RequestBody + +- application/json + +```ts +{ + data: { + type?: string + attributes: { + voucher?: string + time?: integer + } + } +} +``` + +#### Responses + +- 201 successful operation + +`application/json` + +```ts +{ + jsonapi: { + version?: string //default: 1.1 + ext?: string //default: https://jsonapi.org/profiles/ethanresnick/cursor-pagination + } + id?: integer + type?: string //default: RegVoucher + data: { + voucher?: string + time?: integer + } +} +``` + +- 400 Invalid request + +`application/json` + +```ts +{ + title?: string + type?: string + status?: integer +} +``` + +- 401 Authentication failed + +`application/json` + +```ts +{ + title?: string + type?: string + status?: integer +} +``` + +*** + +### [GET]/api/v2/ui/vouchers/count + +- Description +GET many request to retrieve multiple objects. + +- Security +bearerAuth + +#### Parameters(Query) + +```ts +page[after]?: integer +``` + +```ts +page[before]?: integer +``` + +```ts +page[size]?: integer +``` + +```ts +filter: { +} +``` + +```ts +include?: string +``` + +#### Responses + +- 200 successful operation + +`application/json` + +```ts +{ + jsonapi: { + version?: string //default: 1.1 + ext?: string //default: https://jsonapi.org/profiles/ethanresnick/cursor-pagination + } + links: { + self?: string //default: /api/v2/ui/vouchers?page[size]=25 + first?: string //default: /api/v2/ui/vouchers?page[size]=25&page[after]=0 + last?: string //default: /api/v2/ui/vouchers?page[size]=25&page[before]=500 + next?: string //default: /api/v2/ui/vouchers?page[size]=25&page[after]=25 + previous?: string //default: /api/v2/ui/vouchers?page[size]=25&page[before]=25 + } + id?: integer + type?: string //default: RegVoucher + data: { + voucher?: string + time?: integer + } + relationships: { + } + included: { + }[] +}[] +``` + +- 400 Invalid request + +`application/json` + +```ts +{ + title?: string + type?: string + status?: integer +} +``` + +- 401 Authentication failed + +`application/json` + +```ts +{ + title?: string + type?: string + status?: integer +} +``` + +*** + +### [GET]/api/v2/ui/vouchers/{id:[0-9]+} + +- Description +GET request to retrieve a single object. + +- Security +bearerAuth + +#### Parameters(Query) + +```ts +include?: string +``` + +#### Responses + +- 200 successful operation + +`application/json` + +```ts +{ + jsonapi: { + version?: string //default: 1.1 + ext?: string //default: https://jsonapi.org/profiles/ethanresnick/cursor-pagination + } + links: { + self?: string //default: /api/v2/ui/vouchers?page[size]=25 + first?: string //default: /api/v2/ui/vouchers?page[size]=25&page[after]=0 + last?: string //default: /api/v2/ui/vouchers?page[size]=25&page[before]=500 + next?: string //default: /api/v2/ui/vouchers?page[size]=25&page[after]=25 + previous?: string //default: /api/v2/ui/vouchers?page[size]=25&page[before]=25 + } + id?: integer + type?: string //default: RegVoucher + data: { + voucher?: string + time?: integer + } + relationships: { + } + included: { + }[] +} +``` + +- 400 Invalid request + +`application/json` + +```ts +{ + title?: string + type?: string + status?: integer +} +``` + +- 401 Authentication failed + +`application/json` + +```ts +{ + title?: string + type?: string + status?: integer +} +``` + +- 404 Not Found + +`application/json` + +```ts +{ + message?: string + exception: { + type?: string + code?: integer + message?: string + file?: string + line?: integer + } +} +``` + +*** + +### [PATCH]/api/v2/ui/vouchers/{id:[0-9]+} + +- Description +PATCH request to update attributes of a single object. + +- Security +bearerAuth + +#### RequestBody + +- application/json + +```ts +{ + data: { + type?: string + attributes: { + voucher?: string + } + } +} +``` + +#### Responses + +- 200 successful operation + +`application/json` + +```ts +{ + jsonapi: { + version?: string //default: 1.1 + ext?: string //default: https://jsonapi.org/profiles/ethanresnick/cursor-pagination + } + id?: integer + type?: string //default: RegVoucher + data: { + voucher?: string + time?: integer + } +} +``` + +- 400 Invalid request + +`application/json` + +```ts +{ + title?: string + type?: string + status?: integer +} +``` + +- 401 Authentication failed + +`application/json` + +```ts +{ + title?: string + type?: string + status?: integer +} +``` + +- 404 Not Found + +`application/json` + +```ts +{ + message?: string + exception: { + type?: string + code?: integer + message?: string + file?: string + line?: integer + } +} +``` + +*** + +### [DELETE]/api/v2/ui/vouchers/{id:[0-9]+} + +- Security +bearerAuth + +#### RequestBody + +- application/json + +#### Responses + +- 204 successfully deleted + +- 400 Invalid request + +`application/json` + +```ts +{ + title?: string + type?: string + status?: integer +} +``` + +- 401 Authentication failed + +`application/json` + +```ts +{ + title?: string + type?: string + status?: integer +} +``` + +- 404 Not Found + +`application/json` + +```ts +{ + message?: string + exception: { + type?: string + code?: integer + message?: string + file?: string + line?: integer + } +} +``` + +*** + +### [POST]/api/v2/auth/token + +- Security +basicAuth + +#### RequestBody + +- application/json + +```ts +string[] +``` + +#### Responses + +- 200 Success + +`application/json` + +```ts +{ + token?: string + expires?: integer +} +``` + +- 401 Authentication failed + +`application/json` + +```ts +{ + title?: string + type?: string + status?: integer +} +``` + +- 404 Not Found + +`application/json` + +```ts +{ + message?: string + exception: { + type?: string + code?: integer + message?: string + file?: string + line?: integer + } +} +``` + +## References + +### #/components/schemas/ListResponse + +```ts +{ + expand?: string + page[after]?: integer + page[before]?: integer + page[size]?: integer +} +``` + +### #/components/schemas/ErrorResponse + +```ts +{ + title?: string + type?: string + status?: integer +} +``` + +### #/components/schemas/NotFoundResponse + +```ts +{ + message?: string + exception: { + type?: string + code?: integer + message?: string + file?: string + line?: integer + } +} +``` + +### #/components/schemas/AccessGroupCreate + +```ts +{ + data: { + type?: string + attributes: { + groupName?: string + } + } +} +``` + +### #/components/schemas/AccessGroupPatch + +```ts +{ + data: { + type?: string + attributes: { + groupName?: string + } + } +} +``` + +### #/components/schemas/AccessGroupResponse + +```ts +{ + jsonapi: { + version?: string //default: 1.1 + ext?: string //default: https://jsonapi.org/profiles/ethanresnick/cursor-pagination + } + links: { + self?: string //default: /api/v2/ui/accessgroups?page[size]=25 + first?: string //default: /api/v2/ui/accessgroups?page[size]=25&page[after]=0 + last?: string //default: /api/v2/ui/accessgroups?page[size]=25&page[before]=500 + next?: string //default: /api/v2/ui/accessgroups?page[size]=25&page[after]=25 + previous?: string //default: /api/v2/ui/accessgroups?page[size]=25&page[before]=25 + } + id?: integer + type?: string //default: AccessGroup + data: { + groupName?: string + } + relationships: { + } + included: { + }[] +} +``` + +### #/components/schemas/AccessGroupSingleResponse + +```ts +{ + id?: integer + type?: string //default: AccessGroup + data: { + groupName?: string + } + relationships: { + } + included: { + }[] +} +``` + +### #/components/schemas/AccessGroupPostPatchResponse + +```ts +{ + jsonapi: { + version?: string //default: 1.1 + ext?: string //default: https://jsonapi.org/profiles/ethanresnick/cursor-pagination + } + id?: integer + type?: string //default: AccessGroup + data: { + groupName?: string + } +} +``` + +### #/components/schemas/AccessGroupListResponse + +```ts +{ + "allOf": [ + { + "$ref": "#/components/schemas/ListResponse" + }, + { + "type": "object", + "properties": { + "values": { + "type": "array", + "items": { + "$ref": "#/components/schemas/AccessGroupResponse" + } + } + } + } + ] +} +``` + +### #/components/schemas/AssignmentCreate + +```ts +{ + data: { + type?: string + attributes: { + taskId?: integer + agentId?: integer + benchmark?: string + } + } +} +``` + +### #/components/schemas/AssignmentPatch + +```ts +{ + data: { + type?: string + attributes: { + agentId?: integer + taskId?: integer + } + } +} +``` + +### #/components/schemas/AssignmentResponse + +```ts +{ + jsonapi: { + version?: string //default: 1.1 + ext?: string //default: https://jsonapi.org/profiles/ethanresnick/cursor-pagination + } + links: { + self?: string //default: /api/v2/ui/agentassignments?page[size]=25 + first?: string //default: /api/v2/ui/agentassignments?page[size]=25&page[after]=0 + last?: string //default: /api/v2/ui/agentassignments?page[size]=25&page[before]=500 + next?: string //default: /api/v2/ui/agentassignments?page[size]=25&page[after]=25 + previous?: string //default: /api/v2/ui/agentassignments?page[size]=25&page[before]=25 + } + id?: integer + type?: string //default: Assignment + data: { + taskId?: integer + agentId?: integer + benchmark?: string + } + relationships: { + } + included: { + }[] +} +``` + +### #/components/schemas/AssignmentSingleResponse + +```ts +{ + id?: integer + type?: string //default: Assignment + data: { + taskId?: integer + agentId?: integer + benchmark?: string + } + relationships: { + } + included: { + }[] +} +``` + +### #/components/schemas/AssignmentPostPatchResponse + +```ts +{ + jsonapi: { + version?: string //default: 1.1 + ext?: string //default: https://jsonapi.org/profiles/ethanresnick/cursor-pagination + } + id?: integer + type?: string //default: Assignment + data: { + taskId?: integer + agentId?: integer + benchmark?: string + } +} +``` + +### #/components/schemas/AssignmentListResponse + +```ts +{ + "allOf": [ + { + "$ref": "#/components/schemas/ListResponse" + }, + { + "type": "object", + "properties": { + "values": { + "type": "array", + "items": { + "$ref": "#/components/schemas/AssignmentResponse" + } + } + } + } + ] +} +``` + +### #/components/schemas/AgentBinaryCreate + +```ts +{ + data: { + type?: string + attributes: { + type?: string + version?: string + operatingSystems?: string + filename?: string + updateTrack?: string + updateAvailable?: string + } + } +} +``` + +### #/components/schemas/AgentBinaryPatch + +```ts +{ + data: { + type?: string + attributes: { + filename?: string + operatingSystems?: string + type?: string + updateTrack?: string + version?: string + } + } +} +``` + +### #/components/schemas/AgentBinaryResponse + +```ts +{ + jsonapi: { + version?: string //default: 1.1 + ext?: string //default: https://jsonapi.org/profiles/ethanresnick/cursor-pagination + } + links: { + self?: string //default: /api/v2/ui/agentbinaries?page[size]=25 + first?: string //default: /api/v2/ui/agentbinaries?page[size]=25&page[after]=0 + last?: string //default: /api/v2/ui/agentbinaries?page[size]=25&page[before]=500 + next?: string //default: /api/v2/ui/agentbinaries?page[size]=25&page[after]=25 + previous?: string //default: /api/v2/ui/agentbinaries?page[size]=25&page[before]=25 + } + id?: integer + type?: string //default: AgentBinary + data: { + type?: string + version?: string + operatingSystems?: string + filename?: string + updateTrack?: string + updateAvailable?: string + } + relationships: { + } + included: { + }[] +} +``` + +### #/components/schemas/AgentBinarySingleResponse + +```ts +{ + id?: integer + type?: string //default: AgentBinary + data: { + type?: string + version?: string + operatingSystems?: string + filename?: string + updateTrack?: string + updateAvailable?: string + } + relationships: { + } + included: { + }[] +} +``` + +### #/components/schemas/AgentBinaryPostPatchResponse + +```ts +{ + jsonapi: { + version?: string //default: 1.1 + ext?: string //default: https://jsonapi.org/profiles/ethanresnick/cursor-pagination + } + id?: integer + type?: string //default: AgentBinary + data: { + type?: string + version?: string + operatingSystems?: string + filename?: string + updateTrack?: string + updateAvailable?: string + } +} +``` + +### #/components/schemas/AgentBinaryListResponse + +```ts +{ + "allOf": [ + { + "$ref": "#/components/schemas/ListResponse" + }, + { + "type": "object", + "properties": { + "values": { + "type": "array", + "items": { + "$ref": "#/components/schemas/AgentBinaryResponse" + } + } + } + } + ] +} +``` + +### #/components/schemas/AgentCreate + +```ts +{ + data: { + type?: string + attributes: { + agentName?: string + uid?: string + os?: integer + devices?: string + cmdPars?: string + ignoreErrors?: enum[0, 1, 2] + isActive?: boolean + isTrusted?: boolean + token?: string + lastAct?: string + lastTime?: integer + lastIp?: string + userId?: integer + cpuOnly?: boolean + clientSignature?: string + } + } +} +``` + +### #/components/schemas/AgentPatch + +```ts +{ + data: { + type?: string + attributes: { + agentName?: string + clientSignature?: string + cmdPars?: string + cpuOnly?: boolean + devices?: string + ignoreErrors?: enum[0, 1, 2] + isActive?: boolean + isTrusted?: boolean + os?: integer + token?: string + uid?: string + userId?: integer + } + } +} +``` + +### #/components/schemas/AgentResponse + +```ts +{ + jsonapi: { + version?: string //default: 1.1 + ext?: string //default: https://jsonapi.org/profiles/ethanresnick/cursor-pagination + } + links: { + self?: string //default: /api/v2/ui/agents?page[size]=25 + first?: string //default: /api/v2/ui/agents?page[size]=25&page[after]=0 + last?: string //default: /api/v2/ui/agents?page[size]=25&page[before]=500 + next?: string //default: /api/v2/ui/agents?page[size]=25&page[after]=25 + previous?: string //default: /api/v2/ui/agents?page[size]=25&page[before]=25 + } + id?: integer + type?: string //default: Agent + data: { + agentName?: string + uid?: string + os?: integer + devices?: string + cmdPars?: string + ignoreErrors?: enum[0, 1, 2] + isActive?: boolean + isTrusted?: boolean + token?: string + lastAct?: string + lastTime?: integer + lastIp?: string + userId?: integer + cpuOnly?: boolean + clientSignature?: string + } + relationships: { + } + included: { + }[] +} +``` + +### #/components/schemas/AgentSingleResponse + +```ts +{ + id?: integer + type?: string //default: Agent + data: { + agentName?: string + uid?: string + os?: integer + devices?: string + cmdPars?: string + ignoreErrors?: enum[0, 1, 2] + isActive?: boolean + isTrusted?: boolean + token?: string + lastAct?: string + lastTime?: integer + lastIp?: string + userId?: integer + cpuOnly?: boolean + clientSignature?: string + } + relationships: { + } + included: { + }[] +} +``` + +### #/components/schemas/AgentPostPatchResponse + +```ts +{ + jsonapi: { + version?: string //default: 1.1 + ext?: string //default: https://jsonapi.org/profiles/ethanresnick/cursor-pagination + } + id?: integer + type?: string //default: Agent + data: { + agentName?: string + uid?: string + os?: integer + devices?: string + cmdPars?: string + ignoreErrors?: enum[0, 1, 2] + isActive?: boolean + isTrusted?: boolean + token?: string + lastAct?: string + lastTime?: integer + lastIp?: string + userId?: integer + cpuOnly?: boolean + clientSignature?: string + } +} +``` + +### #/components/schemas/AgentListResponse + +```ts +{ + "allOf": [ + { + "$ref": "#/components/schemas/ListResponse" + }, + { + "type": "object", + "properties": { + "values": { + "type": "array", + "items": { + "$ref": "#/components/schemas/AgentResponse" + } + } + } + } + ] +} +``` + +### #/components/schemas/AgentStatCreate + +```ts +{ + data: { + type?: string + attributes: { + agentId?: integer + statType?: integer + time?: integer +[] + } + } +} +``` + +### #/components/schemas/AgentStatPatch + +```ts +{ + data: { + type?: string + attributes: { + } + } +} +``` + +### #/components/schemas/AgentStatResponse + +```ts +{ + jsonapi: { + version?: string //default: 1.1 + ext?: string //default: https://jsonapi.org/profiles/ethanresnick/cursor-pagination + } + links: { + self?: string //default: /api/v2/ui/agentstats?page[size]=25 + first?: string //default: /api/v2/ui/agentstats?page[size]=25&page[after]=0 + last?: string //default: /api/v2/ui/agentstats?page[size]=25&page[before]=500 + next?: string //default: /api/v2/ui/agentstats?page[size]=25&page[after]=25 + previous?: string //default: /api/v2/ui/agentstats?page[size]=25&page[before]=25 + } + id?: integer + type?: string //default: AgentStat + data: { + agentId?: integer + statType?: integer + time?: integer +[] + } + relationships: { + } + included: { + }[] +} +``` + +### #/components/schemas/AgentStatSingleResponse + +```ts +{ + id?: integer + type?: string //default: AgentStat + data: { + agentId?: integer + statType?: integer + time?: integer +[] + } + relationships: { + } + included: { + }[] +} +``` + +### #/components/schemas/AgentStatPostPatchResponse + +```ts +{ + jsonapi: { + version?: string //default: 1.1 + ext?: string //default: https://jsonapi.org/profiles/ethanresnick/cursor-pagination + } + id?: integer + type?: string //default: AgentStat + data: { + agentId?: integer + statType?: integer + time?: integer +[] + } +} +``` + +### #/components/schemas/AgentStatListResponse + +```ts +{ + "allOf": [ + { + "$ref": "#/components/schemas/ListResponse" + }, + { + "type": "object", + "properties": { + "values": { + "type": "array", + "items": { + "$ref": "#/components/schemas/AgentStatResponse" + } + } + } + } + ] +} +``` + +### #/components/schemas/ChunkCreate + +```ts +{ + data: { + type?: string + attributes: { + taskId?: integer + skip?: integer + length?: integer + agentId?: integer + dispatchTime?: integer + solveTime?: integer + checkpoint?: integer + progress?: integer + state?: integer + cracked?: integer + speed?: integer + } + } +} +``` + +### #/components/schemas/ChunkPatch + +```ts +{ + data: { + type?: string + attributes: { + } + } +} +``` + +### #/components/schemas/ChunkResponse + +```ts +{ + jsonapi: { + version?: string //default: 1.1 + ext?: string //default: https://jsonapi.org/profiles/ethanresnick/cursor-pagination + } + links: { + self?: string //default: /api/v2/ui/chunks?page[size]=25 + first?: string //default: /api/v2/ui/chunks?page[size]=25&page[after]=0 + last?: string //default: /api/v2/ui/chunks?page[size]=25&page[before]=500 + next?: string //default: /api/v2/ui/chunks?page[size]=25&page[after]=25 + previous?: string //default: /api/v2/ui/chunks?page[size]=25&page[before]=25 + } + id?: integer + type?: string //default: Chunk + data: { + taskId?: integer + skip?: integer + length?: integer + agentId?: integer + dispatchTime?: integer + solveTime?: integer + checkpoint?: integer + progress?: integer + state?: integer + cracked?: integer + speed?: integer + } + relationships: { + } + included: { + }[] +} +``` + +### #/components/schemas/ChunkSingleResponse + +```ts +{ + id?: integer + type?: string //default: Chunk + data: { + taskId?: integer + skip?: integer + length?: integer + agentId?: integer + dispatchTime?: integer + solveTime?: integer + checkpoint?: integer + progress?: integer + state?: integer + cracked?: integer + speed?: integer + } + relationships: { + } + included: { + }[] +} +``` + +### #/components/schemas/ChunkPostPatchResponse + +```ts +{ + jsonapi: { + version?: string //default: 1.1 + ext?: string //default: https://jsonapi.org/profiles/ethanresnick/cursor-pagination + } + id?: integer + type?: string //default: Chunk + data: { + taskId?: integer + skip?: integer + length?: integer + agentId?: integer + dispatchTime?: integer + solveTime?: integer + checkpoint?: integer + progress?: integer + state?: integer + cracked?: integer + speed?: integer + } +} +``` + +### #/components/schemas/ChunkListResponse + +```ts +{ + "allOf": [ + { + "$ref": "#/components/schemas/ListResponse" + }, + { + "type": "object", + "properties": { + "values": { + "type": "array", + "items": { + "$ref": "#/components/schemas/ChunkResponse" + } + } + } + } + ] +} +``` + +### #/components/schemas/ConfigCreate + +```ts +{ + data: { + type?: string + attributes: { + configSectionId?: integer + item?: string + value?: string + } + } +} +``` + +### #/components/schemas/ConfigPatch + +```ts +{ + data: { + type?: string + attributes: { + configSectionId?: integer + item?: string + value?: string + } + } +} +``` + +### #/components/schemas/ConfigResponse + +```ts +{ + jsonapi: { + version?: string //default: 1.1 + ext?: string //default: https://jsonapi.org/profiles/ethanresnick/cursor-pagination + } + links: { + self?: string //default: /api/v2/ui/configs?page[size]=25 + first?: string //default: /api/v2/ui/configs?page[size]=25&page[after]=0 + last?: string //default: /api/v2/ui/configs?page[size]=25&page[before]=500 + next?: string //default: /api/v2/ui/configs?page[size]=25&page[after]=25 + previous?: string //default: /api/v2/ui/configs?page[size]=25&page[before]=25 + } + id?: integer + type?: string //default: Config + data: { + configSectionId?: integer + item?: string + value?: string + } + relationships: { + } + included: { + }[] +} +``` + +### #/components/schemas/ConfigSingleResponse + +```ts +{ + id?: integer + type?: string //default: Config + data: { + configSectionId?: integer + item?: string + value?: string + } + relationships: { + } + included: { + }[] +} +``` + +### #/components/schemas/ConfigPostPatchResponse + +```ts +{ + jsonapi: { + version?: string //default: 1.1 + ext?: string //default: https://jsonapi.org/profiles/ethanresnick/cursor-pagination + } + id?: integer + type?: string //default: Config + data: { + configSectionId?: integer + item?: string + value?: string + } +} +``` + +### #/components/schemas/ConfigListResponse + +```ts +{ + "allOf": [ + { + "$ref": "#/components/schemas/ListResponse" + }, + { + "type": "object", + "properties": { + "values": { + "type": "array", + "items": { + "$ref": "#/components/schemas/ConfigResponse" + } + } + } + } + ] +} +``` + +### #/components/schemas/ConfigSectionCreate + +```ts +{ + data: { + type?: string + attributes: { + sectionName?: string + } + } +} +``` + +### #/components/schemas/ConfigSectionPatch + +```ts +{ + data: { + type?: string + attributes: { + sectionName?: string + } + } +} +``` + +### #/components/schemas/ConfigSectionResponse + +```ts +{ + jsonapi: { + version?: string //default: 1.1 + ext?: string //default: https://jsonapi.org/profiles/ethanresnick/cursor-pagination + } + links: { + self?: string //default: /api/v2/ui/configsections?page[size]=25 + first?: string //default: /api/v2/ui/configsections?page[size]=25&page[after]=0 + last?: string //default: /api/v2/ui/configsections?page[size]=25&page[before]=500 + next?: string //default: /api/v2/ui/configsections?page[size]=25&page[after]=25 + previous?: string //default: /api/v2/ui/configsections?page[size]=25&page[before]=25 + } + id?: integer + type?: string //default: ConfigSection + data: { + sectionName?: string + } + relationships: { + } + included: { + }[] +} +``` + +### #/components/schemas/ConfigSectionSingleResponse + +```ts +{ + id?: integer + type?: string //default: ConfigSection + data: { + sectionName?: string + } + relationships: { + } + included: { + }[] +} +``` + +### #/components/schemas/ConfigSectionPostPatchResponse + +```ts +{ + jsonapi: { + version?: string //default: 1.1 + ext?: string //default: https://jsonapi.org/profiles/ethanresnick/cursor-pagination + } + id?: integer + type?: string //default: ConfigSection + data: { + sectionName?: string + } +} +``` + +### #/components/schemas/ConfigSectionListResponse + +```ts +{ + "allOf": [ + { + "$ref": "#/components/schemas/ListResponse" + }, + { + "type": "object", + "properties": { + "values": { + "type": "array", + "items": { + "$ref": "#/components/schemas/ConfigSectionResponse" + } + } + } + } + ] +} +``` + +### #/components/schemas/CrackerBinaryCreate + +```ts +{ + data: { + type?: string + attributes: { + crackerBinaryTypeId?: integer + version?: string + downloadUrl?: string + binaryName?: string + } + } +} +``` + +### #/components/schemas/CrackerBinaryPatch + +```ts +{ + data: { + type?: string + attributes: { + binaryName?: string + crackerBinaryTypeId?: integer + downloadUrl?: string + version?: string + } + } +} +``` + +### #/components/schemas/CrackerBinaryResponse + +```ts +{ + jsonapi: { + version?: string //default: 1.1 + ext?: string //default: https://jsonapi.org/profiles/ethanresnick/cursor-pagination + } + links: { + self?: string //default: /api/v2/ui/crackers?page[size]=25 + first?: string //default: /api/v2/ui/crackers?page[size]=25&page[after]=0 + last?: string //default: /api/v2/ui/crackers?page[size]=25&page[before]=500 + next?: string //default: /api/v2/ui/crackers?page[size]=25&page[after]=25 + previous?: string //default: /api/v2/ui/crackers?page[size]=25&page[before]=25 + } + id?: integer + type?: string //default: CrackerBinary + data: { + crackerBinaryTypeId?: integer + version?: string + downloadUrl?: string + binaryName?: string + } + relationships: { + } + included: { + }[] +} +``` + +### #/components/schemas/CrackerBinarySingleResponse + +```ts +{ + id?: integer + type?: string //default: CrackerBinary + data: { + crackerBinaryTypeId?: integer + version?: string + downloadUrl?: string + binaryName?: string + } + relationships: { + } + included: { + }[] +} +``` + +### #/components/schemas/CrackerBinaryPostPatchResponse + +```ts +{ + jsonapi: { + version?: string //default: 1.1 + ext?: string //default: https://jsonapi.org/profiles/ethanresnick/cursor-pagination + } + id?: integer + type?: string //default: CrackerBinary + data: { + crackerBinaryTypeId?: integer + version?: string + downloadUrl?: string + binaryName?: string + } +} +``` + +### #/components/schemas/CrackerBinaryListResponse + +```ts +{ + "allOf": [ + { + "$ref": "#/components/schemas/ListResponse" + }, + { + "type": "object", + "properties": { + "values": { + "type": "array", + "items": { + "$ref": "#/components/schemas/CrackerBinaryResponse" + } + } + } + } + ] +} +``` + +### #/components/schemas/CrackerBinaryTypeCreate + +```ts +{ + data: { + type?: string + attributes: { + typeName?: string + isChunkingAvailable?: boolean + } + } +} +``` + +### #/components/schemas/CrackerBinaryTypePatch + +```ts +{ + data: { + type?: string + attributes: { + isChunkingAvailable?: boolean + typeName?: string + } + } +} +``` + +### #/components/schemas/CrackerBinaryTypeResponse + +```ts +{ + jsonapi: { + version?: string //default: 1.1 + ext?: string //default: https://jsonapi.org/profiles/ethanresnick/cursor-pagination + } + links: { + self?: string //default: /api/v2/ui/crackertypes?page[size]=25 + first?: string //default: /api/v2/ui/crackertypes?page[size]=25&page[after]=0 + last?: string //default: /api/v2/ui/crackertypes?page[size]=25&page[before]=500 + next?: string //default: /api/v2/ui/crackertypes?page[size]=25&page[after]=25 + previous?: string //default: /api/v2/ui/crackertypes?page[size]=25&page[before]=25 + } + id?: integer + type?: string //default: CrackerBinaryType + data: { + typeName?: string + isChunkingAvailable?: boolean + } + relationships: { + } + included: { + }[] +} +``` + +### #/components/schemas/CrackerBinaryTypeSingleResponse + +```ts +{ + id?: integer + type?: string //default: CrackerBinaryType + data: { + typeName?: string + isChunkingAvailable?: boolean + } + relationships: { + } + included: { + }[] +} +``` + +### #/components/schemas/CrackerBinaryTypePostPatchResponse + +```ts +{ + jsonapi: { + version?: string //default: 1.1 + ext?: string //default: https://jsonapi.org/profiles/ethanresnick/cursor-pagination + } + id?: integer + type?: string //default: CrackerBinaryType + data: { + typeName?: string + isChunkingAvailable?: boolean + } +} +``` + +### #/components/schemas/CrackerBinaryTypeListResponse + +```ts +{ + "allOf": [ + { + "$ref": "#/components/schemas/ListResponse" + }, + { + "type": "object", + "properties": { + "values": { + "type": "array", + "items": { + "$ref": "#/components/schemas/CrackerBinaryTypeResponse" + } + } + } + } + ] +} +``` + +### #/components/schemas/FileCreate + +```ts +{ + data: { + type?: string + attributes: { + sourceType?: string + sourceData?: string + filename?: string + size?: integer + isSecret?: boolean + fileType?: integer + accessGroupId?: integer + lineCount?: integer + } + } +} +``` + +### #/components/schemas/FilePatch + +```ts +{ + data: { + type?: string + attributes: { + accessGroupId?: integer + fileType?: integer + filename?: string + isSecret?: boolean + } + } +} +``` + +### #/components/schemas/FileResponse + +```ts +{ + jsonapi: { + version?: string //default: 1.1 + ext?: string //default: https://jsonapi.org/profiles/ethanresnick/cursor-pagination + } + links: { + self?: string //default: /api/v2/ui/files?page[size]=25 + first?: string //default: /api/v2/ui/files?page[size]=25&page[after]=0 + last?: string //default: /api/v2/ui/files?page[size]=25&page[before]=500 + next?: string //default: /api/v2/ui/files?page[size]=25&page[after]=25 + previous?: string //default: /api/v2/ui/files?page[size]=25&page[before]=25 + } + id?: integer + type?: string //default: File + data: { + filename?: string + size?: integer + isSecret?: boolean + fileType?: integer + accessGroupId?: integer + lineCount?: integer + } + relationships: { + } + included: { + }[] +} +``` + +### #/components/schemas/FileSingleResponse + +```ts +{ + id?: integer + type?: string //default: File + data: { + filename?: string + size?: integer + isSecret?: boolean + fileType?: integer + accessGroupId?: integer + lineCount?: integer + } + relationships: { + } + included: { + }[] +} +``` + +### #/components/schemas/FilePostPatchResponse + +```ts +{ + jsonapi: { + version?: string //default: 1.1 + ext?: string //default: https://jsonapi.org/profiles/ethanresnick/cursor-pagination + } + id?: integer + type?: string //default: File + data: { + filename?: string + size?: integer + isSecret?: boolean + fileType?: integer + accessGroupId?: integer + lineCount?: integer + } +} +``` + +### #/components/schemas/FileListResponse + +```ts +{ + "allOf": [ + { + "$ref": "#/components/schemas/ListResponse" + }, + { + "type": "object", + "properties": { + "values": { + "type": "array", + "items": { + "$ref": "#/components/schemas/FileResponse" + } + } + } + } + ] +} +``` + +### #/components/schemas/RightGroupCreate + +```ts +{ + data: { + type?: string + attributes: { + name?: string + permissions: { + } + } + } +} +``` + +### #/components/schemas/RightGroupPatch + +```ts +{ + data: { + type?: string + attributes: { + name?: string + permissions: { + } + } + } +} +``` + +### #/components/schemas/RightGroupResponse + +```ts +{ + jsonapi: { + version?: string //default: 1.1 + ext?: string //default: https://jsonapi.org/profiles/ethanresnick/cursor-pagination + } + links: { + self?: string //default: /api/v2/ui/globalpermissiongroups?page[size]=25 + first?: string //default: /api/v2/ui/globalpermissiongroups?page[size]=25&page[after]=0 + last?: string //default: /api/v2/ui/globalpermissiongroups?page[size]=25&page[before]=500 + next?: string //default: /api/v2/ui/globalpermissiongroups?page[size]=25&page[after]=25 + previous?: string //default: /api/v2/ui/globalpermissiongroups?page[size]=25&page[before]=25 + } + id?: integer + type?: string //default: RightGroup + data: { + name?: string + permissions: { + } + } + relationships: { + } + included: { + }[] +} +``` + +### #/components/schemas/RightGroupSingleResponse + +```ts +{ + id?: integer + type?: string //default: RightGroup + data: { + name?: string + permissions: { + } + } + relationships: { + } + included: { + }[] +} +``` + +### #/components/schemas/RightGroupPostPatchResponse + +```ts +{ + jsonapi: { + version?: string //default: 1.1 + ext?: string //default: https://jsonapi.org/profiles/ethanresnick/cursor-pagination + } + id?: integer + type?: string //default: RightGroup + data: { + name?: string + permissions: { + } + } +} +``` + +### #/components/schemas/RightGroupListResponse + +```ts +{ + "allOf": [ + { + "$ref": "#/components/schemas/ListResponse" + }, + { + "type": "object", + "properties": { + "values": { + "type": "array", + "items": { + "$ref": "#/components/schemas/RightGroupResponse" + } + } + } + } + ] +} +``` + +### #/components/schemas/HashCreate + +```ts +{ + data: { + type?: string + attributes: { + hashlistId?: integer + hash?: string + salt?: string + plaintext?: string + timeCracked?: integer + chunkId?: integer + isCracked?: boolean + crackPos?: integer + } + } +} +``` + +### #/components/schemas/HashPatch + +```ts +{ + data: { + type?: string + attributes: { + chunkId?: integer + crackPos?: integer + hash?: string + hashlistId?: integer + isCracked?: boolean + plaintext?: string + salt?: string + timeCracked?: integer + } + } +} +``` + +### #/components/schemas/HashResponse + +```ts +{ + jsonapi: { + version?: string //default: 1.1 + ext?: string //default: https://jsonapi.org/profiles/ethanresnick/cursor-pagination + } + links: { + self?: string //default: /api/v2/ui/hashes?page[size]=25 + first?: string //default: /api/v2/ui/hashes?page[size]=25&page[after]=0 + last?: string //default: /api/v2/ui/hashes?page[size]=25&page[before]=500 + next?: string //default: /api/v2/ui/hashes?page[size]=25&page[after]=25 + previous?: string //default: /api/v2/ui/hashes?page[size]=25&page[before]=25 + } + id?: integer + type?: string //default: Hash + data: { + hashlistId?: integer + hash?: string + salt?: string + plaintext?: string + timeCracked?: integer + chunkId?: integer + isCracked?: boolean + crackPos?: integer + } + relationships: { + } + included: { + }[] +} +``` + +### #/components/schemas/HashSingleResponse + +```ts +{ + id?: integer + type?: string //default: Hash + data: { + hashlistId?: integer + hash?: string + salt?: string + plaintext?: string + timeCracked?: integer + chunkId?: integer + isCracked?: boolean + crackPos?: integer + } + relationships: { + } + included: { + }[] +} +``` + +### #/components/schemas/HashPostPatchResponse + +```ts +{ + jsonapi: { + version?: string //default: 1.1 + ext?: string //default: https://jsonapi.org/profiles/ethanresnick/cursor-pagination + } + id?: integer + type?: string //default: Hash + data: { + hashlistId?: integer + hash?: string + salt?: string + plaintext?: string + timeCracked?: integer + chunkId?: integer + isCracked?: boolean + crackPos?: integer + } +} +``` + +### #/components/schemas/HashListResponse + +```ts +{ + "allOf": [ + { + "$ref": "#/components/schemas/ListResponse" + }, + { + "type": "object", + "properties": { + "values": { + "type": "array", + "items": { + "$ref": "#/components/schemas/HashResponse" + } + } + } + } + ] +} +``` + +### #/components/schemas/HashlistCreate + +```ts +{ + data: { + type?: string + attributes: { + hashlistSeperator?: string + sourceType?: string + sourceData?: string + name?: string + format?: enum[0, 1, 2, 3] + hashTypeId?: integer + hashCount?: integer + separator?: string + cracked?: integer + isSecret?: boolean + isHexSalt?: boolean + isSalted?: boolean + accessGroupId?: integer + notes?: string + useBrain?: boolean + brainFeatures?: integer + isArchived?: boolean + } + } +} +``` + +### #/components/schemas/HashlistPatch + +```ts +{ + data: { + type?: string + attributes: { + accessGroupId?: integer + isArchived?: boolean + isSecret?: boolean + name?: string + notes?: string + } + } +} +``` + +### #/components/schemas/HashlistResponse + +```ts +{ + jsonapi: { + version?: string //default: 1.1 + ext?: string //default: https://jsonapi.org/profiles/ethanresnick/cursor-pagination + } + links: { + self?: string //default: /api/v2/ui/hashlists?page[size]=25 + first?: string //default: /api/v2/ui/hashlists?page[size]=25&page[after]=0 + last?: string //default: /api/v2/ui/hashlists?page[size]=25&page[before]=500 + next?: string //default: /api/v2/ui/hashlists?page[size]=25&page[after]=25 + previous?: string //default: /api/v2/ui/hashlists?page[size]=25&page[before]=25 + } + id?: integer + type?: string //default: Hashlist + data: { + name?: string + format?: enum[0, 1, 2, 3] + hashTypeId?: integer + hashCount?: integer + separator?: string + cracked?: integer + isSecret?: boolean + isHexSalt?: boolean + isSalted?: boolean + accessGroupId?: integer + notes?: string + useBrain?: boolean + brainFeatures?: integer + isArchived?: boolean + } + relationships: { + } + included: { + }[] +} +``` + +### #/components/schemas/HashlistSingleResponse + +```ts +{ + id?: integer + type?: string //default: Hashlist + data: { + name?: string + format?: enum[0, 1, 2, 3] + hashTypeId?: integer + hashCount?: integer + separator?: string + cracked?: integer + isSecret?: boolean + isHexSalt?: boolean + isSalted?: boolean + accessGroupId?: integer + notes?: string + useBrain?: boolean + brainFeatures?: integer + isArchived?: boolean + } + relationships: { + } + included: { + }[] +} +``` + +### #/components/schemas/HashlistPostPatchResponse + +```ts +{ + jsonapi: { + version?: string //default: 1.1 + ext?: string //default: https://jsonapi.org/profiles/ethanresnick/cursor-pagination + } + id?: integer + type?: string //default: Hashlist + data: { + name?: string + format?: enum[0, 1, 2, 3] + hashTypeId?: integer + hashCount?: integer + separator?: string + cracked?: integer + isSecret?: boolean + isHexSalt?: boolean + isSalted?: boolean + accessGroupId?: integer + notes?: string + useBrain?: boolean + brainFeatures?: integer + isArchived?: boolean + } +} +``` + +### #/components/schemas/HashlistListResponse + +```ts +{ + "allOf": [ + { + "$ref": "#/components/schemas/ListResponse" + }, + { + "type": "object", + "properties": { + "values": { + "type": "array", + "items": { + "$ref": "#/components/schemas/HashlistResponse" + } + } + } + } + ] +} +``` + +### #/components/schemas/HashTypeCreate + +```ts +{ + data: { + type?: string + attributes: { + description?: string + isSalted?: boolean + isSlowHash?: boolean + } + } +} +``` + +### #/components/schemas/HashTypePatch + +```ts +{ + data: { + type?: string + attributes: { + description?: string + isSalted?: boolean + isSlowHash?: boolean + } + } +} +``` + +### #/components/schemas/HashTypeResponse + +```ts +{ + jsonapi: { + version?: string //default: 1.1 + ext?: string //default: https://jsonapi.org/profiles/ethanresnick/cursor-pagination + } + links: { + self?: string //default: /api/v2/ui/hashtypes?page[size]=25 + first?: string //default: /api/v2/ui/hashtypes?page[size]=25&page[after]=0 + last?: string //default: /api/v2/ui/hashtypes?page[size]=25&page[before]=500 + next?: string //default: /api/v2/ui/hashtypes?page[size]=25&page[after]=25 + previous?: string //default: /api/v2/ui/hashtypes?page[size]=25&page[before]=25 + } + id?: integer + type?: string //default: HashType + data: { + description?: string + isSalted?: boolean + isSlowHash?: boolean + } + relationships: { + } + included: { + }[] +} +``` + +### #/components/schemas/HashTypeSingleResponse + +```ts +{ + id?: integer + type?: string //default: HashType + data: { + description?: string + isSalted?: boolean + isSlowHash?: boolean + } + relationships: { + } + included: { + }[] +} +``` + +### #/components/schemas/HashTypePostPatchResponse + +```ts +{ + jsonapi: { + version?: string //default: 1.1 + ext?: string //default: https://jsonapi.org/profiles/ethanresnick/cursor-pagination + } + id?: integer + type?: string //default: HashType + data: { + description?: string + isSalted?: boolean + isSlowHash?: boolean + } +} +``` + +### #/components/schemas/HashTypeListResponse + +```ts +{ + "allOf": [ + { + "$ref": "#/components/schemas/ListResponse" + }, + { + "type": "object", + "properties": { + "values": { + "type": "array", + "items": { + "$ref": "#/components/schemas/HashTypeResponse" + } + } + } + } + ] +} +``` + +### #/components/schemas/HealthCheckAgentCreate + +```ts +{ + data: { + type?: string + attributes: { + healthCheckId?: integer + agentId?: integer + status?: integer + cracked?: integer + numGpus?: integer + start?: integer + end?: integer + errors?: string + } + } +} +``` + +### #/components/schemas/HealthCheckAgentPatch + +```ts +{ + data: { + type?: string + attributes: { + } + } +} +``` + +### #/components/schemas/HealthCheckAgentResponse + +```ts +{ + jsonapi: { + version?: string //default: 1.1 + ext?: string //default: https://jsonapi.org/profiles/ethanresnick/cursor-pagination + } + links: { + self?: string //default: /api/v2/ui/healthcheckagents?page[size]=25 + first?: string //default: /api/v2/ui/healthcheckagents?page[size]=25&page[after]=0 + last?: string //default: /api/v2/ui/healthcheckagents?page[size]=25&page[before]=500 + next?: string //default: /api/v2/ui/healthcheckagents?page[size]=25&page[after]=25 + previous?: string //default: /api/v2/ui/healthcheckagents?page[size]=25&page[before]=25 + } + id?: integer + type?: string //default: HealthCheckAgent + data: { + healthCheckId?: integer + agentId?: integer + status?: integer + cracked?: integer + numGpus?: integer + start?: integer + end?: integer + errors?: string + } + relationships: { + } + included: { + }[] +} +``` + +### #/components/schemas/HealthCheckAgentSingleResponse + +```ts +{ + id?: integer + type?: string //default: HealthCheckAgent + data: { + healthCheckId?: integer + agentId?: integer + status?: integer + cracked?: integer + numGpus?: integer + start?: integer + end?: integer + errors?: string + } + relationships: { + } + included: { + }[] +} +``` + +### #/components/schemas/HealthCheckAgentPostPatchResponse + +```ts +{ + jsonapi: { + version?: string //default: 1.1 + ext?: string //default: https://jsonapi.org/profiles/ethanresnick/cursor-pagination + } + id?: integer + type?: string //default: HealthCheckAgent + data: { + healthCheckId?: integer + agentId?: integer + status?: integer + cracked?: integer + numGpus?: integer + start?: integer + end?: integer + errors?: string + } +} +``` + +### #/components/schemas/HealthCheckAgentListResponse + +```ts +{ + "allOf": [ + { + "$ref": "#/components/schemas/ListResponse" + }, + { + "type": "object", + "properties": { + "values": { + "type": "array", + "items": { + "$ref": "#/components/schemas/HealthCheckAgentResponse" + } + } + } + } + ] +} +``` + +### #/components/schemas/HealthCheckCreate + +```ts +{ + data: { + type?: string + attributes: { + time?: integer + status?: integer + checkType?: integer + hashtypeId?: integer + crackerBinaryId?: integer + expectedCracks?: integer + attackCmd?: string + } + } +} +``` + +### #/components/schemas/HealthCheckPatch + +```ts +{ + data: { + type?: string + attributes: { + checkType?: integer + crackerBinaryId?: integer + hashtypeId?: integer + } + } +} +``` + +### #/components/schemas/HealthCheckResponse + +```ts +{ + jsonapi: { + version?: string //default: 1.1 + ext?: string //default: https://jsonapi.org/profiles/ethanresnick/cursor-pagination + } + links: { + self?: string //default: /api/v2/ui/healthchecks?page[size]=25 + first?: string //default: /api/v2/ui/healthchecks?page[size]=25&page[after]=0 + last?: string //default: /api/v2/ui/healthchecks?page[size]=25&page[before]=500 + next?: string //default: /api/v2/ui/healthchecks?page[size]=25&page[after]=25 + previous?: string //default: /api/v2/ui/healthchecks?page[size]=25&page[before]=25 + } + id?: integer + type?: string //default: HealthCheck + data: { + time?: integer + status?: integer + checkType?: integer + hashtypeId?: integer + crackerBinaryId?: integer + expectedCracks?: integer + attackCmd?: string + } + relationships: { + } + included: { + }[] +} +``` + +### #/components/schemas/HealthCheckSingleResponse + +```ts +{ + id?: integer + type?: string //default: HealthCheck + data: { + time?: integer + status?: integer + checkType?: integer + hashtypeId?: integer + crackerBinaryId?: integer + expectedCracks?: integer + attackCmd?: string + } + relationships: { + } + included: { + }[] +} +``` + +### #/components/schemas/HealthCheckPostPatchResponse + +```ts +{ + jsonapi: { + version?: string //default: 1.1 + ext?: string //default: https://jsonapi.org/profiles/ethanresnick/cursor-pagination + } + id?: integer + type?: string //default: HealthCheck + data: { + time?: integer + status?: integer + checkType?: integer + hashtypeId?: integer + crackerBinaryId?: integer + expectedCracks?: integer + attackCmd?: string + } +} +``` + +### #/components/schemas/HealthCheckListResponse + +```ts +{ + "allOf": [ + { + "$ref": "#/components/schemas/ListResponse" + }, + { + "type": "object", + "properties": { + "values": { + "type": "array", + "items": { + "$ref": "#/components/schemas/HealthCheckResponse" + } + } + } + } + ] +} +``` + +### #/components/schemas/LogEntryCreate + +```ts +{ + data: { + type?: string + attributes: { + issuer?: string + issuerId?: string + level?: string + message?: string + time?: integer + } + } +} +``` + +### #/components/schemas/LogEntryPatch + +```ts +{ + data: { + type?: string + attributes: { + } + } +} +``` + +### #/components/schemas/LogEntryResponse + +```ts +{ + jsonapi: { + version?: string //default: 1.1 + ext?: string //default: https://jsonapi.org/profiles/ethanresnick/cursor-pagination + } + links: { + self?: string //default: /api/v2/ui/logentries?page[size]=25 + first?: string //default: /api/v2/ui/logentries?page[size]=25&page[after]=0 + last?: string //default: /api/v2/ui/logentries?page[size]=25&page[before]=500 + next?: string //default: /api/v2/ui/logentries?page[size]=25&page[after]=25 + previous?: string //default: /api/v2/ui/logentries?page[size]=25&page[before]=25 + } + id?: integer + type?: string //default: LogEntry + data: { + issuer?: string + issuerId?: string + level?: string + message?: string + time?: integer + } + relationships: { + } + included: { + }[] +} +``` + +### #/components/schemas/LogEntrySingleResponse + +```ts +{ + id?: integer + type?: string //default: LogEntry + data: { + issuer?: string + issuerId?: string + level?: string + message?: string + time?: integer + } + relationships: { + } + included: { + }[] +} +``` + +### #/components/schemas/LogEntryPostPatchResponse + +```ts +{ + jsonapi: { + version?: string //default: 1.1 + ext?: string //default: https://jsonapi.org/profiles/ethanresnick/cursor-pagination + } + id?: integer + type?: string //default: LogEntry + data: { + issuer?: string + issuerId?: string + level?: string + message?: string + time?: integer + } +} +``` + +### #/components/schemas/LogEntryListResponse + +```ts +{ + "allOf": [ + { + "$ref": "#/components/schemas/ListResponse" + }, + { + "type": "object", + "properties": { + "values": { + "type": "array", + "items": { + "$ref": "#/components/schemas/LogEntryResponse" + } + } + } + } + ] +} +``` + +### #/components/schemas/NotificationSettingCreate + +```ts +{ + data: { + type?: string + attributes: { + actionFilter?: string + action?: string + objectId?: integer + notification?: string + userId?: integer + receiver?: string + isActive?: boolean + } + } +} +``` + +### #/components/schemas/NotificationSettingPatch + +```ts +{ + data: { + type?: string + attributes: { + action?: string + isActive?: boolean + notification?: string + receiver?: string + } + } +} +``` + +### #/components/schemas/NotificationSettingResponse + +```ts +{ + jsonapi: { + version?: string //default: 1.1 + ext?: string //default: https://jsonapi.org/profiles/ethanresnick/cursor-pagination + } + links: { + self?: string //default: /api/v2/ui/notifications?page[size]=25 + first?: string //default: /api/v2/ui/notifications?page[size]=25&page[after]=0 + last?: string //default: /api/v2/ui/notifications?page[size]=25&page[before]=500 + next?: string //default: /api/v2/ui/notifications?page[size]=25&page[after]=25 + previous?: string //default: /api/v2/ui/notifications?page[size]=25&page[before]=25 + } + id?: integer + type?: string //default: NotificationSetting + data: { + action?: string + objectId?: integer + notification?: string + userId?: integer + receiver?: string + isActive?: boolean + } + relationships: { + } + included: { + }[] +} +``` + +### #/components/schemas/NotificationSettingSingleResponse + +```ts +{ + id?: integer + type?: string //default: NotificationSetting + data: { + action?: string + objectId?: integer + notification?: string + userId?: integer + receiver?: string + isActive?: boolean + } + relationships: { + } + included: { + }[] +} +``` + +### #/components/schemas/NotificationSettingPostPatchResponse + +```ts +{ + jsonapi: { + version?: string //default: 1.1 + ext?: string //default: https://jsonapi.org/profiles/ethanresnick/cursor-pagination + } + id?: integer + type?: string //default: NotificationSetting + data: { + action?: string + objectId?: integer + notification?: string + userId?: integer + receiver?: string + isActive?: boolean + } +} +``` + +### #/components/schemas/NotificationSettingListResponse + +```ts +{ + "allOf": [ + { + "$ref": "#/components/schemas/ListResponse" + }, + { + "type": "object", + "properties": { + "values": { + "type": "array", + "items": { + "$ref": "#/components/schemas/NotificationSettingResponse" + } + } + } + } + ] +} +``` + +### #/components/schemas/PreprocessorCreate + +```ts +{ + data: { + type?: string + attributes: { + name?: string + url?: string + binaryName?: string + keyspaceCommand?: string + skipCommand?: string + limitCommand?: string + } + } +} +``` + +### #/components/schemas/PreprocessorPatch + +```ts +{ + data: { + type?: string + attributes: { + binaryName?: string + keyspaceCommand?: string + limitCommand?: string + name?: string + skipCommand?: string + url?: string + } + } +} +``` + +### #/components/schemas/PreprocessorResponse + +```ts +{ + jsonapi: { + version?: string //default: 1.1 + ext?: string //default: https://jsonapi.org/profiles/ethanresnick/cursor-pagination + } + links: { + self?: string //default: /api/v2/ui/preprocessors?page[size]=25 + first?: string //default: /api/v2/ui/preprocessors?page[size]=25&page[after]=0 + last?: string //default: /api/v2/ui/preprocessors?page[size]=25&page[before]=500 + next?: string //default: /api/v2/ui/preprocessors?page[size]=25&page[after]=25 + previous?: string //default: /api/v2/ui/preprocessors?page[size]=25&page[before]=25 + } + id?: integer + type?: string //default: Preprocessor + data: { + name?: string + url?: string + binaryName?: string + keyspaceCommand?: string + skipCommand?: string + limitCommand?: string + } + relationships: { + } + included: { + }[] +} +``` + +### #/components/schemas/PreprocessorSingleResponse + +```ts +{ + id?: integer + type?: string //default: Preprocessor + data: { + name?: string + url?: string + binaryName?: string + keyspaceCommand?: string + skipCommand?: string + limitCommand?: string + } + relationships: { + } + included: { + }[] +} +``` + +### #/components/schemas/PreprocessorPostPatchResponse + +```ts +{ + jsonapi: { + version?: string //default: 1.1 + ext?: string //default: https://jsonapi.org/profiles/ethanresnick/cursor-pagination + } + id?: integer + type?: string //default: Preprocessor + data: { + name?: string + url?: string + binaryName?: string + keyspaceCommand?: string + skipCommand?: string + limitCommand?: string + } +} +``` + +### #/components/schemas/PreprocessorListResponse + +```ts +{ + "allOf": [ + { + "$ref": "#/components/schemas/ListResponse" + }, + { + "type": "object", + "properties": { + "values": { + "type": "array", + "items": { + "$ref": "#/components/schemas/PreprocessorResponse" + } + } + } + } + ] +} +``` + +### #/components/schemas/PretaskCreate + +```ts +{ + data: { + type?: string + attributes: { +[] + taskName?: string + attackCmd?: string + chunkTime?: integer + statusTimer?: integer + color?: string + isSmall?: boolean + isCpuTask?: boolean + useNewBench?: boolean + priority?: integer + maxAgents?: integer + isMaskImport?: boolean + crackerBinaryTypeId?: integer + } + } +} +``` + +### #/components/schemas/PretaskPatch + +```ts +{ + data: { + type?: string + attributes: { + attackCmd?: string + chunkTime?: integer + color?: string + crackerBinaryTypeId?: integer + isCpuTask?: boolean + isMaskImport?: boolean + isSmall?: boolean + maxAgents?: integer + priority?: integer + statusTimer?: integer + taskName?: string + } + } +} +``` + +### #/components/schemas/PretaskResponse + +```ts +{ + jsonapi: { + version?: string //default: 1.1 + ext?: string //default: https://jsonapi.org/profiles/ethanresnick/cursor-pagination + } + links: { + self?: string //default: /api/v2/ui/pretasks?page[size]=25 + first?: string //default: /api/v2/ui/pretasks?page[size]=25&page[after]=0 + last?: string //default: /api/v2/ui/pretasks?page[size]=25&page[before]=500 + next?: string //default: /api/v2/ui/pretasks?page[size]=25&page[after]=25 + previous?: string //default: /api/v2/ui/pretasks?page[size]=25&page[before]=25 + } + id?: integer + type?: string //default: Pretask + data: { + taskName?: string + attackCmd?: string + chunkTime?: integer + statusTimer?: integer + color?: string + isSmall?: boolean + isCpuTask?: boolean + useNewBench?: boolean + priority?: integer + maxAgents?: integer + isMaskImport?: boolean + crackerBinaryTypeId?: integer + } + relationships: { + } + included: { + }[] +} +``` + +### #/components/schemas/PretaskSingleResponse + +```ts +{ + id?: integer + type?: string //default: Pretask + data: { + taskName?: string + attackCmd?: string + chunkTime?: integer + statusTimer?: integer + color?: string + isSmall?: boolean + isCpuTask?: boolean + useNewBench?: boolean + priority?: integer + maxAgents?: integer + isMaskImport?: boolean + crackerBinaryTypeId?: integer + } + relationships: { + } + included: { + }[] +} +``` + +### #/components/schemas/PretaskPostPatchResponse + +```ts +{ + jsonapi: { + version?: string //default: 1.1 + ext?: string //default: https://jsonapi.org/profiles/ethanresnick/cursor-pagination + } + id?: integer + type?: string //default: Pretask + data: { + taskName?: string + attackCmd?: string + chunkTime?: integer + statusTimer?: integer + color?: string + isSmall?: boolean + isCpuTask?: boolean + useNewBench?: boolean + priority?: integer + maxAgents?: integer + isMaskImport?: boolean + crackerBinaryTypeId?: integer + } +} +``` + +### #/components/schemas/PretaskListResponse + +```ts +{ + "allOf": [ + { + "$ref": "#/components/schemas/ListResponse" + }, + { + "type": "object", + "properties": { + "values": { + "type": "array", + "items": { + "$ref": "#/components/schemas/PretaskResponse" + } + } + } + } + ] +} +``` + +### #/components/schemas/SpeedCreate + +```ts +{ + data: { + type?: string + attributes: { + agentId?: integer + taskId?: integer + speed?: integer + time?: integer + } + } +} +``` + +### #/components/schemas/SpeedPatch + +```ts +{ + data: { + type?: string + attributes: { + } + } +} +``` + +### #/components/schemas/SpeedResponse + +```ts +{ + jsonapi: { + version?: string //default: 1.1 + ext?: string //default: https://jsonapi.org/profiles/ethanresnick/cursor-pagination + } + links: { + self?: string //default: /api/v2/ui/speeds?page[size]=25 + first?: string //default: /api/v2/ui/speeds?page[size]=25&page[after]=0 + last?: string //default: /api/v2/ui/speeds?page[size]=25&page[before]=500 + next?: string //default: /api/v2/ui/speeds?page[size]=25&page[after]=25 + previous?: string //default: /api/v2/ui/speeds?page[size]=25&page[before]=25 + } + id?: integer + type?: string //default: Speed + data: { + agentId?: integer + taskId?: integer + speed?: integer + time?: integer + } + relationships: { + } + included: { + }[] +} +``` + +### #/components/schemas/SpeedSingleResponse + +```ts +{ + id?: integer + type?: string //default: Speed + data: { + agentId?: integer + taskId?: integer + speed?: integer + time?: integer + } + relationships: { + } + included: { + }[] +} +``` + +### #/components/schemas/SpeedPostPatchResponse + +```ts +{ + jsonapi: { + version?: string //default: 1.1 + ext?: string //default: https://jsonapi.org/profiles/ethanresnick/cursor-pagination + } + id?: integer + type?: string //default: Speed + data: { + agentId?: integer + taskId?: integer + speed?: integer + time?: integer + } +} +``` + +### #/components/schemas/SpeedListResponse + +```ts +{ + "allOf": [ + { + "$ref": "#/components/schemas/ListResponse" + }, + { + "type": "object", + "properties": { + "values": { + "type": "array", + "items": { + "$ref": "#/components/schemas/SpeedResponse" + } + } + } + } + ] +} +``` + +### #/components/schemas/SupertaskCreate + +```ts +{ + data: { + type?: string + attributes: { +[] + supertaskName?: string + } + } +} +``` + +### #/components/schemas/SupertaskPatch + +```ts +{ + data: { + type?: string + attributes: { + supertaskName?: string + } + } +} +``` + +### #/components/schemas/SupertaskResponse + +```ts +{ + jsonapi: { + version?: string //default: 1.1 + ext?: string //default: https://jsonapi.org/profiles/ethanresnick/cursor-pagination + } + links: { + self?: string //default: /api/v2/ui/supertasks?page[size]=25 + first?: string //default: /api/v2/ui/supertasks?page[size]=25&page[after]=0 + last?: string //default: /api/v2/ui/supertasks?page[size]=25&page[before]=500 + next?: string //default: /api/v2/ui/supertasks?page[size]=25&page[after]=25 + previous?: string //default: /api/v2/ui/supertasks?page[size]=25&page[before]=25 + } + id?: integer + type?: string //default: Supertask + data: { + supertaskName?: string + } + relationships: { + } + included: { + }[] +} +``` + +### #/components/schemas/SupertaskSingleResponse + +```ts +{ + id?: integer + type?: string //default: Supertask + data: { + supertaskName?: string + } + relationships: { + } + included: { + }[] +} +``` + +### #/components/schemas/SupertaskPostPatchResponse + +```ts +{ + jsonapi: { + version?: string //default: 1.1 + ext?: string //default: https://jsonapi.org/profiles/ethanresnick/cursor-pagination + } + id?: integer + type?: string //default: Supertask + data: { + supertaskName?: string + } +} +``` + +### #/components/schemas/SupertaskListResponse + +```ts +{ + "allOf": [ + { + "$ref": "#/components/schemas/ListResponse" + }, + { + "type": "object", + "properties": { + "values": { + "type": "array", + "items": { + "$ref": "#/components/schemas/SupertaskResponse" + } + } + } + } + ] +} +``` + +### #/components/schemas/TaskCreate + +```ts +{ + data: { + type?: string + attributes: { + hashlistId?: integer +[] + taskName?: string + attackCmd?: string + chunkTime?: integer + statusTimer?: integer + keyspace?: integer + keyspaceProgress?: integer + priority?: integer + maxAgents?: integer + color?: string + isSmall?: boolean + isCpuTask?: boolean + useNewBench?: boolean + skipKeyspace?: integer + crackerBinaryId?: integer + crackerBinaryTypeId?: integer + taskWrapperId?: integer + isArchived?: boolean + notes?: string + staticChunks?: integer + chunkSize?: integer + forcePipe?: boolean + preprocessorId?: integer + preprocessorCommand?: string + } + } +} +``` + +### #/components/schemas/TaskPatch + +```ts +{ + data: { + type?: string + attributes: { + attackCmd?: string + chunkTime?: integer + color?: string + isArchived?: boolean + isCpuTask?: boolean + isSmall?: boolean + maxAgents?: integer + notes?: string + priority?: integer + statusTimer?: integer + taskName?: string + } + } +} +``` + +### #/components/schemas/TaskResponse + +```ts +{ + jsonapi: { + version?: string //default: 1.1 + ext?: string //default: https://jsonapi.org/profiles/ethanresnick/cursor-pagination + } + links: { + self?: string //default: /api/v2/ui/tasks?page[size]=25 + first?: string //default: /api/v2/ui/tasks?page[size]=25&page[after]=0 + last?: string //default: /api/v2/ui/tasks?page[size]=25&page[before]=500 + next?: string //default: /api/v2/ui/tasks?page[size]=25&page[after]=25 + previous?: string //default: /api/v2/ui/tasks?page[size]=25&page[before]=25 + } + id?: integer + type?: string //default: Task + data: { + taskName?: string + attackCmd?: string + chunkTime?: integer + statusTimer?: integer + keyspace?: integer + keyspaceProgress?: integer + priority?: integer + maxAgents?: integer + color?: string + isSmall?: boolean + isCpuTask?: boolean + useNewBench?: boolean + skipKeyspace?: integer + crackerBinaryId?: integer + crackerBinaryTypeId?: integer + taskWrapperId?: integer + isArchived?: boolean + notes?: string + staticChunks?: integer + chunkSize?: integer + forcePipe?: boolean + preprocessorId?: integer + preprocessorCommand?: string + } + relationships: { + } + included: { + }[] +} +``` + +### #/components/schemas/TaskSingleResponse + +```ts +{ + id?: integer + type?: string //default: Task + data: { + taskName?: string + attackCmd?: string + chunkTime?: integer + statusTimer?: integer + keyspace?: integer + keyspaceProgress?: integer + priority?: integer + maxAgents?: integer + color?: string + isSmall?: boolean + isCpuTask?: boolean + useNewBench?: boolean + skipKeyspace?: integer + crackerBinaryId?: integer + crackerBinaryTypeId?: integer + taskWrapperId?: integer + isArchived?: boolean + notes?: string + staticChunks?: integer + chunkSize?: integer + forcePipe?: boolean + preprocessorId?: integer + preprocessorCommand?: string + } + relationships: { + } + included: { + }[] +} +``` + +### #/components/schemas/TaskPostPatchResponse + +```ts +{ + jsonapi: { + version?: string //default: 1.1 + ext?: string //default: https://jsonapi.org/profiles/ethanresnick/cursor-pagination + } + id?: integer + type?: string //default: Task + data: { + taskName?: string + attackCmd?: string + chunkTime?: integer + statusTimer?: integer + keyspace?: integer + keyspaceProgress?: integer + priority?: integer + maxAgents?: integer + color?: string + isSmall?: boolean + isCpuTask?: boolean + useNewBench?: boolean + skipKeyspace?: integer + crackerBinaryId?: integer + crackerBinaryTypeId?: integer + taskWrapperId?: integer + isArchived?: boolean + notes?: string + staticChunks?: integer + chunkSize?: integer + forcePipe?: boolean + preprocessorId?: integer + preprocessorCommand?: string + } +} +``` + +### #/components/schemas/TaskListResponse + +```ts +{ + "allOf": [ + { + "$ref": "#/components/schemas/ListResponse" + }, + { + "type": "object", + "properties": { + "values": { + "type": "array", + "items": { + "$ref": "#/components/schemas/TaskResponse" + } + } + } + } + ] +} +``` + +### #/components/schemas/TaskWrapperCreate + +```ts +{ + data: { + type?: string + attributes: { + priority?: integer + maxAgents?: integer + taskType?: enum[0, 1] + hashlistId?: integer + accessGroupId?: integer + taskWrapperName?: string + isArchived?: boolean + cracked?: integer + } + } +} +``` + +### #/components/schemas/TaskWrapperPatch + +```ts +{ + data: { + type?: string + attributes: { + accessGroupId?: integer + isArchived?: boolean + maxAgents?: integer + priority?: integer + taskWrapperName?: string + } + } +} +``` + +### #/components/schemas/TaskWrapperResponse + +```ts +{ + jsonapi: { + version?: string //default: 1.1 + ext?: string //default: https://jsonapi.org/profiles/ethanresnick/cursor-pagination + } + links: { + self?: string //default: /api/v2/ui/taskwrappers?page[size]=25 + first?: string //default: /api/v2/ui/taskwrappers?page[size]=25&page[after]=0 + last?: string //default: /api/v2/ui/taskwrappers?page[size]=25&page[before]=500 + next?: string //default: /api/v2/ui/taskwrappers?page[size]=25&page[after]=25 + previous?: string //default: /api/v2/ui/taskwrappers?page[size]=25&page[before]=25 + } + id?: integer + type?: string //default: TaskWrapper + data: { + priority?: integer + maxAgents?: integer + taskType?: enum[0, 1] + hashlistId?: integer + accessGroupId?: integer + taskWrapperName?: string + isArchived?: boolean + cracked?: integer + } + relationships: { + } + included: { + }[] +} +``` + +### #/components/schemas/TaskWrapperSingleResponse + +```ts +{ + id?: integer + type?: string //default: TaskWrapper + data: { + priority?: integer + maxAgents?: integer + taskType?: enum[0, 1] + hashlistId?: integer + accessGroupId?: integer + taskWrapperName?: string + isArchived?: boolean + cracked?: integer + } + relationships: { + } + included: { + }[] +} +``` + +### #/components/schemas/TaskWrapperPostPatchResponse + +```ts +{ + jsonapi: { + version?: string //default: 1.1 + ext?: string //default: https://jsonapi.org/profiles/ethanresnick/cursor-pagination + } + id?: integer + type?: string //default: TaskWrapper + data: { + priority?: integer + maxAgents?: integer + taskType?: enum[0, 1] + hashlistId?: integer + accessGroupId?: integer + taskWrapperName?: string + isArchived?: boolean + cracked?: integer + } +} +``` + +### #/components/schemas/TaskWrapperListResponse + +```ts +{ + "allOf": [ + { + "$ref": "#/components/schemas/ListResponse" + }, + { + "type": "object", + "properties": { + "values": { + "type": "array", + "items": { + "$ref": "#/components/schemas/TaskWrapperResponse" + } + } + } + } + ] +} +``` + +### #/components/schemas/UserCreate + +```ts +{ + data: { + type?: string + attributes: { + name?: string + email?: string + passwordHash?: string + passwordSalt?: string + isValid?: boolean + isComputedPassword?: boolean + lastLoginDate?: integer + registeredSince?: integer + sessionLifetime?: integer + globalPermissionGroupId?: integer + yubikey?: string + otp1?: string + otp2?: string + otp3?: string + otp4?: string + } + } +} +``` + +### #/components/schemas/UserPatch + +```ts +{ + data: { + type?: string + attributes: { + email?: string + globalPermissionGroupId?: integer + isValid?: boolean + name?: string + } + } +} +``` + +### #/components/schemas/UserResponse + +```ts +{ + jsonapi: { + version?: string //default: 1.1 + ext?: string //default: https://jsonapi.org/profiles/ethanresnick/cursor-pagination + } + links: { + self?: string //default: /api/v2/ui/users?page[size]=25 + first?: string //default: /api/v2/ui/users?page[size]=25&page[after]=0 + last?: string //default: /api/v2/ui/users?page[size]=25&page[before]=500 + next?: string //default: /api/v2/ui/users?page[size]=25&page[after]=25 + previous?: string //default: /api/v2/ui/users?page[size]=25&page[before]=25 + } + id?: integer + type?: string //default: User + data: { + name?: string + email?: string + passwordHash?: string + passwordSalt?: string + isValid?: boolean + isComputedPassword?: boolean + lastLoginDate?: integer + registeredSince?: integer + sessionLifetime?: integer + globalPermissionGroupId?: integer + yubikey?: string + otp1?: string + otp2?: string + otp3?: string + otp4?: string + } + relationships: { + } + included: { + }[] +} +``` + +### #/components/schemas/UserSingleResponse + +```ts +{ + id?: integer + type?: string //default: User + data: { + name?: string + email?: string + passwordHash?: string + passwordSalt?: string + isValid?: boolean + isComputedPassword?: boolean + lastLoginDate?: integer + registeredSince?: integer + sessionLifetime?: integer + globalPermissionGroupId?: integer + yubikey?: string + otp1?: string + otp2?: string + otp3?: string + otp4?: string + } + relationships: { + } + included: { + }[] +} +``` + +### #/components/schemas/UserPostPatchResponse + +```ts +{ + jsonapi: { + version?: string //default: 1.1 + ext?: string //default: https://jsonapi.org/profiles/ethanresnick/cursor-pagination + } + id?: integer + type?: string //default: User + data: { + name?: string + email?: string + passwordHash?: string + passwordSalt?: string + isValid?: boolean + isComputedPassword?: boolean + lastLoginDate?: integer + registeredSince?: integer + sessionLifetime?: integer + globalPermissionGroupId?: integer + yubikey?: string + otp1?: string + otp2?: string + otp3?: string + otp4?: string + } +} +``` + +### #/components/schemas/UserListResponse + +```ts +{ + "allOf": [ + { + "$ref": "#/components/schemas/ListResponse" + }, + { + "type": "object", + "properties": { + "values": { + "type": "array", + "items": { + "$ref": "#/components/schemas/UserResponse" + } + } + } + } + ] +} +``` + +### #/components/schemas/RegVoucherCreate + +```ts +{ + data: { + type?: string + attributes: { + voucher?: string + time?: integer + } + } +} +``` + +### #/components/schemas/RegVoucherPatch + +```ts +{ + data: { + type?: string + attributes: { + voucher?: string + } + } +} +``` + +### #/components/schemas/RegVoucherResponse + +```ts +{ + jsonapi: { + version?: string //default: 1.1 + ext?: string //default: https://jsonapi.org/profiles/ethanresnick/cursor-pagination + } + links: { + self?: string //default: /api/v2/ui/vouchers?page[size]=25 + first?: string //default: /api/v2/ui/vouchers?page[size]=25&page[after]=0 + last?: string //default: /api/v2/ui/vouchers?page[size]=25&page[before]=500 + next?: string //default: /api/v2/ui/vouchers?page[size]=25&page[after]=25 + previous?: string //default: /api/v2/ui/vouchers?page[size]=25&page[before]=25 + } + id?: integer + type?: string //default: RegVoucher + data: { + voucher?: string + time?: integer + } + relationships: { + } + included: { + }[] +} +``` + +### #/components/schemas/RegVoucherSingleResponse + +```ts +{ + id?: integer + type?: string //default: RegVoucher + data: { + voucher?: string + time?: integer + } + relationships: { + } + included: { + }[] +} +``` + +### #/components/schemas/RegVoucherPostPatchResponse + +```ts +{ + jsonapi: { + version?: string //default: 1.1 + ext?: string //default: https://jsonapi.org/profiles/ethanresnick/cursor-pagination + } + id?: integer + type?: string //default: RegVoucher + data: { + voucher?: string + time?: integer + } +} +``` + +### #/components/schemas/RegVoucherListResponse + +```ts +{ + "allOf": [ + { + "$ref": "#/components/schemas/ListResponse" + }, + { + "type": "object", + "properties": { + "values": { + "type": "array", + "items": { + "$ref": "#/components/schemas/RegVoucherResponse" + } + } + } + } + ] +} +``` + +### #/components/schemas/Token + +```ts +{ + token?: string + expires?: integer +} +``` + +### #/components/schemas/TokenRequest + +```ts +string[] +``` + +### #/components/schemas/ObjectRequest + +```ts +{ + expand?: string + expires?: integer +} +``` + +### #/components/schemas/ObjectListRequest + +```ts +{ + expand?: string + filter?: string[] +} +``` + +### #/components/securitySchemes/bearerAuth + +```ts +{ + "type": "http", + "description": "JWT Authorization header using the Bearer scheme.", + "scheme": "bearer", + "bearerFormat": "JWT", + "scopes": [ + "permAccessGroupCreate", + "permAccessGroupDelete", + "permAccessGroupRead", + "permAccessGroupUpdate", + "permAgentAssignmentCreate", + "permAgentAssignmentDelete", + "permAgentAssignmentRead", + "permAgentAssignmentUpdate", + "permAgentBinaryCreate", + "permAgentBinaryDelete", + "permAgentBinaryRead", + "permAgentBinaryUpdate", + "permAgentCreate", + "permAgentDelete", + "permAgentRead", + "permAgentStatDelete", + "permAgentStatRead", + "permAgentUpdate", + "permChunkRead", + "permChunkUpdate", + "permConfigRead", + "permConfigSectionRead", + "permConfigUpdate", + "permCrackerBinaryCreate", + "permCrackerBinaryDelete", + "permCrackerBinaryRead", + "permCrackerBinaryTypeCreate", + "permCrackerBinaryTypeDelete", + "permCrackerBinaryTypeRead", + "permCrackerBinaryTypeUpdate", + "permCrackerBinaryUpdate", + "permFileCreate", + "permFileDelete", + "permFileRead", + "permFileUpdate", + "permHashRead", + "permHashTypeCreate", + "permHashTypeDelete", + "permHashTypeRead", + "permHashTypeUpdate", + "permHashUpdate", + "permHashlistCreate", + "permHashlistDelete", + "permHashlistRead", + "permHashlistUpdate", + "permHealthCheckAgentRead", + "permHealthCheckAgentUpdate", + "permHealthCheckCreate", + "permHealthCheckDelete", + "permHealthCheckRead", + "permHealthCheckUpdate", + "permLogEntryCreate", + "permLogEntryDelete", + "permLogEntryRead", + "permLogEntryUpdate", + "permNotificationSettingCreate", + "permNotificationSettingDelete", + "permNotificationSettingRead", + "permNotificationSettingUpdate", + "permPreprocessorCreate", + "permPreprocessorDelete", + "permPreprocessorRead", + "permPreprocessorUpdate", + "permPretaskCreate", + "permPretaskDelete", + "permPretaskRead", + "permPretaskUpdate", + "permRegVoucherCreate", + "permRegVoucherDelete", + "permRegVoucherRead", + "permRegVoucherUpdate", + "permRightGroupCreate", + "permRightGroupDelete", + "permRightGroupRead", + "permRightGroupUpdate", + "permSpeedRead", + "permSpeedUpdate", + "permSupertaskCreate", + "permSupertaskDelete", + "permSupertaskRead", + "permSupertaskUpdate", + "permTaskCreate", + "permTaskDelete", + "permTaskRead", + "permTaskUpdate", + "permTaskWrapperCreate", + "permTaskWrapperDelete", + "permTaskWrapperRead", + "permTaskWrapperUpdate", + "permUserCreate", + "permUserDelete", + "permUserRead", + "permUserUpdate" + ] +} +``` + +### #/components/securitySchemes/basicAuth + +```ts +{ + "type": "http", + "description": "Basic Authorization header.", + "scheme": "basic" +} +``` \ No newline at end of file From f6a74a22a955c5f6eee6769cf5d5f096074ac85f Mon Sep 17 00:00:00 2001 From: coiseiw Date: Wed, 15 Jan 2025 15:19:41 +0100 Subject: [PATCH 028/691] reorganisation of the files --- doc/User_Manual/advanced_hashlist.md | 14 ++++++++++++ doc/User_Manual/settings_and_configuration.md | 6 +++++ doc/{ => User_Manual}/user_manual.md | 22 ------------------- mkdocs.yml | 5 ++++- 4 files changed, 24 insertions(+), 23 deletions(-) create mode 100644 doc/User_Manual/advanced_hashlist.md create mode 100644 doc/User_Manual/settings_and_configuration.md rename doc/{ => User_Manual}/user_manual.md (96%) diff --git a/doc/User_Manual/advanced_hashlist.md b/doc/User_Manual/advanced_hashlist.md new file mode 100644 index 000000000..9d8c7077f --- /dev/null +++ b/doc/User_Manual/advanced_hashlist.md @@ -0,0 +1,14 @@ +## Advanced Hashlist + +- Super Hashlist + +- New Hashmode + +## Advanced tasks + +- Advanced option in task creation +- Preconfigured tasks (including from existing task) +- Super Task +- Import Super task + +## New Binary \ No newline at end of file diff --git a/doc/User_Manual/settings_and_configuration.md b/doc/User_Manual/settings_and_configuration.md new file mode 100644 index 000000000..67d922214 --- /dev/null +++ b/doc/User_Manual/settings_and_configuration.md @@ -0,0 +1,6 @@ + +# Settings and Configuration + +# Access Management + +Under construction \ No newline at end of file diff --git a/doc/user_manual.md b/doc/User_Manual/user_manual.md similarity index 96% rename from doc/user_manual.md rename to doc/User_Manual/user_manual.md index 93037fda0..793bc40a1 100644 --- a/doc/user_manual.md +++ b/doc/User_Manual/user_manual.md @@ -123,28 +123,6 @@ Line count: Reprocess the file and update the line count with the number of line ## Monitoring -# Advanced options/Features - -## Advanced Hashlist - -- Super Hashlist - -- New Hashmode - -## Advanced tasks - -- Advanced option in task creation -- Preconfigured tasks (including from existing task) -- Super Task -- Import Super task - -## New Binary - -# Settings and Configuration - -# Access Management - -Under construction # Future Work - Project structure diff --git a/mkdocs.yml b/mkdocs.yml index e61220c99..13d1c9205 100644 --- a/mkdocs.yml +++ b/mkdocs.yml @@ -5,7 +5,10 @@ docs_dir: doc nav: - index.md - install.md - - user_manual.md + - User_Manual: + - User_Manual/user_manual.md + - User_Manual/advanced_hashlist.md + - User_Manual/settings_and_configuration.md - advanced.md - changelog.md theme: From 1b0bc92657ba5dfebe7676504a69bb8379d2622a Mon Sep 17 00:00:00 2001 From: Romke van Dijk Date: Wed, 15 Jan 2025 18:11:05 +0100 Subject: [PATCH 029/691] Small moving / renaming of files. Adding TLS configuration setup. --- doc/advanced.md | 33 ------ doc/advanced_usage/docker.md | 2 + doc/advanced_usage/generic_cracker.md | 0 doc/advanced_usage/slow_hashes.md | 7 ++ doc/advanced_usage/tls.md | 107 ++++++++++++++++++ .../advanced_hashlist.md | 0 .../settings_and_configuration.md | 0 .../user_manual.md | 0 mkdocs.yml | 20 +++- 9 files changed, 131 insertions(+), 38 deletions(-) delete mode 100644 doc/advanced.md create mode 100644 doc/advanced_usage/docker.md create mode 100644 doc/advanced_usage/generic_cracker.md create mode 100644 doc/advanced_usage/slow_hashes.md create mode 100644 doc/advanced_usage/tls.md rename doc/{User_Manual => user_manual}/advanced_hashlist.md (100%) rename doc/{User_Manual => user_manual}/settings_and_configuration.md (100%) rename doc/{User_Manual => user_manual}/user_manual.md (100%) diff --git a/doc/advanced.md b/doc/advanced.md deleted file mode 100644 index 136325196..000000000 --- a/doc/advanced.md +++ /dev/null @@ -1,33 +0,0 @@ -# Advanced usage - -## Generic Crackers - -Custom crackers which should be able to get distributed with Hashtopolis need to fulfill some minimal requirements as command line options. Shown here with the help function of a generic example implementation (which is available [here](https://github.com/hashtopolis/generic-cracker)): - -``` -cracker.exe [options] action -Generic Cracker compatible with Hashtopolis - -Options: - -m, --mask Use mask for attack - -w, --wordlist Use wordlist for attack - -a, --attacked-hashlist Hashlist to attack - -s, --skip Keyspace to skip at the beginning - -l, --length Length of the keyspace to run - --timeout Stop cracking process after fixed amount of time - -Arguments: - action Action to execute ('keyspace' or 'crack') -``` - -`-m` and `-w` are used to specify the type of attack, but these options are not mandatory to look like this. - -Please note that not all Hashtopolis clients are compatible with generic cracker binaries (check their README) and if there are slight differences in the cracker compared to the generic requirements there might be changes required on the client to adapt to another handling schema. - -## Slow Algorithms - -To extract all Hashcat modes which are flagged as slow hashes, following command can be run inside the hashcat directory: - -``` -grep -Hr SLOW_HASH src/modules/ | cut -d: -f1 | sort | cut -d'.' -f1 | sed 's/src\/modules\/module_[0]\?//g' -``` diff --git a/doc/advanced_usage/docker.md b/doc/advanced_usage/docker.md new file mode 100644 index 000000000..d3185ca92 --- /dev/null +++ b/doc/advanced_usage/docker.md @@ -0,0 +1,2 @@ +# Docker +Maybe a page here with some docker internals? \ No newline at end of file diff --git a/doc/advanced_usage/generic_cracker.md b/doc/advanced_usage/generic_cracker.md new file mode 100644 index 000000000..e69de29bb diff --git a/doc/advanced_usage/slow_hashes.md b/doc/advanced_usage/slow_hashes.md new file mode 100644 index 000000000..159b6c1ea --- /dev/null +++ b/doc/advanced_usage/slow_hashes.md @@ -0,0 +1,7 @@ +# Slow Algorithms + +To extract all Hashcat modes which are flagged as slow hashes, following command can be run inside the hashcat directory: + +``` +grep -Hr SLOW_HASH src/modules/ | cut -d: -f1 | sort | cut -d'.' -f1 | sed 's/src\/modules\/module_[0]\?//g' +``` diff --git a/doc/advanced_usage/tls.md b/doc/advanced_usage/tls.md new file mode 100644 index 000000000..162fc0822 --- /dev/null +++ b/doc/advanced_usage/tls.md @@ -0,0 +1,107 @@ +# SSL/TLS Setup +On this page the setup proces will be described howto setup SSL for Hashtopolis. Before you continue it is highly recommanded to read [Docker](docker.md). + +## Generate x509 Certificate +First create a folder were we are going to store all of our hashtopolis persistent files. + +```bash + +mkdir hashtopolis/ +cd hashtopolis/ + +``` + +Next generate a self signed certificate + +```bash + +openssl req -x509 -newkey rsa:2048 -keyout nginx.key -out nginx.crt -days 365 -nodes + +``` + +## Setting up docker-compose and env.example + +Please see the [Install](../install.md) page on how to download those settings file. + +1. Edit docker-compose.yaml + +Add the following new container to the `service:` section in the docker-compose.yaml. + +```json + nginx: + container_name: nginx + image: nginx:latest + restart: always + volumes: + - ./nginx.conf:/etc/nginx/nginx.conf:ro + - ./nginx.crt:/etc/nginx/ssl/nginx.crt:ro + - ./nginx.key:/etc/nginx/ssl/nginx.key:ro + ports: + - 443:443 + - 80:80 +``` + +2. Create a nginx.conf + +Make sure that the server_name reflects your real server name. If you have changed the container names inside your docker-compose file, make sure to reflect those changes inside the nginx.conf file below. + +``` +events { + worker_connections 1024; +} + +http { + server { + listen 80; + server_name localhost; + return 301 https://$host$request_uri; + } + + + server { + listen 443 ssl; + server_name localhost; + + ssl_certificate /etc/nginx/ssl/nginx.crt; + ssl_certificate_key /etc/nginx/ssl/nginx.key; + + ssl_protocols TLSv1.2 TLSv1.3; + ssl_prefer_server_ciphers on; + ssl_ciphers HIGH:!aNULL:!MD5; + + location / { + proxy_pass http://hashtopolis-frontend; + proxy_set_header Host $host; + proxy_set_header X-Real-IP $remote_addr; + proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for; + proxy_set_header X-Forwarded-Proto $scheme; + } + + location /api/v2 { + proxy_pass http://hashtopolis-backend:80/api/v2; + proxy_set_header Host $host; + proxy_set_header X-Real-IP $remote_addr; + proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for; + proxy_set_header X-Forwarded-Proto $scheme; + } + + location /old { + proxy_pass http://hashtopolis-backend/; + proxy_set_header Host $host; + proxy_set_header X-Real-IP $remote_addr; + proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for; + proxy_set_header X-Forwarded-Proto $scheme; + } + } +} +``` + +3. Edit the `HASHTOPOLIS_BACKEND_URL` in `.env` to `https://localhost/api/v2` to reflect the changes done above. + +4. Start the containers +``` + +docker compose up + +``` +5. Visit hashtopolis on http://localhost/ the old ui is available via http://localhost/old \ No newline at end of file diff --git a/doc/User_Manual/advanced_hashlist.md b/doc/user_manual/advanced_hashlist.md similarity index 100% rename from doc/User_Manual/advanced_hashlist.md rename to doc/user_manual/advanced_hashlist.md diff --git a/doc/User_Manual/settings_and_configuration.md b/doc/user_manual/settings_and_configuration.md similarity index 100% rename from doc/User_Manual/settings_and_configuration.md rename to doc/user_manual/settings_and_configuration.md diff --git a/doc/User_Manual/user_manual.md b/doc/user_manual/user_manual.md similarity index 100% rename from doc/User_Manual/user_manual.md rename to doc/user_manual/user_manual.md diff --git a/mkdocs.yml b/mkdocs.yml index 13d1c9205..fe9393b7b 100644 --- a/mkdocs.yml +++ b/mkdocs.yml @@ -5,15 +5,25 @@ docs_dir: doc nav: - index.md - install.md - - User_Manual: - - User_Manual/user_manual.md - - User_Manual/advanced_hashlist.md - - User_Manual/settings_and_configuration.md - - advanced.md + - User Manual: + - user_manual/user_manual.md + - user_manual/advanced_hashlist.md + - user_manual/settings_and_configuration.md + - Advanced Usage: + - advanced_usage/tls.md + - advanced_usage/docker.md + - advanced_usage/generic_cracker.md + - advanced_usage/slow_hashes.md - changelog.md + - API Reference: + - APIv2: apiv2.md + theme: name: material logo: assets/images/logo.png + features: + - content.code.copy + - content.action.edit edit_uri: blob/docs/doc/ # Edit the URL to the static branch and folder markdown_extensions: - github-callouts # Add the ability of notes, warnings, etc. From 663847e2cdd3b8d4f067a26f1d0e9a14b8614424 Mon Sep 17 00:00:00 2001 From: jessevz Date: Thu, 16 Jan 2025 10:26:24 +0100 Subject: [PATCH 030/691] Created a reusable workflow for starting Hashtopolis server --- .github/workflows/ci.yml | 7 ++----- .github/workflows/docs.yml | 7 ++----- .github/workflows/start_server.yml | 15 +++++++++++++++ 3 files changed, 19 insertions(+), 10 deletions(-) create mode 100644 .github/workflows/start_server.yml diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 5b238c291..6bd9776a8 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -16,11 +16,8 @@ jobs: steps: - name: Checkout repository uses: actions/checkout@v3 - - name: Start application containers - working-directory: .devcontainer - run: docker compose up -d - - name: Wait until entrypoint is finished and Hashtopolis is started - run: bash .github/scripts/await-hashtopolis-startup.sh + - name: Start Hashtopolis + uses: ./.github/workflows/start_server.yml - name: Give Apache permissions on necessary directories # for the tests, only src/files and src/inc/utils/locks seem necessary run: docker exec -u root hashtopolis-server-dev bash -c "chown -R www-data:www-data /var/www/html/src && chmod -R g+w /var/www/html/src" - name: Run test suite diff --git a/.github/workflows/docs.yml b/.github/workflows/docs.yml index bf3421659..1e43b38b1 100644 --- a/.github/workflows/docs.yml +++ b/.github/workflows/docs.yml @@ -25,11 +25,8 @@ jobs: sudo apt-get install nodejs sudo apt-get install npm sudo npm i openapi-to-md -g - - name: Start application containers #same steps as in ci.yml, might make it more modular in the future - working-directory: .devcontainer - run: docker compose up -d - - name: Wait until entrypoint is finished and Hashtopolis is started - run: bash .github/scripts/await-hashtopolis-startup.sh + - name: Start Hashtopolis + uses: ./.github/workflows/start_server.yml - name: Download newest apiv2 spec run: | wget http://localhost:8080/api/v2/openapi.json -P /tmp/ diff --git a/.github/workflows/start_server.yml b/.github/workflows/start_server.yml new file mode 100644 index 000000000..7da82e21f --- /dev/null +++ b/.github/workflows/start_server.yml @@ -0,0 +1,15 @@ +name: Start Hashtopolis server + +on: + workflow_call: + +jobs: + start-hashtopolis: + runs-on: ubbuntu-latest + + steps: + - name: Start application containers + working-directory: .devcontainer + run: docker compose up -d + - name: Wait until entrypoint is finished and Hashtopolis is started + run: bash .github/scripts/await-hashtopolis-startup.sh \ No newline at end of file From 6bc0b22d1ca1d9ea3ed31efb8db979a172ea5d20 Mon Sep 17 00:00:00 2001 From: jessevz Date: Thu, 16 Jan 2025 10:56:17 +0100 Subject: [PATCH 031/691] Added checkout to reusable workflow --- .github/workflows/start_server.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.github/workflows/start_server.yml b/.github/workflows/start_server.yml index 7da82e21f..e278a3169 100644 --- a/.github/workflows/start_server.yml +++ b/.github/workflows/start_server.yml @@ -8,6 +8,8 @@ jobs: runs-on: ubbuntu-latest steps: + - name: Checkout repository + uses: actions/checkout@v3 - name: Start application containers working-directory: .devcontainer run: docker compose up -d From d8b65e7baf00a393d7b593396929708803cc003b Mon Sep 17 00:00:00 2001 From: jessevz Date: Thu, 16 Jan 2025 11:03:28 +0100 Subject: [PATCH 032/691] Fixed syntax for calling reusable workflwos --- .github/workflows/ci.yml | 5 +++-- .github/workflows/docs.yml | 7 ++++--- 2 files changed, 7 insertions(+), 5 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 6bd9776a8..5d71fb3d5 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -11,13 +11,14 @@ on: - dev jobs: + start-hashtopolis: + uses: ./.github/workflows/start_server.yml build: + needs: start-hashtopolis runs-on: ubuntu-latest steps: - name: Checkout repository uses: actions/checkout@v3 - - name: Start Hashtopolis - uses: ./.github/workflows/start_server.yml - name: Give Apache permissions on necessary directories # for the tests, only src/files and src/inc/utils/locks seem necessary run: docker exec -u root hashtopolis-server-dev bash -c "chown -R www-data:www-data /var/www/html/src && chmod -R g+w /var/www/html/src" - name: Run test suite diff --git a/.github/workflows/docs.yml b/.github/workflows/docs.yml index 1e43b38b1..a16fb52b8 100644 --- a/.github/workflows/docs.yml +++ b/.github/workflows/docs.yml @@ -5,7 +5,10 @@ on: branches: - docs jobs: + start-hashtopolis: + uses: ./.github/workflows/start_server.yml build: + needs: start-hashtopolis runs-on: ubuntu-latest steps: @@ -25,8 +28,6 @@ jobs: sudo apt-get install nodejs sudo apt-get install npm sudo npm i openapi-to-md -g - - name: Start Hashtopolis - uses: ./.github/workflows/start_server.yml - name: Download newest apiv2 spec run: | wget http://localhost:8080/api/v2/openapi.json -P /tmp/ @@ -40,4 +41,4 @@ jobs: FTP_USERNAME: ${{ secrets.FTP_USERNAME }} FTP_PASSWORD: ${{ secrets.FTP_PASSWORD }} run: | - lftp -e "mirror -R site/ /; quit" -u $FTP_USERNAME,$FTP_PASSWORD $FTP_SERVER + lftp -e "mirror -R site/ /; quit" -u $FTP_USERNAME,$FTP_PASSWORD $FTP_SERVER \ No newline at end of file From ba6d0473ef3416904da9b541edee7c4706b70b60 Mon Sep 17 00:00:00 2001 From: jessevz Date: Thu, 16 Jan 2025 11:40:05 +0100 Subject: [PATCH 033/691] Fixed typo --- .github/workflows/start_server.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/start_server.yml b/.github/workflows/start_server.yml index e278a3169..27575fae2 100644 --- a/.github/workflows/start_server.yml +++ b/.github/workflows/start_server.yml @@ -5,7 +5,7 @@ on: jobs: start-hashtopolis: - runs-on: ubbuntu-latest + runs-on: ubuntu-latest steps: - name: Checkout repository From 94e16cf5c3327a23db243c7df07b924ab866eb66 Mon Sep 17 00:00:00 2001 From: jessevz Date: Thu, 16 Jan 2025 11:55:05 +0100 Subject: [PATCH 034/691] Changed reusing workflow into composite action --- .../start-hashtopolis/action.yml} | 12 +++--------- .github/workflows/ci.yml | 5 ++--- .github/workflows/docs.yml | 5 ++--- 3 files changed, 7 insertions(+), 15 deletions(-) rename .github/{workflows/start_server.yml => actions/start-hashtopolis/action.yml} (67%) diff --git a/.github/workflows/start_server.yml b/.github/actions/start-hashtopolis/action.yml similarity index 67% rename from .github/workflows/start_server.yml rename to .github/actions/start-hashtopolis/action.yml index 27575fae2..89f0b4a3a 100644 --- a/.github/workflows/start_server.yml +++ b/.github/actions/start-hashtopolis/action.yml @@ -1,15 +1,9 @@ name: Start Hashtopolis server +description: Starts application containers and waits for Hashtopolis to be ready. -on: - workflow_call: - -jobs: - start-hashtopolis: - runs-on: ubuntu-latest - +runs: + using: "composite" steps: - - name: Checkout repository - uses: actions/checkout@v3 - name: Start application containers working-directory: .devcontainer run: docker compose up -d diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 5d71fb3d5..512630ccf 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -11,14 +11,13 @@ on: - dev jobs: - start-hashtopolis: - uses: ./.github/workflows/start_server.yml build: - needs: start-hashtopolis runs-on: ubuntu-latest steps: - name: Checkout repository uses: actions/checkout@v3 + - name: Start Hashtopolis server + uses: ./.github/actions/start-hashtopolis - name: Give Apache permissions on necessary directories # for the tests, only src/files and src/inc/utils/locks seem necessary run: docker exec -u root hashtopolis-server-dev bash -c "chown -R www-data:www-data /var/www/html/src && chmod -R g+w /var/www/html/src" - name: Run test suite diff --git a/.github/workflows/docs.yml b/.github/workflows/docs.yml index a16fb52b8..cc3fbc930 100644 --- a/.github/workflows/docs.yml +++ b/.github/workflows/docs.yml @@ -5,10 +5,7 @@ on: branches: - docs jobs: - start-hashtopolis: - uses: ./.github/workflows/start_server.yml build: - needs: start-hashtopolis runs-on: ubuntu-latest steps: @@ -28,6 +25,8 @@ jobs: sudo apt-get install nodejs sudo apt-get install npm sudo npm i openapi-to-md -g + - name: Start Hashtopolis server + uses: ./.github/actions/start-hashtopolis - name: Download newest apiv2 spec run: | wget http://localhost:8080/api/v2/openapi.json -P /tmp/ From 2bd28a0d3f2edb6f61810a125c5aa2681630d757 Mon Sep 17 00:00:00 2001 From: jessevz Date: Thu, 16 Jan 2025 11:59:09 +0100 Subject: [PATCH 035/691] Fixed yaml syntax error in start-hashtopolis action --- .github/actions/start-hashtopolis/action.yml | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/.github/actions/start-hashtopolis/action.yml b/.github/actions/start-hashtopolis/action.yml index 89f0b4a3a..d541e3183 100644 --- a/.github/actions/start-hashtopolis/action.yml +++ b/.github/actions/start-hashtopolis/action.yml @@ -3,9 +3,9 @@ description: Starts application containers and waits for Hashtopolis to be ready runs: using: "composite" - steps: - - name: Start application containers - working-directory: .devcontainer - run: docker compose up -d - - name: Wait until entrypoint is finished and Hashtopolis is started - run: bash .github/scripts/await-hashtopolis-startup.sh \ No newline at end of file + steps: + - name: Start application containers + working-directory: .devcontainer + run: docker compose up -d + - name: Wait until entrypoint is finished and Hashtopolis is started + run: bash .github/scripts/await-hashtopolis-startup.sh \ No newline at end of file From 99436ea57121c7a6ebb347e778739ed55d7a1753 Mon Sep 17 00:00:00 2001 From: jessevz Date: Thu, 16 Jan 2025 12:04:57 +0100 Subject: [PATCH 036/691] Added missing shell property to composite action --- .github/actions/start-hashtopolis/action.yml | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/.github/actions/start-hashtopolis/action.yml b/.github/actions/start-hashtopolis/action.yml index d541e3183..b5faa2209 100644 --- a/.github/actions/start-hashtopolis/action.yml +++ b/.github/actions/start-hashtopolis/action.yml @@ -7,5 +7,7 @@ runs: - name: Start application containers working-directory: .devcontainer run: docker compose up -d + shell: bash - name: Wait until entrypoint is finished and Hashtopolis is started - run: bash .github/scripts/await-hashtopolis-startup.sh \ No newline at end of file + run: bash .github/scripts/await-hashtopolis-startup.sh + shell: bash \ No newline at end of file From 499af62641a75933dc4918b6adba0e37715d1c4f Mon Sep 17 00:00:00 2001 From: jessevz Date: Thu, 16 Jan 2025 13:17:40 +0100 Subject: [PATCH 037/691] Added function level documentation with phpDocumentor --- .github/workflows/docs.yml | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/.github/workflows/docs.yml b/.github/workflows/docs.yml index cc3fbc930..5df568b8b 100644 --- a/.github/workflows/docs.yml +++ b/.github/workflows/docs.yml @@ -21,6 +21,7 @@ jobs: pip install mkdocs pip3 install $(mkdocs get-deps) sudo apt-get update + sudo apt-get install php sudo apt-get install -y lftp sudo apt-get install nodejs sudo apt-get install npm @@ -31,6 +32,10 @@ jobs: run: | wget http://localhost:8080/api/v2/openapi.json -P /tmp/ openapi-to-md /tmp/openapi.json /docs/api/ + - name: Create function level documentation with phpdocumentor + run: | + wget https://phpdoc.org/phpDocumentor.phar -P /tmp/ + php /tmp/phpDocumentor.phar --ignore vendor/ -d . -t /docs/php-documentor/ - name: Build MkDocs site run: | mkdocs build From 1ac4d635a474be5df11bf8436727865cef0fc4ca Mon Sep 17 00:00:00 2001 From: jessevz Date: Thu, 16 Jan 2025 13:44:22 +0100 Subject: [PATCH 038/691] Added sudo to creating phpdoc in order to be able to create directory --- .github/workflows/docs.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/docs.yml b/.github/workflows/docs.yml index 5df568b8b..0a7b9353d 100644 --- a/.github/workflows/docs.yml +++ b/.github/workflows/docs.yml @@ -35,7 +35,7 @@ jobs: - name: Create function level documentation with phpdocumentor run: | wget https://phpdoc.org/phpDocumentor.phar -P /tmp/ - php /tmp/phpDocumentor.phar --ignore vendor/ -d . -t /docs/php-documentor/ + sudo php /tmp/phpDocumentor.phar --ignore vendor/ -d . -t /docs/php-documentor/ - name: Build MkDocs site run: | mkdocs build From 6297209ea0e702610b70300db5094bd37611d158 Mon Sep 17 00:00:00 2001 From: gluafamichl <86108041+gluafamichl@users.noreply.github.com> Date: Thu, 23 Jan 2025 09:22:26 +0100 Subject: [PATCH 039/691] Fix: many to many relations from DB did not work (#1174) Co-authored-by: gluafamichl <> --- .../apiv2/common/AbstractModelAPI.class.php | 35 +++++++++---------- 1 file changed, 17 insertions(+), 18 deletions(-) diff --git a/src/inc/apiv2/common/AbstractModelAPI.class.php b/src/inc/apiv2/common/AbstractModelAPI.class.php index 3497ca5d0..608d55e2d 100644 --- a/src/inc/apiv2/common/AbstractModelAPI.class.php +++ b/src/inc/apiv2/common/AbstractModelAPI.class.php @@ -255,33 +255,32 @@ final protected static function getManyToOneRelationViaIntermediate( ): array { assert($intermediateFactory instanceof AbstractModelFactory); assert($targetFactory instanceof AbstractModelFactory); - $retval = array(); - - + $many2Many = array(); + /* Retrieve Parent -> Intermediate -> Target objects */ $objectIds = []; - foreach ($objects as $object) { + foreach($objects as $object) { $kv = $object->getKeyValueDict(); $objectIds[] = $kv[$objectField]; } $qF = new ContainFilter($filterField, $objectIds, $intermediateFactory); $jF = new JoinFilter($intermediateFactory, $joinField, $joinField); $hO = $targetFactory->filter([Factory::FILTER => $qF, Factory::JOIN => $jF]); - - /* Build mapping Parent -> Intermediate */ - $i2p = []; - foreach ($hO[$intermediateFactory->getModelName()] as $intermidiateObject) { - $kv = $intermidiateObject->getKeyValueDict(); - $i2p[$kv[$joinField]] = $kv[$filterField]; + + $intermediateObjectList = $hO[$intermediateFactory->getModelName()]; + $targetObjectList = $hO[$targetFactory->getModelName()]; + + $intermediateObject = current($intermediateObjectList); + $targetObject = current($targetObjectList); + + while ($intermediateObject && $targetObject) { + $kv = $intermediateObject->getKeyValueDict(); + $many2Many[$kv[$filterField]][] = $targetObject; + + $intermediateObject = next($intermediateObjectList); + $targetObject = next($targetObjectList); } - - /* Associate Target -> Parent (via Intermediate) */ - foreach ($hO[$targetFactory->getModelName()] as $targetObject) { - $parent = $i2p[$targetObject->getKeyValueDict()[$joinField]]; - $retval[$parent][] = $targetObject; - } - - return $retval; + return $many2Many; } /** From f41eba56b9cf41895d84c0b2731cfa62d08b2347 Mon Sep 17 00:00:00 2001 From: jessevz Date: Mon, 27 Jan 2025 08:24:43 +0100 Subject: [PATCH 040/691] Fix including (#1176) * Fixed duplicate entries in included section and including many to one through intermediate table * Fixed bug where user endpoint used wrong include code --- .../apiv2/common/AbstractBaseAPI.class.php | 2 +- .../apiv2/common/AbstractModelAPI.class.php | 100 +++++++++++++++++- src/inc/apiv2/model/tasks.routes.php | 6 ++ src/inc/apiv2/model/users.routes.php | 2 +- 4 files changed, 103 insertions(+), 7 deletions(-) diff --git a/src/inc/apiv2/common/AbstractBaseAPI.class.php b/src/inc/apiv2/common/AbstractBaseAPI.class.php index 7c355b438..2afa40cf3 100644 --- a/src/inc/apiv2/common/AbstractBaseAPI.class.php +++ b/src/inc/apiv2/common/AbstractBaseAPI.class.php @@ -872,7 +872,7 @@ protected function makeExpandables(Request $request, array $validExpandables): a protected function getPrimaryKey(): string { $features = $this->getFeatures(); - # Word-around required since getPrimaryKey is not static in dba/models/*.php + # Work-around required since getPrimaryKey is not static in dba/models/*.php foreach($features as $key => $value) { if ($value['pk'] == True) { return $key; diff --git a/src/inc/apiv2/common/AbstractModelAPI.class.php b/src/inc/apiv2/common/AbstractModelAPI.class.php index 608d55e2d..9f3dc35c6 100644 --- a/src/inc/apiv2/common/AbstractModelAPI.class.php +++ b/src/inc/apiv2/common/AbstractModelAPI.class.php @@ -58,6 +58,19 @@ protected static function fetchExpandObjects(array $objects, string $expand): mi $toOneRelationships = static::getToOneRelationships(); if (array_key_exists($expand, $toOneRelationships)) { $relationFactory = self::getModelFactory($toOneRelationships[$expand]['relationType']); + + if (array_key_exists('junctionTableType', $toOneRelationships[$expand])) { + $junctionTableFactory = self::getModelFactory($toOneRelationships[$expand]['junctionTableType']); + return self::getManyToOneRelationViaIntermediate( + $objects, + $toOneRelationships[$expand]['junctionTableJoinField'], + $junctionTableFactory, + $relationFactory, + $toOneRelationships[$expand]['relationKey'], + $toOneRelationships[$expand]['parentKey'] + ); + }; + return self::getForeignKeyRelation( $objects, $toOneRelationships[$expand]['key'], @@ -73,7 +86,7 @@ protected static function fetchExpandObjects(array $objects, string $expand): mi /* Associative entity */ if (array_key_exists('junctionTableType', $toManyRelationships[$expand])) { $junctionTableFactory = self::getModelFactory($toManyRelationships[$expand]['junctionTableType']); - return self::getManyToOneRelationViaIntermediate( + return self::getManyToManyRelationViaIntermediate( $objects, $toManyRelationships[$expand]['key'], $junctionTableFactory, @@ -148,6 +161,66 @@ protected function getPrimaryKeyOther(string $dbaClass): string } } + /** + * Retrieve ManyToOne relalation for $objects ('parents') of type $targetFactory via 'intermidate' + * of $intermediateFactory joining on $joinField (between 'intermediate' and 'target'). Filtered by + * $filterField at $intermediateFactory. + * + * @param array $objects Objects Fetch relation for selected Objects + * @param string $objectField Field to use as base for $objects + * @param object $intermediateFactory Factory used as intermediate between parentObject and targetObject + * @param string $filterField Filter field of intermadiateObject to filter against $objects field + * @param object $targetFactory Object properties of objects returned + * @param string $joinField Field to connect 'intermediate' to 'target' + + * @return array $many2One which is a map where the key is the id of the parent object and the value is an array of the included + * objects that are included for this parent object + */ + //A bit hacky solution to get a to one through an intermediate table, currently only used by tasks to include a hashlist through the taskwrapper + //another solution can be to overwrite fetchExpandObjects() in tasks.routes + final protected static function getManyToOneRelationViaIntermediate( + array $objects, + string $objectField, + object $intermediateFactory, + object $targetFactory, + string $joinField, + string $parentKey + ): array { + assert($intermediateFactory instanceof AbstractModelFactory); + assert($targetFactory instanceof AbstractModelFactory); + $many2One = array(); + + /* Retrieve Parent -> Intermediate -> Target objects */ + $objectIds = []; + foreach($objects as $object) { + $kv = $object->getKeyValueDict(); + $objectIds[] = $kv[$objectField]; + } + $baseFactory = self::getModelFactory(static::getDBAClass()); + $qF = new ContainFilter($objectField, $objectIds, $intermediateFactory); + $jF = new JoinFilter($intermediateFactory, $joinField, $joinField); + $jF2 = new JoinFilter($baseFactory, $objectField, $objectField, $intermediateFactory); + $hO = $targetFactory->filter([Factory::FILTER => $qF, Factory::JOIN => [$jF, $jF2]]); + + $intermediateObjectList = $hO[$intermediateFactory->getModelName()]; + $targetObjectList = $hO[$targetFactory->getModelName()]; + $baseObjectList = $hO[$baseFactory->getModelName()]; + + $intermediateObject = current($intermediateObjectList); + $targetObject = current($targetObjectList); + $baseObject = current($baseObjectList); + + while ($intermediateObject && $targetObject && $baseObject) { + $kv = $baseObject->getKeyValueDict(); + $many2One[$kv[$parentKey]] = $targetObject; + + $intermediateObject = next($intermediateObjectList); + $targetObject = next($targetObjectList); + $baseObject = next($baseObjectList); + } + return $many2One; + } + /** * Retrieve ForeignKey Relation * @@ -243,9 +316,10 @@ final protected static function getManyToOneRelation( * @param object $targetFactory Object properties of objects returned * @param string $joinField Field to connect 'intermediate' to 'target' - * @return array + * @return array $many2many which is a map where the key is the id of the parent object and the value is an array of the included + * objects that are included for this parent object */ - final protected static function getManyToOneRelationViaIntermediate( + final protected static function getManyToManyRelationViaIntermediate( array $objects, string $objectField, object $intermediateFactory, @@ -372,6 +446,22 @@ final protected function ResourceRecordArrayToUpdateArray($data, $parentId) return $updates; } + protected static function addToRelatedResources(array $relatedResources, array $relatedResource) { + $alreadyExists = false; + $searchType = $relatedResource["type"]; + $searchId = $relatedResource["id"]; + foreach ($relatedResources as $resource) { + if ($resource["id"] == $searchId && $resource["type"] == $searchType) { + $alreadyExists = true; + break; + } + } + if (!$alreadyExists) { + $relatedResources[] = $relatedResource; + } + return $relatedResources; + } + /** * API entry point for requesting multiple objects */ @@ -484,14 +574,14 @@ public static function getManyResources(object $apiClass, Request $request, Resp $expandResultObject = $expandResult[$expand][$object->getId()]; if (is_array($expandResultObject)) { foreach ($expandResultObject as $expandObject) { - $includedResources[] = $apiClass->obj2Resource($expandObject); + $includedResources = self::addToRelatedResources($includedResources, $apiClass->obj2Resource($expandObject)); } } else { if ($expandResultObject === null) { // to-only relation which is nullable continue; } - $includedResources[] = $apiClass->obj2Resource($expandResultObject); + $includedResources = self::addToRelatedResources($includedResources, $apiClass->obj2Resource($expandResultObject)); } } } diff --git a/src/inc/apiv2/model/tasks.routes.php b/src/inc/apiv2/model/tasks.routes.php index 978a14dc1..dada4d77b 100644 --- a/src/inc/apiv2/model/tasks.routes.php +++ b/src/inc/apiv2/model/tasks.routes.php @@ -47,6 +47,12 @@ public static function getToOneRelationships(): array { 'intermediateType' => TaskWrapper::class, 'joinField' => Task::TASK_WRAPPER_ID, 'joinFieldRelation' => TaskWrapper::TASK_WRAPPER_ID, + + 'junctionTableType' => TaskWrapper::class, + 'junctionTableFilterField' => TaskWrapper::HASHLIST_ID, + 'junctionTableJoinField' => TaskWrapper::TASK_WRAPPER_ID, + + 'parentKey' => Task::TASK_ID ], ]; } diff --git a/src/inc/apiv2/model/users.routes.php b/src/inc/apiv2/model/users.routes.php index 2f92db5ef..492bfe3dc 100644 --- a/src/inc/apiv2/model/users.routes.php +++ b/src/inc/apiv2/model/users.routes.php @@ -55,7 +55,7 @@ protected static function fetchExpandObjects(array $objects, string $expand): mi /* Expand requested section */ switch($expand) { case 'accessGroups': - return self::getManyToOneRelationViaIntermediate( + return self::getManyToManyRelationViaIntermediate( $objects, User::USER_ID, Factory::getAccessGroupUserFactory(), From 1e772598350d685ebb527bb76e9461b4e9237410 Mon Sep 17 00:00:00 2001 From: jessevz Date: Thu, 6 Feb 2025 17:10:46 +0100 Subject: [PATCH 041/691] Fixed pagination bug where items with id 0 are skipped (#1182) --- src/inc/apiv2/common/AbstractModelAPI.class.php | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/src/inc/apiv2/common/AbstractModelAPI.class.php b/src/inc/apiv2/common/AbstractModelAPI.class.php index 9f3dc35c6..a003793ac 100644 --- a/src/inc/apiv2/common/AbstractModelAPI.class.php +++ b/src/inc/apiv2/common/AbstractModelAPI.class.php @@ -478,7 +478,7 @@ public static function getManyResources(object $apiClass, Request $request, Resp // $defaultPageSize = SConfig::getInstance()->getVal(DConfig::DEFAULT_PAGE_SIZE); // $maxPageSize = SConfig::getInstance()->getVal(DConfig::MAX_PAGE_SIZE); - $pageAfter = $apiClass->getQueryParameterFamilyMember($request, 'page', 'after') ?? 0; + $pageAfter = $apiClass->getQueryParameterFamilyMember($request, 'page', 'after'); $pageSize = $apiClass->getQueryParameterFamilyMember($request, 'page', 'size') ?? $defaultPageSize; if ($pageSize < 0) { throw new HttpErrorException("Invalid parameter, page[size] must be a positive integer", 400); @@ -536,7 +536,9 @@ public static function getManyResources(object $apiClass, Request $request, Resp //pagination filters need to be added after max has been calculated $finalFs[Factory::LIMIT] = new LimitFilter($pageSize); - $finalFs[Factory::FILTER][] = new QueryFilter($primaryKey, $pageAfter, '>', $factory); + if (isset($pageAfter)){ + $finalFs[Factory::FILTER][] = new QueryFilter($primaryKey, $pageAfter, '>', $factory); + } $pageBefore = $apiClass->getQueryParameterFamilyMember($request, 'page', 'before'); if (isset($pageBefore)) { $finalFs[Factory::FILTER][] = new QueryFilter($primaryKey, $pageBefore, '<', $factory); From 0100eb62ec4d3ffa5edb49a5c72524b96502d8e0 Mon Sep 17 00:00:00 2001 From: jessevz Date: Thu, 6 Feb 2025 17:11:24 +0100 Subject: [PATCH 042/691] Made it possible to include hashtypes in healthcheck (#1183) --- src/inc/apiv2/model/healthchecks.routes.php | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/src/inc/apiv2/model/healthchecks.routes.php b/src/inc/apiv2/model/healthchecks.routes.php index 5d9ba9622..56720e74d 100644 --- a/src/inc/apiv2/model/healthchecks.routes.php +++ b/src/inc/apiv2/model/healthchecks.routes.php @@ -2,6 +2,7 @@ use DBA\Factory; use DBA\CrackerBinary; +use DBA\HashType; use DBA\HealthCheck; use DBA\HealthCheckAgent; @@ -26,6 +27,12 @@ public static function getToOneRelationships(): array { 'relationType' => CrackerBinary::class, 'relationKey' => CrackerBinary::CRACKER_BINARY_ID, ], + 'hashType' => [ + 'key' => HealthCheck::HASHTYPE_ID, + + 'relationType' => HashType::class, + 'relationKey' => HashType::HASH_TYPE_ID, + ] ]; } From 2c105d9635d6d3b7602f9652d5f746230b70ddc4 Mon Sep 17 00:00:00 2001 From: coiseiw Date: Tue, 11 Feb 2025 22:32:51 +0100 Subject: [PATCH 043/691] Update in the manual --- doc/advanced_usage/tls.md | 2 +- doc/index.md | 62 ++++- .../advanced_install.md | 257 ++++++++++++++++++ .../basic_install.md} | 30 +- doc/user_manual/advanced_hashlist.md | 14 - doc/user_manual/advanced_manual.md | 92 +++++++ doc/user_manual/user_manual.md | 53 +++- mkdocs.yml | 6 +- 8 files changed, 473 insertions(+), 43 deletions(-) create mode 100644 doc/installation_guidelines/advanced_install.md rename doc/{install.md => installation_guidelines/basic_install.md} (87%) delete mode 100644 doc/user_manual/advanced_hashlist.md create mode 100644 doc/user_manual/advanced_manual.md diff --git a/doc/advanced_usage/tls.md b/doc/advanced_usage/tls.md index 162fc0822..15f678afc 100644 --- a/doc/advanced_usage/tls.md +++ b/doc/advanced_usage/tls.md @@ -21,7 +21,7 @@ openssl req -x509 -newkey rsa:2048 -keyout nginx.key -out nginx.crt -days 365 -n ## Setting up docker-compose and env.example -Please see the [Install](../install.md) page on how to download those settings file. +Please see the [Install](../installation_guidelines/basic_install.md) page on how to download those settings file. 1. Edit docker-compose.yaml diff --git a/doc/index.md b/doc/index.md index a3db9dd33..4ed667320 100644 --- a/doc/index.md +++ b/doc/index.md @@ -2,5 +2,65 @@ > [!CAUTION] > This is the new documentation of Hashtopolis. It is work in progress, so use with care! +> +> You can find the old documentation still inside this folder, please check the [Hashtopolis Communication Protocol (V2)](protocol.pdf) docs. The user api documentation can be found here: [Hashtopolis User API (V1)](user-api/user-api.pdf). -You can find the old documentation still inside this folder, please check the [Hashtopolis Communication Protocol (V2)](protocol.pdf) docs. The user api documentation can be found here: [Hashtopolis User API (V1)](user-api/user-api.pdf). +Hashtopolis is a multi-platform client-server tool for distributing hashcat tasks to multiple computers. The main goals for Hashtopolis's development are portability, robustness, multi-user support, and multiple groups management. The application has two parts: + +- Agent Python client, easily customizable to suit any need. +- Server several PHP/CSS files operating on two endpoints: an Admin GUI and an Agent Connection Point + +Aiming for high usability even on restricted networks, Hashtopolis communicates over HTTP(S) using a human-readable, hashing-specific dialect of JSON. + +The server part runs on PHP using MySQL as the database back end. It is vital that your MySQL server is configured with performance in mind. Queries can be very expensive and proper configuration makes the difference between a few milliseconds of waiting and disastrous multi-second lags. The database schema heavily profits from indexing. Therefore, if you see a hint about pre-sorting your hashlist, please do so. + +The web admin interface is the single point of access for all client agents. New agent deployments require a one-time password generated in the New Agent tab. This reduces the risk of leaking hashes or files to rogue or fake agents. + +There are parts of the documentation and wiki which are not up-to-date. If you see anything wrong or have questions on understanding descriptions, join our Discord server at https://discord.gg/S2NTxbz. + +To report a bug, please create an issue and try to describe the problem as accurately as possible. This helps us to identify the bug and see if it is reproducible. + +In an effort to make the Hashtopussy project conform to a more politically neutral name it was rebranded to "Hashtopolis" in March 2018. + +# Features +- Easy and comfortable to use +- Dark and light theme +- Accessible from anywhere via web interface or user API +- Server component highly compatible with common web hosting setups +- Unattended agents +- File management for word lists, rules, ... +- Self-updating of both Hashtopolis and Hashcat +- Cracking multiple hashlists of the same hash type as though they were a single hashlist +- Running the same client on Windows, Linux and macOS +- Files and hashes marked as "secret" are only distributed to agents marked as "trusted" +- Many data import and export options +- Rich statistics on hashes and running tasks +- Visual representation of chunk distribution +- Multi-user support +- User permission levels +- Various notification types +- Small and/or CPU-only tasks +- Group assignment for agents and users for fine-grained access-control +- Compatible with crackers supporting certain flags +- Report generation for executed attacks and agent status +- Multiple file distribution variants + +# Contribution Guidelines +We are open to all kinds of contributions. If it's a bug fix or a new feature, feel free to create a pull request. Please consider some points: + +Just include one feature or one bugfix in one pull request. In case you have two new features please also create two pull requests. +Try to stick with the code style used (especially in the PHP parts). IntelliJ/PHPStorm users can get a code style XML here. + +The pull request will then be reviewed by at least one member and merged after approval. Don't be discouraged just because the first review is not approved, often these are just small changes. + +# Thanks +- winxp5421 for testing, writing help texts and a lot of input ideas +- blazer for working on the csharp agent and hops for working on the python agent +- Cynosure Prime for testing +- atom for hashcat +- curlyboi for the original Hashtopus code + +# Do we keep this ? + +7zip binaries are compiled from here +uftp binaries are compiled from here \ No newline at end of file diff --git a/doc/installation_guidelines/advanced_install.md b/doc/installation_guidelines/advanced_install.md new file mode 100644 index 000000000..309cf3540 --- /dev/null +++ b/doc/installation_guidelines/advanced_install.md @@ -0,0 +1,257 @@ +# Advanced installation +- Installation of TLS X.509 certificate (***Done in advanced usage***) +- Agent configuration file and command line arguments +- (Boot from PXE) and run HtP as a service (voucher, local disk,...) +- Misc. + + +## Installation in an airgapped/offline/oil-gapped system (**make a note about the binary**) +If you are running Hashtopolis in an offline network or an air-gapped network, you will need to use a machine with internet access to either pull the images directly from the docker hub or build it yourself. + +Here are the commands to pull the images from Docker hub. To build the images from source, follow the instructions in the section related to building images. +``` +docker pull hashtopolis/backend:latest +docker pull hashtopolis/frontend:latest +``` + +The images can then be saved as .tar archives: +``` +docker save hashtopolis/backend:latest --output hashtopolis-backend.tar +docker save hashtopolis/frontend:latest --output hashtopolis-frontend.tar +``` + +Next, transfer both file to your Hashtopolis server and import them using the following commands +``` +docker load --input hashtopolis-backend.tar +docker load --input hashtopolis-frontend.tar +``` + +Continue with the normal docker installation described in ***link to the basic install*** + +## Build Hashtopolis images yourself +The Docker images can be built from source following these steps. + +### Build frontend image +1. Clone the Hashtopolis web-ui repository and cd into it. +``` +git clone https://github.com/hashtopolis/web-ui.git +cd web-ui +``` + +2. Build the web-ui repo and tag it +``` +docker build -t hashtopolis/frontend:latest --target hashtopolis-web-ui-prod . +``` + +### Build backend image +1. Move one directory back, clone the Hashtopolis server repository and cd into it: +``` +cd .. +git clone https://github.com/hashtopolis/server.git +cd server +``` + +2. *(Optional)* Check the output of ```file docker-entrypoint.sh```. If it mentions *'with CRLF line terminators'*, your git checkout is converting line-ending on checkout. This is causing issues for files within the docker container. This is common behaviour for example within Windows (WSL) instances. To fix this: +``` +git config core.eol lf +git config core.autocrlf input +git rm -rf --cached . +git reset --hard HEAD +``` + +Check that ```file docker-entrypoint.sh``` correctly outputs: *'docker-entrypoint.sh: Bourne-Again shell script, ASCII text executable'*. + +3. Copy the env.example and edit the values to your likings +``` +cp env.example .env +nano .env +``` + +4. (Optional) If you want to test a preview of the version 2 of the UI, consult the New user interface technical preview section. (***Internal LINK***) + +5. Build the server docker image +``` +docker build . -t hashtopolis/backend:latest --target hashtopolis-server-prod +``` + +## Using Local Folders outside of the Docker Volumes + +By default (when you use the default docker-compose) the Hashtopolis folder (import, files and binaries) are in a Docker volume. + +You can list this volume via docker volume ls. You can also access the volume directly in the backend, because it is mounted at: ```/usr/local/share/hashtopolis``` inside the container. + +However, if you do not want the use the volume but want to use folders of the host OS you can change the mount points in the docker compose file: +``` +version: '3.7' +services: + hashtopolis-backend: + container_name: hashtopolis-backend + image: hashtopolis/backend:latest + restart: always + volumes: + # Where /opt/hashtopolis/ are folders on you host OS. + - /opt/hashtopolis/config:/usr/local/share/hashtopolis/config:Z + - /opt/hashtopolis/log:/usr/local/share/hashtopolis/log:Z + - /opt/hashtopolis/import:/usr/local/share/hashtopolis/import:Z + - /opt/hashtopolis/binaries:/usr/local/share/hashtopolis/binaries:Z + - /opt/hashtopolis/files:/usr/local/share/hashtopolis/files:Z + environment: + HASHTOPOLIS_DB_USER: $MYSQL_USER + HASHTOPOLIS_DB_PASS: $MYSQL_PASSWORD + HASHTOPOLIS_DB_HOST: $HASHTOPOLIS_DB_HOST + HASHTOPOLIS_DB_DATABASE: $MYSQL_DATABASE + HASHTOPOLIS_ADMIN_USER: $HASHTOPOLIS_ADMIN_USER + HASHTOPOLIS_ADMIN_PASSWORD: $HASHTOPOLIS_ADMIN_PASSWORD + HASHTOPOLIS_APIV2_ENABLE: $HASHTOPOLIS_APIV2_ENABLE + depends_on: + - db + ports: + - 8080:80 + db: + container_name: db + image: mysql:8.0 + restart: always + volumes: + - db:/var/lib/mysql + environment: + MYSQL_ROOT_PASSWORD: $MYSQL_ROOT_PASS + MYSQL_DATABASE: $MYSQL_DATABASE + MYSQL_USER: $MYSQL_USER + MYSQL_PASSWORD: $MYSQL_PASSWORD + hashtopolis-frontend: + container_name: hashtopolis-frontend + image: hashtopolis/frontend:latest + environment: + HASHTOPOLIS_BACKEND_URL: $HASHTOPOLIS_BACKEND_URL + restart: always + depends_on: + - hashtopolis-backend + ports: + - 4200:80 +volumes: + db: + hashtopolis: +``` + +Make sure to copy everything out of the docker volume, you can do that using: +``` +docker cp hashtopolis-backend:/usr/local/share/hashtopolis +``` + +Next, recreate the containers: +``` +docker compose down +docker compose up +``` + +Remember to copy the contents back into the folders. + +## Upgrading to 0.14.0 (from non-Docker to Docker) +There are multiple ways to migrate the data from your non-docker setup to docker. You can of course completely start fresh; but if you want to migrate your data there are multiple ways to do this. + +### Existing database (**formerly called New database**) +You can reuse your old database server or also migrate the database to a docker container. + +1. Install docker to your system (https://docs.docker.com/engine/install/ubuntu/) +2. Create a database backup mysqldump > hashtopolis-backup.sql +3. Make copies of the following folders, can be found in the hashtopolis folder along side the index.php: + - files + - import + - log +4. Download the docker compose file: wget https://raw.githubusercontent.com/hashtopolis/server/master/docker-compose.yml +5. Edit the docker compose file +``` +[...] + hashtopolis-server: +[...] + volumes: + - :/usr/local/share/hashtopolis:Z +[...] +``` + +6. Download the env file +``` +wget https://raw.githubusercontent.com/hashtopolis/server/master/env.example -O .env +``` + +7. Edit the .env file and change the settings to your likings nano .env + - Optional: if you want to test the new API and new UI, set the HASHTOPOLIS_APIV2_ENABLE to 1 inside the .env file. NOTE: The APIv2 and UIv2 are a technical preview. Currently when enable everyone through the new API will be fully admin! + - The HASHTOPOLIS_ADMIN_USER is only used during setup time and once you import the database backup will be replaced with your old data. +8. Create the folder which to referred to in the docker-compose, in our example we will use /usr/local/share/hashtopolis +``` +sudo mkdir -p /usr/local/share/hashtopolis +``` + +9. Copy the files, import, and log to the new location you refered to in the docker-compose file. +``` +sudo cp -r files/ import/ log/ /usr/local/share/hashtopolis +``` + +10. In the same folder create a config folder: +``` +mkdir /usr/local/share/hashtopolis/config +``` + +11. Start the docker container docker compose up +12. Stop the backend container so that agents don't mess up the database mid migration docker +``` +stop hashtopolis-backend +``` + +13. To migrate the data, first copy the database backup towards the db container: +``` +docker cp hashtopolis-backup.sql db:. +``` + +14. Login on the container: +``` +docker exec -it db /bin/bash +``` + +15. Import the data: +``` +mysql -Dhashtopolis -p < hashtopolis-backup.sql +``` + +16. Exit the container +17. Copy the content of the PEPPER from the *inc/conf.php* file and place them into *config/config*.json` +Example */var/www/hashtopolis/inc/conf.php*: +``` +[...] +$PEPPER = [..., ..., ..., ...]; +[...] +``` +Becomes */usr/local/share/hashtopolis/config/config.json*: +``` +{ + "PEPPER": [..., ..., ..., ...], +} +``` + +18. Restart the compose docker compose down && docker compose up + +### New database (**formerly called Existing database**) + +Repeat all the steps above, but you don't need to export/import the database. Only make sure that you point the settings inside the .env file to your database server and that the database server is reachable from your container. + +## Upgrading from docker to docker (version 0.14.0 and up) +1. Stop your docker compose docker compose down +2. docker compose pull +3. docker compose up + +## Upgrading from docker to docker (version 0.14.0 and up) - Offline System(s) + +***To be done*** + +## New user interface technical preview (**also present in basic install**) +> [!NOTE]: +> The APIv2 and UIv2 are a technical preview. Currently, when enabled, everyone through the new API will be fully admin! + +To enable 'version 2' of the API: + +1. Stop your containers +2. set the *HASHTOPOLIS_APIV2_ENABLE* to 1 inside the *.env* file. +3. ```docker compose up --detach``` +4. Access the technical preview via: http://127.0.0.1:4200 using the credentials below (unless modified in the *.env* file) + - user: admin + - password: hashtopolis diff --git a/doc/install.md b/doc/installation_guidelines/basic_install.md similarity index 87% rename from doc/install.md rename to doc/installation_guidelines/basic_install.md index 4fe37d904..86bbac4eb 100644 --- a/doc/install.md +++ b/doc/installation_guidelines/basic_install.md @@ -1,8 +1,7 @@ -# Installation Guidelines (Work in Progress) -## Basic installation -### Server installation +# Basic installation +## Server installation This guide details installing Hashtopolis using Docker, the recommended method since version 0.14.0. Docker offers a faster, more consistent setup process. -#### Prerequisites: +### Prerequisites: > [!NOTE] > The instructions provided in this section have only been tested on Ubuntu 22.04 and Windows 11 with WSL2. @@ -14,7 +13,7 @@ To install Hashtopolis server, ensure that the following prerequisites are met: 2. Docker Compose v2: Follow the instructions available on the Docker website: - Install Docker Compose on Linux -#### Setup Hashtopolis Server +### Setup Hashtopolis Server The official Docker images can be found on Docker Hub at: https://hub.docker.com/u/hashtopolis. Two Docker images are needed to run Hashtopolis: hashtopolis/frontend (setting up the web user interface), and hashtopolis/backend (taking care of the Hashtopolis database). A docker-compose file allowing to configure the docker containers for Hashtopolis is available in this repository. Here are the steps to follow to run Hashtopolis using that docker-compose file: @@ -40,7 +39,7 @@ docker compose up --detach 5. Access the Hashtopolis UI through: http://127.0.0.1:8080 using the credentials (user=admin, password=hashtopolis) 6. If you want to play around with a preview of the version 2 of the UI, consult the New user interface: technical preview section. -#### New user interface: technical preview +### New user interface: technical preview > [!NOTE] > The APIv2 and UIv2 are a technical preview. Currently, when enabled, everyone through the new API will be fully admin! @@ -58,14 +57,16 @@ docker compose up --detach 4. Access the technical preview via: http://127.0.0.1:4200 using the credentials user=admin and password=hashtopolis, unless modified in the .env file. -### Agent installation -#### Prerequisites +## Agent installation +### Prerequisites To install the agent, ensure that the following prerequisites are met: + 1. Python: Python 3 must be installed on the agent system. You can verify the installation by running the following command in your terminal: ``` python3 --version ``` If Python 3 is not installed, refer to the official Python installation guide. + 2. Python Packages: The Hashtopolis agents depends on the following Python packages: - requests - psutil @@ -82,14 +83,14 @@ Then, install the packages: pip install requests psutil ``` -#### Download the Hashtopolis agent +### Download the Hashtopolis agent 1. Connect to the Hashtopolis server: http://:8080 and log in. Navigate to the Agents tab > New Agent. 2. From that page, you can either download the agent by clicking on the Download button, or copy and paste the provided url to download the agent using wget/curl: ``` curl -o hastopolis.zip "http://:8080/agents.php?download=1" ``` -#### Start and register a new agent +### Start and register a new agent 1. Activate your python virtual environment if not done before: ``` @@ -117,12 +118,3 @@ Login successful! ``` Your agent is now ready to receive new tasks. If you wish to finetune the configuration of your agent, please consult the section related to the agent configuration file or the command line arguments in the Advanced installation section. Otherwise, to start using Hashtopolis, consult the Basic workflow section. - -## Advanced installation -- Installation in an airgapped/offline/oil-gapped system (make a note about the binary) -- Installation with local folders -- Installation of TLS X.509 certificate -- Agent configuration file and command line arguments -- (Boot from PXE) and run HtP as a service (voucher, local disk,...) -- Misc. -- Upgrade of the install diff --git a/doc/user_manual/advanced_hashlist.md b/doc/user_manual/advanced_hashlist.md deleted file mode 100644 index 9d8c7077f..000000000 --- a/doc/user_manual/advanced_hashlist.md +++ /dev/null @@ -1,14 +0,0 @@ -## Advanced Hashlist - -- Super Hashlist - -- New Hashmode - -## Advanced tasks - -- Advanced option in task creation -- Preconfigured tasks (including from existing task) -- Super Task -- Import Super task - -## New Binary \ No newline at end of file diff --git a/doc/user_manual/advanced_manual.md b/doc/user_manual/advanced_manual.md new file mode 100644 index 000000000..0f601870f --- /dev/null +++ b/doc/user_manual/advanced_manual.md @@ -0,0 +1,92 @@ +# Deep Dive Manual + +This page provides more details on each functionalities described in the basic workflow. Among other things it provides deeper details and advanced functionalities about the hashlists, tasks, or the management of the agents. +## Hashlists In-Depth + +### Hashlists View +Ordered by ID by default. It reports the hashlists created. A tick is accolated to the name of the hashlists if all the passwords have been retrieved. It shows the number of retrieved passwords as well as the total number of hashes. It allows to import *pre-cracked hashes* or export the retrieved passwords (*see below for more details*). THe hashlists can also be archived or deleted. + +### Hashlists Details +If you click on a Hashlist, either in the hashlists view, in the Tasks overview or inside a task, it brings you to the corresponding Hashlist details page. + +Appart from the parameters specific to this hashlist (i.e. ID, Access Group, Hashlist name, ...), the page displays some information about the total number of hashes, the number of cracked ones and the number of remaining ones to be recovered. Clicking on one of these three values will open a new window displaying information about the Hashes of the Hashlist as detailed below. + +#### Hashes on the Hashlist +This page list all the hashes from the related hashlist. Filters can be applied to show either the cracked, the uncracked or all the hashes. According to the display filter selected, the Hashes only, the plaintext only or both are displayed. Additionnally, the cracking position (**to be defined**) can be displayed next to the cracked ones. Only 1000 hashes can be displayed at a time within a page but the user can navigate through the pages. The number of hashes per page can be configured in *Config > UI* settings. + +A HEX converter is present at the bottom of the page to convert any HEX values. This can be useful when the reported password is stored in a HEX format. + +#### Actions on the hashlist +Several actions are offered to the user which are detailed below. + +- **Download Report**: **will we still have this function** + +- **Generate Wordlist**: + +- **Export Hashes for pre-crack**: + +- **Export Left Hashes**: + +- **Import pre-cracked Hashes**: + +#### Tasks overview and creation +At the bottom of the page there are three subsections related to task for this hashlist. + +- **Tasks cracking this hashlists**: This section lists all the tasks that are related to this hashlist. Note that supertasks will not appear here (**is this something we would like in the future... let see how it will be handled within project**). The details displayed are defined in the *Show Tasks* section as they are the same. Note that not all the infos present in the *Show Tasks* page are displayed here. + +- **Create pre-configured tasks**: this section lists all the existing pre-configured tasks. The user can select a set of pre-configured tasks and create the corresponding task for the current hashlist. See the section on *pre-configured tasks* for more detail on this. + +- **Create Supertask**: Similarly to the pre-configured tasks, this section lists all the existing supertask that the user can create for the current hashlist. See the section *supertak* for more details on this. + + +### Super Hashlists + +#### Creation + +#### Overview + + +### Search Hash + +### Show Crack + + + +## Tasks in Depth + +### Advanced option during task creation +Several options were not covered in the basic workflow related to the creation of a task. The remaining options are described below. + +- Set as preprocessor task + +- Skip a given keyspace at the beginning of the task + +- Use Static Chunking + +- Enforce Piping (to apply rules before reject): **will be removed soon*** + +### Preconfigured tasks (including from existing task) +A preconfigured tasks is a basic template for a task that is not assigned yet to a hashlist. This is particularly useful to predefine task(s) that are often use such as generic mask attack or commonly used dictionnary attack. A preconfigured task can later be assigned to a hashlist avoiding the user to redefine the same task every time. This section gives more details about this topic. + +When the user goes to the menu *New Preconfigured TasksThe properties of a pre-configured tasks are a subset of those of a regular task and are therefore not re-defined here. THe reader can refer to the dedicated section for reference (**put a ref here**). + +Once the pre-configured task is created, the user is brought to the *Preconfigured tasks* page that lists all the existing preconfigured tasks. Here the user can set the default priority as well as the max number of agents for this preconfigured tasks (**NOTE I believe these two options should already appear in the template of a preconfigured task**). Those values will be used as defaults upon creation of a task from this template. + +In addition to the possibility to delete a preconfigured task, two additional actions are offered to the user and are defined below. + +- **Copy to task**: This action opens a *new task* creaction page where all the pre-defined values of the preconfigured task are already prefilled. The user must select the hashlist for which the task should be created. All the other values can be modified by the user if needed. Note that there is the possibility to create a task from a pretask for a specific hashlist directly from the corresponding *Hashlist details* page. + +- **Copy to Pretask**: This action open a *New Preconfigured Tasks* Page where all the value of the corresponding pretask are duplicated. The user can then modify those values to create a new Preconfigured tasks. This is particularly useful if one want to slightly modify an existing preconfigured task, for example by adding a new placeholder in a mask or changing a rule file in a dictionnary attack. Note that while it is possible to create a perfect duplicate of a pretask there is no added-value in doing-so. + +#### Creating a preconfigured task from a task +In the *Show Tasks* page, there is an action offered for each task, namely **Copy to Pretask**. This option will create a template from the corresponding task by extracting all the required information. The default name extracted will be the current one from the task. The user can modify at will those values and finally create the preconfigured task from it. This is useful in case you have defined an attack that you want to store for future reuse. + + +### Super Task + + +### Import Super task + +## New Binary + +- New Hashmode diff --git a/doc/user_manual/user_manual.md b/doc/user_manual/user_manual.md index 793bc40a1..64c0f92ae 100644 --- a/doc/user_manual/user_manual.md +++ b/doc/user_manual/user_manual.md @@ -1,11 +1,16 @@ # Basic Workflow -Basic workflow highlighting the main point. The goal is that with such workflow a new user is able to run a task on a new hashlist with files or with masks. +This page describes the basic workflow required to launch your first cracking task. +It provides a high-level overview of the key steps needed to get started: -- New Hashlist -- New Files, wordlist/rules/others -- New Task -- Monitoring +- Uploading hash lists; +- Uploading files; +- Creating a task; +- Monitoring the task and the results. +Each of these steps is covered in more detail in the advanced section **link**, but for now, this guide will walk you through the essentials to get your first task up and running. + +> [!NOTE] +> It is assumed that you have already access to a fully functional hashtopolis installation with at least one agent up and running. If it is not the case, please refer to the installation section **link**. ## Hashlists Hashtopolis utilizes hashlists to store password hashes you want to crack. These lists can be in plain text, HCCAPX, or binary format. Some hashes might include additional information like salts, depending on the format. @@ -27,7 +32,7 @@ Here is how to fill in the different fields: - Text File: Paste or upload a plain text file containing one hash per line. - HCCAPX/PMKID: Upload a HCCAPX file containing password hashes. - Binary File: Upload a binary file containing password hashes. -4. **Salted Hashes**: Tick the box related to salted hashes if appropriate and provide the correct separator for your hashlist. +4. **Salted Hashes**: Tick the box related to salted hashes if appropriate and provide the correct separator for your hashlist. The flag is enabled/disabled according to the settings defined in the Hashtype section (**see hashtypes REF**). If the provided salt(s) is in hex, the following flag needs to be enabled otherwise the salt will be interpreted as an ascii value (**is it ASCII or UTF8???**). 5. **Hash source**: Select one of the following hash source types. 6. **Providing the hash**: The last field of the form will automatically adapt depending on the chosen source type. You’ll be asked to provide additional details: - **Paste**: Copy and paste the hashes directly into the "Input" field. @@ -121,6 +126,42 @@ Line count: Reprocess the file and update the line count with the number of line ## Tasks +To create a new task, you have to navigate to *Tasks > New Task*. You will get the following window in which you can create a new task. Some of the fields are mandotory, some others are filled with default values. + +1. **Name**: provide a name for the task you want to create. This is how the task will be referenced with during the monitoring phase (see **link**) therefore it should be relatively explicit to facilitate its monitoring. + +2. **Hashlist**: select the hashlist you want to target in this specific task. Tasks are ordered by their IDs. Supertasks (**see ref to advanced usage**) are at the bottom of the list ordered by their respective IDs. + +3. **Command Line**: provide in this field the attack command that will be executed by the agent on the targeted hashlist using the selected binary (see below). Note that *#HL#* is filled in by default in the command line. It is a placeholder for the hashlist and will be replaced automatically at execution time by the agent with the correct path to the hashlist file. Therefore you should not remove it nor include the filename for the hashlist. If for example you want to perform a mask attack of 6 digits, the command line would look like ```#HL# -a3 ?d?d?d?d?d?d```. +In case you want to perform a dictionary attack with rules, you have to select the corresponding files in the right table. If it is a wordlist, select it within the right column corresponding to T/Task. The Preprocessor part is explained in the advanced section. If it is a rule file, select first the rule tab (see **ref to the picture**) and then select the desired rule file. Note that upon selection of a rule file, the name of the file is included in the command line and automatically include the required '-r' flag. + +4. **Priority**: Assign a priority number to the task. The expected value has to be an integer. Agents will be assigned to tasks in decreasing order of priority. A task with a priority 0 will not be processed even if agents are available. Default value is 0. + +5. **Maximum number of agents**: Specify the maximum agents that can be assigned to the task. If this amount is reached, future available agents will be assigned to the next task available with a lower priority even if the all the chunks of the task have been distributed. The default value of 0 means that there is no maximum and therefore, all available agents are assigned to this tasks until all the chunks have been distributed. This functionality is helpful to only use a portion of the cluster for a specific task, and therefore allowing to split the workers on different tasks. + +6. **Task Notes** - *optional*: This field allows the user to indicate some details about the tasks, the command line or any other details the user can find relevant. + +7. **Color** - *optional*: Can assign a color in a Hex color code format #RRGGBB. Default value is white #FFFFFF. This can be useful in the monitoring part to visually recognise a task or a set of tasks. + +8. **Chunk size**: This parameter defines the duration that each agent should take to process a chunk for this task (**chunk should be define at some point in the general context of hashtopolis**). The default value is defined in the Settings (**ref to settings page XXX**). + +9. **Status timer**: Defines the frequency with which each agent report its progress for this task to the server. The default value is defined in the Settings (**ref to settings page XXX**). + +10. **Benchmark Type**: More details in the advanced section probably. + +11. **Task is CPU only**: If this flag is enabled, only the agents that are declared as CPU only can be assigned to this task. More details can be found in **ref to advanced agents**. The flag is disabled by default. + +12. **Task is small**: If this flag is enabled, a single agent can be assigned to this task. This is relevant for small tasks or to assign the full keyspace in a single chunk to an agent. Note that this is **NOT** equivalent to define the *Maximum number of agents* to 1. Indeed, in this latter car, the task will still be divided in chunks according to the *chunk size* parameter. The flag is disabled by default. + +13. **Binary type to run the task**: This pair of parameters specifiy the binary type as well as the version of the binary to use for this specific task. It will by default use the latest uploaded version of the first binary type defined in the *Binaries* section (**see binaries for more details**). + + +Do and Don't +- multiple wordlists do not work +- increment do not work +- --slow-candidates may not be a good idea +- others? + ## Monitoring diff --git a/mkdocs.yml b/mkdocs.yml index fe9393b7b..c6d4852a3 100644 --- a/mkdocs.yml +++ b/mkdocs.yml @@ -4,10 +4,12 @@ repo_url: https://github.com/hashtopolis/server docs_dir: doc nav: - index.md - - install.md + - Installation Guidelines: + - installation_guidelines/basic_install.md + - installation_guidelines/advanced_install.md - User Manual: - user_manual/user_manual.md - - user_manual/advanced_hashlist.md + - user_manual/advanced_manual.md - user_manual/settings_and_configuration.md - Advanced Usage: - advanced_usage/tls.md From c7710442e7dd07131329b40714f5e21a3ebf31b6 Mon Sep 17 00:00:00 2001 From: jessevz Date: Mon, 10 Mar 2025 16:11:24 +0100 Subject: [PATCH 044/691] Fixed bug by setting Accesgroup of file to defaultgroup when accesgroup gets deleted (#1195) Co-authored-by: jessevz --- src/inc/utils/AccessGroupUtils.class.php | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/src/inc/utils/AccessGroupUtils.class.php b/src/inc/utils/AccessGroupUtils.class.php index 49c61cb47..9513f3dcb 100644 --- a/src/inc/utils/AccessGroupUtils.class.php +++ b/src/inc/utils/AccessGroupUtils.class.php @@ -9,6 +9,7 @@ use DBA\AccessGroupAgent; use DBA\Hashlist; use DBA\Factory; +use DBA\File; class AccessGroupUtils { /** @@ -175,6 +176,11 @@ public static function deleteGroup($groupId) { $qF = new QueryFilter(Hashlist::ACCESS_GROUP_ID, $group->getId(), "="); $uS = new UpdateSet(Hashlist::ACCESS_GROUP_ID, $default->getId()); Factory::getHashlistFactory()->massUpdate([Factory::FILTER => $qF, Factory::UPDATE => $uS]); + + // update associations of files with this group + $qF = new QueryFilter(File::ACCESS_GROUP_ID, $group->getId(), "="); + $uS = new UpdateSet(File::ACCESS_GROUP_ID, $default->getId()); + Factory::getFileFactory()->massUpdate([Factory::FILTER => $qF, Factory::UPDATE => $uS]); // delete all associations to users $qF = new QueryFilter(AccessGroupUser::ACCESS_GROUP_ID, $group->getId(), "="); From 1bc174f06270bac28bd7cfc55b0f1685628f0099 Mon Sep 17 00:00:00 2001 From: coiseiw Date: Fri, 14 Mar 2025 19:47:00 +0100 Subject: [PATCH 045/691] Advanced manual is almost finished. Binaries is the last section missing. THen there is the full page about config / user management / Account that needs to be done --- doc/installation_guidelines/basic_install.md | 6 +- doc/user_manual/advanced_manual.md | 145 +++++++++++++++++-- doc/user_manual/user_manual.md | 6 +- 3 files changed, 139 insertions(+), 18 deletions(-) diff --git a/doc/installation_guidelines/basic_install.md b/doc/installation_guidelines/basic_install.md index 86bbac4eb..b28d8e4cd 100644 --- a/doc/installation_guidelines/basic_install.md +++ b/doc/installation_guidelines/basic_install.md @@ -7,10 +7,14 @@ This guide details installing Hashtopolis using Docker, the recommended method s > The instructions provided in this section have only been tested on Ubuntu 22.04 and Windows 11 with WSL2. To install Hashtopolis server, ensure that the following prerequisites are met: + 1. Docker: Follow the instructions available on the Docker website: - - Install Docker on Ubuntu + + - [Install Docker on Ubuntu](https://docs.docker.com/engine/install/ubuntu/) - Install Docker on Windows + 2. Docker Compose v2: Follow the instructions available on the Docker website: + - Install Docker Compose on Linux ### Setup Hashtopolis Server diff --git a/doc/user_manual/advanced_manual.md b/doc/user_manual/advanced_manual.md index 0f601870f..92e16d300 100644 --- a/doc/user_manual/advanced_manual.md +++ b/doc/user_manual/advanced_manual.md @@ -1,6 +1,7 @@ # Deep Dive Manual This page provides more details on each functionalities described in the basic workflow. Among other things it provides deeper details and advanced functionalities about the hashlists, tasks, or the management of the agents. + ## Hashlists In-Depth ### Hashlists View @@ -11,23 +12,25 @@ If you click on a Hashlist, either in the hashlists view, in the Tasks overview Appart from the parameters specific to this hashlist (i.e. ID, Access Group, Hashlist name, ...), the page displays some information about the total number of hashes, the number of cracked ones and the number of remaining ones to be recovered. Clicking on one of these three values will open a new window displaying information about the Hashes of the Hashlist as detailed below. -#### Hashes on the Hashlist +#### Hashes of Hashlist X This page list all the hashes from the related hashlist. Filters can be applied to show either the cracked, the uncracked or all the hashes. According to the display filter selected, the Hashes only, the plaintext only or both are displayed. Additionnally, the cracking position (**to be defined**) can be displayed next to the cracked ones. Only 1000 hashes can be displayed at a time within a page but the user can navigate through the pages. The number of hashes per page can be configured in *Config > UI* settings. A HEX converter is present at the bottom of the page to convert any HEX values. This can be useful when the reported password is stored in a HEX format. #### Actions on the hashlist -Several actions are offered to the user which are detailed below. +Several actions are offered to the user which are detailed below. Note that some of the options are logically not available if no password have been retrieved for the specific hashlist. - **Download Report**: **will we still have this function** -- **Generate Wordlist**: +- **Generate Wordlist**: This action generates a file listing all the retrieved passwords from this hashlist. The file is automatically stored in the *wordlist* section of the *Files* section. The generated file can be easily retrieved as it got assigned to the latest file ID. The filename is *Wordlist_[Hashlist_ID]_[dd.mm.yyyy]_[hh.mm.ss].txt*. + +- **Export Hashes for pre-crack**: This action generates a file listing all the retrieved passwords from this hashlist associated with the corresponding hash value in the format *[hash]:[plaintext]*. The file is automatically stored in the *wordlist* section of the *Files* section. The generated file can be easily retrieved as it got assigned to the latest file ID. The filename is *Pre-cracked_[Hashlist_ID]_[dd-mm-yyyy]_[hh-mm-ss].txt*. -- **Export Hashes for pre-crack**: +- **Export Left Hashes**: This action generates a file listing all the hashes for which no password have been retrieved at the moment of the file creation. The file is automatically stored in the *wordlist* section of the *Files* section. The generated file can be easily retrieved as it got assigned to the latest file ID. The filename is *Leftlist_[Hashlist_ID]_[dd-mm-yyyy]_[hh-mm-ss].txt*. -- **Export Left Hashes**: +- **Import pre-cracked Hashes**: This action opens a new page in which the user can upload pre-cracked hashes for the related hashlist. A pre-crack is supposed to be a hash contained in the hashlist associated with a plaintext in the format *[hash](:[salt]):[plaintext]*. Such data can be imported in different ways: *"Paste, Upload, Import, URL downlaod"* such as the option to import the hashes during a hashlist creation (**see XXX**). In case of salted password, the field separator must be indicated, ':' being the default one. When validating by pressing the *Pre-crack hashes* button, the back-end will check if the imported data contains hash values from the targeted hashlist and integrate the plaintext value accordingly. If the option *Overwrite already cracked hashes* is selected, existing retrieved passworda will be overwritten by the new imported ones in case of conflict. The front-end is then reporting to the user how many hashes have been considered as well as how many entries have been updated. -- **Import pre-cracked Hashes**: +Pre-cracked management is useful to share results between different instances of hashtopolis. This is especially relevant for salted hashlits as each new recovered plaintext is improving the efficiency of the attack is there is no more hashes associated with the same salt value. #### Tasks overview and creation At the bottom of the page there are three subsections related to task for this hashlist. @@ -36,41 +39,83 @@ At the bottom of the page there are three subsections related to task for this h - **Create pre-configured tasks**: this section lists all the existing pre-configured tasks. The user can select a set of pre-configured tasks and create the corresponding task for the current hashlist. See the section on *pre-configured tasks* for more detail on this. -- **Create Supertask**: Similarly to the pre-configured tasks, this section lists all the existing supertask that the user can create for the current hashlist. See the section *supertak* for more details on this. +- **Create Supertask**: Similarly to the pre-configured tasks, this section lists all the existing supertask that the user can create for the current hashlist. See the section *supertask* for more details on this. ### Super Hashlists -#### Creation +> [!NOTE] +> Should we include pictures in this section that is quite obvious + +A Super Hashlist is a virtual hashlist that combines multiple classic hashlists without duplicating data at the database level. It allows you to run a single cracking task on multiple hashlists at once. Since the hashes are only linked, not merged, storage is optimized, and updates to individual hashlists are immediately reflected. This is especially useful when working with related datasets that require the same attack strategies, saving time and resources while keeping everything well-organized. + +#### New SuperHashlist + +The page displays all the existing hashlists in the database. To create a new superhashlist, you need to do the following: +- select all the hashlists you want to integrate in the superhashlist; +- scroll down to the bottom of the page, and enter a name for the superhashlist in the corresponding field; +- Click on the *create* button. + +You can select all the hashlists at once by clicking on the button *select all*. However, keep in mind that a superhashlist should only contains hash of the same type to work. **We should probably introduce a check at the creation of the super list, and also allow to search or filters to only display those of a specific type to select all in a controlled manner** #### Overview +Once you have created a superhashlist or if you open the *SuperHashlist* menu, the overview page of SuperHaslist is open. Such page diplays all the information about the superhashlists created so far. It is very similar to the hashlist overview page, the only difference being that you cannot archive a superhashlist. + +If you click on a superhashlist, the superhashlist detail page will be open. Again this page is very similar to the hashlist page. The only difference is that it contains the following details about the hashlist(s) contained in the superhashlist: +- ID of each hashlist +- Name of each hashlist +- Cracked percentage of each hashlist + ### Search Hash +This page displays a free text zone in which the user can type multiple hashes, one per line, to check if they are present in the database or not. The hashes do not need to be of the same type. Furthermore, the hash does not need to be complete. + +The result will display all the hashes that correspond to the given entry/ies. It will display one block for each entry specifying either: +- NOT FOUND: if the hash is present in no entries; +- A list of all the hashes that contains the given entry, specifying in which hashlist(s) they are contained and the cleartext password if they have been cracked already. + +
+ ![screenshot_import_file](https://upload.wikimedia.org/wikipedia/commons/8/80/Comingsoon.png?20120228065200){ width="300" } +
+ ### Show Crack +This page displays all the cracked passwords that have been retrieved and that are stored in the database. It shows the following fields. +- **Time Found**: Indicates when the password has been retrieved +- **Plaintext**: Password that has been retrieved +- **Hash**: Hash for which the password was retrieved +- **Hashlist**: ID of the hashlist that contains this hash +- **Agent**: ID of the agent that has retrieved the password +- **Task**: ID of the task that has retrieved the password +- **Chunk**: ID of the chunk that has retrieved the password +- **Type**: Hashmode related to the hash +- **Salt**: Salt associated to the hash if relevant. +1.000 entries are displayed per page and there is a search functionalities that is applied on all the field of the table. ## Tasks in Depth ### Advanced option during task creation Several options were not covered in the basic workflow related to the creation of a task. The remaining options are described below. -- Set as preprocessor task +- **Set as preprocessor task**: Such option allows the usage of a preprocessor. By default hashtopolis is installed with a single preprocessor, namely [*Prince*](https://github.com/hashcat/princeprocessor). Additional preprocessor can be defined in the *Config* page (see [XXX]() for more details). The command that should be used for this preprocessor must be defined in the free text zone below. A task define with a preprocessor will result in the execution of the preprocessor redirecting the output as stdin for the command line defined above in the same task. This allows the usage of "external" candidate generator such as Prince. -- Skip a given keyspace at the beginning of the task +- **Skip a given keyspace at the beginning of the task**: Any value X inserted here will result in ignoring the first X values of the keyspace as it would be done with the flag "-s X" inserted in the command line. The rest of the keyspace will be processed normally. This can be useful to ignore a portion of the keyspace that has been already explored during a different process, for example on a local machine. -- Use Static Chunking +- **Use Static Chunking**: If this option is enabled, the regular division in chunk (based on the chunktime and the benchmark of the agent) will be ignored. An alternative division is used depending of the choice made. + - *Fixed chunk size*: Each chunk will have a portion of the keyspace where the length is the value assigned (an integer) in the associated field. The last chunk of the task may be smaller than the defined length for completion. + - *Fixed number of chunks*: The keyspace will be divided in as many chunks as the number specified in the associated field. -- Enforce Piping (to apply rules before reject): **will be removed soon*** +- Enforce Piping (to apply rules before reject): **will be removed soon** and is therefore not explained here. ### Preconfigured tasks (including from existing task) A preconfigured tasks is a basic template for a task that is not assigned yet to a hashlist. This is particularly useful to predefine task(s) that are often use such as generic mask attack or commonly used dictionnary attack. A preconfigured task can later be assigned to a hashlist avoiding the user to redefine the same task every time. This section gives more details about this topic. When the user goes to the menu *New Preconfigured TasksThe properties of a pre-configured tasks are a subset of those of a regular task and are therefore not re-defined here. THe reader can refer to the dedicated section for reference (**put a ref here**). -Once the pre-configured task is created, the user is brought to the *Preconfigured tasks* page that lists all the existing preconfigured tasks. Here the user can set the default priority as well as the max number of agents for this preconfigured tasks (**NOTE I believe these two options should already appear in the template of a preconfigured task**). Those values will be used as defaults upon creation of a task from this template. +Once the pre-configured task is created, the user is brought to the *Preconfigured tasks* page that lists all the existing preconfigured tasks. Here the user can set the default priority as well as the maximum number of agents for this preconfigured tasks (**NOTE I believe these two options should already appear in the template of a preconfigured task**). Those values will be used as defaults upon creation of a task from this template. In addition to the possibility to delete a preconfigured task, two additional actions are offered to the user and are defined below. @@ -84,8 +129,80 @@ In the *Show Tasks* page, there is an action offered for each task, namely **Cop ### Super Task +A SuperTask is a group of pre-configured tasks. A supertask can be directly applied to a hashlist resulting in the creation of all the underlying pre-configured tasks applied to this hashlist. + +> [!CAUTION] +> A supertask cannot be applied to a superhashlist. + +This is particularly useful when applying the same attack strategy to different hashlists. + +#### New SuperTask + +Similarly to the superhashlists, this page will display all the existing pre-configured tasks. The user needs to select all the pre-configured tasks that should be included in the supertask, give it a name, and press the *create supertask* button. + +#### Overview +Once a new supertask is created, or if you open the *SuperTask* menu, the overview page of SuperTask is open. It displays the ID of all the superhashlists and their names. Three options are proposed. + +- **Apply to Hashlist**: This option open a new page in which you can select the hashlist to which you want to apply the set of pre-configured tasks as well as the binary to use. +- **Show/Hide**: This option unfolds the supertask and displays the included preconfigured task(s) with the following information/options. + - **ID**: ID of the pre-configured task + - **Name**: Name of the pre-configured task. Clicking on it opens the corresponding pre-configured task page. + - **SubTask Priority**: define the order in which the pre-configured tasks will be executed when an agent is assigned to the supertask. Similarly to tasks, priority is given to the highest number. + - **SubTask Max Agents**: similarly to tasks, specifies the maximum agents that can be assigned to the task. + - **Remove**: remove the pre-configured task from the supertask. Note that the pre-configured task is only remove from the supertask but not deleted from the system except if the related pre-configured task was generated via the *Import Super Task* functionality (see below for more details). + +#### SuperTask in the *ShowTasks* Menu + +Supertask are not displayed as regular tasks in the *Show Task* menu as displayed in the picture below. + + +
+ ![screenshot_import_file](https://upload.wikimedia.org/wikipedia/commons/8/80/Comingsoon.png?20120228065200){ width="300" } +
+ +The same information than those of a task are displayed. The *copy to Pretask* and *copy to task* options are not available. There is instead an information button which open a pop-up window displaying the list of subtasks of the supertask. This window is identical to the ShowTasks page apart that only the subtasks of the supertask are diplayed in it as shown in the figure below. + +
+ ![screenshot_import_file](https://upload.wikimedia.org/wikipedia/commons/8/80/Comingsoon.png?20120228065200){ width="300" } +
+ +### Import Super Task + +The Import Super Task menu offers functionalities to create SuperTasks and the related pre-configured task in an easy manner. There exist two different ways to create those supertasks, *Masks* and *Wordlist/Rule bulk*. + +#### Masks + +This functionality allows the user to create a supertask from a mask file or a set of masks. It is a good alternative to replace the --increment option of hashcat that cannot be use in hashtopolis. + +- **Name**: Defines the name that will be given at the created SuperTask +- **Are small tasks**: If this parameter is set to yes, a single agent can be assigned to the tasks that will be created when the resulting supertask is apply to a hashlist. This is relevant for small tasks or to assign the full keyspace in a single chunk to an agent. Note that this is **NOT** equivalent to define the *Maximum number of agents* to 1. Indeed, in this latter case, the task will still be divided in chunks according to the *chunk size* parameter. The parameter is set to No by default. +- **Max Agents**: Specify the maximum agents that can be assigned to the tasks that will be created when the resulting supertask is apply to a hashlist. If this amount is reached, future available agents will be assigned to the next task available with a lower priority even if the all the chunks of the task have been distributed. The default value of 0 means that there is no maximum and therefore, all available agents are assigned to this tasks until all the chunks have been distributed. This functionality is helpful to only use a portion of the cluster for a specific task, and therefore allowing to split the workers on different tasks. +- **Are CPU tasks**: If this parameter is set to yes, only the agents that are declared as CPU only can be assigned to this task. More details can be found in **ref to advanced agents**. The parameter is set to No by default. +- **Use Optimized flag (-O)**: If this parameter is set to Yes, the optimized flag -O will be added to the command line of all the sub-tasks of this supertask. The -O flag in Hashcat enables the use of optimized kernels for better performance. This improves cracking speed yet it has an impact on some aspects such as limiting the maximum length of the candidates to be tested, e.g. from 256 to 55 in the case of MD5 or from 256 to 27 for NTLM. +- **Benchmark Type**: Select which benchmarking type should be used for the subtasks of the supertask. It is recommended to use the default *Speed Test* for mask attack. Only in few cases, such as tasks with big salted lists, the *Runtime* may be used. +- **Cracker Binary which is used to run this task**: This parameter specifies the binary type to use for this specific task. +- **Insert Masks**: The mask lines that will generate the subtask should be written here. The expected format is the one of a *.hcmask" file for hashcat. In a nutshell, there should be one mask per line following the format **[?1,][?2,][?3,][?4,]mask**, where [?x] specifies the optional charset that can be used in the mask. More details can be found [here](https://hashcat.net/wiki/doku.php?id=mask_attack). + +A subtask will be created for each line of the the *Insert masks* text zone and they will be grouped in a supertask. The subtasks are pre-configured task from the database point of view, however they are not diplayed in the *Preconfigured Tasks* page. The subtasks that will be generated in this supertasks will be ordered accordingly to their order in the *Insert masks* text zone giving the highest priority to the first line. + +> [!NOTE] +> Note that the options above will be applied to all the pre-configured tasks that will be created during the generation of the supertaks from this import. + +#### Wordlist/Rule bulk + +The wordlist/Rule bulk functionality allows to create a set of subtasks for an iteration of several files selected by the user. It allows for example to create an attack strategy of a succession of wordlists to be applied one after the other or to use different rule files with a single wordlist. + +Most of the options are identical to those of the Mask supertask creation. The main difference is that the *Insert Masks* is obviously not present and is replaced by the *Base Command* option. In this text zone the user is expected to type the command line that should be iterated. Similarly to the *New Task* page, *#HL#* is filled in by default in the command line. It is a placeholder for the hashlist and will be replaced automatically at execution time by the agent with the correct path to the hashlist file. The user then need to select the Rules and Wordlist to use in the supertask. When selecting a file as a base - wether a Rule file, a wordlist or other - the file is immediately added at the command line like in a regular task creation. + +Multiple files are expected to be selected as "Iterate". They should be of the same type (rules/wordlists/other), yet this functionality allows to select different type of files. The placeholder **FILE** should be manually placed by the user. During creation of the supertask, one subtask is created for each file selected as iterate replacing the FILE placeholder by one of the "Iterate File". + +Similarly to a regular task, any hashcat parameter can be added to the command line. For example, if the user wants that the Optimized Kernel option (-O) is used, it should be added. That is the reason why this option is not offered to the user among the options contrary to the *Import Masks*. + + +**MAKE AN EXAMPLE WITH SOME FIGURES** -### Import Super task +> [!CAUTION] +> If the iteration is done over rule files, the flag **-r** will not be added when FILE is replaced by the rule file. It should therefore be added in the command line as displayed in the example above. ## New Binary diff --git a/doc/user_manual/user_manual.md b/doc/user_manual/user_manual.md index 64c0f92ae..70f5dcebd 100644 --- a/doc/user_manual/user_manual.md +++ b/doc/user_manual/user_manual.md @@ -147,13 +147,13 @@ In case you want to perform a dictionary attack with rules, you have to select t 9. **Status timer**: Defines the frequency with which each agent report its progress for this task to the server. The default value is defined in the Settings (**ref to settings page XXX**). -10. **Benchmark Type**: More details in the advanced section probably. +10. **Benchmark Type**: Select which benchmarking type should be used for this task. In most of the cases, it is recommended to use the default *Speed Test*. Only in few cases, such as tasks with big salted lists, the *Runtime* may be used. 11. **Task is CPU only**: If this flag is enabled, only the agents that are declared as CPU only can be assigned to this task. More details can be found in **ref to advanced agents**. The flag is disabled by default. -12. **Task is small**: If this flag is enabled, a single agent can be assigned to this task. This is relevant for small tasks or to assign the full keyspace in a single chunk to an agent. Note that this is **NOT** equivalent to define the *Maximum number of agents* to 1. Indeed, in this latter car, the task will still be divided in chunks according to the *chunk size* parameter. The flag is disabled by default. +12. **Task is small**: If this flag is enabled, a single agent can be assigned to this task. This is relevant for small tasks or to assign the full keyspace in a single chunk to an agent. Note that this is **NOT** equivalent to define the *Maximum number of agents* to 1. Indeed, in this latter case, the task will still be divided in chunks according to the *chunk size* parameter. The flag is disabled by default. -13. **Binary type to run the task**: This pair of parameters specifiy the binary type as well as the version of the binary to use for this specific task. It will by default use the latest uploaded version of the first binary type defined in the *Binaries* section (**see binaries for more details**). +13. **Binary type to run the task**: This pair of parameters specify the binary type as well as the version of the binary to use for this specific task. It will by default use the latest uploaded version of the first binary type defined in the *Binaries* section (**see binaries for more details**). Do and Don't From 16b5129009b507fb9ac1c72069dfcd3af7c8cd43 Mon Sep 17 00:00:00 2001 From: jessevz Date: Wed, 19 Mar 2025 14:26:17 +0100 Subject: [PATCH 046/691] Added the necessary includes (#1201) Co-authored-by: jessevz --- .../apiv2/common/AbstractBaseAPI.class.php | 2 ++ src/inc/apiv2/model/agents.routes.php | 26 +++++++++++++++++++ 2 files changed, 28 insertions(+) diff --git a/src/inc/apiv2/common/AbstractBaseAPI.class.php b/src/inc/apiv2/common/AbstractBaseAPI.class.php index 2afa40cf3..cf08fc4c0 100644 --- a/src/inc/apiv2/common/AbstractBaseAPI.class.php +++ b/src/inc/apiv2/common/AbstractBaseAPI.class.php @@ -299,12 +299,14 @@ protected static function getExpandPermissions(string $expand): array { $expand_to_perm_mapping = array( 'assignedAgents' => [Agent::PERM_READ], + 'assignments' => [Assignment::PERM_READ], 'agent' => [Agent::PERM_READ], 'agents' => [AccessGroup::PERM_READ], 'agentStats' => [AgentStat::PERM_READ], 'accessGroups' => [AccessGroup::PERM_READ], 'accessGroup' => [AccessGroup::PERM_READ], 'chunk' => [Chunk::PERM_READ], + 'chunks' => [Chunk::PERM_READ], 'configSection' => [ConfigSection::PERM_READ], 'crackerBinary' => [CrackerBinary::PERM_READ], 'crackerBinaryType' => [CrackerBinaryType::PERM_READ], diff --git a/src/inc/apiv2/model/agents.routes.php b/src/inc/apiv2/model/agents.routes.php index 3dbc00c1f..f451102b9 100644 --- a/src/inc/apiv2/model/agents.routes.php +++ b/src/inc/apiv2/model/agents.routes.php @@ -5,6 +5,9 @@ use DBA\AccessGroupAgent; use DBA\Agent; use DBA\AgentStat; +use DBA\Assignment; +use DBA\Chunk; +use DBA\Task; require_once(dirname(__FILE__) . "/../common/AbstractModelAPI.class.php"); @@ -40,6 +43,29 @@ public static function getToManyRelationships(): array { 'relationType' => AgentStat::class, 'relationKey' => AgentStat::AGENT_ID, ], + 'chunks' => [ + 'key' => Agent::AGENT_ID, + + 'relationType' => Chunk::class, + 'relationKey' => Chunk::AGENT_ID, + ], + 'tasks' => [ + 'key' => Agent::AGENT_ID, + + 'junctionTableType' => Assignment::class, + 'junctionTableFilterField' => Assignment::AGENT_ID, + 'junctionTableJoinField' => Assignment::TASK_ID, + + 'relationType' => Task::class, + 'relationKey' => Task::TASK_ID, + ], + 'assignments' => [ + 'key' => Agent::AGENT_ID, + + 'relationType' => Assignment::class, + 'relationKey' => Assignment::AGENT_ID, + ], + ]; } From 997900f90fa5c405dbfe14c4f9826fdd372dfdd8 Mon Sep 17 00:00:00 2001 From: jessevz Date: Tue, 25 Mar 2025 12:58:07 +0100 Subject: [PATCH 047/691] 1170 bug add missing documentation to swagger docs (#1207) * Fixed the swagger post parameter generation * Fixed return format in swagger API for POST and PATCH --------- Co-authored-by: jessevz --- .../apiv2/common/AbstractBaseAPI.class.php | 12 +++++- src/inc/apiv2/common/openAPISchema.routes.php | 38 ++++++++++++------- src/inc/apiv2/model/agents.routes.php | 2 +- src/inc/apiv2/model/crackertypes.routes.php | 8 ++++ src/inc/apiv2/model/notifications.routes.php | 7 +++- src/inc/apiv2/model/users.routes.php | 6 +++ 6 files changed, 57 insertions(+), 16 deletions(-) diff --git a/src/inc/apiv2/common/AbstractBaseAPI.class.php b/src/inc/apiv2/common/AbstractBaseAPI.class.php index cf08fc4c0..6b1a8890e 100644 --- a/src/inc/apiv2/common/AbstractBaseAPI.class.php +++ b/src/inc/apiv2/common/AbstractBaseAPI.class.php @@ -408,7 +408,7 @@ protected static function getExpandPermissions(string $expand): array DAccessControl::PUBLIC_ACCESS => array(LogEntry::PERM_READ), // src/inc/defines/notifications.php - DAccessControl::LOGIN_ACCESS => array(NotificationSetting::PERM_CREATE, NotificationSetting::PERM_READ, NotificationSetting::PERM_UPDATE, NotificationSetting::PERM_DELETE), + DAccessControl::LOGIN_ACCESS => array(NotificationSetting::PERM_CREATE, NotificationSetting::PERM_READ, NotificationSetting::PERM_UPDATE, NotificationSetting::PERM_DELETE, LogEntry::PERM_CREATE, LogEntry::PERM_DELETE, LogEntry::PERM_UPDATE), ); /** @@ -804,6 +804,16 @@ protected function validateData(array $data, array $features) } } + //function for automatic swagger doc generation + function getAllPostParameters(array $features): array { + $postFeatures = []; + foreach($features as $key => $value) { + if ($value['protected'] == False) { + $postFeatures[$key] = $value; + } + } + return $postFeatures; + } /** * Validate incoming parameter keys */ diff --git a/src/inc/apiv2/common/openAPISchema.routes.php b/src/inc/apiv2/common/openAPISchema.routes.php index f7d372306..8a475b90b 100644 --- a/src/inc/apiv2/common/openAPISchema.routes.php +++ b/src/inc/apiv2/common/openAPISchema.routes.php @@ -12,6 +12,7 @@ function typeLookup($feature): array { $type_format = null; $type_enum = null; + $sub_type = null; if ($feature['type'] == 'int') { $type = "integer"; } elseif ($feature['type'] == 'uint64') { @@ -24,6 +25,7 @@ function typeLookup($feature): array { $type = "object"; } elseif ($feature['type'] == 'array') { $type = "array"; + $sub_type = "integer"; //TODO: subtype is hardcoded because we only have int arrays } elseif ($feature['type'] == 'bool') { $type = "boolean"; } elseif (str_starts_with($feature['type'], 'str(')) { @@ -42,6 +44,7 @@ function typeLookup($feature): array { "type" => $type, "type_format" => $type_format, "type_enum" => $type_enum, + "subtype" => $sub_type ]; return $result; @@ -184,16 +187,20 @@ function makeProperties($features, $skipPK=false): array { if ($ret["type_enum"] !== null) { $propertyVal[$feature['alias']]["enum"] = $ret["type_enum"]; } + if ($ret["subtype"] !== null) { + $propertyVal[$feature['alias']]["items"]["type"] = $ret["subtype"]; + } } return $propertyVal; }; -function buildPatchPost($properties, $id=null): array { +function buildPatchPost($properties, $name, $id=null): array { $result = ["data" => [ "type" => "object", "properties" => [ "type" => [ - "type" => "string" + "type" => "string", + "default" => $name ], "attributes" => [ "type" => "object", @@ -381,18 +388,23 @@ function makeDescription($isRelation, $method, $singleObject): string { */ if (array_key_exists($name, $components) == false) { $properties_return_post_patch = [ - "id" => [ - "type" => "integer", - ], - "type" => [ - "type" => "string", - "default" => $name - ], "data" => [ "type" => "object", - "properties" => makeProperties($class->getFeaturesWithoutFormfields(), true) + "properties" => [ + "id" => [ + "type" => "integer", + ], + "type" => [ + "type" => "string", + "default" => $name + ], + "attributes" => [ + "type" => "object", + "properties" => makeProperties($class->getFeaturesWithoutFormfields(), true) + ], + ], ] - ]; + ]; $relationships = ["relationships" =>[ "type" => "object", @@ -413,9 +425,9 @@ function makeDescription($isRelation, $method, $singleObject): string { $json_api_header = makeJsonApiHeader(); $links = makeLinks($uri); $properties_return_post_patch = array_merge($json_api_header, $properties_return_post_patch); - $properties_create = buildPatchPost(makeProperties($class->getCreateValidFeatures(), true)); + $properties_create = buildPatchPost(makeProperties($class->getAllPostParameters($class->getCreateValidFeatures(), true)), $name); $properties_get = array_merge($json_api_header, $links, $properties_get_single, $included); - $properties_patch = buildPatchPost(makeProperties($class->getPatchValidFeatures(), true)); + $properties_patch = buildPatchPost(makeProperties($class->getPatchValidFeatures(), true), $name); $components[$name . "Create"] = [ diff --git a/src/inc/apiv2/model/agents.routes.php b/src/inc/apiv2/model/agents.routes.php index f451102b9..3a34348ab 100644 --- a/src/inc/apiv2/model/agents.routes.php +++ b/src/inc/apiv2/model/agents.routes.php @@ -71,7 +71,7 @@ public static function getToManyRelationships(): array { } protected function createObject(array $data): int { - assert(False, "Chunks cannot be created via API"); + assert(False, "Agents cannot be created via API"); return -1; } diff --git a/src/inc/apiv2/model/crackertypes.routes.php b/src/inc/apiv2/model/crackertypes.routes.php index 47dec3eb3..5406de7d1 100644 --- a/src/inc/apiv2/model/crackertypes.routes.php +++ b/src/inc/apiv2/model/crackertypes.routes.php @@ -37,6 +37,14 @@ public static function getToManyRelationships(): array { ]; } + function getAllPostParameters(array $features): array { + + //for documentation purposes isChunkingAVailable has to be removed + // because it is currently not setable by the user + $features = parent::getAllPostParameters($features); + unset($features[CrackerBinaryType::IS_CHUNKING_AVAILABLE]); + return $features; + } protected function createObject(array $data): int { CrackerUtils::createBinaryType($data[CrackerBinaryType::TYPE_NAME]); diff --git a/src/inc/apiv2/model/notifications.routes.php b/src/inc/apiv2/model/notifications.routes.php index 9c0646be1..c74e8d7fe 100644 --- a/src/inc/apiv2/model/notifications.routes.php +++ b/src/inc/apiv2/model/notifications.routes.php @@ -28,6 +28,11 @@ public static function getToOneRelationships(): array { ]; } + function getAllPostParameters(array $features): array { + $features = parent::getAllPostParameters($features); + unset($features[NotificationSetting::IS_ACTIVE]); + return $features; + } public function getFormFields(): array { return ['actionFilter' => ['type' => 'str(256)']]; @@ -35,7 +40,7 @@ public function getFormFields(): array { protected function createObject(array $data): int { $dummyPost = []; - switch (DNotificationType::getObjectType($data['action'])) { + switch (DNotificationType::getObjectType($data[NotificationSetting::ACTION])) { case DNotificationObjectType::USER: $dummyPost['user'] = $data['actionFilter']; break; diff --git a/src/inc/apiv2/model/users.routes.php b/src/inc/apiv2/model/users.routes.php index 492bfe3dc..de9ea5545 100644 --- a/src/inc/apiv2/model/users.routes.php +++ b/src/inc/apiv2/model/users.routes.php @@ -97,6 +97,12 @@ protected function createObject($data): int { return $objects[0]->getId(); } + function getAllPostParameters(array $features): array { + + $features = parent::getAllPostParameters($features); + unset($features[User::IS_VALID]); + return $features; + } protected function deleteObject(object $object): void { UserUtils::deleteUser($object->getId(), $this->getCurrentUser()); From 1366b80a3393ba58e4473577c0daca1385699e14 Mon Sep 17 00:00:00 2001 From: jessevz Date: Wed, 26 Mar 2025 15:02:54 +0100 Subject: [PATCH 048/691] Added functionality to add aggregated data to get requests (#1214) --- src/inc/apiv2/common/AbstractBaseAPI.class.php | 13 ++++++++++++- src/inc/apiv2/common/AbstractModelAPI.class.php | 1 + src/inc/apiv2/model/tasks.routes.php | 8 ++++++++ src/inc/utils/TaskUtils.class.php | 11 +++++++++++ 4 files changed, 32 insertions(+), 1 deletion(-) diff --git a/src/inc/apiv2/common/AbstractBaseAPI.class.php b/src/inc/apiv2/common/AbstractBaseAPI.class.php index 6b1a8890e..27a899675 100644 --- a/src/inc/apiv2/common/AbstractBaseAPI.class.php +++ b/src/inc/apiv2/common/AbstractBaseAPI.class.php @@ -120,6 +120,14 @@ protected function getFeatures(): array return $features; } + /** + * Overidable function to aggregate data in the object. Currently only used for Tasks + * returns the aggregated data in key value pairs + */ + public static function aggregateData(object $object): array { + return []; + } + /** * Take all the dba features and converts them to a list. * It uses the data from the generator and replaces the keys with the aliasses. @@ -517,6 +525,9 @@ protected function obj2Resource(object $obj, array $expandResult = []) $attributes[$feature['alias']] = $apiClass::db2json($feature, $kv[$name]); } + //TODO: only aggregate data when it has been included + $aggregatedData = $apiClass::aggregateData($obj); + $attributes = array_merge($attributes, $aggregatedData); /* Build JSON::API relationship resource */ $toManyRelationships = $apiClass::getToManyRelationships(); @@ -890,6 +901,7 @@ protected function getPrimaryKey(): string return $key; } } + throw new HTException("Internal error: no primary key found"); } function getFilters(Request $request) { @@ -899,7 +911,6 @@ function getFilters(Request $request) { /** * Check for valid filter parameters and build QueryFilter */ - // protected function makeFilter(Request $request, array $features): array protected function makeFilter(array $filters, object $apiClass): array { $qFs = []; diff --git a/src/inc/apiv2/common/AbstractModelAPI.class.php b/src/inc/apiv2/common/AbstractModelAPI.class.php index a003793ac..2ea42da21 100644 --- a/src/inc/apiv2/common/AbstractModelAPI.class.php +++ b/src/inc/apiv2/common/AbstractModelAPI.class.php @@ -159,6 +159,7 @@ protected function getPrimaryKeyOther(string $dbaClass): string return $key; } } + throw new HTException("Internal error: no primary key found"); } /** diff --git a/src/inc/apiv2/model/tasks.routes.php b/src/inc/apiv2/model/tasks.routes.php index dada4d77b..3fa73dac6 100644 --- a/src/inc/apiv2/model/tasks.routes.php +++ b/src/inc/apiv2/model/tasks.routes.php @@ -11,6 +11,7 @@ use DBA\Speed; use DBA\Task; use DBA\TaskWrapper; +use Util; require_once(dirname(__FILE__) . "/../common/AbstractModelAPI.class.php"); @@ -125,6 +126,13 @@ protected function createObject(array $data): int { return $object->getId(); } + static function aggregateData(object $object): array { + $aggregatedData["Dispatched"] = Util::showperc($object->getKeyspaceProgress(), $object->getKeyspace()); + $aggregatedData["Searched"] = Util::showperc(TaskUtils::getTaskProgress($object), $object->getKeyspace()); + + return $aggregatedData; + } + protected function deleteObject(object $object): void { TaskUtils::deleteTask($object); } diff --git a/src/inc/utils/TaskUtils.class.php b/src/inc/utils/TaskUtils.class.php index 6ba148114..29d490706 100644 --- a/src/inc/utils/TaskUtils.class.php +++ b/src/inc/utils/TaskUtils.class.php @@ -25,6 +25,7 @@ use DBA\TaskDebugOutput; use DBA\Factory; use DBA\Speed; +use DBA\Aggregation; class TaskUtils { /** @@ -1393,4 +1394,14 @@ public static function isSaturatedByOtherAgents($task, $agent) { return ($task->getIsSmall() == 1 && $numAssignments > 0) || // at least one agent is already assigned here ($task->getMaxAgents() > 0 && $numAssignments >= $task->getMaxAgents()); // at least maxAgents agents are already assigned } + + public static function getTaskProgress($task) { + $qF1 = new QueryFilter(Chunk::TASK_ID, $task->getId(), "="); + + $agg1 = new Aggregation(Chunk::CHECKPOINT, Aggregation::SUM); + $agg2 = new Aggregation(Chunk::SKIP, Aggregation::SUM); + $results = Factory::getChunkFactory()->multicolAggregationFilter([Factory::FILTER => $qF1], [$agg1, $agg2]); + $progress = $results[$agg1->getName()] - $results[$agg2->getName()]; + return $progress; + } } From a4205730595d1da3a3e49669d210ed719a34e154 Mon Sep 17 00:00:00 2001 From: jessevz Date: Thu, 27 Mar 2025 08:32:22 +0100 Subject: [PATCH 049/691] Made it possible to include hashlist and hashType from taskWrapper (#1217) Co-authored-by: jessevz --- src/inc/apiv2/model/taskwrappers.routes.php | 23 +++++++++++++++++++++ 1 file changed, 23 insertions(+) diff --git a/src/inc/apiv2/model/taskwrappers.routes.php b/src/inc/apiv2/model/taskwrappers.routes.php index 6bd5b7faa..e792ca6ef 100644 --- a/src/inc/apiv2/model/taskwrappers.routes.php +++ b/src/inc/apiv2/model/taskwrappers.routes.php @@ -2,6 +2,8 @@ use DBA\AccessGroup; use DBA\Factory; +use DBA\Hashlist; +use DBA\HashType; use DBA\JoinFilter; use DBA\QueryFilter; @@ -32,6 +34,27 @@ public static function getToOneRelationships(): array { 'relationType' => AccessGroup::class, 'relationKey' => AccessGroup::ACCESS_GROUP_ID, ], + 'hashlist' => [ + 'key' => TaskWrapper::HASHLIST_ID, + + 'relationType' => Hashlist::class, + 'relationKey' => Hashlist::HASHLIST_ID, + ], + 'hashType' => [ + 'key' => TaskWrapper::TASK_WRAPPER_ID, + 'parentKey' => TaskWrapper::TASK_WRAPPER_ID, + + 'intermediateType' => Hashlist::class, + 'joinField' => TaskWrapper::HASHLIST_ID, + 'joinFieldRelation' => Hashlist::HASHLIST_ID, + + 'junctionTableType' => Hashlist::class, + 'junctionTableFilterField' => Hashlist::HASH_TYPE_ID, + 'junctionTableJoinField' => Hashlist::HASHLIST_ID, + + 'relationType' => HashType::class, + 'relationKey' => HashType::HASH_TYPE_ID, + ], ]; } From 082ec7d338f1721e9169c5c075d4fa2ca873e1b1 Mon Sep 17 00:00:00 2001 From: gluafamichl <> Date: Thu, 27 Mar 2025 08:45:07 +0100 Subject: [PATCH 050/691] Mod: rename attributes to start with lower case character --- src/inc/apiv2/model/tasks.routes.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/inc/apiv2/model/tasks.routes.php b/src/inc/apiv2/model/tasks.routes.php index 3fa73dac6..9d494e773 100644 --- a/src/inc/apiv2/model/tasks.routes.php +++ b/src/inc/apiv2/model/tasks.routes.php @@ -127,8 +127,8 @@ protected function createObject(array $data): int { } static function aggregateData(object $object): array { - $aggregatedData["Dispatched"] = Util::showperc($object->getKeyspaceProgress(), $object->getKeyspace()); - $aggregatedData["Searched"] = Util::showperc(TaskUtils::getTaskProgress($object), $object->getKeyspace()); + $aggregatedData["dispatched"] = Util::showperc($object->getKeyspaceProgress(), $object->getKeyspace()); + $aggregatedData["searched"] = Util::showperc(TaskUtils::getTaskProgress($object), $object->getKeyspace()); return $aggregatedData; } From fb97bf9b9c3aecf1162f711ad75f0e65ee92f367 Mon Sep 17 00:00:00 2001 From: coiseiw Date: Fri, 28 Mar 2025 10:09:11 +0100 Subject: [PATCH 051/691] New structure for the doc --- doc/advanced_usage/generic_cracker.md | 0 doc/advanced_usage/slow_hashes.md | 7 - doc/faq_tips/faq.md | 18 +++ doc/faq_tips/tips.md | 5 + .../docker.md | 0 .../tls.md | 0 doc/user_manual/advanced_manual.md | 2 +- doc/user_manual/agents.md | 15 ++ doc/user_manual/basic_workflow.md | 34 +++++ doc/user_manual/crackers_binary.md | 11 ++ doc/user_manual/files.md | 81 ++++++++++ doc/user_manual/hashlist.md | 124 +++++++++++++++ doc/user_manual/hashtype.md | 13 ++ doc/user_manual/myaccount.md | 1 + doc/user_manual/settings_and_configuration.md | 28 ++++ doc/user_manual/tasks.md | 141 ++++++++++++++++++ doc/user_manual/users.md | 1 + mkdocs.yml | 20 ++- output.png | Bin 0 -> 6741 bytes 19 files changed, 486 insertions(+), 15 deletions(-) delete mode 100644 doc/advanced_usage/generic_cracker.md delete mode 100644 doc/advanced_usage/slow_hashes.md create mode 100644 doc/faq_tips/faq.md create mode 100644 doc/faq_tips/tips.md rename doc/{advanced_usage => installation_guidelines}/docker.md (100%) rename doc/{advanced_usage => installation_guidelines}/tls.md (100%) create mode 100644 doc/user_manual/agents.md create mode 100644 doc/user_manual/basic_workflow.md create mode 100644 doc/user_manual/crackers_binary.md create mode 100644 doc/user_manual/files.md create mode 100644 doc/user_manual/hashlist.md create mode 100644 doc/user_manual/hashtype.md create mode 100644 doc/user_manual/myaccount.md create mode 100644 doc/user_manual/tasks.md create mode 100644 doc/user_manual/users.md create mode 100644 output.png diff --git a/doc/advanced_usage/generic_cracker.md b/doc/advanced_usage/generic_cracker.md deleted file mode 100644 index e69de29bb..000000000 diff --git a/doc/advanced_usage/slow_hashes.md b/doc/advanced_usage/slow_hashes.md deleted file mode 100644 index 159b6c1ea..000000000 --- a/doc/advanced_usage/slow_hashes.md +++ /dev/null @@ -1,7 +0,0 @@ -# Slow Algorithms - -To extract all Hashcat modes which are flagged as slow hashes, following command can be run inside the hashcat directory: - -``` -grep -Hr SLOW_HASH src/modules/ | cut -d: -f1 | sort | cut -d'.' -f1 | sed 's/src\/modules\/module_[0]\?//g' -``` diff --git a/doc/faq_tips/faq.md b/doc/faq_tips/faq.md new file mode 100644 index 000000000..1f0935877 --- /dev/null +++ b/doc/faq_tips/faq.md @@ -0,0 +1,18 @@ +# Questions and Answers + +## Debugging MySQL queries + +Running into some funky issues? Want to see what hashtopolis is really submitting to the database? + +You can enable query logging in mysql. + +Login into the database: + +docker exec -it /bin/bash +mysql -p +# default is: hashtopolis +SET GLOBAL general_log = 'ON'; +SET GLOBAL sql_log_off = 'ON'; +exit +cd /var/lib/mysql +tail -f *.log \ No newline at end of file diff --git a/doc/faq_tips/tips.md b/doc/faq_tips/tips.md new file mode 100644 index 000000000..9c2b4233a --- /dev/null +++ b/doc/faq_tips/tips.md @@ -0,0 +1,5 @@ +# Tips + +Here are some cool tips for the users + +Q&A \ No newline at end of file diff --git a/doc/advanced_usage/docker.md b/doc/installation_guidelines/docker.md similarity index 100% rename from doc/advanced_usage/docker.md rename to doc/installation_guidelines/docker.md diff --git a/doc/advanced_usage/tls.md b/doc/installation_guidelines/tls.md similarity index 100% rename from doc/advanced_usage/tls.md rename to doc/installation_guidelines/tls.md diff --git a/doc/user_manual/advanced_manual.md b/doc/user_manual/advanced_manual.md index 92e16d300..e9fa0ccf7 100644 --- a/doc/user_manual/advanced_manual.md +++ b/doc/user_manual/advanced_manual.md @@ -5,7 +5,7 @@ This page provides more details on each functionalities described in the basic w ## Hashlists In-Depth ### Hashlists View -Ordered by ID by default. It reports the hashlists created. A tick is accolated to the name of the hashlists if all the passwords have been retrieved. It shows the number of retrieved passwords as well as the total number of hashes. It allows to import *pre-cracked hashes* or export the retrieved passwords (*see below for more details*). THe hashlists can also be archived or deleted. +Ordered by ID by default. It reports the hashlists created. A tick is accolated to the name of the hashlists if all the passwords have been retrieved. It shows the number of retrieved passwords as well as the total number of hashes. It allows to import *pre-cracked hashes* or export the retrieved passwords (*see below for more details*). The hashlists can also be archived or deleted. ### Hashlists Details If you click on a Hashlist, either in the hashlists view, in the Tasks overview or inside a task, it brings you to the corresponding Hashlist details page. diff --git a/doc/user_manual/agents.md b/doc/user_manual/agents.md new file mode 100644 index 000000000..e0fc6b39c --- /dev/null +++ b/doc/user_manual/agents.md @@ -0,0 +1,15 @@ +# Agents Overview + +Assuming you have your agents registered, you will see them in this list along with lots of useful information: + +Act This little check box enabled/disables the agent. Should a Hashcat error occur, the agent will be deactivated automatically unless 'Ignore errors' is enabled for it. +Machine Name This is the actual machine name. +Owner User name of the agent owner. +OS A little icon identifying Windows from Linux. +Devices A shortened list of detected GPU cards. Hover mouse for full text. +Last activity Tells you what, when and from what IP has the agent done last. +Important thing is that agent ID and Name are click-able, which will get you to agent detail page. On this page, you can see all of the information from before plus some more. + +Extra Parameters Agent Specific command line options (--force, --workload-profile or --gpu-temp-disable) +Trust only trusted agents will be allowed to crack tasks with secret hashlist or files +Error ignoring the agent will not be deactivated if an error occurs. \ No newline at end of file diff --git a/doc/user_manual/basic_workflow.md b/doc/user_manual/basic_workflow.md new file mode 100644 index 000000000..d1bb26587 --- /dev/null +++ b/doc/user_manual/basic_workflow.md @@ -0,0 +1,34 @@ +# Basic Workflow + +In this manual and in Hashtopolis itself, we use several terms. So let's make them clear: + +Agent: A computer running a Hashtopolis client and Hashcat doing the cracking itself. +Hashlist: A list of hashes saved in the database. Hashlist can be TEXT, HCCAPX or BINARY with most hashlists being the first category. +Task: A specific attack. Every task has a command line defining how Hashcat will be executed. Files can be assigned to a task (wordlists, rules, ...). +Supertask: A grouped number of subtasks. This task itself is not really a task, it just puts all the subtasks together so they can be viewed as one "whole" task. +Subtask: Is inside a supertask. It has the same properties like a normal task, except that it's priority is only relevant inside the supertask. +Keyspace: Every task has a predefined key space which says how big set of keys will be searched. Important note: They keyspace shown on the UI is NOT indicative of the ACTUAL keyspace for a particular attack. To find out more about how the keyspace value is derived please see the hashcat wiki. +Chunk: A chunk is a part of a keyspace assigned to a specific agent. If a chunk times out, it (or its part) will be reassigned to next free agent. +Access Management: This manages the access to functions and actions. It is used to apply a fine-grain access management. +Groups: Used to separate hashlists/tasks/agents from each other if needed. It can be used to have separate independent user groups not interfering with each other. + + +This page describes the basic workflow required to launch your first cracking task. +It provides a high-level overview of the key steps needed to get started: + +- Uploading hash lists; +- Uploading files; +- Creating a task; +- Monitoring the task and the results. +Each of these steps is covered in more detail in the advanced section **link**, but for now, this guide will walk you through the essentials to get your first task up and running. + +> [!NOTE] +> It is assumed that you have already access to a fully functional hashtopolis installation with at least one agent up and running. If it is not the case, please refer to the installation section **link**. + + + +Do and Don't +- multiple wordlists do not work +- increment do not work +- --slow-candidates may not be a good idea +- others? \ No newline at end of file diff --git a/doc/user_manual/crackers_binary.md b/doc/user_manual/crackers_binary.md new file mode 100644 index 000000000..2ddca391e --- /dev/null +++ b/doc/user_manual/crackers_binary.md @@ -0,0 +1,11 @@ +# Crackers Binary + +Hashtopolis employs distribution mechanism to ensure that every agent will have the correct cracker binary for the associated task. You can define cracker types (e.g. Hashcat) and for every type you can add as many version as you like. Make sure to keep the download URLs of the binaries up-to-date in case they change over time. The URL has to be absolute. + +When Hashtopolis was first developed it was designed to distribute tasks to multiple hashcat agent machines. As the Hashtopolis project progressed we wanted to support more than just hashcat. For example, if someone wants to distribute a specific algorithm using custom cracking software. + +Version 0.5.0 now supports multiple cracker binaries which can be used in parallel on different tasks. So for each task, you can select a binary that should be used. The client downloads the specified binary to complete the task. + +You are also able to store multiple versions of a binary. This means you can specify the exact version of a binary allowing you to run the version that gives the best performance for the hash type you are running. + +You must make sure, that the cracker binary version you want to use is compatible with the Hashtopolis agent binary (e.g. the agent binary is version aware by using specific flags/settings). Please consult the Hashtopolis agent repository README for more information on versioning. \ No newline at end of file diff --git a/doc/user_manual/files.md b/doc/user_manual/files.md new file mode 100644 index 000000000..685a7c665 --- /dev/null +++ b/doc/user_manual/files.md @@ -0,0 +1,81 @@ +# Files: Rules, Wordlist and other +When creating a password recovery task in Hashtopolis, you may need to upload additional files to the server, depending on the type of attack you want to perform. These files fall into three main categories: + +1. **Rules** + Rules files contain sets of instructions for dynamically modifying entries in a wordlist during an attack. By applying rules, you can generate variations of passwords without the need for additional wordlist files. For example, rules can: + + - Append numbers or special characters. + - Replace or capitalize specific characters. + - Reverse words or combine entries. + + Rules are commonly used alongside wordlist attacks to increase the range of password candidates efficiently. + +2. **Wordlist** + Wordlists, also known as dictionaries, are used in dictionary attacks. Each line in a wordlist is treated as a potential password candidate. Examples include: collections of commonly used passwords, specialized dictionaries tailored to a specific target or context. + +3. **Others:** + This category includes any additional files required for specific attack types or configurations. Examples include … These files vary depending on the nature of the task and the tools being used. +Files can be uploaded to the Hashtopolis server from the Files page. To begin, select the appropriate file category by clicking on one of the tabs: Rules, Wordlists, or Other. The following figure illustrates the selection of the Rules category. + +
+ ![screenshot_files](https://upload.wikimedia.org/wikipedia/commons/8/80/Comingsoon.png?20120228065200){ width="300" } +
+ +Once a category is selected, files can be added to the server using one of the following methods: + +- **Upload from your computer** – Directly upload files stored on your local machine. +- **Import from an import directory** – Use files that have been preloaded into the server’s import directory. +- **Download from a URL** – Provide a URL to fetch files from an external source. +Detailed instructions for each upload method are provided in the following subsections. + +### Upload a new file from the computer + +
+ ![screenshot_new_file](https://upload.wikimedia.org/wikipedia/commons/8/80/Comingsoon.png?20120228065200){ width="300" } +
+ +1. **Add file**: Click this button to enable file upload.. After clicking, a new field labeled Choose file will appear. Each time you click on Add File, an additional Choose file field will be added, allowing you to upload multiple files simultaneously.. +2. **Associated Access Group**: Define the access group that will have permissions to access the file(s) you are uploading. +3. **Choose file**: Click this button to open your computer’s file explorer. Select the file you wish to upload. +4. **Upload files**: Once you have selected all the files you wanted to upload, click the Upload files button. + +### Import a new file +When dealing with large files, such as wordlists, rules, or hashlists, you may encounter issues uploading them via the v1 of the Hashtopolis User Interface.. Common errors include exceeding the maximum upload size or experiencing a connection timeout. To bypass these limitations, you can use the import functionality of Hashtopolis. + +- **Copy the file to the import folder**: Place the file in the designated import directory on the Hashtopolis server. If you are using the default Docker Compose setup, you can achieve this with the following command: +``` +docker cp hashtopolis-backend:/usr/local/share/hashtopolis/import/ +``` + +- **Import the file**: + +
+ ![screenshot_import_file](https://upload.wikimedia.org/wikipedia/commons/8/80/Comingsoon.png?20120228065200){ width="300" } +
+ +1. **Associated Access Group**: Define the access group that will have permissions to access the file(s) you are uploading. +2. **Select the files to import** by ticking the box in front of them. Alternatively, use Select All below. +3. **Import files**. + +### Download new file from URL + +
+ ![screenshot_download_file](https://upload.wikimedia.org/wikipedia/commons/8/80/Comingsoon.png?20120228065200){ width="300" } +
+ +1. **Associated Access Group**: Define the access group that will have permissions to access the file(s) you are uploading. +2. **URL**: Provide the URL to download from.. +3. **Download file**. + +### Manage Files +Navigating to the Files page of the Hashtopolis User Interface, you can manage the files uploaded to the server. + +
+ ![screenshot_manage_file](https://upload.wikimedia.org/wikipedia/commons/8/80/Comingsoon.png?20120228065200){ width="300" } +
+ +1. **Select Category**. +2. **Secret**: Files that are marked as secret will only be sent to trusted agents. +Line count: Reprocess the file and update the line count with the number of lines contained in the file. +3. **Edit**: Edit the parameters of the file (name, file type and associated group). +4. **Delete**: Removes the file from Hashtopolis. diff --git a/doc/user_manual/hashlist.md b/doc/user_manual/hashlist.md new file mode 100644 index 000000000..2a86ed952 --- /dev/null +++ b/doc/user_manual/hashlist.md @@ -0,0 +1,124 @@ +# Hashlists +Hashtopolis utilizes hashlists to store password hashes you want to crack. These lists can be in plain text, HCCAPX, or binary format. Some hashes might include additional information like salts, depending on the format. +This section details the creation of a hashlist within the Hashtopolis interface. Note that at least one hashlist is required for creating tasks. +Refer to the Hashcat documentation for detailed information on supported hash types and their expected formats. You can also use the example hashes provided there as a test to create your first hashlist. + +# Create a hashlist +In the Hashtopolis web interface, navigate to *Lists > New Hashlist*. You will get the following window: + +
+ ![screenshot_hashlist](https://upload.wikimedia.org/wikipedia/commons/8/80/Comingsoon.png?20120228065200){ width="300" } +
+ +Here is how to fill in the different fields: + +1. **Name**: Provide a descriptive name for your hashlist. +2. **Hash Type**: Select the appropriate hash type from the dropdown menu. Suggestions will appear as you enter text. +3. **Hashlist Format**: Choose the format for your hashlist: + - Text File: Paste or upload a plain text file containing one hash per line. + - HCCAPX/PMKID: Upload a HCCAPX file containing password hashes. + - Binary File: Upload a binary file containing password hashes. +4. **Salted Hashes**: Tick the box related to salted hashes if appropriate and provide the correct separator for your hashlist. The flag is enabled/disabled according to the settings defined in the Hashtype section (**see hashtypes REF**). If the provided salt(s) is in hex, the following flag needs to be enabled otherwise the salt will be interpreted as an ascii value (**is it ASCII or UTF8???**). +5. **Hash source**: Select one of the following hash source types. +6. **Providing the hash**: The last field of the form will automatically adapt depending on the chosen source type. You’ll be asked to provide additional details: + - **Paste**: Copy and paste the hashes directly into the "Input" field. + - **Upload**: Select a file containing the hashes from your computer. + - **URL Download**: Provide a URL to download the hashlist. + - **Import**: This option can be used as a workaround in case of upload errors with the first version of the user interface. To import a file, first copy it to the import folder as described in the section Import a new file. +7. **Access Group**: Modify the access group associated with the hashlist if needed. +8. **Create Hashlist**: Click "Create Hashlist" to finalize the process. This will open a new page displaying the details of your newly created hashlist. + + +## Hashlists In-Depth + +### Hashlists View +Ordered by ID by default. It reports the hashlists created. A tick is accolated to the name of the hashlists if all the passwords have been retrieved. It shows the number of retrieved passwords as well as the total number of hashes. It allows to import *pre-cracked hashes* or export the retrieved passwords (*see below for more details*). The hashlists can also be archived or deleted. + +### Hashlists Details +If you click on a Hashlist, either in the hashlists view, in the Tasks overview or inside a task, it brings you to the corresponding Hashlist details page. + +Appart from the parameters specific to this hashlist (i.e. ID, Access Group, Hashlist name, ...), the page displays some information about the total number of hashes, the number of cracked ones and the number of remaining ones to be recovered. Clicking on one of these three values will open a new window displaying information about the Hashes of the Hashlist as detailed below. + +#### Hashes of Hashlist X +This page list all the hashes from the related hashlist. Filters can be applied to show either the cracked, the uncracked or all the hashes. According to the display filter selected, the Hashes only, the plaintext only or both are displayed. Additionnally, the cracking position (**to be defined**) can be displayed next to the cracked ones. Only 1000 hashes can be displayed at a time within a page but the user can navigate through the pages. The number of hashes per page can be configured in *Config > UI* settings. + +A HEX converter is present at the bottom of the page to convert any HEX values. This can be useful when the reported password is stored in a HEX format. + +#### Actions on the hashlist +Several actions are offered to the user which are detailed below. Note that some of the options are logically not available if no password have been retrieved for the specific hashlist. + +- **Download Report**: **will we still have this function** + +- **Generate Wordlist**: This action generates a file listing all the retrieved passwords from this hashlist. The file is automatically stored in the *wordlist* section of the *Files* section. The generated file can be easily retrieved as it got assigned to the latest file ID. The filename is *Wordlist_[Hashlist_ID]_[dd.mm.yyyy]_[hh.mm.ss].txt*. + +- **Export Hashes for pre-crack**: This action generates a file listing all the retrieved passwords from this hashlist associated with the corresponding hash value in the format *[hash]:[plaintext]*. The file is automatically stored in the *wordlist* section of the *Files* section. The generated file can be easily retrieved as it got assigned to the latest file ID. The filename is *Pre-cracked_[Hashlist_ID]_[dd-mm-yyyy]_[hh-mm-ss].txt*. + +- **Export Left Hashes**: This action generates a file listing all the hashes for which no password have been retrieved at the moment of the file creation. The file is automatically stored in the *wordlist* section of the *Files* section. The generated file can be easily retrieved as it got assigned to the latest file ID. The filename is *Leftlist_[Hashlist_ID]_[dd-mm-yyyy]_[hh-mm-ss].txt*. + +- **Import pre-cracked Hashes**: This action opens a new page in which the user can upload pre-cracked hashes for the related hashlist. A pre-crack is supposed to be a hash contained in the hashlist associated with a plaintext in the format *[hash](:[salt]):[plaintext]*. Such data can be imported in different ways: *"Paste, Upload, Import, URL downlaod"* such as the option to import the hashes during a hashlist creation (**see XXX**). In case of salted password, the field separator must be indicated, ':' being the default one. When validating by pressing the *Pre-crack hashes* button, the back-end will check if the imported data contains hash values from the targeted hashlist and integrate the plaintext value accordingly. If the option *Overwrite already cracked hashes* is selected, existing retrieved passworda will be overwritten by the new imported ones in case of conflict. The front-end is then reporting to the user how many hashes have been considered as well as how many entries have been updated. + +Pre-cracked management is useful to share results between different instances of hashtopolis. This is especially relevant for salted hashlits as each new recovered plaintext is improving the efficiency of the attack is there is no more hashes associated with the same salt value. + +#### Tasks overview and creation +At the bottom of the page there are three subsections related to task for this hashlist. + +- **Tasks cracking this hashlists**: This section lists all the tasks that are related to this hashlist. Note that supertasks will not appear here (**is this something we would like in the future... let see how it will be handled within project**). The details displayed are defined in the *Show Tasks* section as they are the same. Note that not all the infos present in the *Show Tasks* page are displayed here. + +- **Create pre-configured tasks**: this section lists all the existing pre-configured tasks. The user can select a set of pre-configured tasks and create the corresponding task for the current hashlist. See the section on *pre-configured tasks* for more detail on this. + +- **Create Supertask**: Similarly to the pre-configured tasks, this section lists all the existing supertask that the user can create for the current hashlist. See the section *supertask* for more details on this. + + + +### Super Hashlists + +> [!NOTE] +> Should we include pictures in this section that is quite obvious + +A Super Hashlist is a virtual hashlist that combines multiple classic hashlists without duplicating data at the database level. It allows you to run a single cracking task on multiple hashlists at once. Since the hashes are only linked, not merged, storage is optimized, and updates to individual hashlists are immediately reflected. This is especially useful when working with related datasets that require the same attack strategies, saving time and resources while keeping everything well-organized. + +#### New SuperHashlist + +The page displays all the existing hashlists in the database. To create a new superhashlist, you need to do the following: +- select all the hashlists you want to integrate in the superhashlist; +- scroll down to the bottom of the page, and enter a name for the superhashlist in the corresponding field; +- Click on the *create* button. + +You can select all the hashlists at once by clicking on the button *select all*. However, keep in mind that a superhashlist should only contains hash of the same type to work. **We should probably introduce a check at the creation of the super list, and also allow to search or filters to only display those of a specific type to select all in a controlled manner** + +#### Overview + +Once you have created a superhashlist or if you open the *SuperHashlist* menu, the overview page of SuperHaslist is open. Such page diplays all the information about the superhashlists created so far. It is very similar to the hashlist overview page, the only difference being that you cannot archive a superhashlist. + +If you click on a superhashlist, the superhashlist detail page will be open. Again this page is very similar to the hashlist page. The only difference is that it contains the following details about the hashlist(s) contained in the superhashlist: +- ID of each hashlist +- Name of each hashlist +- Cracked percentage of each hashlist + + +### Search Hash + +This page displays a free text zone in which the user can type multiple hashes, one per line, to check if they are present in the database or not. The hashes do not need to be of the same type. Furthermore, the hash does not need to be complete. + +The result will display all the hashes that correspond to the given entry/ies. It will display one block for each entry specifying either: +- NOT FOUND: if the hash is present in no entries; +- A list of all the hashes that contains the given entry, specifying in which hashlist(s) they are contained and the cleartext password if they have been cracked already. + +
+ ![screenshot_import_file](https://upload.wikimedia.org/wikipedia/commons/8/80/Comingsoon.png?20120228065200){ width="300" } +
+ +### Show Crack + +This page displays all the cracked passwords that have been retrieved and that are stored in the database. It shows the following fields. +- **Time Found**: Indicates when the password has been retrieved +- **Plaintext**: Password that has been retrieved +- **Hash**: Hash for which the password was retrieved +- **Hashlist**: ID of the hashlist that contains this hash +- **Agent**: ID of the agent that has retrieved the password +- **Task**: ID of the task that has retrieved the password +- **Chunk**: ID of the chunk that has retrieved the password +- **Type**: Hashmode related to the hash +- **Salt**: Salt associated to the hash if relevant. + +1.000 entries are displayed per page and there is a search functionalities that is applied on all the field of the table. \ No newline at end of file diff --git a/doc/user_manual/hashtype.md b/doc/user_manual/hashtype.md new file mode 100644 index 000000000..7ccd740e8 --- /dev/null +++ b/doc/user_manual/hashtype.md @@ -0,0 +1,13 @@ +# Hashtypes + +Hashcat gets constantly developed and often new hashtypes get added. To be flexible Hashtopolis provides the possibility for the server admin to add new Hashcat algorithms. Even if you use a customized Hashcat with some special algorithm. To add a new type you just need to add the -m number of Hashcat and the name of it. + +Salted says if a hash of this algorithm has a separate hash value (e.g. vBulletin), but this does not include algorithms which have the salt included in the full hash (e.g. bcrypt). This is a feature to help that when this algorithm is selected on hashlist import, the salted checkbox gets ticked automatically. + +## Slow Algorithms + +To extract all Hashcat modes which are flagged as slow hashes, following command can be run inside the hashcat directory: + +``` +grep -Hr SLOW_HASH src/modules/ | cut -d: -f1 | sort | cut -d'.' -f1 | sed 's/src\/modules\/module_[0]\?//g' +``` diff --git a/doc/user_manual/myaccount.md b/doc/user_manual/myaccount.md new file mode 100644 index 000000000..060dfc01a --- /dev/null +++ b/doc/user_manual/myaccount.md @@ -0,0 +1 @@ +# My account \ No newline at end of file diff --git a/doc/user_manual/settings_and_configuration.md b/doc/user_manual/settings_and_configuration.md index 67d922214..d4ec28bed 100644 --- a/doc/user_manual/settings_and_configuration.md +++ b/doc/user_manual/settings_and_configuration.md @@ -1,6 +1,34 @@ # Settings and Configuration +> [!NOTE] +> This page presents the settings following the structure of the updated front-end. All the settings from the old front-end are described but potentially structure in a different order. + +## Agent Settings + +### Activity / Registration + + +### Graphical Feedback + + +## Task/Chunks Settings + +### Benchmark / Chunk + +### Command Line & Misc + +### Rule Splitting + + +## Hashes/Cracks/Hashlist Settings + +## Notification Settings + +## General Settings + + + # Access Management Under construction \ No newline at end of file diff --git a/doc/user_manual/tasks.md b/doc/user_manual/tasks.md new file mode 100644 index 000000000..e00c3e37a --- /dev/null +++ b/doc/user_manual/tasks.md @@ -0,0 +1,141 @@ +# Tasks + +To create a new task, you have to navigate to *Tasks > New Task*. You will get the following window in which you can create a new task. Some of the fields are mandotory, some others are filled with default values. + +1. **Name**: provide a name for the task you want to create. This is how the task will be referenced with during the monitoring phase (see **link**) therefore it should be relatively explicit to facilitate its monitoring. + +2. **Hashlist**: select the hashlist you want to target in this specific task. Tasks are ordered by their IDs. Supertasks (**see ref to advanced usage**) are at the bottom of the list ordered by their respective IDs. + +3. **Command Line**: provide in this field the attack command that will be executed by the agent on the targeted hashlist using the selected binary (see below). Note that *#HL#* is filled in by default in the command line. It is a placeholder for the hashlist and will be replaced automatically at execution time by the agent with the correct path to the hashlist file. Therefore you should not remove it nor include the filename for the hashlist. If for example you want to perform a mask attack of 6 digits, the command line would look like ```#HL# -a3 ?d?d?d?d?d?d```. +In case you want to perform a dictionary attack with rules, you have to select the corresponding files in the right table. If it is a wordlist, select it within the right column corresponding to T/Task. The Preprocessor part is explained in the advanced section. If it is a rule file, select first the rule tab (see **ref to the picture**) and then select the desired rule file. Note that upon selection of a rule file, the name of the file is included in the command line and automatically include the required '-r' flag. + +4. **Priority**: Assign a priority number to the task. The expected value has to be an integer. Agents will be assigned to tasks in decreasing order of priority. A task with a priority 0 will not be processed even if agents are available. Default value is 0. + +5. **Maximum number of agents**: Specify the maximum agents that can be assigned to the task. If this amount is reached, future available agents will be assigned to the next task available with a lower priority even if the all the chunks of the task have been distributed. The default value of 0 means that there is no maximum and therefore, all available agents are assigned to this tasks until all the chunks have been distributed. This functionality is helpful to only use a portion of the cluster for a specific task, and therefore allowing to split the workers on different tasks. + +6. **Task Notes** - *optional*: This field allows the user to indicate some details about the tasks, the command line or any other details the user can find relevant. + +7. **Color** - *optional*: Can assign a color in a Hex color code format #RRGGBB. Default value is white #FFFFFF. This can be useful in the monitoring part to visually recognise a task or a set of tasks. + +8. **Chunk size**: This parameter defines the duration that each agent should take to process a chunk for this task (**chunk should be define at some point in the general context of hashtopolis**). The default value is defined in the Settings (**ref to settings page XXX**). + +9. **Status timer**: Defines the frequency with which each agent report its progress for this task to the server. The default value is defined in the Settings (**ref to settings page XXX**). + +10. **Benchmark Type**: Select which benchmarking type should be used for this task. In most of the cases, it is recommended to use the default *Speed Test*. Only in few cases, such as tasks with big salted lists, the *Runtime* may be used. + +11. **Task is CPU only**: If this flag is enabled, only the agents that are declared as CPU only can be assigned to this task. More details can be found in **ref to advanced agents**. The flag is disabled by default. + +12. **Task is small**: If this flag is enabled, a single agent can be assigned to this task. This is relevant for small tasks or to assign the full keyspace in a single chunk to an agent. Note that this is **NOT** equivalent to define the *Maximum number of agents* to 1. Indeed, in this latter case, the task will still be divided in chunks according to the *chunk size* parameter. The flag is disabled by default. + +13. **Binary type to run the task**: This pair of parameters specify the binary type as well as the version of the binary to use for this specific task. It will by default use the latest uploaded version of the first binary type defined in the *Binaries* section (**see binaries for more details**). + + + +## Tasks in Depth + +### Advanced option during task creation +Several options were not covered in the basic workflow related to the creation of a task. The remaining options are described below. + +- **Set as preprocessor task**: Such option allows the usage of a preprocessor. By default hashtopolis is installed with a single preprocessor, namely [*Prince*](https://github.com/hashcat/princeprocessor). Additional preprocessor can be defined in the *Config* page (see [XXX]() for more details). The command that should be used for this preprocessor must be defined in the free text zone below. A task define with a preprocessor will result in the execution of the preprocessor redirecting the output as stdin for the command line defined above in the same task. This allows the usage of "external" candidate generator such as Prince. + +- **Skip a given keyspace at the beginning of the task**: Any value X inserted here will result in ignoring the first X values of the keyspace as it would be done with the flag "-s X" inserted in the command line. The rest of the keyspace will be processed normally. This can be useful to ignore a portion of the keyspace that has been already explored during a different process, for example on a local machine. + +- **Use Static Chunking**: If this option is enabled, the regular division in chunk (based on the chunktime and the benchmark of the agent) will be ignored. An alternative division is used depending of the choice made. + - *Fixed chunk size*: Each chunk will have a portion of the keyspace where the length is the value assigned (an integer) in the associated field. The last chunk of the task may be smaller than the defined length for completion. + - *Fixed number of chunks*: The keyspace will be divided in as many chunks as the number specified in the associated field. + +- Enforce Piping (to apply rules before reject): **will be removed soon** and is therefore not explained here. + +### Preconfigured tasks (including from existing task) +A preconfigured tasks is a basic template for a task that is not assigned yet to a hashlist. This is particularly useful to predefine task(s) that are often use such as generic mask attack or commonly used dictionnary attack. A preconfigured task can later be assigned to a hashlist avoiding the user to redefine the same task every time. This section gives more details about this topic. + +When the user goes to the menu *New Preconfigured TasksThe properties of a pre-configured tasks are a subset of those of a regular task and are therefore not re-defined here. THe reader can refer to the dedicated section for reference (**put a ref here**). + +Once the pre-configured task is created, the user is brought to the *Preconfigured tasks* page that lists all the existing preconfigured tasks. Here the user can set the default priority as well as the maximum number of agents for this preconfigured tasks (**NOTE I believe these two options should already appear in the template of a preconfigured task**). Those values will be used as defaults upon creation of a task from this template. + +In addition to the possibility to delete a preconfigured task, two additional actions are offered to the user and are defined below. + +- **Copy to task**: This action opens a *new task* creaction page where all the pre-defined values of the preconfigured task are already prefilled. The user must select the hashlist for which the task should be created. All the other values can be modified by the user if needed. Note that there is the possibility to create a task from a pretask for a specific hashlist directly from the corresponding *Hashlist details* page. + +- **Copy to Pretask**: This action open a *New Preconfigured Tasks* Page where all the value of the corresponding pretask are duplicated. The user can then modify those values to create a new Preconfigured tasks. This is particularly useful if one want to slightly modify an existing preconfigured task, for example by adding a new placeholder in a mask or changing a rule file in a dictionnary attack. Note that while it is possible to create a perfect duplicate of a pretask there is no added-value in doing-so. + +#### Creating a preconfigured task from a task +In the *Show Tasks* page, there is an action offered for each task, namely **Copy to Pretask**. This option will create a template from the corresponding task by extracting all the required information. The default name extracted will be the current one from the task. The user can modify at will those values and finally create the preconfigured task from it. This is useful in case you have defined an attack that you want to store for future reuse. + + +### Super Task + +A SuperTask is a group of pre-configured tasks. A supertask can be directly applied to a hashlist resulting in the creation of all the underlying pre-configured tasks applied to this hashlist. + +> [!CAUTION] +> A supertask cannot be applied to a superhashlist. + +This is particularly useful when applying the same attack strategy to different hashlists. + +#### New SuperTask + +Similarly to the superhashlists, this page will display all the existing pre-configured tasks. The user needs to select all the pre-configured tasks that should be included in the supertask, give it a name, and press the *create supertask* button. + +#### Overview +Once a new supertask is created, or if you open the *SuperTask* menu, the overview page of SuperTask is open. It displays the ID of all the superhashlists and their names. Three options are proposed. + +- **Apply to Hashlist**: This option open a new page in which you can select the hashlist to which you want to apply the set of pre-configured tasks as well as the binary to use. +- **Show/Hide**: This option unfolds the supertask and displays the included preconfigured task(s) with the following information/options. + - **ID**: ID of the pre-configured task + - **Name**: Name of the pre-configured task. Clicking on it opens the corresponding pre-configured task page. + - **SubTask Priority**: define the order in which the pre-configured tasks will be executed when an agent is assigned to the supertask. Similarly to tasks, priority is given to the highest number. + - **SubTask Max Agents**: similarly to tasks, specifies the maximum agents that can be assigned to the task. + - **Remove**: remove the pre-configured task from the supertask. Note that the pre-configured task is only remove from the supertask but not deleted from the system except if the related pre-configured task was generated via the *Import Super Task* functionality (see below for more details). + +#### SuperTask in the *ShowTasks* Menu + +Supertask are not displayed as regular tasks in the *Show Task* menu as displayed in the picture below. + + +
+ ![screenshot_import_file](https://upload.wikimedia.org/wikipedia/commons/8/80/Comingsoon.png?20120228065200){ width="300" } +
+ +The same information than those of a task are displayed. The *copy to Pretask* and *copy to task* options are not available. There is instead an information button which open a pop-up window displaying the list of subtasks of the supertask. This window is identical to the ShowTasks page apart that only the subtasks of the supertask are diplayed in it as shown in the figure below. + +
+ ![screenshot_import_file](https://upload.wikimedia.org/wikipedia/commons/8/80/Comingsoon.png?20120228065200){ width="300" } +
+ +### Import Super Task + +The Import Super Task menu offers functionalities to create SuperTasks and the related pre-configured task in an easy manner. There exist two different ways to create those supertasks, *Masks* and *Wordlist/Rule bulk*. + +#### Masks + +This functionality allows the user to create a supertask from a mask file or a set of masks. It is a good alternative to replace the --increment option of hashcat that cannot be use in hashtopolis. + +- **Name**: Defines the name that will be given at the created SuperTask +- **Are small tasks**: If this parameter is set to yes, a single agent can be assigned to the tasks that will be created when the resulting supertask is apply to a hashlist. This is relevant for small tasks or to assign the full keyspace in a single chunk to an agent. Note that this is **NOT** equivalent to define the *Maximum number of agents* to 1. Indeed, in this latter case, the task will still be divided in chunks according to the *chunk size* parameter. The parameter is set to No by default. +- **Max Agents**: Specify the maximum agents that can be assigned to the tasks that will be created when the resulting supertask is apply to a hashlist. If this amount is reached, future available agents will be assigned to the next task available with a lower priority even if the all the chunks of the task have been distributed. The default value of 0 means that there is no maximum and therefore, all available agents are assigned to this tasks until all the chunks have been distributed. This functionality is helpful to only use a portion of the cluster for a specific task, and therefore allowing to split the workers on different tasks. +- **Are CPU tasks**: If this parameter is set to yes, only the agents that are declared as CPU only can be assigned to this task. More details can be found in **ref to advanced agents**. The parameter is set to No by default. +- **Use Optimized flag (-O)**: If this parameter is set to Yes, the optimized flag -O will be added to the command line of all the sub-tasks of this supertask. The -O flag in Hashcat enables the use of optimized kernels for better performance. This improves cracking speed yet it has an impact on some aspects such as limiting the maximum length of the candidates to be tested, e.g. from 256 to 55 in the case of MD5 or from 256 to 27 for NTLM. +- **Benchmark Type**: Select which benchmarking type should be used for the subtasks of the supertask. It is recommended to use the default *Speed Test* for mask attack. Only in few cases, such as tasks with big salted lists, the *Runtime* may be used. +- **Cracker Binary which is used to run this task**: This parameter specifies the binary type to use for this specific task. +- **Insert Masks**: The mask lines that will generate the subtask should be written here. The expected format is the one of a *.hcmask" file for hashcat. In a nutshell, there should be one mask per line following the format **[?1,][?2,][?3,][?4,]mask**, where [?x] specifies the optional charset that can be used in the mask. More details can be found [here](https://hashcat.net/wiki/doku.php?id=mask_attack). + +A subtask will be created for each line of the the *Insert masks* text zone and they will be grouped in a supertask. The subtasks are pre-configured task from the database point of view, however they are not diplayed in the *Preconfigured Tasks* page. The subtasks that will be generated in this supertasks will be ordered accordingly to their order in the *Insert masks* text zone giving the highest priority to the first line. + +> [!NOTE] +> Note that the options above will be applied to all the pre-configured tasks that will be created during the generation of the supertaks from this import. + +#### Wordlist/Rule bulk + +The wordlist/Rule bulk functionality allows to create a set of subtasks for an iteration of several files selected by the user. It allows for example to create an attack strategy of a succession of wordlists to be applied one after the other or to use different rule files with a single wordlist. + +Most of the options are identical to those of the Mask supertask creation. The main difference is that the *Insert Masks* is obviously not present and is replaced by the *Base Command* option. In this text zone the user is expected to type the command line that should be iterated. Similarly to the *New Task* page, *#HL#* is filled in by default in the command line. It is a placeholder for the hashlist and will be replaced automatically at execution time by the agent with the correct path to the hashlist file. The user then need to select the Rules and Wordlist to use in the supertask. When selecting a file as a base - wether a Rule file, a wordlist or other - the file is immediately added at the command line like in a regular task creation. + +Multiple files are expected to be selected as "Iterate". They should be of the same type (rules/wordlists/other), yet this functionality allows to select different type of files. The placeholder **FILE** should be manually placed by the user. During creation of the supertask, one subtask is created for each file selected as iterate replacing the FILE placeholder by one of the "Iterate File". + +Similarly to a regular task, any hashcat parameter can be added to the command line. For example, if the user wants that the Optimized Kernel option (-O) is used, it should be added. That is the reason why this option is not offered to the user among the options contrary to the *Import Masks*. + + +**MAKE AN EXAMPLE WITH SOME FIGURES** + +> [!CAUTION] +> If the iteration is done over rule files, the flag **-r** will not be added when FILE is replaced by the rule file. It should therefore be added in the command line as displayed in the example above. \ No newline at end of file diff --git a/doc/user_manual/users.md b/doc/user_manual/users.md new file mode 100644 index 000000000..76e7c2365 --- /dev/null +++ b/doc/user_manual/users.md @@ -0,0 +1 @@ +# Users diff --git a/mkdocs.yml b/mkdocs.yml index c6d4852a3..946294480 100644 --- a/mkdocs.yml +++ b/mkdocs.yml @@ -7,15 +7,21 @@ nav: - Installation Guidelines: - installation_guidelines/basic_install.md - installation_guidelines/advanced_install.md + - installation_guidelines/tls.md + - installation_guidelines/docker.md - User Manual: - - user_manual/user_manual.md - - user_manual/advanced_manual.md + - user_manual/basic_workflow.md + - user_manual/agents.md + - user_manual/tasks.md + - user_manual/hashlist.md + - user_manual/files.md + - user_manual/crackers_binary.md + - user_manual/myaccount.md - user_manual/settings_and_configuration.md - - Advanced Usage: - - advanced_usage/tls.md - - advanced_usage/docker.md - - advanced_usage/generic_cracker.md - - advanced_usage/slow_hashes.md + - user_manual/users.md + - FAQ and Tips: + - faq_tips/faq.md + - faq_tips/tips.md - changelog.md - API Reference: - APIv2: apiv2.md diff --git a/output.png b/output.png new file mode 100644 index 0000000000000000000000000000000000000000..93fa774eca0e8b092171fcc4d24448b6fbb1a4da GIT binary patch literal 6741 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
    %D8g{Te*PusH2V)HsqJ zvX9j~6QnV!B5j;so{^XHc>b1-0>hXt_%Qth(o)JX7AV$)>CPrN7~eW*0H9-5Yfxc*oe8 z6&_IR7Th2GU_z9xxd*?QXkJbDVDy-DZA-XpR`dASmHcmEy5<~VI>DW|U-J@XUwh-= zmX!hkfwDLuU+aickILDKSbfsuM$Qb_5O_Zg4(D-CRz*F$b(_1WUQPUpR@$V3+Zi4w3TZ=!O zlInB|7y^;Rr~M34!>0>iu~kvCkeRu;NEFKPURtXcQea?U+{; z67Mc77}<%?wVliur#|%)DlIL2|M_$D-k!7La?A8~LrF==T;1ELwQ*oH(lI8yk0P{A#NxZy zk6qQUZsW@Qgap#SK+W`uiKV63tNl)>j*iY;XRyrfdkon(Z`eUytE(L@HWXI_8n&t) z9>PF#l0ZPoVFB=0Q{aWrC-uTH*pJcCQG5adIYUDTCty!h7P{L0S zdnudtJFdvc$&o6e1mr~g%U6JN@};s;B`8R$KLN0V(i#dEfEE{U$dG1A%_i~I1M!vv z@r>Jhd&(9T50f7ohNPJJMh%ysU48wbo{~Iv&o1P?-?MXaVhk)dtnIhE z`18k;LCT*BK??1UqI@&~IDIP6pikq#^zq@ZZf{9_e0)C6!d{l>`kpQOB&MVwa0qEY zpws=;go%mgpOTZU0I>Ks<^#~;azfFjuvU2zEFkxR`-{8oIqJslZgUf0~V;j(` zn(!fti;KsuIyyRF<0vS%urMVA0tuCIm{nm_)HJ|BUug3ZuAn3oE5EX?45@7;J z{EhivnU71m#F9izVixMi})TgifbakmRGBb5_ zb;H;-l0l%Iot=pvKf-|0u06n}_}I5unTLxD2_#m`Jy!Sj_5kf9=kE_o<~NU@%vZsB zU;st`g~!wdj3#Vv+i_BX%M7Y9fyDuCMhF6dH&bR93Iq$4iVvFun}uwyuZM)t7_i zVXJz`(6?_b8+T9G*m~Cos#}>2lB?cMaR3$s$t?;X*}jE?-HBXRV^~5` zQcy}t3Ul^zFhFtu|28!lY~6V6&InFUPQEHl^78WZ6aXB#kth3Y){{4|UP#=yD3)Vd zW25+Mp?SuyrLZG^ysWIORG1exP#t(%%n|r>*}#H?0Gj*qg_DY!nwg7>psS1MBrlJp zps>)e(fyVC&83%!h{)RE0JL!%&d6d{B=lw!6!0-I@vleOffPQgLE?G&`PIOF|5Ky( zE$C79dW=gU5K#Do`+B3HK`7=p2TIe7`1R}cFwkZJ* zr0JXa_3>4XJD+W)y9iNoXj=Som!xE590e%I2snSk7Ei8?{r&O5zuj$sLO1fgP$TW~ o(mw`@*t|zmOTxeFDBnT{eypt$mjnp_fAN6Sl(ZEq Date: Fri, 28 Mar 2025 14:18:17 +0100 Subject: [PATCH 052/691] updated paths for doc builds of api and php doc --- .github/workflows/docs.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/docs.yml b/.github/workflows/docs.yml index 0a7b9353d..60889efcd 100644 --- a/.github/workflows/docs.yml +++ b/.github/workflows/docs.yml @@ -31,11 +31,11 @@ jobs: - name: Download newest apiv2 spec run: | wget http://localhost:8080/api/v2/openapi.json -P /tmp/ - openapi-to-md /tmp/openapi.json /docs/api/ + openapi-to-md /tmp/openapi.json ./doc/api/ - name: Create function level documentation with phpdocumentor run: | wget https://phpdoc.org/phpDocumentor.phar -P /tmp/ - sudo php /tmp/phpDocumentor.phar --ignore vendor/ -d . -t /docs/php-documentor/ + sudo php /tmp/phpDocumentor.phar --ignore vendor/ -d . -t ./doc/php-documentor/ - name: Build MkDocs site run: | mkdocs build @@ -45,4 +45,4 @@ jobs: FTP_USERNAME: ${{ secrets.FTP_USERNAME }} FTP_PASSWORD: ${{ secrets.FTP_PASSWORD }} run: | - lftp -e "mirror -R site/ /; quit" -u $FTP_USERNAME,$FTP_PASSWORD $FTP_SERVER \ No newline at end of file + lftp -e "mirror -R site/ /; quit" -u $FTP_USERNAME,$FTP_PASSWORD $FTP_SERVER From bbed4fd47ab0ce894c636e66c91475034cb2ee9f Mon Sep 17 00:00:00 2001 From: Sein Coray Date: Fri, 28 Mar 2025 14:55:54 +0100 Subject: [PATCH 053/691] debug workflow openapi download issue --- .github/workflows/docs.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/docs.yml b/.github/workflows/docs.yml index 60889efcd..9646c0358 100644 --- a/.github/workflows/docs.yml +++ b/.github/workflows/docs.yml @@ -31,6 +31,7 @@ jobs: - name: Download newest apiv2 spec run: | wget http://localhost:8080/api/v2/openapi.json -P /tmp/ + cat /tmp/openapi.json openapi-to-md /tmp/openapi.json ./doc/api/ - name: Create function level documentation with phpdocumentor run: | From 0eaae28ee7dd25faae71b2367c2c142a216e7023 Mon Sep 17 00:00:00 2001 From: jessevz Date: Tue, 1 Apr 2025 08:41:27 +0200 Subject: [PATCH 054/691] Added a __in filter to query on multiple values --- .../apiv2/common/AbstractBaseAPI.class.php | 145 ++++++++++-------- 1 file changed, 82 insertions(+), 63 deletions(-) diff --git a/src/inc/apiv2/common/AbstractBaseAPI.class.php b/src/inc/apiv2/common/AbstractBaseAPI.class.php index 27a899675..dce8bf7fd 100644 --- a/src/inc/apiv2/common/AbstractBaseAPI.class.php +++ b/src/inc/apiv2/common/AbstractBaseAPI.class.php @@ -40,7 +40,7 @@ use DBA\User; use DBA\Factory; -use DBA\OrderFilter; +use DBA\ContainFilter; use DBA\LikeFilter; use DBA\LikeFilterInsensitive; use DBA\LogEntry; @@ -918,7 +918,7 @@ protected function makeFilter(array $filters, object $apiClass): array $factory = $apiClass->getFactory(); foreach ($filters as $filter => $value) { - if (preg_match('/^(?P[_a-zA-Z0-9]+?)(?|__eq|__ne|__lt|__lte|__gt|__gte|__contains|__startswith|__endswith|__icontains|__istartswith|__iendswith)$/', $filter, $matches) == 0) { + if (preg_match('/^(?P[_a-zA-Z0-9]+?)(?|__eq|__ne|__lt|__lte|__gt|__gte|__contains|__startswith|__endswith|__icontains|__istartswith|__iendswith|__in)$/', $filter, $matches) == 0) { throw new HTException("Filter parameter '" . $filter . "' is not valid"); } @@ -928,76 +928,95 @@ protected function makeFilter(array $filters, object $apiClass): array if (array_key_exists($cast_key, $features) == false) { throw new HTException("Filter parameter '" . $filter . "' is not valid (key not valid field)"); }; + + $valueList = explode(",", $value); // TODO Merge/Combine with validate parameters - switch($features[$cast_key]['type']) { - case 'bool': - $val = filter_var($value, FILTER_VALIDATE_BOOLEAN, FILTER_NULL_ON_FAILURE); - if (is_null($val)) { - throw new HTException("Filter parameter '" . $filter . "' is not valid boolean value"); - } - break; - case 'int': - $val = filter_var($value, FILTER_VALIDATE_INT, FILTER_NULL_ON_FAILURE); - if (is_null($val)) { - throw new HTException("Filter parameter '" . $filter . "' is not valid integer value"); - } - default: - $val = $value; - } + foreach($valueList as $value) { + switch($features[$cast_key]['type']) { + case 'bool': + $value = filter_var($value, FILTER_VALIDATE_BOOLEAN, FILTER_NULL_ON_FAILURE); + if (is_null($value)) { + throw new HTException("Filter parameter '" . $filter . "' is not valid boolean value"); + } + break; + case 'int': + $value = filter_var($value, FILTER_VALIDATE_INT, FILTER_NULL_ON_FAILURE); + if (is_null($value)) { + throw new HTException("Filter parameter '" . $filter . "' is not valid integer value"); + } + } + } // We need to remap any aliased key to the key as it appears in the database. $remappedKey = $features[$cast_key]['dbname']; - switch($matches['operator']) { - case '': - case '__eq': - $operator = '='; - break; - case '__ne': - $operator = '!='; - break; - case '__lt': - $operator = '<'; - break; - case '__lte': - $operator = '<='; - break; - case '__gt': - $operator = '>'; - break; - case '__gte': - $operator = '>='; - break; - case '__contains': - array_push($qFs, new LikeFilter($remappedKey, "%" . $val . "%", $factory)); - break; - case '__startswith': - array_push($qFs, new LikeFilter($remappedKey, $val . "%", $factory)); - break; - case '__endswith': - array_push($qFs, new LikeFilter($remappedKey, "%" . $val, $factory)); - break; - case '__icontains': - array_push($qFs, new LikeFilterInsensitive($remappedKey, "%" . $val . "%", $factory)); - break; - case '__istartswith': - array_push($qFs, new LikeFilterInsensitive($remappedKey, $val . "%", $factory)); - break; - case '__iendswith': - array_push($qFs, new LikeFilterInsensitive($remappedKey, "%" . $val, $factory)); - break; - default: - assert(False, "Operator '" . $matches['operator'] . "' not implemented"); - } + $amount_values = count($valueList); + $val = ($amount_values === 1) ? $valueList[0] : $valueList; + //filters on single values + if ($amount_values === 1) { + switch($matches['operator']) { + case '': + case '__eq': + $operator = '='; + break; + case '__ne': + $operator = '!='; + break; + case '__lt': + $operator = '<'; + break; + case '__lte': + $operator = '<='; + break; + case '__gt': + $operator = '>'; + break; + case '__gte': + $operator = '>='; + break; + case '__contains': + array_push($qFs, new LikeFilter($remappedKey, "%" . $val . "%", $factory)); + break; + case '__startswith': + array_push($qFs, new LikeFilter($remappedKey, $val . "%", $factory)); + break; + case '__endswith': + array_push($qFs, new LikeFilter($remappedKey, "%" . $val, $factory)); + break; + case '__icontains': + array_push($qFs, new LikeFilterInsensitive($remappedKey, "%" . $val . "%", $factory)); + break; + case '__istartswith': + array_push($qFs, new LikeFilterInsensitive($remappedKey, $val . "%", $factory)); + break; + case '__iendswith': + array_push($qFs, new LikeFilterInsensitive($remappedKey, "%" . $val, $factory)); + break; + default: + assert(False, "Operator '" . $matches['operator'] . "' not implemented for single values"); + } - if ($operator) { - if (array_key_exists($val, $features)) { - array_push($qFs, new ComparisonFilter($remappedKey, $val, $operator, $factory)); - } else { - array_push($qFs, new QueryFilter($remappedKey, $val, $operator, $factory)); + if ($operator) { + if (array_key_exists($val, $features)) { + array_push($qFs, new ComparisonFilter($remappedKey, $val, $operator, $factory)); + } else { + array_push($qFs, new QueryFilter($remappedKey, $val, $operator, $factory)); + } + } + + //filters on lists + } else { + switch($matches['operator']) { + case '': + case '__in': + array_push($qFs, new ContainFilter($remappedKey, $val, $factory)); + break; + default: + assert(False, "Operator '" . $matches['operator'] . "' not implemented for list values"); } } + } return $qFs; } From 7737c4b5dcd43235692844ba4586379415443f51 Mon Sep 17 00:00:00 2001 From: jessevz Date: Tue, 1 Apr 2025 09:50:30 +0200 Subject: [PATCH 055/691] Fixed bug where values in loop werent properly updated --- src/inc/apiv2/common/AbstractBaseAPI.class.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/inc/apiv2/common/AbstractBaseAPI.class.php b/src/inc/apiv2/common/AbstractBaseAPI.class.php index dce8bf7fd..34b097a15 100644 --- a/src/inc/apiv2/common/AbstractBaseAPI.class.php +++ b/src/inc/apiv2/common/AbstractBaseAPI.class.php @@ -932,7 +932,7 @@ protected function makeFilter(array $filters, object $apiClass): array $valueList = explode(",", $value); // TODO Merge/Combine with validate parameters - foreach($valueList as $value) { + foreach($valueList as &$value) { switch($features[$cast_key]['type']) { case 'bool': $value = filter_var($value, FILTER_VALIDATE_BOOLEAN, FILTER_NULL_ON_FAILURE); From 3f078e050b966abfa15b294994bf900c51582f78 Mon Sep 17 00:00:00 2001 From: jessevz Date: Tue, 1 Apr 2025 16:16:05 +0200 Subject: [PATCH 056/691] Added more calculations for task page in the backend (#1231) --- src/inc/apiv2/model/logentries.routes.php | 23 ++--------------- src/inc/apiv2/model/tasks.routes.php | 31 +++++++++++++++++++++-- 2 files changed, 31 insertions(+), 23 deletions(-) diff --git a/src/inc/apiv2/model/logentries.routes.php b/src/inc/apiv2/model/logentries.routes.php index 4f54db093..0c184b3ac 100644 --- a/src/inc/apiv2/model/logentries.routes.php +++ b/src/inc/apiv2/model/logentries.routes.php @@ -18,27 +18,8 @@ public static function getDBAclass(): string { } protected function createObject(array $data): int { - Util::createLogEntry( - $data[LogEntry::ISSUER], - $data[LogEntry::ISSUER_ID], - $data[LogEntry::LEVEL], - $data[LogEntry::MESSAGE] - ); - - /* On succesfully insert, return ID */ - $qFs = [ - new QueryFilter(LogEntry::ISSUER, $data[LogEntry::ISSUER], '='), - new QueryFilter(LogEntry::ISSUER_ID, $data[LogEntry::ISSUER_ID], '='), - new QueryFilter(LogEntry::LEVEL, $data[LogEntry::LEVEL], '='), - new QueryFilter(LogEntry::MESSAGE, $data[LogEntry::MESSAGE], '=') - ]; - - /* Hackish way to retreive object since Id is not returned on creation */ - $oF = new OrderFilter(LogEntry::TIME, "DESC"); - $objects = $this->getFactory()->filter([Factory::FILTER => $qFs, Factory::ORDER => $oF]); - assert(count($objects) == 1); - - return $objects[0]->getId(); + assert(False, "Logentries cannot be created via API"); + return -1; } protected function deleteObject(object $object): void { diff --git a/src/inc/apiv2/model/tasks.routes.php b/src/inc/apiv2/model/tasks.routes.php index 9d494e773..a21ddfb4c 100644 --- a/src/inc/apiv2/model/tasks.routes.php +++ b/src/inc/apiv2/model/tasks.routes.php @@ -3,11 +3,13 @@ use DBA\Agent; use DBA\Assignment; +use DBA\Chunk; use DBA\CrackerBinary; use DBA\CrackerBinaryType; use DBA\File; use DBA\FileTask; use DBA\Hashlist; +use DBA\QueryFilter; use DBA\Speed; use DBA\Task; use DBA\TaskWrapper; @@ -126,9 +128,34 @@ protected function createObject(array $data): int { return $object->getId(); } + //TODO make aggregate data queryable and not included by default static function aggregateData(object $object): array { - $aggregatedData["dispatched"] = Util::showperc($object->getKeyspaceProgress(), $object->getKeyspace()); - $aggregatedData["searched"] = Util::showperc(TaskUtils::getTaskProgress($object), $object->getKeyspace()); + $keyspace = $object->getKeyspace(); + $keyspaceProgress = $object->getKeyspaceProgress(); + + $aggregatedData["dispatched"] = Util::showperc($keyspaceProgress, $keyspace); + $aggregatedData["searched"] = Util::showperc(TaskUtils::getTaskProgress($object), $keyspace); + + $qF = new QueryFilter(Chunk::TASK_ID, $object->getId(), "="); + $chunks = Factory::getChunkFactory()->filter([Factory::FILTER => $qF]); + + $activeAgents = []; + foreach($chunks as $chunk) { + if (time() - max($chunk->getSolveTime(), $chunk->getDispatchTime()) < SConfig::getInstance()->getVal(DConfig::CHUNK_TIMEOUT) && $chunk->getProgress() < 10000) { + $activeAgents[$chunk->getAgentId()] = true; + } + } + + //status 1 is running, 2 is idle and 3 is completed + $status = 2; + if ($keyspaceProgress >= $keyspace && $keyspaceProgress > 0) { + $status = 3; + } elseif (count($activeAgents) > 0) { + $status = 1; + } + + $aggregatedData["activeAgents"] = array_keys($activeAgents); + $aggregatedData["status"] = $status; return $aggregatedData; } From 34bf918df7f9721b0e1e7ec263bbdffe15d2db28 Mon Sep 17 00:00:00 2001 From: Sein Coray Date: Tue, 1 Apr 2025 16:24:01 +0200 Subject: [PATCH 057/691] typo fix in readme --- doc/README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/doc/README.md b/doc/README.md index c7fea709c..3c9bdf60f 100644 --- a/doc/README.md +++ b/doc/README.md @@ -1,6 +1,6 @@ # Documentation Development -This page describes howto use the documentation locally or how to contribute to it. +This page describes how to use the documentation locally or how to contribute to it. ## Setup From 429e1eb242747515480ea2776b66283c4ba96df6 Mon Sep 17 00:00:00 2001 From: Sein Coray Date: Wed, 2 Apr 2025 09:13:13 +0200 Subject: [PATCH 058/691] few typo fixes --- doc/user_manual/advanced_manual.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/doc/user_manual/advanced_manual.md b/doc/user_manual/advanced_manual.md index e9fa0ccf7..16bc87a22 100644 --- a/doc/user_manual/advanced_manual.md +++ b/doc/user_manual/advanced_manual.md @@ -13,7 +13,7 @@ If you click on a Hashlist, either in the hashlists view, in the Tasks overview Appart from the parameters specific to this hashlist (i.e. ID, Access Group, Hashlist name, ...), the page displays some information about the total number of hashes, the number of cracked ones and the number of remaining ones to be recovered. Clicking on one of these three values will open a new window displaying information about the Hashes of the Hashlist as detailed below. #### Hashes of Hashlist X -This page list all the hashes from the related hashlist. Filters can be applied to show either the cracked, the uncracked or all the hashes. According to the display filter selected, the Hashes only, the plaintext only or both are displayed. Additionnally, the cracking position (**to be defined**) can be displayed next to the cracked ones. Only 1000 hashes can be displayed at a time within a page but the user can navigate through the pages. The number of hashes per page can be configured in *Config > UI* settings. +This page list all the hashes from the related hashlist. Filters can be applied to show either the cracked, the uncracked or all the hashes. According to the display filter selected, the Hashes only, the plaintext only or both are displayed. Additionally, the cracking position (**to be defined**) can be displayed next to the cracked ones. Only 1000 hashes can be displayed at a time within a page but the user can navigate through the pages. The number of hashes per page can be configured in *Config > UI* settings. A HEX converter is present at the bottom of the page to convert any HEX values. This can be useful when the reported password is stored in a HEX format. @@ -100,7 +100,7 @@ This page displays all the cracked passwords that have been retrieved and that a ### Advanced option during task creation Several options were not covered in the basic workflow related to the creation of a task. The remaining options are described below. -- **Set as preprocessor task**: Such option allows the usage of a preprocessor. By default hashtopolis is installed with a single preprocessor, namely [*Prince*](https://github.com/hashcat/princeprocessor). Additional preprocessor can be defined in the *Config* page (see [XXX]() for more details). The command that should be used for this preprocessor must be defined in the free text zone below. A task define with a preprocessor will result in the execution of the preprocessor redirecting the output as stdin for the command line defined above in the same task. This allows the usage of "external" candidate generator such as Prince. +- **Set as preprocessor task**: Such option allows the usage of a preprocessor. By default hashtopolis is installed with a single preprocessor, namely [*Prince*](https://github.com/hashcat/princeprocessor). $Additional preprocessors can be defined in the *Config* page (see [XXX]() for more details). The command that should be used for this preprocessor must be defined in the free text zone below. A task defined with a preprocessor will result in the execution of the preprocessor redirecting the output as stdin for the command line defined above in the same task. This allows the usage of "external" candidate generator such as Prince. - **Skip a given keyspace at the beginning of the task**: Any value X inserted here will result in ignoring the first X values of the keyspace as it would be done with the flag "-s X" inserted in the command line. The rest of the keyspace will be processed normally. This can be useful to ignore a portion of the keyspace that has been already explored during a different process, for example on a local machine. From bf3d8c3187ba9be6c2be515f71f31c4e1711d69a Mon Sep 17 00:00:00 2001 From: jessevz Date: Wed, 2 Apr 2025 12:17:23 +0200 Subject: [PATCH 059/691] Reowkred filtering and added a NOT IN filter --- .../apiv2/common/AbstractBaseAPI.class.php | 119 +++++++++--------- 1 file changed, 56 insertions(+), 63 deletions(-) diff --git a/src/inc/apiv2/common/AbstractBaseAPI.class.php b/src/inc/apiv2/common/AbstractBaseAPI.class.php index 34b097a15..1396b25c5 100644 --- a/src/inc/apiv2/common/AbstractBaseAPI.class.php +++ b/src/inc/apiv2/common/AbstractBaseAPI.class.php @@ -918,7 +918,7 @@ protected function makeFilter(array $filters, object $apiClass): array $factory = $apiClass->getFactory(); foreach ($filters as $filter => $value) { - if (preg_match('/^(?P[_a-zA-Z0-9]+?)(?|__eq|__ne|__lt|__lte|__gt|__gte|__contains|__startswith|__endswith|__icontains|__istartswith|__iendswith|__in)$/', $filter, $matches) == 0) { + if (preg_match('/^(?P[_a-zA-Z0-9]+?)(?|__eq|__ne|__lt|__lte|__gt|__gte|__contains|__startswith|__endswith|__icontains|__istartswith|__iendswith|__in|__nin)$/', $filter, $matches) == 0) { throw new HTException("Filter parameter '" . $filter . "' is not valid"); } @@ -952,71 +952,64 @@ protected function makeFilter(array $filters, object $apiClass): array $remappedKey = $features[$cast_key]['dbname']; $amount_values = count($valueList); - $val = ($amount_values === 1) ? $valueList[0] : $valueList; - //filters on single values - if ($amount_values === 1) { - switch($matches['operator']) { - case '': - case '__eq': - $operator = '='; - break; - case '__ne': - $operator = '!='; - break; - case '__lt': - $operator = '<'; - break; - case '__lte': - $operator = '<='; - break; - case '__gt': - $operator = '>'; - break; - case '__gte': - $operator = '>='; - break; - case '__contains': - array_push($qFs, new LikeFilter($remappedKey, "%" . $val . "%", $factory)); - break; - case '__startswith': - array_push($qFs, new LikeFilter($remappedKey, $val . "%", $factory)); - break; - case '__endswith': - array_push($qFs, new LikeFilter($remappedKey, "%" . $val, $factory)); - break; - case '__icontains': - array_push($qFs, new LikeFilterInsensitive($remappedKey, "%" . $val . "%", $factory)); - break; - case '__istartswith': - array_push($qFs, new LikeFilterInsensitive($remappedKey, $val . "%", $factory)); - break; - case '__iendswith': - array_push($qFs, new LikeFilterInsensitive($remappedKey, "%" . $val, $factory)); - break; - default: - assert(False, "Operator '" . $matches['operator'] . "' not implemented for single values"); - } - - if ($operator) { - if (array_key_exists($val, $features)) { - array_push($qFs, new ComparisonFilter($remappedKey, $val, $operator, $factory)); - } else { - array_push($qFs, new QueryFilter($remappedKey, $val, $operator, $factory)); - } - } + $single_val = $valueList[0]; + $operator = $matches['operator']; + $query_operator = ""; + switch(true) { + case (($operator == '__eq' | $operator == '') && $amount_values == 1): + $query_operator = '='; + break; + case ($operator == '__ne' && $amount_values == 1): + $query_operator = '!='; + break; + case ($operator == '__lt' && $amount_values == 1): + $query_operator = '<'; + break; + case ($operator == '__lte' && $amount_values == 1): + $query_operator = '<='; + break; + case ($operator == '__gt' && $amount_values == 1): + $query_operator = '>'; + break; + case ($operator == '__gte' && $amount_values == 1): + $query_operator = '>='; + break; + case ($operator == '__contains' && $amount_values == 1): + array_push($qFs, new LikeFilter($remappedKey, "%" . $single_val . "%", $factory)); + break; + case ($operator == '__startswith' && $amount_values == 1): + array_push($qFs, new LikeFilter($remappedKey, $single_val . "%", $factory)); + break; + case ($operator == '__endswith' && $amount_values == 1): + array_push($qFs, new LikeFilter($remappedKey, "%" . $single_val, $factory)); + break; + case ($operator == '__icontains' && $amount_values == 1): + array_push($qFs, new LikeFilterInsensitive($remappedKey, "%" . $single_val . "%", $factory)); + break; + case ($operator == '__istartswith' && $amount_values == 1): + array_push($qFs, new LikeFilterInsensitive($remappedKey, $single_val . "%", $factory)); + break; + case ($operator == '__iendswith' && $amount_values == 1): + array_push($qFs, new LikeFilterInsensitive($remappedKey, "%" . $single_val, $factory)); + break; + //Filters bellow operate on lists + case ($operator == '__in'): + array_push($qFs, new ContainFilter($remappedKey, $valueList, $factory)); + break; + case ($operator == '__nin'): + array_push($qFs, new ContainFilter($remappedKey, $valueList, $factory, true)); + break; + default: + assert(False, "Operator '" . $operator . "' not implemented"); + } - //filters on lists - } else { - switch($matches['operator']) { - case '': - case '__in': - array_push($qFs, new ContainFilter($remappedKey, $val, $factory)); - break; - default: - assert(False, "Operator '" . $matches['operator'] . "' not implemented for list values"); + if ($query_operator) { + if (array_key_exists($single_val, $features)) { + array_push($qFs, new ComparisonFilter($remappedKey, $single_val, $query_operator, $factory)); + } else { + array_push($qFs, new QueryFilter($remappedKey, $single_val, $query_operator, $factory)); } } - } return $qFs; } From e753475705e3ba7c34e4f61589e8ab1bc10d998f Mon Sep 17 00:00:00 2001 From: Sein Coray Date: Thu, 3 Apr 2025 09:20:09 +0200 Subject: [PATCH 060/691] fixed some more typos, small mistakes --- doc/user_manual/advanced_manual.md | 8 ++++---- doc/user_manual/tasks.md | 6 +++--- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/doc/user_manual/advanced_manual.md b/doc/user_manual/advanced_manual.md index 16bc87a22..c39806fc2 100644 --- a/doc/user_manual/advanced_manual.md +++ b/doc/user_manual/advanced_manual.md @@ -10,7 +10,7 @@ Ordered by ID by default. It reports the hashlists created. A tick is accolated ### Hashlists Details If you click on a Hashlist, either in the hashlists view, in the Tasks overview or inside a task, it brings you to the corresponding Hashlist details page. -Appart from the parameters specific to this hashlist (i.e. ID, Access Group, Hashlist name, ...), the page displays some information about the total number of hashes, the number of cracked ones and the number of remaining ones to be recovered. Clicking on one of these three values will open a new window displaying information about the Hashes of the Hashlist as detailed below. +Apart from the parameters specific to this hashlist (i.e. ID, Access Group, Hashlist name, ...), the page displays some information about the total number of hashes, the number of cracked ones and the number of remaining ones to be recovered. Clicking on one of these three values will open a new window displaying information about the Hashes of the Hashlist as detailed below. #### Hashes of Hashlist X This page list all the hashes from the related hashlist. Filters can be applied to show either the cracked, the uncracked or all the hashes. According to the display filter selected, the Hashes only, the plaintext only or both are displayed. Additionally, the cracking position (**to be defined**) can be displayed next to the cracked ones. Only 1000 hashes can be displayed at a time within a page but the user can navigate through the pages. The number of hashes per page can be configured in *Config > UI* settings. @@ -111,7 +111,7 @@ Several options were not covered in the basic workflow related to the creation o - Enforce Piping (to apply rules before reject): **will be removed soon** and is therefore not explained here. ### Preconfigured tasks (including from existing task) -A preconfigured tasks is a basic template for a task that is not assigned yet to a hashlist. This is particularly useful to predefine task(s) that are often use such as generic mask attack or commonly used dictionnary attack. A preconfigured task can later be assigned to a hashlist avoiding the user to redefine the same task every time. This section gives more details about this topic. +A preconfigured tasks is a basic template for a task that is not assigned yet to a hashlist. This is particularly useful to predefine task(s) that are often use such as generic mask attack or commonly used dictionary attack. A preconfigured task can later be assigned to a hashlist avoiding the user to redefine the same task every time. This section gives more details about this topic. When the user goes to the menu *New Preconfigured TasksThe properties of a pre-configured tasks are a subset of those of a regular task and are therefore not re-defined here. THe reader can refer to the dedicated section for reference (**put a ref here**). @@ -149,7 +149,7 @@ Once a new supertask is created, or if you open the *SuperTask* menu, the overvi - **Name**: Name of the pre-configured task. Clicking on it opens the corresponding pre-configured task page. - **SubTask Priority**: define the order in which the pre-configured tasks will be executed when an agent is assigned to the supertask. Similarly to tasks, priority is given to the highest number. - **SubTask Max Agents**: similarly to tasks, specifies the maximum agents that can be assigned to the task. - - **Remove**: remove the pre-configured task from the supertask. Note that the pre-configured task is only remove from the supertask but not deleted from the system except if the related pre-configured task was generated via the *Import Super Task* functionality (see below for more details). + - **Remove**: remove the pre-configured task from the supertask. Note that the pre-configured task is only removed from the supertask but not deleted from the system except if the related pre-configured task was generated via the *Import Super Task* functionality (see below for more details). #### SuperTask in the *ShowTasks* Menu @@ -172,7 +172,7 @@ The Import Super Task menu offers functionalities to create SuperTasks and the r #### Masks -This functionality allows the user to create a supertask from a mask file or a set of masks. It is a good alternative to replace the --increment option of hashcat that cannot be use in hashtopolis. +This functionality allows the user to create a supertask from a mask file or a set of masks. It is a good alternative to replace the --increment option of hashcat that cannot be used in hashtopolis. - **Name**: Defines the name that will be given at the created SuperTask - **Are small tasks**: If this parameter is set to yes, a single agent can be assigned to the tasks that will be created when the resulting supertask is apply to a hashlist. This is relevant for small tasks or to assign the full keyspace in a single chunk to an agent. Note that this is **NOT** equivalent to define the *Maximum number of agents* to 1. Indeed, in this latter case, the task will still be divided in chunks according to the *chunk size* parameter. The parameter is set to No by default. diff --git a/doc/user_manual/tasks.md b/doc/user_manual/tasks.md index e00c3e37a..c9db9f146 100644 --- a/doc/user_manual/tasks.md +++ b/doc/user_manual/tasks.md @@ -1,6 +1,6 @@ # Tasks -To create a new task, you have to navigate to *Tasks > New Task*. You will get the following window in which you can create a new task. Some of the fields are mandotory, some others are filled with default values. +To create a new task, you have to navigate to *Tasks > New Task*. You will get the following window in which you can create a new task. Some of the fields are mandatory, some others are filled with default values. 1. **Name**: provide a name for the task you want to create. This is how the task will be referenced with during the monitoring phase (see **link**) therefore it should be relatively explicit to facilitate its monitoring. @@ -11,7 +11,7 @@ In case you want to perform a dictionary attack with rules, you have to select t 4. **Priority**: Assign a priority number to the task. The expected value has to be an integer. Agents will be assigned to tasks in decreasing order of priority. A task with a priority 0 will not be processed even if agents are available. Default value is 0. -5. **Maximum number of agents**: Specify the maximum agents that can be assigned to the task. If this amount is reached, future available agents will be assigned to the next task available with a lower priority even if the all the chunks of the task have been distributed. The default value of 0 means that there is no maximum and therefore, all available agents are assigned to this tasks until all the chunks have been distributed. This functionality is helpful to only use a portion of the cluster for a specific task, and therefore allowing to split the workers on different tasks. +5. **Maximum number of agents**: Specify the maximum agents that can be assigned to the task. If this amount is reached, future available agents will be assigned to the next task available with a lower priority even if not all the chunks of the task have been distributed. The default value of 0 means that there is no maximum and therefore, all available agents are assigned to this tasks until all the chunks have been distributed. This functionality is helpful to only use a portion of the cluster for a specific task, and therefore allowing to split the workers on different tasks. 6. **Task Notes** - *optional*: This field allows the user to indicate some details about the tasks, the command line or any other details the user can find relevant. @@ -138,4 +138,4 @@ Similarly to a regular task, any hashcat parameter can be added to the command l **MAKE AN EXAMPLE WITH SOME FIGURES** > [!CAUTION] -> If the iteration is done over rule files, the flag **-r** will not be added when FILE is replaced by the rule file. It should therefore be added in the command line as displayed in the example above. \ No newline at end of file +> If the iteration is done over rule files, the flag **-r** will not be added when FILE is replaced by the rule file. It should therefore be added in the command line as displayed in the example above. From 832d2d05f6ad7e23efdc795fbd9b10e88d1f7ed7 Mon Sep 17 00:00:00 2001 From: jessevz Date: Wed, 16 Apr 2025 14:11:51 +0200 Subject: [PATCH 061/691] FEAT: Made it possible to post to many relationships when there is an intermediate table (#1249) Co-authored-by: jessevz --- .../apiv2/common/AbstractBaseAPI.class.php | 32 +++++++------- .../apiv2/common/AbstractModelAPI.class.php | 42 ++++++++++++++----- 2 files changed, 48 insertions(+), 26 deletions(-) diff --git a/src/inc/apiv2/common/AbstractBaseAPI.class.php b/src/inc/apiv2/common/AbstractBaseAPI.class.php index 1396b25c5..802a82edb 100644 --- a/src/inc/apiv2/common/AbstractBaseAPI.class.php +++ b/src/inc/apiv2/common/AbstractBaseAPI.class.php @@ -714,23 +714,23 @@ protected function unaliasData(array $data, array $features): array { * @return void */ protected function isAllowedToMutate(Request $request, array $features, string $key) { - if (is_string($key) == False) { - throw new HttpErrorException("Key '$key' invalid", 403); - } - // Ensure key exists in target array - if (array_key_exists($key, $features) == False) { - throw new HttpErrorException("Key '$key' does not exists!", 403); - } + if (is_string($key) == False) { + throw new HttpErrorException("Key '$key' invalid", 403); + } + // Ensure key exists in target array + if (array_key_exists($key, $features) == False) { + throw new HttpErrorException("Key '$key' does not exists!", 403); + } - if ($features[$key]['read_only'] == True) { - throw new HttpForbiddenException($request, "Key '$key' is immutable"); - } - if ($features[$key]['protected'] == True) { - throw new HttpForbiddenException($request, "Key '$key' is protected"); - } - if ($features[$key]['private'] == True) { - throw new HttpForbiddenException($request, "Key '$key' is private"); - } + if ($features[$key]['read_only'] == True) { + throw new HttpForbiddenException($request, "Key '$key' is immutable"); + } + if ($features[$key]['protected'] == True) { + throw new HttpForbiddenException($request, "Key '$key' is protected"); + } + if ($features[$key]['private'] == True) { + throw new HttpForbiddenException($request, "Key '$key' is private"); + } } /** diff --git a/src/inc/apiv2/common/AbstractModelAPI.class.php b/src/inc/apiv2/common/AbstractModelAPI.class.php index 2ea42da21..afb9f12d3 100644 --- a/src/inc/apiv2/common/AbstractModelAPI.class.php +++ b/src/inc/apiv2/common/AbstractModelAPI.class.php @@ -1193,16 +1193,38 @@ public function postToManyRelationshipLink(Request $request, Response $response, throw new HttpErrorException("Relation does not exist!"); } - $relationType = $relation['relationType']; - $primaryKey = $this->getPrimaryKeyOther($relationType); - $features = $this->getFeaturesOther($relationType); - - // $this->checkForeignkeyPermission($request, $relationKey, $features); - $this->isAllowedToMutate($request, $features, $relationKey); - - $factory = self::getModelFactory($relationType); - $updates = self::ResourceRecordArrayToUpdateArray($data, $args["id"]); - $factory->massSingleUpdate($primaryKey, $relationKey, $updates); + // TODO this ia an abstract way of adding to junctiontables. This only works for intermediate tables + // that have 3 fields (1 primary key and 2 foreignkeys to link the tables) for models that have intermediate + // tables with more than 3 fields, the postToManyRelationshipLink() function should be overidden. + if (array_key_exists("junctionTableType", $relation)) { + $relationType = $relation['junctionTableType']; + $primaryKey = $this->getPrimaryKeyOther($relationType); + //Add to junction table if not exist. + $factory = self::getModelFactory($relationType); + foreach($data as $item) { + if (!$this->validateResourceRecord($item)) { + $encoded_item = json_encode($item); + throw new HttpErrorException('Invalid resource record given in list! invalid resource record: ' . $encoded_item); + } + $junction_table_entry = $factory->getNullObject(); + $setMethod1 = "set" . ucfirst($relation["junctionTableFilterField"]); + $setMethod2 = "set" . ucfirst($relation["junctionTableJoinField"]); + if (!method_exists($junction_table_entry, $setMethod1) || !method_exists($junction_table_entry, $setMethod2)) { + throw new HTException("Internal error, set function not found"); + } + $junction_table_entry->$setMethod1($args["id"]); + $junction_table_entry->$setMethod2($item["id"]); + $factory->save($junction_table_entry); + } + } else { + $relationType = $relation['relationType']; + $primaryKey = $this->getPrimaryKeyOther($relationType); + $features = $this->getFeaturesOther($relationType); + $this->isAllowedToMutate($request, $features, $relationKey); + $factory = self::getModelFactory($relationType); + $updates = self::ResourceRecordArrayToUpdateArray($data, $args["id"]); + $factory->massSingleUpdate($primaryKey, $relationKey, $updates); + } return $response->withStatus(201) ->withHeader("Content-Type", "application/vnd.api+json"); From b5294cf0c63509da4493dcbfc1c48beb2be93d3b Mon Sep 17 00:00:00 2001 From: Sein Coray Date: Mon, 28 Apr 2025 13:21:13 +0200 Subject: [PATCH 062/691] Implemented helper for password reset (#1043) * implemented helper for password reset, special case not needing auth and a user we are still missing a sendmail agent on the docker setup to make sending emails working * updated response sending a success message * added docker setup for ssmtp and configuration of smtp connections for emails * modified docker process to support email sending just by mounting in the ssmtp config via volume * updated changelog regarding docker email sending --------- Co-authored-by: jessevz --- Dockerfile | 1 + doc/changelog.md | 2 +- docker-compose.yml | 1 + src/api/v2/index.php | 3 +- .../apiv2/helper/resetUserPassword.routes.php | 39 ++++++++++++++ src/inc/handlers/ForgotHandler.class.php | 51 +++++-------------- src/inc/utils/UserUtils.class.php | 26 ++++++++++ ssmtp.conf.example | 20 ++++++++ 8 files changed, 102 insertions(+), 41 deletions(-) create mode 100644 src/inc/apiv2/helper/resetUserPassword.routes.php create mode 100644 ssmtp.conf.example diff --git a/Dockerfile b/Dockerfile index 6828f40b3..7e9618e0c 100644 --- a/Dockerfile +++ b/Dockerfile @@ -39,6 +39,7 @@ RUN apt-get update \ && apt-get -y install git iproute2 procps lsb-release \ && apt-get -y install mariadb-client \ && apt-get -y install libpng-dev \ + && apt-get -y install ssmtp \ \ # Install extensions (optional) && docker-php-ext-install pdo_mysql gd \ diff --git a/doc/changelog.md b/doc/changelog.md index 74d48750a..b7d8af077 100644 --- a/doc/changelog.md +++ b/doc/changelog.md @@ -15,7 +15,7 @@ ## Bugfixes - Fixed a bug where creating a new preprocessor would copy the configured limit command over the configured skip command - +- Implemented sending emails inside docker container # v0.14.2 -> v0.14.3 diff --git a/docker-compose.yml b/docker-compose.yml index dc17be161..91b14c1ce 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -6,6 +6,7 @@ services: restart: always volumes: - hashtopolis:/usr/local/share/hashtopolis:Z + # - ./ssmtp.conf:/etc/ssmtp/ssmtp.conf environment: HASHTOPOLIS_DB_USER: $MYSQL_USER HASHTOPOLIS_DB_PASS: $MYSQL_PASSWORD diff --git a/src/api/v2/index.php b/src/api/v2/index.php index ea89c1d63..7484cef49 100644 --- a/src/api/v2/index.php +++ b/src/api/v2/index.php @@ -134,7 +134,7 @@ public function get($key): string { include(dirname(__FILE__) . '/../../inc/confv2.php'); return new JwtAuthentication([ "path" => "/", - "ignore" => ["/api/v2/auth/token", "/api/v2/openapi.json"], + "ignore" => ["/api/v2/auth/token", "/api/v2/helper/resetUserPassword", "/api/v2/openapi.json"], "secret" => $PEPPER[0], "attribute" => false, "secure" => false, @@ -279,6 +279,7 @@ public function process(Request $request, RequestHandler $handler): Response { require __DIR__ . "/../../inc/apiv2/helper/purgeTask.routes.php"; require __DIR__ . "/../../inc/apiv2/helper/recountFileLines.routes.php"; require __DIR__ . "/../../inc/apiv2/helper/resetChunk.routes.php"; +require __DIR__ . "/../../inc/apiv2/helper/resetUserPassword.routes.php"; require __DIR__ . "/../../inc/apiv2/helper/setUserPassword.routes.php"; require __DIR__ . "/../../inc/apiv2/helper/unassignAgent.routes.php"; diff --git a/src/inc/apiv2/helper/resetUserPassword.routes.php b/src/inc/apiv2/helper/resetUserPassword.routes.php new file mode 100644 index 000000000..6959f3b5f --- /dev/null +++ b/src/inc/apiv2/helper/resetUserPassword.routes.php @@ -0,0 +1,39 @@ + ["type" => "str"], + User::USERNAME => ["type" => "str"], + ]; + } + + public function actionPost($data): array|null { + UserUtils::userForgotPassword($data[User::USERNAME], $data[User::EMAIL]); + + return ["reset" => "success"]; + } +} + +ResetUserPasswordHelperAPI::register($app); diff --git a/src/inc/handlers/ForgotHandler.class.php b/src/inc/handlers/ForgotHandler.class.php index a2ffbe18e..20939b9ad 100644 --- a/src/inc/handlers/ForgotHandler.class.php +++ b/src/inc/handlers/ForgotHandler.class.php @@ -1,51 +1,24 @@ forgot($_POST['username'], $_POST['email']); - break; - default: - UI::addMessage(UI::ERROR, "Invalid action!"); - break; - } - } - - private function forgot($username, $email) { - $username = htmlentities($username, ENT_QUOTES, "UTF-8"); - $qF = new QueryFilter(User::USERNAME, $username, "="); - $res = Factory::getUserFactory()->filter([Factory::FILTER => $qF]); - if ($res == null || sizeof($res) == 0) { - UI::addMessage(UI::ERROR, "No such user!"); - return; - } - $user = $res[0]; - if ($user->getEmail() != $email) { - UI::addMessage(UI::ERROR, "No such user!"); - return; - } - $newSalt = Util::randomString(20); - $newPass = Util::randomString(10); - $newHash = Encryption::passwordHash($newPass, $newSalt); - - $tmpl = new Template("email/forgot"); - $tmplPlain = new Template("email/forgot.plain"); - $obj = array('username' => $user->getUsername(), 'password' => $newPass); - if (Util::sendMail($user->getEmail(), "Password reset", $tmpl->render($obj), $tmplPlain->render($obj))) { - Factory::getUserFactory()->mset($user, [User::PASSWORD_HASH => $newHash, User::PASSWORD_SALT => $newSalt, User::IS_COMPUTED_PASSWORD => 1]); - UI::addMessage(UI::SUCCESS, "Password reset! You should receive an email soon."); + try { + switch ($action) { + case DForgotAction::RESET: + UserUtils::userForgotPassword($_POST['username'], $_POST['email']); + UI::addMessage(UI::SUCCESS, "Password reset! You should receive an email soon."); + break; + default: + UI::addMessage(UI::ERROR, "Invalid action!"); + break; + } } - else { - UI::addMessage(UI::ERROR, "Password reset failed because of an error when sending the email! Please check if PHP is able to send emails."); + catch (HTException $e) { + UI::addMessage(UI::ERROR, $e->getMessage()); } } } \ No newline at end of file diff --git a/src/inc/utils/UserUtils.class.php b/src/inc/utils/UserUtils.class.php index 94357f526..a7b7dcab9 100644 --- a/src/inc/utils/UserUtils.class.php +++ b/src/inc/utils/UserUtils.class.php @@ -48,6 +48,32 @@ public static function deleteUser($userId, $adminUser) { Factory::getUserFactory()->delete($user); } + public static function userForgotPassword($username, $email) { + $username = htmlentities($username, ENT_QUOTES, "UTF-8"); + $qF = new QueryFilter(User::USERNAME, $username, "="); + $res = Factory::getUserFactory()->filter([Factory::FILTER => $qF]); + if ($res == null || sizeof($res) == 0) { + throw new HTException("No such user!"); + } + $user = $res[0]; + if ($user->getEmail() != $email) { + throw new HTException("No such user!"); + } + $newSalt = Util::randomString(20); + $newPass = Util::randomString(10); + $newHash = Encryption::passwordHash($newPass, $newSalt); + + $tmpl = new Template("email/forgot"); + $tmplPlain = new Template("email/forgot.plain"); + $obj = array('username' => $user->getUsername(), 'password' => $newPass); + if (Util::sendMail($user->getEmail(), "Password reset", $tmpl->render($obj), $tmplPlain->render($obj))) { + Factory::getUserFactory()->mset($user, [User::PASSWORD_HASH => $newHash, User::PASSWORD_SALT => $newSalt, User::IS_COMPUTED_PASSWORD => 1]); + } + else { + throw new HTException("Password reset failed because of an error when sending the email! Please check if PHP is able to send emails."); + } + } + /** * @param int $userId * @throws HTException diff --git a/ssmtp.conf.example b/ssmtp.conf.example new file mode 100644 index 000000000..57c67666f --- /dev/null +++ b/ssmtp.conf.example @@ -0,0 +1,20 @@ +# The user that gets all the mails (UID < 1000, usually the admin) +root=username@domain.com + +# The mail server (where the mail is sent to) +mailhub=smtp.domain.com:465 + +# The address where the mail appears to come from for user authentication. +rewriteDomain=domain.com + +# Use implicit TLS (port 465). When using port 587, change UseSTARTTLS=Yes +UseTLS=Yes +UseSTARTTLS=No + +# Username/Password +AuthUser=username +AuthPass=password +AuthMethod=PLAIN + +# Email 'From header's can override the default domain? +FromLineOverride=yes From 13c65a11f95d523ff68d6ece0a2c42b6cc8ebdc3 Mon Sep 17 00:00:00 2001 From: jessevz Date: Mon, 28 Apr 2025 13:30:40 +0200 Subject: [PATCH 063/691] Api docs (#1257) * Made get request data to arrays * Programatically create helper docs based on phpdoc * Added automatically generated helper API documentation and fixed in correct parameter documentation for certain endpoints * Added responses to swagger helper documentation * Added swagger documentation for importFile * Fixed bug in retrieving relationships * Fixed bug in retrieving relationship through intermediate table * Updated swagger for relationship documentation * Fix small changes for tests --------- Co-authored-by: jessevz --- ci/apiv2/test_agent.py | 4 +- src/dba/AbstractModelFactory.class.php | 3 + .../apiv2/common/AbstractBaseAPI.class.php | 9 + .../apiv2/common/AbstractHelperAPI.class.php | 9 + .../apiv2/common/AbstractModelAPI.class.php | 43 +- src/inc/apiv2/common/openAPISchema.routes.php | 468 +++++++++++++++--- src/inc/apiv2/helper/abortChunk.routes.php | 12 +- src/inc/apiv2/helper/assignAgent.routes.php | 15 +- .../helper/createSuperHashlist.routes.php | 11 + .../apiv2/helper/createSupertask.routes.php | 12 + .../helper/exportCrackedHashes.routes.php | 10 + .../apiv2/helper/exportLeftHashes.routes.php | 10 + .../apiv2/helper/exportWordlist.routes.php | 10 + src/inc/apiv2/helper/getFile.routes.php | 39 +- .../helper/importCrackedHashes.routes.php | 20 + src/inc/apiv2/helper/importFile.routes.php | 323 +++++++----- src/inc/apiv2/helper/purgeTask.routes.php | 12 +- .../apiv2/helper/recountFileLines.routes.php | 10 + src/inc/apiv2/helper/resetChunk.routes.php | 12 +- .../apiv2/helper/setUserPassword.routes.php | 13 +- src/inc/apiv2/helper/unassignAgent.routes.php | 13 +- 21 files changed, 825 insertions(+), 233 deletions(-) diff --git a/ci/apiv2/test_agent.py b/ci/apiv2/test_agent.py index a4e833c2e..f4a93e4b0 100644 --- a/ci/apiv2/test_agent.py +++ b/ci/apiv2/test_agent.py @@ -49,10 +49,10 @@ def test_assign_unassign_agent(self): result = helper.assign_agent(agent=agent_obj, task=task_obj) - self.assertEqual(result['assign'], 'success') + self.assertEqual(result['Assign'], 'Success') result = helper.unassign_agent(agent=agent_obj) - self.assertEqual(result['unassign'], 'success') + self.assertEqual(result['Unassign'], 'Success') task_test.tearDown() diff --git a/src/dba/AbstractModelFactory.class.php b/src/dba/AbstractModelFactory.class.php index b7d2bc16c..7e00eac46 100755 --- a/src/dba/AbstractModelFactory.class.php +++ b/src/dba/AbstractModelFactory.class.php @@ -425,6 +425,9 @@ public function multicolAggregationFilter($options, $aggregations) { $vals = array(); + if (array_key_exists('join', $options)) { + $query .= $this->applyJoins($options['join']); + } if (array_key_exists("filter", $options)) { $query .= $this->applyFilters($vals, $options['filter']); } diff --git a/src/inc/apiv2/common/AbstractBaseAPI.class.php b/src/inc/apiv2/common/AbstractBaseAPI.class.php index 802a82edb..368807ea8 100644 --- a/src/inc/apiv2/common/AbstractBaseAPI.class.php +++ b/src/inc/apiv2/common/AbstractBaseAPI.class.php @@ -104,6 +104,15 @@ public function getFormFields(): array { return []; } + /** + * Get input field names valid for creation of object + */ + final public function getCreateValidFeatures(): array + { + return $this->getAliasedFeatures(); + } + + /** * Create features from formfields */ diff --git a/src/inc/apiv2/common/AbstractHelperAPI.class.php b/src/inc/apiv2/common/AbstractHelperAPI.class.php index ce57cc37e..344373d2e 100644 --- a/src/inc/apiv2/common/AbstractHelperAPI.class.php +++ b/src/inc/apiv2/common/AbstractHelperAPI.class.php @@ -19,7 +19,16 @@ abstract class AbstractHelperAPI extends AbstractBaseAPI { abstract public function actionPost(array $data): object|array|null; + /** + * Function in order to create swagger documentation. SHould return either a map of strings that + * describes the output ex: ["assign" => "succes"] or if the endpoint returns an object it should return + * the string representation of that object ex: File. + */ + abstract public static function getResponse(): array|string|null; + public function getParamsSwagger(): array { + return []; + } /* Chunk API endpoint specific call to abort chunk */ public function processPost(Request $request, Response $response, array $args): Response { diff --git a/src/inc/apiv2/common/AbstractModelAPI.class.php b/src/inc/apiv2/common/AbstractModelAPI.class.php index afb9f12d3..c7ef2c153 100644 --- a/src/inc/apiv2/common/AbstractModelAPI.class.php +++ b/src/inc/apiv2/common/AbstractModelAPI.class.php @@ -33,7 +33,6 @@ public static function getToManyRelationships(): array return []; } - /** * Available 'expand' parameters on $object */ @@ -43,9 +42,9 @@ public static function getExpandables(): array return $expandables; } - // /** - // * Fetch objects for $expand on $objects - // */ + /** + * Fetch objects for $expand on $objects + */ protected static function fetchExpandObjects(array $objects, string $expand): mixed { //disabled the check because with intermediate objects its possible to fetch a different model @@ -523,9 +522,9 @@ public static function getManyResources(object $apiClass, Request $request, Resp //according to JSON API spec, first and last have to be calculated if inexpensive to compute //(https://jsonapi.org/profiles/ethanresnick/cursor-pagination/#auto-id-links)) //if this query is too expensive for big tables, it can be removed - $agg1 = new Aggregation($primaryKey, Aggregation::MAX); - $agg2 = new Aggregation($primaryKey, Aggregation::MIN); - $agg3 = new Aggregation($primaryKey, Aggregation::COUNT); + $agg1 = new Aggregation($primaryKey, Aggregation::MAX, $factory); + $agg2 = new Aggregation($primaryKey, Aggregation::MIN, $factory); + $agg3 = new Aggregation($primaryKey, Aggregation::COUNT, $factory); $aggregation_results = $factory->multicolAggregationFilter($finalFs, [$agg1, $agg2, $agg3]); $max = $aggregation_results[$agg1->getName()]; @@ -774,14 +773,6 @@ public function count(Request $request, Response $response, array $args): Respon ->withHeader("Content-Type", 'application/vnd.api+json'); } - /** - * Get input field names valid for creation of object - */ - final public function getCreateValidFeatures(): array - { - return $this->getAliasedFeatures(); - } - /** * API entry point for requests of single object */ @@ -874,6 +865,7 @@ public function getToOneRelatedResource(Request $request, Response $response, ar $this->preCommon($request); $relation = $args['relation']; + $id = $args['id']; $relationMapper = $this->getToOneRelationships()[$relation]; $intermediate = $relationMapper["intermediateType"]; @@ -882,20 +874,31 @@ public function getToOneRelatedResource(Request $request, Response $response, ar $intermediateFactory = self::getModelFactory($intermediate); $aFs[Factory::JOIN][] = new JoinFilter( $intermediateFactory, - $relationMapper['joinField'], - $relationMapper['joinFieldRelation'], + $relationMapper['junctionTableJoinField'], + $relationMapper['relationKey'], + ); + + $filterFactory = self::getModelFactory($relationMapper['junctionTableType']); + $filterField = $relationMapper['joinField']; + + $aFs[Factory::FILTER][] = new QueryFilter( + $filterField, + $id, + '=', + $filterFactory ); $factory = $this->getFactory(); $object = $factory->filter($aFs)[$intermediateFactory->getModelName()][0]; + $id = $object->getId(); } else { // Base object - $object = $this->doFetch($request, $args['id']); + $object = $this->doFetch($request, $id); } // Relation object $relationObjects = $this->fetchExpandObjects([$object], $relation); - $relationObject = $relationObjects[$args['id']]; + $relationObject = $relationObjects[$id]; $relationClass = $relationMapper['relationType']; $relationApiClass = new ($this->container->get('classMapper')->get($relationClass))($this->container); @@ -1042,7 +1045,7 @@ public function getToManyRelatedResource(Request $request, Response $response, a $aFs[Factory::JOIN][] = new JoinFilter( self::getModelFactory($toManyRelation['junctionTableType']), $toManyRelation['junctionTableJoinField'], - $toManyRelation['key'], + $toManyRelation['relationKey'], ); } diff --git a/src/inc/apiv2/common/openAPISchema.routes.php b/src/inc/apiv2/common/openAPISchema.routes.php index 8a475b90b..04144355f 100644 --- a/src/inc/apiv2/common/openAPISchema.routes.php +++ b/src/inc/apiv2/common/openAPISchema.routes.php @@ -50,6 +50,16 @@ function typeLookup($feature): array { return $result; }; +function parsePhpDoc($doc) { + $cleanedDoc = preg_replace([ + '/^\/\*\*/', // Remove opening /** + '/\*\/$/', // Remove closing */ + '/^\s*\*\s?/m' // Remove leading * on each line + ], '', $doc); + $cleanedDoc = str_replace("\n", "
    ", $cleanedDoc); //markdown friendly line end + return $cleanedDoc; +} + // "jsonapi": { // "version": "1.1", @@ -145,6 +155,17 @@ function makeRelationships($class, $uri): array { return $properties; } +function getTUSheader(): array { + return [ + "description" => "Indicates the TUS version the server supports. + Must always be set to `1.0.0` in compliant servers.", + "schema" => [ + "type" => "string", + "enum" => "enum: ['1.0.0']" + ] + ]; +} + //TODO expandables array is unnecessarily indexed in the swagger UI function makeExpandables($class, $container): array { $properties = []; @@ -173,6 +194,23 @@ function makeExpandables($class, $container): array { return $properties; } +function mapToProperties($map): array { + $properties = []; + foreach ($map as $key => $value) { + $properties[$key] = [ + "type" => "string", + "default" => $value, + ]; + } + return [ + "type" => "array", + "items" => [ + "type" => "object", + "properties" => $properties + ] + ]; +} + function makeProperties($features, $skipPK=false): array { $propertyVal = []; foreach ($features as $feature) { @@ -218,6 +256,35 @@ function buildPatchPost($properties, $name, $id=null): array { return $result; } +/** + * This function builds the post/patch attributes for a relationship. When $istomany is false, + * it would build the attributes for a to one relationship. If it is true it will build it for a too many relationship. + * */ +function buildPostPatchRelation($name, $isToMany): array { + $resourceRecord = [ + "type" => "object", + "properties" => [ + "type" => [ + "type" => "string", + "default" => $name + ], + "id" => [ + "type" => "integer", + "default" => 1 + ] + ] + ]; + if ($isToMany) { + return ["data" => [ + "type" => "array", + "items" => $resourceRecord + ] + ]; + } else { + return ["data" => $resourceRecord]; + } +} + function makeDescription($isRelation, $method, $singleObject): string { $description = ""; switch ($method) { @@ -356,7 +423,10 @@ function makeDescription($isRelation, $method, $singleObject): string { $reflectionCallable = ($protectedCallable->getValue($route)); /* Assume only one method per route call */ - assert(sizeof($route->getMethods()) == 1); + assert(sizeof($route->getMethods()) == 1, "More than 1 methods found for this route"); + /* Path relative to basePath */ + $path = $route->getPattern(); + $method = strtolower($route->getMethods()[0]); if (is_string($reflectionCallable) == false) { /* OPTIONS (CORS) have an function callable, ignore for now */ @@ -364,23 +434,82 @@ function makeDescription($isRelation, $method, $singleObject): string { } /* Retrieve parameters */ - $apiClassName = explode(':', $reflectionCallable)[0]; + $explodedCallable = explode(':', $reflectionCallable); + $apiClassName = $explodedCallable[0]; + $apiMethod = $explodedCallable[1]; $class = new $apiClassName($app->getContainer()); - /* TODO: No support for helper functions yet */ if (!($class instanceof AbstractModelAPI)){ + $name = $class::class; + $apiMethod = ($apiMethod == "processPost" && $name !== "ImportFileHelperAPI") ? "actionPost" : $apiMethod; + $reflectionApiMethod = new ReflectionMethod($name, $apiMethod); + $paths[$path][$method]["description"] = parsePhpDoc($reflectionApiMethod->getDocComment()); + $parameters = $class->getCreateValidFeatures(); + $properties = makeProperties($parameters); + $components[$name] = + [ + "type" => "object", + "properties" => $properties, + ]; + if($method == "post") { + $reflectionMethodFormFields = new ReflectionMethod($name, "getFormFields"); + $bodyDescription = parsePhpDoc($reflectionMethodFormFields->getDocComment()); + $paths[$path][$method]["requestBody"] = [ + "description" => $bodyDescription, + "required" => true, + "content" => [ + "application/json" => [ + "schema" => [ + '$ref' => "#/components/schemas/" . $name + ], + ] + ]]; + } elseif($method == "get") { + $paths[$path][$method]["parameters"] = $class->getParamsSwagger(); + } + $request_response = $class->getResponse(); + $ref = null; + if (is_array($request_response)) { + $responseProperties = mapToProperties($request_response); + $components[$name . "response"] = $responseProperties; + $ref = "#/components/schemas/" . $name . "Response"; + } else if (is_string($request_response)) { + $ref = "#/components/schemas/" . $request_response . "SingleResponse"; + } else if ($name == "ImportFileHelperAPI"){ + //ImportFileHelperAPI is hardcoded, because its different than other helpers. + continue; + } + if (isset($ref)) { + $paths[$path][$method]["responses"]["200"] = [ + "description" => "successful operation", + "content" => [ + "application/json" => [ + "schema" => [ + '$ref' => $ref + ] + ] + ] + ]; + } else { + $paths[$path][$method]["responses"]["200"] = [ + "description" => "successful operation", + ]; + } continue; }; - /* Path relative to basePath */ - $path = $route->getPattern(); - $method = strtolower($route->getMethods()[0]); /* Quick to find out if single parameter object is used */ $singleObject = ((strstr($path, '/{id:')) !== false); $name = substr($class->getDBAClass(), 4); $uri = $class->getBaseUri(); - $isRelation = (strstr($path , "{relation:")) !== false; + $isRelation = (strstr($path , "/relationships/")) !== false; + if (str_contains($path, "relation:")) { + $relation = rtrim(explode("relation:", $path)[1], "}"); + $isToMany = array_key_exists($relation, $class::getToManyRelationships()); + $isToOne = array_key_exists($relation, $class::getToOneRelationships()); + assert(!($isToMany && $isToOne), "An relationship cant be a to one and to many at the same time."); + } $expandables = implode(",", $class->getExpandables()); /** @@ -389,20 +518,23 @@ function makeDescription($isRelation, $method, $singleObject): string { if (array_key_exists($name, $components) == false) { $properties_return_post_patch = [ "data" => [ - "type" => "object", - "properties" => [ - "id" => [ - "type" => "integer", - ], - "type" => [ - "type" => "string", - "default" => $name - ], - "attributes" => [ - "type" => "object", - "properties" => makeProperties($class->getFeaturesWithoutFormfields(), true) - ], - ], + "type" => "array", + "items" => [ + "type" => "object", + "properties" => [ + "id" => [ + "type" => "integer", + ], + "type" => [ + "type" => "string", + "default" => $name + ], + "attributes" => [ + "type" => "object", + "properties" => makeProperties($class->getFeaturesWithoutFormfields(), true) + ], + ] + ] ] ]; @@ -428,6 +560,8 @@ function makeDescription($isRelation, $method, $singleObject): string { $properties_create = buildPatchPost(makeProperties($class->getAllPostParameters($class->getCreateValidFeatures(), true)), $name); $properties_get = array_merge($json_api_header, $links, $properties_get_single, $included); $properties_patch = buildPatchPost(makeProperties($class->getPatchValidFeatures(), true), $name); + $properties_patch_post_relation = buildPostPatchRelation($relation, ($isToMany && !$isToOne)); + $responseGetRelation = $properties_patch_post_relation; $components[$name . "Create"] = [ @@ -446,6 +580,18 @@ function makeDescription($isRelation, $method, $singleObject): string { "type" => "object", "properties" => $properties_get, ]; + + $components[$name . "Relation" . ucfirst($relation)] = + [ + "type" => "object", + "properties" => $properties_patch_post_relation, + ]; + + $components[$name . "Relation" . ucfirst($relation) . "GetResponse"] = + [ + "type" => "object", + "properties" => $responseGetRelation + ]; $components[$name . "SingleResponse"] = [ @@ -526,6 +672,12 @@ function makeDescription($isRelation, $method, $singleObject): string { $paths[$path][$method]["description"] = makeDescription($isRelation, $method, $singleObject); + if ($isRelation && in_array($method, ["post", "patch", "delete"], true)) { + $paths[$path][$method]["responses"]["204"] = + [ + "description" => "Succesfull operation" + ]; + } if ($singleObject) { /* Single objects could not exists */ $paths[$path][$method]["responses"]["404"] = @@ -542,16 +694,30 @@ function makeDescription($isRelation, $method, $singleObject): string { /* Method specific responses and requests for single objects */ if ($method == 'get') { - $paths[$path][$method]["responses"]["200"] = [ - "description" => "successful operation", - "content" => [ - "application/json" => [ - "schema" => [ - '$ref' => "#/components/schemas/" . $name . "Response" + if (!$isRelation && str_contains($path, "relation:")) { + $paths[$path][$method]["responses"]["200"] = [ + "description" => "successful operation", + "content" => [ + "application/json" => [ + "schema" => [ + '$ref' => "#/components/schemas/" . $name . "Relation" . ucfirst($relation) . "GetResponse" + + ] ] ] - ] - ]; + ]; + } else { + $paths[$path][$method]["responses"]["200"] = [ + "description" => "successful operation", + "content" => [ + "application/json" => [ + "schema" => [ + '$ref' => "#/components/schemas/" . $name . "Response" + ] + ] + ] + ]; + } /* Supported by client, not by browser, disabled for APIdocs */ // /* JSON object required */ @@ -566,6 +732,27 @@ function makeDescription($isRelation, $method, $singleObject): string { // ]]; } elseif ($method == 'patch') { + if ($isRelation) { + $paths[$path][$method]["requestBody"] = [ + "required" => true, + "content" => [ + "application/json" => [ + "schema" => [ + '$ref' => "#/components/schemas/" . $name . "Relation" . ucfirst($relation) + ], + ], + ]]; + } else { + $paths[$path][$method]["requestBody"] = [ + "required" => true, + "content" => [ + "application/json" => [ + "schema" => [ + '$ref' => "#/components/schemas/" . $name . "Patch" + ], + ], + ]]; + $paths[$path][$method]["responses"]["200"] = [ "description" => "successful operation", "content" => [ @@ -576,28 +763,30 @@ function makeDescription($isRelation, $method, $singleObject): string { ] ] ]; - - $paths[$path][$method]["requestBody"] = [ - "required" => true, - "content" => [ - "application/json" => [ - "schema" => [ - '$ref' => "#/components/schemas/" . $name . "Patch" - ], - ], - ]]; - + } } elseif ($method == 'delete') { $paths[$path][$method]["responses"]["204"] = [ "description" => "successfully deleted", ]; - /* Empty JSON object required */ - $paths[$path][$method]["requestBody"] = [ - "required" => true, - "content" => [ - "application/json" => [], - ]]; + if ($isRelation) { + $paths[$path][$method]["requestBody"] = [ + "required" => true, + "content" => [ + "application/json" => [ + "schema" => [ + '$ref' => "#/components/schemas/" . $name . "Relation" . ucfirst($relation) + ], + ], + ]]; + } else { + /* Empty JSON object required */ + $paths[$path][$method]["requestBody"] = [ + "required" => true, + "content" => [ + "application/json" => [], + ]]; + } } elseif ($method == 'post') { $paths[$path][$method]["responses"]["204"] = [ "description" => "successfully created", @@ -652,15 +841,27 @@ function makeDescription($isRelation, $method, $singleObject): string { ] ]; - $paths[$path][$method]["requestBody"] = [ - "required" => true, - "content" => [ - "application/json" => [ - "schema" => [ - '$ref' => "#/components/schemas/" . $name . "Create" - ], - ] - ]]; + if ($isRelation) { + $paths[$path][$method]["requestBody"] = [ + "required" => true, + "content" => [ + "application/json" => [ + "schema" => [ + '$ref' => "#/components/schemas/" . $name . "Relation" . ucfirst($relation) + ], + ], + ]]; + } else { + $paths[$path][$method]["requestBody"] = [ + "required" => true, + "content" => [ + "application/json" => [ + "schema" => [ + '$ref' => "#/components/schemas/" . $name . "Create" + ], + ] + ]]; + } } else { throw new HttpErrorException("Method '$method' not implemented"); @@ -668,16 +869,6 @@ function makeDescription($isRelation, $method, $singleObject): string { } if ($singleObject && $method == 'get') { - $paths[$path][$method]["responses"]["200"] = [ - "description" => "successful operation", - "content" => [ - "application/json" => [ - "schema" => [ - '$ref' => "#/components/schemas/" . $name . "Response" - ] - ] - ] - ]; $parameters = [ [ "name" => "id", @@ -690,7 +881,7 @@ function makeDescription($isRelation, $method, $singleObject): string { ] ]]; - if ($method == 'get') { + if ($method == 'get' && !str_contains($path, "relation:")){ array_push($parameters, [ "name" => "include", @@ -706,7 +897,7 @@ function makeDescription($isRelation, $method, $singleObject): string { $parameters = [ [ "name" => "page[after]", - "in" => "query", + "in" => "path", "schema" => [ "type" => "integer", "format" => "int32" @@ -716,7 +907,7 @@ function makeDescription($isRelation, $method, $singleObject): string { ], [ "name" => "page[before]", - "in" => "query", + "in" => "path", "schema" => [ "type" => "integer", "format" => "int32" @@ -726,7 +917,7 @@ function makeDescription($isRelation, $method, $singleObject): string { ], [ "name" => "page[size]", - "in" => "query", + "in" => "path", "schema" => [ "type" => "integer", "format" => "int32" @@ -736,7 +927,7 @@ function makeDescription($isRelation, $method, $singleObject): string { ], [ "name" => "filter", - "in" => "query", + "in" => "path", "style" => "deepobject", "explode" => true, "schema" => [ @@ -747,7 +938,7 @@ function makeDescription($isRelation, $method, $singleObject): string { ], [ "name" => "include", - "in" => "query", + "in" => "path", "schema" => [ "type" => "string" ], @@ -868,7 +1059,142 @@ function makeDescription($isRelation, $method, $singleObject): string { ], "additionalProperties" => false ]; + //Hard coded headers for the importfile endpoints. + $paths["/api/v2/helper/importFile"]["post"]["parameters"] = [ + [ + "name" => "Upload-Metadata", + "in" => "header", + "required" => "true", + "schema" => [ + "type" => "string", + "pattern" => '^([a-zA-Z0-9]+ [A-Za-z0-9+/=]+)(,[a-zA-Z0-9]+ [A-Za-z0-9+/=]+)*$' + ], + "example" => "filename ZXhhbXBsZS50eHQ=", + "description" => " The Upload-Metadata header contains one or more comma-separated key-value pairs. + Each pair is formatted as ` `, where: + - `key` is a string without spaces. + - `value` is base64-encoded" + ], + [ + "name" => "Upload-Length", + "in" => "header", + "schema" => [ + "type" => "integer", + "minimum" => 1 + ], + "example" => 10000, + "description" => "The total size of the upload in bytes. Must be a positive integer. + Required if `Upload-Defer-Length` is not set." + ], + [ + "name" => "Upload-Defer-Length", + "in" => "header", + "schema" => [ + "type" => "integer", + ], + "example" => 1, + "description" => "Indicates that the upload length is not known at creation time. + Value must be `1`. If present, `Upload-Length` must be omitted." + ] + ]; + + $paths["/api/v2/helper/importFile/{id:[0-9]{14}-[0-9a-f]{32}}"]["patch"]["parameters"] = [ + [ + "name" => "Upload-Offset", + "in" => "header", + "required" => "true", + "schema" => [ + "type" => "integer", + ], + "example" => "512", + "description" => " The Upload-Offset header’s value MUST be equal to the current offset of the resource" + ], + [ + "name" => "Content-Type", + "in" => "header", + "required" => "true", + "schema" => [ + "type" => "string", + "enum" => ["application/offset+octet-stream"] + ], + ], + ]; + $paths["/api/v2/helper/importFile/{id:[0-9]{14}-[0-9a-f]{32}}"]["patch"]["requestBody"] = [ + [ + "required" => "true", + "description" => "The binary data to push to the file", + "content" => [ + "application/offset+octet-stream" => [ + "schema" => [ + "type" => "string", + "format" => "binary" + ] + ] + ] + ] + ]; + + $paths["/api/v2/helper/importFile/{id:[0-9]{14}-[0-9a-f]{32}}"]["head"]["responses"]["200"] = [ + "description" => "sucessful request", + "headers" => [ + "Tus-Resumable" => getTUSheader(), + "Upload-Offset" => [ + "description" => "Number of bytes already received", + "schema" => [ + "type" => "integer" + ] + ], + "Upload-Length" => [ + "description" => "Total upload length (if known)", + "schema" => [ + "type" => "integer" + ], + ], + "Upload-Defer-Length" => [ + "description" => "Indicates deferred upload length (if applicable)", + "schema" => [ + "type" => "string" + ], + ], + "Upload-Metadata" => [ + "description" => "Original metadata sent during creation", + "schema" => [ + "type" => "string" + ] + ] + ] + ]; + $paths["/api/v2/helper/importFile"]["post"]["responses"]["201"] = [ + "description" => "succesful operation", + "headers" => [ + "Tus-Resumable" => getTUSheader(), + "Location" => [ + "description" => "Location of the file where the user can push to.", + "schema" => [ + "type" => "string" + ] + ] + ], + "content" => [ + "application/pdf" => [ + "type" => "string", + "format" => "binary" + ] + ] + ]; + $paths["/api/v2/helper/importFile/{id:[0-9]{14}-[0-9a-f]{32}}"]["patch"]["responses"]["204"] = [ + "description" => "Chunk accepted", + "headers" => [ + "Tus-Resumable" => getTUSheader(), + "Upload-Offset" => [ + "description" => "The new offset after the chunk is accepted. Indicates how many bytes were received so far.", + "schema" => [ + "type" => "integer" + ] + ] + ] + ]; /** * Build final result */ diff --git a/src/inc/apiv2/helper/abortChunk.routes.php b/src/inc/apiv2/helper/abortChunk.routes.php index 9978b4a29..b3c10b34f 100644 --- a/src/inc/apiv2/helper/abortChunk.routes.php +++ b/src/inc/apiv2/helper/abortChunk.routes.php @@ -18,17 +18,27 @@ public function getRequiredPermissions(string $method): array return [Chunk::PERM_UPDATE, Chunk::PERM_DELETE]; } + /** + * ChunkID is the ID of the chunk that needs to be aborted. + */ public function getFormFields(): array { return [ Chunk::CHUNK_ID => ['type' => 'int'] ]; } + public static function getResponse(): array { + return ["Abort" => "Success"]; + } + + /** + * Endpoint to stop a running chunk. + */ public function actionPost(array $data): object|array|null { $chunk = self::getChunk($data[Chunk::CHUNK_ID]); TaskUtils::abortChunk($chunk->getId(), $this->getCurrentUser()); - return null; + return self::getResponse(); } } diff --git a/src/inc/apiv2/helper/assignAgent.routes.php b/src/inc/apiv2/helper/assignAgent.routes.php index 7abef2223..c8d9f8985 100644 --- a/src/inc/apiv2/helper/assignAgent.routes.php +++ b/src/inc/apiv2/helper/assignAgent.routes.php @@ -18,18 +18,29 @@ public function getRequiredPermissions(string $method): array { return [Agent::PERM_UPDATE, Task::PERM_UPDATE]; } + /** + * The agentId is the Id of the agent that has to be assigned to the task. + * The taskId is the Id of the task that will be assigned to the agent. If this is set to 0, + * the agent will be unassigned from its current assigned task. + */ public function getFormFields(): array { return [ Agent::AGENT_ID => ["type" => "int"], Task::TASK_ID => ["type" => "int"], ]; } + + public static function getResponse(): array { + return ["Assign" => "Success"]; + } + /** + * This endpoint is responsible for assigning a task to a specific agent. + */ public function actionPost($data): object|array|null { AgentUtils::assign($data[Agent::AGENT_ID], $data[Task::TASK_ID], $this->getCurrentUser()); - # TODO: Check how to handle custom return messages that are not object, probably we want that to be in some kind of standardized form. - return ["assign" => "success"]; + return self::getResponse(); } } diff --git a/src/inc/apiv2/helper/createSuperHashlist.routes.php b/src/inc/apiv2/helper/createSuperHashlist.routes.php index a2139b761..b40247fad 100644 --- a/src/inc/apiv2/helper/createSuperHashlist.routes.php +++ b/src/inc/apiv2/helper/createSuperHashlist.routes.php @@ -26,6 +26,10 @@ public function getRequiredPermissions(string $method): array return [Hashlist::PERM_CREATE, Hashlist::PERM_READ]; } + /** + * Hashlistids is an array of hashlist ids of the hashlists that have to be combined into a superhashlist. + * Name is the name of the newly created superhashlist. + */ public function getFormFields(): array { return [ @@ -34,6 +38,13 @@ public function getFormFields(): array ]; } + public static function getResponse(): string { + return "Hashlist"; + } + + /** + * Endpoint to create a super hashlist from multiple hashlists + */ public function actionPost($data): object|array|null { /* Validate incoming hashlists */ $hashlistIds = []; diff --git a/src/inc/apiv2/helper/createSupertask.routes.php b/src/inc/apiv2/helper/createSupertask.routes.php index 8ac7de5d0..7ff977c45 100644 --- a/src/inc/apiv2/helper/createSupertask.routes.php +++ b/src/inc/apiv2/helper/createSupertask.routes.php @@ -25,6 +25,11 @@ public function getRequiredPermissions(string $method): array return [TaskWrapper::PERM_CREATE, Task::PERM_CREATE, Supertask::PERM_READ, Hashlist::PERM_READ, CrackerBinary::PERM_READ]; } + /** + * supertaskTemplateId is the the Id of the supertakstemplate of which you want to create a supertask of. + * hashlistId is the Id of the hashlist that has to be used for the supertask. + * crackerVersionId is the Id of the crackerversion that is used for the created supertask. + */ public function getFormFields(): array { return [ @@ -34,6 +39,13 @@ public function getFormFields(): array ]; } + public static function getResponse(): string { + return "TaskWrapper"; + } + + /** + * Endpoint to create a supertask from a supertask template + */ public function actionPost($data): object|array|null { $supertaskTemplate = self::getSupertask($data["supertaskTemplateId"]); $hashlist = self::getHashlist($data[Hashlist::HASHLIST_ID]); diff --git a/src/inc/apiv2/helper/exportCrackedHashes.routes.php b/src/inc/apiv2/helper/exportCrackedHashes.routes.php index 7050d571a..428bce475 100644 --- a/src/inc/apiv2/helper/exportCrackedHashes.routes.php +++ b/src/inc/apiv2/helper/exportCrackedHashes.routes.php @@ -19,6 +19,9 @@ public function getRequiredPermissions(string $method): array return [Hashlist::PERM_READ, Hash::PERM_READ, File::PERM_CREATE]; } + /** + * hashlistId is the Id of the hashlist where you want to export the hashes of. + */ public function getFormFields(): array { return [ @@ -26,6 +29,13 @@ public function getFormFields(): array ]; } + public static function getResponse(): string { + return "File"; + } + + /** + * Endpoint to export cracked hashes. + */ public function actionPost($data): object|array|null { $hashlist = self::getHashlist($data[Hashlist::HASHLIST_ID]); diff --git a/src/inc/apiv2/helper/exportLeftHashes.routes.php b/src/inc/apiv2/helper/exportLeftHashes.routes.php index 582404ad1..cddfa0a5d 100644 --- a/src/inc/apiv2/helper/exportLeftHashes.routes.php +++ b/src/inc/apiv2/helper/exportLeftHashes.routes.php @@ -19,6 +19,9 @@ public function getRequiredPermissions(string $method): array return [Hashlist::PERM_READ, Hash::PERM_READ, File::PERM_CREATE]; } + /** + * hashlistId is the id of the hashlist where you want to export the uncracked hashes of. + */ public function getFormFields(): array { return [ @@ -26,6 +29,13 @@ public function getFormFields(): array ]; } + public static function getResponse(): string { + return "File"; + } + + /** + * Endpoint to export uncracked hashes of a hashlist. + */ public function actionPost($data): object|array|null { $hashlist = self::getHashlist($data[Hashlist::HASHLIST_ID]); diff --git a/src/inc/apiv2/helper/exportWordlist.routes.php b/src/inc/apiv2/helper/exportWordlist.routes.php index 56d1b58be..9d24b184b 100644 --- a/src/inc/apiv2/helper/exportWordlist.routes.php +++ b/src/inc/apiv2/helper/exportWordlist.routes.php @@ -19,6 +19,9 @@ public function getRequiredPermissions(string $method): array return [Hashlist::PERM_READ, Hash::PERM_READ, File::PERM_CREATE]; } + /** + * hashlistId is the Id of the hashlist where you want to export the wordlist of. + */ public function getFormFields(): array { return [ @@ -26,6 +29,13 @@ public function getFormFields(): array ]; } + public static function getResponse(): string { + return "File"; + } + + /** + * Endpoint to export a wordlist of the cracked hashes inside a hashlist. + */ public function actionPost($data): object|array|null { $hashlist = self::getHashlist($data[Hashlist::HASHLIST_ID]); diff --git a/src/inc/apiv2/helper/getFile.routes.php b/src/inc/apiv2/helper/getFile.routes.php index 2e685bdc8..f4940a52d 100644 --- a/src/inc/apiv2/helper/getFile.routes.php +++ b/src/inc/apiv2/helper/getFile.routes.php @@ -3,6 +3,7 @@ use Psr\Http\Message\ResponseInterface as Response; use Psr\Http\Message\ServerRequestInterface as Request; use DBA\Factory; +use Middlewares\Utils\HttpErrorException; use Slim\Exception\HttpNotFoundException; use Slim\Exception\HttpForbiddenException; @@ -21,6 +22,14 @@ public function getRequiredPermissions(string $method): array { return [File::PERM_READ]; } + /** + * geTfile is different because it returns actual binary data. + */ + public static function getResponse(): null { + return null; + } + + public function actionPost(array $data): object|array|null { assert(False, "GetFile has no POST"); @@ -47,7 +56,7 @@ public function validateFile($request, $file_id) { } /** - * Handles HTTP range requests for partial conten delivery + * Handles HTTP range requests for partial content delivery * * This method processes the `Range` header from the HTTP request * to determine the start and end byte positions for the response, @@ -98,9 +107,35 @@ protected function handleRangeRequest(int &$start, int &$end, int &$size, &$fp) return true; } + /** + * Description of get params for swagger. + */ + public function getParamsSwagger(): array { + return [ + [ + "in" => "query", + "name" => "file", + "schema" => [ + "type" => "integer", + "format" => "int32" + ], + "required" => true, + "example" => 1, + "description" => "The ID of the file to download." + ] + ]; + } + + /** + * Endpoint to download files + */ public function handleGet(Request $request, Response $response): Response { $this->preCommon($request); - $file_id = intval($request->getQueryParams()['file']); + $fileParam = $request->getQueryParams()['file']; + if ($fileParam == null) { + throw new HttpErrorException("No File query param has been provided"); + } + $file_id = intval($fileParam); $filename = $this->validateFile($request, $file_id); diff --git a/src/inc/apiv2/helper/importCrackedHashes.routes.php b/src/inc/apiv2/helper/importCrackedHashes.routes.php index 6f99e0481..19f25017c 100644 --- a/src/inc/apiv2/helper/importCrackedHashes.routes.php +++ b/src/inc/apiv2/helper/importCrackedHashes.routes.php @@ -18,6 +18,11 @@ public function getRequiredPermissions(string $method): array { return [Hashlist::PERM_UPDATE, Hash::PERM_UPDATE]; } + /** + * HashlistId is the Id of the hashlist where you want to import the cracked hashes into. + * SourceData is the cracked hashes you want to import. + * Seperator is the seperator that has been used for the salt in the hashes. + */ public function getFormFields(): array { return [ Hashlist::HASHLIST_ID => ["type" => "int"], @@ -25,7 +30,22 @@ public function getFormFields(): array { "separator" => ['type' => 'str'], ]; } + + public static function getResponse(): array { + return [ + "totalLines" => 100, + "newCracked" => 5, + "alreadyCracked" => 2, + "invalid" => 1, + "notFound" => 1, + "processTime" => 60, + "tooLongPlaintexts" => 4, + ]; + } + /** + * Endpoint to import cracked hashes into a hashlist. + */ public function actionPost($data): object|array|null { $hashlist = self::getHashlist($data[Hashlist::HASHLIST_ID]); diff --git a/src/inc/apiv2/helper/importFile.routes.php b/src/inc/apiv2/helper/importFile.routes.php index ce6eb4b83..e6f3971e7 100644 --- a/src/inc/apiv2/helper/importFile.routes.php +++ b/src/inc/apiv2/helper/importFile.routes.php @@ -1,5 +1,15 @@ ) * - Marks file and stores as import/ */ -use Psr\Http\Message\ResponseInterface as Response; -use Psr\Http\Message\ServerRequestInterface as Request; - -use Slim\Routing\RouteCollectorProxy; -use DBA\Factory; - -/* Default timeout interval for considering an upload stale/incomplete */ -define('DEFAULT_UPLOAD_EXPIRES_TIMEOUT', 3600); - -require_once(dirname(__FILE__) . "/../../load.php"); - -function getUploadPath(string $id): string { - $filename = "/tmp/" . $id . '.part'; - return $filename; -}; - -function getMetaPath(string $id): string { - $filename = "/tmp/" . $id . '.meta'; - return $filename; -}; - -function getImportPath(string $id): string { - $filename = Factory::getStoredValueFactory()->get(DDirectories::IMPORT)->getVal() . "/" . $id; - return $filename; -}; - -function getChecksumAlgorithm(): array { - return ['md5', 'sha1' ,'crc32']; -} - - -/* Database quick for temponary storage during upload */ -function getMetaStorage(string $id): array { - $metaPath = getMetaPath($id); - $ds = file_exists($metaPath) ? (array)json_decode(file_get_contents($metaPath), true) : array(); - - return $ds; -} - -function updateStorage(string $id, array $update): void { - $ds = getMetaStorage($id); - - $newDs = $update + $ds; - $metaPath = getMetaPath($id); - file_put_contents($metaPath, json_encode($newDs)); -} - - -$app->group("/api/v2/helper/importFile", function (RouteCollectorProxy $group) { - $group->options('', function (Request $request, Response $response, array $args): Response { - return $response->withStatus(204) - ->withHeader('Tus-Version', '1.0.0') - ->withHeader('Tus-Resumable', '1.0.0') - ->withHeader('Tus-Checksum-Algorithm', join(',', getChecksumAlgorithm())) - //TODO: Maybe add Upload-Expires support. Return in PATCH with RFC 7231 - ->withHeader('Tus-Extension', 'checksum,creation,creation-defer-length,expiration,termination') - ->withHeader('Access-Control-Expose-Headers', 'Tus-Version, Tus-Resumable, Tus-Checksum-Algorithm, Tus-Extension'); - //TODO: Option for Tus-Max-Size: 1073741824 - }); +class ImportFileHelperAPI extends AbstractHelperAPI { + public static function getBaseUri(): string { + return "/api/v2/helper/importFile"; + } + + public function getRequiredPermissions(string $method): array { + return []; + } + + static function getUploadPath(string $id): string { + $filename = "/tmp/" . $id . '.part'; + return $filename; + } + + static function getMetaPath(string $id): string { + $filename = "/tmp/" . $id . '.meta'; + return $filename; + } + + /** + * Import file has no POST parameters + */ + public function getFormFields(): array { + return []; + } + + + static function getImportPath(string $id): string { + $filename = Factory::getStoredValueFactory()->get(DDirectories::IMPORT)->getVal() . "/" . $id; + return $filename; + } + + static function getChecksumAlgorithm(): array { + return ['md5', 'sha1' ,'crc32']; + } + + + /* Database quick for temponary storage during upload */ + static function getMetaStorage(string $id): array { + $metaPath = self::getMetaPath($id); + $ds = file_exists($metaPath) ? (array)json_decode(file_get_contents($metaPath), true) : array(); + + return $ds; + } + + static function updateStorage(string $id, array $update): void { + $ds = self::getMetaStorage($id); + + $newDs = $update + $ds; + $metaPath = self::getMetaPath($id); + file_put_contents($metaPath, json_encode($newDs)); + } + + //register is overriden so no actionPost needed + function actionPost(array $data): object|array|null + { + return null; + } + + /** + * A HEAD request is used in the TUS protocol to determine the offset at which the upload should be continued. + * And to retrieve the upload status. + */ + function processHead(Request $request, Response $response, array $args): Response { + // TODO return 404 or 410 if entry is not found + $filename = self::getUploadPath($args['id']); + $currentSize = filesize($filename); + $ds = self::getMetaStorage($args['id']); + $newResponse = $response->withStatus(200) + ->withHeader("Cache-Control", "no-store") + ->withHeader("Upload-Offset", strval($currentSize)) + ->withHeader("Access-Control-Expose-Headers", "Cache-Control, Upload-Offset") + ; + + if (array_key_exists("upload_metadata_raw", $ds)) { + $cors_headers = $newResponse->getHeaderLine("Access-Control-Expose-Headers"); + $newResponse2 = $newResponse + ->withHeader("Upload-Metadata", $ds["upload_metadata_raw"]) + ->withHeader("Access-Control-Expose-Headers", $cors_headers . ", Upload-Metadata") + ; + } else { + $newResponse2 = $newResponse; + } - $group->post('', function (Request $request, Response $response, array $args): Response { + if ($ds["upload_defer_length"] === true) { + $cors_headers = $newResponse->getHeaderLine("Access-Control-Expose-Headers"); + return $newResponse2 + ->withHeader("Upload-Defer-Length", "1") + ->withHeader("Access-Control-Expose-Headers", $cors_headers . ", Upload-Defer-Length") + ; + } else { + $cors_headers = $newResponse->getHeaderLine("Access-Control-Expose-Headers"); + return $newResponse2 + ->withHeader("Upload-Length", strval($ds["upload_length"])) + ->withHeader("Access-Control-Expose-Headers", $cors_headers . ", Upload-Length") + ; + } + } + + /** + * getfile is different because it returns actual binary data. + */ + public static function getResponse(): null { + return null; + } + + /** File import API + * Based on TUS protocol: https://tus.io/protocols/resumable-upload.html + * + * 1) Client 'Announce' file at ./api/v2/helper/importFile' + * - Ensure Upload-Metadata: filename= base64-encoded-filename is set + * 2) Server checks filename does not exists yet: + * - Checked not part of ongoing transfer (.part / .metatadata in import directory) + * - Checked not uploaded yet (import/) + * If all conditions are met, upload is created and user informed about UUID to push to. + * 3) Client pushes parts to ./api/v2/ui/files/ + * - Checked if upload timeout is not expired + * 4) Server check if upload is completed + * - Checked if not present yet (import/) + * - Marks file and stores as import/ + */ + function processPost(Request $request, Response $response, array $args): Response + { $update = []; if ($request->hasHeader('Upload-Metadata')) { $update["upload_metadata_raw"] = $request->getHeader('Upload-Metadata')[0]; @@ -84,7 +156,7 @@ function updateStorage(string $id, array $update): void { $response->getBody()->write('Error Upload-Metadata contains non-ASCII characters'); return $response->withStatus(400); } - + $update_metadata = []; $list = explode(",", $update["upload_metadata_raw"]); foreach ($list as $item) { @@ -101,8 +173,8 @@ function updateStorage(string $id, array $update): void { $filename = $update_metadata['filename']; /* Generate unique upload identifier */ $id = date("YmdHis") . "-" . md5($filename); - if ((file_exists(getImportPath($filename))) || - (file_exists(getUploadPath($id)))) { + if ((file_exists(self::getImportPath($filename))) || + (file_exists(self::getUploadPath($id)))) { $response->getBody()->write("Error filename '$filename' already exists!"); return $response->withStatus(400); } @@ -127,65 +199,20 @@ function updateStorage(string $id, array $update): void { /* Give user fix amount of time to upload file, before temponary files are removed */ $update["upload_expires"] = (new DateTime())->getTimestamp() + DEFAULT_UPLOAD_EXPIRES_TIMEOUT; - updateStorage($id, $update); - file_put_contents(getUploadPath($id), ''); + self::updateStorage($id, $update); + file_put_contents(self::getUploadPath($id), ''); // TODO: Hash of filename and/or check if similar named file already exists return $response->withStatus(201) ->withHeader("Location", "/api/v2/helper/importFile/$id") ->withHeader('Tus-Resumable', '1.0.0') ->withHeader('Access-Control-Expose-Headers', 'Location, Tus-Resumable'); - }); -}); - -$app->group("/api/v2/helper/importFile/{id:[0-9]{14}-[0-9a-f]{32}}", function (RouteCollectorProxy $group) { - /* Allow preflight requests */ - $group->options('', function (Request $request, Response $response, array $args): Response { - return $response; - }); - - - $group->map(['HEAD'], '', function (Request $request, Response $response, array $args): Response { - // TODO return 404 or 410 if entry is not found - $filename = getUploadPath($args['id']); - $currentSize = filesize($filename); - $ds = getMetaStorage($args['id']); - - $newResponse = $response->withStatus(200) - ->withHeader("Cache-Control", "no-store") - ->withHeader("Upload-Offset", strval($currentSize)) - ->withHeader("Access-Control-Expose-Headers", "Cache-Control, Upload-Offset") - ; - - if (array_key_exists("upload_metadata_raw", $ds)) { - $cors_headers = $newResponse->getHeaderLine("Access-Control-Expose-Headers"); - $newResponse2 = $newResponse - ->withHeader("Upload-Metadata", $ds["upload_metadata_raw"]) - ->withHeader("Access-Control-Expose-Headers", $cors_headers . ", Upload-Metadata") - ; - } else { - $newResponse2 = $newResponse; - } - - if ($ds["upload_defer_length"] === true) { - $cors_headers = $newResponse->getHeaderLine("Access-Control-Expose-Headers"); - return $newResponse2 - ->withHeader("Upload-Defer-Length", "1") - ->withHeader("Access-Control-Expose-Headers", $cors_headers . ", Upload-Defer-Length") - ; - } else { - $cors_headers = $newResponse->getHeaderLine("Access-Control-Expose-Headers"); - return $newResponse2 - ->withHeader("Upload-Length", strval($ds["upload_length"])) - ->withHeader("Access-Control-Expose-Headers", $cors_headers . ", Upload-Length") - ; - } - }); - - - + } - $group->patch('', function (Request $request, Response $response, array $args): Response { + /** + * Given the offset in the 'Upload Offset' header, the user can use this PATCH endpoint in order to resume the upload. + */ + function processPatch(Request $request, Response $response, array $args): Response { // Check for Content-Type: application/offset+octet-stream or return 415 if (($request->hasHeader('Content-Type') == false) || ($request->getHeader('Content-Type')[0] != "application/offset+octet-stream")) { @@ -194,7 +221,7 @@ function updateStorage(string $id, array $update): void { } /* Return 404 if entry is not found */ - $filename = getUploadPath($args['id']); + $filename = self::getUploadPath($args['id']); if (file_exists($filename) === false) { // TODO: Maybe 410 if actual file still exists and meta file also exists? $response->getBody()->write('Upload ID does not exists'); @@ -224,7 +251,7 @@ function updateStorage(string $id, array $update): void { return $response->withStatus(400); } - $ds = getMetaStorage($args['id']); + $ds = self::getMetaStorage($args['id']); /* Validate if upload time is still valid */ $now = new DateTimeImmutable(); @@ -239,7 +266,7 @@ function updateStorage(string $id, array $update): void { if ($request->hasHeader('Upload-Checksum')) { $uploadChecksum = $request->getHeader('Upload-Checksum')[0]; /* algo base64_checksum */ - $regex = "/^(" . join("|", getChecksumAlgorithm()) . ")" . + $regex = "/^(" . join("|", self::getChecksumAlgorithm()) . ")" . "[ ]+((?:[A-Za-z0-9+\/]{4})*(?:[A-Za-z0-9+\/]{2}==|[A-Za-z0-9+\/]{3}=))?$/"; if(preg_match($regex, $uploadChecksum, $matches) === false) { @@ -274,7 +301,7 @@ function updateStorage(string $id, array $update): void { if ($request->hasHeader('Upload-Length')) { $update["upload_length"] = intval($request->getHeader('Upload-Length')[0]); $update["upload_defer_length"] = false; - updateStorage($args['id'], $update); + self::updateStorage($args['id'], $update); } } @@ -294,7 +321,7 @@ function updateStorage(string $id, array $update): void { } /* Check if completed file is not created meanwhile */ - $importPath = getImportPath($targetFile); + $importPath = self::getImportPath($targetFile); if (file_exists($importPath)) { $response->getBody()->write("Error filename '$targetFile' already exists!"); return $response->withStatus(400); @@ -302,7 +329,7 @@ function updateStorage(string $id, array $update): void { /* Migrate completed file to import folder */ rename($filename, $importPath); - unlink(getMetaPath($args['id'])); + unlink(self::getMetaPath($args['id'])); } else { $statusMsg = "Next chunk please"; } @@ -314,14 +341,50 @@ function updateStorage(string $id, array $update): void { ->withHeader("Upload-Offset", strval($newSize)) ->withHeader('Upload-Expires', $dt->format(DateTimeInterface::RFC7231)) ->WithHeader("Access-Control-Expose-Headers", "Tus-Resumable, Upload-Length, Upload-Offset"); - }); + } + + /** + * Endpoint to delete the file + */ + function processDelete(Request $request, Response $response, array $args): Response { + // // TODO delete file + + // // TODO return 404 or 410 if entry is not found + return $response->withStatus(204) + ->withHeader("Tus-Resumable", "1.0.0") + ->WithHeader("Access-Control-Expose-Headers", "Tus-Resumable"); + } + + static public function register($app): void { + $me = get_called_class(); + $baseUri = $me::getBaseUri(); + + $app->group($baseUri, function (RouteCollectorProxy $group) use($me) { + $group->options('', function (Request $request, Response $response, array $args): Response { + return $response->withStatus(204) + ->withHeader('Tus-Version', '1.0.0') + ->withHeader('Tus-Resumable', '1.0.0') + ->withHeader('Tus-Checksum-Algorithm', join(',', self::getChecksumAlgorithm())) + //TODO: Maybe add Upload-Expires support. Return in PATCH with RFC 7231 + ->withHeader('Tus-Extension', 'checksum,creation,creation-defer-length,expiration,termination') + ->withHeader('Access-Control-Expose-Headers', 'Tus-Version, Tus-Resumable, Tus-Checksum-Algorithm, Tus-Extension'); + //TODO: Option for Tus-Max-Size: 1073741824 + }); + + $group->post('', $me . ":processPost")->setName($me . ":processPost"); + }); - $group->delete('', function (Request $request, Response $response, array $args): Response { - // TODO delete file + $app->group($baseUri . "/{id:[0-9]{14}-[0-9a-f]{32}}", function (RouteCollectorProxy $group) use($me){ + /* Allow preflight requests */ + $group->options('', function (Request $request, Response $response, array $args): Response { + return $response; + }); + + $group->map(['HEAD'], '', $me . ":processHead")->setName($me . ":processHead"); + $group->patch('', $me . ":processPatch")->setName($me . ":processPatch"); + $group->delete('', $me . ":processDelete")->setName($me . ":processDelete"); + }); + } +} - // TODO return 404 or 410 if entry is not found - return $response->withStatus(204) - ->withHeader("Tus-Resumable", "1.0.0") - ->WithHeader("Access-Control-Expose-Headers", "Tus-Resumable"); - }); -}); \ No newline at end of file +ImportFileHelperAPI::register($app); \ No newline at end of file diff --git a/src/inc/apiv2/helper/purgeTask.routes.php b/src/inc/apiv2/helper/purgeTask.routes.php index d7f308d57..ee0892145 100644 --- a/src/inc/apiv2/helper/purgeTask.routes.php +++ b/src/inc/apiv2/helper/purgeTask.routes.php @@ -18,6 +18,9 @@ public function getRequiredPermissions(string $method): array return [Chunk::PERM_DELETE, Task::PERM_UPDATE]; } + /** + * taskId is the id of the task that should be purged. + */ public function getFormFields(): array { return [ @@ -25,11 +28,18 @@ public function getFormFields(): array ]; } + public static function getResponse(): array { + return ["Purge" => "Success"]; + } + + /** + * Endpoint to purge a task. Meaning all chunks of a task will be deleted and keyspace and progress will be set to 0. + */ public function actionPost($data): object|array|null { $task = self::getTask($data[Task::TASK_ID]); TaskUtils::purgeTask($task->getId(), $this->getCurrentUser()); - return null; + return $this->getResponse(); } } diff --git a/src/inc/apiv2/helper/recountFileLines.routes.php b/src/inc/apiv2/helper/recountFileLines.routes.php index d3bb0fd63..bab2d6b7c 100644 --- a/src/inc/apiv2/helper/recountFileLines.routes.php +++ b/src/inc/apiv2/helper/recountFileLines.routes.php @@ -17,6 +17,9 @@ public function getRequiredPermissions(string $method): array return [File::PERM_UPDATE]; } + /** + * FileId is the id of the file that needs to be recounted. + */ public function getFormFields(): array { return [ @@ -24,6 +27,13 @@ public function getFormFields(): array ]; } + public static function getResponse(): string { + return "File"; + } + + /** + * Endpoint to recount files for when there is size mismatch + */ public function actionPost($data): object|array|null { // first retrieve the file, as fileCountLines does not check any permissions, therfore to be sure call getFile() first, even if it is not required technically FileUtils::getFile($data[File::FILE_ID], $this->getCurrentUser()); diff --git a/src/inc/apiv2/helper/resetChunk.routes.php b/src/inc/apiv2/helper/resetChunk.routes.php index 1cec7e7fa..f0ff78e00 100644 --- a/src/inc/apiv2/helper/resetChunk.routes.php +++ b/src/inc/apiv2/helper/resetChunk.routes.php @@ -18,16 +18,26 @@ public function getRequiredPermissions(string $method): array return [Chunk::PERM_UPDATE]; } + /** + * chunkId is the id of the chunk which you want to reset. + */ public function getFormFields(): array { return [ Chunk::CHUNK_ID => ['type' => 'int'] ]; } + public static function getResponse(): array { + return ["Reset" => "Success"]; + } + + /** + * Endpoint to reset a chunk. + */ public function actionPost(array $data): object|array|null { $chunk = self::getChunk($data[Chunk::CHUNK_ID]); TaskUtils::resetChunk($chunk->getId(), $this->getCurrentUser()); - return null; + return $this->getResponse(); } } diff --git a/src/inc/apiv2/helper/setUserPassword.routes.php b/src/inc/apiv2/helper/setUserPassword.routes.php index 5a19326f7..dee70d8b1 100644 --- a/src/inc/apiv2/helper/setUserPassword.routes.php +++ b/src/inc/apiv2/helper/setUserPassword.routes.php @@ -20,6 +20,10 @@ public function getRequiredPermissions(string $method): array return [User::PERM_UPDATE]; } + /** + * userId is the is of the user of which you want to change the password. + * password is the new password that you want to set. + */ public function getFormFields(): array { return [ @@ -28,6 +32,13 @@ public function getFormFields(): array ]; } + public static function getResponse(): array { + return ["Set password" => "Success"]; + } + + /** + * Endpoint to set a password of an user. + */ public function actionPost($data): object|array|null { $user = self::getUser($data[User::USER_ID]); @@ -37,7 +48,7 @@ public function actionPost($data): object|array|null { $data["password"], $this->getCurrentUser() ); - return null; + return $this->getResponse(); } } diff --git a/src/inc/apiv2/helper/unassignAgent.routes.php b/src/inc/apiv2/helper/unassignAgent.routes.php index 53cd43e40..52199f2c4 100644 --- a/src/inc/apiv2/helper/unassignAgent.routes.php +++ b/src/inc/apiv2/helper/unassignAgent.routes.php @@ -18,17 +18,26 @@ public function getRequiredPermissions(string $method): array { return [Agent::PERM_UPDATE, Task::PERM_UPDATE]; } + /** + * agentId is the id of the agent which you want to unassign. + */ public function getFormFields(): array { return [ Agent::AGENT_ID => ["type" => "int"], ]; } + + public static function getResponse(): array { + return ["Unassign" => "Success"]; + } + /** + * Endpoint to unassign an agent. + */ public function actionPost($data): object|array|null { AgentUtils::assign($data[Agent::AGENT_ID], 0, $this->getCurrentUser()); - # TODO: Check how to handle custom return messages that are not object, probably we want that to be in some kind of standardized form. - return ["unassign" => "success"]; + return $this->getResponse(); } } From 210cd65f23cb2aa91f407d444bdbfcfab41aa6a3 Mon Sep 17 00:00:00 2001 From: jessevz Date: Mon, 28 Apr 2025 14:08:19 +0200 Subject: [PATCH 064/691] Fixed error by adding abstract function to resetUserPassword helper --- src/inc/apiv2/helper/resetUserPassword.routes.php | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/src/inc/apiv2/helper/resetUserPassword.routes.php b/src/inc/apiv2/helper/resetUserPassword.routes.php index 6959f3b5f..ae389a4f3 100644 --- a/src/inc/apiv2/helper/resetUserPassword.routes.php +++ b/src/inc/apiv2/helper/resetUserPassword.routes.php @@ -21,6 +21,10 @@ public function getRequiredPermissions(string $method): array { public function preCommon(ServerRequestInterface $request): void { // nothing, there is no user for this request as it is an unauthenticated request } + + public static function getResponse(): array { + return ["Reset" => "Success"]; + } public function getFormFields(): array { return [ @@ -32,7 +36,7 @@ public function getFormFields(): array { public function actionPost($data): array|null { UserUtils::userForgotPassword($data[User::USERNAME], $data[User::EMAIL]); - return ["reset" => "success"]; + return $this->getResponse(); } } From 4b8f7de2c1b8a79742b3ecd5b52b22efaba0cbdd Mon Sep 17 00:00:00 2001 From: jessevz Date: Mon, 28 Apr 2025 16:44:31 +0200 Subject: [PATCH 065/691] Add OPTIONS endpoint for relationships in order for prefetch querys to validate --- src/inc/apiv2/common/AbstractModelAPI.class.php | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/src/inc/apiv2/common/AbstractModelAPI.class.php b/src/inc/apiv2/common/AbstractModelAPI.class.php index c7ef2c153..34454de18 100644 --- a/src/inc/apiv2/common/AbstractModelAPI.class.php +++ b/src/inc/apiv2/common/AbstractModelAPI.class.php @@ -1363,6 +1363,12 @@ static public function register($app): void $app->get($baseUriOne . '/' . $relationUri, $me . ':getToOneRelatedResource')->setname($me . ':getToOneRelatedResource'); $app->get($baseUriRelationships . '/' . $relationUri, $me . ':getToOneRelationshipLink')->setname($me . ':getToOneRelationshipLink'); $app->patch($baseUriRelationships . '/' . $relationUri, $me . ':patchToOneRelationshipLink')->setname($me . ':patchToOneRelationshipLink'); + $app->options($baseUriOne . '/' . $relationUri, function (Request $request, Response $response): Response { + return $response; + }); + $app->options($baseUriRelationships . '/' . $relationUri, function (Request $request, Response $response): Response { + return $response; + }); } foreach ($me::getToManyRelationships() as $name => $relationship) { @@ -1372,6 +1378,12 @@ static public function register($app): void $app->patch($baseUriRelationships . '/' . $relationUri, $me . ':patchToManyRelationshipLink')->setname($me . ':patchToManyRelationshipLink'); $app->post($baseUriRelationships . '/' . $relationUri, $me . ':postToManyRelationshipLink')->setname($me . ':postToManyRelationshipLink'); $app->delete($baseUriRelationships . '/' . $relationUri, $me . ':deleteToManyRelationshipLink')->setname($me . ':deleteToManyRelationshipLink'); + $app->options($baseUriOne . '/' . $relationUri, function (Request $request, Response $response): Response { + return $response; + }); + $app->options($baseUriRelationships . '/' . $relationUri, function (Request $request, Response $response): Response { + return $response; + }); } if (in_array("POST", $available_methods)) { From e9f0ed9ed65405fe6d3dc67c0132d668f1267eb1 Mon Sep 17 00:00:00 2001 From: jessevz Date: Wed, 30 Apr 2025 15:13:41 +0200 Subject: [PATCH 066/691] 1131 bug apiv2 more input validation in updateobject in childs of abstractmodel (#1261) * FEAT implemented patch many and reworked updating of objects through new API * Made a start to testing bulk PATCH * Added tests for bulk PATCH * Added more validation when setting attributes in database * Fixed test --------- Co-authored-by: jessevz --- ci/apiv2/hashtopolis.py | 36 ++++++ ci/apiv2/test_agent.py | 5 + ci/apiv2/test_agentassignment.py | 6 +- ci/apiv2/test_config.py | 9 ++ ci/apiv2/test_hashlist.py | 5 + ci/apiv2/test_task.py | 7 +- ci/apiv2/test_user.py | 5 + src/dba/models/Assignment.class.php | 2 +- .../apiv2/common/AbstractBaseAPI.class.php | 8 ++ .../apiv2/common/AbstractModelAPI.class.php | 113 +++++++++++++++--- src/inc/apiv2/common/openAPISchema.routes.php | 5 +- .../apiv2/model/agentassignments.routes.php | 8 +- src/inc/apiv2/model/agentbinaries.routes.php | 8 ++ src/inc/apiv2/model/agents.routes.php | 6 + src/inc/apiv2/model/agentstats.routes.php | 2 +- src/inc/apiv2/model/chunks.routes.php | 2 +- src/inc/apiv2/model/configs.routes.php | 4 + src/inc/apiv2/model/configsections.routes.php | 2 +- src/inc/apiv2/model/files.routes.php | 6 + .../model/globalpermissiongroups.routes.php | 66 +++++----- src/inc/apiv2/model/hashes.routes.php | 2 +- src/inc/apiv2/model/hashlists.routes.php | 23 ++-- .../apiv2/model/healthcheckagents.routes.php | 2 +- src/inc/apiv2/model/notifications.routes.php | 6 + src/inc/apiv2/model/preprocessors.routes.php | 10 ++ src/inc/apiv2/model/pretasks.routes.php | 7 ++ src/inc/apiv2/model/speeds.routes.php | 2 +- src/inc/apiv2/model/tasks.routes.php | 33 ++--- src/inc/apiv2/model/taskwrappers.routes.php | 31 +---- src/inc/apiv2/model/users.routes.php | 30 ++--- src/inc/utils/AgentBinaryUtils.class.php | 36 ++++++ src/inc/utils/AssignmentUtils.class.php | 27 +++++ src/inc/utils/ConfigUtils.class.php | 44 ++++++- src/inc/utils/PreprocessorUtils.class.php | 86 +++++++++++++ src/inc/utils/TaskwrapperUtils.class.php | 44 +++++++ 35 files changed, 535 insertions(+), 153 deletions(-) create mode 100644 src/inc/utils/AssignmentUtils.class.php create mode 100644 src/inc/utils/TaskwrapperUtils.class.php diff --git a/ci/apiv2/hashtopolis.py b/ci/apiv2/hashtopolis.py index 03c548a5b..5c6310202 100644 --- a/ci/apiv2/hashtopolis.py +++ b/ci/apiv2/hashtopolis.py @@ -117,6 +117,18 @@ def authenticate(self): 'Authorization': 'Bearer ' + self._token } + def create_to_many_payload(self, objects, attributes, field): + records = [] + for obj, attribute in zip(objects, attributes): + records.append({ + "type": type(obj).__name__, + "id": obj.id, + "attributes": { + field: attribute + } + }) + return {"data": records} + def create_payload(self, obj, attributes, id=None): payload = {"data": { "type": type(obj).__name__, @@ -234,6 +246,26 @@ def get_one(self, pk, include): self.validate_status_code(r, [200], "Get single object failed") return self.resp_to_json(r) + def patch_many(self, objects, attributes, field): + """ + Used to test PATCH many endpoint. + + args: + objects [Object]: the database objects that have to be PATCHED + field string: the field that has to be changed in the object + attributes [any]: these are the actual attributes you want to set the objects to, where object[0] will be + patched with attributes[0] on the set field + """ + assert len(objects) == len(attributes) + self.authenticate() + uri = self._api_endpoint + self._model_uri + headers = self._headers + headers['Content-Type'] = 'application/json' + payload = self.create_to_many_payload(objects, attributes, field) + logger.debug("Sending bulk PATCH payload: %s to %s", json.dumps(payload), uri) + r = requests.patch(uri, headers=headers, data=json.dumps(payload)) + self.validate_status_code(r, [200], "Patching failed") + def patch_one(self, obj): if not obj.has_changed(): logger.debug("Object '%s' has not changed, no PATCH required", obj) @@ -448,6 +480,10 @@ def patch(cls, obj): cls.get_conn().patch_to_many_relationships(obj) cls.get_conn().patch_one(obj) + @classmethod + def patch_many(cls, objects, attributes, field): + cls.get_conn().patch_many(objects, attributes, field) + @classmethod def create(cls, obj): cls.get_conn().create(obj) diff --git a/ci/apiv2/test_agent.py b/ci/apiv2/test_agent.py index f4a93e4b0..d32ca7768 100644 --- a/ci/apiv2/test_agent.py +++ b/ci/apiv2/test_agent.py @@ -56,3 +56,8 @@ def test_assign_unassign_agent(self): self.assertEqual(result['Unassign'], 'Success') task_test.tearDown() + + def test_bulk_activate(self): + agents = [self.create_agent() for i in range(5)] + active_attributes = [True for i in range(5)] + Agent.objects.patch_many(agents, active_attributes, "isActive") diff --git a/ci/apiv2/test_agentassignment.py b/ci/apiv2/test_agentassignment.py index fd94f1ca8..1d7b2362f 100644 --- a/ci/apiv2/test_agentassignment.py +++ b/ci/apiv2/test_agentassignment.py @@ -1,4 +1,4 @@ -from hashtopolis import HashtopolisResponseError, AgentAssignment +from hashtopolis import AgentAssignment from utils import BaseTest @@ -15,9 +15,7 @@ def test_create(self): def test_patch(self): model_obj = self.create_test_object() - with self.assertRaises(HashtopolisResponseError) as e: - self._test_patch(model_obj, 'agentId', 1234) - self.assertEqual(e.exception.status_code, 405) + self._test_patch(model_obj, 'benchmark', "1234") def test_delete(self): model_obj = self.create_test_object(delete=False) diff --git a/ci/apiv2/test_config.py b/ci/apiv2/test_config.py index 452b4c900..04ed5e5ad 100644 --- a/ci/apiv2/test_config.py +++ b/ci/apiv2/test_config.py @@ -19,6 +19,15 @@ def test_patch_config(self): obj = Config.objects.get(item='hashcatBrainEnable') self.assertEqual(obj.value, "1") + def test_patch_many(self): + configs = Config.objects.filter(configId__lte='9') + attributes_to_change = ["10", "40", "1200", "20", "|"] + Config.objects.patch_many(configs, attributes_to_change, "value") + + newConfigs = Config.objects.filter(configId__lte='9') + for new_config, new_attribute in zip(newConfigs, attributes_to_change): + self.assertEqual(new_config.value, new_attribute) + def test_expandables(self): model_obj = Config.objects.get(pk=1) expandables = ['configSection'] diff --git a/ci/apiv2/test_hashlist.py b/ci/apiv2/test_hashlist.py index d48567ffa..27eeee8ee 100644 --- a/ci/apiv2/test_hashlist.py +++ b/ci/apiv2/test_hashlist.py @@ -149,3 +149,8 @@ def test_helper_create_superhashlist(self): # Validate if created with provided hashlists obj = Hashlist.objects.prefetch_related('hashlists').get(pk=hashlist.id) self.assertListEqual(hashlists, obj.hashlists_set) + + def test_bulk_archive(self): + hashlists = [self.create_test_object() for i in range(5)] + active_attributes = [True for i in range(5)] + Hashlist.objects.patch_many(hashlists, active_attributes, "isArchived") \ No newline at end of file diff --git a/ci/apiv2/test_task.py b/ci/apiv2/test_task.py index b58a4d7e5..4e52c5948 100644 --- a/ci/apiv2/test_task.py +++ b/ci/apiv2/test_task.py @@ -87,7 +87,7 @@ def test_task_update_priority(self): obj = TaskWrapper.objects.get(pk=task.taskWrapperId) self.assertEqual(new_priority, obj.priority) - + def test_task_update_maxagent(self): task = self.create_test_object() obj = TaskWrapper.objects.get(pk=task.taskWrapperId) @@ -99,3 +99,8 @@ def test_task_update_maxagent(self): obj = TaskWrapper.objects.get(pk=task.taskWrapperId) self.assertEqual(new_maxagent, obj.maxAgents) + + def test_bulk_archive(self): + tasks = [self.create_test_object() for i in range(5)] + active_attributes = [True for i in range(5)] + Task.objects.patch_many(tasks, active_attributes, "isArchived") diff --git a/ci/apiv2/test_user.py b/ci/apiv2/test_user.py index 1d3b5081a..65bd98565 100644 --- a/ci/apiv2/test_user.py +++ b/ci/apiv2/test_user.py @@ -54,3 +54,8 @@ def test_helper_set_user_password(self): helper = Helper() helper.set_user_password(user, newPassword) helper._test_authentication(user.name, newPassword) + + def test_bulk_deactivate(self): + users = [self.create_test_object() for i in range(5)] + active_attributes = [False for i in range(5)] + User.objects.patch_many(users, active_attributes, "isValid") diff --git a/src/dba/models/Assignment.class.php b/src/dba/models/Assignment.class.php index 70398be37..06272567d 100644 --- a/src/dba/models/Assignment.class.php +++ b/src/dba/models/Assignment.class.php @@ -30,7 +30,7 @@ static function getFeatures() { $dict['assignmentId'] = ['read_only' => True, "type" => "int", "subtype" => "unset", "choices" => "unset", "null" => False, "pk" => True, "protected" => True, "private" => False, "alias" => "assignmentId"]; $dict['taskId'] = ['read_only' => False, "type" => "int", "subtype" => "unset", "choices" => "unset", "null" => False, "pk" => False, "protected" => False, "private" => False, "alias" => "taskId"]; $dict['agentId'] = ['read_only' => False, "type" => "int", "subtype" => "unset", "choices" => "unset", "null" => False, "pk" => False, "protected" => False, "private" => False, "alias" => "agentId"]; - $dict['benchmark'] = ['read_only' => True, "type" => "str(50)", "subtype" => "unset", "choices" => "unset", "null" => False, "pk" => False, "protected" => True, "private" => False, "alias" => "benchmark"]; + $dict['benchmark'] = ['read_only' => False, "type" => "str(50)", "subtype" => "unset", "choices" => "unset", "null" => True, "pk" => False, "protected" => False, "private" => False, "alias" => "benchmark"]; return $dict; } diff --git a/src/inc/apiv2/common/AbstractBaseAPI.class.php b/src/inc/apiv2/common/AbstractBaseAPI.class.php index 368807ea8..5ee8e597c 100644 --- a/src/inc/apiv2/common/AbstractBaseAPI.class.php +++ b/src/inc/apiv2/common/AbstractBaseAPI.class.php @@ -129,6 +129,10 @@ protected function getFeatures(): array return $features; } + protected function getUpdateHandlers($id, $current_user): array { + return []; + } + /** * Overidable function to aggregate data in the object. Currently only used for Tasks * returns the aggregated data in key value pairs @@ -282,6 +286,10 @@ final protected static function getTask(int $pk): Task { return self::fetchOne(Task::class, $pk); } + final protected static function getTaskWrapper(int $pk): TaskWrapper + { + return self::fetchOne(TaskWrapper::class, $pk); + } final protected static function getUser(int $pk): User { diff --git a/src/inc/apiv2/common/AbstractModelAPI.class.php b/src/inc/apiv2/common/AbstractModelAPI.class.php index 34454de18..2ea25af53 100644 --- a/src/inc/apiv2/common/AbstractModelAPI.class.php +++ b/src/inc/apiv2/common/AbstractModelAPI.class.php @@ -394,7 +394,7 @@ public function deleteOne(Request $request, Response $response, array $args): Re // Solution 2: implement delete logic in every api model { $this->preCommon($request); - $object = $this->doFetch($request, $args['id']); + $object = $this->doFetch($args['id']); /* Actually delete object */ $this->deleteObject($object); @@ -406,11 +406,11 @@ public function deleteOne(Request $request, Response $response, array $args): Re /** * Request single object from database & validate permissons */ - protected function doFetch(Request $request, string $pk): mixed + protected function doFetch(string $pk): mixed { $object = $this->getFactory()->get($pk); if ($object === null) { - throw new HttpNotFoundException($request, "Object not found!"); + throw new HttpErrorException("Object not found!", 404); } return $object; @@ -779,7 +779,7 @@ public function count(Request $request, Response $response, array $args): Respon public function getOne(Request $request, Response $response, array $args): Response { $this->preCommon($request); - $object = $this->doFetch($request, $args['id']); + $object = $this->doFetch($args['id']); $classMapper = $this->container->get('classMapper'); @@ -793,7 +793,8 @@ public function getOne(Request $request, Response $response, array $args): Respo public function patchOne(Request $request, Response $response, array $args): Response { $this->preCommon($request); - $object = $this->doFetch($request, $args['id']); + $objectId = $args['id']; + // $object = $this->doFetch($args['id']); $data = $request->getParsedBody()['data']; if (!$this->validateResourceRecord($data)) { @@ -812,13 +813,70 @@ public function patchOne(Request $request, Response $response, array $args): Res // This does the real things, patch the values that were sent in the data. $mappedData = $this->unaliasData($attributes, $aliasedfeatures); - $this->updateObject($object, $mappedData); //TODO updateObject not implemented in every route? + $this->updateObject($objectId, $mappedData); // Return updated object - $newObject = $this->getFactory()->get($object->getId()); + $newObject = $this->getFactory()->get($objectId); return self::getOneResource($this, $newObject, $request, $response, 200); } + //follows style of bulk methods: https://github.com/json-api/json-api/blob/9c7a03dbc37f80f6ca81b16d444c960e96dd7a57/extensions/bulk/index.md + //1. parse into key => value pairs of what is updated or object => key => value dict + //2. retrieve object $object = $this->doFetch($request, $args['id']); + //3. create updateObjects functions, that in base case will just do updateObject on every element in array + //4. overload function in config route + /** + * { + * "data": [{ + * "id": "1", + * "type": "articles" + * "attributes": { + * "title": "To TDD or Not" + * } + * }, { + * "id": "2", + * "type": "articles" + * "attributes": { + * "title": "LOL Engineering" + * } + * }] + */ + public function patchMultiple(Request $request, Response $response, array $args): Response { + $this->preCommon($request); + $data = $request->getParsedBody()['data']; + $objects = []; + $aliasedfeatures = $this->getAliasedFeatures(); + foreach ($data as $resourceRecord) { + if (!$this->validateResourceRecord($resourceRecord)) { + throw new HttpErrorException('No valid resource identifier object was given as data!', 403); + } + $attributes = $resourceRecord["attributes"]; + foreach (array_keys($attributes) as $key) { + // Ensure key can be updated + $this->isAllowedToMutate($request, $aliasedfeatures, $key); + } + $mappedData = $this->unaliasData($attributes, $aliasedfeatures); + $objects[$resourceRecord["id"]] = $mappedData; + + } + $this->updateObjects($objects); + + // $newObject = $this->getFactory()->get($object->getId()); + // return self::getOneResource($this, $newObject, $request, $response, 200); + //TODO maybe nicer to return all changed objects + return $response->withStatus(204) + ->withHeader("Content-Type", "application/json"); + } + + /** + * Overidable function to update mulitple objects + * @objects ia an array where id is the key and the values are the attributes that need to be patched + */ + protected function updateObjects(array $objects) { + foreach ($objects as $objectId => $attributes) { + $this->updateObject($objectId, $attributes); + } + } /** * API entry point creation of new object @@ -944,7 +1002,7 @@ public function getToOneRelationshipLink(Request $request, Response $response, a //retrieve the only element of the intermediate table, which contains the data for the relatedResource $object = $factory->filter($aFs)[$intermediateFactory->getModelName()][0]; } else { - $object = $this->doFetch($request, $args['id']); + $object = $this->doFetch($args['id']); }; $id = $object->getKeyValueDict()[$relation['key']]; @@ -1005,15 +1063,15 @@ public function patchToOneRelationshipLink(Request $request, Response $response, $this->isAllowedToMutate($request, $features, $relationKey); $factory = $this->getFactory(); - $object = $this->doFetch($request, intval($args['id'])); + $object = $this->doFetch(intval($args['id'])); if ($data == null) { - $factory->set($object, $relationKey, null); + $factory->DatabaseSet($object, $relationKey, null); } elseif (!$this->validateResourceRecord($data)) { throw new HttpErrorException('No valid resource identifier object was given as data!'); } else { - $factory->set($object, $relationKey, $data["id"]); + //TODO check if foreign key exists befor inserting + $factory->DatabaseSet($object, $relationKey, $data["id"]); } - //TODO catch database exceptions like failed foreignkey constraint and return correct error response return $response->withStatus(201) ->withHeader("Content-Type", "application/vnd.api+json"); @@ -1068,7 +1126,7 @@ public function getToManyRelationshipLink(Request $request, Response $response, $this->preCommon($request); // Base object -> Relationship objects - $object = $this->doFetch($request, $args['id']); + $object = $this->doFetch($args['id']); $expandObjects = $this->fetchExpandObjects([$object], $args['relation']); $dataResources = []; @@ -1281,19 +1339,35 @@ public function deleteToManyRelationshipLink(Request $request, Response $respons ->withHeader("Content-Type", "application/vnd.api+json"); } + /** + * Function to update fields in the database + */ + protected function DatabaseSet($object, $key, $value) { + try { + $this->getFactory()->set($object, $key, $value); + } catch (PDOException $e) { + //TODO these should be set to more user friendly errors complaint to the JSON API standard + if ($e->getCode() === '23000') { + throw new HttpErrorException("Foreign key constrain failed: " . $e->getMessage()) ; + } else { + throw new HttpErrorException("MYSQL Database error [" . $e->getCode() . "]: " . $e->getMessage()); + } + } + } /** * Update object with provided values */ - protected function updateObject(object $object, array $data, array $processed = []): void + protected function updateObject(int $objectId, array $data): void { - // Apply changes + $updateHandlers = $this->getUpdateHandlers($objectId, $this->getCurrentUser()); foreach ($data as $key => $value) { - if (in_array($key, $processed)) { - continue; + if (array_key_exists($key, $updateHandlers)) { + $updateHandlers[$key]($value); + } else { + $object = $this->doFetch($objectId); + $this->DatabaseSet($object, $key, $value); } - - $this->getFactory()->set($object, $key, $value); } } @@ -1396,6 +1470,7 @@ static public function register($app): void if (in_array("PATCH", $available_methods)) { $app->patch($baseUriOne, $me . ':patchOne')->setName($me . ':patchOne'); + $app->patch($baseUri, $me . ':patchMultiple')->setName($me . ':patchMultiple'); } if (in_array("DELETE", $available_methods)) { diff --git a/src/inc/apiv2/common/openAPISchema.routes.php b/src/inc/apiv2/common/openAPISchema.routes.php index 04144355f..0559e1490 100644 --- a/src/inc/apiv2/common/openAPISchema.routes.php +++ b/src/inc/apiv2/common/openAPISchema.routes.php @@ -863,7 +863,10 @@ function makeDescription($isRelation, $method, $singleObject): string { ]]; } - } else { + } elseif ($method == 'patch') { + // TODO add patch many here + } + else { throw new HttpErrorException("Method '$method' not implemented"); } } diff --git a/src/inc/apiv2/model/agentassignments.routes.php b/src/inc/apiv2/model/agentassignments.routes.php index 05e1645b8..502bcd0d9 100644 --- a/src/inc/apiv2/model/agentassignments.routes.php +++ b/src/inc/apiv2/model/agentassignments.routes.php @@ -16,7 +16,7 @@ public static function getBaseUri(): string { } public static function getAvailableMethods(): array { - return ['POST', 'GET', 'DELETE']; + return ['POST', 'GET', 'DELETE', 'PATCH']; } public static function getDBAclass(): string { @@ -56,8 +56,10 @@ protected function createObject(array $data): int { return $objects[0]->getId(); } - public function updateObject(object $object, array $data, array $processed = []): void { - assert(False, "AgentAssignments cannot be updated via API"); + protected function getUpdateHandlers($id, $current_user): array { + return [ + Assignment::BENCHMARK => fn ($value) => assignmentUtils::setBenchmark($id, $value, $current_user) + ]; } protected function deleteObject(object $object): void { diff --git a/src/inc/apiv2/model/agentbinaries.routes.php b/src/inc/apiv2/model/agentbinaries.routes.php index cc15f823b..e93f5c4f2 100644 --- a/src/inc/apiv2/model/agentbinaries.routes.php +++ b/src/inc/apiv2/model/agentbinaries.routes.php @@ -45,6 +45,14 @@ protected function createObject(array $data): int { protected function deleteObject(object $object): void { AgentBinaryUtils::deleteBinary($object->getId()); } + + protected function getUpdateHandlers($id, $current_user): array { + return [ + AgentBinary::TYPE => fn ($value) => AgentBinaryUtils::editType($id, $value, $current_user), + AgentBinary::FILENAME => fn ($value) => AgentBinaryUtils::editName($id, $value, $current_user), + AgentBinary::UPDATE_TRACK => fn ($value) => AgentBinaryUtils::editUpdateTracker($id, $value, $current_user), + ]; + } } AgentBinaryAPI::register($app); \ No newline at end of file diff --git a/src/inc/apiv2/model/agents.routes.php b/src/inc/apiv2/model/agents.routes.php index 3a34348ab..8fb400a48 100644 --- a/src/inc/apiv2/model/agents.routes.php +++ b/src/inc/apiv2/model/agents.routes.php @@ -24,6 +24,12 @@ public static function getAvailableMethods(): array { public static function getDBAclass(): string { return Agent::class; } + + protected function getUpdateHandlers($id, $current_user): array { + return [ + Agent::IGNORE_ERRORS => fn ($value) => AgentUtils::changeIgnoreErrors($id, $value, $current_user), + ]; + } public static function getToManyRelationships(): array { return [ diff --git a/src/inc/apiv2/model/agentstats.routes.php b/src/inc/apiv2/model/agentstats.routes.php index 5aa59b823..84d76c834 100644 --- a/src/inc/apiv2/model/agentstats.routes.php +++ b/src/inc/apiv2/model/agentstats.routes.php @@ -24,7 +24,7 @@ protected function createObject(array $data): int { return -1; } - public function updateObject(object $object, array $data, array $processed = []): void { + public function updateObject(int $objectId, array $data): void { assert(False, "AgentStats cannot be updated via API"); } diff --git a/src/inc/apiv2/model/chunks.routes.php b/src/inc/apiv2/model/chunks.routes.php index 92df57022..8808b1ae1 100644 --- a/src/inc/apiv2/model/chunks.routes.php +++ b/src/inc/apiv2/model/chunks.routes.php @@ -44,7 +44,7 @@ protected function createObject(array $data): int { return -1; } - protected function updateObject(object $object, array $data, array $processed = []): void { + public function updateObject(int $objectId, array $data): void { assert(False, "Chunks cannot be updated via API"); } diff --git a/src/inc/apiv2/model/configs.routes.php b/src/inc/apiv2/model/configs.routes.php index 958944182..e9787ead9 100644 --- a/src/inc/apiv2/model/configs.routes.php +++ b/src/inc/apiv2/model/configs.routes.php @@ -41,6 +41,10 @@ protected function deleteObject(object $object): void { /* Dummy code to implement abstract functions */ assert(False, "Configs cannot be deleted via API"); } + + protected function updateObjects(array $objects) { + ConfigUtils::updateConfigs($objects); + } } ConfigAPI::register($app); \ No newline at end of file diff --git a/src/inc/apiv2/model/configsections.routes.php b/src/inc/apiv2/model/configsections.routes.php index b9f21ee79..b6bbb399a 100644 --- a/src/inc/apiv2/model/configsections.routes.php +++ b/src/inc/apiv2/model/configsections.routes.php @@ -23,7 +23,7 @@ protected function createObject(array $data): int { return -1; } - public function updateObject(object $object, array $data, array $processed = []): void { + public function updateObject(int $objectId, array $data): void { assert(False, "ConfigSections cannot be updated via API"); } diff --git a/src/inc/apiv2/model/files.routes.php b/src/inc/apiv2/model/files.routes.php index 088b309e7..7d2268547 100644 --- a/src/inc/apiv2/model/files.routes.php +++ b/src/inc/apiv2/model/files.routes.php @@ -148,6 +148,12 @@ protected function createObject(array $data): int { return $objects[0]->getId(); } + protected function getUpdateHandlers($id, $current_user): array { + return [ + File::FILE_TYPE => fn ($value) => FileUtils::setFileType($id, $value, $current_user) + ]; + } + protected function deleteObject(object $object): void { FileUtils::delete($object->getId(), $this->getCurrentUser()); diff --git a/src/inc/apiv2/model/globalpermissiongroups.routes.php b/src/inc/apiv2/model/globalpermissiongroups.routes.php index 75ed789b6..65b3207cf 100644 --- a/src/inc/apiv2/model/globalpermissiongroups.routes.php +++ b/src/inc/apiv2/model/globalpermissiongroups.routes.php @@ -66,59 +66,57 @@ protected static function db2json(array $feature, mixed $val): mixed { protected function createObject(array $data): int { $group = AccessControlUtils::createGroup($data[RightGroup::GROUP_NAME]); + $id = $group->getId(); // The utils function does not allow to set permissions directly. This call is to workaround this. // This causes the issue that if some error happens during updating the object the object is still created // but the permissions will not be set. - $this->updateObject($group, $data); + $this->updateObject($id, $data); - return $group->getId(); + return $id; } protected function deleteObject(object $object): void { AccessControlUtils::deleteGroup($object->getId()); } + protected function getUpdateHandlers($id, $current_user): array { + return [ + RightGroup::PERMISSIONS => fn ($value) => $this->updatePermissions($id, $value) + ]; + } /** * NOTE: If ANY CRUD-permission is satisfied the corresponding OLD-permission is set */ - public function updateObject(object $object, $data, $processed = []): void { - /* Use quirk on 'permissions' since this is casted to 'incorrect' DB representation already */ - $permissions = unserialize($data[RightGroup::PERMISSIONS]); - $key = RightGroup::PERMISSIONS; - if (array_key_exists($key, $data)) { - array_push($processed, $key); - - // Build reverse mapping to speed-up lookups for CRUD-permission to OLD-permission - $c2o = array(); - foreach (self::$acl_mapping as $oldPerm => $crudPerms) { - foreach($crudPerms as $crudPerm) { - if (array_key_exists($crudPerm, $c2o)) { - array_push($c2o[$crudPerm], $oldPerm); - } else { - $c2o[$crudPerm] = [$oldPerm]; - } - } - } - - // Get enabled 'old-style' permissions - $legacyPerms = []; - foreach($permissions as $crudPerm => $value) { - if ($value === true) { - $legacyPerms = array_merge($legacyPerms, $c2o[$crudPerm]); + private function updatePermissions($id, $value) { + $permissions = unserialize($value); + // Build reverse mapping to speed-up lookups for CRUD-permission to OLD-permission + $c2o = array(); + foreach (self::$acl_mapping as $oldPerm => $crudPerms) { + foreach($crudPerms as $crudPerm) { + if (array_key_exists($crudPerm, $c2o)) { + array_push($c2o[$crudPerm], $oldPerm); + } else { + $c2o[$crudPerm] = [$oldPerm]; } } - - // Modify data to conform with updateGroupPermssions input - $permData = []; - foreach($legacyPerms as $key) { - array_push($permData, $key . "-1"); + } + + // Get enabled 'old-style' permissions + $legacyPerms = []; + foreach($permissions as $crudPerm => $value) { + if ($value === true) { + $legacyPerms = array_merge($legacyPerms, $c2o[$crudPerm]); } - AccessControlUtils::updateGroupPermissions($object->getId(), $permData); } - - parent::updateObject($object, $data, $processed); + + // Modify data to conform with updateGroupPermssions input + $permData = []; + foreach($legacyPerms as $key) { + array_push($permData, $key . "-1"); + } + AccessControlUtils::updateGroupPermissions($id, $permData); } } diff --git a/src/inc/apiv2/model/hashes.routes.php b/src/inc/apiv2/model/hashes.routes.php index 8a1a207b3..bace3f676 100644 --- a/src/inc/apiv2/model/hashes.routes.php +++ b/src/inc/apiv2/model/hashes.routes.php @@ -44,7 +44,7 @@ protected function createObject(array $data): int { return -1; } - public function updateObject(object $object, array $data, array $processed = []): void { + public function updateObject(int $objectId, array $data): void { assert(False, "Hashes cannot be updated via API"); } diff --git a/src/inc/apiv2/model/hashlists.routes.php b/src/inc/apiv2/model/hashlists.routes.php index a44c54c4f..56d9bcba1 100644 --- a/src/inc/apiv2/model/hashlists.routes.php +++ b/src/inc/apiv2/model/hashlists.routes.php @@ -146,21 +146,14 @@ protected function deleteObject(object $object): void { HashlistUtils::delete($object->getId(), $this->getCurrentUser()); } - public function updateObject(object $object, $data, $processed = []): void { - - $key = Hashlist::IS_ARCHIVED; - if (array_key_exists($key, $data)) { - array_push($processed, $key); - HashlistUtils::setArchived($object->getId(), $data[$key], $this->getCurrentUser()); - } - - $key = Hashlist::NOTES; - if (array_key_exists($key, $data)) { - array_push($processed, $key); - HashlistUtils::editNotes($object->getId(), $data[$key], $this->getCurrentUser()); - } - - parent::updateObject($object, $data, $processed = []); + protected function getUpdateHandlers($id, $current_user): array { + return [ + Hashlist::IS_ARCHIVED => fn ($value) => HashListUtils::setArchived($id, $value, $current_user), + Hashlist::NOTES => fn ($value) => HashListUtils::editNotes($id, $value, $current_user), + Hashlist::IS_SECRET => fn ($value) => HashListUtils::setSecret($id, $value, $current_user), + Hashlist::HASHLIST_NAME => fn ($value) => HashListUtils::rename($id, $value, $current_user), + Hashlist::ACCESS_GROUP_ID => fn ($value) => HashListUtils::changeAccessGroup($id, $value, $current_user) + ]; } } diff --git a/src/inc/apiv2/model/healthcheckagents.routes.php b/src/inc/apiv2/model/healthcheckagents.routes.php index e21a312fd..bf1538f19 100644 --- a/src/inc/apiv2/model/healthcheckagents.routes.php +++ b/src/inc/apiv2/model/healthcheckagents.routes.php @@ -44,7 +44,7 @@ protected function createObject(array $object): int { return -1; } - public function updateObject(object $object, array $data, array $processed = []): void { + public function updateObject(int $objectId, array $data): void { assert(False, "HealthCheckAgents cannot be updated via API"); } diff --git a/src/inc/apiv2/model/notifications.routes.php b/src/inc/apiv2/model/notifications.routes.php index c74e8d7fe..f54b77676 100644 --- a/src/inc/apiv2/model/notifications.routes.php +++ b/src/inc/apiv2/model/notifications.routes.php @@ -83,6 +83,12 @@ protected function createObject(array $data): int { protected function deleteObject(object $object): void { NotificationUtils::delete($object->getId(), $this->getCurrentUser()); } + + protected function getUpdateHandlers($id, $current_user): array { + return [ + NotificationSetting::IS_ACTIVE => fn ($value) => NotificationUtils::setActive($id, $value, false, $current_user), + ]; + } } NotificationSettingAPI::register($app); \ No newline at end of file diff --git a/src/inc/apiv2/model/preprocessors.routes.php b/src/inc/apiv2/model/preprocessors.routes.php index 84ccbfeeb..269ea6dd9 100644 --- a/src/inc/apiv2/model/preprocessors.routes.php +++ b/src/inc/apiv2/model/preprocessors.routes.php @@ -41,6 +41,16 @@ protected function createObject(array $data): int { return $objects[0]->getId(); } + protected function getUpdateHandlers($id, $current_user): array { + return [ + Preprocessor::NAME => fn ($value) => PreprocessorUtils::editName($id, $value), + Preprocessor::BINARY_NAME => fn ($value) => PreprocessorUtils::editBinaryName($id, $value), + Preprocessor::KEYSPACE_COMMAND => fn ($value) => PreprocessorUtils::editKeyspaceCommand($id, $value), + Preprocessor::LIMIT_COMMAND => fn ($value) => PreprocessorUtils::editLimitCommand($id, $value), + Preprocessor::SKIP_COMMAND => fn ($value) => PreprocessorUtils::editSkipCommand($id, $value), + ]; + } + protected function deleteObject(object $object): void { PreprocessorUtils::delete($object->getId()); } diff --git a/src/inc/apiv2/model/pretasks.routes.php b/src/inc/apiv2/model/pretasks.routes.php index 34361cbc6..f1f8f5708 100644 --- a/src/inc/apiv2/model/pretasks.routes.php +++ b/src/inc/apiv2/model/pretasks.routes.php @@ -73,6 +73,13 @@ protected function createObject(array $data): int { return $objects[0]->getId(); } + protected function getUpdateHandlers($id, $current_user): array { + return [ + Pretask::ATTACK_CMD => fn ($value) => PretaskUtils::changeAttack($id, $value), + Pretask::COLOR => fn ($value) => PretaskUtils::setColor($id, $value), + ]; + } + protected function deleteObject(object $object): void { PretaskUtils::deletePretask($object->getId()); } diff --git a/src/inc/apiv2/model/speeds.routes.php b/src/inc/apiv2/model/speeds.routes.php index 8bbaed5da..9e49e2848 100644 --- a/src/inc/apiv2/model/speeds.routes.php +++ b/src/inc/apiv2/model/speeds.routes.php @@ -49,7 +49,7 @@ protected function createObject(array $data): int { return -1; } - public function updateObject(object $object, array $data, array $processed = []): void { + public function updateObject(int $objectId, array $data): void { assert(False, "Speeds cannot be updated via API"); } diff --git a/src/inc/apiv2/model/tasks.routes.php b/src/inc/apiv2/model/tasks.routes.php index a21ddfb4c..9b039c01b 100644 --- a/src/inc/apiv2/model/tasks.routes.php +++ b/src/inc/apiv2/model/tasks.routes.php @@ -163,29 +163,16 @@ static function aggregateData(object $object): array { protected function deleteObject(object $object): void { TaskUtils::deleteTask($object); } - - public function updateObject(object $object, $data, $processed = []): void { - $key = Task::IS_ARCHIVED; - if (array_key_exists($key, $data)) { - array_push($processed, $key); - TaskUtils::archiveTask($object->getId(), $this->getCurrentUser()); - } - - /* Update connected TaskWrapper priority as well */ - $key = Task::PRIORITY; - if (array_key_exists($key, $data)) { - array_push($processed, $key); - TaskUtils::updatePriority($object->getId(), $data[Task::PRIORITY], $this->getCurrentUser()); - } - - /* Update connected TaskWrapper maxAgents as well */ - $key = Task::MAX_AGENTS; - if (array_key_exists($key, $data)) { - array_push($processed, $key); - TaskUtils::updateMaxAgents($object->getId(), $data[Task::MAX_AGENTS], $this->getCurrentUser()); - } - - parent::updateObject($object, $data, $processed); + + protected function getUpdateHandlers($id, $current_user): array { + return [ + Task::IS_ARCHIVED => fn ($value) => TaskUtils::archiveTask($id, $current_user), + Task::PRIORITY => fn ($value) => TaskUtils::updatePriority($id, $value, $current_user), + Task::MAX_AGENTS => fn ($value) => TaskUtils::updateMaxAgents($id, $value, $current_user), + Task::IS_CPU_TASK => fn ($value) => TaskUtils::setCpuTask($id, $value, $current_user), + Task::CHUNK_TIME => fn ($value) => TaskUtils::changeChunkTime($id, $value, $current_user), + Task::ATTACK_CMD => fn($value) => TaskUtils::changeAttackCmd($id, $value, $current_user), + ]; } } diff --git a/src/inc/apiv2/model/taskwrappers.routes.php b/src/inc/apiv2/model/taskwrappers.routes.php index e792ca6ef..e0bcc5d07 100644 --- a/src/inc/apiv2/model/taskwrappers.routes.php +++ b/src/inc/apiv2/model/taskwrappers.routes.php @@ -75,33 +75,12 @@ protected function createObject(array $data): int { return -1; } - public function updateObject(object $object, array $data, array $processed = []): void { - assert($object instanceof TaskWrapper); - - // Priority is a bit special, when called on a 'NORMAL' running task - // the underlying Task object priority also gets updated - $key = TaskWrapper::PRIORITY; - if (array_key_exists($key, $data)) { - array_push($processed, $key); - switch ($object->getTaskType()) { - case DTaskTypes::NORMAL: - $qF = new QueryFilter(TaskWrapper::TASK_WRAPPER_ID, $object->getId(), "=", Factory::getTaskWrapperFactory()); - $jF = new JoinFilter(Factory::getTaskWrapperFactory(), Task::TASK_WRAPPER_ID, TaskWrapper::TASK_WRAPPER_ID); - $joined = Factory::getTaskFactory()->filter([Factory::FILTER => $qF, Factory::JOIN => $jF]); - $task = $joined[Factory::getTaskFactory()->getModelName()][0]; - - TaskUtils::updatePriority($task->getId(), $data[TaskWrapper::PRIORITY], $this->getCurrentUser()); - break; - case DTaskTypes::SUPERTASK: - TaskUtils::setSupertaskPriority($object->getId(), $data[TaskWrapper::PRIORITY], $this->getCurrentUser()); - break; - default: - assert(False, "Internal Error: taskType not recognized"); - } - } - parent::updateObject($object, $data, $processed); + protected function getUpdateHandlers($id, $current_user): array { + return [ + Taskwrapper::PRIORITY => fn ($value) => TaskwrapperUtils::updatePriority($id, $value, $current_user), + ]; } - + protected function deleteObject(object $object): void { switch ($object->getTaskType()) { case DTaskTypes::NORMAL: diff --git a/src/inc/apiv2/model/users.routes.php b/src/inc/apiv2/model/users.routes.php index de9ea5545..38c97903b 100644 --- a/src/inc/apiv2/model/users.routes.php +++ b/src/inc/apiv2/model/users.routes.php @@ -46,9 +46,6 @@ public static function getToManyRelationships(): array { ]; } - - - protected static function fetchExpandObjects(array $objects, string $expand): mixed { array_walk($objects, function($obj) { assert($obj instanceof User); }); @@ -108,24 +105,19 @@ protected function deleteObject(object $object): void { UserUtils::deleteUser($object->getId(), $this->getCurrentUser()); } - public function updateObject(object $object, $data, $processed = []): void { - $key = USER::RIGHT_GROUP_ID; - if (array_key_exists($key, $data)) { - array_push($processed, $key); - UserUtils::setRights($object->getId(), $data[$key], $this->getCurrentUser()); - } - - $key = USER::IS_VALID; - if (array_key_exists($key, $data)) { - array_push($processed, $key); - if ($data[$key] == True) { - UserUtils::enableUser($object->getId()); - } else { - UserUtils::disableUser($object->getId(), $this->getCurrentUser()); - } + private function toggleValidityUser($userId, $isValid, $current_user) { + if ($isValid) { + UserUtils::enableUser($userId); + } else { + UserUtils::disableUser($userId, $current_user); } + } - parent::updateObject($object, $data, $processed); + protected function getUpdateHandlers($id, $current_user): array { + return [ + User::RIGHT_GROUP_ID => fn ($value) => UserUtils::setRights($id, $value, $current_user), + User::IS_VALID => fn ($value) => $this->toggleValidityUser($id, $value, $current_user) + ]; } } diff --git a/src/inc/utils/AgentBinaryUtils.class.php b/src/inc/utils/AgentBinaryUtils.class.php index 7b7907456..05a35e6f6 100644 --- a/src/inc/utils/AgentBinaryUtils.class.php +++ b/src/inc/utils/AgentBinaryUtils.class.php @@ -72,6 +72,42 @@ public static function editBinary($binaryId, $type, $os, $filename, $version, $u Util::createLogEntry(DLogEntryIssuer::USER, $user->getId(), DLogEntry::INFO, "Binary " . $agentBinary->getFilename() . " was updated!"); } + + public static function editUpdateTracker($binaryId, $updateTracker, $user) { + $binary = AgentBinaryUtils::getBinary($binaryId); + if ($updateTracker != $binary->getUpdateTrack()) { + Factory::getAgentBinaryFactory()->mset($agentBinary, [ + AgentBinary::UPDATE_AVAILABLE => '', + AgentBinary::UPDATE_TRACK => $updateTracker + ] + ); + } else { + Factory::getAgentBinaryFactory()->set($agentBinary, AgentBinary::UPDATE_TRACK, $updateTracker); + } + Util::createLogEntry(DLogEntryIssuer::USER, $user->getId(), DLogEntry::INFO, "Binary " . $agentBinary->getFilename() . " was updated!"); + } + + public static function editName($binaryId, $filename, $user) { + if (!file_exists(dirname(__FILE__) . "/../../bin/" . basename($filename))) { + throw new HTException("Provided filename does not exist!"); + } + $agentBinary = AgentBinaryUtils::getBinary($binaryId); + Factory::getAgentBinaryFactory()->set($agentBinary, AgentBinary::FILENAME, $filename); + Util::createLogEntry(DLogEntryIssuer::USER, $user->getId(), DLogEntry::INFO, "Binary " . $agentBinary->getFilename() . " was updated!"); + } + + public static function editType($binaryId, $type, $user) { + $agentBinary = AgentBinaryUtils::getBinary($binaryId); + + $qF1 = new QueryFilter(AgentBinary::TYPE, $type, "="); + $qF2 = new QueryFilter(AgentBinary::AGENT_BINARY_ID, $agentBinary->getId(), "<>"); + $result = Factory::getAgentBinaryFactory()->filter([Factory::FILTER => [$qF1, $qF2]], true); + if ($result != null) { + throw new HTException("You cannot have two binaries with the same type!"); + } + Factory::getAgentBinaryFactory()->set($agentBinary, AgentBinary::TYPE, $type); + Util::createLogEntry(DLogEntryIssuer::USER, $user->getId(), DLogEntry::INFO, "Binary " . $agentBinary->getFilename() . " was updated!"); + } /** * @param int $binaryId diff --git a/src/inc/utils/AssignmentUtils.class.php b/src/inc/utils/AssignmentUtils.class.php new file mode 100644 index 000000000..885729ae5 --- /dev/null +++ b/src/inc/utils/AssignmentUtils.class.php @@ -0,0 +1,27 @@ +get($assignmentId); + $agent = Factory::getAgentFactory()->get($assignment->getAgentId()); + if ($assignment == null) { + throw new HTException("No assignment found with this id to change benchmark of"); + } + else if (!AccessUtils::userCanAccessAgent($agent, $user)) { + throw new HTException("No access to this agent!"); + } + // TODO: check benchmark validity + Factory::getAssignmentFactory()->set($assignment, Assignment::BENCHMARK, $benchmark); + } +} \ No newline at end of file diff --git a/src/inc/utils/ConfigUtils.class.php b/src/inc/utils/ConfigUtils.class.php index 10932ce84..a44ff1f0f 100644 --- a/src/inc/utils/ConfigUtils.class.php +++ b/src/inc/utils/ConfigUtils.class.php @@ -64,6 +64,48 @@ public static function getAll() { return Factory::getConfigFactory()->filter([]); } + const DEFAULT_CONFIG_SECTION = 5; + /** + * @param array $arr id => [attributes] + * @throws HTException + * + * This is a new updateConfigs function that unlike the updateConfig is compliant + * for the APIv2 + */ + public static function updateConfigs($arr) { + foreach ($arr as $id => $attributes) { + $currentConfig = Factory::getConfigFactory()->get($id); + $newValue = $attributes[Config::VALUE] ?? null; + $name = $currentConfig->getItem(); + + if (is_null($newValue)) { + throw new HTException("No new config value provided"); + } + if (is_null($currentConfig)) { + throw new HTException("No config with this ID!"); + } + if ($currentConfig->getValue() === $newValue) { + continue; //The value was not changed so we dont need to update it + } + + $lengthLimits = [ + DConfig::HASH_MAX_LENGTH => 'setMaxHashLength', + DConfig::PLAINTEXT_MAX_LENGTH => 'setPlaintextMaxLength' + ]; + if (isset($lengthLimits[$name])) { + $limit = intval($newValue); + if (!Util::{$lengthLimits[$name]}($limit)) { + throw new HTException("Failed to update {$name}!"); + } + } + + SConfig::getInstance()->addValue($name, $newValue); + $currentConfig->setValue($newValue); + ConfigUtils::set($currentConfig, false); + } + + SConfig::reload(); + } /** * @param array $arr * @throws HTException @@ -79,7 +121,7 @@ public static function updateConfig($arr) { $qF = new QueryFilter(Config::ITEM, $name, "="); $config = Factory::getConfigFactory()->filter([Factory::FILTER => $qF], true); if ($config == null) { - $config = new Config(null, 5, $name, $val); + $config = new Config(null, self::DEFAULT_CONFIG_SECTION, $name, $val); Factory::getConfigFactory()->save($config); } else { diff --git a/src/inc/utils/PreprocessorUtils.class.php b/src/inc/utils/PreprocessorUtils.class.php index 75fda032e..5dc3b6ba6 100644 --- a/src/inc/utils/PreprocessorUtils.class.php +++ b/src/inc/utils/PreprocessorUtils.class.php @@ -84,7 +84,93 @@ public static function getPreprocessor($preprocessorId) { } return $preprocessor; } + + /** + * @param $preprocessorId + * @param $name + * Edits the name of the preprocessor + * @throws HTException when name already exists + */ + public static function editName($preprocessorId, $name) { + $qF1 = new QueryFilter(Preprocessor::NAME, $name, "="); + $qF2 = new QueryFilter(Preprocessor::PREPROCESSOR_ID, $preprocessorId, "<>"); + $check = Factory::getPreprocessorFactory()->filter([Factory::FILTER => [$qF1, $qF2]], true); + if ($check !== null) { + throw new HTException("This preprocessor name already exists!"); + } + + $preprocessor = PreprocessorUtils::getPreprocessor($preprocessorId); + Factory::getPreprocessorFactory()->set($preprocessor, Preprocessor::NAME, $name); + } + + /** + * @param $preprocessorId + * @param $binaryName + * Edits the binaryName of the preprocessor + * @throws HTException when BinaryName is empty or contains blacklisted characters + */ + public static function editBinaryName($preprocessorId, $binaryName) { + + if (strlen($binaryName) == 0) { + throw new HTException("Binary basename cannot be empty!"); + } else if (Util::containsBlacklistedChars($binaryName)) { + throw new HTException("The binary name must contain no blacklisted characters!"); + } + $preprocessor = PreprocessorUtils::getPreprocessor($preprocessorId); + Factory::getPreprocessorFactory()->set($preprocessor, Preprocessor::BINARY_NAME, $binaryName); + } + /** + * @param $preprocessorId + * @param $keyspaceCommand + * Edits the keyspaceCommand of the preprocessor + * @throws HTException when keyspaceCommand is empty or contains blacklisted characters + */ + public static function editKeyspaceCommand($preprocessorId, $keyspaceCommand) { + + if (strlen($keyspaceCommand) == 0) { + $keyspaceCommand == null; + } else if (Util::containsBlacklistedChars($keyspaceCommand)) { + throw new HTException("The keyspace command must contain no blacklisted characters!"); + } + $preprocessor = PreprocessorUtils::getPreprocessor($preprocessorId); + Factory::getPreprocessorFactory()->set($preprocessor, Preprocessor::KEYSPACE_COMMAND, $keyspaceCommand); + } + + /** + * @param $preprocessorId + * @param $skipCommand + * Edits the skipCommand of the preprocessor + * @throws HTException when skipCommand is empty or contains blacklisted characters + */ + public static function editSkipCommand($preprocessorId, $skipCommand) { + + if (strlen($skipCommand) == 0) { + $skipCommand == null; + } else if (Util::containsBlacklistedChars($skipCommand)) { + throw new HTException("The skip command must contain no blacklisted characters!"); + } + $preprocessor = PreprocessorUtils::getPreprocessor($preprocessorId); + Factory::getPreprocessorFactory()->set($preprocessor, Preprocessor::SKIP_COMMAND, $skipCommand); + } + + /** + * @param $preprocessorId + * @param $limitCommand + * Edits the limitCommand of the preprocessor + * @throws HTException when limitCommand is empty or contains blacklisted characters + */ + public static function editLimitCommand($preprocessorId, $limitCommand) { + + if (strlen($limitCommand) == 0) { + $limitCommand == null; + } else if (Util::containsBlacklistedChars($limitCommand)) { + throw new HTException("The limit command must contain no blacklisted characters!"); + } + $preprocessor = PreprocessorUtils::getPreprocessor($preprocessorId); + Factory::getPreprocessorFactory()->set($preprocessor, Preprocessor::LIMIT_COMMAND, $limitCommand); + } + /** * @param $preprocessorId * @param $name diff --git a/src/inc/utils/TaskwrapperUtils.class.php b/src/inc/utils/TaskwrapperUtils.class.php new file mode 100644 index 000000000..794988aae --- /dev/null +++ b/src/inc/utils/TaskwrapperUtils.class.php @@ -0,0 +1,44 @@ +get($taskwrapperId); + if ($taskwrapper == null) { + throw new HTException("Invalid taskwrapper!"); + } + return $taskwrapper; + } + + public static function updatePriority($taskWrapperId, $priority, $user) { + $taskwrapper = TaskwrapperUtils::getTaskwrapper($taskWrapperId); + + // Priority is a bit special, when called on a 'NORMAL' running task + // the underlying Task object priority also gets updated + switch ($taskwrapper->getTaskType()) { + case DTaskTypes::NORMAL: + $qF = new QueryFilter(TaskWrapper::TASK_WRAPPER_ID, $taskwrapper->getId(), "=", Factory::getTaskWrapperFactory()); + $jF = new JoinFilter(Factory::getTaskWrapperFactory(), Task::TASK_WRAPPER_ID, TaskWrapper::TASK_WRAPPER_ID); + $joined = Factory::getTaskFactory()->filter([Factory::FILTER => $qF, Factory::JOIN => $jF]); + $task = $joined[Factory::getTaskFactory()->getModelName()][0]; + + TaskUtils::updatePriority($task->getId(), $priority, $user); + break; + case DTaskTypes::SUPERTASK: + TaskUtils::setSupertaskPriority($taskWrapperId, $priority, $user); + break; + default: + assert(False, "Internal Error: taskType not recognized"); + } + } +} \ No newline at end of file From 9b550ec59e5df7b8edacc92cb71a18b55ab6d710 Mon Sep 17 00:00:00 2001 From: gluafamichl <> Date: Tue, 13 May 2025 09:23:21 +0200 Subject: [PATCH 067/691] Mod: fix TLS setup Nginx config --- doc/installation_guidelines/tls.md | 45 +++++++++++++++--------------- 1 file changed, 23 insertions(+), 22 deletions(-) diff --git a/doc/installation_guidelines/tls.md b/doc/installation_guidelines/tls.md index 15f678afc..1b3e60242 100644 --- a/doc/installation_guidelines/tls.md +++ b/doc/installation_guidelines/tls.md @@ -51,15 +51,16 @@ events { } http { + server { listen 80; server_name localhost; return 301 https://$host$request_uri; } - server { - listen 443 ssl; + client_max_body_size 2G; + listen 443 ssl http2; server_name localhost; ssl_certificate /etc/nginx/ssl/nginx.crt; @@ -69,28 +70,28 @@ http { ssl_prefer_server_ciphers on; ssl_ciphers HIGH:!aNULL:!MD5; - location / { - proxy_pass http://hashtopolis-frontend; - proxy_set_header Host $host; - proxy_set_header X-Real-IP $remote_addr; - proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for; - proxy_set_header X-Forwarded-Proto $scheme; + proxy_set_header Host $host; + proxy_set_header X-Real-IP $remote_addr; + proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for; + proxy_set_header X-Forwarded-Proto $scheme; + + location ~ (.*\.php) { + proxy_pass http://hashtopolis-backend/$request_uri; } - location /api/v2 { - proxy_pass http://hashtopolis-backend:80/api/v2; - proxy_set_header Host $host; - proxy_set_header X-Real-IP $remote_addr; - proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for; - proxy_set_header X-Forwarded-Proto $scheme; + location /api { + proxy_pass http://hashtopolis-backend/api; + } + + location /static { + proxy_pass http://hashtopolis-backend/static; + } + + location / { + proxy_pass http://hashtopolis-frontend; } - - location /old { - proxy_pass http://hashtopolis-backend/; - proxy_set_header Host $host; - proxy_set_header X-Real-IP $remote_addr; - proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for; - proxy_set_header X-Forwarded-Proto $scheme; + location /legacy { + proxy_pass http://hashtopolis-backend/index.php; } } } @@ -104,4 +105,4 @@ http { docker compose up ``` -5. Visit hashtopolis on http://localhost/ the old ui is available via http://localhost/old \ No newline at end of file +5. Visit hashtopolis on https://localhost/ the old ui is available via https://localhost/legacy \ No newline at end of file From 4ec1e7f9e0c3bb1824ded2fee3bd0d6d34fc6b76 Mon Sep 17 00:00:00 2001 From: jessevz Date: Wed, 14 May 2025 11:13:16 +0200 Subject: [PATCH 068/691] refactored Error handling (#1266) * FEAT implemented patch many and reworked updating of objects through new API * Made a start to testing bulk PATCH * Added tests for bulk PATCH * Added more validation when setting attributes in database * Fixed test * Refactored exception handling * Fixed forgotten changes in refactor * Added possibility to handle HTexception for when we have not migrated all HTexceptions * Removed duplicate exception * Refactored errors in creation of object to new style * Fixed error in include path * Refactored handlers to handle new form of exceptions * Refactored the old user API to handle new exceptions * Fixed wrong import * Added application/problem+json as valid resposne for test framework * Fixed tests * Added support for new exception style in pytest * Fixed small mistake * Small refactor in agent test --------- Co-authored-by: jessevz --- ci/apiv2/hashtopolis.py | 19 +++- ci/apiv2/test_agent.py | 6 +- ci/apiv2/test_attributes.py | 6 +- ci/apiv2/utils.py | 5 +- src/api/v2/index.php | 68 +++++++++----- .../apiv2/common/AbstractBaseAPI.class.php | 79 ++++++++-------- .../apiv2/common/AbstractHelperAPI.class.php | 12 --- .../apiv2/common/AbstractModelAPI.class.php | 89 +++++++++---------- src/inc/apiv2/common/ErrorHandler.class.php | 51 +++++++++++ src/inc/apiv2/model/supertasks.routes.php | 6 +- .../handlers/AccessControlHandler.class.php | 2 +- src/inc/handlers/AccessGroupHandler.class.php | 2 +- src/inc/handlers/AccountHandler.class.php | 2 +- src/inc/handlers/AgentBinaryHandler.class.php | 2 +- src/inc/handlers/AgentHandler.class.php | 2 +- src/inc/handlers/ApiHandler.class.php | 2 +- src/inc/handlers/ConfigHandler.class.php | 2 +- src/inc/handlers/CrackerHandler.class.php | 2 +- src/inc/handlers/FileHandler.class.php | 2 +- src/inc/handlers/ForgotHandler.class.php | 2 +- src/inc/handlers/HashlistHandler.class.php | 2 +- src/inc/handlers/HashtypeHandler.class.php | 2 +- src/inc/handlers/HealthHandler.class.php | 2 +- .../handlers/NotificationHandler.class.php | 2 +- .../handlers/PreprocessorHandler.class.php | 2 +- src/inc/handlers/PretaskHandler.class.php | 2 +- src/inc/handlers/SearchHandler.class.php | 2 +- src/inc/handlers/SupertaskHandler.class.php | 2 +- src/inc/handlers/TaskHandler.class.php | 2 +- src/inc/handlers/UsersHandler.class.php | 2 +- src/inc/user-api/UserAPIAccess.class.php | 2 +- src/inc/user-api/UserAPIAccount.class.php | 2 +- src/inc/user-api/UserAPIAgent.class.php | 2 +- src/inc/user-api/UserAPIConfig.class.php | 4 +- src/inc/user-api/UserAPICracker.class.php | 2 +- src/inc/user-api/UserAPIFile.class.php | 2 +- src/inc/user-api/UserAPIGroup.class.php | 2 +- src/inc/user-api/UserAPIHashlist.class.php | 2 +- src/inc/user-api/UserAPIPretask.class.php | 2 +- .../user-api/UserAPISuperhashlist.class.php | 2 +- src/inc/user-api/UserAPISupertask.class.php | 2 +- src/inc/user-api/UserAPITask.class.php | 2 +- src/inc/user-api/UserAPIUser.class.php | 2 +- src/inc/utils/AccessControlUtils.class.php | 11 +-- src/inc/utils/AccessGroupUtils.class.php | 5 +- src/inc/utils/AgentBinaryUtils.class.php | 7 +- src/inc/utils/AgentUtils.class.php | 11 +-- src/inc/utils/CrackerUtils.class.php | 9 +- src/inc/utils/FileUtils.class.php | 25 +++--- src/inc/utils/HashlistUtils.class.php | 25 +++--- src/inc/utils/HashtypeUtils.class.php | 7 +- src/inc/utils/HealthUtils.class.php | 9 +- src/inc/utils/NotificationUtils.class.php | 11 +-- src/inc/utils/PreprocessorUtils.class.php | 23 ++--- src/inc/utils/PretaskUtils.class.php | 19 ++-- src/inc/utils/SupertaskUtils.class.php | 7 +- src/inc/utils/TaskUtils.class.php | 29 +++--- src/inc/utils/UserUtils.class.php | 11 +-- 58 files changed, 349 insertions(+), 269 deletions(-) create mode 100644 src/inc/apiv2/common/ErrorHandler.class.php diff --git a/ci/apiv2/hashtopolis.py b/ci/apiv2/hashtopolis.py index 5c6310202..6a0699c34 100644 --- a/ci/apiv2/hashtopolis.py +++ b/ci/apiv2/hashtopolis.py @@ -34,7 +34,14 @@ def print_to_log(*args): # noqa:E301 class HashtopolisError(Exception): def __init__(self, *args, **kwargs): + print(kwargs) super().__init__(*args) + self.title = kwargs.get("title", "") + self.type = kwargs.get("type", "") + self.status = kwargs.get("status", None) + + # TODO: These are the old exception details, if all exceptions have been refactored, + # these following lines can be removed. self.exception_details = kwargs.get('exception_details', []) self.message = kwargs.get('message', '') self.status_code = kwargs.get('status_code', None) @@ -83,7 +90,8 @@ class HashtopolisConnector(object): @staticmethod def resp_to_json(response): content_type_header = response.headers.get('Content-Type', '') - if any([x in content_type_header for x in ('application/vnd.api+json', 'application/json')]): + if any([x in content_type_header for x in ('application/vnd.api+json', 'application/json', + 'application/problem+json')]): return response.json() else: raise HashtopolisResponseError("Response type '%s' is not valid JSON document, text='%s'" % @@ -152,10 +160,14 @@ def validate_status_code(self, r, expected_status_code, error_msg): if r.status_code not in expected_status_code: raise HashtopolisResponseError( "%s (status_code=%s): %s" % (error_msg, r.status_code, r.text), + # TODO old exception details can be removed when it has been refactored everywhere. status_code=r.status_code, exception_details=r_json.get('exception', []), - message=r_json.get('message', None)) - + message=r_json.get('message', None), + status=r_json.get('status', None), + type=r_json.get('type', None), + title=r_json.get('title', None)) + def validate_pagination_links(self, response, page): """Validate all the links that are used for paginated data""" data = response["data"] @@ -355,6 +367,7 @@ def count(self, filter): self.validate_status_code(r, [200], "Getting count failed") return self.resp_to_json(r)['meta'] + # Build Django ORM style django.query interface class QuerySet(): def __init__(self, cls, include=None, ordering=None, filters=None, pages=None): diff --git a/ci/apiv2/test_agent.py b/ci/apiv2/test_agent.py index d32ca7768..262e06703 100644 --- a/ci/apiv2/test_agent.py +++ b/ci/apiv2/test_agent.py @@ -23,15 +23,15 @@ def test_patch_field_ignorerrors_invalid_choice(self): model_obj = self.create_test_object() with self.assertRaises(HashtopolisError) as e: self._test_patch(model_obj, 'ignoreErrors', 5) - self.assertEqual(e.exception.status_code, 500) + self.assertEqual(e.exception.status_code, 400) def test_name_too_long(self): model_obj = self.create_test_object() too_long_name = "a" * 101 with self.assertRaises(HashtopolisError) as e: self._test_patch(model_obj, 'agentName', too_long_name) # name exceeds max size of 100 - self.assertEqual(e.exception.status_code, 500) - self.assertEqual(e.exception.exception_details[0]["message"], + self.assertEqual(e.exception.status_code, 400) + self.assertEqual(e.exception.title, f"The string value: '{too_long_name}' is too long. The max size is '100'") def test_expandables(self): diff --git a/ci/apiv2/test_attributes.py b/ci/apiv2/test_attributes.py index 278c7dda1..86d94ce9b 100644 --- a/ci/apiv2/test_attributes.py +++ b/ci/apiv2/test_attributes.py @@ -33,7 +33,7 @@ def test_patch_read_only(self): r = requests.patch(uri, headers=headers, data=json.dumps(payload)) self.assertEqual(r.status_code, 403) - self.assertIn('immutable', r.json().get('exception')[0].get('message')) + self.assertIn('immutable', r.json().get('title')) user.delete() def test_create_protected(self): @@ -49,8 +49,8 @@ def test_create_protected(self): with self.assertRaises(HashtopolisError) as e: user.save() - self.assertEqual(e.exception.status_code, 500) - self.assertIn(' not valid input ', e.exception.exception_details[0]['message']) + self.assertEqual(e.exception.status_code, 403) + self.assertIn(' not valid input ', e.exception.title) def test_get_private(self): stamp = int(time.time() * 1000) diff --git a/ci/apiv2/utils.py b/ci/apiv2/utils.py index 53ed89601..eb6306c9d 100644 --- a/ci/apiv2/utils.py +++ b/ci/apiv2/utils.py @@ -378,8 +378,9 @@ def _test_expandables(self, model_obj, expandables): def _test_exception(self, func_create, *args, **kwargs): with self.assertRaises(HashtopolisError) as e: _ = func_create(*args, **kwargs) - self.assertEqual(e.exception.status_code, 500) - self.assertGreaterEqual(len(e.exception.exception_details), 1) + self.assertIn(e.exception.status_code, [403, 500, 400]) + # checks len of both old and new exceptions style, TODO: old can be removed when ervything has been refactored. + self.assertTrue(len(e.exception.exception_details) >= 1 or len(e.exception.title) >= 1) def _test_patch(self, model_obj, attr, new_attr_value=None): """ Generic test worker to PATCH object""" diff --git a/src/api/v2/index.php b/src/api/v2/index.php index 7484cef49..3ce0dc992 100644 --- a/src/api/v2/index.php +++ b/src/api/v2/index.php @@ -24,12 +24,11 @@ use Slim\Factory\AppFactory; use Slim\Middleware\ContentLengthMiddleware; use Slim\Routing\RouteContext; - +use Slim\Exception\HttpMethodNotAllowedException; use Slim\Psr7\Response; use Skeleton\Domain\Token; -use Crell\ApiProblem\ApiProblem; use Tuupola\Middleware\JwtAuthentication; use Tuupola\Middleware\HttpBasicAuthentication; @@ -51,6 +50,7 @@ use DBA\Factory; require __DIR__ . "/../../../vendor/autoload.php"; +require __DIR__ . "../../../inc/apiv2/common/ErrorHandler.class.php"; require_once(dirname(__FILE__) . "/../../inc/load.php"); @@ -60,21 +60,6 @@ AppFactory::setContainer($container); -/* Quirk to display error JSON style */ -function errorResponse($response, $message, $status = 401) -{ - $problem = new ApiProblem($message, "about:blank"); - $problem->setStatus($status); - - $body = $response->getBody(); - $body->write($problem->asJson(true)); - - return $response - ->withHeader("Content-type", "application/problem+json") - ->withStatus($status); -} - - /* Authentication middleware for token retrival */ class HashtopolisAuthenticator implements AuthenticatorInterface { public function __invoke(array $arguments): bool { @@ -192,13 +177,17 @@ public function process(Request $request, RequestHandler $handler): Response class CorsHackMiddleware implements MiddlewareInterface { public function process(Request $request, RequestHandler $handler): Response { + $response = $handler->handle($request); + + return $this::addCORSheaders($request, $response); + } + + public static function addCORSheaders(Request $request, $response) { $routeContext = RouteContext::fromRequest($request); $routingResults = $routeContext->getRoutingResults(); $methods = $routingResults->getAllowedMethods(); $requestHeaders = $request->getHeaderLine('Access-Control-Request-Headers'); - $response = $handler->handle($request); - $response = $response->withHeader('Access-Control-Allow-Origin', '*'); $response = $response->withHeader('Access-Control-Allow-Methods', implode(',', $methods)); $response = $response->withHeader('Access-Control-Allow-Headers', $requestHeaders); @@ -232,7 +221,42 @@ public function process(Request $request, RequestHandler $handler): Response { )); $app->add(new CorsHackMiddleware()); // NOTE: The RoutingMiddleware should be added after our CORS middleware so routing is performed first -$app->addRoutingMiddleware(); +// NOTE: The ErrorMiddleware should be added after any middleware which may modify the response body +$errorMiddleware = $app->addErrorMiddleware(true, true, true); +$errorHandler = $errorMiddleware->getDefaultErrorHandler(); +$errorHandler->forceContentType('application/json'); + +$customErrorHandler = function ( + Request $request, + Throwable $exception, + bool $displayErrorDetails, + bool $logErrors, + bool $logErrorDetails) use ($app) { + + $response = $app->getResponseFactory()->createResponse(); + $response = CorsHackMiddleware::addCORSheaders($request, $response); + + //Quirck to handle HTexceptions without status code, this can be removed when all HTexceptions have been migrated + $code = $exception->getCode(); + if ($code == 0) { + $code = 500; + } + + return errorResponse($response, $exception->getMessage(), $code); + }; +$errorMiddleware->setDefaultErrorHandler($customErrorHandler); +$app->addRoutingMiddleware(); //Routing middleware has to be added after the default error handler +$errorMiddlewareMethodNotAllowed = $app->addErrorMiddleware(true, true, true); +$errorMiddlewareMethodNotAllowed->setErrorHandler(HttpMethodNotAllowedException::class, function( + Request $request, + Throwable $exception, + bool $displayErrorDetails, + bool $logErrors, + bool $logErrorDetails) use ($app) { + $response = $app->getResponseFactory()->createResponse(); + return errorResponse($response, $exception->getMessage(), 405); + }); + require __DIR__ . "/../../inc/apiv2/auth/token.routes.php"; @@ -283,9 +307,5 @@ public function process(Request $request, RequestHandler $handler): Response { require __DIR__ . "/../../inc/apiv2/helper/setUserPassword.routes.php"; require __DIR__ . "/../../inc/apiv2/helper/unassignAgent.routes.php"; -// NOTE: The ErrorMiddleware should be added after any middleware which may modify the response body -$errorMiddleware = $app->addErrorMiddleware(true, true, true); -$errorHandler = $errorMiddleware->getDefaultErrorHandler(); -$errorHandler->forceContentType('application/json'); $app->run(); diff --git a/src/inc/apiv2/common/AbstractBaseAPI.class.php b/src/inc/apiv2/common/AbstractBaseAPI.class.php index 5ee8e597c..11ff33b6a 100644 --- a/src/inc/apiv2/common/AbstractBaseAPI.class.php +++ b/src/inc/apiv2/common/AbstractBaseAPI.class.php @@ -2,9 +2,6 @@ use Psr\Http\Message\ServerRequestInterface as Request; use Psr\Http\Message\ResponseInterface as Response; - -use Slim\Exception\HttpNotFoundException; -use Slim\Exception\HttpForbiddenException; use Slim\Routing\RouteContext; use DBA\AccessGroup; @@ -54,6 +51,7 @@ use function DI\string; +include_once __DIR__ . "/ErrorHandler.class.php"; require_once(dirname(__FILE__) . "/../../load.php"); @@ -247,7 +245,7 @@ final protected static function fetchOne(string $model, int $pk): object $factory = self::getModelFactory($model); $object = $factory->get($pk); if ($object === null) { - throw new HTException("$model '$pk' not found!", 400); + throw new ResourceNotFoundError("$model '$pk' not found!", 400); } return $object; } @@ -356,7 +354,7 @@ protected static function getExpandPermissions(string $expand): array ); if (array_key_exists($expand, $expand_to_perm_mapping) === False) { - throw new BadFunctionCallException("Internal error: Expand type '$expand' has no permission mapping implemented in getExpandPermissions()!"); + throw new InternalError("Internal error: Expand type '$expand' has no permission mapping implemented in getExpandPermissions()!"); } return $expand_to_perm_mapping[$expand]; } @@ -722,31 +720,30 @@ protected function unaliasData(array $data, array $features): array { /** * Validate the Permission of a DBA column and check if it key may be altered * - * @param Request $request Current request that is being handled * @param string $key Field to use as base for $objects * @param array $features The features of the DBA object of the child * - * @throws HttpForbiddenException when it is not allowed to alter the key + * @throws HttpForbidden when it is not allowed to alter the key * * @return void */ - protected function isAllowedToMutate(Request $request, array $features, string $key) { + protected function isAllowedToMutate(array $features, string $key) { if (is_string($key) == False) { - throw new HttpErrorException("Key '$key' invalid", 403); + throw new HttpError("Key '$key' invalid"); } // Ensure key exists in target array if (array_key_exists($key, $features) == False) { - throw new HttpErrorException("Key '$key' does not exists!", 403); + throw new HttpError("Key '$key' does not exists!"); } if ($features[$key]['read_only'] == True) { - throw new HttpForbiddenException($request, "Key '$key' is immutable"); + throw new HttpForbidden("Key '$key' is immutable"); } if ($features[$key]['protected'] == True) { - throw new HttpForbiddenException($request, "Key '$key' is protected"); + throw new HttpForbidden("Key '$key' is protected"); } if ($features[$key]['private'] == True) { - throw new HttpForbiddenException($request, "Key '$key' is private"); + throw new HttpForbidden("Key '$key' is private"); } } @@ -759,7 +756,7 @@ protected function validateData(array $data, array $features) // Validate if field can be left empty or not if (($features[$key]['null'] ?? True) == False) { if (is_null($value) == True) { - throw new HttpErrorException("Key '$key' is cannot be null."); + throw new HttpError("Key '$key' cannot be null."); } } else { if (is_null($value) == True) { @@ -771,59 +768,59 @@ protected function validateData(array $data, array $features) // Perform type mapping if ($features[$key]['type'] == 'bool') { if (is_bool($value) == False) { - throw new HttpErrorException("Key '$key' is not of type boolean"); + throw new HttpError("Key '$key' is not of type boolean"); } // Int } elseif (str_starts_with($features[$key]['type'], 'int')) { if (is_integer($value) == False) { - throw new HttpErrorException("Key '$key' is not of type integer"); + throw new HttpError("Key '$key' is not of type integer"); } $maxValue = ($features[$key]['type'] === 'int64') ? 9223372036854775807 : 2147483647; if ($value > $maxValue || $value < -$maxValue) { - throw new HttpErrorException("The value exceeds the limit for a {$features[$key]['type']} integer."); + throw new HttpError("The value exceeds the limit for a {$features[$key]['type']} integer."); } // Str } elseif (str_starts_with($features[$key]['type'], 'str')) { if (is_string($value) == False) { - throw new HttpErrorException("Key '$key' is not of type string"); + throw new HttpError("Key '$key' is not of type string"); } if (preg_match('/str\((\d+)\)/', $features[$key]['type'], $matches)) { $max_string_len = (int) $matches[1]; if (strlen($value) > $max_string_len) { - throw new HttpErrorException("The string value: '$value' is too long. The max size is '$max_string_len'"); + throw new HttpError("The string value: '$value' is too long. The max size is '$max_string_len'"); } } // TODO: Length validation // Array } elseif (str_starts_with($features[$key]['type'], 'array')) { if (is_array($value) == False) { - throw new HttpErrorException("Key '$key' is not of type array"); + throw new HttpError("Key '$key' is not of type array"); } // Array[Int] if ($features[$key]['subtype'] == 'int') { if (in_array(false, array_map('is_integer', $value)) == true) { - throw new HttpErrorException("Key '$key' array contains non-integer values"); + throw new HttpError("Key '$key' array contains non-integer values"); } } // Dict } elseif (str_starts_with($features[$key]['type'], 'dict')) { if (is_array($value) == False) { - throw new HttpErrorException("Key '$key' is not of type dict"); + throw new HttpError("Key '$key' is not of type dict"); } // Dict[Bool] if ($features[$key]['subtype'] == 'bool') { if (in_array(false, array_map('is_bool', $value)) == true) { - throw new HttpErrorException("Key '$key' dict contains non-boolean values"); + throw new HttpError("Key '$key' dict contains non-boolean values"); } } } else { - throw new HttpErrorException("Typemapping error for key '$key' "); + throw new HttpError("Typemapping error for key '$key' "); } // Validate values limited by choices if (is_array($features[$key]['choices'])) { if (array_key_exists($value, $features[$key]['choices']) == false) { - throw new HttpErrorException("Key '$key' value is not valid, choices=[" . + throw new HttpError("Key '$key' value is not valid, choices=[" . join(",", array_keys($features[$key]['choices'])) . "], choices_details=['" . join("', '", array_values($features[$key]['choices'])) . "']"); @@ -865,7 +862,7 @@ protected function validateParameters(array $data, array $allFeatures): void { // Ensure debugging response lists are in sorted order ksort($invalidKeys); ksort($validFeatures); - throw new HTException("Parameter(s) '" . join(", ", $invalidKeys) . "' not valid input " . + throw new HttpError("Parameter(s) '" . join(", ", $invalidKeys) . "' not valid input " . "(valid key(s) : '" . join(", ", $validFeatures) . ")'", 403); } @@ -874,7 +871,7 @@ protected function validateParameters(array $data, array $allFeatures): void { if (count($missingKeys) > 0) { // Ensure debugging response lists are in sorted order ksort($missingKeys); - throw new HTException("Required parameter(s) '" . join(", ", $missingKeys) . "' not specified"); + throw new HttpError("Required parameter(s) '" . join(", ", $missingKeys) . "' not specified"); } } @@ -890,7 +887,7 @@ protected function makeExpandables(Request $request, array $validExpandables): a foreach ($queryExpands as $expand) { if (in_array($expand, $validExpandables) == false) { - throw new HTException("Parameter '" . $expand . "' is not valid expand key (valid keys are: " . join(", ", array_values($validExpandables)) . ")"); + throw new HttpError("Parameter '" . $expand . "' is not valid expand key (valid keys are: " . join(", ", array_values($validExpandables)) . ")"); } } @@ -900,7 +897,7 @@ protected function makeExpandables(Request $request, array $validExpandables): a array_push($required_perms, ...self::getExpandPermissions($expand)); } if ($this->validatePermissions($required_perms) === FALSE) { - throw new HttpForbiddenException($request, 'Permissions missing on expand parameter objects! || ' . join('||', $this->permissionErrors)); + throw new HttpError('Permissions missing on expand parameter objects! || ' . join('||', $this->permissionErrors)); } return $queryExpands; @@ -918,7 +915,7 @@ protected function getPrimaryKey(): string return $key; } } - throw new HTException("Internal error: no primary key found"); + throw new InternalError("Internal error: no primary key found"); } function getFilters(Request $request) { @@ -936,14 +933,14 @@ protected function makeFilter(array $filters, object $apiClass): array foreach ($filters as $filter => $value) { if (preg_match('/^(?P[_a-zA-Z0-9]+?)(?|__eq|__ne|__lt|__lte|__gt|__gte|__contains|__startswith|__endswith|__icontains|__istartswith|__iendswith|__in|__nin)$/', $filter, $matches) == 0) { - throw new HTException("Filter parameter '" . $filter . "' is not valid"); + throw new HttpForbidden("Filter parameter '" . $filter . "' is not valid"); } // Special filtering of _id to use for uniform access to model primary key $cast_key = $matches['key'] == '_id' ? array_column($features, 'alias', 'dbname')[$this->getPrimaryKey()] : $matches['key']; if (array_key_exists($cast_key, $features) == false) { - throw new HTException("Filter parameter '" . $filter . "' is not valid (key not valid field)"); + throw new HttpForbidden("Filter parameter '" . $filter . "' is not valid (key not valid field)"); }; $valueList = explode(",", $value); @@ -954,13 +951,13 @@ protected function makeFilter(array $filters, object $apiClass): array case 'bool': $value = filter_var($value, FILTER_VALIDATE_BOOLEAN, FILTER_NULL_ON_FAILURE); if (is_null($value)) { - throw new HTException("Filter parameter '" . $filter . "' is not valid boolean value"); + throw new HttpForbidden("Filter parameter '" . $filter . "' is not valid boolean value"); } break; case 'int': $value = filter_var($value, FILTER_VALIDATE_INT, FILTER_NULL_ON_FAILURE); if (is_null($value)) { - throw new HTException("Filter parameter '" . $filter . "' is not valid integer value"); + throw new HttpForbidden("Filter parameter '" . $filter . "' is not valid integer value"); } } } @@ -1052,10 +1049,10 @@ protected function makeOrderFilterTemplates(Request $request, array $features, $ $remappedKey = $features[$cast_key]['dbname']; array_push($orderTemplates, ['by' => $remappedKey, 'type' => ($matches['operator'] == '-') ? "DESC" : "ASC" ]); } else { - throw new HTException("Ordering parameter '" . $order . "' is not valid"); + throw new HttpForbidden("Ordering parameter '" . $order . "' is not valid"); } } else { - throw new HTException("Ordering parameter '" . $order . "' is not valid"); + throw new HttpForbidden("Ordering parameter '" . $order . "' is not valid"); } } @@ -1075,16 +1072,16 @@ protected function validateHashlistAccess(Request $request, User $user, String $ { // TODO: Fix permissions if (!AccessControl::getInstance($user)->hasPermission(DAccessControl::MANAGE_HASHLIST_ACCESS)) { - throw new HttpForbiddenException($request, "No '" . DAccessControl::getDescription(DAccessControl::MANAGE_HASHLIST_ACCESS) . "' permission"); + throw new HttpForbidden("No '" . DAccessControl::getDescription(DAccessControl::MANAGE_HASHLIST_ACCESS) . "' permission"); } try { $hashlist = HashlistUtils::getHashlist($hashlistId); } catch (HTException $ex) { - throw new HttpNotFoundException($request, $ex->getMessage()); + throw new ResourceNotFoundError($ex->getMessage()); } if (!AccessUtils::userCanAccessHashlists($hashlist, $user)) { - throw new HttpForbiddenException($request, "No access to hashlist!"); + throw new HttpForbidden("No access to hashlist!"); } return $hashlist; @@ -1156,13 +1153,13 @@ protected function preCommon(Request $request): void $required_perms = $this->getRequiredPermissions($request->getMethod()); } catch (HTException $e) { # Annotate error message, with suitable candidates - throw new HTException($e->getMessage() . + throw new HttpForbidden($e->getMessage() . "(valid methods are for model are: " . join(",", $this->getAvailableMethods()) . ")"); } if ($this->validatePermissions($required_perms) === FALSE) { - throw new HttpForbiddenException($request, join('||', $this->permissionErrors)); + throw new HttpForbidden(join('||', $this->permissionErrors)); } } diff --git a/src/inc/apiv2/common/AbstractHelperAPI.class.php b/src/inc/apiv2/common/AbstractHelperAPI.class.php index 344373d2e..0fedf8685 100644 --- a/src/inc/apiv2/common/AbstractHelperAPI.class.php +++ b/src/inc/apiv2/common/AbstractHelperAPI.class.php @@ -3,18 +3,6 @@ use Psr\Http\Message\ResponseInterface as Response; use Psr\Http\Message\ServerRequestInterface as Request; -use DBA\Factory; - -use DBA\AbstractModelFactory; - -use DBA\Chunk; -use DBA\CrackerBinary; -use DBA\Hashlist; -use DBA\RightGroup; -use DBA\Supertask; -use DBA\Task; -use DBA\TaskWrapper; -use DBA\User; abstract class AbstractHelperAPI extends AbstractBaseAPI { abstract public function actionPost(array $data): object|array|null; diff --git a/src/inc/apiv2/common/AbstractModelAPI.class.php b/src/inc/apiv2/common/AbstractModelAPI.class.php index 2ea25af53..8f6dbe88f 100644 --- a/src/inc/apiv2/common/AbstractModelAPI.class.php +++ b/src/inc/apiv2/common/AbstractModelAPI.class.php @@ -4,10 +4,6 @@ use Psr\Http\Message\ResponseInterface as Response; use Psr\Http\Message\ServerRequestInterface as Request; -use Slim\Exception\HttpNotFoundException; -use Slim\Exception\HttpForbiddenException; -use Middlewares\Utils\HttpErrorException; - use DBA\AbstractModelFactory; use DBA\Aggregation; use DBA\JoinFilter; @@ -18,6 +14,8 @@ use DBA\QueryFilter; use Psr\Http\Message\ServerRequestInterface; +include_once __DIR__ . "/ErrorHandler.class.php"; + abstract class AbstractModelAPI extends AbstractBaseAPI { abstract static public function getDBAClass(); @@ -103,7 +101,7 @@ protected static function fetchExpandObjects(array $objects, string $expand): mi ); }; - throw new BadFunctionCallException("Internal error: Expansion '$expand' not implemented!"); + throw new InternalError("Internal error: Expansion '$expand' not implemented!"); } @@ -158,7 +156,7 @@ protected function getPrimaryKeyOther(string $dbaClass): string return $key; } } - throw new HTException("Internal error: no primary key found"); + throw new InternalError("Internal error: no primary key found"); } /** @@ -378,7 +376,7 @@ public function getRequiredPermissions(string $method): array $required_perm = $model::PERM_DELETE; break; default: - throw new HTException("Method '" . $method . "' is not allowed "); + throw new HttpForbidden("Method '" . $method . "' is not allowed "); } return array($required_perm); } @@ -410,7 +408,7 @@ protected function doFetch(string $pk): mixed { $object = $this->getFactory()->get($pk); if ($object === null) { - throw new HttpErrorException("Object not found!", 404); + throw new ResourceNotFoundError(); } return $object; @@ -439,7 +437,7 @@ final protected function ResourceRecordArrayToUpdateArray($data, $parentId) foreach ($data as $item) { if (!$this->validateResourceRecord($item)) { $encoded_item = json_encode($item); - throw new HttpErrorException('Invalid resource record given in list! invalid resource record: ' . $encoded_item); + throw new HttpError('Invalid resource record given in list! invalid resource record: ' . $encoded_item); } $updates[] = new MassUpdateSet($item["id"], $parentId); } @@ -481,9 +479,9 @@ public static function getManyResources(object $apiClass, Request $request, Resp $pageAfter = $apiClass->getQueryParameterFamilyMember($request, 'page', 'after'); $pageSize = $apiClass->getQueryParameterFamilyMember($request, 'page', 'size') ?? $defaultPageSize; if ($pageSize < 0) { - throw new HttpErrorException("Invalid parameter, page[size] must be a positive integer", 400); + throw new HttpError("Invalid parameter, page[size] must be a positive integer"); } elseif ($pageSize > $maxPageSize) { - throw new HttpErrorException(sprintf("You requested a size of %d, but %d is the maximum.", $pageSize, $maxPageSize), 400); + throw new HttpError(sprintf("You requested a size of %d, but %d is the maximum.", $pageSize, $maxPageSize)); } $validExpandables = $apiClass::getExpandables(); @@ -696,14 +694,14 @@ public function get(Request $request, Response $response, array $args): Response * ... * ] * - * @throws HTException If a filter key does not match the expected format or is invalid. + * @throws HttpForbidden If a filter key does not match the expected format or is invalid. */ public function filterObjectMap(array $filters, array $models) { $modelFilterMap = []; foreach ($filters as $filter => $value) { if (preg_match('/^(?P[_a-zA-Z0-9]+?)(?|__eq|__ne|__lt|__lte|__gt|__gte|__contains|__startswith|__endswith|__icontains|__istartswith|__iendswith)$/', $filter, $matches) == 0) { - throw new HTException("Filter parameter '" . $filter . "' is not valid"); + throw new HttpForbidden("Filter parameter '" . $filter . "' is not valid"); } foreach($models as $model) { @@ -798,7 +796,7 @@ public function patchOne(Request $request, Response $response, array $args): Res $data = $request->getParsedBody()['data']; if (!$this->validateResourceRecord($data)) { - throw new HttpErrorException('No valid resource identifier object was given as data!', 403); + return errorResponse($response, "No valid resource identifier object was given as data!", 403); } $aliasedfeatures = $this->getAliasedFeatures(); $attributes = $data['attributes']; @@ -806,7 +804,7 @@ public function patchOne(Request $request, Response $response, array $args): Res // Validate incoming data foreach (array_keys($attributes) as $key) { // Ensure key can be updated - $this->isAllowedToMutate($request, $aliasedfeatures, $key); + $this->isAllowedToMutate($aliasedfeatures, $key); } // Validate input data if it matches the correct type or subtype $this->validateData($attributes, $aliasedfeatures); @@ -848,12 +846,12 @@ public function patchMultiple(Request $request, Response $response, array $args) $aliasedfeatures = $this->getAliasedFeatures(); foreach ($data as $resourceRecord) { if (!$this->validateResourceRecord($resourceRecord)) { - throw new HttpErrorException('No valid resource identifier object was given as data!', 403); + throw new HttpError('No valid resource identifier object was given as data!', 403); } $attributes = $resourceRecord["attributes"]; foreach (array_keys($attributes) as $key) { // Ensure key can be updated - $this->isAllowedToMutate($request, $aliasedfeatures, $key); + $this->isAllowedToMutate($aliasedfeatures, $key); } $mappedData = $this->unaliasData($attributes, $aliasedfeatures); $objects[$resourceRecord["id"]] = $mappedData; @@ -887,11 +885,11 @@ public function post(Request $request, Response $response, array $args): Respons $data = $request->getParsedBody()["data"]; if ($data == null) { - throw new HttpErrorException("POST request requires data to be present", 403); + throw new HttpError("POST request requires data to be present", 403); } //POST request RR only needs type, no ID if (!isset($data['type'])) { - throw new HttpErrorException('No valid resource identifier object with type was given as data!', 403); + throw new HttpError('No valid resource identifier object with type was given as data!', 403); } $attributes = $data["attributes"]; @@ -907,8 +905,6 @@ public function post(Request $request, Response $response, array $args): Respons $mappedData = $this->unaliasData($attributes, $allFeatures); $pk = $this->createObject($mappedData); - // TODO: Return 409 (conflict) if resource already exists or cannot be created - // Request object again, since post-modified entries are not reflected into object. $object = $this->getFactory()->get($pk); return self::getOneResource($this, $object, $request, $response, 201); @@ -951,7 +947,7 @@ public function getToOneRelatedResource(Request $request, Response $response, ar $id = $object->getId(); } else { // Base object - $object = $this->doFetch($request, $id); + $object = $this->doFetch($id); } // Relation object @@ -1050,24 +1046,24 @@ public function patchToOneRelationshipLink(Request $request, Response $response, $jsonBody = $request->getParsedBody(); if ($jsonBody === null || !array_key_exists('data', $jsonBody)) { - throw new HttpErrorException('No data was sent! Send the json data in the following format: {"data": {"type": "foo", "id": 1}}'); + throw new HttpError('No data was sent! Send the json data in the following format: {"data": {"type": "foo", "id": 1}}'); } $data = $jsonBody['data']; $relationKey = $this->getToOneRelationships()[$args['relation']]['relationKey']; if ($relationKey == null) { - throw new HttpErrorException("Relation does not exist!"); + throw new HttpError("Relation does not exist!"); } $features = $this->getFeatures(); - $this->isAllowedToMutate($request, $features, $relationKey); + $this->isAllowedToMutate($features, $relationKey); $factory = $this->getFactory(); $object = $this->doFetch(intval($args['id'])); if ($data == null) { $factory->DatabaseSet($object, $relationKey, null); } elseif (!$this->validateResourceRecord($data)) { - throw new HttpErrorException('No valid resource identifier object was given as data!'); + throw new HttpError('No valid resource identifier object was given as data!'); } else { //TODO check if foreign key exists befor inserting $factory->DatabaseSet($object, $relationKey, $data["id"]); @@ -1174,7 +1170,7 @@ public function patchToManyRelationshipLink(Request $request, Response $response $jsonBody = $request->getParsedBody(); if ($jsonBody === null || !array_key_exists('data', $jsonBody) || !is_array($jsonBody['data'])) { - throw new HttpErrorException('No data was sent! Send the json data in the following format: {"data":[{"type": "foo", "id": 1}}]'); + throw new HttpError('No data was sent! Send the json data in the following format: {"data":[{"type": "foo", "id": 1}}]'); } $data = $jsonBody['data']; @@ -1192,12 +1188,12 @@ protected function updateToManyRelationship(Request $request, array $data, array $primaryKey = $this->getPrimaryKeyOther($relation['relationType']); $relationKey = $relation['relationKey']; if ($relationKey == null) { - throw new HttpErrorException("Relation does not exist!"); + throw new HttpError("Relation does not exist!"); } $relationType = $relation['relationType']; $features = $this->getFeaturesOther($relationType); - $this->isAllowedToMutate($request, $features, $relationKey); + $this->isAllowedToMutate($features, $relationKey); $factory = self::getModelFactory($relationType); @@ -1213,7 +1209,7 @@ protected function updateToManyRelationship(Request $request, array $data, array foreach ($data as $item) { if (!$this->validateResourceRecord($item)) { $encoded_item = json_encode($item); - throw new HttpErrorException('Invalid resource record given in list! invalid resource record: ' . $encoded_item); + throw new HttpError('Invalid resource record given in list! invalid resource record: ' . $encoded_item); } $updates[] = new MassUpdateSet($item["id"], $args["id"]); unset($modelsDict[$item["id"]]); @@ -1221,7 +1217,7 @@ protected function updateToManyRelationship(Request $request, array $data, array $leftover_primarykeys = array_keys($modelsDict); if ($features[$relationKey]["null"] == False && count($leftover_primarykeys) > 0) { - throw new HttpErrorException("Not all current relationship objects have been included, + throw new HttpError("Not all current relationship objects have been included, but the foreignkey can't be set to null. Either add all objects or delete the not needed objects"); } foreach ($leftover_primarykeys as $key) { @@ -1231,7 +1227,7 @@ protected function updateToManyRelationship(Request $request, array $data, array $factory->getDB()->beginTransaction(); //start transaction to be able roll back $factory->massSingleUpdate($primaryKey, $relationKey, $updates); if (!$factory->getDB()->commit()) { - throw new HttpErrorException("Was not able to update to many relationship"); + throw new HttpError("Was not able to update to many relationship"); } } @@ -1244,14 +1240,14 @@ public function postToManyRelationshipLink(Request $request, Response $response, $jsonBody = $request->getParsedBody(); if ($jsonBody === null || !array_key_exists('data', $jsonBody) || !is_array($jsonBody['data'])) { - throw new HttpErrorException('No data was sent! Send the json data in the following format: {"data":[{"type": "foo", "id": 1}}]'); + throw new HttpError('No data was sent! Send the json data in the following format: {"data":[{"type": "foo", "id": 1}}]'); } $data = $jsonBody['data']; $relation = $this->getToManyRelationships()[$args['relation']]; $relationKey = $relation['relationKey']; if ($relationKey == null) { - throw new HttpErrorException("Relation does not exist!"); + throw new HttpError("Relation does not exist!"); } // TODO this ia an abstract way of adding to junctiontables. This only works for intermediate tables @@ -1265,13 +1261,13 @@ public function postToManyRelationshipLink(Request $request, Response $response, foreach($data as $item) { if (!$this->validateResourceRecord($item)) { $encoded_item = json_encode($item); - throw new HttpErrorException('Invalid resource record given in list! invalid resource record: ' . $encoded_item); + throw new HttpError('Invalid resource record given in list! invalid resource record: ' . $encoded_item); } $junction_table_entry = $factory->getNullObject(); $setMethod1 = "set" . ucfirst($relation["junctionTableFilterField"]); $setMethod2 = "set" . ucfirst($relation["junctionTableJoinField"]); if (!method_exists($junction_table_entry, $setMethod1) || !method_exists($junction_table_entry, $setMethod2)) { - throw new HTException("Internal error, set function not found"); + throw new InternalError("Internal error, set function not found"); } $junction_table_entry->$setMethod1($args["id"]); $junction_table_entry->$setMethod2($item["id"]); @@ -1281,7 +1277,7 @@ public function postToManyRelationshipLink(Request $request, Response $response, $relationType = $relation['relationType']; $primaryKey = $this->getPrimaryKeyOther($relationType); $features = $this->getFeaturesOther($relationType); - $this->isAllowedToMutate($request, $features, $relationKey); + $this->isAllowedToMutate($features, $relationKey); $factory = self::getModelFactory($relationType); $updates = self::ResourceRecordArrayToUpdateArray($data, $args["id"]); $factory->massSingleUpdate($primaryKey, $relationKey, $updates); @@ -1301,22 +1297,22 @@ public function deleteToManyRelationshipLink(Request $request, Response $respons $jsonBody = $request->getParsedBody(); if ($jsonBody === null || !array_key_exists('data', $jsonBody) && is_array($jsonBody['data'])) { - throw new HttpErrorException('No data was sent! Send the json data in the following format: {"data":[{"type": "foo", "id": 1}}]'); + throw new HttpError('No data was sent! Send the json data in the following format: {"data":[{"type": "foo", "id": 1}}]'); } $relation = $this->getToManyRelationships()[$args['relation']]; $primaryKey = $relation['key']; $relationKey = $relation['relationKey']; if ($relationKey == null) { - throw new HttpErrorException("Relation does not exist!"); + throw new HttpError("Relation does not exist!"); } $relationType = $relation['relationType']; $features = $this->getFeaturesOther($relationType); - $this->isAllowedToMutate($request, $features, $relationKey); + $this->isAllowedToMutate($features, $relationKey); if ($features[$relationKey]['null'] == False) { // In this scenario another solution could be to delete object TODO? - throw new HttpForbiddenException($request, "Key '$relationKey' cant be set to null"); + throw new HttpForbidden("Key '$relationKey' cant be set to null"); } $data = $jsonBody['data']; @@ -1324,7 +1320,7 @@ public function deleteToManyRelationshipLink(Request $request, Response $respons foreach ($data as $item) { if (!$this->validateResourceRecord($item)) { $encoded_item = json_encode($item); - throw new HttpErrorException('Invalid resource record given in list! invalid resource record: ' . $encoded_item); + throw new HttpError('Invalid resource record given in list! invalid resource record: ' . $encoded_item); } $updates[] = new MassUpdateSet($item["id"], null); } @@ -1332,7 +1328,7 @@ public function deleteToManyRelationshipLink(Request $request, Response $respons $factory->getDB()->beginTransaction(); //start transaction to be able roll back $factory->massSingleUpdate($primaryKey, $relationKey, $updates); if (!$factory->getDB()->commit()) { - throw new HttpErrorException("Some resources failed updating"); + throw new HttpError("Some resources failed updating"); } return $response->withStatus(201) @@ -1346,11 +1342,10 @@ protected function DatabaseSet($object, $key, $value) { try { $this->getFactory()->set($object, $key, $value); } catch (PDOException $e) { - //TODO these should be set to more user friendly errors complaint to the JSON API standard - if ($e->getCode() === '23000') { - throw new HttpErrorException("Foreign key constrain failed: " . $e->getMessage()) ; + if ($e->getCode() === '23000') { + throw new HttpError("Foreign key constraint failed: " . $e->getMessage()) ; } else { - throw new HttpErrorException("MYSQL Database error [" . $e->getCode() . "]: " . $e->getMessage()); + throw new HttpError("MYSQL Database error [" . $e->getCode() . "]: " . $e->getMessage()); } } } diff --git a/src/inc/apiv2/common/ErrorHandler.class.php b/src/inc/apiv2/common/ErrorHandler.class.php new file mode 100644 index 000000000..154e28467 --- /dev/null +++ b/src/inc/apiv2/common/ErrorHandler.class.php @@ -0,0 +1,51 @@ +setStatus($status); + + $body = $response->getBody(); + $body->write($problem->asJson(true)); + + return $response + ->withHeader("Content-type", "application/problem+json") + ->withStatus($status); +} + +class ResourceNotFoundError extends Exception { + public function __construct(string $message = "Resource not found", int $code = 404) { + parent::__construct($message, $code); + } +} + +class HttpError extends Exception { + public function __construct(string $message = "Bad request", int $code = 400) { + parent::__construct($message, $code); + } +} + +class HttpForbidden extends Exception { + public function __construct(string $message = "Forbidden", int $code = 403) { + parent::__construct($message, $code); + } +} + +class HttpConflict extends Exception { + public function __construct(string $message = "Resource already exists", int $code = 409) { + parent::__construct($message, $code); + } +} + +class InternalError extends Exception { + public function __construct(string $message = "Internal error", int $code = 500) { + parent::__construct($message, $code); + } +} + +?> \ No newline at end of file diff --git a/src/inc/apiv2/model/supertasks.routes.php b/src/inc/apiv2/model/supertasks.routes.php index b6b193296..9a355fa03 100644 --- a/src/inc/apiv2/model/supertasks.routes.php +++ b/src/inc/apiv2/model/supertasks.routes.php @@ -7,8 +7,8 @@ use DBA\Supertask; use DBA\SupertaskPretask; -use Middlewares\Utils\HttpErrorException; +require_once __DIR__ . '/../common/ErrorHandler.class.php'; use Psr\Http\Message\ServerRequestInterface as Request; require_once(dirname(__FILE__) . "/../common/AbstractModelAPI.class.php"); @@ -71,7 +71,7 @@ public function updateToManyRelationship(Request $request, array $data, array $a foreach($data as $pretask) { if (!$this->validateResourceRecord($pretask)) { $encoded_pretask = json_encode($pretask); - throw new HttpErrorException('Invalid resource record given in list! invalid resource record: ' . $encoded_pretask); + throw new HttpError('Invalid resource record given in list! invalid resource record: ' . $encoded_pretask); } array_push($wantedPretasks, self::getPretask($pretask["id"])); } @@ -97,7 +97,7 @@ function compare_ids($a, $b) } if (!$factory->getDB()->commit()) { - throw new HttpErrorException("Was not able to update to many relationship"); + throw new HttpError("Was not able to update to many relationship"); } } diff --git a/src/inc/handlers/AccessControlHandler.class.php b/src/inc/handlers/AccessControlHandler.class.php index 7698b5263..7d0c8fd85 100644 --- a/src/inc/handlers/AccessControlHandler.class.php +++ b/src/inc/handlers/AccessControlHandler.class.php @@ -29,7 +29,7 @@ public function handle($action) { break; } } - catch (HTException $e) { + catch (Exception $e) { UI::addMessage(UI::ERROR, $e->getMessage()); } } diff --git a/src/inc/handlers/AccessGroupHandler.class.php b/src/inc/handlers/AccessGroupHandler.class.php index 6ac7411d9..c46dfe0b7 100644 --- a/src/inc/handlers/AccessGroupHandler.class.php +++ b/src/inc/handlers/AccessGroupHandler.class.php @@ -38,7 +38,7 @@ public function handle($action) { break; } } - catch (HTException $e) { + catch (Exception $e) { UI::addMessage(UI::ERROR, $e->getMessage()); } } diff --git a/src/inc/handlers/AccountHandler.class.php b/src/inc/handlers/AccountHandler.class.php index 9e176e0e7..8b79c5afe 100644 --- a/src/inc/handlers/AccountHandler.class.php +++ b/src/inc/handlers/AccountHandler.class.php @@ -70,7 +70,7 @@ public function handle($action) { break; } } - catch (HTException $e) { + catch (Exception $e) { UI::addMessage(UI::ERROR, $e->getMessage()); } diff --git a/src/inc/handlers/AgentBinaryHandler.class.php b/src/inc/handlers/AgentBinaryHandler.class.php index 2c32052f7..a3adf40db 100644 --- a/src/inc/handlers/AgentBinaryHandler.class.php +++ b/src/inc/handlers/AgentBinaryHandler.class.php @@ -43,7 +43,7 @@ public function handle($action) { break; } } - catch (HTException $e) { + catch (Exception $e) { UI::addMessage(UI::ERROR, $e->getMessage()); } } diff --git a/src/inc/handlers/AgentHandler.class.php b/src/inc/handlers/AgentHandler.class.php index 2b73ba235..cfe21df45 100644 --- a/src/inc/handlers/AgentHandler.class.php +++ b/src/inc/handlers/AgentHandler.class.php @@ -95,7 +95,7 @@ public function handle($action) { break; } } - catch (HTException $e) { + catch (Exception $e) { UI::addMessage(UI::ERROR, $e->getMessage()); } } diff --git a/src/inc/handlers/ApiHandler.class.php b/src/inc/handlers/ApiHandler.class.php index b3723d6f6..e7669d0d3 100644 --- a/src/inc/handlers/ApiHandler.class.php +++ b/src/inc/handlers/ApiHandler.class.php @@ -39,7 +39,7 @@ public function handle($action) { break; } } - catch (HTException $e) { + catch (Exception $e) { UI::addMessage(UI::ERROR, $e->getMessage()); } } diff --git a/src/inc/handlers/ConfigHandler.class.php b/src/inc/handlers/ConfigHandler.class.php index 794ac914e..7b2a57ada 100644 --- a/src/inc/handlers/ConfigHandler.class.php +++ b/src/inc/handlers/ConfigHandler.class.php @@ -32,7 +32,7 @@ public function handle($action) { break; } } - catch (HTException $e) { + catch (Exception $e) { UI::addMessage(UI::ERROR, $e->getMessage()); } catch (HTMessages $m) { diff --git a/src/inc/handlers/CrackerHandler.class.php b/src/inc/handlers/CrackerHandler.class.php index ff3bffc77..38d8e0f04 100644 --- a/src/inc/handlers/CrackerHandler.class.php +++ b/src/inc/handlers/CrackerHandler.class.php @@ -37,7 +37,7 @@ public function handle($action) { break; } } - catch (HTException $e) { + catch (Exception $e) { UI::addMessage(UI::ERROR, $e->getMessage()); } } diff --git a/src/inc/handlers/FileHandler.class.php b/src/inc/handlers/FileHandler.class.php index cc02e2234..34c0544b1 100644 --- a/src/inc/handlers/FileHandler.class.php +++ b/src/inc/handlers/FileHandler.class.php @@ -37,7 +37,7 @@ public function handle($action) { break; } } - catch (HTException $e) { + catch (Exception $e) { UI::addMessage(UI::ERROR, $e->getMessage()); } } diff --git a/src/inc/handlers/ForgotHandler.class.php b/src/inc/handlers/ForgotHandler.class.php index 20939b9ad..ecdfe3326 100644 --- a/src/inc/handlers/ForgotHandler.class.php +++ b/src/inc/handlers/ForgotHandler.class.php @@ -17,7 +17,7 @@ public function handle($action) { break; } } - catch (HTException $e) { + catch (Exception $e) { UI::addMessage(UI::ERROR, $e->getMessage()); } } diff --git a/src/inc/handlers/HashlistHandler.class.php b/src/inc/handlers/HashlistHandler.class.php index f064d136f..1e2672282 100644 --- a/src/inc/handlers/HashlistHandler.class.php +++ b/src/inc/handlers/HashlistHandler.class.php @@ -118,7 +118,7 @@ public function handle($action) { break; } } - catch (HTException $e) { + catch (Exception $e) { UI::addMessage(UI::ERROR, $e->getMessage()); } } diff --git a/src/inc/handlers/HashtypeHandler.class.php b/src/inc/handlers/HashtypeHandler.class.php index 987b199f6..d44ab6fee 100644 --- a/src/inc/handlers/HashtypeHandler.class.php +++ b/src/inc/handlers/HashtypeHandler.class.php @@ -21,7 +21,7 @@ public function handle($action) { break; } } - catch (HTException $e) { + catch (Exception $e) { UI::addMessage(UI::ERROR, $e->getMessage()); } } diff --git a/src/inc/handlers/HealthHandler.class.php b/src/inc/handlers/HealthHandler.class.php index c2b821646..4b64ce8fe 100644 --- a/src/inc/handlers/HealthHandler.class.php +++ b/src/inc/handlers/HealthHandler.class.php @@ -24,7 +24,7 @@ public function handle($action) { throw new HTException("Invalid action!"); } } - catch (HTException $e) { + catch (Exception $e) { UI::addMessage(UI::ERROR, $e->getMessage()); } } diff --git a/src/inc/handlers/NotificationHandler.class.php b/src/inc/handlers/NotificationHandler.class.php index d30dffe1d..bf618ea28 100644 --- a/src/inc/handlers/NotificationHandler.class.php +++ b/src/inc/handlers/NotificationHandler.class.php @@ -31,7 +31,7 @@ public function handle($action) { break; } } - catch (HTException $e) { + catch (Exception $e) { UI::addMessage(UI::ERROR, $e->getMessage()); } } diff --git a/src/inc/handlers/PreprocessorHandler.class.php b/src/inc/handlers/PreprocessorHandler.class.php index 1697b85c8..f8cc52f5e 100644 --- a/src/inc/handlers/PreprocessorHandler.class.php +++ b/src/inc/handlers/PreprocessorHandler.class.php @@ -28,7 +28,7 @@ public function handle($action) { break; } } - catch (HTException $e) { + catch (Exception $e) { UI::addMessage(UI::ERROR, $e->getMessage()); } } diff --git a/src/inc/handlers/PretaskHandler.class.php b/src/inc/handlers/PretaskHandler.class.php index d1b77c45a..31ce39c91 100644 --- a/src/inc/handlers/PretaskHandler.class.php +++ b/src/inc/handlers/PretaskHandler.class.php @@ -64,7 +64,7 @@ public function handle($action) { break; } } - catch (HTException $e) { + catch (Exception $e) { UI::addMessage(UI::ERROR, $e->getMessage()); } } diff --git a/src/inc/handlers/SearchHandler.class.php b/src/inc/handlers/SearchHandler.class.php index 66895e9fa..b20c58975 100644 --- a/src/inc/handlers/SearchHandler.class.php +++ b/src/inc/handlers/SearchHandler.class.php @@ -25,7 +25,7 @@ public function handle($action) { break; } } - catch (HTException $e) { + catch (Exception $e) { UI::addMessage(UI::ERROR, $e->getMessage()); } } diff --git a/src/inc/handlers/SupertaskHandler.class.php b/src/inc/handlers/SupertaskHandler.class.php index 9d7bd129f..4e6d0d1da 100644 --- a/src/inc/handlers/SupertaskHandler.class.php +++ b/src/inc/handlers/SupertaskHandler.class.php @@ -42,7 +42,7 @@ public function handle($action) { break; } } - catch (HTException $e) { + catch (Exception $e) { UI::addMessage(UI::ERROR, $e->getMessage()); } } diff --git a/src/inc/handlers/TaskHandler.class.php b/src/inc/handlers/TaskHandler.class.php index 33b5099e5..34956f13f 100644 --- a/src/inc/handlers/TaskHandler.class.php +++ b/src/inc/handlers/TaskHandler.class.php @@ -130,7 +130,7 @@ public function handle($action) { break; } } - catch (HTException $e) { + catch (Exception $e) { UI::addMessage(UI::ERROR, $e->getMessage()); } } diff --git a/src/inc/handlers/UsersHandler.class.php b/src/inc/handlers/UsersHandler.class.php index ec65405bd..319af0a3d 100644 --- a/src/inc/handlers/UsersHandler.class.php +++ b/src/inc/handlers/UsersHandler.class.php @@ -43,7 +43,7 @@ public function handle($action) { break; } } - catch (HTException $e) { + catch (Exception $e) { UI::addMessage(UI::ERROR, $e->getMessage()); } } diff --git a/src/inc/user-api/UserAPIAccess.class.php b/src/inc/user-api/UserAPIAccess.class.php index e4b9086c3..958ecaa7a 100644 --- a/src/inc/user-api/UserAPIAccess.class.php +++ b/src/inc/user-api/UserAPIAccess.class.php @@ -23,7 +23,7 @@ public function execute($QUERY = array()) { $this->sendErrorResponse($QUERY[UQuery::SECTION], "INV", "Invalid section request!"); } } - catch (HTException $e) { + catch (Exception $e) { $this->sendErrorResponse($QUERY[UQueryTask::SECTION], $QUERY[UQueryTask::REQUEST], $e->getMessage()); } } diff --git a/src/inc/user-api/UserAPIAccount.class.php b/src/inc/user-api/UserAPIAccount.class.php index 326bc5ccb..6fcd78b0b 100644 --- a/src/inc/user-api/UserAPIAccount.class.php +++ b/src/inc/user-api/UserAPIAccount.class.php @@ -20,7 +20,7 @@ public function execute($QUERY = array()) { $this->sendErrorResponse($QUERY[UQuery::SECTION], "INV", "Invalid section request!"); } } - catch (HTException $e) { + catch (Exception $e) { $this->sendErrorResponse($QUERY[UQueryTask::SECTION], $QUERY[UQueryTask::REQUEST], $e->getMessage()); } } diff --git a/src/inc/user-api/UserAPIAgent.class.php b/src/inc/user-api/UserAPIAgent.class.php index 17394ab31..36bcb5ede 100644 --- a/src/inc/user-api/UserAPIAgent.class.php +++ b/src/inc/user-api/UserAPIAgent.class.php @@ -56,7 +56,7 @@ public function execute($QUERY = array()) { $this->sendErrorResponse($QUERY[UQuery::SECTION], "INV", "Invalid section request!"); } } - catch (HTException $e) { + catch (Exception $e) { $this->sendErrorResponse($QUERY[UQuery::SECTION], $QUERY[UQuery::REQUEST], $e->getMessage()); } } diff --git a/src/inc/user-api/UserAPIConfig.class.php b/src/inc/user-api/UserAPIConfig.class.php index e2ea0aad1..431cff2a8 100644 --- a/src/inc/user-api/UserAPIConfig.class.php +++ b/src/inc/user-api/UserAPIConfig.class.php @@ -22,7 +22,7 @@ public function execute($QUERY = array()) { $this->sendErrorResponse($QUERY[UQuery::SECTION], "INV", "Invalid section request!"); } } - catch (HTException $e) { + catch (Exception $e) { $this->sendErrorResponse($QUERY[UQueryTask::SECTION], $QUERY[UQueryTask::REQUEST], $e->getMessage()); } } @@ -45,7 +45,7 @@ private function setConfig($QUERY) { $config = ConfigUtils::get($QUERY[UQueryConfig::CONFIG_ITEM]); $config->setValue($QUERY[UQueryConfig::CONFIG_VALUE]); } - catch (HTException $e) { + catch (Exception $e) { $config = new Config(null, 1, $QUERY[UQueryConfig::CONFIG_ITEM], $QUERY[UQueryConfig::CONFIG_VALUE]); $new = true; } diff --git a/src/inc/user-api/UserAPICracker.class.php b/src/inc/user-api/UserAPICracker.class.php index cb5d4a212..94964ca2c 100644 --- a/src/inc/user-api/UserAPICracker.class.php +++ b/src/inc/user-api/UserAPICracker.class.php @@ -29,7 +29,7 @@ public function execute($QUERY = array()) { $this->sendErrorResponse($QUERY[UQuery::SECTION], "INV", "Invalid section request!"); } } - catch (HTException $e) { + catch (Exception $e) { $this->sendErrorResponse($QUERY[UQueryTask::SECTION], $QUERY[UQueryTask::REQUEST], $e->getMessage()); } } diff --git a/src/inc/user-api/UserAPIFile.class.php b/src/inc/user-api/UserAPIFile.class.php index 43e7168fa..8ba9d4cb8 100644 --- a/src/inc/user-api/UserAPIFile.class.php +++ b/src/inc/user-api/UserAPIFile.class.php @@ -29,7 +29,7 @@ public function execute($QUERY = array()) { $this->sendErrorResponse($QUERY[UQuery::SECTION], "INV", "Invalid section request!"); } } - catch (HTException $e) { + catch (Exception $e) { $this->sendErrorResponse($QUERY[UQueryTask::SECTION], $QUERY[UQueryTask::REQUEST], $e->getMessage()); } } diff --git a/src/inc/user-api/UserAPIGroup.class.php b/src/inc/user-api/UserAPIGroup.class.php index d93b66210..6367cf1e7 100644 --- a/src/inc/user-api/UserAPIGroup.class.php +++ b/src/inc/user-api/UserAPIGroup.class.php @@ -35,7 +35,7 @@ public function execute($QUERY = array()) { $this->sendErrorResponse($QUERY[UQuery::SECTION], "INV", "Invalid section request!"); } } - catch (HTException $e) { + catch (Exception $e) { $this->sendErrorResponse($QUERY[UQueryTask::SECTION], $QUERY[UQueryTask::REQUEST], $e->getMessage()); } } diff --git a/src/inc/user-api/UserAPIHashlist.class.php b/src/inc/user-api/UserAPIHashlist.class.php index 6a60461b0..472298bae 100644 --- a/src/inc/user-api/UserAPIHashlist.class.php +++ b/src/inc/user-api/UserAPIHashlist.class.php @@ -49,7 +49,7 @@ public function execute($QUERY = array()) { $this->sendErrorResponse($QUERY[UQuery::SECTION], "INV", "Invalid section request!"); } } - catch (HTException $e) { + catch (Exception $e) { $this->sendErrorResponse($QUERY[UQueryTask::SECTION], $QUERY[UQueryTask::REQUEST], $e->getMessage()); } } diff --git a/src/inc/user-api/UserAPIPretask.class.php b/src/inc/user-api/UserAPIPretask.class.php index a2205ecdf..ebdcadca4 100644 --- a/src/inc/user-api/UserAPIPretask.class.php +++ b/src/inc/user-api/UserAPIPretask.class.php @@ -41,7 +41,7 @@ public function execute($QUERY = array()) { $this->sendErrorResponse($QUERY[UQuery::SECTION], "INV", "Invalid section request!"); } } - catch (HTException $e) { + catch (Exception $e) { $this->sendErrorResponse($QUERY[UQueryTask::SECTION], $QUERY[UQueryTask::REQUEST], $e->getMessage()); } } diff --git a/src/inc/user-api/UserAPISuperhashlist.class.php b/src/inc/user-api/UserAPISuperhashlist.class.php index b3a882a13..3e862912a 100644 --- a/src/inc/user-api/UserAPISuperhashlist.class.php +++ b/src/inc/user-api/UserAPISuperhashlist.class.php @@ -20,7 +20,7 @@ public function execute($QUERY = array()) { $this->sendErrorResponse($QUERY[UQuery::SECTION], "INV", "Invalid section request!"); } } - catch (HTException $e) { + catch (Exception $e) { $this->sendErrorResponse($QUERY[UQueryTask::SECTION], $QUERY[UQueryTask::REQUEST], $e->getMessage()); } } diff --git a/src/inc/user-api/UserAPISupertask.class.php b/src/inc/user-api/UserAPISupertask.class.php index 352fa4222..218866c7f 100644 --- a/src/inc/user-api/UserAPISupertask.class.php +++ b/src/inc/user-api/UserAPISupertask.class.php @@ -29,7 +29,7 @@ public function execute($QUERY = array()) { $this->sendErrorResponse($QUERY[UQuery::SECTION], "INV", "Invalid section request!"); } } - catch (HTException $e) { + catch (Exception $e) { $this->sendErrorResponse($QUERY[UQueryTask::SECTION], $QUERY[UQueryTask::REQUEST], $e->getMessage()); } } diff --git a/src/inc/user-api/UserAPITask.class.php b/src/inc/user-api/UserAPITask.class.php index d5b91ecd9..5449d2d20 100644 --- a/src/inc/user-api/UserAPITask.class.php +++ b/src/inc/user-api/UserAPITask.class.php @@ -86,7 +86,7 @@ public function execute($QUERY = array()) { $this->sendErrorResponse($QUERY[UQuery::SECTION], "INV", "Invalid section request!"); } } - catch (HTException $e) { + catch (Exception $e) { $this->sendErrorResponse($QUERY[UQueryTask::SECTION], $QUERY[UQueryTask::REQUEST], $e->getMessage()); } } diff --git a/src/inc/user-api/UserAPIUser.class.php b/src/inc/user-api/UserAPIUser.class.php index 3d582f5cf..d04fa5c3a 100644 --- a/src/inc/user-api/UserAPIUser.class.php +++ b/src/inc/user-api/UserAPIUser.class.php @@ -29,7 +29,7 @@ public function execute($QUERY = array()) { $this->sendErrorResponse($QUERY[UQuery::SECTION], "INV", "Invalid section request!"); } } - catch (HTException $e) { + catch (Exception $e) { $this->sendErrorResponse($QUERY[UQueryTask::SECTION], $QUERY[UQueryTask::REQUEST], $e->getMessage()); } } diff --git a/src/inc/utils/AccessControlUtils.class.php b/src/inc/utils/AccessControlUtils.class.php index b77323911..d6689f65b 100644 --- a/src/inc/utils/AccessControlUtils.class.php +++ b/src/inc/utils/AccessControlUtils.class.php @@ -5,6 +5,7 @@ use DBA\RightGroup; use DBA\Factory; +require_once __DIR__ . '/../apiv2/common/ErrorHandler.class.php'; class AccessControlUtils { /** * @param int $groupId @@ -72,17 +73,17 @@ public static function updateGroupPermissions($groupId, $perm) { /** * @param string $groupName * @return RightGroup - * @throws HTException + * @throws HttpError */ public static function createGroup($groupName) { if (strlen($groupName) == 0 || strlen($groupName) > DLimits::ACCESS_GROUP_MAX_LENGTH) { - throw new HTException("Permission group name is too short or too long!"); + throw new HttpError("Permission group name is too short or too long!"); } $qF = new QueryFilter(RightGroup::GROUP_NAME, $groupName, "="); $check = Factory::getRightGroupFactory()->filter([Factory::FILTER => $qF], true); if ($check !== null) { - throw new HTException("There is already an permission group with the same name!"); + throw new HttpConflict("There is already an permission group with the same name!"); } $group = new RightGroup(null, $groupName, "[]"); $group = Factory::getRightGroupFactory()->save($group); @@ -91,14 +92,14 @@ public static function createGroup($groupName) { /** * @param int $groupId - * @throws HTException + * @throws HttpError */ public static function deleteGroup($groupId) { $group = AccessControlUtils::getGroup($groupId); $qF = new QueryFilter(User::RIGHT_GROUP_ID, $group->getId(), "="); $count = Factory::getUserFactory()->countFilter([Factory::FILTER => $qF]); if ($count > 0) { - throw new HTException("You cannot delete a group which has still users belonging to it!"); + throw new HttpError("You cannot delete a group which has still users belonging to it!"); } // delete permission group diff --git a/src/inc/utils/AccessGroupUtils.class.php b/src/inc/utils/AccessGroupUtils.class.php index 9513f3dcb..4e458542d 100644 --- a/src/inc/utils/AccessGroupUtils.class.php +++ b/src/inc/utils/AccessGroupUtils.class.php @@ -11,6 +11,7 @@ use DBA\Factory; use DBA\File; +require_once __DIR__ . '/../apiv2/common/ErrorHandler.class.php'; class AccessGroupUtils { /** * @param int $groupId @@ -44,13 +45,13 @@ public static function getGroups() { */ public static function createGroup($groupName) { if (strlen($groupName) == 0 || strlen($groupName) > DLimits::ACCESS_GROUP_MAX_LENGTH) { - throw new HTException("Access group name is too short or too long!"); + throw new HttpError("Access group name is too short or too long!"); } $qF = new QueryFilter(AccessGroup::GROUP_NAME, $groupName, "="); $check = Factory::getAccessGroupFactory()->filter([Factory::FILTER => $qF], true); if ($check !== null) { - throw new HTException("There is already an access group with the same name!"); + throw new HttpConflict("There is already an access group with the same name!"); } $group = new AccessGroup(null, $groupName); $group = Factory::getAccessGroupFactory()->save($group); diff --git a/src/inc/utils/AgentBinaryUtils.class.php b/src/inc/utils/AgentBinaryUtils.class.php index 05a35e6f6..5a0fdd149 100644 --- a/src/inc/utils/AgentBinaryUtils.class.php +++ b/src/inc/utils/AgentBinaryUtils.class.php @@ -5,6 +5,7 @@ use DBA\User; use DBA\Factory; +require_once __DIR__ . '/../apiv2/common/ErrorHandler.class.php'; class AgentBinaryUtils { /** * @param string $type @@ -17,15 +18,15 @@ class AgentBinaryUtils { */ public static function newBinary($type, $os, $filename, $version, $updateTrack, $user) { if (strlen($version) == 0) { - throw new HTException("Version cannot be empty!"); + throw new HttpError("Version cannot be empty!"); } else if (!file_exists(dirname(__FILE__) . "/../../bin/" . basename($filename))) { - throw new HTException("Provided filename does not exist!"); + throw new HttpError("Provided filename does not exist!"); } $qF = new QueryFilter(AgentBinary::TYPE, $type, "="); $result = Factory::getAgentBinaryFactory()->filter([Factory::FILTER => $qF], true); if ($result != null) { - throw new HTException("You cannot have two binaries with the same type!"); + throw new HttpError("You cannot have two binaries with the same type!"); } $agentBinary = new AgentBinary(null, $type, $version, $os, $filename, $updateTrack, ''); Factory::getAgentBinaryFactory()->save($agentBinary); diff --git a/src/inc/utils/AgentUtils.class.php b/src/inc/utils/AgentUtils.class.php index e00592571..b2a8d8c01 100644 --- a/src/inc/utils/AgentUtils.class.php +++ b/src/inc/utils/AgentUtils.class.php @@ -18,6 +18,7 @@ use DBA\HealthCheckAgent; use DBA\Speed; +require_once __DIR__ . '/../apiv2/common/ErrorHandler.class.php'; class AgentUtils { /** * @param AgentStat $deviceUtil @@ -384,21 +385,21 @@ public static function assign($agentId, $taskId, $user) { $task = Factory::getTaskFactory()->get(intval($taskId)); if ($task == null) { - throw new HTException("Invalid task!"); + throw new HttpError("Invalid task!"); } else if (!AccessUtils::agentCanAccessTask($agent, $task)) { - throw new HTException("This agent cannot access this task - either group mismatch, or agent is not configured as Trusted to access secret tasks"); + throw new HttpError("This agent cannot access this task - either group mismatch, or agent is not configured as Trusted to access secret tasks"); } $taskWrapper = Factory::getTaskWrapperFactory()->get($task->getTaskWrapperId()); if (!AccessUtils::userCanAccessTask($taskWrapper, $user)) { - throw new HTException("No access to this task!"); + throw new HttpError("No access to this task!"); } $qF = new QueryFilter(Assignment::TASK_ID, $task->getId(), "="); $assignments = Factory::getAssignmentFactory()->filter([Factory::FILTER => $qF]); if ($task->getIsSmall() && sizeof($assignments) > 0) { - throw new HTException("You cannot assign agent to this task as the limit of assignments is reached!"); + throw new HttpError("You cannot assign agent to this task as the limit of assignments is reached!"); } $qF = new QueryFilter(Agent::AGENT_ID, $agent->getId(), "="); @@ -540,7 +541,7 @@ public static function createVoucher($newVoucher) { $qF = new QueryFilter(RegVoucher::VOUCHER, $newVoucher, "="); $check = Factory::getRegVoucherFactory()->filter([Factory::FILTER => $qF]); if ($check != null) { - throw new HTException("Same voucher already exists!"); + throw new HttpConflict("Same voucher already exists!"); } $key = htmlentities($newVoucher, ENT_QUOTES, "UTF-8"); diff --git a/src/inc/utils/CrackerUtils.class.php b/src/inc/utils/CrackerUtils.class.php index 38273a688..ec6be4a28 100644 --- a/src/inc/utils/CrackerUtils.class.php +++ b/src/inc/utils/CrackerUtils.class.php @@ -8,6 +8,7 @@ use DBA\Factory; use DBA\Pretask; +require_once __DIR__ . '/../apiv2/common/ErrorHandler.class.php'; class CrackerUtils { /** * @param CrackerBinaryType $cracker @@ -33,10 +34,10 @@ public static function createBinaryType($typeName) { $qF = new QueryFilter(CrackerBinaryType::TYPE_NAME, $typeName, "="); $check = Factory::getCrackerBinaryTypeFactory()->filter([Factory::FILTER => $qF], true); if ($check !== null) { - throw new HTException("This binary type already exists!"); + throw new HttpConflict("This binary type already exists!"); } else if (strlen($typeName) == 0) { - throw new HTException("Cracker name cannot be empty!"); + throw new HttpError("Cracker name cannot be empty!"); } $binaryType = new CrackerBinaryType(null, $typeName, 1); Factory::getCrackerBinaryTypeFactory()->save($binaryType); @@ -48,12 +49,12 @@ public static function createBinaryType($typeName) { * @param string $url * @param int $binaryTypeId * @return CrackerBinaryType - * @throws HTException + * @throws HttpError */ public static function createBinary($version, $name, $url, $binaryTypeId) { $binaryType = CrackerUtils::getBinaryType($binaryTypeId); if (strlen($version) == 0 || strlen($name) == 0 || strlen($url) == 0) { - throw new HTException("Please provide all information!"); + throw new HttpError("Please provide all information!"); } $binary = new CrackerBinary(null, $binaryType->getId(), $version, $url, $name); Factory::getCrackerBinaryFactory()->save($binary); diff --git a/src/inc/utils/FileUtils.class.php b/src/inc/utils/FileUtils.class.php index b5005ca9d..43623682a 100644 --- a/src/inc/utils/FileUtils.class.php +++ b/src/inc/utils/FileUtils.class.php @@ -12,6 +12,7 @@ use DBA\ContainFilter; use DBA\FileDelete; use DBA\Factory; +require_once __DIR__ . '/../apiv2/common/ErrorHandler.class.php'; class FileUtils { /** @@ -114,14 +115,14 @@ public static function add($source, $file, $post, $view) { $accessGroup = Factory::getAccessGroupFactory()->get($post['accessGroupId']); if ($accessGroup == null) { - throw new HTException("Invalid access group selected!"); + throw new HttpError("Invalid access group selected!"); } switch ($source) { case 'inline': $realname = str_replace(" ", "_", htmlentities(basename($post["filename"]), ENT_QUOTES, "UTF-8")); if ($realname == "") { - throw new HTException("Empty filename!"); + throw new HttpError("Empty filename!"); } $tmpfile = Factory::getStoredValueFactory()->get(DDirectories::FILES)->getVal() . "/" . $realname; $resp = Util::uploadFile($tmpfile, 'paste', $post['data']); @@ -131,11 +132,11 @@ public static function add($source, $file, $post, $view) { $fileCount++; } else { - throw new HTException("Failed to insert file $realname into DB!"); + throw new HttpError("Failed to insert file $realname into DB!"); } } else { - throw new HTException("Failed to copy file $realname to the right place! " . $resp[1]); + throw new HttpError("Failed to copy file $realname to the right place! " . $resp[1]); } break; case "upload": @@ -164,11 +165,11 @@ public static function add($source, $file, $post, $view) { $fileCount++; } else { - throw new HTException("Failed to insert file $realname into DB!"); + throw new HttpError("Failed to insert file $realname into DB!"); } } else { - throw new HTException("Failed to copy file $realname to the right place! " . $resp[1]); + throw new HttpError("Failed to copy file $realname to the right place! " . $resp[1]); } } break; @@ -195,11 +196,11 @@ public static function add($source, $file, $post, $view) { $fileCount++; } else { - throw new HTException("Failed to insert file $realname into DB!"); + throw new HttpError("Failed to insert file $realname into DB!"); } } else { - throw new HTException("Failed to copy file $realname to the right place! " . $resp[1]); + throw new HttpError("Failed to copy file $realname to the right place! " . $resp[1]); } } break; @@ -207,14 +208,14 @@ public static function add($source, $file, $post, $view) { // from url $realname = str_replace(" ", "_", htmlentities(basename($post["url"]), ENT_QUOTES, "UTF-8")); if (strlen($realname) == 0) { - throw new HTException("Empty URL provided!"); + throw new HttpError("Empty URL provided!"); } else if ($realname[0] == '.') { $realname[0] = "_"; } $tmpfile = Factory::getStoredValueFactory()->get(DDirectories::FILES)->getVal() . "/" . $realname; if (stripos($post["url"], "https://") !== 0 && stripos($post["url"], "http://") !== 0 && stripos($post["url"], "ftp://") !== 0) { - throw new HTException("Only downloads from http://, https:// and ftp:// are allowed!"); + throw new HttpError("Only downloads from http://, https:// and ftp:// are allowed!"); } $resp = Util::uploadFile($tmpfile, $source, $post["url"]); if ($resp[0]) { @@ -223,11 +224,11 @@ public static function add($source, $file, $post, $view) { $fileCount++; } else { - throw new HTException("Failed to insert file $realname into DB!"); + throw new HttpError("Failed to insert file $realname into DB!"); } } else { - throw new HTException("Failed to copy file $realname to the right place! " . $resp[1]); + throw new HttpError("Failed to copy file $realname to the right place! " . $resp[1]); } break; } diff --git a/src/inc/utils/HashlistUtils.class.php b/src/inc/utils/HashlistUtils.class.php index 58265158f..04601a6b8 100644 --- a/src/inc/utils/HashlistUtils.class.php +++ b/src/inc/utils/HashlistUtils.class.php @@ -21,6 +21,7 @@ use DBA\AgentZap; use DBA\Factory; use DBA\Speed; +require_once __DIR__ . '/../apiv2/common/ErrorHandler.class.php'; class HashlistUtils { /** @@ -772,25 +773,25 @@ public static function createHashlist($name, $isSalted, $isSecret, $isHexSalted, $brainFeatures = intval($brainFeatures); if ($format < DHashlistFormat::PLAIN || $format > DHashlistFormat::BINARY) { - throw new HTException("Invalid hashlist format!"); + throw new HttpError("Invalid hashlist format!"); } else if ($accessGroup == null) { - throw new HTException("Invalid access group selected!"); + throw new HttpError("Invalid access group selected!"); } else if (sizeof(AccessUtils::intersection(array($accessGroup), AccessUtils::getAccessGroupsOfUser($user))) == 0) { - throw new HTException("Access group with no rights selected!"); + throw new HttpError("Access group with no rights selected!"); } else if (strlen($name) == 0) { - throw new HTException("Hashlist name cannot be empty!"); + throw new HttpError("Hashlist name cannot be empty!"); } else if ($salted == '1' && strlen($saltSeparator) == 0) { - throw new HTException("Salt separator cannot be empty when hashes are salted!"); + throw new HttpError("Salt separator cannot be empty when hashes are salted!"); } else if ($brainId && !SConfig::getInstance()->getVal(DConfig::HASHCAT_BRAIN_ENABLE)) { - throw new HTException("Hashcat brain cannot be used if not enabled in config!"); + throw new HttpError("Hashcat brain cannot be used if not enabled in config!"); } else if ($brainId && $brainFeatures < 1 || $brainFeatures > 3) { - throw new HTException("Invalid brain features selected!"); + throw new HttpError("Invalid brain features selected!"); } Factory::getAgentFactory()->getDB()->beginTransaction(); @@ -815,20 +816,20 @@ public static function createHashlist($name, $isSalted, $isSecret, $isHexSalted, $tmpfile = "/tmp/hashlist_" . $hashlist->getId(); if (!Util::uploadFile($tmpfile, $source, $dataSource) && file_exists($tmpfile)) { Factory::getAgentFactory()->getDB()->rollback(); - throw new HTException("Failed to process file!"); + throw new HttpError("Failed to process file!"); } else if (!file_exists($tmpfile)) { Factory::getAgentFactory()->getDB()->rollback(); - throw new HTException("Required file does not exist!"); + throw new HttpError("Required file does not exist!"); } // replace countLines with fileLineCount? Seems like a better option, not OS-dependent else if (Util::countLines($tmpfile) > SConfig::getInstance()->getVal(DConfig::MAX_HASHLIST_SIZE)) { Factory::getAgentFactory()->getDB()->rollback(); - throw new HTException("Hashlist has too many lines!"); + throw new HttpError("Hashlist has too many lines!"); } $file = fopen($tmpfile, "rb"); if (!$file) { - throw new HTException("Failed to open file!"); + throw new HttpError("Failed to open file!"); } Factory::getAgentFactory()->getDB()->commit(); $added = 0; @@ -841,7 +842,7 @@ public static function createHashlist($name, $isSalted, $isSecret, $isHexSalted, rewind($file); $bufline = stream_get_line($file, 1024); if (strpos($bufline, $saltSeparator) === false) { - throw new HTException("Salted hashes separator not found in file!"); + throw new HttpError("Salted hashes separator not found in file!"); } } else { diff --git a/src/inc/utils/HashtypeUtils.class.php b/src/inc/utils/HashtypeUtils.class.php index 86822890a..8c23dc653 100644 --- a/src/inc/utils/HashtypeUtils.class.php +++ b/src/inc/utils/HashtypeUtils.class.php @@ -6,6 +6,7 @@ use DBA\QueryFilter; use DBA\Factory; +require_once __DIR__ . '/../apiv2/common/ErrorHandler.class.php'; class HashtypeUtils { /** * @param int $hashtypeId @@ -37,11 +38,11 @@ public static function deleteHashtype($hashtypeId) { public static function addHashtype($hashtypeId, $description, $isSalted, $isSlowHash, $user) { $hashtype = Factory::getHashTypeFactory()->get($hashtypeId); if ($hashtype != null) { - throw new HTException("This hash number is already used!"); + throw new HttpError("This hash number is already used!"); } $desc = htmlentities($description, ENT_QUOTES, "UTF-8"); if (strlen($desc) == 0 || $hashtypeId < 0) { - throw new HTException("Invalid inputs!"); + throw new HttpError("Invalid inputs!"); } $salted = 0; @@ -55,7 +56,7 @@ public static function addHashtype($hashtypeId, $description, $isSalted, $isSlow $hashtype = new HashType($hashtypeId, $desc, $salted, $slow); if (Factory::getHashTypeFactory()->save($hashtype) == null) { - throw new HTException("Failed to add new hash type!"); + throw new HttpError("Failed to add new hash type!"); } Util::createLogEntry("User", $user->getId(), DLogEntry::INFO, "New Hashtype added: " . $hashtype->getDescription()); } diff --git a/src/inc/utils/HealthUtils.class.php b/src/inc/utils/HealthUtils.class.php index bfbf43deb..4e113ae58 100644 --- a/src/inc/utils/HealthUtils.class.php +++ b/src/inc/utils/HealthUtils.class.php @@ -6,6 +6,7 @@ use DBA\Factory; use DBA\HealthCheck; +require_once __DIR__ . '/../apiv2/common/ErrorHandler.class.php'; class HealthUtils { /** * @param int $checkAgentId @@ -140,15 +141,15 @@ private static function getAttackNumHashes($hashtypeId) { * @param int $type * @param int $crackerBinaryId * @return HealthCheck - * @throws HTException + * @throws HttpError */ public static function createHealthCheck($hashtypeId, $type, $crackerBinaryId) { $crackerBinary = Factory::getCrackerBinaryFactory()->get($crackerBinaryId); if ($crackerBinary == null) { - throw new HTException("Invalid cracker binary selected!"); + throw new HttpError("Invalid cracker binary selected!"); } else if ($type != DHealthCheckType::BRUTE_FORCE) { - throw new HTException("Invalid health check type!"); + throw new HttpError("Invalid health check type!"); } // we use len 5 here, but this can be adjusted depending on the agents abilities @@ -180,7 +181,7 @@ public static function createHealthCheck($hashtypeId, $type, $crackerBinaryId) { // check if file actually exists if (!file_exists($filename)) { Factory::getHealthCheckFactory()->delete($healthCheck); - throw new HTException("Failed to create hashes in tmp directory!"); + throw new HttpError("Failed to create hashes in tmp directory!"); } // apply it to all agents diff --git a/src/inc/utils/NotificationUtils.class.php b/src/inc/utils/NotificationUtils.class.php index f2fae4b67..c293ebc9d 100644 --- a/src/inc/utils/NotificationUtils.class.php +++ b/src/inc/utils/NotificationUtils.class.php @@ -4,6 +4,7 @@ use DBA\User; use DBA\Factory; +require_once __DIR__ . '/../apiv2/common/ErrorHandler.class.php'; class NotificationUtils { /** * @param string $actionType @@ -20,22 +21,22 @@ public static function createNotificaton($actionType, $notification, $receiver, $receiver = trim($receiver); if (!isset(HashtopolisNotification::getInstances()[$notification])) { - throw new HTException("This notification is not available!"); + throw new HttpError("This notification is not available!"); } else if (!in_array($actionType, DNotificationType::getAll())) { - throw new HTException("This actionType is not available!"); + throw new HttpError("This actionType is not available!"); } else if (strlen($receiver) == 0) { - throw new HTException("You need to fill in a receiver!"); + throw new HttpError("You need to fill in a receiver!"); } else if (!AccessControl::getInstance()->hasPermission(DNotificationType::getRequiredPermission($actionType))) { - throw new HTException("You are not allowed to use this action type!"); + throw new HttpError("You are not allowed to use this action type!"); } $objectId = null; switch (DNotificationType::getObjectType($actionType)) { case DNotificationObjectType::USER: if (!AccessControl::getInstance()->hasPermission(DAccessControl::USER_CONFIG_ACCESS)) { - throw new HTException("You are not allowed to use user action types!"); + throw new HttpError("You are not allowed to use user action types!"); } if ($post['users'] == "ALL") { break; diff --git a/src/inc/utils/PreprocessorUtils.class.php b/src/inc/utils/PreprocessorUtils.class.php index 5dc3b6ba6..e356f12d7 100644 --- a/src/inc/utils/PreprocessorUtils.class.php +++ b/src/inc/utils/PreprocessorUtils.class.php @@ -4,6 +4,7 @@ use DBA\Preprocessor; use DBA\QueryFilter; use DBA\Task; +require_once __DIR__ . '/../apiv2/common/ErrorHandler.class.php'; class PreprocessorUtils { @@ -14,34 +15,34 @@ class PreprocessorUtils { * @param $keyspaceCommand * @param $skipCommand * @param $limitCommand - * @throws HTException + * @throws HttpError */ public static function addPreprocessor($name, $binaryName, $url, $keyspaceCommand, $skipCommand, $limitCommand) { $qF = new QueryFilter(Preprocessor::NAME, $name, "="); $check = Factory::getPreprocessorFactory()->filter([Factory::FILTER => $qF], true); if ($check !== null) { - throw new HTException("This preprocessor name already exists!"); + throw new HttpConflict("This preprocessor name already exists!"); } else if (strlen($name) == 0) { - throw new HTException("Preprocessor name cannot be empty!"); + throw new HttpError("Preprocessor name cannot be empty!"); } else if (strlen($binaryName) == 0) { - throw new HTException("Binary basename cannot be empty!"); + throw new HttpError("Binary basename cannot be empty!"); } else if (Util::containsBlacklistedChars($binaryName)) { - throw new HTException("The binary name must contain no blacklisted characters!"); + throw new HttpError("The binary name must contain no blacklisted characters!"); } else if (Util::containsBlacklistedChars($keyspaceCommand)) { - throw new HTException("The keyspace command must contain no blacklisted characters!"); + throw new HttpError("The keyspace command must contain no blacklisted characters!"); } else if (Util::containsBlacklistedChars($skipCommand)) { - throw new HTException("The skip command must contain no blacklisted characters!"); + throw new HttpError("The skip command must contain no blacklisted characters!"); } else if (Util::containsBlacklistedChars($limitCommand)) { - throw new HTException("The limit command must contain no blacklisted characters!"); + throw new HttpError("The limit command must contain no blacklisted characters!"); } else if (strlen($url) == 0) { - throw new HTException("URL cannot be empty!"); + throw new HttpError("URL cannot be empty!"); } if (strlen($keyspaceCommand) == 0) { @@ -60,14 +61,14 @@ public static function addPreprocessor($name, $binaryName, $url, $keyspaceComman /** * @param $preprocessorId - * @throws HTException + * @throws HttpError */ public static function delete($preprocessorId) { $preprocessor = PreprocessorUtils::getPreprocessor($preprocessorId); $qF = new QueryFilter(Task::USE_PREPROCESSOR, $preprocessor->getId(), "="); $check = Factory::getTaskFactory()->filter([Factory::FILTER => [$qF]]); if (sizeof($check) > 0) { - throw new HTException("There are tasks which use this preprocessor!"); + throw new HttpError("There are tasks which use this preprocessor!"); } Factory::getPreprocessorFactory()->delete($preprocessor); } diff --git a/src/inc/utils/PretaskUtils.class.php b/src/inc/utils/PretaskUtils.class.php index 46699e054..c2aeedc62 100644 --- a/src/inc/utils/PretaskUtils.class.php +++ b/src/inc/utils/PretaskUtils.class.php @@ -9,6 +9,7 @@ use DBA\SupertaskPretask; use DBA\Factory; +require_once __DIR__ . '/../apiv2/common/ErrorHandler.class.php'; class PretaskUtils { /** * @param int $pretaskId @@ -294,25 +295,25 @@ public static function runPretask($pretaskId, $hashlistId, $name, $crackerBinary * @param int $crackerBinaryTypeId * @param int $maxAgents * @param int $priority - * @throws HTException + * @throws HttpError */ public static function createPretask($name, $cmdLine, $chunkTime, $statusTimer, $color, $cpuOnly, $isSmall, $benchmarkType, $files, $crackerBinaryTypeId, $maxAgents, $priority = 0) { $crackerBinaryType = Factory::getCrackerBinaryTypeFactory()->get($crackerBinaryTypeId); if (strlen($name) == 0) { - throw new HTException("Name cannot be empty!"); + throw new HttpError("Name cannot be empty!"); } else if (strpos($cmdLine, SConfig::getInstance()->getVal(DConfig::HASHLIST_ALIAS)) === false) { - throw new HTException("The attack command does not contain the hashlist alias!"); + throw new HttpError("The attack command does not contain the hashlist alias!"); } else if (strlen($cmdLine) > 65535) { - throw new HTException("Attack command is too long (max 65535 characters)!"); + throw new HttpError("Attack command is too long (max 65535 characters)!"); } else if (Util::containsBlacklistedChars($cmdLine)) { - throw new HTException("The command must contain no blacklisted characters!"); + throw new HttpError("The command must contain no blacklisted characters!"); } else if ($crackerBinaryType == null) { - throw new HTException("Invalid cracker binary type!"); + throw new HttpError("Invalid cracker binary type!"); } $chunkTime = intval($chunkTime); $statusTimer = intval($statusTimer); @@ -321,13 +322,13 @@ public static function createPretask($name, $cmdLine, $chunkTime, $statusTimer, $color = ""; } else if ($cpuOnly < 0 || $cpuOnly > 1) { - throw new HTException("Invalid cpuOnly value!"); + throw new HttpError("Invalid cpuOnly value!"); } else if ($isSmall < 0 || $isSmall > 1) { - throw new HTException("Invalid isSmall value!"); + throw new HttpError("Invalid isSmall value!"); } else if ($benchmarkType < 0 || $benchmarkType > 1) { - throw new HTException("Invalid benchmark type!"); + throw new HttpError("Invalid benchmark type!"); } else if ($chunkTime <= 0) { $chunkTime = SConfig::getInstance()->getVal(DConfig::CHUNK_DURATION); diff --git a/src/inc/utils/SupertaskUtils.class.php b/src/inc/utils/SupertaskUtils.class.php index d9c105073..f007b385d 100644 --- a/src/inc/utils/SupertaskUtils.class.php +++ b/src/inc/utils/SupertaskUtils.class.php @@ -13,6 +13,7 @@ use DBA\Factory; use DBA\File; use DBA\FilePretask; +require_once __DIR__ . '/../apiv2/common/ErrorHandler.class.php'; class SupertaskUtils { /** @@ -320,17 +321,17 @@ public static function runSupertask($supertaskId, $hashlistId, $crackerId) { /** * @param string $name * @param int[] $pretasks - * @throws HTException + * @throws HttpError */ public static function createSupertask($name, $pretasks) { if (!is_array($pretasks) || sizeof($pretasks) == 0) { - throw new HTException("Cannot create empty supertask!"); + throw new HttpError("Cannot create empty supertask!"); } $tasks = []; foreach ($pretasks as $pretaskId) { $pretask = Factory::getPretaskFactory()->get($pretaskId); if ($pretask == null) { - throw new HTException("Invalid preconfigured task ID ($pretaskId)!"); + throw new HttpError("Invalid preconfigured task ID ($pretaskId)!"); } $tasks[] = $pretask; } diff --git a/src/inc/utils/TaskUtils.class.php b/src/inc/utils/TaskUtils.class.php index 29d490706..07071d25f 100644 --- a/src/inc/utils/TaskUtils.class.php +++ b/src/inc/utils/TaskUtils.class.php @@ -26,6 +26,7 @@ use DBA\Factory; use DBA\Speed; use DBA\Aggregation; +require_once __DIR__ . '/../apiv2/common/ErrorHandler.class.php'; class TaskUtils { /** @@ -734,15 +735,15 @@ public static function updateMaxAgents($taskId, $maxAgents, $user) { * @param int $staticChunking * @param int $chunkSize * @return Task - * @throws HTException + * @throws HttpError */ public static function createTask($hashlistId, $name, $attackCmd, $chunkTime, $status, $benchtype, $color, $isCpuOnly, $isSmall, $usePreprocessor, $preprocessorCommand, $skip, $priority, $maxAgents, $files, $crackerVersionId, $user, $notes = "", $staticChunking = DTaskStaticChunking::NORMAL, $chunkSize = 0) { $hashlist = Factory::getHashlistFactory()->get($hashlistId); if ($hashlist == null) { - throw new HTException("Invalid hashlist ID!"); + throw new HttpError("Invalid hashlist ID!"); } else if ($hashlist->getIsArchived()) { - throw new HTException("You cannot create a task for an archived hashlist!"); + throw new HttpError("You cannot create a task for an archived hashlist!"); } if (strlen($name) == 0) { @@ -753,38 +754,38 @@ public static function createTask($hashlistId, $name, $attackCmd, $chunkTime, $s $qF2 = new QueryFilter(AccessGroupUser::USER_ID, $user->getId(), "="); $accessGroupUser = Factory::getAccessGroupUserFactory()->filter([Factory::FILTER => [$qF1, $qF2]], true); if ($accessGroupUser == null) { - throw new HTException("You have no access to this hashlist!"); + throw new HttpForbidden("You have no access to this hashlist!"); } $cracker = Factory::getCrackerBinaryFactory()->get($crackerVersionId); if ($cracker == null) { - throw new HTException("Invalid cracker ID!"); + throw new HttpError("Invalid cracker ID!"); } else if (strpos($attackCmd, SConfig::getInstance()->getVal(DConfig::HASHLIST_ALIAS)) === false) { - throw new HTException("Attack command does not contain hashlist alias!"); + throw new HttpError("Attack command does not contain hashlist alias!"); } else if (strlen($attackCmd) > 65535) { - throw new HTException("Attack command is too long (max 65535 characters)!"); + throw new HttpError("Attack command is too long (max 65535 characters)!"); } else if ($staticChunking < DTaskStaticChunking::NORMAL || $staticChunking > DTaskStaticChunking::NUM_CHUNKS) { - throw new HTException("Invalid static chunk setting!"); + throw new HttpError("Invalid static chunk setting!"); } else if ($staticChunking > DTaskStaticChunking::NORMAL && $chunkSize <= 0) { - throw new HTException("Invalid chunk size / number of chunks for static chunking!"); + throw new HttpError("Invalid chunk size / number of chunks for static chunking!"); } else if (Util::containsBlacklistedChars($attackCmd)) { - throw new HTException("Attack command contains blacklisted characters!"); + throw new HttpError("Attack command contains blacklisted characters!"); } else if (Util::containsBlacklistedChars($preprocessorCommand)) { - throw new HTException("Preprocessor command contains blacklisted characters!"); + throw new HttpError("Preprocessor command contains blacklisted characters!"); } else if (!is_numeric($chunkTime) || $chunkTime < 1) { - throw new HTException("Invalid chunk size!"); + throw new HttpError("Invalid chunk size!"); } else if (!is_numeric($status) || $status < 1) { - throw new HTException("Invalid status timer!"); + throw new HttpError("Invalid status timer!"); } else if ($benchtype != 'speed' && $benchtype != 'runtime') { - throw new HTException("Invalid benchmark type!"); + throw new HttpError("Invalid benchmark type!"); } $benchtype = ($benchtype == 'speed') ? 1 : 0; if (preg_match("/[0-9A-Za-z]{6}/", $color) != 1) { diff --git a/src/inc/utils/UserUtils.class.php b/src/inc/utils/UserUtils.class.php index a7b7dcab9..30f36cc02 100644 --- a/src/inc/utils/UserUtils.class.php +++ b/src/inc/utils/UserUtils.class.php @@ -7,6 +7,7 @@ use DBA\NotificationSetting; use DBA\Agent; use DBA\Factory; +require_once __DIR__ . '/../apiv2/common/ErrorHandler.class.php'; class UserUtils { /** @@ -138,24 +139,24 @@ public static function setPassword($userId, $password, $adminUser) { * @param string $email * @param int $rightGroupId * @param User $adminUser - * @throws HTException + * @throws HttpError */ public static function createUser($username, $email, $rightGroupId, $adminUser) { $username = htmlentities($username, ENT_QUOTES, "UTF-8"); $group = AccessControlUtils::getGroup($rightGroupId); if (!filter_var($email, FILTER_VALIDATE_EMAIL) || strlen($email) == 0) { - throw new HTException("Invalid email address!"); + throw new HttpError("Invalid email address!"); } else if (strlen($username) < 2) { - throw new HTException("Username is too short!"); + throw new HttpError("Username is too short!"); } else if ($group == null) { - throw new HTException("Invalid group!"); + throw new HttpError("Invalid group!"); } $qF = new QueryFilter("username", $username, "="); $res = Factory::getUserFactory()->filter([Factory::FILTER => $qF], true); if ($res != null) { - throw new HTException("Username is already used!"); + throw new HttpConflict("Username is already used!"); } $newPass = Util::randomString(10); $newSalt = Util::randomString(20); From 724637e9106a104c8dc802a5766c8af7fe03625f Mon Sep 17 00:00:00 2001 From: jessevz Date: Wed, 14 May 2025 12:10:16 +0200 Subject: [PATCH 069/691] Added agentErrors endpoint (#1305) Co-authored-by: jessevz --- src/api/v2/index.php | 1 + .../apiv2/common/AbstractBaseAPI.class.php | 6 +++- src/inc/apiv2/model/agenterrors.routes.php | 36 +++++++++++++++++++ src/inc/apiv2/model/agents.routes.php | 7 ++++ 4 files changed, 49 insertions(+), 1 deletion(-) create mode 100644 src/inc/apiv2/model/agenterrors.routes.php diff --git a/src/api/v2/index.php b/src/api/v2/index.php index 3ce0dc992..b2cfb5db7 100644 --- a/src/api/v2/index.php +++ b/src/api/v2/index.php @@ -265,6 +265,7 @@ public static function addCORSheaders(Request $request, $response) { require __DIR__ . "/../../inc/apiv2/model/accessgroups.routes.php"; require __DIR__ . "/../../inc/apiv2/model/agentassignments.routes.php"; require __DIR__ . "/../../inc/apiv2/model/agentbinaries.routes.php"; +require __DIR__ . "/../../inc/apiv2/model/agenterrors.routes.php"; require __DIR__ . "/../../inc/apiv2/model/agents.routes.php"; require __DIR__ . "/../../inc/apiv2/model/agentstats.routes.php"; require __DIR__ . "/../../inc/apiv2/model/chunks.routes.php"; diff --git a/src/inc/apiv2/common/AbstractBaseAPI.class.php b/src/inc/apiv2/common/AbstractBaseAPI.class.php index 11ff33b6a..798477386 100644 --- a/src/inc/apiv2/common/AbstractBaseAPI.class.php +++ b/src/inc/apiv2/common/AbstractBaseAPI.class.php @@ -9,6 +9,7 @@ use DBA\AccessGroupUser; use DBA\Agent; use DBA\AgentBinary; +use DBA\AgentError; use DBA\AgentStat; use DBA\Assignment; use DBA\Chunk; @@ -180,6 +181,8 @@ protected static function getModelFactory(string $model): object { return Factory::getAgentFactory(); case AgentBinary::class: return Factory::getAgentBinaryFactory(); + case AgentError::class: + return Factory::getAgentErrorFactory(); case AgentStat::class: return Factory::getAgentStatFactory(); case Assignment::class: @@ -325,6 +328,7 @@ protected static function getExpandPermissions(string $expand): array 'assignments' => [Assignment::PERM_READ], 'agent' => [Agent::PERM_READ], 'agents' => [AccessGroup::PERM_READ], + 'agentErrors' => [AgentError::PERM_READ], 'agentStats' => [AgentStat::PERM_READ], 'accessGroups' => [AccessGroup::PERM_READ], 'accessGroup' => [AccessGroup::PERM_READ], @@ -371,7 +375,7 @@ protected static function getExpandPermissions(string $expand): array DAccessControl::CREATE_SUPERHASHLIST_ACCESS => array(HashlistHashlist::PERM_CREATE, HashlistHashlist::PERM_READ), DAccessControl::VIEW_HASHES_ACCESS => array(Hash::PERM_READ), - DAccessControl::VIEW_AGENT_ACCESS[0] => array(Agent::PERM_READ, Assignment::PERM_READ), + DAccessControl::VIEW_AGENT_ACCESS[0] => array(Agent::PERM_READ, Assignment::PERM_READ, AgentError::PERM_READ), DAccessControl::MANAGE_AGENT_ACCESS => array(Agent::PERM_READ, Agent::PERM_UPDATE, Agent::PERM_DELETE, // src/inc/defines/agents.php diff --git a/src/inc/apiv2/model/agenterrors.routes.php b/src/inc/apiv2/model/agenterrors.routes.php new file mode 100644 index 000000000..0c8c56f31 --- /dev/null +++ b/src/inc/apiv2/model/agenterrors.routes.php @@ -0,0 +1,36 @@ +delete($object); + } +} + +AgentErrorAPI::register($app); \ No newline at end of file diff --git a/src/inc/apiv2/model/agents.routes.php b/src/inc/apiv2/model/agents.routes.php index 8fb400a48..d131eab4e 100644 --- a/src/inc/apiv2/model/agents.routes.php +++ b/src/inc/apiv2/model/agents.routes.php @@ -4,6 +4,7 @@ use DBA\AccessGroup; use DBA\AccessGroupAgent; use DBA\Agent; +use DBA\AgentError; use DBA\AgentStat; use DBA\Assignment; use DBA\Chunk; @@ -49,6 +50,12 @@ public static function getToManyRelationships(): array { 'relationType' => AgentStat::class, 'relationKey' => AgentStat::AGENT_ID, ], + 'agentErrors' => [ + 'key' => Agent::AGENT_ID, + + 'relationType' => AgentError::class, + 'relationKey' => AgentError::AGENT_ID, + ], 'chunks' => [ 'key' => Agent::AGENT_ID, From c71a5437d96a16715f6173c6544bef396e096236 Mon Sep 17 00:00:00 2001 From: jessevz Date: Wed, 14 May 2025 15:35:03 +0200 Subject: [PATCH 070/691] Added bulk delete support (#1306) * Added bulk delete support * Fixed error in swagger api --------- Co-authored-by: jessevz --- ci/apiv2/hashtopolis.py | 20 +++++++++++++++++++ ci/apiv2/test_file.py | 6 +++++- ci/apiv2/test_hashlist.py | 6 +++++- .../apiv2/common/AbstractModelAPI.class.php | 16 +++++++++++++++ src/inc/apiv2/common/openAPISchema.routes.php | 2 ++ 5 files changed, 48 insertions(+), 2 deletions(-) diff --git a/ci/apiv2/hashtopolis.py b/ci/apiv2/hashtopolis.py index 6a0699c34..f49e1664d 100644 --- a/ci/apiv2/hashtopolis.py +++ b/ci/apiv2/hashtopolis.py @@ -257,6 +257,22 @@ def get_one(self, pk, include): r = requests.get(uri, headers=headers, data=payload) self.validate_status_code(r, [200], "Get single object failed") return self.resp_to_json(r) + + def delete_many(self, objects): + self.authenticate() + uri = self._api_endpoint + self._model_uri + headers = self._headers + headers['Content-Type'] = 'application/json' + records = [] + for obj in objects: + records.append({ + "type": type(obj).__name__, + "id": obj.id, + }) + payload = {"data": records} + logger.debug("Sending bulk DELETE payload: %s to %s", json.dumps(payload), uri) + r = requests.delete(uri, headers=headers, data=json.dumps(payload)) + self.validate_status_code(r, [204], "deleting failed") def patch_many(self, objects, attributes, field): """ @@ -496,6 +512,10 @@ def patch(cls, obj): @classmethod def patch_many(cls, objects, attributes, field): cls.get_conn().patch_many(objects, attributes, field) + + @classmethod + def delete_many(cls, objects): + cls.get_conn().delete_many(objects) @classmethod def create(cls, obj): diff --git a/ci/apiv2/test_file.py b/ci/apiv2/test_file.py index a884015a9..710aabd7b 100644 --- a/ci/apiv2/test_file.py +++ b/ci/apiv2/test_file.py @@ -46,10 +46,14 @@ def test_helper_get_file(self): helper = Helper() file_data = helper.get_file(file=model_obj) self.assertEqual(file_data, "12345678\n123456\nprincess\n") - + def test_range_request_get_file(self): model_obj = self.create_test_object() helper = Helper() file_data = helper.get_file(file=model_obj, range="bytes=9-15") self.assertEqual(file_data, "123456\n") + + def test_bulk_delete(self): + files = [self.create_test_object(delete=False) for i in range(5)] + File.objects.delete_many(files) diff --git a/ci/apiv2/test_hashlist.py b/ci/apiv2/test_hashlist.py index 27eeee8ee..401be59ac 100644 --- a/ci/apiv2/test_hashlist.py +++ b/ci/apiv2/test_hashlist.py @@ -153,4 +153,8 @@ def test_helper_create_superhashlist(self): def test_bulk_archive(self): hashlists = [self.create_test_object() for i in range(5)] active_attributes = [True for i in range(5)] - Hashlist.objects.patch_many(hashlists, active_attributes, "isArchived") \ No newline at end of file + Hashlist.objects.patch_many(hashlists, active_attributes, "isArchived") + + def test_bulk_delete(self): + hashlists = [self.create_test_object(delete=False) for i in range(5)] + Hashlist.objects.delete_many(hashlists) diff --git a/src/inc/apiv2/common/AbstractModelAPI.class.php b/src/inc/apiv2/common/AbstractModelAPI.class.php index 8f6dbe88f..829d9f8aa 100644 --- a/src/inc/apiv2/common/AbstractModelAPI.class.php +++ b/src/inc/apiv2/common/AbstractModelAPI.class.php @@ -866,6 +866,21 @@ public function patchMultiple(Request $request, Response $response, array $args) ->withHeader("Content-Type", "application/json"); } + public function deleteMultiple(Request $request, Response $response, array $args): Response { + $this->preCommon($request); + $data = $request->getParsedBody()['data']; + + foreach ($data as $resourceRecord) { + if (!$this->validateResourceRecord($resourceRecord)) { + throw new HttpError('No valid resource identifier object was given as data!', 403); + } + $object = $this->doFetch($resourceRecord['id']); + $this->deleteObject($object); + } + return $response->withStatus(204) + ->withHeader("Content-Type", "application/json"); + } + /** * Overidable function to update mulitple objects * @objects ia an array where id is the key and the values are the attributes that need to be patched @@ -1470,6 +1485,7 @@ static public function register($app): void if (in_array("DELETE", $available_methods)) { $app->delete($baseUriOne, $me . ':deleteOne')->setName($me . ':deleteOne'); + $app->delete($baseUri, $me . ':deleteMultiple')->setName($me . 'deleteMultiple'); } } } diff --git a/src/inc/apiv2/common/openAPISchema.routes.php b/src/inc/apiv2/common/openAPISchema.routes.php index 0559e1490..9294a2885 100644 --- a/src/inc/apiv2/common/openAPISchema.routes.php +++ b/src/inc/apiv2/common/openAPISchema.routes.php @@ -865,6 +865,8 @@ function makeDescription($isRelation, $method, $singleObject): string { } elseif ($method == 'patch') { // TODO add patch many here + } elseif ($method == 'delete') { + // TODO add delete many here } else { throw new HttpErrorException("Method '$method' not implemented"); From efd2c4523d6194268ff139f3d3d93e26e959e71a Mon Sep 17 00:00:00 2001 From: coiseiw Date: Fri, 16 May 2025 16:20:41 +0200 Subject: [PATCH 071/691] Many changes in the structure of the doc, creation of an intro page, integration of almost all comments from Sein and Marvin. Adding a first draft of the settings. Creation of a notes about what remain to be done. --- doc/faq_tips/faq.md | 469 +++++++++++++++++- doc/faq_tips/tips.md | 18 +- doc/index.md | 87 ++-- .../advanced_install.md | 27 +- doc/installation_guidelines/basic_install.md | 24 +- doc/notes_manual.md | 13 + doc/user_manual/agents.md | 82 ++- doc/user_manual/basic_workflow.md | 124 ++++- doc/user_manual/crackers_binary.md | 12 +- doc/user_manual/files.md | 5 +- doc/user_manual/hashlist.md | 55 +- doc/user_manual/hashtype.md | 13 - doc/user_manual/settings_and_configuration.md | 120 ++++- doc/user_manual/tasks.md | 54 +- mkdocs.yml | 4 +- 15 files changed, 910 insertions(+), 197 deletions(-) create mode 100644 doc/notes_manual.md delete mode 100644 doc/user_manual/hashtype.md diff --git a/doc/faq_tips/faq.md b/doc/faq_tips/faq.md index 1f0935877..595bfc033 100644 --- a/doc/faq_tips/faq.md +++ b/doc/faq_tips/faq.md @@ -1,18 +1,475 @@ # Questions and Answers -## Debugging MySQL queries +## Installation & Setup -Running into some funky issues? Want to see what hashtopolis is really submitting to the database? + -You can enable query logging in mysql. +❓ How do I install Hashtopolis? -Login into the database: +**Answer**: To install Hashtopolis, you typically clone the GitHub repository, configure the backend using Apache/PHP/MySQL, and set up the frontend via a web browser. For step-by-step instructions, refer to the official documentation. Make sure your system meets the minimum requirements (Linux server, PHP 7.4+, MySQL/MariaDB, Apache/Nginx). + + +--- + + + +❓ Can I run Hashtopolis on a server already running something else (e.g. Homebridge)? + +**Answer**: Yes, as long as the server has enough resources. + + + +--- + + + +❓ How do I make the agent start automatically on Ubuntu? + +**Answer**: To auto-start the agent on boot, create a `systemd` service file in `/etc/systemd/system/hashtopolis-agent.service` that runs the agent script with Python. Enable it using `systemctl enable hashtopolis-agent` and start it with `systemctl start hashtopolis-agent`. Ensure your agent configuration (`config.json`) is correctly set before enabling. + + + +--- + + + +❓ How can I mount folders (import, files, binaries) to a local directory instead of using a Docker volume? + +**Answer**: By default (when using the standard `docker-compose` setup), Hashtopolis stores folders like `import`, `files`, and `binaries` in a Docker volume. You can list this volume using `docker volume ls` and access it inside the container at `/usr/local/share/hashtopolis`. + +To use host directories instead of Docker volumes, you can change the mount paths in your `docker-compose.yml` file like this: + +``` +version: '3.7' +services: + hashtopolis-backend: + container_name: hashtopolis-backend + image: hashtopolis/backend:latest + restart: always + volumes: + - /opt/hashtopolis/config:/usr/local/share/hashtopolis/config:Z + - /opt/hashtopolis/log:/usr/local/share/hashtopolis/log:Z + - /opt/hashtopolis/import:/usr/local/share/hashtopolis/import:Z + - /opt/hashtopolis/binaries:/usr/local/share/hashtopolis/binaries:Z + - /opt/hashtopolis/files:/usr/local/share/hashtopolis/files:Z + environment: + HASHTOPOLIS_DB_USER: $MYSQL_USER + HASHTOPOLIS_DB_PASS: $MYSQL_PASSWORD + HASHTOPOLIS_DB_HOST: $HASHTOPOLIS_DB_HOST + HASHTOPOLIS_DB_DATABASE: $MYSQL_DATABASE + HASHTOPOLIS_ADMIN_USER: $HASHTOPOLIS_ADMIN_USER + HASHTOPOLIS_ADMIN_PASSWORD: $HASHTOPOLIS_ADMIN_PASSWORD + HASHTOPOLIS_APIV2_ENABLE: $HASHTOPOLIS_APIV2_ENABLE + depends_on: + - db + ports: + - 8080:80 + db: + container_name: db + image: mysql:8.0 + restart: always + volumes: + - db:/var/lib/mysql + environment: + MYSQL_ROOT_PASSWORD: $MYSQL_ROOT_PASS + MYSQL_DATABASE: $MYSQL_DATABASE + MYSQL_USER: $MYSQL_USER + MYSQL_PASSWORD: $MYSQL_PASSWORD + hashtopolis-frontend: + container_name: hashtopolis-frontend + image: hashtopolis/frontend:latest + environment: + HASHTOPOLIS_BACKEND_URL: $HASHTOPOLIS_BACKEND_URL + restart: always + depends_on: + - hashtopolis-backend + ports: + - 4200:80 +volumes: + db: + hashtopolis: +``` + +Before recreating the containers, make sure to copy data out of the Docker volume: + +``` +docker cp hashtopolis-backend:/usr/local/share/hashtopolis +``` + +Then shut down and bring the containers back up: + +``` +docker compose down +docker compose up +``` + +Finally, copy your data back into the corresponding folders. + + + + +--- + + + +❓ How can I debug MySQL queries? + +**Answer**: If you're encountering unusual issues and want to understand what queries Hashtopolis is executing on the database, you can enable query logging in MySQL. + +Steps to do this inside a Docker container: + +``` docker exec -it /bin/bash mysql -p -# default is: hashtopolis +# Default password is: hashtopolis SET GLOBAL general_log = 'ON'; SET GLOBAL sql_log_off = 'ON'; exit cd /var/lib/mysql -tail -f *.log \ No newline at end of file +tail -f *.log +``` + +This enables the general query log, which logs all incoming SQL statements. You can inspect these logs to trace how the application interacts with the database. + + + + +--- + + + +❓ Why does Hashtopolis fail and how can I debug errors? + +**Answer**: Troubleshooting Hashtopolis can sometimes be challenging. A common error you might encounter is: + +``` +Error during speed benchmark, return code: 255 Output: +``` + +This usually means something is misconfigured in the Hashcat setup. To debug: + +1. **Stop the Hashtopolis agent** (if running in a background process or screen). + +2. **Restart the agent manually with the** `**--debug**` **flag**: + + ``` + python3 agent.py --debug + ``` + +3. Look in the debug output for a line starting with `CALL:` — this shows the exact Hashcat command being executed. + +4. **Navigate to the relevant cracker binary directory**: + + ``` + cd crackers/1/ + ``` + + _(Note: Check the actual cracker ID used by your task in the Hashtopolis web UI under the Crackers section.)_ + +5. **Copy the** `**CALL:**` **command and remove**: + + - `--machine-readable` + + - `--quiet` + + - `-p ""` _(as tab characters can cause issues when copying)_ + +6. **Run the simplified Hashcat command manually** and check the terminal output. Example: + + ``` + ./hashcat.bin --progress-only --restore-disable --potfile-disable --session=hashtopolis -a3 ../../hashlists/2 ?l?l?l?l?l?l?a --hash-type=0 -o ../../hashlists/2.out + ``` + + +This should help reveal any specific errors or misconfigurations in the command line. + + + + +--- + + + +❓ Can I fake an agent for debugging the server API? + +**Answer**: Yes, you can simulate an agent to test how the Hashtopolis server API behaves. This is especially useful for replicating hard-to-reproduce production issues. + +1. **Ensure the agent is registered** at the server and has a valid token. + +2. Use the following Python code to simulate agent-server interactions: + + +``` +#!/usr/bin/python3 +import requests + +url = 'http://hashtopolis-server-dev/api/server.php' +token = 'token' # Replace with your actual agent token +headers = {} + +data_get_task = { + 'action': 'getTask', + 'token': token +} + +response = requests.post(url, headers=headers, json=data_get_task) +task_id = response.json().get('taskId') + +data_get_chunk = { + 'action': 'getChunk', + 'token': token, + 'taskId': task_id +} + +response = requests.post(url, headers=headers, json=data_get_chunk) +status = response.json().get('status') + +if status == 'keyspace_required': + data_send_keyspace = { + 'action': 'sendKeyspace', + 'token': token, + 'taskId': task_id, + 'keyspace': 5000000 + } + print(requests.post(url, headers=headers, json=data_send_keyspace).json()) +elif status == 'benchmark': + data_send_benchmark = { + 'action': 'sendBenchmark', + 'token': token, + 'taskId': task_id, + 'type': 'speed', + 'result': '674:674.74' + } + print(requests.post(url, headers=headers, json=data_send_benchmark).json()) +elif status == 'OK': + chunk_id = response.json().get('chunkId') + data_send_progress = { + 'action': 'sendProgress', + 'token': token, + 'chunkId': chunk_id, + 'keyspaceProgress': 1, + 'relativeProgress': 1, + 'speed': 1000, + 'state': 3, + 'cracks': [['hash', 'plain', 'salt', '5']], + "gpuTemp": ["0"], + "gpuUtil": ["0"] + } + print(requests.post(url, headers=headers, json=data_send_progress).json()) +``` + +This lets you debug API interactions manually without needing a live cracking job or agent setup. + + + + +--- + + + + +❓ Is internet access required to run Hashtopolis? + +**Answer**: No. + + + +--- + + + +❓ Can I run Hashtopolis on ARM (e.g., Raspberry Pi)? + +**Answer**: Not officially supported. ARM builds must be custom-built. + + + +--- + + + +## Server Configuration & Issues + + + +❓ Why does Apache show only a directory or a 500 error? + +**Answer**: A 500 error or directory index display usually indicates PHP is either not installed, disabled, or misconfigured. Ensure that `libapache2-mod-php` is installed and enabled. Also, verify that your `php.ini` and `.htaccess` files don't contain invalid directives. Check Apache error logs at `/var/log/apache2/error.log` for more specific issues. + + + +--- + + + +❓ How to fix a failed first login in Docker? + +**Answer**: Check if the backend logs show “initialization successful”. Docker environment variables must be set correctly. + + + +--- + + + +❓ How to upgrade Hashtopolis without data loss? + +**Answer**: Back up the database, pull the latest version from Git, and apply the update through the upgrade feature. + + + +--- + + + +## Hashcat Questions + + + +❓ Is `--increment` supported? + +**Answer**: No, not directly. Workaround: create individual masks or use “Import Supertask” for manual mask input. + + + +--- + + + +❓ Can Hashtopolis use custom Hashcat builds? + +**Answer**: Yes, upload them through the admin interface as separate binaries. + + + +--- + + + +❓ What if a client only uses one of multiple GPUs? + +**Answer**: This is likely due to small chunk size or a single hash. Larger workloads will utilize more GPUs. + + + +--- + + + +❓ How do you deal with huge wordlists (e.g. 20–50 GB)? + +**Answer**: Split files, SCP them to the server or serve them via Python’s HTTP server. + + + +--- + + + +## Tasks & Distribution + + + +❓ How are tasks split across clients? + +**Answer**: Based on keyspace ranges (e.g. Client A: AAAA–BBBB, Client B: CCCC–DDDD). + + + +--- + + + +❓ Can I assign specific agents to specific users or tasks? + +**Answer**: Admins can manage this in task settings or manually configure allowed agents. + + + +--- + + + +❓ How are tasks prioritized? + +**Answer**: Tasks are prioritized numerically. + + + +--- + + + +## Interface & Features + + +❓ Does Hashtopolis support notifications (e.g. Telegram, Discord)? + +**Answer**: Yes, Discord and Telegram bot notifications are supported but require manual setup. + + + +--- + + + +## File Management + + + +❓ Can large wordlists be remotely deleted from agents? + +**Answer**: Requires manual script or reconfiguration. + + + +--- + + + +## Troubleshooting & Performance + + + +❓ Why is only 4 GB of VRAM used on a 10 GB RTX 3080? + +**Answer**: Hashcat uses only as much memory as needed. More memory ≠ more speed. + + + +--- + + + +❓ What are “zaps” in status logs? + +**Answer**: Notification that another client already cracked a hash, allowing the client to skip it. + + + +--- + + + +## Security & Access Control + + + +❓ Is there a way to trust all agents by default? + +**Answer**: No, but there’s an open feature request for it: [GitHub Issue #721](https://github.com/hashtopolis/server/issues/721) + + + +--- + + + +❓ Can an API token be shared across multiple agents? + +**Answer**: Yes, using the same token is fine for basic usage. + + + +--- \ No newline at end of file diff --git a/doc/faq_tips/tips.md b/doc/faq_tips/tips.md index 9c2b4233a..b3122733b 100644 --- a/doc/faq_tips/tips.md +++ b/doc/faq_tips/tips.md @@ -2,4 +2,20 @@ Here are some cool tips for the users -Q&A \ No newline at end of file +## Debugging MySQL queries + +Running into some funky issues? Want to see what hashtopolis is really submitting to the database? + +You can enable query logging in mysql. + +Login into the database: +``` +docker exec -it /bin/bash +mysql -p +# default is: hashtopolis +SET GLOBAL general_log = 'ON'; +SET GLOBAL sql_log_off = 'ON'; +exit +cd /var/lib/mysql +tail -f *.log +``` diff --git a/doc/index.md b/doc/index.md index 4ed667320..06222f3e0 100644 --- a/doc/index.md +++ b/doc/index.md @@ -1,66 +1,63 @@ -# Hashtopolis documentation +# What is Hashtopolis? > [!CAUTION] > This is the new documentation of Hashtopolis. It is work in progress, so use with care! > > You can find the old documentation still inside this folder, please check the [Hashtopolis Communication Protocol (V2)](protocol.pdf) docs. The user api documentation can be found here: [Hashtopolis User API (V1)](user-api/user-api.pdf). -Hashtopolis is a multi-platform client-server tool for distributing hashcat tasks to multiple computers. The main goals for Hashtopolis's development are portability, robustness, multi-user support, and multiple groups management. The application has two parts: +**Hashtopolis** is an open-source platform designed to distribute and manage password cracking tasks across multiple machines. +Password cracking is a *pleasantly parallel* problem, meaning it can be divided into many independent subtasks that run simultaneously without needing to communicate with each other. Each agent can work on a different portion of the attack without waiting for others. This makes cracking highly scalable: the more ressources you have, the faster the overall process will run. Hashtopolis takes full advantage of this by coordinating multiple agents to work in parallel, maximizing resource usage and significantly reducing cracking time. -- Agent Python client, easily customizable to suit any need. -- Server several PHP/CSS files operating on two endpoints: an Admin GUI and an Agent Connection Point +## Objectives and Purpose -Aiming for high usability even on restricted networks, Hashtopolis communicates over HTTP(S) using a human-readable, hashing-specific dialect of JSON. +Hashtopolis is built to: -The server part runs on PHP using MySQL as the database back end. It is vital that your MySQL server is configured with performance in mind. Queries can be very expensive and proper configuration makes the difference between a few milliseconds of waiting and disastrous multi-second lags. The database schema heavily profits from indexing. Therefore, if you see a hint about pre-sorting your hashlist, please do so. +- Centralise password cracking management through a user-friendly web interface available in both dark and light theme. +- Efficiently distribute workloads to multiple agents, locally or over a network, taking into account hetereogeneous hardware configuration. +- Support various cracking tools, yet primarily designed for Hashcat, and custom attack strategies. +- Allow easy monitoring, task automation, and result collection in large-scale environments. +- Centralised management of files (e.g. wordlists, rules,...) as well as binaries update and distribution. +- Support for multi-user environment with different level of permissions. -The web admin interface is the single point of access for all client agents. New agent deployments require a one-time password generated in the New Agent tab. This reduces the risk of leaking hashes or files to rogue or fake agents. -There are parts of the documentation and wiki which are not up-to-date. If you see anything wrong or have questions on understanding descriptions, join our Discord server at https://discord.gg/S2NTxbz. +## How It Works – In a Nutshell -To report a bug, please create an issue and try to describe the problem as accurately as possible. This helps us to identify the bug and see if it is reproducible. +Hashtopolis operates on a **client-server architecture**: -In an effort to make the Hashtopussy project conform to a more politically neutral name it was rebranded to "Hashtopolis" in March 2018. +- The **server** hosts the web interface and database, serving as the central hub where users upload hashes and files, configure cracking tasks, and monitor overall progress. It distributes all necessary files, hashlists, and binaries to agents, centralizes their cracking progress, and collects the recovered passwords. The server runs on PHP and uses MySQL as its database backend. -# Features -- Easy and comfortable to use -- Dark and light theme -- Accessible from anywhere via web interface or user API -- Server component highly compatible with common web hosting setups -- Unattended agents -- File management for word lists, rules, ... -- Self-updating of both Hashtopolis and Hashcat -- Cracking multiple hashlists of the same hash type as though they were a single hashlist -- Running the same client on Windows, Linux and macOS -- Files and hashes marked as "secret" are only distributed to agents marked as "trusted" -- Many data import and export options -- Rich statistics on hashes and running tasks -- Visual representation of chunk distribution -- Multi-user support -- User permission levels -- Various notification types -- Small and/or CPU-only tasks -- Group assignment for agents and users for fine-grained access-control -- Compatible with crackers supporting certain flags -- Report generation for executed attacks and agent status -- Multiple file distribution variants +- The **agents** are lightweight Python clients installed on various computing resources. They communicate with the server by requesting work, execute cracking tasks using Hashcat, and report results back to the server. -# Contribution Guidelines -We are open to all kinds of contributions. If it's a bug fix or a new feature, feel free to create a pull request. Please consider some points: +A detailed [Basic Workflow](#) section is available for new users explaining how to operate Hashtopolis step-by-step. Here, we provide a concise overview of what happens behind the scenes once a hash or hashlist has been uploaded and a task created to recover its passwords: -Just include one feature or one bugfix in one pull request. In case you have two new features please also create two pull requests. -Try to stick with the code style used (especially in the PHP parts). IntelliJ/PHPStorm users can get a code style XML here. +1. Agents that currently have no assigned work send requests to the server via API calls asking for new tasks. + +2. The server assigns these agents to the highest-priority task for which they have the necessary permissions. + +3. Before cracking begins, the server initiates a keyspace calculation for the assigned task. This calculation is performed by one or more agents assigned to the task. A few points to note: + - Ideally, only one agent would perform this calculation since the result is always the same. However, having multiple agents perform it prevents idle time if a single agent fails. + - The concept of **keyspace** in Hashcat differs from the traditional definition. For more details, refer to the [Hashcat Wiki](https://hashcat.net/wiki/doku.php?id=frequently_asked_questions#what_is_a_keyspace). Briefly, Hashcat’s `--keyspace` option is designed to optimize workload distribution rather than represent the exact total keyspace. If you know the idea of "base" and "amplifier," Hashcat’s keyspace command outputs the size of the base, whereas the traditional keyspace is base × amplifier. + +4. After the keyspace is known, each agent runs a benchmark for the task to determine how quickly it can process its assigned workload. + +5. Using the benchmark results and the task’s keyspace, the server calculates the size of the **chunk** — a portion of the keyspace assigned to an agent. This chunk size aligns with the task’s configured "chunk size" parameter, which specifies how long an agent should work uninterrupted on a chunk. + +6. Once an agent completes its assigned chunk — either by cracking all possible passwords in that portion or exhausting the keyspace — it requests new work from the server. If the task still has remaining work and remains the highest-priority task, the server assigns the next chunk to that agent. + +## Contribution Guidelines +We are open to all kinds of contributions. If it's a bug fix or a new feature, feel free to create a pull request. Please consider the following points: + +- include one feature or one bugfix in one pull request; +- try to stick with the code style used (especially in the PHP parts), IntelliJ/PHPStorm users can get a code style XML here. The pull request will then be reviewed by at least one member and merged after approval. Don't be discouraged just because the first review is not approved, often these are just small changes. -# Thanks -- winxp5421 for testing, writing help texts and a lot of input ideas -- blazer for working on the csharp agent and hops for working on the python agent -- Cynosure Prime for testing -- atom for hashcat -- curlyboi for the original Hashtopus code +## What to expect from the manual? -# Do we keep this ? +This manual aims at describing all the functionalities and settings existing in hashtopolis. In particular, you can find the following sections: -7zip binaries are compiled from here -uftp binaries are compiled from here \ No newline at end of file +- **Installation Guidelines**: describes the basic installation procedure to deploy a hashtopolis instance. It also contains advanced installation procedures to have it in an air-gapped environment, working with https enabled as well as many other advanced features. +- **Basic Workflow**: serves particularly for new users who are not familiar with hashtopolis. It describes the most important features to know in order to have your first tasks running. +- **User Manual**: goes deeper than the basic workflow in each of the aspect of hashtopolis. This aims to cover all the existing features and settings of Hashtopolis. +- **FAQ and Tips**: gathers most of the questions that were asked on different channels (discord, wiki, etc.). +- **API Reference**: contains all the details related to the API in case you need to automatise some processes or want to develop your own front end. \ No newline at end of file diff --git a/doc/installation_guidelines/advanced_install.md b/doc/installation_guidelines/advanced_install.md index 309cf3540..5e29aa0ca 100644 --- a/doc/installation_guidelines/advanced_install.md +++ b/doc/installation_guidelines/advanced_install.md @@ -1,9 +1,4 @@ # Advanced installation -- Installation of TLS X.509 certificate (***Done in advanced usage***) -- Agent configuration file and command line arguments -- (Boot from PXE) and run HtP as a service (voucher, local disk,...) -- Misc. - ## Installation in an airgapped/offline/oil-gapped system (**make a note about the binary**) If you are running Hashtopolis in an offline network or an air-gapped network, you will need to use a machine with internet access to either pull the images directly from the docker hub or build it yourself. @@ -26,7 +21,7 @@ docker load --input hashtopolis-backend.tar docker load --input hashtopolis-frontend.tar ``` -Continue with the normal docker installation described in ***link to the basic install*** +Continue with the normal docker installation described in the [basic installation section](/installation_guidelines/basic_install/#setup-hashtopolis-server). ## Build Hashtopolis images yourself The Docker images can be built from source following these steps. @@ -243,15 +238,21 @@ Repeat all the steps above, but you don't need to export/import the database. On ***To be done*** -## New user interface technical preview (**also present in basic install**) -> [!NOTE]: + +## New user interface: technical preview + +> [!NOTE] > The APIv2 and UIv2 are a technical preview. Currently, when enabled, everyone through the new API will be fully admin! To enable 'version 2' of the API: 1. Stop your containers -2. set the *HASHTOPOLIS_APIV2_ENABLE* to 1 inside the *.env* file. -3. ```docker compose up --detach``` -4. Access the technical preview via: http://127.0.0.1:4200 using the credentials below (unless modified in the *.env* file) - - user: admin - - password: hashtopolis + +2. set the HASHTOPOLIS_APIV2_ENABLE to 1 inside the .env file. + +3. Relaunch the containers +``` +docker compose up --detach +``` + +4. Access the technical preview via: ```http://127.0.0.1:4200``` using the credentials user=admin and password=hashtopolis, unless modified in the .env file. diff --git a/doc/installation_guidelines/basic_install.md b/doc/installation_guidelines/basic_install.md index b28d8e4cd..e8867607a 100644 --- a/doc/installation_guidelines/basic_install.md +++ b/doc/installation_guidelines/basic_install.md @@ -40,27 +40,9 @@ nano .env ``` docker compose up --detach ``` -5. Access the Hashtopolis UI through: http://127.0.0.1:8080 using the credentials (user=admin, password=hashtopolis) +5. Access the Hashtopolis UI through: ```http://127.0.0.1:8080``` using the credentials (user=admin, password=hashtopolis) 6. If you want to play around with a preview of the version 2 of the UI, consult the New user interface: technical preview section. -### New user interface: technical preview - -> [!NOTE] -> The APIv2 and UIv2 are a technical preview. Currently, when enabled, everyone through the new API will be fully admin! - -To enable 'version 2' of the API: - -1. Stop your containers - -2. set the HASHTOPOLIS_APIV2_ENABLE to 1 inside the .env file. - -3. Relaunch the containers -``` -docker compose up --detach -``` - -4. Access the technical preview via: http://127.0.0.1:4200 using the credentials user=admin and password=hashtopolis, unless modified in the .env file. - ## Agent installation ### Prerequisites To install the agent, ensure that the following prerequisites are met: @@ -88,7 +70,7 @@ pip install requests psutil ``` ### Download the Hashtopolis agent -1. Connect to the Hashtopolis server: http://:8080 and log in. Navigate to the Agents tab > New Agent. +1. Connect to the Hashtopolis server: ```http://:8080``` and log in. Navigate to the page *Agents > Show Agents* and click on the button *'+ New Agent'*. 2. From that page, you can either download the agent by clicking on the Download button, or copy and paste the provided url to download the agent using wget/curl: ``` curl -o hastopolis.zip "http://:8080/agents.php?download=1" @@ -105,7 +87,7 @@ source hashtopolis_env/bin/activate python hashtopolis.zip ``` -3. When prompted, provide the URL to the server API as provided in the Agents page of Hashtopolis (http://:8080/api/server.php). +3. When prompted, provide the URL to the server API as provided in the Agents page of Hashtopolis (```http://:8080/api/server.php```). ``` Starting client 's3-python-0.7.2.4'... Please enter the url to the API of your Hashtopolis installation: diff --git a/doc/notes_manual.md b/doc/notes_manual.md new file mode 100644 index 000000000..46ff6c7c0 --- /dev/null +++ b/doc/notes_manual.md @@ -0,0 +1,13 @@ +# What still has to be done +- in advanced install there should be a note about the binaries, files in www-data forat etc +- lots of screenshots and diagrams to make the text fancier +- details about the config files, structure of repos etc. +- booting from PxE, running hashtopolis as a service ? +- Make the docker page +- Check if any difference for Agent overview in new interface +- Acces management +- Health Checks +- Log +- All users and admin settings +- Hashtypes +- Binaries section \ No newline at end of file diff --git a/doc/user_manual/agents.md b/doc/user_manual/agents.md index e0fc6b39c..4bf4db738 100644 --- a/doc/user_manual/agents.md +++ b/doc/user_manual/agents.md @@ -1,15 +1,73 @@ -# Agents Overview +# Agents -Assuming you have your agents registered, you will see them in this list along with lots of useful information: +An **agent** is an instance of the Hashtopolis client that performs password cracking using Hashcat. Agents are responsible for requesting work from the server, processing it on assigned devices (CPU or GPU), and reporting results back. -Act This little check box enabled/disables the agent. Should a Hashcat error occur, the agent will be deactivated automatically unless 'Ignore errors' is enabled for it. -Machine Name This is the actual machine name. -Owner User name of the agent owner. -OS A little icon identifying Windows from Linux. -Devices A shortened list of detected GPU cards. Hover mouse for full text. -Last activity Tells you what, when and from what IP has the agent done last. -Important thing is that agent ID and Name are click-able, which will get you to agent detail page. On this page, you can see all of the information from before plus some more. +Agents are not necessarily tied to a full system — multiple agents can run on the same physical machine, each targeting a specific device. For example, a server with multiple GPUs can host several agents, each bound to a different GPU, allowing fine-grained control and parallel task execution. -Extra Parameters Agent Specific command line options (--force, --workload-profile or --gpu-temp-disable) -Trust only trusted agents will be allowed to crack tasks with secret hashlist or files -Error ignoring the agent will not be deactivated if an error occurs. \ No newline at end of file +For installing new agents, please refer to the [dedicated section](/installation_guidelines/basic_install/#agent-installation) within the installation manual. + + +## Show Agents + +All the registered agents are displayed on this page in a table containing the following fields. + +- **Active**: Checkbox to enable or disable the agent manually. Agents are automatically disabled if they encounter repeated Hashcat errors, unless configured to ignore such errors. +- **ID**: Unique identifier assigned to each agent by the system. +- **Status**: Current operational status of the agent (e.g., idle, running, offline, error). +- **Name**: The name given to the agent, by default the hostname at the registration time. +- **Owner**: The user responsible for this agent, blank by default. +- **Client**: Version of the Hashtopolis client software the agent is running. +- **GPUs/CPUs**: Number and type of devices (GPUs and/or CPUs) available on this agent for cracking. +- **Last Activity**: Timestamp of the most recent communication including the IP of the agent. +- **Access Group**: The group(s) this agent belongs to, controlling access to tasks and hashlists. +- **Task**: ID of the current task assigned to the agent, if any. +- **Chunk**: ID of the specific portion of the task the agent is currently processing. +- **Speed**: The current hash cracking speed reported by the agent (hashes per second). +- **Cracked**: Number of passwords cracked by this agent so far. + +--- + +## Agent Status + +This page provides a visual overview of the status of all agents, including real-time performance and health metrics: + +- Visual graphs showing **device utilization** for both CPU and GPU agents. +- Temperature readings for each device, helping detect overheating or hardware issues. + +In those visuals, the following colour code is used: +- **Green**: All good +- **Orange**: Warning +- **Red**: Value too low +- **Light blue**: Agent is connected but does not communicate metrics (e.g. no task assigned or downloading data) +- **Grey**: Agent inactive or no communication received + +--- + +## Agent Overview +***(To be checked with the new interface)*** + +Clicking on an individual agent from the lists above brings you to the **Agent Overview** page, where comprehensive information and management options for that agent are available: + +- **Agent ID**: Unique identifier assigned to each agent by the system. +- **Active**: Checkbox to enable or disable the agent manually. Agents are automatically disabled if they encounter repeated Hashcat errors, unless configured to ignore such errors. +- **Last Activity**: Timestamp of the most recent communication including the IP of the agent. +- **Owner**: The user responsible for this agent, blank by default. +- **Machine Name**: The name given to the agent, by default the hostname at the registration time. +- **Operating System**: Icon indicating the OS (e.g., Windows, Linux) on which the agent is running. +- **Access Token**: Unique token used by the agent for authentication with the server. +- **Machine ID**: Unique hardware or system identifier for the agent's machine. +- **CPU Only Agent**: Indicates whether the agent uses only CPU resources or includes GPUs as well. +- **Graphic Cards**: Detailed list of GPUs detected and used by the agent. +- **Member of Access Groups**: Lists all access groups the agent belongs to. +- **Extra Parameters**: Parameters passed to the agent and automatically added to the command line of any task, for example to pass the flag *'-w3'*. +- **Cracker Errors**: Folding menu to decide how the agent should behave when an error is encountered. +- **Trust**: Trust level or rating of the agent, possibly based on performance or error history. +- **Assignment**: Current task and chunk assigned to this agent. +- **Time Spent Cracking**: Total time the agent has spent actively cracking hashes. + +Similar to the ***Agent Status*** page, visuals of the recent temperature evolution and utilisation evolution of all devices associated to this agent are displayed here. +- **Device(s) Temperatures**: Current temperatures of GPUs and/or CPUs. +- **Device(s) Utilisation**: Current utilization percentages for each device. +- **Agent Average CPU Utilisation**: Average CPU usage over a recent period. +- **Error Messages**: Any error messages generated by the agent or Hashcat. +- **Dispatched Chunks**: Display information about the last 50 chunk assigned to this agents. \ No newline at end of file diff --git a/doc/user_manual/basic_workflow.md b/doc/user_manual/basic_workflow.md index d1bb26587..72223a68e 100644 --- a/doc/user_manual/basic_workflow.md +++ b/doc/user_manual/basic_workflow.md @@ -1,34 +1,110 @@ -# Basic Workflow +# Basic Workflow for Your First Cracking Task -In this manual and in Hashtopolis itself, we use several terms. So let's make them clear: +Before diving into Hashtopolis, it’s important to understand some key terms used throughout this manual and in the application itself: -Agent: A computer running a Hashtopolis client and Hashcat doing the cracking itself. -Hashlist: A list of hashes saved in the database. Hashlist can be TEXT, HCCAPX or BINARY with most hashlists being the first category. -Task: A specific attack. Every task has a command line defining how Hashcat will be executed. Files can be assigned to a task (wordlists, rules, ...). -Supertask: A grouped number of subtasks. This task itself is not really a task, it just puts all the subtasks together so they can be viewed as one "whole" task. -Subtask: Is inside a supertask. It has the same properties like a normal task, except that it's priority is only relevant inside the supertask. -Keyspace: Every task has a predefined key space which says how big set of keys will be searched. Important note: They keyspace shown on the UI is NOT indicative of the ACTUAL keyspace for a particular attack. To find out more about how the keyspace value is derived please see the hashcat wiki. -Chunk: A chunk is a part of a keyspace assigned to a specific agent. If a chunk times out, it (or its part) will be reassigned to next free agent. -Access Management: This manages the access to functions and actions. It is used to apply a fine-grain access management. -Groups: Used to separate hashlists/tasks/agents from each other if needed. It can be used to have separate independent user groups not interfering with each other. +- **Agent**: An instance of the Hashtopolis client performing the actual password cracking using its associated hardware resources (e.g. GPUs and/or CPUs). +- **Hashlist**: A list of hashes stored in the database. Hashlists can be TEXT, HCCAPX, or BINARY, with most being TEXT format. +- **Task**: A specific password cracking job, defined by a command line specifying all the parameters, files to use, hashlist to target and binary to use. +- **Supertask**: A container grouping multiple subtasks together for easier management and monitoring. It is not a standalone cracking task. +- **Subtask**: A smaller task within a supertask, which behaves like a normal task but whose priority matters only inside the supertask. +- **Keyspace**: Size of the process that needs to be executed. This value is used to divide the total amount of work to then distribute it to the agents. +> [!NOTE] +> The keyspace returned by hashcat is typically not the same size as the actual search space as one may expect. For more details, see the [Hashcat Wiki on keyspace](https://hashcat.net/wiki/doku.php?id=frequently_asked_questions#what_is_a_keyspace). +- **Chunk**: A portion of the keyspace assigned to an agent for cracking. If an agent fails or a chunk times out, it will be reassigned. +- **Access Management**: Controls user permissions and access to various features and functions for fine-grained security. +- **Groups**: Logical separations that allow different sets of users, hashlists, tasks, and agents to operate independently without interference. +--- -This page describes the basic workflow required to launch your first cracking task. -It provides a high-level overview of the key steps needed to get started: +## Overview of the Basic Workflow -- Uploading hash lists; -- Uploading files; -- Creating a task; -- Monitoring the task and the results. -Each of these steps is covered in more detail in the advanced section **link**, but for now, this guide will walk you through the essentials to get your first task up and running. +This section guides you through the essential steps to launch your first cracking task: +> [!NOTE] +> This guide assumes you have a working Hashtopolis installation with at least one registered and active agent. For installation instructions, please see the [Installation Guide](/installation_guidelines/basic_install/). + + +1. **Upload Hashlists** + Import the hashes you want to crack into Hashtopolis. Supported formats include plain text and specialized hash capture files. + +2. **Upload Required Files** + Upload any additional files your attack requires, such as wordlists or rule files. + +3. **Create a Task** + Define your cracking task by setting the attack command line and assigning the hashlist and other files. + +4. **Monitor the Task** + Track progress through the UI, view agent statuses, and check for any cracked passwords. + +We provide below more details on each of these steps. A more comprehensive explanation can be found in the User Manual section. + +### 1. Upload Hashlists + +Start by importing the hashes you want to crack: + +- Go to the **"Hashlists"** page in the sidebar. +- Click on the button **"+ New Hashlist"**. +- Choose a name for your hashlist +- Select the appropriate **hash type** (e.g., MD5, SHA1, NTLM). +- Paste your hashes into the text field or upload a file. +- Optionally assign the hashlist to a **group** to manage access permissions. +- Click **"Submit"** to create the hashlist. + +> [!NOTE] +> Hash formats like plain text, HCCAPX (for WPA/WPA2), or binary dumps are supported. Make sure your input matches the expected format for the selected hash type. + +--- + +### 2. Upload Required Files + +To perform most attacks, you’ll need additional resources like wordlists or rule files: + +- Go to the corresponding type of files in the **"Files"** section, for example **"Wordlists"**. +- Click **"+ New Wordlists"** and select the file to upload (or provide the link to the file). +- Optionally assign it to a **group**. +- Click **"Create"** to store the file on the server. + +Uploaded files can later be linked to tasks. + +--- + +### 3. Create a Task + +Now you’re ready to define your first cracking job: + +- Navigate to **"Tasks"** and click the button **"+ New Task"**. +- Provide a task name and select the hashlist created in step 1. +- Enter the **Attack command** for your deisered process. Note that the placeholder **#HL#** is placed by default in the command. It represents the hashlist you have selected and you therefore don't need to type it manually. The binary to use also does not need to be typed as it is added automatically by the tool. If you want to use files, they must have been uploaded to the server first. They appear in the right folding menu. By clicking on the box next to the file, they are automatically added to the command line, including the '-r' flag for rules files. > [!NOTE] -> It is assumed that you have already access to a fully functional hashtopolis installation with at least one agent up and running. If it is not the case, please refer to the installation section **link**. +> A simple mask attack of 4 digits would therefore be the following command line: +> ```#HL# -a3 ?d?d?d?d``` +- Choose a **priority** superior to 0 if you want the task to start. +- Click on the button **"Create"**. + +The task will automatically be assigned to available agents if it has the highest priority value. + +--- + +### 4. Monitor the Task + +Once the task is active, you can track its status and results: + +- Go to the **"Tasks"** page to see overall task progress, speed, and number of passwords retrieved. +- Click on the task to view detailed progress and many other information. +- Cracked passwords will appear in the task view. + +> [!TIP] +> You can pause, resume, or delete tasks at any time. Make sure agents remain online and responsive to ensure smooth cracking progress. + + +--- +## Do’s and Don’ts +- **Do** test your command line locally with Hashcat if your task is failing for unknown reason. +- **Don’t** use multiple wordlists with attack mode 0, Hashtopolis currently supports only a single wordlist per task. +- **Don’t** use the `--increment` flag in your command line, as it is not supported. +- **Be cautious** with the `--slow-candidates` option, it may cause performance issues or unexpected behavior. +- **Don’t** create extremely large tasks as **small task**, as it is against the principle of parallelisation of hashtopolis. +- **Do** monitor your agents’ performance to adjust chunk sizes or task priorities as needed. -Do and Don't -- multiple wordlists do not work -- increment do not work -- --slow-candidates may not be a good idea -- others? \ No newline at end of file diff --git a/doc/user_manual/crackers_binary.md b/doc/user_manual/crackers_binary.md index 2ddca391e..1a2577d44 100644 --- a/doc/user_manual/crackers_binary.md +++ b/doc/user_manual/crackers_binary.md @@ -1,4 +1,6 @@ -# Crackers Binary +# Binaries + +## Crackers Hashtopolis employs distribution mechanism to ensure that every agent will have the correct cracker binary for the associated task. You can define cracker types (e.g. Hashcat) and for every type you can add as many version as you like. Make sure to keep the download URLs of the binaries up-to-date in case they change over time. The URL has to be absolute. @@ -8,4 +10,10 @@ Version 0.5.0 now supports multiple cracker binaries which can be used in parall You are also able to store multiple versions of a binary. This means you can specify the exact version of a binary allowing you to run the version that gives the best performance for the hash type you are running. -You must make sure, that the cracker binary version you want to use is compatible with the Hashtopolis agent binary (e.g. the agent binary is version aware by using specific flags/settings). Please consult the Hashtopolis agent repository README for more information on versioning. \ No newline at end of file +You must make sure, that the cracker binary version you want to use is compatible with the Hashtopolis agent binary (e.g. the agent binary is version aware by using specific flags/settings). Please consult the Hashtopolis agent repository README for more information on versioning. + +## Preprocessors + + + +## Agent Binaries diff --git a/doc/user_manual/files.md b/doc/user_manual/files.md index 685a7c665..64cc9ac8e 100644 --- a/doc/user_manual/files.md +++ b/doc/user_manual/files.md @@ -14,7 +14,7 @@ When creating a password recovery task in Hashtopolis, you may need to upload ad Wordlists, also known as dictionaries, are used in dictionary attacks. Each line in a wordlist is treated as a potential password candidate. Examples include: collections of commonly used passwords, specialized dictionaries tailored to a specific target or context. 3. **Others:** - This category includes any additional files required for specific attack types or configurations. Examples include … These files vary depending on the nature of the task and the tools being used. + This category includes any additional files required for specific attack types or configurations. Examples include charset files or any files needed by preprocessors. These files vary depending on the nature of the task and the tools being used. Files can be uploaded to the Hashtopolis server from the Files page. To begin, select the appropriate file category by clicking on one of the tabs: Rules, Wordlists, or Other. The following figure illustrates the selection of the Rules category.
    @@ -79,3 +79,6 @@ Navigating to the Files page of the Hashtopolis User Interface, you can manage t Line count: Reprocess the file and update the line count with the number of lines contained in the file. 3. **Edit**: Edit the parameters of the file (name, file type and associated group). 4. **Delete**: Removes the file from Hashtopolis. + +> [!NOTE] +> Files can only be deleted if they are not referenced in any task, whether they are active, finished or even archived. diff --git a/doc/user_manual/hashlist.md b/doc/user_manual/hashlist.md index 2a86ed952..5c5230aca 100644 --- a/doc/user_manual/hashlist.md +++ b/doc/user_manual/hashlist.md @@ -3,8 +3,8 @@ Hashtopolis utilizes hashlists to store password hashes you want to crack. These This section details the creation of a hashlist within the Hashtopolis interface. Note that at least one hashlist is required for creating tasks. Refer to the Hashcat documentation for detailed information on supported hash types and their expected formats. You can also use the example hashes provided there as a test to create your first hashlist. -# Create a hashlist -In the Hashtopolis web interface, navigate to *Lists > New Hashlist*. You will get the following window: +## Create a hashlist +In the Hashtopolis web interface, navigate to *Hashlists* and click on the button *+ New Hashlist*. You will get the following window:
    ![screenshot_hashlist](https://upload.wikimedia.org/wikipedia/commons/8/80/Comingsoon.png?20120228065200){ width="300" } @@ -18,7 +18,7 @@ Here is how to fill in the different fields: - Text File: Paste or upload a plain text file containing one hash per line. - HCCAPX/PMKID: Upload a HCCAPX file containing password hashes. - Binary File: Upload a binary file containing password hashes. -4. **Salted Hashes**: Tick the box related to salted hashes if appropriate and provide the correct separator for your hashlist. The flag is enabled/disabled according to the settings defined in the Hashtype section (**see hashtypes REF**). If the provided salt(s) is in hex, the following flag needs to be enabled otherwise the salt will be interpreted as an ascii value (**is it ASCII or UTF8???**). +4. **Salted Hashes**: Tick the box related to salted hashes if appropriate and provide the correct separator for your hashlist. The flag is enabled/disabled according to the settings defined in the [Hashtype section](/user_manual/settings_and_configuration/#hashtypes). If the provided salt(s) is in hex, the following flag needs to be enabled otherwise the salt will be interpreted as a UTF8 value. 5. **Hash source**: Select one of the following hash source types. 6. **Providing the hash**: The last field of the form will automatically adapt depending on the chosen source type. You’ll be asked to provide additional details: - **Paste**: Copy and paste the hashes directly into the "Input" field. @@ -28,38 +28,35 @@ Here is how to fill in the different fields: 7. **Access Group**: Modify the access group associated with the hashlist if needed. 8. **Create Hashlist**: Click "Create Hashlist" to finalize the process. This will open a new page displaying the details of your newly created hashlist. +## Hashlists View +Ordered by ID by default. It reports the hashlists created. A tick is accolated to the name of the hashlists if all the passwords have been recovered. It shows the number of recovered passwords as well as the total number of hashes. It allows to import *pre-cracked hashes* or export the recovered passwords (*see below for more details*). The hashlists can also be archived or deleted. -## Hashlists In-Depth - -### Hashlists View -Ordered by ID by default. It reports the hashlists created. A tick is accolated to the name of the hashlists if all the passwords have been retrieved. It shows the number of retrieved passwords as well as the total number of hashes. It allows to import *pre-cracked hashes* or export the retrieved passwords (*see below for more details*). The hashlists can also be archived or deleted. - -### Hashlists Details +## Hashlists Details If you click on a Hashlist, either in the hashlists view, in the Tasks overview or inside a task, it brings you to the corresponding Hashlist details page. Appart from the parameters specific to this hashlist (i.e. ID, Access Group, Hashlist name, ...), the page displays some information about the total number of hashes, the number of cracked ones and the number of remaining ones to be recovered. Clicking on one of these three values will open a new window displaying information about the Hashes of the Hashlist as detailed below. -#### Hashes of Hashlist X +### Hashes of Hashlist X This page list all the hashes from the related hashlist. Filters can be applied to show either the cracked, the uncracked or all the hashes. According to the display filter selected, the Hashes only, the plaintext only or both are displayed. Additionnally, the cracking position (**to be defined**) can be displayed next to the cracked ones. Only 1000 hashes can be displayed at a time within a page but the user can navigate through the pages. The number of hashes per page can be configured in *Config > UI* settings. A HEX converter is present at the bottom of the page to convert any HEX values. This can be useful when the reported password is stored in a HEX format. -#### Actions on the hashlist -Several actions are offered to the user which are detailed below. Note that some of the options are logically not available if no password have been retrieved for the specific hashlist. +### Actions on the hashlist +Several actions are offered to the user which are detailed below. Note that some of the options are logically not available if no password have been recovered for the specific hashlist. - **Download Report**: **will we still have this function** -- **Generate Wordlist**: This action generates a file listing all the retrieved passwords from this hashlist. The file is automatically stored in the *wordlist* section of the *Files* section. The generated file can be easily retrieved as it got assigned to the latest file ID. The filename is *Wordlist_[Hashlist_ID]_[dd.mm.yyyy]_[hh.mm.ss].txt*. +- **Generate Wordlist**: This action generates a file listing all the recovered passwords from this hashlist. The file is automatically stored in the *wordlist* section of the *Files* section. The generated file can be easily retrieved as it got assigned to the latest file ID. The filename is *Wordlist_[Hashlist_ID]_[dd.mm.yyyy]_[hh.mm.ss].txt*. -- **Export Hashes for pre-crack**: This action generates a file listing all the retrieved passwords from this hashlist associated with the corresponding hash value in the format *[hash]:[plaintext]*. The file is automatically stored in the *wordlist* section of the *Files* section. The generated file can be easily retrieved as it got assigned to the latest file ID. The filename is *Pre-cracked_[Hashlist_ID]_[dd-mm-yyyy]_[hh-mm-ss].txt*. +- **Export Hashes for pre-crack**: This action generates a file listing all the recovered passwords from this hashlist associated with the corresponding hash value in the format *[hash]:[plaintext]*. The file is automatically stored in the *wordlist* section of the *Files* section. The generated file can be easily retrieved as it got assigned to the latest file ID. The filename is *Pre-cracked_[Hashlist_ID]_[dd-mm-yyyy]_[hh-mm-ss].txt*. -- **Export Left Hashes**: This action generates a file listing all the hashes for which no password have been retrieved at the moment of the file creation. The file is automatically stored in the *wordlist* section of the *Files* section. The generated file can be easily retrieved as it got assigned to the latest file ID. The filename is *Leftlist_[Hashlist_ID]_[dd-mm-yyyy]_[hh-mm-ss].txt*. +- **Export Left Hashes**: This action generates a file listing all the hashes for which no password have been recovered at the moment of the file creation. The file is automatically stored in the *wordlist* section of the *Files* section. The generated file can be easily retrieved as it got assigned to the latest file ID. The filename is *Leftlist_[Hashlist_ID]_[dd-mm-yyyy]_[hh-mm-ss].txt*. -- **Import pre-cracked Hashes**: This action opens a new page in which the user can upload pre-cracked hashes for the related hashlist. A pre-crack is supposed to be a hash contained in the hashlist associated with a plaintext in the format *[hash](:[salt]):[plaintext]*. Such data can be imported in different ways: *"Paste, Upload, Import, URL downlaod"* such as the option to import the hashes during a hashlist creation (**see XXX**). In case of salted password, the field separator must be indicated, ':' being the default one. When validating by pressing the *Pre-crack hashes* button, the back-end will check if the imported data contains hash values from the targeted hashlist and integrate the plaintext value accordingly. If the option *Overwrite already cracked hashes* is selected, existing retrieved passworda will be overwritten by the new imported ones in case of conflict. The front-end is then reporting to the user how many hashes have been considered as well as how many entries have been updated. +- **Import pre-cracked Hashes**: This action opens a new page in which the user can upload pre-cracked hashes for the related hashlist. A pre-crack is supposed to be a hash contained in the hashlist associated with a plaintext in the format *[hash](:[salt]):[plaintext]*. Such data can be imported in different ways: *"Paste, Upload, Import, URL downlaod"* such as the option to import the hashes during a hashlist creation. In case of salted password, the field separator must be indicated, ':' being the default one. When validating by pressing the *Pre-crack hashes* button, the back-end will check if the imported data contains hash values from the targeted hashlist and integrate the plaintext value accordingly. If the option *Overwrite already cracked hashes* is selected, existing recovered passwords will be overwritten by the new imported ones in case of conflict. The front-end is then reporting to the user how many hashes have been considered as well as how many entries have been updated. Pre-cracked management is useful to share results between different instances of hashtopolis. This is especially relevant for salted hashlits as each new recovered plaintext is improving the efficiency of the attack is there is no more hashes associated with the same salt value. -#### Tasks overview and creation +### Tasks overview and creation At the bottom of the page there are three subsections related to task for this hashlist. - **Tasks cracking this hashlists**: This section lists all the tasks that are related to this hashlist. Note that supertasks will not appear here (**is this something we would like in the future... let see how it will be handled within project**). The details displayed are defined in the *Show Tasks* section as they are the same. Note that not all the infos present in the *Show Tasks* page are displayed here. @@ -70,14 +67,14 @@ At the bottom of the page there are three subsections related to task for this h -### Super Hashlists +## Super Hashlists > [!NOTE] > Should we include pictures in this section that is quite obvious A Super Hashlist is a virtual hashlist that combines multiple classic hashlists without duplicating data at the database level. It allows you to run a single cracking task on multiple hashlists at once. Since the hashes are only linked, not merged, storage is optimized, and updates to individual hashlists are immediately reflected. This is especially useful when working with related datasets that require the same attack strategies, saving time and resources while keeping everything well-organized. -#### New SuperHashlist +### New SuperHashlist The page displays all the existing hashlists in the database. To create a new superhashlist, you need to do the following: - select all the hashlists you want to integrate in the superhashlist; @@ -86,7 +83,7 @@ The page displays all the existing hashlists in the database. To create a new su You can select all the hashlists at once by clicking on the button *select all*. However, keep in mind that a superhashlist should only contains hash of the same type to work. **We should probably introduce a check at the creation of the super list, and also allow to search or filters to only display those of a specific type to select all in a controlled manner** -#### Overview +### Overview Once you have created a superhashlist or if you open the *SuperHashlist* menu, the overview page of SuperHaslist is open. Such page diplays all the information about the superhashlists created so far. It is very similar to the hashlist overview page, the only difference being that you cannot archive a superhashlist. @@ -96,7 +93,7 @@ If you click on a superhashlist, the superhashlist detail page will be open. Aga - Cracked percentage of each hashlist -### Search Hash +## Search Hash This page displays a free text zone in which the user can type multiple hashes, one per line, to check if they are present in the database or not. The hashes do not need to be of the same type. Furthermore, the hash does not need to be complete. @@ -108,16 +105,16 @@ The result will display all the hashes that correspond to the given entry/ies. I ![screenshot_import_file](https://upload.wikimedia.org/wikipedia/commons/8/80/Comingsoon.png?20120228065200){ width="300" }
    -### Show Crack +## Show Crack -This page displays all the cracked passwords that have been retrieved and that are stored in the database. It shows the following fields. -- **Time Found**: Indicates when the password has been retrieved -- **Plaintext**: Password that has been retrieved -- **Hash**: Hash for which the password was retrieved +This page displays all the cracked passwords that have been recovered and that are stored in the database. It shows the following fields. +- **Time Found**: Indicates when the password has been recovered +- **Plaintext**: Password that has been recovered +- **Hash**: Hash for which the password was recovered - **Hashlist**: ID of the hashlist that contains this hash -- **Agent**: ID of the agent that has retrieved the password -- **Task**: ID of the task that has retrieved the password -- **Chunk**: ID of the chunk that has retrieved the password +- **Agent**: ID of the agent that has recovered the password +- **Task**: ID of the task that has recovered the password +- **Chunk**: ID of the chunk that has recovered the password - **Type**: Hashmode related to the hash - **Salt**: Salt associated to the hash if relevant. diff --git a/doc/user_manual/hashtype.md b/doc/user_manual/hashtype.md deleted file mode 100644 index 7ccd740e8..000000000 --- a/doc/user_manual/hashtype.md +++ /dev/null @@ -1,13 +0,0 @@ -# Hashtypes - -Hashcat gets constantly developed and often new hashtypes get added. To be flexible Hashtopolis provides the possibility for the server admin to add new Hashcat algorithms. Even if you use a customized Hashcat with some special algorithm. To add a new type you just need to add the -m number of Hashcat and the name of it. - -Salted says if a hash of this algorithm has a separate hash value (e.g. vBulletin), but this does not include algorithms which have the salt included in the full hash (e.g. bcrypt). This is a feature to help that when this algorithm is selected on hashlist import, the salted checkbox gets ticked automatically. - -## Slow Algorithms - -To extract all Hashcat modes which are flagged as slow hashes, following command can be run inside the hashcat directory: - -``` -grep -Hr SLOW_HASH src/modules/ | cut -d: -f1 | sort | cut -d'.' -f1 | sed 's/src\/modules\/module_[0]\?//g' -``` diff --git a/doc/user_manual/settings_and_configuration.md b/doc/user_manual/settings_and_configuration.md index d4ec28bed..30ed2fb3d 100644 --- a/doc/user_manual/settings_and_configuration.md +++ b/doc/user_manual/settings_and_configuration.md @@ -1,32 +1,146 @@ - # Settings and Configuration > [!NOTE] -> This page presents the settings following the structure of the updated front-end. All the settings from the old front-end are described but potentially structure in a different order. +> This page presents the settings following the structure of the updated front-end. All the settings from the old front-end are described but potentially structured in a different order. ## Agent Settings ### Activity / Registration +- **Inactivity Timeout Delay**: Duration (in seconds) after which an agent is considered inactive if no communication is received. + +- **Inactivity Timeout for Issued Chunks**: Time allowed for an agent to process and report back on an assigned chunk before it is considered failed or timed out. + +- **Task Reporting Frequency**: Interval (in seconds) at which agents report their task progress and status back to the server. + +- **Retention Period for Utilization and Temperature Data**: Duration for which the agent’s utilization and GPU temperature statistics are stored before being purged. + +- **Agent IP Information Privacy**: Controls whether the IP addresses of agents are stored or displayed for privacy reasons. + +- **Register Multiple Agents Using Voucher(s)**: Allows bulk registration of multiple agents using one or more voucher codes for automated onboarding. ### Graphical Feedback +- **Maximum Data Points for Agent (GPU) Graphs**: Maximum number of data points shown on utilization and temperature graphs per agent GPU. + +- **Straight Lines or Bezier Curves for Agent Data Graphs**: Choose the graph style to render agent metrics: straight line segments or smooth bezier curves. + +- **Orange Status Threshold for Agent Temperature**: Temperature (in °C) at which the agent GPU temperature graph changes to orange as a warning. + +- **Red Status Threshold for Agent Temperature**: Temperature (in °C) at which the agent GPU temperature graph changes to red indicating critical heat. + +- **Orange Status Threshold for Agent Utilization**: Utilization percentage at which the graph turns orange signaling moderate load. + +- **Red Status Threshold for Agent Utilization**: Utilization percentage triggering red status indicating high or potentially problematic load. ## Task/Chunks Settings ### Benchmark / Chunk +- **Expected Chunk Duration**: Target duration (in seconds or minutes) for processing a single chunk to balance task granularity. + +- **Authorized Expansion Percentage for Final Chunk in a Task**: Permissible oversize percentage for the last chunk of a task to avoid creating a very small chunk. + +- **Default Speed Benchmark Process**: Indicates if agents should automatically run a speed benchmark to calibrate their chunk processing speed. + +- **Disable Chunk Trimming and Revert to Full Chunk Processing**: Option to disable trimming of chunks based on benchmarks, causing agents to always process full-sized chunks. + ### Command Line & Misc -### Rule Splitting +- **Hashlist Placeholder in Command Line**: Placeholder string in task command lines that gets replaced by the actual hashlist file path during execution. + +- **Forbidden Characters in Attack Command Input**: List of characters not allowed in the attack command line to prevent injection or command errors. + +- **Automatic Assignment of Tasks with Priority 0 (Needed, Check File)**: Controls whether tasks with priority 0 are automatically assigned to agents or require manual action. + +- **Display Cracks per Minute for Active Tasks**: Enables showing real-time statistics of password cracks per minute for currently running tasks. + +### Rule Splitting (Obsolete soon) + +- **Rule Splitting for Tasks: Always Create Small Tasks**: Forces tasks to be split into smaller subtasks based on rule files, regardless of size. + +- **Rule Splitting with Benchmark Constraint: Allow Subtasks with a Single Rule**: Controls whether subtasks can be created with only one rule when splitting is constrained by benchmarking results. +- **Disable Automatic Task Splitting for Large Rule Files**: Turns off automatic splitting of tasks when rule files are large, reverting to processing the entire rule file at once. ## Hashes/Cracks/Hashlist Settings +### Import/Display of Hashlist + +- **Maximum Lines in Hashlist**: Limits the maximum number of hash entries allowed in a single hashlist upload or import. + +- **Hashes size Page in Hash View**: Number of hashes displayed per page in the hashlist viewing interface. + +- **Hashes per Page in Hash View**: Defines pagination size for the hash view listing. + +- **Separator Character for Hash and Plain (or Salt)**: Character used to separate hash values from plaintext or salts in import files. + +- **Check for Previous Cracks in Other Hashlists at Hashlist Creation**: Enables automatic checking if hashes were previously cracked in other hashlists when creating a new one. + +### Database Parameters + +- **SQL Query Batch Size for Hashlist Transmission to Agents**: Number of hash entries sent per batch to agents during hashlist transfer to optimize performance. + +- **Maximum Length of Plain Text**: Maximum allowed length for cracked plaintext strings stored in the database. + +- **Maximum length of a Hash**: Maximum allowed length of a hash string accepted during import or task creation. + ## Notification Settings +- **Notification Sender Email**: Email address used as the sender for outgoing notifications. + +- **Sender's Display Name**: The name displayed as the sender in notification emails. + +- **Telegram Bot Token for Notifications**: API token for a Telegram bot used to send notifications via Telegram messaging. + +- **Enable Notification Proxy**: Enables the use of a proxy server for sending notifications. + +### Proxy Settings + +- **Notification Server URL**: URL of the proxy server used to route notification traffic. + +- **Notification Proxy Port**: Port number on which the notification proxy server listens. + +- **Notification Proxy Type**: Type of proxy protocol (e.g., HTTP, SOCKS5) used for notifications. + ## General Settings +- **Enable Hashcat Brain**: Enables integration with Hashcat Brain for collaborative password cracking and workload distribution. + +- **Host for Hashcat Brain (Accessible by Agents)**: Hostname or IP address where the Hashcat Brain server is accessible to agents. + +- **Port for Hashcat Brain**: Network port used by the Hashcat Brain server. + +- **Password for Accessing Hashcat Brain Server**: Password required by agents to connect to the Hashcat Brain server. + +- **Ignore Error Messages Containing the Following String from Crackers**: Filter to suppress error log entries containing specified text strings from cracking tools. + +- **Number of Retained Log Entries**: Maximum number of log entries retained in the database or log files before pruning. + +- **Time Format Configuration**: Format string or setting defining how timestamps are displayed in the UI and logs. + +- **Maximum User Session Duration (in hours)**: Maximum duration before a user session expires and requires re-authentication. + +- **Base Hostname/Port/Protocol Override**: Allows overriding the automatically detected base URL, port, or protocol for the web interface. + +- **Admin Email Address for Webpage Footer Display**: Email address shown in the website footer as the contact for the administrator. + +- **Server Level Logging to File**: Enables detailed server-side logging output to log files for troubleshooting or audits. + +## Hashtypes + +Hashcat gets constantly developed and often new hashtypes get added. To be flexible Hashtopolis provides the possibility for the server admin to add new Hashcat algorithms. Even if you use a customized Hashcat with some special algorithm. To add a new type you just need to add the -m number of Hashcat and the name of it. + +Salted says if a hash of this algorithm has a separate hash value (e.g. vBulletin), but this does not include algorithms which have the salt included in the full hash (e.g. bcrypt). This is a feature to help that when this algorithm is selected on hashlist import, the salted checkbox gets ticked automatically. + +### Slow Algorithms + +To extract all Hashcat modes which are flagged as slow hashes, following command can be run inside the hashcat directory: + +``` +grep -Hr SLOW_HASH src/modules/ | cut -d: -f1 | sort | cut -d'.' -f1 | sed 's/src\/modules\/module_[0]\?//g' +``` + # Access Management diff --git a/doc/user_manual/tasks.md b/doc/user_manual/tasks.md index c9db9f146..db1c63be2 100644 --- a/doc/user_manual/tasks.md +++ b/doc/user_manual/tasks.md @@ -1,6 +1,12 @@ # Tasks -To create a new task, you have to navigate to *Tasks > New Task*. You will get the following window in which you can create a new task. Some of the fields are mandatory, some others are filled with default values. +Tasks are the core of Hashtopolis operations — they define how password cracking jobs are executed. Each task specifies an attack configuration, including the hashlist to use, files like wordlists or rules, and the command line for Hashcat. This page explains how to create, configure, and manage tasks. + +## Task Creation + +To create a new task, click on the button *'+ New Task* in the page *Tasks > Show Task*. You will get the following window in which you can create a new task. Some of the fields are mandatory, some others are filled with default values. + +### Basic Parameters 1. **Name**: provide a name for the task you want to create. This is how the task will be referenced with during the monitoring phase (see **link**) therefore it should be relatively explicit to facilitate its monitoring. @@ -9,7 +15,7 @@ To create a new task, you have to navigate to *Tasks > New Task*. You will get t 3. **Command Line**: provide in this field the attack command that will be executed by the agent on the targeted hashlist using the selected binary (see below). Note that *#HL#* is filled in by default in the command line. It is a placeholder for the hashlist and will be replaced automatically at execution time by the agent with the correct path to the hashlist file. Therefore you should not remove it nor include the filename for the hashlist. If for example you want to perform a mask attack of 6 digits, the command line would look like ```#HL# -a3 ?d?d?d?d?d?d```. In case you want to perform a dictionary attack with rules, you have to select the corresponding files in the right table. If it is a wordlist, select it within the right column corresponding to T/Task. The Preprocessor part is explained in the advanced section. If it is a rule file, select first the rule tab (see **ref to the picture**) and then select the desired rule file. Note that upon selection of a rule file, the name of the file is included in the command line and automatically include the required '-r' flag. -4. **Priority**: Assign a priority number to the task. The expected value has to be an integer. Agents will be assigned to tasks in decreasing order of priority. A task with a priority 0 will not be processed even if agents are available. Default value is 0. +4. **Priority**: Assign a priority number to the task. The expected value has to be an integer. Agents will be assigned to tasks in decreasing order of priority. A task with a priority 0 will not be processed even if agents are available - except if an agent is manually assigned to it and no other task with higher priority that the agent may join are existing. Default value is 0. 5. **Maximum number of agents**: Specify the maximum agents that can be assigned to the task. If this amount is reached, future available agents will be assigned to the next task available with a lower priority even if not all the chunks of the task have been distributed. The default value of 0 means that there is no maximum and therefore, all available agents are assigned to this tasks until all the chunks have been distributed. This functionality is helpful to only use a portion of the cluster for a specific task, and therefore allowing to split the workers on different tasks. @@ -17,39 +23,37 @@ In case you want to perform a dictionary attack with rules, you have to select t 7. **Color** - *optional*: Can assign a color in a Hex color code format #RRGGBB. Default value is white #FFFFFF. This can be useful in the monitoring part to visually recognise a task or a set of tasks. -8. **Chunk size**: This parameter defines the duration that each agent should take to process a chunk for this task (**chunk should be define at some point in the general context of hashtopolis**). The default value is defined in the Settings (**ref to settings page XXX**). +### Advanced Parameters + +Several options were not covered in the basic workflow related to the creation of a task. The remaining options are described below. + +8. **Chunk size**: This parameter defines the duration that each agent should take to process a chunkℹ️ for this task. The default value is defined in the [Settings](/user_manual/settings_and_configuration/#benchmark-chunk). -9. **Status timer**: Defines the frequency with which each agent report its progress for this task to the server. The default value is defined in the Settings (**ref to settings page XXX**). +9. **Status timer**: Defines the frequency with which each agent report its progress for this task to the server. The default value is defined in the [Settings](/user_manual/settings_and_configuration/#activity-registration). 10. **Benchmark Type**: Select which benchmarking type should be used for this task. In most of the cases, it is recommended to use the default *Speed Test*. Only in few cases, such as tasks with big salted lists, the *Runtime* may be used. -11. **Task is CPU only**: If this flag is enabled, only the agents that are declared as CPU only can be assigned to this task. More details can be found in **ref to advanced agents**. The flag is disabled by default. +11. **Task is CPU only**: If this flag is enabled, only the agents that are declared as CPU only can be assigned to this task. More details can be found in the [agent overview section](/user_manual/agents/#agent-overview). 12. **Task is small**: If this flag is enabled, a single agent can be assigned to this task. This is relevant for small tasks or to assign the full keyspace in a single chunk to an agent. Note that this is **NOT** equivalent to define the *Maximum number of agents* to 1. Indeed, in this latter case, the task will still be divided in chunks according to the *chunk size* parameter. The flag is disabled by default. 13. **Binary type to run the task**: This pair of parameters specify the binary type as well as the version of the binary to use for this specific task. It will by default use the latest uploaded version of the first binary type defined in the *Binaries* section (**see binaries for more details**). +14. **Set as preprocessor task**: Such option allows the usage of a preprocessor. By default hashtopolis is installed with a single preprocessor, namely [*Prince*](https://github.com/hashcat/princeprocessor). Additional preprocessors can be defined in the [*preprocessors*](/user_manual/crackers_binary/#preprocessors) page. The command that should be used for this preprocessor must be defined in the free text zone below. A task define with a preprocessor will result in the execution of the preprocessor redirecting the output as stdin for the command line defined above in the same task. This allows the usage of "external" candidate generator such as Prince. +15. **Skip a given keyspace at the beginning of the task**: Any value X inserted here will result in ignoring the first X values of the keyspace as it would be done with the flag "-s X" inserted in the command line. The rest of the keyspace will be processed normally. This can be useful to ignore a portion of the keyspace that has been already explored during a different process, for example on a local machine. -## Tasks in Depth - -### Advanced option during task creation -Several options were not covered in the basic workflow related to the creation of a task. The remaining options are described below. - -- **Set as preprocessor task**: Such option allows the usage of a preprocessor. By default hashtopolis is installed with a single preprocessor, namely [*Prince*](https://github.com/hashcat/princeprocessor). Additional preprocessor can be defined in the *Config* page (see [XXX]() for more details). The command that should be used for this preprocessor must be defined in the free text zone below. A task define with a preprocessor will result in the execution of the preprocessor redirecting the output as stdin for the command line defined above in the same task. This allows the usage of "external" candidate generator such as Prince. - -- **Skip a given keyspace at the beginning of the task**: Any value X inserted here will result in ignoring the first X values of the keyspace as it would be done with the flag "-s X" inserted in the command line. The rest of the keyspace will be processed normally. This can be useful to ignore a portion of the keyspace that has been already explored during a different process, for example on a local machine. - -- **Use Static Chunking**: If this option is enabled, the regular division in chunk (based on the chunktime and the benchmark of the agent) will be ignored. An alternative division is used depending of the choice made. +16. **Use Static Chunking**: If this option is enabled, the regular division in chunk (based on the chunktime and the benchmark of the agent) will be ignored. An alternative division is used depending of the choice made. - *Fixed chunk size*: Each chunk will have a portion of the keyspace where the length is the value assigned (an integer) in the associated field. The last chunk of the task may be smaller than the defined length for completion. - *Fixed number of chunks*: The keyspace will be divided in as many chunks as the number specified in the associated field. - Enforce Piping (to apply rules before reject): **will be removed soon** and is therefore not explained here. -### Preconfigured tasks (including from existing task) +## Preconfigured tasks + A preconfigured tasks is a basic template for a task that is not assigned yet to a hashlist. This is particularly useful to predefine task(s) that are often use such as generic mask attack or commonly used dictionnary attack. A preconfigured task can later be assigned to a hashlist avoiding the user to redefine the same task every time. This section gives more details about this topic. -When the user goes to the menu *New Preconfigured TasksThe properties of a pre-configured tasks are a subset of those of a regular task and are therefore not re-defined here. THe reader can refer to the dedicated section for reference (**put a ref here**). +When the user creates a *New Preconfigured Tasks*, the fields to create one are a subset of those of a regular task and are therefore not re-defined here. The reader can refer to the above section for reference. Once the pre-configured task is created, the user is brought to the *Preconfigured tasks* page that lists all the existing preconfigured tasks. Here the user can set the default priority as well as the maximum number of agents for this preconfigured tasks (**NOTE I believe these two options should already appear in the template of a preconfigured task**). Those values will be used as defaults upon creation of a task from this template. @@ -63,7 +67,7 @@ In addition to the possibility to delete a preconfigured task, two additional ac In the *Show Tasks* page, there is an action offered for each task, namely **Copy to Pretask**. This option will create a template from the corresponding task by extracting all the required information. The default name extracted will be the current one from the task. The user can modify at will those values and finally create the preconfigured task from it. This is useful in case you have defined an attack that you want to store for future reuse. -### Super Task +## Super Task A SuperTask is a group of pre-configured tasks. A supertask can be directly applied to a hashlist resulting in the creation of all the underlying pre-configured tasks applied to this hashlist. @@ -72,11 +76,11 @@ A SuperTask is a group of pre-configured tasks. A supertask can be directly appl This is particularly useful when applying the same attack strategy to different hashlists. -#### New SuperTask +### New SuperTask Similarly to the superhashlists, this page will display all the existing pre-configured tasks. The user needs to select all the pre-configured tasks that should be included in the supertask, give it a name, and press the *create supertask* button. -#### Overview +### Overview Once a new supertask is created, or if you open the *SuperTask* menu, the overview page of SuperTask is open. It displays the ID of all the superhashlists and their names. Three options are proposed. - **Apply to Hashlist**: This option open a new page in which you can select the hashlist to which you want to apply the set of pre-configured tasks as well as the binary to use. @@ -87,7 +91,7 @@ Once a new supertask is created, or if you open the *SuperTask* menu, the overvi - **SubTask Max Agents**: similarly to tasks, specifies the maximum agents that can be assigned to the task. - **Remove**: remove the pre-configured task from the supertask. Note that the pre-configured task is only remove from the supertask but not deleted from the system except if the related pre-configured task was generated via the *Import Super Task* functionality (see below for more details). -#### SuperTask in the *ShowTasks* Menu +### SuperTask in the *ShowTasks* Menu Supertask are not displayed as regular tasks in the *Show Task* menu as displayed in the picture below. @@ -102,18 +106,18 @@ The same information than those of a task are displayed. The *copy to Pretask* a ![screenshot_import_file](https://upload.wikimedia.org/wikipedia/commons/8/80/Comingsoon.png?20120228065200){ width="300" }
    -### Import Super Task +## Import Super Task The Import Super Task menu offers functionalities to create SuperTasks and the related pre-configured task in an easy manner. There exist two different ways to create those supertasks, *Masks* and *Wordlist/Rule bulk*. -#### Masks +### Masks This functionality allows the user to create a supertask from a mask file or a set of masks. It is a good alternative to replace the --increment option of hashcat that cannot be use in hashtopolis. - **Name**: Defines the name that will be given at the created SuperTask - **Are small tasks**: If this parameter is set to yes, a single agent can be assigned to the tasks that will be created when the resulting supertask is apply to a hashlist. This is relevant for small tasks or to assign the full keyspace in a single chunk to an agent. Note that this is **NOT** equivalent to define the *Maximum number of agents* to 1. Indeed, in this latter case, the task will still be divided in chunks according to the *chunk size* parameter. The parameter is set to No by default. - **Max Agents**: Specify the maximum agents that can be assigned to the tasks that will be created when the resulting supertask is apply to a hashlist. If this amount is reached, future available agents will be assigned to the next task available with a lower priority even if the all the chunks of the task have been distributed. The default value of 0 means that there is no maximum and therefore, all available agents are assigned to this tasks until all the chunks have been distributed. This functionality is helpful to only use a portion of the cluster for a specific task, and therefore allowing to split the workers on different tasks. -- **Are CPU tasks**: If this parameter is set to yes, only the agents that are declared as CPU only can be assigned to this task. More details can be found in **ref to advanced agents**. The parameter is set to No by default. +- **Are CPU tasks**: If this parameter is set to yes, only the agents that are declared as CPU only can be assigned to this task. More details can be found in the [agent section](/user_manual/agents/) of this manual. The parameter is set to No by default. - **Use Optimized flag (-O)**: If this parameter is set to Yes, the optimized flag -O will be added to the command line of all the sub-tasks of this supertask. The -O flag in Hashcat enables the use of optimized kernels for better performance. This improves cracking speed yet it has an impact on some aspects such as limiting the maximum length of the candidates to be tested, e.g. from 256 to 55 in the case of MD5 or from 256 to 27 for NTLM. - **Benchmark Type**: Select which benchmarking type should be used for the subtasks of the supertask. It is recommended to use the default *Speed Test* for mask attack. Only in few cases, such as tasks with big salted lists, the *Runtime* may be used. - **Cracker Binary which is used to run this task**: This parameter specifies the binary type to use for this specific task. @@ -124,7 +128,7 @@ A subtask will be created for each line of the the *Insert masks* text zone and > [!NOTE] > Note that the options above will be applied to all the pre-configured tasks that will be created during the generation of the supertaks from this import. -#### Wordlist/Rule bulk +### Wordlist/Rule bulk The wordlist/Rule bulk functionality allows to create a set of subtasks for an iteration of several files selected by the user. It allows for example to create an attack strategy of a succession of wordlists to be applied one after the other or to use different rule files with a single wordlist. diff --git a/mkdocs.yml b/mkdocs.yml index 946294480..ba31acd25 100644 --- a/mkdocs.yml +++ b/mkdocs.yml @@ -4,13 +4,13 @@ repo_url: https://github.com/hashtopolis/server docs_dir: doc nav: - index.md + - user_manual/basic_workflow.md - Installation Guidelines: - installation_guidelines/basic_install.md - installation_guidelines/advanced_install.md - installation_guidelines/tls.md - - installation_guidelines/docker.md + - installation_guidelines/docker.md - User Manual: - - user_manual/basic_workflow.md - user_manual/agents.md - user_manual/tasks.md - user_manual/hashlist.md From 9d5ac1d5645db47692320dadfb1d623487675b1f Mon Sep 17 00:00:00 2001 From: jessevz Date: Mon, 19 May 2025 11:23:13 +0200 Subject: [PATCH 072/691] Fixed bug by unsetting dangling pointer (#1314) Co-authored-by: jessevz --- src/inc/apiv2/common/AbstractBaseAPI.class.php | 1 + 1 file changed, 1 insertion(+) diff --git a/src/inc/apiv2/common/AbstractBaseAPI.class.php b/src/inc/apiv2/common/AbstractBaseAPI.class.php index 798477386..fd43edf98 100644 --- a/src/inc/apiv2/common/AbstractBaseAPI.class.php +++ b/src/inc/apiv2/common/AbstractBaseAPI.class.php @@ -965,6 +965,7 @@ protected function makeFilter(array $filters, object $apiClass): array } } } + unset($value); // We need to remap any aliased key to the key as it appears in the database. $remappedKey = $features[$cast_key]['dbname']; From 8fcc78ad3ae5ece9834a763b3b6f722058ef224d Mon Sep 17 00:00:00 2001 From: jessevz Date: Wed, 21 May 2025 19:01:30 +0200 Subject: [PATCH 073/691] Fixed bug in posting and deleting in relationships (#1330) Co-authored-by: jessevz --- src/api/v2/index.php | 1 + .../apiv2/common/AbstractModelAPI.class.php | 54 +++++++++++++------ src/inc/apiv2/model/files.routes.php | 16 +++--- 3 files changed, 47 insertions(+), 24 deletions(-) diff --git a/src/api/v2/index.php b/src/api/v2/index.php index b2cfb5db7..6b12c509a 100644 --- a/src/api/v2/index.php +++ b/src/api/v2/index.php @@ -237,6 +237,7 @@ public static function addCORSheaders(Request $request, $response) { $response = CorsHackMiddleware::addCORSheaders($request, $response); //Quirck to handle HTexceptions without status code, this can be removed when all HTexceptions have been migrated + error_log($exception->getMessage()); $code = $exception->getCode(); if ($code == 0) { $code = 500; diff --git a/src/inc/apiv2/common/AbstractModelAPI.class.php b/src/inc/apiv2/common/AbstractModelAPI.class.php index 829d9f8aa..69e9d9360 100644 --- a/src/inc/apiv2/common/AbstractModelAPI.class.php +++ b/src/inc/apiv2/common/AbstractModelAPI.class.php @@ -1279,6 +1279,7 @@ public function postToManyRelationshipLink(Request $request, Response $response, throw new HttpError('Invalid resource record given in list! invalid resource record: ' . $encoded_item); } $junction_table_entry = $factory->getNullObject(); + $junction_table_entry->setId(null); $setMethod1 = "set" . ucfirst($relation["junctionTableFilterField"]); $setMethod2 = "set" . ucfirst($relation["junctionTableJoinField"]); if (!method_exists($junction_table_entry, $setMethod1) || !method_exists($junction_table_entry, $setMethod2)) { @@ -1323,27 +1324,48 @@ public function deleteToManyRelationshipLink(Request $request, Response $respons } $relationType = $relation['relationType']; - $features = $this->getFeaturesOther($relationType); - $this->isAllowedToMutate($features, $relationKey); - if ($features[$relationKey]['null'] == False) { - // In this scenario another solution could be to delete object TODO? - throw new HttpForbidden("Key '$relationKey' cant be set to null"); + $junction_table = $relation['junctionTableType']; + if (!isset($junction_table)) { + $features = $this->getFeaturesOther($relationType); + $this->isAllowedToMutate($features, $relationKey); + if ($features[$relationKey]['null'] == False) { + // In this scenario another solution could be to delete object TODO? + throw new HttpForbidden("Key '$relationKey' cant be set to null"); + } } $data = $jsonBody['data']; - foreach ($data as $item) { - if (!$this->validateResourceRecord($item)) { - $encoded_item = json_encode($item); - throw new HttpError('Invalid resource record given in list! invalid resource record: ' . $encoded_item); - } - $updates[] = new MassUpdateSet($item["id"], null); + if (!is_array($data)) { + throw new HttpError("Data is not an array, data should be an array of resource records."); } - $factory = self::getModelFactory($relationType); - $factory->getDB()->beginTransaction(); //start transaction to be able roll back - $factory->massSingleUpdate($primaryKey, $relationKey, $updates); - if (!$factory->getDB()->commit()) { - throw new HttpError("Some resources failed updating"); + + $factory = (isset($junction_table)) ? self::getModelFactory($junction_table) : self::getModelFactory($relationType); + if (isset($junction_table)) { + $parent_id = $args["id"]; + $factory->getDB()->beginTransaction(); //start transaction to be able roll back + foreach($data as $item) { + $qF = new QueryFilter($relation["junctionTableFilterField"], $parent_id, "=", $factory); + $qF2 = new QueryFilter($relation["junctionTableJoinField"], $item['id'], "=", $factory); + $object = $factory->filter([Factory::FILTER => [$qF, $qF2]])[0]; + $factory->delete($object); + } + if (!$factory->getDB()->commit()) { + throw new HttpError("Some resources failed updating"); + } + } else { + foreach ($data as $item) { + if (!$this->validateResourceRecord($item)) { + $encoded_item = json_encode($item); + throw new HttpError('Invalid resource record given in list! invalid resource record: ' . $encoded_item); + } + $updates[] = new MassUpdateSet($item["id"], null); + } + $factory->getDB()->beginTransaction(); //start transaction to be able roll back + $factory->massSingleUpdate($primaryKey, $relationKey, $updates); + if (!$factory->getDB()->commit()) { + throw new HttpError("Some resources failed updating"); + } } return $response->withStatus(201) diff --git a/src/inc/apiv2/model/files.routes.php b/src/inc/apiv2/model/files.routes.php index 7d2268547..e93ae9aff 100644 --- a/src/inc/apiv2/model/files.routes.php +++ b/src/inc/apiv2/model/files.routes.php @@ -6,7 +6,7 @@ use DBA\OrderFilter; use DBA\File; -use Middlewares\Utils\HttpErrorException; +include_once __DIR__ . "../common/ErrorHandler.class.php"; require_once(dirname(__FILE__) . "/../common/AbstractModelAPI.class.php"); @@ -56,12 +56,12 @@ protected function createObject(array $data): int { /* Validate target filename */ $realname = str_replace(" ", "_", htmlentities(basename($data[File::FILENAME]), ENT_QUOTES, "UTF-8")); if ($data[File::FILENAME] != $realname) { - throw new HttpErrorException(File::FILENAME . " is invalid filename suggestion '$realname'"); + throw new HttpError(File::FILENAME . " is invalid filename suggestion '$realname'"); } /* Pre-checking to allow saving some time in repairing edge cases */ if (file_exists($this->getFilesPath() . $data[File::FILENAME])) { - throw new HttpErrorException("File '" . $data[File::FILENAME] . "' already exists in 'files' folder, cannot continue!"); + throw new HttpError("File '" . $data[File::FILENAME] . "' already exists in 'files' folder, cannot continue!"); } /* Prepare dummy request for insert */ @@ -74,30 +74,30 @@ protected function createObject(array $data): int { // TODO: Should be validated as parameter input instead $decoded = base64_decode($data["sourceData"], true); if ($decoded === false) { - throw new HttpErrorException("sourceData not valid base64 encoding"); + throw new HttpError("sourceData not valid base64 encoding"); } $dummyPost["data"] = $decoded; break; case "import": $realname = str_replace(" ", "_", htmlentities(basename($data["sourceData"]), ENT_QUOTES, "UTF-8")); if ($data["sourceData"] != $realname) { - throw new HttpErrorException("sourceData is invalid filename suggestion '$realname'"); + throw new HttpError("sourceData is invalid filename suggestion '$realname'"); } /* Renaming files will require target file to be checked before renaming */ if (!file_exists($this->getImportPath() . $data["sourceData"])) { - throw new HttpErrorException("File '" . $data["sourceData"] . "' not found in import folder"); + throw new HttpError("File '" . $data["sourceData"] . "' not found in import folder"); } /* We are renaming sourceData file to filename file, check if filename is not there already this can be skipped if they are the same */ if (file_exists($this->getImportPath() . $data[File::FILENAME]) && $data[File::FILENAME] != $data["sourceData"]) { - throw new HttpErrorException("File required temponary file '" . $data[File::FILENAME] . "' exists import folder, cannot continue"); + throw new HttpError("File required temponary file '" . $data[File::FILENAME] . "' exists import folder, cannot continue"); } /* Since we are renaming the file _before_ import the name is temponary changed */ $dummyPost["imfile"] = [$data[File::FILENAME]]; break; default: // TODO: Choice validation are model based checks - throw new HttpErrorException("sourceType value '" . $data["sourceType"] . "' is not supported (choices inline, import"); + throw new HttpError("sourceType value '" . $data["sourceType"] . "' is not supported (choices inline, import"); } /* TODO: Hackish view to revert back to required (hardcoded) view */ From 0e729fc271d5ea3b7b0c533670a8dbb57f53432b Mon Sep 17 00:00:00 2001 From: jessevz Date: Thu, 22 May 2025 15:12:10 +0200 Subject: [PATCH 074/691] Added helper endpoint to change own password (#1332) Co-authored-by: jessevz --- src/api/v2/index.php | 1 + .../apiv2/helper/changeOwnPassword.routes.php | 50 +++++++++++++++++++ .../apiv2/helper/setUserPassword.routes.php | 2 +- src/inc/utils/UserUtils.class.php | 7 +++ 4 files changed, 59 insertions(+), 1 deletion(-) create mode 100644 src/inc/apiv2/helper/changeOwnPassword.routes.php diff --git a/src/api/v2/index.php b/src/api/v2/index.php index 6b12c509a..2d18721e7 100644 --- a/src/api/v2/index.php +++ b/src/api/v2/index.php @@ -294,6 +294,7 @@ public static function addCORSheaders(Request $request, $response) { require __DIR__ . "/../../inc/apiv2/helper/abortChunk.routes.php"; require __DIR__ . "/../../inc/apiv2/helper/assignAgent.routes.php"; +require __DIR__ . "/../../inc/apiv2/helper/changeOwnPassword.routes.php"; require __DIR__ . "/../../inc/apiv2/helper/createSupertask.routes.php"; require __DIR__ . "/../../inc/apiv2/helper/createSuperHashlist.routes.php"; require __DIR__ . "/../../inc/apiv2/helper/exportCrackedHashes.routes.php"; diff --git a/src/inc/apiv2/helper/changeOwnPassword.routes.php b/src/inc/apiv2/helper/changeOwnPassword.routes.php new file mode 100644 index 000000000..7ac10ed57 --- /dev/null +++ b/src/inc/apiv2/helper/changeOwnPassword.routes.php @@ -0,0 +1,50 @@ + ["type" => "str"] + ]; + } + + public static function getResponse(): array { + return ["Change password" => "Success"]; + } + + /** + * Endpoint to set a password of an user. + */ + public function actionPost($data): object|array|null { + $user = $this->getCurrentUser(); + + /* Set user password if provided */ + UserUtils::changePassword($user, $data["password"]); + return $this->getResponse(); + } +} + +changeOwnPasswordHelper::register($app); \ No newline at end of file diff --git a/src/inc/apiv2/helper/setUserPassword.routes.php b/src/inc/apiv2/helper/setUserPassword.routes.php index dee70d8b1..c10a4a92d 100644 --- a/src/inc/apiv2/helper/setUserPassword.routes.php +++ b/src/inc/apiv2/helper/setUserPassword.routes.php @@ -21,7 +21,7 @@ public function getRequiredPermissions(string $method): array } /** - * userId is the is of the user of which you want to change the password. + * userId is the id of the user of which you want to change the password. * password is the new password that you want to set. */ public function getFormFields(): array diff --git a/src/inc/utils/UserUtils.class.php b/src/inc/utils/UserUtils.class.php index 30f36cc02..1caaaf557 100644 --- a/src/inc/utils/UserUtils.class.php +++ b/src/inc/utils/UserUtils.class.php @@ -116,6 +116,13 @@ public static function setRights($userId, $groupId, $adminUser) { Factory::getUserFactory()->set($user, User::RIGHT_GROUP_ID, $group->getId()); } + public static function changePassword($user, $password) { + $newSalt = Util::randomString(20); + $newHash = Encryption::passwordHash($password, $newSalt); + + Factory::getUserFactory()->mset($user, [User::PASSWORD_HASH => $newHash, User::PASSWORD_SALT => $newSalt, User::IS_COMPUTED_PASSWORD => 0]); + } + /** * @param int $userId * @param string $password From dde108d18f6860289dd7487f85e53af8d4f4ab7f Mon Sep 17 00:00:00 2001 From: jessevz Date: Wed, 28 May 2025 15:49:16 +0200 Subject: [PATCH 075/691] Made small changes to make pagination working in frontend --- src/inc/apiv2/common/AbstractModelAPI.class.php | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/src/inc/apiv2/common/AbstractModelAPI.class.php b/src/inc/apiv2/common/AbstractModelAPI.class.php index 69e9d9360..f6b138230 100644 --- a/src/inc/apiv2/common/AbstractModelAPI.class.php +++ b/src/inc/apiv2/common/AbstractModelAPI.class.php @@ -529,8 +529,6 @@ public static function getManyResources(object $apiClass, Request $request, Resp $min = $aggregation_results[$agg2->getName()]; $total = $aggregation_results[$agg3->getName()]; - $totalPages = ceil($total / $pageSize); - //pagination filters need to be added after max has been calculated $finalFs[Factory::LIMIT] = new LimitFilter($pageSize); @@ -544,6 +542,9 @@ public static function getManyResources(object $apiClass, Request $request, Resp /* Request objects */ $filterObjects = $factory->filter($finalFs); + if ($defaultSort == 'DESC') { + $filterObjects = array_reverse($filterObjects); + } /* JOIN statements will return related modules as well, discard for now */ if (array_key_exists(Factory::JOIN, $finalFs)) { @@ -649,7 +650,7 @@ public static function getManyResources(object $apiClass, Request $request, Resp "prev" => $linksPrev, ]; - $metadata = ["page" => ["total_pages" => $totalPages]]; + $metadata = ["page" => ["total_elements" => $total]]; // Generate JSON:API GET output $ret = self::createJsonResponse($dataResources, $links, $includedResources, $metadata); From 76470931a17e81e17856b7a818fedf2a4931ec57 Mon Sep 17 00:00:00 2001 From: jessevz Date: Wed, 4 Jun 2025 10:10:21 +0200 Subject: [PATCH 076/691] Made small changes to make pagination working in frontend (#1340) Co-authored-by: jessevz --- src/inc/apiv2/common/AbstractModelAPI.class.php | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/src/inc/apiv2/common/AbstractModelAPI.class.php b/src/inc/apiv2/common/AbstractModelAPI.class.php index 69e9d9360..f6b138230 100644 --- a/src/inc/apiv2/common/AbstractModelAPI.class.php +++ b/src/inc/apiv2/common/AbstractModelAPI.class.php @@ -529,8 +529,6 @@ public static function getManyResources(object $apiClass, Request $request, Resp $min = $aggregation_results[$agg2->getName()]; $total = $aggregation_results[$agg3->getName()]; - $totalPages = ceil($total / $pageSize); - //pagination filters need to be added after max has been calculated $finalFs[Factory::LIMIT] = new LimitFilter($pageSize); @@ -544,6 +542,9 @@ public static function getManyResources(object $apiClass, Request $request, Resp /* Request objects */ $filterObjects = $factory->filter($finalFs); + if ($defaultSort == 'DESC') { + $filterObjects = array_reverse($filterObjects); + } /* JOIN statements will return related modules as well, discard for now */ if (array_key_exists(Factory::JOIN, $finalFs)) { @@ -649,7 +650,7 @@ public static function getManyResources(object $apiClass, Request $request, Resp "prev" => $linksPrev, ]; - $metadata = ["page" => ["total_pages" => $totalPages]]; + $metadata = ["page" => ["total_elements" => $total]]; // Generate JSON:API GET output $ret = self::createJsonResponse($dataResources, $links, $includedResources, $metadata); From 23f28b0a9100fc5e2503f7785a47e76ff15a8de7 Mon Sep 17 00:00:00 2001 From: jessevz Date: Wed, 4 Jun 2025 10:11:23 +0200 Subject: [PATCH 077/691] Fixed patch to global permission group (#1341) * Fixed patch to global permission group * Fixed not working test --------- Co-authored-by: jessevz --- ci/apiv2/test_globalpermissiongroup.py | 9 +++++++-- .../model/globalpermissiongroups.routes.php | 17 ++++++----------- src/inc/utils/AccessControlUtils.class.php | 12 ++++++++++++ 3 files changed, 25 insertions(+), 13 deletions(-) diff --git a/ci/apiv2/test_globalpermissiongroup.py b/ci/apiv2/test_globalpermissiongroup.py index ebe6e4741..6e69434c3 100644 --- a/ci/apiv2/test_globalpermissiongroup.py +++ b/ci/apiv2/test_globalpermissiongroup.py @@ -15,11 +15,16 @@ def test_create(self): def test_patch(self): model_obj = self.create_test_object() - attr = 'permRightGroupCreate' - model_obj.permissions[attr] = True + # with how the current testing framework, works, multiple permissions have to be set, otherwise conflicting + # permissions, will be set to false by default + attributes = ["permUserDelete", "permUserRead", "permUserUpdate", "permUserCreate", "permRightGroupCreate", + "permRightGroupDelete", "permRightGroupRead", "permRightGroupUpdate"] + for attr in attributes: + model_obj.permissions[attr] = True model_obj.save() # Request object from backend and validate PATCHed permission + attr = 'permRightGroupCreate' obj = self.model_class.objects.get(pk=model_obj.id) self.assertTrue(obj.permissions[attr]) diff --git a/src/inc/apiv2/model/globalpermissiongroups.routes.php b/src/inc/apiv2/model/globalpermissiongroups.routes.php index 65b3207cf..9e630c6bc 100644 --- a/src/inc/apiv2/model/globalpermissiongroups.routes.php +++ b/src/inc/apiv2/model/globalpermissiongroups.routes.php @@ -102,21 +102,16 @@ private function updatePermissions($id, $value) { } } } - - // Get enabled 'old-style' permissions + $legacyPerms = []; foreach($permissions as $crudPerm => $value) { - if ($value === true) { - $legacyPerms = array_merge($legacyPerms, $c2o[$crudPerm]); + if (array_key_exists($crudPerm, $c2o)) { + $filled_perms = array_fill_keys($c2o[$crudPerm], $value); + $legacyPerms = array_merge($legacyPerms, $filled_perms); } } - - // Modify data to conform with updateGroupPermssions input - $permData = []; - foreach($legacyPerms as $key) { - array_push($permData, $key . "-1"); - } - AccessControlUtils::updateGroupPermissions($id, $permData); + + AccessControlUtils::addToPermissions($id, $legacyPerms); } } diff --git a/src/inc/utils/AccessControlUtils.class.php b/src/inc/utils/AccessControlUtils.class.php index d6689f65b..a0b8b9c00 100644 --- a/src/inc/utils/AccessControlUtils.class.php +++ b/src/inc/utils/AccessControlUtils.class.php @@ -23,6 +23,18 @@ public static function getGroups() { return Factory::getRightGroupFactory()->filter([]); } + public static function addToPermissions($groupId, $perm) { + $group = AccessControlUtils::getGroup($groupId); + $current_permissions = $group->getPermissions(); + if ($current_permissions == 'ALL') { + throw new HTException("Administrator group cannot be changed!"); + } + $current_permissions_decoded = json_decode($current_permissions, true); + + $merged_permissions = array_merge($current_permissions_decoded, $perm); + Factory::getRightGroupFactory()->set($group, RightGroup::PERMISSIONS, json_encode($merged_permissions)); + } + /** * @param int $groupId * @param array $perm From bde2a5244f6a07a5734f240f8b4d63d74e5bf89d Mon Sep 17 00:00:00 2001 From: Niklas Date: Tue, 10 Jun 2025 08:05:24 +0200 Subject: [PATCH 078/691] check for password new password and confirm (#1345) * check for password new password and confirm * success response fix --- .../apiv2/helper/changeOwnPassword.routes.php | 12 ++++--- src/inc/utils/UserUtils.class.php | 35 +++++++++++++++++-- 2 files changed, 41 insertions(+), 6 deletions(-) diff --git a/src/inc/apiv2/helper/changeOwnPassword.routes.php b/src/inc/apiv2/helper/changeOwnPassword.routes.php index 7ac10ed57..d4785901c 100644 --- a/src/inc/apiv2/helper/changeOwnPassword.routes.php +++ b/src/inc/apiv2/helper/changeOwnPassword.routes.php @@ -22,17 +22,21 @@ public function getRequiredPermissions(string $method): array } /** - * password is the new password that you want to set. + * oldPassword is the current password of the user. + * newPassword is the new password that you want to set. + * confirmPassword is the new password again to confirm it. */ public function getFormFields(): array { return [ - "password" => ["type" => "str"] + "oldPassword" => ["type" => "str"], + "newPassword" => ["type" => "str"], + "confirmPassword" => ["type" => "str"] ]; } public static function getResponse(): array { - return ["Change password" => "Success"]; + return ["Change password" => "Password succesfully updated!"]; } /** @@ -42,7 +46,7 @@ public function actionPost($data): object|array|null { $user = $this->getCurrentUser(); /* Set user password if provided */ - UserUtils::changePassword($user, $data["password"]); + UserUtils::changePassword($user,$data["oldPassword"], $data["newPassword"],$data["confirmPassword"] ); return $this->getResponse(); } } diff --git a/src/inc/utils/UserUtils.class.php b/src/inc/utils/UserUtils.class.php index 1caaaf557..c9e21e3e2 100644 --- a/src/inc/utils/UserUtils.class.php +++ b/src/inc/utils/UserUtils.class.php @@ -116,9 +116,40 @@ public static function setRights($userId, $groupId, $adminUser) { Factory::getUserFactory()->set($user, User::RIGHT_GROUP_ID, $group->getId()); } - public static function changePassword($user, $password) { + /** + * Changes the password for a given user after validating the old password and new password requirements. + * + * @param User $user The user object whose password is to be changed. + * @param string $oldPassword The user's current password (plain text). + * @param string $newPassword The new password to set (plain text). + * @param string $confirmPassword Confirmation of the new password (plain text). + * + * @throws HTException If the old password is incorrect, the new password is too short, + * the new passwords do not match, or the new password is the same as the old one. + * + * This method performs the following steps: + * 1. Verifies the old password using the user's stored salt and hash. + * 2. Checks that the new password meets minimum length requirements. + * 3. Ensures the new password and confirmation match. + * 4. Ensures the new password is different from the old password. + * 5. Generates a new salt and hash for the new password. + * 6. Updates the user's password hash, salt, and resets the computed password flag. + */ + public static function changePassword($user, $oldPassword, $newPassword, $confirmPassword) { + if (!Encryption::passwordVerify($oldPassword, $user->getPasswordSalt(), $user->getPasswordHash())) { + throw new HTException("Your old password is wrong!"); + } + else if (strlen($newPassword) < 4) { + throw new HTException("Your password is too short!"); + } + else if ($newPassword != $confirmPassword) { + throw new HTException("Your new passwords do not match!"); + } + else if ($newPassword == $oldPassword) { + throw new HTException("Your new password is the same as the old one!"); + } $newSalt = Util::randomString(20); - $newHash = Encryption::passwordHash($password, $newSalt); + $newHash = Encryption::passwordHash($newPassword, $newSalt); Factory::getUserFactory()->mset($user, [User::PASSWORD_HASH => $newHash, User::PASSWORD_SALT => $newSalt, User::IS_COMPUTED_PASSWORD => 0]); } From 6c6dac7d06f16e5ad4b75216fd44332fa7e56edb Mon Sep 17 00:00:00 2001 From: Niklas Date: Mon, 23 Jun 2025 10:40:30 +0200 Subject: [PATCH 079/691] Inclyding task data for task error (#1364) --- src/inc/apiv2/model/agenterrors.routes.php | 15 +++++++++++++-- 1 file changed, 13 insertions(+), 2 deletions(-) diff --git a/src/inc/apiv2/model/agenterrors.routes.php b/src/inc/apiv2/model/agenterrors.routes.php index 0c8c56f31..0d7040ad2 100644 --- a/src/inc/apiv2/model/agenterrors.routes.php +++ b/src/inc/apiv2/model/agenterrors.routes.php @@ -1,5 +1,5 @@ [ + 'key' => AgentError::TASK_ID, + 'relationType' => Task::class, + 'relationKey' => Task::TASK_ID, + ], + ]; + } public static function getAvailableMethods(): array { return ['GET', 'DELETE']; } From f8a796b944657092c1317b708f3252411f758b49 Mon Sep 17 00:00:00 2001 From: coiseiw Date: Mon, 23 Jun 2025 11:08:19 +0200 Subject: [PATCH 080/691] uploading pictures, changing mkdocs --- doc/assets/images/Manage_wordlist.png | Bin 0 -> 42492 bytes doc/assets/images/Upload_url.png | Bin 0 -> 28254 bytes doc/assets/images/create_hashlist.png | Bin 0 -> 38634 bytes doc/assets/images/manage_files.png | Bin 0 -> 47886 bytes doc/assets/images/other_files.png | Bin 0 -> 27137 bytes doc/assets/images/rules_files.png | Bin 0 -> 42999 bytes doc/assets/images/search_hash.png | Bin 0 -> 27424 bytes doc/assets/images/search_hash_2.png | Bin 0 -> 44454 bytes doc/assets/images/supertasks_showtasks.png | Bin 0 -> 28737 bytes doc/assets/images/supertasks_subtasks.png | Bin 0 -> 104520 bytes doc/assets/images/upload_file.png | Bin 0 -> 29824 bytes doc/assets/images/upload_rule.png | Bin 0 -> 26262 bytes .../advanced_install.md | 116 ----------------- doc/installation_guidelines/update.md | 118 ++++++++++++++++++ doc/user_manual/agents.md | 2 + doc/user_manual/files.md | 17 +-- doc/user_manual/hashlist.md | 5 +- doc/user_manual/tasks.md | 6 +- mkdocs.yml | 3 +- 19 files changed, 137 insertions(+), 130 deletions(-) create mode 100644 doc/assets/images/Manage_wordlist.png create mode 100644 doc/assets/images/Upload_url.png create mode 100644 doc/assets/images/create_hashlist.png create mode 100644 doc/assets/images/manage_files.png create mode 100644 doc/assets/images/other_files.png create mode 100644 doc/assets/images/rules_files.png create mode 100644 doc/assets/images/search_hash.png create mode 100644 doc/assets/images/search_hash_2.png create mode 100644 doc/assets/images/supertasks_showtasks.png create mode 100644 doc/assets/images/supertasks_subtasks.png create mode 100644 doc/assets/images/upload_file.png create mode 100644 doc/assets/images/upload_rule.png create mode 100644 doc/installation_guidelines/update.md diff --git a/doc/assets/images/Manage_wordlist.png b/doc/assets/images/Manage_wordlist.png new file mode 100644 index 0000000000000000000000000000000000000000..24a97e466377da7396498a2998b77bb6f02d0953 GIT binary patch literal 42492 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 J)(MAu{|nC9FwFn} literal 0 HcmV?d00001 diff --git a/doc/assets/images/Upload_url.png b/doc/assets/images/Upload_url.png new file mode 100644 index 0000000000000000000000000000000000000000..b47bff0e89d4263693bf5ea57194c0ac9367dc33 GIT binary patch literal 28254 zcmd43^M575w=O)HOl;c|+qP{RJD6Z%V=}RmNwQ;eV%xTDn>+T+e9wD6@BIhvy{CVy z?&?}y3(u;mXLXp8f+PYgF6@^tUl63F#8kd~`D*s%3)mbqFIcr&rj zi^i0g?6X+~2OI|l1to3-d+76KsM>&##OKX?7D$$Vof4U2KX0P^jr5QF*A?(Tqw8`j zYBkz=?NRo$Wqvo|I53cg5g7$#dXT}xf6N&no@Rw+TLia`p_q9WQf_3_JPvA#GRXjE z5Obf>AnMKY$K5NW>#G2Axiz}z#O*}Y{HgKoQM65vVE17=h3Q*=5%NeeW00w+q?_gV zX^D7hgLMJw=TzkORV%=yxQDN!4VWIX?mv0a+^!i~sD#!bQQs z4PCW(FnLN4u+*w!!j%{JO<7s^Z!&Yus&$eIt`GDg(>-t`_Mct`oPR>J%$@%Z!V;mQ zH^QY)uSpcTQ#{SnNYRtZTTC8A+vcpUF!ZU*^tt2L)AT>gF&;7fe2)x$nHypXbboi4 zpz-W(9|r->_0`ZO_F4;WxY^CG_zZgdwVGV}dROe~J$M6!fzXIunO=!wL}wc&EU*#l zLf+22mW+ip`jW|2q7YL0{m`|T4erDX6@7E(<>x}gKIAjpb)*P8aqXVu1qcA7%|Jov zV3p4sj}5mo&f=ua@HN8|{1>x1)a?bmvzl>&~(ABF%6)R&U+mc^! zKgj{sPH0~S0oqiKqk%iuN;h=?=a2j3fZ55Nzk=7;7QnYq1s54&O&+YJce&6rMxOL?S+zU8_pWUxd>Q9X=e7_)V1-^-;x)@KfxOi@)1;;63K{$CwuP1b3rw;eLnj
    - ![screenshot_files](https://upload.wikimedia.org/wikipedia/commons/8/80/Comingsoon.png?20120228065200){ width="300" } + ![screenshot_rule_page](/assets/images/rules_files.png)
    -Once a category is selected, files can be added to the server using one of the following methods: +For each category, new files can be added to the server by pressing "New Wordlist/Rules/File" button. Files are uploaded using one of the following methods: - **Upload from your computer** – Directly upload files stored on your local machine. -- **Import from an import directory** – Use files that have been preloaded into the server’s import directory. +- **Import from an import directory** – Use files that have been preloaded into the server’s import directory. Note that this functionality is obsolete in the new front-end. - **Download from a URL** – Provide a URL to fetch files from an external source. Detailed instructions for each upload method are provided in the following subsections. ### Upload a new file from the computer
    - ![screenshot_new_file](https://upload.wikimedia.org/wikipedia/commons/8/80/Comingsoon.png?20120228065200){ width="300" } + ![screenshot_new_file](/assets/images/upload_rule.png){ width="450" }
    -1. **Add file**: Click this button to enable file upload.. After clicking, a new field labeled Choose file will appear. Each time you click on Add File, an additional Choose file field will be added, allowing you to upload multiple files simultaneously.. +1. **Add file**: Click this button to enable file upload. After clicking, a new field labeled Choose file will appear. Each time you click on Add File, an additional Choose file field will be added, allowing you to upload multiple files simultaneously.. 2. **Associated Access Group**: Define the access group that will have permissions to access the file(s) you are uploading. 3. **Choose file**: Click this button to open your computer’s file explorer. Select the file you wish to upload. 4. **Upload files**: Once you have selected all the files you wanted to upload, click the Upload files button. -### Import a new file + ### Download new file from URL diff --git a/doc/user_manual/hashlist.md b/doc/user_manual/hashlist.md index 5c5230aca..4f801ae4a 100644 --- a/doc/user_manual/hashlist.md +++ b/doc/user_manual/hashlist.md @@ -7,7 +7,7 @@ Refer to the Hashcat documentation for detailed information on supported hash ty In the Hashtopolis web interface, navigate to *Hashlists* and click on the button *+ New Hashlist*. You will get the following window:
    - ![screenshot_hashlist](https://upload.wikimedia.org/wikipedia/commons/8/80/Comingsoon.png?20120228065200){ width="300" } + ![screenshot_create_hashlist](/assets/images/create_hashlist.png)
    Here is how to fill in the different fields: @@ -102,12 +102,13 @@ The result will display all the hashes that correspond to the given entry/ies. I - A list of all the hashes that contains the given entry, specifying in which hashlist(s) they are contained and the cleartext password if they have been cracked already.
    - ![screenshot_import_file](https://upload.wikimedia.org/wikipedia/commons/8/80/Comingsoon.png?20120228065200){ width="300" } + ![screenshot_import_file](/assets/images/search_hash_2.png)
    ## Show Crack This page displays all the cracked passwords that have been recovered and that are stored in the database. It shows the following fields. + - **Time Found**: Indicates when the password has been recovered - **Plaintext**: Password that has been recovered - **Hash**: Hash for which the password was recovered diff --git a/doc/user_manual/tasks.md b/doc/user_manual/tasks.md index db1c63be2..f345ea8a9 100644 --- a/doc/user_manual/tasks.md +++ b/doc/user_manual/tasks.md @@ -97,13 +97,13 @@ Supertask are not displayed as regular tasks in the *Show Task* menu as displaye
    - ![screenshot_import_file](https://upload.wikimedia.org/wikipedia/commons/8/80/Comingsoon.png?20120228065200){ width="300" } + ![screenshot_showtask_supertask](/assets/images/supertasks_showtasks.png)
    -The same information than those of a task are displayed. The *copy to Pretask* and *copy to task* options are not available. There is instead an information button which open a pop-up window displaying the list of subtasks of the supertask. This window is identical to the ShowTasks page apart that only the subtasks of the supertask are diplayed in it as shown in the figure below. +The same information than those of a task are displayed. The *copy to Pretask* and *copy to task* options are not available. There is instead an information button which open a pop-up window displaying the list of subtasks of the supertask. This window is identical to the ShowTasks page apart that only the subtasks of the supertask are displayed in it as shown in the figure below.
    - ![screenshot_import_file](https://upload.wikimedia.org/wikipedia/commons/8/80/Comingsoon.png?20120228065200){ width="300" } + ![screenshot_import_file](/assets/images/)
    ## Import Super Task diff --git a/mkdocs.yml b/mkdocs.yml index ba31acd25..895d07d55 100644 --- a/mkdocs.yml +++ b/mkdocs.yml @@ -7,7 +7,8 @@ nav: - user_manual/basic_workflow.md - Installation Guidelines: - installation_guidelines/basic_install.md - - installation_guidelines/advanced_install.md + - installation_guidelines/advanced_install.md + - installation_guidelines/update.md - installation_guidelines/tls.md - installation_guidelines/docker.md - User Manual: From c6b1795bbb20169550d2280d386b339c2602c463 Mon Sep 17 00:00:00 2001 From: Niklas Date: Mon, 23 Jun 2025 10:41:38 +0000 Subject: [PATCH 081/691] delete error perm --- src/inc/apiv2/common/AbstractBaseAPI.class.php | 1 + 1 file changed, 1 insertion(+) diff --git a/src/inc/apiv2/common/AbstractBaseAPI.class.php b/src/inc/apiv2/common/AbstractBaseAPI.class.php index fd43edf98..8d5283215 100644 --- a/src/inc/apiv2/common/AbstractBaseAPI.class.php +++ b/src/inc/apiv2/common/AbstractBaseAPI.class.php @@ -381,6 +381,7 @@ protected static function getExpandPermissions(string $expand): array // src/inc/defines/agents.php AgentStat::PERM_CREATE, AgentStat::PERM_READ, AgentStat::PERM_UPDATE, AgentStat::PERM_DELETE, Assignment::PERM_CREATE, Assignment::PERM_READ, Assignment::PERM_UPDATE, Assignment::PERM_DELETE, + AgentError::PERM_DELETE ), From 7b22393366f04b3cd5674bb513144bb8989d3347 Mon Sep 17 00:00:00 2001 From: ObsidianOracle Date: Mon, 23 Jun 2025 16:05:34 +0200 Subject: [PATCH 082/691] new-layout-mkdocs --- doc/assets/icons/discord.svg | 1 + doc/assets/icons/docker.svg | 1 + doc/assets/icons/github.svg | 1 + doc/assets/images/hero.jpg | Bin 0 -> 134493 bytes doc/assets/images/hero.svg | 7 +++ doc/assets/stylesheets/extra.css | 6 ++ doc/assets/stylesheets/hero.css | 63 +++++++++++++++++++ mkdocs.yml | 100 +++++++++++++++++++++---------- overrides/partials/footer.html | 11 ++++ 9 files changed, 160 insertions(+), 30 deletions(-) create mode 100644 doc/assets/icons/discord.svg create mode 100644 doc/assets/icons/docker.svg create mode 100644 doc/assets/icons/github.svg create mode 100644 doc/assets/images/hero.jpg create mode 100644 doc/assets/images/hero.svg create mode 100644 doc/assets/stylesheets/extra.css create mode 100644 doc/assets/stylesheets/hero.css create mode 100644 overrides/partials/footer.html diff --git a/doc/assets/icons/discord.svg b/doc/assets/icons/discord.svg new file mode 100644 index 000000000..9d7796b8a --- /dev/null +++ b/doc/assets/icons/discord.svg @@ -0,0 +1 @@ +Discord \ No newline at end of file diff --git a/doc/assets/icons/docker.svg b/doc/assets/icons/docker.svg new file mode 100644 index 000000000..0021a8a7b --- /dev/null +++ b/doc/assets/icons/docker.svg @@ -0,0 +1 @@ +Docker \ No newline at end of file diff --git a/doc/assets/icons/github.svg b/doc/assets/icons/github.svg new file mode 100644 index 000000000..538ec5bf2 --- /dev/null +++ b/doc/assets/icons/github.svg @@ -0,0 +1 @@ +GitHub \ No newline at end of file diff --git a/doc/assets/images/hero.jpg b/doc/assets/images/hero.jpg new file mode 100644 index 0000000000000000000000000000000000000000..812261db09e167d768cd30be56091f2faa920733 GIT binary patch literal 134493 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 + + + + + + \ No newline at end of file diff --git a/doc/assets/stylesheets/extra.css b/doc/assets/stylesheets/extra.css new file mode 100644 index 000000000..ae044c585 --- /dev/null +++ b/doc/assets/stylesheets/extra.css @@ -0,0 +1,6 @@ +.hero h1 { + text-shadow: 0 2px 4px rgba(0,0,0,0.5); +} +.hero p { + text-shadow: 0 1px 3px rgba(0,0,0,0.4); +} diff --git a/doc/assets/stylesheets/hero.css b/doc/assets/stylesheets/hero.css new file mode 100644 index 000000000..41b4ca7cc --- /dev/null +++ b/doc/assets/stylesheets/hero.css @@ -0,0 +1,63 @@ +.hero-fullscreen { + position: relative; + width: 100%; + height: 100vh; /* Full height of the viewport */ + background: url('../images/hero.svg') center center / cover no-repeat; + display: flex; + align-items: center; + justify-content: center; + text-align: center; + color: white; + overflow: hidden; +} + +.hero-fullscreen::after { + content: ""; + position: absolute; + inset: 0; + background: rgba(0, 0, 0, 0.4); /* Optional dark overlay */ + z-index: 1; +} + +.hero-content { + position: relative; + z-index: 2; + padding: 2rem; + max-width: 90%; +} + +.md-button { + margin-top: 1.5rem; + padding: 0.75rem 1.5rem; + background: #2196f3; + color: white; + text-decoration: none; + border-radius: 6px; + font-weight: bold; + display: inline-block; +} + +.md-button:hover { + background: #1976d2; +} +.md-main__inner { + padding-top: 0 !important; +} +.footer-icons img { + transition: transform 0.2s ease; + opacity: 0.8; +} +.footer-icons img:hover { + transform: scale(1.1); + opacity: 1; +} +/* Stronger selector for Material footer */ +.md-footer { + background-color: #1e1e1e !important; + color: white !important; +} + +.md-footer a { + color: #90caf9 !important; +} + diff --git a/mkdocs.yml b/mkdocs.yml index 895d07d55..ea4a9e4b5 100644 --- a/mkdocs.yml +++ b/mkdocs.yml @@ -2,40 +2,80 @@ site_name: Hashtopolis site_url: https://docs.hashtopolis.org repo_url: https://github.com/hashtopolis/server docs_dir: doc + nav: - - index.md - - user_manual/basic_workflow.md - - Installation Guidelines: - - installation_guidelines/basic_install.md - - installation_guidelines/advanced_install.md - - installation_guidelines/update.md - - installation_guidelines/tls.md - - installation_guidelines/docker.md - - User Manual: - - user_manual/agents.md - - user_manual/tasks.md - - user_manual/hashlist.md - - user_manual/files.md - - user_manual/crackers_binary.md - - user_manual/myaccount.md - - user_manual/settings_and_configuration.md - - user_manual/users.md - - FAQ and Tips: - - faq_tips/faq.md - - faq_tips/tips.md - - changelog.md - - API Reference: - - APIv2: apiv2.md + - index.md + - user_manual/basic_workflow.md + - Installation Guidelines: + - installation_guidelines/basic_install.md + - installation_guidelines/advanced_install.md + - installation_guidelines/update.md + - installation_guidelines/tls.md + - installation_guidelines/docker.md + - User Manual: + - user_manual/agents.md + - user_manual/tasks.md + - user_manual/hashlist.md + - user_manual/files.md + - user_manual/crackers_binary.md + - user_manual/myaccount.md + - user_manual/settings_and_configuration.md + - user_manual/users.md + - FAQ and Tips: + - faq_tips/faq.md + - faq_tips/tips.md + - changelog.md + - API Reference: + - APIv2: apiv2.md theme: name: material + custom_dir: overrides logo: assets/images/logo.png + palette: + - scheme: default + primary: blue + accent: light blue + toggle: + icon: material/weather-night + name: Switch to dark mode + - scheme: slate + primary: indigo # or custom color + accent: light blue + toggle: + icon: material/weather-sunny + name: Switch to light mode features: - - content.code.copy - - content.action.edit -edit_uri: blob/docs/doc/ # Edit the URL to the static branch and folder + - content.code.copy + - content.action.edit + - navigation.tabs + - navigation.indexes + - navigation.sections + - header.autohide + - navigation.top + - toc.integrate + - navigation.footer + - content.tabs.link + +edit_uri: blob/docs/doc/ + markdown_extensions: - - github-callouts # Add the ability of notes, warnings, etc. - - sane_lists # Make the numbered lists continue - - attr_list # allows to add HTML attributes and CSS classes - - md_in_html # allows for writing Markdown inside of HTML \ No newline at end of file + - github-callouts + - sane_lists + - attr_list + - md_in_html + +extra_css: + - assets/stylesheets/hero.css + +extra: + font: + text: Roboto + code: Fira Code + +plugins: + - search + - minify: + minify_html: true + - git-revision-date-localized: + fallback_to_build_date: true diff --git a/overrides/partials/footer.html b/overrides/partials/footer.html new file mode 100644 index 000000000..22b7ebe04 --- /dev/null +++ b/overrides/partials/footer.html @@ -0,0 +1,11 @@ +

     From f1211f568b328fc1e2e7bea3ee0c3b735549b73f Mon Sep 17 00:00:00 2001 From: ObsidianOracle Date: Mon, 23 Jun 2025 18:04:13 +0200 Subject: [PATCH 083/691] navigation-and-footer-space --- overrides/partials/footer.html | 28 ++++++++++++++++++++++++++++ 1 file changed, 28 insertions(+) diff --git a/overrides/partials/footer.html b/overrides/partials/footer.html index 22b7ebe04..1b4d68450 100644 --- a/overrides/partials/footer.html +++ b/overrides/partials/footer.html @@ -1,3 +1,28 @@ + +{% if page and page.previous_page or page.next_page %} + +{% endif %} + +
    GitHub @@ -9,3 +34,6 @@ Discord
    + + +
    From 44cf168faa759a45f05d0210c64a9d47cf160828 Mon Sep 17 00:00:00 2001 From: coiseiw Date: Mon, 23 Jun 2025 18:05:31 +0200 Subject: [PATCH 084/691] Including many pictures, settings, configuration and binary section fully done. --- doc/assets/images/Upload_url.png | Bin 28254 -> 31903 bytes doc/assets/images/agent_binaries_page.png | Bin 0 -> 54641 bytes doc/assets/images/cracker_page.png | Bin 0 -> 37093 bytes doc/assets/images/edit_rule_file.png | Bin 0 -> 21495 bytes doc/assets/images/logs_example.png | Bin 0 -> 208450 bytes doc/assets/images/new_agent_page.png | Bin 0 -> 22667 bytes doc/assets/images/new_binary_version.png | Bin 0 -> 25496 bytes doc/assets/images/new_preprocessor_page.png | Bin 0 -> 44771 bytes doc/assets/images/new_user.png | Bin 0 -> 59929 bytes doc/assets/images/preprocessor_page.png | Bin 0 -> 33220 bytes doc/user_manual/crackers_binary.md | 87 +++++++++++++++++- doc/user_manual/files.md | 49 ++++++---- doc/user_manual/myaccount.md | 1 - doc/user_manual/settings_and_configuration.md | 18 +++- doc/user_manual/users.md | 25 +++++ mkdocs.yml | 1 - 16 files changed, 151 insertions(+), 30 deletions(-) create mode 100644 doc/assets/images/agent_binaries_page.png create mode 100644 doc/assets/images/cracker_page.png create mode 100644 doc/assets/images/edit_rule_file.png create mode 100644 doc/assets/images/logs_example.png create mode 100644 doc/assets/images/new_agent_page.png create mode 100644 doc/assets/images/new_binary_version.png create mode 100644 doc/assets/images/new_preprocessor_page.png create mode 100644 doc/assets/images/new_user.png create mode 100644 doc/assets/images/preprocessor_page.png delete mode 100644 doc/user_manual/myaccount.md diff --git a/doc/assets/images/Upload_url.png b/doc/assets/images/Upload_url.png index b47bff0e89d4263693bf5ea57194c0ac9367dc33..dcdca53032eac0b0a13817799d370b1a46b5ffe2 100644 GIT binary patch literal 31903 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 VWEN3E0dxnG&V7S>l^T!#{4ca`MXCS* literal 28254 zcmd43^M575w=O)HOl;c|+qP{RJD6Z%V=}RmNwQ;eV%xTDn>+T+e9wD6@BIhvy{CVy z?&?}y3(u;mXLXp8f+PYgF6@^tUl63F#8kd~`D*s%3)mbqFIcr&rj zi^i0g?6X+~2OI|l1to3-d+76KsM>&##OKX?7D$$Vof4U2KX0P^jr5QF*A?(Tqw8`j zYBkz=?NRo$Wqvo|I53cg5g7$#dXT}xf6N&no@Rw+TLia`p_q9WQf_3_JPvA#GRXjE z5Obf>AnMKY$K5NW>#G2Axiz}z#O*}Y{HgKoQM65vVE17=h3Q*=5%NeeW00w+q?_gV zX^D7hgLMJw=TzkORV%=yxQDN!4VWIX?mv0a+^!i~sD#!bQQs z4PCW(FnLN4u+*w!!j%{JO<7s^Z!&Yus&$eIt`GDg(>-t`_Mct`oPR>J%$@%Z!V;mQ zH^QY)uSpcTQ#{SnNYRtZTTC8A+vcpUF!ZU*^tt2L)AT>gF&;7fe2)x$nHypXbboi4 zpz-W(9|r->_0`ZO_F4;WxY^CG_zZgdwVGV}dROe~J$M6!fzXIunO=!wL}wc&EU*#l zLf+22mW+ip`jW|2q7YL0{m`|T4erDX6@7E(<>x}gKIAjpb)*P8aqXVu1qcA7%|Jov zV3p4sj}5mo&f=ua@HN8|{1>x1)a?bmvzl>&~(ABF%6)R&U+mc^! zKgj{sPH0~S0oqiKqk%iuN;h=?=a2j3fZ55Nzk=7;7QnYq1s54&O&+YJce&6rMxOL?S+zU8_pWUxd>Q9X=e7_)V1-^-;x)@KfxOi@)1;;63K{$CwuP1b3rw;eLnj

    Y0_VglXX>AeT}6T!ttt06fq!O4XEEaLSB9 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 XG_kA5tKIN><6g+is7RMf8VCOmq>cuD diff --git a/doc/assets/images/agent_binaries_page.png b/doc/assets/images/agent_binaries_page.png new file mode 100644 index 0000000000000000000000000000000000000000..a5f3eebedd74f303f5f45aa914f96580a3b11ec0 GIT binary patch literal 54641 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 T874T9m=hb5u)XQajN^X+s~xzZ literal 0 HcmV?d00001 diff --git a/doc/assets/images/logs_example.png b/doc/assets/images/logs_example.png new file mode 100644 index 0000000000000000000000000000000000000000..8e831676fc5928e0953fe32adc155bf5b4ea802a GIT binary patch literal 208450 zcmeFabySsG7e1U7BPAf+N^V-ZOFA|o-La)hT3V%)2I*9~yKCQf zqyFwW=YD5=o{w?IxZ{rFKQb7b_g!nQXFl_pu^>S9nHUB-2>r^HD;VNWMV?=|f(gBH z1vv=y2JoF@0lWg>zpK{I#hzR#>>^pZa)siGxX5D#2d&i!*T{hZN9Iiw8!5uYY>eXI z!0~i&x`xG;k1U414w9T~uh4_HVBIgz*IyTlHj>`VhFzt+t$i=->52k%4)z^9B$d11 z{xCJR-s)@}SQ#V&M^x^U%9QO?^G)_WyG;1a* z%*HBwu&yE@qheDCd0hFQz7P^eJw0%T+n1RPnJ>WKq_eu?gBSzObd9*{uI7T7GN*at+vw*$Z4o&r59xfXJ-)w zmf)FDzDn`E<&_otb&-?(HCRc>qvPErT=y*kcbscCZuvK23D#!w?rpV_x9)Tcl4J30 z3NdKaaw!#Qk*ZgkcXr4rDdE$kxLDl+vC%Tstd?+XHQ~ZEYwWgq#mJjCzc=bm);dZL zT8&$_HkWn_B;@c9$vkfjVy-8|5dE!!Z%E`1Z%wdc-`{+XrYz- zte1R_r`GNtpV=Q^^T7?Di&hvmR$q)Co6t6Mh0Tj9?fXk&418jU%!*&u#jYL zm8&ZTdz-xBy5ZbgX)z@gJK%R2j6nE3y_ndJC!IH%v*lpZA5qB1Y4(11fMZZq1_8xv^Ni`yuk#FYIhoaF@ic1I0^V7LWWg!g8TAA;vbCiZ26p>e~$DDysT8 z?JkC+8Iw7$7I)IkZ|fLsODxTV3f2$NCl%FhOSo(WX$K!nIy0}3ARv=zu`yYfP(bNu zyBkPf=#SuDlN!^s-s9ur#jja1wOcL3()*0e%%NE+ZamKf&vp$=-mjLl>kQ_rs*X{8 z?Dx4z0M2@rgf1B8bo(-O1xK{9rJluZxBXJWhcASvm_rOsq!Kt7TY`xqaMjGr%*KH@ zr8-9Dw3xOv8zEzWlnxa{gs}OH-gyC-SZK)G=-Kk_XaV_5sQ{CrIu4W4C&I8V<6lg& z7m}ULOQ}uA-?O;EPo@mbtcPFvHItuzC!a5ijvicgz7!b(enJXLdie6mxXVtbDs{EZ z((U#b=Fs(tnuWJ}dD>@m=d0c43>+4diREV#_EV(FT8?w(QPs!Ddc%KUG2mmfb>Rw9&u0iD0SNy2TVH*Vd{&u#G$ zh#S*yB$)zG$Q&q4Quw{Hi8;-K0pTNvi{7~}{;9xvz9V3^xmQEr6w}LnU~OT?>BXFP9>Jh00K(q`zN2?9QiD%1dZj-oVC@=X}wg3PJkF_eJdWZt!6*d zB1Z0Nqv3WmXE_(8jBwbSWMX2ML0_r^kO?{Zf_E@X=Wl~LIcwuBFr3L^7}YC8Y;A4( z2L{%5#3f!=*-tte?ygVpj+UELcFz!9=E$&VrM{(NLV)P3E4AV>&ws?m3 zX=!(H_ocL+NuR^(-RjTQELx>GC+?8)*bEP)?b7@s@c!k)=-6D@!Z5+}tE0ODTv+=-@;o7A#vLiH-{ zaX{mS+rflAtgw)&9)7mby5V+EqfyN^GG7EgE&?>5i)6n^c3_!yS92Kq31*BBXhukbNG_&~9)me)atmLNsJ{wm^wzPItOPvyz?Y zOj0D7>)6&C;O83c{%1HKGd{=L6lVZi#HqFd-b4nZ?_a7a5Q-$4Q61m?ILkfWnjGVD z%7_3`n%1lLQrP!aKywg*p(2Ru)r*b#0CyYQubi+`*Kpk%sBxWoPWngn zmAK5+13*-inz`T{i11JxN^sMBXF};<^@2$rH=_jQWt{#+3i7B8#OCAc>nskN-wZt6 zc46er)G-=waCQD4Q4+ju1(}gyvK@cbh!Gx~(w-I8vj~W=Bu7Wv&Ukj|XW__@h#}cf zp5<(ONm{*ge3XGpk;5nkgMb#Wm8u;Dsgdxwh}930H=V_gTfz6T#y}*kKE2Jq{3~j4Irx z>Rol$$E$iXBxCN6QQz%Ux2R)p2_>Ie<&yT{h=4vDeCMz=o$pHXERm3N!bTqG78QD-sm+H*Nx%9`=U zeFiC+5Ip-T*!;os8YNl@$H5X1S;he!&jRU5rKP8DXOsSv&fIWnMU~cd{U&}HYWP}4 zcO0u>3y@lu>{|ea;oJOhjm32MUH->jgb=-fMMlza*vwoK65%Z$;js$jU!yt&pi2>W zGY%sEqI&E2GXPuROCqIy$*QjxSP+;xnLL<|H!1uw>IT#m;vO2@HtyWp8R>T8___-i z;Y+z>re;OYBCso1ZZ4ftf!e^T1A&&q%l`iUrkt$gYE}UV$tz<#nF7vEDm}%sfk&?0= zA0Fd?q%{D&k1PIuhqK{G`l{4OO`=uXgJMW;`r=@LdeF@MqU2{uJnTDx3+Jb71Rz9i zmseO#w_bm;o*wh62}i665lrfw515XJZ%|zZ%<%+VkS8#-#$Uw{9U$WorT#4rFA}#&qO4(TxLt~h=$pD@UxQM95baZsn8|UjA zI>YZ?TCNmSwv-QPC6voB0g){!;=`h*{RAH8l#8|LNJ&OB4~UcN{BVZ#%=Z@2ZA586 z%a#3q=PXsU4;sH_0RZR*(!ZM$hBY%*9>NL$!G+JHL5T3U7;QIhMBOyuEl@LcI#?$q z(0KJ&!=_hsE3VrmGh3AE>L8G9Q5$q65(N=3hYaK?w*pvYwMKAiT$NZT87U$&jEsuX zKR;KWI#vSovVH*!V8}Rj+vWZT3u+NVGVncZI6E2e11e<@IYcU442Z3yv$0AG@_=R{ z!$cgQ6shF`BzjQuiE7aryEUt1Vc|NJj`ABP&8c6Q~EG7Uy>TV4tVx1n=4eiVc1aQW}1k^(ub~-srE13UKV@Pc2 z_rDD0A;iEIQ5?tx55IX40>v9Xpei00*WT8q(-F(UVz)YsAoqv?)6udAnbHaPL)z}H zY`{PDt)qn$azKwjftn%7x2U*~OD#eg=w4jQZUCgX)TVXcTXE^G(PG`!#gS6OM4;Fg zw;>2*DhP3j2(a9Wj)=MhqW-Z6!0Xu>`@O$+>Hn^4MuGmz;??nX$DR4+cP|@tRt5`B z^alfQX<86z+1hCN81oEq}c3xf(qIt0e6rg7nn{mWQaE3Ijr8R5^6y@aP!j-k5mkLQ04}ex++sQGaZPWli zX=s&kKmLjkl(oBklFmL)>FMbatRHgq+Kr~`1RB^WC*upX48TtqI9+0gVH^P9%hvpz z{@&WZqmQlwJym><%$t`{EkYD#00S6};p|;XMIxgE1jcwpn&1*v5%LfkMfL`Nt)N`K zdl{ETy#q{5sa=U@`W+ko?Pom8&`_b7W@7!qmvKyNS|OlIe1%Q(awlzsiw%+<3(3Az z?~XziG1hh!Qhm9T?z>OH7GFUsce&}m)GL4sAobW>?xf#J3qjb-c+<%)2Rp=s-1XF@ zCzm?urwM>{N9{!T{}xiekA)ZsYngL#i@HlkLpm!$7t5@WNRiRZQtS?fV?Ge|gor z6krVpxcM)CyQU#jj|3Hl)roZnhiA?6K4Dt3MnjJ_J}gmK>C&It7faCS`g9&U6#Ew+ z`*4068#JL^((?Ng(2nS+(0Q~9Wnj+k6d5?Joxb=#pU3|K4`8#lFyLXhcR-!pl7Bgn zFgGAW+}#LA|6OBzqrjn+fb6bi$T?34%aP+m3Evl6^XPJ3)W3<&aeQJr>6)uMKgXYN zZnrY;urt!U)icwsJD{E*Xe6(NqbWmrM;pGAyEvJ%WL`6}SA)_?U3CN|iE-03(@x>@!CJ1fOZPyysAFSu2lUc=6B*28`;MXu@tW~w1wJW!lh%L01Xcq(?uZd-> zW|PU;PWBKEXPHD=a88|$mc;Vg%hkR!5N6XGl*PxJaB5C{Nm(+ss@VR$*nF-ew&BH> zLd$sGYm7lAkN=$UK4%0{`{gw`lE2{cZ(=$!Dv1;lH8DuD;of?E6_eI*m{}#=^r{?Z zOGe#3=3@@bJNx8)?9tuoIAhk{;;ZbqRBP@Eg;}X`pNl0ovU#lZ8JzWpAT^oOIwf&+MyCGG|4%h~Sj5?VgTwRV4hFH=*IfIgzAI@CXhT~RLFB!G9cuADD( zf`eYkfITRi%T-U~pkPw2SML@3Ju5=WYOLV+<&V8}Urv`iv7r0pZqI8U8mi{EPb*Gl z@!Z!Q)f^Y55 z@Dp+ZYLj1UIO%?O?BCN%D%DmP1}#2tDK2$iJo{|imTdSFx^)>@ z+GI&@)euCtByzXI+)VnaAKjQzA-;Biy2!4z6T;F?SKT5GUwF^O*EZvx!pY`@x81iG z^09h1ByAxHUz47V&&b?Kfn8`;RUFN3}izcPI9sT-oF^uiUQ0S8O zM)A-CQ-}3+LhJ6EaSa;+F2?;X54t}?a1De{_Je0af)BrOGB>@sj@2AkDG*n2n!o&h zuO!*I0l(VKah%0XDZgzPtguf6^6Fl~YbAG7G0lbBGPu65W0(>E+Yp1whxS9;>ON(m z@UT@UmALBf);qjNw6k%HbREWCQDP1d6;uZX>oQ6t7qZ<=G(|)Y7TwQ17JD;5j!ZtM&}0%ynTZ+k_R8p%x5Q+D zoDuh>Yul=vA!R1FNbGHI38Z~7WU(GT1HT;dUv$!v)^L?O7`84urjAIr)5=W0|2oa0 z1sJQ)v3&D_Auq7l9_ml#?9He=>8vm1%&{~<$&|#y(bYxII*LudPKIk6*I|TTT0pFG zgw@)bAM<9>c!AKNahA}N zeeHf*tVShNDA|OdaSO)8%G}pZ=7DB!BB)l}8V8qgD@Jfz$%LeNt^E%oNi|Xe0?qzyIgpkQxQVAa%6KvOjM zo$HYkhjC@zWJz|llT$EPPA`=@;8*Y@eEK&HJhpmLdHDVlUU}ORHrkm2}?i70uc=LsX}H)vUm)%CQFy1 z*wKwSZ0GH63WvrMQ984;OSv-Cr*X_1YKfVBautigQf?~CTh`IvUdS{yCIOkgJ3>(^&;Ei)vgD{ zv}kh40*^A!j|xGPE;brcP7J;I{+=^gE#J&X3@0~dBMCWaaOKSIk&K|H^%@M;u3R6Q zl;gM7V@sMbEo+_dZJFIV)2*xo6Z?S^ZdTVT5GZ$j7IB9ixk5&jAZ#&T3o$(V?jVK* z675EfsL9FrWe*bj#`P6(e=43F;ZKF`-IO` zRf&>#Yy@L?$G~ zp>?|bSYqHJQyZws=*&RJAUYHb>-m=ac+elC*tG3^Y?2;hd#=u^CS`i-etAJM>-|i= zxPV}eEi1$JRy}1n19Ni)mk8PV7ZoT{jdKH%+H_hk%&%pZSdE5lbeh8m=#hLuHJzwt z=P(~9+}qm=M`oOIJ6V%jOQ8-ssQony06$$oOyN?OhP3!(?j_5=i4FWYWPqvW`MjP6 z9ZFW#I{4`~dGggObT-WAiME5PmVM$h88^~tueM#o2btaB>JWPsIz%2+GM}`waNY;0 zE$1?}h$a8Ro8#>FfYPq6M-^XDStb-GPPc@|AT;iF`=hwta28jEjp025V{_E1y3CPr z73etqjh3byFPMpSCvijkaYlTsK&>-u5SU#7-(`l*SB$CQP{;-%71bXbpKixAbVOvuSLuq>5qJ8JU{e=I%CIW8COKJEg7xXvI=yp=S8=lAHF?H zmPhwB{x#vlMk7miAd)7x@Y@$0FhQOGbF=_W`Fm!}!Rx~wedtj0pCJP*l9iiX|5BDD zrd^z;Ojsdu!zrbd)?|{~f{YpZ!=aiaVGEU+VtaAU^+Z2o5i?azZ!V!T5ZB(n0KC?; zu}km(lG6U#-lEj0D>impZ(G4g|JKDDHf1Ub1;kC!SlW%dxdTiBB*YvGj!0D z3-C}F*99F+x%MPq@vLBaH$$BRw4Ymm=DLJVl~Kb&By#$_U&v!bjr_zf2kB?|-5D59 zuO}~BSJV+Minz!ZWx^!kvF%aE1}dh%GQtX;R3xnvj1n}F8?3b+9T$e}g${t%V0+^C z*m7H>Lvf_}?hS2@Pq54ePWiZ zb4vsLAW&h)Co?PRN&-gWw5zWB=pUOp!I1g@F@0adoi&&je>WY)nvJ zQI6GBge~yZyrT}_P7}K6OyXW($6YdhZg6sS*2uhy=fi>OWcoItIHU5@mF^kX#p{^xeT?^8|UkGd`V1v<5U>L|<~xIay5@6D^9SSB&oQ#Oewt5+49Tbg2o&?h zaq+)E&ez?Q{J6cIQU@}XY&jn8*PMB*-P(s@(7IhIKveo8+qthr>FR7GRc&s6@Nr=` zaHcY}__X(^*k*5^%CIs`&e;r}J-#wrc?SfAIOH(3bg6_pin5I=gExXuT8t*>(i>YC zw+5H>ix(I2bQ%XWR}T6h$%c=uk&vG=z5_19y@#KlT--bEv~Xh`C!+KGl*ka@|8>Q2H0;* z$>LrMHQ!w|ilCYK;kaG1QoOAni0`+4g9W|vo>U|IYMy{cU%8;104m;z$<_VzE?F*_ zaVD{mu-ElPzXDcBCYc8m!p#QiJskL&IW%#WKUq8%L!Uk=2@~Za^rb+Ipk%yqf7&6D z(N(rq^nZq8e9+$>ol~=^Efy||{Uv(;ZD6OS4x1<6S@U3!@F)R1_-!Tzb4Or}0b?j9 zYgKzm_98c%ac|-W$dH#i2Sb;@wM@1Wp-Dx9hKgYe=Vix@`^Zwnp zf=3fj#Po}wxyc)dyQaW(Zh;;>bh0&i&=cQW=jy1CJWSt3_V8h@lU>LvY!`+BZszasx0U5)$QWBAbrt`qro*nYJi@VggmnSzBqgmRH3zMqGAL`fv&jA}Ih zGQj?0ip~Sz0+s8qisrAN`ropIR2$^JQ{DPLIX*)Ag3zNG6Wy&EoFtTimf4#@_(c4K zECmQzMU9Xoe$R7CXE8lq|9Z44a-R$QHptfW*Ejy#yS}AjKivsE!VJWq9T2VO;cXeO zX8@%?@^#DNI3`!jy(!0uh`0_yqj6p@aa!YIQ;B`>65bF+%G|8CLGJQ9RZ$LvMbTp~B36!rIkN;kQ{$ z^!5d;%S0M~`n@RrPXN!ZvHU95rVjjYPP1~|mpZ?TB(5+dqjQ!iPn(AXKMWXFBa|~v z4lwcfT=}o;q+(DNZVv8V2_xih1_Npdx8!QX}BR4adf_8Z!&X`z|s0WiKoRf zN-X0MSN!}*Ob;XvUMlzZ1>L`d2@+Jq0yl*68@_N4j^kddx3R9RIBUl(bft^d=q+Ee z+BT{Qy?Okqv*fV1qan0P=9EXvd7*I)=1M2vyd8V!=L4IGOq#Lq*M}FmpAHCb=$+4( z1xQY(HSpYRUu~bZsD>*t3~#M9!?E)$@V8mb~SfaSj6!q4JgzkC+J@2TWtg?d; zUCz6V?5bDK(q`~qlDUwm6c>?L;hhc~uyl+!c09C(6JFgQ);_bgo2f23sZJiU?RMqg z?=YGC7#BU^HA{&S{;>K)%BdQ@PMovvocnb9@wnDYvYjyP1|k=pvWCLM#|Nm8xzp4r zOS|q|uBACU%C;%3&~&GnsfmaDEEtkxq|5KOnyvEP3xKX)gOjMii?e(jex6$Aj2%go zA>9e{AcpiwmC$$L2W_j|GU&1%NUky;cpe&`c9U9+ycBk3;G#nYs~4TZX0%%9V8$3B zxksnXJ&-A9d~Qm_r|+a*xlSu|_4mGfMUgtsyz@ZqoqSG@D1ngw^Deg`kMSy|=wXH1 z$clYRz25o6mFZ6MB2%38@t zeZkJb(WLUg87$gfHN5-mCB+00NmTui%;u)B;7T@MZnS&9%ef9jfw9JW=ARtX#b-Uq z@ML#lj`Uk36y0W5~sG`%Y>1`QUT?0z`6tmd8lwU9Q6$xRO#8}NEBQx!ph*R{uv zCwQHF!8Jn>b$g6g3lho89(9pnKqt+cda2({sTjB2PEGXlyY{puRWj1IjH%mB)f1&{#>#QGp3%ZZaYLPDYW4F&vda{-E zZVYyVdQWPEjZhVgP9{^rjn_Z-WE)4nzLo~;smBbdFYVco7p%`UkM*H(lj6=%P+G6~ z*!imeKi*6~!^LK-O~5ZZ?&KF(^*AZq!#t-(3)F>4yiS!EZA%D~ra$p`@%-p9RfugG zWmXI=h9{lbRFduhSeu`8d3EW$JZ+p8rUxmrPjnY>40Bz*YWWcGq?2=yweOwO4|Vhuq}!3?z^WxDfK@ZeUYOeXfP1dv!SAx% zPgfh4zu<#JpX{+a!Kxz|nVDn(wA{tW1L5*vYP!eDUOKxEYjLQu^13)KEKf%)Dz0_i_9h*niZ5%2AUEA4_OTp6_QW1YA zpIcC}by!%?^l_m!1I4`@6VH9rw}5;@Y@o7We&6dG3kNo9vR0tCJBDXbFuOHLs;QW; zD*m83-RkPe7MlWo%crH!JT3D6q!}l&u9-vyl^w!XJ03+-w?vqwg;sIv3H!C3jJuvB ztu4^YZhlm{LzWBHw64j4ottka@uBoe;^GibLm&4|OsR&wuOrHmw4=yN#a7g2Z{$ON z?|6K7b4i8jY(;)^CyW)H=$h^5TT%=~AKDIPk?#aqy$lTQ?wk%%s3JC|x1&4uyd)dn zt>#f?pI2DBdGYamJAtt2XluOAy6^PaiUU*I4Wh8jZRLIU090exv)xe%JIZq%-qN~? zE+~lcQu1XO%BdS3bj~D3cVDHZymla@x*PqS{#PZ1;Wg`qILYwc8Wrzh?U@&g70xbX z+bf)~8TstGt9b4mmWLXGdoGWnyAQk)f(<_(N3TsOrBZaSS6v0#(5DX=0-&Ow7n3JT z?MtRk*2~qn1tI#0{2)-BO2}RjURrN0Y27{6cW#5ItqJlaW{lg(-7VsA>dscvDE{sW z)mzX^H3b*75STlEP)pwY{+M;{M8d=~IurVQc z{JnR)Ai;~N;;wpEe8X=8FKBK&uUy(bAcmZc$(>e}A+b-fO)s0tdtEi3JUqf>-5l## z+9bR2o(xpyIk-b(`Sz5`_rz&)AcS_4MhEsM&l&&14~EdtQc&2M+| z46c?^a%~Mcv1#DrV-WI;--NFUlD=%f^lZr5VR>LMe;om7HVO*TV;g{B>XnEAUw!n0 zVQ!F7VTS*6hS9iSn8b-3g~jxn9UnO@sMd=_`nawr2Nid?Q)9;R#-0^kt+K}R4!oe5 zsKl^h&yujr{U@-s?30;CO>Y%bRr?#S-OX{D6_}w1ZLZwzVHnb#ZF!i_M?r}jwPwX(D_;+8)Ae2ut^R1^Mz57(i)eqL- z6t}^W7KMX>82)P27`9I+2ES0(TOQFKyZTSRO4&vA*x&I{A*#biX(AwB+z47^bkghE z5BtjKp`_qWYfah;rmUpE1%7p2uY>M@FIaveY|r$LRR>;F(p^VEn3%XRHcy3uJWDix z`SZTXc@PaLFFN!_+lV$<@8^k>fRRRh1``wZiUJK^47}$F*Edncy#zS%>(K?~^@Ba6 zsgTR8+QiCP7l@b$}yrW-mB{6$L z7Aez|r^3>W65?hJQx}FQFU!^Q6No-HF}QUIe?(S9E#;e__f6T!&Ga!KLxt#(`o4D; zew14>DZ?dXFN}!q)&{iHocJ`?KP7P4Zz0J2r}_dp0T+sHQiHzt{+;2FX?>pjJI`T{ z02bz{i~g+sX^JfRy_@{ zp2Y&5I|9T$)-qa#S0{WaF?pQM?~mA=aq;Qt@dqahXzvj=9uTkX|SfsuZ_>I+ykqy*WF~p~@@u z-J+t~(@|~jCd=su!iv6N;rW+Zwk(1A<_{VoB_ff@Ka9V_2&=hvI!Gq+#ky<4?BE4z z-=wYZpk#9x`&&66w!J|XEUp_+^DKX9NgLS}WLLP|q(?Fy(No~8^igT8I8(V$<0H^K zbjpYGE~(HjpcDkl^QQHd(yAr+;eML0vc)KfZi^wEWB+bYuAjxX!;xXpbaxtH985@G*SiHmFW5h%{$}i*BV6i;&0WN}(2B zuD6r8FSzL3jNs8^&Iju2Sj#;*^kG~1?lIpMGuljRkG{C8J5?Vw6hsGRx43iLyeD2K zI6s!baj+FdB^i8a#uF%QvHl9OY!eHEy>l}otR*B-eD}sw;wm~sQ-}w76wun{c?CeI zUHhT3S7ZoUWqvae`Y92B{Hf#uV!dd?inth3{GREC`8sKSN}mjkimQTz-jcoub_V`} zz>mKXK>s8^xa~D50WCst(wm5y5?9^Ej>LSeHYH5QW-JKFSmP}cJhOW^Kd&ZwL#!J- z>N|wPKXT10_-e_%Qa|aa$5fpHL=nRpdwwqY!~95yd}M{dpe`wLL!8V@7)?sD$ zn&`O3LjsjEDGEQ+EwONb;x?$h=LC>NFK4bvE7CgX6LF}ZNK!xf+y%^bI3T^z3Th7S zrTqT=Mi~cZs*?r&b5^Wj*jac=QR@MNZ@BpOpNrCjs8ihL(9=1R(tc0G z8c{jg>r!&1sBrwsN_t4W3Fh>-M*$x)$N62|i08ZBVK5#ek_v*9*C|=t?;XpD6y2Th z=*@ELtMBr_ksk>s`tXt>heH)5;P24Hzq@TNe#R?@?XA$6cDmqkb12fEg}J;HDU-;f z6NbI6a!d~RI7ztl-S@Gwdhh0%+iYzuzR#2zb1(|uczo}8@c=(|$+RsMKPmE*T&77p zvx2S|LBhzeMnaI|Gb`0+DZHWBRP}Me)Si=@uZX?(+cC0vBfX~ToCc1oHiJriv98jxta-wVv-eY`qvq528g`iO|hW`=L>BKp0@gpRf{HO zg1h@mON4^s3evkR1K|GkqbnQk_jk>2Wjt%SY0*si;rl{_CZyjf`&#XH!M&6%`JD#h ztziqCb!NFy^;3$#2=2VFgA7HOn^tW7tGl1vxbd|bZ+vSRP}0a1^ehPtdQ~EsAsf)M z*lhK-K}m0KWa$Rn-w>O9j9lvz{Z@-2o13aPBRN?)dNii!=Xhxqs;%R~iF3Y^(3`p` z!Fc3NjoQmznRWQQg9bC%il{>?0o48}oJ5o6^XTs?EmHRq&}Zwk^>7(T;YAj@1Gx6n zjO<+JNkF*vI7XiJek|q;Z8~ZRg4Ate`Qg4I&a4C6>z=WII}2NGy`c|f`bC2Gd$ooO z7xN^;MkKLKnPXZdx2j_pGDN~1pM*kIZuJ$=y*+MC{h;CB@7(-Yq3{inhx|o~?z1Nk z!e*Oz0%%up^$b^a>BBq*WWgw1G(mr*64QbYZ8S4H^be|=(-(`3P;F%6dgL5B&Ft<= zaELXk=ljnNsiG!-_}lbg+?W9Q=1ynGFv%M5g2{MgZY{RPj@6SitELf zA}2~qcj`ASUzVl_zKCJ+U(D>7m4X3+zXs zOE`?2rfW9toUn%m=z~gV7~>BuR)w4LEA-E@7G;P+Sw9(E0exuY2ND<8-cI zq#`QJ$9aq&j%{6eB1Ou^NkB81gyAP?3|I9`E!;pN5U`KZ=#&2_SB?UPf`4ev12st5 z_wJRj^8oDkWPw}oV{|3{?{k}5HOKm7gL8@AVTvR?Gm55ai!-SOKtPj4<}1bA`U?I) zVxq9^&uei~si|`Q?7DY#8X*r6{iEsc8xK32@b=u@P%PYZG)>eQ*qpA>OlgPIg1+wy zvv9Lq+Y03o-%gqGvn6ih@qz&(*pkzFy+_rzL1qkEetQ{!zS;P^_cU(Kq4U)qRf+Ok z+TivwmRQ@E%tuwm<8{?L`%e&J!4>KG$KI2ZgVs*Y5}d$_`?2monvaDovbxTc4$QbzJk0(7C-7m^X_-a`c@&kiujp) zQC81QrvD0 zG;K;A?q(<6RGH*ZRmR8{QIK2hvkxw1LlP zRin!HNxfC-t{R2pq;>UVi^vXt?pN^0HpwAm{6UsqoiCWZtFLsoUU3>BYzO5>Qk}4Q$D7A_vAfxZ(=ZB)z;>QA^aO4 zmIH4PYr3tgTka;Y4{vd%dEubSbbXMAH3KzKFasMP2D%MrvU@az_$q2C@R8~~Be>fO za+4*LF%^MS#CscKMb>7LFB_$?*sW3i)or3RNdM*n`%}0Gm)BDTC0j>Ehr5Wf=HAVx z*TqOXh1!1s1J2rr^ZXwJgYyCy{K_>#{j2sEpOaQn^WRGMbgOQ5Tup!TEfIltPjr`1Xb!PTAg;(5H3WrpWHXOPt?EqUiDf>RH_TjVVbaJ;13Hr+O z@abuSM|&$>Q?2$52(4;-yLj!K-(XGeqnF-6p_@uQ$egySpG2-fxzxwJP3Ffik7(S35AGC2(A8L2r?d&f3Lu9ol}Q6q zV!@&xAT;`Q*9)0VoqVkT9O>BkD^ zP)MTugrauMKv8A`Pl*(7cSdk;zQKx)iiHP7q$ZjOFfn+qdZgr;+~}X{`jlU}(&1&j zPUYN{^*k+zDJ*}`xacJ>W^w9U60w@i^i^zQR=SeXcTzcRsWZ#6;dIKfzb|kCUFxR^ebN8+90d>5i2Q%Zp z-G}%kzdzhdjeF>$-_-Uxwc>jwLi5pU&dG{nD~PKT>?hHGXV8Bvdr`w(%ViH#=qXzW z$JMgwZ1wS3^y#6+Eb#7rp2kG`(87eDqkEM{smi*-jKI4C*GZ)P!3T#I)GpCzGhyW0 zw%JbQgqG*@FLQ{i@{wr<535S9XciWu;WavLe(mi9Z7cYbJosiOLPIST=$x#=h83!1X-h)U6)L!)aXGHCIDYXF8Wnh!= z1D6WwQ|=cndBY_=Vl6vE{w4i;!$W%JJhs;b90sS>t0&Q*bQlnHFPl9cBCfz|Ik%u~ za{9yw*eq=m7ksb!0?!3;G#;bnpKR_IYPxWN-N37uB zjJv3upac|!|A>F9w?-b*C)7tF^G21iPl^~h*DU)m5ymoEYHanfrxbcY;1%dT&2WN~ z_FP%}G@{P6+t-p(LXY#Y{h%6T5ffVIjzb;-&C}GAAjjgV2C^pbiUTeQ^fXJUd~2r zJu&A)Iu`G4nghxoN^CBUNHifS9|C+gdYz7Pn>uT;_gb91p*EANAwbc`B6TYP#&x8M zVZ3~f62nwE?c0=npT^DOP%I;9_%)z^g|zR4;S%D_uW^{tf}PK9ogII1sLH-0dC|8} ztTy6e_{V3msD&uwcK1rV-a=U2-p94l=h5p>6qwc!?w6_2#{W?Ju z@|46!SvIc8E@8dsfKgj7Fgc0AJ+Q9W;#0A*|WI65bml$ z*r}I)NI|yGE<@TWX$jfgSL}C>_Zy!mhbSTsM5Of+zuz6w94=X-1zFI8?ht|$=bHxs zvrgg2-X_E|DA@a!eNhS8PcjT*MKo3ZSv4OAValTRcNRY)Xgv%MLu9o0UXxRxP5O^k z*o+cM+46h8H!rf@R7jj~R47|O%JzCB_^Qf=nfzH$$&%|gZ*F;+c^2MKa8>ZR@e+dw z6jhn9mK^G+zEbR%Su5GBKC+fqRh8|o{1_CKCWlf>cM}>fHhgY&9eukZ{e=Y{C~;m4 z$W=KA5>jq@tJ|9vnJ){|aplf^$PRz{BYU(weEvm1@#6Hje0fca^gtYDCr*%Epef8c z1Y4|4>XGGia18b9{(P0g{r&NTct0Czxqvera0{(`YzPopni*fOn!j>hOkvqdaX022 zmUM5FYou;((1rBRO?2G^DrgvhA_8x0Op$Y1OjvOVGopwMT=WURJO1!I{$r9(A?`wU%?W`axxISK@WCax$R3sQG{F-*R5cCilaCypqj}^pf9u zZgyr!F_Xag#DLsC!?LY1RF7(cXT0Ju*%1|6=bg!{XeM zHBdrAaCe801Oma`9TI{DOM*jy#@#)*G?GAY?cnb28VK(0?(T3uNV3oDbLPzKx##}6 z&;G~LbbsBeR;{YHs@__)UfYUur|B4>2tifIm+)f$5JZ0&HT+f7z8tY?8~;xW_DSxT z_cp|~qnj!y`ctXmbU`=-!(xyAwK)NyB8Ij6z=(HpHBQNAQga2Rh#`&#&s+#6Cv#)P zpGZhQO|I5f%R7fs%wI=?;CA9%kXP0`g4b!qd395xMvVFKG5+$2#(j9?&FQ0QWx}_D zY@>xa^Zl7}Ao^-O2KEY{^C(eEqwW(A6PQ!3pMZuQ?;g!U>#Ea_%DV0;-Q27ZrA!$u z`Eqh!?u;8PUA(9Fr5W|3Tg|l{B7P-$b){G}4zF*Dl5yoCOd7})w} z)EdwnDRGj2e`eblsZ3@av0_KI8r~nCO}l>iRPHvZ#{aCJJ6UehJ&iqu?Hk#a;5tkg z@m7th2m9!bP;F&bvb-|c;(Is0+9usolO6dxv-Ez;(E^j&D`#tsDo2CxalY%5Lp_j! zqkI7jP{`GXS$ZT!>bj<1v0HaZHf{UM)cd=vWd**yH}%7%${Ym$xv3|=-zL3IDHy+) zuK|XK^+@;0#405%>&}mu9fUvQJG+4oKf%pNUujar6hn-KfW$=A013zS3D%Ep6C5QJ zgZ2Ql&2?xW&o`=vccBLYj8KB5Dc#0wJS`*HxpW@*`^9osS*4s(Mt#54JIlMZ1!*a06Osu4(3mURe z)KuP5s}$>DGvF=2kpGG;Y#&$69QAVb#&Qy_QBLQwqJjg@6Y}BqS7PkWv^{?N)3iNK z-R^gHF&dB?F-&mpeNuC62sah}qupQ<05~bOunE0ZxO@W6?njT79&@YkPkOPs zVQ81C+f$qHHa+W+vb@9*%j97BP>$F&o9CWdmlem!%tBrJ;?5PXeSsbz?@JVb3qpVz z7zNRAWUUe60(O;WY6LPcC-#L8wNxiDQrBd`#};t%)G?5X+Vzo9DbdO)AA-ot1e!mU(5{o z)4m;ezQW4YHmngRE=q{=jzesEY@^O8e-gKS@?6i%hrHYgI#!~r$fR}f9@s(_GEK&Y zw9xi8Uq0&nUZ@ZqUYoxKy{1ifAPlh;{P=$UU8Pf&ezuQoUh36l$Bd^Eq38%JE&>{E zElhg%==n1oa(=Na=wwy#XVqo;69k@+Hn$5Q%^?odpU7!>{te8f!hP0k5iPt7R+I1@ zk;mQ;63=nyr*jUIi8smpCto^T8Bt4{IG`5_m%YE^kukzlHcD4+=a{7*5ws@DDMKga zsSXlPy1U$&sfxh+LJmOCsTdeFr2MrDcKZ+Jb6=R}BdVTt*@nB($ZHwnCAe6I|7bH7 z`%k=&N8Vj=USk!s4Q=zlfTNHb2Vo<~)>@Yk3KKs6p3x1}ptyj)N`rdxMTT0k(uXVU+oSIO-i%Wzud_eeyjU8K-kjR0B5c&N)r``sNhV;GOxgeCtGUSHVzxQco2+57wS9i7^)Cu_VDvY}DQrR{! ziBIto6V%%(czd%zpv@hxNW;j5fd5@9G^gIF6z5XHOjGP5)YJuMj0?TDn8khGj;HHV zQH-^35=_;r8j^C@R8jjA9&d4>PC{i6Hhr0Glh@Wy1OD%%!+UZaVm&Jq$c+rXxDN!i z8OO6T#!nDtZiOAF`hLpA20RTpe5aBrYy$;Bu|DL(vKyFKeJ+GoWsqdhvz0o_1`N$D zyuw%SM)+6^jd#j(;4WA_f;}Npt?$_MpP|5Uig6$gMdx63kJCB(-*~*D8>Y~TE1m<< zWU;rBQ&$tX6MlLd7Xb}J(bb*Q)rx`rS2URI&5 zYAdD5#$v(U1&ZQ{n{>`M2N)I)q~b_f6wnpr3gp*U?)ioz94OUUu@65fYjrK`V^A2k z_S=nUw$F0KR!TWNFerS0x50p9=*%A1a!Gg~tK-Zbgwz$Vn(AtN!7VzSSOa+j(ltBw+AF&9&3S*$O z2zo8Rwe^A+h!Sb0BQHE5hJ2JK*L`c)4?8Uf!-}*h4ZTDHzodV+65~E&l~t=mAxyOqft%|$E;M%RK% z#JIeL&qSZihN8#$>!bK<)Tbrk!Jd}|Rd@2aSuJ)s(5*)GK2AIl_jWh}YnU-Bf z%}M8*non2Tiat@7PYQ|`p^4dCtscJ)zO}PHS1Wq<*TOAp^t)n>SL1|_-%qMx%J8H3 zmnAN(Z}dGFe?|jiZkC=(Wok5cB~YW9H{3w3x!@qwT%7$;Znx-4lR!|-a6lkCY~y6J zoOV8T>l@PIDii@XjUR7b3lCfg*jGpE_$#Z(*;&%C)x>xr=%|-0lCF{qk2(V|=D``A zr0_(2w}+WHXu(bH)B)yZ*Uea9zZ?a}^d13in~M^Ai*XYKgT*E`;iDE;ktyVitR80F zmORMUQ*K~VTr^I6(d3r)m}{C=V%7O#Tk}WvHWD*530#m9akM}A9c!D@HD%4>rtB!KP6R58n}~`I zeDRw!!fvrZ6lwC2e3`h8sHIZMu9!^b@Qlsclv*bo_xtj*S9qJw&n1K)1(z?^;HLA& zf=b*FH_T1VOxjuxhdK6c^|YGRlNZv4YvUh>Ed!w0X>;5td`EDx;-ki(f?t$@krpqvg^XFshc-%-8w#(0V-1?Bq&PVeEHSkuefl??mNs~-adF=r|hl&%Hu9Hm4zU^p8 z$ai{Y_cJKhg1fB$niBvGWzIe11jValZ0bXA?$tIGX%q|u9`Uq+au*cB5KB(*HXcFgU{+U?m$*_h7Npj$Sr7?K?GP~b6?y?$ zN=3hEv$8n_Jf%$3ynOm8XM%;Ceh3j>yyX(*x&ZwqYFg|!7r^)HhikV)Qzfm+c9tc- z8$4mEGFBp?E2_LWo(Dc+%bbPSf91$|aAV$`I4(WgY-k!%f8jy~DgRFQw**Dd8TXV# z3FMx}SzXv%LE@f(gLqkZKprE84B7WN|P;?UE9QrH zwC9?7=y_$c-d)*X==nW?7O?hI)8&qL*52(HNQQayzKTNk=Yi#y{szniRCPB=Tu0yK z#w!4VTHdMJKG68*OEft$9UM>I`E^pivx=uJEj~h{sZVQz_^Jxw0jv-3k8RzLQu{Je zDy<#LoY78<8KQDG+fd`3^0KWuVwOCI)4x3@2^ktPh0bT z!PPEG;?udhJ)X>1^0|0Ng?s{v@jQKklH~Pp5*77c!5Q4gEUcyPO&9qjd>dw4DAt!n zyh2E)n9G%?XoMjF-|Zj#6~%mjdrym5wBC9cAV?@JP~X?=9UViTd54RkgrvLfYxYHm zslSkVMg;65FuUA+4?&c>=SFZ-Vv7)@jSb-1U8@sm7iH5L&4s7d(_@t3kaM;;!2Mta z8q&a8&5<`SG+iyt;UwhWJEn;O5nqpBE3J~B#&$<-lT8_Lr#W=ouGq|>%K3HS-a@BO z<`2l0u;SFMG{yF)s>WJz69lM>4($f^8)q)8Z=sODy&k4G#n*VFD2`i}*ZgLpp01&2 zOd*@PNZRoPPVnF|HjE5?W2>eLdzdt@rATrzD;LFyln^}iN%F^6x!iXKprML-)GI!u zu5Zv)B*lde8W?mplR)Wzf=9wf%;anKwKKW8S_w|8TGk=wJH?Rkj+awGYyB9gGIk~( zPX@`8P7XZ_BmqVKDh$z{fBijaF2ZrE%LP`~hW%UO%U*_@cbG74>Gpac7ylg?S4Zf(9_=RLS`O(YJYujl1SA*}i4=W=Jmu`s~V~};@ zA9T;=wO`EI`^TtXGofx;N~dgg#CwT>Yt{JtPuZ7}#g0zVr{+j2k@g!SLr+r_S;t?~ z&v`!jN)R!#cE`^Hi3)HHtpg=8hR`}+pm2Yu)Rlc86%!nxhf0tQy-{)fJ)QYiszja! zH(ZY%*=xb&B^RbWZqKsS>CNNiP#wjmTCZ_L!ay9IKd^!y18UJ}9(@_zN4)4aBP46e zFyl(n+pRLVK4RMi_ypTfa#$rqgg*L-3T8QP`&FxWoB;0qLc1Jk?J(y@siVe?51H%Z zwe`k)fg*XwvwjyqCdl9IYs*}n19z(F<7t&+j^eaaVTg&1gI{8pdpzz_U%1{`pp+i} z8qPA(bh4Nhk6`<~#>rpGdp6v65#YBgqpj;GA~V57Qy%%%dH$f11uLjwA$Sd~Wrz@6 zy}>Zn{>j6yDp*%VgrmO4Ijj$K&JJa6gNLMAIcOijPVvm0I`c_L+}OCr{=ZEV5T0yJs6wU(dJTSi%gs zx}vQl189Vc#jvH$0-n{4PC#z?y(-fxKWv4A)mx1eW@Cm_CyU7@nhjd5)R$|3eS(T-U=T^Xp{EPruIUdDK zr|(#sbEIDBDL0GZMisU`|1C3L<{82)Td9!W2nxVUbYItkOPmiue;DK&^rfQ=1r!`C zBxZ>hH)LPRp`M%Fkk{nG;V@%7V@5Sq)4Zo`S71COM?-0kr$utk5O*l+W5;y8%lOBh)t2a z)($bzH(sbq<>clet<$$rEMjIRZpgg`9l6@sbHxs(K7WU;xM}Y?rSrzZRGec+jLs)n zu3E;}M~qtl3x>87i(s1_P1uL(Tw}lO35O#_i`$}@sF@2gYO7;!B|nMxIVNe}o^g&Z zzza$0FJgaC1>;cQ@MW@=UWJaOaYg^h6fWc_j%40$5ys%X7|>qP(cEG1SCY@vxOad= zLArhZ7yV}E{ja7VCtC`Og1 zylFGThCT_yjehABWaUtK7H9?!C)bnoQe>5dI)&Am4rBUuEAbxTn}PCEXq??bWCp7TK$Dd4dkDRrsSFkR9Bey3gcp!x#;%N8y4mnf=)^^=NqXQf5BI?w@<5&K z+Rmt%iN&#e$wA{UlN&K-{ENUmf&Q~6Y^bNx>f3LE0UityjJVSi25QhG zfJ+JRSc8?jSM&J*K2&2utGXX>s}}nYUaZM16mr)ZBUI32*zz7i_c~I-m^B342Wk&B zBM8N2d5|p=O}V$n6~`Hg5^wa9P6O!JAtn}v5R)N+tFB({3*o{57OxpVyo&F37?C-J zw2$_!>liuhXX zZWn=xQq4Uu!f3_iU-*84uEov|fYyXwA3+n>um#~fp=HkiyWmZ&OJpxLuFM{Jun0z&0o2{-`L|UF{ zO$V3Y(`%;7vs?Q_-08kXaMGk zc@q`S9L5gqm3gB(y-~fOr(*rJZ-vgcQ;NOBjAknKb7DJWXOvddS;fUQ4P=lpE3)I% zmOkS(`KEz}!19UZ(3?CT)TRXFw)p&*C9q>g<8R!sb7=?~at~+34Ar{f!9Se9AF8J- zPO~*ZaDJ}WfJJ!RQbkV?c2f}!Ip1xwTXK5QG46`Qiu;2;EZDAtrRA26I9uo89Ni^x z3P4sXTjCSJifT)C$|lht@r!ek&^DjtIegLJMzK*Z@o8{m#N?-8N?PQN`xJiKX}pr@ z^n~Q~?zgc77}K((G&17s*#SET{q~w7^cR*=IqiiYcGsy&sDh(--)4R8S{oUWC;P|X zS62}=%>KGI#0m6Jr*aRXPK=)nxZ!$2$>5^mF_ojm{#MX`RT;0PziS^nu6w+Dmwdg~ zT%up<%(-GL{OdKK`w!^!J&ZgNhTvKiGaGQK_KD-w1PX$0& zAWpS_T1xs(4MN-x!ErpK=&nV$-@UnCX$)W{%gx~c2}1PFdd5~UMp<7!QF+Fq#B2M! zMdxL44psVZyz!;XYWkQ2$ZBxA7cLoBJ28i^QI499+@d`#_#5LTtePkzzy$u3kBPDg$+kNXQW>Y z@>J*cDH`?sc$_(h`B~~O^ul;lQ{CePK2Lz2yJU6@qCI0g0c|Ar~Dz~d_+u-$INc9`>e>5 zKFkUwJ3Oc0IA&#HR#tfXO{A>Rj*OS1Z+#xAJvzuqKegw0@-Rs8W&ZqB7!Wb&OQYg* zyE;?!C_EFSqyQY@4+f=|gXDYuj1^b!S&?wPBr->CTq*}L3=(+pi4=u_l2&^HJQ%vd z^+5z_BxEKIZ0*K_a7f9gc?orU&2gkFBs$>H=iRQk(HqCV$fi?j%4QBXMe2+uoaY*{ z>sH~jS)O|{X2$Xf*SkqSDMM!drO%>jyVLN5BLfbuhL3BW{aX3?!bS+NFwW|vhg$i@`(H0`~ z#IRw+z^4OBpb}l>M?Q#J1YW|o!Y^=8t#0hc%k0`eT^X(=5O`R8i%71`r1!tC~|XKQ1>;PBUiIf^M18pTP2A_;}Y7 zc;7rR>jNf}l0z7;*&Fdr<+HO*HQHMTedS!U(7%Gx>=?9Nw;%RTt$`6aKD-Og_YR!0 zhC@vBk`vAmw?^c5wj+WKb_SFFSR~2_6!$zjqk6$QE?hSyZLe zO;VhSk2!k8!Nbc!NsL&N1OVs^A5$A5ARzWUYZ4wiDB0#r%4LH^mwDN)by+k~=TDV8 z@yUGCZnhgIyq3t%&v@R2cCl8Un1Hp|fv*W^YY3hV+KEj(RMYkrq$!s7>%TKoBgsWSsCQ7C|1?IVvSmGK>b!MqF-I@ zmjC4we<@ZQkU%5HZyjz8QptgL`YbPN`}(^rqR@ixK0;R1i*=P6ll%OerYWXM0I8i< zpoTdcqDNH^+2Y*TTh$qKQ%tDR^|=+Tmu{NREq{2k3Eu}7!4P&fMRihjU*^?;`JA5g zqP`5ZB;k_JnQE=<{uT{s8yk2zmnkIcA>7Y%UY`igk^Xpqi%(kII~Qm4?4*-cjDTk&-q zmBXzn->}dFFH>h$S6tb(?usezTI*6iA@yq{IXq6mrurlJAnYAooJeTxnXQ-A0a-KP z>>7Bv)-95HgC?>4$pc}Kb)c;nC3@GiYfEoJM=tKR?L|2}vl=@u+eTQ8Bm2Pz0$DvETpJ;!3 z$~CE2e5sY?V${;3rL39Mx@8!hiN1sQ2i3E0 zL^{)`;doNCP!63ZY(+KwWFr))-3>4qfWgVs2;d1XejI_@X4C%84A8j0-#jDLW>mB0 zQ&-z=hths|e7LxJm^42%q$6ZP^bKQLevM#q894HA`|z6zWNC^j_AUVaLvwe#(2hAE zSL2Q=(U(?&rDQh&G7JH76;Kf`1DdGR)v`4^FGJ1URP{=`Hjk-Bl^2A>%O55qhBOY% zkKE?*I}71Hu`jXq8+guf-gO>zn{i0pSdjhkqCw{n9eeKE^|lz%?Vu~3kDD!d`(cCF zz}Si!hVKj055>yVtmJG47A`(weWcB}8?r~HJAyylUv*W>P``VBynrUz#dclMG>6@8 zzFkYU+NDKIKwN{D+U@AYo%=bjVTWIS4wEd$-+uYbYMhyIJC`|)kuO(#ky}~@$*w5Z zp7wVj`7d_3uj`)vK`*~&`}Gyk5kH9fBkfAi-VKF4efHKeb7K<=; zIh8fe=JGn**TyZ?TCE}Xd%;*5hTw)bx%J+e^od>cgzs*R&s$2t*UysWHf7u zsF)kV@s9<^m>cniWftU&Gg?k$Hl@HmSI~zzj~4_fBdx{fin%W;4pAc$)*AB;$_7;! zST?F$F%N`lL(N5QxG@UUa0^eL4!tu_I8fDfLQzq@qBydON2K9I98(~OAo9&EUgL;4 zU>Kx%;LGi^9^Bfxnv_U`5ohPpyeIMRPnE1d>V3E`@%=ZQxq+AdXSDCoYeohA`&jnr z-(yO9&=E;K3-u;Cevo^rwI)oNCd9A?PrA*3tZINzVSAq2?No4!G#TPlH*?0Q)X9M=Hr$-wNb4Grk&}>cD^I zKhRVwm8W(GXwg!A*nJ`(EE6gfCL(m0w1D(BHy-_`4~&CcHoLj3!qx5>LzOye)O=tx9=Lf+Fht zZWOdons2MKYGI|=;5$11qtbfqV|PcMWp<8H4uSt88!T@z$_q`K+)Ry3sDS0203o`S z?1>mz`4n+!QxXZ})xM!2e6n>en|+|`VO4)88c4;!Jp;}F&{k+w2oDZMZZ4JyetYrg zyV2~2z=dgz2BPk*iZ-JQp&u4sORW2{7v?@1(VpzwK&Q!IlX~$IB8e9lXTGAIoP(w= zk8D;j8Y2GkWVLy=o6&p0!mfR4IX3{|10%}>kSn@pDd?2ijGcAkKRuVAue~~bC=6kX z37FYLpav6|4d@As1i`;^nQFYK+(f&u=D|n|6g*o@2)(LBUZ-sU__qJbd;AQHJMU{) z5potBzuz4N^Yg}p%ECV=g8~`=>EZm%VzOM)%N;%uW85+cpp;7@bVVE)rLa3v3=if) zG$`8=Y1zXIk4{IgJ7ki;t?Y^lClG>^>8wTffe3p{LfT7KZBy3MkiG^#2YNap-cCqM zn=5Ps2q4ahmL)(X%lU%FTF01reoFwDcp4Wm)4X6i*Nj~ zlf`DzyRAKznA|V@>Kq5kk%?u3@f%y*B?k;Vz5e_j3}x?EeYDRrgA~{6j7TB2y|CC$ z|DH?lPJJ&3MJNlj--59ImBL)Y`7ea#A}RndV7q}?0cAa2qgKAOPS4hA#fVh;Ycu=P zw!`4gPIbOIdDZEWb}&&if^G6xfY?vNRj7B6MPmw29}h~f(ic#?;scI21=hN;Ds$?k%8hUK^CItV_kkw!;E>)M-()_*%?d78 zGZYFu7k~5^_0a2*0XEyx3RU~DNYOwBGPsD;QT8ZrYrhY)Dl+i_i9_kFPf^HmU*u>* z-Co6NaVo=-ukiP<45x3&W*on{00~C-&8+_p(j0l+;oMQoL*2yR+b~u6^CG0x_?s5jk$i=)(#?5o$2cI9jj*eZ_Lw-vFFVbcwbV+7xz~R#( z$CSUjqGu@#sd(#y7Xr6s%#18>s>IuqgHORou({{^GZi?y6YYML)Bz;W4jMP)(=L4g zKRF=k`3zPIlLRN5Ngs2>x_yBc@F%-ZA8QXP0X`S=-Dmmb;N*TfqYWyKtOx+cFx3J# zJ-DE^+eI{K#^Y^=0{-mN`B|&XGt!9Q#{t3+d zGe@|)nlH~wQ7_&guTPAQ-S*3|*p>kN5^pPpp3hTdweR*Th^MN#FG6Dmrq3^Hi3wWA zktF+4ql9lHW;Iw}?IVbYeHn5}M}j{UCCi6IQ;xXw`yI8XDpzl`l1F_tal}Vew?G=5 zLA10CE3zv%b`Urq&VLG6Y}yMk(2%R(M9)|9>t*|o&e}6rP&ivPKGRG+6a(C!X#cPS z|GPQysHVNo!sk-?a)8@>r?u_w^BAK9}c+kDfPOKYNEiZ5v^rwdy4MC?hwQ= zLP6l|%n8$#7WDI{v4&E%SIjnu1lbt4!Z4Kd$8%BXiB4Y`Vf3X)6?h$PN zeNKevLJLu-^-~wn1f(jzIhXMj8q)UtNDOpzS&x%^){2Yf4UzN>}}O%qqJ07H$5AoBOd*rJm@yB9>wa$hPvik8wGQy zq1o1rJ=Thhvw&lfEl`6kMQoUK#_>15FcY~}eqB)WKG)OxN#tuEeC+(BVnk!lL>+Z* z&x=u;1IKbkG(=CfpQIYe>CS9pQ^FNwfLi1Gm5W;tsP7bO1~g@t^%P}?2kwO8Y`x#| z?oeCNn2pMAFI{L2y}?Ixm<-PSOM6Cnzh}JIGts~IjPY0QZ0En{&Ndz<%Rwd5x9?F} zY6eR`fNKyFX8qhYJC0-c!oM-ffjjrYMtng(vT#}1Ze%xJHTNk?K&)@!l}B_3<0^66 zRUN@GA+(5@*_j=wr2S%CrWE_*k3cQU;v=Vz*GdD6F}~I)4LAC^0Mdzd329JE^Jsyt z&!WMEg5IS0V|`b84CHNW>ICr_VZ{F=s7lJ0rH$Rh)u*?HAY#*!=DN zzO__CtcWXI$uK!P$$&W2Tdi4$qaEYTW`KeAPJLX+d5A>y3qIJcuTDIBW6mNl z9F^_A;s&m_kcPFnXK=^p*{qI;$G&z+2Q`^4xBFHFPdmESsb2u&p-ihFAtX~`c74aZ z>INlUsL#BF-72vHQ%PZmo?epep{|_HG;f-(sB*>C;>Q%FH*ShrnOOOk5eL4Hg--Ox zXE>%)%v603QgDTlhjP*}pZye{cCAYaRW@rA&=m6_o5c{9Zu*eo=unh|`SiM5rhjjHD9ul#^kOuA`}b=}?h`OT78IyL$(1A-f5#KSvThTbCkZf7 z^hMj%HZNKJvJ8jR%LvQ+L&Z3cBr*_JSnP3X`^mSIJ}URLT;}=XDXl|$AX7Duwjl10 zv@3*?=0NYuiQ(CI3u;N$ePW}i(usx{?rlIC`J{i=;hI)7Sq?9hNe`N-ju|}2TZXl2 z>&0zRuHxj67Gl#O#)9Qk4CA!WMmA8C{!|D8g>q{Or?(P=S%sP}e9XQMXa3G)$hCf> zU_X}m)xmb5NprB1V3Ih{rKqx}(ds1UGR_hPOA_y!p}_~bpm*a(aft>hF*jYFQ6-ur zS8mjNTCs&FL*&~13PILy(T^NmIFBN5e-QJzYh1A*cr?eK&c2oRs=YPH^Wo}))slhL z84_sU&SzIxSd`i9)`{Gy=7vsWbLl`DKWREy_W>f102^0Z3F=f*hD zHrZNv{K)$fNl?bF-=N^`Grb)CQ8O%LG$3dI=+o~y^X6@%XDejBWHCH+#dTU83t3D+ z0Z-IsKkKn!BcI2g?6c>%$y1Ek^+AQVy}KUj-#N*s`-U_+jNdWj#;>SQVU^lS;SXCY zPN%;d)%SjJ z)darWKWtvH$2D?MlB?+gIPqsD^?g=N@O!y{4Z9|jcJpEwU3%CjPbO8#QFi?3jatfP zITF<-^IidvBkQ%{73JJ%yZM>TWMygmwCD06MVQ@)BkwoBUx)fe&%mQSsfwyXX_pv4 zXKBhxEVCLrtd91Zq6-@T*xr|MG^6Ykn1BQ>bFRd7x;4BpC*(lU>K|k@bSJa?m07ZK z=tcj6#yU!h>gPTlG(2Y7LXU=y;}>Qd(sPX1E~jeBpv(?4M;sKTaoOpA+C8z z0g*=R+Z^{;6fJalMv0VNj}R}d`Ft_K96AF#FENvszOdRiH5v`muQipnoqBAYk-!AJ zRSIyVq#@Hz<(iH5)yVe6$Ue1Q=#?C(KCybQImzX9LM#poATB3_OGqR%G#te?W}2P#8yzPq|S zEa;a7KgG@dNnU2c!>36#WoJ5v1rqa3apKEO=Swg9S6Hqoin;P#3a&Xw(MqAM#uu&g2W$ z6JSP&33=sd&*!lk7dU0la90;IFmqRPS2I_~MLS$57diE;9^UZq`^H=K#EqUKMb)uR zAH3fOC+>hJd$*GyZf+DK8aC2D>{%#0E+^Al&o!cmC}IyW^4p71&A_WnuG2(H@A;~x z72j185J(*#48&6`e$g;OUJ((|LpI|fjCDOztr;dbc?~1L{b7H5%-jv1h91w>dAWQg zF%iSl_uF8D?~EV&K%loCqLiOaz3a=g(_Q;dGZPG)k3V|7l~+k*TZ+ST=zrh8H&nbo z;K80^awr5zy<)dandn5&KH+Ef8MVfm{E=Ja=4`#>!1&E9VdM6=^{kPiw`Kk)-{)#S z=xnMWZcJ}6;q21al_)>Gob&oN8pG`(^W@SDlR#>BRDUiM?}C&M4ZYsK`4XjNeq>I6 z<1{{pAV$$ay1TpDZs?=|aUr0qXPc$weLx?`P7{OwP0%~}Yf=?6eCStorU{Z-sdt2kPj7OQB=hcJ%=5HHIO zY5wKC;nF1npGjA^``Ioie_j`VfEeC&E?haZ&hdNpi9&$D=iYj18kQI?ZFO~g9X=QN ztxh=1GLl#6SMy#K78gNyRy&*)H|P3dvmn1j{$o|1Q^@7wPQAku*J$>a_O8x4qnH+# z-tpeNj;rR|(jb~rHhpNFUuGzc*xuSZ9)#U}}8=c4xF zDYfNysEs&d?I>Ad3>U!2Uly;{LquYU%#g4mRUCbey^okMFgbX?VM0nu%?mSoLD&Vr!|Q`aCLou5Zn0 zS8TAJl^Au+rf0O9Ryvrkev(p}&x1y+47cT_u|Rq&%$IyWE1B-;i_!gsui*V3$w$4t zSCY=_hs_ikWk;j@mx9Juw;v#>`fd7o7tTn#k@crJd&?Pti}Lxm_4|t#KfFLat}Z=6 zz0UiGj90?m;53Kqw%Yxcuea#+Toe0zF1|Mwk{63w{pIeJG_OG{F$)b}P}@V)yNP!T z&ZctsfuU|@RhFJUDtaxi-6jr33n8~X=h?OUhq1jI#>Jm+Z*tR>+k$8gY9FPTD0|k+ z63Xyc>ckE9J3X7&I#JrHV(raZs+?rKt)2Za$0?!=#rHn)&E{AF>Wer)3VxoC?)Vl_<}UkRBQ){# z_t*I+5x|V(sS)nh-@2+=b+hiP)GIbTL>%_}_~Yko{|$^Dr!!9Ub*Htvt*X1B>@6k_+vg#^P}M6PeCZ~))X#F(`R?>bT2w+(>S`4( z0oY!@D+q5deRGf|F&>AVZy2rgHq$E6ZpNN&7=EZ|Yr=DKbs5ItB{@G z2)h~5kZs2oI@s%g&?wtlTIJK*rQG-^dUnmR4}yK|x0nxRf+AkHU6$Zo`RXi8@YnO2 zUKAfLmdx&izo->t7lL#zI@2Uv#vZM{@6lfh%Adw&m*VDsO!^K#@yavSOUx>LVeGtB zr|@t&D561zkZ4uI+GMI?E3M)LHB}Um_mj!*VHUq9x&28^RUeT!t|fzvjf1{_p={4g zFLP+Nt3(ox|EZ+{^zb#;CzFK+gK2A{`5LM=!-};-MyFL434^@sPQPbuR8fQ;9kz5L zfz$LhW@iJ`Zf(R=&r5rh!wk6#J$0Hicri9_y4L8tc&n`J$9x665f$V>C2@L1ALqL) z39PY)F4}4%TcV4(gMoW<&GcEE^{su{2rX_~_1kQ2#~AxsZSva}NA+`7u6C=ncXq-4 z)hbq34tDh%JCnEes{8; z74do?Gwe^jyVB zSmZ(-P0ql(G}tdizvqYi^VP~0Lf4C}a8S@yZxsa)r+fU`sZ@0Pt-|(& zZuZ%rK)Na_zMK7!$h3YE!&V1r)JDUvzem7`ldZ4%N01V9M}^zXI8wNtPxaWZ_igTP zg(L*BYn#X2R)$%uG+1f>IM;8T8H*aSNHc1?wCKw@mobXf9CD`k#o{tx&Ov_ZdxlyV+Zrr>pCqEvK zx-r{3XLPwJwb-ZRIx}`&jofc(4rv)lR}UCDWkTY+?Tq5F5sKq4D2fLM|F0YVb8kD9 z=aPL%0@~WdvcX?>v9jXs-+vS!u(=_3eQ_L^omZ8meDSgjbCt6dVIuL@)A}j}IO8al z6hS42FN$G+X(7}a0-%zE)iJn#Eq~xUJx*XgD9=lnFuGoyon6n~y8Ifp1Lg73!|i6( zEf|1y_xzI}};r(5OJWmOA!_De{w zlHz(Wy~VoL8s1U^tCb)pWBGs}YVwbk;-CAvWx7!O435Ph=7mMlTl+YNmFWI@x7)Ma z*^69D(u9kj((-_YnQ_{!<*;0ORdaK(8TKLb5KuwmnPQ@ckX&Kg1o^q8$)Mko_YmMr z1m^m2l>ncW)rA&VGFmQmtl&z7AG+0AB*^#h8UBKMaMp@HWl+skUH1F6f46>*0E}1O)Nki| zgndz3&0G&-?QgG7->~r|_kWf%^!ur4ehqi-o%E~$R(r0&qnqB5>a+kv_f{rh^{B%O z6#i@3p=chKd@@)BQXPWdkp3l5{dejhzzE2!b!|NI*OPylxPP~lyNNje@SadKK>NHT zy_o*-#sBkj9N52Aj6W8IMFA*vP=d?9J;DD? z6o3A;@aSm3CW%ma{-4Av8w8AkXLLOIb^iWe3i+vs0EmSgGx=|Y`Lh83R+#@qIsaCe zKdix@{`gyA{#Ka(MFM})lRw_`x5E4(ia-DH|DA=2=@x$Xn+xzap82zbyO;U@AMs3* zxDZ5#&&@%|C;k5jYSv+FZvZSl3kst}0OP=e?EWthH0c6BpxI_U;J-Wr^q=e(T803C zsS)B7gny?U{<&@W^MU#w@5zz@BGHSLDZl>K4p#R$`_#3zU)4byUr()@5|JGK1%Nl%TBz!f= zUGIN7>&DLr;amUqWx-D7T;S-o&wb5q!xuw7Qs}Rr(EstX1uEg;z+WeWY#=i}ZVnVP zrW{jXUMIUqdDu9ThpuMkyS7>E{|8tpOAaKkv6;fQkts@>){@y#!n>(pQAo5~`-`G! zy)pi|)A=7i@_(XefzJSl|H4AZE8Eq0eYp@10rU1*_Odug%(^nJH48hXS>*n|e>ju} z0uF$v=e|oJZNLVsPBPbGjPx!j=Kh4#-Cr6!`&Vvx!9Kv#P7j}*cMe?82}ivKO_BuyYh z`;=+?ub3U~0?`OaiD++DCH>~F33PgAa|2S{>i#}eyeGpX_@Kfeg;D!{ZdQwakobZsbdfqlw4V4%ln$!rPo>Lm# zoHoHb;ZO>YT{`Ahx+|Brg%fV3)Wr@<)|g1WtkM){n}OBtT3u};o;L0^{ZrBB4~+q; zQ9pL+0%_Mf5DOhUa|_9*dupodNeB79-tdcS_*c>3v`uJV7V!U}0YC{7jbK}MZ)S&X zJ^9DC(b37nRDNjP`z3n=6a}*2ty%2NT~&0W(>T239%x9eB7AT{)Oo*ADPT*KCW8p+ zfoD0&1EDSEHn0pQtEMB-yJcWM52a)wfYq5?;4C~E-$Al59OC7o=-G~~%3@m zXNus_0)M0lV%c=^mpfi%pclH zxi$EWPl?9+9%er&@z{yklkLQ|4I|S)sdZYhZgq4!NiOb-L?R2|q6tR*{gn)v6pxty zI@H!=Ky_>0SN!LxYC=VArjT{?5F&ZfivVV8+o{55+zsPNMXG1fb6Y=%Iw19BnRPZe z&u6rqW#?ZxersNm4XltFM*NK%$RMo2;z6>U_`|#HJ&LO5X}!vxxT-($77|Z^pZuib z8{3y7S-pYHHybrsfdbkv2$lVBL7)`FgR4?Vno)SEwWFV%JEZ7(qj?Ouw=_8(PrL;RMm z#;Sa56CcHdK_!R*Z2z?UCUA~$W?JmLD!u&2;dllV{b=EJED2xVALwUxdWvFX$kL3-1J>(K2s80NfF|y?ny$OF}^1xc4IsClQyy| zwz;!Lw1Z96o2ZihVh@*~irP|d)a9nVY=h>l^?N$=FWq~nN%KO|nlnz)fqxlZB3m}4 zeSB1OOjh=U_=I1aXB!{L`x z2`8CLJ+|CxgM1{!@fLH=^spMa5DkLJ>w$EJ;s6VqT5;(*2EN9*iIdpPY{S9l!* zMsez``BG;d9k`OtopLehppy&5e{}+_@QNa4&}v!aR+X#5m1_gA^5)OMXtAMa#Xc8TBhyrF0{1~517B`7Vv zAx|;)>ONrVNig5H46*ojT2Z&=(vU0RgcNq>n^S(RT2HE)5@9CoI{9YYJahTA$EQ?^>NMuKBWl%mfcLcz>O*ifWc_l4QNfXFYBN21|nxe-hbgPOF-2Y3o=E zv7zp%8OVB)gB^Vu(f||c#s|VSZhi=4)_@cnj5kRH*T!a2U>Zn zz8>D%Xkc2+UJ_%Qe2NBh(Q={Bi(5~vPU<-rIx@R8D%=_{c*8U6)&shioQt$2@C_`% zV7|l{RnD327^`{1XIrEw)<7nZl0ZHybR=9*DW z5zXB}#GfQB$b(QP+jW~k`7}FbYPfw$Gf%o>w|C2FqN7pI62^&pf%c*O{EkEng(7|< zL72DB=!Qj8^;;tU00-hJOElz#|e7T4HU(ilUg_9*CA($Er5 z<09$K;|B!eZqgFR%I(4kfxfxs=F*W|#!p5bsXfs&?O)?n?tR?~BE%u(w7qkk)Zg#; zqR#vWcOoA4=GBAQmTIV(5@uYft40TL6x^(N&ST7ev_ez7MkeFgiY-UpUfgYE<_9PP zO|?}dSzum1;zTDkS`>~NE7IxDB)YZ6Ce+u{oMEwy$9fS}Qj;fPHac0NN0Vn3_+)YU zY{3eSVmTZfRU=M5Wf~@QrQBBiL;J_(7^9d~Q7*)+Gc9;altLzwL`d=8q)h zxP#hSz;k=7735*5L|3jabnH^HnyWZ3V50o}*`B?aK$dGq~2m_gkzvR#6r?}9ODZ4u#WNS&4 zoawHVa}0baqL^CHYVVcu@pcr`>afWH2;wji6uJ96%{FtCCS`W&$liI1Q@9B*Moxm{ zkTh@j)GGS~ zIx`W%O$!T&!i!B0`sylIhmjMqT6NTlWworSuubFwtxn6pLM_0UO!Ad)+Y#9)1gJ*G z&;oe!Gz7chv>N0&dE=AK%2rtsWTggA#}OqE#S@}V#>~t&ZQTyyC{> ziYNPgCnn7ZAW`9^=`_REtaZ6lN*6`!@Fa#Q5(qq@I@^Lo6kV=U0WX+rn#`CEs;2~o zcw*)nJJx0~8uOG1Hy@X_ySOtOxzimL#SW-$z7`g@H5()LP2>F$U4AyG2YjA)YsZ$i zM&j6#dYXrK_bQd0=LSDHKcSgB_zdyO40~px)Y#VH(rp&M-MULBpLJ$SwBW4t3WK~TbSgQnWECaDWx-G9% zg{IGf1l?IA@#Sx`DSGgg*Mnf)>&?MUHab?b4Q07LX^PMHJ9BP_Y0l7>jLrijEd&Rq zu#!U7JKW5E?DY}0Ilf$1$(e>Mr?R+Or@xb>>@icYwK#m9ycBQS z(9%BYJvLCCH4urZ+m%gLmBTwlk#|%I^rwp_qmQ#ksG;$ z!Q39HZ1(P7_S!Nk7_B)RThSc8cNoo>&|BI{bh91V%^fLYy5)=lb(eJQMXqZn#ypTW${0wDQ>i?qa{ zWxLe2^aM!0HVRk5=-6o103u(#_ZiIO;wDT@nJr}4&v)~5Ci6y~_IbO_jQ;eSB25d3 ziMeWRitLm#DB~!zXvYc34IeQwv=#2>adr*sVH4<%ePM7(V%H*sW@v~E3m$*4?UI~l z7xwMCmLnVR<{GZ!l(f`!!LEELjd&T^Ql`R6(1EiV-BE}^aq+>9G-R8#tSQYt&FZk1 z6~6V+_VW%9%4Wc2`erdl+VUcs-Ms>Xf?zW`F-NnpKHt=x-xIK(eD{I0=hJvSQv+QM zOsIY7o)F@2c<;mTbL914HpY^!%omfup>-p2@sk1s*73L+eV4cFz;}=L!~^;&opr`t za)-|MEMM|{@KxZf6a~9#00s?yuR9_ArVsb-k+H}427(*1W|CiGl-ms)B5TPjooMPc zlS&l31VjqW!uzG;<0yVB`Q@?FyMS??u+?416(5kI5ro|%Y;K-`^|8Mr{tow7V4o`2 zV~d_@q~k~_El}tWqhD1h;m>>uE2=w^={S7mj8Pc-NR;<;PS{f|caCN^y9qeLcy_3{ zd3^!DT~$e<-Sj^5bDOQOj4GWMIfy+s8WWmrarG>eHnZdD27bEt#;wNT5PR{S&celZ z9aofp^ml$Yw#w%MUaq!QZtr5|!{e^nX?3pu=sCPGQ(+}i3l>&$i7lin)nLDiN&mGZ#xN0C+R4)bZNR)ZO~gx<4K+WxNn-6li64p)98=(`=6NG zZ=Q>|55B5207eTj&p9~|hZw55BTL&MsH~mzq=s66md8&GJ^!(xl)$M2`U^VmVxFI; zsZQnt!gt=DI*h2YAL6HPLSwb)jzj7AntYT$QCXo26}r z6jS@Eiphyw+c)YxlN%Ir_;*U=XXjMUG5CpRH}K5|o%)I0#_6rGp(3x;D2gtQ8*03K z?5m$1k!(XSy1oGUpe;a>bMH;%L~Kr%M)15=U>4b_yTR?iOM3EcDi>}dofN8+ zWskX%U(`K6tX%QJJxGf2ne+5Wlgq-MAco{c6(Jn?dq&F|t#p1$xaf1k7qvVw1+eoO)3JX1h56FfS9p>mI_<~j_qXInu~BUx4)X^-jd5SqsEvL({as` zr7;g&q$8l%mfBcy%eoesT0eT;zoLs-Ob&uZg6u*%{cH}>N-Y8ihqUmE$UBA|rVoe9 zT}_MWgqoh{rt{Sr3lk^D4 zP#yyQVhXFL$15$>IKAW~dXuWDmr zk=|80ldQBl4j8OJPkv2)&ESi`2@Gf&h%RO2=5--?^oPocv^ZJU16$d|_?uQrah-Mq?CVzliTN<8gG3d5sV=srVR2Q9*U>4!etve<_7jS_JHCIBC+WpIN{e=iqkf85@eQGzznUiIdPKlXqcES=YLBe?-#hyP>yPH`D)>hJgE%?&<9BhBuW9(Ce|+99jk) zELQf0B!v=G5rbB?pV~c7)VWl7oM;@Nv*#lZ`AV4(ERA!be2sLN5jFj!c&ymMg$~tK z0?)=PTP^7;iN?}2+L~z2Kq7BQYD6x%Nq0hbs2dhO62V#AG;wPxdJW-2r5cg+F~2G-$q1ndxt6IAoFj_% zKM-XX5UH!?6xm$P^QJcaWPGtZG~Y9A+j9@?Pid*N7>kXpeK=KLs`(fY-zg0zZWt;h znq25OL|hAyl}~Gq^@mK23$&2O<|3_3B=!ffGzu7tM4xrZa8lNU30p{byAlX9|wSpXR8RdFTXKQE9=noQ8{Kr2w3QYvX;mt z6Bo;X*G-Ko@{mzI7{u^o&^-EU)0O-HAUWQn$=LlkO2k^nrWiv0&K%BU&sTnbHWwLF z=X;%Ru1IUv{yT9bRaE^Z25ZtBBbe5^_e%(oI)#w-yDW>7#sj3imw#x|^I3qLt<=;vT^Id*D6HgYvBoi1VVlyfq<6p?Dg3td+dB&EfAsZR~3RzNnj-|C^xE* zZcuXw^e$k2i=vDS9UrtJpe~8`;CW)vZ~8lHOXLZ7@~fsE;IBVO!vg0Lwri>}^}x6D zSWVX5D``MmXzM!V^rHY|z7#bYS+46MU~R^B6SNW^Qv)RGhMsah!Xj=*@ya|5NBeSx zgz>trms3W^d#I_jdT&~0dMpB&5#lggFQPd7v|5I`%EWPMKJzM`z*h}%qlTVIu790P zpW>4M5z_~TkOi3q&NcRq6E4{jfJlKnytLMj;_i-VJRWo1*s-1N!DSoB5mF08zXmWZ?#wXy~vL_I0R+gTa$mR$N7mVZ>V6)O30 zk!DnEr#72PUef&I-0p)+z-C1`Lx+^liaU%>%vpEQFwV4lKze7@QooIi;^8tzrL@GW zu73eieg`x~B1te%G5!XTaRT1~%*IxR?vt_}Rf+Swmx*Fyp1m&BWGNMa#v3Uc{oG!~ zEPGY1c!%9xh^q5U%ypAWOYP$#V@{Ln7q zZk@LWZ}PegcX0$=fbuvTjS>qg+&B-A_^{k;mGt9lYc7vhRZ1SR>0REFCxVJ@LKYIB z(4>XBrGrxXpoMJBR*NU@qNY)N52d;e&5lBu*4ndm9Ih0}6`u0@{9#zbhf~UtIClvX z3)=k22X3`LzqOd$l5OnZ(=7$~p4AtCdg_|?7hjeMA@MWwD0&!fJ{iNa`~^>E;gE>Q z-LNh^VGT)El%EeJ>{EjtH}k+ZlDCYf-mZ-@mV7CQbY1!w$v(TslRrKxKG4|_hSRhx zT{5ZCuGCc!>DbUwK8tlPxUPU6xeal4?F-Kjbh_6EIjLiO&UILXfII8$Y}>C^NN(mi z31(1Mmagnyl*jp%kG_YU`6wrgYT?}LHY=%tAA#jgHzlz13|3*t=5v93BgP6JkE8x{ z?^`ixgh(>^ZumwA4;|He8Z=%x*b>c;e$N!2_Ih~x^AMyS<62N!7A}aVz9n)M(Eu>hTJ;o8VKY$7nm$v<1HL)vXd@EmJ)XQJTi?Ngqq57IU*~{>fV48J3y^=4 zR9ckGM2|8uX@Xg*iB1OBg7&nLygljLU#2@$Itf9NJ~B2+FU-yJnHHCbllP^Kkr!l{ z3$%n|pzB|o!Au9WLC@cIXLv{hGdH~V1|P&TdgI_a8$pikbgHk;juu}O{3s)GcV(Yx z1&=5}B(tM2>7v#A^LBl55{~;)7H$~)i_%U0mJXNo!+ZF-D!hlBKz0MS<_sX ze54lXWa)uIG9jJ5;91OmLn{N6>4h76uY@=4MF$;)d@m{Q%U}VlU31TJB4DqbrbUac zf4u+g>tTlnZoJ(d{MSe$*DEG%AKCX$fC5h#HfQu-+apoVSi^`%*` z>_O89fs2KCA~8U46B-(t&3UewY%kmi-4;_55AnMLv;i=JY0m=jK)gXdWE|e9e+c^H;>molK{~W~Q zCWy`F$n;z+{jWpA7b_@4ey_ywHvu&>#l2h9|5Sga*of^mq!21DdniwF5bg|I;wl$t z9Kx@32>`#eQ4#`X3$@$KjGxqVIXtu^eKq|gOUjxT(>IT56;_`02gLv-CGwb~0(0|- z)8Y*ws&Sf0P}RK;xLamBJKCxUvOkW&^yHrDdxuw&S0F>kJikjzHj1BcK`V>(1}lM1oJMV z!0ARh^dM%>oaA#ke^OG9Uo^2|Q?qD8@QU-^d2Dv?Kof*z#`#KX-E6O8dFV2LaLrB2 zn=l5{U(zVgo~_rc5J>&dT;ueY5ys$8V-m)c8+zFrb&rytt@KN%+(cGXPBF1+5%Li+ zt+(O!So=GDPf8K;+ut(bC`N1FNXBZTnU3&+M+6dP_nOsES=cyg@V z&%38<8(u;K=4NtzN>^$B)O9D8qD3iOG`FpHPycYMg)g84$0B$_D+?Mo#f<|k4YE|0 zh-GD^3MR&FU{*hd2jF?t?!i2RjEOwsi#PI-Gw_2 zL*eTp4VRyt)Dnriv85`Kxv|;p-3NezQ)7`Q@_+IO&yAb&TS-|PpkU+QE#=3f{^`y9DyKb>1GaWG!{?!YsA)yu zC4cIv)1$5tlb?};A4Km=H*!H^W%W+3J=Uh?|2@Z!AwBm)qSH$l{>7WV<4(8u>8R1& zk}J=9QsOe4`hXs)R(#-i`s#SbkLwiv0Z)lnE*VobEruyIT}e>K2ZX$;iD2Wil2!t# zTXdOW03mtxL;d`<`brkbU-`}-Mx=Y%wY7KQ?U}b^e`{#?25{)t08M4@UjDzmc`~zT zKOkCOwmXgE@DK;Gt(EU@wjI>~x;15hyuDe=aaYPhG)S0a93LxB1-Girb*t@9Z(*1@ zZ6J~=8i1;v@8`swG9cah<-%ofc=l|XOa-qC_R{(ZH=ehLaM<2w?MM210{h@$qRg@l zOS=fy+aE8VS_ptW`n_rFUp(>78$%%AKa-YTZ#vJ@0}?LK|1(kiJ{Hfm8@Jsi3YEX5 z-%F-qCW*E%{9bAo^XzGhbcFqE7{7=so`pci8GZJ`qBA`IsIP14XcxJL3Z^y;`O#kb zM4)ErSMu@M(C1|m^`A+^a8XieeuD$ij1d(ZJ6TCnvN6v%Ma}Jg%Vfwjgy;638TfCW zct8)T^V4CM{66o4-6n1kVwe1eyDnU*7In9`z9b2i>inG}b~0{&Ipg!rK`l;9NSvqm zM}n+Bf2QbJ>&FR`tik+cpVluH>Q`GOdU|0)o5YqjDfY>RaP@>``4yK3l6~pdIe0D~ zPJZrXNyGoO$^6NtoWJY*hLXo$GVw)1{&m;&Z?r*F`ii&yuV?(jJ^#ezW*z{h9$b{B z|2M`8h}FR_yE6p6{==2~r6b*uxp2BukNjW%$7BEHb8dj_uKf#d`PDA|;u#P50pSvj zs^`YP2g*Mi=2KYkfB3?G@tz+=OAy-MdJex~KhvL$^%tw~)1Web0{{s#@|oa&WV!$H zU00!8mw$Td|BHv=pZ20&2sOO=@5lRRPfn6;`CFFCpNIx1skGWRu|5CRbMCM#-u|<( z{(HAncnO5YOA^Txf6wAy36oy@TTAMR2~-GkUy8Dz|NHU&$uI#Bf&2+x{mC%@28gg$ zwYvT21^D?b|9=LQV;q;=i}I~b$dh9{&YR$eaSxTa-qJ>Ksp6fif-F4Pqyqe`9pH+u z!#q4!*w8sCb^B~o(qGv@+e;ckmfmj!iZ4`tGOc;vEG}JBf2f0d6X|n!$gDgVuOTE{ zd|gFPa%b>`(uB@}s&J)Zh&lbeOEdPJAyIZpB8Kx?ShxEg8-!*`rlux8^9E0NB`fC<)?Knz(T(Ynz$799QSYU z;OPUrgpDr#H0hsS^w$>gf5!EfmhOMX^+#;__pb3j7d$H8r=J963Q>|qoC{(uuKKV4$d;OQe9fFzyfkVZPHjguP%bcfU z&e@0~dtcGFN%#W%=GNa|Y!@j&#Jig9ntnxZb?Z<_8UMb|Kh5W5)CW~nEXHkd8p z4)k$6bET2SC$6fk;nqbg9GJf+d)lFBGb=p-$>I87ihLn`UFUQ6DCmqxTFlH`=KOoIOm(7!W?+>GlVa&rqoq?zhJ5(e(Y5029Hciw&jXwEImVA!cWBUe%0FcFuF=gOHWERDyB3a_ zb2_VAh|!xw5^X(+VOcH(S|di56b}1-t{a96O~bMVpvqzDp8Xj(5?OqJHXAzy{6xS=^!VAV~~N$~PQDDB)Vx!0)LK|IdSkCaSf z;pJZwJ{|9R*F><$)a5!1X~^fx66(&(5P)|(X5Qrvb&uUM?ii5oAG*r}%t@OOg9Akh z7p7#y&K%@G>mr(mvlFTf=Xmlw-yj%&fhh1WIgWXJ6{Ha*BW_nVh{TlA8hCzj&1ANj zgvbZ*;Z)k2EUJ|n(+2M4$xZ!EaYw5}lDYA8G~Yb7g~cF9o@{@1g5u)B=ysi`uMXga zdd38qmUY!I!Wtnw7LZfTyE}id?*ar`HfM5p1mruX-1Iu0X!)$9sOR9Ij1Zf-bQNJu8E4S1z&wCLNd`(tXAY%x;V z?o=>I9`+?GZZuWVr|t28jm=kj{UKoi6Z&4Y$^PNSc5_$QB&B3w??T%h;6d9NoyVWO2=a0tAd8gf^4hvsv$y^6jB8u=yai_O_Bg3z<{HnmIk~M_ zs2^i8?-a<|&+Y2NFlDAj=p!A7>m!34RwvAIig%`Hi$;)XM=oAO9`&-auD)&KMYUu3 zJw`*0gDd!1`zX=4J?ol>d_;G>W9%@jXs!#Lp<1E>;11$pn;aHD`R)g@Tb7pt81i?& zTGV40xD@O>c#Oua2)OuscC)2iu4s40J)8B1c86d&jalaEh6n`igUV_qZS}AGc6-+> zFQZ*u7WRw*v2YD#AJIc94pbzz)3t`43%asDMsDa?7vq7m=6Z`qSIcJtg)RVY8 zdDWpY`du_1*rfapLjNL_h4cEoPapKLuY&9py##<#RqWF&S5$HuUd$Mh#p^ZyO&1AZ zIK8y7z>k%?oPE4B>ut@?Ccjk)rL*ozgsQ%)Aayu;?4af|TFagp530jR1KdY0|NbAv zmho$zCB7|$d_IeGvd=+h$)Lmu0ve)5@z4#`LGv{uVi*o{w`$iN~l5DU27(j0Fra8{Q#W4 z0ZrUW*qr_u+FYJ}z`PaL*BEHPy3-cB?3rx;l3r!qFyyMd1o}=j;9WiJo^oEoxnRsG zA6mw|yqpI$vmHA7>sFGx;k+E0GTO8RgHU?5-9EIGR3`*k-M0v=&~jS6&GEe8Z17Q{s1#P zXyVqP6G4AfohU?6b$8e3*f;m#HTJCsS~+qhI7*B1?2sgnpx3=#u&DeOD?vNoHpDP28>HE)FRiLQbYSvFlJ&K@RE$Kt z@DiTj<}H&pK9tVBRaD3BT98eDhB5_>hTBCwFZ;->jqJ>1preT@Bbrb`4c>hej z>dB=5zF4`hlTvy+oP0YvbmVx<{AqF z`C8&8Uo37KJGyIDliDMyshBWuYJ8TWPA`F83@4jch5Fe3*w({@ zmE9~9g$5~&8Sb~R2sMQX=7_4N>f7m5SZgYSQYl?553Cr7lOGNkenwcax?IYfG>wpp zp`1Hg(`A)23WhqzDWMIv)gQe8=XBIX@B^8nZtnDWZ(699ks?B4&1CBn#dck&9#Fxy zV7VgZ{~`S94HgiONuvO4{~ANhcye0&;pcJ%7gXUp>?WliW|~;wQj?K5R%0{n%vlI) zmNF4|!uv=yz&NqzJ~IhW8n2T3tS|M^;Nu3uOpd*1)xx~B;xy+dut7g0@b@Q8=%1O) zdKqNSrfogP@jgBj0lLAmSWInLyj5B*-g)29HbNoAgK6H|%mJS}K^}e)%C!&0<8m&S zTTiexM*3%(zJ3b$pagH2t>g2EF19us^v67@jcygK1rOzy_Q2Z%JnhE^`SZ0IBO>h@QB@-h6ft*w&oiSt{y@qQQ!jqEv+*W9`^YCrr6R@(xJ9|+4uKNW*VHtFMSk;KAuNyb^p;SbJVupjt?LgSA?P`k zPV-p%;Fnt6847v9n}in?M<;Eszk+k4M0=EFiI5WF5;T7ZrK-VmvusWxx8BfE_aV^l5!0X zw8cVEe$EojbI~S&AlCwchBZ}>{DJPwNUnr7`kSRAal&PrWeebHhs$>J&lw&Z9P=Vh z3I^~k&E;_39-2#mk>WQEH^K)l>ZSXkn!t&GkDf!P~22;-yB{DpbX za(WKlM8E8Iu{h%X&w(`bwGnFDtEG_--Pio0rEN1xN~@o%lI?bn787Wqn74V^Q=25L z!HZQanSh@&gs7~|3*W~E{|1ItR9(dDMcl5q)lxQfJ0V6<&1JZ1qqXZx3v+%XzJInVe*b&U9*I3B0a)D3Gi=nmnzGeZq=nLQpa;-4xZ#b z)w@Kl7OS^2w7qx7bnnnM#VBmINdS7JUBAwIqb^+xk*mRFl_Lk&A&1YXTa_+ttJsZG z=El@jmLGS@5#%c%?okiyBAmm<29<|jC)|iQRY2G%KRYt8*=EjZT^{hDjF=`RjjruZ z6+^n{8C?h+WZvq~3RpUWm;OBXpC>Pwn52dS?Hw2ly8?{i&Gb zsWZCX*LgzY?!w+tExy+;cpG=qOIS&%n8Qu+2+5Q0V?sO9Dm%!M=;)IL8tvbN!m@&h zd4nFi&Ao^_s=p+n3Lm2dZ_g;&xv}1%&!5{waYxg8R2)0P9g0n9B)o(rgW+IDQN8g- zZgGsdPaRcF4qe7yvB$VoKf8cepOV>q%Oqw7EiViWk6V|zJ$anBbVP>tIj7Fd_^=T? zj1%$Rc_GM#PWatGym8%RYN%E&*r(;AV(>9PF5en>V!}>iQTff$#}THi`ngWyS+Qew z#k4(7=Qzh?TIRH^V=Ox^mN#m}?Tm(7qpxmy4CnR--14}eIdouB;{ds4%>1?=e&C>) zwxu~qVRkT znz^u9({@6cfutJKl|f>J?sNGSpWL}LgUDbc>E~tJ+?7Kq?}*y#xpM~%Kh{flzPzu- zbQB(@xR~ktK2p7vQZsLG-DrCNeY=YNVq?WWsYaS;Ne4v&HsX_{^2z%W3~$ymUQaH+ z?Ru`r#x1abpII7aBbl{YB#a+G_ll)2(`}_9k-IBSHjeNS8KiW(p@vX#)YPR2n$*J0 z!h=lpI+7I(xpX_INqA9@ORC_7-Xxis9uraDu&LcGZa!O{J!*ZVdg8`HV05jG%z@PH z%h1bEE%PahqJmdD8lI`BJ|))P&)XCCaw`m?``@X*Ys>22oDwaWm=Rl{KFV@mblved z)RH!SJo0dNGAWqZYjG~E(p0bEzS${d_ne?Rg^`k~KJUj4&c}CiFyB4Z4#9f0#=mCu zC?MoFG-r^OTVwj+?>DxD0Z+~E@Shvu*Q#);94T!AEVi#aIoOv#D z%Yg~KpL?Vb({q8&pWc&`57}Bs);BIoUV)|&vh0aSf{sZswx6c%^gg~ zHdOilcCBH~fKA+p{z-&P-{yYiG%pc!AY+bPxZl1G+3r)NWv8Nb;KW}E2Voytsv}lI zWUDrY#FGFChW+ZTE$-S1Lp3XvEJtg_qLo^T2oR6;^P@FgO0g5L&AZ( zak-SCr*zl<;hHx4F8AneJF9bw1|DTKOs~lJ5k~8LzSiQ5;v%-X4aX?B@Z9O zhE2vHK>Nop7i$!c90uyALoH~nbj0>qB_EHhWB9QdOAAAojOeSoGj}`{dK@H8u0Znd zQcDuL7_gQi4FKXMq33WJ0`oUxFDC_d-D# zIGVPm+i^@KWjp$4FOE){6#C-&Kfxw`vLHNTMXEa%20v%@5cLy6yhV4K z-J`9tkc=hx=*u`_?-mo-wyNynzCg{+iEg{%_P_;Jq&!K3qifUT^&m)b2mKblOyJc;te(s0&<=)Sa6SzpB zab@^ol4Nt8S8qr!<-F=4>A7Z0e#+%dL4On`Uyk_h@B}|w$L0Ut_eqhx-Y z4SW`dXqxR`t-y!oP@R*<=}jIZ!zg-Y~a^^aL48fK(Y7 zrkr?Kk2vmj%$~gVi5=}KP}#|EGG3;YSHqf}c2H&L(Dr-Ts?+r*OsFPYRUMftD8leIWIQjgpUrY-brBF zI4Peept#D8Y7${3A__)fb$94ni3;>+pTAl&98vJ5ridcFXO=uQcWb!S=v_Xv&GFLhT6hs2ZgixbH%1p>s1!$m!N6L`9VQys=PX~r z=aiFdM9|hQU3q#;5O|sH^#KE(P6}ibhv#AOBL1{R0h<3onNY%_?coSqg zdkj_L;mK}&h4dnz{wFYb{(YBjq&ZHhMpF?0w0n@DdmmLL{D< zzC*(l#WVJxypPGDna^*4cXg7(T0?NVr_dru=v>@!rspTzdAC!zzuZ{?)=X0=31J=B z>M}XRO%QN*`K;OCmzNM+jwZouN~-iRQsTwNsnGwR?84Iuu1+n5p$kf*#tIv#Hx@E> zx>FGq9bt!KTLo(KRnn4kg^=bZ_k5J4*vhW`Lq56N#UEltSrKk7b*jxp7vpL#3{zp4 zd5ZhBTR%9T)b%s4xba7@;Qt1I#q~3=P|yza2F^#wz@4#U$>lcVcD{^*>80(nzGOyi zi-y#C7b*c6$9%y?-}=KbYS!a)aKH!^RE7KQ{b(1~h?qd-N#5K*=}IM@tx?$&_3a6_ zMJ~nE4Mzz*^0X3F0{JNEZ^p8k4fS<$4j?QZp{u?2qeTxu8>Sa?z6$6PF#p0G z7Xzt>$KPHyOS5uc#NvyTo%3EH7Kl4n^J-~RE=wxgD+U}j1hNWN3cH=~WDdH-CQ$TQ zK(lIcJ&siFAwv>?7=K9sHkc>RxRW`#y{yg^AtR4e7x=)xzn+qokZ1RVcw0cM#^X)* zFjU>h&D&Bj%sETdzja)&f3t!<)qu;+l83)!PlNPV}?D)MOl$DaORZDJuVfzGPjqS1HI2f7vm9YuJUPv>)DIh zBSm~Bm_Q~|_U5HQ9mGtu;UrbcyMpwYB;oja0)OaWzyHCY!`AyD=EhO0^{C5~oii@B zC7{Y!1sH_%V(6VNA#6o-4K(O&M^WzyNX6dw**& zuIbzEnyZ0-_Hlp8>*zL8yzx^Ntf)ebd4FelAe?9Mj=e{W^Kms;Wc8uaGG2D!V0}Q7 zDL%=_o2gsgSCwz~@?N(#eO83s&b2wNlIjkJ-?34tmSYVm1`<6)79b%J z=}|QbPzJS@%WFAR2o3Pqj8t;+X13QGbZ=~ejs{HTSKcPa zQ08=OWpCzp(H<@2XBrd;vhprLV*20M(6w1y_Y@VYfF#>uSgCxkNqwL{CG}=Hf7Av5 z?JtD=w}23STQoHg%i^`#OddCI>*clW6B6zTN2zADp5chBfrBE`9@2|C=Fl={JFQJ+ zhBwV7maU|BaqSzNwc`^RlMJm#+ zSsn5bC6*q!+|}hLSGw?HN%2go6(ME01a-35lWP}uMDbIRW!TuRW3NV}V1ZqV*)Q%B zayp)Ckem1)m_(bo`NhuEAl~0fK2^P=bsT1Xz_H;_ocQ@JR`2J?2kqtf0xfJeFfMk$N=mG}(8LSOEjSEpQ0n`R1(mbVf+;^OPBW_zXF7@h*!0#?^A^RMIjNok9F z3lp+Bp2~IlMQXNp2cS$Pt}{V}eSN{k^9V9dwza~w8?Z!hb8ILkR({opXx)Xw*WMn& zp~xqUC6Zmg!93UIqwmsC{6FlyXHZmIw>5l31tqFTkc=n@NY1fE6eJ@#gTy9h8i@ju zlZxb=bI!3ra;C{S=hWmT^KI~)_a4uE!oBs>SM|PC=bvTMyZ2suuDQk+D04cCVJ?k;$zeTC&HMA25Uvq{U6xNbVuMb@=JI$IEe;YxO+kkxzT<3R$T9;eQ1czXLmr}DWh zJEiU}S<@Mvn$b&d&XIS6w#J2c7I{<Y^iRTAvVM>pdw4*y2Kb-v%CkK5#{X zq~MT%UE!DY@};;W8V=4D(Yd~Eq~49BIeXJ=`HF*SL&^6{D&buiwC zH8Vxhv^AHWZQ23+$dTuy|LUFa=1K~Wk&C`3p9wg3`wB#d=MOyCF8-pCY{UR+xS5w4(~SUuLbC6*v3 zRq$b$wy1uL|!+?D45`<_ZZgxr!dhKo&aJajzaoJCE}IFh)m;#8j023gD9MKy~F zYEJW`FN=}r+$A0fa{{!!j^Tb4>YPs!cQJ73+!`R}SNj7|A8S;$1}dMINNFk*H4MKi z;|31jnb8;EBKAM~31OpH=xaO2vGNEPuzB8o+cA z8l|`UlVNJp(#;eVe|(_>V3qmE3sM1nxjiRZnQpppqoXh-56hvOcQS+NtS8koq^0bb z#EA1)xNkM?*z^6nI}aFRKbzabyWFE@S_47ax#AhARjOlwz3xbi)zv%O(UjT=vI(mndDjh#0fB7T@vwNkq2TIB%|taE+C+IWX9k`_`9{wzMydez7G2I?rp$kMKX&XxFILis>q}Hcu7; z82{5GY^-p$qf*M)_NHjX^~E)vFtEk-_8eeUfURNjZYl z>@v2slosBck|cXpNPpioz__FC@SEC?!`((hk{5`zl(IA|stH zsV?ArdEcrntFJR@?R+-$jr7WYB+Fnme^3Q`<{qzxI&A(Rq3&d`>C~)DCfAFeY6u^{ z!uU?Lr8KYzY-~Ln%3W`IW5>~Tqu+HFk{V@jA(8K!5|gZ%7w?<~5r4RCcbA?Vv5|g^ z5*U`bXCIGznW7vTk8bHnXLtWA_8-7V_S$Ag*z#x1jE`Q6`Mz;5_IoEFUa?2}6W$vh z21-srv_&`2mZvn5%Ys6TTq;Cy;#rAjZMW5A2SE9|!bF1Fo_eM5It9ijj7@wctD+x< z_4w>enTXCOz9qn9_BKXj0+8#vqn-!@tHCtx^=bgj1JR%JAhoKL;p-Hhm|kvF&3JlN zy^-pmmaT^u%LM1gtx=u0-t*LeedE{%>mJg_HIM1)=2(7YZ13Ztn%t%~-PF*p(~035 zO|WRK`a3Cn1odOlv25)dkg#LDoYI zZmhyD6?`1jh9^6%H$tS{?NV7pIFFq_$Y zIA_YLr|Etsh#HJDPj=G}=f3t6cCToGu zPWWyhz45^+`Jv`607OQ@o$*%O+w~L2l`Ntyrjsd$N=J+8SlqP_2^>t{1bS7YJjVD^ z3UcLz9Mqm%cuQX-YK`v*f0r)5nFe-K*uwgUkt^%0$C7!RDBP@E!>L&rR0dun^XR|k z^IJN%6#M3W>N6dT)tZ;uucsK4KYST;C7n`|UMCIzuF-kLz%+CKSRKCl&8m&L({z$X z4>eQy#bfiwVbSD+2o?%xX(JswMH{oG1;4lIN3JlMhWvEO?*2&ny#yJeiACo(8Y6svGghnAC4NsL2* z7rGibp$apc`Gvdp)s<9+J355=L_Xy4;Yzm=>&hWc?%duW12Y#vj9dDT0Kwirn2;XW&O~?>Z7p!? z%xK7yN5VVv_HB=(_OW=)yvyj`kJ%&3tW35F*dV3By$(OqB)Pf!bv)+z^o9pm8-rIY z!TwD&a{Cs=bw{DeS$tZmhEueln<*h5vQpX3^eu@-XAxl8r?3{*IYIe(w?B->Y>Y|_ z3an=1Vg#uTb%cKJalLYkdPiq?!gqFuFqosMc!bSnlmev%KsrHpBTFO4?z`|Nv9}|if3Dl?SxSXW+Z!U@I0cqy!dr&>)&eO(1FU2)GTl!*T zjV-;^iweJ==!JNsSeUd4`n--6x$DJ4Gk8G}ZF9_v!o}n2TBsy$=otM%Pur67ZjjI) z1pH6Ou8&+j4kLl_V4ElTkoQ<&F9XQfknY^M`q6Fc%D0%^b`fefCckp`#u{Aemo-Wm z@Is&w@Pe{e-;Eefj>kzQ&+q(xz}G51#8klU;Y*Wcbo^Yo5#x~cit1zctBLg`RQy0< zLRhNop`YjdckCHn%?4PRz)nos{zf%u&qqf8M$4P>ndu4bL&rLrH~>Re3;$*VOo-=8 zbvr4KT%)%?6A?;H&ZM7^mT^Pg2fnDTYtNxKUY^jDKRY#phOU2f2Drme`#B#q(Hidb zpGKwG2U_XC;?VT#;_$#FsgndH`S>2$ELFjhK=K$`{&WOPt2f@zhQ63Mx)oZH_2^2X zmrog9IIj8~`);n7cZGMA0xE5neW=P=^pes*kHrpy{azW?(0BkhXdo}MD_$L2TC6?) z{lpH|z4_K_^WmNQe?+|=5cL;6^5ZEx2~Kw|YNdNvp^+?t&JUQoJF~*5ps8tB+^M05 zp-vt~_R)av6rg>q`pX-6-LZ-Vif$AIpV##nGrJ!|r{bl+Pf16tZ}zSi{;Xu#nl{M%`$Va#A$ZUfo!~-Cz+(ms z+fi-CHMYR5=K!->k7k8w63Zc2lA|1Z(`R>SN)P$d^SqrE>VnUS=>VA2k>1X9viC;% zCg-!IFrILLzeH!;_85%yKCYR`nU3fyuj|jHhT1J!lFw)fEr{4%M|2&U`Qwz5O9Ali z=KaKVPA4*lKDK~UV{*S``)&JJNP=)N$Vk=`rVBdTzI{~hcy_hTLT-a{K$=vB@gC!O zN$w`~P1Z-dq-za&ZfjVe;C06RS%3B~ttS9e#H4_CG-}0Odzg+}wo)`D10tiN{9f7J zNpz3C*UrJEdB(hPdfO(N=whwks`$ZyZjR^0fuV|rJ;rACAL zK7Tn#O{?GT3`{&`T~`rMFK=e4b|cAzD&pYCXBFfQf<_c`dlZXL z=tx+r-lq*6e8Zi7xAr4@#rBfQpJvsM0bVj6(ebjub~DZI;b1ji_FM% z44=V$k%D+^N>d4QT~W$7>kiHe#Ho35+b%0;CcW>2>hx%#vdp#q zkcTy~O5BQv9N02+KKihm50o}}iIKG#H*}Cp!t>l-ZA=62r}c?oMOOkk(~P-#o%l^f zr&boF5j!RXo$biP4wMLg26jU>R}t^xk=Ga`0?F5;I4r_TSf*00%PwdP^=UugO8ql{ zV#HGtWzXD>^qjn}Uo97vZpLFpm)g_&tOid8LdALQUmv@BPr{?`r%x*S3+y&Eblj_GvZ*4vr~{l>%!VRfm1P_w~Y0f-@}_zj>{9 zhnbJ#GSF(3R7ze{etJ#3+Q0e6o2HB=ZReUO+>*1?)hl4=L-_1lwF~4%mHlP+6VGPqQ8)o`?|;nj4p)bgSnjI49%01H8mh{agDk z!YY}09-=khRMjhU-c#(WtC;bpTtbQ>G0_34%(dt%Tn%KKDSIZVgvR@r-&(PUEwidO zD(5?o!gYNNsJOz-83F5GEvEq6{M-*bFK-0be~yrbqw#xc)Q0s(LXX3|WXB9&4}*F| zTj*K3L0DHwgf zhg9w9gk-t5N(b{kzA2pF-=cODley<5TSnph5E%I>FREWE*;E zY}t(_J;kebsx3sz;K7N8URugB<@c#w1R+}EF}%of{|qbfRIs6BF8D>N+13itDy(_m zl!n1>seYz}2V5dErVdtv6A$0%=4c&qay-_y0xB~8yn(JCM*ChRrf0~-LS)dNl{SvZ z9#Ao4d?THj44wWycqn_zQ9P_4ib+%9ET98Tct7#l&vQS+onGs#+W371qd!oQVp1D! z96)wM|BUG0Chst|0?$5GqV#>tMX4KY88Br!-(QDzV)|5KB{K~wfw;Q`l{YM|UN)=a zggJSPwh3p_M>E`~{&`PdZsN48;MX|qgN-g=e43|tkod_NDRl5!(exrj9ra)Y9JPwQ znZnbGftVW!-b zJVjM(B?<&se#LrlQqEj0OE&nD-h@c5kU24I-Ap<9yNLX{qqR(~K!`jsqJ5TFUObKi zfb2z2Ec?J2#CquQ4}mm)Wq7CT)`X;$0^QA`y4!xaT_%H1rZpYLJci!2Fntj#YXyX6 zB~s!k@!Atxh4Op^M+ZUG;AyW10Ua*u>2?MI<}!plKigRF z?V6aG!z3m8j`YfIxdYIt?2BMkkrEE$|%5t(+pS|UDShTuVM3PZ2R`5hGMs7+n5t_!g6=>ihyR(|l^i0lj*V1=4j;MYC3GI}@f{lZKvM`TQu8vN}X(ww)$4l2TVF zqAm|dyD3d&T*L#?is3$&_+RcIM!%TT^3dBZa zP(=65oO!x9PV-Fr2QnHtec)i`wz9GBYmqpCv`zvs*0ruHQ)21FkQq|Njo4;eBEy>k zg%7jqE%=peBv$gyY%TMIC>qhyo#9n%;Tw+L82H`K9#@9f5*c^@Cz z-m`x#(dZv}RX9%=LIBdRx&N}g&e5bEU+?~UB9xj3?*r|cUu1~*G6kp1Ox8?V^}V3V zyU`PDBVttN_-geWK3i7QwOL%)H;aBsU~Bx!UjJkLq554T(YRM704Qo~NR|#M zXSvHTc|vtEKtAO1BPC9ZvxSi?^ga4Wfe%h3G4XD6G&}C zHqV`0p#*a05kH>PIwtQ1=p9cE@NGh#c9E)N!Q${LxstHy zCxeL;jg`Tp8rU6z!(RnR5Tm`(^G`q3(~&(Wo0(JVYgK;L8!J?LZFeGY;c(1RmWJMn zaTf5_$u)AeeK~P;5c5i>I)3E9aP~;U7OJgI@uIDpj5H5{Y3`xDHcCZ$EIw{=SnG~d zrcW}Hezdm9hPJ=pP6~ZQRi$*K@B{2y? zYhO}UgGV8$ZFkhGsGiUp6;uf{Rt9?WL5Ry{mWg!SNzkCSTe45Bv5qQ)Q)SnABl_fA zWH-DXcE{%_(tqwl=o`(LCgzkWgl5Xwt-OcEa#~TpopH55PD0*NF=oCsxF{mG$3zY% z9ou-B0dbWz>*BDNSqDlzR&Z^1CZ>31$7aX3Ql4fos4yc_{YBmS{%m#?C`K9pW$p?i z;l8uhT)pv)2X;mTjQt@=uQd%>x@f4Qpjty=a0IBOxGNDC+s;KW??y!>D&=Voy60Ve&$%6kg;KNiG4vJ%(dT`~*2nB0ki_ZZGoRg$TOW-oswSW=bx z33oqm4}VZSn6O!?=XZHbQ$JDgA}Ce`1F2yNKlw-r-8Nbc-M{t2&zTQ&Ic7C#(zWaR zxzS~jU4C)r!985Y$j>-2sKVE4O4uizM{%&MPuVICbpp1%OA7t6fymQDip7q??5)p$ zay50yESNd&sH2Y2sgt?gkMPjx^NOgguN-+~LwjMC60YfOTFc|#grcFDORbbciW_yS zxHEzP^YcSuTGDuK43{l%5m_wvLg`wqAP1{VQI6aD_{Kz6pr!)>PV#^em53FD|!^rhHlvq6Z z8&G~*ahdzr=+^xZ_SuLXdK`6(5eK|u5AH+F_O)SvCGl}oJosX(`>mC4CpyjN9+`#l z{m&Z^B|S0Y^(N=Et%KD$cNPvaUzi$nw52IE?+kM*Kvs&R|uZ>gYaxSOY+n z*I~O6*{s-Yoz)(5pNWpN9kXgCyJDFFjXG9b^B3&zWHB~qe zCw$?Zbz9_pP&_AP>*ER7`y!+stTHLX3yj@OTMXi(dQ|LZ#Cpn;hNV&)^CA4QTWZ+r zy3DY)6!l|b?6M&BhSNeF5p{x`!;{!*T(W&-`{pOlCQ`?)U~|335>L}T9l(}iHx)u}@-d->9ll=t_2v^lwx zaMaSe{Z>-dww?NP8Dn0%cI(|pDF$#ssYqibJf*oc*qxvs*Iq;=(riR9xOdUyc3n4$ z9t_rk)PhU2P^j-Of}&nG3x6Kej<4Ptccc#ynff-9mi;(rH+f#COK1tf-Nv*`#9LN! zyh+X$u!v+{yZqL~Tddvlk7CD~o8|&~f02_LNXHSJ51N6R8EK?z8yJ`(1E_bi2?np) z2hMNbuOX#3T<*Pslu9it($PLDC@jlpKp`B4#K7DzCF({~v!tq+5e@Fh&^jh1>iAbU zh#-z72?~cbosBPct@(5?dwEt zBhA1vvJD0yia@fLG?CYDNCHUZqJ3aW{Gm(UfT0ZYrYdcW#wd{W$#5i zhPiw0bj(byTw@7>y^Df++F5I{a(nikM5QHFDTUY)>lY$*-)M%cKLC_lm8x-pfBuOA z3f7&Af@2;4R%^Y`8irdu4~vtTuajI#TgthDLBhLBpJQBwb7Rzn@USW*$H5+!IuGMK zE59}nmD4gYhR5D}RA4coJE?2@?8uks6=^>+?M83tmoLA z(WjG$%Wk-pNGXu)R}`Qy+*nf_!A8V2quep%wEX;#Pi@=Dz%tm|gxi86y0WcBO6?XT zZh?E46UH(lch-60*8l@{xW*oC`)z7*Y}WYYHvYA z0;IlS4;cac-v$KVIm1aC{eNz8gTWVAvg?;ludypfRz~q0zVl8k6Evz0?dhfy#C1q5 z@5g=8>rb~7@A}rBQZFx23RheSm?~{!X|Pi&xj<>J954oI%+uHg7tc-e0o1laYG>SX zDP861F0>TUMfI_aA>=H4x45BH>ut{ab}>O3B^1V{UO&OV_^#NgXI0Rt_osH+vv#WG zmW$?&HF7G}r6h0<(sKm|GBwzqwR|V--kJ84Eowp8UubCHadc4PMB=E0a^y`%NUy-Q z4->|c8dCEL-%rgXw!?m$ydRD*nWt@3QR-Z3H-JF{3wIy6Z>phfw5)p{oJI;YU$`qt zM2R+O^t^4R8QN{Mw4H)hzTGD_-7KTAbpmD5BREivd6RQR8bO_S+*-HqU=!x+h~mRp z>f|E0kdPO`zh1Gc-yKuh*$1@@@#1~Nq(A8phjL$?*7QRiWt?ksvuMCH*`l^n=}ol5 zMoHh!*EO?MuHA^5+k~O#tzzZl&no~v@1_Rv6(@i`8$aUkIsEFo0v6WNR^MyJ;4}8S z^uY`1*Vsqx;tCe?Tb7}U{29k*cqPXgDzvnfx5CucchgcdKuhJ(ZqG&}O@<8%Z7E*W*X_7t?GH}`EGa?l z6Oh4-6SO5l+p?kzG=DhlMcfqS*~;F+Lew^0QKwNw6ao~L0LyqLg5t)!?FF$~1fZw|=Ox=a&^KTLLj&y;8;~HF6^Y&xax0rA5klQB?$? zS7`^ZK(6jCx`}BzZ6jVs5kc=-epas>iUr>7lX$-00I9~~4p236crUNWZxPt-U%*P& zoxI2tGRM7XL)R{HU#^!9CiS1RGcrfqn;%`;0U@3FZP}&Wm@MsUrBro?5YmUmfSB)j zOG_CF^x7!6jF-=?F>vH6Tmk_W*N?$dk7BFK^x_+?oz{`QhK`#4=3R!cOD)iimmX*P zCH@Wk4SWHXlhM`dD(Sth6@+x60p4pf5DENc*-Vo#2R+!RhyC6HLIZ%qdy)P|=Wp_6 zM@&xjcJ0|YEpshmUc}#qs=Ga3>A4e`=HkeUEv~v7C=y6o9vG@I}Q6uJQq$rr}*3`y-}uMCq}p zsDIgqhK_Az36RSB9e>94feK27_3ioUX#MTa*SnVrI-@~*jXOv6hI#@O0iSx&hh@ADN4GbE9tmWoo0|oxC`j zppm;;qPYkwl&=ipg(a$-ovJ8Ab=$6MVhvln%nU#ojOXTK!ZsTd5D2i{51p=lm4UU1 zvms_P47u;zlnZPc(wXBrW4oI_jrVjclxRdav83{x@$Cqn{qYzFxG792&Hi>2sd?Cm zjNZ0Yv;5FO0u8^J+Q+QZ^-oc7OH$Ir@QJl;2R6mXa{7y-hqinQs^EFE@<_MVK=a3Q zb>z{GA4!zw?c-tcf?W?837`STLrn*v*GgqOWNe_7 z|1mhvTn^8rXf*;ZZPT-$Q1$uQti?~BQyg%OvAt*J)&DuGpDG~5An#tVO#YveUa&XCGwjP1sZeh8p z(trm$Tpa{FTy-@+45q8(;%HwbcIrIuJl_SDZXxWP{dVtTGTrk{vEIxpF*<-7H&d5B z<%wq7oA)@4$6AK?_yLaXnkr0t9-KQix|rG0y`IV|J@H<>y_@p=D)#h=X)AbsSIar_ zZ>YY#RY=277Eau2+qwpDqfd}hkpms>+Tmajl=__sh+cI2&i6jtsIbpHZ4pAX+oyk^ zDwes=;yW4iS*EWiG3fq-uUq$O`2>;`#=?wsUo<#buVjXD)wmyo+h>B#kT*VU8F(CUp8#Q~R;}D}(|l!PGH^r# z|Ln7fv5xyqU0$JamI2P2A=kF&mkj~jxtCucysk$HJgRKdyXHn8jcCqh%9Z+7CDyFD z?C8EaK|-kK3|gpvA!vR>BELgq{q}WCxl2YXTa|o&UHdCO&O(i!aF&*fC_i z7SekDvxcC!M9!B7PrsK!h`ssE- z8xqkX7A^@{j)7?q9`k~7v>`3y>N{3+|7r0TxrAXB9gIB%GLPhsBIqA_C#QWF(`C)# zBN_-~Goc8@_MUsz$apB)fge`nMQ!@vHTVa~GLw8v za^f;6rams!?|n7KjhM9NU#UA=h}q{`S+w7*<#TIJ1%OXu;`n}Y)&UAGLriGi6@_Bm z{N>1LX{cUJUIN7Ir>mkf}N_^CWs%~n|r_kb@*HoN91x^Jz&f{-e+OPk#3nG7v3^v?MiRG9s1_>m?pOj)htQfm% zR*?W3LRR)o<&bPCzcgY_^H+>fn-WN)I*sFgz=s$lcq4jMBf{Ijt=RPV_G@1cA?uUn zxG@6_9|~6%^%6pRLDs1W625p4Q81+JO`|D5v%1Wi#5fx5(+i#$J8~^+o{OS`AT+qB zAz6e`+zSk@j3kc!E4froF1S}3d9}q(<>2xXIXEu$1Q<=PX3TYFUHH?h3p5ixFzeH4 z?uY7FM82M{*^GgH2Top>7q4ID-W_CReLFC)5Rnj(}@)<>okxK7I)U;oJBQmO*;P^{#z{5(f;me zbrpqSBouX~r&3)UyLKSO;pq9tJpCuEDjD#@;avjNACNG)5h?!N4%K3&6OLA$)1eb3 zwTZdXL~51sqvp%R+lBe#2$wAOcP<#uHbBa~=1cvN_H(Of&*3c?61lL;)dkDr{aDyu zgU>g_B^Ie)@d`@vJmGvV*yIDc!EBs}>m>09y%a zjpRUe7R`o#A-0^&Y*^g@2YJo&e-*`s(Z~91OA+~=g!-fjQ_Xt|bC;FTYU`Vxi*~73 z*$o7yRgcfRfjA#{lWh1bvl5FchU?6wE--O(5${8ls>%dy7PfL>yJHRZ=L5vqTk2~J z-5lL}*|!Tf>NDHItC)^RK%_cY3a33Z({sfwwfV2-@~+MjUo3>uGM&wX11`5B4`ZYA z)rEtFXP_p&USn<*`}KhYtSU>FI2hD<`OkX2Y)ATkyENj7Fq_lgeDKThDeou?)B(U% zoL|F+H{c54O@nffqQP_W+rDo&g3mnSICsv5me1bgpvaq9uKd72?Sw`IE%ZvX*jT#S zW$m_LJW+@uEgdI4esw^^`5o>`GeJOWxjq|&-}bhN{h)cUS2&4pjW=uPyo?E4B0arv zI6j;JD>dHiHxa+w^12+AyLi&>LW3i#ZtkjCI*=Yo@ulc$&%rhNd2<~%X(Q=YQ2P%l zUgzHqRLnY=9FG%MueN302&xiYHi&ORvmMS}Ud@Y(yPm10UhIyHU$MXtD6udVvsvEgBjHz$L=dJbfQCmMu@B;S?cOPvMOx^F-Ii$itlyXkj&bZuNsI290-6>;is z)*IHisb(lun-WQAve5s0ZVTBfGGn*Yi1WoB{L3)~51L|nsg@I*Ls!-V$>!$#G6N^1 zv76HhuMbz63_x-hVlf$V!0O0B?CFg@E_(XvU);tlC7zO#8D#V1G;~O1o6m)-g`~!f z7AS#2HsgK!%jt4%2>FE7=&BRnV$1E!FhnV*a=eo>Ue7Y;K}RKi4bKKkTks!GJFEZr z0c+HU>|sY~{n~Jb#Iae$LD+G1#4GP2=tc3 zptJ)N?tgJ4*K8X0_3wrJkAE+_z8c65p40f3ustIT^A`0tX2WT+48MfzFUJ`HElz-6 zNVNP@j{oKJzdW7=%l#U@Cl`DSO|NsB`gu;YU_;QBxQOFj*y{0Yx16%=|2Yi#A6%ut z_IgDrpRie+YxG_ifnM5rahaJbkRI2g%(s1|m~ebliTw}0_Fr##*5NLYMjc5wANe<* zOb+9EYexEBK-A5bgMN9Tf4%4Zd-n*s3+S%#~+t7YK8>$fD%Gh~R(wQ4Q7g<@GNcuv{Lj^v3scj%*fBlo~5K&11*6 z@#}Cs`j>Z03H|5zs`tXk#{9k|mPyS~x z7kKU}Q-Zq`|IuZhT~Dh?QPKbGiT)m#e|#F*-x2dqrrX~G^Y_5~+Z6Z9occRr{*IWx zBj)er`k%m||GNgp&GbHj^G0s@xA0g08M3O!ptNWuh779v-VGd94|(z6e}FIl$p}3l zlZGRe0|nZ(9H008&u;aX9Q#kd`4@<3#_nc1W_X}4C`0<6;l^4t08k@vW%&QI%OC-O z`u>+^|7uV7mnZlKxpc4^0MriVfb~j{bx_~_rUz)z9TYzuG;V6SwI8m_M^Br|H;Ka)jK`~21RhW(HpDv`V?Vw>&fXH{v9{0rmqyj|DDRO z*0F>C;RX0#0>^3WYtf4tba5~cZRNNeX~4|ec&H~2U#hMf=ZgAYEtS9i@#Of8C~);Z z)Up1};Fre$=o&q`X4->!qt@vOyJyZn$-ckd#6O;I^>kFg=r&U3BNDnC7&N^k$Z3Ba zwJ+kc>sDQ^XYT@B&O#%qOJYFFWi6}6K&L_2M9fR9%s+k`(7p1Pb@s+!5l$cJanbU{ zV51KyKoLH5SmsjA`A#}goBUM~z2{$jD|p8Xo3XoF>SHe~jSg4CIM2t&MqOKRi>>hg z-Hxn6;0|El8z)n#B z&G#Y@-XIeDy9(EK|0R_BF&1$|P1BGH{dr;8j?f~9 z=)ZX}q1Sh3Z#wv2N}-#oq?Vo`xulCDE9Fm>m<~Y->l=JzigncF){A)CN{mq+ zW)X{I9_zyg*agn(NT{hi>bM_3NZQ~F4@I z9e8qfDE=YZg~ zqj4`s&9^dgjgy~`7|oo%xnFcHrJPM@0Aw79ayk2I^U6lJq~fX$FZVrY#eUawqdEPi@CVk%6W7uUbW6jo6**MAMJ|v&Nk|jBZNsG>ijgw6+yXDMQzILCfE)$rUA(U-NB%yox~gy+fRQQJnU#KoKkO2VvEn@{P8 z%_WER9fL>eyh4`bzOPTEDn;-;X}wzZ8CcMT4sNYmy{xg} z6{1Slxx^DIbSmA+7s(HwKe5V$?V;%QgKDjw>ud6styT5v$JuU2#Ri5@T^YwXeI(C& zxfIJxjlk_D61s_4tLyAjgSpQ4qIkM9{DW+pUwtlxg)Nuw*mu+}Z_& z2c+fN$qjP5xl+BFUA|80&e8h#tST}UX=R)T;n+;0U-KH-o;2TWABC@0( z0r8c56JK|IE9XXGJjxaEY(gvhpn%=HG&J2Oc z36NRE@#OaC{vquUUN5u?e*ncn2W*$=(8y}r1iNB>$OlOULqlmT^%sNZXCa;4h??mH zSTp`qDOFIdx~bdMq7G6Z6v9cVF-mG$n)Xz0>o9wavwwh;ihjt-G$?L2l5jpQ;woi@LDiATDSZ%li1DFl^7Dri8`nw1qRD&9JcJ5O$9lib!PT7f;3XGPVCDiJ zOvcQ`3Rxg|WP+-W7xJtMWc?I(1WALIRYUAbuFI*C&q)2K*_+{N@eMi=x6JUnK5&wz z@0;ssQV@9khMRK#l*7w?>aDskxBV`|{rH~|MkO60NPLDTAv^uAYnZDG>awKXu<|oM zToLAxaqgRZ8j&UP=@l2S`i*Jgsop2(&XpN0`Dj=Z`omAR+0(?ughmo8eWM~vrClvy zbiEhKpItH`=kA28U61{GD^Hx=S{8fTSS zdu0(5JFV$5d*z%HC~H7h@F1C|dR}SHHgn;`pQ&(*M>TJRe5m^MP}a;dfn>|)X=l~@ z*h6M;Uth(b7P~ycP%0eOsKb0wm;aVW2sO#@UU1_L%eY-PB=LC5{ zc}1SuHUSu}lGXYQ^70*?(K|sIjJ(nFVs-evAU3VK^cAJ^g?gvmgsRC43%R?|4|h8~ z6}8Jack(UG#bZdt1{KTqmVH+*6os{2box|uWLceeIFd_~8IXey-WZF1Gj4ZfCgO3} z^QSDw(DaFHW$%3Hl1zI_G5FJl`g&6y<)EJPfi;5!yL_{=CEeGgG<#EGWCdvUr~u5Dvgbl^bEKfB#H z2BcaiN@P2d0NJ+!6Uv(^)hdI`TQGZbVcyBAQ)3^`a08vhj9i)?sY{>>hBHt3ZL=sS zEfZp@vh8YoLVK~51y(-vmX0CTC(k>m=`?iaLHAZHOk=LfoS2(19i;dXZ{E1HqKe4i za!b(CLSN_8N5D@vjeoW1Y7*>>a>!vcPD zbFUBe%^STaE$xkHS#?^r39#h|m$cEWd^F%O#dNTDDlD=BtP$sYF|(-+_a0QZ-38Xz z8G9f|opqnm2itw8>+DD!v!9!BrVhfPTM1i2x)sVTL1<>~XK#>Mz!RSU+hlmm^{B%3 zP7xaNJ97o6;NmJB2j~Xh{DsNc23_^FnZu&^-uENAx2!-8oVomHP~v1Eh@lv!z1{4_ zX>UV6+;T}+O*Q|6g&0?@LYdyH=+NHPgRa<7(cX2#Qb+TtyO8}a2K(>!Kk}K-vBc3akaKQ4 z^l(;O{6a((_Vn9BOIxnxt1M6zw2owUa zfBBy8svkDag+{XVOZp&l+lMj09(UUO9TW)~& z9}m>>=z#O;`(0S+#Sc@IK5Q(n$O$6dp}F=5UG}$ef^Bj?`Ojd->#sJsEwUJQW{A8sxbQq6GX+Sf8nUw&7-e1C z>T?&l!V=3>lG5Y(CW)a{W-mSe8+Bg8fz-UOK@gQ(3vuPW%!~s=H^MFF=cX(dyPcTI zo`Vl!*H$k^rE?@bOg8-^j_HkpWJP37157*uc;n6uZIN{AciiR=~ zR3nJR%FyPAPVg_m5OLi3Qv#mgmbJn-a1UADw#wEF9}WtL`N7G0C|Ut+uIhpg%kHU# z>f4%=uV+bT&7~QmbrF@EkD_G_Hsy();crFC=?`9RmZSu&AhP3XE)BIUO0W z9gHE&?^MBs8Oy84G-@|DHU(p=8zTPH$%TuM;1HTQ*kIb5P&Envwvk2Aq7m;?tCv1V z*P3}7f#dE^LEw-+Kd(4J8)x$q&yJ^T4s){d;dnruFRTyCl*GJmcIj?@H^7MV&%mgg zfsyAi% zuXE7L4f1QR-eduic|c2#bL&&+1BfG0Eh7$J=rBdKLVN#xGK}Evre@%jV>2bfyA1bg zpbcSTwX`+R!wMJ!6}*eX0gdJwQT?$IyZHy1jvHy95WMs18KzU2L8F;Ns+$#XyiL_l z@Z+SVGO^c`iyoEq%?C`CH5GW0v6U%1%=zMs>M51u2Q^2AV?_UDpR)ZSa0J6?igwivK) zKLgqzDkW)d4SC`_C(s7f#)?fn)ahkysUPtCG>Fdr+l%{tP8KieN%D&Z4BAV-*mPxz z(#;SBPGRA>7r{w=(PrQidz4)J6g)tjIx(6KGz?fKjw5A(o&*u|olN;y?-zBVhzU3S z;nR#NV8guHvDt*uzRwnUa|4;Dt*@zoZzF%&%0+9C9i~t>@NrzQCA!}!drKyQqLqrB zzP_m9OIsXbxp{0;!w$t4Gxm>TV}H8=KX@|(JrUomE~kFPP*8pi)rkUO<~=Pxcs%9d zX2teS+%3mz1$i$!Vp(Bf>upBdSS5= z2t2sa+ac*t@NMY%&}(s0o<~%Yy{+@(jb*?4#zD@!0+A#8DwV8+Ayt%m8RZIAfe;=-7c8wfT$L0r#?R52 zz7*2h4=J;PJET@V%MkX0cN?$J(<^R-_cpIxE^pPav`7CpvSro_=iLY>rYfqL$53IC zy2L8)XL-hCoUerC>Z0c!4`tjFA08}R_wDiE7SGJMEH@)X$|`Nd$liwt91q<5p5`54 z2ee!MLv~!^bTT%tVD7;Z-tz~Z4dAH=b$9-;!Hchv4yjO=ZwPX{!(0WlJ2i2X?;K3l z?J{C4cbAc}oy#Esd2nqNTJXWojYb#!TUI{qhalb}t}iEDA&{1afs=hjG{2toibqsO zTR{}&i&xphPX6m^&DBW4HvFzkE!7=?1}|GDN2-z`+Du7_beLCKY2vfX+C+|EsQ`_R z*h2EtG=|~PLK}9k?aknGJN{5esyZ}&aP%wZnk_l;O~OnTqQ9C@mH;}KnGu0^h&r&WRSU;KD1|W7YbjQZ=-TtXfj$64~3p#HFvp^1e6gl zaf%suB_Vd#lxnJmYS?XF2gL^lpQrPUaF^~?Dr`T_8p8w%N6LWgyy1S<5;y8xQZNB_ z$J~rs%Kct%t=DOT`RrAK92x9YkC)@hnE9oCz&4=|%SkS*^!I9hNFeQ-O zxzBW(U%fEen^ms604EOe#XC~`XqM_a{T*4ms|jdrvv->;^wP}OzcGIiMJP;?G(d{? zV_HG98h7!x!One4?O83N_CON(v+87qG|8Yhj_uZGwWtK@K_@Gx$!8mt0y8wOfm@cx zpy1ZaGum1;6QT$wKK^|ywmnmm;N+QjKay;ps-cHu78LioFq>m9PCmfjWc%e0tp&E@ zpGtms)CF?pM2=s55ycu}CL^4L`1IprxIyq6gd6q{^e~Cbp~YYxY;ZWVRNS?33KbZ+ zj{n`g$*-%I;&jIQ)YI?BraI*TP5&y*3Jzcm6r* zyFfBPKy7?9*T@#w(i$e5^GXl+b)~sZmlF(M@?1GhKl*u;5RgXuj(AVV=oaE9S061x zbkBDZIUQXXRXT{&`wgb}9)`zfmRRe}%|5gKTn3|R>$a1gc>=1q0Q}8 zr;ZPr8Z6h`&M7^kC_Ys28_N%Fp}kV9dubZaPr!$e8+pguBF)=sIG`P&`e^1eYC0Ee!F;|L;QjrSr%nitB zT^|}B#bW^x`<7Yx3xsc)5j@m`2-4LBsV?lC3=~4wDIbb#>ogla+8mEg;Y;K2zTZUDcc5T2Tq6mtpq_iSk(hUj<(jeVRcXw?O0cq*( zZi!8^X^_rMcXw}k!*>HS^UOQ*%scNq-}C4Dj`_nu?K`e(T`SIYuC=b9lP4oviG6l@ zS}R%r6j|CKm|w6w6<}WuV-i)nO4HOHNF7z&R1q; zp|kiy{R^Ut+HyuavZX2IaWAsxR7-MWCj%oRI2|2t@2Jv>z=7U(cqxTe(}ny}QbK-k z=jVrHlLq8nP-=Z<|L_vTd$Nz;F@KXeryC!{&7;0Q9FJBJ*F5H$!7z1k<^h!cs5!!% zQGxJr9jG;1^$8I*i}gNf7^CKcFV(Z}hB(hgR|?M2b6WKzoKJg=bEd!!QSWHP`@5;Z zEwWb%d(DNMtV`Ki%|e|_S+@MW_qF<@S;-jS`|0oNj09w4O3r-`_0PAh3U{U>G%M_9 zzqCMbE;}x{Al5sw3%-+&#O=Uu&-hdVDm%RoYs&S&@nTu0Hiq0vIUVtkFjGUa0FQa@t*dm7PgnOVfa6*0S zR$x|BT6pPA5JNnl0OH-;mnaNTB0BBAF{~(ciRZSGKY!iOGGg?A6_}+Jh-c ztnA|vu}s2dM>UsWalVUw;{CJ_!^!LN`9*}$ZaGmvX<%7+Zc&0E|GUq6PW|gChb+oY zmNLA7G}9y~9Hy1FB-xNEOsWv!-W3}NTR{a1Zk~&W@asPS)88N<_OQ{PJ^TEJ`zFuc z{@;KH$S+>}K-C(X+QUP7R(PEov8%o{6VoWKbZkB2z@Sv(CFYdEiAD|UP~ zY^joBt17n=UDx81&al0zD}<@bph!F>(X9Fq+1Czc93Vj6vuM{%+g;Tnk+MGAxdtWl z(%`~7+os^PDk5O>4SYxNMl~sUpXBK6k?#ou+^}|dRUOJD<%Z9 zz{?~{6F4_**J@utRsK>)Prauj;Fb%h?{PkM+S}4WMu;X!tk&zFdx)^{u|CeIosix$_S5KU+1Wm7T~P6OgL#`!LGy4mu8&W~ z{%g34sSr)V)30j72(me7b1w|fz;{KD&#M{xFso|i?``|xh{)qN z0!jFk?-QB?rtro4#QVQ)z(Yuo_q9|}!9N|c=boCvSf{Oh;yXWCxI7BpXMHn0*oPxQvbk-gg zNw^V^6frE%nrUvc}-Gu#!9D5%U4Drv)sqdBi~|}NbT93%Y&3d>l4a6!U*zD zbu1IvF_whoOTie$D=AAXOgl3J4_Q+lcx(u&`T?u>7IWZiB5J+c(>?`6>B40qT)H z@hCFnGBArJ2^FiY&R_g0(ygySX5f}KkPFR{FZQh|sq^%}z-F}gX*_Y^HY7vCUBy+|vS0ii_e^gNMsEg022KSSq^i7_@FUcwjkRacaqx@C zy`Ww8aT`)~pxbcgg{I5vCDl(FXDKcW$D{H3a48?lRPkuwpvs4f0(eNA*Yci;O!c~{ zPhy{9d|+G9to2^UtvO^!X(Yd)y^QCV>EKD zlLQyChk=AXhyD!1ETEJau#x((-rc!w_Y8S72+N>pO^@9VZM(SwFGhrjBX~V zxU{H{Rr?D~G3zi5c_RyF$qffvhCmh8NF7Qtz6vH!P`Kp#{%56y!mfZOW#2Q%~DW@aZ1CX{!Z=OE5pK(}w_a{xTTiY9x+Hg?t z^0H^x8@BCOdD)R1UyHe;qgE^GUE#W*!!QAk{_M_PvNek+wq%XkKqU5wi0NlP05z zU-+h@{uJbnMJr~ZHr+x>t*hXGR#}PDdI62cabcRC2~+5lWTSl1RVCNYEUj%W1R2 zpy6<|+`9w3$yiZfl6Go*vsb|u&ctIAyEm#)TvtzFxm0 zJ?a0jDMkn##SGtbYQK-a7uX=EeWbOh7tRDMNS*GL)T({$Q&Y3p*gQALxyuG&d0La; z_-yZE%9-Xyt5=Hlem4CvR)Su&w=hbp{_-l$0eUs7#qHp& zsT9vU`SLy_c{LM`{*KvP%6WT&eWy^E=49q=UiSqoS2Tej#$Ae)O=YvL?Vu+nc+Yj$ zIF_f}0^E~qiIHdeRN4foaDriW+gIndJ zyIVF3xX2T2@V@GB?v83k_}#9Z@nh_i!ZUOLB|AKuiY(`rKYSW{HcU+q;KtJ!W9Rc) z7PB3Tr9UJt)WbTMPO9YI)ZFpcy(E;bTsPW0YVB{+irQd~?sF;z>ir<@)cC)L%@P9; z`(bG0boRT+^+$nC9@|H0W5QN07BikewJ;9JVkQ554`FC)6j%DtL{u<{K6c?}+c_mY zIPD5#RBML-XLQNQ&PuD)DX^AM3vFmEgkD*!Jc&NtmG{Z!a8=X~&t@`}Y(G)Gt+1VB zMOPbQTLSj5>6eLXnjI$(sPCKrseKGopxWIai@luQ?v2(4k1KBr;e==0Gju;E1zp7e zCdn;7_l*0Z`h1s;V%C^pyMk!Av{Ni>W7p{#JEsQU~ zbcPEdpykZLnTmrIaLCWXn^kO$c<%+q$j+?< z!#mkuGQI)1ni$m&D(-?2*IDYWMbv_2Lh#N;_X=*0mtPABx`jiDs(!np3g)(Ir33kQ zleH#wE|-RGpjiXkiJ2%2NZyc1F)6-?U<7)HCK&9U*#m-U0GrahG!yBlL?D>^Eel|S$% z_z8gK&hTI=IvBC4v!AB1+otcB$SrN49vw7|6rzSGiS(yc*$p{kU5C*FCrlG8IC>!a z%+t?5Dd=e(Yq(OXEAf12{4DTvDQuHX-*&o1dapaUIW=5`RNoqJisXGQpQ%8vz6XKo zFsP`_wcxYh^nglX$RCJarXSq2;o_@Qieq*WuH;?G&2H$3a_P8%U2>^IEJkoTdkyEujj!UYdHB*1U?PaDCOtHA>V(NWHtDsO^`$ zLTdA1Q5_cXylMR?KSQ-)VE&bVq20OjqQA2UR#84dd3?G0lWSMU4FdqqWj;Vfl(%0; z!PFtjkc+sV+?WyYcxU*WDI{uHaq@<%f@PzhzY_(L@busFUZ*^!E_m4Ff+W!lhK-q; z1;V`u1LFhB-gbBy=7pEFQ~_yF06GfFgEYS;Lv>-WvUo9O zs7ceb(w)yk6)rUcm%YY8Z3%?RQReKz{(Lun-urOs9aQ zMureXaosJsoa1W?#V3L3Nf(V4A7G_noM$6@F|80j-yWmze9P2-2?dzbGsTTHi57^3 z@SY@Cm8nfaJ=8Eqt6gDP>o{eSp+fm+2q1E;0z@v);_2SkDZUJqMw0kWPOw&WD}|Y+ zEwF2f4r8{BT14lnlR1q#AEd0)epI>TZPl&i3x%UMs;=p$x;WnJWI%!iP)F~s0G4O6 z!P+-WFHubz)LRI`h^&ZytXuxO!!61C0>S}dp1_*DMHt6tj*jWAJocX&v0@%}tC-ye z0`HSauat~3`a_-(TyadTccNTzGG){0acu9cHO)xxF@0Q~9-bq{@hNLY)ng@z?t z`hH3zQDsF|bdvQUu;<~A-eJ@Q?My`>{UTGh-p7G9GnE&CjgE=ovv9ETO2>U9q7*(M zl2Z`x*Os+vZ?Y>wLz{<`ZcJwrbq52*`w1AX?8!1ttR~d~mOs6MBCQ!N6NZbwH3{xV zb2&{u;WG<+@oGl*k)l#SbH%FtET3OXmPY8*b_`+M*L@+*A%!`K6MS_SLxmbNq0YdK zuUidk)7O4qY6xHZh+c%k&~#!&gYK@0YUV+^X6$hzkHvzX&LdovWcWPKZj|JvZ-A4p zymWzmUb+*+^h7PK!K!!&7IaQ7pF;?~s5y_y4lh`$>S*BxoHR2@%0IR>Sd$@MjMVB9 z38f1jW_5n1OPEvm_1u#i`zG$c&tc--SP(afuU+=cC7ZWG&{%^R0GvQbx$G1SoUKv`K zYGusc?dZhc<=jlraJ#UL7xS1H9FGCMoT&|0DI-X{Z|D+xcLJNMBlj>I_GJ+AP^)nP;x)de zv%(I<6Q)=31oC#AL)OC4ZmPQ?sgBr$w?+;=_`=1iikx=yz^w z@pNF4%cuqk=m!K%Y^N*81yJDot}fFp%|B6FEH3upoQ`=%I%Ob;$*61)xzYj5g6d~G zW$Z4M!q2k&(7D-+)QH+Z1T1TX1ly01*A$dpfmRFSGJh<>b34TV5*@0=58qaO5wva@ z>1oy4MlvFl3;l4znK9*Q`tn-;%AeN*RMk>{;mCfk{zAm}JZ@8E)f^_tsi#Pi%a@YS zPbEMyI3T|5hnyMpEpYR)>Wy=Rd4kG~r?tJi4}g_g;v1bcRB^j&fV9H_Y4_*xR=^a>a_jF6ft z{BzQHP>B;@65OY`25|H4yd+iG^(F^&7!``K#oU6StIFy^`=%xnA6{|6g_*_Pfhvvh zL`7~EIhm_HGpEQYDWI8RKn3Jue6h*mm#d8o$8Usk3*JUrkRP@rzpx&)?9~@u*13jw zbut|It7xsWNjsGo0SRLGMS>~;2~v)O4@b{+zM61&NfeOayx4l9r|7>lElwWe=W|4c z<jf&Lg zDEP(+niX;dtUVz%pF~i=);w^_XFs%kma#sORxwokVRkgGk0m}KTH0c9<4f3$gmuV% z5S?yWd?p``t#tt%wclI}vDg#3U%1Lt<@DV3SWGB1;R484{0N_xo7#>OESu*^9;)g{ zUwXnEy^}%n^!E<=C!kjS1)i0d^7#$xz!^tNU|Ux8+|a3CV1ISVQ%lHak4L4ML>Wk;GNPQ%Q1GIb@T@~mHmKK{$mw`A@onCPvT%L{3 zuXtpw2$$8Hz}A^Rg+BYdxwHiI(l>c27BS~mm_L@9pBd%h#GDA+e!yG#J@{3Hlb!c0Wc62ee2x{ z0E1gs$nW71ZnoAZl@9j&$qf+!{Q0eX@jGC=V*=fY)iVpdiw&uX(FCH0-su7srwt!g z>H2lnl}ap4uEWRmF>hKsA3y;00ns9HQ)+XmZTaxALGMj+sYY?018Qf>X(H4!t~5v0 z>n2k_@xiddEeDaV*od`p7l0#RUw{~{J3nGo@aCc;iG$E}P0IR3?19u?UfF6z zH{yBp zb?#1FyExYPpehWHnezx7$FO4wsXL3Wc;p459|e>BvA0uQ9@)2#)2me(b2CDB=Q^oA zs`#DTlbxDM&R5)UYoHH;k>tV;NbIh=>}4mE3?0t^`PMCbpYx5ZA$I2r>y3iKN3Oe( z=0B&4yL2cHN0|euJOFVPkwQ$lS|A9Fef2+)ya?)}qNJxz=3%Ja+L40#*D$rzXN z1)$-HE*6?CC&@j$To)qhc&$gmTj-?wZ!Nj+}XyD%)AXEu+)(Hup7l|lCiZ1tJm09uZ(uvQDD zs(;CGbr%fLPNq?0}E($26Le4>>lAsfx^(yKofryZhJ6_YK+SVrvd$4-mkTcXTAqDFqU$>^(^0i2Y$iolG%i`jv8B0?r(?Q zzbi2+h}>?E4!4%`_{j}VJ@J4rLbqS64elgEtY@$@x%BD$eR(i4%OVyj1#-1ffIva4 zZ+%tHOzjOO0L`dxQIlfor0y{5-GKPBahDm=p2~6yC(SKnSieqz+U-pBnj&{6tf?if znHAacl%DY4{Rl(g$Bv(Tsy6SD*>{*?@iAMkvD`v>)R0arR#e4$${#+1ob&XTXc0j$hA75o zpm8(E(Kpy+M>(fqj;&I&r>`No1t2yYoXPZADfFXYrBOdLrsXo#h}IL<*tJDGPQ#Z` zKi-lOyAWt_tmVNT;G;qu6|^eh1CA|w;pTu)%5wad6O7=n4NK*Ye0%5gPR~bS-P}id zT*-D+eDyE86y>6$L;cjQ`vuB-7scZR5Y&X6Gz(M1AtEg?xG83*Fr1Ukc2cT%qrROH zF;#q1Q5k1|F$EOr*4Y4E5^78vU=M!F`O72O>CR$5-gy;U5s#T*NZC*DmnaL-y18td$Cv#x`FrCCj+C1(HouA~k`e1fn{&M&plC$0oQi zGisI7nDzk=b>(Efe6LB&&)S&VKrn73EEmWxq}{(Ffap1;I92y5MUMxRVC+L0Bf$HwqkL03!n>1D+l8>&Ud8Mj*Cs1jq>eiL!0UbdTeDH2ikOsaweC zmvKKt@9EYI=(jzbgWmm;PuCiiVb@$AfkH$fC$Axn`66Ti*ZxQr|NO@*jPRhZ**UXI zQ+HfJlK2iOi7K`q{X$JbQ~kD(07IKe;uc(g@n+ibF&=qvDBc8}gDy8aRsqqpifeM4 zr!eKBT@jF4uRlw^Ol$b!mcLuR0P5pC{RWeiqO=bf5rL(5T{094oIEHDVr_qomkDjEGcV=QIf`&hW|+MbuAW zDzz8KivV9(Yw^h-3H0n;yItIyp(}{*cS-JvN`%n^wlox3YTueGu1Qm289E)aO0dvs z!&iTRF}WUwP<@l@5rha;cB-a>okf?1nVY6|?=uW3nez5n#yVK);d84gCe`*gT)e$M zKct?U|Dboz+3(P%wXlKRU>?9UT}wz@>Q)Sg#%IDhU!)LUl3 zvtD~Yo*_bURJ=W)l&Smtgs8bb3M|)=Y+2WG!?m0ijybD3lInD}dO5~h@~lUrt93!P&%} zs*vWM#+E~zsQ9mtDp4Y4YBLEzP>*?MUbC3IstYrqiyz2@u|YpcZ5D;z?Gns&bvhST zVa7sr&Q;|^Z`5E{+!OOLbeC@C@?+WX-@UITZR^a8^lb;X{5mCFTKbh=s|2m5sY#1g zx?hCam%$;C%M(;G^e)fh7(7sT8Q`yA1ULyKPr?g_%o=Ke)|4|f=p*NO!$X%576+1? zDU0rSqCsbekpTr8L;*}5clt=ECip}@6XT`qM-4CxO{!Ybt5+}++y=4BhAO-{N$mUj zb1mG^)|O5!ET8W3a$^!?9NQYVe1i7j_5(&Q^@UFlxj#Kc)o$Uk6mn}ipDCRU%48B- zb0)hZ9_i`wVDmwQSVI#2K!>kahd96a+^l)*VpKr$$0rPaI?*9CjZFgm>nsNM3=P~L z#j=+?j_S)3Ku&pChip3IXR?9w?8B`xxckDs_0fPN&!nViU{l#ev67l3G-vHZPSPc( z0Gw~M=j{rgLP9pTi0fo!bp8)UiG8lVo$TrVmP$?vLmNaU0hsdepL+sz*up6hb!rd429iT=Y~3 zmww`u%Q3O6hx~Av!m$HaE_Y*2JhRbT?gz$dSYjRAX9-w?g><1{qu4TS8uL1l_8hE8 zEuY)g=^sgEK%KrK9 z7Ts51?Ih4j#C7k>U8FHtmG3zt?lIsD@en>d*&3UGayO-djoKOJ8`Ib_inmAR^2+C;ZInM-R z)^Gx45w2Rdgz+l((eS$dLdxoNZI!Kj2lkV3x5QQ9wg9fG#qCl`xh&4H%$0aF;Zt|k zaBQ%%PKKWc5+59=iLRgi0n(*0z#J6BtSWFMA83m1&acT?kjoKY>VXD|8+}atL6_rd zqx4x29{hp`(YB_p3*fiZRw-xiW*@$R;^Yl^p-kvu7!EC*NH3Zg#+lk|AI0E3WsasR zFnR24y@?4SIfE|Ne6b|FUF1@wo?<4M%|U-m0e-XLr@US&|1iv2<=yOo4+ab8Zi)d| z$(8Vv_xlY5kc*)rpB&%o&;o$P>j}E02rM{J|tc-N?`FxwVUj5`o zjGQWuae06J#aFS}?1qmXTVGdxBp4gQBGw(*f~5AM!83HjJrhoX6uCe2l2PFMMMI!% z^B#8ItPT>`9h;4iH;hMq@8HsJ-_I*w79|xI&`}qvK{Rzj&O15^?4*QwA$ZGMiU!5~ zRmxn&xh(7APN3Rw*CA>9JH`dCQ^sV^vpB&$rf-GQxk3yLQ!4jCG)9{u{Ky>%rFdM# zuTw5~g|rPLhNp{`6}rfomK)d7&W}z9w?7vT=yz*JKOx^jTrCn(`rS;b>mR8|XLiSx z-87BkSNq($H$LymnMAufNl6FZ^6!`)$rxH4oJf3L1p<80gBph9)A`3~x=b}yhtYG` zG`Hj4)*|bng>nru!DJLuD%+81nx_d!2vb0vI&{MR2?L zB^V5#bC6Mda>;H-c{sg8wS;{xZ`;i@ke8Um`h&9V#A?0njPB~Zw>5)_Kh=eQqE*bm z2*-sbs8M~7k)U+g#RCRLU?OCxRa7doJnHerrKqg|cGuvcKH2I;nk46YS# z8alXwk2xZg-`eUH{b(;COhD!i3+lK9=-@}hZU+)xJZreNpul$3v32O>WZ&Gj?lx^U zxeYx9264F@jK?H;>tfr`h03bce8PY^hW9Dad(q`DLnie(906s}%=y9G)B6P@-vPwD z`rIC=3!|gfPHUghV{3hQp)KHf4>h43uDF7>npWXme^rY9Rsm_$%gLJP72G~YDy0vA zj&Keb$pTpxN}^eJVLZ*am$O@ep6#efe0GkJn%KwUKgeQWZ1hbBRNLKU^P?zN?h~CZ z1~8`b5Ar|Lf?|JO8m=(%C7o9x!;OszL}3uod$bINc@xs6Gg9c?DltOt;@kb^sBRPG zf?+ziGEpAA{qkFFX?|3{#*iHmN%ItTRq)e>wYAo@G9S)ISV zkz=Bm&$*AvVZc1M8rXOw?(;`dZe2~$OX|3NgOWofrjx6T81mvTvRmfk97`yZ4+KA^ zU*?+_!fPcA<_7(`^YgcJ<0Hl_HsY0=#~h&!-0z9&24;WSE}*{X{~`fj$Tb-b=p|tB z;T}mxH(_{t#E$uW;2aTl>bUQ039S>qnR=@@gs>OEZAm~Rgr zy&@(t9{>bfv?dFfKT>lXN7<#Q;3B@Aj3qN366Z5He~4Uv24C_7E|VQ!sYf3_2+YW& zsd7`Gtmexei8!-KE)Y2yG126wqg#U@5|gOKT|}!nPE_7q;A18`T@D<2rb#I2#d2 zImbS0D6_A2HW=dbl-2-y2<5K7ZjMsE!drL2Vx5UdzttG6!hYmi%HM&OhsnB$YG~aF1y5S2j!QP{$gGF zFg9e;G6Z@a7posb%VXJhd7;T!8;TW2KdsP4q|U+7GU2VrS=sXNg3fFbGgY3}?=xl3 zC|w>-5y>n^jLUAbXY?lVltR2}9u1E{jngb^y`r2I_D3dO2;I0*vVa>UL+Nh)8m;|- z`s!k_<#^Z73~^!mFAeuTTXlFFn^vQU2OqW=0{7xxuysc0!P`!AoIM9)Jh!4q7G zgHwKTc>|Tld6@;HAy0q(SY00FtKQ7OP27XT&cukG)^uX(f3sV^YBE57rOKmKP)r8m%62T9o)}TKu>QB7{Y+}E!;dQDSwfd}x=R}8R79q@NL|d#Rb?)p za|X6rtEuXIaKiDgN6LQ$n7vlrhc_;zmdrQIU;p-RR>iy#F<8%W(DGCr4oB0<21dJ! z8$$L!Id*INjpK1JcV(Y{dY!^ss`(o&b#)&9pu}%}=Y~gO zZon^&_P~JF=75L6zxHKj3lB$9Vho=0c?F+vkN5AQs*P|s%dsb~z#qHF_7mmP7+E+7 z#Dw?1Jq<6}NsGplQ4jF>-!62s9_FIJpxQMptHYzCb$2x09fsC+U7NGbG9!Kc%p#;` zc7L`GS5N<;3|UoFe-|%r?R2+Nw5u_jD0*n25z%j}l#bu!cazQjxSVbxS9ea?u&X^& zQ-e5h{IJLuYvWiIHhha=S4 zK4MPFoI1KEF$=d5bu)WXfC0{!eat%`|p4C5P!Y5*Md||2N=TB z&hvKaf|c`=ect6YkgeB4f_?!so&`|L!q>mvq+d7x&t#bG4FJlZe9y4OS5s2z+jc$T za@naz!er++P?~Z*+dLg<Iz5epu|HsE(eE|FmRO11umw&zYfB9gq>Qn&*ZAJb5cT=qY z-eUdo0&aj?&-`6np#G0X;jf?M529uT>_AuEJMaI3@Z3X`2c)Nt74^>^bTGroDezlmD@I|K?Tx5w!nc75@>m|EqZY>;L`{w0{KcPxbOY8tw0!gnvxu z-?N(6!uOA${r^kQ+LmsC?#QY{i|GW9Z6p#J`o&9@{ z3sLREFmSb+XB0&Lg{u*p=OD{!XY{F{dY}GhUh?mr?==t`Ft5i5&j!@BR_Azq?{UhUOnZ z`}@b>A3^&^(Edy>|D)0V1H175Ez@bzTx;?R7vS$7gqu(NV@ChJ+P!z}uc4ImULpNq zVVLkOyV?OHB4;T#lF;zQ&9dqIK$i`z?3|o|dUqtzjxYZOl>E~xV!+*jRVb-DEMms- zfu@#K;XPZuNdk^5NnYnYk@$a^BKb2t@vq2W#`8LV;biF5_dn7Xw)lB83>75*sf7LN zP?=9&C8vT;tES=kz%c6#t$?sD!|kb>({=^O`%(9AT>k}!RTUfXS6#HXwzr3Y4Vk&R z#oFPx*>G>KlnxsI)_<_qzxN2u)vn*-Br7Any<;;Y3ujvy4#b3++zh8(A&a0I+-b+N%xm)AR z%X&xYPjf*)yC=M8c1J~lZEdO%=d~ii?OIIgDwQ<{>QVw5{(lMJpME#fa-H6D`SY~u zh#W#2Te|h0o>6~oz-p5g7-chiOh)O-1h}b)f7owNmT=w9eKJe31~*J;C|ewQIa431 zKsIQu{ce3#b2#&IBbf6rv|r>_L53GqMOl_t=R2QQkM1~gZM!RSw0{A%bwUim0=8i? z>|FYzY-{d0n@o(9{GVAEH@s(8De<+NT)eX}N)i8uVdU#1W6d*hnp{Jk!l*nDkYpUB zIBiB>J9kcbPBdymBa3qju^p2_uV_4qaC5U$qNBV@V_AJ&%BEtm0@KxO<;nJB&S8YF z0=u=4|MLWc!NLF`8)J~7-0*-NQx*)$(G?rpJGl4SUxQE%4&&x+cgJ6m4c$H@pY4lf+8(I21+4<0J zIhA3;f@;s>FNq(*%F^xk;;RQj?4 z|1vaZ#R;nkiJs<`zHqKYfsx3N)G#F8E~GSxBW$r^yx}ITE)-{AT#ECz8I6*7He`F_ z%Zz)oHYY2%tmaB)_XJeuPTAp*P-^4(X?UP~KDs2! zLifcR;z$HY+);flVcPX42>~5s7GIhSP=7nJ!p7_tzs|*jZ42)(&%0&$tV7M1v!p&QIy}Fkunp-2F1I^yb7gFP&jtA-vip_+q(WrK~3a5?%zSItI2WUo_Vw#Bk? zOkSC0L~O0~9!Q>H+N^^-o4Z~VBl(yb3yF46yerS$He8(-y5ZV6QZakqoE8dE05d8& z-r)N!$))NIahCn|GjOf3Lr`wEe95!yHNM~ra~-)|kn*&W2RW?0uPoJr{xN%{DCa%s zn?z?fOR}n`cZI?=e#Foq31E*C%NT|=m|yhU#~^oz7%6$KwWfn#N}bNw$Lmr_Svv@# zXQVTi8KYu=(`oE_Psxk~e0+aGxVWdPBHPni6*?NinY&ei3EQF%2Gjn;9M=8ePRljP zJskdhBzJc@AiHodOdXzObH{45SIkLtsd15jK^(%GE0RwlRqykS<;nx7v%z@jux(D$ zoe)XX!{ns*Z1gLsP~5neN;38zuVGGv!pLquImE zw0Dh{CsA>7b~dYPgT9irruRfs1lWr zUeG*jY=tGzN^awtI>pdy1wRuv#8DrwucA$T2k+ZF@4j#rU-f4%zMR;zGWC!{-7xBt zr7CcDS3WU_*=t0-KS+-u4R^ny(o`80P@1Bi-v{_%=b3$Fqg{4ngQuVe1~x_t&6|KS zx!4iH%rcYNmdZVDXlt&F)R|oxbHnW74cDmRA7V+!Q`iKU=>Yk9F-=G5_G(G3hA7{< zl>fY)Z9+}31q|PCxY|a<_=>ml@B$_4WYEEXN`t%Td+3MSBA|-FEx7=a8I(oo1S%}m z@bG_Y;nqk+8j4Ta21QXITc#*DaJc=y6?c{DG`OjqI9b&-hA<>kj z-q^hf=M%uC8@cm@&s0wB(((}G2|e!26;#RAxlb*Uw+6Eg8I#o0;KYFL(5GWo-4+Kl zSlz3imC@a_a&RzC<;Y#?K*_becU$?KPs6)JE#l5&YWpK~PQd+0t@~MVcg1tI?uja( zb8#W66Uxm#nNsc&G6Ak4>Gnled3`X#CDvy0=|CxyK{|e45~eucMzvw)rUM6OZrG}# zTcE4!kazVBbrvu;vn}N?1e^jX2&>X zFJ7m(M2-gt_d;oa4hn77zYtWf)$eUL|28rLS4Zjv>eLoJti5F#Q&au)vbQb;TN{I; z*F@Vz`pA5?yVk_4X?ZyHW375DCs1V%O_bK8`bWxkpOz@L!%Y`!`>u8)EKz z;7VKQFuU2Tf6Hkv{iFk>9!B0r7I(>)xNWBEx=|U8)_$c@ zuLI&JdO0*xE_*ql5^YQc@rn1Y0prU#B^$1@Cynf88a_ccWM@q6bhKdmaP%;wAq3DG z2=w0%H#u4S^=cQG{nz)b`~!4K(ZD_ThcvWGQ?1A6Sh*J>X zL^H!Ob?Z*8Fq)XNLIgrFrS7wmygk6lbQ0KXz)-)vR-HcWk(w??29Wf#JFO2!8E;+D z7-d!KX!NaZ%oCI)^vbBHip;f|eLHU5y!{OgEDAB7)@TMjFDi}`b%{n9`>}leTi4C| zs8x5ol-vszPB>hzDXqnkR24Gcl3e0-Y=%E~bGT?hUM4rTwuFwhr^vh4M#{wu2oiGC zTPC%9r1fi&RU`H+UD(>WsIKJgOA&(!+E{QOaaGosnhxc-BMn+QQd5Z(sPjJ9buF*~)!G5991#q_3!L8_unKL;KpJC*2Z zrq{qO2hDBM@Xv;HLhnT+m_R3pY_jKPGY$E}`_}My9`DPqq7B}5o22_N$y3t4Dj zwkMsIE$t8XRTguBQ=Z0LQ~GJ}LU3cMb3c~8ncCzDIK8$x3-?0zrXJ%r{j6&Q9s;^% z;2DDKlY(0|>H|ob*{`YF{RyuO7aFdysl!U~YqMwVUOyoKU0U&`&3b2NH|#5y+mW15kZnC>kVyJ|eNGy0gO(9&_Y zmapJY@_-_q%5lAf&XqcP`m6U-@Q}%!=R-yZn{CyToOZ6-X!f*NCHgLx_XrXOPl6o7 zY9CbB9LL<>96NebX=@k*$*iAPgS+yJdzIRHS|eME>zFVOEfy=BXVn-cblK8puolUV zpW}JixQDM7zP#{EkH_t;O4x*^RB*N7cH>c7dsGm@e=M|ztLhKCS!;x3R|#Tr4WtAa z&*&5;O0OqRZ{bZVj^}nxegyF*4=G%Ran|C<9Bh5lk=|9FQHkt6-PoHx$^qJo=seXHXuNh^*xsry|=ITImf`~1_VluvCxB@P7g zsM)cCA1CyWWIc^jQ&V_ebsEY4@hva9%(wy(v=IKWHEvMIuZMz&p< zhwT1nijR$LP9CK4o%)@-U)DmDT~=do?QPYKRyPb;>|Nze?81BP9;kI9vC``NP?F9s z4R#l2b9}Cgd~l8kXcmeOCojowN+~?@^M;HhtQA9$1P9}%l1hHG-WnI8FGF*T5mAjC z$eKm&QrZ@f`v@H*lo8U%Saqmn3xO?}j5Uqn@A`e|R5!f@&I$DD@8EEnVI zu=Kr(>vDn7JJS!yxHu}qrFssyb|bH9Fy!f#;wiVXp^pP$V%Y1-YjO7PNa$mH+6tMow?w8g+t^w@&P_G(cVv#CdebTco%cziPusFh zI_druXl4!)+R=Nxvew|cfe za|j88N3--YnD;wk_bFJ&PPO%xa8(WxTr&Koh9d@DA{GWUQqU55XEa!Gr?&Iwoz#=g z-euSNp&Dp@lv`K1-QqbMSxx>))IuB%|0LjuzRbqLUpL37|Ny_0fx9-W=WT%3BV__ zjMR`{r_hE}oFbMEg9lcp9B9-Ii^C5H@VPS{n#%Ug{;xAyc03 zq^c7!KG2q+%g)Fb-Op-!kQ7M<>dS-iO^@acIK*lS$ZXPbo?L3LS#3mN!pyqjC^Gf? ziGr0~E8pgYtiPAbJJpDiYgJQ^Zd$-m-|G-InuHHq*v&KUEoa=kD-OydX2W|r!8A7@ zn)j8uNqlo_{r>5NYh27a1);X`+{a^}EMh_vVVFdpxgs~I2W&VO>^oU++I8_=0Zey0 z!@HRm93R=|XuD@tuj;!L#zf2vNtHZzY5afK`_8Z?+iYD$Km`#M0j1gi0RidK1w}-9 zhtNfOl@?lvh=_vpUPJGM8hQXlKza+kgdPYbBE1C8i+;1mIeX9SJ+tS>IoI|5h9kILosIYyEGCET`&!F4#*sHB|-v7ca2U3y|7W9w= zSS3PXpZ7DxX-W;XvQ}Zmht0sR0$>qbFyV6VgNJ=%2S>U#rE`PQ+XxrSmId+aHTK$N z5}$HgjIZTFO6Lj=PIPO>45#9&V=aZp=VvEYmUKg~TF}0<62YW|YPXx0#K-o%J8g6# z@@ZbP)~fDKv1Gz!S|g{925kwj93$ho*MPj{%2OXzv`FGgI10P#iQ=d0(ZkW708`2y zlD;b0)S?mO+su{^h#ppB(3<({akASC4|Zm&bGHZ9tZwQ>;}z|NG}&Mcg@dzd6vJW` zd?me^{>j?T+aW^r#n6APZm(FEpEGR0zRf}(I56%A?bk{q;O1f;$nV7 zXV3W1on6UmYS!v{e;N2!#TV3tEw=Dg2kW-OpG>oCEuhHYXX0$j`h`fEp7qr@j)7xu z4tzlqw~;xdRGLglm-&IF2K(3*jcrD}ByC6FxCk=S$*HqL{ML06zexE-MWV}gy*Zqp za@Ms4Zpqk*tVH#V;~7S{((j)>l%3t#m5i@>t!6IV_90iW1NQVfJ|ZI;3M^OLp_+}Z2jrl-AhW6-gjcFe36IEV6xfbY=d54|LWtj;Jm|wT z6z$ZnVWGRV5v~Cb(~gI!=`-$sfOoh+}S+b_lsJXIH|MeV|d0s!< zW?+5WqxY9&1_Q+&SiEmBjTZ8lzx*o~l52F;5V!y3B-_YD_G+cqA;~^UQ z`7L>e?j-Pz3^fiTQzWfJjvTdWs;b7cW+?Zr`&H9TuQF2XK%n;#}z)ORRmXRe|NQ(&9& z{8pdSy%U?XwLWGYU|4Km@#29=#nnPwY&T9RpJrq@E!UO^SF#_aW2NMAncWYn^Z zz@5^XSEA*s?dQ(!S}cfq=0!}k3y8Ww!=fko7sz5z)WJGEhIXosbYgMOlJOVD*ph

    _I5&yzu-_5{-^Mb@LF52Te zKu^!$%5Oy}5MxFp(w^}j1zI)-6gqrj01l;?NqHtkW&DhKj!KhLdcazV;`BJG#U>;^ z88nf6VfIm#v++~^5L3-AIeg$x1ZR-#)#z2b%_LStYbVmS@h@Be;_^g#r^0nmZ*?8z zz}h*fxQV>M5y70PIYi!NfAwu|)dY>(8bYfATIJ_%UOtWzcOR$WyRNxA@#1q^oGIAx z?XwQ%d*=wRd?TsSr!LYVc-k}x(q7hhI`p_->g!|cgVKemA;E%)2K45 z!BeWQc)_5m8eXF9`>gbAW}el+*0^uL;-oKt5gfdhX9b&QzuiT%2h!}lj4^|2+gzks zxONKj6H29Q?FJvsjx&?qKgHSj##C($`}UF2+jPrg7o|iWN$LfOu)``nh-UTF18B>=deMKsh=s%TUxMA*yc z-8H#|`i|CWbMMlK#*C6Iazlt(CHh5Z#D|Tc%=OXgN6X9zSoh=r zN5)cP0W)KMNfM^ogv;;HH*)ug4$z#D_{3&LwptgB!jjjZ#BD}L!Ja&-K0}3Hwf%Z9 z$P>wQ*)A}{H_pV7Y5t1gXb(S=RM+Vsz4SHcr>y?G1UxSp=g zS>Xz;W z=j_6XT6ok%3>qH6DS&r�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 z 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�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 bQNinV;XJve_z36-*h=#7K3;M3{Pq6=A8x~= literal 0 HcmV?d00001 diff --git a/doc/assets/images/new_binary_version.png b/doc/assets/images/new_binary_version.png new file mode 100644 index 0000000000000000000000000000000000000000..d380873c2caebef54bcdd78f9658674d6982c103 GIT binary patch literal 25496 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 literal 0 HcmV?d00001 diff --git a/doc/assets/images/new_preprocessor_page.png b/doc/assets/images/new_preprocessor_page.png new file mode 100644 index 0000000000000000000000000000000000000000..09c116b7bc3c4932a7198f307220560432631374 GIT binary patch literal 44771 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 literal 0 HcmV?d00001 diff --git a/doc/assets/images/preprocessor_page.png b/doc/assets/images/preprocessor_page.png new file mode 100644 index 0000000000000000000000000000000000000000..794caaafae09358aa84db74a9369ce815acca32e GIT binary patch literal 33220 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 literal 0 HcmV?d00001 diff --git a/doc/user_manual/crackers_binary.md b/doc/user_manual/crackers_binary.md index 1a2577d44..8dbb52769 100644 --- a/doc/user_manual/crackers_binary.md +++ b/doc/user_manual/crackers_binary.md @@ -1,19 +1,96 @@ # Binaries +Hashtopolis is also responsible of the update and distribution of several binaries, starting from the cracker, e.g. Hashcat, or also the binaries for the agent. This part of the manual is dedicated to the management of those binaries from the corresponding menu. + ## Crackers -Hashtopolis employs distribution mechanism to ensure that every agent will have the correct cracker binary for the associated task. You can define cracker types (e.g. Hashcat) and for every type you can add as many version as you like. Make sure to keep the download URLs of the binaries up-to-date in case they change over time. The URL has to be absolute. +When Hashtopolis was first developed it was solely designed to manage hashcat tasks with multiple agents. As part of the evolution of the project, support for other tool than hashcat was integrated in hashtopolis. In addition to the support of different tools, hashtopolis can also manage different versions of the same tool. + +

    + ![screenshot_cracker_page](/assets/images/cracker_page.png){ width="600" } +
    + +This page displays some basic information about all the crackers configured in hashtopolis. Apart from the ID of the cracker and its name, the version(s) available is also displayed. Hashtopolis is configured with a default hashcat cracker to be downloaded by the agents whenever they need it. + +### Creating a New Cracker + +As mentioned above, Hashtopolis supports other cracker than Hashcat. To deploy a new cracker, two steps are required, first the creation of the type of cracker and then adding a version for it. + +By clicking on the ``*New Cracker*'' button, a new page opens in which you can set the name for the new cracker and declare if the chunking is available for this cracker. In order to be compatible with chunking, a cracker must have the following features: + +- **--keyspace**: calculate the size of the task to be distributed. +- **--skip**: define the starting point from where the hashcat instance should start working on the keyspace. +- **--limit**: define how many entries from the keyspace should be evaluated by the hashcat instance. + +In other words, the keyspace is the total amount of work related to a task. The combination of skip and limit will define a portion of the keyspace, also called chunk, on wich an agent will be working. That is the main features required to distribute a task among the several agents. + +If chunking is not available for a cracker, then a task cannot be split and it must be run by a single agent. WHen selecting such type of cracker during the task creation, the ["small task"](/user_manual/tasks/#advanced-parameters) flag will be enabled by default. + +> [!CAUTION] +> Creating a new type of cracker is not a simple plug-and-play process with Hashtopolis. In addition to defining the new cracker type, you must also modify the agent itself. Specifically, this involves writing a dedicated Python handler file for your cracker. +> +> An example handler, generic_cracker.py, is available in the agent-python Git repository and can serve as a starting point. However, adapting it to your needs will likely require a solid understanding of how the agent communicates with the server and processes tasks. Once your custom handler is ready, you must also update the agent's main file to properly register and include it. + +### Adding a New Version + +Whether it is the first version for a new cracker or to update an existing cracker, the page displayed below for adding a version to a cracker will appear. -When Hashtopolis was first developed it was designed to distribute tasks to multiple hashcat agent machines. As the Hashtopolis project progressed we wanted to support more than just hashcat. For example, if someone wants to distribute a specific algorithm using custom cracking software. +
    + ![screenshot_manage_file](/assets/images/new_binary_version.png){ width="400" } +
    -Version 0.5.0 now supports multiple cracker binaries which can be used in parallel on different tasks. So for each task, you can select a binary that should be used. The client downloads the specified binary to complete the task. +The three following information are required to deploy a new version. -You are also able to store multiple versions of a binary. This means you can specify the exact version of a binary allowing you to run the version that gives the best performance for the hash type you are running. +- **Binary Base Name**: this is how the cracker should be called from the command line by the agent. In our example, the hashcat cracker is called with ```hashcat'''. +- **Binary Version**: the version number of the cracker should be inserted here. The backend will order them in decreasing order. The latest version will be selected by default for this cracker. +- **Download URL**: this specifies from where the agent should download the binary package. In the case of our example, it is directly downloaded from the hashcat webpage. -You must make sure, that the cracker binary version you want to use is compatible with the Hashtopolis agent binary (e.g. the agent binary is version aware by using specific flags/settings). Please consult the Hashtopolis agent repository README for more information on versioning. +> [!NOTE] +> The agents may not have access to the location of the cracker, e.g. in the case of an offline system. One solution is to store the cracker package in a folder of the main server that is reachable by the agents. Then use this for the URL so that the agent can reach it and download it when needed. +> ## Preprocessors +The purpose of a pre-processor in the context of hashcat is to generate passwords candidates that are then fed through the standard input to a hashcat process. The preprocessor page displayed below list all the preprocessors configured in hashtopolis. + +
    + ![screenshot_cracker_page](/assets/images/preprocessor_page.png){ width="600" } +
    + +By default hashtopolis is installed with a single preprocessor, namely [*Prince*](https://github.com/hashcat/princeprocessor). Additional preprocessors can be added by clicking the *New Preprocessor" button. The creation page below is diplayed. + +
    + ![screenshot_cracker_page](/assets/images/new_preprocessor_page.png){ width="600" } +
    + +It is rather similar to the creation of a new version of a [cracker](/user_manual/crackers_binary/#adding-a-new-version). The main difference is that the user can associate the required keyspace, skip, and limit options to different flags of the preprocessor. Note that those three remain mandatory to be used within hashtopolis, however, this allows more flexibility as the preprocessor may have named those options differently. If additional paramaters are required at execution time, they should be included in the [preprocessr's command](/user_manual/tasks/#advanced-parameters) during the task creation. ## Agent Binaries + +There are several situations where deploying a new Hashtopolis agent binary is necessary. Most commonly, this happens when official updates introduce bug fixes, performance improvements, or support for new features. However, you may also need to build or modify an agent binary yourself—for example, if you've developed a custom cracker that requires integration via a new Python handler, or if you need a version of the agent compiled specifically for another platform such as Windows. In all cases, updating the agent typically involves replacing the existing binary and ensuring any dependencies are still met. + +The agent binaries page displayed the information shown below about the current agent binaries configured in hashtopolis. + +
    + ![screenshot_cracker_page](/assets/images/agent_binaries_page.png){ width="600" } +
    + +To create a new agent, simply press the button *New Binary* in the agent binary page. The following page is then displayed. + +
    + ![screenshot_cracker_page](/assets/images/new_agent_page.png){ width="400" } +
    + +The following fields need to be filled at creation time. + +- **Type**: This field is used to provide information about the agent binaries such as for example the programming language in which it is written. +- **Operating Systems**: specifies the list of OSs supported by the agent. +- **Filename**: specifies the filename of the agent binaries. +- **Version**: specifies the version of the agent binaries +- **Update Track**: this can be either stable or release. It specifies the status of the current agent. + +** To be reviewed ** +- Are the two first fields free text zones or they are checked and linked to something? +- What it the update track field needed for... for information purpose ? +- WHere does one store the agent... I guess it should be in the folder binaries of hashtopolis, but so it means it has to be uploaded manually and therefore we should have an explanation about this or to have an upload / url functionality. \ No newline at end of file diff --git a/doc/user_manual/files.md b/doc/user_manual/files.md index 28e0632d5..0ddd905dd 100644 --- a/doc/user_manual/files.md +++ b/doc/user_manual/files.md @@ -16,12 +16,34 @@ When creating a password recovery task in Hashtopolis, you may need to upload ad 3. **Others:** This category includes any additional files required for specific attack types or configurations. Examples include charset files or any files needed by preprocessors. These files vary depending on the nature of the task and the tools being used. -Each type of file has a dedicated page containing similar informations. The figure below displays the rule page. +## Manage Files + +Each type of file has a dedicated page containing similar informations. The figure below shows what the rule page looks like. It contains information such as the name of the file, its size, the number of line in it as well as the access group. The key next to the name indicates that the file is secret and can only be accessed by trusted agents **REF?**.
    ![screenshot_rule_page](/assets/images/rules_files.png)
    + +From this page, files can be edited by clicking on their name or on the related action. Files can also be deleted from there. The picture below shows the page opened when editing a rule file. Other type of files are very similar to this one. + +Navigating to the Files page of the Hashtopolis User Interface, you can manage the files uploaded to the server. + +
    + ![screenshot_manage_file](/assets/images/edit_rule_file.png){ width="400" } +
    + +1. **Select Category**. +2. **Secret**: Files that are marked as secret will only be sent to trusted agents. +Line count: Reprocess the file and update the line count with the number of lines contained in the file. +3. **Edit**: Edit the parameters of the file (name, file type and associated group). +4. **Delete**: Removes the file from Hashtopolis. + +> [!NOTE] +> Files can only be deleted if they are not referenced in any task, whether they are active, finished or even archived. + +## Upload New Files + For each category, new files can be added to the server by pressing "New Wordlist/Rules/File" button. Files are uploaded using one of the following methods: - **Upload from your computer** – Directly upload files stored on your local machine. @@ -32,7 +54,7 @@ Detailed instructions for each upload method are provided in the following subse ### Upload a new file from the computer
    - ![screenshot_new_file](/assets/images/upload_rule.png){ width="450" } + ![screenshot_new_file](/assets/images/upload_rule.png){ width="400" }
    1. **Add file**: Click this button to enable file upload. After clicking, a new field labeled Choose file will appear. Each time you click on Add File, an additional Choose file field will be added, allowing you to upload multiple files simultaneously.. @@ -61,25 +83,12 @@ docker cp hashtopolis-backend:/usr/local/share/hashtopolis/import/ ### Download new file from URL
    - ![screenshot_download_file](https://upload.wikimedia.org/wikipedia/commons/8/80/Comingsoon.png?20120228065200){ width="300" } + ![screenshot_download_url](/assets/images/upload_url.png){ width="400" }
    -1. **Associated Access Group**: Define the access group that will have permissions to access the file(s) you are uploading. -2. **URL**: Provide the URL to download from.. -3. **Download file**. - -### Manage Files -Navigating to the Files page of the Hashtopolis User Interface, you can manage the files uploaded to the server. - -
    - ![screenshot_manage_file](https://upload.wikimedia.org/wikipedia/commons/8/80/Comingsoon.png?20120228065200){ width="300" } -
    +1. **Name**: Name of the file that will be downloaded +2. **Associated Access Group**: Define the access group that will have permissions to access the file(s) you are uploading. +3. **URL**: Provide the URL to download from.. +4. **Download file**. -1. **Select Category**. -2. **Secret**: Files that are marked as secret will only be sent to trusted agents. -Line count: Reprocess the file and update the line count with the number of lines contained in the file. -3. **Edit**: Edit the parameters of the file (name, file type and associated group). -4. **Delete**: Removes the file from Hashtopolis. -> [!NOTE] -> Files can only be deleted if they are not referenced in any task, whether they are active, finished or even archived. diff --git a/doc/user_manual/myaccount.md b/doc/user_manual/myaccount.md deleted file mode 100644 index 060dfc01a..000000000 --- a/doc/user_manual/myaccount.md +++ /dev/null @@ -1 +0,0 @@ -# My account \ No newline at end of file diff --git a/doc/user_manual/settings_and_configuration.md b/doc/user_manual/settings_and_configuration.md index 30ed2fb3d..18d820fd1 100644 --- a/doc/user_manual/settings_and_configuration.md +++ b/doc/user_manual/settings_and_configuration.md @@ -127,7 +127,7 @@ - **Server Level Logging to File**: Enables detailed server-side logging output to log files for troubleshooting or audits. -## Hashtypes +## Hashtypes [to be rewritten] Hashcat gets constantly developed and often new hashtypes get added. To be flexible Hashtopolis provides the possibility for the server admin to add new Hashcat algorithms. Even if you use a customized Hashcat with some special algorithm. To add a new type you just need to add the -m number of Hashcat and the name of it. @@ -142,7 +142,19 @@ grep -Hr SLOW_HASH src/modules/ | cut -d: -f1 | sort | cut -d'.' -f1 | sed 's/sr ``` +## Health Checks -# Access Management +Health checks offer an excellent opportunity to ensure that the cracker binary set up is working correctly. For this purpose, a test command is executed on the agent and it is checked whether everything is working properly. The result and a possible error code are then displayed in the frontend -Under construction \ No newline at end of file +A new health check can be created by clicking on **New Health Check**. All you have to do is select the binary and the test can be started. The result is displayed transparently on the overview page. + +Additional information is displayed by clicking on the ID. Here you will then find the detailed test result and the possible error code, which can be used for debugging. + + +## Log + +Important events can be viewed in the log area. For example, failed logins are documented or document uploads are tracked: + +
    + ![screenshot_logs_example](/assets/images/logs_example.png){ width="600" } +
    \ No newline at end of file diff --git a/doc/user_manual/users.md b/doc/user_manual/users.md index 76e7c2365..cdb870e1b 100644 --- a/doc/user_manual/users.md +++ b/doc/user_manual/users.md @@ -1 +1,26 @@ # Users + + +## All Users + +Hashtopolis is a multi-user platform so it is possible to create and manage new users. + +In the **user area** there is an overview which shows all relevant information about the created users: + +For example, the last login date and the associated permission group are tracked. + +### Creating a new User + +To create a new user you have to click on New-User. You can then specify a user name and the corresponding e-mail address. In addition, the user must be given appropriate rights, i.e. assigned to a so-called permission group + +
    + ![screenshot_new_user](/assets/images/new_user.png){ width="600" } +
    + + +## Global Permissions + + +## Access Groups + + diff --git a/mkdocs.yml b/mkdocs.yml index ea4a9e4b5..2ac00d0a6 100644 --- a/mkdocs.yml +++ b/mkdocs.yml @@ -18,7 +18,6 @@ nav: - user_manual/hashlist.md - user_manual/files.md - user_manual/crackers_binary.md - - user_manual/myaccount.md - user_manual/settings_and_configuration.md - user_manual/users.md - FAQ and Tips: From f9c1d6f4d731de022bfb1f9cbfad3c85e3a18e00 Mon Sep 17 00:00:00 2001 From: coiseiw Date: Tue, 24 Jun 2025 08:26:05 +0200 Subject: [PATCH 085/691] test for binaries --- doc/user_manual/crackers_binary.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/doc/user_manual/crackers_binary.md b/doc/user_manual/crackers_binary.md index 8dbb52769..2031aa808 100644 --- a/doc/user_manual/crackers_binary.md +++ b/doc/user_manual/crackers_binary.md @@ -90,7 +90,7 @@ The following fields need to be filled at creation time. - **Version**: specifies the version of the agent binaries - **Update Track**: this can be either stable or release. It specifies the status of the current agent. -** To be reviewed ** +**To be reviewed** - Are the two first fields free text zones or they are checked and linked to something? - What it the update track field needed for... for information purpose ? - WHere does one store the agent... I guess it should be in the folder binaries of hashtopolis, but so it means it has to be uploaded manually and therefore we should have an explanation about this or to have an upload / url functionality. \ No newline at end of file From a63916ba18e3db3047c3ae3afd9c30713f718ef0 Mon Sep 17 00:00:00 2001 From: Sein Coray Date: Tue, 24 Jun 2025 08:36:31 +0200 Subject: [PATCH 086/691] implemented helper to retrieve the access groups independently (#1381) * implemented helper to retrieve the access groups independently * fixed commented out error handler, and fixed import for error handler * fixed import to right dir, but maybe we have to change it to require_once * removed some warning causing effects --- src/api/v2/index.php | 3 +- .../apiv2/helper/getAccessGroups.routes.php | 68 +++++++++++++++++++ src/inc/apiv2/model/files.routes.php | 4 +- src/inc/apiv2/model/tasks.routes.php | 3 +- 4 files changed, 73 insertions(+), 5 deletions(-) create mode 100644 src/inc/apiv2/helper/getAccessGroups.routes.php diff --git a/src/api/v2/index.php b/src/api/v2/index.php index 2d18721e7..82c7f5f09 100644 --- a/src/api/v2/index.php +++ b/src/api/v2/index.php @@ -50,7 +50,7 @@ use DBA\Factory; require __DIR__ . "/../../../vendor/autoload.php"; -require __DIR__ . "../../../inc/apiv2/common/ErrorHandler.class.php"; +require __DIR__ . "/../../inc/apiv2/common/ErrorHandler.class.php"; require_once(dirname(__FILE__) . "/../../inc/load.php"); @@ -300,6 +300,7 @@ public static function addCORSheaders(Request $request, $response) { require __DIR__ . "/../../inc/apiv2/helper/exportCrackedHashes.routes.php"; require __DIR__ . "/../../inc/apiv2/helper/exportLeftHashes.routes.php"; require __DIR__ . "/../../inc/apiv2/helper/exportWordlist.routes.php"; +require __DIR__ . "/../../inc/apiv2/helper/getAccessGroups.routes.php"; require __DIR__ . "/../../inc/apiv2/helper/getFile.routes.php"; require __DIR__ . "/../../inc/apiv2/helper/importCrackedHashes.routes.php"; require __DIR__ . "/../../inc/apiv2/helper/importFile.routes.php"; diff --git a/src/inc/apiv2/helper/getAccessGroups.routes.php b/src/inc/apiv2/helper/getAccessGroups.routes.php new file mode 100644 index 000000000..4ae842aeb --- /dev/null +++ b/src/inc/apiv2/helper/getAccessGroups.routes.php @@ -0,0 +1,68 @@ +preCommon($request); + $user = $this->getCurrentUser(); + + $accessGroups = AccessUtils::getAccessGroupsOfUser($user); + $converted = []; + + foreach($accessGroups as $accessGroup) { + $converted[] = self::obj2Resource($accessGroup); + } + $ret = self::createJsonResponse(data: $converted); + + $body = $response->getBody(); + $body->write($this->ret2json($ret)); + + return $response->withStatus(200) + ->withHeader("Content-Type", 'application/vnd.api+json;'); + } + + public function actionPost($data): object|array|null { + assert(False, "GetAccessGroups has no POST"); + } + + static public function register($app): void { + $baseUri = GetAccessGroupsHelperAPI::getBaseUri(); + + /* Allow CORS preflight requests */ + $app->options($baseUri, function (Request $request, Response $response): Response { + return $response; + }); + $app->get($baseUri, "GetAccessGroupsHelperAPI:handleGet"); + } + + /** + * getAccessGroups is different because it returns via another function + */ + public static function getResponse(): array|string|null { + return null; + } +} + +GetAccessGroupsHelperAPI::register($app); diff --git a/src/inc/apiv2/model/files.routes.php b/src/inc/apiv2/model/files.routes.php index e93ae9aff..4dfed8bda 100644 --- a/src/inc/apiv2/model/files.routes.php +++ b/src/inc/apiv2/model/files.routes.php @@ -6,7 +6,7 @@ use DBA\OrderFilter; use DBA\File; -include_once __DIR__ . "../common/ErrorHandler.class.php"; +include_once __DIR__ . "/../common/ErrorHandler.class.php"; require_once(dirname(__FILE__) . "/../common/AbstractModelAPI.class.php"); @@ -160,4 +160,4 @@ protected function deleteObject(object $object): void { } } -FileAPI::register($app); \ No newline at end of file +FileAPI::register($app); diff --git a/src/inc/apiv2/model/tasks.routes.php b/src/inc/apiv2/model/tasks.routes.php index 9b039c01b..0b2e45077 100644 --- a/src/inc/apiv2/model/tasks.routes.php +++ b/src/inc/apiv2/model/tasks.routes.php @@ -13,7 +13,6 @@ use DBA\Speed; use DBA\Task; use DBA\TaskWrapper; -use Util; require_once(dirname(__FILE__) . "/../common/AbstractModelAPI.class.php"); @@ -176,4 +175,4 @@ protected function getUpdateHandlers($id, $current_user): array { } } -TaskAPI::register($app); \ No newline at end of file +TaskAPI::register($app); From aa13d488fe66920c6a689acb989ef8b790f66a40 Mon Sep 17 00:00:00 2001 From: jessevz Date: Tue, 24 Jun 2025 09:01:46 +0200 Subject: [PATCH 087/691] WIP: made pagination working for ids and text --- .../apiv2/common/AbstractModelAPI.class.php | 126 ++++++++++++------ 1 file changed, 85 insertions(+), 41 deletions(-) diff --git a/src/inc/apiv2/common/AbstractModelAPI.class.php b/src/inc/apiv2/common/AbstractModelAPI.class.php index f6b138230..86c359215 100644 --- a/src/inc/apiv2/common/AbstractModelAPI.class.php +++ b/src/inc/apiv2/common/AbstractModelAPI.class.php @@ -460,6 +460,27 @@ protected static function addToRelatedResources(array $relatedResources, array $ return $relatedResources; } + protected static function calculate_next_cursor(string|int $element) { + if (is_int($element)) { + return $element + 1; + } elseif (is_string($element)) { + $len = strlen($element); + if ($len == 0) { + return '~'; + } + + $lastChar = $element[$len - 1]; + $ord = ord($lastChar); + if ($ord < 126) { + return substr($element, 0, $len-1) . chr($ord + 1); + } else { + return $element . '!'; // '!' is lowest printable ascii + } + } else { + throw new HttpError("Internal error", 500); + } + } + /** * API entry point for requesting multiple objects */ @@ -477,6 +498,7 @@ public static function getManyResources(object $apiClass, Request $request, Resp // $maxPageSize = SConfig::getInstance()->getVal(DConfig::MAX_PAGE_SIZE); $pageAfter = $apiClass->getQueryParameterFamilyMember($request, 'page', 'after'); + $pageBefore = $apiClass->getQueryParameterFamilyMember($request, 'page', 'before'); $pageSize = $apiClass->getQueryParameterFamilyMember($request, 'page', 'size') ?? $defaultPageSize; if ($pageSize < 0) { throw new HttpError("Invalid parameter, page[size] must be a positive integer"); @@ -504,9 +526,45 @@ public static function getManyResources(object $apiClass, Request $request, Resp * * TODO: Deny pagination with un-stable sorting */ - $defaultSort = $apiClass->getQueryParameterFamilyMember($request, 'page', 'after') == null && - $apiClass->getQueryParameterFamilyMember($request, 'page', 'before') != null ? 'DESC' : 'ASC'; + $sortList = $apiClass->getQueryParameterAsList($request, 'sort'); + $isNegativeSort = $sortList != null && $sortList[0][0] == '-'; + //this is used to reverse the array to show the data correctly for the user + $reverseArray = false; + + if (!$isNegativeSort && !isset($pageBefore) && isset($pageAfter)) { + // this happens when going to the next page while having an ascending sort + $defaultSort = "ASC"; + $reverseArray = false; + $operator = ">"; + $paginationCursor = $pageAfter; + } else if (!$isNegativeSort && isset($pageBefore) && !isset($pageAfter)) { + // this happens when going to the previous page while having an ascending sort + $defaultSort = "DESC"; + $reverseArray = true; + $operator = "<"; + $paginationCursor = $pageBefore; + } else if ($isNegativeSort && (isset($pageBefore) && !isset($pageAfter))) { + // this happens when going to the previous page while having a descending sort + $defaultSort = "ASC"; + $reverseArray = true; + $operator = ">"; + $paginationCursor = $pageBefore; + } else if ($isNegativeSort && isset($pageAfter) && !isset($pageBefore)) { + // this happens when going to the next page while having an ascending sort + $defaultSort = "DESC"; + $reverseArray = false; + $operator = "<"; + $paginationCursor = $pageAfter; + } else if ($isNegativeSort) { + //the default negative case to retrieve the first elements in a descending way + $defaultSort = "DESC"; + } else { + $defaultSort = "ASC"; + } + $orderTemplates = $apiClass->makeOrderFilterTemplates($request, $aliasedfeatures, $defaultSort); + $orderTemplates[0]["type"] = $defaultSort; + $primaryFilter = $orderTemplates[0]['by']; // Build actual order filters foreach ($orderTemplates as $orderTemplate) { @@ -516,13 +574,12 @@ public static function getManyResources(object $apiClass, Request $request, Resp /* Include relation filters */ $finalFs = array_merge($aFs, $relationFs); - $primaryKey = $apiClass->getPrimaryKey(); //according to JSON API spec, first and last have to be calculated if inexpensive to compute //(https://jsonapi.org/profiles/ethanresnick/cursor-pagination/#auto-id-links)) //if this query is too expensive for big tables, it can be removed - $agg1 = new Aggregation($primaryKey, Aggregation::MAX, $factory); - $agg2 = new Aggregation($primaryKey, Aggregation::MIN, $factory); - $agg3 = new Aggregation($primaryKey, Aggregation::COUNT, $factory); + $agg1 = new Aggregation($primaryFilter, Aggregation::MAX, $factory); + $agg2 = new Aggregation($primaryFilter, Aggregation::MIN, $factory); + $agg3 = new Aggregation($primaryFilter, Aggregation::COUNT, $factory); $aggregation_results = $factory->multicolAggregationFilter($finalFs, [$agg1, $agg2, $agg3]); $max = $aggregation_results[$agg1->getName()]; @@ -532,19 +589,12 @@ public static function getManyResources(object $apiClass, Request $request, Resp //pagination filters need to be added after max has been calculated $finalFs[Factory::LIMIT] = new LimitFilter($pageSize); - if (isset($pageAfter)){ - $finalFs[Factory::FILTER][] = new QueryFilter($primaryKey, $pageAfter, '>', $factory); - } - $pageBefore = $apiClass->getQueryParameterFamilyMember($request, 'page', 'before'); - if (isset($pageBefore)) { - $finalFs[Factory::FILTER][] = new QueryFilter($primaryKey, $pageBefore, '<', $factory); + if (isset($paginationCursor)) { + $finalFs[Factory::FILTER][] = new QueryFilter($primaryFilter, $paginationCursor, $operator, $factory); } /* Request objects */ $filterObjects = $factory->filter($finalFs); - if ($defaultSort == 'DESC') { - $filterObjects = array_reverse($filterObjects); - } /* JOIN statements will return related modules as well, discard for now */ if (array_key_exists(Factory::JOIN, $finalFs)) { @@ -552,6 +602,9 @@ public static function getManyResources(object $apiClass, Request $request, Resp } else { $objects = $filterObjects; } + if ($reverseArray) { + $objects = array_reverse($objects); + } /* Resolve all expandables */ $expandResult = []; @@ -590,61 +643,52 @@ public static function getManyResources(object $apiClass, Request $request, Resp // Add to result output $dataResources[] = $newObject; } - + $baseUrl = Util::buildServerUrl(); //build last link $lastParams = $request->getQueryParams(); unset($lastParams['page']['after']); $lastParams['page']['size'] = $pageSize; - $lastParams['page']['before'] = $max + 1; - $linksLast = $request->getUri()->getPath() . '?' . urldecode(http_build_query($lastParams)); + $lastParams['page']['before'] = urlencode(self::calculate_next_cursor($max)); + $linksLast = $baseUrl . $request->getUri()->getPath() . '?' . urldecode(http_build_query($lastParams)); // Build self link $selfParams = $request->getQueryParams(); $selfParams['page']['size'] = $pageSize; - $linksSelf = $request->getUri()->getPath() . '?' . urldecode(http_build_query($selfParams)); + $linksSelf = $baseUrl . $request->getUri()->getPath() . '?' . urldecode(http_build_query($selfParams)); $linksNext = null; $linksPrev = null; // Build next link if (!empty($objects)) { - $minId = $maxId = $objects[0]->getId() ?? null; - foreach ($objects as $obj) { - $cur_id = $obj->getId(); - if ($cur_id < $minId) { - $minId = $cur_id; - } - if ($cur_id > $maxId) { - $maxId = $cur_id; - } - } - $nextId = $defaultSort == "ASC" ? $maxId : $minId; + // retrieve last object in page and retrieve the attribute based on the filter + $prevId = $objects[0]->expose()[$primaryFilter]; + $nextId = end($objects)->expose()[$primaryFilter]; if ($nextId < $max) { //only set next page when its not the last page $nextParams = $selfParams; - $nextParams['page']['after'] = $nextId; + $nextParams['page']['after'] = urlencode($nextId); unset($nextParams['page']['before']); - $linksNext = $request->getUri()->getPath() . '?' . urldecode(http_build_query($nextParams)); + $linksNext = $baseUrl . $request->getUri()->getPath() . '?' . urldecode(http_build_query($nextParams)); } // Build prev link - $prevId = $defaultSort == "DESC" ? $maxId : $minId; if ($prevId != $min) { //only set previous page when its not the first page $prevParams = $selfParams; - $prevParams['page']['before'] = $prevId; + $prevParams['page']['before'] = urlencode($prevId); unset($prevParams['page']['after']); - $linksPrev = $request->getUri()->getPath() . '?' . urldecode(http_build_query($prevParams)); + $linksPrev = $baseUrl . $request->getUri()->getPath() . '?' . urldecode(http_build_query($prevParams)); } } //build first link - $firstParams = $request->getQueryParams(); - unset($firstParams['page']['before']); - $firstParams['page']['size'] = $pageSize; - $firstParams['page']['after'] = $min; - $linksFirst = $request->getUri()->getPath() . '?' . urldecode(http_build_query($firstParams)); + // $firstParams = $request->getQueryParams(); + // unset($firstParams['page']['before']); + // $firstParams['page']['size'] = $pageSize; + // $firstParams['page']['after'] = urlencode($min); + // $linksFirst = $request->getUri()->getPath() . '?' . urldecode(http_build_query($firstParams)); $links = [ "self" => $linksSelf, - "first" => $linksFirst, + // "first" => $linksFirst, "last" => $linksLast, "next" => $linksNext, "prev" => $linksPrev, From acf577f4a78c728b2db7b61b4301d7006ee8d2c3 Mon Sep 17 00:00:00 2001 From: Sein Coray Date: Tue, 24 Jun 2025 09:36:26 +0200 Subject: [PATCH 088/691] added getUserPermission helper (#1387) --- src/api/v2/index.php | 1 + .../apiv2/common/AbstractBaseAPI.class.php | 2 +- .../apiv2/helper/getUserPermission.routes.php | 65 +++++++++++++++++++ .../model/globalpermissiongroups.routes.php | 25 +------ src/inc/utils/AccessUtils.class.php | 31 +++++++++ 5 files changed, 99 insertions(+), 25 deletions(-) create mode 100644 src/inc/apiv2/helper/getUserPermission.routes.php diff --git a/src/api/v2/index.php b/src/api/v2/index.php index 82c7f5f09..dd44bdca2 100644 --- a/src/api/v2/index.php +++ b/src/api/v2/index.php @@ -302,6 +302,7 @@ public static function addCORSheaders(Request $request, $response) { require __DIR__ . "/../../inc/apiv2/helper/exportWordlist.routes.php"; require __DIR__ . "/../../inc/apiv2/helper/getAccessGroups.routes.php"; require __DIR__ . "/../../inc/apiv2/helper/getFile.routes.php"; +require __DIR__ . "/../../inc/apiv2/helper/getUserPermission.routes.php"; require __DIR__ . "/../../inc/apiv2/helper/importCrackedHashes.routes.php"; require __DIR__ . "/../../inc/apiv2/helper/importFile.routes.php"; require __DIR__ . "/../../inc/apiv2/helper/purgeTask.routes.php"; diff --git a/src/inc/apiv2/common/AbstractBaseAPI.class.php b/src/inc/apiv2/common/AbstractBaseAPI.class.php index 8d5283215..a9e38ccd1 100644 --- a/src/inc/apiv2/common/AbstractBaseAPI.class.php +++ b/src/inc/apiv2/common/AbstractBaseAPI.class.php @@ -366,7 +366,7 @@ protected static function getExpandPermissions(string $expand): array /** * Temponary mapping until src/inc/defines/accessControl.php permissions are no longer used */ - protected static $acl_mapping = array( + public static $acl_mapping = array( DAccessControl::VIEW_HASHLIST_ACCESS[0] => array(Hashlist::PERM_READ), DAccessControl::MANAGE_HASHLIST_ACCESS => array(Hashlist::PERM_READ, Hashlist::PERM_UPDATE, Hashlist::PERM_DELETE, Hash::PERM_READ, Hash::PERM_UPDATE, Hash::PERM_DELETE), diff --git a/src/inc/apiv2/helper/getUserPermission.routes.php b/src/inc/apiv2/helper/getUserPermission.routes.php new file mode 100644 index 000000000..07a06735c --- /dev/null +++ b/src/inc/apiv2/helper/getUserPermission.routes.php @@ -0,0 +1,65 @@ +preCommon($request); + $user = $this->getCurrentUser(); + + $rightGroup = Factory::getRightGroupFactory()->get($user->getRightGroupId()); + + $ret = self::createJsonResponse(data: self::obj2Resource($rightGroup)); + + $body = $response->getBody(); + $body->write($this->ret2json($ret)); + + return $response->withStatus(200) + ->withHeader("Content-Type", 'application/vnd.api+json;'); + } + + public function actionPost($data): object|array|null { + assert(False, "GetAccessGroups has no POST"); + } + + static public function register($app): void { + $baseUri = GetUserPermissionHelperAPI::getBaseUri(); + + /* Allow CORS preflight requests */ + $app->options($baseUri, function (Request $request, Response $response): Response { + return $response; + }); + $app->get($baseUri, "GetUserPermissionHelperAPI:handleGet"); + } + + /** + * getAccessGroups is different because it returns via another function + */ + public static function getResponse(): array|string|null { + return null; + } +} + +GetUserPermissionHelperAPI::register($app); diff --git a/src/inc/apiv2/model/globalpermissiongroups.routes.php b/src/inc/apiv2/model/globalpermissiongroups.routes.php index 9e630c6bc..173108067 100644 --- a/src/inc/apiv2/model/globalpermissiongroups.routes.php +++ b/src/inc/apiv2/model/globalpermissiongroups.routes.php @@ -34,30 +34,7 @@ public static function getToManyRelationships(): array { */ protected static function db2json(array $feature, mixed $val): mixed { if ($feature['alias'] == 'permissions') { - $all_perms = array_unique(array_merge(...array_values(self::$acl_mapping))); - - if ($val == 'ALL') { - // Special case ALL should set all permissions to true - $retval_perms = array_combine($all_perms, array_fill(0,count($all_perms), true)); - } - else { - // Create listing of enabled permissions based on permission set in database - $user_available_perms = array(); - foreach(json_decode($val) as $rightgroup_perm => $permission_set) { - if ($permission_set) { - $user_available_perms = array_unique(array_merge($user_available_perms, self::$acl_mapping[$rightgroup_perm])); - } - } - - // Create output document - $retval_perms = array_combine($all_perms, array_fill(0,count($all_perms), false)); - foreach($user_available_perms as $perm) { - $retval_perms[$perm] = True; - } - } - // Ensure output is sorted for easy debugging - ksort($retval_perms); - return $retval_perms; + return AccessUtils::getPermissionArrayConverted($val); } else { // Consider all other fields normal conversions return parent::db2json($feature, $val); diff --git a/src/inc/utils/AccessUtils.class.php b/src/inc/utils/AccessUtils.class.php index 1a5d5310c..0c3ebd95f 100644 --- a/src/inc/utils/AccessUtils.class.php +++ b/src/inc/utils/AccessUtils.class.php @@ -33,6 +33,37 @@ public static function userCanAccessHashlists($hashlists, $user) { return true; } + /** + * @param $val permission as they are stored in the legacy way in the DB in the RightGroup table + * @return array + */ + public static function getPermissionArrayConverted($val) { + $all_perms = array_unique(array_merge(...array_values(AbstractBaseAPI::$acl_mapping))); + + if ($val == 'ALL') { + // Special case ALL should set all permissions to true + $retval_perms = array_combine($all_perms, array_fill(0,count($all_perms), true)); + } + else { + // Create listing of enabled permissions based on permission set in database + $user_available_perms = array(); + foreach(json_decode($val) as $rightgroup_perm => $permission_set) { + if ($permission_set) { + $user_available_perms = array_unique(array_merge($user_available_perms, AbstractBaseAPI::$acl_mapping[$rightgroup_perm])); + } + } + + // Create output document + $retval_perms = array_combine($all_perms, array_fill(0,count($all_perms), false)); + foreach($user_available_perms as $perm) { + $retval_perms[$perm] = True; + } + } + // Ensure output is sorted for easy debugging + ksort($retval_perms); + return $retval_perms; + } + /** * @param $agent Agent * @param $user User From 4d0a432daa108d42ff2a6f99ecb9b5c413c106da Mon Sep 17 00:00:00 2001 From: Sein Coray Date: Tue, 24 Jun 2025 09:47:44 +0200 Subject: [PATCH 089/691] made naming and case of class names of all helpers consistent (#1388) --- src/inc/apiv2/helper/abortChunk.routes.php | 5 ++--- src/inc/apiv2/helper/changeOwnPassword.routes.php | 6 +++--- src/inc/apiv2/helper/getFile.routes.php | 6 +++--- src/inc/apiv2/helper/recountFileLines.routes.php | 4 ++-- src/inc/apiv2/helper/resetChunk.routes.php | 4 ++-- 5 files changed, 12 insertions(+), 13 deletions(-) diff --git a/src/inc/apiv2/helper/abortChunk.routes.php b/src/inc/apiv2/helper/abortChunk.routes.php index b3c10b34f..f43202e10 100644 --- a/src/inc/apiv2/helper/abortChunk.routes.php +++ b/src/inc/apiv2/helper/abortChunk.routes.php @@ -1,10 +1,9 @@ getResponse(); } -} +} -changeOwnPasswordHelper::register($app); \ No newline at end of file +ChangeOwnPasswordHelperAPI::register($app); \ No newline at end of file diff --git a/src/inc/apiv2/helper/getFile.routes.php b/src/inc/apiv2/helper/getFile.routes.php index f4940a52d..ee696bc13 100644 --- a/src/inc/apiv2/helper/getFile.routes.php +++ b/src/inc/apiv2/helper/getFile.routes.php @@ -9,7 +9,7 @@ require_once(dirname(__FILE__) . "/../common/AbstractHelperAPI.class.php"); -class getFileHelperAPI extends AbstractHelperAPI { +class GetFileHelperAPI extends AbstractHelperAPI { public static function getBaseUri(): string { return "/api/v2/helper/getFile"; } @@ -197,7 +197,7 @@ public function handleGet(Request $request, Response $response): Response { static public function register($app): void { - $baseUri = getFileHelperAPI::getBaseUri(); + $baseUri = GetFileHelperAPI::getBaseUri(); /* Allow CORS preflight requests */ $app->options($baseUri, function (Request $request, Response $response): Response { @@ -207,4 +207,4 @@ static public function register($app): void } } -getFileHelperAPI::register($app); \ No newline at end of file +GetFileHelperAPI::register($app); \ No newline at end of file diff --git a/src/inc/apiv2/helper/recountFileLines.routes.php b/src/inc/apiv2/helper/recountFileLines.routes.php index bab2d6b7c..33aadf80b 100644 --- a/src/inc/apiv2/helper/recountFileLines.routes.php +++ b/src/inc/apiv2/helper/recountFileLines.routes.php @@ -3,7 +3,7 @@ require_once(dirname(__FILE__) . "/../common/AbstractHelperAPI.class.php"); -class RecountFileFilesHelperAPI extends AbstractHelperAPI { +class RecountFileLinesHelperAPI extends AbstractHelperAPI { public static function getBaseUri(): string { return "/api/v2/helper/recountFileLines"; } @@ -44,4 +44,4 @@ public function actionPost($data): object|array|null { } } -RecountFileFilesHelperAPI::register($app); \ No newline at end of file +RecountFileLinesHelperAPI::register($app); \ No newline at end of file diff --git a/src/inc/apiv2/helper/resetChunk.routes.php b/src/inc/apiv2/helper/resetChunk.routes.php index f0ff78e00..3978d472c 100644 --- a/src/inc/apiv2/helper/resetChunk.routes.php +++ b/src/inc/apiv2/helper/resetChunk.routes.php @@ -4,7 +4,7 @@ require_once(dirname(__FILE__) . "/../common/AbstractHelperAPI.class.php"); -class ChunkResetHelperAPI extends AbstractHelperAPI { +class ResetChunkHelperAPI extends AbstractHelperAPI { public static function getBaseUri(): string { return "/api/v2/helper/resetChunk"; } @@ -41,4 +41,4 @@ public function actionPost(array $data): object|array|null { } } -ChunkResetHelperAPI::register($app); \ No newline at end of file +ResetChunkHelperAPI::register($app); \ No newline at end of file From 0d306485177eef8fe90b07d6259f4cb57d1d0419 Mon Sep 17 00:00:00 2001 From: Sammy Date: Tue, 24 Jun 2025 09:13:35 +0000 Subject: [PATCH 090/691] added toggleArchive function and modified the updateHandler --- src/inc/apiv2/model/tasks.routes.php | 2 +- src/inc/utils/TaskUtils.class.php | 9 +++++++++ 2 files changed, 10 insertions(+), 1 deletion(-) diff --git a/src/inc/apiv2/model/tasks.routes.php b/src/inc/apiv2/model/tasks.routes.php index 0b2e45077..1132fac6d 100644 --- a/src/inc/apiv2/model/tasks.routes.php +++ b/src/inc/apiv2/model/tasks.routes.php @@ -165,7 +165,7 @@ protected function deleteObject(object $object): void { protected function getUpdateHandlers($id, $current_user): array { return [ - Task::IS_ARCHIVED => fn ($value) => TaskUtils::archiveTask($id, $current_user), + Task::IS_ARCHIVED => fn ($value) => TaskUtils::toggleArchiveTask($id, $value, $current_user), Task::PRIORITY => fn ($value) => TaskUtils::updatePriority($id, $value, $current_user), Task::MAX_AGENTS => fn ($value) => TaskUtils::updateMaxAgents($id, $value, $current_user), Task::IS_CPU_TASK => fn ($value) => TaskUtils::setCpuTask($id, $value, $current_user), diff --git a/src/inc/utils/TaskUtils.class.php b/src/inc/utils/TaskUtils.class.php index 07071d25f..ef4415c1d 100644 --- a/src/inc/utils/TaskUtils.class.php +++ b/src/inc/utils/TaskUtils.class.php @@ -178,6 +178,15 @@ public static function archiveTask($taskId, $user) { } Factory::getTaskFactory()->set($task, Task::IS_ARCHIVED, 1); } + + public static function toggleArchiveTask($taskId, $taskState, $user) { + $task = TaskUtils::getTask($taskId, $user); + $taskWrapper = TaskUtils::getTaskWrapper($task->getTaskWrapperId(), $user); + if ($taskWrapper->getTaskType() == DTaskTypes::NORMAL) { + Factory::getTaskWrapperFactory()->set($taskWrapper, TaskWrapper::IS_ARCHIVED, $taskState); + } + Factory::getTaskFactory()->set($task, Task::IS_ARCHIVED, $taskState); + } /** * @param int $taskWrapperId From 368853711ec0b50bb96bb109ba92df4cd66c320b Mon Sep 17 00:00:00 2001 From: Sammy Date: Tue, 24 Jun 2025 09:47:54 +0000 Subject: [PATCH 091/691] added comment --- src/inc/utils/TaskUtils.class.php | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/src/inc/utils/TaskUtils.class.php b/src/inc/utils/TaskUtils.class.php index ef4415c1d..07a32528e 100644 --- a/src/inc/utils/TaskUtils.class.php +++ b/src/inc/utils/TaskUtils.class.php @@ -179,6 +179,12 @@ public static function archiveTask($taskId, $user) { Factory::getTaskFactory()->set($task, Task::IS_ARCHIVED, 1); } + /** + * @param int $taskId + * @param bool $taskState + * @param User $user + * @throws HTException + */ public static function toggleArchiveTask($taskId, $taskState, $user) { $task = TaskUtils::getTask($taskId, $user); $taskWrapper = TaskUtils::getTaskWrapper($task->getTaskWrapperId(), $user); From 86f2c6bbc49c6ef6a2807515b50b221f9a008236 Mon Sep 17 00:00:00 2001 From: coiseiw Date: Tue, 24 Jun 2025 12:04:06 +0200 Subject: [PATCH 092/691] Removing old files, integration of comments for all the install section, integration of the access permission and user pages, first batch of correction of links. --- .vscode/settings.json | 13 +- doc/assets/images/edit_user.png | Bin 0 -> 173559 bytes doc/index.md | 44 ++-- .../advanced_install.md | 35 ++- doc/installation_guidelines/basic_install.md | 39 ++-- doc/installation_guidelines/docker.md | 55 ++++- doc/installation_guidelines/tls.md | 18 +- doc/installation_guidelines/update.md | 46 ++-- doc/user_manual/advanced_manual.md | 209 ------------------ doc/user_manual/basic_workflow.md | 24 +- doc/user_manual/tasks.md | 2 +- doc/user_manual/user-settings.md | 43 ++++ doc/user_manual/user_manual.md | 172 -------------- doc/user_manual/users.md | 38 +++- mkdocs.yml | 1 + 15 files changed, 266 insertions(+), 473 deletions(-) create mode 100644 doc/assets/images/edit_user.png delete mode 100644 doc/user_manual/advanced_manual.md create mode 100644 doc/user_manual/user-settings.md delete mode 100644 doc/user_manual/user_manual.md diff --git a/.vscode/settings.json b/.vscode/settings.json index 777e2c6a4..2ec2ed860 100644 --- a/.vscode/settings.json +++ b/.vscode/settings.json @@ -16,5 +16,16 @@ ], "flake8.args": [ "--max-line-length=120" - ], +], +"cSpell.words": [ + "Hashcat", + "hashlist", + "hashlists", + "Hashtopolis", + "keyspace", + "supertask", + "Supertasks", + "wordlist", + "wordlists" +], } \ No newline at end of file diff --git a/doc/assets/images/edit_user.png b/doc/assets/images/edit_user.png new file mode 100644 index 0000000000000000000000000000000000000000..2340dbeabb234e73193df0bdfb2f5fb57c8ba94f GIT binary patch literal 173559 zcmeFZcQl+2+bx`k7J`Hzx=4`dQKPr$(fg=DqK@7fA`*fiA$sq<_f7;6y^J!-=zWYn zx^t7?^SszQ0E&eQuw%^C)COyUd?T*x2CnPe~SR z!tIHE`1qM!zq1>+il4;@oevh>HCA*DrKm?ERcn^4~qopNA-AvR7Q!W)`i8rwe-g_kkA^ z$GzXEGYD0lfAF`#x?jpJwv!G~S9|rBQNJ&inu>vK$g;MPv-9`qFhNS|KGgjDIo)3e zOJxuZot?z_P~H9SGiwV7y9NCF!@rOEGmG0FNO9{=p9}qM5#B;O0>WNtCm;OxQGZx@ zt1Se>;Nl_m-zWVU5Ox?Jz0}`F9S8J&uH!?o4^H^scPt1Hc0@u1-QPzYgH>$DL|j|+ zlgwWiPHQs|_9I2P2Y(%PzYip|?q#V3DLSEr0p0H`JM;5jNBuwT>fbNT|Fo-r zzcl~TuKxYf{7<|3w;SSr+SPyB)qh9e|4($)nuu#i*>KKIei8HF;?(FWN91g)qA{=0 zy0}id<)rQ^RjQ>*2e;&^sIi-rO#H8Lg>g2 z#R>BG&fi0`75~=6yN1q6`i;loq$^)eBH#wU?|yO0uKxAx-*4mp=S}pzq8~p|<4bQJ zl`GG;z3(P-c!~xLYE-27*b>IPzP|k1m%oK}@{Gg$1F7gq!&TaV$QcU_-kp8tKA!P4 z)a9aYJl6?*#((F)|Ly-K2xGb0LVSH!NG;!9UM#RrI>tH*oFunAC;f_k|Cg%q3G%{l zfqek7Cl~g7$Nc~HxBQ78$2dB$256X~vx7c7jq{+NLud0r#pMvbJw2)zc+mQ?#46^; z|2fkC<`DU+3*bQoWvsT4Xj-{rDujFx?OFlI_E+Ft&K)&|UOYH9X7`1=3a zekhw2Ywec-%@)suR&+==0iT#v>Yo=fr{_S#p^=$NDqxJkb1^rDS z#-^a9fl1p!_A3^i6aQE8wR#g8&$3E@NlG*oW$4K$1QX@GqzTQFL*ks?u*e9pudJ)nDH)ZcRKG* z%WNQ#P`_k#PM@X~@fTecDjC}?xf;7wi&yNIArK~Ofmpse=FBeu;~-n5sQW;ywfYuv z&?5cQg68aSR&-QItgkuv!TLT^6M4G_!M0Tp}I7sKR7R%H(vb9HwNx|f7bOu zV=SCUb{qI8{pwinGf!p08Wc1gM@SD&Hc2eR9eXGEhnPfo)46h#m-;A=r=uBA*u5@( zbWx(Ua>NC;BYjf1Rciv;Pva`yy<3VoJ=twha~oG(Zi|T1ZDo7!QFB&ZP~!Tjli(xG zh}bFvPh%W~OS^)dWxHZ`OVeJNKufjmjGvrl{zWKxls@vb%UyrBVDZX#ZON@_w@$t8 z?T;TupHRyz(;uG#Z(t0aF7yrk)DHsqMcz@Pcc$3XkJp+!DA=zb-Yx9fQhlD9h4oTB z!6eKsgAVChL<1-c$oZu*6jG{v$H~rbw6IC0_QjthIe7-qD_Nk&?n8uTeoswV-G>&5 z$FqzmHP5z{4*P~>Jay(wm>SSI`cYUjq>axk4=&iE_!71SWOf$3eI=gJpkbq9zrr?j zzH;$C{*Ld`lzFtM>x$7QXpi(V^at`+Rp~q-)Qai5Sj1%Maxyk8#}$Tqpmf2a#O~e~ z)Jxnv!`V#Ckz#vpwPNY(dGbq~cKAn0<-w}?j*0t})Q$;$IJxhK>ke?A;l5r`cFtyH z@yohNyXwu7PM%}F8LP>Di7gJTODeyUXZM*4p#7&+Ow{3^p34?yQs>47#lEK1AH|90 zSBAItZAtt|n=XFzUNlaaf;aN?lfAVT$USrP;NC~Fvo=f=voQ(g;rt!qsjcXa)a}6p z1y?dfRxl$A@SAKbv+b&HpN@RolsaurDxjcudqt!)W35+Hc>&s3I9s7&4u3jDtSCS# zfbtbSkg|%C$a2=9vv-#K9C0Z&NW~~tTqY#_l01^ON>Oz-6W76wr~i66_*Q3JQA%8s zp68B9$i^)yOJ)iEre zuLOPkHb=*P(mUWCRau$pJ!Z8^nfIufbkAnNWRD)Lw$fhi134EtuV1i1c~F>`Psf^f z0`l$T*nW|3Yqv`l#b4$yNi-0`ViH1w7l7n3R-hezL;`+8a>PF&O)_}aR9Pn3@H^&r z%lYI8-#z!{eX!(hy%w+GKhPxg{>{Ycxt=&IU(LQSs0fMQ({(+oZ&D)=uGKQSP#anb zJimwa;uY{&XmZ{DvVZ7DfMfWbn={pb!gbBwqU^5WJ^BSS^!u^CXaR_3^_>YsR6bsLtQ~hfQ|B5vB3OR_4`}W@PN=wXbw3wTr)?0rI zp~|KSP%>;*=XlqpC&u7M4BPX!D=^Wu^03m65qX*4Pvg3=LxzN-hx&&%!?X5Q4i*ui zE3-LSYFkH1IrJedAvF(V$?zQu?FxBa)+79y6jA0+g8_(94 z9))XVWH+B6UahYbi@_L(cON8)97P{dZb4hWHt0(+`Ic%`Y0?LUN_Jh5j;~+f<ea2DF&rHTjt52@H93UE1zPim9)#P3$L3H1(=h+X!dAp32f}YmZ14jWoCW z7W;+d;8`O{%qk;^qX;w=Z>DENXxJaIU)i9t=)e|W^>#$wtA#)Jm3kXnd(a+y#ChX3UG>Xn`Uw&_pp?YbH($+Z|jeMe)(Z z^{FkbHr+Ms)nTuD?YU%5AIS_v$9M%}vn@SKC_8=J)C*{KclFV zx)djD)ly+`PE(RR;wK8$@Ol(&M|nQn0M57IpFd&Fs6&;WEgc|T&-(e_`iV*y8{!lW z_K(*Tu$jW&)sG}9zS%{-fM9w>5sfhHP85F3wJ9F5?dOKs=O4pfARbSOuw?< zbl{ZslkXrki-rTAX@)t<9%svJ@P09(RX2CaW>)83X1@n_UT3Sg$J1Sz%3#3~t%MMOuh< zRK7`v+Dz#)P1)xn0_kn)GF4Yl$OZ*x-WLE&=oE!6H#`39;y!T88Fj1GOX><#BwQc| znotNDfAtw_2}0F_MR#sgkVXB3t9eQU+J&T2JqwZHY+*LA?EGytdeCY$L!wt0G;Zkq zItEjDeJ5cN$%HaKy@9nW{Tkmtg)bsI^Bc5sCp@}x3@d`%$|I32YN$3tyyMx5WV<4k zf%Y{l119)1g?Gop#_466maae$N~0hFB2AJ^(7&0pQ>$RU>`e0#i;c@ylq2_Q zO{wz&Dc;arPYO~zKXWYdN(XITu92`d%tCV-g$lWlhZ`rWz0E_}yAF(&*V#Rbtpg7K zFuNYtd6(U2Fi>!< z%e+3x1OsRuVzdqK?V7}^>nN2aRL987j;X_6WH@okxey!pkH~%Ib?e0+r)r zDkZ~9^V7TG`1xDi5W{b`TKs-X^OUfw?nZoC9LJ{~%9jzmph#fR`-&0qdLq#L!{Z!U zOu1z7hV@BBHWvHcsR5B3(Pk%2e|+lQ?35^FIf4@Y;LL1C+ry| z8V18x(*`?U3xiA-Ww55f^;Ao%An6cj`&p1L1c%mQSxh{5KCGoFPdlW50RBMlh0T>}FkH>Z!x`fA*G<8v zXfu8j|MCJT$)l*>6JP=x!rA2nh*7ld^CDf z?N%$3X8e0J8<-|*@NgFHC1@O_V9#)-vWuwZ=|vJ1`59?Xo>pKU>E8f&j_1Zz!h204 zXNFW`MFi1iRE%E;sG-p^f}<_v(n*hzz8x~7EhtN#Lo?8t%|xJve$4DlPJQ(3+>4IV zYUYJ>ie$b&IZ%GLaH>vO(d{Ye7enD3$#8C~nl{W-;?N?PO5%A#T8h=;(ed{Wq&cHl z19?arw+Gfg+;J9Hg|e`hT3SI>Evf|(o00s&UavI6-N<{tl?+9bZbQK-6ju#xM2A+h zDTbg7w^rzbq)UfDE2F;3>@-;lP<4Ur+iHHU)!BKcbN=vU#fPjv1Uoa?7nV*Jo>Og1 zL_72k(o~kO?!msEw7*DN2df|U#0g0z|E{~=7`quCo(PNj+!j)w8i%Zq{|$Y5Wu&%r z-_Mft7vx?~&B`{yt7=!u*A=hpdwC&EP&M_BaV4tFVbN*wa{Q-0;(=~s*5eKIRucv# zct*cDgCbnEdP+kp55eFkNrPqe8W2!CW5T*eflkv=OSN=QM8_jf^Mw3l;kV}rdk1(| zmSTc6uIrU&B^R4w%9qt+QS67s4mh!Jt~f?#TP^{239ss!broaLu^kVE6+RohI!5SSO47 z3#}>xFDtDzOzp4pYaO`tFE?t>1EPNhGbp1wVNMLt07)XiK)RBB%!!9-6v_F>u4wf&S{+PK^L!XD|F6+Qhsxjs(aCagLfb$Xr)d-Fa#!lUs%cB^o$F>Bxb z_-^OKQFa3BwUjHxdfPG+1^pa3rsB3{EwD|GgNmpT4cXqOTh~*TxpMyyK_vb`V5$Jf zk`wNb$~UX1QTsq^4pe>x^TcN#7tPai!qrio@f3ZLtRu!63{0;WURR44UlsN;+|8WR z!yoKx`{O6GkZv<4T*E?*GYXzaq7fxfe^51P7hzuZvX{w@=Xo~0W>x;NNxAVjyY{5E zn*X;a0+6ltpu5{f7kjy`s9G!ugu4d=(Sm~_H5tDp!lld!{%YekBG`%CVTG49E{9TS zXdx#AfZq?x#kPsM)~&`)d6g)RUj@3t5%C|Ll<*sm^Vkek#jYeAm9UFv6Ysry2G5M1 zQcviAn734%;38Rm#dSQ}AmGFwhYHCV9d_YXJDfUjL?h*^tOiJ(r5~D%jN6WEpu)F# zGwP9b2j53hoD#t16Pe|9Y0$OhPoVFh&#N2iZ1w#O>*8Z0=}(~Oq}M#rC)VpyZyYfw zR=Vop7k02|JI0@BZu-sEEcHlhL8#TQ+Oj|o{PN~I z!=2wb;co5y5Gz>>Q^wA0hSk~c(Ml`)m(N3i5}(?kBI3s6eSwN@Zk7PZv6}J*JK`20 z2L8?G5vI;$s~N?HgY!j)uw_q1it*`t80=c3-1%nR?!_i?thpahCS{;gy~8zhwxyvjqO9mi>5CUr*)b`pELRoQ(`Jso$J_hp z^)p~{8wFnNbqVaiVWU3N!q{c{&>}&NP0*lcc8wC0{S1?7_ycK|@`{DW_UHcEdm((b z&}}SvXa6hvSF2_nVOj`RxL`F%abVPPMlr9W(v*B{Ix~RpB1$bisl+bno{*yw!P%RF zc&`CP!`SGt(y*G*JpL)UunH~I^rPG8jwHXbW{m1|g;}%YsS-&m--vIuX(8ZipnH3& zCCOJM1{+SS-Ulu41sbZ+PDYf6TWJ%pZo3r@m20%R2cR_DiFiP6XC?!4Mr>^%^vXz8 zFI^^glh--$>5S-pqGBQ9yvAx(cs=r+;!ne5(fj}zf$t=<2>A1D<&7$4NvX*_d74*W zHizSGQ;E1r+(8~%8>h3M9q+=%cc9s&v(-Oa()Q7HT1D^*SjKD5yWg9m%35M z4114rsK?CIzC6JorLdOJ3cHk;w z#!LBRW!8IN=E)sc)tf;4vsC|;wg9E=kz#Ex9*!4Sx|w@9)%hpI-JxS_P2*|7MMJz& z3e%neA4q394pP{3oB7qvKK1d?WFzE(WZ{}Hk5Y`3ZE<9i1~!r6@Nd4D~5FoSf_#X z1C;;*a=srQ;W#j9SvMvO&8=^URw`5uPC-CByBg?3?Y7fD9-5B$nD+}5HL>SqbRAxh z=oMAEfF|)LKbv${{aLhM`vVd{w94H-M9)WvJHw;woiy9;KCd=&+XCLSh4dpbvdLcb z=!;mRUDG>JA{8mB{c^yQf$_! zEbLcg+17UYJrOuKPY)D*^gU}7iCGzistCOb6@{aEBCo)&F2Foij>thihblKtzCRMc zOKYCqP=NO!M^CRlyP+us;yCPwM^M|?ltL8j3We2*XGp!|djgbNMovi}eZdq@x7xm= zW_kELYs_2+tEjsIaZl&|3c7l>Ic&+4P1fX17dLllJ!R|Jt}?6NEp2m#E5dex^ItXt`zxnPBlTqGJ2!s$h@IC&%BtqAYrt6EwdGKo);@ZJfj2 zxisu=3LY*FH&EqU+%*(?JL(#M@&1_6uOiVC0Uq~vmF0cEN_Yc`!{0X@{c3R^bBiy7 z&y3H?PAY}nr5PxM%;RaoBlKS2z5?mk~G_w<|y<`Dmx=ABQr#I$QQ=M+}YZItlDpWWYw0_}v)#tVS>V z<%tjJ~<)S)OP#o4(a{G>*&_2VnI4-|j`ayhW|v*m=>O=&9jCrroiSg?~uFt)_=6veC*v8q9iuU zSFbyGvkr0QTX4dX$qT*8~e!$q481i1@kicEBs` zs4Q06c{-7cy0}qbs@#fg=suWye7y-6=q-XR^8*7mK)?U@yz@3eUuTk}Qj+O(2F=5}25bxOJISk2m!Nn9%^DFRHp7 zhCyYUH_kTj0k$*OQJy0>x)*5lh<#?60D3uyPxV`6Y%iLvs_?av1OQHFP5 zDWU%zrii+5Xu(+)lsw#ta!AZADgK-yB_5LLKfyNTl@6|Ce$LcrJVEX{xNaWE@T5hf+U)!^gvPlbe_1x*L*dx=olv42z0hWO z-rhTS)f;e38y!2BRPi5B)Jk7kE{zDEDT+upGy6(o?)=K%9Lw4LN}P%V+l)Jjq6UVg zyfj&fq%87{X%dR=8t~wF@XN_>IIyN*-Pb5hCwsi31NZc}383G^Q9-`qpJ18&G|I{K zj~;$qy<}ES%|M=AjOCzmD_D4fh`s5C-9b{YJ++2r@}3=pEtrLUi;Bo4!^~($0hID| zK}g3UrG4)47w+t6Vc`+p_N^tUDQl6}Q&G9V_?a}X0-Nl3+uudoSD}sJj~WitJ50(? zU{ns+FWD@uWot`m0nkc0dbZb8UYe;(z9-xMJNjf)C8v#XQvQBJ^~R2RUSzz?=#_qG zd{`aL=ThF`v6`wP=O1un^=fx|k}c&5*`?{hDAKvm*V)$%-4+e`+q6(?rle5wTB&8- zI^zJ(Si?Yr79wxpPv61my7!LpC$aSc$qm)@{caS5)&p!nLFkV9ALLFO$LGhNd!Jo= z9upT2@b~pKg!>%vC!H-tR*t^*CruLl67Tx6(COq0t{JZ3_wyWy4y^F}byXCtw9cTy zPqa^X0f83{tFA+P(T6qeUGEOJSfI!H9kG}Ke0lSIEN}PGmEQ47(bEycJb5pcjD75S z#W|q)5A9%hGA`?>WP+{xXnlI%qJJ;Zb&YI?$KA+-#74F*v2pG0Wxp%kx4Ylp?4qQZ)HC!R*E0%5a#xCWHqz*P$ZwiOH0GqWGG8^v;cX^oflF(iSqwhqr^p z9&kw1?xw?6(mh!Hv=HDZhbR-6Z^TDBoQHYmZC09a_58Qv=9eSKI{-7`DTnC7BYl}7 zny(q|{Hj->bvX^3xzCpkF>eUbDGEzbHVA%rKi0=@!U`(l-I9N4pGQJZ8j~|~V5Kja z1J_y&G1$O`Y5XKAeL#pk|J1O`076jmh~U<4O0mvVb|i{b`Q78Gyp6})W1V{vvoF4_ zo}4rG<&-F5Bg|_c=is9;diQa%k6}(ylzPD=(XJ`eyjgrACb!w#C3_4c#g z_c1ySE-Byei1$m`uE`9w|4C*D0n1DI5zsXd8-bRai0abX#;d(bzb`Nt1-f^WLQRWLxf;QJ*oRK)>e7q0=JKUsasat z`y_KhwPENBykzRZ-AGaB?(FTPAT>AX$aIn>It+GLqg`nIRl1{zc5Pb?652^xAxWm} z`D%9s1R#P`G4yxKROB!>-89w`n-uI(r+hk}-9${Ev66O1<+a*2OX5fMZZ&%IwrJ23EY}u#@f*sS8=RcS3)sNIQ;KOGwr%knUHU107tn#RV5Da6Gcx`=vOq_wvB3 zxfGS%)&y+fQ}T?~qCby>bg8k};|tSpJVm~oIxG^b)hC^eI?HgbjdM>75M?4o5hHUR zP8YmCP9fi#YZ9Gj;NF*geD4t8P5{APM{4K#KxjP(xG=f)WDp(A#~H^;?4V#xr!j?B_TEPWGJA?6BsX8);bi3 z8k*E7^0o2~R@kk&S4k||KCn2eZ&gb7>5akboR`Mh!IMS#8RP z%q=}txWo+(Wt~P&4oS0KEmkP=9||ciLw|1h7)d{xrf89w@R~MjEtXvdDD8a%g~;W@ z6%ii~9di-tK_k?`hL{d*z))tc6nkVx8c|1?2fWnpL?F(d?dr+yw!IH-_= z&rx8?nT12EtA2(k7W~w(@b%$AUA*(Yy9lHJc{!Qbfh)bWOT}}`xA^FVO%Tz*)p^T!qm&v-)7et7PE>I0;?E_Vo35b^VKL66r88_ zIzXkyek5iBL7loP7uTXV%2R>NvxIUA{w!MmnneRxCk0y9Gx8brIxXU>O~)Dgq?naq zFN6Gv4eK7qdxn+6SSdwwQo59)tLu`+{XoNA+6MRl6nRm-Wf@BFc;oY_uTDlbA0zH+ zTur$C%0cKS)3>3X%??%37)6So!!6g4B5JWL&(I~?vH`1^r+Wm^qGHB|*h}P%u_vRB37do~x;yDr zcGe2;HC;H8KWyZ!0+*WCgR1R2K4II9W>Xq%nZj`k0xB6i)0R@d#ek~~2*FHLDk6g1azggk0Cb{fHw zT9~m4z$&90Sh$zlP*Uxv#ryvBYqQ&-wtU@nKM#Koox{?DBm_~ijo0UFXf`oH(pG=c z10DvC)l^pzx2KZ#O+S9(#2g5qDk;Syo?F~rb-Q>KIyRFGyLA9pP9`H8EXEUbetFka(EY`? zLMM3Fwsr@Vg1@q#b1_*{>SZ%uWyAifXxh%au;sVDUGBfBJwIsL({zfClUlxjWHze@ zFviVwILDUym_Bt2foMeScmz<2Guu3s8rfF&ODPqgnU9kRP1<5k*Vr9?< z(3bvD1>&cJ05S-i?|C%(rDuh_@#P}fa=-|!u|TPACSDQPs#cizE8!nENrU0pm1Af$ zy%UMhOWkx}XlZqXM(UAuvKtP@86}Sl4tgXBE#esK*2%HDF+71}Pgo{Z&vg`-k_(8Y zyMKf|5>hQ$`NCK%CHq<7ff%hQ`s=BSe+c9p_GFI=acGjbxYw*(*?t%$d8o>0S@`J8 zXxdNmuch53m1gajuluk*Ge(3JsdQ*-7i^8`X`G)K4dR7(>rEO`4T+79SgqYH<%mzL zSmXIL*YO-0xyuHRB#xdkw)wbv{R@F+#$t@5vMRG9nlos0Y+~B3SF9n1XTDV+$xiBg zNF$Wb8t#g26L9}}Ak@ z3B!^=q_jxOpk%nF&V5;sR_DQdTOZ7YMV-1!*^kAjN}>khkY^Gy(ly7{1kb8pncd3a zkpB&=AZLOMN2An-(@}4mUKy9Y^cZ^fvfat^d+0Us72I}?usPH%N_c%SBZhT-y9yl~FR^)4{o^S^~QhVf&tm`dTx=;p`uaGV*pkl=D?>O1q~D}8wb zL3%GUVJQctmp!!N*C@#j!=_2H=m;!Pb?xdhbRjNqu^w8Iz9rdJlegh@sTlr)!CTU9 zrLHw>{94Tv9P;I!Da>okQeb6{>{1K8m;1IoY!{E5`+AkQ8eVHKi|9X3paVhdd9I1u zTr^i$My4SE);{j4F`g76g6#C?_MW@=cqP;ippRQw=n;;&>LO}LHX>!}ZfcwmEjf~_ zzW_Njc2G8bPXmv=DGQH}{>q`&2#=u3s@0`vXu5%@-onY}g@f-%vs0ym@yMQ;cX|4k zlzn%)uYqXLDFKb-U>)kyJYHK-i`X7=mn*5P;1a5qX<=9HWq8yZ{7!Z~0NfqIc5<>n zyv>}x-VT?uXPOk2P9`J3fOPwE_A!H*rr^vvftVBWwA*?;#pxQeHPHc>O>E#(BxzCM z&4O_ns;WF(K4FfBFqJ-i;qU?tgW1^S9&_3wgctWc5jDa4yR&I+mdU-Jn)q111O2bc zQa~4;alO4(ld4tL6L>~6IytHGZQp~4&{axqx^AnFP<2c4p`FJ0wfNs`!1VQxcf+4- z_!dhm5>e>C@|yk8to%gJi}yZh7sFcS-1|G-7sX$EomJi{ zZ}${wxY=k8^pEzBF;G0|1uTf=PiJ|bwinw3M5d25(j_%olqFY6028^md&UG^p8&ySSxC-3-QVMLQkypfwAI*L_qDn?MlpTVp;+1~sB+Yn~=b9$+ zejv?)keSQf{nK(kkNx- z>LLXMchVbkObOttshJ+r)0MV4&S;r8E1zgGZ=^W&#AUZt|CuruXi%|Qd2T!v-@75noeodi#& zNTML}8{)nkjOHYh;ptkOJVCko+Ab;ID0xfNv(ub2X<>`W%7Xt#v+2DS1+|(l0zhVI z{mCq$n^_tmi#+(em^BF_8h`{sQHKImX8IcHnbG4%uWfYhKgy*U1H8_UmhY46QdYn{?VKE&By(fNF84^GJ4)tuLblAG#lSeOq%CA@+&i|K*@LptV&>=h zcsF3>WxSrLa*u$GfUfG!gRW=^{}CZ#Du6M$5r(JayPoUGg07n!c#s6l`nnTtc5Q`y zon*L1={%IR(bx1iAu23~Xa% zkXp-nZ$wEqYS!D+T#e)=PIXVN?+5AuBI@RTfZLDo`Dbw^NUbJ3uU@xXaVqo1f{}lz z%Lz>5=(+ucY9I@rG7$3S?Pnbl`FU@fWMZ*<3VQx_g-P#vR{6R`$`>nV$7%z*GUKnG zaqjExAVtw`%FpZQ&wN+I-XP%3k~8Le>E+$%XxI~kpC`6^_+s7GXYe&EkCi6(@hUq8 zsE4Av1i5@EUJABuHyfo~O;Yo?CGOn2=Ly$t7noJcS#k5nNumBqP4Y1r8207-InQ}> zUF`zgGD^Of&o*j9lbXHb*tROyh%HNJ7a$h{9fN{`8i!kAbLtzSCpwozAHc#>nE)if z?p41nNYur9#@pP7C(((1ejCY3;rgp#-m~(P&KsyrS5IAt8&T}>Nd|0BRwe+MKnV7D zTftPl$;ffHzj3+|THM?amc zf|m$--L#!{0ZXvEeaFwl+ifA|*f&JhJMGke9Ikm__b%=os|<2a&VdmAlf!UROpHs9 zmDxKVD7t#U6$Hr<+(KfO3T3vj@r z-W;q+-Y-_iIkhfm3)urt-2ZbZ!Q75YLm9{Y;}~zMs~kh_W3V&%C}B|phUEa{{IL0v z1uCh#UHD;Q%@6McwHs@ppEuwvA5sein3roEri`pnN55GPiYn5aI~x+A(iT&!edE(9#g%A*!Dh>$MGhu_~y!ta~_!UC5cz}Vj? zRr$^IClL*v;(;||)-lMXwBej13%88}-POYvfO885bN)qo%RqlJH(FG$=xsM@$Qb?( zY;)$$iF6ya_6@Oad*!Xux|& zF;Rg;&W$@^;P+DwQN5ey^Zk9_k;M_o2hTevcg}h{tVa(*5A$oAesPV-@6fei-299# z=}tJ8^=nDwg+|GhM-KiOAL2{VV89_1rqis?r=QSU$AvW;A%aisWfktJwm7F92(8Ib zV!e&41U_o(ax$BBJ4*gaIE`Y-%O8uzQfP8Yuw1MLlpOPmG}=4Z=(xvSzT5(Zm!?=% ztIHY1JhvBpDFC{S0J3PP`H(T3FY0>t%a##bio*j<<|Y>v5GypPOS9)92c||Bk~bX* zSquxJI~AFfi`w{oHLAj$*PJ;EE<5Jet%(zHW2|SY`>b?$P87G{?muUB4BdB379fYx zeM{K`yAKYpECSYB=&;h|YU z$XnPeJVkxB_Wsc+ri;~HK;`!wSBI+Iak+D>{-Z2HOazM^q?cf_OCh{PW$l&BqUQBx zeW~LomVOq@$R3jLbezkjsZkkAL>4}m?Y`^@E^Kz&JL{EOG-&}{hHD{L3Nd|>X>wb_ z1w54k1wd72wSojvOeOF_yO|1algQduJH;HG@T$BVN00nF6s6f!vhOZLN?hpLdT2IV zeXZ5KWM|)<4JJHqxg~eQ790O_Px6n=;1z)(V4RuDIfZ^4u(OaG0xW)|Vz_E|3i5oN zL{d`*swJm;X@PrOuKp8`n9p|-h(7IL>3_MBRM|-%X5gbY2xX>LW*|A3vcFshwDn8a zI}iNj;89B#q;t$;yJGnlCq-S`lZD9fQwF+4Q*v^0)%2I+tXekR661D|*EwD=jWa9z zIYl24qH6#ofkB7GE)Tl#5d~)jH2IV%zg5J7)G(>GtY!%~anXQUseIIj}uI^}J++KCAl*G9}G%kqjXedHw7=*j-|U1CIlQts9+zJG+0 zp-CU}H#1rOkyDijqQY-4jycyF+GkunoB8!S@T~;fPh%>0?o#Ge*8=9N`>`!(>XzY| zFCgyr6|PhYr>{J7WGLD3ER}~z92=%A<#3B}w^O=A1#-&)>lO3MLPT(FtIef|@b`Py z@7T8nM6){BQHuOAU=yLxj{ceE&JZ^vs*$X;2N%D| z1RGr6m>kgCs=f)FJvd}p0Q1V?p9b5f;#lyw+cOsEe2-d zCSiKxlM4zT^x`|t&^K${p2??2Njg(?a(H=mS3g}a!I?#N)_T|ee4^#@m&zo0O`pd^ z0xr3=$MVngtTnd`ry@2O4U)Gg1ZccEtusT<8~OKB1d@LJSbl?dvEL$130e#+L4q3R2fjuexb>AT5$9d{WL}+8Xv^6E7+I1%EMvs zwZ0<1{wqfPNe`dk+tlNd6sV#Im^8P@R|mK)9u&axk)k>aGmz21hb`{%fl9K(s3O^I zZ?3{c;1n%M8EO;f82jj%xA1c|3+yJqZEDX+O=` zy!(~PTcx%T)!9(;k-0L+>6nwuQb3h~9v_!i|Tgd)oFZ}Kzq+D7UUJD|^;=t6%tY~Y0FRvL7L6~=i;QLOcL9ij>xLq8l4$kK*VV~R8X2m0%k3Z%TDr`5-_a1{dsGEix*8ZeH`zFP zaN5rRQRb&0P64I56hw!?A4}3qyW0*Kp9_6S@s$Ct$%2_FpnK*8RlO~_!jjq2SjrXy zN7a>h0y8m!Ik?;2v}XeTKM(yFkx$iu3#XA07m)VWj1c!Ty~%wuQx^6gd}qJOU9PVJ z7zy(3MN^*WU>Qy)I!tp63+Y^Q+QEky?9yHg>}xwIqt@Dc;a|qArS2IzNAUWv2NwO| zb{xM=gHgI&WkqqX3haxe0V(9Q(N221>FkjiNR%*-isLS=GZgj(i(T5o=##e|MGLAt zi|EKFrL>&;x&TTk8)Ge4dRy|;qy|pGZ?{$OGUvk3*Eh^E60tL8 zZ>Hlf`!Ii}1mjZh?2T)&XFdn-+Y{+?07F+PLYO!$ye%er@d18^Ir8!_OPdvFRD(~IfzYW{)2=U4gPdX&cxEnN zha9M{3ywBV;|wu2}QWu@vGIEETGyB zZK&4LKUnFCQO0Lb$*y!fEFbz*f9>Jvc3X1$h3pf39kPC&UX~IIc>&5v~lWBuU8}QS> zV<2U-ACo?I1|fy6wWLb`^PhUjYvPN8w=BDwA8ktT%L>1YE9 zBRt?C`86Nox9cTOZwC>Yzj?#^7%P7GcoA8RtlsIuM6H(=F>TtK7AZ_!&7ipQasT9H zIRPlDITmz&XT3`Ic>{l8zM_c+Letc5Tz8y*TTM;>-hY$JvrZPx@3)tvKl9Sh3~aFT^2W|>BUh=t_Dkd3*|8o){Uqmtf8gX6 zR>?6T`g$HlSpE+(yZv1r$UyFu=zYJMG}1T>^w}rG&3@A-0D|XmCjfC1bBtuY>64?S6g3WiS3! ziTj@~jw-;MMm{ZjWAaO-xStEGGK%W<)w9O==X;->-*hE9pe-S$21<_a7kV#rOEtQp z(tU{9FTnf0%&N9qCW?^r5gNXq1i;_CZ+idgQZGQn^V=nH> z8b1F~&Pc1+@{?llyJh{$Dt`bSR)#h~?I(RBhArGITNR5gEV0mlhQMdLvegceOl(#vMw6TZ1k-Us9o*58bEqD9)`PoKfk!E_J z%f_#XOhE?{IwAj^;Qy&3|MH7|_rFHL+n3{#jG`~Zh%a`U6CUXA)<~CapUnPWoyH{R zEpfg^?d)))E?dPgsC} zr{P@wa^A9=k;mm|DISqS>eAH;BF6>8nPKez{e-U=TyH+&T3+&3Qv`pia)13oH?R$G zRxC*U((?a}AXtH6&I7-Fkp4?T`xBJ@_1Q)pARcmLDEQycC;sgk8UU-fA1nXIP3tc# z`)^_W_mA!0uKq2oe-p=luU>x(>;EUhD(awq_75(=Ujy6!FY)UfaZ7&Zga}##|t4H}viZt(e{<|1*?xKq+;>K^AE9EiQY7bda`qYN4SN zG#+I*{WkM~jaqoM!w`LDZcKjoROUDrgO_>+w|=|q{uV1*0*9k%?@Bkt-5Y(US)RRo z$$g8Sys>Oby@B6|GmxT>D6q8-#g3yog?(S zbuR-kS)8`w-M_w<|0%@a0I>w;v(#Uq!+*4j|MSf;m;SSjnB@OGf8pW(d5ixSkJR9@ z@t}(E$*+*?KfsdT$?R{%`VXY{w_^QHfBsZ@e=F9XistthaL_}$^lCT3z7F^Pr+D=* z;bZV60ve{?{%17>l@wc%47S?~E$KSi*e-Nbo$HHo4W8OwUjzB^}r+p`_4e-IBLVOEOUMSD3 zn=+#AVn(AYOk~S7(P4oOI~~KRSEATyKKaLLYH-7_gvj=Qk&gfJAD@Z$mKey_*1b_A z`b&Ntu%UVzDa=)*HH?T}?4lvJCi#i7W4ap@o*A8=5}q{cdn!`j@??zF{dzSY`uAQR zg(%?XP>Iq;Wd6@C(Jus=6Ps%t(;wEA2TQXA3yOTw9OycbGZBp??UU6{FVsDCPTc$C zs5DJE`OoU*zd=_c4k1uq@lWD~{^jb)v*PPmGs0hNH#M^K&nH#xA1~;iZ~QOtm{Xkt*A*t?S`Snton+2< z9atgytHy!1+bwJ#I{8iquw5*Fh#K|68d~jHqbi*0k z)_Ju*#r%;lXiEpYX+*6oCl}f)a&c;|%tHT{vonpgF{Ny;3sCwYX#C| z``!d{!cgSg+@FXWd7Xpab*HGEYN$6+AWQE_>mx?JS`Bp_d$B-|*N%TIus`@!O2n=V zM^W|FXD-NwU8i+{z1R3vW;*G%EOippQmBvk9!A7}vH)ESQ<-hUr;7{tkfWBhbrR*m zKFIl=u|WcxSy13#JY2Cov#};%c4RF1G_D-Jk*J2NBP^mnTm6GMk#*&rxhf0&C0YLu zOy>M%cg$QXYO6*bbpYQhTvD#hI^J8^=+Zymy+`dg{ns^+al3wItghjxfctD6ft*1h zWEnCS!vyqrJa?t5kDIlf5<=tEoYUCwRTSjb|C4_$;bZZCj{zpT_=ikfBZmS z$r`kwvlQsoaA#(KX2Bqf{6qVVH9ZmP_|AgAdi%_(M%$Uw5F1#r6kz^#!-MR7guHAlu#EnM_7I~60K|zC{|&wUo8i-cphti7SS3UoAG_{sXJb;qzVzx# zYbI-_4ep`Qjg=N!)OS*aY%X_l!!5g|-IC>TFLYGpr!ql!brHMuN)t`4a|;0%M=eG* z6Bnbl6lf&!2_C6r(O?N;Gf$exmZGcf-rtK*h6C7&!2A#XlK5iSyka!OaT4ao^4u9nU5AbV>>-9vWr8#|^J!8rmyD zAvChXLk(PON|l^z6|$!Il0b{~-p_%foWi6&D-TgmsMp8oy-}Q(+^UgNX-3SoDvY*v zT34*DG)%{8wJJ^V^V`{bf;?tPlv?}h??!maS^Z-w{=dn!(djNw zvdt=a4k*dT&C9Vmuf*m+;A+F6!cto+>TAK0Ei~Cu6iIZg$ zE%MXinFyxGALq=y%^!YkQ0-#LQRii3ROSMjUZ5OVlG6`INWhu8(C__t8;G~WZlEBcPY?>1Hfb!`WwrP1zr08$n=8p|-2@0mYm~>I=P(E6i_Zmsk zPCeKeZ{4Ua&Eod3(0T)8qibyGrMUz=O4oyjp^KpHg}Lvys@HZ#PR?o?vRPQLVU;HOd{9jzMfE7g_`SYxn~wf z6ImiXYg#yoeP)EHYg@eVsUc1?S8JmuO01aQ$}CVrR@J;j3lh^%<@^;tsoj2 z9MWxR<=y9xvIn9uORF4xwFFL_&oQYvOa+y5_W~!m$jo(=&S;r~8^$uhWuUZ@d3l#l zMZ#szLuL^}bKdrJbgV4On$eLKvgSn&1iC|`9R{W&p>#_KH_76=R{n3r?zF4hJgn@*;%y;!CqK6zr*Kfu1TOcd1pq@vNSBNM4UNCYK<4>OhN9=NOW0 ze-keh$6`-3#NwjkEnHY2e>PDEaf1Un!4y(Io)a=_uD-&8#l?O;&H)}P!Cs3l)Y|+Kj}edal1DAERmj}KyCK@XD`|Kr0hOvzN1;du5CrY(Ntb3 zEz(_Jrg)jT1y_s$p^BIKb*q;3qXCIMI^IP^pHLekFal(vv0kP_p?=y(a+msOPDgoP za#7Cbwp$d?EmTE{vD-M_r4MaDhK-YBzvIBwaJN9~{9f3i3~H`5jjh0$Gn5b4II!yx zKw$d)M*VQX?jWqFgZ}0PhJ$KJj#zFlNWd*^y`kjQ6YKdY3j2$mj$tUZQx46THAK0; zVK}Sv*kt`+(AqP;(gxq1B1+LA9yi~&)grpCqnm0`5ncBZG2#WxMJY3%op$S(?L2USZo;W?uF`h#ccfHf-FLg3)OMYnO4CeOm_^1k}TUuRwR4TvLAwzB1 zgzoGyiy1K9%JDJ&y_ESj{Wp|lwz8(S4*my@fXS!2wO<3Qn+8b6 z_{rL3b_9$0{^3osQUa;^{WV5F7YTk?O~^hquoS~eaWk`kD=*di`H~Q!-f%y%mXLHZbqE`9QHe${{Mx{(GRdo(>8fE>13vl#yzxUh= zd4R9YE?1o_FpEBg6L$ohj?RPqu|RMcj$P5hWYetIr+JUnNdIi|p##V}b~GVmJXgjhiJOyOx^ zPBf%t{X((f#e-I*^7W)Gr8Pm8NoAsI5cC(1S~3fbj}vYkPC+J@=!J+l*JZeFA=W_1}&5*}Q<2lTOXx|7BrJj8u(F*mJG zT%*{yHbt{t3&J&tdbaMlWqGw6rgx%B_nk1V$96L5 z2OHZ);^!B?dE0w;_?bS=P|r3~j|^@m#y`y2U5p6IHW}Me8guSAH|6A|ZU;!;joxOe zJ0%X3r+vPdxCa%lpx!|#u!MaH+MMG-B9p$F#@WuI3ev}OoZNHTJ#AWIk zjs>`vhFrau@{Z1|-(V)%K?5(HQ-i1dkoFgmP8uszGVqE)bLv`GmA10bQw>-*S=v`- zpTwLv+6wcLSbxd{!(VQmoeWT}UmaR|;yOV4U9*TBC1GzFAsVqSj`xx#GlR3pL+#n% zD|Ew4WPeDD3)rb0(TxLDhO9j0#i5~+&YIz!iV18Dw3~Qg7IQTw^wl8t@3f1{)-d~c z<+sUCo<4B;zVFH9#GP~0&FO(Lv#JbNHL;kbKAx?@g^eg~+AHn6hZXiJ!X3jG3S23X z=Ox)MbY}~T<)7k|At2G&*(QRu1K`_^+es9JrSH(FcSjM5+Rs%`r>k~Rk+=575Q@_K zY z?`+AoD!rY{+mDfSdIR>G?{|vDGBOx+9}##vkMb&5U9r?31*W<`D;q(ctve z*=i{~fk%kD%6pqpqPI2Nz5MFIlNL)!lpk5-ca7#Igr?NKJOPC^5MX?UfWqPe**Aro zUOTH1=D2qm-_BmF3Cy@f`3Xd887)MUG_7RkkHL$z7Dr+{*+t%HP2vMV#BagS}TF`=`FCp$+-+Kq}iW^M|B z$ebkzBFt5Ep+1e>x4#Mz45`4X+O6`wA50or(3-Uei&8b&9(bARo$dsQD4i*TsCK;O zB>+b#!;)DqtATGN?$Hb;9qHUVZ2K+Gb8b$d-p6HEiI#2EIfIJMzI+wiVYx-fhUD4mkccZAlDqevP!fXkQ?+>R1wg>u0Y_wOc`xj|lQ~ zg-5k$Uv>!@ux1*va9MN&E*Igj+heunUnA;N9@^q26gNvHo!rT;R!=6r*%&@3#b3G- zFK15CQubADdHab0Q>OiM=V%s{rSVnBuMqLz#Up$ox-90q3S>`J$4Z<#T{`s$VckUA zgb;^N>#}bdvaq@$gB~pX8P< z@3nU7ZpUeU|fhs_7rqrRl66W#Sn8ol4dRTOHw zUfff@*t+Ko3-vRr*hDCiE(yWxJrbr^`* zs%2Fw<@R+B-NtjTL>JxYgU2Md@GC}71p18clzkCTn#~Kr&4&rHau&_S4h}}f)+yye z)h(A&_rKi=i80pWq%#uIHH!7)$v!`qLn1D*pS; z>zCdfkaSl9#FH$?&=e&6yf<(fCl_p;uUGR`O23v-dTkURp(o*noG2o4DqV<}_S|@_8Hf`ga z?(b5;19|2JR2s>qB8g~u9j)X?-Q^X(jyBmuCX(afIpL*KsBLsUfrc52bQer#6l~lz z0ezJZb;5g7vtYlW2 zkO@D_?f`9Ctz_#Y!wAXEV41Q+WstQNN;U;{z-8WbAj)3uH}2# ze4l%sHgR!2>D%%JLuoz|s=PrDqX9o? zS~8ALSc_tt99`Do+FVyCT4X2?iZ@b2awDf=o+^A_*+`szz#4&$dI8ldIH{27^WC|)XjFWHsCA56O*e`lM_e{<1&+x1YS)J(l$ z%gaWiW)_eBNUsuRPMegzcfJ{+6%X*k7D? z%eiZiF_CRBi-G%03e|RguOH4c^@aR=xIQcqKYuJ5LU0aI*KyC?s(%(Yj%Wy3M}i(L z$@5C`-4f0zlV%xiR%S%GI%SgAl zSzB&HUY^>x`PX8+8HHTB%((Oeke!YqV<6Ops(dY}y`Wd9utR5nGZLd~e~BWR(9lfW zHYMstx8AkBKFFbW{kednO4SpYIMsoS^6=ny^^)?!C8n5x0yo`X^>jt$+FLchI<@kR zAly_&p0fL8ZPH=~7t3+VaOUtI7jW@?qS3pZf~tBiT%B8nOsnnqL23EcS9y7hZdHHL zx)|?cmLQ+V@zCRrcEA|xpxt!%Sfl8HBL_}?{snQ}>oKfA()T03dUSTR?aMgzyz+e9 z&LDTDm}<+RL1Nhx*@uX_MEaU?trXLA{h>_S^}Wql5q)!Y%^gg?Of+eRk$tC-g%ydA zPC4SZH{nVK8Q_ewcM&5>>&jNa&n&JN9G-l3NnUU^=*T94H2LJXxoFd7({$@a`}7rU zZyuapgAv`1SQQpPBIK5{Y?cLUMznK|m*zi$tBlKW2uW=i`ojfUO#gnh1<{r26$rpthKA#r1o?_?yG)>1OBz>$8RT^=2 z>*Vc+E=3PZ(C7xk@ZoMOiT~Pnk*8(?}t)2WbH(?eBk; zF1ART`EVj(f#>^NMLyE4GSNnv zH|Nq%CCBl&tV>E~mKJR|m=~$dsz7TwgnkQHN1ln7T^K*}#cE^u(y>>ze#;F{QwV7%1)PTsr6)_1ew6TNnmvyTT6Yu~CMd0g5JsbJg6m*BREJ{5Fk zf4s=Zqzo+P3y(z4=8lr>7qLsSUQj(gOP+u`=bjc;rz*+mR52zlI+ z?)&A-B3XO-TW2epaC5enxDQ3?q8|0J+qwB@(zQj2p856pQWZ^;>bq6=2!ttC$^Z%_~6LRuiG@xuJ{hEl*t zyt5}0Y&4TE;%^o_tC;1JTjcwfw6ICkb>`UzhV6xNL)%f}s{@VV}bj@tY{Fikrv(z&V(K)2P%_vg-R2=p2T2OCUQd&YotyVlU z-*kpzK$$Hn40(Kh=S*0yV-c--jU#LA1EnZ%7|b3^r4ER~Q;BDjkL2R09m~mM4Y&G% zsQX#6fb&SGI?~;TJ8|a&q5BWV9>yiJcNBV8+EYzLrzLr@Nrj{ zuzjvv`$;>EITooAyAbJmtqPF$&8{3T(5}OvX>Z9S(Ran+OfabC2ls)cRbTb1_YNc5 zP62_7#`hf|E|YaZlLt9X8Kg9aY`GyGm<}vwzQs3W@*7{-mPw5|S-g4pwQ0@u+R`W} zXOXPJD)l+8kVa-|wU_4N9V?H7i2T5s;*py25nflel4@z^Le<=KCU&;&oIuB7)siwx z#-N>7@>K5la++Olz_WR^v2x~_b=K@3=AXjF`}em zOzYJQ`fJP$XaQa-nc;Eu@5WxP9@?Crv=1v82sFd_y8({E)*IeGb!2~X#)V|Duyo3&R)9Va9XoVyc(i$+Wsl{)LI zq^&DVwA;3nNYdV)n?;#wItBHgRX5Ww099Eyk@Kq70Iy*?0o>_cWweDy@$B*ROO!bhqREQzp1E?2fMep$g5@{g4lHQGAedaaWn z&x@#PhM8_S(d<*L0|#ptTpzvZn`5eRi?W-WjsI7DXH4szDJ-YPGlgC>NH6QBE6*=W z<&mL^5w!706V~m6lkfY%9<3bj5W2g#MAqfY@d??KKI3nqXE7X3*n=&L*tTUacYZs; zcPr!2N=Oe)MhAvSfyiRknL^h;SVJ`o-fVcV*+$4MQVNf&=O+~RZhtu&q=C<9WIt0; zYkwC@%mk(>4SHuHi&Lu;Kl)pf4-s5D+13HQoqZHv|3gV~9A$HLT-okrWv!nP71*+c zwce{d;5!d`aZw;$;-Y|kjpaJca}m7*Gp6`KXM^MSiFOXFDuOjXYhULIMh_=82K6?F z{cX!EN|;JQpGZdreB(C~FF{UNQ%XyHCbfgkCJH*Q$L?)zX$$C^=+3v13Qbx!33Xt> z!%nkb@^Kld%lO=c&AV5L)W~wg%O|}&l#GcoNK>#|D!?P`bM8Hfa-OhIonBzmj>ZLRY(NC(4fsIX}^SYw@7ic}REW!sQZ7!@Wj zjBOU#C1j~`=G#IR`<KS^7T1h@9fl0$#Ysu zJUd&b)GrctSSW^8ru``tkc+AV#! z!MTRtvOYUnIKQ)>%}kXdGTElu#=rW*naZO+wQ%o?e-eO(-?QG2xi_T1l3u-B%2LZ& zI=S`GjPDDETNPd`c@IM3^Gk!#TN;q|$7I@}y@TUb63)pE{T}s-d<^lAo_Bp zkZuu8AIF@{!<0YPbntjYu#aNAzbhOhN;;CZ6+nm1Qh#!gOMez{H-y5orzlqpi#e2d zm#mRD@)E@|lAYpU7uBL!$=!#2nvg!bYpV@LDN_8+EI6b*wnL$l6f>=!RPnnWwR71J z^3;ec&qK!1``QRIqY`R-v6sKxSfAvv?HN@WA&IAsJz4yXvvLsz2El@T7Ev(ic=Ui&~gQ<|(9HqsLgEb|QAzGRBKubqHsEZYJ@AAF4g`o_n*|Y^m75qeNxI z&ze2s-QPKv0_n3@j2r#_aBhu0?@U0KzurYfynL5fjOCQ;vbJ&Xn`oD7ucfc{$YHJX z%$o&!?F|sD^x3nff$`sTfh^E5Q`q|Ditl)X^hCb!;7igbvCC&A#KbHm^5C!bfbP-f zxo!D5-&b+nqKiAc6HV#J?Fldh2WaK~fsL1;X2_e1ec~hC3{Q~8p~$v!ei-_a`IaWE)Fs0qfgMX6E>GP%*fQp&wvuR=;tF~xFSv_e?Oe#^ zoBDj)@C`9-at0FO=ogh}lX!MVWN48z`6!R7ioa_ni3iJhSY~UPY*V{kyY0V5YSe@0S9*N4B*M=y?aj(tu|L4MAqYC`Y*t;)J&tz&-glKPlU6No#9_x^1a-}$ zh$7s(w3Sei+3Y6_E!RF_=P8YCk%=V>MRfQaEXLpl*NieLHP%8jY28h8pe4`Ow1HAM z$Cs2Hd{V%=YVG_2)zz~(`|9H=&B5KBvGV*OH4QCj(7G?L;6{t1qnqLfVA>>C0jM_? zpztVtmHW0K>-Czeyj8<_vQ&k#8;JJ|+NJph8szmQieMHwIU70YKBXGdzZ=2c#lJ7 z=X+fF5swytc9cCeW--Jrc6!#yOd~{TI zPRf&2>vogdpQNQnQ(sM72>|9He-?Vf`(&WijuS3?Xg=m~0l}EoNDi9U zyWM$zG$oUPBhs`gO5B5?%=KY5chdp~7D@%I7|Y+j@-a~pTHZ^xG~vxvo1vz!F+@rw ze-k(7TUWNZhkg`A;T}*hcLjfnqb=AwYKo+xp_`2#zjnPuwXyt-`YF!)rX+Tz+A)$|DdW71eKjQ12lTLzv1Y=uI zYG%BAWL=KhRJ@^w^C=dSRnB>CVO-gNu64paV0(CL03N9&_(}3Re>rs-d2)N^DHY51 z`ONEWJcML;^HmCJNb5_3+AV1q7m=JRkRBFNf_`ARHhMU?+R$pQvfnIXWK>Zx-rnJZ z@=)~vSMj&EN4`L@ z5Jmvwd+$B42Qv zEo0Yd+5Oreh#<-a?58z(;?84*3d?KPGAOYz95Fd(PR+q^Wxh*FNjY|Hz1YPfM|AFv ze*3lMwPM711XYz=is1`fe9Hcov82NAWQv&nxWg(up~LO6I36CdZAy66p~cw4Q7Xg~u(s#y?2$2*C8_g6yx#yw$*@^gNYh4Yb`c%^Z z-+F6Jt07aPOU?yqpb%zVEpG|oIj+D@ip+wXHq$0fmVk1jF1E+83m@#i2JbOsRG+jA zpkyDq?tGSCFDm?DUauT~(U80Wi@FA<5|D|rIXR7X-camv=Q=~taJ`(1x&0NFjOOUZ z#_0H5w!c0MdT^mxIJ)u>Eyepq8Qe-q?=<~xd7T_yXthkXoZHQ_x0`S(&MPvl=u{)z$RnhF=TR^C1qQkFQh+AIr2JjI`t$ zjBGe(E4z1e=hKGg*Ew?0^$W=~3vzc_n&@g%YWtiDB<#I_;z$|%-m|&yH%Nrq!?UF< z#=MujmbqU$02Tl8mH0Bak@uEcr?7I7rvK-RI9m78&L2Fzj9{0^>-5(%*4@kHCgftj ziY_Z3Z~dqe=}R!HSlQtFut6KgQdy_8lD~x~|8l3e^3~Md+)n_bdr#+Z`jaCeDn&yc zyHfuR^G3`qoSBF;pQu-Jr!O;|1K<)hsxEpN&9Cq7pq=MW=sJn}xhLf*MJ)>Px-Z%J z&b5}lDBHA9s$ay{Kn0$pXkivu4fVDOuFTeqiaE7$WVD^$W37~bsegF0_*!R_3B4|1 zJSfNFlP~gH37uDepf$U@dlG%UZW@az_?5fSD{Vxf8ayq*&0F3Je)h+9>?|>UVp^?2hgla;WdYw-Z1EG_NQ8zwu!m>JBP1dQx@;PqmB@hCRRNuV1mg-km z&j)3KTy_1K%@GtQoAVF2^y_s(So|)C5FppP=>@KY+IUCw|f?hl~r*6USl zz2Phaq@s)6OGQ{LG+q)3OrSfk50~qB>MeSv72)+Mu07(BCjEsvek~N9y8;|xD*#h+ zsb-$Nr+xI9oN6rBI(ou~65mP(I%IpAr4g!3zrX(-bEyqop!aDNsiG!;CH%6#sG3H* z4~)yn2hPoz?G(a<_R*%#v?}9P5+G$;HIHY$9VrSqT+mG4iRCEW9vWN!bedg^IFqs@ zKiSuK9JE-Rp+9;uwMvIa6h4bw3zTgbtS`D)qN?S+I5iYak`5r(9GRk!{+>9g;u;e!EVEo{G7^ZabT4y_88huoS}^| zIWcZUu1T|9l|K{x4c#U!tR647)ejmIl~mA}@I@RiIP8nO+7zcN{kU?0U&VnxE!1UG zQMVvq?_SnwKN^PC3@gd`#)K;Dz}3%4P525II7mo%a_U#kO@s=TeluT_5>dqtl`%by zKe9~i$ft1*)^0N%H1|Qx3x2_eHK{1EFTIMNh!t`omQqldnn!2sXR7H=zgEysE! z_=lO10=rU1ubNa=Z&y}-8@g1NgCYroUbO)aS3TU z%{t0QTR+MKq&Ze5;K%NA3nxXWknFQ{iVfC{?dUb_1{~rZ=&F*oh;(=$Zsb`}lP?=(-~H_o zqP&%A4W*yt5|5)-t=6dFk33!~$*9tK?DNqT!=GFY;tNm`*T;Ty2cuzQ$+3-B2f;(; zKrkhrUpFRGPtewf$;Ldc9-UU`@9%YYia;kh024$Fj6QjG{aP17B}c)Ug@>-M`gY^1 zEGdVFecrs@>ypQDo?(X>!QdSp6nLs?*$acE{%mWqdS{2l-0m?u6(tsZ>~C$42rGGA zAaZ?!Xwkq}U*RTuLRh+-2suD8t!xTNp}FK!hUh{izw&3z8Yz2)5xYVVtgZpcRaxxyWC|ds)Z}>7D$Z2( z@Ko1k^RTy`Miyt|C31TnOIpS0V%!R2t(XR`MJ({Vb*RP%Ns&beg-_5d@nOh?Qubf4 z(XcpbhyxRz<))ui!fk>I{X0n*hnLMy18c5&x*AIfTvr03H^K_17jz2U^v4==LF=bG z4OB-SOhVvDism~{&LXw+rwdqQyIDNsHstz7D`*HfVWIXDEf)<`7oIYD?dB^SLkuqg zez)02pvZUM3}quD{I1*O5ey=8bJO!pUHxgiUBt4!LS8#_2=-$NPn{JJ{(HULcAoxQ zx%E;(lqJmK8nu`#{FFoVrn8wG<4m1d2PKlXnK&d0TB|Ez->mO~|K zbUUW!x+24o2i|q*+xH`*G6rqAv)4NrF&0eLKV(+O%n6WPyPdL*1G;D4LHX%*~u~Hh#I#%=Ckila+@>+m;;c4d*Aj$%M)Co-eVGPW+kkEmihc5M5^M{)b?|ddz#Ha!>MRCxyy3!nuzCEp>*tyNz*o9 zflPBC3MvQxB%HTsK9Uh0Cg1V6!i5mcswy!7L@(%E$lg^UB>GN4UyyOp(4j|HUfM59atx$`#6Oqc~W3>v5{k(LnfZ>Z(Q|rym;kolWA>Rt@c{KTZ ze^^eQ(X0XIFOFpw%&BiLq#WXz_l!Cq8}4d`Ja`^`3xjnAa*W2mCu-LEIk30U_3^)# z%o#oUbRVtjwqk~7=54GG+esG{-(~DyI~@Pqfr`wJV@8P2%nH=b8m&rPMJpW2jR$(Q zrIH@pL~YEEjn9NO+1r~oTmx3-TGuIIE=ILtEvdv>2|1UJ!Rtvw#vB&L%{ATE*emzr z>(EG#f^|b@N=78YoR{-~R7rpQ6t1;D^vb~ElYJ`lrV@G6TZX2N7{QJViSB1g?Ml$fy}j)4c|8?*CZmwnRSD!S0AdEK z!k28>nyt`YGB#j~7S@YzQp9cGWK2xV2<~UxLAWRH!D6i1K|0S;7}1+18o} zdy#UY1in6-zA?wUV}0qtb%+|~yM|VXpWZzY?^6AJA0~pRz>)I82V3+*Z9S>?uPZ;D zbAeA15o)NUQO2v&HGR&@Hp_j!+&aP9(Z%lFWgh+sc}&H!T4f9OjCA%3ue;*e78{;? zJ38y@n1X8><8yZB&t`;LrVf(v?l&38#}duJh|i^Md|jOHSvoKv4viYBtF)8xDBF=U z2*>ROJ8kc%DN<6V4@H4PyS@PHtwQPb>ntmRfgn%@-9{&Uew8p#88&-5XD>@hK+w>8 z2lX6?amNcdCK0NZ;tn0F!k(@wXtPYp9d&5)Vv4foPbgzZxYl6yA~OgSu($fhog--* zGTZgG*c3lX{q|9rdFHTX~=4)7yy$V9$90~IWi zbdIOc5`PH43zjd#3Np!`Oi3z!m!@^Fb3LLvsN}Uy*PBp(=hp>x7q9wsGq@}R%XTAT zv0W2b=FNi*e_CbiInnwhU&A?cEj_2yQGWQvQ195toDd)V8`7J$&H!I+*mM#*Zp0p1 zpm}gLQ|2S|w^(9j!i1Sg0)SS0{NR!l`7eeyaOcMP)|mT`STp4J8O6F?IfVuYiiabtCySW8~GUcD8xRdu|o;P@WPZc_u6Rjt7W37PI~V$ zHSp|Tn{s=RlNCWpSQ+Dt;&zTSYb$v7W+La(`rtBHUWt~%k!O|*@6!M!u=R9EQJE^2 z$7P;wizu0*No<>lFVi#kvzQo3KaF`6mxHJ0RG_UimiYiSCnT-Xe>e8WYxV({T?1R| z3xc-udL0wov-wR$DI2klxdW-hifRGDo2^~+sE*Ni`0efIjffQuC{UPv^OQfr&&UxB zaq(z~hS8k2$IFoAoNl_iNMJByVvp<^N9+<96TQlm_HYA9nO>M`Hc}jT-bf4tWblK| zubY^8y>aNus!vIPez)Ljx7%I_(?9*Ro?Jb2g#HBEfC4wvqSwBC1C2I;0u{$02E?^! zBRaKm5XWAwHtR2QjQ4KfX0z!nn_RSK3f2+($%P<*4GXf-*G%;y0vH45 z9m}$2!p9W04~TUdqo$;!pmM*R(E0A56lEd`rH!&K z)r$mCbsS^*!(v15&K^T##Z#eqin~Mh@gLICS+OR<*l6}_?{?JnRfdfHKb(DaT+?sY zzYW8j=Rk6F!vFzkr7gOfQ6eyEw19%dgwc(3jT$-leE`4T+vom0 z&mI25YkQ4-c3tN>ectCfkfliOlLt>ur+4@oD^4oa_h%Yp&OI_tK>r=Gq9R})l8QPW zwNQ%82DR;2j+hD{R1O+ivji}$J|SZpEEFCdCjO4|H#`%23nhSH)miei8`crF&J@T% zQkoQjR^;}56kK-Prt5O@^;tFj0Kru__07+?hGq+OE}9k&Si%)6AB#}efF)S4b5_@? zglf9wT-%!&Zuph&eyg=HTH}_NanGCY;s{PtgfO(jh5zYQ@=7lTIiBSE!l}c75|*SA zGFh~Dc+aAHavBC~K*Y?AL4NmDUr1H>_G_*FyyPr?$bSoCRnYXrr5KdkzB)B5D1Yp- znuAYx2bc{69oKbI8z%<^3m-47jx+OS_EUEB1BvvR8Ig(H#E+c>-80UIj3)4bN?aRl z3#|OU@)}8WIVm}Pb6val@qw@HdY?~-r@DW=aRZ?>%j;?f zd3*Z}@^Y0^KtC1~3;msA##rM`pW{$Mc-IjVlc;PILlT$;}`QN|wZHz9d zyYaWKl2&FG@euzQ~4xUD-mlPeU|XNYr25l8*eRDID;X7waB zd%}FPi?#RE08p;E-Q}!Vz_k-2z`_Q+`)$LY!G$B9CG0(1F%PO#kLmW#)QB*u8GS zqL*QP*0jPYfmLjWINAF?Yk4%Vf$8owoxm^)J8nJI<(wWg_&ZrFCjy@LDiZG&epxuz zf^)krLwFZdSYK@#$|QT@{_)1i{>cwhhPZUtC*6co+<*(-uWYf*TyV4XqYO;1;^eA< z#p>?C_F&ChD1AzHVq{X5DTAmyp-6llZgka!6Z0*mLX3Xp^~TUE96(jhASGK8@A_R| z#41t;R?U6Y@S4(#4h7zp?7*!oS6E{$fRHamSWwjUq}{)G&0GyU(#2|8jhy@lcy&bs zlUn?xVl2y2Klh%P+FphokJ+b7`xH_}mqnUFp0h|>mMJ1T+L<)=N%e-(licRn$he0d z!ibw~aCIEbwL0#V&Q5`V+^*hK-i*R~k))&ulM@1@;dvKK^Xw0xVIWy&3&p$3y^6X0 z{8Oq@eE&AEW|x!!yd;I(d-31f@o((X6GAiJy2(V zI6A^zE>K)4{4!b2zlg|9o(m^irC}h_2#C3&ttrlHs(LA-KLBq}I3ZSHEk&YxEe!_1 z`nVsu57<1kZKoeajj=4wd`~oYn;70_T_$+c=QL@flUI%Ii^E-ISWx>Wfm~t`JntRL zb3uH~EEK0h=XrR?J>Bn=D-9(rzdx|)*)-K0v2L5(##x)P^&$RyE8b)LXY8CA{ENo< z3B_MUHRIxj+RIEzR*O57XQTH9>PB$lVw>sYzHDq42wl?1P2q8-W&R`-Jbg)8*Dt-; zy0@-XD7Z8k=)`*WWZ=zOBy7Sc(9*q1X8+O*jspjn;m~=3nh7(kD(d2%QYvB<)+*Y{ zNaRn&4sOKuUz(^>KlzlU=~Yi1@~tes);6KKJ#pggF9BS_YD{)yhx5L}cd&kn-nUHo z>Yb3S;*Yy6R9le%?>JCttxMHC%Z^g{AR0<)^pGz<3e$3hAHL+~_Bp+zqtB@pbQ~Ge z$@luhLt?|kcA!yG{U42zI-nmydR(c za|Mx&^il_YTc@!~*>n&41_96m19yM5+>Z&?Bm~ayitLK3oT2t7@8QF@4ldTZOABm# za2IHae~L&GS%xpBB-yW3DW}#2`?Mm+%&^bbzs4tbMF|_xSf$CkH z2)~BYFp7?J@BJA}Lek&R-z4AifW%00|aCccvUe}VNVc0>%<#;un#n|VG86gkqX zx$QqykLY~=O|zGfomJ?YS2x#P64JaK=q%JnWHUyBcNpEP-p-R01s0~l_g}ho_=tGz zlg766Zn07keFZ*BMoH0jx}^J=DUaMikEC|cyKzs5c&}A&$BTDFkR3-nPwmKgb0gzr zUY0mHlx$su^_y4qSjS%1o?`^4e|e$_Ouyhj?_oO3frncwutE~OQ>2|BF16N@nP(kE zzKwyuQAMn9_uB0kcK4&}v2ek-?JS6?kO*DGbm<8C%4p^~)BZ{_TqCRO9m(o`wyuX0 z$Fb}BG|bD=z6wWw-MG8Y@`VEgLCP}DYgw4FD*&;$X?n$;3J+SmBm}T%+?BFi*%1M@ z4>Zhq6(hWyalD*mL2^Kp^u^4z1o>vNC6;1|92ikJE}@4_PL2~3=?uNYe2sdo3>-RA z3f3xQi;+8mb?eqk*<8||w27NHJ_y=vsM+%xnGm5Dh#2`&tVB~`b=$i>l31l&zUPsC zf%$Y|P{fDtMnX@*h3d7#eRK=Er1>VFt$$-;TH9ri1t#U?Hvr8WDY|*~dq&Ced;;kxsFLYV8v90CG-plp#xV$VIE>_x=n>Ix4?8{IMuyhSRjpZb>f(-0lpX=l5ij_p z^h>()66BeS_AB>)I%Hlqi7og!)BA47JgJ1LQt4Ucw?>CFsiT^TE+43(Zj}D zBY=e?^3Ip*Zvpaq!iw)~c1&y`RvW$B zsI|?3Rt^3sFct`ufIjAl@EpLWqYp(ZD*8SdQ$C6G_*tv8n&^MIaL1MS&S;H#sL!5N z?TumZFZ@P?VvnOA)y`m6j$(JwlR{unpPr#zj%-np#)%fR!~~0KjA@cztp!DI^3XFm z#+nn2?-NM3n`dExMWSn{p7`ob&eF$HS0@Pb{zQL~PR!5%6B|tXA>$q47e@e;-tL~t zj_TX@^St(4eaQ>fnn3!PLwPd8pP#rV6X2=pfE6PxWIe?d}(0LUMemmzIjN1+ippv&4uO- zUHO^g7R3CD#!S3?wI@{pO>hUX)m9@ob{fCCPX{w7uf4n#Tq}wy27|6nfmZd=~S+8 zjkq!`P-vs<(!S?!Ue6x-0oV?>9smotKZ&buGlIf#XcJO!6yv}q-F$P@E8vbBW}JBq zKj|mn{2!h%;$O6*k=9R{?S8~+Zd%%!O%aEq4#1k(A&4ak4hX`Lp5aX z@0afd7-EE%?lwDY>(8K~;yDb8T4S1gq&e0RMI*)&3c~V4a?@R3n1I1pEa$Dh0qbrw z<|g31k0_2*$Ux4R?X#r2{7{k{E=4%Cw7qm^O9%3C9ZC=G_VWD($NPtuht-{x3oqTG zIQCf?BZXW;)}CyT-nl9kj-(CkPccR1wEY@^h z(h5pt4qljw8W_$qox+2}>c0v7351+Gkb#oQjVy|AOK*|wrxOX`;@~^8~h<9g3!!&osCcgJyJ`{QF zQ5{IYiI%e8K)ncFZY<_d_3qlsJ?td#7iT;enEW~=F%c=h?*(T>Ob`=C1JnXugm`^sXwbke(0@s(01PZTBp=0FL`osf@N-gopp+$j}4XSGE zk?@xqi(Y*DK4ITHAzXWM~;rb8y&<*A+F(n8}YwS_I+I%2Bok-2Ji2j7?p#Ar_EH8hce*a_x#UJSEx9S$D@v3p&ytJXTJUyXvby0_P# z6y=T|f=jFRf!!zhc`u?srTEWtskmtGf{+Q=_ z9L$wNBSgwHbCc?ygcDz`RzDv>K6XoQPgxprXZ~O@3&mv(vz^DBaB7!ATce!?*`AxS zRaiWUZ4yM2d)`X^KGSjZ5c4_3o~A1Db2q(eLYsJb%DrS>L@?C|ZTZjfa^ag%(z+f7 z?25d(S@Si11r9Co8-cg0H3eLub0FPoXv@XMLgs}k3sIRS@y9F+A?qNlVukcn+2_6L z19$(lLxTCXQNDXyho~%`UshINB_iZZr@=E!L98bPw z%%XB8A*3u1J&h0bsH)iorMMw9jNi0~mrp8%LlY zJl4OMTn#(D zN>f_YH`TZdNIgBj@nGeJ&-&_=9$`~xNdOh5n1lhzMG%>yj-^4~rLX+{Ko!G4nakMsCQhGS=j9p?yL+kUn35*UkLojN?7QD2qLZUTS1lc&#BwVQl>F`E{s;abmf)@%*v z%{j|aG|SqqXAUGqByVeYRcPq8we)%xYZ6E&e@$N_S0X_Z%ERoZ-eXl7d_k>X`w6pp zkWW3Cv!hGwt~>oQo6ErpatXk%vY1GJQ66J`6urw(5|OY&_6f%?8G9#j-5eO?QWRS)ykgmO&*_Sflh&&klklH$BoCrPrq0$fsW@Si_~U> z-sYJ}m4`Ha|MYrhk={QcxKOl+IlsbcXQfxYs;&mRXi7qtvkOBVL`5}nNW7&iy5d0F z=1t;a-FU@>nC=tdt~cjJr{NA6`zyQoUJ8#DyqyxbpS;MxYf~8>(6pRhK?)a_+OA*m z=eQN6TOvuP4`tEOC#qJGem$f3gsC^$vdydINMGWDZvcK7cq70<=juJH(XE-gpG??m za+J5a9%v?gyu!0sW?wBu)p1i3$Ovv9J zAe{)wqc3J7?!I2sGC!8@_DhV^9q_ALXP{Mlrgcv#uIASQ}xW#e#A4dtfj zeVs%4tDCsLgEuD=00U$s#_@Xqp_<(%L~jY`)hD><$=zF-H*afsOEE3%q1Hxtso8;D zLL{2fdBxtb9Hh-B3?Rau914En+Ru$phF}VelAq&0Zv9Eb5hQ#};mpO!;xjH#SjGBf zpHRP0#~X2teT6@#J@K$~$GrDIkGf#vka@X1r}{+c=M|8ge|;>`+2p&1e6fcCwD=qz zW4c$OZv)=8N%bT0&db5h6-Gxgte>9ms*C1b7F}5!|75(={5jNRqXfq7hQ^2|3=|{7 zIVu*Dk|)!(1=JwQK6XDSNb7Pt`#(#~E+d|wNaXmmOMWVr?>=4{sP;a*F_JV?y%ECZ z++yyZmrig9tl@{dWCa;@09J&*^-v4a0}YHp$5+L_RnU|ysh+G|gcRPtki;dm(=iX7 zly1|ZFN7xPr$gsGyCS|mQ11jLDD(UnsxJH-GJsN6B9FK*g>MRVck~Te!7N&8ZbjN$ z6mx2F`x=#T?d9jPLyCN4$#WN{=RE5)%LOrdo!aHfPD$!7Z7ArT20m(buMpvpSEbZ$ zY%x+V)`u<@P02+%JzBt#VA=f)T)I#wJ%rvz*_Kiocyq4M^8H-cJ$l$||Ggw}iz?6C zA6ImGYpJw;%TVQOJI#QLfP_!GstZ@D z56yS0@36Ocr8L)xKB_sS*fy1r^qmvZ$fz=K%rx&zj8jj)D~wFdyro{RlCjtoW#d_D zNu{=UeA3w;wytUA?J&_N(SyD=z0aIiTO!-rZsnP;H#Y%Owram^FvPilqd|(4HX5rb z2o_7nNk4eU_l$Yk`^I1q6NB!K%85aZzyCKCG(VwQeSw@iY#<^c$pxCoRs86aIaIjD zJ56xVpoX3q2k6_hnhnS0((h}EH>#_13pxDu{%P@;S;3REFV++q$o#p_@Kla3NluT9 z?l#?MP9>K~7sAhSdjx^3@^xGayjn_Fo?0Ynnln5Bcd2(va8(so=ZX+9)dLO|(uQ;;|xm`?AOJgP^^aN=&`p&_G|tgg8m+4!u* z6%ozXERQ#{;%E1cDED1jPWXk%rX-xKZ{D;1=?eckTWabm6V5lG-#7oWEH!k#QUk>O zzI)$;im7K*DUXXHzviUDM1J5$Cz3T{kW_XcpN!*Wj_y{WPDy$`S^6Y;54ZIiu8Jv_79ajap)ub58_)+HxO8P5{C+`c z5$^fog>3EE-3e=Mnp5M!{2cLA^CfxDu5+LcYto(wic(VpUOeX@uAk_Zl-IG}%+oSk zDi?yfy-#ZPHno;TYgb!?TOFYgDC)A)LR>u zEAlu~ka9**!#CnYJL`=VXy7uMgrwsKB5p21p|-Tm)k0PENeS}@$hHM{nMLcHqUM9t zJO%Rp6W)cAW~qq2N@EiB!;#hDk_vJ9YJ3)-@-^2-z6ne2Mq^ zT}{LK`R_{e`>eZ=1lq)0PYo(K2FkW5(KnoltxN2yyM$j7Fzvyz-FC?r>RD0 z-M(lh5R>1;64)->r+2eR!irAUuPB#(iPh$EvB!ML(+Hc~M$O|G$2v8rQwEF4Zs0@q z0}XEmc&b>YJI`&Y!1)w9>XGpzc}wuH>4@8Y{K*P!r@)X6!yPkkT(p=H65B~J+L16+ z9gNN!*XZC5w=6N>Ju2JR+5LHcmsNK>+v9Z>Jjt1Mgee`5yPoPA@7ye{$SA=qziBsIuRMpnhTe=EMGt2 zp0mVa2AJZ$9H zJ|M4-JJ+Bl$)}flQ|%}mi+;)i9T(`xyA#CEy7XRncfI!gd{KZNXE~^5Y{G3Wf1zn@ zV5ma3ALXC+}%oT_KRa7%!SuV@2%O(o17sc>tjOder{G< z0Z%EY=41sEkb6e?s~E__F2hDQi;fuM=U3bTlv=k1rTBeAcb#)>Ds;cy-Ze}tFGurI z2w)C^Qp3$7+f|QaA~g@!b^EGEj^jpj!ca!Q)f7OGmAC_E!FC zY=t`mY-*pfd}y3+_Cw#oP)%qP=!j)|mli>vuyo_oh-c(p1l8W|Sky^P0Oi^Au>+X~ z*A2-$F+xzTruGLa1y>Es2+X>A21{&JN8h2Ebv3wLZg!J=OC4fV6MtNxZiA-Mwps|F z^1LGyKy^1zINK!RTd|!==otU#{x!t)jMtl`Aroz}SW?H7Vd~#P{O$TaJ33Z3m$bN9 zIH|v#`F8CX60uxGLTb}jYdg<(1+e}V?8)|!#@f!F0PdWn0}P$>VuvvDY9xDKhh{Qz-tt?&M|S7);~MtI*DUOu z!LT|{2VW5gR5{W${xTj1(>hU_IUXa~eM8YtGzp#Crh;n1RqNHO92}anNWx~2jld@j zg|~B}N`>0yl?Ecmlj_AzyymNtox;2@Z&*ECYc}h7pLIt`P5HIT&lAKTC}Da2V#L+X zg2g%o*M*ep6zYY2DpG-o4V#`C`9?3Zu-aygb5UlbxnDA`Zr=Ie$~&Q3^e!d-D>#`>)?u1I&o zdz}clahqC!HF>he=KZb)QMa;}=El5GN5eLhwzJ_+5{rATiJ3C3Kh*%p7vTA%vS<4e{0sVzFZp4HK|xf&ay z2cSEPhRgh{b?X-FNt8>y&zy@TY^+$F8+VAGP`zHNskm*^3k#~!dD$YTE&;e7i=|~L zP96<_39J{1lZ|zY&J~(2xy4dplDD)@bfR6}{U*qFjCu_d9V{w&|MY5pqE`*YC)*#^ zAZrsl-;Nb887{wlls+<8RPZlK9YeMuV&?L8b~QAFjsh;qEi>Tln;Md z{Ij`)1qN9I;ev zIq*Fsd1erhKvZoYRVQw*j;0!T&dc1;42+M9ZxXoAuDCer&e`_vLd^Nfe?VJtn` zF@y}4)^?|kVtqWP=U;S1rfsGN*OQ$sAIK(Z`92Gx!RI*O*~bH}i;i3C{DNw{Irfd( zXOqDB2%~s_tftyoDDnZf)g^nA(BLJtilK`5*ygQ9*CeT))3&8nGU7U+-hreN_tw?_KpSJs<0fc%pvK=xh2ajow6K z9R1@f7z&=g{rEn|?^{+pX6zwFQWOR9&LY?f0hOZ6N5^zpmZ*1pz45Ww&+dc8+H6+4 z=)*5o9q|O=#A@xY3!8LL^RSrJ!J*vY%Q1PjUZpyo#nmxciSG%W*B+T!b(u=E6L)-^ z+^1MDNzmy(dKzlA+y^gTHFQZ@xjyStrDpo*`&ykNq{%y7aFM6l_SqE>5Ay)%p**3% zQk3LJsM+eRKw(kQwRyAG{I#{p<)V?sUDgIg?+7WORpRaY8sW+M)W@<&dcg#>-JcJU zRU#*{yoc#36dqm*ZoK(R->)LkFQqhIPVfP2J2v6JfaZ99JBr%365vcBQfnluQQ=R@ zJMUi&*y0ZB6||fTK~Uu*dPq0G1W(w9x7Wqz6p*dU3tT$1a(mhwD!k4y4O#!$UCJb3 zP}8})s=HjaGOmNf)JfR%^V9oQ>8AepTov#2qH-7MTFZy*OiXo`AKRS;)hN)}z0Q7F zQCN7-pawgIG+AeE%d>)H)v^FN?HQAYKzsMV891t678UKgzTIrPzP@1&LJ(k$;|L7L ztGTUXpkA#SEJA{cf%7qo@pQ84vF|DLcBEUN-Y$9B!GdNMA{7{ul4xP4Pn)5rJvYIFt%q zwjF@73%5}L`F5XU-gwbsbAzBnN-j9%s)hQ@?T+%57?>p}WNyoSqN}p5D7O2@dvmL` z`j2@FKfk5~AI0}#(}H+-^yw|ViZnW6kQRl7j&=oYp-<`ALh5Q=d5bIc)pv_Do_AaM zXegAdd3fYyJ7v+^`9QP@F5uD@;?z+;9h%kEW$yTeF^@`M6|Z4eLM__vOfCKCLzlkNW(${LkrnrbG3m zjPOC@1zz}IDP)~1YtqT&+Rpy98WzbF{nx}H+Nma;VdY`inv(mv@>S>%!S z^;0_y)Hf(lf?uV9oA}=VnPX<@_Tgu$ILQ%g1R|Uv2GxX`TOz?=jherP?gZ ztd0##U9ZsQc@CRnZSwI#tm4RI`N-e9W|YAJL4Pb}l|RH?{mfB-$ZnZpt7n!eUi@_r z8w(rCyX~;r9k>wLV=FL|T6}85e7We`?!xPW+wamvozL$l{I%EvDZ|vKq1feP$I7N` zXDR2!Ta%ixoI1sjisuk6oei=M^3w?vX1{Is9~=Ms)sLsCJ82g2pL6eW_ODD^3VWV7 z&no$Hv7?3k&juh+Q~O4uy>fN=zW25!g=6>nCKoCQq)EFa*GLDG2wICBHn#pgnKtzV z=YUOU&|qXylpl6>Im;_C6JJPk;MC_EtYYUsb2;X!t%r)VyiRjn>pX0;!qz0X<=RhtmX5S!VI zMA$DMM^qp;51DFF-&v7GcFJveTjdU`_h)aNLCAoGDC1x6xrl-7&|nt!8J3#87$nPW z3kVtbRyfBzx=6Rn;aj}V#Eoo%cK#yF>G?BC;9RA+FQ-<+(j@!noc^z67>7Tl4TM8% z9+@_UZq0XVnw#egY>@6b#>K_yRN7Cy+Vv;-H#>=1!J-$WD}x-b>WufP1|psZOP$#! z3R6$*Skqq%Xkh6XM-)kL+$X}JAy*GXsOcWbuJIr2%D64$UXdyx|9zc?QG|Q+54LM+ zm5wmwNl)qyX>OcRJ`oGl{K~<$br%};_8{ruRLkWX5HUg5mDd9m6aB!{g|MQ!gC*~g z8+3o);Q#wm{}x{{##vl+8FVpE-D5iL5^wpMimq;3<4x1qd-Hoj6v?9M6Nw;b)B92t z?@FTcFZr5~4IXr9jO`yqZd;B}PCN}`Dtjz4&ok!ORY>c$U1>ti6;h=A`L7=Mu6~vCM|lm>>+ed03$mrosf@+w9<22F4<78O2=d&~yBDS70WL`&~N6 z{}kE(eGk7DW{+i8R-Yzyyi0XZTrZSg?{l;p`$ju3lUBS6j zopJC5tUTsPDJ9NizG>}8J7tSpr^LO0wT873aAih&U`alg4_F-d(&l!rqE&CUyo_iY zlR{!H;e$%X#Y36PzYFd^X!^grvL}F-&ePj?FS~ghhtHSoBvE=*u8Y^!?|ONCK6&4e zt{tZ>@KOsFas8OZYppkBV5rIf5ioNsBNZt`EBCvUOLO}|{QXM`7&-(>)}oI`H43~; zgirs$x9+Q>YndHrC8sXTnY^on3BeX>Yz;Q%uMA?|lo1 z4Bi(_IIItt^b&~w4NsrT`Y&>wYm2jQ5M_!9HP(R#!d=}TQHc&yOWVQDhL%MoV{Kd_ z2-hjIc~%4W>V7;RUxhOAP~evQk4KvQ({G76;(ejT2{Wq&NAt2G9;94WHwQ%)Z>VD&`|BxlWF_PH~a{Sob z2%x-OZUcwke@|4jeera=7knW&)5I+CHf`ia+n+HFd?cv$>)qaF`sX|Tchvg-Mfg&d zSeb*rmj9cQBJ&>1%1r9$8zR6d1uV&3TzC+6VWWhO2mqrgSl&U00(b6pi3=#fT#C*)adz_O)LhXn_pw+xm>>^(g#MI%d3VTc z_PV>tjP5^a!yN8 z5SD?@)~e$BwmlT{xMc9!pKkWseKL7ecjRQcE?vJD2s`xc!S%%rlW~Ua)7b_9!+@JY z6xb_J>AId9qvkff<;1KU4}JesnTR#uL5L6T-m0whIXM;)ys1}-u!(eEt@j$!>VE+{ zXYa`vu}u5)5!duWzXjM)Pnx)Yyu!0rz&5=*uMYpi&HpDg^>5xX2I8jUZv^V}TMhPT zt0SsF_g4ebBhBY8#|fj_-hjr14)Wa_=sgl@?;yJLSSu)J?DIIhb4}nQ_6z)5=FD!JqF` z0vCSi;0W)5j?FVDjC#>Q+$Q=>w&Ij)q^AG1u@>iZmHG__9&l|{pQIdK>XBZqkV$5o z+g5mZyU-3sUZm*TMv7XBH|dR7`wtb)|EHpQ>ajrSxQGCpF~8t0XlOs)?Z9hE7hAvw zFJM!q)|mXx{&Q7>dO*g)xM2NF`w5o{9+z5+M1_(`83i>^nV#sre|o#cpDdsul^jL8 z=A_%z;dQvXPWq6L!ia~EpJA)IzzZAHI%695q#}dnY^=T54?;*@>jLk0>IYw_AM`A| zv<3!XKCuO1hxwvzf24Zv-GzAar}BK2Y4YyZ`SRfxm8dkDS20VWZ&}$Tp-bQ=?lduU zmIcdqtuG@u&p0pjD(b3|Go5{Ik73zIie`14GT3szS?2Zh!6n% zAe1QDzAcp(Tq?PodiDs9?}g#wB>c~4XlNdOOi4th2$6okJr`!_+ZR=L29K7PmVPj& zy!^qe2M#30MqUXfTKtIbCKw-;iDdjp)eHW?rS_*3S-}DUtgWU`M4`viNU+>i6^74F zLdSRCgqIn8=hsm`qvR|u2F746lN*%c;fe)0+D&p6@&mcK&7 zb9)4lKs+?mmg3r&U+7$&J(5x$j5wP4D@s4Q!g*10i$iUp2NcMq!Yk=HE9tp@Q0CRJ zTtn>BDt#Uc|H(N-;b4KLfe8JWf_tu*NU;pPzAMu~g^V+{?;#+Ey=49;i9*${;v zi!zduk}@>3MN($qbH?+nbm*Q`=#>LMKIsi3X8LQDudATW*>QeD3y%w6T8z^C}-m3KRI`*onJJ%D>w`PB; z@}*TSa!g6o`-KKIK%ol-l?w&KkcG71OX_~IDk9Z^=N7!3Aa>wqq{u;T#mN*_m@Sf~ zGXxOA04i12_#THp<+pSy)Kxv6LPVvz5Jbo+ARel*)kP5Id!p+8cK@`Q`cHJS*a6<&6;PR`8jmAj5771* zTQKeM8+v6oL^r?Q?louTR5?H8OInj-ZWF78@C72y;e4*3YMW|1(ueUUf^0ljLDwgf zzR&$BA1)~RN>8;w@*fD~KNMiQUyV!Exrfhzp1*IXd$yy+2ZlhSLK`%enzdn&ISS0m zN<#CaV;)Yw?Ze8EeaK^c^hX=NfVFss%nrh(hmZjXNEf>eytk3hFf53#^*D4c$h%l6j42K1REAQSjaf+^d&yeUq!89t;4qz?2r;{_Fz&L9SWN8_oW9$ zxrg5|=$#-kkle0C>)sz8zz+$=XjHma61XW8P=4mK63ZuZZVCzt)hm};&n@{>L6l>pZ}YgqDNm#mfA?rMPVz#mT@#{IiQ)BhEeGxl&`y=@9bsOj_2!=fwv zLi)YBqSCj#mmTsq)7=wMM)h(R`Oarti-|P^P<2L9=#}|}peN=wl#tX(kwe;^BaHB` z*1r_ye|-vuD8gq14`=~rI<)^YIyJraUAjg04a?J?FfC~7T>HqT!nnyYX9@lLU?QaXhgPeoyrQSL++G;9h;pXdfq z#X0?pMr z@~gqcb&yeqw!79VzoN?vSdCbAwL2P0fKYs0C|^o1*Q;C#6$klXcCZ`HRrmkNb^rGV z4U?3wAHl%`4jS4#k^Ie}0P565(rM&|N!hU-<~YaaAg8ewo0|Sy*~$Ru@(D~)MRhtL zwt&)n`o>nBvXgUVN@B}rU@0_!>ODBJm*P*& zT==ugi5-udL(y#jx0?f+vIWo%X8h){CHeVm_7gx_PIWl;FFPrVWe4AoO!Y95l$5kX zK4bd=RyT6KM6-JG$k^o)P3KI%qM>$EXdchq1-3u4RTr=jga8`BxoBNOAFKPivU^%H1z>#Y!B_XV{3p+zhTZMxhH&< zkP~BU!98Wm)X8*p8^rzyv=tn*OvEL?#-(#o0mkFV-n)}__@`3)?CR^ga4;^J{D|$8 z#IlIzR|LTwotqM+MZ#aHp-bu7bD8fILU@R7oL9>(Tui|^-i)c=)&M!@*DYw+APAUs zB8Qqox)?JSnSdggD`n@OxDlt+iz>kK4x%dLOh;x5CxTno(LT!}Y;f?gooxbNL3^li zYnY6N$icZ|350@!CB{-pvn^p^VdL!~bFh7`n-Udd89T9<3Ve=JbwUoh?%W%6@lVf) z?0yu`@>05#J_HqpgN1F?P0BRQc+w=;D#2@_`#;|g+5Dn-k0RDch21(abNr|Dee>c1 zux-L*dg*XF_jkZ42EG{d1X7aX%9QY@84kl#AnVJabMaYzeg6UaQ@YE@@yLBU(tE>p z3A5i%#4)$wkCjUOS8tu_q|A(0z+%<4%1&UxSI3@)q1y^aTDca`zS8SrKa`WX{#31T zzQ(yFaXB%v4bZEXXjdtyRw-!YTO>*gY7eGaauOfD{z5}=E|cHbQS+iF{7TvgkPBiI zrm0c(G!zXanZQ67nB%&Y#~=HdO*l<~RAV;?DL`ctc4M&1l&cpd<}ql-41D%@hNe*b zk=ehphFTZRA&C3dfmHI;2x!wnK?6A2DTt=%a z=@ww&N8+6S3QYf7&Fbq*ChZJC5ZsL~(XLqal{ob3w;|Uk3#Jkj6x^xm_OfM!3^JV` zg9QsJM-(FiRPt&mDCHRu0aS&6cMjwNA&6A%j`$Ica*0D5!2O-=GwS(6&9QhZ>NP68 zw%Vw2L_-X5-?-j}ltTxQz3h%Klf<)Ueq#hYZw*5P$o*8O_)08uv3;jrte{DtFu4Pd zCGw0H`GYe!Grdt4e5HXFE}05bxt^Yb5>eYR1{V0KHev@<85Q7m`5bTIlcfSz$({v+ z_T+mr3@6mNWnfayVK$Coz#y>#L1>)fA8s8OYECQX{24H88k~SR@EG;>5dyrqFJNzS zkjcAq?&9Rc0u*X~dwT6~I)zag>q8G9D0$%2&|!M*lG%~<*&yiuKkfb>u*5VO>M9MO zv#Ft287}n{N<8`%P|jiT(0-rQy2xpf3q9_%nlC1%H*1 z|J$vLvEmT{%m+#Xn3<+0<%#COgG~Pu(xi-Dv}Bi(56tJ zr=J_|Pd%8UE7CzIqs;bDjaLA4Q}i%VR>nY=lJ!ah^~XYsUwi2p()$ zFm>U{DOFW%1$tim=@!$;Peq!&3=Fdfq)4hSyl|?|+VD6eD@3(V?*jz*w;m^PN`n0H z_pe{^aIO~mbOGeJhXDB^w%hi7fV|u4-9Jw$%ivzR1;~vTLfakC&+ind&+|4>d_cJ! zAUfbY0)ood8{qq=8gudi*>gZ+G3c=C*l1BubYkAJKG5lion84zEv^pYdC}@H(^^9J zEAmWD!GYP1(E?(MAyjtR56S5UByeVS}i)c?viq_^g1s+e$zgg$c$W&w2K> zc*6}4&qYbLuYhY-w|!#$)1S^`oCHiz07)UkG7M9pYlsk9 zqXh9#P<3Je)_g&UkUC`|-^P2BL>%!AX?YC`QV;|LcbI>2HtDNjpQ+q`s|fybbcq}< za=g7b{}3IOK2>sKR}c;!E`@T&lNoz^A2UwS5s{vo!Jk*a78Y;wD#3uG`$8N5WtRFZ z;Q#4fW!R&_rcU!HKp|DwYvKCobAa-zJt2qA3rPTfGRjxqDVk54F=8Wba--q|W~=J% zK&HreUW)y{gSNl6^v~ufY8-1Lh-!8DP}v<`0Pg;2m*k(mN9)_3gTe6 zORD>qd;H((0meMs18z7tkgn6NRDZdm%H}vO<1f+h+@zr@thULB=Ofkaz*85(Q#>5-;`e=k^D}&5e*K&; z?$nA^qSEo%%*@Q%k6_2RO|Qj+aGt&a@@YNbF&IE$a**7Ch1h=%4f&Ow{YweImN!fV zR81;k+aH)Je;8GME-lgluLe-*Lof<8KmolLev>NH&2ptw2-Wea?Ed$_`uNr!8itpr2rKq@Sz*^~(ic2FBQcIoc)4Q)9 z#PMAD3o3T@^vr0n&jD2OuMujRJeU&Ogo*xB@2MZ2UU9ZCpm&@F9{ct!BBvej@%kp# z&-%sxX{-PHTVHPqNCt*jc(cA&nLqzT1un5JkTeA+-G)y%G^IK|uY&ufGW zdg#GBOGJJb(l0Dx5H1BVjdM0Pj3OWdUC$JZe(@hiSDaB;HKL=1Bag`dYFF!zCm*}oBloPbQAL_C- zQ~}m%{nUq(Iq;h(Waa{^{W<1fcQPX^eAvXWeW-boNxJ*;x~dc@9sg5<8z=lpZs<6H zxm?ATzDwu%ip-n~QxY+lV*r6>wKdo2F%$l%Z)hlvhx;}+w`zt|WPboYxpOOx`5pQC z1-##R;Qth}(+?O{50xscV{^g<=`LS0{(&!1y)`N!;5_&Odzh3j;vWiDOaLE9H`mqL zu(A~$b$VcCJI6LZ`@q8tzee2@Slm;N-{1M>+a7jw{$pe^zy&1Y3yV1^{n_#fx2lNu zX2_Wp`f#cAI43cw*uPQYUoH+0KCw|}3$$6rkH5Uh!buP*s_Q0SCnaS<|MnUtjr_OA z5V-A@%S^TR%qhR6>l)U$x1b!nk0 z?khLf&$&5$f7oP@`4?{KR9p>Fr)wSb8W|eOl1kYZ^{8_XMX!tY6erOLIKS>87KR_Xy4_4 zOb+iglTKECgWI2jh{2+RKzA?z6?O#Jylgcx!L~ZDd%Ws!t>(R15M3)7EXnQAauH)t27qyC4q z{>xWU(!M(%X}LXJb}1E-io>nUSsuL|d2Tq8bSUU@3a58Hv?H&iu#=Azo#VljLEeZA z4glj?=2$U1%@qd)dmPM3IWG2Bq^Y?{8*$%bw=m#VA&a>t z+Ep#RYimCYDDYZ{L1$SG=G=zw?8e1|XuTy}{<`0W&E>Q=YlMGC6ts(iV48qNw z3eN6}{>v-532+g5z3;KTn1>~1>tNN1qdnBi2i+CWT!%)MI#2y{dZthyIy)4d&=Ae8 z>%2c3vkX*DkwBU)JwBe+3tgImOL!6IKp7BMV!@$i-*4mf-iZ~~XW+d5v6ff>{2++VHV$!pj{BFNQ+XPMOu z!g`aCzZrCUa@5sSrw63~LTo&HC30xJ!gj=G#4cgy`^oCAi;D{`me-ufX&rr(?__gp zOVykCc(bm2TSDMep()KRyZQAF>ll0<5E)kYPDyy72pt8FBjX5Q(@<3UNKC84# z;5n6^y>CcJ2#=#lBE!mU+qbw+@gMIF6;_Nx*^1#;KVAHPOuch-ob4Ai+y;$p+iYx4 zY}-~FJ85jIv2EKn8r!y=Z`$Yge((G5tTk)ay05v=9824X1kt8Mys zORqZJV;)HixsOuWPi21Ct53EQzu-?XZjiLmdC(@E{LuGm4Yq$ioBwm<|F^+V5l(NE zwq`M?-HJU^XDAi=k-X+iaVJ}iw!q9|FU>j5pB1aV-N(P=Y+CXsMB7qyIKm3Jgp>w-y7bBpPDNX-m14>;5o5bFIpEBUB&GkjG?un zJMZGdtVMA4N(elv8t3AzTni@U`+>e-yh@0!PU&aP^kH-e-m?D(-fvM0xYm4<4_>%@ z((QX17`*`ZM(qAjt5OV=OqKG z?~^^V61OhL2WdZ4y}Z0GV=kI^;dR`P3;az&sJP*QJWAWC;R(k!07vV;xAXgifGReJ zZ>6b9hDPqnLneJXmmbdIq~b;QeFz=NmO{3$9RJ%d+m|lhaGwKOn^c|RJl;yYTf<{S z-M7AY?8jA|?a&|-i*cl(qjo#+RL*S?JYHH;1yzwRzP_kSe@X|%lB|{)*o)mf(%dHp zVrm@{KKB(9*BP}6c5A(k4AM?aWv6*gcc$$!#oey<;vv;ifVmWdXi_f`3^WvS;PFzd zuWcsOTtqa3*G|PYQhBNs?m}gm7BiKNYz;0FZntcf>ne8b@&6|%fcR#+5_)4kXW`JY z!BZoHjisq{V#N(>c@#_Se=fMr+Pr3L*P%(#dA??8r_;3gl~w&Dds+JFmd)Q4oXKcZ z?AY{rhrn#2!KAxP#yyLo=lf2!HJ(&9soO4Y;b+d7Zr3BP?h9|ak15fHv&M~LspY(z z1Rw8|N-7!^g9L{rFRP5Cb*-}2LoN8pk{X%++>7e@uF)&6c)IPU zf!y~;Wi)wMEmdQK$lCQ>KaZbMTA$CfJkJp#3o3tI4%PcpzCG)fJgR>J?fj-*UNO=@ zyX(b8(c%AIyRAB4GsqGYW?7tX(Bt>HX>zw4BX~9Qx3k?Jw<|g-{h^&55s_opn1EY0 z1YDrI^SR%dzwc4-&tP<31@2)=hu!a-16?Kn44wR@4R@Mp2ZvYwk6nJ^D8ti*iq?;p z(+00s=M0aFmeR_~h3#Mhe7g>1^{sg|y?OSoXBn@z>mlEZ)bSbM2N}>h7~2C0OER5K zaaXyKO#iAk|E4J!+Y3B+y;n^`_qS*)07718`%leIcmmukDv~MCq`&4CuDRA+A!ZDgQo3IC+NqSP)K{|- z!l*i;mBob9yHgw+t*|`k{>=GOOudqBw`^dV*O1|(Ci1xqjLJ>MzGXwN4AEeUTBqWD z6Pl<~t=QivHBK{wEn}oZx%TaW1rG{~QMn0^I-ZHmYS}v3qqfMXMN1V0)&17@?1DNN z*3a#NR438=jK#`AZb_E9!B%${$nprDi5Eb}0fwk01JZ4oLZT5c5-;^I6XDXTV=~Xr z>Qu!+SWx+P*o$)GoM&piQgwbJv&797Wnls8bC9s4OegZMOL{h4F)9qbQhB0@C!o4< zvE*&`BEG)&eGipxcGRR`G@Q5@XQJLv1MHhfH)2sFec{rr3NwO5{A^i=#tXH7_S}`Q|1Z zU0hW5 z)7=x^p91RQP;Yvx?H0!1%vySr;E$m|Q@m3CGG@rTacWTHTGD=$lVXl>&D_4!{)&)# zy9#~&Y%Ev59^&!r>K|SRN`in@LZ+ux>Zf2fxK4mAuHp-Z`=^o8^Hq1GAbO$3TjEDk zxymm3tKiLX>9TS~E+YZp?E~1?9{Jw?nJ8jd#G_cx+|9$t=}tIN*v12^mk;0nGBDQ* zg(o}j(eIjCy020@><7E(vfTHiIu0XU@L@phc5k?BBd^B;81*}yUT6Db4oNhRVl@9p zvn=O6DnTNIk5T}}>xEG-kdjr}Pmyz-X)KE4#r=KuE|n-D$B(D>t5INwX9PzL>|2Mx zN+5>AeYXvUMeb_U`m36ayR*OT>TIFQ!y_#tts27HDj-$-m)$f!8m9gUv?I&ppMaaz z4FOeeK!>V#mB8`?wTaHT<%dLzr1#1i_w<_8qQx#8erX=~jN|`;tcJSAL26WWt(DFP zP?Ya$^JCQ7HwyNZC@i+Ec=0%GqE0>?Y_CQlOg;HCOX3Pt+h@ik!hs?0lT?{`ZMMHF zdX?&Sq08^%SXC^}##aR7tN(^_a!nxNZT=~CGfOU;+;PN7%YR5lFMEq4vurGt4Qk_R zCPCcgBG|B5*cp?m?-$;W37Dt?CPf(x#$8C}#FsVLEIay)3-cznrK&iYhFbP%JaQfr zYMD4ynfD|czP(;4Cdx8YoO{`RqbAZlbhRB-Hlp!CY@GT-zI4bP2Qq4)i_UhxLZe57Z-Jn2HtYz7$7EKD65xl-KantPQ!6tREx@*3gk-{?rh0$rIvH1zTWEeWV$q&`1@gup z7pv|K1{JChIzOq@3ZzaOikJF4h=KVs!70P!z&FZw4++xUW?WHYo$bfaxgVb}#y=Cf z1Fz}+A9)Bt*Xz)VXshj8mnX2D4lI7Z@P&ngEQhpC&I_##_Q^PZ$?i|174&GIO&X{2 zs=4DjwMT7pCM{s_>9NCFhmlzZwb{6m@YEx=2FAis;s6nS^U*CZc+gUa5fccS3Gu)c z@0;U{^ne+Bog+X8-Sz9<{b!pNzpg?RuSZ@pwf0UMnjH*Du-P$idOzx)BEJE3>9>8V z6{z0^)G6Gq{S|FHF6y}4KWt}xK4&?7zCT(${d5pXCtv^p{`skqbV=Kf_FLj%$Nn-J zfyM|B`FeakViyt;FrR_VPF9J-@kin)}gF-5IML-@F5 zRB<}dus%w8t4DMPel4_R+GC@b$WJ&>gWN)&pAGHZcn(a1Q|+xBYCFM7I9 zY>8*NS}Qq*PPbTkpxU5u7-qUpS*0IjI+0d^RkR<_1(}w7m78pGHtbtE_-M85?_{~M z;o!;tH-;+F@_zwSZ{_W-Knm#YE^G1b)b;_$5O8_-Q2n{fbGSTP{9avSj3nOu{X8@0 z`LRRsYO`)FjCIA;C`7YX3*Blq;^J~9fBLJnPZy44l9vSkzm8>yF5a^%X=?0^I zFNFcci=wNmS4LCT(=VHN?TlVKO-GyP$rVLN-H(V9H+3Zmd%{B?3 z%~dO9;oO@o z9j65?8RnsE`i?DUb{vW(A88S__6L$Y$jw(2m7<6oH`6fwrdnOp ziP%#wm^&0R{G0$`P_eMKa48Tr34}7cuu$Gl+1JEVXVkmR(#g}Hcx^ugvN_LB7eBK- zVwjpOodxGj=k?GlYejy7OFruVewTX21%_jC8dHu(EZCm9*UEt$CcjI4#1OF)xQz6) z91z8r^Se=+MJ-romLV3w1zZ@Y`BTf4$Uido_c=`Pxd>a=8Oa0=>TaUwz^Zxuv1Xzq zJTiFA5v}zKElh7xU(cc~EIXK*r-nwWb_((nR-S|9>LF2_pJ?QoNN1E=*O(QeTWMD; z(1osk;&3sC_6>jxfMsyb631e4wRHk2JA|BJBLAZvVw6FsoZ~cJU);EUIA?%>V>pDV zbXb-Yih0DIS30wPx&rfnQ}b|_Q#-BWODTfehJgyq{M0(fzi}Ez5Wd;rJ%QXGR`&yT z->Y|C8!e9O5jUOAZKvC7q37?xj)mbUUef`kKF!K*IZ?50P~`3!gD2f>k)^H0+6~;o zpoi&t6;@2tDkl4IMxBIdb1hv;i{%yaf6^A_*M)vO4sVN5(=bZ`_g8p}8;{)0m>hAg zo;ep;t;#9F%)2KzG)370AW;?&sBdq&R7cG&v88$y#}3zH{x>}sl8#;7*;7D3x@B85 z_79N4`=WAJqFR3bt=B0)Yjw@*US9O$NoFd=-NELD#90vX+>0G&)EC#~RR%%Uv%=spPx!K*( zOe&jADt*VDBA&-tje@ZH`NHDjX`-5L>~q&M7N>o_EbqOt*CF@jOahe>$Y=CJQCXQ( z*X#P_T|bK4QOjZGpV!MS0&`*@!LvIQjj-ByJOuo5$wV5v$4dFgsc=h!$zC;-+bPe9-DtsS=S+C`CgZ&PLjLc3PdBJKgohLE?2Co=2sf5Ku2n+Xp8eMv9<(AGqW>u-~Cduxzy)PTzm+e)`78(MK z3XI6j!OO#piAx}<4MVT%)N4cLLmVY2Ls7Ar`z?DV8BxZa^7(0PVoi^djx3i>f=nV! zWdmPdGd(V04>wwTg1;(Ey?eg>8h^gcJWS_)%zSL0dfi(6(RDxZ8Ogp;Y!ROXCzho$wr>;3#k zr$^}cC6HK%I{s7SaJ$w}CixSu+e=LPH{;jOkH;=foZ(BK_ftK)y@!E>u7jXNp-wAqZD!!g}Iqep!QC$(Ee0ys|D2%|43iV=Dt~VYDr{lOg_Hb={ z$Xfd7fEXIV&z1s`dm3`mxNP4XdR1ymXU|hAmY%jUj=~on8a*$4hr~TnA&)4pMsP5n zqOvsu5ZkNGK}3&=8+Y%~e%}CK^lq9AiX~d`Myu9^{Q24QOizQ=J02OG)3XOx-W4O- z>0#@{v}R6;@iLSE!?<15CKS}s8T|?$I{1aQrU80p18=eHM%^ZZD@FxaAcv?RqJFr| zz7Y6Ji$Ht>NyO>rG~=xNFzG|aS@VCi0K%JlY%v&Gma$G=Jd#kp^0D1>A-&&`hIc_k z6Xw5Z9nJ+tbcX)4_mL;Jo)M%k#j;tgR@Z!$Cq}}~g5mOLq}`6@OISo{-yId$6v3xk z4!}5X?mY7U=ET~?CJmyZg2LU3!yC-`nl7Fm_f?HqKjo}D3Aass`$nD$c~=#(e+P5V z=QorIp8QS^tzds~x@z3khvyQRaM4I%4osOsMsA_djv(OXOBQko^5De^ZvTd!-yk|l zFS^PLOt;iVwYU5Z+02FOcSn(`qbIyQ>o`1FT9Z41rD z3YJhZ$cX(Oyh<3l5HwPtB~C&D$-{f*#tkW4MecwoAuI;0T(R^tkR!M;v`qgDP_4!e zZ{AZTT~et=bs95LS3m1#)65y;UPRbnD4QnJRHE*KRIMdgzBd;EL^NKjgQhd==iJ@9 zBRMDe8iYuRi`}@=jF%qXINBGgZbr_w8SITa=1Xm;@IvTNda)r4XpucG9vSEJ|Ni3f zBPrn0^U2oKh(``78+p*~W2csPSk|jOBZ>ff}7~^3y{~S?^)ViZB_9rom zwS7*{D-Q+g>oxq`p2VB)2Gz_qfqy1bK5r9@1qrf(;5}SCc+!XJQY(Rwjj++F$F~mB z`b>Z7vBUl;3dYm(6m#|d8wVLJX zPLJV7-U^Smccz@t!RzpRHh!k^Q;DUs)9e5ay}JF}N?Q2R5;{Bu%odSmiv5dA{VceQ zp|N1NjDIJYJ^=|fu_*BH9>_^qQZAOK7Pe;Wd(W1^N5>Fi{{gz=a)J@05FZ!IG9M++ z9~HroQ+MN8PvllLS5;>LUK`TeGR%%1x(9yT?i2D*G7=UNVskKAcWygZ<%O#;MibyA zf>~=d8ao|+xh8++7u5l}p83e5GdX40xdQ#_=))gQFzJ}J;eycOB>1M67k@PkYN!{H zuysVH7wg?T#S>iJ;mDa(wH&qndHu5Qp1m1~gvrl~^|-zPgOSO1PGS@Ll8^su-gf+T;AI=rd6*Nz#xiS zgGpnv>CKDgD_y?WPu7b-j^jxl&sU2sP>wb_xb5xje**VR4q*u! zWqHHl`CY(HiBV@dadY2cIZwUjc9>DB&d$neXRItlNrFLyANO1^v}Ln3SE7W=$;iMk zC8n-ynI1zJ9u|g(eM0bvW_`2sxakuO2uHU&6*wmbTQ(XseKJr1BVqW4WVE0> zM5G_m?wX4P&d?Q^xLLBgxLewz?v{looG@9Kzcqqj4Ty;{0p9baudLd|q#x+z?G zbM|4@wz~-1xwH`j_6d}fL5L+OQ=NzXD~bm-j^iCD1-UhUM4o3a#&g-&z;6yyV)V`Y z*_ft-P|rW11pO!ZneOppvX-*s8zax^xP#R$L)sPjDN zmTlL9UQ4XnIP)mKg(>5k`J*We#Q0aeraPus>6cmv9`{jC45TV$`YBq%S_=92ZRs z{zZ7deP=cKwOm39Cw$azfQoi#qR(6A?^o;7PeRT(vU$~Bh zoZ-SQXE=tu_arq^<7`yG-;f_ zgY1pHV?+Ac2V}K*Hxn~#Z5aJAL14cIeG$%9BF=udl}S0T6x)bUNA)h{L%p?0`B^Tm zNd7GGXytK`V%slt)hR@GCT2cU&|6_wS-a zBQaHVn%{zi3~Xv9gx;Abk$iq(A=c$)DGz?AItQ`LZv;Bd_JGk&?nVi!|sL_k@!RE7!rkS zE@$MvH&ZQ?qlBbcoxp7dbg^$+oc8g;i7rH2GwMzKd(XzZ9h736y}Z>8%V1p0D^vG$I7v8M8QB-{@$=dU7$;@@-4usjq zf5=V0J!(tb(PN%=e-vQL+E-jA0xPUjREmKrBiO&E{!0*S<-+P`p0^6NqP>nhZ$}Fa z0S-*Afr5ng+><5o4)gpfk=fbDp#Yw^?%Zx4310@d!03A*54rnrIAFf{;~8@AESExF zx{<~4qv9T)kVse*V}3ho)FY-*!UTPSZLg9+Seri(Ku*kno-_G@evzVAP)k2v&HK!? z0Nshndb7i>lJcAF)5)o84X#dJlLf(_ej5~VisELcG1@uXdRNuo#pjS3-)G7^qSa0O zkZClV)rN>6t}>srWq&N0gq&P-2HJiKk$C-&9Dl{?EKspc#LkYv>wYI+E{ysaf^8rn z5qjYqI*LQY7=_2JS_e<0HJQea!2f<1Z>sUbcYIu0)?!BLgJcir)q(|1{uJ6sLXCH& zs&StvPD0@Yth)LaYb_zs(T}HcQf{%zgkb%^nScAVs_WpS3<;?NZ`wh^+L;44-7@!% z%lnOkJ<4UnO^h8qU`cW~N~9pVGlbeuQZj5xHhReaveOFAl;Y&K$o`Z^ENAEaf|kiE znGxA8&(E!2^lc%vL@A#Nd7{VERVu}KBjF+y36uoL_fj2;Ku~cFL@EFUs6VUl3ijzh z!BSQ4o6MR$iQ7%K8HEzHMRlA z@{OlAhLsD5=Z-L+5Tad)7`09HvxcyWB0?kubBxE3JL~V8YO9_ps~3l-Yg`f7wF98Uy1FKJfab){us82Q<@#08S~9UWvLR-F2`YC)dKam z27V2_!!>$(#HppDR(|ctaF_ zC6H0RsUVrj7O!G31rmF(doC}p=_p-UA|{1gl*Ka<&*p4Mq8LVL=utWQ<#(rv$7DB5 z&PGJib`sh$`29aD>Y=UJ1$g&20WstiXKmi^m}J40n3nop4W*ZX#9mUYiixfQb&*n|*4l&M;;?B!!cyCBE^H`e~wo11MV?wr6R~FRYmX)?tG4Xpr}I_LPY$ z@!F}_8OEC(ES>#w2VkB4Mf6jaC_Am4GB3*b#6~!u4s6|6IW1fCA-iX#dDYZuPXPXN{B6dg4gZHL{u^0Ga5cU9G4!F;+Vt`&t3H_ zT!u(B0mPdrLi*v=M0;^c=A{)kR2&Wy2%{qRI1-SFw`w7irmj|=mn`-UbQWWERp^xr zU`Z0U+^#%rLXclzglEHyVNpcQKm73;y}y=1HnQXz`;n?oS_i(<(^LlZT=&AMy+GR4 zLJ~N4v%{rruK?;y6E=7Idp>tU+4b7L!L)qmQTI??g zqnvf@JAz@H5;Nda0nV;yw>cq}V4S;=3Sx-#^`LSGUEhzstN>er=ME$CMwr;`$PZ(T z^n~UkI^%@yrObYSVf_9MjlxS2llC8-1KQ+uN!YK@Uv0A3Mi!CQ9LN-E2O`dkGs!rI z;wEE`bT;_6cd+;L2Q5mifwmSSmd$eKAb9qp5MqVM=c^TId2djhl+}y zz7Ua@ZPju=zk4d(bJS9Ur`bvi%{XQafxVxxVeN}%C=nep6L|;msV==VE4*st^-mGj zm-)Ag4^t`*kY?`=hZBR1qX%eKRD1sU6$Cml_lyJ85H9jT0SHN2HKZg%Kw+%aU5@yM zh4wW3CU@+jXwDho&x-`jnUi$k3RNPLj_o zUJtgvDx^trp(B!WzT0tTJ~APpDAE8nvH@XE*4Dp?2dT_O!R?eP1Ejlue^n5bVxL~| zBUTJw(2X;TO0R^6NE?||6k9k~SNtFx5v9%feAJ5}uEhh`vN-L_9*G?UhyB)Dos@8Q z53_tGOZeR-aswPh4s=e5Nt>~lO+!#2Lu)tv5%?f$(T8zkpDEtE-fqTnoob!WHC5&X zDmpu|Tu9v%Y}@UvZh*Yc;LboeAYaQ~kCcpz3jTDf$A1miHMGGPkAj@sUNZBqs_KU~ zR8DiL_hoeN>kxSG^n@|3KrtDm;#F;*vYC1IrE9S$={`spGjfT&n-|iY8}2HKe{mP zdQO6k5b0I)V4XdBekTFvZh?svkZ~mBAKKq3zp;MzdZWELTlz3gx;-d0`j72g zxeuH}C*sPfVb3f?(H1^g;Dr9x@QOZUIw&LyEly}Lapq4GS=yl}K!Uq(@00m#viNm3 zq@B2)M&0%ib{YO0&iueldNE{Tlyr#nbNlrj+oF9MG2UGF>Avv>nIeeBLgY7o*08lp4B@Ow3^ zotl){*i$NVXCYc3B$v;H5Cg;xe~iJA9$O)C2-!uU>q!Zcb94!vXW^i{22mmxL7x5h zg)3HeeGR10p;ql+*9#&tcce2@9v_#c0c57c9xv(vx<*0AYV2!_eYpDNK11}73pl`5 z^_LNHbOyWYh?i7O1J3eQ4ul5TPX>EMQTh4SwC;L{h}fxNwHOCIra3EjEV+#IAZ{Dh z7m}n=`b|SAbARF2TU$_=kb{Fsn7gyHMq=NBSKiHQaL+q1@4r| z4ZA%tev~Tu;pNh3r38JKo4?ur;6T`q0;8M>5rLZhW@7jnMEY6l?rG088nVIfUXa^L zj%SH4KEwA68-oGm=?)cfE~C9ym>!EUb!6k-=vX;b^zL)nD#)ic%QF-QQf#MM_@hgR z-SUd}#X3dal;VHSzMfd0ak5t@C4^|h#q2jyOZ}|g^=e{Zalay;uJ5q*Fxetv#>m*K z?$2_3w?9S-N4F+`zH14-Gp6U0NdDbBI*<~{g7WAieYD!bqHebsOC<=mSOz@5;Rx&e zXawPq0oXqh>^$UkQ_+S;Is!u*J(uI-$f0Xa&mnn6R9b7rKHtGZTN?QE&?NTS^Ej}* zkwCon0J$J~L2uVN&BanQ-(#OR56SrfCEcqvZ+|e5=7odWpPud4zJIuFzSK;5!<7-> zp52Zi`Q@2ia*b!Uf)U_Bh=H{@A6PBjZ4pf209Ry5e<;;ozd2v#VPtf&uBS-Coh{Vd0C@c3PA-(I~ljRo+`hPRnA5Cn2vFy^v ziGmeJeTIyU)edkJ8+Hj$rszmbP35RXQ@|lr%i{Br*VG(Ef+@gg*$m+#C8}{_U~L#y zDw4Ge3-@_l-E7{`w2V|7XeAO3`Wfc$4yl7eE-g?!9NxchzS`uF&&*^hv_X>3OExbg z6hu<$>G626KUg9nR8dtm=^wYL;e^4x>7|1Ry)mxybCB^*Fb=yZ< zbIsFkr1NG2A!3j`Oc+NZQbI-(tvVs=fM@%$F+Nd}Y%MDu9UwrXwlJKr7P|*1*(t$p zQEMfi4=JDJR8lHRP*NZhk>G5Q=e!{Xx@OMmrgngf&mYVWq6bv!CRo7sQ2Sqd=+R6l z&mbfbAgGsO6OCxcG%nY0zzh0?f0J9Z5SpU}uBwH>j7~n@4O^hpPmV#JbkUD5nDb-& zh?BBfg6*qf?Y4=3ja?<4*ZzatW@j)J;C`ux$gub9^+3Nyi6ETSUAhTNG{dN!t2|BhN7_8@>QR5oa z!C`dl`^snDCM8Fknei*MHdMQ_?CKQ@CP7|7}i6*#5%U?mbF-3(Yul~^F-x!{>r_)rnng0X9!3uyN^P6GYmSp(sA zttOvZZC{JkVPJio#RPoYA;m|$W`54?_0jXP&OO7Tm$as$$bU$%_3kD3Yo5fi(xMlD z_al_b6I7 zi+B2u&Bp{e{0ic}Apw|@s^HBR!IOA7+b2wngPT|W0vMG>&$lfWejyy`2W#V$+FmQYT@n8W&hdBi)nXONl~o0e}R>z5|#gDS}8&mGCjh z;_x4HAd@ev&}pR{h(9IA{=yr|^F* zvHDR5pE(G5=wVF@+&``QDT-Qm<<>H>hUmv)L}ywL-i5u+>^%e(ypj~;cZy3|B4Kj- zHH)7$x4zE1au&j>>Da3XC{0jjj6q`FTS&zP|Ct7Jt;~0d+7IRohiCI^nKo^$@7cab5m>J#f@}G^Acbm=B&`2$Cy`QL)w<3ozJIov< zrNj@3gj_pRPnzj!fi@O9Jz0G31m%%9QPx#@^xLeSZ%gt75_YZ#@b#?)oPQ`s(3!r!ZK!-MGj zh`yk&s=4cLP%G9b3Mv)Xz6)s8k_zI*LVkh?P?MQhq0dr`1 zxw)vTWTn62$z_Bbmgxs~N^?j+A!y^9XMX?z9(%VQ)CZz+lu6nZW1myBX+n zCUJ67T!|#m*L!pyYL_ha8RmX;rY?=^*b3`hyx{6`6KD~12QFY^r-$H~nD`09D&74%e?X%;tI5kWA@vWb1X=(ukBv= ziwR|ZxQ6}|wQ#HmryqTe8z$*-qH6D4oA-T$LhP4u-WB0kW$h?w{=&p2lYfPAff-sg zi0Ee!k~}E`@(2XA-503xXs2x35}kZ%P@So*fBd+-_#Kf{ShhYQ5?+CC7Rz@6=RKbb zf%?0QEd2O#;s6M=5zv^%#7pI<7|K+%)FVoiBRT#lnO(f4Sc;w_Sh??~ng4_9lXPJ9 zn-T;4921AQUuIrg(=BsWUi}E#xe`_)8`+&n?VE2Q1gL(Ei{UB|hvL~0d%J#X_5@?{ zXkFlqLQ7#y6p!P&Z{HIi&}RpI4cBpljHUwnv?LW1M?LQp5fS^mW+(h1Qr6ml%%>d= zA%*0#34L`p@Nb8l=J)|}EZKx`sD(J#64SpRo(u%hLG*gdESPd{o*;D_nV~_ZKb~rM z6nzmfxx<>pX&e9V-tkvqstQ*VqIsH}Rys?(*kD9sI*mn!(R0q!aQNYZpK+c6a9fNC zg6I3|tDe7jjkeV$12NZ2msxn62UQ0Q%&v<`@NO*i2mivHJ;%;_{JhocUW7lDtU%#D zNgV0->74dr3DLRO7%dj+i4K3#o+edVc`48v(T0}>s9x$7vJS|;y1^E^ZGt0RkQb)hwEWSw4>U& zn+3uf=QE$SZBlaQ^!hXw?UDj;?hO-%^w;xwXJyyS4SNJCX^P{%@ZuvBb&3y%?kOrd zSzBA*QGG-1U6Em54;Z6wlSWeM2%wo2aCT-ZN*AZ+CH<}#6_JQY+#wkgKq&^9Ia}5- z60Z0fI!mUY*M2uE^=?fR7CpuP$@A#aU=O_iqg00RFLH&8HqCL@50WcRiTaQr z5NKki9B?UuRATbQP(Fknm~e9a0O((=Rxpf*U-Ysst2wN3T_T$ut5;zLjT=ea?1oNh z824d(4T#IekNCe}_tAVC$R;n8v&xAlFqmX+D4yXSDstJ`#>HT>-#0m6$9(!*<;-|N zY@27r2(M)XWhE$}#(|0s*W7qD#dw(fIY4^M*Jxsr0F(I~&s1V3g$>1dtQQN}5>7z##WvyTcA&0XcvN zsJdRTBoa3@%zf`JiK9JIrXFgjd>G{J@?me-84GGBL%EiaqeMynL!ixg)S-o+)v`7z zSAzeK@g|dAg_wZqF(=u$4MXa^ftX=wV>8n34J|UDz(fWRBrm;8q{~hXP2g@*G)e{G z{#!pIDRK>BS6`)n@;^2J6Sb@t@yHyEWf+vWmT5f1VUB1~){Fnh?OQm=9jjma$kQVl zv7t0RfjWaQVs=)Ry@)thvCc#GtuZ)q6~UzdfFbGj$cFL7FNKaKizzjtR9SmG|l zuSVvBys8S&H?9nFFF-(jw-Uk;Q}qMZ?4vbEd8ixXkO$(O22~JV_iPFrh1Y{`sN5Om z97_=gs*CyjxL;9FzS{WZU0>D#OPmkyJI#TOtl&8j{rj&I0AvKsrEcIxvf`nq5L^j} zkr*;YC{&{^TREmy08Hy}8MJw1q?flX(KK6DV?w*Rs3Xo)BFpA_!4>n(PD=yfviZNA zpMV%)_Ua;`ta*O0s~T$;gCg~_;M4hYM`*Dtf`1`M4mxToA7{lkW4=XII}Eki2PyG5 z7PL#T4|AtJ*bW#>G6qv?v3pt{VoIA>b7{>QfjF;dTsI^LDMYs+C7~O7oXk?X0a9vM zAe3(+JOJ-ucq}sXY;hzti{f#+W_d^!A+hAF3UeM9U#vFK{k#=&yKW;`8`ijo?&S9t zdK|ro*c%vgcN9A)f1SRa{nb&>I<%<^&K=e+9zQUwu3DiP$bH$aQk3(Mg$ihhbf7@V5*pH{iG_ zl#5__pTd^o7j#_Tc~-*hTY;>9BnTM&k`IOTiTHQTOnoO2rd=pzA?$#4P9r#niCjFQ z=Y5hK_br0^G7_Rk+y>s<3o7z2_PoAItcF)skD;?w=H&sQ(%q@ZWX=0_!bh<~VVb>w z<2W}TF`ae}dAbhwR0Gv8-(bEID9S11sXc?fM~$S#N+DO+ZA-zlu<**q;Z%)Z8I4Vq zD8X#axlfr!JJ~4Gr2LO!ZU==F^vgqDCQcMaNFDuy`1&(3rbWJ(ml9=_omBAsx6o#G zs!rf=89EaM$Wx&Kj-?B09|WFIjJ#^7b=q1xww}Y_Vne50wIZx9bJ(xKn^+EU+yk%# zpSVcIAKjf%X4RBRm1{kDs9%sYSu8w&2Q$G84ueY~tFw?8BXrvxB%g2}+EMxvIA;sk!PXYt)4XLV^{*oc|re$CB- z-v?BX%JdTpUxJ(q=z^V(CESjc+)+vC2Eh1Suq#~=XfQrbX!5WOx4H5x#qb~^yhnb1 z(n;}kkJ+{B$%eLvxDW(6eXM#0dO%+v?`%i37hmc04u_xLlC1&$YU}FZ{YqWUDFtd9$#^!6$vaDz#N`bKV*Kxu}YTRI~Z_8vzj#b`2$I$?T;C>U7@Iw8v~ z_*GOlpFHP3iY-H*ml?$qvRNUP2h2iigg`okzBFD1n#uY1*p>;TBR&|*NH`1BWo=J! zrkNOn%q@b^Jv2p<*Azy(*_tOUo~Q~m+cM+QxkZ$mnD1XM&D!-ViVKt@7{3Vs&N@+A zDNQW4f@_eRYKOgRFioEo*rriI3=LDzj?>0sSM*j%)~c;ZbHiNi6_0u?m5YXBN*oa> z-nw}-d=pOpblZJ(qQnEsYNvEgIvv5KB=(^M&xZuH(dI)&nnGGj0HJ}SWq`7qX|2ZI zr^=B}uUQ;pCrM6CoS#NkY=GU=^Q8^RW2R+KbXXzM*t+9BIM z7SA;HhmhnOGf8Xnx97ZurOqHxQhI5SJY8u)LtDBkd+10$vfV9b@D7`h`oQe8fL|7P zs9`}meq4c>uN828zlxw#qGbS*Ey;7m2@-$)O*yMfh^om%(}IxZaTq-%2x5_zWYuXv z{ZX*mjQ9|QuodK+=eW6++a}*tFHZMVW)jsg{jVx? zBgzX3+-4|?A;$XLVuR7I3z~Y4rA`g%Hyy&*LjzutEb|{wqN`OTG*hk)>NM=C&e!?t z6Wb}_(wUprOwMn!?NoS(?X^(mo;3H7_agw>o*;&zS_U)reVFMuGN%B^Y^Ku8RJdvI zh|6tpn|qI-SPVFsuQcPpnTnD`0BIlas$9@T)3_Hz;{}H71vU32oDSR0C9?0{>y?Q1 zZgwH{l0WLok?7Alr?jr8&12cHn@{M)e37WWqsQ9+$KG3p)s-#X!a;&X@Zb)?-62SD z2@sqF4-hoCySuvtcX!v|?(Xg$-1fH!>C=7geeb=e`}uyJKY1Xmz1CiH)~s2x#;8%- zH$1AQJ%S7Ovxc;*ggazEs|0IombDkOG@cLfLt5Tec(@d0Tp!XTz7|q@2aiUE#qbLy z&?5q`b9!~w#N*1nF_;n}PoQN4_nlADp-w)c18#1ejaazr$D~xBX4-~2!sp3%E@?dh zosLM(+`$%J4LOzEFC)+rJ~9jjXE&{H5gW)8MK7%++MVdyE5?NoW5fps6-#v-J>04X z?{Aa53s0t|rskF*x?Z?tzfQa>|6FKazlXBn%=SQJuI`9BumthX5o_H-ufF|IooGAuMKx z%IC#xY}-D=nau2kU?6$m0A$t!?S5|hb)T#s0m>m@#!c5>=dGqx(doZHK4Qrd=K?Y& zK#{+Qq~s){+ysL;MYLPdISbZU@T*6{r15XUq*-EF)+@s0A~Akj|Ih(NL3TG_!omCe zZ7?A#x&zXNFzlp34V7*UH98Vtn=jsZKAm6SCypfFHMDyLwW?bpLqA?KUmE_>jRk-C z3HrN%k+$Tyg+ru&8=}Y=Nx?O;0j%PT%>Z|_z6<<0b=&tUf_?fF9wC#dCKGo}B8cHa zdjz!Zo&1qeQnPkkWl-&>8LvrJy%(<|5yt!1aB_Oe^T`BGUl~G;-<;zqArR`nT|Uo5 zgHUHLf?}S;`Q5D+mV*$H2uLFLHPlHI) z)FT18J-->tef-s2m?T5gt}PUFVng@B8U#YUx0DfI1nkaHNl5`mq*R17!|1zr3efRk zXmeTwWh@v^)J0xe@Xx?WW5OS2Kv{Q;i^+FWYphaAFv zTHnaH;K2`S>jUT51$=6oYh=0dvnihtqOZ`X)Y1JAGGiN_IpXCRvc?|lIGRMwwsi;C zH>)bK16yIrHyB@eS;7|=DP+B#o6My!LvOk_2nB_%7uyZ$Fkzpa6H~#6VXVQiRj8{d zuJWQD?}a$JkK4$Yo}!&Ua22WQ}JP=hO77OuO^GC2|P8_KEmLD|1ZG$*`p%3u` zK=L@cPWcl6gm2+_w@~M=Q`YPYu!SZ!Ykb;p`Y^~QLp)&xGdE(DlW5wD8+3WJdq#8&Fubd14}zavs<(Iq1@k)oW~>*QVQxvUein~02^nd_Al5B zGD0*^R2W!X;3_~$!uNA}m^iInSRf^X%wV-iM)hRbH)7KFs2b0U=BhT(9W36j+ zxcmYrZ(RYH)5}+C0mR+i0U&rl%OA=o7q^V&2M-q)4$%2Y_Pb9KmxFmm`_+}L<1@6XsSsnz%g|uSnP^(DZgS zeq2;nKFARHuYVrUpQahBAkx{LJdxm9XV!hCEsk3Y&))9RDRA!z0CI|`mZz)FzXt9s z$VL?KL(mhygF?RD_3@6 zP(wvivK@R$-#HVZopw`gC%6;LxODiiZ|qh;T%0PI zc`3M>;OL|(z((CwI2Acd_0pI2`AMS#gbw&;bz?M!PU0H|#P}|>)UWy(0t6pda6;eK zZcEP^=JL&2k>@PON4#K*IwCzjM@1miQ+gAeL+H$$kQJpBqGItj#)z`hKL8TNWC_6B^Z7Uv;7L(L|>rC z6K18hpNEI?kwqZJzoh*zhXvPeAEurX^UAE+3mshqrjtg*OSSj?e3Z{|EZ@U@>*e>< z9$3xphZ1a9#Xd{HX4cpOUu=`-nX0M!%G2X2?XQfezp{0UmqY);ZXPR2(7}6Q^q|D# zGgD3ckBt=M5F@KxtRv8r>BHvoWj$XAzQdGedkb#2ey3yxn&k#^C3CA9dpa5&>Wpu8 z;HOFaJ`taD88c1RFVEh*VUe3mOZ|itr|ajTB~G(%eqw8X|Jq)H`;%Kc5CCPD`3a3I zIttu`30tweJ;mCdYYU48{4Z%!0Xnc*4u6Gw7e$Uvrw-Gy=IhTd%>g8N**f5nkt~Ua zEx6{<{5BfM;~!R25Rgek{ZLSxDZ`=hzfqdRd`ZKH`=Jqz=5l=J8W%NIdRgD-y(vQL zR?6iU(7xOhbLl~}OQN!PV9tM0-nvB&9?$&^hhj@+n`!arC7_d3wL_ec1sQqN^M-^6 zg@o6zt336mrB{h2<0FgMtsEKf5m50BdhX{%=t@zwo)1d%p|0~iySvs&M6Yrd>M%^c z<+<;r3)LvM4|r1N3E8DNuKQ+54Ib~Khd>Mmw=pkfr83gsI3VyJAof>G3Uh{|@f#<4 zDnmAZmr_MsMnUNj1g$$a?@IPd;07-xLH7nwQ)f$;T)f&}v>86`J^X+Qb+H$8ElZkW zI7O4#L&aYOL_{^ZL%8i79V@^96{mP3yg434gdR-5=VZ zb6Dnx=pO?h%ZA)0z!L6^8WmTgqM_*oT7bM-$ycZWN+h~M@U}{3O0}SMUl#^m0@W4f z7DA?D{Lw_`8z`VUpo}gw6yYTn%S$v>%P^B^PweYK&ZFfRb?23b&hCKSKA$G3vq5O- zC6YZ*W{leErgwo!Z2$tA#Zw(d9|b+bXY|r#qNZP!zM1hHHr~#=86d1M;6un@4GZ^cJ zF*SP6taa{hrF6jsVs$Z3Z}=u$9rdLhnokJ#7x&787CJPZB0V^@jPNmNWpAef&iS+} z@Fid6(#@maN`!hyW;{$n(Pi$6sK}~sYOYW7A<$2SLg$q_x#1@0>DK4ZW-R}Q9ub{94y7F#jMuo8WNn7)}W??WI`MkS0jEU+GN8{GVwqe7>0HZNv)450XN(W z@9rP&0~cHklqr44tD#^jSTmK6f#oB(SkQo^R*3$M!OZ%*eocv_gm6N>M!_k`NGqdJ z?cOY!w0I11(jwPt;zF0_J@&D3PoXXifiNDwI$KgLXs#O_cQ53uFI(tm0l7Gz$nB2FR&g5y2smCLGvk_z16y)J;kqROv(Ob2< zh+*^u_yhd+_SiqL>v0{GFdjjaKqAvJaPp~aw`|(kux3p*h4yt{r(uv?hT?oV%lJspJdhmHWg8QIO;f2`C#R)J?wF9I@1x9I@2HlP{mBWN3SB$?JtS z)$B2wSkIY~eX-ZdVvGM(5_`%S$C9`2k*yQe78!|>oGBhn^#dqCzN0cRbyDH3@sIWa(j^1+>+8Ani!xN6iOh)5`K`C+M0nYBQ< z`gOn?>Q(P_PY5mrzG*@@XSHxLf_7@PhFGF@#QDsa5&9~5JNju0ZS5reK+#6t?jpBP zG<~cd3wI4QW#s_YB}ZfcQg++E<`>BlkD=KR$ru$EQ+wI&Owtfo1VL1joLd&yAVRP- z)8m%7(8O5j`>B};d{shnd7AF@%kp$-JOFUL1=6g)V2*LK&NIL;AwOIfdg~A}XaYo* z1Xn+OP08@LbG?zCEU##G#m zm+aK0#*uNJ%Wg zz^6j&>kE!O`z#FGu2h~&N-(OYSn4w@QYeYwsFi^Kvr}zhDIG$n{;hLp%jZ#}VB}(+ zykZkADC*u^0pB`D4D~%Ngs2!6(cTV`nT4H^$>+@{z}J5^4NfW@A<|#FSxv|j96V++ zT6V?@$X@DGs6GKP5$H2Z4D4^2caQlnGJNve$V2C#3pM2JB5<#XKjD8hAy`ETPo!mA zMmOFqfJr%VH3&>&UJ_93K7lido$cfIP#rAE`+3gL0 z@fAo75?nhC^R*3jtUrc(6DO=JPa_9!CpbjLuA^|!w1f2RA&F%YhjQQ#z=9nBEIPQu zalpj3k`&Ll@gqzHY(g=3*qg}Z+I%}06#r+ax`Zz&i_-Tw`u50mX^&?cT8r9_O9#>KT( z!b%{#un_f9KJErBZ$tCBi!f6aXyP>zN+Stjp-CD7Ro7r!#S|PRkPK!;$Z;}yw%T`f zR1&I2pvTc}*Pe0&I2o?&-MRB8YGgg+eB`*-`PK9DNOl?j>6K48Xm#ai`>sS{@1cal zuS7mgD1pASGPwlLn2@er4RxI>B8gG_BC$-brQs^s+0Yk6@4cEEp!kjjqt{e_`%3mU zkzspFtYS&h$DA{9S(=4h*8!*j#S-@jdIU@WBCR^i_64)A6U>D>m#M&YrYan_HFXeK z11Gp0c&fzC!orn>>fHEb4Jz-DL-~^jQOW^4h)=54kwy;Jvo!ji4kUDWwRcMH-JD6Q z5#24`*#_eDJ)<1H-{3F#N9`X#(K9A19%pXzM}ZC7&1%(76%aaD)dsZdk}8A`Nh9c1 zKSL#rQmgd85uhTiQW3x^C@7fY#53PDYL+gaPpNkuxquwLL0CoF0-~ru z(WaCs2`sxIAbWt$XWxakJ&7pugAaq7(v1E8*mgKAWf_#+>hMEF?#pl}5E zz*olalB751dp^*(wyv^!L@{qpLJ-zq1~W4=RqRGz$Bq5)fTnys{R^1D!op(T=ss%R zLe=lS3$^1wj*0BXg1HW9!lSKSM>0-=dN~~ZP6m_q)1G$l>FKHCP-=d06J~Ma1!i`n zsJiF22u!ou>ci|oGi?!feS?!d0FY}1Nh_~n#^-L#{UqUPQ4 z43yl#CcM5z8KHRtYK%Du_Q&+|+!EOY2q)??AVnVho;RYw_o$>O2SvPT<6wu`7CbLq zjybcWxeWbs|6Pw_DADrs1S9nQ3wJQ5XX_nn$qjCtOZwn0#51Uuf#RK`nhdY=ev|B; zW%n^F#lOjxWO?@~4v|K)5bEhDSQ1Q zAwGa@aj9FKy0W{DJ4rDT=)1_(!5{_!x8PrPZionBSWbuE6bX`)k*QAsC-%!Ta<}kN zTHyNveXxD5_+t4*_17Ph#eDdOosWeg#7*QM)Q%t{zjb>Lbg!Ge5{u;Qy}(!Y5*CHN z(1ZF3sp)j0l?BghyBZLWi_O#e2NxhHtrD5cPQuc(SlH_$c0~rdNWOKxt%p%9gF8nY zW>`fB0D(4u0qGs0qx(tUa9G6d74TdjZ@cJrH{yoF;5V*h1u4yIiSQOLmeN3$(y)O{ zB>zC0G;zroI5ec(Bhrbed9EWU8fh?L-~POpcN5%2=4diG5000SVd>xubzwjxHwo|k ze5prtDkP8+8e=tuaaCj#IpU$z*rv7dyFAmC0N=;eIz{d`ZLZ0>8)9O*311Gif70{W zv-QOQE9khB1w8<>m{*G+f+LDyI=;o(sfTHVmL;S;1d5M75M+zxMCNq+gr(uV2QIDvn0DE|siyVYUwCKKRx_%Z%R7!^HbYs=y9I#6!a)*TnU@XR>k} z3tS{0(bv&DymklmiS1&6s7Rz=Y`nVW`%9uwyb~&#?bTvqgkfH#%<|W67svWUKq%xL zp6q*xd72S!{SJ#`PvIG3?C&s<4f5p`CX#u1k-%yp(o%g>**U{r^U z>K&FNULxYLu6y>E96viNez;eKq5(jJcre?h{7O3Nea72w(z66k*ecYQa)eD!`iLk z%KXo~kq-pV#kS!*8*F#S$@}9Np_!Q*mORJ+0g}0I+~!#^!_&>pflMWI8CqSzny2eM z)AcsAmoeMhdI;`VaZ;JT@mGtCDyZ|J4;mzy>pbb&QviDok@0JP3vjIK$KdU51ZW{O ztNxVWj3POL-M-obRLWKTQmBjGuymQ`Q;h zF9g=+EgHifCmm!3tAtx+p8@@&XvMcv!sT46FWU-kJ#!s_Ua*XG{C>^T>#gmhiPLR} z8?N-}TPZDXVHe?l!645eEIj}}rVem7&(*I?+n8C#2O2QAw7(%ny!y>0M(s@!82Bul zAFpLY$&$6;*A#9YVocrPJ9~81Y`x z`guzfH>95loFDE@cKXeMoM-Q~^u;6FA}N$Wl6=|A{BRd`^(W&((2dTCFE!!&Wa3w{ zOxVoVC0K81PABw*tMgVD5lL5lbY0P;=m1PoIIbOI{X8?SC!|#bMK5LTnAaIc9Qzok zbtuXzd!PS?&m|=y#{>}r@uNHu#B$Mxc7$TW9C9$7WZkwmz9vIszN70(+R|`I0P1?} z+u?m=G4dmtWu{tlMnnJ=78+TsT|ipH+dd)fSs@FV2qrFTehY%02_%rs^W#c8dOORz zp-YG38LS3NHkTtAXrh7|Q0udm>IeWj9Y^@P2$S00Giy+2Lb*ijZe+(eEZQzg-hc=J z2M_nQ zc%jm-QAs+U6<|!{e9z=nC$6~;-+2~FB8mB8m(hB$1K_FMT+(CV@$=%kJ#h!&OFtI< zuH_x;LnPLzi`OhY#*&t@V4SCBK#dCD+W9Et1}J&-MMJFz1@WzL=ehhv%7Z9gzrL}< zomY)mqH*aAceI+SC0AYQdBxR@+9EtL-- zIT%qBl;3LgH#3~xReARckAA{T3;ZhXi0 zBZ+OJr8K_u554b4>EJyR6Wpk>RN8QSFT)eS2aY;R3u6J^%hMwi>uw^75|e`Rg24Yd zQu3C=M7E=8JtdvRHuy0LIli_UYE`CRVp_J#HNuPsa)|=W2yEOb!=mHr8%rK)NJ|-t z!0(t^ea;1vu_65BYMsd@dq2pv!kl}gia!%wi=rGhxR5qG@Q^k~xG3byALVT`Z8+cU zphUB)wWWfv513dm=+|wcm%eDOHg22sm;}o0S?U1w&H$05SVUaB4QL4Bs6|0W#w#Zm zxsRTi!6b7Sr<l)NT2ykv>I-66@1Uj%JFR?G;w%1&hHKjo$Jd z*-t@a1AZ}kfKe4d0&_98f9WMp_ZSb6tMnbdCN=K+{e!J>QD z1*}*Ub`ycE<{@O@c9D^Q5%o*@FPC! z0V^WxL3AafgQr`H4l;+OZ?zcqtB8FmXXn8qw526%R>4CMDH8zGm&bq2q=hsUl%IwW zwnsuEMCf9Hm?rOw{dtTKN4c8`nj(`pQtP}sVNuLlo`k)s>xN^8Z?;504rWllPqmh8 zD1hI0J8b#AtR3bTyrR`ewrEk!f)GYWowZ%2USBx_o)i5 z`U7J@F(LgTAUm|i2uf`s(zo@hpM1rrycD~b@H4w22K1&QeV)5mr;T8J$n=46$be(t zv70vig1^aif=2u@N@!lpodFQ)I7fvZH94c5s(Fi8I#bDq;Duop%&|VZfr=-XAyEEm zMsjE64G%~fUh#T%Oh$B~fmI32n^%_)AF#}4i0`Laaibu?4=FOdvagyEmzc_Iu-hmU1Nq@>6D zU|Q{wO&owUI(mDBkYPL>eD;1(XZcBz3HDaw*<;hU7Uxf9v*!D@!xHqtMK3|^B)dH(dtzJz8 zaY9LjsCCMror7BsMjPTKTLXejFc*X}X?M3#i#E*06eL?}-?*_jbf=)P9uWtictr|< zZrczc7eCy|#T!D9vF#2?)qiM|pFkp-_-$uTZanf`=2pvF;>d&dRT5u~^(NlSGWqYG zrmixKaMga{fkwFCWygm1@1i`1Hw)?uhYq@CzuK}U|Kg*Ys#Y=`FB4qmLwwIV^`+yx zEsC?)D{*+cFcigOdC@f_kuNec=;+c^2>QeRa=I93MEF2iyv2&2A7gH#KTaQy6QVTN z17-XRJ_<`k9?zBBs6yvjKgyDu6V4HFwz9KuBo~g4L8Q9bn)iy1SZhi5FznUpwu_-? zJ+bOD6|a;*hpISrF;>}RY&X$#^EOjClA7YmfiRv8BEA7$US9axf=7aKcQCn!s{tDu zs+qkms&$qty-SbkNShJ2#{;ZO?Uhq%0YJTTbD2!*M9O;)w(vzDy`MLI2%rcEcz7WI z8_d%ch}r^Z$HGk0_1~Y|AlRW8Bt2{EfGU% z`#qo$_mu7JK{dVAu3U$e;rb$>!0BVEGAb&n$-pz^_Ob77Ifl8E&eyLuBC#3nNEo(5 zNnGDo$)yd5V{pCNhq!M8We12a32Jej&ZL0~nz138_+>F};!D_1Sf35j>uruYvy+{B z!&qr+mcg5?AyoI`TM~bO1Nld{Kk|oy)D5S;BhcL zQxw%*;4kIaG4{+yKx<^aXfDURbmYslIT%HSD1!UJTXxCuOC6;1WYSXW25rESr6RemSXcyloE=Mk62T)?t?QI~OjrhJc3XOjkB36WHCp#5J<}(T_IfsgWSm8V1-sP0=f}D&;{K&pmIC_=AqGTM{Mz+Bw z4*F^=!h5Ic4S$g1vwN3;Si8enBw^2g%19n51;px@OJ?qq5N~JbFIs4JKtm_Uj_ST8c(_*>sV7qwHlM} zGh(pwT74M~!{9OkB@88A^WsN2W*b>Ef6RNMkO3$N)p@E6bO*fu98mBGa6I~?VJ}zi zQ^J@y$X{x8T=~k$_1VL6%3iY`;{oNLTf?l0vA}na;2}{Cbie&VV#Xo556(MawW(ml zzx!zCL(i#^d;eVfn&JYEL_;n}UafBM%JsAcYvnV8tVmu;5{lP2%F)2Hh>lk1NkQ(Q zI;whY=YOn!P#| z?hB)PqFsJj7gSX@C_vy}RuTB4BnF!CFna_4gem=E;$4AKeeDG6{3AoQi%?UIW7X(Q z>}M5`dKyGjaPKld$1?=v^T^b#+>Rh`Rz-Z>%<>7Ai07%A^dk0_xT{d{1Tq#ck?g`^ zO_y&WVjIa}g(Z(aopSC8iiA@hQM^y?yRlS2j#I_)<8`>I=-G1)9gMOiTVE_LC<)oR zKU`um@-~cVvY?=?_`!*_+uifU=~uK5L<_h08tqfOD9s7d^d>Jy9pe%!hep|37h35= zPj#(8Zu8eQyX>aFKraLt%a3q7sj-)07)W$AHkxS-fj>>pZgA2`^d+}D}91^Uj@ z8!(T%zei;IRf1hIDecahBjzHG%G!(-88`k-0QXcCiSlh6_Itx6AQE440dc*d{!A>R z!jv!oXnu^zJ&Ovzp=rJ|M?piQ%v(p~LnGKl1V<;}L~2DPm>vr=|U^a}# z`w<%HbkulxyzBwrdSJZZk`smoI}?EL1_bDZn57_cDikRF$X)GGg@(s{Bz>ALw}2h4 zVHwwe0R@Xt82M-66imC)JjCB1#njGh--(Edy7g^Lgltd~{@k+U7-@EKnGhr=@z2wI z@9VfXRlEgbr`F1%uL8)T0R3GwM>9nAj5j^1&JccPSP1M&g&XD`%+l_P-iOH0Gr zz5p8(zNaEz=fOmu6h-&31OSpY7gvDn6dkKkG zib-ehC))wR5E?_;+K@-dl!lw#{Q0f*2ZG&5fR~@Her?ixAKhkrwAk1*)O{Zr8JQuX zQBYX8aTo?YQ(5Aic}PseUm`9O#F321CZcP{r#DX)rq zUgr)!;ajich$lrqBGOsMVvQGl(gH|nk77h3_Ut3R?lDW9y+=%S`}!Sqw@2*=B;aa5 z%=p8&Si%=BN^o5e=an_RX8SN_DHVfUK~j$N`8KrVhiPYYVe;@a^(dORffyJ*?#d1Z zSf@@9(T#UB3IXorI(b&*8qx*LH(A!ufV{%83a{(yUO1z7k7B1h9Ika7JpqNEiupt9 z>^Mg!F3erly3Qjt*l|)DE)m{mrA#vxPV_ucm_;CNAUhAA@SLz%QHP>3U^l30+Qc8 zT?1zOEiK&9pdI6vj!z>S_}KCOrxQCcvPjc=XX}Fg%X&`;_DJuA`FjmD?EVq5+31k& zBQXT#x5AOysi+h$2w$+Ik@c!?s6l4G)Qr4UIk|85=wv4M9kPCJXoDQT&3m1E;7kFr z_+Ztng*eeRAt-VxTbC_F$nQ;@?ER~%CB9*sPiRSitx+D;ebSK{nYlgER$G66S-xr-5eO-mw=BCkvG>hc>W%a;;@hZ6GL zN+jRUp@SN_FV)e}+!|CV#w3y6@Ni+1kh|a1zdrr4-AYJ2!R;P+DerzzfkY4xUYL=t zcjIGATplg=hbP#il)SP zqi>&NO$G4(B5S&v4D+sr_0w&|Z?=2)AhH!HbOv~iO-R!y;#|#Q63qp%sYlweJ~8vfF`X^q|K9NY`YPq zXugiiS4JdeCdGYCd^zSo9)^^eAtIAR#)0IHMvxJ9>y?vH_^BK!qu`8?n1+w8VI3(v zZUIEN>p7MsfsBajN4T&*Q_e0Z^5y5rTGt6c&e7-zCjkUhA*Xz!>xh3`0K&~Jn*#|> z8)IW*?B^V#n?N07V17|u?@$VFPe4X0pkZ#7!F^LUcR)r#;og&hlOrUO7s7QBo5Nii z(@#K9a1XSsz3Sq5a0?GdLSW|JLB+utCDONCW(*dA*LT4Wd|%?o=@i=*%~ z8ip6p@{RWQ^|b*~=6i;F!JLQ7oy7wC#6N|{$$C`mX}|ESxZIzFxU5H_ip~kthKGjq z#2>4*`M_^Y%7ox@2~;tj5)#o?oi7^5Iti&6Av+e7y#xaO?&uDne3IalkhS{__QEY} zuK{LB)67C1wrv%rILT8@iZryE^$gz0wGMz@%Oz={i{FICIXOf@L=fiL3QV_4fX~pG1;(1%wA;9 zPFTB_l@#c)RH-mnI6mt$uqBt1*4VyvTeJQAi{dm)*ofFQ#QBT70Qan)zx5!MZUih= zPDe@y4yvDYTo4%v!13n38fhE=wY&$%*p{i5I`rR__eQoOIv9V9(!NZ8OG0E7k3*1W zYSnUc%9NgZsCYGE3e;Y;-pa>~T2(Kh=ovPo@;V@rjB{{^3k zFMq4YCDB)eV)Im6plE8Ji#_M^S#-~9qaJB#jP=d5H-oJHE0JgVO|$+bqGlpV2+#>( zmEsF70%1h$m>#hw^uDFan)LX5`-|~z^cLUsjOhuCq)B>_Co*{!>hqUXZp&KZ>+oPB z2sO{8g0ljNVwjt1__ug`#r>E&5MZ#~00`*5tkfU^jh$clot|Sc3Q32gQND?hyg0Km zfw8dg%F~`P$QcWL6th^7`nR(xoxNq(&!CltT`;vaUxjBWrK;p)&UeUpn6!$tp>Z zJ-z{KWHVTyet{r0lqB;mWH&dG++c+=d)O)Q!@r$ebbXPmWBB+~}BZpL3rIniHtDSzXT!VA_El5jY0@#n{R7xnu22mFWCA3u;oWO%%6*TF40W@kSS#4&d1mVNp_`3D!k;vo;knzUhC zb!K?F1hIxG@8FXi`UF}Kg~Q?m)_tKvD=aCShwuTDI5cp?vNPZ=jJ z7NhCqmq!?=&kDH%omPOBv8D>@FQ?k3g#&qun*nfBvcw?c&?@NC?~(ONK~4^vJJ;!m z?#53vjj@fm`(RvQHLIV^o-cd@=Y|9{Rze>Q#ys?brS(>hya0MRDLm(cr|sMo@wl98 zBfMHw6Q8!+l3?A*I$XLUT&FGv2drk9K%*{{z7mk`V70v6HbVhR$dkOzV?Y$-%B1|= z@bZtgv#Mw?Tn*Fb-#RAavjWPEYV)r5z%y@ZuceHF0v3O_e08mEX{vIn+p4UuGzc(b zY~Hr}fE$;q{-H+Q=M~J(VD1RxGkf=cwSh*M053IFq1$J@I|JI6m=A>8(2Y#3KYvAA zr@$c>R@zvXc0vdG_E1~wg%-3M5OV*Zb8ofgBYl5oYI8WxC^bgS)9{Waj|Nj~SIl-K zXIkOo$K`^v&0>4ylpdy5BOz2_qWNl@qea)B#-6Bv@;RXN39+0a6%C`M z+Y#gy!6SnZKR>^l`y&_H^dSX2A=eXKp4&JB0|W4)@VL00m)|je$kUwV_TAk%J~mNId;^Q3#`I>fRLdt2F0r`z!G3rpBP%Pfp<(`0BI7*#n$;Z;Xq6u} z-5#dg1~|;cs9ML3^~EAn!fRo<+>9k#ZYA360^-T9>infqPZXPPQ zA306KRY6Ty1WM_78O6{mf~^7XZPJodfEL(NyQ3`NFzw+$Pc8m(L0kIh3zZw7xA_C) zYaHSMx$9fhcuYRQnjA%D`5z*6T2YgOuT)BDcDwkY|I&5&v0J+%TzjjaSR;#-3EJNN zcM1&FrfP}&@w&1W`5lMCWFvH-iO%C?b<`z&rQ$rFEV41HY?_pc=7MZe-Odovc4Lt7 z#-(9}tu((W{MllDdkp+rxcj1KUn(l2aK45_y8)!0B1|t zxGpoZi`EU@dwrA8elCWKvEgolC$&Y08Azq z=wJ-F{rA0>m`ozTL?tn5vpe5ig*pa4%N|KWY_jwj4(8Y;Td?0N`OY9Vs51K0^GJ#thrsRx7ODED2 z5fP=F9|8?GCSCv<{hwwI4l;d#K7+OxKOZ}ML#s?}D_dBUCpn&q>UwoQHXzipOAqox zCgr%KUbABSDBqvL>EZP}@P4E5a?v6Pn3ps$&G~jjsH+}Zp z4MMr{cxA)h(&kn}IN2ppt-C_uu$K0iPUx?l?jM)kueFEZTf(ax(fd|g|K#H0Agf^A%A485pD9{R4VEz^%Be}(9N=M=RyP;tP z%)a4VwhyT6V;_s$PRkDn!~+G8^F6bZQPJ0A9$}wXY*cA;U$y?6pA&oyMW+?EjYe&` z!ZLCvwM+_Q$*6%nA(e~j7z!65Kg`(xWl`k5^TY65I0UPGX6)906D*)K`lG%60M{aD^XQu6ncD-2DvQ<0SG%!XT(INeEQ z);T%i;B&rMU14~yb=^z(E%Y{?h9rY*EgD5LY3M4^gQiV(uD!NBA<5kMxi~8rLPe<4ERSL; zijoL3A|M=ww$sFR#J22kX(=m{wjr-Nf!jB4>(Guo+ptqUMt_;Nc-=(qJbdui+7S?Q zJx&v?%gGVBy*vtubgHffGL*bgk&%}5IGDc%LTx$uyzcJgvZ5nDy(_3rAir1w)>-#3 z2M-@d;9th{*THj(MVhXXiy)26naLmXo02n76@}`eg7}aHMB%;uhZCbvil{=A$UN_a zqbSAGFTm+2`86<}jPfSWbwN{cCxK)TUrS0}6X+`KOuIt}^uuz(v~M475*w)bbE9b` z({Rzvg)^pipy>{5r?tj)On{8^5g8|(*Qm8;^6UU?GTp)u)%y{MT*M+K3J#mLaTD$4%9K;9T3XFzrAK| zR?Ey3&pV&J`D%sTR7OIvafiJz_z+fvj&(mpholw=I!-&mzU?fP5;s(vaBx|g&zGt# zA4Jc@n2Fi(^=z}R#52PFH8^#TgR{AoXtOv{KE#cs%7~J}3S=}22idp2$L`SL2>y>o z@V~FB?Rs#$8J^KG7Y8wyyDo$Ky#yC4*wtyG;0cm!$oCc(#PLiPrGHzIt+b}c z%Rf?r>}f5QTik-J`kNU+&5y2dGdbuy&?Ny>Tv#Y^2zW?q(Bjq1RRoZ!sVFY3YI(T- zW`7b=ycgo4Rty2{J|xK2HP!6Gqk6g^r)t;Jfyrjd%a)Ku{b+V>YzX)b+suBn&39#! zh018>vYf{AY^u)J8`4WsPba5;o7O*F*}we+1h%>k+(7R-mq{$V#-gBPX8p^ih1p7* zmh605S5V zW*&nqOJKY>b}}L&qoaj7I&$JrIsOc*|C9Im!=BE*fwcyVFoGPKX7Y8_?p^E++d$_^ zs6y$pU&KzydlOg$`Gc`hxID5+e+`H9V-MurEYH{f@?QToN`Kt-f7rNxUx&a6bb(Db zDXMb1%Z+X<69P>)@hfb0^}+xg`fOR@ms4k;?>P}t?-qM0sD3TH;jZT}v==8ht}DM= zng73^@xQ$PFb){y3fqy+YizdRQqiAB{h*_VnY-$1T`jJ)rA?5bp`nHMc_4`KPa_*m zOzoVnZ06wh{v4N)^bp*j==sZa5YlQnBLU(w)^za{-MCY{Ui0ab~35kKR;~O@5Y~K0z?)3BsH`~V{3n}l7efs!z6EFaWSfh`} z2|m5v>Sy5YDpIr_{Qt)h z`oI4nMfY(<70?zwEhvP1z<9N+Hn&;->HA9K0}}xE){W+AxDdP^m$<3SHqt-6Vd>*) zQ26Ta{FGHd_yi0<*!fq(e>#NiQNWDW#7jawZRNbvfB|_2g?s-aa{;Vu+u?D&FMenI z@-!s{Kww&t*3R%xzaRdxtm`o$=VMOr(Za5f@Ef|F-Ttu@MM1#tL9 zz;t(>pE0ogv*iH>Y5!=?LpP%wPv5VU;&FC#gPs4WLq>T1XdoI$+rL+sG})v5kb2Sl z<4uL~(S&ufwn?A9VHhf~pg);ZdH=&97-7j`UkUo*Z53T&zLg zjJobz4qfW2P40?-b0d(}<>?&i1l5AjK}k&dGI)t3-a)?}#=HJpp;)aD3<4_01@wU9 z66kWdH#KzKbF(+T)n3*;{s3-AGZ2XW-g@6ElG z6d~+*^*v>>z?Y$5+<&@*4sSg#5P)ikp;uI50?~Zj5VUzN2r+*(qiQ#z5;Ow*tLinP zVl{H5DkdhDoJ{-dDbVqad`v=?*QM3oq}}Qs^#&a71};XS0U1c#MVER|G2Tjthy>}} zKaR`GfL)kqZ(#EG(@=q3sgyzX?B9;Reh#-G-GO zmu)_yaPw21Y5URbbM1-m{bjoTR>a?4`50Fwsr|NL-WXt4wvG!%{WFdAH(vMgrGO~# z_K)T8-ze~JP7A_+qrm@0fq!TH{{M8$WHYaA`hyGbul?!2N6!BqIsZ=j`{?`@njB8*6_GGQnG8btz4?tzRHL=KbRQ}~Sy=Y6)K8v^<)z_t_vX&&p>|9RRCCZXj$&NyDY`ULIb72d&OHK)-5l!4x{riay# zAkRc*PfTty01YKPK|_CJd0zv`Ds7WLGT-XJ?9R~s=W!=K75MG!#ZHXLVlf)%$O|{W zYP&dH2(^8iyn{$s=Or1_Kh)QoY{%T*$Dapmh`A8#?JGAHSxl z6P9!>J=%u|L;;KnM)3b*?7gGm>btk`J4!?eX^c)HBlwfirg4hk zzi2c6@0>C0fls>m-T!dB-TR_(?uJRChCkA56fomDK2W#xVRAFyUkxcF@?W!dsfHU6 zwwh{3EZw+O_JkUbaw)*b_~ZY7NwTuCHv#qBzp-u`2q-Oe_0b}~|NX7;)0qdF|8KiK zmw;hMP=GvhTlIN>(jmA>NAiU!MDsXG<-g$Qdtl%$ESa-vbiq@H1ehkeqi`TEDx=zdtbN#^dmDFL7R8!?X z@==cL6Ssk(d5#~!@!57CkZv&R=1Ok8Bl&o?A#?wY97us~`p)}Ya@wMvZy|?k7?>VH z1v@>(fl2-=n>p`qF0)72sYajb8{!#e3kCj%u>(Ajo6*0-RC^F`olRJNljZ;2g$CjW z3E)!;yU1ccXrBTx7s^DCGiEl-LuG z)>5X(7q0+~M?+^g)l%g%8bQ0^2%*^mfU^54Kg~Uvjh!8{-_o;&lLrRC>}tH$mWJ#>x{A#U#IQGI>4C9mSej`q=Hmr~6Wj1wbNusP+$0 z>g9s+AG=u}=6}W94dOv*gzeBVLXWifK}Yj5{4%FY z2S<~#Rdy+j3vP98_bl~mZR1I z!q|NfV}sR`sN?s>@DuQ&518gp&i$Jz$W0ae%U<7bMx0rirc9FE;#@`k|BBb#DU)g> zl3TU@R5VhkR8=4bry&geP3NNf*lQM2Qpe1?EZCs)quDT57A&Y>xx9W%qmG>Me#;r9 zJbpU5dOVN{%|WnR7HEL!IAPcwlg9Dn0>Vn-IN^r+_P;L-T&ufgpmVQ`^QNcQRdA={ zZ4N#@K%faVv}$t=X3B`i(@4v?0IKenK>5A*KRHSuIt9^-VfJ^~==lt_cDEPr3QTFH zPVu!@??Hgcf59X2k|JdI{h2Kl;O;Azptr_#EH;b$jNHmhXLP5H-j7&~8euvfhu$5@ zzOI#F{cKuSZm#`50`jJ6Sh8$>PXM|u_X~A-8%(OY?i}c}{P#otXD5nuUOyL{Zapem zki`vH>WoO{vy23G9TXEjWGQH9Fpv%**%t+8YPxOrE7f1%!Dymv#0P(GyCS!l6B z8`(+VFE*mKw8TW}m+-=JN6zaRTSj|1J_5zyDKM(+P7jibCET{wz8q6RET5EFU#@D` zmUcwjeO45fl&^KMWLxXsg*sb>*J>fh#`uT)T-F_+@7>oIV;DV>+~EaRJsoMC3DJqg zzdj2md)b!qs;I0l=Dhe-mkI4lkStp%6D-U{XdMd{PJ{e+3)GK4bwI$Z^MfWLl^wedYXEA0%3ZEZQ7lhCwT#19W#;o;zv6ST5e@ zSrh#=k;}|h1RFn(*clRDW7;m$drTHdeh&a8qr$3kW4($r zeU$Db7$$>1Zm;^hA0mw%{|{;zhVzxI{}VvPhm>qsAO2D!vsqx#GIK+Vev8{%Jjc(D zyUf|@d$03>HO;-cdq}nny-$I|*El8L7S`B1)Or7J>!1*mh;-@_IiVqDYHeY^c zSjFBd>p@UT!)GX2ySMw}IJDD5r)6X+XC*4$%DM#Q^=+X?v3cKp;No4LdgR9DX`2hQ z=Z{1Nrj9X6{Sy117*}F7?#i&kH%&qoxyXn7}8YXP(@6yOIF5ZOQ@;_N$))#FaOo1n+ zTBonudOZ`)SuBdp`5)K{_T*yE4~=GRt*$ukQql1py}_4AU?HXa*pzYFjw zB(jKm0jAjZ|M-CA5ShCg+G%^>2zkm}w2sh9c5+_JrDf1$m8_mvI~I?x$}L*oCmMM1 zY+`v5`QE51Pp1wBIh}rX`>AcGh5(x)**H{n+o}S;ZOy&8?sZGP>A$32 zX(hesxi<0U%!Wv>+Z6gD4@T9y$;}0I*wJ;zVQ?Jr2YiYMJB7$^(sy=4c%Q_}e%HZk zXba1(=t-ss{S+!CBoD(hGv0q;6* zj}9P&Hrt0J;dZox`1KDB_|JI`64hY+-mki7XIEq(FG8jD8<~eKbS^I^dx_oCWj^;l z*URg*eN|JQnDZl5$HrD0)4!1nx?rqT%qY|xEHF-N^x9?AojVo(4;1q=7y#@iGGqgQ zg0lM+A$O|HRPc>?}xhV&j!O@f}SlJn-j} zJB;^WQa{_mu8UDCQO)_BgQP4QU(a-G3<}aBKCDzY^Q<(pY8VJu}|maV@M zyTdOTpWBnG92&yglDACE8|!_rFpA=|(M2-4biXzYgKu_F84}}8ZfQoxmyzcUf2&i& z6k=*O6xn$!%$u?aJG5_v$qS$ z%OQz@q`)hhHr}pCBIYo@h6*9CYE}4S>2hmLDp(}fskjjjpd=?3x6zgNb?x3_9x4H( zWR&e^>y_xXuw!rX@V+sk6T_SVm&`O9Zv<3%b?%RZWOpt|;#5};C+H60srOx4{TxJ} zWw$y9Fhcvt@@3#3G-8-MsGDH5jUK8Q20N^n24~TyXZObC_TF(HN@3L0ZVQX7R*H2i zaT?3Q%N;D!QifWAqCIwBEw4Rc49=FtG;@xq`s?S9GYVOV{8GtMKlCpR-R;->76;C6 ze3V#z@#b-ZRniyy`%>R4TQXCAQW5N06jqhLjR($O4BHD%RdxgAJPIM$YDg(P8o|xi zcm$yx1oAFj0J2ze*>kCt z^teV(E{XMcBb$-iP7;gKK}Sf}VVsv!PeZ(8^ayk9*Sf zc!oD8_Ia{Ys_*sji}XkHaua^`-aal3A3;7E&Dd#D3IkWiR>eRbXmD7_tsC9XOhDBL z4vwEH&_`MiW{cBO?p$v9sAf=7?uYQ^8kW~IR*e31wukT{y0~DGx9-*fGQ!3iDh|Id zpi%THhYQ@2zZA<|(el8nP(QGRZ#S!(^XahK0>yE=SMSxpd8Ay-u5K>EMY{3caOQda zXsnK@$h%Fu@}fA9zLuL-@|U@<%O{a2PKbzkgQCQHH@|HTq?lTP=Am*-#QvpsT?PB^ zeYtBbQnEsK37*tMVWs9&QH_oK>9)g3Sf*}vzK(G4ha_U5!Y6%OitXZ9FPh9Bqma#q)I+3SFGd;PLSmr5=2 z?mCS`WZv&h55&Bf?NCQ_{8W{u-oyT&-^YmH5Ky~VbNu=C{cpS_U!x0T5HMt134$K# zTF|s-2UPr!k@&*Vm6cxM$%~8k1-W@rdLGDH==1}Ax1M^o4679zL#1q!$9Ud4EvkW{ zjX7$4rRDE$F)wt?rb$-)%K-cnu?$d>>qq*4IxnE;YX)(E>5pcOyaw8_6K}*^to5dO zf=z$7nxe9V;wW^-ZmM9%2)fn?dsLKhs;l(b}ziw!P_?R+z;lB$f(fmEPU7ePEq5px4m!A>f@3( z4hYW7LAE%5u0iX6TBziN&nw;@J(_2$kj#ckV$HeI zmHbU}vR$LES7KXEU)8@~7W`A;KEG`v=Dl25ilg zBJLOB&@3pwk?rn{7seS1^3Y_(wwWN%X9~#(-x8v(^IfH};H5aNg*wllMi}+5c4HpA zEX5W_j2=5k!Al%m?~5B$@F0`#pR()cSE*%Omye*!9SI;Tjl`|}9qKB=sHYtJc^UOI z*1*H!s2p~liAKFCTANb#u?Bo4#H`n|KA9B`y^_(-w;~OXZbI_m3l*+(xEPc|=C2@b zVo&;_H#M1ZDLAymj&n6aViCX_O6zd-1t-O#EyS zYN|Yd*qKvRLQ@Qt!JO(n*+`p-ZILF)nSVmBnh4_;fV2bgH&g!2TPZ{*WWivhI%BS3g+1gyVll#8ULQa1|!G+>WHA~%e# z&l4&mUIyRZXgC~n8Js@dUlIT;i307>ziTya7Vb)1otmyWcMdh5Bg^2XU8I}_HE$6J z#8jna6!7!P0E=b=kdd!bx1Tva-V*>oAIYKnr-ys$VNhkR+~WI|f8v&=Eoa3eprRTU z07~i1T0r495SGh%$Ib{=?6kXSPq9nA;}kum==Ms3VJcZu@Uc=@HO+NG<^h2nTaE1} z+n~}la zX>Tq=+QKsv?fszJW5HOR9LXX2DHI3Zg8>j3^PsxDY37B2;Jse@k@Dh3K~>8k>!=8p zl>~N6<)B`JIH23DB0Ic*>|D~ACtq!S(DC`Hk9mjx6Cs8EY-;7YT^lr%zSp zY_QoI-5THm1tAS%#e2<(8CLcPk{G}1WZ)&_y&@t z7YZhJy+F;Z|LIQ{*DhDW_4_%0=X~Li+}NjcOHN2B+Z+h;F{>}o6o^`TJ~^knUfe*T zuh%&f0p8T|HBX0CouPFW%~$IDq=LT8c(ptHj<&xJx~%gvZ=$ZMNAIo%)OXSPhd%&h zEnT~GnQu(<&D-e=_ywaSo*0JZX<8Xyw}6PvhO;7@=wUW?_53K%{v!k zEWT;;eq^S!>@U+F_MPWwru$Gkdwb;XT9>p;*#I)83vEr!Ws)CMnSx9AIU3|W)p+dy zgDxmlYnyRYA6NaGlNpbUNI)oK93~QQ4Xk~#0n8V@f&H$yT#k58831Ddzctah{rc3h zy+ye77{Bc}$K*~ajZW?OuHyRGXrS($AZ}n(#Q#pt=LPo^7Swt9EwAmV@s$b1sfyFP zDaHZDVPYI3doQK9GJ%ax0h5?X2^|99E-mvsTZa)RoNmwm%LU*XcC$?T{_#p%bUbed z-B21zbERtA?7CiryR&t-{4R2NOxd!DDU)I= zrIEf$@W^XAYV;{?z*ZLOgi0uuk=e=E;&xmMWwZ1mv;c;7q>s;g1fbzQEce_Yqe!~HV*q3Vd+ zLoV0I_R)4L%bhK6i^H`k_*!(AQ*hMiDe$AlK0b;N`(2-_dUTp)BYtZBgY!SW1C9jx zk#kJ*%=da_Ne8tCK)atPpmu-cyj2;y%1O=Ih-V4b%l!@?K|l{8X5o#UalA~w=PzVJL zF1L!X-8gzuVkj)Fu*!2Xe?`7ARQYnJf2qou*U|-XP@0l|uFblitXRU;vuC(4>cdch zDrDqr7Jp&er?!$(`OA03Gfo#M*L?h$CutO8FSB!P9F*Q}UO4?JZIh*cQ){88P;VrQb#$31%5)qc>7Fb>H6Y8bT)-$ z>XXt+n$6`}yHO`qY8%N1?McaQ(jnhO44XH+K&SIVdS%AG(QMtv5lF}p@sJG#;b&IG zW)_`KLaWbLD6hxH&fNSGAyCe-27;nrKT0n12!vJb)iz`s`8w>#Z%#7CNc<)%bi7s}fI!MPpxS4VcWX7KK2kU-6$v~=4y)#%v`&FRy z$EGIq3qh2%+Qt*D=8<1&0==FY0}ZurKS|7;47gBio*<<&_%;RMRda7&6DrcC6ehV4 z$EAGDN&AC+9-9(LGzTaWoqd46@0Wc&=OgXvRj+HgrYS7BG|AhC@E*}*hKSp3Up}&_ zEZQw~>J8}Oib%|zLJ`F+7I7LaO^y}U$t%Iv0mBqTo#H*_r)(<~No=WUMd2~Hv4QY| z%bM&miYBIWo1qa{$XYLaeIw4l=<`{CZ21r6vEIjMQwpPA+UZR#%=!bZGQBd3YNtCx z@1h1?Ks2wHO*qdkZ6VE*N50f?FhYOHY9IGs7s>Ni^gG*2?a(ql`ZB{j!QVqAkTK8S zT5AU6vmB#8C~+1*+%w#RUJagq8u4Z-dHW{0At$3^3dWysufmG_SgXdZUr{6O>fU*y zs)8!#fK0duW5a7GWRap>=w|L8NdWP3EUyUX;qYlB>Rhq@be4?xD8rndo^{kZjU4{v zyIvWblu5JDF@tsAiq~<_*09xRITL-i_Zi~5;pleS!sLqWWw7l7y;RTehirYG&nhpB z{rO1zIHP%NzWsJ+fMia`I)!JpjI{@+BYG*|cWH93!O$W7Y-9DQFUgiyZXHfUzek#p z5?E`gf)>94VQwDZIk)Dma_;Sa(o!3|o^Iy-hlM+@)UqV%_*d5VPrMht&)(ENzd>I` ziv0DxDR;!w@?djiI%A|K1XFm-bxm`FH4@T2!43Kc7wPB#(M-dw2lF(+5U62}Np@Rp zhAD(_)s(8Kv@kl#^dXgdNx(UjToT@f5r3jZJdS+sA>*U^s?NQ&&63=x>y~d?aOGW9 zway5N$h*na8&}&4w#`47*~}OJ7{zoYG~h-Okk)Yha@FF9F|8lh7S9PyHzScVRrPFszgPG1DbAw^EEX(a0d953uH6ch;8IANSS7`5uR z9ss_0i|SUV9txVtr-G@;dcN67Q%Z_)_1w?6zQ_l5?;HX9F(8`FxwG5ty8*@jHC8~!A8BASGRJ6&NBMA78rb;ICPJ!w8GHvru+;E z{W6f4quj!zO+bo6`;K?9MW|UkU$Y7~IH=6p4 z1}_tV4WUGgx1&Zu` zFCVkTFt4AcGu# z*y*`(8CY8z8uvT2O@wU3^SaKE(B%u#sVIY4UsGa)EF||tM&a3-&Ex^T;>qD;3)au6 z^_h#nrNVXNuRu-m#)>z5DkmTa@#CB|D{W-I9eMNp`S~s3N=(7K+=WR#kQiTU8;04=ENN zYFkfo_8im-;fXrTk9ZKz-EW*K()G(sud_*~#@UwmJV_4m3&^vR2+p9WvfebEXb-b@ zN6uxGG$^8)b{x4>2h}<%b9-s&JuCEW58cjEMexsK?P#TY3k%e&^R9zmr$HaO4~`v4 z`SC*^YL8oWKJQUv_~xLSH?`<$E96vB7f?xy6OT^|`6>y)FBLO+)snLM0&cQuMP6*} z`1`sdU1(@@LJ#JZ^|p{+=$BJL?GybN23LY}9K2^G4b{4Oa-_()xV#4HlQ6R^UWNiS zFZXXNH|Rvs8yvG!J*cMo^jP8-6N2BMJEm)_u=vE}x z#HiMJ8}CZ^0iS!+p2;U_zAK^beWH}nfPEivKV|Gmu+&0FnwxChyFoPax6=|OgWu^O zCk$3&Xc}eLJOTU*3YywR4)o^!|KA9Q>U3(V6vKZ$zS*<42=vQZfLoJVts|iSuR9zR z74SMR1BNNhH(2Az{ys#i?YQx&Z&OvxWcxtc<21-+nfQ(t zVT61@%5Hz7g3ww0%Qs4mr7&;RlsAuS9!ozII7?*86|ASO4k+Cz?foq0l07sqLVN|g z6*3VYDWL?ue$nnRG0fCpHMX9;GqnsmSSy}?aq)W6V+vtjR)mvn3%C-K@A|8HTvkEB z_3TjUEs{6GPJ$^-qVu+wUZ`|wB=rkuBbSD0Bkpy7%mBWP^LEz0)5 z=#9=W32hGiemlQOpa@!?`gH z`Bk%DVMS+L!R5E;LfCKhSyq`<@xoQy#zCU5UQqCM2{JidQ1x!-m(qK3A2NDX$Jx|R zCrTuqkDaoHrGeo8zz4<(KJ4{*XHt!5wph;A-KJ@4zRVEm;3K||e~t+8Hla0+w@bve z{=rSFqR+8KL{k^Tp2}AdSR8s=4|msJLmCjMn~yo-AE0ltVfQEHx=O-AhS5-1W9m>j zSzp|{+6S+#K%cA7;^VOFpCaP8F(AwNjLtg83PhO$Yc%iS!T29E>r9`VmO#AHF7Y|@Q z+?ZYIchfyI;ceRz@jI+$D)w})KX~vk?jp@~vP!VPdMmTHbM-6MPm<^;y`a&?x?rn- zW!nxc_17R8n^ns@cD@=(6uxt*q&8xUNOr0y^Qxd6wY41|WpCu_bm0rKQWUuB$$Bq0A3$pc_#9dyqQcRB(He$x&Tyx-+*14NPiG6Tot(7`w^Hajd zLVu=pd2E)rc8WcTS+O#Ohrsd+^I10J>>{@F%_<7-Py;+~8_%gj-uyc^W4YdFZK~+q zi;O;HPMe*AZzHoN!#4Z-7>X9FEajFZ1XoMBIhrj3nF5~|V+iI6NDy$?#W>{Vo%@zf zAxu^$L))T-epzWa*{t3EbGlf_$5nti+-EMhx(^)=)y}S<#wx=<{EHnX29fMMyA{Qs==KIK~KrRsXIMPrQ;zl4@6#w>_^ocBxkIC?1`v zm6$bZ_l5Q>S%e*q+aNh#vQ2pUvTXUbckE?|{#~JvCHe=8iN~W&q0zkdK%ESaORmr2 zvl~4AsX3s_ud!AKDNp;Fd89U5&0SG+RjSZi#FNpWpw?;5N=;$H>>PE%Y?_jX?oDf+ z^Ufe}E;x(uws*g4YB|%$Rtmh<4OFn2a??lDabI_{owJ$QSc|*hVo}Nyc7l_lX_a3L zJV&Hk;tQ5zA2ILRZTfCIOXc-mLl&_0QC(iIHNr}l{8`(9raPO+*Wyg{+&+H5(bMVh zp^j}Y*g(kAW0!{MXhx~2=)U}}R$qor(SEix>Xc5b@-0|v#b)`hwlInlo2ZUET<)?v z!y@8TP=k8+lFH32(Pf`r*8Bn(tXFSk82j$yKH&JfO~O;h@DUU>40xKA0q(!92j170 zCvE_Gw3Xu6#>y{9+UIKbD4<#UO5<`Y9VQJx>`;s$jS zzMzJ=4N{}%IKyrJ9xEM99Z9#m(>w)N7iu~>iM;o&jg{*B5M$}q^nRg5o72~`mflT= zRP3BY+~x97njhR+3=28xkLh!p%P*B$p65Gi+h(QSG5q>oHO9YgJ<7Y4&YdPX%d)io zXJrYldn2}&xNcYc1fLMsbp}2yFo(4-+VkZz1`cVWcHK?w=i| zw|RMBgizl&`kEIb?WaY`m}En2I`zP zYGP!Ho&Q)Jv(XlY7Xb32-1_MH)c`B^VK#Tr6*TixpUrjX*avscZBUgNCZ!RuZsrjk zE&m)l6v7+PoF#sbb(#d(p#Ky-NqqT4YzqX1Y``#=MIecxUA@c;9(gCtv4|@grj95V#qEf&KRF|H~Mwzq*du7Ub zM0M_OZ|-Og971|6I-dJxJy4zR@C))%?stJGwjy+^y)s)$G!jZU;du(9Uohmf{>g!C z(k_UNEPIyzaxMH*ie}PEy<&{;L|URzQKx8QGl>^;omD?iF(H9{%}m2b4wHZ{ss+#Pk*se<{=JYMKCu1k7QA^M1>l+QX7+uwRx?IbXu)DJz&6U$k_>h7uLh}t`74; z4-SovsIfS!bAx585*-DVbePC$$AviZm+|W^a}HnmBdan$(a#BSHj}u*=^)x&Yjvdk zm@>JzeQ$|BN`Ae&O;EX=aP35C=yJ|OfWNEChJ3kSBMr-q$XHA58i)*^|9LkKmXxr- zW9bYp*v&_=H+T9mF$b`ucXg(=3$aN`luIS84$S~5w@1tzyyrW>OCeNcBr4fnIkf`9 zur-ashfcldyC#Z6XCkzMs&11{UwK2?cSVXM@EVaY@SR@X}#mu4!nKM_?)7emD-;L3`jb z$hrY`(CoUVY8r@68ztXBE8?#(-IPv(I|;9bA3T4R{o(#+MwtQ`7cH4-e&iFRoHX%m z;t&%&TWZX!9}j*}?>&wn`;P2J+`eKnzyLr1+zJwWEsBlq?;qUlf12`xFvG9W_kK(g z-&(`a_HKXDp{Qipt?(JT8p>1u$DZZYP3=DL*>PE(ECVtsfiH(H%&0Y8cl-of-fPqg z`Z8M|xX=sAKXGM%?>jR@gZgnTVOT%J~!_v zyR~W@}5m`kc8*W$yuCa3oqcq~}6dy0JQ%@${ zJdwqA%2AxMTh7=3ZkD;C)ic?t?IKk?f`YuyHj$zjhL~NVK@XmIt(40^Z9_L3>_l+6 z@)nJ)0QQ^y(eJL-?TERWi(8lbFvqW6Bh%J1P2@pg60Nj?LIhy+-{w0B>~^IT@Jg^)Y)OYdoGhi%I92oQU z<^B~Gjq+$(f`8G9uFuPpJ6s!btOkR@I_~c7GDZ#ioiugpSz%^oM*Pt74^JY1G8D1V zN#jU@Cru4z;>M5#oCZe9z_tWxzYG{i`)BkL&f(e2Yxk zoP=abVW6^c(U;ISgyPZrfu=cSMp`)wYT7QCw>T+`!=^a;yGB{Uq8~y4R zi_+&;+4VdIK5Vc$+OVfV2*wifEp3aHP`l+U)gE2N#8L0RSr-%LH>4qI1{3f1ZSlib z2j-h_n+gfasPZ4HFjGykC5&53uO}`IrIby#5&I`qJ@YK@l2CaO9n+%E9>>SlaPAx) z`eW5kf1Ldq{t7=tc{{ihiu;UqbCicN6;?|lRJ6YQ+;G+9?acEI`|l`;do%vaEsJD& z)cy@m_zYf{XMJ&xN2orHjWx{MS$Rmyi+d_AJ1_~(?U%g^aZxjyV!sYPaq^Yg*}9k# zLRF4`zQfvkz7Iz19lXh<`pQ|tX#+FLTx>Jn3Et|7VT0%L_X%$$4RP@kxI=IsojC1f z4Y}(Iod_xL*OXnm3|@Q9U))MeJKGX2E3A#S9F|AB?6S9y(d0?nNq|KC=wFFcNl$%_`Mc(2l~@Wi2Mnu)dGBzV*)%1*jcs|hb&@5` zVy4^_+YR=b7C~4NLhqR4- zVam-iHv;Gr#Kzm7TV%88yJ)?`chhR*j6|1h(>86~H~Vl(Y$j)NBAVI9v%ZvMegdwC zvjbcEZQ7;yj^76m_JB}f8qg60?cU#Wk#wY4`YZ@)EhsSOAD%Mwea}sUip8#{VE;dA&nv=ISDHF`-2vt{w%@V~l8AQx+*v1xFjd;L~+V@)%&jX{59 z?x75-fVK3GsdfK^CH=lWEhTUt&S}l$*xInKMKr^k2zY z$S^(MUyjLEb|pDp26At<61b6nkILN4vf*Ub$L)C1QonAJzQKxi?he$o_YqYFUyAy@ zb?B`RAmygd^t6fVn5|ijxY0}EM26^;V--cU-uvpdE|rj1gg}}TvC9+`=hv_OH!aQ57-6(*&3sAy+;N7L8%*CM^`c}R!Rc$`Kr%9*6Ua~2FDICe%t ze6-i=-tzY5I7W^M`W(wDy)~*RP2-W~ds5jQnv5;g<}4ZA$s`F-c%~qX{;au{Eq@s2I7iP#mUm>+`Ch?)lTvp>KDO_B0UI(D>VO!szOYceM^g;(c`9 z=VqJ?IeGDMSjqu!UJ86{0CBDUC1Cs=#>vVY%3C6&dX@e%7s{ z2LfV=`Q08$R$$5C%}m4Jx4qMN1SA-E*NH{n+55X`vpS=c zuL?oJm|>8k9M$jEP|J+`u?e1BqUAT?-BxmYi~UQc?dOtZqSI>Ip;<(>ivMx}q{xV5?n3$LKPFRVS3O0I%>7yDKUS1mIODeNC^UE92Rb!ga8tz_ z;Yu`e4#)MO*75c$b2(GrOkHW`_SWlK*hK9M8}1Y}nO<_FjV`yCTt0u1vvbH7>6lNc zmCQahI&gz1v!ZR}LH8D}1}6s!lST^N4r$uszEzw}MQ>n6B=|Xg^5Bz6TD(40;&b$) z=i~RImwwOfJj9nzu*MQie^6LG&gs|0R1&9w%I*mCI^SLAFC4x}gHo@Qy!0R!>YtoV zIUB6?F4{Ikezo&tr-d4JD_ZFNZkHB>cTV%gYS1@ut2SF#+8ihg&v4kg27vX@pl`7{ z2=OOOx#o8L_9Vlx3W|zjZO?>Q&;9DWc-YoVPcV*nQwdTy0i4Kgr@mKuqAUfA5xnL} z8Not2){ssdeAG`T(P}?0aKJ{?WlciKl`-#jICoP8q6 zN67HN$4HGB_Z#ux%(M9=|JiTlzjx?S57sHY((G%E+>?ydbiQS7NpD%?4V7qjz`HNj zX7*Dj)a7gELhGZfy#i(#cHbMJaOiizz7e=^0hp_%3igR&q-ol!DJj=zUe_v{SpD-S zo@(k#J9^1K#Q5Ji%*RdXdMIO$)83_O^bIutqVKJ*6-+&*gYhL{>BQ; zND3%bH_-Oadd`*^jc2(KLXQsKy`0YiF*{DX>g;8Gb>fkfY;JtuG3%AjqLR7}Vf_HQ z)*ur;C=9=YI zAvll5xY$sJLgwrPM}`x1*(yp(M2KzcrG1Y*a+j5*ONy9~XUQ!}0lKilvQU*>T`Ig8 zwkFeTx!>1yvqDv2-;zeuf0lL$_`7AhQ#ZpcQP?>VW$1oI6@mK;Z6%6Tn{bWWUB@_c z$fH6+{ z`q}}v@qSWrZ*@Vx*O^yOMOH(CvCP=h;T*9NFN92zp@CRiGC9*Ro8J`yy75het0=*;evb(Vy16yK#wmbP6zYNUOn?9lnR>{V2T)- zdpcsQa5W@+y>mPYwhL~Np!k~{7#P)R_w<%n4KH$x3BVH2^E!%gJWhJ+FTc0TsE7s$ z4^O>YtUJSwvECaM+n?Egna|uF8~Qoh9>FG7D7A%)2~RE9J@#vk@=0v}qfR|yzBSiM zHr@frDxpOub+`MK&!J`e*v{H1Y!2&^Do8zQjjHP{8!D=X{jw55kw^8}V6iuUZCQP; z4|{_W8%!d4bE2lkYg&C`30Lr6;J97YV;barZWHCSU`@KKfNJ9uNVbO74z!=47M2$1 zM|8a8dK_9s=_9R0$d}v#^gL!5S9A!7kKt0fhUL5z4kWwp{gbF2Ht*;hW1&R9^+0#k zui9G|Q*omG{8&6|tF45N)^^TZBJbW`j|~*CExg2zKSS}vCV2%tgivY~R>gWBL!YHojh;j&b@zS6N<$)NH z1PTcPOIGC@)#4(@{MprX-Cj;Y_#EPppzu43?p!hRwANQsZ+~;WkA32}nfgUbZVZkR zk#pGhCp?_jC%sLj_y%Y?Ukm40dy+wWuIQbnE>_Qx8ttB|DE;6tVRnt`ah*;1JZq`4 z*(-5n1N!9f({}RnEqf+h{SaJ=0ZE$X>00Lx&bz@-HaY$xWNzp3Nn)SSv0=H%C%Gv4ogzw? zfS*Lri@kO-0n<*B%N1~dHTZgZ?yBm`moKqNNt1<)az23zM;l{W1_r>YqJXQzjG(%P zy*A^KSjUZVH*oUlfR zk3{sOl3GqitQO6!*_of&jR}9oxEfbk*jO+@clw6+FgPw33%o?k^$21l5hEj7)rdjR{zBE6M~$5VK=Q! zp1~s<7Zg?O%IRCd;*4}Nib)ZfQooLQoLtq}y}G_I_4Dw%xBMB9H{wJ4v-^%lzYu;I z9D!l*r8Oxb`>Gmj@WU!fC4*+2LRL$1+oFVUb!eSOm*PseUe5bOLz!bGeJUWAT&jL3 z*QwW719YbJ&FM30xz;ftSF^G0jAA(2!uoWdKX8tOTQUF)wSHnI0)inp%OaoncRI#?tZj2)ia?Wx!;uVKXBjdX~T>Iab}QV-=fX$|03tKgZf5_vTK?$ePl5(PWN@P@1{8E z@owtn+q6uRq56s#c30h@;MflM{c~fiOIlPsz$ytO_AM0`%0%o^KYrp?vb`{ym3@2P zuHN#gpbR4{a7Em{Ruy4Eb$m2yV>>c#v}QZySalo3h&kBIZVi(gbM!s9ZSTp%&otA~ zru5fRAo%XEV@1M7H#mji{cU3Zt!yCy>{s@q-DhY|wUdT{(-`NYFtuv$+4Q^EDk+y4 z-Z%%M5;OJ<#|Tx}Rh-2bR$R-=)<*N&#s&QO>`E$*D9C(#HaafikYRrKI4<=8<$+4c>lr5jatK$5lBrrSA0N}SvYq3z@GRCB9)x3>Z# z+RI<>4c&56#wO|(jSo=6Y_A?|r=VvJ!gmMm$_dI5Lw_xySpBY;TIo8$V^t|bPds@# zX+m0L!5J)9RU4)A9r(l)1u(W#72(xHQ=FGyJDVNAlD9(qs{|sqJbbF_rmkmWTEjZa zjr`BdscwaEa*iVlZhYh4wTD;(i+O_Pdv56Tm)LqsCQqOpb6fZXx>=NjnRe|v#sj;5 zj!N_Se1kbfD*nNojKIQcg?TYjecme>+68sPb5H2SvO}bBhZKHzh!$konxf+4U!rNHn+vE=XG%X~JeBOSu$f+&!_dlD zOS-P%prGS!)gN)$OWcTK8Bp`G38uojEYQ8I+Ph7nMk0@u$_!1yCN8@A&U<=A#836i zyc7tYu`lKD51bBq#O>cbQL7qE!%edysAs(Q;K%Lw+#)Me#A^Dsf2rWCgu3ubD?zQA zPV|XDEvsgx_?Fgt#Y~*?KmdxV}+WNTtlydrFbH%V#HyjNeyCF>NAQLClt%dOEHQSo*cW} znpM4G_!$kjQO0o|KfHyS@0j;69xRCb>v(ws>0S7L*n7*UDBG@KSdmgB1f@%nE@_DY z6agirdj{$5h5-QqB~?m5TDrSSrMqE>0qJgr8hB5@>wfO_#P{4@>wAB^Yu$fXOq|E; zWAArV|)wXwHg|VzyanTQUr?$$b zHXk72SU+i9iUd!-tHoHc4de%shtxK!`4n zCm-iG1+hU_%(Yv7xX$L(QU@j4CM4Vja~t~x<9}N{9vt%3pcjtz&|!A3tXR%`PQSJ` z?u&hIn^9NuWshAV=>|d}$XY?CA9JCC9g`)^K<@SC@zP4fGhZH|4Q2{=VWg7beLvOe zwI5AExV4AwtZpZSy%hM&Z;R5(#F4nm8DcmB+$pu2ceJ^2O1HnpIn4G22~~JwBgDJ` z8xPq|%anj8eTg0w>>T_DOz`-${9sLxaMWL z+TPjEKOA-$(xrW4-b>N$j{TU^)wH>%Dg>f(hMpTx%I|qW)`Zg+8e}f-9WD7DkxR3% z?_S%#*z$zfr7O;P#wPe1EC=E*?rplR!D|!rH=cbq6^CsHNbeu8*JGjz`ro1q@tT0a zV7{dP;ZAXGcbX~Vyj@G-9W*t_KlPw?Y}^isN_;Xt(zjPr2iZx$0ducbxFa@2%bS-H zy@bsifni*_vT?k!B}UzWF)HCR;timl!_$(>BRegB?Iu1ylUPMsR^&^qnf`jdWzEgH zjD>PxG62JtUpcJM8ZyJxyIW@6cl(E9=aIc5Z1xj&sPVR*kZ-pD(X!;WUQz%E!_-M^ zJH_^_j@50Yz14AVucj0f5ySbbOImJNR=>U=ODqMW>gS%vDwee)tgjA*RsO!&&)kDM zEoR4<-(f{E`mGU6g{ldl!SJe%dOAKdXNz+rw;@YzbkTS4bnFIGy939zQ0BBk=tQH% z#@RC_Ojgp36nGXp(G)Z*mkm3uB%R%FcPtsZ13x|FR4>eEa+juf}LpmHnr zs&fp#z~De-cMCVnL5em?1H)gcriG8Ep1c~Kbd2*IcNg-&Xa%|KT%^x9%aliV5&RIW zho{XpV`nE&YI6+l+Cg2&Yk=FzBwr<45dLj( zSSdoGm`6R6mL_%2Rx^=d$h73SzPFvmjlQdE`%dD`*3Tq8o!`AVfDw?0ltp39B+$k5 zT$Q~Z+7p2X1M%KL66vjmOOfVB9L6sBB4nElC|c5TgAv2YD!9EGx&H3ueS0cA*u9o9?o*^+a*`RDZE;fq472gPq@5FtxFwgYTh7^i;t8QvTC=U02&&Z zae6eGT{=_WchHbJYO}!Fq4FfS`vS_^6ogggIwzCnZxPSMjt{VVg_+tRjZG1=TM=Tz z;$yN_h=5jp;tes83DSdunmR4A4KFwmU=~mW_hzT3)8&EdG=Z)*@7sP7=Pv=%jTurQ zyL)?vXBJ-fYL_co$349Wsa^VqPOqJT6N&Jb(BzE`+|H0E-Ydf}%ATPov^xtP*P0`F4q&aG4O)Wgx)0_ zIqA}jKQ}Pp&m3Z@Q^M+X2ib0y3Kfa! z8>u)NgfYWYirXTraazaHA_*kT`k7l2KSyfyCpBv*sMhY`J$(ZbEn%WJ&UA_U=51eQ zD*b6-QnSiE%}(N7iCmRz(j7u0&-d&1pAc>ZeBY4GWFPrx8tMJEV*3S2#UlTCU78$L z%X~$_i!VZ1+FDkf<%XCJY~%RzzYKk(wDRuAGrhK1H7?D?{nWa8c09~@&+*u;JWtM# zejxz1Ld%?f5kPntRW`!}z{{6Z3qW z)!xAUAz)__enp-niJHrL`*-0QKEI2~l#t(HOH;=1ap%VbikssowxXvaUaMn~AUmAQ zcD$uJNo&Z@M+QpTJJTGdDKfCY6TK3GJH72V;)1Qa-UCD?zWas}=LUX-ue|pS+g9=7 zot8&q8Ew&EaxZ&MfUeH^3tG3aX5X3_==w=EK%CQUb-d5h&A-p$vZB-ZPGu;y&h$V+mXg0hS+Uc$+U*9q)3W)r(F&^^y#2*-uo zl6@6Uc1__ROzrjQu*Dv9lIr2?Z{Hr{$r#txpC1&gB?nLj#vHI~CtOQ{h103&ypY3& zt(+NgcaZSewwUEqwF*!zFxV18c5u8jvQDd};~2Tvn^Gz~&R&7%K~80a>_g0Ttjoy3>Th8|ME|5UIPpd}bj}zkgrMFo zz%8wtWz;zxii45h5DQ*~Aq$?RuQv0Dt~Up8@AvC84d9BX#4Q>!I^b@Q88~k+g+PT% z?dFPNU{1%*4`?4}rmo|z^33Hg4dESif2uz25R%0~Q$_b&;Ll`N|HgkhcNKLIvi~?0 zr)k$JFh%jcV7(wKd~qdxOkXBycb=bmkS{*WsT$SY=~rKov+3Zeb!{eX*vMMb>rts& z-0rI^-F%4=$mbR{*^zAnKCpy?_4wc z(_B>h(Fnye`A32l{i?c6qy zW?8-N`#ZPx42o3_&0K%}u#`_Yq>g-pRko5GBek|=YHd!J|K+BA^6n&hT0G8#-(IIa z^CRB1-Gkf=;Zn*G#Ek}5M0p;Quzn!ZL<5n)xZSCN+Mbxt<|+iD;^@^NPG~$uU!j*l zSW}BuGelGm`_Y2ApY#^E38YGu_fCnTCxl0zV1f7Xx7V|d7eBxVly@XziZx}!x4DRN z-pJ0c?t7BIT{-?`BO6e;nC05%y z&Q4$O&VK?;yc3NG~nyast5Pk8hVwtr1&IN9EZn-37TyD?C`r z4>a2(rG_U%;#3^$=0E+ir?O_N5Ns(ugEKpy)K8ffUkJ%<6WK`+(Y>u&zlVwp4e1Y$J}=fth>6qheghJ!Wx}`QgB0RC4C_(jJ%ye$(ef2z6{!pw&xbEm2X+yPw;H?AM>$C?~$GPZH zQ6EobUnkl3Qn}B)*0^1pJ7JVZdqtYXPt^2Jn*Gg?lG5(H^*?arRTW)M zTO=J$e#ka`c!rUXq%tb2>@Tgsi6KwQ3OsLT`##K`g zM$SkwZe{<(Ko6Cj*L--OtQzFfkaRC~(d2l1lR&uIV|5Fv<_uR!qfMTpx&J^lGr zAOBcU868Ay5o4G9C8NE{;OlQ+#G)2&Gxnpj$cz(wPS5Kr+|jGAx;?4#cg&DTPiq z%-WZ9rkkK74|k@dh}|U5Dr(?}dW30IsD9)r85Q)!8!M{!$&$)CNcCZ1%oawG=N;oK z$#E043uV#5b=OX0jk0!`nJX}$-N>_nh!u;7e|o7}UVE()sI{BKXaz3JWGCO@C|H|p z8_-$qm@e)e=G78XrME__L@(>Tk6#yr>3;iOi8emsgCM?JPi!kD@c8bi+B&X z&!n7g=SKwS$HK@9UWG-SYU)RrF6e3)~TM;GZ_OyGII;Fk%O3vyn=F;a2z^h&MtcO)l+w?bR7#}VJj9pYQK^pFcgC@vZUj@FA*^d3p2pmBU@^+Tk9pyL9LYrr5*Q zw@J}`m0Ps~v_ld$)ZACGN7&28ChDRrQrFEpSXOq#%JyqcI6EQ=a!McHhjX0Q9#?PN z9VB!wH}f12r9!64I_h{qFe$R~%@*b~%a@1!!F)Sq|C}I_RN>;;HZg=EpA~J1X(Y|_ z7aF^ipt-8aS*Q2@rvw-tvg?VlEqT)Mps{JW>l^EdP(dn<7w)Z>o# zhKowa-;ta*hc1_JIG&IW-#2FJa6oT;MCR2X8tJv;z-{VWmz{uPn68q|$=;!S#L9X0 zxw!*7ln))UX#Tn15LU0}Q2_dB5O) z8cWrGuztT=XEf;%9L~?0%}knn79bYy?2#~%%dC)|*n_1!C6v{R z)a(~3YIWq4C+{gp+7zx#C=;se9s1?Z)4_usC3#q_WrPupcxfLWHC4s&(QpWP@QIWv zUq#;qXRgme_Uus2r-njMPF$piGcR*G1i1!Q2w*)Ed4IbW;wd6ag5|5Ezff*gYxr4p z)HhyWSjOpjk{~MJTkAN)8`Vs^ojs;O81rE4GxR%Bu*sfFHYOrGT_w{(zWxp+@1c`> z7%z~jq|Q1)AvCc43tdG%?D!3NiIgYRPd6(nvftzT9`@ySw39GRFCGYX0oLm-Xp!)! zR6nLAlo4C@-1dB$FFM*zyo{7k{Z>q_Y;k$(F}M$kQqhHgQ*vrm0fx&*SB0G|teBG5 z)vQkX8c!Hyu@Wc0#k6WUPWZyU(j~{yWl6?;8R6iVuJXuIS;O+rEadI@DZKZtJR&CB z(W2UI%~Q{hJvN?Z+CGZc2uOyolf@K~w>f!nXcND+rWrFMUXM8OdAk6;Z}obA zo%N8;nPou#j8zT*a64RtZWP+Q!bVd)pJ5c0-%0~JCgs8m7M0RRU zF}BqxHyju5*6`NwY+Ot?$zqh=ut4>NCs8Yqo3%jNY3Y4`ji=B)ees36Q{QPXjV9m} z#N2ng+1nKKdBJULW86}Pc+EwzUq6m}^y~Y^@`7mh{Y^}8DGTo-#C80zw~N(Ymz`KCF!=*W^|mdNzCZnX&s9uFh1MKzc7xU^Ua4LUe0#Bo%;<(04wBuOcM`o4wg z0BtoQEpgQy2}Hk7`Nd{ZAVodaaGjjq@G=YA>`;HQ0B`7t~^RdBOX40+nxqdQMe z-QQa-L2+iarRF%AuTu@g{SKzxx6qtG8>NG#ZU<%*PGfHp0%6sTIc)VuddO4w1&)OX zFvl0U$k*`Ui97OOR0XIBjEb5e4!lRrZwV{?(z=Z=WP-{I_Cg+bzkN0LfK@Ctqh*YD z*Y2z*qEi@io%!;5wEO#dq(;xt>PT2PiN~Mkp$F^ce6lucgk_Ib__wJt;s&&riVjh{>gkz zwU=ErPKlvdDe6~>gnVo@Pl#`dfsDsRyHtn^o!fRIZQ*8;GHb&wO2~V~f-s23OSqRq zw2yf#PTzV~3AfkBJZxJWa6}qaaF<_6>Df9%39Zwxsoer#QDNdoy0Pu0NTbVWk#TbF zl`^TKx61?3h6f=6mf!ti-F%LXwr}OJ77Vd^;qqF~6n=osf0X5zq*=6QTZx-1-HOb?qagrAP@T%CGB0<`>AGy_|bRerC6?zigDO4lj8VX-&IxGVk*fHkx z_USP1Mi|vNY$K?hAP$_ZSIvc&rBOz<3RxoSl#_2OY>vlz#-$boi6NXXoWm9!;w`H3 z!+02T^Tf+WLtZ~~NseP6iSC96d9!qL&;^jd3uuh;a6P@4VaU*c8S#nlAF_%zO8_m+ z(DB%gonYYC6jAYH;y1I+>TU(1$Hj+v_BL-M$;k8jyGGy2J)^Y@VWNm6&|H5gwXJuG z!me=A!>LM>)_fmN|jFUs5_6 z<9bXL?yY?hU*`Z#{8CeBNe03qr^N7*us1H07|YTS%u?ECXrwB!pHdCMC|L2Dg&A^K zJsoN)PbK=s(t)U%q7Pq6UU#?IZID&zI;G`~5N?cukfAX*j*$mnaA$upMLG?A8pFc8 zgCS+L)i;;E7{JxsR z+QBTl+D(UTZ;Tv=u6P0Z1MPyELLJEc!r+=JcHME8)0Ybo0dy0Rb-ZDKD|l@$_cAKg z9`&lK&K%4zVpub=MHofLh0%!jBG2pu_n zgXBpOqv2}H!G;ey1jo;|TS#rF>~q@=?=r(44MY{Ce6`!q{*{p2RhID!2(yT|^mAr7 z&u9+|X?%0YI4=qdc|oF75{yl^ly%blIWtJ3Y-oP1^w{ws9s8X0$XeF>t{~Pm$Kw^X zoVuT`Wp2fNq-E6zcyIRnkkAxSY)ZJm0T^^vvbEAzH+wsP!aLa8BG^)}jLEv*31VAd z^>nFF)L&w*vZZ0xBBZ4O=v=nZz~_l`F$D}%X9rF3#ta?IznsJd+*RZCKnzxVuC{hD z)?8UhiNK^Uy5Y<)Posnmua9WsV5gNTCn-s^SNPQ8R2b-R|5lEF;eM;m89L3$)U>ty z*o4J8khOTe9U$Vsx(XD~jehsTnz)4#LJ`HHfsc7o+A!^P0hNv66qk6LxwHHEVLxVO zEs!k+yTxp8Z(ruJ^Xq*vpY=3(+ZU4aGeKZ11j@6-Tj)PEz2#04FOI1|yKOYpKn3mxUc(Pvq9=1I-Oz)j0-^FC|kEmw&5d4j*|+JS%+iU9gz&%nuqJBHlrU3`7B0_|&)b zp1ief_nYHsNv>_BJY(;M_kZHBo}kUpd{&d0cTz_MCc5T9M+6_GZG!_)tY-Y>6vw7uHOvf*Z zT85Q05tiYhQL%dDXYR$x_Uetv`<+E1)8LF8Gq9>y+hgi`v=h48J#}^LYt`b8Fg%9b zh8E+cwQ{ah_zl2g9|?HuMT#~Gg1K5&M#oL>d1s9{-R(OgDd9dPqu@C|iYe=G;XHc< zgXl|uiQhcr--ni3B=)MAnpiGB7TH#3jfu|T;P5e<)02D%g*5W&#(dRDZ;g_BEw%0! zQ@#1i)lMmAq?a`1JAE*}rmN!BeEanUv&HVM*fp)y7`F&(ZDq2^W zg^J;;qNsCP4T6gj8LSe)I8Ya4I|VtpVRuolmLo2nrio~O-F-UV8|hpPw1opM+~1c9 zXc;*8m1tEC1GJh>W4^ALiG_1c(#KTR^Nro`eu2L%vz_v|(;)ls@C7bdSvv0y*PZ9# z*|ZdiIlJ&khEo@<$GU55!{_t(50nGw%w)6s4hM2GH9qG(yVVrvqWQHk;Tb2t5|&z& z`J%H$BB%v%0z&J6Xj7ftCB95D?k>w6ST%p{^ymQOcwM&;j}kRQ^NMj?Q(Glnd(Sx= zdCEMbm@z}Sha%EqbXAkoZPWSdW}cv#icp5A%AzisJP!Jf^w>D<T^X^tYfO{v6_Mc?ICSZ-3mVzvrnAG zNv$aDO)OQBI%u(nae3(yFK)A0P%+!ydBkJd(aLs`OmL&3bPG>Lu&Lr&DANNuog__rU8RV|gec3%la=16 z)iN>q>`aH`;?&^&_3XC(Hm&d89a$YZZi!Moe8y(s^R{PcWmevtyE)Gh4Nby9#GR(* z3RA579T19YBeh~XX42B9%y!;SAfp`#t%%_1)w8FfTW8xDBXzGDV?jj(bESgW5h9M> zJS8dE)W=`_vMaMyu8jfu|h@f@Z`5}O`*j>vg>5ktZ}k*{}KGQ z)dihBU#mh+4FYvcIs+miqCl+$DZib82envQ?a6A6_j*tw(9L6pPl7C%`e%QtBu41U zJ}2xPNI_T;Z{zb6Htg@1#KrK_`>3!Z(`b z7BT2J>L(sm4m~9+1f zciHtEj$tb6MSq(UX52eE(cG-Df`?9v5)fr75d?o#E zEYWZ-usU;#mLi3pXwlSc9%}NaPAp6M`JFLUZM8sud6G2lxzgPuQqOk11)PJ*B3G`0 z@Hm-U1^udB_Mnr{$PSW{mlRdZ-y*thlNxHDp4msQ@(r7-xkL*?(Z2s`3*Y5V19Hro3*Z6?Ed1KnS^CrTG;!7;uuouy>{) z1$uF^p650^vSmhfKWdq z3yiX2iK~)k5m~31f4hi?=4DvIF+Zz?@X!6?{ zNJ>g^6?z~`=^f$lMcS)wIqVhSzGjeyA1aA_G`Bcz}5}%;mDX&*6=vcc`%7E7u zo$n_q@}6097m?_bA^|k_G%3qtVA2gsuzhHrlztO?TrAbvc;k8kEz1* zXC*Xx`AkRMyVE)RLj_#1fu78t$TQ)hWkL-qA-sEIb3!;<8T0qk5=lI)c{f6LJ?-wU zb6|X7a{FkKG=MXAH+>D(JME^pwkGR4&H)F;o}Hv~1id$(AJd1_=SS9sZlS>@{cLa4 zOW-YAc{fCv%~u*G-$2TR4wE#kHn0y5oboyaV=)Z_@PMn$BQ&JytKwYYXr#Ii{9wmwB;Ck^o2qp~(Tq%vNu zlb>GO1g|R|OMIN4S}GX29gx_UW;a$9hFLmf+VsUkC5DKtFhm4&?2x)}^3+hukFtif zli%0=JuSF5(x;hUTl#Stv$>*8@Va#fnF=DXVo7-x90V`%6}F@7y9+RhZUbQ<2!q$3 zB=k0$T_kUfrg?gXrXwu2%yXLfL3zRY`Z)^-&&GMfX2LmR5TTXL*=mHo$V6-}SZNfpW{y2p;R>NO!|6BJ56@JO}yw{PXh>zQP( z$lk2JyPy_FjWUXeAw7CkM+!GPwDn+wjp^j{c{8-7^t-5kGodAOopM!YcZug`?rnGd{kl1v5uhD%_7rwl&g{laQszB%hq2}6 zlY)uf!A}_L4KYNwwfA@ZLoaxzfcT^V!P$zuS2q0O9I^301n32F%iBic3H*~JB_qv* zo|u>zb>mjqD7b|C$#hc?d+oLl;L7?XTCO<9`& zS=TpsQhT=Bc}wFluE?1U39kgYIL+X!j`LL7WsOdqNh)QITER$GMgr-9jdksgKU?+k zBk0kaR-j=jo$SB^HSOfmQtpE-xXAXnp23US)6JS&8tgv`!sP@Q@g4&$pgo6+&MKze znDO44qLTYV{D*zeupEGnS4@nIjIYagoM|c@RtD0%4~Yv*Zf2vhSI6_8)m7XEg3hZ& zFK}^W_D>GV!@az+tfi5UWUCy~Vr6!?Z==G_xDWGZHGxrd2Y>V zE^yQToQ(3k#qHW7bWKk&=Qm3LNZ14S2Zg5wchKo8Dv8$}w@HnLH$U7>y zJg?Y7#ADAswxJpvRyDMiIV1y$KQv-T0!jEUoVivH*SrhN z&4BXnkZP{I6oq=RzKoro62DLb-B@))h4i)G}mZebXkZun(L zY_Y!*q|!;-VTZ|Y8|Vn?`x^oA@(JN0{G|HD+kWvmp?fc+a1C9*P7W2VI%Y3gP3ESA zgCaHxKiu>9lvpF9rIQauiJ{Cd$NelwH8^+>p_JZgW9vSWGZXO~ZPC;y+SL8{U8Y9% zS2H|EpDeYM%<$Kmr3XD8vPA}dHVi}Rww2kB9#MbO@7x462pyBXlKtffGB;qXbPU{O z?ivh9)x}N73e5H!xto|Sn+FBNmzEj#VD-zWR`5Pmt;yZ>)(o$_)+jrbBKx9Zp^@6o zaKexq=^y+?x`=REc~wKxXzyTb6_qK>v8k4zN27hURQGj#_IEjjo?$16g1Nht1toDnZ!J&Hye?b9Pg@Lg z_C~%P_9+EPFSZ}SHGp{z*4`Ix$Tw5FL%j!Ebr+$|{kDu-(#ZO6aXrW^&!g^Fwv1uV zPu`1ms^+n<^rcjf!E+S@iwPrg)&nWs@(mVwP{bF*)Mlx4R=<4CD|TFn#iONhko>gc z=F}(Ib2AngpMbf(g@S|i0z-nE&|)N=*#gL@r>dQvBZbE|n=4y&60e_vH56AP>{Q^f zdH3~qju;Bw&zvxhqKj}>eo9BJOy~5Dyg~Xlg-OH!Zmhe28%v^4 zSn{~)E3G((FVH@(bWEt zyEVaOs;2&RcwxTE-kj#RT)0KINK%|U2oW-^Gzya&ZS)o5wXn`{s@E=1>8(rdrrPX3oxS@3gVwZ9 zO_Ar|>z0|Fn~fji=qMoKycRWBT^D36PbJOW3EO@EBc3Z9f|s#OK^=Z6QwPkXi@4f2r%DT8RUe6X%Jfn$P>6W6+uQ-OGyQSk#uK zj9{rd`sgoQ%{*4V34|r~ch=-r7U{tw{P6NjQARo-dDo?MM#c_F+pDZZzUM^Y5fw%?Qk+Ph z%u^pC-vbk9j$EX3!Rujy#oRkhckxp_xuxwhj2U_8)Nrr-PUU4)3TvCpDhpJ(^|aa0w995*M6DY9^>BaoA@MO-6m2 z0#;;{KHOt)uQf!OMRe3-vS&_`y```HY z6zu{B2I!fr!3lO;I)u6$<9rvMv7ChHshk28c+YcUAsQL(UOHJ!dw0rTF-r0CE0q}a zDq1;JqkPz;0N2wQApGq8d9SiWABQ#ugk)=$zhur4RQ-TE8NS#x^u4M|O5}Sr%(ZLl z)!b&Ty0!32=u%FOQs0F-Q-cU8*}LgCW%*hXYOCe$+A)lUJovRVC_v zjsuio!ojYZPFp7>5yDxEgk>!FMOL5tr)5vw3v7{=Q(BC86saAaSE@dq->uIxi$-@h z10I>Zi#Ra5Ypg9JrEqdwqU;cfu#IRW{!t)Z_A4x%MZBdXvmbcZFrgToUPJZ78L;RR zF*fu;hcd=h6yrZ@Jy71YI&Wrem}EdbGV)*h8a3YmN5nFvGb}~rnQbJdOfH0(+Li`K zqzmweHoW6XVg0fo+@fm*PoNu~s!(J;*WJZ5ymi1ErH{NDD8R_$AtOKMJ{#hxJ3{+c zF2LLqoS8KCarB$0_;NE?&}6s}!aUFIm~sR8y)E|h(*jS7{lQ=*_R+8g_eh++n;(=o z%sxLsVJ#TWUafae6{4?Fb`|Ns(f)Dj<~UpRdC(SCFx9PZ;Jx-`wxgSQAoo>&Yune3 zwUd&E5K@a^K=f08Y(!z5U^*B~j5LEjjk5++2a)CL<8RAYzn+Rn%PV$pn0C}!BpA7# zZ3dsqOm9tw5?bmYl^(#Wz#++RK7Wg_K-!5_(Y>(tZw1>@4W3L`x0=oWdcCbDSLMXk zULHB+=WdvBcP*LY?S~Q~GgY~2#c8dqqEtf0*SFZ4g1l#jQiru6X#;7IQN}(At>_fR z?Nn3R1=)hp*#km|$4~0Hl}69T1nTdDTsXccD7ZVB?7{9#Dd}Wb3JNYF$q&n#NI4H5 zb=M!E#Pe@UM~OBgSzSIgiicUxTETK_0M%i}$H%vJnE^K!CPG>E0C{qNWnm99%`k

    EbZHVfD{AcjoB4s|)x)|4ACXv!10i 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 D64U1& literal 0 HcmV?d00001 diff --git a/doc/index.md b/doc/index.md index 06222f3e0..baf9306b9 100644 --- a/doc/index.md +++ b/doc/index.md @@ -1,23 +1,23 @@ # What is Hashtopolis? -> [!CAUTION] + **Hashtopolis** is an open-source platform designed to distribute and manage password cracking tasks across multiple machines. -Password cracking is a *pleasantly parallel* problem, meaning it can be divided into many independent subtasks that run simultaneously without needing to communicate with each other. Each agent can work on a different portion of the attack without waiting for others. This makes cracking highly scalable: the more ressources you have, the faster the overall process will run. Hashtopolis takes full advantage of this by coordinating multiple agents to work in parallel, maximizing resource usage and significantly reducing cracking time. +Password cracking is a *pleasantly parallel* problem, meaning it can be divided into many independent subtasks that run simultaneously without needing to communicate with each other. Each agent can work on a different portion of the attack without waiting for others. This makes cracking highly scalable: the more resources you have, the faster the overall process will run. Hashtopolis takes full advantage of this by coordinating multiple agents to work in parallel, maximizing resource utilization and significantly reducing cracking time. ## Objectives and Purpose Hashtopolis is built to: -- Centralise password cracking management through a user-friendly web interface available in both dark and light theme. -- Efficiently distribute workloads to multiple agents, locally or over a network, taking into account hetereogeneous hardware configuration. -- Support various cracking tools, yet primarily designed for Hashcat, and custom attack strategies. -- Allow easy monitoring, task automation, and result collection in large-scale environments. -- Centralised management of files (e.g. wordlists, rules,...) as well as binaries update and distribution. -- Support for multi-user environment with different level of permissions. +- **Centralize password cracking** management through a user-friendly web interface available in both dark and light themes. +- **Efficiently distribute** workloads to multiple agents, locally or over a network, taking into account heterogeneous hardware configurations. +- **Support various cracking tools**, primarily designed for **Hashcat**, as well as custom attack strategies. +- Allow **easy monitoring**, **task automation**, and result collection in large-scale environments. +- **Centralized management** of files (e.g. wordlists, rules,...) as well as binaries update and distribution. +- Support **multi-user environment** with configurable permission levels. ## How It Works – In a Nutshell @@ -28,7 +28,7 @@ Hashtopolis operates on a **client-server architecture**: - The **agents** are lightweight Python clients installed on various computing resources. They communicate with the server by requesting work, execute cracking tasks using Hashcat, and report results back to the server. -A detailed [Basic Workflow](#) section is available for new users explaining how to operate Hashtopolis step-by-step. Here, we provide a concise overview of what happens behind the scenes once a hash or hashlist has been uploaded and a task created to recover its passwords: +A detailed [Basic Workflow](/user_manual/basic_workflow/) section is available for new users providing step-by-step guidance on how to operate Hashtopolis. Here, we provide a concise overview of what happens once a hash or hashlist is uploaded and a cracking task is created: 1. Agents that currently have no assigned work send requests to the server via API calls asking for new tasks. @@ -36,28 +36,30 @@ A detailed [Basic Workflow](#) section is available for new users explaining how 3. Before cracking begins, the server initiates a keyspace calculation for the assigned task. This calculation is performed by one or more agents assigned to the task. A few points to note: - Ideally, only one agent would perform this calculation since the result is always the same. However, having multiple agents perform it prevents idle time if a single agent fails. - - The concept of **keyspace** in Hashcat differs from the traditional definition. For more details, refer to the [Hashcat Wiki](https://hashcat.net/wiki/doku.php?id=frequently_asked_questions#what_is_a_keyspace). Briefly, Hashcat’s `--keyspace` option is designed to optimize workload distribution rather than represent the exact total keyspace. If you know the idea of "base" and "amplifier," Hashcat’s keyspace command outputs the size of the base, whereas the traditional keyspace is base × amplifier. + - The concept of **keyspace** in Hashcat differs from the traditional definition. See the [Hashcat Wiki](https://hashcat.net/wiki/doku.php?id=frequently_asked_questions#what_is_a_keyspace) for more information. + Briefly, Hashcat’s `--keyspace` option is designed to optimize workload distribution rather than represent the exact total keyspace. If you know the idea of "base" and "amplifier," Hashcat’s keyspace command outputs the size of the base, whereas the traditional keyspace is base × amplifier. 4. After the keyspace is known, each agent runs a benchmark for the task to determine how quickly it can process its assigned workload. -5. Using the benchmark results and the task’s keyspace, the server calculates the size of the **chunk** — a portion of the keyspace assigned to an agent. This chunk size aligns with the task’s configured "chunk size" parameter, which specifies how long an agent should work uninterrupted on a chunk. +5. Using the benchmark results and the task’s keyspace, the server calculates the size of the **chunk** — a portion of the keyspace assigned to an agent. This chunk size aligns with the task’s configured "*chunk size*" parameter, which specifies how long an agent should work uninterrupted on a chunk. 6. Once an agent completes its assigned chunk — either by cracking all possible passwords in that portion or exhausting the keyspace — it requests new work from the server. If the task still has remaining work and remains the highest-priority task, the server assigns the next chunk to that agent. ## Contribution Guidelines We are open to all kinds of contributions. If it's a bug fix or a new feature, feel free to create a pull request. Please consider the following points: -- include one feature or one bugfix in one pull request; -- try to stick with the code style used (especially in the PHP parts), IntelliJ/PHPStorm users can get a code style XML here. +- Include one feature or one bugfix in one pull request; +- Try to follow the existing code style (especially for PHP). IntelliJ/PHPStorm users can import the style-XML provided. + +The pull request will then be reviewed by at least one member and merged after approval. Don’t be discouraged if your pull request isn’t accepted immediately, most requested changes are minor. -The pull request will then be reviewed by at least one member and merged after approval. Don't be discouraged just because the first review is not approved, often these are just small changes. ## What to expect from the manual? -This manual aims at describing all the functionalities and settings existing in hashtopolis. In particular, you can find the following sections: +This manual aims to describe all the functionalities and settings existing in Hashtopolis. In particular, you can find the following sections: -- **Installation Guidelines**: describes the basic installation procedure to deploy a hashtopolis instance. It also contains advanced installation procedures to have it in an air-gapped environment, working with https enabled as well as many other advanced features. -- **Basic Workflow**: serves particularly for new users who are not familiar with hashtopolis. It describes the most important features to know in order to have your first tasks running. -- **User Manual**: goes deeper than the basic workflow in each of the aspect of hashtopolis. This aims to cover all the existing features and settings of Hashtopolis. -- **FAQ and Tips**: gathers most of the questions that were asked on different channels (discord, wiki, etc.). -- **API Reference**: contains all the details related to the API in case you need to automatise some processes or want to develop your own front end. \ No newline at end of file +- [**Basic Workflow**](/user_manual/basic_workflow/): Tailored for new users unfamiliar with Hashtopolis. It describes the most important features to know in order to have your first tasks running. +- [**Installation Guidelines**](/installation_guidelines/basic_install/): Covers basic installation steps to deploy a Hashtopolis instance. It also contains advanced installation procedures for air-gapped environments, HTTPS configuration, as well as many other advanced features. +- [**User Manual**](/user_manual/agents/): goes deeper than the basic workflow into each aspect of Hashtopolis. This aims to cover all the existing features and settings. +- [**FAQ and Tips**](/faq_tips/faq/): gathers most of the questions that were asked on different channels (discord, wiki, etc.). +- [**API Reference**](/apiv2/): contains all the details related to the API in case you need to automate some processes or want to develop your own front end. \ No newline at end of file diff --git a/doc/installation_guidelines/advanced_install.md b/doc/installation_guidelines/advanced_install.md index d4c617b15..fc896018c 100644 --- a/doc/installation_guidelines/advanced_install.md +++ b/doc/installation_guidelines/advanced_install.md @@ -1,27 +1,40 @@ # Advanced installation -## Installation in an airgapped/offline/oil-gapped system (**make a note about the binary**) -If you are running Hashtopolis in an offline network or an air-gapped network, you will need to use a machine with internet access to either pull the images directly from the docker hub or build it yourself. +## Installation in an offline environment +If you want to run Hashtopolis on a network without internet access, you need a separate machine with internet to either pull the images from Docker Hub or build them yourself. Here are the commands to pull the images from Docker hub. To build the images from source, follow the instructions in the section related to building images. ``` docker pull hashtopolis/backend:latest docker pull hashtopolis/frontend:latest +docker pull mysql:8.0 ``` The images can then be saved as .tar archives: ``` docker save hashtopolis/backend:latest --output hashtopolis-backend.tar docker save hashtopolis/frontend:latest --output hashtopolis-frontend.tar +docker save mysql:8.0 --output mysql.tar ``` -Next, transfer both file to your Hashtopolis server and import them using the following commands +Next, transfer both file to your Hashtopolis server and import them using the following commands: ``` docker load --input hashtopolis-backend.tar docker load --input hashtopolis-frontend.tar +docker load --input mysql.tar ``` -Continue with the normal docker installation described in the [basic installation section](/installation_guidelines/basic_install/#setup-hashtopolis-server). +Download docker-compose.yml and env.example and transfer them to your Hashtopolis server as well: + +``` +wget https://raw.githubusercontent.com/hashtopolis/server/master/docker-compose.yml +wget https://raw.githubusercontent.com/hashtopolis/server/master/env.example -O .env +``` + +Continue with the normal docker installation described in the [basic installation section](basic_install.md#setup-hashtopolis-server). + +> [!CAUTION] +> Hashtopolis is pre-configured with a hashcat cracker. However, the binary package is not loaded within the docker image. A URL is provided so that the agent can download the binary when required. Obviously this does not work in an offline environment. Please check the [binaries cracker section](../user_manual/crackers_binary.md#adding-a-new-version) for details about how to handle such situation. ## Build Hashtopolis images yourself The Docker images can be built from source following these steps. @@ -46,7 +59,7 @@ git clone https://github.com/hashtopolis/server.git cd server ``` -2. *(Optional)* Check the output of ```file docker-entrypoint.sh```. If it mentions *'with CRLF line terminators'*, your git checkout is converting line-ending on checkout. This is causing issues for files within the docker container. This is common behaviour for example within Windows (WSL) instances. To fix this: +2. *(Optional)* Check the output of ```file docker-entrypoint.sh```. If it mentions *'with CRLF line terminators'*, your git checkout is converting line-ending on checkout. This is causing issues for files within the docker container. This is common behavior for example within Windows (WSL) instances. To fix this: ``` git config core.eol lf git config core.autocrlf input @@ -56,15 +69,13 @@ git reset --hard HEAD Check that ```file docker-entrypoint.sh``` correctly outputs: *'docker-entrypoint.sh: Bourne-Again shell script, ASCII text executable'*. -3. Copy the env.example and edit the values to your likings +3. Copy the env.example file and modify the values as needed. ``` cp env.example .env nano .env ``` -4. (Optional) If you want to test a preview of the version 2 of the UI, consult the New user interface technical preview section. (***Internal LINK***) - -5. Build the server docker image +4. Build the server docker image ``` docker build . -t hashtopolis/backend:latest --target hashtopolis-server-prod ``` @@ -75,7 +86,7 @@ By default (when you use the default docker-compose) the Hashtopolis folder (imp You can list this volume via docker volume ls. You can also access the volume directly in the backend, because it is mounted at: ```/usr/local/share/hashtopolis``` inside the container. -However, if you do not want the use the volume but want to use folders of the host OS you can change the mount points in the docker compose file: +However, if you prefer not to use Docker volumes and instead use folders on the host OS, you can update the mount points in the *docker-compose.yml* file: ``` version: '3.7' services: @@ -128,7 +139,7 @@ volumes: hashtopolis: ``` -Make sure to copy everything out of the docker volume, you can do that using: +Make sure to back up all data from the Docker volume. You can do this using: ``` docker cp hashtopolis-backend:/usr/local/share/hashtopolis ``` @@ -139,4 +150,4 @@ docker compose down docker compose up ``` -Remember to copy the contents back into the folders. +Finally, copy the data back into the appropriate folders after recreating the containers. \ No newline at end of file diff --git a/doc/installation_guidelines/basic_install.md b/doc/installation_guidelines/basic_install.md index e8867607a..508de0eae 100644 --- a/doc/installation_guidelines/basic_install.md +++ b/doc/installation_guidelines/basic_install.md @@ -1,6 +1,8 @@ # Basic installation ## Server installation -This guide details installing Hashtopolis using Docker, the recommended method since version 0.14.0. Docker offers a faster, more consistent setup process. + +This guide explains how to install Hashtopolis using Docker. + ### Prerequisites: > [!NOTE] @@ -11,14 +13,17 @@ To install Hashtopolis server, ensure that the following prerequisites are met: 1. Docker: Follow the instructions available on the Docker website: - [Install Docker on Ubuntu](https://docs.docker.com/engine/install/ubuntu/) - - Install Docker on Windows + - [Install Docker on Windows](https://docs.docker.com/desktop/setup/install/windows-install/#:~:text=needing%20administrator%20privileges.-,Install%20interactively,Program%20Files%5CDocker%5CDocker%20.) 2. Docker Compose v2: Follow the instructions available on the Docker website: - Install Docker Compose on Linux ### Setup Hashtopolis Server -The official Docker images can be found on Docker Hub at: https://hub.docker.com/u/hashtopolis. Two Docker images are needed to run Hashtopolis: hashtopolis/frontend (setting up the web user interface), and hashtopolis/backend (taking care of the Hashtopolis database). +The official Docker images can be found on [Docker Hub](https://hub.docker.com/u/hashtopolis). To run Hashtopolis, you need two main images: + +- *hashtopolis/frontend*: provides the web user interface +- *hashtopolis/backend*: handles background processing and communicates with the database (managed by a separate MySQL container) A docker-compose file allowing to configure the docker containers for Hashtopolis is available in this repository. Here are the steps to follow to run Hashtopolis using that docker-compose file: @@ -33,34 +38,39 @@ wget https://raw.githubusercontent.com/hashtopolis/server/master/docker-compose. wget https://raw.githubusercontent.com/hashtopolis/server/master/env.example -O .env ``` 3. Edit the .env file and change the settings to your likings. + ``` nano .env ``` + 4. Start the containers: + ``` docker compose up --detach ``` -5. Access the Hashtopolis UI through: ```http://127.0.0.1:8080``` using the credentials (user=admin, password=hashtopolis) -6. If you want to play around with a preview of the version 2 of the UI, consult the New user interface: technical preview section. + +5. Access the Hashtopolis UI through: ```http://127.0.0.1:8080``` using the credentials set in the *.env* file, default are user=admin and password=hashtopolis. + ## Agent installation ### Prerequisites To install the agent, ensure that the following prerequisites are met: -1. Python: Python 3 must be installed on the agent system. You can verify the installation by running the following command in your terminal: +1. Python: Python 3 must be installed on the agent system. If Python 3 is not installed, refer to the official Python installation guide. You can verify the installation by running the following command in your terminal: + ``` python3 --version ``` -If Python 3 is not installed, refer to the official Python installation guide. 2. Python Packages: The Hashtopolis agents depends on the following Python packages: + - requests - psutil -[***To be checked***] It is recommended to use a virtual environment for installing the required packages to avoid conflicts with system-wide packages. You can create and activate a virtual environment with the following commands: + ``` -python3 -m venv hastopolis_env +python3 -m venv hashtopolis_env source hashtopolis_env/bin/activate ``` @@ -71,9 +81,10 @@ pip install requests psutil ### Download the Hashtopolis agent 1. Connect to the Hashtopolis server: ```http://:8080``` and log in. Navigate to the page *Agents > Show Agents* and click on the button *'+ New Agent'*. -2. From that page, you can either download the agent by clicking on the Download button, or copy and paste the provided url to download the agent using wget/curl: +2. On that page you can click on "..." and choose to download the agent binary or copy the URL of the agent binary and download the agent using wget/curl: + ``` -curl -o hastopolis.zip "http://:8080/agents.php?download=1" +curl -o hashtopolis.zip "http://:8080/agents.php?download=1" ``` ### Start and register a new agent @@ -87,13 +98,13 @@ source hashtopolis_env/bin/activate python hashtopolis.zip ``` -3. When prompted, provide the URL to the server API as provided in the Agents page of Hashtopolis (```http://:8080/api/server.php```). +3. When prompted, provide the URL to the server API as provided in the *+ New Agents* wizard of Hashtopolis (```http://:8080/api/server.php```). ``` Starting client 's3-python-0.7.2.4'... Please enter the url to the API of your Hashtopolis installation: http://localhost:8080/api/server.php ``` -4. On the server Agents page of Hashtopolis, create a new Voucher and copy it. +4. In the *+ New Agents* wizard of Hashtopolis, create a new Voucher and copy it. 5. Register the agent by providing the newly created token. ``` No token found! Please enter a voucher to register your agent: @@ -103,4 +114,4 @@ Collecting agent data... Login successful! ``` -Your agent is now ready to receive new tasks. If you wish to finetune the configuration of your agent, please consult the section related to the agent configuration file or the command line arguments in the Advanced installation section. Otherwise, to start using Hashtopolis, consult the Basic workflow section. +Your agent is now ready to receive new tasks. If you wish to fine-tune the configuration of your agent, please consult the [Agent Settings section](../user_manual/settings_and_configuration.md#agent-settings) or the specific parameters within the [agent overview](../user_manual/agents.md#agent-overview) page. Otherwise, to start using Hashtopolis, consult the [Basic workflow section](../user_manual/basic_workflow.md). diff --git a/doc/installation_guidelines/docker.md b/doc/installation_guidelines/docker.md index d3185ca92..79f1f0c2b 100644 --- a/doc/installation_guidelines/docker.md +++ b/doc/installation_guidelines/docker.md @@ -1,2 +1,55 @@ # Docker -Maybe a page here with some docker internals? \ No newline at end of file + +All the following commands need to be executed in the folder, where the docker-compose.yml-file is located. + +## Start the containers and run foreground: + +This is to see the logging output for debugging purposes. + +``` +docker compose up +``` + +## Start the containers and run in background: + +``` +docker compose up --detach +``` + +## Update your containers to the latest version: + +``` +docker compose down +docker compose pull +docker compose up +``` + +## Stop and remove the containers: + +``` +docker compose down +``` + +## List running containers: + +``` +docker compose ps +``` + Here you see the different containers (frontend, backend and db), that are need to run Hashtopolis. In addition you see, when the containers were created and since when they are running. + +## Access the database: + +``` +docker compose exec db mysql -u root -p +``` + +You will be prompted for the database-password (default is 'hashtopolis'). You can directly have a look at the data in the database there and alter it. This is not the supported way. Do this at your own risk! + +## Show the logs of a container: + +``` +docker compose logs db +docker compose logs hashtopolis-frontend +docker compose logs hashtopolis-backend +``` +You can have a look at the logs of the different containers, if something is going wrong. This may be needed for support purposes in the Discord-channel. \ No newline at end of file diff --git a/doc/installation_guidelines/tls.md b/doc/installation_guidelines/tls.md index 1b3e60242..ef2b7b613 100644 --- a/doc/installation_guidelines/tls.md +++ b/doc/installation_guidelines/tls.md @@ -1,8 +1,9 @@ # SSL/TLS Setup -On this page the setup proces will be described howto setup SSL for Hashtopolis. Before you continue it is highly recommanded to read [Docker](docker.md). + +This page describes how to set up SSL for Hashtopolis. ## Generate x509 Certificate -First create a folder were we are going to store all of our hashtopolis persistent files. +First, create a folder where all persistent Hashtopolis files will be stored. ```bash @@ -11,7 +12,7 @@ cd hashtopolis/ ``` -Next generate a self signed certificate +Next generate a self-signed certificate ```bash @@ -21,7 +22,7 @@ openssl req -x509 -newkey rsa:2048 -keyout nginx.key -out nginx.crt -days 365 -n ## Setting up docker-compose and env.example -Please see the [Install](../installation_guidelines/basic_install.md) page on how to download those settings file. +Refer to the [Basic installation](../installation_guidelines/basic_install.md) page on how to download those settings file. 1. Edit docker-compose.yaml @@ -41,9 +42,8 @@ Add the following new container to the `service:` section in the docker-compose. - 80:80 ``` -2. Create a nginx.conf - -Make sure that the server_name reflects your real server name. If you have changed the container names inside your docker-compose file, make sure to reflect those changes inside the nginx.conf file below. +2. Create a *nginx.conf* file +Ensure that server_name matches your actual server name. If you changed container names in docker-compose.yaml, update them in the *nginx.conf* file accordingly. ``` events { @@ -97,7 +97,7 @@ http { } ``` -3. Edit the `HASHTOPOLIS_BACKEND_URL` in `.env` to `https://localhost/api/v2` to reflect the changes done above. +3. Update the value of `HASHTOPOLIS_BACKEND_URL` in the `.env` file to reflect the changes done above. 4. Start the containers ``` @@ -105,4 +105,4 @@ http { docker compose up ``` -5. Visit hashtopolis on https://localhost/ the old ui is available via https://localhost/legacy \ No newline at end of file +5. Visit hashtopolis at https://localhost/ \ No newline at end of file diff --git a/doc/installation_guidelines/update.md b/doc/installation_guidelines/update.md index deb4a87b6..b98fa7687 100644 --- a/doc/installation_guidelines/update.md +++ b/doc/installation_guidelines/update.md @@ -2,18 +2,27 @@ # Updating Hashtopolis ## Upgrading to 0.14.0 (from non-Docker to Docker) -There are multiple ways to migrate the data from your non-docker setup to docker. You can of course completely start fresh; but if you want to migrate your data there are multiple ways to do this. -### Existing database (**formerly called New database**) +There are multiple ways to migrate data from a non-Docker setup to Docker. You can start fresh, but if you want to keep your data, several migration options are available. + +### Existing database You can reuse your old database server or also migrate the database to a docker container. -1. Install docker to your system (https://docs.docker.com/engine/install/ubuntu/) -2. Create a database backup mysqldump > hashtopolis-backup.sql -3. Make copies of the following folders, can be found in the hashtopolis folder along side the index.php: +1. [Install docker](https://docs.docker.com/engine/install/ubuntu/) to your system +2. Create a database backup using +``` +mysqldump > hashtopolis-backup.sql +``` + +3. Make copies of the following folders, located in the Hashtopolis directory next to index.php: - files - import - log -4. Download the docker compose file: wget https://raw.githubusercontent.com/hashtopolis/server/master/docker-compose.yml +4. Download the docker compose file: +``` +wget https://raw.githubusercontent.com/hashtopolis/server/master/docker-compose.yml +``` + 5. Edit the docker compose file ``` [...] @@ -29,15 +38,15 @@ You can reuse your old database server or also migrate the database to a docker wget https://raw.githubusercontent.com/hashtopolis/server/master/env.example -O .env ``` -7. Edit the .env file and change the settings to your likings nano .env - - Optional: if you want to test the new API and new UI, set the HASHTOPOLIS_APIV2_ENABLE to 1 inside the .env file. NOTE: The APIv2 and UIv2 are a technical preview. Currently when enable everyone through the new API will be fully admin! - - The HASHTOPOLIS_ADMIN_USER is only used during setup time and once you import the database backup will be replaced with your old data. +7. Edit the .env file and adjust the settings according to your desired configuration: + + - HASHTOPOLIS_ADMIN_USER is only used during initial setup. Once the database is imported, it will be overwritten with your previous data. 8. Create the folder which to referred to in the docker-compose, in our example we will use /usr/local/share/hashtopolis ``` sudo mkdir -p /usr/local/share/hashtopolis ``` -9. Copy the files, import, and log to the new location you refered to in the docker-compose file. +9. Copy the files, import, and log folders to the location referenced in the docker-compose file. ``` sudo cp -r files/ import/ log/ /usr/local/share/hashtopolis ``` @@ -48,9 +57,9 @@ mkdir /usr/local/share/hashtopolis/config ``` 11. Start the docker container docker compose up -12. Stop the backend container so that agents don't mess up the database mid migration docker +12. Stop the backend container to avoid agents interfering with the migration: ``` -stop hashtopolis-backend +docker compose stop hashtopolis-backend ``` 13. To migrate the data, first copy the database backup towards the db container: @@ -65,12 +74,11 @@ docker exec -it db /bin/bash 15. Import the data: ``` -mysql -Dhashtopolis -p < hashtopolis-backup.sql +mysql -D hashtopolis -p < hashtopolis-backup.sql ``` 16. Exit the container -17. Copy the content of the PEPPER from the *inc/conf.php* file and place them into *config/config*.json` -Example */var/www/hashtopolis/inc/conf.php*: +17. Copy the PEPPER value from *inc/conf.php* and paste it into *config/config.json*. For example, from */var/www/hashtopolis/inc/conf.php*: ``` [...] $PEPPER = [..., ..., ..., ...]; @@ -85,9 +93,9 @@ Becomes */usr/local/share/hashtopolis/config/config.json*: 18. Restart the compose docker compose down && docker compose up -### New database (**formerly called Existing database**) +### New database -Repeat all the steps above, but you don't need to export/import the database. Only make sure that you point the settings inside the .env file to your database server and that the database server is reachable from your container. +Repeat the above steps, but you do not need to export or import the database. Just ensure the .env file points to your database server and that it is reachable from the container. ## Upgrading from docker to docker (version 0.14.0 and up) 1. Stop your docker compose docker compose down @@ -99,7 +107,7 @@ Repeat all the steps above, but you don't need to export/import the database. On ***To be done*** -## New user interface: technical preview + diff --git a/doc/user_manual/advanced_manual.md b/doc/user_manual/advanced_manual.md deleted file mode 100644 index c39806fc2..000000000 --- a/doc/user_manual/advanced_manual.md +++ /dev/null @@ -1,209 +0,0 @@ -# Deep Dive Manual - -This page provides more details on each functionalities described in the basic workflow. Among other things it provides deeper details and advanced functionalities about the hashlists, tasks, or the management of the agents. - -## Hashlists In-Depth - -### Hashlists View -Ordered by ID by default. It reports the hashlists created. A tick is accolated to the name of the hashlists if all the passwords have been retrieved. It shows the number of retrieved passwords as well as the total number of hashes. It allows to import *pre-cracked hashes* or export the retrieved passwords (*see below for more details*). The hashlists can also be archived or deleted. - -### Hashlists Details -If you click on a Hashlist, either in the hashlists view, in the Tasks overview or inside a task, it brings you to the corresponding Hashlist details page. - -Apart from the parameters specific to this hashlist (i.e. ID, Access Group, Hashlist name, ...), the page displays some information about the total number of hashes, the number of cracked ones and the number of remaining ones to be recovered. Clicking on one of these three values will open a new window displaying information about the Hashes of the Hashlist as detailed below. - -#### Hashes of Hashlist X -This page list all the hashes from the related hashlist. Filters can be applied to show either the cracked, the uncracked or all the hashes. According to the display filter selected, the Hashes only, the plaintext only or both are displayed. Additionally, the cracking position (**to be defined**) can be displayed next to the cracked ones. Only 1000 hashes can be displayed at a time within a page but the user can navigate through the pages. The number of hashes per page can be configured in *Config > UI* settings. - -A HEX converter is present at the bottom of the page to convert any HEX values. This can be useful when the reported password is stored in a HEX format. - -#### Actions on the hashlist -Several actions are offered to the user which are detailed below. Note that some of the options are logically not available if no password have been retrieved for the specific hashlist. - -- **Download Report**: **will we still have this function** - -- **Generate Wordlist**: This action generates a file listing all the retrieved passwords from this hashlist. The file is automatically stored in the *wordlist* section of the *Files* section. The generated file can be easily retrieved as it got assigned to the latest file ID. The filename is *Wordlist_[Hashlist_ID]_[dd.mm.yyyy]_[hh.mm.ss].txt*. - -- **Export Hashes for pre-crack**: This action generates a file listing all the retrieved passwords from this hashlist associated with the corresponding hash value in the format *[hash]:[plaintext]*. The file is automatically stored in the *wordlist* section of the *Files* section. The generated file can be easily retrieved as it got assigned to the latest file ID. The filename is *Pre-cracked_[Hashlist_ID]_[dd-mm-yyyy]_[hh-mm-ss].txt*. - -- **Export Left Hashes**: This action generates a file listing all the hashes for which no password have been retrieved at the moment of the file creation. The file is automatically stored in the *wordlist* section of the *Files* section. The generated file can be easily retrieved as it got assigned to the latest file ID. The filename is *Leftlist_[Hashlist_ID]_[dd-mm-yyyy]_[hh-mm-ss].txt*. - -- **Import pre-cracked Hashes**: This action opens a new page in which the user can upload pre-cracked hashes for the related hashlist. A pre-crack is supposed to be a hash contained in the hashlist associated with a plaintext in the format *[hash](:[salt]):[plaintext]*. Such data can be imported in different ways: *"Paste, Upload, Import, URL downlaod"* such as the option to import the hashes during a hashlist creation (**see XXX**). In case of salted password, the field separator must be indicated, ':' being the default one. When validating by pressing the *Pre-crack hashes* button, the back-end will check if the imported data contains hash values from the targeted hashlist and integrate the plaintext value accordingly. If the option *Overwrite already cracked hashes* is selected, existing retrieved passworda will be overwritten by the new imported ones in case of conflict. The front-end is then reporting to the user how many hashes have been considered as well as how many entries have been updated. - -Pre-cracked management is useful to share results between different instances of hashtopolis. This is especially relevant for salted hashlits as each new recovered plaintext is improving the efficiency of the attack is there is no more hashes associated with the same salt value. - -#### Tasks overview and creation -At the bottom of the page there are three subsections related to task for this hashlist. - -- **Tasks cracking this hashlists**: This section lists all the tasks that are related to this hashlist. Note that supertasks will not appear here (**is this something we would like in the future... let see how it will be handled within project**). The details displayed are defined in the *Show Tasks* section as they are the same. Note that not all the infos present in the *Show Tasks* page are displayed here. - -- **Create pre-configured tasks**: this section lists all the existing pre-configured tasks. The user can select a set of pre-configured tasks and create the corresponding task for the current hashlist. See the section on *pre-configured tasks* for more detail on this. - -- **Create Supertask**: Similarly to the pre-configured tasks, this section lists all the existing supertask that the user can create for the current hashlist. See the section *supertask* for more details on this. - - -### Super Hashlists - -> [!NOTE] -> Should we include pictures in this section that is quite obvious - -A Super Hashlist is a virtual hashlist that combines multiple classic hashlists without duplicating data at the database level. It allows you to run a single cracking task on multiple hashlists at once. Since the hashes are only linked, not merged, storage is optimized, and updates to individual hashlists are immediately reflected. This is especially useful when working with related datasets that require the same attack strategies, saving time and resources while keeping everything well-organized. - -#### New SuperHashlist - -The page displays all the existing hashlists in the database. To create a new superhashlist, you need to do the following: -- select all the hashlists you want to integrate in the superhashlist; -- scroll down to the bottom of the page, and enter a name for the superhashlist in the corresponding field; -- Click on the *create* button. - -You can select all the hashlists at once by clicking on the button *select all*. However, keep in mind that a superhashlist should only contains hash of the same type to work. **We should probably introduce a check at the creation of the super list, and also allow to search or filters to only display those of a specific type to select all in a controlled manner** - -#### Overview - -Once you have created a superhashlist or if you open the *SuperHashlist* menu, the overview page of SuperHaslist is open. Such page diplays all the information about the superhashlists created so far. It is very similar to the hashlist overview page, the only difference being that you cannot archive a superhashlist. - -If you click on a superhashlist, the superhashlist detail page will be open. Again this page is very similar to the hashlist page. The only difference is that it contains the following details about the hashlist(s) contained in the superhashlist: -- ID of each hashlist -- Name of each hashlist -- Cracked percentage of each hashlist - - -### Search Hash - -This page displays a free text zone in which the user can type multiple hashes, one per line, to check if they are present in the database or not. The hashes do not need to be of the same type. Furthermore, the hash does not need to be complete. - -The result will display all the hashes that correspond to the given entry/ies. It will display one block for each entry specifying either: -- NOT FOUND: if the hash is present in no entries; -- A list of all the hashes that contains the given entry, specifying in which hashlist(s) they are contained and the cleartext password if they have been cracked already. - -

    - ![screenshot_import_file](https://upload.wikimedia.org/wikipedia/commons/8/80/Comingsoon.png?20120228065200){ width="300" } -
    - -### Show Crack - -This page displays all the cracked passwords that have been retrieved and that are stored in the database. It shows the following fields. -- **Time Found**: Indicates when the password has been retrieved -- **Plaintext**: Password that has been retrieved -- **Hash**: Hash for which the password was retrieved -- **Hashlist**: ID of the hashlist that contains this hash -- **Agent**: ID of the agent that has retrieved the password -- **Task**: ID of the task that has retrieved the password -- **Chunk**: ID of the chunk that has retrieved the password -- **Type**: Hashmode related to the hash -- **Salt**: Salt associated to the hash if relevant. - -1.000 entries are displayed per page and there is a search functionalities that is applied on all the field of the table. - -## Tasks in Depth - -### Advanced option during task creation -Several options were not covered in the basic workflow related to the creation of a task. The remaining options are described below. - -- **Set as preprocessor task**: Such option allows the usage of a preprocessor. By default hashtopolis is installed with a single preprocessor, namely [*Prince*](https://github.com/hashcat/princeprocessor). $Additional preprocessors can be defined in the *Config* page (see [XXX]() for more details). The command that should be used for this preprocessor must be defined in the free text zone below. A task defined with a preprocessor will result in the execution of the preprocessor redirecting the output as stdin for the command line defined above in the same task. This allows the usage of "external" candidate generator such as Prince. - -- **Skip a given keyspace at the beginning of the task**: Any value X inserted here will result in ignoring the first X values of the keyspace as it would be done with the flag "-s X" inserted in the command line. The rest of the keyspace will be processed normally. This can be useful to ignore a portion of the keyspace that has been already explored during a different process, for example on a local machine. - -- **Use Static Chunking**: If this option is enabled, the regular division in chunk (based on the chunktime and the benchmark of the agent) will be ignored. An alternative division is used depending of the choice made. - - *Fixed chunk size*: Each chunk will have a portion of the keyspace where the length is the value assigned (an integer) in the associated field. The last chunk of the task may be smaller than the defined length for completion. - - *Fixed number of chunks*: The keyspace will be divided in as many chunks as the number specified in the associated field. - -- Enforce Piping (to apply rules before reject): **will be removed soon** and is therefore not explained here. - -### Preconfigured tasks (including from existing task) -A preconfigured tasks is a basic template for a task that is not assigned yet to a hashlist. This is particularly useful to predefine task(s) that are often use such as generic mask attack or commonly used dictionary attack. A preconfigured task can later be assigned to a hashlist avoiding the user to redefine the same task every time. This section gives more details about this topic. - -When the user goes to the menu *New Preconfigured TasksThe properties of a pre-configured tasks are a subset of those of a regular task and are therefore not re-defined here. THe reader can refer to the dedicated section for reference (**put a ref here**). - -Once the pre-configured task is created, the user is brought to the *Preconfigured tasks* page that lists all the existing preconfigured tasks. Here the user can set the default priority as well as the maximum number of agents for this preconfigured tasks (**NOTE I believe these two options should already appear in the template of a preconfigured task**). Those values will be used as defaults upon creation of a task from this template. - -In addition to the possibility to delete a preconfigured task, two additional actions are offered to the user and are defined below. - -- **Copy to task**: This action opens a *new task* creaction page where all the pre-defined values of the preconfigured task are already prefilled. The user must select the hashlist for which the task should be created. All the other values can be modified by the user if needed. Note that there is the possibility to create a task from a pretask for a specific hashlist directly from the corresponding *Hashlist details* page. - -- **Copy to Pretask**: This action open a *New Preconfigured Tasks* Page where all the value of the corresponding pretask are duplicated. The user can then modify those values to create a new Preconfigured tasks. This is particularly useful if one want to slightly modify an existing preconfigured task, for example by adding a new placeholder in a mask or changing a rule file in a dictionnary attack. Note that while it is possible to create a perfect duplicate of a pretask there is no added-value in doing-so. - -#### Creating a preconfigured task from a task -In the *Show Tasks* page, there is an action offered for each task, namely **Copy to Pretask**. This option will create a template from the corresponding task by extracting all the required information. The default name extracted will be the current one from the task. The user can modify at will those values and finally create the preconfigured task from it. This is useful in case you have defined an attack that you want to store for future reuse. - - -### Super Task - -A SuperTask is a group of pre-configured tasks. A supertask can be directly applied to a hashlist resulting in the creation of all the underlying pre-configured tasks applied to this hashlist. - -> [!CAUTION] -> A supertask cannot be applied to a superhashlist. - -This is particularly useful when applying the same attack strategy to different hashlists. - -#### New SuperTask - -Similarly to the superhashlists, this page will display all the existing pre-configured tasks. The user needs to select all the pre-configured tasks that should be included in the supertask, give it a name, and press the *create supertask* button. - -#### Overview -Once a new supertask is created, or if you open the *SuperTask* menu, the overview page of SuperTask is open. It displays the ID of all the superhashlists and their names. Three options are proposed. - -- **Apply to Hashlist**: This option open a new page in which you can select the hashlist to which you want to apply the set of pre-configured tasks as well as the binary to use. -- **Show/Hide**: This option unfolds the supertask and displays the included preconfigured task(s) with the following information/options. - - **ID**: ID of the pre-configured task - - **Name**: Name of the pre-configured task. Clicking on it opens the corresponding pre-configured task page. - - **SubTask Priority**: define the order in which the pre-configured tasks will be executed when an agent is assigned to the supertask. Similarly to tasks, priority is given to the highest number. - - **SubTask Max Agents**: similarly to tasks, specifies the maximum agents that can be assigned to the task. - - **Remove**: remove the pre-configured task from the supertask. Note that the pre-configured task is only removed from the supertask but not deleted from the system except if the related pre-configured task was generated via the *Import Super Task* functionality (see below for more details). - -#### SuperTask in the *ShowTasks* Menu - -Supertask are not displayed as regular tasks in the *Show Task* menu as displayed in the picture below. - - -
    - ![screenshot_import_file](https://upload.wikimedia.org/wikipedia/commons/8/80/Comingsoon.png?20120228065200){ width="300" } -
    - -The same information than those of a task are displayed. The *copy to Pretask* and *copy to task* options are not available. There is instead an information button which open a pop-up window displaying the list of subtasks of the supertask. This window is identical to the ShowTasks page apart that only the subtasks of the supertask are diplayed in it as shown in the figure below. - -
    - ![screenshot_import_file](https://upload.wikimedia.org/wikipedia/commons/8/80/Comingsoon.png?20120228065200){ width="300" } -
    - -### Import Super Task - -The Import Super Task menu offers functionalities to create SuperTasks and the related pre-configured task in an easy manner. There exist two different ways to create those supertasks, *Masks* and *Wordlist/Rule bulk*. - -#### Masks - -This functionality allows the user to create a supertask from a mask file or a set of masks. It is a good alternative to replace the --increment option of hashcat that cannot be used in hashtopolis. - -- **Name**: Defines the name that will be given at the created SuperTask -- **Are small tasks**: If this parameter is set to yes, a single agent can be assigned to the tasks that will be created when the resulting supertask is apply to a hashlist. This is relevant for small tasks or to assign the full keyspace in a single chunk to an agent. Note that this is **NOT** equivalent to define the *Maximum number of agents* to 1. Indeed, in this latter case, the task will still be divided in chunks according to the *chunk size* parameter. The parameter is set to No by default. -- **Max Agents**: Specify the maximum agents that can be assigned to the tasks that will be created when the resulting supertask is apply to a hashlist. If this amount is reached, future available agents will be assigned to the next task available with a lower priority even if the all the chunks of the task have been distributed. The default value of 0 means that there is no maximum and therefore, all available agents are assigned to this tasks until all the chunks have been distributed. This functionality is helpful to only use a portion of the cluster for a specific task, and therefore allowing to split the workers on different tasks. -- **Are CPU tasks**: If this parameter is set to yes, only the agents that are declared as CPU only can be assigned to this task. More details can be found in **ref to advanced agents**. The parameter is set to No by default. -- **Use Optimized flag (-O)**: If this parameter is set to Yes, the optimized flag -O will be added to the command line of all the sub-tasks of this supertask. The -O flag in Hashcat enables the use of optimized kernels for better performance. This improves cracking speed yet it has an impact on some aspects such as limiting the maximum length of the candidates to be tested, e.g. from 256 to 55 in the case of MD5 or from 256 to 27 for NTLM. -- **Benchmark Type**: Select which benchmarking type should be used for the subtasks of the supertask. It is recommended to use the default *Speed Test* for mask attack. Only in few cases, such as tasks with big salted lists, the *Runtime* may be used. -- **Cracker Binary which is used to run this task**: This parameter specifies the binary type to use for this specific task. -- **Insert Masks**: The mask lines that will generate the subtask should be written here. The expected format is the one of a *.hcmask" file for hashcat. In a nutshell, there should be one mask per line following the format **[?1,][?2,][?3,][?4,]mask**, where [?x] specifies the optional charset that can be used in the mask. More details can be found [here](https://hashcat.net/wiki/doku.php?id=mask_attack). - -A subtask will be created for each line of the the *Insert masks* text zone and they will be grouped in a supertask. The subtasks are pre-configured task from the database point of view, however they are not diplayed in the *Preconfigured Tasks* page. The subtasks that will be generated in this supertasks will be ordered accordingly to their order in the *Insert masks* text zone giving the highest priority to the first line. - -> [!NOTE] -> Note that the options above will be applied to all the pre-configured tasks that will be created during the generation of the supertaks from this import. - -#### Wordlist/Rule bulk - -The wordlist/Rule bulk functionality allows to create a set of subtasks for an iteration of several files selected by the user. It allows for example to create an attack strategy of a succession of wordlists to be applied one after the other or to use different rule files with a single wordlist. - -Most of the options are identical to those of the Mask supertask creation. The main difference is that the *Insert Masks* is obviously not present and is replaced by the *Base Command* option. In this text zone the user is expected to type the command line that should be iterated. Similarly to the *New Task* page, *#HL#* is filled in by default in the command line. It is a placeholder for the hashlist and will be replaced automatically at execution time by the agent with the correct path to the hashlist file. The user then need to select the Rules and Wordlist to use in the supertask. When selecting a file as a base - wether a Rule file, a wordlist or other - the file is immediately added at the command line like in a regular task creation. - -Multiple files are expected to be selected as "Iterate". They should be of the same type (rules/wordlists/other), yet this functionality allows to select different type of files. The placeholder **FILE** should be manually placed by the user. During creation of the supertask, one subtask is created for each file selected as iterate replacing the FILE placeholder by one of the "Iterate File". - -Similarly to a regular task, any hashcat parameter can be added to the command line. For example, if the user wants that the Optimized Kernel option (-O) is used, it should be added. That is the reason why this option is not offered to the user among the options contrary to the *Import Masks*. - - -**MAKE AN EXAMPLE WITH SOME FIGURES** - -> [!CAUTION] -> If the iteration is done over rule files, the flag **-r** will not be added when FILE is replaced by the rule file. It should therefore be added in the command line as displayed in the example above. - -## New Binary - -- New Hashmode diff --git a/doc/user_manual/basic_workflow.md b/doc/user_manual/basic_workflow.md index 72223a68e..63c8bff60 100644 --- a/doc/user_manual/basic_workflow.md +++ b/doc/user_manual/basic_workflow.md @@ -1,9 +1,9 @@ # Basic Workflow for Your First Cracking Task -Before diving into Hashtopolis, it’s important to understand some key terms used throughout this manual and in the application itself: +Before using Hashtopolis, it's important to understand key terms commonly used in the manual and the application: -- **Agent**: An instance of the Hashtopolis client performing the actual password cracking using its associated hardware resources (e.g. GPUs and/or CPUs). -- **Hashlist**: A list of hashes stored in the database. Hashlists can be TEXT, HCCAPX, or BINARY, with most being TEXT format. +- **Agent**: A Hashtopolis client instance that performs password cracking using its available/associated hardware resources (e.g., GPUs and CPUs). +- **Hashlist**: A collection of hashes stored in the database. Hashlists are most commonly in TEXT, yet other formats like HCCAPX, or BINARY are also supported. - **Task**: A specific password cracking job, defined by a command line specifying all the parameters, files to use, hashlist to target and binary to use. - **Supertask**: A container grouping multiple subtasks together for easier management and monitoring. It is not a standalone cracking task. - **Subtask**: A smaller task within a supertask, which behaves like a normal task but whose priority matters only inside the supertask. @@ -48,7 +48,7 @@ Start by importing the hashes you want to crack: - Select the appropriate **hash type** (e.g., MD5, SHA1, NTLM). - Paste your hashes into the text field or upload a file. - Optionally assign the hashlist to a **group** to manage access permissions. -- Click **"Submit"** to create the hashlist. +- Click **"Create"** to create the hashlist. > [!NOTE] > Hash formats like plain text, HCCAPX (for WPA/WPA2), or binary dumps are supported. Make sure your input matches the expected format for the selected hash type. @@ -60,7 +60,7 @@ Start by importing the hashes you want to crack: To perform most attacks, you’ll need additional resources like wordlists or rule files: - Go to the corresponding type of files in the **"Files"** section, for example **"Wordlists"**. -- Click **"+ New Wordlists"** and select the file to upload (or provide the link to the file). +- Click **"+ New Wordlist"** and select the file to upload (or provide the link to the file). - Optionally assign it to a **group**. - Click **"Create"** to store the file on the server. @@ -72,15 +72,19 @@ Uploaded files can later be linked to tasks. Now you’re ready to define your first cracking job: -- Navigate to **"Tasks"** and click the button **"+ New Task"**. +- Navigate to **"Tasks > Show Tasks"** and click the button **"+ New Task"**. - Provide a task name and select the hashlist created in step 1. -- Enter the **Attack command** for your deisered process. Note that the placeholder **#HL#** is placed by default in the command. It represents the hashlist you have selected and you therefore don't need to type it manually. The binary to use also does not need to be typed as it is added automatically by the tool. If you want to use files, they must have been uploaded to the server first. They appear in the right folding menu. By clicking on the box next to the file, they are automatically added to the command line, including the '-r' flag for rules files. +- Enter the **Attack command** for your desired process. The placeholder #HL# is included by default and represents the selected hashlist, so you don’t need to add it manually. The cracker selected by default (e.g. hashcat) is also automatically added to the command line by the agent. If you need to use files, they will appear in the right-hand menu assuming you have already uploaded them. Clicking the checkbox next to a file adds it to the command line, including the '-r' flag if it is a rule file. > [!NOTE] > A simple mask attack of 4 digits would therefore be the following command line: > ```#HL# -a3 ?d?d?d?d``` -- Choose a **priority** superior to 0 if you want the task to start. +- Choose a **priority** superior to 0 if you want the task to start. +> [!TIP] +> To allow a task with priority 0 to start, you can adjust this behavior via ["Settings > Task/Chunk > Automatic Assignment of Tasks with Priority 0"](/user_manual/settings_and_configuration/#command-line-misc) - Click on the button **"Create"**. + + The task will automatically be assigned to available agents if it has the highest priority value. --- @@ -90,7 +94,7 @@ The task will automatically be assigned to available agents if it has the highes Once the task is active, you can track its status and results: - Go to the **"Tasks"** page to see overall task progress, speed, and number of passwords retrieved. -- Click on the task to view detailed progress and many other information. +- Click on the task to view detailed progress and more information. - Cracked passwords will appear in the task view. > [!TIP] @@ -105,6 +109,6 @@ Once the task is active, you can track its status and results: - **Don’t** use multiple wordlists with attack mode 0, Hashtopolis currently supports only a single wordlist per task. - **Don’t** use the `--increment` flag in your command line, as it is not supported. - **Be cautious** with the `--slow-candidates` option, it may cause performance issues or unexpected behavior. -- **Don’t** create extremely large tasks as **small task**, as it is against the principle of parallelisation of hashtopolis. +- **Don’t** create extremely large tasks as **small task**. This goes against Hashtopolis’s parallel processing design.. - **Do** monitor your agents’ performance to adjust chunk sizes or task priorities as needed. diff --git a/doc/user_manual/tasks.md b/doc/user_manual/tasks.md index f345ea8a9..cf1e1be70 100644 --- a/doc/user_manual/tasks.md +++ b/doc/user_manual/tasks.md @@ -4,7 +4,7 @@ Tasks are the core of Hashtopolis operations — they define how password cracki ## Task Creation -To create a new task, click on the button *'+ New Task* in the page *Tasks > Show Task*. You will get the following window in which you can create a new task. Some of the fields are mandatory, some others are filled with default values. +To create a new task, click on the button "+ New Task" in the page *Tasks > Show Task*. You will get the following window in which you can create a new task. Some of the fields are mandatory, some others are filled with default values. ### Basic Parameters diff --git a/doc/user_manual/user-settings.md b/doc/user_manual/user-settings.md new file mode 100644 index 000000000..4b3390dbc --- /dev/null +++ b/doc/user_manual/user-settings.md @@ -0,0 +1,43 @@ +# User Settings + +This section describes the account settings that each user can set. + +## Account Settings + +The account settings offer an easy way to change the stored e-mail address of the currently logged in user as well as the password. When changing the password, the use of a 12-digit password using the entire character set leads to the visualization of a particularly strong password. + +## UI Settings + +The UI settings offer the option of adjusting the date and time format to your own preferences and switching between dark and light mode. + +## Notifications +It is possible to be informed about various events via different channels. The following channels are currently supported: + +- Chatbot +- Discord +- Email +- Telegram +- Slack + +A notification can be triggered for the following triggers (if you are allowed to receive this information depending on your access group): + +- **agentError**: When one of the agents throws an error +- **ownAgentError**: When your agent (as agent owner) throws an error +- **deleteAgent**: When an agent was deleted +- **newTask**: When a new Task was created +- **TaskComplete**: When a Task was completed +- **deleteTask**: When a task was deleted +- **newHashlist**: When a new hashlist was created +- **deleteHashlist**: When a hashlist was deleted +- **hashlistAllCracked**: When all hashes in a hashlist got cracked +- **hashlistCrackedHash. When any hash got cracked - **warning**: You could receive a lot of notifications if you try to crack a large hashlist. +- **userCreated**: When a new user was created +- **userDeleted**: When a user was deleted +- **userLoginFailed**: When a user login failed +- **logWarn**: When there are logs on warn level +- **logFatal**: When there are logs on fatal level +- **logError**: When there are logs on error level + +To set up notification, click on the **New Notification** button. The trigger and then the channel are selected. + +To complete the setup of the notifications, a so-called recipient must be specified. This can be an e-mail address or a special Telegram token, for example. To find the right receiver, please refer to the external documentation of the channels offered, as this can change constantly in a dynamic environment. \ No newline at end of file diff --git a/doc/user_manual/user_manual.md b/doc/user_manual/user_manual.md deleted file mode 100644 index 70f5dcebd..000000000 --- a/doc/user_manual/user_manual.md +++ /dev/null @@ -1,172 +0,0 @@ -# Basic Workflow - -This page describes the basic workflow required to launch your first cracking task. -It provides a high-level overview of the key steps needed to get started: - -- Uploading hash lists; -- Uploading files; -- Creating a task; -- Monitoring the task and the results. -Each of these steps is covered in more detail in the advanced section **link**, but for now, this guide will walk you through the essentials to get your first task up and running. - -> [!NOTE] -> It is assumed that you have already access to a fully functional hashtopolis installation with at least one agent up and running. If it is not the case, please refer to the installation section **link**. - -## Hashlists -Hashtopolis utilizes hashlists to store password hashes you want to crack. These lists can be in plain text, HCCAPX, or binary format. Some hashes might include additional information like salts, depending on the format. -This section details the creation of a hashlist within the Hashtopolis interface. Note that at least one hashlist is required for creating tasks. -Refer to the Hashcat documentation for detailed information on supported hash types and their expected formats. You can also use the example hashes provided there as a test to create your first hashlist. - -### Create a hashlist -In the Hashtopolis web interface, navigate to *Lists > New Hashlist*. You will get the following window: - -
    - ![screenshot_hashlist](https://upload.wikimedia.org/wikipedia/commons/8/80/Comingsoon.png?20120228065200){ width="300" } -
    - -Here is how to fill in the different fields: - -1. **Name**: Provide a descriptive name for your hashlist. -2. **Hash Type**: Select the appropriate hash type from the dropdown menu. Suggestions will appear as you enter text. -3. **Hashlist Format**: Choose the format for your hashlist: - - Text File: Paste or upload a plain text file containing one hash per line. - - HCCAPX/PMKID: Upload a HCCAPX file containing password hashes. - - Binary File: Upload a binary file containing password hashes. -4. **Salted Hashes**: Tick the box related to salted hashes if appropriate and provide the correct separator for your hashlist. The flag is enabled/disabled according to the settings defined in the Hashtype section (**see hashtypes REF**). If the provided salt(s) is in hex, the following flag needs to be enabled otherwise the salt will be interpreted as an ascii value (**is it ASCII or UTF8???**). -5. **Hash source**: Select one of the following hash source types. -6. **Providing the hash**: The last field of the form will automatically adapt depending on the chosen source type. You’ll be asked to provide additional details: - - **Paste**: Copy and paste the hashes directly into the "Input" field. - - **Upload**: Select a file containing the hashes from your computer. - - **URL Download**: Provide a URL to download the hashlist. - - **Import**: This option can be used as a workaround in case of upload errors with the first version of the user interface. To import a file, first copy it to the import folder as described in the section Import a new file. -7. **Access Group**: Modify the access group associated with the hashlist if needed. -8. **Create Hashlist**: Click "Create Hashlist" to finalize the process. This will open a new page displaying the details of your newly created hashlist. - -## Files: Rules, Wordlist and other -When creating a password recovery task in Hashtopolis, you may need to upload additional files to the server, depending on the type of attack you want to perform. These files fall into three main categories: - -1. **Rules** - Rules files contain sets of instructions for dynamically modifying entries in a wordlist during an attack. By applying rules, you can generate variations of passwords without the need for additional wordlist files. For example, rules can: - - - Append numbers or special characters. - - Replace or capitalize specific characters. - - Reverse words or combine entries. - - Rules are commonly used alongside wordlist attacks to increase the range of password candidates efficiently. - -2. **Wordlist** - Wordlists, also known as dictionaries, are used in dictionary attacks. Each line in a wordlist is treated as a potential password candidate. Examples include: collections of commonly used passwords, specialized dictionaries tailored to a specific target or context. - -3. **Others:** - This category includes any additional files required for specific attack types or configurations. Examples include … These files vary depending on the nature of the task and the tools being used. -Files can be uploaded to the Hashtopolis server from the Files page. To begin, select the appropriate file category by clicking on one of the tabs: Rules, Wordlists, or Other. The following figure illustrates the selection of the Rules category. - -
    - ![screenshot_files](https://upload.wikimedia.org/wikipedia/commons/8/80/Comingsoon.png?20120228065200){ width="300" } -
    - -Once a category is selected, files can be added to the server using one of the following methods: - -- **Upload from your computer** – Directly upload files stored on your local machine. -- **Import from an import directory** – Use files that have been preloaded into the server’s import directory. -- **Download from a URL** – Provide a URL to fetch files from an external source. -Detailed instructions for each upload method are provided in the following subsections. - -### Upload a new file from the computer - -
    - ![screenshot_new_file](https://upload.wikimedia.org/wikipedia/commons/8/80/Comingsoon.png?20120228065200){ width="300" } -
    - -1. **Add file**: Click this button to enable file upload.. After clicking, a new field labeled Choose file will appear. Each time you click on Add File, an additional Choose file field will be added, allowing you to upload multiple files simultaneously.. -2. **Associated Access Group**: Define the access group that will have permissions to access the file(s) you are uploading. -3. **Choose file**: Click this button to open your computer’s file explorer. Select the file you wish to upload. -4. **Upload files**: Once you have selected all the files you wanted to upload, click the Upload files button. - -### Import a new file -When dealing with large files, such as wordlists, rules, or hashlists, you may encounter issues uploading them via the v1 of the Hashtopolis User Interface.. Common errors include exceeding the maximum upload size or experiencing a connection timeout. To bypass these limitations, you can use the import functionality of Hashtopolis. - -- **Copy the file to the import folder**: Place the file in the designated import directory on the Hashtopolis server. If you are using the default Docker Compose setup, you can achieve this with the following command: -``` -docker cp hashtopolis-backend:/usr/local/share/hashtopolis/import/ -``` - -- **Import the file**: - -
    - ![screenshot_import_file](https://upload.wikimedia.org/wikipedia/commons/8/80/Comingsoon.png?20120228065200){ width="300" } -
    - -1. **Associated Access Group**: Define the access group that will have permissions to access the file(s) you are uploading. -2. **Select the files to import** by ticking the box in front of them. Alternatively, use Select All below. -3. **Import files**. - -### Download new file from URL - -
    - ![screenshot_download_file](https://upload.wikimedia.org/wikipedia/commons/8/80/Comingsoon.png?20120228065200){ width="300" } -
    - -1. **Associated Access Group**: Define the access group that will have permissions to access the file(s) you are uploading. -2. **URL**: Provide the URL to download from.. -3. **Download file**. - -### Manage Files -Navigating to the Files page of the Hashtopolis User Interface, you can manage the files uploaded to the server. - -
    - ![screenshot_manage_file](https://upload.wikimedia.org/wikipedia/commons/8/80/Comingsoon.png?20120228065200){ width="300" } -
    - -1. **Select Category**. -2. **Secret**: Files that are marked as secret will only be sent to trusted agents. -Line count: Reprocess the file and update the line count with the number of lines contained in the file. -3. **Edit**: Edit the parameters of the file (name, file type and associated group). -4. **Delete**: Removes the file from Hashtopolis. - -## Tasks - -To create a new task, you have to navigate to *Tasks > New Task*. You will get the following window in which you can create a new task. Some of the fields are mandotory, some others are filled with default values. - -1. **Name**: provide a name for the task you want to create. This is how the task will be referenced with during the monitoring phase (see **link**) therefore it should be relatively explicit to facilitate its monitoring. - -2. **Hashlist**: select the hashlist you want to target in this specific task. Tasks are ordered by their IDs. Supertasks (**see ref to advanced usage**) are at the bottom of the list ordered by their respective IDs. - -3. **Command Line**: provide in this field the attack command that will be executed by the agent on the targeted hashlist using the selected binary (see below). Note that *#HL#* is filled in by default in the command line. It is a placeholder for the hashlist and will be replaced automatically at execution time by the agent with the correct path to the hashlist file. Therefore you should not remove it nor include the filename for the hashlist. If for example you want to perform a mask attack of 6 digits, the command line would look like ```#HL# -a3 ?d?d?d?d?d?d```. -In case you want to perform a dictionary attack with rules, you have to select the corresponding files in the right table. If it is a wordlist, select it within the right column corresponding to T/Task. The Preprocessor part is explained in the advanced section. If it is a rule file, select first the rule tab (see **ref to the picture**) and then select the desired rule file. Note that upon selection of a rule file, the name of the file is included in the command line and automatically include the required '-r' flag. - -4. **Priority**: Assign a priority number to the task. The expected value has to be an integer. Agents will be assigned to tasks in decreasing order of priority. A task with a priority 0 will not be processed even if agents are available. Default value is 0. - -5. **Maximum number of agents**: Specify the maximum agents that can be assigned to the task. If this amount is reached, future available agents will be assigned to the next task available with a lower priority even if the all the chunks of the task have been distributed. The default value of 0 means that there is no maximum and therefore, all available agents are assigned to this tasks until all the chunks have been distributed. This functionality is helpful to only use a portion of the cluster for a specific task, and therefore allowing to split the workers on different tasks. - -6. **Task Notes** - *optional*: This field allows the user to indicate some details about the tasks, the command line or any other details the user can find relevant. - -7. **Color** - *optional*: Can assign a color in a Hex color code format #RRGGBB. Default value is white #FFFFFF. This can be useful in the monitoring part to visually recognise a task or a set of tasks. - -8. **Chunk size**: This parameter defines the duration that each agent should take to process a chunk for this task (**chunk should be define at some point in the general context of hashtopolis**). The default value is defined in the Settings (**ref to settings page XXX**). - -9. **Status timer**: Defines the frequency with which each agent report its progress for this task to the server. The default value is defined in the Settings (**ref to settings page XXX**). - -10. **Benchmark Type**: Select which benchmarking type should be used for this task. In most of the cases, it is recommended to use the default *Speed Test*. Only in few cases, such as tasks with big salted lists, the *Runtime* may be used. - -11. **Task is CPU only**: If this flag is enabled, only the agents that are declared as CPU only can be assigned to this task. More details can be found in **ref to advanced agents**. The flag is disabled by default. - -12. **Task is small**: If this flag is enabled, a single agent can be assigned to this task. This is relevant for small tasks or to assign the full keyspace in a single chunk to an agent. Note that this is **NOT** equivalent to define the *Maximum number of agents* to 1. Indeed, in this latter case, the task will still be divided in chunks according to the *chunk size* parameter. The flag is disabled by default. - -13. **Binary type to run the task**: This pair of parameters specify the binary type as well as the version of the binary to use for this specific task. It will by default use the latest uploaded version of the first binary type defined in the *Binaries* section (**see binaries for more details**). - - -Do and Don't -- multiple wordlists do not work -- increment do not work -- --slow-candidates may not be a good idea -- others? - -## Monitoring - - -# Future Work -- Project structure -- LDAP -- Permission Scheme -- (Ref to the sprints) diff --git a/doc/user_manual/users.md b/doc/user_manual/users.md index cdb870e1b..a980810d4 100644 --- a/doc/user_manual/users.md +++ b/doc/user_manual/users.md @@ -11,16 +11,46 @@ For example, the last login date and the associated permission group are tracked ### Creating a new User -To create a new user you have to click on New-User. You can then specify a user name and the corresponding e-mail address. In addition, the user must be given appropriate rights, i.e. assigned to a so-called permission group +Click on the **+ New User** button to create a new user which will open the user creation page as displayed below. You can then specify a user name and the corresponding e-mail address. In addition, the user must be given appropriate rights, i.e. assigned to a so-called permission group
    - ![screenshot_new_user](/assets/images/new_user.png){ width="600" } + ![screenshot_new_user](../assets/images/new_user.png){ width="600" }
    +### Edit user to set a password -## Global Permissions +If an email server has not been properly set, it is necessary for the admin to set a password for the newly created user to give her the possibility to login. To do this, click on **edit-user** in the action field for this user as depicted on the picture below. A freely chosen password can then be set. The newly created user can now log in with a user name and password. The rights that the user has are defined in the corresponding permission group and determine which areas will be visible and editable for the new user (see the [Access management](users.md#access-management) section). +
    + ![screenshot_new_user](../assets/images/edit_user.png){ width="600" } +
    + +In addition, users can be deactivated. A deactivated user can no longer log in. He will receive the error message **Check Credentials**. Deactivated users can be reactivated at any time by an admin. + + + +## Access Management + +The tool offers the possibility to define broad and very detailed access authorizations not only at user level. In the Access Group Management of Hashtopolis we distinguish between two essential components. On the one hand the so-called **Global Permissions** and on the other hand the **Access Groups**. Both areas can be found under the **Users** menu item. + +### Global Permissions +The very first step is to create the global permission group. This can be easily created using the **+ New** button. Only a name is initially selected in the creation step. + +In the second step, the authorizations of the created permission group must be defined. To do this, simply click on **Edit Permission Group** in the overview area. We can now define which rights the global permission group should have for the individual access areas. We differentiate here between the **Create**, **Read**, **Update** and **Delete** events. Depending on the access area, there are dependencies, for example it is partly predefined that the authorization **Create Agent** must also receive the authorization **Reg Voucher**, as the two processes are technically linked. Nevertheless, authorizations can be defined in fine granularity. + +We now drag the link to the user administration. Each user must be a member of a permission group, which is selected when the user is created. This ensures that the user has defined authorizations at all times and can only see the areas that are intended. It is important to note that a user can only be a member of a single permission group. The permission group can be changed via the settings under **Edit User**. The individual members of a permission group can be viewed under **Edit Permission Group**. This logic also means that a permission group can only be deleted when no more users belong to it, so that it has been ensured that the users have been transferred to another permission group. + +### Access Groups +In the global permissions, we have defined what rights users are generally allowed to have. For example, creating an agent or registering a voucher. The access groups now define the specific objects on which these rights can be executed. Let's do an example of this: + +When creating a hash list, I have to define which access group this hash list is assigned to. As a user with the global permission **Create Task,** I can now only see the hash list when creating the task if I am also a member of the corresponding access group. The Access Group can therefore regulate who can see, use and work with which files. +The same applies to the agents. I can therefore use the access groups to control who gets which access to my computing resources. + +In contrast to the permission groups, a user can be a member of none, one or more access groups in order to keep the options offered by Hashtopolis as flexible as possible. -## Access Groups +To create a new Access Group, click on **New Access Group**. As with the global permissions, only a name is initially defined here. +The group can then be edited in more detail. +To edit the group, click on **Edit Access Group** in the overview area again. I can now specify which user and which agent should be added to this access group. Please note the following: When an agent is created, it is automatically assigned to the **default** Access Group. If I want to change this, it must be done here. The reason for this is that the owner of an agent should not change the assignment to an Access Group. Otherwise, an agent owner could make this setting in the agent details. +Let's explain this in more detail using a practical example: When a task is created, the access group is derived from the associated hashlist, as an access group must be selected when the hashlist is created. Now Hashtopolis looks at which agents are in my access group and the task is only distributed to the agents in the corresponding access group. Agents outside the access group would not be addressed. Of course, it is possible that an agent is a member of different access groups, so it is possible that agents are still busy with tasks from other access groups. diff --git a/mkdocs.yml b/mkdocs.yml index 2ac00d0a6..10bb1645c 100644 --- a/mkdocs.yml +++ b/mkdocs.yml @@ -20,6 +20,7 @@ nav: - user_manual/crackers_binary.md - user_manual/settings_and_configuration.md - user_manual/users.md + - user_manual/user-settings.md - FAQ and Tips: - faq_tips/faq.md - faq_tips/tips.md From 37746285135b9f80d0a51827296f62e23e14338e Mon Sep 17 00:00:00 2001 From: coiseiw Date: Tue, 24 Jun 2025 12:23:51 +0200 Subject: [PATCH 093/691] Fixing all the absolute link to relative ones + some typos --- .vscode/settings.json | 3 + README.md | 74 ------------------- ...{notes_manual.md => TODO-notes_manual.txt} | 7 +- doc/index.md | 12 +-- doc/user_manual/agents.md | 10 +-- doc/user_manual/basic_workflow.md | 4 +- doc/user_manual/crackers_binary.md | 2 +- doc/user_manual/files.md | 2 +- doc/user_manual/hashlist.md | 14 ++-- doc/user_manual/tasks.md | 30 ++++---- doc/user_manual/user-settings.md | 4 +- 11 files changed, 43 insertions(+), 119 deletions(-) delete mode 100755 README.md rename doc/{notes_manual.md => TODO-notes_manual.txt} (76%) diff --git a/.vscode/settings.json b/.vscode/settings.json index 2ec2ed860..9a7729930 100644 --- a/.vscode/settings.json +++ b/.vscode/settings.json @@ -22,7 +22,10 @@ "hashlist", "hashlists", "Hashtopolis", + "Hashtype", "keyspace", + "superhashlist", + "superhashlists", "supertask", "Supertasks", "wordlist", diff --git a/README.md b/README.md deleted file mode 100755 index 429601861..000000000 --- a/README.md +++ /dev/null @@ -1,74 +0,0 @@ -# Hashtopolis - -Hashtopolis - -[![CodeFactor](https://www.codefactor.io/repository/github/hashtopolis/server/badge)](https://www.codefactor.io/repository/github/hashtopolis/server) -[![LoC](https://tokei.rs/b1/github/hashtopolis/server?category=code)](https://github.com/hashtopolis/server) -[![Hashtopolis Build](https://github.com/hashtopolis/server/actions/workflows/ci.yml/badge.svg)](https://github.com/hashtopolis/server) - -Hashtopolis is a multi-platform client-server tool for distributing hashcat tasks to multiple computers. The main goals for Hashtopolis's development are portability, robustness, multi-user support, and multiple groups management. -The application has two parts: - -- **Agent** Python client, easily customizable to suit any need. -- **Server** several PHP/CSS files operating on two endpoints: an Admin GUI and an Agent Connection Point - -Aiming for high usability even on restricted networks, Hashtopolis communicates over HTTP(S) using a human-readable, hashing-specific dialect of JSON. - -The server part runs on PHP using MySQL as the database back end. It is vital that your MySQL server is configured with performance in mind. Queries can be very expensive and proper configuration makes the difference between a few milliseconds of waiting and disastrous multi-second lags. The database schema heavily profits from indexing. Therefore, if you see a hint about pre-sorting your hashlist, please do so. - -The web admin interface is the single point of access for all client agents. New agent deployments require a one-time password generated in the New Agent tab. This reduces the risk of leaking hashes or files to rogue or fake agents. - -There are parts of the documentation and wiki which are not up-to-date. If you see anything wrong or have questions on understanding descriptions, join our Discord server at https://discord.gg/S2NTxbz. - -To report a bug, please create an issue and try to describe the problem as accurately as possible. This helps us to identify the bug and see if it is reproducible. - -In an effort to make the Hashtopussy project conform to a more politically neutral name it was rebranded to "Hashtopolis" in March 2018. - -## Features - -- Easy and comfortable to use -- Dark and light theme -- Accessible from anywhere via web interface or user API -- Server component highly compatible with common web hosting setups -- Unattended agents -- File management for word lists, rules, ... -- Self-updating of both Hashtopolis and Hashcat -- Cracking multiple hashlists of the same hash type as though they were a single hashlist -- Running the same client on Windows, Linux and macOS -- Files and hashes marked as "secret" are only distributed to agents marked as "trusted" -- Many data import and export options -- Rich statistics on hashes and running tasks -- Visual representation of chunk distribution -- Multi-user support -- User permission levels -- Various notification types -- Small and/or CPU-only tasks -- Group assignment for agents and users for fine-grained access-control -- Compatible with crackers supporting certain flags -- Report generation for executed attacks and agent status -- Multiple file distribution variants - -## Setup and Usage - -Please visit the [wiki](https://github.com/hashtopolis/server/wiki) for more information on setup and upgrade. - -Some screenshots of Hashtopolis (by winxp5421 and s3in!c): [Imgur1](http://imgur.com/gallery/Fj0s0) [Imgur2](http://imgur.com/gallery/LzTsI) - -## Contribution Guidelines - -We are open to all kinds of contributions. If it's a bug fix or a new feature, feel free to create a pull request. Please consider some points: - -* Just include one feature or one bugfix in one pull request. In case you have two new features please also create two pull requests. -* Try to stick with the code style used (especially in the PHP parts). IntelliJ/PHPStorm users can get a code style XML [here](https://gist.github.com/s3inlc/226ed78b05eb6dc8f60f18d6fd310d74). - -The pull request will then be reviewed by at least one member and merged after approval. Don't be discouraged just because the first review is not approved, often these are just small changes. - -## Thanks - -* winxp5421 for testing, writing help texts and a lot of input ideas -* blazer for working on the csharp agent and hops for working on the python agent -* Cynosure Prime for testing -* atom for [hashcat](https://github.com/hashcat/hashcat) -* curlyboi for the original [Hashtopus](https://github.com/curlyboi/hashtopus) code -* 7zip binaries are compiled from [here](https://sourceforge.net/projects/sevenzip/files/7-Zip/16.04/) -* uftp binaries are compiled from [here](http://uftp-multicast.sourceforge.net/) diff --git a/doc/notes_manual.md b/doc/TODO-notes_manual.txt similarity index 76% rename from doc/notes_manual.md rename to doc/TODO-notes_manual.txt index 46ff6c7c0..d1dcd39ef 100644 --- a/doc/notes_manual.md +++ b/doc/TODO-notes_manual.txt @@ -3,11 +3,6 @@ - lots of screenshots and diagrams to make the text fancier - details about the config files, structure of repos etc. - booting from PxE, running hashtopolis as a service ? -- Make the docker page - Check if any difference for Agent overview in new interface -- Acces management -- Health Checks -- Log -- All users and admin settings - Hashtypes -- Binaries section \ No newline at end of file +- make an example of import super task to make it clearer diff --git a/doc/index.md b/doc/index.md index baf9306b9..f54940708 100644 --- a/doc/index.md +++ b/doc/index.md @@ -28,7 +28,7 @@ Hashtopolis operates on a **client-server architecture**: - The **agents** are lightweight Python clients installed on various computing resources. They communicate with the server by requesting work, execute cracking tasks using Hashcat, and report results back to the server. -A detailed [Basic Workflow](/user_manual/basic_workflow/) section is available for new users providing step-by-step guidance on how to operate Hashtopolis. Here, we provide a concise overview of what happens once a hash or hashlist is uploaded and a cracking task is created: +A detailed [Basic Workflow](./user_manual/basic_workflow.md) section is available for new users providing step-by-step guidance on how to operate Hashtopolis. Here, we provide a concise overview of what happens once a hash or hashlist is uploaded and a cracking task is created: 1. Agents that currently have no assigned work send requests to the server via API calls asking for new tasks. @@ -58,8 +58,8 @@ The pull request will then be reviewed by at least one member and merged after a This manual aims to describe all the functionalities and settings existing in Hashtopolis. In particular, you can find the following sections: -- [**Basic Workflow**](/user_manual/basic_workflow/): Tailored for new users unfamiliar with Hashtopolis. It describes the most important features to know in order to have your first tasks running. -- [**Installation Guidelines**](/installation_guidelines/basic_install/): Covers basic installation steps to deploy a Hashtopolis instance. It also contains advanced installation procedures for air-gapped environments, HTTPS configuration, as well as many other advanced features. -- [**User Manual**](/user_manual/agents/): goes deeper than the basic workflow into each aspect of Hashtopolis. This aims to cover all the existing features and settings. -- [**FAQ and Tips**](/faq_tips/faq/): gathers most of the questions that were asked on different channels (discord, wiki, etc.). -- [**API Reference**](/apiv2/): contains all the details related to the API in case you need to automate some processes or want to develop your own front end. \ No newline at end of file +- [**Basic Workflow**](./user_manual/basic_workflow.md): Tailored for new users unfamiliar with Hashtopolis. It describes the most important features to know in order to have your first tasks running. +- [**Installation Guidelines**](./installation_guidelines/basic_install.md): Covers basic installation steps to deploy a Hashtopolis instance. It also contains advanced installation procedures for air-gapped environments, HTTPS configuration, as well as many other advanced features. +- [**User Manual**](./user_manual/agents.md): goes deeper than the basic workflow into each aspect of Hashtopolis. This aims to cover all the existing features and settings. +- [**FAQ and Tips**](./faq_tips/faq.md): gathers most of the questions that were asked on different channels (discord, wiki, etc.). +- [**API Reference**](./apiv2.md): contains all the details related to the API in case you need to automate some processes or want to develop your own front end. \ No newline at end of file diff --git a/doc/user_manual/agents.md b/doc/user_manual/agents.md index 12d10d262..a472aa620 100644 --- a/doc/user_manual/agents.md +++ b/doc/user_manual/agents.md @@ -4,7 +4,7 @@ An **agent** is an instance of the Hashtopolis client that performs password cra Agents are not necessarily tied to a full system — multiple agents can run on the same physical machine, each targeting a specific device. For example, a server with multiple GPUs can host several agents, each bound to a different GPU, allowing fine-grained control and parallel task execution. -For installing new agents, please refer to the [dedicated section](/installation_guidelines/basic_install/#agent-installation) within the installation manual. +For installing new agents, please refer to the [dedicated section](../installation_guidelines/basic_install.md#agent-installation) within the installation manual. ## Show Agents @@ -34,7 +34,7 @@ This page provides a visual overview of the status of all agents, including real - Visual graphs showing **device utilization** for both CPU and GPU agents. - Temperature readings for each device, helping detect overheating or hardware issues. -In those visuals, the following colour code is used: +In those visuals, the following color code is used: - **Green**: All good - **Orange**: Warning @@ -66,10 +66,10 @@ Clicking on an individual agent from the lists above brings you to the **Agent O - **Assignment**: Current task and chunk assigned to this agent. - **Time Spent Cracking**: Total time the agent has spent actively cracking hashes. -Similar to the ***Agent Status*** page, visuals of the recent temperature evolution and utilisation evolution of all devices associated to this agent are displayed here. +Similar to the ***Agent Status*** page, visuals of the recent temperature evolution and utilization evolution of all devices associated to this agent are displayed here. - **Device(s) Temperatures**: Current temperatures of GPUs and/or CPUs. -- **Device(s) Utilisation**: Current utilization percentages for each device. -- **Agent Average CPU Utilisation**: Average CPU usage over a recent period. +- **Device(s) Utilization**: Current utilization percentages for each device. +- **Agent Average CPU Utilization**: Average CPU usage over a recent period. - **Error Messages**: Any error messages generated by the agent or Hashcat. - **Dispatched Chunks**: Display information about the last 50 chunk assigned to this agents. \ No newline at end of file diff --git a/doc/user_manual/basic_workflow.md b/doc/user_manual/basic_workflow.md index 63c8bff60..c83970340 100644 --- a/doc/user_manual/basic_workflow.md +++ b/doc/user_manual/basic_workflow.md @@ -21,7 +21,7 @@ Before using Hashtopolis, it's important to understand key terms commonly used i This section guides you through the essential steps to launch your first cracking task: > [!NOTE] -> This guide assumes you have a working Hashtopolis installation with at least one registered and active agent. For installation instructions, please see the [Installation Guide](/installation_guidelines/basic_install/). +> This guide assumes you have a working Hashtopolis installation with at least one registered and active agent. For installation instructions, please see the [Installation Guide](../installation_guidelines/basic_install.md). 1. **Upload Hashlists** @@ -80,7 +80,7 @@ Now you’re ready to define your first cracking job: > ```#HL# -a3 ?d?d?d?d``` - Choose a **priority** superior to 0 if you want the task to start. > [!TIP] -> To allow a task with priority 0 to start, you can adjust this behavior via ["Settings > Task/Chunk > Automatic Assignment of Tasks with Priority 0"](/user_manual/settings_and_configuration/#command-line-misc) +> To allow a task with priority 0 to start, you can adjust this behavior via ["Settings > Task/Chunk > Automatic Assignment of Tasks with Priority 0"](./settings_and_configuration.md#command-line-misc) - Click on the button **"Create"**. diff --git a/doc/user_manual/crackers_binary.md b/doc/user_manual/crackers_binary.md index 2031aa808..782c712e6 100644 --- a/doc/user_manual/crackers_binary.md +++ b/doc/user_manual/crackers_binary.md @@ -63,7 +63,7 @@ By default hashtopolis is installed with a single preprocessor, namely [*Prince* ![screenshot_cracker_page](/assets/images/new_preprocessor_page.png){ width="600" } -It is rather similar to the creation of a new version of a [cracker](/user_manual/crackers_binary/#adding-a-new-version). The main difference is that the user can associate the required keyspace, skip, and limit options to different flags of the preprocessor. Note that those three remain mandatory to be used within hashtopolis, however, this allows more flexibility as the preprocessor may have named those options differently. If additional paramaters are required at execution time, they should be included in the [preprocessr's command](/user_manual/tasks/#advanced-parameters) during the task creation. +It is rather similar to the creation of a new version of a [cracker](./crackers_binary.md#adding-a-new-version). The main difference is that the user can associate the required keyspace, skip, and limit options to different flags of the preprocessor. Note that those three remain mandatory to be used within hashtopolis, however, this allows more flexibility as the preprocessor may have named those options differently. If additional paramaters are required at execution time, they should be included in the [preprocessor's command](tasks.md#advanced-parameters) during the task creation. ## Agent Binaries diff --git a/doc/user_manual/files.md b/doc/user_manual/files.md index 0ddd905dd..5e0b526db 100644 --- a/doc/user_manual/files.md +++ b/doc/user_manual/files.md @@ -18,7 +18,7 @@ When creating a password recovery task in Hashtopolis, you may need to upload ad ## Manage Files -Each type of file has a dedicated page containing similar informations. The figure below shows what the rule page looks like. It contains information such as the name of the file, its size, the number of line in it as well as the access group. The key next to the name indicates that the file is secret and can only be accessed by trusted agents **REF?**. +Each type of file has a dedicated page containing similar information. The figure below shows what the rule page looks like. It contains information such as the name of the file, its size, the number of line in it as well as the access group. The key next to the name indicates that the file is secret and can only be accessed by [trusted agents](./agents.md#agent-overview).
    ![screenshot_rule_page](/assets/images/rules_files.png) diff --git a/doc/user_manual/hashlist.md b/doc/user_manual/hashlist.md index 4f801ae4a..c3d683253 100644 --- a/doc/user_manual/hashlist.md +++ b/doc/user_manual/hashlist.md @@ -18,7 +18,7 @@ Here is how to fill in the different fields: - Text File: Paste or upload a plain text file containing one hash per line. - HCCAPX/PMKID: Upload a HCCAPX file containing password hashes. - Binary File: Upload a binary file containing password hashes. -4. **Salted Hashes**: Tick the box related to salted hashes if appropriate and provide the correct separator for your hashlist. The flag is enabled/disabled according to the settings defined in the [Hashtype section](/user_manual/settings_and_configuration/#hashtypes). If the provided salt(s) is in hex, the following flag needs to be enabled otherwise the salt will be interpreted as a UTF8 value. +4. **Salted Hashes**: Tick the box related to salted hashes if appropriate and provide the correct separator for your hashlist. The flag is enabled/disabled according to the settings defined in the [Hashtype section](./settings_and_configuration.md#hashtypes). If the provided salt(s) is in hex, the following flag needs to be enabled otherwise the salt will be interpreted as a UTF8 value. 5. **Hash source**: Select one of the following hash source types. 6. **Providing the hash**: The last field of the form will automatically adapt depending on the chosen source type. You’ll be asked to provide additional details: - **Paste**: Copy and paste the hashes directly into the "Input" field. @@ -29,15 +29,15 @@ Here is how to fill in the different fields: 8. **Create Hashlist**: Click "Create Hashlist" to finalize the process. This will open a new page displaying the details of your newly created hashlist. ## Hashlists View -Ordered by ID by default. It reports the hashlists created. A tick is accolated to the name of the hashlists if all the passwords have been recovered. It shows the number of recovered passwords as well as the total number of hashes. It allows to import *pre-cracked hashes* or export the recovered passwords (*see below for more details*). The hashlists can also be archived or deleted. +Ordered by ID by default. It reports the hashlists created. A checkmark is shown beside the hashlist name once all associated passwords have been successfully recovered. It shows the number of recovered passwords as well as the total number of hashes. It allows to import *pre-cracked hashes* or export the recovered passwords (*see below for more details*). The hashlists can also be archived or deleted. ## Hashlists Details If you click on a Hashlist, either in the hashlists view, in the Tasks overview or inside a task, it brings you to the corresponding Hashlist details page. -Appart from the parameters specific to this hashlist (i.e. ID, Access Group, Hashlist name, ...), the page displays some information about the total number of hashes, the number of cracked ones and the number of remaining ones to be recovered. Clicking on one of these three values will open a new window displaying information about the Hashes of the Hashlist as detailed below. +Apart from the parameters specific to this hashlist (i.e. ID, Access Group, Hashlist name, ...), the page displays some information about the total number of hashes, the number of cracked ones and the number of remaining ones to be recovered. Clicking on one of these three values will open a new window displaying information about the Hashes of the Hashlist as detailed below. ### Hashes of Hashlist X -This page list all the hashes from the related hashlist. Filters can be applied to show either the cracked, the uncracked or all the hashes. According to the display filter selected, the Hashes only, the plaintext only or both are displayed. Additionnally, the cracking position (**to be defined**) can be displayed next to the cracked ones. Only 1000 hashes can be displayed at a time within a page but the user can navigate through the pages. The number of hashes per page can be configured in *Config > UI* settings. +This page list all the hashes from the related hashlist. Filters can be applied to show either the cracked, the uncracked or all the hashes. According to the display filter selected, the Hashes only, the plaintext only or both are displayed. Additionally, the cracking position (**to be defined**) can be displayed next to the cracked ones. Only 1000 hashes can be displayed at a time within a page but the user can navigate through the pages. The number of hashes per page can be configured in *Config > UI* settings. A HEX converter is present at the bottom of the page to convert any HEX values. This can be useful when the reported password is stored in a HEX format. @@ -52,9 +52,9 @@ Several actions are offered to the user which are detailed below. Note that some - **Export Left Hashes**: This action generates a file listing all the hashes for which no password have been recovered at the moment of the file creation. The file is automatically stored in the *wordlist* section of the *Files* section. The generated file can be easily retrieved as it got assigned to the latest file ID. The filename is *Leftlist_[Hashlist_ID]_[dd-mm-yyyy]_[hh-mm-ss].txt*. -- **Import pre-cracked Hashes**: This action opens a new page in which the user can upload pre-cracked hashes for the related hashlist. A pre-crack is supposed to be a hash contained in the hashlist associated with a plaintext in the format *[hash](:[salt]):[plaintext]*. Such data can be imported in different ways: *"Paste, Upload, Import, URL downlaod"* such as the option to import the hashes during a hashlist creation. In case of salted password, the field separator must be indicated, ':' being the default one. When validating by pressing the *Pre-crack hashes* button, the back-end will check if the imported data contains hash values from the targeted hashlist and integrate the plaintext value accordingly. If the option *Overwrite already cracked hashes* is selected, existing recovered passwords will be overwritten by the new imported ones in case of conflict. The front-end is then reporting to the user how many hashes have been considered as well as how many entries have been updated. +- **Import pre-cracked Hashes**: This action opens a new page in which the user can upload pre-cracked hashes for the related hashlist. A pre-crack is supposed to be a hash contained in the hashlist associated with a plaintext in the format *[hash](:[salt]):[plaintext]*. Such data can be imported in different ways: *"Paste, Upload, Import, URL download"* such as the option to import the hashes during a hashlist creation. In case of salted password, the field separator must be indicated, ':' being the default one. When validating by pressing the *Pre-crack hashes* button, the back-end will check if the imported data contains hash values from the targeted hashlist and integrate the plaintext value accordingly. If the option *Overwrite already cracked hashes* is selected, existing recovered passwords will be overwritten by the new imported ones in case of conflict. The front-end is then reporting to the user how many hashes have been considered as well as how many entries have been updated. -Pre-cracked management is useful to share results between different instances of hashtopolis. This is especially relevant for salted hashlits as each new recovered plaintext is improving the efficiency of the attack is there is no more hashes associated with the same salt value. +Pre-cracked management is useful to share results between different instances of hashtopolis. This is especially relevant for salted hashlists as each new recovered plaintext is improving the efficiency of the attack is there is no more hashes associated with the same salt value. ### Tasks overview and creation At the bottom of the page there are three subsections related to task for this hashlist. @@ -85,7 +85,7 @@ You can select all the hashlists at once by clicking on the button *select all*. ### Overview -Once you have created a superhashlist or if you open the *SuperHashlist* menu, the overview page of SuperHaslist is open. Such page diplays all the information about the superhashlists created so far. It is very similar to the hashlist overview page, the only difference being that you cannot archive a superhashlist. +Once you have created a superhashlist or if you open the *SuperHashlist* menu, the overview page of Superhashlist is open. Such page displays all the information about the superhashlists created so far. It is very similar to the hashlist overview page, the only difference being that you cannot archive a superhashlist. If you click on a superhashlist, the superhashlist detail page will be open. Again this page is very similar to the hashlist page. The only difference is that it contains the following details about the hashlist(s) contained in the superhashlist: - ID of each hashlist diff --git a/doc/user_manual/tasks.md b/doc/user_manual/tasks.md index cf1e1be70..9950c9456 100644 --- a/doc/user_manual/tasks.md +++ b/doc/user_manual/tasks.md @@ -10,10 +10,10 @@ To create a new task, click on the button "+ New Task" in the page *Tasks > Show 1. **Name**: provide a name for the task you want to create. This is how the task will be referenced with during the monitoring phase (see **link**) therefore it should be relatively explicit to facilitate its monitoring. -2. **Hashlist**: select the hashlist you want to target in this specific task. Tasks are ordered by their IDs. Supertasks (**see ref to advanced usage**) are at the bottom of the list ordered by their respective IDs. +2. **Hashlist**: select the hashlist you want to target in this specific task. Tasks are ordered by their IDs. [SuperHashlists](./hashlist.md#super-hashlists) are at the bottom of the list ordered by their respective IDs. 3. **Command Line**: provide in this field the attack command that will be executed by the agent on the targeted hashlist using the selected binary (see below). Note that *#HL#* is filled in by default in the command line. It is a placeholder for the hashlist and will be replaced automatically at execution time by the agent with the correct path to the hashlist file. Therefore you should not remove it nor include the filename for the hashlist. If for example you want to perform a mask attack of 6 digits, the command line would look like ```#HL# -a3 ?d?d?d?d?d?d```. -In case you want to perform a dictionary attack with rules, you have to select the corresponding files in the right table. If it is a wordlist, select it within the right column corresponding to T/Task. The Preprocessor part is explained in the advanced section. If it is a rule file, select first the rule tab (see **ref to the picture**) and then select the desired rule file. Note that upon selection of a rule file, the name of the file is included in the command line and automatically include the required '-r' flag. +In case you want to perform a dictionary attack with rules, you have to select the corresponding files in the right table. If it is a wordlist, select it within the right column corresponding to T/Task. The Preprocessor part is explained in the advanced section. If it is a rule file, select first the rule tab and then select the desired rule file. Note that upon selection of a rule file, the name of the file is included in the command line and automatically include the required '-r' flag. 4. **Priority**: Assign a priority number to the task. The expected value has to be an integer. Agents will be assigned to tasks in decreasing order of priority. A task with a priority 0 will not be processed even if agents are available - except if an agent is manually assigned to it and no other task with higher priority that the agent may join are existing. Default value is 0. @@ -21,25 +21,25 @@ In case you want to perform a dictionary attack with rules, you have to select t 6. **Task Notes** - *optional*: This field allows the user to indicate some details about the tasks, the command line or any other details the user can find relevant. -7. **Color** - *optional*: Can assign a color in a Hex color code format #RRGGBB. Default value is white #FFFFFF. This can be useful in the monitoring part to visually recognise a task or a set of tasks. +7. **Color** - *optional*: Can assign a color in a Hex color code format #RRGGBB. Default value is white #FFFFFF. This can be useful in the monitoring part to visually recognize a task or a set of tasks. ### Advanced Parameters Several options were not covered in the basic workflow related to the creation of a task. The remaining options are described below. -8. **Chunk size**: This parameter defines the duration that each agent should take to process a chunkℹ️ for this task. The default value is defined in the [Settings](/user_manual/settings_and_configuration/#benchmark-chunk). +8. **Chunk size**: This parameter defines the duration that each agent should take to process a chunkℹ️ for this task. The default value is defined in the [Settings](./settings_and_configuration.md#benchmark-chunk). -9. **Status timer**: Defines the frequency with which each agent report its progress for this task to the server. The default value is defined in the [Settings](/user_manual/settings_and_configuration/#activity-registration). +9. **Status timer**: Defines the frequency with which each agent report its progress for this task to the server. The default value is defined in the [Settings](./settings_and_configuration.md#activity-registration). 10. **Benchmark Type**: Select which benchmarking type should be used for this task. In most of the cases, it is recommended to use the default *Speed Test*. Only in few cases, such as tasks with big salted lists, the *Runtime* may be used. -11. **Task is CPU only**: If this flag is enabled, only the agents that are declared as CPU only can be assigned to this task. More details can be found in the [agent overview section](/user_manual/agents/#agent-overview). +11. **Task is CPU only**: If this flag is enabled, only the agents that are declared as CPU only can be assigned to this task. More details can be found in the [agent overview section](./agents.md#agent-overview). 12. **Task is small**: If this flag is enabled, a single agent can be assigned to this task. This is relevant for small tasks or to assign the full keyspace in a single chunk to an agent. Note that this is **NOT** equivalent to define the *Maximum number of agents* to 1. Indeed, in this latter case, the task will still be divided in chunks according to the *chunk size* parameter. The flag is disabled by default. -13. **Binary type to run the task**: This pair of parameters specify the binary type as well as the version of the binary to use for this specific task. It will by default use the latest uploaded version of the first binary type defined in the *Binaries* section (**see binaries for more details**). +13. **Binary type to run the task**: This pair of parameters specify the binary type as well as the version of the binary to use for this specific task. It will by default use the latest uploaded version of the first binary type defined in the [*Binaries* section](./crackers_binary.md). -14. **Set as preprocessor task**: Such option allows the usage of a preprocessor. By default hashtopolis is installed with a single preprocessor, namely [*Prince*](https://github.com/hashcat/princeprocessor). Additional preprocessors can be defined in the [*preprocessors*](/user_manual/crackers_binary/#preprocessors) page. The command that should be used for this preprocessor must be defined in the free text zone below. A task define with a preprocessor will result in the execution of the preprocessor redirecting the output as stdin for the command line defined above in the same task. This allows the usage of "external" candidate generator such as Prince. +14. **Set as preprocessor task**: Such option allows the usage of a preprocessor. By default hashtopolis is installed with a single preprocessor, namely [*Prince*](https://github.com/hashcat/princeprocessor). Additional preprocessors can be defined in the [*preprocessors*](./crackers_binary.md#preprocessors) page. The command that should be used for this preprocessor must be defined in the free text zone below. A task define with a preprocessor will result in the execution of the preprocessor redirecting the output as stdin for the command line defined above in the same task. This allows the usage of "external" candidate generator such as Prince. 15. **Skip a given keyspace at the beginning of the task**: Any value X inserted here will result in ignoring the first X values of the keyspace as it would be done with the flag "-s X" inserted in the command line. The rest of the keyspace will be processed normally. This can be useful to ignore a portion of the keyspace that has been already explored during a different process, for example on a local machine. @@ -47,11 +47,9 @@ Several options were not covered in the basic workflow related to the creation o - *Fixed chunk size*: Each chunk will have a portion of the keyspace where the length is the value assigned (an integer) in the associated field. The last chunk of the task may be smaller than the defined length for completion. - *Fixed number of chunks*: The keyspace will be divided in as many chunks as the number specified in the associated field. -- Enforce Piping (to apply rules before reject): **will be removed soon** and is therefore not explained here. - ## Preconfigured tasks -A preconfigured tasks is a basic template for a task that is not assigned yet to a hashlist. This is particularly useful to predefine task(s) that are often use such as generic mask attack or commonly used dictionnary attack. A preconfigured task can later be assigned to a hashlist avoiding the user to redefine the same task every time. This section gives more details about this topic. +A preconfigured tasks is a basic template for a task that is not assigned yet to a hashlist. This is particularly useful to predefine task(s) that are often use such as generic mask attack or commonly used dictionary attack. A preconfigured task can later be assigned to a hashlist avoiding the user to redefine the same task every time. This section gives more details about this topic. When the user creates a *New Preconfigured Tasks*, the fields to create one are a subset of those of a regular task and are therefore not re-defined here. The reader can refer to the above section for reference. @@ -59,9 +57,9 @@ Once the pre-configured task is created, the user is brought to the *Preconfigur In addition to the possibility to delete a preconfigured task, two additional actions are offered to the user and are defined below. -- **Copy to task**: This action opens a *new task* creaction page where all the pre-defined values of the preconfigured task are already prefilled. The user must select the hashlist for which the task should be created. All the other values can be modified by the user if needed. Note that there is the possibility to create a task from a pretask for a specific hashlist directly from the corresponding *Hashlist details* page. +- **Copy to task**: This action opens a *new task* creation page where all the pre-defined values of the preconfigured task are already prefilled. The user must select the hashlist for which the task should be created. All the other values can be modified by the user if needed. Note that there is the possibility to create a task from a pretask for a specific hashlist directly from the corresponding *Hashlist details* page. -- **Copy to Pretask**: This action open a *New Preconfigured Tasks* Page where all the value of the corresponding pretask are duplicated. The user can then modify those values to create a new Preconfigured tasks. This is particularly useful if one want to slightly modify an existing preconfigured task, for example by adding a new placeholder in a mask or changing a rule file in a dictionnary attack. Note that while it is possible to create a perfect duplicate of a pretask there is no added-value in doing-so. +- **Copy to Pretask**: This action open a *New Preconfigured Tasks* Page where all the value of the corresponding pretask are duplicated. The user can then modify those values to create a new Preconfigured tasks. This is particularly useful if one want to slightly modify an existing preconfigured task, for example by adding a new placeholder in a mask or changing a rule file in a dictionary attack. Note that while it is possible to create a perfect duplicate of a pretask there is no added-value in doing-so. #### Creating a preconfigured task from a task In the *Show Tasks* page, there is an action offered for each task, namely **Copy to Pretask**. This option will create a template from the corresponding task by extracting all the required information. The default name extracted will be the current one from the task. The user can modify at will those values and finally create the preconfigured task from it. This is useful in case you have defined an attack that you want to store for future reuse. @@ -117,16 +115,16 @@ This functionality allows the user to create a supertask from a mask file or a s - **Name**: Defines the name that will be given at the created SuperTask - **Are small tasks**: If this parameter is set to yes, a single agent can be assigned to the tasks that will be created when the resulting supertask is apply to a hashlist. This is relevant for small tasks or to assign the full keyspace in a single chunk to an agent. Note that this is **NOT** equivalent to define the *Maximum number of agents* to 1. Indeed, in this latter case, the task will still be divided in chunks according to the *chunk size* parameter. The parameter is set to No by default. - **Max Agents**: Specify the maximum agents that can be assigned to the tasks that will be created when the resulting supertask is apply to a hashlist. If this amount is reached, future available agents will be assigned to the next task available with a lower priority even if the all the chunks of the task have been distributed. The default value of 0 means that there is no maximum and therefore, all available agents are assigned to this tasks until all the chunks have been distributed. This functionality is helpful to only use a portion of the cluster for a specific task, and therefore allowing to split the workers on different tasks. -- **Are CPU tasks**: If this parameter is set to yes, only the agents that are declared as CPU only can be assigned to this task. More details can be found in the [agent section](/user_manual/agents/) of this manual. The parameter is set to No by default. +- **Are CPU tasks**: If this parameter is set to yes, only the agents that are declared as CPU only can be assigned to this task. More details can be found in the [agent section](./agents.md) of this manual. The parameter is set to No by default. - **Use Optimized flag (-O)**: If this parameter is set to Yes, the optimized flag -O will be added to the command line of all the sub-tasks of this supertask. The -O flag in Hashcat enables the use of optimized kernels for better performance. This improves cracking speed yet it has an impact on some aspects such as limiting the maximum length of the candidates to be tested, e.g. from 256 to 55 in the case of MD5 or from 256 to 27 for NTLM. - **Benchmark Type**: Select which benchmarking type should be used for the subtasks of the supertask. It is recommended to use the default *Speed Test* for mask attack. Only in few cases, such as tasks with big salted lists, the *Runtime* may be used. - **Cracker Binary which is used to run this task**: This parameter specifies the binary type to use for this specific task. - **Insert Masks**: The mask lines that will generate the subtask should be written here. The expected format is the one of a *.hcmask" file for hashcat. In a nutshell, there should be one mask per line following the format **[?1,][?2,][?3,][?4,]mask**, where [?x] specifies the optional charset that can be used in the mask. More details can be found [here](https://hashcat.net/wiki/doku.php?id=mask_attack). -A subtask will be created for each line of the the *Insert masks* text zone and they will be grouped in a supertask. The subtasks are pre-configured task from the database point of view, however they are not diplayed in the *Preconfigured Tasks* page. The subtasks that will be generated in this supertasks will be ordered accordingly to their order in the *Insert masks* text zone giving the highest priority to the first line. +A subtask will be created for each line of the the *Insert masks* text zone and they will be grouped in a supertask. The subtasks are pre-configured task from the database point of view, however they are not displayed in the *Preconfigured Tasks* page. The subtasks that will be generated in this supertasks will be ordered accordingly to their order in the *Insert masks* text zone giving the highest priority to the first line. > [!NOTE] -> Note that the options above will be applied to all the pre-configured tasks that will be created during the generation of the supertaks from this import. +> Note that the options above will be applied to all the pre-configured tasks that will be created during the generation of the supertasks from this import. ### Wordlist/Rule bulk diff --git a/doc/user_manual/user-settings.md b/doc/user_manual/user-settings.md index 4b3390dbc..100ee292d 100644 --- a/doc/user_manual/user-settings.md +++ b/doc/user_manual/user-settings.md @@ -30,7 +30,9 @@ A notification can be triggered for the following triggers (if you are allowed t - **newHashlist**: When a new hashlist was created - **deleteHashlist**: When a hashlist was deleted - **hashlistAllCracked**: When all hashes in a hashlist got cracked -- **hashlistCrackedHash. When any hash got cracked - **warning**: You could receive a lot of notifications if you try to crack a large hashlist. +- **hashlistCrackedHash. When any hash got cracked - +> [!CAUTION] +> You could receive a lot of notifications if you try to crack a large hashlist. - **userCreated**: When a new user was created - **userDeleted**: When a user was deleted - **userLoginFailed**: When a user login failed From 7cfe7ddd49205c23588dcd28bdb0bb03507de68f Mon Sep 17 00:00:00 2001 From: coiseiw Date: Tue, 24 Jun 2025 13:09:33 +0200 Subject: [PATCH 094/691] Integrating several feedback in update, agents and tasks --- doc/TODO-notes_manual.txt | 3 +- doc/installation_guidelines/update.md | 35 ++++++++++++++++++--- doc/user_manual/agents.md | 20 ++++++------ doc/user_manual/tasks.md | 44 +++++++++++++++------------ 4 files changed, 67 insertions(+), 35 deletions(-) diff --git a/doc/TODO-notes_manual.txt b/doc/TODO-notes_manual.txt index d1dcd39ef..70ccac3ff 100644 --- a/doc/TODO-notes_manual.txt +++ b/doc/TODO-notes_manual.txt @@ -1,8 +1,9 @@ # What still has to be done -- in advanced install there should be a note about the binaries, files in www-data forat etc +- in advanced install there should be a note about files in www-data format etc - lots of screenshots and diagrams to make the text fancier - details about the config files, structure of repos etc. - booting from PxE, running hashtopolis as a service ? - Check if any difference for Agent overview in new interface - Hashtypes - make an example of import super task to make it clearer +- Task overview is missing !!! \ No newline at end of file diff --git a/doc/installation_guidelines/update.md b/doc/installation_guidelines/update.md index b98fa7687..5549b4b41 100644 --- a/doc/installation_guidelines/update.md +++ b/doc/installation_guidelines/update.md @@ -15,9 +15,11 @@ mysqldump > hashtopolis-backup.sql ``` 3. Make copies of the following folders, located in the Hashtopolis directory next to index.php: + - files - import - log + 4. Download the docker compose file: ``` wget https://raw.githubusercontent.com/hashtopolis/server/master/docker-compose.yml @@ -91,21 +93,44 @@ Becomes */usr/local/share/hashtopolis/config/config.json*: } ``` -18. Restart the compose docker compose down && docker compose up +18. Restart the containers + +``` +docker compose down && docker compose up +``` ### New database Repeat the above steps, but you do not need to export or import the database. Just ensure the .env file points to your database server and that it is reachable from the container. ## Upgrading from docker to docker (version 0.14.0 and up) -1. Stop your docker compose docker compose down -2. docker compose pull -3. docker compose up + +For this process, you need to stop your containers, pull the new ones and then restart the containers. +``` +docker compose down +docker compose pull +docker compose up +``` ## Upgrading from docker to docker (version 0.14.0 and up) - Offline System(s) -***To be done*** +1. On a system with internet access execute the following commands: + +``` +docker pull hashtopolis/backend:latest +docker pull hashtopolis/frontend:latest +docker save hashtopolis/backend:latest --output hashtopolis-backend.tar +docker save hashtopolis/frontend:latest --output hashtopolis-frontend.tar +``` +2. Next, transfer both tar-files to your Hashtopolis server and import them using the following commands: + +``` +docker compose down +docker load --input hashtopolis-backend.tar +docker load --input hashtopolis-frontend.tar +docker compose up +``` review hashcat --exam - make an example of import super task to make it clearer -- Task overview is missing !!! \ No newline at end of file +- Task overview is missing !!! +- Creating an example of preprocessors in the preprocessors binary to simplify the related section in task creation +- Explaining the global interface of hashtopolis +- Check the style of the manual, page, buttons, code etc should always be within the same style +- Agent installation is not compliant with v2 +- Pictures for installation +- Sein: Review contribution guidelines +- \ No newline at end of file diff --git a/doc/assets/images/task_overview.md.png b/doc/assets/images/task_overview.md.png new file mode 100644 index 0000000000000000000000000000000000000000..7338271b5157adb5b238f317e87e381981b03307 GIT binary patch literal 66969 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%0A%&Q`3K;{-+TDjIyl`=;$#4!vVy) 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%0DSvepbQTI*Fo`u-h`O(LTF9}{%dxqW( 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 [!TIP] +> Considering that the hashmode is configured in your hashcat binary, you can obtain all these information directly from hashcat: +> ``` +> hashcat.bin --exam -m 3200 +> +> hashcat (v6.2.6-850-gfafb277e0+) starting in hash-info mode +> +> Hash Info: +> ========== +> +> Hash mode #3200 +> Name................: bcrypt $2*$, Blowfish (Unix) +> Category............: Operating System +> Slow.Hash...........: Yes +> Password.Len.Min....: 0 +> Password.Len.Max....: 72 +> Salt.Type...........: Embedded +> Salt.Len.Min........: 0 +> Salt.Len.Max........: 256 +> Kernel.Type(s)......: pure +> Example.Hash.Format.: plain +> Example.Hash........: $2a$05$MBCzKhG1KhezLh.0LRa0Kuw12nLJtpHy6DIaU.JAnqJUDYspHC.Ou +> Example.Pass........: hashcat +> Benchmark.Mask......: ?b?b?b?b?b?b?b +> Autodetect.Enabled..: Yes +> Self.Test.Enabled...: Yes +> Potfile.Enabled.....: Yes +> Custom.Plugin.......: No +> Plaintext.Encoding..: ASCII, HEX +> +> ``` + +You cannot create a new hashtype using an existing hashtype value. In case you want to modify an existing hashtype, you must delete it and recreate it. This is unfortunately not possible if there are existing hashlists associated to this hashtype. ## Health Checks diff --git a/doc/user_manual/tasks.md b/doc/user_manual/tasks.md index 49a4881fe..8b529804c 100644 --- a/doc/user_manual/tasks.md +++ b/doc/user_manual/tasks.md @@ -49,49 +49,65 @@ These additional task configuration options allow greater control over execution ## Task Overview -**Work in progress** +Valuable information on the current tasks is displayed in the Task Overview. In addition to the classic information such as individual ID or the type of task, the overview offers further highlights. The most important ones are described in more detail below: + +- Status: The current number of password candidates attempted per second is shown in a **live status**. If the task has been completed, this is indicated by a **visual tick**; if the task is not currently running, it is in **idle** status. + +- Dispatched/Searched: As already described in **What is Hashtopolis**, a part of the keyspace is distributed. It is therefore very common that not 100% of the keyspace is distributed directly. This information is communicated to us at this point. The search space is always smaller than the dispatched value because Hashtopolis distributes the chunk first and then starts the password search. **Searched** shows the percentage of the entire chunk/keyspace that has already been searched. + +- Cracked: If a password is found during the attack, this is displayed with a 1, for example (if the number of passwords found is higher, this is correspondingly more). Clicking on the number then displays the plain text password, among other things. + +
    + ![screenshot_showtask_supertask](../assets/images/task_overview.png) +
    + + ## Preconfigured tasks A **preconfigured task** is a reusable template not yet linked to a hashlist. This is useful for defining frequently used tasks like standard mask attacks or dictionary attacks. Once created, the preconfigured task can be reused without needing to re-enter its settings. -When the user creates a *New Preconfigured Tasks*, the fields to create one are a subset of those of a regular task and are therefore not re-defined here. The reader can refer to the above section for reference. +When creating a *new preconfigured task*, you will see a subset of the fields used for regular tasks. Refer to the [Task Creation](./tasks.md#task-creation) section for more details. + +After creation, the new preconfigured task appears on the Preconfigured Tasks page. You can set its default priority and maximum number of agents. These defaults will be applied when generating a task from the template. -Once the pre-configured task is created, the user is brought to the *Preconfigured tasks* page that lists all the existing preconfigured tasks. Here the user can set the default priority as well as the maximum number of agents for this preconfigured tasks (**NOTE I believe these two options should already appear in the template of a preconfigured task**). Those values will be used as defaults upon creation of a task from this template. +You may delete a preconfigured task or use one of the two actions below: -In addition to the possibility to delete a preconfigured task, two additional actions are offered to the user and are defined below. +- **Copy to task**: Opens a *New Task* form with all values pre-filled from the preconfigured task. Just choose the target hashlist and adjust other values as needed. -- **Copy to task**: This action opens a *new task* creation page where all the pre-defined values of the preconfigured task are already prefilled. The user must select the hashlist for which the task should be created. All the other values can be modified by the user if needed. Note that there is the possibility to create a task from a pretask for a specific hashlist directly from the corresponding *Hashlist details* page. +> [!TIP] +> A task can also be generated from a preconfigured task directly from the *Hashlist Details*. + +- **Copy to Pretask**: Opens the *New Preconfigured Task* form pre-filled with the values from the existing preconfigured task for easy editing. This is useful for making slight adjustments—such as updating a mask or swapping a rule file without recreating it from scratch. -- **Copy to Pretask**: This action open a *New Preconfigured Tasks* Page where all the value of the corresponding pretask are duplicated. The user can then modify those values to create a new Preconfigured tasks. This is particularly useful if one want to slightly modify an existing preconfigured task, for example by adding a new placeholder in a mask or changing a rule file in a dictionary attack. Note that while it is possible to create a perfect duplicate of a pretask there is no added-value in doing-so. #### Creating a preconfigured task from a task -In the *Show Tasks* page, there is an action offered for each task, namely **Copy to Pretask**. This option will create a template from the corresponding task by extracting all the required information. The default name extracted will be the current one from the task. The user can modify at will those values and finally create the preconfigured task from it. This is useful in case you have defined an attack that you want to store for future reuse. +On the Show Tasks page, each task has an action called *Copy to Pretask*. This creates a preconfigured task pre-filled with the values from the existing task, including its name. You can modify those values before saving. ## Super Task - -A SuperTask is a group of pre-configured tasks. A supertask can be directly applied to a hashlist resulting in the creation of all the underlying pre-configured tasks applied to this hashlist. +A **SuperTask** is a collection of preconfigured tasks. When applied to a hashlist, it creates all the individual tasks included in the group. A SuperTask is handled differently by both the front-end and the back-end. As such, the monitoring is slightly different as explained below. > [!CAUTION] -> A supertask cannot be applied to a superhashlist. +> Supertasks cannot be applied to superhashlists. -This is particularly useful when applying the same attack strategy to different hashlists. +Supertasks are ideal for defining consistent cracking strategies which can be used repeatedly with multiple hashlists. ### New SuperTask -Similarly to the superhashlists, this page will display all the existing pre-configured tasks. The user needs to select all the pre-configured tasks that should be included in the supertask, give it a name, and press the *create supertask* button. +A new supertask can be created from the *SuperTask* page by clicking on the *+ New* button. In the following page, give a name to the supertask and select all the preconfigured tasks to include. Click the "Create SuperTask" button to finalize. ### Overview -Once a new supertask is created, or if you open the *SuperTask* menu, the overview page of SuperTask is open. It displays the ID of all the superhashlists and their names. Three options are proposed. -- **Apply to Hashlist**: This option open a new page in which you can select the hashlist to which you want to apply the set of pre-configured tasks as well as the binary to use. -- **Show/Hide**: This option unfolds the supertask and displays the included preconfigured task(s) with the following information/options. - - **ID**: ID of the pre-configured task - - **Name**: Name of the pre-configured task. Clicking on it opens the corresponding pre-configured task page. - - **SubTask Priority**: define the order in which the pre-configured tasks will be executed when an agent is assigned to the supertask. Similarly to tasks, priority is given to the highest number. - - **SubTask Max Agents**: similarly to tasks, specifies the maximum agents that can be assigned to the task. - - **Remove**: remove the pre-configured task from the supertask. Note that the pre-configured task is only remove from the supertask but not deleted from the system except if the related pre-configured task was generated via the *Import Super Task* functionality (see below for more details). +The **SuperTask menu** shows a list of all supertasks and their associated preconfigured tasks. The following options are available: + +- **Apply to Hashlist**: Select a target hashlist and binary in the opened page. This action creates all the sub-tasks from the supertask to the selected hashlist. +- **Show/Hide**: Expands the supertask view to show the included subtasks with their details: + - **ID**: Preconfigured task ID. + - **Name**: Clickable name to open and view the subtask details. + - **SubTask Priority**: Controls subtask execution order within the supertask (higher = first). + - **SubTask Max Agents**: Limits the number of agents per subtask. + - **Remove**: Removes the subtask from the supertask but doesn't delete it unless initially imported via "Import SuperTask". ### SuperTask in the *ShowTasks* Menu @@ -99,13 +115,13 @@ Supertask are not displayed as regular tasks in the *Show Task* menu as displaye
    - ![screenshot_showtask_supertask](/assets/images/supertasks_showtasks.png) + ![screenshot_showtask_supertask](../assets/images/supertasks_showtasks.png)
    The same information than those of a task are displayed. The *copy to Pretask* and *copy to task* options are not available. There is instead an information button which open a pop-up window displaying the list of subtasks of the supertask. This window is identical to the ShowTasks page apart that only the subtasks of the supertask are displayed in it as shown in the figure below.
    - ![screenshot_import_file](/assets/images/) + ![screenshot_import_file](../assets/images/supertasks_subtasks.png)
    ## Import Super Task From 4a1325136bb12b836e55e08ce0700358b91305c5 Mon Sep 17 00:00:00 2001 From: coiseiw Date: Tue, 24 Jun 2025 18:09:30 +0200 Subject: [PATCH 097/691] fixing the relative path for image and fixing the hashtype example --- doc/TODO-notes_manual.txt | 2 +- ...task_overview.md.png => task_overview.png} | Bin doc/user_manual/crackers_binary.md | 16 +++---- doc/user_manual/files.md | 8 ++-- doc/user_manual/hashlist.md | 6 +-- doc/user_manual/settings_and_configuration.md | 39 ++++++++++++++++-- 6 files changed, 51 insertions(+), 20 deletions(-) rename doc/assets/images/{task_overview.md.png => task_overview.png} (100%) diff --git a/doc/TODO-notes_manual.txt b/doc/TODO-notes_manual.txt index d3ca78463..3fb61e3a6 100644 --- a/doc/TODO-notes_manual.txt +++ b/doc/TODO-notes_manual.txt @@ -13,4 +13,4 @@ - Agent installation is not compliant with v2 - Pictures for installation - Sein: Review contribution guidelines -- \ No newline at end of file +- Hashlist page, define what is cracking position \ No newline at end of file diff --git a/doc/assets/images/task_overview.md.png b/doc/assets/images/task_overview.png similarity index 100% rename from doc/assets/images/task_overview.md.png rename to doc/assets/images/task_overview.png diff --git a/doc/user_manual/crackers_binary.md b/doc/user_manual/crackers_binary.md index 782c712e6..6d717b99a 100644 --- a/doc/user_manual/crackers_binary.md +++ b/doc/user_manual/crackers_binary.md @@ -7,7 +7,7 @@ Hashtopolis is also responsible of the update and distribution of several binari When Hashtopolis was first developed it was solely designed to manage hashcat tasks with multiple agents. As part of the evolution of the project, support for other tool than hashcat was integrated in hashtopolis. In addition to the support of different tools, hashtopolis can also manage different versions of the same tool.
    - ![screenshot_cracker_page](/assets/images/cracker_page.png){ width="600" } + ![screenshot_cracker_page](../assets/images/cracker_page.png){ width="600" }
    This page displays some basic information about all the crackers configured in hashtopolis. Apart from the ID of the cracker and its name, the version(s) available is also displayed. Hashtopolis is configured with a default hashcat cracker to be downloaded by the agents whenever they need it. @@ -24,7 +24,7 @@ By clicking on the ``*New Cracker*'' button, a new page opens in which you can s In other words, the keyspace is the total amount of work related to a task. The combination of skip and limit will define a portion of the keyspace, also called chunk, on wich an agent will be working. That is the main features required to distribute a task among the several agents. -If chunking is not available for a cracker, then a task cannot be split and it must be run by a single agent. WHen selecting such type of cracker during the task creation, the ["small task"](/user_manual/tasks/#advanced-parameters) flag will be enabled by default. +If chunking is not available for a cracker, then a task cannot be split and it must be run by a single agent. WHen selecting such type of cracker during the task creation, the ["small task"](./tasks.md#advanced-parameters) flag will be enabled by default. > [!CAUTION] > Creating a new type of cracker is not a simple plug-and-play process with Hashtopolis. In addition to defining the new cracker type, you must also modify the agent itself. Specifically, this involves writing a dedicated Python handler file for your cracker. @@ -36,7 +36,7 @@ If chunking is not available for a cracker, then a task cannot be split and it m Whether it is the first version for a new cracker or to update an existing cracker, the page displayed below for adding a version to a cracker will appear.
    - ![screenshot_manage_file](/assets/images/new_binary_version.png){ width="400" } + ![screenshot_manage_file](../assets/images/new_binary_version.png){ width="400" }
    The three following information are required to deploy a new version. @@ -54,16 +54,16 @@ The three following information are required to deploy a new version. The purpose of a pre-processor in the context of hashcat is to generate passwords candidates that are then fed through the standard input to a hashcat process. The preprocessor page displayed below list all the preprocessors configured in hashtopolis.
    - ![screenshot_cracker_page](/assets/images/preprocessor_page.png){ width="600" } + ![screenshot_cracker_page](../assets/images/preprocessor_page.png){ width="600" }
    By default hashtopolis is installed with a single preprocessor, namely [*Prince*](https://github.com/hashcat/princeprocessor). Additional preprocessors can be added by clicking the *New Preprocessor" button. The creation page below is diplayed.
    - ![screenshot_cracker_page](/assets/images/new_preprocessor_page.png){ width="600" } + ![screenshot_cracker_page](../assets/images/new_preprocessor_page.png){ width="600" }
    -It is rather similar to the creation of a new version of a [cracker](./crackers_binary.md#adding-a-new-version). The main difference is that the user can associate the required keyspace, skip, and limit options to different flags of the preprocessor. Note that those three remain mandatory to be used within hashtopolis, however, this allows more flexibility as the preprocessor may have named those options differently. If additional paramaters are required at execution time, they should be included in the [preprocessor's command](tasks.md#advanced-parameters) during the task creation. +It is rather similar to the creation of a new version of a [cracker](./crackers_binary.md#adding-a-new-version). The main difference is that the user can associate the required keyspace, skip, and limit options to different flags of the preprocessor. Note that those three remain mandatory to be used within hashtopolis, however, this allows more flexibility as the preprocessor may have named those options differently. If additional paramaters are required at execution time, they should be included in the [preprocessor's command](./tasks.md#advanced-parameters) during the task creation. ## Agent Binaries @@ -73,13 +73,13 @@ There are several situations where deploying a new Hashtopolis agent binary is n The agent binaries page displayed the information shown below about the current agent binaries configured in hashtopolis.
    - ![screenshot_cracker_page](/assets/images/agent_binaries_page.png){ width="600" } + ![screenshot_cracker_page](../assets/images/agent_binaries_page.png){ width="600" }
    To create a new agent, simply press the button *New Binary* in the agent binary page. The following page is then displayed.
    - ![screenshot_cracker_page](/assets/images/new_agent_page.png){ width="400" } + ![screenshot_cracker_page](../assets/images/new_agent_page.png){ width="400" }
    The following fields need to be filled at creation time. diff --git a/doc/user_manual/files.md b/doc/user_manual/files.md index 5e0b526db..18016bcb2 100644 --- a/doc/user_manual/files.md +++ b/doc/user_manual/files.md @@ -21,7 +21,7 @@ When creating a password recovery task in Hashtopolis, you may need to upload ad Each type of file has a dedicated page containing similar information. The figure below shows what the rule page looks like. It contains information such as the name of the file, its size, the number of line in it as well as the access group. The key next to the name indicates that the file is secret and can only be accessed by [trusted agents](./agents.md#agent-overview).
    - ![screenshot_rule_page](/assets/images/rules_files.png) + ![screenshot_rule_page](../assets/images/rules_files.png)
    @@ -30,7 +30,7 @@ From this page, files can be edited by clicking on their name or on the related Navigating to the Files page of the Hashtopolis User Interface, you can manage the files uploaded to the server.
    - ![screenshot_manage_file](/assets/images/edit_rule_file.png){ width="400" } + ![screenshot_manage_file](../assets/images/edit_rule_file.png){ width="400" }
    1. **Select Category**. @@ -54,7 +54,7 @@ Detailed instructions for each upload method are provided in the following subse ### Upload a new file from the computer
    - ![screenshot_new_file](/assets/images/upload_rule.png){ width="400" } + ![screenshot_new_file](../assets/images/upload_rule.png){ width="400" }
    1. **Add file**: Click this button to enable file upload. After clicking, a new field labeled Choose file will appear. Each time you click on Add File, an additional Choose file field will be added, allowing you to upload multiple files simultaneously.. @@ -83,7 +83,7 @@ docker cp hashtopolis-backend:/usr/local/share/hashtopolis/import/ ### Download new file from URL
    - ![screenshot_download_url](/assets/images/upload_url.png){ width="400" } + ![screenshot_download_url](../assets/images/upload_url.png){ width="400" }
    1. **Name**: Name of the file that will be downloaded diff --git a/doc/user_manual/hashlist.md b/doc/user_manual/hashlist.md index c3d683253..d43b87d9c 100644 --- a/doc/user_manual/hashlist.md +++ b/doc/user_manual/hashlist.md @@ -7,7 +7,7 @@ Refer to the Hashcat documentation for detailed information on supported hash ty In the Hashtopolis web interface, navigate to *Hashlists* and click on the button *+ New Hashlist*. You will get the following window:
    - ![screenshot_create_hashlist](/assets/images/create_hashlist.png) + ![screenshot_create_hashlist](../assets/images/create_hashlist.png)
    Here is how to fill in the different fields: @@ -52,7 +52,7 @@ Several actions are offered to the user which are detailed below. Note that some - **Export Left Hashes**: This action generates a file listing all the hashes for which no password have been recovered at the moment of the file creation. The file is automatically stored in the *wordlist* section of the *Files* section. The generated file can be easily retrieved as it got assigned to the latest file ID. The filename is *Leftlist_[Hashlist_ID]_[dd-mm-yyyy]_[hh-mm-ss].txt*. -- **Import pre-cracked Hashes**: This action opens a new page in which the user can upload pre-cracked hashes for the related hashlist. A pre-crack is supposed to be a hash contained in the hashlist associated with a plaintext in the format *[hash](:[salt]):[plaintext]*. Such data can be imported in different ways: *"Paste, Upload, Import, URL download"* such as the option to import the hashes during a hashlist creation. In case of salted password, the field separator must be indicated, ':' being the default one. When validating by pressing the *Pre-crack hashes* button, the back-end will check if the imported data contains hash values from the targeted hashlist and integrate the plaintext value accordingly. If the option *Overwrite already cracked hashes* is selected, existing recovered passwords will be overwritten by the new imported ones in case of conflict. The front-end is then reporting to the user how many hashes have been considered as well as how many entries have been updated. +- **Import pre-cracked Hashes**: This action opens a new page in which the user can upload pre-cracked hashes for the related hashlist. A pre-crack is supposed to be a hash contained in the hashlist associated with a plaintext in the format *[hash]\(:[salt]\):[plaintext]*. Such data can be imported in different ways: *"Paste, Upload, Import, URL download"* such as the option to import the hashes during a hashlist creation. In case of salted password, the field separator must be indicated, ':' being the default one. When validating by pressing the *Pre-crack hashes* button, the back-end will check if the imported data contains hash values from the targeted hashlist and integrate the plaintext value accordingly. If the option *Overwrite already cracked hashes* is selected, existing recovered passwords will be overwritten by the new imported ones in case of conflict. The front-end is then reporting to the user how many hashes have been considered as well as how many entries have been updated. Pre-cracked management is useful to share results between different instances of hashtopolis. This is especially relevant for salted hashlists as each new recovered plaintext is improving the efficiency of the attack is there is no more hashes associated with the same salt value. @@ -102,7 +102,7 @@ The result will display all the hashes that correspond to the given entry/ies. I - A list of all the hashes that contains the given entry, specifying in which hashlist(s) they are contained and the cleartext password if they have been cracked already.
    - ![screenshot_import_file](/assets/images/search_hash_2.png) + ![screenshot_import_file](../assets/images/search_hash_2.png)
    ## Show Crack diff --git a/doc/user_manual/settings_and_configuration.md b/doc/user_manual/settings_and_configuration.md index 04edd0b75..ed5182695 100644 --- a/doc/user_manual/settings_and_configuration.md +++ b/doc/user_manual/settings_and_configuration.md @@ -138,7 +138,7 @@ Click on *+ New Hashtype* to add a new hashtype. Fill the corresponding fields d - **Salted**: Salted indicates whether the hash algorithm uses a separate salt value (e.g., vBulletin). It does not apply to algorithms where the salt is embedded within the hash itself (e.g., bcrypt). This setting allows Hashtopolis to automatically check the Salted box when importing a hashlist that uses such an algorithm. - **Slow Hash**: Check this box if the hashmode is a computationally intensive (slow) hash function. -> [!TIP] + + +!!! tip "Tip: Using hashcat to inspect hashmodes" + + Considering that the hashmode is configured in your hashcat binary, you can obtain all this information directly from hashcat: + + 
    
+    hashcat.bin --exam -m 3200
+
+    hashcat (v6.2.6-850-gfafb277e0+) starting in hash-info mode
+    Hash Info:
+    Hash mode #3200
+      Name................: bcrypt $2*$, Blowfish (Unix)
+      Category............: Operating System
+      Slow.Hash...........: Yes
+      Password.Len.Min....: 0
+      Password.Len.Max....: 72
+      Salt.Type...........: Embedded
+      Salt.Len.Min........: 0
+      Salt.Len.Max........: 256
+      Kernel.Type(s)......: pure
+      Example.Hash.Format.: plain
+      Example.Hash........: $2a$05$MBCzKhG1KhezLh.0LRa0Kuw12nLJtpHy6DIaU.JAnqJUDYspHC.Ou
+      Example.Pass........: hashcat
+      Benchmark.Mask......: ?b?b?b?b?b?b?b
+      Autodetect.Enabled..: Yes
+      Self.Test.Enabled...: Yes
+      Potfile.Enabled.....: Yes
+      Custom.Plugin.......: No
+      Plaintext.Encoding..: ASCII, HEX
+
    + You cannot create a new hashtype using an existing hashtype value. In case you want to modify an existing hashtype, you must delete it and recreate it. This is unfortunately not possible if there are existing hashlists associated to this hashtype. @@ -186,5 +217,5 @@ Additional information is displayed by clicking on the ID. Here you will then fi Important events can be viewed in the log area. For example, failed logins are documented or document uploads are tracked:
    - ![screenshot_logs_example](/assets/images/logs_example.png){ width="600" } + ![screenshot_logs_example](../assets/images/logs_example.png){ width="600" }
    \ No newline at end of file From 299812e5f5e66875fa286a32003130a619aeece1 Mon Sep 17 00:00:00 2001 From: Sein Coray Date: Wed, 25 Jun 2025 08:57:03 +0200 Subject: [PATCH 098/691] implemented access group check for hashlists and agents so far (#1389) * implemented access group check for hashlists and agents so far * updated all ACL functions for retrieval of multiple elements * fixed most of the tasks failing due to check in tasks only working with existing assignments * added first two single object ACL checks * added all other single ACL checks * fixed phpdoc --- .../apiv2/common/AbstractBaseAPI.class.php | 22 ++++++++-- .../apiv2/common/AbstractModelAPI.class.php | 18 ++++++-- .../apiv2/model/agentassignments.routes.php | 37 +++++++++++++++- src/inc/apiv2/model/agenterrors.routes.php | 32 ++++++++++++++ src/inc/apiv2/model/agents.routes.php | 22 ++++++++++ src/inc/apiv2/model/agentstats.routes.php | 26 +++++++++++ src/inc/apiv2/model/chunks.routes.php | 40 ++++++++++++++++- src/inc/apiv2/model/files.routes.php | 21 ++++++++- src/inc/apiv2/model/hashes.routes.php | 24 +++++++++++ src/inc/apiv2/model/hashlists.routes.php | 13 +++++- .../apiv2/model/healthcheckagents.routes.php | 26 +++++++++++ src/inc/apiv2/model/speeds.routes.php | 43 +++++++++++++++++++ src/inc/apiv2/model/tasks.routes.php | 31 +++++++++++++ src/inc/apiv2/model/taskwrappers.routes.php | 28 +++++++++++- src/inc/utils/AccessUtils.class.php | 6 +-- 15 files changed, 372 insertions(+), 17 deletions(-) diff --git a/src/inc/apiv2/common/AbstractBaseAPI.class.php b/src/inc/apiv2/common/AbstractBaseAPI.class.php index a9e38ccd1..71c5a23a3 100644 --- a/src/inc/apiv2/common/AbstractBaseAPI.class.php +++ b/src/inc/apiv2/common/AbstractBaseAPI.class.php @@ -1,4 +1,6 @@ container = $container; } - - + /** + * Checks if a user has access to the given single element retrieved + * @param User $user + * @param object $object + * @return bool true if the access is allowed + */ + protected function getSingleACL(User $user, object $object): bool { + return true; + } + + /** + * Returns an array containing all filters and joins to be added to the query to ensure + * that only the elements are retrieved matching the access groups the user is in + * @return array + */ protected function getFilterACL(): array { return []; } @@ -163,8 +178,7 @@ final protected function mapFeatures($features) { /** * Retrieve currently logged-in user */ - final protected function getCurrentUser() - { + final protected function getCurrentUser(): User { return $this->user; } diff --git a/src/inc/apiv2/common/AbstractModelAPI.class.php b/src/inc/apiv2/common/AbstractModelAPI.class.php index f6b138230..de2a99a94 100644 --- a/src/inc/apiv2/common/AbstractModelAPI.class.php +++ b/src/inc/apiv2/common/AbstractModelAPI.class.php @@ -410,6 +410,9 @@ protected function doFetch(string $pk): mixed if ($object === null) { throw new ResourceNotFoundError(); } + if ($this->getSingleACL($this->getCurrentUser(), $object) === false) { + throw new HttpForbidden("No access to this object!", 403); + } return $object; } @@ -493,10 +496,17 @@ public static function getManyResources(object $apiClass, Request $request, Resp /* Generate filters */ $filters = $apiClass->getFilters($request); $qFs_Filter = $apiClass->makeFilter($filters, $apiClass); - $qFs_ACL = $apiClass->getFilterACL(); - $qFs = array_merge($qFs_ACL, $qFs_Filter); - if (count($qFs) > 0) { - $aFs[Factory::FILTER] = $qFs; + + $aFs_ACL = $apiClass->getFilterACL(); + if (isset($aFs_ACL[Factory::FILTER])) { + $qFs_Filter = array_merge($aFs_ACL[Factory::FILTER], $qFs_Filter); + } + if (isset($aFs_ACL[Factory::JOIN])){ + $aFs[Factory::JOIN] = $aFs_ACL[Factory::JOIN]; + } + + if (count($qFs_Filter) > 0) { + $aFs[Factory::FILTER] = $qFs_Filter; } /** diff --git a/src/inc/apiv2/model/agentassignments.routes.php b/src/inc/apiv2/model/agentassignments.routes.php index 502bcd0d9..936cf310d 100644 --- a/src/inc/apiv2/model/agentassignments.routes.php +++ b/src/inc/apiv2/model/agentassignments.routes.php @@ -1,11 +1,19 @@ get($object->getAgentId()); + $accessGroupsAgent = Util::arrayOfIds(AccessUtils::getAccessGroupsOfAgent($agent)); + + return count(array_intersect($accessGroupsAgent, $accessGroupsUser)) > 0; + } + + protected function getFilterACL(): array { + $accessGroups = Util::arrayOfIds(AccessUtils::getAccessGroupsOfUser($this->getCurrentUser())); + return [ + Factory::JOIN => [ + new JoinFilter(Factory::getAccessGroupAgentFactory(), Assignment::AGENT_ID, AccessGroupAgent::AGENT_ID), + new JoinFilter(Factory::getTaskFactory(), Assignment::TASK_ID, Task::TASK_ID), + new JoinFilter(Factory::getTaskWrapperFactory(), Task::TASK_WRAPPER_ID, TaskWrapper::TASK_WRAPPER_ID, Factory::getTaskFactory()), + new JoinFilter(Factory::getHashlistFactory(), TaskWrapper::HASHLIST_ID, Hashlist::HASHLIST_ID, Factory::getTaskWrapperFactory()), + ], + Factory::FILTER => [ + new ContainFilter(AccessGroupAgent::ACCESS_GROUP_ID, $accessGroups, Factory::getAccessGroupAgentFactory()), + new ContainFilter(Hashlist::ACCESS_GROUP_ID, $accessGroups, Factory::getHashlistFactory()), + ] + ]; + } + public static function getToOneRelationships(): array { return [ 'agent' => [ - 'key' => Assignment::AGENT_ID, + 'key' => Assignment::AGENT_ID, 'relationType' => Agent::class, 'relationKey' => Agent::AGENT_ID, ], 'task' => [ - 'key' => Assignment::TASK_ID, + 'key' => Assignment::TASK_ID, 'relationType' => Task::class, 'relationKey' => Task::TASK_ID, diff --git a/src/inc/apiv2/model/agenterrors.routes.php b/src/inc/apiv2/model/agenterrors.routes.php index 0d7040ad2..5a115f298 100644 --- a/src/inc/apiv2/model/agenterrors.routes.php +++ b/src/inc/apiv2/model/agenterrors.routes.php @@ -1,7 +1,14 @@ get($object->getAgentId()); + $accessGroupsAgent = Util::arrayOfIds(AccessUtils::getAccessGroupsOfAgent($agent)); + + return count(array_intersect($accessGroupsAgent, $accessGroupsUser)) > 0; + } + + protected function getFilterACL(): array { + $accessGroups = Util::arrayOfIds(AccessUtils::getAccessGroupsOfUser($this->getCurrentUser())); + + return [ + Factory::JOIN => [ + new JoinFilter(Factory::getAccessGroupAgentFactory(), AgentError::AGENT_ID, AccessGroupAgent::AGENT_ID), + new JoinFilter(Factory::getTaskFactory(), AgentError::TASK_ID, Task::TASK_ID), + new JoinFilter(Factory::getTaskWrapperFactory(), Task::TASK_WRAPPER_ID, TaskWrapper::TASK_WRAPPER_ID, Factory::getTaskFactory()), + new JoinFilter(Factory::getHashlistFactory(), TaskWrapper::HASHLIST_ID, Hashlist::HASHLIST_ID, Factory::getTaskWrapperFactory()), + ], + Factory::FILTER => [ + new ContainFilter(AccessGroupAgent::ACCESS_GROUP_ID, $accessGroups, Factory::getAccessGroupAgentFactory()), + new ContainFilter(Hashlist::ACCESS_GROUP_ID, $accessGroups, Factory::getHashlistFactory()), + ] + ]; + } protected function createObject(array $data): int { assert(False, "AgentErrors cannot be created via API"); diff --git a/src/inc/apiv2/model/agents.routes.php b/src/inc/apiv2/model/agents.routes.php index d131eab4e..25a9710be 100644 --- a/src/inc/apiv2/model/agents.routes.php +++ b/src/inc/apiv2/model/agents.routes.php @@ -1,4 +1,6 @@ fn ($value) => AgentUtils::changeIgnoreErrors($id, $value, $current_user), ]; } + + protected function getSingleACL(User $user, object $object): bool { + $accessGroupsUser = Util::arrayOfIds(AccessUtils::getAccessGroupsOfUser($user)); + /** @var Agent $object */ + $accessGroupsAgent = Util::arrayOfIds(AccessUtils::getAccessGroupsOfAgent($object)); + + return count(array_intersect($accessGroupsAgent, $accessGroupsUser)) > 0; + } + + protected function getFilterACL(): array { + $accessGroups = Util::arrayOfIds(AccessUtils::getAccessGroupsOfUser($this->getCurrentUser())); + + return [ + Factory::JOIN => [ + new JoinFilter(Factory::getAccessGroupAgentFactory(), Agent::AGENT_ID, AccessGroupAgent::AGENT_ID)], Factory::FILTER => [new ContainFilter(AccessGroupAgent::ACCESS_GROUP_ID, $accessGroups), + ] + ]; + } public static function getToManyRelationships(): array { return [ diff --git a/src/inc/apiv2/model/agentstats.routes.php b/src/inc/apiv2/model/agentstats.routes.php index 84d76c834..b39e26250 100644 --- a/src/inc/apiv2/model/agentstats.routes.php +++ b/src/inc/apiv2/model/agentstats.routes.php @@ -1,7 +1,12 @@ get($object->getAgentId()); + $accessGroupsAgent = Util::arrayOfIds(AccessUtils::getAccessGroupsOfAgent($agent)); + + return count(array_intersect($accessGroupsAgent, $accessGroupsUser)) > 0; + } + + protected function getFilterACL(): array { + $accessGroups = Util::arrayOfIds(AccessUtils::getAccessGroupsOfUser($this->getCurrentUser())); + + return [ + Factory::JOIN => [ + new JoinFilter(Factory::getAccessGroupAgentFactory(), AgentStat::AGENT_ID, AccessGroupAgent::AGENT_ID), + ], + Factory::FILTER => [ + new ContainFilter(AccessGroupAgent::ACCESS_GROUP_ID, $accessGroups, Factory::getAccessGroupAgentFactory()), + ] + ]; + } protected function createObject(array $data): int { assert(False, "AgentStats cannot be created via API"); diff --git a/src/inc/apiv2/model/chunks.routes.php b/src/inc/apiv2/model/chunks.routes.php index 8808b1ae1..c45f48d58 100644 --- a/src/inc/apiv2/model/chunks.routes.php +++ b/src/inc/apiv2/model/chunks.routes.php @@ -1,9 +1,17 @@ getId(), "="); + $jF1 = new JoinFilter(Factory::getTaskFactory(), Chunk::TASK_ID, Task::TASK_ID); + $jF2 = new JoinFilter(Factory::getTaskWrapperFactory(), Task::TASK_WRAPPER_ID, TaskWrapper::TASK_WRAPPER_ID, Factory::getTaskFactory()); + $jF3 = new JoinFilter(Factory::getHashlistFactory(), TaskWrapper::HASHLIST_ID, Hashlist::HASHLIST_ID, Factory::getTaskWrapperFactory()); + $chunks = Factory::getChunkFactory()->filter([Factory::FILTER => [$qF1, $qF2], Factory::JOIN => [$jF1, $jF2, $jF3]])[Factory::getChunkFactory()->getModelName()]; + + return count($chunks) > 0; + } + + protected function getFilterACL(): array { + $accessGroups = Util::arrayOfIds(AccessUtils::getAccessGroupsOfUser($this->getCurrentUser())); + + return [ + Factory::JOIN => [ + new JoinFilter(Factory::getAccessGroupAgentFactory(), Chunk::AGENT_ID, AccessGroupAgent::AGENT_ID), + new JoinFilter(Factory::getTaskFactory(), Chunk::TASK_ID, Task::TASK_ID), + new JoinFilter(Factory::getTaskWrapperFactory(), Task::TASK_WRAPPER_ID, TaskWrapper::TASK_WRAPPER_ID, Factory::getTaskFactory()), + new JoinFilter(Factory::getHashlistFactory(), TaskWrapper::HASHLIST_ID, Hashlist::HASHLIST_ID, Factory::getTaskWrapperFactory()), + ], + Factory::FILTER => [ + new ContainFilter(AccessGroupAgent::ACCESS_GROUP_ID, $accessGroups, Factory::getAccessGroupAgentFactory()), + new ContainFilter(Hashlist::ACCESS_GROUP_ID, $accessGroups, Factory::getHashlistFactory()), + ] + ]; + } public static function getToOneRelationships(): array { return [ diff --git a/src/inc/apiv2/model/files.routes.php b/src/inc/apiv2/model/files.routes.php index 4dfed8bda..0f0814fa6 100644 --- a/src/inc/apiv2/model/files.routes.php +++ b/src/inc/apiv2/model/files.routes.php @@ -1,11 +1,14 @@ getAccessGroupId(), $accessGroupsUser); + } + + protected function getFilterACL(): array { + $accessGroups = Util::arrayOfIds(AccessUtils::getAccessGroupsOfUser($this->getCurrentUser())); + + return [ + Factory::FILTER => [ + new ContainFilter(File::ACCESS_GROUP_ID, $accessGroups), + ] + ]; + } public static function getToOneRelationships(): array { return [ diff --git a/src/inc/apiv2/model/hashes.routes.php b/src/inc/apiv2/model/hashes.routes.php index bace3f676..8f4f2e0cf 100644 --- a/src/inc/apiv2/model/hashes.routes.php +++ b/src/inc/apiv2/model/hashes.routes.php @@ -1,9 +1,13 @@ get($object->getHashlistId()); + + return in_array($hashlist->getAccessGroupId(), $accessGroupsUser); + } + + protected function getFilterACL(): array { + $accessGroups = Util::arrayOfIds(AccessUtils::getAccessGroupsOfUser($this->getCurrentUser())); + + return [ + Factory::JOIN => [ + new JoinFilter(Factory::getHashlistFactory(), Hash::HASHLIST_ID, Hashlist::HASHLIST_ID), + ], + Factory::FILTER => [ + new ContainFilter(Hashlist::ACCESS_GROUP_ID, $accessGroups, Factory::getHashlistFactory()), + ] + ]; + } public static function getToOneRelationships(): array { return [ diff --git a/src/inc/apiv2/model/hashlists.routes.php b/src/inc/apiv2/model/hashlists.routes.php index 56d9bcba1..1ee0e60ba 100644 --- a/src/inc/apiv2/model/hashlists.routes.php +++ b/src/inc/apiv2/model/hashlists.routes.php @@ -11,6 +11,7 @@ use DBA\Task; use DBA\TaskWrapper; +use DBA\User; use Middlewares\Utils\HttpErrorException; require_once(dirname(__FILE__) . "/../common/AbstractModelAPI.class.php"); @@ -75,9 +76,19 @@ public static function getToManyRelationships(): array { ], ]; } + + protected function getSingleACL(User $user, object $object): bool { + $accessGroupsUser = Util::arrayOfIds(AccessUtils::getAccessGroupsOfUser($user)); + + return in_array($object->getAccessGroupId(), $accessGroupsUser); + } protected function getFilterACL(): array { - return [new ContainFilter(Hashlist::ACCESS_GROUP_ID, Util::arrayOfIds(AccessUtils::getAccessGroupsOfUser($this->getCurrentUser())))]; + return [ + Factory::FILTER => [ + new ContainFilter(Hashlist::ACCESS_GROUP_ID, Util::arrayOfIds(AccessUtils::getAccessGroupsOfUser($this->getCurrentUser()))) + ] + ]; } public function getFormFields(): array { diff --git a/src/inc/apiv2/model/healthcheckagents.routes.php b/src/inc/apiv2/model/healthcheckagents.routes.php index bf1538f19..0a8fa8fcc 100644 --- a/src/inc/apiv2/model/healthcheckagents.routes.php +++ b/src/inc/apiv2/model/healthcheckagents.routes.php @@ -1,9 +1,14 @@ get($object->getAgentId()); + $accessGroupsAgent = Util::arrayOfIds(AccessUtils::getAccessGroupsOfAgent($agent)); + + return count(array_intersect($accessGroupsAgent, $accessGroupsUser)) > 0; + } + + protected function getFilterACL(): array { + $accessGroups = Util::arrayOfIds(AccessUtils::getAccessGroupsOfUser($this->getCurrentUser())); + + return [ + Factory::JOIN => [ + new JoinFilter(Factory::getAccessGroupAgentFactory(), HealthCheckAgent::AGENT_ID, AccessGroupAgent::AGENT_ID), + ], + Factory::FILTER => [ + new ContainFilter(AccessGroupAgent::ACCESS_GROUP_ID, $accessGroups, Factory::getAccessGroupAgentFactory()), + ] + ]; + } public static function getToOneRelationships(): array { return [ diff --git a/src/inc/apiv2/model/speeds.routes.php b/src/inc/apiv2/model/speeds.routes.php index 9e49e2848..48e541f6a 100644 --- a/src/inc/apiv2/model/speeds.routes.php +++ b/src/inc/apiv2/model/speeds.routes.php @@ -1,9 +1,16 @@ get($object->getAgentId()); + $accessGroupsAgent = Util::arrayOfIds(AccessUtils::getAccessGroupsOfAgent($agent)); + + if (count(array_intersect($accessGroupsAgent, $accessGroupsUser)) == 0){ + return false; + } + + $qF = new ContainFilter(Hashlist::ACCESS_GROUP_ID, $accessGroupsUser, Factory::getHashlistFactory()); + $jF1 = new JoinFilter(Factory::getTaskFactory(), Speed::TASK_ID, Task::TASK_ID); + $jF2 = new JoinFilter(Factory::getTaskWrapperFactory(), Task::TASK_WRAPPER_ID, TaskWrapper::TASK_WRAPPER_ID, Factory::getTaskFactory()); + $jF3 = new JoinFilter(Factory::getHashlistFactory(), TaskWrapper::HASHLIST_ID, Hashlist::HASHLIST_ID, Factory::getTaskWrapperFactory()); + $hashlist = Factory::getSpeedFactory()->filter([Factory::FILTER => $qF, Factory::JOIN => [$jF1, $jF2, $jF3]])[Factory::getSpeedFactory()->getModelName()]; + + return count($hashlist) > 0; + } + + protected function getFilterACL(): array { + $accessGroups = Util::arrayOfIds(AccessUtils::getAccessGroupsOfUser($this->getCurrentUser())); + + return [ + Factory::JOIN => [ + new JoinFilter(Factory::getAccessGroupAgentFactory(), Speed::AGENT_ID, AccessGroupAgent::AGENT_ID), + new JoinFilter(Factory::getTaskFactory(), Speed::TASK_ID, Task::TASK_ID), + new JoinFilter(Factory::getTaskWrapperFactory(), Task::TASK_WRAPPER_ID, TaskWrapper::TASK_WRAPPER_ID, Factory::getTaskFactory()), + new JoinFilter(Factory::getHashlistFactory(), TaskWrapper::HASHLIST_ID, Hashlist::HASHLIST_ID, Factory::getTaskWrapperFactory()), + ], + Factory::FILTER => [ + new ContainFilter(AccessGroupAgent::ACCESS_GROUP_ID, $accessGroups, Factory::getAccessGroupAgentFactory()), + new ContainFilter(Hashlist::ACCESS_GROUP_ID, $accessGroups, Factory::getHashlistFactory()), + ] + ]; + } public static function getToOneRelationships(): array { diff --git a/src/inc/apiv2/model/tasks.routes.php b/src/inc/apiv2/model/tasks.routes.php index 0b2e45077..60cc1865a 100644 --- a/src/inc/apiv2/model/tasks.routes.php +++ b/src/inc/apiv2/model/tasks.routes.php @@ -1,4 +1,7 @@ getId(), "="); + $jF1 = new JoinFilter(Factory::getTaskWrapperFactory(), Task::TASK_WRAPPER_ID, TaskWrapper::TASK_WRAPPER_ID, Factory::getTaskFactory()); + $jF2 = new JoinFilter(Factory::getHashlistFactory(), TaskWrapper::HASHLIST_ID, Hashlist::HASHLIST_ID, Factory::getTaskWrapperFactory()); + $tasks = Factory::getTaskFactory()->filter([Factory::FILTER => [$qF1, $qF2], Factory::JOIN => [$jF1, $jF2]])[Factory::getTaskFactory()->getModelName()]; + + return count($tasks) > 0; + } + + protected function getFilterACL(): array { + $accessGroups = Util::arrayOfIds(AccessUtils::getAccessGroupsOfUser($this->getCurrentUser())); + + return [ + Factory::JOIN => [ + new JoinFilter(Factory::getTaskWrapperFactory(), Task::TASK_WRAPPER_ID, TaskWrapper::TASK_WRAPPER_ID), + new JoinFilter(Factory::getHashlistFactory(), TaskWrapper::HASHLIST_ID, Hashlist::HASHLIST_ID, Factory::getTaskWrapperFactory()), + ], + Factory::FILTER => [ + new ContainFilter(Hashlist::ACCESS_GROUP_ID, $accessGroups, Factory::getHashlistFactory()), + ] + ]; + } public static function getToOneRelationships(): array { return [ diff --git a/src/inc/apiv2/model/taskwrappers.routes.php b/src/inc/apiv2/model/taskwrappers.routes.php index e0bcc5d07..25af553bf 100644 --- a/src/inc/apiv2/model/taskwrappers.routes.php +++ b/src/inc/apiv2/model/taskwrappers.routes.php @@ -1,6 +1,7 @@ getId(), "="); + $jF = new JoinFilter(Factory::getHashlistFactory(), TaskWrapper::HASHLIST_ID, Hashlist::HASHLIST_ID); + $wrappers = Factory::getTaskWrapperFactory()->filter([Factory::FILTER => [$qF1, $qF2], Factory::JOIN => $jF])[Factory::getTaskWrapperFactory()->getModelName()]; + + return count($wrappers) > 0; + } + + protected function getFilterACL(): array { + $accessGroups = Util::arrayOfIds(AccessUtils::getAccessGroupsOfUser($this->getCurrentUser())); + + return [ + Factory::JOIN => [ + new JoinFilter(Factory::getHashlistFactory(), TaskWrapper::HASHLIST_ID, Hashlist::HASHLIST_ID), + ], + Factory::FILTER => [ + new ContainFilter(Hashlist::ACCESS_GROUP_ID, $accessGroups, Factory::getHashlistFactory()), + ] + ]; + } public static function getToOneRelationships(): array { return [ diff --git a/src/inc/utils/AccessUtils.class.php b/src/inc/utils/AccessUtils.class.php index 0c3ebd95f..a1db60d7d 100644 --- a/src/inc/utils/AccessUtils.class.php +++ b/src/inc/utils/AccessUtils.class.php @@ -145,10 +145,10 @@ public static function getAccessGroupsOfUser($user) { } /** - * @param $agent Agent + * @param Agent $agent * @return AccessGroup[] */ - public static function getAccessGroupsOfAgent($agent) { + public static function getAccessGroupsOfAgent(Agent $agent): array { $qF = new QueryFilter(AccessGroupAgent::AGENT_ID, $agent->getId(), "=", Factory::getAccessGroupAgentFactory()); $jF = new JoinFilter(Factory::getAccessGroupAgentFactory(), AccessGroup::ACCESS_GROUP_ID, AccessGroupAgent::ACCESS_GROUP_ID); $joined = Factory::getAccessGroupFactory()->filter([Factory::FILTER => $qF, Factory::JOIN => $jF]); @@ -204,4 +204,4 @@ public static function agentCanAccessTask($agent, $task) { } return true; } -} \ No newline at end of file +} From 5c58674bbd0ec76f721da07a2f3cc8f997c790e8 Mon Sep 17 00:00:00 2001 From: Sein Coray Date: Thu, 26 Jun 2025 09:05:11 +0200 Subject: [PATCH 099/691] Adding public attributes to endpoints (#1397) * added public attribute settings to generated and regenerated models * fixed entries which were not updated in the generator.php * added determining of public attributes on permission check and implemented handling in obvious cases of helpers where public attributes will not be available * fixed typing issue * fixed permission check in helpers * updated composer to only accept php8 and added first check for simple and list requests for public attributes * implemented public attribute filtering for all cases now --- composer.json | 6 +- composer.lock | 336 +++++++++--------- src/dba/models/AccessGroup.class.php | 4 +- src/dba/models/AccessGroupAgent.class.php | 6 +- src/dba/models/AccessGroupUser.class.php | 6 +- src/dba/models/Agent.class.php | 32 +- src/dba/models/AgentBinary.class.php | 14 +- src/dba/models/AgentError.class.php | 12 +- src/dba/models/AgentStat.class.php | 10 +- src/dba/models/AgentZap.class.php | 6 +- src/dba/models/ApiGroup.class.php | 6 +- src/dba/models/ApiKey.class.php | 14 +- src/dba/models/Assignment.class.php | 8 +- src/dba/models/Chunk.class.php | 24 +- src/dba/models/Config.class.php | 8 +- src/dba/models/ConfigSection.class.php | 4 +- src/dba/models/CrackerBinary.class.php | 10 +- src/dba/models/CrackerBinaryType.class.php | 6 +- src/dba/models/Factory.template.txt | 1 + src/dba/models/File.class.php | 14 +- src/dba/models/FileDelete.class.php | 6 +- src/dba/models/FileDownload.class.php | 8 +- src/dba/models/FilePretask.class.php | 6 +- src/dba/models/FileTask.class.php | 6 +- src/dba/models/Hash.class.php | 18 +- src/dba/models/HashBinary.class.php | 18 +- src/dba/models/HashType.class.php | 8 +- src/dba/models/Hashlist.class.php | 30 +- src/dba/models/HashlistHashlist.class.php | 6 +- src/dba/models/HealthCheck.class.php | 16 +- src/dba/models/HealthCheckAgent.class.php | 18 +- src/dba/models/LogEntry.class.php | 12 +- src/dba/models/NotificationSetting.class.php | 14 +- src/dba/models/Preprocessor.class.php | 14 +- src/dba/models/Pretask.class.php | 26 +- src/dba/models/RegVoucher.class.php | 6 +- src/dba/models/RightGroup.class.php | 6 +- src/dba/models/Session.class.php | 14 +- src/dba/models/Speed.class.php | 10 +- src/dba/models/StoredValue.class.php | 4 +- src/dba/models/Supertask.class.php | 4 +- src/dba/models/SupertaskPretask.class.php | 6 +- src/dba/models/Task.class.php | 48 +-- src/dba/models/TaskDebugOutput.class.php | 6 +- src/dba/models/TaskWrapper.class.php | 18 +- src/dba/models/User.class.php | 32 +- src/dba/models/Zap.class.php | 10 +- src/dba/models/generator.php | 17 +- .../apiv2/common/AbstractBaseAPI.class.php | 86 ++++- 49 files changed, 540 insertions(+), 460 deletions(-) diff --git a/composer.json b/composer.json index a94940c31..71e85fb34 100644 --- a/composer.json +++ b/composer.json @@ -7,17 +7,17 @@ "router", "psr7" ], - "homepage": "http://github.com/hashtopolis/server", + "homepage": "https://github.com/hashtopolis/server", "license": "MIT", "authors": [ { "name": "Various Authors", "email": "noreply@example.org", - "homepage": "http://example.org" + "homepage": "https://example.org" } ], "require": { - "php": "^7.4 || ^8.0", + "php": "^8.0", "ext-json": "*", "ext-pdo": "*", "crell/api-problem": "^3.6", diff --git a/composer.lock b/composer.lock index 4075ded6d..18b6e0c14 100644 --- a/composer.lock +++ b/composer.lock @@ -4,7 +4,7 @@ "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies", "This file is @generated automatically" ], - "content-hash": "6a357741d92415a1fe0b0b8344e3c53c", + "content-hash": "448d813b74a8b1d0a517cf71e22a34a6", "packages": [ { "name": "crell/api-problem", @@ -253,31 +253,31 @@ }, { "name": "middlewares/encoder", - "version": "v2.1.1", + "version": "v2.2.0", "source": { "type": "git", "url": "https://github.com/middlewares/encoder.git", - "reference": "6fd1744bcf88bec4e3dea0ca98ed6f900cc41ce0" + "reference": "08097bf64bcafc997ffd52757e2c63b4d9cd4265" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/middlewares/encoder/zipball/6fd1744bcf88bec4e3dea0ca98ed6f900cc41ce0", - "reference": "6fd1744bcf88bec4e3dea0ca98ed6f900cc41ce0", + "url": "https://api.github.com/repos/middlewares/encoder/zipball/08097bf64bcafc997ffd52757e2c63b4d9cd4265", + "reference": "08097bf64bcafc997ffd52757e2c63b4d9cd4265", "shasum": "" }, "require": { "ext-zlib": "*", - "middlewares/utils": "^3.0", + "middlewares/utils": "^2 || ^3 || ^4", "php": "^7.2 || ^8.0", - "psr/http-server-middleware": "^1.0" + "psr/http-server-middleware": "^1" }, "require-dev": { - "friendsofphp/php-cs-fixer": "^2.0", - "laminas/laminas-diactoros": "^2.2", - "oscarotero/php-cs-fixer-config": "^1.0", - "phpstan/phpstan": "^0.12", - "phpunit/phpunit": "^8|^9", - "squizlabs/php_codesniffer": "^3.0" + "friendsofphp/php-cs-fixer": "^3", + "laminas/laminas-diactoros": "^2 || ^3", + "oscarotero/php-cs-fixer-config": "^2", + "phpstan/phpstan": "^1 || ^2", + "phpunit/phpunit": "^8 || ^9", + "squizlabs/php_codesniffer": "^3" }, "type": "library", "autoload": { @@ -303,37 +303,37 @@ ], "support": { "issues": "https://github.com/middlewares/encoder/issues", - "source": "https://github.com/middlewares/encoder/tree/v2.1.1" + "source": "https://github.com/middlewares/encoder/tree/v2.2.0" }, - "time": "2020-12-03T01:13:28+00:00" + "time": "2025-03-23T10:27:13+00:00" }, { "name": "middlewares/negotiation", - "version": "v2.1.1", + "version": "v2.2.0", "source": { "type": "git", "url": "https://github.com/middlewares/negotiation.git", - "reference": "d2d44ea744109216ef9569653c179b2005c77a85" + "reference": "9c7baf2a3b72c8bdf389a8ed325a1d1e21ef365c" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/middlewares/negotiation/zipball/d2d44ea744109216ef9569653c179b2005c77a85", - "reference": "d2d44ea744109216ef9569653c179b2005c77a85", + "url": "https://api.github.com/repos/middlewares/negotiation/zipball/9c7baf2a3b72c8bdf389a8ed325a1d1e21ef365c", + "reference": "9c7baf2a3b72c8bdf389a8ed325a1d1e21ef365c", "shasum": "" }, "require": { - "middlewares/utils": "^3.0 || ^4.0", + "middlewares/utils": "^2 || ^3 || ^4", "php": "^7.2 || ^8.0", - "psr/http-server-middleware": "^1.0", + "psr/http-server-middleware": "^1", "willdurand/negotiation": "^3.0" }, "require-dev": { - "friendsofphp/php-cs-fixer": "^2.0", - "laminas/laminas-diactoros": "^2.2", - "oscarotero/php-cs-fixer-config": "^1.0", - "phpstan/phpstan": "^0.12", - "phpunit/phpunit": "^8|^9|^10|^11", - "squizlabs/php_codesniffer": "^3.0" + "friendsofphp/php-cs-fixer": "^3", + "laminas/laminas-diactoros": "^2 || ^3", + "oscarotero/php-cs-fixer-config": "^2", + "phpstan/phpstan": "^1 || ^2", + "phpunit/phpunit": "^8 || ^9", + "squizlabs/php_codesniffer": "^3" }, "type": "library", "autoload": { @@ -360,45 +360,42 @@ ], "support": { "issues": "https://github.com/middlewares/negotiation/issues", - "source": "https://github.com/middlewares/negotiation/tree/v2.1.1" + "source": "https://github.com/middlewares/negotiation/tree/v2.2.0" }, - "time": "2024-03-24T14:24:30+00:00" + "time": "2025-03-22T16:14:38+00:00" }, { "name": "middlewares/utils", - "version": "v3.3.0", + "version": "v4.0.2", "source": { "type": "git", "url": "https://github.com/middlewares/utils.git", - "reference": "670b135ce0dbd040eadb025a9388f9bd617cc010" + "reference": "749a3055972ebf4197f663eedcb38cae3c81f1c8" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/middlewares/utils/zipball/670b135ce0dbd040eadb025a9388f9bd617cc010", - "reference": "670b135ce0dbd040eadb025a9388f9bd617cc010", + "url": "https://api.github.com/repos/middlewares/utils/zipball/749a3055972ebf4197f663eedcb38cae3c81f1c8", + "reference": "749a3055972ebf4197f663eedcb38cae3c81f1c8", "shasum": "" }, "require": { - "php": "^7.2 || ^8.0", + "php": ">=8.1", "psr/container": "^1.0 || ^2.0", "psr/http-factory": "^1.0", - "psr/http-message": "^1.0", + "psr/http-message": "^1.0 || ^2.0", "psr/http-server-middleware": "^1.0" }, "require-dev": { - "friendsofphp/php-cs-fixer": "^v2.16", - "guzzlehttp/psr7": "^2.0", - "laminas/laminas-diactoros": "^2.4", - "nyholm/psr7": "^1.0", - "oscarotero/php-cs-fixer-config": "^1.0", - "phpstan/phpstan": "^0.12", - "phpunit/phpunit": "^8|^9", - "slim/psr7": "^1.4", - "squizlabs/php_codesniffer": "^3.5", - "sunrise/http-message": "^1.0", - "sunrise/http-server-request": "^1.0", - "sunrise/stream": "^1.0.15", - "sunrise/uri": "^1.0.15" + "friendsofphp/php-cs-fixer": "^3.41", + "guzzlehttp/psr7": "^2.6", + "laminas/laminas-diactoros": "^3.3", + "nyholm/psr7": "^1.8", + "oscarotero/php-cs-fixer-config": "^2.0", + "phpstan/phpstan": "^1.10", + "phpunit/phpunit": "^10.5", + "slim/psr7": "^1.6", + "squizlabs/php_codesniffer": "^3.8", + "sunrise/http-message": "^3.0" }, "type": "library", "autoload": { @@ -422,9 +419,9 @@ ], "support": { "issues": "https://github.com/middlewares/utils/issues", - "source": "https://github.com/middlewares/utils/tree/v3.3.0" + "source": "https://github.com/middlewares/utils/tree/v4.0.2" }, - "time": "2021-07-04T17:56:23+00:00" + "time": "2025-01-23T13:33:55+00:00" }, { "name": "monolog/monolog", @@ -580,16 +577,16 @@ }, { "name": "php-di/invoker", - "version": "2.3.4", + "version": "2.3.6", "source": { "type": "git", "url": "https://github.com/PHP-DI/Invoker.git", - "reference": "33234b32dafa8eb69202f950a1fc92055ed76a86" + "reference": "59f15608528d8a8838d69b422a919fd6b16aa576" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/PHP-DI/Invoker/zipball/33234b32dafa8eb69202f950a1fc92055ed76a86", - "reference": "33234b32dafa8eb69202f950a1fc92055ed76a86", + "url": "https://api.github.com/repos/PHP-DI/Invoker/zipball/59f15608528d8a8838d69b422a919fd6b16aa576", + "reference": "59f15608528d8a8838d69b422a919fd6b16aa576", "shasum": "" }, "require": { @@ -623,7 +620,7 @@ ], "support": { "issues": "https://github.com/PHP-DI/Invoker/issues", - "source": "https://github.com/PHP-DI/Invoker/tree/2.3.4" + "source": "https://github.com/PHP-DI/Invoker/tree/2.3.6" }, "funding": [ { @@ -631,7 +628,7 @@ "type": "github" } ], - "time": "2023-09-08T09:24:21+00:00" + "time": "2025-01-17T12:49:27+00:00" }, { "name": "php-di/php-di", @@ -816,16 +813,16 @@ }, { "name": "psr/http-message", - "version": "1.1", + "version": "2.0", "source": { "type": "git", "url": "https://github.com/php-fig/http-message.git", - "reference": "cb6ce4845ce34a8ad9e68117c10ee90a29919eba" + "reference": "402d35bcb92c70c026d1a6a9883f06b2ead23d71" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/php-fig/http-message/zipball/cb6ce4845ce34a8ad9e68117c10ee90a29919eba", - "reference": "cb6ce4845ce34a8ad9e68117c10ee90a29919eba", + "url": "https://api.github.com/repos/php-fig/http-message/zipball/402d35bcb92c70c026d1a6a9883f06b2ead23d71", + "reference": "402d35bcb92c70c026d1a6a9883f06b2ead23d71", "shasum": "" }, "require": { @@ -834,7 +831,7 @@ "type": "library", "extra": { "branch-alias": { - "dev-master": "1.1.x-dev" + "dev-master": "2.0.x-dev" } }, "autoload": { @@ -849,7 +846,7 @@ "authors": [ { "name": "PHP-FIG", - "homepage": "http://www.php-fig.org/" + "homepage": "https://www.php-fig.org/" } ], "description": "Common interface for HTTP messages", @@ -863,9 +860,9 @@ "response" ], "support": { - "source": "https://github.com/php-fig/http-message/tree/1.1" + "source": "https://github.com/php-fig/http-message/tree/2.0" }, - "time": "2023-04-04T09:50:52+00:00" + "time": "2023-04-04T09:54:51+00:00" }, { "name": "psr/http-server-handler", @@ -1076,16 +1073,16 @@ }, { "name": "slim/psr7", - "version": "1.7.0", + "version": "1.7.1", "source": { "type": "git", "url": "https://github.com/slimphp/Slim-Psr7.git", - "reference": "753e9646def5ff4db1a06e5cf4ef539bfd30f467" + "reference": "fe98653e7983010aa85c1d137c9b9ad5a1cd187d" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/slimphp/Slim-Psr7/zipball/753e9646def5ff4db1a06e5cf4ef539bfd30f467", - "reference": "753e9646def5ff4db1a06e5cf4ef539bfd30f467", + "url": "https://api.github.com/repos/slimphp/Slim-Psr7/zipball/fe98653e7983010aa85c1d137c9b9ad5a1cd187d", + "reference": "fe98653e7983010aa85c1d137c9b9ad5a1cd187d", "shasum": "" }, "require": { @@ -1103,12 +1100,12 @@ "require-dev": { "adriansuter/php-autoload-override": "^1.4", "ext-json": "*", - "http-interop/http-factory-tests": "^1.1.0", - "php-http/psr7-integration-tests": "1.3.0", + "http-interop/http-factory-tests": "^1.0 || ^2.0", + "php-http/psr7-integration-tests": "^1.4", "phpspec/prophecy": "^1.19", "phpspec/prophecy-phpunit": "^2.2", - "phpstan/phpstan": "^1.11", - "phpunit/phpunit": "^9.6", + "phpstan/phpstan": "^2.1", + "phpunit/phpunit": "^9.6 || ^10", "squizlabs/php_codesniffer": "^3.10" }, "type": "library", @@ -1125,22 +1122,22 @@ { "name": "Josh Lockhart", "email": "hello@joshlockhart.com", - "homepage": "http://joshlockhart.com" + "homepage": "https://joshlockhart.com" }, { "name": "Andrew Smith", "email": "a.smith@silentworks.co.uk", - "homepage": "http://silentworks.co.uk" + "homepage": "https://silentworks.co.uk" }, { "name": "Rob Allen", "email": "rob@akrabat.com", - "homepage": "http://akrabat.com" + "homepage": "https://akrabat.com" }, { "name": "Pierre Berube", "email": "pierre@lgse.com", - "homepage": "http://www.lgse.com" + "homepage": "https://www.lgse.com" } ], "description": "Strict PSR-7 implementation", @@ -1152,9 +1149,9 @@ ], "support": { "issues": "https://github.com/slimphp/Slim-Psr7/issues", - "source": "https://github.com/slimphp/Slim-Psr7/tree/1.7.0" + "source": "https://github.com/slimphp/Slim-Psr7/tree/1.7.1" }, - "time": "2024-06-08T14:48:17+00:00" + "time": "2025-05-13T14:24:12+00:00" }, { "name": "slim/slim", @@ -1274,16 +1271,16 @@ }, { "name": "symfony/polyfill-php80", - "version": "v1.31.0", + "version": "v1.32.0", "source": { "type": "git", "url": "https://github.com/symfony/polyfill-php80.git", - "reference": "60328e362d4c2c802a54fcbf04f9d3fb892b4cf8" + "reference": "0cc9dd0f17f61d8131e7df6b84bd344899fe2608" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/polyfill-php80/zipball/60328e362d4c2c802a54fcbf04f9d3fb892b4cf8", - "reference": "60328e362d4c2c802a54fcbf04f9d3fb892b4cf8", + "url": "https://api.github.com/repos/symfony/polyfill-php80/zipball/0cc9dd0f17f61d8131e7df6b84bd344899fe2608", + "reference": "0cc9dd0f17f61d8131e7df6b84bd344899fe2608", "shasum": "" }, "require": { @@ -1292,8 +1289,8 @@ "type": "library", "extra": { "thanks": { - "name": "symfony/polyfill", - "url": "https://github.com/symfony/polyfill" + "url": "https://github.com/symfony/polyfill", + "name": "symfony/polyfill" } }, "autoload": { @@ -1334,7 +1331,7 @@ "shim" ], "support": { - "source": "https://github.com/symfony/polyfill-php80/tree/v1.31.0" + "source": "https://github.com/symfony/polyfill-php80/tree/v1.32.0" }, "funding": [ { @@ -1350,7 +1347,7 @@ "type": "tidelift" } ], - "time": "2024-09-09T11:45:10+00:00" + "time": "2025-01-02T08:10:11+00:00" }, { "name": "tuupola/callable-handler", @@ -1673,29 +1670,30 @@ "packages-dev": [ { "name": "doctrine/deprecations", - "version": "1.1.3", + "version": "1.1.5", "source": { "type": "git", "url": "https://github.com/doctrine/deprecations.git", - "reference": "dfbaa3c2d2e9a9df1118213f3b8b0c597bb99fab" + "reference": "459c2f5dd3d6a4633d3b5f46ee2b1c40f57d3f38" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/doctrine/deprecations/zipball/dfbaa3c2d2e9a9df1118213f3b8b0c597bb99fab", - "reference": "dfbaa3c2d2e9a9df1118213f3b8b0c597bb99fab", + "url": "https://api.github.com/repos/doctrine/deprecations/zipball/459c2f5dd3d6a4633d3b5f46ee2b1c40f57d3f38", + "reference": "459c2f5dd3d6a4633d3b5f46ee2b1c40f57d3f38", "shasum": "" }, "require": { "php": "^7.1 || ^8.0" }, + "conflict": { + "phpunit/phpunit": "<=7.5 || >=13" + }, "require-dev": { - "doctrine/coding-standard": "^9", - "phpstan/phpstan": "1.4.10 || 1.10.15", - "phpstan/phpstan-phpunit": "^1.0", - "phpunit/phpunit": "^7.5 || ^8.5 || ^9.5", - "psalm/plugin-phpunit": "0.18.4", - "psr/log": "^1 || ^2 || ^3", - "vimeo/psalm": "4.30.0 || 5.12.0" + "doctrine/coding-standard": "^9 || ^12 || ^13", + "phpstan/phpstan": "1.4.10 || 2.1.11", + "phpstan/phpstan-phpunit": "^1.0 || ^2", + "phpunit/phpunit": "^7.5 || ^8.5 || ^9.6 || ^10.5 || ^11.5 || ^12", + "psr/log": "^1 || ^2 || ^3" }, "suggest": { "psr/log": "Allows logging deprecations via PSR-3 logger implementation" @@ -1703,7 +1701,7 @@ "type": "library", "autoload": { "psr-4": { - "Doctrine\\Deprecations\\": "lib/Doctrine/Deprecations" + "Doctrine\\Deprecations\\": "src" } }, "notification-url": "https://packagist.org/downloads/", @@ -1714,9 +1712,9 @@ "homepage": "https://www.doctrine-project.org/", "support": { "issues": "https://github.com/doctrine/deprecations/issues", - "source": "https://github.com/doctrine/deprecations/tree/1.1.3" + "source": "https://github.com/doctrine/deprecations/tree/1.1.5" }, - "time": "2024-01-30T19:34:25+00:00" + "time": "2025-04-07T20:06:18+00:00" }, { "name": "doctrine/instantiator", @@ -1849,16 +1847,16 @@ }, { "name": "myclabs/deep-copy", - "version": "1.12.1", + "version": "1.13.1", "source": { "type": "git", "url": "https://github.com/myclabs/DeepCopy.git", - "reference": "123267b2c49fbf30d78a7b2d333f6be754b94845" + "reference": "1720ddd719e16cf0db4eb1c6eca108031636d46c" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/myclabs/DeepCopy/zipball/123267b2c49fbf30d78a7b2d333f6be754b94845", - "reference": "123267b2c49fbf30d78a7b2d333f6be754b94845", + "url": "https://api.github.com/repos/myclabs/DeepCopy/zipball/1720ddd719e16cf0db4eb1c6eca108031636d46c", + "reference": "1720ddd719e16cf0db4eb1c6eca108031636d46c", "shasum": "" }, "require": { @@ -1897,7 +1895,7 @@ ], "support": { "issues": "https://github.com/myclabs/DeepCopy/issues", - "source": "https://github.com/myclabs/DeepCopy/tree/1.12.1" + "source": "https://github.com/myclabs/DeepCopy/tree/1.13.1" }, "funding": [ { @@ -1905,20 +1903,20 @@ "type": "tidelift" } ], - "time": "2024-11-08T17:47:46+00:00" + "time": "2025-04-29T12:36:36+00:00" }, { "name": "nikic/php-parser", - "version": "v5.3.1", + "version": "v5.5.0", "source": { "type": "git", "url": "https://github.com/nikic/PHP-Parser.git", - "reference": "8eea230464783aa9671db8eea6f8c6ac5285794b" + "reference": "ae59794362fe85e051a58ad36b289443f57be7a9" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/nikic/PHP-Parser/zipball/8eea230464783aa9671db8eea6f8c6ac5285794b", - "reference": "8eea230464783aa9671db8eea6f8c6ac5285794b", + "url": "https://api.github.com/repos/nikic/PHP-Parser/zipball/ae59794362fe85e051a58ad36b289443f57be7a9", + "reference": "ae59794362fe85e051a58ad36b289443f57be7a9", "shasum": "" }, "require": { @@ -1961,9 +1959,9 @@ ], "support": { "issues": "https://github.com/nikic/PHP-Parser/issues", - "source": "https://github.com/nikic/PHP-Parser/tree/v5.3.1" + "source": "https://github.com/nikic/PHP-Parser/tree/v5.5.0" }, - "time": "2024-10-08T18:51:32+00:00" + "time": "2025-05-31T08:24:38+00:00" }, { "name": "phar-io/manifest", @@ -2138,16 +2136,16 @@ }, { "name": "phpdocumentor/reflection-docblock", - "version": "5.6.0", + "version": "5.6.2", "source": { "type": "git", "url": "https://github.com/phpDocumentor/ReflectionDocBlock.git", - "reference": "f3558a4c23426d12bffeaab463f8a8d8b681193c" + "reference": "92dde6a5919e34835c506ac8c523ef095a95ed62" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/phpDocumentor/ReflectionDocBlock/zipball/f3558a4c23426d12bffeaab463f8a8d8b681193c", - "reference": "f3558a4c23426d12bffeaab463f8a8d8b681193c", + "url": "https://api.github.com/repos/phpDocumentor/ReflectionDocBlock/zipball/92dde6a5919e34835c506ac8c523ef095a95ed62", + "reference": "92dde6a5919e34835c506ac8c523ef095a95ed62", "shasum": "" }, "require": { @@ -2196,9 +2194,9 @@ "description": "With this component, a library can provide support for annotations via DocBlocks or otherwise retrieve information that is embedded in a DocBlock.", "support": { "issues": "https://github.com/phpDocumentor/ReflectionDocBlock/issues", - "source": "https://github.com/phpDocumentor/ReflectionDocBlock/tree/5.6.0" + "source": "https://github.com/phpDocumentor/ReflectionDocBlock/tree/5.6.2" }, - "time": "2024-11-12T11:25:25+00:00" + "time": "2025-04-13T19:20:35+00:00" }, { "name": "phpdocumentor/type-resolver", @@ -2260,29 +2258,29 @@ }, { "name": "phpspec/prophecy", - "version": "v1.20.0", + "version": "v1.22.0", "source": { "type": "git", "url": "https://github.com/phpspec/prophecy.git", - "reference": "a0165c648cab6a80311c74ffc708a07bb53ecc93" + "reference": "35f1adb388946d92e6edab2aa2cb2b60e132ebd5" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/phpspec/prophecy/zipball/a0165c648cab6a80311c74ffc708a07bb53ecc93", - "reference": "a0165c648cab6a80311c74ffc708a07bb53ecc93", + "url": "https://api.github.com/repos/phpspec/prophecy/zipball/35f1adb388946d92e6edab2aa2cb2b60e132ebd5", + "reference": "35f1adb388946d92e6edab2aa2cb2b60e132ebd5", "shasum": "" }, "require": { "doctrine/instantiator": "^1.2 || ^2.0", - "php": "^7.2 || 8.0.* || 8.1.* || 8.2.* || 8.3.* || 8.4.*", + "php": "^7.4 || 8.0.* || 8.1.* || 8.2.* || 8.3.* || 8.4.*", "phpdocumentor/reflection-docblock": "^5.2", - "sebastian/comparator": "^3.0 || ^4.0 || ^5.0 || ^6.0", - "sebastian/recursion-context": "^3.0 || ^4.0 || ^5.0 || ^6.0" + "sebastian/comparator": "^3.0 || ^4.0 || ^5.0 || ^6.0 || ^7.0", + "sebastian/recursion-context": "^3.0 || ^4.0 || ^5.0 || ^6.0 || ^7.0" }, "require-dev": { "friendsofphp/php-cs-fixer": "^3.40", "phpspec/phpspec": "^6.0 || ^7.0", - "phpstan/phpstan": "^1.9", + "phpstan/phpstan": "^2.1.13", "phpunit/phpunit": "^8.0 || ^9.0 || ^10.0" }, "type": "library", @@ -2324,28 +2322,28 @@ ], "support": { "issues": "https://github.com/phpspec/prophecy/issues", - "source": "https://github.com/phpspec/prophecy/tree/v1.20.0" + "source": "https://github.com/phpspec/prophecy/tree/v1.22.0" }, - "time": "2024-11-19T13:12:41+00:00" + "time": "2025-04-29T14:58:06+00:00" }, { "name": "phpspec/prophecy-phpunit", - "version": "v2.3.0", + "version": "v2.4.0", "source": { "type": "git", "url": "https://github.com/phpspec/prophecy-phpunit.git", - "reference": "8819516c1b489ecee4c60db5f5432fac1ea8ac6f" + "reference": "d3c28041d9390c9bca325a08c5b2993ac855bded" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/phpspec/prophecy-phpunit/zipball/8819516c1b489ecee4c60db5f5432fac1ea8ac6f", - "reference": "8819516c1b489ecee4c60db5f5432fac1ea8ac6f", + "url": "https://api.github.com/repos/phpspec/prophecy-phpunit/zipball/d3c28041d9390c9bca325a08c5b2993ac855bded", + "reference": "d3c28041d9390c9bca325a08c5b2993ac855bded", "shasum": "" }, "require": { "php": "^7.3 || ^8", "phpspec/prophecy": "^1.18", - "phpunit/phpunit": "^9.1 || ^10.1 || ^11.0" + "phpunit/phpunit": "^9.1 || ^10.1 || ^11.0 || ^12.0" }, "require-dev": { "phpstan/phpstan": "^1.10" @@ -2379,9 +2377,9 @@ ], "support": { "issues": "https://github.com/phpspec/prophecy-phpunit/issues", - "source": "https://github.com/phpspec/prophecy-phpunit/tree/v2.3.0" + "source": "https://github.com/phpspec/prophecy-phpunit/tree/v2.4.0" }, - "time": "2024-11-19T13:24:17+00:00" + "time": "2025-05-13T13:52:32+00:00" }, { "name": "phpstan/extension-installer", @@ -2433,16 +2431,16 @@ }, { "name": "phpstan/phpdoc-parser", - "version": "2.0.0", + "version": "2.1.0", "source": { "type": "git", "url": "https://github.com/phpstan/phpdoc-parser.git", - "reference": "c00d78fb6b29658347f9d37ebe104bffadf36299" + "reference": "9b30d6fd026b2c132b3985ce6b23bec09ab3aa68" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/phpstan/phpdoc-parser/zipball/c00d78fb6b29658347f9d37ebe104bffadf36299", - "reference": "c00d78fb6b29658347f9d37ebe104bffadf36299", + "url": "https://api.github.com/repos/phpstan/phpdoc-parser/zipball/9b30d6fd026b2c132b3985ce6b23bec09ab3aa68", + "reference": "9b30d6fd026b2c132b3985ce6b23bec09ab3aa68", "shasum": "" }, "require": { @@ -2474,22 +2472,22 @@ "description": "PHPDoc parser with support for nullable, intersection and generic types", "support": { "issues": "https://github.com/phpstan/phpdoc-parser/issues", - "source": "https://github.com/phpstan/phpdoc-parser/tree/2.0.0" + "source": "https://github.com/phpstan/phpdoc-parser/tree/2.1.0" }, - "time": "2024-10-13T11:29:49+00:00" + "time": "2025-02-19T13:28:12+00:00" }, { "name": "phpstan/phpstan", - "version": "1.12.11", + "version": "1.12.27", "source": { "type": "git", "url": "https://github.com/phpstan/phpstan.git", - "reference": "0d1fc20a962a91be578bcfe7cf939e6e1a2ff733" + "reference": "3a6e423c076ab39dfedc307e2ac627ef579db162" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/phpstan/phpstan/zipball/0d1fc20a962a91be578bcfe7cf939e6e1a2ff733", - "reference": "0d1fc20a962a91be578bcfe7cf939e6e1a2ff733", + "url": "https://api.github.com/repos/phpstan/phpstan/zipball/3a6e423c076ab39dfedc307e2ac627ef579db162", + "reference": "3a6e423c076ab39dfedc307e2ac627ef579db162", "shasum": "" }, "require": { @@ -2534,7 +2532,7 @@ "type": "github" } ], - "time": "2024-11-17T14:08:01+00:00" + "time": "2025-05-21T20:51:45+00:00" }, { "name": "phpunit/php-code-coverage", @@ -2857,16 +2855,16 @@ }, { "name": "phpunit/phpunit", - "version": "9.6.21", + "version": "9.6.23", "source": { "type": "git", "url": "https://github.com/sebastianbergmann/phpunit.git", - "reference": "de6abf3b6f8dd955fac3caad3af7a9504e8c2ffa" + "reference": "43d2cb18d0675c38bd44982a5d1d88f6d53d8d95" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/sebastianbergmann/phpunit/zipball/de6abf3b6f8dd955fac3caad3af7a9504e8c2ffa", - "reference": "de6abf3b6f8dd955fac3caad3af7a9504e8c2ffa", + "url": "https://api.github.com/repos/sebastianbergmann/phpunit/zipball/43d2cb18d0675c38bd44982a5d1d88f6d53d8d95", + "reference": "43d2cb18d0675c38bd44982a5d1d88f6d53d8d95", "shasum": "" }, "require": { @@ -2877,7 +2875,7 @@ "ext-mbstring": "*", "ext-xml": "*", "ext-xmlwriter": "*", - "myclabs/deep-copy": "^1.12.0", + "myclabs/deep-copy": "^1.13.1", "phar-io/manifest": "^2.0.4", "phar-io/version": "^3.2.1", "php": ">=7.3", @@ -2940,7 +2938,7 @@ "support": { "issues": "https://github.com/sebastianbergmann/phpunit/issues", "security": "https://github.com/sebastianbergmann/phpunit/security/policy", - "source": "https://github.com/sebastianbergmann/phpunit/tree/9.6.21" + "source": "https://github.com/sebastianbergmann/phpunit/tree/9.6.23" }, "funding": [ { @@ -2951,12 +2949,20 @@ "url": "https://github.com/sebastianbergmann", "type": "github" }, + { + "url": "https://liberapay.com/sebastianbergmann", + "type": "liberapay" + }, + { + "url": "https://thanks.dev/u/gh/sebastianbergmann", + "type": "thanks_dev" + }, { "url": "https://tidelift.com/funding/github/packagist/phpunit/phpunit", "type": "tidelift" } ], - "time": "2024-09-19T10:50:18+00:00" + "time": "2025-05-02T06:40:34+00:00" }, { "name": "sebastian/cli-parser", @@ -3923,16 +3929,16 @@ }, { "name": "squizlabs/php_codesniffer", - "version": "3.11.1", + "version": "3.13.2", "source": { "type": "git", "url": "https://github.com/PHPCSStandards/PHP_CodeSniffer.git", - "reference": "19473c30efe4f7b3cd42522d0b2e6e7f243c6f87" + "reference": "5b5e3821314f947dd040c70f7992a64eac89025c" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/PHPCSStandards/PHP_CodeSniffer/zipball/19473c30efe4f7b3cd42522d0b2e6e7f243c6f87", - "reference": "19473c30efe4f7b3cd42522d0b2e6e7f243c6f87", + "url": "https://api.github.com/repos/PHPCSStandards/PHP_CodeSniffer/zipball/5b5e3821314f947dd040c70f7992a64eac89025c", + "reference": "5b5e3821314f947dd040c70f7992a64eac89025c", "shasum": "" }, "require": { @@ -3997,9 +4003,13 @@ { "url": "https://opencollective.com/php_codesniffer", "type": "open_collective" + }, + { + "url": "https://thanks.dev/u/gh/phpcsstandards", + "type": "thanks_dev" } ], - "time": "2024-11-16T12:02:36+00:00" + "time": "2025-06-17T22:17:01+00:00" }, { "name": "theseer/tokenizer", @@ -4112,14 +4122,14 @@ ], "aliases": [], "minimum-stability": "stable", - "stability-flags": [], + "stability-flags": {}, "prefer-stable": false, "prefer-lowest": false, "platform": { - "php": "^7.4 || ^8.0", + "php": "^8.0", "ext-json": "*", "ext-pdo": "*" }, - "platform-dev": [], - "plugin-api-version": "2.3.0" -} \ No newline at end of file + "platform-dev": {}, + "plugin-api-version": "2.6.0" +} diff --git a/src/dba/models/AccessGroup.class.php b/src/dba/models/AccessGroup.class.php index 66483c10a..1fa73a754 100644 --- a/src/dba/models/AccessGroup.class.php +++ b/src/dba/models/AccessGroup.class.php @@ -21,8 +21,8 @@ function getKeyValueDict() { static function getFeatures() { $dict = array(); - $dict['accessGroupId'] = ['read_only' => True, "type" => "int", "subtype" => "unset", "choices" => "unset", "null" => False, "pk" => True, "protected" => True, "private" => False, "alias" => "accessGroupId"]; - $dict['groupName'] = ['read_only' => False, "type" => "str(50)", "subtype" => "unset", "choices" => "unset", "null" => False, "pk" => False, "protected" => False, "private" => False, "alias" => "groupName"]; + $dict['accessGroupId'] = ['read_only' => True, "type" => "int", "subtype" => "unset", "choices" => "unset", "null" => False, "pk" => True, "protected" => True, "private" => False, "alias" => "accessGroupId", "public" => False]; + $dict['groupName'] = ['read_only' => False, "type" => "str(50)", "subtype" => "unset", "choices" => "unset", "null" => False, "pk" => False, "protected" => False, "private" => False, "alias" => "groupName", "public" => False]; return $dict; } diff --git a/src/dba/models/AccessGroupAgent.class.php b/src/dba/models/AccessGroupAgent.class.php index 21f9e75e6..858f32ea0 100644 --- a/src/dba/models/AccessGroupAgent.class.php +++ b/src/dba/models/AccessGroupAgent.class.php @@ -24,9 +24,9 @@ function getKeyValueDict() { static function getFeatures() { $dict = array(); - $dict['accessGroupAgentId'] = ['read_only' => True, "type" => "int", "subtype" => "unset", "choices" => "unset", "null" => False, "pk" => True, "protected" => True, "private" => False, "alias" => "accessGroupAgentId"]; - $dict['accessGroupId'] = ['read_only' => True, "type" => "int", "subtype" => "unset", "choices" => "unset", "null" => False, "pk" => False, "protected" => False, "private" => False, "alias" => "accessGroupId"]; - $dict['agentId'] = ['read_only' => True, "type" => "int", "subtype" => "unset", "choices" => "unset", "null" => False, "pk" => False, "protected" => False, "private" => False, "alias" => "agentId"]; + $dict['accessGroupAgentId'] = ['read_only' => True, "type" => "int", "subtype" => "unset", "choices" => "unset", "null" => False, "pk" => True, "protected" => True, "private" => False, "alias" => "accessGroupAgentId", "public" => False]; + $dict['accessGroupId'] = ['read_only' => True, "type" => "int", "subtype" => "unset", "choices" => "unset", "null" => False, "pk" => False, "protected" => False, "private" => False, "alias" => "accessGroupId", "public" => False]; + $dict['agentId'] = ['read_only' => True, "type" => "int", "subtype" => "unset", "choices" => "unset", "null" => False, "pk" => False, "protected" => False, "private" => False, "alias" => "agentId", "public" => False]; return $dict; } diff --git a/src/dba/models/AccessGroupUser.class.php b/src/dba/models/AccessGroupUser.class.php index d2fc421e4..47e846466 100644 --- a/src/dba/models/AccessGroupUser.class.php +++ b/src/dba/models/AccessGroupUser.class.php @@ -24,9 +24,9 @@ function getKeyValueDict() { static function getFeatures() { $dict = array(); - $dict['accessGroupUserId'] = ['read_only' => True, "type" => "int", "subtype" => "unset", "choices" => "unset", "null" => False, "pk" => True, "protected" => True, "private" => False, "alias" => "accessGroupUserId"]; - $dict['accessGroupId'] = ['read_only' => True, "type" => "int", "subtype" => "unset", "choices" => "unset", "null" => False, "pk" => False, "protected" => False, "private" => False, "alias" => "accessGroupId"]; - $dict['userId'] = ['read_only' => True, "type" => "int", "subtype" => "unset", "choices" => "unset", "null" => False, "pk" => False, "protected" => False, "private" => False, "alias" => "userId"]; + $dict['accessGroupUserId'] = ['read_only' => True, "type" => "int", "subtype" => "unset", "choices" => "unset", "null" => False, "pk" => True, "protected" => True, "private" => False, "alias" => "accessGroupUserId", "public" => False]; + $dict['accessGroupId'] = ['read_only' => True, "type" => "int", "subtype" => "unset", "choices" => "unset", "null" => False, "pk" => False, "protected" => False, "private" => False, "alias" => "accessGroupId", "public" => False]; + $dict['userId'] = ['read_only' => True, "type" => "int", "subtype" => "unset", "choices" => "unset", "null" => False, "pk" => False, "protected" => False, "private" => False, "alias" => "userId", "public" => False]; return $dict; } diff --git a/src/dba/models/Agent.class.php b/src/dba/models/Agent.class.php index 4c54d213f..56f0eea4b 100644 --- a/src/dba/models/Agent.class.php +++ b/src/dba/models/Agent.class.php @@ -63,22 +63,22 @@ function getKeyValueDict() { static function getFeatures() { $dict = array(); - $dict['agentId'] = ['read_only' => True, "type" => "int", "subtype" => "unset", "choices" => "unset", "null" => False, "pk" => True, "protected" => True, "private" => False, "alias" => "agentId"]; - $dict['agentName'] = ['read_only' => False, "type" => "str(100)", "subtype" => "unset", "choices" => "unset", "null" => False, "pk" => False, "protected" => False, "private" => False, "alias" => "agentName"]; - $dict['uid'] = ['read_only' => False, "type" => "str(100)", "subtype" => "unset", "choices" => "unset", "null" => False, "pk" => False, "protected" => False, "private" => False, "alias" => "uid"]; - $dict['os'] = ['read_only' => False, "type" => "int", "subtype" => "unset", "choices" => "unset", "null" => False, "pk" => False, "protected" => False, "private" => False, "alias" => "os"]; - $dict['devices'] = ['read_only' => False, "type" => "str(65535)", "subtype" => "unset", "choices" => "unset", "null" => False, "pk" => False, "protected" => False, "private" => False, "alias" => "devices"]; - $dict['cmdPars'] = ['read_only' => False, "type" => "str(65535)", "subtype" => "unset", "choices" => "unset", "null" => False, "pk" => False, "protected" => False, "private" => False, "alias" => "cmdPars"]; - $dict['ignoreErrors'] = ['read_only' => False, "type" => "int", "subtype" => "unset", "choices" => [0 => "Deactivate agent on error", 1 => "Keep agent running, but save errors", 2 => "Keep agent running and discard errors", ], "null" => False, "pk" => False, "protected" => False, "private" => False, "alias" => "ignoreErrors"]; - $dict['isActive'] = ['read_only' => False, "type" => "bool", "subtype" => "unset", "choices" => "unset", "null" => False, "pk" => False, "protected" => False, "private" => False, "alias" => "isActive"]; - $dict['isTrusted'] = ['read_only' => False, "type" => "bool", "subtype" => "unset", "choices" => "unset", "null" => False, "pk" => False, "protected" => False, "private" => False, "alias" => "isTrusted"]; - $dict['token'] = ['read_only' => False, "type" => "str(30)", "subtype" => "unset", "choices" => "unset", "null" => False, "pk" => False, "protected" => False, "private" => False, "alias" => "token"]; - $dict['lastAct'] = ['read_only' => True, "type" => "str(50)", "subtype" => "unset", "choices" => "unset", "null" => False, "pk" => False, "protected" => True, "private" => False, "alias" => "lastAct"]; - $dict['lastTime'] = ['read_only' => True, "type" => "int64", "subtype" => "unset", "choices" => "unset", "null" => False, "pk" => False, "protected" => True, "private" => False, "alias" => "lastTime"]; - $dict['lastIp'] = ['read_only' => True, "type" => "str(50)", "subtype" => "unset", "choices" => "unset", "null" => False, "pk" => False, "protected" => True, "private" => False, "alias" => "lastIp"]; - $dict['userId'] = ['read_only' => False, "type" => "int", "subtype" => "unset", "choices" => "unset", "null" => True, "pk" => False, "protected" => False, "private" => False, "alias" => "userId"]; - $dict['cpuOnly'] = ['read_only' => False, "type" => "bool", "subtype" => "unset", "choices" => "unset", "null" => False, "pk" => False, "protected" => False, "private" => False, "alias" => "cpuOnly"]; - $dict['clientSignature'] = ['read_only' => False, "type" => "str(50)", "subtype" => "unset", "choices" => "unset", "null" => False, "pk" => False, "protected" => False, "private" => False, "alias" => "clientSignature"]; + $dict['agentId'] = ['read_only' => True, "type" => "int", "subtype" => "unset", "choices" => "unset", "null" => False, "pk" => True, "protected" => True, "private" => False, "alias" => "agentId", "public" => False]; + $dict['agentName'] = ['read_only' => False, "type" => "str(100)", "subtype" => "unset", "choices" => "unset", "null" => False, "pk" => False, "protected" => False, "private" => False, "alias" => "agentName", "public" => False]; + $dict['uid'] = ['read_only' => False, "type" => "str(100)", "subtype" => "unset", "choices" => "unset", "null" => False, "pk" => False, "protected" => False, "private" => False, "alias" => "uid", "public" => False]; + $dict['os'] = ['read_only' => False, "type" => "int", "subtype" => "unset", "choices" => "unset", "null" => False, "pk" => False, "protected" => False, "private" => False, "alias" => "os", "public" => False]; + $dict['devices'] = ['read_only' => False, "type" => "str(65535)", "subtype" => "unset", "choices" => "unset", "null" => False, "pk" => False, "protected" => False, "private" => False, "alias" => "devices", "public" => False]; + $dict['cmdPars'] = ['read_only' => False, "type" => "str(65535)", "subtype" => "unset", "choices" => "unset", "null" => False, "pk" => False, "protected" => False, "private" => False, "alias" => "cmdPars", "public" => False]; + $dict['ignoreErrors'] = ['read_only' => False, "type" => "int", "subtype" => "unset", "choices" => [0 => "Deactivate agent on error", 1 => "Keep agent running, but save errors", 2 => "Keep agent running and discard errors", ], "null" => False, "pk" => False, "protected" => False, "private" => False, "alias" => "ignoreErrors", "public" => False]; + $dict['isActive'] = ['read_only' => False, "type" => "bool", "subtype" => "unset", "choices" => "unset", "null" => False, "pk" => False, "protected" => False, "private" => False, "alias" => "isActive", "public" => False]; + $dict['isTrusted'] = ['read_only' => False, "type" => "bool", "subtype" => "unset", "choices" => "unset", "null" => False, "pk" => False, "protected" => False, "private" => False, "alias" => "isTrusted", "public" => False]; + $dict['token'] = ['read_only' => False, "type" => "str(30)", "subtype" => "unset", "choices" => "unset", "null" => False, "pk" => False, "protected" => False, "private" => False, "alias" => "token", "public" => False]; + $dict['lastAct'] = ['read_only' => True, "type" => "str(50)", "subtype" => "unset", "choices" => "unset", "null" => False, "pk" => False, "protected" => True, "private" => False, "alias" => "lastAct", "public" => False]; + $dict['lastTime'] = ['read_only' => True, "type" => "int64", "subtype" => "unset", "choices" => "unset", "null" => False, "pk" => False, "protected" => True, "private" => False, "alias" => "lastTime", "public" => False]; + $dict['lastIp'] = ['read_only' => True, "type" => "str(50)", "subtype" => "unset", "choices" => "unset", "null" => False, "pk" => False, "protected" => True, "private" => False, "alias" => "lastIp", "public" => False]; + $dict['userId'] = ['read_only' => False, "type" => "int", "subtype" => "unset", "choices" => "unset", "null" => True, "pk" => False, "protected" => False, "private" => False, "alias" => "userId", "public" => False]; + $dict['cpuOnly'] = ['read_only' => False, "type" => "bool", "subtype" => "unset", "choices" => "unset", "null" => False, "pk" => False, "protected" => False, "private" => False, "alias" => "cpuOnly", "public" => False]; + $dict['clientSignature'] = ['read_only' => False, "type" => "str(50)", "subtype" => "unset", "choices" => "unset", "null" => False, "pk" => False, "protected" => False, "private" => False, "alias" => "clientSignature", "public" => False]; return $dict; } diff --git a/src/dba/models/AgentBinary.class.php b/src/dba/models/AgentBinary.class.php index 1e42a078b..12709fe74 100644 --- a/src/dba/models/AgentBinary.class.php +++ b/src/dba/models/AgentBinary.class.php @@ -36,13 +36,13 @@ function getKeyValueDict() { static function getFeatures() { $dict = array(); - $dict['agentBinaryId'] = ['read_only' => True, "type" => "int", "subtype" => "unset", "choices" => "unset", "null" => False, "pk" => True, "protected" => True, "private" => False, "alias" => "agentBinaryId"]; - $dict['type'] = ['read_only' => False, "type" => "str(20)", "subtype" => "unset", "choices" => "unset", "null" => False, "pk" => False, "protected" => False, "private" => False, "alias" => "type"]; - $dict['version'] = ['read_only' => False, "type" => "str(20)", "subtype" => "unset", "choices" => "unset", "null" => False, "pk" => False, "protected" => False, "private" => False, "alias" => "version"]; - $dict['operatingSystems'] = ['read_only' => False, "type" => "str(50)", "subtype" => "unset", "choices" => "unset", "null" => False, "pk" => False, "protected" => False, "private" => False, "alias" => "operatingSystems"]; - $dict['filename'] = ['read_only' => False, "type" => "str(50)", "subtype" => "unset", "choices" => "unset", "null" => False, "pk" => False, "protected" => False, "private" => False, "alias" => "filename"]; - $dict['updateTrack'] = ['read_only' => False, "type" => "str(20)", "subtype" => "unset", "choices" => "unset", "null" => False, "pk" => False, "protected" => False, "private" => False, "alias" => "updateTrack"]; - $dict['updateAvailable'] = ['read_only' => True, "type" => "str(20)", "subtype" => "unset", "choices" => "unset", "null" => False, "pk" => False, "protected" => True, "private" => False, "alias" => "updateAvailable"]; + $dict['agentBinaryId'] = ['read_only' => True, "type" => "int", "subtype" => "unset", "choices" => "unset", "null" => False, "pk" => True, "protected" => True, "private" => False, "alias" => "agentBinaryId", "public" => False]; + $dict['type'] = ['read_only' => False, "type" => "str(20)", "subtype" => "unset", "choices" => "unset", "null" => False, "pk" => False, "protected" => False, "private" => False, "alias" => "type", "public" => False]; + $dict['version'] = ['read_only' => False, "type" => "str(20)", "subtype" => "unset", "choices" => "unset", "null" => False, "pk" => False, "protected" => False, "private" => False, "alias" => "version", "public" => False]; + $dict['operatingSystems'] = ['read_only' => False, "type" => "str(50)", "subtype" => "unset", "choices" => "unset", "null" => False, "pk" => False, "protected" => False, "private" => False, "alias" => "operatingSystems", "public" => False]; + $dict['filename'] = ['read_only' => False, "type" => "str(50)", "subtype" => "unset", "choices" => "unset", "null" => False, "pk" => False, "protected" => False, "private" => False, "alias" => "filename", "public" => False]; + $dict['updateTrack'] = ['read_only' => False, "type" => "str(20)", "subtype" => "unset", "choices" => "unset", "null" => False, "pk" => False, "protected" => False, "private" => False, "alias" => "updateTrack", "public" => False]; + $dict['updateAvailable'] = ['read_only' => True, "type" => "str(20)", "subtype" => "unset", "choices" => "unset", "null" => False, "pk" => False, "protected" => True, "private" => False, "alias" => "updateAvailable", "public" => False]; return $dict; } diff --git a/src/dba/models/AgentError.class.php b/src/dba/models/AgentError.class.php index e7dfd42af..cb2106c89 100644 --- a/src/dba/models/AgentError.class.php +++ b/src/dba/models/AgentError.class.php @@ -33,12 +33,12 @@ function getKeyValueDict() { static function getFeatures() { $dict = array(); - $dict['agentErrorId'] = ['read_only' => True, "type" => "int", "subtype" => "unset", "choices" => "unset", "null" => False, "pk" => True, "protected" => True, "private" => False, "alias" => "agentErrorId"]; - $dict['agentId'] = ['read_only' => True, "type" => "int", "subtype" => "unset", "choices" => "unset", "null" => False, "pk" => False, "protected" => True, "private" => False, "alias" => "agentId"]; - $dict['taskId'] = ['read_only' => True, "type" => "int", "subtype" => "unset", "choices" => "unset", "null" => False, "pk" => False, "protected" => True, "private" => False, "alias" => "taskId"]; - $dict['chunkId'] = ['read_only' => True, "type" => "int", "subtype" => "unset", "choices" => "unset", "null" => False, "pk" => False, "protected" => True, "private" => False, "alias" => "chunkId"]; - $dict['time'] = ['read_only' => True, "type" => "int64", "subtype" => "unset", "choices" => "unset", "null" => False, "pk" => False, "protected" => True, "private" => False, "alias" => "time"]; - $dict['error'] = ['read_only' => True, "type" => "str(65535)", "subtype" => "unset", "choices" => "unset", "null" => False, "pk" => False, "protected" => True, "private" => False, "alias" => "error"]; + $dict['agentErrorId'] = ['read_only' => True, "type" => "int", "subtype" => "unset", "choices" => "unset", "null" => False, "pk" => True, "protected" => True, "private" => False, "alias" => "agentErrorId", "public" => False]; + $dict['agentId'] = ['read_only' => True, "type" => "int", "subtype" => "unset", "choices" => "unset", "null" => False, "pk" => False, "protected" => True, "private" => False, "alias" => "agentId", "public" => False]; + $dict['taskId'] = ['read_only' => True, "type" => "int", "subtype" => "unset", "choices" => "unset", "null" => False, "pk" => False, "protected" => True, "private" => False, "alias" => "taskId", "public" => False]; + $dict['chunkId'] = ['read_only' => True, "type" => "int", "subtype" => "unset", "choices" => "unset", "null" => False, "pk" => False, "protected" => True, "private" => False, "alias" => "chunkId", "public" => False]; + $dict['time'] = ['read_only' => True, "type" => "int64", "subtype" => "unset", "choices" => "unset", "null" => False, "pk" => False, "protected" => True, "private" => False, "alias" => "time", "public" => False]; + $dict['error'] = ['read_only' => True, "type" => "str(65535)", "subtype" => "unset", "choices" => "unset", "null" => False, "pk" => False, "protected" => True, "private" => False, "alias" => "error", "public" => False]; return $dict; } diff --git a/src/dba/models/AgentStat.class.php b/src/dba/models/AgentStat.class.php index 61b37734f..d292e9f53 100644 --- a/src/dba/models/AgentStat.class.php +++ b/src/dba/models/AgentStat.class.php @@ -30,11 +30,11 @@ function getKeyValueDict() { static function getFeatures() { $dict = array(); - $dict['agentStatId'] = ['read_only' => True, "type" => "int", "subtype" => "unset", "choices" => "unset", "null" => False, "pk" => True, "protected" => True, "private" => False, "alias" => "agentStatId"]; - $dict['agentId'] = ['read_only' => True, "type" => "int", "subtype" => "unset", "choices" => "unset", "null" => False, "pk" => False, "protected" => True, "private" => False, "alias" => "agentId"]; - $dict['statType'] = ['read_only' => True, "type" => "int", "subtype" => "unset", "choices" => "unset", "null" => False, "pk" => False, "protected" => True, "private" => False, "alias" => "statType"]; - $dict['time'] = ['read_only' => True, "type" => "int64", "subtype" => "unset", "choices" => "unset", "null" => False, "pk" => False, "protected" => True, "private" => False, "alias" => "time"]; - $dict['value'] = ['read_only' => True, "type" => "array", "subtype" => "int", "choices" => "unset", "null" => False, "pk" => False, "protected" => True, "private" => False, "alias" => "value"]; + $dict['agentStatId'] = ['read_only' => True, "type" => "int", "subtype" => "unset", "choices" => "unset", "null" => False, "pk" => True, "protected" => True, "private" => False, "alias" => "agentStatId", "public" => False]; + $dict['agentId'] = ['read_only' => True, "type" => "int", "subtype" => "unset", "choices" => "unset", "null" => False, "pk" => False, "protected" => True, "private" => False, "alias" => "agentId", "public" => False]; + $dict['statType'] = ['read_only' => True, "type" => "int", "subtype" => "unset", "choices" => "unset", "null" => False, "pk" => False, "protected" => True, "private" => False, "alias" => "statType", "public" => False]; + $dict['time'] = ['read_only' => True, "type" => "int64", "subtype" => "unset", "choices" => "unset", "null" => False, "pk" => False, "protected" => True, "private" => False, "alias" => "time", "public" => False]; + $dict['value'] = ['read_only' => True, "type" => "array", "subtype" => "int", "choices" => "unset", "null" => False, "pk" => False, "protected" => True, "private" => False, "alias" => "value", "public" => False]; return $dict; } diff --git a/src/dba/models/AgentZap.class.php b/src/dba/models/AgentZap.class.php index 8f38f1399..bde886edd 100644 --- a/src/dba/models/AgentZap.class.php +++ b/src/dba/models/AgentZap.class.php @@ -24,9 +24,9 @@ function getKeyValueDict() { static function getFeatures() { $dict = array(); - $dict['agentZapId'] = ['read_only' => True, "type" => "int", "subtype" => "unset", "choices" => "unset", "null" => False, "pk" => True, "protected" => True, "private" => False, "alias" => "agentZapId"]; - $dict['agentId'] = ['read_only' => True, "type" => "int", "subtype" => "unset", "choices" => "unset", "null" => False, "pk" => False, "protected" => True, "private" => False, "alias" => "agentId"]; - $dict['lastZapId'] = ['read_only' => True, "type" => "str(128)", "subtype" => "unset", "choices" => "unset", "null" => False, "pk" => False, "protected" => True, "private" => False, "alias" => "lastZapId"]; + $dict['agentZapId'] = ['read_only' => True, "type" => "int", "subtype" => "unset", "choices" => "unset", "null" => False, "pk" => True, "protected" => True, "private" => False, "alias" => "agentZapId", "public" => False]; + $dict['agentId'] = ['read_only' => True, "type" => "int", "subtype" => "unset", "choices" => "unset", "null" => False, "pk" => False, "protected" => True, "private" => False, "alias" => "agentId", "public" => False]; + $dict['lastZapId'] = ['read_only' => True, "type" => "str(128)", "subtype" => "unset", "choices" => "unset", "null" => False, "pk" => False, "protected" => True, "private" => False, "alias" => "lastZapId", "public" => False]; return $dict; } diff --git a/src/dba/models/ApiGroup.class.php b/src/dba/models/ApiGroup.class.php index 332cd8f17..3c516e141 100644 --- a/src/dba/models/ApiGroup.class.php +++ b/src/dba/models/ApiGroup.class.php @@ -24,9 +24,9 @@ function getKeyValueDict() { static function getFeatures() { $dict = array(); - $dict['apiGroupId'] = ['read_only' => True, "type" => "int", "subtype" => "unset", "choices" => "unset", "null" => False, "pk" => True, "protected" => True, "private" => False, "alias" => "apiGroupId"]; - $dict['permissions'] = ['read_only' => False, "type" => "str(65535)", "subtype" => "unset", "choices" => "unset", "null" => False, "pk" => False, "protected" => False, "private" => False, "alias" => "permissions"]; - $dict['name'] = ['read_only' => False, "type" => "str(100)", "subtype" => "unset", "choices" => "unset", "null" => False, "pk" => False, "protected" => False, "private" => False, "alias" => "name"]; + $dict['apiGroupId'] = ['read_only' => True, "type" => "int", "subtype" => "unset", "choices" => "unset", "null" => False, "pk" => True, "protected" => True, "private" => False, "alias" => "apiGroupId", "public" => False]; + $dict['permissions'] = ['read_only' => False, "type" => "str(65535)", "subtype" => "unset", "choices" => "unset", "null" => False, "pk" => False, "protected" => False, "private" => False, "alias" => "permissions", "public" => False]; + $dict['name'] = ['read_only' => False, "type" => "str(100)", "subtype" => "unset", "choices" => "unset", "null" => False, "pk" => False, "protected" => False, "private" => False, "alias" => "name", "public" => False]; return $dict; } diff --git a/src/dba/models/ApiKey.class.php b/src/dba/models/ApiKey.class.php index 99d3bbea8..5e5812500 100644 --- a/src/dba/models/ApiKey.class.php +++ b/src/dba/models/ApiKey.class.php @@ -36,13 +36,13 @@ function getKeyValueDict() { static function getFeatures() { $dict = array(); - $dict['apiKeyId'] = ['read_only' => True, "type" => "int", "subtype" => "unset", "choices" => "unset", "null" => False, "pk" => True, "protected" => True, "private" => False, "alias" => "apiKeyId"]; - $dict['startValid'] = ['read_only' => False, "type" => "int64", "subtype" => "unset", "choices" => "unset", "null" => False, "pk" => False, "protected" => False, "private" => False, "alias" => "startValid"]; - $dict['endValid'] = ['read_only' => False, "type" => "int64", "subtype" => "unset", "choices" => "unset", "null" => False, "pk" => False, "protected" => False, "private" => False, "alias" => "endValid"]; - $dict['accessKey'] = ['read_only' => True, "type" => "str(256)", "subtype" => "unset", "choices" => "unset", "null" => False, "pk" => False, "protected" => True, "private" => False, "alias" => "accessKey"]; - $dict['accessCount'] = ['read_only' => True, "type" => "int", "subtype" => "unset", "choices" => "unset", "null" => False, "pk" => False, "protected" => True, "private" => False, "alias" => "accessCount"]; - $dict['userId'] = ['read_only' => False, "type" => "int", "subtype" => "unset", "choices" => "unset", "null" => False, "pk" => False, "protected" => False, "private" => False, "alias" => "userId"]; - $dict['apiGroupId'] = ['read_only' => False, "type" => "int", "subtype" => "unset", "choices" => "unset", "null" => False, "pk" => False, "protected" => False, "private" => False, "alias" => "apiGroupId"]; + $dict['apiKeyId'] = ['read_only' => True, "type" => "int", "subtype" => "unset", "choices" => "unset", "null" => False, "pk" => True, "protected" => True, "private" => False, "alias" => "apiKeyId", "public" => False]; + $dict['startValid'] = ['read_only' => False, "type" => "int64", "subtype" => "unset", "choices" => "unset", "null" => False, "pk" => False, "protected" => False, "private" => False, "alias" => "startValid", "public" => False]; + $dict['endValid'] = ['read_only' => False, "type" => "int64", "subtype" => "unset", "choices" => "unset", "null" => False, "pk" => False, "protected" => False, "private" => False, "alias" => "endValid", "public" => False]; + $dict['accessKey'] = ['read_only' => True, "type" => "str(256)", "subtype" => "unset", "choices" => "unset", "null" => False, "pk" => False, "protected" => True, "private" => False, "alias" => "accessKey", "public" => False]; + $dict['accessCount'] = ['read_only' => True, "type" => "int", "subtype" => "unset", "choices" => "unset", "null" => False, "pk" => False, "protected" => True, "private" => False, "alias" => "accessCount", "public" => False]; + $dict['userId'] = ['read_only' => False, "type" => "int", "subtype" => "unset", "choices" => "unset", "null" => False, "pk" => False, "protected" => False, "private" => False, "alias" => "userId", "public" => False]; + $dict['apiGroupId'] = ['read_only' => False, "type" => "int", "subtype" => "unset", "choices" => "unset", "null" => False, "pk" => False, "protected" => False, "private" => False, "alias" => "apiGroupId", "public" => False]; return $dict; } diff --git a/src/dba/models/Assignment.class.php b/src/dba/models/Assignment.class.php index 06272567d..d20863e47 100644 --- a/src/dba/models/Assignment.class.php +++ b/src/dba/models/Assignment.class.php @@ -27,10 +27,10 @@ function getKeyValueDict() { static function getFeatures() { $dict = array(); - $dict['assignmentId'] = ['read_only' => True, "type" => "int", "subtype" => "unset", "choices" => "unset", "null" => False, "pk" => True, "protected" => True, "private" => False, "alias" => "assignmentId"]; - $dict['taskId'] = ['read_only' => False, "type" => "int", "subtype" => "unset", "choices" => "unset", "null" => False, "pk" => False, "protected" => False, "private" => False, "alias" => "taskId"]; - $dict['agentId'] = ['read_only' => False, "type" => "int", "subtype" => "unset", "choices" => "unset", "null" => False, "pk" => False, "protected" => False, "private" => False, "alias" => "agentId"]; - $dict['benchmark'] = ['read_only' => False, "type" => "str(50)", "subtype" => "unset", "choices" => "unset", "null" => True, "pk" => False, "protected" => False, "private" => False, "alias" => "benchmark"]; + $dict['assignmentId'] = ['read_only' => True, "type" => "int", "subtype" => "unset", "choices" => "unset", "null" => False, "pk" => True, "protected" => True, "private" => False, "alias" => "assignmentId", "public" => False]; + $dict['taskId'] = ['read_only' => False, "type" => "int", "subtype" => "unset", "choices" => "unset", "null" => False, "pk" => False, "protected" => False, "private" => False, "alias" => "taskId", "public" => False]; + $dict['agentId'] = ['read_only' => False, "type" => "int", "subtype" => "unset", "choices" => "unset", "null" => False, "pk" => False, "protected" => False, "private" => False, "alias" => "agentId", "public" => False]; + $dict['benchmark'] = ['read_only' => False, "type" => "str(50)", "subtype" => "unset", "choices" => "unset", "null" => True, "pk" => False, "protected" => False, "private" => False, "alias" => "benchmark", "public" => False]; return $dict; } diff --git a/src/dba/models/Chunk.class.php b/src/dba/models/Chunk.class.php index c23a9f88a..4ddf0fa3b 100644 --- a/src/dba/models/Chunk.class.php +++ b/src/dba/models/Chunk.class.php @@ -51,18 +51,18 @@ function getKeyValueDict() { static function getFeatures() { $dict = array(); - $dict['chunkId'] = ['read_only' => True, "type" => "int", "subtype" => "unset", "choices" => "unset", "null" => False, "pk" => True, "protected" => True, "private" => False, "alias" => "chunkId"]; - $dict['taskId'] = ['read_only' => True, "type" => "int", "subtype" => "unset", "choices" => "unset", "null" => False, "pk" => False, "protected" => True, "private" => False, "alias" => "taskId"]; - $dict['skip'] = ['read_only' => True, "type" => "uint64", "subtype" => "unset", "choices" => "unset", "null" => False, "pk" => False, "protected" => True, "private" => False, "alias" => "skip"]; - $dict['length'] = ['read_only' => True, "type" => "uint64", "subtype" => "unset", "choices" => "unset", "null" => False, "pk" => False, "protected" => True, "private" => False, "alias" => "length"]; - $dict['agentId'] = ['read_only' => True, "type" => "int", "subtype" => "unset", "choices" => "unset", "null" => False, "pk" => False, "protected" => True, "private" => False, "alias" => "agentId"]; - $dict['dispatchTime'] = ['read_only' => True, "type" => "int64", "subtype" => "unset", "choices" => "unset", "null" => False, "pk" => False, "protected" => True, "private" => False, "alias" => "dispatchTime"]; - $dict['solveTime'] = ['read_only' => True, "type" => "int64", "subtype" => "unset", "choices" => "unset", "null" => False, "pk" => False, "protected" => True, "private" => False, "alias" => "solveTime"]; - $dict['checkpoint'] = ['read_only' => True, "type" => "int64", "subtype" => "unset", "choices" => "unset", "null" => False, "pk" => False, "protected" => True, "private" => False, "alias" => "checkpoint"]; - $dict['progress'] = ['read_only' => True, "type" => "int", "subtype" => "unset", "choices" => "unset", "null" => False, "pk" => False, "protected" => True, "private" => False, "alias" => "progress"]; - $dict['state'] = ['read_only' => True, "type" => "int", "subtype" => "unset", "choices" => "unset", "null" => False, "pk" => False, "protected" => True, "private" => False, "alias" => "state"]; - $dict['cracked'] = ['read_only' => True, "type" => "int", "subtype" => "unset", "choices" => "unset", "null" => False, "pk" => False, "protected" => True, "private" => False, "alias" => "cracked"]; - $dict['speed'] = ['read_only' => True, "type" => "int64", "subtype" => "unset", "choices" => "unset", "null" => False, "pk" => False, "protected" => True, "private" => False, "alias" => "speed"]; + $dict['chunkId'] = ['read_only' => True, "type" => "int", "subtype" => "unset", "choices" => "unset", "null" => False, "pk" => True, "protected" => True, "private" => False, "alias" => "chunkId", "public" => False]; + $dict['taskId'] = ['read_only' => True, "type" => "int", "subtype" => "unset", "choices" => "unset", "null" => False, "pk" => False, "protected" => True, "private" => False, "alias" => "taskId", "public" => False]; + $dict['skip'] = ['read_only' => True, "type" => "uint64", "subtype" => "unset", "choices" => "unset", "null" => False, "pk" => False, "protected" => True, "private" => False, "alias" => "skip", "public" => False]; + $dict['length'] = ['read_only' => True, "type" => "uint64", "subtype" => "unset", "choices" => "unset", "null" => False, "pk" => False, "protected" => True, "private" => False, "alias" => "length", "public" => False]; + $dict['agentId'] = ['read_only' => True, "type" => "int", "subtype" => "unset", "choices" => "unset", "null" => False, "pk" => False, "protected" => True, "private" => False, "alias" => "agentId", "public" => False]; + $dict['dispatchTime'] = ['read_only' => True, "type" => "int64", "subtype" => "unset", "choices" => "unset", "null" => False, "pk" => False, "protected" => True, "private" => False, "alias" => "dispatchTime", "public" => False]; + $dict['solveTime'] = ['read_only' => True, "type" => "int64", "subtype" => "unset", "choices" => "unset", "null" => False, "pk" => False, "protected" => True, "private" => False, "alias" => "solveTime", "public" => False]; + $dict['checkpoint'] = ['read_only' => True, "type" => "int64", "subtype" => "unset", "choices" => "unset", "null" => False, "pk" => False, "protected" => True, "private" => False, "alias" => "checkpoint", "public" => False]; + $dict['progress'] = ['read_only' => True, "type" => "int", "subtype" => "unset", "choices" => "unset", "null" => False, "pk" => False, "protected" => True, "private" => False, "alias" => "progress", "public" => False]; + $dict['state'] = ['read_only' => True, "type" => "int", "subtype" => "unset", "choices" => "unset", "null" => False, "pk" => False, "protected" => True, "private" => False, "alias" => "state", "public" => False]; + $dict['cracked'] = ['read_only' => True, "type" => "int", "subtype" => "unset", "choices" => "unset", "null" => False, "pk" => False, "protected" => True, "private" => False, "alias" => "cracked", "public" => False]; + $dict['speed'] = ['read_only' => True, "type" => "int64", "subtype" => "unset", "choices" => "unset", "null" => False, "pk" => False, "protected" => True, "private" => False, "alias" => "speed", "public" => False]; return $dict; } diff --git a/src/dba/models/Config.class.php b/src/dba/models/Config.class.php index 2441a0d12..d83cf4cbb 100644 --- a/src/dba/models/Config.class.php +++ b/src/dba/models/Config.class.php @@ -27,10 +27,10 @@ function getKeyValueDict() { static function getFeatures() { $dict = array(); - $dict['configId'] = ['read_only' => True, "type" => "int", "subtype" => "unset", "choices" => "unset", "null" => False, "pk" => True, "protected" => True, "private" => False, "alias" => "configId"]; - $dict['configSectionId'] = ['read_only' => False, "type" => "int", "subtype" => "unset", "choices" => "unset", "null" => False, "pk" => False, "protected" => False, "private" => False, "alias" => "configSectionId"]; - $dict['item'] = ['read_only' => False, "type" => "str(128)", "subtype" => "unset", "choices" => "unset", "null" => False, "pk" => False, "protected" => False, "private" => False, "alias" => "item"]; - $dict['value'] = ['read_only' => False, "type" => "str(65535)", "subtype" => "unset", "choices" => "unset", "null" => False, "pk" => False, "protected" => False, "private" => False, "alias" => "value"]; + $dict['configId'] = ['read_only' => True, "type" => "int", "subtype" => "unset", "choices" => "unset", "null" => False, "pk" => True, "protected" => True, "private" => False, "alias" => "configId", "public" => False]; + $dict['configSectionId'] = ['read_only' => False, "type" => "int", "subtype" => "unset", "choices" => "unset", "null" => False, "pk" => False, "protected" => False, "private" => False, "alias" => "configSectionId", "public" => False]; + $dict['item'] = ['read_only' => False, "type" => "str(128)", "subtype" => "unset", "choices" => "unset", "null" => False, "pk" => False, "protected" => False, "private" => False, "alias" => "item", "public" => False]; + $dict['value'] = ['read_only' => False, "type" => "str(65535)", "subtype" => "unset", "choices" => "unset", "null" => False, "pk" => False, "protected" => False, "private" => False, "alias" => "value", "public" => False]; return $dict; } diff --git a/src/dba/models/ConfigSection.class.php b/src/dba/models/ConfigSection.class.php index f26503c75..2960cf303 100644 --- a/src/dba/models/ConfigSection.class.php +++ b/src/dba/models/ConfigSection.class.php @@ -21,8 +21,8 @@ function getKeyValueDict() { static function getFeatures() { $dict = array(); - $dict['configSectionId'] = ['read_only' => True, "type" => "int", "subtype" => "unset", "choices" => "unset", "null" => False, "pk" => True, "protected" => True, "private" => False, "alias" => "configSectionId"]; - $dict['sectionName'] = ['read_only' => False, "type" => "str(100)", "subtype" => "unset", "choices" => "unset", "null" => False, "pk" => False, "protected" => False, "private" => False, "alias" => "sectionName"]; + $dict['configSectionId'] = ['read_only' => True, "type" => "int", "subtype" => "unset", "choices" => "unset", "null" => False, "pk" => True, "protected" => True, "private" => False, "alias" => "configSectionId", "public" => False]; + $dict['sectionName'] = ['read_only' => False, "type" => "str(100)", "subtype" => "unset", "choices" => "unset", "null" => False, "pk" => False, "protected" => False, "private" => False, "alias" => "sectionName", "public" => False]; return $dict; } diff --git a/src/dba/models/CrackerBinary.class.php b/src/dba/models/CrackerBinary.class.php index d97a5edad..576304dba 100644 --- a/src/dba/models/CrackerBinary.class.php +++ b/src/dba/models/CrackerBinary.class.php @@ -30,11 +30,11 @@ function getKeyValueDict() { static function getFeatures() { $dict = array(); - $dict['crackerBinaryId'] = ['read_only' => True, "type" => "int", "subtype" => "unset", "choices" => "unset", "null" => False, "pk" => True, "protected" => True, "private" => False, "alias" => "crackerBinaryId"]; - $dict['crackerBinaryTypeId'] = ['read_only' => False, "type" => "int", "subtype" => "unset", "choices" => "unset", "null" => False, "pk" => False, "protected" => False, "private" => False, "alias" => "crackerBinaryTypeId"]; - $dict['version'] = ['read_only' => False, "type" => "str(20)", "subtype" => "unset", "choices" => "unset", "null" => False, "pk" => False, "protected" => False, "private" => False, "alias" => "version"]; - $dict['downloadUrl'] = ['read_only' => False, "type" => "str(150)", "subtype" => "unset", "choices" => "unset", "null" => False, "pk" => False, "protected" => False, "private" => False, "alias" => "downloadUrl"]; - $dict['binaryName'] = ['read_only' => False, "type" => "str(50)", "subtype" => "unset", "choices" => "unset", "null" => False, "pk" => False, "protected" => False, "private" => False, "alias" => "binaryName"]; + $dict['crackerBinaryId'] = ['read_only' => True, "type" => "int", "subtype" => "unset", "choices" => "unset", "null" => False, "pk" => True, "protected" => True, "private" => False, "alias" => "crackerBinaryId", "public" => False]; + $dict['crackerBinaryTypeId'] = ['read_only' => False, "type" => "int", "subtype" => "unset", "choices" => "unset", "null" => False, "pk" => False, "protected" => False, "private" => False, "alias" => "crackerBinaryTypeId", "public" => False]; + $dict['version'] = ['read_only' => False, "type" => "str(20)", "subtype" => "unset", "choices" => "unset", "null" => False, "pk" => False, "protected" => False, "private" => False, "alias" => "version", "public" => False]; + $dict['downloadUrl'] = ['read_only' => False, "type" => "str(150)", "subtype" => "unset", "choices" => "unset", "null" => False, "pk" => False, "protected" => False, "private" => False, "alias" => "downloadUrl", "public" => False]; + $dict['binaryName'] = ['read_only' => False, "type" => "str(50)", "subtype" => "unset", "choices" => "unset", "null" => False, "pk" => False, "protected" => False, "private" => False, "alias" => "binaryName", "public" => False]; return $dict; } diff --git a/src/dba/models/CrackerBinaryType.class.php b/src/dba/models/CrackerBinaryType.class.php index 4355022e3..12a00c5db 100644 --- a/src/dba/models/CrackerBinaryType.class.php +++ b/src/dba/models/CrackerBinaryType.class.php @@ -24,9 +24,9 @@ function getKeyValueDict() { static function getFeatures() { $dict = array(); - $dict['crackerBinaryTypeId'] = ['read_only' => True, "type" => "int", "subtype" => "unset", "choices" => "unset", "null" => False, "pk" => True, "protected" => True, "private" => False, "alias" => "crackerBinaryTypeId"]; - $dict['typeName'] = ['read_only' => False, "type" => "str(30)", "subtype" => "unset", "choices" => "unset", "null" => False, "pk" => False, "protected" => False, "private" => False, "alias" => "typeName"]; - $dict['isChunkingAvailable'] = ['read_only' => False, "type" => "bool", "subtype" => "unset", "choices" => "unset", "null" => False, "pk" => False, "protected" => False, "private" => False, "alias" => "isChunkingAvailable"]; + $dict['crackerBinaryTypeId'] = ['read_only' => True, "type" => "int", "subtype" => "unset", "choices" => "unset", "null" => False, "pk" => True, "protected" => True, "private" => False, "alias" => "crackerBinaryTypeId", "public" => False]; + $dict['typeName'] = ['read_only' => False, "type" => "str(30)", "subtype" => "unset", "choices" => "unset", "null" => False, "pk" => False, "protected" => False, "private" => False, "alias" => "typeName", "public" => False]; + $dict['isChunkingAvailable'] = ['read_only' => False, "type" => "bool", "subtype" => "unset", "choices" => "unset", "null" => False, "pk" => False, "protected" => False, "private" => False, "alias" => "isChunkingAvailable", "public" => False]; return $dict; } diff --git a/src/dba/models/Factory.template.txt b/src/dba/models/Factory.template.txt index 1dca8550f..9abdb0019 100644 --- a/src/dba/models/Factory.template.txt +++ b/src/dba/models/Factory.template.txt @@ -12,4 +12,5 @@ class Factory { const ORDER = "order"; const UPDATE = "update"; const GROUP = "group"; + const LIMIT = "limit"; } diff --git a/src/dba/models/File.class.php b/src/dba/models/File.class.php index 17a29dc99..961585683 100644 --- a/src/dba/models/File.class.php +++ b/src/dba/models/File.class.php @@ -36,13 +36,13 @@ function getKeyValueDict() { static function getFeatures() { $dict = array(); - $dict['fileId'] = ['read_only' => True, "type" => "int", "subtype" => "unset", "choices" => "unset", "null" => False, "pk" => True, "protected" => True, "private" => False, "alias" => "fileId"]; - $dict['filename'] = ['read_only' => False, "type" => "str(100)", "subtype" => "unset", "choices" => "unset", "null" => False, "pk" => False, "protected" => False, "private" => False, "alias" => "filename"]; - $dict['size'] = ['read_only' => True, "type" => "int64", "subtype" => "unset", "choices" => "unset", "null" => False, "pk" => False, "protected" => True, "private" => False, "alias" => "size"]; - $dict['isSecret'] = ['read_only' => False, "type" => "bool", "subtype" => "unset", "choices" => "unset", "null" => False, "pk" => False, "protected" => False, "private" => False, "alias" => "isSecret"]; - $dict['fileType'] = ['read_only' => False, "type" => "int", "subtype" => "unset", "choices" => "unset", "null" => False, "pk" => False, "protected" => False, "private" => False, "alias" => "fileType"]; - $dict['accessGroupId'] = ['read_only' => False, "type" => "int", "subtype" => "unset", "choices" => "unset", "null" => False, "pk" => False, "protected" => False, "private" => False, "alias" => "accessGroupId"]; - $dict['lineCount'] = ['read_only' => True, "type" => "int64", "subtype" => "unset", "choices" => "unset", "null" => False, "pk" => False, "protected" => True, "private" => False, "alias" => "lineCount"]; + $dict['fileId'] = ['read_only' => True, "type" => "int", "subtype" => "unset", "choices" => "unset", "null" => False, "pk" => True, "protected" => True, "private" => False, "alias" => "fileId", "public" => False]; + $dict['filename'] = ['read_only' => False, "type" => "str(100)", "subtype" => "unset", "choices" => "unset", "null" => False, "pk" => False, "protected" => False, "private" => False, "alias" => "filename", "public" => False]; + $dict['size'] = ['read_only' => True, "type" => "int64", "subtype" => "unset", "choices" => "unset", "null" => False, "pk" => False, "protected" => True, "private" => False, "alias" => "size", "public" => False]; + $dict['isSecret'] = ['read_only' => False, "type" => "bool", "subtype" => "unset", "choices" => "unset", "null" => False, "pk" => False, "protected" => False, "private" => False, "alias" => "isSecret", "public" => False]; + $dict['fileType'] = ['read_only' => False, "type" => "int", "subtype" => "unset", "choices" => "unset", "null" => False, "pk" => False, "protected" => False, "private" => False, "alias" => "fileType", "public" => False]; + $dict['accessGroupId'] = ['read_only' => False, "type" => "int", "subtype" => "unset", "choices" => "unset", "null" => False, "pk" => False, "protected" => False, "private" => False, "alias" => "accessGroupId", "public" => False]; + $dict['lineCount'] = ['read_only' => True, "type" => "int64", "subtype" => "unset", "choices" => "unset", "null" => False, "pk" => False, "protected" => True, "private" => False, "alias" => "lineCount", "public" => False]; return $dict; } diff --git a/src/dba/models/FileDelete.class.php b/src/dba/models/FileDelete.class.php index 11bee0e08..06ac64eec 100644 --- a/src/dba/models/FileDelete.class.php +++ b/src/dba/models/FileDelete.class.php @@ -24,9 +24,9 @@ function getKeyValueDict() { static function getFeatures() { $dict = array(); - $dict['fileDeleteId'] = ['read_only' => True, "type" => "int", "subtype" => "unset", "choices" => "unset", "null" => False, "pk" => True, "protected" => True, "private" => False, "alias" => "fileDeleteId"]; - $dict['filename'] = ['read_only' => True, "type" => "str(256)", "subtype" => "unset", "choices" => "unset", "null" => False, "pk" => False, "protected" => True, "private" => False, "alias" => "filename"]; - $dict['time'] = ['read_only' => True, "type" => "int64", "subtype" => "unset", "choices" => "unset", "null" => False, "pk" => False, "protected" => True, "private" => False, "alias" => "time"]; + $dict['fileDeleteId'] = ['read_only' => True, "type" => "int", "subtype" => "unset", "choices" => "unset", "null" => False, "pk" => True, "protected" => True, "private" => False, "alias" => "fileDeleteId", "public" => False]; + $dict['filename'] = ['read_only' => True, "type" => "str(256)", "subtype" => "unset", "choices" => "unset", "null" => False, "pk" => False, "protected" => True, "private" => False, "alias" => "filename", "public" => False]; + $dict['time'] = ['read_only' => True, "type" => "int64", "subtype" => "unset", "choices" => "unset", "null" => False, "pk" => False, "protected" => True, "private" => False, "alias" => "time", "public" => False]; return $dict; } diff --git a/src/dba/models/FileDownload.class.php b/src/dba/models/FileDownload.class.php index 94e8c0e36..06a54bb06 100644 --- a/src/dba/models/FileDownload.class.php +++ b/src/dba/models/FileDownload.class.php @@ -27,10 +27,10 @@ function getKeyValueDict() { static function getFeatures() { $dict = array(); - $dict['fileDownloadId'] = ['read_only' => True, "type" => "int", "subtype" => "unset", "choices" => "unset", "null" => False, "pk" => True, "protected" => True, "private" => False, "alias" => "fileDownloadId"]; - $dict['time'] = ['read_only' => True, "type" => "int64", "subtype" => "unset", "choices" => "unset", "null" => False, "pk" => False, "protected" => True, "private" => False, "alias" => "time"]; - $dict['fileId'] = ['read_only' => True, "type" => "int", "subtype" => "unset", "choices" => "unset", "null" => False, "pk" => False, "protected" => True, "private" => False, "alias" => "fileId"]; - $dict['status'] = ['read_only' => True, "type" => "int", "subtype" => "unset", "choices" => "unset", "null" => False, "pk" => False, "protected" => True, "private" => False, "alias" => "status"]; + $dict['fileDownloadId'] = ['read_only' => True, "type" => "int", "subtype" => "unset", "choices" => "unset", "null" => False, "pk" => True, "protected" => True, "private" => False, "alias" => "fileDownloadId", "public" => False]; + $dict['time'] = ['read_only' => True, "type" => "int64", "subtype" => "unset", "choices" => "unset", "null" => False, "pk" => False, "protected" => True, "private" => False, "alias" => "time", "public" => False]; + $dict['fileId'] = ['read_only' => True, "type" => "int", "subtype" => "unset", "choices" => "unset", "null" => False, "pk" => False, "protected" => True, "private" => False, "alias" => "fileId", "public" => False]; + $dict['status'] = ['read_only' => True, "type" => "int", "subtype" => "unset", "choices" => "unset", "null" => False, "pk" => False, "protected" => True, "private" => False, "alias" => "status", "public" => False]; return $dict; } diff --git a/src/dba/models/FilePretask.class.php b/src/dba/models/FilePretask.class.php index 3556d7d0b..d77358c1c 100644 --- a/src/dba/models/FilePretask.class.php +++ b/src/dba/models/FilePretask.class.php @@ -24,9 +24,9 @@ function getKeyValueDict() { static function getFeatures() { $dict = array(); - $dict['filePretaskId'] = ['read_only' => True, "type" => "int", "subtype" => "unset", "choices" => "unset", "null" => False, "pk" => True, "protected" => True, "private" => False, "alias" => "filePretaskId"]; - $dict['fileId'] = ['read_only' => True, "type" => "int", "subtype" => "unset", "choices" => "unset", "null" => False, "pk" => False, "protected" => False, "private" => False, "alias" => "fileId"]; - $dict['pretaskId'] = ['read_only' => True, "type" => "int", "subtype" => "unset", "choices" => "unset", "null" => False, "pk" => False, "protected" => False, "private" => False, "alias" => "pretaskId"]; + $dict['filePretaskId'] = ['read_only' => True, "type" => "int", "subtype" => "unset", "choices" => "unset", "null" => False, "pk" => True, "protected" => True, "private" => False, "alias" => "filePretaskId", "public" => False]; + $dict['fileId'] = ['read_only' => True, "type" => "int", "subtype" => "unset", "choices" => "unset", "null" => False, "pk" => False, "protected" => False, "private" => False, "alias" => "fileId", "public" => False]; + $dict['pretaskId'] = ['read_only' => True, "type" => "int", "subtype" => "unset", "choices" => "unset", "null" => False, "pk" => False, "protected" => False, "private" => False, "alias" => "pretaskId", "public" => False]; return $dict; } diff --git a/src/dba/models/FileTask.class.php b/src/dba/models/FileTask.class.php index a131cc213..9c52eb34d 100644 --- a/src/dba/models/FileTask.class.php +++ b/src/dba/models/FileTask.class.php @@ -24,9 +24,9 @@ function getKeyValueDict() { static function getFeatures() { $dict = array(); - $dict['fileTaskId'] = ['read_only' => True, "type" => "int", "subtype" => "unset", "choices" => "unset", "null" => False, "pk" => True, "protected" => True, "private" => False, "alias" => "fileTaskId"]; - $dict['fileId'] = ['read_only' => True, "type" => "int", "subtype" => "unset", "choices" => "unset", "null" => False, "pk" => False, "protected" => False, "private" => False, "alias" => "fileId"]; - $dict['taskId'] = ['read_only' => True, "type" => "int", "subtype" => "unset", "choices" => "unset", "null" => False, "pk" => False, "protected" => False, "private" => False, "alias" => "taskId"]; + $dict['fileTaskId'] = ['read_only' => True, "type" => "int", "subtype" => "unset", "choices" => "unset", "null" => False, "pk" => True, "protected" => True, "private" => False, "alias" => "fileTaskId", "public" => False]; + $dict['fileId'] = ['read_only' => True, "type" => "int", "subtype" => "unset", "choices" => "unset", "null" => False, "pk" => False, "protected" => False, "private" => False, "alias" => "fileId", "public" => False]; + $dict['taskId'] = ['read_only' => True, "type" => "int", "subtype" => "unset", "choices" => "unset", "null" => False, "pk" => False, "protected" => False, "private" => False, "alias" => "taskId", "public" => False]; return $dict; } diff --git a/src/dba/models/Hash.class.php b/src/dba/models/Hash.class.php index cdd57ab76..2cef9cf74 100644 --- a/src/dba/models/Hash.class.php +++ b/src/dba/models/Hash.class.php @@ -42,15 +42,15 @@ function getKeyValueDict() { static function getFeatures() { $dict = array(); - $dict['hashId'] = ['read_only' => True, "type" => "int", "subtype" => "unset", "choices" => "unset", "null" => False, "pk" => True, "protected" => True, "private" => False, "alias" => "hashId"]; - $dict['hashlistId'] = ['read_only' => False, "type" => "int", "subtype" => "unset", "choices" => "unset", "null" => False, "pk" => False, "protected" => False, "private" => False, "alias" => "hashlistId"]; - $dict['hash'] = ['read_only' => False, "type" => "str(65535)", "subtype" => "unset", "choices" => "unset", "null" => False, "pk" => False, "protected" => False, "private" => False, "alias" => "hash"]; - $dict['salt'] = ['read_only' => False, "type" => "str(256)", "subtype" => "unset", "choices" => "unset", "null" => False, "pk" => False, "protected" => False, "private" => False, "alias" => "salt"]; - $dict['plaintext'] = ['read_only' => False, "type" => "str(256)", "subtype" => "unset", "choices" => "unset", "null" => False, "pk" => False, "protected" => False, "private" => False, "alias" => "plaintext"]; - $dict['timeCracked'] = ['read_only' => False, "type" => "int64", "subtype" => "unset", "choices" => "unset", "null" => False, "pk" => False, "protected" => False, "private" => False, "alias" => "timeCracked"]; - $dict['chunkId'] = ['read_only' => False, "type" => "int", "subtype" => "unset", "choices" => "unset", "null" => False, "pk" => False, "protected" => False, "private" => False, "alias" => "chunkId"]; - $dict['isCracked'] = ['read_only' => False, "type" => "bool", "subtype" => "unset", "choices" => "unset", "null" => False, "pk" => False, "protected" => False, "private" => False, "alias" => "isCracked"]; - $dict['crackPos'] = ['read_only' => False, "type" => "int64", "subtype" => "unset", "choices" => "unset", "null" => False, "pk" => False, "protected" => False, "private" => False, "alias" => "crackPos"]; + $dict['hashId'] = ['read_only' => True, "type" => "int", "subtype" => "unset", "choices" => "unset", "null" => False, "pk" => True, "protected" => True, "private" => False, "alias" => "hashId", "public" => False]; + $dict['hashlistId'] = ['read_only' => False, "type" => "int", "subtype" => "unset", "choices" => "unset", "null" => False, "pk" => False, "protected" => False, "private" => False, "alias" => "hashlistId", "public" => False]; + $dict['hash'] = ['read_only' => False, "type" => "str(65535)", "subtype" => "unset", "choices" => "unset", "null" => False, "pk" => False, "protected" => False, "private" => False, "alias" => "hash", "public" => False]; + $dict['salt'] = ['read_only' => False, "type" => "str(256)", "subtype" => "unset", "choices" => "unset", "null" => False, "pk" => False, "protected" => False, "private" => False, "alias" => "salt", "public" => False]; + $dict['plaintext'] = ['read_only' => False, "type" => "str(256)", "subtype" => "unset", "choices" => "unset", "null" => False, "pk" => False, "protected" => False, "private" => False, "alias" => "plaintext", "public" => False]; + $dict['timeCracked'] = ['read_only' => False, "type" => "int64", "subtype" => "unset", "choices" => "unset", "null" => False, "pk" => False, "protected" => False, "private" => False, "alias" => "timeCracked", "public" => False]; + $dict['chunkId'] = ['read_only' => False, "type" => "int", "subtype" => "unset", "choices" => "unset", "null" => False, "pk" => False, "protected" => False, "private" => False, "alias" => "chunkId", "public" => False]; + $dict['isCracked'] = ['read_only' => False, "type" => "bool", "subtype" => "unset", "choices" => "unset", "null" => False, "pk" => False, "protected" => False, "private" => False, "alias" => "isCracked", "public" => False]; + $dict['crackPos'] = ['read_only' => False, "type" => "int64", "subtype" => "unset", "choices" => "unset", "null" => False, "pk" => False, "protected" => False, "private" => False, "alias" => "crackPos", "public" => False]; return $dict; } diff --git a/src/dba/models/HashBinary.class.php b/src/dba/models/HashBinary.class.php index b846bbd5f..c17353ef5 100644 --- a/src/dba/models/HashBinary.class.php +++ b/src/dba/models/HashBinary.class.php @@ -42,15 +42,15 @@ function getKeyValueDict() { static function getFeatures() { $dict = array(); - $dict['hashBinaryId'] = ['read_only' => True, "type" => "int", "subtype" => "unset", "choices" => "unset", "null" => False, "pk" => True, "protected" => True, "private" => False, "alias" => "hashBinaryId"]; - $dict['hashlistId'] = ['read_only' => False, "type" => "int", "subtype" => "unset", "choices" => "unset", "null" => False, "pk" => False, "protected" => False, "private" => False, "alias" => "hashlistId"]; - $dict['essid'] = ['read_only' => False, "type" => "str(100)", "subtype" => "unset", "choices" => "unset", "null" => False, "pk" => False, "protected" => False, "private" => False, "alias" => "essid"]; - $dict['hash'] = ['read_only' => False, "type" => "str(4294967295)", "subtype" => "unset", "choices" => "unset", "null" => False, "pk" => False, "protected" => False, "private" => False, "alias" => "hash"]; - $dict['plaintext'] = ['read_only' => False, "type" => "str(1024)", "subtype" => "unset", "choices" => "unset", "null" => False, "pk" => False, "protected" => False, "private" => False, "alias" => "plaintext"]; - $dict['timeCracked'] = ['read_only' => False, "type" => "int64", "subtype" => "unset", "choices" => "unset", "null" => False, "pk" => False, "protected" => False, "private" => False, "alias" => "timeCracked"]; - $dict['chunkId'] = ['read_only' => False, "type" => "int", "subtype" => "unset", "choices" => "unset", "null" => False, "pk" => False, "protected" => False, "private" => False, "alias" => "chunkId"]; - $dict['isCracked'] = ['read_only' => False, "type" => "bool", "subtype" => "unset", "choices" => "unset", "null" => False, "pk" => False, "protected" => False, "private" => False, "alias" => "isCracked"]; - $dict['crackPos'] = ['read_only' => False, "type" => "int64", "subtype" => "unset", "choices" => "unset", "null" => False, "pk" => False, "protected" => False, "private" => False, "alias" => "crackPos"]; + $dict['hashBinaryId'] = ['read_only' => True, "type" => "int", "subtype" => "unset", "choices" => "unset", "null" => False, "pk" => True, "protected" => True, "private" => False, "alias" => "hashBinaryId", "public" => False]; + $dict['hashlistId'] = ['read_only' => False, "type" => "int", "subtype" => "unset", "choices" => "unset", "null" => False, "pk" => False, "protected" => False, "private" => False, "alias" => "hashlistId", "public" => False]; + $dict['essid'] = ['read_only' => False, "type" => "str(100)", "subtype" => "unset", "choices" => "unset", "null" => False, "pk" => False, "protected" => False, "private" => False, "alias" => "essid", "public" => False]; + $dict['hash'] = ['read_only' => False, "type" => "str(4294967295)", "subtype" => "unset", "choices" => "unset", "null" => False, "pk" => False, "protected" => False, "private" => False, "alias" => "hash", "public" => False]; + $dict['plaintext'] = ['read_only' => False, "type" => "str(1024)", "subtype" => "unset", "choices" => "unset", "null" => False, "pk" => False, "protected" => False, "private" => False, "alias" => "plaintext", "public" => False]; + $dict['timeCracked'] = ['read_only' => False, "type" => "int64", "subtype" => "unset", "choices" => "unset", "null" => False, "pk" => False, "protected" => False, "private" => False, "alias" => "timeCracked", "public" => False]; + $dict['chunkId'] = ['read_only' => False, "type" => "int", "subtype" => "unset", "choices" => "unset", "null" => False, "pk" => False, "protected" => False, "private" => False, "alias" => "chunkId", "public" => False]; + $dict['isCracked'] = ['read_only' => False, "type" => "bool", "subtype" => "unset", "choices" => "unset", "null" => False, "pk" => False, "protected" => False, "private" => False, "alias" => "isCracked", "public" => False]; + $dict['crackPos'] = ['read_only' => False, "type" => "int64", "subtype" => "unset", "choices" => "unset", "null" => False, "pk" => False, "protected" => False, "private" => False, "alias" => "crackPos", "public" => False]; return $dict; } diff --git a/src/dba/models/HashType.class.php b/src/dba/models/HashType.class.php index 79311f464..ca9b4b8a7 100644 --- a/src/dba/models/HashType.class.php +++ b/src/dba/models/HashType.class.php @@ -27,10 +27,10 @@ function getKeyValueDict() { static function getFeatures() { $dict = array(); - $dict['hashTypeId'] = ['read_only' => True, "type" => "int", "subtype" => "unset", "choices" => "unset", "null" => False, "pk" => True, "protected" => False, "private" => False, "alias" => "hashTypeId"]; - $dict['description'] = ['read_only' => False, "type" => "str(256)", "subtype" => "unset", "choices" => "unset", "null" => False, "pk" => False, "protected" => False, "private" => False, "alias" => "description"]; - $dict['isSalted'] = ['read_only' => False, "type" => "bool", "subtype" => "unset", "choices" => "unset", "null" => False, "pk" => False, "protected" => False, "private" => False, "alias" => "isSalted"]; - $dict['isSlowHash'] = ['read_only' => False, "type" => "bool", "subtype" => "unset", "choices" => "unset", "null" => False, "pk" => False, "protected" => False, "private" => False, "alias" => "isSlowHash"]; + $dict['hashTypeId'] = ['read_only' => True, "type" => "int", "subtype" => "unset", "choices" => "unset", "null" => False, "pk" => True, "protected" => False, "private" => False, "alias" => "hashTypeId", "public" => False]; + $dict['description'] = ['read_only' => False, "type" => "str(256)", "subtype" => "unset", "choices" => "unset", "null" => False, "pk" => False, "protected" => False, "private" => False, "alias" => "description", "public" => False]; + $dict['isSalted'] = ['read_only' => False, "type" => "bool", "subtype" => "unset", "choices" => "unset", "null" => False, "pk" => False, "protected" => False, "private" => False, "alias" => "isSalted", "public" => False]; + $dict['isSlowHash'] = ['read_only' => False, "type" => "bool", "subtype" => "unset", "choices" => "unset", "null" => False, "pk" => False, "protected" => False, "private" => False, "alias" => "isSlowHash", "public" => False]; return $dict; } diff --git a/src/dba/models/Hashlist.class.php b/src/dba/models/Hashlist.class.php index a95cb60ce..2108816ee 100644 --- a/src/dba/models/Hashlist.class.php +++ b/src/dba/models/Hashlist.class.php @@ -60,21 +60,21 @@ function getKeyValueDict() { static function getFeatures() { $dict = array(); - $dict['hashlistId'] = ['read_only' => True, "type" => "int", "subtype" => "unset", "choices" => "unset", "null" => False, "pk" => True, "protected" => True, "private" => False, "alias" => "hashlistId"]; - $dict['hashlistName'] = ['read_only' => False, "type" => "str(100)", "subtype" => "unset", "choices" => "unset", "null" => False, "pk" => False, "protected" => False, "private" => False, "alias" => "name"]; - $dict['format'] = ['read_only' => True, "type" => "int", "subtype" => "unset", "choices" => [0 => "Hashlist format is PLAIN", 1 => "Hashlist format is WPA", 2 => "Hashlist format is BINARY", 3 => "Hashlist is SUPERHASHLIST", ], "null" => False, "pk" => False, "protected" => False, "private" => False, "alias" => "format"]; - $dict['hashTypeId'] = ['read_only' => True, "type" => "int", "subtype" => "unset", "choices" => "unset", "null" => False, "pk" => False, "protected" => False, "private" => False, "alias" => "hashTypeId"]; - $dict['hashCount'] = ['read_only' => True, "type" => "int", "subtype" => "unset", "choices" => "unset", "null" => False, "pk" => False, "protected" => False, "private" => False, "alias" => "hashCount"]; - $dict['saltSeparator'] = ['read_only' => True, "type" => "str(10)", "subtype" => "unset", "choices" => "unset", "null" => True, "pk" => False, "protected" => False, "private" => False, "alias" => "separator"]; - $dict['cracked'] = ['read_only' => True, "type" => "int", "subtype" => "unset", "choices" => "unset", "null" => False, "pk" => False, "protected" => True, "private" => False, "alias" => "cracked"]; - $dict['isSecret'] = ['read_only' => False, "type" => "bool", "subtype" => "unset", "choices" => "unset", "null" => False, "pk" => False, "protected" => False, "private" => False, "alias" => "isSecret"]; - $dict['hexSalt'] = ['read_only' => True, "type" => "bool", "subtype" => "unset", "choices" => "unset", "null" => False, "pk" => False, "protected" => False, "private" => False, "alias" => "isHexSalt"]; - $dict['isSalted'] = ['read_only' => True, "type" => "bool", "subtype" => "unset", "choices" => "unset", "null" => False, "pk" => False, "protected" => False, "private" => False, "alias" => "isSalted"]; - $dict['accessGroupId'] = ['read_only' => False, "type" => "int", "subtype" => "unset", "choices" => "unset", "null" => False, "pk" => False, "protected" => False, "private" => False, "alias" => "accessGroupId"]; - $dict['notes'] = ['read_only' => False, "type" => "str(65535)", "subtype" => "unset", "choices" => "unset", "null" => False, "pk" => False, "protected" => False, "private" => False, "alias" => "notes"]; - $dict['brainId'] = ['read_only' => True, "type" => "bool", "subtype" => "unset", "choices" => "unset", "null" => False, "pk" => False, "protected" => False, "private" => False, "alias" => "useBrain"]; - $dict['brainFeatures'] = ['read_only' => True, "type" => "int", "subtype" => "unset", "choices" => "unset", "null" => False, "pk" => False, "protected" => False, "private" => False, "alias" => "brainFeatures"]; - $dict['isArchived'] = ['read_only' => False, "type" => "bool", "subtype" => "unset", "choices" => "unset", "null" => False, "pk" => False, "protected" => False, "private" => False, "alias" => "isArchived"]; + $dict['hashlistId'] = ['read_only' => True, "type" => "int", "subtype" => "unset", "choices" => "unset", "null" => False, "pk" => True, "protected" => True, "private" => False, "alias" => "hashlistId", "public" => False]; + $dict['hashlistName'] = ['read_only' => False, "type" => "str(100)", "subtype" => "unset", "choices" => "unset", "null" => False, "pk" => False, "protected" => False, "private" => False, "alias" => "name", "public" => False]; + $dict['format'] = ['read_only' => True, "type" => "int", "subtype" => "unset", "choices" => [0 => "Hashlist format is PLAIN", 1 => "Hashlist format is WPA", 2 => "Hashlist format is BINARY", 3 => "Hashlist is SUPERHASHLIST", ], "null" => False, "pk" => False, "protected" => False, "private" => False, "alias" => "format", "public" => False]; + $dict['hashTypeId'] = ['read_only' => True, "type" => "int", "subtype" => "unset", "choices" => "unset", "null" => False, "pk" => False, "protected" => False, "private" => False, "alias" => "hashTypeId", "public" => False]; + $dict['hashCount'] = ['read_only' => True, "type" => "int", "subtype" => "unset", "choices" => "unset", "null" => False, "pk" => False, "protected" => False, "private" => False, "alias" => "hashCount", "public" => False]; + $dict['saltSeparator'] = ['read_only' => True, "type" => "str(10)", "subtype" => "unset", "choices" => "unset", "null" => True, "pk" => False, "protected" => False, "private" => False, "alias" => "separator", "public" => False]; + $dict['cracked'] = ['read_only' => True, "type" => "int", "subtype" => "unset", "choices" => "unset", "null" => False, "pk" => False, "protected" => True, "private" => False, "alias" => "cracked", "public" => False]; + $dict['isSecret'] = ['read_only' => False, "type" => "bool", "subtype" => "unset", "choices" => "unset", "null" => False, "pk" => False, "protected" => False, "private" => False, "alias" => "isSecret", "public" => False]; + $dict['hexSalt'] = ['read_only' => True, "type" => "bool", "subtype" => "unset", "choices" => "unset", "null" => False, "pk" => False, "protected" => False, "private" => False, "alias" => "isHexSalt", "public" => False]; + $dict['isSalted'] = ['read_only' => True, "type" => "bool", "subtype" => "unset", "choices" => "unset", "null" => False, "pk" => False, "protected" => False, "private" => False, "alias" => "isSalted", "public" => False]; + $dict['accessGroupId'] = ['read_only' => False, "type" => "int", "subtype" => "unset", "choices" => "unset", "null" => False, "pk" => False, "protected" => False, "private" => False, "alias" => "accessGroupId", "public" => False]; + $dict['notes'] = ['read_only' => False, "type" => "str(65535)", "subtype" => "unset", "choices" => "unset", "null" => False, "pk" => False, "protected" => False, "private" => False, "alias" => "notes", "public" => False]; + $dict['brainId'] = ['read_only' => True, "type" => "bool", "subtype" => "unset", "choices" => "unset", "null" => False, "pk" => False, "protected" => False, "private" => False, "alias" => "useBrain", "public" => False]; + $dict['brainFeatures'] = ['read_only' => True, "type" => "int", "subtype" => "unset", "choices" => "unset", "null" => False, "pk" => False, "protected" => False, "private" => False, "alias" => "brainFeatures", "public" => False]; + $dict['isArchived'] = ['read_only' => False, "type" => "bool", "subtype" => "unset", "choices" => "unset", "null" => False, "pk" => False, "protected" => False, "private" => False, "alias" => "isArchived", "public" => False]; return $dict; } diff --git a/src/dba/models/HashlistHashlist.class.php b/src/dba/models/HashlistHashlist.class.php index ea524d43c..e09214bb4 100644 --- a/src/dba/models/HashlistHashlist.class.php +++ b/src/dba/models/HashlistHashlist.class.php @@ -24,9 +24,9 @@ function getKeyValueDict() { static function getFeatures() { $dict = array(); - $dict['hashlistHashlistId'] = ['read_only' => True, "type" => "int", "subtype" => "unset", "choices" => "unset", "null" => False, "pk" => True, "protected" => True, "private" => False, "alias" => "hashlistHashlistId"]; - $dict['parentHashlistId'] = ['read_only' => True, "type" => "int", "subtype" => "unset", "choices" => "unset", "null" => False, "pk" => False, "protected" => False, "private" => False, "alias" => "parentHashlistId"]; - $dict['hashlistId'] = ['read_only' => True, "type" => "int", "subtype" => "unset", "choices" => "unset", "null" => False, "pk" => False, "protected" => False, "private" => False, "alias" => "hashlistId"]; + $dict['hashlistHashlistId'] = ['read_only' => True, "type" => "int", "subtype" => "unset", "choices" => "unset", "null" => False, "pk" => True, "protected" => True, "private" => False, "alias" => "hashlistHashlistId", "public" => False]; + $dict['parentHashlistId'] = ['read_only' => True, "type" => "int", "subtype" => "unset", "choices" => "unset", "null" => False, "pk" => False, "protected" => False, "private" => False, "alias" => "parentHashlistId", "public" => False]; + $dict['hashlistId'] = ['read_only' => True, "type" => "int", "subtype" => "unset", "choices" => "unset", "null" => False, "pk" => False, "protected" => False, "private" => False, "alias" => "hashlistId", "public" => False]; return $dict; } diff --git a/src/dba/models/HealthCheck.class.php b/src/dba/models/HealthCheck.class.php index f57461631..8b9615948 100644 --- a/src/dba/models/HealthCheck.class.php +++ b/src/dba/models/HealthCheck.class.php @@ -39,14 +39,14 @@ function getKeyValueDict() { static function getFeatures() { $dict = array(); - $dict['healthCheckId'] = ['read_only' => True, "type" => "int", "subtype" => "unset", "choices" => "unset", "null" => False, "pk" => True, "protected" => True, "private" => False, "alias" => "healthCheckId"]; - $dict['time'] = ['read_only' => True, "type" => "int64", "subtype" => "unset", "choices" => "unset", "null" => False, "pk" => False, "protected" => True, "private" => False, "alias" => "time"]; - $dict['status'] = ['read_only' => True, "type" => "int", "subtype" => "unset", "choices" => "unset", "null" => False, "pk" => False, "protected" => True, "private" => False, "alias" => "status"]; - $dict['checkType'] = ['read_only' => False, "type" => "int", "subtype" => "unset", "choices" => "unset", "null" => False, "pk" => False, "protected" => False, "private" => False, "alias" => "checkType"]; - $dict['hashtypeId'] = ['read_only' => False, "type" => "int", "subtype" => "unset", "choices" => "unset", "null" => False, "pk" => False, "protected" => False, "private" => False, "alias" => "hashtypeId"]; - $dict['crackerBinaryId'] = ['read_only' => False, "type" => "int", "subtype" => "unset", "choices" => "unset", "null" => False, "pk" => False, "protected" => False, "private" => False, "alias" => "crackerBinaryId"]; - $dict['expectedCracks'] = ['read_only' => True, "type" => "int", "subtype" => "unset", "choices" => "unset", "null" => False, "pk" => False, "protected" => True, "private" => False, "alias" => "expectedCracks"]; - $dict['attackCmd'] = ['read_only' => True, "type" => "str(65535)", "subtype" => "unset", "choices" => "unset", "null" => False, "pk" => False, "protected" => True, "private" => False, "alias" => "attackCmd"]; + $dict['healthCheckId'] = ['read_only' => True, "type" => "int", "subtype" => "unset", "choices" => "unset", "null" => False, "pk" => True, "protected" => True, "private" => False, "alias" => "healthCheckId", "public" => False]; + $dict['time'] = ['read_only' => True, "type" => "int64", "subtype" => "unset", "choices" => "unset", "null" => False, "pk" => False, "protected" => True, "private" => False, "alias" => "time", "public" => False]; + $dict['status'] = ['read_only' => True, "type" => "int", "subtype" => "unset", "choices" => "unset", "null" => False, "pk" => False, "protected" => True, "private" => False, "alias" => "status", "public" => False]; + $dict['checkType'] = ['read_only' => False, "type" => "int", "subtype" => "unset", "choices" => "unset", "null" => False, "pk" => False, "protected" => False, "private" => False, "alias" => "checkType", "public" => False]; + $dict['hashtypeId'] = ['read_only' => False, "type" => "int", "subtype" => "unset", "choices" => "unset", "null" => False, "pk" => False, "protected" => False, "private" => False, "alias" => "hashtypeId", "public" => False]; + $dict['crackerBinaryId'] = ['read_only' => False, "type" => "int", "subtype" => "unset", "choices" => "unset", "null" => False, "pk" => False, "protected" => False, "private" => False, "alias" => "crackerBinaryId", "public" => False]; + $dict['expectedCracks'] = ['read_only' => True, "type" => "int", "subtype" => "unset", "choices" => "unset", "null" => False, "pk" => False, "protected" => True, "private" => False, "alias" => "expectedCracks", "public" => False]; + $dict['attackCmd'] = ['read_only' => True, "type" => "str(65535)", "subtype" => "unset", "choices" => "unset", "null" => False, "pk" => False, "protected" => True, "private" => False, "alias" => "attackCmd", "public" => False]; return $dict; } diff --git a/src/dba/models/HealthCheckAgent.class.php b/src/dba/models/HealthCheckAgent.class.php index ce60589e6..302175767 100644 --- a/src/dba/models/HealthCheckAgent.class.php +++ b/src/dba/models/HealthCheckAgent.class.php @@ -42,15 +42,15 @@ function getKeyValueDict() { static function getFeatures() { $dict = array(); - $dict['healthCheckAgentId'] = ['read_only' => True, "type" => "int", "subtype" => "unset", "choices" => "unset", "null" => False, "pk" => True, "protected" => True, "private" => False, "alias" => "healthCheckAgentId"]; - $dict['healthCheckId'] = ['read_only' => True, "type" => "int", "subtype" => "unset", "choices" => "unset", "null" => False, "pk" => False, "protected" => True, "private" => False, "alias" => "healthCheckId"]; - $dict['agentId'] = ['read_only' => True, "type" => "int", "subtype" => "unset", "choices" => "unset", "null" => False, "pk" => False, "protected" => True, "private" => False, "alias" => "agentId"]; - $dict['status'] = ['read_only' => True, "type" => "int", "subtype" => "unset", "choices" => "unset", "null" => False, "pk" => False, "protected" => True, "private" => False, "alias" => "status"]; - $dict['cracked'] = ['read_only' => True, "type" => "int", "subtype" => "unset", "choices" => "unset", "null" => False, "pk" => False, "protected" => True, "private" => False, "alias" => "cracked"]; - $dict['numGpus'] = ['read_only' => True, "type" => "int", "subtype" => "unset", "choices" => "unset", "null" => False, "pk" => False, "protected" => True, "private" => False, "alias" => "numGpus"]; - $dict['start'] = ['read_only' => True, "type" => "int64", "subtype" => "unset", "choices" => "unset", "null" => False, "pk" => False, "protected" => True, "private" => False, "alias" => "start"]; - $dict['end'] = ['read_only' => True, "type" => "int64", "subtype" => "unset", "choices" => "unset", "null" => False, "pk" => False, "protected" => True, "private" => False, "alias" => "end"]; - $dict['errors'] = ['read_only' => True, "type" => "str(65535)", "subtype" => "unset", "choices" => "unset", "null" => False, "pk" => False, "protected" => True, "private" => False, "alias" => "errors"]; + $dict['healthCheckAgentId'] = ['read_only' => True, "type" => "int", "subtype" => "unset", "choices" => "unset", "null" => False, "pk" => True, "protected" => True, "private" => False, "alias" => "healthCheckAgentId", "public" => False]; + $dict['healthCheckId'] = ['read_only' => True, "type" => "int", "subtype" => "unset", "choices" => "unset", "null" => False, "pk" => False, "protected" => True, "private" => False, "alias" => "healthCheckId", "public" => False]; + $dict['agentId'] = ['read_only' => True, "type" => "int", "subtype" => "unset", "choices" => "unset", "null" => False, "pk" => False, "protected" => True, "private" => False, "alias" => "agentId", "public" => False]; + $dict['status'] = ['read_only' => True, "type" => "int", "subtype" => "unset", "choices" => "unset", "null" => False, "pk" => False, "protected" => True, "private" => False, "alias" => "status", "public" => False]; + $dict['cracked'] = ['read_only' => True, "type" => "int", "subtype" => "unset", "choices" => "unset", "null" => False, "pk" => False, "protected" => True, "private" => False, "alias" => "cracked", "public" => False]; + $dict['numGpus'] = ['read_only' => True, "type" => "int", "subtype" => "unset", "choices" => "unset", "null" => False, "pk" => False, "protected" => True, "private" => False, "alias" => "numGpus", "public" => False]; + $dict['start'] = ['read_only' => True, "type" => "int64", "subtype" => "unset", "choices" => "unset", "null" => False, "pk" => False, "protected" => True, "private" => False, "alias" => "start", "public" => False]; + $dict['end'] = ['read_only' => True, "type" => "int64", "subtype" => "unset", "choices" => "unset", "null" => False, "pk" => False, "protected" => True, "private" => False, "alias" => "end", "public" => False]; + $dict['errors'] = ['read_only' => True, "type" => "str(65535)", "subtype" => "unset", "choices" => "unset", "null" => False, "pk" => False, "protected" => True, "private" => False, "alias" => "errors", "public" => False]; return $dict; } diff --git a/src/dba/models/LogEntry.class.php b/src/dba/models/LogEntry.class.php index ffc247146..d7db60c11 100644 --- a/src/dba/models/LogEntry.class.php +++ b/src/dba/models/LogEntry.class.php @@ -33,12 +33,12 @@ function getKeyValueDict() { static function getFeatures() { $dict = array(); - $dict['logEntryId'] = ['read_only' => True, "type" => "int", "subtype" => "unset", "choices" => "unset", "null" => False, "pk" => True, "protected" => True, "private" => False, "alias" => "logEntryId"]; - $dict['issuer'] = ['read_only' => True, "type" => "str(50)", "subtype" => "unset", "choices" => "unset", "null" => False, "pk" => False, "protected" => True, "private" => False, "alias" => "issuer"]; - $dict['issuerId'] = ['read_only' => True, "type" => "str(50)", "subtype" => "unset", "choices" => "unset", "null" => False, "pk" => False, "protected" => True, "private" => False, "alias" => "issuerId"]; - $dict['level'] = ['read_only' => True, "type" => "str(50)", "subtype" => "unset", "choices" => "unset", "null" => False, "pk" => False, "protected" => True, "private" => False, "alias" => "level"]; - $dict['message'] = ['read_only' => True, "type" => "str(65535)", "subtype" => "unset", "choices" => "unset", "null" => False, "pk" => False, "protected" => True, "private" => False, "alias" => "message"]; - $dict['time'] = ['read_only' => True, "type" => "int64", "subtype" => "unset", "choices" => "unset", "null" => False, "pk" => False, "protected" => True, "private" => False, "alias" => "time"]; + $dict['logEntryId'] = ['read_only' => True, "type" => "int", "subtype" => "unset", "choices" => "unset", "null" => False, "pk" => True, "protected" => True, "private" => False, "alias" => "logEntryId", "public" => False]; + $dict['issuer'] = ['read_only' => True, "type" => "str(50)", "subtype" => "unset", "choices" => "unset", "null" => False, "pk" => False, "protected" => True, "private" => False, "alias" => "issuer", "public" => False]; + $dict['issuerId'] = ['read_only' => True, "type" => "str(50)", "subtype" => "unset", "choices" => "unset", "null" => False, "pk" => False, "protected" => True, "private" => False, "alias" => "issuerId", "public" => False]; + $dict['level'] = ['read_only' => True, "type" => "str(50)", "subtype" => "unset", "choices" => "unset", "null" => False, "pk" => False, "protected" => True, "private" => False, "alias" => "level", "public" => False]; + $dict['message'] = ['read_only' => True, "type" => "str(65535)", "subtype" => "unset", "choices" => "unset", "null" => False, "pk" => False, "protected" => True, "private" => False, "alias" => "message", "public" => False]; + $dict['time'] = ['read_only' => True, "type" => "int64", "subtype" => "unset", "choices" => "unset", "null" => False, "pk" => False, "protected" => True, "private" => False, "alias" => "time", "public" => False]; return $dict; } diff --git a/src/dba/models/NotificationSetting.class.php b/src/dba/models/NotificationSetting.class.php index a3cbda436..39ae29d5a 100644 --- a/src/dba/models/NotificationSetting.class.php +++ b/src/dba/models/NotificationSetting.class.php @@ -36,13 +36,13 @@ function getKeyValueDict() { static function getFeatures() { $dict = array(); - $dict['notificationSettingId'] = ['read_only' => True, "type" => "int", "subtype" => "unset", "choices" => "unset", "null" => False, "pk" => True, "protected" => True, "private" => False, "alias" => "notificationSettingId"]; - $dict['action'] = ['read_only' => False, "type" => "str(50)", "subtype" => "unset", "choices" => "unset", "null" => False, "pk" => False, "protected" => False, "private" => False, "alias" => "action"]; - $dict['objectId'] = ['read_only' => True, "type" => "int", "subtype" => "unset", "choices" => "unset", "null" => False, "pk" => False, "protected" => True, "private" => False, "alias" => "objectId"]; - $dict['notification'] = ['read_only' => False, "type" => "str(50)", "subtype" => "unset", "choices" => "unset", "null" => False, "pk" => False, "protected" => False, "private" => False, "alias" => "notification"]; - $dict['userId'] = ['read_only' => True, "type" => "int", "subtype" => "unset", "choices" => "unset", "null" => False, "pk" => False, "protected" => True, "private" => False, "alias" => "userId"]; - $dict['receiver'] = ['read_only' => False, "type" => "str(256)", "subtype" => "unset", "choices" => "unset", "null" => False, "pk" => False, "protected" => False, "private" => False, "alias" => "receiver"]; - $dict['isActive'] = ['read_only' => False, "type" => "bool", "subtype" => "unset", "choices" => "unset", "null" => False, "pk" => False, "protected" => False, "private" => False, "alias" => "isActive"]; + $dict['notificationSettingId'] = ['read_only' => True, "type" => "int", "subtype" => "unset", "choices" => "unset", "null" => False, "pk" => True, "protected" => True, "private" => False, "alias" => "notificationSettingId", "public" => False]; + $dict['action'] = ['read_only' => False, "type" => "str(50)", "subtype" => "unset", "choices" => "unset", "null" => False, "pk" => False, "protected" => False, "private" => False, "alias" => "action", "public" => False]; + $dict['objectId'] = ['read_only' => True, "type" => "int", "subtype" => "unset", "choices" => "unset", "null" => False, "pk" => False, "protected" => True, "private" => False, "alias" => "objectId", "public" => False]; + $dict['notification'] = ['read_only' => False, "type" => "str(50)", "subtype" => "unset", "choices" => "unset", "null" => False, "pk" => False, "protected" => False, "private" => False, "alias" => "notification", "public" => False]; + $dict['userId'] = ['read_only' => True, "type" => "int", "subtype" => "unset", "choices" => "unset", "null" => False, "pk" => False, "protected" => True, "private" => False, "alias" => "userId", "public" => False]; + $dict['receiver'] = ['read_only' => False, "type" => "str(256)", "subtype" => "unset", "choices" => "unset", "null" => False, "pk" => False, "protected" => False, "private" => False, "alias" => "receiver", "public" => False]; + $dict['isActive'] = ['read_only' => False, "type" => "bool", "subtype" => "unset", "choices" => "unset", "null" => False, "pk" => False, "protected" => False, "private" => False, "alias" => "isActive", "public" => False]; return $dict; } diff --git a/src/dba/models/Preprocessor.class.php b/src/dba/models/Preprocessor.class.php index 15809e7fd..5aae0685e 100644 --- a/src/dba/models/Preprocessor.class.php +++ b/src/dba/models/Preprocessor.class.php @@ -36,13 +36,13 @@ function getKeyValueDict() { static function getFeatures() { $dict = array(); - $dict['preprocessorId'] = ['read_only' => True, "type" => "int", "subtype" => "unset", "choices" => "unset", "null" => False, "pk" => True, "protected" => True, "private" => False, "alias" => "preprocessorId"]; - $dict['name'] = ['read_only' => False, "type" => "str(256)", "subtype" => "unset", "choices" => "unset", "null" => False, "pk" => False, "protected" => False, "private" => False, "alias" => "name"]; - $dict['url'] = ['read_only' => False, "type" => "str(512)", "subtype" => "unset", "choices" => "unset", "null" => False, "pk" => False, "protected" => False, "private" => False, "alias" => "url"]; - $dict['binaryName'] = ['read_only' => False, "type" => "str(256)", "subtype" => "unset", "choices" => "unset", "null" => False, "pk" => False, "protected" => False, "private" => False, "alias" => "binaryName"]; - $dict['keyspaceCommand'] = ['read_only' => False, "type" => "str(256)", "subtype" => "unset", "choices" => "unset", "null" => False, "pk" => False, "protected" => False, "private" => False, "alias" => "keyspaceCommand"]; - $dict['skipCommand'] = ['read_only' => False, "type" => "str(256)", "subtype" => "unset", "choices" => "unset", "null" => False, "pk" => False, "protected" => False, "private" => False, "alias" => "skipCommand"]; - $dict['limitCommand'] = ['read_only' => False, "type" => "str(256)", "subtype" => "unset", "choices" => "unset", "null" => False, "pk" => False, "protected" => False, "private" => False, "alias" => "limitCommand"]; + $dict['preprocessorId'] = ['read_only' => True, "type" => "int", "subtype" => "unset", "choices" => "unset", "null" => False, "pk" => True, "protected" => True, "private" => False, "alias" => "preprocessorId", "public" => False]; + $dict['name'] = ['read_only' => False, "type" => "str(256)", "subtype" => "unset", "choices" => "unset", "null" => False, "pk" => False, "protected" => False, "private" => False, "alias" => "name", "public" => False]; + $dict['url'] = ['read_only' => False, "type" => "str(512)", "subtype" => "unset", "choices" => "unset", "null" => False, "pk" => False, "protected" => False, "private" => False, "alias" => "url", "public" => False]; + $dict['binaryName'] = ['read_only' => False, "type" => "str(256)", "subtype" => "unset", "choices" => "unset", "null" => False, "pk" => False, "protected" => False, "private" => False, "alias" => "binaryName", "public" => False]; + $dict['keyspaceCommand'] = ['read_only' => False, "type" => "str(256)", "subtype" => "unset", "choices" => "unset", "null" => False, "pk" => False, "protected" => False, "private" => False, "alias" => "keyspaceCommand", "public" => False]; + $dict['skipCommand'] = ['read_only' => False, "type" => "str(256)", "subtype" => "unset", "choices" => "unset", "null" => False, "pk" => False, "protected" => False, "private" => False, "alias" => "skipCommand", "public" => False]; + $dict['limitCommand'] = ['read_only' => False, "type" => "str(256)", "subtype" => "unset", "choices" => "unset", "null" => False, "pk" => False, "protected" => False, "private" => False, "alias" => "limitCommand", "public" => False]; return $dict; } diff --git a/src/dba/models/Pretask.class.php b/src/dba/models/Pretask.class.php index 29ec977cd..47795443e 100644 --- a/src/dba/models/Pretask.class.php +++ b/src/dba/models/Pretask.class.php @@ -54,19 +54,19 @@ function getKeyValueDict() { static function getFeatures() { $dict = array(); - $dict['pretaskId'] = ['read_only' => True, "type" => "int", "subtype" => "unset", "choices" => "unset", "null" => False, "pk" => True, "protected" => True, "private" => False, "alias" => "pretaskId"]; - $dict['taskName'] = ['read_only' => False, "type" => "str(100)", "subtype" => "unset", "choices" => "unset", "null" => False, "pk" => False, "protected" => False, "private" => False, "alias" => "taskName"]; - $dict['attackCmd'] = ['read_only' => False, "type" => "str(65535)", "subtype" => "unset", "choices" => "unset", "null" => False, "pk" => False, "protected" => False, "private" => False, "alias" => "attackCmd"]; - $dict['chunkTime'] = ['read_only' => False, "type" => "int", "subtype" => "unset", "choices" => "unset", "null" => False, "pk" => False, "protected" => False, "private" => False, "alias" => "chunkTime"]; - $dict['statusTimer'] = ['read_only' => False, "type" => "int", "subtype" => "unset", "choices" => "unset", "null" => False, "pk" => False, "protected" => False, "private" => False, "alias" => "statusTimer"]; - $dict['color'] = ['read_only' => False, "type" => "str(20)", "subtype" => "unset", "choices" => "unset", "null" => False, "pk" => False, "protected" => False, "private" => False, "alias" => "color"]; - $dict['isSmall'] = ['read_only' => False, "type" => "bool", "subtype" => "unset", "choices" => "unset", "null" => False, "pk" => False, "protected" => False, "private" => False, "alias" => "isSmall"]; - $dict['isCpuTask'] = ['read_only' => False, "type" => "bool", "subtype" => "unset", "choices" => "unset", "null" => False, "pk" => False, "protected" => False, "private" => False, "alias" => "isCpuTask"]; - $dict['useNewBench'] = ['read_only' => True, "type" => "bool", "subtype" => "unset", "choices" => "unset", "null" => False, "pk" => False, "protected" => False, "private" => False, "alias" => "useNewBench"]; - $dict['priority'] = ['read_only' => False, "type" => "int", "subtype" => "unset", "choices" => "unset", "null" => False, "pk" => False, "protected" => False, "private" => False, "alias" => "priority"]; - $dict['maxAgents'] = ['read_only' => False, "type" => "int", "subtype" => "unset", "choices" => "unset", "null" => False, "pk" => False, "protected" => False, "private" => False, "alias" => "maxAgents"]; - $dict['isMaskImport'] = ['read_only' => False, "type" => "bool", "subtype" => "unset", "choices" => "unset", "null" => False, "pk" => False, "protected" => False, "private" => False, "alias" => "isMaskImport"]; - $dict['crackerBinaryTypeId'] = ['read_only' => False, "type" => "int", "subtype" => "unset", "choices" => "unset", "null" => False, "pk" => False, "protected" => False, "private" => False, "alias" => "crackerBinaryTypeId"]; + $dict['pretaskId'] = ['read_only' => True, "type" => "int", "subtype" => "unset", "choices" => "unset", "null" => False, "pk" => True, "protected" => True, "private" => False, "alias" => "pretaskId", "public" => False]; + $dict['taskName'] = ['read_only' => False, "type" => "str(100)", "subtype" => "unset", "choices" => "unset", "null" => False, "pk" => False, "protected" => False, "private" => False, "alias" => "taskName", "public" => False]; + $dict['attackCmd'] = ['read_only' => False, "type" => "str(65535)", "subtype" => "unset", "choices" => "unset", "null" => False, "pk" => False, "protected" => False, "private" => False, "alias" => "attackCmd", "public" => False]; + $dict['chunkTime'] = ['read_only' => False, "type" => "int", "subtype" => "unset", "choices" => "unset", "null" => False, "pk" => False, "protected" => False, "private" => False, "alias" => "chunkTime", "public" => False]; + $dict['statusTimer'] = ['read_only' => False, "type" => "int", "subtype" => "unset", "choices" => "unset", "null" => False, "pk" => False, "protected" => False, "private" => False, "alias" => "statusTimer", "public" => False]; + $dict['color'] = ['read_only' => False, "type" => "str(20)", "subtype" => "unset", "choices" => "unset", "null" => False, "pk" => False, "protected" => False, "private" => False, "alias" => "color", "public" => False]; + $dict['isSmall'] = ['read_only' => False, "type" => "bool", "subtype" => "unset", "choices" => "unset", "null" => False, "pk" => False, "protected" => False, "private" => False, "alias" => "isSmall", "public" => False]; + $dict['isCpuTask'] = ['read_only' => False, "type" => "bool", "subtype" => "unset", "choices" => "unset", "null" => False, "pk" => False, "protected" => False, "private" => False, "alias" => "isCpuTask", "public" => False]; + $dict['useNewBench'] = ['read_only' => True, "type" => "bool", "subtype" => "unset", "choices" => "unset", "null" => False, "pk" => False, "protected" => False, "private" => False, "alias" => "useNewBench", "public" => False]; + $dict['priority'] = ['read_only' => False, "type" => "int", "subtype" => "unset", "choices" => "unset", "null" => False, "pk" => False, "protected" => False, "private" => False, "alias" => "priority", "public" => False]; + $dict['maxAgents'] = ['read_only' => False, "type" => "int", "subtype" => "unset", "choices" => "unset", "null" => False, "pk" => False, "protected" => False, "private" => False, "alias" => "maxAgents", "public" => False]; + $dict['isMaskImport'] = ['read_only' => False, "type" => "bool", "subtype" => "unset", "choices" => "unset", "null" => False, "pk" => False, "protected" => False, "private" => False, "alias" => "isMaskImport", "public" => False]; + $dict['crackerBinaryTypeId'] = ['read_only' => False, "type" => "int", "subtype" => "unset", "choices" => "unset", "null" => False, "pk" => False, "protected" => False, "private" => False, "alias" => "crackerBinaryTypeId", "public" => False]; return $dict; } diff --git a/src/dba/models/RegVoucher.class.php b/src/dba/models/RegVoucher.class.php index 9b0c4d58a..a29ed903f 100644 --- a/src/dba/models/RegVoucher.class.php +++ b/src/dba/models/RegVoucher.class.php @@ -24,9 +24,9 @@ function getKeyValueDict() { static function getFeatures() { $dict = array(); - $dict['regVoucherId'] = ['read_only' => True, "type" => "int", "subtype" => "unset", "choices" => "unset", "null" => False, "pk" => True, "protected" => True, "private" => False, "alias" => "regVoucherId"]; - $dict['voucher'] = ['read_only' => False, "type" => "str(100)", "subtype" => "unset", "choices" => "unset", "null" => False, "pk" => False, "protected" => False, "private" => False, "alias" => "voucher"]; - $dict['time'] = ['read_only' => True, "type" => "int64", "subtype" => "unset", "choices" => "unset", "null" => False, "pk" => False, "protected" => True, "private" => False, "alias" => "time"]; + $dict['regVoucherId'] = ['read_only' => True, "type" => "int", "subtype" => "unset", "choices" => "unset", "null" => False, "pk" => True, "protected" => True, "private" => False, "alias" => "regVoucherId", "public" => False]; + $dict['voucher'] = ['read_only' => False, "type" => "str(100)", "subtype" => "unset", "choices" => "unset", "null" => False, "pk" => False, "protected" => False, "private" => False, "alias" => "voucher", "public" => False]; + $dict['time'] = ['read_only' => True, "type" => "int64", "subtype" => "unset", "choices" => "unset", "null" => False, "pk" => False, "protected" => True, "private" => False, "alias" => "time", "public" => False]; return $dict; } diff --git a/src/dba/models/RightGroup.class.php b/src/dba/models/RightGroup.class.php index 01852b901..6bb6748c9 100644 --- a/src/dba/models/RightGroup.class.php +++ b/src/dba/models/RightGroup.class.php @@ -24,9 +24,9 @@ function getKeyValueDict() { static function getFeatures() { $dict = array(); - $dict['rightGroupId'] = ['read_only' => True, "type" => "int", "subtype" => "unset", "choices" => "unset", "null" => False, "pk" => True, "protected" => True, "private" => False, "alias" => "id"]; - $dict['groupName'] = ['read_only' => False, "type" => "str(50)", "subtype" => "unset", "choices" => "unset", "null" => False, "pk" => False, "protected" => False, "private" => False, "alias" => "name"]; - $dict['permissions'] = ['read_only' => False, "type" => "dict", "subtype" => "bool", "choices" => "unset", "null" => True, "pk" => False, "protected" => False, "private" => False, "alias" => "permissions"]; + $dict['rightGroupId'] = ['read_only' => True, "type" => "int", "subtype" => "unset", "choices" => "unset", "null" => False, "pk" => True, "protected" => True, "private" => False, "alias" => "id", "public" => False]; + $dict['groupName'] = ['read_only' => False, "type" => "str(50)", "subtype" => "unset", "choices" => "unset", "null" => False, "pk" => False, "protected" => False, "private" => False, "alias" => "name", "public" => False]; + $dict['permissions'] = ['read_only' => False, "type" => "dict", "subtype" => "bool", "choices" => "unset", "null" => True, "pk" => False, "protected" => False, "private" => False, "alias" => "permissions", "public" => False]; return $dict; } diff --git a/src/dba/models/Session.class.php b/src/dba/models/Session.class.php index c61749026..a217d1ba2 100644 --- a/src/dba/models/Session.class.php +++ b/src/dba/models/Session.class.php @@ -36,13 +36,13 @@ function getKeyValueDict() { static function getFeatures() { $dict = array(); - $dict['sessionId'] = ['read_only' => True, "type" => "int", "subtype" => "unset", "choices" => "unset", "null" => False, "pk" => True, "protected" => True, "private" => False, "alias" => "sessionId"]; - $dict['userId'] = ['read_only' => True, "type" => "int", "subtype" => "unset", "choices" => "unset", "null" => False, "pk" => False, "protected" => True, "private" => False, "alias" => "userId"]; - $dict['sessionStartDate'] = ['read_only' => True, "type" => "int64", "subtype" => "unset", "choices" => "unset", "null" => False, "pk" => False, "protected" => True, "private" => False, "alias" => "sessionStartDate"]; - $dict['lastActionDate'] = ['read_only' => True, "type" => "int64", "subtype" => "unset", "choices" => "unset", "null" => False, "pk" => False, "protected" => True, "private" => False, "alias" => "lastActionDate"]; - $dict['isOpen'] = ['read_only' => True, "type" => "bool", "subtype" => "unset", "choices" => "unset", "null" => False, "pk" => False, "protected" => True, "private" => False, "alias" => "isOpen"]; - $dict['sessionLifetime'] = ['read_only' => True, "type" => "int", "subtype" => "unset", "choices" => "unset", "null" => False, "pk" => False, "protected" => True, "private" => False, "alias" => "sessionLifetime"]; - $dict['sessionKey'] = ['read_only' => True, "type" => "str(256)", "subtype" => "unset", "choices" => "unset", "null" => False, "pk" => False, "protected" => True, "private" => False, "alias" => "sessionKey"]; + $dict['sessionId'] = ['read_only' => True, "type" => "int", "subtype" => "unset", "choices" => "unset", "null" => False, "pk" => True, "protected" => True, "private" => False, "alias" => "sessionId", "public" => False]; + $dict['userId'] = ['read_only' => True, "type" => "int", "subtype" => "unset", "choices" => "unset", "null" => False, "pk" => False, "protected" => True, "private" => False, "alias" => "userId", "public" => False]; + $dict['sessionStartDate'] = ['read_only' => True, "type" => "int64", "subtype" => "unset", "choices" => "unset", "null" => False, "pk" => False, "protected" => True, "private" => False, "alias" => "sessionStartDate", "public" => False]; + $dict['lastActionDate'] = ['read_only' => True, "type" => "int64", "subtype" => "unset", "choices" => "unset", "null" => False, "pk" => False, "protected" => True, "private" => False, "alias" => "lastActionDate", "public" => False]; + $dict['isOpen'] = ['read_only' => True, "type" => "bool", "subtype" => "unset", "choices" => "unset", "null" => False, "pk" => False, "protected" => True, "private" => False, "alias" => "isOpen", "public" => False]; + $dict['sessionLifetime'] = ['read_only' => True, "type" => "int", "subtype" => "unset", "choices" => "unset", "null" => False, "pk" => False, "protected" => True, "private" => False, "alias" => "sessionLifetime", "public" => False]; + $dict['sessionKey'] = ['read_only' => True, "type" => "str(256)", "subtype" => "unset", "choices" => "unset", "null" => False, "pk" => False, "protected" => True, "private" => False, "alias" => "sessionKey", "public" => False]; return $dict; } diff --git a/src/dba/models/Speed.class.php b/src/dba/models/Speed.class.php index 4b872baf8..e18dabaa3 100644 --- a/src/dba/models/Speed.class.php +++ b/src/dba/models/Speed.class.php @@ -30,11 +30,11 @@ function getKeyValueDict() { static function getFeatures() { $dict = array(); - $dict['speedId'] = ['read_only' => True, "type" => "int", "subtype" => "unset", "choices" => "unset", "null" => False, "pk" => True, "protected" => True, "private" => False, "alias" => "speedId"]; - $dict['agentId'] = ['read_only' => True, "type" => "int", "subtype" => "unset", "choices" => "unset", "null" => False, "pk" => False, "protected" => True, "private" => False, "alias" => "agentId"]; - $dict['taskId'] = ['read_only' => True, "type" => "int", "subtype" => "unset", "choices" => "unset", "null" => False, "pk" => False, "protected" => True, "private" => False, "alias" => "taskId"]; - $dict['speed'] = ['read_only' => True, "type" => "int64", "subtype" => "unset", "choices" => "unset", "null" => False, "pk" => False, "protected" => True, "private" => False, "alias" => "speed"]; - $dict['time'] = ['read_only' => True, "type" => "int64", "subtype" => "unset", "choices" => "unset", "null" => False, "pk" => False, "protected" => True, "private" => False, "alias" => "time"]; + $dict['speedId'] = ['read_only' => True, "type" => "int", "subtype" => "unset", "choices" => "unset", "null" => False, "pk" => True, "protected" => True, "private" => False, "alias" => "speedId", "public" => False]; + $dict['agentId'] = ['read_only' => True, "type" => "int", "subtype" => "unset", "choices" => "unset", "null" => False, "pk" => False, "protected" => True, "private" => False, "alias" => "agentId", "public" => False]; + $dict['taskId'] = ['read_only' => True, "type" => "int", "subtype" => "unset", "choices" => "unset", "null" => False, "pk" => False, "protected" => True, "private" => False, "alias" => "taskId", "public" => False]; + $dict['speed'] = ['read_only' => True, "type" => "int64", "subtype" => "unset", "choices" => "unset", "null" => False, "pk" => False, "protected" => True, "private" => False, "alias" => "speed", "public" => False]; + $dict['time'] = ['read_only' => True, "type" => "int64", "subtype" => "unset", "choices" => "unset", "null" => False, "pk" => False, "protected" => True, "private" => False, "alias" => "time", "public" => False]; return $dict; } diff --git a/src/dba/models/StoredValue.class.php b/src/dba/models/StoredValue.class.php index 8d5b3d3bd..ead8dfd0a 100644 --- a/src/dba/models/StoredValue.class.php +++ b/src/dba/models/StoredValue.class.php @@ -21,8 +21,8 @@ function getKeyValueDict() { static function getFeatures() { $dict = array(); - $dict['storedValueId'] = ['read_only' => True, "type" => "str(50)", "subtype" => "unset", "choices" => "unset", "null" => False, "pk" => True, "protected" => True, "private" => False, "alias" => "storedValueId"]; - $dict['val'] = ['read_only' => False, "type" => "str(256)", "subtype" => "unset", "choices" => "unset", "null" => False, "pk" => False, "protected" => False, "private" => False, "alias" => "val"]; + $dict['storedValueId'] = ['read_only' => True, "type" => "str(50)", "subtype" => "unset", "choices" => "unset", "null" => False, "pk" => True, "protected" => True, "private" => False, "alias" => "storedValueId", "public" => False]; + $dict['val'] = ['read_only' => False, "type" => "str(256)", "subtype" => "unset", "choices" => "unset", "null" => False, "pk" => False, "protected" => False, "private" => False, "alias" => "val", "public" => False]; return $dict; } diff --git a/src/dba/models/Supertask.class.php b/src/dba/models/Supertask.class.php index d4c20637a..90e707f10 100644 --- a/src/dba/models/Supertask.class.php +++ b/src/dba/models/Supertask.class.php @@ -21,8 +21,8 @@ function getKeyValueDict() { static function getFeatures() { $dict = array(); - $dict['supertaskId'] = ['read_only' => True, "type" => "int", "subtype" => "unset", "choices" => "unset", "null" => False, "pk" => True, "protected" => True, "private" => False, "alias" => "supertaskId"]; - $dict['supertaskName'] = ['read_only' => False, "type" => "str(50)", "subtype" => "unset", "choices" => "unset", "null" => False, "pk" => False, "protected" => False, "private" => False, "alias" => "supertaskName"]; + $dict['supertaskId'] = ['read_only' => True, "type" => "int", "subtype" => "unset", "choices" => "unset", "null" => False, "pk" => True, "protected" => True, "private" => False, "alias" => "supertaskId", "public" => False]; + $dict['supertaskName'] = ['read_only' => False, "type" => "str(50)", "subtype" => "unset", "choices" => "unset", "null" => False, "pk" => False, "protected" => False, "private" => False, "alias" => "supertaskName", "public" => False]; return $dict; } diff --git a/src/dba/models/SupertaskPretask.class.php b/src/dba/models/SupertaskPretask.class.php index fb5eb0966..859384116 100644 --- a/src/dba/models/SupertaskPretask.class.php +++ b/src/dba/models/SupertaskPretask.class.php @@ -24,9 +24,9 @@ function getKeyValueDict() { static function getFeatures() { $dict = array(); - $dict['supertaskPretaskId'] = ['read_only' => True, "type" => "int", "subtype" => "unset", "choices" => "unset", "null" => False, "pk" => True, "protected" => True, "private" => False, "alias" => "supertaskPretaskId"]; - $dict['supertaskId'] = ['read_only' => True, "type" => "int", "subtype" => "unset", "choices" => "unset", "null" => False, "pk" => False, "protected" => False, "private" => False, "alias" => "supertaskId"]; - $dict['pretaskId'] = ['read_only' => True, "type" => "int", "subtype" => "unset", "choices" => "unset", "null" => False, "pk" => False, "protected" => False, "private" => False, "alias" => "pretaskId"]; + $dict['supertaskPretaskId'] = ['read_only' => True, "type" => "int", "subtype" => "unset", "choices" => "unset", "null" => False, "pk" => True, "protected" => True, "private" => False, "alias" => "supertaskPretaskId", "public" => False]; + $dict['supertaskId'] = ['read_only' => True, "type" => "int", "subtype" => "unset", "choices" => "unset", "null" => False, "pk" => False, "protected" => False, "private" => False, "alias" => "supertaskId", "public" => False]; + $dict['pretaskId'] = ['read_only' => True, "type" => "int", "subtype" => "unset", "choices" => "unset", "null" => False, "pk" => False, "protected" => False, "private" => False, "alias" => "pretaskId", "public" => False]; return $dict; } diff --git a/src/dba/models/Task.class.php b/src/dba/models/Task.class.php index 9635e2f62..12fc8b589 100644 --- a/src/dba/models/Task.class.php +++ b/src/dba/models/Task.class.php @@ -87,30 +87,30 @@ function getKeyValueDict() { static function getFeatures() { $dict = array(); - $dict['taskId'] = ['read_only' => True, "type" => "int", "subtype" => "unset", "choices" => "unset", "null" => False, "pk" => True, "protected" => True, "private" => False, "alias" => "taskId"]; - $dict['taskName'] = ['read_only' => False, "type" => "str(256)", "subtype" => "unset", "choices" => "unset", "null" => False, "pk" => False, "protected" => False, "private" => False, "alias" => "taskName"]; - $dict['attackCmd'] = ['read_only' => False, "type" => "str(65535)", "subtype" => "unset", "choices" => "unset", "null" => False, "pk" => False, "protected" => False, "private" => False, "alias" => "attackCmd"]; - $dict['chunkTime'] = ['read_only' => False, "type" => "int", "subtype" => "unset", "choices" => "unset", "null" => False, "pk" => False, "protected" => False, "private" => False, "alias" => "chunkTime"]; - $dict['statusTimer'] = ['read_only' => False, "type" => "int", "subtype" => "unset", "choices" => "unset", "null" => False, "pk" => False, "protected" => False, "private" => False, "alias" => "statusTimer"]; - $dict['keyspace'] = ['read_only' => True, "type" => "int64", "subtype" => "unset", "choices" => "unset", "null" => False, "pk" => False, "protected" => True, "private" => False, "alias" => "keyspace"]; - $dict['keyspaceProgress'] = ['read_only' => True, "type" => "int64", "subtype" => "unset", "choices" => "unset", "null" => False, "pk" => False, "protected" => True, "private" => False, "alias" => "keyspaceProgress"]; - $dict['priority'] = ['read_only' => False, "type" => "int", "subtype" => "unset", "choices" => "unset", "null" => False, "pk" => False, "protected" => False, "private" => False, "alias" => "priority"]; - $dict['maxAgents'] = ['read_only' => False, "type" => "int", "subtype" => "unset", "choices" => "unset", "null" => False, "pk" => False, "protected" => False, "private" => False, "alias" => "maxAgents"]; - $dict['color'] = ['read_only' => False, "type" => "str(20)", "subtype" => "unset", "choices" => "unset", "null" => True, "pk" => False, "protected" => False, "private" => False, "alias" => "color"]; - $dict['isSmall'] = ['read_only' => False, "type" => "bool", "subtype" => "unset", "choices" => "unset", "null" => False, "pk" => False, "protected" => False, "private" => False, "alias" => "isSmall"]; - $dict['isCpuTask'] = ['read_only' => False, "type" => "bool", "subtype" => "unset", "choices" => "unset", "null" => False, "pk" => False, "protected" => False, "private" => False, "alias" => "isCpuTask"]; - $dict['useNewBench'] = ['read_only' => True, "type" => "bool", "subtype" => "unset", "choices" => "unset", "null" => False, "pk" => False, "protected" => False, "private" => False, "alias" => "useNewBench"]; - $dict['skipKeyspace'] = ['read_only' => True, "type" => "int64", "subtype" => "unset", "choices" => "unset", "null" => False, "pk" => False, "protected" => False, "private" => False, "alias" => "skipKeyspace"]; - $dict['crackerBinaryId'] = ['read_only' => True, "type" => "int", "subtype" => "unset", "choices" => "unset", "null" => False, "pk" => False, "protected" => False, "private" => False, "alias" => "crackerBinaryId"]; - $dict['crackerBinaryTypeId'] = ['read_only' => True, "type" => "int", "subtype" => "unset", "choices" => "unset", "null" => False, "pk" => False, "protected" => False, "private" => False, "alias" => "crackerBinaryTypeId"]; - $dict['taskWrapperId'] = ['read_only' => True, "type" => "int", "subtype" => "unset", "choices" => "unset", "null" => False, "pk" => False, "protected" => True, "private" => False, "alias" => "taskWrapperId"]; - $dict['isArchived'] = ['read_only' => False, "type" => "bool", "subtype" => "unset", "choices" => "unset", "null" => False, "pk" => False, "protected" => False, "private" => False, "alias" => "isArchived"]; - $dict['notes'] = ['read_only' => False, "type" => "str(65535)", "subtype" => "unset", "choices" => "unset", "null" => False, "pk" => False, "protected" => False, "private" => False, "alias" => "notes"]; - $dict['staticChunks'] = ['read_only' => True, "type" => "int", "subtype" => "unset", "choices" => "unset", "null" => False, "pk" => False, "protected" => False, "private" => False, "alias" => "staticChunks"]; - $dict['chunkSize'] = ['read_only' => True, "type" => "int64", "subtype" => "unset", "choices" => "unset", "null" => False, "pk" => False, "protected" => False, "private" => False, "alias" => "chunkSize"]; - $dict['forcePipe'] = ['read_only' => True, "type" => "bool", "subtype" => "unset", "choices" => "unset", "null" => False, "pk" => False, "protected" => False, "private" => False, "alias" => "forcePipe"]; - $dict['usePreprocessor'] = ['read_only' => True, "type" => "int", "subtype" => "unset", "choices" => "unset", "null" => False, "pk" => False, "protected" => False, "private" => False, "alias" => "preprocessorId"]; - $dict['preprocessorCommand'] = ['read_only' => True, "type" => "str(256)", "subtype" => "unset", "choices" => "unset", "null" => False, "pk" => False, "protected" => False, "private" => False, "alias" => "preprocessorCommand"]; + $dict['taskId'] = ['read_only' => True, "type" => "int", "subtype" => "unset", "choices" => "unset", "null" => False, "pk" => True, "protected" => True, "private" => False, "alias" => "taskId", "public" => False]; + $dict['taskName'] = ['read_only' => False, "type" => "str(256)", "subtype" => "unset", "choices" => "unset", "null" => False, "pk" => False, "protected" => False, "private" => False, "alias" => "taskName", "public" => False]; + $dict['attackCmd'] = ['read_only' => False, "type" => "str(65535)", "subtype" => "unset", "choices" => "unset", "null" => False, "pk" => False, "protected" => False, "private" => False, "alias" => "attackCmd", "public" => False]; + $dict['chunkTime'] = ['read_only' => False, "type" => "int", "subtype" => "unset", "choices" => "unset", "null" => False, "pk" => False, "protected" => False, "private" => False, "alias" => "chunkTime", "public" => False]; + $dict['statusTimer'] = ['read_only' => False, "type" => "int", "subtype" => "unset", "choices" => "unset", "null" => False, "pk" => False, "protected" => False, "private" => False, "alias" => "statusTimer", "public" => False]; + $dict['keyspace'] = ['read_only' => True, "type" => "int64", "subtype" => "unset", "choices" => "unset", "null" => False, "pk" => False, "protected" => True, "private" => False, "alias" => "keyspace", "public" => False]; + $dict['keyspaceProgress'] = ['read_only' => True, "type" => "int64", "subtype" => "unset", "choices" => "unset", "null" => False, "pk" => False, "protected" => True, "private" => False, "alias" => "keyspaceProgress", "public" => False]; + $dict['priority'] = ['read_only' => False, "type" => "int", "subtype" => "unset", "choices" => "unset", "null" => False, "pk" => False, "protected" => False, "private" => False, "alias" => "priority", "public" => False]; + $dict['maxAgents'] = ['read_only' => False, "type" => "int", "subtype" => "unset", "choices" => "unset", "null" => False, "pk" => False, "protected" => False, "private" => False, "alias" => "maxAgents", "public" => False]; + $dict['color'] = ['read_only' => False, "type" => "str(50)", "subtype" => "unset", "choices" => "unset", "null" => True, "pk" => False, "protected" => False, "private" => False, "alias" => "color", "public" => False]; + $dict['isSmall'] = ['read_only' => False, "type" => "bool", "subtype" => "unset", "choices" => "unset", "null" => False, "pk" => False, "protected" => False, "private" => False, "alias" => "isSmall", "public" => False]; + $dict['isCpuTask'] = ['read_only' => False, "type" => "bool", "subtype" => "unset", "choices" => "unset", "null" => False, "pk" => False, "protected" => False, "private" => False, "alias" => "isCpuTask", "public" => False]; + $dict['useNewBench'] = ['read_only' => True, "type" => "bool", "subtype" => "unset", "choices" => "unset", "null" => False, "pk" => False, "protected" => False, "private" => False, "alias" => "useNewBench", "public" => False]; + $dict['skipKeyspace'] = ['read_only' => True, "type" => "int64", "subtype" => "unset", "choices" => "unset", "null" => False, "pk" => False, "protected" => False, "private" => False, "alias" => "skipKeyspace", "public" => False]; + $dict['crackerBinaryId'] = ['read_only' => True, "type" => "int", "subtype" => "unset", "choices" => "unset", "null" => False, "pk" => False, "protected" => False, "private" => False, "alias" => "crackerBinaryId", "public" => False]; + $dict['crackerBinaryTypeId'] = ['read_only' => True, "type" => "int", "subtype" => "unset", "choices" => "unset", "null" => False, "pk" => False, "protected" => False, "private" => False, "alias" => "crackerBinaryTypeId", "public" => False]; + $dict['taskWrapperId'] = ['read_only' => True, "type" => "int", "subtype" => "unset", "choices" => "unset", "null" => False, "pk" => False, "protected" => True, "private" => False, "alias" => "taskWrapperId", "public" => False]; + $dict['isArchived'] = ['read_only' => False, "type" => "bool", "subtype" => "unset", "choices" => "unset", "null" => False, "pk" => False, "protected" => False, "private" => False, "alias" => "isArchived", "public" => False]; + $dict['notes'] = ['read_only' => False, "type" => "str(65535)", "subtype" => "unset", "choices" => "unset", "null" => False, "pk" => False, "protected" => False, "private" => False, "alias" => "notes", "public" => False]; + $dict['staticChunks'] = ['read_only' => True, "type" => "int", "subtype" => "unset", "choices" => "unset", "null" => False, "pk" => False, "protected" => False, "private" => False, "alias" => "staticChunks", "public" => False]; + $dict['chunkSize'] = ['read_only' => True, "type" => "int64", "subtype" => "unset", "choices" => "unset", "null" => False, "pk" => False, "protected" => False, "private" => False, "alias" => "chunkSize", "public" => False]; + $dict['forcePipe'] = ['read_only' => True, "type" => "bool", "subtype" => "unset", "choices" => "unset", "null" => False, "pk" => False, "protected" => False, "private" => False, "alias" => "forcePipe", "public" => False]; + $dict['usePreprocessor'] = ['read_only' => True, "type" => "int", "subtype" => "unset", "choices" => "unset", "null" => False, "pk" => False, "protected" => False, "private" => False, "alias" => "preprocessorId", "public" => False]; + $dict['preprocessorCommand'] = ['read_only' => True, "type" => "str(256)", "subtype" => "unset", "choices" => "unset", "null" => False, "pk" => False, "protected" => False, "private" => False, "alias" => "preprocessorCommand", "public" => False]; return $dict; } diff --git a/src/dba/models/TaskDebugOutput.class.php b/src/dba/models/TaskDebugOutput.class.php index f237726b6..5b74299fc 100644 --- a/src/dba/models/TaskDebugOutput.class.php +++ b/src/dba/models/TaskDebugOutput.class.php @@ -24,9 +24,9 @@ function getKeyValueDict() { static function getFeatures() { $dict = array(); - $dict['taskDebugOutputId'] = ['read_only' => True, "type" => "int", "subtype" => "unset", "choices" => "unset", "null" => False, "pk" => True, "protected" => True, "private" => False, "alias" => "taskDebugOutputId"]; - $dict['taskId'] = ['read_only' => True, "type" => "int", "subtype" => "unset", "choices" => "unset", "null" => False, "pk" => False, "protected" => False, "private" => False, "alias" => "taskId"]; - $dict['output'] = ['read_only' => True, "type" => "str(256)", "subtype" => "unset", "choices" => "unset", "null" => False, "pk" => False, "protected" => False, "private" => False, "alias" => "output"]; + $dict['taskDebugOutputId'] = ['read_only' => True, "type" => "int", "subtype" => "unset", "choices" => "unset", "null" => False, "pk" => True, "protected" => True, "private" => False, "alias" => "taskDebugOutputId", "public" => False]; + $dict['taskId'] = ['read_only' => True, "type" => "int", "subtype" => "unset", "choices" => "unset", "null" => False, "pk" => False, "protected" => False, "private" => False, "alias" => "taskId", "public" => False]; + $dict['output'] = ['read_only' => True, "type" => "str(256)", "subtype" => "unset", "choices" => "unset", "null" => False, "pk" => False, "protected" => False, "private" => False, "alias" => "output", "public" => False]; return $dict; } diff --git a/src/dba/models/TaskWrapper.class.php b/src/dba/models/TaskWrapper.class.php index 04d30de1a..850b28fb5 100644 --- a/src/dba/models/TaskWrapper.class.php +++ b/src/dba/models/TaskWrapper.class.php @@ -42,15 +42,15 @@ function getKeyValueDict() { static function getFeatures() { $dict = array(); - $dict['taskWrapperId'] = ['read_only' => True, "type" => "int", "subtype" => "unset", "choices" => "unset", "null" => False, "pk" => True, "protected" => True, "private" => False, "alias" => "taskWrapperId"]; - $dict['priority'] = ['read_only' => False, "type" => "int", "subtype" => "unset", "choices" => "unset", "null" => False, "pk" => False, "protected" => False, "private" => False, "alias" => "priority"]; - $dict['maxAgents'] = ['read_only' => False, "type" => "int", "subtype" => "unset", "choices" => "unset", "null" => False, "pk" => False, "protected" => False, "private" => False, "alias" => "maxAgents"]; - $dict['taskType'] = ['read_only' => True, "type" => "int", "subtype" => "unset", "choices" => [0 => "TaskType is Task", 1 => "TaskType is Supertask", ], "null" => False, "pk" => False, "protected" => True, "private" => False, "alias" => "taskType"]; - $dict['hashlistId'] = ['read_only' => True, "type" => "int", "subtype" => "unset", "choices" => "unset", "null" => False, "pk" => False, "protected" => True, "private" => False, "alias" => "hashlistId"]; - $dict['accessGroupId'] = ['read_only' => False, "type" => "int", "subtype" => "unset", "choices" => "unset", "null" => False, "pk" => False, "protected" => False, "private" => False, "alias" => "accessGroupId"]; - $dict['taskWrapperName'] = ['read_only' => False, "type" => "str(100)", "subtype" => "unset", "choices" => "unset", "null" => False, "pk" => False, "protected" => False, "private" => False, "alias" => "taskWrapperName"]; - $dict['isArchived'] = ['read_only' => False, "type" => "bool", "subtype" => "unset", "choices" => "unset", "null" => False, "pk" => False, "protected" => False, "private" => False, "alias" => "isArchived"]; - $dict['cracked'] = ['read_only' => False, "type" => "int", "subtype" => "unset", "choices" => "unset", "null" => False, "pk" => False, "protected" => True, "private" => False, "alias" => "cracked"]; + $dict['taskWrapperId'] = ['read_only' => True, "type" => "int", "subtype" => "unset", "choices" => "unset", "null" => False, "pk" => True, "protected" => True, "private" => False, "alias" => "taskWrapperId", "public" => False]; + $dict['priority'] = ['read_only' => False, "type" => "int", "subtype" => "unset", "choices" => "unset", "null" => False, "pk" => False, "protected" => False, "private" => False, "alias" => "priority", "public" => False]; + $dict['maxAgents'] = ['read_only' => False, "type" => "int", "subtype" => "unset", "choices" => "unset", "null" => False, "pk" => False, "protected" => False, "private" => False, "alias" => "maxAgents", "public" => False]; + $dict['taskType'] = ['read_only' => True, "type" => "int", "subtype" => "unset", "choices" => [0 => "TaskType is Task", 1 => "TaskType is Supertask", ], "null" => False, "pk" => False, "protected" => True, "private" => False, "alias" => "taskType", "public" => False]; + $dict['hashlistId'] = ['read_only' => True, "type" => "int", "subtype" => "unset", "choices" => "unset", "null" => False, "pk" => False, "protected" => True, "private" => False, "alias" => "hashlistId", "public" => False]; + $dict['accessGroupId'] = ['read_only' => False, "type" => "int", "subtype" => "unset", "choices" => "unset", "null" => False, "pk" => False, "protected" => False, "private" => False, "alias" => "accessGroupId", "public" => False]; + $dict['taskWrapperName'] = ['read_only' => False, "type" => "str(100)", "subtype" => "unset", "choices" => "unset", "null" => False, "pk" => False, "protected" => False, "private" => False, "alias" => "taskWrapperName", "public" => False]; + $dict['isArchived'] = ['read_only' => False, "type" => "bool", "subtype" => "unset", "choices" => "unset", "null" => False, "pk" => False, "protected" => False, "private" => False, "alias" => "isArchived", "public" => False]; + $dict['cracked'] = ['read_only' => False, "type" => "int", "subtype" => "unset", "choices" => "unset", "null" => False, "pk" => False, "protected" => True, "private" => False, "alias" => "cracked", "public" => False]; return $dict; } diff --git a/src/dba/models/User.class.php b/src/dba/models/User.class.php index 20634978b..6672e0d7d 100644 --- a/src/dba/models/User.class.php +++ b/src/dba/models/User.class.php @@ -63,22 +63,22 @@ function getKeyValueDict() { static function getFeatures() { $dict = array(); - $dict['userId'] = ['read_only' => True, "type" => "int", "subtype" => "unset", "choices" => "unset", "null" => False, "pk" => True, "protected" => True, "private" => False, "alias" => "id"]; - $dict['username'] = ['read_only' => False, "type" => "str(100)", "subtype" => "unset", "choices" => "unset", "null" => False, "pk" => False, "protected" => False, "private" => False, "alias" => "name"]; - $dict['email'] = ['read_only' => False, "type" => "str(150)", "subtype" => "unset", "choices" => "unset", "null" => False, "pk" => False, "protected" => False, "private" => False, "alias" => "email"]; - $dict['passwordHash'] = ['read_only' => True, "type" => "str(256)", "subtype" => "unset", "choices" => "unset", "null" => False, "pk" => False, "protected" => True, "private" => True, "alias" => "passwordHash"]; - $dict['passwordSalt'] = ['read_only' => True, "type" => "str(256)", "subtype" => "unset", "choices" => "unset", "null" => False, "pk" => False, "protected" => True, "private" => True, "alias" => "passwordSalt"]; - $dict['isValid'] = ['read_only' => False, "type" => "bool", "subtype" => "unset", "choices" => "unset", "null" => True, "pk" => False, "protected" => False, "private" => False, "alias" => "isValid"]; - $dict['isComputedPassword'] = ['read_only' => True, "type" => "bool", "subtype" => "unset", "choices" => "unset", "null" => False, "pk" => False, "protected" => True, "private" => False, "alias" => "isComputedPassword"]; - $dict['lastLoginDate'] = ['read_only' => True, "type" => "int64", "subtype" => "unset", "choices" => "unset", "null" => False, "pk" => False, "protected" => True, "private" => False, "alias" => "lastLoginDate"]; - $dict['registeredSince'] = ['read_only' => True, "type" => "int64", "subtype" => "unset", "choices" => "unset", "null" => False, "pk" => False, "protected" => True, "private" => False, "alias" => "registeredSince"]; - $dict['sessionLifetime'] = ['read_only' => True, "type" => "int", "subtype" => "unset", "choices" => "unset", "null" => False, "pk" => False, "protected" => True, "private" => False, "alias" => "sessionLifetime"]; - $dict['rightGroupId'] = ['read_only' => False, "type" => "int", "subtype" => "unset", "choices" => "unset", "null" => False, "pk" => False, "protected" => False, "private" => False, "alias" => "globalPermissionGroupId"]; - $dict['yubikey'] = ['read_only' => True, "type" => "str(256)", "subtype" => "unset", "choices" => "unset", "null" => False, "pk" => False, "protected" => True, "private" => False, "alias" => "yubikey"]; - $dict['otp1'] = ['read_only' => True, "type" => "str(256)", "subtype" => "unset", "choices" => "unset", "null" => False, "pk" => False, "protected" => True, "private" => False, "alias" => "otp1"]; - $dict['otp2'] = ['read_only' => True, "type" => "str(256)", "subtype" => "unset", "choices" => "unset", "null" => False, "pk" => False, "protected" => True, "private" => False, "alias" => "otp2"]; - $dict['otp3'] = ['read_only' => True, "type" => "str(256)", "subtype" => "unset", "choices" => "unset", "null" => False, "pk" => False, "protected" => True, "private" => False, "alias" => "otp3"]; - $dict['otp4'] = ['read_only' => True, "type" => "str(256)", "subtype" => "unset", "choices" => "unset", "null" => False, "pk" => False, "protected" => True, "private" => False, "alias" => "otp4"]; + $dict['userId'] = ['read_only' => True, "type" => "int", "subtype" => "unset", "choices" => "unset", "null" => False, "pk" => True, "protected" => True, "private" => False, "alias" => "id", "public" => True]; + $dict['username'] = ['read_only' => False, "type" => "str(100)", "subtype" => "unset", "choices" => "unset", "null" => False, "pk" => False, "protected" => False, "private" => False, "alias" => "name", "public" => True]; + $dict['email'] = ['read_only' => False, "type" => "str(150)", "subtype" => "unset", "choices" => "unset", "null" => False, "pk" => False, "protected" => False, "private" => False, "alias" => "email", "public" => False]; + $dict['passwordHash'] = ['read_only' => True, "type" => "str(256)", "subtype" => "unset", "choices" => "unset", "null" => False, "pk" => False, "protected" => True, "private" => True, "alias" => "passwordHash", "public" => False]; + $dict['passwordSalt'] = ['read_only' => True, "type" => "str(256)", "subtype" => "unset", "choices" => "unset", "null" => False, "pk" => False, "protected" => True, "private" => True, "alias" => "passwordSalt", "public" => False]; + $dict['isValid'] = ['read_only' => False, "type" => "bool", "subtype" => "unset", "choices" => "unset", "null" => True, "pk" => False, "protected" => False, "private" => False, "alias" => "isValid", "public" => False]; + $dict['isComputedPassword'] = ['read_only' => True, "type" => "bool", "subtype" => "unset", "choices" => "unset", "null" => False, "pk" => False, "protected" => True, "private" => False, "alias" => "isComputedPassword", "public" => False]; + $dict['lastLoginDate'] = ['read_only' => True, "type" => "int64", "subtype" => "unset", "choices" => "unset", "null" => False, "pk" => False, "protected" => True, "private" => False, "alias" => "lastLoginDate", "public" => False]; + $dict['registeredSince'] = ['read_only' => True, "type" => "int64", "subtype" => "unset", "choices" => "unset", "null" => False, "pk" => False, "protected" => True, "private" => False, "alias" => "registeredSince", "public" => False]; + $dict['sessionLifetime'] = ['read_only' => True, "type" => "int", "subtype" => "unset", "choices" => "unset", "null" => False, "pk" => False, "protected" => True, "private" => False, "alias" => "sessionLifetime", "public" => False]; + $dict['rightGroupId'] = ['read_only' => False, "type" => "int", "subtype" => "unset", "choices" => "unset", "null" => False, "pk" => False, "protected" => False, "private" => False, "alias" => "globalPermissionGroupId", "public" => False]; + $dict['yubikey'] = ['read_only' => True, "type" => "str(256)", "subtype" => "unset", "choices" => "unset", "null" => False, "pk" => False, "protected" => True, "private" => False, "alias" => "yubikey", "public" => False]; + $dict['otp1'] = ['read_only' => True, "type" => "str(256)", "subtype" => "unset", "choices" => "unset", "null" => False, "pk" => False, "protected" => True, "private" => False, "alias" => "otp1", "public" => False]; + $dict['otp2'] = ['read_only' => True, "type" => "str(256)", "subtype" => "unset", "choices" => "unset", "null" => False, "pk" => False, "protected" => True, "private" => False, "alias" => "otp2", "public" => False]; + $dict['otp3'] = ['read_only' => True, "type" => "str(256)", "subtype" => "unset", "choices" => "unset", "null" => False, "pk" => False, "protected" => True, "private" => False, "alias" => "otp3", "public" => False]; + $dict['otp4'] = ['read_only' => True, "type" => "str(256)", "subtype" => "unset", "choices" => "unset", "null" => False, "pk" => False, "protected" => True, "private" => False, "alias" => "otp4", "public" => False]; return $dict; } diff --git a/src/dba/models/Zap.class.php b/src/dba/models/Zap.class.php index 1a3dd78d0..02641e632 100644 --- a/src/dba/models/Zap.class.php +++ b/src/dba/models/Zap.class.php @@ -30,11 +30,11 @@ function getKeyValueDict() { static function getFeatures() { $dict = array(); - $dict['zapId'] = ['read_only' => True, "type" => "int", "subtype" => "unset", "choices" => "unset", "null" => False, "pk" => True, "protected" => True, "private" => False, "alias" => "zapId"]; - $dict['hash'] = ['read_only' => True, "type" => "str(65535)", "subtype" => "unset", "choices" => "unset", "null" => False, "pk" => False, "protected" => True, "private" => False, "alias" => "hash"]; - $dict['solveTime'] = ['read_only' => True, "type" => "int64", "subtype" => "unset", "choices" => "unset", "null" => False, "pk" => False, "protected" => True, "private" => False, "alias" => "solveTime"]; - $dict['agentId'] = ['read_only' => True, "type" => "int", "subtype" => "unset", "choices" => "unset", "null" => False, "pk" => False, "protected" => True, "private" => False, "alias" => "agentId"]; - $dict['hashlistId'] = ['read_only' => True, "type" => "int", "subtype" => "unset", "choices" => "unset", "null" => False, "pk" => False, "protected" => True, "private" => False, "alias" => "hashlistId"]; + $dict['zapId'] = ['read_only' => True, "type" => "int", "subtype" => "unset", "choices" => "unset", "null" => False, "pk" => True, "protected" => True, "private" => False, "alias" => "zapId", "public" => False]; + $dict['hash'] = ['read_only' => True, "type" => "str(65535)", "subtype" => "unset", "choices" => "unset", "null" => False, "pk" => False, "protected" => True, "private" => False, "alias" => "hash", "public" => False]; + $dict['solveTime'] = ['read_only' => True, "type" => "int64", "subtype" => "unset", "choices" => "unset", "null" => False, "pk" => False, "protected" => True, "private" => False, "alias" => "solveTime", "public" => False]; + $dict['agentId'] = ['read_only' => True, "type" => "int", "subtype" => "unset", "choices" => "unset", "null" => False, "pk" => False, "protected" => True, "private" => False, "alias" => "agentId", "public" => False]; + $dict['hashlistId'] = ['read_only' => True, "type" => "int", "subtype" => "unset", "choices" => "unset", "null" => False, "pk" => False, "protected" => True, "private" => False, "alias" => "hashlistId", "public" => False]; return $dict; } diff --git a/src/dba/models/generator.php b/src/dba/models/generator.php index 77086d171..867352d48 100644 --- a/src/dba/models/generator.php +++ b/src/dba/models/generator.php @@ -130,7 +130,7 @@ ['name' => 'assignmentId', 'read_only' => True, 'type' => 'int', 'protected' => True], ['name' => 'taskId', 'read_only' => False, 'type' => 'int', 'relation' => 'Task'], ['name' => 'agentId', 'read_only' => False, 'type' => 'int', 'relation' => 'Agent'], - ['name' => 'benchmark', 'read_only' => True, 'type' => 'str(50)', 'protected' => True], + ['name' => 'benchmark', 'read_only' => False, 'type' => 'str(50)', 'null' => True], ], ]; $CONF['Chunk'] = [ @@ -152,7 +152,7 @@ $CONF['Config'] = [ 'columns' => [ ['name' => 'configId', 'read_only' => True, 'type' => 'int', 'protected' => True], - ['name' => 'configSectionId', 'read_only' => False, 'type' => 'int', 'relation' => 'ConfigSecion'], + ['name' => 'configSectionId', 'read_only' => False, 'type' => 'int', 'relation' => 'ConfigSection'], ['name' => 'item', 'read_only' => False, 'type' => 'str(128)'], ['name' => 'value', 'read_only' => False, 'type' => 'str(65535)'], ], @@ -243,7 +243,7 @@ ['name' => 'isSecret', 'read_only' => False, 'type' => 'bool'], ['name' => 'hexSalt', 'read_only' => True, 'type' => 'bool', 'alias' => UQueryHashlist::HASHLIST_HEX_SALTED], ['name' => 'isSalted', 'read_only' => True, 'type' => 'bool'], - ['name' => 'accessGroupId', 'read_only' => False, 'type' => 'int', , 'relation' => 'AccessGroup'], + ['name' => 'accessGroupId', 'read_only' => False, 'type' => 'int', 'relation' => 'AccessGroup'], ['name' => 'notes', 'read_only' => False, 'type' => 'str(65535)'], ['name' => 'brainId', 'read_only' => True, 'type' => 'bool', 'alias' => UQueryHashlist::HASHLIST_USE_BRAIN], ['name' => 'brainFeatures', 'read_only' => True, 'type' => 'int'], @@ -349,7 +349,7 @@ $CONF['Session'] = [ 'columns' => [ ['name' => 'sessionId', 'read_only' => True, 'type' => 'int', 'protected' => True], - ['name' => 'userId', 'read_only' => True, 'type' => 'int', 'protected' => True, , 'relation' => 'User'], + ['name' => 'userId', 'read_only' => True, 'type' => 'int', 'protected' => True, 'relation' => 'User'], ['name' => 'sessionStartDate', 'read_only' => True, 'type' => 'int64', 'protected' => True], ['name' => 'lastActionDate', 'read_only' => True, 'type' => 'int64', 'protected' => True], ['name' => 'isOpen', 'read_only' => True, 'type' => 'bool', 'protected' => True], @@ -396,7 +396,7 @@ ['name' => 'skipKeyspace', 'read_only' => True, 'type' => 'int64'], ['name' => 'crackerBinaryId', 'read_only' => True, 'type' => 'int', 'relation' => 'CrackerBinary'], ['name' => 'crackerBinaryTypeId', 'read_only' => True, 'type' => 'int', 'relation' => 'CrackerBinaryType'], - ['name' => 'taskWrapperId', 'read_only' => True, 'type' => 'int', 'protected' => True, , 'relation' => 'TaskWrapper'], + ['name' => 'taskWrapperId', 'read_only' => True, 'type' => 'int', 'protected' => True, 'relation' => 'TaskWrapper'], ['name' => 'isArchived', 'read_only' => False, 'type' => 'bool'], ['name' => 'notes', 'read_only' => False, 'type' => 'str(65535)'], ['name' => 'staticChunks', 'read_only' => True, 'type' => 'int'], @@ -428,8 +428,8 @@ ]; $CONF['User'] = [ 'columns' => [ - ['name' => 'userId', 'read_only' => True, 'type' => 'int', 'protected' => True, 'alias' => 'id'], - ['name' => 'username', 'read_only' => False, 'type' => 'str(100)', 'alias' => 'name'], + ['name' => 'userId', 'read_only' => True, 'type' => 'int', 'protected' => True, 'alias' => 'id', 'public' => True], + ['name' => 'username', 'read_only' => False, 'type' => 'str(100)', 'alias' => 'name', 'public' => True], ['name' => 'email', 'read_only' => False, 'type' => 'str(150)'], ['name' => 'passwordHash', 'read_only' => True, 'type' => 'str(256)', 'protected' => True, 'private' => True], ['name' => 'passwordSalt', 'read_only' => True, 'protected' => True, 'type' => 'str(256)', 'private' => True], @@ -545,7 +545,8 @@ '"pk" => ' . (($col == $COLUMNS[0]['name']) ? 'True' : 'False') . ', ' . '"protected" => ' . (array_key_exists("protected", $COLUMN) ? ($COLUMN['protected'] ? 'True' : 'False') : 'False') . ', ' . '"private" => ' . (array_key_exists("private", $COLUMN) ? ($COLUMN['private'] ? 'True' : 'False') : 'False') . ', ' . - '"alias" => "' . (array_key_exists("alias", $COLUMN) ? $COLUMN['alias'] : $COLUMN['name']) . '"' . + '"alias" => "' . (array_key_exists("alias", $COLUMN) ? $COLUMN['alias'] : $COLUMN['name']) . '", ' . + '"public" => ' . (array_key_exists("public", $COLUMN) ? ($COLUMN['public'] ? 'True' : 'False') : 'False') . '];'; $keyVal[] = "\$dict['$col'] = \$this->$col;"; $variables[] = "const " . makeConstant($col) . " = \"$col\";"; diff --git a/src/inc/apiv2/common/AbstractBaseAPI.class.php b/src/inc/apiv2/common/AbstractBaseAPI.class.php index 71c5a23a3..fccc88b40 100644 --- a/src/inc/apiv2/common/AbstractBaseAPI.class.php +++ b/src/inc/apiv2/common/AbstractBaseAPI.class.php @@ -83,6 +83,12 @@ abstract public function getRequiredPermissions(string $method): array; * validatePermissions function call */ private $permissionErrors; + + /** + * @var array list of model classes which will need to be filtered for public attributes because + * no read access on the whole model exists + */ + protected $publicAttributeFilterClasses; /** * Constructor receives container instance @@ -533,8 +539,7 @@ protected function obj2Array(object $obj) /** * Convert DB object JSON:API Resource Object */ - protected function obj2Resource(object $obj, array $expandResult = []) - { + protected function obj2Resource(object $obj, array $expandResult = []): array { // Convert values to JSON supported types $features = $obj->getFeatures(); $kv = $obj->getKeyValueDict(); @@ -556,6 +561,11 @@ protected function obj2Resource(object $obj, array $expandResult = []) if ($feature['pk'] === true) { continue; } + + if (is_array($this->publicAttributeFilterClasses) && in_array($obj::class, $this->publicAttributeFilterClasses) && $feature['public'] !== true){ + continue; + } + $attributes[$feature['alias']] = $apiClass::db2json($feature, $kv[$name]); } @@ -912,13 +922,23 @@ protected function makeExpandables(Request $request, array $validExpandables): a /* Validate expand parameters for required permissions */ $required_perms = []; + $permsExpandMatching = []; foreach ($queryExpands as $expand) { - array_push($required_perms, ...self::getExpandPermissions($expand)); + $expandedPerms = self::getExpandPermissions($expand); + foreach($expandedPerms as $expandedPerm) { + if (!isset($permsExpandMatching[$expandedPerm])){ + $permsExpandMatching[$expandedPerm] = [$expand]; + } + else{ + $permsExpandMatching[$expandedPerm][] = $expand; + } + } + array_push($required_perms, ...$expandedPerms); } - if ($this->validatePermissions($required_perms) === FALSE) { + $permissionResponse = $this->validatePermissions($required_perms, $permsExpandMatching); + if ($permissionResponse === FALSE) { throw new HttpError('Permissions missing on expand parameter objects! || ' . join('||', $this->permissionErrors)); } - return $queryExpands; } @@ -1110,11 +1130,10 @@ protected function validateHashlistAccess(Request $request, User $user, String $ /** * Validate permissions */ - protected function validatePermissions(array $required_perms): bool { + protected function validatePermissions(array $required_perms, array $permsExpandMatching = []): bool|array { // Retrieve permissions from RightGroup part of the User $group = Factory::getRightGroupFactory()->get($this->user->getRightGroupId()); - if ($group->getPermissions() == 'ALL') { // Special (legacy) case for administative access, enable all available permissions $all_perms = array_keys(self::$acl_mapping); @@ -1141,6 +1160,47 @@ protected function validatePermissions(array $required_perms): bool { // Find if all permissions are matched $missing_permissions = array_diff($required_perms, $user_available_perms); if (count($missing_permissions) > 0) { + if($this instanceof AbstractModelAPI) { + $features = $this->getFeatures(); + foreach ($features as $key => $arr) { + if ($arr['public']) { + $this->addPublicAttributeClass($this->getDBAClass()); + } + } + + $missingPermissionMatching = true; + // if we also have permissions from expanded entries we need to check them as well + if (count($permsExpandMatching) && $this instanceof AbstractModelAPI) { + foreach ($missing_permissions as $missing_permission) { + $expands = $permsExpandMatching[$missing_permission]; + foreach ($expands as $expand) { + $classType = $this->getToManyRelationships()[$expand]['relationType']; + $features = $this->getFeaturesOther($classType); + $expandPublicAttributes = []; + foreach ($features as $key => $arr) { + if ($arr['public']) { + $expandPublicAttributes[] = $key; + } + } + if (count($expandPublicAttributes) == 0) { + $missingPermissionMatching = false; + break; + } + else { + $this->addPublicAttributeClass($classType); + } + } + } + } + if (!$missingPermissionMatching) { + $this->publicAttributeFilterClasses = []; + } + + if (count($this->publicAttributeFilterClasses) > 0) { + // if there are public attributes we don't return false, but the list of classes which needs to be filtered is saved in the attribteFilterClasses list + return TRUE; + } + } $this->permissionErrors = array("No '" . join(",", $missing_permissions) . "' permission(s). [required_permissions='" .join(", ", $required_perms). "', user_permissions='" . join(", ", $user_available_perms) . "']"); return FALSE; } else { @@ -1148,6 +1208,15 @@ protected function validatePermissions(array $required_perms): bool { return TRUE; } } + + protected function addPublicAttributeClass($class): void { + if(!is_array($this->publicAttributeFilterClasses)){ + $this->publicAttributeFilterClasses = []; + } + if(!in_array($class, $this->publicAttributeFilterClasses)){ + $this->publicAttributeFilterClasses[] = $class; + } + } /** * Common features for all requests, like setting user and checking basic permissions @@ -1176,8 +1245,7 @@ protected function preCommon(Request $request): void throw new HttpForbidden($e->getMessage() . "(valid methods are for model are: " . join(",", $this->getAvailableMethods()) . ")"); } - - + if ($this->validatePermissions($required_perms) === FALSE) { throw new HttpForbidden(join('||', $this->permissionErrors)); } From 7c8461ae4981f2b03aa2296cbfb1c572c57075aa Mon Sep 17 00:00:00 2001 From: Sein Coray Date: Thu, 26 Jun 2025 11:50:33 +0200 Subject: [PATCH 100/691] Code quality Rework (#1402) * code document and typing pass over AbstractBaseAPI * fixed typing initialization issue of variable * applied formatting * code document and typing pass over AbstractHelperAPI * applied formatting * code document and typing pass over AbstractModelAPI * applied formatting * fixed non matching signature in route and formatted errorhandler * code document and typing pass over openAPISchema * applied formatting * applied formatting * fixed typos, phpdocs and typing in all helpers * applied formatting to all helpers * fixed typos, phpdocs and typing in all model routes * applied formatting to all model routes * applied typing and code style to apiv2 index --- src/api/v2/index.php | 261 ++--- src/inc/apiv2/auth/token.routes.php | 167 +-- .../apiv2/common/AbstractBaseAPI.class.php | 923 +++++++++-------- .../apiv2/common/AbstractHelperAPI.class.php | 63 +- .../apiv2/common/AbstractModelAPI.class.php | 959 ++++++++++-------- src/inc/apiv2/common/ErrorHandler.class.php | 27 +- src/inc/apiv2/common/openAPISchema.routes.php | 554 +++++----- src/inc/apiv2/helper/abortChunk.routes.php | 19 +- src/inc/apiv2/helper/assignAgent.routes.php | 3 +- .../apiv2/helper/changeOwnPassword.routes.php | 27 +- .../helper/createSuperHashlist.routes.php | 44 +- .../apiv2/helper/createSupertask.routes.php | 40 +- .../helper/exportCrackedHashes.routes.php | 23 +- .../apiv2/helper/exportLeftHashes.routes.php | 24 +- .../apiv2/helper/exportWordlist.routes.php | 20 +- .../apiv2/helper/getAccessGroups.routes.php | 34 +- src/inc/apiv2/helper/getFile.routes.php | 109 +- .../apiv2/helper/getUserPermission.routes.php | 28 +- .../helper/importCrackedHashes.routes.php | 3 +- src/inc/apiv2/helper/importFile.routes.php | 234 ++--- src/inc/apiv2/helper/purgeTask.routes.php | 26 +- .../apiv2/helper/recountFileLines.routes.php | 28 +- src/inc/apiv2/helper/resetChunk.routes.php | 20 +- .../apiv2/helper/resetUserPassword.routes.php | 5 +- .../apiv2/helper/setUserPassword.routes.php | 25 +- src/inc/apiv2/helper/unassignAgent.routes.php | 3 +- src/inc/apiv2/model/accessgroups.routes.php | 91 +- .../apiv2/model/agentassignments.routes.php | 159 +-- src/inc/apiv2/model/agentbinaries.routes.php | 93 +- src/inc/apiv2/model/agenterrors.routes.php | 118 +-- src/inc/apiv2/model/agents.routes.php | 184 ++-- src/inc/apiv2/model/agentstats.routes.php | 86 +- src/inc/apiv2/model/chunks.routes.php | 140 ++- src/inc/apiv2/model/configs.routes.php | 76 +- src/inc/apiv2/model/configsections.routes.php | 51 +- src/inc/apiv2/model/crackers.routes.php | 127 +-- src/inc/apiv2/model/crackertypes.routes.php | 115 ++- src/inc/apiv2/model/files.routes.php | 303 +++--- .../model/globalpermissiongroups.routes.php | 164 +-- src/inc/apiv2/model/hashes.routes.php | 118 ++- src/inc/apiv2/model/hashlists.routes.php | 293 +++--- src/inc/apiv2/model/hashtypes.routes.php | 53 +- .../apiv2/model/healthcheckagents.routes.php | 121 ++- src/inc/apiv2/model/healthchecks.routes.php | 107 +- src/inc/apiv2/model/logentries.routes.php | 35 +- src/inc/apiv2/model/notifications.routes.php | 165 +-- src/inc/apiv2/model/preprocessors.routes.php | 97 +- src/inc/apiv2/model/pretasks.routes.php | 148 +-- src/inc/apiv2/model/speeds.routes.php | 158 +-- src/inc/apiv2/model/supertasks.routes.php | 177 ++-- src/inc/apiv2/model/tasks.routes.php | 355 +++---- src/inc/apiv2/model/taskwrappers.routes.php | 213 ++-- src/inc/apiv2/model/users.routes.php | 222 ++-- src/inc/apiv2/model/vouchers.routes.php | 59 +- 54 files changed, 4031 insertions(+), 3666 deletions(-) diff --git a/src/api/v2/index.php b/src/api/v2/index.php index dd44bdca2..44a207754 100644 --- a/src/api/v2/index.php +++ b/src/api/v2/index.php @@ -11,8 +11,8 @@ ini_set("display_errors", '1'); /** * Treat warnings as error, very usefull during unit testing. - * TODO: How-ever during Xdebug debugging under VS Code, this is very - * TODO: slightly annoying since the last call stack is not very interesting. + * TODO: How-ever during Xdebug debugging under VS Code, this is very + * TODO: slightly annoying since the last call stack is not very interesting. * TODO: Thus for the time-being do not-enable by default. */ // set_error_handler(function ($severity, $message, $file, $line) { @@ -54,148 +54,150 @@ require_once(dirname(__FILE__) . "/../../inc/load.php"); - + /* Construct container for middleware */ $container = new \DI\Container(); AppFactory::setContainer($container); /* Authentication middleware for token retrival */ + class HashtopolisAuthenticator implements AuthenticatorInterface { - public function __invoke(array $arguments): bool { - $username = $arguments["user"]; - $password = $arguments["password"]; - - $filter = new QueryFilter(User::USERNAME, $username, "="); - - $check = Factory::getUserFactory()->filter([Factory::FILTER => $filter]); - if ($check === null || sizeof($check) == 0) { - return false; - } - $user = $check[0]; - - if ($user->getIsValid() != 1) { - return false; - } - else if (!Encryption::passwordVerify($password, $user->getPasswordSalt(), $user->getPasswordHash())) { - Util::createLogEntry(DLogEntryIssuer::USER, $user->getId(), DLogEntry::WARN, "Failed login attempt due to wrong password!"); - return false; - } - return true; + public function __invoke(array $arguments): bool { + $username = $arguments["user"]; + $password = $arguments["password"]; + + $filter = new QueryFilter(User::USERNAME, $username, "="); + + $check = Factory::getUserFactory()->filter([Factory::FILTER => $filter]); + if ($check === null || sizeof($check) == 0) { + return false; } + $user = $check[0]; + + if ($user->getIsValid() != 1) { + return false; + } + else if (!Encryption::passwordVerify($password, $user->getPasswordSalt(), $user->getPasswordHash())) { + Util::createLogEntry(DLogEntryIssuer::USER, $user->getId(), DLogEntry::WARN, "Failed login attempt due to wrong password!"); + return false; + } + return true; + } } $container->set("HttpBasicAuthentication", function (\Psr\Container\ContainerInterface $container) { - return new HttpBasicAuthentication([ - "path" => "/api/v2/auth/token", - "secure" => false, - "error" => function ($response, $arguments) { - return errorResponse($response, $arguments["message"], 401); - }, - "authenticator" => new HashtopolisAuthenticator, - "before" => function ($request, $arguments) { - return $request->withAttribute("user", $arguments["user"]); - } - ]); + return new HttpBasicAuthentication([ + "path" => "/api/v2/auth/token", + "secure" => false, + "error" => function ($response, $arguments) { + return errorResponse($response, $arguments["message"], 401); + }, + "authenticator" => new HashtopolisAuthenticator, + "before" => function ($request, $arguments) { + return $request->withAttribute("user", $arguments["user"]); + } + ]); }); /* Quick to create auto-generated lookup table between DBA Objects and APIv2 classes */ + class ClassMapper { - private $store = array(); - public function add($key, $value) : void { + private array $store = array(); + + public function add($key, $value): void { $this->store[$key] = $value; } + public function get($key): string { return $this->store[$key]; } } -$container->set("classMapper", function() { +$container->set("classMapper", function () { return new ClassMapper(); }); /* API token validation */ $container->set("JwtAuthentication", function (\Psr\Container\ContainerInterface $container) { - include(dirname(__FILE__) . '/../../inc/confv2.php'); - return new JwtAuthentication([ - "path" => "/", - "ignore" => ["/api/v2/auth/token", "/api/v2/helper/resetUserPassword", "/api/v2/openapi.json"], - "secret" => $PEPPER[0], - "attribute" => false, - "secure" => false, - "error" => function ($response, $arguments) { - return errorResponse($response, $arguments["message"], 401); - }, - "before" => function ($request, $arguments) use ($container) { - // TODO: Validate if user is still allowed to login - return $request->withAttribute("userId", $arguments["decoded"]["userId"])->withAttribute("scope", $arguments["decoded"]["scope"]); - }, - ]); + include(dirname(__FILE__) . '/../../inc/confv2.php'); + return new JwtAuthentication([ + "path" => "/", + "ignore" => ["/api/v2/auth/token", "/api/v2/helper/resetUserPassword", "/api/v2/openapi.json"], + "secret" => $PEPPER[0], + "attribute" => false, + "secure" => false, + "error" => function ($response, $arguments) { + return errorResponse($response, $arguments["message"], 401); + }, + "before" => function ($request, $arguments) use ($container) { + // TODO: Validate if user is still allowed to login + return $request->withAttribute("userId", $arguments["decoded"]["userId"])->withAttribute("scope", $arguments["decoded"]["scope"]); + }, + ]); }); /* Pre-parse incoming request body */ -class JsonBodyParserMiddleware implements MiddlewareInterface -{ - public function process(Request $request, RequestHandler $handler): Response - { - $contentType = $request->getHeaderLine('Content-Type'); - - if (strstr($contentType, 'application/json') || strstr($contentType, 'application/vnd.api+json')) { - $contents = json_decode(file_get_contents('php://input'), true); - if (json_last_error() === JSON_ERROR_NONE) { - $request = $request->withParsedBody($contents); - } else { - $response = new Response(); - return errorResponse($response, "Malformed request", 400); - } - } - - $response = $handler->handle($request); - return $response; + +class JsonBodyParserMiddleware implements MiddlewareInterface { + public function process(Request $request, RequestHandler $handler): Response { + $contentType = $request->getHeaderLine('Content-Type'); + + if (strstr($contentType, 'application/json') || strstr($contentType, 'application/vnd.api+json')) { + $contents = json_decode(file_get_contents('php://input'), true); + if (json_last_error() === JSON_ERROR_NONE) { + $request = $request->withParsedBody($contents); + } + else { + $response = new Response(); + return errorResponse($response, "Malformed request", 400); + } } + + return $handler->handle($request); + } } -/* Quirk to map token as parameter (usefull for debugging) to 'Authorization Header (for JWT input) */ -class TokenAsParameterMiddleware implements MiddlewareInterface -{ - public function process(Request $request, RequestHandler $handler): Response - { - $data = $request->getQueryParams(); - if (array_key_exists('token', $data)) { - $request = $request->withHeader('Authorization', 'Bearer ' . $data['token']); - }; - - $response = $handler->handle($request); - return $response; - } +/* Quirk to map token as parameter (useful for debugging) to 'Authorization Header (for JWT input) */ + +class TokenAsParameterMiddleware implements MiddlewareInterface { + public function process(Request $request, RequestHandler $handler): Response { + $data = $request->getQueryParams(); + if (array_key_exists('token', $data)) { + $request = $request->withHeader('Authorization', 'Bearer ' . $data['token']); + }; + + return $handler->handle($request); + } } /* FIXME: CORS wildcard hack should require proper implementation and validation */ -/* This middleware will append the response header Access-Control-Allow-Methods with all allowed methods */ -class CorsHackMiddleware implements MiddlewareInterface -{ - public function process(Request $request, RequestHandler $handler): Response { - $response = $handler->handle($request); - return $this::addCORSheaders($request, $response); - } +/* This middleware will append the response header Access-Control-Allow-Methods with all allowed methods */ - public static function addCORSheaders(Request $request, $response) { - $routeContext = RouteContext::fromRequest($request); - $routingResults = $routeContext->getRoutingResults(); - $methods = $routingResults->getAllowedMethods(); - $requestHeaders = $request->getHeaderLine('Access-Control-Request-Headers'); +class CorsHackMiddleware implements MiddlewareInterface { + public function process(Request $request, RequestHandler $handler): Response { + $response = $handler->handle($request); + + return $this::addCORSheaders($request, $response); + } + + public static function addCORSheaders(Request $request, $response) { + $routeContext = RouteContext::fromRequest($request); + $routingResults = $routeContext->getRoutingResults(); + $methods = $routingResults->getAllowedMethods(); + $requestHeaders = $request->getHeaderLine('Access-Control-Request-Headers'); - $response = $response->withHeader('Access-Control-Allow-Origin', '*'); - $response = $response->withHeader('Access-Control-Allow-Methods', implode(',', $methods)); - $response = $response->withHeader('Access-Control-Allow-Headers', $requestHeaders); + $response = $response->withHeader('Access-Control-Allow-Origin', '*'); + $response = $response->withHeader('Access-Control-Allow-Methods', implode(',', $methods)); + $response = $response->withHeader('Access-Control-Allow-Headers', $requestHeaders); - // Optional: Allow Ajax CORS requests with Authorization header - // $response = $response->withHeader('Access-Control-Allow-Credentials', 'true'); - return $response; - } + // Optional: Allow Ajax CORS requests with Authorization header + // $response = $response->withHeader('Access-Control-Allow-Credentials', 'true'); + return $response; + } } /* @@ -218,7 +220,8 @@ public static function addCORSheaders(Request $request, $response) { $app->add(new ContentLengthMiddleware()); // NOTE: Add any middleware which may modify the response body before adding the ContentLengthMiddleware $app->add((new DeflateEncoder())->contentType( '/^(image\/svg\\+xml|text\/.*|application\/json|"application\/vnd\.api+json)(;.*)?$/' -)); +) +); $app->add(new CorsHackMiddleware()); // NOTE: The RoutingMiddleware should be added after our CORS middleware so routing is performed first // NOTE: The ErrorMiddleware should be added after any middleware which may modify the response body @@ -227,36 +230,36 @@ public static function addCORSheaders(Request $request, $response) { $errorHandler->forceContentType('application/json'); $customErrorHandler = function ( - Request $request, - Throwable $exception, - bool $displayErrorDetails, - bool $logErrors, + Request $request, + Throwable $exception, + bool $displayErrorDetails, + bool $logErrors, bool $logErrorDetails) use ($app) { - - $response = $app->getResponseFactory()->createResponse(); - $response = CorsHackMiddleware::addCORSheaders($request, $response); - - //Quirck to handle HTexceptions without status code, this can be removed when all HTexceptions have been migrated - error_log($exception->getMessage()); - $code = $exception->getCode(); - if ($code == 0) { - $code = 500; - } - - return errorResponse($response, $exception->getMessage(), $code); - }; + + $response = $app->getResponseFactory()->createResponse(); + $response = CorsHackMiddleware::addCORSheaders($request, $response); + + //Quirck to handle HTexceptions without status code, this can be removed when all HTexceptions have been migrated + error_log($exception->getMessage()); + $code = $exception->getCode(); + if ($code == 0) { + $code = 500; + } + + return errorResponse($response, $exception->getMessage(), $code); +}; $errorMiddleware->setDefaultErrorHandler($customErrorHandler); $app->addRoutingMiddleware(); //Routing middleware has to be added after the default error handler -$errorMiddlewareMethodNotAllowed = $app->addErrorMiddleware(true, true, true); -$errorMiddlewareMethodNotAllowed->setErrorHandler(HttpMethodNotAllowedException::class, function( - Request $request, - Throwable $exception, - bool $displayErrorDetails, - bool $logErrors, +$errorMiddlewareMethodNotAllowed = $app->addErrorMiddleware(true, true, true); +$errorMiddlewareMethodNotAllowed->setErrorHandler(HttpMethodNotAllowedException::class, function ( + Request $request, + Throwable $exception, + bool $displayErrorDetails, + bool $logErrors, bool $logErrorDetails) use ($app) { - $response = $app->getResponseFactory()->createResponse(); - return errorResponse($response, $exception->getMessage(), 405); - }); + $response = $app->getResponseFactory()->createResponse(); + return errorResponse($response, $exception->getMessage(), 405); +}); require __DIR__ . "/../../inc/apiv2/auth/token.routes.php"; diff --git a/src/inc/apiv2/auth/token.routes.php b/src/inc/apiv2/auth/token.routes.php index 3b4851795..7f1f01317 100644 --- a/src/inc/apiv2/auth/token.routes.php +++ b/src/inc/apiv2/auth/token.routes.php @@ -1,4 +1,5 @@ group("/api/v2/auth/token", function (RouteCollectorProxy $group) { - /* Allow preflight requests */ - $group->options('', function (Request $request, Response $response, array $args): Response { - return $response; - }); - - $group->post('', function (Request $request, Response $response, array $args): Response { - include(dirname(__FILE__) . '/../../confv2.php'); - - $requested_scopes = $request->getParsedBody() ?: ["todo.all"]; - - $valid_scopes = [ - "todo.create", - "todo.read", - "todo.update", - "todo.delete", - "todo.list", - "todo.all" - ]; - - $scopes = array_filter($requested_scopes, function ($needle) use ($valid_scopes) { - return in_array($needle, $valid_scopes); - }); - - $now = new DateTime(); - $future = new DateTime("now +2 hours"); - $server = $request->getServerParams(); - - $jti = bin2hex(random_bytes(16)); - - // FIXME: This is duplicated and should be passed by HttpBasicMiddleware - $filter = new QueryFilter(User::USERNAME, $request->getAttribute('user'), "="); - $check = Factory::getUserFactory()->filter([Factory::FILTER => $filter]); - $user = $check[0]; - - $payload = [ - "iat" => $now->getTimeStamp(), - "exp" => $future->getTimeStamp(), - "jti" => $jti, - "userId" => $user->getId(), - "scope" => $scopes - ]; - - $secret = $PEPPER[0]; - $token = JWT::encode($payload, $secret, "HS256"); - - $data["token"] = $token; - $data["expires"] = $future->getTimeStamp(); - - $body = $response->getBody(); - $body->write(json_encode($data, JSON_UNESCAPED_SLASHES | JSON_PRETTY_PRINT)); - - return $response->withStatus(201) - ->withHeader("Content-Type", "application/json"); +$app->group("/api/v2/auth/token", function (RouteCollectorProxy $group) { + /* Allow preflight requests */ + $group->options('', function (Request $request, Response $response, array $args): Response { + return $response; + }); + + $group->post('', function (Request $request, Response $response, array $args): Response { + include(dirname(__FILE__) . '/../../confv2.php'); + + $requested_scopes = $request->getParsedBody() ?: ["todo.all"]; + + $valid_scopes = [ + "todo.create", + "todo.read", + "todo.update", + "todo.delete", + "todo.list", + "todo.all" + ]; + + $scopes = array_filter($requested_scopes, function ($needle) use ($valid_scopes) { + return in_array($needle, $valid_scopes); }); + + $now = new DateTime(); + $future = new DateTime("now +2 hours"); + $server = $request->getServerParams(); + + $jti = bin2hex(random_bytes(16)); + + // FIXME: This is duplicated and should be passed by HttpBasicMiddleware + $filter = new QueryFilter(User::USERNAME, $request->getAttribute('user'), "="); + $check = Factory::getUserFactory()->filter([Factory::FILTER => $filter]); + $user = $check[0]; + + $payload = [ + "iat" => $now->getTimeStamp(), + "exp" => $future->getTimeStamp(), + "jti" => $jti, + "userId" => $user->getId(), + "scope" => $scopes + ]; + + $secret = $PEPPER[0]; + $token = JWT::encode($payload, $secret, "HS256"); + + $data["token"] = $token; + $data["expires"] = $future->getTimeStamp(); + + $body = $response->getBody(); + $body->write(json_encode($data, JSON_UNESCAPED_SLASHES | JSON_PRETTY_PRINT)); + + return $response->withStatus(201) + ->withHeader("Content-Type", "application/json"); + }); }); -$app->group("/api/v2/auth/refresh", function (RouteCollectorProxy $group) { +$app->group("/api/v2/auth/refresh", function (RouteCollectorProxy $group) { /* Allow preflight requests */ $group->options('', function (Request $request, Response $response, array $args): Response { - return $response; + return $response; }); - + $group->post('', function (Request $request, Response $response, array $args): Response { - include(dirname(__FILE__) . '/../conf.php'); - - $now = new DateTime(); - $future = new DateTime("now +2 hours"); - - $jti = bin2hex(random_bytes(16)); - - $payload = [ - "iat" => $now->getTimeStamp(), - "exp" => $future->getTimeStamp(), - "jti" => $jti, - "userId" => $request->getAttribute(('userId')), - "scope" => $request->getAttribute("scope") - ]; - - $secret = $PEPPER[0]; - $token = JWT::encode($payload, $secret, "HS256"); - - $data["token"] = $token; - $data["expires"] = $future->getTimeStamp(); - - $body = $response->getBody(); - $body->write(json_encode($data, JSON_UNESCAPED_SLASHES | JSON_PRETTY_PRINT)); - - return $response->withStatus(201) - ->withHeader("Content-Type", "application/json"); + include(dirname(__FILE__) . '/../conf.php'); + + $now = new DateTime(); + $future = new DateTime("now +2 hours"); + + $jti = bin2hex(random_bytes(16)); + + $payload = [ + "iat" => $now->getTimeStamp(), + "exp" => $future->getTimeStamp(), + "jti" => $jti, + "userId" => $request->getAttribute(('userId')), + "scope" => $request->getAttribute("scope") + ]; + + $secret = $PEPPER[0]; + $token = JWT::encode($payload, $secret, "HS256"); + + $data["token"] = $token; + $data["expires"] = $future->getTimeStamp(); + + $body = $response->getBody(); + $body->write(json_encode($data, JSON_UNESCAPED_SLASHES | JSON_PRETTY_PRINT)); + + return $response->withStatus(201) + ->withHeader("Content-Type", "application/json"); }); }); \ No newline at end of file diff --git a/src/inc/apiv2/common/AbstractBaseAPI.class.php b/src/inc/apiv2/common/AbstractBaseAPI.class.php index fccc88b40..85909959c 100644 --- a/src/inc/apiv2/common/AbstractBaseAPI.class.php +++ b/src/inc/apiv2/common/AbstractBaseAPI.class.php @@ -1,9 +1,12 @@ container = $container; + $this->publicAttributeFilterClasses = []; } /** @@ -116,31 +113,28 @@ protected function getSingleACL(User $user, object $object): bool { protected function getFilterACL(): array { return []; } - - /** + + /** * Extra fields which are valid for creation of object */ public function getFormFields(): array { - return []; + return []; } - + /** * Get input field names valid for creation of object */ - final public function getCreateValidFeatures(): array - { + final public function getCreateValidFeatures(): array { return $this->getAliasedFeatures(); } - - + /** - * Create features from formfields + * Create features from form fields */ - protected function getFeatures(): array - { + protected function getFeatures(): array { $features = []; - foreach($this->getFormFields() as $key => $feature) { - /* Innitate default values */ + foreach ($this->getFormFields() as $key => $feature) { + /* Initiate default values */ $features[$key] = $feature + ['null' => False, 'protected' => False, 'private' => False, 'choices' => "unset", 'pk' => False, 'read_only' => True]; if (!array_key_exists('alias', $feature)) { $features[$key]['alias'] = $key; @@ -148,31 +142,30 @@ protected function getFeatures(): array } return $features; } - + protected function getUpdateHandlers($id, $current_user): array { return []; } - + /** - * Overidable function to aggregate data in the object. Currently only used for Tasks + * Overridable function to aggregate data in the object. Currently only used for Tasks * returns the aggregated data in key value pairs */ public static function aggregateData(object $object): array { return []; } - + /** * Take all the dba features and converts them to a list. - * It uses the data from the generator and replaces the keys with the aliasses. + * It uses the data from the generator and replaces the keys with the aliases. * structure: hashlist: name: [dbname => hashlistId] */ - public function getAliasedFeatures(): array - { + public function getAliasedFeatures(): array { $features = $this->getFeatures(); return $this->mapFeatures($features); } - - final protected function mapFeatures($features) { + + final protected function mapFeatures($features): array { $mappedFeatures = []; foreach ($features as $key => $value) { $mappedFeatures[$value['alias']] = $value; @@ -180,17 +173,17 @@ final protected function mapFeatures($features) { } return $mappedFeatures; } - - /** + + /** * Retrieve currently logged-in user */ final protected function getCurrentUser(): User { return $this->user; } - - + + protected static function getModelFactory(string $model): object { - switch($model) { + switch ($model) { case AccessGroup::class: return Factory::getAccessGroupFactory(); case AccessGroupAgent::class: @@ -259,12 +252,17 @@ protected static function getModelFactory(string $model): object { return Factory::getTaskWrapperFactory(); case User::class: return Factory::getUserFactory(); - } + } assert(False, "Model '$model' cannot be mapped to Factory"); } - - final protected static function fetchOne(string $model, int $pk): object - { + + /** + * @param string $model + * @param int $pk + * @return object + * @throws ResourceNotFoundError + */ + final protected static function fetchOne(string $model, int $pk): object { $factory = self::getModelFactory($model); $object = $factory->get($pk); if ($object === null) { @@ -272,77 +270,71 @@ final protected static function fetchOne(string $model, int $pk): object } return $object; } - - final protected static function getChunk(int $pk): Chunk - { + + final protected static function getChunk(int $pk): Chunk { return self::fetchOne(Chunk::class, $pk); } - - final protected static function getCrackerBinary(int $pk): CrackerBinary - { + + final protected static function getCrackerBinary(int $pk): CrackerBinary { return self::fetchOne(CrackerBinary::class, $pk); } - - final protected static function getHashlist(int $pk): Hashlist - { + + final protected static function getHashlist(int $pk): Hashlist { return self::fetchOne(Hashlist::class, $pk); } - - final protected static function getPretask(int $pk): Pretask - { + + final protected static function getPretask(int $pk): Pretask { return self::fetchOne(Pretask::class, $pk); } - - final protected static function getRightGroup(int $pk): RightGroup - { + + final protected static function getRightGroup(int $pk): RightGroup { return self::fetchOne(RightGroup::class, $pk); } - - final protected static function getSupertask(int $pk): Supertask - { + + final protected static function getSupertask(int $pk): Supertask { return self::fetchOne(Supertask::class, $pk); } - - final protected static function getTask(int $pk): Task - { + + final protected static function getTask(int $pk): Task { return self::fetchOne(Task::class, $pk); } - final protected static function getTaskWrapper(int $pk): TaskWrapper - { + + final protected static function getTaskWrapper(int $pk): TaskWrapper { return self::fetchOne(TaskWrapper::class, $pk); } - - final protected static function getUser(int $pk): User - { + + final protected static function getUser(int $pk): User { return self::fetchOne(User::class, $pk); } - + /** * Return Object Resource Type Identifier of API object. - * - * @param mixed $obj - * @return string + * + * @param mixed $obj + * @return string + * @throws ContainerExceptionInterface + * @throws NotFoundExceptionInterface */ - final protected function getObjectTypeName($obj): string - { - + final protected function getObjectTypeName(mixed $obj): string { + $container = $this->container->get('classMapper'); - + if (is_string($obj)) { $apiClass = $this->container->get('classMapper')->get($obj); - } else { + } + else { $apiClass = $this->container->get('classMapper')->get(get_class($obj)); } - + /* Use the API class Name as type identifier written in camelCase*/ return lcfirst(substr($apiClass, 0, -3)); } - - /** - * Retrieve permissions based on expand section - */ - protected static function getExpandPermissions(string $expand): array - { + + /** + * Retrieve permissions based on expand section + * @throws InternalError + */ + protected static function getExpandPermissions(string $expand): array { $expand_to_perm_mapping = array( 'assignedAgents' => [Agent::PERM_READ], 'assignments' => [Assignment::PERM_READ], @@ -350,7 +342,7 @@ protected static function getExpandPermissions(string $expand): array 'agents' => [AccessGroup::PERM_READ], 'agentErrors' => [AgentError::PERM_READ], 'agentStats' => [AgentStat::PERM_READ], - 'accessGroups' => [AccessGroup::PERM_READ], + 'accessGroups' => [AccessGroup::PERM_READ], 'accessGroup' => [AccessGroup::PERM_READ], 'chunk' => [Chunk::PERM_READ], 'chunks' => [Chunk::PERM_READ], @@ -376,68 +368,73 @@ protected static function getExpandPermissions(string $expand): array 'userMembers' => [User::PERM_READ], 'agentMembers' => [Agent::PERM_READ], ); - + if (array_key_exists($expand, $expand_to_perm_mapping) === False) { throw new InternalError("Internal error: Expand type '$expand' has no permission mapping implemented in getExpandPermissions()!"); } return $expand_to_perm_mapping[$expand]; } - + /** - * Temponary mapping until src/inc/defines/accessControl.php permissions are no longer used + * Temporary mapping until src/inc/defines/accessControl.php permissions are no longer used */ - public static $acl_mapping = array( + public static array $acl_mapping = array( DAccessControl::VIEW_HASHLIST_ACCESS[0] => array(Hashlist::PERM_READ), DAccessControl::MANAGE_HASHLIST_ACCESS => array(Hashlist::PERM_READ, Hashlist::PERM_UPDATE, Hashlist::PERM_DELETE, - Hash::PERM_READ, Hash::PERM_UPDATE, Hash::PERM_DELETE), + Hash::PERM_READ, Hash::PERM_UPDATE, Hash::PERM_DELETE + ), DAccessControl::CREATE_HASHLIST_ACCESS => array(Hashlist::PERM_CREATE, Hash::PERM_CREATE), - + DAccessControl::CREATE_SUPERHASHLIST_ACCESS => array(HashlistHashlist::PERM_CREATE, HashlistHashlist::PERM_READ), - + DAccessControl::VIEW_HASHES_ACCESS => array(Hash::PERM_READ), DAccessControl::VIEW_AGENT_ACCESS[0] => array(Agent::PERM_READ, Assignment::PERM_READ, AgentError::PERM_READ), - + DAccessControl::MANAGE_AGENT_ACCESS => array(Agent::PERM_READ, Agent::PERM_UPDATE, Agent::PERM_DELETE, - // src/inc/defines/agents.php - AgentStat::PERM_CREATE, AgentStat::PERM_READ, AgentStat::PERM_UPDATE, AgentStat::PERM_DELETE, - Assignment::PERM_CREATE, Assignment::PERM_READ, Assignment::PERM_UPDATE, Assignment::PERM_DELETE, - AgentError::PERM_DELETE - - ), - + // src/inc/defines/agents.php + AgentStat::PERM_CREATE, AgentStat::PERM_READ, AgentStat::PERM_UPDATE, AgentStat::PERM_DELETE, + Assignment::PERM_CREATE, Assignment::PERM_READ, Assignment::PERM_UPDATE, Assignment::PERM_DELETE, + AgentError::PERM_DELETE + + ), + DAccessControl::CREATE_AGENT_ACCESS => array(Agent::PERM_CREATE, Agent::PERM_READ, - // src/inc/defines/agents.php - RegVoucher::PERM_CREATE, RegVoucher::PERM_READ, RegVoucher::PERM_UPDATE, RegVoucher::PERM_DELETE), - + // src/inc/defines/agents.php + RegVoucher::PERM_CREATE, RegVoucher::PERM_READ, RegVoucher::PERM_UPDATE, RegVoucher::PERM_DELETE + ), + DAccessControl::VIEW_TASK_ACCESS[0] => array(Task::PERM_READ, Speed::PERM_READ, Chunk::PERM_READ, FileTask::PERM_READ), DAccessControl::RUN_TASK_ACCESS[0] => array(Task::PERM_CREATE, FileTask::PERM_CREATE), DAccessControl::CREATE_TASK_ACCESS[0] => array(Task::PERM_CREATE, FileTask::PERM_CREATE, - Task::PERM_READ, Chunk::PERM_READ, FileTask::PERM_READ, - TaskWrapper::PERM_CREATE, TaskWrapper::PERM_READ), + Task::PERM_READ, Chunk::PERM_READ, FileTask::PERM_READ, + TaskWrapper::PERM_CREATE, TaskWrapper::PERM_READ + ), DAccessControl::MANAGE_TASK_ACCESS => array(Task::PERM_READ, Task::PERM_UPDATE, Task::PERM_DELETE, Chunk::PERM_READ, Chunk::PERM_UPDATE, Chunk::PERM_DELETE, // src/inc/defines/tasks.php TaskWrapper::PERM_READ, TaskWrapper::PERM_UPDATE, TaskWrapper::PERM_DELETE, - FileTask::PERM_READ, FileTask::PERM_UPDATE, FileTask::PERM_DELETE), - + FileTask::PERM_READ, FileTask::PERM_UPDATE, FileTask::PERM_DELETE + ), + DAccessControl::VIEW_PRETASK_ACCESS[0] => array(Pretask::PERM_READ, FilePretask::PERM_READ), DAccessControl::CREATE_PRETASK_ACCESS => array(Pretask::PERM_READ, Pretask::PERM_CREATE, FilePretask::PERM_CREATE), DAccessControl::MANAGE_PRETASK_ACCESS => array(Pretask::PERM_READ, Pretask::PERM_UPDATE, Pretask::PERM_DELETE, FilePretask::PERM_UPDATE, FilePretask::PERM_DELETE), - + DAccessControl::VIEW_SUPERTASK_ACCESS[0] => array(Supertask::PERM_READ), DAccessControl::CREATE_SUPERTASK_ACCESS => array(Supertask::PERM_CREATE, Supertask::PERM_READ), DAccessControl::MANAGE_SUPERTASK_ACCESS => array(Supertask::PERM_READ, Supertask::PERM_UPDATE, Supertask::PERM_DELETE), - + DAccessControl::VIEW_FILE_ACCESS[0] => array(File::PERM_READ), DAccessControl::MANAGE_FILE_ACCESS => array(File::PERM_READ, File::PERM_UPDATE, File::PERM_DELETE), DAccessControl::ADD_FILE_ACCESS => array(File::PERM_CREATE, File::PERM_READ), - - // src/inc/defines/cracker.php + + // src/inc/defines/cracker.php DAccessControl::CRACKER_BINARY_ACCESS => array(CrackerBinary::PERM_CREATE, CrackerBinary::PERM_READ, CrackerBinary::PERM_UPDATE, CrackerBinary::PERM_DELETE, CrackerBinaryType::PERM_CREATE, CrackerBinaryType::PERM_READ, CrackerBinaryType::PERM_UPDATE, CrackerBinaryType::PERM_DELETE, // src/inc/defines/agents.php - AgentBinary::PERM_CREATE, AgentBinary::PERM_READ, AgentBinary::PERM_UPDATE, AgentBinary::PERM_DELETE), - + AgentBinary::PERM_CREATE, AgentBinary::PERM_READ, AgentBinary::PERM_UPDATE, AgentBinary::PERM_DELETE + ), + DAccessControl::SERVER_CONFIG_ACCESS => array(Config::PERM_CREATE, Config::PERM_READ, Config::PERM_UPDATE, Config::PERM_DELETE, ConfigSection::PERM_CREATE, ConfigSection::PERM_READ, ConfigSection::PERM_UPDATE, ConfigSection::PERM_DELETE, // src/inc/defines/preprocessor.php @@ -446,38 +443,41 @@ protected static function getExpandPermissions(string $expand): array HealthCheck::PERM_CREATE, HealthCheck::PERM_READ, HealthCheck::PERM_UPDATE, HealthCheck::PERM_DELETE, HealthCheckAgent::PERM_CREATE, HealthCheckAgent::PERM_READ, HealthCheckAgent::PERM_UPDATE, HealthCheckAgent::PERM_DELETE, // src/inc/defines/hashlists.php - HashType::PERM_CREATE, HashType::PERM_READ, HashType::PERM_UPDATE, HashType::PERM_DELETE), - + HashType::PERM_CREATE, HashType::PERM_READ, HashType::PERM_UPDATE, HashType::PERM_DELETE + ), + DAccessControl::USER_CONFIG_ACCESS => array(User::PERM_CREATE, User::PERM_READ, User::PERM_UPDATE, User::PERM_DELETE, RightGroup::PERM_CREATE, RightGroup::PERM_READ, RightGroup::PERM_UPDATE, RightGroup::PERM_DELETE), - + DAccessControl::MANAGE_ACCESS_GROUP_ACCESS => array(AccessGroup::PERM_CREATE, AccessGroup::PERM_READ, AccessGroup::PERM_UPDATE, AccessGroup::PERM_DELETE), - + // src/inc/defines/accessControl.php DAccessControl::PUBLIC_ACCESS => array(LogEntry::PERM_READ), - + // src/inc/defines/notifications.php DAccessControl::LOGIN_ACCESS => array(NotificationSetting::PERM_CREATE, NotificationSetting::PERM_READ, NotificationSetting::PERM_UPDATE, NotificationSetting::PERM_DELETE, LogEntry::PERM_CREATE, LogEntry::PERM_DELETE, LogEntry::PERM_UPDATE), ); - - /** - * Convert Database value to JSON object value + + /** + * Convert Database value to JSON object value */ - protected static function db2json(array $feature, mixed $val): mixed - { + protected static function db2json(array $feature, mixed $val): mixed { if ($feature['type'] == 'bool') { - $obj = ($val == "1") ? True : False; - } elseif ($feature['type'] == 'dict') { + $obj = $val == "1"; + } + elseif ($feature['type'] == 'dict') { $obj = json_decode($val, true, 512, JSON_OBJECT_AS_ARRAY); // During encoding of the data, the data is saved as an empty array // An empty array is something different in json and in python. // The following code casts the empty array to an empty 'object' - // which will be intepreted by python and json correctly as dict or object. + // which will be interpreted by python and json correctly as dict or object. if (empty($obj)) { $obj = (object)[]; } - } elseif ($feature['type'] == 'array' && $feature['subtype'] == 'int') { + } + elseif ($feature['type'] == 'array' && $feature['subtype'] == 'int') { $obj = array_map('intval', preg_split("/,/", $val, -1, PREG_SPLIT_NO_EMPTY)); - } elseif (str_starts_with($feature['type'], 'str') && $val !== null) { + } + elseif (str_starts_with($feature['type'], 'str') && $val !== null) { $obj = html_entity_decode($val, ENT_COMPAT, "UTF-8"); } else { @@ -486,45 +486,51 @@ protected static function db2json(array $feature, mixed $val): mixed } return $obj; } - - /** + + /** * Convert JSON object value to DB insert value, supported by DBA */ - protected static function json2db(array $feature, mixed $obj): mixed - { - if(($feature['null'] == true) && is_null($obj)) { + protected static function json2db(array $feature, mixed $obj): ?string { + if ($feature['null'] && is_null($obj)) { return null; - } elseif ($feature['type'] == 'bool') { + } + elseif ($feature['type'] == 'bool') { $val = ($obj) ? "1" : "0"; - } elseif ($feature['type'] == 'int' && is_null($obj)){ + } + elseif ($feature['type'] == 'int' && is_null($obj)) { $val = $obj; - } elseif (str_starts_with($feature['type'], 'str')) { + } + elseif (str_starts_with($feature['type'], 'str')) { $val = htmlentities($obj, ENT_QUOTES, "UTF-8"); - } elseif ($feature['type'] == 'array' && $feature['subtype'] == 'int') { + } + elseif ($feature['type'] == 'array' && $feature['subtype'] == 'int') { $val = implode(",", $obj); - } elseif ($feature['type'] == 'dict' && $feature['subtype'] == 'bool') { + } + elseif ($feature['type'] == 'dict' && $feature['subtype'] == 'bool') { $val = serialize($obj); - } else { + } + else { $val = strval($obj); } return $val; } - - /** + + /** * Convert JSON object value to DB insert value, supported by DBA + * @throws NotFoundExceptionInterface + * @throws ContainerExceptionInterface, */ - protected function obj2Array(object $obj) - { + protected function obj2Array(object $obj): array { // Convert values to JSON supported types $features = $obj->getFeatures(); $kv = $obj->getKeyValueDict(); - + $item = []; - + $apiClass = $this->container->get('classMapper')->get(get_class($obj)); $item['_id'] = $obj->getId(); $item['_self'] = $this->routeParser->urlFor($apiClass . ':getOne', ['id' => $item['_id']]); - + foreach ($features as $name => $feature) { // If a attribute is set to private, it should be hidden and not returned. // Example of this is the password hash. @@ -535,21 +541,23 @@ protected function obj2Array(object $obj) } return $item; } - - /** + + /** * Convert DB object JSON:API Resource Object + * @throws NotFoundExceptionInterface + * @throws ContainerExceptionInterface */ protected function obj2Resource(object $obj, array $expandResult = []): array { // Convert values to JSON supported types $features = $obj->getFeatures(); $kv = $obj->getKeyValueDict(); - + $apiClass = $this->container->get('classMapper')->get(get_class($obj)); $linkSelf = $this->routeParser->urlFor($apiClass . ':getOne', ['id' => $obj->getId()]); - + $attributes = []; $relationships = []; - + /* Collect attributes */ foreach ($features as $name => $feature) { // If a attribute is set to private, it should be hidden and not returned. @@ -562,54 +570,54 @@ protected function obj2Resource(object $obj, array $expandResult = []): array { continue; } - if (is_array($this->publicAttributeFilterClasses) && in_array($obj::class, $this->publicAttributeFilterClasses) && $feature['public'] !== true){ + if (is_array($this->publicAttributeFilterClasses) && in_array($obj::class, $this->publicAttributeFilterClasses) && $feature['public'] !== true) { continue; } $attributes[$feature['alias']] = $apiClass::db2json($feature, $kv[$name]); } - + //TODO: only aggregate data when it has been included $aggregatedData = $apiClass::aggregateData($obj); $attributes = array_merge($attributes, $aggregatedData); - + /* Build JSON::API relationship resource */ $toManyRelationships = $apiClass::getToManyRelationships(); $toOneRelationships = $apiClass::getToOneRelationships(); - + $relationshipsNames = array_merge(array_keys($toOneRelationships), array_keys($toManyRelationships)); sort($relationshipsNames); foreach ($relationshipsNames as $relationshipName) { - $relationships[$relationshipName] = [ - "links" => [ + $relationships[$relationshipName] = [ + "links" => [ "self" => $linkSelf . "/relationships/" . $relationshipName, "related" => $linkSelf . "/" . $relationshipName, ] ]; } - + /* Generate to-many relationships entries */ foreach ($toManyRelationships as $relationshipName => $toManyRelationship) { // Build (optional) compound document resource linkage if (array_key_exists($relationshipName, $expandResult)) { $relationships[$relationshipName]["data"] = []; - + // Empty to-many relationship if (array_key_exists($obj->getId(), $expandResult[$relationshipName]) === false) { continue; } - + // Fetch to-many-objects $expandObjects = $expandResult[$relationshipName][$obj->getId()]; - foreach($expandObjects as $relationObject) { + foreach ($expandObjects as $relationObject) { $relationships[$relationshipName]["data"][] = [ - "type" => $this->getObjectTypeName($relationObject), - "id" => $relationObject->getId() + "type" => $this->getObjectTypeName($relationObject), + "id" => $relationObject->getId() ]; } } } - + /* Generate to-one relationships entries */ foreach ($toOneRelationships as $relationshipName => $toOneRelationship) { // Build (optional) compound document resource linkage @@ -619,18 +627,18 @@ protected function obj2Resource(object $obj, array $expandResult = []): array { $relationships[$relationshipName]["data"] = null; continue; } - + // Fetch to-one-objects $expandObject = $expandResult[$relationshipName][$obj->getId()]; - + $relationships[$relationshipName]["data"] = [ - "type" => $this->getObjectTypeName($expandObject), - "id" => $expandObject->getId() + "type" => $this->getObjectTypeName($expandObject), + "id" => $expandObject->getId() ]; } } - - + + $newObject = [ "type" => $this->getObjectTypeName($obj), "id" => $obj->getId(), @@ -639,102 +647,114 @@ protected function obj2Resource(object $obj, array $expandResult = []): array { "self" => $linkSelf, ], ]; - + if (sizeof($relationships) > 0) { $newObject['relationships'] = $relationships; } - + return $newObject; } - + /** - * Quirck to resolve objects via ManyToMany relation table + * Quick to resolve objects via ManyToMany relation table + * @throws NotFoundExceptionInterface + * @throws ContainerExceptionInterface */ - protected function joinQuery(mixed $objFactory, DBA\QueryFilter $qF, DBA\JoinFilter $jF): array - { + protected function joinQuery(mixed $objFactory, DBA\QueryFilter $qF, DBA\JoinFilter $jF): array { $joined = $objFactory->filter([Factory::FILTER => $qF, Factory::JOIN => $jF]); $objects = $joined[$objFactory->getModelName()]; - + $ret = []; foreach ($objects as $object) { - array_push($ret, $this->obj2Array($object)); + $ret[] = $this->obj2Array($object); } - return $ret; } - + /** - * Quirck to resolve objects via ForeignKey relation table + * Quick to resolve objects via ForeignKey relation table + * @throws NotFoundExceptionInterface + * @throws ContainerExceptionInterface */ - protected function filterQuery(mixed $objFactory, DBA\QueryFilter $qF): array - { + protected function filterQuery(mixed $objFactory, DBA\QueryFilter $qF): array { $objects = $objFactory->filter([Factory::FILTER => $qF]); - + $ret = []; foreach ($objects as $object) { - array_push($ret, $this->obj2Array($object)); + $ret[] = $this->obj2Array($object); } - return $ret; } - - + + /** + * @param object $object + * @param array $expands + * @param array $expandResult + * @return array + * @throws ContainerExceptionInterface + * @throws NotFoundExceptionInterface + */ protected function applyExpansions(object $object, array $expands, array $expandResult): array { $newObject = $this->obj2Array($object); foreach ($expands as $expand) { - if (array_key_exists($object->getId(), $expandResult[$expand]) == false) { + if (!array_key_exists($object->getId(), $expandResult[$expand])) { $newObject[$expand] = []; continue; } - - $expandObject = $expandResult[$expand][$object->getId()]; + + $expandObject = $expandResult[$expand][$object->getId()]; if (is_array($expandObject)) { - $newObject[$expand] = array_map(function($object) { return $this->obj2Array($object); }, $expandObject); - } else { + $newObject[$expand] = array_map(function ($object) { + return $this->obj2Array($object); + }, $expandObject); + } + else { $newObject[$expand] = $this->obj2Array($expandObject); } } - + /* Ensure sorted, for easy debugging of fields */ ksort($newObject); - + return $newObject; } - - - /** + /** * Expands object items + * @throws NotFoundExceptionInterface + * @throws ContainerExceptionInterface */ - protected function object2Array(object $object, array $expands = []): array - { + protected function object2Array(object $object, array $expands = []): array { $expandResult = []; foreach ($expands as $expand) { $apiClass = $this->container->get('classMapper')->get(get_class($object)); $expandResult[$expand] = $apiClass::fetchExpandObjects([$object], $expand); - } - + } + return $this->applyExpansions($object, $expands, $expandResult); } - - + /** - * Uniform conversion of php array to JSON output + * Uniform conversion of php array to JSON output + * @throws JsonException */ - protected static function ret2json(array $result): string - { + protected static function ret2json(array $result): string { return json_encode($result, JSON_UNESCAPED_SLASHES | JSON_PRETTY_PRINT | JSON_THROW_ON_ERROR) . PHP_EOL; } - + /** * Helper conversion of single object to JSON string + * @param object $object + * @return string + * @throws ContainerExceptionInterface + * @throws JsonException + * @throws NotFoundExceptionInterface */ - protected function object2JSON(object $object): string - { + protected function object2JSON(object $object): string { $item = $this->object2Array($object, []); return $this->ret2json($item); } - + /** * Convert incoming (JSON) data to DB values */ @@ -745,63 +765,61 @@ protected function unaliasData(array $data, array $features): array { } return $mappedData; } - + /** * Validate the Permission of a DBA column and check if it key may be altered - * + * * @param string $key Field to use as base for $objects * @param array $features The features of the DBA object of the child - * + * @return void + * @throws HttpError * @throws HttpForbidden when it is not allowed to alter the key - * - * @return void */ - protected function isAllowedToMutate(array $features, string $key) { - if (is_string($key) == False) { - throw new HttpError("Key '$key' invalid"); - } + protected function isAllowedToMutate(array $features, string $key): void { // Ensure key exists in target array - if (array_key_exists($key, $features) == False) { + if (!array_key_exists($key, $features)) { throw new HttpError("Key '$key' does not exists!"); } - - if ($features[$key]['read_only'] == True) { + + if ($features[$key]['read_only']) { throw new HttpForbidden("Key '$key' is immutable"); } - if ($features[$key]['protected'] == True) { + if ($features[$key]['protected']) { throw new HttpForbidden("Key '$key' is protected"); } - if ($features[$key]['private'] == True) { + if ($features[$key]['private']) { throw new HttpForbidden("Key '$key' is private"); } } - + /** * Validate incoming data + * @throws HttpError */ - protected function validateData(array $data, array $features) - { + protected function validateData(array $data, array $features): void { foreach ($data as $key => $value) { // Validate if field can be left empty or not - if (($features[$key]['null'] ?? True) == False) { - if (is_null($value) == True) { + if (!($features[$key]['null'] ?? True)) { + if (is_null($value)) { throw new HttpError("Key '$key' cannot be null."); } - } else { - if (is_null($value) == True) { + } + else { + if (is_null($value)) { // Key can be null and is null, so skip type checking. continue; } } - + // Perform type mapping if ($features[$key]['type'] == 'bool') { - if (is_bool($value) == False) { + if (!is_bool($value)) { throw new HttpError("Key '$key' is not of type boolean"); } // Int - } elseif (str_starts_with($features[$key]['type'], 'int')) { - if (is_integer($value) == False) { + } + elseif (str_starts_with($features[$key]['type'], 'int')) { + if (!is_integer($value)) { throw new HttpError("Key '$key' is not of type integer"); } $maxValue = ($features[$key]['type'] === 'int64') ? 9223372036854775807 : 2147483647; @@ -809,82 +827,85 @@ protected function validateData(array $data, array $features) throw new HttpError("The value exceeds the limit for a {$features[$key]['type']} integer."); } // Str - } elseif (str_starts_with($features[$key]['type'], 'str')) { - if (is_string($value) == False) { + } + elseif (str_starts_with($features[$key]['type'], 'str')) { + if (!is_string($value)) { throw new HttpError("Key '$key' is not of type string"); } if (preg_match('/str\((\d+)\)/', $features[$key]['type'], $matches)) { - $max_string_len = (int) $matches[1]; + $max_string_len = (int)$matches[1]; if (strlen($value) > $max_string_len) { throw new HttpError("The string value: '$value' is too long. The max size is '$max_string_len'"); } } // TODO: Length validation // Array - } elseif (str_starts_with($features[$key]['type'], 'array')) { - if (is_array($value) == False) { + } + elseif (str_starts_with($features[$key]['type'], 'array')) { + if (!is_array($value)) { throw new HttpError("Key '$key' is not of type array"); } // Array[Int] if ($features[$key]['subtype'] == 'int') { - if (in_array(false, array_map('is_integer', $value)) == true) { + if (in_array(false, array_map('is_integer', $value))) { throw new HttpError("Key '$key' array contains non-integer values"); } } // Dict - } elseif (str_starts_with($features[$key]['type'], 'dict')) { - if (is_array($value) == False) { + } + elseif (str_starts_with($features[$key]['type'], 'dict')) { + if (!is_array($value)) { throw new HttpError("Key '$key' is not of type dict"); } // Dict[Bool] if ($features[$key]['subtype'] == 'bool') { - if (in_array(false, array_map('is_bool', $value)) == true) { + if (in_array(false, array_map('is_bool', $value))) { throw new HttpError("Key '$key' dict contains non-boolean values"); } } - } else { + } + else { throw new HttpError("Typemapping error for key '$key' "); } - + // Validate values limited by choices if (is_array($features[$key]['choices'])) { - if (array_key_exists($value, $features[$key]['choices']) == false) { - throw new HttpError("Key '$key' value is not valid, choices=[" . - join(",", array_keys($features[$key]['choices'])) . - "], choices_details=['" . - join("', '", array_values($features[$key]['choices'])) . "']"); + if (!array_key_exists($value, $features[$key]['choices'])) { + throw new HttpError("Key '$key' value is not valid, choices=[" . + join(",", array_keys($features[$key]['choices'])) . + "], choices_details=['" . + join("', '", array_values($features[$key]['choices'])) . "']" + ); } } } } - + //function for automatic swagger doc generation function getAllPostParameters(array $features): array { - $postFeatures = []; - foreach($features as $key => $value) { - if ($value['protected'] == False) { - $postFeatures[$key] = $value; - } - } - return $postFeatures; + return array_filter($features, function ($value) { + return $value['protected'] == False; + }); } + /** * Validate incoming parameter keys + * @throws HttpError */ protected function validateParameters(array $data, array $allFeatures): void { // Features which MAY be present $validFeatures = []; // Features which MUST be present $requiredFeatures = []; - foreach($allFeatures as $key => $value) { - if (($value['protected'] == False) and ($value['private'] == False)) { - array_push($validFeatures, $key); + foreach ($allFeatures as $key => $value) { + if (!$value['protected'] and !$value['private']) { + $validFeatures[] = $key; } - if (($value['protected'] == False) and ($value['null'] == False)) { - array_push($requiredFeatures, $key); + if (!$value['protected'] and !$value['null']) { + $requiredFeatures[] = $key; } } - + // Find keys which are invalid $invalidKeys = array_diff(array_keys($data), $validFeatures); if (sizeof($invalidKeys) > 0) { @@ -892,48 +913,50 @@ protected function validateParameters(array $data, array $allFeatures): void { ksort($invalidKeys); ksort($validFeatures); throw new HttpError("Parameter(s) '" . join(", ", $invalidKeys) . "' not valid input " . - "(valid key(s) : '" . join(", ", $validFeatures) . ")'", 403); + "(valid key(s) : '" . join(", ", $validFeatures) . ")'", 403 + ); } - + // Find out about mandatory parameters which are not provided $missingKeys = array_diff($requiredFeatures, array_keys($data)); if (count($missingKeys) > 0) { // Ensure debugging response lists are in sorted order ksort($missingKeys); - throw new HttpError("Required parameter(s) '" . join(", ", $missingKeys) . "' not specified"); + throw new HttpError("Required parameter(s) '" . join(", ", $missingKeys) . "' not specified"); } } - + /** * Check for valid expand parameters. + * @throws HttpError + * @throws InternalError */ //TODO: nice to have would be to be able to include objects that are further away in the relationship //ex. from Hash include=hashlist.task to include all tasks from a hash (section 8.3 JSON API) - protected function makeExpandables(Request $request, array $validExpandables): array - { + protected function makeExpandables(Request $request, array $validExpandables): array { $data = $request->getParsedBody(); $queryExpands = (array_key_exists('include', $request->getQueryParams())) ? preg_split("/[,\ ]+/", $request->getQueryParams()['include']) : []; - + foreach ($queryExpands as $expand) { - if (in_array($expand, $validExpandables) == false) { + if (!in_array($expand, $validExpandables)) { throw new HttpError("Parameter '" . $expand . "' is not valid expand key (valid keys are: " . join(", ", array_values($validExpandables)) . ")"); } } - + /* Validate expand parameters for required permissions */ $required_perms = []; $permsExpandMatching = []; foreach ($queryExpands as $expand) { - $expandedPerms = self::getExpandPermissions($expand); - foreach($expandedPerms as $expandedPerm) { - if (!isset($permsExpandMatching[$expandedPerm])){ - $permsExpandMatching[$expandedPerm] = [$expand]; - } - else{ - $permsExpandMatching[$expandedPerm][] = $expand; - } + $expandedPerms = self::getExpandPermissions($expand); + foreach ($expandedPerms as $expandedPerm) { + if (!isset($permsExpandMatching[$expandedPerm])) { + $permsExpandMatching[$expandedPerm] = [$expand]; } - array_push($required_perms, ...$expandedPerms); + else { + $permsExpandMatching[$expandedPerm][] = $expand; + } + } + array_push($required_perms, ...$expandedPerms); } $permissionResponse = $this->validatePermissions($required_perms, $permsExpandMatching); if ($permissionResponse === FALSE) { @@ -941,52 +964,53 @@ protected function makeExpandables(Request $request, array $validExpandables): a } return $queryExpands; } - + /** * Find primary key for DBA object + * @throws InternalError */ - protected function getPrimaryKey(): string - { + protected function getPrimaryKey(): string { $features = $this->getFeatures(); # Work-around required since getPrimaryKey is not static in dba/models/*.php - foreach($features as $key => $value) { - if ($value['pk'] == True) { + foreach ($features as $key => $value) { + if ($value['pk']) { return $key; } } throw new InternalError("Internal error: no primary key found"); } - - function getFilters(Request $request) { - return $this->getQueryParameterFamily($request, 'filter'); + + function getFilters(Request $request): array { + return $this->getQueryParameterFamily($request, 'filter'); } - + /** * Check for valid filter parameters and build QueryFilter + * @throws HttpForbidden + * @throws InternalError */ - protected function makeFilter(array $filters, object $apiClass): array - { - $qFs = []; + protected function makeFilter(array $filters, object $apiClass): array { + $qFs = []; $features = $apiClass->getAliasedFeatures(); $factory = $apiClass->getFactory(); foreach ($filters as $filter => $value) { - + if (preg_match('/^(?P[_a-zA-Z0-9]+?)(?|__eq|__ne|__lt|__lte|__gt|__gte|__contains|__startswith|__endswith|__icontains|__istartswith|__iendswith|__in|__nin)$/', $filter, $matches) == 0) { throw new HttpForbidden("Filter parameter '" . $filter . "' is not valid"); } - + // Special filtering of _id to use for uniform access to model primary key $cast_key = $matches['key'] == '_id' ? array_column($features, 'alias', 'dbname')[$this->getPrimaryKey()] : $matches['key']; - if (array_key_exists($cast_key, $features) == false) { + if (!array_key_exists($cast_key, $features)) { throw new HttpForbidden("Filter parameter '" . $filter . "' is not valid (key not valid field)"); }; - + $valueList = explode(",", $value); - + // TODO Merge/Combine with validate parameters - foreach($valueList as &$value) { - switch($features[$cast_key]['type']) { + foreach ($valueList as &$value) { + switch ($features[$cast_key]['type']) { case 'bool': $value = filter_var($value, FILTER_VALIDATE_BOOLEAN, FILTER_NULL_ON_FAILURE); if (is_null($value)) { @@ -998,18 +1022,18 @@ protected function makeFilter(array $filters, object $apiClass): array if (is_null($value)) { throw new HttpForbidden("Filter parameter '" . $filter . "' is not valid integer value"); } - } + } } unset($value); - + // We need to remap any aliased key to the key as it appears in the database. $remappedKey = $features[$cast_key]['dbname']; - + $amount_values = count($valueList); $single_val = $valueList[0]; $operator = $matches['operator']; $query_operator = ""; - switch(true) { + switch (true) { case (($operator == '__eq' | $operator == '') && $amount_values == 1): $query_operator = '='; break; @@ -1029,53 +1053,55 @@ protected function makeFilter(array $filters, object $apiClass): array $query_operator = '>='; break; case ($operator == '__contains' && $amount_values == 1): - array_push($qFs, new LikeFilter($remappedKey, "%" . $single_val . "%", $factory)); + $qFs[] = new LikeFilter($remappedKey, "%" . $single_val . "%", $factory); break; case ($operator == '__startswith' && $amount_values == 1): - array_push($qFs, new LikeFilter($remappedKey, $single_val . "%", $factory)); + $qFs[] = new LikeFilter($remappedKey, $single_val . "%", $factory); break; case ($operator == '__endswith' && $amount_values == 1): - array_push($qFs, new LikeFilter($remappedKey, "%" . $single_val, $factory)); + $qFs[] = new LikeFilter($remappedKey, "%" . $single_val, $factory); break; case ($operator == '__icontains' && $amount_values == 1): - array_push($qFs, new LikeFilterInsensitive($remappedKey, "%" . $single_val . "%", $factory)); + $qFs[] = new LikeFilterInsensitive($remappedKey, "%" . $single_val . "%", $factory); break; case ($operator == '__istartswith' && $amount_values == 1): - array_push($qFs, new LikeFilterInsensitive($remappedKey, $single_val . "%", $factory)); + $qFs[] = new LikeFilterInsensitive($remappedKey, $single_val . "%", $factory); break; case ($operator == '__iendswith' && $amount_values == 1): - array_push($qFs, new LikeFilterInsensitive($remappedKey, "%" . $single_val, $factory)); + $qFs[] = new LikeFilterInsensitive($remappedKey, "%" . $single_val, $factory); break; //Filters bellow operate on lists case ($operator == '__in'): - array_push($qFs, new ContainFilter($remappedKey, $valueList, $factory)); + $qFs[] = new ContainFilter($remappedKey, $valueList, $factory); break; case ($operator == '__nin'): - array_push($qFs, new ContainFilter($remappedKey, $valueList, $factory, true)); + $qFs[] = new ContainFilter($remappedKey, $valueList, $factory, true); break; default: assert(False, "Operator '" . $operator . "' not implemented"); } - + if ($query_operator) { if (array_key_exists($single_val, $features)) { - array_push($qFs, new ComparisonFilter($remappedKey, $single_val, $query_operator, $factory)); - } else { - array_push($qFs, new QueryFilter($remappedKey, $single_val, $query_operator, $factory)); + $qFs[] = new ComparisonFilter($remappedKey, $single_val, $query_operator, $factory); + } + else { + $qFs[] = new QueryFilter($remappedKey, $single_val, $query_operator, $factory); } } } return $qFs; } - - + + /** * Check for valid ordering parameters and build QueryFilter + * @throws InternalError + * @throws HttpForbidden */ - protected function makeOrderFilterTemplates(Request $request, array $features, $defaultSort = 'ASC'): array - { + protected function makeOrderFilterTemplates(Request $request, array $features, $defaultSort = 'ASC'): array { $orderTemplates = []; - + $orderings = $this->getQueryParameterAsList($request, 'sort'); $contains_primary_key = false; foreach ($orderings as $order) { @@ -1083,51 +1109,55 @@ protected function makeOrderFilterTemplates(Request $request, array $features, $ // Special filtering of _id to use for uniform access to model primary key $cast_key = $matches['key'] == '_id' ? $this->getPrimaryKey() : $matches['key']; if ($cast_key == $this->getPrimaryKey()) { - $contains_primary_key = true; + $contains_primary_key = true; } if (array_key_exists($cast_key, $features)) { $remappedKey = $features[$cast_key]['dbname']; - array_push($orderTemplates, ['by' => $remappedKey, 'type' => ($matches['operator'] == '-') ? "DESC" : "ASC" ]); - } else { + $orderTemplates[] = ['by' => $remappedKey, 'type' => ($matches['operator'] == '-') ? "DESC" : "ASC"]; + } + else { throw new HttpForbidden("Ordering parameter '" . $order . "' is not valid"); } - } else { + } + else { throw new HttpForbidden("Ordering parameter '" . $order . "' is not valid"); } } - + //when no primary key has been added in the sort parameter, add the default case of sorting on primary key as last sort - if ($contains_primary_key == false) { - array_push($orderTemplates, ['by' =>$this->getPrimaryKey(), 'type' => $defaultSort]); + if (!$contains_primary_key) { + $orderTemplates[] = ['by' => $this->getPrimaryKey(), 'type' => $defaultSort]; } - + return $orderTemplates; } - + /** * Validate if user is allowed to access hashlist + * @throws HttpForbidden + * @throws ResourceNotFoundError */ - protected function validateHashlistAccess(Request $request, User $user, String $hashlistId): Hashlist - { + protected function validateHashlistAccess(Request $request, User $user, string $hashlistId): Hashlist { // TODO: Fix permissions if (!AccessControl::getInstance($user)->hasPermission(DAccessControl::MANAGE_HASHLIST_ACCESS)) { throw new HttpForbidden("No '" . DAccessControl::getDescription(DAccessControl::MANAGE_HASHLIST_ACCESS) . "' permission"); } - + try { $hashlist = HashlistUtils::getHashlist($hashlistId); - } catch (HTException $ex) { + } + catch (HTException $ex) { throw new ResourceNotFoundError($ex->getMessage()); } if (!AccessUtils::userCanAccessHashlists($hashlist, $user)) { throw new HttpForbidden("No access to hashlist!"); } - + return $hashlist; } - - /** + + /** * Validate permissions */ protected function validatePermissions(array $required_perms, array $permsExpandMatching = []): bool|array { @@ -1135,32 +1165,33 @@ protected function validatePermissions(array $required_perms, array $permsExpand $group = Factory::getRightGroupFactory()->get($this->user->getRightGroupId()); if ($group->getPermissions() == 'ALL') { - // Special (legacy) case for administative access, enable all available permissions + // Special (legacy) case for administrative access, enable all available permissions $all_perms = array_keys(self::$acl_mapping); - $rightgroup_perms = array_combine($all_perms, array_fill(0,count($all_perms), true)); - } else { + $rightgroup_perms = array_combine($all_perms, array_fill(0, count($all_perms), true)); + } + else { $rightgroup_perms = json_decode($group->getPermissions(), true); } - + // Validate if no undefined permissions are set in $acl_mapping assert(count(array_diff(array_keys($rightgroup_perms), array_keys(self::$acl_mapping))) == 0); - + // Create listing of available permissions for user $user_available_perms = array(); - foreach($rightgroup_perms as $rightgroup_perm => $permission_set) { + foreach ($rightgroup_perms as $rightgroup_perm => $permission_set) { if ($permission_set) { $user_available_perms = array_unique(array_merge($user_available_perms, self::$acl_mapping[$rightgroup_perm])); } }; - + // Sort to display values in a unified format for user and debugging sort($required_perms); sort($user_available_perms); - + // Find if all permissions are matched $missing_permissions = array_diff($required_perms, $user_available_perms); if (count($missing_permissions) > 0) { - if($this instanceof AbstractModelAPI) { + if ($this instanceof AbstractModelAPI) { $features = $this->getFeatures(); foreach ($features as $key => $arr) { if ($arr['public']) { @@ -1201,183 +1232,184 @@ protected function validatePermissions(array $required_perms, array $permsExpand return TRUE; } } - $this->permissionErrors = array("No '" . join(",", $missing_permissions) . "' permission(s). [required_permissions='" .join(", ", $required_perms). "', user_permissions='" . join(", ", $user_available_perms) . "']"); + $this->permissionErrors = array("No '" . join(",", $missing_permissions) . "' permission(s). [required_permissions='" . join(", ", $required_perms) . "', user_permissions='" . join(", ", $user_available_perms) . "']"); return FALSE; - } else { + } + else { $this->permissionErrors = array(); return TRUE; } } protected function addPublicAttributeClass($class): void { - if(!is_array($this->publicAttributeFilterClasses)){ + if (!is_array($this->publicAttributeFilterClasses)) { $this->publicAttributeFilterClasses = []; } - if(!in_array($class, $this->publicAttributeFilterClasses)){ + if (!in_array($class, $this->publicAttributeFilterClasses)) { $this->publicAttributeFilterClasses[] = $class; } } - + /** - * Common features for all requests, like setting user and checking basic permissions + * Common features for all requests, like setting user and checking basic permissions + * @throws HTException + * @throws HttpForbidden */ - protected function preCommon(Request $request): void - { + protected function preCommon(Request $request): void { $userId = $request->getAttribute(('userId')); $this->user = UserUtils::getUser($userId); - - # 'Innitiate' AccessControl class, by requesting instance with parameter of logged-in user. - # This will cause the AccessControle class to initiate it's static 'instance' parameter, + + # 'Initiate' AccessControl class, by requesting instance with parameter of logged-in user. + # This will cause the AccessControl class to initiate it's static 'instance' parameter, # which is in turn used at later stages (e.g. src/inc/utils/NotificationUtils.class.php) to # request an object on which authentication takes place. # # At some point we might want to remove this strange behaviour always pass the $user object # to the AccessControl class when requested. AccessControl::getInstance($this->user); - + $routeContext = RouteContext::fromRequest($request); $this->routeParser = $routeContext->getRouteParser(); try { - $required_perms = $this->getRequiredPermissions($request->getMethod()); - } catch (HTException $e) { + $required_perms = $this->getRequiredPermissions($request->getMethod()); + } + catch (HTException $e) { # Annotate error message, with suitable candidates - throw new HttpForbidden($e->getMessage() . - "(valid methods are for model are: " . join(",", $this->getAvailableMethods()) . ")"); + throw new HttpForbidden($e->getMessage() . + "(valid methods are for model are: " . join(",", $this->getAvailableMethods()) . ")" + ); } if ($this->validatePermissions($required_perms) === FALSE) { throw new HttpForbidden(join('||', $this->permissionErrors)); } } - + /* * Return requested parameter, prioritize query parameter over inline payload parameter */ - protected function getParam(Request $request, string $param, int $default): int - { + protected function getParam(Request $request, string $param, int $default): int { $queryParams = $request->getQueryParams(); $bodyParams = $request->getParsedBody(); - + // Check query parameters and make sure it is an array - if (is_array($queryParams) && array_key_exists($param, $queryParams)) { + if (array_key_exists($param, $queryParams)) { return intval($queryParams[$param]); } // Check body parameters and make sure it is an array elseif (is_array($bodyParams) && array_key_exists($param, $bodyParams)) { return intval($bodyParams[$param]); - // Return default value if parameter not found - } else { + // Return default value if parameter not found + } + else { return $default; } } - - - protected function getQueryParameterAsList(Request $request, string $name): array - { + + protected function getQueryParameterAsList(Request $request, string $name): array { $queryParams = $request->getQueryParams(); - if (is_array($queryParams) && array_key_exists($name, $queryParams)) { + if (array_key_exists($name, $queryParams)) { return preg_split("/[,\ ]+/", $queryParams[$name]); - } else { + } + else { return []; } } - - + + /* * Return requested parameter, prioritize query parameter over inline payload parameter */ - protected function getQueryParameterFamilyMember(Request $request, string $family, string $member): string|null - { + protected function getQueryParameterFamilyMember(Request $request, string $family, string $member): string|null { $queryParams = $request->getQueryParams(); // Check query parameters and make sure it is an array - if (is_array($queryParams) && array_key_exists($family, $queryParams) && array_key_exists($member, $queryParams[$family])) { + if (array_key_exists($family, $queryParams) && array_key_exists($member, $queryParams[$family])) { return $queryParams[$family][$member]; } - + return null; } - - + + /* * Return requested parameter, prioritize query parameter over inline payload parameter */ - protected function getQueryParameterFamily(Request $request, string $family): array - { + protected function getQueryParameterFamily(Request $request, string $family): array { $retval = []; $queryParams = $request->getQueryParams(); if (array_key_exists($family, $queryParams) and is_array($queryParams[$family])) { // TODO: Enhance validation return $queryParams[$family]; } - + return $retval; } - - static function createJsonResponse(array $data = [], array $links = [], array $included = [], array $meta = []) { + + static function createJsonResponse(array $data = [], array $links = [], array $included = [], array $meta = []): array { $response = [ - "jsonapi" => [ - "version" => "1.1", - "ext" => [ - "https://jsonapi.org/profiles/ethanresnick/cursor-pagination" - ], + "jsonapi" => [ + "version" => "1.1", + "ext" => [ + "https://jsonapi.org/profiles/ethanresnick/cursor-pagination" ], + ], ]; if (!empty($links)) { $response["links"] = $links; } - - if(!empty($meta)) { + + if (!empty($meta)) { $response["meta"] = $meta; } - + $response["data"] = $data; - + if (!empty($included)) { $response["included"] = $included; } - + return $response; -} - - /** + } + + /** * Get single Resource */ - protected static function getOneResource(object $apiClass, object $object, Request $request, Response $response, int $statusCode=200): Response - { + protected static function getOneResource(object $apiClass, object $object, Request $request, Response $response, int $statusCode = 200): Response { $apiClass->preCommon($request); - + $validExpandables = $apiClass->getExpandables(); $expands = $apiClass->makeExpandables($request, $validExpandables); - + $objects = [$object]; - + /* Resolve all expandables */ $expandResult = []; foreach ($expands as $expand) { // mapping from $objectId -> result objects in $expandResult[$expand] = $apiClass->fetchExpandObjects($objects, $expand); } - + /* Convert objects to JSON:API */ $dataResources = []; $includedResources = []; - + // Convert objects to data resources foreach ($objects as $object) { // Create object $newObject = $apiClass->obj2Resource($object, $expandResult); - + // For compound document, included resources foreach ($expands as $expand) { if (array_key_exists($object->getId(), $expandResult[$expand])) { $expandResultObject = $expandResult[$expand][$object->getId()]; if (is_array($expandResultObject)) { - foreach($expandResultObject as $expandObject) { + foreach ($expandResultObject as $expandObject) { $includedResources[] = $apiClass->obj2Resource($expandObject); } - } else { + } + else { if ($expandResultObject === null) { // to-only relation which is nullable continue; @@ -1386,7 +1418,7 @@ protected static function getOneResource(object $apiClass, object $object, Reque } } } - + // Add to result output $dataResources[] = $newObject; } @@ -1394,36 +1426,39 @@ protected static function getOneResource(object $apiClass, object $object, Reque $selfParams = $request->getQueryParams(); $linksQuery = urldecode(http_build_query($selfParams)); - $linksSelf = $request->getUri()->getPath() . ((!empty($linksQuery)) ? '?' . $linksQuery : ''); + $linksSelf = $request->getUri()->getPath() . ((!empty($linksQuery)) ? '?' . $linksQuery : ''); $links = ["self" => $linksSelf]; - + // Generate JSON:API GET output $ret = self::createJsonResponse($dataResources[0], $links, $includedResources); - + $body = $response->getBody(); $body->write($apiClass->ret2json($ret)); - + return $response->withStatus($statusCode) ->withHeader("Content-Type", "application/vnd.api+json") ->withHeader("Location", $dataResources[0]["links"]["self"]); - //for location we use links value from $dataresources because if we use $linksSelf, the wrong location gets returned in - //case of a POST request + //for location we use links value from $dataresources because if we use $linksSelf, the wrong location gets returned in + //case of a POST request } - + //Meta response for helper functions that do not respond with resource records - protected static function getMetaResponse(array $meta, Request $request, Response $response, int $statusCode=200) { + + /** + * @throws JsonException + */ + protected static function getMetaResponse(array $meta, Request $request, Response $response, int $statusCode = 200): MessageInterface|Response { $ret = self::createJsonResponse(meta: $meta); $body = $response->getBody(); $body->write(self::ret2json($ret)); - + return $response->withStatus($statusCode)->withHeader("Content-Type", "application/vnd.api+json"); } - + /** - * Override-able activated methods + * Override-able activated methods */ - static public function getAvailableMethods(): array - { + static public function getAvailableMethods(): array { return ["GET", "POST", "PATCH", "DELETE"]; } } \ No newline at end of file diff --git a/src/inc/apiv2/common/AbstractHelperAPI.class.php b/src/inc/apiv2/common/AbstractHelperAPI.class.php index 0fedf8685..c8a77c347 100644 --- a/src/inc/apiv2/common/AbstractHelperAPI.class.php +++ b/src/inc/apiv2/common/AbstractHelperAPI.class.php @@ -1,6 +1,8 @@ preCommon($request); - + $data = $request->getParsedBody(); $allFeatures = $this->getAliasedFeatures(); - + // Validate if correct parameters are sent $this->validateParameters($data, $allFeatures); - + /* Validate type of parameters */ $this->validateData($data, $allFeatures); - + /* All creation of object */ $newObject = $this->actionPost($data); - + /* Successfully executed action of type update/delete */ if ($newObject == null) { return $response->withStatus(204); } - - - /* Succesful executed action of create */ + + + /* Successful executed action of create */ if (is_object($newObject)) { $apiClass = new ($this->container->get('classMapper')->get($newObject::class))($this->container); return self::getOneResource($apiClass, $newObject, $request, $response); - /* A meta response of a helper function */ - } elseif (is_array($newObject)) { + /* A meta response of a helper function */ + } + elseif (is_array($newObject)) { return self::getMetaResponse($newObject, $request, $response); } - } - + throw new HttpError("Unable to process request!"); + } + /** * Override-able registering of options */ - static public function register($app): void - { + static public function register($app): void { $me = get_called_class(); $baseUri = $me::getBaseUri(); - + /* Allow CORS preflight requests */ $app->options($baseUri, function (Request $request, Response $response): Response { return $response; }); - + $available_methods = $me::getAvailableMethods(); - + if (in_array("GET", $available_methods)) { $app->get($baseUri, $me . ':actionGet')->setname($me . ':actionGet'); } - + if (in_array("POST", $available_methods)) { $app->post($baseUri, $me . ':processPost')->setname($me . ':processPost'); } - + if (in_array("PATCH", $available_methods)) { $app->patch($baseUri, $me . ':actionPatch')->setName($me . ':actionPatch'); } - + if (in_array("DELETE", $available_methods)) { $app->delete($baseUri, $me . ':actionDelete')->setName($me . ':actionDelete'); } diff --git a/src/inc/apiv2/common/AbstractModelAPI.class.php b/src/inc/apiv2/common/AbstractModelAPI.class.php index de2a99a94..da277501b 100644 --- a/src/inc/apiv2/common/AbstractModelAPI.class.php +++ b/src/inc/apiv2/common/AbstractModelAPI.class.php @@ -1,6 +1,8 @@ getDBAclass() . '::getFeatures'), ); } - + /** - * Seperate get features function to get features without the formfields. This is needed to generate the openAPI documentation - * TODO: This function could probably be used in the patch endpoints aswell, since formfields are not relevant there. + * Separate get features function to get features without the form fields. This is needed to generate the openAPI documentation + * TODO: This function could probably be used in the patch endpoints as well, since form fields are not relevant there. */ public function getFeaturesWithoutFormfields(): array { $features = call_user_func($this->getDBAclass() . '::getFeatures'); return $this->mapFeatures($features); } - - /** + + /** * Get features based on DBA model features - * + * * @param string $dbaClass is the dba class to get the features from */ - //TODO doesnt retrieve features based on formfields, could be done by adding api class in relationship objects - final protected function getFeaturesOther(string $dbaClass): array - { + //TODO doesnt retrieve features based on form fields, could be done by adding api class in relationship objects + final protected function getFeaturesOther(string $dbaClass): array { return call_user_func($dbaClass . '::getFeatures'); } - + /** * Find primary key for another DBA object * A little bit hacky because the getPrimaryKey function in dbaClass is not static - * - * @param string $dbaClass is the dba class to get the primarykey from + * + * @param string $dbaClass is the dba class to get the primary key from + * @throws InternalError */ - protected function getPrimaryKeyOther(string $dbaClass): string - { + protected function getPrimaryKeyOther(string $dbaClass): string { $features = $this->getFeaturesOther($dbaClass); # Work-around required since getPrimaryKey is not static in dba/models/*.php foreach ($features as $key => $value) { - if ($value['pk'] == True) { + if ($value['pk']) { return $key; } } throw new InternalError("Internal error: no primary key found"); } - + /** - * Retrieve ManyToOne relalation for $objects ('parents') of type $targetFactory via 'intermidate' - * of $intermediateFactory joining on $joinField (between 'intermediate' and 'target'). Filtered by + * Retrieve ManyToOne relation for $objects ('parents') of type $targetFactory via 'intermediate' + * of $intermediateFactory joining on $joinField (between 'intermediate' and 'target'). Filtered by * $filterField at $intermediateFactory. - * - * @param array $objects Objects Fetch relation for selected Objects + * + * @param array $objects Objects Fetch relation for selected Objects * @param string $objectField Field to use as base for $objects * @param object $intermediateFactory Factory used as intermediate between parentObject and targetObject - * @param string $filterField Filter field of intermadiateObject to filter against $objects field * @param object $targetFactory Object properties of objects returned * @param string $joinField Field to connect 'intermediate' to 'target' - + * @param string $parentKey * @return array $many2One which is a map where the key is the id of the parent object and the value is an array of the included * objects that are included for this parent object */ @@ -190,7 +183,7 @@ final protected static function getManyToOneRelationViaIntermediate( /* Retrieve Parent -> Intermediate -> Target objects */ $objectIds = []; - foreach($objects as $object) { + foreach ($objects as $object) { $kv = $object->getKeyValueDict(); $objectIds[] = $kv[$objectField]; } @@ -218,16 +211,16 @@ final protected static function getManyToOneRelationViaIntermediate( } return $many2One; } - + /** * Retrieve ForeignKey Relation - * - * @param array $objects Objects Fetch relation for selected Objects + * + * @param array $objects Objects Fetch relation for selected Objects * @param string $objectField Field to use as base for $objects * @param object $factory Factory used to retrieve objects * @param string $filterField Filter field of $field to filter against $objects field - * - * @return array + * + * @return array */ final protected static function getForeignKeyRelation( array $objects, @@ -237,7 +230,7 @@ final protected static function getForeignKeyRelation( ): array { assert($factory instanceof AbstractModelFactory); $retval = array(); - + /* Fetch required objects */ $objectIds = []; foreach ($objects as $object) { @@ -246,33 +239,33 @@ final protected static function getForeignKeyRelation( } $qF = new ContainFilter($filterField, $objectIds, $factory); $hO = $factory->filter([Factory::FILTER => $qF]); - + /* Objects are uniquely identified by fields, create mapping to speed-up further processing */ $f2o = []; foreach ($hO as $relationObject) { $f2o[$relationObject->getKeyValueDict()[$filterField]] = $relationObject; }; - + /* Map objects */ foreach ($objects as $object) { $fieldId = $object->getKeyValueDict()[$objectField]; - if (array_key_exists($fieldId, $f2o) == true) { + if (array_key_exists($fieldId, $f2o)) { $retval[$object->getId()] = $f2o[$fieldId]; } } - + return $retval; } - + /** * Retrieve ManyToOneRelation (reverse ForeignKey) - * - * @param array $objects Objects Fetch relation for selected Objects + * + * @param array $objects Objects Fetch relation for selected Objects * @param string $objectField Field to use as base for $objects * @param object $factory Factory used to retrieve objects * @param string $filterField Filter field of $field to filter against $objects field - * - * @return array + * + * @return array */ final protected static function getManyToOneRelation( array $objects, @@ -282,7 +275,7 @@ final protected static function getManyToOneRelation( ): array { assert($factory instanceof AbstractModelFactory); $retval = array(); - + /* Fetch required objects */ $objectIds = []; foreach ($objects as $object) { @@ -291,29 +284,28 @@ final protected static function getManyToOneRelation( } $qF = new ContainFilter($filterField, $objectIds, $factory); $hO = $factory->filter([Factory::FILTER => $qF]); - + /* Map (multiple) objects to base objects */ foreach ($hO as $relationObject) { $kv = $relationObject->getKeyValueDict(); $retval[$kv[$filterField]][] = $relationObject; } - + return $retval; } - - + + /** - * Retrieve ManyToOne relalation for $objects ('parents') of type $targetFactory via 'intermidate' - * of $intermediateFactory joining on $joinField (between 'intermediate' and 'target'). Filtered by + * Retrieve ManyToOne relation for $objects ('parents') of type $targetFactory via 'intermediate' + * of $intermediateFactory joining on $joinField (between 'intermediate' and 'target'). Filtered by * $filterField at $intermediateFactory. - * - * @param array $objects Objects Fetch relation for selected Objects + * + * @param array $objects Objects Fetch relation for selected Objects * @param string $objectField Field to use as base for $objects * @param object $intermediateFactory Factory used as intermediate between parentObject and targetObject - * @param string $filterField Filter field of intermadiateObject to filter against $objects field + * @param string $filterField Filter field of intermediateObject to filter against $objects field * @param object $targetFactory Object properties of objects returned * @param string $joinField Field to connect 'intermediate' to 'target' - * @return array $many2many which is a map where the key is the id of the parent object and the value is an array of the included * objects that are included for this parent object */ @@ -331,7 +323,7 @@ final protected static function getManyToManyRelationViaIntermediate( /* Retrieve Parent -> Intermediate -> Target objects */ $objectIds = []; - foreach($objects as $object) { + foreach ($objects as $object) { $kv = $object->getKeyValueDict(); $objectIds[] = $kv[$objectField]; } @@ -354,58 +346,57 @@ final protected static function getManyToManyRelationViaIntermediate( } return $many2Many; } - - /** + + /** * Retrieve permissions based on class and method requested + * @throws HttpForbidden */ - public function getRequiredPermissions(string $method): array - { + public function getRequiredPermissions(string $method): array { $model = $this->getDBAclass(); # Get required permission based on API method type - switch (strtoupper($method)) { - case "GET": - $required_perm = $model::PERM_READ; - break; - case "POST": - $required_perm = $model::PERM_CREATE; - break; - case "PATCH": - $required_perm = $model::PERM_UPDATE; - break; - case "DELETE": - $required_perm = $model::PERM_DELETE; - break; - default: - throw new HttpForbidden("Method '" . $method . "' is not allowed "); - } + $required_perm = match (strtoupper($method)) { + "GET" => $model::PERM_READ, + "POST" => $model::PERM_CREATE, + "PATCH" => $model::PERM_UPDATE, + "DELETE" => $model::PERM_DELETE, + default => throw new HttpForbidden("Method '" . $method . "' is not allowed "), + }; return array($required_perm); } - + /** * API entry point for deletion of single object + * @param Request $request + * @param Response $response + * @param array $args + * @return Response + * @throws HTException + * @throws HttpForbidden + * @throws ResourceNotFoundError */ public function deleteOne(Request $request, Response $response, array $args): Response - // TODO how to handle cascading deletes? - // ex. Hash foreignkey to hashlist can't be null, but hashlist delete doesnt cascade to Hash - // Which effectively means that we cant delete a hashlist because of foreingkey constraints - // Solution 1: make cascading rules in Database - // Solution 2: implement delete logic in every api model + // TODO how to handle cascading deletes? + // ex. Hash foreignkey to hashlist can't be null, but hashlist delete doesnt cascade to Hash + // Which effectively means that we cant delete a hashlist because of foreign key constraints + // Solution 1: make cascading rules in Database + // Solution 2: implement delete logic in every api model { $this->preCommon($request); $object = $this->doFetch($args['id']); - + /* Actually delete object */ $this->deleteObject($object); - + return $response->withStatus(204) ->withHeader("Content-Type", "application/json"); } - + /** - * Request single object from database & validate permissons + * Request single object from database & validate permissions + * @throws ResourceNotFoundError + * @throws HttpForbidden */ - protected function doFetch(string $pk): mixed - { + protected function doFetch(string $pk): mixed { $object = $this->getFactory()->get($pk); if ($object === null) { throw new ResourceNotFoundError(); @@ -413,29 +404,29 @@ protected function doFetch(string $pk): mixed if ($this->getSingleACL($this->getCurrentUser(), $object) === false) { throw new HttpForbidden("No access to this object!", 403); } - + return $object; } - + /** - * Additional filtering required for limiting access to objects + * Additional filtering required for limiting access to objects */ - protected function getFilterACL(): array - { + protected function getFilterACL(): array { return []; } - + /** * Helper function to determine if $resourceRecord is a valid resource record * returns true if it is a valid resource record and false if it is an invalid resource record */ - final protected function validateResourceRecord(mixed $resourceRecord): bool - { + final protected function validateResourceRecord(mixed $resourceRecord): bool { return (isset($resourceRecord['type']) && is_numeric($resourceRecord['id'])); } - - final protected function ResourceRecordArrayToUpdateArray($data, $parentId) - { + + /** + * @throws HttpError + */ + final protected function ResourceRecordArrayToUpdateArray($data, $parentId): array { $updates = []; foreach ($data as $item) { if (!$this->validateResourceRecord($item)) { @@ -446,8 +437,8 @@ final protected function ResourceRecordArrayToUpdateArray($data, $parentId) } return $updates; } - - protected static function addToRelatedResources(array $relatedResources, array $relatedResource) { + + protected static function addToRelatedResources(array $relatedResources, array $relatedResource): array { $alreadyExists = false; $searchType = $relatedResource["type"]; $searchId = $relatedResource["id"]; @@ -458,41 +449,42 @@ protected static function addToRelatedResources(array $relatedResources, array $ } } if (!$alreadyExists) { - $relatedResources[] = $relatedResource; + $relatedResources[] = $relatedResource; } return $relatedResources; } - + /** * API entry point for requesting multiple objects + * @throws HttpError */ - public static function getManyResources(object $apiClass, Request $request, Response $response, array $relationFs = []): Response - { + public static function getManyResources(object $apiClass, Request $request, Response $response, array $relationFs = []): Response { $apiClass->preCommon($request); - + $aliasedfeatures = $apiClass->getAliasedFeatures(); $factory = $apiClass->getFactory(); - + $defaultPageSize = 10000; $maxPageSize = 50000; // TODO: if 0.14.4 release has happened, following parameters can be retrieved from config // $defaultPageSize = SConfig::getInstance()->getVal(DConfig::DEFAULT_PAGE_SIZE); // $maxPageSize = SConfig::getInstance()->getVal(DConfig::MAX_PAGE_SIZE); - + $pageAfter = $apiClass->getQueryParameterFamilyMember($request, 'page', 'after'); $pageSize = $apiClass->getQueryParameterFamilyMember($request, 'page', 'size') ?? $defaultPageSize; if ($pageSize < 0) { throw new HttpError("Invalid parameter, page[size] must be a positive integer"); - } elseif ($pageSize > $maxPageSize) { + } + elseif ($pageSize > $maxPageSize) { throw new HttpError(sprintf("You requested a size of %d, but %d is the maximum.", $pageSize, $maxPageSize)); } - + $validExpandables = $apiClass::getExpandables(); $expands = $apiClass->makeExpandables($request, $validExpandables); - + /* Object filter definition */ $aFs = []; - + /* Generate filters */ $filters = $apiClass->getFilters($request); $qFs_Filter = $apiClass->makeFilter($filters, $apiClass); @@ -501,31 +493,31 @@ public static function getManyResources(object $apiClass, Request $request, Resp if (isset($aFs_ACL[Factory::FILTER])) { $qFs_Filter = array_merge($aFs_ACL[Factory::FILTER], $qFs_Filter); } - if (isset($aFs_ACL[Factory::JOIN])){ + if (isset($aFs_ACL[Factory::JOIN])) { $aFs[Factory::JOIN] = $aFs_ACL[Factory::JOIN]; } if (count($qFs_Filter) > 0) { $aFs[Factory::FILTER] = $qFs_Filter; } - + /** * Create pagination - * + * * TODO: Deny pagination with un-stable sorting */ $defaultSort = $apiClass->getQueryParameterFamilyMember($request, 'page', 'after') == null && - $apiClass->getQueryParameterFamilyMember($request, 'page', 'before') != null ? 'DESC' : 'ASC'; + $apiClass->getQueryParameterFamilyMember($request, 'page', 'before') != null ? 'DESC' : 'ASC'; $orderTemplates = $apiClass->makeOrderFilterTemplates($request, $aliasedfeatures, $defaultSort); - + // Build actual order filters foreach ($orderTemplates as $orderTemplate) { $aFs[Factory::ORDER][] = new OrderFilter($orderTemplate['by'], $orderTemplate['type']); } - + /* Include relation filters */ $finalFs = array_merge($aFs, $relationFs); - + $primaryKey = $apiClass->getPrimaryKey(); //according to JSON API spec, first and last have to be calculated if inexpensive to compute //(https://jsonapi.org/profiles/ethanresnick/cursor-pagination/#auto-id-links)) @@ -534,51 +526,52 @@ public static function getManyResources(object $apiClass, Request $request, Resp $agg2 = new Aggregation($primaryKey, Aggregation::MIN, $factory); $agg3 = new Aggregation($primaryKey, Aggregation::COUNT, $factory); $aggregation_results = $factory->multicolAggregationFilter($finalFs, [$agg1, $agg2, $agg3]); - + $max = $aggregation_results[$agg1->getName()]; $min = $aggregation_results[$agg2->getName()]; $total = $aggregation_results[$agg3->getName()]; - + //pagination filters need to be added after max has been calculated $finalFs[Factory::LIMIT] = new LimitFilter($pageSize); - - if (isset($pageAfter)){ + + if (isset($pageAfter)) { $finalFs[Factory::FILTER][] = new QueryFilter($primaryKey, $pageAfter, '>', $factory); } $pageBefore = $apiClass->getQueryParameterFamilyMember($request, 'page', 'before'); if (isset($pageBefore)) { $finalFs[Factory::FILTER][] = new QueryFilter($primaryKey, $pageBefore, '<', $factory); } - + /* Request objects */ $filterObjects = $factory->filter($finalFs); if ($defaultSort == 'DESC') { $filterObjects = array_reverse($filterObjects); } - + /* JOIN statements will return related modules as well, discard for now */ if (array_key_exists(Factory::JOIN, $finalFs)) { $objects = $filterObjects[$factory->getModelname()]; - } else { + } + else { $objects = $filterObjects; } - + /* Resolve all expandables */ $expandResult = []; foreach ($expands as $expand) { // mapping from $objectId -> result objects in $expandResult[$expand] = $apiClass->fetchExpandObjects($objects, $expand); } - + /* Convert objects to JSON:API */ $dataResources = []; $includedResources = []; - + // Convert objects to data resources foreach ($objects as $object) { // Create object $newObject = $apiClass->obj2Resource($object, $expandResult); - + // For compound document, included resources foreach ($expands as $expand) { if (array_key_exists($object->getId(), $expandResult[$expand])) { @@ -587,7 +580,8 @@ public static function getManyResources(object $apiClass, Request $request, Resp foreach ($expandResultObject as $expandObject) { $includedResources = self::addToRelatedResources($includedResources, $apiClass->obj2Resource($expandObject)); } - } else { + } + else { if ($expandResultObject === null) { // to-only relation which is nullable continue; @@ -596,26 +590,26 @@ public static function getManyResources(object $apiClass, Request $request, Resp } } } - + // Add to result output $dataResources[] = $newObject; } - + //build last link $lastParams = $request->getQueryParams(); unset($lastParams['page']['after']); $lastParams['page']['size'] = $pageSize; $lastParams['page']['before'] = $max + 1; - $linksLast = $request->getUri()->getPath() . '?' . urldecode(http_build_query($lastParams)); - + $linksLast = $request->getUri()->getPath() . '?' . urldecode(http_build_query($lastParams)); + // Build self link $selfParams = $request->getQueryParams(); $selfParams['page']['size'] = $pageSize; - $linksSelf = $request->getUri()->getPath() . '?' . urldecode(http_build_query($selfParams)); - + $linksSelf = $request->getUri()->getPath() . '?' . urldecode(http_build_query($selfParams)); + $linksNext = null; $linksPrev = null; - + // Build next link if (!empty($objects)) { $minId = $maxId = $objects[0]->getId() ?? null; @@ -629,12 +623,12 @@ public static function getManyResources(object $apiClass, Request $request, Resp } } $nextId = $defaultSort == "ASC" ? $maxId : $minId; - + if ($nextId < $max) { //only set next page when its not the last page $nextParams = $selfParams; $nextParams['page']['after'] = $nextId; unset($nextParams['page']['before']); - $linksNext = $request->getUri()->getPath() . '?' . urldecode(http_build_query($nextParams)); + $linksNext = $request->getUri()->getPath() . '?' . urldecode(http_build_query($nextParams)); } // Build prev link $prevId = $defaultSort == "DESC" ? $maxId : $minId; @@ -642,59 +636,59 @@ public static function getManyResources(object $apiClass, Request $request, Resp $prevParams = $selfParams; $prevParams['page']['before'] = $prevId; unset($prevParams['page']['after']); - $linksPrev = $request->getUri()->getPath() . '?' . urldecode(http_build_query($prevParams)); + $linksPrev = $request->getUri()->getPath() . '?' . urldecode(http_build_query($prevParams)); } } - + //build first link $firstParams = $request->getQueryParams(); unset($firstParams['page']['before']); $firstParams['page']['size'] = $pageSize; $firstParams['page']['after'] = $min; - $linksFirst = $request->getUri()->getPath() . '?' . urldecode(http_build_query($firstParams)); + $linksFirst = $request->getUri()->getPath() . '?' . urldecode(http_build_query($firstParams)); $links = [ - "self" => $linksSelf, - "first" => $linksFirst, - "last" => $linksLast, - "next" => $linksNext, - "prev" => $linksPrev, - ]; - + "self" => $linksSelf, + "first" => $linksFirst, + "last" => $linksLast, + "next" => $linksNext, + "prev" => $linksPrev, + ]; + $metadata = ["page" => ["total_elements" => $total]]; // Generate JSON:API GET output $ret = self::createJsonResponse($dataResources, $links, $includedResources, $metadata); - + $body = $response->getBody(); $body->write($apiClass->ret2json($ret)); - + return $response->withStatus(200) ->withHeader("Content-Type", 'application/vnd.api+json; ext="https://jsonapi.org/profiles/ethanresnick/cursor-pagination"'); } - + /** * API entry point for requesting multiple objects + * @throws HttpError */ - public function get(Request $request, Response $response, array $args): Response - { + public function get(Request $request, Response $response, array $args): Response { return self::getManyResources($this, $request, $response); } - + /** * Maps filters to the appropiate models based on their feautures. - * + * * Helper function to get valid filters for the models. This is usefull when multiple objects * have been included and the correct filters need to be mapped to the correct objects. * Currently used to make complex filters for counting objects - * - * @param array $filters An associative array of filters where the key is the filter + * + * @param array $filters An associative array of filters where the key is the filter * name and the value is the filter value. Filters should match - * the pattern ``, where `` can be + * the pattern ``, where `` can be * one of the supported suffixes (e.g., `__eq`, `__ne`). - * @param array $models An array of model objects. Each model must have a `getFeatures()` - * method that returns an associative array of model features. - * The features should map filter keys to their respective + * @param array $models An array of model objects. Each model must have a `getFeatures()` + * method that returns an associative array of model features. + * The features should map filter keys to their respective * attributes or aliases. - * + * * @return array An associative array mapping model classes to their respective valid filters. * The structure is: * [ @@ -704,43 +698,53 @@ public function get(Request $request, Response $response, array $args): Response * ], * ... * ] - * + * * @throws HttpForbidden If a filter key does not match the expected format or is invalid. + * @throws InternalError */ - public function filterObjectMap(array $filters, array $models) { - + public function filterObjectMap(array $filters, array $models): array { $modelFilterMap = []; foreach ($filters as $filter => $value) { if (preg_match('/^(?P[_a-zA-Z0-9]+?)(?|__eq|__ne|__lt|__lte|__gt|__gte|__contains|__startswith|__endswith|__icontains|__istartswith|__iendswith)$/', $filter, $matches) == 0) { throw new HttpForbidden("Filter parameter '" . $filter . "' is not valid"); } - - foreach($models as $model) { + + foreach ($models as $model) { $features = $model->getFeatures(); // Special filtering of _id to use for uniform access to model primary key $cast_key = $matches['key'] == '_id' ? array_column($features, 'alias', 'dbname')[$this->getPrimaryKey()] : $matches['key']; - if (array_key_exists($cast_key, $features) == false) { + if (!array_key_exists($cast_key, $features)) { continue; //not a valid filter for current model }; - $modelFilterMap[$model::class][$filter] = $value; + $modelFilterMap[$model::class][$filter] = $value; break; //filter has been found for current model, so break to go to next filter } } return $modelFilterMap; } - + /** * API entry point for retrieving count information of data + * @param Request $request + * @param Response $response + * @param array $args + * @return Response + * @throws HTException + * @throws HttpError + * @throws HttpForbidden + * @throws InternalError + * @throws JsonException + * @throws ContainerExceptionInterface + * @throws NotFoundExceptionInterface */ - public function count(Request $request, Response $response, array $args): Response - { + public function count(Request $request, Response $response, array $args): Response { $this->preCommon($request); $factory = $this->getFactory(); - + //resolve all expandables $validExpandables = $this::getExpandables(); $expands = $this->makeExpandables($request, $validExpandables); - + $objects = [$factory->getNullObject()]; $aFs = []; //build join filters @@ -751,67 +755,81 @@ public function count(Request $request, Response $response, array $args): Respon $primaryKey = $this->getPrimaryKey(); $aFs[Factory::JOIN][] = new JoinFilter($otherFactory, $relation["relationKey"], $primaryKey, $factory); } - + $filters = $this->getFilters($request); $filterObjectMap = $this->filterObjectMap($filters, $objects); $qFs = []; - foreach($filterObjectMap as $class => $cur_filters) { + foreach ($filterObjectMap as $class => $cur_filters) { $relationApiClass = new ($this->container->get('classMapper')->get($class))($this->container); $current_qFs = $this->makeFilter($cur_filters, $relationApiClass); $qFs = array_merge($qFs, $current_qFs); } - + if (count($qFs) > 0) { $aFs[Factory::FILTER] = $qFs; } - + $count = $factory->countFilter($aFs); $meta = ["count" => $count]; - + $include_total = $request->getQueryParams()['include_total']; if ($include_total == "true") { $meta["total_count"] = $factory->countFilter([]); } - + $ret = self::createJsonResponse(meta: $meta); - + $body = $response->getBody(); $body->write($this->ret2json($ret)); - + return $response->withStatus(200) ->withHeader("Content-Type", 'application/vnd.api+json'); } - + /** * API entry point for requests of single object + * @param Request $request + * @param Response $response + * @param array $args + * @return Response + * @throws ContainerExceptionInterface + * @throws HTException + * @throws HttpForbidden + * @throws NotFoundExceptionInterface + * @throws ResourceNotFoundError */ - public function getOne(Request $request, Response $response, array $args): Response - { + public function getOne(Request $request, Response $response, array $args): Response { $this->preCommon($request); $object = $this->doFetch($args['id']); - + $classMapper = $this->container->get('classMapper'); - + return self::getOneResource($this, $object, $request, $response); } - - + + /** * API entry point for modification of single object + * @param Request $request + * @param Response $response + * @param array $args + * @return Response + * @throws HTException + * @throws HttpError + * @throws HttpForbidden */ - public function patchOne(Request $request, Response $response, array $args): Response - { + public function patchOne(Request $request, Response $response, array $args): Response { $this->preCommon($request); $objectId = $args['id']; // $object = $this->doFetch($args['id']); - + $data = $request->getParsedBody()['data']; if (!$this->validateResourceRecord($data)) { return errorResponse($response, "No valid resource identifier object was given as data!", 403); } $aliasedfeatures = $this->getAliasedFeatures(); $attributes = $data['attributes']; - + // Validate incoming data foreach (array_keys($attributes) as $key) { // Ensure key can be updated @@ -819,16 +837,16 @@ public function patchOne(Request $request, Response $response, array $args): Res } // Validate input data if it matches the correct type or subtype $this->validateData($attributes, $aliasedfeatures); - + // This does the real things, patch the values that were sent in the data. $mappedData = $this->unaliasData($attributes, $aliasedfeatures); $this->updateObject($objectId, $mappedData); - + // Return updated object $newObject = $this->getFactory()->get($objectId); return self::getOneResource($this, $newObject, $request, $response, 200); } - + //follows style of bulk methods: https://github.com/json-api/json-api/blob/9c7a03dbc37f80f6ca81b16d444c960e96dd7a57/extensions/bulk/index.md //1. parse into key => value pairs of what is updated or object => key => value dict //2. retrieve object $object = $this->doFetch($request, $args['id']); @@ -836,19 +854,26 @@ public function patchOne(Request $request, Response $response, array $args): Res //4. overload function in config route /** * { - * "data": [{ - * "id": "1", - * "type": "articles" - * "attributes": { - * "title": "To TDD or Not" - * } - * }, { - * "id": "2", - * "type": "articles" - * "attributes": { - * "title": "LOL Engineering" - * } - * }] + * "data": [{ + * "id": "1", + * "type": "articles" + * "attributes": { + * "title": "To TDD or Not" + * } + * }, { + * "id": "2", + * "type": "articles" + * "attributes": { + * "title": "LOL Engineering" + * } + * }] + * @param Request $request + * @param Response $response + * @param array $args + * @return Response + * @throws HTException + * @throws HttpError + * @throws HttpForbidden */ public function patchMultiple(Request $request, Response $response, array $args): Response { $this->preCommon($request); @@ -866,21 +891,31 @@ public function patchMultiple(Request $request, Response $response, array $args) } $mappedData = $this->unaliasData($attributes, $aliasedfeatures); $objects[$resourceRecord["id"]] = $mappedData; - + } $this->updateObjects($objects); - + // $newObject = $this->getFactory()->get($object->getId()); // return self::getOneResource($this, $newObject, $request, $response, 200); //TODO maybe nicer to return all changed objects return $response->withStatus(204) ->withHeader("Content-Type", "application/json"); } - + + /** + * @param Request $request + * @param Response $response + * @param array $args + * @return Response + * @throws HTException + * @throws HttpError + * @throws HttpForbidden + * @throws ResourceNotFoundError + */ public function deleteMultiple(Request $request, Response $response, array $args): Response { $this->preCommon($request); $data = $request->getParsedBody()['data']; - + foreach ($data as $resourceRecord) { if (!$this->validateResourceRecord($resourceRecord)) { throw new HttpError('No valid resource identifier object was given as data!', 403); @@ -891,24 +926,30 @@ public function deleteMultiple(Request $request, Response $response, array $args return $response->withStatus(204) ->withHeader("Content-Type", "application/json"); } - + /** - * Overidable function to update mulitple objects + * Overridable function to update multiple objects * @objects ia an array where id is the key and the values are the attributes that need to be patched */ - protected function updateObjects(array $objects) { + protected function updateObjects(array $objects): void { foreach ($objects as $objectId => $attributes) { $this->updateObject($objectId, $attributes); } } - + /** * API entry point creation of new object + * @param Request $request + * @param Response $response + * @param array $args + * @return Response + * @throws HTException + * @throws HttpError + * @throws HttpForbidden */ - public function post(Request $request, Response $response, array $args): Response - { + public function post(Request $request, Response $response, array $args): Response { $this->preCommon($request); - + $data = $request->getParsedBody()["data"]; if ($data == null) { throw new HttpError("POST request requires data to be present", 403); @@ -918,35 +959,44 @@ public function post(Request $request, Response $response, array $args): Respons throw new HttpError('No valid resource identifier object with type was given as data!', 403); } $attributes = $data["attributes"]; - + $allFeatures = $this->getAliasedFeatures(); - + // Validate incoming parameters $this->validateParameters($attributes, $allFeatures); - + // Validate incoming data by value $this->validateData($attributes, $allFeatures); - + // Remove key aliases and sanitize to 'db values and request creation $mappedData = $this->unaliasData($attributes, $allFeatures); $pk = $this->createObject($mappedData); - + // Request object again, since post-modified entries are not reflected into object. $object = $this->getFactory()->get($pk); return self::getOneResource($this, $object, $request, $response, 201); } - - + + /** - * API endpoint to get a to one related resource record + * API endpoint to get a to one related resource record + * @param Request $request + * @param Response $response + * @param array $args + * @return Response + * @throws ContainerExceptionInterface + * @throws HTException + * @throws HttpForbidden + * @throws InternalError + * @throws NotFoundExceptionInterface + * @throws ResourceNotFoundError */ - public function getToOneRelatedResource(Request $request, Response $response, array $args): Response - { + public function getToOneRelatedResource(Request $request, Response $response, array $args): Response { $this->preCommon($request); - + $relation = $args['relation']; $id = $args['id']; - + $relationMapper = $this->getToOneRelationships()[$relation]; $intermediate = $relationMapper["intermediateType"]; //if there is an intermediate table join on that @@ -957,46 +1007,56 @@ public function getToOneRelatedResource(Request $request, Response $response, ar $relationMapper['junctionTableJoinField'], $relationMapper['relationKey'], ); - + $filterFactory = self::getModelFactory($relationMapper['junctionTableType']); $filterField = $relationMapper['joinField']; - + $aFs[Factory::FILTER][] = new QueryFilter( $filterField, $id, '=', $filterFactory ); - + $factory = $this->getFactory(); $object = $factory->filter($aFs)[$intermediateFactory->getModelName()][0]; $id = $object->getId(); - } else { + } + else { // Base object $object = $this->doFetch($id); } - + // Relation object $relationObjects = $this->fetchExpandObjects([$object], $relation); $relationObject = $relationObjects[$id]; - + $relationClass = $relationMapper['relationType']; $relationApiClass = new ($this->container->get('classMapper')->get($relationClass))($this->container); - + return self::getOneResource($relationApiClass, $relationObject, $request, $response); } - + /** * API endpoint to get a to one relationship link + * @param Request $request + * @param Response $response + * @param array $args + * @return Response + * @throws ContainerExceptionInterface + * @throws HTException + * @throws HttpForbidden + * @throws JsonException + * @throws NotFoundExceptionInterface + * @throws ResourceNotFoundError */ - public function getToOneRelationshipLink(Request $request, Response $response, array $args): Response - { + public function getToOneRelationshipLink(Request $request, Response $response, array $args): Response { $this->preCommon($request); - + $relation = $this->getToOneRelationships()[$args['relation']]; - + /* Prepare filter for to-one relations */ - + // Example for Task: // 'Hashlist' => [ // 'intermediateType' => TaskWrapper::class, @@ -1006,151 +1066,180 @@ public function getToOneRelationshipLink(Request $request, Response $response, a if (array_key_exists('intermediateType', $relation)) { $aFs = []; $intermediateFactory = self::getModelFactory($relation['intermediateType']); - + $aFs[Factory::FILTER][] = new QueryFilter( $relation['joinField'], $args['id'], '=', $intermediateFactory ); - + $aFs[Factory::JOIN][] = new JoinFilter( $intermediateFactory, $relation['joinField'], $relation['joinFieldRelation'], ); - + $factory = $this->getFactory(); //retrieve the only element of the intermediate table, which contains the data for the relatedResource $object = $factory->filter($aFs)[$intermediateFactory->getModelName()][0]; - } else { + } + else { $object = $this->doFetch($args['id']); }; - + $id = $object->getKeyValueDict()[$relation['key']]; - + if (is_null($id)) { $dataResource = null; - } else { + } + else { $dataResource = [ 'type' => $this->getObjectTypeName($relation['relationType']), 'id' => $id, ]; } - + $selfParams = $request->getQueryParams(); $linksQuery = urldecode(http_build_query($selfParams)); - $linksSelf = $request->getUri()->getPath() . ((!empty($linksQuery)) ? '?' . $linksQuery : ''); - + $linksSelf = $request->getUri()->getPath() . ((!empty($linksQuery)) ? '?' . $linksQuery : ''); + $apiClass = $this->container->get('classMapper')->get(get_class($object)); $linksRelated = $this->routeParser->urlFor($apiClass . ':getToOneRelatedResource', $args); - - $links = [ - "self" => $linksSelf, - "related" => $linksRelated, - ]; - + + $links = [ + "self" => $linksSelf, + "related" => $linksRelated, + ]; + // Generate JSON:API GET output $ret = self::createJsonResponse($dataResource, $links); - + $body = $response->getBody(); $body->write($this->ret2json($ret)); - + return $response->withStatus(200) ->withHeader("Content-Type", 'application/vnd.api+json'); } - - /* - * API endpoint to patch a to one relationship link - */ - // TODO This works as intended but it can give weird behaviour. ex. it allows you to put an MD5 hash to a SHA1 hashlist - //by patching the foreingkey. Simple fix could be to make foreignkey immutable for cases like this. - //Or just like with the patch many, create an overrideable function to add more logic in child - public function patchToOneRelationshipLink(Request $request, Response $response, array $args): Response - { + + /** + * API endpoint to patch a to one relationship link + * TODO: This works as intended but it can give weird behaviour. ex. it allows you to put an MD5 hash to a SHA1 hashlist + * by patching the foreign key. Simple fix could be to make foreignkey immutable for cases like this. + * Or just like with the patch many, create an overrideable function to add more logic in child + * @param Request $request + * @param Response $response + * @param array $args + * @return Response + * @throws HTException + * @throws HttpError + * @throws HttpForbidden + * @throws ResourceNotFoundError + */ + public function patchToOneRelationshipLink(Request $request, Response $response, array $args): Response { $this->preCommon($request); $jsonBody = $request->getParsedBody(); - + if ($jsonBody === null || !array_key_exists('data', $jsonBody)) { throw new HttpError('No data was sent! Send the json data in the following format: {"data": {"type": "foo", "id": 1}}'); } $data = $jsonBody['data']; - + $relationKey = $this->getToOneRelationships()[$args['relation']]['relationKey']; if ($relationKey == null) { throw new HttpError("Relation does not exist!"); } - + $features = $this->getFeatures(); $this->isAllowedToMutate($features, $relationKey); - + $factory = $this->getFactory(); $object = $this->doFetch(intval($args['id'])); if ($data == null) { $factory->DatabaseSet($object, $relationKey, null); - } elseif (!$this->validateResourceRecord($data)) { + } + elseif (!$this->validateResourceRecord($data)) { throw new HttpError('No valid resource identifier object was given as data!'); - } else { + } + else { //TODO check if foreign key exists befor inserting $factory->DatabaseSet($object, $relationKey, $data["id"]); } - + return $response->withStatus(201) ->withHeader("Content-Type", "application/vnd.api+json"); } - - + + /** * API endpoint for retrieving to many relationship resource records + * @param Request $request + * @param Response $response + * @param array $args + * @return Response + * @throws ContainerExceptionInterface + * @throws HTException + * @throws HttpError + * @throws HttpForbidden + * @throws NotFoundExceptionInterface */ - public function getToManyRelatedResource(Request $request, Response $response, array $args): Response - { + public function getToManyRelatedResource(Request $request, Response $response, array $args): Response { $this->preCommon($request); - + // Base object -> Relation objects // $object = $this->doFetch($request, $args['id']); - + $toManyRelation = $this->getToManyRelationships()[$args['relation']]; $relationClass = $toManyRelation['relationType']; $relationApiClass = new ($this->container->get('classMapper')->get($relationClass))($this->container); - + $aFs = []; $filterField = $toManyRelation['relationKey']; $filterFactory = null; - + if (array_key_exists('junctionTableType', $toManyRelation)) { $filterField = $toManyRelation['junctionTableFilterField']; $filterFactory = self::getModelFactory($toManyRelation['junctionTableType']); - + $aFs[Factory::JOIN][] = new JoinFilter( self::getModelFactory($toManyRelation['junctionTableType']), $toManyRelation['junctionTableJoinField'], $toManyRelation['relationKey'], ); } - + $aFs[Factory::FILTER][] = new QueryFilter( $filterField, $args['id'], '=', $filterFactory ); - + return self::getManyResources($relationApiClass, $request, $response, $aFs); } - - + + /** - * API get request to retrieve the to many relationship links + * API get request to retrieve the to many relationship links + * @param Request $request + * @param Response $response + * @param array $args + * @return Response + * @throws ContainerExceptionInterface + * @throws HTException + * @throws HttpForbidden + * @throws InternalError + * @throws JsonException + * @throws NotFoundExceptionInterface + * @throws ResourceNotFoundError */ - public function getToManyRelationshipLink(Request $request, Response $response, array $args): Response - { + public function getToManyRelationshipLink(Request $request, Response $response, array $args): Response { $this->preCommon($request); - + // Base object -> Relationship objects $object = $this->doFetch($args['id']); $expandObjects = $this->fetchExpandObjects([$object], $args['relation']); - + $dataResources = []; if (array_key_exists($object->getId(), $expandObjects)) { foreach ($expandObjects[$object->getId()] as $relationshipObject) { @@ -1160,18 +1249,18 @@ public function getToManyRelationshipLink(Request $request, Response $response, ]; } } - + $selfParams = $request->getQueryParams(); $linksQuery = urldecode(http_build_query($selfParams)); - $linksSelf = $request->getUri()->getPath() . ((!empty($linksQuery)) ? '?' . $linksQuery : ''); - + $linksSelf = $request->getUri()->getPath() . ((!empty($linksQuery)) ? '?' . $linksQuery : ''); + $apiClass = $this->container->get('classMapper')->get(get_class($object)); $linksRelated = $this->routeParser->urlFor($apiClass . ':getToManyRelatedResource', $args); - - + + // TODO implement pagination support $linksNext = null; - + // Generate JSON:API GET output $links = [ "self" => $linksSelf, @@ -1179,35 +1268,48 @@ public function getToManyRelationshipLink(Request $request, Response $response, "next" => $linksNext, ]; $ret = self::createJsonResponse($dataResources, $links); - + $body = $response->getBody(); $body->write($this->ret2json($ret)); - + return $response->withStatus(200) ->withHeader("Content-Type", 'application/vnd.api+json; ext="https://jsonapi.org/profiles/ethanresnick/cursor-pagination"'); } - + /** - * PATCH request to patch the to many relationship link TODO: handle intermediate tables + * PATCH request to patch the to many relationship link + * TODO: handle intermediate tables + * @param Request $request + * @param Response $response + * @param array $args + * @return Response + * @throws HTException + * @throws HttpError + * @throws HttpForbidden */ - public function patchToManyRelationshipLink(Request $request, Response $response, array $args): Response - { + public function patchToManyRelationshipLink(Request $request, Response $response, array $args): Response { $this->preCommon($request); $jsonBody = $request->getParsedBody(); - + if ($jsonBody === null || !array_key_exists('data', $jsonBody) || !is_array($jsonBody['data'])) { throw new HttpError('No data was sent! Send the json data in the following format: {"data":[{"type": "foo", "id": 1}}]'); } - + $data = $jsonBody['data']; $this->updateToManyRelationship($request, $data, $args); - + return $response->withStatus(204) ->withHeader("Content-Type", "application/vnd.api+json"); } - + /** - * Overidable function to update the to many relationship + * Overridable function to update the to many relationship + * @param Request $request + * @param array $data + * @param array $args + * @throws HttpError + * @throws HttpForbidden + * @throws InternalError */ protected function updateToManyRelationship(Request $request, array $data, array $args): void { $relation = $this->getToManyRelationships()[$args['relation']]; @@ -1216,13 +1318,13 @@ protected function updateToManyRelationship(Request $request, array $data, array if ($relationKey == null) { throw new HttpError("Relation does not exist!"); } - + $relationType = $relation['relationType']; $features = $this->getFeaturesOther($relationType); $this->isAllowedToMutate($features, $relationKey); - + $factory = self::getModelFactory($relationType); - + $qF = new QueryFilter($relationKey, $args['id'], "="); $models = $factory->filter([Factory::FILTER => $qF]); //TODO Would be nicer if filter/factory could return a dict based on primarykeys directly @@ -1230,7 +1332,7 @@ protected function updateToManyRelationship(Request $request, array $data, array foreach ($models as $item) { $modelsDict[$item->getPrimaryKeyValue()] = $item; } - + $updates = []; foreach ($data as $item) { if (!$this->validateResourceRecord($item)) { @@ -1240,14 +1342,15 @@ protected function updateToManyRelationship(Request $request, array $data, array $updates[] = new MassUpdateSet($item["id"], $args["id"]); unset($modelsDict[$item["id"]]); } - - $leftover_primarykeys = array_keys($modelsDict); - if ($features[$relationKey]["null"] == False && count($leftover_primarykeys) > 0) { + + $leftover_primary_keys = array_keys($modelsDict); + if (!$features[$relationKey]["null"] && count($leftover_primary_keys) > 0) { throw new HttpError("Not all current relationship objects have been included, - but the foreignkey can't be set to null. Either add all objects or delete the not needed objects"); + but the foreignkey can't be set to null. Either add all objects or delete the not needed objects" + ); } - foreach ($leftover_primarykeys as $key) { - //set all foreignkeys of current relationships to null that have not been included + foreach ($leftover_primary_keys as $key) { + //set all foreign keys of current relationships to null that have not been included $updates[] = new MassUpdateSet($key, null); } $factory->getDB()->beginTransaction(); //start transaction to be able roll back @@ -1256,35 +1359,42 @@ protected function updateToManyRelationship(Request $request, array $data, array throw new HttpError("Was not able to update to many relationship"); } } - + /** - * POST request for the to many relationship link TODO + * POST request for the to many relationship link + * @param Request $request + * @param Response $response + * @param array $args + * @return Response + * @throws HTException + * @throws HttpError + * @throws HttpForbidden + * @throws InternalError */ - public function postToManyRelationshipLink(Request $request, Response $response, array $args): Response - { + public function postToManyRelationshipLink(Request $request, Response $response, array $args): Response { $this->preCommon($request); - + $jsonBody = $request->getParsedBody(); if ($jsonBody === null || !array_key_exists('data', $jsonBody) || !is_array($jsonBody['data'])) { throw new HttpError('No data was sent! Send the json data in the following format: {"data":[{"type": "foo", "id": 1}}]'); } $data = $jsonBody['data']; - + $relation = $this->getToManyRelationships()[$args['relation']]; $relationKey = $relation['relationKey']; if ($relationKey == null) { throw new HttpError("Relation does not exist!"); } - - // TODO this ia an abstract way of adding to junctiontables. This only works for intermediate tables - // that have 3 fields (1 primary key and 2 foreignkeys to link the tables) for models that have intermediate - // tables with more than 3 fields, the postToManyRelationshipLink() function should be overidden. + + // TODO this ia an abstract way of adding to junction tables. This only works for intermediate tables + // that have 3 fields (1 primary key and 2 foreign keys to link the tables) for models that have intermediate + // tables with more than 3 fields, the postToManyRelationshipLink() function should be overridden. if (array_key_exists("junctionTableType", $relation)) { $relationType = $relation['junctionTableType']; $primaryKey = $this->getPrimaryKeyOther($relationType); //Add to junction table if not exist. $factory = self::getModelFactory($relationType); - foreach($data as $item) { + foreach ($data as $item) { if (!$this->validateResourceRecord($item)) { $encoded_item = json_encode($item); throw new HttpError('Invalid resource record given in list! invalid resource record: ' . $encoded_item); @@ -1300,7 +1410,8 @@ public function postToManyRelationshipLink(Request $request, Response $response, $junction_table_entry->$setMethod2($item["id"]); $factory->save($junction_table_entry); } - } else { + } + else { $relationType = $relation['relationType']; $primaryKey = $this->getPrimaryKeyOther($relationType); $features = $this->getFeaturesOther($relationType); @@ -1309,53 +1420,59 @@ public function postToManyRelationshipLink(Request $request, Response $response, $updates = self::ResourceRecordArrayToUpdateArray($data, $args["id"]); $factory->massSingleUpdate($primaryKey, $relationKey, $updates); } - + return $response->withStatus(201) ->withHeader("Content-Type", "application/vnd.api+json"); } - + /** * DELETE request for the to many relationship link * currently there is no object that can be altered this way because of constraints + * @param Request $request + * @param Response $response + * @param array $args + * @return Response + * @throws HTException + * @throws HttpError + * @throws HttpForbidden */ - public function deleteToManyRelationshipLink(Request $request, Response $response, array $args): Response - { + public function deleteToManyRelationshipLink(Request $request, Response $response, array $args): Response { $this->preCommon($request); $jsonBody = $request->getParsedBody(); - + if ($jsonBody === null || !array_key_exists('data', $jsonBody) && is_array($jsonBody['data'])) { throw new HttpError('No data was sent! Send the json data in the following format: {"data":[{"type": "foo", "id": 1}}]'); } - + $relation = $this->getToManyRelationships()[$args['relation']]; $primaryKey = $relation['key']; $relationKey = $relation['relationKey']; if ($relationKey == null) { throw new HttpError("Relation does not exist!"); } - + $relationType = $relation['relationType']; $junction_table = $relation['junctionTableType']; if (!isset($junction_table)) { $features = $this->getFeaturesOther($relationType); $this->isAllowedToMutate($features, $relationKey); - if ($features[$relationKey]['null'] == False) { + if (!$features[$relationKey]['null']) { // In this scenario another solution could be to delete object TODO? throw new HttpForbidden("Key '$relationKey' cant be set to null"); } } - + $data = $jsonBody['data']; - + if (!is_array($data)) { throw new HttpError("Data is not an array, data should be an array of resource records."); } - + $factory = (isset($junction_table)) ? self::getModelFactory($junction_table) : self::getModelFactory($relationType); if (isset($junction_table)) { $parent_id = $args["id"]; $factory->getDB()->beginTransaction(); //start transaction to be able roll back - foreach($data as $item) { + foreach ($data as $item) { $qF = new QueryFilter($relation["junctionTableFilterField"], $parent_id, "=", $factory); $qF2 = new QueryFilter($relation["junctionTableJoinField"], $item['id'], "=", $factory); $object = $factory->filter([Factory::FILTER => [$qF, $qF2]])[0]; @@ -1364,7 +1481,8 @@ public function deleteToManyRelationshipLink(Request $request, Response $respons if (!$factory->getDB()->commit()) { throw new HttpError("Some resources failed updating"); } - } else { + } + else { foreach ($data as $item) { if (!$this->validateResourceRecord($item)) { $encoded_item = json_encode($item); @@ -1378,103 +1496,108 @@ public function deleteToManyRelationshipLink(Request $request, Response $respons throw new HttpError("Some resources failed updating"); } } - + return $response->withStatus(201) ->withHeader("Content-Type", "application/vnd.api+json"); } - + /** * Function to update fields in the database + * @throws HttpError */ - protected function DatabaseSet($object, $key, $value) { + protected function DatabaseSet($object, $key, $value): void { try { $this->getFactory()->set($object, $key, $value); - } catch (PDOException $e) { - if ($e->getCode() === '23000') { - throw new HttpError("Foreign key constraint failed: " . $e->getMessage()) ; - } else { + } + catch (PDOException $e) { + if ($e->getCode() === '23000') { + throw new HttpError("Foreign key constraint failed: " . $e->getMessage()); + } + else { throw new HttpError("MYSQL Database error [" . $e->getCode() . "]: " . $e->getMessage()); } } } - + /** * Update object with provided values + * @param int $objectId + * @param array $data + * @throws HttpError + * @throws HttpForbidden + * @throws ResourceNotFoundError */ - protected function updateObject(int $objectId, array $data): void - { + protected function updateObject(int $objectId, array $data): void { $updateHandlers = $this->getUpdateHandlers($objectId, $this->getCurrentUser()); foreach ($data as $key => $value) { if (array_key_exists($key, $updateHandlers)) { $updateHandlers[$key]($value); - } else { + } + else { $object = $this->doFetch($objectId); $this->DatabaseSet($object, $key, $value); } } } - + /** * Get input field names valid for patching of object */ - final public function getPatchValidFeatures(): array - { + final public function getPatchValidFeatures(): array { $aliasedfeatures = $this->getFeaturesWithoutFormfields(); $validFeatures = []; - + // Generate listing of validFeatures foreach ($aliasedfeatures as $name => $feature) { // Ensure key can be updated - if ($feature['read_only'] == True) { + if ($feature['read_only']) { continue; } - if ($feature['protected'] == True) { + if ($feature['protected']) { continue; } - if ($feature['private'] == True) { + if ($feature['private']) { continue; } - + $validFeatures[$name] = $feature; }; - + // Ensure debugging response lists are in sorted order ksort($validFeatures); - + return $validFeatures; } - + /** * Override-able registering of options */ - static public function register($app): void - { + static public function register($app): void { $me = get_called_class(); - $foo = $me::getDBAClass(); $baseUri = $me::getBaseUri(); $baseUriOne = $baseUri . '/{id:[0-9]+}'; $baseUriCount = $baseUri . "/count"; - + $baseUriRelationships = $baseUri . '/{id:[0-9]+}/relationships'; $uris = [$baseUri, $baseUriOne, $baseUriCount, $baseUriRelationships]; - + $classMapper = $app->getContainer()->get('classMapper'); $classMapper->add($me::getDBAclass(), $me); - + /* Allow CORS preflight requests */ foreach ($uris as $uri) { $app->options($uri, function (Request $request, Response $response): Response { return $response; }); } - + $available_methods = $me::getAvailableMethods(); - + if (in_array("GET", $available_methods)) { $app->get($baseUri, $me . ':get')->setname($me . ':get'); $app->get($baseUriCount, $me . ':count')->setname($me . ':count'); } - + foreach ($me::getToOneRelationships() as $name => $relationship) { $relationUri = '{relation:' . $name . '}'; $app->get($baseUriOne . '/' . $relationUri, $me . ':getToOneRelatedResource')->setname($me . ':getToOneRelatedResource'); @@ -1487,7 +1610,7 @@ static public function register($app): void return $response; }); } - + foreach ($me::getToManyRelationships() as $name => $relationship) { $relationUri = '{relation:' . $name . '}'; $app->get($baseUriOne . '/' . $relationUri, $me . ':getToManyRelatedResource')->setname($me . ':getToManyRelatedResource'); @@ -1502,20 +1625,20 @@ static public function register($app): void return $response; }); } - + if (in_array("POST", $available_methods)) { $app->post($baseUri, $me . ':post')->setname($me . ':post'); } - + if (in_array("GET", $available_methods)) { $app->get($baseUriOne, $me . ':getOne')->setName($me . ':getOne'); } - + if (in_array("PATCH", $available_methods)) { $app->patch($baseUriOne, $me . ':patchOne')->setName($me . ':patchOne'); $app->patch($baseUri, $me . ':patchMultiple')->setName($me . ':patchMultiple'); } - + if (in_array("DELETE", $available_methods)) { $app->delete($baseUriOne, $me . ':deleteOne')->setName($me . ':deleteOne'); $app->delete($baseUri, $me . ':deleteMultiple')->setName($me . 'deleteMultiple'); diff --git a/src/inc/apiv2/common/ErrorHandler.class.php b/src/inc/apiv2/common/ErrorHandler.class.php index 154e28467..b25f95e73 100644 --- a/src/inc/apiv2/common/ErrorHandler.class.php +++ b/src/inc/apiv2/common/ErrorHandler.class.php @@ -1,21 +1,20 @@ setStatus($status); - - $body = $response->getBody(); - $body->write($problem->asJson(true)); - - return $response - ->withHeader("Content-type", "application/problem+json") - ->withStatus($status); +function errorResponse(Response $response, $message, $status = 401): MessageInterface|Response { + $problem = new ApiProblem($message, "about:blank"); + $problem->setStatus($status); + + $body = $response->getBody(); + $body->write($problem->asJson(true)); + + return $response + ->withHeader("Content-type", "application/problem+json") + ->withStatus($status); } class ResourceNotFoundError extends Exception { @@ -47,5 +46,3 @@ public function __construct(string $message = "Internal error", int $code = 500) parent::__construct($message, $code); } } - -?> \ No newline at end of file diff --git a/src/inc/apiv2/common/openAPISchema.routes.php b/src/inc/apiv2/common/openAPISchema.routes.php index 9294a2885..fc0fb3146 100644 --- a/src/inc/apiv2/common/openAPISchema.routes.php +++ b/src/inc/apiv2/common/openAPISchema.routes.php @@ -9,55 +9,66 @@ require_once(dirname(__FILE__) . "/../common/AbstractModelAPI.class.php"); +/** + * @throws HttpErrorException + */ function typeLookup($feature): array { $type_format = null; $type_enum = null; $sub_type = null; if ($feature['type'] == 'int') { $type = "integer"; - } elseif ($feature['type'] == 'uint64') { + } + elseif ($feature['type'] == 'uint64') { /* TODO: Specify integer ranges */ $type = "integer"; - } elseif ($feature['type'] == 'int64') { + } + elseif ($feature['type'] == 'int64') { $type = "integer"; $type_format = "int64"; - } elseif ($feature['type'] == 'dict') { + } + elseif ($feature['type'] == 'dict') { $type = "object"; - } elseif ($feature['type'] == 'array') { + } + elseif ($feature['type'] == 'array') { $type = "array"; $sub_type = "integer"; //TODO: subtype is hardcoded because we only have int arrays - } elseif ($feature['type'] == 'bool') { + } + elseif ($feature['type'] == 'bool') { $type = "boolean"; - } elseif (str_starts_with($feature['type'], 'str(')) { + } + elseif (str_starts_with($feature['type'], 'str(')) { $type = "string"; - } elseif ($feature['type'] == 'str') { + } + elseif ($feature['type'] == 'str') { $type = "string"; - } else { + } + else { throw new HttpErrorException("Cast for type '" . $feature['type'] . "' not implemented"); } - + if (is_array($feature['choices'])) { $type_enum = array_keys($feature['choices']); } - - $result = [ - "type" => $type, - "type_format" => $type_format, - "type_enum" => $type_enum, - "subtype" => $sub_type + + return [ + "type" => $type, + "type_format" => $type_format, + "type_enum" => $type_enum, + "subtype" => $sub_type ]; +} - return $result; -}; +; -function parsePhpDoc($doc) { +function parsePhpDoc($doc): array|string|null { $cleanedDoc = preg_replace([ '/^\/\*\*/', // Remove opening /** '/\*\/$/', // Remove closing */ '/^\s*\*\s?/m' // Remove leading * on each line ], '', $doc); - $cleanedDoc = str_replace("\n", "
    ", $cleanedDoc); //markdown friendly line end - return $cleanedDoc; + //markdown friendly line end + return str_replace("\n", "
    ", $cleanedDoc); } @@ -80,7 +91,8 @@ function makeJsonApiHeader(): array { "default" => "https://jsonapi.org/profiles/ethanresnick/cursor-pagination" ] ] - ]]; + ] + ]; } // "links": { @@ -116,7 +128,8 @@ function makeLinks($uri): array { "default" => $self . "&page[before]=25" ] ] - ]]; + ] + ]; } //TODO relationship array is unnecessarily indexed in the swagger UI @@ -127,8 +140,7 @@ function makeRelationships($class, $uri): array { foreach ($relationshipsNames as $relationshipName) { $self = $uri . "/relationships/" . $relationshipName; $related = $uri . "/" . $relationshipName; - array_push($properties, - [ + $properties[] = [ "properties" => [ $relationshipName => [ "type" => "object", @@ -148,21 +160,21 @@ function makeRelationships($class, $uri): array { ] ] ] - + ] - ]); + ]; } return $properties; } function getTUSheader(): array { return [ - "description" => "Indicates the TUS version the server supports. + "description" => "Indicates the TUS version the server supports. Must always be set to `1.0.0` in compliant servers.", - "schema" => [ - "type" => "string", - "enum" => "enum: ['1.0.0']" - ] + "schema" => [ + "type" => "string", + "enum" => "enum: ['1.0.0']" + ] ]; } @@ -171,37 +183,34 @@ function makeExpandables($class, $container): array { $properties = []; $expandables = array_merge($class->getToOneRelationships(), $class->getToManyRelationships()); foreach ($expandables as $expand => $expandVal) { - $expandClass = $expandVal["relationType"]; - $expandApiClass = new ($container->get('classMapper')->get($expandClass))($container); - array_push($properties, - [ - "properties" => [ - "id" => [ - "type" => "integer" - ], - "type" => [ - "type" => "string", - "default" => $expand - ], - "attributes" => [ - "type" => "object", - "properties" => makeProperties($expandApiClass->getAliasedFeatures()) - ] - ] + $expandClass = $expandVal["relationType"]; + $expandApiClass = new ($container->get('classMapper')->get($expandClass))($container); + $properties[] = [ + "properties" => [ + "id" => [ + "type" => "integer" + ], + "type" => [ + "type" => "string", + "default" => $expand + ], + "attributes" => [ + "type" => "object", + "properties" => makeProperties($expandApiClass->getAliasedFeatures()) ] - ); + ] + ]; }; return $properties; } function mapToProperties($map): array { - $properties = []; - foreach ($map as $key => $value) { - $properties[$key] = [ - "type" => "string", - "default" => $value, + $properties = array_map(function ($value) { + return [ + "type" => "string", + "default" => $value, ]; - } + }, $map); return [ "type" => "array", "items" => [ @@ -211,7 +220,10 @@ function mapToProperties($map): array { ]; } -function makeProperties($features, $skipPK=false): array { +/** + * @throws HttpErrorException + */ +function makeProperties($features, $skipPK = false): array { $propertyVal = []; foreach ($features as $feature) { if ($skipPK && $feature['pk']) { @@ -230,24 +242,26 @@ function makeProperties($features, $skipPK=false): array { } } return $propertyVal; -}; +} -function buildPatchPost($properties, $name, $id=null): array { +; + +function buildPatchPost($properties, $name, $id = null): array { $result = ["data" => [ - "type" => "object", - "properties" => [ - "type" => [ - "type" => "string", - "default" => $name - ], - "attributes" => [ - "type" => "object", - "properties" => $properties - ] + "type" => "object", + "properties" => [ + "type" => [ + "type" => "string", + "default" => $name + ], + "attributes" => [ + "type" => "object", + "properties" => $properties ] - ] + ] + ] ]; - + if ($id) { $result["data"]["properties"]["id"] = [ "type" => "integer", @@ -259,28 +273,29 @@ function buildPatchPost($properties, $name, $id=null): array { /** * This function builds the post/patch attributes for a relationship. When $istomany is false, * it would build the attributes for a to one relationship. If it is true it will build it for a too many relationship. - * */ + * */ function buildPostPatchRelation($name, $isToMany): array { $resourceRecord = [ - "type" => "object", - "properties" => [ - "type" => [ - "type" => "string", - "default" => $name - ], - "id" => [ - "type" => "integer", - "default" => 1 - ] + "type" => "object", + "properties" => [ + "type" => [ + "type" => "string", + "default" => $name + ], + "id" => [ + "type" => "integer", + "default" => 1 ] + ] ]; if ($isToMany) { return ["data" => [ "type" => "array", - "items" => $resourceRecord - ] + "items" => $resourceRecord + ] ]; - } else { + } + else { return ["data" => $resourceRecord]; } } @@ -290,15 +305,18 @@ function makeDescription($isRelation, $method, $singleObject): string { switch ($method) { case "get": if ($isRelation) { - if($singleObject) { + if ($singleObject) { $description = "GET request for for a to-one relationship link. Returns the resource record of the object that is part of the specified relation."; - } else { + } + else { $description = "GET request for a to-many relationship link. Returns a list of resource records of objects that are part of the specified relation."; } - } else { + } + else { if ($singleObject) { $description = "GET request to retrieve a single object."; - } else { + } + else { $description = "GET many request to retrieve multiple objects."; } } @@ -306,25 +324,29 @@ function makeDescription($isRelation, $method, $singleObject): string { case "post": if ($isRelation) { if ($singleObject) { - "POST request to create a to-one relationship link."; - } else { - "POST request to create a to-many relationship link."; + $description = "POST request to create a to-one relationship link."; } - } else { - $description = "POST request to create a new object. The request must contain the resource record as data with the attributes of the new object." - . "To add relationships, a relationships object can be added with the resource records of the relations that are part of this object."; + else { + $description = "POST request to create a to-many relationship link."; } + } + else { + $description = "POST request to create a new object. The request must contain the resource record as data with the attributes of the new object." + . "To add relationships, a relationships object can be added with the resource records of the relations that are part of this object."; + } break; case "patch": if ($isRelation) { if ($singleObject) { - "PATCH request to update a to one relationship."; - } else { - "PATCH request to update a to-many relationship link."; + $description = "PATCH request to update a to one relationship."; } - } else { - $description = "PATCH request to update attributes of a single object." ; - } + else { + $description = "PATCH request to update a to-many relationship link."; + } + } + else { + $description = "PATCH request to update attributes of a single object."; + } } return $description; } @@ -334,11 +356,11 @@ function makeDescription($isRelation, $method, $singleObject): string { $group->options('', function (Request $request, Response $response): Response { return $response; }); - + $group->get('', function (Request $request, Response $response) use ($app): Response { /* Hold collection of all scopes discovered */ $all_scopes = []; - + $paths = []; $components["ListResponse"] = [ "type" => "object", @@ -412,34 +434,34 @@ function makeDescription($isRelation, $method, $singleObject): string { ] ] ]; - + /* Iterate over routes */ $routes = $app->getRouteCollector()->getRoutes(); foreach ($routes as $route) { - /* Quirck to receive className, since it is hidden in a protected variable */ + /* Quirk to receive className, since it is hidden in a protected variable */ $reflectionOfRoute = new \ReflectionObject($route); - $protectedCallable = $reflectionOfRoute->getProperty('callable'); + $protectedCallable = $reflectionOfRoute->getProperty('callable'); $protectedCallable->setAccessible(true); $reflectionCallable = ($protectedCallable->getValue($route)); - + /* Assume only one method per route call */ assert(sizeof($route->getMethods()) == 1, "More than 1 methods found for this route"); /* Path relative to basePath */ $path = $route->getPattern(); $method = strtolower($route->getMethods()[0]); - - if (is_string($reflectionCallable) == false) { + + if (!is_string($reflectionCallable)) { /* OPTIONS (CORS) have an function callable, ignore for now */ continue; } - + /* Retrieve parameters */ $explodedCallable = explode(':', $reflectionCallable); $apiClassName = $explodedCallable[0]; $apiMethod = $explodedCallable[1]; $class = new $apiClassName($app->getContainer()); - - if (!($class instanceof AbstractModelAPI)){ + + if (!($class instanceof AbstractModelAPI)) { $name = $class::class; $apiMethod = ($apiMethod == "processPost" && $name !== "ImportFileHelperAPI") ? "actionPost" : $apiMethod; $reflectionApiMethod = new ReflectionMethod($name, $apiMethod); @@ -451,7 +473,7 @@ function makeDescription($isRelation, $method, $singleObject): string { "type" => "object", "properties" => $properties, ]; - if($method == "post") { + if ($method == "post") { $reflectionMethodFormFields = new ReflectionMethod($name, "getFormFields"); $bodyDescription = parsePhpDoc($reflectionMethodFormFields->getDocComment()); $paths[$path][$method]["requestBody"] = [ @@ -460,11 +482,13 @@ function makeDescription($isRelation, $method, $singleObject): string { "content" => [ "application/json" => [ "schema" => [ - '$ref' => "#/components/schemas/" . $name + '$ref' => "#/components/schemas/" . $name ], - ] - ]]; - } elseif($method == "get") { + ] + ] + ]; + } + elseif ($method == "get") { $paths[$path][$method]["parameters"] = $class->getParamsSwagger(); } $request_response = $class->getResponse(); @@ -473,49 +497,52 @@ function makeDescription($isRelation, $method, $singleObject): string { $responseProperties = mapToProperties($request_response); $components[$name . "response"] = $responseProperties; $ref = "#/components/schemas/" . $name . "Response"; - } else if (is_string($request_response)) { + } + else if (is_string($request_response)) { $ref = "#/components/schemas/" . $request_response . "SingleResponse"; - } else if ($name == "ImportFileHelperAPI"){ + } + else if ($name == "ImportFileHelperAPI") { //ImportFileHelperAPI is hardcoded, because its different than other helpers. continue; } if (isset($ref)) { - $paths[$path][$method]["responses"]["200"] = [ - "description" => "successful operation", - "content" => [ - "application/json" => [ - "schema" => [ - '$ref' => $ref + $paths[$path][$method]["responses"]["200"] = [ + "description" => "successful operation", + "content" => [ + "application/json" => [ + "schema" => [ + '$ref' => $ref + ] ] ] - ] - ]; - } else { - $paths[$path][$method]["responses"]["200"] = [ - "description" => "successful operation", - ]; - } + ]; + } + else { + $paths[$path][$method]["responses"]["200"] = [ + "description" => "successful operation", + ]; + } continue; }; - + /* Quick to find out if single parameter object is used */ $singleObject = ((strstr($path, '/{id:')) !== false); $name = substr($class->getDBAClass(), 4); $uri = $class->getBaseUri(); - - $isRelation = (strstr($path , "/relationships/")) !== false; + + $isRelation = (strstr($path, "/relationships/")) !== false; if (str_contains($path, "relation:")) { $relation = rtrim(explode("relation:", $path)[1], "}"); $isToMany = array_key_exists($relation, $class::getToManyRelationships()); $isToOne = array_key_exists($relation, $class::getToOneRelationships()); assert(!($isToMany && $isToOne), "An relationship cant be a to one and to many at the same time."); } - + $expandables = implode(",", $class->getExpandables()); /** * Create component objects */ - if (array_key_exists($name, $components) == false) { + if (!array_key_exists($name, $components)) { $properties_return_post_patch = [ "data" => [ "type" => "array", @@ -525,7 +552,7 @@ function makeDescription($isRelation, $method, $singleObject): string { "id" => [ "type" => "integer", ], - "type" => [ + "type" => [ "type" => "string", "default" => $name ], @@ -537,23 +564,23 @@ function makeDescription($isRelation, $method, $singleObject): string { ] ] ]; - - $relationships = ["relationships" =>[ + + $relationships = ["relationships" => [ "type" => "object", "properties" => makeRelationships($class, $uri) ] ]; - $included = ["included" => [ + $included = ["included" => [ "type" => "array", "items" => [ "type" => "object", "properties" => makeExpandables($class, $app->getContainer()) ], - ] + ] ]; - + $properties_get_single = array_merge($properties_return_post_patch, $relationships, $included); - + $json_api_header = makeJsonApiHeader(); $links = makeLinks($uri); $properties_return_post_patch = array_merge($json_api_header, $properties_return_post_patch); @@ -562,13 +589,13 @@ function makeDescription($isRelation, $method, $singleObject): string { $properties_patch = buildPatchPost(makeProperties($class->getPatchValidFeatures(), true), $name); $properties_patch_post_relation = buildPostPatchRelation($relation, ($isToMany && !$isToOne)); $responseGetRelation = $properties_patch_post_relation; - + $components[$name . "Create"] = [ "type" => "object", "properties" => $properties_create, ]; - + $components[$name . "Patch"] = [ "type" => "object", @@ -581,30 +608,30 @@ function makeDescription($isRelation, $method, $singleObject): string { "properties" => $properties_get, ]; - $components[$name . "Relation" . ucfirst($relation)] = + $components[$name . "Relation" . ucfirst($relation)] = [ "type" => "object", "properties" => $properties_patch_post_relation, ]; - + $components[$name . "Relation" . ucfirst($relation) . "GetResponse"] = - [ - "type" => "object", - "properties" => $responseGetRelation - ]; - + [ + "type" => "object", + "properties" => $responseGetRelation + ]; + $components[$name . "SingleResponse"] = [ "type" => "object", "properties" => $properties_get_single ]; - + $components[$name . "PostPatchResponse"] = [ "type" => "object", "properties" => $properties_return_post_patch ]; - + $components[$name . "ListResponse"] = [ "allOf" => [ @@ -625,21 +652,21 @@ function makeDescription($isRelation, $method, $singleObject): string { ] ]; } - + /** * Create path objects */ - + /* Determine the scopes required for the call */ $required_scopes = $class->getRequiredPermissions($method); array_push($all_scopes, ...$required_scopes); - + $paths[$path][$method] = [ "tags" => [ $name . 's' ], "responses" => [ - + "400" => [ "description" => "Invalid request", "content" => [ @@ -668,30 +695,30 @@ function makeDescription($isRelation, $method, $singleObject): string { ] ] ] - ]; - + ]; + $paths[$path][$method]["description"] = makeDescription($isRelation, $method, $singleObject); - + if ($isRelation && in_array($method, ["post", "patch", "delete"], true)) { - $paths[$path][$method]["responses"]["204"] = - [ - "description" => "Succesfull operation" - ]; + $paths[$path][$method]["responses"]["204"] = + [ + "description" => "Successfull operation" + ]; } if ($singleObject) { /* Single objects could not exists */ $paths[$path][$method]["responses"]["404"] = - [ - "description" => "Not Found", - "content" => [ - "application/json" => [ - "schema" => [ - '$ref' => "#/components/schemas/NotFoundResponse" + [ + "description" => "Not Found", + "content" => [ + "application/json" => [ + "schema" => [ + '$ref' => "#/components/schemas/NotFoundResponse" + ] ] ] - ] - ]; - + ]; + /* Method specific responses and requests for single objects */ if ($method == 'get') { if (!$isRelation && str_contains($path, "relation:")) { @@ -701,12 +728,13 @@ function makeDescription($isRelation, $method, $singleObject): string { "application/json" => [ "schema" => [ '$ref' => "#/components/schemas/" . $name . "Relation" . ucfirst($relation) . "GetResponse" - + ] ] ] ]; - } else { + } + else { $paths[$path][$method]["responses"]["200"] = [ "description" => "successful operation", "content" => [ @@ -718,7 +746,7 @@ function makeDescription($isRelation, $method, $singleObject): string { ] ]; } - + /* Supported by client, not by browser, disabled for APIdocs */ // /* JSON object required */ // $paths[$path][$method]["requestBody"] = [ @@ -730,8 +758,9 @@ function makeDescription($isRelation, $method, $singleObject): string { // ], // ], // ]]; - - } elseif ($method == 'patch') { + + } + elseif ($method == 'patch') { if ($isRelation) { $paths[$path][$method]["requestBody"] = [ "required" => true, @@ -740,9 +769,11 @@ function makeDescription($isRelation, $method, $singleObject): string { "schema" => [ '$ref' => "#/components/schemas/" . $name . "Relation" . ucfirst($relation) ], - ], - ]]; - } else { + ], + ] + ]; + } + else { $paths[$path][$method]["requestBody"] = [ "required" => true, "content" => [ @@ -750,25 +781,27 @@ function makeDescription($isRelation, $method, $singleObject): string { "schema" => [ '$ref' => "#/components/schemas/" . $name . "Patch" ], - ], - ]]; - - $paths[$path][$method]["responses"]["200"] = [ - "description" => "successful operation", - "content" => [ - "application/json" => [ - "schema" => [ - '$ref' => "#/components/schemas/" . $name . "PostPatchResponse" + ], + ] + ]; + + $paths[$path][$method]["responses"]["200"] = [ + "description" => "successful operation", + "content" => [ + "application/json" => [ + "schema" => [ + '$ref' => "#/components/schemas/" . $name . "PostPatchResponse" + ] ] ] - ] - ]; + ]; } - } elseif ($method == 'delete') { + } + elseif ($method == 'delete') { $paths[$path][$method]["responses"]["204"] = [ "description" => "successfully deleted", ]; - + if ($isRelation) { $paths[$path][$method]["requestBody"] = [ "required" => true, @@ -777,31 +810,38 @@ function makeDescription($isRelation, $method, $singleObject): string { "schema" => [ '$ref' => "#/components/schemas/" . $name . "Relation" . ucfirst($relation) ], - ], - ]]; - } else { + ], + ] + ]; + } + else { /* Empty JSON object required */ $paths[$path][$method]["requestBody"] = [ "required" => true, "content" => [ - "application/json" => [], - ]]; + "application/json" => [], + ] + ]; } - } elseif ($method == 'post') { + } + elseif ($method == 'post') { $paths[$path][$method]["responses"]["204"] = [ "description" => "successfully created", ]; - - /* Empty JSON object required */ - $paths[$path][$method]["requestBody"] = [ - "required" => true, - "content" => [ - "application/json" => [], - ]]; - } else { + + /* Empty JSON object required */ + $paths[$path][$method]["requestBody"] = [ + "required" => true, + "content" => [ + "application/json" => [], + ] + ]; + } + else { throw new HttpErrorException("Method '$method' not implemented"); } - } else { + } + else { /* Model API entry point */ if ($method == 'get') { $paths[$path][$method]["responses"]["200"] = [ @@ -816,8 +856,8 @@ function makeDescription($isRelation, $method, $singleObject): string { ] ] ] - ]; - + ]; + /* Supported by client, not by browser, disabled for APIdocs */ // $paths[$path][$method]["requestBody"] = [ // "content" => [ @@ -827,9 +867,10 @@ function makeDescription($isRelation, $method, $singleObject): string { // ], // ] // ]]; - - - } elseif ($method == 'post') { + + + } + elseif ($method == 'post') { $paths[$path][$method]["responses"]["201"] = [ "description" => "successful operation", "content" => [ @@ -840,7 +881,7 @@ function makeDescription($isRelation, $method, $singleObject): string { ] ] ]; - + if ($isRelation) { $paths[$path][$method]["requestBody"] = [ "required" => true, @@ -849,9 +890,11 @@ function makeDescription($isRelation, $method, $singleObject): string { "schema" => [ '$ref' => "#/components/schemas/" . $name . "Relation" . ucfirst($relation) ], - ], - ]]; - } else { + ], + ] + ]; + } + else { $paths[$path][$method]["requestBody"] = [ "required" => true, "content" => [ @@ -859,20 +902,23 @@ function makeDescription($isRelation, $method, $singleObject): string { "schema" => [ '$ref' => "#/components/schemas/" . $name . "Create" ], - ] - ]]; + ] + ] + ]; } - - } elseif ($method == 'patch') { + + } + elseif ($method == 'patch') { // TODO add patch many here - } elseif ($method == 'delete') { + } + elseif ($method == 'delete') { // TODO add delete many here } - else { + else { throw new HttpErrorException("Method '$method' not implemented"); } } - + if ($singleObject && $method == 'get') { $parameters = [ [ @@ -884,20 +930,21 @@ function makeDescription($isRelation, $method, $singleObject): string { "format" => "int32", "example" => 10, ] - ]]; - - if ($method == 'get' && !str_contains($path, "relation:")){ - array_push($parameters, - [ + ] + ]; + + if (!str_contains($path, "relation:")) { + $parameters[] = [ "name" => "include", "in" => "query", "schema" => [ "type" => "string" ], "description" => "Items to include. Comma seperated" - ]); + ]; }; - } else { + } + else { if ($method == 'get') { $parameters = [ [ @@ -939,7 +986,7 @@ function makeDescription($isRelation, $method, $singleObject): string { "type" => "object", ], "description" => "Filters results using a query", - "example" => '"filter[hashlistId__gt]": 200' + "example" => '"filter[hashlistId__gt]": 200' ], [ "name" => "include", @@ -950,14 +997,15 @@ function makeDescription($isRelation, $method, $singleObject): string { "description" => "Items to include, comma seperated. Possible options: " . $expandables ] ]; - } else { + } + else { $parameters = []; } } $paths[$path][$method]["parameters"] = $parameters; }; - - /** + + /** * Build static entries */ $paths["/api/v2/auth/token"] = [ @@ -966,14 +1014,14 @@ function makeDescription($isRelation, $method, $singleObject): string { "Login" ], "requestBody" => [ - "required" => true, - "content" => [ - "application/json" =>[ - "schema" => [ - '$ref' => "#/components/schemas/TokenRequest" - ] + "required" => true, + "content" => [ + "application/json" => [ + "schema" => [ + '$ref' => "#/components/schemas/TokenRequest" ] ] + ] ], "responses" => [ "200" => [ @@ -1014,7 +1062,7 @@ function makeDescription($isRelation, $method, $singleObject): string { ] ] ]; - + $components["Token"] = [ "type" => "object", "properties" => [ @@ -1034,7 +1082,7 @@ function makeDescription($isRelation, $method, $singleObject): string { "example" => "role.all" ] ]; - + $components["ObjectRequest"] = [ "type" => "object", "properties" => [ @@ -1047,7 +1095,7 @@ function makeDescription($isRelation, $method, $singleObject): string { ], "additionalProperties" => false ]; - + $components["ObjectListRequest"] = [ "type" => "object", "properties" => [ @@ -1102,7 +1150,7 @@ function makeDescription($isRelation, $method, $singleObject): string { Value must be `1`. If present, `Upload-Length` must be omitted." ] ]; - + $paths["/api/v2/helper/importFile/{id:[0-9]{14}-[0-9a-f]{32}}"]["patch"]["parameters"] = [ [ "name" => "Upload-Offset", @@ -1138,9 +1186,9 @@ function makeDescription($isRelation, $method, $singleObject): string { ] ] ]; - + $paths["/api/v2/helper/importFile/{id:[0-9]{14}-[0-9a-f]{32}}"]["head"]["responses"]["200"] = [ - "description" => "sucessful request", + "description" => "successful request", "headers" => [ "Tus-Resumable" => getTUSheader(), "Upload-Offset" => [ @@ -1169,9 +1217,9 @@ function makeDescription($isRelation, $method, $singleObject): string { ] ] ]; - + $paths["/api/v2/helper/importFile"]["post"]["responses"]["201"] = [ - "description" => "succesful operation", + "description" => "successful operation", "headers" => [ "Tus-Resumable" => getTUSheader(), "Location" => [ @@ -1235,10 +1283,10 @@ function makeDescription($isRelation, $method, $singleObject): string { ] ], ]; - + $body = $response->getBody(); $body->write(json_encode($result, JSON_UNESCAPED_SLASHES | JSON_PRETTY_PRINT | JSON_THROW_ON_ERROR)); - + return $response->withStatus(200) ->withHeader("Content-Type", "application/json"); }); diff --git a/src/inc/apiv2/helper/abortChunk.routes.php b/src/inc/apiv2/helper/abortChunk.routes.php index f43202e10..d2e006ba0 100644 --- a/src/inc/apiv2/helper/abortChunk.routes.php +++ b/src/inc/apiv2/helper/abortChunk.routes.php @@ -1,4 +1,5 @@ ['type' => 'int'] ]; } - + public static function getResponse(): array { return ["Abort" => "Success"]; } - + /** * Endpoint to stop a running chunk. + * @throws HTException */ public function actionPost(array $data): object|array|null { $chunk = self::getChunk($data[Chunk::CHUNK_ID]); TaskUtils::abortChunk($chunk->getId(), $this->getCurrentUser()); return self::getResponse(); - } + } } AbortChunkHelperAPI::register($app); \ No newline at end of file diff --git a/src/inc/apiv2/helper/assignAgent.routes.php b/src/inc/apiv2/helper/assignAgent.routes.php index c8d9f8985..df227afff 100644 --- a/src/inc/apiv2/helper/assignAgent.routes.php +++ b/src/inc/apiv2/helper/assignAgent.routes.php @@ -29,13 +29,14 @@ public function getFormFields(): array { Task::TASK_ID => ["type" => "int"], ]; } - + public static function getResponse(): array { return ["Assign" => "Success"]; } /** * This endpoint is responsible for assigning a task to a specific agent. + * @throws HTException */ public function actionPost($data): object|array|null { AgentUtils::assign($data[Agent::AGENT_ID], $data[Task::TASK_ID], $this->getCurrentUser()); diff --git a/src/inc/apiv2/helper/changeOwnPassword.routes.php b/src/inc/apiv2/helper/changeOwnPassword.routes.php index 49885c298..aae4747e2 100644 --- a/src/inc/apiv2/helper/changeOwnPassword.routes.php +++ b/src/inc/apiv2/helper/changeOwnPassword.routes.php @@ -1,8 +1,4 @@ ["type" => "str"], "newPassword" => ["type" => "str"], "confirmPassword" => ["type" => "str"] ]; } - + public static function getResponse(): array { return ["Change password" => "Password succesfully updated!"]; } - + /** * Endpoint to set a password of an user. + * @throws HTException */ public function actionPost($data): object|array|null { $user = $this->getCurrentUser(); - + /* Set user password if provided */ - UserUtils::changePassword($user,$data["oldPassword"], $data["newPassword"],$data["confirmPassword"] ); + UserUtils::changePassword($user, $data["oldPassword"], $data["newPassword"], $data["confirmPassword"]); return $this->getResponse(); } } diff --git a/src/inc/apiv2/helper/createSuperHashlist.routes.php b/src/inc/apiv2/helper/createSuperHashlist.routes.php index b40247fad..6aedd4b64 100644 --- a/src/inc/apiv2/helper/createSuperHashlist.routes.php +++ b/src/inc/apiv2/helper/createSuperHashlist.routes.php @@ -1,13 +1,10 @@ ["type" => "array", "subtype" => "int"], "name" => ["type" => "str"], ]; } - + public static function getResponse(): string { return "Hashlist"; } - + /** * Endpoint to create a super hashlist from multiple hashlists + * @throws HTException */ public function actionPost($data): object|array|null { /* Validate incoming hashlists */ $hashlistIds = []; - foreach($data["hashlistIds"] as $hashlistId) { - array_push($hashlistIds, self::getHashlist($hashlistId)->getId()); + foreach ($data["hashlistIds"] as $hashlistId) { + $hashlistIds[] = self::getHashlist($hashlistId)->getId(); } - + /* Execute helper */ HashlistUtils::createSuperhashlist($hashlistIds, $data["name"], $this->getCurrentUser()); - + /* Quick to retrieve newly created SuperHashlist (which is of type Hashlist) */ $qFs = [ - new QueryFilter(Hashlist::FORMAT, DHashlistFormat::SUPERHASHLIST, "=") + new QueryFilter(Hashlist::FORMAT, DHashlistFormat::SUPERHASHLIST, "=") ]; - $oF = new OrderFilter(Hashlist::HASHLIST_ID, "DESC"); + $oF = new OrderFilter(Hashlist::HASHLIST_ID, "DESC"); $objects = self::getModelFactory(Hashlist::class)->filter([Factory::FILTER => $qFs, Factory::ORDER => $oF]); assert(count($objects) > 0); - - /* TODO: Make it bit more transparant and auto-expands hashlists by default */ + + /* TODO: Make it bit more transparent and auto-expands hashlists by default */ return $objects[0]; - + } -} +} CreateSuperHashlistHelperAPI::register($app); \ No newline at end of file diff --git a/src/inc/apiv2/helper/createSupertask.routes.php b/src/inc/apiv2/helper/createSupertask.routes.php index 7ff977c45..554453073 100644 --- a/src/inc/apiv2/helper/createSupertask.routes.php +++ b/src/inc/apiv2/helper/createSupertask.routes.php @@ -1,4 +1,5 @@ ["type" => "int"], Hashlist::HASHLIST_ID => ["type" => "int"], "crackerVersionId" => ["type" => "int"], ]; } - + public static function getResponse(): string { return "TaskWrapper"; } - + /** * Endpoint to create a supertask from a supertask template + * @throws HTException */ public function actionPost($data): object|array|null { $supertaskTemplate = self::getSupertask($data["supertaskTemplateId"]); $hashlist = self::getHashlist($data[Hashlist::HASHLIST_ID]); $crackerBinary = self::getCrackerBinary($data["crackerVersionId"]); - + SupertaskUtils::runSupertask( - $supertaskTemplate->getId(), - $hashlist->getId(), - $crackerBinary->getId() + $supertaskTemplate->getId(), + $hashlist->getId(), + $crackerBinary->getId() ); - + /* Quick to retrieve newly created TaskWrapper */ $qFs = [ - new QueryFilter(TaskWrapper::HASHLIST_ID, $hashlist->getId(), "="), - new QueryFilter(TaskWrapper::TASK_TYPE, DTaskTypes::SUPERTASK, "=") + new QueryFilter(TaskWrapper::HASHLIST_ID, $hashlist->getId(), "="), + new QueryFilter(TaskWrapper::TASK_TYPE, DTaskTypes::SUPERTASK, "=") ]; $oF = new OrderFilter(TaskWrapper::TASK_WRAPPER_ID, "DESC"); $objects = self::getModelFactory(TaskWrapper::class)->filter([Factory::FILTER => $qFs, Factory::ORDER => $oF]); assert(count($objects) > 0); - + return $objects[0]; } -} +} CreateSupertaskHelperAPI::register($app); \ No newline at end of file diff --git a/src/inc/apiv2/helper/exportCrackedHashes.routes.php b/src/inc/apiv2/helper/exportCrackedHashes.routes.php index 428bce475..c47de569a 100644 --- a/src/inc/apiv2/helper/exportCrackedHashes.routes.php +++ b/src/inc/apiv2/helper/exportCrackedHashes.routes.php @@ -1,4 +1,5 @@ ["type" => "int"], ]; } - + public static function getResponse(): string { return "File"; } - + /** * Endpoint to export cracked hashes. + * @throws HTException */ public function actionPost($data): object|array|null { $hashlist = self::getHashlist($data[Hashlist::HASHLIST_ID]); - $file = HashlistUtils::export($hashlist->getId(), $this->getCurrentUser()); - return $file; + return HashlistUtils::export($hashlist->getId(), $this->getCurrentUser()); } } diff --git a/src/inc/apiv2/helper/exportLeftHashes.routes.php b/src/inc/apiv2/helper/exportLeftHashes.routes.php index cddfa0a5d..1f292c5c0 100644 --- a/src/inc/apiv2/helper/exportLeftHashes.routes.php +++ b/src/inc/apiv2/helper/exportLeftHashes.routes.php @@ -1,4 +1,5 @@ ["type" => "int"], ]; } - + public static function getResponse(): string { return "File"; } - + /** * Endpoint to export uncracked hashes of a hashlist. + * @throws HTException */ public function actionPost($data): object|array|null { $hashlist = self::getHashlist($data[Hashlist::HASHLIST_ID]); - $file = HashlistUtils::leftlist($hashlist->getId(), $this->getCurrentUser()); - - return $file; + return HashlistUtils::leftlist($hashlist->getId(), $this->getCurrentUser()); } } diff --git a/src/inc/apiv2/helper/exportWordlist.routes.php b/src/inc/apiv2/helper/exportWordlist.routes.php index 9d24b184b..984e22b72 100644 --- a/src/inc/apiv2/helper/exportWordlist.routes.php +++ b/src/inc/apiv2/helper/exportWordlist.routes.php @@ -1,4 +1,5 @@ ["type" => "int"], ]; } - + public static function getResponse(): string { return "File"; } - + /** * Endpoint to export a wordlist of the cracked hashes inside a hashlist. + * @throws HTException */ public function actionPost($data): object|array|null { $hashlist = self::getHashlist($data[Hashlist::HASHLIST_ID]); diff --git a/src/inc/apiv2/helper/getAccessGroups.routes.php b/src/inc/apiv2/helper/getAccessGroups.routes.php index 4ae842aeb..5d2657ea1 100644 --- a/src/inc/apiv2/helper/getAccessGroups.routes.php +++ b/src/inc/apiv2/helper/getAccessGroups.routes.php @@ -1,5 +1,8 @@ preCommon($request); $user = $this->getCurrentUser(); @@ -31,7 +39,7 @@ public function handleGet(Request $request, Response $response): Response { $accessGroups = AccessUtils::getAccessGroupsOfUser($user); $converted = []; - foreach($accessGroups as $accessGroup) { + foreach ($accessGroups as $accessGroup) { $converted[] = self::obj2Resource($accessGroup); } $ret = self::createJsonResponse(data: $converted); @@ -42,8 +50,12 @@ public function handleGet(Request $request, Response $response): Response { return $response->withStatus(200) ->withHeader("Content-Type", 'application/vnd.api+json;'); } - - public function actionPost($data): object|array|null { + + /** + * @param $data + * @return object|array|null + */ + #[NoReturn] public function actionPost($data): object|array|null { assert(False, "GetAccessGroups has no POST"); } diff --git a/src/inc/apiv2/helper/getFile.routes.php b/src/inc/apiv2/helper/getFile.routes.php index ee696bc13..21b8a7fdf 100644 --- a/src/inc/apiv2/helper/getFile.routes.php +++ b/src/inc/apiv2/helper/getFile.routes.php @@ -1,5 +1,7 @@ "query", - "name" => "file", - "schema" => [ - "type" => "integer", - "format" => "int32" - ], - "required" => true, - "example" => 1, - "description" => "The ID of the file to download." - ] + "in" => "query", + "name" => "file", + "schema" => [ + "type" => "integer", + "format" => "int32" + ], + "required" => true, + "example" => 1, + "description" => "The ID of the file to download." + ] ]; } - + /** * Endpoint to download files + * @param Request $request + * @param Response $response + * @return Response + * @throws HTException + * @throws HttpErrorException + * @throws HttpForbidden */ public function handleGet(Request $request, Response $response): Response { $this->preCommon($request); @@ -135,56 +145,58 @@ public function handleGet(Request $request, Response $response): Response { if ($fileParam == null) { throw new HttpErrorException("No File query param has been provided"); } - $file_id = intval($fileParam); - + $file_id = intval($fileParam); + $filename = $this->validateFile($request, $file_id); - - $size = Util::filesize($filename); + + $size = Util::filesize($filename); $lastModified = filemtime($filename); - + $etag = md5($lastModified . $size); $ifNoneMatch = $request->getHeaderLine('If-None-Match'); if ($ifNoneMatch === $etag) { - return $response->withStatus(304); + return $response->withStatus(304); } - + $exp = explode(".", $filename); if ($exp[sizeof($exp) - 1] == '7z') { $contentType = "application/x-7z-compressed"; - } else { + } + else { $contentType = "application/force-download"; } $fp = @fopen($filename, "rb"); - + if (!$fp) { throw new HttpForbiddenException($request, "Can't open the file"); } - + $start = 0; // Start byte $end = $size - 1; // End byte - + $status = 200; if (isset($_SERVER['HTTP_RANGE'])) { - if(!$this->handleRangeRequest($start, $end, $size, $fp)) { + if (!$this->handleRangeRequest($start, $end, $size, $fp)) { fclose($fp); return $response->withStatus(416) - ->withHeader("Content-Range", "bytes $start-$end/$size"); - } else { + ->withHeader("Content-Range", "bytes $start-$end/$size"); + } + else { $status = 206; } } - + $length = $end - $start + 1; //content-length $buffer = 1024 * 100; $stream = $response->getBody(); while (!feof($fp) && ($p = ftell($fp)) <= $end) { if ($p + $buffer > $end) { - $buffer = $end - $p + 1; + $buffer = $end - $p + 1; } - $stream->write(fread($fp, $buffer)); + $stream->write(fread($fp, $buffer)); } fclose($fp); - + return $response->withStatus($status) ->withHeader("Content-Type", $contentType) ->withHeader("Content-Description", $filename) @@ -194,11 +206,10 @@ public function handleGet(Request $request, Response $response): Response { ->withHeader("Content-Length", $length) ->withHeader("ETag", $etag); } - - static public function register($app): void - { + + static public function register($app): void { $baseUri = GetFileHelperAPI::getBaseUri(); - + /* Allow CORS preflight requests */ $app->options($baseUri, function (Request $request, Response $response): Response { return $response; diff --git a/src/inc/apiv2/helper/getUserPermission.routes.php b/src/inc/apiv2/helper/getUserPermission.routes.php index 07a06735c..6de07efba 100644 --- a/src/inc/apiv2/helper/getUserPermission.routes.php +++ b/src/inc/apiv2/helper/getUserPermission.routes.php @@ -1,6 +1,9 @@ preCommon($request); $user = $this->getCurrentUser(); @@ -39,8 +47,8 @@ public function handleGet(Request $request, Response $response): Response { return $response->withStatus(200) ->withHeader("Content-Type", 'application/vnd.api+json;'); } - - public function actionPost($data): object|array|null { + + #[NoReturn] public function actionPost($data): object|array|null { assert(False, "GetAccessGroups has no POST"); } diff --git a/src/inc/apiv2/helper/importCrackedHashes.routes.php b/src/inc/apiv2/helper/importCrackedHashes.routes.php index 19f25017c..2248d5512 100644 --- a/src/inc/apiv2/helper/importCrackedHashes.routes.php +++ b/src/inc/apiv2/helper/importCrackedHashes.routes.php @@ -30,7 +30,7 @@ public function getFormFields(): array { "separator" => ['type' => 'str'], ]; } - + public static function getResponse(): array { return [ "totalLines" => 100, @@ -45,6 +45,7 @@ public static function getResponse(): array { /** * Endpoint to import cracked hashes into a hashlist. + * @throws HTException */ public function actionPost($data): object|array|null { $hashlist = self::getHashlist($data[Hashlist::HASHLIST_ID]); diff --git a/src/inc/apiv2/helper/importFile.routes.php b/src/inc/apiv2/helper/importFile.routes.php index e6f3971e7..da74b472a 100644 --- a/src/inc/apiv2/helper/importFile.routes.php +++ b/src/inc/apiv2/helper/importFile.routes.php @@ -3,10 +3,12 @@ use Psr\Http\Message\ResponseInterface as Response; use Psr\Http\Message\ServerRequestInterface as Request; +use Random\RandomException; use Slim\Routing\RouteCollectorProxy; use DBA\Factory; + /* Default timeout interval for considering an upload stale/incomplete */ -define('DEFAULT_UPLOAD_EXPIRES_TIMEOUT', 3600); +const DEFAULT_UPLOAD_EXPIRES_TIMEOUT = 3600; require_once(dirname(__FILE__) . "/../../load.php"); require_once(dirname(__FILE__) . "/../common/AbstractHelperAPI.class.php"); @@ -24,24 +26,23 @@ * 4) Server check if upload is completed * - Checked if not present yet (import/) * - Marks file and stores as import/ - */ + */ + class ImportFileHelperAPI extends AbstractHelperAPI { public static function getBaseUri(): string { return "/api/v2/helper/importFile"; } - + public function getRequiredPermissions(string $method): array { return []; } - + static function getUploadPath(string $id): string { - $filename = "/tmp/" . $id . '.part'; - return $filename; + return "/tmp/" . $id . '.part'; } - + static function getMetaPath(string $id): string { - $filename = "/tmp/" . $id . '.meta'; - return $filename; + return "/tmp/" . $id . '.meta'; } /** @@ -50,40 +51,36 @@ static function getMetaPath(string $id): string { public function getFormFields(): array { return []; } - - + + static function getImportPath(string $id): string { - $filename = Factory::getStoredValueFactory()->get(DDirectories::IMPORT)->getVal() . "/" . $id; - return $filename; + return Factory::getStoredValueFactory()->get(DDirectories::IMPORT)->getVal() . "/" . $id; } - + static function getChecksumAlgorithm(): array { - return ['md5', 'sha1' ,'crc32']; + return ['md5', 'sha1', 'crc32']; } - - - /* Database quick for temponary storage during upload */ + + + /* Database quick for temporary storage during upload */ static function getMetaStorage(string $id): array { $metaPath = self::getMetaPath($id); - $ds = file_exists($metaPath) ? (array)json_decode(file_get_contents($metaPath), true) : array(); - - return $ds; + return file_exists($metaPath) ? (array)json_decode(file_get_contents($metaPath), true) : array(); } - + static function updateStorage(string $id, array $update): void { $ds = self::getMetaStorage($id); - + $newDs = $update + $ds; $metaPath = self::getMetaPath($id); file_put_contents($metaPath, json_encode($newDs)); } - - //register is overriden so no actionPost needed - function actionPost(array $data): object|array|null - { + + //register is overridden so no actionPost needed + function actionPost(array $data): object|array|null { return null; } - + /** * A HEAD request is used in the TUS protocol to determine the offset at which the upload should be continued. * And to retrieve the upload status. @@ -93,62 +90,59 @@ function processHead(Request $request, Response $response, array $args): Respons $filename = self::getUploadPath($args['id']); $currentSize = filesize($filename); $ds = self::getMetaStorage($args['id']); - + $newResponse = $response->withStatus(200) ->withHeader("Cache-Control", "no-store") - ->withHeader("Upload-Offset", strval($currentSize)) - ->withHeader("Access-Control-Expose-Headers", "Cache-Control, Upload-Offset") - ; + ->withHeader("Upload-Offset", strval($currentSize)) + ->withHeader("Access-Control-Expose-Headers", "Cache-Control, Upload-Offset"); if (array_key_exists("upload_metadata_raw", $ds)) { $cors_headers = $newResponse->getHeaderLine("Access-Control-Expose-Headers"); $newResponse2 = $newResponse ->withHeader("Upload-Metadata", $ds["upload_metadata_raw"]) - ->withHeader("Access-Control-Expose-Headers", $cors_headers . ", Upload-Metadata") - ; - } else { + ->withHeader("Access-Control-Expose-Headers", $cors_headers . ", Upload-Metadata"); + } + else { $newResponse2 = $newResponse; } - + + $cors_headers = $newResponse->getHeaderLine("Access-Control-Expose-Headers"); if ($ds["upload_defer_length"] === true) { - $cors_headers = $newResponse->getHeaderLine("Access-Control-Expose-Headers"); return $newResponse2 ->withHeader("Upload-Defer-Length", "1") - ->withHeader("Access-Control-Expose-Headers", $cors_headers . ", Upload-Defer-Length") - ; - } else { - $cors_headers = $newResponse->getHeaderLine("Access-Control-Expose-Headers"); + ->withHeader("Access-Control-Expose-Headers", $cors_headers . ", Upload-Defer-Length"); + } + else { return $newResponse2 ->withHeader("Upload-Length", strval($ds["upload_length"])) - ->withHeader("Access-Control-Expose-Headers", $cors_headers . ", Upload-Length") - ; + ->withHeader("Access-Control-Expose-Headers", $cors_headers . ", Upload-Length"); } } - + /** * getfile is different because it returns actual binary data. */ public static function getResponse(): null { return null; } - + /** File import API - * Based on TUS protocol: https://tus.io/protocols/resumable-upload.html - * - * 1) Client 'Announce' file at ./api/v2/helper/importFile' - * - Ensure Upload-Metadata: filename= base64-encoded-filename is set - * 2) Server checks filename does not exists yet: - * - Checked not part of ongoing transfer (.part / .metatadata in import directory) - * - Checked not uploaded yet (import/) - * If all conditions are met, upload is created and user informed about UUID to push to. - * 3) Client pushes parts to ./api/v2/ui/files/ - * - Checked if upload timeout is not expired - * 4) Server check if upload is completed - * - Checked if not present yet (import/) - * - Marks file and stores as import/ - */ - function processPost(Request $request, Response $response, array $args): Response - { + * Based on TUS protocol: https://tus.io/protocols/resumable-upload.html + * + * 1) Client 'Announce' file at ./api/v2/helper/importFile' + * - Ensure Upload-Metadata: filename= base64-encoded-filename is set + * 2) Server checks filename does not exists yet: + * - Checked not part of ongoing transfer (.part / .metatadata in import directory) + * - Checked not uploaded yet (import/) + * If all conditions are met, upload is created and user informed about UUID to push to. + * 3) Client pushes parts to ./api/v2/ui/files/ + * - Checked if upload timeout is not expired + * 4) Server check if upload is completed + * - Checked if not present yet (import/) + * - Marks file and stores as import/ + * @throws RandomException + */ + function processPost(Request $request, Response $response, array $args): Response { $update = []; if ($request->hasHeader('Upload-Metadata')) { $update["upload_metadata_raw"] = $request->getHeader('Upload-Metadata')[0]; @@ -156,7 +150,7 @@ function processPost(Request $request, Response $response, array $args): Respons $response->getBody()->write('Error Upload-Metadata contains non-ASCII characters'); return $response->withStatus(400); } - + $update_metadata = []; $list = explode(",", $update["upload_metadata_raw"]); foreach ($list as $item) { @@ -173,20 +167,22 @@ function processPost(Request $request, Response $response, array $args): Respons $filename = $update_metadata['filename']; /* Generate unique upload identifier */ $id = date("YmdHis") . "-" . md5($filename); - if ((file_exists(self::getImportPath($filename))) || - (file_exists(self::getUploadPath($id)))) { - $response->getBody()->write("Error filename '$filename' already exists!"); - return $response->withStatus(400); - } - } else { + if ((file_exists(self::getImportPath($filename))) || + (file_exists(self::getUploadPath($id)))) { + $response->getBody()->write("Error filename '$filename' already exists!"); + return $response->withStatus(400); + } + } + else { $id = bin2hex(random_bytes(16)); } $update["upload_metadata"] = $update_metadata; - + if ($request->hasHeader('Upload-Defer-Length')) { if ($request->getHeader('Upload-Defer-Length')[0] == "1") { $update["upload_defer_length"] = true; - } else { + } + else { $response->getBody()->write('Invalid Upload-Defer-Length value (choices: 1)'); return $response->withStatus(400); } @@ -195,54 +191,55 @@ function processPost(Request $request, Response $response, array $args): Respons $update["upload_length"] = intval($request->getHeader('Upload-Length')[0]); $update["upload_defer_length"] = false; } - - /* Give user fix amount of time to upload file, before temponary files are removed */ + + /* Give user fix amount of time to upload file, before temporary files are removed */ $update["upload_expires"] = (new DateTime())->getTimestamp() + DEFAULT_UPLOAD_EXPIRES_TIMEOUT; - + self::updateStorage($id, $update); file_put_contents(self::getUploadPath($id), ''); - + // TODO: Hash of filename and/or check if similar named file already exists return $response->withStatus(201) ->withHeader("Location", "/api/v2/helper/importFile/$id") ->withHeader('Tus-Resumable', '1.0.0') ->withHeader('Access-Control-Expose-Headers', 'Location, Tus-Resumable'); } - + /** * Given the offset in the 'Upload Offset' header, the user can use this PATCH endpoint in order to resume the upload. */ function processPatch(Request $request, Response $response, array $args): Response { // Check for Content-Type: application/offset+octet-stream or return 415 - if (($request->hasHeader('Content-Type') == false) || - ($request->getHeader('Content-Type')[0] != "application/offset+octet-stream")) { + if (!$request->hasHeader('Content-Type') || + ($request->getHeader('Content-Type')[0] != "application/offset+octet-stream")) { $response->getBody()->write('Unsupported Media Type'); return $response->withStatus(415); } - + /* Return 404 if entry is not found */ $filename = self::getUploadPath($args['id']); if (file_exists($filename) === false) { // TODO: Maybe 410 if actual file still exists and meta file also exists? $response->getBody()->write('Upload ID does not exists'); - return $response->withStatus(404); + return $response->withStatus(404); } - + /* Offset mismatch check and 409 Conflict */ $currentSize = filesize($filename); - if ($request->hasHeader('Upload-Offset') == false) { + if (!$request->hasHeader('Upload-Offset')) { $response->getBody()->write('Conflict (Upload-Offset header missing)'); return $response->withStatus(409); - } else { + } + else { $uploadOffset = intval($request->getHeader('Upload-Offset')[0]); if ($uploadOffset != $currentSize) { $response->getBody()->write("Conflict (currentSize=$currentSize uploadOffset=$uploadOffset)"); return $response->withStatus(409); } } - + $body = $request->getBody(); - + // TODO: Should we even check this and which error to return? $contentLength = intval($request->getHeader('Content-Length')[0]); $chunk = $body->getContents(); @@ -250,7 +247,7 @@ function processPatch(Request $request, Response $response, array $args): Respon $response->getBody()->write('Mismatch between Content-Length specified and sent'); return $response->withStatus(400); } - + $ds = self::getMetaStorage($args['id']); /* Validate if upload time is still valid */ @@ -261,21 +258,22 @@ function processPatch(Request $request, Response $response, array $args): Respon $response->getBody()->write('Upload token expired'); return $response->withStatus(410); } - + /* Validate checksum */ if ($request->hasHeader('Upload-Checksum')) { $uploadChecksum = $request->getHeader('Upload-Checksum')[0]; /* algo base64_checksum */ - $regex = "/^(" . join("|", self::getChecksumAlgorithm()) . ")" . + $regex = "/^(" . join("|", self::getChecksumAlgorithm()) . ")" . "[ ]+((?:[A-Za-z0-9+\/]{4})*(?:[A-Za-z0-9+\/]{2}==|[A-Za-z0-9+\/]{3}=))?$/"; - if(preg_match($regex, $uploadChecksum, $matches) === false) { + if (preg_match($regex, $uploadChecksum, $matches) === false) { $response->getBody()->write('Syntax of Upload-Checksum header incorrect'); return $response->withStatus(400); - } else { + } + else { $algo = $matches[1]; $incomingHash = $matches[2]; - switch($algo) { + switch ($algo) { case "md5": $chunkHash = base64_encode(md5($chunk, true)); break; @@ -286,17 +284,17 @@ function processPatch(Request $request, Response $response, array $args): Respon $chunkHash = base64_encode(crc32($chunk, true)); break; default: - /* Since algoritms are checked in regex, this should never happen */ + /* Since algorithms are checked in regex, this should never happen */ assert(False); } - + if ($chunkHash != $incomingHash) { $response->getBody()->write('Checksum Mismatch'); return $response->withStatus(460); } } } - + if ($ds["upload_defer_length"] === true) { if ($request->hasHeader('Upload-Length')) { $update["upload_length"] = intval($request->getHeader('Upload-Length')[0]); @@ -304,36 +302,38 @@ function processPatch(Request $request, Response $response, array $args): Respon self::updateStorage($args['id'], $update); } } - + file_put_contents($filename, $chunk, FILE_APPEND); - + clearstatcache(); $newSize = filesize($filename); - + if ($ds["upload_length"] == $newSize) { /* Process completed file */ $statusMsg = "All chunks received"; if (array_key_exists("upload_metadata", $ds) && - array_key_exists("filename", $ds["upload_metadata"])) { - $targetFile = $ds["upload_metadata"]["filename"]; - } else { + array_key_exists("filename", $ds["upload_metadata"])) { + $targetFile = $ds["upload_metadata"]["filename"]; + } + else { $targetFile = $args['id']; } - + /* Check if completed file is not created meanwhile */ $importPath = self::getImportPath($targetFile); if (file_exists($importPath)) { $response->getBody()->write("Error filename '$targetFile' already exists!"); return $response->withStatus(400); }; - + /* Migrate completed file to import folder */ rename($filename, $importPath); unlink(self::getMetaPath($args['id'])); - } else { + } + else { $statusMsg = "Next chunk please"; } - + $response->getBody()->write($statusMsg); return $response->withStatus(204) ->withHeader("Tus-Resumable", "1.0.0") @@ -342,24 +342,24 @@ function processPatch(Request $request, Response $response, array $args): Respon ->withHeader('Upload-Expires', $dt->format(DateTimeInterface::RFC7231)) ->WithHeader("Access-Control-Expose-Headers", "Tus-Resumable, Upload-Length, Upload-Offset"); } - + /** * Endpoint to delete the file */ function processDelete(Request $request, Response $response, array $args): Response { - // // TODO delete file - - // // TODO return 404 or 410 if entry is not found - return $response->withStatus(204) - ->withHeader("Tus-Resumable", "1.0.0") - ->WithHeader("Access-Control-Expose-Headers", "Tus-Resumable"); + // // TODO delete file + + // // TODO return 404 or 410 if entry is not found + return $response->withStatus(204) + ->withHeader("Tus-Resumable", "1.0.0") + ->WithHeader("Access-Control-Expose-Headers", "Tus-Resumable"); } - + static public function register($app): void { $me = get_called_class(); $baseUri = $me::getBaseUri(); - - $app->group($baseUri, function (RouteCollectorProxy $group) use($me) { + + $app->group($baseUri, function (RouteCollectorProxy $group) use ($me) { $group->options('', function (Request $request, Response $response, array $args): Response { return $response->withStatus(204) ->withHeader('Tus-Version', '1.0.0') @@ -368,13 +368,13 @@ static public function register($app): void { //TODO: Maybe add Upload-Expires support. Return in PATCH with RFC 7231 ->withHeader('Tus-Extension', 'checksum,creation,creation-defer-length,expiration,termination') ->withHeader('Access-Control-Expose-Headers', 'Tus-Version, Tus-Resumable, Tus-Checksum-Algorithm, Tus-Extension'); - //TODO: Option for Tus-Max-Size: 1073741824 + //TODO: Option for Tus-Max-Size: 1073741824 }); - + $group->post('', $me . ":processPost")->setName($me . ":processPost"); }); - - $app->group($baseUri . "/{id:[0-9]{14}-[0-9a-f]{32}}", function (RouteCollectorProxy $group) use($me){ + + $app->group($baseUri . "/{id:[0-9]{14}-[0-9a-f]{32}}", function (RouteCollectorProxy $group) use ($me) { /* Allow preflight requests */ $group->options('', function (Request $request, Response $response, array $args): Response { return $response; diff --git a/src/inc/apiv2/helper/purgeTask.routes.php b/src/inc/apiv2/helper/purgeTask.routes.php index ee0892145..00cc39889 100644 --- a/src/inc/apiv2/helper/purgeTask.routes.php +++ b/src/inc/apiv2/helper/purgeTask.routes.php @@ -1,4 +1,5 @@ ["type" => "int"], ]; } - + public static function getResponse(): array { return ["Purge" => "Success"]; } - + /** * Endpoint to purge a task. Meaning all chunks of a task will be deleted and keyspace and progress will be set to 0. + * @throws HTException */ public function actionPost($data): object|array|null { $task = self::getTask($data[Task::TASK_ID]); - - TaskUtils::purgeTask($task->getId(), $this->getCurrentUser()); + + TaskUtils::purgeTask($task->getId(), $this->getCurrentUser()); return $this->getResponse(); } -} +} PurgeTaskHelperAPI::register($app); \ No newline at end of file diff --git a/src/inc/apiv2/helper/recountFileLines.routes.php b/src/inc/apiv2/helper/recountFileLines.routes.php index 33aadf80b..80fe8e25c 100644 --- a/src/inc/apiv2/helper/recountFileLines.routes.php +++ b/src/inc/apiv2/helper/recountFileLines.routes.php @@ -1,5 +1,8 @@ ["type" => "int"], ]; } - + public static function getResponse(): string { return "File"; } - + /** * Endpoint to recount files for when there is size mismatch + * @param $data + * @return object|array|null + * @throws HTException + * @throws ContainerExceptionInterface + * @throws NotFoundExceptionInterface */ public function actionPost($data): object|array|null { // first retrieve the file, as fileCountLines does not check any permissions, therfore to be sure call getFile() first, even if it is not required technically FileUtils::getFile($data[File::FILE_ID], $this->getCurrentUser()); - + FileUtils::fileCountLines($data[File::FILE_ID]); return $this->object2Array(FileUtils::getFile($data[File::FILE_ID], $this->getCurrentUser())); diff --git a/src/inc/apiv2/helper/resetChunk.routes.php b/src/inc/apiv2/helper/resetChunk.routes.php index 3978d472c..13a6e2eac 100644 --- a/src/inc/apiv2/helper/resetChunk.routes.php +++ b/src/inc/apiv2/helper/resetChunk.routes.php @@ -1,6 +1,6 @@ ['type' => 'int'] ]; } - + public static function getResponse(): array { return ["Reset" => "Success"]; } - + /** * Endpoint to reset a chunk. + * @throws HTException */ public function actionPost(array $data): object|array|null { $chunk = self::getChunk($data[Chunk::CHUNK_ID]); TaskUtils::resetChunk($chunk->getId(), $this->getCurrentUser()); return $this->getResponse(); - } + } } ResetChunkHelperAPI::register($app); \ No newline at end of file diff --git a/src/inc/apiv2/helper/resetUserPassword.routes.php b/src/inc/apiv2/helper/resetUserPassword.routes.php index ae389a4f3..e75bc7488 100644 --- a/src/inc/apiv2/helper/resetUserPassword.routes.php +++ b/src/inc/apiv2/helper/resetUserPassword.routes.php @@ -21,7 +21,7 @@ public function getRequiredPermissions(string $method): array { public function preCommon(ServerRequestInterface $request): void { // nothing, there is no user for this request as it is an unauthenticated request } - + public static function getResponse(): array { return ["Reset" => "Success"]; } @@ -33,6 +33,9 @@ public function getFormFields(): array { ]; } + /** + * @throws HTException + */ public function actionPost($data): array|null { UserUtils::userForgotPassword($data[User::USERNAME], $data[User::EMAIL]); diff --git a/src/inc/apiv2/helper/setUserPassword.routes.php b/src/inc/apiv2/helper/setUserPassword.routes.php index c10a4a92d..c8faa04a9 100644 --- a/src/inc/apiv2/helper/setUserPassword.routes.php +++ b/src/inc/apiv2/helper/setUserPassword.routes.php @@ -1,6 +1,4 @@ ["type" => "int"], "password" => ["type" => "str"] ]; } - + public static function getResponse(): array { return ["Set password" => "Success"]; } - + /** * Endpoint to set a password of an user. + * @throws HTException */ public function actionPost($data): object|array|null { $user = self::getUser($data[User::USER_ID]); - + /* Set user password if provided */ UserUtils::setPassword( $user->getId(), @@ -50,6 +47,6 @@ public function actionPost($data): object|array|null { ); return $this->getResponse(); } -} +} SetUserPasswordHelperAPI::register($app); \ No newline at end of file diff --git a/src/inc/apiv2/helper/unassignAgent.routes.php b/src/inc/apiv2/helper/unassignAgent.routes.php index 52199f2c4..48474a27e 100644 --- a/src/inc/apiv2/helper/unassignAgent.routes.php +++ b/src/inc/apiv2/helper/unassignAgent.routes.php @@ -26,13 +26,14 @@ public function getFormFields(): array { Agent::AGENT_ID => ["type" => "int"], ]; } - + public static function getResponse(): array { return ["Unassign" => "Success"]; } /** * Endpoint to unassign an agent. + * @throws HTException */ public function actionPost($data): object|array|null { AgentUtils::assign($data[Agent::AGENT_ID], 0, $this->getCurrentUser()); diff --git a/src/inc/apiv2/model/accessgroups.routes.php b/src/inc/apiv2/model/accessgroups.routes.php index f6f5cb5cb..ef2374248 100644 --- a/src/inc/apiv2/model/accessgroups.routes.php +++ b/src/inc/apiv2/model/accessgroups.routes.php @@ -1,5 +1,4 @@ [ - 'key' => AccessGroup::ACCESS_GROUP_ID, - - 'junctionTableType' => AccessGroupUser::class, - 'junctionTableFilterField' => AccessGroupUser::ACCESS_GROUP_ID, - 'junctionTableJoinField' => AccessGroupUser::USER_ID, - - 'relationType' => User::class, - 'relationKey' => User::USER_ID, - ], - 'agentMembers' => [ - 'key' => AccessGroup::ACCESS_GROUP_ID, - - 'junctionTableType' =>AccessGroupAgent::class, - 'junctionTableFilterField' => AccessGroupAgent::ACCESS_GROUP_ID, - 'junctionTableJoinField' => AccessGroupAgent::AGENT_ID, - - 'relationType' => Agent::class, - 'relationKey' => Agent::AGENT_ID, - ], - ]; - } - - - protected function createObject(array $data): int { - $object = AccessGroupUtils::createGroup($data[AccessGroup::GROUP_NAME]); - return $object->getId(); - } - - protected function deleteObject(object $object): void { - AccessGroupUtils::deleteGroup($object->getId()); - } + public static function getBaseUri(): string { + return "/api/v2/ui/accessgroups"; + } + + public static function getDBAclass(): string { + return AccessGroup::class; + } + + public static function getToManyRelationships(): array { + return [ + 'userMembers' => [ + 'key' => AccessGroup::ACCESS_GROUP_ID, + + 'junctionTableType' => AccessGroupUser::class, + 'junctionTableFilterField' => AccessGroupUser::ACCESS_GROUP_ID, + 'junctionTableJoinField' => AccessGroupUser::USER_ID, + + 'relationType' => User::class, + 'relationKey' => User::USER_ID, + ], + 'agentMembers' => [ + 'key' => AccessGroup::ACCESS_GROUP_ID, + + 'junctionTableType' => AccessGroupAgent::class, + 'junctionTableFilterField' => AccessGroupAgent::ACCESS_GROUP_ID, + 'junctionTableJoinField' => AccessGroupAgent::AGENT_ID, + + 'relationType' => Agent::class, + 'relationKey' => Agent::AGENT_ID, + ], + ]; + } + + + /** + * @throws HTException + */ + protected function createObject(array $data): int { + $object = AccessGroupUtils::createGroup($data[AccessGroup::GROUP_NAME]); + return $object->getId(); + } + + /** + * @throws HTException + */ + protected function deleteObject(object $object): void { + AccessGroupUtils::deleteGroup($object->getId()); + } } AccessGroupAPI::register($app); \ No newline at end of file diff --git a/src/inc/apiv2/model/agentassignments.routes.php b/src/inc/apiv2/model/agentassignments.routes.php index 936cf310d..28905535b 100644 --- a/src/inc/apiv2/model/agentassignments.routes.php +++ b/src/inc/apiv2/model/agentassignments.routes.php @@ -1,6 +1,5 @@ get($object->getAgentId()); - $accessGroupsAgent = Util::arrayOfIds(AccessUtils::getAccessGroupsOfAgent($agent)); - - return count(array_intersect($accessGroupsAgent, $accessGroupsUser)) > 0; - } + public static function getDBAclass(): string { + return Assignment::class; + } + + protected function getSingleACL(User $user, object $object): bool { + $accessGroupsUser = Util::arrayOfIds(AccessUtils::getAccessGroupsOfUser($user)); + $agent = Factory::getAgentFactory()->get($object->getAgentId()); + $accessGroupsAgent = Util::arrayOfIds(AccessUtils::getAccessGroupsOfAgent($agent)); - protected function getFilterACL(): array { - $accessGroups = Util::arrayOfIds(AccessUtils::getAccessGroupsOfUser($this->getCurrentUser())); - - return [ - Factory::JOIN => [ - new JoinFilter(Factory::getAccessGroupAgentFactory(), Assignment::AGENT_ID, AccessGroupAgent::AGENT_ID), - new JoinFilter(Factory::getTaskFactory(), Assignment::TASK_ID, Task::TASK_ID), - new JoinFilter(Factory::getTaskWrapperFactory(), Task::TASK_WRAPPER_ID, TaskWrapper::TASK_WRAPPER_ID, Factory::getTaskFactory()), - new JoinFilter(Factory::getHashlistFactory(), TaskWrapper::HASHLIST_ID, Hashlist::HASHLIST_ID, Factory::getTaskWrapperFactory()), - ], - Factory::FILTER => [ - new ContainFilter(AccessGroupAgent::ACCESS_GROUP_ID, $accessGroups, Factory::getAccessGroupAgentFactory()), - new ContainFilter(Hashlist::ACCESS_GROUP_ID, $accessGroups, Factory::getHashlistFactory()), - ] - ]; - } + return count(array_intersect($accessGroupsAgent, $accessGroupsUser)) > 0; + } + + protected function getFilterACL(): array { + $accessGroups = Util::arrayOfIds(AccessUtils::getAccessGroupsOfUser($this->getCurrentUser())); - public static function getToOneRelationships(): array { - return [ - 'agent' => [ - 'key' => Assignment::AGENT_ID, - - 'relationType' => Agent::class, - 'relationKey' => Agent::AGENT_ID, - ], - 'task' => [ - 'key' => Assignment::TASK_ID, - - 'relationType' => Task::class, - 'relationKey' => Task::TASK_ID, - ], - ]; - } - - protected function createObject(array $data): int { - AgentUtils::assign($data[Assignment::AGENT_ID], $data[Assignment::TASK_ID], $this->getCurrentUser()); - /* On succesfully insert, return ID */ - $qFs = [ - new QueryFilter(Assignment::AGENT_ID, $data[Assignment::AGENT_ID], '='), - new QueryFilter(Assignment::TASK_ID, $data[Assignment::TASK_ID], '=') - ]; - - /* Hackish way to retreive object since Id is not returned on creation */ - $oF = new OrderFilter(Assignment::ASSIGNMENT_ID, "DESC"); - $objects = $this->getFactory()->filter([Factory::FILTER => $qFs, Factory::ORDER => $oF]); - assert(count($objects) >= 1); - - return $objects[0]->getId(); - } - - protected function getUpdateHandlers($id, $current_user): array { - return [ - Assignment::BENCHMARK => fn ($value) => assignmentUtils::setBenchmark($id, $value, $current_user) - ]; - } - - protected function deleteObject(object $object): void { - AgentUtils::assign($object->getAgentId(), 0, $this->getCurrentUser()); - } + return [ + Factory::JOIN => [ + new JoinFilter(Factory::getAccessGroupAgentFactory(), Assignment::AGENT_ID, AccessGroupAgent::AGENT_ID), + new JoinFilter(Factory::getTaskFactory(), Assignment::TASK_ID, Task::TASK_ID), + new JoinFilter(Factory::getTaskWrapperFactory(), Task::TASK_WRAPPER_ID, TaskWrapper::TASK_WRAPPER_ID, Factory::getTaskFactory()), + new JoinFilter(Factory::getHashlistFactory(), TaskWrapper::HASHLIST_ID, Hashlist::HASHLIST_ID, Factory::getTaskWrapperFactory()), + ], + Factory::FILTER => [ + new ContainFilter(AccessGroupAgent::ACCESS_GROUP_ID, $accessGroups, Factory::getAccessGroupAgentFactory()), + new ContainFilter(Hashlist::ACCESS_GROUP_ID, $accessGroups, Factory::getHashlistFactory()), + ] + ]; + } + + public static function getToOneRelationships(): array { + return [ + 'agent' => [ + 'key' => Assignment::AGENT_ID, + + 'relationType' => Agent::class, + 'relationKey' => Agent::AGENT_ID, + ], + 'task' => [ + 'key' => Assignment::TASK_ID, + + 'relationType' => Task::class, + 'relationKey' => Task::TASK_ID, + ], + ]; + } + + /** + * @throws HTException + */ + protected function createObject(array $data): int { + AgentUtils::assign($data[Assignment::AGENT_ID], $data[Assignment::TASK_ID], $this->getCurrentUser()); + /* On successfully insert, return ID */ + $qFs = [ + new QueryFilter(Assignment::AGENT_ID, $data[Assignment::AGENT_ID], '='), + new QueryFilter(Assignment::TASK_ID, $data[Assignment::TASK_ID], '=') + ]; + + /* Hackish way to retrieve object since Id is not returned on creation */ + $oF = new OrderFilter(Assignment::ASSIGNMENT_ID, "DESC"); + $objects = $this->getFactory()->filter([Factory::FILTER => $qFs, Factory::ORDER => $oF]); + assert(count($objects) >= 1); + + return $objects[0]->getId(); + } + + protected function getUpdateHandlers($id, $current_user): array { + return [ + Assignment::BENCHMARK => fn($value) => assignmentUtils::setBenchmark($id, $value, $current_user) + ]; + } + + /** + * @throws HTException + */ + protected function deleteObject(object $object): void { + AgentUtils::assign($object->getAgentId(), 0, $this->getCurrentUser()); + } } AgentAssignmentAPI::register($app); \ No newline at end of file diff --git a/src/inc/apiv2/model/agentbinaries.routes.php b/src/inc/apiv2/model/agentbinaries.routes.php index e93f5c4f2..d923cdc79 100644 --- a/src/inc/apiv2/model/agentbinaries.routes.php +++ b/src/inc/apiv2/model/agentbinaries.routes.php @@ -1,4 +1,5 @@ getCurrentUser() - ); - - /* On succesfully insert, return ID */ - $qFs = [ - new QueryFilter(AgentBinary::FILENAME, $data[AgentBinary::FILENAME], '='), - new QueryFilter(AgentBinary::VERSION, $data[AgentBinary::VERSION], '='), - ]; - - /* Hackish way to retreive object since Id is not returned on creation */ - $oF = new OrderFilter(AgentBinary::AGENT_BINARY_ID, "DESC"); - $objects = $this->getFactory()->filter([Factory::FILTER => $qFs, Factory::ORDER => $oF]); - /* No unique properties set on columns, thus multiple entries could exists, pick the latest (DESC ordering used) */ - assert(count($objects) >= 1); - - return $objects[0]->getId(); - } - - protected function deleteObject(object $object): void { - AgentBinaryUtils::deleteBinary($object->getId()); - } - - protected function getUpdateHandlers($id, $current_user): array { - return [ - AgentBinary::TYPE => fn ($value) => AgentBinaryUtils::editType($id, $value, $current_user), - AgentBinary::FILENAME => fn ($value) => AgentBinaryUtils::editName($id, $value, $current_user), - AgentBinary::UPDATE_TRACK => fn ($value) => AgentBinaryUtils::editUpdateTracker($id, $value, $current_user), - ]; - } + public static function getDBAclass(): string { + return AgentBinary::class; + } + + /** + * @throws HTException + */ + protected function createObject(array $data): int { + AgentBinaryUtils::newBinary( + $data[AgentBinary::TYPE], + $data[AgentBinary::OPERATING_SYSTEMS], + $data[AgentBinary::FILENAME], + $data[AgentBinary::VERSION], + $data[AgentBinary::UPDATE_TRACK], + $this->getCurrentUser() + ); + + /* On successfully insert, return ID */ + $qFs = [ + new QueryFilter(AgentBinary::FILENAME, $data[AgentBinary::FILENAME], '='), + new QueryFilter(AgentBinary::VERSION, $data[AgentBinary::VERSION], '='), + ]; + + /* Hackish way to retrieve object since Id is not returned on creation */ + $oF = new OrderFilter(AgentBinary::AGENT_BINARY_ID, "DESC"); + $objects = $this->getFactory()->filter([Factory::FILTER => $qFs, Factory::ORDER => $oF]); + /* No unique properties set on columns, thus multiple entries could exists, pick the latest (DESC ordering used) */ + assert(count($objects) >= 1); + + return $objects[0]->getId(); + } + + /** + * @throws HTException + */ + protected function deleteObject(object $object): void { + AgentBinaryUtils::deleteBinary($object->getId()); + } + + protected function getUpdateHandlers($id, $current_user): array { + return [ + AgentBinary::TYPE => fn($value) => AgentBinaryUtils::editType($id, $value, $current_user), + AgentBinary::FILENAME => fn($value) => AgentBinaryUtils::editName($id, $value, $current_user), + AgentBinary::UPDATE_TRACK => fn($value) => AgentBinaryUtils::editUpdateTracker($id, $value, $current_user), + ]; + } } AgentBinaryAPI::register($app); \ No newline at end of file diff --git a/src/inc/apiv2/model/agenterrors.routes.php b/src/inc/apiv2/model/agenterrors.routes.php index 5a115f298..305c4bcc1 100644 --- a/src/inc/apiv2/model/agenterrors.routes.php +++ b/src/inc/apiv2/model/agenterrors.routes.php @@ -9,71 +9,73 @@ use DBA\Factory; use DBA\TaskWrapper; use DBA\User; +use JetBrains\PhpStorm\NoReturn; require_once(dirname(__FILE__) . "/../common/AbstractModelAPI.class.php"); class AgentErrorAPI extends AbstractModelAPI { - public static function getBaseUri(): string { - return "/api/v2/ui/agenterrors"; - } - /* - * Include the task data for the task error . - */ - public static function getToOneRelationships(): array { - return [ - 'task' => [ - 'key' => AgentError::TASK_ID, - 'relationType' => Task::class, - 'relationKey' => Task::TASK_ID, - ], - ]; - } - public static function getAvailableMethods(): array { - return ['GET', 'DELETE']; - } - - public static function getDBAclass(): string { - return AgentError::class; - } + public static function getBaseUri(): string { + return "/api/v2/ui/agenterrors"; + } - protected function getSingleACL(User $user, object $object): bool { - $accessGroupsUser = Util::arrayOfIds(AccessUtils::getAccessGroupsOfUser($user)); - $agent = Factory::getAgentFactory()->get($object->getAgentId()); - $accessGroupsAgent = Util::arrayOfIds(AccessUtils::getAccessGroupsOfAgent($agent)); - - return count(array_intersect($accessGroupsAgent, $accessGroupsUser)) > 0; - } + /* + * Include the task data for the task error . + */ + public static function getToOneRelationships(): array { + return [ + 'task' => [ + 'key' => AgentError::TASK_ID, + 'relationType' => Task::class, + 'relationKey' => Task::TASK_ID, + ], + ]; + } - protected function getFilterACL(): array { - $accessGroups = Util::arrayOfIds(AccessUtils::getAccessGroupsOfUser($this->getCurrentUser())); - - return [ - Factory::JOIN => [ - new JoinFilter(Factory::getAccessGroupAgentFactory(), AgentError::AGENT_ID, AccessGroupAgent::AGENT_ID), - new JoinFilter(Factory::getTaskFactory(), AgentError::TASK_ID, Task::TASK_ID), - new JoinFilter(Factory::getTaskWrapperFactory(), Task::TASK_WRAPPER_ID, TaskWrapper::TASK_WRAPPER_ID, Factory::getTaskFactory()), - new JoinFilter(Factory::getHashlistFactory(), TaskWrapper::HASHLIST_ID, Hashlist::HASHLIST_ID, Factory::getTaskWrapperFactory()), - ], - Factory::FILTER => [ - new ContainFilter(AccessGroupAgent::ACCESS_GROUP_ID, $accessGroups, Factory::getAccessGroupAgentFactory()), - new ContainFilter(Hashlist::ACCESS_GROUP_ID, $accessGroups, Factory::getHashlistFactory()), - ] - ]; - } - - protected function createObject(array $data): int { - assert(False, "AgentErrors cannot be created via API"); - return -1; - } - - public function updateObject(int $objectId, array $data): void { - assert(False, "AgentErrors cannot be updated via API"); - } - - protected function deleteObject(object $object): void { - Factory::getAgentErrorFactory()->delete($object); - } + public static function getAvailableMethods(): array { + return ['GET', 'DELETE']; + } + + public static function getDBAclass(): string { + return AgentError::class; + } + + protected function getSingleACL(User $user, object $object): bool { + $accessGroupsUser = Util::arrayOfIds(AccessUtils::getAccessGroupsOfUser($user)); + $agent = Factory::getAgentFactory()->get($object->getAgentId()); + $accessGroupsAgent = Util::arrayOfIds(AccessUtils::getAccessGroupsOfAgent($agent)); + + return count(array_intersect($accessGroupsAgent, $accessGroupsUser)) > 0; + } + + protected function getFilterACL(): array { + $accessGroups = Util::arrayOfIds(AccessUtils::getAccessGroupsOfUser($this->getCurrentUser())); + + return [ + Factory::JOIN => [ + new JoinFilter(Factory::getAccessGroupAgentFactory(), AgentError::AGENT_ID, AccessGroupAgent::AGENT_ID), + new JoinFilter(Factory::getTaskFactory(), AgentError::TASK_ID, Task::TASK_ID), + new JoinFilter(Factory::getTaskWrapperFactory(), Task::TASK_WRAPPER_ID, TaskWrapper::TASK_WRAPPER_ID, Factory::getTaskFactory()), + new JoinFilter(Factory::getHashlistFactory(), TaskWrapper::HASHLIST_ID, Hashlist::HASHLIST_ID, Factory::getTaskWrapperFactory()), + ], + Factory::FILTER => [ + new ContainFilter(AccessGroupAgent::ACCESS_GROUP_ID, $accessGroups, Factory::getAccessGroupAgentFactory()), + new ContainFilter(Hashlist::ACCESS_GROUP_ID, $accessGroups, Factory::getHashlistFactory()), + ] + ]; + } + + #[NoReturn] protected function createObject(array $data): int { + assert(False, "AgentErrors cannot be created via API"); + } + + #[NoReturn] public function updateObject(int $objectId, array $data): void { + assert(False, "AgentErrors cannot be updated via API"); + } + + protected function deleteObject(object $object): void { + Factory::getAgentErrorFactory()->delete($object); + } } AgentErrorAPI::register($app); \ No newline at end of file diff --git a/src/inc/apiv2/model/agents.routes.php b/src/inc/apiv2/model/agents.routes.php index 25a9710be..d6472ecc4 100644 --- a/src/inc/apiv2/model/agents.routes.php +++ b/src/inc/apiv2/model/agents.routes.php @@ -13,106 +13,108 @@ use DBA\JoinFilter; use DBA\Task; use DBA\User; +use JetBrains\PhpStorm\NoReturn; require_once(dirname(__FILE__) . "/../common/AbstractModelAPI.class.php"); class AgentAPI extends AbstractModelAPI { - public static function getBaseUri(): string { - return "/api/v2/ui/agents"; - } - - public static function getAvailableMethods(): array { - return ['GET', 'PATCH', 'DELETE']; - } - - public static function getDBAclass(): string { - return Agent::class; - } + public static function getBaseUri(): string { + return "/api/v2/ui/agents"; + } + + public static function getAvailableMethods(): array { + return ['GET', 'PATCH', 'DELETE']; + } + + public static function getDBAclass(): string { + return Agent::class; + } + + protected function getUpdateHandlers($id, $current_user): array { + return [ + Agent::IGNORE_ERRORS => fn($value) => AgentUtils::changeIgnoreErrors($id, $value, $current_user), + ]; + } + + protected function getSingleACL(User $user, object $object): bool { + $accessGroupsUser = Util::arrayOfIds(AccessUtils::getAccessGroupsOfUser($user)); + /** @var Agent $object */ + $accessGroupsAgent = Util::arrayOfIds(AccessUtils::getAccessGroupsOfAgent($object)); - protected function getUpdateHandlers($id, $current_user): array { - return [ - Agent::IGNORE_ERRORS => fn ($value) => AgentUtils::changeIgnoreErrors($id, $value, $current_user), - ]; - } + return count(array_intersect($accessGroupsAgent, $accessGroupsUser)) > 0; + } - protected function getSingleACL(User $user, object $object): bool { - $accessGroupsUser = Util::arrayOfIds(AccessUtils::getAccessGroupsOfUser($user)); - /** @var Agent $object */ - $accessGroupsAgent = Util::arrayOfIds(AccessUtils::getAccessGroupsOfAgent($object)); - - return count(array_intersect($accessGroupsAgent, $accessGroupsUser)) > 0; - } + protected function getFilterACL(): array { + $accessGroups = Util::arrayOfIds(AccessUtils::getAccessGroupsOfUser($this->getCurrentUser())); + + return [ + Factory::JOIN => [ + new JoinFilter(Factory::getAccessGroupAgentFactory(), Agent::AGENT_ID, AccessGroupAgent::AGENT_ID) + ], Factory::FILTER => [new ContainFilter(AccessGroupAgent::ACCESS_GROUP_ID, $accessGroups), + ] + ]; + } - protected function getFilterACL(): array { - $accessGroups = Util::arrayOfIds(AccessUtils::getAccessGroupsOfUser($this->getCurrentUser())); - - return [ - Factory::JOIN => [ - new JoinFilter(Factory::getAccessGroupAgentFactory(), Agent::AGENT_ID, AccessGroupAgent::AGENT_ID)], Factory::FILTER => [new ContainFilter(AccessGroupAgent::ACCESS_GROUP_ID, $accessGroups), - ] - ]; - } - - public static function getToManyRelationships(): array { - return [ - 'accessGroups' => [ - 'key' => Agent::AGENT_ID, - - 'junctionTableType' => AccessGroupAgent::class, - 'junctionTableFilterField' => AccessGroupAgent::AGENT_ID, - 'junctionTableJoinField' => AccessGroupAgent::ACCESS_GROUP_ID, - - 'relationType' => AccessGroup::class, - 'relationKey' => AccessGroup::ACCESS_GROUP_ID, - ], - 'agentStats' => [ - 'key' => Agent::AGENT_ID, - - 'relationType' => AgentStat::class, - 'relationKey' => AgentStat::AGENT_ID, - ], - 'agentErrors' => [ - 'key' => Agent::AGENT_ID, - - 'relationType' => AgentError::class, - 'relationKey' => AgentError::AGENT_ID, - ], - 'chunks' => [ - 'key' => Agent::AGENT_ID, - - 'relationType' => Chunk::class, - 'relationKey' => Chunk::AGENT_ID, - ], - 'tasks' => [ - 'key' => Agent::AGENT_ID, - - 'junctionTableType' => Assignment::class, - 'junctionTableFilterField' => Assignment::AGENT_ID, - 'junctionTableJoinField' => Assignment::TASK_ID, - - 'relationType' => Task::class, - 'relationKey' => Task::TASK_ID, - ], - 'assignments' => [ - 'key' => Agent::AGENT_ID, - - 'relationType' => Assignment::class, - 'relationKey' => Assignment::AGENT_ID, - ], + public static function getToManyRelationships(): array { + return [ + 'accessGroups' => [ + 'key' => Agent::AGENT_ID, - - ]; - } - - protected function createObject(array $data): int { - assert(False, "Agents cannot be created via API"); - return -1; - } - - protected function deleteObject(object $object): void { - AgentUtils::delete($object->getId(), $this->getCurrentUser()); - } + 'junctionTableType' => AccessGroupAgent::class, + 'junctionTableFilterField' => AccessGroupAgent::AGENT_ID, + 'junctionTableJoinField' => AccessGroupAgent::ACCESS_GROUP_ID, + + 'relationType' => AccessGroup::class, + 'relationKey' => AccessGroup::ACCESS_GROUP_ID, + ], + 'agentStats' => [ + 'key' => Agent::AGENT_ID, + + 'relationType' => AgentStat::class, + 'relationKey' => AgentStat::AGENT_ID, + ], + 'agentErrors' => [ + 'key' => Agent::AGENT_ID, + + 'relationType' => AgentError::class, + 'relationKey' => AgentError::AGENT_ID, + ], + 'chunks' => [ + 'key' => Agent::AGENT_ID, + + 'relationType' => Chunk::class, + 'relationKey' => Chunk::AGENT_ID, + ], + 'tasks' => [ + 'key' => Agent::AGENT_ID, + + 'junctionTableType' => Assignment::class, + 'junctionTableFilterField' => Assignment::AGENT_ID, + 'junctionTableJoinField' => Assignment::TASK_ID, + + 'relationType' => Task::class, + 'relationKey' => Task::TASK_ID, + ], + 'assignments' => [ + 'key' => Agent::AGENT_ID, + + 'relationType' => Assignment::class, + 'relationKey' => Assignment::AGENT_ID, + ], + ]; + } + + #[NoReturn] protected function createObject(array $data): int { + assert(False, "Agents cannot be created via API"); + } + + /** + * @throws HTException + */ + protected function deleteObject(object $object): void { + AgentUtils::delete($object->getId(), $this->getCurrentUser()); + } } AgentAPI::register($app); \ No newline at end of file diff --git a/src/inc/apiv2/model/agentstats.routes.php b/src/inc/apiv2/model/agentstats.routes.php index b39e26250..5e9caac59 100644 --- a/src/inc/apiv2/model/agentstats.routes.php +++ b/src/inc/apiv2/model/agentstats.routes.php @@ -7,56 +7,56 @@ use DBA\AgentStat; use DBA\JoinFilter; use DBA\User; +use JetBrains\PhpStorm\NoReturn; require_once(dirname(__FILE__) . "/../common/AbstractModelAPI.class.php"); class AgentStatAPI extends AbstractModelAPI { - public static function getBaseUri(): string { - return "/api/v2/ui/agentstats"; - } - - public static function getAvailableMethods(): array { - return ['GET', 'DELETE']; - } - - public static function getDBAclass(): string { - return AgentStat::class; - } + public static function getBaseUri(): string { + return "/api/v2/ui/agentstats"; + } - protected function getSingleACL(User $user, object $object): bool { - $accessGroupsUser = Util::arrayOfIds(AccessUtils::getAccessGroupsOfUser($user)); - $agent = Factory::getAgentFactory()->get($object->getAgentId()); - $accessGroupsAgent = Util::arrayOfIds(AccessUtils::getAccessGroupsOfAgent($agent)); - - return count(array_intersect($accessGroupsAgent, $accessGroupsUser)) > 0; - } + public static function getAvailableMethods(): array { + return ['GET', 'DELETE']; + } - protected function getFilterACL(): array { - $accessGroups = Util::arrayOfIds(AccessUtils::getAccessGroupsOfUser($this->getCurrentUser())); - - return [ - Factory::JOIN => [ - new JoinFilter(Factory::getAccessGroupAgentFactory(), AgentStat::AGENT_ID, AccessGroupAgent::AGENT_ID), - ], - Factory::FILTER => [ - new ContainFilter(AccessGroupAgent::ACCESS_GROUP_ID, $accessGroups, Factory::getAccessGroupAgentFactory()), - ] - ]; - } - - protected function createObject(array $data): int { - assert(False, "AgentStats cannot be created via API"); - return -1; - } - - public function updateObject(int $objectId, array $data): void { - assert(False, "AgentStats cannot be updated via API"); - } - - protected function deleteObject(object $object): void { - Factory::getAgentStatFactory()->delete($object); - } + public static function getDBAclass(): string { + return AgentStat::class; + } + + protected function getSingleACL(User $user, object $object): bool { + $accessGroupsUser = Util::arrayOfIds(AccessUtils::getAccessGroupsOfUser($user)); + $agent = Factory::getAgentFactory()->get($object->getAgentId()); + $accessGroupsAgent = Util::arrayOfIds(AccessUtils::getAccessGroupsOfAgent($agent)); + + return count(array_intersect($accessGroupsAgent, $accessGroupsUser)) > 0; + } + + protected function getFilterACL(): array { + $accessGroups = Util::arrayOfIds(AccessUtils::getAccessGroupsOfUser($this->getCurrentUser())); + + return [ + Factory::JOIN => [ + new JoinFilter(Factory::getAccessGroupAgentFactory(), AgentStat::AGENT_ID, AccessGroupAgent::AGENT_ID), + ], + Factory::FILTER => [ + new ContainFilter(AccessGroupAgent::ACCESS_GROUP_ID, $accessGroups, Factory::getAccessGroupAgentFactory()), + ] + ]; + } + + #[NoReturn] protected function createObject(array $data): int { + assert(False, "AgentStats cannot be created via API"); + } + + #[NoReturn] public function updateObject(int $objectId, array $data): void { + assert(False, "AgentStats cannot be updated via API"); + } + + protected function deleteObject(object $object): void { + Factory::getAgentStatFactory()->delete($object); + } } AgentStatAPI::register($app); \ No newline at end of file diff --git a/src/inc/apiv2/model/chunks.routes.php b/src/inc/apiv2/model/chunks.routes.php index c45f48d58..a217d76f3 100644 --- a/src/inc/apiv2/model/chunks.routes.php +++ b/src/inc/apiv2/model/chunks.routes.php @@ -12,84 +12,82 @@ use DBA\Task; use DBA\TaskWrapper; use DBA\User; +use JetBrains\PhpStorm\NoReturn; require_once(dirname(__FILE__) . "/../common/AbstractModelAPI.class.php"); class ChunkAPI extends AbstractModelAPI { - public static function getBaseUri(): string { - return "/api/v2/ui/chunks"; - } - - public static function getAvailableMethods(): array { - return ['GET']; - } - - public static function getDBAclass(): string { - return Chunk::class; - } + public static function getBaseUri(): string { + return "/api/v2/ui/chunks"; + } - protected function getSingleACL(User $user, object $object): bool { - $accessGroupsUser = Util::arrayOfIds(AccessUtils::getAccessGroupsOfUser($user)); - - $qF1 = new ContainFilter(Hashlist::ACCESS_GROUP_ID, $accessGroupsUser, Factory::getHashlistFactory()); - $qF2 = new QueryFilter(Chunk::CHUNK_ID, $object->getId(), "="); - $jF1 = new JoinFilter(Factory::getTaskFactory(), Chunk::TASK_ID, Task::TASK_ID); - $jF2 = new JoinFilter(Factory::getTaskWrapperFactory(), Task::TASK_WRAPPER_ID, TaskWrapper::TASK_WRAPPER_ID, Factory::getTaskFactory()); - $jF3 = new JoinFilter(Factory::getHashlistFactory(), TaskWrapper::HASHLIST_ID, Hashlist::HASHLIST_ID, Factory::getTaskWrapperFactory()); - $chunks = Factory::getChunkFactory()->filter([Factory::FILTER => [$qF1, $qF2], Factory::JOIN => [$jF1, $jF2, $jF3]])[Factory::getChunkFactory()->getModelName()]; - - return count($chunks) > 0; - } + public static function getAvailableMethods(): array { + return ['GET']; + } - protected function getFilterACL(): array { - $accessGroups = Util::arrayOfIds(AccessUtils::getAccessGroupsOfUser($this->getCurrentUser())); - - return [ - Factory::JOIN => [ - new JoinFilter(Factory::getAccessGroupAgentFactory(), Chunk::AGENT_ID, AccessGroupAgent::AGENT_ID), - new JoinFilter(Factory::getTaskFactory(), Chunk::TASK_ID, Task::TASK_ID), - new JoinFilter(Factory::getTaskWrapperFactory(), Task::TASK_WRAPPER_ID, TaskWrapper::TASK_WRAPPER_ID, Factory::getTaskFactory()), - new JoinFilter(Factory::getHashlistFactory(), TaskWrapper::HASHLIST_ID, Hashlist::HASHLIST_ID, Factory::getTaskWrapperFactory()), - ], - Factory::FILTER => [ - new ContainFilter(AccessGroupAgent::ACCESS_GROUP_ID, $accessGroups, Factory::getAccessGroupAgentFactory()), - new ContainFilter(Hashlist::ACCESS_GROUP_ID, $accessGroups, Factory::getHashlistFactory()), - ] - ]; - } - - public static function getToOneRelationships(): array { - return [ - 'agent' => [ - 'key' => Chunk::AGENT_ID, - - 'relationType' => Agent::class, - 'relationKey' => Agent::AGENT_ID, - ], - 'task' => [ - 'key' => Chunk::TASK_ID, - - 'relationType' => Task::class, - 'relationKey' => Task::TASK_ID, - ], - ]; - } - - protected function createObject(array $data): int { - /* Dummy code to implement abstract functions */ - assert(False, "Chunks cannot be created via API"); - return -1; - } - - public function updateObject(int $objectId, array $data): void { - assert(False, "Chunks cannot be updated via API"); - } - - protected function deleteObject(object $object): void { - /* Dummy code to implement abstract functions */ - assert(False, "Chunks cannot be deleted via API"); - } + public static function getDBAclass(): string { + return Chunk::class; + } + + protected function getSingleACL(User $user, object $object): bool { + $accessGroupsUser = Util::arrayOfIds(AccessUtils::getAccessGroupsOfUser($user)); + + $qF1 = new ContainFilter(Hashlist::ACCESS_GROUP_ID, $accessGroupsUser, Factory::getHashlistFactory()); + $qF2 = new QueryFilter(Chunk::CHUNK_ID, $object->getId(), "="); + $jF1 = new JoinFilter(Factory::getTaskFactory(), Chunk::TASK_ID, Task::TASK_ID); + $jF2 = new JoinFilter(Factory::getTaskWrapperFactory(), Task::TASK_WRAPPER_ID, TaskWrapper::TASK_WRAPPER_ID, Factory::getTaskFactory()); + $jF3 = new JoinFilter(Factory::getHashlistFactory(), TaskWrapper::HASHLIST_ID, Hashlist::HASHLIST_ID, Factory::getTaskWrapperFactory()); + $chunks = Factory::getChunkFactory()->filter([Factory::FILTER => [$qF1, $qF2], Factory::JOIN => [$jF1, $jF2, $jF3]])[Factory::getChunkFactory()->getModelName()]; + + return count($chunks) > 0; + } + + protected function getFilterACL(): array { + $accessGroups = Util::arrayOfIds(AccessUtils::getAccessGroupsOfUser($this->getCurrentUser())); + + return [ + Factory::JOIN => [ + new JoinFilter(Factory::getAccessGroupAgentFactory(), Chunk::AGENT_ID, AccessGroupAgent::AGENT_ID), + new JoinFilter(Factory::getTaskFactory(), Chunk::TASK_ID, Task::TASK_ID), + new JoinFilter(Factory::getTaskWrapperFactory(), Task::TASK_WRAPPER_ID, TaskWrapper::TASK_WRAPPER_ID, Factory::getTaskFactory()), + new JoinFilter(Factory::getHashlistFactory(), TaskWrapper::HASHLIST_ID, Hashlist::HASHLIST_ID, Factory::getTaskWrapperFactory()), + ], + Factory::FILTER => [ + new ContainFilter(AccessGroupAgent::ACCESS_GROUP_ID, $accessGroups, Factory::getAccessGroupAgentFactory()), + new ContainFilter(Hashlist::ACCESS_GROUP_ID, $accessGroups, Factory::getHashlistFactory()), + ] + ]; + } + + public static function getToOneRelationships(): array { + return [ + 'agent' => [ + 'key' => Chunk::AGENT_ID, + + 'relationType' => Agent::class, + 'relationKey' => Agent::AGENT_ID, + ], + 'task' => [ + 'key' => Chunk::TASK_ID, + + 'relationType' => Task::class, + 'relationKey' => Task::TASK_ID, + ], + ]; + } + + #[NoReturn] protected function createObject(array $data): int { + assert(False, "Chunks cannot be created via API"); + } + + #[NoReturn] public function updateObject(int $objectId, array $data): void { + assert(False, "Chunks cannot be updated via API"); + } + + #[NoReturn] protected function deleteObject(object $object): void { + assert(False, "Chunks cannot be deleted via API"); + } } ChunkAPI::register($app); \ No newline at end of file diff --git a/src/inc/apiv2/model/configs.routes.php b/src/inc/apiv2/model/configs.routes.php index e9787ead9..bbab7f121 100644 --- a/src/inc/apiv2/model/configs.routes.php +++ b/src/inc/apiv2/model/configs.routes.php @@ -1,50 +1,50 @@ [ - 'key' => Config::CONFIG_SECTION_ID, - - 'relationType' => ConfigSection::class, - 'relationKey' => ConfigSection::CONFIG_SECTION_ID, - ], - ]; - } - - protected function createObject(array $data): int { - /* Dummy code to implement abstract functions */ - assert(False, "Configs cannot be created via API"); - return -1; - } - - protected function deleteObject(object $object): void { - /* Dummy code to implement abstract functions */ - assert(False, "Configs cannot be deleted via API"); - } - - protected function updateObjects(array $objects) { - ConfigUtils::updateConfigs($objects); - } + public static function getBaseUri(): string { + return "/api/v2/ui/configs"; + } + + public static function getAvailableMethods(): array { + return ['GET', 'PATCH']; + } + + public static function getDBAclass(): string { + return Config::class; + } + + public static function getToOneRelationships(): array { + return [ + 'configSection' => [ + 'key' => Config::CONFIG_SECTION_ID, + + 'relationType' => ConfigSection::class, + 'relationKey' => ConfigSection::CONFIG_SECTION_ID, + ], + ]; + } + + #[NoReturn] protected function createObject(array $data): int { + assert(False, "Configs cannot be created via API"); + } + + #[NoReturn] protected function deleteObject(object $object): void { + assert(False, "Configs cannot be deleted via API"); + } + + /** + * @throws HTException + */ + protected function updateObjects(array $objects): void { + ConfigUtils::updateConfigs($objects); + } } ConfigAPI::register($app); \ No newline at end of file diff --git a/src/inc/apiv2/model/configsections.routes.php b/src/inc/apiv2/model/configsections.routes.php index b6bbb399a..60b0bfc96 100644 --- a/src/inc/apiv2/model/configsections.routes.php +++ b/src/inc/apiv2/model/configsections.routes.php @@ -1,36 +1,35 @@ [ - 'key' => CrackerBinary::CRACKER_BINARY_TYPE_ID, - - 'relationType' => CrackerBinaryType::class, - 'relationKey' => CrackerBinaryType::CRACKER_BINARY_TYPE_ID, - ], - ]; - } - - public static function getToManyRelationships(): array - { - return [ - 'tasks' => [ - 'key' => CrackerBinary::CRACKER_BINARY_ID, - - 'relationType' => Task::class, - 'relationKey' => Task::CRACKER_BINARY_ID, - ], - ]; - } - - protected function createObject(array $data): int { - CrackerUtils::createBinary( - $data[CrackerBinary::VERSION], - $data[CrackerBinary::BINARY_NAME], - $data[CrackerBinary::DOWNLOAD_URL], - $data[CrackerBinary::CRACKER_BINARY_TYPE_ID] - ); - - /* On succesfully insert, return ID */ - $qFs = [ - new QueryFilter(CrackerBinary::VERSION, $data[CrackerBinary::VERSION], '='), - new QueryFilter(CrackerBinary::BINARY_NAME, $data[CrackerBinary::BINARY_NAME], '='), - new QueryFilter(CrackerBinary::DOWNLOAD_URL, $data[CrackerBinary::DOWNLOAD_URL], '='), - new QueryFilter(CrackerBinary::CRACKER_BINARY_TYPE_ID, $data[CrackerBinary::CRACKER_BINARY_TYPE_ID], '='), - - ]; - - /* Hackish way to retreive object since Id is not returned on creation */ - $oF = new OrderFilter(CrackerBinary::CRACKER_BINARY_ID, "DESC"); - $objects = $this->getFactory()->filter([Factory::FILTER => $qFs, Factory::ORDER => $oF]); - /* No unique properties set on columns, thus multiple entries could exists, pick the latest (DESC ordering used) */ - assert(count($objects) >= 1); - - return $objects[0]->getId(); - } - - protected function deleteObject(object $object): void { - CrackerUtils::deleteBinary($object->getId()); - } + public static function getBaseUri(): string { + return "/api/v2/ui/crackers"; + } + + public static function getDBAclass(): string { + return CrackerBinary::class; + } + + public static function getToOneRelationships(): array { + return [ + 'crackerBinaryType' => [ + 'key' => CrackerBinary::CRACKER_BINARY_TYPE_ID, + + 'relationType' => CrackerBinaryType::class, + 'relationKey' => CrackerBinaryType::CRACKER_BINARY_TYPE_ID, + ], + ]; + } + + public static function getToManyRelationships(): array { + return [ + 'tasks' => [ + 'key' => CrackerBinary::CRACKER_BINARY_ID, + + 'relationType' => Task::class, + 'relationKey' => Task::CRACKER_BINARY_ID, + ], + ]; + } + + /** + * @throws HttpError + */ + protected function createObject(array $data): int { + CrackerUtils::createBinary( + $data[CrackerBinary::VERSION], + $data[CrackerBinary::BINARY_NAME], + $data[CrackerBinary::DOWNLOAD_URL], + $data[CrackerBinary::CRACKER_BINARY_TYPE_ID] + ); + + /* On successfully insert, return ID */ + $qFs = [ + new QueryFilter(CrackerBinary::VERSION, $data[CrackerBinary::VERSION], '='), + new QueryFilter(CrackerBinary::BINARY_NAME, $data[CrackerBinary::BINARY_NAME], '='), + new QueryFilter(CrackerBinary::DOWNLOAD_URL, $data[CrackerBinary::DOWNLOAD_URL], '='), + new QueryFilter(CrackerBinary::CRACKER_BINARY_TYPE_ID, $data[CrackerBinary::CRACKER_BINARY_TYPE_ID], '='), + + ]; + + /* Hackish way to retrieve object since Id is not returned on creation */ + $oF = new OrderFilter(CrackerBinary::CRACKER_BINARY_ID, "DESC"); + $objects = $this->getFactory()->filter([Factory::FILTER => $qFs, Factory::ORDER => $oF]); + /* No unique properties set on columns, thus multiple entries could exists, pick the latest (DESC ordering used) */ + assert(count($objects) >= 1); + + return $objects[0]->getId(); + } + + /** + * @throws HTException + */ + protected function deleteObject(object $object): void { + CrackerUtils::deleteBinary($object->getId()); + } } + CrackerBinaryAPI::register($app); \ No newline at end of file diff --git a/src/inc/apiv2/model/crackertypes.routes.php b/src/inc/apiv2/model/crackertypes.routes.php index 5406de7d1..0a3af1ac9 100644 --- a/src/inc/apiv2/model/crackertypes.routes.php +++ b/src/inc/apiv2/model/crackertypes.routes.php @@ -1,4 +1,5 @@ [ - 'key' => CrackerBinaryType::CRACKER_BINARY_TYPE_ID, - - 'relationType' => CrackerBinary::class, - 'relationKey' => CrackerBinary::CRACKER_BINARY_TYPE_ID, - ], - 'tasks' => [ - 'key' => CrackerBinaryType::CRACKER_BINARY_TYPE_ID, - - 'relationType' => Task::class, - 'relationKey' => Task::CRACKER_BINARY_TYPE_ID, - ] - ]; - } - - function getAllPostParameters(array $features): array { - - //for documentation purposes isChunkingAVailable has to be removed - // because it is currently not setable by the user - $features = parent::getAllPostParameters($features); - unset($features[CrackerBinaryType::IS_CHUNKING_AVAILABLE]); - return $features; - } + public static function getBaseUri(): string { + return "/api/v2/ui/crackertypes"; + } - protected function createObject(array $data): int { - CrackerUtils::createBinaryType($data[CrackerBinaryType::TYPE_NAME]); - - /* On succesfully insert, return ID */ - $qFs = [ - new QueryFilter(CrackerBinaryType::TYPE_NAME, $data[CrackerBinaryType::TYPE_NAME], '=') - ]; - - /* Hackish way to retreive object since Id is not returned on creation */ - $oF = new OrderFilter(CrackerBinaryType::CRACKER_BINARY_TYPE_ID, "DESC"); - $objects = $this->getFactory()->filter([Factory::FILTER => $qFs, Factory::ORDER => $oF]); - assert(count($objects) == 1); - - return $objects[0]->getId(); - } - - - protected function deleteObject(object $object): void { - CrackerUtils::deleteBinaryType($object->getId()); - } + public static function getDBAclass(): string { + return CrackerBinaryType::class; + } + + + public static function getToManyRelationships(): array { + return [ + 'crackerVersions' => [ + 'key' => CrackerBinaryType::CRACKER_BINARY_TYPE_ID, + + 'relationType' => CrackerBinary::class, + 'relationKey' => CrackerBinary::CRACKER_BINARY_TYPE_ID, + ], + 'tasks' => [ + 'key' => CrackerBinaryType::CRACKER_BINARY_TYPE_ID, + + 'relationType' => Task::class, + 'relationKey' => Task::CRACKER_BINARY_TYPE_ID, + ] + ]; + } + + function getAllPostParameters(array $features): array { + + //for documentation purposes isChunkingAvailable has to be removed + // because it is currently not settable by the user + $features = parent::getAllPostParameters($features); + unset($features[CrackerBinaryType::IS_CHUNKING_AVAILABLE]); + return $features; + } + + /** + * @throws HTException + */ + protected function createObject(array $data): int { + CrackerUtils::createBinaryType($data[CrackerBinaryType::TYPE_NAME]); + + /* On successfully insert, return ID */ + $qFs = [ + new QueryFilter(CrackerBinaryType::TYPE_NAME, $data[CrackerBinaryType::TYPE_NAME], '=') + ]; + + /* Hackish way to retrieve object since Id is not returned on creation */ + $oF = new OrderFilter(CrackerBinaryType::CRACKER_BINARY_TYPE_ID, "DESC"); + $objects = $this->getFactory()->filter([Factory::FILTER => $qFs, Factory::ORDER => $oF]); + assert(count($objects) == 1); + + return $objects[0]->getId(); + } + + + /** + * @throws HTException + */ + protected function deleteObject(object $object): void { + CrackerUtils::deleteBinaryType($object->getId()); + } } CrackerBinaryTypeAPI::register($app); \ No newline at end of file diff --git a/src/inc/apiv2/model/files.routes.php b/src/inc/apiv2/model/files.routes.php index 0f0814fa6..0f88f6f7a 100644 --- a/src/inc/apiv2/model/files.routes.php +++ b/src/inc/apiv2/model/files.routes.php @@ -15,168 +15,173 @@ class FileAPI extends AbstractModelAPI { - public static function getBaseUri(): string { - return "/api/v2/ui/files"; - } + public static function getBaseUri(): string { + return "/api/v2/ui/files"; + } - public static function getDBAclass(): string { - return File::class; - } + public static function getDBAclass(): string { + return File::class; + } - protected function getSingleACL(User $user, object $object): bool { - $accessGroupsUser = Util::arrayOfIds(AccessUtils::getAccessGroupsOfUser($user)); - - return in_array($object->getAccessGroupId(), $accessGroupsUser); - } + protected function getSingleACL(User $user, object $object): bool { + $accessGroupsUser = Util::arrayOfIds(AccessUtils::getAccessGroupsOfUser($user)); + + return in_array($object->getAccessGroupId(), $accessGroupsUser); + } - protected function getFilterACL(): array { - $accessGroups = Util::arrayOfIds(AccessUtils::getAccessGroupsOfUser($this->getCurrentUser())); - - return [ - Factory::FILTER => [ - new ContainFilter(File::ACCESS_GROUP_ID, $accessGroups), - ] - ]; - } + protected function getFilterACL(): array { + $accessGroups = Util::arrayOfIds(AccessUtils::getAccessGroupsOfUser($this->getCurrentUser())); - public static function getToOneRelationships(): array { - return [ - 'accessGroup' => [ - 'key' => File::ACCESS_GROUP_ID, - - 'relationType' => AccessGroup::class, - 'relationKey' => AccessGroup::ACCESS_GROUP_ID, - ], - ]; + return [ + Factory::FILTER => [ + new ContainFilter(File::ACCESS_GROUP_ID, $accessGroups), + ] + ]; + } + + public static function getToOneRelationships(): array { + return [ + 'accessGroup' => [ + 'key' => File::ACCESS_GROUP_ID, + + 'relationType' => AccessGroup::class, + 'relationKey' => AccessGroup::ACCESS_GROUP_ID, + ], + ]; + } + + public function getFormFields(): array { + // TODO Form declarations in more generic class to allow auto-generated OpenAPI specifications + return [ + "sourceType" => ['type' => 'str'], + "sourceData" => ['type' => 'str'] + ]; + } + + static protected function getImportPath(): string { + return Factory::getStoredValueFactory()->get(DDirectories::IMPORT)->getVal() . '/'; + } + + static protected function getFilesPath(): string { + return Factory::getStoredValueFactory()->get(DDirectories::FILES)->getVal() . '/'; + } + + /* Includes: + * Experimental support for renaming import file to target file + */ + /** + * @throws HTException + * @throws HttpError + */ + protected function createObject(array $data): int { + /* Validate target filename */ + $realname = str_replace(" ", "_", htmlentities(basename($data[File::FILENAME]), ENT_QUOTES, "UTF-8")); + if ($data[File::FILENAME] != $realname) { + throw new HttpError(File::FILENAME . " is invalid filename suggestion '$realname'"); } - - public function getFormFields(): array { - // TODO Form declarations in more generic class to allow auto-generated OpenAPI specifications - return [ - "sourceType" => ['type' => 'str'], - "sourceData" => ['type' => 'str'] - ]; + + /* Pre-checking to allow saving some time in repairing edge cases */ + if (file_exists($this->getFilesPath() . $data[File::FILENAME])) { + throw new HttpError("File '" . $data[File::FILENAME] . "' already exists in 'files' folder, cannot continue!"); } - - static protected function getImportPath(): string - { - return Factory::getStoredValueFactory()->get(DDirectories::IMPORT)->getVal() . '/'; + + /* Prepare dummy request for insert */ + $dummyPost = [ + "filename" => $data[File::FILENAME], + "accessGroupId" => $data[File::ACCESS_GROUP_ID], + ]; + switch ($data["sourceType"]) { + case "inline": + // TODO: Should be validated as parameter input instead + $decoded = base64_decode($data["sourceData"], true); + if ($decoded === false) { + throw new HttpError("sourceData not valid base64 encoding"); + } + $dummyPost["data"] = $decoded; + break; + case "import": + $realname = str_replace(" ", "_", htmlentities(basename($data["sourceData"]), ENT_QUOTES, "UTF-8")); + if ($data["sourceData"] != $realname) { + throw new HttpError("sourceData is invalid filename suggestion '$realname'"); + } + /* Renaming files will require target file to be checked before renaming */ + if (!file_exists($this->getImportPath() . $data["sourceData"])) { + throw new HttpError("File '" . $data["sourceData"] . "' not found in import folder"); + } + /* We are renaming sourceData file to filename file, check if filename is not there already + this can be skipped if they are the same */ + if (file_exists($this->getImportPath() . $data[File::FILENAME]) && $data[File::FILENAME] != $data["sourceData"]) { + throw new HttpError("File required temporary file '" . $data[File::FILENAME] . "' exists import folder, cannot continue"); + } + /* Since we are renaming the file _before_ import the name is temporary changed */ + $dummyPost["imfile"] = [$data[File::FILENAME]]; + break; + default: + // TODO: Choice validation are model based checks + throw new HttpError("sourceType value '" . $data["sourceType"] . "' is not supported (choices inline, import"); } - static protected function getFilesPath(): string - { - return Factory::getStoredValueFactory()->get(DDirectories::FILES)->getVal() . '/'; + /* TODO: Hackish view to revert back to required (hardcoded) view */ + $view = [ + DFileType::OTHER => 'other', + DFileType::RULE => 'rule', + DFileType::WORDLIST => 'dict' + ][$data[File::FILE_TYPE]]; + + + /* Prepare renaming file if required */ + $doRenameImport = (($data["sourceType"] == "import") && ($data[File::FILENAME] != $data["sourceData"])); + if ($doRenameImport) { + rename( + $this->getImportPath() . $data["sourceData"], + $this->getImportPath() . $data[File::FILENAME] + ); + }; + + try { + /* Create the file, calculating (e.g. lines) and checking validity (e.g. file exists) */ + FileUtils::add($data["sourceType"], $data[File::FILENAME], $dummyPost, $view); } - - /* Includes: - * Experimental support for renaming import file to target file - */ - protected function createObject(array $data): int { - /* Validate target filename */ - $realname = str_replace(" ", "_", htmlentities(basename($data[File::FILENAME]), ENT_QUOTES, "UTF-8")); - if ($data[File::FILENAME] != $realname) { - throw new HttpError(File::FILENAME . " is invalid filename suggestion '$realname'"); - } - - /* Pre-checking to allow saving some time in repairing edge cases */ - if (file_exists($this->getFilesPath() . $data[File::FILENAME])) { - throw new HttpError("File '" . $data[File::FILENAME] . "' already exists in 'files' folder, cannot continue!"); - } - - /* Prepare dummy request for insert */ - $dummyPost = [ - "filename" => $data[File::FILENAME], - "accessGroupId" => $data[File::ACCESS_GROUP_ID], - ]; - switch ($data["sourceType"]) { - case "inline": - // TODO: Should be validated as parameter input instead - $decoded = base64_decode($data["sourceData"], true); - if ($decoded === false) { - throw new HttpError("sourceData not valid base64 encoding"); - } - $dummyPost["data"] = $decoded; - break; - case "import": - $realname = str_replace(" ", "_", htmlentities(basename($data["sourceData"]), ENT_QUOTES, "UTF-8")); - if ($data["sourceData"] != $realname) { - throw new HttpError("sourceData is invalid filename suggestion '$realname'"); - } - /* Renaming files will require target file to be checked before renaming */ - if (!file_exists($this->getImportPath() . $data["sourceData"])) { - throw new HttpError("File '" . $data["sourceData"] . "' not found in import folder"); - } - /* We are renaming sourceData file to filename file, check if filename is not there already - this can be skipped if they are the same */ - if (file_exists($this->getImportPath() . $data[File::FILENAME]) && $data[File::FILENAME] != $data["sourceData"]) { - throw new HttpError("File required temponary file '" . $data[File::FILENAME] . "' exists import folder, cannot continue"); - } - /* Since we are renaming the file _before_ import the name is temponary changed */ - $dummyPost["imfile"] = [$data[File::FILENAME]]; - break; - default: - // TODO: Choice validation are model based checks - throw new HttpError("sourceType value '" . $data["sourceType"] . "' is not supported (choices inline, import"); - } - - /* TODO: Hackish view to revert back to required (hardcoded) view */ - $view = [ - DFileType::OTHER => 'other', - DFileType::RULE => 'rule', - DFileType::WORDLIST => 'dict' - ][$data[File::FILE_TYPE]]; - - - /* Prepare renaming file if required */ - $doRenameImport = (($data["sourceType"] == "import") && ($data[File::FILENAME] != $data["sourceData"])); - if ($doRenameImport) { + catch (Exception $e) { + /* In case of errors, ensure old state is restored */ + if (($data["sourceType"] == "import") && ($data[File::FILENAME] != $data["sourceData"])) { rename( - $this->getImportPath() . $data["sourceData"], - $this->getImportPath() . $data[File::FILENAME] + $this->getImportPath() . $data[File::FILENAME], + $this->getImportPath() . $data["sourceData"] ); }; - - try { - /* Create the file, calculating (e.g. lines) and checking validity (e.g. file exists) */ - FileUtils::add($data["sourceType"], $data[File::FILENAME], $dummyPost, $view); - } catch (Exception $e) { - /* In case of errors, ensure old state is restored */ - if (($data["sourceType"] == "import") && ($data[File::FILENAME] != $data["sourceData"])) { - rename( - $this->getImportPath() . $data[File::FILENAME], - $this->getImportPath() . $data["sourceData"] - ); - }; - throw $e; - } - - /* Hackish way to retrieve object since Id is not returned on creation */ - $qFs = [ - new QueryFilter(File::FILENAME, $data[File::FILENAME], '='), - new QueryFilter(File::FILE_TYPE, $data[File::FILE_TYPE], '='), - new QueryFilter(File::ACCESS_GROUP_ID, $data[File::ACCESS_GROUP_ID], '=') - ]; - $oF = new OrderFilter(File::FILE_ID, "DESC"); - $objects = $this->getFactory()->filter([Factory::FILTER => $qFs, Factory::ORDER => $oF]); - assert(count($objects) == 1); - - /* Manually set secret, since it not set when adding file */ - FileUtils::switchSecret($objects[0]->getId(), ($data[File::IS_SECRET]) ? 1 : 0, $this->getCurrentUser()); - - /* On succesfully insert, return ID */ - return $objects[0]->getId(); - } - - protected function getUpdateHandlers($id, $current_user): array { - return [ - File::FILE_TYPE => fn ($value) => FileUtils::setFileType($id, $value, $current_user) - ]; - } - - - protected function deleteObject(object $object): void { - FileUtils::delete($object->getId(), $this->getCurrentUser()); + throw $e; } + + /* Hackish way to retrieve object since Id is not returned on creation */ + $qFs = [ + new QueryFilter(File::FILENAME, $data[File::FILENAME], '='), + new QueryFilter(File::FILE_TYPE, $data[File::FILE_TYPE], '='), + new QueryFilter(File::ACCESS_GROUP_ID, $data[File::ACCESS_GROUP_ID], '=') + ]; + $oF = new OrderFilter(File::FILE_ID, "DESC"); + $objects = $this->getFactory()->filter([Factory::FILTER => $qFs, Factory::ORDER => $oF]); + assert(count($objects) == 1); + + /* Manually set secret, since it not set when adding file */ + FileUtils::switchSecret($objects[0]->getId(), ($data[File::IS_SECRET]) ? 1 : 0, $this->getCurrentUser()); + + /* On successfully insert, return ID */ + return $objects[0]->getId(); + } + + protected function getUpdateHandlers($id, $current_user): array { + return [ + File::FILE_TYPE => fn($value) => FileUtils::setFileType($id, $value, $current_user) + ]; + } + + /** + * @throws HTException + */ + protected function deleteObject(object $object): void { + FileUtils::delete($object->getId(), $this->getCurrentUser()); + } } FileAPI::register($app); diff --git a/src/inc/apiv2/model/globalpermissiongroups.routes.php b/src/inc/apiv2/model/globalpermissiongroups.routes.php index 173108067..ce7774ccf 100644 --- a/src/inc/apiv2/model/globalpermissiongroups.routes.php +++ b/src/inc/apiv2/model/globalpermissiongroups.routes.php @@ -1,5 +1,4 @@ [ + 'key' => RightGroup::RIGHT_GROUP_ID, + + 'relationType' => User::class, + 'relationKey' => User::RIGHT_GROUP_ID, + ], + ]; + } + + /** + * Rewrite permissions DB values to CRUD field values + * Temporary exception until old API is removed and we + * are allowed to write CRUD permissions to database + */ + protected static function db2json(array $feature, mixed $val): mixed { + if ($feature['alias'] == 'permissions') { + return AccessUtils::getPermissionArrayConverted($val); } - - public static function getDBAclass(): string { - return RightGroup::class; - } - - public static function getToManyRelationships(): array { - return [ - 'userMembers' => [ - 'key' => RightGroup::RIGHT_GROUP_ID, - - 'relationType' => User::class, - 'relationKey' => User::RIGHT_GROUP_ID, - ], - ]; - } - - /** - * Rewrite permissions DB values to CRUD field values - * Temponary exception until old API is removed and we - * are allowed to write CRUD permissions to database - */ - protected static function db2json(array $feature, mixed $val): mixed { - if ($feature['alias'] == 'permissions') { - return AccessUtils::getPermissionArrayConverted($val); - } else { - // Consider all other fields normal conversions - return parent::db2json($feature, $val); - } + else { + // Consider all other fields normal conversions + return parent::db2json($feature, $val); } - - protected function createObject(array $data): int { - $group = AccessControlUtils::createGroup($data[RightGroup::GROUP_NAME]); - $id = $group->getId(); - - // The utils function does not allow to set permissions directly. This call is to workaround this. - // This causes the issue that if some error happens during updating the object the object is still created - // but the permissions will not be set. - $this->updateObject($id, $data); - - return $id; - } - - protected function deleteObject(object $object): void { - AccessControlUtils::deleteGroup($object->getId()); - } - - protected function getUpdateHandlers($id, $current_user): array { - return [ - RightGroup::PERMISSIONS => fn ($value) => $this->updatePermissions($id, $value) - ]; - } - - /** - * NOTE: If ANY CRUD-permission is satisfied the corresponding OLD-permission is set - */ - private function updatePermissions($id, $value) { - $permissions = unserialize($value); - // Build reverse mapping to speed-up lookups for CRUD-permission to OLD-permission - $c2o = array(); - foreach (self::$acl_mapping as $oldPerm => $crudPerms) { - foreach($crudPerms as $crudPerm) { - if (array_key_exists($crudPerm, $c2o)) { - array_push($c2o[$crudPerm], $oldPerm); - } else { - $c2o[$crudPerm] = [$oldPerm]; - } - } - } - - $legacyPerms = []; - foreach($permissions as $crudPerm => $value) { + } + + /** + * @throws ResourceNotFoundError + * @throws HttpForbidden + * @throws HttpError + */ + protected function createObject(array $data): int { + $group = AccessControlUtils::createGroup($data[RightGroup::GROUP_NAME]); + $id = $group->getId(); + + // The utils function does not allow to set permissions directly. This call is to workaround this. + // This causes the issue that if some error happens during updating the object the object is still created + // but the permissions will not be set. + $this->updateObject($id, $data); + + return $id; + } + + /** + * @throws HttpError + */ + protected function deleteObject(object $object): void { + AccessControlUtils::deleteGroup($object->getId()); + } + + protected function getUpdateHandlers($id, $current_user): array { + return [ + RightGroup::PERMISSIONS => fn($value) => $this->updatePermissions($id, $value) + ]; + } + + /** + * NOTE: If ANY CRUD-permission is satisfied the corresponding OLD-permission is set + * @throws HTException + */ + private function updatePermissions($id, $value): void { + $permissions = unserialize($value); + // Build reverse mapping to speed-up lookups for CRUD-permission to OLD-permission + $c2o = array(); + foreach (self::$acl_mapping as $oldPerm => $crudPerms) { + foreach ($crudPerms as $crudPerm) { if (array_key_exists($crudPerm, $c2o)) { - $filled_perms = array_fill_keys($c2o[$crudPerm], $value); - $legacyPerms = array_merge($legacyPerms, $filled_perms); + $c2o[$crudPerm][] = $oldPerm; + } + else { + $c2o[$crudPerm] = [$oldPerm]; } } - - AccessControlUtils::addToPermissions($id, $legacyPerms); } + + $legacyPerms = []; + foreach ($permissions as $crudPerm => $value) { + if (array_key_exists($crudPerm, $c2o)) { + $filled_perms = array_fill_keys($c2o[$crudPerm], $value); + $legacyPerms = array_merge($legacyPerms, $filled_perms); + } + } + + AccessControlUtils::addToPermissions($id, $legacyPerms); + } } GlobalPermissionGroupAPI::register($app); \ No newline at end of file diff --git a/src/inc/apiv2/model/hashes.routes.php b/src/inc/apiv2/model/hashes.routes.php index 8f4f2e0cf..6175672ce 100644 --- a/src/inc/apiv2/model/hashes.routes.php +++ b/src/inc/apiv2/model/hashes.routes.php @@ -8,74 +8,72 @@ use DBA\Hashlist; use DBA\JoinFilter; use DBA\User; +use JetBrains\PhpStorm\NoReturn; require_once(dirname(__FILE__) . "/../common/AbstractModelAPI.class.php"); class HashAPI extends AbstractModelAPI { - public static function getBaseUri(): string { - return "/api/v2/ui/hashes"; - } - - public static function getAvailableMethods(): array { - return ['GET']; - } - - public static function getDBAclass(): string { - return Hash::class; - } + public static function getBaseUri(): string { + return "/api/v2/ui/hashes"; + } - protected function getSingleACL(User $user, object $object): bool { - $accessGroupsUser = Util::arrayOfIds(AccessUtils::getAccessGroupsOfUser($user)); - $hashlist = Factory::getHashlistFactory()->get($object->getHashlistId()); - - return in_array($hashlist->getAccessGroupId(), $accessGroupsUser); - } + public static function getAvailableMethods(): array { + return ['GET']; + } - protected function getFilterACL(): array { - $accessGroups = Util::arrayOfIds(AccessUtils::getAccessGroupsOfUser($this->getCurrentUser())); - - return [ - Factory::JOIN => [ - new JoinFilter(Factory::getHashlistFactory(), Hash::HASHLIST_ID, Hashlist::HASHLIST_ID), - ], - Factory::FILTER => [ - new ContainFilter(Hashlist::ACCESS_GROUP_ID, $accessGroups, Factory::getHashlistFactory()), - ] - ]; - } + public static function getDBAclass(): string { + return Hash::class; + } + + protected function getSingleACL(User $user, object $object): bool { + $accessGroupsUser = Util::arrayOfIds(AccessUtils::getAccessGroupsOfUser($user)); + $hashlist = Factory::getHashlistFactory()->get($object->getHashlistId()); - public static function getToOneRelationships(): array { - return [ - 'chunk' => [ - 'key' => Hash::CHUNK_ID, - - 'relationType' => Chunk::class, - 'relationKey' => Chunk::CHUNK_ID, - ], - 'hashlist' => [ - 'key' => Hash::HASHLIST_ID, - - 'relationType' => Hashlist::class, - 'relationKey' => Hashlist::HASHLIST_ID, - ], - ]; - } - - protected function createObject(array $data): int { - /* Dummy code to implement abstract functions */ - assert(False, "Hashes cannot be created via API"); - return -1; - } - - public function updateObject(int $objectId, array $data): void { - assert(False, "Hashes cannot be updated via API"); - } - - protected function deleteObject(object $object): void { - /* Dummy code to implement abstract functions */ - assert(False, "Hashes cannot be deleted via API"); - } + return in_array($hashlist->getAccessGroupId(), $accessGroupsUser); + } + + protected function getFilterACL(): array { + $accessGroups = Util::arrayOfIds(AccessUtils::getAccessGroupsOfUser($this->getCurrentUser())); + + return [ + Factory::JOIN => [ + new JoinFilter(Factory::getHashlistFactory(), Hash::HASHLIST_ID, Hashlist::HASHLIST_ID), + ], + Factory::FILTER => [ + new ContainFilter(Hashlist::ACCESS_GROUP_ID, $accessGroups, Factory::getHashlistFactory()), + ] + ]; + } + + public static function getToOneRelationships(): array { + return [ + 'chunk' => [ + 'key' => Hash::CHUNK_ID, + + 'relationType' => Chunk::class, + 'relationKey' => Chunk::CHUNK_ID, + ], + 'hashlist' => [ + 'key' => Hash::HASHLIST_ID, + + 'relationType' => Hashlist::class, + 'relationKey' => Hashlist::HASHLIST_ID, + ], + ]; + } + + #[NoReturn] protected function createObject(array $data): int { + assert(False, "Hashes cannot be created via API"); + } + + #[NoReturn] public function updateObject(int $objectId, array $data): void { + assert(False, "Hashes cannot be updated via API"); + } + + #[NoReturn] protected function deleteObject(object $object): void { + assert(False, "Hashes cannot be deleted via API"); + } } HashAPI::register($app); \ No newline at end of file diff --git a/src/inc/apiv2/model/hashlists.routes.php b/src/inc/apiv2/model/hashlists.routes.php index 1ee0e60ba..8278be8a0 100644 --- a/src/inc/apiv2/model/hashlists.routes.php +++ b/src/inc/apiv2/model/hashlists.routes.php @@ -18,154 +18,161 @@ class HashlistAPI extends AbstractModelAPI { - public static function getBaseUri(): string { - return "/api/v2/ui/hashlists"; - } - - public static function getDBAclass(): string { - return Hashlist::class; - } - - - public static function getToOneRelationships(): array { - return [ - 'accessGroup' => [ - 'key' => Hashlist::ACCESS_GROUP_ID, - - 'relationType' => AccessGroup::class, - 'relationKey' => AccessGroup::ACCESS_GROUP_ID, - ], - 'hashType' => [ - 'key' => Hashlist::HASH_TYPE_ID, - - 'relationType' => HashType::class, - 'relationKey' => HashType::HASH_TYPE_ID, - ], - ]; - } - - - public static function getToManyRelationships(): array { - return [ - 'hashes' => [ - 'key' => Hashlist::HASHLIST_ID, - - 'relationType' => Hash::class, - 'relationKey' => Hash::HASHLIST_ID, - ], - /* Special case due to superhashlist setup. PARENT_HASHLIST_ID in use in intermediate table */ - 'hashlists' => [ - 'key' => Hashlist::HASHLIST_ID, - - 'junctionTableType' => HashlistHashlist::class, - 'junctionTableFilterField' => HashlistHashlist::PARENT_HASHLIST_ID, - 'junctionTableJoinField' => HashlistHashlist::HASHLIST_ID, - - 'relationType' => Hashlist::class, - 'relationKey' => Hashlist::HASHLIST_ID, - ], - 'tasks' => [ - 'key' => Hashlist::HASHLIST_ID, - - 'junctionTableType' => TaskWrapper::class, - 'junctionTableFilterField' => TaskWrapper::HASHLIST_ID, - 'junctionTableJoinField' => TaskWrapper::TASK_WRAPPER_ID, - - 'relationType' => Task::class, - 'relationKey' => Task::TASK_WRAPPER_ID, - ], - ]; - } + public static function getBaseUri(): string { + return "/api/v2/ui/hashlists"; + } - protected function getSingleACL(User $user, object $object): bool { - $accessGroupsUser = Util::arrayOfIds(AccessUtils::getAccessGroupsOfUser($user)); - - return in_array($object->getAccessGroupId(), $accessGroupsUser); - } - - protected function getFilterACL(): array { - return [ - Factory::FILTER => [ - new ContainFilter(Hashlist::ACCESS_GROUP_ID, Util::arrayOfIds(AccessUtils::getAccessGroupsOfUser($this->getCurrentUser()))) - ] - ]; - } - - public function getFormFields(): array { + public static function getDBAclass(): string { + return Hashlist::class; + } + + + public static function getToOneRelationships(): array { + return [ + 'accessGroup' => [ + 'key' => Hashlist::ACCESS_GROUP_ID, + + 'relationType' => AccessGroup::class, + 'relationKey' => AccessGroup::ACCESS_GROUP_ID, + ], + 'hashType' => [ + 'key' => Hashlist::HASH_TYPE_ID, + + 'relationType' => HashType::class, + 'relationKey' => HashType::HASH_TYPE_ID, + ], + ]; + } + + + public static function getToManyRelationships(): array { + return [ + 'hashes' => [ + 'key' => Hashlist::HASHLIST_ID, + + 'relationType' => Hash::class, + 'relationKey' => Hash::HASHLIST_ID, + ], + /* Special case due to superhashlist setup. PARENT_HASHLIST_ID in use in intermediate table */ + 'hashlists' => [ + 'key' => Hashlist::HASHLIST_ID, + + 'junctionTableType' => HashlistHashlist::class, + 'junctionTableFilterField' => HashlistHashlist::PARENT_HASHLIST_ID, + 'junctionTableJoinField' => HashlistHashlist::HASHLIST_ID, + + 'relationType' => Hashlist::class, + 'relationKey' => Hashlist::HASHLIST_ID, + ], + 'tasks' => [ + 'key' => Hashlist::HASHLIST_ID, + + 'junctionTableType' => TaskWrapper::class, + 'junctionTableFilterField' => TaskWrapper::HASHLIST_ID, + 'junctionTableJoinField' => TaskWrapper::TASK_WRAPPER_ID, + + 'relationType' => Task::class, + 'relationKey' => Task::TASK_WRAPPER_ID, + ], + ]; + } + + protected function getSingleACL(User $user, object $object): bool { + $accessGroupsUser = Util::arrayOfIds(AccessUtils::getAccessGroupsOfUser($user)); + + return in_array($object->getAccessGroupId(), $accessGroupsUser); + } + + protected function getFilterACL(): array { + return [ + Factory::FILTER => [ + new ContainFilter(Hashlist::ACCESS_GROUP_ID, Util::arrayOfIds(AccessUtils::getAccessGroupsOfUser($this->getCurrentUser()))) + ] + ]; + } + + public function getFormFields(): array { // TODO Form declarations in more generic class to allow auto-generated OpenAPI specifications - return [ - "hashlistSeperator" => ['type' => 'str', "null" => True], - "sourceType" => ['type' => 'str'], - "sourceData" => ['type' => 'str'], - ]; + return [ + "hashlistSeperator" => ['type' => 'str', "null" => True], + "sourceType" => ['type' => 'str'], + "sourceData" => ['type' => 'str'], + ]; + } + + /** + * @throws HttpErrorException + * @throws HTException + */ + protected function createObject(array $data): int { + // Cast to createHashlist compatible upload format + $dummyPost = []; + switch ($data["sourceType"]) { + case "paste": + $dummyPost["hashfield"] = base64_decode($data["sourceData"]); + break; + case "import": + $dummyPost["importfile"] = $data["sourceData"]; + break; + case "url": + $dummyPost["url"] = $data["sourceData"]; + break; + default: + // TODO: Choice validation are model based checks + throw new HttpErrorException("sourceType value '" . $data["sourceType"] . "' is not supported (choices paste, import, url"); } - - protected function createObject(array $data): int { - // Cast to createHashlist compatible upload format - $dummyPost = []; - switch ($data["sourceType"]) { - case "paste": - $dummyPost["hashfield"] = base64_decode($data["sourceData"]); - break; - case "import": - $dummyPost["importfile"] = $data["sourceData"]; - break; - case "url": - $dummyPost["url"] = $data["sourceData"]; - break; - default: - // TODO: Choice validation are model based checks - throw new HttpErrorException("sourceType value '" . $data["sourceType"] . "' is not supported (choices paste, import, url"); - } - - // TODO: validate input is valid base64 encoded - if ($data["sourceType"] == "paste") { - if (strlen($data["sourceData"]) == 0) { - // TODO: Should be 400 instead - throw new HttpErrorException("sourceType=paste, requires sourceData to be non-empty"); - } - } - $hashlist = HashlistUtils::createHashlist( - $data[Hashlist::HASHLIST_NAME], - $data[Hashlist::IS_SALTED], - $data[Hashlist::IS_SECRET], - $data[Hashlist::HEX_SALT], - $data["hashlistSeperator"] ?? "", - $data[Hashlist::FORMAT], - $data[Hashlist::HASH_TYPE_ID], - $data[Hashlist::SALT_SEPARATOR] ?? $data["hashlistSeperator"] ?? "", - $data[UQueryHashlist::HASHLIST_ACCESS_GROUP_ID], - $data["sourceType"], - $dummyPost, - [], - $this->getCurrentUser(), - $data[Hashlist::BRAIN_ID], - $data[Hashlist::BRAIN_FEATURES] - ); - - // Modify fields not set on hashlist creation - if (array_key_exists("notes", $data)) { - HashlistUtils::editNotes($hashlist->getId(), $data["notes"], $this->getCurrentUser()); - }; - HashlistUtils::setArchived($hashlist->getId(), $data[UQueryHashlist::HASHLIST_IS_ARCHIVED], $this->getCurrentUser()); - - return $hashlist->getId(); - } - - protected function deleteObject(object $object): void { - HashlistUtils::delete($object->getId(), $this->getCurrentUser()); - } - - protected function getUpdateHandlers($id, $current_user): array { - return [ - Hashlist::IS_ARCHIVED => fn ($value) => HashListUtils::setArchived($id, $value, $current_user), - Hashlist::NOTES => fn ($value) => HashListUtils::editNotes($id, $value, $current_user), - Hashlist::IS_SECRET => fn ($value) => HashListUtils::setSecret($id, $value, $current_user), - Hashlist::HASHLIST_NAME => fn ($value) => HashListUtils::rename($id, $value, $current_user), - Hashlist::ACCESS_GROUP_ID => fn ($value) => HashListUtils::changeAccessGroup($id, $value, $current_user) - ]; + // TODO: validate input is valid base64 encoded + if ($data["sourceType"] == "paste") { + if (strlen($data["sourceData"]) == 0) { + // TODO: Should be 400 instead + throw new HttpErrorException("sourceType=paste, requires sourceData to be non-empty"); + } } + + $hashlist = HashlistUtils::createHashlist( + $data[Hashlist::HASHLIST_NAME], + $data[Hashlist::IS_SALTED], + $data[Hashlist::IS_SECRET], + $data[Hashlist::HEX_SALT], + $data["hashlistSeperator"] ?? "", + $data[Hashlist::FORMAT], + $data[Hashlist::HASH_TYPE_ID], + $data[Hashlist::SALT_SEPARATOR] ?? $data["hashlistSeperator"] ?? "", + $data[UQueryHashlist::HASHLIST_ACCESS_GROUP_ID], + $data["sourceType"], + $dummyPost, + [], + $this->getCurrentUser(), + $data[Hashlist::BRAIN_ID], + $data[Hashlist::BRAIN_FEATURES] + ); + + // Modify fields not set on hashlist creation + if (array_key_exists("notes", $data)) { + HashlistUtils::editNotes($hashlist->getId(), $data["notes"], $this->getCurrentUser()); + }; + HashlistUtils::setArchived($hashlist->getId(), $data[UQueryHashlist::HASHLIST_IS_ARCHIVED], $this->getCurrentUser()); + + return $hashlist->getId(); + } + + /** + * @throws HTException + */ + protected function deleteObject(object $object): void { + HashlistUtils::delete($object->getId(), $this->getCurrentUser()); + } + + protected function getUpdateHandlers($id, $current_user): array { + return [ + Hashlist::IS_ARCHIVED => fn($value) => HashListUtils::setArchived($id, $value, $current_user), + Hashlist::NOTES => fn($value) => HashListUtils::editNotes($id, $value, $current_user), + Hashlist::IS_SECRET => fn($value) => HashListUtils::setSecret($id, $value, $current_user), + Hashlist::HASHLIST_NAME => fn($value) => HashListUtils::rename($id, $value, $current_user), + Hashlist::ACCESS_GROUP_ID => fn($value) => HashListUtils::changeAccessGroup($id, $value, $current_user) + ]; + } } HashlistAPI::register($app); \ No newline at end of file diff --git a/src/inc/apiv2/model/hashtypes.routes.php b/src/inc/apiv2/model/hashtypes.routes.php index 5d10b8285..7331a78ab 100644 --- a/src/inc/apiv2/model/hashtypes.routes.php +++ b/src/inc/apiv2/model/hashtypes.routes.php @@ -1,33 +1,40 @@ getCurrentUser() - ); - - return $data[HashType::HASH_TYPE_ID]; - } - - protected function deleteObject(object $object): void { - HashtypeUtils::deleteHashtype($object->getId()); - } + public static function getBaseUri(): string { + return "/api/v2/ui/hashtypes"; + } + + public static function getDBAclass(): string { + return HashType::class; + } + + /** + * @throws HTException + */ + protected function createObject(array $data): int { + HashtypeUtils::addHashtype( + $data[HashType::HASH_TYPE_ID], + $data[HashType::DESCRIPTION], + $data[HashType::IS_SALTED], + $data[HashType::IS_SLOW_HASH], + $this->getCurrentUser() + ); + + return $data[HashType::HASH_TYPE_ID]; + } + + /** + * @throws HTException + */ + protected function deleteObject(object $object): void { + HashtypeUtils::deleteHashtype($object->getId()); + } } HashTypeAPI::register($app); \ No newline at end of file diff --git a/src/inc/apiv2/model/healthcheckagents.routes.php b/src/inc/apiv2/model/healthcheckagents.routes.php index 0a8fa8fcc..eea339fac 100644 --- a/src/inc/apiv2/model/healthcheckagents.routes.php +++ b/src/inc/apiv2/model/healthcheckagents.routes.php @@ -9,75 +9,74 @@ use DBA\HealthCheckAgent; use DBA\JoinFilter; use DBA\User; +use JetBrains\PhpStorm\NoReturn; require_once(dirname(__FILE__) . "/../common/AbstractModelAPI.class.php"); class HealthCheckAgentAPI extends AbstractModelAPI { - public static function getBaseUri(): string { - return "/api/v2/ui/healthcheckagents"; - } - - public static function getAvailableMethods(): array { - return ['GET']; - } - - public static function getDBAclass(): string { - return HealthCheckAgent::class; - } + public static function getBaseUri(): string { + return "/api/v2/ui/healthcheckagents"; + } - protected function getSingleACL(User $user, object $object): bool { - $accessGroupsUser = Util::arrayOfIds(AccessUtils::getAccessGroupsOfUser($user)); - $agent = Factory::getAgentFactory()->get($object->getAgentId()); - $accessGroupsAgent = Util::arrayOfIds(AccessUtils::getAccessGroupsOfAgent($agent)); - - return count(array_intersect($accessGroupsAgent, $accessGroupsUser)) > 0; - } + public static function getAvailableMethods(): array { + return ['GET']; + } - protected function getFilterACL(): array { - $accessGroups = Util::arrayOfIds(AccessUtils::getAccessGroupsOfUser($this->getCurrentUser())); - - return [ - Factory::JOIN => [ - new JoinFilter(Factory::getAccessGroupAgentFactory(), HealthCheckAgent::AGENT_ID, AccessGroupAgent::AGENT_ID), - ], - Factory::FILTER => [ - new ContainFilter(AccessGroupAgent::ACCESS_GROUP_ID, $accessGroups, Factory::getAccessGroupAgentFactory()), - ] - ]; - } - - public static function getToOneRelationships(): array { - return [ - 'agent' => [ - 'key' => HealthCheckAgent::AGENT_ID, - - 'relationType' => Agent::class, - 'relationKey' => Agent::AGENT_ID, - ], - 'healthCheck' => [ - 'key' => HealthCheckAgent::HEALTH_CHECK_ID, - - 'relationType' => HealthCheck::class, - 'relationKey' => HealthCheck::HEALTH_CHECK_ID, - ], - ]; - } + public static function getDBAclass(): string { + return HealthCheckAgent::class; + } + + protected function getSingleACL(User $user, object $object): bool { + $accessGroupsUser = Util::arrayOfIds(AccessUtils::getAccessGroupsOfUser($user)); + $agent = Factory::getAgentFactory()->get($object->getAgentId()); + $accessGroupsAgent = Util::arrayOfIds(AccessUtils::getAccessGroupsOfAgent($agent)); - protected function createObject(array $object): int { - /* Dummy code to implement abstract functions */ - assert(False, "HealthCheckAgents cannot be created via API"); - return -1; - } - - public function updateObject(int $objectId, array $data): void { - assert(False, "HealthCheckAgents cannot be updated via API"); - } - - protected function deleteObject(object $object): void { - /* Dummy code to implement abstract functions */ - assert(False, "HealthCheckAgents cannot be deleted via API"); - } + return count(array_intersect($accessGroupsAgent, $accessGroupsUser)) > 0; + } + + protected function getFilterACL(): array { + $accessGroups = Util::arrayOfIds(AccessUtils::getAccessGroupsOfUser($this->getCurrentUser())); + + return [ + Factory::JOIN => [ + new JoinFilter(Factory::getAccessGroupAgentFactory(), HealthCheckAgent::AGENT_ID, AccessGroupAgent::AGENT_ID), + ], + Factory::FILTER => [ + new ContainFilter(AccessGroupAgent::ACCESS_GROUP_ID, $accessGroups, Factory::getAccessGroupAgentFactory()), + ] + ]; + } + + public static function getToOneRelationships(): array { + return [ + 'agent' => [ + 'key' => HealthCheckAgent::AGENT_ID, + + 'relationType' => Agent::class, + 'relationKey' => Agent::AGENT_ID, + ], + 'healthCheck' => [ + 'key' => HealthCheckAgent::HEALTH_CHECK_ID, + + 'relationType' => HealthCheck::class, + 'relationKey' => HealthCheck::HEALTH_CHECK_ID, + ], + ]; + } + + #[NoReturn] protected function createObject(array $object): int { + assert(False, "HealthCheckAgents cannot be created via API"); + } + + #[NoReturn] public function updateObject(int $objectId, array $data): void { + assert(False, "HealthCheckAgents cannot be updated via API"); + } + + #[NoReturn] protected function deleteObject(object $object): void { + /* Dummy code to implement abstract functions */ + assert(False, "HealthCheckAgents cannot be deleted via API"); + } } HealthCheckAgentAPI::register($app); \ No newline at end of file diff --git a/src/inc/apiv2/model/healthchecks.routes.php b/src/inc/apiv2/model/healthchecks.routes.php index 56720e74d..b3df6a798 100644 --- a/src/inc/apiv2/model/healthchecks.routes.php +++ b/src/inc/apiv2/model/healthchecks.routes.php @@ -1,5 +1,4 @@ [ - 'key' => HealthCheck::CRACKER_BINARY_ID, - - 'relationType' => CrackerBinary::class, - 'relationKey' => CrackerBinary::CRACKER_BINARY_ID, - ], - 'hashType' => [ - 'key' => HealthCheck::HASHTYPE_ID, - - 'relationType' => HashType::class, - 'relationKey' => HashType::HASH_TYPE_ID, - ] - ]; - } - - public static function getToManyRelationships(): array { - return [ - 'healthCheckAgents' => [ - 'key' => HealthCheck::HEALTH_CHECK_ID, - - 'relationType' => HealthCheckAgent::class, - 'relationKey' => HealthCheckAgent::HEALTH_CHECK_ID, - ], - ]; - } - - protected function createObject(array $data): int { - $obj = HealthUtils::createHealthCheck( - $data[HealthCheck::HASHTYPE_ID], - $data[HealthCheck::CHECK_TYPE], - $data[HealthCheck::CRACKER_BINARY_ID] - ); - - return $obj->getId(); - } - - protected function deleteObject(object $object): void { - HealthUtils::deleteHealthCheck($object->getId()); - } + public static function getBaseUri(): string { + return "/api/v2/ui/healthchecks"; + } + + public static function getDBAclass(): string { + return HealthCheck::class; + } + + + public static function getToOneRelationships(): array { + return [ + 'crackerBinary' => [ + 'key' => HealthCheck::CRACKER_BINARY_ID, + + 'relationType' => CrackerBinary::class, + 'relationKey' => CrackerBinary::CRACKER_BINARY_ID, + ], + 'hashType' => [ + 'key' => HealthCheck::HASHTYPE_ID, + + 'relationType' => HashType::class, + 'relationKey' => HashType::HASH_TYPE_ID, + ] + ]; + } + + public static function getToManyRelationships(): array { + return [ + 'healthCheckAgents' => [ + 'key' => HealthCheck::HEALTH_CHECK_ID, + + 'relationType' => HealthCheckAgent::class, + 'relationKey' => HealthCheckAgent::HEALTH_CHECK_ID, + ], + ]; + } + + /** + * @throws HttpError + */ + protected function createObject(array $data): int { + $obj = HealthUtils::createHealthCheck( + $data[HealthCheck::HASHTYPE_ID], + $data[HealthCheck::CHECK_TYPE], + $data[HealthCheck::CRACKER_BINARY_ID] + ); + + return $obj->getId(); + } + + /** + * @throws HTException + */ + protected function deleteObject(object $object): void { + HealthUtils::deleteHealthCheck($object->getId()); + } } HealthCheckAPI::register($app); \ No newline at end of file diff --git a/src/inc/apiv2/model/logentries.routes.php b/src/inc/apiv2/model/logentries.routes.php index 0c184b3ac..2e7f34763 100644 --- a/src/inc/apiv2/model/logentries.routes.php +++ b/src/inc/apiv2/model/logentries.routes.php @@ -1,30 +1,29 @@ delete($object); - } + public static function getBaseUri(): string { + return "/api/v2/ui/logentries"; + } + + public static function getDBAclass(): string { + return LogEntry::class; + } + + #[NoReturn] protected function createObject(array $data): int { + assert(False, "Logentries cannot be created via API"); + } + + protected function deleteObject(object $object): void { + Factory::getLogEntryFactory()->delete($object); + } } LogEntryAPI::register($app); \ No newline at end of file diff --git a/src/inc/apiv2/model/notifications.routes.php b/src/inc/apiv2/model/notifications.routes.php index f54b77676..ad40e3d33 100644 --- a/src/inc/apiv2/model/notifications.routes.php +++ b/src/inc/apiv2/model/notifications.routes.php @@ -1,4 +1,5 @@ [ - 'key' => NotificationSetting::USER_ID, - - 'relationType' => User::class, - 'relationKey' => User::USER_ID, - ], - ]; - } - - function getAllPostParameters(array $features): array { - $features = parent::getAllPostParameters($features); - unset($features[NotificationSetting::IS_ACTIVE]); - return $features; - } - - public function getFormFields(): array { - return ['actionFilter' => ['type' => 'str(256)']]; - } - - protected function createObject(array $data): int { - $dummyPost = []; - switch (DNotificationType::getObjectType($data[NotificationSetting::ACTION])) { - case DNotificationObjectType::USER: - $dummyPost['user'] = $data['actionFilter']; - break; - case DNotificationObjectType::AGENT: - $dummyPost['agents'] = $data['actionFilter']; - break; - case DNotificationObjectType::HASHLIST: - $dummyPost['hashlists'] = $data['actionFilter']; - break; - case DNotificationObjectType::TASK: - $dummyPost['tasks'] = $data['actionFilter']; - break; - } - - - NotificationUtils::createNotificaton( - $data[NotificationSetting::ACTION], - $data[NotificationSetting::NOTIFICATION], - $data[NotificationSetting::RECEIVER], - $dummyPost, - $this->getCurrentUser(), - ); - - /* On succesfully insert, return ID */ - $qFs = [ - new QueryFilter(NotificationSetting::ACTION, $data[NotificationSetting::ACTION], '='), - new QueryFilter(NotificationSetting::NOTIFICATION, $data[NotificationSetting::NOTIFICATION], '='), - new QueryFilter(NotificationSetting::RECEIVER, $data[NotificationSetting::RECEIVER], '='), - ]; - - /* Hackish way to retreive object since Id is not returned on creation */ - $oF = new OrderFilter(NotificationSetting::NOTIFICATION_SETTING_ID, "DESC"); - $objects = $this->getFactory()->filter([Factory::FILTER => $qFs, Factory::ORDER => $oF]); - /* No unique properties set on columns, thus multiple entries could exists, pick the latest (DESC ordering used) */ - assert(count($objects) >= 1); - - return $objects[0]->getId(); - } - - protected function deleteObject(object $object): void { - NotificationUtils::delete($object->getId(), $this->getCurrentUser()); - } - - protected function getUpdateHandlers($id, $current_user): array { - return [ - NotificationSetting::IS_ACTIVE => fn ($value) => NotificationUtils::setActive($id, $value, false, $current_user), - ]; + public static function getBaseUri(): string { + return "/api/v2/ui/notifications"; + } + + public static function getDBAclass(): string { + return NotificationSetting::class; + } + + public static function getToOneRelationships(): array { + return [ + 'user' => [ + 'key' => NotificationSetting::USER_ID, + + 'relationType' => User::class, + 'relationKey' => User::USER_ID, + ], + ]; + } + + function getAllPostParameters(array $features): array { + $features = parent::getAllPostParameters($features); + unset($features[NotificationSetting::IS_ACTIVE]); + return $features; + } + + public function getFormFields(): array { + return ['actionFilter' => ['type' => 'str(256)']]; + } + + /** + * @throws HTException + */ + protected function createObject(array $data): int { + $dummyPost = []; + switch (DNotificationType::getObjectType($data[NotificationSetting::ACTION])) { + case DNotificationObjectType::USER: + $dummyPost['user'] = $data['actionFilter']; + break; + case DNotificationObjectType::AGENT: + $dummyPost['agents'] = $data['actionFilter']; + break; + case DNotificationObjectType::HASHLIST: + $dummyPost['hashlists'] = $data['actionFilter']; + break; + case DNotificationObjectType::TASK: + $dummyPost['tasks'] = $data['actionFilter']; + break; } + + + NotificationUtils::createNotificaton( + $data[NotificationSetting::ACTION], + $data[NotificationSetting::NOTIFICATION], + $data[NotificationSetting::RECEIVER], + $dummyPost, + $this->getCurrentUser(), + ); + + /* On successfully insert, return ID */ + $qFs = [ + new QueryFilter(NotificationSetting::ACTION, $data[NotificationSetting::ACTION], '='), + new QueryFilter(NotificationSetting::NOTIFICATION, $data[NotificationSetting::NOTIFICATION], '='), + new QueryFilter(NotificationSetting::RECEIVER, $data[NotificationSetting::RECEIVER], '='), + ]; + + /* Hackish way to retrieve object since Id is not returned on creation */ + $oF = new OrderFilter(NotificationSetting::NOTIFICATION_SETTING_ID, "DESC"); + $objects = $this->getFactory()->filter([Factory::FILTER => $qFs, Factory::ORDER => $oF]); + /* No unique properties set on columns, thus multiple entries could exists, pick the latest (DESC ordering used) */ + assert(count($objects) >= 1); + + return $objects[0]->getId(); + } + + /** + * @throws HTException + */ + protected function deleteObject(object $object): void { + NotificationUtils::delete($object->getId(), $this->getCurrentUser()); + } + + protected function getUpdateHandlers($id, $current_user): array { + return [ + NotificationSetting::IS_ACTIVE => fn($value) => NotificationUtils::setActive($id, $value, false, $current_user), + ]; + } } NotificationSettingAPI::register($app); \ No newline at end of file diff --git a/src/inc/apiv2/model/preprocessors.routes.php b/src/inc/apiv2/model/preprocessors.routes.php index 269ea6dd9..5f9410ecc 100644 --- a/src/inc/apiv2/model/preprocessors.routes.php +++ b/src/inc/apiv2/model/preprocessors.routes.php @@ -1,4 +1,5 @@ getFactory()->filter([Factory::FILTER => $qFs, Factory::ORDER => $oF]); - assert(count($objects) == 1); - - return $objects[0]->getId(); - } - - protected function getUpdateHandlers($id, $current_user): array { - return [ - Preprocessor::NAME => fn ($value) => PreprocessorUtils::editName($id, $value), - Preprocessor::BINARY_NAME => fn ($value) => PreprocessorUtils::editBinaryName($id, $value), - Preprocessor::KEYSPACE_COMMAND => fn ($value) => PreprocessorUtils::editKeyspaceCommand($id, $value), - Preprocessor::LIMIT_COMMAND => fn ($value) => PreprocessorUtils::editLimitCommand($id, $value), - Preprocessor::SKIP_COMMAND => fn ($value) => PreprocessorUtils::editSkipCommand($id, $value), - ]; - } - - protected function deleteObject(object $object): void { - PreprocessorUtils::delete($object->getId()); - } + public static function getBaseUri(): string { + return "/api/v2/ui/preprocessors"; + } + + public static function getDBAclass(): string { + return Preprocessor::class; + } + + /** + * @throws HttpError + */ + protected function createObject(array $data): int { + PreprocessorUtils::addPreprocessor( + $data[Preprocessor::NAME], + $data[Preprocessor::BINARY_NAME], + $data[Preprocessor::URL], + $data[Preprocessor::KEYSPACE_COMMAND], + $data[Preprocessor::SKIP_COMMAND], + $data[Preprocessor::LIMIT_COMMAND] + ); + + /* On successfully insert, return ID */ + $qFs = [ + new QueryFilter(Preprocessor::NAME, $data[Preprocessor::NAME], '='), + new QueryFilter(Preprocessor::BINARY_NAME, $data[Preprocessor::BINARY_NAME], '=') + ]; + + /* Hackish way to retrieve object since Id is not returned on creation */ + $oF = new OrderFilter(Preprocessor::PREPROCESSOR_ID, "DESC"); + $objects = $this->getFactory()->filter([Factory::FILTER => $qFs, Factory::ORDER => $oF]); + assert(count($objects) == 1); + + return $objects[0]->getId(); + } + + protected function getUpdateHandlers($id, $current_user): array { + return [ + Preprocessor::NAME => fn($value) => PreprocessorUtils::editName($id, $value), + Preprocessor::BINARY_NAME => fn($value) => PreprocessorUtils::editBinaryName($id, $value), + Preprocessor::KEYSPACE_COMMAND => fn($value) => PreprocessorUtils::editKeyspaceCommand($id, $value), + Preprocessor::LIMIT_COMMAND => fn($value) => PreprocessorUtils::editLimitCommand($id, $value), + Preprocessor::SKIP_COMMAND => fn($value) => PreprocessorUtils::editSkipCommand($id, $value), + ]; + } + + /** + * @throws HttpError + */ + protected function deleteObject(object $object): void { + PreprocessorUtils::delete($object->getId()); + } } PreprocessorAPI::register($app); \ No newline at end of file diff --git a/src/inc/apiv2/model/pretasks.routes.php b/src/inc/apiv2/model/pretasks.routes.php index f1f8f5708..483ed0528 100644 --- a/src/inc/apiv2/model/pretasks.routes.php +++ b/src/inc/apiv2/model/pretasks.routes.php @@ -1,6 +1,6 @@ [ - 'key' => Pretask::PRETASK_ID, - - 'junctionTableType' => FilePretask::class, - 'junctionTableFilterField' => FilePretask::PRETASK_ID, - 'junctionTableJoinField' => FilePretask::FILE_ID, - - 'relationType' => File::class, - 'relationKey' => File::FILE_ID, - ], - ]; - } - - public function getFormFields(): array { + public static function getBaseUri(): string { + return "/api/v2/ui/pretasks"; + } + + public static function getDBAclass(): string { + return Pretask::class; + } + + public static function getToManyRelationships(): array { + return [ + 'pretaskFiles' => [ + 'key' => Pretask::PRETASK_ID, + + 'junctionTableType' => FilePretask::class, + 'junctionTableFilterField' => FilePretask::PRETASK_ID, + 'junctionTableJoinField' => FilePretask::FILE_ID, + + 'relationType' => File::class, + 'relationKey' => File::FILE_ID, + ], + ]; + } + + public function getFormFields(): array { // TODO Form declarations in more generic class to allow auto-generated OpenAPI specifications - return [ - "files" => ['type' => 'array', 'subtype' => 'int'] - ]; - } - - protected function createObject(array $data): int { - /* Use quirk on 'files' since this is casted to DB representation */ - PretaskUtils::createPretask( - $data[PreTask::TASK_NAME], - $data[PreTask::ATTACK_CMD], - $data[PreTask::CHUNK_TIME], - $data[PreTask::STATUS_TIMER], - $data[PreTask::COLOR], - $data[PreTask::IS_CPU_TASK], - $data[PreTask::IS_SMALL], - $data[PreTask::USE_NEW_BENCH], - $this->db2json($this->getFeatures()['files'], $data["files"]), - $data[PreTask::CRACKER_BINARY_TYPE_ID], - $data[PreTask::MAX_AGENTS], - $data[PreTask::PRIORITY] - ); - - /* On succesfully insert, return ID */ - $qFs = [ - new QueryFilter(PreTask::TASK_NAME, $data[PreTask::TASK_NAME], '='), - new QueryFilter(PreTask::ATTACK_CMD, $data[PreTask::ATTACK_CMD], '=') - ]; - - /* Hackish way to retreive object since Id is not returned on creation */ - $oF = new OrderFilter(PreTask::PRETASK_ID, "DESC"); - $objects = $this->getFactory()->filter([Factory::FILTER => $qFs, Factory::ORDER => $oF]); - assert(count($objects) >= 1); - - return $objects[0]->getId(); - } - - protected function getUpdateHandlers($id, $current_user): array { - return [ - Pretask::ATTACK_CMD => fn ($value) => PretaskUtils::changeAttack($id, $value), - Pretask::COLOR => fn ($value) => PretaskUtils::setColor($id, $value), - ]; - } - - protected function deleteObject(object $object): void { - PretaskUtils::deletePretask($object->getId()); - } + return [ + "files" => ['type' => 'array', 'subtype' => 'int'] + ]; + } + + /** + * @throws HttpError + */ + protected function createObject(array $data): int { + /* Use quirk on 'files' since this is casted to DB representation */ + PretaskUtils::createPretask( + $data[PreTask::TASK_NAME], + $data[PreTask::ATTACK_CMD], + $data[PreTask::CHUNK_TIME], + $data[PreTask::STATUS_TIMER], + $data[PreTask::COLOR], + $data[PreTask::IS_CPU_TASK], + $data[PreTask::IS_SMALL], + $data[PreTask::USE_NEW_BENCH], + $this->db2json($this->getFeatures()['files'], $data["files"]), + $data[PreTask::CRACKER_BINARY_TYPE_ID], + $data[PreTask::MAX_AGENTS], + $data[PreTask::PRIORITY] + ); + + /* On successfully insert, return ID */ + $qFs = [ + new QueryFilter(PreTask::TASK_NAME, $data[PreTask::TASK_NAME], '='), + new QueryFilter(PreTask::ATTACK_CMD, $data[PreTask::ATTACK_CMD], '=') + ]; + + /* Hackish way to retrieve object since Id is not returned on creation */ + $oF = new OrderFilter(PreTask::PRETASK_ID, "DESC"); + $objects = $this->getFactory()->filter([Factory::FILTER => $qFs, Factory::ORDER => $oF]); + assert(count($objects) >= 1); + + return $objects[0]->getId(); + } + + protected function getUpdateHandlers($id, $current_user): array { + return [ + Pretask::ATTACK_CMD => fn($value) => PretaskUtils::changeAttack($id, $value), + Pretask::COLOR => fn($value) => PretaskUtils::setColor($id, $value), + ]; + } + + /** + * @throws HTException + */ + protected function deleteObject(object $object): void { + PretaskUtils::deletePretask($object->getId()); + } } PreTaskAPI::register($app); \ No newline at end of file diff --git a/src/inc/apiv2/model/speeds.routes.php b/src/inc/apiv2/model/speeds.routes.php index 48e541f6a..98d9e448f 100644 --- a/src/inc/apiv2/model/speeds.routes.php +++ b/src/inc/apiv2/model/speeds.routes.php @@ -11,94 +11,94 @@ use DBA\Task; use DBA\TaskWrapper; use DBA\User; +use JetBrains\PhpStorm\NoReturn; require_once(dirname(__FILE__) . "/../common/AbstractModelAPI.class.php"); class SpeedAPI extends AbstractModelAPI { - public static function getBaseUri(): string { - return "/api/v2/ui/speeds"; - } - - public static function getAvailableMethods(): array { - return ['GET']; - } - - public function getPermission(): string { - // TODO: Find proper permission - return DAccessControl::CREATE_HASHLIST_ACCESS; - } - - public static function getDBAclass(): string { - return Speed::class; - } + public static function getBaseUri(): string { + return "/api/v2/ui/speeds"; + } - protected function getSingleACL(User $user, object $object): bool { - $accessGroupsUser = Util::arrayOfIds(AccessUtils::getAccessGroupsOfUser($user)); - - $agent = Factory::getAgentFactory()->get($object->getAgentId()); - $accessGroupsAgent = Util::arrayOfIds(AccessUtils::getAccessGroupsOfAgent($agent)); - - if (count(array_intersect($accessGroupsAgent, $accessGroupsUser)) == 0){ - return false; - } - - $qF = new ContainFilter(Hashlist::ACCESS_GROUP_ID, $accessGroupsUser, Factory::getHashlistFactory()); - $jF1 = new JoinFilter(Factory::getTaskFactory(), Speed::TASK_ID, Task::TASK_ID); - $jF2 = new JoinFilter(Factory::getTaskWrapperFactory(), Task::TASK_WRAPPER_ID, TaskWrapper::TASK_WRAPPER_ID, Factory::getTaskFactory()); - $jF3 = new JoinFilter(Factory::getHashlistFactory(), TaskWrapper::HASHLIST_ID, Hashlist::HASHLIST_ID, Factory::getTaskWrapperFactory()); - $hashlist = Factory::getSpeedFactory()->filter([Factory::FILTER => $qF, Factory::JOIN => [$jF1, $jF2, $jF3]])[Factory::getSpeedFactory()->getModelName()]; - - return count($hashlist) > 0; - } + public static function getAvailableMethods(): array { + return ['GET']; + } - protected function getFilterACL(): array { - $accessGroups = Util::arrayOfIds(AccessUtils::getAccessGroupsOfUser($this->getCurrentUser())); - - return [ - Factory::JOIN => [ - new JoinFilter(Factory::getAccessGroupAgentFactory(), Speed::AGENT_ID, AccessGroupAgent::AGENT_ID), - new JoinFilter(Factory::getTaskFactory(), Speed::TASK_ID, Task::TASK_ID), - new JoinFilter(Factory::getTaskWrapperFactory(), Task::TASK_WRAPPER_ID, TaskWrapper::TASK_WRAPPER_ID, Factory::getTaskFactory()), - new JoinFilter(Factory::getHashlistFactory(), TaskWrapper::HASHLIST_ID, Hashlist::HASHLIST_ID, Factory::getTaskWrapperFactory()), - ], - Factory::FILTER => [ - new ContainFilter(AccessGroupAgent::ACCESS_GROUP_ID, $accessGroups, Factory::getAccessGroupAgentFactory()), - new ContainFilter(Hashlist::ACCESS_GROUP_ID, $accessGroups, Factory::getHashlistFactory()), - ] - ]; - } - - - public static function getToOneRelationships(): array { - return [ - 'agent' => [ - 'key' => Speed::AGENT_ID, - - 'relationType' => Agent::class, - 'relationKey' => Agent::AGENT_ID, - ], - 'task' => [ - 'key' => Speed::TASK_ID, - - 'relationType' => Task::class, - 'relationKey' => Task::TASK_ID, - ], - ]; + public function getPermission(): string { + // TODO: Find proper permission + return DAccessControl::CREATE_HASHLIST_ACCESS; + } + + public static function getDBAclass(): string { + return Speed::class; + } + + protected function getSingleACL(User $user, object $object): bool { + $accessGroupsUser = Util::arrayOfIds(AccessUtils::getAccessGroupsOfUser($user)); + + $agent = Factory::getAgentFactory()->get($object->getAgentId()); + $accessGroupsAgent = Util::arrayOfIds(AccessUtils::getAccessGroupsOfAgent($agent)); + + if (count(array_intersect($accessGroupsAgent, $accessGroupsUser)) == 0) { + return false; } - - protected function createObject(array $data): int { - assert(False, "Speeds cannot be created via API"); - return -1; - } - - public function updateObject(int $objectId, array $data): void { + + $qF = new ContainFilter(Hashlist::ACCESS_GROUP_ID, $accessGroupsUser, Factory::getHashlistFactory()); + $jF1 = new JoinFilter(Factory::getTaskFactory(), Speed::TASK_ID, Task::TASK_ID); + $jF2 = new JoinFilter(Factory::getTaskWrapperFactory(), Task::TASK_WRAPPER_ID, TaskWrapper::TASK_WRAPPER_ID, Factory::getTaskFactory()); + $jF3 = new JoinFilter(Factory::getHashlistFactory(), TaskWrapper::HASHLIST_ID, Hashlist::HASHLIST_ID, Factory::getTaskWrapperFactory()); + $hashlist = Factory::getSpeedFactory()->filter([Factory::FILTER => $qF, Factory::JOIN => [$jF1, $jF2, $jF3]])[Factory::getSpeedFactory()->getModelName()]; + + return count($hashlist) > 0; + } + + protected function getFilterACL(): array { + $accessGroups = Util::arrayOfIds(AccessUtils::getAccessGroupsOfUser($this->getCurrentUser())); + + return [ + Factory::JOIN => [ + new JoinFilter(Factory::getAccessGroupAgentFactory(), Speed::AGENT_ID, AccessGroupAgent::AGENT_ID), + new JoinFilter(Factory::getTaskFactory(), Speed::TASK_ID, Task::TASK_ID), + new JoinFilter(Factory::getTaskWrapperFactory(), Task::TASK_WRAPPER_ID, TaskWrapper::TASK_WRAPPER_ID, Factory::getTaskFactory()), + new JoinFilter(Factory::getHashlistFactory(), TaskWrapper::HASHLIST_ID, Hashlist::HASHLIST_ID, Factory::getTaskWrapperFactory()), + ], + Factory::FILTER => [ + new ContainFilter(AccessGroupAgent::ACCESS_GROUP_ID, $accessGroups, Factory::getAccessGroupAgentFactory()), + new ContainFilter(Hashlist::ACCESS_GROUP_ID, $accessGroups, Factory::getHashlistFactory()), + ] + ]; + } + + + public static function getToOneRelationships(): array { + return [ + 'agent' => [ + 'key' => Speed::AGENT_ID, + + 'relationType' => Agent::class, + 'relationKey' => Agent::AGENT_ID, + ], + 'task' => [ + 'key' => Speed::TASK_ID, + + 'relationType' => Task::class, + 'relationKey' => Task::TASK_ID, + ], + ]; + } + + #[NoReturn] protected function createObject(array $data): int { + assert(False, "Speeds cannot be created via API"); + } + + #[NoReturn] public function updateObject(int $objectId, array $data): void { assert(False, "Speeds cannot be updated via API"); - } - - protected function deleteObject(object $object): void { - assert(False, "Speeds cannot be deleted via API"); - } + } + + #[NoReturn] protected function deleteObject(object $object): void { + assert(False, "Speeds cannot be deleted via API"); + } } SpeedAPI::register($app); \ No newline at end of file diff --git a/src/inc/apiv2/model/supertasks.routes.php b/src/inc/apiv2/model/supertasks.routes.php index 9a355fa03..cf0e4a8ee 100644 --- a/src/inc/apiv2/model/supertasks.routes.php +++ b/src/inc/apiv2/model/supertasks.routes.php @@ -1,4 +1,5 @@ [ + 'key' => Supertask::SUPERTASK_ID, + + 'junctionTableType' => SupertaskPretask::class, + 'junctionTableFilterField' => SupertaskPretask::SUPERTASK_ID, + 'junctionTableJoinField' => SupertaskPretask::PRETASK_ID, + + 'relationType' => Pretask::class, + 'relationKey' => Pretask::PRETASK_ID, + ], + ]; + } + + public function getFormFields(): array { + return [ + "pretasks" => ['type' => 'array', 'subtype' => 'int'] + ]; + } + + protected function createObject(array $data): int { + /* Use quirk on 'pretasks' since this is casted to DB representation */ + SupertaskUtils::createSupertask( + $data[Supertask::SUPERTASK_NAME], + $this->db2json($this->getFeatures()['pretasks'], $data["pretasks"]) + ); + + /* On successfully insert, return ID */ + $qFs = [ + new QueryFilter(Supertask::SUPERTASK_NAME, $data[Supertask::SUPERTASK_NAME], '=') + ]; + + /* Hackish way to retrieve object since Id is not returned on creation */ + $oF = new OrderFilter(Supertask::SUPERTASK_ID, "DESC"); + $objects = $this->getFactory()->filter([Factory::FILTER => $qFs, Factory::ORDER => $oF]); + /* No unique properties set on columns, thus multiple entries could exists, pick the latest (DESC ordering used) */ + assert(count($objects) >= 1); + + return $objects[0]->getId(); + } + + /** + * @throws HttpError + * @throws HTException + */ + public function updateToManyRelationship(Request $request, array $data, array $args): void { + $id = $args['id']; + $wantedPretasks = []; + foreach ($data as $pretask) { + if (!$this->validateResourceRecord($pretask)) { + $encoded_pretask = json_encode($pretask); + throw new HttpError('Invalid resource record given in list! invalid resource record: ' . $encoded_pretask); + } + array_push($wantedPretasks, self::getPretask($pretask["id"])); } - - public static function getDBAclass(): string { - return Supertask::class; + + // Find out which to add and remove + $currentPretasks = SupertaskUtils::getPretasksOfSupertask($id); + function compare_ids($a, $b) { + return ($a->getId() - $b->getId()); } - - public static function getToManyRelationships(): array { - return [ - 'pretasks' => [ - 'key' => Supertask::SUPERTASK_ID, - - 'junctionTableType' => SupertaskPretask::class, - 'junctionTableFilterField' => SupertaskPretask::SUPERTASK_ID, - 'junctionTableJoinField' => SupertaskPretask::PRETASK_ID, - - 'relationType' => Pretask::class, - 'relationKey' => Pretask::PRETASK_ID, - ], - ]; - } - - public function getFormFields(): array { - return [ - "pretasks" => ['type' => 'array', 'subtype' => 'int'] - ]; + + $toAddPretasks = array_udiff($wantedPretasks, $currentPretasks, 'compare_ids'); + $toRemovePretasks = array_udiff($currentPretasks, $wantedPretasks, 'compare_ids'); + + $factory = $this->getFactory(); + $factory->getDB()->beginTransaction(); //start transaction to be able roll back + + // Update models + foreach ($toAddPretasks as $pretask) { + SupertaskUtils::addPretaskToSupertask($id, $pretask->getId()); } - - protected function createObject(array $data): int { - /* Use quirk on 'pretasks' since this is casted to DB representation */ - SupertaskUtils::createSupertask( - $data[Supertask::SUPERTASK_NAME], - $this->db2json($this->getFeatures()['pretasks'], $data["pretasks"]) - ); - - /* On succesfully insert, return ID */ - $qFs = [ - new QueryFilter(Supertask::SUPERTASK_NAME, $data[Supertask::SUPERTASK_NAME], '=') - ]; - - /* Hackish way to retreive object since Id is not returned on creation */ - $oF = new OrderFilter(Supertask::SUPERTASK_ID, "DESC"); - $objects = $this->getFactory()->filter([Factory::FILTER => $qFs, Factory::ORDER => $oF]); - /* No unique properties set on columns, thus multiple entries could exists, pick the latest (DESC ordering used) */ - assert(count($objects) >= 1); - - return $objects[0]->getId(); - } - - public function updateToManyRelationship(Request $request, array $data, array $args): void { - $id = $args['id']; - $wantedPretasks = []; - foreach($data as $pretask) { - if (!$this->validateResourceRecord($pretask)) { - $encoded_pretask = json_encode($pretask); - throw new HttpError('Invalid resource record given in list! invalid resource record: ' . $encoded_pretask); - } - array_push($wantedPretasks, self::getPretask($pretask["id"])); - } - - // Find out which to add and remove - $currentPretasks = SupertaskUtils::getPretasksOfSupertask($id); - function compare_ids($a, $b) - { - return ($a->getId() - $b->getId()); - } - $toAddPretasks = array_udiff($wantedPretasks, $currentPretasks, 'compare_ids'); - $toRemovePretasks = array_udiff($currentPretasks, $wantedPretasks, 'compare_ids'); - - $factory = $this->getFactory(); - $factory->getDB()->beginTransaction(); //start transaction to be able roll back - - // Update models - foreach($toAddPretasks as $pretask) { - SupertaskUtils::addPretaskToSupertask($id, $pretask->getId()); - } - foreach($toRemovePretasks as $pretask) { - SupertaskUtils::removePretaskFromSupertask($id, $pretask->getId()); - } - - if (!$factory->getDB()->commit()) { - throw new HttpError("Was not able to update to many relationship"); - } + foreach ($toRemovePretasks as $pretask) { + SupertaskUtils::removePretaskFromSupertask($id, $pretask->getId()); } - - protected function deleteObject(object $object): void { - SupertaskUtils::deleteSupertask($object->getId()); + + if (!$factory->getDB()->commit()) { + throw new HttpError("Was not able to update to many relationship"); } + } + + /** + * @throws HTException + */ + protected function deleteObject(object $object): void { + SupertaskUtils::deleteSupertask($object->getId()); + } } SupertaskAPI::register($app); \ No newline at end of file diff --git a/src/inc/apiv2/model/tasks.routes.php b/src/inc/apiv2/model/tasks.routes.php index 45c8abd06..1f7f6e292 100644 --- a/src/inc/apiv2/model/tasks.routes.php +++ b/src/inc/apiv2/model/tasks.routes.php @@ -1,6 +1,5 @@ getId(), "="); - $jF1 = new JoinFilter(Factory::getTaskWrapperFactory(), Task::TASK_WRAPPER_ID, TaskWrapper::TASK_WRAPPER_ID, Factory::getTaskFactory()); - $jF2 = new JoinFilter(Factory::getHashlistFactory(), TaskWrapper::HASHLIST_ID, Hashlist::HASHLIST_ID, Factory::getTaskWrapperFactory()); - $tasks = Factory::getTaskFactory()->filter([Factory::FILTER => [$qF1, $qF2], Factory::JOIN => [$jF1, $jF2]])[Factory::getTaskFactory()->getModelName()]; - - return count($tasks) > 0; - } + public static function getDBAclass(): string { + return Task::class; + } - protected function getFilterACL(): array { - $accessGroups = Util::arrayOfIds(AccessUtils::getAccessGroupsOfUser($this->getCurrentUser())); - - return [ - Factory::JOIN => [ - new JoinFilter(Factory::getTaskWrapperFactory(), Task::TASK_WRAPPER_ID, TaskWrapper::TASK_WRAPPER_ID), - new JoinFilter(Factory::getHashlistFactory(), TaskWrapper::HASHLIST_ID, Hashlist::HASHLIST_ID, Factory::getTaskWrapperFactory()), - ], - Factory::FILTER => [ - new ContainFilter(Hashlist::ACCESS_GROUP_ID, $accessGroups, Factory::getHashlistFactory()), - ] - ]; - } - - public static function getToOneRelationships(): array { - return [ - 'crackerBinary' => [ - 'key' => Task::CRACKER_BINARY_ID, - - 'relationType' => CrackerBinary::class, - 'relationKey' => CrackerBinary::CRACKER_BINARY_ID, - ], - 'crackerBinaryType' => [ - 'key' => Task::CRACKER_BINARY_TYPE_ID, - - 'relationType' => CrackerBinaryType::class, - 'relationKey' => CrackerBinaryType::CRACKER_BINARY_TYPE_ID, - ], - 'hashlist' => [ - 'key' => TaskWrapper::HASHLIST_ID, - - 'relationType' => Hashlist::class, - 'relationKey' => Hashlist::HASHLIST_ID, - - //because task doesnt have a direct connection to hashlist - 'intermediateType' => TaskWrapper::class, - 'joinField' => Task::TASK_WRAPPER_ID, - 'joinFieldRelation' => TaskWrapper::TASK_WRAPPER_ID, - - 'junctionTableType' => TaskWrapper::class, - 'junctionTableFilterField' => TaskWrapper::HASHLIST_ID, - 'junctionTableJoinField' => TaskWrapper::TASK_WRAPPER_ID, - - 'parentKey' => Task::TASK_ID - ], - ]; - } - - public static function getToManyRelationships(): array { - return [ - 'assignedAgents' => [ - 'key' => Task::TASK_ID, - - 'junctionTableType' => Assignment::class, - 'junctionTableFilterField' => Assignment::TASK_ID, - 'junctionTableJoinField' => Assignment::AGENT_ID, - - 'relationType' => Agent::class, - 'relationKey' => Agent::AGENT_ID, - ], - 'files' => [ - 'key' => Task::TASK_ID, - - 'junctionTableType' => FileTask::class, - 'junctionTableFilterField' => FileTask::TASK_ID, - 'junctionTableJoinField' => FileTask::FILE_ID, - - 'relationType' => File::class, - 'relationKey' => File::FILE_ID, - ], - 'speeds' => [ - 'key' => Task::TASK_ID, - - 'relationType' => Speed::class, - 'relationKey' => Speed::TASK_ID, - ] - ]; - } + protected function getSingleACL(User $user, object $object): bool { + $accessGroupsUser = Util::arrayOfIds(AccessUtils::getAccessGroupsOfUser($user)); - public function getFormFields(): array { - // TODO Form declarations in more generic class to allow auto-generated OpenAPI specifications - return [ - "hashlistId" => ['type' => 'int'], - "files" => ['type' => 'array', 'subtype' => 'int'], - ]; - } - - protected function createObject(array $data): int { - /* Parameter is used as primary key in database */ - - $object = TaskUtils::createTask( - $data["hashlistId"], - $data[Task::TASK_NAME], - $data[Task::ATTACK_CMD], - $data[Task::CHUNK_TIME], - $data[Task::STATUS_TIMER], - $data[Task::USE_NEW_BENCH] ? 'speed': 'runtime', - $data[Task::COLOR], - $data[Task::IS_CPU_TASK], - $data[Task::IS_SMALL], - $data[Task::USE_PREPROCESSOR], - $data[Task::PREPROCESSOR_COMMAND], - $data[Task::SKIP_KEYSPACE], - $data[Task::PRIORITY], - $data[Task::MAX_AGENTS], - $this->db2json($this->getFeatures()['files'], $data["files"]), - $data[Task::CRACKER_BINARY_TYPE_ID], - $this->getCurrentUser(), - $data[Task::NOTES], - $data[Task::STATIC_CHUNKS], - $data[Task::CHUNK_SIZE] - ); - - return $object->getId(); - } - - //TODO make aggregate data queryable and not included by default - static function aggregateData(object $object): array { - $keyspace = $object->getKeyspace(); - $keyspaceProgress = $object->getKeyspaceProgress(); - - $aggregatedData["dispatched"] = Util::showperc($keyspaceProgress, $keyspace); - $aggregatedData["searched"] = Util::showperc(TaskUtils::getTaskProgress($object), $keyspace); - - $qF = new QueryFilter(Chunk::TASK_ID, $object->getId(), "="); - $chunks = Factory::getChunkFactory()->filter([Factory::FILTER => $qF]); - - $activeAgents = []; - foreach($chunks as $chunk) { - if (time() - max($chunk->getSolveTime(), $chunk->getDispatchTime()) < SConfig::getInstance()->getVal(DConfig::CHUNK_TIMEOUT) && $chunk->getProgress() < 10000) { - $activeAgents[$chunk->getAgentId()] = true; - } - } - - //status 1 is running, 2 is idle and 3 is completed - $status = 2; - if ($keyspaceProgress >= $keyspace && $keyspaceProgress > 0) { - $status = 3; - } elseif (count($activeAgents) > 0) { - $status = 1; + $qF1 = new ContainFilter(Hashlist::ACCESS_GROUP_ID, $accessGroupsUser, Factory::getHashlistFactory()); + $qF2 = new QueryFilter(Task::TASK_ID, $object->getId(), "="); + $jF1 = new JoinFilter(Factory::getTaskWrapperFactory(), Task::TASK_WRAPPER_ID, TaskWrapper::TASK_WRAPPER_ID, Factory::getTaskFactory()); + $jF2 = new JoinFilter(Factory::getHashlistFactory(), TaskWrapper::HASHLIST_ID, Hashlist::HASHLIST_ID, Factory::getTaskWrapperFactory()); + $tasks = Factory::getTaskFactory()->filter([Factory::FILTER => [$qF1, $qF2], Factory::JOIN => [$jF1, $jF2]])[Factory::getTaskFactory()->getModelName()]; + + return count($tasks) > 0; + } + + protected function getFilterACL(): array { + $accessGroups = Util::arrayOfIds(AccessUtils::getAccessGroupsOfUser($this->getCurrentUser())); + + return [ + Factory::JOIN => [ + new JoinFilter(Factory::getTaskWrapperFactory(), Task::TASK_WRAPPER_ID, TaskWrapper::TASK_WRAPPER_ID), + new JoinFilter(Factory::getHashlistFactory(), TaskWrapper::HASHLIST_ID, Hashlist::HASHLIST_ID, Factory::getTaskWrapperFactory()), + ], + Factory::FILTER => [ + new ContainFilter(Hashlist::ACCESS_GROUP_ID, $accessGroups, Factory::getHashlistFactory()), + ] + ]; + } + + public static function getToOneRelationships(): array { + return [ + 'crackerBinary' => [ + 'key' => Task::CRACKER_BINARY_ID, + + 'relationType' => CrackerBinary::class, + 'relationKey' => CrackerBinary::CRACKER_BINARY_ID, + ], + 'crackerBinaryType' => [ + 'key' => Task::CRACKER_BINARY_TYPE_ID, + + 'relationType' => CrackerBinaryType::class, + 'relationKey' => CrackerBinaryType::CRACKER_BINARY_TYPE_ID, + ], + 'hashlist' => [ + 'key' => TaskWrapper::HASHLIST_ID, + + 'relationType' => Hashlist::class, + 'relationKey' => Hashlist::HASHLIST_ID, + + //because task doesnt have a direct connection to hashlist + 'intermediateType' => TaskWrapper::class, + 'joinField' => Task::TASK_WRAPPER_ID, + 'joinFieldRelation' => TaskWrapper::TASK_WRAPPER_ID, + + 'junctionTableType' => TaskWrapper::class, + 'junctionTableFilterField' => TaskWrapper::HASHLIST_ID, + 'junctionTableJoinField' => TaskWrapper::TASK_WRAPPER_ID, + + 'parentKey' => Task::TASK_ID + ], + ]; + } + + public static function getToManyRelationships(): array { + return [ + 'assignedAgents' => [ + 'key' => Task::TASK_ID, + + 'junctionTableType' => Assignment::class, + 'junctionTableFilterField' => Assignment::TASK_ID, + 'junctionTableJoinField' => Assignment::AGENT_ID, + + 'relationType' => Agent::class, + 'relationKey' => Agent::AGENT_ID, + ], + 'files' => [ + 'key' => Task::TASK_ID, + + 'junctionTableType' => FileTask::class, + 'junctionTableFilterField' => FileTask::TASK_ID, + 'junctionTableJoinField' => FileTask::FILE_ID, + + 'relationType' => File::class, + 'relationKey' => File::FILE_ID, + ], + 'speeds' => [ + 'key' => Task::TASK_ID, + + 'relationType' => Speed::class, + 'relationKey' => Speed::TASK_ID, + ] + ]; + } + + public function getFormFields(): array { + // TODO Form declarations in more generic class to allow auto-generated OpenAPI specifications + return [ + "hashlistId" => ['type' => 'int'], + "files" => ['type' => 'array', 'subtype' => 'int'], + ]; + } + + /** + * @throws HttpError + */ + protected function createObject(array $data): int { + /* Parameter is used as primary key in database */ + + $object = TaskUtils::createTask( + $data["hashlistId"], + $data[Task::TASK_NAME], + $data[Task::ATTACK_CMD], + $data[Task::CHUNK_TIME], + $data[Task::STATUS_TIMER], + $data[Task::USE_NEW_BENCH] ? 'speed' : 'runtime', + $data[Task::COLOR], + $data[Task::IS_CPU_TASK], + $data[Task::IS_SMALL], + $data[Task::USE_PREPROCESSOR], + $data[Task::PREPROCESSOR_COMMAND], + $data[Task::SKIP_KEYSPACE], + $data[Task::PRIORITY], + $data[Task::MAX_AGENTS], + $this->db2json($this->getFeatures()['files'], $data["files"]), + $data[Task::CRACKER_BINARY_TYPE_ID], + $this->getCurrentUser(), + $data[Task::NOTES], + $data[Task::STATIC_CHUNKS], + $data[Task::CHUNK_SIZE] + ); + + return $object->getId(); + } + + //TODO make aggregate data queryable and not included by default + static function aggregateData(object $object): array { + $keyspace = $object->getKeyspace(); + $keyspaceProgress = $object->getKeyspaceProgress(); + + $aggregatedData["dispatched"] = Util::showperc($keyspaceProgress, $keyspace); + $aggregatedData["searched"] = Util::showperc(TaskUtils::getTaskProgress($object), $keyspace); + + $qF = new QueryFilter(Chunk::TASK_ID, $object->getId(), "="); + $chunks = Factory::getChunkFactory()->filter([Factory::FILTER => $qF]); + + $activeAgents = []; + foreach ($chunks as $chunk) { + if (time() - max($chunk->getSolveTime(), $chunk->getDispatchTime()) < SConfig::getInstance()->getVal(DConfig::CHUNK_TIMEOUT) && $chunk->getProgress() < 10000) { + $activeAgents[$chunk->getAgentId()] = true; } - - $aggregatedData["activeAgents"] = array_keys($activeAgents); - $aggregatedData["status"] = $status; - - return $aggregatedData; - } - - protected function deleteObject(object $object): void { - TaskUtils::deleteTask($object); } - protected function getUpdateHandlers($id, $current_user): array { - return [ - Task::IS_ARCHIVED => fn ($value) => TaskUtils::toggleArchiveTask($id, $value, $current_user), - Task::PRIORITY => fn ($value) => TaskUtils::updatePriority($id, $value, $current_user), - Task::MAX_AGENTS => fn ($value) => TaskUtils::updateMaxAgents($id, $value, $current_user), - Task::IS_CPU_TASK => fn ($value) => TaskUtils::setCpuTask($id, $value, $current_user), - Task::CHUNK_TIME => fn ($value) => TaskUtils::changeChunkTime($id, $value, $current_user), - Task::ATTACK_CMD => fn($value) => TaskUtils::changeAttackCmd($id, $value, $current_user), - ]; + //status 1 is running, 2 is idle and 3 is completed + $status = 2; + if ($keyspaceProgress >= $keyspace && $keyspaceProgress > 0) { + $status = 3; + } + elseif (count($activeAgents) > 0) { + $status = 1; } + + $aggregatedData["activeAgents"] = array_keys($activeAgents); + $aggregatedData["status"] = $status; + + return $aggregatedData; + } + + protected function deleteObject(object $object): void { + TaskUtils::deleteTask($object); + } + + protected function getUpdateHandlers($id, $current_user): array { + return [ + Task::IS_ARCHIVED => fn($value) => TaskUtils::toggleArchiveTask($id, $value, $current_user), + Task::PRIORITY => fn($value) => TaskUtils::updatePriority($id, $value, $current_user), + Task::MAX_AGENTS => fn($value) => TaskUtils::updateMaxAgents($id, $value, $current_user), + Task::IS_CPU_TASK => fn($value) => TaskUtils::setCpuTask($id, $value, $current_user), + Task::CHUNK_TIME => fn($value) => TaskUtils::changeChunkTime($id, $value, $current_user), + Task::ATTACK_CMD => fn($value) => TaskUtils::changeAttackCmd($id, $value, $current_user), + ]; + } } TaskAPI::register($app); diff --git a/src/inc/apiv2/model/taskwrappers.routes.php b/src/inc/apiv2/model/taskwrappers.routes.php index 25af553bf..c4452231a 100644 --- a/src/inc/apiv2/model/taskwrappers.routes.php +++ b/src/inc/apiv2/model/taskwrappers.routes.php @@ -11,119 +11,122 @@ use DBA\Task; use DBA\TaskWrapper; use DBA\User; +use JetBrains\PhpStorm\NoReturn; require_once(dirname(__FILE__) . "/../common/AbstractModelAPI.class.php"); class TaskWrapperAPI extends AbstractModelAPI { - public static function getBaseUri(): string { - return "/api/v2/ui/taskwrappers"; - } - - public static function getAvailableMethods(): array { - return ['GET', 'PATCH', 'DELETE']; - } - - public static function getDBAclass(): string { - return TaskWrapper::class; - } + public static function getBaseUri(): string { + return "/api/v2/ui/taskwrappers"; + } - protected function getSingleACL(User $user, object $object): bool { - $accessGroupsUser = Util::arrayOfIds(AccessUtils::getAccessGroupsOfUser($user)); - - $qF1 = new ContainFilter(Hashlist::ACCESS_GROUP_ID, $accessGroupsUser, Factory::getHashlistFactory()); - $qF2 = new QueryFilter(TaskWrapper::TASK_WRAPPER_ID, $object->getId(), "="); - $jF = new JoinFilter(Factory::getHashlistFactory(), TaskWrapper::HASHLIST_ID, Hashlist::HASHLIST_ID); - $wrappers = Factory::getTaskWrapperFactory()->filter([Factory::FILTER => [$qF1, $qF2], Factory::JOIN => $jF])[Factory::getTaskWrapperFactory()->getModelName()]; - - return count($wrappers) > 0; - } + public static function getAvailableMethods(): array { + return ['GET', 'PATCH', 'DELETE']; + } - protected function getFilterACL(): array { - $accessGroups = Util::arrayOfIds(AccessUtils::getAccessGroupsOfUser($this->getCurrentUser())); - - return [ - Factory::JOIN => [ - new JoinFilter(Factory::getHashlistFactory(), TaskWrapper::HASHLIST_ID, Hashlist::HASHLIST_ID), - ], - Factory::FILTER => [ - new ContainFilter(Hashlist::ACCESS_GROUP_ID, $accessGroups, Factory::getHashlistFactory()), - ] - ]; - } - - public static function getToOneRelationships(): array { - return [ - 'accessGroup' => [ - 'key' => TaskWrapper::ACCESS_GROUP_ID, - - 'relationType' => AccessGroup::class, - 'relationKey' => AccessGroup::ACCESS_GROUP_ID, - ], - 'hashlist' => [ - 'key' => TaskWrapper::HASHLIST_ID, - - 'relationType' => Hashlist::class, - 'relationKey' => Hashlist::HASHLIST_ID, - ], - 'hashType' => [ - 'key' => TaskWrapper::TASK_WRAPPER_ID, - 'parentKey' => TaskWrapper::TASK_WRAPPER_ID, - - 'intermediateType' => Hashlist::class, - 'joinField' => TaskWrapper::HASHLIST_ID, - 'joinFieldRelation' => Hashlist::HASHLIST_ID, - - 'junctionTableType' => Hashlist::class, - 'junctionTableFilterField' => Hashlist::HASH_TYPE_ID, - 'junctionTableJoinField' => Hashlist::HASHLIST_ID, - - 'relationType' => HashType::class, - 'relationKey' => HashType::HASH_TYPE_ID, - ], - ]; - } - - public static function getToManyRelationships(): array { - return [ - 'tasks' => [ - 'key' => TaskWrapper::TASK_WRAPPER_ID, - - 'relationType' => Task::class, - 'relationKey' => Task::TASK_WRAPPER_ID, - ], - ]; - } - - - protected function createObject(array $data): int { - assert(False, "TaskWrappers cannot be created via API"); - return -1; - } - - protected function getUpdateHandlers($id, $current_user): array { - return [ - Taskwrapper::PRIORITY => fn ($value) => TaskwrapperUtils::updatePriority($id, $value, $current_user), - ]; - } - - protected function deleteObject(object $object): void { - switch ($object->getTaskType()) { - case DTaskTypes::NORMAL: - $qF = new QueryFilter(TaskWrapper::TASK_WRAPPER_ID, $object->getId(), "=", Factory::getTaskWrapperFactory()); - $jF = new JoinFilter(Factory::getTaskWrapperFactory(), Task::TASK_WRAPPER_ID, TaskWrapper::TASK_WRAPPER_ID); - $joined = Factory::getTaskFactory()->filter([Factory::FILTER => $qF, Factory::JOIN => $jF]); - $task = $joined[Factory::getTaskFactory()->getModelName()][0]; - // api=true to avoid TaskUtils::delete setting 'Location:' header - TaskUtils::delete($task->getId(), $this->getCurrentUser(), true); - break; - case DTaskTypes::SUPERTASK: - TaskUtils::deleteSupertask($object->getId(), $this->getCurrentUser()); - break; - default: - assert(False, "Internal Error: taskType not recognized"); - } + public static function getDBAclass(): string { + return TaskWrapper::class; + } + + protected function getSingleACL(User $user, object $object): bool { + $accessGroupsUser = Util::arrayOfIds(AccessUtils::getAccessGroupsOfUser($user)); + + $qF1 = new ContainFilter(Hashlist::ACCESS_GROUP_ID, $accessGroupsUser, Factory::getHashlistFactory()); + $qF2 = new QueryFilter(TaskWrapper::TASK_WRAPPER_ID, $object->getId(), "="); + $jF = new JoinFilter(Factory::getHashlistFactory(), TaskWrapper::HASHLIST_ID, Hashlist::HASHLIST_ID); + $wrappers = Factory::getTaskWrapperFactory()->filter([Factory::FILTER => [$qF1, $qF2], Factory::JOIN => $jF])[Factory::getTaskWrapperFactory()->getModelName()]; + + return count($wrappers) > 0; + } + + protected function getFilterACL(): array { + $accessGroups = Util::arrayOfIds(AccessUtils::getAccessGroupsOfUser($this->getCurrentUser())); + + return [ + Factory::JOIN => [ + new JoinFilter(Factory::getHashlistFactory(), TaskWrapper::HASHLIST_ID, Hashlist::HASHLIST_ID), + ], + Factory::FILTER => [ + new ContainFilter(Hashlist::ACCESS_GROUP_ID, $accessGroups, Factory::getHashlistFactory()), + ] + ]; + } + + public static function getToOneRelationships(): array { + return [ + 'accessGroup' => [ + 'key' => TaskWrapper::ACCESS_GROUP_ID, + + 'relationType' => AccessGroup::class, + 'relationKey' => AccessGroup::ACCESS_GROUP_ID, + ], + 'hashlist' => [ + 'key' => TaskWrapper::HASHLIST_ID, + + 'relationType' => Hashlist::class, + 'relationKey' => Hashlist::HASHLIST_ID, + ], + 'hashType' => [ + 'key' => TaskWrapper::TASK_WRAPPER_ID, + 'parentKey' => TaskWrapper::TASK_WRAPPER_ID, + + 'intermediateType' => Hashlist::class, + 'joinField' => TaskWrapper::HASHLIST_ID, + 'joinFieldRelation' => Hashlist::HASHLIST_ID, + + 'junctionTableType' => Hashlist::class, + 'junctionTableFilterField' => Hashlist::HASH_TYPE_ID, + 'junctionTableJoinField' => Hashlist::HASHLIST_ID, + + 'relationType' => HashType::class, + 'relationKey' => HashType::HASH_TYPE_ID, + ], + ]; + } + + public static function getToManyRelationships(): array { + return [ + 'tasks' => [ + 'key' => TaskWrapper::TASK_WRAPPER_ID, + + 'relationType' => Task::class, + 'relationKey' => Task::TASK_WRAPPER_ID, + ], + ]; + } + + + #[NoReturn] protected function createObject(array $data): int { + assert(False, "TaskWrappers cannot be created via API"); + } + + protected function getUpdateHandlers($id, $current_user): array { + return [ + Taskwrapper::PRIORITY => fn($value) => TaskwrapperUtils::updatePriority($id, $value, $current_user), + ]; + } + + /** + * @throws HTException + */ + protected function deleteObject(object $object): void { + switch ($object->getTaskType()) { + case DTaskTypes::NORMAL: + $qF = new QueryFilter(TaskWrapper::TASK_WRAPPER_ID, $object->getId(), "=", Factory::getTaskWrapperFactory()); + $jF = new JoinFilter(Factory::getTaskWrapperFactory(), Task::TASK_WRAPPER_ID, TaskWrapper::TASK_WRAPPER_ID); + $joined = Factory::getTaskFactory()->filter([Factory::FILTER => $qF, Factory::JOIN => $jF]); + $task = $joined[Factory::getTaskFactory()->getModelName()][0]; + // api=true to avoid TaskUtils::delete setting 'Location:' header + TaskUtils::delete($task->getId(), $this->getCurrentUser(), true); + break; + case DTaskTypes::SUPERTASK: + TaskUtils::deleteSupertask($object->getId(), $this->getCurrentUser()); + break; + default: + assert(False, "Internal Error: taskType not recognized"); } + } } TaskWrapperAPI::register($app); \ No newline at end of file diff --git a/src/inc/apiv2/model/users.routes.php b/src/inc/apiv2/model/users.routes.php index 38c97903b..33c72ad02 100644 --- a/src/inc/apiv2/model/users.routes.php +++ b/src/inc/apiv2/model/users.routes.php @@ -1,4 +1,5 @@ [ + 'key' => User::RIGHT_GROUP_ID, + + 'relationType' => RightGroup::class, + 'relationKey' => RightGroup::RIGHT_GROUP_ID, + ], + ]; + } + + public static function getToManyRelationships(): array { + return [ + 'accessGroups' => [ + 'key' => User::USER_ID, + + 'junctionTableType' => AccessGroupUser::class, + 'junctionTableFilterField' => AccessGroupUser::USER_ID, + 'junctionTableJoinField' => AccessGroupUser::ACCESS_GROUP_ID, + + 'relationType' => AccessGroup::class, + 'relationKey' => AccessGroup::ACCESS_GROUP_ID, + ], + ]; + } + + protected static function fetchExpandObjects(array $objects, string $expand): mixed { + array_walk($objects, function ($obj) { + assert($obj instanceof User); + }); + + /* Expand requested section */ + return match ($expand) { + 'accessGroups' => self::getManyToManyRelationViaIntermediate( + $objects, + User::USER_ID, + Factory::getAccessGroupUserFactory(), + AccessGroupUser::USER_ID, + Factory::getAccessGroupFactory(), + AccessGroup::ACCESS_GROUP_ID + ), + 'globalPermissionGroup' => self::getForeignKeyRelation( + $objects, + User::RIGHT_GROUP_ID, + Factory::getRightGroupFactory(), + RightGroup::RIGHT_GROUP_ID + ), + default => throw new BadFunctionCallException("Internal error: Expansion '$expand' not implemented!"), + }; + } + + /** + * @throws HttpError + */ + protected function createObject($data): int { + UserUtils::createUser( + $data[User::USERNAME], + $data[User::EMAIL], + $data[User::RIGHT_GROUP_ID], + $this->getCurrentUser() + ); + + /* Hackish way to retrieve object since Id is not returned on creation */ + $qFs = [ + new QueryFilter(User::USERNAME, $data[USER::USERNAME], '='), + new QueryFilter(User::EMAIL, $data[User::EMAIL], '='), + new QueryFilter(User::RIGHT_GROUP_ID, $data[User::RIGHT_GROUP_ID], '=') + ]; + + $oF = new OrderFilter(User::USER_ID, "DESC"); + $objects = $this->getFactory()->filter([Factory::FILTER => $qFs, Factory::ORDER => $oF]); + assert(count($objects) == 1); + + return $objects[0]->getId(); + } + + function getAllPostParameters(array $features): array { + + $features = parent::getAllPostParameters($features); + unset($features[User::IS_VALID]); + return $features; + } + + /** + * @throws HTException + */ + protected function deleteObject(object $object): void { + UserUtils::deleteUser($object->getId(), $this->getCurrentUser()); + } + + /** + * @throws HTException + */ + private function toggleValidityUser($userId, $isValid, $current_user): void { + if ($isValid) { + UserUtils::enableUser($userId); } - - public static function getDBAclass(): string { - return User::class; + else { + UserUtils::disableUser($userId, $current_user); } - - public static function getToOneRelationships(): array { - return [ - 'globalPermissionGroup' => [ - 'key' => User::RIGHT_GROUP_ID, - - 'relationType' => RightGroup::class, - 'relationKey' => RightGroup::RIGHT_GROUP_ID, - ], - ]; - } - - public static function getToManyRelationships(): array { - return [ - 'accessGroups' => [ - 'key' => User::USER_ID, - - 'junctionTableType' => AccessGroupUser::class, - 'junctionTableFilterField' => AccessGroupUser::USER_ID, - 'junctionTableJoinField' => AccessGroupUser::ACCESS_GROUP_ID, - - 'relationType' => AccessGroup::class, - 'relationKey' => AccessGroup::ACCESS_GROUP_ID, - ], - ]; - } - - protected static function fetchExpandObjects(array $objects, string $expand): mixed { - array_walk($objects, function($obj) { assert($obj instanceof User); }); - - /* Expand requested section */ - switch($expand) { - case 'accessGroups': - return self::getManyToManyRelationViaIntermediate( - $objects, - User::USER_ID, - Factory::getAccessGroupUserFactory(), - AccessGroupUser::USER_ID, - Factory::getAccessGroupFactory(), - AccessGroup::ACCESS_GROUP_ID - ); - case 'globalPermissionGroup': - return self::getForeignKeyRelation( - $objects, - User::RIGHT_GROUP_ID, - Factory::getRightGroupFactory(), - RightGroup::RIGHT_GROUP_ID - ); - default: - throw new BadFunctionCallException("Internal error: Expansion '$expand' not implemented!"); - } - } - - protected function createObject($data): int { - UserUtils::createUser( - $data[User::USERNAME], - $data[User::EMAIL], - $data[User::RIGHT_GROUP_ID], - $this->getCurrentUser() - ); - - /* Hackish way to retreive object since Id is not returned on creation */ - $qFs = [ - new QueryFilter(User::USERNAME, $data[USER::USERNAME], '='), - new QueryFilter(User::EMAIL, $data[User::EMAIL], '='), - new QueryFilter(User::RIGHT_GROUP_ID, $data[User::RIGHT_GROUP_ID], '=') - ]; - - $oF = new OrderFilter(User::USER_ID, "DESC"); - $objects = $this->getFactory()->filter([Factory::FILTER => $qFs, Factory::ORDER => $oF]); - assert(count($objects) == 1); - - return $objects[0]->getId(); - } - - function getAllPostParameters(array $features): array { - - $features = parent::getAllPostParameters($features); - unset($features[User::IS_VALID]); - return $features; - } - - protected function deleteObject(object $object): void { - UserUtils::deleteUser($object->getId(), $this->getCurrentUser()); - } - - private function toggleValidityUser($userId, $isValid, $current_user) { - if ($isValid) { - UserUtils::enableUser($userId); - } else { - UserUtils::disableUser($userId, $current_user); - } - } - - protected function getUpdateHandlers($id, $current_user): array { - return [ - User::RIGHT_GROUP_ID => fn ($value) => UserUtils::setRights($id, $value, $current_user), - User::IS_VALID => fn ($value) => $this->toggleValidityUser($id, $value, $current_user) - ]; - } - + } + + protected function getUpdateHandlers($id, $current_user): array { + return [ + User::RIGHT_GROUP_ID => fn($value) => UserUtils::setRights($id, $value, $current_user), + User::IS_VALID => fn($value) => $this->toggleValidityUser($id, $value, $current_user) + ]; + } + } UserAPI::register($app); \ No newline at end of file diff --git a/src/inc/apiv2/model/vouchers.routes.php b/src/inc/apiv2/model/vouchers.routes.php index 0278b3e6e..3df14e5ca 100644 --- a/src/inc/apiv2/model/vouchers.routes.php +++ b/src/inc/apiv2/model/vouchers.routes.php @@ -1,4 +1,5 @@ getFactory()->filter([Factory::FILTER => $qFs, Factory::ORDER => $oF]); - assert(count($objects) == 1); - - return $objects[0]->getId(); - } - - protected function deleteObject(object $object): void { - AgentUtils::deleteVoucher($object->getId()); - } + /* On successfully insert, return ID */ + $qFs = [ + new QueryFilter(RegVoucher::VOUCHER, $data[RegVoucher::VOUCHER], '=') + ]; + + /* Hackish way to retrieve object since Id is not returned on creation */ + $oF = new OrderFilter(RegVoucher::REG_VOUCHER_ID, "DESC"); + $objects = $this->getFactory()->filter([Factory::FILTER => $qFs, Factory::ORDER => $oF]); + assert(count($objects) == 1); + + return $objects[0]->getId(); + } + + /** + * @throws HTException + */ + protected function deleteObject(object $object): void { + AgentUtils::deleteVoucher($object->getId()); + } } VoucherAPI::register($app); \ No newline at end of file From 6420bf604c024683c8362cb8b4c4963c9736e5fe Mon Sep 17 00:00:00 2001 From: Sein Coray Date: Thu, 26 Jun 2025 12:23:53 +0200 Subject: [PATCH 101/691] Accept optional isValid on user creation (#1404) * added optional setting of isValid on user creation * fix user test to make user active on creation --- ci/apiv2/utils.py | 1 + src/inc/apiv2/model/users.routes.php | 22 ++++++++-------------- src/inc/utils/UserUtils.class.php | 12 ++++++++++-- 3 files changed, 19 insertions(+), 16 deletions(-) diff --git a/ci/apiv2/utils.py b/ci/apiv2/utils.py index eb6306c9d..409f9da2e 100644 --- a/ci/apiv2/utils.py +++ b/ci/apiv2/utils.py @@ -189,6 +189,7 @@ def do_create_user(global_permission_group_id=1): name=f'test-{stamp}', email='test@example.com', globalPermissionGroupId=global_permission_group_id, + isValid=True, ) obj = User(**payload) obj.save() diff --git a/src/inc/apiv2/model/users.routes.php b/src/inc/apiv2/model/users.routes.php index 33c72ad02..caa2ed72e 100644 --- a/src/inc/apiv2/model/users.routes.php +++ b/src/inc/apiv2/model/users.routes.php @@ -73,28 +73,22 @@ protected static function fetchExpandObjects(array $objects, string $expand): mi } /** + * @param $data + * @return int + * @throws HTException + * @throws HttpConflict * @throws HttpError */ protected function createObject($data): int { - UserUtils::createUser( + $user = UserUtils::createUser( $data[User::USERNAME], $data[User::EMAIL], $data[User::RIGHT_GROUP_ID], - $this->getCurrentUser() + $this->getCurrentUser(), + $data[User::IS_VALID] ?? false, ); - /* Hackish way to retrieve object since Id is not returned on creation */ - $qFs = [ - new QueryFilter(User::USERNAME, $data[USER::USERNAME], '='), - new QueryFilter(User::EMAIL, $data[User::EMAIL], '='), - new QueryFilter(User::RIGHT_GROUP_ID, $data[User::RIGHT_GROUP_ID], '=') - ]; - - $oF = new OrderFilter(User::USER_ID, "DESC"); - $objects = $this->getFactory()->filter([Factory::FILTER => $qFs, Factory::ORDER => $oF]); - assert(count($objects) == 1); - - return $objects[0]->getId(); + return $user->getId(); } function getAllPostParameters(array $features): array { diff --git a/src/inc/utils/UserUtils.class.php b/src/inc/utils/UserUtils.class.php index c9e21e3e2..538b85b77 100644 --- a/src/inc/utils/UserUtils.class.php +++ b/src/inc/utils/UserUtils.class.php @@ -177,9 +177,13 @@ public static function setPassword($userId, $password, $adminUser) { * @param string $email * @param int $rightGroupId * @param User $adminUser + * @param bool $isValid + * @return User + * @throws HTException + * @throws HttpConflict * @throws HttpError */ - public static function createUser($username, $email, $rightGroupId, $adminUser) { + public static function createUser(string $username, string $email, int $rightGroupId, User $adminUser, bool $isValid = true): User { $username = htmlentities($username, ENT_QUOTES, "UTF-8"); $group = AccessControlUtils::getGroup($rightGroupId); if (!filter_var($email, FILTER_VALIDATE_EMAIL) || strlen($email) == 0) { @@ -199,7 +203,7 @@ public static function createUser($username, $email, $rightGroupId, $adminUser) $newPass = Util::randomString(10); $newSalt = Util::randomString(20); $newHash = Encryption::passwordHash($newPass, $newSalt); - $user = new User(null, $username, $email, $newHash, $newSalt, 1, 1, 0, time(), 3600, $group->getId(), 0, "", "", "", ""); + $user = new User(null, $username, $email, $newHash, $newSalt, $isValid ? 1: 0, 1, 0, time(), 3600, $group->getId(), 0, "", "", "", ""); Factory::getUserFactory()->save($user); // add user to default group @@ -207,14 +211,18 @@ public static function createUser($username, $email, $rightGroupId, $adminUser) $groupMember = new AccessGroupUser(null, $group->getId(), $user->getId()); Factory::getAccessGroupUserFactory()->save($groupMember); + // send email with generated password to user email $tmpl = new Template("email/creation"); $tmplPlain = new Template("email/creation.plain"); $obj = array('username' => $username, 'password' => $newPass, 'url' => Util::buildServerUrl() . SConfig::getInstance()->getVal(DConfig::BASE_URL)); Util::sendMail($email, "Account at " . APP_NAME, $tmpl->render($obj), $tmplPlain->render($obj)); + // create log entry and check if notification sending is needed Util::createLogEntry("User", $adminUser->getId(), DLogEntry::INFO, "New User created: " . $user->getUsername()); $payload = new DataSet(array(DPayloadKeys::USER => $user)); NotificationHandler::checkNotifications(DNotificationType::USER_CREATED, $payload); + + return $user; } /** From 209158d4a0f2065a674a8488db0345d6fbfbc800 Mon Sep 17 00:00:00 2001 From: Sein Coray Date: Thu, 26 Jun 2025 12:55:00 +0200 Subject: [PATCH 102/691] Improve createObject endpoints to reduce hackish id retrieval (#1405) * added for agentbinaries and agentassignments * implemented the code improvement for all createobject functions --- .../apiv2/model/agentassignments.routes.php | 15 ++++--------- src/inc/apiv2/model/agentbinaries.routes.php | 19 +++-------------- src/inc/apiv2/model/crackers.routes.php | 21 +++---------------- src/inc/apiv2/model/crackertypes.routes.php | 20 ++++++------------ src/inc/apiv2/model/hashtypes.routes.php | 6 +++--- src/inc/apiv2/model/healthchecks.routes.php | 4 ++-- src/inc/apiv2/model/notifications.routes.php | 20 +++--------------- src/inc/apiv2/model/preprocessors.routes.php | 17 +++------------ src/inc/apiv2/model/pretasks.routes.php | 16 ++------------ src/inc/apiv2/model/supertasks.routes.php | 16 ++------------ src/inc/apiv2/model/tasks.routes.php | 4 ++-- src/inc/apiv2/model/vouchers.routes.php | 17 +++------------ src/inc/handlers/CrackerHandler.class.php | 4 ++-- .../handlers/NotificationHandler.class.php | 2 +- src/inc/utils/AccessControlUtils.class.php | 6 +++--- src/inc/utils/AgentBinaryUtils.class.php | 9 +++++--- src/inc/utils/AgentUtils.class.php | 19 ++++++++++------- src/inc/utils/CrackerUtils.class.php | 16 +++++++------- src/inc/utils/HashtypeUtils.class.php | 9 +++++--- src/inc/utils/NotificationUtils.class.php | 7 +++++-- src/inc/utils/PreprocessorUtils.class.php | 18 +++++++++------- src/inc/utils/PretaskUtils.class.php | 6 ++++-- src/inc/utils/SupertaskUtils.class.php | 6 ++++-- 23 files changed, 97 insertions(+), 180 deletions(-) diff --git a/src/inc/apiv2/model/agentassignments.routes.php b/src/inc/apiv2/model/agentassignments.routes.php index 28905535b..d3006d6a5 100644 --- a/src/inc/apiv2/model/agentassignments.routes.php +++ b/src/inc/apiv2/model/agentassignments.routes.php @@ -74,21 +74,14 @@ public static function getToOneRelationships(): array { /** * @throws HTException + * @throws HttpError */ protected function createObject(array $data): int { - AgentUtils::assign($data[Assignment::AGENT_ID], $data[Assignment::TASK_ID], $this->getCurrentUser()); - /* On successfully insert, return ID */ - $qFs = [ - new QueryFilter(Assignment::AGENT_ID, $data[Assignment::AGENT_ID], '='), - new QueryFilter(Assignment::TASK_ID, $data[Assignment::TASK_ID], '=') - ]; + $assignment = AgentUtils::assign($data[Assignment::AGENT_ID], $data[Assignment::TASK_ID], $this->getCurrentUser()); - /* Hackish way to retrieve object since Id is not returned on creation */ - $oF = new OrderFilter(Assignment::ASSIGNMENT_ID, "DESC"); - $objects = $this->getFactory()->filter([Factory::FILTER => $qFs, Factory::ORDER => $oF]); - assert(count($objects) >= 1); + assert($assignment !== null); - return $objects[0]->getId(); + return $assignment->getId(); } protected function getUpdateHandlers($id, $current_user): array { diff --git a/src/inc/apiv2/model/agentbinaries.routes.php b/src/inc/apiv2/model/agentbinaries.routes.php index d923cdc79..ee4b19883 100644 --- a/src/inc/apiv2/model/agentbinaries.routes.php +++ b/src/inc/apiv2/model/agentbinaries.routes.php @@ -19,10 +19,10 @@ public static function getDBAclass(): string { } /** - * @throws HTException + * @throws HttpError */ protected function createObject(array $data): int { - AgentBinaryUtils::newBinary( + $agentBinary = AgentBinaryUtils::newBinary( $data[AgentBinary::TYPE], $data[AgentBinary::OPERATING_SYSTEMS], $data[AgentBinary::FILENAME], @@ -30,20 +30,7 @@ protected function createObject(array $data): int { $data[AgentBinary::UPDATE_TRACK], $this->getCurrentUser() ); - - /* On successfully insert, return ID */ - $qFs = [ - new QueryFilter(AgentBinary::FILENAME, $data[AgentBinary::FILENAME], '='), - new QueryFilter(AgentBinary::VERSION, $data[AgentBinary::VERSION], '='), - ]; - - /* Hackish way to retrieve object since Id is not returned on creation */ - $oF = new OrderFilter(AgentBinary::AGENT_BINARY_ID, "DESC"); - $objects = $this->getFactory()->filter([Factory::FILTER => $qFs, Factory::ORDER => $oF]); - /* No unique properties set on columns, thus multiple entries could exists, pick the latest (DESC ordering used) */ - assert(count($objects) >= 1); - - return $objects[0]->getId(); + return $agentBinary->getId(); } /** diff --git a/src/inc/apiv2/model/crackers.routes.php b/src/inc/apiv2/model/crackers.routes.php index 7fa66ebf6..47c339b9b 100644 --- a/src/inc/apiv2/model/crackers.routes.php +++ b/src/inc/apiv2/model/crackers.routes.php @@ -44,31 +44,16 @@ public static function getToManyRelationships(): array { /** * @throws HttpError + * @throws HTException */ protected function createObject(array $data): int { - CrackerUtils::createBinary( + $binary = CrackerUtils::createBinary( $data[CrackerBinary::VERSION], $data[CrackerBinary::BINARY_NAME], $data[CrackerBinary::DOWNLOAD_URL], $data[CrackerBinary::CRACKER_BINARY_TYPE_ID] ); - - /* On successfully insert, return ID */ - $qFs = [ - new QueryFilter(CrackerBinary::VERSION, $data[CrackerBinary::VERSION], '='), - new QueryFilter(CrackerBinary::BINARY_NAME, $data[CrackerBinary::BINARY_NAME], '='), - new QueryFilter(CrackerBinary::DOWNLOAD_URL, $data[CrackerBinary::DOWNLOAD_URL], '='), - new QueryFilter(CrackerBinary::CRACKER_BINARY_TYPE_ID, $data[CrackerBinary::CRACKER_BINARY_TYPE_ID], '='), - - ]; - - /* Hackish way to retrieve object since Id is not returned on creation */ - $oF = new OrderFilter(CrackerBinary::CRACKER_BINARY_ID, "DESC"); - $objects = $this->getFactory()->filter([Factory::FILTER => $qFs, Factory::ORDER => $oF]); - /* No unique properties set on columns, thus multiple entries could exists, pick the latest (DESC ordering used) */ - assert(count($objects) >= 1); - - return $objects[0]->getId(); + return $binary->getId(); } /** diff --git a/src/inc/apiv2/model/crackertypes.routes.php b/src/inc/apiv2/model/crackertypes.routes.php index 0a3af1ac9..af066c64e 100644 --- a/src/inc/apiv2/model/crackertypes.routes.php +++ b/src/inc/apiv2/model/crackertypes.routes.php @@ -48,22 +48,14 @@ function getAllPostParameters(array $features): array { } /** - * @throws HTException + * @param array $data + * @return int + * @throws HttpConflict + * @throws HttpError */ protected function createObject(array $data): int { - CrackerUtils::createBinaryType($data[CrackerBinaryType::TYPE_NAME]); - - /* On successfully insert, return ID */ - $qFs = [ - new QueryFilter(CrackerBinaryType::TYPE_NAME, $data[CrackerBinaryType::TYPE_NAME], '=') - ]; - - /* Hackish way to retrieve object since Id is not returned on creation */ - $oF = new OrderFilter(CrackerBinaryType::CRACKER_BINARY_TYPE_ID, "DESC"); - $objects = $this->getFactory()->filter([Factory::FILTER => $qFs, Factory::ORDER => $oF]); - assert(count($objects) == 1); - - return $objects[0]->getId(); + $binaryType = CrackerUtils::createBinaryType($data[CrackerBinaryType::TYPE_NAME]); + return $binaryType->getId(); } diff --git a/src/inc/apiv2/model/hashtypes.routes.php b/src/inc/apiv2/model/hashtypes.routes.php index 7331a78ab..c83d94c6d 100644 --- a/src/inc/apiv2/model/hashtypes.routes.php +++ b/src/inc/apiv2/model/hashtypes.routes.php @@ -15,10 +15,10 @@ public static function getDBAclass(): string { } /** - * @throws HTException + * @throws HttpError */ protected function createObject(array $data): int { - HashtypeUtils::addHashtype( + $hashtype = HashtypeUtils::addHashtype( $data[HashType::HASH_TYPE_ID], $data[HashType::DESCRIPTION], $data[HashType::IS_SALTED], @@ -26,7 +26,7 @@ protected function createObject(array $data): int { $this->getCurrentUser() ); - return $data[HashType::HASH_TYPE_ID]; + return $hashtype->getId(); } /** diff --git a/src/inc/apiv2/model/healthchecks.routes.php b/src/inc/apiv2/model/healthchecks.routes.php index b3df6a798..2a49e1f6f 100644 --- a/src/inc/apiv2/model/healthchecks.routes.php +++ b/src/inc/apiv2/model/healthchecks.routes.php @@ -50,13 +50,13 @@ public static function getToManyRelationships(): array { * @throws HttpError */ protected function createObject(array $data): int { - $obj = HealthUtils::createHealthCheck( + $healthCheck = HealthUtils::createHealthCheck( $data[HealthCheck::HASHTYPE_ID], $data[HealthCheck::CHECK_TYPE], $data[HealthCheck::CRACKER_BINARY_ID] ); - return $obj->getId(); + return $healthCheck->getId(); } /** diff --git a/src/inc/apiv2/model/notifications.routes.php b/src/inc/apiv2/model/notifications.routes.php index ad40e3d33..91ee5a242 100644 --- a/src/inc/apiv2/model/notifications.routes.php +++ b/src/inc/apiv2/model/notifications.routes.php @@ -41,6 +41,7 @@ public function getFormFields(): array { /** * @throws HTException + * @throws HttpError */ protected function createObject(array $data): int { $dummyPost = []; @@ -59,29 +60,14 @@ protected function createObject(array $data): int { break; } - - NotificationUtils::createNotificaton( + $notification = NotificationUtils::createNotification( $data[NotificationSetting::ACTION], $data[NotificationSetting::NOTIFICATION], $data[NotificationSetting::RECEIVER], $dummyPost, $this->getCurrentUser(), ); - - /* On successfully insert, return ID */ - $qFs = [ - new QueryFilter(NotificationSetting::ACTION, $data[NotificationSetting::ACTION], '='), - new QueryFilter(NotificationSetting::NOTIFICATION, $data[NotificationSetting::NOTIFICATION], '='), - new QueryFilter(NotificationSetting::RECEIVER, $data[NotificationSetting::RECEIVER], '='), - ]; - - /* Hackish way to retrieve object since Id is not returned on creation */ - $oF = new OrderFilter(NotificationSetting::NOTIFICATION_SETTING_ID, "DESC"); - $objects = $this->getFactory()->filter([Factory::FILTER => $qFs, Factory::ORDER => $oF]); - /* No unique properties set on columns, thus multiple entries could exists, pick the latest (DESC ordering used) */ - assert(count($objects) >= 1); - - return $objects[0]->getId(); + return $notification->getId(); } /** diff --git a/src/inc/apiv2/model/preprocessors.routes.php b/src/inc/apiv2/model/preprocessors.routes.php index 5f9410ecc..49e8ffc40 100644 --- a/src/inc/apiv2/model/preprocessors.routes.php +++ b/src/inc/apiv2/model/preprocessors.routes.php @@ -20,9 +20,10 @@ public static function getDBAclass(): string { /** * @throws HttpError + * @throws HttpConflict */ protected function createObject(array $data): int { - PreprocessorUtils::addPreprocessor( + $preprocessor = PreprocessorUtils::addPreprocessor( $data[Preprocessor::NAME], $data[Preprocessor::BINARY_NAME], $data[Preprocessor::URL], @@ -30,19 +31,7 @@ protected function createObject(array $data): int { $data[Preprocessor::SKIP_COMMAND], $data[Preprocessor::LIMIT_COMMAND] ); - - /* On successfully insert, return ID */ - $qFs = [ - new QueryFilter(Preprocessor::NAME, $data[Preprocessor::NAME], '='), - new QueryFilter(Preprocessor::BINARY_NAME, $data[Preprocessor::BINARY_NAME], '=') - ]; - - /* Hackish way to retrieve object since Id is not returned on creation */ - $oF = new OrderFilter(Preprocessor::PREPROCESSOR_ID, "DESC"); - $objects = $this->getFactory()->filter([Factory::FILTER => $qFs, Factory::ORDER => $oF]); - assert(count($objects) == 1); - - return $objects[0]->getId(); + return $preprocessor->getId(); } protected function getUpdateHandlers($id, $current_user): array { diff --git a/src/inc/apiv2/model/pretasks.routes.php b/src/inc/apiv2/model/pretasks.routes.php index 483ed0528..85e4dff67 100644 --- a/src/inc/apiv2/model/pretasks.routes.php +++ b/src/inc/apiv2/model/pretasks.routes.php @@ -47,7 +47,7 @@ public function getFormFields(): array { */ protected function createObject(array $data): int { /* Use quirk on 'files' since this is casted to DB representation */ - PretaskUtils::createPretask( + $pretask = PretaskUtils::createPretask( $data[PreTask::TASK_NAME], $data[PreTask::ATTACK_CMD], $data[PreTask::CHUNK_TIME], @@ -61,19 +61,7 @@ protected function createObject(array $data): int { $data[PreTask::MAX_AGENTS], $data[PreTask::PRIORITY] ); - - /* On successfully insert, return ID */ - $qFs = [ - new QueryFilter(PreTask::TASK_NAME, $data[PreTask::TASK_NAME], '='), - new QueryFilter(PreTask::ATTACK_CMD, $data[PreTask::ATTACK_CMD], '=') - ]; - - /* Hackish way to retrieve object since Id is not returned on creation */ - $oF = new OrderFilter(PreTask::PRETASK_ID, "DESC"); - $objects = $this->getFactory()->filter([Factory::FILTER => $qFs, Factory::ORDER => $oF]); - assert(count($objects) >= 1); - - return $objects[0]->getId(); + return $pretask->getId(); } protected function getUpdateHandlers($id, $current_user): array { diff --git a/src/inc/apiv2/model/supertasks.routes.php b/src/inc/apiv2/model/supertasks.routes.php index cf0e4a8ee..0488c67f1 100644 --- a/src/inc/apiv2/model/supertasks.routes.php +++ b/src/inc/apiv2/model/supertasks.routes.php @@ -48,23 +48,11 @@ public function getFormFields(): array { protected function createObject(array $data): int { /* Use quirk on 'pretasks' since this is casted to DB representation */ - SupertaskUtils::createSupertask( + $supertask = SupertaskUtils::createSupertask( $data[Supertask::SUPERTASK_NAME], $this->db2json($this->getFeatures()['pretasks'], $data["pretasks"]) ); - - /* On successfully insert, return ID */ - $qFs = [ - new QueryFilter(Supertask::SUPERTASK_NAME, $data[Supertask::SUPERTASK_NAME], '=') - ]; - - /* Hackish way to retrieve object since Id is not returned on creation */ - $oF = new OrderFilter(Supertask::SUPERTASK_ID, "DESC"); - $objects = $this->getFactory()->filter([Factory::FILTER => $qFs, Factory::ORDER => $oF]); - /* No unique properties set on columns, thus multiple entries could exists, pick the latest (DESC ordering used) */ - assert(count($objects) >= 1); - - return $objects[0]->getId(); + return $supertask->getId(); } /** diff --git a/src/inc/apiv2/model/tasks.routes.php b/src/inc/apiv2/model/tasks.routes.php index 1f7f6e292..c62b1caf1 100644 --- a/src/inc/apiv2/model/tasks.routes.php +++ b/src/inc/apiv2/model/tasks.routes.php @@ -134,7 +134,7 @@ public function getFormFields(): array { protected function createObject(array $data): int { /* Parameter is used as primary key in database */ - $object = TaskUtils::createTask( + $task = TaskUtils::createTask( $data["hashlistId"], $data[Task::TASK_NAME], $data[Task::ATTACK_CMD], @@ -157,7 +157,7 @@ protected function createObject(array $data): int { $data[Task::CHUNK_SIZE] ); - return $object->getId(); + return $task->getId(); } //TODO make aggregate data queryable and not included by default diff --git a/src/inc/apiv2/model/vouchers.routes.php b/src/inc/apiv2/model/vouchers.routes.php index 3df14e5ca..88c348a9f 100644 --- a/src/inc/apiv2/model/vouchers.routes.php +++ b/src/inc/apiv2/model/vouchers.routes.php @@ -19,22 +19,11 @@ public static function getDBAclass(): string { } /** - * @throws HTException + * @throws HttpConflict */ protected function createObject(array $data): int { - AgentUtils::createVoucher($data[RegVoucher::VOUCHER]); - - /* On successfully insert, return ID */ - $qFs = [ - new QueryFilter(RegVoucher::VOUCHER, $data[RegVoucher::VOUCHER], '=') - ]; - - /* Hackish way to retrieve object since Id is not returned on creation */ - $oF = new OrderFilter(RegVoucher::REG_VOUCHER_ID, "DESC"); - $objects = $this->getFactory()->filter([Factory::FILTER => $qFs, Factory::ORDER => $oF]); - assert(count($objects) == 1); - - return $objects[0]->getId(); + $voucher = AgentUtils::createVoucher($data[RegVoucher::VOUCHER]); + return $voucher->getId(); } /** diff --git a/src/inc/handlers/CrackerHandler.class.php b/src/inc/handlers/CrackerHandler.class.php index 38d8e0f04..80f455d67 100644 --- a/src/inc/handlers/CrackerHandler.class.php +++ b/src/inc/handlers/CrackerHandler.class.php @@ -24,8 +24,8 @@ public function handle($action) { die(); case DCrackerBinaryAction::CREATE_BINARY: AccessControl::getInstance()->checkPermission(DCrackerBinaryAction::CREATE_BINARY_PERM); - $binaryType = CrackerUtils::createBinary($_POST['version'], $_POST['name'], $_POST['url'], $_POST['binaryTypeId']); - header("Location: crackers.php?id=" . $binaryType->getId()); + $binary = CrackerUtils::createBinary($_POST['version'], $_POST['name'], $_POST['url'], $_POST['binaryTypeId']); + header("Location: crackers.php?id=" . $binary->getCrackerBinaryTypeId()); die(); case DCrackerBinaryAction::EDIT_BINARY: AccessControl::getInstance()->checkPermission(DCrackerBinaryAction::EDIT_BINARY_PERM); diff --git a/src/inc/handlers/NotificationHandler.class.php b/src/inc/handlers/NotificationHandler.class.php index bf618ea28..923390390 100644 --- a/src/inc/handlers/NotificationHandler.class.php +++ b/src/inc/handlers/NotificationHandler.class.php @@ -16,7 +16,7 @@ public function handle($action) { switch ($action) { case DNotificationAction::CREATE_NOTIFICATION: AccessControl::getInstance()->checkPermission(DNotificationAction::CREATE_NOTIFICATION_PERM); - NotificationUtils::createNotificaton($_POST['actionType'], $_POST['notification'], $_POST['receiver'], $_POST); + NotificationUtils::createNotification($_POST['actionType'], $_POST['notification'], $_POST['receiver'], $_POST); break; case DNotificationAction::SET_ACTIVE: AccessControl::getInstance()->checkPermission(DNotificationAction::SET_ACTIVE_PERM); diff --git a/src/inc/utils/AccessControlUtils.class.php b/src/inc/utils/AccessControlUtils.class.php index a0b8b9c00..996521dfd 100644 --- a/src/inc/utils/AccessControlUtils.class.php +++ b/src/inc/utils/AccessControlUtils.class.php @@ -86,8 +86,9 @@ public static function updateGroupPermissions($groupId, $perm) { * @param string $groupName * @return RightGroup * @throws HttpError + * @throws HttpConflict */ - public static function createGroup($groupName) { + public static function createGroup(string $groupName): RightGroup { if (strlen($groupName) == 0 || strlen($groupName) > DLimits::ACCESS_GROUP_MAX_LENGTH) { throw new HttpError("Permission group name is too short or too long!"); } @@ -98,8 +99,7 @@ public static function createGroup($groupName) { throw new HttpConflict("There is already an permission group with the same name!"); } $group = new RightGroup(null, $groupName, "[]"); - $group = Factory::getRightGroupFactory()->save($group); - return $group; + return Factory::getRightGroupFactory()->save($group); } /** diff --git a/src/inc/utils/AgentBinaryUtils.class.php b/src/inc/utils/AgentBinaryUtils.class.php index 5a0fdd149..23a3d0261 100644 --- a/src/inc/utils/AgentBinaryUtils.class.php +++ b/src/inc/utils/AgentBinaryUtils.class.php @@ -14,9 +14,10 @@ class AgentBinaryUtils { * @param string $version * @param string $updateTrack * @param User $user - * @throws HTException + * @return AgentBinary + * @throws HttpError */ - public static function newBinary($type, $os, $filename, $version, $updateTrack, $user) { + public static function newBinary(string $type, string $os, string $filename, string $version, string $updateTrack, User $user): AgentBinary { if (strlen($version) == 0) { throw new HttpError("Version cannot be empty!"); } @@ -29,8 +30,10 @@ public static function newBinary($type, $os, $filename, $version, $updateTrack, throw new HttpError("You cannot have two binaries with the same type!"); } $agentBinary = new AgentBinary(null, $type, $version, $os, $filename, $updateTrack, ''); - Factory::getAgentBinaryFactory()->save($agentBinary); + $agentBinary = Factory::getAgentBinaryFactory()->save($agentBinary); Util::createLogEntry(DLogEntryIssuer::USER, $user->getId(), DLogEntry::INFO, "New Binary " . $agentBinary->getFilename() . " was added!"); + + return $agentBinary; } /** diff --git a/src/inc/utils/AgentUtils.class.php b/src/inc/utils/AgentUtils.class.php index b2a8d8c01..621df9638 100644 --- a/src/inc/utils/AgentUtils.class.php +++ b/src/inc/utils/AgentUtils.class.php @@ -363,14 +363,15 @@ public static function deleteDependencies($agent) { Factory::getAgentFactory()->delete($agent); return true; } - + /** * @param int $agentId * @param int $taskId * @param User $user * @throws HTException + * @throws HttpError */ - public static function assign($agentId, $taskId, $user) { + public static function assign(int $agentId, int $taskId, User $user): ?Assignment { $agent = AgentUtils::getAgent($agentId, $user); if ($taskId == 0 || empty($taskId)) { // unassign @@ -380,7 +381,7 @@ public static function assign($agentId, $taskId, $user) { header("Location: tasks.php?id=" . intval($_GET['task'])); die(); } - return; + return null; } $task = Factory::getTaskFactory()->get(intval($taskId)); @@ -414,12 +415,13 @@ public static function assign($agentId, $taskId, $user) { } else { $assignment = new Assignment(null, $task->getId(), $agent->getId(), $benchmark); - Factory::getAssignmentFactory()->save($assignment); + $assignment = Factory::getAssignmentFactory()->save($assignment); } if (isset($_GET['task'])) { header("Location: tasks.php?id=" . intval($_GET['task'])); die(); } + return $assignment; } /** @@ -532,12 +534,13 @@ public static function setActive($agentId, $active, $user, $toggle = false) { } Factory::getAgentFactory()->set($agent, Agent::IS_ACTIVE, $set); } - + /** * @param string $newVoucher - * @throws HTException + * @return RegVoucher + * @throws HttpConflict */ - public static function createVoucher($newVoucher) { + public static function createVoucher(string $newVoucher): RegVoucher { $qF = new QueryFilter(RegVoucher::VOUCHER, $newVoucher, "="); $check = Factory::getRegVoucherFactory()->filter([Factory::FILTER => $qF]); if ($check != null) { @@ -546,7 +549,7 @@ public static function createVoucher($newVoucher) { $key = htmlentities($newVoucher, ENT_QUOTES, "UTF-8"); $voucher = new RegVoucher(null, $key, time()); - Factory::getRegVoucherFactory()->save($voucher); + return Factory::getRegVoucherFactory()->save($voucher); } /** diff --git a/src/inc/utils/CrackerUtils.class.php b/src/inc/utils/CrackerUtils.class.php index ec6be4a28..0215112c4 100644 --- a/src/inc/utils/CrackerUtils.class.php +++ b/src/inc/utils/CrackerUtils.class.php @@ -28,9 +28,11 @@ public static function getBinaryTypes() { /** * @param string $typeName - * @throws HTException + * @return CrackerBinaryType + * @throws HttpConflict + * @throws HttpError */ - public static function createBinaryType($typeName) { + public static function createBinaryType(string $typeName): CrackerBinaryType { $qF = new QueryFilter(CrackerBinaryType::TYPE_NAME, $typeName, "="); $check = Factory::getCrackerBinaryTypeFactory()->filter([Factory::FILTER => $qF], true); if ($check !== null) { @@ -40,7 +42,7 @@ public static function createBinaryType($typeName) { throw new HttpError("Cracker name cannot be empty!"); } $binaryType = new CrackerBinaryType(null, $typeName, 1); - Factory::getCrackerBinaryTypeFactory()->save($binaryType); + return Factory::getCrackerBinaryTypeFactory()->save($binaryType); } /** @@ -48,17 +50,17 @@ public static function createBinaryType($typeName) { * @param string $name * @param string $url * @param int $binaryTypeId - * @return CrackerBinaryType + * @return CrackerBinary * @throws HttpError + * @throws HTException */ - public static function createBinary($version, $name, $url, $binaryTypeId) { + public static function createBinary(string $version, string $name, string $url, int $binaryTypeId): CrackerBinary { $binaryType = CrackerUtils::getBinaryType($binaryTypeId); if (strlen($version) == 0 || strlen($name) == 0 || strlen($url) == 0) { throw new HttpError("Please provide all information!"); } $binary = new CrackerBinary(null, $binaryType->getId(), $version, $url, $name); - Factory::getCrackerBinaryFactory()->save($binary); - return $binaryType; + return Factory::getCrackerBinaryFactory()->save($binary); } /** diff --git a/src/inc/utils/HashtypeUtils.class.php b/src/inc/utils/HashtypeUtils.class.php index 8c23dc653..b2cb9856d 100644 --- a/src/inc/utils/HashtypeUtils.class.php +++ b/src/inc/utils/HashtypeUtils.class.php @@ -33,9 +33,10 @@ public static function deleteHashtype($hashtypeId) { * @param int $isSalted * @param bool $isSlowHash * @param User $user - * @throws HTException + * @return HashType + * @throws HttpError */ - public static function addHashtype($hashtypeId, $description, $isSalted, $isSlowHash, $user) { + public static function addHashtype(int $hashtypeId, string $description, int $isSalted, bool $isSlowHash, User $user): HashType { $hashtype = Factory::getHashTypeFactory()->get($hashtypeId); if ($hashtype != null) { throw new HttpError("This hash number is already used!"); @@ -55,9 +56,11 @@ public static function addHashtype($hashtypeId, $description, $isSalted, $isSlow } $hashtype = new HashType($hashtypeId, $desc, $salted, $slow); - if (Factory::getHashTypeFactory()->save($hashtype) == null) { + $hashtype = Factory::getHashTypeFactory()->save($hashtype); + if ($hashtype == null) { throw new HttpError("Failed to add new hash type!"); } Util::createLogEntry("User", $user->getId(), DLogEntry::INFO, "New Hashtype added: " . $hashtype->getDescription()); + return $hashtype; } } \ No newline at end of file diff --git a/src/inc/utils/NotificationUtils.class.php b/src/inc/utils/NotificationUtils.class.php index c293ebc9d..385d2418f 100644 --- a/src/inc/utils/NotificationUtils.class.php +++ b/src/inc/utils/NotificationUtils.class.php @@ -11,10 +11,13 @@ class NotificationUtils { * @param string $notification * @param string $receiver * @param array $post + * @param User|null $user + * @return NotificationSetting * @throws HTException + * @throws HttpError */ - public static function createNotificaton($actionType, $notification, $receiver, $post, $user = null) { + public static function createNotification(string $actionType, string $notification, string $receiver, array $post, User $user = null): NotificationSetting { if ($user == null) { $user = Login::getInstance()->getUser(); }; @@ -68,7 +71,7 @@ public static function createNotificaton($actionType, $notification, $receiver, } $notificationSetting = new NotificationSetting(null, $actionType, $objectId, $notification, $user->getId(), $receiver, 1); - Factory::getNotificationSettingFactory()->save($notificationSetting); + return Factory::getNotificationSettingFactory()->save($notificationSetting); } /** diff --git a/src/inc/utils/PreprocessorUtils.class.php b/src/inc/utils/PreprocessorUtils.class.php index e356f12d7..97a942078 100644 --- a/src/inc/utils/PreprocessorUtils.class.php +++ b/src/inc/utils/PreprocessorUtils.class.php @@ -9,15 +9,17 @@ class PreprocessorUtils { /** - * @param $name - * @param $binaryName - * @param $url - * @param $keyspaceCommand - * @param $skipCommand - * @param $limitCommand + * @param string $name + * @param string $binaryName + * @param string $url + * @param string $keyspaceCommand + * @param string $skipCommand + * @param string $limitCommand + * @return Preprocessor + * @throws HttpConflict * @throws HttpError */ - public static function addPreprocessor($name, $binaryName, $url, $keyspaceCommand, $skipCommand, $limitCommand) { + public static function addPreprocessor(string $name, string $binaryName, string $url, string $keyspaceCommand, string $skipCommand, string $limitCommand): Preprocessor { $qF = new QueryFilter(Preprocessor::NAME, $name, "="); $check = Factory::getPreprocessorFactory()->filter([Factory::FILTER => $qF], true); if ($check !== null) { @@ -56,7 +58,7 @@ public static function addPreprocessor($name, $binaryName, $url, $keyspaceComman } $preprocessor = new Preprocessor(null, $name, $url, $binaryName, $keyspaceCommand, $skipCommand, $limitCommand); - Factory::getPreprocessorFactory()->save($preprocessor); + return Factory::getPreprocessorFactory()->save($preprocessor); } /** diff --git a/src/inc/utils/PretaskUtils.class.php b/src/inc/utils/PretaskUtils.class.php index c2aeedc62..5ccd89595 100644 --- a/src/inc/utils/PretaskUtils.class.php +++ b/src/inc/utils/PretaskUtils.class.php @@ -295,15 +295,16 @@ public static function runPretask($pretaskId, $hashlistId, $name, $crackerBinary * @param int $crackerBinaryTypeId * @param int $maxAgents * @param int $priority + * @return Pretask * @throws HttpError */ - public static function createPretask($name, $cmdLine, $chunkTime, $statusTimer, $color, $cpuOnly, $isSmall, $benchmarkType, $files, $crackerBinaryTypeId, $maxAgents, $priority = 0) { + public static function createPretask(string $name, string $cmdLine, int $chunkTime, int $statusTimer, string $color, int $cpuOnly, int $isSmall, int $benchmarkType, array $files, int $crackerBinaryTypeId, int $maxAgents, int $priority = 0): Pretask { $crackerBinaryType = Factory::getCrackerBinaryTypeFactory()->get($crackerBinaryTypeId); if (strlen($name) == 0) { throw new HttpError("Name cannot be empty!"); } - else if (strpos($cmdLine, SConfig::getInstance()->getVal(DConfig::HASHLIST_ALIAS)) === false) { + else if (!str_contains($cmdLine, SConfig::getInstance()->getVal(DConfig::HASHLIST_ALIAS))) { throw new HttpError("The attack command does not contain the hashlist alias!"); } else if (strlen($cmdLine) > 65535) { @@ -360,6 +361,7 @@ public static function createPretask($name, $cmdLine, $chunkTime, $statusTimer, Factory::getFilePretaskFactory()->save($filePretask); } } + return $pretask; } } diff --git a/src/inc/utils/SupertaskUtils.class.php b/src/inc/utils/SupertaskUtils.class.php index f007b385d..e538a103d 100644 --- a/src/inc/utils/SupertaskUtils.class.php +++ b/src/inc/utils/SupertaskUtils.class.php @@ -321,10 +321,11 @@ public static function runSupertask($supertaskId, $hashlistId, $crackerId) { /** * @param string $name * @param int[] $pretasks + * @return Supertask * @throws HttpError */ - public static function createSupertask($name, $pretasks) { - if (!is_array($pretasks) || sizeof($pretasks) == 0) { + public static function createSupertask(string $name, array $pretasks): Supertask { + if (sizeof($pretasks) == 0) { throw new HttpError("Cannot create empty supertask!"); } $tasks = []; @@ -346,6 +347,7 @@ public static function createSupertask($name, $pretasks) { } Factory::getAgentFactory()->getDB()->commit(); + return Factory::getSupertaskFactory()->get($supertask->getId()); } /** From b8d9e91508ec708bf0b30b3899f44d59f86a8554 Mon Sep 17 00:00:00 2001 From: Sein Coray Date: Thu, 26 Jun 2025 15:11:39 +0200 Subject: [PATCH 103/691] fixed relationtype retrieval in permission check for public attributes (#1407) --- .../apiv2/common/AbstractBaseAPI.class.php | 19 ++++++++++++++----- 1 file changed, 14 insertions(+), 5 deletions(-) diff --git a/src/inc/apiv2/common/AbstractBaseAPI.class.php b/src/inc/apiv2/common/AbstractBaseAPI.class.php index 85909959c..7af305707 100644 --- a/src/inc/apiv2/common/AbstractBaseAPI.class.php +++ b/src/inc/apiv2/common/AbstractBaseAPI.class.php @@ -1205,12 +1205,21 @@ protected function validatePermissions(array $required_perms, array $permsExpand foreach ($missing_permissions as $missing_permission) { $expands = $permsExpandMatching[$missing_permission]; foreach ($expands as $expand) { - $classType = $this->getToManyRelationships()[$expand]['relationType']; - $features = $this->getFeaturesOther($classType); + $classType = null; + if (isset($this->getToManyRelationships()[$expand])) { + $classType = $this->getToManyRelationships()[$expand]['relationType']; + } + elseif (isset($this->getToOneRelationships()[$expand])) { + $classType = $this->getToOneRelationships()[$expand]['relationType']; + } + $expandPublicAttributes = []; - foreach ($features as $key => $arr) { - if ($arr['public']) { - $expandPublicAttributes[] = $key; + if ($classType != null) { + $features = $this->getFeaturesOther($classType); + foreach ($features as $key => $arr) { + if ($arr['public']) { + $expandPublicAttributes[] = $key; + } } } if (count($expandPublicAttributes) == 0) { From 97bd880dee3fdf7ad686f1810a96bf1cf0e7677f Mon Sep 17 00:00:00 2001 From: Sein Coray Date: Thu, 26 Jun 2025 15:12:39 +0200 Subject: [PATCH 104/691] update last login time on user login via new api (#1408) --- src/api/v2/index.php | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/api/v2/index.php b/src/api/v2/index.php index 44a207754..03ba4f0cd 100644 --- a/src/api/v2/index.php +++ b/src/api/v2/index.php @@ -69,11 +69,10 @@ public function __invoke(array $arguments): bool { $filter = new QueryFilter(User::USERNAME, $username, "="); - $check = Factory::getUserFactory()->filter([Factory::FILTER => $filter]); - if ($check === null || sizeof($check) == 0) { + $user = Factory::getUserFactory()->filter([Factory::FILTER => $filter], true); + if ($user === null) { return false; } - $user = $check[0]; if ($user->getIsValid() != 1) { return false; @@ -82,6 +81,7 @@ public function __invoke(array $arguments): bool { Util::createLogEntry(DLogEntryIssuer::USER, $user->getId(), DLogEntry::WARN, "Failed login attempt due to wrong password!"); return false; } + Factory::getUserFactory()->set($user, User::LAST_LOGIN_DATE, time()); return true; } } From 23e863d8c4346789aa54204edb8dd7c59a60e6ba Mon Sep 17 00:00:00 2001 From: Sein Coray Date: Fri, 27 Jun 2025 10:14:26 +0200 Subject: [PATCH 105/691] Patching Checks (#1409) * fixed call to databaseset on patching * implemented check to only accept existing foreing keys to patch * fixed the patch check to use the correct factory * check that certain foreign keys cannot be set to null from the model features * set all non-modifiable relationships for one-one relationships * improved POST queries on relationships to check for foreign keys existing * fixed missing immutable setting for Hash.hashlistId * added checking of ids of relation keys on many updates --- src/dba/models/Assignment.class.php | 4 +- src/dba/models/Config.class.php | 2 +- src/dba/models/CrackerBinary.class.php | 2 +- src/dba/models/Hash.class.php | 2 +- src/dba/models/HashBinary.class.php | 2 +- src/dba/models/HealthCheck.class.php | 4 +- src/dba/models/TaskWrapper.class.php | 2 +- src/dba/models/generator.php | 20 ++--- .../apiv2/common/AbstractBaseAPI.class.php | 8 +- .../apiv2/common/AbstractModelAPI.class.php | 87 ++++++++++++++----- 10 files changed, 90 insertions(+), 43 deletions(-) diff --git a/src/dba/models/Assignment.class.php b/src/dba/models/Assignment.class.php index d20863e47..def0af230 100644 --- a/src/dba/models/Assignment.class.php +++ b/src/dba/models/Assignment.class.php @@ -28,8 +28,8 @@ function getKeyValueDict() { static function getFeatures() { $dict = array(); $dict['assignmentId'] = ['read_only' => True, "type" => "int", "subtype" => "unset", "choices" => "unset", "null" => False, "pk" => True, "protected" => True, "private" => False, "alias" => "assignmentId", "public" => False]; - $dict['taskId'] = ['read_only' => False, "type" => "int", "subtype" => "unset", "choices" => "unset", "null" => False, "pk" => False, "protected" => False, "private" => False, "alias" => "taskId", "public" => False]; - $dict['agentId'] = ['read_only' => False, "type" => "int", "subtype" => "unset", "choices" => "unset", "null" => False, "pk" => False, "protected" => False, "private" => False, "alias" => "agentId", "public" => False]; + $dict['taskId'] = ['read_only' => True, "type" => "int", "subtype" => "unset", "choices" => "unset", "null" => False, "pk" => False, "protected" => False, "private" => False, "alias" => "taskId", "public" => False]; + $dict['agentId'] = ['read_only' => True, "type" => "int", "subtype" => "unset", "choices" => "unset", "null" => False, "pk" => False, "protected" => False, "private" => False, "alias" => "agentId", "public" => False]; $dict['benchmark'] = ['read_only' => False, "type" => "str(50)", "subtype" => "unset", "choices" => "unset", "null" => True, "pk" => False, "protected" => False, "private" => False, "alias" => "benchmark", "public" => False]; return $dict; diff --git a/src/dba/models/Config.class.php b/src/dba/models/Config.class.php index d83cf4cbb..26278439f 100644 --- a/src/dba/models/Config.class.php +++ b/src/dba/models/Config.class.php @@ -28,7 +28,7 @@ function getKeyValueDict() { static function getFeatures() { $dict = array(); $dict['configId'] = ['read_only' => True, "type" => "int", "subtype" => "unset", "choices" => "unset", "null" => False, "pk" => True, "protected" => True, "private" => False, "alias" => "configId", "public" => False]; - $dict['configSectionId'] = ['read_only' => False, "type" => "int", "subtype" => "unset", "choices" => "unset", "null" => False, "pk" => False, "protected" => False, "private" => False, "alias" => "configSectionId", "public" => False]; + $dict['configSectionId'] = ['read_only' => True, "type" => "int", "subtype" => "unset", "choices" => "unset", "null" => False, "pk" => False, "protected" => False, "private" => False, "alias" => "configSectionId", "public" => False]; $dict['item'] = ['read_only' => False, "type" => "str(128)", "subtype" => "unset", "choices" => "unset", "null" => False, "pk" => False, "protected" => False, "private" => False, "alias" => "item", "public" => False]; $dict['value'] = ['read_only' => False, "type" => "str(65535)", "subtype" => "unset", "choices" => "unset", "null" => False, "pk" => False, "protected" => False, "private" => False, "alias" => "value", "public" => False]; diff --git a/src/dba/models/CrackerBinary.class.php b/src/dba/models/CrackerBinary.class.php index 576304dba..e68dd0bb7 100644 --- a/src/dba/models/CrackerBinary.class.php +++ b/src/dba/models/CrackerBinary.class.php @@ -31,7 +31,7 @@ function getKeyValueDict() { static function getFeatures() { $dict = array(); $dict['crackerBinaryId'] = ['read_only' => True, "type" => "int", "subtype" => "unset", "choices" => "unset", "null" => False, "pk" => True, "protected" => True, "private" => False, "alias" => "crackerBinaryId", "public" => False]; - $dict['crackerBinaryTypeId'] = ['read_only' => False, "type" => "int", "subtype" => "unset", "choices" => "unset", "null" => False, "pk" => False, "protected" => False, "private" => False, "alias" => "crackerBinaryTypeId", "public" => False]; + $dict['crackerBinaryTypeId'] = ['read_only' => True, "type" => "int", "subtype" => "unset", "choices" => "unset", "null" => False, "pk" => False, "protected" => False, "private" => False, "alias" => "crackerBinaryTypeId", "public" => False]; $dict['version'] = ['read_only' => False, "type" => "str(20)", "subtype" => "unset", "choices" => "unset", "null" => False, "pk" => False, "protected" => False, "private" => False, "alias" => "version", "public" => False]; $dict['downloadUrl'] = ['read_only' => False, "type" => "str(150)", "subtype" => "unset", "choices" => "unset", "null" => False, "pk" => False, "protected" => False, "private" => False, "alias" => "downloadUrl", "public" => False]; $dict['binaryName'] = ['read_only' => False, "type" => "str(50)", "subtype" => "unset", "choices" => "unset", "null" => False, "pk" => False, "protected" => False, "private" => False, "alias" => "binaryName", "public" => False]; diff --git a/src/dba/models/Hash.class.php b/src/dba/models/Hash.class.php index 2cef9cf74..8d63e5340 100644 --- a/src/dba/models/Hash.class.php +++ b/src/dba/models/Hash.class.php @@ -43,7 +43,7 @@ function getKeyValueDict() { static function getFeatures() { $dict = array(); $dict['hashId'] = ['read_only' => True, "type" => "int", "subtype" => "unset", "choices" => "unset", "null" => False, "pk" => True, "protected" => True, "private" => False, "alias" => "hashId", "public" => False]; - $dict['hashlistId'] = ['read_only' => False, "type" => "int", "subtype" => "unset", "choices" => "unset", "null" => False, "pk" => False, "protected" => False, "private" => False, "alias" => "hashlistId", "public" => False]; + $dict['hashlistId'] = ['read_only' => True, "type" => "int", "subtype" => "unset", "choices" => "unset", "null" => False, "pk" => False, "protected" => False, "private" => False, "alias" => "hashlistId", "public" => False]; $dict['hash'] = ['read_only' => False, "type" => "str(65535)", "subtype" => "unset", "choices" => "unset", "null" => False, "pk" => False, "protected" => False, "private" => False, "alias" => "hash", "public" => False]; $dict['salt'] = ['read_only' => False, "type" => "str(256)", "subtype" => "unset", "choices" => "unset", "null" => False, "pk" => False, "protected" => False, "private" => False, "alias" => "salt", "public" => False]; $dict['plaintext'] = ['read_only' => False, "type" => "str(256)", "subtype" => "unset", "choices" => "unset", "null" => False, "pk" => False, "protected" => False, "private" => False, "alias" => "plaintext", "public" => False]; diff --git a/src/dba/models/HashBinary.class.php b/src/dba/models/HashBinary.class.php index c17353ef5..bf2679049 100644 --- a/src/dba/models/HashBinary.class.php +++ b/src/dba/models/HashBinary.class.php @@ -43,7 +43,7 @@ function getKeyValueDict() { static function getFeatures() { $dict = array(); $dict['hashBinaryId'] = ['read_only' => True, "type" => "int", "subtype" => "unset", "choices" => "unset", "null" => False, "pk" => True, "protected" => True, "private" => False, "alias" => "hashBinaryId", "public" => False]; - $dict['hashlistId'] = ['read_only' => False, "type" => "int", "subtype" => "unset", "choices" => "unset", "null" => False, "pk" => False, "protected" => False, "private" => False, "alias" => "hashlistId", "public" => False]; + $dict['hashlistId'] = ['read_only' => True, "type" => "int", "subtype" => "unset", "choices" => "unset", "null" => False, "pk" => False, "protected" => False, "private" => False, "alias" => "hashlistId", "public" => False]; $dict['essid'] = ['read_only' => False, "type" => "str(100)", "subtype" => "unset", "choices" => "unset", "null" => False, "pk" => False, "protected" => False, "private" => False, "alias" => "essid", "public" => False]; $dict['hash'] = ['read_only' => False, "type" => "str(4294967295)", "subtype" => "unset", "choices" => "unset", "null" => False, "pk" => False, "protected" => False, "private" => False, "alias" => "hash", "public" => False]; $dict['plaintext'] = ['read_only' => False, "type" => "str(1024)", "subtype" => "unset", "choices" => "unset", "null" => False, "pk" => False, "protected" => False, "private" => False, "alias" => "plaintext", "public" => False]; diff --git a/src/dba/models/HealthCheck.class.php b/src/dba/models/HealthCheck.class.php index 8b9615948..8e762aff0 100644 --- a/src/dba/models/HealthCheck.class.php +++ b/src/dba/models/HealthCheck.class.php @@ -43,8 +43,8 @@ static function getFeatures() { $dict['time'] = ['read_only' => True, "type" => "int64", "subtype" => "unset", "choices" => "unset", "null" => False, "pk" => False, "protected" => True, "private" => False, "alias" => "time", "public" => False]; $dict['status'] = ['read_only' => True, "type" => "int", "subtype" => "unset", "choices" => "unset", "null" => False, "pk" => False, "protected" => True, "private" => False, "alias" => "status", "public" => False]; $dict['checkType'] = ['read_only' => False, "type" => "int", "subtype" => "unset", "choices" => "unset", "null" => False, "pk" => False, "protected" => False, "private" => False, "alias" => "checkType", "public" => False]; - $dict['hashtypeId'] = ['read_only' => False, "type" => "int", "subtype" => "unset", "choices" => "unset", "null" => False, "pk" => False, "protected" => False, "private" => False, "alias" => "hashtypeId", "public" => False]; - $dict['crackerBinaryId'] = ['read_only' => False, "type" => "int", "subtype" => "unset", "choices" => "unset", "null" => False, "pk" => False, "protected" => False, "private" => False, "alias" => "crackerBinaryId", "public" => False]; + $dict['hashtypeId'] = ['read_only' => True, "type" => "int", "subtype" => "unset", "choices" => "unset", "null" => False, "pk" => False, "protected" => False, "private" => False, "alias" => "hashtypeId", "public" => False]; + $dict['crackerBinaryId'] = ['read_only' => True, "type" => "int", "subtype" => "unset", "choices" => "unset", "null" => False, "pk" => False, "protected" => False, "private" => False, "alias" => "crackerBinaryId", "public" => False]; $dict['expectedCracks'] = ['read_only' => True, "type" => "int", "subtype" => "unset", "choices" => "unset", "null" => False, "pk" => False, "protected" => True, "private" => False, "alias" => "expectedCracks", "public" => False]; $dict['attackCmd'] = ['read_only' => True, "type" => "str(65535)", "subtype" => "unset", "choices" => "unset", "null" => False, "pk" => False, "protected" => True, "private" => False, "alias" => "attackCmd", "public" => False]; diff --git a/src/dba/models/TaskWrapper.class.php b/src/dba/models/TaskWrapper.class.php index 850b28fb5..8f18302f3 100644 --- a/src/dba/models/TaskWrapper.class.php +++ b/src/dba/models/TaskWrapper.class.php @@ -50,7 +50,7 @@ static function getFeatures() { $dict['accessGroupId'] = ['read_only' => False, "type" => "int", "subtype" => "unset", "choices" => "unset", "null" => False, "pk" => False, "protected" => False, "private" => False, "alias" => "accessGroupId", "public" => False]; $dict['taskWrapperName'] = ['read_only' => False, "type" => "str(100)", "subtype" => "unset", "choices" => "unset", "null" => False, "pk" => False, "protected" => False, "private" => False, "alias" => "taskWrapperName", "public" => False]; $dict['isArchived'] = ['read_only' => False, "type" => "bool", "subtype" => "unset", "choices" => "unset", "null" => False, "pk" => False, "protected" => False, "private" => False, "alias" => "isArchived", "public" => False]; - $dict['cracked'] = ['read_only' => False, "type" => "int", "subtype" => "unset", "choices" => "unset", "null" => False, "pk" => False, "protected" => True, "private" => False, "alias" => "cracked", "public" => False]; + $dict['cracked'] = ['read_only' => True, "type" => "int", "subtype" => "unset", "choices" => "unset", "null" => False, "pk" => False, "protected" => True, "private" => False, "alias" => "cracked", "public" => False]; return $dict; } diff --git a/src/dba/models/generator.php b/src/dba/models/generator.php index 867352d48..f133b1fba 100644 --- a/src/dba/models/generator.php +++ b/src/dba/models/generator.php @@ -128,8 +128,8 @@ 'permission_alias' => 'AgentAssignment', 'columns' => [ ['name' => 'assignmentId', 'read_only' => True, 'type' => 'int', 'protected' => True], - ['name' => 'taskId', 'read_only' => False, 'type' => 'int', 'relation' => 'Task'], - ['name' => 'agentId', 'read_only' => False, 'type' => 'int', 'relation' => 'Agent'], + ['name' => 'taskId', 'read_only' => True, 'type' => 'int', 'relation' => 'Task'], + ['name' => 'agentId', 'read_only' => True, 'type' => 'int', 'relation' => 'Agent'], ['name' => 'benchmark', 'read_only' => False, 'type' => 'str(50)', 'null' => True], ], ]; @@ -152,7 +152,7 @@ $CONF['Config'] = [ 'columns' => [ ['name' => 'configId', 'read_only' => True, 'type' => 'int', 'protected' => True], - ['name' => 'configSectionId', 'read_only' => False, 'type' => 'int', 'relation' => 'ConfigSection'], + ['name' => 'configSectionId', 'read_only' => True, 'type' => 'int', 'relation' => 'ConfigSection'], ['name' => 'item', 'read_only' => False, 'type' => 'str(128)'], ['name' => 'value', 'read_only' => False, 'type' => 'str(65535)'], ], @@ -166,7 +166,7 @@ $CONF['CrackerBinary'] = [ 'columns' => [ ['name' => 'crackerBinaryId', 'read_only' => True, 'type' => 'int', 'protected' => True], - ['name' => 'crackerBinaryTypeId', 'read_only' => False, 'type' => 'int', 'relation' => 'CrackerBinaryType'], + ['name' => 'crackerBinaryTypeId', 'read_only' => True, 'type' => 'int', 'relation' => 'CrackerBinaryType'], ['name' => 'version', 'read_only' => False, 'type' => 'str(20)'], ['name' => 'downloadUrl', 'read_only' => False, 'type' => 'str(150)'], ['name' => 'binaryName', 'read_only' => False, 'type' => 'str(50)'], @@ -208,7 +208,7 @@ $CONF['Hash'] = [ 'columns' => [ ['name' => 'hashId', 'read_only' => True, 'type' => 'int', 'protected' => True], - ['name' => 'hashlistId', 'read_only' => False, 'type' => 'int', 'relation' => 'Hashlist'], + ['name' => 'hashlistId', 'read_only' => True, 'type' => 'int', 'relation' => 'Hashlist'], ['name' => 'hash', 'read_only' => False, 'type' => 'str(65535)'], ['name' => 'salt', 'read_only' => False, 'type' => 'str(256)'], ['name' => 'plaintext', 'read_only' => False, 'type' => 'str(256)'], @@ -221,7 +221,7 @@ $CONF['HashBinary'] = [ 'columns' => [ ['name' => 'hashBinaryId', 'read_only' => True, 'type' => 'int', 'protected' => True], - ['name' => 'hashlistId', 'read_only' => False, 'type' => 'int', 'relation' => 'Hashlist'], + ['name' => 'hashlistId', 'read_only' => True, 'type' => 'int', 'relation' => 'Hashlist'], ['name' => 'essid', 'read_only' => False, 'type' => 'str(100)'], ['name' => 'hash', 'read_only' => False, 'type' => 'str(4294967295)'], ['name' => 'plaintext', 'read_only' => False, 'type' => 'str(1024)'], @@ -239,7 +239,7 @@ ['name' => 'hashTypeId', 'read_only' => True, 'type' => 'int', 'relation' => 'HashType'], ['name' => 'hashCount', 'read_only' => True, 'type' => 'int'], ['name' => 'saltSeparator', 'read_only' => True, 'type' => 'str(10)', 'null' => True, 'alias' => UQueryHashlist::HASHLIST_SEPARATOR], - ['name' => 'cracked', 'read_only' => true, 'type' => 'int', 'protected' => True], + ['name' => 'cracked', 'read_only' => True, 'type' => 'int', 'protected' => True], ['name' => 'isSecret', 'read_only' => False, 'type' => 'bool'], ['name' => 'hexSalt', 'read_only' => True, 'type' => 'bool', 'alias' => UQueryHashlist::HASHLIST_HEX_SALTED], ['name' => 'isSalted', 'read_only' => True, 'type' => 'bool'], @@ -264,8 +264,8 @@ ['name' => 'time', 'read_only' => True, 'type' => 'int64', 'protected' => True], ['name' => 'status', 'read_only' => True, 'type' => 'int', 'protected' => True], ['name' => 'checkType', 'read_only' => False, 'type' => 'int'], - ['name' => 'hashtypeId', 'read_only' => False, 'type' => 'int', 'relation' => 'HashType'], - ['name' => 'crackerBinaryId', 'read_only' => False, 'type' => 'int', 'relation' => 'CrackerBinary'], + ['name' => 'hashtypeId', 'read_only' => True, 'type' => 'int', 'relation' => 'HashType'], + ['name' => 'crackerBinaryId', 'read_only' => True, 'type' => 'int', 'relation' => 'CrackerBinary'], ['name' => 'expectedCracks', 'read_only' => True, 'type' => 'int', 'protected' => True], ['name' => 'attackCmd', 'read_only' => True, 'type' => 'str(65535)', 'protected' => True], ], @@ -423,7 +423,7 @@ ['name' => 'accessGroupId', 'read_only' => False, 'type' => 'int', 'relation' => 'AccessGroup'], ['name' => 'taskWrapperName', 'read_only' => False, 'type' => 'str(100)'], ['name' => 'isArchived', 'read_only' => False, 'type' => 'bool'], - ['name' => 'cracked', 'read_only' => False, 'type' => 'int', 'protected' => True], + ['name' => 'cracked', 'read_only' => True, 'type' => 'int', 'protected' => True], ], ]; $CONF['User'] = [ diff --git a/src/inc/apiv2/common/AbstractBaseAPI.class.php b/src/inc/apiv2/common/AbstractBaseAPI.class.php index 7af305707..edcc32bae 100644 --- a/src/inc/apiv2/common/AbstractBaseAPI.class.php +++ b/src/inc/apiv2/common/AbstractBaseAPI.class.php @@ -769,13 +769,14 @@ protected function unaliasData(array $data, array $features): array { /** * Validate the Permission of a DBA column and check if it key may be altered * - * @param string $key Field to use as base for $objects * @param array $features The features of the DBA object of the child + * @param string $key Field to use as base for $objects + * @param bool $toNull set this to true if it should be checked if the value can be set to null * @return void * @throws HttpError * @throws HttpForbidden when it is not allowed to alter the key */ - protected function isAllowedToMutate(array $features, string $key): void { + protected function isAllowedToMutate(array $features, string $key, bool $toNull = false): void { // Ensure key exists in target array if (!array_key_exists($key, $features)) { throw new HttpError("Key '$key' does not exists!"); @@ -790,6 +791,9 @@ protected function isAllowedToMutate(array $features, string $key): void { if ($features[$key]['private']) { throw new HttpForbidden("Key '$key' is private"); } + if ($toNull && $features[$key]['null'] == false){ + throw new HttpForbidden("Key '$key' can not be set to NULL!"); + } } /** diff --git a/src/inc/apiv2/common/AbstractModelAPI.class.php b/src/inc/apiv2/common/AbstractModelAPI.class.php index da277501b..c1ff75269 100644 --- a/src/inc/apiv2/common/AbstractModelAPI.class.php +++ b/src/inc/apiv2/common/AbstractModelAPI.class.php @@ -396,12 +396,18 @@ public function deleteOne(Request $request, Response $response, array $args): Re * @throws ResourceNotFoundError * @throws HttpForbidden */ - protected function doFetch(string $pk): mixed { - $object = $this->getFactory()->get($pk); + protected function doFetch(string $pk, AbstractModelFactory $otherFactory = null): mixed { + if ($otherFactory != null) { + $object = $otherFactory->get($pk); + } + else { + $object = $this->getFactory()->get($pk); + } + if ($object === null) { throw new ResourceNotFoundError(); } - if ($this->getSingleACL($this->getCurrentUser(), $object) === false) { + if ($otherFactory == null && $this->getSingleACL($this->getCurrentUser(), $object) === false) { throw new HttpForbidden("No access to this object!", 403); } @@ -1124,9 +1130,6 @@ public function getToOneRelationshipLink(Request $request, Response $response, a /** * API endpoint to patch a to one relationship link - * TODO: This works as intended but it can give weird behaviour. ex. it allows you to put an MD5 hash to a SHA1 hashlist - * by patching the foreign key. Simple fix could be to make foreignkey immutable for cases like this. - * Or just like with the patch many, create an overrideable function to add more logic in child * @param Request $request * @param Response $response * @param array $args @@ -1145,25 +1148,32 @@ public function patchToOneRelationshipLink(Request $request, Response $response, } $data = $jsonBody['data']; - $relationKey = $this->getToOneRelationships()[$args['relation']]['relationKey']; - if ($relationKey == null) { + $relation = $this->getToOneRelationships()[$args['relation']]; + if ($relation == null) { throw new HttpError("Relation does not exist!"); } + $relationKey = $relation['relationKey']; + $relationType = $relation['relationType']; $features = $this->getFeatures(); - $this->isAllowedToMutate($features, $relationKey); + $this->isAllowedToMutate($features, $relationKey, $data == null); $factory = $this->getFactory(); $object = $this->doFetch(intval($args['id'])); if ($data == null) { - $factory->DatabaseSet($object, $relationKey, null); + $this->DatabaseSet($object, $relationKey, null); } elseif (!$this->validateResourceRecord($data)) { throw new HttpError('No valid resource identifier object was given as data!'); } else { - //TODO check if foreign key exists befor inserting - $factory->DatabaseSet($object, $relationKey, $data["id"]); + // check if foreign key exists before inserting + $otherFactory = self::getModelFactory($relationType); + $check = $otherFactory->get($data["id"]); + if ($check == null) { + throw new HttpError("Provided foreign key to patch to does not exist!"); + } + $this->DatabaseSet($object, $relationKey, $check->getId()); } return $response->withStatus(201) @@ -1286,6 +1296,7 @@ public function getToManyRelationshipLink(Request $request, Response $response, * @throws HTException * @throws HttpError * @throws HttpForbidden + * @throws InternalError */ public function patchToManyRelationshipLink(Request $request, Response $response, array $args): Response { $this->preCommon($request); @@ -1370,6 +1381,8 @@ protected function updateToManyRelationship(Request $request, array $data, array * @throws HttpError * @throws HttpForbidden * @throws InternalError + * @throws ResourceNotFoundError + * @throws HttpConflict */ public function postToManyRelationshipLink(Request $request, Response $response, array $args): Response { $this->preCommon($request); @@ -1386,6 +1399,9 @@ public function postToManyRelationshipLink(Request $request, Response $response, throw new HttpError("Relation does not exist!"); } + // check if the object queried exists + $baseItem = $this->doFetch($args["id"]); + // TODO this ia an abstract way of adding to junction tables. This only works for intermediate tables // that have 3 fields (1 primary key and 2 foreign keys to link the tables) for models that have intermediate // tables with more than 3 fields, the postToManyRelationshipLink() function should be overridden. @@ -1394,22 +1410,32 @@ public function postToManyRelationshipLink(Request $request, Response $response, $primaryKey = $this->getPrimaryKeyOther($relationType); //Add to junction table if not exist. $factory = self::getModelFactory($relationType); + $factory->getDB()->beginTransaction(); foreach ($data as $item) { if (!$this->validateResourceRecord($item)) { $encoded_item = json_encode($item); throw new HttpError('Invalid resource record given in list! invalid resource record: ' . $encoded_item); } - $junction_table_entry = $factory->getNullObject(); - $junction_table_entry->setId(null); - $setMethod1 = "set" . ucfirst($relation["junctionTableFilterField"]); - $setMethod2 = "set" . ucfirst($relation["junctionTableJoinField"]); - if (!method_exists($junction_table_entry, $setMethod1) || !method_exists($junction_table_entry, $setMethod2)) { - throw new InternalError("Internal error, set function not found"); + $otherFactory = self::getModelFactory($relation["relationType"]); + $relationItem = $this->doFetch($item["id"], $otherFactory); + + // check if the relation already exists + $qF1 = new QueryFilter($relation["junctionTableFilterField"], $baseItem->getId(), "="); + $qF2 = new QueryFilter($relation["junctionTableJoinField"], $relationItem->getId(), "="); + $check = $factory->filter([Factory::FILTER => [$qF1, $qF2]], true); + if ($check != null) { + throw new HttpConflict("Relation " . $relation['junctionTableType'] . " of " . $baseItem->getId() . " to " . $relationItem->getId() . " already exists"); } - $junction_table_entry->$setMethod1($args["id"]); - $junction_table_entry->$setMethod2($item["id"]); - $factory->save($junction_table_entry); + + $table_entry_dict = [ + $primaryKey => -1, + $relation["junctionTableFilterField"] => $baseItem->getId(), + $relation["junctionTableJoinField"] => $relationItem->getId(), + ]; + $table_entry = $factory->createObjectFromDict(-1, $table_entry_dict); + $factory->save($table_entry); } + $factory->getDB()->commit(); } else { $relationType = $relation['relationType']; @@ -1417,8 +1443,25 @@ public function postToManyRelationshipLink(Request $request, Response $response, $features = $this->getFeaturesOther($relationType); $this->isAllowedToMutate($features, $relationKey); $factory = self::getModelFactory($relationType); - $updates = self::ResourceRecordArrayToUpdateArray($data, $args["id"]); + + $factory->getDB()->beginTransaction(); + $updates = self::ResourceRecordArrayToUpdateArray($data, $baseItem->getId()); + + // check that all the IDs exist + $updateIds = []; + foreach ($updates as $update) { + $updateIds[] = $update->getMatchValue(); + } + $qF = new ContainFilter($primaryKey, $updateIds); + $check = $factory->countFilter([Factory::FILTER => $qF]); + if ($check != count($updateIds)) { + // in order to be efficient we only do a count query, but this has the effect that we cannot + // exactly tell which item is missing + throw new ResourceNotFoundError("Not all requested items to update exist!"); + } + $factory->massSingleUpdate($primaryKey, $relationKey, $updates); + $factory->getDB()->commit(); } return $response->withStatus(201) From eb5955c4454301e14fb43eb85f34244d56f1aa28 Mon Sep 17 00:00:00 2001 From: jessevz Date: Fri, 27 Jun 2025 12:14:04 +0200 Subject: [PATCH 106/691] pagination in working state --- src/dba/PaginationFilter.class.php | 49 ++++++ src/dba/init.php | 1 + .../apiv2/common/AbstractModelAPI.class.php | 147 ++++++++++++++++-- 3 files changed, 180 insertions(+), 17 deletions(-) create mode 100644 src/dba/PaginationFilter.class.php diff --git a/src/dba/PaginationFilter.class.php b/src/dba/PaginationFilter.class.php new file mode 100644 index 000000000..16169fb75 --- /dev/null +++ b/src/dba/PaginationFilter.class.php @@ -0,0 +1,49 @@ +key = $key; + $this->value = $value; + $this->operator = $operator; + $this->factory = $factory; + $this->tieBreakerKey = $tieBreakerKey; + $this->tieBreakerValue = $tieBreakerValue; + } + + function getQueryString($table = "") { + if ($table != "") { + $table = $table . "."; + } + if ($this->factory != null) { + $table = $this->factory->getModelTable() . "."; + } + //ex. SELECT hashTypeId, description, isSalted, isSlowHash FROM HashType + // where (HashType.isSalted < 1) OR (HashType.isSalted = 1 and HashType.hashTypeId < 12600) + // ORDER BY HashType.isSalted DESC, HashType.hashTypeId DESC LIMIT 25; + return "(" . $table . $this->key . $this->operator . "?" . ") OR (" . $this->key . "=" . "?" + . " AND " . $this->tieBreakerKey . $this->operator . "?)"; + } + + function getValue() { + return [$this->value, $this->value, $this->tieBreakerValue]; + } + + function getHasValue() { + if ($this->value === null) { + return false; + } + return true; + } +} diff --git a/src/dba/init.php b/src/dba/init.php index 834f846e7..4ab7cebc6 100644 --- a/src/dba/init.php +++ b/src/dba/init.php @@ -19,6 +19,7 @@ require_once(dirname(__FILE__) . "/ContainFilter.class.php"); require_once(dirname(__FILE__) . "/JoinFilter.class.php"); require_once(dirname(__FILE__) . "/OrderFilter.class.php"); +require_once(dirname(__FILE__) . "/PaginationFilter.class.php"); require_once(dirname(__FILE__) . "/QueryFilter.class.php"); require_once(dirname(__FILE__) . "/GroupFilter.class.php"); require_once(dirname(__FILE__) . "/LimitFilter.class.php"); diff --git a/src/inc/apiv2/common/AbstractModelAPI.class.php b/src/inc/apiv2/common/AbstractModelAPI.class.php index 86c359215..cf6f77d28 100644 --- a/src/inc/apiv2/common/AbstractModelAPI.class.php +++ b/src/inc/apiv2/common/AbstractModelAPI.class.php @@ -11,6 +11,7 @@ use DBA\ContainFilter; use DBA\LimitFilter; use DBA\OrderFilter; +use DBA\PaginationFilter; use DBA\QueryFilter; use Psr\Http\Message\ServerRequestInterface; @@ -460,6 +461,7 @@ protected static function addToRelatedResources(array $relatedResources, array $ return $relatedResources; } + //TODO: This should calculate the next secondary cursor when the primary cursor is not unique protected static function calculate_next_cursor(string|int $element) { if (is_int($element)) { return $element + 1; @@ -480,6 +482,68 @@ protected static function calculate_next_cursor(string|int $element) { throw new HttpError("Internal error", 500); } } + /** + * The cursor is base64 encoded in the following json format: + * {"primary":{"isSlowHash":0},"secondary":{"hashTypeId":10810}} + * This containts a primary filter which is the main sorting filter, but to handle duplicates, it has an optional + * secondary filter for when the primary filter is not unique. This way there is an unique secondary filter to + * handle tie breaks. + * + * @param mixed $primaryFilter The main filter that is sorted on + * @param mixed $primaryId the value of the primaryFilter + * @param bool $hasSecondaryFilter This is a boolean to set whether there is a secondary filter + * @param mixed $secondaryFilter An unique secondary filter to use as a tiebreaker when the main filter is not unique + * @param object $secondaryId The value of the secondary filter + + * @return string a base64 encoded json string that contains the filters. + */ + protected static function build_cursor($primaryFilter, $primaryId, $hasSecondaryFilter = false, + $secondaryFilter= null, $secondaryId = null) { + $cursor = ["primary" => [$primaryFilter => $primaryId]]; + if ($hasSecondaryFilter) { + assert($secondaryId != null && $secondaryFilter != null, + "Secondary id and filter should be set"); + //Add the primary key as a secondary cursor to guarantee the cursor is unique + $cursor["secondary"] = [$secondaryFilter => $secondaryId]; + } + //TODO '=' is not URL safe, should be removed and replaced based on the length of the base64, or it should be url encoded + //or url encode everything and also dont touch the /? + $json = json_encode($cursor); + return strtr(base64_encode($json), '+/', '-_'); + // return urlencode($json); + } + + /** + * Function to decode the cursor from base64 format + * + * @param string $encoded_cursor in base64 format + * + * @return string the decoded cursor in a json string format + */ + protected static function decode_cursor(string $encoded_cursor) { + $json = base64_decode(strtr($encoded_cursor, '-_', '+/')); + $cursor = json_decode($json, true); + if (json_last_error() !== JSON_ERROR_NONE) { + throw new HttpError("Invallid pagination cursor"); + } + return $cursor; + } + + protected static function compare_keys($key1, $key2, $isNegativeSort) { + if (is_string($key1) && is_string($key2)) { + if ($isNegativeSort){ + return strcmp($key2, $key1); + } else { + return strcmp($key1, $key2); + } + } else { + if ($isNegativeSort) { + return $key2 > $key1; + } else { + return $key1 > $key2; + } + } + } /** * API entry point for requesting multiple objects @@ -500,7 +564,7 @@ public static function getManyResources(object $apiClass, Request $request, Resp $pageAfter = $apiClass->getQueryParameterFamilyMember($request, 'page', 'after'); $pageBefore = $apiClass->getQueryParameterFamilyMember($request, 'page', 'before'); $pageSize = $apiClass->getQueryParameterFamilyMember($request, 'page', 'size') ?? $defaultPageSize; - if ($pageSize < 0) { + if (!is_numeric($pageSize) || $pageSize < 0) { throw new HttpError("Invalid parameter, page[size] must be a positive integer"); } elseif ($pageSize > $maxPageSize) { throw new HttpError(sprintf("You requested a size of %d, but %d is the maximum.", $pageSize, $maxPageSize)); @@ -574,23 +638,52 @@ public static function getManyResources(object $apiClass, Request $request, Resp /* Include relation filters */ $finalFs = array_merge($aFs, $relationFs); + $primaryKey = $apiClass->getPrimaryKey(); + //TODO it would be even better if its possible to see if the primary filter is unique, instead of primary key. + $primaryKeyIsNotPrimaryFilter = $primaryFilter != $primaryKey; //according to JSON API spec, first and last have to be calculated if inexpensive to compute //(https://jsonapi.org/profiles/ethanresnick/cursor-pagination/#auto-id-links)) //if this query is too expensive for big tables, it can be removed $agg1 = new Aggregation($primaryFilter, Aggregation::MAX, $factory); $agg2 = new Aggregation($primaryFilter, Aggregation::MIN, $factory); $agg3 = new Aggregation($primaryFilter, Aggregation::COUNT, $factory); - $aggregation_results = $factory->multicolAggregationFilter($finalFs, [$agg1, $agg2, $agg3]); + $aggregations = [$agg1, $agg2, $agg3]; + if ($primaryKeyIsNotPrimaryFilter) { + $agg4 = new Aggregation($primaryKey, Aggregation::MAX, $factory); + $agg5 = new Aggregation($primaryKey, Aggregation::MIN, $factory); + array_push($aggregations, $agg4, $agg5); + } + $aggregation_results = $factory->multicolAggregationFilter($finalFs, $aggregations); + //TODO these should be calculated, based on the acls of the user. it should only show the max, for the max this user is allowed to see $max = $aggregation_results[$agg1->getName()]; $min = $aggregation_results[$agg2->getName()]; $total = $aggregation_results[$agg3->getName()]; + if ($isNegativeSort) { + [$min, $max] = [$max, $min]; + } + + if ($primaryKeyIsNotPrimaryFilter) { + $secondary_max = $aggregation_results[$agg4->getName()]; //This is the max primary key, when the primary key is not the main filter + $secondary_min = $aggregation_results[$agg5->getName()]; + if ($isNegativeSort) { + [$secondary_min, $secondary_max] = [$secondary_max, $secondary_min]; + } + } //pagination filters need to be added after max has been calculated $finalFs[Factory::LIMIT] = new LimitFilter($pageSize); if (isset($paginationCursor)) { - $finalFs[Factory::FILTER][] = new QueryFilter($primaryFilter, $paginationCursor, $operator, $factory); + $decoded_cursor = $apiClass->decode_cursor($paginationCursor); + $primary_cursor = $decoded_cursor["primary"]; + $secondary_cursor = $decoded_cursor["secondary"]; + if ($secondary_cursor) { + $finalFs[Factory::FILTER][] = new PaginationFilter(key($primary_cursor), current($primary_cursor), + $operator, key($secondary_cursor), current($secondary_cursor)); + } else { + $finalFs[Factory::FILTER][] = new QueryFilter(key($primary_cursor), current($primary_cursor), $operator, $factory); + } } /* Request objects */ @@ -648,7 +741,10 @@ public static function getManyResources(object $apiClass, Request $request, Resp $lastParams = $request->getQueryParams(); unset($lastParams['page']['after']); $lastParams['page']['size'] = $pageSize; - $lastParams['page']['before'] = urlencode(self::calculate_next_cursor($max)); + //Todo build last cursor + // $next_cursor = $apiClass::build_cursor($primaryFilter, $nextId, $primaryKeyIsNotPrimaryFilter, $primaryKey, $nextPrimaryKey); + // $nextParams['page']['after'] = $next_cursor; + // $lastParams['page']['before'] = $apiClass::encode_cursor(self::calculate_next_cursor($max)); $linksLast = $baseUrl . $request->getUri()->getPath() . '?' . urldecode(http_build_query($lastParams)); // Build self link @@ -659,36 +755,53 @@ public static function getManyResources(object $apiClass, Request $request, Resp $linksNext = null; $linksPrev = null; - // Build next link if (!empty($objects)) { // retrieve last object in page and retrieve the attribute based on the filter - $prevId = $objects[0]->expose()[$primaryFilter]; - $nextId = end($objects)->expose()[$primaryFilter]; - - if ($nextId < $max) { //only set next page when its not the last page + $firstObject = $objects[0]->expose(); + $lastObject = end($objects)->expose(); + $prevId = $firstObject[$primaryFilter]; + $nextId = $lastObject[$primaryFilter]; + $nextPrimaryKey = $lastObject[$primaryKey]; + $previousPrimaryKey = $firstObject[$primaryKey]; + + // there is next page when either, it is filtered on an unique key and the unique key is smaller than the highest returned key + // or if there is non unique key, that is equal and there is a higher tie breaker secondary key. + // ex. (HashType.isSalted < 1) OR (HashType.isSalted = 1 and HashType.hashTypeId < 12600) + // where salted is primary and hashTypeId is secondary + //only set next page when its not the last page + if ($apiClass::compare_keys($max, $nextId, $isNegativeSort) || ($primaryKeyIsNotPrimaryFilter && $nextId == $max && $apiClass::compare_keys($secondary_max, $nextPrimaryKey, $isNegativeSort))) { $nextParams = $selfParams; - $nextParams['page']['after'] = urlencode($nextId); + // $nextParams['page']['after'] = urlencode($nextId); + $next_cursor = $apiClass::build_cursor($primaryFilter, $nextId, $primaryKeyIsNotPrimaryFilter, $primaryKey, $nextPrimaryKey); + $nextParams['page']['after'] = $next_cursor; unset($nextParams['page']['before']); $linksNext = $baseUrl . $request->getUri()->getPath() . '?' . urldecode(http_build_query($nextParams)); } // Build prev link - if ($prevId != $min) { //only set previous page when its not the first page + //only set previous page when its not the first page + error_log("previous id: ". $prevId); + error_log("previous min: ". $min); + error_log($apiClass::compare_keys($prevId, $min, $isNegativeSort)); + if ($apiClass::compare_keys($prevId, $min, $isNegativeSort) || ($primaryKeyIsNotPrimaryFilter && $prevId == $min && $apiClass::compare_keys($previousPrimaryKey, $secondary_min, $isNegativeSort))) { + error_log("check"); $prevParams = $selfParams; - $prevParams['page']['before'] = urlencode($prevId); + $previous_cursor = $apiClass::build_cursor($primaryFilter, $prevId, $primaryKeyIsNotPrimaryFilter, $primaryKey, $firstObject[$primaryKey]); + $prevParams['page']['before'] = $previous_cursor; unset($prevParams['page']['after']); $linksPrev = $baseUrl . $request->getUri()->getPath() . '?' . urldecode(http_build_query($prevParams)); } } //build first link - // $firstParams = $request->getQueryParams(); - // unset($firstParams['page']['before']); - // $firstParams['page']['size'] = $pageSize; + $firstParams = $request->getQueryParams(); + unset($firstParams['page']['before']); + $firstParams['page']['size'] = $pageSize; // $firstParams['page']['after'] = urlencode($min); - // $linksFirst = $request->getUri()->getPath() . '?' . urldecode(http_build_query($firstParams)); + unset($firstParams['page']['after']); + $linksFirst = $request->getUri()->getPath() . '?' . urldecode(http_build_query($firstParams)); $links = [ "self" => $linksSelf, - // "first" => $linksFirst, + "first" => $linksFirst, "last" => $linksLast, "next" => $linksNext, "prev" => $linksPrev, From 61798db136f171fae6c1b32bef81cb7c9c993831 Mon Sep 17 00:00:00 2001 From: Sein Coray Date: Fri, 27 Jun 2025 16:53:25 +0200 Subject: [PATCH 107/691] added helper getAgentBinaryHelperAPI to download agent zips (#1418) --- src/api/v2/index.php | 1 + .../apiv2/common/AbstractHelperAPI.class.php | 119 ++++++++++++++++++ .../apiv2/helper/getAgentBinary.routes.php | 109 ++++++++++++++++ src/inc/apiv2/helper/getFile.routes.php | 109 +--------------- 4 files changed, 230 insertions(+), 108 deletions(-) create mode 100644 src/inc/apiv2/helper/getAgentBinary.routes.php diff --git a/src/api/v2/index.php b/src/api/v2/index.php index 03ba4f0cd..f5948a0d3 100644 --- a/src/api/v2/index.php +++ b/src/api/v2/index.php @@ -304,6 +304,7 @@ public static function addCORSheaders(Request $request, $response) { require __DIR__ . "/../../inc/apiv2/helper/exportLeftHashes.routes.php"; require __DIR__ . "/../../inc/apiv2/helper/exportWordlist.routes.php"; require __DIR__ . "/../../inc/apiv2/helper/getAccessGroups.routes.php"; +require __DIR__ . "/../../inc/apiv2/helper/getAgentBinary.routes.php"; require __DIR__ . "/../../inc/apiv2/helper/getFile.routes.php"; require __DIR__ . "/../../inc/apiv2/helper/getUserPermission.routes.php"; require __DIR__ . "/../../inc/apiv2/helper/importCrackedHashes.routes.php"; diff --git a/src/inc/apiv2/common/AbstractHelperAPI.class.php b/src/inc/apiv2/common/AbstractHelperAPI.class.php index c8a77c347..2ea5d8692 100644 --- a/src/inc/apiv2/common/AbstractHelperAPI.class.php +++ b/src/inc/apiv2/common/AbstractHelperAPI.class.php @@ -3,8 +3,10 @@ use Psr\Container\ContainerExceptionInterface; use Psr\Container\NotFoundExceptionInterface; +use Psr\Http\Message\MessageInterface; use Psr\Http\Message\ResponseInterface as Response; use Psr\Http\Message\ServerRequestInterface as Request; +use Slim\Exception\HttpForbiddenException; abstract class AbstractHelperAPI extends AbstractBaseAPI { abstract public function actionPost(array $data): object|array|null; @@ -97,4 +99,121 @@ static public function register($app): void { $app->delete($baseUri, $me . ':actionDelete')->setName($me . ':actionDelete'); } } + + /** + * Handles HTTP range requests for partial content delivery + * + * This method processes the `Range` header from the HTTP request + * to determine the start and end byte positions for the response, + * ensuring the range is valid and updates the file pointer accordingly. + * + * @param int &$start A reference to the starting byte of the range. This value will be updated. + * @param int &$end A reference to the ending byte of the range. This value will be updated. + * @param int &$size The total size of the content in bytes. + * @param resource &$fp A file pointer resource to seek to the correct position for the range. + * @return bool Returns `true` if the range request is valid and successfully processed, or `false` otherwise. + * + * @throws InvalidArgumentException If the `Range` header is malformed. + * + * @note This function assumes the presence of the `HTTP_RANGE` header in the `$_SERVER` superglobal. + */ + protected function handleRangeRequest(int &$start, int &$end, int &$size, &$fp): bool { + $c_start = $start; + $c_end = $end; + + list(, $range) = explode('=', $_SERVER['HTTP_RANGE'], 2); + + if (str_contains($range, ',')) { + return false; + } + if ($range == '-') { + $c_start = $size - substr($range, 1); + } + else { + $range = explode('-', $range); + $c_start = $range[0]; + if ((isset($range[1]) && is_numeric($range[1]))) { + $c_end = $range[1]; + } + else { + $c_end = $size; + } + } + if ($c_end > $end) { + $c_end = $end; + } + if ($c_start > $c_end || $c_start > $size - 1 || $c_end >= $size) { + return false; + } + $start = $c_start; + $end = $c_end; + fseek($fp, $start); + return true; + } + + /** + * @param Request $request + * @param Response $response + * @param string $filename + * @return Response + * @throws HttpForbiddenException + */ + protected function startDownload(Request $request, Response $response, string $filename): Response { + $size = Util::filesize($filename); + $lastModified = filemtime($filename); + + $etag = md5($lastModified . $size); + $ifNoneMatch = $request->getHeaderLine('If-None-Match'); + if ($ifNoneMatch === $etag) { + return $response->withStatus(304); + } + + $exp = explode(".", $filename); + if ($exp[sizeof($exp) - 1] == '7z') { + $contentType = "application/x-7z-compressed"; + } + else { + $contentType = "application/force-download"; + } + $fp = @fopen($filename, "rb"); + + if (!$fp) { + throw new HttpForbiddenException($request, "Can't open the file"); + } + + $start = 0; // Start byte + $end = $size - 1; // End byte + + $status = 200; + if (isset($_SERVER['HTTP_RANGE'])) { + if (!$this->handleRangeRequest($start, $end, $size, $fp)) { + fclose($fp); + return $response->withStatus(416) + ->withHeader("Content-Range", "bytes $start-$end/$size"); + } + else { + $status = 206; + } + } + + $length = $end - $start + 1; //content-length + $buffer = 1024 * 100; + $stream = $response->getBody(); + while (!feof($fp) && ($p = ftell($fp)) <= $end) { + if ($p + $buffer > $end) { + $buffer = $end - $p + 1; + } + $stream->write(fread($fp, $buffer)); + } + fclose($fp); + + return $response->withStatus($status) + ->withHeader("Content-Type", $contentType) + ->withHeader("Content-Description", $filename) + ->withHeader("Content-Disposition", "attachment; filename=\"" . $filename . "\"") + ->withHeader("Accept-Ranges", "Byte") + ->withHeader("Content-Range", "bytes $start-$end/$size") + ->withHeader("Content-Length", $length) + ->withHeader("ETag", $etag); + } } diff --git a/src/inc/apiv2/helper/getAgentBinary.routes.php b/src/inc/apiv2/helper/getAgentBinary.routes.php new file mode 100644 index 000000000..585d0e475 --- /dev/null +++ b/src/inc/apiv2/helper/getAgentBinary.routes.php @@ -0,0 +1,109 @@ +get($agentBinaryId); + if ($agentBinary == null) { + throw new HttpNotFoundException($request, "No agent binary with id: " . $agentBinaryId); + } + $filename = dirname(__FILE__) . "/../../../bin/" . $agentBinary->getFilename(); + if (!file_exists($filename)) { + throw new HTException("Agent Binary not present on server!"); + } + if (!is_readable($filename)) { + throw new HttpForbiddenException($request, "Not allowed to read file"); + } + + return $filename; + } + + /** + * Description of get params for swagger. + */ + public function getParamsSwagger(): array { + return [ + [ + "in" => "query", + "name" => "agent", + "schema" => [ + "type" => "integer", + "format" => "int32" + ], + "required" => true, + "example" => 1, + "description" => "The ID of the agent zip to download." + ] + ]; + } + + /** + * Endpoint to download files + * @param Request $request + * @param Response $response + * @return Response + * @throws HTException + * @throws HttpErrorException + * @throws HttpForbidden + */ + public function handleGet(Request $request, Response $response): Response { + $this->preCommon($request); + $agentParam = $request->getQueryParams()['agent']; + if ($agentParam == null) { + throw new HttpErrorException("No AgentBinary query param has been provided"); + } + $agentBinaryId = intval($agentParam); + $filename = $this->validateAgent($request, $agentBinaryId); + + return $this->startDownload($request, $response, $filename); + } + + static public function register($app): void { + $baseUri = GetAgentBinaryHelperAPI::getBaseUri(); + + /* Allow CORS preflight requests */ + $app->options($baseUri, function (Request $request, Response $response): Response { + return $response; + }); + $app->get($baseUri, "getAgentBinaryHelperAPI:handleGet"); + } +} + +GetAgentBinaryHelperAPI::register($app); \ No newline at end of file diff --git a/src/inc/apiv2/helper/getFile.routes.php b/src/inc/apiv2/helper/getFile.routes.php index 21b8a7fdf..e2d152af5 100644 --- a/src/inc/apiv2/helper/getFile.routes.php +++ b/src/inc/apiv2/helper/getFile.routes.php @@ -59,58 +59,6 @@ public function validateFile($request, $file_id): string { return $filename; } - /** - * Handles HTTP range requests for partial content delivery - * - * This method processes the `Range` header from the HTTP request - * to determine the start and end byte positions for the response, - * ensuring the range is valid and updates the file pointer accordingly. - * - * @param int &$start A reference to the starting byte of the range. This value will be updated. - * @param int &$end A reference to the ending byte of the range. This value will be updated. - * @param int &$size The total size of the content in bytes. - * @param resource &$fp A file pointer resource to seek to the correct position for the range. - * @return bool Returns `true` if the range request is valid and successfully processed, or `false` otherwise. - * - * @throws InvalidArgumentException If the `Range` header is malformed. - * - * @note This function assumes the presence of the `HTTP_RANGE` header in the `$_SERVER` superglobal. - */ - protected function handleRangeRequest(int &$start, int &$end, int &$size, &$fp): bool { - - $c_start = $start; - $c_end = $end; - - list(, $range) = explode('=', $_SERVER['HTTP_RANGE'], 2); - - if (str_contains($range, ',')) { - return false; - } - if ($range == '-') { - $c_start = $size - substr($range, 1); - } - else { - $range = explode('-', $range); - $c_start = $range[0]; - if ((isset($range[1]) && is_numeric($range[1]))) { - $c_end = $range[1]; - } - else { - $c_end = $size; - } - } - if ($c_end > $end) { - $c_end = $end; - } - if ($c_start > $c_end || $c_start > $size - 1 || $c_end >= $size) { - return false; - } - $start = $c_start; - $end = $c_end; - fseek($fp, $start); - return true; - } - /** * Description of get params for swagger. */ @@ -149,62 +97,7 @@ public function handleGet(Request $request, Response $response): Response { $filename = $this->validateFile($request, $file_id); - $size = Util::filesize($filename); - $lastModified = filemtime($filename); - - $etag = md5($lastModified . $size); - $ifNoneMatch = $request->getHeaderLine('If-None-Match'); - if ($ifNoneMatch === $etag) { - return $response->withStatus(304); - } - - $exp = explode(".", $filename); - if ($exp[sizeof($exp) - 1] == '7z') { - $contentType = "application/x-7z-compressed"; - } - else { - $contentType = "application/force-download"; - } - $fp = @fopen($filename, "rb"); - - if (!$fp) { - throw new HttpForbiddenException($request, "Can't open the file"); - } - - $start = 0; // Start byte - $end = $size - 1; // End byte - - $status = 200; - if (isset($_SERVER['HTTP_RANGE'])) { - if (!$this->handleRangeRequest($start, $end, $size, $fp)) { - fclose($fp); - return $response->withStatus(416) - ->withHeader("Content-Range", "bytes $start-$end/$size"); - } - else { - $status = 206; - } - } - - $length = $end - $start + 1; //content-length - $buffer = 1024 * 100; - $stream = $response->getBody(); - while (!feof($fp) && ($p = ftell($fp)) <= $end) { - if ($p + $buffer > $end) { - $buffer = $end - $p + 1; - } - $stream->write(fread($fp, $buffer)); - } - fclose($fp); - - return $response->withStatus($status) - ->withHeader("Content-Type", $contentType) - ->withHeader("Content-Description", $filename) - ->withHeader("Content-Disposition", "attachment; filename=\"" . $filename . "\"") - ->withHeader("Accept-Ranges", "Byte") - ->withHeader("Content-Range", "bytes $start-$end/$size") - ->withHeader("Content-Length", $length) - ->withHeader("ETag", $etag); + return $this->startDownload($request, $response, $filename); } static public function register($app): void { From a18e0a405b3a40a3be9e9ba17a98b418ca716d6b Mon Sep 17 00:00:00 2001 From: Sein Coray Date: Fri, 27 Jun 2025 17:31:24 +0200 Subject: [PATCH 108/691] DBA generator update (#1417) * first iteration of update * fixed typing to allow null in most of the cases for the value * try fixing weird test fail * set test config properly * trying test typing fix with matching type * update check for boolean values in config * try explicitly setting values of 0 and 1 * try explicitly setting values of 0 and 1 * small cosmetic fix to do proper checking of provided id --- ci/tests/integration/RuleSplitTest.class.php | 2 +- src/dba/AbstractModel.class.php | 2 +- src/dba/models/AbstractModel.template.txt | 14 +- .../models/AbstractModelFactory.template.txt | 24 ++- src/dba/models/AccessGroup.class.php | 24 +-- src/dba/models/AccessGroupAgent.class.php | 30 ++-- .../models/AccessGroupAgentFactory.class.php | 24 ++- src/dba/models/AccessGroupFactory.class.php | 24 ++- src/dba/models/AccessGroupUser.class.php | 30 ++-- .../models/AccessGroupUserFactory.class.php | 24 ++- src/dba/models/Agent.class.php | 110 ++++++------ src/dba/models/AgentBinary.class.php | 56 +++---- src/dba/models/AgentBinaryFactory.class.php | 24 ++- src/dba/models/AgentError.class.php | 50 +++--- src/dba/models/AgentErrorFactory.class.php | 24 ++- src/dba/models/AgentFactory.class.php | 24 ++- src/dba/models/AgentStat.class.php | 42 ++--- src/dba/models/AgentStatFactory.class.php | 24 ++- src/dba/models/AgentZap.class.php | 30 ++-- src/dba/models/AgentZapFactory.class.php | 24 ++- src/dba/models/ApiGroup.class.php | 30 ++-- src/dba/models/ApiGroupFactory.class.php | 24 ++- src/dba/models/ApiKey.class.php | 56 +++---- src/dba/models/ApiKeyFactory.class.php | 24 ++- src/dba/models/Assignment.class.php | 36 ++-- src/dba/models/AssignmentFactory.class.php | 24 ++- src/dba/models/Chunk.class.php | 86 +++++----- src/dba/models/ChunkFactory.class.php | 24 ++- src/dba/models/Config.class.php | 36 ++-- src/dba/models/ConfigFactory.class.php | 24 ++- src/dba/models/ConfigSection.class.php | 24 +-- src/dba/models/ConfigSectionFactory.class.php | 24 ++- src/dba/models/CrackerBinary.class.php | 42 ++--- src/dba/models/CrackerBinaryFactory.class.php | 24 ++- src/dba/models/CrackerBinaryType.class.php | 30 ++-- .../models/CrackerBinaryTypeFactory.class.php | 24 ++- src/dba/models/File.class.php | 56 +++---- src/dba/models/FileDelete.class.php | 30 ++-- src/dba/models/FileDeleteFactory.class.php | 24 ++- src/dba/models/FileDownload.class.php | 36 ++-- src/dba/models/FileDownloadFactory.class.php | 24 ++- src/dba/models/FileFactory.class.php | 24 ++- src/dba/models/FilePretask.class.php | 30 ++-- src/dba/models/FilePretaskFactory.class.php | 24 ++- src/dba/models/FileTask.class.php | 30 ++-- src/dba/models/FileTaskFactory.class.php | 24 ++- src/dba/models/Hash.class.php | 68 ++++---- src/dba/models/HashBinary.class.php | 68 ++++---- src/dba/models/HashBinaryFactory.class.php | 24 ++- src/dba/models/HashFactory.class.php | 24 ++- src/dba/models/HashType.class.php | 36 ++-- src/dba/models/HashTypeFactory.class.php | 24 ++- src/dba/models/Hashlist.class.php | 104 ++++++------ src/dba/models/HashlistFactory.class.php | 24 ++- src/dba/models/HashlistHashlist.class.php | 30 ++-- .../models/HashlistHashlistFactory.class.php | 24 ++- src/dba/models/HealthCheck.class.php | 62 +++---- src/dba/models/HealthCheckAgent.class.php | 68 ++++---- .../models/HealthCheckAgentFactory.class.php | 24 ++- src/dba/models/HealthCheckFactory.class.php | 24 ++- src/dba/models/LogEntry.class.php | 50 +++--- src/dba/models/LogEntryFactory.class.php | 24 ++- src/dba/models/NotificationSetting.class.php | 56 +++---- .../NotificationSettingFactory.class.php | 24 ++- src/dba/models/Preprocessor.class.php | 56 +++---- src/dba/models/PreprocessorFactory.class.php | 24 ++- src/dba/models/Pretask.class.php | 92 +++++----- src/dba/models/PretaskFactory.class.php | 24 ++- src/dba/models/RegVoucher.class.php | 30 ++-- src/dba/models/RegVoucherFactory.class.php | 24 ++- src/dba/models/RightGroup.class.php | 30 ++-- src/dba/models/RightGroupFactory.class.php | 24 ++- src/dba/models/Session.class.php | 56 +++---- src/dba/models/SessionFactory.class.php | 24 ++- src/dba/models/Speed.class.php | 42 ++--- src/dba/models/SpeedFactory.class.php | 24 ++- src/dba/models/StoredValue.class.php | 24 +-- src/dba/models/StoredValueFactory.class.php | 24 ++- src/dba/models/Supertask.class.php | 24 +-- src/dba/models/SupertaskFactory.class.php | 24 ++- src/dba/models/SupertaskPretask.class.php | 30 ++-- .../models/SupertaskPretaskFactory.class.php | 24 ++- src/dba/models/Task.class.php | 158 +++++++++--------- src/dba/models/TaskDebugOutput.class.php | 30 ++-- .../models/TaskDebugOutputFactory.class.php | 24 ++- src/dba/models/TaskFactory.class.php | 24 ++- src/dba/models/TaskWrapper.class.php | 68 ++++---- src/dba/models/TaskWrapperFactory.class.php | 24 ++- src/dba/models/User.class.php | 110 ++++++------ src/dba/models/UserFactory.class.php | 24 ++- src/dba/models/Zap.class.php | 42 ++--- src/dba/models/ZapFactory.class.php | 24 ++- src/dba/models/generator.php | 92 ++++++---- .../apiv2/common/AbstractModelAPI.class.php | 20 ++- src/inc/user-api/UserAPIConfig.class.php | 9 +- 95 files changed, 1690 insertions(+), 1757 deletions(-) diff --git a/ci/tests/integration/RuleSplitTest.class.php b/ci/tests/integration/RuleSplitTest.class.php index fe5651230..170733ada 100644 --- a/ci/tests/integration/RuleSplitTest.class.php +++ b/ci/tests/integration/RuleSplitTest.class.php @@ -107,7 +107,7 @@ private function testRuleSplit() { if (!is_array($response)) { $this->testFailed("RuleSplitTest:testRuleSplit()", sprintf("Expected benchmark to return OK.")); } else { - if (!$this->getTask('task-1 (From Rule Split)') === false) { + if ($this->getTask('task-1 (From Rule Split)')) { $this->testSuccess("RuleSplitTest:testRuleSplit()"); } else { $this->testFailed("RuleSplitTest:testRuleSplit()", sprintf("Couldn't find the created supertask")); diff --git a/src/dba/AbstractModel.class.php b/src/dba/AbstractModel.class.php index 64b99162b..3563f2dcd 100755 --- a/src/dba/AbstractModel.class.php +++ b/src/dba/AbstractModel.class.php @@ -24,7 +24,7 @@ abstract function getPrimaryKeyValue(); * @param $id string * @return */ - abstract function setId($id); + abstract function setId($id): void; /** * this function returns the models id diff --git a/src/dba/models/AbstractModel.template.txt b/src/dba/models/AbstractModel.template.txt index 36425e5f6..166f82bd9 100644 --- a/src/dba/models/AbstractModel.template.txt +++ b/src/dba/models/AbstractModel.template.txt @@ -9,33 +9,33 @@ class __MODEL_NAME__ extends AbstractModel { __MODEL_PARAMS_INIT__ } - function getKeyValueDict() { + function getKeyValueDict(): array { $dict = array(); __MODEL_KEY_VAL__ return $dict; } - static function getFeatures() { + static function getFeatures(): array { $dict = array(); __MODEL_FEATURES__ return $dict; } - function getPrimaryKey() { + function getPrimaryKey(): string { return "__MODEL_PK__"; } - function getPrimaryKeyValue() { + function getPrimaryKeyValue(): ?__MODEL_PK_TYPE__ { return $this->__MODEL_PK__; } - function getId() { + function getId(): ?__MODEL_PK_TYPE__ { return $this->__MODEL_PK__; } - function setId($id) { + function setId($id): void { $this->__MODEL_PK__ = $id; } @@ -43,7 +43,7 @@ class __MODEL_NAME__ extends AbstractModel { * Used to serialize the data contained in the model * @return array */ - public function expose() { + public function expose(): array { return get_object_vars($this); } diff --git a/src/dba/models/AbstractModelFactory.template.txt b/src/dba/models/AbstractModelFactory.template.txt index 86169b5b5..c1b027d3c 100644 --- a/src/dba/models/AbstractModelFactory.template.txt +++ b/src/dba/models/AbstractModelFactory.template.txt @@ -3,28 +3,27 @@ namespace DBA; class __MODEL_NAME__Factory extends AbstractModelFactory { - function getModelName() { + function getModelName(): string { return "__MODEL_NAME__"; } - function getModelTable() { + function getModelTable(): string { return "__MODEL_NAME__"; } - function isCachable() { + function isCachable(): bool { return false; } - function getCacheValidTime() { + function getCacheValidTime(): int { return -1; } /** * @return __MODEL_NAME__ */ - function getNullObject() { - $o = new __MODEL_NAME__(__MODEL_DICT__); - return $o; + function getNullObject(): __MODEL_NAME__ { + return new __MODEL_NAME__(__MODEL_DICT__); } /** @@ -32,9 +31,8 @@ class __MODEL_NAME__Factory extends AbstractModelFactory { * @param array $dict * @return __MODEL_NAME__ */ - function createObjectFromDict($pk, $dict) { - $o = new __MODEL_NAME__(__MODEL__DICT2__); - return $o; + function createObjectFromDict($pk, $dict): __MODEL_NAME__ { + return new __MODEL_NAME__(__MODEL__DICT2__); } /** @@ -66,9 +64,9 @@ class __MODEL_NAME__Factory extends AbstractModelFactory { /** * @param string $pk - * @return __MODEL_NAME__ + * @return ?__MODEL_NAME__ */ - function get($pk) { + function get($pk): ?__MODEL_NAME__ { return Util::cast(parent::get($pk), __MODEL_NAME__::class); } @@ -76,7 +74,7 @@ class __MODEL_NAME__Factory extends AbstractModelFactory { * @param __MODEL_NAME__ $model * @return __MODEL_NAME__ */ - function save($model) { + function save($model): __MODEL_NAME__ { return Util::cast(parent::save($model), __MODEL_NAME__::class); } } \ No newline at end of file diff --git a/src/dba/models/AccessGroup.class.php b/src/dba/models/AccessGroup.class.php index 1fa73a754..0af23e071 100644 --- a/src/dba/models/AccessGroup.class.php +++ b/src/dba/models/AccessGroup.class.php @@ -3,15 +3,15 @@ namespace DBA; class AccessGroup extends AbstractModel { - private $accessGroupId; - private $groupName; + private ?int $accessGroupId; + private ?string $groupName; - function __construct($accessGroupId, $groupName) { + function __construct(?int $accessGroupId, ?string $groupName) { $this->accessGroupId = $accessGroupId; $this->groupName = $groupName; } - function getKeyValueDict() { + function getKeyValueDict(): array { $dict = array(); $dict['accessGroupId'] = $this->accessGroupId; $dict['groupName'] = $this->groupName; @@ -19,7 +19,7 @@ function getKeyValueDict() { return $dict; } - static function getFeatures() { + static function getFeatures(): array { $dict = array(); $dict['accessGroupId'] = ['read_only' => True, "type" => "int", "subtype" => "unset", "choices" => "unset", "null" => False, "pk" => True, "protected" => True, "private" => False, "alias" => "accessGroupId", "public" => False]; $dict['groupName'] = ['read_only' => False, "type" => "str(50)", "subtype" => "unset", "choices" => "unset", "null" => False, "pk" => False, "protected" => False, "private" => False, "alias" => "groupName", "public" => False]; @@ -27,19 +27,19 @@ static function getFeatures() { return $dict; } - function getPrimaryKey() { + function getPrimaryKey(): string { return "accessGroupId"; } - function getPrimaryKeyValue() { + function getPrimaryKeyValue(): ?int { return $this->accessGroupId; } - function getId() { + function getId(): ?int { return $this->accessGroupId; } - function setId($id) { + function setId($id): void { $this->accessGroupId = $id; } @@ -47,15 +47,15 @@ function setId($id) { * Used to serialize the data contained in the model * @return array */ - public function expose() { + public function expose(): array { return get_object_vars($this); } - function getGroupName() { + function getGroupName(): ?string { return $this->groupName; } - function setGroupName($groupName) { + function setGroupName(?string $groupName): void { $this->groupName = $groupName; } diff --git a/src/dba/models/AccessGroupAgent.class.php b/src/dba/models/AccessGroupAgent.class.php index 858f32ea0..321486960 100644 --- a/src/dba/models/AccessGroupAgent.class.php +++ b/src/dba/models/AccessGroupAgent.class.php @@ -3,17 +3,17 @@ namespace DBA; class AccessGroupAgent extends AbstractModel { - private $accessGroupAgentId; - private $accessGroupId; - private $agentId; + private ?int $accessGroupAgentId; + private ?int $accessGroupId; + private ?int $agentId; - function __construct($accessGroupAgentId, $accessGroupId, $agentId) { + function __construct(?int $accessGroupAgentId, ?int $accessGroupId, ?int $agentId) { $this->accessGroupAgentId = $accessGroupAgentId; $this->accessGroupId = $accessGroupId; $this->agentId = $agentId; } - function getKeyValueDict() { + function getKeyValueDict(): array { $dict = array(); $dict['accessGroupAgentId'] = $this->accessGroupAgentId; $dict['accessGroupId'] = $this->accessGroupId; @@ -22,7 +22,7 @@ function getKeyValueDict() { return $dict; } - static function getFeatures() { + static function getFeatures(): array { $dict = array(); $dict['accessGroupAgentId'] = ['read_only' => True, "type" => "int", "subtype" => "unset", "choices" => "unset", "null" => False, "pk" => True, "protected" => True, "private" => False, "alias" => "accessGroupAgentId", "public" => False]; $dict['accessGroupId'] = ['read_only' => True, "type" => "int", "subtype" => "unset", "choices" => "unset", "null" => False, "pk" => False, "protected" => False, "private" => False, "alias" => "accessGroupId", "public" => False]; @@ -31,19 +31,19 @@ static function getFeatures() { return $dict; } - function getPrimaryKey() { + function getPrimaryKey(): string { return "accessGroupAgentId"; } - function getPrimaryKeyValue() { + function getPrimaryKeyValue(): ?int { return $this->accessGroupAgentId; } - function getId() { + function getId(): ?int { return $this->accessGroupAgentId; } - function setId($id) { + function setId($id): void { $this->accessGroupAgentId = $id; } @@ -51,23 +51,23 @@ function setId($id) { * Used to serialize the data contained in the model * @return array */ - public function expose() { + public function expose(): array { return get_object_vars($this); } - function getAccessGroupId() { + function getAccessGroupId(): ?int { return $this->accessGroupId; } - function setAccessGroupId($accessGroupId) { + function setAccessGroupId(?int $accessGroupId): void { $this->accessGroupId = $accessGroupId; } - function getAgentId() { + function getAgentId(): ?int { return $this->agentId; } - function setAgentId($agentId) { + function setAgentId(?int $agentId): void { $this->agentId = $agentId; } diff --git a/src/dba/models/AccessGroupAgentFactory.class.php b/src/dba/models/AccessGroupAgentFactory.class.php index 5798acbaa..50db0ee05 100644 --- a/src/dba/models/AccessGroupAgentFactory.class.php +++ b/src/dba/models/AccessGroupAgentFactory.class.php @@ -3,28 +3,27 @@ namespace DBA; class AccessGroupAgentFactory extends AbstractModelFactory { - function getModelName() { + function getModelName(): string { return "AccessGroupAgent"; } - function getModelTable() { + function getModelTable(): string { return "AccessGroupAgent"; } - function isCachable() { + function isCachable(): bool { return false; } - function getCacheValidTime() { + function getCacheValidTime(): int { return -1; } /** * @return AccessGroupAgent */ - function getNullObject() { - $o = new AccessGroupAgent(-1, null, null); - return $o; + function getNullObject(): AccessGroupAgent { + return new AccessGroupAgent(-1, null, null); } /** @@ -32,9 +31,8 @@ function getNullObject() { * @param array $dict * @return AccessGroupAgent */ - function createObjectFromDict($pk, $dict) { - $o = new AccessGroupAgent($dict['accessGroupAgentId'], $dict['accessGroupId'], $dict['agentId']); - return $o; + function createObjectFromDict($pk, $dict): AccessGroupAgent { + return new AccessGroupAgent($dict['accessGroupAgentId'], $dict['accessGroupId'], $dict['agentId']); } /** @@ -66,9 +64,9 @@ function filter($options, $single = false) { /** * @param string $pk - * @return AccessGroupAgent + * @return ?AccessGroupAgent */ - function get($pk) { + function get($pk): ?AccessGroupAgent { return Util::cast(parent::get($pk), AccessGroupAgent::class); } @@ -76,7 +74,7 @@ function get($pk) { * @param AccessGroupAgent $model * @return AccessGroupAgent */ - function save($model) { + function save($model): AccessGroupAgent { return Util::cast(parent::save($model), AccessGroupAgent::class); } } \ No newline at end of file diff --git a/src/dba/models/AccessGroupFactory.class.php b/src/dba/models/AccessGroupFactory.class.php index d62586198..b10cd4a6e 100644 --- a/src/dba/models/AccessGroupFactory.class.php +++ b/src/dba/models/AccessGroupFactory.class.php @@ -3,28 +3,27 @@ namespace DBA; class AccessGroupFactory extends AbstractModelFactory { - function getModelName() { + function getModelName(): string { return "AccessGroup"; } - function getModelTable() { + function getModelTable(): string { return "AccessGroup"; } - function isCachable() { + function isCachable(): bool { return false; } - function getCacheValidTime() { + function getCacheValidTime(): int { return -1; } /** * @return AccessGroup */ - function getNullObject() { - $o = new AccessGroup(-1, null); - return $o; + function getNullObject(): AccessGroup { + return new AccessGroup(-1, null); } /** @@ -32,9 +31,8 @@ function getNullObject() { * @param array $dict * @return AccessGroup */ - function createObjectFromDict($pk, $dict) { - $o = new AccessGroup($dict['accessGroupId'], $dict['groupName']); - return $o; + function createObjectFromDict($pk, $dict): AccessGroup { + return new AccessGroup($dict['accessGroupId'], $dict['groupName']); } /** @@ -66,9 +64,9 @@ function filter($options, $single = false) { /** * @param string $pk - * @return AccessGroup + * @return ?AccessGroup */ - function get($pk) { + function get($pk): ?AccessGroup { return Util::cast(parent::get($pk), AccessGroup::class); } @@ -76,7 +74,7 @@ function get($pk) { * @param AccessGroup $model * @return AccessGroup */ - function save($model) { + function save($model): AccessGroup { return Util::cast(parent::save($model), AccessGroup::class); } } \ No newline at end of file diff --git a/src/dba/models/AccessGroupUser.class.php b/src/dba/models/AccessGroupUser.class.php index 47e846466..2bc945a2c 100644 --- a/src/dba/models/AccessGroupUser.class.php +++ b/src/dba/models/AccessGroupUser.class.php @@ -3,17 +3,17 @@ namespace DBA; class AccessGroupUser extends AbstractModel { - private $accessGroupUserId; - private $accessGroupId; - private $userId; + private ?int $accessGroupUserId; + private ?int $accessGroupId; + private ?int $userId; - function __construct($accessGroupUserId, $accessGroupId, $userId) { + function __construct(?int $accessGroupUserId, ?int $accessGroupId, ?int $userId) { $this->accessGroupUserId = $accessGroupUserId; $this->accessGroupId = $accessGroupId; $this->userId = $userId; } - function getKeyValueDict() { + function getKeyValueDict(): array { $dict = array(); $dict['accessGroupUserId'] = $this->accessGroupUserId; $dict['accessGroupId'] = $this->accessGroupId; @@ -22,7 +22,7 @@ function getKeyValueDict() { return $dict; } - static function getFeatures() { + static function getFeatures(): array { $dict = array(); $dict['accessGroupUserId'] = ['read_only' => True, "type" => "int", "subtype" => "unset", "choices" => "unset", "null" => False, "pk" => True, "protected" => True, "private" => False, "alias" => "accessGroupUserId", "public" => False]; $dict['accessGroupId'] = ['read_only' => True, "type" => "int", "subtype" => "unset", "choices" => "unset", "null" => False, "pk" => False, "protected" => False, "private" => False, "alias" => "accessGroupId", "public" => False]; @@ -31,19 +31,19 @@ static function getFeatures() { return $dict; } - function getPrimaryKey() { + function getPrimaryKey(): string { return "accessGroupUserId"; } - function getPrimaryKeyValue() { + function getPrimaryKeyValue(): ?int { return $this->accessGroupUserId; } - function getId() { + function getId(): ?int { return $this->accessGroupUserId; } - function setId($id) { + function setId($id): void { $this->accessGroupUserId = $id; } @@ -51,23 +51,23 @@ function setId($id) { * Used to serialize the data contained in the model * @return array */ - public function expose() { + public function expose(): array { return get_object_vars($this); } - function getAccessGroupId() { + function getAccessGroupId(): ?int { return $this->accessGroupId; } - function setAccessGroupId($accessGroupId) { + function setAccessGroupId(?int $accessGroupId): void { $this->accessGroupId = $accessGroupId; } - function getUserId() { + function getUserId(): ?int { return $this->userId; } - function setUserId($userId) { + function setUserId(?int $userId): void { $this->userId = $userId; } diff --git a/src/dba/models/AccessGroupUserFactory.class.php b/src/dba/models/AccessGroupUserFactory.class.php index b430c34e9..3892a02be 100644 --- a/src/dba/models/AccessGroupUserFactory.class.php +++ b/src/dba/models/AccessGroupUserFactory.class.php @@ -3,28 +3,27 @@ namespace DBA; class AccessGroupUserFactory extends AbstractModelFactory { - function getModelName() { + function getModelName(): string { return "AccessGroupUser"; } - function getModelTable() { + function getModelTable(): string { return "AccessGroupUser"; } - function isCachable() { + function isCachable(): bool { return false; } - function getCacheValidTime() { + function getCacheValidTime(): int { return -1; } /** * @return AccessGroupUser */ - function getNullObject() { - $o = new AccessGroupUser(-1, null, null); - return $o; + function getNullObject(): AccessGroupUser { + return new AccessGroupUser(-1, null, null); } /** @@ -32,9 +31,8 @@ function getNullObject() { * @param array $dict * @return AccessGroupUser */ - function createObjectFromDict($pk, $dict) { - $o = new AccessGroupUser($dict['accessGroupUserId'], $dict['accessGroupId'], $dict['userId']); - return $o; + function createObjectFromDict($pk, $dict): AccessGroupUser { + return new AccessGroupUser($dict['accessGroupUserId'], $dict['accessGroupId'], $dict['userId']); } /** @@ -66,9 +64,9 @@ function filter($options, $single = false) { /** * @param string $pk - * @return AccessGroupUser + * @return ?AccessGroupUser */ - function get($pk) { + function get($pk): ?AccessGroupUser { return Util::cast(parent::get($pk), AccessGroupUser::class); } @@ -76,7 +74,7 @@ function get($pk) { * @param AccessGroupUser $model * @return AccessGroupUser */ - function save($model) { + function save($model): AccessGroupUser { return Util::cast(parent::save($model), AccessGroupUser::class); } } \ No newline at end of file diff --git a/src/dba/models/Agent.class.php b/src/dba/models/Agent.class.php index 56f0eea4b..b4a98e529 100644 --- a/src/dba/models/Agent.class.php +++ b/src/dba/models/Agent.class.php @@ -3,24 +3,24 @@ namespace DBA; class Agent extends AbstractModel { - private $agentId; - private $agentName; - private $uid; - private $os; - private $devices; - private $cmdPars; - private $ignoreErrors; - private $isActive; - private $isTrusted; - private $token; - private $lastAct; - private $lastTime; - private $lastIp; - private $userId; - private $cpuOnly; - private $clientSignature; - - function __construct($agentId, $agentName, $uid, $os, $devices, $cmdPars, $ignoreErrors, $isActive, $isTrusted, $token, $lastAct, $lastTime, $lastIp, $userId, $cpuOnly, $clientSignature) { + private ?int $agentId; + private ?string $agentName; + private ?string $uid; + private ?int $os; + private ?string $devices; + private ?string $cmdPars; + private ?int $ignoreErrors; + private ?int $isActive; + private ?int $isTrusted; + private ?string $token; + private ?string $lastAct; + private ?int $lastTime; + private ?string $lastIp; + private ?int $userId; + private ?int $cpuOnly; + private ?string $clientSignature; + + function __construct(?int $agentId, ?string $agentName, ?string $uid, ?int $os, ?string $devices, ?string $cmdPars, ?int $ignoreErrors, ?int $isActive, ?int $isTrusted, ?string $token, ?string $lastAct, ?int $lastTime, ?string $lastIp, ?int $userId, ?int $cpuOnly, ?string $clientSignature) { $this->agentId = $agentId; $this->agentName = $agentName; $this->uid = $uid; @@ -39,7 +39,7 @@ function __construct($agentId, $agentName, $uid, $os, $devices, $cmdPars, $ignor $this->clientSignature = $clientSignature; } - function getKeyValueDict() { + function getKeyValueDict(): array { $dict = array(); $dict['agentId'] = $this->agentId; $dict['agentName'] = $this->agentName; @@ -61,7 +61,7 @@ function getKeyValueDict() { return $dict; } - static function getFeatures() { + static function getFeatures(): array { $dict = array(); $dict['agentId'] = ['read_only' => True, "type" => "int", "subtype" => "unset", "choices" => "unset", "null" => False, "pk" => True, "protected" => True, "private" => False, "alias" => "agentId", "public" => False]; $dict['agentName'] = ['read_only' => False, "type" => "str(100)", "subtype" => "unset", "choices" => "unset", "null" => False, "pk" => False, "protected" => False, "private" => False, "alias" => "agentName", "public" => False]; @@ -83,19 +83,19 @@ static function getFeatures() { return $dict; } - function getPrimaryKey() { + function getPrimaryKey(): string { return "agentId"; } - function getPrimaryKeyValue() { + function getPrimaryKeyValue(): ?int { return $this->agentId; } - function getId() { + function getId(): ?int { return $this->agentId; } - function setId($id) { + function setId($id): void { $this->agentId = $id; } @@ -103,127 +103,127 @@ function setId($id) { * Used to serialize the data contained in the model * @return array */ - public function expose() { + public function expose(): array { return get_object_vars($this); } - function getAgentName() { + function getAgentName(): ?string { return $this->agentName; } - function setAgentName($agentName) { + function setAgentName(?string $agentName): void { $this->agentName = $agentName; } - function getUid() { + function getUid(): ?string { return $this->uid; } - function setUid($uid) { + function setUid(?string $uid): void { $this->uid = $uid; } - function getOs() { + function getOs(): ?int { return $this->os; } - function setOs($os) { + function setOs(?int $os): void { $this->os = $os; } - function getDevices() { + function getDevices(): ?string { return $this->devices; } - function setDevices($devices) { + function setDevices(?string $devices): void { $this->devices = $devices; } - function getCmdPars() { + function getCmdPars(): ?string { return $this->cmdPars; } - function setCmdPars($cmdPars) { + function setCmdPars(?string $cmdPars): void { $this->cmdPars = $cmdPars; } - function getIgnoreErrors() { + function getIgnoreErrors(): ?int { return $this->ignoreErrors; } - function setIgnoreErrors($ignoreErrors) { + function setIgnoreErrors(?int $ignoreErrors): void { $this->ignoreErrors = $ignoreErrors; } - function getIsActive() { + function getIsActive(): ?int { return $this->isActive; } - function setIsActive($isActive) { + function setIsActive(?int $isActive): void { $this->isActive = $isActive; } - function getIsTrusted() { + function getIsTrusted(): ?int { return $this->isTrusted; } - function setIsTrusted($isTrusted) { + function setIsTrusted(?int $isTrusted): void { $this->isTrusted = $isTrusted; } - function getToken() { + function getToken(): ?string { return $this->token; } - function setToken($token) { + function setToken(?string $token): void { $this->token = $token; } - function getLastAct() { + function getLastAct(): ?string { return $this->lastAct; } - function setLastAct($lastAct) { + function setLastAct(?string $lastAct): void { $this->lastAct = $lastAct; } - function getLastTime() { + function getLastTime(): ?int { return $this->lastTime; } - function setLastTime($lastTime) { + function setLastTime(?int $lastTime): void { $this->lastTime = $lastTime; } - function getLastIp() { + function getLastIp(): ?string { return $this->lastIp; } - function setLastIp($lastIp) { + function setLastIp(?string $lastIp): void { $this->lastIp = $lastIp; } - function getUserId() { + function getUserId(): ?int { return $this->userId; } - function setUserId($userId) { + function setUserId(?int $userId): void { $this->userId = $userId; } - function getCpuOnly() { + function getCpuOnly(): ?int { return $this->cpuOnly; } - function setCpuOnly($cpuOnly) { + function setCpuOnly(?int $cpuOnly): void { $this->cpuOnly = $cpuOnly; } - function getClientSignature() { + function getClientSignature(): ?string { return $this->clientSignature; } - function setClientSignature($clientSignature) { + function setClientSignature(?string $clientSignature): void { $this->clientSignature = $clientSignature; } diff --git a/src/dba/models/AgentBinary.class.php b/src/dba/models/AgentBinary.class.php index 12709fe74..c1b33f131 100644 --- a/src/dba/models/AgentBinary.class.php +++ b/src/dba/models/AgentBinary.class.php @@ -3,15 +3,15 @@ namespace DBA; class AgentBinary extends AbstractModel { - private $agentBinaryId; - private $type; - private $version; - private $operatingSystems; - private $filename; - private $updateTrack; - private $updateAvailable; - - function __construct($agentBinaryId, $type, $version, $operatingSystems, $filename, $updateTrack, $updateAvailable) { + private ?int $agentBinaryId; + private ?string $type; + private ?string $version; + private ?string $operatingSystems; + private ?string $filename; + private ?string $updateTrack; + private ?string $updateAvailable; + + function __construct(?int $agentBinaryId, ?string $type, ?string $version, ?string $operatingSystems, ?string $filename, ?string $updateTrack, ?string $updateAvailable) { $this->agentBinaryId = $agentBinaryId; $this->type = $type; $this->version = $version; @@ -21,7 +21,7 @@ function __construct($agentBinaryId, $type, $version, $operatingSystems, $filena $this->updateAvailable = $updateAvailable; } - function getKeyValueDict() { + function getKeyValueDict(): array { $dict = array(); $dict['agentBinaryId'] = $this->agentBinaryId; $dict['type'] = $this->type; @@ -34,7 +34,7 @@ function getKeyValueDict() { return $dict; } - static function getFeatures() { + static function getFeatures(): array { $dict = array(); $dict['agentBinaryId'] = ['read_only' => True, "type" => "int", "subtype" => "unset", "choices" => "unset", "null" => False, "pk" => True, "protected" => True, "private" => False, "alias" => "agentBinaryId", "public" => False]; $dict['type'] = ['read_only' => False, "type" => "str(20)", "subtype" => "unset", "choices" => "unset", "null" => False, "pk" => False, "protected" => False, "private" => False, "alias" => "type", "public" => False]; @@ -47,19 +47,19 @@ static function getFeatures() { return $dict; } - function getPrimaryKey() { + function getPrimaryKey(): string { return "agentBinaryId"; } - function getPrimaryKeyValue() { + function getPrimaryKeyValue(): ?int { return $this->agentBinaryId; } - function getId() { + function getId(): ?int { return $this->agentBinaryId; } - function setId($id) { + function setId($id): void { $this->agentBinaryId = $id; } @@ -67,55 +67,55 @@ function setId($id) { * Used to serialize the data contained in the model * @return array */ - public function expose() { + public function expose(): array { return get_object_vars($this); } - function getType() { + function getType(): ?string { return $this->type; } - function setType($type) { + function setType(?string $type): void { $this->type = $type; } - function getVersion() { + function getVersion(): ?string { return $this->version; } - function setVersion($version) { + function setVersion(?string $version): void { $this->version = $version; } - function getOperatingSystems() { + function getOperatingSystems(): ?string { return $this->operatingSystems; } - function setOperatingSystems($operatingSystems) { + function setOperatingSystems(?string $operatingSystems): void { $this->operatingSystems = $operatingSystems; } - function getFilename() { + function getFilename(): ?string { return $this->filename; } - function setFilename($filename) { + function setFilename(?string $filename): void { $this->filename = $filename; } - function getUpdateTrack() { + function getUpdateTrack(): ?string { return $this->updateTrack; } - function setUpdateTrack($updateTrack) { + function setUpdateTrack(?string $updateTrack): void { $this->updateTrack = $updateTrack; } - function getUpdateAvailable() { + function getUpdateAvailable(): ?string { return $this->updateAvailable; } - function setUpdateAvailable($updateAvailable) { + function setUpdateAvailable(?string $updateAvailable): void { $this->updateAvailable = $updateAvailable; } diff --git a/src/dba/models/AgentBinaryFactory.class.php b/src/dba/models/AgentBinaryFactory.class.php index 162a147cd..0b9bcb1e4 100644 --- a/src/dba/models/AgentBinaryFactory.class.php +++ b/src/dba/models/AgentBinaryFactory.class.php @@ -3,28 +3,27 @@ namespace DBA; class AgentBinaryFactory extends AbstractModelFactory { - function getModelName() { + function getModelName(): string { return "AgentBinary"; } - function getModelTable() { + function getModelTable(): string { return "AgentBinary"; } - function isCachable() { + function isCachable(): bool { return false; } - function getCacheValidTime() { + function getCacheValidTime(): int { return -1; } /** * @return AgentBinary */ - function getNullObject() { - $o = new AgentBinary(-1, null, null, null, null, null, null); - return $o; + function getNullObject(): AgentBinary { + return new AgentBinary(-1, null, null, null, null, null, null); } /** @@ -32,9 +31,8 @@ function getNullObject() { * @param array $dict * @return AgentBinary */ - function createObjectFromDict($pk, $dict) { - $o = new AgentBinary($dict['agentBinaryId'], $dict['type'], $dict['version'], $dict['operatingSystems'], $dict['filename'], $dict['updateTrack'], $dict['updateAvailable']); - return $o; + function createObjectFromDict($pk, $dict): AgentBinary { + return new AgentBinary($dict['agentBinaryId'], $dict['type'], $dict['version'], $dict['operatingSystems'], $dict['filename'], $dict['updateTrack'], $dict['updateAvailable']); } /** @@ -66,9 +64,9 @@ function filter($options, $single = false) { /** * @param string $pk - * @return AgentBinary + * @return ?AgentBinary */ - function get($pk) { + function get($pk): ?AgentBinary { return Util::cast(parent::get($pk), AgentBinary::class); } @@ -76,7 +74,7 @@ function get($pk) { * @param AgentBinary $model * @return AgentBinary */ - function save($model) { + function save($model): AgentBinary { return Util::cast(parent::save($model), AgentBinary::class); } } \ No newline at end of file diff --git a/src/dba/models/AgentError.class.php b/src/dba/models/AgentError.class.php index cb2106c89..8099db80f 100644 --- a/src/dba/models/AgentError.class.php +++ b/src/dba/models/AgentError.class.php @@ -3,14 +3,14 @@ namespace DBA; class AgentError extends AbstractModel { - private $agentErrorId; - private $agentId; - private $taskId; - private $chunkId; - private $time; - private $error; - - function __construct($agentErrorId, $agentId, $taskId, $chunkId, $time, $error) { + private ?int $agentErrorId; + private ?int $agentId; + private ?int $taskId; + private ?int $chunkId; + private ?int $time; + private ?string $error; + + function __construct(?int $agentErrorId, ?int $agentId, ?int $taskId, ?int $chunkId, ?int $time, ?string $error) { $this->agentErrorId = $agentErrorId; $this->agentId = $agentId; $this->taskId = $taskId; @@ -19,7 +19,7 @@ function __construct($agentErrorId, $agentId, $taskId, $chunkId, $time, $error) $this->error = $error; } - function getKeyValueDict() { + function getKeyValueDict(): array { $dict = array(); $dict['agentErrorId'] = $this->agentErrorId; $dict['agentId'] = $this->agentId; @@ -31,7 +31,7 @@ function getKeyValueDict() { return $dict; } - static function getFeatures() { + static function getFeatures(): array { $dict = array(); $dict['agentErrorId'] = ['read_only' => True, "type" => "int", "subtype" => "unset", "choices" => "unset", "null" => False, "pk" => True, "protected" => True, "private" => False, "alias" => "agentErrorId", "public" => False]; $dict['agentId'] = ['read_only' => True, "type" => "int", "subtype" => "unset", "choices" => "unset", "null" => False, "pk" => False, "protected" => True, "private" => False, "alias" => "agentId", "public" => False]; @@ -43,19 +43,19 @@ static function getFeatures() { return $dict; } - function getPrimaryKey() { + function getPrimaryKey(): string { return "agentErrorId"; } - function getPrimaryKeyValue() { + function getPrimaryKeyValue(): ?int { return $this->agentErrorId; } - function getId() { + function getId(): ?int { return $this->agentErrorId; } - function setId($id) { + function setId($id): void { $this->agentErrorId = $id; } @@ -63,47 +63,47 @@ function setId($id) { * Used to serialize the data contained in the model * @return array */ - public function expose() { + public function expose(): array { return get_object_vars($this); } - function getAgentId() { + function getAgentId(): ?int { return $this->agentId; } - function setAgentId($agentId) { + function setAgentId(?int $agentId): void { $this->agentId = $agentId; } - function getTaskId() { + function getTaskId(): ?int { return $this->taskId; } - function setTaskId($taskId) { + function setTaskId(?int $taskId): void { $this->taskId = $taskId; } - function getChunkId() { + function getChunkId(): ?int { return $this->chunkId; } - function setChunkId($chunkId) { + function setChunkId(?int $chunkId): void { $this->chunkId = $chunkId; } - function getTime() { + function getTime(): ?int { return $this->time; } - function setTime($time) { + function setTime(?int $time): void { $this->time = $time; } - function getError() { + function getError(): ?string { return $this->error; } - function setError($error) { + function setError(?string $error): void { $this->error = $error; } diff --git a/src/dba/models/AgentErrorFactory.class.php b/src/dba/models/AgentErrorFactory.class.php index e4575e05b..f4dae014e 100644 --- a/src/dba/models/AgentErrorFactory.class.php +++ b/src/dba/models/AgentErrorFactory.class.php @@ -3,28 +3,27 @@ namespace DBA; class AgentErrorFactory extends AbstractModelFactory { - function getModelName() { + function getModelName(): string { return "AgentError"; } - function getModelTable() { + function getModelTable(): string { return "AgentError"; } - function isCachable() { + function isCachable(): bool { return false; } - function getCacheValidTime() { + function getCacheValidTime(): int { return -1; } /** * @return AgentError */ - function getNullObject() { - $o = new AgentError(-1, null, null, null, null, null); - return $o; + function getNullObject(): AgentError { + return new AgentError(-1, null, null, null, null, null); } /** @@ -32,9 +31,8 @@ function getNullObject() { * @param array $dict * @return AgentError */ - function createObjectFromDict($pk, $dict) { - $o = new AgentError($dict['agentErrorId'], $dict['agentId'], $dict['taskId'], $dict['chunkId'], $dict['time'], $dict['error']); - return $o; + function createObjectFromDict($pk, $dict): AgentError { + return new AgentError($dict['agentErrorId'], $dict['agentId'], $dict['taskId'], $dict['chunkId'], $dict['time'], $dict['error']); } /** @@ -66,9 +64,9 @@ function filter($options, $single = false) { /** * @param string $pk - * @return AgentError + * @return ?AgentError */ - function get($pk) { + function get($pk): ?AgentError { return Util::cast(parent::get($pk), AgentError::class); } @@ -76,7 +74,7 @@ function get($pk) { * @param AgentError $model * @return AgentError */ - function save($model) { + function save($model): AgentError { return Util::cast(parent::save($model), AgentError::class); } } \ No newline at end of file diff --git a/src/dba/models/AgentFactory.class.php b/src/dba/models/AgentFactory.class.php index 3363c2a6a..1b9dbbea6 100644 --- a/src/dba/models/AgentFactory.class.php +++ b/src/dba/models/AgentFactory.class.php @@ -3,28 +3,27 @@ namespace DBA; class AgentFactory extends AbstractModelFactory { - function getModelName() { + function getModelName(): string { return "Agent"; } - function getModelTable() { + function getModelTable(): string { return "Agent"; } - function isCachable() { + function isCachable(): bool { return false; } - function getCacheValidTime() { + function getCacheValidTime(): int { return -1; } /** * @return Agent */ - function getNullObject() { - $o = new Agent(-1, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null); - return $o; + function getNullObject(): Agent { + return new Agent(-1, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null); } /** @@ -32,9 +31,8 @@ function getNullObject() { * @param array $dict * @return Agent */ - function createObjectFromDict($pk, $dict) { - $o = new Agent($dict['agentId'], $dict['agentName'], $dict['uid'], $dict['os'], $dict['devices'], $dict['cmdPars'], $dict['ignoreErrors'], $dict['isActive'], $dict['isTrusted'], $dict['token'], $dict['lastAct'], $dict['lastTime'], $dict['lastIp'], $dict['userId'], $dict['cpuOnly'], $dict['clientSignature']); - return $o; + function createObjectFromDict($pk, $dict): Agent { + return new Agent($dict['agentId'], $dict['agentName'], $dict['uid'], $dict['os'], $dict['devices'], $dict['cmdPars'], $dict['ignoreErrors'], $dict['isActive'], $dict['isTrusted'], $dict['token'], $dict['lastAct'], $dict['lastTime'], $dict['lastIp'], $dict['userId'], $dict['cpuOnly'], $dict['clientSignature']); } /** @@ -66,9 +64,9 @@ function filter($options, $single = false) { /** * @param string $pk - * @return Agent + * @return ?Agent */ - function get($pk) { + function get($pk): ?Agent { return Util::cast(parent::get($pk), Agent::class); } @@ -76,7 +74,7 @@ function get($pk) { * @param Agent $model * @return Agent */ - function save($model) { + function save($model): Agent { return Util::cast(parent::save($model), Agent::class); } } \ No newline at end of file diff --git a/src/dba/models/AgentStat.class.php b/src/dba/models/AgentStat.class.php index d292e9f53..705650b2f 100644 --- a/src/dba/models/AgentStat.class.php +++ b/src/dba/models/AgentStat.class.php @@ -3,13 +3,13 @@ namespace DBA; class AgentStat extends AbstractModel { - private $agentStatId; - private $agentId; - private $statType; - private $time; - private $value; + private ?int $agentStatId; + private ?int $agentId; + private ?int $statType; + private ?int $time; + private ?string $value; - function __construct($agentStatId, $agentId, $statType, $time, $value) { + function __construct(?int $agentStatId, ?int $agentId, ?int $statType, ?int $time, ?string $value) { $this->agentStatId = $agentStatId; $this->agentId = $agentId; $this->statType = $statType; @@ -17,7 +17,7 @@ function __construct($agentStatId, $agentId, $statType, $time, $value) { $this->value = $value; } - function getKeyValueDict() { + function getKeyValueDict(): array { $dict = array(); $dict['agentStatId'] = $this->agentStatId; $dict['agentId'] = $this->agentId; @@ -28,7 +28,7 @@ function getKeyValueDict() { return $dict; } - static function getFeatures() { + static function getFeatures(): array { $dict = array(); $dict['agentStatId'] = ['read_only' => True, "type" => "int", "subtype" => "unset", "choices" => "unset", "null" => False, "pk" => True, "protected" => True, "private" => False, "alias" => "agentStatId", "public" => False]; $dict['agentId'] = ['read_only' => True, "type" => "int", "subtype" => "unset", "choices" => "unset", "null" => False, "pk" => False, "protected" => True, "private" => False, "alias" => "agentId", "public" => False]; @@ -39,19 +39,19 @@ static function getFeatures() { return $dict; } - function getPrimaryKey() { + function getPrimaryKey(): string { return "agentStatId"; } - function getPrimaryKeyValue() { + function getPrimaryKeyValue(): ?int { return $this->agentStatId; } - function getId() { + function getId(): ?int { return $this->agentStatId; } - function setId($id) { + function setId($id): void { $this->agentStatId = $id; } @@ -59,39 +59,39 @@ function setId($id) { * Used to serialize the data contained in the model * @return array */ - public function expose() { + public function expose(): array { return get_object_vars($this); } - function getAgentId() { + function getAgentId(): ?int { return $this->agentId; } - function setAgentId($agentId) { + function setAgentId(?int $agentId): void { $this->agentId = $agentId; } - function getStatType() { + function getStatType(): ?int { return $this->statType; } - function setStatType($statType) { + function setStatType(?int $statType): void { $this->statType = $statType; } - function getTime() { + function getTime(): ?int { return $this->time; } - function setTime($time) { + function setTime(?int $time): void { $this->time = $time; } - function getValue() { + function getValue(): ?string { return $this->value; } - function setValue($value) { + function setValue(?string $value): void { $this->value = $value; } diff --git a/src/dba/models/AgentStatFactory.class.php b/src/dba/models/AgentStatFactory.class.php index e2a387e77..d1feb1a4f 100644 --- a/src/dba/models/AgentStatFactory.class.php +++ b/src/dba/models/AgentStatFactory.class.php @@ -3,28 +3,27 @@ namespace DBA; class AgentStatFactory extends AbstractModelFactory { - function getModelName() { + function getModelName(): string { return "AgentStat"; } - function getModelTable() { + function getModelTable(): string { return "AgentStat"; } - function isCachable() { + function isCachable(): bool { return false; } - function getCacheValidTime() { + function getCacheValidTime(): int { return -1; } /** * @return AgentStat */ - function getNullObject() { - $o = new AgentStat(-1, null, null, null, null); - return $o; + function getNullObject(): AgentStat { + return new AgentStat(-1, null, null, null, null); } /** @@ -32,9 +31,8 @@ function getNullObject() { * @param array $dict * @return AgentStat */ - function createObjectFromDict($pk, $dict) { - $o = new AgentStat($dict['agentStatId'], $dict['agentId'], $dict['statType'], $dict['time'], $dict['value']); - return $o; + function createObjectFromDict($pk, $dict): AgentStat { + return new AgentStat($dict['agentStatId'], $dict['agentId'], $dict['statType'], $dict['time'], $dict['value']); } /** @@ -66,9 +64,9 @@ function filter($options, $single = false) { /** * @param string $pk - * @return AgentStat + * @return ?AgentStat */ - function get($pk) { + function get($pk): ?AgentStat { return Util::cast(parent::get($pk), AgentStat::class); } @@ -76,7 +74,7 @@ function get($pk) { * @param AgentStat $model * @return AgentStat */ - function save($model) { + function save($model): AgentStat { return Util::cast(parent::save($model), AgentStat::class); } } \ No newline at end of file diff --git a/src/dba/models/AgentZap.class.php b/src/dba/models/AgentZap.class.php index bde886edd..aab1dbd4e 100644 --- a/src/dba/models/AgentZap.class.php +++ b/src/dba/models/AgentZap.class.php @@ -3,17 +3,17 @@ namespace DBA; class AgentZap extends AbstractModel { - private $agentZapId; - private $agentId; - private $lastZapId; + private ?int $agentZapId; + private ?int $agentId; + private ?string $lastZapId; - function __construct($agentZapId, $agentId, $lastZapId) { + function __construct(?int $agentZapId, ?int $agentId, ?string $lastZapId) { $this->agentZapId = $agentZapId; $this->agentId = $agentId; $this->lastZapId = $lastZapId; } - function getKeyValueDict() { + function getKeyValueDict(): array { $dict = array(); $dict['agentZapId'] = $this->agentZapId; $dict['agentId'] = $this->agentId; @@ -22,7 +22,7 @@ function getKeyValueDict() { return $dict; } - static function getFeatures() { + static function getFeatures(): array { $dict = array(); $dict['agentZapId'] = ['read_only' => True, "type" => "int", "subtype" => "unset", "choices" => "unset", "null" => False, "pk" => True, "protected" => True, "private" => False, "alias" => "agentZapId", "public" => False]; $dict['agentId'] = ['read_only' => True, "type" => "int", "subtype" => "unset", "choices" => "unset", "null" => False, "pk" => False, "protected" => True, "private" => False, "alias" => "agentId", "public" => False]; @@ -31,19 +31,19 @@ static function getFeatures() { return $dict; } - function getPrimaryKey() { + function getPrimaryKey(): string { return "agentZapId"; } - function getPrimaryKeyValue() { + function getPrimaryKeyValue(): ?int { return $this->agentZapId; } - function getId() { + function getId(): ?int { return $this->agentZapId; } - function setId($id) { + function setId($id): void { $this->agentZapId = $id; } @@ -51,23 +51,23 @@ function setId($id) { * Used to serialize the data contained in the model * @return array */ - public function expose() { + public function expose(): array { return get_object_vars($this); } - function getAgentId() { + function getAgentId(): ?int { return $this->agentId; } - function setAgentId($agentId) { + function setAgentId(?int $agentId): void { $this->agentId = $agentId; } - function getLastZapId() { + function getLastZapId(): ?string { return $this->lastZapId; } - function setLastZapId($lastZapId) { + function setLastZapId(?string $lastZapId): void { $this->lastZapId = $lastZapId; } diff --git a/src/dba/models/AgentZapFactory.class.php b/src/dba/models/AgentZapFactory.class.php index dfa3be3bb..247d34443 100644 --- a/src/dba/models/AgentZapFactory.class.php +++ b/src/dba/models/AgentZapFactory.class.php @@ -3,28 +3,27 @@ namespace DBA; class AgentZapFactory extends AbstractModelFactory { - function getModelName() { + function getModelName(): string { return "AgentZap"; } - function getModelTable() { + function getModelTable(): string { return "AgentZap"; } - function isCachable() { + function isCachable(): bool { return false; } - function getCacheValidTime() { + function getCacheValidTime(): int { return -1; } /** * @return AgentZap */ - function getNullObject() { - $o = new AgentZap(-1, null, null); - return $o; + function getNullObject(): AgentZap { + return new AgentZap(-1, null, null); } /** @@ -32,9 +31,8 @@ function getNullObject() { * @param array $dict * @return AgentZap */ - function createObjectFromDict($pk, $dict) { - $o = new AgentZap($dict['agentZapId'], $dict['agentId'], $dict['lastZapId']); - return $o; + function createObjectFromDict($pk, $dict): AgentZap { + return new AgentZap($dict['agentZapId'], $dict['agentId'], $dict['lastZapId']); } /** @@ -66,9 +64,9 @@ function filter($options, $single = false) { /** * @param string $pk - * @return AgentZap + * @return ?AgentZap */ - function get($pk) { + function get($pk): ?AgentZap { return Util::cast(parent::get($pk), AgentZap::class); } @@ -76,7 +74,7 @@ function get($pk) { * @param AgentZap $model * @return AgentZap */ - function save($model) { + function save($model): AgentZap { return Util::cast(parent::save($model), AgentZap::class); } } \ No newline at end of file diff --git a/src/dba/models/ApiGroup.class.php b/src/dba/models/ApiGroup.class.php index 3c516e141..846f568db 100644 --- a/src/dba/models/ApiGroup.class.php +++ b/src/dba/models/ApiGroup.class.php @@ -3,17 +3,17 @@ namespace DBA; class ApiGroup extends AbstractModel { - private $apiGroupId; - private $permissions; - private $name; + private ?int $apiGroupId; + private ?string $permissions; + private ?string $name; - function __construct($apiGroupId, $permissions, $name) { + function __construct(?int $apiGroupId, ?string $permissions, ?string $name) { $this->apiGroupId = $apiGroupId; $this->permissions = $permissions; $this->name = $name; } - function getKeyValueDict() { + function getKeyValueDict(): array { $dict = array(); $dict['apiGroupId'] = $this->apiGroupId; $dict['permissions'] = $this->permissions; @@ -22,7 +22,7 @@ function getKeyValueDict() { return $dict; } - static function getFeatures() { + static function getFeatures(): array { $dict = array(); $dict['apiGroupId'] = ['read_only' => True, "type" => "int", "subtype" => "unset", "choices" => "unset", "null" => False, "pk" => True, "protected" => True, "private" => False, "alias" => "apiGroupId", "public" => False]; $dict['permissions'] = ['read_only' => False, "type" => "str(65535)", "subtype" => "unset", "choices" => "unset", "null" => False, "pk" => False, "protected" => False, "private" => False, "alias" => "permissions", "public" => False]; @@ -31,19 +31,19 @@ static function getFeatures() { return $dict; } - function getPrimaryKey() { + function getPrimaryKey(): string { return "apiGroupId"; } - function getPrimaryKeyValue() { + function getPrimaryKeyValue(): ?int { return $this->apiGroupId; } - function getId() { + function getId(): ?int { return $this->apiGroupId; } - function setId($id) { + function setId($id): void { $this->apiGroupId = $id; } @@ -51,23 +51,23 @@ function setId($id) { * Used to serialize the data contained in the model * @return array */ - public function expose() { + public function expose(): array { return get_object_vars($this); } - function getPermissions() { + function getPermissions(): ?string { return $this->permissions; } - function setPermissions($permissions) { + function setPermissions(?string $permissions): void { $this->permissions = $permissions; } - function getName() { + function getName(): ?string { return $this->name; } - function setName($name) { + function setName(?string $name): void { $this->name = $name; } diff --git a/src/dba/models/ApiGroupFactory.class.php b/src/dba/models/ApiGroupFactory.class.php index 484be07de..6df0e8112 100644 --- a/src/dba/models/ApiGroupFactory.class.php +++ b/src/dba/models/ApiGroupFactory.class.php @@ -3,28 +3,27 @@ namespace DBA; class ApiGroupFactory extends AbstractModelFactory { - function getModelName() { + function getModelName(): string { return "ApiGroup"; } - function getModelTable() { + function getModelTable(): string { return "ApiGroup"; } - function isCachable() { + function isCachable(): bool { return false; } - function getCacheValidTime() { + function getCacheValidTime(): int { return -1; } /** * @return ApiGroup */ - function getNullObject() { - $o = new ApiGroup(-1, null, null); - return $o; + function getNullObject(): ApiGroup { + return new ApiGroup(-1, null, null); } /** @@ -32,9 +31,8 @@ function getNullObject() { * @param array $dict * @return ApiGroup */ - function createObjectFromDict($pk, $dict) { - $o = new ApiGroup($dict['apiGroupId'], $dict['permissions'], $dict['name']); - return $o; + function createObjectFromDict($pk, $dict): ApiGroup { + return new ApiGroup($dict['apiGroupId'], $dict['permissions'], $dict['name']); } /** @@ -66,9 +64,9 @@ function filter($options, $single = false) { /** * @param string $pk - * @return ApiGroup + * @return ?ApiGroup */ - function get($pk) { + function get($pk): ?ApiGroup { return Util::cast(parent::get($pk), ApiGroup::class); } @@ -76,7 +74,7 @@ function get($pk) { * @param ApiGroup $model * @return ApiGroup */ - function save($model) { + function save($model): ApiGroup { return Util::cast(parent::save($model), ApiGroup::class); } } \ No newline at end of file diff --git a/src/dba/models/ApiKey.class.php b/src/dba/models/ApiKey.class.php index 5e5812500..54def9e85 100644 --- a/src/dba/models/ApiKey.class.php +++ b/src/dba/models/ApiKey.class.php @@ -3,15 +3,15 @@ namespace DBA; class ApiKey extends AbstractModel { - private $apiKeyId; - private $startValid; - private $endValid; - private $accessKey; - private $accessCount; - private $userId; - private $apiGroupId; - - function __construct($apiKeyId, $startValid, $endValid, $accessKey, $accessCount, $userId, $apiGroupId) { + private ?int $apiKeyId; + private ?int $startValid; + private ?int $endValid; + private ?string $accessKey; + private ?int $accessCount; + private ?int $userId; + private ?int $apiGroupId; + + function __construct(?int $apiKeyId, ?int $startValid, ?int $endValid, ?string $accessKey, ?int $accessCount, ?int $userId, ?int $apiGroupId) { $this->apiKeyId = $apiKeyId; $this->startValid = $startValid; $this->endValid = $endValid; @@ -21,7 +21,7 @@ function __construct($apiKeyId, $startValid, $endValid, $accessKey, $accessCount $this->apiGroupId = $apiGroupId; } - function getKeyValueDict() { + function getKeyValueDict(): array { $dict = array(); $dict['apiKeyId'] = $this->apiKeyId; $dict['startValid'] = $this->startValid; @@ -34,7 +34,7 @@ function getKeyValueDict() { return $dict; } - static function getFeatures() { + static function getFeatures(): array { $dict = array(); $dict['apiKeyId'] = ['read_only' => True, "type" => "int", "subtype" => "unset", "choices" => "unset", "null" => False, "pk" => True, "protected" => True, "private" => False, "alias" => "apiKeyId", "public" => False]; $dict['startValid'] = ['read_only' => False, "type" => "int64", "subtype" => "unset", "choices" => "unset", "null" => False, "pk" => False, "protected" => False, "private" => False, "alias" => "startValid", "public" => False]; @@ -47,19 +47,19 @@ static function getFeatures() { return $dict; } - function getPrimaryKey() { + function getPrimaryKey(): string { return "apiKeyId"; } - function getPrimaryKeyValue() { + function getPrimaryKeyValue(): ?int { return $this->apiKeyId; } - function getId() { + function getId(): ?int { return $this->apiKeyId; } - function setId($id) { + function setId($id): void { $this->apiKeyId = $id; } @@ -67,55 +67,55 @@ function setId($id) { * Used to serialize the data contained in the model * @return array */ - public function expose() { + public function expose(): array { return get_object_vars($this); } - function getStartValid() { + function getStartValid(): ?int { return $this->startValid; } - function setStartValid($startValid) { + function setStartValid(?int $startValid): void { $this->startValid = $startValid; } - function getEndValid() { + function getEndValid(): ?int { return $this->endValid; } - function setEndValid($endValid) { + function setEndValid(?int $endValid): void { $this->endValid = $endValid; } - function getAccessKey() { + function getAccessKey(): ?string { return $this->accessKey; } - function setAccessKey($accessKey) { + function setAccessKey(?string $accessKey): void { $this->accessKey = $accessKey; } - function getAccessCount() { + function getAccessCount(): ?int { return $this->accessCount; } - function setAccessCount($accessCount) { + function setAccessCount(?int $accessCount): void { $this->accessCount = $accessCount; } - function getUserId() { + function getUserId(): ?int { return $this->userId; } - function setUserId($userId) { + function setUserId(?int $userId): void { $this->userId = $userId; } - function getApiGroupId() { + function getApiGroupId(): ?int { return $this->apiGroupId; } - function setApiGroupId($apiGroupId) { + function setApiGroupId(?int $apiGroupId): void { $this->apiGroupId = $apiGroupId; } diff --git a/src/dba/models/ApiKeyFactory.class.php b/src/dba/models/ApiKeyFactory.class.php index 226d1e7da..2a376aba0 100644 --- a/src/dba/models/ApiKeyFactory.class.php +++ b/src/dba/models/ApiKeyFactory.class.php @@ -3,28 +3,27 @@ namespace DBA; class ApiKeyFactory extends AbstractModelFactory { - function getModelName() { + function getModelName(): string { return "ApiKey"; } - function getModelTable() { + function getModelTable(): string { return "ApiKey"; } - function isCachable() { + function isCachable(): bool { return false; } - function getCacheValidTime() { + function getCacheValidTime(): int { return -1; } /** * @return ApiKey */ - function getNullObject() { - $o = new ApiKey(-1, null, null, null, null, null, null); - return $o; + function getNullObject(): ApiKey { + return new ApiKey(-1, null, null, null, null, null, null); } /** @@ -32,9 +31,8 @@ function getNullObject() { * @param array $dict * @return ApiKey */ - function createObjectFromDict($pk, $dict) { - $o = new ApiKey($dict['apiKeyId'], $dict['startValid'], $dict['endValid'], $dict['accessKey'], $dict['accessCount'], $dict['userId'], $dict['apiGroupId']); - return $o; + function createObjectFromDict($pk, $dict): ApiKey { + return new ApiKey($dict['apiKeyId'], $dict['startValid'], $dict['endValid'], $dict['accessKey'], $dict['accessCount'], $dict['userId'], $dict['apiGroupId']); } /** @@ -66,9 +64,9 @@ function filter($options, $single = false) { /** * @param string $pk - * @return ApiKey + * @return ?ApiKey */ - function get($pk) { + function get($pk): ?ApiKey { return Util::cast(parent::get($pk), ApiKey::class); } @@ -76,7 +74,7 @@ function get($pk) { * @param ApiKey $model * @return ApiKey */ - function save($model) { + function save($model): ApiKey { return Util::cast(parent::save($model), ApiKey::class); } } \ No newline at end of file diff --git a/src/dba/models/Assignment.class.php b/src/dba/models/Assignment.class.php index def0af230..77e871e40 100644 --- a/src/dba/models/Assignment.class.php +++ b/src/dba/models/Assignment.class.php @@ -3,19 +3,19 @@ namespace DBA; class Assignment extends AbstractModel { - private $assignmentId; - private $taskId; - private $agentId; - private $benchmark; + private ?int $assignmentId; + private ?int $taskId; + private ?int $agentId; + private ?string $benchmark; - function __construct($assignmentId, $taskId, $agentId, $benchmark) { + function __construct(?int $assignmentId, ?int $taskId, ?int $agentId, ?string $benchmark) { $this->assignmentId = $assignmentId; $this->taskId = $taskId; $this->agentId = $agentId; $this->benchmark = $benchmark; } - function getKeyValueDict() { + function getKeyValueDict(): array { $dict = array(); $dict['assignmentId'] = $this->assignmentId; $dict['taskId'] = $this->taskId; @@ -25,7 +25,7 @@ function getKeyValueDict() { return $dict; } - static function getFeatures() { + static function getFeatures(): array { $dict = array(); $dict['assignmentId'] = ['read_only' => True, "type" => "int", "subtype" => "unset", "choices" => "unset", "null" => False, "pk" => True, "protected" => True, "private" => False, "alias" => "assignmentId", "public" => False]; $dict['taskId'] = ['read_only' => True, "type" => "int", "subtype" => "unset", "choices" => "unset", "null" => False, "pk" => False, "protected" => False, "private" => False, "alias" => "taskId", "public" => False]; @@ -35,19 +35,19 @@ static function getFeatures() { return $dict; } - function getPrimaryKey() { + function getPrimaryKey(): string { return "assignmentId"; } - function getPrimaryKeyValue() { + function getPrimaryKeyValue(): ?int { return $this->assignmentId; } - function getId() { + function getId(): ?int { return $this->assignmentId; } - function setId($id) { + function setId($id): void { $this->assignmentId = $id; } @@ -55,31 +55,31 @@ function setId($id) { * Used to serialize the data contained in the model * @return array */ - public function expose() { + public function expose(): array { return get_object_vars($this); } - function getTaskId() { + function getTaskId(): ?int { return $this->taskId; } - function setTaskId($taskId) { + function setTaskId(?int $taskId): void { $this->taskId = $taskId; } - function getAgentId() { + function getAgentId(): ?int { return $this->agentId; } - function setAgentId($agentId) { + function setAgentId(?int $agentId): void { $this->agentId = $agentId; } - function getBenchmark() { + function getBenchmark(): ?string { return $this->benchmark; } - function setBenchmark($benchmark) { + function setBenchmark(?string $benchmark): void { $this->benchmark = $benchmark; } diff --git a/src/dba/models/AssignmentFactory.class.php b/src/dba/models/AssignmentFactory.class.php index b02021427..94e944a03 100644 --- a/src/dba/models/AssignmentFactory.class.php +++ b/src/dba/models/AssignmentFactory.class.php @@ -3,28 +3,27 @@ namespace DBA; class AssignmentFactory extends AbstractModelFactory { - function getModelName() { + function getModelName(): string { return "Assignment"; } - function getModelTable() { + function getModelTable(): string { return "Assignment"; } - function isCachable() { + function isCachable(): bool { return false; } - function getCacheValidTime() { + function getCacheValidTime(): int { return -1; } /** * @return Assignment */ - function getNullObject() { - $o = new Assignment(-1, null, null, null); - return $o; + function getNullObject(): Assignment { + return new Assignment(-1, null, null, null); } /** @@ -32,9 +31,8 @@ function getNullObject() { * @param array $dict * @return Assignment */ - function createObjectFromDict($pk, $dict) { - $o = new Assignment($dict['assignmentId'], $dict['taskId'], $dict['agentId'], $dict['benchmark']); - return $o; + function createObjectFromDict($pk, $dict): Assignment { + return new Assignment($dict['assignmentId'], $dict['taskId'], $dict['agentId'], $dict['benchmark']); } /** @@ -66,9 +64,9 @@ function filter($options, $single = false) { /** * @param string $pk - * @return Assignment + * @return ?Assignment */ - function get($pk) { + function get($pk): ?Assignment { return Util::cast(parent::get($pk), Assignment::class); } @@ -76,7 +74,7 @@ function get($pk) { * @param Assignment $model * @return Assignment */ - function save($model) { + function save($model): Assignment { return Util::cast(parent::save($model), Assignment::class); } } \ No newline at end of file diff --git a/src/dba/models/Chunk.class.php b/src/dba/models/Chunk.class.php index 4ddf0fa3b..c85487d5d 100644 --- a/src/dba/models/Chunk.class.php +++ b/src/dba/models/Chunk.class.php @@ -3,20 +3,20 @@ namespace DBA; class Chunk extends AbstractModel { - private $chunkId; - private $taskId; - private $skip; - private $length; - private $agentId; - private $dispatchTime; - private $solveTime; - private $checkpoint; - private $progress; - private $state; - private $cracked; - private $speed; - - function __construct($chunkId, $taskId, $skip, $length, $agentId, $dispatchTime, $solveTime, $checkpoint, $progress, $state, $cracked, $speed) { + private ?int $chunkId; + private ?int $taskId; + private ?int $skip; + private ?int $length; + private ?int $agentId; + private ?int $dispatchTime; + private ?int $solveTime; + private ?int $checkpoint; + private ?int $progress; + private ?int $state; + private ?int $cracked; + private ?int $speed; + + function __construct(?int $chunkId, ?int $taskId, ?int $skip, ?int $length, ?int $agentId, ?int $dispatchTime, ?int $solveTime, ?int $checkpoint, ?int $progress, ?int $state, ?int $cracked, ?int $speed) { $this->chunkId = $chunkId; $this->taskId = $taskId; $this->skip = $skip; @@ -31,7 +31,7 @@ function __construct($chunkId, $taskId, $skip, $length, $agentId, $dispatchTime, $this->speed = $speed; } - function getKeyValueDict() { + function getKeyValueDict(): array { $dict = array(); $dict['chunkId'] = $this->chunkId; $dict['taskId'] = $this->taskId; @@ -49,7 +49,7 @@ function getKeyValueDict() { return $dict; } - static function getFeatures() { + static function getFeatures(): array { $dict = array(); $dict['chunkId'] = ['read_only' => True, "type" => "int", "subtype" => "unset", "choices" => "unset", "null" => False, "pk" => True, "protected" => True, "private" => False, "alias" => "chunkId", "public" => False]; $dict['taskId'] = ['read_only' => True, "type" => "int", "subtype" => "unset", "choices" => "unset", "null" => False, "pk" => False, "protected" => True, "private" => False, "alias" => "taskId", "public" => False]; @@ -67,19 +67,19 @@ static function getFeatures() { return $dict; } - function getPrimaryKey() { + function getPrimaryKey(): string { return "chunkId"; } - function getPrimaryKeyValue() { + function getPrimaryKeyValue(): ?int { return $this->chunkId; } - function getId() { + function getId(): ?int { return $this->chunkId; } - function setId($id) { + function setId($id): void { $this->chunkId = $id; } @@ -87,95 +87,95 @@ function setId($id) { * Used to serialize the data contained in the model * @return array */ - public function expose() { + public function expose(): array { return get_object_vars($this); } - function getTaskId() { + function getTaskId(): ?int { return $this->taskId; } - function setTaskId($taskId) { + function setTaskId(?int $taskId): void { $this->taskId = $taskId; } - function getSkip() { + function getSkip(): ?int { return $this->skip; } - function setSkip($skip) { + function setSkip(?int $skip): void { $this->skip = $skip; } - function getLength() { + function getLength(): ?int { return $this->length; } - function setLength($length) { + function setLength(?int $length): void { $this->length = $length; } - function getAgentId() { + function getAgentId(): ?int { return $this->agentId; } - function setAgentId($agentId) { + function setAgentId(?int $agentId): void { $this->agentId = $agentId; } - function getDispatchTime() { + function getDispatchTime(): ?int { return $this->dispatchTime; } - function setDispatchTime($dispatchTime) { + function setDispatchTime(?int $dispatchTime): void { $this->dispatchTime = $dispatchTime; } - function getSolveTime() { + function getSolveTime(): ?int { return $this->solveTime; } - function setSolveTime($solveTime) { + function setSolveTime(?int $solveTime): void { $this->solveTime = $solveTime; } - function getCheckpoint() { + function getCheckpoint(): ?int { return $this->checkpoint; } - function setCheckpoint($checkpoint) { + function setCheckpoint(?int $checkpoint): void { $this->checkpoint = $checkpoint; } - function getProgress() { + function getProgress(): ?int { return $this->progress; } - function setProgress($progress) { + function setProgress(?int $progress): void { $this->progress = $progress; } - function getState() { + function getState(): ?int { return $this->state; } - function setState($state) { + function setState(?int $state): void { $this->state = $state; } - function getCracked() { + function getCracked(): ?int { return $this->cracked; } - function setCracked($cracked) { + function setCracked(?int $cracked): void { $this->cracked = $cracked; } - function getSpeed() { + function getSpeed(): ?int { return $this->speed; } - function setSpeed($speed) { + function setSpeed(?int $speed): void { $this->speed = $speed; } diff --git a/src/dba/models/ChunkFactory.class.php b/src/dba/models/ChunkFactory.class.php index 3c0cb8346..32fd633c5 100644 --- a/src/dba/models/ChunkFactory.class.php +++ b/src/dba/models/ChunkFactory.class.php @@ -3,28 +3,27 @@ namespace DBA; class ChunkFactory extends AbstractModelFactory { - function getModelName() { + function getModelName(): string { return "Chunk"; } - function getModelTable() { + function getModelTable(): string { return "Chunk"; } - function isCachable() { + function isCachable(): bool { return false; } - function getCacheValidTime() { + function getCacheValidTime(): int { return -1; } /** * @return Chunk */ - function getNullObject() { - $o = new Chunk(-1, null, null, null, null, null, null, null, null, null, null, null); - return $o; + function getNullObject(): Chunk { + return new Chunk(-1, null, null, null, null, null, null, null, null, null, null, null); } /** @@ -32,9 +31,8 @@ function getNullObject() { * @param array $dict * @return Chunk */ - function createObjectFromDict($pk, $dict) { - $o = new Chunk($dict['chunkId'], $dict['taskId'], $dict['skip'], $dict['length'], $dict['agentId'], $dict['dispatchTime'], $dict['solveTime'], $dict['checkpoint'], $dict['progress'], $dict['state'], $dict['cracked'], $dict['speed']); - return $o; + function createObjectFromDict($pk, $dict): Chunk { + return new Chunk($dict['chunkId'], $dict['taskId'], $dict['skip'], $dict['length'], $dict['agentId'], $dict['dispatchTime'], $dict['solveTime'], $dict['checkpoint'], $dict['progress'], $dict['state'], $dict['cracked'], $dict['speed']); } /** @@ -66,9 +64,9 @@ function filter($options, $single = false) { /** * @param string $pk - * @return Chunk + * @return ?Chunk */ - function get($pk) { + function get($pk): ?Chunk { return Util::cast(parent::get($pk), Chunk::class); } @@ -76,7 +74,7 @@ function get($pk) { * @param Chunk $model * @return Chunk */ - function save($model) { + function save($model): Chunk { return Util::cast(parent::save($model), Chunk::class); } } \ No newline at end of file diff --git a/src/dba/models/Config.class.php b/src/dba/models/Config.class.php index 26278439f..733711fb2 100644 --- a/src/dba/models/Config.class.php +++ b/src/dba/models/Config.class.php @@ -3,19 +3,19 @@ namespace DBA; class Config extends AbstractModel { - private $configId; - private $configSectionId; - private $item; - private $value; + private ?int $configId; + private ?int $configSectionId; + private ?string $item; + private ?string $value; - function __construct($configId, $configSectionId, $item, $value) { + function __construct(?int $configId, ?int $configSectionId, ?string $item, ?string $value) { $this->configId = $configId; $this->configSectionId = $configSectionId; $this->item = $item; $this->value = $value; } - function getKeyValueDict() { + function getKeyValueDict(): array { $dict = array(); $dict['configId'] = $this->configId; $dict['configSectionId'] = $this->configSectionId; @@ -25,7 +25,7 @@ function getKeyValueDict() { return $dict; } - static function getFeatures() { + static function getFeatures(): array { $dict = array(); $dict['configId'] = ['read_only' => True, "type" => "int", "subtype" => "unset", "choices" => "unset", "null" => False, "pk" => True, "protected" => True, "private" => False, "alias" => "configId", "public" => False]; $dict['configSectionId'] = ['read_only' => True, "type" => "int", "subtype" => "unset", "choices" => "unset", "null" => False, "pk" => False, "protected" => False, "private" => False, "alias" => "configSectionId", "public" => False]; @@ -35,19 +35,19 @@ static function getFeatures() { return $dict; } - function getPrimaryKey() { + function getPrimaryKey(): string { return "configId"; } - function getPrimaryKeyValue() { + function getPrimaryKeyValue(): ?int { return $this->configId; } - function getId() { + function getId(): ?int { return $this->configId; } - function setId($id) { + function setId($id): void { $this->configId = $id; } @@ -55,31 +55,31 @@ function setId($id) { * Used to serialize the data contained in the model * @return array */ - public function expose() { + public function expose(): array { return get_object_vars($this); } - function getConfigSectionId() { + function getConfigSectionId(): ?int { return $this->configSectionId; } - function setConfigSectionId($configSectionId) { + function setConfigSectionId(?int $configSectionId): void { $this->configSectionId = $configSectionId; } - function getItem() { + function getItem(): ?string { return $this->item; } - function setItem($item) { + function setItem(?string $item): void { $this->item = $item; } - function getValue() { + function getValue(): ?string { return $this->value; } - function setValue($value) { + function setValue(?string $value): void { $this->value = $value; } diff --git a/src/dba/models/ConfigFactory.class.php b/src/dba/models/ConfigFactory.class.php index 6d800f733..0c761ffb5 100644 --- a/src/dba/models/ConfigFactory.class.php +++ b/src/dba/models/ConfigFactory.class.php @@ -3,28 +3,27 @@ namespace DBA; class ConfigFactory extends AbstractModelFactory { - function getModelName() { + function getModelName(): string { return "Config"; } - function getModelTable() { + function getModelTable(): string { return "Config"; } - function isCachable() { + function isCachable(): bool { return false; } - function getCacheValidTime() { + function getCacheValidTime(): int { return -1; } /** * @return Config */ - function getNullObject() { - $o = new Config(-1, null, null, null); - return $o; + function getNullObject(): Config { + return new Config(-1, null, null, null); } /** @@ -32,9 +31,8 @@ function getNullObject() { * @param array $dict * @return Config */ - function createObjectFromDict($pk, $dict) { - $o = new Config($dict['configId'], $dict['configSectionId'], $dict['item'], $dict['value']); - return $o; + function createObjectFromDict($pk, $dict): Config { + return new Config($dict['configId'], $dict['configSectionId'], $dict['item'], $dict['value']); } /** @@ -66,9 +64,9 @@ function filter($options, $single = false) { /** * @param string $pk - * @return Config + * @return ?Config */ - function get($pk) { + function get($pk): ?Config { return Util::cast(parent::get($pk), Config::class); } @@ -76,7 +74,7 @@ function get($pk) { * @param Config $model * @return Config */ - function save($model) { + function save($model): Config { return Util::cast(parent::save($model), Config::class); } } \ No newline at end of file diff --git a/src/dba/models/ConfigSection.class.php b/src/dba/models/ConfigSection.class.php index 2960cf303..558108c23 100644 --- a/src/dba/models/ConfigSection.class.php +++ b/src/dba/models/ConfigSection.class.php @@ -3,15 +3,15 @@ namespace DBA; class ConfigSection extends AbstractModel { - private $configSectionId; - private $sectionName; + private ?int $configSectionId; + private ?string $sectionName; - function __construct($configSectionId, $sectionName) { + function __construct(?int $configSectionId, ?string $sectionName) { $this->configSectionId = $configSectionId; $this->sectionName = $sectionName; } - function getKeyValueDict() { + function getKeyValueDict(): array { $dict = array(); $dict['configSectionId'] = $this->configSectionId; $dict['sectionName'] = $this->sectionName; @@ -19,7 +19,7 @@ function getKeyValueDict() { return $dict; } - static function getFeatures() { + static function getFeatures(): array { $dict = array(); $dict['configSectionId'] = ['read_only' => True, "type" => "int", "subtype" => "unset", "choices" => "unset", "null" => False, "pk" => True, "protected" => True, "private" => False, "alias" => "configSectionId", "public" => False]; $dict['sectionName'] = ['read_only' => False, "type" => "str(100)", "subtype" => "unset", "choices" => "unset", "null" => False, "pk" => False, "protected" => False, "private" => False, "alias" => "sectionName", "public" => False]; @@ -27,19 +27,19 @@ static function getFeatures() { return $dict; } - function getPrimaryKey() { + function getPrimaryKey(): string { return "configSectionId"; } - function getPrimaryKeyValue() { + function getPrimaryKeyValue(): ?int { return $this->configSectionId; } - function getId() { + function getId(): ?int { return $this->configSectionId; } - function setId($id) { + function setId($id): void { $this->configSectionId = $id; } @@ -47,15 +47,15 @@ function setId($id) { * Used to serialize the data contained in the model * @return array */ - public function expose() { + public function expose(): array { return get_object_vars($this); } - function getSectionName() { + function getSectionName(): ?string { return $this->sectionName; } - function setSectionName($sectionName) { + function setSectionName(?string $sectionName): void { $this->sectionName = $sectionName; } diff --git a/src/dba/models/ConfigSectionFactory.class.php b/src/dba/models/ConfigSectionFactory.class.php index b21ea17d8..a56eaee08 100644 --- a/src/dba/models/ConfigSectionFactory.class.php +++ b/src/dba/models/ConfigSectionFactory.class.php @@ -3,28 +3,27 @@ namespace DBA; class ConfigSectionFactory extends AbstractModelFactory { - function getModelName() { + function getModelName(): string { return "ConfigSection"; } - function getModelTable() { + function getModelTable(): string { return "ConfigSection"; } - function isCachable() { + function isCachable(): bool { return false; } - function getCacheValidTime() { + function getCacheValidTime(): int { return -1; } /** * @return ConfigSection */ - function getNullObject() { - $o = new ConfigSection(-1, null); - return $o; + function getNullObject(): ConfigSection { + return new ConfigSection(-1, null); } /** @@ -32,9 +31,8 @@ function getNullObject() { * @param array $dict * @return ConfigSection */ - function createObjectFromDict($pk, $dict) { - $o = new ConfigSection($dict['configSectionId'], $dict['sectionName']); - return $o; + function createObjectFromDict($pk, $dict): ConfigSection { + return new ConfigSection($dict['configSectionId'], $dict['sectionName']); } /** @@ -66,9 +64,9 @@ function filter($options, $single = false) { /** * @param string $pk - * @return ConfigSection + * @return ?ConfigSection */ - function get($pk) { + function get($pk): ?ConfigSection { return Util::cast(parent::get($pk), ConfigSection::class); } @@ -76,7 +74,7 @@ function get($pk) { * @param ConfigSection $model * @return ConfigSection */ - function save($model) { + function save($model): ConfigSection { return Util::cast(parent::save($model), ConfigSection::class); } } \ No newline at end of file diff --git a/src/dba/models/CrackerBinary.class.php b/src/dba/models/CrackerBinary.class.php index e68dd0bb7..a2bc40bc8 100644 --- a/src/dba/models/CrackerBinary.class.php +++ b/src/dba/models/CrackerBinary.class.php @@ -3,13 +3,13 @@ namespace DBA; class CrackerBinary extends AbstractModel { - private $crackerBinaryId; - private $crackerBinaryTypeId; - private $version; - private $downloadUrl; - private $binaryName; + private ?int $crackerBinaryId; + private ?int $crackerBinaryTypeId; + private ?string $version; + private ?string $downloadUrl; + private ?string $binaryName; - function __construct($crackerBinaryId, $crackerBinaryTypeId, $version, $downloadUrl, $binaryName) { + function __construct(?int $crackerBinaryId, ?int $crackerBinaryTypeId, ?string $version, ?string $downloadUrl, ?string $binaryName) { $this->crackerBinaryId = $crackerBinaryId; $this->crackerBinaryTypeId = $crackerBinaryTypeId; $this->version = $version; @@ -17,7 +17,7 @@ function __construct($crackerBinaryId, $crackerBinaryTypeId, $version, $download $this->binaryName = $binaryName; } - function getKeyValueDict() { + function getKeyValueDict(): array { $dict = array(); $dict['crackerBinaryId'] = $this->crackerBinaryId; $dict['crackerBinaryTypeId'] = $this->crackerBinaryTypeId; @@ -28,7 +28,7 @@ function getKeyValueDict() { return $dict; } - static function getFeatures() { + static function getFeatures(): array { $dict = array(); $dict['crackerBinaryId'] = ['read_only' => True, "type" => "int", "subtype" => "unset", "choices" => "unset", "null" => False, "pk" => True, "protected" => True, "private" => False, "alias" => "crackerBinaryId", "public" => False]; $dict['crackerBinaryTypeId'] = ['read_only' => True, "type" => "int", "subtype" => "unset", "choices" => "unset", "null" => False, "pk" => False, "protected" => False, "private" => False, "alias" => "crackerBinaryTypeId", "public" => False]; @@ -39,19 +39,19 @@ static function getFeatures() { return $dict; } - function getPrimaryKey() { + function getPrimaryKey(): string { return "crackerBinaryId"; } - function getPrimaryKeyValue() { + function getPrimaryKeyValue(): ?int { return $this->crackerBinaryId; } - function getId() { + function getId(): ?int { return $this->crackerBinaryId; } - function setId($id) { + function setId($id): void { $this->crackerBinaryId = $id; } @@ -59,39 +59,39 @@ function setId($id) { * Used to serialize the data contained in the model * @return array */ - public function expose() { + public function expose(): array { return get_object_vars($this); } - function getCrackerBinaryTypeId() { + function getCrackerBinaryTypeId(): ?int { return $this->crackerBinaryTypeId; } - function setCrackerBinaryTypeId($crackerBinaryTypeId) { + function setCrackerBinaryTypeId(?int $crackerBinaryTypeId): void { $this->crackerBinaryTypeId = $crackerBinaryTypeId; } - function getVersion() { + function getVersion(): ?string { return $this->version; } - function setVersion($version) { + function setVersion(?string $version): void { $this->version = $version; } - function getDownloadUrl() { + function getDownloadUrl(): ?string { return $this->downloadUrl; } - function setDownloadUrl($downloadUrl) { + function setDownloadUrl(?string $downloadUrl): void { $this->downloadUrl = $downloadUrl; } - function getBinaryName() { + function getBinaryName(): ?string { return $this->binaryName; } - function setBinaryName($binaryName) { + function setBinaryName(?string $binaryName): void { $this->binaryName = $binaryName; } diff --git a/src/dba/models/CrackerBinaryFactory.class.php b/src/dba/models/CrackerBinaryFactory.class.php index 5736a956f..51a5ff4bf 100644 --- a/src/dba/models/CrackerBinaryFactory.class.php +++ b/src/dba/models/CrackerBinaryFactory.class.php @@ -3,28 +3,27 @@ namespace DBA; class CrackerBinaryFactory extends AbstractModelFactory { - function getModelName() { + function getModelName(): string { return "CrackerBinary"; } - function getModelTable() { + function getModelTable(): string { return "CrackerBinary"; } - function isCachable() { + function isCachable(): bool { return false; } - function getCacheValidTime() { + function getCacheValidTime(): int { return -1; } /** * @return CrackerBinary */ - function getNullObject() { - $o = new CrackerBinary(-1, null, null, null, null); - return $o; + function getNullObject(): CrackerBinary { + return new CrackerBinary(-1, null, null, null, null); } /** @@ -32,9 +31,8 @@ function getNullObject() { * @param array $dict * @return CrackerBinary */ - function createObjectFromDict($pk, $dict) { - $o = new CrackerBinary($dict['crackerBinaryId'], $dict['crackerBinaryTypeId'], $dict['version'], $dict['downloadUrl'], $dict['binaryName']); - return $o; + function createObjectFromDict($pk, $dict): CrackerBinary { + return new CrackerBinary($dict['crackerBinaryId'], $dict['crackerBinaryTypeId'], $dict['version'], $dict['downloadUrl'], $dict['binaryName']); } /** @@ -66,9 +64,9 @@ function filter($options, $single = false) { /** * @param string $pk - * @return CrackerBinary + * @return ?CrackerBinary */ - function get($pk) { + function get($pk): ?CrackerBinary { return Util::cast(parent::get($pk), CrackerBinary::class); } @@ -76,7 +74,7 @@ function get($pk) { * @param CrackerBinary $model * @return CrackerBinary */ - function save($model) { + function save($model): CrackerBinary { return Util::cast(parent::save($model), CrackerBinary::class); } } \ No newline at end of file diff --git a/src/dba/models/CrackerBinaryType.class.php b/src/dba/models/CrackerBinaryType.class.php index 12a00c5db..2c9979bb1 100644 --- a/src/dba/models/CrackerBinaryType.class.php +++ b/src/dba/models/CrackerBinaryType.class.php @@ -3,17 +3,17 @@ namespace DBA; class CrackerBinaryType extends AbstractModel { - private $crackerBinaryTypeId; - private $typeName; - private $isChunkingAvailable; + private ?int $crackerBinaryTypeId; + private ?string $typeName; + private ?int $isChunkingAvailable; - function __construct($crackerBinaryTypeId, $typeName, $isChunkingAvailable) { + function __construct(?int $crackerBinaryTypeId, ?string $typeName, ?int $isChunkingAvailable) { $this->crackerBinaryTypeId = $crackerBinaryTypeId; $this->typeName = $typeName; $this->isChunkingAvailable = $isChunkingAvailable; } - function getKeyValueDict() { + function getKeyValueDict(): array { $dict = array(); $dict['crackerBinaryTypeId'] = $this->crackerBinaryTypeId; $dict['typeName'] = $this->typeName; @@ -22,7 +22,7 @@ function getKeyValueDict() { return $dict; } - static function getFeatures() { + static function getFeatures(): array { $dict = array(); $dict['crackerBinaryTypeId'] = ['read_only' => True, "type" => "int", "subtype" => "unset", "choices" => "unset", "null" => False, "pk" => True, "protected" => True, "private" => False, "alias" => "crackerBinaryTypeId", "public" => False]; $dict['typeName'] = ['read_only' => False, "type" => "str(30)", "subtype" => "unset", "choices" => "unset", "null" => False, "pk" => False, "protected" => False, "private" => False, "alias" => "typeName", "public" => False]; @@ -31,19 +31,19 @@ static function getFeatures() { return $dict; } - function getPrimaryKey() { + function getPrimaryKey(): string { return "crackerBinaryTypeId"; } - function getPrimaryKeyValue() { + function getPrimaryKeyValue(): ?int { return $this->crackerBinaryTypeId; } - function getId() { + function getId(): ?int { return $this->crackerBinaryTypeId; } - function setId($id) { + function setId($id): void { $this->crackerBinaryTypeId = $id; } @@ -51,23 +51,23 @@ function setId($id) { * Used to serialize the data contained in the model * @return array */ - public function expose() { + public function expose(): array { return get_object_vars($this); } - function getTypeName() { + function getTypeName(): ?string { return $this->typeName; } - function setTypeName($typeName) { + function setTypeName(?string $typeName): void { $this->typeName = $typeName; } - function getIsChunkingAvailable() { + function getIsChunkingAvailable(): ?int { return $this->isChunkingAvailable; } - function setIsChunkingAvailable($isChunkingAvailable) { + function setIsChunkingAvailable(?int $isChunkingAvailable): void { $this->isChunkingAvailable = $isChunkingAvailable; } diff --git a/src/dba/models/CrackerBinaryTypeFactory.class.php b/src/dba/models/CrackerBinaryTypeFactory.class.php index c9870c579..19d1b8105 100644 --- a/src/dba/models/CrackerBinaryTypeFactory.class.php +++ b/src/dba/models/CrackerBinaryTypeFactory.class.php @@ -3,28 +3,27 @@ namespace DBA; class CrackerBinaryTypeFactory extends AbstractModelFactory { - function getModelName() { + function getModelName(): string { return "CrackerBinaryType"; } - function getModelTable() { + function getModelTable(): string { return "CrackerBinaryType"; } - function isCachable() { + function isCachable(): bool { return false; } - function getCacheValidTime() { + function getCacheValidTime(): int { return -1; } /** * @return CrackerBinaryType */ - function getNullObject() { - $o = new CrackerBinaryType(-1, null, null); - return $o; + function getNullObject(): CrackerBinaryType { + return new CrackerBinaryType(-1, null, null); } /** @@ -32,9 +31,8 @@ function getNullObject() { * @param array $dict * @return CrackerBinaryType */ - function createObjectFromDict($pk, $dict) { - $o = new CrackerBinaryType($dict['crackerBinaryTypeId'], $dict['typeName'], $dict['isChunkingAvailable']); - return $o; + function createObjectFromDict($pk, $dict): CrackerBinaryType { + return new CrackerBinaryType($dict['crackerBinaryTypeId'], $dict['typeName'], $dict['isChunkingAvailable']); } /** @@ -66,9 +64,9 @@ function filter($options, $single = false) { /** * @param string $pk - * @return CrackerBinaryType + * @return ?CrackerBinaryType */ - function get($pk) { + function get($pk): ?CrackerBinaryType { return Util::cast(parent::get($pk), CrackerBinaryType::class); } @@ -76,7 +74,7 @@ function get($pk) { * @param CrackerBinaryType $model * @return CrackerBinaryType */ - function save($model) { + function save($model): CrackerBinaryType { return Util::cast(parent::save($model), CrackerBinaryType::class); } } \ No newline at end of file diff --git a/src/dba/models/File.class.php b/src/dba/models/File.class.php index 961585683..999be7af5 100644 --- a/src/dba/models/File.class.php +++ b/src/dba/models/File.class.php @@ -3,15 +3,15 @@ namespace DBA; class File extends AbstractModel { - private $fileId; - private $filename; - private $size; - private $isSecret; - private $fileType; - private $accessGroupId; - private $lineCount; - - function __construct($fileId, $filename, $size, $isSecret, $fileType, $accessGroupId, $lineCount) { + private ?int $fileId; + private ?string $filename; + private ?int $size; + private ?int $isSecret; + private ?int $fileType; + private ?int $accessGroupId; + private ?int $lineCount; + + function __construct(?int $fileId, ?string $filename, ?int $size, ?int $isSecret, ?int $fileType, ?int $accessGroupId, ?int $lineCount) { $this->fileId = $fileId; $this->filename = $filename; $this->size = $size; @@ -21,7 +21,7 @@ function __construct($fileId, $filename, $size, $isSecret, $fileType, $accessGro $this->lineCount = $lineCount; } - function getKeyValueDict() { + function getKeyValueDict(): array { $dict = array(); $dict['fileId'] = $this->fileId; $dict['filename'] = $this->filename; @@ -34,7 +34,7 @@ function getKeyValueDict() { return $dict; } - static function getFeatures() { + static function getFeatures(): array { $dict = array(); $dict['fileId'] = ['read_only' => True, "type" => "int", "subtype" => "unset", "choices" => "unset", "null" => False, "pk" => True, "protected" => True, "private" => False, "alias" => "fileId", "public" => False]; $dict['filename'] = ['read_only' => False, "type" => "str(100)", "subtype" => "unset", "choices" => "unset", "null" => False, "pk" => False, "protected" => False, "private" => False, "alias" => "filename", "public" => False]; @@ -47,19 +47,19 @@ static function getFeatures() { return $dict; } - function getPrimaryKey() { + function getPrimaryKey(): string { return "fileId"; } - function getPrimaryKeyValue() { + function getPrimaryKeyValue(): ?int { return $this->fileId; } - function getId() { + function getId(): ?int { return $this->fileId; } - function setId($id) { + function setId($id): void { $this->fileId = $id; } @@ -67,55 +67,55 @@ function setId($id) { * Used to serialize the data contained in the model * @return array */ - public function expose() { + public function expose(): array { return get_object_vars($this); } - function getFilename() { + function getFilename(): ?string { return $this->filename; } - function setFilename($filename) { + function setFilename(?string $filename): void { $this->filename = $filename; } - function getSize() { + function getSize(): ?int { return $this->size; } - function setSize($size) { + function setSize(?int $size): void { $this->size = $size; } - function getIsSecret() { + function getIsSecret(): ?int { return $this->isSecret; } - function setIsSecret($isSecret) { + function setIsSecret(?int $isSecret): void { $this->isSecret = $isSecret; } - function getFileType() { + function getFileType(): ?int { return $this->fileType; } - function setFileType($fileType) { + function setFileType(?int $fileType): void { $this->fileType = $fileType; } - function getAccessGroupId() { + function getAccessGroupId(): ?int { return $this->accessGroupId; } - function setAccessGroupId($accessGroupId) { + function setAccessGroupId(?int $accessGroupId): void { $this->accessGroupId = $accessGroupId; } - function getLineCount() { + function getLineCount(): ?int { return $this->lineCount; } - function setLineCount($lineCount) { + function setLineCount(?int $lineCount): void { $this->lineCount = $lineCount; } diff --git a/src/dba/models/FileDelete.class.php b/src/dba/models/FileDelete.class.php index 06ac64eec..b93228ced 100644 --- a/src/dba/models/FileDelete.class.php +++ b/src/dba/models/FileDelete.class.php @@ -3,17 +3,17 @@ namespace DBA; class FileDelete extends AbstractModel { - private $fileDeleteId; - private $filename; - private $time; + private ?int $fileDeleteId; + private ?string $filename; + private ?int $time; - function __construct($fileDeleteId, $filename, $time) { + function __construct(?int $fileDeleteId, ?string $filename, ?int $time) { $this->fileDeleteId = $fileDeleteId; $this->filename = $filename; $this->time = $time; } - function getKeyValueDict() { + function getKeyValueDict(): array { $dict = array(); $dict['fileDeleteId'] = $this->fileDeleteId; $dict['filename'] = $this->filename; @@ -22,7 +22,7 @@ function getKeyValueDict() { return $dict; } - static function getFeatures() { + static function getFeatures(): array { $dict = array(); $dict['fileDeleteId'] = ['read_only' => True, "type" => "int", "subtype" => "unset", "choices" => "unset", "null" => False, "pk" => True, "protected" => True, "private" => False, "alias" => "fileDeleteId", "public" => False]; $dict['filename'] = ['read_only' => True, "type" => "str(256)", "subtype" => "unset", "choices" => "unset", "null" => False, "pk" => False, "protected" => True, "private" => False, "alias" => "filename", "public" => False]; @@ -31,19 +31,19 @@ static function getFeatures() { return $dict; } - function getPrimaryKey() { + function getPrimaryKey(): string { return "fileDeleteId"; } - function getPrimaryKeyValue() { + function getPrimaryKeyValue(): ?int { return $this->fileDeleteId; } - function getId() { + function getId(): ?int { return $this->fileDeleteId; } - function setId($id) { + function setId($id): void { $this->fileDeleteId = $id; } @@ -51,23 +51,23 @@ function setId($id) { * Used to serialize the data contained in the model * @return array */ - public function expose() { + public function expose(): array { return get_object_vars($this); } - function getFilename() { + function getFilename(): ?string { return $this->filename; } - function setFilename($filename) { + function setFilename(?string $filename): void { $this->filename = $filename; } - function getTime() { + function getTime(): ?int { return $this->time; } - function setTime($time) { + function setTime(?int $time): void { $this->time = $time; } diff --git a/src/dba/models/FileDeleteFactory.class.php b/src/dba/models/FileDeleteFactory.class.php index 302b9d2a9..5961d2395 100644 --- a/src/dba/models/FileDeleteFactory.class.php +++ b/src/dba/models/FileDeleteFactory.class.php @@ -3,28 +3,27 @@ namespace DBA; class FileDeleteFactory extends AbstractModelFactory { - function getModelName() { + function getModelName(): string { return "FileDelete"; } - function getModelTable() { + function getModelTable(): string { return "FileDelete"; } - function isCachable() { + function isCachable(): bool { return false; } - function getCacheValidTime() { + function getCacheValidTime(): int { return -1; } /** * @return FileDelete */ - function getNullObject() { - $o = new FileDelete(-1, null, null); - return $o; + function getNullObject(): FileDelete { + return new FileDelete(-1, null, null); } /** @@ -32,9 +31,8 @@ function getNullObject() { * @param array $dict * @return FileDelete */ - function createObjectFromDict($pk, $dict) { - $o = new FileDelete($dict['fileDeleteId'], $dict['filename'], $dict['time']); - return $o; + function createObjectFromDict($pk, $dict): FileDelete { + return new FileDelete($dict['fileDeleteId'], $dict['filename'], $dict['time']); } /** @@ -66,9 +64,9 @@ function filter($options, $single = false) { /** * @param string $pk - * @return FileDelete + * @return ?FileDelete */ - function get($pk) { + function get($pk): ?FileDelete { return Util::cast(parent::get($pk), FileDelete::class); } @@ -76,7 +74,7 @@ function get($pk) { * @param FileDelete $model * @return FileDelete */ - function save($model) { + function save($model): FileDelete { return Util::cast(parent::save($model), FileDelete::class); } } \ No newline at end of file diff --git a/src/dba/models/FileDownload.class.php b/src/dba/models/FileDownload.class.php index 06a54bb06..59082ccf0 100644 --- a/src/dba/models/FileDownload.class.php +++ b/src/dba/models/FileDownload.class.php @@ -3,19 +3,19 @@ namespace DBA; class FileDownload extends AbstractModel { - private $fileDownloadId; - private $time; - private $fileId; - private $status; + private ?int $fileDownloadId; + private ?int $time; + private ?int $fileId; + private ?int $status; - function __construct($fileDownloadId, $time, $fileId, $status) { + function __construct(?int $fileDownloadId, ?int $time, ?int $fileId, ?int $status) { $this->fileDownloadId = $fileDownloadId; $this->time = $time; $this->fileId = $fileId; $this->status = $status; } - function getKeyValueDict() { + function getKeyValueDict(): array { $dict = array(); $dict['fileDownloadId'] = $this->fileDownloadId; $dict['time'] = $this->time; @@ -25,7 +25,7 @@ function getKeyValueDict() { return $dict; } - static function getFeatures() { + static function getFeatures(): array { $dict = array(); $dict['fileDownloadId'] = ['read_only' => True, "type" => "int", "subtype" => "unset", "choices" => "unset", "null" => False, "pk" => True, "protected" => True, "private" => False, "alias" => "fileDownloadId", "public" => False]; $dict['time'] = ['read_only' => True, "type" => "int64", "subtype" => "unset", "choices" => "unset", "null" => False, "pk" => False, "protected" => True, "private" => False, "alias" => "time", "public" => False]; @@ -35,19 +35,19 @@ static function getFeatures() { return $dict; } - function getPrimaryKey() { + function getPrimaryKey(): string { return "fileDownloadId"; } - function getPrimaryKeyValue() { + function getPrimaryKeyValue(): ?int { return $this->fileDownloadId; } - function getId() { + function getId(): ?int { return $this->fileDownloadId; } - function setId($id) { + function setId($id): void { $this->fileDownloadId = $id; } @@ -55,31 +55,31 @@ function setId($id) { * Used to serialize the data contained in the model * @return array */ - public function expose() { + public function expose(): array { return get_object_vars($this); } - function getTime() { + function getTime(): ?int { return $this->time; } - function setTime($time) { + function setTime(?int $time): void { $this->time = $time; } - function getFileId() { + function getFileId(): ?int { return $this->fileId; } - function setFileId($fileId) { + function setFileId(?int $fileId): void { $this->fileId = $fileId; } - function getStatus() { + function getStatus(): ?int { return $this->status; } - function setStatus($status) { + function setStatus(?int $status): void { $this->status = $status; } diff --git a/src/dba/models/FileDownloadFactory.class.php b/src/dba/models/FileDownloadFactory.class.php index ac076a61b..86b1cf503 100644 --- a/src/dba/models/FileDownloadFactory.class.php +++ b/src/dba/models/FileDownloadFactory.class.php @@ -3,28 +3,27 @@ namespace DBA; class FileDownloadFactory extends AbstractModelFactory { - function getModelName() { + function getModelName(): string { return "FileDownload"; } - function getModelTable() { + function getModelTable(): string { return "FileDownload"; } - function isCachable() { + function isCachable(): bool { return false; } - function getCacheValidTime() { + function getCacheValidTime(): int { return -1; } /** * @return FileDownload */ - function getNullObject() { - $o = new FileDownload(-1, null, null, null); - return $o; + function getNullObject(): FileDownload { + return new FileDownload(-1, null, null, null); } /** @@ -32,9 +31,8 @@ function getNullObject() { * @param array $dict * @return FileDownload */ - function createObjectFromDict($pk, $dict) { - $o = new FileDownload($dict['fileDownloadId'], $dict['time'], $dict['fileId'], $dict['status']); - return $o; + function createObjectFromDict($pk, $dict): FileDownload { + return new FileDownload($dict['fileDownloadId'], $dict['time'], $dict['fileId'], $dict['status']); } /** @@ -66,9 +64,9 @@ function filter($options, $single = false) { /** * @param string $pk - * @return FileDownload + * @return ?FileDownload */ - function get($pk) { + function get($pk): ?FileDownload { return Util::cast(parent::get($pk), FileDownload::class); } @@ -76,7 +74,7 @@ function get($pk) { * @param FileDownload $model * @return FileDownload */ - function save($model) { + function save($model): FileDownload { return Util::cast(parent::save($model), FileDownload::class); } } \ No newline at end of file diff --git a/src/dba/models/FileFactory.class.php b/src/dba/models/FileFactory.class.php index 6db9bf31b..b24486e33 100644 --- a/src/dba/models/FileFactory.class.php +++ b/src/dba/models/FileFactory.class.php @@ -3,28 +3,27 @@ namespace DBA; class FileFactory extends AbstractModelFactory { - function getModelName() { + function getModelName(): string { return "File"; } - function getModelTable() { + function getModelTable(): string { return "File"; } - function isCachable() { + function isCachable(): bool { return false; } - function getCacheValidTime() { + function getCacheValidTime(): int { return -1; } /** * @return File */ - function getNullObject() { - $o = new File(-1, null, null, null, null, null, null); - return $o; + function getNullObject(): File { + return new File(-1, null, null, null, null, null, null); } /** @@ -32,9 +31,8 @@ function getNullObject() { * @param array $dict * @return File */ - function createObjectFromDict($pk, $dict) { - $o = new File($dict['fileId'], $dict['filename'], $dict['size'], $dict['isSecret'], $dict['fileType'], $dict['accessGroupId'], $dict['lineCount']); - return $o; + function createObjectFromDict($pk, $dict): File { + return new File($dict['fileId'], $dict['filename'], $dict['size'], $dict['isSecret'], $dict['fileType'], $dict['accessGroupId'], $dict['lineCount']); } /** @@ -66,9 +64,9 @@ function filter($options, $single = false) { /** * @param string $pk - * @return File + * @return ?File */ - function get($pk) { + function get($pk): ?File { return Util::cast(parent::get($pk), File::class); } @@ -76,7 +74,7 @@ function get($pk) { * @param File $model * @return File */ - function save($model) { + function save($model): File { return Util::cast(parent::save($model), File::class); } } \ No newline at end of file diff --git a/src/dba/models/FilePretask.class.php b/src/dba/models/FilePretask.class.php index d77358c1c..97af21b7a 100644 --- a/src/dba/models/FilePretask.class.php +++ b/src/dba/models/FilePretask.class.php @@ -3,17 +3,17 @@ namespace DBA; class FilePretask extends AbstractModel { - private $filePretaskId; - private $fileId; - private $pretaskId; + private ?int $filePretaskId; + private ?int $fileId; + private ?int $pretaskId; - function __construct($filePretaskId, $fileId, $pretaskId) { + function __construct(?int $filePretaskId, ?int $fileId, ?int $pretaskId) { $this->filePretaskId = $filePretaskId; $this->fileId = $fileId; $this->pretaskId = $pretaskId; } - function getKeyValueDict() { + function getKeyValueDict(): array { $dict = array(); $dict['filePretaskId'] = $this->filePretaskId; $dict['fileId'] = $this->fileId; @@ -22,7 +22,7 @@ function getKeyValueDict() { return $dict; } - static function getFeatures() { + static function getFeatures(): array { $dict = array(); $dict['filePretaskId'] = ['read_only' => True, "type" => "int", "subtype" => "unset", "choices" => "unset", "null" => False, "pk" => True, "protected" => True, "private" => False, "alias" => "filePretaskId", "public" => False]; $dict['fileId'] = ['read_only' => True, "type" => "int", "subtype" => "unset", "choices" => "unset", "null" => False, "pk" => False, "protected" => False, "private" => False, "alias" => "fileId", "public" => False]; @@ -31,19 +31,19 @@ static function getFeatures() { return $dict; } - function getPrimaryKey() { + function getPrimaryKey(): string { return "filePretaskId"; } - function getPrimaryKeyValue() { + function getPrimaryKeyValue(): ?int { return $this->filePretaskId; } - function getId() { + function getId(): ?int { return $this->filePretaskId; } - function setId($id) { + function setId($id): void { $this->filePretaskId = $id; } @@ -51,23 +51,23 @@ function setId($id) { * Used to serialize the data contained in the model * @return array */ - public function expose() { + public function expose(): array { return get_object_vars($this); } - function getFileId() { + function getFileId(): ?int { return $this->fileId; } - function setFileId($fileId) { + function setFileId(?int $fileId): void { $this->fileId = $fileId; } - function getPretaskId() { + function getPretaskId(): ?int { return $this->pretaskId; } - function setPretaskId($pretaskId) { + function setPretaskId(?int $pretaskId): void { $this->pretaskId = $pretaskId; } diff --git a/src/dba/models/FilePretaskFactory.class.php b/src/dba/models/FilePretaskFactory.class.php index 06a0b02ac..0f201531f 100644 --- a/src/dba/models/FilePretaskFactory.class.php +++ b/src/dba/models/FilePretaskFactory.class.php @@ -3,28 +3,27 @@ namespace DBA; class FilePretaskFactory extends AbstractModelFactory { - function getModelName() { + function getModelName(): string { return "FilePretask"; } - function getModelTable() { + function getModelTable(): string { return "FilePretask"; } - function isCachable() { + function isCachable(): bool { return false; } - function getCacheValidTime() { + function getCacheValidTime(): int { return -1; } /** * @return FilePretask */ - function getNullObject() { - $o = new FilePretask(-1, null, null); - return $o; + function getNullObject(): FilePretask { + return new FilePretask(-1, null, null); } /** @@ -32,9 +31,8 @@ function getNullObject() { * @param array $dict * @return FilePretask */ - function createObjectFromDict($pk, $dict) { - $o = new FilePretask($dict['filePretaskId'], $dict['fileId'], $dict['pretaskId']); - return $o; + function createObjectFromDict($pk, $dict): FilePretask { + return new FilePretask($dict['filePretaskId'], $dict['fileId'], $dict['pretaskId']); } /** @@ -66,9 +64,9 @@ function filter($options, $single = false) { /** * @param string $pk - * @return FilePretask + * @return ?FilePretask */ - function get($pk) { + function get($pk): ?FilePretask { return Util::cast(parent::get($pk), FilePretask::class); } @@ -76,7 +74,7 @@ function get($pk) { * @param FilePretask $model * @return FilePretask */ - function save($model) { + function save($model): FilePretask { return Util::cast(parent::save($model), FilePretask::class); } } \ No newline at end of file diff --git a/src/dba/models/FileTask.class.php b/src/dba/models/FileTask.class.php index 9c52eb34d..5507fad3d 100644 --- a/src/dba/models/FileTask.class.php +++ b/src/dba/models/FileTask.class.php @@ -3,17 +3,17 @@ namespace DBA; class FileTask extends AbstractModel { - private $fileTaskId; - private $fileId; - private $taskId; + private ?int $fileTaskId; + private ?int $fileId; + private ?int $taskId; - function __construct($fileTaskId, $fileId, $taskId) { + function __construct(?int $fileTaskId, ?int $fileId, ?int $taskId) { $this->fileTaskId = $fileTaskId; $this->fileId = $fileId; $this->taskId = $taskId; } - function getKeyValueDict() { + function getKeyValueDict(): array { $dict = array(); $dict['fileTaskId'] = $this->fileTaskId; $dict['fileId'] = $this->fileId; @@ -22,7 +22,7 @@ function getKeyValueDict() { return $dict; } - static function getFeatures() { + static function getFeatures(): array { $dict = array(); $dict['fileTaskId'] = ['read_only' => True, "type" => "int", "subtype" => "unset", "choices" => "unset", "null" => False, "pk" => True, "protected" => True, "private" => False, "alias" => "fileTaskId", "public" => False]; $dict['fileId'] = ['read_only' => True, "type" => "int", "subtype" => "unset", "choices" => "unset", "null" => False, "pk" => False, "protected" => False, "private" => False, "alias" => "fileId", "public" => False]; @@ -31,19 +31,19 @@ static function getFeatures() { return $dict; } - function getPrimaryKey() { + function getPrimaryKey(): string { return "fileTaskId"; } - function getPrimaryKeyValue() { + function getPrimaryKeyValue(): ?int { return $this->fileTaskId; } - function getId() { + function getId(): ?int { return $this->fileTaskId; } - function setId($id) { + function setId($id): void { $this->fileTaskId = $id; } @@ -51,23 +51,23 @@ function setId($id) { * Used to serialize the data contained in the model * @return array */ - public function expose() { + public function expose(): array { return get_object_vars($this); } - function getFileId() { + function getFileId(): ?int { return $this->fileId; } - function setFileId($fileId) { + function setFileId(?int $fileId): void { $this->fileId = $fileId; } - function getTaskId() { + function getTaskId(): ?int { return $this->taskId; } - function setTaskId($taskId) { + function setTaskId(?int $taskId): void { $this->taskId = $taskId; } diff --git a/src/dba/models/FileTaskFactory.class.php b/src/dba/models/FileTaskFactory.class.php index a1b3f0d11..65b12d772 100644 --- a/src/dba/models/FileTaskFactory.class.php +++ b/src/dba/models/FileTaskFactory.class.php @@ -3,28 +3,27 @@ namespace DBA; class FileTaskFactory extends AbstractModelFactory { - function getModelName() { + function getModelName(): string { return "FileTask"; } - function getModelTable() { + function getModelTable(): string { return "FileTask"; } - function isCachable() { + function isCachable(): bool { return false; } - function getCacheValidTime() { + function getCacheValidTime(): int { return -1; } /** * @return FileTask */ - function getNullObject() { - $o = new FileTask(-1, null, null); - return $o; + function getNullObject(): FileTask { + return new FileTask(-1, null, null); } /** @@ -32,9 +31,8 @@ function getNullObject() { * @param array $dict * @return FileTask */ - function createObjectFromDict($pk, $dict) { - $o = new FileTask($dict['fileTaskId'], $dict['fileId'], $dict['taskId']); - return $o; + function createObjectFromDict($pk, $dict): FileTask { + return new FileTask($dict['fileTaskId'], $dict['fileId'], $dict['taskId']); } /** @@ -66,9 +64,9 @@ function filter($options, $single = false) { /** * @param string $pk - * @return FileTask + * @return ?FileTask */ - function get($pk) { + function get($pk): ?FileTask { return Util::cast(parent::get($pk), FileTask::class); } @@ -76,7 +74,7 @@ function get($pk) { * @param FileTask $model * @return FileTask */ - function save($model) { + function save($model): FileTask { return Util::cast(parent::save($model), FileTask::class); } } \ No newline at end of file diff --git a/src/dba/models/Hash.class.php b/src/dba/models/Hash.class.php index 8d63e5340..5c966112c 100644 --- a/src/dba/models/Hash.class.php +++ b/src/dba/models/Hash.class.php @@ -3,17 +3,17 @@ namespace DBA; class Hash extends AbstractModel { - private $hashId; - private $hashlistId; - private $hash; - private $salt; - private $plaintext; - private $timeCracked; - private $chunkId; - private $isCracked; - private $crackPos; - - function __construct($hashId, $hashlistId, $hash, $salt, $plaintext, $timeCracked, $chunkId, $isCracked, $crackPos) { + private ?int $hashId; + private ?int $hashlistId; + private ?string $hash; + private ?string $salt; + private ?string $plaintext; + private ?int $timeCracked; + private ?int $chunkId; + private ?int $isCracked; + private ?int $crackPos; + + function __construct(?int $hashId, ?int $hashlistId, ?string $hash, ?string $salt, ?string $plaintext, ?int $timeCracked, ?int $chunkId, ?int $isCracked, ?int $crackPos) { $this->hashId = $hashId; $this->hashlistId = $hashlistId; $this->hash = $hash; @@ -25,7 +25,7 @@ function __construct($hashId, $hashlistId, $hash, $salt, $plaintext, $timeCracke $this->crackPos = $crackPos; } - function getKeyValueDict() { + function getKeyValueDict(): array { $dict = array(); $dict['hashId'] = $this->hashId; $dict['hashlistId'] = $this->hashlistId; @@ -40,7 +40,7 @@ function getKeyValueDict() { return $dict; } - static function getFeatures() { + static function getFeatures(): array { $dict = array(); $dict['hashId'] = ['read_only' => True, "type" => "int", "subtype" => "unset", "choices" => "unset", "null" => False, "pk" => True, "protected" => True, "private" => False, "alias" => "hashId", "public" => False]; $dict['hashlistId'] = ['read_only' => True, "type" => "int", "subtype" => "unset", "choices" => "unset", "null" => False, "pk" => False, "protected" => False, "private" => False, "alias" => "hashlistId", "public" => False]; @@ -55,19 +55,19 @@ static function getFeatures() { return $dict; } - function getPrimaryKey() { + function getPrimaryKey(): string { return "hashId"; } - function getPrimaryKeyValue() { + function getPrimaryKeyValue(): ?int { return $this->hashId; } - function getId() { + function getId(): ?int { return $this->hashId; } - function setId($id) { + function setId($id): void { $this->hashId = $id; } @@ -75,71 +75,71 @@ function setId($id) { * Used to serialize the data contained in the model * @return array */ - public function expose() { + public function expose(): array { return get_object_vars($this); } - function getHashlistId() { + function getHashlistId(): ?int { return $this->hashlistId; } - function setHashlistId($hashlistId) { + function setHashlistId(?int $hashlistId): void { $this->hashlistId = $hashlistId; } - function getHash() { + function getHash(): ?string { return $this->hash; } - function setHash($hash) { + function setHash(?string $hash): void { $this->hash = $hash; } - function getSalt() { + function getSalt(): ?string { return $this->salt; } - function setSalt($salt) { + function setSalt(?string $salt): void { $this->salt = $salt; } - function getPlaintext() { + function getPlaintext(): ?string { return $this->plaintext; } - function setPlaintext($plaintext) { + function setPlaintext(?string $plaintext): void { $this->plaintext = $plaintext; } - function getTimeCracked() { + function getTimeCracked(): ?int { return $this->timeCracked; } - function setTimeCracked($timeCracked) { + function setTimeCracked(?int $timeCracked): void { $this->timeCracked = $timeCracked; } - function getChunkId() { + function getChunkId(): ?int { return $this->chunkId; } - function setChunkId($chunkId) { + function setChunkId(?int $chunkId): void { $this->chunkId = $chunkId; } - function getIsCracked() { + function getIsCracked(): ?int { return $this->isCracked; } - function setIsCracked($isCracked) { + function setIsCracked(?int $isCracked): void { $this->isCracked = $isCracked; } - function getCrackPos() { + function getCrackPos(): ?int { return $this->crackPos; } - function setCrackPos($crackPos) { + function setCrackPos(?int $crackPos): void { $this->crackPos = $crackPos; } diff --git a/src/dba/models/HashBinary.class.php b/src/dba/models/HashBinary.class.php index bf2679049..3eeebd6a1 100644 --- a/src/dba/models/HashBinary.class.php +++ b/src/dba/models/HashBinary.class.php @@ -3,17 +3,17 @@ namespace DBA; class HashBinary extends AbstractModel { - private $hashBinaryId; - private $hashlistId; - private $essid; - private $hash; - private $plaintext; - private $timeCracked; - private $chunkId; - private $isCracked; - private $crackPos; - - function __construct($hashBinaryId, $hashlistId, $essid, $hash, $plaintext, $timeCracked, $chunkId, $isCracked, $crackPos) { + private ?int $hashBinaryId; + private ?int $hashlistId; + private ?string $essid; + private ?string $hash; + private ?string $plaintext; + private ?int $timeCracked; + private ?int $chunkId; + private ?int $isCracked; + private ?int $crackPos; + + function __construct(?int $hashBinaryId, ?int $hashlistId, ?string $essid, ?string $hash, ?string $plaintext, ?int $timeCracked, ?int $chunkId, ?int $isCracked, ?int $crackPos) { $this->hashBinaryId = $hashBinaryId; $this->hashlistId = $hashlistId; $this->essid = $essid; @@ -25,7 +25,7 @@ function __construct($hashBinaryId, $hashlistId, $essid, $hash, $plaintext, $tim $this->crackPos = $crackPos; } - function getKeyValueDict() { + function getKeyValueDict(): array { $dict = array(); $dict['hashBinaryId'] = $this->hashBinaryId; $dict['hashlistId'] = $this->hashlistId; @@ -40,7 +40,7 @@ function getKeyValueDict() { return $dict; } - static function getFeatures() { + static function getFeatures(): array { $dict = array(); $dict['hashBinaryId'] = ['read_only' => True, "type" => "int", "subtype" => "unset", "choices" => "unset", "null" => False, "pk" => True, "protected" => True, "private" => False, "alias" => "hashBinaryId", "public" => False]; $dict['hashlistId'] = ['read_only' => True, "type" => "int", "subtype" => "unset", "choices" => "unset", "null" => False, "pk" => False, "protected" => False, "private" => False, "alias" => "hashlistId", "public" => False]; @@ -55,19 +55,19 @@ static function getFeatures() { return $dict; } - function getPrimaryKey() { + function getPrimaryKey(): string { return "hashBinaryId"; } - function getPrimaryKeyValue() { + function getPrimaryKeyValue(): ?int { return $this->hashBinaryId; } - function getId() { + function getId(): ?int { return $this->hashBinaryId; } - function setId($id) { + function setId($id): void { $this->hashBinaryId = $id; } @@ -75,71 +75,71 @@ function setId($id) { * Used to serialize the data contained in the model * @return array */ - public function expose() { + public function expose(): array { return get_object_vars($this); } - function getHashlistId() { + function getHashlistId(): ?int { return $this->hashlistId; } - function setHashlistId($hashlistId) { + function setHashlistId(?int $hashlistId): void { $this->hashlistId = $hashlistId; } - function getEssid() { + function getEssid(): ?string { return $this->essid; } - function setEssid($essid) { + function setEssid(?string $essid): void { $this->essid = $essid; } - function getHash() { + function getHash(): ?string { return $this->hash; } - function setHash($hash) { + function setHash(?string $hash): void { $this->hash = $hash; } - function getPlaintext() { + function getPlaintext(): ?string { return $this->plaintext; } - function setPlaintext($plaintext) { + function setPlaintext(?string $plaintext): void { $this->plaintext = $plaintext; } - function getTimeCracked() { + function getTimeCracked(): ?int { return $this->timeCracked; } - function setTimeCracked($timeCracked) { + function setTimeCracked(?int $timeCracked): void { $this->timeCracked = $timeCracked; } - function getChunkId() { + function getChunkId(): ?int { return $this->chunkId; } - function setChunkId($chunkId) { + function setChunkId(?int $chunkId): void { $this->chunkId = $chunkId; } - function getIsCracked() { + function getIsCracked(): ?int { return $this->isCracked; } - function setIsCracked($isCracked) { + function setIsCracked(?int $isCracked): void { $this->isCracked = $isCracked; } - function getCrackPos() { + function getCrackPos(): ?int { return $this->crackPos; } - function setCrackPos($crackPos) { + function setCrackPos(?int $crackPos): void { $this->crackPos = $crackPos; } diff --git a/src/dba/models/HashBinaryFactory.class.php b/src/dba/models/HashBinaryFactory.class.php index a7929f131..736273be7 100644 --- a/src/dba/models/HashBinaryFactory.class.php +++ b/src/dba/models/HashBinaryFactory.class.php @@ -3,28 +3,27 @@ namespace DBA; class HashBinaryFactory extends AbstractModelFactory { - function getModelName() { + function getModelName(): string { return "HashBinary"; } - function getModelTable() { + function getModelTable(): string { return "HashBinary"; } - function isCachable() { + function isCachable(): bool { return false; } - function getCacheValidTime() { + function getCacheValidTime(): int { return -1; } /** * @return HashBinary */ - function getNullObject() { - $o = new HashBinary(-1, null, null, null, null, null, null, null, null); - return $o; + function getNullObject(): HashBinary { + return new HashBinary(-1, null, null, null, null, null, null, null, null); } /** @@ -32,9 +31,8 @@ function getNullObject() { * @param array $dict * @return HashBinary */ - function createObjectFromDict($pk, $dict) { - $o = new HashBinary($dict['hashBinaryId'], $dict['hashlistId'], $dict['essid'], $dict['hash'], $dict['plaintext'], $dict['timeCracked'], $dict['chunkId'], $dict['isCracked'], $dict['crackPos']); - return $o; + function createObjectFromDict($pk, $dict): HashBinary { + return new HashBinary($dict['hashBinaryId'], $dict['hashlistId'], $dict['essid'], $dict['hash'], $dict['plaintext'], $dict['timeCracked'], $dict['chunkId'], $dict['isCracked'], $dict['crackPos']); } /** @@ -66,9 +64,9 @@ function filter($options, $single = false) { /** * @param string $pk - * @return HashBinary + * @return ?HashBinary */ - function get($pk) { + function get($pk): ?HashBinary { return Util::cast(parent::get($pk), HashBinary::class); } @@ -76,7 +74,7 @@ function get($pk) { * @param HashBinary $model * @return HashBinary */ - function save($model) { + function save($model): HashBinary { return Util::cast(parent::save($model), HashBinary::class); } } \ No newline at end of file diff --git a/src/dba/models/HashFactory.class.php b/src/dba/models/HashFactory.class.php index fd301ed0d..a5ac288dd 100644 --- a/src/dba/models/HashFactory.class.php +++ b/src/dba/models/HashFactory.class.php @@ -3,28 +3,27 @@ namespace DBA; class HashFactory extends AbstractModelFactory { - function getModelName() { + function getModelName(): string { return "Hash"; } - function getModelTable() { + function getModelTable(): string { return "Hash"; } - function isCachable() { + function isCachable(): bool { return false; } - function getCacheValidTime() { + function getCacheValidTime(): int { return -1; } /** * @return Hash */ - function getNullObject() { - $o = new Hash(-1, null, null, null, null, null, null, null, null); - return $o; + function getNullObject(): Hash { + return new Hash(-1, null, null, null, null, null, null, null, null); } /** @@ -32,9 +31,8 @@ function getNullObject() { * @param array $dict * @return Hash */ - function createObjectFromDict($pk, $dict) { - $o = new Hash($dict['hashId'], $dict['hashlistId'], $dict['hash'], $dict['salt'], $dict['plaintext'], $dict['timeCracked'], $dict['chunkId'], $dict['isCracked'], $dict['crackPos']); - return $o; + function createObjectFromDict($pk, $dict): Hash { + return new Hash($dict['hashId'], $dict['hashlistId'], $dict['hash'], $dict['salt'], $dict['plaintext'], $dict['timeCracked'], $dict['chunkId'], $dict['isCracked'], $dict['crackPos']); } /** @@ -66,9 +64,9 @@ function filter($options, $single = false) { /** * @param string $pk - * @return Hash + * @return ?Hash */ - function get($pk) { + function get($pk): ?Hash { return Util::cast(parent::get($pk), Hash::class); } @@ -76,7 +74,7 @@ function get($pk) { * @param Hash $model * @return Hash */ - function save($model) { + function save($model): Hash { return Util::cast(parent::save($model), Hash::class); } } \ No newline at end of file diff --git a/src/dba/models/HashType.class.php b/src/dba/models/HashType.class.php index ca9b4b8a7..0391543fc 100644 --- a/src/dba/models/HashType.class.php +++ b/src/dba/models/HashType.class.php @@ -3,19 +3,19 @@ namespace DBA; class HashType extends AbstractModel { - private $hashTypeId; - private $description; - private $isSalted; - private $isSlowHash; + private ?int $hashTypeId; + private ?string $description; + private ?int $isSalted; + private ?int $isSlowHash; - function __construct($hashTypeId, $description, $isSalted, $isSlowHash) { + function __construct(?int $hashTypeId, ?string $description, ?int $isSalted, ?int $isSlowHash) { $this->hashTypeId = $hashTypeId; $this->description = $description; $this->isSalted = $isSalted; $this->isSlowHash = $isSlowHash; } - function getKeyValueDict() { + function getKeyValueDict(): array { $dict = array(); $dict['hashTypeId'] = $this->hashTypeId; $dict['description'] = $this->description; @@ -25,7 +25,7 @@ function getKeyValueDict() { return $dict; } - static function getFeatures() { + static function getFeatures(): array { $dict = array(); $dict['hashTypeId'] = ['read_only' => True, "type" => "int", "subtype" => "unset", "choices" => "unset", "null" => False, "pk" => True, "protected" => False, "private" => False, "alias" => "hashTypeId", "public" => False]; $dict['description'] = ['read_only' => False, "type" => "str(256)", "subtype" => "unset", "choices" => "unset", "null" => False, "pk" => False, "protected" => False, "private" => False, "alias" => "description", "public" => False]; @@ -35,19 +35,19 @@ static function getFeatures() { return $dict; } - function getPrimaryKey() { + function getPrimaryKey(): string { return "hashTypeId"; } - function getPrimaryKeyValue() { + function getPrimaryKeyValue(): ?int { return $this->hashTypeId; } - function getId() { + function getId(): ?int { return $this->hashTypeId; } - function setId($id) { + function setId($id): void { $this->hashTypeId = $id; } @@ -55,31 +55,31 @@ function setId($id) { * Used to serialize the data contained in the model * @return array */ - public function expose() { + public function expose(): array { return get_object_vars($this); } - function getDescription() { + function getDescription(): ?string { return $this->description; } - function setDescription($description) { + function setDescription(?string $description): void { $this->description = $description; } - function getIsSalted() { + function getIsSalted(): ?int { return $this->isSalted; } - function setIsSalted($isSalted) { + function setIsSalted(?int $isSalted): void { $this->isSalted = $isSalted; } - function getIsSlowHash() { + function getIsSlowHash(): ?int { return $this->isSlowHash; } - function setIsSlowHash($isSlowHash) { + function setIsSlowHash(?int $isSlowHash): void { $this->isSlowHash = $isSlowHash; } diff --git a/src/dba/models/HashTypeFactory.class.php b/src/dba/models/HashTypeFactory.class.php index e4a26762a..689ca6791 100644 --- a/src/dba/models/HashTypeFactory.class.php +++ b/src/dba/models/HashTypeFactory.class.php @@ -3,28 +3,27 @@ namespace DBA; class HashTypeFactory extends AbstractModelFactory { - function getModelName() { + function getModelName(): string { return "HashType"; } - function getModelTable() { + function getModelTable(): string { return "HashType"; } - function isCachable() { + function isCachable(): bool { return false; } - function getCacheValidTime() { + function getCacheValidTime(): int { return -1; } /** * @return HashType */ - function getNullObject() { - $o = new HashType(-1, null, null, null); - return $o; + function getNullObject(): HashType { + return new HashType(-1, null, null, null); } /** @@ -32,9 +31,8 @@ function getNullObject() { * @param array $dict * @return HashType */ - function createObjectFromDict($pk, $dict) { - $o = new HashType($dict['hashTypeId'], $dict['description'], $dict['isSalted'], $dict['isSlowHash']); - return $o; + function createObjectFromDict($pk, $dict): HashType { + return new HashType($dict['hashTypeId'], $dict['description'], $dict['isSalted'], $dict['isSlowHash']); } /** @@ -66,9 +64,9 @@ function filter($options, $single = false) { /** * @param string $pk - * @return HashType + * @return ?HashType */ - function get($pk) { + function get($pk): ?HashType { return Util::cast(parent::get($pk), HashType::class); } @@ -76,7 +74,7 @@ function get($pk) { * @param HashType $model * @return HashType */ - function save($model) { + function save($model): HashType { return Util::cast(parent::save($model), HashType::class); } } \ No newline at end of file diff --git a/src/dba/models/Hashlist.class.php b/src/dba/models/Hashlist.class.php index 2108816ee..aa5a9940b 100644 --- a/src/dba/models/Hashlist.class.php +++ b/src/dba/models/Hashlist.class.php @@ -3,23 +3,23 @@ namespace DBA; class Hashlist extends AbstractModel { - private $hashlistId; - private $hashlistName; - private $format; - private $hashTypeId; - private $hashCount; - private $saltSeparator; - private $cracked; - private $isSecret; - private $hexSalt; - private $isSalted; - private $accessGroupId; - private $notes; - private $brainId; - private $brainFeatures; - private $isArchived; - - function __construct($hashlistId, $hashlistName, $format, $hashTypeId, $hashCount, $saltSeparator, $cracked, $isSecret, $hexSalt, $isSalted, $accessGroupId, $notes, $brainId, $brainFeatures, $isArchived) { + private ?int $hashlistId; + private ?string $hashlistName; + private ?int $format; + private ?int $hashTypeId; + private ?int $hashCount; + private ?string $saltSeparator; + private ?int $cracked; + private ?int $isSecret; + private ?int $hexSalt; + private ?int $isSalted; + private ?int $accessGroupId; + private ?string $notes; + private ?int $brainId; + private ?int $brainFeatures; + private ?int $isArchived; + + function __construct(?int $hashlistId, ?string $hashlistName, ?int $format, ?int $hashTypeId, ?int $hashCount, ?string $saltSeparator, ?int $cracked, ?int $isSecret, ?int $hexSalt, ?int $isSalted, ?int $accessGroupId, ?string $notes, ?int $brainId, ?int $brainFeatures, ?int $isArchived) { $this->hashlistId = $hashlistId; $this->hashlistName = $hashlistName; $this->format = $format; @@ -37,7 +37,7 @@ function __construct($hashlistId, $hashlistName, $format, $hashTypeId, $hashCoun $this->isArchived = $isArchived; } - function getKeyValueDict() { + function getKeyValueDict(): array { $dict = array(); $dict['hashlistId'] = $this->hashlistId; $dict['hashlistName'] = $this->hashlistName; @@ -58,7 +58,7 @@ function getKeyValueDict() { return $dict; } - static function getFeatures() { + static function getFeatures(): array { $dict = array(); $dict['hashlistId'] = ['read_only' => True, "type" => "int", "subtype" => "unset", "choices" => "unset", "null" => False, "pk" => True, "protected" => True, "private" => False, "alias" => "hashlistId", "public" => False]; $dict['hashlistName'] = ['read_only' => False, "type" => "str(100)", "subtype" => "unset", "choices" => "unset", "null" => False, "pk" => False, "protected" => False, "private" => False, "alias" => "name", "public" => False]; @@ -79,19 +79,19 @@ static function getFeatures() { return $dict; } - function getPrimaryKey() { + function getPrimaryKey(): string { return "hashlistId"; } - function getPrimaryKeyValue() { + function getPrimaryKeyValue(): ?int { return $this->hashlistId; } - function getId() { + function getId(): ?int { return $this->hashlistId; } - function setId($id) { + function setId($id): void { $this->hashlistId = $id; } @@ -99,119 +99,119 @@ function setId($id) { * Used to serialize the data contained in the model * @return array */ - public function expose() { + public function expose(): array { return get_object_vars($this); } - function getHashlistName() { + function getHashlistName(): ?string { return $this->hashlistName; } - function setHashlistName($hashlistName) { + function setHashlistName(?string $hashlistName): void { $this->hashlistName = $hashlistName; } - function getFormat() { + function getFormat(): ?int { return $this->format; } - function setFormat($format) { + function setFormat(?int $format): void { $this->format = $format; } - function getHashTypeId() { + function getHashTypeId(): ?int { return $this->hashTypeId; } - function setHashTypeId($hashTypeId) { + function setHashTypeId(?int $hashTypeId): void { $this->hashTypeId = $hashTypeId; } - function getHashCount() { + function getHashCount(): ?int { return $this->hashCount; } - function setHashCount($hashCount) { + function setHashCount(?int $hashCount): void { $this->hashCount = $hashCount; } - function getSaltSeparator() { + function getSaltSeparator(): ?string { return $this->saltSeparator; } - function setSaltSeparator($saltSeparator) { + function setSaltSeparator(?string $saltSeparator): void { $this->saltSeparator = $saltSeparator; } - function getCracked() { + function getCracked(): ?int { return $this->cracked; } - function setCracked($cracked) { + function setCracked(?int $cracked): void { $this->cracked = $cracked; } - function getIsSecret() { + function getIsSecret(): ?int { return $this->isSecret; } - function setIsSecret($isSecret) { + function setIsSecret(?int $isSecret): void { $this->isSecret = $isSecret; } - function getHexSalt() { + function getHexSalt(): ?int { return $this->hexSalt; } - function setHexSalt($hexSalt) { + function setHexSalt(?int $hexSalt): void { $this->hexSalt = $hexSalt; } - function getIsSalted() { + function getIsSalted(): ?int { return $this->isSalted; } - function setIsSalted($isSalted) { + function setIsSalted(?int $isSalted): void { $this->isSalted = $isSalted; } - function getAccessGroupId() { + function getAccessGroupId(): ?int { return $this->accessGroupId; } - function setAccessGroupId($accessGroupId) { + function setAccessGroupId(?int $accessGroupId): void { $this->accessGroupId = $accessGroupId; } - function getNotes() { + function getNotes(): ?string { return $this->notes; } - function setNotes($notes) { + function setNotes(?string $notes): void { $this->notes = $notes; } - function getBrainId() { + function getBrainId(): ?int { return $this->brainId; } - function setBrainId($brainId) { + function setBrainId(?int $brainId): void { $this->brainId = $brainId; } - function getBrainFeatures() { + function getBrainFeatures(): ?int { return $this->brainFeatures; } - function setBrainFeatures($brainFeatures) { + function setBrainFeatures(?int $brainFeatures): void { $this->brainFeatures = $brainFeatures; } - function getIsArchived() { + function getIsArchived(): ?int { return $this->isArchived; } - function setIsArchived($isArchived) { + function setIsArchived(?int $isArchived): void { $this->isArchived = $isArchived; } diff --git a/src/dba/models/HashlistFactory.class.php b/src/dba/models/HashlistFactory.class.php index 7d1033bb6..42ab7a250 100644 --- a/src/dba/models/HashlistFactory.class.php +++ b/src/dba/models/HashlistFactory.class.php @@ -3,28 +3,27 @@ namespace DBA; class HashlistFactory extends AbstractModelFactory { - function getModelName() { + function getModelName(): string { return "Hashlist"; } - function getModelTable() { + function getModelTable(): string { return "Hashlist"; } - function isCachable() { + function isCachable(): bool { return false; } - function getCacheValidTime() { + function getCacheValidTime(): int { return -1; } /** * @return Hashlist */ - function getNullObject() { - $o = new Hashlist(-1, null, null, null, null, null, null, null, null, null, null, null, null, null, null); - return $o; + function getNullObject(): Hashlist { + return new Hashlist(-1, null, null, null, null, null, null, null, null, null, null, null, null, null, null); } /** @@ -32,9 +31,8 @@ function getNullObject() { * @param array $dict * @return Hashlist */ - function createObjectFromDict($pk, $dict) { - $o = new Hashlist($dict['hashlistId'], $dict['hashlistName'], $dict['format'], $dict['hashTypeId'], $dict['hashCount'], $dict['saltSeparator'], $dict['cracked'], $dict['isSecret'], $dict['hexSalt'], $dict['isSalted'], $dict['accessGroupId'], $dict['notes'], $dict['brainId'], $dict['brainFeatures'], $dict['isArchived']); - return $o; + function createObjectFromDict($pk, $dict): Hashlist { + return new Hashlist($dict['hashlistId'], $dict['hashlistName'], $dict['format'], $dict['hashTypeId'], $dict['hashCount'], $dict['saltSeparator'], $dict['cracked'], $dict['isSecret'], $dict['hexSalt'], $dict['isSalted'], $dict['accessGroupId'], $dict['notes'], $dict['brainId'], $dict['brainFeatures'], $dict['isArchived']); } /** @@ -66,9 +64,9 @@ function filter($options, $single = false) { /** * @param string $pk - * @return Hashlist + * @return ?Hashlist */ - function get($pk) { + function get($pk): ?Hashlist { return Util::cast(parent::get($pk), Hashlist::class); } @@ -76,7 +74,7 @@ function get($pk) { * @param Hashlist $model * @return Hashlist */ - function save($model) { + function save($model): Hashlist { return Util::cast(parent::save($model), Hashlist::class); } } \ No newline at end of file diff --git a/src/dba/models/HashlistHashlist.class.php b/src/dba/models/HashlistHashlist.class.php index e09214bb4..08824b7c9 100644 --- a/src/dba/models/HashlistHashlist.class.php +++ b/src/dba/models/HashlistHashlist.class.php @@ -3,17 +3,17 @@ namespace DBA; class HashlistHashlist extends AbstractModel { - private $hashlistHashlistId; - private $parentHashlistId; - private $hashlistId; + private ?int $hashlistHashlistId; + private ?int $parentHashlistId; + private ?int $hashlistId; - function __construct($hashlistHashlistId, $parentHashlistId, $hashlistId) { + function __construct(?int $hashlistHashlistId, ?int $parentHashlistId, ?int $hashlistId) { $this->hashlistHashlistId = $hashlistHashlistId; $this->parentHashlistId = $parentHashlistId; $this->hashlistId = $hashlistId; } - function getKeyValueDict() { + function getKeyValueDict(): array { $dict = array(); $dict['hashlistHashlistId'] = $this->hashlistHashlistId; $dict['parentHashlistId'] = $this->parentHashlistId; @@ -22,7 +22,7 @@ function getKeyValueDict() { return $dict; } - static function getFeatures() { + static function getFeatures(): array { $dict = array(); $dict['hashlistHashlistId'] = ['read_only' => True, "type" => "int", "subtype" => "unset", "choices" => "unset", "null" => False, "pk" => True, "protected" => True, "private" => False, "alias" => "hashlistHashlistId", "public" => False]; $dict['parentHashlistId'] = ['read_only' => True, "type" => "int", "subtype" => "unset", "choices" => "unset", "null" => False, "pk" => False, "protected" => False, "private" => False, "alias" => "parentHashlistId", "public" => False]; @@ -31,19 +31,19 @@ static function getFeatures() { return $dict; } - function getPrimaryKey() { + function getPrimaryKey(): string { return "hashlistHashlistId"; } - function getPrimaryKeyValue() { + function getPrimaryKeyValue(): ?int { return $this->hashlistHashlistId; } - function getId() { + function getId(): ?int { return $this->hashlistHashlistId; } - function setId($id) { + function setId($id): void { $this->hashlistHashlistId = $id; } @@ -51,23 +51,23 @@ function setId($id) { * Used to serialize the data contained in the model * @return array */ - public function expose() { + public function expose(): array { return get_object_vars($this); } - function getParentHashlistId() { + function getParentHashlistId(): ?int { return $this->parentHashlistId; } - function setParentHashlistId($parentHashlistId) { + function setParentHashlistId(?int $parentHashlistId): void { $this->parentHashlistId = $parentHashlistId; } - function getHashlistId() { + function getHashlistId(): ?int { return $this->hashlistId; } - function setHashlistId($hashlistId) { + function setHashlistId(?int $hashlistId): void { $this->hashlistId = $hashlistId; } diff --git a/src/dba/models/HashlistHashlistFactory.class.php b/src/dba/models/HashlistHashlistFactory.class.php index c8236e142..4fcba249f 100644 --- a/src/dba/models/HashlistHashlistFactory.class.php +++ b/src/dba/models/HashlistHashlistFactory.class.php @@ -3,28 +3,27 @@ namespace DBA; class HashlistHashlistFactory extends AbstractModelFactory { - function getModelName() { + function getModelName(): string { return "HashlistHashlist"; } - function getModelTable() { + function getModelTable(): string { return "HashlistHashlist"; } - function isCachable() { + function isCachable(): bool { return false; } - function getCacheValidTime() { + function getCacheValidTime(): int { return -1; } /** * @return HashlistHashlist */ - function getNullObject() { - $o = new HashlistHashlist(-1, null, null); - return $o; + function getNullObject(): HashlistHashlist { + return new HashlistHashlist(-1, null, null); } /** @@ -32,9 +31,8 @@ function getNullObject() { * @param array $dict * @return HashlistHashlist */ - function createObjectFromDict($pk, $dict) { - $o = new HashlistHashlist($dict['hashlistHashlistId'], $dict['parentHashlistId'], $dict['hashlistId']); - return $o; + function createObjectFromDict($pk, $dict): HashlistHashlist { + return new HashlistHashlist($dict['hashlistHashlistId'], $dict['parentHashlistId'], $dict['hashlistId']); } /** @@ -66,9 +64,9 @@ function filter($options, $single = false) { /** * @param string $pk - * @return HashlistHashlist + * @return ?HashlistHashlist */ - function get($pk) { + function get($pk): ?HashlistHashlist { return Util::cast(parent::get($pk), HashlistHashlist::class); } @@ -76,7 +74,7 @@ function get($pk) { * @param HashlistHashlist $model * @return HashlistHashlist */ - function save($model) { + function save($model): HashlistHashlist { return Util::cast(parent::save($model), HashlistHashlist::class); } } \ No newline at end of file diff --git a/src/dba/models/HealthCheck.class.php b/src/dba/models/HealthCheck.class.php index 8e762aff0..b1f555976 100644 --- a/src/dba/models/HealthCheck.class.php +++ b/src/dba/models/HealthCheck.class.php @@ -3,16 +3,16 @@ namespace DBA; class HealthCheck extends AbstractModel { - private $healthCheckId; - private $time; - private $status; - private $checkType; - private $hashtypeId; - private $crackerBinaryId; - private $expectedCracks; - private $attackCmd; - - function __construct($healthCheckId, $time, $status, $checkType, $hashtypeId, $crackerBinaryId, $expectedCracks, $attackCmd) { + private ?int $healthCheckId; + private ?int $time; + private ?int $status; + private ?int $checkType; + private ?int $hashtypeId; + private ?int $crackerBinaryId; + private ?int $expectedCracks; + private ?string $attackCmd; + + function __construct(?int $healthCheckId, ?int $time, ?int $status, ?int $checkType, ?int $hashtypeId, ?int $crackerBinaryId, ?int $expectedCracks, ?string $attackCmd) { $this->healthCheckId = $healthCheckId; $this->time = $time; $this->status = $status; @@ -23,7 +23,7 @@ function __construct($healthCheckId, $time, $status, $checkType, $hashtypeId, $c $this->attackCmd = $attackCmd; } - function getKeyValueDict() { + function getKeyValueDict(): array { $dict = array(); $dict['healthCheckId'] = $this->healthCheckId; $dict['time'] = $this->time; @@ -37,7 +37,7 @@ function getKeyValueDict() { return $dict; } - static function getFeatures() { + static function getFeatures(): array { $dict = array(); $dict['healthCheckId'] = ['read_only' => True, "type" => "int", "subtype" => "unset", "choices" => "unset", "null" => False, "pk" => True, "protected" => True, "private" => False, "alias" => "healthCheckId", "public" => False]; $dict['time'] = ['read_only' => True, "type" => "int64", "subtype" => "unset", "choices" => "unset", "null" => False, "pk" => False, "protected" => True, "private" => False, "alias" => "time", "public" => False]; @@ -51,19 +51,19 @@ static function getFeatures() { return $dict; } - function getPrimaryKey() { + function getPrimaryKey(): string { return "healthCheckId"; } - function getPrimaryKeyValue() { + function getPrimaryKeyValue(): ?int { return $this->healthCheckId; } - function getId() { + function getId(): ?int { return $this->healthCheckId; } - function setId($id) { + function setId($id): void { $this->healthCheckId = $id; } @@ -71,63 +71,63 @@ function setId($id) { * Used to serialize the data contained in the model * @return array */ - public function expose() { + public function expose(): array { return get_object_vars($this); } - function getTime() { + function getTime(): ?int { return $this->time; } - function setTime($time) { + function setTime(?int $time): void { $this->time = $time; } - function getStatus() { + function getStatus(): ?int { return $this->status; } - function setStatus($status) { + function setStatus(?int $status): void { $this->status = $status; } - function getCheckType() { + function getCheckType(): ?int { return $this->checkType; } - function setCheckType($checkType) { + function setCheckType(?int $checkType): void { $this->checkType = $checkType; } - function getHashtypeId() { + function getHashtypeId(): ?int { return $this->hashtypeId; } - function setHashtypeId($hashtypeId) { + function setHashtypeId(?int $hashtypeId): void { $this->hashtypeId = $hashtypeId; } - function getCrackerBinaryId() { + function getCrackerBinaryId(): ?int { return $this->crackerBinaryId; } - function setCrackerBinaryId($crackerBinaryId) { + function setCrackerBinaryId(?int $crackerBinaryId): void { $this->crackerBinaryId = $crackerBinaryId; } - function getExpectedCracks() { + function getExpectedCracks(): ?int { return $this->expectedCracks; } - function setExpectedCracks($expectedCracks) { + function setExpectedCracks(?int $expectedCracks): void { $this->expectedCracks = $expectedCracks; } - function getAttackCmd() { + function getAttackCmd(): ?string { return $this->attackCmd; } - function setAttackCmd($attackCmd) { + function setAttackCmd(?string $attackCmd): void { $this->attackCmd = $attackCmd; } diff --git a/src/dba/models/HealthCheckAgent.class.php b/src/dba/models/HealthCheckAgent.class.php index 302175767..3f60d8c8b 100644 --- a/src/dba/models/HealthCheckAgent.class.php +++ b/src/dba/models/HealthCheckAgent.class.php @@ -3,17 +3,17 @@ namespace DBA; class HealthCheckAgent extends AbstractModel { - private $healthCheckAgentId; - private $healthCheckId; - private $agentId; - private $status; - private $cracked; - private $numGpus; - private $start; - private $end; - private $errors; - - function __construct($healthCheckAgentId, $healthCheckId, $agentId, $status, $cracked, $numGpus, $start, $end, $errors) { + private ?int $healthCheckAgentId; + private ?int $healthCheckId; + private ?int $agentId; + private ?int $status; + private ?int $cracked; + private ?int $numGpus; + private ?int $start; + private ?int $end; + private ?string $errors; + + function __construct(?int $healthCheckAgentId, ?int $healthCheckId, ?int $agentId, ?int $status, ?int $cracked, ?int $numGpus, ?int $start, ?int $end, ?string $errors) { $this->healthCheckAgentId = $healthCheckAgentId; $this->healthCheckId = $healthCheckId; $this->agentId = $agentId; @@ -25,7 +25,7 @@ function __construct($healthCheckAgentId, $healthCheckId, $agentId, $status, $cr $this->errors = $errors; } - function getKeyValueDict() { + function getKeyValueDict(): array { $dict = array(); $dict['healthCheckAgentId'] = $this->healthCheckAgentId; $dict['healthCheckId'] = $this->healthCheckId; @@ -40,7 +40,7 @@ function getKeyValueDict() { return $dict; } - static function getFeatures() { + static function getFeatures(): array { $dict = array(); $dict['healthCheckAgentId'] = ['read_only' => True, "type" => "int", "subtype" => "unset", "choices" => "unset", "null" => False, "pk" => True, "protected" => True, "private" => False, "alias" => "healthCheckAgentId", "public" => False]; $dict['healthCheckId'] = ['read_only' => True, "type" => "int", "subtype" => "unset", "choices" => "unset", "null" => False, "pk" => False, "protected" => True, "private" => False, "alias" => "healthCheckId", "public" => False]; @@ -55,19 +55,19 @@ static function getFeatures() { return $dict; } - function getPrimaryKey() { + function getPrimaryKey(): string { return "healthCheckAgentId"; } - function getPrimaryKeyValue() { + function getPrimaryKeyValue(): ?int { return $this->healthCheckAgentId; } - function getId() { + function getId(): ?int { return $this->healthCheckAgentId; } - function setId($id) { + function setId($id): void { $this->healthCheckAgentId = $id; } @@ -75,71 +75,71 @@ function setId($id) { * Used to serialize the data contained in the model * @return array */ - public function expose() { + public function expose(): array { return get_object_vars($this); } - function getHealthCheckId() { + function getHealthCheckId(): ?int { return $this->healthCheckId; } - function setHealthCheckId($healthCheckId) { + function setHealthCheckId(?int $healthCheckId): void { $this->healthCheckId = $healthCheckId; } - function getAgentId() { + function getAgentId(): ?int { return $this->agentId; } - function setAgentId($agentId) { + function setAgentId(?int $agentId): void { $this->agentId = $agentId; } - function getStatus() { + function getStatus(): ?int { return $this->status; } - function setStatus($status) { + function setStatus(?int $status): void { $this->status = $status; } - function getCracked() { + function getCracked(): ?int { return $this->cracked; } - function setCracked($cracked) { + function setCracked(?int $cracked): void { $this->cracked = $cracked; } - function getNumGpus() { + function getNumGpus(): ?int { return $this->numGpus; } - function setNumGpus($numGpus) { + function setNumGpus(?int $numGpus): void { $this->numGpus = $numGpus; } - function getStart() { + function getStart(): ?int { return $this->start; } - function setStart($start) { + function setStart(?int $start): void { $this->start = $start; } - function getEnd() { + function getEnd(): ?int { return $this->end; } - function setEnd($end) { + function setEnd(?int $end): void { $this->end = $end; } - function getErrors() { + function getErrors(): ?string { return $this->errors; } - function setErrors($errors) { + function setErrors(?string $errors): void { $this->errors = $errors; } diff --git a/src/dba/models/HealthCheckAgentFactory.class.php b/src/dba/models/HealthCheckAgentFactory.class.php index da517bc96..f7fd56465 100644 --- a/src/dba/models/HealthCheckAgentFactory.class.php +++ b/src/dba/models/HealthCheckAgentFactory.class.php @@ -3,28 +3,27 @@ namespace DBA; class HealthCheckAgentFactory extends AbstractModelFactory { - function getModelName() { + function getModelName(): string { return "HealthCheckAgent"; } - function getModelTable() { + function getModelTable(): string { return "HealthCheckAgent"; } - function isCachable() { + function isCachable(): bool { return false; } - function getCacheValidTime() { + function getCacheValidTime(): int { return -1; } /** * @return HealthCheckAgent */ - function getNullObject() { - $o = new HealthCheckAgent(-1, null, null, null, null, null, null, null, null); - return $o; + function getNullObject(): HealthCheckAgent { + return new HealthCheckAgent(-1, null, null, null, null, null, null, null, null); } /** @@ -32,9 +31,8 @@ function getNullObject() { * @param array $dict * @return HealthCheckAgent */ - function createObjectFromDict($pk, $dict) { - $o = new HealthCheckAgent($dict['healthCheckAgentId'], $dict['healthCheckId'], $dict['agentId'], $dict['status'], $dict['cracked'], $dict['numGpus'], $dict['start'], $dict['end'], $dict['errors']); - return $o; + function createObjectFromDict($pk, $dict): HealthCheckAgent { + return new HealthCheckAgent($dict['healthCheckAgentId'], $dict['healthCheckId'], $dict['agentId'], $dict['status'], $dict['cracked'], $dict['numGpus'], $dict['start'], $dict['end'], $dict['errors']); } /** @@ -66,9 +64,9 @@ function filter($options, $single = false) { /** * @param string $pk - * @return HealthCheckAgent + * @return ?HealthCheckAgent */ - function get($pk) { + function get($pk): ?HealthCheckAgent { return Util::cast(parent::get($pk), HealthCheckAgent::class); } @@ -76,7 +74,7 @@ function get($pk) { * @param HealthCheckAgent $model * @return HealthCheckAgent */ - function save($model) { + function save($model): HealthCheckAgent { return Util::cast(parent::save($model), HealthCheckAgent::class); } } \ No newline at end of file diff --git a/src/dba/models/HealthCheckFactory.class.php b/src/dba/models/HealthCheckFactory.class.php index b44b0ba8a..2921257f7 100644 --- a/src/dba/models/HealthCheckFactory.class.php +++ b/src/dba/models/HealthCheckFactory.class.php @@ -3,28 +3,27 @@ namespace DBA; class HealthCheckFactory extends AbstractModelFactory { - function getModelName() { + function getModelName(): string { return "HealthCheck"; } - function getModelTable() { + function getModelTable(): string { return "HealthCheck"; } - function isCachable() { + function isCachable(): bool { return false; } - function getCacheValidTime() { + function getCacheValidTime(): int { return -1; } /** * @return HealthCheck */ - function getNullObject() { - $o = new HealthCheck(-1, null, null, null, null, null, null, null); - return $o; + function getNullObject(): HealthCheck { + return new HealthCheck(-1, null, null, null, null, null, null, null); } /** @@ -32,9 +31,8 @@ function getNullObject() { * @param array $dict * @return HealthCheck */ - function createObjectFromDict($pk, $dict) { - $o = new HealthCheck($dict['healthCheckId'], $dict['time'], $dict['status'], $dict['checkType'], $dict['hashtypeId'], $dict['crackerBinaryId'], $dict['expectedCracks'], $dict['attackCmd']); - return $o; + function createObjectFromDict($pk, $dict): HealthCheck { + return new HealthCheck($dict['healthCheckId'], $dict['time'], $dict['status'], $dict['checkType'], $dict['hashtypeId'], $dict['crackerBinaryId'], $dict['expectedCracks'], $dict['attackCmd']); } /** @@ -66,9 +64,9 @@ function filter($options, $single = false) { /** * @param string $pk - * @return HealthCheck + * @return ?HealthCheck */ - function get($pk) { + function get($pk): ?HealthCheck { return Util::cast(parent::get($pk), HealthCheck::class); } @@ -76,7 +74,7 @@ function get($pk) { * @param HealthCheck $model * @return HealthCheck */ - function save($model) { + function save($model): HealthCheck { return Util::cast(parent::save($model), HealthCheck::class); } } \ No newline at end of file diff --git a/src/dba/models/LogEntry.class.php b/src/dba/models/LogEntry.class.php index d7db60c11..9e3c1ca5b 100644 --- a/src/dba/models/LogEntry.class.php +++ b/src/dba/models/LogEntry.class.php @@ -3,14 +3,14 @@ namespace DBA; class LogEntry extends AbstractModel { - private $logEntryId; - private $issuer; - private $issuerId; - private $level; - private $message; - private $time; - - function __construct($logEntryId, $issuer, $issuerId, $level, $message, $time) { + private ?int $logEntryId; + private ?string $issuer; + private ?string $issuerId; + private ?string $level; + private ?string $message; + private ?int $time; + + function __construct(?int $logEntryId, ?string $issuer, ?string $issuerId, ?string $level, ?string $message, ?int $time) { $this->logEntryId = $logEntryId; $this->issuer = $issuer; $this->issuerId = $issuerId; @@ -19,7 +19,7 @@ function __construct($logEntryId, $issuer, $issuerId, $level, $message, $time) { $this->time = $time; } - function getKeyValueDict() { + function getKeyValueDict(): array { $dict = array(); $dict['logEntryId'] = $this->logEntryId; $dict['issuer'] = $this->issuer; @@ -31,7 +31,7 @@ function getKeyValueDict() { return $dict; } - static function getFeatures() { + static function getFeatures(): array { $dict = array(); $dict['logEntryId'] = ['read_only' => True, "type" => "int", "subtype" => "unset", "choices" => "unset", "null" => False, "pk" => True, "protected" => True, "private" => False, "alias" => "logEntryId", "public" => False]; $dict['issuer'] = ['read_only' => True, "type" => "str(50)", "subtype" => "unset", "choices" => "unset", "null" => False, "pk" => False, "protected" => True, "private" => False, "alias" => "issuer", "public" => False]; @@ -43,19 +43,19 @@ static function getFeatures() { return $dict; } - function getPrimaryKey() { + function getPrimaryKey(): string { return "logEntryId"; } - function getPrimaryKeyValue() { + function getPrimaryKeyValue(): ?int { return $this->logEntryId; } - function getId() { + function getId(): ?int { return $this->logEntryId; } - function setId($id) { + function setId($id): void { $this->logEntryId = $id; } @@ -63,47 +63,47 @@ function setId($id) { * Used to serialize the data contained in the model * @return array */ - public function expose() { + public function expose(): array { return get_object_vars($this); } - function getIssuer() { + function getIssuer(): ?string { return $this->issuer; } - function setIssuer($issuer) { + function setIssuer(?string $issuer): void { $this->issuer = $issuer; } - function getIssuerId() { + function getIssuerId(): ?string { return $this->issuerId; } - function setIssuerId($issuerId) { + function setIssuerId(?string $issuerId): void { $this->issuerId = $issuerId; } - function getLevel() { + function getLevel(): ?string { return $this->level; } - function setLevel($level) { + function setLevel(?string $level): void { $this->level = $level; } - function getMessage() { + function getMessage(): ?string { return $this->message; } - function setMessage($message) { + function setMessage(?string $message): void { $this->message = $message; } - function getTime() { + function getTime(): ?int { return $this->time; } - function setTime($time) { + function setTime(?int $time): void { $this->time = $time; } diff --git a/src/dba/models/LogEntryFactory.class.php b/src/dba/models/LogEntryFactory.class.php index a32464f65..d63898c05 100644 --- a/src/dba/models/LogEntryFactory.class.php +++ b/src/dba/models/LogEntryFactory.class.php @@ -3,28 +3,27 @@ namespace DBA; class LogEntryFactory extends AbstractModelFactory { - function getModelName() { + function getModelName(): string { return "LogEntry"; } - function getModelTable() { + function getModelTable(): string { return "LogEntry"; } - function isCachable() { + function isCachable(): bool { return false; } - function getCacheValidTime() { + function getCacheValidTime(): int { return -1; } /** * @return LogEntry */ - function getNullObject() { - $o = new LogEntry(-1, null, null, null, null, null); - return $o; + function getNullObject(): LogEntry { + return new LogEntry(-1, null, null, null, null, null); } /** @@ -32,9 +31,8 @@ function getNullObject() { * @param array $dict * @return LogEntry */ - function createObjectFromDict($pk, $dict) { - $o = new LogEntry($dict['logEntryId'], $dict['issuer'], $dict['issuerId'], $dict['level'], $dict['message'], $dict['time']); - return $o; + function createObjectFromDict($pk, $dict): LogEntry { + return new LogEntry($dict['logEntryId'], $dict['issuer'], $dict['issuerId'], $dict['level'], $dict['message'], $dict['time']); } /** @@ -66,9 +64,9 @@ function filter($options, $single = false) { /** * @param string $pk - * @return LogEntry + * @return ?LogEntry */ - function get($pk) { + function get($pk): ?LogEntry { return Util::cast(parent::get($pk), LogEntry::class); } @@ -76,7 +74,7 @@ function get($pk) { * @param LogEntry $model * @return LogEntry */ - function save($model) { + function save($model): LogEntry { return Util::cast(parent::save($model), LogEntry::class); } } \ No newline at end of file diff --git a/src/dba/models/NotificationSetting.class.php b/src/dba/models/NotificationSetting.class.php index 39ae29d5a..527728b5a 100644 --- a/src/dba/models/NotificationSetting.class.php +++ b/src/dba/models/NotificationSetting.class.php @@ -3,15 +3,15 @@ namespace DBA; class NotificationSetting extends AbstractModel { - private $notificationSettingId; - private $action; - private $objectId; - private $notification; - private $userId; - private $receiver; - private $isActive; - - function __construct($notificationSettingId, $action, $objectId, $notification, $userId, $receiver, $isActive) { + private ?int $notificationSettingId; + private ?string $action; + private ?int $objectId; + private ?string $notification; + private ?int $userId; + private ?string $receiver; + private ?int $isActive; + + function __construct(?int $notificationSettingId, ?string $action, ?int $objectId, ?string $notification, ?int $userId, ?string $receiver, ?int $isActive) { $this->notificationSettingId = $notificationSettingId; $this->action = $action; $this->objectId = $objectId; @@ -21,7 +21,7 @@ function __construct($notificationSettingId, $action, $objectId, $notification, $this->isActive = $isActive; } - function getKeyValueDict() { + function getKeyValueDict(): array { $dict = array(); $dict['notificationSettingId'] = $this->notificationSettingId; $dict['action'] = $this->action; @@ -34,7 +34,7 @@ function getKeyValueDict() { return $dict; } - static function getFeatures() { + static function getFeatures(): array { $dict = array(); $dict['notificationSettingId'] = ['read_only' => True, "type" => "int", "subtype" => "unset", "choices" => "unset", "null" => False, "pk" => True, "protected" => True, "private" => False, "alias" => "notificationSettingId", "public" => False]; $dict['action'] = ['read_only' => False, "type" => "str(50)", "subtype" => "unset", "choices" => "unset", "null" => False, "pk" => False, "protected" => False, "private" => False, "alias" => "action", "public" => False]; @@ -47,19 +47,19 @@ static function getFeatures() { return $dict; } - function getPrimaryKey() { + function getPrimaryKey(): string { return "notificationSettingId"; } - function getPrimaryKeyValue() { + function getPrimaryKeyValue(): ?int { return $this->notificationSettingId; } - function getId() { + function getId(): ?int { return $this->notificationSettingId; } - function setId($id) { + function setId($id): void { $this->notificationSettingId = $id; } @@ -67,55 +67,55 @@ function setId($id) { * Used to serialize the data contained in the model * @return array */ - public function expose() { + public function expose(): array { return get_object_vars($this); } - function getAction() { + function getAction(): ?string { return $this->action; } - function setAction($action) { + function setAction(?string $action): void { $this->action = $action; } - function getObjectId() { + function getObjectId(): ?int { return $this->objectId; } - function setObjectId($objectId) { + function setObjectId(?int $objectId): void { $this->objectId = $objectId; } - function getNotification() { + function getNotification(): ?string { return $this->notification; } - function setNotification($notification) { + function setNotification(?string $notification): void { $this->notification = $notification; } - function getUserId() { + function getUserId(): ?int { return $this->userId; } - function setUserId($userId) { + function setUserId(?int $userId): void { $this->userId = $userId; } - function getReceiver() { + function getReceiver(): ?string { return $this->receiver; } - function setReceiver($receiver) { + function setReceiver(?string $receiver): void { $this->receiver = $receiver; } - function getIsActive() { + function getIsActive(): ?int { return $this->isActive; } - function setIsActive($isActive) { + function setIsActive(?int $isActive): void { $this->isActive = $isActive; } diff --git a/src/dba/models/NotificationSettingFactory.class.php b/src/dba/models/NotificationSettingFactory.class.php index 9607fc1ae..acf982ced 100644 --- a/src/dba/models/NotificationSettingFactory.class.php +++ b/src/dba/models/NotificationSettingFactory.class.php @@ -3,28 +3,27 @@ namespace DBA; class NotificationSettingFactory extends AbstractModelFactory { - function getModelName() { + function getModelName(): string { return "NotificationSetting"; } - function getModelTable() { + function getModelTable(): string { return "NotificationSetting"; } - function isCachable() { + function isCachable(): bool { return false; } - function getCacheValidTime() { + function getCacheValidTime(): int { return -1; } /** * @return NotificationSetting */ - function getNullObject() { - $o = new NotificationSetting(-1, null, null, null, null, null, null); - return $o; + function getNullObject(): NotificationSetting { + return new NotificationSetting(-1, null, null, null, null, null, null); } /** @@ -32,9 +31,8 @@ function getNullObject() { * @param array $dict * @return NotificationSetting */ - function createObjectFromDict($pk, $dict) { - $o = new NotificationSetting($dict['notificationSettingId'], $dict['action'], $dict['objectId'], $dict['notification'], $dict['userId'], $dict['receiver'], $dict['isActive']); - return $o; + function createObjectFromDict($pk, $dict): NotificationSetting { + return new NotificationSetting($dict['notificationSettingId'], $dict['action'], $dict['objectId'], $dict['notification'], $dict['userId'], $dict['receiver'], $dict['isActive']); } /** @@ -66,9 +64,9 @@ function filter($options, $single = false) { /** * @param string $pk - * @return NotificationSetting + * @return ?NotificationSetting */ - function get($pk) { + function get($pk): ?NotificationSetting { return Util::cast(parent::get($pk), NotificationSetting::class); } @@ -76,7 +74,7 @@ function get($pk) { * @param NotificationSetting $model * @return NotificationSetting */ - function save($model) { + function save($model): NotificationSetting { return Util::cast(parent::save($model), NotificationSetting::class); } } \ No newline at end of file diff --git a/src/dba/models/Preprocessor.class.php b/src/dba/models/Preprocessor.class.php index 5aae0685e..d690a8154 100644 --- a/src/dba/models/Preprocessor.class.php +++ b/src/dba/models/Preprocessor.class.php @@ -3,15 +3,15 @@ namespace DBA; class Preprocessor extends AbstractModel { - private $preprocessorId; - private $name; - private $url; - private $binaryName; - private $keyspaceCommand; - private $skipCommand; - private $limitCommand; - - function __construct($preprocessorId, $name, $url, $binaryName, $keyspaceCommand, $skipCommand, $limitCommand) { + private ?int $preprocessorId; + private ?string $name; + private ?string $url; + private ?string $binaryName; + private ?string $keyspaceCommand; + private ?string $skipCommand; + private ?string $limitCommand; + + function __construct(?int $preprocessorId, ?string $name, ?string $url, ?string $binaryName, ?string $keyspaceCommand, ?string $skipCommand, ?string $limitCommand) { $this->preprocessorId = $preprocessorId; $this->name = $name; $this->url = $url; @@ -21,7 +21,7 @@ function __construct($preprocessorId, $name, $url, $binaryName, $keyspaceCommand $this->limitCommand = $limitCommand; } - function getKeyValueDict() { + function getKeyValueDict(): array { $dict = array(); $dict['preprocessorId'] = $this->preprocessorId; $dict['name'] = $this->name; @@ -34,7 +34,7 @@ function getKeyValueDict() { return $dict; } - static function getFeatures() { + static function getFeatures(): array { $dict = array(); $dict['preprocessorId'] = ['read_only' => True, "type" => "int", "subtype" => "unset", "choices" => "unset", "null" => False, "pk" => True, "protected" => True, "private" => False, "alias" => "preprocessorId", "public" => False]; $dict['name'] = ['read_only' => False, "type" => "str(256)", "subtype" => "unset", "choices" => "unset", "null" => False, "pk" => False, "protected" => False, "private" => False, "alias" => "name", "public" => False]; @@ -47,19 +47,19 @@ static function getFeatures() { return $dict; } - function getPrimaryKey() { + function getPrimaryKey(): string { return "preprocessorId"; } - function getPrimaryKeyValue() { + function getPrimaryKeyValue(): ?int { return $this->preprocessorId; } - function getId() { + function getId(): ?int { return $this->preprocessorId; } - function setId($id) { + function setId($id): void { $this->preprocessorId = $id; } @@ -67,55 +67,55 @@ function setId($id) { * Used to serialize the data contained in the model * @return array */ - public function expose() { + public function expose(): array { return get_object_vars($this); } - function getName() { + function getName(): ?string { return $this->name; } - function setName($name) { + function setName(?string $name): void { $this->name = $name; } - function getUrl() { + function getUrl(): ?string { return $this->url; } - function setUrl($url) { + function setUrl(?string $url): void { $this->url = $url; } - function getBinaryName() { + function getBinaryName(): ?string { return $this->binaryName; } - function setBinaryName($binaryName) { + function setBinaryName(?string $binaryName): void { $this->binaryName = $binaryName; } - function getKeyspaceCommand() { + function getKeyspaceCommand(): ?string { return $this->keyspaceCommand; } - function setKeyspaceCommand($keyspaceCommand) { + function setKeyspaceCommand(?string $keyspaceCommand): void { $this->keyspaceCommand = $keyspaceCommand; } - function getSkipCommand() { + function getSkipCommand(): ?string { return $this->skipCommand; } - function setSkipCommand($skipCommand) { + function setSkipCommand(?string $skipCommand): void { $this->skipCommand = $skipCommand; } - function getLimitCommand() { + function getLimitCommand(): ?string { return $this->limitCommand; } - function setLimitCommand($limitCommand) { + function setLimitCommand(?string $limitCommand): void { $this->limitCommand = $limitCommand; } diff --git a/src/dba/models/PreprocessorFactory.class.php b/src/dba/models/PreprocessorFactory.class.php index 14ee7bd88..9897181d8 100644 --- a/src/dba/models/PreprocessorFactory.class.php +++ b/src/dba/models/PreprocessorFactory.class.php @@ -3,28 +3,27 @@ namespace DBA; class PreprocessorFactory extends AbstractModelFactory { - function getModelName() { + function getModelName(): string { return "Preprocessor"; } - function getModelTable() { + function getModelTable(): string { return "Preprocessor"; } - function isCachable() { + function isCachable(): bool { return false; } - function getCacheValidTime() { + function getCacheValidTime(): int { return -1; } /** * @return Preprocessor */ - function getNullObject() { - $o = new Preprocessor(-1, null, null, null, null, null, null); - return $o; + function getNullObject(): Preprocessor { + return new Preprocessor(-1, null, null, null, null, null, null); } /** @@ -32,9 +31,8 @@ function getNullObject() { * @param array $dict * @return Preprocessor */ - function createObjectFromDict($pk, $dict) { - $o = new Preprocessor($dict['preprocessorId'], $dict['name'], $dict['url'], $dict['binaryName'], $dict['keyspaceCommand'], $dict['skipCommand'], $dict['limitCommand']); - return $o; + function createObjectFromDict($pk, $dict): Preprocessor { + return new Preprocessor($dict['preprocessorId'], $dict['name'], $dict['url'], $dict['binaryName'], $dict['keyspaceCommand'], $dict['skipCommand'], $dict['limitCommand']); } /** @@ -66,9 +64,9 @@ function filter($options, $single = false) { /** * @param string $pk - * @return Preprocessor + * @return ?Preprocessor */ - function get($pk) { + function get($pk): ?Preprocessor { return Util::cast(parent::get($pk), Preprocessor::class); } @@ -76,7 +74,7 @@ function get($pk) { * @param Preprocessor $model * @return Preprocessor */ - function save($model) { + function save($model): Preprocessor { return Util::cast(parent::save($model), Preprocessor::class); } } \ No newline at end of file diff --git a/src/dba/models/Pretask.class.php b/src/dba/models/Pretask.class.php index 47795443e..1e5910ae3 100644 --- a/src/dba/models/Pretask.class.php +++ b/src/dba/models/Pretask.class.php @@ -3,21 +3,21 @@ namespace DBA; class Pretask extends AbstractModel { - private $pretaskId; - private $taskName; - private $attackCmd; - private $chunkTime; - private $statusTimer; - private $color; - private $isSmall; - private $isCpuTask; - private $useNewBench; - private $priority; - private $maxAgents; - private $isMaskImport; - private $crackerBinaryTypeId; - - function __construct($pretaskId, $taskName, $attackCmd, $chunkTime, $statusTimer, $color, $isSmall, $isCpuTask, $useNewBench, $priority, $maxAgents, $isMaskImport, $crackerBinaryTypeId) { + private ?int $pretaskId; + private ?string $taskName; + private ?string $attackCmd; + private ?int $chunkTime; + private ?int $statusTimer; + private ?string $color; + private ?int $isSmall; + private ?int $isCpuTask; + private ?int $useNewBench; + private ?int $priority; + private ?int $maxAgents; + private ?int $isMaskImport; + private ?int $crackerBinaryTypeId; + + function __construct(?int $pretaskId, ?string $taskName, ?string $attackCmd, ?int $chunkTime, ?int $statusTimer, ?string $color, ?int $isSmall, ?int $isCpuTask, ?int $useNewBench, ?int $priority, ?int $maxAgents, ?int $isMaskImport, ?int $crackerBinaryTypeId) { $this->pretaskId = $pretaskId; $this->taskName = $taskName; $this->attackCmd = $attackCmd; @@ -33,7 +33,7 @@ function __construct($pretaskId, $taskName, $attackCmd, $chunkTime, $statusTimer $this->crackerBinaryTypeId = $crackerBinaryTypeId; } - function getKeyValueDict() { + function getKeyValueDict(): array { $dict = array(); $dict['pretaskId'] = $this->pretaskId; $dict['taskName'] = $this->taskName; @@ -52,7 +52,7 @@ function getKeyValueDict() { return $dict; } - static function getFeatures() { + static function getFeatures(): array { $dict = array(); $dict['pretaskId'] = ['read_only' => True, "type" => "int", "subtype" => "unset", "choices" => "unset", "null" => False, "pk" => True, "protected" => True, "private" => False, "alias" => "pretaskId", "public" => False]; $dict['taskName'] = ['read_only' => False, "type" => "str(100)", "subtype" => "unset", "choices" => "unset", "null" => False, "pk" => False, "protected" => False, "private" => False, "alias" => "taskName", "public" => False]; @@ -71,19 +71,19 @@ static function getFeatures() { return $dict; } - function getPrimaryKey() { + function getPrimaryKey(): string { return "pretaskId"; } - function getPrimaryKeyValue() { + function getPrimaryKeyValue(): ?int { return $this->pretaskId; } - function getId() { + function getId(): ?int { return $this->pretaskId; } - function setId($id) { + function setId($id): void { $this->pretaskId = $id; } @@ -91,103 +91,103 @@ function setId($id) { * Used to serialize the data contained in the model * @return array */ - public function expose() { + public function expose(): array { return get_object_vars($this); } - function getTaskName() { + function getTaskName(): ?string { return $this->taskName; } - function setTaskName($taskName) { + function setTaskName(?string $taskName): void { $this->taskName = $taskName; } - function getAttackCmd() { + function getAttackCmd(): ?string { return $this->attackCmd; } - function setAttackCmd($attackCmd) { + function setAttackCmd(?string $attackCmd): void { $this->attackCmd = $attackCmd; } - function getChunkTime() { + function getChunkTime(): ?int { return $this->chunkTime; } - function setChunkTime($chunkTime) { + function setChunkTime(?int $chunkTime): void { $this->chunkTime = $chunkTime; } - function getStatusTimer() { + function getStatusTimer(): ?int { return $this->statusTimer; } - function setStatusTimer($statusTimer) { + function setStatusTimer(?int $statusTimer): void { $this->statusTimer = $statusTimer; } - function getColor() { + function getColor(): ?string { return $this->color; } - function setColor($color) { + function setColor(?string $color): void { $this->color = $color; } - function getIsSmall() { + function getIsSmall(): ?int { return $this->isSmall; } - function setIsSmall($isSmall) { + function setIsSmall(?int $isSmall): void { $this->isSmall = $isSmall; } - function getIsCpuTask() { + function getIsCpuTask(): ?int { return $this->isCpuTask; } - function setIsCpuTask($isCpuTask) { + function setIsCpuTask(?int $isCpuTask): void { $this->isCpuTask = $isCpuTask; } - function getUseNewBench() { + function getUseNewBench(): ?int { return $this->useNewBench; } - function setUseNewBench($useNewBench) { + function setUseNewBench(?int $useNewBench): void { $this->useNewBench = $useNewBench; } - function getPriority() { + function getPriority(): ?int { return $this->priority; } - function setPriority($priority) { + function setPriority(?int $priority): void { $this->priority = $priority; } - function getMaxAgents() { + function getMaxAgents(): ?int { return $this->maxAgents; } - function setMaxAgents($maxAgents) { + function setMaxAgents(?int $maxAgents): void { $this->maxAgents = $maxAgents; } - function getIsMaskImport() { + function getIsMaskImport(): ?int { return $this->isMaskImport; } - function setIsMaskImport($isMaskImport) { + function setIsMaskImport(?int $isMaskImport): void { $this->isMaskImport = $isMaskImport; } - function getCrackerBinaryTypeId() { + function getCrackerBinaryTypeId(): ?int { return $this->crackerBinaryTypeId; } - function setCrackerBinaryTypeId($crackerBinaryTypeId) { + function setCrackerBinaryTypeId(?int $crackerBinaryTypeId): void { $this->crackerBinaryTypeId = $crackerBinaryTypeId; } diff --git a/src/dba/models/PretaskFactory.class.php b/src/dba/models/PretaskFactory.class.php index 606a3be0f..1a39b350f 100644 --- a/src/dba/models/PretaskFactory.class.php +++ b/src/dba/models/PretaskFactory.class.php @@ -3,28 +3,27 @@ namespace DBA; class PretaskFactory extends AbstractModelFactory { - function getModelName() { + function getModelName(): string { return "Pretask"; } - function getModelTable() { + function getModelTable(): string { return "Pretask"; } - function isCachable() { + function isCachable(): bool { return false; } - function getCacheValidTime() { + function getCacheValidTime(): int { return -1; } /** * @return Pretask */ - function getNullObject() { - $o = new Pretask(-1, null, null, null, null, null, null, null, null, null, null, null, null); - return $o; + function getNullObject(): Pretask { + return new Pretask(-1, null, null, null, null, null, null, null, null, null, null, null, null); } /** @@ -32,9 +31,8 @@ function getNullObject() { * @param array $dict * @return Pretask */ - function createObjectFromDict($pk, $dict) { - $o = new Pretask($dict['pretaskId'], $dict['taskName'], $dict['attackCmd'], $dict['chunkTime'], $dict['statusTimer'], $dict['color'], $dict['isSmall'], $dict['isCpuTask'], $dict['useNewBench'], $dict['priority'], $dict['maxAgents'], $dict['isMaskImport'], $dict['crackerBinaryTypeId']); - return $o; + function createObjectFromDict($pk, $dict): Pretask { + return new Pretask($dict['pretaskId'], $dict['taskName'], $dict['attackCmd'], $dict['chunkTime'], $dict['statusTimer'], $dict['color'], $dict['isSmall'], $dict['isCpuTask'], $dict['useNewBench'], $dict['priority'], $dict['maxAgents'], $dict['isMaskImport'], $dict['crackerBinaryTypeId']); } /** @@ -66,9 +64,9 @@ function filter($options, $single = false) { /** * @param string $pk - * @return Pretask + * @return ?Pretask */ - function get($pk) { + function get($pk): ?Pretask { return Util::cast(parent::get($pk), Pretask::class); } @@ -76,7 +74,7 @@ function get($pk) { * @param Pretask $model * @return Pretask */ - function save($model) { + function save($model): Pretask { return Util::cast(parent::save($model), Pretask::class); } } \ No newline at end of file diff --git a/src/dba/models/RegVoucher.class.php b/src/dba/models/RegVoucher.class.php index a29ed903f..443a4221e 100644 --- a/src/dba/models/RegVoucher.class.php +++ b/src/dba/models/RegVoucher.class.php @@ -3,17 +3,17 @@ namespace DBA; class RegVoucher extends AbstractModel { - private $regVoucherId; - private $voucher; - private $time; + private ?int $regVoucherId; + private ?string $voucher; + private ?int $time; - function __construct($regVoucherId, $voucher, $time) { + function __construct(?int $regVoucherId, ?string $voucher, ?int $time) { $this->regVoucherId = $regVoucherId; $this->voucher = $voucher; $this->time = $time; } - function getKeyValueDict() { + function getKeyValueDict(): array { $dict = array(); $dict['regVoucherId'] = $this->regVoucherId; $dict['voucher'] = $this->voucher; @@ -22,7 +22,7 @@ function getKeyValueDict() { return $dict; } - static function getFeatures() { + static function getFeatures(): array { $dict = array(); $dict['regVoucherId'] = ['read_only' => True, "type" => "int", "subtype" => "unset", "choices" => "unset", "null" => False, "pk" => True, "protected" => True, "private" => False, "alias" => "regVoucherId", "public" => False]; $dict['voucher'] = ['read_only' => False, "type" => "str(100)", "subtype" => "unset", "choices" => "unset", "null" => False, "pk" => False, "protected" => False, "private" => False, "alias" => "voucher", "public" => False]; @@ -31,19 +31,19 @@ static function getFeatures() { return $dict; } - function getPrimaryKey() { + function getPrimaryKey(): string { return "regVoucherId"; } - function getPrimaryKeyValue() { + function getPrimaryKeyValue(): ?int { return $this->regVoucherId; } - function getId() { + function getId(): ?int { return $this->regVoucherId; } - function setId($id) { + function setId($id): void { $this->regVoucherId = $id; } @@ -51,23 +51,23 @@ function setId($id) { * Used to serialize the data contained in the model * @return array */ - public function expose() { + public function expose(): array { return get_object_vars($this); } - function getVoucher() { + function getVoucher(): ?string { return $this->voucher; } - function setVoucher($voucher) { + function setVoucher(?string $voucher): void { $this->voucher = $voucher; } - function getTime() { + function getTime(): ?int { return $this->time; } - function setTime($time) { + function setTime(?int $time): void { $this->time = $time; } diff --git a/src/dba/models/RegVoucherFactory.class.php b/src/dba/models/RegVoucherFactory.class.php index 9a78e1a4d..47a517a08 100644 --- a/src/dba/models/RegVoucherFactory.class.php +++ b/src/dba/models/RegVoucherFactory.class.php @@ -3,28 +3,27 @@ namespace DBA; class RegVoucherFactory extends AbstractModelFactory { - function getModelName() { + function getModelName(): string { return "RegVoucher"; } - function getModelTable() { + function getModelTable(): string { return "RegVoucher"; } - function isCachable() { + function isCachable(): bool { return false; } - function getCacheValidTime() { + function getCacheValidTime(): int { return -1; } /** * @return RegVoucher */ - function getNullObject() { - $o = new RegVoucher(-1, null, null); - return $o; + function getNullObject(): RegVoucher { + return new RegVoucher(-1, null, null); } /** @@ -32,9 +31,8 @@ function getNullObject() { * @param array $dict * @return RegVoucher */ - function createObjectFromDict($pk, $dict) { - $o = new RegVoucher($dict['regVoucherId'], $dict['voucher'], $dict['time']); - return $o; + function createObjectFromDict($pk, $dict): RegVoucher { + return new RegVoucher($dict['regVoucherId'], $dict['voucher'], $dict['time']); } /** @@ -66,9 +64,9 @@ function filter($options, $single = false) { /** * @param string $pk - * @return RegVoucher + * @return ?RegVoucher */ - function get($pk) { + function get($pk): ?RegVoucher { return Util::cast(parent::get($pk), RegVoucher::class); } @@ -76,7 +74,7 @@ function get($pk) { * @param RegVoucher $model * @return RegVoucher */ - function save($model) { + function save($model): RegVoucher { return Util::cast(parent::save($model), RegVoucher::class); } } \ No newline at end of file diff --git a/src/dba/models/RightGroup.class.php b/src/dba/models/RightGroup.class.php index 6bb6748c9..5599bd1e9 100644 --- a/src/dba/models/RightGroup.class.php +++ b/src/dba/models/RightGroup.class.php @@ -3,17 +3,17 @@ namespace DBA; class RightGroup extends AbstractModel { - private $rightGroupId; - private $groupName; - private $permissions; + private ?int $rightGroupId; + private ?string $groupName; + private ?string $permissions; - function __construct($rightGroupId, $groupName, $permissions) { + function __construct(?int $rightGroupId, ?string $groupName, ?string $permissions) { $this->rightGroupId = $rightGroupId; $this->groupName = $groupName; $this->permissions = $permissions; } - function getKeyValueDict() { + function getKeyValueDict(): array { $dict = array(); $dict['rightGroupId'] = $this->rightGroupId; $dict['groupName'] = $this->groupName; @@ -22,7 +22,7 @@ function getKeyValueDict() { return $dict; } - static function getFeatures() { + static function getFeatures(): array { $dict = array(); $dict['rightGroupId'] = ['read_only' => True, "type" => "int", "subtype" => "unset", "choices" => "unset", "null" => False, "pk" => True, "protected" => True, "private" => False, "alias" => "id", "public" => False]; $dict['groupName'] = ['read_only' => False, "type" => "str(50)", "subtype" => "unset", "choices" => "unset", "null" => False, "pk" => False, "protected" => False, "private" => False, "alias" => "name", "public" => False]; @@ -31,19 +31,19 @@ static function getFeatures() { return $dict; } - function getPrimaryKey() { + function getPrimaryKey(): string { return "rightGroupId"; } - function getPrimaryKeyValue() { + function getPrimaryKeyValue(): ?int { return $this->rightGroupId; } - function getId() { + function getId(): ?int { return $this->rightGroupId; } - function setId($id) { + function setId($id): void { $this->rightGroupId = $id; } @@ -51,23 +51,23 @@ function setId($id) { * Used to serialize the data contained in the model * @return array */ - public function expose() { + public function expose(): array { return get_object_vars($this); } - function getGroupName() { + function getGroupName(): ?string { return $this->groupName; } - function setGroupName($groupName) { + function setGroupName(?string $groupName): void { $this->groupName = $groupName; } - function getPermissions() { + function getPermissions(): ?string { return $this->permissions; } - function setPermissions($permissions) { + function setPermissions(?string $permissions): void { $this->permissions = $permissions; } diff --git a/src/dba/models/RightGroupFactory.class.php b/src/dba/models/RightGroupFactory.class.php index e105b7b8c..b0b93dd3a 100644 --- a/src/dba/models/RightGroupFactory.class.php +++ b/src/dba/models/RightGroupFactory.class.php @@ -3,28 +3,27 @@ namespace DBA; class RightGroupFactory extends AbstractModelFactory { - function getModelName() { + function getModelName(): string { return "RightGroup"; } - function getModelTable() { + function getModelTable(): string { return "RightGroup"; } - function isCachable() { + function isCachable(): bool { return false; } - function getCacheValidTime() { + function getCacheValidTime(): int { return -1; } /** * @return RightGroup */ - function getNullObject() { - $o = new RightGroup(-1, null, null); - return $o; + function getNullObject(): RightGroup { + return new RightGroup(-1, null, null); } /** @@ -32,9 +31,8 @@ function getNullObject() { * @param array $dict * @return RightGroup */ - function createObjectFromDict($pk, $dict) { - $o = new RightGroup($dict['rightGroupId'], $dict['groupName'], $dict['permissions']); - return $o; + function createObjectFromDict($pk, $dict): RightGroup { + return new RightGroup($dict['rightGroupId'], $dict['groupName'], $dict['permissions']); } /** @@ -66,9 +64,9 @@ function filter($options, $single = false) { /** * @param string $pk - * @return RightGroup + * @return ?RightGroup */ - function get($pk) { + function get($pk): ?RightGroup { return Util::cast(parent::get($pk), RightGroup::class); } @@ -76,7 +74,7 @@ function get($pk) { * @param RightGroup $model * @return RightGroup */ - function save($model) { + function save($model): RightGroup { return Util::cast(parent::save($model), RightGroup::class); } } \ No newline at end of file diff --git a/src/dba/models/Session.class.php b/src/dba/models/Session.class.php index a217d1ba2..374a93b51 100644 --- a/src/dba/models/Session.class.php +++ b/src/dba/models/Session.class.php @@ -3,15 +3,15 @@ namespace DBA; class Session extends AbstractModel { - private $sessionId; - private $userId; - private $sessionStartDate; - private $lastActionDate; - private $isOpen; - private $sessionLifetime; - private $sessionKey; - - function __construct($sessionId, $userId, $sessionStartDate, $lastActionDate, $isOpen, $sessionLifetime, $sessionKey) { + private ?int $sessionId; + private ?int $userId; + private ?int $sessionStartDate; + private ?int $lastActionDate; + private ?int $isOpen; + private ?int $sessionLifetime; + private ?string $sessionKey; + + function __construct(?int $sessionId, ?int $userId, ?int $sessionStartDate, ?int $lastActionDate, ?int $isOpen, ?int $sessionLifetime, ?string $sessionKey) { $this->sessionId = $sessionId; $this->userId = $userId; $this->sessionStartDate = $sessionStartDate; @@ -21,7 +21,7 @@ function __construct($sessionId, $userId, $sessionStartDate, $lastActionDate, $i $this->sessionKey = $sessionKey; } - function getKeyValueDict() { + function getKeyValueDict(): array { $dict = array(); $dict['sessionId'] = $this->sessionId; $dict['userId'] = $this->userId; @@ -34,7 +34,7 @@ function getKeyValueDict() { return $dict; } - static function getFeatures() { + static function getFeatures(): array { $dict = array(); $dict['sessionId'] = ['read_only' => True, "type" => "int", "subtype" => "unset", "choices" => "unset", "null" => False, "pk" => True, "protected" => True, "private" => False, "alias" => "sessionId", "public" => False]; $dict['userId'] = ['read_only' => True, "type" => "int", "subtype" => "unset", "choices" => "unset", "null" => False, "pk" => False, "protected" => True, "private" => False, "alias" => "userId", "public" => False]; @@ -47,19 +47,19 @@ static function getFeatures() { return $dict; } - function getPrimaryKey() { + function getPrimaryKey(): string { return "sessionId"; } - function getPrimaryKeyValue() { + function getPrimaryKeyValue(): ?int { return $this->sessionId; } - function getId() { + function getId(): ?int { return $this->sessionId; } - function setId($id) { + function setId($id): void { $this->sessionId = $id; } @@ -67,55 +67,55 @@ function setId($id) { * Used to serialize the data contained in the model * @return array */ - public function expose() { + public function expose(): array { return get_object_vars($this); } - function getUserId() { + function getUserId(): ?int { return $this->userId; } - function setUserId($userId) { + function setUserId(?int $userId): void { $this->userId = $userId; } - function getSessionStartDate() { + function getSessionStartDate(): ?int { return $this->sessionStartDate; } - function setSessionStartDate($sessionStartDate) { + function setSessionStartDate(?int $sessionStartDate): void { $this->sessionStartDate = $sessionStartDate; } - function getLastActionDate() { + function getLastActionDate(): ?int { return $this->lastActionDate; } - function setLastActionDate($lastActionDate) { + function setLastActionDate(?int $lastActionDate): void { $this->lastActionDate = $lastActionDate; } - function getIsOpen() { + function getIsOpen(): ?int { return $this->isOpen; } - function setIsOpen($isOpen) { + function setIsOpen(?int $isOpen): void { $this->isOpen = $isOpen; } - function getSessionLifetime() { + function getSessionLifetime(): ?int { return $this->sessionLifetime; } - function setSessionLifetime($sessionLifetime) { + function setSessionLifetime(?int $sessionLifetime): void { $this->sessionLifetime = $sessionLifetime; } - function getSessionKey() { + function getSessionKey(): ?string { return $this->sessionKey; } - function setSessionKey($sessionKey) { + function setSessionKey(?string $sessionKey): void { $this->sessionKey = $sessionKey; } diff --git a/src/dba/models/SessionFactory.class.php b/src/dba/models/SessionFactory.class.php index ba48a1aee..fc20c5c9c 100644 --- a/src/dba/models/SessionFactory.class.php +++ b/src/dba/models/SessionFactory.class.php @@ -3,28 +3,27 @@ namespace DBA; class SessionFactory extends AbstractModelFactory { - function getModelName() { + function getModelName(): string { return "Session"; } - function getModelTable() { + function getModelTable(): string { return "Session"; } - function isCachable() { + function isCachable(): bool { return false; } - function getCacheValidTime() { + function getCacheValidTime(): int { return -1; } /** * @return Session */ - function getNullObject() { - $o = new Session(-1, null, null, null, null, null, null); - return $o; + function getNullObject(): Session { + return new Session(-1, null, null, null, null, null, null); } /** @@ -32,9 +31,8 @@ function getNullObject() { * @param array $dict * @return Session */ - function createObjectFromDict($pk, $dict) { - $o = new Session($dict['sessionId'], $dict['userId'], $dict['sessionStartDate'], $dict['lastActionDate'], $dict['isOpen'], $dict['sessionLifetime'], $dict['sessionKey']); - return $o; + function createObjectFromDict($pk, $dict): Session { + return new Session($dict['sessionId'], $dict['userId'], $dict['sessionStartDate'], $dict['lastActionDate'], $dict['isOpen'], $dict['sessionLifetime'], $dict['sessionKey']); } /** @@ -66,9 +64,9 @@ function filter($options, $single = false) { /** * @param string $pk - * @return Session + * @return ?Session */ - function get($pk) { + function get($pk): ?Session { return Util::cast(parent::get($pk), Session::class); } @@ -76,7 +74,7 @@ function get($pk) { * @param Session $model * @return Session */ - function save($model) { + function save($model): Session { return Util::cast(parent::save($model), Session::class); } } \ No newline at end of file diff --git a/src/dba/models/Speed.class.php b/src/dba/models/Speed.class.php index e18dabaa3..b937f6a8d 100644 --- a/src/dba/models/Speed.class.php +++ b/src/dba/models/Speed.class.php @@ -3,13 +3,13 @@ namespace DBA; class Speed extends AbstractModel { - private $speedId; - private $agentId; - private $taskId; - private $speed; - private $time; + private ?int $speedId; + private ?int $agentId; + private ?int $taskId; + private ?int $speed; + private ?int $time; - function __construct($speedId, $agentId, $taskId, $speed, $time) { + function __construct(?int $speedId, ?int $agentId, ?int $taskId, ?int $speed, ?int $time) { $this->speedId = $speedId; $this->agentId = $agentId; $this->taskId = $taskId; @@ -17,7 +17,7 @@ function __construct($speedId, $agentId, $taskId, $speed, $time) { $this->time = $time; } - function getKeyValueDict() { + function getKeyValueDict(): array { $dict = array(); $dict['speedId'] = $this->speedId; $dict['agentId'] = $this->agentId; @@ -28,7 +28,7 @@ function getKeyValueDict() { return $dict; } - static function getFeatures() { + static function getFeatures(): array { $dict = array(); $dict['speedId'] = ['read_only' => True, "type" => "int", "subtype" => "unset", "choices" => "unset", "null" => False, "pk" => True, "protected" => True, "private" => False, "alias" => "speedId", "public" => False]; $dict['agentId'] = ['read_only' => True, "type" => "int", "subtype" => "unset", "choices" => "unset", "null" => False, "pk" => False, "protected" => True, "private" => False, "alias" => "agentId", "public" => False]; @@ -39,19 +39,19 @@ static function getFeatures() { return $dict; } - function getPrimaryKey() { + function getPrimaryKey(): string { return "speedId"; } - function getPrimaryKeyValue() { + function getPrimaryKeyValue(): ?int { return $this->speedId; } - function getId() { + function getId(): ?int { return $this->speedId; } - function setId($id) { + function setId($id): void { $this->speedId = $id; } @@ -59,39 +59,39 @@ function setId($id) { * Used to serialize the data contained in the model * @return array */ - public function expose() { + public function expose(): array { return get_object_vars($this); } - function getAgentId() { + function getAgentId(): ?int { return $this->agentId; } - function setAgentId($agentId) { + function setAgentId(?int $agentId): void { $this->agentId = $agentId; } - function getTaskId() { + function getTaskId(): ?int { return $this->taskId; } - function setTaskId($taskId) { + function setTaskId(?int $taskId): void { $this->taskId = $taskId; } - function getSpeed() { + function getSpeed(): ?int { return $this->speed; } - function setSpeed($speed) { + function setSpeed(?int $speed): void { $this->speed = $speed; } - function getTime() { + function getTime(): ?int { return $this->time; } - function setTime($time) { + function setTime(?int $time): void { $this->time = $time; } diff --git a/src/dba/models/SpeedFactory.class.php b/src/dba/models/SpeedFactory.class.php index 7c9074e16..7ecada0f2 100644 --- a/src/dba/models/SpeedFactory.class.php +++ b/src/dba/models/SpeedFactory.class.php @@ -3,28 +3,27 @@ namespace DBA; class SpeedFactory extends AbstractModelFactory { - function getModelName() { + function getModelName(): string { return "Speed"; } - function getModelTable() { + function getModelTable(): string { return "Speed"; } - function isCachable() { + function isCachable(): bool { return false; } - function getCacheValidTime() { + function getCacheValidTime(): int { return -1; } /** * @return Speed */ - function getNullObject() { - $o = new Speed(-1, null, null, null, null); - return $o; + function getNullObject(): Speed { + return new Speed(-1, null, null, null, null); } /** @@ -32,9 +31,8 @@ function getNullObject() { * @param array $dict * @return Speed */ - function createObjectFromDict($pk, $dict) { - $o = new Speed($dict['speedId'], $dict['agentId'], $dict['taskId'], $dict['speed'], $dict['time']); - return $o; + function createObjectFromDict($pk, $dict): Speed { + return new Speed($dict['speedId'], $dict['agentId'], $dict['taskId'], $dict['speed'], $dict['time']); } /** @@ -66,9 +64,9 @@ function filter($options, $single = false) { /** * @param string $pk - * @return Speed + * @return ?Speed */ - function get($pk) { + function get($pk): ?Speed { return Util::cast(parent::get($pk), Speed::class); } @@ -76,7 +74,7 @@ function get($pk) { * @param Speed $model * @return Speed */ - function save($model) { + function save($model): Speed { return Util::cast(parent::save($model), Speed::class); } } \ No newline at end of file diff --git a/src/dba/models/StoredValue.class.php b/src/dba/models/StoredValue.class.php index ead8dfd0a..83afa4647 100644 --- a/src/dba/models/StoredValue.class.php +++ b/src/dba/models/StoredValue.class.php @@ -3,15 +3,15 @@ namespace DBA; class StoredValue extends AbstractModel { - private $storedValueId; - private $val; + private ?string $storedValueId; + private ?string $val; - function __construct($storedValueId, $val) { + function __construct(?string $storedValueId, ?string $val) { $this->storedValueId = $storedValueId; $this->val = $val; } - function getKeyValueDict() { + function getKeyValueDict(): array { $dict = array(); $dict['storedValueId'] = $this->storedValueId; $dict['val'] = $this->val; @@ -19,7 +19,7 @@ function getKeyValueDict() { return $dict; } - static function getFeatures() { + static function getFeatures(): array { $dict = array(); $dict['storedValueId'] = ['read_only' => True, "type" => "str(50)", "subtype" => "unset", "choices" => "unset", "null" => False, "pk" => True, "protected" => True, "private" => False, "alias" => "storedValueId", "public" => False]; $dict['val'] = ['read_only' => False, "type" => "str(256)", "subtype" => "unset", "choices" => "unset", "null" => False, "pk" => False, "protected" => False, "private" => False, "alias" => "val", "public" => False]; @@ -27,19 +27,19 @@ static function getFeatures() { return $dict; } - function getPrimaryKey() { + function getPrimaryKey(): string { return "storedValueId"; } - function getPrimaryKeyValue() { + function getPrimaryKeyValue(): ?string { return $this->storedValueId; } - function getId() { + function getId(): ?string { return $this->storedValueId; } - function setId($id) { + function setId($id): void { $this->storedValueId = $id; } @@ -47,15 +47,15 @@ function setId($id) { * Used to serialize the data contained in the model * @return array */ - public function expose() { + public function expose(): array { return get_object_vars($this); } - function getVal() { + function getVal(): ?string { return $this->val; } - function setVal($val) { + function setVal(?string $val): void { $this->val = $val; } diff --git a/src/dba/models/StoredValueFactory.class.php b/src/dba/models/StoredValueFactory.class.php index 863b970e2..4aab838a3 100644 --- a/src/dba/models/StoredValueFactory.class.php +++ b/src/dba/models/StoredValueFactory.class.php @@ -3,28 +3,27 @@ namespace DBA; class StoredValueFactory extends AbstractModelFactory { - function getModelName() { + function getModelName(): string { return "StoredValue"; } - function getModelTable() { + function getModelTable(): string { return "StoredValue"; } - function isCachable() { + function isCachable(): bool { return false; } - function getCacheValidTime() { + function getCacheValidTime(): int { return -1; } /** * @return StoredValue */ - function getNullObject() { - $o = new StoredValue(-1, null); - return $o; + function getNullObject(): StoredValue { + return new StoredValue(-1, null); } /** @@ -32,9 +31,8 @@ function getNullObject() { * @param array $dict * @return StoredValue */ - function createObjectFromDict($pk, $dict) { - $o = new StoredValue($dict['storedValueId'], $dict['val']); - return $o; + function createObjectFromDict($pk, $dict): StoredValue { + return new StoredValue($dict['storedValueId'], $dict['val']); } /** @@ -66,9 +64,9 @@ function filter($options, $single = false) { /** * @param string $pk - * @return StoredValue + * @return ?StoredValue */ - function get($pk) { + function get($pk): ?StoredValue { return Util::cast(parent::get($pk), StoredValue::class); } @@ -76,7 +74,7 @@ function get($pk) { * @param StoredValue $model * @return StoredValue */ - function save($model) { + function save($model): StoredValue { return Util::cast(parent::save($model), StoredValue::class); } } \ No newline at end of file diff --git a/src/dba/models/Supertask.class.php b/src/dba/models/Supertask.class.php index 90e707f10..072f1c2dc 100644 --- a/src/dba/models/Supertask.class.php +++ b/src/dba/models/Supertask.class.php @@ -3,15 +3,15 @@ namespace DBA; class Supertask extends AbstractModel { - private $supertaskId; - private $supertaskName; + private ?int $supertaskId; + private ?string $supertaskName; - function __construct($supertaskId, $supertaskName) { + function __construct(?int $supertaskId, ?string $supertaskName) { $this->supertaskId = $supertaskId; $this->supertaskName = $supertaskName; } - function getKeyValueDict() { + function getKeyValueDict(): array { $dict = array(); $dict['supertaskId'] = $this->supertaskId; $dict['supertaskName'] = $this->supertaskName; @@ -19,7 +19,7 @@ function getKeyValueDict() { return $dict; } - static function getFeatures() { + static function getFeatures(): array { $dict = array(); $dict['supertaskId'] = ['read_only' => True, "type" => "int", "subtype" => "unset", "choices" => "unset", "null" => False, "pk" => True, "protected" => True, "private" => False, "alias" => "supertaskId", "public" => False]; $dict['supertaskName'] = ['read_only' => False, "type" => "str(50)", "subtype" => "unset", "choices" => "unset", "null" => False, "pk" => False, "protected" => False, "private" => False, "alias" => "supertaskName", "public" => False]; @@ -27,19 +27,19 @@ static function getFeatures() { return $dict; } - function getPrimaryKey() { + function getPrimaryKey(): string { return "supertaskId"; } - function getPrimaryKeyValue() { + function getPrimaryKeyValue(): ?int { return $this->supertaskId; } - function getId() { + function getId(): ?int { return $this->supertaskId; } - function setId($id) { + function setId($id): void { $this->supertaskId = $id; } @@ -47,15 +47,15 @@ function setId($id) { * Used to serialize the data contained in the model * @return array */ - public function expose() { + public function expose(): array { return get_object_vars($this); } - function getSupertaskName() { + function getSupertaskName(): ?string { return $this->supertaskName; } - function setSupertaskName($supertaskName) { + function setSupertaskName(?string $supertaskName): void { $this->supertaskName = $supertaskName; } diff --git a/src/dba/models/SupertaskFactory.class.php b/src/dba/models/SupertaskFactory.class.php index eea89a887..d95b26026 100644 --- a/src/dba/models/SupertaskFactory.class.php +++ b/src/dba/models/SupertaskFactory.class.php @@ -3,28 +3,27 @@ namespace DBA; class SupertaskFactory extends AbstractModelFactory { - function getModelName() { + function getModelName(): string { return "Supertask"; } - function getModelTable() { + function getModelTable(): string { return "Supertask"; } - function isCachable() { + function isCachable(): bool { return false; } - function getCacheValidTime() { + function getCacheValidTime(): int { return -1; } /** * @return Supertask */ - function getNullObject() { - $o = new Supertask(-1, null); - return $o; + function getNullObject(): Supertask { + return new Supertask(-1, null); } /** @@ -32,9 +31,8 @@ function getNullObject() { * @param array $dict * @return Supertask */ - function createObjectFromDict($pk, $dict) { - $o = new Supertask($dict['supertaskId'], $dict['supertaskName']); - return $o; + function createObjectFromDict($pk, $dict): Supertask { + return new Supertask($dict['supertaskId'], $dict['supertaskName']); } /** @@ -66,9 +64,9 @@ function filter($options, $single = false) { /** * @param string $pk - * @return Supertask + * @return ?Supertask */ - function get($pk) { + function get($pk): ?Supertask { return Util::cast(parent::get($pk), Supertask::class); } @@ -76,7 +74,7 @@ function get($pk) { * @param Supertask $model * @return Supertask */ - function save($model) { + function save($model): Supertask { return Util::cast(parent::save($model), Supertask::class); } } \ No newline at end of file diff --git a/src/dba/models/SupertaskPretask.class.php b/src/dba/models/SupertaskPretask.class.php index 859384116..73295a792 100644 --- a/src/dba/models/SupertaskPretask.class.php +++ b/src/dba/models/SupertaskPretask.class.php @@ -3,17 +3,17 @@ namespace DBA; class SupertaskPretask extends AbstractModel { - private $supertaskPretaskId; - private $supertaskId; - private $pretaskId; + private ?int $supertaskPretaskId; + private ?int $supertaskId; + private ?int $pretaskId; - function __construct($supertaskPretaskId, $supertaskId, $pretaskId) { + function __construct(?int $supertaskPretaskId, ?int $supertaskId, ?int $pretaskId) { $this->supertaskPretaskId = $supertaskPretaskId; $this->supertaskId = $supertaskId; $this->pretaskId = $pretaskId; } - function getKeyValueDict() { + function getKeyValueDict(): array { $dict = array(); $dict['supertaskPretaskId'] = $this->supertaskPretaskId; $dict['supertaskId'] = $this->supertaskId; @@ -22,7 +22,7 @@ function getKeyValueDict() { return $dict; } - static function getFeatures() { + static function getFeatures(): array { $dict = array(); $dict['supertaskPretaskId'] = ['read_only' => True, "type" => "int", "subtype" => "unset", "choices" => "unset", "null" => False, "pk" => True, "protected" => True, "private" => False, "alias" => "supertaskPretaskId", "public" => False]; $dict['supertaskId'] = ['read_only' => True, "type" => "int", "subtype" => "unset", "choices" => "unset", "null" => False, "pk" => False, "protected" => False, "private" => False, "alias" => "supertaskId", "public" => False]; @@ -31,19 +31,19 @@ static function getFeatures() { return $dict; } - function getPrimaryKey() { + function getPrimaryKey(): string { return "supertaskPretaskId"; } - function getPrimaryKeyValue() { + function getPrimaryKeyValue(): ?int { return $this->supertaskPretaskId; } - function getId() { + function getId(): ?int { return $this->supertaskPretaskId; } - function setId($id) { + function setId($id): void { $this->supertaskPretaskId = $id; } @@ -51,23 +51,23 @@ function setId($id) { * Used to serialize the data contained in the model * @return array */ - public function expose() { + public function expose(): array { return get_object_vars($this); } - function getSupertaskId() { + function getSupertaskId(): ?int { return $this->supertaskId; } - function setSupertaskId($supertaskId) { + function setSupertaskId(?int $supertaskId): void { $this->supertaskId = $supertaskId; } - function getPretaskId() { + function getPretaskId(): ?int { return $this->pretaskId; } - function setPretaskId($pretaskId) { + function setPretaskId(?int $pretaskId): void { $this->pretaskId = $pretaskId; } diff --git a/src/dba/models/SupertaskPretaskFactory.class.php b/src/dba/models/SupertaskPretaskFactory.class.php index 6a747cba2..ecda00a55 100644 --- a/src/dba/models/SupertaskPretaskFactory.class.php +++ b/src/dba/models/SupertaskPretaskFactory.class.php @@ -3,28 +3,27 @@ namespace DBA; class SupertaskPretaskFactory extends AbstractModelFactory { - function getModelName() { + function getModelName(): string { return "SupertaskPretask"; } - function getModelTable() { + function getModelTable(): string { return "SupertaskPretask"; } - function isCachable() { + function isCachable(): bool { return false; } - function getCacheValidTime() { + function getCacheValidTime(): int { return -1; } /** * @return SupertaskPretask */ - function getNullObject() { - $o = new SupertaskPretask(-1, null, null); - return $o; + function getNullObject(): SupertaskPretask { + return new SupertaskPretask(-1, null, null); } /** @@ -32,9 +31,8 @@ function getNullObject() { * @param array $dict * @return SupertaskPretask */ - function createObjectFromDict($pk, $dict) { - $o = new SupertaskPretask($dict['supertaskPretaskId'], $dict['supertaskId'], $dict['pretaskId']); - return $o; + function createObjectFromDict($pk, $dict): SupertaskPretask { + return new SupertaskPretask($dict['supertaskPretaskId'], $dict['supertaskId'], $dict['pretaskId']); } /** @@ -66,9 +64,9 @@ function filter($options, $single = false) { /** * @param string $pk - * @return SupertaskPretask + * @return ?SupertaskPretask */ - function get($pk) { + function get($pk): ?SupertaskPretask { return Util::cast(parent::get($pk), SupertaskPretask::class); } @@ -76,7 +74,7 @@ function get($pk) { * @param SupertaskPretask $model * @return SupertaskPretask */ - function save($model) { + function save($model): SupertaskPretask { return Util::cast(parent::save($model), SupertaskPretask::class); } } \ No newline at end of file diff --git a/src/dba/models/Task.class.php b/src/dba/models/Task.class.php index 12fc8b589..9a6538502 100644 --- a/src/dba/models/Task.class.php +++ b/src/dba/models/Task.class.php @@ -3,32 +3,32 @@ namespace DBA; class Task extends AbstractModel { - private $taskId; - private $taskName; - private $attackCmd; - private $chunkTime; - private $statusTimer; - private $keyspace; - private $keyspaceProgress; - private $priority; - private $maxAgents; - private $color; - private $isSmall; - private $isCpuTask; - private $useNewBench; - private $skipKeyspace; - private $crackerBinaryId; - private $crackerBinaryTypeId; - private $taskWrapperId; - private $isArchived; - private $notes; - private $staticChunks; - private $chunkSize; - private $forcePipe; - private $usePreprocessor; - private $preprocessorCommand; - - function __construct($taskId, $taskName, $attackCmd, $chunkTime, $statusTimer, $keyspace, $keyspaceProgress, $priority, $maxAgents, $color, $isSmall, $isCpuTask, $useNewBench, $skipKeyspace, $crackerBinaryId, $crackerBinaryTypeId, $taskWrapperId, $isArchived, $notes, $staticChunks, $chunkSize, $forcePipe, $usePreprocessor, $preprocessorCommand) { + private ?int $taskId; + private ?string $taskName; + private ?string $attackCmd; + private ?int $chunkTime; + private ?int $statusTimer; + private ?int $keyspace; + private ?int $keyspaceProgress; + private ?int $priority; + private ?int $maxAgents; + private ?string $color; + private ?int $isSmall; + private ?int $isCpuTask; + private ?int $useNewBench; + private ?int $skipKeyspace; + private ?int $crackerBinaryId; + private ?int $crackerBinaryTypeId; + private ?int $taskWrapperId; + private ?int $isArchived; + private ?string $notes; + private ?int $staticChunks; + private ?int $chunkSize; + private ?int $forcePipe; + private ?int $usePreprocessor; + private ?string $preprocessorCommand; + + function __construct(?int $taskId, ?string $taskName, ?string $attackCmd, ?int $chunkTime, ?int $statusTimer, ?int $keyspace, ?int $keyspaceProgress, ?int $priority, ?int $maxAgents, ?string $color, ?int $isSmall, ?int $isCpuTask, ?int $useNewBench, ?int $skipKeyspace, ?int $crackerBinaryId, ?int $crackerBinaryTypeId, ?int $taskWrapperId, ?int $isArchived, ?string $notes, ?int $staticChunks, ?int $chunkSize, ?int $forcePipe, ?int $usePreprocessor, ?string $preprocessorCommand) { $this->taskId = $taskId; $this->taskName = $taskName; $this->attackCmd = $attackCmd; @@ -55,7 +55,7 @@ function __construct($taskId, $taskName, $attackCmd, $chunkTime, $statusTimer, $ $this->preprocessorCommand = $preprocessorCommand; } - function getKeyValueDict() { + function getKeyValueDict(): array { $dict = array(); $dict['taskId'] = $this->taskId; $dict['taskName'] = $this->taskName; @@ -85,7 +85,7 @@ function getKeyValueDict() { return $dict; } - static function getFeatures() { + static function getFeatures(): array { $dict = array(); $dict['taskId'] = ['read_only' => True, "type" => "int", "subtype" => "unset", "choices" => "unset", "null" => False, "pk" => True, "protected" => True, "private" => False, "alias" => "taskId", "public" => False]; $dict['taskName'] = ['read_only' => False, "type" => "str(256)", "subtype" => "unset", "choices" => "unset", "null" => False, "pk" => False, "protected" => False, "private" => False, "alias" => "taskName", "public" => False]; @@ -115,19 +115,19 @@ static function getFeatures() { return $dict; } - function getPrimaryKey() { + function getPrimaryKey(): string { return "taskId"; } - function getPrimaryKeyValue() { + function getPrimaryKeyValue(): ?int { return $this->taskId; } - function getId() { + function getId(): ?int { return $this->taskId; } - function setId($id) { + function setId($id): void { $this->taskId = $id; } @@ -135,191 +135,191 @@ function setId($id) { * Used to serialize the data contained in the model * @return array */ - public function expose() { + public function expose(): array { return get_object_vars($this); } - function getTaskName() { + function getTaskName(): ?string { return $this->taskName; } - function setTaskName($taskName) { + function setTaskName(?string $taskName): void { $this->taskName = $taskName; } - function getAttackCmd() { + function getAttackCmd(): ?string { return $this->attackCmd; } - function setAttackCmd($attackCmd) { + function setAttackCmd(?string $attackCmd): void { $this->attackCmd = $attackCmd; } - function getChunkTime() { + function getChunkTime(): ?int { return $this->chunkTime; } - function setChunkTime($chunkTime) { + function setChunkTime(?int $chunkTime): void { $this->chunkTime = $chunkTime; } - function getStatusTimer() { + function getStatusTimer(): ?int { return $this->statusTimer; } - function setStatusTimer($statusTimer) { + function setStatusTimer(?int $statusTimer): void { $this->statusTimer = $statusTimer; } - function getKeyspace() { + function getKeyspace(): ?int { return $this->keyspace; } - function setKeyspace($keyspace) { + function setKeyspace(?int $keyspace): void { $this->keyspace = $keyspace; } - function getKeyspaceProgress() { + function getKeyspaceProgress(): ?int { return $this->keyspaceProgress; } - function setKeyspaceProgress($keyspaceProgress) { + function setKeyspaceProgress(?int $keyspaceProgress): void { $this->keyspaceProgress = $keyspaceProgress; } - function getPriority() { + function getPriority(): ?int { return $this->priority; } - function setPriority($priority) { + function setPriority(?int $priority): void { $this->priority = $priority; } - function getMaxAgents() { + function getMaxAgents(): ?int { return $this->maxAgents; } - function setMaxAgents($maxAgents) { + function setMaxAgents(?int $maxAgents): void { $this->maxAgents = $maxAgents; } - function getColor() { + function getColor(): ?string { return $this->color; } - function setColor($color) { + function setColor(?string $color): void { $this->color = $color; } - function getIsSmall() { + function getIsSmall(): ?int { return $this->isSmall; } - function setIsSmall($isSmall) { + function setIsSmall(?int $isSmall): void { $this->isSmall = $isSmall; } - function getIsCpuTask() { + function getIsCpuTask(): ?int { return $this->isCpuTask; } - function setIsCpuTask($isCpuTask) { + function setIsCpuTask(?int $isCpuTask): void { $this->isCpuTask = $isCpuTask; } - function getUseNewBench() { + function getUseNewBench(): ?int { return $this->useNewBench; } - function setUseNewBench($useNewBench) { + function setUseNewBench(?int $useNewBench): void { $this->useNewBench = $useNewBench; } - function getSkipKeyspace() { + function getSkipKeyspace(): ?int { return $this->skipKeyspace; } - function setSkipKeyspace($skipKeyspace) { + function setSkipKeyspace(?int $skipKeyspace): void { $this->skipKeyspace = $skipKeyspace; } - function getCrackerBinaryId() { + function getCrackerBinaryId(): ?int { return $this->crackerBinaryId; } - function setCrackerBinaryId($crackerBinaryId) { + function setCrackerBinaryId(?int $crackerBinaryId): void { $this->crackerBinaryId = $crackerBinaryId; } - function getCrackerBinaryTypeId() { + function getCrackerBinaryTypeId(): ?int { return $this->crackerBinaryTypeId; } - function setCrackerBinaryTypeId($crackerBinaryTypeId) { + function setCrackerBinaryTypeId(?int $crackerBinaryTypeId): void { $this->crackerBinaryTypeId = $crackerBinaryTypeId; } - function getTaskWrapperId() { + function getTaskWrapperId(): ?int { return $this->taskWrapperId; } - function setTaskWrapperId($taskWrapperId) { + function setTaskWrapperId(?int $taskWrapperId): void { $this->taskWrapperId = $taskWrapperId; } - function getIsArchived() { + function getIsArchived(): ?int { return $this->isArchived; } - function setIsArchived($isArchived) { + function setIsArchived(?int $isArchived): void { $this->isArchived = $isArchived; } - function getNotes() { + function getNotes(): ?string { return $this->notes; } - function setNotes($notes) { + function setNotes(?string $notes): void { $this->notes = $notes; } - function getStaticChunks() { + function getStaticChunks(): ?int { return $this->staticChunks; } - function setStaticChunks($staticChunks) { + function setStaticChunks(?int $staticChunks): void { $this->staticChunks = $staticChunks; } - function getChunkSize() { + function getChunkSize(): ?int { return $this->chunkSize; } - function setChunkSize($chunkSize) { + function setChunkSize(?int $chunkSize): void { $this->chunkSize = $chunkSize; } - function getForcePipe() { + function getForcePipe(): ?int { return $this->forcePipe; } - function setForcePipe($forcePipe) { + function setForcePipe(?int $forcePipe): void { $this->forcePipe = $forcePipe; } - function getUsePreprocessor() { + function getUsePreprocessor(): ?int { return $this->usePreprocessor; } - function setUsePreprocessor($usePreprocessor) { + function setUsePreprocessor(?int $usePreprocessor): void { $this->usePreprocessor = $usePreprocessor; } - function getPreprocessorCommand() { + function getPreprocessorCommand(): ?string { return $this->preprocessorCommand; } - function setPreprocessorCommand($preprocessorCommand) { + function setPreprocessorCommand(?string $preprocessorCommand): void { $this->preprocessorCommand = $preprocessorCommand; } diff --git a/src/dba/models/TaskDebugOutput.class.php b/src/dba/models/TaskDebugOutput.class.php index 5b74299fc..80f680f7d 100644 --- a/src/dba/models/TaskDebugOutput.class.php +++ b/src/dba/models/TaskDebugOutput.class.php @@ -3,17 +3,17 @@ namespace DBA; class TaskDebugOutput extends AbstractModel { - private $taskDebugOutputId; - private $taskId; - private $output; + private ?int $taskDebugOutputId; + private ?int $taskId; + private ?string $output; - function __construct($taskDebugOutputId, $taskId, $output) { + function __construct(?int $taskDebugOutputId, ?int $taskId, ?string $output) { $this->taskDebugOutputId = $taskDebugOutputId; $this->taskId = $taskId; $this->output = $output; } - function getKeyValueDict() { + function getKeyValueDict(): array { $dict = array(); $dict['taskDebugOutputId'] = $this->taskDebugOutputId; $dict['taskId'] = $this->taskId; @@ -22,7 +22,7 @@ function getKeyValueDict() { return $dict; } - static function getFeatures() { + static function getFeatures(): array { $dict = array(); $dict['taskDebugOutputId'] = ['read_only' => True, "type" => "int", "subtype" => "unset", "choices" => "unset", "null" => False, "pk" => True, "protected" => True, "private" => False, "alias" => "taskDebugOutputId", "public" => False]; $dict['taskId'] = ['read_only' => True, "type" => "int", "subtype" => "unset", "choices" => "unset", "null" => False, "pk" => False, "protected" => False, "private" => False, "alias" => "taskId", "public" => False]; @@ -31,19 +31,19 @@ static function getFeatures() { return $dict; } - function getPrimaryKey() { + function getPrimaryKey(): string { return "taskDebugOutputId"; } - function getPrimaryKeyValue() { + function getPrimaryKeyValue(): ?int { return $this->taskDebugOutputId; } - function getId() { + function getId(): ?int { return $this->taskDebugOutputId; } - function setId($id) { + function setId($id): void { $this->taskDebugOutputId = $id; } @@ -51,23 +51,23 @@ function setId($id) { * Used to serialize the data contained in the model * @return array */ - public function expose() { + public function expose(): array { return get_object_vars($this); } - function getTaskId() { + function getTaskId(): ?int { return $this->taskId; } - function setTaskId($taskId) { + function setTaskId(?int $taskId): void { $this->taskId = $taskId; } - function getOutput() { + function getOutput(): ?string { return $this->output; } - function setOutput($output) { + function setOutput(?string $output): void { $this->output = $output; } diff --git a/src/dba/models/TaskDebugOutputFactory.class.php b/src/dba/models/TaskDebugOutputFactory.class.php index adf562115..e57c2cb6b 100644 --- a/src/dba/models/TaskDebugOutputFactory.class.php +++ b/src/dba/models/TaskDebugOutputFactory.class.php @@ -3,28 +3,27 @@ namespace DBA; class TaskDebugOutputFactory extends AbstractModelFactory { - function getModelName() { + function getModelName(): string { return "TaskDebugOutput"; } - function getModelTable() { + function getModelTable(): string { return "TaskDebugOutput"; } - function isCachable() { + function isCachable(): bool { return false; } - function getCacheValidTime() { + function getCacheValidTime(): int { return -1; } /** * @return TaskDebugOutput */ - function getNullObject() { - $o = new TaskDebugOutput(-1, null, null); - return $o; + function getNullObject(): TaskDebugOutput { + return new TaskDebugOutput(-1, null, null); } /** @@ -32,9 +31,8 @@ function getNullObject() { * @param array $dict * @return TaskDebugOutput */ - function createObjectFromDict($pk, $dict) { - $o = new TaskDebugOutput($dict['taskDebugOutputId'], $dict['taskId'], $dict['output']); - return $o; + function createObjectFromDict($pk, $dict): TaskDebugOutput { + return new TaskDebugOutput($dict['taskDebugOutputId'], $dict['taskId'], $dict['output']); } /** @@ -66,9 +64,9 @@ function filter($options, $single = false) { /** * @param string $pk - * @return TaskDebugOutput + * @return ?TaskDebugOutput */ - function get($pk) { + function get($pk): ?TaskDebugOutput { return Util::cast(parent::get($pk), TaskDebugOutput::class); } @@ -76,7 +74,7 @@ function get($pk) { * @param TaskDebugOutput $model * @return TaskDebugOutput */ - function save($model) { + function save($model): TaskDebugOutput { return Util::cast(parent::save($model), TaskDebugOutput::class); } } \ No newline at end of file diff --git a/src/dba/models/TaskFactory.class.php b/src/dba/models/TaskFactory.class.php index cdd4a871d..d9ea543fe 100644 --- a/src/dba/models/TaskFactory.class.php +++ b/src/dba/models/TaskFactory.class.php @@ -3,28 +3,27 @@ namespace DBA; class TaskFactory extends AbstractModelFactory { - function getModelName() { + function getModelName(): string { return "Task"; } - function getModelTable() { + function getModelTable(): string { return "Task"; } - function isCachable() { + function isCachable(): bool { return false; } - function getCacheValidTime() { + function getCacheValidTime(): int { return -1; } /** * @return Task */ - function getNullObject() { - $o = new Task(-1, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null); - return $o; + function getNullObject(): Task { + return new Task(-1, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null); } /** @@ -32,9 +31,8 @@ function getNullObject() { * @param array $dict * @return Task */ - function createObjectFromDict($pk, $dict) { - $o = new Task($dict['taskId'], $dict['taskName'], $dict['attackCmd'], $dict['chunkTime'], $dict['statusTimer'], $dict['keyspace'], $dict['keyspaceProgress'], $dict['priority'], $dict['maxAgents'], $dict['color'], $dict['isSmall'], $dict['isCpuTask'], $dict['useNewBench'], $dict['skipKeyspace'], $dict['crackerBinaryId'], $dict['crackerBinaryTypeId'], $dict['taskWrapperId'], $dict['isArchived'], $dict['notes'], $dict['staticChunks'], $dict['chunkSize'], $dict['forcePipe'], $dict['usePreprocessor'], $dict['preprocessorCommand']); - return $o; + function createObjectFromDict($pk, $dict): Task { + return new Task($dict['taskId'], $dict['taskName'], $dict['attackCmd'], $dict['chunkTime'], $dict['statusTimer'], $dict['keyspace'], $dict['keyspaceProgress'], $dict['priority'], $dict['maxAgents'], $dict['color'], $dict['isSmall'], $dict['isCpuTask'], $dict['useNewBench'], $dict['skipKeyspace'], $dict['crackerBinaryId'], $dict['crackerBinaryTypeId'], $dict['taskWrapperId'], $dict['isArchived'], $dict['notes'], $dict['staticChunks'], $dict['chunkSize'], $dict['forcePipe'], $dict['usePreprocessor'], $dict['preprocessorCommand']); } /** @@ -66,9 +64,9 @@ function filter($options, $single = false) { /** * @param string $pk - * @return Task + * @return ?Task */ - function get($pk) { + function get($pk): ?Task { return Util::cast(parent::get($pk), Task::class); } @@ -76,7 +74,7 @@ function get($pk) { * @param Task $model * @return Task */ - function save($model) { + function save($model): Task { return Util::cast(parent::save($model), Task::class); } } \ No newline at end of file diff --git a/src/dba/models/TaskWrapper.class.php b/src/dba/models/TaskWrapper.class.php index 8f18302f3..e060ed836 100644 --- a/src/dba/models/TaskWrapper.class.php +++ b/src/dba/models/TaskWrapper.class.php @@ -3,17 +3,17 @@ namespace DBA; class TaskWrapper extends AbstractModel { - private $taskWrapperId; - private $priority; - private $maxAgents; - private $taskType; - private $hashlistId; - private $accessGroupId; - private $taskWrapperName; - private $isArchived; - private $cracked; - - function __construct($taskWrapperId, $priority, $maxAgents, $taskType, $hashlistId, $accessGroupId, $taskWrapperName, $isArchived, $cracked) { + private ?int $taskWrapperId; + private ?int $priority; + private ?int $maxAgents; + private ?int $taskType; + private ?int $hashlistId; + private ?int $accessGroupId; + private ?string $taskWrapperName; + private ?int $isArchived; + private ?int $cracked; + + function __construct(?int $taskWrapperId, ?int $priority, ?int $maxAgents, ?int $taskType, ?int $hashlistId, ?int $accessGroupId, ?string $taskWrapperName, ?int $isArchived, ?int $cracked) { $this->taskWrapperId = $taskWrapperId; $this->priority = $priority; $this->maxAgents = $maxAgents; @@ -25,7 +25,7 @@ function __construct($taskWrapperId, $priority, $maxAgents, $taskType, $hashlist $this->cracked = $cracked; } - function getKeyValueDict() { + function getKeyValueDict(): array { $dict = array(); $dict['taskWrapperId'] = $this->taskWrapperId; $dict['priority'] = $this->priority; @@ -40,7 +40,7 @@ function getKeyValueDict() { return $dict; } - static function getFeatures() { + static function getFeatures(): array { $dict = array(); $dict['taskWrapperId'] = ['read_only' => True, "type" => "int", "subtype" => "unset", "choices" => "unset", "null" => False, "pk" => True, "protected" => True, "private" => False, "alias" => "taskWrapperId", "public" => False]; $dict['priority'] = ['read_only' => False, "type" => "int", "subtype" => "unset", "choices" => "unset", "null" => False, "pk" => False, "protected" => False, "private" => False, "alias" => "priority", "public" => False]; @@ -55,19 +55,19 @@ static function getFeatures() { return $dict; } - function getPrimaryKey() { + function getPrimaryKey(): string { return "taskWrapperId"; } - function getPrimaryKeyValue() { + function getPrimaryKeyValue(): ?int { return $this->taskWrapperId; } - function getId() { + function getId(): ?int { return $this->taskWrapperId; } - function setId($id) { + function setId($id): void { $this->taskWrapperId = $id; } @@ -75,71 +75,71 @@ function setId($id) { * Used to serialize the data contained in the model * @return array */ - public function expose() { + public function expose(): array { return get_object_vars($this); } - function getPriority() { + function getPriority(): ?int { return $this->priority; } - function setPriority($priority) { + function setPriority(?int $priority): void { $this->priority = $priority; } - function getMaxAgents() { + function getMaxAgents(): ?int { return $this->maxAgents; } - function setMaxAgents($maxAgents) { + function setMaxAgents(?int $maxAgents): void { $this->maxAgents = $maxAgents; } - function getTaskType() { + function getTaskType(): ?int { return $this->taskType; } - function setTaskType($taskType) { + function setTaskType(?int $taskType): void { $this->taskType = $taskType; } - function getHashlistId() { + function getHashlistId(): ?int { return $this->hashlistId; } - function setHashlistId($hashlistId) { + function setHashlistId(?int $hashlistId): void { $this->hashlistId = $hashlistId; } - function getAccessGroupId() { + function getAccessGroupId(): ?int { return $this->accessGroupId; } - function setAccessGroupId($accessGroupId) { + function setAccessGroupId(?int $accessGroupId): void { $this->accessGroupId = $accessGroupId; } - function getTaskWrapperName() { + function getTaskWrapperName(): ?string { return $this->taskWrapperName; } - function setTaskWrapperName($taskWrapperName) { + function setTaskWrapperName(?string $taskWrapperName): void { $this->taskWrapperName = $taskWrapperName; } - function getIsArchived() { + function getIsArchived(): ?int { return $this->isArchived; } - function setIsArchived($isArchived) { + function setIsArchived(?int $isArchived): void { $this->isArchived = $isArchived; } - function getCracked() { + function getCracked(): ?int { return $this->cracked; } - function setCracked($cracked) { + function setCracked(?int $cracked): void { $this->cracked = $cracked; } diff --git a/src/dba/models/TaskWrapperFactory.class.php b/src/dba/models/TaskWrapperFactory.class.php index e9dc21c20..1830ecdf0 100644 --- a/src/dba/models/TaskWrapperFactory.class.php +++ b/src/dba/models/TaskWrapperFactory.class.php @@ -3,28 +3,27 @@ namespace DBA; class TaskWrapperFactory extends AbstractModelFactory { - function getModelName() { + function getModelName(): string { return "TaskWrapper"; } - function getModelTable() { + function getModelTable(): string { return "TaskWrapper"; } - function isCachable() { + function isCachable(): bool { return false; } - function getCacheValidTime() { + function getCacheValidTime(): int { return -1; } /** * @return TaskWrapper */ - function getNullObject() { - $o = new TaskWrapper(-1, null, null, null, null, null, null, null, null); - return $o; + function getNullObject(): TaskWrapper { + return new TaskWrapper(-1, null, null, null, null, null, null, null, null); } /** @@ -32,9 +31,8 @@ function getNullObject() { * @param array $dict * @return TaskWrapper */ - function createObjectFromDict($pk, $dict) { - $o = new TaskWrapper($dict['taskWrapperId'], $dict['priority'], $dict['maxAgents'], $dict['taskType'], $dict['hashlistId'], $dict['accessGroupId'], $dict['taskWrapperName'], $dict['isArchived'], $dict['cracked']); - return $o; + function createObjectFromDict($pk, $dict): TaskWrapper { + return new TaskWrapper($dict['taskWrapperId'], $dict['priority'], $dict['maxAgents'], $dict['taskType'], $dict['hashlistId'], $dict['accessGroupId'], $dict['taskWrapperName'], $dict['isArchived'], $dict['cracked']); } /** @@ -66,9 +64,9 @@ function filter($options, $single = false) { /** * @param string $pk - * @return TaskWrapper + * @return ?TaskWrapper */ - function get($pk) { + function get($pk): ?TaskWrapper { return Util::cast(parent::get($pk), TaskWrapper::class); } @@ -76,7 +74,7 @@ function get($pk) { * @param TaskWrapper $model * @return TaskWrapper */ - function save($model) { + function save($model): TaskWrapper { return Util::cast(parent::save($model), TaskWrapper::class); } } \ No newline at end of file diff --git a/src/dba/models/User.class.php b/src/dba/models/User.class.php index 6672e0d7d..d5304d0d2 100644 --- a/src/dba/models/User.class.php +++ b/src/dba/models/User.class.php @@ -3,24 +3,24 @@ namespace DBA; class User extends AbstractModel { - private $userId; - private $username; - private $email; - private $passwordHash; - private $passwordSalt; - private $isValid; - private $isComputedPassword; - private $lastLoginDate; - private $registeredSince; - private $sessionLifetime; - private $rightGroupId; - private $yubikey; - private $otp1; - private $otp2; - private $otp3; - private $otp4; - - function __construct($userId, $username, $email, $passwordHash, $passwordSalt, $isValid, $isComputedPassword, $lastLoginDate, $registeredSince, $sessionLifetime, $rightGroupId, $yubikey, $otp1, $otp2, $otp3, $otp4) { + private ?int $userId; + private ?string $username; + private ?string $email; + private ?string $passwordHash; + private ?string $passwordSalt; + private ?int $isValid; + private ?int $isComputedPassword; + private ?int $lastLoginDate; + private ?int $registeredSince; + private ?int $sessionLifetime; + private ?int $rightGroupId; + private ?string $yubikey; + private ?string $otp1; + private ?string $otp2; + private ?string $otp3; + private ?string $otp4; + + function __construct(?int $userId, ?string $username, ?string $email, ?string $passwordHash, ?string $passwordSalt, ?int $isValid, ?int $isComputedPassword, ?int $lastLoginDate, ?int $registeredSince, ?int $sessionLifetime, ?int $rightGroupId, ?string $yubikey, ?string $otp1, ?string $otp2, ?string $otp3, ?string $otp4) { $this->userId = $userId; $this->username = $username; $this->email = $email; @@ -39,7 +39,7 @@ function __construct($userId, $username, $email, $passwordHash, $passwordSalt, $ $this->otp4 = $otp4; } - function getKeyValueDict() { + function getKeyValueDict(): array { $dict = array(); $dict['userId'] = $this->userId; $dict['username'] = $this->username; @@ -61,7 +61,7 @@ function getKeyValueDict() { return $dict; } - static function getFeatures() { + static function getFeatures(): array { $dict = array(); $dict['userId'] = ['read_only' => True, "type" => "int", "subtype" => "unset", "choices" => "unset", "null" => False, "pk" => True, "protected" => True, "private" => False, "alias" => "id", "public" => True]; $dict['username'] = ['read_only' => False, "type" => "str(100)", "subtype" => "unset", "choices" => "unset", "null" => False, "pk" => False, "protected" => False, "private" => False, "alias" => "name", "public" => True]; @@ -83,19 +83,19 @@ static function getFeatures() { return $dict; } - function getPrimaryKey() { + function getPrimaryKey(): string { return "userId"; } - function getPrimaryKeyValue() { + function getPrimaryKeyValue(): ?int { return $this->userId; } - function getId() { + function getId(): ?int { return $this->userId; } - function setId($id) { + function setId($id): void { $this->userId = $id; } @@ -103,127 +103,127 @@ function setId($id) { * Used to serialize the data contained in the model * @return array */ - public function expose() { + public function expose(): array { return get_object_vars($this); } - function getUsername() { + function getUsername(): ?string { return $this->username; } - function setUsername($username) { + function setUsername(?string $username): void { $this->username = $username; } - function getEmail() { + function getEmail(): ?string { return $this->email; } - function setEmail($email) { + function setEmail(?string $email): void { $this->email = $email; } - function getPasswordHash() { + function getPasswordHash(): ?string { return $this->passwordHash; } - function setPasswordHash($passwordHash) { + function setPasswordHash(?string $passwordHash): void { $this->passwordHash = $passwordHash; } - function getPasswordSalt() { + function getPasswordSalt(): ?string { return $this->passwordSalt; } - function setPasswordSalt($passwordSalt) { + function setPasswordSalt(?string $passwordSalt): void { $this->passwordSalt = $passwordSalt; } - function getIsValid() { + function getIsValid(): ?int { return $this->isValid; } - function setIsValid($isValid) { + function setIsValid(?int $isValid): void { $this->isValid = $isValid; } - function getIsComputedPassword() { + function getIsComputedPassword(): ?int { return $this->isComputedPassword; } - function setIsComputedPassword($isComputedPassword) { + function setIsComputedPassword(?int $isComputedPassword): void { $this->isComputedPassword = $isComputedPassword; } - function getLastLoginDate() { + function getLastLoginDate(): ?int { return $this->lastLoginDate; } - function setLastLoginDate($lastLoginDate) { + function setLastLoginDate(?int $lastLoginDate): void { $this->lastLoginDate = $lastLoginDate; } - function getRegisteredSince() { + function getRegisteredSince(): ?int { return $this->registeredSince; } - function setRegisteredSince($registeredSince) { + function setRegisteredSince(?int $registeredSince): void { $this->registeredSince = $registeredSince; } - function getSessionLifetime() { + function getSessionLifetime(): ?int { return $this->sessionLifetime; } - function setSessionLifetime($sessionLifetime) { + function setSessionLifetime(?int $sessionLifetime): void { $this->sessionLifetime = $sessionLifetime; } - function getRightGroupId() { + function getRightGroupId(): ?int { return $this->rightGroupId; } - function setRightGroupId($rightGroupId) { + function setRightGroupId(?int $rightGroupId): void { $this->rightGroupId = $rightGroupId; } - function getYubikey() { + function getYubikey(): ?string { return $this->yubikey; } - function setYubikey($yubikey) { + function setYubikey(?string $yubikey): void { $this->yubikey = $yubikey; } - function getOtp1() { + function getOtp1(): ?string { return $this->otp1; } - function setOtp1($otp1) { + function setOtp1(?string $otp1): void { $this->otp1 = $otp1; } - function getOtp2() { + function getOtp2(): ?string { return $this->otp2; } - function setOtp2($otp2) { + function setOtp2(?string $otp2): void { $this->otp2 = $otp2; } - function getOtp3() { + function getOtp3(): ?string { return $this->otp3; } - function setOtp3($otp3) { + function setOtp3(?string $otp3): void { $this->otp3 = $otp3; } - function getOtp4() { + function getOtp4(): ?string { return $this->otp4; } - function setOtp4($otp4) { + function setOtp4(?string $otp4): void { $this->otp4 = $otp4; } diff --git a/src/dba/models/UserFactory.class.php b/src/dba/models/UserFactory.class.php index f50a06b52..bb2112b2c 100644 --- a/src/dba/models/UserFactory.class.php +++ b/src/dba/models/UserFactory.class.php @@ -3,28 +3,27 @@ namespace DBA; class UserFactory extends AbstractModelFactory { - function getModelName() { + function getModelName(): string { return "User"; } - function getModelTable() { + function getModelTable(): string { return "User"; } - function isCachable() { + function isCachable(): bool { return false; } - function getCacheValidTime() { + function getCacheValidTime(): int { return -1; } /** * @return User */ - function getNullObject() { - $o = new User(-1, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null); - return $o; + function getNullObject(): User { + return new User(-1, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null); } /** @@ -32,9 +31,8 @@ function getNullObject() { * @param array $dict * @return User */ - function createObjectFromDict($pk, $dict) { - $o = new User($dict['userId'], $dict['username'], $dict['email'], $dict['passwordHash'], $dict['passwordSalt'], $dict['isValid'], $dict['isComputedPassword'], $dict['lastLoginDate'], $dict['registeredSince'], $dict['sessionLifetime'], $dict['rightGroupId'], $dict['yubikey'], $dict['otp1'], $dict['otp2'], $dict['otp3'], $dict['otp4']); - return $o; + function createObjectFromDict($pk, $dict): User { + return new User($dict['userId'], $dict['username'], $dict['email'], $dict['passwordHash'], $dict['passwordSalt'], $dict['isValid'], $dict['isComputedPassword'], $dict['lastLoginDate'], $dict['registeredSince'], $dict['sessionLifetime'], $dict['rightGroupId'], $dict['yubikey'], $dict['otp1'], $dict['otp2'], $dict['otp3'], $dict['otp4']); } /** @@ -66,9 +64,9 @@ function filter($options, $single = false) { /** * @param string $pk - * @return User + * @return ?User */ - function get($pk) { + function get($pk): ?User { return Util::cast(parent::get($pk), User::class); } @@ -76,7 +74,7 @@ function get($pk) { * @param User $model * @return User */ - function save($model) { + function save($model): User { return Util::cast(parent::save($model), User::class); } } \ No newline at end of file diff --git a/src/dba/models/Zap.class.php b/src/dba/models/Zap.class.php index 02641e632..65e05545e 100644 --- a/src/dba/models/Zap.class.php +++ b/src/dba/models/Zap.class.php @@ -3,13 +3,13 @@ namespace DBA; class Zap extends AbstractModel { - private $zapId; - private $hash; - private $solveTime; - private $agentId; - private $hashlistId; + private ?int $zapId; + private ?string $hash; + private ?int $solveTime; + private ?int $agentId; + private ?int $hashlistId; - function __construct($zapId, $hash, $solveTime, $agentId, $hashlistId) { + function __construct(?int $zapId, ?string $hash, ?int $solveTime, ?int $agentId, ?int $hashlistId) { $this->zapId = $zapId; $this->hash = $hash; $this->solveTime = $solveTime; @@ -17,7 +17,7 @@ function __construct($zapId, $hash, $solveTime, $agentId, $hashlistId) { $this->hashlistId = $hashlistId; } - function getKeyValueDict() { + function getKeyValueDict(): array { $dict = array(); $dict['zapId'] = $this->zapId; $dict['hash'] = $this->hash; @@ -28,7 +28,7 @@ function getKeyValueDict() { return $dict; } - static function getFeatures() { + static function getFeatures(): array { $dict = array(); $dict['zapId'] = ['read_only' => True, "type" => "int", "subtype" => "unset", "choices" => "unset", "null" => False, "pk" => True, "protected" => True, "private" => False, "alias" => "zapId", "public" => False]; $dict['hash'] = ['read_only' => True, "type" => "str(65535)", "subtype" => "unset", "choices" => "unset", "null" => False, "pk" => False, "protected" => True, "private" => False, "alias" => "hash", "public" => False]; @@ -39,19 +39,19 @@ static function getFeatures() { return $dict; } - function getPrimaryKey() { + function getPrimaryKey(): string { return "zapId"; } - function getPrimaryKeyValue() { + function getPrimaryKeyValue(): ?int { return $this->zapId; } - function getId() { + function getId(): ?int { return $this->zapId; } - function setId($id) { + function setId($id): void { $this->zapId = $id; } @@ -59,39 +59,39 @@ function setId($id) { * Used to serialize the data contained in the model * @return array */ - public function expose() { + public function expose(): array { return get_object_vars($this); } - function getHash() { + function getHash(): ?string { return $this->hash; } - function setHash($hash) { + function setHash(?string $hash): void { $this->hash = $hash; } - function getSolveTime() { + function getSolveTime(): ?int { return $this->solveTime; } - function setSolveTime($solveTime) { + function setSolveTime(?int $solveTime): void { $this->solveTime = $solveTime; } - function getAgentId() { + function getAgentId(): ?int { return $this->agentId; } - function setAgentId($agentId) { + function setAgentId(?int $agentId): void { $this->agentId = $agentId; } - function getHashlistId() { + function getHashlistId(): ?int { return $this->hashlistId; } - function setHashlistId($hashlistId) { + function setHashlistId(?int $hashlistId): void { $this->hashlistId = $hashlistId; } diff --git a/src/dba/models/ZapFactory.class.php b/src/dba/models/ZapFactory.class.php index cde91b304..c3a142607 100644 --- a/src/dba/models/ZapFactory.class.php +++ b/src/dba/models/ZapFactory.class.php @@ -3,28 +3,27 @@ namespace DBA; class ZapFactory extends AbstractModelFactory { - function getModelName() { + function getModelName(): string { return "Zap"; } - function getModelTable() { + function getModelTable(): string { return "Zap"; } - function isCachable() { + function isCachable(): bool { return false; } - function getCacheValidTime() { + function getCacheValidTime(): int { return -1; } /** * @return Zap */ - function getNullObject() { - $o = new Zap(-1, null, null, null, null); - return $o; + function getNullObject(): Zap { + return new Zap(-1, null, null, null, null); } /** @@ -32,9 +31,8 @@ function getNullObject() { * @param array $dict * @return Zap */ - function createObjectFromDict($pk, $dict) { - $o = new Zap($dict['zapId'], $dict['hash'], $dict['solveTime'], $dict['agentId'], $dict['hashlistId']); - return $o; + function createObjectFromDict($pk, $dict): Zap { + return new Zap($dict['zapId'], $dict['hash'], $dict['solveTime'], $dict['agentId'], $dict['hashlistId']); } /** @@ -66,9 +64,9 @@ function filter($options, $single = false) { /** * @param string $pk - * @return Zap + * @return ?Zap */ - function get($pk) { + function get($pk): ?Zap { return Util::cast(parent::get($pk), Zap::class); } @@ -76,7 +74,7 @@ function get($pk) { * @param Zap $model * @return Zap */ - function save($model) { + function save($model): Zap { return Util::cast(parent::save($model), Zap::class); } } \ No newline at end of file diff --git a/src/dba/models/generator.php b/src/dba/models/generator.php index f133b1fba..37d4de7cc 100644 --- a/src/dba/models/generator.php +++ b/src/dba/models/generator.php @@ -13,21 +13,21 @@ // Field choice declarations // $FieldIgnoreErrorsChoices = [ - [ 'key' => DAgentIgnoreErrors::NO, 'label' => 'Deactivate agent on error'], - [ 'key' => DAgentIgnoreErrors::IGNORE_SAVE, 'label' => 'Keep agent running, but save errors'], - [ 'key' => DAgentIgnoreErrors::IGNORE_NOSAVE, 'label' => 'Keep agent running and discard errors'], + ['key' => DAgentIgnoreErrors::NO, 'label' => 'Deactivate agent on error'], + ['key' => DAgentIgnoreErrors::IGNORE_SAVE, 'label' => 'Keep agent running, but save errors'], + ['key' => DAgentIgnoreErrors::IGNORE_NOSAVE, 'label' => 'Keep agent running and discard errors'], ]; $FieldTaskTypeChoices = [ - [ 'key' => DTaskTypes::NORMAL, 'label' => 'TaskType is Task'], - [ 'key' => DTaskTypes::SUPERTASK, 'label' => 'TaskType is Supertask'], + ['key' => DTaskTypes::NORMAL, 'label' => 'TaskType is Task'], + ['key' => DTaskTypes::SUPERTASK, 'label' => 'TaskType is Supertask'], ]; $FieldHashlistFormatChoices = [ - [ 'key' => DHashlistFormat::PLAIN, 'label' => 'Hashlist format is PLAIN'], - [ 'key' => DHashlistFormat::WPA, 'label' => 'Hashlist format is WPA'], - [ 'key' => DHashlistFormat::BINARY, 'label' => 'Hashlist format is BINARY'], - [ 'key' => DHashlistFormat::SUPERHASHLIST, 'label' => 'Hashlist is SUPERHASHLIST'], + ['key' => DHashlistFormat::PLAIN, 'label' => 'Hashlist format is PLAIN'], + ['key' => DHashlistFormat::WPA, 'label' => 'Hashlist format is WPA'], + ['key' => DHashlistFormat::BINARY, 'label' => 'Hashlist format is BINARY'], + ['key' => DHashlistFormat::SUPERHASHLIST, 'label' => 'Hashlist is SUPERHASHLIST'], ]; // Type: describes what kind of type the attribute is @@ -438,7 +438,7 @@ ['name' => 'lastLoginDate', 'read_only' => True, 'type' => 'int64', 'protected' => True], ['name' => 'registeredSince', 'read_only' => True, 'type' => 'int64', 'protected' => True], ['name' => 'sessionLifetime', 'read_only' => True, 'type' => 'int', 'protected' => True], - ['name' => 'rightGroupId', 'read_only' => False, 'type' => 'int', 'alias' => 'globalPermissionGroupId', 'relation' => 'RightGroup' ], + ['name' => 'rightGroupId', 'read_only' => False, 'type' => 'int', 'alias' => 'globalPermissionGroupId', 'relation' => 'RightGroup'], ['name' => 'yubikey', 'read_only' => True, 'type' => 'str(256)', 'protected' => True], ['name' => 'otp1', 'read_only' => True, 'type' => 'str(256)', 'protected' => True], ['name' => 'otp2', 'read_only' => True, 'type' => 'str(256)', 'protected' => True], @@ -495,12 +495,31 @@ ]; $CONF['HashlistHashlist'] = [ 'columns' => [ - ['name' => 'hashlistHashlistId', 'read_only' => True, 'type' => 'int', 'protected' => True], + ['name' => 'hashlistHashlistId', 'read_only' => True, 'type' => 'int', 'protected' => True], ['name' => 'parentHashlistId', 'read_only' => True, 'type' => 'int', 'relation' => 'Hashlist'], ['name' => 'hashlistId', 'read_only' => True, 'type' => 'int', 'relation' => 'Hashlist'], ], ]; +/** + * @throws Exception + */ +function getTypingType($str, $nullable = false): string { + if ($str == 'int' || $str == 'int64' || $str == 'uint64') { + return ($nullable ? '?' : '') . 'int'; + } + if (str_starts_with($str, "str(")) { + return ($nullable ? '?' : '') . 'string'; + } + if ($str == 'bool') { + return ($nullable ? '?' : '') . 'int'; + } + if ($str == 'array' || $str == 'dict') { + return ($nullable ? '?' : '') . 'string'; + } + throw new Exception("Cannot convert type " . $str); +} + foreach ($CONF as $NAME => $MODEL_CONF) { $COLUMNS = $MODEL_CONF['columns']; $class = file_get_contents(dirname(__FILE__) . "/AbstractModel.template.txt"); @@ -509,6 +528,7 @@ $init = array(); $keyVal = array(); $class = str_replace("__MODEL_PK__", $COLUMNS[0]['name'], $class); + $class = str_replace("__MODEL_PK_TYPE__", getTypingType($COLUMNS[0]['type'], false), $class); $features = array(); $functions = array(); $params = array(); @@ -516,38 +536,40 @@ $crud_defines = array(); foreach ($COLUMNS as $COLUMN) { $col = $COLUMN['name']; + $type = getTypingType($COLUMN['type'], !((isset($COLUMN['null']) && !$COLUMN['null']))); if (sizeof($vars) > 0) { - $getter = "function get" . strtoupper($col[0]) . substr($col, 1) . "() {\n return \$this->$col;\n }"; - $setter = "function set" . strtoupper($col[0]) . substr($col, 1) . "(\$$col) {\n \$this->$col = \$$col;\n }"; + $getter = "function get" . strtoupper($col[0]) . substr($col, 1) . "(): $type {\n return \$this->$col;\n }"; + $setter = "function set" . strtoupper($col[0]) . substr($col, 1) . "($type \$$col): void {\n \$this->$col = \$$col;\n }"; $functions[] = $getter; $functions[] = $setter; } - $params[] = "\$$col"; - $vars[] = "private \$$col;"; + $params[] = "$type \$$col"; + $vars[] = "private $type \$$col;"; $init[] = "\$this->$col = \$$col;"; - - if (array_key_exists("choices", $COLUMN)) { + + if (array_key_exists("choices", $COLUMN)) { $choicesVal = '['; foreach ($COLUMN['choices'] as $CHOICE) { $choicesVal .= $CHOICE['key'] . ' => "' . $CHOICE['label'] . '", '; } $choicesVal .= ']'; - } else { + } + else { $choicesVal = '"unset"'; } - - $features[] = "\$dict['$col'] = ['read_only' => " . ($COLUMN['read_only'] ? 'True' : "False") . ', ' . - '"type" => "' . $COLUMN['type'] . '", ' . - '"subtype" => "' . (array_key_exists("subtype", $COLUMN) ? $COLUMN['subtype'] : 'unset') . '", ' . - '"choices" => ' . $choicesVal . ', ' . - '"null" => ' . (array_key_exists("null", $COLUMN) ? ($COLUMN['null'] ? 'True' : 'False') : 'False') . ', ' . - '"pk" => ' . (($col == $COLUMNS[0]['name']) ? 'True' : 'False') . ', ' . - '"protected" => ' . (array_key_exists("protected", $COLUMN) ? ($COLUMN['protected'] ? 'True' : 'False') : 'False') . ', ' . - '"private" => ' . (array_key_exists("private", $COLUMN) ? ($COLUMN['private'] ? 'True' : 'False') : 'False') . ', ' . - '"alias" => "' . (array_key_exists("alias", $COLUMN) ? $COLUMN['alias'] : $COLUMN['name']) . '", ' . - '"public" => ' . (array_key_exists("public", $COLUMN) ? ($COLUMN['public'] ? 'True' : 'False') : 'False') . - '];'; + + $features[] = "\$dict['$col'] = ['read_only' => " . ($COLUMN['read_only'] ? 'True' : "False") . ', ' . + '"type" => "' . $COLUMN['type'] . '", ' . + '"subtype" => "' . (array_key_exists("subtype", $COLUMN) ? $COLUMN['subtype'] : 'unset') . '", ' . + '"choices" => ' . $choicesVal . ', ' . + '"null" => ' . (array_key_exists("null", $COLUMN) ? ($COLUMN['null'] ? 'True' : 'False') : 'False') . ', ' . + '"pk" => ' . (($col == $COLUMNS[0]['name']) ? 'True' : 'False') . ', ' . + '"protected" => ' . (array_key_exists("protected", $COLUMN) ? ($COLUMN['protected'] ? 'True' : 'False') : 'False') . ', ' . + '"private" => ' . (array_key_exists("private", $COLUMN) ? ($COLUMN['private'] ? 'True' : 'False') : 'False') . ', ' . + '"alias" => "' . (array_key_exists("alias", $COLUMN) ? $COLUMN['alias'] : $COLUMN['name']) . '", ' . + '"public" => ' . (array_key_exists("public", $COLUMN) ? ($COLUMN['public'] ? 'True' : 'False') : 'False') . + '];'; $keyVal[] = "\$dict['$col'] = \$this->$col;"; $variables[] = "const " . makeConstant($col) . " = \"$col\";"; @@ -557,7 +579,7 @@ $crud_defines[] = "const PERM_READ = \"perm" . $crud_prefix . "Read\";"; $crud_defines[] = "const PERM_UPDATE = \"perm" . $crud_prefix . "Update\";"; $crud_defines[] = "const PERM_DELETE = \"perm" . $crud_prefix . "Delete\";"; - + $class = str_replace("__MODEL_PARAMS__", implode(", ", $params), $class); $class = str_replace("__MODEL_VARS__", implode("\n ", $vars), $class); $class = str_replace("__MODEL_PARAMS_INIT__", implode("\n ", $init), $class); @@ -567,9 +589,7 @@ $class = str_replace("__MODEL_VARIABLE_NAMES__", implode("\n ", $variables), $class); $class = str_replace("__MODEL_PERMISSION_DEFINES__", implode("\n ", $crud_defines), $class); - if (true || !file_exists(dirname(__FILE__) . "/" . $NAME . ".class.php")) { - file_put_contents(dirname(__FILE__) . "/" . $NAME . ".class.php", $class); - } + file_put_contents(dirname(__FILE__) . "/" . $NAME . ".class.php", $class); $class = file_get_contents(dirname(__FILE__) . "/AbstractModelFactory.template.txt"); $class = str_replace("__MODEL_NAME__", $NAME, $class); @@ -589,9 +609,7 @@ $class = str_replace("__MODEL_DICT__", implode(", ", $dict), $class); $class = str_replace("__MODEL__DICT2__", implode(", ", $dict2), $class); - if (true || !file_exists(dirname(__FILE__) . "/" . $NAME . "Factory.class.php")) { - file_put_contents(dirname(__FILE__) . "/" . $NAME . "Factory.class.php", $class); - } + file_put_contents(dirname(__FILE__) . "/" . $NAME . "Factory.class.php", $class); } $class = file_get_contents(dirname(__FILE__) . "/Factory.template.txt"); diff --git a/src/inc/apiv2/common/AbstractModelAPI.class.php b/src/inc/apiv2/common/AbstractModelAPI.class.php index c1ff75269..d52120b40 100644 --- a/src/inc/apiv2/common/AbstractModelAPI.class.php +++ b/src/inc/apiv2/common/AbstractModelAPI.class.php @@ -778,7 +778,7 @@ public function count(Request $request, Response $response, array $args): Respon $count = $factory->countFilter($aFs); $meta = ["count" => $count]; - $include_total = $request->getQueryParams()['include_total']; + $include_total = $request->getQueryParams()['include_total'] ?? false; if ($include_total == "true") { $meta["total_count"] = $factory->countFilter([]); } @@ -823,33 +823,35 @@ public function getOne(Request $request, Response $response, array $args): Respo * @throws HTException * @throws HttpError * @throws HttpForbidden + * @throws ResourceNotFoundError */ public function patchOne(Request $request, Response $response, array $args): Response { $this->preCommon($request); - $objectId = $args['id']; - // $object = $this->doFetch($args['id']); + + // use doFetch to also have additional checks completed + $object = $this->doFetch($args['id']); $data = $request->getParsedBody()['data']; if (!$this->validateResourceRecord($data)) { return errorResponse($response, "No valid resource identifier object was given as data!", 403); } - $aliasedfeatures = $this->getAliasedFeatures(); + $aliasedFeatures = $this->getAliasedFeatures(); $attributes = $data['attributes']; // Validate incoming data foreach (array_keys($attributes) as $key) { // Ensure key can be updated - $this->isAllowedToMutate($aliasedfeatures, $key); + $this->isAllowedToMutate($aliasedFeatures, $key); } // Validate input data if it matches the correct type or subtype - $this->validateData($attributes, $aliasedfeatures); + $this->validateData($attributes, $aliasedFeatures); // This does the real things, patch the values that were sent in the data. - $mappedData = $this->unaliasData($attributes, $aliasedfeatures); - $this->updateObject($objectId, $mappedData); + $mappedData = $this->unaliasData($attributes, $aliasedFeatures); + $this->updateObject($object->getId(), $mappedData); // Return updated object - $newObject = $this->getFactory()->get($objectId); + $newObject = $this->getFactory()->get($object->getId()); return self::getOneResource($this, $newObject, $request, $response, 200); } diff --git a/src/inc/user-api/UserAPIConfig.class.php b/src/inc/user-api/UserAPIConfig.class.php index 431cff2a8..0670cedfb 100644 --- a/src/inc/user-api/UserAPIConfig.class.php +++ b/src/inc/user-api/UserAPIConfig.class.php @@ -69,12 +69,15 @@ private function setConfig($QUERY) { } break; case DConfigType::TICKBOX: - if (!is_bool($config->getValue())) { + if ($config->getValue() != '1' && $config->getValue()) { throw new HTException("Value most be boolean!"); } # Workaround, inserting 'false' into text field will cause an empty field. - if ($config->getValue() === false) { - $config->setValue(0); + if (!$config->getValue()) { + $config->setValue('0'); + } + else{ + $config->setValue('1'); } break; case DConfigType::SELECT: From e541f64c8d4fe4f1b59a6fe37eadc91ef55cdc91 Mon Sep 17 00:00:00 2001 From: coiseiw Date: Mon, 30 Jun 2025 16:51:15 +0200 Subject: [PATCH 109/691] Including some comments from Christoffer, manual for local server from Markus, SuperTask Builder and some minor fix --- doc/README.md | 20 - doc/TODO-notes_manual.txt | 6 +- doc/apiv2.md | 30491 ---------------- doc/assets/images/logo2.png | Bin 0 -> 56632 bytes .../advanced_install.md | 71 + doc/installation_guidelines/update.md | 6 +- doc/user_manual/basic_workflow.md | 2 +- doc/user_manual/files.md | 2 +- doc/user_manual/hashlist.md | 21 +- doc/user_manual/tasks.md | 8 +- 10 files changed, 95 insertions(+), 30532 deletions(-) delete mode 100644 doc/README.md delete mode 100644 doc/apiv2.md create mode 100644 doc/assets/images/logo2.png diff --git a/doc/README.md b/doc/README.md deleted file mode 100644 index 3c9bdf60f..000000000 --- a/doc/README.md +++ /dev/null @@ -1,20 +0,0 @@ -# Documentation Development - -This page describes how to use the documentation locally or how to contribute to it. - -## Setup - -1. Make sure you are in the root of the server project and setup a virtual enviroment there. -2. Install mkdocs -3. Install required mkdocs extensions -4. Start the server -5. Browse to http://127.0.0.1:8000 - -``` bash -cd hashtopolis -virtualenv venv -source venv/bin/activate -pip3 install mkdocs -pip3 install $(mkdocs get-deps) -mkdocs serve -``` diff --git a/doc/TODO-notes_manual.txt b/doc/TODO-notes_manual.txt index 3fb61e3a6..6ca7be8ed 100644 --- a/doc/TODO-notes_manual.txt +++ b/doc/TODO-notes_manual.txt @@ -5,7 +5,7 @@ - booting from PxE, running hashtopolis as a service ? - Check if any difference for Agent overview in new interface - Hashtypes --> review hashcat --exam -- make an example of import super task to make it clearer +- make an example of supertask builder to make it clearer - Task overview is missing !!! - Creating an example of preprocessors in the preprocessors binary to simplify the related section in task creation - Explaining the global interface of hashtopolis @@ -13,4 +13,6 @@ - Agent installation is not compliant with v2 - Pictures for installation - Sein: Review contribution guidelines -- Hashlist page, define what is cracking position \ No newline at end of file +- Hashlist page, define what is cracking position +- change the port 8080 to 4200 in the installation part + add a note for the old ui +- Mac OS installation \ No newline at end of file diff --git a/doc/apiv2.md b/doc/apiv2.md deleted file mode 100644 index a7e822934..000000000 --- a/doc/apiv2.md +++ /dev/null @@ -1,30491 +0,0 @@ -# Hashtopolis API - -> Version v2 - -## Path Table - -| Method | Path | Description | -| --- | --- | --- | -| GET | [/api/v2/ui/accessgroups](#getapiv2uiaccessgroups) | | -| POST | [/api/v2/ui/accessgroups](#postapiv2uiaccessgroups) | | -| GET | [/api/v2/ui/accessgroups/count](#getapiv2uiaccessgroupscount) | | -| GET | [/api/v2/ui/accessgroups/{id:[0-9]+}/{relation:userMembers}](#getapiv2uiaccessgroupsid0-9relationusermembers) | | -| GET | [/api/v2/ui/accessgroups/{id:[0-9]+}/relationships/{relation:userMembers}](#getapiv2uiaccessgroupsid0-9relationshipsrelationusermembers) | | -| PATCH | [/api/v2/ui/accessgroups/{id:[0-9]+}/relationships/{relation:userMembers}](#patchapiv2uiaccessgroupsid0-9relationshipsrelationusermembers) | | -| POST | [/api/v2/ui/accessgroups/{id:[0-9]+}/relationships/{relation:userMembers}](#postapiv2uiaccessgroupsid0-9relationshipsrelationusermembers) | | -| DELETE | [/api/v2/ui/accessgroups/{id:[0-9]+}/relationships/{relation:userMembers}](#deleteapiv2uiaccessgroupsid0-9relationshipsrelationusermembers) | | -| GET | [/api/v2/ui/accessgroups/{id:[0-9]+}/{relation:agentMembers}](#getapiv2uiaccessgroupsid0-9relationagentmembers) | | -| GET | [/api/v2/ui/accessgroups/{id:[0-9]+}/relationships/{relation:agentMembers}](#getapiv2uiaccessgroupsid0-9relationshipsrelationagentmembers) | | -| PATCH | [/api/v2/ui/accessgroups/{id:[0-9]+}/relationships/{relation:agentMembers}](#patchapiv2uiaccessgroupsid0-9relationshipsrelationagentmembers) | | -| POST | [/api/v2/ui/accessgroups/{id:[0-9]+}/relationships/{relation:agentMembers}](#postapiv2uiaccessgroupsid0-9relationshipsrelationagentmembers) | | -| DELETE | [/api/v2/ui/accessgroups/{id:[0-9]+}/relationships/{relation:agentMembers}](#deleteapiv2uiaccessgroupsid0-9relationshipsrelationagentmembers) | | -| GET | [/api/v2/ui/accessgroups/{id:[0-9]+}](#getapiv2uiaccessgroupsid0-9) | | -| PATCH | [/api/v2/ui/accessgroups/{id:[0-9]+}](#patchapiv2uiaccessgroupsid0-9) | | -| DELETE | [/api/v2/ui/accessgroups/{id:[0-9]+}](#deleteapiv2uiaccessgroupsid0-9) | | -| GET | [/api/v2/ui/agentassignments](#getapiv2uiagentassignments) | | -| POST | [/api/v2/ui/agentassignments](#postapiv2uiagentassignments) | | -| GET | [/api/v2/ui/agentassignments/count](#getapiv2uiagentassignmentscount) | | -| GET | [/api/v2/ui/agentassignments/{id:[0-9]+}/{relation:agent}](#getapiv2uiagentassignmentsid0-9relationagent) | | -| GET | [/api/v2/ui/agentassignments/{id:[0-9]+}/relationships/{relation:agent}](#getapiv2uiagentassignmentsid0-9relationshipsrelationagent) | | -| PATCH | [/api/v2/ui/agentassignments/{id:[0-9]+}/relationships/{relation:agent}](#patchapiv2uiagentassignmentsid0-9relationshipsrelationagent) | | -| GET | [/api/v2/ui/agentassignments/{id:[0-9]+}/{relation:task}](#getapiv2uiagentassignmentsid0-9relationtask) | | -| GET | [/api/v2/ui/agentassignments/{id:[0-9]+}/relationships/{relation:task}](#getapiv2uiagentassignmentsid0-9relationshipsrelationtask) | | -| PATCH | [/api/v2/ui/agentassignments/{id:[0-9]+}/relationships/{relation:task}](#patchapiv2uiagentassignmentsid0-9relationshipsrelationtask) | | -| GET | [/api/v2/ui/agentassignments/{id:[0-9]+}](#getapiv2uiagentassignmentsid0-9) | | -| DELETE | [/api/v2/ui/agentassignments/{id:[0-9]+}](#deleteapiv2uiagentassignmentsid0-9) | | -| GET | [/api/v2/ui/agentbinaries](#getapiv2uiagentbinaries) | | -| POST | [/api/v2/ui/agentbinaries](#postapiv2uiagentbinaries) | | -| GET | [/api/v2/ui/agentbinaries/count](#getapiv2uiagentbinariescount) | | -| GET | [/api/v2/ui/agentbinaries/{id:[0-9]+}](#getapiv2uiagentbinariesid0-9) | | -| PATCH | [/api/v2/ui/agentbinaries/{id:[0-9]+}](#patchapiv2uiagentbinariesid0-9) | | -| DELETE | [/api/v2/ui/agentbinaries/{id:[0-9]+}](#deleteapiv2uiagentbinariesid0-9) | | -| GET | [/api/v2/ui/agents](#getapiv2uiagents) | | -| GET | [/api/v2/ui/agents/count](#getapiv2uiagentscount) | | -| GET | [/api/v2/ui/agents/{id:[0-9]+}/{relation:accessGroups}](#getapiv2uiagentsid0-9relationaccessgroups) | | -| GET | [/api/v2/ui/agents/{id:[0-9]+}/relationships/{relation:accessGroups}](#getapiv2uiagentsid0-9relationshipsrelationaccessgroups) | | -| PATCH | [/api/v2/ui/agents/{id:[0-9]+}/relationships/{relation:accessGroups}](#patchapiv2uiagentsid0-9relationshipsrelationaccessgroups) | | -| POST | [/api/v2/ui/agents/{id:[0-9]+}/relationships/{relation:accessGroups}](#postapiv2uiagentsid0-9relationshipsrelationaccessgroups) | | -| DELETE | [/api/v2/ui/agents/{id:[0-9]+}/relationships/{relation:accessGroups}](#deleteapiv2uiagentsid0-9relationshipsrelationaccessgroups) | | -| GET | [/api/v2/ui/agents/{id:[0-9]+}/{relation:agentStats}](#getapiv2uiagentsid0-9relationagentstats) | | -| GET | [/api/v2/ui/agents/{id:[0-9]+}/relationships/{relation:agentStats}](#getapiv2uiagentsid0-9relationshipsrelationagentstats) | | -| PATCH | [/api/v2/ui/agents/{id:[0-9]+}/relationships/{relation:agentStats}](#patchapiv2uiagentsid0-9relationshipsrelationagentstats) | | -| POST | [/api/v2/ui/agents/{id:[0-9]+}/relationships/{relation:agentStats}](#postapiv2uiagentsid0-9relationshipsrelationagentstats) | | -| DELETE | [/api/v2/ui/agents/{id:[0-9]+}/relationships/{relation:agentStats}](#deleteapiv2uiagentsid0-9relationshipsrelationagentstats) | | -| GET | [/api/v2/ui/agents/{id:[0-9]+}](#getapiv2uiagentsid0-9) | | -| PATCH | [/api/v2/ui/agents/{id:[0-9]+}](#patchapiv2uiagentsid0-9) | | -| DELETE | [/api/v2/ui/agents/{id:[0-9]+}](#deleteapiv2uiagentsid0-9) | | -| GET | [/api/v2/ui/agentstats](#getapiv2uiagentstats) | | -| GET | [/api/v2/ui/agentstats/count](#getapiv2uiagentstatscount) | | -| GET | [/api/v2/ui/agentstats/{id:[0-9]+}](#getapiv2uiagentstatsid0-9) | | -| DELETE | [/api/v2/ui/agentstats/{id:[0-9]+}](#deleteapiv2uiagentstatsid0-9) | | -| GET | [/api/v2/ui/chunks](#getapiv2uichunks) | | -| GET | [/api/v2/ui/chunks/count](#getapiv2uichunkscount) | | -| GET | [/api/v2/ui/chunks/{id:[0-9]+}/{relation:agent}](#getapiv2uichunksid0-9relationagent) | | -| GET | [/api/v2/ui/chunks/{id:[0-9]+}/relationships/{relation:agent}](#getapiv2uichunksid0-9relationshipsrelationagent) | | -| PATCH | [/api/v2/ui/chunks/{id:[0-9]+}/relationships/{relation:agent}](#patchapiv2uichunksid0-9relationshipsrelationagent) | | -| GET | [/api/v2/ui/chunks/{id:[0-9]+}/{relation:task}](#getapiv2uichunksid0-9relationtask) | | -| GET | [/api/v2/ui/chunks/{id:[0-9]+}/relationships/{relation:task}](#getapiv2uichunksid0-9relationshipsrelationtask) | | -| PATCH | [/api/v2/ui/chunks/{id:[0-9]+}/relationships/{relation:task}](#patchapiv2uichunksid0-9relationshipsrelationtask) | | -| GET | [/api/v2/ui/chunks/{id:[0-9]+}](#getapiv2uichunksid0-9) | | -| GET | [/api/v2/ui/configs](#getapiv2uiconfigs) | | -| GET | [/api/v2/ui/configs/count](#getapiv2uiconfigscount) | | -| GET | [/api/v2/ui/configs/{id:[0-9]+}/{relation:configSection}](#getapiv2uiconfigsid0-9relationconfigsection) | | -| GET | [/api/v2/ui/configs/{id:[0-9]+}/relationships/{relation:configSection}](#getapiv2uiconfigsid0-9relationshipsrelationconfigsection) | | -| PATCH | [/api/v2/ui/configs/{id:[0-9]+}/relationships/{relation:configSection}](#patchapiv2uiconfigsid0-9relationshipsrelationconfigsection) | | -| GET | [/api/v2/ui/configs/{id:[0-9]+}](#getapiv2uiconfigsid0-9) | | -| PATCH | [/api/v2/ui/configs/{id:[0-9]+}](#patchapiv2uiconfigsid0-9) | | -| GET | [/api/v2/ui/configsections](#getapiv2uiconfigsections) | | -| GET | [/api/v2/ui/configsections/count](#getapiv2uiconfigsectionscount) | | -| GET | [/api/v2/ui/configsections/{id:[0-9]+}](#getapiv2uiconfigsectionsid0-9) | | -| GET | [/api/v2/ui/crackers](#getapiv2uicrackers) | | -| POST | [/api/v2/ui/crackers](#postapiv2uicrackers) | | -| GET | [/api/v2/ui/crackers/count](#getapiv2uicrackerscount) | | -| GET | [/api/v2/ui/crackers/{id:[0-9]+}/{relation:crackerBinaryType}](#getapiv2uicrackersid0-9relationcrackerbinarytype) | | -| GET | [/api/v2/ui/crackers/{id:[0-9]+}/relationships/{relation:crackerBinaryType}](#getapiv2uicrackersid0-9relationshipsrelationcrackerbinarytype) | | -| PATCH | [/api/v2/ui/crackers/{id:[0-9]+}/relationships/{relation:crackerBinaryType}](#patchapiv2uicrackersid0-9relationshipsrelationcrackerbinarytype) | | -| GET | [/api/v2/ui/crackers/{id:[0-9]+}/{relation:tasks}](#getapiv2uicrackersid0-9relationtasks) | | -| GET | [/api/v2/ui/crackers/{id:[0-9]+}/relationships/{relation:tasks}](#getapiv2uicrackersid0-9relationshipsrelationtasks) | | -| PATCH | [/api/v2/ui/crackers/{id:[0-9]+}/relationships/{relation:tasks}](#patchapiv2uicrackersid0-9relationshipsrelationtasks) | | -| POST | [/api/v2/ui/crackers/{id:[0-9]+}/relationships/{relation:tasks}](#postapiv2uicrackersid0-9relationshipsrelationtasks) | | -| DELETE | [/api/v2/ui/crackers/{id:[0-9]+}/relationships/{relation:tasks}](#deleteapiv2uicrackersid0-9relationshipsrelationtasks) | | -| GET | [/api/v2/ui/crackers/{id:[0-9]+}](#getapiv2uicrackersid0-9) | | -| PATCH | [/api/v2/ui/crackers/{id:[0-9]+}](#patchapiv2uicrackersid0-9) | | -| DELETE | [/api/v2/ui/crackers/{id:[0-9]+}](#deleteapiv2uicrackersid0-9) | | -| GET | [/api/v2/ui/crackertypes](#getapiv2uicrackertypes) | | -| POST | [/api/v2/ui/crackertypes](#postapiv2uicrackertypes) | | -| GET | [/api/v2/ui/crackertypes/count](#getapiv2uicrackertypescount) | | -| GET | [/api/v2/ui/crackertypes/{id:[0-9]+}/{relation:crackerVersions}](#getapiv2uicrackertypesid0-9relationcrackerversions) | | -| GET | [/api/v2/ui/crackertypes/{id:[0-9]+}/relationships/{relation:crackerVersions}](#getapiv2uicrackertypesid0-9relationshipsrelationcrackerversions) | | -| PATCH | [/api/v2/ui/crackertypes/{id:[0-9]+}/relationships/{relation:crackerVersions}](#patchapiv2uicrackertypesid0-9relationshipsrelationcrackerversions) | | -| POST | [/api/v2/ui/crackertypes/{id:[0-9]+}/relationships/{relation:crackerVersions}](#postapiv2uicrackertypesid0-9relationshipsrelationcrackerversions) | | -| DELETE | [/api/v2/ui/crackertypes/{id:[0-9]+}/relationships/{relation:crackerVersions}](#deleteapiv2uicrackertypesid0-9relationshipsrelationcrackerversions) | | -| GET | [/api/v2/ui/crackertypes/{id:[0-9]+}/{relation:tasks}](#getapiv2uicrackertypesid0-9relationtasks) | | -| GET | [/api/v2/ui/crackertypes/{id:[0-9]+}/relationships/{relation:tasks}](#getapiv2uicrackertypesid0-9relationshipsrelationtasks) | | -| PATCH | [/api/v2/ui/crackertypes/{id:[0-9]+}/relationships/{relation:tasks}](#patchapiv2uicrackertypesid0-9relationshipsrelationtasks) | | -| POST | [/api/v2/ui/crackertypes/{id:[0-9]+}/relationships/{relation:tasks}](#postapiv2uicrackertypesid0-9relationshipsrelationtasks) | | -| DELETE | [/api/v2/ui/crackertypes/{id:[0-9]+}/relationships/{relation:tasks}](#deleteapiv2uicrackertypesid0-9relationshipsrelationtasks) | | -| GET | [/api/v2/ui/crackertypes/{id:[0-9]+}](#getapiv2uicrackertypesid0-9) | | -| PATCH | [/api/v2/ui/crackertypes/{id:[0-9]+}](#patchapiv2uicrackertypesid0-9) | | -| DELETE | [/api/v2/ui/crackertypes/{id:[0-9]+}](#deleteapiv2uicrackertypesid0-9) | | -| GET | [/api/v2/ui/files](#getapiv2uifiles) | | -| POST | [/api/v2/ui/files](#postapiv2uifiles) | | -| GET | [/api/v2/ui/files/count](#getapiv2uifilescount) | | -| GET | [/api/v2/ui/files/{id:[0-9]+}/{relation:accessGroup}](#getapiv2uifilesid0-9relationaccessgroup) | | -| GET | [/api/v2/ui/files/{id:[0-9]+}/relationships/{relation:accessGroup}](#getapiv2uifilesid0-9relationshipsrelationaccessgroup) | | -| PATCH | [/api/v2/ui/files/{id:[0-9]+}/relationships/{relation:accessGroup}](#patchapiv2uifilesid0-9relationshipsrelationaccessgroup) | | -| GET | [/api/v2/ui/files/{id:[0-9]+}](#getapiv2uifilesid0-9) | | -| PATCH | [/api/v2/ui/files/{id:[0-9]+}](#patchapiv2uifilesid0-9) | | -| DELETE | [/api/v2/ui/files/{id:[0-9]+}](#deleteapiv2uifilesid0-9) | | -| GET | [/api/v2/ui/globalpermissiongroups](#getapiv2uiglobalpermissiongroups) | | -| POST | [/api/v2/ui/globalpermissiongroups](#postapiv2uiglobalpermissiongroups) | | -| GET | [/api/v2/ui/globalpermissiongroups/count](#getapiv2uiglobalpermissiongroupscount) | | -| GET | [/api/v2/ui/globalpermissiongroups/{id:[0-9]+}/{relation:userMembers}](#getapiv2uiglobalpermissiongroupsid0-9relationusermembers) | | -| GET | [/api/v2/ui/globalpermissiongroups/{id:[0-9]+}/relationships/{relation:userMembers}](#getapiv2uiglobalpermissiongroupsid0-9relationshipsrelationusermembers) | | -| PATCH | [/api/v2/ui/globalpermissiongroups/{id:[0-9]+}/relationships/{relation:userMembers}](#patchapiv2uiglobalpermissiongroupsid0-9relationshipsrelationusermembers) | | -| POST | [/api/v2/ui/globalpermissiongroups/{id:[0-9]+}/relationships/{relation:userMembers}](#postapiv2uiglobalpermissiongroupsid0-9relationshipsrelationusermembers) | | -| DELETE | [/api/v2/ui/globalpermissiongroups/{id:[0-9]+}/relationships/{relation:userMembers}](#deleteapiv2uiglobalpermissiongroupsid0-9relationshipsrelationusermembers) | | -| GET | [/api/v2/ui/globalpermissiongroups/{id:[0-9]+}](#getapiv2uiglobalpermissiongroupsid0-9) | | -| PATCH | [/api/v2/ui/globalpermissiongroups/{id:[0-9]+}](#patchapiv2uiglobalpermissiongroupsid0-9) | | -| DELETE | [/api/v2/ui/globalpermissiongroups/{id:[0-9]+}](#deleteapiv2uiglobalpermissiongroupsid0-9) | | -| GET | [/api/v2/ui/hashes](#getapiv2uihashes) | | -| GET | [/api/v2/ui/hashes/count](#getapiv2uihashescount) | | -| GET | [/api/v2/ui/hashes/{id:[0-9]+}/{relation:chunk}](#getapiv2uihashesid0-9relationchunk) | | -| GET | [/api/v2/ui/hashes/{id:[0-9]+}/relationships/{relation:chunk}](#getapiv2uihashesid0-9relationshipsrelationchunk) | | -| PATCH | [/api/v2/ui/hashes/{id:[0-9]+}/relationships/{relation:chunk}](#patchapiv2uihashesid0-9relationshipsrelationchunk) | | -| GET | [/api/v2/ui/hashes/{id:[0-9]+}/{relation:hashlist}](#getapiv2uihashesid0-9relationhashlist) | | -| GET | [/api/v2/ui/hashes/{id:[0-9]+}/relationships/{relation:hashlist}](#getapiv2uihashesid0-9relationshipsrelationhashlist) | | -| PATCH | [/api/v2/ui/hashes/{id:[0-9]+}/relationships/{relation:hashlist}](#patchapiv2uihashesid0-9relationshipsrelationhashlist) | | -| GET | [/api/v2/ui/hashes/{id:[0-9]+}](#getapiv2uihashesid0-9) | | -| GET | [/api/v2/ui/hashlists](#getapiv2uihashlists) | | -| POST | [/api/v2/ui/hashlists](#postapiv2uihashlists) | | -| GET | [/api/v2/ui/hashlists/count](#getapiv2uihashlistscount) | | -| GET | [/api/v2/ui/hashlists/{id:[0-9]+}/{relation:accessGroup}](#getapiv2uihashlistsid0-9relationaccessgroup) | | -| GET | [/api/v2/ui/hashlists/{id:[0-9]+}/relationships/{relation:accessGroup}](#getapiv2uihashlistsid0-9relationshipsrelationaccessgroup) | | -| PATCH | [/api/v2/ui/hashlists/{id:[0-9]+}/relationships/{relation:accessGroup}](#patchapiv2uihashlistsid0-9relationshipsrelationaccessgroup) | | -| GET | [/api/v2/ui/hashlists/{id:[0-9]+}/{relation:hashType}](#getapiv2uihashlistsid0-9relationhashtype) | | -| GET | [/api/v2/ui/hashlists/{id:[0-9]+}/relationships/{relation:hashType}](#getapiv2uihashlistsid0-9relationshipsrelationhashtype) | | -| PATCH | [/api/v2/ui/hashlists/{id:[0-9]+}/relationships/{relation:hashType}](#patchapiv2uihashlistsid0-9relationshipsrelationhashtype) | | -| GET | [/api/v2/ui/hashlists/{id:[0-9]+}/{relation:hashes}](#getapiv2uihashlistsid0-9relationhashes) | | -| GET | [/api/v2/ui/hashlists/{id:[0-9]+}/relationships/{relation:hashes}](#getapiv2uihashlistsid0-9relationshipsrelationhashes) | | -| PATCH | [/api/v2/ui/hashlists/{id:[0-9]+}/relationships/{relation:hashes}](#patchapiv2uihashlistsid0-9relationshipsrelationhashes) | | -| POST | [/api/v2/ui/hashlists/{id:[0-9]+}/relationships/{relation:hashes}](#postapiv2uihashlistsid0-9relationshipsrelationhashes) | | -| DELETE | [/api/v2/ui/hashlists/{id:[0-9]+}/relationships/{relation:hashes}](#deleteapiv2uihashlistsid0-9relationshipsrelationhashes) | | -| GET | [/api/v2/ui/hashlists/{id:[0-9]+}/{relation:hashlists}](#getapiv2uihashlistsid0-9relationhashlists) | | -| GET | [/api/v2/ui/hashlists/{id:[0-9]+}/relationships/{relation:hashlists}](#getapiv2uihashlistsid0-9relationshipsrelationhashlists) | | -| PATCH | [/api/v2/ui/hashlists/{id:[0-9]+}/relationships/{relation:hashlists}](#patchapiv2uihashlistsid0-9relationshipsrelationhashlists) | | -| POST | [/api/v2/ui/hashlists/{id:[0-9]+}/relationships/{relation:hashlists}](#postapiv2uihashlistsid0-9relationshipsrelationhashlists) | | -| DELETE | [/api/v2/ui/hashlists/{id:[0-9]+}/relationships/{relation:hashlists}](#deleteapiv2uihashlistsid0-9relationshipsrelationhashlists) | | -| GET | [/api/v2/ui/hashlists/{id:[0-9]+}/{relation:tasks}](#getapiv2uihashlistsid0-9relationtasks) | | -| GET | [/api/v2/ui/hashlists/{id:[0-9]+}/relationships/{relation:tasks}](#getapiv2uihashlistsid0-9relationshipsrelationtasks) | | -| PATCH | [/api/v2/ui/hashlists/{id:[0-9]+}/relationships/{relation:tasks}](#patchapiv2uihashlistsid0-9relationshipsrelationtasks) | | -| POST | [/api/v2/ui/hashlists/{id:[0-9]+}/relationships/{relation:tasks}](#postapiv2uihashlistsid0-9relationshipsrelationtasks) | | -| DELETE | [/api/v2/ui/hashlists/{id:[0-9]+}/relationships/{relation:tasks}](#deleteapiv2uihashlistsid0-9relationshipsrelationtasks) | | -| GET | [/api/v2/ui/hashlists/{id:[0-9]+}](#getapiv2uihashlistsid0-9) | | -| PATCH | [/api/v2/ui/hashlists/{id:[0-9]+}](#patchapiv2uihashlistsid0-9) | | -| DELETE | [/api/v2/ui/hashlists/{id:[0-9]+}](#deleteapiv2uihashlistsid0-9) | | -| GET | [/api/v2/ui/hashtypes](#getapiv2uihashtypes) | | -| POST | [/api/v2/ui/hashtypes](#postapiv2uihashtypes) | | -| GET | [/api/v2/ui/hashtypes/count](#getapiv2uihashtypescount) | | -| GET | [/api/v2/ui/hashtypes/{id:[0-9]+}](#getapiv2uihashtypesid0-9) | | -| PATCH | [/api/v2/ui/hashtypes/{id:[0-9]+}](#patchapiv2uihashtypesid0-9) | | -| DELETE | [/api/v2/ui/hashtypes/{id:[0-9]+}](#deleteapiv2uihashtypesid0-9) | | -| GET | [/api/v2/ui/healthcheckagents](#getapiv2uihealthcheckagents) | | -| GET | [/api/v2/ui/healthcheckagents/count](#getapiv2uihealthcheckagentscount) | | -| GET | [/api/v2/ui/healthcheckagents/{id:[0-9]+}/{relation:agent}](#getapiv2uihealthcheckagentsid0-9relationagent) | | -| GET | [/api/v2/ui/healthcheckagents/{id:[0-9]+}/relationships/{relation:agent}](#getapiv2uihealthcheckagentsid0-9relationshipsrelationagent) | | -| PATCH | [/api/v2/ui/healthcheckagents/{id:[0-9]+}/relationships/{relation:agent}](#patchapiv2uihealthcheckagentsid0-9relationshipsrelationagent) | | -| GET | [/api/v2/ui/healthcheckagents/{id:[0-9]+}/{relation:healthCheck}](#getapiv2uihealthcheckagentsid0-9relationhealthcheck) | | -| GET | [/api/v2/ui/healthcheckagents/{id:[0-9]+}/relationships/{relation:healthCheck}](#getapiv2uihealthcheckagentsid0-9relationshipsrelationhealthcheck) | | -| PATCH | [/api/v2/ui/healthcheckagents/{id:[0-9]+}/relationships/{relation:healthCheck}](#patchapiv2uihealthcheckagentsid0-9relationshipsrelationhealthcheck) | | -| GET | [/api/v2/ui/healthcheckagents/{id:[0-9]+}](#getapiv2uihealthcheckagentsid0-9) | | -| GET | [/api/v2/ui/healthchecks](#getapiv2uihealthchecks) | | -| POST | [/api/v2/ui/healthchecks](#postapiv2uihealthchecks) | | -| GET | [/api/v2/ui/healthchecks/count](#getapiv2uihealthcheckscount) | | -| GET | [/api/v2/ui/healthchecks/{id:[0-9]+}/{relation:crackerBinary}](#getapiv2uihealthchecksid0-9relationcrackerbinary) | | -| GET | [/api/v2/ui/healthchecks/{id:[0-9]+}/relationships/{relation:crackerBinary}](#getapiv2uihealthchecksid0-9relationshipsrelationcrackerbinary) | | -| PATCH | [/api/v2/ui/healthchecks/{id:[0-9]+}/relationships/{relation:crackerBinary}](#patchapiv2uihealthchecksid0-9relationshipsrelationcrackerbinary) | | -| GET | [/api/v2/ui/healthchecks/{id:[0-9]+}/{relation:healthCheckAgents}](#getapiv2uihealthchecksid0-9relationhealthcheckagents) | | -| GET | [/api/v2/ui/healthchecks/{id:[0-9]+}/relationships/{relation:healthCheckAgents}](#getapiv2uihealthchecksid0-9relationshipsrelationhealthcheckagents) | | -| PATCH | [/api/v2/ui/healthchecks/{id:[0-9]+}/relationships/{relation:healthCheckAgents}](#patchapiv2uihealthchecksid0-9relationshipsrelationhealthcheckagents) | | -| POST | [/api/v2/ui/healthchecks/{id:[0-9]+}/relationships/{relation:healthCheckAgents}](#postapiv2uihealthchecksid0-9relationshipsrelationhealthcheckagents) | | -| DELETE | [/api/v2/ui/healthchecks/{id:[0-9]+}/relationships/{relation:healthCheckAgents}](#deleteapiv2uihealthchecksid0-9relationshipsrelationhealthcheckagents) | | -| GET | [/api/v2/ui/healthchecks/{id:[0-9]+}](#getapiv2uihealthchecksid0-9) | | -| PATCH | [/api/v2/ui/healthchecks/{id:[0-9]+}](#patchapiv2uihealthchecksid0-9) | | -| DELETE | [/api/v2/ui/healthchecks/{id:[0-9]+}](#deleteapiv2uihealthchecksid0-9) | | -| GET | [/api/v2/ui/logentries](#getapiv2uilogentries) | | -| POST | [/api/v2/ui/logentries](#postapiv2uilogentries) | | -| GET | [/api/v2/ui/logentries/count](#getapiv2uilogentriescount) | | -| GET | [/api/v2/ui/logentries/{id:[0-9]+}](#getapiv2uilogentriesid0-9) | | -| PATCH | [/api/v2/ui/logentries/{id:[0-9]+}](#patchapiv2uilogentriesid0-9) | | -| DELETE | [/api/v2/ui/logentries/{id:[0-9]+}](#deleteapiv2uilogentriesid0-9) | | -| GET | [/api/v2/ui/notifications](#getapiv2uinotifications) | | -| POST | [/api/v2/ui/notifications](#postapiv2uinotifications) | | -| GET | [/api/v2/ui/notifications/count](#getapiv2uinotificationscount) | | -| GET | [/api/v2/ui/notifications/{id:[0-9]+}/{relation:user}](#getapiv2uinotificationsid0-9relationuser) | | -| GET | [/api/v2/ui/notifications/{id:[0-9]+}/relationships/{relation:user}](#getapiv2uinotificationsid0-9relationshipsrelationuser) | | -| PATCH | [/api/v2/ui/notifications/{id:[0-9]+}/relationships/{relation:user}](#patchapiv2uinotificationsid0-9relationshipsrelationuser) | | -| GET | [/api/v2/ui/notifications/{id:[0-9]+}](#getapiv2uinotificationsid0-9) | | -| PATCH | [/api/v2/ui/notifications/{id:[0-9]+}](#patchapiv2uinotificationsid0-9) | | -| DELETE | [/api/v2/ui/notifications/{id:[0-9]+}](#deleteapiv2uinotificationsid0-9) | | -| GET | [/api/v2/ui/preprocessors](#getapiv2uipreprocessors) | | -| POST | [/api/v2/ui/preprocessors](#postapiv2uipreprocessors) | | -| GET | [/api/v2/ui/preprocessors/count](#getapiv2uipreprocessorscount) | | -| GET | [/api/v2/ui/preprocessors/{id:[0-9]+}](#getapiv2uipreprocessorsid0-9) | | -| PATCH | [/api/v2/ui/preprocessors/{id:[0-9]+}](#patchapiv2uipreprocessorsid0-9) | | -| DELETE | [/api/v2/ui/preprocessors/{id:[0-9]+}](#deleteapiv2uipreprocessorsid0-9) | | -| GET | [/api/v2/ui/pretasks](#getapiv2uipretasks) | | -| POST | [/api/v2/ui/pretasks](#postapiv2uipretasks) | | -| GET | [/api/v2/ui/pretasks/count](#getapiv2uipretaskscount) | | -| GET | [/api/v2/ui/pretasks/{id:[0-9]+}/{relation:pretaskFiles}](#getapiv2uipretasksid0-9relationpretaskfiles) | | -| GET | [/api/v2/ui/pretasks/{id:[0-9]+}/relationships/{relation:pretaskFiles}](#getapiv2uipretasksid0-9relationshipsrelationpretaskfiles) | | -| PATCH | [/api/v2/ui/pretasks/{id:[0-9]+}/relationships/{relation:pretaskFiles}](#patchapiv2uipretasksid0-9relationshipsrelationpretaskfiles) | | -| POST | [/api/v2/ui/pretasks/{id:[0-9]+}/relationships/{relation:pretaskFiles}](#postapiv2uipretasksid0-9relationshipsrelationpretaskfiles) | | -| DELETE | [/api/v2/ui/pretasks/{id:[0-9]+}/relationships/{relation:pretaskFiles}](#deleteapiv2uipretasksid0-9relationshipsrelationpretaskfiles) | | -| GET | [/api/v2/ui/pretasks/{id:[0-9]+}](#getapiv2uipretasksid0-9) | | -| PATCH | [/api/v2/ui/pretasks/{id:[0-9]+}](#patchapiv2uipretasksid0-9) | | -| DELETE | [/api/v2/ui/pretasks/{id:[0-9]+}](#deleteapiv2uipretasksid0-9) | | -| GET | [/api/v2/ui/speeds](#getapiv2uispeeds) | | -| GET | [/api/v2/ui/speeds/count](#getapiv2uispeedscount) | | -| GET | [/api/v2/ui/speeds/{id:[0-9]+}/{relation:agent}](#getapiv2uispeedsid0-9relationagent) | | -| GET | [/api/v2/ui/speeds/{id:[0-9]+}/relationships/{relation:agent}](#getapiv2uispeedsid0-9relationshipsrelationagent) | | -| PATCH | [/api/v2/ui/speeds/{id:[0-9]+}/relationships/{relation:agent}](#patchapiv2uispeedsid0-9relationshipsrelationagent) | | -| GET | [/api/v2/ui/speeds/{id:[0-9]+}/{relation:task}](#getapiv2uispeedsid0-9relationtask) | | -| GET | [/api/v2/ui/speeds/{id:[0-9]+}/relationships/{relation:task}](#getapiv2uispeedsid0-9relationshipsrelationtask) | | -| PATCH | [/api/v2/ui/speeds/{id:[0-9]+}/relationships/{relation:task}](#patchapiv2uispeedsid0-9relationshipsrelationtask) | | -| GET | [/api/v2/ui/speeds/{id:[0-9]+}](#getapiv2uispeedsid0-9) | | -| GET | [/api/v2/ui/supertasks](#getapiv2uisupertasks) | | -| POST | [/api/v2/ui/supertasks](#postapiv2uisupertasks) | | -| GET | [/api/v2/ui/supertasks/count](#getapiv2uisupertaskscount) | | -| GET | [/api/v2/ui/supertasks/{id:[0-9]+}/{relation:pretasks}](#getapiv2uisupertasksid0-9relationpretasks) | | -| GET | [/api/v2/ui/supertasks/{id:[0-9]+}/relationships/{relation:pretasks}](#getapiv2uisupertasksid0-9relationshipsrelationpretasks) | | -| PATCH | [/api/v2/ui/supertasks/{id:[0-9]+}/relationships/{relation:pretasks}](#patchapiv2uisupertasksid0-9relationshipsrelationpretasks) | | -| POST | [/api/v2/ui/supertasks/{id:[0-9]+}/relationships/{relation:pretasks}](#postapiv2uisupertasksid0-9relationshipsrelationpretasks) | | -| DELETE | [/api/v2/ui/supertasks/{id:[0-9]+}/relationships/{relation:pretasks}](#deleteapiv2uisupertasksid0-9relationshipsrelationpretasks) | | -| GET | [/api/v2/ui/supertasks/{id:[0-9]+}](#getapiv2uisupertasksid0-9) | | -| PATCH | [/api/v2/ui/supertasks/{id:[0-9]+}](#patchapiv2uisupertasksid0-9) | | -| DELETE | [/api/v2/ui/supertasks/{id:[0-9]+}](#deleteapiv2uisupertasksid0-9) | | -| GET | [/api/v2/ui/tasks](#getapiv2uitasks) | | -| POST | [/api/v2/ui/tasks](#postapiv2uitasks) | | -| GET | [/api/v2/ui/tasks/count](#getapiv2uitaskscount) | | -| GET | [/api/v2/ui/tasks/{id:[0-9]+}/{relation:crackerBinary}](#getapiv2uitasksid0-9relationcrackerbinary) | | -| GET | [/api/v2/ui/tasks/{id:[0-9]+}/relationships/{relation:crackerBinary}](#getapiv2uitasksid0-9relationshipsrelationcrackerbinary) | | -| PATCH | [/api/v2/ui/tasks/{id:[0-9]+}/relationships/{relation:crackerBinary}](#patchapiv2uitasksid0-9relationshipsrelationcrackerbinary) | | -| GET | [/api/v2/ui/tasks/{id:[0-9]+}/{relation:crackerBinaryType}](#getapiv2uitasksid0-9relationcrackerbinarytype) | | -| GET | [/api/v2/ui/tasks/{id:[0-9]+}/relationships/{relation:crackerBinaryType}](#getapiv2uitasksid0-9relationshipsrelationcrackerbinarytype) | | -| PATCH | [/api/v2/ui/tasks/{id:[0-9]+}/relationships/{relation:crackerBinaryType}](#patchapiv2uitasksid0-9relationshipsrelationcrackerbinarytype) | | -| GET | [/api/v2/ui/tasks/{id:[0-9]+}/{relation:hashlist}](#getapiv2uitasksid0-9relationhashlist) | | -| GET | [/api/v2/ui/tasks/{id:[0-9]+}/relationships/{relation:hashlist}](#getapiv2uitasksid0-9relationshipsrelationhashlist) | | -| PATCH | [/api/v2/ui/tasks/{id:[0-9]+}/relationships/{relation:hashlist}](#patchapiv2uitasksid0-9relationshipsrelationhashlist) | | -| GET | [/api/v2/ui/tasks/{id:[0-9]+}/{relation:assignedAgents}](#getapiv2uitasksid0-9relationassignedagents) | | -| GET | [/api/v2/ui/tasks/{id:[0-9]+}/relationships/{relation:assignedAgents}](#getapiv2uitasksid0-9relationshipsrelationassignedagents) | | -| PATCH | [/api/v2/ui/tasks/{id:[0-9]+}/relationships/{relation:assignedAgents}](#patchapiv2uitasksid0-9relationshipsrelationassignedagents) | | -| POST | [/api/v2/ui/tasks/{id:[0-9]+}/relationships/{relation:assignedAgents}](#postapiv2uitasksid0-9relationshipsrelationassignedagents) | | -| DELETE | [/api/v2/ui/tasks/{id:[0-9]+}/relationships/{relation:assignedAgents}](#deleteapiv2uitasksid0-9relationshipsrelationassignedagents) | | -| GET | [/api/v2/ui/tasks/{id:[0-9]+}/{relation:files}](#getapiv2uitasksid0-9relationfiles) | | -| GET | [/api/v2/ui/tasks/{id:[0-9]+}/relationships/{relation:files}](#getapiv2uitasksid0-9relationshipsrelationfiles) | | -| PATCH | [/api/v2/ui/tasks/{id:[0-9]+}/relationships/{relation:files}](#patchapiv2uitasksid0-9relationshipsrelationfiles) | | -| POST | [/api/v2/ui/tasks/{id:[0-9]+}/relationships/{relation:files}](#postapiv2uitasksid0-9relationshipsrelationfiles) | | -| DELETE | [/api/v2/ui/tasks/{id:[0-9]+}/relationships/{relation:files}](#deleteapiv2uitasksid0-9relationshipsrelationfiles) | | -| GET | [/api/v2/ui/tasks/{id:[0-9]+}/{relation:speeds}](#getapiv2uitasksid0-9relationspeeds) | | -| GET | [/api/v2/ui/tasks/{id:[0-9]+}/relationships/{relation:speeds}](#getapiv2uitasksid0-9relationshipsrelationspeeds) | | -| PATCH | [/api/v2/ui/tasks/{id:[0-9]+}/relationships/{relation:speeds}](#patchapiv2uitasksid0-9relationshipsrelationspeeds) | | -| POST | [/api/v2/ui/tasks/{id:[0-9]+}/relationships/{relation:speeds}](#postapiv2uitasksid0-9relationshipsrelationspeeds) | | -| DELETE | [/api/v2/ui/tasks/{id:[0-9]+}/relationships/{relation:speeds}](#deleteapiv2uitasksid0-9relationshipsrelationspeeds) | | -| GET | [/api/v2/ui/tasks/{id:[0-9]+}](#getapiv2uitasksid0-9) | | -| PATCH | [/api/v2/ui/tasks/{id:[0-9]+}](#patchapiv2uitasksid0-9) | | -| DELETE | [/api/v2/ui/tasks/{id:[0-9]+}](#deleteapiv2uitasksid0-9) | | -| GET | [/api/v2/ui/taskwrappers](#getapiv2uitaskwrappers) | | -| GET | [/api/v2/ui/taskwrappers/count](#getapiv2uitaskwrapperscount) | | -| GET | [/api/v2/ui/taskwrappers/{id:[0-9]+}/{relation:accessGroup}](#getapiv2uitaskwrappersid0-9relationaccessgroup) | | -| GET | [/api/v2/ui/taskwrappers/{id:[0-9]+}/relationships/{relation:accessGroup}](#getapiv2uitaskwrappersid0-9relationshipsrelationaccessgroup) | | -| PATCH | [/api/v2/ui/taskwrappers/{id:[0-9]+}/relationships/{relation:accessGroup}](#patchapiv2uitaskwrappersid0-9relationshipsrelationaccessgroup) | | -| GET | [/api/v2/ui/taskwrappers/{id:[0-9]+}/{relation:tasks}](#getapiv2uitaskwrappersid0-9relationtasks) | | -| GET | [/api/v2/ui/taskwrappers/{id:[0-9]+}/relationships/{relation:tasks}](#getapiv2uitaskwrappersid0-9relationshipsrelationtasks) | | -| PATCH | [/api/v2/ui/taskwrappers/{id:[0-9]+}/relationships/{relation:tasks}](#patchapiv2uitaskwrappersid0-9relationshipsrelationtasks) | | -| POST | [/api/v2/ui/taskwrappers/{id:[0-9]+}/relationships/{relation:tasks}](#postapiv2uitaskwrappersid0-9relationshipsrelationtasks) | | -| DELETE | [/api/v2/ui/taskwrappers/{id:[0-9]+}/relationships/{relation:tasks}](#deleteapiv2uitaskwrappersid0-9relationshipsrelationtasks) | | -| GET | [/api/v2/ui/taskwrappers/{id:[0-9]+}](#getapiv2uitaskwrappersid0-9) | | -| PATCH | [/api/v2/ui/taskwrappers/{id:[0-9]+}](#patchapiv2uitaskwrappersid0-9) | | -| DELETE | [/api/v2/ui/taskwrappers/{id:[0-9]+}](#deleteapiv2uitaskwrappersid0-9) | | -| GET | [/api/v2/ui/users](#getapiv2uiusers) | | -| POST | [/api/v2/ui/users](#postapiv2uiusers) | | -| GET | [/api/v2/ui/users/count](#getapiv2uiuserscount) | | -| GET | [/api/v2/ui/users/{id:[0-9]+}/{relation:globalPermissionGroup}](#getapiv2uiusersid0-9relationglobalpermissiongroup) | | -| GET | [/api/v2/ui/users/{id:[0-9]+}/relationships/{relation:globalPermissionGroup}](#getapiv2uiusersid0-9relationshipsrelationglobalpermissiongroup) | | -| PATCH | [/api/v2/ui/users/{id:[0-9]+}/relationships/{relation:globalPermissionGroup}](#patchapiv2uiusersid0-9relationshipsrelationglobalpermissiongroup) | | -| GET | [/api/v2/ui/users/{id:[0-9]+}/{relation:accessGroups}](#getapiv2uiusersid0-9relationaccessgroups) | | -| GET | [/api/v2/ui/users/{id:[0-9]+}/relationships/{relation:accessGroups}](#getapiv2uiusersid0-9relationshipsrelationaccessgroups) | | -| PATCH | [/api/v2/ui/users/{id:[0-9]+}/relationships/{relation:accessGroups}](#patchapiv2uiusersid0-9relationshipsrelationaccessgroups) | | -| POST | [/api/v2/ui/users/{id:[0-9]+}/relationships/{relation:accessGroups}](#postapiv2uiusersid0-9relationshipsrelationaccessgroups) | | -| DELETE | [/api/v2/ui/users/{id:[0-9]+}/relationships/{relation:accessGroups}](#deleteapiv2uiusersid0-9relationshipsrelationaccessgroups) | | -| GET | [/api/v2/ui/users/{id:[0-9]+}](#getapiv2uiusersid0-9) | | -| PATCH | [/api/v2/ui/users/{id:[0-9]+}](#patchapiv2uiusersid0-9) | | -| DELETE | [/api/v2/ui/users/{id:[0-9]+}](#deleteapiv2uiusersid0-9) | | -| GET | [/api/v2/ui/vouchers](#getapiv2uivouchers) | | -| POST | [/api/v2/ui/vouchers](#postapiv2uivouchers) | | -| GET | [/api/v2/ui/vouchers/count](#getapiv2uivoucherscount) | | -| GET | [/api/v2/ui/vouchers/{id:[0-9]+}](#getapiv2uivouchersid0-9) | | -| PATCH | [/api/v2/ui/vouchers/{id:[0-9]+}](#patchapiv2uivouchersid0-9) | | -| DELETE | [/api/v2/ui/vouchers/{id:[0-9]+}](#deleteapiv2uivouchersid0-9) | | -| POST | [/api/v2/auth/token](#postapiv2authtoken) | | - -## Reference Table - -| Name | Path | Description | -| --- | --- | --- | -| ListResponse | [#/components/schemas/ListResponse](#componentsschemaslistresponse) | | -| ErrorResponse | [#/components/schemas/ErrorResponse](#componentsschemaserrorresponse) | | -| NotFoundResponse | [#/components/schemas/NotFoundResponse](#componentsschemasnotfoundresponse) | | -| AccessGroupCreate | [#/components/schemas/AccessGroupCreate](#componentsschemasaccessgroupcreate) | | -| AccessGroupPatch | [#/components/schemas/AccessGroupPatch](#componentsschemasaccessgrouppatch) | | -| AccessGroupResponse | [#/components/schemas/AccessGroupResponse](#componentsschemasaccessgroupresponse) | | -| AccessGroupSingleResponse | [#/components/schemas/AccessGroupSingleResponse](#componentsschemasaccessgroupsingleresponse) | | -| AccessGroupPostPatchResponse | [#/components/schemas/AccessGroupPostPatchResponse](#componentsschemasaccessgrouppostpatchresponse) | | -| AccessGroupListResponse | [#/components/schemas/AccessGroupListResponse](#componentsschemasaccessgrouplistresponse) | | -| AssignmentCreate | [#/components/schemas/AssignmentCreate](#componentsschemasassignmentcreate) | | -| AssignmentPatch | [#/components/schemas/AssignmentPatch](#componentsschemasassignmentpatch) | | -| AssignmentResponse | [#/components/schemas/AssignmentResponse](#componentsschemasassignmentresponse) | | -| AssignmentSingleResponse | [#/components/schemas/AssignmentSingleResponse](#componentsschemasassignmentsingleresponse) | | -| AssignmentPostPatchResponse | [#/components/schemas/AssignmentPostPatchResponse](#componentsschemasassignmentpostpatchresponse) | | -| AssignmentListResponse | [#/components/schemas/AssignmentListResponse](#componentsschemasassignmentlistresponse) | | -| AgentBinaryCreate | [#/components/schemas/AgentBinaryCreate](#componentsschemasagentbinarycreate) | | -| AgentBinaryPatch | [#/components/schemas/AgentBinaryPatch](#componentsschemasagentbinarypatch) | | -| AgentBinaryResponse | [#/components/schemas/AgentBinaryResponse](#componentsschemasagentbinaryresponse) | | -| AgentBinarySingleResponse | [#/components/schemas/AgentBinarySingleResponse](#componentsschemasagentbinarysingleresponse) | | -| AgentBinaryPostPatchResponse | [#/components/schemas/AgentBinaryPostPatchResponse](#componentsschemasagentbinarypostpatchresponse) | | -| AgentBinaryListResponse | [#/components/schemas/AgentBinaryListResponse](#componentsschemasagentbinarylistresponse) | | -| AgentCreate | [#/components/schemas/AgentCreate](#componentsschemasagentcreate) | | -| AgentPatch | [#/components/schemas/AgentPatch](#componentsschemasagentpatch) | | -| AgentResponse | [#/components/schemas/AgentResponse](#componentsschemasagentresponse) | | -| AgentSingleResponse | [#/components/schemas/AgentSingleResponse](#componentsschemasagentsingleresponse) | | -| AgentPostPatchResponse | [#/components/schemas/AgentPostPatchResponse](#componentsschemasagentpostpatchresponse) | | -| AgentListResponse | [#/components/schemas/AgentListResponse](#componentsschemasagentlistresponse) | | -| AgentStatCreate | [#/components/schemas/AgentStatCreate](#componentsschemasagentstatcreate) | | -| AgentStatPatch | [#/components/schemas/AgentStatPatch](#componentsschemasagentstatpatch) | | -| AgentStatResponse | [#/components/schemas/AgentStatResponse](#componentsschemasagentstatresponse) | | -| AgentStatSingleResponse | [#/components/schemas/AgentStatSingleResponse](#componentsschemasagentstatsingleresponse) | | -| AgentStatPostPatchResponse | [#/components/schemas/AgentStatPostPatchResponse](#componentsschemasagentstatpostpatchresponse) | | -| AgentStatListResponse | [#/components/schemas/AgentStatListResponse](#componentsschemasagentstatlistresponse) | | -| ChunkCreate | [#/components/schemas/ChunkCreate](#componentsschemaschunkcreate) | | -| ChunkPatch | [#/components/schemas/ChunkPatch](#componentsschemaschunkpatch) | | -| ChunkResponse | [#/components/schemas/ChunkResponse](#componentsschemaschunkresponse) | | -| ChunkSingleResponse | [#/components/schemas/ChunkSingleResponse](#componentsschemaschunksingleresponse) | | -| ChunkPostPatchResponse | [#/components/schemas/ChunkPostPatchResponse](#componentsschemaschunkpostpatchresponse) | | -| ChunkListResponse | [#/components/schemas/ChunkListResponse](#componentsschemaschunklistresponse) | | -| ConfigCreate | [#/components/schemas/ConfigCreate](#componentsschemasconfigcreate) | | -| ConfigPatch | [#/components/schemas/ConfigPatch](#componentsschemasconfigpatch) | | -| ConfigResponse | [#/components/schemas/ConfigResponse](#componentsschemasconfigresponse) | | -| ConfigSingleResponse | [#/components/schemas/ConfigSingleResponse](#componentsschemasconfigsingleresponse) | | -| ConfigPostPatchResponse | [#/components/schemas/ConfigPostPatchResponse](#componentsschemasconfigpostpatchresponse) | | -| ConfigListResponse | [#/components/schemas/ConfigListResponse](#componentsschemasconfiglistresponse) | | -| ConfigSectionCreate | [#/components/schemas/ConfigSectionCreate](#componentsschemasconfigsectioncreate) | | -| ConfigSectionPatch | [#/components/schemas/ConfigSectionPatch](#componentsschemasconfigsectionpatch) | | -| ConfigSectionResponse | [#/components/schemas/ConfigSectionResponse](#componentsschemasconfigsectionresponse) | | -| ConfigSectionSingleResponse | [#/components/schemas/ConfigSectionSingleResponse](#componentsschemasconfigsectionsingleresponse) | | -| ConfigSectionPostPatchResponse | [#/components/schemas/ConfigSectionPostPatchResponse](#componentsschemasconfigsectionpostpatchresponse) | | -| ConfigSectionListResponse | [#/components/schemas/ConfigSectionListResponse](#componentsschemasconfigsectionlistresponse) | | -| CrackerBinaryCreate | [#/components/schemas/CrackerBinaryCreate](#componentsschemascrackerbinarycreate) | | -| CrackerBinaryPatch | [#/components/schemas/CrackerBinaryPatch](#componentsschemascrackerbinarypatch) | | -| CrackerBinaryResponse | [#/components/schemas/CrackerBinaryResponse](#componentsschemascrackerbinaryresponse) | | -| CrackerBinarySingleResponse | [#/components/schemas/CrackerBinarySingleResponse](#componentsschemascrackerbinarysingleresponse) | | -| CrackerBinaryPostPatchResponse | [#/components/schemas/CrackerBinaryPostPatchResponse](#componentsschemascrackerbinarypostpatchresponse) | | -| CrackerBinaryListResponse | [#/components/schemas/CrackerBinaryListResponse](#componentsschemascrackerbinarylistresponse) | | -| CrackerBinaryTypeCreate | [#/components/schemas/CrackerBinaryTypeCreate](#componentsschemascrackerbinarytypecreate) | | -| CrackerBinaryTypePatch | [#/components/schemas/CrackerBinaryTypePatch](#componentsschemascrackerbinarytypepatch) | | -| CrackerBinaryTypeResponse | [#/components/schemas/CrackerBinaryTypeResponse](#componentsschemascrackerbinarytyperesponse) | | -| CrackerBinaryTypeSingleResponse | [#/components/schemas/CrackerBinaryTypeSingleResponse](#componentsschemascrackerbinarytypesingleresponse) | | -| CrackerBinaryTypePostPatchResponse | [#/components/schemas/CrackerBinaryTypePostPatchResponse](#componentsschemascrackerbinarytypepostpatchresponse) | | -| CrackerBinaryTypeListResponse | [#/components/schemas/CrackerBinaryTypeListResponse](#componentsschemascrackerbinarytypelistresponse) | | -| FileCreate | [#/components/schemas/FileCreate](#componentsschemasfilecreate) | | -| FilePatch | [#/components/schemas/FilePatch](#componentsschemasfilepatch) | | -| FileResponse | [#/components/schemas/FileResponse](#componentsschemasfileresponse) | | -| FileSingleResponse | [#/components/schemas/FileSingleResponse](#componentsschemasfilesingleresponse) | | -| FilePostPatchResponse | [#/components/schemas/FilePostPatchResponse](#componentsschemasfilepostpatchresponse) | | -| FileListResponse | [#/components/schemas/FileListResponse](#componentsschemasfilelistresponse) | | -| RightGroupCreate | [#/components/schemas/RightGroupCreate](#componentsschemasrightgroupcreate) | | -| RightGroupPatch | [#/components/schemas/RightGroupPatch](#componentsschemasrightgrouppatch) | | -| RightGroupResponse | [#/components/schemas/RightGroupResponse](#componentsschemasrightgroupresponse) | | -| RightGroupSingleResponse | [#/components/schemas/RightGroupSingleResponse](#componentsschemasrightgroupsingleresponse) | | -| RightGroupPostPatchResponse | [#/components/schemas/RightGroupPostPatchResponse](#componentsschemasrightgrouppostpatchresponse) | | -| RightGroupListResponse | [#/components/schemas/RightGroupListResponse](#componentsschemasrightgrouplistresponse) | | -| HashCreate | [#/components/schemas/HashCreate](#componentsschemashashcreate) | | -| HashPatch | [#/components/schemas/HashPatch](#componentsschemashashpatch) | | -| HashResponse | [#/components/schemas/HashResponse](#componentsschemashashresponse) | | -| HashSingleResponse | [#/components/schemas/HashSingleResponse](#componentsschemashashsingleresponse) | | -| HashPostPatchResponse | [#/components/schemas/HashPostPatchResponse](#componentsschemashashpostpatchresponse) | | -| HashListResponse | [#/components/schemas/HashListResponse](#componentsschemashashlistresponse) | | -| HashlistCreate | [#/components/schemas/HashlistCreate](#componentsschemashashlistcreate) | | -| HashlistPatch | [#/components/schemas/HashlistPatch](#componentsschemashashlistpatch) | | -| HashlistResponse | [#/components/schemas/HashlistResponse](#componentsschemashashlistresponse) | | -| HashlistSingleResponse | [#/components/schemas/HashlistSingleResponse](#componentsschemashashlistsingleresponse) | | -| HashlistPostPatchResponse | [#/components/schemas/HashlistPostPatchResponse](#componentsschemashashlistpostpatchresponse) | | -| HashlistListResponse | [#/components/schemas/HashlistListResponse](#componentsschemashashlistlistresponse) | | -| HashTypeCreate | [#/components/schemas/HashTypeCreate](#componentsschemashashtypecreate) | | -| HashTypePatch | [#/components/schemas/HashTypePatch](#componentsschemashashtypepatch) | | -| HashTypeResponse | [#/components/schemas/HashTypeResponse](#componentsschemashashtyperesponse) | | -| HashTypeSingleResponse | [#/components/schemas/HashTypeSingleResponse](#componentsschemashashtypesingleresponse) | | -| HashTypePostPatchResponse | [#/components/schemas/HashTypePostPatchResponse](#componentsschemashashtypepostpatchresponse) | | -| HashTypeListResponse | [#/components/schemas/HashTypeListResponse](#componentsschemashashtypelistresponse) | | -| HealthCheckAgentCreate | [#/components/schemas/HealthCheckAgentCreate](#componentsschemashealthcheckagentcreate) | | -| HealthCheckAgentPatch | [#/components/schemas/HealthCheckAgentPatch](#componentsschemashealthcheckagentpatch) | | -| HealthCheckAgentResponse | [#/components/schemas/HealthCheckAgentResponse](#componentsschemashealthcheckagentresponse) | | -| HealthCheckAgentSingleResponse | [#/components/schemas/HealthCheckAgentSingleResponse](#componentsschemashealthcheckagentsingleresponse) | | -| HealthCheckAgentPostPatchResponse | [#/components/schemas/HealthCheckAgentPostPatchResponse](#componentsschemashealthcheckagentpostpatchresponse) | | -| HealthCheckAgentListResponse | [#/components/schemas/HealthCheckAgentListResponse](#componentsschemashealthcheckagentlistresponse) | | -| HealthCheckCreate | [#/components/schemas/HealthCheckCreate](#componentsschemashealthcheckcreate) | | -| HealthCheckPatch | [#/components/schemas/HealthCheckPatch](#componentsschemashealthcheckpatch) | | -| HealthCheckResponse | [#/components/schemas/HealthCheckResponse](#componentsschemashealthcheckresponse) | | -| HealthCheckSingleResponse | [#/components/schemas/HealthCheckSingleResponse](#componentsschemashealthchecksingleresponse) | | -| HealthCheckPostPatchResponse | [#/components/schemas/HealthCheckPostPatchResponse](#componentsschemashealthcheckpostpatchresponse) | | -| HealthCheckListResponse | [#/components/schemas/HealthCheckListResponse](#componentsschemashealthchecklistresponse) | | -| LogEntryCreate | [#/components/schemas/LogEntryCreate](#componentsschemaslogentrycreate) | | -| LogEntryPatch | [#/components/schemas/LogEntryPatch](#componentsschemaslogentrypatch) | | -| LogEntryResponse | [#/components/schemas/LogEntryResponse](#componentsschemaslogentryresponse) | | -| LogEntrySingleResponse | [#/components/schemas/LogEntrySingleResponse](#componentsschemaslogentrysingleresponse) | | -| LogEntryPostPatchResponse | [#/components/schemas/LogEntryPostPatchResponse](#componentsschemaslogentrypostpatchresponse) | | -| LogEntryListResponse | [#/components/schemas/LogEntryListResponse](#componentsschemaslogentrylistresponse) | | -| NotificationSettingCreate | [#/components/schemas/NotificationSettingCreate](#componentsschemasnotificationsettingcreate) | | -| NotificationSettingPatch | [#/components/schemas/NotificationSettingPatch](#componentsschemasnotificationsettingpatch) | | -| NotificationSettingResponse | [#/components/schemas/NotificationSettingResponse](#componentsschemasnotificationsettingresponse) | | -| NotificationSettingSingleResponse | [#/components/schemas/NotificationSettingSingleResponse](#componentsschemasnotificationsettingsingleresponse) | | -| NotificationSettingPostPatchResponse | [#/components/schemas/NotificationSettingPostPatchResponse](#componentsschemasnotificationsettingpostpatchresponse) | | -| NotificationSettingListResponse | [#/components/schemas/NotificationSettingListResponse](#componentsschemasnotificationsettinglistresponse) | | -| PreprocessorCreate | [#/components/schemas/PreprocessorCreate](#componentsschemaspreprocessorcreate) | | -| PreprocessorPatch | [#/components/schemas/PreprocessorPatch](#componentsschemaspreprocessorpatch) | | -| PreprocessorResponse | [#/components/schemas/PreprocessorResponse](#componentsschemaspreprocessorresponse) | | -| PreprocessorSingleResponse | [#/components/schemas/PreprocessorSingleResponse](#componentsschemaspreprocessorsingleresponse) | | -| PreprocessorPostPatchResponse | [#/components/schemas/PreprocessorPostPatchResponse](#componentsschemaspreprocessorpostpatchresponse) | | -| PreprocessorListResponse | [#/components/schemas/PreprocessorListResponse](#componentsschemaspreprocessorlistresponse) | | -| PretaskCreate | [#/components/schemas/PretaskCreate](#componentsschemaspretaskcreate) | | -| PretaskPatch | [#/components/schemas/PretaskPatch](#componentsschemaspretaskpatch) | | -| PretaskResponse | [#/components/schemas/PretaskResponse](#componentsschemaspretaskresponse) | | -| PretaskSingleResponse | [#/components/schemas/PretaskSingleResponse](#componentsschemaspretasksingleresponse) | | -| PretaskPostPatchResponse | [#/components/schemas/PretaskPostPatchResponse](#componentsschemaspretaskpostpatchresponse) | | -| PretaskListResponse | [#/components/schemas/PretaskListResponse](#componentsschemaspretasklistresponse) | | -| SpeedCreate | [#/components/schemas/SpeedCreate](#componentsschemasspeedcreate) | | -| SpeedPatch | [#/components/schemas/SpeedPatch](#componentsschemasspeedpatch) | | -| SpeedResponse | [#/components/schemas/SpeedResponse](#componentsschemasspeedresponse) | | -| SpeedSingleResponse | [#/components/schemas/SpeedSingleResponse](#componentsschemasspeedsingleresponse) | | -| SpeedPostPatchResponse | [#/components/schemas/SpeedPostPatchResponse](#componentsschemasspeedpostpatchresponse) | | -| SpeedListResponse | [#/components/schemas/SpeedListResponse](#componentsschemasspeedlistresponse) | | -| SupertaskCreate | [#/components/schemas/SupertaskCreate](#componentsschemassupertaskcreate) | | -| SupertaskPatch | [#/components/schemas/SupertaskPatch](#componentsschemassupertaskpatch) | | -| SupertaskResponse | [#/components/schemas/SupertaskResponse](#componentsschemassupertaskresponse) | | -| SupertaskSingleResponse | [#/components/schemas/SupertaskSingleResponse](#componentsschemassupertasksingleresponse) | | -| SupertaskPostPatchResponse | [#/components/schemas/SupertaskPostPatchResponse](#componentsschemassupertaskpostpatchresponse) | | -| SupertaskListResponse | [#/components/schemas/SupertaskListResponse](#componentsschemassupertasklistresponse) | | -| TaskCreate | [#/components/schemas/TaskCreate](#componentsschemastaskcreate) | | -| TaskPatch | [#/components/schemas/TaskPatch](#componentsschemastaskpatch) | | -| TaskResponse | [#/components/schemas/TaskResponse](#componentsschemastaskresponse) | | -| TaskSingleResponse | [#/components/schemas/TaskSingleResponse](#componentsschemastasksingleresponse) | | -| TaskPostPatchResponse | [#/components/schemas/TaskPostPatchResponse](#componentsschemastaskpostpatchresponse) | | -| TaskListResponse | [#/components/schemas/TaskListResponse](#componentsschemastasklistresponse) | | -| TaskWrapperCreate | [#/components/schemas/TaskWrapperCreate](#componentsschemastaskwrappercreate) | | -| TaskWrapperPatch | [#/components/schemas/TaskWrapperPatch](#componentsschemastaskwrapperpatch) | | -| TaskWrapperResponse | [#/components/schemas/TaskWrapperResponse](#componentsschemastaskwrapperresponse) | | -| TaskWrapperSingleResponse | [#/components/schemas/TaskWrapperSingleResponse](#componentsschemastaskwrappersingleresponse) | | -| TaskWrapperPostPatchResponse | [#/components/schemas/TaskWrapperPostPatchResponse](#componentsschemastaskwrapperpostpatchresponse) | | -| TaskWrapperListResponse | [#/components/schemas/TaskWrapperListResponse](#componentsschemastaskwrapperlistresponse) | | -| UserCreate | [#/components/schemas/UserCreate](#componentsschemasusercreate) | | -| UserPatch | [#/components/schemas/UserPatch](#componentsschemasuserpatch) | | -| UserResponse | [#/components/schemas/UserResponse](#componentsschemasuserresponse) | | -| UserSingleResponse | [#/components/schemas/UserSingleResponse](#componentsschemasusersingleresponse) | | -| UserPostPatchResponse | [#/components/schemas/UserPostPatchResponse](#componentsschemasuserpostpatchresponse) | | -| UserListResponse | [#/components/schemas/UserListResponse](#componentsschemasuserlistresponse) | | -| RegVoucherCreate | [#/components/schemas/RegVoucherCreate](#componentsschemasregvouchercreate) | | -| RegVoucherPatch | [#/components/schemas/RegVoucherPatch](#componentsschemasregvoucherpatch) | | -| RegVoucherResponse | [#/components/schemas/RegVoucherResponse](#componentsschemasregvoucherresponse) | | -| RegVoucherSingleResponse | [#/components/schemas/RegVoucherSingleResponse](#componentsschemasregvouchersingleresponse) | | -| RegVoucherPostPatchResponse | [#/components/schemas/RegVoucherPostPatchResponse](#componentsschemasregvoucherpostpatchresponse) | | -| RegVoucherListResponse | [#/components/schemas/RegVoucherListResponse](#componentsschemasregvoucherlistresponse) | | -| Token | [#/components/schemas/Token](#componentsschemastoken) | | -| TokenRequest | [#/components/schemas/TokenRequest](#componentsschemastokenrequest) | | -| ObjectRequest | [#/components/schemas/ObjectRequest](#componentsschemasobjectrequest) | | -| ObjectListRequest | [#/components/schemas/ObjectListRequest](#componentsschemasobjectlistrequest) | | -| bearerAuth | [#/components/securitySchemes/bearerAuth](#componentssecurityschemesbearerauth) | JWT Authorization header using the Bearer scheme. | -| basicAuth | [#/components/securitySchemes/basicAuth](#componentssecurityschemesbasicauth) | Basic Authorization header. | - -## Path Details - -*** - -### [GET]/api/v2/ui/accessgroups - -- Description -GET many request to retrieve multiple objects. - -- Security -bearerAuth - -#### Parameters(Query) - -```ts -page[after]?: integer -``` - -```ts -page[before]?: integer -``` - -```ts -page[size]?: integer -``` - -```ts -filter: { -} -``` - -```ts -include?: string -``` - -#### Responses - -- 200 successful operation - -`application/json` - -```ts -{ - jsonapi: { - version?: string //default: 1.1 - ext?: string //default: https://jsonapi.org/profiles/ethanresnick/cursor-pagination - } - links: { - self?: string //default: /api/v2/ui/accessgroups?page[size]=25 - first?: string //default: /api/v2/ui/accessgroups?page[size]=25&page[after]=0 - last?: string //default: /api/v2/ui/accessgroups?page[size]=25&page[before]=500 - next?: string //default: /api/v2/ui/accessgroups?page[size]=25&page[after]=25 - previous?: string //default: /api/v2/ui/accessgroups?page[size]=25&page[before]=25 - } - id?: integer - type?: string //default: AccessGroup - data: { - groupName?: string - } - relationships: { - } - included: { - }[] -}[] -``` - -- 400 Invalid request - -`application/json` - -```ts -{ - title?: string - type?: string - status?: integer -} -``` - -- 401 Authentication failed - -`application/json` - -```ts -{ - title?: string - type?: string - status?: integer -} -``` - -*** - -### [POST]/api/v2/ui/accessgroups - -- Description -POST request to create a new object. The request must contain the resource record as data with the attributes of the new object.To add relationships, a relationships object can be added with the resource records of the relations that are part of this object. - -- Security -bearerAuth - -#### RequestBody - -- application/json - -```ts -{ - data: { - type?: string - attributes: { - groupName?: string - } - } -} -``` - -#### Responses - -- 201 successful operation - -`application/json` - -```ts -{ - jsonapi: { - version?: string //default: 1.1 - ext?: string //default: https://jsonapi.org/profiles/ethanresnick/cursor-pagination - } - id?: integer - type?: string //default: AccessGroup - data: { - groupName?: string - } -} -``` - -- 400 Invalid request - -`application/json` - -```ts -{ - title?: string - type?: string - status?: integer -} -``` - -- 401 Authentication failed - -`application/json` - -```ts -{ - title?: string - type?: string - status?: integer -} -``` - -*** - -### [GET]/api/v2/ui/accessgroups/count - -- Description -GET many request to retrieve multiple objects. - -- Security -bearerAuth - -#### Parameters(Query) - -```ts -page[after]?: integer -``` - -```ts -page[before]?: integer -``` - -```ts -page[size]?: integer -``` - -```ts -filter: { -} -``` - -```ts -include?: string -``` - -#### Responses - -- 200 successful operation - -`application/json` - -```ts -{ - jsonapi: { - version?: string //default: 1.1 - ext?: string //default: https://jsonapi.org/profiles/ethanresnick/cursor-pagination - } - links: { - self?: string //default: /api/v2/ui/accessgroups?page[size]=25 - first?: string //default: /api/v2/ui/accessgroups?page[size]=25&page[after]=0 - last?: string //default: /api/v2/ui/accessgroups?page[size]=25&page[before]=500 - next?: string //default: /api/v2/ui/accessgroups?page[size]=25&page[after]=25 - previous?: string //default: /api/v2/ui/accessgroups?page[size]=25&page[before]=25 - } - id?: integer - type?: string //default: AccessGroup - data: { - groupName?: string - } - relationships: { - } - included: { - }[] -}[] -``` - -- 400 Invalid request - -`application/json` - -```ts -{ - title?: string - type?: string - status?: integer -} -``` - -- 401 Authentication failed - -`application/json` - -```ts -{ - title?: string - type?: string - status?: integer -} -``` - -*** - -### [GET]/api/v2/ui/accessgroups/{id:[0-9]+}/{relation:userMembers} - -- Description -GET request for for a to-one relationship link. Returns the resource record of the object that is part of the specified relation. - -- Security -bearerAuth - -#### Parameters(Query) - -```ts -include?: string -``` - -#### Responses - -- 200 successful operation - -`application/json` - -```ts -{ - jsonapi: { - version?: string //default: 1.1 - ext?: string //default: https://jsonapi.org/profiles/ethanresnick/cursor-pagination - } - links: { - self?: string //default: /api/v2/ui/accessgroups?page[size]=25 - first?: string //default: /api/v2/ui/accessgroups?page[size]=25&page[after]=0 - last?: string //default: /api/v2/ui/accessgroups?page[size]=25&page[before]=500 - next?: string //default: /api/v2/ui/accessgroups?page[size]=25&page[after]=25 - previous?: string //default: /api/v2/ui/accessgroups?page[size]=25&page[before]=25 - } - id?: integer - type?: string //default: AccessGroup - data: { - groupName?: string - } - relationships: { - } - included: { - }[] -} -``` - -- 400 Invalid request - -`application/json` - -```ts -{ - title?: string - type?: string - status?: integer -} -``` - -- 401 Authentication failed - -`application/json` - -```ts -{ - title?: string - type?: string - status?: integer -} -``` - -- 404 Not Found - -`application/json` - -```ts -{ - message?: string - exception: { - type?: string - code?: integer - message?: string - file?: string - line?: integer - } -} -``` - -*** - -### [GET]/api/v2/ui/accessgroups/{id:[0-9]+}/relationships/{relation:userMembers} - -- Description -GET request for for a to-one relationship link. Returns the resource record of the object that is part of the specified relation. - -- Security -bearerAuth - -#### Parameters(Query) - -```ts -include?: string -``` - -#### Responses - -- 200 successful operation - -`application/json` - -```ts -{ - jsonapi: { - version?: string //default: 1.1 - ext?: string //default: https://jsonapi.org/profiles/ethanresnick/cursor-pagination - } - links: { - self?: string //default: /api/v2/ui/accessgroups?page[size]=25 - first?: string //default: /api/v2/ui/accessgroups?page[size]=25&page[after]=0 - last?: string //default: /api/v2/ui/accessgroups?page[size]=25&page[before]=500 - next?: string //default: /api/v2/ui/accessgroups?page[size]=25&page[after]=25 - previous?: string //default: /api/v2/ui/accessgroups?page[size]=25&page[before]=25 - } - id?: integer - type?: string //default: AccessGroup - data: { - groupName?: string - } - relationships: { - } - included: { - }[] -} -``` - -- 400 Invalid request - -`application/json` - -```ts -{ - title?: string - type?: string - status?: integer -} -``` - -- 401 Authentication failed - -`application/json` - -```ts -{ - title?: string - type?: string - status?: integer -} -``` - -- 404 Not Found - -`application/json` - -```ts -{ - message?: string - exception: { - type?: string - code?: integer - message?: string - file?: string - line?: integer - } -} -``` - -*** - -### [PATCH]/api/v2/ui/accessgroups/{id:[0-9]+}/relationships/{relation:userMembers} - -- Security -bearerAuth - -#### RequestBody - -- application/json - -```ts -{ - data: { - type?: string - attributes: { - groupName?: string - } - } -} -``` - -#### Responses - -- 200 successful operation - -`application/json` - -```ts -{ - jsonapi: { - version?: string //default: 1.1 - ext?: string //default: https://jsonapi.org/profiles/ethanresnick/cursor-pagination - } - id?: integer - type?: string //default: AccessGroup - data: { - groupName?: string - } -} -``` - -- 400 Invalid request - -`application/json` - -```ts -{ - title?: string - type?: string - status?: integer -} -``` - -- 401 Authentication failed - -`application/json` - -```ts -{ - title?: string - type?: string - status?: integer -} -``` - -- 404 Not Found - -`application/json` - -```ts -{ - message?: string - exception: { - type?: string - code?: integer - message?: string - file?: string - line?: integer - } -} -``` - -*** - -### [POST]/api/v2/ui/accessgroups/{id:[0-9]+}/relationships/{relation:userMembers} - -- Security -bearerAuth - -#### RequestBody - -- application/json - -#### Responses - -- 204 successfully created - -- 400 Invalid request - -`application/json` - -```ts -{ - title?: string - type?: string - status?: integer -} -``` - -- 401 Authentication failed - -`application/json` - -```ts -{ - title?: string - type?: string - status?: integer -} -``` - -- 404 Not Found - -`application/json` - -```ts -{ - message?: string - exception: { - type?: string - code?: integer - message?: string - file?: string - line?: integer - } -} -``` - -*** - -### [DELETE]/api/v2/ui/accessgroups/{id:[0-9]+}/relationships/{relation:userMembers} - -- Security -bearerAuth - -#### RequestBody - -- application/json - -#### Responses - -- 204 successfully deleted - -- 400 Invalid request - -`application/json` - -```ts -{ - title?: string - type?: string - status?: integer -} -``` - -- 401 Authentication failed - -`application/json` - -```ts -{ - title?: string - type?: string - status?: integer -} -``` - -- 404 Not Found - -`application/json` - -```ts -{ - message?: string - exception: { - type?: string - code?: integer - message?: string - file?: string - line?: integer - } -} -``` - -*** - -### [GET]/api/v2/ui/accessgroups/{id:[0-9]+}/{relation:agentMembers} - -- Description -GET request for for a to-one relationship link. Returns the resource record of the object that is part of the specified relation. - -- Security -bearerAuth - -#### Parameters(Query) - -```ts -include?: string -``` - -#### Responses - -- 200 successful operation - -`application/json` - -```ts -{ - jsonapi: { - version?: string //default: 1.1 - ext?: string //default: https://jsonapi.org/profiles/ethanresnick/cursor-pagination - } - links: { - self?: string //default: /api/v2/ui/accessgroups?page[size]=25 - first?: string //default: /api/v2/ui/accessgroups?page[size]=25&page[after]=0 - last?: string //default: /api/v2/ui/accessgroups?page[size]=25&page[before]=500 - next?: string //default: /api/v2/ui/accessgroups?page[size]=25&page[after]=25 - previous?: string //default: /api/v2/ui/accessgroups?page[size]=25&page[before]=25 - } - id?: integer - type?: string //default: AccessGroup - data: { - groupName?: string - } - relationships: { - } - included: { - }[] -} -``` - -- 400 Invalid request - -`application/json` - -```ts -{ - title?: string - type?: string - status?: integer -} -``` - -- 401 Authentication failed - -`application/json` - -```ts -{ - title?: string - type?: string - status?: integer -} -``` - -- 404 Not Found - -`application/json` - -```ts -{ - message?: string - exception: { - type?: string - code?: integer - message?: string - file?: string - line?: integer - } -} -``` - -*** - -### [GET]/api/v2/ui/accessgroups/{id:[0-9]+}/relationships/{relation:agentMembers} - -- Description -GET request for for a to-one relationship link. Returns the resource record of the object that is part of the specified relation. - -- Security -bearerAuth - -#### Parameters(Query) - -```ts -include?: string -``` - -#### Responses - -- 200 successful operation - -`application/json` - -```ts -{ - jsonapi: { - version?: string //default: 1.1 - ext?: string //default: https://jsonapi.org/profiles/ethanresnick/cursor-pagination - } - links: { - self?: string //default: /api/v2/ui/accessgroups?page[size]=25 - first?: string //default: /api/v2/ui/accessgroups?page[size]=25&page[after]=0 - last?: string //default: /api/v2/ui/accessgroups?page[size]=25&page[before]=500 - next?: string //default: /api/v2/ui/accessgroups?page[size]=25&page[after]=25 - previous?: string //default: /api/v2/ui/accessgroups?page[size]=25&page[before]=25 - } - id?: integer - type?: string //default: AccessGroup - data: { - groupName?: string - } - relationships: { - } - included: { - }[] -} -``` - -- 400 Invalid request - -`application/json` - -```ts -{ - title?: string - type?: string - status?: integer -} -``` - -- 401 Authentication failed - -`application/json` - -```ts -{ - title?: string - type?: string - status?: integer -} -``` - -- 404 Not Found - -`application/json` - -```ts -{ - message?: string - exception: { - type?: string - code?: integer - message?: string - file?: string - line?: integer - } -} -``` - -*** - -### [PATCH]/api/v2/ui/accessgroups/{id:[0-9]+}/relationships/{relation:agentMembers} - -- Security -bearerAuth - -#### RequestBody - -- application/json - -```ts -{ - data: { - type?: string - attributes: { - groupName?: string - } - } -} -``` - -#### Responses - -- 200 successful operation - -`application/json` - -```ts -{ - jsonapi: { - version?: string //default: 1.1 - ext?: string //default: https://jsonapi.org/profiles/ethanresnick/cursor-pagination - } - id?: integer - type?: string //default: AccessGroup - data: { - groupName?: string - } -} -``` - -- 400 Invalid request - -`application/json` - -```ts -{ - title?: string - type?: string - status?: integer -} -``` - -- 401 Authentication failed - -`application/json` - -```ts -{ - title?: string - type?: string - status?: integer -} -``` - -- 404 Not Found - -`application/json` - -```ts -{ - message?: string - exception: { - type?: string - code?: integer - message?: string - file?: string - line?: integer - } -} -``` - -*** - -### [POST]/api/v2/ui/accessgroups/{id:[0-9]+}/relationships/{relation:agentMembers} - -- Security -bearerAuth - -#### RequestBody - -- application/json - -#### Responses - -- 204 successfully created - -- 400 Invalid request - -`application/json` - -```ts -{ - title?: string - type?: string - status?: integer -} -``` - -- 401 Authentication failed - -`application/json` - -```ts -{ - title?: string - type?: string - status?: integer -} -``` - -- 404 Not Found - -`application/json` - -```ts -{ - message?: string - exception: { - type?: string - code?: integer - message?: string - file?: string - line?: integer - } -} -``` - -*** - -### [DELETE]/api/v2/ui/accessgroups/{id:[0-9]+}/relationships/{relation:agentMembers} - -- Security -bearerAuth - -#### RequestBody - -- application/json - -#### Responses - -- 204 successfully deleted - -- 400 Invalid request - -`application/json` - -```ts -{ - title?: string - type?: string - status?: integer -} -``` - -- 401 Authentication failed - -`application/json` - -```ts -{ - title?: string - type?: string - status?: integer -} -``` - -- 404 Not Found - -`application/json` - -```ts -{ - message?: string - exception: { - type?: string - code?: integer - message?: string - file?: string - line?: integer - } -} -``` - -*** - -### [GET]/api/v2/ui/accessgroups/{id:[0-9]+} - -- Description -GET request to retrieve a single object. - -- Security -bearerAuth - -#### Parameters(Query) - -```ts -include?: string -``` - -#### Responses - -- 200 successful operation - -`application/json` - -```ts -{ - jsonapi: { - version?: string //default: 1.1 - ext?: string //default: https://jsonapi.org/profiles/ethanresnick/cursor-pagination - } - links: { - self?: string //default: /api/v2/ui/accessgroups?page[size]=25 - first?: string //default: /api/v2/ui/accessgroups?page[size]=25&page[after]=0 - last?: string //default: /api/v2/ui/accessgroups?page[size]=25&page[before]=500 - next?: string //default: /api/v2/ui/accessgroups?page[size]=25&page[after]=25 - previous?: string //default: /api/v2/ui/accessgroups?page[size]=25&page[before]=25 - } - id?: integer - type?: string //default: AccessGroup - data: { - groupName?: string - } - relationships: { - } - included: { - }[] -} -``` - -- 400 Invalid request - -`application/json` - -```ts -{ - title?: string - type?: string - status?: integer -} -``` - -- 401 Authentication failed - -`application/json` - -```ts -{ - title?: string - type?: string - status?: integer -} -``` - -- 404 Not Found - -`application/json` - -```ts -{ - message?: string - exception: { - type?: string - code?: integer - message?: string - file?: string - line?: integer - } -} -``` - -*** - -### [PATCH]/api/v2/ui/accessgroups/{id:[0-9]+} - -- Description -PATCH request to update attributes of a single object. - -- Security -bearerAuth - -#### RequestBody - -- application/json - -```ts -{ - data: { - type?: string - attributes: { - groupName?: string - } - } -} -``` - -#### Responses - -- 200 successful operation - -`application/json` - -```ts -{ - jsonapi: { - version?: string //default: 1.1 - ext?: string //default: https://jsonapi.org/profiles/ethanresnick/cursor-pagination - } - id?: integer - type?: string //default: AccessGroup - data: { - groupName?: string - } -} -``` - -- 400 Invalid request - -`application/json` - -```ts -{ - title?: string - type?: string - status?: integer -} -``` - -- 401 Authentication failed - -`application/json` - -```ts -{ - title?: string - type?: string - status?: integer -} -``` - -- 404 Not Found - -`application/json` - -```ts -{ - message?: string - exception: { - type?: string - code?: integer - message?: string - file?: string - line?: integer - } -} -``` - -*** - -### [DELETE]/api/v2/ui/accessgroups/{id:[0-9]+} - -- Security -bearerAuth - -#### RequestBody - -- application/json - -#### Responses - -- 204 successfully deleted - -- 400 Invalid request - -`application/json` - -```ts -{ - title?: string - type?: string - status?: integer -} -``` - -- 401 Authentication failed - -`application/json` - -```ts -{ - title?: string - type?: string - status?: integer -} -``` - -- 404 Not Found - -`application/json` - -```ts -{ - message?: string - exception: { - type?: string - code?: integer - message?: string - file?: string - line?: integer - } -} -``` - -*** - -### [GET]/api/v2/ui/agentassignments - -- Description -GET many request to retrieve multiple objects. - -- Security -bearerAuth - -#### Parameters(Query) - -```ts -page[after]?: integer -``` - -```ts -page[before]?: integer -``` - -```ts -page[size]?: integer -``` - -```ts -filter: { -} -``` - -```ts -include?: string -``` - -#### Responses - -- 200 successful operation - -`application/json` - -```ts -{ - jsonapi: { - version?: string //default: 1.1 - ext?: string //default: https://jsonapi.org/profiles/ethanresnick/cursor-pagination - } - links: { - self?: string //default: /api/v2/ui/agentassignments?page[size]=25 - first?: string //default: /api/v2/ui/agentassignments?page[size]=25&page[after]=0 - last?: string //default: /api/v2/ui/agentassignments?page[size]=25&page[before]=500 - next?: string //default: /api/v2/ui/agentassignments?page[size]=25&page[after]=25 - previous?: string //default: /api/v2/ui/agentassignments?page[size]=25&page[before]=25 - } - id?: integer - type?: string //default: Assignment - data: { - taskId?: integer - agentId?: integer - benchmark?: string - } - relationships: { - } - included: { - }[] -}[] -``` - -- 400 Invalid request - -`application/json` - -```ts -{ - title?: string - type?: string - status?: integer -} -``` - -- 401 Authentication failed - -`application/json` - -```ts -{ - title?: string - type?: string - status?: integer -} -``` - -*** - -### [POST]/api/v2/ui/agentassignments - -- Description -POST request to create a new object. The request must contain the resource record as data with the attributes of the new object.To add relationships, a relationships object can be added with the resource records of the relations that are part of this object. - -- Security -bearerAuth - -#### RequestBody - -- application/json - -```ts -{ - data: { - type?: string - attributes: { - taskId?: integer - agentId?: integer - benchmark?: string - } - } -} -``` - -#### Responses - -- 201 successful operation - -`application/json` - -```ts -{ - jsonapi: { - version?: string //default: 1.1 - ext?: string //default: https://jsonapi.org/profiles/ethanresnick/cursor-pagination - } - id?: integer - type?: string //default: Assignment - data: { - taskId?: integer - agentId?: integer - benchmark?: string - } -} -``` - -- 400 Invalid request - -`application/json` - -```ts -{ - title?: string - type?: string - status?: integer -} -``` - -- 401 Authentication failed - -`application/json` - -```ts -{ - title?: string - type?: string - status?: integer -} -``` - -*** - -### [GET]/api/v2/ui/agentassignments/count - -- Description -GET many request to retrieve multiple objects. - -- Security -bearerAuth - -#### Parameters(Query) - -```ts -page[after]?: integer -``` - -```ts -page[before]?: integer -``` - -```ts -page[size]?: integer -``` - -```ts -filter: { -} -``` - -```ts -include?: string -``` - -#### Responses - -- 200 successful operation - -`application/json` - -```ts -{ - jsonapi: { - version?: string //default: 1.1 - ext?: string //default: https://jsonapi.org/profiles/ethanresnick/cursor-pagination - } - links: { - self?: string //default: /api/v2/ui/agentassignments?page[size]=25 - first?: string //default: /api/v2/ui/agentassignments?page[size]=25&page[after]=0 - last?: string //default: /api/v2/ui/agentassignments?page[size]=25&page[before]=500 - next?: string //default: /api/v2/ui/agentassignments?page[size]=25&page[after]=25 - previous?: string //default: /api/v2/ui/agentassignments?page[size]=25&page[before]=25 - } - id?: integer - type?: string //default: Assignment - data: { - taskId?: integer - agentId?: integer - benchmark?: string - } - relationships: { - } - included: { - }[] -}[] -``` - -- 400 Invalid request - -`application/json` - -```ts -{ - title?: string - type?: string - status?: integer -} -``` - -- 401 Authentication failed - -`application/json` - -```ts -{ - title?: string - type?: string - status?: integer -} -``` - -*** - -### [GET]/api/v2/ui/agentassignments/{id:[0-9]+}/{relation:agent} - -- Description -GET request for for a to-one relationship link. Returns the resource record of the object that is part of the specified relation. - -- Security -bearerAuth - -#### Parameters(Query) - -```ts -include?: string -``` - -#### Responses - -- 200 successful operation - -`application/json` - -```ts -{ - jsonapi: { - version?: string //default: 1.1 - ext?: string //default: https://jsonapi.org/profiles/ethanresnick/cursor-pagination - } - links: { - self?: string //default: /api/v2/ui/agentassignments?page[size]=25 - first?: string //default: /api/v2/ui/agentassignments?page[size]=25&page[after]=0 - last?: string //default: /api/v2/ui/agentassignments?page[size]=25&page[before]=500 - next?: string //default: /api/v2/ui/agentassignments?page[size]=25&page[after]=25 - previous?: string //default: /api/v2/ui/agentassignments?page[size]=25&page[before]=25 - } - id?: integer - type?: string //default: Assignment - data: { - taskId?: integer - agentId?: integer - benchmark?: string - } - relationships: { - } - included: { - }[] -} -``` - -- 400 Invalid request - -`application/json` - -```ts -{ - title?: string - type?: string - status?: integer -} -``` - -- 401 Authentication failed - -`application/json` - -```ts -{ - title?: string - type?: string - status?: integer -} -``` - -- 404 Not Found - -`application/json` - -```ts -{ - message?: string - exception: { - type?: string - code?: integer - message?: string - file?: string - line?: integer - } -} -``` - -*** - -### [GET]/api/v2/ui/agentassignments/{id:[0-9]+}/relationships/{relation:agent} - -- Description -GET request for for a to-one relationship link. Returns the resource record of the object that is part of the specified relation. - -- Security -bearerAuth - -#### Parameters(Query) - -```ts -include?: string -``` - -#### Responses - -- 200 successful operation - -`application/json` - -```ts -{ - jsonapi: { - version?: string //default: 1.1 - ext?: string //default: https://jsonapi.org/profiles/ethanresnick/cursor-pagination - } - links: { - self?: string //default: /api/v2/ui/agentassignments?page[size]=25 - first?: string //default: /api/v2/ui/agentassignments?page[size]=25&page[after]=0 - last?: string //default: /api/v2/ui/agentassignments?page[size]=25&page[before]=500 - next?: string //default: /api/v2/ui/agentassignments?page[size]=25&page[after]=25 - previous?: string //default: /api/v2/ui/agentassignments?page[size]=25&page[before]=25 - } - id?: integer - type?: string //default: Assignment - data: { - taskId?: integer - agentId?: integer - benchmark?: string - } - relationships: { - } - included: { - }[] -} -``` - -- 400 Invalid request - -`application/json` - -```ts -{ - title?: string - type?: string - status?: integer -} -``` - -- 401 Authentication failed - -`application/json` - -```ts -{ - title?: string - type?: string - status?: integer -} -``` - -- 404 Not Found - -`application/json` - -```ts -{ - message?: string - exception: { - type?: string - code?: integer - message?: string - file?: string - line?: integer - } -} -``` - -*** - -### [PATCH]/api/v2/ui/agentassignments/{id:[0-9]+}/relationships/{relation:agent} - -- Security -bearerAuth - -#### RequestBody - -- application/json - -```ts -{ - data: { - type?: string - attributes: { - agentId?: integer - taskId?: integer - } - } -} -``` - -#### Responses - -- 200 successful operation - -`application/json` - -```ts -{ - jsonapi: { - version?: string //default: 1.1 - ext?: string //default: https://jsonapi.org/profiles/ethanresnick/cursor-pagination - } - id?: integer - type?: string //default: Assignment - data: { - taskId?: integer - agentId?: integer - benchmark?: string - } -} -``` - -- 400 Invalid request - -`application/json` - -```ts -{ - title?: string - type?: string - status?: integer -} -``` - -- 401 Authentication failed - -`application/json` - -```ts -{ - title?: string - type?: string - status?: integer -} -``` - -- 404 Not Found - -`application/json` - -```ts -{ - message?: string - exception: { - type?: string - code?: integer - message?: string - file?: string - line?: integer - } -} -``` - -*** - -### [GET]/api/v2/ui/agentassignments/{id:[0-9]+}/{relation:task} - -- Description -GET request for for a to-one relationship link. Returns the resource record of the object that is part of the specified relation. - -- Security -bearerAuth - -#### Parameters(Query) - -```ts -include?: string -``` - -#### Responses - -- 200 successful operation - -`application/json` - -```ts -{ - jsonapi: { - version?: string //default: 1.1 - ext?: string //default: https://jsonapi.org/profiles/ethanresnick/cursor-pagination - } - links: { - self?: string //default: /api/v2/ui/agentassignments?page[size]=25 - first?: string //default: /api/v2/ui/agentassignments?page[size]=25&page[after]=0 - last?: string //default: /api/v2/ui/agentassignments?page[size]=25&page[before]=500 - next?: string //default: /api/v2/ui/agentassignments?page[size]=25&page[after]=25 - previous?: string //default: /api/v2/ui/agentassignments?page[size]=25&page[before]=25 - } - id?: integer - type?: string //default: Assignment - data: { - taskId?: integer - agentId?: integer - benchmark?: string - } - relationships: { - } - included: { - }[] -} -``` - -- 400 Invalid request - -`application/json` - -```ts -{ - title?: string - type?: string - status?: integer -} -``` - -- 401 Authentication failed - -`application/json` - -```ts -{ - title?: string - type?: string - status?: integer -} -``` - -- 404 Not Found - -`application/json` - -```ts -{ - message?: string - exception: { - type?: string - code?: integer - message?: string - file?: string - line?: integer - } -} -``` - -*** - -### [GET]/api/v2/ui/agentassignments/{id:[0-9]+}/relationships/{relation:task} - -- Description -GET request for for a to-one relationship link. Returns the resource record of the object that is part of the specified relation. - -- Security -bearerAuth - -#### Parameters(Query) - -```ts -include?: string -``` - -#### Responses - -- 200 successful operation - -`application/json` - -```ts -{ - jsonapi: { - version?: string //default: 1.1 - ext?: string //default: https://jsonapi.org/profiles/ethanresnick/cursor-pagination - } - links: { - self?: string //default: /api/v2/ui/agentassignments?page[size]=25 - first?: string //default: /api/v2/ui/agentassignments?page[size]=25&page[after]=0 - last?: string //default: /api/v2/ui/agentassignments?page[size]=25&page[before]=500 - next?: string //default: /api/v2/ui/agentassignments?page[size]=25&page[after]=25 - previous?: string //default: /api/v2/ui/agentassignments?page[size]=25&page[before]=25 - } - id?: integer - type?: string //default: Assignment - data: { - taskId?: integer - agentId?: integer - benchmark?: string - } - relationships: { - } - included: { - }[] -} -``` - -- 400 Invalid request - -`application/json` - -```ts -{ - title?: string - type?: string - status?: integer -} -``` - -- 401 Authentication failed - -`application/json` - -```ts -{ - title?: string - type?: string - status?: integer -} -``` - -- 404 Not Found - -`application/json` - -```ts -{ - message?: string - exception: { - type?: string - code?: integer - message?: string - file?: string - line?: integer - } -} -``` - -*** - -### [PATCH]/api/v2/ui/agentassignments/{id:[0-9]+}/relationships/{relation:task} - -- Security -bearerAuth - -#### RequestBody - -- application/json - -```ts -{ - data: { - type?: string - attributes: { - agentId?: integer - taskId?: integer - } - } -} -``` - -#### Responses - -- 200 successful operation - -`application/json` - -```ts -{ - jsonapi: { - version?: string //default: 1.1 - ext?: string //default: https://jsonapi.org/profiles/ethanresnick/cursor-pagination - } - id?: integer - type?: string //default: Assignment - data: { - taskId?: integer - agentId?: integer - benchmark?: string - } -} -``` - -- 400 Invalid request - -`application/json` - -```ts -{ - title?: string - type?: string - status?: integer -} -``` - -- 401 Authentication failed - -`application/json` - -```ts -{ - title?: string - type?: string - status?: integer -} -``` - -- 404 Not Found - -`application/json` - -```ts -{ - message?: string - exception: { - type?: string - code?: integer - message?: string - file?: string - line?: integer - } -} -``` - -*** - -### [GET]/api/v2/ui/agentassignments/{id:[0-9]+} - -- Description -GET request to retrieve a single object. - -- Security -bearerAuth - -#### Parameters(Query) - -```ts -include?: string -``` - -#### Responses - -- 200 successful operation - -`application/json` - -```ts -{ - jsonapi: { - version?: string //default: 1.1 - ext?: string //default: https://jsonapi.org/profiles/ethanresnick/cursor-pagination - } - links: { - self?: string //default: /api/v2/ui/agentassignments?page[size]=25 - first?: string //default: /api/v2/ui/agentassignments?page[size]=25&page[after]=0 - last?: string //default: /api/v2/ui/agentassignments?page[size]=25&page[before]=500 - next?: string //default: /api/v2/ui/agentassignments?page[size]=25&page[after]=25 - previous?: string //default: /api/v2/ui/agentassignments?page[size]=25&page[before]=25 - } - id?: integer - type?: string //default: Assignment - data: { - taskId?: integer - agentId?: integer - benchmark?: string - } - relationships: { - } - included: { - }[] -} -``` - -- 400 Invalid request - -`application/json` - -```ts -{ - title?: string - type?: string - status?: integer -} -``` - -- 401 Authentication failed - -`application/json` - -```ts -{ - title?: string - type?: string - status?: integer -} -``` - -- 404 Not Found - -`application/json` - -```ts -{ - message?: string - exception: { - type?: string - code?: integer - message?: string - file?: string - line?: integer - } -} -``` - -*** - -### [DELETE]/api/v2/ui/agentassignments/{id:[0-9]+} - -- Security -bearerAuth - -#### RequestBody - -- application/json - -#### Responses - -- 204 successfully deleted - -- 400 Invalid request - -`application/json` - -```ts -{ - title?: string - type?: string - status?: integer -} -``` - -- 401 Authentication failed - -`application/json` - -```ts -{ - title?: string - type?: string - status?: integer -} -``` - -- 404 Not Found - -`application/json` - -```ts -{ - message?: string - exception: { - type?: string - code?: integer - message?: string - file?: string - line?: integer - } -} -``` - -*** - -### [GET]/api/v2/ui/agentbinaries - -- Description -GET many request to retrieve multiple objects. - -- Security -bearerAuth - -#### Parameters(Query) - -```ts -page[after]?: integer -``` - -```ts -page[before]?: integer -``` - -```ts -page[size]?: integer -``` - -```ts -filter: { -} -``` - -```ts -include?: string -``` - -#### Responses - -- 200 successful operation - -`application/json` - -```ts -{ - jsonapi: { - version?: string //default: 1.1 - ext?: string //default: https://jsonapi.org/profiles/ethanresnick/cursor-pagination - } - links: { - self?: string //default: /api/v2/ui/agentbinaries?page[size]=25 - first?: string //default: /api/v2/ui/agentbinaries?page[size]=25&page[after]=0 - last?: string //default: /api/v2/ui/agentbinaries?page[size]=25&page[before]=500 - next?: string //default: /api/v2/ui/agentbinaries?page[size]=25&page[after]=25 - previous?: string //default: /api/v2/ui/agentbinaries?page[size]=25&page[before]=25 - } - id?: integer - type?: string //default: AgentBinary - data: { - type?: string - version?: string - operatingSystems?: string - filename?: string - updateTrack?: string - updateAvailable?: string - } - relationships: { - } - included: { - }[] -}[] -``` - -- 400 Invalid request - -`application/json` - -```ts -{ - title?: string - type?: string - status?: integer -} -``` - -- 401 Authentication failed - -`application/json` - -```ts -{ - title?: string - type?: string - status?: integer -} -``` - -*** - -### [POST]/api/v2/ui/agentbinaries - -- Description -POST request to create a new object. The request must contain the resource record as data with the attributes of the new object.To add relationships, a relationships object can be added with the resource records of the relations that are part of this object. - -- Security -bearerAuth - -#### RequestBody - -- application/json - -```ts -{ - data: { - type?: string - attributes: { - type?: string - version?: string - operatingSystems?: string - filename?: string - updateTrack?: string - updateAvailable?: string - } - } -} -``` - -#### Responses - -- 201 successful operation - -`application/json` - -```ts -{ - jsonapi: { - version?: string //default: 1.1 - ext?: string //default: https://jsonapi.org/profiles/ethanresnick/cursor-pagination - } - id?: integer - type?: string //default: AgentBinary - data: { - type?: string - version?: string - operatingSystems?: string - filename?: string - updateTrack?: string - updateAvailable?: string - } -} -``` - -- 400 Invalid request - -`application/json` - -```ts -{ - title?: string - type?: string - status?: integer -} -``` - -- 401 Authentication failed - -`application/json` - -```ts -{ - title?: string - type?: string - status?: integer -} -``` - -*** - -### [GET]/api/v2/ui/agentbinaries/count - -- Description -GET many request to retrieve multiple objects. - -- Security -bearerAuth - -#### Parameters(Query) - -```ts -page[after]?: integer -``` - -```ts -page[before]?: integer -``` - -```ts -page[size]?: integer -``` - -```ts -filter: { -} -``` - -```ts -include?: string -``` - -#### Responses - -- 200 successful operation - -`application/json` - -```ts -{ - jsonapi: { - version?: string //default: 1.1 - ext?: string //default: https://jsonapi.org/profiles/ethanresnick/cursor-pagination - } - links: { - self?: string //default: /api/v2/ui/agentbinaries?page[size]=25 - first?: string //default: /api/v2/ui/agentbinaries?page[size]=25&page[after]=0 - last?: string //default: /api/v2/ui/agentbinaries?page[size]=25&page[before]=500 - next?: string //default: /api/v2/ui/agentbinaries?page[size]=25&page[after]=25 - previous?: string //default: /api/v2/ui/agentbinaries?page[size]=25&page[before]=25 - } - id?: integer - type?: string //default: AgentBinary - data: { - type?: string - version?: string - operatingSystems?: string - filename?: string - updateTrack?: string - updateAvailable?: string - } - relationships: { - } - included: { - }[] -}[] -``` - -- 400 Invalid request - -`application/json` - -```ts -{ - title?: string - type?: string - status?: integer -} -``` - -- 401 Authentication failed - -`application/json` - -```ts -{ - title?: string - type?: string - status?: integer -} -``` - -*** - -### [GET]/api/v2/ui/agentbinaries/{id:[0-9]+} - -- Description -GET request to retrieve a single object. - -- Security -bearerAuth - -#### Parameters(Query) - -```ts -include?: string -``` - -#### Responses - -- 200 successful operation - -`application/json` - -```ts -{ - jsonapi: { - version?: string //default: 1.1 - ext?: string //default: https://jsonapi.org/profiles/ethanresnick/cursor-pagination - } - links: { - self?: string //default: /api/v2/ui/agentbinaries?page[size]=25 - first?: string //default: /api/v2/ui/agentbinaries?page[size]=25&page[after]=0 - last?: string //default: /api/v2/ui/agentbinaries?page[size]=25&page[before]=500 - next?: string //default: /api/v2/ui/agentbinaries?page[size]=25&page[after]=25 - previous?: string //default: /api/v2/ui/agentbinaries?page[size]=25&page[before]=25 - } - id?: integer - type?: string //default: AgentBinary - data: { - type?: string - version?: string - operatingSystems?: string - filename?: string - updateTrack?: string - updateAvailable?: string - } - relationships: { - } - included: { - }[] -} -``` - -- 400 Invalid request - -`application/json` - -```ts -{ - title?: string - type?: string - status?: integer -} -``` - -- 401 Authentication failed - -`application/json` - -```ts -{ - title?: string - type?: string - status?: integer -} -``` - -- 404 Not Found - -`application/json` - -```ts -{ - message?: string - exception: { - type?: string - code?: integer - message?: string - file?: string - line?: integer - } -} -``` - -*** - -### [PATCH]/api/v2/ui/agentbinaries/{id:[0-9]+} - -- Description -PATCH request to update attributes of a single object. - -- Security -bearerAuth - -#### RequestBody - -- application/json - -```ts -{ - data: { - type?: string - attributes: { - filename?: string - operatingSystems?: string - type?: string - updateTrack?: string - version?: string - } - } -} -``` - -#### Responses - -- 200 successful operation - -`application/json` - -```ts -{ - jsonapi: { - version?: string //default: 1.1 - ext?: string //default: https://jsonapi.org/profiles/ethanresnick/cursor-pagination - } - id?: integer - type?: string //default: AgentBinary - data: { - type?: string - version?: string - operatingSystems?: string - filename?: string - updateTrack?: string - updateAvailable?: string - } -} -``` - -- 400 Invalid request - -`application/json` - -```ts -{ - title?: string - type?: string - status?: integer -} -``` - -- 401 Authentication failed - -`application/json` - -```ts -{ - title?: string - type?: string - status?: integer -} -``` - -- 404 Not Found - -`application/json` - -```ts -{ - message?: string - exception: { - type?: string - code?: integer - message?: string - file?: string - line?: integer - } -} -``` - -*** - -### [DELETE]/api/v2/ui/agentbinaries/{id:[0-9]+} - -- Security -bearerAuth - -#### RequestBody - -- application/json - -#### Responses - -- 204 successfully deleted - -- 400 Invalid request - -`application/json` - -```ts -{ - title?: string - type?: string - status?: integer -} -``` - -- 401 Authentication failed - -`application/json` - -```ts -{ - title?: string - type?: string - status?: integer -} -``` - -- 404 Not Found - -`application/json` - -```ts -{ - message?: string - exception: { - type?: string - code?: integer - message?: string - file?: string - line?: integer - } -} -``` - -*** - -### [GET]/api/v2/ui/agents - -- Description -GET many request to retrieve multiple objects. - -- Security -bearerAuth - -#### Parameters(Query) - -```ts -page[after]?: integer -``` - -```ts -page[before]?: integer -``` - -```ts -page[size]?: integer -``` - -```ts -filter: { -} -``` - -```ts -include?: string -``` - -#### Responses - -- 200 successful operation - -`application/json` - -```ts -{ - jsonapi: { - version?: string //default: 1.1 - ext?: string //default: https://jsonapi.org/profiles/ethanresnick/cursor-pagination - } - links: { - self?: string //default: /api/v2/ui/agents?page[size]=25 - first?: string //default: /api/v2/ui/agents?page[size]=25&page[after]=0 - last?: string //default: /api/v2/ui/agents?page[size]=25&page[before]=500 - next?: string //default: /api/v2/ui/agents?page[size]=25&page[after]=25 - previous?: string //default: /api/v2/ui/agents?page[size]=25&page[before]=25 - } - id?: integer - type?: string //default: Agent - data: { - agentName?: string - uid?: string - os?: integer - devices?: string - cmdPars?: string - ignoreErrors?: enum[0, 1, 2] - isActive?: boolean - isTrusted?: boolean - token?: string - lastAct?: string - lastTime?: integer - lastIp?: string - userId?: integer - cpuOnly?: boolean - clientSignature?: string - } - relationships: { - } - included: { - }[] -}[] -``` - -- 400 Invalid request - -`application/json` - -```ts -{ - title?: string - type?: string - status?: integer -} -``` - -- 401 Authentication failed - -`application/json` - -```ts -{ - title?: string - type?: string - status?: integer -} -``` - -*** - -### [GET]/api/v2/ui/agents/count - -- Description -GET many request to retrieve multiple objects. - -- Security -bearerAuth - -#### Parameters(Query) - -```ts -page[after]?: integer -``` - -```ts -page[before]?: integer -``` - -```ts -page[size]?: integer -``` - -```ts -filter: { -} -``` - -```ts -include?: string -``` - -#### Responses - -- 200 successful operation - -`application/json` - -```ts -{ - jsonapi: { - version?: string //default: 1.1 - ext?: string //default: https://jsonapi.org/profiles/ethanresnick/cursor-pagination - } - links: { - self?: string //default: /api/v2/ui/agents?page[size]=25 - first?: string //default: /api/v2/ui/agents?page[size]=25&page[after]=0 - last?: string //default: /api/v2/ui/agents?page[size]=25&page[before]=500 - next?: string //default: /api/v2/ui/agents?page[size]=25&page[after]=25 - previous?: string //default: /api/v2/ui/agents?page[size]=25&page[before]=25 - } - id?: integer - type?: string //default: Agent - data: { - agentName?: string - uid?: string - os?: integer - devices?: string - cmdPars?: string - ignoreErrors?: enum[0, 1, 2] - isActive?: boolean - isTrusted?: boolean - token?: string - lastAct?: string - lastTime?: integer - lastIp?: string - userId?: integer - cpuOnly?: boolean - clientSignature?: string - } - relationships: { - } - included: { - }[] -}[] -``` - -- 400 Invalid request - -`application/json` - -```ts -{ - title?: string - type?: string - status?: integer -} -``` - -- 401 Authentication failed - -`application/json` - -```ts -{ - title?: string - type?: string - status?: integer -} -``` - -*** - -### [GET]/api/v2/ui/agents/{id:[0-9]+}/{relation:accessGroups} - -- Description -GET request for for a to-one relationship link. Returns the resource record of the object that is part of the specified relation. - -- Security -bearerAuth - -#### Parameters(Query) - -```ts -include?: string -``` - -#### Responses - -- 200 successful operation - -`application/json` - -```ts -{ - jsonapi: { - version?: string //default: 1.1 - ext?: string //default: https://jsonapi.org/profiles/ethanresnick/cursor-pagination - } - links: { - self?: string //default: /api/v2/ui/agents?page[size]=25 - first?: string //default: /api/v2/ui/agents?page[size]=25&page[after]=0 - last?: string //default: /api/v2/ui/agents?page[size]=25&page[before]=500 - next?: string //default: /api/v2/ui/agents?page[size]=25&page[after]=25 - previous?: string //default: /api/v2/ui/agents?page[size]=25&page[before]=25 - } - id?: integer - type?: string //default: Agent - data: { - agentName?: string - uid?: string - os?: integer - devices?: string - cmdPars?: string - ignoreErrors?: enum[0, 1, 2] - isActive?: boolean - isTrusted?: boolean - token?: string - lastAct?: string - lastTime?: integer - lastIp?: string - userId?: integer - cpuOnly?: boolean - clientSignature?: string - } - relationships: { - } - included: { - }[] -} -``` - -- 400 Invalid request - -`application/json` - -```ts -{ - title?: string - type?: string - status?: integer -} -``` - -- 401 Authentication failed - -`application/json` - -```ts -{ - title?: string - type?: string - status?: integer -} -``` - -- 404 Not Found - -`application/json` - -```ts -{ - message?: string - exception: { - type?: string - code?: integer - message?: string - file?: string - line?: integer - } -} -``` - -*** - -### [GET]/api/v2/ui/agents/{id:[0-9]+}/relationships/{relation:accessGroups} - -- Description -GET request for for a to-one relationship link. Returns the resource record of the object that is part of the specified relation. - -- Security -bearerAuth - -#### Parameters(Query) - -```ts -include?: string -``` - -#### Responses - -- 200 successful operation - -`application/json` - -```ts -{ - jsonapi: { - version?: string //default: 1.1 - ext?: string //default: https://jsonapi.org/profiles/ethanresnick/cursor-pagination - } - links: { - self?: string //default: /api/v2/ui/agents?page[size]=25 - first?: string //default: /api/v2/ui/agents?page[size]=25&page[after]=0 - last?: string //default: /api/v2/ui/agents?page[size]=25&page[before]=500 - next?: string //default: /api/v2/ui/agents?page[size]=25&page[after]=25 - previous?: string //default: /api/v2/ui/agents?page[size]=25&page[before]=25 - } - id?: integer - type?: string //default: Agent - data: { - agentName?: string - uid?: string - os?: integer - devices?: string - cmdPars?: string - ignoreErrors?: enum[0, 1, 2] - isActive?: boolean - isTrusted?: boolean - token?: string - lastAct?: string - lastTime?: integer - lastIp?: string - userId?: integer - cpuOnly?: boolean - clientSignature?: string - } - relationships: { - } - included: { - }[] -} -``` - -- 400 Invalid request - -`application/json` - -```ts -{ - title?: string - type?: string - status?: integer -} -``` - -- 401 Authentication failed - -`application/json` - -```ts -{ - title?: string - type?: string - status?: integer -} -``` - -- 404 Not Found - -`application/json` - -```ts -{ - message?: string - exception: { - type?: string - code?: integer - message?: string - file?: string - line?: integer - } -} -``` - -*** - -### [PATCH]/api/v2/ui/agents/{id:[0-9]+}/relationships/{relation:accessGroups} - -- Security -bearerAuth - -#### RequestBody - -- application/json - -```ts -{ - data: { - type?: string - attributes: { - agentName?: string - clientSignature?: string - cmdPars?: string - cpuOnly?: boolean - devices?: string - ignoreErrors?: enum[0, 1, 2] - isActive?: boolean - isTrusted?: boolean - os?: integer - token?: string - uid?: string - userId?: integer - } - } -} -``` - -#### Responses - -- 200 successful operation - -`application/json` - -```ts -{ - jsonapi: { - version?: string //default: 1.1 - ext?: string //default: https://jsonapi.org/profiles/ethanresnick/cursor-pagination - } - id?: integer - type?: string //default: Agent - data: { - agentName?: string - uid?: string - os?: integer - devices?: string - cmdPars?: string - ignoreErrors?: enum[0, 1, 2] - isActive?: boolean - isTrusted?: boolean - token?: string - lastAct?: string - lastTime?: integer - lastIp?: string - userId?: integer - cpuOnly?: boolean - clientSignature?: string - } -} -``` - -- 400 Invalid request - -`application/json` - -```ts -{ - title?: string - type?: string - status?: integer -} -``` - -- 401 Authentication failed - -`application/json` - -```ts -{ - title?: string - type?: string - status?: integer -} -``` - -- 404 Not Found - -`application/json` - -```ts -{ - message?: string - exception: { - type?: string - code?: integer - message?: string - file?: string - line?: integer - } -} -``` - -*** - -### [POST]/api/v2/ui/agents/{id:[0-9]+}/relationships/{relation:accessGroups} - -- Security -bearerAuth - -#### RequestBody - -- application/json - -#### Responses - -- 204 successfully created - -- 400 Invalid request - -`application/json` - -```ts -{ - title?: string - type?: string - status?: integer -} -``` - -- 401 Authentication failed - -`application/json` - -```ts -{ - title?: string - type?: string - status?: integer -} -``` - -- 404 Not Found - -`application/json` - -```ts -{ - message?: string - exception: { - type?: string - code?: integer - message?: string - file?: string - line?: integer - } -} -``` - -*** - -### [DELETE]/api/v2/ui/agents/{id:[0-9]+}/relationships/{relation:accessGroups} - -- Security -bearerAuth - -#### RequestBody - -- application/json - -#### Responses - -- 204 successfully deleted - -- 400 Invalid request - -`application/json` - -```ts -{ - title?: string - type?: string - status?: integer -} -``` - -- 401 Authentication failed - -`application/json` - -```ts -{ - title?: string - type?: string - status?: integer -} -``` - -- 404 Not Found - -`application/json` - -```ts -{ - message?: string - exception: { - type?: string - code?: integer - message?: string - file?: string - line?: integer - } -} -``` - -*** - -### [GET]/api/v2/ui/agents/{id:[0-9]+}/{relation:agentStats} - -- Description -GET request for for a to-one relationship link. Returns the resource record of the object that is part of the specified relation. - -- Security -bearerAuth - -#### Parameters(Query) - -```ts -include?: string -``` - -#### Responses - -- 200 successful operation - -`application/json` - -```ts -{ - jsonapi: { - version?: string //default: 1.1 - ext?: string //default: https://jsonapi.org/profiles/ethanresnick/cursor-pagination - } - links: { - self?: string //default: /api/v2/ui/agents?page[size]=25 - first?: string //default: /api/v2/ui/agents?page[size]=25&page[after]=0 - last?: string //default: /api/v2/ui/agents?page[size]=25&page[before]=500 - next?: string //default: /api/v2/ui/agents?page[size]=25&page[after]=25 - previous?: string //default: /api/v2/ui/agents?page[size]=25&page[before]=25 - } - id?: integer - type?: string //default: Agent - data: { - agentName?: string - uid?: string - os?: integer - devices?: string - cmdPars?: string - ignoreErrors?: enum[0, 1, 2] - isActive?: boolean - isTrusted?: boolean - token?: string - lastAct?: string - lastTime?: integer - lastIp?: string - userId?: integer - cpuOnly?: boolean - clientSignature?: string - } - relationships: { - } - included: { - }[] -} -``` - -- 400 Invalid request - -`application/json` - -```ts -{ - title?: string - type?: string - status?: integer -} -``` - -- 401 Authentication failed - -`application/json` - -```ts -{ - title?: string - type?: string - status?: integer -} -``` - -- 404 Not Found - -`application/json` - -```ts -{ - message?: string - exception: { - type?: string - code?: integer - message?: string - file?: string - line?: integer - } -} -``` - -*** - -### [GET]/api/v2/ui/agents/{id:[0-9]+}/relationships/{relation:agentStats} - -- Description -GET request for for a to-one relationship link. Returns the resource record of the object that is part of the specified relation. - -- Security -bearerAuth - -#### Parameters(Query) - -```ts -include?: string -``` - -#### Responses - -- 200 successful operation - -`application/json` - -```ts -{ - jsonapi: { - version?: string //default: 1.1 - ext?: string //default: https://jsonapi.org/profiles/ethanresnick/cursor-pagination - } - links: { - self?: string //default: /api/v2/ui/agents?page[size]=25 - first?: string //default: /api/v2/ui/agents?page[size]=25&page[after]=0 - last?: string //default: /api/v2/ui/agents?page[size]=25&page[before]=500 - next?: string //default: /api/v2/ui/agents?page[size]=25&page[after]=25 - previous?: string //default: /api/v2/ui/agents?page[size]=25&page[before]=25 - } - id?: integer - type?: string //default: Agent - data: { - agentName?: string - uid?: string - os?: integer - devices?: string - cmdPars?: string - ignoreErrors?: enum[0, 1, 2] - isActive?: boolean - isTrusted?: boolean - token?: string - lastAct?: string - lastTime?: integer - lastIp?: string - userId?: integer - cpuOnly?: boolean - clientSignature?: string - } - relationships: { - } - included: { - }[] -} -``` - -- 400 Invalid request - -`application/json` - -```ts -{ - title?: string - type?: string - status?: integer -} -``` - -- 401 Authentication failed - -`application/json` - -```ts -{ - title?: string - type?: string - status?: integer -} -``` - -- 404 Not Found - -`application/json` - -```ts -{ - message?: string - exception: { - type?: string - code?: integer - message?: string - file?: string - line?: integer - } -} -``` - -*** - -### [PATCH]/api/v2/ui/agents/{id:[0-9]+}/relationships/{relation:agentStats} - -- Security -bearerAuth - -#### RequestBody - -- application/json - -```ts -{ - data: { - type?: string - attributes: { - agentName?: string - clientSignature?: string - cmdPars?: string - cpuOnly?: boolean - devices?: string - ignoreErrors?: enum[0, 1, 2] - isActive?: boolean - isTrusted?: boolean - os?: integer - token?: string - uid?: string - userId?: integer - } - } -} -``` - -#### Responses - -- 200 successful operation - -`application/json` - -```ts -{ - jsonapi: { - version?: string //default: 1.1 - ext?: string //default: https://jsonapi.org/profiles/ethanresnick/cursor-pagination - } - id?: integer - type?: string //default: Agent - data: { - agentName?: string - uid?: string - os?: integer - devices?: string - cmdPars?: string - ignoreErrors?: enum[0, 1, 2] - isActive?: boolean - isTrusted?: boolean - token?: string - lastAct?: string - lastTime?: integer - lastIp?: string - userId?: integer - cpuOnly?: boolean - clientSignature?: string - } -} -``` - -- 400 Invalid request - -`application/json` - -```ts -{ - title?: string - type?: string - status?: integer -} -``` - -- 401 Authentication failed - -`application/json` - -```ts -{ - title?: string - type?: string - status?: integer -} -``` - -- 404 Not Found - -`application/json` - -```ts -{ - message?: string - exception: { - type?: string - code?: integer - message?: string - file?: string - line?: integer - } -} -``` - -*** - -### [POST]/api/v2/ui/agents/{id:[0-9]+}/relationships/{relation:agentStats} - -- Security -bearerAuth - -#### RequestBody - -- application/json - -#### Responses - -- 204 successfully created - -- 400 Invalid request - -`application/json` - -```ts -{ - title?: string - type?: string - status?: integer -} -``` - -- 401 Authentication failed - -`application/json` - -```ts -{ - title?: string - type?: string - status?: integer -} -``` - -- 404 Not Found - -`application/json` - -```ts -{ - message?: string - exception: { - type?: string - code?: integer - message?: string - file?: string - line?: integer - } -} -``` - -*** - -### [DELETE]/api/v2/ui/agents/{id:[0-9]+}/relationships/{relation:agentStats} - -- Security -bearerAuth - -#### RequestBody - -- application/json - -#### Responses - -- 204 successfully deleted - -- 400 Invalid request - -`application/json` - -```ts -{ - title?: string - type?: string - status?: integer -} -``` - -- 401 Authentication failed - -`application/json` - -```ts -{ - title?: string - type?: string - status?: integer -} -``` - -- 404 Not Found - -`application/json` - -```ts -{ - message?: string - exception: { - type?: string - code?: integer - message?: string - file?: string - line?: integer - } -} -``` - -*** - -### [GET]/api/v2/ui/agents/{id:[0-9]+} - -- Description -GET request to retrieve a single object. - -- Security -bearerAuth - -#### Parameters(Query) - -```ts -include?: string -``` - -#### Responses - -- 200 successful operation - -`application/json` - -```ts -{ - jsonapi: { - version?: string //default: 1.1 - ext?: string //default: https://jsonapi.org/profiles/ethanresnick/cursor-pagination - } - links: { - self?: string //default: /api/v2/ui/agents?page[size]=25 - first?: string //default: /api/v2/ui/agents?page[size]=25&page[after]=0 - last?: string //default: /api/v2/ui/agents?page[size]=25&page[before]=500 - next?: string //default: /api/v2/ui/agents?page[size]=25&page[after]=25 - previous?: string //default: /api/v2/ui/agents?page[size]=25&page[before]=25 - } - id?: integer - type?: string //default: Agent - data: { - agentName?: string - uid?: string - os?: integer - devices?: string - cmdPars?: string - ignoreErrors?: enum[0, 1, 2] - isActive?: boolean - isTrusted?: boolean - token?: string - lastAct?: string - lastTime?: integer - lastIp?: string - userId?: integer - cpuOnly?: boolean - clientSignature?: string - } - relationships: { - } - included: { - }[] -} -``` - -- 400 Invalid request - -`application/json` - -```ts -{ - title?: string - type?: string - status?: integer -} -``` - -- 401 Authentication failed - -`application/json` - -```ts -{ - title?: string - type?: string - status?: integer -} -``` - -- 404 Not Found - -`application/json` - -```ts -{ - message?: string - exception: { - type?: string - code?: integer - message?: string - file?: string - line?: integer - } -} -``` - -*** - -### [PATCH]/api/v2/ui/agents/{id:[0-9]+} - -- Description -PATCH request to update attributes of a single object. - -- Security -bearerAuth - -#### RequestBody - -- application/json - -```ts -{ - data: { - type?: string - attributes: { - agentName?: string - clientSignature?: string - cmdPars?: string - cpuOnly?: boolean - devices?: string - ignoreErrors?: enum[0, 1, 2] - isActive?: boolean - isTrusted?: boolean - os?: integer - token?: string - uid?: string - userId?: integer - } - } -} -``` - -#### Responses - -- 200 successful operation - -`application/json` - -```ts -{ - jsonapi: { - version?: string //default: 1.1 - ext?: string //default: https://jsonapi.org/profiles/ethanresnick/cursor-pagination - } - id?: integer - type?: string //default: Agent - data: { - agentName?: string - uid?: string - os?: integer - devices?: string - cmdPars?: string - ignoreErrors?: enum[0, 1, 2] - isActive?: boolean - isTrusted?: boolean - token?: string - lastAct?: string - lastTime?: integer - lastIp?: string - userId?: integer - cpuOnly?: boolean - clientSignature?: string - } -} -``` - -- 400 Invalid request - -`application/json` - -```ts -{ - title?: string - type?: string - status?: integer -} -``` - -- 401 Authentication failed - -`application/json` - -```ts -{ - title?: string - type?: string - status?: integer -} -``` - -- 404 Not Found - -`application/json` - -```ts -{ - message?: string - exception: { - type?: string - code?: integer - message?: string - file?: string - line?: integer - } -} -``` - -*** - -### [DELETE]/api/v2/ui/agents/{id:[0-9]+} - -- Security -bearerAuth - -#### RequestBody - -- application/json - -#### Responses - -- 204 successfully deleted - -- 400 Invalid request - -`application/json` - -```ts -{ - title?: string - type?: string - status?: integer -} -``` - -- 401 Authentication failed - -`application/json` - -```ts -{ - title?: string - type?: string - status?: integer -} -``` - -- 404 Not Found - -`application/json` - -```ts -{ - message?: string - exception: { - type?: string - code?: integer - message?: string - file?: string - line?: integer - } -} -``` - -*** - -### [GET]/api/v2/ui/agentstats - -- Description -GET many request to retrieve multiple objects. - -- Security -bearerAuth - -#### Parameters(Query) - -```ts -page[after]?: integer -``` - -```ts -page[before]?: integer -``` - -```ts -page[size]?: integer -``` - -```ts -filter: { -} -``` - -```ts -include?: string -``` - -#### Responses - -- 200 successful operation - -`application/json` - -```ts -{ - jsonapi: { - version?: string //default: 1.1 - ext?: string //default: https://jsonapi.org/profiles/ethanresnick/cursor-pagination - } - links: { - self?: string //default: /api/v2/ui/agentstats?page[size]=25 - first?: string //default: /api/v2/ui/agentstats?page[size]=25&page[after]=0 - last?: string //default: /api/v2/ui/agentstats?page[size]=25&page[before]=500 - next?: string //default: /api/v2/ui/agentstats?page[size]=25&page[after]=25 - previous?: string //default: /api/v2/ui/agentstats?page[size]=25&page[before]=25 - } - id?: integer - type?: string //default: AgentStat - data: { - agentId?: integer - statType?: integer - time?: integer -[] - } - relationships: { - } - included: { - }[] -}[] -``` - -- 400 Invalid request - -`application/json` - -```ts -{ - title?: string - type?: string - status?: integer -} -``` - -- 401 Authentication failed - -`application/json` - -```ts -{ - title?: string - type?: string - status?: integer -} -``` - -*** - -### [GET]/api/v2/ui/agentstats/count - -- Description -GET many request to retrieve multiple objects. - -- Security -bearerAuth - -#### Parameters(Query) - -```ts -page[after]?: integer -``` - -```ts -page[before]?: integer -``` - -```ts -page[size]?: integer -``` - -```ts -filter: { -} -``` - -```ts -include?: string -``` - -#### Responses - -- 200 successful operation - -`application/json` - -```ts -{ - jsonapi: { - version?: string //default: 1.1 - ext?: string //default: https://jsonapi.org/profiles/ethanresnick/cursor-pagination - } - links: { - self?: string //default: /api/v2/ui/agentstats?page[size]=25 - first?: string //default: /api/v2/ui/agentstats?page[size]=25&page[after]=0 - last?: string //default: /api/v2/ui/agentstats?page[size]=25&page[before]=500 - next?: string //default: /api/v2/ui/agentstats?page[size]=25&page[after]=25 - previous?: string //default: /api/v2/ui/agentstats?page[size]=25&page[before]=25 - } - id?: integer - type?: string //default: AgentStat - data: { - agentId?: integer - statType?: integer - time?: integer -[] - } - relationships: { - } - included: { - }[] -}[] -``` - -- 400 Invalid request - -`application/json` - -```ts -{ - title?: string - type?: string - status?: integer -} -``` - -- 401 Authentication failed - -`application/json` - -```ts -{ - title?: string - type?: string - status?: integer -} -``` - -*** - -### [GET]/api/v2/ui/agentstats/{id:[0-9]+} - -- Description -GET request to retrieve a single object. - -- Security -bearerAuth - -#### Parameters(Query) - -```ts -include?: string -``` - -#### Responses - -- 200 successful operation - -`application/json` - -```ts -{ - jsonapi: { - version?: string //default: 1.1 - ext?: string //default: https://jsonapi.org/profiles/ethanresnick/cursor-pagination - } - links: { - self?: string //default: /api/v2/ui/agentstats?page[size]=25 - first?: string //default: /api/v2/ui/agentstats?page[size]=25&page[after]=0 - last?: string //default: /api/v2/ui/agentstats?page[size]=25&page[before]=500 - next?: string //default: /api/v2/ui/agentstats?page[size]=25&page[after]=25 - previous?: string //default: /api/v2/ui/agentstats?page[size]=25&page[before]=25 - } - id?: integer - type?: string //default: AgentStat - data: { - agentId?: integer - statType?: integer - time?: integer -[] - } - relationships: { - } - included: { - }[] -} -``` - -- 400 Invalid request - -`application/json` - -```ts -{ - title?: string - type?: string - status?: integer -} -``` - -- 401 Authentication failed - -`application/json` - -```ts -{ - title?: string - type?: string - status?: integer -} -``` - -- 404 Not Found - -`application/json` - -```ts -{ - message?: string - exception: { - type?: string - code?: integer - message?: string - file?: string - line?: integer - } -} -``` - -*** - -### [DELETE]/api/v2/ui/agentstats/{id:[0-9]+} - -- Security -bearerAuth - -#### RequestBody - -- application/json - -#### Responses - -- 204 successfully deleted - -- 400 Invalid request - -`application/json` - -```ts -{ - title?: string - type?: string - status?: integer -} -``` - -- 401 Authentication failed - -`application/json` - -```ts -{ - title?: string - type?: string - status?: integer -} -``` - -- 404 Not Found - -`application/json` - -```ts -{ - message?: string - exception: { - type?: string - code?: integer - message?: string - file?: string - line?: integer - } -} -``` - -*** - -### [GET]/api/v2/ui/chunks - -- Description -GET many request to retrieve multiple objects. - -- Security -bearerAuth - -#### Parameters(Query) - -```ts -page[after]?: integer -``` - -```ts -page[before]?: integer -``` - -```ts -page[size]?: integer -``` - -```ts -filter: { -} -``` - -```ts -include?: string -``` - -#### Responses - -- 200 successful operation - -`application/json` - -```ts -{ - jsonapi: { - version?: string //default: 1.1 - ext?: string //default: https://jsonapi.org/profiles/ethanresnick/cursor-pagination - } - links: { - self?: string //default: /api/v2/ui/chunks?page[size]=25 - first?: string //default: /api/v2/ui/chunks?page[size]=25&page[after]=0 - last?: string //default: /api/v2/ui/chunks?page[size]=25&page[before]=500 - next?: string //default: /api/v2/ui/chunks?page[size]=25&page[after]=25 - previous?: string //default: /api/v2/ui/chunks?page[size]=25&page[before]=25 - } - id?: integer - type?: string //default: Chunk - data: { - taskId?: integer - skip?: integer - length?: integer - agentId?: integer - dispatchTime?: integer - solveTime?: integer - checkpoint?: integer - progress?: integer - state?: integer - cracked?: integer - speed?: integer - } - relationships: { - } - included: { - }[] -}[] -``` - -- 400 Invalid request - -`application/json` - -```ts -{ - title?: string - type?: string - status?: integer -} -``` - -- 401 Authentication failed - -`application/json` - -```ts -{ - title?: string - type?: string - status?: integer -} -``` - -*** - -### [GET]/api/v2/ui/chunks/count - -- Description -GET many request to retrieve multiple objects. - -- Security -bearerAuth - -#### Parameters(Query) - -```ts -page[after]?: integer -``` - -```ts -page[before]?: integer -``` - -```ts -page[size]?: integer -``` - -```ts -filter: { -} -``` - -```ts -include?: string -``` - -#### Responses - -- 200 successful operation - -`application/json` - -```ts -{ - jsonapi: { - version?: string //default: 1.1 - ext?: string //default: https://jsonapi.org/profiles/ethanresnick/cursor-pagination - } - links: { - self?: string //default: /api/v2/ui/chunks?page[size]=25 - first?: string //default: /api/v2/ui/chunks?page[size]=25&page[after]=0 - last?: string //default: /api/v2/ui/chunks?page[size]=25&page[before]=500 - next?: string //default: /api/v2/ui/chunks?page[size]=25&page[after]=25 - previous?: string //default: /api/v2/ui/chunks?page[size]=25&page[before]=25 - } - id?: integer - type?: string //default: Chunk - data: { - taskId?: integer - skip?: integer - length?: integer - agentId?: integer - dispatchTime?: integer - solveTime?: integer - checkpoint?: integer - progress?: integer - state?: integer - cracked?: integer - speed?: integer - } - relationships: { - } - included: { - }[] -}[] -``` - -- 400 Invalid request - -`application/json` - -```ts -{ - title?: string - type?: string - status?: integer -} -``` - -- 401 Authentication failed - -`application/json` - -```ts -{ - title?: string - type?: string - status?: integer -} -``` - -*** - -### [GET]/api/v2/ui/chunks/{id:[0-9]+}/{relation:agent} - -- Description -GET request for for a to-one relationship link. Returns the resource record of the object that is part of the specified relation. - -- Security -bearerAuth - -#### Parameters(Query) - -```ts -include?: string -``` - -#### Responses - -- 200 successful operation - -`application/json` - -```ts -{ - jsonapi: { - version?: string //default: 1.1 - ext?: string //default: https://jsonapi.org/profiles/ethanresnick/cursor-pagination - } - links: { - self?: string //default: /api/v2/ui/chunks?page[size]=25 - first?: string //default: /api/v2/ui/chunks?page[size]=25&page[after]=0 - last?: string //default: /api/v2/ui/chunks?page[size]=25&page[before]=500 - next?: string //default: /api/v2/ui/chunks?page[size]=25&page[after]=25 - previous?: string //default: /api/v2/ui/chunks?page[size]=25&page[before]=25 - } - id?: integer - type?: string //default: Chunk - data: { - taskId?: integer - skip?: integer - length?: integer - agentId?: integer - dispatchTime?: integer - solveTime?: integer - checkpoint?: integer - progress?: integer - state?: integer - cracked?: integer - speed?: integer - } - relationships: { - } - included: { - }[] -} -``` - -- 400 Invalid request - -`application/json` - -```ts -{ - title?: string - type?: string - status?: integer -} -``` - -- 401 Authentication failed - -`application/json` - -```ts -{ - title?: string - type?: string - status?: integer -} -``` - -- 404 Not Found - -`application/json` - -```ts -{ - message?: string - exception: { - type?: string - code?: integer - message?: string - file?: string - line?: integer - } -} -``` - -*** - -### [GET]/api/v2/ui/chunks/{id:[0-9]+}/relationships/{relation:agent} - -- Description -GET request for for a to-one relationship link. Returns the resource record of the object that is part of the specified relation. - -- Security -bearerAuth - -#### Parameters(Query) - -```ts -include?: string -``` - -#### Responses - -- 200 successful operation - -`application/json` - -```ts -{ - jsonapi: { - version?: string //default: 1.1 - ext?: string //default: https://jsonapi.org/profiles/ethanresnick/cursor-pagination - } - links: { - self?: string //default: /api/v2/ui/chunks?page[size]=25 - first?: string //default: /api/v2/ui/chunks?page[size]=25&page[after]=0 - last?: string //default: /api/v2/ui/chunks?page[size]=25&page[before]=500 - next?: string //default: /api/v2/ui/chunks?page[size]=25&page[after]=25 - previous?: string //default: /api/v2/ui/chunks?page[size]=25&page[before]=25 - } - id?: integer - type?: string //default: Chunk - data: { - taskId?: integer - skip?: integer - length?: integer - agentId?: integer - dispatchTime?: integer - solveTime?: integer - checkpoint?: integer - progress?: integer - state?: integer - cracked?: integer - speed?: integer - } - relationships: { - } - included: { - }[] -} -``` - -- 400 Invalid request - -`application/json` - -```ts -{ - title?: string - type?: string - status?: integer -} -``` - -- 401 Authentication failed - -`application/json` - -```ts -{ - title?: string - type?: string - status?: integer -} -``` - -- 404 Not Found - -`application/json` - -```ts -{ - message?: string - exception: { - type?: string - code?: integer - message?: string - file?: string - line?: integer - } -} -``` - -*** - -### [PATCH]/api/v2/ui/chunks/{id:[0-9]+}/relationships/{relation:agent} - -- Security -bearerAuth - -#### RequestBody - -- application/json - -```ts -{ - data: { - type?: string - attributes: { - } - } -} -``` - -#### Responses - -- 200 successful operation - -`application/json` - -```ts -{ - jsonapi: { - version?: string //default: 1.1 - ext?: string //default: https://jsonapi.org/profiles/ethanresnick/cursor-pagination - } - id?: integer - type?: string //default: Chunk - data: { - taskId?: integer - skip?: integer - length?: integer - agentId?: integer - dispatchTime?: integer - solveTime?: integer - checkpoint?: integer - progress?: integer - state?: integer - cracked?: integer - speed?: integer - } -} -``` - -- 400 Invalid request - -`application/json` - -```ts -{ - title?: string - type?: string - status?: integer -} -``` - -- 401 Authentication failed - -`application/json` - -```ts -{ - title?: string - type?: string - status?: integer -} -``` - -- 404 Not Found - -`application/json` - -```ts -{ - message?: string - exception: { - type?: string - code?: integer - message?: string - file?: string - line?: integer - } -} -``` - -*** - -### [GET]/api/v2/ui/chunks/{id:[0-9]+}/{relation:task} - -- Description -GET request for for a to-one relationship link. Returns the resource record of the object that is part of the specified relation. - -- Security -bearerAuth - -#### Parameters(Query) - -```ts -include?: string -``` - -#### Responses - -- 200 successful operation - -`application/json` - -```ts -{ - jsonapi: { - version?: string //default: 1.1 - ext?: string //default: https://jsonapi.org/profiles/ethanresnick/cursor-pagination - } - links: { - self?: string //default: /api/v2/ui/chunks?page[size]=25 - first?: string //default: /api/v2/ui/chunks?page[size]=25&page[after]=0 - last?: string //default: /api/v2/ui/chunks?page[size]=25&page[before]=500 - next?: string //default: /api/v2/ui/chunks?page[size]=25&page[after]=25 - previous?: string //default: /api/v2/ui/chunks?page[size]=25&page[before]=25 - } - id?: integer - type?: string //default: Chunk - data: { - taskId?: integer - skip?: integer - length?: integer - agentId?: integer - dispatchTime?: integer - solveTime?: integer - checkpoint?: integer - progress?: integer - state?: integer - cracked?: integer - speed?: integer - } - relationships: { - } - included: { - }[] -} -``` - -- 400 Invalid request - -`application/json` - -```ts -{ - title?: string - type?: string - status?: integer -} -``` - -- 401 Authentication failed - -`application/json` - -```ts -{ - title?: string - type?: string - status?: integer -} -``` - -- 404 Not Found - -`application/json` - -```ts -{ - message?: string - exception: { - type?: string - code?: integer - message?: string - file?: string - line?: integer - } -} -``` - -*** - -### [GET]/api/v2/ui/chunks/{id:[0-9]+}/relationships/{relation:task} - -- Description -GET request for for a to-one relationship link. Returns the resource record of the object that is part of the specified relation. - -- Security -bearerAuth - -#### Parameters(Query) - -```ts -include?: string -``` - -#### Responses - -- 200 successful operation - -`application/json` - -```ts -{ - jsonapi: { - version?: string //default: 1.1 - ext?: string //default: https://jsonapi.org/profiles/ethanresnick/cursor-pagination - } - links: { - self?: string //default: /api/v2/ui/chunks?page[size]=25 - first?: string //default: /api/v2/ui/chunks?page[size]=25&page[after]=0 - last?: string //default: /api/v2/ui/chunks?page[size]=25&page[before]=500 - next?: string //default: /api/v2/ui/chunks?page[size]=25&page[after]=25 - previous?: string //default: /api/v2/ui/chunks?page[size]=25&page[before]=25 - } - id?: integer - type?: string //default: Chunk - data: { - taskId?: integer - skip?: integer - length?: integer - agentId?: integer - dispatchTime?: integer - solveTime?: integer - checkpoint?: integer - progress?: integer - state?: integer - cracked?: integer - speed?: integer - } - relationships: { - } - included: { - }[] -} -``` - -- 400 Invalid request - -`application/json` - -```ts -{ - title?: string - type?: string - status?: integer -} -``` - -- 401 Authentication failed - -`application/json` - -```ts -{ - title?: string - type?: string - status?: integer -} -``` - -- 404 Not Found - -`application/json` - -```ts -{ - message?: string - exception: { - type?: string - code?: integer - message?: string - file?: string - line?: integer - } -} -``` - -*** - -### [PATCH]/api/v2/ui/chunks/{id:[0-9]+}/relationships/{relation:task} - -- Security -bearerAuth - -#### RequestBody - -- application/json - -```ts -{ - data: { - type?: string - attributes: { - } - } -} -``` - -#### Responses - -- 200 successful operation - -`application/json` - -```ts -{ - jsonapi: { - version?: string //default: 1.1 - ext?: string //default: https://jsonapi.org/profiles/ethanresnick/cursor-pagination - } - id?: integer - type?: string //default: Chunk - data: { - taskId?: integer - skip?: integer - length?: integer - agentId?: integer - dispatchTime?: integer - solveTime?: integer - checkpoint?: integer - progress?: integer - state?: integer - cracked?: integer - speed?: integer - } -} -``` - -- 400 Invalid request - -`application/json` - -```ts -{ - title?: string - type?: string - status?: integer -} -``` - -- 401 Authentication failed - -`application/json` - -```ts -{ - title?: string - type?: string - status?: integer -} -``` - -- 404 Not Found - -`application/json` - -```ts -{ - message?: string - exception: { - type?: string - code?: integer - message?: string - file?: string - line?: integer - } -} -``` - -*** - -### [GET]/api/v2/ui/chunks/{id:[0-9]+} - -- Description -GET request to retrieve a single object. - -- Security -bearerAuth - -#### Parameters(Query) - -```ts -include?: string -``` - -#### Responses - -- 200 successful operation - -`application/json` - -```ts -{ - jsonapi: { - version?: string //default: 1.1 - ext?: string //default: https://jsonapi.org/profiles/ethanresnick/cursor-pagination - } - links: { - self?: string //default: /api/v2/ui/chunks?page[size]=25 - first?: string //default: /api/v2/ui/chunks?page[size]=25&page[after]=0 - last?: string //default: /api/v2/ui/chunks?page[size]=25&page[before]=500 - next?: string //default: /api/v2/ui/chunks?page[size]=25&page[after]=25 - previous?: string //default: /api/v2/ui/chunks?page[size]=25&page[before]=25 - } - id?: integer - type?: string //default: Chunk - data: { - taskId?: integer - skip?: integer - length?: integer - agentId?: integer - dispatchTime?: integer - solveTime?: integer - checkpoint?: integer - progress?: integer - state?: integer - cracked?: integer - speed?: integer - } - relationships: { - } - included: { - }[] -} -``` - -- 400 Invalid request - -`application/json` - -```ts -{ - title?: string - type?: string - status?: integer -} -``` - -- 401 Authentication failed - -`application/json` - -```ts -{ - title?: string - type?: string - status?: integer -} -``` - -- 404 Not Found - -`application/json` - -```ts -{ - message?: string - exception: { - type?: string - code?: integer - message?: string - file?: string - line?: integer - } -} -``` - -*** - -### [GET]/api/v2/ui/configs - -- Description -GET many request to retrieve multiple objects. - -- Security -bearerAuth - -#### Parameters(Query) - -```ts -page[after]?: integer -``` - -```ts -page[before]?: integer -``` - -```ts -page[size]?: integer -``` - -```ts -filter: { -} -``` - -```ts -include?: string -``` - -#### Responses - -- 200 successful operation - -`application/json` - -```ts -{ - jsonapi: { - version?: string //default: 1.1 - ext?: string //default: https://jsonapi.org/profiles/ethanresnick/cursor-pagination - } - links: { - self?: string //default: /api/v2/ui/configs?page[size]=25 - first?: string //default: /api/v2/ui/configs?page[size]=25&page[after]=0 - last?: string //default: /api/v2/ui/configs?page[size]=25&page[before]=500 - next?: string //default: /api/v2/ui/configs?page[size]=25&page[after]=25 - previous?: string //default: /api/v2/ui/configs?page[size]=25&page[before]=25 - } - id?: integer - type?: string //default: Config - data: { - configSectionId?: integer - item?: string - value?: string - } - relationships: { - } - included: { - }[] -}[] -``` - -- 400 Invalid request - -`application/json` - -```ts -{ - title?: string - type?: string - status?: integer -} -``` - -- 401 Authentication failed - -`application/json` - -```ts -{ - title?: string - type?: string - status?: integer -} -``` - -*** - -### [GET]/api/v2/ui/configs/count - -- Description -GET many request to retrieve multiple objects. - -- Security -bearerAuth - -#### Parameters(Query) - -```ts -page[after]?: integer -``` - -```ts -page[before]?: integer -``` - -```ts -page[size]?: integer -``` - -```ts -filter: { -} -``` - -```ts -include?: string -``` - -#### Responses - -- 200 successful operation - -`application/json` - -```ts -{ - jsonapi: { - version?: string //default: 1.1 - ext?: string //default: https://jsonapi.org/profiles/ethanresnick/cursor-pagination - } - links: { - self?: string //default: /api/v2/ui/configs?page[size]=25 - first?: string //default: /api/v2/ui/configs?page[size]=25&page[after]=0 - last?: string //default: /api/v2/ui/configs?page[size]=25&page[before]=500 - next?: string //default: /api/v2/ui/configs?page[size]=25&page[after]=25 - previous?: string //default: /api/v2/ui/configs?page[size]=25&page[before]=25 - } - id?: integer - type?: string //default: Config - data: { - configSectionId?: integer - item?: string - value?: string - } - relationships: { - } - included: { - }[] -}[] -``` - -- 400 Invalid request - -`application/json` - -```ts -{ - title?: string - type?: string - status?: integer -} -``` - -- 401 Authentication failed - -`application/json` - -```ts -{ - title?: string - type?: string - status?: integer -} -``` - -*** - -### [GET]/api/v2/ui/configs/{id:[0-9]+}/{relation:configSection} - -- Description -GET request for for a to-one relationship link. Returns the resource record of the object that is part of the specified relation. - -- Security -bearerAuth - -#### Parameters(Query) - -```ts -include?: string -``` - -#### Responses - -- 200 successful operation - -`application/json` - -```ts -{ - jsonapi: { - version?: string //default: 1.1 - ext?: string //default: https://jsonapi.org/profiles/ethanresnick/cursor-pagination - } - links: { - self?: string //default: /api/v2/ui/configs?page[size]=25 - first?: string //default: /api/v2/ui/configs?page[size]=25&page[after]=0 - last?: string //default: /api/v2/ui/configs?page[size]=25&page[before]=500 - next?: string //default: /api/v2/ui/configs?page[size]=25&page[after]=25 - previous?: string //default: /api/v2/ui/configs?page[size]=25&page[before]=25 - } - id?: integer - type?: string //default: Config - data: { - configSectionId?: integer - item?: string - value?: string - } - relationships: { - } - included: { - }[] -} -``` - -- 400 Invalid request - -`application/json` - -```ts -{ - title?: string - type?: string - status?: integer -} -``` - -- 401 Authentication failed - -`application/json` - -```ts -{ - title?: string - type?: string - status?: integer -} -``` - -- 404 Not Found - -`application/json` - -```ts -{ - message?: string - exception: { - type?: string - code?: integer - message?: string - file?: string - line?: integer - } -} -``` - -*** - -### [GET]/api/v2/ui/configs/{id:[0-9]+}/relationships/{relation:configSection} - -- Description -GET request for for a to-one relationship link. Returns the resource record of the object that is part of the specified relation. - -- Security -bearerAuth - -#### Parameters(Query) - -```ts -include?: string -``` - -#### Responses - -- 200 successful operation - -`application/json` - -```ts -{ - jsonapi: { - version?: string //default: 1.1 - ext?: string //default: https://jsonapi.org/profiles/ethanresnick/cursor-pagination - } - links: { - self?: string //default: /api/v2/ui/configs?page[size]=25 - first?: string //default: /api/v2/ui/configs?page[size]=25&page[after]=0 - last?: string //default: /api/v2/ui/configs?page[size]=25&page[before]=500 - next?: string //default: /api/v2/ui/configs?page[size]=25&page[after]=25 - previous?: string //default: /api/v2/ui/configs?page[size]=25&page[before]=25 - } - id?: integer - type?: string //default: Config - data: { - configSectionId?: integer - item?: string - value?: string - } - relationships: { - } - included: { - }[] -} -``` - -- 400 Invalid request - -`application/json` - -```ts -{ - title?: string - type?: string - status?: integer -} -``` - -- 401 Authentication failed - -`application/json` - -```ts -{ - title?: string - type?: string - status?: integer -} -``` - -- 404 Not Found - -`application/json` - -```ts -{ - message?: string - exception: { - type?: string - code?: integer - message?: string - file?: string - line?: integer - } -} -``` - -*** - -### [PATCH]/api/v2/ui/configs/{id:[0-9]+}/relationships/{relation:configSection} - -- Security -bearerAuth - -#### RequestBody - -- application/json - -```ts -{ - data: { - type?: string - attributes: { - configSectionId?: integer - item?: string - value?: string - } - } -} -``` - -#### Responses - -- 200 successful operation - -`application/json` - -```ts -{ - jsonapi: { - version?: string //default: 1.1 - ext?: string //default: https://jsonapi.org/profiles/ethanresnick/cursor-pagination - } - id?: integer - type?: string //default: Config - data: { - configSectionId?: integer - item?: string - value?: string - } -} -``` - -- 400 Invalid request - -`application/json` - -```ts -{ - title?: string - type?: string - status?: integer -} -``` - -- 401 Authentication failed - -`application/json` - -```ts -{ - title?: string - type?: string - status?: integer -} -``` - -- 404 Not Found - -`application/json` - -```ts -{ - message?: string - exception: { - type?: string - code?: integer - message?: string - file?: string - line?: integer - } -} -``` - -*** - -### [GET]/api/v2/ui/configs/{id:[0-9]+} - -- Description -GET request to retrieve a single object. - -- Security -bearerAuth - -#### Parameters(Query) - -```ts -include?: string -``` - -#### Responses - -- 200 successful operation - -`application/json` - -```ts -{ - jsonapi: { - version?: string //default: 1.1 - ext?: string //default: https://jsonapi.org/profiles/ethanresnick/cursor-pagination - } - links: { - self?: string //default: /api/v2/ui/configs?page[size]=25 - first?: string //default: /api/v2/ui/configs?page[size]=25&page[after]=0 - last?: string //default: /api/v2/ui/configs?page[size]=25&page[before]=500 - next?: string //default: /api/v2/ui/configs?page[size]=25&page[after]=25 - previous?: string //default: /api/v2/ui/configs?page[size]=25&page[before]=25 - } - id?: integer - type?: string //default: Config - data: { - configSectionId?: integer - item?: string - value?: string - } - relationships: { - } - included: { - }[] -} -``` - -- 400 Invalid request - -`application/json` - -```ts -{ - title?: string - type?: string - status?: integer -} -``` - -- 401 Authentication failed - -`application/json` - -```ts -{ - title?: string - type?: string - status?: integer -} -``` - -- 404 Not Found - -`application/json` - -```ts -{ - message?: string - exception: { - type?: string - code?: integer - message?: string - file?: string - line?: integer - } -} -``` - -*** - -### [PATCH]/api/v2/ui/configs/{id:[0-9]+} - -- Description -PATCH request to update attributes of a single object. - -- Security -bearerAuth - -#### RequestBody - -- application/json - -```ts -{ - data: { - type?: string - attributes: { - configSectionId?: integer - item?: string - value?: string - } - } -} -``` - -#### Responses - -- 200 successful operation - -`application/json` - -```ts -{ - jsonapi: { - version?: string //default: 1.1 - ext?: string //default: https://jsonapi.org/profiles/ethanresnick/cursor-pagination - } - id?: integer - type?: string //default: Config - data: { - configSectionId?: integer - item?: string - value?: string - } -} -``` - -- 400 Invalid request - -`application/json` - -```ts -{ - title?: string - type?: string - status?: integer -} -``` - -- 401 Authentication failed - -`application/json` - -```ts -{ - title?: string - type?: string - status?: integer -} -``` - -- 404 Not Found - -`application/json` - -```ts -{ - message?: string - exception: { - type?: string - code?: integer - message?: string - file?: string - line?: integer - } -} -``` - -*** - -### [GET]/api/v2/ui/configsections - -- Description -GET many request to retrieve multiple objects. - -- Security -bearerAuth - -#### Parameters(Query) - -```ts -page[after]?: integer -``` - -```ts -page[before]?: integer -``` - -```ts -page[size]?: integer -``` - -```ts -filter: { -} -``` - -```ts -include?: string -``` - -#### Responses - -- 200 successful operation - -`application/json` - -```ts -{ - jsonapi: { - version?: string //default: 1.1 - ext?: string //default: https://jsonapi.org/profiles/ethanresnick/cursor-pagination - } - links: { - self?: string //default: /api/v2/ui/configsections?page[size]=25 - first?: string //default: /api/v2/ui/configsections?page[size]=25&page[after]=0 - last?: string //default: /api/v2/ui/configsections?page[size]=25&page[before]=500 - next?: string //default: /api/v2/ui/configsections?page[size]=25&page[after]=25 - previous?: string //default: /api/v2/ui/configsections?page[size]=25&page[before]=25 - } - id?: integer - type?: string //default: ConfigSection - data: { - sectionName?: string - } - relationships: { - } - included: { - }[] -}[] -``` - -- 400 Invalid request - -`application/json` - -```ts -{ - title?: string - type?: string - status?: integer -} -``` - -- 401 Authentication failed - -`application/json` - -```ts -{ - title?: string - type?: string - status?: integer -} -``` - -*** - -### [GET]/api/v2/ui/configsections/count - -- Description -GET many request to retrieve multiple objects. - -- Security -bearerAuth - -#### Parameters(Query) - -```ts -page[after]?: integer -``` - -```ts -page[before]?: integer -``` - -```ts -page[size]?: integer -``` - -```ts -filter: { -} -``` - -```ts -include?: string -``` - -#### Responses - -- 200 successful operation - -`application/json` - -```ts -{ - jsonapi: { - version?: string //default: 1.1 - ext?: string //default: https://jsonapi.org/profiles/ethanresnick/cursor-pagination - } - links: { - self?: string //default: /api/v2/ui/configsections?page[size]=25 - first?: string //default: /api/v2/ui/configsections?page[size]=25&page[after]=0 - last?: string //default: /api/v2/ui/configsections?page[size]=25&page[before]=500 - next?: string //default: /api/v2/ui/configsections?page[size]=25&page[after]=25 - previous?: string //default: /api/v2/ui/configsections?page[size]=25&page[before]=25 - } - id?: integer - type?: string //default: ConfigSection - data: { - sectionName?: string - } - relationships: { - } - included: { - }[] -}[] -``` - -- 400 Invalid request - -`application/json` - -```ts -{ - title?: string - type?: string - status?: integer -} -``` - -- 401 Authentication failed - -`application/json` - -```ts -{ - title?: string - type?: string - status?: integer -} -``` - -*** - -### [GET]/api/v2/ui/configsections/{id:[0-9]+} - -- Description -GET request to retrieve a single object. - -- Security -bearerAuth - -#### Parameters(Query) - -```ts -include?: string -``` - -#### Responses - -- 200 successful operation - -`application/json` - -```ts -{ - jsonapi: { - version?: string //default: 1.1 - ext?: string //default: https://jsonapi.org/profiles/ethanresnick/cursor-pagination - } - links: { - self?: string //default: /api/v2/ui/configsections?page[size]=25 - first?: string //default: /api/v2/ui/configsections?page[size]=25&page[after]=0 - last?: string //default: /api/v2/ui/configsections?page[size]=25&page[before]=500 - next?: string //default: /api/v2/ui/configsections?page[size]=25&page[after]=25 - previous?: string //default: /api/v2/ui/configsections?page[size]=25&page[before]=25 - } - id?: integer - type?: string //default: ConfigSection - data: { - sectionName?: string - } - relationships: { - } - included: { - }[] -} -``` - -- 400 Invalid request - -`application/json` - -```ts -{ - title?: string - type?: string - status?: integer -} -``` - -- 401 Authentication failed - -`application/json` - -```ts -{ - title?: string - type?: string - status?: integer -} -``` - -- 404 Not Found - -`application/json` - -```ts -{ - message?: string - exception: { - type?: string - code?: integer - message?: string - file?: string - line?: integer - } -} -``` - -*** - -### [GET]/api/v2/ui/crackers - -- Description -GET many request to retrieve multiple objects. - -- Security -bearerAuth - -#### Parameters(Query) - -```ts -page[after]?: integer -``` - -```ts -page[before]?: integer -``` - -```ts -page[size]?: integer -``` - -```ts -filter: { -} -``` - -```ts -include?: string -``` - -#### Responses - -- 200 successful operation - -`application/json` - -```ts -{ - jsonapi: { - version?: string //default: 1.1 - ext?: string //default: https://jsonapi.org/profiles/ethanresnick/cursor-pagination - } - links: { - self?: string //default: /api/v2/ui/crackers?page[size]=25 - first?: string //default: /api/v2/ui/crackers?page[size]=25&page[after]=0 - last?: string //default: /api/v2/ui/crackers?page[size]=25&page[before]=500 - next?: string //default: /api/v2/ui/crackers?page[size]=25&page[after]=25 - previous?: string //default: /api/v2/ui/crackers?page[size]=25&page[before]=25 - } - id?: integer - type?: string //default: CrackerBinary - data: { - crackerBinaryTypeId?: integer - version?: string - downloadUrl?: string - binaryName?: string - } - relationships: { - } - included: { - }[] -}[] -``` - -- 400 Invalid request - -`application/json` - -```ts -{ - title?: string - type?: string - status?: integer -} -``` - -- 401 Authentication failed - -`application/json` - -```ts -{ - title?: string - type?: string - status?: integer -} -``` - -*** - -### [POST]/api/v2/ui/crackers - -- Description -POST request to create a new object. The request must contain the resource record as data with the attributes of the new object.To add relationships, a relationships object can be added with the resource records of the relations that are part of this object. - -- Security -bearerAuth - -#### RequestBody - -- application/json - -```ts -{ - data: { - type?: string - attributes: { - crackerBinaryTypeId?: integer - version?: string - downloadUrl?: string - binaryName?: string - } - } -} -``` - -#### Responses - -- 201 successful operation - -`application/json` - -```ts -{ - jsonapi: { - version?: string //default: 1.1 - ext?: string //default: https://jsonapi.org/profiles/ethanresnick/cursor-pagination - } - id?: integer - type?: string //default: CrackerBinary - data: { - crackerBinaryTypeId?: integer - version?: string - downloadUrl?: string - binaryName?: string - } -} -``` - -- 400 Invalid request - -`application/json` - -```ts -{ - title?: string - type?: string - status?: integer -} -``` - -- 401 Authentication failed - -`application/json` - -```ts -{ - title?: string - type?: string - status?: integer -} -``` - -*** - -### [GET]/api/v2/ui/crackers/count - -- Description -GET many request to retrieve multiple objects. - -- Security -bearerAuth - -#### Parameters(Query) - -```ts -page[after]?: integer -``` - -```ts -page[before]?: integer -``` - -```ts -page[size]?: integer -``` - -```ts -filter: { -} -``` - -```ts -include?: string -``` - -#### Responses - -- 200 successful operation - -`application/json` - -```ts -{ - jsonapi: { - version?: string //default: 1.1 - ext?: string //default: https://jsonapi.org/profiles/ethanresnick/cursor-pagination - } - links: { - self?: string //default: /api/v2/ui/crackers?page[size]=25 - first?: string //default: /api/v2/ui/crackers?page[size]=25&page[after]=0 - last?: string //default: /api/v2/ui/crackers?page[size]=25&page[before]=500 - next?: string //default: /api/v2/ui/crackers?page[size]=25&page[after]=25 - previous?: string //default: /api/v2/ui/crackers?page[size]=25&page[before]=25 - } - id?: integer - type?: string //default: CrackerBinary - data: { - crackerBinaryTypeId?: integer - version?: string - downloadUrl?: string - binaryName?: string - } - relationships: { - } - included: { - }[] -}[] -``` - -- 400 Invalid request - -`application/json` - -```ts -{ - title?: string - type?: string - status?: integer -} -``` - -- 401 Authentication failed - -`application/json` - -```ts -{ - title?: string - type?: string - status?: integer -} -``` - -*** - -### [GET]/api/v2/ui/crackers/{id:[0-9]+}/{relation:crackerBinaryType} - -- Description -GET request for for a to-one relationship link. Returns the resource record of the object that is part of the specified relation. - -- Security -bearerAuth - -#### Parameters(Query) - -```ts -include?: string -``` - -#### Responses - -- 200 successful operation - -`application/json` - -```ts -{ - jsonapi: { - version?: string //default: 1.1 - ext?: string //default: https://jsonapi.org/profiles/ethanresnick/cursor-pagination - } - links: { - self?: string //default: /api/v2/ui/crackers?page[size]=25 - first?: string //default: /api/v2/ui/crackers?page[size]=25&page[after]=0 - last?: string //default: /api/v2/ui/crackers?page[size]=25&page[before]=500 - next?: string //default: /api/v2/ui/crackers?page[size]=25&page[after]=25 - previous?: string //default: /api/v2/ui/crackers?page[size]=25&page[before]=25 - } - id?: integer - type?: string //default: CrackerBinary - data: { - crackerBinaryTypeId?: integer - version?: string - downloadUrl?: string - binaryName?: string - } - relationships: { - } - included: { - }[] -} -``` - -- 400 Invalid request - -`application/json` - -```ts -{ - title?: string - type?: string - status?: integer -} -``` - -- 401 Authentication failed - -`application/json` - -```ts -{ - title?: string - type?: string - status?: integer -} -``` - -- 404 Not Found - -`application/json` - -```ts -{ - message?: string - exception: { - type?: string - code?: integer - message?: string - file?: string - line?: integer - } -} -``` - -*** - -### [GET]/api/v2/ui/crackers/{id:[0-9]+}/relationships/{relation:crackerBinaryType} - -- Description -GET request for for a to-one relationship link. Returns the resource record of the object that is part of the specified relation. - -- Security -bearerAuth - -#### Parameters(Query) - -```ts -include?: string -``` - -#### Responses - -- 200 successful operation - -`application/json` - -```ts -{ - jsonapi: { - version?: string //default: 1.1 - ext?: string //default: https://jsonapi.org/profiles/ethanresnick/cursor-pagination - } - links: { - self?: string //default: /api/v2/ui/crackers?page[size]=25 - first?: string //default: /api/v2/ui/crackers?page[size]=25&page[after]=0 - last?: string //default: /api/v2/ui/crackers?page[size]=25&page[before]=500 - next?: string //default: /api/v2/ui/crackers?page[size]=25&page[after]=25 - previous?: string //default: /api/v2/ui/crackers?page[size]=25&page[before]=25 - } - id?: integer - type?: string //default: CrackerBinary - data: { - crackerBinaryTypeId?: integer - version?: string - downloadUrl?: string - binaryName?: string - } - relationships: { - } - included: { - }[] -} -``` - -- 400 Invalid request - -`application/json` - -```ts -{ - title?: string - type?: string - status?: integer -} -``` - -- 401 Authentication failed - -`application/json` - -```ts -{ - title?: string - type?: string - status?: integer -} -``` - -- 404 Not Found - -`application/json` - -```ts -{ - message?: string - exception: { - type?: string - code?: integer - message?: string - file?: string - line?: integer - } -} -``` - -*** - -### [PATCH]/api/v2/ui/crackers/{id:[0-9]+}/relationships/{relation:crackerBinaryType} - -- Security -bearerAuth - -#### RequestBody - -- application/json - -```ts -{ - data: { - type?: string - attributes: { - binaryName?: string - crackerBinaryTypeId?: integer - downloadUrl?: string - version?: string - } - } -} -``` - -#### Responses - -- 200 successful operation - -`application/json` - -```ts -{ - jsonapi: { - version?: string //default: 1.1 - ext?: string //default: https://jsonapi.org/profiles/ethanresnick/cursor-pagination - } - id?: integer - type?: string //default: CrackerBinary - data: { - crackerBinaryTypeId?: integer - version?: string - downloadUrl?: string - binaryName?: string - } -} -``` - -- 400 Invalid request - -`application/json` - -```ts -{ - title?: string - type?: string - status?: integer -} -``` - -- 401 Authentication failed - -`application/json` - -```ts -{ - title?: string - type?: string - status?: integer -} -``` - -- 404 Not Found - -`application/json` - -```ts -{ - message?: string - exception: { - type?: string - code?: integer - message?: string - file?: string - line?: integer - } -} -``` - -*** - -### [GET]/api/v2/ui/crackers/{id:[0-9]+}/{relation:tasks} - -- Description -GET request for for a to-one relationship link. Returns the resource record of the object that is part of the specified relation. - -- Security -bearerAuth - -#### Parameters(Query) - -```ts -include?: string -``` - -#### Responses - -- 200 successful operation - -`application/json` - -```ts -{ - jsonapi: { - version?: string //default: 1.1 - ext?: string //default: https://jsonapi.org/profiles/ethanresnick/cursor-pagination - } - links: { - self?: string //default: /api/v2/ui/crackers?page[size]=25 - first?: string //default: /api/v2/ui/crackers?page[size]=25&page[after]=0 - last?: string //default: /api/v2/ui/crackers?page[size]=25&page[before]=500 - next?: string //default: /api/v2/ui/crackers?page[size]=25&page[after]=25 - previous?: string //default: /api/v2/ui/crackers?page[size]=25&page[before]=25 - } - id?: integer - type?: string //default: CrackerBinary - data: { - crackerBinaryTypeId?: integer - version?: string - downloadUrl?: string - binaryName?: string - } - relationships: { - } - included: { - }[] -} -``` - -- 400 Invalid request - -`application/json` - -```ts -{ - title?: string - type?: string - status?: integer -} -``` - -- 401 Authentication failed - -`application/json` - -```ts -{ - title?: string - type?: string - status?: integer -} -``` - -- 404 Not Found - -`application/json` - -```ts -{ - message?: string - exception: { - type?: string - code?: integer - message?: string - file?: string - line?: integer - } -} -``` - -*** - -### [GET]/api/v2/ui/crackers/{id:[0-9]+}/relationships/{relation:tasks} - -- Description -GET request for for a to-one relationship link. Returns the resource record of the object that is part of the specified relation. - -- Security -bearerAuth - -#### Parameters(Query) - -```ts -include?: string -``` - -#### Responses - -- 200 successful operation - -`application/json` - -```ts -{ - jsonapi: { - version?: string //default: 1.1 - ext?: string //default: https://jsonapi.org/profiles/ethanresnick/cursor-pagination - } - links: { - self?: string //default: /api/v2/ui/crackers?page[size]=25 - first?: string //default: /api/v2/ui/crackers?page[size]=25&page[after]=0 - last?: string //default: /api/v2/ui/crackers?page[size]=25&page[before]=500 - next?: string //default: /api/v2/ui/crackers?page[size]=25&page[after]=25 - previous?: string //default: /api/v2/ui/crackers?page[size]=25&page[before]=25 - } - id?: integer - type?: string //default: CrackerBinary - data: { - crackerBinaryTypeId?: integer - version?: string - downloadUrl?: string - binaryName?: string - } - relationships: { - } - included: { - }[] -} -``` - -- 400 Invalid request - -`application/json` - -```ts -{ - title?: string - type?: string - status?: integer -} -``` - -- 401 Authentication failed - -`application/json` - -```ts -{ - title?: string - type?: string - status?: integer -} -``` - -- 404 Not Found - -`application/json` - -```ts -{ - message?: string - exception: { - type?: string - code?: integer - message?: string - file?: string - line?: integer - } -} -``` - -*** - -### [PATCH]/api/v2/ui/crackers/{id:[0-9]+}/relationships/{relation:tasks} - -- Security -bearerAuth - -#### RequestBody - -- application/json - -```ts -{ - data: { - type?: string - attributes: { - binaryName?: string - crackerBinaryTypeId?: integer - downloadUrl?: string - version?: string - } - } -} -``` - -#### Responses - -- 200 successful operation - -`application/json` - -```ts -{ - jsonapi: { - version?: string //default: 1.1 - ext?: string //default: https://jsonapi.org/profiles/ethanresnick/cursor-pagination - } - id?: integer - type?: string //default: CrackerBinary - data: { - crackerBinaryTypeId?: integer - version?: string - downloadUrl?: string - binaryName?: string - } -} -``` - -- 400 Invalid request - -`application/json` - -```ts -{ - title?: string - type?: string - status?: integer -} -``` - -- 401 Authentication failed - -`application/json` - -```ts -{ - title?: string - type?: string - status?: integer -} -``` - -- 404 Not Found - -`application/json` - -```ts -{ - message?: string - exception: { - type?: string - code?: integer - message?: string - file?: string - line?: integer - } -} -``` - -*** - -### [POST]/api/v2/ui/crackers/{id:[0-9]+}/relationships/{relation:tasks} - -- Security -bearerAuth - -#### RequestBody - -- application/json - -#### Responses - -- 204 successfully created - -- 400 Invalid request - -`application/json` - -```ts -{ - title?: string - type?: string - status?: integer -} -``` - -- 401 Authentication failed - -`application/json` - -```ts -{ - title?: string - type?: string - status?: integer -} -``` - -- 404 Not Found - -`application/json` - -```ts -{ - message?: string - exception: { - type?: string - code?: integer - message?: string - file?: string - line?: integer - } -} -``` - -*** - -### [DELETE]/api/v2/ui/crackers/{id:[0-9]+}/relationships/{relation:tasks} - -- Security -bearerAuth - -#### RequestBody - -- application/json - -#### Responses - -- 204 successfully deleted - -- 400 Invalid request - -`application/json` - -```ts -{ - title?: string - type?: string - status?: integer -} -``` - -- 401 Authentication failed - -`application/json` - -```ts -{ - title?: string - type?: string - status?: integer -} -``` - -- 404 Not Found - -`application/json` - -```ts -{ - message?: string - exception: { - type?: string - code?: integer - message?: string - file?: string - line?: integer - } -} -``` - -*** - -### [GET]/api/v2/ui/crackers/{id:[0-9]+} - -- Description -GET request to retrieve a single object. - -- Security -bearerAuth - -#### Parameters(Query) - -```ts -include?: string -``` - -#### Responses - -- 200 successful operation - -`application/json` - -```ts -{ - jsonapi: { - version?: string //default: 1.1 - ext?: string //default: https://jsonapi.org/profiles/ethanresnick/cursor-pagination - } - links: { - self?: string //default: /api/v2/ui/crackers?page[size]=25 - first?: string //default: /api/v2/ui/crackers?page[size]=25&page[after]=0 - last?: string //default: /api/v2/ui/crackers?page[size]=25&page[before]=500 - next?: string //default: /api/v2/ui/crackers?page[size]=25&page[after]=25 - previous?: string //default: /api/v2/ui/crackers?page[size]=25&page[before]=25 - } - id?: integer - type?: string //default: CrackerBinary - data: { - crackerBinaryTypeId?: integer - version?: string - downloadUrl?: string - binaryName?: string - } - relationships: { - } - included: { - }[] -} -``` - -- 400 Invalid request - -`application/json` - -```ts -{ - title?: string - type?: string - status?: integer -} -``` - -- 401 Authentication failed - -`application/json` - -```ts -{ - title?: string - type?: string - status?: integer -} -``` - -- 404 Not Found - -`application/json` - -```ts -{ - message?: string - exception: { - type?: string - code?: integer - message?: string - file?: string - line?: integer - } -} -``` - -*** - -### [PATCH]/api/v2/ui/crackers/{id:[0-9]+} - -- Description -PATCH request to update attributes of a single object. - -- Security -bearerAuth - -#### RequestBody - -- application/json - -```ts -{ - data: { - type?: string - attributes: { - binaryName?: string - crackerBinaryTypeId?: integer - downloadUrl?: string - version?: string - } - } -} -``` - -#### Responses - -- 200 successful operation - -`application/json` - -```ts -{ - jsonapi: { - version?: string //default: 1.1 - ext?: string //default: https://jsonapi.org/profiles/ethanresnick/cursor-pagination - } - id?: integer - type?: string //default: CrackerBinary - data: { - crackerBinaryTypeId?: integer - version?: string - downloadUrl?: string - binaryName?: string - } -} -``` - -- 400 Invalid request - -`application/json` - -```ts -{ - title?: string - type?: string - status?: integer -} -``` - -- 401 Authentication failed - -`application/json` - -```ts -{ - title?: string - type?: string - status?: integer -} -``` - -- 404 Not Found - -`application/json` - -```ts -{ - message?: string - exception: { - type?: string - code?: integer - message?: string - file?: string - line?: integer - } -} -``` - -*** - -### [DELETE]/api/v2/ui/crackers/{id:[0-9]+} - -- Security -bearerAuth - -#### RequestBody - -- application/json - -#### Responses - -- 204 successfully deleted - -- 400 Invalid request - -`application/json` - -```ts -{ - title?: string - type?: string - status?: integer -} -``` - -- 401 Authentication failed - -`application/json` - -```ts -{ - title?: string - type?: string - status?: integer -} -``` - -- 404 Not Found - -`application/json` - -```ts -{ - message?: string - exception: { - type?: string - code?: integer - message?: string - file?: string - line?: integer - } -} -``` - -*** - -### [GET]/api/v2/ui/crackertypes - -- Description -GET many request to retrieve multiple objects. - -- Security -bearerAuth - -#### Parameters(Query) - -```ts -page[after]?: integer -``` - -```ts -page[before]?: integer -``` - -```ts -page[size]?: integer -``` - -```ts -filter: { -} -``` - -```ts -include?: string -``` - -#### Responses - -- 200 successful operation - -`application/json` - -```ts -{ - jsonapi: { - version?: string //default: 1.1 - ext?: string //default: https://jsonapi.org/profiles/ethanresnick/cursor-pagination - } - links: { - self?: string //default: /api/v2/ui/crackertypes?page[size]=25 - first?: string //default: /api/v2/ui/crackertypes?page[size]=25&page[after]=0 - last?: string //default: /api/v2/ui/crackertypes?page[size]=25&page[before]=500 - next?: string //default: /api/v2/ui/crackertypes?page[size]=25&page[after]=25 - previous?: string //default: /api/v2/ui/crackertypes?page[size]=25&page[before]=25 - } - id?: integer - type?: string //default: CrackerBinaryType - data: { - typeName?: string - isChunkingAvailable?: boolean - } - relationships: { - } - included: { - }[] -}[] -``` - -- 400 Invalid request - -`application/json` - -```ts -{ - title?: string - type?: string - status?: integer -} -``` - -- 401 Authentication failed - -`application/json` - -```ts -{ - title?: string - type?: string - status?: integer -} -``` - -*** - -### [POST]/api/v2/ui/crackertypes - -- Description -POST request to create a new object. The request must contain the resource record as data with the attributes of the new object.To add relationships, a relationships object can be added with the resource records of the relations that are part of this object. - -- Security -bearerAuth - -#### RequestBody - -- application/json - -```ts -{ - data: { - type?: string - attributes: { - typeName?: string - isChunkingAvailable?: boolean - } - } -} -``` - -#### Responses - -- 201 successful operation - -`application/json` - -```ts -{ - jsonapi: { - version?: string //default: 1.1 - ext?: string //default: https://jsonapi.org/profiles/ethanresnick/cursor-pagination - } - id?: integer - type?: string //default: CrackerBinaryType - data: { - typeName?: string - isChunkingAvailable?: boolean - } -} -``` - -- 400 Invalid request - -`application/json` - -```ts -{ - title?: string - type?: string - status?: integer -} -``` - -- 401 Authentication failed - -`application/json` - -```ts -{ - title?: string - type?: string - status?: integer -} -``` - -*** - -### [GET]/api/v2/ui/crackertypes/count - -- Description -GET many request to retrieve multiple objects. - -- Security -bearerAuth - -#### Parameters(Query) - -```ts -page[after]?: integer -``` - -```ts -page[before]?: integer -``` - -```ts -page[size]?: integer -``` - -```ts -filter: { -} -``` - -```ts -include?: string -``` - -#### Responses - -- 200 successful operation - -`application/json` - -```ts -{ - jsonapi: { - version?: string //default: 1.1 - ext?: string //default: https://jsonapi.org/profiles/ethanresnick/cursor-pagination - } - links: { - self?: string //default: /api/v2/ui/crackertypes?page[size]=25 - first?: string //default: /api/v2/ui/crackertypes?page[size]=25&page[after]=0 - last?: string //default: /api/v2/ui/crackertypes?page[size]=25&page[before]=500 - next?: string //default: /api/v2/ui/crackertypes?page[size]=25&page[after]=25 - previous?: string //default: /api/v2/ui/crackertypes?page[size]=25&page[before]=25 - } - id?: integer - type?: string //default: CrackerBinaryType - data: { - typeName?: string - isChunkingAvailable?: boolean - } - relationships: { - } - included: { - }[] -}[] -``` - -- 400 Invalid request - -`application/json` - -```ts -{ - title?: string - type?: string - status?: integer -} -``` - -- 401 Authentication failed - -`application/json` - -```ts -{ - title?: string - type?: string - status?: integer -} -``` - -*** - -### [GET]/api/v2/ui/crackertypes/{id:[0-9]+}/{relation:crackerVersions} - -- Description -GET request for for a to-one relationship link. Returns the resource record of the object that is part of the specified relation. - -- Security -bearerAuth - -#### Parameters(Query) - -```ts -include?: string -``` - -#### Responses - -- 200 successful operation - -`application/json` - -```ts -{ - jsonapi: { - version?: string //default: 1.1 - ext?: string //default: https://jsonapi.org/profiles/ethanresnick/cursor-pagination - } - links: { - self?: string //default: /api/v2/ui/crackertypes?page[size]=25 - first?: string //default: /api/v2/ui/crackertypes?page[size]=25&page[after]=0 - last?: string //default: /api/v2/ui/crackertypes?page[size]=25&page[before]=500 - next?: string //default: /api/v2/ui/crackertypes?page[size]=25&page[after]=25 - previous?: string //default: /api/v2/ui/crackertypes?page[size]=25&page[before]=25 - } - id?: integer - type?: string //default: CrackerBinaryType - data: { - typeName?: string - isChunkingAvailable?: boolean - } - relationships: { - } - included: { - }[] -} -``` - -- 400 Invalid request - -`application/json` - -```ts -{ - title?: string - type?: string - status?: integer -} -``` - -- 401 Authentication failed - -`application/json` - -```ts -{ - title?: string - type?: string - status?: integer -} -``` - -- 404 Not Found - -`application/json` - -```ts -{ - message?: string - exception: { - type?: string - code?: integer - message?: string - file?: string - line?: integer - } -} -``` - -*** - -### [GET]/api/v2/ui/crackertypes/{id:[0-9]+}/relationships/{relation:crackerVersions} - -- Description -GET request for for a to-one relationship link. Returns the resource record of the object that is part of the specified relation. - -- Security -bearerAuth - -#### Parameters(Query) - -```ts -include?: string -``` - -#### Responses - -- 200 successful operation - -`application/json` - -```ts -{ - jsonapi: { - version?: string //default: 1.1 - ext?: string //default: https://jsonapi.org/profiles/ethanresnick/cursor-pagination - } - links: { - self?: string //default: /api/v2/ui/crackertypes?page[size]=25 - first?: string //default: /api/v2/ui/crackertypes?page[size]=25&page[after]=0 - last?: string //default: /api/v2/ui/crackertypes?page[size]=25&page[before]=500 - next?: string //default: /api/v2/ui/crackertypes?page[size]=25&page[after]=25 - previous?: string //default: /api/v2/ui/crackertypes?page[size]=25&page[before]=25 - } - id?: integer - type?: string //default: CrackerBinaryType - data: { - typeName?: string - isChunkingAvailable?: boolean - } - relationships: { - } - included: { - }[] -} -``` - -- 400 Invalid request - -`application/json` - -```ts -{ - title?: string - type?: string - status?: integer -} -``` - -- 401 Authentication failed - -`application/json` - -```ts -{ - title?: string - type?: string - status?: integer -} -``` - -- 404 Not Found - -`application/json` - -```ts -{ - message?: string - exception: { - type?: string - code?: integer - message?: string - file?: string - line?: integer - } -} -``` - -*** - -### [PATCH]/api/v2/ui/crackertypes/{id:[0-9]+}/relationships/{relation:crackerVersions} - -- Security -bearerAuth - -#### RequestBody - -- application/json - -```ts -{ - data: { - type?: string - attributes: { - isChunkingAvailable?: boolean - typeName?: string - } - } -} -``` - -#### Responses - -- 200 successful operation - -`application/json` - -```ts -{ - jsonapi: { - version?: string //default: 1.1 - ext?: string //default: https://jsonapi.org/profiles/ethanresnick/cursor-pagination - } - id?: integer - type?: string //default: CrackerBinaryType - data: { - typeName?: string - isChunkingAvailable?: boolean - } -} -``` - -- 400 Invalid request - -`application/json` - -```ts -{ - title?: string - type?: string - status?: integer -} -``` - -- 401 Authentication failed - -`application/json` - -```ts -{ - title?: string - type?: string - status?: integer -} -``` - -- 404 Not Found - -`application/json` - -```ts -{ - message?: string - exception: { - type?: string - code?: integer - message?: string - file?: string - line?: integer - } -} -``` - -*** - -### [POST]/api/v2/ui/crackertypes/{id:[0-9]+}/relationships/{relation:crackerVersions} - -- Security -bearerAuth - -#### RequestBody - -- application/json - -#### Responses - -- 204 successfully created - -- 400 Invalid request - -`application/json` - -```ts -{ - title?: string - type?: string - status?: integer -} -``` - -- 401 Authentication failed - -`application/json` - -```ts -{ - title?: string - type?: string - status?: integer -} -``` - -- 404 Not Found - -`application/json` - -```ts -{ - message?: string - exception: { - type?: string - code?: integer - message?: string - file?: string - line?: integer - } -} -``` - -*** - -### [DELETE]/api/v2/ui/crackertypes/{id:[0-9]+}/relationships/{relation:crackerVersions} - -- Security -bearerAuth - -#### RequestBody - -- application/json - -#### Responses - -- 204 successfully deleted - -- 400 Invalid request - -`application/json` - -```ts -{ - title?: string - type?: string - status?: integer -} -``` - -- 401 Authentication failed - -`application/json` - -```ts -{ - title?: string - type?: string - status?: integer -} -``` - -- 404 Not Found - -`application/json` - -```ts -{ - message?: string - exception: { - type?: string - code?: integer - message?: string - file?: string - line?: integer - } -} -``` - -*** - -### [GET]/api/v2/ui/crackertypes/{id:[0-9]+}/{relation:tasks} - -- Description -GET request for for a to-one relationship link. Returns the resource record of the object that is part of the specified relation. - -- Security -bearerAuth - -#### Parameters(Query) - -```ts -include?: string -``` - -#### Responses - -- 200 successful operation - -`application/json` - -```ts -{ - jsonapi: { - version?: string //default: 1.1 - ext?: string //default: https://jsonapi.org/profiles/ethanresnick/cursor-pagination - } - links: { - self?: string //default: /api/v2/ui/crackertypes?page[size]=25 - first?: string //default: /api/v2/ui/crackertypes?page[size]=25&page[after]=0 - last?: string //default: /api/v2/ui/crackertypes?page[size]=25&page[before]=500 - next?: string //default: /api/v2/ui/crackertypes?page[size]=25&page[after]=25 - previous?: string //default: /api/v2/ui/crackertypes?page[size]=25&page[before]=25 - } - id?: integer - type?: string //default: CrackerBinaryType - data: { - typeName?: string - isChunkingAvailable?: boolean - } - relationships: { - } - included: { - }[] -} -``` - -- 400 Invalid request - -`application/json` - -```ts -{ - title?: string - type?: string - status?: integer -} -``` - -- 401 Authentication failed - -`application/json` - -```ts -{ - title?: string - type?: string - status?: integer -} -``` - -- 404 Not Found - -`application/json` - -```ts -{ - message?: string - exception: { - type?: string - code?: integer - message?: string - file?: string - line?: integer - } -} -``` - -*** - -### [GET]/api/v2/ui/crackertypes/{id:[0-9]+}/relationships/{relation:tasks} - -- Description -GET request for for a to-one relationship link. Returns the resource record of the object that is part of the specified relation. - -- Security -bearerAuth - -#### Parameters(Query) - -```ts -include?: string -``` - -#### Responses - -- 200 successful operation - -`application/json` - -```ts -{ - jsonapi: { - version?: string //default: 1.1 - ext?: string //default: https://jsonapi.org/profiles/ethanresnick/cursor-pagination - } - links: { - self?: string //default: /api/v2/ui/crackertypes?page[size]=25 - first?: string //default: /api/v2/ui/crackertypes?page[size]=25&page[after]=0 - last?: string //default: /api/v2/ui/crackertypes?page[size]=25&page[before]=500 - next?: string //default: /api/v2/ui/crackertypes?page[size]=25&page[after]=25 - previous?: string //default: /api/v2/ui/crackertypes?page[size]=25&page[before]=25 - } - id?: integer - type?: string //default: CrackerBinaryType - data: { - typeName?: string - isChunkingAvailable?: boolean - } - relationships: { - } - included: { - }[] -} -``` - -- 400 Invalid request - -`application/json` - -```ts -{ - title?: string - type?: string - status?: integer -} -``` - -- 401 Authentication failed - -`application/json` - -```ts -{ - title?: string - type?: string - status?: integer -} -``` - -- 404 Not Found - -`application/json` - -```ts -{ - message?: string - exception: { - type?: string - code?: integer - message?: string - file?: string - line?: integer - } -} -``` - -*** - -### [PATCH]/api/v2/ui/crackertypes/{id:[0-9]+}/relationships/{relation:tasks} - -- Security -bearerAuth - -#### RequestBody - -- application/json - -```ts -{ - data: { - type?: string - attributes: { - isChunkingAvailable?: boolean - typeName?: string - } - } -} -``` - -#### Responses - -- 200 successful operation - -`application/json` - -```ts -{ - jsonapi: { - version?: string //default: 1.1 - ext?: string //default: https://jsonapi.org/profiles/ethanresnick/cursor-pagination - } - id?: integer - type?: string //default: CrackerBinaryType - data: { - typeName?: string - isChunkingAvailable?: boolean - } -} -``` - -- 400 Invalid request - -`application/json` - -```ts -{ - title?: string - type?: string - status?: integer -} -``` - -- 401 Authentication failed - -`application/json` - -```ts -{ - title?: string - type?: string - status?: integer -} -``` - -- 404 Not Found - -`application/json` - -```ts -{ - message?: string - exception: { - type?: string - code?: integer - message?: string - file?: string - line?: integer - } -} -``` - -*** - -### [POST]/api/v2/ui/crackertypes/{id:[0-9]+}/relationships/{relation:tasks} - -- Security -bearerAuth - -#### RequestBody - -- application/json - -#### Responses - -- 204 successfully created - -- 400 Invalid request - -`application/json` - -```ts -{ - title?: string - type?: string - status?: integer -} -``` - -- 401 Authentication failed - -`application/json` - -```ts -{ - title?: string - type?: string - status?: integer -} -``` - -- 404 Not Found - -`application/json` - -```ts -{ - message?: string - exception: { - type?: string - code?: integer - message?: string - file?: string - line?: integer - } -} -``` - -*** - -### [DELETE]/api/v2/ui/crackertypes/{id:[0-9]+}/relationships/{relation:tasks} - -- Security -bearerAuth - -#### RequestBody - -- application/json - -#### Responses - -- 204 successfully deleted - -- 400 Invalid request - -`application/json` - -```ts -{ - title?: string - type?: string - status?: integer -} -``` - -- 401 Authentication failed - -`application/json` - -```ts -{ - title?: string - type?: string - status?: integer -} -``` - -- 404 Not Found - -`application/json` - -```ts -{ - message?: string - exception: { - type?: string - code?: integer - message?: string - file?: string - line?: integer - } -} -``` - -*** - -### [GET]/api/v2/ui/crackertypes/{id:[0-9]+} - -- Description -GET request to retrieve a single object. - -- Security -bearerAuth - -#### Parameters(Query) - -```ts -include?: string -``` - -#### Responses - -- 200 successful operation - -`application/json` - -```ts -{ - jsonapi: { - version?: string //default: 1.1 - ext?: string //default: https://jsonapi.org/profiles/ethanresnick/cursor-pagination - } - links: { - self?: string //default: /api/v2/ui/crackertypes?page[size]=25 - first?: string //default: /api/v2/ui/crackertypes?page[size]=25&page[after]=0 - last?: string //default: /api/v2/ui/crackertypes?page[size]=25&page[before]=500 - next?: string //default: /api/v2/ui/crackertypes?page[size]=25&page[after]=25 - previous?: string //default: /api/v2/ui/crackertypes?page[size]=25&page[before]=25 - } - id?: integer - type?: string //default: CrackerBinaryType - data: { - typeName?: string - isChunkingAvailable?: boolean - } - relationships: { - } - included: { - }[] -} -``` - -- 400 Invalid request - -`application/json` - -```ts -{ - title?: string - type?: string - status?: integer -} -``` - -- 401 Authentication failed - -`application/json` - -```ts -{ - title?: string - type?: string - status?: integer -} -``` - -- 404 Not Found - -`application/json` - -```ts -{ - message?: string - exception: { - type?: string - code?: integer - message?: string - file?: string - line?: integer - } -} -``` - -*** - -### [PATCH]/api/v2/ui/crackertypes/{id:[0-9]+} - -- Description -PATCH request to update attributes of a single object. - -- Security -bearerAuth - -#### RequestBody - -- application/json - -```ts -{ - data: { - type?: string - attributes: { - isChunkingAvailable?: boolean - typeName?: string - } - } -} -``` - -#### Responses - -- 200 successful operation - -`application/json` - -```ts -{ - jsonapi: { - version?: string //default: 1.1 - ext?: string //default: https://jsonapi.org/profiles/ethanresnick/cursor-pagination - } - id?: integer - type?: string //default: CrackerBinaryType - data: { - typeName?: string - isChunkingAvailable?: boolean - } -} -``` - -- 400 Invalid request - -`application/json` - -```ts -{ - title?: string - type?: string - status?: integer -} -``` - -- 401 Authentication failed - -`application/json` - -```ts -{ - title?: string - type?: string - status?: integer -} -``` - -- 404 Not Found - -`application/json` - -```ts -{ - message?: string - exception: { - type?: string - code?: integer - message?: string - file?: string - line?: integer - } -} -``` - -*** - -### [DELETE]/api/v2/ui/crackertypes/{id:[0-9]+} - -- Security -bearerAuth - -#### RequestBody - -- application/json - -#### Responses - -- 204 successfully deleted - -- 400 Invalid request - -`application/json` - -```ts -{ - title?: string - type?: string - status?: integer -} -``` - -- 401 Authentication failed - -`application/json` - -```ts -{ - title?: string - type?: string - status?: integer -} -``` - -- 404 Not Found - -`application/json` - -```ts -{ - message?: string - exception: { - type?: string - code?: integer - message?: string - file?: string - line?: integer - } -} -``` - -*** - -### [GET]/api/v2/ui/files - -- Description -GET many request to retrieve multiple objects. - -- Security -bearerAuth - -#### Parameters(Query) - -```ts -page[after]?: integer -``` - -```ts -page[before]?: integer -``` - -```ts -page[size]?: integer -``` - -```ts -filter: { -} -``` - -```ts -include?: string -``` - -#### Responses - -- 200 successful operation - -`application/json` - -```ts -{ - jsonapi: { - version?: string //default: 1.1 - ext?: string //default: https://jsonapi.org/profiles/ethanresnick/cursor-pagination - } - links: { - self?: string //default: /api/v2/ui/files?page[size]=25 - first?: string //default: /api/v2/ui/files?page[size]=25&page[after]=0 - last?: string //default: /api/v2/ui/files?page[size]=25&page[before]=500 - next?: string //default: /api/v2/ui/files?page[size]=25&page[after]=25 - previous?: string //default: /api/v2/ui/files?page[size]=25&page[before]=25 - } - id?: integer - type?: string //default: File - data: { - filename?: string - size?: integer - isSecret?: boolean - fileType?: integer - accessGroupId?: integer - lineCount?: integer - } - relationships: { - } - included: { - }[] -}[] -``` - -- 400 Invalid request - -`application/json` - -```ts -{ - title?: string - type?: string - status?: integer -} -``` - -- 401 Authentication failed - -`application/json` - -```ts -{ - title?: string - type?: string - status?: integer -} -``` - -*** - -### [POST]/api/v2/ui/files - -- Description -POST request to create a new object. The request must contain the resource record as data with the attributes of the new object.To add relationships, a relationships object can be added with the resource records of the relations that are part of this object. - -- Security -bearerAuth - -#### RequestBody - -- application/json - -```ts -{ - data: { - type?: string - attributes: { - sourceType?: string - sourceData?: string - filename?: string - size?: integer - isSecret?: boolean - fileType?: integer - accessGroupId?: integer - lineCount?: integer - } - } -} -``` - -#### Responses - -- 201 successful operation - -`application/json` - -```ts -{ - jsonapi: { - version?: string //default: 1.1 - ext?: string //default: https://jsonapi.org/profiles/ethanresnick/cursor-pagination - } - id?: integer - type?: string //default: File - data: { - filename?: string - size?: integer - isSecret?: boolean - fileType?: integer - accessGroupId?: integer - lineCount?: integer - } -} -``` - -- 400 Invalid request - -`application/json` - -```ts -{ - title?: string - type?: string - status?: integer -} -``` - -- 401 Authentication failed - -`application/json` - -```ts -{ - title?: string - type?: string - status?: integer -} -``` - -*** - -### [GET]/api/v2/ui/files/count - -- Description -GET many request to retrieve multiple objects. - -- Security -bearerAuth - -#### Parameters(Query) - -```ts -page[after]?: integer -``` - -```ts -page[before]?: integer -``` - -```ts -page[size]?: integer -``` - -```ts -filter: { -} -``` - -```ts -include?: string -``` - -#### Responses - -- 200 successful operation - -`application/json` - -```ts -{ - jsonapi: { - version?: string //default: 1.1 - ext?: string //default: https://jsonapi.org/profiles/ethanresnick/cursor-pagination - } - links: { - self?: string //default: /api/v2/ui/files?page[size]=25 - first?: string //default: /api/v2/ui/files?page[size]=25&page[after]=0 - last?: string //default: /api/v2/ui/files?page[size]=25&page[before]=500 - next?: string //default: /api/v2/ui/files?page[size]=25&page[after]=25 - previous?: string //default: /api/v2/ui/files?page[size]=25&page[before]=25 - } - id?: integer - type?: string //default: File - data: { - filename?: string - size?: integer - isSecret?: boolean - fileType?: integer - accessGroupId?: integer - lineCount?: integer - } - relationships: { - } - included: { - }[] -}[] -``` - -- 400 Invalid request - -`application/json` - -```ts -{ - title?: string - type?: string - status?: integer -} -``` - -- 401 Authentication failed - -`application/json` - -```ts -{ - title?: string - type?: string - status?: integer -} -``` - -*** - -### [GET]/api/v2/ui/files/{id:[0-9]+}/{relation:accessGroup} - -- Description -GET request for for a to-one relationship link. Returns the resource record of the object that is part of the specified relation. - -- Security -bearerAuth - -#### Parameters(Query) - -```ts -include?: string -``` - -#### Responses - -- 200 successful operation - -`application/json` - -```ts -{ - jsonapi: { - version?: string //default: 1.1 - ext?: string //default: https://jsonapi.org/profiles/ethanresnick/cursor-pagination - } - links: { - self?: string //default: /api/v2/ui/files?page[size]=25 - first?: string //default: /api/v2/ui/files?page[size]=25&page[after]=0 - last?: string //default: /api/v2/ui/files?page[size]=25&page[before]=500 - next?: string //default: /api/v2/ui/files?page[size]=25&page[after]=25 - previous?: string //default: /api/v2/ui/files?page[size]=25&page[before]=25 - } - id?: integer - type?: string //default: File - data: { - filename?: string - size?: integer - isSecret?: boolean - fileType?: integer - accessGroupId?: integer - lineCount?: integer - } - relationships: { - } - included: { - }[] -} -``` - -- 400 Invalid request - -`application/json` - -```ts -{ - title?: string - type?: string - status?: integer -} -``` - -- 401 Authentication failed - -`application/json` - -```ts -{ - title?: string - type?: string - status?: integer -} -``` - -- 404 Not Found - -`application/json` - -```ts -{ - message?: string - exception: { - type?: string - code?: integer - message?: string - file?: string - line?: integer - } -} -``` - -*** - -### [GET]/api/v2/ui/files/{id:[0-9]+}/relationships/{relation:accessGroup} - -- Description -GET request for for a to-one relationship link. Returns the resource record of the object that is part of the specified relation. - -- Security -bearerAuth - -#### Parameters(Query) - -```ts -include?: string -``` - -#### Responses - -- 200 successful operation - -`application/json` - -```ts -{ - jsonapi: { - version?: string //default: 1.1 - ext?: string //default: https://jsonapi.org/profiles/ethanresnick/cursor-pagination - } - links: { - self?: string //default: /api/v2/ui/files?page[size]=25 - first?: string //default: /api/v2/ui/files?page[size]=25&page[after]=0 - last?: string //default: /api/v2/ui/files?page[size]=25&page[before]=500 - next?: string //default: /api/v2/ui/files?page[size]=25&page[after]=25 - previous?: string //default: /api/v2/ui/files?page[size]=25&page[before]=25 - } - id?: integer - type?: string //default: File - data: { - filename?: string - size?: integer - isSecret?: boolean - fileType?: integer - accessGroupId?: integer - lineCount?: integer - } - relationships: { - } - included: { - }[] -} -``` - -- 400 Invalid request - -`application/json` - -```ts -{ - title?: string - type?: string - status?: integer -} -``` - -- 401 Authentication failed - -`application/json` - -```ts -{ - title?: string - type?: string - status?: integer -} -``` - -- 404 Not Found - -`application/json` - -```ts -{ - message?: string - exception: { - type?: string - code?: integer - message?: string - file?: string - line?: integer - } -} -``` - -*** - -### [PATCH]/api/v2/ui/files/{id:[0-9]+}/relationships/{relation:accessGroup} - -- Security -bearerAuth - -#### RequestBody - -- application/json - -```ts -{ - data: { - type?: string - attributes: { - accessGroupId?: integer - fileType?: integer - filename?: string - isSecret?: boolean - } - } -} -``` - -#### Responses - -- 200 successful operation - -`application/json` - -```ts -{ - jsonapi: { - version?: string //default: 1.1 - ext?: string //default: https://jsonapi.org/profiles/ethanresnick/cursor-pagination - } - id?: integer - type?: string //default: File - data: { - filename?: string - size?: integer - isSecret?: boolean - fileType?: integer - accessGroupId?: integer - lineCount?: integer - } -} -``` - -- 400 Invalid request - -`application/json` - -```ts -{ - title?: string - type?: string - status?: integer -} -``` - -- 401 Authentication failed - -`application/json` - -```ts -{ - title?: string - type?: string - status?: integer -} -``` - -- 404 Not Found - -`application/json` - -```ts -{ - message?: string - exception: { - type?: string - code?: integer - message?: string - file?: string - line?: integer - } -} -``` - -*** - -### [GET]/api/v2/ui/files/{id:[0-9]+} - -- Description -GET request to retrieve a single object. - -- Security -bearerAuth - -#### Parameters(Query) - -```ts -include?: string -``` - -#### Responses - -- 200 successful operation - -`application/json` - -```ts -{ - jsonapi: { - version?: string //default: 1.1 - ext?: string //default: https://jsonapi.org/profiles/ethanresnick/cursor-pagination - } - links: { - self?: string //default: /api/v2/ui/files?page[size]=25 - first?: string //default: /api/v2/ui/files?page[size]=25&page[after]=0 - last?: string //default: /api/v2/ui/files?page[size]=25&page[before]=500 - next?: string //default: /api/v2/ui/files?page[size]=25&page[after]=25 - previous?: string //default: /api/v2/ui/files?page[size]=25&page[before]=25 - } - id?: integer - type?: string //default: File - data: { - filename?: string - size?: integer - isSecret?: boolean - fileType?: integer - accessGroupId?: integer - lineCount?: integer - } - relationships: { - } - included: { - }[] -} -``` - -- 400 Invalid request - -`application/json` - -```ts -{ - title?: string - type?: string - status?: integer -} -``` - -- 401 Authentication failed - -`application/json` - -```ts -{ - title?: string - type?: string - status?: integer -} -``` - -- 404 Not Found - -`application/json` - -```ts -{ - message?: string - exception: { - type?: string - code?: integer - message?: string - file?: string - line?: integer - } -} -``` - -*** - -### [PATCH]/api/v2/ui/files/{id:[0-9]+} - -- Description -PATCH request to update attributes of a single object. - -- Security -bearerAuth - -#### RequestBody - -- application/json - -```ts -{ - data: { - type?: string - attributes: { - accessGroupId?: integer - fileType?: integer - filename?: string - isSecret?: boolean - } - } -} -``` - -#### Responses - -- 200 successful operation - -`application/json` - -```ts -{ - jsonapi: { - version?: string //default: 1.1 - ext?: string //default: https://jsonapi.org/profiles/ethanresnick/cursor-pagination - } - id?: integer - type?: string //default: File - data: { - filename?: string - size?: integer - isSecret?: boolean - fileType?: integer - accessGroupId?: integer - lineCount?: integer - } -} -``` - -- 400 Invalid request - -`application/json` - -```ts -{ - title?: string - type?: string - status?: integer -} -``` - -- 401 Authentication failed - -`application/json` - -```ts -{ - title?: string - type?: string - status?: integer -} -``` - -- 404 Not Found - -`application/json` - -```ts -{ - message?: string - exception: { - type?: string - code?: integer - message?: string - file?: string - line?: integer - } -} -``` - -*** - -### [DELETE]/api/v2/ui/files/{id:[0-9]+} - -- Security -bearerAuth - -#### RequestBody - -- application/json - -#### Responses - -- 204 successfully deleted - -- 400 Invalid request - -`application/json` - -```ts -{ - title?: string - type?: string - status?: integer -} -``` - -- 401 Authentication failed - -`application/json` - -```ts -{ - title?: string - type?: string - status?: integer -} -``` - -- 404 Not Found - -`application/json` - -```ts -{ - message?: string - exception: { - type?: string - code?: integer - message?: string - file?: string - line?: integer - } -} -``` - -*** - -### [GET]/api/v2/ui/globalpermissiongroups - -- Description -GET many request to retrieve multiple objects. - -- Security -bearerAuth - -#### Parameters(Query) - -```ts -page[after]?: integer -``` - -```ts -page[before]?: integer -``` - -```ts -page[size]?: integer -``` - -```ts -filter: { -} -``` - -```ts -include?: string -``` - -#### Responses - -- 200 successful operation - -`application/json` - -```ts -{ - jsonapi: { - version?: string //default: 1.1 - ext?: string //default: https://jsonapi.org/profiles/ethanresnick/cursor-pagination - } - links: { - self?: string //default: /api/v2/ui/globalpermissiongroups?page[size]=25 - first?: string //default: /api/v2/ui/globalpermissiongroups?page[size]=25&page[after]=0 - last?: string //default: /api/v2/ui/globalpermissiongroups?page[size]=25&page[before]=500 - next?: string //default: /api/v2/ui/globalpermissiongroups?page[size]=25&page[after]=25 - previous?: string //default: /api/v2/ui/globalpermissiongroups?page[size]=25&page[before]=25 - } - id?: integer - type?: string //default: RightGroup - data: { - name?: string - permissions: { - } - } - relationships: { - } - included: { - }[] -}[] -``` - -- 400 Invalid request - -`application/json` - -```ts -{ - title?: string - type?: string - status?: integer -} -``` - -- 401 Authentication failed - -`application/json` - -```ts -{ - title?: string - type?: string - status?: integer -} -``` - -*** - -### [POST]/api/v2/ui/globalpermissiongroups - -- Description -POST request to create a new object. The request must contain the resource record as data with the attributes of the new object.To add relationships, a relationships object can be added with the resource records of the relations that are part of this object. - -- Security -bearerAuth - -#### RequestBody - -- application/json - -```ts -{ - data: { - type?: string - attributes: { - name?: string - permissions: { - } - } - } -} -``` - -#### Responses - -- 201 successful operation - -`application/json` - -```ts -{ - jsonapi: { - version?: string //default: 1.1 - ext?: string //default: https://jsonapi.org/profiles/ethanresnick/cursor-pagination - } - id?: integer - type?: string //default: RightGroup - data: { - name?: string - permissions: { - } - } -} -``` - -- 400 Invalid request - -`application/json` - -```ts -{ - title?: string - type?: string - status?: integer -} -``` - -- 401 Authentication failed - -`application/json` - -```ts -{ - title?: string - type?: string - status?: integer -} -``` - -*** - -### [GET]/api/v2/ui/globalpermissiongroups/count - -- Description -GET many request to retrieve multiple objects. - -- Security -bearerAuth - -#### Parameters(Query) - -```ts -page[after]?: integer -``` - -```ts -page[before]?: integer -``` - -```ts -page[size]?: integer -``` - -```ts -filter: { -} -``` - -```ts -include?: string -``` - -#### Responses - -- 200 successful operation - -`application/json` - -```ts -{ - jsonapi: { - version?: string //default: 1.1 - ext?: string //default: https://jsonapi.org/profiles/ethanresnick/cursor-pagination - } - links: { - self?: string //default: /api/v2/ui/globalpermissiongroups?page[size]=25 - first?: string //default: /api/v2/ui/globalpermissiongroups?page[size]=25&page[after]=0 - last?: string //default: /api/v2/ui/globalpermissiongroups?page[size]=25&page[before]=500 - next?: string //default: /api/v2/ui/globalpermissiongroups?page[size]=25&page[after]=25 - previous?: string //default: /api/v2/ui/globalpermissiongroups?page[size]=25&page[before]=25 - } - id?: integer - type?: string //default: RightGroup - data: { - name?: string - permissions: { - } - } - relationships: { - } - included: { - }[] -}[] -``` - -- 400 Invalid request - -`application/json` - -```ts -{ - title?: string - type?: string - status?: integer -} -``` - -- 401 Authentication failed - -`application/json` - -```ts -{ - title?: string - type?: string - status?: integer -} -``` - -*** - -### [GET]/api/v2/ui/globalpermissiongroups/{id:[0-9]+}/{relation:userMembers} - -- Description -GET request for for a to-one relationship link. Returns the resource record of the object that is part of the specified relation. - -- Security -bearerAuth - -#### Parameters(Query) - -```ts -include?: string -``` - -#### Responses - -- 200 successful operation - -`application/json` - -```ts -{ - jsonapi: { - version?: string //default: 1.1 - ext?: string //default: https://jsonapi.org/profiles/ethanresnick/cursor-pagination - } - links: { - self?: string //default: /api/v2/ui/globalpermissiongroups?page[size]=25 - first?: string //default: /api/v2/ui/globalpermissiongroups?page[size]=25&page[after]=0 - last?: string //default: /api/v2/ui/globalpermissiongroups?page[size]=25&page[before]=500 - next?: string //default: /api/v2/ui/globalpermissiongroups?page[size]=25&page[after]=25 - previous?: string //default: /api/v2/ui/globalpermissiongroups?page[size]=25&page[before]=25 - } - id?: integer - type?: string //default: RightGroup - data: { - name?: string - permissions: { - } - } - relationships: { - } - included: { - }[] -} -``` - -- 400 Invalid request - -`application/json` - -```ts -{ - title?: string - type?: string - status?: integer -} -``` - -- 401 Authentication failed - -`application/json` - -```ts -{ - title?: string - type?: string - status?: integer -} -``` - -- 404 Not Found - -`application/json` - -```ts -{ - message?: string - exception: { - type?: string - code?: integer - message?: string - file?: string - line?: integer - } -} -``` - -*** - -### [GET]/api/v2/ui/globalpermissiongroups/{id:[0-9]+}/relationships/{relation:userMembers} - -- Description -GET request for for a to-one relationship link. Returns the resource record of the object that is part of the specified relation. - -- Security -bearerAuth - -#### Parameters(Query) - -```ts -include?: string -``` - -#### Responses - -- 200 successful operation - -`application/json` - -```ts -{ - jsonapi: { - version?: string //default: 1.1 - ext?: string //default: https://jsonapi.org/profiles/ethanresnick/cursor-pagination - } - links: { - self?: string //default: /api/v2/ui/globalpermissiongroups?page[size]=25 - first?: string //default: /api/v2/ui/globalpermissiongroups?page[size]=25&page[after]=0 - last?: string //default: /api/v2/ui/globalpermissiongroups?page[size]=25&page[before]=500 - next?: string //default: /api/v2/ui/globalpermissiongroups?page[size]=25&page[after]=25 - previous?: string //default: /api/v2/ui/globalpermissiongroups?page[size]=25&page[before]=25 - } - id?: integer - type?: string //default: RightGroup - data: { - name?: string - permissions: { - } - } - relationships: { - } - included: { - }[] -} -``` - -- 400 Invalid request - -`application/json` - -```ts -{ - title?: string - type?: string - status?: integer -} -``` - -- 401 Authentication failed - -`application/json` - -```ts -{ - title?: string - type?: string - status?: integer -} -``` - -- 404 Not Found - -`application/json` - -```ts -{ - message?: string - exception: { - type?: string - code?: integer - message?: string - file?: string - line?: integer - } -} -``` - -*** - -### [PATCH]/api/v2/ui/globalpermissiongroups/{id:[0-9]+}/relationships/{relation:userMembers} - -- Security -bearerAuth - -#### RequestBody - -- application/json - -```ts -{ - data: { - type?: string - attributes: { - name?: string - permissions: { - } - } - } -} -``` - -#### Responses - -- 200 successful operation - -`application/json` - -```ts -{ - jsonapi: { - version?: string //default: 1.1 - ext?: string //default: https://jsonapi.org/profiles/ethanresnick/cursor-pagination - } - id?: integer - type?: string //default: RightGroup - data: { - name?: string - permissions: { - } - } -} -``` - -- 400 Invalid request - -`application/json` - -```ts -{ - title?: string - type?: string - status?: integer -} -``` - -- 401 Authentication failed - -`application/json` - -```ts -{ - title?: string - type?: string - status?: integer -} -``` - -- 404 Not Found - -`application/json` - -```ts -{ - message?: string - exception: { - type?: string - code?: integer - message?: string - file?: string - line?: integer - } -} -``` - -*** - -### [POST]/api/v2/ui/globalpermissiongroups/{id:[0-9]+}/relationships/{relation:userMembers} - -- Security -bearerAuth - -#### RequestBody - -- application/json - -#### Responses - -- 204 successfully created - -- 400 Invalid request - -`application/json` - -```ts -{ - title?: string - type?: string - status?: integer -} -``` - -- 401 Authentication failed - -`application/json` - -```ts -{ - title?: string - type?: string - status?: integer -} -``` - -- 404 Not Found - -`application/json` - -```ts -{ - message?: string - exception: { - type?: string - code?: integer - message?: string - file?: string - line?: integer - } -} -``` - -*** - -### [DELETE]/api/v2/ui/globalpermissiongroups/{id:[0-9]+}/relationships/{relation:userMembers} - -- Security -bearerAuth - -#### RequestBody - -- application/json - -#### Responses - -- 204 successfully deleted - -- 400 Invalid request - -`application/json` - -```ts -{ - title?: string - type?: string - status?: integer -} -``` - -- 401 Authentication failed - -`application/json` - -```ts -{ - title?: string - type?: string - status?: integer -} -``` - -- 404 Not Found - -`application/json` - -```ts -{ - message?: string - exception: { - type?: string - code?: integer - message?: string - file?: string - line?: integer - } -} -``` - -*** - -### [GET]/api/v2/ui/globalpermissiongroups/{id:[0-9]+} - -- Description -GET request to retrieve a single object. - -- Security -bearerAuth - -#### Parameters(Query) - -```ts -include?: string -``` - -#### Responses - -- 200 successful operation - -`application/json` - -```ts -{ - jsonapi: { - version?: string //default: 1.1 - ext?: string //default: https://jsonapi.org/profiles/ethanresnick/cursor-pagination - } - links: { - self?: string //default: /api/v2/ui/globalpermissiongroups?page[size]=25 - first?: string //default: /api/v2/ui/globalpermissiongroups?page[size]=25&page[after]=0 - last?: string //default: /api/v2/ui/globalpermissiongroups?page[size]=25&page[before]=500 - next?: string //default: /api/v2/ui/globalpermissiongroups?page[size]=25&page[after]=25 - previous?: string //default: /api/v2/ui/globalpermissiongroups?page[size]=25&page[before]=25 - } - id?: integer - type?: string //default: RightGroup - data: { - name?: string - permissions: { - } - } - relationships: { - } - included: { - }[] -} -``` - -- 400 Invalid request - -`application/json` - -```ts -{ - title?: string - type?: string - status?: integer -} -``` - -- 401 Authentication failed - -`application/json` - -```ts -{ - title?: string - type?: string - status?: integer -} -``` - -- 404 Not Found - -`application/json` - -```ts -{ - message?: string - exception: { - type?: string - code?: integer - message?: string - file?: string - line?: integer - } -} -``` - -*** - -### [PATCH]/api/v2/ui/globalpermissiongroups/{id:[0-9]+} - -- Description -PATCH request to update attributes of a single object. - -- Security -bearerAuth - -#### RequestBody - -- application/json - -```ts -{ - data: { - type?: string - attributes: { - name?: string - permissions: { - } - } - } -} -``` - -#### Responses - -- 200 successful operation - -`application/json` - -```ts -{ - jsonapi: { - version?: string //default: 1.1 - ext?: string //default: https://jsonapi.org/profiles/ethanresnick/cursor-pagination - } - id?: integer - type?: string //default: RightGroup - data: { - name?: string - permissions: { - } - } -} -``` - -- 400 Invalid request - -`application/json` - -```ts -{ - title?: string - type?: string - status?: integer -} -``` - -- 401 Authentication failed - -`application/json` - -```ts -{ - title?: string - type?: string - status?: integer -} -``` - -- 404 Not Found - -`application/json` - -```ts -{ - message?: string - exception: { - type?: string - code?: integer - message?: string - file?: string - line?: integer - } -} -``` - -*** - -### [DELETE]/api/v2/ui/globalpermissiongroups/{id:[0-9]+} - -- Security -bearerAuth - -#### RequestBody - -- application/json - -#### Responses - -- 204 successfully deleted - -- 400 Invalid request - -`application/json` - -```ts -{ - title?: string - type?: string - status?: integer -} -``` - -- 401 Authentication failed - -`application/json` - -```ts -{ - title?: string - type?: string - status?: integer -} -``` - -- 404 Not Found - -`application/json` - -```ts -{ - message?: string - exception: { - type?: string - code?: integer - message?: string - file?: string - line?: integer - } -} -``` - -*** - -### [GET]/api/v2/ui/hashes - -- Description -GET many request to retrieve multiple objects. - -- Security -bearerAuth - -#### Parameters(Query) - -```ts -page[after]?: integer -``` - -```ts -page[before]?: integer -``` - -```ts -page[size]?: integer -``` - -```ts -filter: { -} -``` - -```ts -include?: string -``` - -#### Responses - -- 200 successful operation - -`application/json` - -```ts -{ - jsonapi: { - version?: string //default: 1.1 - ext?: string //default: https://jsonapi.org/profiles/ethanresnick/cursor-pagination - } - links: { - self?: string //default: /api/v2/ui/hashes?page[size]=25 - first?: string //default: /api/v2/ui/hashes?page[size]=25&page[after]=0 - last?: string //default: /api/v2/ui/hashes?page[size]=25&page[before]=500 - next?: string //default: /api/v2/ui/hashes?page[size]=25&page[after]=25 - previous?: string //default: /api/v2/ui/hashes?page[size]=25&page[before]=25 - } - id?: integer - type?: string //default: Hash - data: { - hashlistId?: integer - hash?: string - salt?: string - plaintext?: string - timeCracked?: integer - chunkId?: integer - isCracked?: boolean - crackPos?: integer - } - relationships: { - } - included: { - }[] -}[] -``` - -- 400 Invalid request - -`application/json` - -```ts -{ - title?: string - type?: string - status?: integer -} -``` - -- 401 Authentication failed - -`application/json` - -```ts -{ - title?: string - type?: string - status?: integer -} -``` - -*** - -### [GET]/api/v2/ui/hashes/count - -- Description -GET many request to retrieve multiple objects. - -- Security -bearerAuth - -#### Parameters(Query) - -```ts -page[after]?: integer -``` - -```ts -page[before]?: integer -``` - -```ts -page[size]?: integer -``` - -```ts -filter: { -} -``` - -```ts -include?: string -``` - -#### Responses - -- 200 successful operation - -`application/json` - -```ts -{ - jsonapi: { - version?: string //default: 1.1 - ext?: string //default: https://jsonapi.org/profiles/ethanresnick/cursor-pagination - } - links: { - self?: string //default: /api/v2/ui/hashes?page[size]=25 - first?: string //default: /api/v2/ui/hashes?page[size]=25&page[after]=0 - last?: string //default: /api/v2/ui/hashes?page[size]=25&page[before]=500 - next?: string //default: /api/v2/ui/hashes?page[size]=25&page[after]=25 - previous?: string //default: /api/v2/ui/hashes?page[size]=25&page[before]=25 - } - id?: integer - type?: string //default: Hash - data: { - hashlistId?: integer - hash?: string - salt?: string - plaintext?: string - timeCracked?: integer - chunkId?: integer - isCracked?: boolean - crackPos?: integer - } - relationships: { - } - included: { - }[] -}[] -``` - -- 400 Invalid request - -`application/json` - -```ts -{ - title?: string - type?: string - status?: integer -} -``` - -- 401 Authentication failed - -`application/json` - -```ts -{ - title?: string - type?: string - status?: integer -} -``` - -*** - -### [GET]/api/v2/ui/hashes/{id:[0-9]+}/{relation:chunk} - -- Description -GET request for for a to-one relationship link. Returns the resource record of the object that is part of the specified relation. - -- Security -bearerAuth - -#### Parameters(Query) - -```ts -include?: string -``` - -#### Responses - -- 200 successful operation - -`application/json` - -```ts -{ - jsonapi: { - version?: string //default: 1.1 - ext?: string //default: https://jsonapi.org/profiles/ethanresnick/cursor-pagination - } - links: { - self?: string //default: /api/v2/ui/hashes?page[size]=25 - first?: string //default: /api/v2/ui/hashes?page[size]=25&page[after]=0 - last?: string //default: /api/v2/ui/hashes?page[size]=25&page[before]=500 - next?: string //default: /api/v2/ui/hashes?page[size]=25&page[after]=25 - previous?: string //default: /api/v2/ui/hashes?page[size]=25&page[before]=25 - } - id?: integer - type?: string //default: Hash - data: { - hashlistId?: integer - hash?: string - salt?: string - plaintext?: string - timeCracked?: integer - chunkId?: integer - isCracked?: boolean - crackPos?: integer - } - relationships: { - } - included: { - }[] -} -``` - -- 400 Invalid request - -`application/json` - -```ts -{ - title?: string - type?: string - status?: integer -} -``` - -- 401 Authentication failed - -`application/json` - -```ts -{ - title?: string - type?: string - status?: integer -} -``` - -- 404 Not Found - -`application/json` - -```ts -{ - message?: string - exception: { - type?: string - code?: integer - message?: string - file?: string - line?: integer - } -} -``` - -*** - -### [GET]/api/v2/ui/hashes/{id:[0-9]+}/relationships/{relation:chunk} - -- Description -GET request for for a to-one relationship link. Returns the resource record of the object that is part of the specified relation. - -- Security -bearerAuth - -#### Parameters(Query) - -```ts -include?: string -``` - -#### Responses - -- 200 successful operation - -`application/json` - -```ts -{ - jsonapi: { - version?: string //default: 1.1 - ext?: string //default: https://jsonapi.org/profiles/ethanresnick/cursor-pagination - } - links: { - self?: string //default: /api/v2/ui/hashes?page[size]=25 - first?: string //default: /api/v2/ui/hashes?page[size]=25&page[after]=0 - last?: string //default: /api/v2/ui/hashes?page[size]=25&page[before]=500 - next?: string //default: /api/v2/ui/hashes?page[size]=25&page[after]=25 - previous?: string //default: /api/v2/ui/hashes?page[size]=25&page[before]=25 - } - id?: integer - type?: string //default: Hash - data: { - hashlistId?: integer - hash?: string - salt?: string - plaintext?: string - timeCracked?: integer - chunkId?: integer - isCracked?: boolean - crackPos?: integer - } - relationships: { - } - included: { - }[] -} -``` - -- 400 Invalid request - -`application/json` - -```ts -{ - title?: string - type?: string - status?: integer -} -``` - -- 401 Authentication failed - -`application/json` - -```ts -{ - title?: string - type?: string - status?: integer -} -``` - -- 404 Not Found - -`application/json` - -```ts -{ - message?: string - exception: { - type?: string - code?: integer - message?: string - file?: string - line?: integer - } -} -``` - -*** - -### [PATCH]/api/v2/ui/hashes/{id:[0-9]+}/relationships/{relation:chunk} - -- Security -bearerAuth - -#### RequestBody - -- application/json - -```ts -{ - data: { - type?: string - attributes: { - chunkId?: integer - crackPos?: integer - hash?: string - hashlistId?: integer - isCracked?: boolean - plaintext?: string - salt?: string - timeCracked?: integer - } - } -} -``` - -#### Responses - -- 200 successful operation - -`application/json` - -```ts -{ - jsonapi: { - version?: string //default: 1.1 - ext?: string //default: https://jsonapi.org/profiles/ethanresnick/cursor-pagination - } - id?: integer - type?: string //default: Hash - data: { - hashlistId?: integer - hash?: string - salt?: string - plaintext?: string - timeCracked?: integer - chunkId?: integer - isCracked?: boolean - crackPos?: integer - } -} -``` - -- 400 Invalid request - -`application/json` - -```ts -{ - title?: string - type?: string - status?: integer -} -``` - -- 401 Authentication failed - -`application/json` - -```ts -{ - title?: string - type?: string - status?: integer -} -``` - -- 404 Not Found - -`application/json` - -```ts -{ - message?: string - exception: { - type?: string - code?: integer - message?: string - file?: string - line?: integer - } -} -``` - -*** - -### [GET]/api/v2/ui/hashes/{id:[0-9]+}/{relation:hashlist} - -- Description -GET request for for a to-one relationship link. Returns the resource record of the object that is part of the specified relation. - -- Security -bearerAuth - -#### Parameters(Query) - -```ts -include?: string -``` - -#### Responses - -- 200 successful operation - -`application/json` - -```ts -{ - jsonapi: { - version?: string //default: 1.1 - ext?: string //default: https://jsonapi.org/profiles/ethanresnick/cursor-pagination - } - links: { - self?: string //default: /api/v2/ui/hashes?page[size]=25 - first?: string //default: /api/v2/ui/hashes?page[size]=25&page[after]=0 - last?: string //default: /api/v2/ui/hashes?page[size]=25&page[before]=500 - next?: string //default: /api/v2/ui/hashes?page[size]=25&page[after]=25 - previous?: string //default: /api/v2/ui/hashes?page[size]=25&page[before]=25 - } - id?: integer - type?: string //default: Hash - data: { - hashlistId?: integer - hash?: string - salt?: string - plaintext?: string - timeCracked?: integer - chunkId?: integer - isCracked?: boolean - crackPos?: integer - } - relationships: { - } - included: { - }[] -} -``` - -- 400 Invalid request - -`application/json` - -```ts -{ - title?: string - type?: string - status?: integer -} -``` - -- 401 Authentication failed - -`application/json` - -```ts -{ - title?: string - type?: string - status?: integer -} -``` - -- 404 Not Found - -`application/json` - -```ts -{ - message?: string - exception: { - type?: string - code?: integer - message?: string - file?: string - line?: integer - } -} -``` - -*** - -### [GET]/api/v2/ui/hashes/{id:[0-9]+}/relationships/{relation:hashlist} - -- Description -GET request for for a to-one relationship link. Returns the resource record of the object that is part of the specified relation. - -- Security -bearerAuth - -#### Parameters(Query) - -```ts -include?: string -``` - -#### Responses - -- 200 successful operation - -`application/json` - -```ts -{ - jsonapi: { - version?: string //default: 1.1 - ext?: string //default: https://jsonapi.org/profiles/ethanresnick/cursor-pagination - } - links: { - self?: string //default: /api/v2/ui/hashes?page[size]=25 - first?: string //default: /api/v2/ui/hashes?page[size]=25&page[after]=0 - last?: string //default: /api/v2/ui/hashes?page[size]=25&page[before]=500 - next?: string //default: /api/v2/ui/hashes?page[size]=25&page[after]=25 - previous?: string //default: /api/v2/ui/hashes?page[size]=25&page[before]=25 - } - id?: integer - type?: string //default: Hash - data: { - hashlistId?: integer - hash?: string - salt?: string - plaintext?: string - timeCracked?: integer - chunkId?: integer - isCracked?: boolean - crackPos?: integer - } - relationships: { - } - included: { - }[] -} -``` - -- 400 Invalid request - -`application/json` - -```ts -{ - title?: string - type?: string - status?: integer -} -``` - -- 401 Authentication failed - -`application/json` - -```ts -{ - title?: string - type?: string - status?: integer -} -``` - -- 404 Not Found - -`application/json` - -```ts -{ - message?: string - exception: { - type?: string - code?: integer - message?: string - file?: string - line?: integer - } -} -``` - -*** - -### [PATCH]/api/v2/ui/hashes/{id:[0-9]+}/relationships/{relation:hashlist} - -- Security -bearerAuth - -#### RequestBody - -- application/json - -```ts -{ - data: { - type?: string - attributes: { - chunkId?: integer - crackPos?: integer - hash?: string - hashlistId?: integer - isCracked?: boolean - plaintext?: string - salt?: string - timeCracked?: integer - } - } -} -``` - -#### Responses - -- 200 successful operation - -`application/json` - -```ts -{ - jsonapi: { - version?: string //default: 1.1 - ext?: string //default: https://jsonapi.org/profiles/ethanresnick/cursor-pagination - } - id?: integer - type?: string //default: Hash - data: { - hashlistId?: integer - hash?: string - salt?: string - plaintext?: string - timeCracked?: integer - chunkId?: integer - isCracked?: boolean - crackPos?: integer - } -} -``` - -- 400 Invalid request - -`application/json` - -```ts -{ - title?: string - type?: string - status?: integer -} -``` - -- 401 Authentication failed - -`application/json` - -```ts -{ - title?: string - type?: string - status?: integer -} -``` - -- 404 Not Found - -`application/json` - -```ts -{ - message?: string - exception: { - type?: string - code?: integer - message?: string - file?: string - line?: integer - } -} -``` - -*** - -### [GET]/api/v2/ui/hashes/{id:[0-9]+} - -- Description -GET request to retrieve a single object. - -- Security -bearerAuth - -#### Parameters(Query) - -```ts -include?: string -``` - -#### Responses - -- 200 successful operation - -`application/json` - -```ts -{ - jsonapi: { - version?: string //default: 1.1 - ext?: string //default: https://jsonapi.org/profiles/ethanresnick/cursor-pagination - } - links: { - self?: string //default: /api/v2/ui/hashes?page[size]=25 - first?: string //default: /api/v2/ui/hashes?page[size]=25&page[after]=0 - last?: string //default: /api/v2/ui/hashes?page[size]=25&page[before]=500 - next?: string //default: /api/v2/ui/hashes?page[size]=25&page[after]=25 - previous?: string //default: /api/v2/ui/hashes?page[size]=25&page[before]=25 - } - id?: integer - type?: string //default: Hash - data: { - hashlistId?: integer - hash?: string - salt?: string - plaintext?: string - timeCracked?: integer - chunkId?: integer - isCracked?: boolean - crackPos?: integer - } - relationships: { - } - included: { - }[] -} -``` - -- 400 Invalid request - -`application/json` - -```ts -{ - title?: string - type?: string - status?: integer -} -``` - -- 401 Authentication failed - -`application/json` - -```ts -{ - title?: string - type?: string - status?: integer -} -``` - -- 404 Not Found - -`application/json` - -```ts -{ - message?: string - exception: { - type?: string - code?: integer - message?: string - file?: string - line?: integer - } -} -``` - -*** - -### [GET]/api/v2/ui/hashlists - -- Description -GET many request to retrieve multiple objects. - -- Security -bearerAuth - -#### Parameters(Query) - -```ts -page[after]?: integer -``` - -```ts -page[before]?: integer -``` - -```ts -page[size]?: integer -``` - -```ts -filter: { -} -``` - -```ts -include?: string -``` - -#### Responses - -- 200 successful operation - -`application/json` - -```ts -{ - jsonapi: { - version?: string //default: 1.1 - ext?: string //default: https://jsonapi.org/profiles/ethanresnick/cursor-pagination - } - links: { - self?: string //default: /api/v2/ui/hashlists?page[size]=25 - first?: string //default: /api/v2/ui/hashlists?page[size]=25&page[after]=0 - last?: string //default: /api/v2/ui/hashlists?page[size]=25&page[before]=500 - next?: string //default: /api/v2/ui/hashlists?page[size]=25&page[after]=25 - previous?: string //default: /api/v2/ui/hashlists?page[size]=25&page[before]=25 - } - id?: integer - type?: string //default: Hashlist - data: { - name?: string - format?: enum[0, 1, 2, 3] - hashTypeId?: integer - hashCount?: integer - separator?: string - cracked?: integer - isSecret?: boolean - isHexSalt?: boolean - isSalted?: boolean - accessGroupId?: integer - notes?: string - useBrain?: boolean - brainFeatures?: integer - isArchived?: boolean - } - relationships: { - } - included: { - }[] -}[] -``` - -- 400 Invalid request - -`application/json` - -```ts -{ - title?: string - type?: string - status?: integer -} -``` - -- 401 Authentication failed - -`application/json` - -```ts -{ - title?: string - type?: string - status?: integer -} -``` - -*** - -### [POST]/api/v2/ui/hashlists - -- Description -POST request to create a new object. The request must contain the resource record as data with the attributes of the new object.To add relationships, a relationships object can be added with the resource records of the relations that are part of this object. - -- Security -bearerAuth - -#### RequestBody - -- application/json - -```ts -{ - data: { - type?: string - attributes: { - hashlistSeperator?: string - sourceType?: string - sourceData?: string - name?: string - format?: enum[0, 1, 2, 3] - hashTypeId?: integer - hashCount?: integer - separator?: string - cracked?: integer - isSecret?: boolean - isHexSalt?: boolean - isSalted?: boolean - accessGroupId?: integer - notes?: string - useBrain?: boolean - brainFeatures?: integer - isArchived?: boolean - } - } -} -``` - -#### Responses - -- 201 successful operation - -`application/json` - -```ts -{ - jsonapi: { - version?: string //default: 1.1 - ext?: string //default: https://jsonapi.org/profiles/ethanresnick/cursor-pagination - } - id?: integer - type?: string //default: Hashlist - data: { - name?: string - format?: enum[0, 1, 2, 3] - hashTypeId?: integer - hashCount?: integer - separator?: string - cracked?: integer - isSecret?: boolean - isHexSalt?: boolean - isSalted?: boolean - accessGroupId?: integer - notes?: string - useBrain?: boolean - brainFeatures?: integer - isArchived?: boolean - } -} -``` - -- 400 Invalid request - -`application/json` - -```ts -{ - title?: string - type?: string - status?: integer -} -``` - -- 401 Authentication failed - -`application/json` - -```ts -{ - title?: string - type?: string - status?: integer -} -``` - -*** - -### [GET]/api/v2/ui/hashlists/count - -- Description -GET many request to retrieve multiple objects. - -- Security -bearerAuth - -#### Parameters(Query) - -```ts -page[after]?: integer -``` - -```ts -page[before]?: integer -``` - -```ts -page[size]?: integer -``` - -```ts -filter: { -} -``` - -```ts -include?: string -``` - -#### Responses - -- 200 successful operation - -`application/json` - -```ts -{ - jsonapi: { - version?: string //default: 1.1 - ext?: string //default: https://jsonapi.org/profiles/ethanresnick/cursor-pagination - } - links: { - self?: string //default: /api/v2/ui/hashlists?page[size]=25 - first?: string //default: /api/v2/ui/hashlists?page[size]=25&page[after]=0 - last?: string //default: /api/v2/ui/hashlists?page[size]=25&page[before]=500 - next?: string //default: /api/v2/ui/hashlists?page[size]=25&page[after]=25 - previous?: string //default: /api/v2/ui/hashlists?page[size]=25&page[before]=25 - } - id?: integer - type?: string //default: Hashlist - data: { - name?: string - format?: enum[0, 1, 2, 3] - hashTypeId?: integer - hashCount?: integer - separator?: string - cracked?: integer - isSecret?: boolean - isHexSalt?: boolean - isSalted?: boolean - accessGroupId?: integer - notes?: string - useBrain?: boolean - brainFeatures?: integer - isArchived?: boolean - } - relationships: { - } - included: { - }[] -}[] -``` - -- 400 Invalid request - -`application/json` - -```ts -{ - title?: string - type?: string - status?: integer -} -``` - -- 401 Authentication failed - -`application/json` - -```ts -{ - title?: string - type?: string - status?: integer -} -``` - -*** - -### [GET]/api/v2/ui/hashlists/{id:[0-9]+}/{relation:accessGroup} - -- Description -GET request for for a to-one relationship link. Returns the resource record of the object that is part of the specified relation. - -- Security -bearerAuth - -#### Parameters(Query) - -```ts -include?: string -``` - -#### Responses - -- 200 successful operation - -`application/json` - -```ts -{ - jsonapi: { - version?: string //default: 1.1 - ext?: string //default: https://jsonapi.org/profiles/ethanresnick/cursor-pagination - } - links: { - self?: string //default: /api/v2/ui/hashlists?page[size]=25 - first?: string //default: /api/v2/ui/hashlists?page[size]=25&page[after]=0 - last?: string //default: /api/v2/ui/hashlists?page[size]=25&page[before]=500 - next?: string //default: /api/v2/ui/hashlists?page[size]=25&page[after]=25 - previous?: string //default: /api/v2/ui/hashlists?page[size]=25&page[before]=25 - } - id?: integer - type?: string //default: Hashlist - data: { - name?: string - format?: enum[0, 1, 2, 3] - hashTypeId?: integer - hashCount?: integer - separator?: string - cracked?: integer - isSecret?: boolean - isHexSalt?: boolean - isSalted?: boolean - accessGroupId?: integer - notes?: string - useBrain?: boolean - brainFeatures?: integer - isArchived?: boolean - } - relationships: { - } - included: { - }[] -} -``` - -- 400 Invalid request - -`application/json` - -```ts -{ - title?: string - type?: string - status?: integer -} -``` - -- 401 Authentication failed - -`application/json` - -```ts -{ - title?: string - type?: string - status?: integer -} -``` - -- 404 Not Found - -`application/json` - -```ts -{ - message?: string - exception: { - type?: string - code?: integer - message?: string - file?: string - line?: integer - } -} -``` - -*** - -### [GET]/api/v2/ui/hashlists/{id:[0-9]+}/relationships/{relation:accessGroup} - -- Description -GET request for for a to-one relationship link. Returns the resource record of the object that is part of the specified relation. - -- Security -bearerAuth - -#### Parameters(Query) - -```ts -include?: string -``` - -#### Responses - -- 200 successful operation - -`application/json` - -```ts -{ - jsonapi: { - version?: string //default: 1.1 - ext?: string //default: https://jsonapi.org/profiles/ethanresnick/cursor-pagination - } - links: { - self?: string //default: /api/v2/ui/hashlists?page[size]=25 - first?: string //default: /api/v2/ui/hashlists?page[size]=25&page[after]=0 - last?: string //default: /api/v2/ui/hashlists?page[size]=25&page[before]=500 - next?: string //default: /api/v2/ui/hashlists?page[size]=25&page[after]=25 - previous?: string //default: /api/v2/ui/hashlists?page[size]=25&page[before]=25 - } - id?: integer - type?: string //default: Hashlist - data: { - name?: string - format?: enum[0, 1, 2, 3] - hashTypeId?: integer - hashCount?: integer - separator?: string - cracked?: integer - isSecret?: boolean - isHexSalt?: boolean - isSalted?: boolean - accessGroupId?: integer - notes?: string - useBrain?: boolean - brainFeatures?: integer - isArchived?: boolean - } - relationships: { - } - included: { - }[] -} -``` - -- 400 Invalid request - -`application/json` - -```ts -{ - title?: string - type?: string - status?: integer -} -``` - -- 401 Authentication failed - -`application/json` - -```ts -{ - title?: string - type?: string - status?: integer -} -``` - -- 404 Not Found - -`application/json` - -```ts -{ - message?: string - exception: { - type?: string - code?: integer - message?: string - file?: string - line?: integer - } -} -``` - -*** - -### [PATCH]/api/v2/ui/hashlists/{id:[0-9]+}/relationships/{relation:accessGroup} - -- Security -bearerAuth - -#### RequestBody - -- application/json - -```ts -{ - data: { - type?: string - attributes: { - accessGroupId?: integer - isArchived?: boolean - isSecret?: boolean - name?: string - notes?: string - } - } -} -``` - -#### Responses - -- 200 successful operation - -`application/json` - -```ts -{ - jsonapi: { - version?: string //default: 1.1 - ext?: string //default: https://jsonapi.org/profiles/ethanresnick/cursor-pagination - } - id?: integer - type?: string //default: Hashlist - data: { - name?: string - format?: enum[0, 1, 2, 3] - hashTypeId?: integer - hashCount?: integer - separator?: string - cracked?: integer - isSecret?: boolean - isHexSalt?: boolean - isSalted?: boolean - accessGroupId?: integer - notes?: string - useBrain?: boolean - brainFeatures?: integer - isArchived?: boolean - } -} -``` - -- 400 Invalid request - -`application/json` - -```ts -{ - title?: string - type?: string - status?: integer -} -``` - -- 401 Authentication failed - -`application/json` - -```ts -{ - title?: string - type?: string - status?: integer -} -``` - -- 404 Not Found - -`application/json` - -```ts -{ - message?: string - exception: { - type?: string - code?: integer - message?: string - file?: string - line?: integer - } -} -``` - -*** - -### [GET]/api/v2/ui/hashlists/{id:[0-9]+}/{relation:hashType} - -- Description -GET request for for a to-one relationship link. Returns the resource record of the object that is part of the specified relation. - -- Security -bearerAuth - -#### Parameters(Query) - -```ts -include?: string -``` - -#### Responses - -- 200 successful operation - -`application/json` - -```ts -{ - jsonapi: { - version?: string //default: 1.1 - ext?: string //default: https://jsonapi.org/profiles/ethanresnick/cursor-pagination - } - links: { - self?: string //default: /api/v2/ui/hashlists?page[size]=25 - first?: string //default: /api/v2/ui/hashlists?page[size]=25&page[after]=0 - last?: string //default: /api/v2/ui/hashlists?page[size]=25&page[before]=500 - next?: string //default: /api/v2/ui/hashlists?page[size]=25&page[after]=25 - previous?: string //default: /api/v2/ui/hashlists?page[size]=25&page[before]=25 - } - id?: integer - type?: string //default: Hashlist - data: { - name?: string - format?: enum[0, 1, 2, 3] - hashTypeId?: integer - hashCount?: integer - separator?: string - cracked?: integer - isSecret?: boolean - isHexSalt?: boolean - isSalted?: boolean - accessGroupId?: integer - notes?: string - useBrain?: boolean - brainFeatures?: integer - isArchived?: boolean - } - relationships: { - } - included: { - }[] -} -``` - -- 400 Invalid request - -`application/json` - -```ts -{ - title?: string - type?: string - status?: integer -} -``` - -- 401 Authentication failed - -`application/json` - -```ts -{ - title?: string - type?: string - status?: integer -} -``` - -- 404 Not Found - -`application/json` - -```ts -{ - message?: string - exception: { - type?: string - code?: integer - message?: string - file?: string - line?: integer - } -} -``` - -*** - -### [GET]/api/v2/ui/hashlists/{id:[0-9]+}/relationships/{relation:hashType} - -- Description -GET request for for a to-one relationship link. Returns the resource record of the object that is part of the specified relation. - -- Security -bearerAuth - -#### Parameters(Query) - -```ts -include?: string -``` - -#### Responses - -- 200 successful operation - -`application/json` - -```ts -{ - jsonapi: { - version?: string //default: 1.1 - ext?: string //default: https://jsonapi.org/profiles/ethanresnick/cursor-pagination - } - links: { - self?: string //default: /api/v2/ui/hashlists?page[size]=25 - first?: string //default: /api/v2/ui/hashlists?page[size]=25&page[after]=0 - last?: string //default: /api/v2/ui/hashlists?page[size]=25&page[before]=500 - next?: string //default: /api/v2/ui/hashlists?page[size]=25&page[after]=25 - previous?: string //default: /api/v2/ui/hashlists?page[size]=25&page[before]=25 - } - id?: integer - type?: string //default: Hashlist - data: { - name?: string - format?: enum[0, 1, 2, 3] - hashTypeId?: integer - hashCount?: integer - separator?: string - cracked?: integer - isSecret?: boolean - isHexSalt?: boolean - isSalted?: boolean - accessGroupId?: integer - notes?: string - useBrain?: boolean - brainFeatures?: integer - isArchived?: boolean - } - relationships: { - } - included: { - }[] -} -``` - -- 400 Invalid request - -`application/json` - -```ts -{ - title?: string - type?: string - status?: integer -} -``` - -- 401 Authentication failed - -`application/json` - -```ts -{ - title?: string - type?: string - status?: integer -} -``` - -- 404 Not Found - -`application/json` - -```ts -{ - message?: string - exception: { - type?: string - code?: integer - message?: string - file?: string - line?: integer - } -} -``` - -*** - -### [PATCH]/api/v2/ui/hashlists/{id:[0-9]+}/relationships/{relation:hashType} - -- Security -bearerAuth - -#### RequestBody - -- application/json - -```ts -{ - data: { - type?: string - attributes: { - accessGroupId?: integer - isArchived?: boolean - isSecret?: boolean - name?: string - notes?: string - } - } -} -``` - -#### Responses - -- 200 successful operation - -`application/json` - -```ts -{ - jsonapi: { - version?: string //default: 1.1 - ext?: string //default: https://jsonapi.org/profiles/ethanresnick/cursor-pagination - } - id?: integer - type?: string //default: Hashlist - data: { - name?: string - format?: enum[0, 1, 2, 3] - hashTypeId?: integer - hashCount?: integer - separator?: string - cracked?: integer - isSecret?: boolean - isHexSalt?: boolean - isSalted?: boolean - accessGroupId?: integer - notes?: string - useBrain?: boolean - brainFeatures?: integer - isArchived?: boolean - } -} -``` - -- 400 Invalid request - -`application/json` - -```ts -{ - title?: string - type?: string - status?: integer -} -``` - -- 401 Authentication failed - -`application/json` - -```ts -{ - title?: string - type?: string - status?: integer -} -``` - -- 404 Not Found - -`application/json` - -```ts -{ - message?: string - exception: { - type?: string - code?: integer - message?: string - file?: string - line?: integer - } -} -``` - -*** - -### [GET]/api/v2/ui/hashlists/{id:[0-9]+}/{relation:hashes} - -- Description -GET request for for a to-one relationship link. Returns the resource record of the object that is part of the specified relation. - -- Security -bearerAuth - -#### Parameters(Query) - -```ts -include?: string -``` - -#### Responses - -- 200 successful operation - -`application/json` - -```ts -{ - jsonapi: { - version?: string //default: 1.1 - ext?: string //default: https://jsonapi.org/profiles/ethanresnick/cursor-pagination - } - links: { - self?: string //default: /api/v2/ui/hashlists?page[size]=25 - first?: string //default: /api/v2/ui/hashlists?page[size]=25&page[after]=0 - last?: string //default: /api/v2/ui/hashlists?page[size]=25&page[before]=500 - next?: string //default: /api/v2/ui/hashlists?page[size]=25&page[after]=25 - previous?: string //default: /api/v2/ui/hashlists?page[size]=25&page[before]=25 - } - id?: integer - type?: string //default: Hashlist - data: { - name?: string - format?: enum[0, 1, 2, 3] - hashTypeId?: integer - hashCount?: integer - separator?: string - cracked?: integer - isSecret?: boolean - isHexSalt?: boolean - isSalted?: boolean - accessGroupId?: integer - notes?: string - useBrain?: boolean - brainFeatures?: integer - isArchived?: boolean - } - relationships: { - } - included: { - }[] -} -``` - -- 400 Invalid request - -`application/json` - -```ts -{ - title?: string - type?: string - status?: integer -} -``` - -- 401 Authentication failed - -`application/json` - -```ts -{ - title?: string - type?: string - status?: integer -} -``` - -- 404 Not Found - -`application/json` - -```ts -{ - message?: string - exception: { - type?: string - code?: integer - message?: string - file?: string - line?: integer - } -} -``` - -*** - -### [GET]/api/v2/ui/hashlists/{id:[0-9]+}/relationships/{relation:hashes} - -- Description -GET request for for a to-one relationship link. Returns the resource record of the object that is part of the specified relation. - -- Security -bearerAuth - -#### Parameters(Query) - -```ts -include?: string -``` - -#### Responses - -- 200 successful operation - -`application/json` - -```ts -{ - jsonapi: { - version?: string //default: 1.1 - ext?: string //default: https://jsonapi.org/profiles/ethanresnick/cursor-pagination - } - links: { - self?: string //default: /api/v2/ui/hashlists?page[size]=25 - first?: string //default: /api/v2/ui/hashlists?page[size]=25&page[after]=0 - last?: string //default: /api/v2/ui/hashlists?page[size]=25&page[before]=500 - next?: string //default: /api/v2/ui/hashlists?page[size]=25&page[after]=25 - previous?: string //default: /api/v2/ui/hashlists?page[size]=25&page[before]=25 - } - id?: integer - type?: string //default: Hashlist - data: { - name?: string - format?: enum[0, 1, 2, 3] - hashTypeId?: integer - hashCount?: integer - separator?: string - cracked?: integer - isSecret?: boolean - isHexSalt?: boolean - isSalted?: boolean - accessGroupId?: integer - notes?: string - useBrain?: boolean - brainFeatures?: integer - isArchived?: boolean - } - relationships: { - } - included: { - }[] -} -``` - -- 400 Invalid request - -`application/json` - -```ts -{ - title?: string - type?: string - status?: integer -} -``` - -- 401 Authentication failed - -`application/json` - -```ts -{ - title?: string - type?: string - status?: integer -} -``` - -- 404 Not Found - -`application/json` - -```ts -{ - message?: string - exception: { - type?: string - code?: integer - message?: string - file?: string - line?: integer - } -} -``` - -*** - -### [PATCH]/api/v2/ui/hashlists/{id:[0-9]+}/relationships/{relation:hashes} - -- Security -bearerAuth - -#### RequestBody - -- application/json - -```ts -{ - data: { - type?: string - attributes: { - accessGroupId?: integer - isArchived?: boolean - isSecret?: boolean - name?: string - notes?: string - } - } -} -``` - -#### Responses - -- 200 successful operation - -`application/json` - -```ts -{ - jsonapi: { - version?: string //default: 1.1 - ext?: string //default: https://jsonapi.org/profiles/ethanresnick/cursor-pagination - } - id?: integer - type?: string //default: Hashlist - data: { - name?: string - format?: enum[0, 1, 2, 3] - hashTypeId?: integer - hashCount?: integer - separator?: string - cracked?: integer - isSecret?: boolean - isHexSalt?: boolean - isSalted?: boolean - accessGroupId?: integer - notes?: string - useBrain?: boolean - brainFeatures?: integer - isArchived?: boolean - } -} -``` - -- 400 Invalid request - -`application/json` - -```ts -{ - title?: string - type?: string - status?: integer -} -``` - -- 401 Authentication failed - -`application/json` - -```ts -{ - title?: string - type?: string - status?: integer -} -``` - -- 404 Not Found - -`application/json` - -```ts -{ - message?: string - exception: { - type?: string - code?: integer - message?: string - file?: string - line?: integer - } -} -``` - -*** - -### [POST]/api/v2/ui/hashlists/{id:[0-9]+}/relationships/{relation:hashes} - -- Security -bearerAuth - -#### RequestBody - -- application/json - -#### Responses - -- 204 successfully created - -- 400 Invalid request - -`application/json` - -```ts -{ - title?: string - type?: string - status?: integer -} -``` - -- 401 Authentication failed - -`application/json` - -```ts -{ - title?: string - type?: string - status?: integer -} -``` - -- 404 Not Found - -`application/json` - -```ts -{ - message?: string - exception: { - type?: string - code?: integer - message?: string - file?: string - line?: integer - } -} -``` - -*** - -### [DELETE]/api/v2/ui/hashlists/{id:[0-9]+}/relationships/{relation:hashes} - -- Security -bearerAuth - -#### RequestBody - -- application/json - -#### Responses - -- 204 successfully deleted - -- 400 Invalid request - -`application/json` - -```ts -{ - title?: string - type?: string - status?: integer -} -``` - -- 401 Authentication failed - -`application/json` - -```ts -{ - title?: string - type?: string - status?: integer -} -``` - -- 404 Not Found - -`application/json` - -```ts -{ - message?: string - exception: { - type?: string - code?: integer - message?: string - file?: string - line?: integer - } -} -``` - -*** - -### [GET]/api/v2/ui/hashlists/{id:[0-9]+}/{relation:hashlists} - -- Description -GET request for for a to-one relationship link. Returns the resource record of the object that is part of the specified relation. - -- Security -bearerAuth - -#### Parameters(Query) - -```ts -include?: string -``` - -#### Responses - -- 200 successful operation - -`application/json` - -```ts -{ - jsonapi: { - version?: string //default: 1.1 - ext?: string //default: https://jsonapi.org/profiles/ethanresnick/cursor-pagination - } - links: { - self?: string //default: /api/v2/ui/hashlists?page[size]=25 - first?: string //default: /api/v2/ui/hashlists?page[size]=25&page[after]=0 - last?: string //default: /api/v2/ui/hashlists?page[size]=25&page[before]=500 - next?: string //default: /api/v2/ui/hashlists?page[size]=25&page[after]=25 - previous?: string //default: /api/v2/ui/hashlists?page[size]=25&page[before]=25 - } - id?: integer - type?: string //default: Hashlist - data: { - name?: string - format?: enum[0, 1, 2, 3] - hashTypeId?: integer - hashCount?: integer - separator?: string - cracked?: integer - isSecret?: boolean - isHexSalt?: boolean - isSalted?: boolean - accessGroupId?: integer - notes?: string - useBrain?: boolean - brainFeatures?: integer - isArchived?: boolean - } - relationships: { - } - included: { - }[] -} -``` - -- 400 Invalid request - -`application/json` - -```ts -{ - title?: string - type?: string - status?: integer -} -``` - -- 401 Authentication failed - -`application/json` - -```ts -{ - title?: string - type?: string - status?: integer -} -``` - -- 404 Not Found - -`application/json` - -```ts -{ - message?: string - exception: { - type?: string - code?: integer - message?: string - file?: string - line?: integer - } -} -``` - -*** - -### [GET]/api/v2/ui/hashlists/{id:[0-9]+}/relationships/{relation:hashlists} - -- Description -GET request for for a to-one relationship link. Returns the resource record of the object that is part of the specified relation. - -- Security -bearerAuth - -#### Parameters(Query) - -```ts -include?: string -``` - -#### Responses - -- 200 successful operation - -`application/json` - -```ts -{ - jsonapi: { - version?: string //default: 1.1 - ext?: string //default: https://jsonapi.org/profiles/ethanresnick/cursor-pagination - } - links: { - self?: string //default: /api/v2/ui/hashlists?page[size]=25 - first?: string //default: /api/v2/ui/hashlists?page[size]=25&page[after]=0 - last?: string //default: /api/v2/ui/hashlists?page[size]=25&page[before]=500 - next?: string //default: /api/v2/ui/hashlists?page[size]=25&page[after]=25 - previous?: string //default: /api/v2/ui/hashlists?page[size]=25&page[before]=25 - } - id?: integer - type?: string //default: Hashlist - data: { - name?: string - format?: enum[0, 1, 2, 3] - hashTypeId?: integer - hashCount?: integer - separator?: string - cracked?: integer - isSecret?: boolean - isHexSalt?: boolean - isSalted?: boolean - accessGroupId?: integer - notes?: string - useBrain?: boolean - brainFeatures?: integer - isArchived?: boolean - } - relationships: { - } - included: { - }[] -} -``` - -- 400 Invalid request - -`application/json` - -```ts -{ - title?: string - type?: string - status?: integer -} -``` - -- 401 Authentication failed - -`application/json` - -```ts -{ - title?: string - type?: string - status?: integer -} -``` - -- 404 Not Found - -`application/json` - -```ts -{ - message?: string - exception: { - type?: string - code?: integer - message?: string - file?: string - line?: integer - } -} -``` - -*** - -### [PATCH]/api/v2/ui/hashlists/{id:[0-9]+}/relationships/{relation:hashlists} - -- Security -bearerAuth - -#### RequestBody - -- application/json - -```ts -{ - data: { - type?: string - attributes: { - accessGroupId?: integer - isArchived?: boolean - isSecret?: boolean - name?: string - notes?: string - } - } -} -``` - -#### Responses - -- 200 successful operation - -`application/json` - -```ts -{ - jsonapi: { - version?: string //default: 1.1 - ext?: string //default: https://jsonapi.org/profiles/ethanresnick/cursor-pagination - } - id?: integer - type?: string //default: Hashlist - data: { - name?: string - format?: enum[0, 1, 2, 3] - hashTypeId?: integer - hashCount?: integer - separator?: string - cracked?: integer - isSecret?: boolean - isHexSalt?: boolean - isSalted?: boolean - accessGroupId?: integer - notes?: string - useBrain?: boolean - brainFeatures?: integer - isArchived?: boolean - } -} -``` - -- 400 Invalid request - -`application/json` - -```ts -{ - title?: string - type?: string - status?: integer -} -``` - -- 401 Authentication failed - -`application/json` - -```ts -{ - title?: string - type?: string - status?: integer -} -``` - -- 404 Not Found - -`application/json` - -```ts -{ - message?: string - exception: { - type?: string - code?: integer - message?: string - file?: string - line?: integer - } -} -``` - -*** - -### [POST]/api/v2/ui/hashlists/{id:[0-9]+}/relationships/{relation:hashlists} - -- Security -bearerAuth - -#### RequestBody - -- application/json - -#### Responses - -- 204 successfully created - -- 400 Invalid request - -`application/json` - -```ts -{ - title?: string - type?: string - status?: integer -} -``` - -- 401 Authentication failed - -`application/json` - -```ts -{ - title?: string - type?: string - status?: integer -} -``` - -- 404 Not Found - -`application/json` - -```ts -{ - message?: string - exception: { - type?: string - code?: integer - message?: string - file?: string - line?: integer - } -} -``` - -*** - -### [DELETE]/api/v2/ui/hashlists/{id:[0-9]+}/relationships/{relation:hashlists} - -- Security -bearerAuth - -#### RequestBody - -- application/json - -#### Responses - -- 204 successfully deleted - -- 400 Invalid request - -`application/json` - -```ts -{ - title?: string - type?: string - status?: integer -} -``` - -- 401 Authentication failed - -`application/json` - -```ts -{ - title?: string - type?: string - status?: integer -} -``` - -- 404 Not Found - -`application/json` - -```ts -{ - message?: string - exception: { - type?: string - code?: integer - message?: string - file?: string - line?: integer - } -} -``` - -*** - -### [GET]/api/v2/ui/hashlists/{id:[0-9]+}/{relation:tasks} - -- Description -GET request for for a to-one relationship link. Returns the resource record of the object that is part of the specified relation. - -- Security -bearerAuth - -#### Parameters(Query) - -```ts -include?: string -``` - -#### Responses - -- 200 successful operation - -`application/json` - -```ts -{ - jsonapi: { - version?: string //default: 1.1 - ext?: string //default: https://jsonapi.org/profiles/ethanresnick/cursor-pagination - } - links: { - self?: string //default: /api/v2/ui/hashlists?page[size]=25 - first?: string //default: /api/v2/ui/hashlists?page[size]=25&page[after]=0 - last?: string //default: /api/v2/ui/hashlists?page[size]=25&page[before]=500 - next?: string //default: /api/v2/ui/hashlists?page[size]=25&page[after]=25 - previous?: string //default: /api/v2/ui/hashlists?page[size]=25&page[before]=25 - } - id?: integer - type?: string //default: Hashlist - data: { - name?: string - format?: enum[0, 1, 2, 3] - hashTypeId?: integer - hashCount?: integer - separator?: string - cracked?: integer - isSecret?: boolean - isHexSalt?: boolean - isSalted?: boolean - accessGroupId?: integer - notes?: string - useBrain?: boolean - brainFeatures?: integer - isArchived?: boolean - } - relationships: { - } - included: { - }[] -} -``` - -- 400 Invalid request - -`application/json` - -```ts -{ - title?: string - type?: string - status?: integer -} -``` - -- 401 Authentication failed - -`application/json` - -```ts -{ - title?: string - type?: string - status?: integer -} -``` - -- 404 Not Found - -`application/json` - -```ts -{ - message?: string - exception: { - type?: string - code?: integer - message?: string - file?: string - line?: integer - } -} -``` - -*** - -### [GET]/api/v2/ui/hashlists/{id:[0-9]+}/relationships/{relation:tasks} - -- Description -GET request for for a to-one relationship link. Returns the resource record of the object that is part of the specified relation. - -- Security -bearerAuth - -#### Parameters(Query) - -```ts -include?: string -``` - -#### Responses - -- 200 successful operation - -`application/json` - -```ts -{ - jsonapi: { - version?: string //default: 1.1 - ext?: string //default: https://jsonapi.org/profiles/ethanresnick/cursor-pagination - } - links: { - self?: string //default: /api/v2/ui/hashlists?page[size]=25 - first?: string //default: /api/v2/ui/hashlists?page[size]=25&page[after]=0 - last?: string //default: /api/v2/ui/hashlists?page[size]=25&page[before]=500 - next?: string //default: /api/v2/ui/hashlists?page[size]=25&page[after]=25 - previous?: string //default: /api/v2/ui/hashlists?page[size]=25&page[before]=25 - } - id?: integer - type?: string //default: Hashlist - data: { - name?: string - format?: enum[0, 1, 2, 3] - hashTypeId?: integer - hashCount?: integer - separator?: string - cracked?: integer - isSecret?: boolean - isHexSalt?: boolean - isSalted?: boolean - accessGroupId?: integer - notes?: string - useBrain?: boolean - brainFeatures?: integer - isArchived?: boolean - } - relationships: { - } - included: { - }[] -} -``` - -- 400 Invalid request - -`application/json` - -```ts -{ - title?: string - type?: string - status?: integer -} -``` - -- 401 Authentication failed - -`application/json` - -```ts -{ - title?: string - type?: string - status?: integer -} -``` - -- 404 Not Found - -`application/json` - -```ts -{ - message?: string - exception: { - type?: string - code?: integer - message?: string - file?: string - line?: integer - } -} -``` - -*** - -### [PATCH]/api/v2/ui/hashlists/{id:[0-9]+}/relationships/{relation:tasks} - -- Security -bearerAuth - -#### RequestBody - -- application/json - -```ts -{ - data: { - type?: string - attributes: { - accessGroupId?: integer - isArchived?: boolean - isSecret?: boolean - name?: string - notes?: string - } - } -} -``` - -#### Responses - -- 200 successful operation - -`application/json` - -```ts -{ - jsonapi: { - version?: string //default: 1.1 - ext?: string //default: https://jsonapi.org/profiles/ethanresnick/cursor-pagination - } - id?: integer - type?: string //default: Hashlist - data: { - name?: string - format?: enum[0, 1, 2, 3] - hashTypeId?: integer - hashCount?: integer - separator?: string - cracked?: integer - isSecret?: boolean - isHexSalt?: boolean - isSalted?: boolean - accessGroupId?: integer - notes?: string - useBrain?: boolean - brainFeatures?: integer - isArchived?: boolean - } -} -``` - -- 400 Invalid request - -`application/json` - -```ts -{ - title?: string - type?: string - status?: integer -} -``` - -- 401 Authentication failed - -`application/json` - -```ts -{ - title?: string - type?: string - status?: integer -} -``` - -- 404 Not Found - -`application/json` - -```ts -{ - message?: string - exception: { - type?: string - code?: integer - message?: string - file?: string - line?: integer - } -} -``` - -*** - -### [POST]/api/v2/ui/hashlists/{id:[0-9]+}/relationships/{relation:tasks} - -- Security -bearerAuth - -#### RequestBody - -- application/json - -#### Responses - -- 204 successfully created - -- 400 Invalid request - -`application/json` - -```ts -{ - title?: string - type?: string - status?: integer -} -``` - -- 401 Authentication failed - -`application/json` - -```ts -{ - title?: string - type?: string - status?: integer -} -``` - -- 404 Not Found - -`application/json` - -```ts -{ - message?: string - exception: { - type?: string - code?: integer - message?: string - file?: string - line?: integer - } -} -``` - -*** - -### [DELETE]/api/v2/ui/hashlists/{id:[0-9]+}/relationships/{relation:tasks} - -- Security -bearerAuth - -#### RequestBody - -- application/json - -#### Responses - -- 204 successfully deleted - -- 400 Invalid request - -`application/json` - -```ts -{ - title?: string - type?: string - status?: integer -} -``` - -- 401 Authentication failed - -`application/json` - -```ts -{ - title?: string - type?: string - status?: integer -} -``` - -- 404 Not Found - -`application/json` - -```ts -{ - message?: string - exception: { - type?: string - code?: integer - message?: string - file?: string - line?: integer - } -} -``` - -*** - -### [GET]/api/v2/ui/hashlists/{id:[0-9]+} - -- Description -GET request to retrieve a single object. - -- Security -bearerAuth - -#### Parameters(Query) - -```ts -include?: string -``` - -#### Responses - -- 200 successful operation - -`application/json` - -```ts -{ - jsonapi: { - version?: string //default: 1.1 - ext?: string //default: https://jsonapi.org/profiles/ethanresnick/cursor-pagination - } - links: { - self?: string //default: /api/v2/ui/hashlists?page[size]=25 - first?: string //default: /api/v2/ui/hashlists?page[size]=25&page[after]=0 - last?: string //default: /api/v2/ui/hashlists?page[size]=25&page[before]=500 - next?: string //default: /api/v2/ui/hashlists?page[size]=25&page[after]=25 - previous?: string //default: /api/v2/ui/hashlists?page[size]=25&page[before]=25 - } - id?: integer - type?: string //default: Hashlist - data: { - name?: string - format?: enum[0, 1, 2, 3] - hashTypeId?: integer - hashCount?: integer - separator?: string - cracked?: integer - isSecret?: boolean - isHexSalt?: boolean - isSalted?: boolean - accessGroupId?: integer - notes?: string - useBrain?: boolean - brainFeatures?: integer - isArchived?: boolean - } - relationships: { - } - included: { - }[] -} -``` - -- 400 Invalid request - -`application/json` - -```ts -{ - title?: string - type?: string - status?: integer -} -``` - -- 401 Authentication failed - -`application/json` - -```ts -{ - title?: string - type?: string - status?: integer -} -``` - -- 404 Not Found - -`application/json` - -```ts -{ - message?: string - exception: { - type?: string - code?: integer - message?: string - file?: string - line?: integer - } -} -``` - -*** - -### [PATCH]/api/v2/ui/hashlists/{id:[0-9]+} - -- Description -PATCH request to update attributes of a single object. - -- Security -bearerAuth - -#### RequestBody - -- application/json - -```ts -{ - data: { - type?: string - attributes: { - accessGroupId?: integer - isArchived?: boolean - isSecret?: boolean - name?: string - notes?: string - } - } -} -``` - -#### Responses - -- 200 successful operation - -`application/json` - -```ts -{ - jsonapi: { - version?: string //default: 1.1 - ext?: string //default: https://jsonapi.org/profiles/ethanresnick/cursor-pagination - } - id?: integer - type?: string //default: Hashlist - data: { - name?: string - format?: enum[0, 1, 2, 3] - hashTypeId?: integer - hashCount?: integer - separator?: string - cracked?: integer - isSecret?: boolean - isHexSalt?: boolean - isSalted?: boolean - accessGroupId?: integer - notes?: string - useBrain?: boolean - brainFeatures?: integer - isArchived?: boolean - } -} -``` - -- 400 Invalid request - -`application/json` - -```ts -{ - title?: string - type?: string - status?: integer -} -``` - -- 401 Authentication failed - -`application/json` - -```ts -{ - title?: string - type?: string - status?: integer -} -``` - -- 404 Not Found - -`application/json` - -```ts -{ - message?: string - exception: { - type?: string - code?: integer - message?: string - file?: string - line?: integer - } -} -``` - -*** - -### [DELETE]/api/v2/ui/hashlists/{id:[0-9]+} - -- Security -bearerAuth - -#### RequestBody - -- application/json - -#### Responses - -- 204 successfully deleted - -- 400 Invalid request - -`application/json` - -```ts -{ - title?: string - type?: string - status?: integer -} -``` - -- 401 Authentication failed - -`application/json` - -```ts -{ - title?: string - type?: string - status?: integer -} -``` - -- 404 Not Found - -`application/json` - -```ts -{ - message?: string - exception: { - type?: string - code?: integer - message?: string - file?: string - line?: integer - } -} -``` - -*** - -### [GET]/api/v2/ui/hashtypes - -- Description -GET many request to retrieve multiple objects. - -- Security -bearerAuth - -#### Parameters(Query) - -```ts -page[after]?: integer -``` - -```ts -page[before]?: integer -``` - -```ts -page[size]?: integer -``` - -```ts -filter: { -} -``` - -```ts -include?: string -``` - -#### Responses - -- 200 successful operation - -`application/json` - -```ts -{ - jsonapi: { - version?: string //default: 1.1 - ext?: string //default: https://jsonapi.org/profiles/ethanresnick/cursor-pagination - } - links: { - self?: string //default: /api/v2/ui/hashtypes?page[size]=25 - first?: string //default: /api/v2/ui/hashtypes?page[size]=25&page[after]=0 - last?: string //default: /api/v2/ui/hashtypes?page[size]=25&page[before]=500 - next?: string //default: /api/v2/ui/hashtypes?page[size]=25&page[after]=25 - previous?: string //default: /api/v2/ui/hashtypes?page[size]=25&page[before]=25 - } - id?: integer - type?: string //default: HashType - data: { - description?: string - isSalted?: boolean - isSlowHash?: boolean - } - relationships: { - } - included: { - }[] -}[] -``` - -- 400 Invalid request - -`application/json` - -```ts -{ - title?: string - type?: string - status?: integer -} -``` - -- 401 Authentication failed - -`application/json` - -```ts -{ - title?: string - type?: string - status?: integer -} -``` - -*** - -### [POST]/api/v2/ui/hashtypes - -- Description -POST request to create a new object. The request must contain the resource record as data with the attributes of the new object.To add relationships, a relationships object can be added with the resource records of the relations that are part of this object. - -- Security -bearerAuth - -#### RequestBody - -- application/json - -```ts -{ - data: { - type?: string - attributes: { - description?: string - isSalted?: boolean - isSlowHash?: boolean - } - } -} -``` - -#### Responses - -- 201 successful operation - -`application/json` - -```ts -{ - jsonapi: { - version?: string //default: 1.1 - ext?: string //default: https://jsonapi.org/profiles/ethanresnick/cursor-pagination - } - id?: integer - type?: string //default: HashType - data: { - description?: string - isSalted?: boolean - isSlowHash?: boolean - } -} -``` - -- 400 Invalid request - -`application/json` - -```ts -{ - title?: string - type?: string - status?: integer -} -``` - -- 401 Authentication failed - -`application/json` - -```ts -{ - title?: string - type?: string - status?: integer -} -``` - -*** - -### [GET]/api/v2/ui/hashtypes/count - -- Description -GET many request to retrieve multiple objects. - -- Security -bearerAuth - -#### Parameters(Query) - -```ts -page[after]?: integer -``` - -```ts -page[before]?: integer -``` - -```ts -page[size]?: integer -``` - -```ts -filter: { -} -``` - -```ts -include?: string -``` - -#### Responses - -- 200 successful operation - -`application/json` - -```ts -{ - jsonapi: { - version?: string //default: 1.1 - ext?: string //default: https://jsonapi.org/profiles/ethanresnick/cursor-pagination - } - links: { - self?: string //default: /api/v2/ui/hashtypes?page[size]=25 - first?: string //default: /api/v2/ui/hashtypes?page[size]=25&page[after]=0 - last?: string //default: /api/v2/ui/hashtypes?page[size]=25&page[before]=500 - next?: string //default: /api/v2/ui/hashtypes?page[size]=25&page[after]=25 - previous?: string //default: /api/v2/ui/hashtypes?page[size]=25&page[before]=25 - } - id?: integer - type?: string //default: HashType - data: { - description?: string - isSalted?: boolean - isSlowHash?: boolean - } - relationships: { - } - included: { - }[] -}[] -``` - -- 400 Invalid request - -`application/json` - -```ts -{ - title?: string - type?: string - status?: integer -} -``` - -- 401 Authentication failed - -`application/json` - -```ts -{ - title?: string - type?: string - status?: integer -} -``` - -*** - -### [GET]/api/v2/ui/hashtypes/{id:[0-9]+} - -- Description -GET request to retrieve a single object. - -- Security -bearerAuth - -#### Parameters(Query) - -```ts -include?: string -``` - -#### Responses - -- 200 successful operation - -`application/json` - -```ts -{ - jsonapi: { - version?: string //default: 1.1 - ext?: string //default: https://jsonapi.org/profiles/ethanresnick/cursor-pagination - } - links: { - self?: string //default: /api/v2/ui/hashtypes?page[size]=25 - first?: string //default: /api/v2/ui/hashtypes?page[size]=25&page[after]=0 - last?: string //default: /api/v2/ui/hashtypes?page[size]=25&page[before]=500 - next?: string //default: /api/v2/ui/hashtypes?page[size]=25&page[after]=25 - previous?: string //default: /api/v2/ui/hashtypes?page[size]=25&page[before]=25 - } - id?: integer - type?: string //default: HashType - data: { - description?: string - isSalted?: boolean - isSlowHash?: boolean - } - relationships: { - } - included: { - }[] -} -``` - -- 400 Invalid request - -`application/json` - -```ts -{ - title?: string - type?: string - status?: integer -} -``` - -- 401 Authentication failed - -`application/json` - -```ts -{ - title?: string - type?: string - status?: integer -} -``` - -- 404 Not Found - -`application/json` - -```ts -{ - message?: string - exception: { - type?: string - code?: integer - message?: string - file?: string - line?: integer - } -} -``` - -*** - -### [PATCH]/api/v2/ui/hashtypes/{id:[0-9]+} - -- Description -PATCH request to update attributes of a single object. - -- Security -bearerAuth - -#### RequestBody - -- application/json - -```ts -{ - data: { - type?: string - attributes: { - description?: string - isSalted?: boolean - isSlowHash?: boolean - } - } -} -``` - -#### Responses - -- 200 successful operation - -`application/json` - -```ts -{ - jsonapi: { - version?: string //default: 1.1 - ext?: string //default: https://jsonapi.org/profiles/ethanresnick/cursor-pagination - } - id?: integer - type?: string //default: HashType - data: { - description?: string - isSalted?: boolean - isSlowHash?: boolean - } -} -``` - -- 400 Invalid request - -`application/json` - -```ts -{ - title?: string - type?: string - status?: integer -} -``` - -- 401 Authentication failed - -`application/json` - -```ts -{ - title?: string - type?: string - status?: integer -} -``` - -- 404 Not Found - -`application/json` - -```ts -{ - message?: string - exception: { - type?: string - code?: integer - message?: string - file?: string - line?: integer - } -} -``` - -*** - -### [DELETE]/api/v2/ui/hashtypes/{id:[0-9]+} - -- Security -bearerAuth - -#### RequestBody - -- application/json - -#### Responses - -- 204 successfully deleted - -- 400 Invalid request - -`application/json` - -```ts -{ - title?: string - type?: string - status?: integer -} -``` - -- 401 Authentication failed - -`application/json` - -```ts -{ - title?: string - type?: string - status?: integer -} -``` - -- 404 Not Found - -`application/json` - -```ts -{ - message?: string - exception: { - type?: string - code?: integer - message?: string - file?: string - line?: integer - } -} -``` - -*** - -### [GET]/api/v2/ui/healthcheckagents - -- Description -GET many request to retrieve multiple objects. - -- Security -bearerAuth - -#### Parameters(Query) - -```ts -page[after]?: integer -``` - -```ts -page[before]?: integer -``` - -```ts -page[size]?: integer -``` - -```ts -filter: { -} -``` - -```ts -include?: string -``` - -#### Responses - -- 200 successful operation - -`application/json` - -```ts -{ - jsonapi: { - version?: string //default: 1.1 - ext?: string //default: https://jsonapi.org/profiles/ethanresnick/cursor-pagination - } - links: { - self?: string //default: /api/v2/ui/healthcheckagents?page[size]=25 - first?: string //default: /api/v2/ui/healthcheckagents?page[size]=25&page[after]=0 - last?: string //default: /api/v2/ui/healthcheckagents?page[size]=25&page[before]=500 - next?: string //default: /api/v2/ui/healthcheckagents?page[size]=25&page[after]=25 - previous?: string //default: /api/v2/ui/healthcheckagents?page[size]=25&page[before]=25 - } - id?: integer - type?: string //default: HealthCheckAgent - data: { - healthCheckId?: integer - agentId?: integer - status?: integer - cracked?: integer - numGpus?: integer - start?: integer - end?: integer - errors?: string - } - relationships: { - } - included: { - }[] -}[] -``` - -- 400 Invalid request - -`application/json` - -```ts -{ - title?: string - type?: string - status?: integer -} -``` - -- 401 Authentication failed - -`application/json` - -```ts -{ - title?: string - type?: string - status?: integer -} -``` - -*** - -### [GET]/api/v2/ui/healthcheckagents/count - -- Description -GET many request to retrieve multiple objects. - -- Security -bearerAuth - -#### Parameters(Query) - -```ts -page[after]?: integer -``` - -```ts -page[before]?: integer -``` - -```ts -page[size]?: integer -``` - -```ts -filter: { -} -``` - -```ts -include?: string -``` - -#### Responses - -- 200 successful operation - -`application/json` - -```ts -{ - jsonapi: { - version?: string //default: 1.1 - ext?: string //default: https://jsonapi.org/profiles/ethanresnick/cursor-pagination - } - links: { - self?: string //default: /api/v2/ui/healthcheckagents?page[size]=25 - first?: string //default: /api/v2/ui/healthcheckagents?page[size]=25&page[after]=0 - last?: string //default: /api/v2/ui/healthcheckagents?page[size]=25&page[before]=500 - next?: string //default: /api/v2/ui/healthcheckagents?page[size]=25&page[after]=25 - previous?: string //default: /api/v2/ui/healthcheckagents?page[size]=25&page[before]=25 - } - id?: integer - type?: string //default: HealthCheckAgent - data: { - healthCheckId?: integer - agentId?: integer - status?: integer - cracked?: integer - numGpus?: integer - start?: integer - end?: integer - errors?: string - } - relationships: { - } - included: { - }[] -}[] -``` - -- 400 Invalid request - -`application/json` - -```ts -{ - title?: string - type?: string - status?: integer -} -``` - -- 401 Authentication failed - -`application/json` - -```ts -{ - title?: string - type?: string - status?: integer -} -``` - -*** - -### [GET]/api/v2/ui/healthcheckagents/{id:[0-9]+}/{relation:agent} - -- Description -GET request for for a to-one relationship link. Returns the resource record of the object that is part of the specified relation. - -- Security -bearerAuth - -#### Parameters(Query) - -```ts -include?: string -``` - -#### Responses - -- 200 successful operation - -`application/json` - -```ts -{ - jsonapi: { - version?: string //default: 1.1 - ext?: string //default: https://jsonapi.org/profiles/ethanresnick/cursor-pagination - } - links: { - self?: string //default: /api/v2/ui/healthcheckagents?page[size]=25 - first?: string //default: /api/v2/ui/healthcheckagents?page[size]=25&page[after]=0 - last?: string //default: /api/v2/ui/healthcheckagents?page[size]=25&page[before]=500 - next?: string //default: /api/v2/ui/healthcheckagents?page[size]=25&page[after]=25 - previous?: string //default: /api/v2/ui/healthcheckagents?page[size]=25&page[before]=25 - } - id?: integer - type?: string //default: HealthCheckAgent - data: { - healthCheckId?: integer - agentId?: integer - status?: integer - cracked?: integer - numGpus?: integer - start?: integer - end?: integer - errors?: string - } - relationships: { - } - included: { - }[] -} -``` - -- 400 Invalid request - -`application/json` - -```ts -{ - title?: string - type?: string - status?: integer -} -``` - -- 401 Authentication failed - -`application/json` - -```ts -{ - title?: string - type?: string - status?: integer -} -``` - -- 404 Not Found - -`application/json` - -```ts -{ - message?: string - exception: { - type?: string - code?: integer - message?: string - file?: string - line?: integer - } -} -``` - -*** - -### [GET]/api/v2/ui/healthcheckagents/{id:[0-9]+}/relationships/{relation:agent} - -- Description -GET request for for a to-one relationship link. Returns the resource record of the object that is part of the specified relation. - -- Security -bearerAuth - -#### Parameters(Query) - -```ts -include?: string -``` - -#### Responses - -- 200 successful operation - -`application/json` - -```ts -{ - jsonapi: { - version?: string //default: 1.1 - ext?: string //default: https://jsonapi.org/profiles/ethanresnick/cursor-pagination - } - links: { - self?: string //default: /api/v2/ui/healthcheckagents?page[size]=25 - first?: string //default: /api/v2/ui/healthcheckagents?page[size]=25&page[after]=0 - last?: string //default: /api/v2/ui/healthcheckagents?page[size]=25&page[before]=500 - next?: string //default: /api/v2/ui/healthcheckagents?page[size]=25&page[after]=25 - previous?: string //default: /api/v2/ui/healthcheckagents?page[size]=25&page[before]=25 - } - id?: integer - type?: string //default: HealthCheckAgent - data: { - healthCheckId?: integer - agentId?: integer - status?: integer - cracked?: integer - numGpus?: integer - start?: integer - end?: integer - errors?: string - } - relationships: { - } - included: { - }[] -} -``` - -- 400 Invalid request - -`application/json` - -```ts -{ - title?: string - type?: string - status?: integer -} -``` - -- 401 Authentication failed - -`application/json` - -```ts -{ - title?: string - type?: string - status?: integer -} -``` - -- 404 Not Found - -`application/json` - -```ts -{ - message?: string - exception: { - type?: string - code?: integer - message?: string - file?: string - line?: integer - } -} -``` - -*** - -### [PATCH]/api/v2/ui/healthcheckagents/{id:[0-9]+}/relationships/{relation:agent} - -- Security -bearerAuth - -#### RequestBody - -- application/json - -```ts -{ - data: { - type?: string - attributes: { - } - } -} -``` - -#### Responses - -- 200 successful operation - -`application/json` - -```ts -{ - jsonapi: { - version?: string //default: 1.1 - ext?: string //default: https://jsonapi.org/profiles/ethanresnick/cursor-pagination - } - id?: integer - type?: string //default: HealthCheckAgent - data: { - healthCheckId?: integer - agentId?: integer - status?: integer - cracked?: integer - numGpus?: integer - start?: integer - end?: integer - errors?: string - } -} -``` - -- 400 Invalid request - -`application/json` - -```ts -{ - title?: string - type?: string - status?: integer -} -``` - -- 401 Authentication failed - -`application/json` - -```ts -{ - title?: string - type?: string - status?: integer -} -``` - -- 404 Not Found - -`application/json` - -```ts -{ - message?: string - exception: { - type?: string - code?: integer - message?: string - file?: string - line?: integer - } -} -``` - -*** - -### [GET]/api/v2/ui/healthcheckagents/{id:[0-9]+}/{relation:healthCheck} - -- Description -GET request for for a to-one relationship link. Returns the resource record of the object that is part of the specified relation. - -- Security -bearerAuth - -#### Parameters(Query) - -```ts -include?: string -``` - -#### Responses - -- 200 successful operation - -`application/json` - -```ts -{ - jsonapi: { - version?: string //default: 1.1 - ext?: string //default: https://jsonapi.org/profiles/ethanresnick/cursor-pagination - } - links: { - self?: string //default: /api/v2/ui/healthcheckagents?page[size]=25 - first?: string //default: /api/v2/ui/healthcheckagents?page[size]=25&page[after]=0 - last?: string //default: /api/v2/ui/healthcheckagents?page[size]=25&page[before]=500 - next?: string //default: /api/v2/ui/healthcheckagents?page[size]=25&page[after]=25 - previous?: string //default: /api/v2/ui/healthcheckagents?page[size]=25&page[before]=25 - } - id?: integer - type?: string //default: HealthCheckAgent - data: { - healthCheckId?: integer - agentId?: integer - status?: integer - cracked?: integer - numGpus?: integer - start?: integer - end?: integer - errors?: string - } - relationships: { - } - included: { - }[] -} -``` - -- 400 Invalid request - -`application/json` - -```ts -{ - title?: string - type?: string - status?: integer -} -``` - -- 401 Authentication failed - -`application/json` - -```ts -{ - title?: string - type?: string - status?: integer -} -``` - -- 404 Not Found - -`application/json` - -```ts -{ - message?: string - exception: { - type?: string - code?: integer - message?: string - file?: string - line?: integer - } -} -``` - -*** - -### [GET]/api/v2/ui/healthcheckagents/{id:[0-9]+}/relationships/{relation:healthCheck} - -- Description -GET request for for a to-one relationship link. Returns the resource record of the object that is part of the specified relation. - -- Security -bearerAuth - -#### Parameters(Query) - -```ts -include?: string -``` - -#### Responses - -- 200 successful operation - -`application/json` - -```ts -{ - jsonapi: { - version?: string //default: 1.1 - ext?: string //default: https://jsonapi.org/profiles/ethanresnick/cursor-pagination - } - links: { - self?: string //default: /api/v2/ui/healthcheckagents?page[size]=25 - first?: string //default: /api/v2/ui/healthcheckagents?page[size]=25&page[after]=0 - last?: string //default: /api/v2/ui/healthcheckagents?page[size]=25&page[before]=500 - next?: string //default: /api/v2/ui/healthcheckagents?page[size]=25&page[after]=25 - previous?: string //default: /api/v2/ui/healthcheckagents?page[size]=25&page[before]=25 - } - id?: integer - type?: string //default: HealthCheckAgent - data: { - healthCheckId?: integer - agentId?: integer - status?: integer - cracked?: integer - numGpus?: integer - start?: integer - end?: integer - errors?: string - } - relationships: { - } - included: { - }[] -} -``` - -- 400 Invalid request - -`application/json` - -```ts -{ - title?: string - type?: string - status?: integer -} -``` - -- 401 Authentication failed - -`application/json` - -```ts -{ - title?: string - type?: string - status?: integer -} -``` - -- 404 Not Found - -`application/json` - -```ts -{ - message?: string - exception: { - type?: string - code?: integer - message?: string - file?: string - line?: integer - } -} -``` - -*** - -### [PATCH]/api/v2/ui/healthcheckagents/{id:[0-9]+}/relationships/{relation:healthCheck} - -- Security -bearerAuth - -#### RequestBody - -- application/json - -```ts -{ - data: { - type?: string - attributes: { - } - } -} -``` - -#### Responses - -- 200 successful operation - -`application/json` - -```ts -{ - jsonapi: { - version?: string //default: 1.1 - ext?: string //default: https://jsonapi.org/profiles/ethanresnick/cursor-pagination - } - id?: integer - type?: string //default: HealthCheckAgent - data: { - healthCheckId?: integer - agentId?: integer - status?: integer - cracked?: integer - numGpus?: integer - start?: integer - end?: integer - errors?: string - } -} -``` - -- 400 Invalid request - -`application/json` - -```ts -{ - title?: string - type?: string - status?: integer -} -``` - -- 401 Authentication failed - -`application/json` - -```ts -{ - title?: string - type?: string - status?: integer -} -``` - -- 404 Not Found - -`application/json` - -```ts -{ - message?: string - exception: { - type?: string - code?: integer - message?: string - file?: string - line?: integer - } -} -``` - -*** - -### [GET]/api/v2/ui/healthcheckagents/{id:[0-9]+} - -- Description -GET request to retrieve a single object. - -- Security -bearerAuth - -#### Parameters(Query) - -```ts -include?: string -``` - -#### Responses - -- 200 successful operation - -`application/json` - -```ts -{ - jsonapi: { - version?: string //default: 1.1 - ext?: string //default: https://jsonapi.org/profiles/ethanresnick/cursor-pagination - } - links: { - self?: string //default: /api/v2/ui/healthcheckagents?page[size]=25 - first?: string //default: /api/v2/ui/healthcheckagents?page[size]=25&page[after]=0 - last?: string //default: /api/v2/ui/healthcheckagents?page[size]=25&page[before]=500 - next?: string //default: /api/v2/ui/healthcheckagents?page[size]=25&page[after]=25 - previous?: string //default: /api/v2/ui/healthcheckagents?page[size]=25&page[before]=25 - } - id?: integer - type?: string //default: HealthCheckAgent - data: { - healthCheckId?: integer - agentId?: integer - status?: integer - cracked?: integer - numGpus?: integer - start?: integer - end?: integer - errors?: string - } - relationships: { - } - included: { - }[] -} -``` - -- 400 Invalid request - -`application/json` - -```ts -{ - title?: string - type?: string - status?: integer -} -``` - -- 401 Authentication failed - -`application/json` - -```ts -{ - title?: string - type?: string - status?: integer -} -``` - -- 404 Not Found - -`application/json` - -```ts -{ - message?: string - exception: { - type?: string - code?: integer - message?: string - file?: string - line?: integer - } -} -``` - -*** - -### [GET]/api/v2/ui/healthchecks - -- Description -GET many request to retrieve multiple objects. - -- Security -bearerAuth - -#### Parameters(Query) - -```ts -page[after]?: integer -``` - -```ts -page[before]?: integer -``` - -```ts -page[size]?: integer -``` - -```ts -filter: { -} -``` - -```ts -include?: string -``` - -#### Responses - -- 200 successful operation - -`application/json` - -```ts -{ - jsonapi: { - version?: string //default: 1.1 - ext?: string //default: https://jsonapi.org/profiles/ethanresnick/cursor-pagination - } - links: { - self?: string //default: /api/v2/ui/healthchecks?page[size]=25 - first?: string //default: /api/v2/ui/healthchecks?page[size]=25&page[after]=0 - last?: string //default: /api/v2/ui/healthchecks?page[size]=25&page[before]=500 - next?: string //default: /api/v2/ui/healthchecks?page[size]=25&page[after]=25 - previous?: string //default: /api/v2/ui/healthchecks?page[size]=25&page[before]=25 - } - id?: integer - type?: string //default: HealthCheck - data: { - time?: integer - status?: integer - checkType?: integer - hashtypeId?: integer - crackerBinaryId?: integer - expectedCracks?: integer - attackCmd?: string - } - relationships: { - } - included: { - }[] -}[] -``` - -- 400 Invalid request - -`application/json` - -```ts -{ - title?: string - type?: string - status?: integer -} -``` - -- 401 Authentication failed - -`application/json` - -```ts -{ - title?: string - type?: string - status?: integer -} -``` - -*** - -### [POST]/api/v2/ui/healthchecks - -- Description -POST request to create a new object. The request must contain the resource record as data with the attributes of the new object.To add relationships, a relationships object can be added with the resource records of the relations that are part of this object. - -- Security -bearerAuth - -#### RequestBody - -- application/json - -```ts -{ - data: { - type?: string - attributes: { - time?: integer - status?: integer - checkType?: integer - hashtypeId?: integer - crackerBinaryId?: integer - expectedCracks?: integer - attackCmd?: string - } - } -} -``` - -#### Responses - -- 201 successful operation - -`application/json` - -```ts -{ - jsonapi: { - version?: string //default: 1.1 - ext?: string //default: https://jsonapi.org/profiles/ethanresnick/cursor-pagination - } - id?: integer - type?: string //default: HealthCheck - data: { - time?: integer - status?: integer - checkType?: integer - hashtypeId?: integer - crackerBinaryId?: integer - expectedCracks?: integer - attackCmd?: string - } -} -``` - -- 400 Invalid request - -`application/json` - -```ts -{ - title?: string - type?: string - status?: integer -} -``` - -- 401 Authentication failed - -`application/json` - -```ts -{ - title?: string - type?: string - status?: integer -} -``` - -*** - -### [GET]/api/v2/ui/healthchecks/count - -- Description -GET many request to retrieve multiple objects. - -- Security -bearerAuth - -#### Parameters(Query) - -```ts -page[after]?: integer -``` - -```ts -page[before]?: integer -``` - -```ts -page[size]?: integer -``` - -```ts -filter: { -} -``` - -```ts -include?: string -``` - -#### Responses - -- 200 successful operation - -`application/json` - -```ts -{ - jsonapi: { - version?: string //default: 1.1 - ext?: string //default: https://jsonapi.org/profiles/ethanresnick/cursor-pagination - } - links: { - self?: string //default: /api/v2/ui/healthchecks?page[size]=25 - first?: string //default: /api/v2/ui/healthchecks?page[size]=25&page[after]=0 - last?: string //default: /api/v2/ui/healthchecks?page[size]=25&page[before]=500 - next?: string //default: /api/v2/ui/healthchecks?page[size]=25&page[after]=25 - previous?: string //default: /api/v2/ui/healthchecks?page[size]=25&page[before]=25 - } - id?: integer - type?: string //default: HealthCheck - data: { - time?: integer - status?: integer - checkType?: integer - hashtypeId?: integer - crackerBinaryId?: integer - expectedCracks?: integer - attackCmd?: string - } - relationships: { - } - included: { - }[] -}[] -``` - -- 400 Invalid request - -`application/json` - -```ts -{ - title?: string - type?: string - status?: integer -} -``` - -- 401 Authentication failed - -`application/json` - -```ts -{ - title?: string - type?: string - status?: integer -} -``` - -*** - -### [GET]/api/v2/ui/healthchecks/{id:[0-9]+}/{relation:crackerBinary} - -- Description -GET request for for a to-one relationship link. Returns the resource record of the object that is part of the specified relation. - -- Security -bearerAuth - -#### Parameters(Query) - -```ts -include?: string -``` - -#### Responses - -- 200 successful operation - -`application/json` - -```ts -{ - jsonapi: { - version?: string //default: 1.1 - ext?: string //default: https://jsonapi.org/profiles/ethanresnick/cursor-pagination - } - links: { - self?: string //default: /api/v2/ui/healthchecks?page[size]=25 - first?: string //default: /api/v2/ui/healthchecks?page[size]=25&page[after]=0 - last?: string //default: /api/v2/ui/healthchecks?page[size]=25&page[before]=500 - next?: string //default: /api/v2/ui/healthchecks?page[size]=25&page[after]=25 - previous?: string //default: /api/v2/ui/healthchecks?page[size]=25&page[before]=25 - } - id?: integer - type?: string //default: HealthCheck - data: { - time?: integer - status?: integer - checkType?: integer - hashtypeId?: integer - crackerBinaryId?: integer - expectedCracks?: integer - attackCmd?: string - } - relationships: { - } - included: { - }[] -} -``` - -- 400 Invalid request - -`application/json` - -```ts -{ - title?: string - type?: string - status?: integer -} -``` - -- 401 Authentication failed - -`application/json` - -```ts -{ - title?: string - type?: string - status?: integer -} -``` - -- 404 Not Found - -`application/json` - -```ts -{ - message?: string - exception: { - type?: string - code?: integer - message?: string - file?: string - line?: integer - } -} -``` - -*** - -### [GET]/api/v2/ui/healthchecks/{id:[0-9]+}/relationships/{relation:crackerBinary} - -- Description -GET request for for a to-one relationship link. Returns the resource record of the object that is part of the specified relation. - -- Security -bearerAuth - -#### Parameters(Query) - -```ts -include?: string -``` - -#### Responses - -- 200 successful operation - -`application/json` - -```ts -{ - jsonapi: { - version?: string //default: 1.1 - ext?: string //default: https://jsonapi.org/profiles/ethanresnick/cursor-pagination - } - links: { - self?: string //default: /api/v2/ui/healthchecks?page[size]=25 - first?: string //default: /api/v2/ui/healthchecks?page[size]=25&page[after]=0 - last?: string //default: /api/v2/ui/healthchecks?page[size]=25&page[before]=500 - next?: string //default: /api/v2/ui/healthchecks?page[size]=25&page[after]=25 - previous?: string //default: /api/v2/ui/healthchecks?page[size]=25&page[before]=25 - } - id?: integer - type?: string //default: HealthCheck - data: { - time?: integer - status?: integer - checkType?: integer - hashtypeId?: integer - crackerBinaryId?: integer - expectedCracks?: integer - attackCmd?: string - } - relationships: { - } - included: { - }[] -} -``` - -- 400 Invalid request - -`application/json` - -```ts -{ - title?: string - type?: string - status?: integer -} -``` - -- 401 Authentication failed - -`application/json` - -```ts -{ - title?: string - type?: string - status?: integer -} -``` - -- 404 Not Found - -`application/json` - -```ts -{ - message?: string - exception: { - type?: string - code?: integer - message?: string - file?: string - line?: integer - } -} -``` - -*** - -### [PATCH]/api/v2/ui/healthchecks/{id:[0-9]+}/relationships/{relation:crackerBinary} - -- Security -bearerAuth - -#### RequestBody - -- application/json - -```ts -{ - data: { - type?: string - attributes: { - checkType?: integer - crackerBinaryId?: integer - hashtypeId?: integer - } - } -} -``` - -#### Responses - -- 200 successful operation - -`application/json` - -```ts -{ - jsonapi: { - version?: string //default: 1.1 - ext?: string //default: https://jsonapi.org/profiles/ethanresnick/cursor-pagination - } - id?: integer - type?: string //default: HealthCheck - data: { - time?: integer - status?: integer - checkType?: integer - hashtypeId?: integer - crackerBinaryId?: integer - expectedCracks?: integer - attackCmd?: string - } -} -``` - -- 400 Invalid request - -`application/json` - -```ts -{ - title?: string - type?: string - status?: integer -} -``` - -- 401 Authentication failed - -`application/json` - -```ts -{ - title?: string - type?: string - status?: integer -} -``` - -- 404 Not Found - -`application/json` - -```ts -{ - message?: string - exception: { - type?: string - code?: integer - message?: string - file?: string - line?: integer - } -} -``` - -*** - -### [GET]/api/v2/ui/healthchecks/{id:[0-9]+}/{relation:healthCheckAgents} - -- Description -GET request for for a to-one relationship link. Returns the resource record of the object that is part of the specified relation. - -- Security -bearerAuth - -#### Parameters(Query) - -```ts -include?: string -``` - -#### Responses - -- 200 successful operation - -`application/json` - -```ts -{ - jsonapi: { - version?: string //default: 1.1 - ext?: string //default: https://jsonapi.org/profiles/ethanresnick/cursor-pagination - } - links: { - self?: string //default: /api/v2/ui/healthchecks?page[size]=25 - first?: string //default: /api/v2/ui/healthchecks?page[size]=25&page[after]=0 - last?: string //default: /api/v2/ui/healthchecks?page[size]=25&page[before]=500 - next?: string //default: /api/v2/ui/healthchecks?page[size]=25&page[after]=25 - previous?: string //default: /api/v2/ui/healthchecks?page[size]=25&page[before]=25 - } - id?: integer - type?: string //default: HealthCheck - data: { - time?: integer - status?: integer - checkType?: integer - hashtypeId?: integer - crackerBinaryId?: integer - expectedCracks?: integer - attackCmd?: string - } - relationships: { - } - included: { - }[] -} -``` - -- 400 Invalid request - -`application/json` - -```ts -{ - title?: string - type?: string - status?: integer -} -``` - -- 401 Authentication failed - -`application/json` - -```ts -{ - title?: string - type?: string - status?: integer -} -``` - -- 404 Not Found - -`application/json` - -```ts -{ - message?: string - exception: { - type?: string - code?: integer - message?: string - file?: string - line?: integer - } -} -``` - -*** - -### [GET]/api/v2/ui/healthchecks/{id:[0-9]+}/relationships/{relation:healthCheckAgents} - -- Description -GET request for for a to-one relationship link. Returns the resource record of the object that is part of the specified relation. - -- Security -bearerAuth - -#### Parameters(Query) - -```ts -include?: string -``` - -#### Responses - -- 200 successful operation - -`application/json` - -```ts -{ - jsonapi: { - version?: string //default: 1.1 - ext?: string //default: https://jsonapi.org/profiles/ethanresnick/cursor-pagination - } - links: { - self?: string //default: /api/v2/ui/healthchecks?page[size]=25 - first?: string //default: /api/v2/ui/healthchecks?page[size]=25&page[after]=0 - last?: string //default: /api/v2/ui/healthchecks?page[size]=25&page[before]=500 - next?: string //default: /api/v2/ui/healthchecks?page[size]=25&page[after]=25 - previous?: string //default: /api/v2/ui/healthchecks?page[size]=25&page[before]=25 - } - id?: integer - type?: string //default: HealthCheck - data: { - time?: integer - status?: integer - checkType?: integer - hashtypeId?: integer - crackerBinaryId?: integer - expectedCracks?: integer - attackCmd?: string - } - relationships: { - } - included: { - }[] -} -``` - -- 400 Invalid request - -`application/json` - -```ts -{ - title?: string - type?: string - status?: integer -} -``` - -- 401 Authentication failed - -`application/json` - -```ts -{ - title?: string - type?: string - status?: integer -} -``` - -- 404 Not Found - -`application/json` - -```ts -{ - message?: string - exception: { - type?: string - code?: integer - message?: string - file?: string - line?: integer - } -} -``` - -*** - -### [PATCH]/api/v2/ui/healthchecks/{id:[0-9]+}/relationships/{relation:healthCheckAgents} - -- Security -bearerAuth - -#### RequestBody - -- application/json - -```ts -{ - data: { - type?: string - attributes: { - checkType?: integer - crackerBinaryId?: integer - hashtypeId?: integer - } - } -} -``` - -#### Responses - -- 200 successful operation - -`application/json` - -```ts -{ - jsonapi: { - version?: string //default: 1.1 - ext?: string //default: https://jsonapi.org/profiles/ethanresnick/cursor-pagination - } - id?: integer - type?: string //default: HealthCheck - data: { - time?: integer - status?: integer - checkType?: integer - hashtypeId?: integer - crackerBinaryId?: integer - expectedCracks?: integer - attackCmd?: string - } -} -``` - -- 400 Invalid request - -`application/json` - -```ts -{ - title?: string - type?: string - status?: integer -} -``` - -- 401 Authentication failed - -`application/json` - -```ts -{ - title?: string - type?: string - status?: integer -} -``` - -- 404 Not Found - -`application/json` - -```ts -{ - message?: string - exception: { - type?: string - code?: integer - message?: string - file?: string - line?: integer - } -} -``` - -*** - -### [POST]/api/v2/ui/healthchecks/{id:[0-9]+}/relationships/{relation:healthCheckAgents} - -- Security -bearerAuth - -#### RequestBody - -- application/json - -#### Responses - -- 204 successfully created - -- 400 Invalid request - -`application/json` - -```ts -{ - title?: string - type?: string - status?: integer -} -``` - -- 401 Authentication failed - -`application/json` - -```ts -{ - title?: string - type?: string - status?: integer -} -``` - -- 404 Not Found - -`application/json` - -```ts -{ - message?: string - exception: { - type?: string - code?: integer - message?: string - file?: string - line?: integer - } -} -``` - -*** - -### [DELETE]/api/v2/ui/healthchecks/{id:[0-9]+}/relationships/{relation:healthCheckAgents} - -- Security -bearerAuth - -#### RequestBody - -- application/json - -#### Responses - -- 204 successfully deleted - -- 400 Invalid request - -`application/json` - -```ts -{ - title?: string - type?: string - status?: integer -} -``` - -- 401 Authentication failed - -`application/json` - -```ts -{ - title?: string - type?: string - status?: integer -} -``` - -- 404 Not Found - -`application/json` - -```ts -{ - message?: string - exception: { - type?: string - code?: integer - message?: string - file?: string - line?: integer - } -} -``` - -*** - -### [GET]/api/v2/ui/healthchecks/{id:[0-9]+} - -- Description -GET request to retrieve a single object. - -- Security -bearerAuth - -#### Parameters(Query) - -```ts -include?: string -``` - -#### Responses - -- 200 successful operation - -`application/json` - -```ts -{ - jsonapi: { - version?: string //default: 1.1 - ext?: string //default: https://jsonapi.org/profiles/ethanresnick/cursor-pagination - } - links: { - self?: string //default: /api/v2/ui/healthchecks?page[size]=25 - first?: string //default: /api/v2/ui/healthchecks?page[size]=25&page[after]=0 - last?: string //default: /api/v2/ui/healthchecks?page[size]=25&page[before]=500 - next?: string //default: /api/v2/ui/healthchecks?page[size]=25&page[after]=25 - previous?: string //default: /api/v2/ui/healthchecks?page[size]=25&page[before]=25 - } - id?: integer - type?: string //default: HealthCheck - data: { - time?: integer - status?: integer - checkType?: integer - hashtypeId?: integer - crackerBinaryId?: integer - expectedCracks?: integer - attackCmd?: string - } - relationships: { - } - included: { - }[] -} -``` - -- 400 Invalid request - -`application/json` - -```ts -{ - title?: string - type?: string - status?: integer -} -``` - -- 401 Authentication failed - -`application/json` - -```ts -{ - title?: string - type?: string - status?: integer -} -``` - -- 404 Not Found - -`application/json` - -```ts -{ - message?: string - exception: { - type?: string - code?: integer - message?: string - file?: string - line?: integer - } -} -``` - -*** - -### [PATCH]/api/v2/ui/healthchecks/{id:[0-9]+} - -- Description -PATCH request to update attributes of a single object. - -- Security -bearerAuth - -#### RequestBody - -- application/json - -```ts -{ - data: { - type?: string - attributes: { - checkType?: integer - crackerBinaryId?: integer - hashtypeId?: integer - } - } -} -``` - -#### Responses - -- 200 successful operation - -`application/json` - -```ts -{ - jsonapi: { - version?: string //default: 1.1 - ext?: string //default: https://jsonapi.org/profiles/ethanresnick/cursor-pagination - } - id?: integer - type?: string //default: HealthCheck - data: { - time?: integer - status?: integer - checkType?: integer - hashtypeId?: integer - crackerBinaryId?: integer - expectedCracks?: integer - attackCmd?: string - } -} -``` - -- 400 Invalid request - -`application/json` - -```ts -{ - title?: string - type?: string - status?: integer -} -``` - -- 401 Authentication failed - -`application/json` - -```ts -{ - title?: string - type?: string - status?: integer -} -``` - -- 404 Not Found - -`application/json` - -```ts -{ - message?: string - exception: { - type?: string - code?: integer - message?: string - file?: string - line?: integer - } -} -``` - -*** - -### [DELETE]/api/v2/ui/healthchecks/{id:[0-9]+} - -- Security -bearerAuth - -#### RequestBody - -- application/json - -#### Responses - -- 204 successfully deleted - -- 400 Invalid request - -`application/json` - -```ts -{ - title?: string - type?: string - status?: integer -} -``` - -- 401 Authentication failed - -`application/json` - -```ts -{ - title?: string - type?: string - status?: integer -} -``` - -- 404 Not Found - -`application/json` - -```ts -{ - message?: string - exception: { - type?: string - code?: integer - message?: string - file?: string - line?: integer - } -} -``` - -*** - -### [GET]/api/v2/ui/logentries - -- Description -GET many request to retrieve multiple objects. - -- Security -bearerAuth - -#### Parameters(Query) - -```ts -page[after]?: integer -``` - -```ts -page[before]?: integer -``` - -```ts -page[size]?: integer -``` - -```ts -filter: { -} -``` - -```ts -include?: string -``` - -#### Responses - -- 200 successful operation - -`application/json` - -```ts -{ - jsonapi: { - version?: string //default: 1.1 - ext?: string //default: https://jsonapi.org/profiles/ethanresnick/cursor-pagination - } - links: { - self?: string //default: /api/v2/ui/logentries?page[size]=25 - first?: string //default: /api/v2/ui/logentries?page[size]=25&page[after]=0 - last?: string //default: /api/v2/ui/logentries?page[size]=25&page[before]=500 - next?: string //default: /api/v2/ui/logentries?page[size]=25&page[after]=25 - previous?: string //default: /api/v2/ui/logentries?page[size]=25&page[before]=25 - } - id?: integer - type?: string //default: LogEntry - data: { - issuer?: string - issuerId?: string - level?: string - message?: string - time?: integer - } - relationships: { - } - included: { - }[] -}[] -``` - -- 400 Invalid request - -`application/json` - -```ts -{ - title?: string - type?: string - status?: integer -} -``` - -- 401 Authentication failed - -`application/json` - -```ts -{ - title?: string - type?: string - status?: integer -} -``` - -*** - -### [POST]/api/v2/ui/logentries - -- Description -POST request to create a new object. The request must contain the resource record as data with the attributes of the new object.To add relationships, a relationships object can be added with the resource records of the relations that are part of this object. - -- Security -bearerAuth - -#### RequestBody - -- application/json - -```ts -{ - data: { - type?: string - attributes: { - issuer?: string - issuerId?: string - level?: string - message?: string - time?: integer - } - } -} -``` - -#### Responses - -- 201 successful operation - -`application/json` - -```ts -{ - jsonapi: { - version?: string //default: 1.1 - ext?: string //default: https://jsonapi.org/profiles/ethanresnick/cursor-pagination - } - id?: integer - type?: string //default: LogEntry - data: { - issuer?: string - issuerId?: string - level?: string - message?: string - time?: integer - } -} -``` - -- 400 Invalid request - -`application/json` - -```ts -{ - title?: string - type?: string - status?: integer -} -``` - -- 401 Authentication failed - -`application/json` - -```ts -{ - title?: string - type?: string - status?: integer -} -``` - -*** - -### [GET]/api/v2/ui/logentries/count - -- Description -GET many request to retrieve multiple objects. - -- Security -bearerAuth - -#### Parameters(Query) - -```ts -page[after]?: integer -``` - -```ts -page[before]?: integer -``` - -```ts -page[size]?: integer -``` - -```ts -filter: { -} -``` - -```ts -include?: string -``` - -#### Responses - -- 200 successful operation - -`application/json` - -```ts -{ - jsonapi: { - version?: string //default: 1.1 - ext?: string //default: https://jsonapi.org/profiles/ethanresnick/cursor-pagination - } - links: { - self?: string //default: /api/v2/ui/logentries?page[size]=25 - first?: string //default: /api/v2/ui/logentries?page[size]=25&page[after]=0 - last?: string //default: /api/v2/ui/logentries?page[size]=25&page[before]=500 - next?: string //default: /api/v2/ui/logentries?page[size]=25&page[after]=25 - previous?: string //default: /api/v2/ui/logentries?page[size]=25&page[before]=25 - } - id?: integer - type?: string //default: LogEntry - data: { - issuer?: string - issuerId?: string - level?: string - message?: string - time?: integer - } - relationships: { - } - included: { - }[] -}[] -``` - -- 400 Invalid request - -`application/json` - -```ts -{ - title?: string - type?: string - status?: integer -} -``` - -- 401 Authentication failed - -`application/json` - -```ts -{ - title?: string - type?: string - status?: integer -} -``` - -*** - -### [GET]/api/v2/ui/logentries/{id:[0-9]+} - -- Description -GET request to retrieve a single object. - -- Security -bearerAuth - -#### Parameters(Query) - -```ts -include?: string -``` - -#### Responses - -- 200 successful operation - -`application/json` - -```ts -{ - jsonapi: { - version?: string //default: 1.1 - ext?: string //default: https://jsonapi.org/profiles/ethanresnick/cursor-pagination - } - links: { - self?: string //default: /api/v2/ui/logentries?page[size]=25 - first?: string //default: /api/v2/ui/logentries?page[size]=25&page[after]=0 - last?: string //default: /api/v2/ui/logentries?page[size]=25&page[before]=500 - next?: string //default: /api/v2/ui/logentries?page[size]=25&page[after]=25 - previous?: string //default: /api/v2/ui/logentries?page[size]=25&page[before]=25 - } - id?: integer - type?: string //default: LogEntry - data: { - issuer?: string - issuerId?: string - level?: string - message?: string - time?: integer - } - relationships: { - } - included: { - }[] -} -``` - -- 400 Invalid request - -`application/json` - -```ts -{ - title?: string - type?: string - status?: integer -} -``` - -- 401 Authentication failed - -`application/json` - -```ts -{ - title?: string - type?: string - status?: integer -} -``` - -- 404 Not Found - -`application/json` - -```ts -{ - message?: string - exception: { - type?: string - code?: integer - message?: string - file?: string - line?: integer - } -} -``` - -*** - -### [PATCH]/api/v2/ui/logentries/{id:[0-9]+} - -- Description -PATCH request to update attributes of a single object. - -- Security -bearerAuth - -#### RequestBody - -- application/json - -```ts -{ - data: { - type?: string - attributes: { - } - } -} -``` - -#### Responses - -- 200 successful operation - -`application/json` - -```ts -{ - jsonapi: { - version?: string //default: 1.1 - ext?: string //default: https://jsonapi.org/profiles/ethanresnick/cursor-pagination - } - id?: integer - type?: string //default: LogEntry - data: { - issuer?: string - issuerId?: string - level?: string - message?: string - time?: integer - } -} -``` - -- 400 Invalid request - -`application/json` - -```ts -{ - title?: string - type?: string - status?: integer -} -``` - -- 401 Authentication failed - -`application/json` - -```ts -{ - title?: string - type?: string - status?: integer -} -``` - -- 404 Not Found - -`application/json` - -```ts -{ - message?: string - exception: { - type?: string - code?: integer - message?: string - file?: string - line?: integer - } -} -``` - -*** - -### [DELETE]/api/v2/ui/logentries/{id:[0-9]+} - -- Security -bearerAuth - -#### RequestBody - -- application/json - -#### Responses - -- 204 successfully deleted - -- 400 Invalid request - -`application/json` - -```ts -{ - title?: string - type?: string - status?: integer -} -``` - -- 401 Authentication failed - -`application/json` - -```ts -{ - title?: string - type?: string - status?: integer -} -``` - -- 404 Not Found - -`application/json` - -```ts -{ - message?: string - exception: { - type?: string - code?: integer - message?: string - file?: string - line?: integer - } -} -``` - -*** - -### [GET]/api/v2/ui/notifications - -- Description -GET many request to retrieve multiple objects. - -- Security -bearerAuth - -#### Parameters(Query) - -```ts -page[after]?: integer -``` - -```ts -page[before]?: integer -``` - -```ts -page[size]?: integer -``` - -```ts -filter: { -} -``` - -```ts -include?: string -``` - -#### Responses - -- 200 successful operation - -`application/json` - -```ts -{ - jsonapi: { - version?: string //default: 1.1 - ext?: string //default: https://jsonapi.org/profiles/ethanresnick/cursor-pagination - } - links: { - self?: string //default: /api/v2/ui/notifications?page[size]=25 - first?: string //default: /api/v2/ui/notifications?page[size]=25&page[after]=0 - last?: string //default: /api/v2/ui/notifications?page[size]=25&page[before]=500 - next?: string //default: /api/v2/ui/notifications?page[size]=25&page[after]=25 - previous?: string //default: /api/v2/ui/notifications?page[size]=25&page[before]=25 - } - id?: integer - type?: string //default: NotificationSetting - data: { - action?: string - objectId?: integer - notification?: string - userId?: integer - receiver?: string - isActive?: boolean - } - relationships: { - } - included: { - }[] -}[] -``` - -- 400 Invalid request - -`application/json` - -```ts -{ - title?: string - type?: string - status?: integer -} -``` - -- 401 Authentication failed - -`application/json` - -```ts -{ - title?: string - type?: string - status?: integer -} -``` - -*** - -### [POST]/api/v2/ui/notifications - -- Description -POST request to create a new object. The request must contain the resource record as data with the attributes of the new object.To add relationships, a relationships object can be added with the resource records of the relations that are part of this object. - -- Security -bearerAuth - -#### RequestBody - -- application/json - -```ts -{ - data: { - type?: string - attributes: { - actionFilter?: string - action?: string - objectId?: integer - notification?: string - userId?: integer - receiver?: string - isActive?: boolean - } - } -} -``` - -#### Responses - -- 201 successful operation - -`application/json` - -```ts -{ - jsonapi: { - version?: string //default: 1.1 - ext?: string //default: https://jsonapi.org/profiles/ethanresnick/cursor-pagination - } - id?: integer - type?: string //default: NotificationSetting - data: { - action?: string - objectId?: integer - notification?: string - userId?: integer - receiver?: string - isActive?: boolean - } -} -``` - -- 400 Invalid request - -`application/json` - -```ts -{ - title?: string - type?: string - status?: integer -} -``` - -- 401 Authentication failed - -`application/json` - -```ts -{ - title?: string - type?: string - status?: integer -} -``` - -*** - -### [GET]/api/v2/ui/notifications/count - -- Description -GET many request to retrieve multiple objects. - -- Security -bearerAuth - -#### Parameters(Query) - -```ts -page[after]?: integer -``` - -```ts -page[before]?: integer -``` - -```ts -page[size]?: integer -``` - -```ts -filter: { -} -``` - -```ts -include?: string -``` - -#### Responses - -- 200 successful operation - -`application/json` - -```ts -{ - jsonapi: { - version?: string //default: 1.1 - ext?: string //default: https://jsonapi.org/profiles/ethanresnick/cursor-pagination - } - links: { - self?: string //default: /api/v2/ui/notifications?page[size]=25 - first?: string //default: /api/v2/ui/notifications?page[size]=25&page[after]=0 - last?: string //default: /api/v2/ui/notifications?page[size]=25&page[before]=500 - next?: string //default: /api/v2/ui/notifications?page[size]=25&page[after]=25 - previous?: string //default: /api/v2/ui/notifications?page[size]=25&page[before]=25 - } - id?: integer - type?: string //default: NotificationSetting - data: { - action?: string - objectId?: integer - notification?: string - userId?: integer - receiver?: string - isActive?: boolean - } - relationships: { - } - included: { - }[] -}[] -``` - -- 400 Invalid request - -`application/json` - -```ts -{ - title?: string - type?: string - status?: integer -} -``` - -- 401 Authentication failed - -`application/json` - -```ts -{ - title?: string - type?: string - status?: integer -} -``` - -*** - -### [GET]/api/v2/ui/notifications/{id:[0-9]+}/{relation:user} - -- Description -GET request for for a to-one relationship link. Returns the resource record of the object that is part of the specified relation. - -- Security -bearerAuth - -#### Parameters(Query) - -```ts -include?: string -``` - -#### Responses - -- 200 successful operation - -`application/json` - -```ts -{ - jsonapi: { - version?: string //default: 1.1 - ext?: string //default: https://jsonapi.org/profiles/ethanresnick/cursor-pagination - } - links: { - self?: string //default: /api/v2/ui/notifications?page[size]=25 - first?: string //default: /api/v2/ui/notifications?page[size]=25&page[after]=0 - last?: string //default: /api/v2/ui/notifications?page[size]=25&page[before]=500 - next?: string //default: /api/v2/ui/notifications?page[size]=25&page[after]=25 - previous?: string //default: /api/v2/ui/notifications?page[size]=25&page[before]=25 - } - id?: integer - type?: string //default: NotificationSetting - data: { - action?: string - objectId?: integer - notification?: string - userId?: integer - receiver?: string - isActive?: boolean - } - relationships: { - } - included: { - }[] -} -``` - -- 400 Invalid request - -`application/json` - -```ts -{ - title?: string - type?: string - status?: integer -} -``` - -- 401 Authentication failed - -`application/json` - -```ts -{ - title?: string - type?: string - status?: integer -} -``` - -- 404 Not Found - -`application/json` - -```ts -{ - message?: string - exception: { - type?: string - code?: integer - message?: string - file?: string - line?: integer - } -} -``` - -*** - -### [GET]/api/v2/ui/notifications/{id:[0-9]+}/relationships/{relation:user} - -- Description -GET request for for a to-one relationship link. Returns the resource record of the object that is part of the specified relation. - -- Security -bearerAuth - -#### Parameters(Query) - -```ts -include?: string -``` - -#### Responses - -- 200 successful operation - -`application/json` - -```ts -{ - jsonapi: { - version?: string //default: 1.1 - ext?: string //default: https://jsonapi.org/profiles/ethanresnick/cursor-pagination - } - links: { - self?: string //default: /api/v2/ui/notifications?page[size]=25 - first?: string //default: /api/v2/ui/notifications?page[size]=25&page[after]=0 - last?: string //default: /api/v2/ui/notifications?page[size]=25&page[before]=500 - next?: string //default: /api/v2/ui/notifications?page[size]=25&page[after]=25 - previous?: string //default: /api/v2/ui/notifications?page[size]=25&page[before]=25 - } - id?: integer - type?: string //default: NotificationSetting - data: { - action?: string - objectId?: integer - notification?: string - userId?: integer - receiver?: string - isActive?: boolean - } - relationships: { - } - included: { - }[] -} -``` - -- 400 Invalid request - -`application/json` - -```ts -{ - title?: string - type?: string - status?: integer -} -``` - -- 401 Authentication failed - -`application/json` - -```ts -{ - title?: string - type?: string - status?: integer -} -``` - -- 404 Not Found - -`application/json` - -```ts -{ - message?: string - exception: { - type?: string - code?: integer - message?: string - file?: string - line?: integer - } -} -``` - -*** - -### [PATCH]/api/v2/ui/notifications/{id:[0-9]+}/relationships/{relation:user} - -- Security -bearerAuth - -#### RequestBody - -- application/json - -```ts -{ - data: { - type?: string - attributes: { - action?: string - isActive?: boolean - notification?: string - receiver?: string - } - } -} -``` - -#### Responses - -- 200 successful operation - -`application/json` - -```ts -{ - jsonapi: { - version?: string //default: 1.1 - ext?: string //default: https://jsonapi.org/profiles/ethanresnick/cursor-pagination - } - id?: integer - type?: string //default: NotificationSetting - data: { - action?: string - objectId?: integer - notification?: string - userId?: integer - receiver?: string - isActive?: boolean - } -} -``` - -- 400 Invalid request - -`application/json` - -```ts -{ - title?: string - type?: string - status?: integer -} -``` - -- 401 Authentication failed - -`application/json` - -```ts -{ - title?: string - type?: string - status?: integer -} -``` - -- 404 Not Found - -`application/json` - -```ts -{ - message?: string - exception: { - type?: string - code?: integer - message?: string - file?: string - line?: integer - } -} -``` - -*** - -### [GET]/api/v2/ui/notifications/{id:[0-9]+} - -- Description -GET request to retrieve a single object. - -- Security -bearerAuth - -#### Parameters(Query) - -```ts -include?: string -``` - -#### Responses - -- 200 successful operation - -`application/json` - -```ts -{ - jsonapi: { - version?: string //default: 1.1 - ext?: string //default: https://jsonapi.org/profiles/ethanresnick/cursor-pagination - } - links: { - self?: string //default: /api/v2/ui/notifications?page[size]=25 - first?: string //default: /api/v2/ui/notifications?page[size]=25&page[after]=0 - last?: string //default: /api/v2/ui/notifications?page[size]=25&page[before]=500 - next?: string //default: /api/v2/ui/notifications?page[size]=25&page[after]=25 - previous?: string //default: /api/v2/ui/notifications?page[size]=25&page[before]=25 - } - id?: integer - type?: string //default: NotificationSetting - data: { - action?: string - objectId?: integer - notification?: string - userId?: integer - receiver?: string - isActive?: boolean - } - relationships: { - } - included: { - }[] -} -``` - -- 400 Invalid request - -`application/json` - -```ts -{ - title?: string - type?: string - status?: integer -} -``` - -- 401 Authentication failed - -`application/json` - -```ts -{ - title?: string - type?: string - status?: integer -} -``` - -- 404 Not Found - -`application/json` - -```ts -{ - message?: string - exception: { - type?: string - code?: integer - message?: string - file?: string - line?: integer - } -} -``` - -*** - -### [PATCH]/api/v2/ui/notifications/{id:[0-9]+} - -- Description -PATCH request to update attributes of a single object. - -- Security -bearerAuth - -#### RequestBody - -- application/json - -```ts -{ - data: { - type?: string - attributes: { - action?: string - isActive?: boolean - notification?: string - receiver?: string - } - } -} -``` - -#### Responses - -- 200 successful operation - -`application/json` - -```ts -{ - jsonapi: { - version?: string //default: 1.1 - ext?: string //default: https://jsonapi.org/profiles/ethanresnick/cursor-pagination - } - id?: integer - type?: string //default: NotificationSetting - data: { - action?: string - objectId?: integer - notification?: string - userId?: integer - receiver?: string - isActive?: boolean - } -} -``` - -- 400 Invalid request - -`application/json` - -```ts -{ - title?: string - type?: string - status?: integer -} -``` - -- 401 Authentication failed - -`application/json` - -```ts -{ - title?: string - type?: string - status?: integer -} -``` - -- 404 Not Found - -`application/json` - -```ts -{ - message?: string - exception: { - type?: string - code?: integer - message?: string - file?: string - line?: integer - } -} -``` - -*** - -### [DELETE]/api/v2/ui/notifications/{id:[0-9]+} - -- Security -bearerAuth - -#### RequestBody - -- application/json - -#### Responses - -- 204 successfully deleted - -- 400 Invalid request - -`application/json` - -```ts -{ - title?: string - type?: string - status?: integer -} -``` - -- 401 Authentication failed - -`application/json` - -```ts -{ - title?: string - type?: string - status?: integer -} -``` - -- 404 Not Found - -`application/json` - -```ts -{ - message?: string - exception: { - type?: string - code?: integer - message?: string - file?: string - line?: integer - } -} -``` - -*** - -### [GET]/api/v2/ui/preprocessors - -- Description -GET many request to retrieve multiple objects. - -- Security -bearerAuth - -#### Parameters(Query) - -```ts -page[after]?: integer -``` - -```ts -page[before]?: integer -``` - -```ts -page[size]?: integer -``` - -```ts -filter: { -} -``` - -```ts -include?: string -``` - -#### Responses - -- 200 successful operation - -`application/json` - -```ts -{ - jsonapi: { - version?: string //default: 1.1 - ext?: string //default: https://jsonapi.org/profiles/ethanresnick/cursor-pagination - } - links: { - self?: string //default: /api/v2/ui/preprocessors?page[size]=25 - first?: string //default: /api/v2/ui/preprocessors?page[size]=25&page[after]=0 - last?: string //default: /api/v2/ui/preprocessors?page[size]=25&page[before]=500 - next?: string //default: /api/v2/ui/preprocessors?page[size]=25&page[after]=25 - previous?: string //default: /api/v2/ui/preprocessors?page[size]=25&page[before]=25 - } - id?: integer - type?: string //default: Preprocessor - data: { - name?: string - url?: string - binaryName?: string - keyspaceCommand?: string - skipCommand?: string - limitCommand?: string - } - relationships: { - } - included: { - }[] -}[] -``` - -- 400 Invalid request - -`application/json` - -```ts -{ - title?: string - type?: string - status?: integer -} -``` - -- 401 Authentication failed - -`application/json` - -```ts -{ - title?: string - type?: string - status?: integer -} -``` - -*** - -### [POST]/api/v2/ui/preprocessors - -- Description -POST request to create a new object. The request must contain the resource record as data with the attributes of the new object.To add relationships, a relationships object can be added with the resource records of the relations that are part of this object. - -- Security -bearerAuth - -#### RequestBody - -- application/json - -```ts -{ - data: { - type?: string - attributes: { - name?: string - url?: string - binaryName?: string - keyspaceCommand?: string - skipCommand?: string - limitCommand?: string - } - } -} -``` - -#### Responses - -- 201 successful operation - -`application/json` - -```ts -{ - jsonapi: { - version?: string //default: 1.1 - ext?: string //default: https://jsonapi.org/profiles/ethanresnick/cursor-pagination - } - id?: integer - type?: string //default: Preprocessor - data: { - name?: string - url?: string - binaryName?: string - keyspaceCommand?: string - skipCommand?: string - limitCommand?: string - } -} -``` - -- 400 Invalid request - -`application/json` - -```ts -{ - title?: string - type?: string - status?: integer -} -``` - -- 401 Authentication failed - -`application/json` - -```ts -{ - title?: string - type?: string - status?: integer -} -``` - -*** - -### [GET]/api/v2/ui/preprocessors/count - -- Description -GET many request to retrieve multiple objects. - -- Security -bearerAuth - -#### Parameters(Query) - -```ts -page[after]?: integer -``` - -```ts -page[before]?: integer -``` - -```ts -page[size]?: integer -``` - -```ts -filter: { -} -``` - -```ts -include?: string -``` - -#### Responses - -- 200 successful operation - -`application/json` - -```ts -{ - jsonapi: { - version?: string //default: 1.1 - ext?: string //default: https://jsonapi.org/profiles/ethanresnick/cursor-pagination - } - links: { - self?: string //default: /api/v2/ui/preprocessors?page[size]=25 - first?: string //default: /api/v2/ui/preprocessors?page[size]=25&page[after]=0 - last?: string //default: /api/v2/ui/preprocessors?page[size]=25&page[before]=500 - next?: string //default: /api/v2/ui/preprocessors?page[size]=25&page[after]=25 - previous?: string //default: /api/v2/ui/preprocessors?page[size]=25&page[before]=25 - } - id?: integer - type?: string //default: Preprocessor - data: { - name?: string - url?: string - binaryName?: string - keyspaceCommand?: string - skipCommand?: string - limitCommand?: string - } - relationships: { - } - included: { - }[] -}[] -``` - -- 400 Invalid request - -`application/json` - -```ts -{ - title?: string - type?: string - status?: integer -} -``` - -- 401 Authentication failed - -`application/json` - -```ts -{ - title?: string - type?: string - status?: integer -} -``` - -*** - -### [GET]/api/v2/ui/preprocessors/{id:[0-9]+} - -- Description -GET request to retrieve a single object. - -- Security -bearerAuth - -#### Parameters(Query) - -```ts -include?: string -``` - -#### Responses - -- 200 successful operation - -`application/json` - -```ts -{ - jsonapi: { - version?: string //default: 1.1 - ext?: string //default: https://jsonapi.org/profiles/ethanresnick/cursor-pagination - } - links: { - self?: string //default: /api/v2/ui/preprocessors?page[size]=25 - first?: string //default: /api/v2/ui/preprocessors?page[size]=25&page[after]=0 - last?: string //default: /api/v2/ui/preprocessors?page[size]=25&page[before]=500 - next?: string //default: /api/v2/ui/preprocessors?page[size]=25&page[after]=25 - previous?: string //default: /api/v2/ui/preprocessors?page[size]=25&page[before]=25 - } - id?: integer - type?: string //default: Preprocessor - data: { - name?: string - url?: string - binaryName?: string - keyspaceCommand?: string - skipCommand?: string - limitCommand?: string - } - relationships: { - } - included: { - }[] -} -``` - -- 400 Invalid request - -`application/json` - -```ts -{ - title?: string - type?: string - status?: integer -} -``` - -- 401 Authentication failed - -`application/json` - -```ts -{ - title?: string - type?: string - status?: integer -} -``` - -- 404 Not Found - -`application/json` - -```ts -{ - message?: string - exception: { - type?: string - code?: integer - message?: string - file?: string - line?: integer - } -} -``` - -*** - -### [PATCH]/api/v2/ui/preprocessors/{id:[0-9]+} - -- Description -PATCH request to update attributes of a single object. - -- Security -bearerAuth - -#### RequestBody - -- application/json - -```ts -{ - data: { - type?: string - attributes: { - binaryName?: string - keyspaceCommand?: string - limitCommand?: string - name?: string - skipCommand?: string - url?: string - } - } -} -``` - -#### Responses - -- 200 successful operation - -`application/json` - -```ts -{ - jsonapi: { - version?: string //default: 1.1 - ext?: string //default: https://jsonapi.org/profiles/ethanresnick/cursor-pagination - } - id?: integer - type?: string //default: Preprocessor - data: { - name?: string - url?: string - binaryName?: string - keyspaceCommand?: string - skipCommand?: string - limitCommand?: string - } -} -``` - -- 400 Invalid request - -`application/json` - -```ts -{ - title?: string - type?: string - status?: integer -} -``` - -- 401 Authentication failed - -`application/json` - -```ts -{ - title?: string - type?: string - status?: integer -} -``` - -- 404 Not Found - -`application/json` - -```ts -{ - message?: string - exception: { - type?: string - code?: integer - message?: string - file?: string - line?: integer - } -} -``` - -*** - -### [DELETE]/api/v2/ui/preprocessors/{id:[0-9]+} - -- Security -bearerAuth - -#### RequestBody - -- application/json - -#### Responses - -- 204 successfully deleted - -- 400 Invalid request - -`application/json` - -```ts -{ - title?: string - type?: string - status?: integer -} -``` - -- 401 Authentication failed - -`application/json` - -```ts -{ - title?: string - type?: string - status?: integer -} -``` - -- 404 Not Found - -`application/json` - -```ts -{ - message?: string - exception: { - type?: string - code?: integer - message?: string - file?: string - line?: integer - } -} -``` - -*** - -### [GET]/api/v2/ui/pretasks - -- Description -GET many request to retrieve multiple objects. - -- Security -bearerAuth - -#### Parameters(Query) - -```ts -page[after]?: integer -``` - -```ts -page[before]?: integer -``` - -```ts -page[size]?: integer -``` - -```ts -filter: { -} -``` - -```ts -include?: string -``` - -#### Responses - -- 200 successful operation - -`application/json` - -```ts -{ - jsonapi: { - version?: string //default: 1.1 - ext?: string //default: https://jsonapi.org/profiles/ethanresnick/cursor-pagination - } - links: { - self?: string //default: /api/v2/ui/pretasks?page[size]=25 - first?: string //default: /api/v2/ui/pretasks?page[size]=25&page[after]=0 - last?: string //default: /api/v2/ui/pretasks?page[size]=25&page[before]=500 - next?: string //default: /api/v2/ui/pretasks?page[size]=25&page[after]=25 - previous?: string //default: /api/v2/ui/pretasks?page[size]=25&page[before]=25 - } - id?: integer - type?: string //default: Pretask - data: { - taskName?: string - attackCmd?: string - chunkTime?: integer - statusTimer?: integer - color?: string - isSmall?: boolean - isCpuTask?: boolean - useNewBench?: boolean - priority?: integer - maxAgents?: integer - isMaskImport?: boolean - crackerBinaryTypeId?: integer - } - relationships: { - } - included: { - }[] -}[] -``` - -- 400 Invalid request - -`application/json` - -```ts -{ - title?: string - type?: string - status?: integer -} -``` - -- 401 Authentication failed - -`application/json` - -```ts -{ - title?: string - type?: string - status?: integer -} -``` - -*** - -### [POST]/api/v2/ui/pretasks - -- Description -POST request to create a new object. The request must contain the resource record as data with the attributes of the new object.To add relationships, a relationships object can be added with the resource records of the relations that are part of this object. - -- Security -bearerAuth - -#### RequestBody - -- application/json - -```ts -{ - data: { - type?: string - attributes: { -[] - taskName?: string - attackCmd?: string - chunkTime?: integer - statusTimer?: integer - color?: string - isSmall?: boolean - isCpuTask?: boolean - useNewBench?: boolean - priority?: integer - maxAgents?: integer - isMaskImport?: boolean - crackerBinaryTypeId?: integer - } - } -} -``` - -#### Responses - -- 201 successful operation - -`application/json` - -```ts -{ - jsonapi: { - version?: string //default: 1.1 - ext?: string //default: https://jsonapi.org/profiles/ethanresnick/cursor-pagination - } - id?: integer - type?: string //default: Pretask - data: { - taskName?: string - attackCmd?: string - chunkTime?: integer - statusTimer?: integer - color?: string - isSmall?: boolean - isCpuTask?: boolean - useNewBench?: boolean - priority?: integer - maxAgents?: integer - isMaskImport?: boolean - crackerBinaryTypeId?: integer - } -} -``` - -- 400 Invalid request - -`application/json` - -```ts -{ - title?: string - type?: string - status?: integer -} -``` - -- 401 Authentication failed - -`application/json` - -```ts -{ - title?: string - type?: string - status?: integer -} -``` - -*** - -### [GET]/api/v2/ui/pretasks/count - -- Description -GET many request to retrieve multiple objects. - -- Security -bearerAuth - -#### Parameters(Query) - -```ts -page[after]?: integer -``` - -```ts -page[before]?: integer -``` - -```ts -page[size]?: integer -``` - -```ts -filter: { -} -``` - -```ts -include?: string -``` - -#### Responses - -- 200 successful operation - -`application/json` - -```ts -{ - jsonapi: { - version?: string //default: 1.1 - ext?: string //default: https://jsonapi.org/profiles/ethanresnick/cursor-pagination - } - links: { - self?: string //default: /api/v2/ui/pretasks?page[size]=25 - first?: string //default: /api/v2/ui/pretasks?page[size]=25&page[after]=0 - last?: string //default: /api/v2/ui/pretasks?page[size]=25&page[before]=500 - next?: string //default: /api/v2/ui/pretasks?page[size]=25&page[after]=25 - previous?: string //default: /api/v2/ui/pretasks?page[size]=25&page[before]=25 - } - id?: integer - type?: string //default: Pretask - data: { - taskName?: string - attackCmd?: string - chunkTime?: integer - statusTimer?: integer - color?: string - isSmall?: boolean - isCpuTask?: boolean - useNewBench?: boolean - priority?: integer - maxAgents?: integer - isMaskImport?: boolean - crackerBinaryTypeId?: integer - } - relationships: { - } - included: { - }[] -}[] -``` - -- 400 Invalid request - -`application/json` - -```ts -{ - title?: string - type?: string - status?: integer -} -``` - -- 401 Authentication failed - -`application/json` - -```ts -{ - title?: string - type?: string - status?: integer -} -``` - -*** - -### [GET]/api/v2/ui/pretasks/{id:[0-9]+}/{relation:pretaskFiles} - -- Description -GET request for for a to-one relationship link. Returns the resource record of the object that is part of the specified relation. - -- Security -bearerAuth - -#### Parameters(Query) - -```ts -include?: string -``` - -#### Responses - -- 200 successful operation - -`application/json` - -```ts -{ - jsonapi: { - version?: string //default: 1.1 - ext?: string //default: https://jsonapi.org/profiles/ethanresnick/cursor-pagination - } - links: { - self?: string //default: /api/v2/ui/pretasks?page[size]=25 - first?: string //default: /api/v2/ui/pretasks?page[size]=25&page[after]=0 - last?: string //default: /api/v2/ui/pretasks?page[size]=25&page[before]=500 - next?: string //default: /api/v2/ui/pretasks?page[size]=25&page[after]=25 - previous?: string //default: /api/v2/ui/pretasks?page[size]=25&page[before]=25 - } - id?: integer - type?: string //default: Pretask - data: { - taskName?: string - attackCmd?: string - chunkTime?: integer - statusTimer?: integer - color?: string - isSmall?: boolean - isCpuTask?: boolean - useNewBench?: boolean - priority?: integer - maxAgents?: integer - isMaskImport?: boolean - crackerBinaryTypeId?: integer - } - relationships: { - } - included: { - }[] -} -``` - -- 400 Invalid request - -`application/json` - -```ts -{ - title?: string - type?: string - status?: integer -} -``` - -- 401 Authentication failed - -`application/json` - -```ts -{ - title?: string - type?: string - status?: integer -} -``` - -- 404 Not Found - -`application/json` - -```ts -{ - message?: string - exception: { - type?: string - code?: integer - message?: string - file?: string - line?: integer - } -} -``` - -*** - -### [GET]/api/v2/ui/pretasks/{id:[0-9]+}/relationships/{relation:pretaskFiles} - -- Description -GET request for for a to-one relationship link. Returns the resource record of the object that is part of the specified relation. - -- Security -bearerAuth - -#### Parameters(Query) - -```ts -include?: string -``` - -#### Responses - -- 200 successful operation - -`application/json` - -```ts -{ - jsonapi: { - version?: string //default: 1.1 - ext?: string //default: https://jsonapi.org/profiles/ethanresnick/cursor-pagination - } - links: { - self?: string //default: /api/v2/ui/pretasks?page[size]=25 - first?: string //default: /api/v2/ui/pretasks?page[size]=25&page[after]=0 - last?: string //default: /api/v2/ui/pretasks?page[size]=25&page[before]=500 - next?: string //default: /api/v2/ui/pretasks?page[size]=25&page[after]=25 - previous?: string //default: /api/v2/ui/pretasks?page[size]=25&page[before]=25 - } - id?: integer - type?: string //default: Pretask - data: { - taskName?: string - attackCmd?: string - chunkTime?: integer - statusTimer?: integer - color?: string - isSmall?: boolean - isCpuTask?: boolean - useNewBench?: boolean - priority?: integer - maxAgents?: integer - isMaskImport?: boolean - crackerBinaryTypeId?: integer - } - relationships: { - } - included: { - }[] -} -``` - -- 400 Invalid request - -`application/json` - -```ts -{ - title?: string - type?: string - status?: integer -} -``` - -- 401 Authentication failed - -`application/json` - -```ts -{ - title?: string - type?: string - status?: integer -} -``` - -- 404 Not Found - -`application/json` - -```ts -{ - message?: string - exception: { - type?: string - code?: integer - message?: string - file?: string - line?: integer - } -} -``` - -*** - -### [PATCH]/api/v2/ui/pretasks/{id:[0-9]+}/relationships/{relation:pretaskFiles} - -- Security -bearerAuth - -#### RequestBody - -- application/json - -```ts -{ - data: { - type?: string - attributes: { - attackCmd?: string - chunkTime?: integer - color?: string - crackerBinaryTypeId?: integer - isCpuTask?: boolean - isMaskImport?: boolean - isSmall?: boolean - maxAgents?: integer - priority?: integer - statusTimer?: integer - taskName?: string - } - } -} -``` - -#### Responses - -- 200 successful operation - -`application/json` - -```ts -{ - jsonapi: { - version?: string //default: 1.1 - ext?: string //default: https://jsonapi.org/profiles/ethanresnick/cursor-pagination - } - id?: integer - type?: string //default: Pretask - data: { - taskName?: string - attackCmd?: string - chunkTime?: integer - statusTimer?: integer - color?: string - isSmall?: boolean - isCpuTask?: boolean - useNewBench?: boolean - priority?: integer - maxAgents?: integer - isMaskImport?: boolean - crackerBinaryTypeId?: integer - } -} -``` - -- 400 Invalid request - -`application/json` - -```ts -{ - title?: string - type?: string - status?: integer -} -``` - -- 401 Authentication failed - -`application/json` - -```ts -{ - title?: string - type?: string - status?: integer -} -``` - -- 404 Not Found - -`application/json` - -```ts -{ - message?: string - exception: { - type?: string - code?: integer - message?: string - file?: string - line?: integer - } -} -``` - -*** - -### [POST]/api/v2/ui/pretasks/{id:[0-9]+}/relationships/{relation:pretaskFiles} - -- Security -bearerAuth - -#### RequestBody - -- application/json - -#### Responses - -- 204 successfully created - -- 400 Invalid request - -`application/json` - -```ts -{ - title?: string - type?: string - status?: integer -} -``` - -- 401 Authentication failed - -`application/json` - -```ts -{ - title?: string - type?: string - status?: integer -} -``` - -- 404 Not Found - -`application/json` - -```ts -{ - message?: string - exception: { - type?: string - code?: integer - message?: string - file?: string - line?: integer - } -} -``` - -*** - -### [DELETE]/api/v2/ui/pretasks/{id:[0-9]+}/relationships/{relation:pretaskFiles} - -- Security -bearerAuth - -#### RequestBody - -- application/json - -#### Responses - -- 204 successfully deleted - -- 400 Invalid request - -`application/json` - -```ts -{ - title?: string - type?: string - status?: integer -} -``` - -- 401 Authentication failed - -`application/json` - -```ts -{ - title?: string - type?: string - status?: integer -} -``` - -- 404 Not Found - -`application/json` - -```ts -{ - message?: string - exception: { - type?: string - code?: integer - message?: string - file?: string - line?: integer - } -} -``` - -*** - -### [GET]/api/v2/ui/pretasks/{id:[0-9]+} - -- Description -GET request to retrieve a single object. - -- Security -bearerAuth - -#### Parameters(Query) - -```ts -include?: string -``` - -#### Responses - -- 200 successful operation - -`application/json` - -```ts -{ - jsonapi: { - version?: string //default: 1.1 - ext?: string //default: https://jsonapi.org/profiles/ethanresnick/cursor-pagination - } - links: { - self?: string //default: /api/v2/ui/pretasks?page[size]=25 - first?: string //default: /api/v2/ui/pretasks?page[size]=25&page[after]=0 - last?: string //default: /api/v2/ui/pretasks?page[size]=25&page[before]=500 - next?: string //default: /api/v2/ui/pretasks?page[size]=25&page[after]=25 - previous?: string //default: /api/v2/ui/pretasks?page[size]=25&page[before]=25 - } - id?: integer - type?: string //default: Pretask - data: { - taskName?: string - attackCmd?: string - chunkTime?: integer - statusTimer?: integer - color?: string - isSmall?: boolean - isCpuTask?: boolean - useNewBench?: boolean - priority?: integer - maxAgents?: integer - isMaskImport?: boolean - crackerBinaryTypeId?: integer - } - relationships: { - } - included: { - }[] -} -``` - -- 400 Invalid request - -`application/json` - -```ts -{ - title?: string - type?: string - status?: integer -} -``` - -- 401 Authentication failed - -`application/json` - -```ts -{ - title?: string - type?: string - status?: integer -} -``` - -- 404 Not Found - -`application/json` - -```ts -{ - message?: string - exception: { - type?: string - code?: integer - message?: string - file?: string - line?: integer - } -} -``` - -*** - -### [PATCH]/api/v2/ui/pretasks/{id:[0-9]+} - -- Description -PATCH request to update attributes of a single object. - -- Security -bearerAuth - -#### RequestBody - -- application/json - -```ts -{ - data: { - type?: string - attributes: { - attackCmd?: string - chunkTime?: integer - color?: string - crackerBinaryTypeId?: integer - isCpuTask?: boolean - isMaskImport?: boolean - isSmall?: boolean - maxAgents?: integer - priority?: integer - statusTimer?: integer - taskName?: string - } - } -} -``` - -#### Responses - -- 200 successful operation - -`application/json` - -```ts -{ - jsonapi: { - version?: string //default: 1.1 - ext?: string //default: https://jsonapi.org/profiles/ethanresnick/cursor-pagination - } - id?: integer - type?: string //default: Pretask - data: { - taskName?: string - attackCmd?: string - chunkTime?: integer - statusTimer?: integer - color?: string - isSmall?: boolean - isCpuTask?: boolean - useNewBench?: boolean - priority?: integer - maxAgents?: integer - isMaskImport?: boolean - crackerBinaryTypeId?: integer - } -} -``` - -- 400 Invalid request - -`application/json` - -```ts -{ - title?: string - type?: string - status?: integer -} -``` - -- 401 Authentication failed - -`application/json` - -```ts -{ - title?: string - type?: string - status?: integer -} -``` - -- 404 Not Found - -`application/json` - -```ts -{ - message?: string - exception: { - type?: string - code?: integer - message?: string - file?: string - line?: integer - } -} -``` - -*** - -### [DELETE]/api/v2/ui/pretasks/{id:[0-9]+} - -- Security -bearerAuth - -#### RequestBody - -- application/json - -#### Responses - -- 204 successfully deleted - -- 400 Invalid request - -`application/json` - -```ts -{ - title?: string - type?: string - status?: integer -} -``` - -- 401 Authentication failed - -`application/json` - -```ts -{ - title?: string - type?: string - status?: integer -} -``` - -- 404 Not Found - -`application/json` - -```ts -{ - message?: string - exception: { - type?: string - code?: integer - message?: string - file?: string - line?: integer - } -} -``` - -*** - -### [GET]/api/v2/ui/speeds - -- Description -GET many request to retrieve multiple objects. - -- Security -bearerAuth - -#### Parameters(Query) - -```ts -page[after]?: integer -``` - -```ts -page[before]?: integer -``` - -```ts -page[size]?: integer -``` - -```ts -filter: { -} -``` - -```ts -include?: string -``` - -#### Responses - -- 200 successful operation - -`application/json` - -```ts -{ - jsonapi: { - version?: string //default: 1.1 - ext?: string //default: https://jsonapi.org/profiles/ethanresnick/cursor-pagination - } - links: { - self?: string //default: /api/v2/ui/speeds?page[size]=25 - first?: string //default: /api/v2/ui/speeds?page[size]=25&page[after]=0 - last?: string //default: /api/v2/ui/speeds?page[size]=25&page[before]=500 - next?: string //default: /api/v2/ui/speeds?page[size]=25&page[after]=25 - previous?: string //default: /api/v2/ui/speeds?page[size]=25&page[before]=25 - } - id?: integer - type?: string //default: Speed - data: { - agentId?: integer - taskId?: integer - speed?: integer - time?: integer - } - relationships: { - } - included: { - }[] -}[] -``` - -- 400 Invalid request - -`application/json` - -```ts -{ - title?: string - type?: string - status?: integer -} -``` - -- 401 Authentication failed - -`application/json` - -```ts -{ - title?: string - type?: string - status?: integer -} -``` - -*** - -### [GET]/api/v2/ui/speeds/count - -- Description -GET many request to retrieve multiple objects. - -- Security -bearerAuth - -#### Parameters(Query) - -```ts -page[after]?: integer -``` - -```ts -page[before]?: integer -``` - -```ts -page[size]?: integer -``` - -```ts -filter: { -} -``` - -```ts -include?: string -``` - -#### Responses - -- 200 successful operation - -`application/json` - -```ts -{ - jsonapi: { - version?: string //default: 1.1 - ext?: string //default: https://jsonapi.org/profiles/ethanresnick/cursor-pagination - } - links: { - self?: string //default: /api/v2/ui/speeds?page[size]=25 - first?: string //default: /api/v2/ui/speeds?page[size]=25&page[after]=0 - last?: string //default: /api/v2/ui/speeds?page[size]=25&page[before]=500 - next?: string //default: /api/v2/ui/speeds?page[size]=25&page[after]=25 - previous?: string //default: /api/v2/ui/speeds?page[size]=25&page[before]=25 - } - id?: integer - type?: string //default: Speed - data: { - agentId?: integer - taskId?: integer - speed?: integer - time?: integer - } - relationships: { - } - included: { - }[] -}[] -``` - -- 400 Invalid request - -`application/json` - -```ts -{ - title?: string - type?: string - status?: integer -} -``` - -- 401 Authentication failed - -`application/json` - -```ts -{ - title?: string - type?: string - status?: integer -} -``` - -*** - -### [GET]/api/v2/ui/speeds/{id:[0-9]+}/{relation:agent} - -- Description -GET request for for a to-one relationship link. Returns the resource record of the object that is part of the specified relation. - -- Security -bearerAuth - -#### Parameters(Query) - -```ts -include?: string -``` - -#### Responses - -- 200 successful operation - -`application/json` - -```ts -{ - jsonapi: { - version?: string //default: 1.1 - ext?: string //default: https://jsonapi.org/profiles/ethanresnick/cursor-pagination - } - links: { - self?: string //default: /api/v2/ui/speeds?page[size]=25 - first?: string //default: /api/v2/ui/speeds?page[size]=25&page[after]=0 - last?: string //default: /api/v2/ui/speeds?page[size]=25&page[before]=500 - next?: string //default: /api/v2/ui/speeds?page[size]=25&page[after]=25 - previous?: string //default: /api/v2/ui/speeds?page[size]=25&page[before]=25 - } - id?: integer - type?: string //default: Speed - data: { - agentId?: integer - taskId?: integer - speed?: integer - time?: integer - } - relationships: { - } - included: { - }[] -} -``` - -- 400 Invalid request - -`application/json` - -```ts -{ - title?: string - type?: string - status?: integer -} -``` - -- 401 Authentication failed - -`application/json` - -```ts -{ - title?: string - type?: string - status?: integer -} -``` - -- 404 Not Found - -`application/json` - -```ts -{ - message?: string - exception: { - type?: string - code?: integer - message?: string - file?: string - line?: integer - } -} -``` - -*** - -### [GET]/api/v2/ui/speeds/{id:[0-9]+}/relationships/{relation:agent} - -- Description -GET request for for a to-one relationship link. Returns the resource record of the object that is part of the specified relation. - -- Security -bearerAuth - -#### Parameters(Query) - -```ts -include?: string -``` - -#### Responses - -- 200 successful operation - -`application/json` - -```ts -{ - jsonapi: { - version?: string //default: 1.1 - ext?: string //default: https://jsonapi.org/profiles/ethanresnick/cursor-pagination - } - links: { - self?: string //default: /api/v2/ui/speeds?page[size]=25 - first?: string //default: /api/v2/ui/speeds?page[size]=25&page[after]=0 - last?: string //default: /api/v2/ui/speeds?page[size]=25&page[before]=500 - next?: string //default: /api/v2/ui/speeds?page[size]=25&page[after]=25 - previous?: string //default: /api/v2/ui/speeds?page[size]=25&page[before]=25 - } - id?: integer - type?: string //default: Speed - data: { - agentId?: integer - taskId?: integer - speed?: integer - time?: integer - } - relationships: { - } - included: { - }[] -} -``` - -- 400 Invalid request - -`application/json` - -```ts -{ - title?: string - type?: string - status?: integer -} -``` - -- 401 Authentication failed - -`application/json` - -```ts -{ - title?: string - type?: string - status?: integer -} -``` - -- 404 Not Found - -`application/json` - -```ts -{ - message?: string - exception: { - type?: string - code?: integer - message?: string - file?: string - line?: integer - } -} -``` - -*** - -### [PATCH]/api/v2/ui/speeds/{id:[0-9]+}/relationships/{relation:agent} - -- Security -bearerAuth - -#### RequestBody - -- application/json - -```ts -{ - data: { - type?: string - attributes: { - } - } -} -``` - -#### Responses - -- 200 successful operation - -`application/json` - -```ts -{ - jsonapi: { - version?: string //default: 1.1 - ext?: string //default: https://jsonapi.org/profiles/ethanresnick/cursor-pagination - } - id?: integer - type?: string //default: Speed - data: { - agentId?: integer - taskId?: integer - speed?: integer - time?: integer - } -} -``` - -- 400 Invalid request - -`application/json` - -```ts -{ - title?: string - type?: string - status?: integer -} -``` - -- 401 Authentication failed - -`application/json` - -```ts -{ - title?: string - type?: string - status?: integer -} -``` - -- 404 Not Found - -`application/json` - -```ts -{ - message?: string - exception: { - type?: string - code?: integer - message?: string - file?: string - line?: integer - } -} -``` - -*** - -### [GET]/api/v2/ui/speeds/{id:[0-9]+}/{relation:task} - -- Description -GET request for for a to-one relationship link. Returns the resource record of the object that is part of the specified relation. - -- Security -bearerAuth - -#### Parameters(Query) - -```ts -include?: string -``` - -#### Responses - -- 200 successful operation - -`application/json` - -```ts -{ - jsonapi: { - version?: string //default: 1.1 - ext?: string //default: https://jsonapi.org/profiles/ethanresnick/cursor-pagination - } - links: { - self?: string //default: /api/v2/ui/speeds?page[size]=25 - first?: string //default: /api/v2/ui/speeds?page[size]=25&page[after]=0 - last?: string //default: /api/v2/ui/speeds?page[size]=25&page[before]=500 - next?: string //default: /api/v2/ui/speeds?page[size]=25&page[after]=25 - previous?: string //default: /api/v2/ui/speeds?page[size]=25&page[before]=25 - } - id?: integer - type?: string //default: Speed - data: { - agentId?: integer - taskId?: integer - speed?: integer - time?: integer - } - relationships: { - } - included: { - }[] -} -``` - -- 400 Invalid request - -`application/json` - -```ts -{ - title?: string - type?: string - status?: integer -} -``` - -- 401 Authentication failed - -`application/json` - -```ts -{ - title?: string - type?: string - status?: integer -} -``` - -- 404 Not Found - -`application/json` - -```ts -{ - message?: string - exception: { - type?: string - code?: integer - message?: string - file?: string - line?: integer - } -} -``` - -*** - -### [GET]/api/v2/ui/speeds/{id:[0-9]+}/relationships/{relation:task} - -- Description -GET request for for a to-one relationship link. Returns the resource record of the object that is part of the specified relation. - -- Security -bearerAuth - -#### Parameters(Query) - -```ts -include?: string -``` - -#### Responses - -- 200 successful operation - -`application/json` - -```ts -{ - jsonapi: { - version?: string //default: 1.1 - ext?: string //default: https://jsonapi.org/profiles/ethanresnick/cursor-pagination - } - links: { - self?: string //default: /api/v2/ui/speeds?page[size]=25 - first?: string //default: /api/v2/ui/speeds?page[size]=25&page[after]=0 - last?: string //default: /api/v2/ui/speeds?page[size]=25&page[before]=500 - next?: string //default: /api/v2/ui/speeds?page[size]=25&page[after]=25 - previous?: string //default: /api/v2/ui/speeds?page[size]=25&page[before]=25 - } - id?: integer - type?: string //default: Speed - data: { - agentId?: integer - taskId?: integer - speed?: integer - time?: integer - } - relationships: { - } - included: { - }[] -} -``` - -- 400 Invalid request - -`application/json` - -```ts -{ - title?: string - type?: string - status?: integer -} -``` - -- 401 Authentication failed - -`application/json` - -```ts -{ - title?: string - type?: string - status?: integer -} -``` - -- 404 Not Found - -`application/json` - -```ts -{ - message?: string - exception: { - type?: string - code?: integer - message?: string - file?: string - line?: integer - } -} -``` - -*** - -### [PATCH]/api/v2/ui/speeds/{id:[0-9]+}/relationships/{relation:task} - -- Security -bearerAuth - -#### RequestBody - -- application/json - -```ts -{ - data: { - type?: string - attributes: { - } - } -} -``` - -#### Responses - -- 200 successful operation - -`application/json` - -```ts -{ - jsonapi: { - version?: string //default: 1.1 - ext?: string //default: https://jsonapi.org/profiles/ethanresnick/cursor-pagination - } - id?: integer - type?: string //default: Speed - data: { - agentId?: integer - taskId?: integer - speed?: integer - time?: integer - } -} -``` - -- 400 Invalid request - -`application/json` - -```ts -{ - title?: string - type?: string - status?: integer -} -``` - -- 401 Authentication failed - -`application/json` - -```ts -{ - title?: string - type?: string - status?: integer -} -``` - -- 404 Not Found - -`application/json` - -```ts -{ - message?: string - exception: { - type?: string - code?: integer - message?: string - file?: string - line?: integer - } -} -``` - -*** - -### [GET]/api/v2/ui/speeds/{id:[0-9]+} - -- Description -GET request to retrieve a single object. - -- Security -bearerAuth - -#### Parameters(Query) - -```ts -include?: string -``` - -#### Responses - -- 200 successful operation - -`application/json` - -```ts -{ - jsonapi: { - version?: string //default: 1.1 - ext?: string //default: https://jsonapi.org/profiles/ethanresnick/cursor-pagination - } - links: { - self?: string //default: /api/v2/ui/speeds?page[size]=25 - first?: string //default: /api/v2/ui/speeds?page[size]=25&page[after]=0 - last?: string //default: /api/v2/ui/speeds?page[size]=25&page[before]=500 - next?: string //default: /api/v2/ui/speeds?page[size]=25&page[after]=25 - previous?: string //default: /api/v2/ui/speeds?page[size]=25&page[before]=25 - } - id?: integer - type?: string //default: Speed - data: { - agentId?: integer - taskId?: integer - speed?: integer - time?: integer - } - relationships: { - } - included: { - }[] -} -``` - -- 400 Invalid request - -`application/json` - -```ts -{ - title?: string - type?: string - status?: integer -} -``` - -- 401 Authentication failed - -`application/json` - -```ts -{ - title?: string - type?: string - status?: integer -} -``` - -- 404 Not Found - -`application/json` - -```ts -{ - message?: string - exception: { - type?: string - code?: integer - message?: string - file?: string - line?: integer - } -} -``` - -*** - -### [GET]/api/v2/ui/supertasks - -- Description -GET many request to retrieve multiple objects. - -- Security -bearerAuth - -#### Parameters(Query) - -```ts -page[after]?: integer -``` - -```ts -page[before]?: integer -``` - -```ts -page[size]?: integer -``` - -```ts -filter: { -} -``` - -```ts -include?: string -``` - -#### Responses - -- 200 successful operation - -`application/json` - -```ts -{ - jsonapi: { - version?: string //default: 1.1 - ext?: string //default: https://jsonapi.org/profiles/ethanresnick/cursor-pagination - } - links: { - self?: string //default: /api/v2/ui/supertasks?page[size]=25 - first?: string //default: /api/v2/ui/supertasks?page[size]=25&page[after]=0 - last?: string //default: /api/v2/ui/supertasks?page[size]=25&page[before]=500 - next?: string //default: /api/v2/ui/supertasks?page[size]=25&page[after]=25 - previous?: string //default: /api/v2/ui/supertasks?page[size]=25&page[before]=25 - } - id?: integer - type?: string //default: Supertask - data: { - supertaskName?: string - } - relationships: { - } - included: { - }[] -}[] -``` - -- 400 Invalid request - -`application/json` - -```ts -{ - title?: string - type?: string - status?: integer -} -``` - -- 401 Authentication failed - -`application/json` - -```ts -{ - title?: string - type?: string - status?: integer -} -``` - -*** - -### [POST]/api/v2/ui/supertasks - -- Description -POST request to create a new object. The request must contain the resource record as data with the attributes of the new object.To add relationships, a relationships object can be added with the resource records of the relations that are part of this object. - -- Security -bearerAuth - -#### RequestBody - -- application/json - -```ts -{ - data: { - type?: string - attributes: { -[] - supertaskName?: string - } - } -} -``` - -#### Responses - -- 201 successful operation - -`application/json` - -```ts -{ - jsonapi: { - version?: string //default: 1.1 - ext?: string //default: https://jsonapi.org/profiles/ethanresnick/cursor-pagination - } - id?: integer - type?: string //default: Supertask - data: { - supertaskName?: string - } -} -``` - -- 400 Invalid request - -`application/json` - -```ts -{ - title?: string - type?: string - status?: integer -} -``` - -- 401 Authentication failed - -`application/json` - -```ts -{ - title?: string - type?: string - status?: integer -} -``` - -*** - -### [GET]/api/v2/ui/supertasks/count - -- Description -GET many request to retrieve multiple objects. - -- Security -bearerAuth - -#### Parameters(Query) - -```ts -page[after]?: integer -``` - -```ts -page[before]?: integer -``` - -```ts -page[size]?: integer -``` - -```ts -filter: { -} -``` - -```ts -include?: string -``` - -#### Responses - -- 200 successful operation - -`application/json` - -```ts -{ - jsonapi: { - version?: string //default: 1.1 - ext?: string //default: https://jsonapi.org/profiles/ethanresnick/cursor-pagination - } - links: { - self?: string //default: /api/v2/ui/supertasks?page[size]=25 - first?: string //default: /api/v2/ui/supertasks?page[size]=25&page[after]=0 - last?: string //default: /api/v2/ui/supertasks?page[size]=25&page[before]=500 - next?: string //default: /api/v2/ui/supertasks?page[size]=25&page[after]=25 - previous?: string //default: /api/v2/ui/supertasks?page[size]=25&page[before]=25 - } - id?: integer - type?: string //default: Supertask - data: { - supertaskName?: string - } - relationships: { - } - included: { - }[] -}[] -``` - -- 400 Invalid request - -`application/json` - -```ts -{ - title?: string - type?: string - status?: integer -} -``` - -- 401 Authentication failed - -`application/json` - -```ts -{ - title?: string - type?: string - status?: integer -} -``` - -*** - -### [GET]/api/v2/ui/supertasks/{id:[0-9]+}/{relation:pretasks} - -- Description -GET request for for a to-one relationship link. Returns the resource record of the object that is part of the specified relation. - -- Security -bearerAuth - -#### Parameters(Query) - -```ts -include?: string -``` - -#### Responses - -- 200 successful operation - -`application/json` - -```ts -{ - jsonapi: { - version?: string //default: 1.1 - ext?: string //default: https://jsonapi.org/profiles/ethanresnick/cursor-pagination - } - links: { - self?: string //default: /api/v2/ui/supertasks?page[size]=25 - first?: string //default: /api/v2/ui/supertasks?page[size]=25&page[after]=0 - last?: string //default: /api/v2/ui/supertasks?page[size]=25&page[before]=500 - next?: string //default: /api/v2/ui/supertasks?page[size]=25&page[after]=25 - previous?: string //default: /api/v2/ui/supertasks?page[size]=25&page[before]=25 - } - id?: integer - type?: string //default: Supertask - data: { - supertaskName?: string - } - relationships: { - } - included: { - }[] -} -``` - -- 400 Invalid request - -`application/json` - -```ts -{ - title?: string - type?: string - status?: integer -} -``` - -- 401 Authentication failed - -`application/json` - -```ts -{ - title?: string - type?: string - status?: integer -} -``` - -- 404 Not Found - -`application/json` - -```ts -{ - message?: string - exception: { - type?: string - code?: integer - message?: string - file?: string - line?: integer - } -} -``` - -*** - -### [GET]/api/v2/ui/supertasks/{id:[0-9]+}/relationships/{relation:pretasks} - -- Description -GET request for for a to-one relationship link. Returns the resource record of the object that is part of the specified relation. - -- Security -bearerAuth - -#### Parameters(Query) - -```ts -include?: string -``` - -#### Responses - -- 200 successful operation - -`application/json` - -```ts -{ - jsonapi: { - version?: string //default: 1.1 - ext?: string //default: https://jsonapi.org/profiles/ethanresnick/cursor-pagination - } - links: { - self?: string //default: /api/v2/ui/supertasks?page[size]=25 - first?: string //default: /api/v2/ui/supertasks?page[size]=25&page[after]=0 - last?: string //default: /api/v2/ui/supertasks?page[size]=25&page[before]=500 - next?: string //default: /api/v2/ui/supertasks?page[size]=25&page[after]=25 - previous?: string //default: /api/v2/ui/supertasks?page[size]=25&page[before]=25 - } - id?: integer - type?: string //default: Supertask - data: { - supertaskName?: string - } - relationships: { - } - included: { - }[] -} -``` - -- 400 Invalid request - -`application/json` - -```ts -{ - title?: string - type?: string - status?: integer -} -``` - -- 401 Authentication failed - -`application/json` - -```ts -{ - title?: string - type?: string - status?: integer -} -``` - -- 404 Not Found - -`application/json` - -```ts -{ - message?: string - exception: { - type?: string - code?: integer - message?: string - file?: string - line?: integer - } -} -``` - -*** - -### [PATCH]/api/v2/ui/supertasks/{id:[0-9]+}/relationships/{relation:pretasks} - -- Security -bearerAuth - -#### RequestBody - -- application/json - -```ts -{ - data: { - type?: string - attributes: { - supertaskName?: string - } - } -} -``` - -#### Responses - -- 200 successful operation - -`application/json` - -```ts -{ - jsonapi: { - version?: string //default: 1.1 - ext?: string //default: https://jsonapi.org/profiles/ethanresnick/cursor-pagination - } - id?: integer - type?: string //default: Supertask - data: { - supertaskName?: string - } -} -``` - -- 400 Invalid request - -`application/json` - -```ts -{ - title?: string - type?: string - status?: integer -} -``` - -- 401 Authentication failed - -`application/json` - -```ts -{ - title?: string - type?: string - status?: integer -} -``` - -- 404 Not Found - -`application/json` - -```ts -{ - message?: string - exception: { - type?: string - code?: integer - message?: string - file?: string - line?: integer - } -} -``` - -*** - -### [POST]/api/v2/ui/supertasks/{id:[0-9]+}/relationships/{relation:pretasks} - -- Security -bearerAuth - -#### RequestBody - -- application/json - -#### Responses - -- 204 successfully created - -- 400 Invalid request - -`application/json` - -```ts -{ - title?: string - type?: string - status?: integer -} -``` - -- 401 Authentication failed - -`application/json` - -```ts -{ - title?: string - type?: string - status?: integer -} -``` - -- 404 Not Found - -`application/json` - -```ts -{ - message?: string - exception: { - type?: string - code?: integer - message?: string - file?: string - line?: integer - } -} -``` - -*** - -### [DELETE]/api/v2/ui/supertasks/{id:[0-9]+}/relationships/{relation:pretasks} - -- Security -bearerAuth - -#### RequestBody - -- application/json - -#### Responses - -- 204 successfully deleted - -- 400 Invalid request - -`application/json` - -```ts -{ - title?: string - type?: string - status?: integer -} -``` - -- 401 Authentication failed - -`application/json` - -```ts -{ - title?: string - type?: string - status?: integer -} -``` - -- 404 Not Found - -`application/json` - -```ts -{ - message?: string - exception: { - type?: string - code?: integer - message?: string - file?: string - line?: integer - } -} -``` - -*** - -### [GET]/api/v2/ui/supertasks/{id:[0-9]+} - -- Description -GET request to retrieve a single object. - -- Security -bearerAuth - -#### Parameters(Query) - -```ts -include?: string -``` - -#### Responses - -- 200 successful operation - -`application/json` - -```ts -{ - jsonapi: { - version?: string //default: 1.1 - ext?: string //default: https://jsonapi.org/profiles/ethanresnick/cursor-pagination - } - links: { - self?: string //default: /api/v2/ui/supertasks?page[size]=25 - first?: string //default: /api/v2/ui/supertasks?page[size]=25&page[after]=0 - last?: string //default: /api/v2/ui/supertasks?page[size]=25&page[before]=500 - next?: string //default: /api/v2/ui/supertasks?page[size]=25&page[after]=25 - previous?: string //default: /api/v2/ui/supertasks?page[size]=25&page[before]=25 - } - id?: integer - type?: string //default: Supertask - data: { - supertaskName?: string - } - relationships: { - } - included: { - }[] -} -``` - -- 400 Invalid request - -`application/json` - -```ts -{ - title?: string - type?: string - status?: integer -} -``` - -- 401 Authentication failed - -`application/json` - -```ts -{ - title?: string - type?: string - status?: integer -} -``` - -- 404 Not Found - -`application/json` - -```ts -{ - message?: string - exception: { - type?: string - code?: integer - message?: string - file?: string - line?: integer - } -} -``` - -*** - -### [PATCH]/api/v2/ui/supertasks/{id:[0-9]+} - -- Description -PATCH request to update attributes of a single object. - -- Security -bearerAuth - -#### RequestBody - -- application/json - -```ts -{ - data: { - type?: string - attributes: { - supertaskName?: string - } - } -} -``` - -#### Responses - -- 200 successful operation - -`application/json` - -```ts -{ - jsonapi: { - version?: string //default: 1.1 - ext?: string //default: https://jsonapi.org/profiles/ethanresnick/cursor-pagination - } - id?: integer - type?: string //default: Supertask - data: { - supertaskName?: string - } -} -``` - -- 400 Invalid request - -`application/json` - -```ts -{ - title?: string - type?: string - status?: integer -} -``` - -- 401 Authentication failed - -`application/json` - -```ts -{ - title?: string - type?: string - status?: integer -} -``` - -- 404 Not Found - -`application/json` - -```ts -{ - message?: string - exception: { - type?: string - code?: integer - message?: string - file?: string - line?: integer - } -} -``` - -*** - -### [DELETE]/api/v2/ui/supertasks/{id:[0-9]+} - -- Security -bearerAuth - -#### RequestBody - -- application/json - -#### Responses - -- 204 successfully deleted - -- 400 Invalid request - -`application/json` - -```ts -{ - title?: string - type?: string - status?: integer -} -``` - -- 401 Authentication failed - -`application/json` - -```ts -{ - title?: string - type?: string - status?: integer -} -``` - -- 404 Not Found - -`application/json` - -```ts -{ - message?: string - exception: { - type?: string - code?: integer - message?: string - file?: string - line?: integer - } -} -``` - -*** - -### [GET]/api/v2/ui/tasks - -- Description -GET many request to retrieve multiple objects. - -- Security -bearerAuth - -#### Parameters(Query) - -```ts -page[after]?: integer -``` - -```ts -page[before]?: integer -``` - -```ts -page[size]?: integer -``` - -```ts -filter: { -} -``` - -```ts -include?: string -``` - -#### Responses - -- 200 successful operation - -`application/json` - -```ts -{ - jsonapi: { - version?: string //default: 1.1 - ext?: string //default: https://jsonapi.org/profiles/ethanresnick/cursor-pagination - } - links: { - self?: string //default: /api/v2/ui/tasks?page[size]=25 - first?: string //default: /api/v2/ui/tasks?page[size]=25&page[after]=0 - last?: string //default: /api/v2/ui/tasks?page[size]=25&page[before]=500 - next?: string //default: /api/v2/ui/tasks?page[size]=25&page[after]=25 - previous?: string //default: /api/v2/ui/tasks?page[size]=25&page[before]=25 - } - id?: integer - type?: string //default: Task - data: { - taskName?: string - attackCmd?: string - chunkTime?: integer - statusTimer?: integer - keyspace?: integer - keyspaceProgress?: integer - priority?: integer - maxAgents?: integer - color?: string - isSmall?: boolean - isCpuTask?: boolean - useNewBench?: boolean - skipKeyspace?: integer - crackerBinaryId?: integer - crackerBinaryTypeId?: integer - taskWrapperId?: integer - isArchived?: boolean - notes?: string - staticChunks?: integer - chunkSize?: integer - forcePipe?: boolean - preprocessorId?: integer - preprocessorCommand?: string - } - relationships: { - } - included: { - }[] -}[] -``` - -- 400 Invalid request - -`application/json` - -```ts -{ - title?: string - type?: string - status?: integer -} -``` - -- 401 Authentication failed - -`application/json` - -```ts -{ - title?: string - type?: string - status?: integer -} -``` - -*** - -### [POST]/api/v2/ui/tasks - -- Description -POST request to create a new object. The request must contain the resource record as data with the attributes of the new object.To add relationships, a relationships object can be added with the resource records of the relations that are part of this object. - -- Security -bearerAuth - -#### RequestBody - -- application/json - -```ts -{ - data: { - type?: string - attributes: { - hashlistId?: integer -[] - taskName?: string - attackCmd?: string - chunkTime?: integer - statusTimer?: integer - keyspace?: integer - keyspaceProgress?: integer - priority?: integer - maxAgents?: integer - color?: string - isSmall?: boolean - isCpuTask?: boolean - useNewBench?: boolean - skipKeyspace?: integer - crackerBinaryId?: integer - crackerBinaryTypeId?: integer - taskWrapperId?: integer - isArchived?: boolean - notes?: string - staticChunks?: integer - chunkSize?: integer - forcePipe?: boolean - preprocessorId?: integer - preprocessorCommand?: string - } - } -} -``` - -#### Responses - -- 201 successful operation - -`application/json` - -```ts -{ - jsonapi: { - version?: string //default: 1.1 - ext?: string //default: https://jsonapi.org/profiles/ethanresnick/cursor-pagination - } - id?: integer - type?: string //default: Task - data: { - taskName?: string - attackCmd?: string - chunkTime?: integer - statusTimer?: integer - keyspace?: integer - keyspaceProgress?: integer - priority?: integer - maxAgents?: integer - color?: string - isSmall?: boolean - isCpuTask?: boolean - useNewBench?: boolean - skipKeyspace?: integer - crackerBinaryId?: integer - crackerBinaryTypeId?: integer - taskWrapperId?: integer - isArchived?: boolean - notes?: string - staticChunks?: integer - chunkSize?: integer - forcePipe?: boolean - preprocessorId?: integer - preprocessorCommand?: string - } -} -``` - -- 400 Invalid request - -`application/json` - -```ts -{ - title?: string - type?: string - status?: integer -} -``` - -- 401 Authentication failed - -`application/json` - -```ts -{ - title?: string - type?: string - status?: integer -} -``` - -*** - -### [GET]/api/v2/ui/tasks/count - -- Description -GET many request to retrieve multiple objects. - -- Security -bearerAuth - -#### Parameters(Query) - -```ts -page[after]?: integer -``` - -```ts -page[before]?: integer -``` - -```ts -page[size]?: integer -``` - -```ts -filter: { -} -``` - -```ts -include?: string -``` - -#### Responses - -- 200 successful operation - -`application/json` - -```ts -{ - jsonapi: { - version?: string //default: 1.1 - ext?: string //default: https://jsonapi.org/profiles/ethanresnick/cursor-pagination - } - links: { - self?: string //default: /api/v2/ui/tasks?page[size]=25 - first?: string //default: /api/v2/ui/tasks?page[size]=25&page[after]=0 - last?: string //default: /api/v2/ui/tasks?page[size]=25&page[before]=500 - next?: string //default: /api/v2/ui/tasks?page[size]=25&page[after]=25 - previous?: string //default: /api/v2/ui/tasks?page[size]=25&page[before]=25 - } - id?: integer - type?: string //default: Task - data: { - taskName?: string - attackCmd?: string - chunkTime?: integer - statusTimer?: integer - keyspace?: integer - keyspaceProgress?: integer - priority?: integer - maxAgents?: integer - color?: string - isSmall?: boolean - isCpuTask?: boolean - useNewBench?: boolean - skipKeyspace?: integer - crackerBinaryId?: integer - crackerBinaryTypeId?: integer - taskWrapperId?: integer - isArchived?: boolean - notes?: string - staticChunks?: integer - chunkSize?: integer - forcePipe?: boolean - preprocessorId?: integer - preprocessorCommand?: string - } - relationships: { - } - included: { - }[] -}[] -``` - -- 400 Invalid request - -`application/json` - -```ts -{ - title?: string - type?: string - status?: integer -} -``` - -- 401 Authentication failed - -`application/json` - -```ts -{ - title?: string - type?: string - status?: integer -} -``` - -*** - -### [GET]/api/v2/ui/tasks/{id:[0-9]+}/{relation:crackerBinary} - -- Description -GET request for for a to-one relationship link. Returns the resource record of the object that is part of the specified relation. - -- Security -bearerAuth - -#### Parameters(Query) - -```ts -include?: string -``` - -#### Responses - -- 200 successful operation - -`application/json` - -```ts -{ - jsonapi: { - version?: string //default: 1.1 - ext?: string //default: https://jsonapi.org/profiles/ethanresnick/cursor-pagination - } - links: { - self?: string //default: /api/v2/ui/tasks?page[size]=25 - first?: string //default: /api/v2/ui/tasks?page[size]=25&page[after]=0 - last?: string //default: /api/v2/ui/tasks?page[size]=25&page[before]=500 - next?: string //default: /api/v2/ui/tasks?page[size]=25&page[after]=25 - previous?: string //default: /api/v2/ui/tasks?page[size]=25&page[before]=25 - } - id?: integer - type?: string //default: Task - data: { - taskName?: string - attackCmd?: string - chunkTime?: integer - statusTimer?: integer - keyspace?: integer - keyspaceProgress?: integer - priority?: integer - maxAgents?: integer - color?: string - isSmall?: boolean - isCpuTask?: boolean - useNewBench?: boolean - skipKeyspace?: integer - crackerBinaryId?: integer - crackerBinaryTypeId?: integer - taskWrapperId?: integer - isArchived?: boolean - notes?: string - staticChunks?: integer - chunkSize?: integer - forcePipe?: boolean - preprocessorId?: integer - preprocessorCommand?: string - } - relationships: { - } - included: { - }[] -} -``` - -- 400 Invalid request - -`application/json` - -```ts -{ - title?: string - type?: string - status?: integer -} -``` - -- 401 Authentication failed - -`application/json` - -```ts -{ - title?: string - type?: string - status?: integer -} -``` - -- 404 Not Found - -`application/json` - -```ts -{ - message?: string - exception: { - type?: string - code?: integer - message?: string - file?: string - line?: integer - } -} -``` - -*** - -### [GET]/api/v2/ui/tasks/{id:[0-9]+}/relationships/{relation:crackerBinary} - -- Description -GET request for for a to-one relationship link. Returns the resource record of the object that is part of the specified relation. - -- Security -bearerAuth - -#### Parameters(Query) - -```ts -include?: string -``` - -#### Responses - -- 200 successful operation - -`application/json` - -```ts -{ - jsonapi: { - version?: string //default: 1.1 - ext?: string //default: https://jsonapi.org/profiles/ethanresnick/cursor-pagination - } - links: { - self?: string //default: /api/v2/ui/tasks?page[size]=25 - first?: string //default: /api/v2/ui/tasks?page[size]=25&page[after]=0 - last?: string //default: /api/v2/ui/tasks?page[size]=25&page[before]=500 - next?: string //default: /api/v2/ui/tasks?page[size]=25&page[after]=25 - previous?: string //default: /api/v2/ui/tasks?page[size]=25&page[before]=25 - } - id?: integer - type?: string //default: Task - data: { - taskName?: string - attackCmd?: string - chunkTime?: integer - statusTimer?: integer - keyspace?: integer - keyspaceProgress?: integer - priority?: integer - maxAgents?: integer - color?: string - isSmall?: boolean - isCpuTask?: boolean - useNewBench?: boolean - skipKeyspace?: integer - crackerBinaryId?: integer - crackerBinaryTypeId?: integer - taskWrapperId?: integer - isArchived?: boolean - notes?: string - staticChunks?: integer - chunkSize?: integer - forcePipe?: boolean - preprocessorId?: integer - preprocessorCommand?: string - } - relationships: { - } - included: { - }[] -} -``` - -- 400 Invalid request - -`application/json` - -```ts -{ - title?: string - type?: string - status?: integer -} -``` - -- 401 Authentication failed - -`application/json` - -```ts -{ - title?: string - type?: string - status?: integer -} -``` - -- 404 Not Found - -`application/json` - -```ts -{ - message?: string - exception: { - type?: string - code?: integer - message?: string - file?: string - line?: integer - } -} -``` - -*** - -### [PATCH]/api/v2/ui/tasks/{id:[0-9]+}/relationships/{relation:crackerBinary} - -- Security -bearerAuth - -#### RequestBody - -- application/json - -```ts -{ - data: { - type?: string - attributes: { - attackCmd?: string - chunkTime?: integer - color?: string - isArchived?: boolean - isCpuTask?: boolean - isSmall?: boolean - maxAgents?: integer - notes?: string - priority?: integer - statusTimer?: integer - taskName?: string - } - } -} -``` - -#### Responses - -- 200 successful operation - -`application/json` - -```ts -{ - jsonapi: { - version?: string //default: 1.1 - ext?: string //default: https://jsonapi.org/profiles/ethanresnick/cursor-pagination - } - id?: integer - type?: string //default: Task - data: { - taskName?: string - attackCmd?: string - chunkTime?: integer - statusTimer?: integer - keyspace?: integer - keyspaceProgress?: integer - priority?: integer - maxAgents?: integer - color?: string - isSmall?: boolean - isCpuTask?: boolean - useNewBench?: boolean - skipKeyspace?: integer - crackerBinaryId?: integer - crackerBinaryTypeId?: integer - taskWrapperId?: integer - isArchived?: boolean - notes?: string - staticChunks?: integer - chunkSize?: integer - forcePipe?: boolean - preprocessorId?: integer - preprocessorCommand?: string - } -} -``` - -- 400 Invalid request - -`application/json` - -```ts -{ - title?: string - type?: string - status?: integer -} -``` - -- 401 Authentication failed - -`application/json` - -```ts -{ - title?: string - type?: string - status?: integer -} -``` - -- 404 Not Found - -`application/json` - -```ts -{ - message?: string - exception: { - type?: string - code?: integer - message?: string - file?: string - line?: integer - } -} -``` - -*** - -### [GET]/api/v2/ui/tasks/{id:[0-9]+}/{relation:crackerBinaryType} - -- Description -GET request for for a to-one relationship link. Returns the resource record of the object that is part of the specified relation. - -- Security -bearerAuth - -#### Parameters(Query) - -```ts -include?: string -``` - -#### Responses - -- 200 successful operation - -`application/json` - -```ts -{ - jsonapi: { - version?: string //default: 1.1 - ext?: string //default: https://jsonapi.org/profiles/ethanresnick/cursor-pagination - } - links: { - self?: string //default: /api/v2/ui/tasks?page[size]=25 - first?: string //default: /api/v2/ui/tasks?page[size]=25&page[after]=0 - last?: string //default: /api/v2/ui/tasks?page[size]=25&page[before]=500 - next?: string //default: /api/v2/ui/tasks?page[size]=25&page[after]=25 - previous?: string //default: /api/v2/ui/tasks?page[size]=25&page[before]=25 - } - id?: integer - type?: string //default: Task - data: { - taskName?: string - attackCmd?: string - chunkTime?: integer - statusTimer?: integer - keyspace?: integer - keyspaceProgress?: integer - priority?: integer - maxAgents?: integer - color?: string - isSmall?: boolean - isCpuTask?: boolean - useNewBench?: boolean - skipKeyspace?: integer - crackerBinaryId?: integer - crackerBinaryTypeId?: integer - taskWrapperId?: integer - isArchived?: boolean - notes?: string - staticChunks?: integer - chunkSize?: integer - forcePipe?: boolean - preprocessorId?: integer - preprocessorCommand?: string - } - relationships: { - } - included: { - }[] -} -``` - -- 400 Invalid request - -`application/json` - -```ts -{ - title?: string - type?: string - status?: integer -} -``` - -- 401 Authentication failed - -`application/json` - -```ts -{ - title?: string - type?: string - status?: integer -} -``` - -- 404 Not Found - -`application/json` - -```ts -{ - message?: string - exception: { - type?: string - code?: integer - message?: string - file?: string - line?: integer - } -} -``` - -*** - -### [GET]/api/v2/ui/tasks/{id:[0-9]+}/relationships/{relation:crackerBinaryType} - -- Description -GET request for for a to-one relationship link. Returns the resource record of the object that is part of the specified relation. - -- Security -bearerAuth - -#### Parameters(Query) - -```ts -include?: string -``` - -#### Responses - -- 200 successful operation - -`application/json` - -```ts -{ - jsonapi: { - version?: string //default: 1.1 - ext?: string //default: https://jsonapi.org/profiles/ethanresnick/cursor-pagination - } - links: { - self?: string //default: /api/v2/ui/tasks?page[size]=25 - first?: string //default: /api/v2/ui/tasks?page[size]=25&page[after]=0 - last?: string //default: /api/v2/ui/tasks?page[size]=25&page[before]=500 - next?: string //default: /api/v2/ui/tasks?page[size]=25&page[after]=25 - previous?: string //default: /api/v2/ui/tasks?page[size]=25&page[before]=25 - } - id?: integer - type?: string //default: Task - data: { - taskName?: string - attackCmd?: string - chunkTime?: integer - statusTimer?: integer - keyspace?: integer - keyspaceProgress?: integer - priority?: integer - maxAgents?: integer - color?: string - isSmall?: boolean - isCpuTask?: boolean - useNewBench?: boolean - skipKeyspace?: integer - crackerBinaryId?: integer - crackerBinaryTypeId?: integer - taskWrapperId?: integer - isArchived?: boolean - notes?: string - staticChunks?: integer - chunkSize?: integer - forcePipe?: boolean - preprocessorId?: integer - preprocessorCommand?: string - } - relationships: { - } - included: { - }[] -} -``` - -- 400 Invalid request - -`application/json` - -```ts -{ - title?: string - type?: string - status?: integer -} -``` - -- 401 Authentication failed - -`application/json` - -```ts -{ - title?: string - type?: string - status?: integer -} -``` - -- 404 Not Found - -`application/json` - -```ts -{ - message?: string - exception: { - type?: string - code?: integer - message?: string - file?: string - line?: integer - } -} -``` - -*** - -### [PATCH]/api/v2/ui/tasks/{id:[0-9]+}/relationships/{relation:crackerBinaryType} - -- Security -bearerAuth - -#### RequestBody - -- application/json - -```ts -{ - data: { - type?: string - attributes: { - attackCmd?: string - chunkTime?: integer - color?: string - isArchived?: boolean - isCpuTask?: boolean - isSmall?: boolean - maxAgents?: integer - notes?: string - priority?: integer - statusTimer?: integer - taskName?: string - } - } -} -``` - -#### Responses - -- 200 successful operation - -`application/json` - -```ts -{ - jsonapi: { - version?: string //default: 1.1 - ext?: string //default: https://jsonapi.org/profiles/ethanresnick/cursor-pagination - } - id?: integer - type?: string //default: Task - data: { - taskName?: string - attackCmd?: string - chunkTime?: integer - statusTimer?: integer - keyspace?: integer - keyspaceProgress?: integer - priority?: integer - maxAgents?: integer - color?: string - isSmall?: boolean - isCpuTask?: boolean - useNewBench?: boolean - skipKeyspace?: integer - crackerBinaryId?: integer - crackerBinaryTypeId?: integer - taskWrapperId?: integer - isArchived?: boolean - notes?: string - staticChunks?: integer - chunkSize?: integer - forcePipe?: boolean - preprocessorId?: integer - preprocessorCommand?: string - } -} -``` - -- 400 Invalid request - -`application/json` - -```ts -{ - title?: string - type?: string - status?: integer -} -``` - -- 401 Authentication failed - -`application/json` - -```ts -{ - title?: string - type?: string - status?: integer -} -``` - -- 404 Not Found - -`application/json` - -```ts -{ - message?: string - exception: { - type?: string - code?: integer - message?: string - file?: string - line?: integer - } -} -``` - -*** - -### [GET]/api/v2/ui/tasks/{id:[0-9]+}/{relation:hashlist} - -- Description -GET request for for a to-one relationship link. Returns the resource record of the object that is part of the specified relation. - -- Security -bearerAuth - -#### Parameters(Query) - -```ts -include?: string -``` - -#### Responses - -- 200 successful operation - -`application/json` - -```ts -{ - jsonapi: { - version?: string //default: 1.1 - ext?: string //default: https://jsonapi.org/profiles/ethanresnick/cursor-pagination - } - links: { - self?: string //default: /api/v2/ui/tasks?page[size]=25 - first?: string //default: /api/v2/ui/tasks?page[size]=25&page[after]=0 - last?: string //default: /api/v2/ui/tasks?page[size]=25&page[before]=500 - next?: string //default: /api/v2/ui/tasks?page[size]=25&page[after]=25 - previous?: string //default: /api/v2/ui/tasks?page[size]=25&page[before]=25 - } - id?: integer - type?: string //default: Task - data: { - taskName?: string - attackCmd?: string - chunkTime?: integer - statusTimer?: integer - keyspace?: integer - keyspaceProgress?: integer - priority?: integer - maxAgents?: integer - color?: string - isSmall?: boolean - isCpuTask?: boolean - useNewBench?: boolean - skipKeyspace?: integer - crackerBinaryId?: integer - crackerBinaryTypeId?: integer - taskWrapperId?: integer - isArchived?: boolean - notes?: string - staticChunks?: integer - chunkSize?: integer - forcePipe?: boolean - preprocessorId?: integer - preprocessorCommand?: string - } - relationships: { - } - included: { - }[] -} -``` - -- 400 Invalid request - -`application/json` - -```ts -{ - title?: string - type?: string - status?: integer -} -``` - -- 401 Authentication failed - -`application/json` - -```ts -{ - title?: string - type?: string - status?: integer -} -``` - -- 404 Not Found - -`application/json` - -```ts -{ - message?: string - exception: { - type?: string - code?: integer - message?: string - file?: string - line?: integer - } -} -``` - -*** - -### [GET]/api/v2/ui/tasks/{id:[0-9]+}/relationships/{relation:hashlist} - -- Description -GET request for for a to-one relationship link. Returns the resource record of the object that is part of the specified relation. - -- Security -bearerAuth - -#### Parameters(Query) - -```ts -include?: string -``` - -#### Responses - -- 200 successful operation - -`application/json` - -```ts -{ - jsonapi: { - version?: string //default: 1.1 - ext?: string //default: https://jsonapi.org/profiles/ethanresnick/cursor-pagination - } - links: { - self?: string //default: /api/v2/ui/tasks?page[size]=25 - first?: string //default: /api/v2/ui/tasks?page[size]=25&page[after]=0 - last?: string //default: /api/v2/ui/tasks?page[size]=25&page[before]=500 - next?: string //default: /api/v2/ui/tasks?page[size]=25&page[after]=25 - previous?: string //default: /api/v2/ui/tasks?page[size]=25&page[before]=25 - } - id?: integer - type?: string //default: Task - data: { - taskName?: string - attackCmd?: string - chunkTime?: integer - statusTimer?: integer - keyspace?: integer - keyspaceProgress?: integer - priority?: integer - maxAgents?: integer - color?: string - isSmall?: boolean - isCpuTask?: boolean - useNewBench?: boolean - skipKeyspace?: integer - crackerBinaryId?: integer - crackerBinaryTypeId?: integer - taskWrapperId?: integer - isArchived?: boolean - notes?: string - staticChunks?: integer - chunkSize?: integer - forcePipe?: boolean - preprocessorId?: integer - preprocessorCommand?: string - } - relationships: { - } - included: { - }[] -} -``` - -- 400 Invalid request - -`application/json` - -```ts -{ - title?: string - type?: string - status?: integer -} -``` - -- 401 Authentication failed - -`application/json` - -```ts -{ - title?: string - type?: string - status?: integer -} -``` - -- 404 Not Found - -`application/json` - -```ts -{ - message?: string - exception: { - type?: string - code?: integer - message?: string - file?: string - line?: integer - } -} -``` - -*** - -### [PATCH]/api/v2/ui/tasks/{id:[0-9]+}/relationships/{relation:hashlist} - -- Security -bearerAuth - -#### RequestBody - -- application/json - -```ts -{ - data: { - type?: string - attributes: { - attackCmd?: string - chunkTime?: integer - color?: string - isArchived?: boolean - isCpuTask?: boolean - isSmall?: boolean - maxAgents?: integer - notes?: string - priority?: integer - statusTimer?: integer - taskName?: string - } - } -} -``` - -#### Responses - -- 200 successful operation - -`application/json` - -```ts -{ - jsonapi: { - version?: string //default: 1.1 - ext?: string //default: https://jsonapi.org/profiles/ethanresnick/cursor-pagination - } - id?: integer - type?: string //default: Task - data: { - taskName?: string - attackCmd?: string - chunkTime?: integer - statusTimer?: integer - keyspace?: integer - keyspaceProgress?: integer - priority?: integer - maxAgents?: integer - color?: string - isSmall?: boolean - isCpuTask?: boolean - useNewBench?: boolean - skipKeyspace?: integer - crackerBinaryId?: integer - crackerBinaryTypeId?: integer - taskWrapperId?: integer - isArchived?: boolean - notes?: string - staticChunks?: integer - chunkSize?: integer - forcePipe?: boolean - preprocessorId?: integer - preprocessorCommand?: string - } -} -``` - -- 400 Invalid request - -`application/json` - -```ts -{ - title?: string - type?: string - status?: integer -} -``` - -- 401 Authentication failed - -`application/json` - -```ts -{ - title?: string - type?: string - status?: integer -} -``` - -- 404 Not Found - -`application/json` - -```ts -{ - message?: string - exception: { - type?: string - code?: integer - message?: string - file?: string - line?: integer - } -} -``` - -*** - -### [GET]/api/v2/ui/tasks/{id:[0-9]+}/{relation:assignedAgents} - -- Description -GET request for for a to-one relationship link. Returns the resource record of the object that is part of the specified relation. - -- Security -bearerAuth - -#### Parameters(Query) - -```ts -include?: string -``` - -#### Responses - -- 200 successful operation - -`application/json` - -```ts -{ - jsonapi: { - version?: string //default: 1.1 - ext?: string //default: https://jsonapi.org/profiles/ethanresnick/cursor-pagination - } - links: { - self?: string //default: /api/v2/ui/tasks?page[size]=25 - first?: string //default: /api/v2/ui/tasks?page[size]=25&page[after]=0 - last?: string //default: /api/v2/ui/tasks?page[size]=25&page[before]=500 - next?: string //default: /api/v2/ui/tasks?page[size]=25&page[after]=25 - previous?: string //default: /api/v2/ui/tasks?page[size]=25&page[before]=25 - } - id?: integer - type?: string //default: Task - data: { - taskName?: string - attackCmd?: string - chunkTime?: integer - statusTimer?: integer - keyspace?: integer - keyspaceProgress?: integer - priority?: integer - maxAgents?: integer - color?: string - isSmall?: boolean - isCpuTask?: boolean - useNewBench?: boolean - skipKeyspace?: integer - crackerBinaryId?: integer - crackerBinaryTypeId?: integer - taskWrapperId?: integer - isArchived?: boolean - notes?: string - staticChunks?: integer - chunkSize?: integer - forcePipe?: boolean - preprocessorId?: integer - preprocessorCommand?: string - } - relationships: { - } - included: { - }[] -} -``` - -- 400 Invalid request - -`application/json` - -```ts -{ - title?: string - type?: string - status?: integer -} -``` - -- 401 Authentication failed - -`application/json` - -```ts -{ - title?: string - type?: string - status?: integer -} -``` - -- 404 Not Found - -`application/json` - -```ts -{ - message?: string - exception: { - type?: string - code?: integer - message?: string - file?: string - line?: integer - } -} -``` - -*** - -### [GET]/api/v2/ui/tasks/{id:[0-9]+}/relationships/{relation:assignedAgents} - -- Description -GET request for for a to-one relationship link. Returns the resource record of the object that is part of the specified relation. - -- Security -bearerAuth - -#### Parameters(Query) - -```ts -include?: string -``` - -#### Responses - -- 200 successful operation - -`application/json` - -```ts -{ - jsonapi: { - version?: string //default: 1.1 - ext?: string //default: https://jsonapi.org/profiles/ethanresnick/cursor-pagination - } - links: { - self?: string //default: /api/v2/ui/tasks?page[size]=25 - first?: string //default: /api/v2/ui/tasks?page[size]=25&page[after]=0 - last?: string //default: /api/v2/ui/tasks?page[size]=25&page[before]=500 - next?: string //default: /api/v2/ui/tasks?page[size]=25&page[after]=25 - previous?: string //default: /api/v2/ui/tasks?page[size]=25&page[before]=25 - } - id?: integer - type?: string //default: Task - data: { - taskName?: string - attackCmd?: string - chunkTime?: integer - statusTimer?: integer - keyspace?: integer - keyspaceProgress?: integer - priority?: integer - maxAgents?: integer - color?: string - isSmall?: boolean - isCpuTask?: boolean - useNewBench?: boolean - skipKeyspace?: integer - crackerBinaryId?: integer - crackerBinaryTypeId?: integer - taskWrapperId?: integer - isArchived?: boolean - notes?: string - staticChunks?: integer - chunkSize?: integer - forcePipe?: boolean - preprocessorId?: integer - preprocessorCommand?: string - } - relationships: { - } - included: { - }[] -} -``` - -- 400 Invalid request - -`application/json` - -```ts -{ - title?: string - type?: string - status?: integer -} -``` - -- 401 Authentication failed - -`application/json` - -```ts -{ - title?: string - type?: string - status?: integer -} -``` - -- 404 Not Found - -`application/json` - -```ts -{ - message?: string - exception: { - type?: string - code?: integer - message?: string - file?: string - line?: integer - } -} -``` - -*** - -### [PATCH]/api/v2/ui/tasks/{id:[0-9]+}/relationships/{relation:assignedAgents} - -- Security -bearerAuth - -#### RequestBody - -- application/json - -```ts -{ - data: { - type?: string - attributes: { - attackCmd?: string - chunkTime?: integer - color?: string - isArchived?: boolean - isCpuTask?: boolean - isSmall?: boolean - maxAgents?: integer - notes?: string - priority?: integer - statusTimer?: integer - taskName?: string - } - } -} -``` - -#### Responses - -- 200 successful operation - -`application/json` - -```ts -{ - jsonapi: { - version?: string //default: 1.1 - ext?: string //default: https://jsonapi.org/profiles/ethanresnick/cursor-pagination - } - id?: integer - type?: string //default: Task - data: { - taskName?: string - attackCmd?: string - chunkTime?: integer - statusTimer?: integer - keyspace?: integer - keyspaceProgress?: integer - priority?: integer - maxAgents?: integer - color?: string - isSmall?: boolean - isCpuTask?: boolean - useNewBench?: boolean - skipKeyspace?: integer - crackerBinaryId?: integer - crackerBinaryTypeId?: integer - taskWrapperId?: integer - isArchived?: boolean - notes?: string - staticChunks?: integer - chunkSize?: integer - forcePipe?: boolean - preprocessorId?: integer - preprocessorCommand?: string - } -} -``` - -- 400 Invalid request - -`application/json` - -```ts -{ - title?: string - type?: string - status?: integer -} -``` - -- 401 Authentication failed - -`application/json` - -```ts -{ - title?: string - type?: string - status?: integer -} -``` - -- 404 Not Found - -`application/json` - -```ts -{ - message?: string - exception: { - type?: string - code?: integer - message?: string - file?: string - line?: integer - } -} -``` - -*** - -### [POST]/api/v2/ui/tasks/{id:[0-9]+}/relationships/{relation:assignedAgents} - -- Security -bearerAuth - -#### RequestBody - -- application/json - -#### Responses - -- 204 successfully created - -- 400 Invalid request - -`application/json` - -```ts -{ - title?: string - type?: string - status?: integer -} -``` - -- 401 Authentication failed - -`application/json` - -```ts -{ - title?: string - type?: string - status?: integer -} -``` - -- 404 Not Found - -`application/json` - -```ts -{ - message?: string - exception: { - type?: string - code?: integer - message?: string - file?: string - line?: integer - } -} -``` - -*** - -### [DELETE]/api/v2/ui/tasks/{id:[0-9]+}/relationships/{relation:assignedAgents} - -- Security -bearerAuth - -#### RequestBody - -- application/json - -#### Responses - -- 204 successfully deleted - -- 400 Invalid request - -`application/json` - -```ts -{ - title?: string - type?: string - status?: integer -} -``` - -- 401 Authentication failed - -`application/json` - -```ts -{ - title?: string - type?: string - status?: integer -} -``` - -- 404 Not Found - -`application/json` - -```ts -{ - message?: string - exception: { - type?: string - code?: integer - message?: string - file?: string - line?: integer - } -} -``` - -*** - -### [GET]/api/v2/ui/tasks/{id:[0-9]+}/{relation:files} - -- Description -GET request for for a to-one relationship link. Returns the resource record of the object that is part of the specified relation. - -- Security -bearerAuth - -#### Parameters(Query) - -```ts -include?: string -``` - -#### Responses - -- 200 successful operation - -`application/json` - -```ts -{ - jsonapi: { - version?: string //default: 1.1 - ext?: string //default: https://jsonapi.org/profiles/ethanresnick/cursor-pagination - } - links: { - self?: string //default: /api/v2/ui/tasks?page[size]=25 - first?: string //default: /api/v2/ui/tasks?page[size]=25&page[after]=0 - last?: string //default: /api/v2/ui/tasks?page[size]=25&page[before]=500 - next?: string //default: /api/v2/ui/tasks?page[size]=25&page[after]=25 - previous?: string //default: /api/v2/ui/tasks?page[size]=25&page[before]=25 - } - id?: integer - type?: string //default: Task - data: { - taskName?: string - attackCmd?: string - chunkTime?: integer - statusTimer?: integer - keyspace?: integer - keyspaceProgress?: integer - priority?: integer - maxAgents?: integer - color?: string - isSmall?: boolean - isCpuTask?: boolean - useNewBench?: boolean - skipKeyspace?: integer - crackerBinaryId?: integer - crackerBinaryTypeId?: integer - taskWrapperId?: integer - isArchived?: boolean - notes?: string - staticChunks?: integer - chunkSize?: integer - forcePipe?: boolean - preprocessorId?: integer - preprocessorCommand?: string - } - relationships: { - } - included: { - }[] -} -``` - -- 400 Invalid request - -`application/json` - -```ts -{ - title?: string - type?: string - status?: integer -} -``` - -- 401 Authentication failed - -`application/json` - -```ts -{ - title?: string - type?: string - status?: integer -} -``` - -- 404 Not Found - -`application/json` - -```ts -{ - message?: string - exception: { - type?: string - code?: integer - message?: string - file?: string - line?: integer - } -} -``` - -*** - -### [GET]/api/v2/ui/tasks/{id:[0-9]+}/relationships/{relation:files} - -- Description -GET request for for a to-one relationship link. Returns the resource record of the object that is part of the specified relation. - -- Security -bearerAuth - -#### Parameters(Query) - -```ts -include?: string -``` - -#### Responses - -- 200 successful operation - -`application/json` - -```ts -{ - jsonapi: { - version?: string //default: 1.1 - ext?: string //default: https://jsonapi.org/profiles/ethanresnick/cursor-pagination - } - links: { - self?: string //default: /api/v2/ui/tasks?page[size]=25 - first?: string //default: /api/v2/ui/tasks?page[size]=25&page[after]=0 - last?: string //default: /api/v2/ui/tasks?page[size]=25&page[before]=500 - next?: string //default: /api/v2/ui/tasks?page[size]=25&page[after]=25 - previous?: string //default: /api/v2/ui/tasks?page[size]=25&page[before]=25 - } - id?: integer - type?: string //default: Task - data: { - taskName?: string - attackCmd?: string - chunkTime?: integer - statusTimer?: integer - keyspace?: integer - keyspaceProgress?: integer - priority?: integer - maxAgents?: integer - color?: string - isSmall?: boolean - isCpuTask?: boolean - useNewBench?: boolean - skipKeyspace?: integer - crackerBinaryId?: integer - crackerBinaryTypeId?: integer - taskWrapperId?: integer - isArchived?: boolean - notes?: string - staticChunks?: integer - chunkSize?: integer - forcePipe?: boolean - preprocessorId?: integer - preprocessorCommand?: string - } - relationships: { - } - included: { - }[] -} -``` - -- 400 Invalid request - -`application/json` - -```ts -{ - title?: string - type?: string - status?: integer -} -``` - -- 401 Authentication failed - -`application/json` - -```ts -{ - title?: string - type?: string - status?: integer -} -``` - -- 404 Not Found - -`application/json` - -```ts -{ - message?: string - exception: { - type?: string - code?: integer - message?: string - file?: string - line?: integer - } -} -``` - -*** - -### [PATCH]/api/v2/ui/tasks/{id:[0-9]+}/relationships/{relation:files} - -- Security -bearerAuth - -#### RequestBody - -- application/json - -```ts -{ - data: { - type?: string - attributes: { - attackCmd?: string - chunkTime?: integer - color?: string - isArchived?: boolean - isCpuTask?: boolean - isSmall?: boolean - maxAgents?: integer - notes?: string - priority?: integer - statusTimer?: integer - taskName?: string - } - } -} -``` - -#### Responses - -- 200 successful operation - -`application/json` - -```ts -{ - jsonapi: { - version?: string //default: 1.1 - ext?: string //default: https://jsonapi.org/profiles/ethanresnick/cursor-pagination - } - id?: integer - type?: string //default: Task - data: { - taskName?: string - attackCmd?: string - chunkTime?: integer - statusTimer?: integer - keyspace?: integer - keyspaceProgress?: integer - priority?: integer - maxAgents?: integer - color?: string - isSmall?: boolean - isCpuTask?: boolean - useNewBench?: boolean - skipKeyspace?: integer - crackerBinaryId?: integer - crackerBinaryTypeId?: integer - taskWrapperId?: integer - isArchived?: boolean - notes?: string - staticChunks?: integer - chunkSize?: integer - forcePipe?: boolean - preprocessorId?: integer - preprocessorCommand?: string - } -} -``` - -- 400 Invalid request - -`application/json` - -```ts -{ - title?: string - type?: string - status?: integer -} -``` - -- 401 Authentication failed - -`application/json` - -```ts -{ - title?: string - type?: string - status?: integer -} -``` - -- 404 Not Found - -`application/json` - -```ts -{ - message?: string - exception: { - type?: string - code?: integer - message?: string - file?: string - line?: integer - } -} -``` - -*** - -### [POST]/api/v2/ui/tasks/{id:[0-9]+}/relationships/{relation:files} - -- Security -bearerAuth - -#### RequestBody - -- application/json - -#### Responses - -- 204 successfully created - -- 400 Invalid request - -`application/json` - -```ts -{ - title?: string - type?: string - status?: integer -} -``` - -- 401 Authentication failed - -`application/json` - -```ts -{ - title?: string - type?: string - status?: integer -} -``` - -- 404 Not Found - -`application/json` - -```ts -{ - message?: string - exception: { - type?: string - code?: integer - message?: string - file?: string - line?: integer - } -} -``` - -*** - -### [DELETE]/api/v2/ui/tasks/{id:[0-9]+}/relationships/{relation:files} - -- Security -bearerAuth - -#### RequestBody - -- application/json - -#### Responses - -- 204 successfully deleted - -- 400 Invalid request - -`application/json` - -```ts -{ - title?: string - type?: string - status?: integer -} -``` - -- 401 Authentication failed - -`application/json` - -```ts -{ - title?: string - type?: string - status?: integer -} -``` - -- 404 Not Found - -`application/json` - -```ts -{ - message?: string - exception: { - type?: string - code?: integer - message?: string - file?: string - line?: integer - } -} -``` - -*** - -### [GET]/api/v2/ui/tasks/{id:[0-9]+}/{relation:speeds} - -- Description -GET request for for a to-one relationship link. Returns the resource record of the object that is part of the specified relation. - -- Security -bearerAuth - -#### Parameters(Query) - -```ts -include?: string -``` - -#### Responses - -- 200 successful operation - -`application/json` - -```ts -{ - jsonapi: { - version?: string //default: 1.1 - ext?: string //default: https://jsonapi.org/profiles/ethanresnick/cursor-pagination - } - links: { - self?: string //default: /api/v2/ui/tasks?page[size]=25 - first?: string //default: /api/v2/ui/tasks?page[size]=25&page[after]=0 - last?: string //default: /api/v2/ui/tasks?page[size]=25&page[before]=500 - next?: string //default: /api/v2/ui/tasks?page[size]=25&page[after]=25 - previous?: string //default: /api/v2/ui/tasks?page[size]=25&page[before]=25 - } - id?: integer - type?: string //default: Task - data: { - taskName?: string - attackCmd?: string - chunkTime?: integer - statusTimer?: integer - keyspace?: integer - keyspaceProgress?: integer - priority?: integer - maxAgents?: integer - color?: string - isSmall?: boolean - isCpuTask?: boolean - useNewBench?: boolean - skipKeyspace?: integer - crackerBinaryId?: integer - crackerBinaryTypeId?: integer - taskWrapperId?: integer - isArchived?: boolean - notes?: string - staticChunks?: integer - chunkSize?: integer - forcePipe?: boolean - preprocessorId?: integer - preprocessorCommand?: string - } - relationships: { - } - included: { - }[] -} -``` - -- 400 Invalid request - -`application/json` - -```ts -{ - title?: string - type?: string - status?: integer -} -``` - -- 401 Authentication failed - -`application/json` - -```ts -{ - title?: string - type?: string - status?: integer -} -``` - -- 404 Not Found - -`application/json` - -```ts -{ - message?: string - exception: { - type?: string - code?: integer - message?: string - file?: string - line?: integer - } -} -``` - -*** - -### [GET]/api/v2/ui/tasks/{id:[0-9]+}/relationships/{relation:speeds} - -- Description -GET request for for a to-one relationship link. Returns the resource record of the object that is part of the specified relation. - -- Security -bearerAuth - -#### Parameters(Query) - -```ts -include?: string -``` - -#### Responses - -- 200 successful operation - -`application/json` - -```ts -{ - jsonapi: { - version?: string //default: 1.1 - ext?: string //default: https://jsonapi.org/profiles/ethanresnick/cursor-pagination - } - links: { - self?: string //default: /api/v2/ui/tasks?page[size]=25 - first?: string //default: /api/v2/ui/tasks?page[size]=25&page[after]=0 - last?: string //default: /api/v2/ui/tasks?page[size]=25&page[before]=500 - next?: string //default: /api/v2/ui/tasks?page[size]=25&page[after]=25 - previous?: string //default: /api/v2/ui/tasks?page[size]=25&page[before]=25 - } - id?: integer - type?: string //default: Task - data: { - taskName?: string - attackCmd?: string - chunkTime?: integer - statusTimer?: integer - keyspace?: integer - keyspaceProgress?: integer - priority?: integer - maxAgents?: integer - color?: string - isSmall?: boolean - isCpuTask?: boolean - useNewBench?: boolean - skipKeyspace?: integer - crackerBinaryId?: integer - crackerBinaryTypeId?: integer - taskWrapperId?: integer - isArchived?: boolean - notes?: string - staticChunks?: integer - chunkSize?: integer - forcePipe?: boolean - preprocessorId?: integer - preprocessorCommand?: string - } - relationships: { - } - included: { - }[] -} -``` - -- 400 Invalid request - -`application/json` - -```ts -{ - title?: string - type?: string - status?: integer -} -``` - -- 401 Authentication failed - -`application/json` - -```ts -{ - title?: string - type?: string - status?: integer -} -``` - -- 404 Not Found - -`application/json` - -```ts -{ - message?: string - exception: { - type?: string - code?: integer - message?: string - file?: string - line?: integer - } -} -``` - -*** - -### [PATCH]/api/v2/ui/tasks/{id:[0-9]+}/relationships/{relation:speeds} - -- Security -bearerAuth - -#### RequestBody - -- application/json - -```ts -{ - data: { - type?: string - attributes: { - attackCmd?: string - chunkTime?: integer - color?: string - isArchived?: boolean - isCpuTask?: boolean - isSmall?: boolean - maxAgents?: integer - notes?: string - priority?: integer - statusTimer?: integer - taskName?: string - } - } -} -``` - -#### Responses - -- 200 successful operation - -`application/json` - -```ts -{ - jsonapi: { - version?: string //default: 1.1 - ext?: string //default: https://jsonapi.org/profiles/ethanresnick/cursor-pagination - } - id?: integer - type?: string //default: Task - data: { - taskName?: string - attackCmd?: string - chunkTime?: integer - statusTimer?: integer - keyspace?: integer - keyspaceProgress?: integer - priority?: integer - maxAgents?: integer - color?: string - isSmall?: boolean - isCpuTask?: boolean - useNewBench?: boolean - skipKeyspace?: integer - crackerBinaryId?: integer - crackerBinaryTypeId?: integer - taskWrapperId?: integer - isArchived?: boolean - notes?: string - staticChunks?: integer - chunkSize?: integer - forcePipe?: boolean - preprocessorId?: integer - preprocessorCommand?: string - } -} -``` - -- 400 Invalid request - -`application/json` - -```ts -{ - title?: string - type?: string - status?: integer -} -``` - -- 401 Authentication failed - -`application/json` - -```ts -{ - title?: string - type?: string - status?: integer -} -``` - -- 404 Not Found - -`application/json` - -```ts -{ - message?: string - exception: { - type?: string - code?: integer - message?: string - file?: string - line?: integer - } -} -``` - -*** - -### [POST]/api/v2/ui/tasks/{id:[0-9]+}/relationships/{relation:speeds} - -- Security -bearerAuth - -#### RequestBody - -- application/json - -#### Responses - -- 204 successfully created - -- 400 Invalid request - -`application/json` - -```ts -{ - title?: string - type?: string - status?: integer -} -``` - -- 401 Authentication failed - -`application/json` - -```ts -{ - title?: string - type?: string - status?: integer -} -``` - -- 404 Not Found - -`application/json` - -```ts -{ - message?: string - exception: { - type?: string - code?: integer - message?: string - file?: string - line?: integer - } -} -``` - -*** - -### [DELETE]/api/v2/ui/tasks/{id:[0-9]+}/relationships/{relation:speeds} - -- Security -bearerAuth - -#### RequestBody - -- application/json - -#### Responses - -- 204 successfully deleted - -- 400 Invalid request - -`application/json` - -```ts -{ - title?: string - type?: string - status?: integer -} -``` - -- 401 Authentication failed - -`application/json` - -```ts -{ - title?: string - type?: string - status?: integer -} -``` - -- 404 Not Found - -`application/json` - -```ts -{ - message?: string - exception: { - type?: string - code?: integer - message?: string - file?: string - line?: integer - } -} -``` - -*** - -### [GET]/api/v2/ui/tasks/{id:[0-9]+} - -- Description -GET request to retrieve a single object. - -- Security -bearerAuth - -#### Parameters(Query) - -```ts -include?: string -``` - -#### Responses - -- 200 successful operation - -`application/json` - -```ts -{ - jsonapi: { - version?: string //default: 1.1 - ext?: string //default: https://jsonapi.org/profiles/ethanresnick/cursor-pagination - } - links: { - self?: string //default: /api/v2/ui/tasks?page[size]=25 - first?: string //default: /api/v2/ui/tasks?page[size]=25&page[after]=0 - last?: string //default: /api/v2/ui/tasks?page[size]=25&page[before]=500 - next?: string //default: /api/v2/ui/tasks?page[size]=25&page[after]=25 - previous?: string //default: /api/v2/ui/tasks?page[size]=25&page[before]=25 - } - id?: integer - type?: string //default: Task - data: { - taskName?: string - attackCmd?: string - chunkTime?: integer - statusTimer?: integer - keyspace?: integer - keyspaceProgress?: integer - priority?: integer - maxAgents?: integer - color?: string - isSmall?: boolean - isCpuTask?: boolean - useNewBench?: boolean - skipKeyspace?: integer - crackerBinaryId?: integer - crackerBinaryTypeId?: integer - taskWrapperId?: integer - isArchived?: boolean - notes?: string - staticChunks?: integer - chunkSize?: integer - forcePipe?: boolean - preprocessorId?: integer - preprocessorCommand?: string - } - relationships: { - } - included: { - }[] -} -``` - -- 400 Invalid request - -`application/json` - -```ts -{ - title?: string - type?: string - status?: integer -} -``` - -- 401 Authentication failed - -`application/json` - -```ts -{ - title?: string - type?: string - status?: integer -} -``` - -- 404 Not Found - -`application/json` - -```ts -{ - message?: string - exception: { - type?: string - code?: integer - message?: string - file?: string - line?: integer - } -} -``` - -*** - -### [PATCH]/api/v2/ui/tasks/{id:[0-9]+} - -- Description -PATCH request to update attributes of a single object. - -- Security -bearerAuth - -#### RequestBody - -- application/json - -```ts -{ - data: { - type?: string - attributes: { - attackCmd?: string - chunkTime?: integer - color?: string - isArchived?: boolean - isCpuTask?: boolean - isSmall?: boolean - maxAgents?: integer - notes?: string - priority?: integer - statusTimer?: integer - taskName?: string - } - } -} -``` - -#### Responses - -- 200 successful operation - -`application/json` - -```ts -{ - jsonapi: { - version?: string //default: 1.1 - ext?: string //default: https://jsonapi.org/profiles/ethanresnick/cursor-pagination - } - id?: integer - type?: string //default: Task - data: { - taskName?: string - attackCmd?: string - chunkTime?: integer - statusTimer?: integer - keyspace?: integer - keyspaceProgress?: integer - priority?: integer - maxAgents?: integer - color?: string - isSmall?: boolean - isCpuTask?: boolean - useNewBench?: boolean - skipKeyspace?: integer - crackerBinaryId?: integer - crackerBinaryTypeId?: integer - taskWrapperId?: integer - isArchived?: boolean - notes?: string - staticChunks?: integer - chunkSize?: integer - forcePipe?: boolean - preprocessorId?: integer - preprocessorCommand?: string - } -} -``` - -- 400 Invalid request - -`application/json` - -```ts -{ - title?: string - type?: string - status?: integer -} -``` - -- 401 Authentication failed - -`application/json` - -```ts -{ - title?: string - type?: string - status?: integer -} -``` - -- 404 Not Found - -`application/json` - -```ts -{ - message?: string - exception: { - type?: string - code?: integer - message?: string - file?: string - line?: integer - } -} -``` - -*** - -### [DELETE]/api/v2/ui/tasks/{id:[0-9]+} - -- Security -bearerAuth - -#### RequestBody - -- application/json - -#### Responses - -- 204 successfully deleted - -- 400 Invalid request - -`application/json` - -```ts -{ - title?: string - type?: string - status?: integer -} -``` - -- 401 Authentication failed - -`application/json` - -```ts -{ - title?: string - type?: string - status?: integer -} -``` - -- 404 Not Found - -`application/json` - -```ts -{ - message?: string - exception: { - type?: string - code?: integer - message?: string - file?: string - line?: integer - } -} -``` - -*** - -### [GET]/api/v2/ui/taskwrappers - -- Description -GET many request to retrieve multiple objects. - -- Security -bearerAuth - -#### Parameters(Query) - -```ts -page[after]?: integer -``` - -```ts -page[before]?: integer -``` - -```ts -page[size]?: integer -``` - -```ts -filter: { -} -``` - -```ts -include?: string -``` - -#### Responses - -- 200 successful operation - -`application/json` - -```ts -{ - jsonapi: { - version?: string //default: 1.1 - ext?: string //default: https://jsonapi.org/profiles/ethanresnick/cursor-pagination - } - links: { - self?: string //default: /api/v2/ui/taskwrappers?page[size]=25 - first?: string //default: /api/v2/ui/taskwrappers?page[size]=25&page[after]=0 - last?: string //default: /api/v2/ui/taskwrappers?page[size]=25&page[before]=500 - next?: string //default: /api/v2/ui/taskwrappers?page[size]=25&page[after]=25 - previous?: string //default: /api/v2/ui/taskwrappers?page[size]=25&page[before]=25 - } - id?: integer - type?: string //default: TaskWrapper - data: { - priority?: integer - maxAgents?: integer - taskType?: enum[0, 1] - hashlistId?: integer - accessGroupId?: integer - taskWrapperName?: string - isArchived?: boolean - cracked?: integer - } - relationships: { - } - included: { - }[] -}[] -``` - -- 400 Invalid request - -`application/json` - -```ts -{ - title?: string - type?: string - status?: integer -} -``` - -- 401 Authentication failed - -`application/json` - -```ts -{ - title?: string - type?: string - status?: integer -} -``` - -*** - -### [GET]/api/v2/ui/taskwrappers/count - -- Description -GET many request to retrieve multiple objects. - -- Security -bearerAuth - -#### Parameters(Query) - -```ts -page[after]?: integer -``` - -```ts -page[before]?: integer -``` - -```ts -page[size]?: integer -``` - -```ts -filter: { -} -``` - -```ts -include?: string -``` - -#### Responses - -- 200 successful operation - -`application/json` - -```ts -{ - jsonapi: { - version?: string //default: 1.1 - ext?: string //default: https://jsonapi.org/profiles/ethanresnick/cursor-pagination - } - links: { - self?: string //default: /api/v2/ui/taskwrappers?page[size]=25 - first?: string //default: /api/v2/ui/taskwrappers?page[size]=25&page[after]=0 - last?: string //default: /api/v2/ui/taskwrappers?page[size]=25&page[before]=500 - next?: string //default: /api/v2/ui/taskwrappers?page[size]=25&page[after]=25 - previous?: string //default: /api/v2/ui/taskwrappers?page[size]=25&page[before]=25 - } - id?: integer - type?: string //default: TaskWrapper - data: { - priority?: integer - maxAgents?: integer - taskType?: enum[0, 1] - hashlistId?: integer - accessGroupId?: integer - taskWrapperName?: string - isArchived?: boolean - cracked?: integer - } - relationships: { - } - included: { - }[] -}[] -``` - -- 400 Invalid request - -`application/json` - -```ts -{ - title?: string - type?: string - status?: integer -} -``` - -- 401 Authentication failed - -`application/json` - -```ts -{ - title?: string - type?: string - status?: integer -} -``` - -*** - -### [GET]/api/v2/ui/taskwrappers/{id:[0-9]+}/{relation:accessGroup} - -- Description -GET request for for a to-one relationship link. Returns the resource record of the object that is part of the specified relation. - -- Security -bearerAuth - -#### Parameters(Query) - -```ts -include?: string -``` - -#### Responses - -- 200 successful operation - -`application/json` - -```ts -{ - jsonapi: { - version?: string //default: 1.1 - ext?: string //default: https://jsonapi.org/profiles/ethanresnick/cursor-pagination - } - links: { - self?: string //default: /api/v2/ui/taskwrappers?page[size]=25 - first?: string //default: /api/v2/ui/taskwrappers?page[size]=25&page[after]=0 - last?: string //default: /api/v2/ui/taskwrappers?page[size]=25&page[before]=500 - next?: string //default: /api/v2/ui/taskwrappers?page[size]=25&page[after]=25 - previous?: string //default: /api/v2/ui/taskwrappers?page[size]=25&page[before]=25 - } - id?: integer - type?: string //default: TaskWrapper - data: { - priority?: integer - maxAgents?: integer - taskType?: enum[0, 1] - hashlistId?: integer - accessGroupId?: integer - taskWrapperName?: string - isArchived?: boolean - cracked?: integer - } - relationships: { - } - included: { - }[] -} -``` - -- 400 Invalid request - -`application/json` - -```ts -{ - title?: string - type?: string - status?: integer -} -``` - -- 401 Authentication failed - -`application/json` - -```ts -{ - title?: string - type?: string - status?: integer -} -``` - -- 404 Not Found - -`application/json` - -```ts -{ - message?: string - exception: { - type?: string - code?: integer - message?: string - file?: string - line?: integer - } -} -``` - -*** - -### [GET]/api/v2/ui/taskwrappers/{id:[0-9]+}/relationships/{relation:accessGroup} - -- Description -GET request for for a to-one relationship link. Returns the resource record of the object that is part of the specified relation. - -- Security -bearerAuth - -#### Parameters(Query) - -```ts -include?: string -``` - -#### Responses - -- 200 successful operation - -`application/json` - -```ts -{ - jsonapi: { - version?: string //default: 1.1 - ext?: string //default: https://jsonapi.org/profiles/ethanresnick/cursor-pagination - } - links: { - self?: string //default: /api/v2/ui/taskwrappers?page[size]=25 - first?: string //default: /api/v2/ui/taskwrappers?page[size]=25&page[after]=0 - last?: string //default: /api/v2/ui/taskwrappers?page[size]=25&page[before]=500 - next?: string //default: /api/v2/ui/taskwrappers?page[size]=25&page[after]=25 - previous?: string //default: /api/v2/ui/taskwrappers?page[size]=25&page[before]=25 - } - id?: integer - type?: string //default: TaskWrapper - data: { - priority?: integer - maxAgents?: integer - taskType?: enum[0, 1] - hashlistId?: integer - accessGroupId?: integer - taskWrapperName?: string - isArchived?: boolean - cracked?: integer - } - relationships: { - } - included: { - }[] -} -``` - -- 400 Invalid request - -`application/json` - -```ts -{ - title?: string - type?: string - status?: integer -} -``` - -- 401 Authentication failed - -`application/json` - -```ts -{ - title?: string - type?: string - status?: integer -} -``` - -- 404 Not Found - -`application/json` - -```ts -{ - message?: string - exception: { - type?: string - code?: integer - message?: string - file?: string - line?: integer - } -} -``` - -*** - -### [PATCH]/api/v2/ui/taskwrappers/{id:[0-9]+}/relationships/{relation:accessGroup} - -- Security -bearerAuth - -#### RequestBody - -- application/json - -```ts -{ - data: { - type?: string - attributes: { - accessGroupId?: integer - isArchived?: boolean - maxAgents?: integer - priority?: integer - taskWrapperName?: string - } - } -} -``` - -#### Responses - -- 200 successful operation - -`application/json` - -```ts -{ - jsonapi: { - version?: string //default: 1.1 - ext?: string //default: https://jsonapi.org/profiles/ethanresnick/cursor-pagination - } - id?: integer - type?: string //default: TaskWrapper - data: { - priority?: integer - maxAgents?: integer - taskType?: enum[0, 1] - hashlistId?: integer - accessGroupId?: integer - taskWrapperName?: string - isArchived?: boolean - cracked?: integer - } -} -``` - -- 400 Invalid request - -`application/json` - -```ts -{ - title?: string - type?: string - status?: integer -} -``` - -- 401 Authentication failed - -`application/json` - -```ts -{ - title?: string - type?: string - status?: integer -} -``` - -- 404 Not Found - -`application/json` - -```ts -{ - message?: string - exception: { - type?: string - code?: integer - message?: string - file?: string - line?: integer - } -} -``` - -*** - -### [GET]/api/v2/ui/taskwrappers/{id:[0-9]+}/{relation:tasks} - -- Description -GET request for for a to-one relationship link. Returns the resource record of the object that is part of the specified relation. - -- Security -bearerAuth - -#### Parameters(Query) - -```ts -include?: string -``` - -#### Responses - -- 200 successful operation - -`application/json` - -```ts -{ - jsonapi: { - version?: string //default: 1.1 - ext?: string //default: https://jsonapi.org/profiles/ethanresnick/cursor-pagination - } - links: { - self?: string //default: /api/v2/ui/taskwrappers?page[size]=25 - first?: string //default: /api/v2/ui/taskwrappers?page[size]=25&page[after]=0 - last?: string //default: /api/v2/ui/taskwrappers?page[size]=25&page[before]=500 - next?: string //default: /api/v2/ui/taskwrappers?page[size]=25&page[after]=25 - previous?: string //default: /api/v2/ui/taskwrappers?page[size]=25&page[before]=25 - } - id?: integer - type?: string //default: TaskWrapper - data: { - priority?: integer - maxAgents?: integer - taskType?: enum[0, 1] - hashlistId?: integer - accessGroupId?: integer - taskWrapperName?: string - isArchived?: boolean - cracked?: integer - } - relationships: { - } - included: { - }[] -} -``` - -- 400 Invalid request - -`application/json` - -```ts -{ - title?: string - type?: string - status?: integer -} -``` - -- 401 Authentication failed - -`application/json` - -```ts -{ - title?: string - type?: string - status?: integer -} -``` - -- 404 Not Found - -`application/json` - -```ts -{ - message?: string - exception: { - type?: string - code?: integer - message?: string - file?: string - line?: integer - } -} -``` - -*** - -### [GET]/api/v2/ui/taskwrappers/{id:[0-9]+}/relationships/{relation:tasks} - -- Description -GET request for for a to-one relationship link. Returns the resource record of the object that is part of the specified relation. - -- Security -bearerAuth - -#### Parameters(Query) - -```ts -include?: string -``` - -#### Responses - -- 200 successful operation - -`application/json` - -```ts -{ - jsonapi: { - version?: string //default: 1.1 - ext?: string //default: https://jsonapi.org/profiles/ethanresnick/cursor-pagination - } - links: { - self?: string //default: /api/v2/ui/taskwrappers?page[size]=25 - first?: string //default: /api/v2/ui/taskwrappers?page[size]=25&page[after]=0 - last?: string //default: /api/v2/ui/taskwrappers?page[size]=25&page[before]=500 - next?: string //default: /api/v2/ui/taskwrappers?page[size]=25&page[after]=25 - previous?: string //default: /api/v2/ui/taskwrappers?page[size]=25&page[before]=25 - } - id?: integer - type?: string //default: TaskWrapper - data: { - priority?: integer - maxAgents?: integer - taskType?: enum[0, 1] - hashlistId?: integer - accessGroupId?: integer - taskWrapperName?: string - isArchived?: boolean - cracked?: integer - } - relationships: { - } - included: { - }[] -} -``` - -- 400 Invalid request - -`application/json` - -```ts -{ - title?: string - type?: string - status?: integer -} -``` - -- 401 Authentication failed - -`application/json` - -```ts -{ - title?: string - type?: string - status?: integer -} -``` - -- 404 Not Found - -`application/json` - -```ts -{ - message?: string - exception: { - type?: string - code?: integer - message?: string - file?: string - line?: integer - } -} -``` - -*** - -### [PATCH]/api/v2/ui/taskwrappers/{id:[0-9]+}/relationships/{relation:tasks} - -- Security -bearerAuth - -#### RequestBody - -- application/json - -```ts -{ - data: { - type?: string - attributes: { - accessGroupId?: integer - isArchived?: boolean - maxAgents?: integer - priority?: integer - taskWrapperName?: string - } - } -} -``` - -#### Responses - -- 200 successful operation - -`application/json` - -```ts -{ - jsonapi: { - version?: string //default: 1.1 - ext?: string //default: https://jsonapi.org/profiles/ethanresnick/cursor-pagination - } - id?: integer - type?: string //default: TaskWrapper - data: { - priority?: integer - maxAgents?: integer - taskType?: enum[0, 1] - hashlistId?: integer - accessGroupId?: integer - taskWrapperName?: string - isArchived?: boolean - cracked?: integer - } -} -``` - -- 400 Invalid request - -`application/json` - -```ts -{ - title?: string - type?: string - status?: integer -} -``` - -- 401 Authentication failed - -`application/json` - -```ts -{ - title?: string - type?: string - status?: integer -} -``` - -- 404 Not Found - -`application/json` - -```ts -{ - message?: string - exception: { - type?: string - code?: integer - message?: string - file?: string - line?: integer - } -} -``` - -*** - -### [POST]/api/v2/ui/taskwrappers/{id:[0-9]+}/relationships/{relation:tasks} - -- Security -bearerAuth - -#### RequestBody - -- application/json - -#### Responses - -- 204 successfully created - -- 400 Invalid request - -`application/json` - -```ts -{ - title?: string - type?: string - status?: integer -} -``` - -- 401 Authentication failed - -`application/json` - -```ts -{ - title?: string - type?: string - status?: integer -} -``` - -- 404 Not Found - -`application/json` - -```ts -{ - message?: string - exception: { - type?: string - code?: integer - message?: string - file?: string - line?: integer - } -} -``` - -*** - -### [DELETE]/api/v2/ui/taskwrappers/{id:[0-9]+}/relationships/{relation:tasks} - -- Security -bearerAuth - -#### RequestBody - -- application/json - -#### Responses - -- 204 successfully deleted - -- 400 Invalid request - -`application/json` - -```ts -{ - title?: string - type?: string - status?: integer -} -``` - -- 401 Authentication failed - -`application/json` - -```ts -{ - title?: string - type?: string - status?: integer -} -``` - -- 404 Not Found - -`application/json` - -```ts -{ - message?: string - exception: { - type?: string - code?: integer - message?: string - file?: string - line?: integer - } -} -``` - -*** - -### [GET]/api/v2/ui/taskwrappers/{id:[0-9]+} - -- Description -GET request to retrieve a single object. - -- Security -bearerAuth - -#### Parameters(Query) - -```ts -include?: string -``` - -#### Responses - -- 200 successful operation - -`application/json` - -```ts -{ - jsonapi: { - version?: string //default: 1.1 - ext?: string //default: https://jsonapi.org/profiles/ethanresnick/cursor-pagination - } - links: { - self?: string //default: /api/v2/ui/taskwrappers?page[size]=25 - first?: string //default: /api/v2/ui/taskwrappers?page[size]=25&page[after]=0 - last?: string //default: /api/v2/ui/taskwrappers?page[size]=25&page[before]=500 - next?: string //default: /api/v2/ui/taskwrappers?page[size]=25&page[after]=25 - previous?: string //default: /api/v2/ui/taskwrappers?page[size]=25&page[before]=25 - } - id?: integer - type?: string //default: TaskWrapper - data: { - priority?: integer - maxAgents?: integer - taskType?: enum[0, 1] - hashlistId?: integer - accessGroupId?: integer - taskWrapperName?: string - isArchived?: boolean - cracked?: integer - } - relationships: { - } - included: { - }[] -} -``` - -- 400 Invalid request - -`application/json` - -```ts -{ - title?: string - type?: string - status?: integer -} -``` - -- 401 Authentication failed - -`application/json` - -```ts -{ - title?: string - type?: string - status?: integer -} -``` - -- 404 Not Found - -`application/json` - -```ts -{ - message?: string - exception: { - type?: string - code?: integer - message?: string - file?: string - line?: integer - } -} -``` - -*** - -### [PATCH]/api/v2/ui/taskwrappers/{id:[0-9]+} - -- Description -PATCH request to update attributes of a single object. - -- Security -bearerAuth - -#### RequestBody - -- application/json - -```ts -{ - data: { - type?: string - attributes: { - accessGroupId?: integer - isArchived?: boolean - maxAgents?: integer - priority?: integer - taskWrapperName?: string - } - } -} -``` - -#### Responses - -- 200 successful operation - -`application/json` - -```ts -{ - jsonapi: { - version?: string //default: 1.1 - ext?: string //default: https://jsonapi.org/profiles/ethanresnick/cursor-pagination - } - id?: integer - type?: string //default: TaskWrapper - data: { - priority?: integer - maxAgents?: integer - taskType?: enum[0, 1] - hashlistId?: integer - accessGroupId?: integer - taskWrapperName?: string - isArchived?: boolean - cracked?: integer - } -} -``` - -- 400 Invalid request - -`application/json` - -```ts -{ - title?: string - type?: string - status?: integer -} -``` - -- 401 Authentication failed - -`application/json` - -```ts -{ - title?: string - type?: string - status?: integer -} -``` - -- 404 Not Found - -`application/json` - -```ts -{ - message?: string - exception: { - type?: string - code?: integer - message?: string - file?: string - line?: integer - } -} -``` - -*** - -### [DELETE]/api/v2/ui/taskwrappers/{id:[0-9]+} - -- Security -bearerAuth - -#### RequestBody - -- application/json - -#### Responses - -- 204 successfully deleted - -- 400 Invalid request - -`application/json` - -```ts -{ - title?: string - type?: string - status?: integer -} -``` - -- 401 Authentication failed - -`application/json` - -```ts -{ - title?: string - type?: string - status?: integer -} -``` - -- 404 Not Found - -`application/json` - -```ts -{ - message?: string - exception: { - type?: string - code?: integer - message?: string - file?: string - line?: integer - } -} -``` - -*** - -### [GET]/api/v2/ui/users - -- Description -GET many request to retrieve multiple objects. - -- Security -bearerAuth - -#### Parameters(Query) - -```ts -page[after]?: integer -``` - -```ts -page[before]?: integer -``` - -```ts -page[size]?: integer -``` - -```ts -filter: { -} -``` - -```ts -include?: string -``` - -#### Responses - -- 200 successful operation - -`application/json` - -```ts -{ - jsonapi: { - version?: string //default: 1.1 - ext?: string //default: https://jsonapi.org/profiles/ethanresnick/cursor-pagination - } - links: { - self?: string //default: /api/v2/ui/users?page[size]=25 - first?: string //default: /api/v2/ui/users?page[size]=25&page[after]=0 - last?: string //default: /api/v2/ui/users?page[size]=25&page[before]=500 - next?: string //default: /api/v2/ui/users?page[size]=25&page[after]=25 - previous?: string //default: /api/v2/ui/users?page[size]=25&page[before]=25 - } - id?: integer - type?: string //default: User - data: { - name?: string - email?: string - passwordHash?: string - passwordSalt?: string - isValid?: boolean - isComputedPassword?: boolean - lastLoginDate?: integer - registeredSince?: integer - sessionLifetime?: integer - globalPermissionGroupId?: integer - yubikey?: string - otp1?: string - otp2?: string - otp3?: string - otp4?: string - } - relationships: { - } - included: { - }[] -}[] -``` - -- 400 Invalid request - -`application/json` - -```ts -{ - title?: string - type?: string - status?: integer -} -``` - -- 401 Authentication failed - -`application/json` - -```ts -{ - title?: string - type?: string - status?: integer -} -``` - -*** - -### [POST]/api/v2/ui/users - -- Description -POST request to create a new object. The request must contain the resource record as data with the attributes of the new object.To add relationships, a relationships object can be added with the resource records of the relations that are part of this object. - -- Security -bearerAuth - -#### RequestBody - -- application/json - -```ts -{ - data: { - type?: string - attributes: { - name?: string - email?: string - passwordHash?: string - passwordSalt?: string - isValid?: boolean - isComputedPassword?: boolean - lastLoginDate?: integer - registeredSince?: integer - sessionLifetime?: integer - globalPermissionGroupId?: integer - yubikey?: string - otp1?: string - otp2?: string - otp3?: string - otp4?: string - } - } -} -``` - -#### Responses - -- 201 successful operation - -`application/json` - -```ts -{ - jsonapi: { - version?: string //default: 1.1 - ext?: string //default: https://jsonapi.org/profiles/ethanresnick/cursor-pagination - } - id?: integer - type?: string //default: User - data: { - name?: string - email?: string - passwordHash?: string - passwordSalt?: string - isValid?: boolean - isComputedPassword?: boolean - lastLoginDate?: integer - registeredSince?: integer - sessionLifetime?: integer - globalPermissionGroupId?: integer - yubikey?: string - otp1?: string - otp2?: string - otp3?: string - otp4?: string - } -} -``` - -- 400 Invalid request - -`application/json` - -```ts -{ - title?: string - type?: string - status?: integer -} -``` - -- 401 Authentication failed - -`application/json` - -```ts -{ - title?: string - type?: string - status?: integer -} -``` - -*** - -### [GET]/api/v2/ui/users/count - -- Description -GET many request to retrieve multiple objects. - -- Security -bearerAuth - -#### Parameters(Query) - -```ts -page[after]?: integer -``` - -```ts -page[before]?: integer -``` - -```ts -page[size]?: integer -``` - -```ts -filter: { -} -``` - -```ts -include?: string -``` - -#### Responses - -- 200 successful operation - -`application/json` - -```ts -{ - jsonapi: { - version?: string //default: 1.1 - ext?: string //default: https://jsonapi.org/profiles/ethanresnick/cursor-pagination - } - links: { - self?: string //default: /api/v2/ui/users?page[size]=25 - first?: string //default: /api/v2/ui/users?page[size]=25&page[after]=0 - last?: string //default: /api/v2/ui/users?page[size]=25&page[before]=500 - next?: string //default: /api/v2/ui/users?page[size]=25&page[after]=25 - previous?: string //default: /api/v2/ui/users?page[size]=25&page[before]=25 - } - id?: integer - type?: string //default: User - data: { - name?: string - email?: string - passwordHash?: string - passwordSalt?: string - isValid?: boolean - isComputedPassword?: boolean - lastLoginDate?: integer - registeredSince?: integer - sessionLifetime?: integer - globalPermissionGroupId?: integer - yubikey?: string - otp1?: string - otp2?: string - otp3?: string - otp4?: string - } - relationships: { - } - included: { - }[] -}[] -``` - -- 400 Invalid request - -`application/json` - -```ts -{ - title?: string - type?: string - status?: integer -} -``` - -- 401 Authentication failed - -`application/json` - -```ts -{ - title?: string - type?: string - status?: integer -} -``` - -*** - -### [GET]/api/v2/ui/users/{id:[0-9]+}/{relation:globalPermissionGroup} - -- Description -GET request for for a to-one relationship link. Returns the resource record of the object that is part of the specified relation. - -- Security -bearerAuth - -#### Parameters(Query) - -```ts -include?: string -``` - -#### Responses - -- 200 successful operation - -`application/json` - -```ts -{ - jsonapi: { - version?: string //default: 1.1 - ext?: string //default: https://jsonapi.org/profiles/ethanresnick/cursor-pagination - } - links: { - self?: string //default: /api/v2/ui/users?page[size]=25 - first?: string //default: /api/v2/ui/users?page[size]=25&page[after]=0 - last?: string //default: /api/v2/ui/users?page[size]=25&page[before]=500 - next?: string //default: /api/v2/ui/users?page[size]=25&page[after]=25 - previous?: string //default: /api/v2/ui/users?page[size]=25&page[before]=25 - } - id?: integer - type?: string //default: User - data: { - name?: string - email?: string - passwordHash?: string - passwordSalt?: string - isValid?: boolean - isComputedPassword?: boolean - lastLoginDate?: integer - registeredSince?: integer - sessionLifetime?: integer - globalPermissionGroupId?: integer - yubikey?: string - otp1?: string - otp2?: string - otp3?: string - otp4?: string - } - relationships: { - } - included: { - }[] -} -``` - -- 400 Invalid request - -`application/json` - -```ts -{ - title?: string - type?: string - status?: integer -} -``` - -- 401 Authentication failed - -`application/json` - -```ts -{ - title?: string - type?: string - status?: integer -} -``` - -- 404 Not Found - -`application/json` - -```ts -{ - message?: string - exception: { - type?: string - code?: integer - message?: string - file?: string - line?: integer - } -} -``` - -*** - -### [GET]/api/v2/ui/users/{id:[0-9]+}/relationships/{relation:globalPermissionGroup} - -- Description -GET request for for a to-one relationship link. Returns the resource record of the object that is part of the specified relation. - -- Security -bearerAuth - -#### Parameters(Query) - -```ts -include?: string -``` - -#### Responses - -- 200 successful operation - -`application/json` - -```ts -{ - jsonapi: { - version?: string //default: 1.1 - ext?: string //default: https://jsonapi.org/profiles/ethanresnick/cursor-pagination - } - links: { - self?: string //default: /api/v2/ui/users?page[size]=25 - first?: string //default: /api/v2/ui/users?page[size]=25&page[after]=0 - last?: string //default: /api/v2/ui/users?page[size]=25&page[before]=500 - next?: string //default: /api/v2/ui/users?page[size]=25&page[after]=25 - previous?: string //default: /api/v2/ui/users?page[size]=25&page[before]=25 - } - id?: integer - type?: string //default: User - data: { - name?: string - email?: string - passwordHash?: string - passwordSalt?: string - isValid?: boolean - isComputedPassword?: boolean - lastLoginDate?: integer - registeredSince?: integer - sessionLifetime?: integer - globalPermissionGroupId?: integer - yubikey?: string - otp1?: string - otp2?: string - otp3?: string - otp4?: string - } - relationships: { - } - included: { - }[] -} -``` - -- 400 Invalid request - -`application/json` - -```ts -{ - title?: string - type?: string - status?: integer -} -``` - -- 401 Authentication failed - -`application/json` - -```ts -{ - title?: string - type?: string - status?: integer -} -``` - -- 404 Not Found - -`application/json` - -```ts -{ - message?: string - exception: { - type?: string - code?: integer - message?: string - file?: string - line?: integer - } -} -``` - -*** - -### [PATCH]/api/v2/ui/users/{id:[0-9]+}/relationships/{relation:globalPermissionGroup} - -- Security -bearerAuth - -#### RequestBody - -- application/json - -```ts -{ - data: { - type?: string - attributes: { - email?: string - globalPermissionGroupId?: integer - isValid?: boolean - name?: string - } - } -} -``` - -#### Responses - -- 200 successful operation - -`application/json` - -```ts -{ - jsonapi: { - version?: string //default: 1.1 - ext?: string //default: https://jsonapi.org/profiles/ethanresnick/cursor-pagination - } - id?: integer - type?: string //default: User - data: { - name?: string - email?: string - passwordHash?: string - passwordSalt?: string - isValid?: boolean - isComputedPassword?: boolean - lastLoginDate?: integer - registeredSince?: integer - sessionLifetime?: integer - globalPermissionGroupId?: integer - yubikey?: string - otp1?: string - otp2?: string - otp3?: string - otp4?: string - } -} -``` - -- 400 Invalid request - -`application/json` - -```ts -{ - title?: string - type?: string - status?: integer -} -``` - -- 401 Authentication failed - -`application/json` - -```ts -{ - title?: string - type?: string - status?: integer -} -``` - -- 404 Not Found - -`application/json` - -```ts -{ - message?: string - exception: { - type?: string - code?: integer - message?: string - file?: string - line?: integer - } -} -``` - -*** - -### [GET]/api/v2/ui/users/{id:[0-9]+}/{relation:accessGroups} - -- Description -GET request for for a to-one relationship link. Returns the resource record of the object that is part of the specified relation. - -- Security -bearerAuth - -#### Parameters(Query) - -```ts -include?: string -``` - -#### Responses - -- 200 successful operation - -`application/json` - -```ts -{ - jsonapi: { - version?: string //default: 1.1 - ext?: string //default: https://jsonapi.org/profiles/ethanresnick/cursor-pagination - } - links: { - self?: string //default: /api/v2/ui/users?page[size]=25 - first?: string //default: /api/v2/ui/users?page[size]=25&page[after]=0 - last?: string //default: /api/v2/ui/users?page[size]=25&page[before]=500 - next?: string //default: /api/v2/ui/users?page[size]=25&page[after]=25 - previous?: string //default: /api/v2/ui/users?page[size]=25&page[before]=25 - } - id?: integer - type?: string //default: User - data: { - name?: string - email?: string - passwordHash?: string - passwordSalt?: string - isValid?: boolean - isComputedPassword?: boolean - lastLoginDate?: integer - registeredSince?: integer - sessionLifetime?: integer - globalPermissionGroupId?: integer - yubikey?: string - otp1?: string - otp2?: string - otp3?: string - otp4?: string - } - relationships: { - } - included: { - }[] -} -``` - -- 400 Invalid request - -`application/json` - -```ts -{ - title?: string - type?: string - status?: integer -} -``` - -- 401 Authentication failed - -`application/json` - -```ts -{ - title?: string - type?: string - status?: integer -} -``` - -- 404 Not Found - -`application/json` - -```ts -{ - message?: string - exception: { - type?: string - code?: integer - message?: string - file?: string - line?: integer - } -} -``` - -*** - -### [GET]/api/v2/ui/users/{id:[0-9]+}/relationships/{relation:accessGroups} - -- Description -GET request for for a to-one relationship link. Returns the resource record of the object that is part of the specified relation. - -- Security -bearerAuth - -#### Parameters(Query) - -```ts -include?: string -``` - -#### Responses - -- 200 successful operation - -`application/json` - -```ts -{ - jsonapi: { - version?: string //default: 1.1 - ext?: string //default: https://jsonapi.org/profiles/ethanresnick/cursor-pagination - } - links: { - self?: string //default: /api/v2/ui/users?page[size]=25 - first?: string //default: /api/v2/ui/users?page[size]=25&page[after]=0 - last?: string //default: /api/v2/ui/users?page[size]=25&page[before]=500 - next?: string //default: /api/v2/ui/users?page[size]=25&page[after]=25 - previous?: string //default: /api/v2/ui/users?page[size]=25&page[before]=25 - } - id?: integer - type?: string //default: User - data: { - name?: string - email?: string - passwordHash?: string - passwordSalt?: string - isValid?: boolean - isComputedPassword?: boolean - lastLoginDate?: integer - registeredSince?: integer - sessionLifetime?: integer - globalPermissionGroupId?: integer - yubikey?: string - otp1?: string - otp2?: string - otp3?: string - otp4?: string - } - relationships: { - } - included: { - }[] -} -``` - -- 400 Invalid request - -`application/json` - -```ts -{ - title?: string - type?: string - status?: integer -} -``` - -- 401 Authentication failed - -`application/json` - -```ts -{ - title?: string - type?: string - status?: integer -} -``` - -- 404 Not Found - -`application/json` - -```ts -{ - message?: string - exception: { - type?: string - code?: integer - message?: string - file?: string - line?: integer - } -} -``` - -*** - -### [PATCH]/api/v2/ui/users/{id:[0-9]+}/relationships/{relation:accessGroups} - -- Security -bearerAuth - -#### RequestBody - -- application/json - -```ts -{ - data: { - type?: string - attributes: { - email?: string - globalPermissionGroupId?: integer - isValid?: boolean - name?: string - } - } -} -``` - -#### Responses - -- 200 successful operation - -`application/json` - -```ts -{ - jsonapi: { - version?: string //default: 1.1 - ext?: string //default: https://jsonapi.org/profiles/ethanresnick/cursor-pagination - } - id?: integer - type?: string //default: User - data: { - name?: string - email?: string - passwordHash?: string - passwordSalt?: string - isValid?: boolean - isComputedPassword?: boolean - lastLoginDate?: integer - registeredSince?: integer - sessionLifetime?: integer - globalPermissionGroupId?: integer - yubikey?: string - otp1?: string - otp2?: string - otp3?: string - otp4?: string - } -} -``` - -- 400 Invalid request - -`application/json` - -```ts -{ - title?: string - type?: string - status?: integer -} -``` - -- 401 Authentication failed - -`application/json` - -```ts -{ - title?: string - type?: string - status?: integer -} -``` - -- 404 Not Found - -`application/json` - -```ts -{ - message?: string - exception: { - type?: string - code?: integer - message?: string - file?: string - line?: integer - } -} -``` - -*** - -### [POST]/api/v2/ui/users/{id:[0-9]+}/relationships/{relation:accessGroups} - -- Security -bearerAuth - -#### RequestBody - -- application/json - -#### Responses - -- 204 successfully created - -- 400 Invalid request - -`application/json` - -```ts -{ - title?: string - type?: string - status?: integer -} -``` - -- 401 Authentication failed - -`application/json` - -```ts -{ - title?: string - type?: string - status?: integer -} -``` - -- 404 Not Found - -`application/json` - -```ts -{ - message?: string - exception: { - type?: string - code?: integer - message?: string - file?: string - line?: integer - } -} -``` - -*** - -### [DELETE]/api/v2/ui/users/{id:[0-9]+}/relationships/{relation:accessGroups} - -- Security -bearerAuth - -#### RequestBody - -- application/json - -#### Responses - -- 204 successfully deleted - -- 400 Invalid request - -`application/json` - -```ts -{ - title?: string - type?: string - status?: integer -} -``` - -- 401 Authentication failed - -`application/json` - -```ts -{ - title?: string - type?: string - status?: integer -} -``` - -- 404 Not Found - -`application/json` - -```ts -{ - message?: string - exception: { - type?: string - code?: integer - message?: string - file?: string - line?: integer - } -} -``` - -*** - -### [GET]/api/v2/ui/users/{id:[0-9]+} - -- Description -GET request to retrieve a single object. - -- Security -bearerAuth - -#### Parameters(Query) - -```ts -include?: string -``` - -#### Responses - -- 200 successful operation - -`application/json` - -```ts -{ - jsonapi: { - version?: string //default: 1.1 - ext?: string //default: https://jsonapi.org/profiles/ethanresnick/cursor-pagination - } - links: { - self?: string //default: /api/v2/ui/users?page[size]=25 - first?: string //default: /api/v2/ui/users?page[size]=25&page[after]=0 - last?: string //default: /api/v2/ui/users?page[size]=25&page[before]=500 - next?: string //default: /api/v2/ui/users?page[size]=25&page[after]=25 - previous?: string //default: /api/v2/ui/users?page[size]=25&page[before]=25 - } - id?: integer - type?: string //default: User - data: { - name?: string - email?: string - passwordHash?: string - passwordSalt?: string - isValid?: boolean - isComputedPassword?: boolean - lastLoginDate?: integer - registeredSince?: integer - sessionLifetime?: integer - globalPermissionGroupId?: integer - yubikey?: string - otp1?: string - otp2?: string - otp3?: string - otp4?: string - } - relationships: { - } - included: { - }[] -} -``` - -- 400 Invalid request - -`application/json` - -```ts -{ - title?: string - type?: string - status?: integer -} -``` - -- 401 Authentication failed - -`application/json` - -```ts -{ - title?: string - type?: string - status?: integer -} -``` - -- 404 Not Found - -`application/json` - -```ts -{ - message?: string - exception: { - type?: string - code?: integer - message?: string - file?: string - line?: integer - } -} -``` - -*** - -### [PATCH]/api/v2/ui/users/{id:[0-9]+} - -- Description -PATCH request to update attributes of a single object. - -- Security -bearerAuth - -#### RequestBody - -- application/json - -```ts -{ - data: { - type?: string - attributes: { - email?: string - globalPermissionGroupId?: integer - isValid?: boolean - name?: string - } - } -} -``` - -#### Responses - -- 200 successful operation - -`application/json` - -```ts -{ - jsonapi: { - version?: string //default: 1.1 - ext?: string //default: https://jsonapi.org/profiles/ethanresnick/cursor-pagination - } - id?: integer - type?: string //default: User - data: { - name?: string - email?: string - passwordHash?: string - passwordSalt?: string - isValid?: boolean - isComputedPassword?: boolean - lastLoginDate?: integer - registeredSince?: integer - sessionLifetime?: integer - globalPermissionGroupId?: integer - yubikey?: string - otp1?: string - otp2?: string - otp3?: string - otp4?: string - } -} -``` - -- 400 Invalid request - -`application/json` - -```ts -{ - title?: string - type?: string - status?: integer -} -``` - -- 401 Authentication failed - -`application/json` - -```ts -{ - title?: string - type?: string - status?: integer -} -``` - -- 404 Not Found - -`application/json` - -```ts -{ - message?: string - exception: { - type?: string - code?: integer - message?: string - file?: string - line?: integer - } -} -``` - -*** - -### [DELETE]/api/v2/ui/users/{id:[0-9]+} - -- Security -bearerAuth - -#### RequestBody - -- application/json - -#### Responses - -- 204 successfully deleted - -- 400 Invalid request - -`application/json` - -```ts -{ - title?: string - type?: string - status?: integer -} -``` - -- 401 Authentication failed - -`application/json` - -```ts -{ - title?: string - type?: string - status?: integer -} -``` - -- 404 Not Found - -`application/json` - -```ts -{ - message?: string - exception: { - type?: string - code?: integer - message?: string - file?: string - line?: integer - } -} -``` - -*** - -### [GET]/api/v2/ui/vouchers - -- Description -GET many request to retrieve multiple objects. - -- Security -bearerAuth - -#### Parameters(Query) - -```ts -page[after]?: integer -``` - -```ts -page[before]?: integer -``` - -```ts -page[size]?: integer -``` - -```ts -filter: { -} -``` - -```ts -include?: string -``` - -#### Responses - -- 200 successful operation - -`application/json` - -```ts -{ - jsonapi: { - version?: string //default: 1.1 - ext?: string //default: https://jsonapi.org/profiles/ethanresnick/cursor-pagination - } - links: { - self?: string //default: /api/v2/ui/vouchers?page[size]=25 - first?: string //default: /api/v2/ui/vouchers?page[size]=25&page[after]=0 - last?: string //default: /api/v2/ui/vouchers?page[size]=25&page[before]=500 - next?: string //default: /api/v2/ui/vouchers?page[size]=25&page[after]=25 - previous?: string //default: /api/v2/ui/vouchers?page[size]=25&page[before]=25 - } - id?: integer - type?: string //default: RegVoucher - data: { - voucher?: string - time?: integer - } - relationships: { - } - included: { - }[] -}[] -``` - -- 400 Invalid request - -`application/json` - -```ts -{ - title?: string - type?: string - status?: integer -} -``` - -- 401 Authentication failed - -`application/json` - -```ts -{ - title?: string - type?: string - status?: integer -} -``` - -*** - -### [POST]/api/v2/ui/vouchers - -- Description -POST request to create a new object. The request must contain the resource record as data with the attributes of the new object.To add relationships, a relationships object can be added with the resource records of the relations that are part of this object. - -- Security -bearerAuth - -#### RequestBody - -- application/json - -```ts -{ - data: { - type?: string - attributes: { - voucher?: string - time?: integer - } - } -} -``` - -#### Responses - -- 201 successful operation - -`application/json` - -```ts -{ - jsonapi: { - version?: string //default: 1.1 - ext?: string //default: https://jsonapi.org/profiles/ethanresnick/cursor-pagination - } - id?: integer - type?: string //default: RegVoucher - data: { - voucher?: string - time?: integer - } -} -``` - -- 400 Invalid request - -`application/json` - -```ts -{ - title?: string - type?: string - status?: integer -} -``` - -- 401 Authentication failed - -`application/json` - -```ts -{ - title?: string - type?: string - status?: integer -} -``` - -*** - -### [GET]/api/v2/ui/vouchers/count - -- Description -GET many request to retrieve multiple objects. - -- Security -bearerAuth - -#### Parameters(Query) - -```ts -page[after]?: integer -``` - -```ts -page[before]?: integer -``` - -```ts -page[size]?: integer -``` - -```ts -filter: { -} -``` - -```ts -include?: string -``` - -#### Responses - -- 200 successful operation - -`application/json` - -```ts -{ - jsonapi: { - version?: string //default: 1.1 - ext?: string //default: https://jsonapi.org/profiles/ethanresnick/cursor-pagination - } - links: { - self?: string //default: /api/v2/ui/vouchers?page[size]=25 - first?: string //default: /api/v2/ui/vouchers?page[size]=25&page[after]=0 - last?: string //default: /api/v2/ui/vouchers?page[size]=25&page[before]=500 - next?: string //default: /api/v2/ui/vouchers?page[size]=25&page[after]=25 - previous?: string //default: /api/v2/ui/vouchers?page[size]=25&page[before]=25 - } - id?: integer - type?: string //default: RegVoucher - data: { - voucher?: string - time?: integer - } - relationships: { - } - included: { - }[] -}[] -``` - -- 400 Invalid request - -`application/json` - -```ts -{ - title?: string - type?: string - status?: integer -} -``` - -- 401 Authentication failed - -`application/json` - -```ts -{ - title?: string - type?: string - status?: integer -} -``` - -*** - -### [GET]/api/v2/ui/vouchers/{id:[0-9]+} - -- Description -GET request to retrieve a single object. - -- Security -bearerAuth - -#### Parameters(Query) - -```ts -include?: string -``` - -#### Responses - -- 200 successful operation - -`application/json` - -```ts -{ - jsonapi: { - version?: string //default: 1.1 - ext?: string //default: https://jsonapi.org/profiles/ethanresnick/cursor-pagination - } - links: { - self?: string //default: /api/v2/ui/vouchers?page[size]=25 - first?: string //default: /api/v2/ui/vouchers?page[size]=25&page[after]=0 - last?: string //default: /api/v2/ui/vouchers?page[size]=25&page[before]=500 - next?: string //default: /api/v2/ui/vouchers?page[size]=25&page[after]=25 - previous?: string //default: /api/v2/ui/vouchers?page[size]=25&page[before]=25 - } - id?: integer - type?: string //default: RegVoucher - data: { - voucher?: string - time?: integer - } - relationships: { - } - included: { - }[] -} -``` - -- 400 Invalid request - -`application/json` - -```ts -{ - title?: string - type?: string - status?: integer -} -``` - -- 401 Authentication failed - -`application/json` - -```ts -{ - title?: string - type?: string - status?: integer -} -``` - -- 404 Not Found - -`application/json` - -```ts -{ - message?: string - exception: { - type?: string - code?: integer - message?: string - file?: string - line?: integer - } -} -``` - -*** - -### [PATCH]/api/v2/ui/vouchers/{id:[0-9]+} - -- Description -PATCH request to update attributes of a single object. - -- Security -bearerAuth - -#### RequestBody - -- application/json - -```ts -{ - data: { - type?: string - attributes: { - voucher?: string - } - } -} -``` - -#### Responses - -- 200 successful operation - -`application/json` - -```ts -{ - jsonapi: { - version?: string //default: 1.1 - ext?: string //default: https://jsonapi.org/profiles/ethanresnick/cursor-pagination - } - id?: integer - type?: string //default: RegVoucher - data: { - voucher?: string - time?: integer - } -} -``` - -- 400 Invalid request - -`application/json` - -```ts -{ - title?: string - type?: string - status?: integer -} -``` - -- 401 Authentication failed - -`application/json` - -```ts -{ - title?: string - type?: string - status?: integer -} -``` - -- 404 Not Found - -`application/json` - -```ts -{ - message?: string - exception: { - type?: string - code?: integer - message?: string - file?: string - line?: integer - } -} -``` - -*** - -### [DELETE]/api/v2/ui/vouchers/{id:[0-9]+} - -- Security -bearerAuth - -#### RequestBody - -- application/json - -#### Responses - -- 204 successfully deleted - -- 400 Invalid request - -`application/json` - -```ts -{ - title?: string - type?: string - status?: integer -} -``` - -- 401 Authentication failed - -`application/json` - -```ts -{ - title?: string - type?: string - status?: integer -} -``` - -- 404 Not Found - -`application/json` - -```ts -{ - message?: string - exception: { - type?: string - code?: integer - message?: string - file?: string - line?: integer - } -} -``` - -*** - -### [POST]/api/v2/auth/token - -- Security -basicAuth - -#### RequestBody - -- application/json - -```ts -string[] -``` - -#### Responses - -- 200 Success - -`application/json` - -```ts -{ - token?: string - expires?: integer -} -``` - -- 401 Authentication failed - -`application/json` - -```ts -{ - title?: string - type?: string - status?: integer -} -``` - -- 404 Not Found - -`application/json` - -```ts -{ - message?: string - exception: { - type?: string - code?: integer - message?: string - file?: string - line?: integer - } -} -``` - -## References - -### #/components/schemas/ListResponse - -```ts -{ - expand?: string - page[after]?: integer - page[before]?: integer - page[size]?: integer -} -``` - -### #/components/schemas/ErrorResponse - -```ts -{ - title?: string - type?: string - status?: integer -} -``` - -### #/components/schemas/NotFoundResponse - -```ts -{ - message?: string - exception: { - type?: string - code?: integer - message?: string - file?: string - line?: integer - } -} -``` - -### #/components/schemas/AccessGroupCreate - -```ts -{ - data: { - type?: string - attributes: { - groupName?: string - } - } -} -``` - -### #/components/schemas/AccessGroupPatch - -```ts -{ - data: { - type?: string - attributes: { - groupName?: string - } - } -} -``` - -### #/components/schemas/AccessGroupResponse - -```ts -{ - jsonapi: { - version?: string //default: 1.1 - ext?: string //default: https://jsonapi.org/profiles/ethanresnick/cursor-pagination - } - links: { - self?: string //default: /api/v2/ui/accessgroups?page[size]=25 - first?: string //default: /api/v2/ui/accessgroups?page[size]=25&page[after]=0 - last?: string //default: /api/v2/ui/accessgroups?page[size]=25&page[before]=500 - next?: string //default: /api/v2/ui/accessgroups?page[size]=25&page[after]=25 - previous?: string //default: /api/v2/ui/accessgroups?page[size]=25&page[before]=25 - } - id?: integer - type?: string //default: AccessGroup - data: { - groupName?: string - } - relationships: { - } - included: { - }[] -} -``` - -### #/components/schemas/AccessGroupSingleResponse - -```ts -{ - id?: integer - type?: string //default: AccessGroup - data: { - groupName?: string - } - relationships: { - } - included: { - }[] -} -``` - -### #/components/schemas/AccessGroupPostPatchResponse - -```ts -{ - jsonapi: { - version?: string //default: 1.1 - ext?: string //default: https://jsonapi.org/profiles/ethanresnick/cursor-pagination - } - id?: integer - type?: string //default: AccessGroup - data: { - groupName?: string - } -} -``` - -### #/components/schemas/AccessGroupListResponse - -```ts -{ - "allOf": [ - { - "$ref": "#/components/schemas/ListResponse" - }, - { - "type": "object", - "properties": { - "values": { - "type": "array", - "items": { - "$ref": "#/components/schemas/AccessGroupResponse" - } - } - } - } - ] -} -``` - -### #/components/schemas/AssignmentCreate - -```ts -{ - data: { - type?: string - attributes: { - taskId?: integer - agentId?: integer - benchmark?: string - } - } -} -``` - -### #/components/schemas/AssignmentPatch - -```ts -{ - data: { - type?: string - attributes: { - agentId?: integer - taskId?: integer - } - } -} -``` - -### #/components/schemas/AssignmentResponse - -```ts -{ - jsonapi: { - version?: string //default: 1.1 - ext?: string //default: https://jsonapi.org/profiles/ethanresnick/cursor-pagination - } - links: { - self?: string //default: /api/v2/ui/agentassignments?page[size]=25 - first?: string //default: /api/v2/ui/agentassignments?page[size]=25&page[after]=0 - last?: string //default: /api/v2/ui/agentassignments?page[size]=25&page[before]=500 - next?: string //default: /api/v2/ui/agentassignments?page[size]=25&page[after]=25 - previous?: string //default: /api/v2/ui/agentassignments?page[size]=25&page[before]=25 - } - id?: integer - type?: string //default: Assignment - data: { - taskId?: integer - agentId?: integer - benchmark?: string - } - relationships: { - } - included: { - }[] -} -``` - -### #/components/schemas/AssignmentSingleResponse - -```ts -{ - id?: integer - type?: string //default: Assignment - data: { - taskId?: integer - agentId?: integer - benchmark?: string - } - relationships: { - } - included: { - }[] -} -``` - -### #/components/schemas/AssignmentPostPatchResponse - -```ts -{ - jsonapi: { - version?: string //default: 1.1 - ext?: string //default: https://jsonapi.org/profiles/ethanresnick/cursor-pagination - } - id?: integer - type?: string //default: Assignment - data: { - taskId?: integer - agentId?: integer - benchmark?: string - } -} -``` - -### #/components/schemas/AssignmentListResponse - -```ts -{ - "allOf": [ - { - "$ref": "#/components/schemas/ListResponse" - }, - { - "type": "object", - "properties": { - "values": { - "type": "array", - "items": { - "$ref": "#/components/schemas/AssignmentResponse" - } - } - } - } - ] -} -``` - -### #/components/schemas/AgentBinaryCreate - -```ts -{ - data: { - type?: string - attributes: { - type?: string - version?: string - operatingSystems?: string - filename?: string - updateTrack?: string - updateAvailable?: string - } - } -} -``` - -### #/components/schemas/AgentBinaryPatch - -```ts -{ - data: { - type?: string - attributes: { - filename?: string - operatingSystems?: string - type?: string - updateTrack?: string - version?: string - } - } -} -``` - -### #/components/schemas/AgentBinaryResponse - -```ts -{ - jsonapi: { - version?: string //default: 1.1 - ext?: string //default: https://jsonapi.org/profiles/ethanresnick/cursor-pagination - } - links: { - self?: string //default: /api/v2/ui/agentbinaries?page[size]=25 - first?: string //default: /api/v2/ui/agentbinaries?page[size]=25&page[after]=0 - last?: string //default: /api/v2/ui/agentbinaries?page[size]=25&page[before]=500 - next?: string //default: /api/v2/ui/agentbinaries?page[size]=25&page[after]=25 - previous?: string //default: /api/v2/ui/agentbinaries?page[size]=25&page[before]=25 - } - id?: integer - type?: string //default: AgentBinary - data: { - type?: string - version?: string - operatingSystems?: string - filename?: string - updateTrack?: string - updateAvailable?: string - } - relationships: { - } - included: { - }[] -} -``` - -### #/components/schemas/AgentBinarySingleResponse - -```ts -{ - id?: integer - type?: string //default: AgentBinary - data: { - type?: string - version?: string - operatingSystems?: string - filename?: string - updateTrack?: string - updateAvailable?: string - } - relationships: { - } - included: { - }[] -} -``` - -### #/components/schemas/AgentBinaryPostPatchResponse - -```ts -{ - jsonapi: { - version?: string //default: 1.1 - ext?: string //default: https://jsonapi.org/profiles/ethanresnick/cursor-pagination - } - id?: integer - type?: string //default: AgentBinary - data: { - type?: string - version?: string - operatingSystems?: string - filename?: string - updateTrack?: string - updateAvailable?: string - } -} -``` - -### #/components/schemas/AgentBinaryListResponse - -```ts -{ - "allOf": [ - { - "$ref": "#/components/schemas/ListResponse" - }, - { - "type": "object", - "properties": { - "values": { - "type": "array", - "items": { - "$ref": "#/components/schemas/AgentBinaryResponse" - } - } - } - } - ] -} -``` - -### #/components/schemas/AgentCreate - -```ts -{ - data: { - type?: string - attributes: { - agentName?: string - uid?: string - os?: integer - devices?: string - cmdPars?: string - ignoreErrors?: enum[0, 1, 2] - isActive?: boolean - isTrusted?: boolean - token?: string - lastAct?: string - lastTime?: integer - lastIp?: string - userId?: integer - cpuOnly?: boolean - clientSignature?: string - } - } -} -``` - -### #/components/schemas/AgentPatch - -```ts -{ - data: { - type?: string - attributes: { - agentName?: string - clientSignature?: string - cmdPars?: string - cpuOnly?: boolean - devices?: string - ignoreErrors?: enum[0, 1, 2] - isActive?: boolean - isTrusted?: boolean - os?: integer - token?: string - uid?: string - userId?: integer - } - } -} -``` - -### #/components/schemas/AgentResponse - -```ts -{ - jsonapi: { - version?: string //default: 1.1 - ext?: string //default: https://jsonapi.org/profiles/ethanresnick/cursor-pagination - } - links: { - self?: string //default: /api/v2/ui/agents?page[size]=25 - first?: string //default: /api/v2/ui/agents?page[size]=25&page[after]=0 - last?: string //default: /api/v2/ui/agents?page[size]=25&page[before]=500 - next?: string //default: /api/v2/ui/agents?page[size]=25&page[after]=25 - previous?: string //default: /api/v2/ui/agents?page[size]=25&page[before]=25 - } - id?: integer - type?: string //default: Agent - data: { - agentName?: string - uid?: string - os?: integer - devices?: string - cmdPars?: string - ignoreErrors?: enum[0, 1, 2] - isActive?: boolean - isTrusted?: boolean - token?: string - lastAct?: string - lastTime?: integer - lastIp?: string - userId?: integer - cpuOnly?: boolean - clientSignature?: string - } - relationships: { - } - included: { - }[] -} -``` - -### #/components/schemas/AgentSingleResponse - -```ts -{ - id?: integer - type?: string //default: Agent - data: { - agentName?: string - uid?: string - os?: integer - devices?: string - cmdPars?: string - ignoreErrors?: enum[0, 1, 2] - isActive?: boolean - isTrusted?: boolean - token?: string - lastAct?: string - lastTime?: integer - lastIp?: string - userId?: integer - cpuOnly?: boolean - clientSignature?: string - } - relationships: { - } - included: { - }[] -} -``` - -### #/components/schemas/AgentPostPatchResponse - -```ts -{ - jsonapi: { - version?: string //default: 1.1 - ext?: string //default: https://jsonapi.org/profiles/ethanresnick/cursor-pagination - } - id?: integer - type?: string //default: Agent - data: { - agentName?: string - uid?: string - os?: integer - devices?: string - cmdPars?: string - ignoreErrors?: enum[0, 1, 2] - isActive?: boolean - isTrusted?: boolean - token?: string - lastAct?: string - lastTime?: integer - lastIp?: string - userId?: integer - cpuOnly?: boolean - clientSignature?: string - } -} -``` - -### #/components/schemas/AgentListResponse - -```ts -{ - "allOf": [ - { - "$ref": "#/components/schemas/ListResponse" - }, - { - "type": "object", - "properties": { - "values": { - "type": "array", - "items": { - "$ref": "#/components/schemas/AgentResponse" - } - } - } - } - ] -} -``` - -### #/components/schemas/AgentStatCreate - -```ts -{ - data: { - type?: string - attributes: { - agentId?: integer - statType?: integer - time?: integer -[] - } - } -} -``` - -### #/components/schemas/AgentStatPatch - -```ts -{ - data: { - type?: string - attributes: { - } - } -} -``` - -### #/components/schemas/AgentStatResponse - -```ts -{ - jsonapi: { - version?: string //default: 1.1 - ext?: string //default: https://jsonapi.org/profiles/ethanresnick/cursor-pagination - } - links: { - self?: string //default: /api/v2/ui/agentstats?page[size]=25 - first?: string //default: /api/v2/ui/agentstats?page[size]=25&page[after]=0 - last?: string //default: /api/v2/ui/agentstats?page[size]=25&page[before]=500 - next?: string //default: /api/v2/ui/agentstats?page[size]=25&page[after]=25 - previous?: string //default: /api/v2/ui/agentstats?page[size]=25&page[before]=25 - } - id?: integer - type?: string //default: AgentStat - data: { - agentId?: integer - statType?: integer - time?: integer -[] - } - relationships: { - } - included: { - }[] -} -``` - -### #/components/schemas/AgentStatSingleResponse - -```ts -{ - id?: integer - type?: string //default: AgentStat - data: { - agentId?: integer - statType?: integer - time?: integer -[] - } - relationships: { - } - included: { - }[] -} -``` - -### #/components/schemas/AgentStatPostPatchResponse - -```ts -{ - jsonapi: { - version?: string //default: 1.1 - ext?: string //default: https://jsonapi.org/profiles/ethanresnick/cursor-pagination - } - id?: integer - type?: string //default: AgentStat - data: { - agentId?: integer - statType?: integer - time?: integer -[] - } -} -``` - -### #/components/schemas/AgentStatListResponse - -```ts -{ - "allOf": [ - { - "$ref": "#/components/schemas/ListResponse" - }, - { - "type": "object", - "properties": { - "values": { - "type": "array", - "items": { - "$ref": "#/components/schemas/AgentStatResponse" - } - } - } - } - ] -} -``` - -### #/components/schemas/ChunkCreate - -```ts -{ - data: { - type?: string - attributes: { - taskId?: integer - skip?: integer - length?: integer - agentId?: integer - dispatchTime?: integer - solveTime?: integer - checkpoint?: integer - progress?: integer - state?: integer - cracked?: integer - speed?: integer - } - } -} -``` - -### #/components/schemas/ChunkPatch - -```ts -{ - data: { - type?: string - attributes: { - } - } -} -``` - -### #/components/schemas/ChunkResponse - -```ts -{ - jsonapi: { - version?: string //default: 1.1 - ext?: string //default: https://jsonapi.org/profiles/ethanresnick/cursor-pagination - } - links: { - self?: string //default: /api/v2/ui/chunks?page[size]=25 - first?: string //default: /api/v2/ui/chunks?page[size]=25&page[after]=0 - last?: string //default: /api/v2/ui/chunks?page[size]=25&page[before]=500 - next?: string //default: /api/v2/ui/chunks?page[size]=25&page[after]=25 - previous?: string //default: /api/v2/ui/chunks?page[size]=25&page[before]=25 - } - id?: integer - type?: string //default: Chunk - data: { - taskId?: integer - skip?: integer - length?: integer - agentId?: integer - dispatchTime?: integer - solveTime?: integer - checkpoint?: integer - progress?: integer - state?: integer - cracked?: integer - speed?: integer - } - relationships: { - } - included: { - }[] -} -``` - -### #/components/schemas/ChunkSingleResponse - -```ts -{ - id?: integer - type?: string //default: Chunk - data: { - taskId?: integer - skip?: integer - length?: integer - agentId?: integer - dispatchTime?: integer - solveTime?: integer - checkpoint?: integer - progress?: integer - state?: integer - cracked?: integer - speed?: integer - } - relationships: { - } - included: { - }[] -} -``` - -### #/components/schemas/ChunkPostPatchResponse - -```ts -{ - jsonapi: { - version?: string //default: 1.1 - ext?: string //default: https://jsonapi.org/profiles/ethanresnick/cursor-pagination - } - id?: integer - type?: string //default: Chunk - data: { - taskId?: integer - skip?: integer - length?: integer - agentId?: integer - dispatchTime?: integer - solveTime?: integer - checkpoint?: integer - progress?: integer - state?: integer - cracked?: integer - speed?: integer - } -} -``` - -### #/components/schemas/ChunkListResponse - -```ts -{ - "allOf": [ - { - "$ref": "#/components/schemas/ListResponse" - }, - { - "type": "object", - "properties": { - "values": { - "type": "array", - "items": { - "$ref": "#/components/schemas/ChunkResponse" - } - } - } - } - ] -} -``` - -### #/components/schemas/ConfigCreate - -```ts -{ - data: { - type?: string - attributes: { - configSectionId?: integer - item?: string - value?: string - } - } -} -``` - -### #/components/schemas/ConfigPatch - -```ts -{ - data: { - type?: string - attributes: { - configSectionId?: integer - item?: string - value?: string - } - } -} -``` - -### #/components/schemas/ConfigResponse - -```ts -{ - jsonapi: { - version?: string //default: 1.1 - ext?: string //default: https://jsonapi.org/profiles/ethanresnick/cursor-pagination - } - links: { - self?: string //default: /api/v2/ui/configs?page[size]=25 - first?: string //default: /api/v2/ui/configs?page[size]=25&page[after]=0 - last?: string //default: /api/v2/ui/configs?page[size]=25&page[before]=500 - next?: string //default: /api/v2/ui/configs?page[size]=25&page[after]=25 - previous?: string //default: /api/v2/ui/configs?page[size]=25&page[before]=25 - } - id?: integer - type?: string //default: Config - data: { - configSectionId?: integer - item?: string - value?: string - } - relationships: { - } - included: { - }[] -} -``` - -### #/components/schemas/ConfigSingleResponse - -```ts -{ - id?: integer - type?: string //default: Config - data: { - configSectionId?: integer - item?: string - value?: string - } - relationships: { - } - included: { - }[] -} -``` - -### #/components/schemas/ConfigPostPatchResponse - -```ts -{ - jsonapi: { - version?: string //default: 1.1 - ext?: string //default: https://jsonapi.org/profiles/ethanresnick/cursor-pagination - } - id?: integer - type?: string //default: Config - data: { - configSectionId?: integer - item?: string - value?: string - } -} -``` - -### #/components/schemas/ConfigListResponse - -```ts -{ - "allOf": [ - { - "$ref": "#/components/schemas/ListResponse" - }, - { - "type": "object", - "properties": { - "values": { - "type": "array", - "items": { - "$ref": "#/components/schemas/ConfigResponse" - } - } - } - } - ] -} -``` - -### #/components/schemas/ConfigSectionCreate - -```ts -{ - data: { - type?: string - attributes: { - sectionName?: string - } - } -} -``` - -### #/components/schemas/ConfigSectionPatch - -```ts -{ - data: { - type?: string - attributes: { - sectionName?: string - } - } -} -``` - -### #/components/schemas/ConfigSectionResponse - -```ts -{ - jsonapi: { - version?: string //default: 1.1 - ext?: string //default: https://jsonapi.org/profiles/ethanresnick/cursor-pagination - } - links: { - self?: string //default: /api/v2/ui/configsections?page[size]=25 - first?: string //default: /api/v2/ui/configsections?page[size]=25&page[after]=0 - last?: string //default: /api/v2/ui/configsections?page[size]=25&page[before]=500 - next?: string //default: /api/v2/ui/configsections?page[size]=25&page[after]=25 - previous?: string //default: /api/v2/ui/configsections?page[size]=25&page[before]=25 - } - id?: integer - type?: string //default: ConfigSection - data: { - sectionName?: string - } - relationships: { - } - included: { - }[] -} -``` - -### #/components/schemas/ConfigSectionSingleResponse - -```ts -{ - id?: integer - type?: string //default: ConfigSection - data: { - sectionName?: string - } - relationships: { - } - included: { - }[] -} -``` - -### #/components/schemas/ConfigSectionPostPatchResponse - -```ts -{ - jsonapi: { - version?: string //default: 1.1 - ext?: string //default: https://jsonapi.org/profiles/ethanresnick/cursor-pagination - } - id?: integer - type?: string //default: ConfigSection - data: { - sectionName?: string - } -} -``` - -### #/components/schemas/ConfigSectionListResponse - -```ts -{ - "allOf": [ - { - "$ref": "#/components/schemas/ListResponse" - }, - { - "type": "object", - "properties": { - "values": { - "type": "array", - "items": { - "$ref": "#/components/schemas/ConfigSectionResponse" - } - } - } - } - ] -} -``` - -### #/components/schemas/CrackerBinaryCreate - -```ts -{ - data: { - type?: string - attributes: { - crackerBinaryTypeId?: integer - version?: string - downloadUrl?: string - binaryName?: string - } - } -} -``` - -### #/components/schemas/CrackerBinaryPatch - -```ts -{ - data: { - type?: string - attributes: { - binaryName?: string - crackerBinaryTypeId?: integer - downloadUrl?: string - version?: string - } - } -} -``` - -### #/components/schemas/CrackerBinaryResponse - -```ts -{ - jsonapi: { - version?: string //default: 1.1 - ext?: string //default: https://jsonapi.org/profiles/ethanresnick/cursor-pagination - } - links: { - self?: string //default: /api/v2/ui/crackers?page[size]=25 - first?: string //default: /api/v2/ui/crackers?page[size]=25&page[after]=0 - last?: string //default: /api/v2/ui/crackers?page[size]=25&page[before]=500 - next?: string //default: /api/v2/ui/crackers?page[size]=25&page[after]=25 - previous?: string //default: /api/v2/ui/crackers?page[size]=25&page[before]=25 - } - id?: integer - type?: string //default: CrackerBinary - data: { - crackerBinaryTypeId?: integer - version?: string - downloadUrl?: string - binaryName?: string - } - relationships: { - } - included: { - }[] -} -``` - -### #/components/schemas/CrackerBinarySingleResponse - -```ts -{ - id?: integer - type?: string //default: CrackerBinary - data: { - crackerBinaryTypeId?: integer - version?: string - downloadUrl?: string - binaryName?: string - } - relationships: { - } - included: { - }[] -} -``` - -### #/components/schemas/CrackerBinaryPostPatchResponse - -```ts -{ - jsonapi: { - version?: string //default: 1.1 - ext?: string //default: https://jsonapi.org/profiles/ethanresnick/cursor-pagination - } - id?: integer - type?: string //default: CrackerBinary - data: { - crackerBinaryTypeId?: integer - version?: string - downloadUrl?: string - binaryName?: string - } -} -``` - -### #/components/schemas/CrackerBinaryListResponse - -```ts -{ - "allOf": [ - { - "$ref": "#/components/schemas/ListResponse" - }, - { - "type": "object", - "properties": { - "values": { - "type": "array", - "items": { - "$ref": "#/components/schemas/CrackerBinaryResponse" - } - } - } - } - ] -} -``` - -### #/components/schemas/CrackerBinaryTypeCreate - -```ts -{ - data: { - type?: string - attributes: { - typeName?: string - isChunkingAvailable?: boolean - } - } -} -``` - -### #/components/schemas/CrackerBinaryTypePatch - -```ts -{ - data: { - type?: string - attributes: { - isChunkingAvailable?: boolean - typeName?: string - } - } -} -``` - -### #/components/schemas/CrackerBinaryTypeResponse - -```ts -{ - jsonapi: { - version?: string //default: 1.1 - ext?: string //default: https://jsonapi.org/profiles/ethanresnick/cursor-pagination - } - links: { - self?: string //default: /api/v2/ui/crackertypes?page[size]=25 - first?: string //default: /api/v2/ui/crackertypes?page[size]=25&page[after]=0 - last?: string //default: /api/v2/ui/crackertypes?page[size]=25&page[before]=500 - next?: string //default: /api/v2/ui/crackertypes?page[size]=25&page[after]=25 - previous?: string //default: /api/v2/ui/crackertypes?page[size]=25&page[before]=25 - } - id?: integer - type?: string //default: CrackerBinaryType - data: { - typeName?: string - isChunkingAvailable?: boolean - } - relationships: { - } - included: { - }[] -} -``` - -### #/components/schemas/CrackerBinaryTypeSingleResponse - -```ts -{ - id?: integer - type?: string //default: CrackerBinaryType - data: { - typeName?: string - isChunkingAvailable?: boolean - } - relationships: { - } - included: { - }[] -} -``` - -### #/components/schemas/CrackerBinaryTypePostPatchResponse - -```ts -{ - jsonapi: { - version?: string //default: 1.1 - ext?: string //default: https://jsonapi.org/profiles/ethanresnick/cursor-pagination - } - id?: integer - type?: string //default: CrackerBinaryType - data: { - typeName?: string - isChunkingAvailable?: boolean - } -} -``` - -### #/components/schemas/CrackerBinaryTypeListResponse - -```ts -{ - "allOf": [ - { - "$ref": "#/components/schemas/ListResponse" - }, - { - "type": "object", - "properties": { - "values": { - "type": "array", - "items": { - "$ref": "#/components/schemas/CrackerBinaryTypeResponse" - } - } - } - } - ] -} -``` - -### #/components/schemas/FileCreate - -```ts -{ - data: { - type?: string - attributes: { - sourceType?: string - sourceData?: string - filename?: string - size?: integer - isSecret?: boolean - fileType?: integer - accessGroupId?: integer - lineCount?: integer - } - } -} -``` - -### #/components/schemas/FilePatch - -```ts -{ - data: { - type?: string - attributes: { - accessGroupId?: integer - fileType?: integer - filename?: string - isSecret?: boolean - } - } -} -``` - -### #/components/schemas/FileResponse - -```ts -{ - jsonapi: { - version?: string //default: 1.1 - ext?: string //default: https://jsonapi.org/profiles/ethanresnick/cursor-pagination - } - links: { - self?: string //default: /api/v2/ui/files?page[size]=25 - first?: string //default: /api/v2/ui/files?page[size]=25&page[after]=0 - last?: string //default: /api/v2/ui/files?page[size]=25&page[before]=500 - next?: string //default: /api/v2/ui/files?page[size]=25&page[after]=25 - previous?: string //default: /api/v2/ui/files?page[size]=25&page[before]=25 - } - id?: integer - type?: string //default: File - data: { - filename?: string - size?: integer - isSecret?: boolean - fileType?: integer - accessGroupId?: integer - lineCount?: integer - } - relationships: { - } - included: { - }[] -} -``` - -### #/components/schemas/FileSingleResponse - -```ts -{ - id?: integer - type?: string //default: File - data: { - filename?: string - size?: integer - isSecret?: boolean - fileType?: integer - accessGroupId?: integer - lineCount?: integer - } - relationships: { - } - included: { - }[] -} -``` - -### #/components/schemas/FilePostPatchResponse - -```ts -{ - jsonapi: { - version?: string //default: 1.1 - ext?: string //default: https://jsonapi.org/profiles/ethanresnick/cursor-pagination - } - id?: integer - type?: string //default: File - data: { - filename?: string - size?: integer - isSecret?: boolean - fileType?: integer - accessGroupId?: integer - lineCount?: integer - } -} -``` - -### #/components/schemas/FileListResponse - -```ts -{ - "allOf": [ - { - "$ref": "#/components/schemas/ListResponse" - }, - { - "type": "object", - "properties": { - "values": { - "type": "array", - "items": { - "$ref": "#/components/schemas/FileResponse" - } - } - } - } - ] -} -``` - -### #/components/schemas/RightGroupCreate - -```ts -{ - data: { - type?: string - attributes: { - name?: string - permissions: { - } - } - } -} -``` - -### #/components/schemas/RightGroupPatch - -```ts -{ - data: { - type?: string - attributes: { - name?: string - permissions: { - } - } - } -} -``` - -### #/components/schemas/RightGroupResponse - -```ts -{ - jsonapi: { - version?: string //default: 1.1 - ext?: string //default: https://jsonapi.org/profiles/ethanresnick/cursor-pagination - } - links: { - self?: string //default: /api/v2/ui/globalpermissiongroups?page[size]=25 - first?: string //default: /api/v2/ui/globalpermissiongroups?page[size]=25&page[after]=0 - last?: string //default: /api/v2/ui/globalpermissiongroups?page[size]=25&page[before]=500 - next?: string //default: /api/v2/ui/globalpermissiongroups?page[size]=25&page[after]=25 - previous?: string //default: /api/v2/ui/globalpermissiongroups?page[size]=25&page[before]=25 - } - id?: integer - type?: string //default: RightGroup - data: { - name?: string - permissions: { - } - } - relationships: { - } - included: { - }[] -} -``` - -### #/components/schemas/RightGroupSingleResponse - -```ts -{ - id?: integer - type?: string //default: RightGroup - data: { - name?: string - permissions: { - } - } - relationships: { - } - included: { - }[] -} -``` - -### #/components/schemas/RightGroupPostPatchResponse - -```ts -{ - jsonapi: { - version?: string //default: 1.1 - ext?: string //default: https://jsonapi.org/profiles/ethanresnick/cursor-pagination - } - id?: integer - type?: string //default: RightGroup - data: { - name?: string - permissions: { - } - } -} -``` - -### #/components/schemas/RightGroupListResponse - -```ts -{ - "allOf": [ - { - "$ref": "#/components/schemas/ListResponse" - }, - { - "type": "object", - "properties": { - "values": { - "type": "array", - "items": { - "$ref": "#/components/schemas/RightGroupResponse" - } - } - } - } - ] -} -``` - -### #/components/schemas/HashCreate - -```ts -{ - data: { - type?: string - attributes: { - hashlistId?: integer - hash?: string - salt?: string - plaintext?: string - timeCracked?: integer - chunkId?: integer - isCracked?: boolean - crackPos?: integer - } - } -} -``` - -### #/components/schemas/HashPatch - -```ts -{ - data: { - type?: string - attributes: { - chunkId?: integer - crackPos?: integer - hash?: string - hashlistId?: integer - isCracked?: boolean - plaintext?: string - salt?: string - timeCracked?: integer - } - } -} -``` - -### #/components/schemas/HashResponse - -```ts -{ - jsonapi: { - version?: string //default: 1.1 - ext?: string //default: https://jsonapi.org/profiles/ethanresnick/cursor-pagination - } - links: { - self?: string //default: /api/v2/ui/hashes?page[size]=25 - first?: string //default: /api/v2/ui/hashes?page[size]=25&page[after]=0 - last?: string //default: /api/v2/ui/hashes?page[size]=25&page[before]=500 - next?: string //default: /api/v2/ui/hashes?page[size]=25&page[after]=25 - previous?: string //default: /api/v2/ui/hashes?page[size]=25&page[before]=25 - } - id?: integer - type?: string //default: Hash - data: { - hashlistId?: integer - hash?: string - salt?: string - plaintext?: string - timeCracked?: integer - chunkId?: integer - isCracked?: boolean - crackPos?: integer - } - relationships: { - } - included: { - }[] -} -``` - -### #/components/schemas/HashSingleResponse - -```ts -{ - id?: integer - type?: string //default: Hash - data: { - hashlistId?: integer - hash?: string - salt?: string - plaintext?: string - timeCracked?: integer - chunkId?: integer - isCracked?: boolean - crackPos?: integer - } - relationships: { - } - included: { - }[] -} -``` - -### #/components/schemas/HashPostPatchResponse - -```ts -{ - jsonapi: { - version?: string //default: 1.1 - ext?: string //default: https://jsonapi.org/profiles/ethanresnick/cursor-pagination - } - id?: integer - type?: string //default: Hash - data: { - hashlistId?: integer - hash?: string - salt?: string - plaintext?: string - timeCracked?: integer - chunkId?: integer - isCracked?: boolean - crackPos?: integer - } -} -``` - -### #/components/schemas/HashListResponse - -```ts -{ - "allOf": [ - { - "$ref": "#/components/schemas/ListResponse" - }, - { - "type": "object", - "properties": { - "values": { - "type": "array", - "items": { - "$ref": "#/components/schemas/HashResponse" - } - } - } - } - ] -} -``` - -### #/components/schemas/HashlistCreate - -```ts -{ - data: { - type?: string - attributes: { - hashlistSeperator?: string - sourceType?: string - sourceData?: string - name?: string - format?: enum[0, 1, 2, 3] - hashTypeId?: integer - hashCount?: integer - separator?: string - cracked?: integer - isSecret?: boolean - isHexSalt?: boolean - isSalted?: boolean - accessGroupId?: integer - notes?: string - useBrain?: boolean - brainFeatures?: integer - isArchived?: boolean - } - } -} -``` - -### #/components/schemas/HashlistPatch - -```ts -{ - data: { - type?: string - attributes: { - accessGroupId?: integer - isArchived?: boolean - isSecret?: boolean - name?: string - notes?: string - } - } -} -``` - -### #/components/schemas/HashlistResponse - -```ts -{ - jsonapi: { - version?: string //default: 1.1 - ext?: string //default: https://jsonapi.org/profiles/ethanresnick/cursor-pagination - } - links: { - self?: string //default: /api/v2/ui/hashlists?page[size]=25 - first?: string //default: /api/v2/ui/hashlists?page[size]=25&page[after]=0 - last?: string //default: /api/v2/ui/hashlists?page[size]=25&page[before]=500 - next?: string //default: /api/v2/ui/hashlists?page[size]=25&page[after]=25 - previous?: string //default: /api/v2/ui/hashlists?page[size]=25&page[before]=25 - } - id?: integer - type?: string //default: Hashlist - data: { - name?: string - format?: enum[0, 1, 2, 3] - hashTypeId?: integer - hashCount?: integer - separator?: string - cracked?: integer - isSecret?: boolean - isHexSalt?: boolean - isSalted?: boolean - accessGroupId?: integer - notes?: string - useBrain?: boolean - brainFeatures?: integer - isArchived?: boolean - } - relationships: { - } - included: { - }[] -} -``` - -### #/components/schemas/HashlistSingleResponse - -```ts -{ - id?: integer - type?: string //default: Hashlist - data: { - name?: string - format?: enum[0, 1, 2, 3] - hashTypeId?: integer - hashCount?: integer - separator?: string - cracked?: integer - isSecret?: boolean - isHexSalt?: boolean - isSalted?: boolean - accessGroupId?: integer - notes?: string - useBrain?: boolean - brainFeatures?: integer - isArchived?: boolean - } - relationships: { - } - included: { - }[] -} -``` - -### #/components/schemas/HashlistPostPatchResponse - -```ts -{ - jsonapi: { - version?: string //default: 1.1 - ext?: string //default: https://jsonapi.org/profiles/ethanresnick/cursor-pagination - } - id?: integer - type?: string //default: Hashlist - data: { - name?: string - format?: enum[0, 1, 2, 3] - hashTypeId?: integer - hashCount?: integer - separator?: string - cracked?: integer - isSecret?: boolean - isHexSalt?: boolean - isSalted?: boolean - accessGroupId?: integer - notes?: string - useBrain?: boolean - brainFeatures?: integer - isArchived?: boolean - } -} -``` - -### #/components/schemas/HashlistListResponse - -```ts -{ - "allOf": [ - { - "$ref": "#/components/schemas/ListResponse" - }, - { - "type": "object", - "properties": { - "values": { - "type": "array", - "items": { - "$ref": "#/components/schemas/HashlistResponse" - } - } - } - } - ] -} -``` - -### #/components/schemas/HashTypeCreate - -```ts -{ - data: { - type?: string - attributes: { - description?: string - isSalted?: boolean - isSlowHash?: boolean - } - } -} -``` - -### #/components/schemas/HashTypePatch - -```ts -{ - data: { - type?: string - attributes: { - description?: string - isSalted?: boolean - isSlowHash?: boolean - } - } -} -``` - -### #/components/schemas/HashTypeResponse - -```ts -{ - jsonapi: { - version?: string //default: 1.1 - ext?: string //default: https://jsonapi.org/profiles/ethanresnick/cursor-pagination - } - links: { - self?: string //default: /api/v2/ui/hashtypes?page[size]=25 - first?: string //default: /api/v2/ui/hashtypes?page[size]=25&page[after]=0 - last?: string //default: /api/v2/ui/hashtypes?page[size]=25&page[before]=500 - next?: string //default: /api/v2/ui/hashtypes?page[size]=25&page[after]=25 - previous?: string //default: /api/v2/ui/hashtypes?page[size]=25&page[before]=25 - } - id?: integer - type?: string //default: HashType - data: { - description?: string - isSalted?: boolean - isSlowHash?: boolean - } - relationships: { - } - included: { - }[] -} -``` - -### #/components/schemas/HashTypeSingleResponse - -```ts -{ - id?: integer - type?: string //default: HashType - data: { - description?: string - isSalted?: boolean - isSlowHash?: boolean - } - relationships: { - } - included: { - }[] -} -``` - -### #/components/schemas/HashTypePostPatchResponse - -```ts -{ - jsonapi: { - version?: string //default: 1.1 - ext?: string //default: https://jsonapi.org/profiles/ethanresnick/cursor-pagination - } - id?: integer - type?: string //default: HashType - data: { - description?: string - isSalted?: boolean - isSlowHash?: boolean - } -} -``` - -### #/components/schemas/HashTypeListResponse - -```ts -{ - "allOf": [ - { - "$ref": "#/components/schemas/ListResponse" - }, - { - "type": "object", - "properties": { - "values": { - "type": "array", - "items": { - "$ref": "#/components/schemas/HashTypeResponse" - } - } - } - } - ] -} -``` - -### #/components/schemas/HealthCheckAgentCreate - -```ts -{ - data: { - type?: string - attributes: { - healthCheckId?: integer - agentId?: integer - status?: integer - cracked?: integer - numGpus?: integer - start?: integer - end?: integer - errors?: string - } - } -} -``` - -### #/components/schemas/HealthCheckAgentPatch - -```ts -{ - data: { - type?: string - attributes: { - } - } -} -``` - -### #/components/schemas/HealthCheckAgentResponse - -```ts -{ - jsonapi: { - version?: string //default: 1.1 - ext?: string //default: https://jsonapi.org/profiles/ethanresnick/cursor-pagination - } - links: { - self?: string //default: /api/v2/ui/healthcheckagents?page[size]=25 - first?: string //default: /api/v2/ui/healthcheckagents?page[size]=25&page[after]=0 - last?: string //default: /api/v2/ui/healthcheckagents?page[size]=25&page[before]=500 - next?: string //default: /api/v2/ui/healthcheckagents?page[size]=25&page[after]=25 - previous?: string //default: /api/v2/ui/healthcheckagents?page[size]=25&page[before]=25 - } - id?: integer - type?: string //default: HealthCheckAgent - data: { - healthCheckId?: integer - agentId?: integer - status?: integer - cracked?: integer - numGpus?: integer - start?: integer - end?: integer - errors?: string - } - relationships: { - } - included: { - }[] -} -``` - -### #/components/schemas/HealthCheckAgentSingleResponse - -```ts -{ - id?: integer - type?: string //default: HealthCheckAgent - data: { - healthCheckId?: integer - agentId?: integer - status?: integer - cracked?: integer - numGpus?: integer - start?: integer - end?: integer - errors?: string - } - relationships: { - } - included: { - }[] -} -``` - -### #/components/schemas/HealthCheckAgentPostPatchResponse - -```ts -{ - jsonapi: { - version?: string //default: 1.1 - ext?: string //default: https://jsonapi.org/profiles/ethanresnick/cursor-pagination - } - id?: integer - type?: string //default: HealthCheckAgent - data: { - healthCheckId?: integer - agentId?: integer - status?: integer - cracked?: integer - numGpus?: integer - start?: integer - end?: integer - errors?: string - } -} -``` - -### #/components/schemas/HealthCheckAgentListResponse - -```ts -{ - "allOf": [ - { - "$ref": "#/components/schemas/ListResponse" - }, - { - "type": "object", - "properties": { - "values": { - "type": "array", - "items": { - "$ref": "#/components/schemas/HealthCheckAgentResponse" - } - } - } - } - ] -} -``` - -### #/components/schemas/HealthCheckCreate - -```ts -{ - data: { - type?: string - attributes: { - time?: integer - status?: integer - checkType?: integer - hashtypeId?: integer - crackerBinaryId?: integer - expectedCracks?: integer - attackCmd?: string - } - } -} -``` - -### #/components/schemas/HealthCheckPatch - -```ts -{ - data: { - type?: string - attributes: { - checkType?: integer - crackerBinaryId?: integer - hashtypeId?: integer - } - } -} -``` - -### #/components/schemas/HealthCheckResponse - -```ts -{ - jsonapi: { - version?: string //default: 1.1 - ext?: string //default: https://jsonapi.org/profiles/ethanresnick/cursor-pagination - } - links: { - self?: string //default: /api/v2/ui/healthchecks?page[size]=25 - first?: string //default: /api/v2/ui/healthchecks?page[size]=25&page[after]=0 - last?: string //default: /api/v2/ui/healthchecks?page[size]=25&page[before]=500 - next?: string //default: /api/v2/ui/healthchecks?page[size]=25&page[after]=25 - previous?: string //default: /api/v2/ui/healthchecks?page[size]=25&page[before]=25 - } - id?: integer - type?: string //default: HealthCheck - data: { - time?: integer - status?: integer - checkType?: integer - hashtypeId?: integer - crackerBinaryId?: integer - expectedCracks?: integer - attackCmd?: string - } - relationships: { - } - included: { - }[] -} -``` - -### #/components/schemas/HealthCheckSingleResponse - -```ts -{ - id?: integer - type?: string //default: HealthCheck - data: { - time?: integer - status?: integer - checkType?: integer - hashtypeId?: integer - crackerBinaryId?: integer - expectedCracks?: integer - attackCmd?: string - } - relationships: { - } - included: { - }[] -} -``` - -### #/components/schemas/HealthCheckPostPatchResponse - -```ts -{ - jsonapi: { - version?: string //default: 1.1 - ext?: string //default: https://jsonapi.org/profiles/ethanresnick/cursor-pagination - } - id?: integer - type?: string //default: HealthCheck - data: { - time?: integer - status?: integer - checkType?: integer - hashtypeId?: integer - crackerBinaryId?: integer - expectedCracks?: integer - attackCmd?: string - } -} -``` - -### #/components/schemas/HealthCheckListResponse - -```ts -{ - "allOf": [ - { - "$ref": "#/components/schemas/ListResponse" - }, - { - "type": "object", - "properties": { - "values": { - "type": "array", - "items": { - "$ref": "#/components/schemas/HealthCheckResponse" - } - } - } - } - ] -} -``` - -### #/components/schemas/LogEntryCreate - -```ts -{ - data: { - type?: string - attributes: { - issuer?: string - issuerId?: string - level?: string - message?: string - time?: integer - } - } -} -``` - -### #/components/schemas/LogEntryPatch - -```ts -{ - data: { - type?: string - attributes: { - } - } -} -``` - -### #/components/schemas/LogEntryResponse - -```ts -{ - jsonapi: { - version?: string //default: 1.1 - ext?: string //default: https://jsonapi.org/profiles/ethanresnick/cursor-pagination - } - links: { - self?: string //default: /api/v2/ui/logentries?page[size]=25 - first?: string //default: /api/v2/ui/logentries?page[size]=25&page[after]=0 - last?: string //default: /api/v2/ui/logentries?page[size]=25&page[before]=500 - next?: string //default: /api/v2/ui/logentries?page[size]=25&page[after]=25 - previous?: string //default: /api/v2/ui/logentries?page[size]=25&page[before]=25 - } - id?: integer - type?: string //default: LogEntry - data: { - issuer?: string - issuerId?: string - level?: string - message?: string - time?: integer - } - relationships: { - } - included: { - }[] -} -``` - -### #/components/schemas/LogEntrySingleResponse - -```ts -{ - id?: integer - type?: string //default: LogEntry - data: { - issuer?: string - issuerId?: string - level?: string - message?: string - time?: integer - } - relationships: { - } - included: { - }[] -} -``` - -### #/components/schemas/LogEntryPostPatchResponse - -```ts -{ - jsonapi: { - version?: string //default: 1.1 - ext?: string //default: https://jsonapi.org/profiles/ethanresnick/cursor-pagination - } - id?: integer - type?: string //default: LogEntry - data: { - issuer?: string - issuerId?: string - level?: string - message?: string - time?: integer - } -} -``` - -### #/components/schemas/LogEntryListResponse - -```ts -{ - "allOf": [ - { - "$ref": "#/components/schemas/ListResponse" - }, - { - "type": "object", - "properties": { - "values": { - "type": "array", - "items": { - "$ref": "#/components/schemas/LogEntryResponse" - } - } - } - } - ] -} -``` - -### #/components/schemas/NotificationSettingCreate - -```ts -{ - data: { - type?: string - attributes: { - actionFilter?: string - action?: string - objectId?: integer - notification?: string - userId?: integer - receiver?: string - isActive?: boolean - } - } -} -``` - -### #/components/schemas/NotificationSettingPatch - -```ts -{ - data: { - type?: string - attributes: { - action?: string - isActive?: boolean - notification?: string - receiver?: string - } - } -} -``` - -### #/components/schemas/NotificationSettingResponse - -```ts -{ - jsonapi: { - version?: string //default: 1.1 - ext?: string //default: https://jsonapi.org/profiles/ethanresnick/cursor-pagination - } - links: { - self?: string //default: /api/v2/ui/notifications?page[size]=25 - first?: string //default: /api/v2/ui/notifications?page[size]=25&page[after]=0 - last?: string //default: /api/v2/ui/notifications?page[size]=25&page[before]=500 - next?: string //default: /api/v2/ui/notifications?page[size]=25&page[after]=25 - previous?: string //default: /api/v2/ui/notifications?page[size]=25&page[before]=25 - } - id?: integer - type?: string //default: NotificationSetting - data: { - action?: string - objectId?: integer - notification?: string - userId?: integer - receiver?: string - isActive?: boolean - } - relationships: { - } - included: { - }[] -} -``` - -### #/components/schemas/NotificationSettingSingleResponse - -```ts -{ - id?: integer - type?: string //default: NotificationSetting - data: { - action?: string - objectId?: integer - notification?: string - userId?: integer - receiver?: string - isActive?: boolean - } - relationships: { - } - included: { - }[] -} -``` - -### #/components/schemas/NotificationSettingPostPatchResponse - -```ts -{ - jsonapi: { - version?: string //default: 1.1 - ext?: string //default: https://jsonapi.org/profiles/ethanresnick/cursor-pagination - } - id?: integer - type?: string //default: NotificationSetting - data: { - action?: string - objectId?: integer - notification?: string - userId?: integer - receiver?: string - isActive?: boolean - } -} -``` - -### #/components/schemas/NotificationSettingListResponse - -```ts -{ - "allOf": [ - { - "$ref": "#/components/schemas/ListResponse" - }, - { - "type": "object", - "properties": { - "values": { - "type": "array", - "items": { - "$ref": "#/components/schemas/NotificationSettingResponse" - } - } - } - } - ] -} -``` - -### #/components/schemas/PreprocessorCreate - -```ts -{ - data: { - type?: string - attributes: { - name?: string - url?: string - binaryName?: string - keyspaceCommand?: string - skipCommand?: string - limitCommand?: string - } - } -} -``` - -### #/components/schemas/PreprocessorPatch - -```ts -{ - data: { - type?: string - attributes: { - binaryName?: string - keyspaceCommand?: string - limitCommand?: string - name?: string - skipCommand?: string - url?: string - } - } -} -``` - -### #/components/schemas/PreprocessorResponse - -```ts -{ - jsonapi: { - version?: string //default: 1.1 - ext?: string //default: https://jsonapi.org/profiles/ethanresnick/cursor-pagination - } - links: { - self?: string //default: /api/v2/ui/preprocessors?page[size]=25 - first?: string //default: /api/v2/ui/preprocessors?page[size]=25&page[after]=0 - last?: string //default: /api/v2/ui/preprocessors?page[size]=25&page[before]=500 - next?: string //default: /api/v2/ui/preprocessors?page[size]=25&page[after]=25 - previous?: string //default: /api/v2/ui/preprocessors?page[size]=25&page[before]=25 - } - id?: integer - type?: string //default: Preprocessor - data: { - name?: string - url?: string - binaryName?: string - keyspaceCommand?: string - skipCommand?: string - limitCommand?: string - } - relationships: { - } - included: { - }[] -} -``` - -### #/components/schemas/PreprocessorSingleResponse - -```ts -{ - id?: integer - type?: string //default: Preprocessor - data: { - name?: string - url?: string - binaryName?: string - keyspaceCommand?: string - skipCommand?: string - limitCommand?: string - } - relationships: { - } - included: { - }[] -} -``` - -### #/components/schemas/PreprocessorPostPatchResponse - -```ts -{ - jsonapi: { - version?: string //default: 1.1 - ext?: string //default: https://jsonapi.org/profiles/ethanresnick/cursor-pagination - } - id?: integer - type?: string //default: Preprocessor - data: { - name?: string - url?: string - binaryName?: string - keyspaceCommand?: string - skipCommand?: string - limitCommand?: string - } -} -``` - -### #/components/schemas/PreprocessorListResponse - -```ts -{ - "allOf": [ - { - "$ref": "#/components/schemas/ListResponse" - }, - { - "type": "object", - "properties": { - "values": { - "type": "array", - "items": { - "$ref": "#/components/schemas/PreprocessorResponse" - } - } - } - } - ] -} -``` - -### #/components/schemas/PretaskCreate - -```ts -{ - data: { - type?: string - attributes: { -[] - taskName?: string - attackCmd?: string - chunkTime?: integer - statusTimer?: integer - color?: string - isSmall?: boolean - isCpuTask?: boolean - useNewBench?: boolean - priority?: integer - maxAgents?: integer - isMaskImport?: boolean - crackerBinaryTypeId?: integer - } - } -} -``` - -### #/components/schemas/PretaskPatch - -```ts -{ - data: { - type?: string - attributes: { - attackCmd?: string - chunkTime?: integer - color?: string - crackerBinaryTypeId?: integer - isCpuTask?: boolean - isMaskImport?: boolean - isSmall?: boolean - maxAgents?: integer - priority?: integer - statusTimer?: integer - taskName?: string - } - } -} -``` - -### #/components/schemas/PretaskResponse - -```ts -{ - jsonapi: { - version?: string //default: 1.1 - ext?: string //default: https://jsonapi.org/profiles/ethanresnick/cursor-pagination - } - links: { - self?: string //default: /api/v2/ui/pretasks?page[size]=25 - first?: string //default: /api/v2/ui/pretasks?page[size]=25&page[after]=0 - last?: string //default: /api/v2/ui/pretasks?page[size]=25&page[before]=500 - next?: string //default: /api/v2/ui/pretasks?page[size]=25&page[after]=25 - previous?: string //default: /api/v2/ui/pretasks?page[size]=25&page[before]=25 - } - id?: integer - type?: string //default: Pretask - data: { - taskName?: string - attackCmd?: string - chunkTime?: integer - statusTimer?: integer - color?: string - isSmall?: boolean - isCpuTask?: boolean - useNewBench?: boolean - priority?: integer - maxAgents?: integer - isMaskImport?: boolean - crackerBinaryTypeId?: integer - } - relationships: { - } - included: { - }[] -} -``` - -### #/components/schemas/PretaskSingleResponse - -```ts -{ - id?: integer - type?: string //default: Pretask - data: { - taskName?: string - attackCmd?: string - chunkTime?: integer - statusTimer?: integer - color?: string - isSmall?: boolean - isCpuTask?: boolean - useNewBench?: boolean - priority?: integer - maxAgents?: integer - isMaskImport?: boolean - crackerBinaryTypeId?: integer - } - relationships: { - } - included: { - }[] -} -``` - -### #/components/schemas/PretaskPostPatchResponse - -```ts -{ - jsonapi: { - version?: string //default: 1.1 - ext?: string //default: https://jsonapi.org/profiles/ethanresnick/cursor-pagination - } - id?: integer - type?: string //default: Pretask - data: { - taskName?: string - attackCmd?: string - chunkTime?: integer - statusTimer?: integer - color?: string - isSmall?: boolean - isCpuTask?: boolean - useNewBench?: boolean - priority?: integer - maxAgents?: integer - isMaskImport?: boolean - crackerBinaryTypeId?: integer - } -} -``` - -### #/components/schemas/PretaskListResponse - -```ts -{ - "allOf": [ - { - "$ref": "#/components/schemas/ListResponse" - }, - { - "type": "object", - "properties": { - "values": { - "type": "array", - "items": { - "$ref": "#/components/schemas/PretaskResponse" - } - } - } - } - ] -} -``` - -### #/components/schemas/SpeedCreate - -```ts -{ - data: { - type?: string - attributes: { - agentId?: integer - taskId?: integer - speed?: integer - time?: integer - } - } -} -``` - -### #/components/schemas/SpeedPatch - -```ts -{ - data: { - type?: string - attributes: { - } - } -} -``` - -### #/components/schemas/SpeedResponse - -```ts -{ - jsonapi: { - version?: string //default: 1.1 - ext?: string //default: https://jsonapi.org/profiles/ethanresnick/cursor-pagination - } - links: { - self?: string //default: /api/v2/ui/speeds?page[size]=25 - first?: string //default: /api/v2/ui/speeds?page[size]=25&page[after]=0 - last?: string //default: /api/v2/ui/speeds?page[size]=25&page[before]=500 - next?: string //default: /api/v2/ui/speeds?page[size]=25&page[after]=25 - previous?: string //default: /api/v2/ui/speeds?page[size]=25&page[before]=25 - } - id?: integer - type?: string //default: Speed - data: { - agentId?: integer - taskId?: integer - speed?: integer - time?: integer - } - relationships: { - } - included: { - }[] -} -``` - -### #/components/schemas/SpeedSingleResponse - -```ts -{ - id?: integer - type?: string //default: Speed - data: { - agentId?: integer - taskId?: integer - speed?: integer - time?: integer - } - relationships: { - } - included: { - }[] -} -``` - -### #/components/schemas/SpeedPostPatchResponse - -```ts -{ - jsonapi: { - version?: string //default: 1.1 - ext?: string //default: https://jsonapi.org/profiles/ethanresnick/cursor-pagination - } - id?: integer - type?: string //default: Speed - data: { - agentId?: integer - taskId?: integer - speed?: integer - time?: integer - } -} -``` - -### #/components/schemas/SpeedListResponse - -```ts -{ - "allOf": [ - { - "$ref": "#/components/schemas/ListResponse" - }, - { - "type": "object", - "properties": { - "values": { - "type": "array", - "items": { - "$ref": "#/components/schemas/SpeedResponse" - } - } - } - } - ] -} -``` - -### #/components/schemas/SupertaskCreate - -```ts -{ - data: { - type?: string - attributes: { -[] - supertaskName?: string - } - } -} -``` - -### #/components/schemas/SupertaskPatch - -```ts -{ - data: { - type?: string - attributes: { - supertaskName?: string - } - } -} -``` - -### #/components/schemas/SupertaskResponse - -```ts -{ - jsonapi: { - version?: string //default: 1.1 - ext?: string //default: https://jsonapi.org/profiles/ethanresnick/cursor-pagination - } - links: { - self?: string //default: /api/v2/ui/supertasks?page[size]=25 - first?: string //default: /api/v2/ui/supertasks?page[size]=25&page[after]=0 - last?: string //default: /api/v2/ui/supertasks?page[size]=25&page[before]=500 - next?: string //default: /api/v2/ui/supertasks?page[size]=25&page[after]=25 - previous?: string //default: /api/v2/ui/supertasks?page[size]=25&page[before]=25 - } - id?: integer - type?: string //default: Supertask - data: { - supertaskName?: string - } - relationships: { - } - included: { - }[] -} -``` - -### #/components/schemas/SupertaskSingleResponse - -```ts -{ - id?: integer - type?: string //default: Supertask - data: { - supertaskName?: string - } - relationships: { - } - included: { - }[] -} -``` - -### #/components/schemas/SupertaskPostPatchResponse - -```ts -{ - jsonapi: { - version?: string //default: 1.1 - ext?: string //default: https://jsonapi.org/profiles/ethanresnick/cursor-pagination - } - id?: integer - type?: string //default: Supertask - data: { - supertaskName?: string - } -} -``` - -### #/components/schemas/SupertaskListResponse - -```ts -{ - "allOf": [ - { - "$ref": "#/components/schemas/ListResponse" - }, - { - "type": "object", - "properties": { - "values": { - "type": "array", - "items": { - "$ref": "#/components/schemas/SupertaskResponse" - } - } - } - } - ] -} -``` - -### #/components/schemas/TaskCreate - -```ts -{ - data: { - type?: string - attributes: { - hashlistId?: integer -[] - taskName?: string - attackCmd?: string - chunkTime?: integer - statusTimer?: integer - keyspace?: integer - keyspaceProgress?: integer - priority?: integer - maxAgents?: integer - color?: string - isSmall?: boolean - isCpuTask?: boolean - useNewBench?: boolean - skipKeyspace?: integer - crackerBinaryId?: integer - crackerBinaryTypeId?: integer - taskWrapperId?: integer - isArchived?: boolean - notes?: string - staticChunks?: integer - chunkSize?: integer - forcePipe?: boolean - preprocessorId?: integer - preprocessorCommand?: string - } - } -} -``` - -### #/components/schemas/TaskPatch - -```ts -{ - data: { - type?: string - attributes: { - attackCmd?: string - chunkTime?: integer - color?: string - isArchived?: boolean - isCpuTask?: boolean - isSmall?: boolean - maxAgents?: integer - notes?: string - priority?: integer - statusTimer?: integer - taskName?: string - } - } -} -``` - -### #/components/schemas/TaskResponse - -```ts -{ - jsonapi: { - version?: string //default: 1.1 - ext?: string //default: https://jsonapi.org/profiles/ethanresnick/cursor-pagination - } - links: { - self?: string //default: /api/v2/ui/tasks?page[size]=25 - first?: string //default: /api/v2/ui/tasks?page[size]=25&page[after]=0 - last?: string //default: /api/v2/ui/tasks?page[size]=25&page[before]=500 - next?: string //default: /api/v2/ui/tasks?page[size]=25&page[after]=25 - previous?: string //default: /api/v2/ui/tasks?page[size]=25&page[before]=25 - } - id?: integer - type?: string //default: Task - data: { - taskName?: string - attackCmd?: string - chunkTime?: integer - statusTimer?: integer - keyspace?: integer - keyspaceProgress?: integer - priority?: integer - maxAgents?: integer - color?: string - isSmall?: boolean - isCpuTask?: boolean - useNewBench?: boolean - skipKeyspace?: integer - crackerBinaryId?: integer - crackerBinaryTypeId?: integer - taskWrapperId?: integer - isArchived?: boolean - notes?: string - staticChunks?: integer - chunkSize?: integer - forcePipe?: boolean - preprocessorId?: integer - preprocessorCommand?: string - } - relationships: { - } - included: { - }[] -} -``` - -### #/components/schemas/TaskSingleResponse - -```ts -{ - id?: integer - type?: string //default: Task - data: { - taskName?: string - attackCmd?: string - chunkTime?: integer - statusTimer?: integer - keyspace?: integer - keyspaceProgress?: integer - priority?: integer - maxAgents?: integer - color?: string - isSmall?: boolean - isCpuTask?: boolean - useNewBench?: boolean - skipKeyspace?: integer - crackerBinaryId?: integer - crackerBinaryTypeId?: integer - taskWrapperId?: integer - isArchived?: boolean - notes?: string - staticChunks?: integer - chunkSize?: integer - forcePipe?: boolean - preprocessorId?: integer - preprocessorCommand?: string - } - relationships: { - } - included: { - }[] -} -``` - -### #/components/schemas/TaskPostPatchResponse - -```ts -{ - jsonapi: { - version?: string //default: 1.1 - ext?: string //default: https://jsonapi.org/profiles/ethanresnick/cursor-pagination - } - id?: integer - type?: string //default: Task - data: { - taskName?: string - attackCmd?: string - chunkTime?: integer - statusTimer?: integer - keyspace?: integer - keyspaceProgress?: integer - priority?: integer - maxAgents?: integer - color?: string - isSmall?: boolean - isCpuTask?: boolean - useNewBench?: boolean - skipKeyspace?: integer - crackerBinaryId?: integer - crackerBinaryTypeId?: integer - taskWrapperId?: integer - isArchived?: boolean - notes?: string - staticChunks?: integer - chunkSize?: integer - forcePipe?: boolean - preprocessorId?: integer - preprocessorCommand?: string - } -} -``` - -### #/components/schemas/TaskListResponse - -```ts -{ - "allOf": [ - { - "$ref": "#/components/schemas/ListResponse" - }, - { - "type": "object", - "properties": { - "values": { - "type": "array", - "items": { - "$ref": "#/components/schemas/TaskResponse" - } - } - } - } - ] -} -``` - -### #/components/schemas/TaskWrapperCreate - -```ts -{ - data: { - type?: string - attributes: { - priority?: integer - maxAgents?: integer - taskType?: enum[0, 1] - hashlistId?: integer - accessGroupId?: integer - taskWrapperName?: string - isArchived?: boolean - cracked?: integer - } - } -} -``` - -### #/components/schemas/TaskWrapperPatch - -```ts -{ - data: { - type?: string - attributes: { - accessGroupId?: integer - isArchived?: boolean - maxAgents?: integer - priority?: integer - taskWrapperName?: string - } - } -} -``` - -### #/components/schemas/TaskWrapperResponse - -```ts -{ - jsonapi: { - version?: string //default: 1.1 - ext?: string //default: https://jsonapi.org/profiles/ethanresnick/cursor-pagination - } - links: { - self?: string //default: /api/v2/ui/taskwrappers?page[size]=25 - first?: string //default: /api/v2/ui/taskwrappers?page[size]=25&page[after]=0 - last?: string //default: /api/v2/ui/taskwrappers?page[size]=25&page[before]=500 - next?: string //default: /api/v2/ui/taskwrappers?page[size]=25&page[after]=25 - previous?: string //default: /api/v2/ui/taskwrappers?page[size]=25&page[before]=25 - } - id?: integer - type?: string //default: TaskWrapper - data: { - priority?: integer - maxAgents?: integer - taskType?: enum[0, 1] - hashlistId?: integer - accessGroupId?: integer - taskWrapperName?: string - isArchived?: boolean - cracked?: integer - } - relationships: { - } - included: { - }[] -} -``` - -### #/components/schemas/TaskWrapperSingleResponse - -```ts -{ - id?: integer - type?: string //default: TaskWrapper - data: { - priority?: integer - maxAgents?: integer - taskType?: enum[0, 1] - hashlistId?: integer - accessGroupId?: integer - taskWrapperName?: string - isArchived?: boolean - cracked?: integer - } - relationships: { - } - included: { - }[] -} -``` - -### #/components/schemas/TaskWrapperPostPatchResponse - -```ts -{ - jsonapi: { - version?: string //default: 1.1 - ext?: string //default: https://jsonapi.org/profiles/ethanresnick/cursor-pagination - } - id?: integer - type?: string //default: TaskWrapper - data: { - priority?: integer - maxAgents?: integer - taskType?: enum[0, 1] - hashlistId?: integer - accessGroupId?: integer - taskWrapperName?: string - isArchived?: boolean - cracked?: integer - } -} -``` - -### #/components/schemas/TaskWrapperListResponse - -```ts -{ - "allOf": [ - { - "$ref": "#/components/schemas/ListResponse" - }, - { - "type": "object", - "properties": { - "values": { - "type": "array", - "items": { - "$ref": "#/components/schemas/TaskWrapperResponse" - } - } - } - } - ] -} -``` - -### #/components/schemas/UserCreate - -```ts -{ - data: { - type?: string - attributes: { - name?: string - email?: string - passwordHash?: string - passwordSalt?: string - isValid?: boolean - isComputedPassword?: boolean - lastLoginDate?: integer - registeredSince?: integer - sessionLifetime?: integer - globalPermissionGroupId?: integer - yubikey?: string - otp1?: string - otp2?: string - otp3?: string - otp4?: string - } - } -} -``` - -### #/components/schemas/UserPatch - -```ts -{ - data: { - type?: string - attributes: { - email?: string - globalPermissionGroupId?: integer - isValid?: boolean - name?: string - } - } -} -``` - -### #/components/schemas/UserResponse - -```ts -{ - jsonapi: { - version?: string //default: 1.1 - ext?: string //default: https://jsonapi.org/profiles/ethanresnick/cursor-pagination - } - links: { - self?: string //default: /api/v2/ui/users?page[size]=25 - first?: string //default: /api/v2/ui/users?page[size]=25&page[after]=0 - last?: string //default: /api/v2/ui/users?page[size]=25&page[before]=500 - next?: string //default: /api/v2/ui/users?page[size]=25&page[after]=25 - previous?: string //default: /api/v2/ui/users?page[size]=25&page[before]=25 - } - id?: integer - type?: string //default: User - data: { - name?: string - email?: string - passwordHash?: string - passwordSalt?: string - isValid?: boolean - isComputedPassword?: boolean - lastLoginDate?: integer - registeredSince?: integer - sessionLifetime?: integer - globalPermissionGroupId?: integer - yubikey?: string - otp1?: string - otp2?: string - otp3?: string - otp4?: string - } - relationships: { - } - included: { - }[] -} -``` - -### #/components/schemas/UserSingleResponse - -```ts -{ - id?: integer - type?: string //default: User - data: { - name?: string - email?: string - passwordHash?: string - passwordSalt?: string - isValid?: boolean - isComputedPassword?: boolean - lastLoginDate?: integer - registeredSince?: integer - sessionLifetime?: integer - globalPermissionGroupId?: integer - yubikey?: string - otp1?: string - otp2?: string - otp3?: string - otp4?: string - } - relationships: { - } - included: { - }[] -} -``` - -### #/components/schemas/UserPostPatchResponse - -```ts -{ - jsonapi: { - version?: string //default: 1.1 - ext?: string //default: https://jsonapi.org/profiles/ethanresnick/cursor-pagination - } - id?: integer - type?: string //default: User - data: { - name?: string - email?: string - passwordHash?: string - passwordSalt?: string - isValid?: boolean - isComputedPassword?: boolean - lastLoginDate?: integer - registeredSince?: integer - sessionLifetime?: integer - globalPermissionGroupId?: integer - yubikey?: string - otp1?: string - otp2?: string - otp3?: string - otp4?: string - } -} -``` - -### #/components/schemas/UserListResponse - -```ts -{ - "allOf": [ - { - "$ref": "#/components/schemas/ListResponse" - }, - { - "type": "object", - "properties": { - "values": { - "type": "array", - "items": { - "$ref": "#/components/schemas/UserResponse" - } - } - } - } - ] -} -``` - -### #/components/schemas/RegVoucherCreate - -```ts -{ - data: { - type?: string - attributes: { - voucher?: string - time?: integer - } - } -} -``` - -### #/components/schemas/RegVoucherPatch - -```ts -{ - data: { - type?: string - attributes: { - voucher?: string - } - } -} -``` - -### #/components/schemas/RegVoucherResponse - -```ts -{ - jsonapi: { - version?: string //default: 1.1 - ext?: string //default: https://jsonapi.org/profiles/ethanresnick/cursor-pagination - } - links: { - self?: string //default: /api/v2/ui/vouchers?page[size]=25 - first?: string //default: /api/v2/ui/vouchers?page[size]=25&page[after]=0 - last?: string //default: /api/v2/ui/vouchers?page[size]=25&page[before]=500 - next?: string //default: /api/v2/ui/vouchers?page[size]=25&page[after]=25 - previous?: string //default: /api/v2/ui/vouchers?page[size]=25&page[before]=25 - } - id?: integer - type?: string //default: RegVoucher - data: { - voucher?: string - time?: integer - } - relationships: { - } - included: { - }[] -} -``` - -### #/components/schemas/RegVoucherSingleResponse - -```ts -{ - id?: integer - type?: string //default: RegVoucher - data: { - voucher?: string - time?: integer - } - relationships: { - } - included: { - }[] -} -``` - -### #/components/schemas/RegVoucherPostPatchResponse - -```ts -{ - jsonapi: { - version?: string //default: 1.1 - ext?: string //default: https://jsonapi.org/profiles/ethanresnick/cursor-pagination - } - id?: integer - type?: string //default: RegVoucher - data: { - voucher?: string - time?: integer - } -} -``` - -### #/components/schemas/RegVoucherListResponse - -```ts -{ - "allOf": [ - { - "$ref": "#/components/schemas/ListResponse" - }, - { - "type": "object", - "properties": { - "values": { - "type": "array", - "items": { - "$ref": "#/components/schemas/RegVoucherResponse" - } - } - } - } - ] -} -``` - -### #/components/schemas/Token - -```ts -{ - token?: string - expires?: integer -} -``` - -### #/components/schemas/TokenRequest - -```ts -string[] -``` - -### #/components/schemas/ObjectRequest - -```ts -{ - expand?: string - expires?: integer -} -``` - -### #/components/schemas/ObjectListRequest - -```ts -{ - expand?: string - filter?: string[] -} -``` - -### #/components/securitySchemes/bearerAuth - -```ts -{ - "type": "http", - "description": "JWT Authorization header using the Bearer scheme.", - "scheme": "bearer", - "bearerFormat": "JWT", - "scopes": [ - "permAccessGroupCreate", - "permAccessGroupDelete", - "permAccessGroupRead", - "permAccessGroupUpdate", - "permAgentAssignmentCreate", - "permAgentAssignmentDelete", - "permAgentAssignmentRead", - "permAgentAssignmentUpdate", - "permAgentBinaryCreate", - "permAgentBinaryDelete", - "permAgentBinaryRead", - "permAgentBinaryUpdate", - "permAgentCreate", - "permAgentDelete", - "permAgentRead", - "permAgentStatDelete", - "permAgentStatRead", - "permAgentUpdate", - "permChunkRead", - "permChunkUpdate", - "permConfigRead", - "permConfigSectionRead", - "permConfigUpdate", - "permCrackerBinaryCreate", - "permCrackerBinaryDelete", - "permCrackerBinaryRead", - "permCrackerBinaryTypeCreate", - "permCrackerBinaryTypeDelete", - "permCrackerBinaryTypeRead", - "permCrackerBinaryTypeUpdate", - "permCrackerBinaryUpdate", - "permFileCreate", - "permFileDelete", - "permFileRead", - "permFileUpdate", - "permHashRead", - "permHashTypeCreate", - "permHashTypeDelete", - "permHashTypeRead", - "permHashTypeUpdate", - "permHashUpdate", - "permHashlistCreate", - "permHashlistDelete", - "permHashlistRead", - "permHashlistUpdate", - "permHealthCheckAgentRead", - "permHealthCheckAgentUpdate", - "permHealthCheckCreate", - "permHealthCheckDelete", - "permHealthCheckRead", - "permHealthCheckUpdate", - "permLogEntryCreate", - "permLogEntryDelete", - "permLogEntryRead", - "permLogEntryUpdate", - "permNotificationSettingCreate", - "permNotificationSettingDelete", - "permNotificationSettingRead", - "permNotificationSettingUpdate", - "permPreprocessorCreate", - "permPreprocessorDelete", - "permPreprocessorRead", - "permPreprocessorUpdate", - "permPretaskCreate", - "permPretaskDelete", - "permPretaskRead", - "permPretaskUpdate", - "permRegVoucherCreate", - "permRegVoucherDelete", - "permRegVoucherRead", - "permRegVoucherUpdate", - "permRightGroupCreate", - "permRightGroupDelete", - "permRightGroupRead", - "permRightGroupUpdate", - "permSpeedRead", - "permSpeedUpdate", - "permSupertaskCreate", - "permSupertaskDelete", - "permSupertaskRead", - "permSupertaskUpdate", - "permTaskCreate", - "permTaskDelete", - "permTaskRead", - "permTaskUpdate", - "permTaskWrapperCreate", - "permTaskWrapperDelete", - "permTaskWrapperRead", - "permTaskWrapperUpdate", - "permUserCreate", - "permUserDelete", - "permUserRead", - "permUserUpdate" - ] -} -``` - -### #/components/securitySchemes/basicAuth - -```ts -{ - "type": "http", - "description": "Basic Authorization header.", - "scheme": "basic" -} -``` \ No newline at end of file diff --git a/doc/assets/images/logo2.png b/doc/assets/images/logo2.png new file mode 100644 index 0000000000000000000000000000000000000000..b6c15fbe12c0848e9c7ee4762c9ffc527050ccb0 GIT binary patch literal 56632 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 M-2pzgyux$-0&!U@&Hw-a literal 0 HcmV?d00001 diff --git a/doc/installation_guidelines/advanced_install.md b/doc/installation_guidelines/advanced_install.md index fc896018c..022a997d4 100644 --- a/doc/installation_guidelines/advanced_install.md +++ b/doc/installation_guidelines/advanced_install.md @@ -36,6 +36,77 @@ Continue with the normal docker installation described in the [basic installatio > [!CAUTION] > Hashtopolis is pre-configured with a hashcat cracker. However, the binary package is not loaded within the docker image. A URL is provided so that the agent can download the binary when required. Obviously this does not work in an offline environment. Please check the [binaries cracker section](../user_manual/crackers_binary.md#adding-a-new-version) for details about how to handle such situation. +## Local webserver for cracker binaries + +If you want to use a custom binary or a different version of hashcat (for example with custom modules), you need to supply an URL for a ZIP-file containing that binary, that the agents can reach. You may want to store all your binaries within a local webserver, especially if your environment is offline/air-gapped. + + +If your Hashtopolis-instance is running, stop it, before you make any changes: +``` shell +docker compose down +``` + +### docker-compose.yml + +In your docker-compose.yml-file you have to add an additional container: +``` docker-compose.yml + file-download: + container_name: file-download + image: nginx + restart: always + volumes: + - ./nginx.conf:/etc/nginx/nginx.conf + - ./data:/var/www/html + ports: + - 8081:80 + +``` +Adapt the configuration as needed. In this example you have to put your binary-ZIP-files in the `./data`-folder, where your docker-compose.yml is located and the webserver listens on port 8081. + +!!! note "Note:" + If your environment is offline, keep in mind that you need to export and import the nginx image first following a similar process than for the hashtopolis images as described [previously](./advanced_install.md#installation-in-an-offline-environment). + +### nginx.conf + +For the webserver, which serves the binaries, you need a custom nginx.conf located in the folder, where your docker-compose.yml is located. + +``` nginx.conf +events { + worker_connections 1024; +} + +http { + server { + listen 80; + listen [::]:80; + server_name localhost; + + location / { + root /var/www/html; + index index.html index.htm; + } + } +} +``` + +Adapt this config to your liking and to your setup. You can configure the path to the nginx.conf in the docker-compose.yml. + +If you are using a nginx-server for the SSL/TLS Setup, it is recommended to use a separate nginx.conf for the SSL/TLS Setup and for the local webserver. Change your config-names accordingly and the paths in the docker-compose.yml. + +### Usage + +The local webserver starts with your regular hashtopolis-instance: + +```docker compose up --detach ``` + +Put the ZIP-file for your custom binary in the `./data`-folder. + +When registering a [new binary in the UI](../user_manual/crackers_binary.md#binaries) enter your `Download URL`: +`http://:8081/.zip` + +Your agents should now be able to download the new binary, if you create a task using that binary. + + ## Build Hashtopolis images yourself The Docker images can be built from source following these steps. diff --git a/doc/installation_guidelines/update.md b/doc/installation_guidelines/update.md index 5549b4b41..0e166cab2 100644 --- a/doc/installation_guidelines/update.md +++ b/doc/installation_guidelines/update.md @@ -5,8 +5,8 @@ There are multiple ways to migrate data from a non-Docker setup to Docker. You can start fresh, but if you want to keep your data, several migration options are available. -### Existing database -You can reuse your old database server or also migrate the database to a docker container. +### Importing the existing database in docker +You can reuse your old database server or also migrate the database within a docker container. 1. [Install docker](https://docs.docker.com/engine/install/ubuntu/) to your system 2. Create a database backup using @@ -99,7 +99,7 @@ Becomes */usr/local/share/hashtopolis/config/config.json*: docker compose down && docker compose up ``` -### New database +### Preserving the existing database Repeat the above steps, but you do not need to export or import the database. Just ensure the .env file points to your database server and that it is reachable from the container. diff --git a/doc/user_manual/basic_workflow.md b/doc/user_manual/basic_workflow.md index c83970340..a2c22dc5c 100644 --- a/doc/user_manual/basic_workflow.md +++ b/doc/user_manual/basic_workflow.md @@ -93,7 +93,7 @@ The task will automatically be assigned to available agents if it has the highes Once the task is active, you can track its status and results: -- Go to the **"Tasks"** page to see overall task progress, speed, and number of passwords retrieved. +- Go to the **"Tasks"** page to see overall task progress, speed, and number of passwords recovered. - Click on the task to view detailed progress and more information. - Cracked passwords will appear in the task view. diff --git a/doc/user_manual/files.md b/doc/user_manual/files.md index 18016bcb2..433d6f160 100644 --- a/doc/user_manual/files.md +++ b/doc/user_manual/files.md @@ -47,7 +47,7 @@ Line count: Reprocess the file and update the line count with the number of line For each category, new files can be added to the server by pressing "New Wordlist/Rules/File" button. Files are uploaded using one of the following methods: - **Upload from your computer** – Directly upload files stored on your local machine. -- **Import from an import directory** – Use files that have been preloaded into the server’s import directory. Note that this functionality is obsolete in the new front-end. + - **Download from a URL** – Provide a URL to fetch files from an external source. Detailed instructions for each upload method are provided in the following subsections. diff --git a/doc/user_manual/hashlist.md b/doc/user_manual/hashlist.md index d43b87d9c..7c43d35a7 100644 --- a/doc/user_manual/hashlist.md +++ b/doc/user_manual/hashlist.md @@ -1,23 +1,24 @@ # Hashlists -Hashtopolis utilizes hashlists to store password hashes you want to crack. These lists can be in plain text, HCCAPX, or binary format. Some hashes might include additional information like salts, depending on the format. -This section details the creation of a hashlist within the Hashtopolis interface. Note that at least one hashlist is required for creating tasks. -Refer to the Hashcat documentation for detailed information on supported hash types and their expected formats. You can also use the example hashes provided there as a test to create your first hashlist. +Hashtopolis uses **hashlists** to store password hashes you want to crack. These lists can be in **plain text**, **HCCAPX**, or **binary format**. Some hashes might include additional information like **salts**, depending on the format. + +This section explains how to create a hashlist using the Hashtopolis web interface. + +For a full list of supported hash types and expected formats, refer to the [Hashcat documentation](https://hashcat.net/wiki/doku.php?id=example_hashes). You can also use example hashes from Hashcat website to test your setup by creating your first hashlist. ## Create a hashlist -In the Hashtopolis web interface, navigate to *Hashlists* and click on the button *+ New Hashlist*. You will get the following window: +In the Hashtopolis web interface, go to **Hashlists**, then click on the button **+ New Hashlist**. The following window will appear:
    ![screenshot_create_hashlist](../assets/images/create_hashlist.png)
    -Here is how to fill in the different fields: - -1. **Name**: Provide a descriptive name for your hashlist. -2. **Hash Type**: Select the appropriate hash type from the dropdown menu. Suggestions will appear as you enter text. +Fill out the fields as follows: +1. **Name**: Enter a descriptive name for your hashlist. +2. **Hash Type**: Choose the correct hash type from the dropdown menu. Suggestions will appear as you type in the menu, or just scroll to select the desired one. 3. **Hashlist Format**: Choose the format for your hashlist: - - Text File: Paste or upload a plain text file containing one hash per line. + - Text File: Paste or upload plain text with one hash per line. - HCCAPX/PMKID: Upload a HCCAPX file containing password hashes. - - Binary File: Upload a binary file containing password hashes. + - Binary File: Upload a binary-formatted hash file (e.g. a legacy Veracrypt extracted with `dd`). 4. **Salted Hashes**: Tick the box related to salted hashes if appropriate and provide the correct separator for your hashlist. The flag is enabled/disabled according to the settings defined in the [Hashtype section](./settings_and_configuration.md#hashtypes). If the provided salt(s) is in hex, the following flag needs to be enabled otherwise the salt will be interpreted as a UTF8 value. 5. **Hash source**: Select one of the following hash source types. 6. **Providing the hash**: The last field of the form will automatically adapt depending on the chosen source type. You’ll be asked to provide additional details: diff --git a/doc/user_manual/tasks.md b/doc/user_manual/tasks.md index 8b529804c..a71859728 100644 --- a/doc/user_manual/tasks.md +++ b/doc/user_manual/tasks.md @@ -124,9 +124,9 @@ The same information than those of a task are displayed. The *copy to Pretask* a ![screenshot_import_file](../assets/images/supertasks_subtasks.png)
    -## Import Super Task +## SuperTask Builder -The Import Super Task menu offers functionalities to create SuperTasks and the related pre-configured task in an easy manner. There exist two different ways to create those supertasks, *Masks* and *Wordlist/Rule bulk*. +The **SuperTask Builder** menu offers functionalities to create SuperTasks and the related pre-configured task in an easy manner. There exist two different ways to create those supertasks, *Masks* and *Wordlist/Rule bulk*. ### Masks @@ -144,7 +144,7 @@ This functionality allows the user to create a supertask from a mask file or a s A subtask will be created for each line of the the *Insert masks* text zone and they will be grouped in a supertask. The subtasks are pre-configured task from the database point of view, however they are not displayed in the *Preconfigured Tasks* page. The subtasks that will be generated in this supertasks will be ordered accordingly to their order in the *Insert masks* text zone giving the highest priority to the first line. > [!NOTE] -> Note that the options above will be applied to all the pre-configured tasks that will be created during the generation of the supertasks from this import. +> Note that the options above will be applied to all the pre-configured tasks that will be created during the generation of the supertasks from this build. ### Wordlist/Rule bulk @@ -154,7 +154,7 @@ Most of the options are identical to those of the Mask supertask creation. The m Multiple files are expected to be selected as "Iterate". They should be of the same type (rules/wordlists/other), yet this functionality allows to select different type of files. The placeholder **FILE** should be manually placed by the user. During creation of the supertask, one subtask is created for each file selected as iterate replacing the FILE placeholder by one of the "Iterate File". -Similarly to a regular task, any hashcat parameter can be added to the command line. For example, if the user wants that the Optimized Kernel option (-O) is used, it should be added. That is the reason why this option is not offered to the user among the options contrary to the *Import Masks*. +Similarly to a regular task, any hashcat parameter can be added to the command line. For example, if the user wants that the Optimized Kernel option (-O) is used, it should be added. That is the reason why this option is not offered to the user among the options contrary to the *Build Masks*. **MAKE AN EXAMPLE WITH SOME FIGURES** From 65fc787092abcce2ddbed78c9802bd02072f3a4b Mon Sep 17 00:00:00 2001 From: jessevz Date: Wed, 9 Jul 2025 14:32:35 +0200 Subject: [PATCH 110/691] pagination works, apart from checking if there is a next or prev page --- .../apiv2/common/AbstractModelAPI.class.php | 117 +++++++++++++----- 1 file changed, 85 insertions(+), 32 deletions(-) diff --git a/src/inc/apiv2/common/AbstractModelAPI.class.php b/src/inc/apiv2/common/AbstractModelAPI.class.php index cf6f77d28..dce185e5c 100644 --- a/src/inc/apiv2/common/AbstractModelAPI.class.php +++ b/src/inc/apiv2/common/AbstractModelAPI.class.php @@ -627,49 +627,85 @@ public static function getManyResources(object $apiClass, Request $request, Resp } $orderTemplates = $apiClass->makeOrderFilterTemplates($request, $aliasedfeatures, $defaultSort); + // var_dump($orderTemplates); + //min calculation + // $orderTemplates[0]["type"] = "DESC"; + // $min_order_filters = []; + // foreach ($orderTemplates as $orderTemplate) { + // $min_order_filters[Factory::ORDER][] = new OrderFilter($orderTemplate['by'], $orderTemplate['type']); + // } $orderTemplates[0]["type"] = $defaultSort; $primaryFilter = $orderTemplates[0]['by']; + $orderFilters = []; // Build actual order filters foreach ($orderTemplates as $orderTemplate) { - $aFs[Factory::ORDER][] = new OrderFilter($orderTemplate['by'], $orderTemplate['type']); + // $aFs[Factory::ORDER][] = new OrderFilter($orderTemplate['by'], $orderTemplate['type']); + $orderFilters[] = new OrderFilter($orderTemplate['by'], $orderTemplate['type']); } + // $aFs[Factory::ORDER] = $orderFilters; + // var_dump($aFs); /* Include relation filters */ $finalFs = array_merge($aFs, $relationFs); $primaryKey = $apiClass->getPrimaryKey(); //TODO it would be even better if its possible to see if the primary filter is unique, instead of primary key. + //But this probably needs to be added in getFeatures() then. $primaryKeyIsNotPrimaryFilter = $primaryFilter != $primaryKey; //according to JSON API spec, first and last have to be calculated if inexpensive to compute //(https://jsonapi.org/profiles/ethanresnick/cursor-pagination/#auto-id-links)) //if this query is too expensive for big tables, it can be removed - $agg1 = new Aggregation($primaryFilter, Aggregation::MAX, $factory); - $agg2 = new Aggregation($primaryFilter, Aggregation::MIN, $factory); - $agg3 = new Aggregation($primaryFilter, Aggregation::COUNT, $factory); - $aggregations = [$agg1, $agg2, $agg3]; - if ($primaryKeyIsNotPrimaryFilter) { - $agg4 = new Aggregation($primaryKey, Aggregation::MAX, $factory); - $agg5 = new Aggregation($primaryKey, Aggregation::MIN, $factory); - array_push($aggregations, $agg4, $agg5); - } - $aggregation_results = $factory->multicolAggregationFilter($finalFs, $aggregations); - + //TODO: you cant get the min and max with an aggregation query. + + // $agg1 = new Aggregation($primaryFilter, Aggregation::MAX, $factory); + // $agg2 = new Aggregation($primaryFilter, Aggregation::MIN, $factory); + // $agg3 = new Aggregation($primaryFilter, Aggregation::COUNT, $factory); + // $aggregations = [$agg3]; + // $aggregations = [$agg1, $agg2, $agg3]; + // if ($primaryKeyIsNotPrimaryFilter) { + // $agg4 = new Aggregation($primaryKey, Aggregation::MAX, $factory); + // $agg5 = new Aggregation($primaryKey, Aggregation::MIN, $factory); + // array_push($aggregations, $agg4, $agg5); + // } + // $aggregation_results = $factory->multicolAggregationFilter($finalFs, $aggregations); + $total = $factory->countFilter($finalFs); + + //limit filter of 1 to retrieve first and last cursor + $finalFs[Factory::LIMIT] = new LimitFilter(1); + $oppositeSort = ($defaultSort == "ASC") ? "DESC" : "ASC"; + $orderTemplatesOpposite = $apiClass->makeOrderFilterTemplates($request, $aliasedfeatures, $oppositeSort); + $orderTemplatesOpposite[0]["type"] = $oppositeSort; + $orderFiltersOpposite = []; + foreach ($orderTemplatesOpposite as $orderTemplate) { + // $aFs[Factory::ORDER][] = new OrderFilter($orderTemplate['by'], $orderTemplate['type']); + $orderFiltersOpposite[] = new OrderFilter($orderTemplate['by'], $orderTemplate['type']); + } + $finalFs[Factory::ORDER] = $orderFiltersOpposite; + $lastCursorObject = $factory->filter($finalFs)[0]; + $finalFs[Factory::ORDER] = $orderFilters; + $firstCursorObject = $factory->filter($finalFs)[0]; + if ($isNegativeSort){ + [$firstCursorObject, $lastCursorObject] = [$lastCursorObject, $firstCursorObject]; + } + + // var_dump($firstCursorObject); + // var_dump($lastCursorObject); //TODO these should be calculated, based on the acls of the user. it should only show the max, for the max this user is allowed to see - $max = $aggregation_results[$agg1->getName()]; - $min = $aggregation_results[$agg2->getName()]; - $total = $aggregation_results[$agg3->getName()]; - if ($isNegativeSort) { - [$min, $max] = [$max, $min]; - } - - if ($primaryKeyIsNotPrimaryFilter) { - $secondary_max = $aggregation_results[$agg4->getName()]; //This is the max primary key, when the primary key is not the main filter - $secondary_min = $aggregation_results[$agg5->getName()]; - if ($isNegativeSort) { - [$secondary_min, $secondary_max] = [$secondary_max, $secondary_min]; - } - } + // $max = $aggregation_results[$agg1->getName()]; + // $min = $aggregation_results[$agg2->getName()]; + // $total = $aggregation_results[$agg3->getName()]; + // if ($isNegativeSort) { + // [$min, $max] = [$max, $min]; + // } + + // if ($primaryKeyIsNotPrimaryFilter) { + // $secondary_max = $aggregation_results[$agg4->getName()]; //This is the max primary key, when the primary key is not the main filter + // $secondary_min = $aggregation_results[$agg5->getName()]; + // if ($isNegativeSort) { + // [$secondary_min, $secondary_max] = [$secondary_max, $secondary_min]; + // } + // } //pagination filters need to be added after max has been calculated $finalFs[Factory::LIMIT] = new LimitFilter($pageSize); @@ -760,16 +796,25 @@ public static function getManyResources(object $apiClass, Request $request, Resp $firstObject = $objects[0]->expose(); $lastObject = end($objects)->expose(); $prevId = $firstObject[$primaryFilter]; + // $prevId = $objects[0]->getId(); $nextId = $lastObject[$primaryFilter]; $nextPrimaryKey = $lastObject[$primaryKey]; $previousPrimaryKey = $firstObject[$primaryKey]; + $min = $firstCursorObject->expose()[$primaryFilter]; + $secondary_min = $firstCursorObject->expose()[$primaryFilter]; + $max = $lastCursorObject->expose()[$primaryKey]; + $secondary_max = $lastCursorObject->expose()[$primaryKey]; + // there is next page when either, it is filtered on an unique key and the unique key is smaller than the highest returned key // or if there is non unique key, that is equal and there is a higher tie breaker secondary key. // ex. (HashType.isSalted < 1) OR (HashType.isSalted = 1 and HashType.hashTypeId < 12600) // where salted is primary and hashTypeId is secondary //only set next page when its not the last page - if ($apiClass::compare_keys($max, $nextId, $isNegativeSort) || ($primaryKeyIsNotPrimaryFilter && $nextId == $max && $apiClass::compare_keys($secondary_max, $nextPrimaryKey, $isNegativeSort))) { + // if ($apiClass::compare_keys($max, $nextId, $isNegativeSort) || ($primaryKeyIsNotPrimaryFilter && $nextId == $max && $apiClass::compare_keys($secondary_max, $nextPrimaryKey, $isNegativeSort))) { + error_log("next primary key: " . $nextPrimaryKey); + error_log("Last cursor id: " . $lastCursorObject->getId()); + if ($nextPrimaryKey !== $lastCursorObject->getId()) { $nextParams = $selfParams; // $nextParams['page']['after'] = urlencode($nextId); $next_cursor = $apiClass::build_cursor($primaryFilter, $nextId, $primaryKeyIsNotPrimaryFilter, $primaryKey, $nextPrimaryKey); @@ -779,10 +824,18 @@ public static function getManyResources(object $apiClass, Request $request, Resp } // Build prev link //only set previous page when its not the first page - error_log("previous id: ". $prevId); - error_log("previous min: ". $min); - error_log($apiClass::compare_keys($prevId, $min, $isNegativeSort)); - if ($apiClass::compare_keys($prevId, $min, $isNegativeSort) || ($primaryKeyIsNotPrimaryFilter && $prevId == $min && $apiClass::compare_keys($previousPrimaryKey, $secondary_min, $isNegativeSort))) { + error_log("previous id: ". $previousPrimaryKey); + error_log("first id: " . $firstCursorObject->getId()); + // error_log("min: ". $min); + // error_log("previous primaryKey: " . $previousPrimaryKey); + // error_log("secondary min: ". $secondary_min); + // error_log($apiClass::compare_keys($prevId, $min, $isNegativeSort)); + // error_log($apiClass::compare_keys($previousPrimaryKey, $secondary_min, $isNegativeSort)); + //TODO this check is totally wrong because the secondary key will be the total min/max + // if ($apiClass::compare_keys($prevId, $min, $isNegativeSort) || ($primaryKeyIsNotPrimaryFilter && $prevId == $min && $apiClass::compare_keys($previousPrimaryKey, $secondary_min, $isNegativeSort))) { + if ($previousPrimaryKey !== $firstCursorObject->getId()) { + //build page before + //TODO building cursor is wrong error_log("check"); $prevParams = $selfParams; $previous_cursor = $apiClass::build_cursor($primaryFilter, $prevId, $primaryKeyIsNotPrimaryFilter, $primaryKey, $firstObject[$primaryKey]); @@ -798,7 +851,7 @@ public static function getManyResources(object $apiClass, Request $request, Resp $firstParams['page']['size'] = $pageSize; // $firstParams['page']['after'] = urlencode($min); unset($firstParams['page']['after']); - $linksFirst = $request->getUri()->getPath() . '?' . urldecode(http_build_query($firstParams)); + $linksFirst = $baseUrl . $request->getUri()->getPath() . '?' . urldecode(http_build_query($firstParams)); $links = [ "self" => $linksSelf, "first" => $linksFirst, From 68ccac534260b7bcfb57a79800e4df389b1d6082 Mon Sep 17 00:00:00 2001 From: coiseiw Date: Thu, 10 Jul 2025 13:23:14 +0200 Subject: [PATCH 111/691] fixing a dead link in landing page --- doc/index.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/doc/index.md b/doc/index.md index f54940708..c2f05c32e 100644 --- a/doc/index.md +++ b/doc/index.md @@ -62,4 +62,4 @@ This manual aims to describe all the functionalities and settings existing in Ha - [**Installation Guidelines**](./installation_guidelines/basic_install.md): Covers basic installation steps to deploy a Hashtopolis instance. It also contains advanced installation procedures for air-gapped environments, HTTPS configuration, as well as many other advanced features. - [**User Manual**](./user_manual/agents.md): goes deeper than the basic workflow into each aspect of Hashtopolis. This aims to cover all the existing features and settings. - [**FAQ and Tips**](./faq_tips/faq.md): gathers most of the questions that were asked on different channels (discord, wiki, etc.). -- [**API Reference**](./apiv2.md): contains all the details related to the API in case you need to automate some processes or want to develop your own front end. \ No newline at end of file +- [**API Reference**](./api.md): contains all the details related to the API in case you need to automate some processes or want to develop your own front end. \ No newline at end of file From 7898320fc9e137e15f78ceb2ab4f12ba99f214d4 Mon Sep 17 00:00:00 2001 From: jessevz Date: Thu, 10 Jul 2025 14:51:57 +0200 Subject: [PATCH 112/691] Made next and previous calculation working --- .../apiv2/common/AbstractModelAPI.class.php | 110 ++++-------------- 1 file changed, 23 insertions(+), 87 deletions(-) diff --git a/src/inc/apiv2/common/AbstractModelAPI.class.php b/src/inc/apiv2/common/AbstractModelAPI.class.php index dce185e5c..dc01f2260 100644 --- a/src/inc/apiv2/common/AbstractModelAPI.class.php +++ b/src/inc/apiv2/common/AbstractModelAPI.class.php @@ -501,7 +501,7 @@ protected static function build_cursor($primaryFilter, $primaryId, $hasSecondary $secondaryFilter= null, $secondaryId = null) { $cursor = ["primary" => [$primaryFilter => $primaryId]]; if ($hasSecondaryFilter) { - assert($secondaryId != null && $secondaryFilter != null, + assert($secondaryId !== null && $secondaryFilter !== null, "Secondary id and filter should be set"); //Add the primary key as a secondary cursor to guarantee the cursor is unique $cursor["secondary"] = [$secondaryFilter => $secondaryId]; @@ -545,6 +545,19 @@ protected static function compare_keys($key1, $key2, $isNegativeSort) { } } + protected static function getMinMaxCursor($apiClass, string $sort, array $filters, $request, $aliasedfeatures) { + $filters[Factory::LIMIT] = new LimitFilter(1); + $orderTemplates = $apiClass->makeOrderFilterTemplates($request, $aliasedfeatures, $sort); + $orderTemplates[0]["type"] = $sort; + $orderFilters = []; + foreach ($orderTemplates as $orderTemplate) { + $orderFilters[] = new OrderFilter($orderTemplate['by'], $orderTemplate['type']); + } + $filters[Factory::ORDER] = $orderFilters; + $factory = $apiClass->getFactory(); + return $factory->filter($filters)[0]; + } + /** * API entry point for requesting multiple objects */ @@ -595,6 +608,13 @@ public static function getManyResources(object $apiClass, Request $request, Resp //this is used to reverse the array to show the data correctly for the user $reverseArray = false; + $lastCursorObject = $apiClass->getMinMaxCursor($apiClass, "DESC", $aFs, $request, $aliasedfeatures); + $firstCursorObject = $apiClass->getMinMaxCursor($apiClass, "ASC", $aFs, $request, $aliasedfeatures); + + if ($isNegativeSort){ + [$firstCursorObject, $lastCursorObject] = [$lastCursorObject, $firstCursorObject]; + } + if (!$isNegativeSort && !isset($pageBefore) && isset($pageAfter)) { // this happens when going to the next page while having an ascending sort $defaultSort = "ASC"; @@ -627,13 +647,6 @@ public static function getManyResources(object $apiClass, Request $request, Resp } $orderTemplates = $apiClass->makeOrderFilterTemplates($request, $aliasedfeatures, $defaultSort); - // var_dump($orderTemplates); - //min calculation - // $orderTemplates[0]["type"] = "DESC"; - // $min_order_filters = []; - // foreach ($orderTemplates as $orderTemplate) { - // $min_order_filters[Factory::ORDER][] = new OrderFilter($orderTemplate['by'], $orderTemplate['type']); - // } $orderTemplates[0]["type"] = $defaultSort; $primaryFilter = $orderTemplates[0]['by']; $orderFilters = []; @@ -643,8 +656,7 @@ public static function getManyResources(object $apiClass, Request $request, Resp // $aFs[Factory::ORDER][] = new OrderFilter($orderTemplate['by'], $orderTemplate['type']); $orderFilters[] = new OrderFilter($orderTemplate['by'], $orderTemplate['type']); } - // $aFs[Factory::ORDER] = $orderFilters; - // var_dump($aFs); + $aFs[Factory::ORDER] = $orderFilters; /* Include relation filters */ $finalFs = array_merge($aFs, $relationFs); @@ -653,60 +665,8 @@ public static function getManyResources(object $apiClass, Request $request, Resp //TODO it would be even better if its possible to see if the primary filter is unique, instead of primary key. //But this probably needs to be added in getFeatures() then. $primaryKeyIsNotPrimaryFilter = $primaryFilter != $primaryKey; - //according to JSON API spec, first and last have to be calculated if inexpensive to compute - //(https://jsonapi.org/profiles/ethanresnick/cursor-pagination/#auto-id-links)) - //if this query is too expensive for big tables, it can be removed - //TODO: you cant get the min and max with an aggregation query. - - // $agg1 = new Aggregation($primaryFilter, Aggregation::MAX, $factory); - // $agg2 = new Aggregation($primaryFilter, Aggregation::MIN, $factory); - // $agg3 = new Aggregation($primaryFilter, Aggregation::COUNT, $factory); - // $aggregations = [$agg3]; - // $aggregations = [$agg1, $agg2, $agg3]; - // if ($primaryKeyIsNotPrimaryFilter) { - // $agg4 = new Aggregation($primaryKey, Aggregation::MAX, $factory); - // $agg5 = new Aggregation($primaryKey, Aggregation::MIN, $factory); - // array_push($aggregations, $agg4, $agg5); - // } - // $aggregation_results = $factory->multicolAggregationFilter($finalFs, $aggregations); $total = $factory->countFilter($finalFs); - //limit filter of 1 to retrieve first and last cursor - $finalFs[Factory::LIMIT] = new LimitFilter(1); - $oppositeSort = ($defaultSort == "ASC") ? "DESC" : "ASC"; - $orderTemplatesOpposite = $apiClass->makeOrderFilterTemplates($request, $aliasedfeatures, $oppositeSort); - $orderTemplatesOpposite[0]["type"] = $oppositeSort; - $orderFiltersOpposite = []; - foreach ($orderTemplatesOpposite as $orderTemplate) { - // $aFs[Factory::ORDER][] = new OrderFilter($orderTemplate['by'], $orderTemplate['type']); - $orderFiltersOpposite[] = new OrderFilter($orderTemplate['by'], $orderTemplate['type']); - } - $finalFs[Factory::ORDER] = $orderFiltersOpposite; - $lastCursorObject = $factory->filter($finalFs)[0]; - $finalFs[Factory::ORDER] = $orderFilters; - $firstCursorObject = $factory->filter($finalFs)[0]; - if ($isNegativeSort){ - [$firstCursorObject, $lastCursorObject] = [$lastCursorObject, $firstCursorObject]; - } - - // var_dump($firstCursorObject); - // var_dump($lastCursorObject); - //TODO these should be calculated, based on the acls of the user. it should only show the max, for the max this user is allowed to see - // $max = $aggregation_results[$agg1->getName()]; - // $min = $aggregation_results[$agg2->getName()]; - // $total = $aggregation_results[$agg3->getName()]; - // if ($isNegativeSort) { - // [$min, $max] = [$max, $min]; - // } - - // if ($primaryKeyIsNotPrimaryFilter) { - // $secondary_max = $aggregation_results[$agg4->getName()]; //This is the max primary key, when the primary key is not the main filter - // $secondary_min = $aggregation_results[$agg5->getName()]; - // if ($isNegativeSort) { - // [$secondary_min, $secondary_max] = [$secondary_max, $secondary_min]; - // } - // } - //pagination filters need to be added after max has been calculated $finalFs[Factory::LIMIT] = new LimitFilter($pageSize); @@ -796,24 +756,11 @@ public static function getManyResources(object $apiClass, Request $request, Resp $firstObject = $objects[0]->expose(); $lastObject = end($objects)->expose(); $prevId = $firstObject[$primaryFilter]; - // $prevId = $objects[0]->getId(); $nextId = $lastObject[$primaryFilter]; $nextPrimaryKey = $lastObject[$primaryKey]; $previousPrimaryKey = $firstObject[$primaryKey]; - $min = $firstCursorObject->expose()[$primaryFilter]; - $secondary_min = $firstCursorObject->expose()[$primaryFilter]; - $max = $lastCursorObject->expose()[$primaryKey]; - $secondary_max = $lastCursorObject->expose()[$primaryKey]; - - // there is next page when either, it is filtered on an unique key and the unique key is smaller than the highest returned key - // or if there is non unique key, that is equal and there is a higher tie breaker secondary key. - // ex. (HashType.isSalted < 1) OR (HashType.isSalted = 1 and HashType.hashTypeId < 12600) - // where salted is primary and hashTypeId is secondary //only set next page when its not the last page - // if ($apiClass::compare_keys($max, $nextId, $isNegativeSort) || ($primaryKeyIsNotPrimaryFilter && $nextId == $max && $apiClass::compare_keys($secondary_max, $nextPrimaryKey, $isNegativeSort))) { - error_log("next primary key: " . $nextPrimaryKey); - error_log("Last cursor id: " . $lastCursorObject->getId()); if ($nextPrimaryKey !== $lastCursorObject->getId()) { $nextParams = $selfParams; // $nextParams['page']['after'] = urlencode($nextId); @@ -824,21 +771,10 @@ public static function getManyResources(object $apiClass, Request $request, Resp } // Build prev link //only set previous page when its not the first page - error_log("previous id: ". $previousPrimaryKey); - error_log("first id: " . $firstCursorObject->getId()); - // error_log("min: ". $min); - // error_log("previous primaryKey: " . $previousPrimaryKey); - // error_log("secondary min: ". $secondary_min); - // error_log($apiClass::compare_keys($prevId, $min, $isNegativeSort)); - // error_log($apiClass::compare_keys($previousPrimaryKey, $secondary_min, $isNegativeSort)); - //TODO this check is totally wrong because the secondary key will be the total min/max - // if ($apiClass::compare_keys($prevId, $min, $isNegativeSort) || ($primaryKeyIsNotPrimaryFilter && $prevId == $min && $apiClass::compare_keys($previousPrimaryKey, $secondary_min, $isNegativeSort))) { if ($previousPrimaryKey !== $firstCursorObject->getId()) { //build page before - //TODO building cursor is wrong - error_log("check"); $prevParams = $selfParams; - $previous_cursor = $apiClass::build_cursor($primaryFilter, $prevId, $primaryKeyIsNotPrimaryFilter, $primaryKey, $firstObject[$primaryKey]); + $previous_cursor = $apiClass::build_cursor($primaryFilter, $prevId, $primaryKeyIsNotPrimaryFilter, $primaryKey, $previousPrimaryKey); $prevParams['page']['before'] = $previous_cursor; unset($prevParams['page']['after']); $linksPrev = $baseUrl . $request->getUri()->getPath() . '?' . urldecode(http_build_query($prevParams)); From 9a5efeef2011dea389a9a3a7ca1ae5ed35863533 Mon Sep 17 00:00:00 2001 From: jessevz Date: Mon, 14 Jul 2025 10:33:57 +0200 Subject: [PATCH 113/691] Fixed last cursro calculation --- .../apiv2/common/AbstractModelAPI.class.php | 53 +++++++++++++------ 1 file changed, 37 insertions(+), 16 deletions(-) diff --git a/src/inc/apiv2/common/AbstractModelAPI.class.php b/src/inc/apiv2/common/AbstractModelAPI.class.php index dc01f2260..bff9e03d0 100644 --- a/src/inc/apiv2/common/AbstractModelAPI.class.php +++ b/src/inc/apiv2/common/AbstractModelAPI.class.php @@ -461,23 +461,37 @@ protected static function addToRelatedResources(array $relatedResources, array $ return $relatedResources; } - //TODO: This should calculate the next secondary cursor when the primary cursor is not unique - protected static function calculate_next_cursor(string|int $element) { - if (is_int($element)) { - return $element + 1; - } elseif (is_string($element)) { - $len = strlen($element); - if ($len == 0) { - return '~'; - } - - $lastChar = $element[$len - 1]; - $ord = ord($lastChar); - if ($ord < 126) { - return substr($element, 0, $len-1) . chr($ord + 1); + protected static function calculate_next_cursor(string|int $cursor, bool $ascending=true) { + if (is_int($cursor)) { + if ($ascending) { + return $cursor + 1; } else { - return $element . '!'; // '!' is lowest printable ascii + return $cursor - 1; } + } elseif (is_string($cursor)) { + $len = strlen($cursor); + $lastChar = $cursor[$len - 1]; + $ord = ord($lastChar); + if ($ascending) { + if ($len == 0) { + return '~'; + } + + if ($ord < 126) { + return substr($cursor, 0, $len-1) . chr($ord + 1); + } else { + return $cursor . '!'; // '!' is lowest printable ascii + } + }else { + var_dump($ord); + if ($len == 0) { + return ""; + } + if ($ord > 33) { + return substr($cursor, 0, $len-1) . chr($ord - 1); + } else + return substr($cursor, 0, $len-1); + } } else { throw new HttpError("Internal error", 500); } @@ -739,8 +753,15 @@ public static function getManyResources(object $apiClass, Request $request, Resp $lastParams['page']['size'] = $pageSize; //Todo build last cursor // $next_cursor = $apiClass::build_cursor($primaryFilter, $nextId, $primaryKeyIsNotPrimaryFilter, $primaryKey, $nextPrimaryKey); - // $nextParams['page']['after'] = $next_cursor; // $lastParams['page']['before'] = $apiClass::encode_cursor(self::calculate_next_cursor($max)); + if ($primaryKeyIsNotPrimaryFilter) { + $new_secondary_cursor = $apiClass::calculate_next_cursor($lastCursorObject->getId(), !$isNegativeSort); + $last_cursor = $apiClass::build_cursor($primaryFilter, $lastCursorObject->expose()[$primaryFilter], $primaryKeyIsNotPrimaryFilter, $primaryKey, $new_secondary_cursor); + } else { + $new_cursor = $apiClass::calculate_next_cursor($lastCursorObject->getId(), !$isNegativeSort); + $last_cursor = $apiClass::build_cursor($primaryFilter, $new_cursor); + } + $lastParams['page']['before'] = $last_cursor; $linksLast = $baseUrl . $request->getUri()->getPath() . '?' . urldecode(http_build_query($lastParams)); // Build self link From e4e2dd5e64ea5c9f754bf3f5824760e63f889261 Mon Sep 17 00:00:00 2001 From: jessevz Date: Mon, 14 Jul 2025 10:40:45 +0200 Subject: [PATCH 114/691] URL encode pagination cursor --- src/inc/apiv2/common/AbstractModelAPI.class.php | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/src/inc/apiv2/common/AbstractModelAPI.class.php b/src/inc/apiv2/common/AbstractModelAPI.class.php index bff9e03d0..903444f02 100644 --- a/src/inc/apiv2/common/AbstractModelAPI.class.php +++ b/src/inc/apiv2/common/AbstractModelAPI.class.php @@ -496,6 +496,7 @@ protected static function calculate_next_cursor(string|int $cursor, bool $ascend throw new HttpError("Internal error", 500); } } + /** * The cursor is base64 encoded in the following json format: * {"primary":{"isSlowHash":0},"secondary":{"hashTypeId":10810}} @@ -520,11 +521,8 @@ protected static function build_cursor($primaryFilter, $primaryId, $hasSecondary //Add the primary key as a secondary cursor to guarantee the cursor is unique $cursor["secondary"] = [$secondaryFilter => $secondaryId]; } - //TODO '=' is not URL safe, should be removed and replaced based on the length of the base64, or it should be url encoded - //or url encode everything and also dont touch the /? $json = json_encode($cursor); - return strtr(base64_encode($json), '+/', '-_'); - // return urlencode($json); + return urlencode(base64_encode($json)); } /** @@ -535,7 +533,7 @@ protected static function build_cursor($primaryFilter, $primaryId, $hasSecondary * @return string the decoded cursor in a json string format */ protected static function decode_cursor(string $encoded_cursor) { - $json = base64_decode(strtr($encoded_cursor, '-_', '+/')); + $json = base64_decode($encoded_cursor); $cursor = json_decode($json, true); if (json_last_error() !== JSON_ERROR_NONE) { throw new HttpError("Invallid pagination cursor"); From 0a59fc38c2b5ed2bbb46e5ffbcd716985d545a78 Mon Sep 17 00:00:00 2001 From: jessevz Date: Mon, 14 Jul 2025 13:38:42 +0200 Subject: [PATCH 115/691] Fixed merge error --- .../apiv2/common/AbstractModelAPI.class.php | 52 ++++++++----------- 1 file changed, 22 insertions(+), 30 deletions(-) diff --git a/src/inc/apiv2/common/AbstractModelAPI.class.php b/src/inc/apiv2/common/AbstractModelAPI.class.php index de9922017..ebfa1994c 100644 --- a/src/inc/apiv2/common/AbstractModelAPI.class.php +++ b/src/inc/apiv2/common/AbstractModelAPI.class.php @@ -576,32 +576,31 @@ protected static function getMinMaxCursor($apiClass, string $sort, array $filter */ public static function getManyResources(object $apiClass, Request $request, Response $response, array $relationFs = []): Response { $apiClass->preCommon($request); - + $aliasedfeatures = $apiClass->getAliasedFeatures(); $factory = $apiClass->getFactory(); - + $defaultPageSize = 10000; $maxPageSize = 50000; // TODO: if 0.14.4 release has happened, following parameters can be retrieved from config // $defaultPageSize = SConfig::getInstance()->getVal(DConfig::DEFAULT_PAGE_SIZE); // $maxPageSize = SConfig::getInstance()->getVal(DConfig::MAX_PAGE_SIZE); - + $pageAfter = $apiClass->getQueryParameterFamilyMember($request, 'page', 'after'); $pageBefore = $apiClass->getQueryParameterFamilyMember($request, 'page', 'before'); $pageSize = $apiClass->getQueryParameterFamilyMember($request, 'page', 'size') ?? $defaultPageSize; if (!is_numeric($pageSize) || $pageSize < 0) { throw new HttpError("Invalid parameter, page[size] must be a positive integer"); - } - elseif ($pageSize > $maxPageSize) { + } elseif ($pageSize > $maxPageSize) { throw new HttpError(sprintf("You requested a size of %d, but %d is the maximum.", $pageSize, $maxPageSize)); } - + $validExpandables = $apiClass::getExpandables(); $expands = $apiClass->makeExpandables($request, $validExpandables); - + /* Object filter definition */ $aFs = []; - + /* Generate filters */ $filters = $apiClass->getFilters($request); $qFs_Filter = $apiClass->makeFilter($filters, $apiClass); @@ -617,13 +616,12 @@ public static function getManyResources(object $apiClass, Request $request, Resp if (count($qFs_Filter) > 0) { $aFs[Factory::FILTER] = $qFs_Filter; } - + /** * Create pagination - * + * * TODO: Deny pagination with un-stable sorting */ - $sortList = $apiClass->getQueryParameterAsList($request, 'sort'); $isNegativeSort = $sortList != null && $sortList[0][0] == '-'; //this is used to reverse the array to show the data correctly for the user @@ -677,10 +675,11 @@ public static function getManyResources(object $apiClass, Request $request, Resp // $aFs[Factory::ORDER][] = new OrderFilter($orderTemplate['by'], $orderTemplate['type']); $orderFilters[] = new OrderFilter($orderTemplate['by'], $orderTemplate['type']); } + $aFs[Factory::ORDER] = $orderFilters; /* Include relation filters */ $finalFs = array_merge($aFs, $relationFs); - + $primaryKey = $apiClass->getPrimaryKey(); //TODO it would be even better if its possible to see if the primary filter is unique, instead of primary key. //But this probably needs to be added in getFeatures() then. @@ -701,13 +700,10 @@ public static function getManyResources(object $apiClass, Request $request, Resp $finalFs[Factory::FILTER][] = new QueryFilter(key($primary_cursor), current($primary_cursor), $operator, $factory); } } - + /* Request objects */ $filterObjects = $factory->filter($finalFs); - if ($defaultSort == 'DESC') { - $filterObjects = array_reverse($filterObjects); - } - + /* JOIN statements will return related modules as well, discard for now */ if (array_key_exists(Factory::JOIN, $finalFs)) { $objects = $filterObjects[$factory->getModelname()]; @@ -715,7 +711,6 @@ public static function getManyResources(object $apiClass, Request $request, Resp else { $objects = $filterObjects; } - if ($reverseArray) { $objects = array_reverse($objects); } @@ -726,16 +721,16 @@ public static function getManyResources(object $apiClass, Request $request, Resp // mapping from $objectId -> result objects in $expandResult[$expand] = $apiClass->fetchExpandObjects($objects, $expand); } - + /* Convert objects to JSON:API */ $dataResources = []; $includedResources = []; - + // Convert objects to data resources foreach ($objects as $object) { // Create object $newObject = $apiClass->obj2Resource($object, $expandResult); - + // For compound document, included resources foreach ($expands as $expand) { if (array_key_exists($object->getId(), $expandResult[$expand])) { @@ -744,8 +739,7 @@ public static function getManyResources(object $apiClass, Request $request, Resp foreach ($expandResultObject as $expandObject) { $includedResources = self::addToRelatedResources($includedResources, $apiClass->obj2Resource($expandObject)); } - } - else { + } else { if ($expandResultObject === null) { // to-only relation which is nullable continue; @@ -754,18 +748,16 @@ public static function getManyResources(object $apiClass, Request $request, Resp } } } - + // Add to result output $dataResources[] = $newObject; } - $baseUrl = Util::buildServerUrl(); - //build last link $lastParams = $request->getQueryParams(); unset($lastParams['page']['after']); $lastParams['page']['size'] = $pageSize; - + //Todo build last cursor // $next_cursor = $apiClass::build_cursor($primaryFilter, $nextId, $primaryKeyIsNotPrimaryFilter, $primaryKey, $nextPrimaryKey); // $lastParams['page']['before'] = $apiClass::encode_cursor(self::calculate_next_cursor($max)); if ($primaryKeyIsNotPrimaryFilter) { @@ -815,7 +807,7 @@ public static function getManyResources(object $apiClass, Request $request, Resp $linksPrev = $baseUrl . $request->getUri()->getPath() . '?' . urldecode(http_build_query($prevParams)); } } - + //build first link $firstParams = $request->getQueryParams(); unset($firstParams['page']['before']); @@ -834,10 +826,10 @@ public static function getManyResources(object $apiClass, Request $request, Resp $metadata = ["page" => ["total_elements" => $total]]; // Generate JSON:API GET output $ret = self::createJsonResponse($dataResources, $links, $includedResources, $metadata); - + $body = $response->getBody(); $body->write($apiClass->ret2json($ret)); - + return $response->withStatus(200) ->withHeader("Content-Type", 'application/vnd.api+json; ext="https://jsonapi.org/profiles/ethanresnick/cursor-pagination"'); } From ef635ee595db7ae4f56ed32ed95da9ac8a0d84ef Mon Sep 17 00:00:00 2001 From: jessevz Date: Mon, 14 Jul 2025 13:53:19 +0200 Subject: [PATCH 116/691] url encode self parameter cursors --- src/inc/apiv2/common/AbstractModelAPI.class.php | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/src/inc/apiv2/common/AbstractModelAPI.class.php b/src/inc/apiv2/common/AbstractModelAPI.class.php index ebfa1994c..ed5051968 100644 --- a/src/inc/apiv2/common/AbstractModelAPI.class.php +++ b/src/inc/apiv2/common/AbstractModelAPI.class.php @@ -757,7 +757,6 @@ public static function getManyResources(object $apiClass, Request $request, Resp $lastParams = $request->getQueryParams(); unset($lastParams['page']['after']); $lastParams['page']['size'] = $pageSize; - //Todo build last cursor // $next_cursor = $apiClass::build_cursor($primaryFilter, $nextId, $primaryKeyIsNotPrimaryFilter, $primaryKey, $nextPrimaryKey); // $lastParams['page']['before'] = $apiClass::encode_cursor(self::calculate_next_cursor($max)); if ($primaryKeyIsNotPrimaryFilter) { @@ -772,6 +771,14 @@ public static function getManyResources(object $apiClass, Request $request, Resp // Build self link $selfParams = $request->getQueryParams(); + + if (isset($selfParams['page']['after'])) { + $selfParams['page']['after'] = urlencode($selfParams['page']['after']); + } + if (isset($selfParams['page']['before'])) { + $selfParams['page']['before'] = urlencode($selfParams['page']['before']); + } + $selfParams['page']['size'] = $pageSize; $linksSelf = $baseUrl . $request->getUri()->getPath() . '?' . urldecode(http_build_query($selfParams)); From 96cb9dc0f5d5358c4b66fda54e838eecd1eb15b0 Mon Sep 17 00:00:00 2001 From: jessevz Date: Tue, 15 Jul 2025 07:19:03 +0200 Subject: [PATCH 117/691] Fix get single page test --- ci/apiv2/hashtopolis.py | 41 +++++++++++-------- ci/apiv2/test_pagination.py | 8 +++- .../apiv2/common/AbstractModelAPI.class.php | 15 ++++--- 3 files changed, 39 insertions(+), 25 deletions(-) diff --git a/ci/apiv2/hashtopolis.py b/ci/apiv2/hashtopolis.py index f49e1664d..1660fb7f0 100644 --- a/ci/apiv2/hashtopolis.py +++ b/ci/apiv2/hashtopolis.py @@ -4,6 +4,7 @@ # PoC testing/development framework for APIv2 # Written in python to work on creation of hashtopolis APIv2 python binding. # +from base64 import b64encode import copy import json import logging @@ -168,22 +169,23 @@ def validate_status_code(self, r, expected_status_code, error_msg): type=r_json.get('type', None), title=r_json.get('title', None)) - def validate_pagination_links(self, response, page): - """Validate all the links that are used for paginated data""" - data = response["data"] - highest_id = max(data, key=lambda obj: obj['id'])['id'] - lowest_id = min(data, key=lambda obj: obj['id'])['id'] - - links = response["links"] - query_params = urllib.parse.parse_qs(urllib.parse.urlparse(links["next"]).query) - assert (int(query_params["page[size]"][0]) == page["size"]) - assert (int(query_params["page[after]"][0]) == highest_id) - query_params = urllib.parse.parse_qs(urllib.parse.urlparse(links["prev"]).query) - assert (int(query_params["page[size]"][0]) == page["size"]) - assert (int(query_params["page[before]"][0]) == lowest_id) - query_params = urllib.parse.parse_qs(urllib.parse.urlparse(links["first"]).query) - assert (int(query_params["page[size]"][0]) == page["size"]) - assert (int(query_params["page[after]"][0]) == 0) + # TODO: this does not work anymore for new pagination style + # def validate_pagination_links(self, response, page): + # """Validate all the links that are used for paginated data""" + # data = response["data"] + # highest_id = max(data, key=lambda obj: obj['id'])['id'] + # lowest_id = min(data, key=lambda obj: obj['id'])['id'] + + # links = response["links"] + # query_params = urllib.parse.parse_qs(urllib.parse.urlparse(links["next"]).query) + # assert (int(query_params["page[size]"][0]) == page["size"]) + # assert (int(query_params["page[after]"][0]) == highest_id) + # query_params = urllib.parse.parse_qs(urllib.parse.urlparse(links["prev"]).query) + # assert (int(query_params["page[size]"][0]) == page["size"]) + # assert (int(query_params["page[before]"][0]) == lowest_id) + # query_params = urllib.parse.parse_qs(urllib.parse.urlparse(links["first"]).query) + # assert (int(query_params["page[size]"][0]) == page["size"]) + # assert (int(query_params["page[after]"][0]) == 0) # query_params = urllib.parse.parse_qs(urllib.parse.urlparse(links["last"]).query) # TODO not really a straightforward way to validate the last link @@ -208,7 +210,7 @@ def get_single_page(self, page, filter): logger.debug("Response %s", json.dumps(response, indent=4)) # validate page links - self.validate_pagination_links(response, page) + # self.validate_pagination_links(response, page) return response["data"] # todo refactor start_offset into page variable @@ -216,7 +218,10 @@ def filter(self, include, ordering, filter, start_offset): self.authenticate() headers = self._headers - payload = {'page[after]': start_offset} + after_dict = {"primary": {"_id": start_offset}} + after_param = b64encode(json.dumps(after_dict).encode('utf-8')).decode('utf-8') + + payload = {'page[after]': after_param} if filter: for k, v in filter.items(): payload[f"filter[{k}]"] = v diff --git a/ci/apiv2/test_pagination.py b/ci/apiv2/test_pagination.py index deb8af57a..dd0b794cc 100644 --- a/ci/apiv2/test_pagination.py +++ b/ci/apiv2/test_pagination.py @@ -1,19 +1,23 @@ from hashtopolis import HashType from utils import BaseTest +import json +from base64 import b64encode class PaginationTest(BaseTest): model_class = HashType def pagination_test_helper(self, after, size): - objs = HashType.objects.paginate(size=size, after=after).get_pagination() + after_dict = {"primary": {"hashTypeId": after}} + after_param = b64encode(json.dumps(after_dict).encode('utf-8')).decode('utf-8') + objs = HashType.objects.paginate(size=size, after=after_param).get_pagination() all_objs = list(HashType.objects.all()) index = None for idx, obj in enumerate(all_objs): if obj.id > after: index = idx break - + self.assertIsNotNone(index) self.assertEqual(objs, all_objs[index:index+size]) pass diff --git a/src/inc/apiv2/common/AbstractModelAPI.class.php b/src/inc/apiv2/common/AbstractModelAPI.class.php index ed5051968..650e28fd8 100644 --- a/src/inc/apiv2/common/AbstractModelAPI.class.php +++ b/src/inc/apiv2/common/AbstractModelAPI.class.php @@ -692,12 +692,17 @@ public static function getManyResources(object $apiClass, Request $request, Resp if (isset($paginationCursor)) { $decoded_cursor = $apiClass->decode_cursor($paginationCursor); $primary_cursor = $decoded_cursor["primary"]; + $primary_cursor_key = key($primary_cursor); + // Special filtering of _id to use for uniform access to model primary key + $primary_cursor_key = $primary_cursor_key == '_id' ? array_column($aliasedfeatures, 'alias', 'dbname')[$apiClass->getPrimaryKey()] : $primary_cursor_key; $secondary_cursor = $decoded_cursor["secondary"]; if ($secondary_cursor) { - $finalFs[Factory::FILTER][] = new PaginationFilter(key($primary_cursor), current($primary_cursor), - $operator, key($secondary_cursor), current($secondary_cursor)); + $secondary_cursor_key = key($secondary_cursor); + $secondary_cursor_key = $secondary_cursor_key == '_id' ? array_column($aliasedfeatures, 'alias', 'dbname')[$apiClass->getPrimaryKey()] : $secondary_cursor_key; + $finalFs[Factory::FILTER][] = new PaginationFilter($primary_cursor_key, current($primary_cursor), + $operator, $secondary_cursor_key, current($secondary_cursor)); } else { - $finalFs[Factory::FILTER][] = new QueryFilter(key($primary_cursor), current($primary_cursor), $operator, $factory); + $finalFs[Factory::FILTER][] = new QueryFilter($primary_cursor_key, current($primary_cursor), $operator, $factory); } } @@ -759,10 +764,10 @@ public static function getManyResources(object $apiClass, Request $request, Resp $lastParams['page']['size'] = $pageSize; // $next_cursor = $apiClass::build_cursor($primaryFilter, $nextId, $primaryKeyIsNotPrimaryFilter, $primaryKey, $nextPrimaryKey); // $lastParams['page']['before'] = $apiClass::encode_cursor(self::calculate_next_cursor($max)); - if ($primaryKeyIsNotPrimaryFilter) { + if ($primaryKeyIsNotPrimaryFilter && isset($lastCursorObject)) { $new_secondary_cursor = $apiClass::calculate_next_cursor($lastCursorObject->getId(), !$isNegativeSort); $last_cursor = $apiClass::build_cursor($primaryFilter, $lastCursorObject->expose()[$primaryFilter], $primaryKeyIsNotPrimaryFilter, $primaryKey, $new_secondary_cursor); - } else { + } else if (isset($lastCursorObject)){ $new_cursor = $apiClass::calculate_next_cursor($lastCursorObject->getId(), !$isNegativeSort); $last_cursor = $apiClass::build_cursor($primaryFilter, $new_cursor); } From b5caf6387bab6074f0d2bedaa9152c3a280e9ec3 Mon Sep 17 00:00:00 2001 From: jessevz Date: Tue, 15 Jul 2025 18:16:23 +0200 Subject: [PATCH 118/691] Added limit support for join database queries --- src/dba/AbstractModelFactory.class.php | 3 +++ 1 file changed, 3 insertions(+) diff --git a/src/dba/AbstractModelFactory.class.php b/src/dba/AbstractModelFactory.class.php index 7e00eac46..e4bc12106 100755 --- a/src/dba/AbstractModelFactory.class.php +++ b/src/dba/AbstractModelFactory.class.php @@ -634,6 +634,9 @@ private function filterWithJoin($options) { } $query .= $this->applyOrder($options['order']); + if (array_key_exists("limit", $options)) { + $query .= $this->applyLimit($options['limit']); + } $dbh = self::getDB(); $stmt = $dbh->prepare($query); From b0e764a97d85875502c3797bb4f60edbfcc38ae6 Mon Sep 17 00:00:00 2001 From: jessevz Date: Tue, 15 Jul 2025 18:49:57 +0200 Subject: [PATCH 119/691] Fixed handling of pagination when data has been joined --- src/inc/apiv2/common/AbstractModelAPI.class.php | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/src/inc/apiv2/common/AbstractModelAPI.class.php b/src/inc/apiv2/common/AbstractModelAPI.class.php index 650e28fd8..1484115bd 100644 --- a/src/inc/apiv2/common/AbstractModelAPI.class.php +++ b/src/inc/apiv2/common/AbstractModelAPI.class.php @@ -567,7 +567,12 @@ protected static function getMinMaxCursor($apiClass, string $sort, array $filter } $filters[Factory::ORDER] = $orderFilters; $factory = $apiClass->getFactory(); - return $factory->filter($filters)[0]; + $result = $factory->filter($filters); + //handle joined queries + if (array_key_exists(Factory::JOIN, $filters)) { + $result = $result[$factory->getModelname()]; + } + return $result[0]; } /** @@ -800,7 +805,7 @@ public static function getManyResources(object $apiClass, Request $request, Resp $previousPrimaryKey = $firstObject[$primaryKey]; //only set next page when its not the last page - if ($nextPrimaryKey !== $lastCursorObject->getId()) { + if (isset($lastCursorObject) && $nextPrimaryKey !== $lastCursorObject->getId()) { $nextParams = $selfParams; // $nextParams['page']['after'] = urlencode($nextId); $next_cursor = $apiClass::build_cursor($primaryFilter, $nextId, $primaryKeyIsNotPrimaryFilter, $primaryKey, $nextPrimaryKey); @@ -810,7 +815,7 @@ public static function getManyResources(object $apiClass, Request $request, Resp } // Build prev link //only set previous page when its not the first page - if ($previousPrimaryKey !== $firstCursorObject->getId()) { + if (isset($firstCursorObject) && $previousPrimaryKey !== $firstCursorObject->getId()) { //build page before $prevParams = $selfParams; $previous_cursor = $apiClass::build_cursor($primaryFilter, $prevId, $primaryKeyIsNotPrimaryFilter, $primaryKey, $previousPrimaryKey); From a4748bf61b670de8e226c049a3c7647226e361fd Mon Sep 17 00:00:00 2001 From: jessevz Date: Thu, 17 Jul 2025 11:31:15 +0200 Subject: [PATCH 120/691] Fixed last bugs in pagination --- ci/apiv2/hashtopolis.py | 28 ++++++++++--------- .../apiv2/common/AbstractBaseAPI.class.php | 9 ++++-- .../apiv2/common/AbstractModelAPI.class.php | 14 ++++------ 3 files changed, 28 insertions(+), 23 deletions(-) diff --git a/ci/apiv2/hashtopolis.py b/ci/apiv2/hashtopolis.py index 1660fb7f0..dfd597528 100644 --- a/ci/apiv2/hashtopolis.py +++ b/ci/apiv2/hashtopolis.py @@ -40,7 +40,7 @@ def __init__(self, *args, **kwargs): self.title = kwargs.get("title", "") self.type = kwargs.get("type", "") self.status = kwargs.get("status", None) - + # TODO: These are the old exception details, if all exceptions have been refactored, # these following lines can be removed. self.exception_details = kwargs.get('exception_details', []) @@ -125,7 +125,7 @@ def authenticate(self): self._headers = { 'Authorization': 'Bearer ' + self._token } - + def create_to_many_payload(self, objects, attributes, field): records = [] for obj, attribute in zip(objects, attributes): @@ -188,7 +188,7 @@ def validate_status_code(self, r, expected_status_code, error_msg): # assert (int(query_params["page[after]"][0]) == 0) # query_params = urllib.parse.parse_qs(urllib.parse.urlparse(links["last"]).query) # TODO not really a straightforward way to validate the last link - + def get_single_page(self, page, filter): """Gets a single page by using the page parameters""" self.authenticate() @@ -221,7 +221,9 @@ def filter(self, include, ordering, filter, start_offset): after_dict = {"primary": {"_id": start_offset}} after_param = b64encode(json.dumps(after_dict).encode('utf-8')).decode('utf-8') - payload = {'page[after]': after_param} + payload = {} + if (start_offset): + payload['page[after]'] = after_param if filter: for k, v in filter.items(): payload[f"filter[{k}]"] = v @@ -248,7 +250,7 @@ def filter(self, include, ordering, filter, start_offset): if 'links' not in response or 'next' not in response['links'] or not response['links']['next']: break - request_uri = self._hashtopolis_uri + response['links']['next'] + request_uri = response['links']['next'] def get_one(self, pk, include): self.authenticate() @@ -262,7 +264,7 @@ def get_one(self, pk, include): r = requests.get(uri, headers=headers, data=payload) self.validate_status_code(r, [200], "Get single object failed") return self.resp_to_json(r) - + def delete_many(self, objects): self.authenticate() uri = self._api_endpoint + self._model_uri @@ -313,7 +315,7 @@ def patch_one(self, obj): for k, v in obj.diff().items(): logger.debug("Going to patch object '%s' property '%s' from '%s' to '%s'", obj, k, v[0], v[1]) attributes[k] = v[1] - + payload = self.create_payload(obj, attributes, id=obj.id) logger.debug("Sending PATCH payload: %s to %s", json.dumps(payload), uri) r = requests.patch(uri, headers=headers, data=json.dumps(payload)) @@ -407,7 +409,7 @@ def __getitem__(self, k): if isinstance(k, slice): return self.filter_(k.start or 0, k.stop or sys.maxsize, k.step or 1) - + def get_pagination(self): objs = self.cls.get_conn().get_single_page(self.pages, self.filters) parsed_objs = [] @@ -458,7 +460,7 @@ def order_by(self, *ordering): def filter(self, **filters): self.filters = filters return self - + def page(self, **pages): self.pages = pages return self @@ -517,7 +519,7 @@ def patch(cls, obj): @classmethod def patch_many(cls, objects, attributes, field): cls.get_conn().patch_many(objects, attributes, field) - + @classmethod def delete_many(cls, objects): cls.get_conn().delete_many(objects) @@ -541,11 +543,11 @@ def get_first(cls): @classmethod def get(cls, **filters): return QuerySet(cls, filters=filters).get() - + @classmethod def count(cls, **filters): return cls.get_conn().count(filter=filters) - + @classmethod def paginate(cls, **pages): return QuerySet(cls, pages=pages) @@ -715,7 +717,7 @@ def diff_includes(self): # Use ID of ojbects as new current/update identifiers if sorted(v_innitial_ids) != sorted(v_current_ids): diffs.append((innitial_name, (v_innitial_ids, v_current_ids))) - + return dict(diffs) def has_changed(self): diff --git a/src/inc/apiv2/common/AbstractBaseAPI.class.php b/src/inc/apiv2/common/AbstractBaseAPI.class.php index edcc32bae..ec2cb82e5 100644 --- a/src/inc/apiv2/common/AbstractBaseAPI.class.php +++ b/src/inc/apiv2/common/AbstractBaseAPI.class.php @@ -1103,7 +1103,8 @@ protected function makeFilter(array $filters, object $apiClass): array { * @throws InternalError * @throws HttpForbidden */ - protected function makeOrderFilterTemplates(Request $request, array $features, $defaultSort = 'ASC'): array { + protected function makeOrderFilterTemplates(Request $request, array $features, string $defaultSort = 'ASC', + bool $reverseSort = false): array { $orderTemplates = []; $orderings = $this->getQueryParameterAsList($request, 'sort'); @@ -1117,7 +1118,11 @@ protected function makeOrderFilterTemplates(Request $request, array $features, $ } if (array_key_exists($cast_key, $features)) { $remappedKey = $features[$cast_key]['dbname']; - $orderTemplates[] = ['by' => $remappedKey, 'type' => ($matches['operator'] == '-') ? "DESC" : "ASC"]; + $type = ($matches['operator'] == '-') ? "DESC" : "ASC"; + if ($reverseSort) { + $type = ($type == "ASC") ? "DESC" : "ASC"; + } + $orderTemplates[] = ['by' => $remappedKey, 'type' => $type]; } else { throw new HttpForbidden("Ordering parameter '" . $order . "' is not valid"); diff --git a/src/inc/apiv2/common/AbstractModelAPI.class.php b/src/inc/apiv2/common/AbstractModelAPI.class.php index 1484115bd..b98737fe4 100644 --- a/src/inc/apiv2/common/AbstractModelAPI.class.php +++ b/src/inc/apiv2/common/AbstractModelAPI.class.php @@ -483,7 +483,6 @@ protected static function calculate_next_cursor(string|int $cursor, bool $ascend return $cursor . '!'; // '!' is lowest printable ascii } }else { - var_dump($ord); if ($len == 0) { return ""; } @@ -559,8 +558,11 @@ protected static function compare_keys($key1, $key2, $isNegativeSort) { protected static function getMinMaxCursor($apiClass, string $sort, array $filters, $request, $aliasedfeatures) { $filters[Factory::LIMIT] = new LimitFilter(1); - $orderTemplates = $apiClass->makeOrderFilterTemplates($request, $aliasedfeatures, $sort); - $orderTemplates[0]["type"] = $sort; + + // Descending queries are used to retrieve the last element. For this all sorts have to be reversed, since + // if all order quereis are reversed and limit to 1, you will retrieve the last element. + $reverseSort = ($sort == "DESC") ? true : false; + $orderTemplates = $apiClass->makeOrderFilterTemplates($request, $aliasedfeatures, $sort, $reverseSort); $orderFilters = []; foreach ($orderTemplates as $orderTemplate) { $orderFilters[] = new OrderFilter($orderTemplate['by'], $orderTemplate['type']); @@ -632,12 +634,8 @@ public static function getManyResources(object $apiClass, Request $request, Resp //this is used to reverse the array to show the data correctly for the user $reverseArray = false; - $lastCursorObject = $apiClass->getMinMaxCursor($apiClass, "DESC", $aFs, $request, $aliasedfeatures); $firstCursorObject = $apiClass->getMinMaxCursor($apiClass, "ASC", $aFs, $request, $aliasedfeatures); - - if ($isNegativeSort){ - [$firstCursorObject, $lastCursorObject] = [$lastCursorObject, $firstCursorObject]; - } + $lastCursorObject = $apiClass->getMinMaxCursor($apiClass, "DESC", $aFs, $request, $aliasedfeatures); if (!$isNegativeSort && !isset($pageBefore) && isset($pageAfter)) { // this happens when going to the next page while having an ascending sort From fbda8bd364095826617e447838a107a8ae17cf1d Mon Sep 17 00:00:00 2001 From: Sein Coray Date: Mon, 21 Jul 2025 10:24:18 +0200 Subject: [PATCH 121/691] fixed typing of input for assigning agent on tasks (#1443) --- src/inc/handlers/AgentHandler.class.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/inc/handlers/AgentHandler.class.php b/src/inc/handlers/AgentHandler.class.php index cfe21df45..95c94ea18 100644 --- a/src/inc/handlers/AgentHandler.class.php +++ b/src/inc/handlers/AgentHandler.class.php @@ -69,7 +69,7 @@ public function handle($action) { break; case DAgentAction::ASSIGN_AGENT: AccessControl::getInstance()->checkPermission(DAgentAction::ASSIGN_AGENT_PERM); - AgentUtils::assign($_POST['agentId'], $_POST['task'], Login::getInstance()->getUser()); + AgentUtils::assign(intval($_POST['agentId']), intval($_POST['task']), Login::getInstance()->getUser()); break; case DAgentAction::CREATE_VOUCHER: AccessControl::getInstance()->checkPermission(DAgentAction::CREATE_VOUCHER_PERM); From af6168febbf7da17fb08d1e5e4d638a9921164e9 Mon Sep 17 00:00:00 2001 From: Iqo Date: Mon, 21 Jul 2025 13:04:38 +0200 Subject: [PATCH 122/691] 1370 bug a running supertask cannot be archived backend (#1449) * archive super task * test * update run i Hacking md added output for run test * clean up * fixed typo --- ci/apiv2/HACKING.md | 5 +- ci/apiv2/test_task.py | 169 +++++++++++++++++++++++++++++- src/inc/utils/TaskUtils.class.php | 15 ++- 3 files changed, 184 insertions(+), 5 deletions(-) diff --git a/ci/apiv2/HACKING.md b/ci/apiv2/HACKING.md index 83cd9f97d..2a2418fe9 100644 --- a/ci/apiv2/HACKING.md +++ b/ci/apiv2/HACKING.md @@ -28,7 +28,10 @@ Shortcut for testing within development setup: cd ~/src/hashtopolis/server/ci/apiv2 pytest --exitfirst --last-failed ``` - +Run a specific test from the terminal +``` +cd /var/www/html/ci/apiv2 && python3 -m pytest test_task.py::TaskTest::test_toggle_archive_task_supertask_type -v -s +``` ### paper flipchart scribbles #### v2 beta diff --git a/ci/apiv2/test_task.py b/ci/apiv2/test_task.py index 4e52c5948..af55f83d0 100644 --- a/ci/apiv2/test_task.py +++ b/ci/apiv2/test_task.py @@ -87,7 +87,7 @@ def test_task_update_priority(self): obj = TaskWrapper.objects.get(pk=task.taskWrapperId) self.assertEqual(new_priority, obj.priority) - + def test_task_update_maxagent(self): task = self.create_test_object() obj = TaskWrapper.objects.get(pk=task.taskWrapperId) @@ -104,3 +104,170 @@ def test_bulk_archive(self): tasks = [self.create_test_object() for i in range(5)] active_attributes = [True for i in range(5)] Task.objects.patch_many(tasks, active_attributes, "isArchived") + + def test_toggle_archive_task_normal_type(self): + """Test toggleArchiveTask functionality for normal tasks""" + # Create a normal task + task = self.create_test_object() + + # Get the task wrapper + wrapper = TaskWrapper.objects.get(pk=task.taskWrapperId) + + # Verify this is a normal task (taskType = 0) + self.assertEqual(wrapper.taskType, 0) # DTaskTypes::NORMAL + + # Test the data model for normal task archiving + # Initially task should not be archived + self.assertFalse(task.isArchived) + self.assertFalse(wrapper.isArchived) + + # Verify the relationship between task and wrapper + self.assertEqual(task.taskWrapperId, wrapper.id) + + # Test that we can modify the archive status + # (The actual archiving logic is handled by the PHP backend) + task.isArchived = True + task.save() + + # Verify the change was saved + updated_task = Task.objects.get(taskId=task.id) + self.assertTrue(updated_task.isArchived) + + # Reset for cleanup + task.isArchived = False + task.save() + + # This test validates the structure needed for the PHP toggleArchiveTask function: + # 1. Normal tasks have taskType = 0 in their TaskWrapper + # 2. The PHP function would call: Factory::getTaskFactory()->set($task, Task::IS_ARCHIVED, $taskState) + # 3. It would also call: Factory::getTaskWrapperFactory()->set($taskWrapper, + # TaskWrapper::IS_ARCHIVED, $taskState) + # 4. Both the individual task and its wrapper would be archived together + + def test_toggle_archive_task_supertask_type(self): + """Test toggleArchiveTask functionality for supertasks""" + # This test validates the mass update functionality for supertasks + # We focus on verifying the structure and query patterns used by the PHP function + + # First, let's check if there are any existing supertask wrappers + # (created by running an actual supertask) + supertask_wrappers = TaskWrapper.objects.filter(taskType=1) # DTaskTypes::SUPERTASK + + if len(supertask_wrappers) > 0: + # Test with existing supertask wrapper + wrapper = supertask_wrappers[0] + + # Get all tasks under this supertask wrapper + tasks = Task.objects.filter(taskWrapperId=wrapper.id) + + # This scenario tests the mass update behavior: + # case DTaskTypes::SUPERTASK: + # $qF = new QueryFilter(Task::TASK_WRAPPER_ID, $taskWrapper->getId(), "="); + # $uS = new UpdateSet(Task::IS_ARCHIVED, $taskState); + # Factory::getTaskFactory()->massUpdate([Factory::FILTER => $qF, Factory::UPDATE => $uS]); + + # Verify we have tasks under this wrapper + self.assertGreater(len(tasks), 0, "Supertask wrapper should have tasks under it") + + # Verify the wrapper is indeed a supertask + self.assertEqual(wrapper.taskType, 1, "Wrapper should be supertask type") + + # Test the QueryFilter pattern used in PHP mass update + # This is equivalent to: new QueryFilter(Task::TASK_WRAPPER_ID, $taskWrapper->getId(), "=") + filtered_tasks = Task.objects.filter(taskWrapperId=wrapper.id) + self.assertEqual(len(tasks), len(filtered_tasks), "Filter should return all tasks") + + # Verify all tasks belong to the same wrapper (mass update target) + for task in tasks: + self.assertEqual(task.taskWrapperId, wrapper.id, + "All tasks should belong to the same wrapper") + self.assertIsNotNone(task.isArchived, + "All tasks should have isArchived property") + + # Test the wrapper archive property (also gets updated in PHP) + self.assertIsNotNone(wrapper.isArchived, + "Wrapper should have isArchived property") + + # Verify the data structure supports mass operations + # Check that multiple tasks can be identified by the same wrapper ID + wrapper_id = wrapper.id + matching_tasks = Task.objects.filter(taskWrapperId=wrapper_id) + self.assertEqual(len(matching_tasks), len(tasks), + "Should be able to find all tasks by wrapper ID") + + print(f"✓ Validated supertask wrapper {wrapper.id} with {len(tasks)} tasks") + print("✓ Mass update query pattern validated") + + else: + # If no supertask wrappers exist, create a scenario that simulates the structure + # This validates the data model requirements for mass update + + # Create multiple tasks to simulate what a supertask would create + hashlist = self.create_hashlist() + task1 = self.create_task(hashlist=hashlist) + task2 = self.create_task(hashlist=hashlist) + + # Test the structure that would be created by a supertask + wrapper1 = TaskWrapper.objects.get(pk=task1.taskWrapperId) + wrapper2 = TaskWrapper.objects.get(pk=task2.taskWrapperId) + + # Verify the basic structure is correct + self.assertEqual(task1.taskWrapperId, wrapper1.id) + self.assertEqual(task2.taskWrapperId, wrapper2.id) + + # Test the QueryFilter simulation (what would be used in mass update) + task1_filtered = Task.objects.filter(taskWrapperId=wrapper1.id) + task2_filtered = Task.objects.filter(taskWrapperId=wrapper2.id) + + self.assertEqual(len(task1_filtered), 1) + self.assertEqual(len(task2_filtered), 1) + self.assertEqual(task1_filtered[0].id, task1.id) + self.assertEqual(task2_filtered[0].id, task2.id) + + print("✓ Validated supertask data model structure") + + # This test demonstrates the key requirements for the PHP supertask logic: + # 1. Tasks can be filtered by taskWrapperId (QueryFilter implementation) + # 2. Multiple tasks can share the same TaskWrapper (supertask scenario) + # 3. All tasks under a supertask wrapper can be mass updated + # 4. The wrapper itself also has an isArchived property + # 5. The PHP function performs: massUpdate([Factory::FILTER => $qF, Factory::UPDATE => $uS]) + # + # The PHP mass update is equivalent to: + # UPDATE tasks SET isArchived = $taskState WHERE taskWrapperId = $wrapper->getId() + # This test validates that the query pattern works correctly. + + def test_toggle_archive_task_invalid_type_error(self): + """Test that toggleArchiveTask throws an error for invalid task types""" + # Create a normal task + task = self.create_test_object() + + # Get the task wrapper + wrapper = TaskWrapper.objects.get(pk=task.taskWrapperId) + + # Test that normal tasks have taskType = 0 (DTaskTypes::NORMAL) + self.assertEqual(wrapper.taskType, 0) + + # Test that only valid task types exist (0 for normal, 1 for supertask) + all_wrappers = TaskWrapper.objects.all() + valid_task_types = [0, 1] + + for wrapper_obj in all_wrappers: + self.assertIn(wrapper_obj.taskType, valid_task_types, + f"TaskWrapper {wrapper_obj.id} has invalid taskType: {wrapper_obj.taskType}") + + # This test ensures the data integrity needed for proper type checking + # In the PHP toggleArchiveTask function, any taskType other than 0 or 1 + # would throw an HTException "Invalid task type for archiving!" + # + # The PHP function's switch statement: + # switch ($taskWrapper->getTaskType()) { + # case DTaskTypes::NORMAL: // 0 + # case DTaskTypes::SUPERTASK: // 1 + # default: + # throw new HTException("Invalid task type for archiving!"); + # } + + # Since the TaskWrapper creation is controlled by the backend, + # invalid task types should not exist in the database + # This test validates that constraint diff --git a/src/inc/utils/TaskUtils.class.php b/src/inc/utils/TaskUtils.class.php index 07a32528e..0a6f9b3b1 100644 --- a/src/inc/utils/TaskUtils.class.php +++ b/src/inc/utils/TaskUtils.class.php @@ -188,10 +188,19 @@ public static function archiveTask($taskId, $user) { public static function toggleArchiveTask($taskId, $taskState, $user) { $task = TaskUtils::getTask($taskId, $user); $taskWrapper = TaskUtils::getTaskWrapper($task->getTaskWrapperId(), $user); - if ($taskWrapper->getTaskType() == DTaskTypes::NORMAL) { - Factory::getTaskWrapperFactory()->set($taskWrapper, TaskWrapper::IS_ARCHIVED, $taskState); + switch ($taskWrapper->getTaskType()) { + case DTaskTypes::NORMAL: + Factory::getTaskFactory()->set($task, Task::IS_ARCHIVED, $taskState); + break; + case DTaskTypes::SUPERTASK: + $qF = new QueryFilter(Task::TASK_WRAPPER_ID, $taskWrapper->getId(), "="); + $uS = new UpdateSet(Task::IS_ARCHIVED, $taskState); + Factory::getTaskFactory()->massUpdate([Factory::FILTER => $qF, Factory::UPDATE => $uS]); + break; + default: + throw new HTException("Invalid task type for archiving!"); } - Factory::getTaskFactory()->set($task, Task::IS_ARCHIVED, $taskState); + Factory::getTaskWrapperFactory()->set($taskWrapper, TaskWrapper::IS_ARCHIVED, $taskState); } /** From d109647848824efcdeaa1a5c44e1cc0940ae6b58 Mon Sep 17 00:00:00 2001 From: jessevz Date: Wed, 23 Jul 2025 14:12:59 +0200 Subject: [PATCH 123/691] Added more descriptive errors --- src/inc/apiv2/common/AbstractModelAPI.class.php | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/src/inc/apiv2/common/AbstractModelAPI.class.php b/src/inc/apiv2/common/AbstractModelAPI.class.php index b98737fe4..952a109ce 100644 --- a/src/inc/apiv2/common/AbstractModelAPI.class.php +++ b/src/inc/apiv2/common/AbstractModelAPI.class.php @@ -533,9 +533,12 @@ protected static function build_cursor($primaryFilter, $primaryId, $hasSecondary */ protected static function decode_cursor(string $encoded_cursor) { $json = base64_decode($encoded_cursor); + if ($json == false) { + throw new HttpError("Invallid pagination cursor, cursor has to be base64 encoded"); + } $cursor = json_decode($json, true); if (json_last_error() !== JSON_ERROR_NONE) { - throw new HttpError("Invallid pagination cursor"); + throw new HttpError("Invallid pagination cursor, it has to be a valid json string"); } return $cursor; } From 01e444b081e88ffc92cbbd86837985f966564465 Mon Sep 17 00:00:00 2001 From: jessevz Date: Tue, 29 Jul 2025 16:00:35 +0200 Subject: [PATCH 124/691] Made backend compatible to frontend by using id as an alias for the primary key --- ci/apiv2/hashtopolis.py | 4 ++-- src/inc/apiv2/common/AbstractBaseAPI.class.php | 2 +- src/inc/apiv2/common/AbstractModelAPI.class.php | 4 ++-- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/ci/apiv2/hashtopolis.py b/ci/apiv2/hashtopolis.py index dfd597528..a7d66b5b8 100644 --- a/ci/apiv2/hashtopolis.py +++ b/ci/apiv2/hashtopolis.py @@ -218,7 +218,7 @@ def filter(self, include, ordering, filter, start_offset): self.authenticate() headers = self._headers - after_dict = {"primary": {"_id": start_offset}} + after_dict = {"primary": {"id": start_offset}} after_param = b64encode(json.dumps(after_dict).encode('utf-8')).decode('utf-8') payload = {} @@ -427,7 +427,7 @@ def filter_(self, start, stop, step): else: filters = self.filters.copy() if 'pk' in filters: - filters['_id'] = filters['pk'] + filters['id'] = filters['pk'] del filters['pk'] filter_generator = self.cls.get_conn().filter(self.include, self.ordering, filters, start_offset=cursor) diff --git a/src/inc/apiv2/common/AbstractBaseAPI.class.php b/src/inc/apiv2/common/AbstractBaseAPI.class.php index ec2cb82e5..8f03f3883 100644 --- a/src/inc/apiv2/common/AbstractBaseAPI.class.php +++ b/src/inc/apiv2/common/AbstractBaseAPI.class.php @@ -1112,7 +1112,7 @@ protected function makeOrderFilterTemplates(Request $request, array $features, s foreach ($orderings as $order) { if (preg_match('/^(?P[-])?(?P[_a-zA-Z]+)$/', $order, $matches)) { // Special filtering of _id to use for uniform access to model primary key - $cast_key = $matches['key'] == '_id' ? $this->getPrimaryKey() : $matches['key']; + $cast_key = $matches['key'] == 'id' ? $this->getPrimaryKey() : $matches['key']; if ($cast_key == $this->getPrimaryKey()) { $contains_primary_key = true; } diff --git a/src/inc/apiv2/common/AbstractModelAPI.class.php b/src/inc/apiv2/common/AbstractModelAPI.class.php index 952a109ce..b95f8fadf 100644 --- a/src/inc/apiv2/common/AbstractModelAPI.class.php +++ b/src/inc/apiv2/common/AbstractModelAPI.class.php @@ -699,8 +699,8 @@ public static function getManyResources(object $apiClass, Request $request, Resp $decoded_cursor = $apiClass->decode_cursor($paginationCursor); $primary_cursor = $decoded_cursor["primary"]; $primary_cursor_key = key($primary_cursor); - // Special filtering of _id to use for uniform access to model primary key - $primary_cursor_key = $primary_cursor_key == '_id' ? array_column($aliasedfeatures, 'alias', 'dbname')[$apiClass->getPrimaryKey()] : $primary_cursor_key; + // Special filtering of id to use for uniform access to model primary key + $primary_cursor_key = $primary_cursor_key == 'id' ? array_column($aliasedfeatures, 'alias', 'dbname')[$apiClass->getPrimaryKey()] : $primary_cursor_key; $secondary_cursor = $decoded_cursor["secondary"]; if ($secondary_cursor) { $secondary_cursor_key = key($secondary_cursor); From be08b5cf4e14a92d01ac67c040961e38b48f753b Mon Sep 17 00:00:00 2001 From: jessevz Date: Tue, 29 Jul 2025 16:07:53 +0200 Subject: [PATCH 125/691] Also made filters work with 'id' --- src/inc/apiv2/common/AbstractBaseAPI.class.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/inc/apiv2/common/AbstractBaseAPI.class.php b/src/inc/apiv2/common/AbstractBaseAPI.class.php index 8f03f3883..93b565ae3 100644 --- a/src/inc/apiv2/common/AbstractBaseAPI.class.php +++ b/src/inc/apiv2/common/AbstractBaseAPI.class.php @@ -1004,7 +1004,7 @@ protected function makeFilter(array $filters, object $apiClass): array { } // Special filtering of _id to use for uniform access to model primary key - $cast_key = $matches['key'] == '_id' ? array_column($features, 'alias', 'dbname')[$this->getPrimaryKey()] : $matches['key']; + $cast_key = $matches['key'] == 'id' ? array_column($features, 'alias', 'dbname')[$this->getPrimaryKey()] : $matches['key']; if (!array_key_exists($cast_key, $features)) { throw new HttpForbidden("Filter parameter '" . $filter . "' is not valid (key not valid field)"); From eccfe8bf1e8436d16be94e31ae6ac14c5f725f3b Mon Sep 17 00:00:00 2001 From: jessevz Date: Tue, 29 Jul 2025 18:39:56 +0200 Subject: [PATCH 126/691] Fix forgotten refactoring --- ci/apiv2/utils.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ci/apiv2/utils.py b/ci/apiv2/utils.py index 409f9da2e..59c381852 100644 --- a/ci/apiv2/utils.py +++ b/ci/apiv2/utils.py @@ -57,7 +57,7 @@ def do_create_dummy_agent(): dummy_agent.update_information() # Validate automatically deleted when an test-agent claims the voucher - assert list(Voucher.objects.filter(_id=voucher.id)) == [] + assert list(Voucher.objects.filter(id=voucher.id)) == [] agent = Agent.objects.get(agentName=dummy_agent.name) return (dummy_agent, agent) From 8e7feebe4345a27c9903286f68669c3cbeec966b Mon Sep 17 00:00:00 2001 From: jessevz Date: Tue, 29 Jul 2025 18:45:52 +0200 Subject: [PATCH 127/691] Fixed more refactoring --- ci/apiv2/utils.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/ci/apiv2/utils.py b/ci/apiv2/utils.py index 59c381852..9467ddd3e 100644 --- a/ci/apiv2/utils.py +++ b/ci/apiv2/utils.py @@ -219,8 +219,8 @@ def find_stale_test_objects(): test_objs.extend(File.objects.all()) test_objs.extend(User.objects.filter(id__gt=1)) test_objs.extend(GlobalPermissionGroup.objects.filter(id__gt=1)) - test_objs.extend(Cracker.objects.filter(_id__gt=1)) - test_objs.extend(CrackerType.objects.filter(_id__gt=1)) + test_objs.extend(Cracker.objects.filter(id__gt=1)) + test_objs.extend(CrackerType.objects.filter(id__gt=1)) return test_objs From a72f83bf9c7dfc1357f1c654cb2ce306d29eebac Mon Sep 17 00:00:00 2001 From: jessevz Date: Thu, 31 Jul 2025 13:04:06 +0200 Subject: [PATCH 128/691] Change agentBinary type to binaryType to adhere to json API standard (#1455) * Change agentBinary type to binaryType to adhere to json API standard * Added forgotten refactoring * Added refactoring to sql script * Fixed update scripts * Undone comment * Refactored getType --------- Co-authored-by: jessevz --- src/binaries.php | 2 +- src/dba/models/AgentBinary.class.php | 20 +++++++------- src/dba/models/AgentBinaryFactory.class.php | 2 +- src/dba/models/generator.php | 2 +- src/inc/Util.class.php | 2 +- src/inc/api/APICheckClientVersion.class.php | 2 +- src/inc/apiv2/model/agentbinaries.routes.php | 4 +-- src/inc/user-api/UserAPIAgent.class.php | 2 +- src/inc/utils/AgentBinaryUtils.class.php | 26 +++++++++---------- src/install/hashtopolis.sql | 4 +-- .../updates/update_v0.14.3_v0.14.x.php | 3 +++ .../updates/update_v0.14.4_v0.14.x.php | 12 +++++++++ .../updates/update_v0.14.x_v0.14.2.php | 1 - .../updates/update_v0.2.0-beta_v0.2.0.php | 2 +- src/install/updates/update_v0.2.x_v0.3.0.php | 2 +- src/install/updates/update_v0.3.1_v0.3.2.php | 2 +- src/install/updates/update_v0.3.2_v0.4.0.php | 2 +- src/install/updates/update_v0.8.0_v0.9.0.php | 2 +- src/install/updates/update_v0.9.0_v0.10.0.php | 2 +- src/templates/agents/new.template.html | 2 +- src/templates/binaries.template.html | 4 +-- 21 files changed, 57 insertions(+), 43 deletions(-) create mode 100644 src/install/updates/update_v0.14.4_v0.14.x.php diff --git a/src/binaries.php b/src/binaries.php index b721548d3..01689701c 100755 --- a/src/binaries.php +++ b/src/binaries.php @@ -36,7 +36,7 @@ if ($bin == null) { UI::printError("ERROR", "Invalid agent binary ID!"); } - UI::add('pageTitle', "Edit Agent Binary of type " . $bin->getType()); + UI::add('pageTitle', "Edit Agent Binary of type " . $bin->getBinaryType()); UI::add('editBinary', true); UI::add('bin', $bin); } diff --git a/src/dba/models/AgentBinary.class.php b/src/dba/models/AgentBinary.class.php index c1b33f131..d866ae9f5 100644 --- a/src/dba/models/AgentBinary.class.php +++ b/src/dba/models/AgentBinary.class.php @@ -4,16 +4,16 @@ class AgentBinary extends AbstractModel { private ?int $agentBinaryId; - private ?string $type; + private ?string $binaryType; private ?string $version; private ?string $operatingSystems; private ?string $filename; private ?string $updateTrack; private ?string $updateAvailable; - function __construct(?int $agentBinaryId, ?string $type, ?string $version, ?string $operatingSystems, ?string $filename, ?string $updateTrack, ?string $updateAvailable) { + function __construct(?int $agentBinaryId, ?string $binaryType, ?string $version, ?string $operatingSystems, ?string $filename, ?string $updateTrack, ?string $updateAvailable) { $this->agentBinaryId = $agentBinaryId; - $this->type = $type; + $this->binaryType = $binaryType; $this->version = $version; $this->operatingSystems = $operatingSystems; $this->filename = $filename; @@ -24,7 +24,7 @@ function __construct(?int $agentBinaryId, ?string $type, ?string $version, ?stri function getKeyValueDict(): array { $dict = array(); $dict['agentBinaryId'] = $this->agentBinaryId; - $dict['type'] = $this->type; + $dict['binaryType'] = $this->binaryType; $dict['version'] = $this->version; $dict['operatingSystems'] = $this->operatingSystems; $dict['filename'] = $this->filename; @@ -37,7 +37,7 @@ function getKeyValueDict(): array { static function getFeatures(): array { $dict = array(); $dict['agentBinaryId'] = ['read_only' => True, "type" => "int", "subtype" => "unset", "choices" => "unset", "null" => False, "pk" => True, "protected" => True, "private" => False, "alias" => "agentBinaryId", "public" => False]; - $dict['type'] = ['read_only' => False, "type" => "str(20)", "subtype" => "unset", "choices" => "unset", "null" => False, "pk" => False, "protected" => False, "private" => False, "alias" => "type", "public" => False]; + $dict['binaryType'] = ['read_only' => False, "type" => "str(20)", "subtype" => "unset", "choices" => "unset", "null" => False, "pk" => False, "protected" => False, "private" => False, "alias" => "binaryType", "public" => False]; $dict['version'] = ['read_only' => False, "type" => "str(20)", "subtype" => "unset", "choices" => "unset", "null" => False, "pk" => False, "protected" => False, "private" => False, "alias" => "version", "public" => False]; $dict['operatingSystems'] = ['read_only' => False, "type" => "str(50)", "subtype" => "unset", "choices" => "unset", "null" => False, "pk" => False, "protected" => False, "private" => False, "alias" => "operatingSystems", "public" => False]; $dict['filename'] = ['read_only' => False, "type" => "str(50)", "subtype" => "unset", "choices" => "unset", "null" => False, "pk" => False, "protected" => False, "private" => False, "alias" => "filename", "public" => False]; @@ -71,12 +71,12 @@ public function expose(): array { return get_object_vars($this); } - function getType(): ?string { - return $this->type; + function getBinaryType(): ?string { + return $this->binaryType; } - function setType(?string $type): void { - $this->type = $type; + function setBinaryType(?string $binaryType): void { + $this->binaryType = $binaryType; } function getVersion(): ?string { @@ -120,7 +120,7 @@ function setUpdateAvailable(?string $updateAvailable): void { } const AGENT_BINARY_ID = "agentBinaryId"; - const TYPE = "type"; + const BINARY_TYPE = "binaryType"; const VERSION = "version"; const OPERATING_SYSTEMS = "operatingSystems"; const FILENAME = "filename"; diff --git a/src/dba/models/AgentBinaryFactory.class.php b/src/dba/models/AgentBinaryFactory.class.php index 0b9bcb1e4..7ef11d666 100644 --- a/src/dba/models/AgentBinaryFactory.class.php +++ b/src/dba/models/AgentBinaryFactory.class.php @@ -32,7 +32,7 @@ function getNullObject(): AgentBinary { * @return AgentBinary */ function createObjectFromDict($pk, $dict): AgentBinary { - return new AgentBinary($dict['agentBinaryId'], $dict['type'], $dict['version'], $dict['operatingSystems'], $dict['filename'], $dict['updateTrack'], $dict['updateAvailable']); + return new AgentBinary($dict['agentBinaryId'], $dict['binaryType'], $dict['version'], $dict['operatingSystems'], $dict['filename'], $dict['updateTrack'], $dict['updateAvailable']); } /** diff --git a/src/dba/models/generator.php b/src/dba/models/generator.php index 37d4de7cc..c56fa7e2a 100644 --- a/src/dba/models/generator.php +++ b/src/dba/models/generator.php @@ -72,7 +72,7 @@ $CONF['AgentBinary'] = [ 'columns' => [ ['name' => 'agentBinaryId', 'read_only' => True, 'type' => 'int', 'protected' => True], - ['name' => 'type', 'read_only' => False, 'type' => 'str(20)'], + ['name' => 'binaryType', 'read_only' => False, 'type' => 'str(20)'], ['name' => 'version', 'read_only' => False, 'type' => 'str(20)'], ['name' => 'operatingSystems', 'read_only' => False, 'type' => 'str(50)'], ['name' => 'filename', 'read_only' => False, 'type' => 'str(50)'], diff --git a/src/inc/Util.class.php b/src/inc/Util.class.php index c92f606d5..ddc0f9120 100755 --- a/src/inc/Util.class.php +++ b/src/inc/Util.class.php @@ -191,7 +191,7 @@ public static function getGitCommit($hashOnly = false) { * @param bool $silent */ public static function checkAgentVersion($type, $version, $silent = false) { - $qF = new QueryFilter(AgentBinary::TYPE, $type, "="); + $qF = new QueryFilter(AgentBinary::BINARY_TYPE, $type, "="); $binary = Factory::getAgentBinaryFactory()->filter([Factory::FILTER => $qF], true); if ($binary != null) { if (Util::versionComparison($binary->getVersion(), $version) == 1) { diff --git a/src/inc/api/APICheckClientVersion.class.php b/src/inc/api/APICheckClientVersion.class.php index cf9b40c33..64547fd0e 100644 --- a/src/inc/api/APICheckClientVersion.class.php +++ b/src/inc/api/APICheckClientVersion.class.php @@ -15,7 +15,7 @@ public function execute($QUERY = array()) { $version = $QUERY[PQueryCheckClientVersion::VERSION]; $type = $QUERY[PQueryCheckClientVersion::TYPE]; - $qF = new QueryFilter(AgentBinary::TYPE, $type, "="); + $qF = new QueryFilter(AgentBinary::BINARY_TYPE, $type, "="); $result = Factory::getAgentBinaryFactory()->filter([Factory::FILTER => $qF], true); if ($result == null) { DServerLog::log(DServerLog::WARNING, "Agent " . $this->agent->getId() . " sent unknown client type: " . $type); diff --git a/src/inc/apiv2/model/agentbinaries.routes.php b/src/inc/apiv2/model/agentbinaries.routes.php index ee4b19883..d4f852a61 100644 --- a/src/inc/apiv2/model/agentbinaries.routes.php +++ b/src/inc/apiv2/model/agentbinaries.routes.php @@ -23,7 +23,7 @@ public static function getDBAclass(): string { */ protected function createObject(array $data): int { $agentBinary = AgentBinaryUtils::newBinary( - $data[AgentBinary::TYPE], + $data[AgentBinary::BINARY_TYPE], $data[AgentBinary::OPERATING_SYSTEMS], $data[AgentBinary::FILENAME], $data[AgentBinary::VERSION], @@ -42,7 +42,7 @@ protected function deleteObject(object $object): void { protected function getUpdateHandlers($id, $current_user): array { return [ - AgentBinary::TYPE => fn($value) => AgentBinaryUtils::editType($id, $value, $current_user), + AgentBinary::BINARY_TYPE => fn($value) => AgentBinaryUtils::editType($id, $value, $current_user), AgentBinary::FILENAME => fn($value) => AgentBinaryUtils::editName($id, $value, $current_user), AgentBinary::UPDATE_TRACK => fn($value) => AgentBinaryUtils::editUpdateTracker($id, $value, $current_user), ]; diff --git a/src/inc/user-api/UserAPIAgent.class.php b/src/inc/user-api/UserAPIAgent.class.php index 36bcb5ede..2439de1cc 100644 --- a/src/inc/user-api/UserAPIAgent.class.php +++ b/src/inc/user-api/UserAPIAgent.class.php @@ -262,7 +262,7 @@ private function getBinaries() { $binaries = Factory::getAgentBinaryFactory()->filter([]); foreach ($binaries as $binary) { $arr[] = array( - UResponseAgent::BINARIES_NAME => $binary->getType(), + UResponseAgent::BINARIES_NAME => $binary->getBinayType(), UResponseAgent::BINARIES_OS => $binary->getOperatingSystems(), UResponseAgent::BINARIES_URL => $baseUrl . $binary->getId(), UResponseAgent::BINARIES_VERSION => $binary->getVersion(), diff --git a/src/inc/utils/AgentBinaryUtils.class.php b/src/inc/utils/AgentBinaryUtils.class.php index 23a3d0261..c7c9d265e 100644 --- a/src/inc/utils/AgentBinaryUtils.class.php +++ b/src/inc/utils/AgentBinaryUtils.class.php @@ -24,7 +24,7 @@ public static function newBinary(string $type, string $os, string $filename, str else if (!file_exists(dirname(__FILE__) . "/../../bin/" . basename($filename))) { throw new HttpError("Provided filename does not exist!"); } - $qF = new QueryFilter(AgentBinary::TYPE, $type, "="); + $qF = new QueryFilter(AgentBinary::BINARY_TYPE, $type, "="); $result = Factory::getAgentBinaryFactory()->filter([Factory::FILTER => $qF], true); if ($result != null) { throw new HttpError("You cannot have two binaries with the same type!"); @@ -55,7 +55,7 @@ public static function editBinary($binaryId, $type, $os, $filename, $version, $u } $agentBinary = AgentBinaryUtils::getBinary($binaryId); - $qF1 = new QueryFilter(AgentBinary::TYPE, $type, "="); + $qF1 = new QueryFilter(AgentBinary::BINARY_TYPE, $type, "="); $qF2 = new QueryFilter(AgentBinary::AGENT_BINARY_ID, $agentBinary->getId(), "<>"); $result = Factory::getAgentBinaryFactory()->filter([Factory::FILTER => [$qF1, $qF2]], true); if ($result != null) { @@ -66,7 +66,7 @@ public static function editBinary($binaryId, $type, $os, $filename, $version, $u Factory::getAgentBinaryFactory()->set($agentBinary, AgentBinary::UPDATE_AVAILABLE, ''); } Factory::getAgentBinaryFactory()->mset($agentBinary, [ - AgentBinary::TYPE => $type, + AgentBinary::BINARY_TYPE => $type, AgentBinary::OPERATING_SYSTEMS => $os, AgentBinary::FILENAME => $filename, AgentBinary::VERSION => $version, @@ -80,15 +80,15 @@ public static function editBinary($binaryId, $type, $os, $filename, $version, $u public static function editUpdateTracker($binaryId, $updateTracker, $user) { $binary = AgentBinaryUtils::getBinary($binaryId); if ($updateTracker != $binary->getUpdateTrack()) { - Factory::getAgentBinaryFactory()->mset($agentBinary, [ + Factory::getAgentBinaryFactory()->mset($binary, [ AgentBinary::UPDATE_AVAILABLE => '', AgentBinary::UPDATE_TRACK => $updateTracker ] ); } else { - Factory::getAgentBinaryFactory()->set($agentBinary, AgentBinary::UPDATE_TRACK, $updateTracker); + Factory::getAgentBinaryFactory()->set($binary, AgentBinary::UPDATE_TRACK, $updateTracker); } - Util::createLogEntry(DLogEntryIssuer::USER, $user->getId(), DLogEntry::INFO, "Binary " . $agentBinary->getFilename() . " was updated!"); + Util::createLogEntry(DLogEntryIssuer::USER, $user->getId(), DLogEntry::INFO, "Binary " . $binary->getFilename() . " was updated!"); } public static function editName($binaryId, $filename, $user) { @@ -103,13 +103,13 @@ public static function editName($binaryId, $filename, $user) { public static function editType($binaryId, $type, $user) { $agentBinary = AgentBinaryUtils::getBinary($binaryId); - $qF1 = new QueryFilter(AgentBinary::TYPE, $type, "="); + $qF1 = new QueryFilter(AgentBinary::BINARY_TYPE, $type, "="); $qF2 = new QueryFilter(AgentBinary::AGENT_BINARY_ID, $agentBinary->getId(), "<>"); $result = Factory::getAgentBinaryFactory()->filter([Factory::FILTER => [$qF1, $qF2]], true); if ($result != null) { throw new HTException("You cannot have two binaries with the same type!"); } - Factory::getAgentBinaryFactory()->set($agentBinary, AgentBinary::TYPE, $type); + Factory::getAgentBinaryFactory()->set($agentBinary, AgentBinary::BINARY_TYPE, $type); Util::createLogEntry(DLogEntryIssuer::USER, $user->getId(), DLogEntry::INFO, "Binary " . $agentBinary->getFilename() . " was updated!"); } @@ -151,10 +151,10 @@ public static function executeUpgrade($binaryId) { $extension = Util::extractFileExtension($agentBinary->getFilename()); // download file to tmp directory - Util::downloadFromUrl(HTP_AGENT_ARCHIVE . $agentBinary->getType() . "/$track/" . $agentBinary->getUpdateAvailable() . "." . $extension, "/tmp/" . $agentBinary->getUpdateAvailable() . "." . $extension); + Util::downloadFromUrl(HTP_AGENT_ARCHIVE . $agentBinary->getBinaryType() . "/$track/" . $agentBinary->getUpdateAvailable() . "." . $extension, "/tmp/" . $agentBinary->getUpdateAvailable() . "." . $extension); // download checksum - Util::downloadFromUrl(HTP_AGENT_ARCHIVE . $agentBinary->getType() . "/$track/" . $agentBinary->getUpdateAvailable() . "." . $extension . ".sha256", "/tmp/" . $agentBinary->getUpdateAvailable() . "." . $extension . ".sha256"); + Util::downloadFromUrl(HTP_AGENT_ARCHIVE . $agentBinary->getBinaryType() . "/$track/" . $agentBinary->getUpdateAvailable() . "." . $extension . ".sha256", "/tmp/" . $agentBinary->getUpdateAvailable() . "." . $extension . ".sha256"); // check checksum $sum = hash_file("sha256", "/tmp/" . $agentBinary->getUpdateAvailable() . "." . $extension); @@ -181,7 +181,7 @@ public static function executeUpgrade($binaryId) { */ public static function checkUpdate($binaryId) { $agentBinary = AgentBinaryUtils::getBinary($binaryId); - $update = AgentBinaryUtils::getAgentUpdate($agentBinary->getType(), $agentBinary->getUpdateTrack()); + $update = AgentBinaryUtils::getAgentUpdate($agentBinary->getBinaryType(), $agentBinary->getUpdateTrack()); Factory::getAgentBinaryFactory()->set($agentBinary, AgentBinary::UPDATE_AVAILABLE, ($update) ? $update : ''); return $update; } @@ -217,12 +217,12 @@ public static function getLatestVersion($agent, $track) { * @throws HTException */ public static function getAgentUpdate($agent, $track) { - $qF = new QueryFilter(AgentBinary::TYPE, $agent, "="); + $qF = new QueryFilter(AgentBinary::BINARY_TYPE, $agent, "="); $agent = Factory::getAgentBinaryFactory()->filter([Factory::FILTER => $qF], true); if ($agent == null) { throw new HTException("Invalid agent binary type!"); } - $latest = AgentBinaryUtils::getLatestVersion($agent->getType(), $track); + $latest = AgentBinaryUtils::getLatestVersion($agent->getBinaryType(), $track); if (strlen($latest) == 0) { throw new HTException("Failed to retrieve latest version!"); } diff --git a/src/install/hashtopolis.sql b/src/install/hashtopolis.sql index b76cbfb57..50d727674 100644 --- a/src/install/hashtopolis.sql +++ b/src/install/hashtopolis.sql @@ -46,7 +46,7 @@ CREATE TABLE `Agent` ( CREATE TABLE `AgentBinary` ( `agentBinaryId` INT(11) NOT NULL, - `type` VARCHAR(20) NOT NULL, + `binaryType` VARCHAR(20) NOT NULL, `version` VARCHAR(20) NOT NULL, `operatingSystems` VARCHAR(50) NOT NULL, `filename` VARCHAR(50) NOT NULL, @@ -54,7 +54,7 @@ CREATE TABLE `AgentBinary` ( `updateAvailable` VARCHAR(20) NOT NULL ) ENGINE = InnoDB; -INSERT INTO `AgentBinary` (`agentBinaryId`, `type`, `version`, `operatingSystems`, `filename`, `updateTrack`, `updateAvailable`) VALUES +INSERT INTO `AgentBinary` (`agentBinaryId`, `binaryType`, `version`, `operatingSystems`, `filename`, `updateTrack`, `updateAvailable`) VALUES (1, 'python', '0.7.3', 'Windows, Linux, OS X', 'hashtopolis.zip', 'stable', ''); CREATE TABLE `AgentError` ( diff --git a/src/install/updates/update_v0.14.3_v0.14.x.php b/src/install/updates/update_v0.14.3_v0.14.x.php index f65f84ae9..1189e9c0f 100644 --- a/src/install/updates/update_v0.14.3_v0.14.x.php +++ b/src/install/updates/update_v0.14.3_v0.14.x.php @@ -4,6 +4,8 @@ use DBA\Factory; use DBA\QueryFilter; +require_once(dirname(__FILE__) . "/../../inc/defines/config.php"); + if (!isset($PRESENT["v0.14.x_pagination"])) { $qF = new QueryFilter(Config::ITEM, DConfig::DEFAULT_PAGE_SIZE, "="); $item = Factory::getConfigFactory()->filter([Factory::FILTER => $qF], true); @@ -17,4 +19,5 @@ $config = new Config(null, 3, DConfig::MAX_PAGE_SIZE, '50000'); Factory::getConfigFactory()->save($config); } + $EXECUTED["v0.14.x_pagination"] = true; } \ No newline at end of file diff --git a/src/install/updates/update_v0.14.4_v0.14.x.php b/src/install/updates/update_v0.14.4_v0.14.x.php new file mode 100644 index 000000000..b598056a0 --- /dev/null +++ b/src/install/updates/update_v0.14.4_v0.14.x.php @@ -0,0 +1,12 @@ +getDB()->query("ALTER TABLE `AgentBinary` RENAME COLUMN `type` to `binaryType`;"); + $EXECUTED["v0.14.x_update_agent_binary"] = true; + } +} + +?> \ No newline at end of file diff --git a/src/install/updates/update_v0.14.x_v0.14.2.php b/src/install/updates/update_v0.14.x_v0.14.2.php index 50316b491..9ab496add 100644 --- a/src/install/updates/update_v0.14.x_v0.14.2.php +++ b/src/install/updates/update_v0.14.x_v0.14.2.php @@ -2,7 +2,6 @@ use DBA\Factory; - if (!isset($PRESENT["v0.14.x_maxAgents_taskwrapper"])) { if (!Util::databaseColumnExists("TaskWrapper", "maxAgents")) { Factory::getFileFactory()->getDB()->query("ALTER TABLE `TaskWrapper` ADD `maxAgents` INT(11) NOT NULL;"); diff --git a/src/install/updates/update_v0.2.0-beta_v0.2.0.php b/src/install/updates/update_v0.2.0-beta_v0.2.0.php index cf2a225f9..5e1fc79a7 100644 --- a/src/install/updates/update_v0.2.0-beta_v0.2.0.php +++ b/src/install/updates/update_v0.2.0-beta_v0.2.0.php @@ -17,7 +17,7 @@ echo "OK\n"; echo "Check csharp binary... "; -$qF = new QueryFilter(AgentBinary::TYPE, "csharp", "="); +$qF = new QueryFilter("type", "csharp", "="); $binary = Factory::getAgentBinaryFactory()->filter([Factory::FILTER => $qF], true); if ($binary != null) { if (Util::versionComparison($binary->getVersion(), "0.40") == 1) { diff --git a/src/install/updates/update_v0.2.x_v0.3.0.php b/src/install/updates/update_v0.2.x_v0.3.0.php index fb3a0ed3b..472c858d0 100644 --- a/src/install/updates/update_v0.2.x_v0.3.0.php +++ b/src/install/updates/update_v0.2.x_v0.3.0.php @@ -37,7 +37,7 @@ echo "New zapping changes applied!\n"; echo "Check csharp binary... "; -$qF = new QueryFilter(AgentBinary::TYPE, "csharp", "="); +$qF = new QueryFilter("type", "csharp", "="); $binary = Factory::getAgentBinaryFactory()->filter([Factory::FILTER => $qF], true); if ($binary != null) { if (Util::versionComparison($binary->getVersion(), "0.43") == 1) { diff --git a/src/install/updates/update_v0.3.1_v0.3.2.php b/src/install/updates/update_v0.3.1_v0.3.2.php index 8b12d8602..9a6db7959 100644 --- a/src/install/updates/update_v0.3.1_v0.3.2.php +++ b/src/install/updates/update_v0.3.1_v0.3.2.php @@ -13,7 +13,7 @@ echo "OK\n"; echo "Check csharp binary... "; -$qF = new QueryFilter(AgentBinary::TYPE, "csharp", "="); +$qF = new QueryFilter("type", "csharp", "="); $binary = Factory::getAgentBinaryFactory()->filter([Factory::FILTER => $qF], true); if ($binary != null) { if (Util::versionComparison($binary->getVersion(), "0.43.13") == 1) { diff --git a/src/install/updates/update_v0.3.2_v0.4.0.php b/src/install/updates/update_v0.3.2_v0.4.0.php index 4b8ff8056..5b9330489 100644 --- a/src/install/updates/update_v0.3.2_v0.4.0.php +++ b/src/install/updates/update_v0.3.2_v0.4.0.php @@ -86,7 +86,7 @@ echo "OK\n"; echo "Check csharp binary... "; -$qF = new QueryFilter(AgentBinary::TYPE, "csharp", "="); +$qF = new QueryFilter("type", "csharp", "="); $binary = Factory::getAgentBinaryFactory()->filter([Factory::FILTER => $qF], true); if ($binary != null) { if (Util::versionComparison($binary->getVersion(), "0.46.2") == 1) { diff --git a/src/install/updates/update_v0.8.0_v0.9.0.php b/src/install/updates/update_v0.8.0_v0.9.0.php index 213904dd9..fbdb8d11b 100644 --- a/src/install/updates/update_v0.8.0_v0.9.0.php +++ b/src/install/updates/update_v0.8.0_v0.9.0.php @@ -28,7 +28,7 @@ echo "OK\n"; echo "Check agent binaries... "; - $qF = new QueryFilter(AgentBinary::TYPE, "python", "="); + $qF = new QueryFilter("type", "python", "="); $binary = Factory::getAgentBinaryFactory()->filter([Factory::FILTER => $qF], true); if ($binary != null) { if (Util::versionComparison($binary->getVersion(), "0.3.0") == 1) { diff --git a/src/install/updates/update_v0.9.0_v0.10.0.php b/src/install/updates/update_v0.9.0_v0.10.0.php index 19d8b9a57..67123c5d7 100644 --- a/src/install/updates/update_v0.9.0_v0.10.0.php +++ b/src/install/updates/update_v0.9.0_v0.10.0.php @@ -72,7 +72,7 @@ if (!isset($PRESENT["v0.9.0_agentBinaries"])) { Factory::getAgentFactory()->getDB()->query("ALTER TABLE `AgentBinary` ADD `updateAvailable` VARCHAR(20) NOT NULL"); Factory::getAgentFactory()->getDB()->query("ALTER TABLE `AgentBinary` ADD `updateTrack` VARCHAR(20) NOT NULL"); - $qF = new QueryFilter(AgentBinary::TYPE, "python", "="); + $qF = new QueryFilter("type", "python", "="); $agent = Factory::getAgentBinaryFactory()->filter([Factory::FILTER => $qF], true); if ($agent != null) { $agent->setUpdateTrack('stable'); diff --git a/src/templates/agents/new.template.html b/src/templates/agents/new.template.html index 6529cfbb2..42b8708d9 100755 --- a/src/templates/agents/new.template.html +++ b/src/templates/agents/new.template.html @@ -24,7 +24,7 @@

    Clients

    [[binary.getId()]] [[binary.getVersion()]] - [[binary.getType()]] + [[binary.getBinaryType()]] [[binary.getOperatingSystems()]] [[binary.getFilename()]] diff --git a/src/templates/binaries.template.html b/src/templates/binaries.template.html index 9f2048ae2..d660b24d5 100755 --- a/src/templates/binaries.template.html +++ b/src/templates/binaries.template.html @@ -54,7 +54,7 @@

    Agent Binaries

    - + @@ -108,7 +108,7 @@

    Agent Binaries

    {{FOREACH binary;[[binaries]]}} - + From 5f907f68d0039c98e63886e0bd9828895ca74bb3 Mon Sep 17 00:00:00 2001 From: jessevz Date: Thu, 31 Jul 2025 17:04:06 +0200 Subject: [PATCH 129/691] changed alias primary key of user and righgroup to have same standard as other datatypes --- src/dba/models/RightGroup.class.php | 2 +- src/dba/models/User.class.php | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/dba/models/RightGroup.class.php b/src/dba/models/RightGroup.class.php index 5599bd1e9..ef0af1c51 100644 --- a/src/dba/models/RightGroup.class.php +++ b/src/dba/models/RightGroup.class.php @@ -24,7 +24,7 @@ function getKeyValueDict(): array { static function getFeatures(): array { $dict = array(); - $dict['rightGroupId'] = ['read_only' => True, "type" => "int", "subtype" => "unset", "choices" => "unset", "null" => False, "pk" => True, "protected" => True, "private" => False, "alias" => "id", "public" => False]; + $dict['rightGroupId'] = ['read_only' => True, "type" => "int", "subtype" => "unset", "choices" => "unset", "null" => False, "pk" => True, "protected" => True, "private" => False, "alias" => "rightGroupId", "public" => False]; $dict['groupName'] = ['read_only' => False, "type" => "str(50)", "subtype" => "unset", "choices" => "unset", "null" => False, "pk" => False, "protected" => False, "private" => False, "alias" => "name", "public" => False]; $dict['permissions'] = ['read_only' => False, "type" => "dict", "subtype" => "bool", "choices" => "unset", "null" => True, "pk" => False, "protected" => False, "private" => False, "alias" => "permissions", "public" => False]; diff --git a/src/dba/models/User.class.php b/src/dba/models/User.class.php index d5304d0d2..bac5ad944 100644 --- a/src/dba/models/User.class.php +++ b/src/dba/models/User.class.php @@ -63,7 +63,7 @@ function getKeyValueDict(): array { static function getFeatures(): array { $dict = array(); - $dict['userId'] = ['read_only' => True, "type" => "int", "subtype" => "unset", "choices" => "unset", "null" => False, "pk" => True, "protected" => True, "private" => False, "alias" => "id", "public" => True]; + $dict['userId'] = ['read_only' => True, "type" => "int", "subtype" => "unset", "choices" => "unset", "null" => False, "pk" => True, "protected" => True, "private" => False, "alias" => "userId", "public" => True]; $dict['username'] = ['read_only' => False, "type" => "str(100)", "subtype" => "unset", "choices" => "unset", "null" => False, "pk" => False, "protected" => False, "private" => False, "alias" => "name", "public" => True]; $dict['email'] = ['read_only' => False, "type" => "str(150)", "subtype" => "unset", "choices" => "unset", "null" => False, "pk" => False, "protected" => False, "private" => False, "alias" => "email", "public" => False]; $dict['passwordHash'] = ['read_only' => True, "type" => "str(256)", "subtype" => "unset", "choices" => "unset", "null" => False, "pk" => False, "protected" => True, "private" => True, "alias" => "passwordHash", "public" => False]; From 497c22ed53dde82db7e1ed6063b21108231acd4f Mon Sep 17 00:00:00 2001 From: jessevz Date: Mon, 4 Aug 2025 18:36:41 +0200 Subject: [PATCH 130/691] Small fix to auto increment the primary key when adding to a to many relationship --- src/inc/apiv2/common/AbstractModelAPI.class.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/inc/apiv2/common/AbstractModelAPI.class.php b/src/inc/apiv2/common/AbstractModelAPI.class.php index b95f8fadf..cc906a931 100644 --- a/src/inc/apiv2/common/AbstractModelAPI.class.php +++ b/src/inc/apiv2/common/AbstractModelAPI.class.php @@ -1611,7 +1611,7 @@ public function postToManyRelationshipLink(Request $request, Response $response, } $table_entry_dict = [ - $primaryKey => -1, + $primaryKey => null, $relation["junctionTableFilterField"] => $baseItem->getId(), $relation["junctionTableJoinField"] => $relationItem->getId(), ]; From ff2859978d8f09a092983558db020cfc73423ce1 Mon Sep 17 00:00:00 2001 From: jessevz Date: Tue, 5 Aug 2025 13:44:09 +0200 Subject: [PATCH 131/691] Fixes bug in update script when there is still old 'type' name in agentbinary data --- src/inc/Util.class.php | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/src/inc/Util.class.php b/src/inc/Util.class.php index ddc0f9120..8168328ee 100755 --- a/src/inc/Util.class.php +++ b/src/inc/Util.class.php @@ -192,6 +192,10 @@ public static function getGitCommit($hashOnly = false) { */ public static function checkAgentVersion($type, $version, $silent = false) { $qF = new QueryFilter(AgentBinary::BINARY_TYPE, $type, "="); + if (Util::databaseColumnExists("AgentBinary", "type")) { + // This check is needed for older updates when agentbinary column still got old 'type' name + $qF = new QueryFilter("type", $type, "="); + } $binary = Factory::getAgentBinaryFactory()->filter([Factory::FILTER => $qF], true); if ($binary != null) { if (Util::versionComparison($binary->getVersion(), $version) == 1) { From 6f2f1f7450380a7d46745af3c04d1006b6c1162f Mon Sep 17 00:00:00 2001 From: jessevz Date: Tue, 5 Aug 2025 13:56:09 +0200 Subject: [PATCH 132/691] Added new hashcat7 hashing algorithms to update script (still have todo slow hash and salted) --- .../updates/update_v0.14.4_v0.14.x.php | 146 ++++++++++++++++++ 1 file changed, 146 insertions(+) diff --git a/src/install/updates/update_v0.14.4_v0.14.x.php b/src/install/updates/update_v0.14.4_v0.14.x.php index b598056a0..1f1b6f530 100644 --- a/src/install/updates/update_v0.14.4_v0.14.x.php +++ b/src/install/updates/update_v0.14.4_v0.14.x.php @@ -1,6 +1,7 @@ = v3.8.5" , 0, 0), + new HashType( 2811 , "MyBB 1.2+, IPB2+ (Invision Power Board)" , 0, 0), + new HashType( 3711 , "MediaWiki B type" , 0, 0), + new HashType( 4110 , "md5($salt.md5($pass.$salt))" , 0, 0), + new HashType( 4711 , "Huawei sha1(md5($pass).$salt)" , 0, 0), + new HashType( 6211 , "TrueCrypt RIPEMD160 + XTS 512 bit (legacy)" , 0, 0), + new HashType( 6900 , "GOST R 34.11-94" , 0, 0), + new HashType( 3610 , "md5(md5(md5($pass)).$salt)" , 0, 0), + new HashType( 3730 , "md5($salt1.strtoupper(md5($salt2.$pass)))" , 0, 0), + new HashType( 4420 , "md5(sha1($pass.$salt))" , 0, 0), + new HashType( 4430 , "md5(sha1($salt.$pass))" , 0, 0), + new HashType( 6050 , "HMAC-RIPEMD160 (key = $pass)" , 0, 0), + new HashType( 6060 , "HMAC-RIPEMD160 (key = $salt)" , 0, 0), + new HashType( 7350 , "IPMI2 RAKP HMAC-MD5" , 0, 0), + new HashType( 10510 , "PDF 1.3 - 1.6 (Acrobat 4 - 8) w/ RC4-40" , 0, 0), + new HashType( 10700 , "PDF 1.7 Level 8 (Acrobat 10 - 11)" , 0, 0), + new HashType( 11000 , "PrestaShop" , 0, 0), + new HashType( 11100 , "PostgreSQL CRAM (MD5)" , 0, 0), + new HashType( 11200 , "MySQL CRAM (SHA1)" , 0, 0), + new HashType( 11300 , "Bitcoin/Litecoin wallet.dat" , 0, 0), + new HashType( 11400 , "SIP digest authentication (MD5)" , 0, 0), + new HashType( 11500 , "CRC32" , 0, 0), + new HashType( 11600 , "7-Zip" , 0, 0), + new HashType( 11700 , "GOST R 34.11-2012 (Streebog) 256-bit, big-endian" , 0, 0), + new HashType( 11750 , "HMAC-Streebog-256 (key = $pass), big-endian" , 0, 0), + new HashType( 11760 , "HMAC-Streebog-256 (key = $salt), big-endian" , 0, 0), + new HashType( 11800, "GOST R 34.11-2012 (Streebog) 512-bit, big-endian" , 0, 0), + new HashType( 11850 , "HMAC-Streebog-512 (key = $pass), big-endian" , 0, 0), + new HashType( 11860 , "HMAC-Streebog-512 (key = $salt), big-endian" , 0, 0), + new HashType( 11900 , "PBKDF2-HMAC-MD5" , 0, 0), + new HashType( 12150 , "Apache Shiro 1 SHA-512" , 0, 0), + new HashType( 13711 , "VeraCrypt RIPEMD160 + XTS 512 bit (legacy)" , 0, 0), + new HashType( 14200 , "RACF KDFAES" , 0, 0), + new HashType( 16501 , "Perl Mojolicious session cookie (HMAC-SHA256, >= v9.19)" , 0, 0), + new HashType( 17020 , "GPG (AES-128/AES-256 (SHA-512($pass)))" , 0, 0), + new HashType( 17030 , "GPG (AES-128/AES-256 (SHA-256($pass)))" , 0, 0), + new HashType( 17040 , "GPG (CAST5 (SHA-1($pass)))" , 0, 0), + new HashType( 19210 , "QNX 7 /etc/shadow (SHA512)" , 0, 0), + new HashType( 20011 , "DiskCryptor SHA512 + XTS 512 bit" , 0, 0), + new HashType( 20711 , "AuthMe sha256" , 0, 0), + new HashType( 20712 , "RSA Security Analytics / NetWitness (sha256)" , 0, 0), + new HashType( 20730 , "sha256(sha256($pass.$salt))" , 0, 0), + new HashType( 21100 , "sha1(md5($pass.$salt))" , 0, 0), + new HashType( 21310 , "md5($salt1.sha1($salt2.$pass))" , 0, 0), + new HashType( 21900 , "md5(md5(md5($pass.$salt1)).$salt2)" , 0, 0), + new HashType( 22800 , "Simpla CMS - md5($salt.$pass.md5($pass))" , 0, 0), + new HashType( 24000 , "BestCrypt v4 Volume Encryption" , 0, 0), + new HashType( 24420 , "PKCS#8 Private Keys (PBKDF2-HMAC-SHA256 + 3DES/AES)" , 0, 0), + new HashType( 22911 , "RSA/DSA/EC/OpenSSH Private Keys ($0$)" , 0, 0), + new HashType( 29311 , "TrueCrypt RIPEMD160 + XTS 512 bit" , 0, 0), + new HashType( 29411 , "VeraCrypt RIPEMD160 + XTS 512 bit" , 0, 0), + new HashType( 29511 , "LUKS v1 SHA-1 + AES" , 0, 0), + new HashType( 31100 , "ShangMi 3 (SM3)" , 0, 0), + new HashType( 34211 , "MurmurHash64A truncated (zero seed)" , 0, 0), + new HashType( 26300 , "FortiGate256 (FortiOS256)" , 0, 0), + new HashType( 26610 , "MetaMask Wallet (short hash, plaintext check)" , 0, 0), + new HashType( 29800 , "Bisq .wallet (scrypt)" , 0, 0), + new HashType( 29910 , "ENCsecurity Datavault (PBKDF2/no keychain)" , 0, 0), + new HashType( 29920 , "ENCsecurity Datavault (PBKDF2/keychain)" , 0, 0), + new HashType( 29930 , "ENCsecurity Datavault (MD5/no keychain)" , 0, 0), + new HashType( 29940 , "ENCsecurity Datavault (MD5/keychain)" , 0, 0), + new HashType( 30420 , "DANE RFC7929/RFC8162 SHA2-256" , 0, 0), + new HashType( 30500 , "md5(md5($salt).md5(md5($pass)))" , 0, 0), + new HashType( 30600 , "bcrypt(sha256($pass)) / bcryptsha256" , 0, 0), + new HashType( 30601 , "bcrypt-sha256 v2 bcrypt(HMAC-SHA256($pass))" , 0, 0), + new HashType( 30700 , "Anope IRC Services (enc_sha256)" , 0, 0), + new HashType( 30901 , "Bitcoin raw private key (P2PKH), compressed" , 0, 0), + new HashType( 30902 , "Bitcoin raw private key (P2PKH), uncompressed" , 0, 0), + new HashType( 30903 , "Bitcoin raw private key (P2WPKH, Bech32), compressed" , 0, 0), + new HashType( 30904 , "Bitcoin raw private key (P2WPKH, Bech32), uncompressed" , 0, 0), + new HashType( 30905 , "Bitcoin raw private key (P2SH(P2WPKH)), compressed" , 0, 0), + new HashType( 30906 , "Bitcoin raw private key (P2SH(P2WPKH)), uncompressed" , 0, 0), + new HashType( 31000 , "BLAKE2s-256" , 0, 0), + new HashType( 31100 , "ShangMi 3 (SM3)" , 0, 0), + new HashType( 31200 , "Veeam VBK" , 0, 0), + new HashType( 31300 , "MS SNTP" , 0, 0), + new HashType( 31400 , "SecureCRT MasterPassphrase v2" , 0, 0), + new HashType( 31500 , "Domain Cached Credentials (DCC), MS Cache (NT)" , 0, 0), + new HashType( 31600 , "Domain Cached Credentials 2 (DCC2), MS Cache 2, (NT)" , 0, 0), + new HashType( 31700 , "md5(md5(md5($pass).$salt1).$salt2)" , 0, 0), + new HashType( 31800 , "1Password, mobilekeychain (1Password 8)" , 0, 0), + new HashType( 31900 , "MetaMask Mobile Wallet" , 0, 0), + new HashType( 32000 , "NetIQ SSPR (MD5)" , 0, 0), + new HashType( 32010 , "NetIQ SSPR (SHA1)" , 0, 0), + new HashType( 32020 , "NetIQ SSPR (SHA-1 with Salt)" , 0, 0), + new HashType( 32030 , "NetIQ SSPR (SHA-256 with Salt)" , 0, 0), + new HashType( 32031 , "Adobe AEM (SSPR, SHA-256 with Salt)" , 0, 0), + new HashType( 32040 , "NetIQ SSPR (SHA-512 with Salt)" , 0, 0), + new HashType( 32041 , "Adobe AEM (SSPR, SHA-512 with Salt)" , 0, 0), + new HashType( 32050 , "NetIQ SSPR (PBKDF2WithHmacSHA1)" , 0, 0), + new HashType( 32060 , "NetIQ SSPR (PBKDF2WithHmacSHA256)" , 0, 0), + new HashType( 32070 , "NetIQ SSPR (PBKDF2WithHmacSHA512)" , 0, 0), + new HashType( 32100 , "Kerberos 5, etype 17, AS-REP" , 0, 0), + new HashType( 32200 , "Kerberos 5, etype 18, AS-REP" , 0, 0), + new HashType( 32300 , "Empire CMS (Admin password)" , 0, 0), + new HashType( 32410 , "sha512(sha512($pass).$salt)" , 0, 0), + new HashType( 32420 , "sha512(sha512_bin($pass).$salt)" , 0, 0), + new HashType( 32500 , "Dogechain.info Wallet" , 0, 0), + new HashType( 32600 , "CubeCart (whirlpool($salt.$pass.$salt))" , 0, 0), + new HashType( 32700 , "Kremlin Encrypt 3.0 w/NewDES" , 0, 0), + new HashType( 32800 , "md5(sha1(md5($pass)))" , 0, 0), + new HashType( 32900 , "PBKDF1-SHA1" , 0, 0), + new HashType( 33000 , "md5($salt1.$pass.$salt2)" , 0, 0), + new HashType( 33100 , "md5($salt.md5($pass).$salt)" , 0, 0), + new HashType( 33300 , "HMAC-BLAKE2S (key = $pass)" , 0, 0), + new HashType( 33400 , "mega.nz password-protected link (PBKDF2-HMAC-SHA512)" , 0, 0), + new HashType( 33500 , "RC4 40-bit DropN" , 0, 0), + new HashType( 33501 , "RC4 72-bit DropN" , 0, 0), + new HashType( 33502 , "RC4 104-bit DropN" , 0, 0), + new HashType( 33600 , "RIPEMD-320" , 0, 0), + new HashType( 33650 , "HMAC-RIPEMD320 (key = $pass)" , 0, 0), + new HashType( 33660 , "HMAC-RIPEMD320 (key = $salt)" , 0, 0), + new HashType( 33700 , "Microsoft Online Account (PBKDF2-HMAC-SHA256 + AES256)" , 0, 0), + new HashType( 33800 , "WBB4 (Woltlab Burning Board) Plugin [bcrypt(bcrypt($pass))]" , 0, 0), + new HashType( 33900 , "Citrix NetScaler (PBKDF2-HMAC-SHA256)" , 0, 0), + new HashType( 34000 , "Argon2" , 0, 0), + new HashType( 34100 , "LUKS v2 argon2id + SHA-256 + AES" , 0, 0), + new HashType( 34200 , "MurmurHash64A" , 0, 0), + new HashType( 34201 , "MurmurHash64A (zero seed)" , 0, 0), + new HashType( 34211 , "MurmurHash64A truncated (zero seed)" , 0, 0), + new HashType( 70000 , "argon2id [Bridged: reference implementation + tunings]" , 0, 0), + new HashType( 70100 , "scrypt [Bridged: Scrypt-Jane ROMix]" , 0, 0), + new HashType( 70200 , "scrypt [Bridged: Scrypt-Yescrypt]" , 0, 0), + new HashType( 72000 , "Generic Hash [Bridged: Python Interpreter free-threading]" , 0, 0), + new HashType( 73000 , "Generic Hash [Bridged: Python Interpreter with GIL]" , 0, 0), + ]; + foreach ($hashtypes as $hashtype) { + $check = Factory::getHashTypeFactory()->get($hashtype->getId()); + if ($check === null) { + Factory::getHashTypeFactory()->save($hashtype); + } + } + $EXECUTED["v0.14.x_update_hashtypes"] = true; +} ?> \ No newline at end of file From 8e74bed0b9fc0e97df4f9aaace8600b96435389a Mon Sep 17 00:00:00 2001 From: jessevz Date: Tue, 5 Aug 2025 15:05:26 +0200 Subject: [PATCH 133/691] Removed accidentely added hashtypes --- .../updates/update_v0.14.4_v0.14.x.php | 44 +------------------ 1 file changed, 2 insertions(+), 42 deletions(-) diff --git a/src/install/updates/update_v0.14.4_v0.14.x.php b/src/install/updates/update_v0.14.4_v0.14.x.php index 1f1b6f530..01acc016f 100644 --- a/src/install/updates/update_v0.14.4_v0.14.x.php +++ b/src/install/updates/update_v0.14.4_v0.14.x.php @@ -11,22 +11,7 @@ } if (!isset($PRESENT["v0.14.x_update_hashtypes"])){ $hashTypes = [ - new HashType( 11 , "Joomla < 2.5.18" , 0, 0), - new HashType( 110 , "sha1($pass.$salt)" , 0, 0), - new HashType( 111 , "nsldaps, SSHA-1(Base64), Netscape LDAP SSHA" , 0, 0), - new HashType( 112 , "Oracle S: Type (Oracle 11+)" , 0, 0), - new HashType( 1100 , "Domain Cached Credentials (DCC), MS Cache" , 0, 0), - new HashType( 1411 , "SSHA-256(Base64), LDAP {SSHA256}" , 0, 0), - new HashType( 1711 , "SSHA-512(Base64), LDAP {SSHA512}" , 0, 0), - new HashType( 2611 , "vBulletin < v3.8.5" , 0, 0), new HashType( 2630 , "md5(md5($pass.$salt))" , 0, 0), - new HashType( 2711 , "vBulletin >= v3.8.5" , 0, 0), - new HashType( 2811 , "MyBB 1.2+, IPB2+ (Invision Power Board)" , 0, 0), - new HashType( 3711 , "MediaWiki B type" , 0, 0), - new HashType( 4110 , "md5($salt.md5($pass.$salt))" , 0, 0), - new HashType( 4711 , "Huawei sha1(md5($pass).$salt)" , 0, 0), - new HashType( 6211 , "TrueCrypt RIPEMD160 + XTS 512 bit (legacy)" , 0, 0), - new HashType( 6900 , "GOST R 34.11-94" , 0, 0), new HashType( 3610 , "md5(md5(md5($pass)).$salt)" , 0, 0), new HashType( 3730 , "md5($salt1.strtoupper(md5($salt2.$pass)))" , 0, 0), new HashType( 4420 , "md5(sha1($pass.$salt))" , 0, 0), @@ -35,46 +20,19 @@ new HashType( 6060 , "HMAC-RIPEMD160 (key = $salt)" , 0, 0), new HashType( 7350 , "IPMI2 RAKP HMAC-MD5" , 0, 0), new HashType( 10510 , "PDF 1.3 - 1.6 (Acrobat 4 - 8) w/ RC4-40" , 0, 0), - new HashType( 10700 , "PDF 1.7 Level 8 (Acrobat 10 - 11)" , 0, 0), - new HashType( 11000 , "PrestaShop" , 0, 0), - new HashType( 11100 , "PostgreSQL CRAM (MD5)" , 0, 0), - new HashType( 11200 , "MySQL CRAM (SHA1)" , 0, 0), - new HashType( 11300 , "Bitcoin/Litecoin wallet.dat" , 0, 0), - new HashType( 11400 , "SIP digest authentication (MD5)" , 0, 0), - new HashType( 11500 , "CRC32" , 0, 0), - new HashType( 11600 , "7-Zip" , 0, 0), - new HashType( 11700 , "GOST R 34.11-2012 (Streebog) 256-bit, big-endian" , 0, 0), - new HashType( 11750 , "HMAC-Streebog-256 (key = $pass), big-endian" , 0, 0), - new HashType( 11760 , "HMAC-Streebog-256 (key = $salt), big-endian" , 0, 0), - new HashType( 11800, "GOST R 34.11-2012 (Streebog) 512-bit, big-endian" , 0, 0), - new HashType( 11850 , "HMAC-Streebog-512 (key = $pass), big-endian" , 0, 0), - new HashType( 11860 , "HMAC-Streebog-512 (key = $salt), big-endian" , 0, 0), - new HashType( 11900 , "PBKDF2-HMAC-MD5" , 0, 0), new HashType( 12150 , "Apache Shiro 1 SHA-512" , 0, 0), - new HashType( 13711 , "VeraCrypt RIPEMD160 + XTS 512 bit (legacy)" , 0, 0), new HashType( 14200 , "RACF KDFAES" , 0, 0), new HashType( 16501 , "Perl Mojolicious session cookie (HMAC-SHA256, >= v9.19)" , 0, 0), new HashType( 17020 , "GPG (AES-128/AES-256 (SHA-512($pass)))" , 0, 0), new HashType( 17030 , "GPG (AES-128/AES-256 (SHA-256($pass)))" , 0, 0), new HashType( 17040 , "GPG (CAST5 (SHA-1($pass)))" , 0, 0), new HashType( 19210 , "QNX 7 /etc/shadow (SHA512)" , 0, 0), - new HashType( 20011 , "DiskCryptor SHA512 + XTS 512 bit" , 0, 0), - new HashType( 20711 , "AuthMe sha256" , 0, 0), new HashType( 20712 , "RSA Security Analytics / NetWitness (sha256)" , 0, 0), new HashType( 20730 , "sha256(sha256($pass.$salt))" , 0, 0), - new HashType( 21100 , "sha1(md5($pass.$salt))" , 0, 0), new HashType( 21310 , "md5($salt1.sha1($salt2.$pass))" , 0, 0), new HashType( 21900 , "md5(md5(md5($pass.$salt1)).$salt2)" , 0, 0), new HashType( 22800 , "Simpla CMS - md5($salt.$pass.md5($pass))" , 0, 0), new HashType( 24000 , "BestCrypt v4 Volume Encryption" , 0, 0), - new HashType( 24420 , "PKCS#8 Private Keys (PBKDF2-HMAC-SHA256 + 3DES/AES)" , 0, 0), - new HashType( 22911 , "RSA/DSA/EC/OpenSSH Private Keys ($0$)" , 0, 0), - new HashType( 29311 , "TrueCrypt RIPEMD160 + XTS 512 bit" , 0, 0), - new HashType( 29411 , "VeraCrypt RIPEMD160 + XTS 512 bit" , 0, 0), - new HashType( 29511 , "LUKS v1 SHA-1 + AES" , 0, 0), - new HashType( 31100 , "ShangMi 3 (SM3)" , 0, 0), - new HashType( 34211 , "MurmurHash64A truncated (zero seed)" , 0, 0), - new HashType( 26300 , "FortiGate256 (FortiOS256)" , 0, 0), new HashType( 26610 , "MetaMask Wallet (short hash, plaintext check)" , 0, 0), new HashType( 29800 , "Bisq .wallet (scrypt)" , 0, 0), new HashType( 29910 , "ENCsecurity Datavault (PBKDF2/no keychain)" , 0, 0), @@ -92,6 +50,8 @@ new HashType( 30904 , "Bitcoin raw private key (P2WPKH, Bech32), uncompressed" , 0, 0), new HashType( 30905 , "Bitcoin raw private key (P2SH(P2WPKH)), compressed" , 0, 0), new HashType( 30906 , "Bitcoin raw private key (P2SH(P2WPKH)), uncompressed" , 0, 0), + new HashType( 31100 , "ShangMi 3 (SM3)" , 0, 0), + new HashType( 34211 , "MurmurHash64A truncated (zero seed)" , 0, 0), new HashType( 31000 , "BLAKE2s-256" , 0, 0), new HashType( 31100 , "ShangMi 3 (SM3)" , 0, 0), new HashType( 31200 , "Veeam VBK" , 0, 0), From 3499e6a4f44c3329ea49d3d3611542a3c25c4500 Mon Sep 17 00:00:00 2001 From: jessevz Date: Wed, 6 Aug 2025 10:37:20 +0200 Subject: [PATCH 134/691] Added slow hash and salted to update script --- .../updates/update_v0.14.4_v0.14.x.php | 187 +++++++++--------- 1 file changed, 93 insertions(+), 94 deletions(-) diff --git a/src/install/updates/update_v0.14.4_v0.14.x.php b/src/install/updates/update_v0.14.4_v0.14.x.php index 01acc016f..e88397e31 100644 --- a/src/install/updates/update_v0.14.4_v0.14.x.php +++ b/src/install/updates/update_v0.14.4_v0.14.x.php @@ -9,102 +9,101 @@ $EXECUTED["v0.14.x_update_agent_binary"] = true; } } + if (!isset($PRESENT["v0.14.x_update_hashtypes"])){ $hashTypes = [ - new HashType( 2630 , "md5(md5($pass.$salt))" , 0, 0), - new HashType( 3610 , "md5(md5(md5($pass)).$salt)" , 0, 0), - new HashType( 3730 , "md5($salt1.strtoupper(md5($salt2.$pass)))" , 0, 0), - new HashType( 4420 , "md5(sha1($pass.$salt))" , 0, 0), - new HashType( 4430 , "md5(sha1($salt.$pass))" , 0, 0), - new HashType( 6050 , "HMAC-RIPEMD160 (key = $pass)" , 0, 0), - new HashType( 6060 , "HMAC-RIPEMD160 (key = $salt)" , 0, 0), - new HashType( 7350 , "IPMI2 RAKP HMAC-MD5" , 0, 0), - new HashType( 10510 , "PDF 1.3 - 1.6 (Acrobat 4 - 8) w/ RC4-40" , 0, 0), - new HashType( 12150 , "Apache Shiro 1 SHA-512" , 0, 0), - new HashType( 14200 , "RACF KDFAES" , 0, 0), - new HashType( 16501 , "Perl Mojolicious session cookie (HMAC-SHA256, >= v9.19)" , 0, 0), - new HashType( 17020 , "GPG (AES-128/AES-256 (SHA-512($pass)))" , 0, 0), - new HashType( 17030 , "GPG (AES-128/AES-256 (SHA-256($pass)))" , 0, 0), - new HashType( 17040 , "GPG (CAST5 (SHA-1($pass)))" , 0, 0), - new HashType( 19210 , "QNX 7 /etc/shadow (SHA512)" , 0, 0), - new HashType( 20712 , "RSA Security Analytics / NetWitness (sha256)" , 0, 0), - new HashType( 20730 , "sha256(sha256($pass.$salt))" , 0, 0), - new HashType( 21310 , "md5($salt1.sha1($salt2.$pass))" , 0, 0), - new HashType( 21900 , "md5(md5(md5($pass.$salt1)).$salt2)" , 0, 0), - new HashType( 22800 , "Simpla CMS - md5($salt.$pass.md5($pass))" , 0, 0), - new HashType( 24000 , "BestCrypt v4 Volume Encryption" , 0, 0), - new HashType( 26610 , "MetaMask Wallet (short hash, plaintext check)" , 0, 0), - new HashType( 29800 , "Bisq .wallet (scrypt)" , 0, 0), - new HashType( 29910 , "ENCsecurity Datavault (PBKDF2/no keychain)" , 0, 0), - new HashType( 29920 , "ENCsecurity Datavault (PBKDF2/keychain)" , 0, 0), - new HashType( 29930 , "ENCsecurity Datavault (MD5/no keychain)" , 0, 0), - new HashType( 29940 , "ENCsecurity Datavault (MD5/keychain)" , 0, 0), - new HashType( 30420 , "DANE RFC7929/RFC8162 SHA2-256" , 0, 0), - new HashType( 30500 , "md5(md5($salt).md5(md5($pass)))" , 0, 0), - new HashType( 30600 , "bcrypt(sha256($pass)) / bcryptsha256" , 0, 0), - new HashType( 30601 , "bcrypt-sha256 v2 bcrypt(HMAC-SHA256($pass))" , 0, 0), - new HashType( 30700 , "Anope IRC Services (enc_sha256)" , 0, 0), - new HashType( 30901 , "Bitcoin raw private key (P2PKH), compressed" , 0, 0), - new HashType( 30902 , "Bitcoin raw private key (P2PKH), uncompressed" , 0, 0), - new HashType( 30903 , "Bitcoin raw private key (P2WPKH, Bech32), compressed" , 0, 0), - new HashType( 30904 , "Bitcoin raw private key (P2WPKH, Bech32), uncompressed" , 0, 0), - new HashType( 30905 , "Bitcoin raw private key (P2SH(P2WPKH)), compressed" , 0, 0), - new HashType( 30906 , "Bitcoin raw private key (P2SH(P2WPKH)), uncompressed" , 0, 0), - new HashType( 31100 , "ShangMi 3 (SM3)" , 0, 0), - new HashType( 34211 , "MurmurHash64A truncated (zero seed)" , 0, 0), - new HashType( 31000 , "BLAKE2s-256" , 0, 0), - new HashType( 31100 , "ShangMi 3 (SM3)" , 0, 0), - new HashType( 31200 , "Veeam VBK" , 0, 0), - new HashType( 31300 , "MS SNTP" , 0, 0), - new HashType( 31400 , "SecureCRT MasterPassphrase v2" , 0, 0), - new HashType( 31500 , "Domain Cached Credentials (DCC), MS Cache (NT)" , 0, 0), - new HashType( 31600 , "Domain Cached Credentials 2 (DCC2), MS Cache 2, (NT)" , 0, 0), - new HashType( 31700 , "md5(md5(md5($pass).$salt1).$salt2)" , 0, 0), - new HashType( 31800 , "1Password, mobilekeychain (1Password 8)" , 0, 0), - new HashType( 31900 , "MetaMask Mobile Wallet" , 0, 0), - new HashType( 32000 , "NetIQ SSPR (MD5)" , 0, 0), - new HashType( 32010 , "NetIQ SSPR (SHA1)" , 0, 0), - new HashType( 32020 , "NetIQ SSPR (SHA-1 with Salt)" , 0, 0), - new HashType( 32030 , "NetIQ SSPR (SHA-256 with Salt)" , 0, 0), - new HashType( 32031 , "Adobe AEM (SSPR, SHA-256 with Salt)" , 0, 0), - new HashType( 32040 , "NetIQ SSPR (SHA-512 with Salt)" , 0, 0), - new HashType( 32041 , "Adobe AEM (SSPR, SHA-512 with Salt)" , 0, 0), - new HashType( 32050 , "NetIQ SSPR (PBKDF2WithHmacSHA1)" , 0, 0), - new HashType( 32060 , "NetIQ SSPR (PBKDF2WithHmacSHA256)" , 0, 0), - new HashType( 32070 , "NetIQ SSPR (PBKDF2WithHmacSHA512)" , 0, 0), - new HashType( 32100 , "Kerberos 5, etype 17, AS-REP" , 0, 0), - new HashType( 32200 , "Kerberos 5, etype 18, AS-REP" , 0, 0), - new HashType( 32300 , "Empire CMS (Admin password)" , 0, 0), - new HashType( 32410 , "sha512(sha512($pass).$salt)" , 0, 0), - new HashType( 32420 , "sha512(sha512_bin($pass).$salt)" , 0, 0), - new HashType( 32500 , "Dogechain.info Wallet" , 0, 0), - new HashType( 32600 , "CubeCart (whirlpool($salt.$pass.$salt))" , 0, 0), - new HashType( 32700 , "Kremlin Encrypt 3.0 w/NewDES" , 0, 0), - new HashType( 32800 , "md5(sha1(md5($pass)))" , 0, 0), - new HashType( 32900 , "PBKDF1-SHA1" , 0, 0), - new HashType( 33000 , "md5($salt1.$pass.$salt2)" , 0, 0), - new HashType( 33100 , "md5($salt.md5($pass).$salt)" , 0, 0), - new HashType( 33300 , "HMAC-BLAKE2S (key = $pass)" , 0, 0), - new HashType( 33400 , "mega.nz password-protected link (PBKDF2-HMAC-SHA512)" , 0, 0), - new HashType( 33500 , "RC4 40-bit DropN" , 0, 0), - new HashType( 33501 , "RC4 72-bit DropN" , 0, 0), - new HashType( 33502 , "RC4 104-bit DropN" , 0, 0), - new HashType( 33600 , "RIPEMD-320" , 0, 0), - new HashType( 33650 , "HMAC-RIPEMD320 (key = $pass)" , 0, 0), - new HashType( 33660 , "HMAC-RIPEMD320 (key = $salt)" , 0, 0), - new HashType( 33700 , "Microsoft Online Account (PBKDF2-HMAC-SHA256 + AES256)" , 0, 0), - new HashType( 33800 , "WBB4 (Woltlab Burning Board) Plugin [bcrypt(bcrypt($pass))]" , 0, 0), - new HashType( 33900 , "Citrix NetScaler (PBKDF2-HMAC-SHA256)" , 0, 0), - new HashType( 34000 , "Argon2" , 0, 0), - new HashType( 34100 , "LUKS v2 argon2id + SHA-256 + AES" , 0, 0), - new HashType( 34200 , "MurmurHash64A" , 0, 0), - new HashType( 34201 , "MurmurHash64A (zero seed)" , 0, 0), - new HashType( 34211 , "MurmurHash64A truncated (zero seed)" , 0, 0), - new HashType( 70000 , "argon2id [Bridged: reference implementation + tunings]" , 0, 0), - new HashType( 70100 , "scrypt [Bridged: Scrypt-Jane ROMix]" , 0, 0), - new HashType( 70200 , "scrypt [Bridged: Scrypt-Yescrypt]" , 0, 0), - new HashType( 72000 , "Generic Hash [Bridged: Python Interpreter free-threading]" , 0, 0), - new HashType( 73000 , "Generic Hash [Bridged: Python Interpreter with GIL]" , 0, 0), + new HashType( 2630, "md5(md5($pass.$salt))", 1, 0), + new HashType( 3610, "md5(md5(md5($pass)).$salt)", 1, 0), + new HashType( 3730, "md5($salt1.strtoupper(md5($salt2.$pass)))", 1, 0), + new HashType( 4420, "md5(sha1($pass.$salt))", 1, 0), + new HashType( 4430, "md5(sha1($salt.$pass))", 1, 0), + new HashType( 6050, "HMAC-RIPEMD160 (key = $pass)", 1, 0), + new HashType( 6060, "HMAC-RIPEMD160 (key = $salt)", 1, 0), + new HashType( 7350, "IPMI2 RAKP HMAC-MD5", 1, 0), + new HashType( 10510, "PDF 1.3 - 1.6 (Acrobat 4 - 8) w/ RC4-40", 1, 1), + new HashType( 12150, "Apache Shiro 1 SHA-512", 1, 1), + new HashType( 14200, "RACF KDFAES", 1, 1), + new HashType( 16501, "Perl Mojolicious session cookie (HMAC-SHA256, >= v9.19)", 1, 0), + new HashType( 17020, "GPG (AES-128/AES-256 (SHA-512($pass)))", 1, 1), + new HashType( 17030, "GPG (AES-128/AES-256 (SHA-256($pass)))", 1, 1), + new HashType( 17040, "GPG (CAST5 (SHA-1($pass)))", 1, 1), + new HashType( 19210, "QNX 7 /etc/shadow (SHA512)", 1, 1), + new HashType( 20712, "RSA Security Analytics / NetWitness (sha256)", 1, 0), + new HashType( 20730, "sha256(sha256($pass.$salt))", 1, 0), + new HashType( 21310, "md5($salt1.sha1($salt2.$pass))", 1, 0), + new HashType( 21900, "md5(md5(md5($pass.$salt1)).$salt2)", 1, 0), + new HashType( 22800, "Simpla CMS - md5($salt.$pass.md5($pass))", 1, 0), + new HashType( 24000, "BestCrypt v4 Volume Encryption", 1, 1), + new HashType( 26610, "MetaMask Wallet (short hash, plaintext check)", 1, 1), + new HashType( 29800, "Bisq .wallet (scrypt)", 1, 1), + new HashType( 29910, "ENCsecurity Datavault (PBKDF2/no keychain)", 1, 1), + new HashType( 29920, "ENCsecurity Datavault (PBKDF2/keychain)", 1, 1), + new HashType( 29930, "ENCsecurity Datavault (MD5/no keychain)", 1, 1), + new HashType( 29940, "ENCsecurity Datavault (MD5/keychain)", 1, 1), + new HashType( 30420, "DANE RFC7929/RFC8162 SHA2-256", 0, 0), + new HashType( 30500, "md5(md5($salt).md5(md5($pass)))", 1, 0), + new HashType( 30600, "bcrypt(sha256($pass)) / bcryptsha256", 1, 1), + new HashType( 30601, "bcrypt-sha256 v2 bcrypt(HMAC-SHA256($pass))", 1, 1), + new HashType( 30700, "Anope IRC Services (enc_sha256)", 1, 0), + new HashType( 30901, "Bitcoin raw private key (P2PKH), compressed", 0, 0), + new HashType( 30902, "Bitcoin raw private key (P2PKH), uncompressed", 0, 0), + new HashType( 30903, "Bitcoin raw private key (P2WPKH, Bech32), compressed", 0, 0), + new HashType( 30904, "Bitcoin raw private key (P2WPKH, Bech32), uncompressed", 0, 0), + new HashType( 30905, "Bitcoin raw private key (P2SH(P2WPKH)), compressed", 0, 0), + new HashType( 30906, "Bitcoin raw private key (P2SH(P2WPKH)), uncompressed", 0, 0), + new HashType( 31000, "BLAKE2s-256", 0, 0), + new HashType( 31100, "ShangMi 3 (SM3)", 0, 0), + new HashType( 31200, "Veeam VBK", 1, 1), + new HashType( 31300, "MS SNTP", 1, 0), + new HashType( 31400, "SecureCRT MasterPassphrase v2", 1, 0), + new HashType( 31500, "Domain Cached Credentials (DCC), MS Cache (NT)", 1, 1), + new HashType( 31600, "Domain Cached Credentials 2 (DCC2), MS Cache 2, (NT)", 1, 1), + new HashType( 31700, "md5(md5(md5($pass).$salt1).$salt2)", 1, 0), + new HashType( 31800, "1Password, mobilekeychain (1Password 8)", 1, 1), + new HashType( 31900, "MetaMask Mobile Wallet", 1, 1), + new HashType( 32000, "NetIQ SSPR (MD5)", 1, 1), + new HashType( 32010, "NetIQ SSPR (SHA1)", 1, 1), + new HashType( 32020, "NetIQ SSPR (SHA-1 with Salt)", 1, 1), + new HashType( 32030, "NetIQ SSPR (SHA-256 with Salt)", 1, 1), + new HashType( 32031, "Adobe AEM (SSPR, SHA-256 with Salt)", 1, 1), + new HashType( 32040, "NetIQ SSPR (SHA-512 with Salt)", 1, 1), + new HashType( 32041, "Adobe AEM (SSPR, SHA-512 with Salt)", 1, 1), + new HashType( 32050, "NetIQ SSPR (PBKDF2WithHmacSHA1)", 1, 1), + new HashType( 32060, "NetIQ SSPR (PBKDF2WithHmacSHA256)", 1, 1), + new HashType( 32070, "NetIQ SSPR (PBKDF2WithHmacSHA512)", 1, 1), + new HashType( 32100, "Kerberos 5, etype 17, AS-REP", 1, 1), + new HashType( 32200, "Kerberos 5, etype 18, AS-REP", 1, 1), + new HashType( 32300, "Empire CMS (Admin password)", 1, 0), + new HashType( 32410, "sha512(sha512($pass).$salt)", 1, 0), + new HashType( 32420, "sha512(sha512_bin($pass).$salt)", 1, 0), + new HashType( 32500, "Dogechain.info Wallet", 1, 1), + new HashType( 32600, "CubeCart (whirlpool($salt.$pass.$salt))", 1, 0), + new HashType( 32700, "Kremlin Encrypt 3.0 w/NewDES", 1, 1), + new HashType( 32800, "md5(sha1(md5($pass)))", 0, 0), + new HashType( 32900, "PBKDF1-SHA1", 1, 1), + new HashType( 33000, "md5($salt1.$pass.$salt2)", 1, 0), + new HashType( 33100, "md5($salt.md5($pass).$salt)", 1, 0), + new HashType( 33300, "HMAC-BLAKE2S (key = $pass)", 1, 0), + new HashType( 33400, "mega.nz password-protected link (PBKDF2-HMAC-SHA512)", 1, 1), + new HashType( 33500, "RC4 40-bit DropN", 1, 0), + new HashType( 33501, "RC4 72-bit DropN", 1, 0), + new HashType( 33502, "RC4 104-bit DropN", 1, 0), + new HashType( 33600, "RIPEMD-320", 0, 0), + new HashType( 33650, "HMAC-RIPEMD320 (key = $pass)", 1, 0), + new HashType( 33660, "HMAC-RIPEMD320 (key = $salt)", 1, 0), + new HashType( 33700, "Microsoft Online Account (PBKDF2-HMAC-SHA256 + AES256)", 1, 1), + new HashType( 33800, "WBB4 (Woltlab Burning Board) Plugin [bcrypt(bcrypt($pass))]", 1, 1), + new HashType( 33900, "Citrix NetScaler (PBKDF2-HMAC-SHA256)", 1, 1), + new HashType( 34000, "Argon2", 1, 1), + new HashType( 34100, "LUKS v2 argon2id + SHA-256 + AES", 1, 1), + new HashType( 34200, "MurmurHash64A", 1, 0), + new HashType( 34201, "MurmurHash64A (zero seed)", 0, 0), + new HashType( 34211, "MurmurHash64A truncated (zero seed)", 0, 0), + new HashType( 70000, "argon2id [Bridged: reference implementation + tunings]", 1, 1), + new HashType( 70100, "scrypt [Bridged: Scrypt-Jane ROMix]", 1, 1), + new HashType( 70200, "scrypt [Bridged: Scrypt-Yescrypt]", 1, 1), + new HashType( 72000, "Generic Hash [Bridged: Python Interpreter free-threading]", 1, 1), + new HashType( 73000, "Generic Hash [Bridged: Python Interpreter with GIL]", 1, 1), ]; foreach ($hashtypes as $hashtype) { From 9ec53fa6454aa31b3b5213111f8b2b27ec7fe514 Mon Sep 17 00:00:00 2001 From: jessevz Date: Wed, 6 Aug 2025 11:41:29 +0200 Subject: [PATCH 135/691] Added new hashtypes to install script --- src/install/hashtopolis.sql | 92 +++++++++++++++++++++++++++++++++++++ 1 file changed, 92 insertions(+) diff --git a/src/install/hashtopolis.sql b/src/install/hashtopolis.sql index 50d727674..f2a1e0c94 100644 --- a/src/install/hashtopolis.sql +++ b/src/install/hashtopolis.sql @@ -372,14 +372,17 @@ INSERT INTO `HashType` (`hashTypeId`, `description`, `isSalted`, `isSlowHash`) V (2600, 'md5(md5($pass))', 0, 0), (2611, 'vBulletin < v3.8.5', 1, 0), (2612, 'PHPS', 0, 0), + (2630, 'md5(md5($pass.$salt))', 1, 0), (2711, 'vBulletin >= v3.8.5', 1, 0), (2811, 'IPB2+, MyBB1.2+', 1, 0), (3000, 'LM', 0, 0), (3100, 'Oracle H: Type (Oracle 7+), DES(Oracle)', 1, 0), (3200, 'bcrypt, Blowfish(OpenBSD)', 0, 0), (3500, 'md5(md5(md5($pass)))', 0, 0), + (3610, 'md5(md5(md5($pass)).$salt)', 1, 0), (3710, 'md5($salt.md5($pass))', 1, 0), (3711, 'Mediawiki B type', 0, 0), + (3730, 'md5($salt1.strtoupper(md5($salt2.$pass)))', 1, 0), (3800, 'md5($salt.$pass.$salt)', 1, 0), (3910, 'md5(md5($pass).md5($salt))', 1, 0), (4010, 'md5($salt.md5($salt.$pass))', 1, 0), @@ -387,6 +390,8 @@ INSERT INTO `HashType` (`hashTypeId`, `description`, `isSalted`, `isSlowHash`) V (4300, 'md5(strtoupper(md5($pass)))', 0, 0), (4400, 'md5(sha1($pass))', 0, 0), (4410, 'md5(sha1($pass).$salt)', 1, 0), + (4420, 'md5(sha1($pass.$salt))', 1, 0), + (4430, 'md5(sha1($salt.$pass))', 1, 0), (4500, 'sha1(sha1($pass))', 0, 0), (4510, 'sha1(sha1($pass).$salt)', 1, 0), (4520, 'sha1($salt.sha1($pass))', 1, 0), @@ -407,6 +412,8 @@ INSERT INTO `HashType` (`hashTypeId`, `description`, `isSalted`, `isSlowHash`) V (5700, 'Cisco-IOS SHA256', 0, 0), (5800, 'Samsung Android Password/PIN', 1, 0), (6000, 'RipeMD160', 0, 0), + (6050, 'HMAC-RIPEMD160 (key = $pass)', 1, 0), + (6060, 'HMAC-RIPEMD160 (key = $salt)', 1, 0), (6100, 'Whirlpool', 0, 0), (6211, 'TrueCrypt 5.0+ PBKDF2-HMAC-RipeMD160 + AES/Serpent/Twofish', 0, 1), (6212, 'TrueCrypt 5.0+ PBKDF2-HMAC-RipeMD160 + AES-Twofish/Serpent-AES/Twofish-Serpent', 0, 1), @@ -431,6 +438,7 @@ INSERT INTO `HashType` (`hashTypeId`, `description`, `isSalted`, `isSlowHash`) V (7100, 'OS X v10.8 / v10.9', 0, 1), (7200, 'GRUB 2', 0, 1), (7300, 'IPMI2 RAKP HMAC-SHA1', 1, 0), + (7350, 'IPMI2 RAKP HMAC-MD5', 1, 0), (7400, 'sha256crypt, SHA256(Unix)', 0, 0), (7401, 'MySQL $A$ (sha256crypt)', 0, 0), (7500, 'Kerberos 5 AS-REQ Pre-Auth', 0, 0), @@ -471,6 +479,7 @@ INSERT INTO `HashType` (`hashTypeId`, `description`, `isSalted`, `isSlowHash`) V (10410, 'PDF 1.1 - 1.3 (Acrobat 2 - 4), collider #1', 0, 0), (10420, 'PDF 1.1 - 1.3 (Acrobat 2 - 4), collider #2', 0, 0), (10500, 'PDF 1.4 - 1.6 (Acrobat 5 - 8)', 0, 0), + (10510, 'PDF 1.3 - 1.6 (Acrobat 4 - 8) w/ RC4-40', 1, 1), (10600, 'PDF 1.7 Level 3 (Acrobat 9)', 0, 0), (10700, 'PDF 1.7 Level 8 (Acrobat 10 - 11)', 0, 0), (10800, 'SHA384', 0, 0), @@ -498,6 +507,7 @@ INSERT INTO `HashType` (`hashTypeId`, `description`, `isSalted`, `isSlowHash`) V (12000, 'PBKDF2-HMAC-SHA1', 0, 1), (12001, 'Atlassian (PBKDF2-HMAC-SHA1)', 0, 1), (12100, 'PBKDF2-HMAC-SHA512', 0, 1), + (12150, 'Apache Shiro 1 SHA-512', 1, 1), (12200, 'eCryptfs', 0, 1), (12300, 'Oracle T: Type (Oracle 12+)', 0, 1), (12400, 'BSDiCrypt, Extended DES', 0, 0), @@ -541,6 +551,7 @@ INSERT INTO `HashType` (`hashTypeId`, `description`, `isSalted`, `isSlowHash`) V (13900, 'OpenCart', 1, 0), (14000, 'DES (PT = $salt, key = $pass)', 1, 0), (14100, '3DES (PT = $salt, key = $pass)', 1, 0), + (14200, 'RACF KDFAES', 1, 1), (14400, 'sha1(CX)', 1, 0), (14500, 'Linux Kernel Crypto API (2.4)', 0, 0), (14600, 'LUKS 10', 0, 1), @@ -564,12 +575,16 @@ INSERT INTO `HashType` (`hashTypeId`, `description`, `isSalted`, `isSlowHash`) V (16300, 'Ethereum Pre-Sale Wallet, PBKDF2-HMAC-SHA256', 0, 1), (16400, 'CRAM-MD5 Dovecot', 0, 0), (16500, 'JWT (JSON Web Token)', 0, 0), + (16501, 'Perl Mojolicious session cookie (HMAC-SHA256, >= v9.19)', 1, 0), (16600, 'Electrum Wallet (Salt-Type 1-3)', 0, 0), (16700, 'FileVault 2', 0, 1), (16800, 'WPA-PMKID-PBKDF2', 0, 1), (16801, 'WPA-PMKID-PMK', 0, 1), (16900, 'Ansible Vault', 0, 1), (17010, 'GPG (AES-128/AES-256 (SHA-1($pass)))', 0, 1), + (17020, 'GPG (AES-128/AES-256 (SHA-512($pass)))', 1, 1), + (17030, 'GPG (AES-128/AES-256 (SHA-256($pass)))', 1, 1), + (17040, 'GPG (CAST5 (SHA-1($pass)))', 1, 1), (17200, 'PKZIP (Compressed)', 0, 0), (17210, 'PKZIP (Uncompressed)', 0, 0), (17220, 'PKZIP (Compressed Multi-File)', 0, 0), @@ -595,6 +610,7 @@ INSERT INTO `HashType` (`hashTypeId`, `description`, `isSalted`, `isSlowHash`) V (19000, 'QNX /etc/shadow (MD5)', 0, 1), (19100, 'QNX /etc/shadow (SHA256)', 0, 1), (19200, 'QNX /etc/shadow (SHA512)', 0, 1), + (19210, 'QNX 7 /etc/shadow (SHA512)', 1, 1), (19300, 'sha1($salt1.$pass.$salt2)', 0, 0), (19500, 'Ruby on Rails Restful-Authentication', 0, 0), (19600, 'Kerberos 5 TGS-REP etype 17 (AES128-CTS-HMAC-SHA1-96)', 0, 1), @@ -612,13 +628,16 @@ INSERT INTO `HashType` (`hashTypeId`, `description`, `isSalted`, `isSlowHash`) V (20600, 'Oracle Transportation Management (SHA256)', 0, 0), (20710, 'sha256(sha256($pass).$salt)', 1, 0), (20711, 'AuthMe sha256', 0, 0), + (20712, 'RSA Security Analytics / NetWitness (sha256)', 1, 0), (20720, 'sha256($salt.sha256($pass))', 1, 0), + (20730, 'sha256(sha256($pass.$salt))', 1, 0), (20800, 'sha256(md5($pass))', 0, 0), (20900, 'md5(sha1($pass).md5($pass).sha1($pass))', 0, 0), (21000, 'BitShares v0.x - sha512(sha512_bin(pass))', 0, 0), (21100, 'sha1(md5($pass.$salt))', 1, 0), (21200, 'md5(sha1($salt).md5($pass))', 1, 0), (21300, 'md5($salt.sha1($salt.$pass))', 1, 0), + (21310, 'md5($salt1.sha1($salt2.$pass))', 1, 0), (21400, 'sha256(sha256_bin(pass))', 0, 0), (21420, 'sha256($salt.sha256_bin($pass))', 1, 0), (21500, 'SolarWinds Orion', 0, 0), @@ -626,6 +645,7 @@ INSERT INTO `HashType` (`hashTypeId`, `description`, `isSalted`, `isSlowHash`) V (21600, 'Web2py pbkdf2-sha512', 0, 0), (21700, 'Electrum Wallet (Salt-Type 4)', 0, 0), (21800, 'Electrum Wallet (Salt-Type 5)', 0, 0), + (21900, 'md5(md5(md5($pass.$salt1)).$salt2)', 1, 0), (22000, 'WPA-PBKDF2-PMKID+EAPOL', 0, 0), (22001, 'WPA-PMK-PMKID+EAPOL', 0, 0), (22100, 'BitLocker', 0, 0), @@ -636,6 +656,7 @@ INSERT INTO `HashType` (`hashTypeId`, `description`, `isSalted`, `isSlowHash`) V (22500, 'MultiBit Classic .key (MD5)', 0, 0), (22600, 'Telegram Desktop App Passcode (PBKDF2-HMAC-SHA1)', 0, 0), (22700, 'MultiBit HD (scrypt)', 0, 1), + (22800, 'Simpla CMS - md5($salt.$pass.md5($pass))', 1, 0), (22911, 'RSA/DSA/EC/OPENSSH Private Keys ($0$)', 0, 0), (22921, 'RSA/DSA/EC/OPENSSH Private Keys ($6$)', 0, 0), (22931, 'RSA/DSA/EC/OPENSSH Private Keys ($1, $3$)', 0, 0), @@ -653,6 +674,7 @@ INSERT INTO `HashType` (`hashTypeId`, `description`, `isSalted`, `isSlowHash`) V (23700, 'RAR3-p (Uncompressed)', 0, 0), (23800, 'RAR3-p (Compressed)', 0, 0), (23900, 'BestCrypt v3 Volume Encryption', 0, 0), + (24000, 'BestCrypt v4 Volume Encryption', 1, 1), (24100, 'MongoDB ServerKey SCRAM-SHA-1', 0, 0), (24200, 'MongoDB ServerKey SCRAM-SHA-256', 0, 0), (24300, 'sha1($salt.sha1($pass.$salt))', 1, 0), @@ -682,6 +704,7 @@ INSERT INTO `HashType` (`hashTypeId`, `description`, `isSalted`, `isSlowHash`) V (26403, 'AES-256-ECB NOKDF (PT = $salt, key = $pass)', 0, 0), (26500, 'iPhone passcode (UID key + System Keybag)', 0, 0), (26600, 'MetaMask Wallet', 0, 1), + (26610, 'MetaMask Wallet (short hash, plaintext check)', 1, 1), (26700, 'SNMPv3 HMAC-SHA224-128', 0, 0), (26800, 'SNMPv3 HMAC-SHA256-192', 0, 0), (26900, 'SNMPv3 HMAC-SHA384-256', 0, 0), @@ -763,8 +786,77 @@ INSERT INTO `HashType` (`hashTypeId`, `description`, `isSalted`, `isSlowHash`) V (29543, 'LUKS v1 RIPEMD-160 + Twofish', 0, 1), (29600, 'Terra Station Wallet (AES256-CBC(PBKDF2($pass)))', 0, 1), (29700, 'KeePass 1 (AES/Twofish) and KeePass 2 (AES) - keyfile only mode', 0, 1), + (29800, 'Bisq .wallet (scrypt)', 1, 1), + (29910, 'ENCsecurity Datavault (PBKDF2/no keychain)', 1, 1), + (29920, 'ENCsecurity Datavault (PBKDF2/keychain)', 1, 1), + (29930, 'ENCsecurity Datavault (MD5/no keychain)', 1, 1), + (29940, 'ENCsecurity Datavault (MD5/keychain)', 1, 1), (30000, 'Python Werkzeug MD5 (HMAC-MD5 (key = $salt))', 0, 0), (30120, 'Python Werkzeug SHA256 (HMAC-SHA256 (key = $salt))', 0, 0), + (30420, 'DANE RFC7929/RFC8162 SHA2-256', 0, 0), + (30500, 'md5(md5($salt).md5(md5($pass)))', 1, 0), + (30600, 'bcrypt(sha256($pass)) / bcryptsha256', 1, 1), + (30601, 'bcrypt-sha256 v2 bcrypt(HMAC-SHA256($pass))', 1, 1), + (30700, 'Anope IRC Services (enc_sha256)', 1, 0), + (30901, 'Bitcoin raw private key (P2PKH), compressed', 0, 0), + (30902, 'Bitcoin raw private key (P2PKH), uncompressed', 0, 0), + (30903, 'Bitcoin raw private key (P2WPKH, Bech32), compressed', 0, 0), + (30904, 'Bitcoin raw private key (P2WPKH, Bech32), uncompressed', 0, 0), + (30905, 'Bitcoin raw private key (P2SH(P2WPKH)), compressed', 0, 0), + (30906, 'Bitcoin raw private key (P2SH(P2WPKH)), uncompressed', 0, 0), + (31000, 'BLAKE2s-256', 0, 0), + (31100, 'ShangMi 3 (SM3)', 0, 0), + (31200, 'Veeam VBK', 1, 1), + (31300, 'MS SNTP', 1, 0), + (31400, 'SecureCRT MasterPassphrase v2', 1, 0), + (31500, 'Domain Cached Credentials (DCC), MS Cache (NT)', 1, 1), + (31600, 'Domain Cached Credentials 2 (DCC2), MS Cache 2, (NT)', 1, 1), + (31700, 'md5(md5(md5($pass).$salt1).$salt2)', 1, 0), + (31800, '1Password, mobilekeychain (1Password 8)', 1, 1), + (31900, 'MetaMask Mobile Wallet', 1, 1), + (32000, 'NetIQ SSPR (MD5)', 1, 1), + (32010, 'NetIQ SSPR (SHA1)', 1, 1), + (32020, 'NetIQ SSPR (SHA-1 with Salt)', 1, 1), + (32030, 'NetIQ SSPR (SHA-256 with Salt)', 1, 1), + (32031, 'Adobe AEM (SSPR, SHA-256 with Salt)', 1, 1), + (32040, 'NetIQ SSPR (SHA-512 with Salt)', 1, 1), + (32041, 'Adobe AEM (SSPR, SHA-512 with Salt)', 1, 1), + (32050, 'NetIQ SSPR (PBKDF2WithHmacSHA1)', 1, 1), + (32060, 'NetIQ SSPR (PBKDF2WithHmacSHA256)', 1, 1), + (32070, 'NetIQ SSPR (PBKDF2WithHmacSHA512)', 1, 1), + (32100, 'Kerberos 5, etype 17, AS-REP', 1, 1), + (32200, 'Kerberos 5, etype 18, AS-REP', 1, 1), + (32300, 'Empire CMS (Admin password)', 1, 0), + (32410, 'sha512(sha512($pass).$salt)', 1, 0), + (32420, 'sha512(sha512_bin($pass).$salt)', 1, 0), + (32500, 'Dogechain.info Wallet', 1, 1), + (32600, 'CubeCart (whirlpool($salt.$pass.$salt))', 1, 0), + (32700, 'Kremlin Encrypt 3.0 w/NewDES', 1, 1), + (32800, 'md5(sha1(md5($pass)))', 0, 0), + (32900, 'PBKDF1-SHA1', 1, 1), + (33000, 'md5($salt1.$pass.$salt2)', 1, 0), + (33100, 'md5($salt.md5($pass).$salt)', 1, 0), + (33300, 'HMAC-BLAKE2S (key = $pass)', 1, 0), + (33400, 'mega.nz password-protected link (PBKDF2-HMAC-SHA512)', 1, 1), + (33500, 'RC4 40-bit DropN', 1, 0), + (33501, 'RC4 72-bit DropN', 1, 0), + (33502, 'RC4 104-bit DropN', 1, 0), + (33600, 'RIPEMD-320', 0, 0), + (33650, 'HMAC-RIPEMD320 (key = $pass)', 1, 0), + (33660, 'HMAC-RIPEMD320 (key = $salt)', 1, 0), + (33700, 'Microsoft Online Account (PBKDF2-HMAC-SHA256 + AES256)', 1, 1), + (33800, 'WBB4 (Woltlab Burning Board) Plugin [bcrypt(bcrypt($pass))]', 1, 1), + (33900, 'Citrix NetScaler (PBKDF2-HMAC-SHA256)', 1, 1), + (34000, 'Argon2', 1, 1), + (34100, 'LUKS v2 argon2id + SHA-256 + AES', 1, 1), + (34200, 'MurmurHash64A', 1, 0), + (34201, 'MurmurHash64A (zero seed)', 0, 0), + (34211, 'MurmurHash64A truncated (zero seed)', 0, 0), + (70000, 'argon2id [Bridged: reference implementation + tunings]', 1, 1), + (70100, 'scrypt [Bridged: Scrypt-Jane ROMix]', 1, 1), + (70200, 'scrypt [Bridged: Scrypt-Yescrypt]', 1, 1), + (72000, 'Generic Hash [Bridged: Python Interpreter free-threading]', 1, 1), + (73000, 'Generic Hash [Bridged: Python Interpreter with GIL]', 1, 1), (99999, 'Plaintext', 0, 0); CREATE TABLE `LogEntry` ( From 854303c0a62d5f82587e0dd4def10710db0db7ce Mon Sep 17 00:00:00 2001 From: jessevz Date: Wed, 6 Aug 2025 11:42:47 +0200 Subject: [PATCH 136/691] Added script that automaticcaly generates update scripts for new hashtypes --- ci/files/update-hashes.py | 70 +++++++++++++++++++++++++++++++++++++++ 1 file changed, 70 insertions(+) create mode 100644 ci/files/update-hashes.py diff --git a/ci/files/update-hashes.py b/ci/files/update-hashes.py new file mode 100644 index 000000000..bb04d82be --- /dev/null +++ b/ci/files/update-hashes.py @@ -0,0 +1,70 @@ +import requests +import subprocess +import json +import sys +import os + + +class HashType: + def __init__(self, hashType, description, salted, slowHash): + self.hashType = hashType + self.description = description + self.salted = salted + self.slowHash = slowHash + + +url = "https://raw.githubusercontent.com/hashcat/hashcat/refs/tags/v7.0.0/docs/hashcat-example_hashes.md" +binary = sys.argv[1] # The hashcat binary is the first argument +if not os.path.isfile(binary): + print("usage: python3 update-hashes.py ") +args = [binary, "-m", "PLACEHOLDER", "--exam", "--machine-readable", "--quiet"] +new_hashtypes = [] + +response = requests.get(url) +response.raise_for_status() + +lines = response.text.splitlines() + +auth_uri = 'http://localhost:8080/api/v2/auth/token' +auth = ("admin", "hashtopolis") # default credentials +r = requests.post(auth_uri, auth=auth) +token = r.json()["token"] + +headers = { + 'Authorization': 'Bearer ' + token +} +url = "http://localhost:8080/api/v2/ui/hashtypes/" +print("Retrieving hashes from db please wait...") + +for line in lines[4:]: # skip first 4 header lines + splitted = line.split("|") + hashType = splitted[1].strip().strip("`") + description = splitted[2].strip().strip("`") + r = requests.get(url + hashType, headers=headers) + if (r.status_code != 200): + args[2] = hashType + hashcat_output = subprocess.run(args, stdout=subprocess.PIPE, stderr=subprocess.PIPE, text=True) + data = json.loads(hashcat_output.stdout) + slow_hash = data[hashType]["slow_hash"] + salted = data[hashType]["is_salted"] + new_hashtypes.append(HashType(hashType, description, salted, slow_hash)) +print("Finished retrieving hashes!") + +print("Add the following to the update script:") +print('if (!isset($PRESENT["PLACEHOLDER"])){') +print(" $hashTypes = [") +for hashType in new_hashtypes: + print(f' new HashType( {hashType.hashType}, "{hashType.description}", {int(hashType.salted)}, {int(hashType.slowHash)}),') +print(" ]") +print(' foreach ($hashtypes as $hashtype) {') +print(' $check = Factory::getHashTypeFactory()->get($hashtype->getId());') +print(' if ($check === null) {') +print(' Factory::getHashTypeFactory()->save($hashtype);') +print(' }') +print(' }') +print(' $EXECUTED["PLACEHOLDER"] = true;') +print('}') + +print("Add the following to the install script:") +for hashType in new_hashtypes: + print(f" ({hashType.hashType}, '{hashType.description}', {int(hashType.salted)}, {int(hashType.slowHash)}),") From 87aa54bd8e8efdd2e9bd40dafcbfca0697f984e4 Mon Sep 17 00:00:00 2001 From: jessevz Date: Thu, 7 Aug 2025 10:10:24 +0200 Subject: [PATCH 137/691] Make it possible for admin users to always see objects, regardless of the access group --- .../apiv2/common/AbstractModelAPI.class.php | 20 +++++++++++-------- 1 file changed, 12 insertions(+), 8 deletions(-) diff --git a/src/inc/apiv2/common/AbstractModelAPI.class.php b/src/inc/apiv2/common/AbstractModelAPI.class.php index b95f8fadf..d89bb1f35 100644 --- a/src/inc/apiv2/common/AbstractModelAPI.class.php +++ b/src/inc/apiv2/common/AbstractModelAPI.class.php @@ -408,7 +408,9 @@ protected function doFetch(string $pk, AbstractModelFactory $otherFactory = null if ($object === null) { throw new ResourceNotFoundError(); } - if ($otherFactory == null && $this->getSingleACL($this->getCurrentUser(), $object) === false) { + $group = Factory::getRightGroupFactory()->get($this->getCurrentUser()->getRightGroupId()); + if ($group->getPermissions() !== 'ALL' && $otherFactory == null && $this->getSingleACL($this->getCurrentUser(), + $object) === false) { throw new HttpForbidden("No access to this object!", 403); } @@ -614,13 +616,15 @@ public static function getManyResources(object $apiClass, Request $request, Resp /* Generate filters */ $filters = $apiClass->getFilters($request); $qFs_Filter = $apiClass->makeFilter($filters, $apiClass); - - $aFs_ACL = $apiClass->getFilterACL(); - if (isset($aFs_ACL[Factory::FILTER])) { - $qFs_Filter = array_merge($aFs_ACL[Factory::FILTER], $qFs_Filter); - } - if (isset($aFs_ACL[Factory::JOIN])) { - $aFs[Factory::JOIN] = $aFs_ACL[Factory::JOIN]; + $group = Factory::getRightGroupFactory()->get($apiClass->getCurrentUser()->getRightGroupId()); + if ($group->getPermissions() !== 'ALL') { // Only add permission filters when no admin user + $aFs_ACL = $apiClass->getFilterACL(); + if (isset($aFs_ACL[Factory::FILTER])) { + $qFs_Filter = array_merge($aFs_ACL[Factory::FILTER], $qFs_Filter); + } + if (isset($aFs_ACL[Factory::JOIN])) { + $aFs[Factory::JOIN] = $aFs_ACL[Factory::JOIN]; + } } if (count($qFs_Filter) > 0) { From ef1f29043a21c2746efb103cd2aa026952e577e8 Mon Sep 17 00:00:00 2001 From: gluafamichl <> Date: Thu, 14 Aug 2025 15:41:37 +0200 Subject: [PATCH 138/691] Add: security headers to apache config --- 000-default.conf | 9 +++++++++ Dockerfile | 7 ++++++- 2 files changed, 15 insertions(+), 1 deletion(-) diff --git a/000-default.conf b/000-default.conf index d94b1007e..4d870292f 100644 --- a/000-default.conf +++ b/000-default.conf @@ -11,4 +11,13 @@ Require all granted + Header always set Referrer-Policy "same-origin" + Header always set Feature-Policy "geolocation none;midi none;notifications none;push none;sync-xhr self;microphone none;camera none;magnetometer none;gyroscope none;speaker none;vibrate none;fullscreen self;payment none;" + Header always set Content-Security-Policy "frame-ancestors 'none';" + Header always set X-Frame-Options "DENY" + Header always set X-Content-Type-Options "nosniff" + Header always set X-XSS-Protection "1; mode=block" + Header always set Strict-Transport-Security "max-age=63072000; includeSubDomains; preload" + Header always set Cache-Control "no-cache, no-store, must-revalidate" + Header unset X-Powered-By diff --git a/Dockerfile b/Dockerfile index 7e9618e0c..d42b8068d 100644 --- a/Dockerfile +++ b/Dockerfile @@ -48,9 +48,14 @@ RUN apt-get update \ && curl -sS https://getcomposer.org/installer | php \ && mv composer.phar /usr/local/bin/composer \ # Enable URL rewriting using .htaccess - && a2enmod rewrite + && a2enmod rewrite \ + # Enable headers + && a2enmod headers RUN sed -i 's/KeepAliveTimeout 5/KeepAliveTimeout 10/' /etc/apache2/apache2.conf +RUN echo "ServerTokens Prod" >> /etc/apache2/apache2.conf \ + && echo "ServerSignature Off" >> /etc/apache2/apache2.conf + RUN mkdir -p ${HASHTOPOLIS_DOCUMENT_ROOT} \ && mkdir ${HASHTOPOLIS_DOCUMENT_ROOT}/../../.git/ \ From 8263e7cfa1befbd1737185c1d8bfc8eb61597888 Mon Sep 17 00:00:00 2001 From: gluafamichl <> Date: Thu, 14 Aug 2025 15:53:42 +0200 Subject: [PATCH 139/691] Mod: remove duplicate header --- 000-default.conf | 1 - 1 file changed, 1 deletion(-) diff --git a/000-default.conf b/000-default.conf index 4d870292f..526a4bc32 100644 --- a/000-default.conf +++ b/000-default.conf @@ -18,6 +18,5 @@ Header always set X-Content-Type-Options "nosniff" Header always set X-XSS-Protection "1; mode=block" Header always set Strict-Transport-Security "max-age=63072000; includeSubDomains; preload" - Header always set Cache-Control "no-cache, no-store, must-revalidate" Header unset X-Powered-By From 020cf75a27a90fbd3d46f949daf23facc24f1264 Mon Sep 17 00:00:00 2001 From: coiseiw Date: Mon, 18 Aug 2025 17:56:16 +0200 Subject: [PATCH 140/691] Adding a new question in the FAQ --- doc/faq_tips/faq.md | 72 +++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 72 insertions(+) diff --git a/doc/faq_tips/faq.md b/doc/faq_tips/faq.md index 595bfc033..6db0cb76a 100644 --- a/doc/faq_tips/faq.md +++ b/doc/faq_tips/faq.md @@ -323,6 +323,78 @@ This lets you debug API interactions manually without needing a live cracking jo +❓ PHP Fatal error:  Allowed memory size of 268435456 bytes exhausted - What can I do now? + + +This guide shows how to raise PHP's memory limit in a Dockerized setup using a `custom.ini` file mounted into the PHP container. It also includes example `docker-compose.yml` snippets for common images. + +1) **Create `custom.ini` next to your `docker-compose.yml`** + +Add your PHP overrides (uppercase `M` is conventional, PHP is case-insensitive here): + + +```ini + +; custom.ini + +memory_limit = 256M + +upload_max_filesize = 256M + +max_execution_time = 60 + +``` + +- Adjust `memory_limit` to your needs (e.g., `512M`, `1G`). + +- The other two values are optional and not directly related to the memory issue. + + 2) **Mount `custom.ini` into the PHP container** + + Add this to your **backend** service’s `volumes:` list in `docker-compose.yml`: + + +```yaml + +- ./custom.ini:/usr/local/etc/php/conf.d/custom.ini + +``` + + +> The path `/usr/local/etc/php/conf.d/` is correct for official PHP images (`php:*`). + + + + 3) **Recreate or restart the container** + +Make sure the container reloads the INI: + + + +```bash + +# Start or recreate after changes + +docker compose up -d + + + +# or, if the stack is already running and only the ini changed: + +docker compose restart backend + +``` + + +**Done!** Your PHP container will now use the memory settings from `custom.ini`. + + + + +--- + + + ## Hashcat Questions From 7903ed680d2a2a17ab467d7b0492e0041a80153f Mon Sep 17 00:00:00 2001 From: Sein Coray Date: Tue, 19 Aug 2025 14:19:09 +0200 Subject: [PATCH 141/691] Update docker-entrypoint.sh (#1514) * Update docker-entrypoint.sh Within newest debian docker image updates, mariadb client was updated from 10 to 11 where ssl verify by default is enabled, causing this test to fail. * add --skip-ssl also for test backup * workaround to fix test failing due to bug in apache2 not using deflate properly --- ci/HashtopolisTestFramework.class.php | 4 ++-- ci/apiv2/hashtopolis.py | 2 +- docker-entrypoint.sh | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/ci/HashtopolisTestFramework.class.php b/ci/HashtopolisTestFramework.class.php index c67afe681..89325ff2d 100644 --- a/ci/HashtopolisTestFramework.class.php +++ b/ci/HashtopolisTestFramework.class.php @@ -73,7 +73,7 @@ private function backupDatabase() { HashtopolisTestFramework::log(HashtopolisTestFramework::LOG_INFO, "Backup database to " . $this->dbBackupFile . "..."); // Note that the '-y' option avoids requirement on 'PROCESS' privilege for the 'hashtopolis' user! - exec("mysqldump hashtopolis -y -h".$CONN['server'] . " -P".$CONN['port'] . " -u".$CONN['user'] . " -p".$CONN['pass'] ." > " . $this->dbBackupFile, $output, $status); + exec("mysqldump hashtopolis -y -h".$CONN['server'] . " -P".$CONN['port'] . " -u".$CONN['user'] . " -p".$CONN['pass'] ." --skip-ssl > " . $this->dbBackupFile, $output, $status); if ($status != 0) { $this->dbBackupFile = ""; @@ -191,4 +191,4 @@ public static function reportTestSummary() { } } } -} \ No newline at end of file +} diff --git a/ci/apiv2/hashtopolis.py b/ci/apiv2/hashtopolis.py index a7d66b5b8..211b5c815 100644 --- a/ci/apiv2/hashtopolis.py +++ b/ci/apiv2/hashtopolis.py @@ -912,7 +912,7 @@ def __init__(self): def get_meta(self): self.authenticate() uri = self._api_endpoint + self._model_uri - r = requests.get(uri) + r = requests.get(uri, headers={"Accept-Encoding": "gzip"}) self.validate_status_code(r, [200], "Unable to retrieve Meta definitions") return self.resp_to_json(r) diff --git a/docker-entrypoint.sh b/docker-entrypoint.sh index 7bed554f6..ac7a2cde4 100755 --- a/docker-entrypoint.sh +++ b/docker-entrypoint.sh @@ -11,7 +11,7 @@ for path in ${paths[@]}; do done echo "Testing database." -MYSQL="mysql -u${HASHTOPOLIS_DB_USER} -p${HASHTOPOLIS_DB_PASS} -h ${HASHTOPOLIS_DB_HOST}" +MYSQL="mysql -u${HASHTOPOLIS_DB_USER} -p${HASHTOPOLIS_DB_PASS} -h ${HASHTOPOLIS_DB_HOST} --skip-ssl" $MYSQL -e "SELECT 1" > /dev/null 2>&1 ERROR=$? From 9b812b6f0fcf4af32878ed4ca9497f2210a203dc Mon Sep 17 00:00:00 2001 From: gluafamichl <> Date: Tue, 19 Aug 2025 14:21:10 +0200 Subject: [PATCH 142/691] Mod: remove Strict Transport header --- 000-default.conf | 1 - 1 file changed, 1 deletion(-) diff --git a/000-default.conf b/000-default.conf index 526a4bc32..dd2b8133e 100644 --- a/000-default.conf +++ b/000-default.conf @@ -17,6 +17,5 @@ Header always set X-Frame-Options "DENY" Header always set X-Content-Type-Options "nosniff" Header always set X-XSS-Protection "1; mode=block" - Header always set Strict-Transport-Security "max-age=63072000; includeSubDomains; preload" Header unset X-Powered-By From afffb24f71a1b48bdcdba298f8fa704fc5b03c47 Mon Sep 17 00:00:00 2001 From: coiseiw <46989280+coiseiw@users.noreply.github.com> Date: Tue, 19 Aug 2025 14:57:19 +0200 Subject: [PATCH 143/691] Rename Upload_url.png to upload_url.png Updating filename for the reference in the docs --- .../images/{Upload_url.png => upload_url.png} | Bin 1 file changed, 0 insertions(+), 0 deletions(-) rename doc/assets/images/{Upload_url.png => upload_url.png} (100%) diff --git a/doc/assets/images/Upload_url.png b/doc/assets/images/upload_url.png similarity index 100% rename from doc/assets/images/Upload_url.png rename to doc/assets/images/upload_url.png From c238878bd5658ff049a3c03b153706c846011ae4 Mon Sep 17 00:00:00 2001 From: Sein Coray Date: Tue, 19 Aug 2025 15:03:45 +0200 Subject: [PATCH 144/691] add fetch-depth: 0 for checkout to be on the safe side and get rid of building warnings --- .github/workflows/docs.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.github/workflows/docs.yml b/.github/workflows/docs.yml index 9646c0358..f57172941 100644 --- a/.github/workflows/docs.yml +++ b/.github/workflows/docs.yml @@ -11,6 +11,8 @@ jobs: steps: - name: Check out the repository uses: actions/checkout@v4 + with: + fetch-depth: 0 - name: Set up Python uses: actions/setup-python@v5 with: From be0dfc73a19db3061850ae7c8d800c588680fb69 Mon Sep 17 00:00:00 2001 From: Sein Coray Date: Tue, 19 Aug 2025 15:23:10 +0200 Subject: [PATCH 145/691] changed github action branch for docs to 'dev' --- .github/workflows/docs.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/docs.yml b/.github/workflows/docs.yml index f57172941..8a00bf9e5 100644 --- a/.github/workflows/docs.yml +++ b/.github/workflows/docs.yml @@ -3,7 +3,7 @@ name: Generate MkDocs and upload on: push: branches: - - docs + - dev jobs: build: runs-on: ubuntu-latest From e5aaf90724ba8dd8503ee1e2ec54b081aee67073 Mon Sep 17 00:00:00 2001 From: Sein Coray Date: Tue, 19 Aug 2025 16:22:41 +0200 Subject: [PATCH 146/691] restored main README.md and shortened it to key points --- README.md | 36 ++++++++++++++++++++++++++++++++++++ 1 file changed, 36 insertions(+) create mode 100644 README.md diff --git a/README.md b/README.md new file mode 100644 index 000000000..66b620090 --- /dev/null +++ b/README.md @@ -0,0 +1,36 @@ +# Hashtopolis + +Hashtopolis + +[![CodeFactor](https://www.codefactor.io/repository/github/hashtopolis/server/badge)](https://www.codefactor.io/repository/github/hashtopolis/server) +[![LoC](https://tokei.rs/b1/github/hashtopolis/server?category=code)](https://github.com/hashtopolis/server) +[![Hashtopolis Build](https://github.com/hashtopolis/server/actions/workflows/ci.yml/badge.svg)](https://github.com/hashtopolis/server) + +Hashtopolis is a multi-platform client-server tool for distributing hashcat tasks to multiple computers. The main goals for Hashtopolis's development are portability, robustness, multi-user support, and multiple groups management. + +To report a bug, please create an issue and try to describe the problem as accurately as possible. This helps us to identify the bug and see if it is reproducible. + +In an effort to make the Hashtopussy project conform to a more politically neutral name it was rebranded to "Hashtopolis" in March 2018. + +## Setup and Usage + +Please consult the [documentation](https://docs.hashtopolis.org) for more information on setup, upgrade and usage. + +## Contribution Guidelines + +We are open to all kinds of contributions. If it's a bug fix or a new feature, feel free to create a pull request. Please consider some points: + +* Just include one feature or one bugfix in one pull request. In case you have two new features please also create two pull requests. +* Try to stick with the code style used (especially in the PHP parts). IntelliJ/PHPStorm users can get a code style XML [here](https://gist.github.com/s3inlc/226ed78b05eb6dc8f60f18d6fd310d74). + +The pull request will then be reviewed by at least one member and merged after approval. Don't be discouraged just because the first review is not approved, often these are just small changes. + +## Thanks + +* winxp5421 for testing, writing help texts and a lot of input ideas +* blazer for working on the csharp agent and hops for working on the python agent +* Cynosure Prime for testing +* atom for [hashcat](https://github.com/hashcat/hashcat) +* curlyboi for the original [Hashtopus](https://github.com/curlyboi/hashtopus) code +* 7zip binaries are compiled from [here](https://sourceforge.net/projects/sevenzip/files/7-Zip/16.04/) +* uftp binaries are compiled from [here](http://uftp-multicast.sourceforge.net/) From e5db5e1f4659c9475fc17964c70eea24bbe6d711 Mon Sep 17 00:00:00 2001 From: Sein Coray Date: Wed, 20 Aug 2025 09:33:22 +0200 Subject: [PATCH 147/691] added workflow only build the docs on pull requests to see issues before merging --- .github/workflows/docs-build.yml | 44 ++++++++++++++++++++++++++++++++ 1 file changed, 44 insertions(+) create mode 100644 .github/workflows/docs-build.yml diff --git a/.github/workflows/docs-build.yml b/.github/workflows/docs-build.yml new file mode 100644 index 000000000..5d9d5c4e4 --- /dev/null +++ b/.github/workflows/docs-build.yml @@ -0,0 +1,44 @@ +name: Generate MkDocs and upload + +on: + pull_request: + branches: ["dev"] + +jobs: + build: + runs-on: ubuntu-latest + + steps: + - name: Check out the repository + uses: actions/checkout@v4 + with: + fetch-depth: 0 + - name: Set up Python + uses: actions/setup-python@v5 + with: + python-version: "3.10" + - name: Install dependencies + run: | + python -m pip install --upgrade pip + pip install mkdocs + pip3 install $(mkdocs get-deps) + sudo apt-get update + sudo apt-get install php + sudo apt-get install -y lftp + sudo apt-get install nodejs + sudo apt-get install npm + sudo npm i openapi-to-md -g + - name: Start Hashtopolis server + uses: ./.github/actions/start-hashtopolis + - name: Download newest apiv2 spec + run: | + wget http://localhost:8080/api/v2/openapi.json -P /tmp/ + cat /tmp/openapi.json + openapi-to-md /tmp/openapi.json ./doc/api/ + - name: Create function level documentation with phpdocumentor + run: | + wget https://phpdoc.org/phpDocumentor.phar -P /tmp/ + sudo php /tmp/phpDocumentor.phar --ignore vendor/ -d . -t ./doc/php-documentor/ + - name: Build MkDocs site + run: | + mkdocs build From add0204a487bae0a858fbf6d0e65d1c638016568 Mon Sep 17 00:00:00 2001 From: Sein Coray Date: Wed, 20 Aug 2025 09:34:45 +0200 Subject: [PATCH 148/691] adjusted workflow name --- .github/workflows/docs-build.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/docs-build.yml b/.github/workflows/docs-build.yml index 5d9d5c4e4..2d594fef4 100644 --- a/.github/workflows/docs-build.yml +++ b/.github/workflows/docs-build.yml @@ -1,4 +1,4 @@ -name: Generate MkDocs and upload +name: Generate MkDocs on: pull_request: From 2e167a6f72b80dd032928753db46b11e6c36bea9 Mon Sep 17 00:00:00 2001 From: Sein Coray Date: Wed, 20 Aug 2025 09:43:22 +0200 Subject: [PATCH 149/691] remove trailing space Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com> --- .github/workflows/docs-build.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/docs-build.yml b/.github/workflows/docs-build.yml index 2d594fef4..3c384247c 100644 --- a/.github/workflows/docs-build.yml +++ b/.github/workflows/docs-build.yml @@ -26,7 +26,7 @@ jobs: sudo apt-get install php sudo apt-get install -y lftp sudo apt-get install nodejs - sudo apt-get install npm + sudo apt-get install npm sudo npm i openapi-to-md -g - name: Start Hashtopolis server uses: ./.github/actions/start-hashtopolis From c0e6488434c022c1d777f6ba5b9c3aaf2822d939 Mon Sep 17 00:00:00 2001 From: coiseiw <46989280+coiseiw@users.noreply.github.com> Date: Wed, 20 Aug 2025 10:30:01 +0200 Subject: [PATCH 150/691] Docs fix (#1517) * Changes in editing style for changelog and FAQ. Changing also the answer to the installation question in the FAQ. * Moving the footer.html page inside the doc folder. * added consistent line breaking between versions * removed leftover file * Update doc/faq_tips/faq.md --------- Co-authored-by: Sein Coray Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com> --- doc/changelog.md | 194 ++++++++++-------- doc/faq_tips/faq.md | 56 +++-- .../overrides}/partials/footer.html | 0 doc/user_manual/crackers_binary.md | 2 +- mkdocs.yml | 2 +- output.png | Bin 6741 -> 0 bytes 6 files changed, 141 insertions(+), 113 deletions(-) rename {overrides => doc/overrides}/partials/footer.html (100%) delete mode 100644 output.png diff --git a/doc/changelog.md b/doc/changelog.md index cbcb09ab9..e410082ba 100644 --- a/doc/changelog.md +++ b/doc/changelog.md @@ -1,27 +1,31 @@ # Changelog -# v0.14.4 -> vx.x.x -# Enhancements +## v0.14.4 -> vx.x.x + +**Enhancements** - Updated OpenAPI docs to latest API updates -# v0.14.3 -> v0.14.4 -## Enhancements +## v0.14.3 -> v0.14.4 + +**Enhancements** - Use utf8mb4 as default encoding in order to support the full unicode range - Log hashes when they are skipped. This way the administrator can detect when Hashcat rebuilds the hashes incorrectly -## Bugfixes +**Bugfixes** - Fixed a bug where creating a new preprocessor would copy the configured limit command over the configured skip command - Implemented sending emails inside docker container -# v0.14.2 -> v0.14.3 -## Tech Preview New API +## v0.14.2 -> v0.14.3 + +**Tech Preview New API** + Release 0.14.3 comes with an update to the tech preview of the new API. Be aware, it is a preview, it contains bugs and it will change; To use it, please see https://github.com/hashtopolis/server/wiki/Installation. Changes/Bugfixes on new UI: @@ -35,66 +39,76 @@ Changes/Bugfixes on new UI: - The hashlists are now displayed correctly according to the tasks on the tasks page - Encoding bug fixed, Unicode characters were displayed incorrectly -## Bugfixes +**Bugfixes** - Fixed a bug in the user API where a hash in binary format did not return the plain text when cracked - Increase the limit of the attack command length -# v0.14.1 -> v0.14.2 +## v0.14.1 -> v0.14.2 + +**Tech Preview New API** -## Tech Preview New API Release 0.14.2 comes with an update to the tech preview of APIv2. Be aware, it is a preview, it contains bugs and it will change; To use it, please see https://github.com/hashtopolis/server/wiki/Installation. -## Bugfixes +**Bugfixes** + - Setting maxAgent after creating doesn't update the maxAgents of the taskwrapper. This only causes issues when the maxAgents was set at creation time. #1013 -# v0.14.0 -> v0.14.1 +## v0.14.0 -> v0.14.1 + +**Tech Preview New API** -## Tech Preview New API Release 0.14.1 comes with an update to the tech preview of APIv2. Be aware, it is a preview, it contains bugs and it will change; To use it, please see https://github.com/hashtopolis/server/wiki/Installation. -## Bugfixes +**Bugfixes** + - Clicking pretask in Supertask create screen now directs correctly to the pretask and not a task with the same id (#945) - Pretask attackCmd parameter was not checked for maximum length of 256 on creation (#963) - Creating supertask fails when provided crackerType != pretask.crackerType (#969) - Searching for hashes and plaintext now also searches non archived hashlists (#974) -## New feature +**Features** + - Number of agents per supertask/taskwrapper can be limited (#769). -# v0.13.1 -> v0.14.0 +## v0.13.1 -> v0.14.0 + +**Tech Preview New API** -## Tech Preview New API Release 0.14.0 comes with a tech preview of APIv2. This is the starting point of the seperating of the frontend and the backend and gives insight into what the future brings for Hashtopolis. We invite you to test it with the new web-ui and provide us with feedback. Be aware, it is a preview, it contains bugs and it will change; also it does not contain any permission checking. To use it, please see https://github.com/hashtopolis/server/wiki/Installation. -## Default installation method changed to Dockerimage +**Default installation method changed to Dockerimage** + With the release 0.14.0 the default installation method changed to Docker. Docker images are now available at https://hub.docker.com/u/hashtopolis -## Bugfixes +**Bugfixes** + - Setting 'Salt is in hex' during Hashlist creation will not set the --hex-salt flag (#892) -# v0.13.0 -> v0.13.1 -## Bugfixes +## v0.13.0 -> v0.13.1 + +**Bugfixes** - When deleting a supertask that was created from an import, pretasks that were removed from this supertask should also be deleted (issue #865). - Setting config values to false using the user API now works as intended. - When using the rulesplit function an internal server error was thrown. (#836) - Deleting the last Hashlist resulted in an fatal error issue #888. -## Enhancements +**Enhancements** - Hash.hash is now of type MEDIUMTEXT to avoid issues with longer hashes (e.g. LUKS, issue #851). -# v0.12.0 -> v0.13.0 -## Features +## v0.12.0 -> v0.13.0 + +**Features** - Added monitoring of CPU utilization of agents. - Cracked hashes for all hashlists can be shown together (caution: only use when having smaller hashlists). @@ -106,7 +120,7 @@ With the release 0.14.0 the default installation method changed to Docker. Docke - Added hashtype dropdown autocompletion for creating new hashlists (pull request #781). - Allow agents to register as CPU agents only (feature request #805). -## Bugfixes +**Bugfixes** - Fixed search hash function. - Fixed possible path traversal vulnerability on filename check. @@ -130,7 +144,7 @@ With the release 0.14.0 the default installation method changed to Docker. Docke - Added check for max length of the attack command (issue #668). - Fixed missing flag isArchived on User API getTask requests (issue #794). -## Enhancements +**Enhancements** - Cracker version and name are shown on task details. - Task notes and cracker version are copied. @@ -145,14 +159,15 @@ With the release 0.14.0 the default installation method changed to Docker. Docke - Agents overview page and agent detail page now show counter for repeating devices. - Increase size of database column for storing agentstats. -# v0.11.0 -> v0.12.0 -## Features +## v0.11.0 -> v0.12.0 + +**Features** - Generic preprocessor integration to allow inclusion of any preprocessor supporting chunking. - Dark mode added. -## Bugfixes +**Bugfixes** - Fixed increasing the superhashlist cracked count if there are cracks running one of the hashlists alone. - Fixed hidden superhashlists on task creation page due to filtering. @@ -162,7 +177,7 @@ With the release 0.14.0 the default installation method changed to Docker. Docke - Fixed discord notification to work again. - Fixed missing index structure on speed measurements table. -## Enhancements +**Enhancements** - Agents can be assigned to tasks via user API. - Server can be configured to provide 'isComplete' flag on the user API when requesting all tasks. @@ -176,9 +191,10 @@ With the release 0.14.0 the default installation method changed to Docker. Docke - Adjusted to new format of Hashcat printing cracked WPA hashes. - Adjusted to PMKID handling of Hashcat. -# v0.10.1 -> v0.11.0 -## Bugfixes +## v0.10.1 -> v0.11.0 + +**Bugfixes** - Fixed wrong task speed summation for task overview page. - Fixed error on hashlist hash retrieval. @@ -191,7 +207,7 @@ With the release 0.14.0 the default installation method changed to Docker. Docke - Fixed missing update of cracked count for superhashlists. - Fixed listing of hashlists and hashes of lists which should not be accessible by user. -## Enhancements +**Enhancements** - Temperature and util thresholds for agent status page can be configured. - User API can provide all cracks for a given task. @@ -199,18 +215,20 @@ With the release 0.14.0 the default installation method changed to Docker. Docke - User API can provide all cracks for a given hashlist. - Support for new Hashcat versions without 32/64-bit naming. -# v0.10.0 -> v0.10.1 -## Bugfixes +## v0.10.0 -> v0.10.1 + +**Bugfixes** - Fixed createHashlist API call with wrong brain parameter conversion. - Fixed createUser API call with wrong amount of parameters. - Fixed applying supertasks directly from hashlist view. - Fixed wrong saving of build number if it didn't exist. -# v0.9.0 -> v0.10.0 -## Features +## v0.9.0 -> v0.10.0 + +**Features** - Integration of Hashcat Brain feature. - Speed data is kept and can be shown in graphs for tasks. @@ -218,20 +236,21 @@ With the release 0.14.0 the default installation method changed to Docker. Docke - Agent updates can now automatically be retrieved, based on selected update track. - Update scripts in the future can be handled differently. Applying updates is easier as there is a build number. -## Bugfixes +**Bugfixes** - Fixed wrong percentage in case of big tasks where percentage was close to 0. - Rule splitting can only happen if at least two subparts get created afterwards. - Fixed filesize calculation for temporary files after rule splitting. -## Enhancements +**Enhancements** - In case of client errors the corresponding chunk now also is saved if available. - Make more clear naming on rule splitting tasks, rules have an empty line at the end to increase readability. -# v0.8.0 -> v0.9.0 -## Features +## v0.8.0 -> v0.9.0 + +**Features** - The server saves the crackpos for hash founds given by hashcat. - Trimming of chunks can be disabled so a chunk is always run fully again (or splitted if it is too large). @@ -241,13 +260,13 @@ With the release 0.14.0 the default installation method changed to Docker. Docke - Slow hashes are marked, so the client can decide if piping could make sense for this hash type. - Agents can run health checks to determine if all agents are running correctly. -## Bugfixes +**Bugfixes** - Fixed GPU data graph when having multiple agents. - Fixed assignment issue with subtasks of supertasks if they were in the same supertask. - Fixed that cracker types cannot be deleted when there are supertasks using this type. -## Enhancements +**Enhancements** - Telegram notifications can now completely be configured via server config and also can be used through proxies. - Peppers of Encryption.class.php and CSRF.class.php were moved out of the files to make updating easier. @@ -257,9 +276,10 @@ With the release 0.14.0 the default installation method changed to Docker. Docke - Preconfigured task attack commands can be edited after creation. - If needed it can be set that the server should also distribute tasks with priority 0. -# v0.7.1 -> v0.8.0 -## Features +## v0.7.1 -> v0.8.0 + +**Features** - The server can store sent debug output from Hashcat sent by the agent. - Files now also are associated to an Access Group to control the visibility of files. @@ -272,14 +292,14 @@ With the release 0.14.0 the default installation method changed to Docker. Docke - To make sure rules are applied before rejecting, piping can be enforced. - Added Notification type for Slack. -## Enhancements +**Enhancements** - Task attack commands can be changed after creation, e.g. to fix typos - Switch between tasks and archived ones is easier - Archived tasks can be deleted at once - Task priority can now be set directly in the task creation form. -## Bugfixes +**Bugfixes** - New task creation page now also shows the other file type. - New file creation with the user API now takes the right file type. @@ -287,9 +307,10 @@ With the release 0.14.0 the default installation method changed to Docker. Docke - Disabling rule splitting when having a prince task. - Fixed non-working secret checkbox for hashlists. -# v0.7.0 -> v0.7.1 -## Bugfixes +## v0.7.0 -> v0.7.1 + +**Bugfixes** - Fixed permission check for file downloads with URLs from the user API - Fixed issue with creating supertasks from preconfigured task list @@ -297,9 +318,10 @@ With the release 0.14.0 the default installation method changed to Docker. Docke - Fixed mask import - Fixed hiding of mask imports in preconfigured task list on hashlist page -# v0.6.0 -> v0.7.0 -## Features +## v0.6.0 -> v0.7.0 + +**Features** - Tasks which are recognized containing large rule files and not giving good benchmarks result in splitting into subtasks - Most of the tables can now be easily ordered and searched with the datatables plugin @@ -309,35 +331,37 @@ With the release 0.14.0 the default installation method changed to Docker. Docke - File types can be edited of existing files. - Tasks can now be archived instead of being deleted. -## Enhancements +**Enhancements** - Width of the container is increased to have more space on large screens. - Standard buttons have now icons instead of text to use less space. - Hashcat is configured already as crack to make it easier for users to get started. -## Bugfixes +**Bugfixes** - Using correct function to get superhashlistId on zapping from webinterface. - Zapping from the website will now also issue zaps for non-salted hashlists. - Fixed zapping querying on progress sending from agent to also match for agent null values. -# v0.5.1 -> v0.6.0 -## Features +## v0.5.1 -> v0.6.0 + +**Features** - Added autofocus for login field - Added fine grained permission management - Updated Bootstrap and jQuery to newest versions - Added Icons instead of images -## Bugfixes +**Bugfixes** - Export of founds of binary hashlists fixed - DB Connection check during installation is now tested correctly -# v0.5.0 -> v0.5.1 -## Bugfixes +## v0.5.0 -> v0.5.1 + +**Bugfixes** - Fixed missing file assignments when applying preconfigured tasks from hashlists view (issue #354) - Fixed cracker binary relation error when applying supertasks from hashlist view @@ -347,9 +371,10 @@ With the release 0.14.0 the default installation method changed to Docker. Docke - Fixed renaming of files which allowed renaming them to other directories and execute them - Fixed renaming/uploading of files which allowed to override hidden files (e.g. .htaccess file) -# v0.4.3 -> v0.5.0 -## Large Update +## v0.4.3 -> v0.5.0 + +**Large Update** - Complete task management backend rewritten - Improved performance when handling cracked hashes @@ -359,11 +384,11 @@ With the release 0.14.0 the default installation method changed to Docker. Docke - More configuration options added - Cracker version management changed -## New Features +**Features** - Tasks now have a cracks per minute performance based on total spent time -## Bugfixes +**Bugfixes** - Fixed dependency problem on user deletion - Fixed issue when agents got deleted which had completed at least one chunk @@ -371,36 +396,38 @@ With the release 0.14.0 the default installation method changed to Docker. Docke - Fixed ETA and spent time for tasks - Error message which was always shown when adding new hash types fixed -# v0.4.2 -> v0.4.3 -## New Features +## v0.4.2 -> v0.4.3 + +**Features** - Added telegram bot notification - Supertasks can now also be applied when viewing hashlist details (similar to preconfigured tasks) -## Bugfixes +**Bugfixes** - Notification display fixed - Updated problem where agents were looping when tasks go over 100% -## Technical +**Technical** - Fixed warnings during found import - Fixed edge case where it could happen that agents started to loop after a task when no new task was available - Pre-crack import warns when too long plaintexts are in the import file - Implemented missing ownAgentError notification execution -# v0.4.1 -> v0.4.2 -## New Features +## v0.4.1 -> v0.4.2 + +**Features** - Supertask imports can now be set to be small tasks for every subtask -## Bugfixes +**Bugfixes** - Fixed broken agent download -## Technical +**Technical** - Typos in constants fixed - Tasks can also be deleted from the detailed view @@ -410,19 +437,21 @@ With the release 0.14.0 the default installation method changed to Docker. Docke - Fixed additional vulnerabilities reported - Fixed remaining fragments when deleting finished supertasks -# v0.4.0 -> v0.4.1 -## Bugfixes +## v0.4.0 -> v0.4.1 + +**Bugfixes** - Various vulnerabilities (CVE-2017-11680, CVE-2017-11681, CVE-2017-11682) fixed, see [issue #241](https://github.com/hashtopolis/server/issues/241) -## Technical +**Technical** - Improved code handling, constants can be used in templates. -# v0.3.2 -> v0.4.0 -## New Features +## v0.3.2 -> v0.4.0 + +**Features** - Renewed status page, gives now JSON formatted information which can be parsed however the user wants to. - added search page to search for hashes and plains @@ -433,7 +462,7 @@ With the release 0.14.0 the default installation method changed to Docker. Docke - Supertasks added - HCmask style can be imported -## Technical +**Technical** - DB connection details now are stored in a file which is not in repository (a template is provided instead). This avoids conflicts on updates in `inc/load.php` - Hash length is increased to 1024 (old 512) @@ -441,7 +470,7 @@ With the release 0.14.0 the default installation method changed to Docker. Docke - Added new hashtypes from Hashcat - Server hostname can be overridden in config -## Client +**Client** - Client updated to version 0.43.19 - Fixed debug not showing hashcat parameters on calls @@ -450,13 +479,14 @@ With the release 0.14.0 the default installation method changed to Docker. Docke - Fixed slow file downloading issue - Changed the way hashcat version is queried (should work properly on linux/mac) -# v0.3.1 -> v0.3.2 -## Client +## v0.3.1 -> v0.3.2 + +**Client** - Client updated to version 0.43.13 -## Bugfixes +**Bugfixes** - fixed not sending notifications when using pre-task creation from hashlist details view - 'Delete Finished' button now deletes also tasks of hashlists which are completely cracked @@ -466,12 +496,12 @@ With the release 0.14.0 the default installation method changed to Docker. Docke - fixed problem that on small tasks multiple agents got assigned and assignments were deleted immediately - fixed issue that some agents suddenly got a very large chunk -## Features +**Features** - Added possibility to change isCpuOnly and isSmall on tasks after creation - DB details are now saved separately to the other loading part, so conflicts on updates are avoided -## Technical +**Technical** - removed old installation code which was used to upgrade Hashtopus to Hashtopolis 0.1.0 - reduced size of task progress image diff --git a/doc/faq_tips/faq.md b/doc/faq_tips/faq.md index 6db0cb76a..441295388 100644 --- a/doc/faq_tips/faq.md +++ b/doc/faq_tips/faq.md @@ -4,17 +4,15 @@ -❓ How do I install Hashtopolis? +❓ How do I install Hashtopolis? -**Answer**: To install Hashtopolis, you typically clone the GitHub repository, configure the backend using Apache/PHP/MySQL, and set up the frontend via a web browser. For step-by-step instructions, refer to the official documentation. Make sure your system meets the minimum requirements (Linux server, PHP 7.4+, MySQL/MariaDB, Apache/Nginx). - - +**Answer**: The easiest way to install Hashtopolis is with the Docker images that can be retrieved from the [Docker Hub](https://hub.docker.com/u/hashtopolis). Follow the instructions from the [documentation](../installation_guidelines/basic_install.md). --- -❓ Can I run Hashtopolis on a server already running something else (e.g. Homebridge)? +❓ Can I run Hashtopolis on a server already running something else (e.g. Homebridge)? **Answer**: Yes, as long as the server has enough resources. @@ -24,7 +22,7 @@ -❓ How do I make the agent start automatically on Ubuntu? +❓ How do I make the agent start automatically on Ubuntu? **Answer**: To auto-start the agent on boot, create a `systemd` service file in `/etc/systemd/system/hashtopolis-agent.service` that runs the agent script with Python. Enable it using `systemctl enable hashtopolis-agent` and start it with `systemctl start hashtopolis-agent`. Ensure your agent configuration (`config.json`) is correctly set before enabling. @@ -34,7 +32,7 @@ -❓ How can I mount folders (import, files, binaries) to a local directory instead of using a Docker volume? +❓ How can I mount folders (import, files, binaries) to a local directory instead of using a Docker volume? **Answer**: By default (when using the standard `docker-compose` setup), Hashtopolis stores folders like `import`, `files`, and `binaries` in a Docker volume. You can list this volume using `docker volume ls` and access it inside the container at `/usr/local/share/hashtopolis`. @@ -113,7 +111,7 @@ Finally, copy your data back into the corresponding folders. -❓ How can I debug MySQL queries? +❓ How can I debug MySQL queries? **Answer**: If you're encountering unusual issues and want to understand what queries Hashtopolis is executing on the database, you can enable query logging in MySQL. @@ -139,7 +137,7 @@ This enables the general query log, which logs all incoming SQL statements. You -❓ Why does Hashtopolis fail and how can I debug errors? +❓ Why does Hashtopolis fail and how can I debug errors? **Answer**: Troubleshooting Hashtopolis can sometimes be challenging. A common error you might encounter is: @@ -191,7 +189,7 @@ This should help reveal any specific errors or misconfigurations in the command -❓ Can I fake an agent for debugging the server API? +❓ Can I fake an agent for debugging the server API? **Answer**: Yes, you can simulate an agent to test how the Hashtopolis server API behaves. This is especially useful for replicating hard-to-reproduce production issues. @@ -269,7 +267,7 @@ This lets you debug API interactions manually without needing a live cracking jo -❓ Is internet access required to run Hashtopolis? +❓ Is internet access required to run Hashtopolis? **Answer**: No. @@ -279,7 +277,7 @@ This lets you debug API interactions manually without needing a live cracking jo -❓ Can I run Hashtopolis on ARM (e.g., Raspberry Pi)? +❓ Can I run Hashtopolis on ARM (e.g., Raspberry Pi)? **Answer**: Not officially supported. ARM builds must be custom-built. @@ -293,7 +291,7 @@ This lets you debug API interactions manually without needing a live cracking jo -❓ Why does Apache show only a directory or a 500 error? +❓ Why does Apache show only a directory or a 500 error? **Answer**: A 500 error or directory index display usually indicates PHP is either not installed, disabled, or misconfigured. Ensure that `libapache2-mod-php` is installed and enabled. Also, verify that your `php.ini` and `.htaccess` files don't contain invalid directives. Check Apache error logs at `/var/log/apache2/error.log` for more specific issues. @@ -303,7 +301,7 @@ This lets you debug API interactions manually without needing a live cracking jo -❓ How to fix a failed first login in Docker? +❓ How to fix a failed first login in Docker? **Answer**: Check if the backend logs show “initialization successful”. Docker environment variables must be set correctly. @@ -313,7 +311,7 @@ This lets you debug API interactions manually without needing a live cracking jo -❓ How to upgrade Hashtopolis without data loss? +❓ How to upgrade Hashtopolis without data loss? **Answer**: Back up the database, pull the latest version from Git, and apply the update through the upgrade feature. @@ -323,7 +321,7 @@ This lets you debug API interactions manually without needing a live cracking jo -❓ PHP Fatal error:  Allowed memory size of 268435456 bytes exhausted - What can I do now? +❓ PHP Fatal error:  Allowed memory size of 268435456 bytes exhausted - What can I do now? This guide shows how to raise PHP's memory limit in a Dockerized setup using a `custom.ini` file mounted into the PHP container. It also includes example `docker-compose.yml` snippets for common images. @@ -399,7 +397,7 @@ docker compose restart backend -❓ Is `--increment` supported? +❓ Is `--increment` supported? **Answer**: No, not directly. Workaround: create individual masks or use “Import Supertask” for manual mask input. @@ -409,7 +407,7 @@ docker compose restart backend -❓ Can Hashtopolis use custom Hashcat builds? +❓ Can Hashtopolis use custom Hashcat builds? **Answer**: Yes, upload them through the admin interface as separate binaries. @@ -419,7 +417,7 @@ docker compose restart backend -❓ What if a client only uses one of multiple GPUs? +❓ What if a client only uses one of multiple GPUs? **Answer**: This is likely due to small chunk size or a single hash. Larger workloads will utilize more GPUs. @@ -429,7 +427,7 @@ docker compose restart backend -❓ How do you deal with huge wordlists (e.g. 20–50 GB)? +❓ How do you deal with huge wordlists (e.g. 20–50 GB)? **Answer**: Split files, SCP them to the server or serve them via Python’s HTTP server. @@ -443,7 +441,7 @@ docker compose restart backend -❓ How are tasks split across clients? +❓ How are tasks split across clients? **Answer**: Based on keyspace ranges (e.g. Client A: AAAA–BBBB, Client B: CCCC–DDDD). @@ -453,7 +451,7 @@ docker compose restart backend -❓ Can I assign specific agents to specific users or tasks? +❓ Can I assign specific agents to specific users or tasks? **Answer**: Admins can manage this in task settings or manually configure allowed agents. @@ -463,7 +461,7 @@ docker compose restart backend -❓ How are tasks prioritized? +❓ How are tasks prioritized? **Answer**: Tasks are prioritized numerically. @@ -476,7 +474,7 @@ docker compose restart backend ## Interface & Features -❓ Does Hashtopolis support notifications (e.g. Telegram, Discord)? +❓ Does Hashtopolis support notifications (e.g. Telegram, Discord)? **Answer**: Yes, Discord and Telegram bot notifications are supported but require manual setup. @@ -490,7 +488,7 @@ docker compose restart backend -❓ Can large wordlists be remotely deleted from agents? +❓ Can large wordlists be remotely deleted from agents? **Answer**: Requires manual script or reconfiguration. @@ -504,7 +502,7 @@ docker compose restart backend -❓ Why is only 4 GB of VRAM used on a 10 GB RTX 3080? +❓ Why is only 4 GB of VRAM used on a 10 GB RTX 3080? **Answer**: Hashcat uses only as much memory as needed. More memory ≠ more speed. @@ -514,7 +512,7 @@ docker compose restart backend -❓ What are “zaps” in status logs? +❓ What are “zaps” in status logs? **Answer**: Notification that another client already cracked a hash, allowing the client to skip it. @@ -528,7 +526,7 @@ docker compose restart backend -❓ Is there a way to trust all agents by default? +❓ Is there a way to trust all agents by default? **Answer**: No, but there’s an open feature request for it: [GitHub Issue #721](https://github.com/hashtopolis/server/issues/721) @@ -538,7 +536,7 @@ docker compose restart backend -❓ Can an API token be shared across multiple agents? +❓ Can an API token be shared across multiple agents? **Answer**: Yes, using the same token is fine for basic usage. diff --git a/overrides/partials/footer.html b/doc/overrides/partials/footer.html similarity index 100% rename from overrides/partials/footer.html rename to doc/overrides/partials/footer.html diff --git a/doc/user_manual/crackers_binary.md b/doc/user_manual/crackers_binary.md index 6d717b99a..343ecd4a1 100644 --- a/doc/user_manual/crackers_binary.md +++ b/doc/user_manual/crackers_binary.md @@ -14,7 +14,7 @@ This page displays some basic information about all the crackers configured in h ### Creating a New Cracker -As mentioned above, Hashtopolis supports other cracker than Hashcat. To deploy a new cracker, two steps are required, first the creation of the type of cracker and then adding a version for it. +As mentioned above, Hashtopolis supports other crackers than Hashcat. To deploy a new cracker, two steps are required, first the creation of the type of cracker and then adding a version for it. By clicking on the ``*New Cracker*'' button, a new page opens in which you can set the name for the new cracker and declare if the chunking is available for this cracker. In order to be compatible with chunking, a cracker must have the following features: diff --git a/mkdocs.yml b/mkdocs.yml index da4ff6404..95abf97e8 100644 --- a/mkdocs.yml +++ b/mkdocs.yml @@ -30,7 +30,7 @@ nav: theme: name: material - custom_dir: overrides + custom_dir: doc/overrides logo: assets/images/logo.png palette: - scheme: default diff --git a/output.png b/output.png deleted file mode 100644 index 93fa774eca0e8b092171fcc4d24448b6fbb1a4da..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 6741 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
      %D8g{Te*PusH2V)HsqJ zvX9j~6QnV!B5j;so{^XHc>b1-0>hXt_%Qth(o)JX7AV$)>CPrN7~eW*0H9-5Yfxc*oe8 z6&_IR7Th2GU_z9xxd*?QXkJbDVDy-DZA-XpR`dASmHcmEy5<~VI>DW|U-J@XUwh-= zmX!hkfwDLuU+aickILDKSbfsuM$Qb_5O_Zg4(D-CRz*F$b(_1WUQPUpR@$V3+Zi4w3TZ=!O zlInB|7y^;Rr~M34!>0>iu~kvCkeRu;NEFKPURtXcQea?U+{; z67Mc77}<%?wVliur#|%)DlIL2|M_$D-k!7La?A8~LrF==T;1ELwQ*oH(lI8yk0P{A#NxZy zk6qQUZsW@Qgap#SK+W`uiKV63tNl)>j*iY;XRyrfdkon(Z`eUytE(L@HWXI_8n&t) z9>PF#l0ZPoVFB=0Q{aWrC-uTH*pJcCQG5adIYUDTCty!h7P{L0S zdnudtJFdvc$&o6e1mr~g%U6JN@};s;B`8R$KLN0V(i#dEfEE{U$dG1A%_i~I1M!vv z@r>Jhd&(9T50f7ohNPJJMh%ysU48wbo{~Iv&o1P?-?MXaVhk)dtnIhE z`18k;LCT*BK??1UqI@&~IDIP6pikq#^zq@ZZf{9_e0)C6!d{l>`kpQOB&MVwa0qEY zpws=;go%mgpOTZU0I>Ks<^#~;azfFjuvU2zEFkxR`-{8oIqJslZgUf0~V;j(` zn(!fti;KsuIyyRF<0vS%urMVA0tuCIm{nm_)HJ|BUug3ZuAn3oE5EX?45@7;J z{EhivnU71m#F9izVixMi})TgifbakmRGBb5_ zb;H;-l0l%Iot=pvKf-|0u06n}_}I5unTLxD2_#m`Jy!Sj_5kf9=kE_o<~NU@%vZsB zU;st`g~!wdj3#Vv+i_BX%M7Y9fyDuCMhF6dH&bR93Iq$4iVvFun}uwyuZM)t7_i zVXJz`(6?_b8+T9G*m~Cos#}>2lB?cMaR3$s$t?;X*}jE?-HBXRV^~5` zQcy}t3Ul^zFhFtu|28!lY~6V6&InFUPQEHl^78WZ6aXB#kth3Y){{4|UP#=yD3)Vd zW25+Mp?SuyrLZG^ysWIORG1exP#t(%%n|r>*}#H?0Gj*qg_DY!nwg7>psS1MBrlJp zps>)e(fyVC&83%!h{)RE0JL!%&d6d{B=lw!6!0-I@vleOffPQgLE?G&`PIOF|5Ky( zE$C79dW=gU5K#Do`+B3HK`7=p2TIe7`1R}cFwkZJ* zr0JXa_3>4XJD+W)y9iNoXj=Som!xE590e%I2snSk7Ei8?{r&O5zuj$sLO1fgP$TW~ o(mw`@*t|zmOTxeFDBnT{eypt$mjnp_fAN6Sl(ZEq Date: Wed, 20 Aug 2025 11:07:36 +0200 Subject: [PATCH 151/691] removed leftover json file --- doc/openapi.json | 46166 --------------------------------------------- 1 file changed, 46166 deletions(-) delete mode 100644 doc/openapi.json diff --git a/doc/openapi.json b/doc/openapi.json deleted file mode 100644 index 1c84739a7..000000000 --- a/doc/openapi.json +++ /dev/null @@ -1,46166 +0,0 @@ -{ - "openapi": "3.0.1", - "info": { - "title": "Hashtopolis API", - "version": "v2" - }, - "servers": [ - { - "url": "/" - } - ], - "paths": { - "/api/v2/ui/accessgroups": { - "get": { - "tags": [ - "AccessGroups" - ], - "responses": { - "400": { - "description": "Invalid request", - "content": { - "application/json": { - "schema": { - "$ref": "#/components/schemas/ErrorResponse" - } - } - } - }, - "401": { - "description": "Authentication failed", - "content": { - "application/json": { - "schema": { - "$ref": "#/components/schemas/ErrorResponse" - } - } - } - }, - "200": { - "description": "successful operation", - "content": { - "application/json": { - "schema": { - "type": "array", - "items": { - "$ref": "#/components/schemas/AccessGroupResponse" - } - } - } - } - } - }, - "security": [ - { - "bearerAuth": [ - [ - "permAccessGroupRead" - ] - ] - } - ], - "description": "GET many request to retrieve multiple objects.", - "parameters": [ - { - "name": "page[after]", - "in": "path", - "schema": { - "type": "integer", - "format": "int32" - }, - "example": 0, - "description": "Pointer to paginate to retrieve the data after the value provided" - }, - { - "name": "page[before]", - "in": "path", - "schema": { - "type": "integer", - "format": "int32" - }, - "example": 0, - "description": "Pointer to paginate to retrieve the data before the value provided" - }, - { - "name": "page[size]", - "in": "path", - "schema": { - "type": "integer", - "format": "int32" - }, - "example": 100, - "description": "Amout of data to retrieve inside a single page" - }, - { - "name": "filter", - "in": "path", - "style": "deepobject", - "explode": true, - "schema": { - "type": "object" - }, - "description": "Filters results using a query", - "example": "\"filter[hashlistId__gt]\": 200" - }, - { - "name": "include", - "in": "path", - "schema": { - "type": "string" - }, - "description": "Items to include, comma seperated. Possible options: userMembers,agentMembers" - } - ] - }, - "post": { - "tags": [ - "AccessGroups" - ], - "responses": { - "400": { - "description": "Invalid request", - "content": { - "application/json": { - "schema": { - "$ref": "#/components/schemas/ErrorResponse" - } - } - } - }, - "401": { - "description": "Authentication failed", - "content": { - "application/json": { - "schema": { - "$ref": "#/components/schemas/ErrorResponse" - } - } - } - }, - "201": { - "description": "successful operation", - "content": { - "application/json": { - "schema": { - "$ref": "#/components/schemas/AccessGroupPostPatchResponse" - } - } - } - } - }, - "security": [ - { - "bearerAuth": [ - [ - "permAccessGroupCreate" - ] - ] - } - ], - "description": "POST request to create a new object. The request must contain the resource record as data with the attributes of the new object.To add relationships, a relationships object can be added with the resource records of the relations that are part of this object.", - "requestBody": { - "required": true, - "content": { - "application/json": { - "schema": { - "$ref": "#/components/schemas/AccessGroupCreate" - } - } - } - }, - "parameters": [] - }, - "patch": { - "tags": [ - "AccessGroups" - ], - "responses": { - "400": { - "description": "Invalid request", - "content": { - "application/json": { - "schema": { - "$ref": "#/components/schemas/ErrorResponse" - } - } - } - }, - "401": { - "description": "Authentication failed", - "content": { - "application/json": { - "schema": { - "$ref": "#/components/schemas/ErrorResponse" - } - } - } - } - }, - "security": [ - { - "bearerAuth": [ - [ - "permAccessGroupUpdate" - ] - ] - } - ], - "description": "PATCH request to update attributes of a single object.", - "parameters": [] - }, - "delete": { - "tags": [ - "AccessGroups" - ], - "responses": { - "400": { - "description": "Invalid request", - "content": { - "application/json": { - "schema": { - "$ref": "#/components/schemas/ErrorResponse" - } - } - } - }, - "401": { - "description": "Authentication failed", - "content": { - "application/json": { - "schema": { - "$ref": "#/components/schemas/ErrorResponse" - } - } - } - } - }, - "security": [ - { - "bearerAuth": [ - [ - "permAccessGroupDelete" - ] - ] - } - ], - "description": "", - "parameters": [] - } - }, - "/api/v2/ui/accessgroups/count": { - "get": { - "tags": [ - "AccessGroups" - ], - "responses": { - "400": { - "description": "Invalid request", - "content": { - "application/json": { - "schema": { - "$ref": "#/components/schemas/ErrorResponse" - } - } - } - }, - "401": { - "description": "Authentication failed", - "content": { - "application/json": { - "schema": { - "$ref": "#/components/schemas/ErrorResponse" - } - } - } - }, - "200": { - "description": "successful operation", - "content": { - "application/json": { - "schema": { - "type": "array", - "items": { - "$ref": "#/components/schemas/AccessGroupResponse" - } - } - } - } - } - }, - "security": [ - { - "bearerAuth": [ - [ - "permAccessGroupRead" - ] - ] - } - ], - "description": "GET many request to retrieve multiple objects.", - "parameters": [ - { - "name": "page[after]", - "in": "path", - "schema": { - "type": "integer", - "format": "int32" - }, - "example": 0, - "description": "Pointer to paginate to retrieve the data after the value provided" - }, - { - "name": "page[before]", - "in": "path", - "schema": { - "type": "integer", - "format": "int32" - }, - "example": 0, - "description": "Pointer to paginate to retrieve the data before the value provided" - }, - { - "name": "page[size]", - "in": "path", - "schema": { - "type": "integer", - "format": "int32" - }, - "example": 100, - "description": "Amout of data to retrieve inside a single page" - }, - { - "name": "filter", - "in": "path", - "style": "deepobject", - "explode": true, - "schema": { - "type": "object" - }, - "description": "Filters results using a query", - "example": "\"filter[hashlistId__gt]\": 200" - }, - { - "name": "include", - "in": "path", - "schema": { - "type": "string" - }, - "description": "Items to include, comma seperated. Possible options: userMembers,agentMembers" - } - ] - } - }, - "/api/v2/ui/accessgroups/{id:[0-9]+}/{relation:userMembers}": { - "get": { - "tags": [ - "AccessGroups" - ], - "responses": { - "400": { - "description": "Invalid request", - "content": { - "application/json": { - "schema": { - "$ref": "#/components/schemas/ErrorResponse" - } - } - } - }, - "401": { - "description": "Authentication failed", - "content": { - "application/json": { - "schema": { - "$ref": "#/components/schemas/ErrorResponse" - } - } - } - }, - "404": { - "description": "Not Found", - "content": { - "application/json": { - "schema": { - "$ref": "#/components/schemas/NotFoundResponse" - } - } - } - }, - "200": { - "description": "successful operation", - "content": { - "application/json": { - "schema": { - "$ref": "#/components/schemas/AccessGroupRelationUserMembersGetResponse" - } - } - } - } - }, - "security": [ - { - "bearerAuth": [ - [ - "permAccessGroupRead" - ] - ] - } - ], - "description": "GET request to retrieve a single object.", - "parameters": [ - { - "name": "id", - "in": "path", - "required": true, - "schema": { - "type": "integer", - "format": "int32", - "example": 10 - } - } - ] - } - }, - "/api/v2/ui/accessgroups/{id:[0-9]+}/relationships/{relation:userMembers}": { - "get": { - "tags": [ - "AccessGroups" - ], - "responses": { - "400": { - "description": "Invalid request", - "content": { - "application/json": { - "schema": { - "$ref": "#/components/schemas/ErrorResponse" - } - } - } - }, - "401": { - "description": "Authentication failed", - "content": { - "application/json": { - "schema": { - "$ref": "#/components/schemas/ErrorResponse" - } - } - } - }, - "404": { - "description": "Not Found", - "content": { - "application/json": { - "schema": { - "$ref": "#/components/schemas/NotFoundResponse" - } - } - } - }, - "200": { - "description": "successful operation", - "content": { - "application/json": { - "schema": { - "$ref": "#/components/schemas/AccessGroupResponse" - } - } - } - } - }, - "security": [ - { - "bearerAuth": [ - [ - "permAccessGroupRead" - ] - ] - } - ], - "description": "GET request for for a to-one relationship link. Returns the resource record of the object that is part of the specified relation.", - "parameters": [ - { - "name": "id", - "in": "path", - "required": true, - "schema": { - "type": "integer", - "format": "int32", - "example": 10 - } - } - ] - }, - "patch": { - "tags": [ - "AccessGroups" - ], - "responses": { - "400": { - "description": "Invalid request", - "content": { - "application/json": { - "schema": { - "$ref": "#/components/schemas/ErrorResponse" - } - } - } - }, - "401": { - "description": "Authentication failed", - "content": { - "application/json": { - "schema": { - "$ref": "#/components/schemas/ErrorResponse" - } - } - } - }, - "204": { - "description": "Succesfull operation" - }, - "404": { - "description": "Not Found", - "content": { - "application/json": { - "schema": { - "$ref": "#/components/schemas/NotFoundResponse" - } - } - } - } - }, - "security": [ - { - "bearerAuth": [ - [ - "permAccessGroupUpdate" - ] - ] - } - ], - "description": "", - "requestBody": { - "required": true, - "content": { - "application/json": { - "schema": { - "$ref": "#/components/schemas/AccessGroupRelationUserMembers" - } - } - } - }, - "parameters": [] - }, - "post": { - "tags": [ - "AccessGroups" - ], - "responses": { - "400": { - "description": "Invalid request", - "content": { - "application/json": { - "schema": { - "$ref": "#/components/schemas/ErrorResponse" - } - } - } - }, - "401": { - "description": "Authentication failed", - "content": { - "application/json": { - "schema": { - "$ref": "#/components/schemas/ErrorResponse" - } - } - } - }, - "204": { - "description": "successfully created" - }, - "404": { - "description": "Not Found", - "content": { - "application/json": { - "schema": { - "$ref": "#/components/schemas/NotFoundResponse" - } - } - } - } - }, - "security": [ - { - "bearerAuth": [ - [ - "permAccessGroupCreate" - ] - ] - } - ], - "description": "", - "requestBody": { - "required": true, - "content": { - "application/json": [] - } - }, - "parameters": [] - }, - "delete": { - "tags": [ - "AccessGroups" - ], - "responses": { - "400": { - "description": "Invalid request", - "content": { - "application/json": { - "schema": { - "$ref": "#/components/schemas/ErrorResponse" - } - } - } - }, - "401": { - "description": "Authentication failed", - "content": { - "application/json": { - "schema": { - "$ref": "#/components/schemas/ErrorResponse" - } - } - } - }, - "204": { - "description": "successfully deleted" - }, - "404": { - "description": "Not Found", - "content": { - "application/json": { - "schema": { - "$ref": "#/components/schemas/NotFoundResponse" - } - } - } - } - }, - "security": [ - { - "bearerAuth": [ - [ - "permAccessGroupDelete" - ] - ] - } - ], - "description": "", - "requestBody": { - "required": true, - "content": { - "application/json": { - "schema": { - "$ref": "#/components/schemas/AccessGroupRelationUserMembers" - } - } - } - }, - "parameters": [] - } - }, - "/api/v2/ui/accessgroups/{id:[0-9]+}/{relation:agentMembers}": { - "get": { - "tags": [ - "AccessGroups" - ], - "responses": { - "400": { - "description": "Invalid request", - "content": { - "application/json": { - "schema": { - "$ref": "#/components/schemas/ErrorResponse" - } - } - } - }, - "401": { - "description": "Authentication failed", - "content": { - "application/json": { - "schema": { - "$ref": "#/components/schemas/ErrorResponse" - } - } - } - }, - "404": { - "description": "Not Found", - "content": { - "application/json": { - "schema": { - "$ref": "#/components/schemas/NotFoundResponse" - } - } - } - }, - "200": { - "description": "successful operation", - "content": { - "application/json": { - "schema": { - "$ref": "#/components/schemas/AccessGroupRelationAgentMembersGetResponse" - } - } - } - } - }, - "security": [ - { - "bearerAuth": [ - [ - "permAccessGroupRead" - ] - ] - } - ], - "description": "GET request to retrieve a single object.", - "parameters": [ - { - "name": "id", - "in": "path", - "required": true, - "schema": { - "type": "integer", - "format": "int32", - "example": 10 - } - } - ] - } - }, - "/api/v2/ui/accessgroups/{id:[0-9]+}/relationships/{relation:agentMembers}": { - "get": { - "tags": [ - "AccessGroups" - ], - "responses": { - "400": { - "description": "Invalid request", - "content": { - "application/json": { - "schema": { - "$ref": "#/components/schemas/ErrorResponse" - } - } - } - }, - "401": { - "description": "Authentication failed", - "content": { - "application/json": { - "schema": { - "$ref": "#/components/schemas/ErrorResponse" - } - } - } - }, - "404": { - "description": "Not Found", - "content": { - "application/json": { - "schema": { - "$ref": "#/components/schemas/NotFoundResponse" - } - } - } - }, - "200": { - "description": "successful operation", - "content": { - "application/json": { - "schema": { - "$ref": "#/components/schemas/AccessGroupResponse" - } - } - } - } - }, - "security": [ - { - "bearerAuth": [ - [ - "permAccessGroupRead" - ] - ] - } - ], - "description": "GET request for for a to-one relationship link. Returns the resource record of the object that is part of the specified relation.", - "parameters": [ - { - "name": "id", - "in": "path", - "required": true, - "schema": { - "type": "integer", - "format": "int32", - "example": 10 - } - } - ] - }, - "patch": { - "tags": [ - "AccessGroups" - ], - "responses": { - "400": { - "description": "Invalid request", - "content": { - "application/json": { - "schema": { - "$ref": "#/components/schemas/ErrorResponse" - } - } - } - }, - "401": { - "description": "Authentication failed", - "content": { - "application/json": { - "schema": { - "$ref": "#/components/schemas/ErrorResponse" - } - } - } - }, - "204": { - "description": "Succesfull operation" - }, - "404": { - "description": "Not Found", - "content": { - "application/json": { - "schema": { - "$ref": "#/components/schemas/NotFoundResponse" - } - } - } - } - }, - "security": [ - { - "bearerAuth": [ - [ - "permAccessGroupUpdate" - ] - ] - } - ], - "description": "", - "requestBody": { - "required": true, - "content": { - "application/json": { - "schema": { - "$ref": "#/components/schemas/AccessGroupRelationAgentMembers" - } - } - } - }, - "parameters": [] - }, - "post": { - "tags": [ - "AccessGroups" - ], - "responses": { - "400": { - "description": "Invalid request", - "content": { - "application/json": { - "schema": { - "$ref": "#/components/schemas/ErrorResponse" - } - } - } - }, - "401": { - "description": "Authentication failed", - "content": { - "application/json": { - "schema": { - "$ref": "#/components/schemas/ErrorResponse" - } - } - } - }, - "204": { - "description": "successfully created" - }, - "404": { - "description": "Not Found", - "content": { - "application/json": { - "schema": { - "$ref": "#/components/schemas/NotFoundResponse" - } - } - } - } - }, - "security": [ - { - "bearerAuth": [ - [ - "permAccessGroupCreate" - ] - ] - } - ], - "description": "", - "requestBody": { - "required": true, - "content": { - "application/json": [] - } - }, - "parameters": [] - }, - "delete": { - "tags": [ - "AccessGroups" - ], - "responses": { - "400": { - "description": "Invalid request", - "content": { - "application/json": { - "schema": { - "$ref": "#/components/schemas/ErrorResponse" - } - } - } - }, - "401": { - "description": "Authentication failed", - "content": { - "application/json": { - "schema": { - "$ref": "#/components/schemas/ErrorResponse" - } - } - } - }, - "204": { - "description": "successfully deleted" - }, - "404": { - "description": "Not Found", - "content": { - "application/json": { - "schema": { - "$ref": "#/components/schemas/NotFoundResponse" - } - } - } - } - }, - "security": [ - { - "bearerAuth": [ - [ - "permAccessGroupDelete" - ] - ] - } - ], - "description": "", - "requestBody": { - "required": true, - "content": { - "application/json": { - "schema": { - "$ref": "#/components/schemas/AccessGroupRelationAgentMembers" - } - } - } - }, - "parameters": [] - } - }, - "/api/v2/ui/accessgroups/{id:[0-9]+}": { - "get": { - "tags": [ - "AccessGroups" - ], - "responses": { - "400": { - "description": "Invalid request", - "content": { - "application/json": { - "schema": { - "$ref": "#/components/schemas/ErrorResponse" - } - } - } - }, - "401": { - "description": "Authentication failed", - "content": { - "application/json": { - "schema": { - "$ref": "#/components/schemas/ErrorResponse" - } - } - } - }, - "404": { - "description": "Not Found", - "content": { - "application/json": { - "schema": { - "$ref": "#/components/schemas/NotFoundResponse" - } - } - } - }, - "200": { - "description": "successful operation", - "content": { - "application/json": { - "schema": { - "$ref": "#/components/schemas/AccessGroupResponse" - } - } - } - } - }, - "security": [ - { - "bearerAuth": [ - [ - "permAccessGroupRead" - ] - ] - } - ], - "description": "GET request to retrieve a single object.", - "parameters": [ - { - "name": "id", - "in": "path", - "required": true, - "schema": { - "type": "integer", - "format": "int32", - "example": 10 - } - }, - { - "name": "include", - "in": "query", - "schema": { - "type": "string" - }, - "description": "Items to include. Comma seperated" - } - ] - }, - "patch": { - "tags": [ - "AccessGroups" - ], - "responses": { - "400": { - "description": "Invalid request", - "content": { - "application/json": { - "schema": { - "$ref": "#/components/schemas/ErrorResponse" - } - } - } - }, - "401": { - "description": "Authentication failed", - "content": { - "application/json": { - "schema": { - "$ref": "#/components/schemas/ErrorResponse" - } - } - } - }, - "404": { - "description": "Not Found", - "content": { - "application/json": { - "schema": { - "$ref": "#/components/schemas/NotFoundResponse" - } - } - } - }, - "200": { - "description": "successful operation", - "content": { - "application/json": { - "schema": { - "$ref": "#/components/schemas/AccessGroupPostPatchResponse" - } - } - } - } - }, - "security": [ - { - "bearerAuth": [ - [ - "permAccessGroupUpdate" - ] - ] - } - ], - "description": "PATCH request to update attributes of a single object.", - "requestBody": { - "required": true, - "content": { - "application/json": { - "schema": { - "$ref": "#/components/schemas/AccessGroupPatch" - } - } - } - }, - "parameters": [] - }, - "delete": { - "tags": [ - "AccessGroups" - ], - "responses": { - "400": { - "description": "Invalid request", - "content": { - "application/json": { - "schema": { - "$ref": "#/components/schemas/ErrorResponse" - } - } - } - }, - "401": { - "description": "Authentication failed", - "content": { - "application/json": { - "schema": { - "$ref": "#/components/schemas/ErrorResponse" - } - } - } - }, - "404": { - "description": "Not Found", - "content": { - "application/json": { - "schema": { - "$ref": "#/components/schemas/NotFoundResponse" - } - } - } - }, - "204": { - "description": "successfully deleted" - } - }, - "security": [ - { - "bearerAuth": [ - [ - "permAccessGroupDelete" - ] - ] - } - ], - "description": "", - "requestBody": { - "required": true, - "content": { - "application/json": [] - } - }, - "parameters": [] - } - }, - "/api/v2/ui/agentassignments": { - "get": { - "tags": [ - "Assignments" - ], - "responses": { - "400": { - "description": "Invalid request", - "content": { - "application/json": { - "schema": { - "$ref": "#/components/schemas/ErrorResponse" - } - } - } - }, - "401": { - "description": "Authentication failed", - "content": { - "application/json": { - "schema": { - "$ref": "#/components/schemas/ErrorResponse" - } - } - } - }, - "200": { - "description": "successful operation", - "content": { - "application/json": { - "schema": { - "type": "array", - "items": { - "$ref": "#/components/schemas/AssignmentResponse" - } - } - } - } - } - }, - "security": [ - { - "bearerAuth": [ - [ - "permAgentAssignmentRead" - ] - ] - } - ], - "description": "GET many request to retrieve multiple objects.", - "parameters": [ - { - "name": "page[after]", - "in": "path", - "schema": { - "type": "integer", - "format": "int32" - }, - "example": 0, - "description": "Pointer to paginate to retrieve the data after the value provided" - }, - { - "name": "page[before]", - "in": "path", - "schema": { - "type": "integer", - "format": "int32" - }, - "example": 0, - "description": "Pointer to paginate to retrieve the data before the value provided" - }, - { - "name": "page[size]", - "in": "path", - "schema": { - "type": "integer", - "format": "int32" - }, - "example": 100, - "description": "Amout of data to retrieve inside a single page" - }, - { - "name": "filter", - "in": "path", - "style": "deepobject", - "explode": true, - "schema": { - "type": "object" - }, - "description": "Filters results using a query", - "example": "\"filter[hashlistId__gt]\": 200" - }, - { - "name": "include", - "in": "path", - "schema": { - "type": "string" - }, - "description": "Items to include, comma seperated. Possible options: agent,task" - } - ] - }, - "post": { - "tags": [ - "Assignments" - ], - "responses": { - "400": { - "description": "Invalid request", - "content": { - "application/json": { - "schema": { - "$ref": "#/components/schemas/ErrorResponse" - } - } - } - }, - "401": { - "description": "Authentication failed", - "content": { - "application/json": { - "schema": { - "$ref": "#/components/schemas/ErrorResponse" - } - } - } - }, - "201": { - "description": "successful operation", - "content": { - "application/json": { - "schema": { - "$ref": "#/components/schemas/AssignmentPostPatchResponse" - } - } - } - } - }, - "security": [ - { - "bearerAuth": [ - [ - "permAgentAssignmentCreate" - ] - ] - } - ], - "description": "POST request to create a new object. The request must contain the resource record as data with the attributes of the new object.To add relationships, a relationships object can be added with the resource records of the relations that are part of this object.", - "requestBody": { - "required": true, - "content": { - "application/json": { - "schema": { - "$ref": "#/components/schemas/AssignmentCreate" - } - } - } - }, - "parameters": [] - }, - "patch": { - "tags": [ - "Assignments" - ], - "responses": { - "400": { - "description": "Invalid request", - "content": { - "application/json": { - "schema": { - "$ref": "#/components/schemas/ErrorResponse" - } - } - } - }, - "401": { - "description": "Authentication failed", - "content": { - "application/json": { - "schema": { - "$ref": "#/components/schemas/ErrorResponse" - } - } - } - } - }, - "security": [ - { - "bearerAuth": [ - [ - "permAgentAssignmentUpdate" - ] - ] - } - ], - "description": "PATCH request to update attributes of a single object.", - "parameters": [] - }, - "delete": { - "tags": [ - "Assignments" - ], - "responses": { - "400": { - "description": "Invalid request", - "content": { - "application/json": { - "schema": { - "$ref": "#/components/schemas/ErrorResponse" - } - } - } - }, - "401": { - "description": "Authentication failed", - "content": { - "application/json": { - "schema": { - "$ref": "#/components/schemas/ErrorResponse" - } - } - } - } - }, - "security": [ - { - "bearerAuth": [ - [ - "permAgentAssignmentDelete" - ] - ] - } - ], - "description": "", - "parameters": [] - } - }, - "/api/v2/ui/agentassignments/count": { - "get": { - "tags": [ - "Assignments" - ], - "responses": { - "400": { - "description": "Invalid request", - "content": { - "application/json": { - "schema": { - "$ref": "#/components/schemas/ErrorResponse" - } - } - } - }, - "401": { - "description": "Authentication failed", - "content": { - "application/json": { - "schema": { - "$ref": "#/components/schemas/ErrorResponse" - } - } - } - }, - "200": { - "description": "successful operation", - "content": { - "application/json": { - "schema": { - "type": "array", - "items": { - "$ref": "#/components/schemas/AssignmentResponse" - } - } - } - } - } - }, - "security": [ - { - "bearerAuth": [ - [ - "permAgentAssignmentRead" - ] - ] - } - ], - "description": "GET many request to retrieve multiple objects.", - "parameters": [ - { - "name": "page[after]", - "in": "path", - "schema": { - "type": "integer", - "format": "int32" - }, - "example": 0, - "description": "Pointer to paginate to retrieve the data after the value provided" - }, - { - "name": "page[before]", - "in": "path", - "schema": { - "type": "integer", - "format": "int32" - }, - "example": 0, - "description": "Pointer to paginate to retrieve the data before the value provided" - }, - { - "name": "page[size]", - "in": "path", - "schema": { - "type": "integer", - "format": "int32" - }, - "example": 100, - "description": "Amout of data to retrieve inside a single page" - }, - { - "name": "filter", - "in": "path", - "style": "deepobject", - "explode": true, - "schema": { - "type": "object" - }, - "description": "Filters results using a query", - "example": "\"filter[hashlistId__gt]\": 200" - }, - { - "name": "include", - "in": "path", - "schema": { - "type": "string" - }, - "description": "Items to include, comma seperated. Possible options: agent,task" - } - ] - } - }, - "/api/v2/ui/agentassignments/{id:[0-9]+}/{relation:agent}": { - "get": { - "tags": [ - "Assignments" - ], - "responses": { - "400": { - "description": "Invalid request", - "content": { - "application/json": { - "schema": { - "$ref": "#/components/schemas/ErrorResponse" - } - } - } - }, - "401": { - "description": "Authentication failed", - "content": { - "application/json": { - "schema": { - "$ref": "#/components/schemas/ErrorResponse" - } - } - } - }, - "404": { - "description": "Not Found", - "content": { - "application/json": { - "schema": { - "$ref": "#/components/schemas/NotFoundResponse" - } - } - } - }, - "200": { - "description": "successful operation", - "content": { - "application/json": { - "schema": { - "$ref": "#/components/schemas/AssignmentRelationAgentGetResponse" - } - } - } - } - }, - "security": [ - { - "bearerAuth": [ - [ - "permAgentAssignmentRead" - ] - ] - } - ], - "description": "GET request to retrieve a single object.", - "parameters": [ - { - "name": "id", - "in": "path", - "required": true, - "schema": { - "type": "integer", - "format": "int32", - "example": 10 - } - } - ] - } - }, - "/api/v2/ui/agentassignments/{id:[0-9]+}/relationships/{relation:agent}": { - "get": { - "tags": [ - "Assignments" - ], - "responses": { - "400": { - "description": "Invalid request", - "content": { - "application/json": { - "schema": { - "$ref": "#/components/schemas/ErrorResponse" - } - } - } - }, - "401": { - "description": "Authentication failed", - "content": { - "application/json": { - "schema": { - "$ref": "#/components/schemas/ErrorResponse" - } - } - } - }, - "404": { - "description": "Not Found", - "content": { - "application/json": { - "schema": { - "$ref": "#/components/schemas/NotFoundResponse" - } - } - } - }, - "200": { - "description": "successful operation", - "content": { - "application/json": { - "schema": { - "$ref": "#/components/schemas/AssignmentResponse" - } - } - } - } - }, - "security": [ - { - "bearerAuth": [ - [ - "permAgentAssignmentRead" - ] - ] - } - ], - "description": "GET request for for a to-one relationship link. Returns the resource record of the object that is part of the specified relation.", - "parameters": [ - { - "name": "id", - "in": "path", - "required": true, - "schema": { - "type": "integer", - "format": "int32", - "example": 10 - } - } - ] - }, - "patch": { - "tags": [ - "Assignments" - ], - "responses": { - "400": { - "description": "Invalid request", - "content": { - "application/json": { - "schema": { - "$ref": "#/components/schemas/ErrorResponse" - } - } - } - }, - "401": { - "description": "Authentication failed", - "content": { - "application/json": { - "schema": { - "$ref": "#/components/schemas/ErrorResponse" - } - } - } - }, - "204": { - "description": "Succesfull operation" - }, - "404": { - "description": "Not Found", - "content": { - "application/json": { - "schema": { - "$ref": "#/components/schemas/NotFoundResponse" - } - } - } - } - }, - "security": [ - { - "bearerAuth": [ - [ - "permAgentAssignmentUpdate" - ] - ] - } - ], - "description": "", - "requestBody": { - "required": true, - "content": { - "application/json": { - "schema": { - "$ref": "#/components/schemas/AssignmentRelationAgent" - } - } - } - }, - "parameters": [] - } - }, - "/api/v2/ui/agentassignments/{id:[0-9]+}/{relation:task}": { - "get": { - "tags": [ - "Assignments" - ], - "responses": { - "400": { - "description": "Invalid request", - "content": { - "application/json": { - "schema": { - "$ref": "#/components/schemas/ErrorResponse" - } - } - } - }, - "401": { - "description": "Authentication failed", - "content": { - "application/json": { - "schema": { - "$ref": "#/components/schemas/ErrorResponse" - } - } - } - }, - "404": { - "description": "Not Found", - "content": { - "application/json": { - "schema": { - "$ref": "#/components/schemas/NotFoundResponse" - } - } - } - }, - "200": { - "description": "successful operation", - "content": { - "application/json": { - "schema": { - "$ref": "#/components/schemas/AssignmentRelationTaskGetResponse" - } - } - } - } - }, - "security": [ - { - "bearerAuth": [ - [ - "permAgentAssignmentRead" - ] - ] - } - ], - "description": "GET request to retrieve a single object.", - "parameters": [ - { - "name": "id", - "in": "path", - "required": true, - "schema": { - "type": "integer", - "format": "int32", - "example": 10 - } - } - ] - } - }, - "/api/v2/ui/agentassignments/{id:[0-9]+}/relationships/{relation:task}": { - "get": { - "tags": [ - "Assignments" - ], - "responses": { - "400": { - "description": "Invalid request", - "content": { - "application/json": { - "schema": { - "$ref": "#/components/schemas/ErrorResponse" - } - } - } - }, - "401": { - "description": "Authentication failed", - "content": { - "application/json": { - "schema": { - "$ref": "#/components/schemas/ErrorResponse" - } - } - } - }, - "404": { - "description": "Not Found", - "content": { - "application/json": { - "schema": { - "$ref": "#/components/schemas/NotFoundResponse" - } - } - } - }, - "200": { - "description": "successful operation", - "content": { - "application/json": { - "schema": { - "$ref": "#/components/schemas/AssignmentResponse" - } - } - } - } - }, - "security": [ - { - "bearerAuth": [ - [ - "permAgentAssignmentRead" - ] - ] - } - ], - "description": "GET request for for a to-one relationship link. Returns the resource record of the object that is part of the specified relation.", - "parameters": [ - { - "name": "id", - "in": "path", - "required": true, - "schema": { - "type": "integer", - "format": "int32", - "example": 10 - } - } - ] - }, - "patch": { - "tags": [ - "Assignments" - ], - "responses": { - "400": { - "description": "Invalid request", - "content": { - "application/json": { - "schema": { - "$ref": "#/components/schemas/ErrorResponse" - } - } - } - }, - "401": { - "description": "Authentication failed", - "content": { - "application/json": { - "schema": { - "$ref": "#/components/schemas/ErrorResponse" - } - } - } - }, - "204": { - "description": "Succesfull operation" - }, - "404": { - "description": "Not Found", - "content": { - "application/json": { - "schema": { - "$ref": "#/components/schemas/NotFoundResponse" - } - } - } - } - }, - "security": [ - { - "bearerAuth": [ - [ - "permAgentAssignmentUpdate" - ] - ] - } - ], - "description": "", - "requestBody": { - "required": true, - "content": { - "application/json": { - "schema": { - "$ref": "#/components/schemas/AssignmentRelationTask" - } - } - } - }, - "parameters": [] - } - }, - "/api/v2/ui/agentassignments/{id:[0-9]+}": { - "get": { - "tags": [ - "Assignments" - ], - "responses": { - "400": { - "description": "Invalid request", - "content": { - "application/json": { - "schema": { - "$ref": "#/components/schemas/ErrorResponse" - } - } - } - }, - "401": { - "description": "Authentication failed", - "content": { - "application/json": { - "schema": { - "$ref": "#/components/schemas/ErrorResponse" - } - } - } - }, - "404": { - "description": "Not Found", - "content": { - "application/json": { - "schema": { - "$ref": "#/components/schemas/NotFoundResponse" - } - } - } - }, - "200": { - "description": "successful operation", - "content": { - "application/json": { - "schema": { - "$ref": "#/components/schemas/AssignmentResponse" - } - } - } - } - }, - "security": [ - { - "bearerAuth": [ - [ - "permAgentAssignmentRead" - ] - ] - } - ], - "description": "GET request to retrieve a single object.", - "parameters": [ - { - "name": "id", - "in": "path", - "required": true, - "schema": { - "type": "integer", - "format": "int32", - "example": 10 - } - }, - { - "name": "include", - "in": "query", - "schema": { - "type": "string" - }, - "description": "Items to include. Comma seperated" - } - ] - }, - "patch": { - "tags": [ - "Assignments" - ], - "responses": { - "400": { - "description": "Invalid request", - "content": { - "application/json": { - "schema": { - "$ref": "#/components/schemas/ErrorResponse" - } - } - } - }, - "401": { - "description": "Authentication failed", - "content": { - "application/json": { - "schema": { - "$ref": "#/components/schemas/ErrorResponse" - } - } - } - }, - "404": { - "description": "Not Found", - "content": { - "application/json": { - "schema": { - "$ref": "#/components/schemas/NotFoundResponse" - } - } - } - }, - "200": { - "description": "successful operation", - "content": { - "application/json": { - "schema": { - "$ref": "#/components/schemas/AssignmentPostPatchResponse" - } - } - } - } - }, - "security": [ - { - "bearerAuth": [ - [ - "permAgentAssignmentUpdate" - ] - ] - } - ], - "description": "PATCH request to update attributes of a single object.", - "requestBody": { - "required": true, - "content": { - "application/json": { - "schema": { - "$ref": "#/components/schemas/AssignmentPatch" - } - } - } - }, - "parameters": [] - }, - "delete": { - "tags": [ - "Assignments" - ], - "responses": { - "400": { - "description": "Invalid request", - "content": { - "application/json": { - "schema": { - "$ref": "#/components/schemas/ErrorResponse" - } - } - } - }, - "401": { - "description": "Authentication failed", - "content": { - "application/json": { - "schema": { - "$ref": "#/components/schemas/ErrorResponse" - } - } - } - }, - "404": { - "description": "Not Found", - "content": { - "application/json": { - "schema": { - "$ref": "#/components/schemas/NotFoundResponse" - } - } - } - }, - "204": { - "description": "successfully deleted" - } - }, - "security": [ - { - "bearerAuth": [ - [ - "permAgentAssignmentDelete" - ] - ] - } - ], - "description": "", - "requestBody": { - "required": true, - "content": { - "application/json": [] - } - }, - "parameters": [] - } - }, - "/api/v2/ui/agentbinaries": { - "get": { - "tags": [ - "AgentBinarys" - ], - "responses": { - "400": { - "description": "Invalid request", - "content": { - "application/json": { - "schema": { - "$ref": "#/components/schemas/ErrorResponse" - } - } - } - }, - "401": { - "description": "Authentication failed", - "content": { - "application/json": { - "schema": { - "$ref": "#/components/schemas/ErrorResponse" - } - } - } - }, - "200": { - "description": "successful operation", - "content": { - "application/json": { - "schema": { - "type": "array", - "items": { - "$ref": "#/components/schemas/AgentBinaryResponse" - } - } - } - } - } - }, - "security": [ - { - "bearerAuth": [ - [ - "permAgentBinaryRead" - ] - ] - } - ], - "description": "GET many request to retrieve multiple objects.", - "parameters": [ - { - "name": "page[after]", - "in": "path", - "schema": { - "type": "integer", - "format": "int32" - }, - "example": 0, - "description": "Pointer to paginate to retrieve the data after the value provided" - }, - { - "name": "page[before]", - "in": "path", - "schema": { - "type": "integer", - "format": "int32" - }, - "example": 0, - "description": "Pointer to paginate to retrieve the data before the value provided" - }, - { - "name": "page[size]", - "in": "path", - "schema": { - "type": "integer", - "format": "int32" - }, - "example": 100, - "description": "Amout of data to retrieve inside a single page" - }, - { - "name": "filter", - "in": "path", - "style": "deepobject", - "explode": true, - "schema": { - "type": "object" - }, - "description": "Filters results using a query", - "example": "\"filter[hashlistId__gt]\": 200" - }, - { - "name": "include", - "in": "path", - "schema": { - "type": "string" - }, - "description": "Items to include, comma seperated. Possible options: " - } - ] - }, - "post": { - "tags": [ - "AgentBinarys" - ], - "responses": { - "400": { - "description": "Invalid request", - "content": { - "application/json": { - "schema": { - "$ref": "#/components/schemas/ErrorResponse" - } - } - } - }, - "401": { - "description": "Authentication failed", - "content": { - "application/json": { - "schema": { - "$ref": "#/components/schemas/ErrorResponse" - } - } - } - }, - "201": { - "description": "successful operation", - "content": { - "application/json": { - "schema": { - "$ref": "#/components/schemas/AgentBinaryPostPatchResponse" - } - } - } - } - }, - "security": [ - { - "bearerAuth": [ - [ - "permAgentBinaryCreate" - ] - ] - } - ], - "description": "POST request to create a new object. The request must contain the resource record as data with the attributes of the new object.To add relationships, a relationships object can be added with the resource records of the relations that are part of this object.", - "requestBody": { - "required": true, - "content": { - "application/json": { - "schema": { - "$ref": "#/components/schemas/AgentBinaryCreate" - } - } - } - }, - "parameters": [] - }, - "patch": { - "tags": [ - "AgentBinarys" - ], - "responses": { - "400": { - "description": "Invalid request", - "content": { - "application/json": { - "schema": { - "$ref": "#/components/schemas/ErrorResponse" - } - } - } - }, - "401": { - "description": "Authentication failed", - "content": { - "application/json": { - "schema": { - "$ref": "#/components/schemas/ErrorResponse" - } - } - } - } - }, - "security": [ - { - "bearerAuth": [ - [ - "permAgentBinaryUpdate" - ] - ] - } - ], - "description": "PATCH request to update attributes of a single object.", - "parameters": [] - }, - "delete": { - "tags": [ - "AgentBinarys" - ], - "responses": { - "400": { - "description": "Invalid request", - "content": { - "application/json": { - "schema": { - "$ref": "#/components/schemas/ErrorResponse" - } - } - } - }, - "401": { - "description": "Authentication failed", - "content": { - "application/json": { - "schema": { - "$ref": "#/components/schemas/ErrorResponse" - } - } - } - } - }, - "security": [ - { - "bearerAuth": [ - [ - "permAgentBinaryDelete" - ] - ] - } - ], - "description": "", - "parameters": [] - } - }, - "/api/v2/ui/agentbinaries/count": { - "get": { - "tags": [ - "AgentBinarys" - ], - "responses": { - "400": { - "description": "Invalid request", - "content": { - "application/json": { - "schema": { - "$ref": "#/components/schemas/ErrorResponse" - } - } - } - }, - "401": { - "description": "Authentication failed", - "content": { - "application/json": { - "schema": { - "$ref": "#/components/schemas/ErrorResponse" - } - } - } - }, - "200": { - "description": "successful operation", - "content": { - "application/json": { - "schema": { - "type": "array", - "items": { - "$ref": "#/components/schemas/AgentBinaryResponse" - } - } - } - } - } - }, - "security": [ - { - "bearerAuth": [ - [ - "permAgentBinaryRead" - ] - ] - } - ], - "description": "GET many request to retrieve multiple objects.", - "parameters": [ - { - "name": "page[after]", - "in": "path", - "schema": { - "type": "integer", - "format": "int32" - }, - "example": 0, - "description": "Pointer to paginate to retrieve the data after the value provided" - }, - { - "name": "page[before]", - "in": "path", - "schema": { - "type": "integer", - "format": "int32" - }, - "example": 0, - "description": "Pointer to paginate to retrieve the data before the value provided" - }, - { - "name": "page[size]", - "in": "path", - "schema": { - "type": "integer", - "format": "int32" - }, - "example": 100, - "description": "Amout of data to retrieve inside a single page" - }, - { - "name": "filter", - "in": "path", - "style": "deepobject", - "explode": true, - "schema": { - "type": "object" - }, - "description": "Filters results using a query", - "example": "\"filter[hashlistId__gt]\": 200" - }, - { - "name": "include", - "in": "path", - "schema": { - "type": "string" - }, - "description": "Items to include, comma seperated. Possible options: " - } - ] - } - }, - "/api/v2/ui/agentbinaries/{id:[0-9]+}": { - "get": { - "tags": [ - "AgentBinarys" - ], - "responses": { - "400": { - "description": "Invalid request", - "content": { - "application/json": { - "schema": { - "$ref": "#/components/schemas/ErrorResponse" - } - } - } - }, - "401": { - "description": "Authentication failed", - "content": { - "application/json": { - "schema": { - "$ref": "#/components/schemas/ErrorResponse" - } - } - } - }, - "404": { - "description": "Not Found", - "content": { - "application/json": { - "schema": { - "$ref": "#/components/schemas/NotFoundResponse" - } - } - } - }, - "200": { - "description": "successful operation", - "content": { - "application/json": { - "schema": { - "$ref": "#/components/schemas/AgentBinaryResponse" - } - } - } - } - }, - "security": [ - { - "bearerAuth": [ - [ - "permAgentBinaryRead" - ] - ] - } - ], - "description": "GET request to retrieve a single object.", - "parameters": [ - { - "name": "id", - "in": "path", - "required": true, - "schema": { - "type": "integer", - "format": "int32", - "example": 10 - } - }, - { - "name": "include", - "in": "query", - "schema": { - "type": "string" - }, - "description": "Items to include. Comma seperated" - } - ] - }, - "patch": { - "tags": [ - "AgentBinarys" - ], - "responses": { - "400": { - "description": "Invalid request", - "content": { - "application/json": { - "schema": { - "$ref": "#/components/schemas/ErrorResponse" - } - } - } - }, - "401": { - "description": "Authentication failed", - "content": { - "application/json": { - "schema": { - "$ref": "#/components/schemas/ErrorResponse" - } - } - } - }, - "404": { - "description": "Not Found", - "content": { - "application/json": { - "schema": { - "$ref": "#/components/schemas/NotFoundResponse" - } - } - } - }, - "200": { - "description": "successful operation", - "content": { - "application/json": { - "schema": { - "$ref": "#/components/schemas/AgentBinaryPostPatchResponse" - } - } - } - } - }, - "security": [ - { - "bearerAuth": [ - [ - "permAgentBinaryUpdate" - ] - ] - } - ], - "description": "PATCH request to update attributes of a single object.", - "requestBody": { - "required": true, - "content": { - "application/json": { - "schema": { - "$ref": "#/components/schemas/AgentBinaryPatch" - } - } - } - }, - "parameters": [] - }, - "delete": { - "tags": [ - "AgentBinarys" - ], - "responses": { - "400": { - "description": "Invalid request", - "content": { - "application/json": { - "schema": { - "$ref": "#/components/schemas/ErrorResponse" - } - } - } - }, - "401": { - "description": "Authentication failed", - "content": { - "application/json": { - "schema": { - "$ref": "#/components/schemas/ErrorResponse" - } - } - } - }, - "404": { - "description": "Not Found", - "content": { - "application/json": { - "schema": { - "$ref": "#/components/schemas/NotFoundResponse" - } - } - } - }, - "204": { - "description": "successfully deleted" - } - }, - "security": [ - { - "bearerAuth": [ - [ - "permAgentBinaryDelete" - ] - ] - } - ], - "description": "", - "requestBody": { - "required": true, - "content": { - "application/json": [] - } - }, - "parameters": [] - } - }, - "/api/v2/ui/agenterrors": { - "get": { - "tags": [ - "AgentErrors" - ], - "responses": { - "400": { - "description": "Invalid request", - "content": { - "application/json": { - "schema": { - "$ref": "#/components/schemas/ErrorResponse" - } - } - } - }, - "401": { - "description": "Authentication failed", - "content": { - "application/json": { - "schema": { - "$ref": "#/components/schemas/ErrorResponse" - } - } - } - }, - "200": { - "description": "successful operation", - "content": { - "application/json": { - "schema": { - "type": "array", - "items": { - "$ref": "#/components/schemas/AgentErrorResponse" - } - } - } - } - } - }, - "security": [ - { - "bearerAuth": [ - [ - "permAgentErrorRead" - ] - ] - } - ], - "description": "GET many request to retrieve multiple objects.", - "parameters": [ - { - "name": "page[after]", - "in": "path", - "schema": { - "type": "integer", - "format": "int32" - }, - "example": 0, - "description": "Pointer to paginate to retrieve the data after the value provided" - }, - { - "name": "page[before]", - "in": "path", - "schema": { - "type": "integer", - "format": "int32" - }, - "example": 0, - "description": "Pointer to paginate to retrieve the data before the value provided" - }, - { - "name": "page[size]", - "in": "path", - "schema": { - "type": "integer", - "format": "int32" - }, - "example": 100, - "description": "Amout of data to retrieve inside a single page" - }, - { - "name": "filter", - "in": "path", - "style": "deepobject", - "explode": true, - "schema": { - "type": "object" - }, - "description": "Filters results using a query", - "example": "\"filter[hashlistId__gt]\": 200" - }, - { - "name": "include", - "in": "path", - "schema": { - "type": "string" - }, - "description": "Items to include, comma seperated. Possible options: task" - } - ] - }, - "delete": { - "tags": [ - "AgentErrors" - ], - "responses": { - "400": { - "description": "Invalid request", - "content": { - "application/json": { - "schema": { - "$ref": "#/components/schemas/ErrorResponse" - } - } - } - }, - "401": { - "description": "Authentication failed", - "content": { - "application/json": { - "schema": { - "$ref": "#/components/schemas/ErrorResponse" - } - } - } - } - }, - "security": [ - { - "bearerAuth": [ - [ - "permAgentErrorDelete" - ] - ] - } - ], - "description": "", - "parameters": [] - } - }, - "/api/v2/ui/agenterrors/count": { - "get": { - "tags": [ - "AgentErrors" - ], - "responses": { - "400": { - "description": "Invalid request", - "content": { - "application/json": { - "schema": { - "$ref": "#/components/schemas/ErrorResponse" - } - } - } - }, - "401": { - "description": "Authentication failed", - "content": { - "application/json": { - "schema": { - "$ref": "#/components/schemas/ErrorResponse" - } - } - } - }, - "200": { - "description": "successful operation", - "content": { - "application/json": { - "schema": { - "type": "array", - "items": { - "$ref": "#/components/schemas/AgentErrorResponse" - } - } - } - } - } - }, - "security": [ - { - "bearerAuth": [ - [ - "permAgentErrorRead" - ] - ] - } - ], - "description": "GET many request to retrieve multiple objects.", - "parameters": [ - { - "name": "page[after]", - "in": "path", - "schema": { - "type": "integer", - "format": "int32" - }, - "example": 0, - "description": "Pointer to paginate to retrieve the data after the value provided" - }, - { - "name": "page[before]", - "in": "path", - "schema": { - "type": "integer", - "format": "int32" - }, - "example": 0, - "description": "Pointer to paginate to retrieve the data before the value provided" - }, - { - "name": "page[size]", - "in": "path", - "schema": { - "type": "integer", - "format": "int32" - }, - "example": 100, - "description": "Amout of data to retrieve inside a single page" - }, - { - "name": "filter", - "in": "path", - "style": "deepobject", - "explode": true, - "schema": { - "type": "object" - }, - "description": "Filters results using a query", - "example": "\"filter[hashlistId__gt]\": 200" - }, - { - "name": "include", - "in": "path", - "schema": { - "type": "string" - }, - "description": "Items to include, comma seperated. Possible options: task" - } - ] - } - }, - "/api/v2/ui/agenterrors/{id:[0-9]+}/{relation:task}": { - "get": { - "tags": [ - "AgentErrors" - ], - "responses": { - "400": { - "description": "Invalid request", - "content": { - "application/json": { - "schema": { - "$ref": "#/components/schemas/ErrorResponse" - } - } - } - }, - "401": { - "description": "Authentication failed", - "content": { - "application/json": { - "schema": { - "$ref": "#/components/schemas/ErrorResponse" - } - } - } - }, - "404": { - "description": "Not Found", - "content": { - "application/json": { - "schema": { - "$ref": "#/components/schemas/NotFoundResponse" - } - } - } - }, - "200": { - "description": "successful operation", - "content": { - "application/json": { - "schema": { - "$ref": "#/components/schemas/AgentErrorRelationTaskGetResponse" - } - } - } - } - }, - "security": [ - { - "bearerAuth": [ - [ - "permAgentErrorRead" - ] - ] - } - ], - "description": "GET request to retrieve a single object.", - "parameters": [ - { - "name": "id", - "in": "path", - "required": true, - "schema": { - "type": "integer", - "format": "int32", - "example": 10 - } - } - ] - } - }, - "/api/v2/ui/agenterrors/{id:[0-9]+}/relationships/{relation:task}": { - "get": { - "tags": [ - "AgentErrors" - ], - "responses": { - "400": { - "description": "Invalid request", - "content": { - "application/json": { - "schema": { - "$ref": "#/components/schemas/ErrorResponse" - } - } - } - }, - "401": { - "description": "Authentication failed", - "content": { - "application/json": { - "schema": { - "$ref": "#/components/schemas/ErrorResponse" - } - } - } - }, - "404": { - "description": "Not Found", - "content": { - "application/json": { - "schema": { - "$ref": "#/components/schemas/NotFoundResponse" - } - } - } - }, - "200": { - "description": "successful operation", - "content": { - "application/json": { - "schema": { - "$ref": "#/components/schemas/AgentErrorResponse" - } - } - } - } - }, - "security": [ - { - "bearerAuth": [ - [ - "permAgentErrorRead" - ] - ] - } - ], - "description": "GET request for for a to-one relationship link. Returns the resource record of the object that is part of the specified relation.", - "parameters": [ - { - "name": "id", - "in": "path", - "required": true, - "schema": { - "type": "integer", - "format": "int32", - "example": 10 - } - } - ] - }, - "patch": { - "tags": [ - "AgentErrors" - ], - "responses": { - "400": { - "description": "Invalid request", - "content": { - "application/json": { - "schema": { - "$ref": "#/components/schemas/ErrorResponse" - } - } - } - }, - "401": { - "description": "Authentication failed", - "content": { - "application/json": { - "schema": { - "$ref": "#/components/schemas/ErrorResponse" - } - } - } - }, - "204": { - "description": "Succesfull operation" - }, - "404": { - "description": "Not Found", - "content": { - "application/json": { - "schema": { - "$ref": "#/components/schemas/NotFoundResponse" - } - } - } - } - }, - "security": [ - { - "bearerAuth": [ - [ - "permAgentErrorUpdate" - ] - ] - } - ], - "description": "", - "requestBody": { - "required": true, - "content": { - "application/json": { - "schema": { - "$ref": "#/components/schemas/AgentErrorRelationTask" - } - } - } - }, - "parameters": [] - } - }, - "/api/v2/ui/agenterrors/{id:[0-9]+}": { - "get": { - "tags": [ - "AgentErrors" - ], - "responses": { - "400": { - "description": "Invalid request", - "content": { - "application/json": { - "schema": { - "$ref": "#/components/schemas/ErrorResponse" - } - } - } - }, - "401": { - "description": "Authentication failed", - "content": { - "application/json": { - "schema": { - "$ref": "#/components/schemas/ErrorResponse" - } - } - } - }, - "404": { - "description": "Not Found", - "content": { - "application/json": { - "schema": { - "$ref": "#/components/schemas/NotFoundResponse" - } - } - } - }, - "200": { - "description": "successful operation", - "content": { - "application/json": { - "schema": { - "$ref": "#/components/schemas/AgentErrorResponse" - } - } - } - } - }, - "security": [ - { - "bearerAuth": [ - [ - "permAgentErrorRead" - ] - ] - } - ], - "description": "GET request to retrieve a single object.", - "parameters": [ - { - "name": "id", - "in": "path", - "required": true, - "schema": { - "type": "integer", - "format": "int32", - "example": 10 - } - }, - { - "name": "include", - "in": "query", - "schema": { - "type": "string" - }, - "description": "Items to include. Comma seperated" - } - ] - }, - "delete": { - "tags": [ - "AgentErrors" - ], - "responses": { - "400": { - "description": "Invalid request", - "content": { - "application/json": { - "schema": { - "$ref": "#/components/schemas/ErrorResponse" - } - } - } - }, - "401": { - "description": "Authentication failed", - "content": { - "application/json": { - "schema": { - "$ref": "#/components/schemas/ErrorResponse" - } - } - } - }, - "404": { - "description": "Not Found", - "content": { - "application/json": { - "schema": { - "$ref": "#/components/schemas/NotFoundResponse" - } - } - } - }, - "204": { - "description": "successfully deleted" - } - }, - "security": [ - { - "bearerAuth": [ - [ - "permAgentErrorDelete" - ] - ] - } - ], - "description": "", - "requestBody": { - "required": true, - "content": { - "application/json": [] - } - }, - "parameters": [] - } - }, - "/api/v2/ui/agents": { - "get": { - "tags": [ - "Agents" - ], - "responses": { - "400": { - "description": "Invalid request", - "content": { - "application/json": { - "schema": { - "$ref": "#/components/schemas/ErrorResponse" - } - } - } - }, - "401": { - "description": "Authentication failed", - "content": { - "application/json": { - "schema": { - "$ref": "#/components/schemas/ErrorResponse" - } - } - } - }, - "200": { - "description": "successful operation", - "content": { - "application/json": { - "schema": { - "type": "array", - "items": { - "$ref": "#/components/schemas/AgentResponse" - } - } - } - } - } - }, - "security": [ - { - "bearerAuth": [ - [ - "permAgentRead" - ] - ] - } - ], - "description": "GET many request to retrieve multiple objects.", - "parameters": [ - { - "name": "page[after]", - "in": "path", - "schema": { - "type": "integer", - "format": "int32" - }, - "example": 0, - "description": "Pointer to paginate to retrieve the data after the value provided" - }, - { - "name": "page[before]", - "in": "path", - "schema": { - "type": "integer", - "format": "int32" - }, - "example": 0, - "description": "Pointer to paginate to retrieve the data before the value provided" - }, - { - "name": "page[size]", - "in": "path", - "schema": { - "type": "integer", - "format": "int32" - }, - "example": 100, - "description": "Amout of data to retrieve inside a single page" - }, - { - "name": "filter", - "in": "path", - "style": "deepobject", - "explode": true, - "schema": { - "type": "object" - }, - "description": "Filters results using a query", - "example": "\"filter[hashlistId__gt]\": 200" - }, - { - "name": "include", - "in": "path", - "schema": { - "type": "string" - }, - "description": "Items to include, comma seperated. Possible options: accessGroups,agentStats,agentErrors,chunks,tasks,assignments" - } - ] - }, - "patch": { - "tags": [ - "Agents" - ], - "responses": { - "400": { - "description": "Invalid request", - "content": { - "application/json": { - "schema": { - "$ref": "#/components/schemas/ErrorResponse" - } - } - } - }, - "401": { - "description": "Authentication failed", - "content": { - "application/json": { - "schema": { - "$ref": "#/components/schemas/ErrorResponse" - } - } - } - } - }, - "security": [ - { - "bearerAuth": [ - [ - "permAgentUpdate" - ] - ] - } - ], - "description": "PATCH request to update attributes of a single object.", - "parameters": [] - }, - "delete": { - "tags": [ - "Agents" - ], - "responses": { - "400": { - "description": "Invalid request", - "content": { - "application/json": { - "schema": { - "$ref": "#/components/schemas/ErrorResponse" - } - } - } - }, - "401": { - "description": "Authentication failed", - "content": { - "application/json": { - "schema": { - "$ref": "#/components/schemas/ErrorResponse" - } - } - } - } - }, - "security": [ - { - "bearerAuth": [ - [ - "permAgentDelete" - ] - ] - } - ], - "description": "", - "parameters": [] - } - }, - "/api/v2/ui/agents/count": { - "get": { - "tags": [ - "Agents" - ], - "responses": { - "400": { - "description": "Invalid request", - "content": { - "application/json": { - "schema": { - "$ref": "#/components/schemas/ErrorResponse" - } - } - } - }, - "401": { - "description": "Authentication failed", - "content": { - "application/json": { - "schema": { - "$ref": "#/components/schemas/ErrorResponse" - } - } - } - }, - "200": { - "description": "successful operation", - "content": { - "application/json": { - "schema": { - "type": "array", - "items": { - "$ref": "#/components/schemas/AgentResponse" - } - } - } - } - } - }, - "security": [ - { - "bearerAuth": [ - [ - "permAgentRead" - ] - ] - } - ], - "description": "GET many request to retrieve multiple objects.", - "parameters": [ - { - "name": "page[after]", - "in": "path", - "schema": { - "type": "integer", - "format": "int32" - }, - "example": 0, - "description": "Pointer to paginate to retrieve the data after the value provided" - }, - { - "name": "page[before]", - "in": "path", - "schema": { - "type": "integer", - "format": "int32" - }, - "example": 0, - "description": "Pointer to paginate to retrieve the data before the value provided" - }, - { - "name": "page[size]", - "in": "path", - "schema": { - "type": "integer", - "format": "int32" - }, - "example": 100, - "description": "Amout of data to retrieve inside a single page" - }, - { - "name": "filter", - "in": "path", - "style": "deepobject", - "explode": true, - "schema": { - "type": "object" - }, - "description": "Filters results using a query", - "example": "\"filter[hashlistId__gt]\": 200" - }, - { - "name": "include", - "in": "path", - "schema": { - "type": "string" - }, - "description": "Items to include, comma seperated. Possible options: accessGroups,agentStats,agentErrors,chunks,tasks,assignments" - } - ] - } - }, - "/api/v2/ui/agents/{id:[0-9]+}/{relation:accessGroups}": { - "get": { - "tags": [ - "Agents" - ], - "responses": { - "400": { - "description": "Invalid request", - "content": { - "application/json": { - "schema": { - "$ref": "#/components/schemas/ErrorResponse" - } - } - } - }, - "401": { - "description": "Authentication failed", - "content": { - "application/json": { - "schema": { - "$ref": "#/components/schemas/ErrorResponse" - } - } - } - }, - "404": { - "description": "Not Found", - "content": { - "application/json": { - "schema": { - "$ref": "#/components/schemas/NotFoundResponse" - } - } - } - }, - "200": { - "description": "successful operation", - "content": { - "application/json": { - "schema": { - "$ref": "#/components/schemas/AgentRelationAccessGroupsGetResponse" - } - } - } - } - }, - "security": [ - { - "bearerAuth": [ - [ - "permAgentRead" - ] - ] - } - ], - "description": "GET request to retrieve a single object.", - "parameters": [ - { - "name": "id", - "in": "path", - "required": true, - "schema": { - "type": "integer", - "format": "int32", - "example": 10 - } - } - ] - } - }, - "/api/v2/ui/agents/{id:[0-9]+}/relationships/{relation:accessGroups}": { - "get": { - "tags": [ - "Agents" - ], - "responses": { - "400": { - "description": "Invalid request", - "content": { - "application/json": { - "schema": { - "$ref": "#/components/schemas/ErrorResponse" - } - } - } - }, - "401": { - "description": "Authentication failed", - "content": { - "application/json": { - "schema": { - "$ref": "#/components/schemas/ErrorResponse" - } - } - } - }, - "404": { - "description": "Not Found", - "content": { - "application/json": { - "schema": { - "$ref": "#/components/schemas/NotFoundResponse" - } - } - } - }, - "200": { - "description": "successful operation", - "content": { - "application/json": { - "schema": { - "$ref": "#/components/schemas/AgentResponse" - } - } - } - } - }, - "security": [ - { - "bearerAuth": [ - [ - "permAgentRead" - ] - ] - } - ], - "description": "GET request for for a to-one relationship link. Returns the resource record of the object that is part of the specified relation.", - "parameters": [ - { - "name": "id", - "in": "path", - "required": true, - "schema": { - "type": "integer", - "format": "int32", - "example": 10 - } - } - ] - }, - "patch": { - "tags": [ - "Agents" - ], - "responses": { - "400": { - "description": "Invalid request", - "content": { - "application/json": { - "schema": { - "$ref": "#/components/schemas/ErrorResponse" - } - } - } - }, - "401": { - "description": "Authentication failed", - "content": { - "application/json": { - "schema": { - "$ref": "#/components/schemas/ErrorResponse" - } - } - } - }, - "204": { - "description": "Succesfull operation" - }, - "404": { - "description": "Not Found", - "content": { - "application/json": { - "schema": { - "$ref": "#/components/schemas/NotFoundResponse" - } - } - } - } - }, - "security": [ - { - "bearerAuth": [ - [ - "permAgentUpdate" - ] - ] - } - ], - "description": "", - "requestBody": { - "required": true, - "content": { - "application/json": { - "schema": { - "$ref": "#/components/schemas/AgentRelationAccessGroups" - } - } - } - }, - "parameters": [] - }, - "post": { - "tags": [ - "Agents" - ], - "responses": { - "400": { - "description": "Invalid request", - "content": { - "application/json": { - "schema": { - "$ref": "#/components/schemas/ErrorResponse" - } - } - } - }, - "401": { - "description": "Authentication failed", - "content": { - "application/json": { - "schema": { - "$ref": "#/components/schemas/ErrorResponse" - } - } - } - }, - "204": { - "description": "successfully created" - }, - "404": { - "description": "Not Found", - "content": { - "application/json": { - "schema": { - "$ref": "#/components/schemas/NotFoundResponse" - } - } - } - } - }, - "security": [ - { - "bearerAuth": [ - [ - "permAgentCreate" - ] - ] - } - ], - "description": "", - "requestBody": { - "required": true, - "content": { - "application/json": [] - } - }, - "parameters": [] - }, - "delete": { - "tags": [ - "Agents" - ], - "responses": { - "400": { - "description": "Invalid request", - "content": { - "application/json": { - "schema": { - "$ref": "#/components/schemas/ErrorResponse" - } - } - } - }, - "401": { - "description": "Authentication failed", - "content": { - "application/json": { - "schema": { - "$ref": "#/components/schemas/ErrorResponse" - } - } - } - }, - "204": { - "description": "successfully deleted" - }, - "404": { - "description": "Not Found", - "content": { - "application/json": { - "schema": { - "$ref": "#/components/schemas/NotFoundResponse" - } - } - } - } - }, - "security": [ - { - "bearerAuth": [ - [ - "permAgentDelete" - ] - ] - } - ], - "description": "", - "requestBody": { - "required": true, - "content": { - "application/json": { - "schema": { - "$ref": "#/components/schemas/AgentRelationAccessGroups" - } - } - } - }, - "parameters": [] - } - }, - "/api/v2/ui/agents/{id:[0-9]+}/{relation:agentStats}": { - "get": { - "tags": [ - "Agents" - ], - "responses": { - "400": { - "description": "Invalid request", - "content": { - "application/json": { - "schema": { - "$ref": "#/components/schemas/ErrorResponse" - } - } - } - }, - "401": { - "description": "Authentication failed", - "content": { - "application/json": { - "schema": { - "$ref": "#/components/schemas/ErrorResponse" - } - } - } - }, - "404": { - "description": "Not Found", - "content": { - "application/json": { - "schema": { - "$ref": "#/components/schemas/NotFoundResponse" - } - } - } - }, - "200": { - "description": "successful operation", - "content": { - "application/json": { - "schema": { - "$ref": "#/components/schemas/AgentRelationAgentStatsGetResponse" - } - } - } - } - }, - "security": [ - { - "bearerAuth": [ - [ - "permAgentRead" - ] - ] - } - ], - "description": "GET request to retrieve a single object.", - "parameters": [ - { - "name": "id", - "in": "path", - "required": true, - "schema": { - "type": "integer", - "format": "int32", - "example": 10 - } - } - ] - } - }, - "/api/v2/ui/agents/{id:[0-9]+}/relationships/{relation:agentStats}": { - "get": { - "tags": [ - "Agents" - ], - "responses": { - "400": { - "description": "Invalid request", - "content": { - "application/json": { - "schema": { - "$ref": "#/components/schemas/ErrorResponse" - } - } - } - }, - "401": { - "description": "Authentication failed", - "content": { - "application/json": { - "schema": { - "$ref": "#/components/schemas/ErrorResponse" - } - } - } - }, - "404": { - "description": "Not Found", - "content": { - "application/json": { - "schema": { - "$ref": "#/components/schemas/NotFoundResponse" - } - } - } - }, - "200": { - "description": "successful operation", - "content": { - "application/json": { - "schema": { - "$ref": "#/components/schemas/AgentResponse" - } - } - } - } - }, - "security": [ - { - "bearerAuth": [ - [ - "permAgentRead" - ] - ] - } - ], - "description": "GET request for for a to-one relationship link. Returns the resource record of the object that is part of the specified relation.", - "parameters": [ - { - "name": "id", - "in": "path", - "required": true, - "schema": { - "type": "integer", - "format": "int32", - "example": 10 - } - } - ] - }, - "patch": { - "tags": [ - "Agents" - ], - "responses": { - "400": { - "description": "Invalid request", - "content": { - "application/json": { - "schema": { - "$ref": "#/components/schemas/ErrorResponse" - } - } - } - }, - "401": { - "description": "Authentication failed", - "content": { - "application/json": { - "schema": { - "$ref": "#/components/schemas/ErrorResponse" - } - } - } - }, - "204": { - "description": "Succesfull operation" - }, - "404": { - "description": "Not Found", - "content": { - "application/json": { - "schema": { - "$ref": "#/components/schemas/NotFoundResponse" - } - } - } - } - }, - "security": [ - { - "bearerAuth": [ - [ - "permAgentUpdate" - ] - ] - } - ], - "description": "", - "requestBody": { - "required": true, - "content": { - "application/json": { - "schema": { - "$ref": "#/components/schemas/AgentRelationAgentStats" - } - } - } - }, - "parameters": [] - }, - "post": { - "tags": [ - "Agents" - ], - "responses": { - "400": { - "description": "Invalid request", - "content": { - "application/json": { - "schema": { - "$ref": "#/components/schemas/ErrorResponse" - } - } - } - }, - "401": { - "description": "Authentication failed", - "content": { - "application/json": { - "schema": { - "$ref": "#/components/schemas/ErrorResponse" - } - } - } - }, - "204": { - "description": "successfully created" - }, - "404": { - "description": "Not Found", - "content": { - "application/json": { - "schema": { - "$ref": "#/components/schemas/NotFoundResponse" - } - } - } - } - }, - "security": [ - { - "bearerAuth": [ - [ - "permAgentCreate" - ] - ] - } - ], - "description": "", - "requestBody": { - "required": true, - "content": { - "application/json": [] - } - }, - "parameters": [] - }, - "delete": { - "tags": [ - "Agents" - ], - "responses": { - "400": { - "description": "Invalid request", - "content": { - "application/json": { - "schema": { - "$ref": "#/components/schemas/ErrorResponse" - } - } - } - }, - "401": { - "description": "Authentication failed", - "content": { - "application/json": { - "schema": { - "$ref": "#/components/schemas/ErrorResponse" - } - } - } - }, - "204": { - "description": "successfully deleted" - }, - "404": { - "description": "Not Found", - "content": { - "application/json": { - "schema": { - "$ref": "#/components/schemas/NotFoundResponse" - } - } - } - } - }, - "security": [ - { - "bearerAuth": [ - [ - "permAgentDelete" - ] - ] - } - ], - "description": "", - "requestBody": { - "required": true, - "content": { - "application/json": { - "schema": { - "$ref": "#/components/schemas/AgentRelationAgentStats" - } - } - } - }, - "parameters": [] - } - }, - "/api/v2/ui/agents/{id:[0-9]+}/{relation:agentErrors}": { - "get": { - "tags": [ - "Agents" - ], - "responses": { - "400": { - "description": "Invalid request", - "content": { - "application/json": { - "schema": { - "$ref": "#/components/schemas/ErrorResponse" - } - } - } - }, - "401": { - "description": "Authentication failed", - "content": { - "application/json": { - "schema": { - "$ref": "#/components/schemas/ErrorResponse" - } - } - } - }, - "404": { - "description": "Not Found", - "content": { - "application/json": { - "schema": { - "$ref": "#/components/schemas/NotFoundResponse" - } - } - } - }, - "200": { - "description": "successful operation", - "content": { - "application/json": { - "schema": { - "$ref": "#/components/schemas/AgentRelationAgentErrorsGetResponse" - } - } - } - } - }, - "security": [ - { - "bearerAuth": [ - [ - "permAgentRead" - ] - ] - } - ], - "description": "GET request to retrieve a single object.", - "parameters": [ - { - "name": "id", - "in": "path", - "required": true, - "schema": { - "type": "integer", - "format": "int32", - "example": 10 - } - } - ] - } - }, - "/api/v2/ui/agents/{id:[0-9]+}/relationships/{relation:agentErrors}": { - "get": { - "tags": [ - "Agents" - ], - "responses": { - "400": { - "description": "Invalid request", - "content": { - "application/json": { - "schema": { - "$ref": "#/components/schemas/ErrorResponse" - } - } - } - }, - "401": { - "description": "Authentication failed", - "content": { - "application/json": { - "schema": { - "$ref": "#/components/schemas/ErrorResponse" - } - } - } - }, - "404": { - "description": "Not Found", - "content": { - "application/json": { - "schema": { - "$ref": "#/components/schemas/NotFoundResponse" - } - } - } - }, - "200": { - "description": "successful operation", - "content": { - "application/json": { - "schema": { - "$ref": "#/components/schemas/AgentResponse" - } - } - } - } - }, - "security": [ - { - "bearerAuth": [ - [ - "permAgentRead" - ] - ] - } - ], - "description": "GET request for for a to-one relationship link. Returns the resource record of the object that is part of the specified relation.", - "parameters": [ - { - "name": "id", - "in": "path", - "required": true, - "schema": { - "type": "integer", - "format": "int32", - "example": 10 - } - } - ] - }, - "patch": { - "tags": [ - "Agents" - ], - "responses": { - "400": { - "description": "Invalid request", - "content": { - "application/json": { - "schema": { - "$ref": "#/components/schemas/ErrorResponse" - } - } - } - }, - "401": { - "description": "Authentication failed", - "content": { - "application/json": { - "schema": { - "$ref": "#/components/schemas/ErrorResponse" - } - } - } - }, - "204": { - "description": "Succesfull operation" - }, - "404": { - "description": "Not Found", - "content": { - "application/json": { - "schema": { - "$ref": "#/components/schemas/NotFoundResponse" - } - } - } - } - }, - "security": [ - { - "bearerAuth": [ - [ - "permAgentUpdate" - ] - ] - } - ], - "description": "", - "requestBody": { - "required": true, - "content": { - "application/json": { - "schema": { - "$ref": "#/components/schemas/AgentRelationAgentErrors" - } - } - } - }, - "parameters": [] - }, - "post": { - "tags": [ - "Agents" - ], - "responses": { - "400": { - "description": "Invalid request", - "content": { - "application/json": { - "schema": { - "$ref": "#/components/schemas/ErrorResponse" - } - } - } - }, - "401": { - "description": "Authentication failed", - "content": { - "application/json": { - "schema": { - "$ref": "#/components/schemas/ErrorResponse" - } - } - } - }, - "204": { - "description": "successfully created" - }, - "404": { - "description": "Not Found", - "content": { - "application/json": { - "schema": { - "$ref": "#/components/schemas/NotFoundResponse" - } - } - } - } - }, - "security": [ - { - "bearerAuth": [ - [ - "permAgentCreate" - ] - ] - } - ], - "description": "", - "requestBody": { - "required": true, - "content": { - "application/json": [] - } - }, - "parameters": [] - }, - "delete": { - "tags": [ - "Agents" - ], - "responses": { - "400": { - "description": "Invalid request", - "content": { - "application/json": { - "schema": { - "$ref": "#/components/schemas/ErrorResponse" - } - } - } - }, - "401": { - "description": "Authentication failed", - "content": { - "application/json": { - "schema": { - "$ref": "#/components/schemas/ErrorResponse" - } - } - } - }, - "204": { - "description": "successfully deleted" - }, - "404": { - "description": "Not Found", - "content": { - "application/json": { - "schema": { - "$ref": "#/components/schemas/NotFoundResponse" - } - } - } - } - }, - "security": [ - { - "bearerAuth": [ - [ - "permAgentDelete" - ] - ] - } - ], - "description": "", - "requestBody": { - "required": true, - "content": { - "application/json": { - "schema": { - "$ref": "#/components/schemas/AgentRelationAgentErrors" - } - } - } - }, - "parameters": [] - } - }, - "/api/v2/ui/agents/{id:[0-9]+}/{relation:chunks}": { - "get": { - "tags": [ - "Agents" - ], - "responses": { - "400": { - "description": "Invalid request", - "content": { - "application/json": { - "schema": { - "$ref": "#/components/schemas/ErrorResponse" - } - } - } - }, - "401": { - "description": "Authentication failed", - "content": { - "application/json": { - "schema": { - "$ref": "#/components/schemas/ErrorResponse" - } - } - } - }, - "404": { - "description": "Not Found", - "content": { - "application/json": { - "schema": { - "$ref": "#/components/schemas/NotFoundResponse" - } - } - } - }, - "200": { - "description": "successful operation", - "content": { - "application/json": { - "schema": { - "$ref": "#/components/schemas/AgentRelationChunksGetResponse" - } - } - } - } - }, - "security": [ - { - "bearerAuth": [ - [ - "permAgentRead" - ] - ] - } - ], - "description": "GET request to retrieve a single object.", - "parameters": [ - { - "name": "id", - "in": "path", - "required": true, - "schema": { - "type": "integer", - "format": "int32", - "example": 10 - } - } - ] - } - }, - "/api/v2/ui/agents/{id:[0-9]+}/relationships/{relation:chunks}": { - "get": { - "tags": [ - "Agents" - ], - "responses": { - "400": { - "description": "Invalid request", - "content": { - "application/json": { - "schema": { - "$ref": "#/components/schemas/ErrorResponse" - } - } - } - }, - "401": { - "description": "Authentication failed", - "content": { - "application/json": { - "schema": { - "$ref": "#/components/schemas/ErrorResponse" - } - } - } - }, - "404": { - "description": "Not Found", - "content": { - "application/json": { - "schema": { - "$ref": "#/components/schemas/NotFoundResponse" - } - } - } - }, - "200": { - "description": "successful operation", - "content": { - "application/json": { - "schema": { - "$ref": "#/components/schemas/AgentResponse" - } - } - } - } - }, - "security": [ - { - "bearerAuth": [ - [ - "permAgentRead" - ] - ] - } - ], - "description": "GET request for for a to-one relationship link. Returns the resource record of the object that is part of the specified relation.", - "parameters": [ - { - "name": "id", - "in": "path", - "required": true, - "schema": { - "type": "integer", - "format": "int32", - "example": 10 - } - } - ] - }, - "patch": { - "tags": [ - "Agents" - ], - "responses": { - "400": { - "description": "Invalid request", - "content": { - "application/json": { - "schema": { - "$ref": "#/components/schemas/ErrorResponse" - } - } - } - }, - "401": { - "description": "Authentication failed", - "content": { - "application/json": { - "schema": { - "$ref": "#/components/schemas/ErrorResponse" - } - } - } - }, - "204": { - "description": "Succesfull operation" - }, - "404": { - "description": "Not Found", - "content": { - "application/json": { - "schema": { - "$ref": "#/components/schemas/NotFoundResponse" - } - } - } - } - }, - "security": [ - { - "bearerAuth": [ - [ - "permAgentUpdate" - ] - ] - } - ], - "description": "", - "requestBody": { - "required": true, - "content": { - "application/json": { - "schema": { - "$ref": "#/components/schemas/AgentRelationChunks" - } - } - } - }, - "parameters": [] - }, - "post": { - "tags": [ - "Agents" - ], - "responses": { - "400": { - "description": "Invalid request", - "content": { - "application/json": { - "schema": { - "$ref": "#/components/schemas/ErrorResponse" - } - } - } - }, - "401": { - "description": "Authentication failed", - "content": { - "application/json": { - "schema": { - "$ref": "#/components/schemas/ErrorResponse" - } - } - } - }, - "204": { - "description": "successfully created" - }, - "404": { - "description": "Not Found", - "content": { - "application/json": { - "schema": { - "$ref": "#/components/schemas/NotFoundResponse" - } - } - } - } - }, - "security": [ - { - "bearerAuth": [ - [ - "permAgentCreate" - ] - ] - } - ], - "description": "", - "requestBody": { - "required": true, - "content": { - "application/json": [] - } - }, - "parameters": [] - }, - "delete": { - "tags": [ - "Agents" - ], - "responses": { - "400": { - "description": "Invalid request", - "content": { - "application/json": { - "schema": { - "$ref": "#/components/schemas/ErrorResponse" - } - } - } - }, - "401": { - "description": "Authentication failed", - "content": { - "application/json": { - "schema": { - "$ref": "#/components/schemas/ErrorResponse" - } - } - } - }, - "204": { - "description": "successfully deleted" - }, - "404": { - "description": "Not Found", - "content": { - "application/json": { - "schema": { - "$ref": "#/components/schemas/NotFoundResponse" - } - } - } - } - }, - "security": [ - { - "bearerAuth": [ - [ - "permAgentDelete" - ] - ] - } - ], - "description": "", - "requestBody": { - "required": true, - "content": { - "application/json": { - "schema": { - "$ref": "#/components/schemas/AgentRelationChunks" - } - } - } - }, - "parameters": [] - } - }, - "/api/v2/ui/agents/{id:[0-9]+}/{relation:tasks}": { - "get": { - "tags": [ - "Agents" - ], - "responses": { - "400": { - "description": "Invalid request", - "content": { - "application/json": { - "schema": { - "$ref": "#/components/schemas/ErrorResponse" - } - } - } - }, - "401": { - "description": "Authentication failed", - "content": { - "application/json": { - "schema": { - "$ref": "#/components/schemas/ErrorResponse" - } - } - } - }, - "404": { - "description": "Not Found", - "content": { - "application/json": { - "schema": { - "$ref": "#/components/schemas/NotFoundResponse" - } - } - } - }, - "200": { - "description": "successful operation", - "content": { - "application/json": { - "schema": { - "$ref": "#/components/schemas/AgentRelationTasksGetResponse" - } - } - } - } - }, - "security": [ - { - "bearerAuth": [ - [ - "permAgentRead" - ] - ] - } - ], - "description": "GET request to retrieve a single object.", - "parameters": [ - { - "name": "id", - "in": "path", - "required": true, - "schema": { - "type": "integer", - "format": "int32", - "example": 10 - } - } - ] - } - }, - "/api/v2/ui/agents/{id:[0-9]+}/relationships/{relation:tasks}": { - "get": { - "tags": [ - "Agents" - ], - "responses": { - "400": { - "description": "Invalid request", - "content": { - "application/json": { - "schema": { - "$ref": "#/components/schemas/ErrorResponse" - } - } - } - }, - "401": { - "description": "Authentication failed", - "content": { - "application/json": { - "schema": { - "$ref": "#/components/schemas/ErrorResponse" - } - } - } - }, - "404": { - "description": "Not Found", - "content": { - "application/json": { - "schema": { - "$ref": "#/components/schemas/NotFoundResponse" - } - } - } - }, - "200": { - "description": "successful operation", - "content": { - "application/json": { - "schema": { - "$ref": "#/components/schemas/AgentResponse" - } - } - } - } - }, - "security": [ - { - "bearerAuth": [ - [ - "permAgentRead" - ] - ] - } - ], - "description": "GET request for for a to-one relationship link. Returns the resource record of the object that is part of the specified relation.", - "parameters": [ - { - "name": "id", - "in": "path", - "required": true, - "schema": { - "type": "integer", - "format": "int32", - "example": 10 - } - } - ] - }, - "patch": { - "tags": [ - "Agents" - ], - "responses": { - "400": { - "description": "Invalid request", - "content": { - "application/json": { - "schema": { - "$ref": "#/components/schemas/ErrorResponse" - } - } - } - }, - "401": { - "description": "Authentication failed", - "content": { - "application/json": { - "schema": { - "$ref": "#/components/schemas/ErrorResponse" - } - } - } - }, - "204": { - "description": "Succesfull operation" - }, - "404": { - "description": "Not Found", - "content": { - "application/json": { - "schema": { - "$ref": "#/components/schemas/NotFoundResponse" - } - } - } - } - }, - "security": [ - { - "bearerAuth": [ - [ - "permAgentUpdate" - ] - ] - } - ], - "description": "", - "requestBody": { - "required": true, - "content": { - "application/json": { - "schema": { - "$ref": "#/components/schemas/AgentRelationTasks" - } - } - } - }, - "parameters": [] - }, - "post": { - "tags": [ - "Agents" - ], - "responses": { - "400": { - "description": "Invalid request", - "content": { - "application/json": { - "schema": { - "$ref": "#/components/schemas/ErrorResponse" - } - } - } - }, - "401": { - "description": "Authentication failed", - "content": { - "application/json": { - "schema": { - "$ref": "#/components/schemas/ErrorResponse" - } - } - } - }, - "204": { - "description": "successfully created" - }, - "404": { - "description": "Not Found", - "content": { - "application/json": { - "schema": { - "$ref": "#/components/schemas/NotFoundResponse" - } - } - } - } - }, - "security": [ - { - "bearerAuth": [ - [ - "permAgentCreate" - ] - ] - } - ], - "description": "", - "requestBody": { - "required": true, - "content": { - "application/json": [] - } - }, - "parameters": [] - }, - "delete": { - "tags": [ - "Agents" - ], - "responses": { - "400": { - "description": "Invalid request", - "content": { - "application/json": { - "schema": { - "$ref": "#/components/schemas/ErrorResponse" - } - } - } - }, - "401": { - "description": "Authentication failed", - "content": { - "application/json": { - "schema": { - "$ref": "#/components/schemas/ErrorResponse" - } - } - } - }, - "204": { - "description": "successfully deleted" - }, - "404": { - "description": "Not Found", - "content": { - "application/json": { - "schema": { - "$ref": "#/components/schemas/NotFoundResponse" - } - } - } - } - }, - "security": [ - { - "bearerAuth": [ - [ - "permAgentDelete" - ] - ] - } - ], - "description": "", - "requestBody": { - "required": true, - "content": { - "application/json": { - "schema": { - "$ref": "#/components/schemas/AgentRelationTasks" - } - } - } - }, - "parameters": [] - } - }, - "/api/v2/ui/agents/{id:[0-9]+}/{relation:assignments}": { - "get": { - "tags": [ - "Agents" - ], - "responses": { - "400": { - "description": "Invalid request", - "content": { - "application/json": { - "schema": { - "$ref": "#/components/schemas/ErrorResponse" - } - } - } - }, - "401": { - "description": "Authentication failed", - "content": { - "application/json": { - "schema": { - "$ref": "#/components/schemas/ErrorResponse" - } - } - } - }, - "404": { - "description": "Not Found", - "content": { - "application/json": { - "schema": { - "$ref": "#/components/schemas/NotFoundResponse" - } - } - } - }, - "200": { - "description": "successful operation", - "content": { - "application/json": { - "schema": { - "$ref": "#/components/schemas/AgentRelationAssignmentsGetResponse" - } - } - } - } - }, - "security": [ - { - "bearerAuth": [ - [ - "permAgentRead" - ] - ] - } - ], - "description": "GET request to retrieve a single object.", - "parameters": [ - { - "name": "id", - "in": "path", - "required": true, - "schema": { - "type": "integer", - "format": "int32", - "example": 10 - } - } - ] - } - }, - "/api/v2/ui/agents/{id:[0-9]+}/relationships/{relation:assignments}": { - "get": { - "tags": [ - "Agents" - ], - "responses": { - "400": { - "description": "Invalid request", - "content": { - "application/json": { - "schema": { - "$ref": "#/components/schemas/ErrorResponse" - } - } - } - }, - "401": { - "description": "Authentication failed", - "content": { - "application/json": { - "schema": { - "$ref": "#/components/schemas/ErrorResponse" - } - } - } - }, - "404": { - "description": "Not Found", - "content": { - "application/json": { - "schema": { - "$ref": "#/components/schemas/NotFoundResponse" - } - } - } - }, - "200": { - "description": "successful operation", - "content": { - "application/json": { - "schema": { - "$ref": "#/components/schemas/AgentResponse" - } - } - } - } - }, - "security": [ - { - "bearerAuth": [ - [ - "permAgentRead" - ] - ] - } - ], - "description": "GET request for for a to-one relationship link. Returns the resource record of the object that is part of the specified relation.", - "parameters": [ - { - "name": "id", - "in": "path", - "required": true, - "schema": { - "type": "integer", - "format": "int32", - "example": 10 - } - } - ] - }, - "patch": { - "tags": [ - "Agents" - ], - "responses": { - "400": { - "description": "Invalid request", - "content": { - "application/json": { - "schema": { - "$ref": "#/components/schemas/ErrorResponse" - } - } - } - }, - "401": { - "description": "Authentication failed", - "content": { - "application/json": { - "schema": { - "$ref": "#/components/schemas/ErrorResponse" - } - } - } - }, - "204": { - "description": "Succesfull operation" - }, - "404": { - "description": "Not Found", - "content": { - "application/json": { - "schema": { - "$ref": "#/components/schemas/NotFoundResponse" - } - } - } - } - }, - "security": [ - { - "bearerAuth": [ - [ - "permAgentUpdate" - ] - ] - } - ], - "description": "", - "requestBody": { - "required": true, - "content": { - "application/json": { - "schema": { - "$ref": "#/components/schemas/AgentRelationAssignments" - } - } - } - }, - "parameters": [] - }, - "post": { - "tags": [ - "Agents" - ], - "responses": { - "400": { - "description": "Invalid request", - "content": { - "application/json": { - "schema": { - "$ref": "#/components/schemas/ErrorResponse" - } - } - } - }, - "401": { - "description": "Authentication failed", - "content": { - "application/json": { - "schema": { - "$ref": "#/components/schemas/ErrorResponse" - } - } - } - }, - "204": { - "description": "successfully created" - }, - "404": { - "description": "Not Found", - "content": { - "application/json": { - "schema": { - "$ref": "#/components/schemas/NotFoundResponse" - } - } - } - } - }, - "security": [ - { - "bearerAuth": [ - [ - "permAgentCreate" - ] - ] - } - ], - "description": "", - "requestBody": { - "required": true, - "content": { - "application/json": [] - } - }, - "parameters": [] - }, - "delete": { - "tags": [ - "Agents" - ], - "responses": { - "400": { - "description": "Invalid request", - "content": { - "application/json": { - "schema": { - "$ref": "#/components/schemas/ErrorResponse" - } - } - } - }, - "401": { - "description": "Authentication failed", - "content": { - "application/json": { - "schema": { - "$ref": "#/components/schemas/ErrorResponse" - } - } - } - }, - "204": { - "description": "successfully deleted" - }, - "404": { - "description": "Not Found", - "content": { - "application/json": { - "schema": { - "$ref": "#/components/schemas/NotFoundResponse" - } - } - } - } - }, - "security": [ - { - "bearerAuth": [ - [ - "permAgentDelete" - ] - ] - } - ], - "description": "", - "requestBody": { - "required": true, - "content": { - "application/json": { - "schema": { - "$ref": "#/components/schemas/AgentRelationAssignments" - } - } - } - }, - "parameters": [] - } - }, - "/api/v2/ui/agents/{id:[0-9]+}": { - "get": { - "tags": [ - "Agents" - ], - "responses": { - "400": { - "description": "Invalid request", - "content": { - "application/json": { - "schema": { - "$ref": "#/components/schemas/ErrorResponse" - } - } - } - }, - "401": { - "description": "Authentication failed", - "content": { - "application/json": { - "schema": { - "$ref": "#/components/schemas/ErrorResponse" - } - } - } - }, - "404": { - "description": "Not Found", - "content": { - "application/json": { - "schema": { - "$ref": "#/components/schemas/NotFoundResponse" - } - } - } - }, - "200": { - "description": "successful operation", - "content": { - "application/json": { - "schema": { - "$ref": "#/components/schemas/AgentResponse" - } - } - } - } - }, - "security": [ - { - "bearerAuth": [ - [ - "permAgentRead" - ] - ] - } - ], - "description": "GET request to retrieve a single object.", - "parameters": [ - { - "name": "id", - "in": "path", - "required": true, - "schema": { - "type": "integer", - "format": "int32", - "example": 10 - } - }, - { - "name": "include", - "in": "query", - "schema": { - "type": "string" - }, - "description": "Items to include. Comma seperated" - } - ] - }, - "patch": { - "tags": [ - "Agents" - ], - "responses": { - "400": { - "description": "Invalid request", - "content": { - "application/json": { - "schema": { - "$ref": "#/components/schemas/ErrorResponse" - } - } - } - }, - "401": { - "description": "Authentication failed", - "content": { - "application/json": { - "schema": { - "$ref": "#/components/schemas/ErrorResponse" - } - } - } - }, - "404": { - "description": "Not Found", - "content": { - "application/json": { - "schema": { - "$ref": "#/components/schemas/NotFoundResponse" - } - } - } - }, - "200": { - "description": "successful operation", - "content": { - "application/json": { - "schema": { - "$ref": "#/components/schemas/AgentPostPatchResponse" - } - } - } - } - }, - "security": [ - { - "bearerAuth": [ - [ - "permAgentUpdate" - ] - ] - } - ], - "description": "PATCH request to update attributes of a single object.", - "requestBody": { - "required": true, - "content": { - "application/json": { - "schema": { - "$ref": "#/components/schemas/AgentPatch" - } - } - } - }, - "parameters": [] - }, - "delete": { - "tags": [ - "Agents" - ], - "responses": { - "400": { - "description": "Invalid request", - "content": { - "application/json": { - "schema": { - "$ref": "#/components/schemas/ErrorResponse" - } - } - } - }, - "401": { - "description": "Authentication failed", - "content": { - "application/json": { - "schema": { - "$ref": "#/components/schemas/ErrorResponse" - } - } - } - }, - "404": { - "description": "Not Found", - "content": { - "application/json": { - "schema": { - "$ref": "#/components/schemas/NotFoundResponse" - } - } - } - }, - "204": { - "description": "successfully deleted" - } - }, - "security": [ - { - "bearerAuth": [ - [ - "permAgentDelete" - ] - ] - } - ], - "description": "", - "requestBody": { - "required": true, - "content": { - "application/json": [] - } - }, - "parameters": [] - } - }, - "/api/v2/ui/agentstats": { - "get": { - "tags": [ - "AgentStats" - ], - "responses": { - "400": { - "description": "Invalid request", - "content": { - "application/json": { - "schema": { - "$ref": "#/components/schemas/ErrorResponse" - } - } - } - }, - "401": { - "description": "Authentication failed", - "content": { - "application/json": { - "schema": { - "$ref": "#/components/schemas/ErrorResponse" - } - } - } - }, - "200": { - "description": "successful operation", - "content": { - "application/json": { - "schema": { - "type": "array", - "items": { - "$ref": "#/components/schemas/AgentStatResponse" - } - } - } - } - } - }, - "security": [ - { - "bearerAuth": [ - [ - "permAgentStatRead" - ] - ] - } - ], - "description": "GET many request to retrieve multiple objects.", - "parameters": [ - { - "name": "page[after]", - "in": "path", - "schema": { - "type": "integer", - "format": "int32" - }, - "example": 0, - "description": "Pointer to paginate to retrieve the data after the value provided" - }, - { - "name": "page[before]", - "in": "path", - "schema": { - "type": "integer", - "format": "int32" - }, - "example": 0, - "description": "Pointer to paginate to retrieve the data before the value provided" - }, - { - "name": "page[size]", - "in": "path", - "schema": { - "type": "integer", - "format": "int32" - }, - "example": 100, - "description": "Amout of data to retrieve inside a single page" - }, - { - "name": "filter", - "in": "path", - "style": "deepobject", - "explode": true, - "schema": { - "type": "object" - }, - "description": "Filters results using a query", - "example": "\"filter[hashlistId__gt]\": 200" - }, - { - "name": "include", - "in": "path", - "schema": { - "type": "string" - }, - "description": "Items to include, comma seperated. Possible options: " - } - ] - }, - "delete": { - "tags": [ - "AgentStats" - ], - "responses": { - "400": { - "description": "Invalid request", - "content": { - "application/json": { - "schema": { - "$ref": "#/components/schemas/ErrorResponse" - } - } - } - }, - "401": { - "description": "Authentication failed", - "content": { - "application/json": { - "schema": { - "$ref": "#/components/schemas/ErrorResponse" - } - } - } - } - }, - "security": [ - { - "bearerAuth": [ - [ - "permAgentStatDelete" - ] - ] - } - ], - "description": "", - "parameters": [] - } - }, - "/api/v2/ui/agentstats/count": { - "get": { - "tags": [ - "AgentStats" - ], - "responses": { - "400": { - "description": "Invalid request", - "content": { - "application/json": { - "schema": { - "$ref": "#/components/schemas/ErrorResponse" - } - } - } - }, - "401": { - "description": "Authentication failed", - "content": { - "application/json": { - "schema": { - "$ref": "#/components/schemas/ErrorResponse" - } - } - } - }, - "200": { - "description": "successful operation", - "content": { - "application/json": { - "schema": { - "type": "array", - "items": { - "$ref": "#/components/schemas/AgentStatResponse" - } - } - } - } - } - }, - "security": [ - { - "bearerAuth": [ - [ - "permAgentStatRead" - ] - ] - } - ], - "description": "GET many request to retrieve multiple objects.", - "parameters": [ - { - "name": "page[after]", - "in": "path", - "schema": { - "type": "integer", - "format": "int32" - }, - "example": 0, - "description": "Pointer to paginate to retrieve the data after the value provided" - }, - { - "name": "page[before]", - "in": "path", - "schema": { - "type": "integer", - "format": "int32" - }, - "example": 0, - "description": "Pointer to paginate to retrieve the data before the value provided" - }, - { - "name": "page[size]", - "in": "path", - "schema": { - "type": "integer", - "format": "int32" - }, - "example": 100, - "description": "Amout of data to retrieve inside a single page" - }, - { - "name": "filter", - "in": "path", - "style": "deepobject", - "explode": true, - "schema": { - "type": "object" - }, - "description": "Filters results using a query", - "example": "\"filter[hashlistId__gt]\": 200" - }, - { - "name": "include", - "in": "path", - "schema": { - "type": "string" - }, - "description": "Items to include, comma seperated. Possible options: " - } - ] - } - }, - "/api/v2/ui/agentstats/{id:[0-9]+}": { - "get": { - "tags": [ - "AgentStats" - ], - "responses": { - "400": { - "description": "Invalid request", - "content": { - "application/json": { - "schema": { - "$ref": "#/components/schemas/ErrorResponse" - } - } - } - }, - "401": { - "description": "Authentication failed", - "content": { - "application/json": { - "schema": { - "$ref": "#/components/schemas/ErrorResponse" - } - } - } - }, - "404": { - "description": "Not Found", - "content": { - "application/json": { - "schema": { - "$ref": "#/components/schemas/NotFoundResponse" - } - } - } - }, - "200": { - "description": "successful operation", - "content": { - "application/json": { - "schema": { - "$ref": "#/components/schemas/AgentStatResponse" - } - } - } - } - }, - "security": [ - { - "bearerAuth": [ - [ - "permAgentStatRead" - ] - ] - } - ], - "description": "GET request to retrieve a single object.", - "parameters": [ - { - "name": "id", - "in": "path", - "required": true, - "schema": { - "type": "integer", - "format": "int32", - "example": 10 - } - }, - { - "name": "include", - "in": "query", - "schema": { - "type": "string" - }, - "description": "Items to include. Comma seperated" - } - ] - }, - "delete": { - "tags": [ - "AgentStats" - ], - "responses": { - "400": { - "description": "Invalid request", - "content": { - "application/json": { - "schema": { - "$ref": "#/components/schemas/ErrorResponse" - } - } - } - }, - "401": { - "description": "Authentication failed", - "content": { - "application/json": { - "schema": { - "$ref": "#/components/schemas/ErrorResponse" - } - } - } - }, - "404": { - "description": "Not Found", - "content": { - "application/json": { - "schema": { - "$ref": "#/components/schemas/NotFoundResponse" - } - } - } - }, - "204": { - "description": "successfully deleted" - } - }, - "security": [ - { - "bearerAuth": [ - [ - "permAgentStatDelete" - ] - ] - } - ], - "description": "", - "requestBody": { - "required": true, - "content": { - "application/json": [] - } - }, - "parameters": [] - } - }, - "/api/v2/ui/chunks": { - "get": { - "tags": [ - "Chunks" - ], - "responses": { - "400": { - "description": "Invalid request", - "content": { - "application/json": { - "schema": { - "$ref": "#/components/schemas/ErrorResponse" - } - } - } - }, - "401": { - "description": "Authentication failed", - "content": { - "application/json": { - "schema": { - "$ref": "#/components/schemas/ErrorResponse" - } - } - } - }, - "200": { - "description": "successful operation", - "content": { - "application/json": { - "schema": { - "type": "array", - "items": { - "$ref": "#/components/schemas/ChunkResponse" - } - } - } - } - } - }, - "security": [ - { - "bearerAuth": [ - [ - "permChunkRead" - ] - ] - } - ], - "description": "GET many request to retrieve multiple objects.", - "parameters": [ - { - "name": "page[after]", - "in": "path", - "schema": { - "type": "integer", - "format": "int32" - }, - "example": 0, - "description": "Pointer to paginate to retrieve the data after the value provided" - }, - { - "name": "page[before]", - "in": "path", - "schema": { - "type": "integer", - "format": "int32" - }, - "example": 0, - "description": "Pointer to paginate to retrieve the data before the value provided" - }, - { - "name": "page[size]", - "in": "path", - "schema": { - "type": "integer", - "format": "int32" - }, - "example": 100, - "description": "Amout of data to retrieve inside a single page" - }, - { - "name": "filter", - "in": "path", - "style": "deepobject", - "explode": true, - "schema": { - "type": "object" - }, - "description": "Filters results using a query", - "example": "\"filter[hashlistId__gt]\": 200" - }, - { - "name": "include", - "in": "path", - "schema": { - "type": "string" - }, - "description": "Items to include, comma seperated. Possible options: agent,task" - } - ] - } - }, - "/api/v2/ui/chunks/count": { - "get": { - "tags": [ - "Chunks" - ], - "responses": { - "400": { - "description": "Invalid request", - "content": { - "application/json": { - "schema": { - "$ref": "#/components/schemas/ErrorResponse" - } - } - } - }, - "401": { - "description": "Authentication failed", - "content": { - "application/json": { - "schema": { - "$ref": "#/components/schemas/ErrorResponse" - } - } - } - }, - "200": { - "description": "successful operation", - "content": { - "application/json": { - "schema": { - "type": "array", - "items": { - "$ref": "#/components/schemas/ChunkResponse" - } - } - } - } - } - }, - "security": [ - { - "bearerAuth": [ - [ - "permChunkRead" - ] - ] - } - ], - "description": "GET many request to retrieve multiple objects.", - "parameters": [ - { - "name": "page[after]", - "in": "path", - "schema": { - "type": "integer", - "format": "int32" - }, - "example": 0, - "description": "Pointer to paginate to retrieve the data after the value provided" - }, - { - "name": "page[before]", - "in": "path", - "schema": { - "type": "integer", - "format": "int32" - }, - "example": 0, - "description": "Pointer to paginate to retrieve the data before the value provided" - }, - { - "name": "page[size]", - "in": "path", - "schema": { - "type": "integer", - "format": "int32" - }, - "example": 100, - "description": "Amout of data to retrieve inside a single page" - }, - { - "name": "filter", - "in": "path", - "style": "deepobject", - "explode": true, - "schema": { - "type": "object" - }, - "description": "Filters results using a query", - "example": "\"filter[hashlistId__gt]\": 200" - }, - { - "name": "include", - "in": "path", - "schema": { - "type": "string" - }, - "description": "Items to include, comma seperated. Possible options: agent,task" - } - ] - } - }, - "/api/v2/ui/chunks/{id:[0-9]+}/{relation:agent}": { - "get": { - "tags": [ - "Chunks" - ], - "responses": { - "400": { - "description": "Invalid request", - "content": { - "application/json": { - "schema": { - "$ref": "#/components/schemas/ErrorResponse" - } - } - } - }, - "401": { - "description": "Authentication failed", - "content": { - "application/json": { - "schema": { - "$ref": "#/components/schemas/ErrorResponse" - } - } - } - }, - "404": { - "description": "Not Found", - "content": { - "application/json": { - "schema": { - "$ref": "#/components/schemas/NotFoundResponse" - } - } - } - }, - "200": { - "description": "successful operation", - "content": { - "application/json": { - "schema": { - "$ref": "#/components/schemas/ChunkRelationAgentGetResponse" - } - } - } - } - }, - "security": [ - { - "bearerAuth": [ - [ - "permChunkRead" - ] - ] - } - ], - "description": "GET request to retrieve a single object.", - "parameters": [ - { - "name": "id", - "in": "path", - "required": true, - "schema": { - "type": "integer", - "format": "int32", - "example": 10 - } - } - ] - } - }, - "/api/v2/ui/chunks/{id:[0-9]+}/relationships/{relation:agent}": { - "get": { - "tags": [ - "Chunks" - ], - "responses": { - "400": { - "description": "Invalid request", - "content": { - "application/json": { - "schema": { - "$ref": "#/components/schemas/ErrorResponse" - } - } - } - }, - "401": { - "description": "Authentication failed", - "content": { - "application/json": { - "schema": { - "$ref": "#/components/schemas/ErrorResponse" - } - } - } - }, - "404": { - "description": "Not Found", - "content": { - "application/json": { - "schema": { - "$ref": "#/components/schemas/NotFoundResponse" - } - } - } - }, - "200": { - "description": "successful operation", - "content": { - "application/json": { - "schema": { - "$ref": "#/components/schemas/ChunkResponse" - } - } - } - } - }, - "security": [ - { - "bearerAuth": [ - [ - "permChunkRead" - ] - ] - } - ], - "description": "GET request for for a to-one relationship link. Returns the resource record of the object that is part of the specified relation.", - "parameters": [ - { - "name": "id", - "in": "path", - "required": true, - "schema": { - "type": "integer", - "format": "int32", - "example": 10 - } - } - ] - }, - "patch": { - "tags": [ - "Chunks" - ], - "responses": { - "400": { - "description": "Invalid request", - "content": { - "application/json": { - "schema": { - "$ref": "#/components/schemas/ErrorResponse" - } - } - } - }, - "401": { - "description": "Authentication failed", - "content": { - "application/json": { - "schema": { - "$ref": "#/components/schemas/ErrorResponse" - } - } - } - }, - "204": { - "description": "Succesfull operation" - }, - "404": { - "description": "Not Found", - "content": { - "application/json": { - "schema": { - "$ref": "#/components/schemas/NotFoundResponse" - } - } - } - } - }, - "security": [ - { - "bearerAuth": [ - [ - "permChunkUpdate" - ] - ] - } - ], - "description": "", - "requestBody": { - "required": true, - "content": { - "application/json": { - "schema": { - "$ref": "#/components/schemas/ChunkRelationAgent" - } - } - } - }, - "parameters": [] - } - }, - "/api/v2/ui/chunks/{id:[0-9]+}/{relation:task}": { - "get": { - "tags": [ - "Chunks" - ], - "responses": { - "400": { - "description": "Invalid request", - "content": { - "application/json": { - "schema": { - "$ref": "#/components/schemas/ErrorResponse" - } - } - } - }, - "401": { - "description": "Authentication failed", - "content": { - "application/json": { - "schema": { - "$ref": "#/components/schemas/ErrorResponse" - } - } - } - }, - "404": { - "description": "Not Found", - "content": { - "application/json": { - "schema": { - "$ref": "#/components/schemas/NotFoundResponse" - } - } - } - }, - "200": { - "description": "successful operation", - "content": { - "application/json": { - "schema": { - "$ref": "#/components/schemas/ChunkRelationTaskGetResponse" - } - } - } - } - }, - "security": [ - { - "bearerAuth": [ - [ - "permChunkRead" - ] - ] - } - ], - "description": "GET request to retrieve a single object.", - "parameters": [ - { - "name": "id", - "in": "path", - "required": true, - "schema": { - "type": "integer", - "format": "int32", - "example": 10 - } - } - ] - } - }, - "/api/v2/ui/chunks/{id:[0-9]+}/relationships/{relation:task}": { - "get": { - "tags": [ - "Chunks" - ], - "responses": { - "400": { - "description": "Invalid request", - "content": { - "application/json": { - "schema": { - "$ref": "#/components/schemas/ErrorResponse" - } - } - } - }, - "401": { - "description": "Authentication failed", - "content": { - "application/json": { - "schema": { - "$ref": "#/components/schemas/ErrorResponse" - } - } - } - }, - "404": { - "description": "Not Found", - "content": { - "application/json": { - "schema": { - "$ref": "#/components/schemas/NotFoundResponse" - } - } - } - }, - "200": { - "description": "successful operation", - "content": { - "application/json": { - "schema": { - "$ref": "#/components/schemas/ChunkResponse" - } - } - } - } - }, - "security": [ - { - "bearerAuth": [ - [ - "permChunkRead" - ] - ] - } - ], - "description": "GET request for for a to-one relationship link. Returns the resource record of the object that is part of the specified relation.", - "parameters": [ - { - "name": "id", - "in": "path", - "required": true, - "schema": { - "type": "integer", - "format": "int32", - "example": 10 - } - } - ] - }, - "patch": { - "tags": [ - "Chunks" - ], - "responses": { - "400": { - "description": "Invalid request", - "content": { - "application/json": { - "schema": { - "$ref": "#/components/schemas/ErrorResponse" - } - } - } - }, - "401": { - "description": "Authentication failed", - "content": { - "application/json": { - "schema": { - "$ref": "#/components/schemas/ErrorResponse" - } - } - } - }, - "204": { - "description": "Succesfull operation" - }, - "404": { - "description": "Not Found", - "content": { - "application/json": { - "schema": { - "$ref": "#/components/schemas/NotFoundResponse" - } - } - } - } - }, - "security": [ - { - "bearerAuth": [ - [ - "permChunkUpdate" - ] - ] - } - ], - "description": "", - "requestBody": { - "required": true, - "content": { - "application/json": { - "schema": { - "$ref": "#/components/schemas/ChunkRelationTask" - } - } - } - }, - "parameters": [] - } - }, - "/api/v2/ui/chunks/{id:[0-9]+}": { - "get": { - "tags": [ - "Chunks" - ], - "responses": { - "400": { - "description": "Invalid request", - "content": { - "application/json": { - "schema": { - "$ref": "#/components/schemas/ErrorResponse" - } - } - } - }, - "401": { - "description": "Authentication failed", - "content": { - "application/json": { - "schema": { - "$ref": "#/components/schemas/ErrorResponse" - } - } - } - }, - "404": { - "description": "Not Found", - "content": { - "application/json": { - "schema": { - "$ref": "#/components/schemas/NotFoundResponse" - } - } - } - }, - "200": { - "description": "successful operation", - "content": { - "application/json": { - "schema": { - "$ref": "#/components/schemas/ChunkResponse" - } - } - } - } - }, - "security": [ - { - "bearerAuth": [ - [ - "permChunkRead" - ] - ] - } - ], - "description": "GET request to retrieve a single object.", - "parameters": [ - { - "name": "id", - "in": "path", - "required": true, - "schema": { - "type": "integer", - "format": "int32", - "example": 10 - } - }, - { - "name": "include", - "in": "query", - "schema": { - "type": "string" - }, - "description": "Items to include. Comma seperated" - } - ] - } - }, - "/api/v2/ui/configs": { - "get": { - "tags": [ - "Configs" - ], - "responses": { - "400": { - "description": "Invalid request", - "content": { - "application/json": { - "schema": { - "$ref": "#/components/schemas/ErrorResponse" - } - } - } - }, - "401": { - "description": "Authentication failed", - "content": { - "application/json": { - "schema": { - "$ref": "#/components/schemas/ErrorResponse" - } - } - } - }, - "200": { - "description": "successful operation", - "content": { - "application/json": { - "schema": { - "type": "array", - "items": { - "$ref": "#/components/schemas/ConfigResponse" - } - } - } - } - } - }, - "security": [ - { - "bearerAuth": [ - [ - "permConfigRead" - ] - ] - } - ], - "description": "GET many request to retrieve multiple objects.", - "parameters": [ - { - "name": "page[after]", - "in": "path", - "schema": { - "type": "integer", - "format": "int32" - }, - "example": 0, - "description": "Pointer to paginate to retrieve the data after the value provided" - }, - { - "name": "page[before]", - "in": "path", - "schema": { - "type": "integer", - "format": "int32" - }, - "example": 0, - "description": "Pointer to paginate to retrieve the data before the value provided" - }, - { - "name": "page[size]", - "in": "path", - "schema": { - "type": "integer", - "format": "int32" - }, - "example": 100, - "description": "Amout of data to retrieve inside a single page" - }, - { - "name": "filter", - "in": "path", - "style": "deepobject", - "explode": true, - "schema": { - "type": "object" - }, - "description": "Filters results using a query", - "example": "\"filter[hashlistId__gt]\": 200" - }, - { - "name": "include", - "in": "path", - "schema": { - "type": "string" - }, - "description": "Items to include, comma seperated. Possible options: configSection" - } - ] - }, - "patch": { - "tags": [ - "Configs" - ], - "responses": { - "400": { - "description": "Invalid request", - "content": { - "application/json": { - "schema": { - "$ref": "#/components/schemas/ErrorResponse" - } - } - } - }, - "401": { - "description": "Authentication failed", - "content": { - "application/json": { - "schema": { - "$ref": "#/components/schemas/ErrorResponse" - } - } - } - } - }, - "security": [ - { - "bearerAuth": [ - [ - "permConfigUpdate" - ] - ] - } - ], - "description": "PATCH request to update attributes of a single object.", - "parameters": [] - } - }, - "/api/v2/ui/configs/count": { - "get": { - "tags": [ - "Configs" - ], - "responses": { - "400": { - "description": "Invalid request", - "content": { - "application/json": { - "schema": { - "$ref": "#/components/schemas/ErrorResponse" - } - } - } - }, - "401": { - "description": "Authentication failed", - "content": { - "application/json": { - "schema": { - "$ref": "#/components/schemas/ErrorResponse" - } - } - } - }, - "200": { - "description": "successful operation", - "content": { - "application/json": { - "schema": { - "type": "array", - "items": { - "$ref": "#/components/schemas/ConfigResponse" - } - } - } - } - } - }, - "security": [ - { - "bearerAuth": [ - [ - "permConfigRead" - ] - ] - } - ], - "description": "GET many request to retrieve multiple objects.", - "parameters": [ - { - "name": "page[after]", - "in": "path", - "schema": { - "type": "integer", - "format": "int32" - }, - "example": 0, - "description": "Pointer to paginate to retrieve the data after the value provided" - }, - { - "name": "page[before]", - "in": "path", - "schema": { - "type": "integer", - "format": "int32" - }, - "example": 0, - "description": "Pointer to paginate to retrieve the data before the value provided" - }, - { - "name": "page[size]", - "in": "path", - "schema": { - "type": "integer", - "format": "int32" - }, - "example": 100, - "description": "Amout of data to retrieve inside a single page" - }, - { - "name": "filter", - "in": "path", - "style": "deepobject", - "explode": true, - "schema": { - "type": "object" - }, - "description": "Filters results using a query", - "example": "\"filter[hashlistId__gt]\": 200" - }, - { - "name": "include", - "in": "path", - "schema": { - "type": "string" - }, - "description": "Items to include, comma seperated. Possible options: configSection" - } - ] - } - }, - "/api/v2/ui/configs/{id:[0-9]+}/{relation:configSection}": { - "get": { - "tags": [ - "Configs" - ], - "responses": { - "400": { - "description": "Invalid request", - "content": { - "application/json": { - "schema": { - "$ref": "#/components/schemas/ErrorResponse" - } - } - } - }, - "401": { - "description": "Authentication failed", - "content": { - "application/json": { - "schema": { - "$ref": "#/components/schemas/ErrorResponse" - } - } - } - }, - "404": { - "description": "Not Found", - "content": { - "application/json": { - "schema": { - "$ref": "#/components/schemas/NotFoundResponse" - } - } - } - }, - "200": { - "description": "successful operation", - "content": { - "application/json": { - "schema": { - "$ref": "#/components/schemas/ConfigRelationConfigSectionGetResponse" - } - } - } - } - }, - "security": [ - { - "bearerAuth": [ - [ - "permConfigRead" - ] - ] - } - ], - "description": "GET request to retrieve a single object.", - "parameters": [ - { - "name": "id", - "in": "path", - "required": true, - "schema": { - "type": "integer", - "format": "int32", - "example": 10 - } - } - ] - } - }, - "/api/v2/ui/configs/{id:[0-9]+}/relationships/{relation:configSection}": { - "get": { - "tags": [ - "Configs" - ], - "responses": { - "400": { - "description": "Invalid request", - "content": { - "application/json": { - "schema": { - "$ref": "#/components/schemas/ErrorResponse" - } - } - } - }, - "401": { - "description": "Authentication failed", - "content": { - "application/json": { - "schema": { - "$ref": "#/components/schemas/ErrorResponse" - } - } - } - }, - "404": { - "description": "Not Found", - "content": { - "application/json": { - "schema": { - "$ref": "#/components/schemas/NotFoundResponse" - } - } - } - }, - "200": { - "description": "successful operation", - "content": { - "application/json": { - "schema": { - "$ref": "#/components/schemas/ConfigResponse" - } - } - } - } - }, - "security": [ - { - "bearerAuth": [ - [ - "permConfigRead" - ] - ] - } - ], - "description": "GET request for for a to-one relationship link. Returns the resource record of the object that is part of the specified relation.", - "parameters": [ - { - "name": "id", - "in": "path", - "required": true, - "schema": { - "type": "integer", - "format": "int32", - "example": 10 - } - } - ] - }, - "patch": { - "tags": [ - "Configs" - ], - "responses": { - "400": { - "description": "Invalid request", - "content": { - "application/json": { - "schema": { - "$ref": "#/components/schemas/ErrorResponse" - } - } - } - }, - "401": { - "description": "Authentication failed", - "content": { - "application/json": { - "schema": { - "$ref": "#/components/schemas/ErrorResponse" - } - } - } - }, - "204": { - "description": "Succesfull operation" - }, - "404": { - "description": "Not Found", - "content": { - "application/json": { - "schema": { - "$ref": "#/components/schemas/NotFoundResponse" - } - } - } - } - }, - "security": [ - { - "bearerAuth": [ - [ - "permConfigUpdate" - ] - ] - } - ], - "description": "", - "requestBody": { - "required": true, - "content": { - "application/json": { - "schema": { - "$ref": "#/components/schemas/ConfigRelationConfigSection" - } - } - } - }, - "parameters": [] - } - }, - "/api/v2/ui/configs/{id:[0-9]+}": { - "get": { - "tags": [ - "Configs" - ], - "responses": { - "400": { - "description": "Invalid request", - "content": { - "application/json": { - "schema": { - "$ref": "#/components/schemas/ErrorResponse" - } - } - } - }, - "401": { - "description": "Authentication failed", - "content": { - "application/json": { - "schema": { - "$ref": "#/components/schemas/ErrorResponse" - } - } - } - }, - "404": { - "description": "Not Found", - "content": { - "application/json": { - "schema": { - "$ref": "#/components/schemas/NotFoundResponse" - } - } - } - }, - "200": { - "description": "successful operation", - "content": { - "application/json": { - "schema": { - "$ref": "#/components/schemas/ConfigResponse" - } - } - } - } - }, - "security": [ - { - "bearerAuth": [ - [ - "permConfigRead" - ] - ] - } - ], - "description": "GET request to retrieve a single object.", - "parameters": [ - { - "name": "id", - "in": "path", - "required": true, - "schema": { - "type": "integer", - "format": "int32", - "example": 10 - } - }, - { - "name": "include", - "in": "query", - "schema": { - "type": "string" - }, - "description": "Items to include. Comma seperated" - } - ] - }, - "patch": { - "tags": [ - "Configs" - ], - "responses": { - "400": { - "description": "Invalid request", - "content": { - "application/json": { - "schema": { - "$ref": "#/components/schemas/ErrorResponse" - } - } - } - }, - "401": { - "description": "Authentication failed", - "content": { - "application/json": { - "schema": { - "$ref": "#/components/schemas/ErrorResponse" - } - } - } - }, - "404": { - "description": "Not Found", - "content": { - "application/json": { - "schema": { - "$ref": "#/components/schemas/NotFoundResponse" - } - } - } - }, - "200": { - "description": "successful operation", - "content": { - "application/json": { - "schema": { - "$ref": "#/components/schemas/ConfigPostPatchResponse" - } - } - } - } - }, - "security": [ - { - "bearerAuth": [ - [ - "permConfigUpdate" - ] - ] - } - ], - "description": "PATCH request to update attributes of a single object.", - "requestBody": { - "required": true, - "content": { - "application/json": { - "schema": { - "$ref": "#/components/schemas/ConfigPatch" - } - } - } - }, - "parameters": [] - } - }, - "/api/v2/ui/configsections": { - "get": { - "tags": [ - "ConfigSections" - ], - "responses": { - "400": { - "description": "Invalid request", - "content": { - "application/json": { - "schema": { - "$ref": "#/components/schemas/ErrorResponse" - } - } - } - }, - "401": { - "description": "Authentication failed", - "content": { - "application/json": { - "schema": { - "$ref": "#/components/schemas/ErrorResponse" - } - } - } - }, - "200": { - "description": "successful operation", - "content": { - "application/json": { - "schema": { - "type": "array", - "items": { - "$ref": "#/components/schemas/ConfigSectionResponse" - } - } - } - } - } - }, - "security": [ - { - "bearerAuth": [ - [ - "permConfigSectionRead" - ] - ] - } - ], - "description": "GET many request to retrieve multiple objects.", - "parameters": [ - { - "name": "page[after]", - "in": "path", - "schema": { - "type": "integer", - "format": "int32" - }, - "example": 0, - "description": "Pointer to paginate to retrieve the data after the value provided" - }, - { - "name": "page[before]", - "in": "path", - "schema": { - "type": "integer", - "format": "int32" - }, - "example": 0, - "description": "Pointer to paginate to retrieve the data before the value provided" - }, - { - "name": "page[size]", - "in": "path", - "schema": { - "type": "integer", - "format": "int32" - }, - "example": 100, - "description": "Amout of data to retrieve inside a single page" - }, - { - "name": "filter", - "in": "path", - "style": "deepobject", - "explode": true, - "schema": { - "type": "object" - }, - "description": "Filters results using a query", - "example": "\"filter[hashlistId__gt]\": 200" - }, - { - "name": "include", - "in": "path", - "schema": { - "type": "string" - }, - "description": "Items to include, comma seperated. Possible options: " - } - ] - } - }, - "/api/v2/ui/configsections/count": { - "get": { - "tags": [ - "ConfigSections" - ], - "responses": { - "400": { - "description": "Invalid request", - "content": { - "application/json": { - "schema": { - "$ref": "#/components/schemas/ErrorResponse" - } - } - } - }, - "401": { - "description": "Authentication failed", - "content": { - "application/json": { - "schema": { - "$ref": "#/components/schemas/ErrorResponse" - } - } - } - }, - "200": { - "description": "successful operation", - "content": { - "application/json": { - "schema": { - "type": "array", - "items": { - "$ref": "#/components/schemas/ConfigSectionResponse" - } - } - } - } - } - }, - "security": [ - { - "bearerAuth": [ - [ - "permConfigSectionRead" - ] - ] - } - ], - "description": "GET many request to retrieve multiple objects.", - "parameters": [ - { - "name": "page[after]", - "in": "path", - "schema": { - "type": "integer", - "format": "int32" - }, - "example": 0, - "description": "Pointer to paginate to retrieve the data after the value provided" - }, - { - "name": "page[before]", - "in": "path", - "schema": { - "type": "integer", - "format": "int32" - }, - "example": 0, - "description": "Pointer to paginate to retrieve the data before the value provided" - }, - { - "name": "page[size]", - "in": "path", - "schema": { - "type": "integer", - "format": "int32" - }, - "example": 100, - "description": "Amout of data to retrieve inside a single page" - }, - { - "name": "filter", - "in": "path", - "style": "deepobject", - "explode": true, - "schema": { - "type": "object" - }, - "description": "Filters results using a query", - "example": "\"filter[hashlistId__gt]\": 200" - }, - { - "name": "include", - "in": "path", - "schema": { - "type": "string" - }, - "description": "Items to include, comma seperated. Possible options: " - } - ] - } - }, - "/api/v2/ui/configsections/{id:[0-9]+}": { - "get": { - "tags": [ - "ConfigSections" - ], - "responses": { - "400": { - "description": "Invalid request", - "content": { - "application/json": { - "schema": { - "$ref": "#/components/schemas/ErrorResponse" - } - } - } - }, - "401": { - "description": "Authentication failed", - "content": { - "application/json": { - "schema": { - "$ref": "#/components/schemas/ErrorResponse" - } - } - } - }, - "404": { - "description": "Not Found", - "content": { - "application/json": { - "schema": { - "$ref": "#/components/schemas/NotFoundResponse" - } - } - } - }, - "200": { - "description": "successful operation", - "content": { - "application/json": { - "schema": { - "$ref": "#/components/schemas/ConfigSectionResponse" - } - } - } - } - }, - "security": [ - { - "bearerAuth": [ - [ - "permConfigSectionRead" - ] - ] - } - ], - "description": "GET request to retrieve a single object.", - "parameters": [ - { - "name": "id", - "in": "path", - "required": true, - "schema": { - "type": "integer", - "format": "int32", - "example": 10 - } - }, - { - "name": "include", - "in": "query", - "schema": { - "type": "string" - }, - "description": "Items to include. Comma seperated" - } - ] - } - }, - "/api/v2/ui/crackers": { - "get": { - "tags": [ - "CrackerBinarys" - ], - "responses": { - "400": { - "description": "Invalid request", - "content": { - "application/json": { - "schema": { - "$ref": "#/components/schemas/ErrorResponse" - } - } - } - }, - "401": { - "description": "Authentication failed", - "content": { - "application/json": { - "schema": { - "$ref": "#/components/schemas/ErrorResponse" - } - } - } - }, - "200": { - "description": "successful operation", - "content": { - "application/json": { - "schema": { - "type": "array", - "items": { - "$ref": "#/components/schemas/CrackerBinaryResponse" - } - } - } - } - } - }, - "security": [ - { - "bearerAuth": [ - [ - "permCrackerBinaryRead" - ] - ] - } - ], - "description": "GET many request to retrieve multiple objects.", - "parameters": [ - { - "name": "page[after]", - "in": "path", - "schema": { - "type": "integer", - "format": "int32" - }, - "example": 0, - "description": "Pointer to paginate to retrieve the data after the value provided" - }, - { - "name": "page[before]", - "in": "path", - "schema": { - "type": "integer", - "format": "int32" - }, - "example": 0, - "description": "Pointer to paginate to retrieve the data before the value provided" - }, - { - "name": "page[size]", - "in": "path", - "schema": { - "type": "integer", - "format": "int32" - }, - "example": 100, - "description": "Amout of data to retrieve inside a single page" - }, - { - "name": "filter", - "in": "path", - "style": "deepobject", - "explode": true, - "schema": { - "type": "object" - }, - "description": "Filters results using a query", - "example": "\"filter[hashlistId__gt]\": 200" - }, - { - "name": "include", - "in": "path", - "schema": { - "type": "string" - }, - "description": "Items to include, comma seperated. Possible options: crackerBinaryType,tasks" - } - ] - }, - "post": { - "tags": [ - "CrackerBinarys" - ], - "responses": { - "400": { - "description": "Invalid request", - "content": { - "application/json": { - "schema": { - "$ref": "#/components/schemas/ErrorResponse" - } - } - } - }, - "401": { - "description": "Authentication failed", - "content": { - "application/json": { - "schema": { - "$ref": "#/components/schemas/ErrorResponse" - } - } - } - }, - "201": { - "description": "successful operation", - "content": { - "application/json": { - "schema": { - "$ref": "#/components/schemas/CrackerBinaryPostPatchResponse" - } - } - } - } - }, - "security": [ - { - "bearerAuth": [ - [ - "permCrackerBinaryCreate" - ] - ] - } - ], - "description": "POST request to create a new object. The request must contain the resource record as data with the attributes of the new object.To add relationships, a relationships object can be added with the resource records of the relations that are part of this object.", - "requestBody": { - "required": true, - "content": { - "application/json": { - "schema": { - "$ref": "#/components/schemas/CrackerBinaryCreate" - } - } - } - }, - "parameters": [] - }, - "patch": { - "tags": [ - "CrackerBinarys" - ], - "responses": { - "400": { - "description": "Invalid request", - "content": { - "application/json": { - "schema": { - "$ref": "#/components/schemas/ErrorResponse" - } - } - } - }, - "401": { - "description": "Authentication failed", - "content": { - "application/json": { - "schema": { - "$ref": "#/components/schemas/ErrorResponse" - } - } - } - } - }, - "security": [ - { - "bearerAuth": [ - [ - "permCrackerBinaryUpdate" - ] - ] - } - ], - "description": "PATCH request to update attributes of a single object.", - "parameters": [] - }, - "delete": { - "tags": [ - "CrackerBinarys" - ], - "responses": { - "400": { - "description": "Invalid request", - "content": { - "application/json": { - "schema": { - "$ref": "#/components/schemas/ErrorResponse" - } - } - } - }, - "401": { - "description": "Authentication failed", - "content": { - "application/json": { - "schema": { - "$ref": "#/components/schemas/ErrorResponse" - } - } - } - } - }, - "security": [ - { - "bearerAuth": [ - [ - "permCrackerBinaryDelete" - ] - ] - } - ], - "description": "", - "parameters": [] - } - }, - "/api/v2/ui/crackers/count": { - "get": { - "tags": [ - "CrackerBinarys" - ], - "responses": { - "400": { - "description": "Invalid request", - "content": { - "application/json": { - "schema": { - "$ref": "#/components/schemas/ErrorResponse" - } - } - } - }, - "401": { - "description": "Authentication failed", - "content": { - "application/json": { - "schema": { - "$ref": "#/components/schemas/ErrorResponse" - } - } - } - }, - "200": { - "description": "successful operation", - "content": { - "application/json": { - "schema": { - "type": "array", - "items": { - "$ref": "#/components/schemas/CrackerBinaryResponse" - } - } - } - } - } - }, - "security": [ - { - "bearerAuth": [ - [ - "permCrackerBinaryRead" - ] - ] - } - ], - "description": "GET many request to retrieve multiple objects.", - "parameters": [ - { - "name": "page[after]", - "in": "path", - "schema": { - "type": "integer", - "format": "int32" - }, - "example": 0, - "description": "Pointer to paginate to retrieve the data after the value provided" - }, - { - "name": "page[before]", - "in": "path", - "schema": { - "type": "integer", - "format": "int32" - }, - "example": 0, - "description": "Pointer to paginate to retrieve the data before the value provided" - }, - { - "name": "page[size]", - "in": "path", - "schema": { - "type": "integer", - "format": "int32" - }, - "example": 100, - "description": "Amout of data to retrieve inside a single page" - }, - { - "name": "filter", - "in": "path", - "style": "deepobject", - "explode": true, - "schema": { - "type": "object" - }, - "description": "Filters results using a query", - "example": "\"filter[hashlistId__gt]\": 200" - }, - { - "name": "include", - "in": "path", - "schema": { - "type": "string" - }, - "description": "Items to include, comma seperated. Possible options: crackerBinaryType,tasks" - } - ] - } - }, - "/api/v2/ui/crackers/{id:[0-9]+}/{relation:crackerBinaryType}": { - "get": { - "tags": [ - "CrackerBinarys" - ], - "responses": { - "400": { - "description": "Invalid request", - "content": { - "application/json": { - "schema": { - "$ref": "#/components/schemas/ErrorResponse" - } - } - } - }, - "401": { - "description": "Authentication failed", - "content": { - "application/json": { - "schema": { - "$ref": "#/components/schemas/ErrorResponse" - } - } - } - }, - "404": { - "description": "Not Found", - "content": { - "application/json": { - "schema": { - "$ref": "#/components/schemas/NotFoundResponse" - } - } - } - }, - "200": { - "description": "successful operation", - "content": { - "application/json": { - "schema": { - "$ref": "#/components/schemas/CrackerBinaryRelationCrackerBinaryTypeGetResponse" - } - } - } - } - }, - "security": [ - { - "bearerAuth": [ - [ - "permCrackerBinaryRead" - ] - ] - } - ], - "description": "GET request to retrieve a single object.", - "parameters": [ - { - "name": "id", - "in": "path", - "required": true, - "schema": { - "type": "integer", - "format": "int32", - "example": 10 - } - } - ] - } - }, - "/api/v2/ui/crackers/{id:[0-9]+}/relationships/{relation:crackerBinaryType}": { - "get": { - "tags": [ - "CrackerBinarys" - ], - "responses": { - "400": { - "description": "Invalid request", - "content": { - "application/json": { - "schema": { - "$ref": "#/components/schemas/ErrorResponse" - } - } - } - }, - "401": { - "description": "Authentication failed", - "content": { - "application/json": { - "schema": { - "$ref": "#/components/schemas/ErrorResponse" - } - } - } - }, - "404": { - "description": "Not Found", - "content": { - "application/json": { - "schema": { - "$ref": "#/components/schemas/NotFoundResponse" - } - } - } - }, - "200": { - "description": "successful operation", - "content": { - "application/json": { - "schema": { - "$ref": "#/components/schemas/CrackerBinaryResponse" - } - } - } - } - }, - "security": [ - { - "bearerAuth": [ - [ - "permCrackerBinaryRead" - ] - ] - } - ], - "description": "GET request for for a to-one relationship link. Returns the resource record of the object that is part of the specified relation.", - "parameters": [ - { - "name": "id", - "in": "path", - "required": true, - "schema": { - "type": "integer", - "format": "int32", - "example": 10 - } - } - ] - }, - "patch": { - "tags": [ - "CrackerBinarys" - ], - "responses": { - "400": { - "description": "Invalid request", - "content": { - "application/json": { - "schema": { - "$ref": "#/components/schemas/ErrorResponse" - } - } - } - }, - "401": { - "description": "Authentication failed", - "content": { - "application/json": { - "schema": { - "$ref": "#/components/schemas/ErrorResponse" - } - } - } - }, - "204": { - "description": "Succesfull operation" - }, - "404": { - "description": "Not Found", - "content": { - "application/json": { - "schema": { - "$ref": "#/components/schemas/NotFoundResponse" - } - } - } - } - }, - "security": [ - { - "bearerAuth": [ - [ - "permCrackerBinaryUpdate" - ] - ] - } - ], - "description": "", - "requestBody": { - "required": true, - "content": { - "application/json": { - "schema": { - "$ref": "#/components/schemas/CrackerBinaryRelationCrackerBinaryType" - } - } - } - }, - "parameters": [] - } - }, - "/api/v2/ui/crackers/{id:[0-9]+}/{relation:tasks}": { - "get": { - "tags": [ - "CrackerBinarys" - ], - "responses": { - "400": { - "description": "Invalid request", - "content": { - "application/json": { - "schema": { - "$ref": "#/components/schemas/ErrorResponse" - } - } - } - }, - "401": { - "description": "Authentication failed", - "content": { - "application/json": { - "schema": { - "$ref": "#/components/schemas/ErrorResponse" - } - } - } - }, - "404": { - "description": "Not Found", - "content": { - "application/json": { - "schema": { - "$ref": "#/components/schemas/NotFoundResponse" - } - } - } - }, - "200": { - "description": "successful operation", - "content": { - "application/json": { - "schema": { - "$ref": "#/components/schemas/CrackerBinaryRelationTasksGetResponse" - } - } - } - } - }, - "security": [ - { - "bearerAuth": [ - [ - "permCrackerBinaryRead" - ] - ] - } - ], - "description": "GET request to retrieve a single object.", - "parameters": [ - { - "name": "id", - "in": "path", - "required": true, - "schema": { - "type": "integer", - "format": "int32", - "example": 10 - } - } - ] - } - }, - "/api/v2/ui/crackers/{id:[0-9]+}/relationships/{relation:tasks}": { - "get": { - "tags": [ - "CrackerBinarys" - ], - "responses": { - "400": { - "description": "Invalid request", - "content": { - "application/json": { - "schema": { - "$ref": "#/components/schemas/ErrorResponse" - } - } - } - }, - "401": { - "description": "Authentication failed", - "content": { - "application/json": { - "schema": { - "$ref": "#/components/schemas/ErrorResponse" - } - } - } - }, - "404": { - "description": "Not Found", - "content": { - "application/json": { - "schema": { - "$ref": "#/components/schemas/NotFoundResponse" - } - } - } - }, - "200": { - "description": "successful operation", - "content": { - "application/json": { - "schema": { - "$ref": "#/components/schemas/CrackerBinaryResponse" - } - } - } - } - }, - "security": [ - { - "bearerAuth": [ - [ - "permCrackerBinaryRead" - ] - ] - } - ], - "description": "GET request for for a to-one relationship link. Returns the resource record of the object that is part of the specified relation.", - "parameters": [ - { - "name": "id", - "in": "path", - "required": true, - "schema": { - "type": "integer", - "format": "int32", - "example": 10 - } - } - ] - }, - "patch": { - "tags": [ - "CrackerBinarys" - ], - "responses": { - "400": { - "description": "Invalid request", - "content": { - "application/json": { - "schema": { - "$ref": "#/components/schemas/ErrorResponse" - } - } - } - }, - "401": { - "description": "Authentication failed", - "content": { - "application/json": { - "schema": { - "$ref": "#/components/schemas/ErrorResponse" - } - } - } - }, - "204": { - "description": "Succesfull operation" - }, - "404": { - "description": "Not Found", - "content": { - "application/json": { - "schema": { - "$ref": "#/components/schemas/NotFoundResponse" - } - } - } - } - }, - "security": [ - { - "bearerAuth": [ - [ - "permCrackerBinaryUpdate" - ] - ] - } - ], - "description": "", - "requestBody": { - "required": true, - "content": { - "application/json": { - "schema": { - "$ref": "#/components/schemas/CrackerBinaryRelationTasks" - } - } - } - }, - "parameters": [] - }, - "post": { - "tags": [ - "CrackerBinarys" - ], - "responses": { - "400": { - "description": "Invalid request", - "content": { - "application/json": { - "schema": { - "$ref": "#/components/schemas/ErrorResponse" - } - } - } - }, - "401": { - "description": "Authentication failed", - "content": { - "application/json": { - "schema": { - "$ref": "#/components/schemas/ErrorResponse" - } - } - } - }, - "204": { - "description": "successfully created" - }, - "404": { - "description": "Not Found", - "content": { - "application/json": { - "schema": { - "$ref": "#/components/schemas/NotFoundResponse" - } - } - } - } - }, - "security": [ - { - "bearerAuth": [ - [ - "permCrackerBinaryCreate" - ] - ] - } - ], - "description": "", - "requestBody": { - "required": true, - "content": { - "application/json": [] - } - }, - "parameters": [] - }, - "delete": { - "tags": [ - "CrackerBinarys" - ], - "responses": { - "400": { - "description": "Invalid request", - "content": { - "application/json": { - "schema": { - "$ref": "#/components/schemas/ErrorResponse" - } - } - } - }, - "401": { - "description": "Authentication failed", - "content": { - "application/json": { - "schema": { - "$ref": "#/components/schemas/ErrorResponse" - } - } - } - }, - "204": { - "description": "successfully deleted" - }, - "404": { - "description": "Not Found", - "content": { - "application/json": { - "schema": { - "$ref": "#/components/schemas/NotFoundResponse" - } - } - } - } - }, - "security": [ - { - "bearerAuth": [ - [ - "permCrackerBinaryDelete" - ] - ] - } - ], - "description": "", - "requestBody": { - "required": true, - "content": { - "application/json": { - "schema": { - "$ref": "#/components/schemas/CrackerBinaryRelationTasks" - } - } - } - }, - "parameters": [] - } - }, - "/api/v2/ui/crackers/{id:[0-9]+}": { - "get": { - "tags": [ - "CrackerBinarys" - ], - "responses": { - "400": { - "description": "Invalid request", - "content": { - "application/json": { - "schema": { - "$ref": "#/components/schemas/ErrorResponse" - } - } - } - }, - "401": { - "description": "Authentication failed", - "content": { - "application/json": { - "schema": { - "$ref": "#/components/schemas/ErrorResponse" - } - } - } - }, - "404": { - "description": "Not Found", - "content": { - "application/json": { - "schema": { - "$ref": "#/components/schemas/NotFoundResponse" - } - } - } - }, - "200": { - "description": "successful operation", - "content": { - "application/json": { - "schema": { - "$ref": "#/components/schemas/CrackerBinaryResponse" - } - } - } - } - }, - "security": [ - { - "bearerAuth": [ - [ - "permCrackerBinaryRead" - ] - ] - } - ], - "description": "GET request to retrieve a single object.", - "parameters": [ - { - "name": "id", - "in": "path", - "required": true, - "schema": { - "type": "integer", - "format": "int32", - "example": 10 - } - }, - { - "name": "include", - "in": "query", - "schema": { - "type": "string" - }, - "description": "Items to include. Comma seperated" - } - ] - }, - "patch": { - "tags": [ - "CrackerBinarys" - ], - "responses": { - "400": { - "description": "Invalid request", - "content": { - "application/json": { - "schema": { - "$ref": "#/components/schemas/ErrorResponse" - } - } - } - }, - "401": { - "description": "Authentication failed", - "content": { - "application/json": { - "schema": { - "$ref": "#/components/schemas/ErrorResponse" - } - } - } - }, - "404": { - "description": "Not Found", - "content": { - "application/json": { - "schema": { - "$ref": "#/components/schemas/NotFoundResponse" - } - } - } - }, - "200": { - "description": "successful operation", - "content": { - "application/json": { - "schema": { - "$ref": "#/components/schemas/CrackerBinaryPostPatchResponse" - } - } - } - } - }, - "security": [ - { - "bearerAuth": [ - [ - "permCrackerBinaryUpdate" - ] - ] - } - ], - "description": "PATCH request to update attributes of a single object.", - "requestBody": { - "required": true, - "content": { - "application/json": { - "schema": { - "$ref": "#/components/schemas/CrackerBinaryPatch" - } - } - } - }, - "parameters": [] - }, - "delete": { - "tags": [ - "CrackerBinarys" - ], - "responses": { - "400": { - "description": "Invalid request", - "content": { - "application/json": { - "schema": { - "$ref": "#/components/schemas/ErrorResponse" - } - } - } - }, - "401": { - "description": "Authentication failed", - "content": { - "application/json": { - "schema": { - "$ref": "#/components/schemas/ErrorResponse" - } - } - } - }, - "404": { - "description": "Not Found", - "content": { - "application/json": { - "schema": { - "$ref": "#/components/schemas/NotFoundResponse" - } - } - } - }, - "204": { - "description": "successfully deleted" - } - }, - "security": [ - { - "bearerAuth": [ - [ - "permCrackerBinaryDelete" - ] - ] - } - ], - "description": "", - "requestBody": { - "required": true, - "content": { - "application/json": [] - } - }, - "parameters": [] - } - }, - "/api/v2/ui/crackertypes": { - "get": { - "tags": [ - "CrackerBinaryTypes" - ], - "responses": { - "400": { - "description": "Invalid request", - "content": { - "application/json": { - "schema": { - "$ref": "#/components/schemas/ErrorResponse" - } - } - } - }, - "401": { - "description": "Authentication failed", - "content": { - "application/json": { - "schema": { - "$ref": "#/components/schemas/ErrorResponse" - } - } - } - }, - "200": { - "description": "successful operation", - "content": { - "application/json": { - "schema": { - "type": "array", - "items": { - "$ref": "#/components/schemas/CrackerBinaryTypeResponse" - } - } - } - } - } - }, - "security": [ - { - "bearerAuth": [ - [ - "permCrackerBinaryTypeRead" - ] - ] - } - ], - "description": "GET many request to retrieve multiple objects.", - "parameters": [ - { - "name": "page[after]", - "in": "path", - "schema": { - "type": "integer", - "format": "int32" - }, - "example": 0, - "description": "Pointer to paginate to retrieve the data after the value provided" - }, - { - "name": "page[before]", - "in": "path", - "schema": { - "type": "integer", - "format": "int32" - }, - "example": 0, - "description": "Pointer to paginate to retrieve the data before the value provided" - }, - { - "name": "page[size]", - "in": "path", - "schema": { - "type": "integer", - "format": "int32" - }, - "example": 100, - "description": "Amout of data to retrieve inside a single page" - }, - { - "name": "filter", - "in": "path", - "style": "deepobject", - "explode": true, - "schema": { - "type": "object" - }, - "description": "Filters results using a query", - "example": "\"filter[hashlistId__gt]\": 200" - }, - { - "name": "include", - "in": "path", - "schema": { - "type": "string" - }, - "description": "Items to include, comma seperated. Possible options: crackerVersions,tasks" - } - ] - }, - "post": { - "tags": [ - "CrackerBinaryTypes" - ], - "responses": { - "400": { - "description": "Invalid request", - "content": { - "application/json": { - "schema": { - "$ref": "#/components/schemas/ErrorResponse" - } - } - } - }, - "401": { - "description": "Authentication failed", - "content": { - "application/json": { - "schema": { - "$ref": "#/components/schemas/ErrorResponse" - } - } - } - }, - "201": { - "description": "successful operation", - "content": { - "application/json": { - "schema": { - "$ref": "#/components/schemas/CrackerBinaryTypePostPatchResponse" - } - } - } - } - }, - "security": [ - { - "bearerAuth": [ - [ - "permCrackerBinaryTypeCreate" - ] - ] - } - ], - "description": "POST request to create a new object. The request must contain the resource record as data with the attributes of the new object.To add relationships, a relationships object can be added with the resource records of the relations that are part of this object.", - "requestBody": { - "required": true, - "content": { - "application/json": { - "schema": { - "$ref": "#/components/schemas/CrackerBinaryTypeCreate" - } - } - } - }, - "parameters": [] - }, - "patch": { - "tags": [ - "CrackerBinaryTypes" - ], - "responses": { - "400": { - "description": "Invalid request", - "content": { - "application/json": { - "schema": { - "$ref": "#/components/schemas/ErrorResponse" - } - } - } - }, - "401": { - "description": "Authentication failed", - "content": { - "application/json": { - "schema": { - "$ref": "#/components/schemas/ErrorResponse" - } - } - } - } - }, - "security": [ - { - "bearerAuth": [ - [ - "permCrackerBinaryTypeUpdate" - ] - ] - } - ], - "description": "PATCH request to update attributes of a single object.", - "parameters": [] - }, - "delete": { - "tags": [ - "CrackerBinaryTypes" - ], - "responses": { - "400": { - "description": "Invalid request", - "content": { - "application/json": { - "schema": { - "$ref": "#/components/schemas/ErrorResponse" - } - } - } - }, - "401": { - "description": "Authentication failed", - "content": { - "application/json": { - "schema": { - "$ref": "#/components/schemas/ErrorResponse" - } - } - } - } - }, - "security": [ - { - "bearerAuth": [ - [ - "permCrackerBinaryTypeDelete" - ] - ] - } - ], - "description": "", - "parameters": [] - } - }, - "/api/v2/ui/crackertypes/count": { - "get": { - "tags": [ - "CrackerBinaryTypes" - ], - "responses": { - "400": { - "description": "Invalid request", - "content": { - "application/json": { - "schema": { - "$ref": "#/components/schemas/ErrorResponse" - } - } - } - }, - "401": { - "description": "Authentication failed", - "content": { - "application/json": { - "schema": { - "$ref": "#/components/schemas/ErrorResponse" - } - } - } - }, - "200": { - "description": "successful operation", - "content": { - "application/json": { - "schema": { - "type": "array", - "items": { - "$ref": "#/components/schemas/CrackerBinaryTypeResponse" - } - } - } - } - } - }, - "security": [ - { - "bearerAuth": [ - [ - "permCrackerBinaryTypeRead" - ] - ] - } - ], - "description": "GET many request to retrieve multiple objects.", - "parameters": [ - { - "name": "page[after]", - "in": "path", - "schema": { - "type": "integer", - "format": "int32" - }, - "example": 0, - "description": "Pointer to paginate to retrieve the data after the value provided" - }, - { - "name": "page[before]", - "in": "path", - "schema": { - "type": "integer", - "format": "int32" - }, - "example": 0, - "description": "Pointer to paginate to retrieve the data before the value provided" - }, - { - "name": "page[size]", - "in": "path", - "schema": { - "type": "integer", - "format": "int32" - }, - "example": 100, - "description": "Amout of data to retrieve inside a single page" - }, - { - "name": "filter", - "in": "path", - "style": "deepobject", - "explode": true, - "schema": { - "type": "object" - }, - "description": "Filters results using a query", - "example": "\"filter[hashlistId__gt]\": 200" - }, - { - "name": "include", - "in": "path", - "schema": { - "type": "string" - }, - "description": "Items to include, comma seperated. Possible options: crackerVersions,tasks" - } - ] - } - }, - "/api/v2/ui/crackertypes/{id:[0-9]+}/{relation:crackerVersions}": { - "get": { - "tags": [ - "CrackerBinaryTypes" - ], - "responses": { - "400": { - "description": "Invalid request", - "content": { - "application/json": { - "schema": { - "$ref": "#/components/schemas/ErrorResponse" - } - } - } - }, - "401": { - "description": "Authentication failed", - "content": { - "application/json": { - "schema": { - "$ref": "#/components/schemas/ErrorResponse" - } - } - } - }, - "404": { - "description": "Not Found", - "content": { - "application/json": { - "schema": { - "$ref": "#/components/schemas/NotFoundResponse" - } - } - } - }, - "200": { - "description": "successful operation", - "content": { - "application/json": { - "schema": { - "$ref": "#/components/schemas/CrackerBinaryTypeRelationCrackerVersionsGetResponse" - } - } - } - } - }, - "security": [ - { - "bearerAuth": [ - [ - "permCrackerBinaryTypeRead" - ] - ] - } - ], - "description": "GET request to retrieve a single object.", - "parameters": [ - { - "name": "id", - "in": "path", - "required": true, - "schema": { - "type": "integer", - "format": "int32", - "example": 10 - } - } - ] - } - }, - "/api/v2/ui/crackertypes/{id:[0-9]+}/relationships/{relation:crackerVersions}": { - "get": { - "tags": [ - "CrackerBinaryTypes" - ], - "responses": { - "400": { - "description": "Invalid request", - "content": { - "application/json": { - "schema": { - "$ref": "#/components/schemas/ErrorResponse" - } - } - } - }, - "401": { - "description": "Authentication failed", - "content": { - "application/json": { - "schema": { - "$ref": "#/components/schemas/ErrorResponse" - } - } - } - }, - "404": { - "description": "Not Found", - "content": { - "application/json": { - "schema": { - "$ref": "#/components/schemas/NotFoundResponse" - } - } - } - }, - "200": { - "description": "successful operation", - "content": { - "application/json": { - "schema": { - "$ref": "#/components/schemas/CrackerBinaryTypeResponse" - } - } - } - } - }, - "security": [ - { - "bearerAuth": [ - [ - "permCrackerBinaryTypeRead" - ] - ] - } - ], - "description": "GET request for for a to-one relationship link. Returns the resource record of the object that is part of the specified relation.", - "parameters": [ - { - "name": "id", - "in": "path", - "required": true, - "schema": { - "type": "integer", - "format": "int32", - "example": 10 - } - } - ] - }, - "patch": { - "tags": [ - "CrackerBinaryTypes" - ], - "responses": { - "400": { - "description": "Invalid request", - "content": { - "application/json": { - "schema": { - "$ref": "#/components/schemas/ErrorResponse" - } - } - } - }, - "401": { - "description": "Authentication failed", - "content": { - "application/json": { - "schema": { - "$ref": "#/components/schemas/ErrorResponse" - } - } - } - }, - "204": { - "description": "Succesfull operation" - }, - "404": { - "description": "Not Found", - "content": { - "application/json": { - "schema": { - "$ref": "#/components/schemas/NotFoundResponse" - } - } - } - } - }, - "security": [ - { - "bearerAuth": [ - [ - "permCrackerBinaryTypeUpdate" - ] - ] - } - ], - "description": "", - "requestBody": { - "required": true, - "content": { - "application/json": { - "schema": { - "$ref": "#/components/schemas/CrackerBinaryTypeRelationCrackerVersions" - } - } - } - }, - "parameters": [] - }, - "post": { - "tags": [ - "CrackerBinaryTypes" - ], - "responses": { - "400": { - "description": "Invalid request", - "content": { - "application/json": { - "schema": { - "$ref": "#/components/schemas/ErrorResponse" - } - } - } - }, - "401": { - "description": "Authentication failed", - "content": { - "application/json": { - "schema": { - "$ref": "#/components/schemas/ErrorResponse" - } - } - } - }, - "204": { - "description": "successfully created" - }, - "404": { - "description": "Not Found", - "content": { - "application/json": { - "schema": { - "$ref": "#/components/schemas/NotFoundResponse" - } - } - } - } - }, - "security": [ - { - "bearerAuth": [ - [ - "permCrackerBinaryTypeCreate" - ] - ] - } - ], - "description": "", - "requestBody": { - "required": true, - "content": { - "application/json": [] - } - }, - "parameters": [] - }, - "delete": { - "tags": [ - "CrackerBinaryTypes" - ], - "responses": { - "400": { - "description": "Invalid request", - "content": { - "application/json": { - "schema": { - "$ref": "#/components/schemas/ErrorResponse" - } - } - } - }, - "401": { - "description": "Authentication failed", - "content": { - "application/json": { - "schema": { - "$ref": "#/components/schemas/ErrorResponse" - } - } - } - }, - "204": { - "description": "successfully deleted" - }, - "404": { - "description": "Not Found", - "content": { - "application/json": { - "schema": { - "$ref": "#/components/schemas/NotFoundResponse" - } - } - } - } - }, - "security": [ - { - "bearerAuth": [ - [ - "permCrackerBinaryTypeDelete" - ] - ] - } - ], - "description": "", - "requestBody": { - "required": true, - "content": { - "application/json": { - "schema": { - "$ref": "#/components/schemas/CrackerBinaryTypeRelationCrackerVersions" - } - } - } - }, - "parameters": [] - } - }, - "/api/v2/ui/crackertypes/{id:[0-9]+}/{relation:tasks}": { - "get": { - "tags": [ - "CrackerBinaryTypes" - ], - "responses": { - "400": { - "description": "Invalid request", - "content": { - "application/json": { - "schema": { - "$ref": "#/components/schemas/ErrorResponse" - } - } - } - }, - "401": { - "description": "Authentication failed", - "content": { - "application/json": { - "schema": { - "$ref": "#/components/schemas/ErrorResponse" - } - } - } - }, - "404": { - "description": "Not Found", - "content": { - "application/json": { - "schema": { - "$ref": "#/components/schemas/NotFoundResponse" - } - } - } - }, - "200": { - "description": "successful operation", - "content": { - "application/json": { - "schema": { - "$ref": "#/components/schemas/CrackerBinaryTypeRelationTasksGetResponse" - } - } - } - } - }, - "security": [ - { - "bearerAuth": [ - [ - "permCrackerBinaryTypeRead" - ] - ] - } - ], - "description": "GET request to retrieve a single object.", - "parameters": [ - { - "name": "id", - "in": "path", - "required": true, - "schema": { - "type": "integer", - "format": "int32", - "example": 10 - } - } - ] - } - }, - "/api/v2/ui/crackertypes/{id:[0-9]+}/relationships/{relation:tasks}": { - "get": { - "tags": [ - "CrackerBinaryTypes" - ], - "responses": { - "400": { - "description": "Invalid request", - "content": { - "application/json": { - "schema": { - "$ref": "#/components/schemas/ErrorResponse" - } - } - } - }, - "401": { - "description": "Authentication failed", - "content": { - "application/json": { - "schema": { - "$ref": "#/components/schemas/ErrorResponse" - } - } - } - }, - "404": { - "description": "Not Found", - "content": { - "application/json": { - "schema": { - "$ref": "#/components/schemas/NotFoundResponse" - } - } - } - }, - "200": { - "description": "successful operation", - "content": { - "application/json": { - "schema": { - "$ref": "#/components/schemas/CrackerBinaryTypeResponse" - } - } - } - } - }, - "security": [ - { - "bearerAuth": [ - [ - "permCrackerBinaryTypeRead" - ] - ] - } - ], - "description": "GET request for for a to-one relationship link. Returns the resource record of the object that is part of the specified relation.", - "parameters": [ - { - "name": "id", - "in": "path", - "required": true, - "schema": { - "type": "integer", - "format": "int32", - "example": 10 - } - } - ] - }, - "patch": { - "tags": [ - "CrackerBinaryTypes" - ], - "responses": { - "400": { - "description": "Invalid request", - "content": { - "application/json": { - "schema": { - "$ref": "#/components/schemas/ErrorResponse" - } - } - } - }, - "401": { - "description": "Authentication failed", - "content": { - "application/json": { - "schema": { - "$ref": "#/components/schemas/ErrorResponse" - } - } - } - }, - "204": { - "description": "Succesfull operation" - }, - "404": { - "description": "Not Found", - "content": { - "application/json": { - "schema": { - "$ref": "#/components/schemas/NotFoundResponse" - } - } - } - } - }, - "security": [ - { - "bearerAuth": [ - [ - "permCrackerBinaryTypeUpdate" - ] - ] - } - ], - "description": "", - "requestBody": { - "required": true, - "content": { - "application/json": { - "schema": { - "$ref": "#/components/schemas/CrackerBinaryTypeRelationTasks" - } - } - } - }, - "parameters": [] - }, - "post": { - "tags": [ - "CrackerBinaryTypes" - ], - "responses": { - "400": { - "description": "Invalid request", - "content": { - "application/json": { - "schema": { - "$ref": "#/components/schemas/ErrorResponse" - } - } - } - }, - "401": { - "description": "Authentication failed", - "content": { - "application/json": { - "schema": { - "$ref": "#/components/schemas/ErrorResponse" - } - } - } - }, - "204": { - "description": "successfully created" - }, - "404": { - "description": "Not Found", - "content": { - "application/json": { - "schema": { - "$ref": "#/components/schemas/NotFoundResponse" - } - } - } - } - }, - "security": [ - { - "bearerAuth": [ - [ - "permCrackerBinaryTypeCreate" - ] - ] - } - ], - "description": "", - "requestBody": { - "required": true, - "content": { - "application/json": [] - } - }, - "parameters": [] - }, - "delete": { - "tags": [ - "CrackerBinaryTypes" - ], - "responses": { - "400": { - "description": "Invalid request", - "content": { - "application/json": { - "schema": { - "$ref": "#/components/schemas/ErrorResponse" - } - } - } - }, - "401": { - "description": "Authentication failed", - "content": { - "application/json": { - "schema": { - "$ref": "#/components/schemas/ErrorResponse" - } - } - } - }, - "204": { - "description": "successfully deleted" - }, - "404": { - "description": "Not Found", - "content": { - "application/json": { - "schema": { - "$ref": "#/components/schemas/NotFoundResponse" - } - } - } - } - }, - "security": [ - { - "bearerAuth": [ - [ - "permCrackerBinaryTypeDelete" - ] - ] - } - ], - "description": "", - "requestBody": { - "required": true, - "content": { - "application/json": { - "schema": { - "$ref": "#/components/schemas/CrackerBinaryTypeRelationTasks" - } - } - } - }, - "parameters": [] - } - }, - "/api/v2/ui/crackertypes/{id:[0-9]+}": { - "get": { - "tags": [ - "CrackerBinaryTypes" - ], - "responses": { - "400": { - "description": "Invalid request", - "content": { - "application/json": { - "schema": { - "$ref": "#/components/schemas/ErrorResponse" - } - } - } - }, - "401": { - "description": "Authentication failed", - "content": { - "application/json": { - "schema": { - "$ref": "#/components/schemas/ErrorResponse" - } - } - } - }, - "404": { - "description": "Not Found", - "content": { - "application/json": { - "schema": { - "$ref": "#/components/schemas/NotFoundResponse" - } - } - } - }, - "200": { - "description": "successful operation", - "content": { - "application/json": { - "schema": { - "$ref": "#/components/schemas/CrackerBinaryTypeResponse" - } - } - } - } - }, - "security": [ - { - "bearerAuth": [ - [ - "permCrackerBinaryTypeRead" - ] - ] - } - ], - "description": "GET request to retrieve a single object.", - "parameters": [ - { - "name": "id", - "in": "path", - "required": true, - "schema": { - "type": "integer", - "format": "int32", - "example": 10 - } - }, - { - "name": "include", - "in": "query", - "schema": { - "type": "string" - }, - "description": "Items to include. Comma seperated" - } - ] - }, - "patch": { - "tags": [ - "CrackerBinaryTypes" - ], - "responses": { - "400": { - "description": "Invalid request", - "content": { - "application/json": { - "schema": { - "$ref": "#/components/schemas/ErrorResponse" - } - } - } - }, - "401": { - "description": "Authentication failed", - "content": { - "application/json": { - "schema": { - "$ref": "#/components/schemas/ErrorResponse" - } - } - } - }, - "404": { - "description": "Not Found", - "content": { - "application/json": { - "schema": { - "$ref": "#/components/schemas/NotFoundResponse" - } - } - } - }, - "200": { - "description": "successful operation", - "content": { - "application/json": { - "schema": { - "$ref": "#/components/schemas/CrackerBinaryTypePostPatchResponse" - } - } - } - } - }, - "security": [ - { - "bearerAuth": [ - [ - "permCrackerBinaryTypeUpdate" - ] - ] - } - ], - "description": "PATCH request to update attributes of a single object.", - "requestBody": { - "required": true, - "content": { - "application/json": { - "schema": { - "$ref": "#/components/schemas/CrackerBinaryTypePatch" - } - } - } - }, - "parameters": [] - }, - "delete": { - "tags": [ - "CrackerBinaryTypes" - ], - "responses": { - "400": { - "description": "Invalid request", - "content": { - "application/json": { - "schema": { - "$ref": "#/components/schemas/ErrorResponse" - } - } - } - }, - "401": { - "description": "Authentication failed", - "content": { - "application/json": { - "schema": { - "$ref": "#/components/schemas/ErrorResponse" - } - } - } - }, - "404": { - "description": "Not Found", - "content": { - "application/json": { - "schema": { - "$ref": "#/components/schemas/NotFoundResponse" - } - } - } - }, - "204": { - "description": "successfully deleted" - } - }, - "security": [ - { - "bearerAuth": [ - [ - "permCrackerBinaryTypeDelete" - ] - ] - } - ], - "description": "", - "requestBody": { - "required": true, - "content": { - "application/json": [] - } - }, - "parameters": [] - } - }, - "/api/v2/ui/files": { - "get": { - "tags": [ - "Files" - ], - "responses": { - "400": { - "description": "Invalid request", - "content": { - "application/json": { - "schema": { - "$ref": "#/components/schemas/ErrorResponse" - } - } - } - }, - "401": { - "description": "Authentication failed", - "content": { - "application/json": { - "schema": { - "$ref": "#/components/schemas/ErrorResponse" - } - } - } - }, - "200": { - "description": "successful operation", - "content": { - "application/json": { - "schema": { - "type": "array", - "items": { - "$ref": "#/components/schemas/FileResponse" - } - } - } - } - } - }, - "security": [ - { - "bearerAuth": [ - [ - "permFileRead" - ] - ] - } - ], - "description": "GET many request to retrieve multiple objects.", - "parameters": [ - { - "name": "page[after]", - "in": "path", - "schema": { - "type": "integer", - "format": "int32" - }, - "example": 0, - "description": "Pointer to paginate to retrieve the data after the value provided" - }, - { - "name": "page[before]", - "in": "path", - "schema": { - "type": "integer", - "format": "int32" - }, - "example": 0, - "description": "Pointer to paginate to retrieve the data before the value provided" - }, - { - "name": "page[size]", - "in": "path", - "schema": { - "type": "integer", - "format": "int32" - }, - "example": 100, - "description": "Amout of data to retrieve inside a single page" - }, - { - "name": "filter", - "in": "path", - "style": "deepobject", - "explode": true, - "schema": { - "type": "object" - }, - "description": "Filters results using a query", - "example": "\"filter[hashlistId__gt]\": 200" - }, - { - "name": "include", - "in": "path", - "schema": { - "type": "string" - }, - "description": "Items to include, comma seperated. Possible options: accessGroup" - } - ] - }, - "post": { - "tags": [ - "Files" - ], - "responses": { - "400": { - "description": "Invalid request", - "content": { - "application/json": { - "schema": { - "$ref": "#/components/schemas/ErrorResponse" - } - } - } - }, - "401": { - "description": "Authentication failed", - "content": { - "application/json": { - "schema": { - "$ref": "#/components/schemas/ErrorResponse" - } - } - } - }, - "201": { - "description": "successful operation", - "content": { - "application/json": { - "schema": { - "$ref": "#/components/schemas/FilePostPatchResponse" - } - } - } - } - }, - "security": [ - { - "bearerAuth": [ - [ - "permFileCreate" - ] - ] - } - ], - "description": "POST request to create a new object. The request must contain the resource record as data with the attributes of the new object.To add relationships, a relationships object can be added with the resource records of the relations that are part of this object.", - "requestBody": { - "required": true, - "content": { - "application/json": { - "schema": { - "$ref": "#/components/schemas/FileCreate" - } - } - } - }, - "parameters": [] - }, - "patch": { - "tags": [ - "Files" - ], - "responses": { - "400": { - "description": "Invalid request", - "content": { - "application/json": { - "schema": { - "$ref": "#/components/schemas/ErrorResponse" - } - } - } - }, - "401": { - "description": "Authentication failed", - "content": { - "application/json": { - "schema": { - "$ref": "#/components/schemas/ErrorResponse" - } - } - } - } - }, - "security": [ - { - "bearerAuth": [ - [ - "permFileUpdate" - ] - ] - } - ], - "description": "PATCH request to update attributes of a single object.", - "parameters": [] - }, - "delete": { - "tags": [ - "Files" - ], - "responses": { - "400": { - "description": "Invalid request", - "content": { - "application/json": { - "schema": { - "$ref": "#/components/schemas/ErrorResponse" - } - } - } - }, - "401": { - "description": "Authentication failed", - "content": { - "application/json": { - "schema": { - "$ref": "#/components/schemas/ErrorResponse" - } - } - } - } - }, - "security": [ - { - "bearerAuth": [ - [ - "permFileDelete" - ] - ] - } - ], - "description": "", - "parameters": [] - } - }, - "/api/v2/ui/files/count": { - "get": { - "tags": [ - "Files" - ], - "responses": { - "400": { - "description": "Invalid request", - "content": { - "application/json": { - "schema": { - "$ref": "#/components/schemas/ErrorResponse" - } - } - } - }, - "401": { - "description": "Authentication failed", - "content": { - "application/json": { - "schema": { - "$ref": "#/components/schemas/ErrorResponse" - } - } - } - }, - "200": { - "description": "successful operation", - "content": { - "application/json": { - "schema": { - "type": "array", - "items": { - "$ref": "#/components/schemas/FileResponse" - } - } - } - } - } - }, - "security": [ - { - "bearerAuth": [ - [ - "permFileRead" - ] - ] - } - ], - "description": "GET many request to retrieve multiple objects.", - "parameters": [ - { - "name": "page[after]", - "in": "path", - "schema": { - "type": "integer", - "format": "int32" - }, - "example": 0, - "description": "Pointer to paginate to retrieve the data after the value provided" - }, - { - "name": "page[before]", - "in": "path", - "schema": { - "type": "integer", - "format": "int32" - }, - "example": 0, - "description": "Pointer to paginate to retrieve the data before the value provided" - }, - { - "name": "page[size]", - "in": "path", - "schema": { - "type": "integer", - "format": "int32" - }, - "example": 100, - "description": "Amout of data to retrieve inside a single page" - }, - { - "name": "filter", - "in": "path", - "style": "deepobject", - "explode": true, - "schema": { - "type": "object" - }, - "description": "Filters results using a query", - "example": "\"filter[hashlistId__gt]\": 200" - }, - { - "name": "include", - "in": "path", - "schema": { - "type": "string" - }, - "description": "Items to include, comma seperated. Possible options: accessGroup" - } - ] - } - }, - "/api/v2/ui/files/{id:[0-9]+}/{relation:accessGroup}": { - "get": { - "tags": [ - "Files" - ], - "responses": { - "400": { - "description": "Invalid request", - "content": { - "application/json": { - "schema": { - "$ref": "#/components/schemas/ErrorResponse" - } - } - } - }, - "401": { - "description": "Authentication failed", - "content": { - "application/json": { - "schema": { - "$ref": "#/components/schemas/ErrorResponse" - } - } - } - }, - "404": { - "description": "Not Found", - "content": { - "application/json": { - "schema": { - "$ref": "#/components/schemas/NotFoundResponse" - } - } - } - }, - "200": { - "description": "successful operation", - "content": { - "application/json": { - "schema": { - "$ref": "#/components/schemas/FileRelationAccessGroupGetResponse" - } - } - } - } - }, - "security": [ - { - "bearerAuth": [ - [ - "permFileRead" - ] - ] - } - ], - "description": "GET request to retrieve a single object.", - "parameters": [ - { - "name": "id", - "in": "path", - "required": true, - "schema": { - "type": "integer", - "format": "int32", - "example": 10 - } - } - ] - } - }, - "/api/v2/ui/files/{id:[0-9]+}/relationships/{relation:accessGroup}": { - "get": { - "tags": [ - "Files" - ], - "responses": { - "400": { - "description": "Invalid request", - "content": { - "application/json": { - "schema": { - "$ref": "#/components/schemas/ErrorResponse" - } - } - } - }, - "401": { - "description": "Authentication failed", - "content": { - "application/json": { - "schema": { - "$ref": "#/components/schemas/ErrorResponse" - } - } - } - }, - "404": { - "description": "Not Found", - "content": { - "application/json": { - "schema": { - "$ref": "#/components/schemas/NotFoundResponse" - } - } - } - }, - "200": { - "description": "successful operation", - "content": { - "application/json": { - "schema": { - "$ref": "#/components/schemas/FileResponse" - } - } - } - } - }, - "security": [ - { - "bearerAuth": [ - [ - "permFileRead" - ] - ] - } - ], - "description": "GET request for for a to-one relationship link. Returns the resource record of the object that is part of the specified relation.", - "parameters": [ - { - "name": "id", - "in": "path", - "required": true, - "schema": { - "type": "integer", - "format": "int32", - "example": 10 - } - } - ] - }, - "patch": { - "tags": [ - "Files" - ], - "responses": { - "400": { - "description": "Invalid request", - "content": { - "application/json": { - "schema": { - "$ref": "#/components/schemas/ErrorResponse" - } - } - } - }, - "401": { - "description": "Authentication failed", - "content": { - "application/json": { - "schema": { - "$ref": "#/components/schemas/ErrorResponse" - } - } - } - }, - "204": { - "description": "Succesfull operation" - }, - "404": { - "description": "Not Found", - "content": { - "application/json": { - "schema": { - "$ref": "#/components/schemas/NotFoundResponse" - } - } - } - } - }, - "security": [ - { - "bearerAuth": [ - [ - "permFileUpdate" - ] - ] - } - ], - "description": "", - "requestBody": { - "required": true, - "content": { - "application/json": { - "schema": { - "$ref": "#/components/schemas/FileRelationAccessGroup" - } - } - } - }, - "parameters": [] - } - }, - "/api/v2/ui/files/{id:[0-9]+}": { - "get": { - "tags": [ - "Files" - ], - "responses": { - "400": { - "description": "Invalid request", - "content": { - "application/json": { - "schema": { - "$ref": "#/components/schemas/ErrorResponse" - } - } - } - }, - "401": { - "description": "Authentication failed", - "content": { - "application/json": { - "schema": { - "$ref": "#/components/schemas/ErrorResponse" - } - } - } - }, - "404": { - "description": "Not Found", - "content": { - "application/json": { - "schema": { - "$ref": "#/components/schemas/NotFoundResponse" - } - } - } - }, - "200": { - "description": "successful operation", - "content": { - "application/json": { - "schema": { - "$ref": "#/components/schemas/FileResponse" - } - } - } - } - }, - "security": [ - { - "bearerAuth": [ - [ - "permFileRead" - ] - ] - } - ], - "description": "GET request to retrieve a single object.", - "parameters": [ - { - "name": "id", - "in": "path", - "required": true, - "schema": { - "type": "integer", - "format": "int32", - "example": 10 - } - }, - { - "name": "include", - "in": "query", - "schema": { - "type": "string" - }, - "description": "Items to include. Comma seperated" - } - ] - }, - "patch": { - "tags": [ - "Files" - ], - "responses": { - "400": { - "description": "Invalid request", - "content": { - "application/json": { - "schema": { - "$ref": "#/components/schemas/ErrorResponse" - } - } - } - }, - "401": { - "description": "Authentication failed", - "content": { - "application/json": { - "schema": { - "$ref": "#/components/schemas/ErrorResponse" - } - } - } - }, - "404": { - "description": "Not Found", - "content": { - "application/json": { - "schema": { - "$ref": "#/components/schemas/NotFoundResponse" - } - } - } - }, - "200": { - "description": "successful operation", - "content": { - "application/json": { - "schema": { - "$ref": "#/components/schemas/FilePostPatchResponse" - } - } - } - } - }, - "security": [ - { - "bearerAuth": [ - [ - "permFileUpdate" - ] - ] - } - ], - "description": "PATCH request to update attributes of a single object.", - "requestBody": { - "required": true, - "content": { - "application/json": { - "schema": { - "$ref": "#/components/schemas/FilePatch" - } - } - } - }, - "parameters": [] - }, - "delete": { - "tags": [ - "Files" - ], - "responses": { - "400": { - "description": "Invalid request", - "content": { - "application/json": { - "schema": { - "$ref": "#/components/schemas/ErrorResponse" - } - } - } - }, - "401": { - "description": "Authentication failed", - "content": { - "application/json": { - "schema": { - "$ref": "#/components/schemas/ErrorResponse" - } - } - } - }, - "404": { - "description": "Not Found", - "content": { - "application/json": { - "schema": { - "$ref": "#/components/schemas/NotFoundResponse" - } - } - } - }, - "204": { - "description": "successfully deleted" - } - }, - "security": [ - { - "bearerAuth": [ - [ - "permFileDelete" - ] - ] - } - ], - "description": "", - "requestBody": { - "required": true, - "content": { - "application/json": [] - } - }, - "parameters": [] - } - }, - "/api/v2/ui/globalpermissiongroups": { - "get": { - "tags": [ - "RightGroups" - ], - "responses": { - "400": { - "description": "Invalid request", - "content": { - "application/json": { - "schema": { - "$ref": "#/components/schemas/ErrorResponse" - } - } - } - }, - "401": { - "description": "Authentication failed", - "content": { - "application/json": { - "schema": { - "$ref": "#/components/schemas/ErrorResponse" - } - } - } - }, - "200": { - "description": "successful operation", - "content": { - "application/json": { - "schema": { - "type": "array", - "items": { - "$ref": "#/components/schemas/RightGroupResponse" - } - } - } - } - } - }, - "security": [ - { - "bearerAuth": [ - [ - "permRightGroupRead" - ] - ] - } - ], - "description": "GET many request to retrieve multiple objects.", - "parameters": [ - { - "name": "page[after]", - "in": "path", - "schema": { - "type": "integer", - "format": "int32" - }, - "example": 0, - "description": "Pointer to paginate to retrieve the data after the value provided" - }, - { - "name": "page[before]", - "in": "path", - "schema": { - "type": "integer", - "format": "int32" - }, - "example": 0, - "description": "Pointer to paginate to retrieve the data before the value provided" - }, - { - "name": "page[size]", - "in": "path", - "schema": { - "type": "integer", - "format": "int32" - }, - "example": 100, - "description": "Amout of data to retrieve inside a single page" - }, - { - "name": "filter", - "in": "path", - "style": "deepobject", - "explode": true, - "schema": { - "type": "object" - }, - "description": "Filters results using a query", - "example": "\"filter[hashlistId__gt]\": 200" - }, - { - "name": "include", - "in": "path", - "schema": { - "type": "string" - }, - "description": "Items to include, comma seperated. Possible options: userMembers" - } - ] - }, - "post": { - "tags": [ - "RightGroups" - ], - "responses": { - "400": { - "description": "Invalid request", - "content": { - "application/json": { - "schema": { - "$ref": "#/components/schemas/ErrorResponse" - } - } - } - }, - "401": { - "description": "Authentication failed", - "content": { - "application/json": { - "schema": { - "$ref": "#/components/schemas/ErrorResponse" - } - } - } - }, - "201": { - "description": "successful operation", - "content": { - "application/json": { - "schema": { - "$ref": "#/components/schemas/RightGroupPostPatchResponse" - } - } - } - } - }, - "security": [ - { - "bearerAuth": [ - [ - "permRightGroupCreate" - ] - ] - } - ], - "description": "POST request to create a new object. The request must contain the resource record as data with the attributes of the new object.To add relationships, a relationships object can be added with the resource records of the relations that are part of this object.", - "requestBody": { - "required": true, - "content": { - "application/json": { - "schema": { - "$ref": "#/components/schemas/RightGroupCreate" - } - } - } - }, - "parameters": [] - }, - "patch": { - "tags": [ - "RightGroups" - ], - "responses": { - "400": { - "description": "Invalid request", - "content": { - "application/json": { - "schema": { - "$ref": "#/components/schemas/ErrorResponse" - } - } - } - }, - "401": { - "description": "Authentication failed", - "content": { - "application/json": { - "schema": { - "$ref": "#/components/schemas/ErrorResponse" - } - } - } - } - }, - "security": [ - { - "bearerAuth": [ - [ - "permRightGroupUpdate" - ] - ] - } - ], - "description": "PATCH request to update attributes of a single object.", - "parameters": [] - }, - "delete": { - "tags": [ - "RightGroups" - ], - "responses": { - "400": { - "description": "Invalid request", - "content": { - "application/json": { - "schema": { - "$ref": "#/components/schemas/ErrorResponse" - } - } - } - }, - "401": { - "description": "Authentication failed", - "content": { - "application/json": { - "schema": { - "$ref": "#/components/schemas/ErrorResponse" - } - } - } - } - }, - "security": [ - { - "bearerAuth": [ - [ - "permRightGroupDelete" - ] - ] - } - ], - "description": "", - "parameters": [] - } - }, - "/api/v2/ui/globalpermissiongroups/count": { - "get": { - "tags": [ - "RightGroups" - ], - "responses": { - "400": { - "description": "Invalid request", - "content": { - "application/json": { - "schema": { - "$ref": "#/components/schemas/ErrorResponse" - } - } - } - }, - "401": { - "description": "Authentication failed", - "content": { - "application/json": { - "schema": { - "$ref": "#/components/schemas/ErrorResponse" - } - } - } - }, - "200": { - "description": "successful operation", - "content": { - "application/json": { - "schema": { - "type": "array", - "items": { - "$ref": "#/components/schemas/RightGroupResponse" - } - } - } - } - } - }, - "security": [ - { - "bearerAuth": [ - [ - "permRightGroupRead" - ] - ] - } - ], - "description": "GET many request to retrieve multiple objects.", - "parameters": [ - { - "name": "page[after]", - "in": "path", - "schema": { - "type": "integer", - "format": "int32" - }, - "example": 0, - "description": "Pointer to paginate to retrieve the data after the value provided" - }, - { - "name": "page[before]", - "in": "path", - "schema": { - "type": "integer", - "format": "int32" - }, - "example": 0, - "description": "Pointer to paginate to retrieve the data before the value provided" - }, - { - "name": "page[size]", - "in": "path", - "schema": { - "type": "integer", - "format": "int32" - }, - "example": 100, - "description": "Amout of data to retrieve inside a single page" - }, - { - "name": "filter", - "in": "path", - "style": "deepobject", - "explode": true, - "schema": { - "type": "object" - }, - "description": "Filters results using a query", - "example": "\"filter[hashlistId__gt]\": 200" - }, - { - "name": "include", - "in": "path", - "schema": { - "type": "string" - }, - "description": "Items to include, comma seperated. Possible options: userMembers" - } - ] - } - }, - "/api/v2/ui/globalpermissiongroups/{id:[0-9]+}/{relation:userMembers}": { - "get": { - "tags": [ - "RightGroups" - ], - "responses": { - "400": { - "description": "Invalid request", - "content": { - "application/json": { - "schema": { - "$ref": "#/components/schemas/ErrorResponse" - } - } - } - }, - "401": { - "description": "Authentication failed", - "content": { - "application/json": { - "schema": { - "$ref": "#/components/schemas/ErrorResponse" - } - } - } - }, - "404": { - "description": "Not Found", - "content": { - "application/json": { - "schema": { - "$ref": "#/components/schemas/NotFoundResponse" - } - } - } - }, - "200": { - "description": "successful operation", - "content": { - "application/json": { - "schema": { - "$ref": "#/components/schemas/RightGroupRelationUserMembersGetResponse" - } - } - } - } - }, - "security": [ - { - "bearerAuth": [ - [ - "permRightGroupRead" - ] - ] - } - ], - "description": "GET request to retrieve a single object.", - "parameters": [ - { - "name": "id", - "in": "path", - "required": true, - "schema": { - "type": "integer", - "format": "int32", - "example": 10 - } - } - ] - } - }, - "/api/v2/ui/globalpermissiongroups/{id:[0-9]+}/relationships/{relation:userMembers}": { - "get": { - "tags": [ - "RightGroups" - ], - "responses": { - "400": { - "description": "Invalid request", - "content": { - "application/json": { - "schema": { - "$ref": "#/components/schemas/ErrorResponse" - } - } - } - }, - "401": { - "description": "Authentication failed", - "content": { - "application/json": { - "schema": { - "$ref": "#/components/schemas/ErrorResponse" - } - } - } - }, - "404": { - "description": "Not Found", - "content": { - "application/json": { - "schema": { - "$ref": "#/components/schemas/NotFoundResponse" - } - } - } - }, - "200": { - "description": "successful operation", - "content": { - "application/json": { - "schema": { - "$ref": "#/components/schemas/RightGroupResponse" - } - } - } - } - }, - "security": [ - { - "bearerAuth": [ - [ - "permRightGroupRead" - ] - ] - } - ], - "description": "GET request for for a to-one relationship link. Returns the resource record of the object that is part of the specified relation.", - "parameters": [ - { - "name": "id", - "in": "path", - "required": true, - "schema": { - "type": "integer", - "format": "int32", - "example": 10 - } - } - ] - }, - "patch": { - "tags": [ - "RightGroups" - ], - "responses": { - "400": { - "description": "Invalid request", - "content": { - "application/json": { - "schema": { - "$ref": "#/components/schemas/ErrorResponse" - } - } - } - }, - "401": { - "description": "Authentication failed", - "content": { - "application/json": { - "schema": { - "$ref": "#/components/schemas/ErrorResponse" - } - } - } - }, - "204": { - "description": "Succesfull operation" - }, - "404": { - "description": "Not Found", - "content": { - "application/json": { - "schema": { - "$ref": "#/components/schemas/NotFoundResponse" - } - } - } - } - }, - "security": [ - { - "bearerAuth": [ - [ - "permRightGroupUpdate" - ] - ] - } - ], - "description": "", - "requestBody": { - "required": true, - "content": { - "application/json": { - "schema": { - "$ref": "#/components/schemas/RightGroupRelationUserMembers" - } - } - } - }, - "parameters": [] - }, - "post": { - "tags": [ - "RightGroups" - ], - "responses": { - "400": { - "description": "Invalid request", - "content": { - "application/json": { - "schema": { - "$ref": "#/components/schemas/ErrorResponse" - } - } - } - }, - "401": { - "description": "Authentication failed", - "content": { - "application/json": { - "schema": { - "$ref": "#/components/schemas/ErrorResponse" - } - } - } - }, - "204": { - "description": "successfully created" - }, - "404": { - "description": "Not Found", - "content": { - "application/json": { - "schema": { - "$ref": "#/components/schemas/NotFoundResponse" - } - } - } - } - }, - "security": [ - { - "bearerAuth": [ - [ - "permRightGroupCreate" - ] - ] - } - ], - "description": "", - "requestBody": { - "required": true, - "content": { - "application/json": [] - } - }, - "parameters": [] - }, - "delete": { - "tags": [ - "RightGroups" - ], - "responses": { - "400": { - "description": "Invalid request", - "content": { - "application/json": { - "schema": { - "$ref": "#/components/schemas/ErrorResponse" - } - } - } - }, - "401": { - "description": "Authentication failed", - "content": { - "application/json": { - "schema": { - "$ref": "#/components/schemas/ErrorResponse" - } - } - } - }, - "204": { - "description": "successfully deleted" - }, - "404": { - "description": "Not Found", - "content": { - "application/json": { - "schema": { - "$ref": "#/components/schemas/NotFoundResponse" - } - } - } - } - }, - "security": [ - { - "bearerAuth": [ - [ - "permRightGroupDelete" - ] - ] - } - ], - "description": "", - "requestBody": { - "required": true, - "content": { - "application/json": { - "schema": { - "$ref": "#/components/schemas/RightGroupRelationUserMembers" - } - } - } - }, - "parameters": [] - } - }, - "/api/v2/ui/globalpermissiongroups/{id:[0-9]+}": { - "get": { - "tags": [ - "RightGroups" - ], - "responses": { - "400": { - "description": "Invalid request", - "content": { - "application/json": { - "schema": { - "$ref": "#/components/schemas/ErrorResponse" - } - } - } - }, - "401": { - "description": "Authentication failed", - "content": { - "application/json": { - "schema": { - "$ref": "#/components/schemas/ErrorResponse" - } - } - } - }, - "404": { - "description": "Not Found", - "content": { - "application/json": { - "schema": { - "$ref": "#/components/schemas/NotFoundResponse" - } - } - } - }, - "200": { - "description": "successful operation", - "content": { - "application/json": { - "schema": { - "$ref": "#/components/schemas/RightGroupResponse" - } - } - } - } - }, - "security": [ - { - "bearerAuth": [ - [ - "permRightGroupRead" - ] - ] - } - ], - "description": "GET request to retrieve a single object.", - "parameters": [ - { - "name": "id", - "in": "path", - "required": true, - "schema": { - "type": "integer", - "format": "int32", - "example": 10 - } - }, - { - "name": "include", - "in": "query", - "schema": { - "type": "string" - }, - "description": "Items to include. Comma seperated" - } - ] - }, - "patch": { - "tags": [ - "RightGroups" - ], - "responses": { - "400": { - "description": "Invalid request", - "content": { - "application/json": { - "schema": { - "$ref": "#/components/schemas/ErrorResponse" - } - } - } - }, - "401": { - "description": "Authentication failed", - "content": { - "application/json": { - "schema": { - "$ref": "#/components/schemas/ErrorResponse" - } - } - } - }, - "404": { - "description": "Not Found", - "content": { - "application/json": { - "schema": { - "$ref": "#/components/schemas/NotFoundResponse" - } - } - } - }, - "200": { - "description": "successful operation", - "content": { - "application/json": { - "schema": { - "$ref": "#/components/schemas/RightGroupPostPatchResponse" - } - } - } - } - }, - "security": [ - { - "bearerAuth": [ - [ - "permRightGroupUpdate" - ] - ] - } - ], - "description": "PATCH request to update attributes of a single object.", - "requestBody": { - "required": true, - "content": { - "application/json": { - "schema": { - "$ref": "#/components/schemas/RightGroupPatch" - } - } - } - }, - "parameters": [] - }, - "delete": { - "tags": [ - "RightGroups" - ], - "responses": { - "400": { - "description": "Invalid request", - "content": { - "application/json": { - "schema": { - "$ref": "#/components/schemas/ErrorResponse" - } - } - } - }, - "401": { - "description": "Authentication failed", - "content": { - "application/json": { - "schema": { - "$ref": "#/components/schemas/ErrorResponse" - } - } - } - }, - "404": { - "description": "Not Found", - "content": { - "application/json": { - "schema": { - "$ref": "#/components/schemas/NotFoundResponse" - } - } - } - }, - "204": { - "description": "successfully deleted" - } - }, - "security": [ - { - "bearerAuth": [ - [ - "permRightGroupDelete" - ] - ] - } - ], - "description": "", - "requestBody": { - "required": true, - "content": { - "application/json": [] - } - }, - "parameters": [] - } - }, - "/api/v2/ui/hashes": { - "get": { - "tags": [ - "Hashs" - ], - "responses": { - "400": { - "description": "Invalid request", - "content": { - "application/json": { - "schema": { - "$ref": "#/components/schemas/ErrorResponse" - } - } - } - }, - "401": { - "description": "Authentication failed", - "content": { - "application/json": { - "schema": { - "$ref": "#/components/schemas/ErrorResponse" - } - } - } - }, - "200": { - "description": "successful operation", - "content": { - "application/json": { - "schema": { - "type": "array", - "items": { - "$ref": "#/components/schemas/HashResponse" - } - } - } - } - } - }, - "security": [ - { - "bearerAuth": [ - [ - "permHashRead" - ] - ] - } - ], - "description": "GET many request to retrieve multiple objects.", - "parameters": [ - { - "name": "page[after]", - "in": "path", - "schema": { - "type": "integer", - "format": "int32" - }, - "example": 0, - "description": "Pointer to paginate to retrieve the data after the value provided" - }, - { - "name": "page[before]", - "in": "path", - "schema": { - "type": "integer", - "format": "int32" - }, - "example": 0, - "description": "Pointer to paginate to retrieve the data before the value provided" - }, - { - "name": "page[size]", - "in": "path", - "schema": { - "type": "integer", - "format": "int32" - }, - "example": 100, - "description": "Amout of data to retrieve inside a single page" - }, - { - "name": "filter", - "in": "path", - "style": "deepobject", - "explode": true, - "schema": { - "type": "object" - }, - "description": "Filters results using a query", - "example": "\"filter[hashlistId__gt]\": 200" - }, - { - "name": "include", - "in": "path", - "schema": { - "type": "string" - }, - "description": "Items to include, comma seperated. Possible options: chunk,hashlist" - } - ] - } - }, - "/api/v2/ui/hashes/count": { - "get": { - "tags": [ - "Hashs" - ], - "responses": { - "400": { - "description": "Invalid request", - "content": { - "application/json": { - "schema": { - "$ref": "#/components/schemas/ErrorResponse" - } - } - } - }, - "401": { - "description": "Authentication failed", - "content": { - "application/json": { - "schema": { - "$ref": "#/components/schemas/ErrorResponse" - } - } - } - }, - "200": { - "description": "successful operation", - "content": { - "application/json": { - "schema": { - "type": "array", - "items": { - "$ref": "#/components/schemas/HashResponse" - } - } - } - } - } - }, - "security": [ - { - "bearerAuth": [ - [ - "permHashRead" - ] - ] - } - ], - "description": "GET many request to retrieve multiple objects.", - "parameters": [ - { - "name": "page[after]", - "in": "path", - "schema": { - "type": "integer", - "format": "int32" - }, - "example": 0, - "description": "Pointer to paginate to retrieve the data after the value provided" - }, - { - "name": "page[before]", - "in": "path", - "schema": { - "type": "integer", - "format": "int32" - }, - "example": 0, - "description": "Pointer to paginate to retrieve the data before the value provided" - }, - { - "name": "page[size]", - "in": "path", - "schema": { - "type": "integer", - "format": "int32" - }, - "example": 100, - "description": "Amout of data to retrieve inside a single page" - }, - { - "name": "filter", - "in": "path", - "style": "deepobject", - "explode": true, - "schema": { - "type": "object" - }, - "description": "Filters results using a query", - "example": "\"filter[hashlistId__gt]\": 200" - }, - { - "name": "include", - "in": "path", - "schema": { - "type": "string" - }, - "description": "Items to include, comma seperated. Possible options: chunk,hashlist" - } - ] - } - }, - "/api/v2/ui/hashes/{id:[0-9]+}/{relation:chunk}": { - "get": { - "tags": [ - "Hashs" - ], - "responses": { - "400": { - "description": "Invalid request", - "content": { - "application/json": { - "schema": { - "$ref": "#/components/schemas/ErrorResponse" - } - } - } - }, - "401": { - "description": "Authentication failed", - "content": { - "application/json": { - "schema": { - "$ref": "#/components/schemas/ErrorResponse" - } - } - } - }, - "404": { - "description": "Not Found", - "content": { - "application/json": { - "schema": { - "$ref": "#/components/schemas/NotFoundResponse" - } - } - } - }, - "200": { - "description": "successful operation", - "content": { - "application/json": { - "schema": { - "$ref": "#/components/schemas/HashRelationChunkGetResponse" - } - } - } - } - }, - "security": [ - { - "bearerAuth": [ - [ - "permHashRead" - ] - ] - } - ], - "description": "GET request to retrieve a single object.", - "parameters": [ - { - "name": "id", - "in": "path", - "required": true, - "schema": { - "type": "integer", - "format": "int32", - "example": 10 - } - } - ] - } - }, - "/api/v2/ui/hashes/{id:[0-9]+}/relationships/{relation:chunk}": { - "get": { - "tags": [ - "Hashs" - ], - "responses": { - "400": { - "description": "Invalid request", - "content": { - "application/json": { - "schema": { - "$ref": "#/components/schemas/ErrorResponse" - } - } - } - }, - "401": { - "description": "Authentication failed", - "content": { - "application/json": { - "schema": { - "$ref": "#/components/schemas/ErrorResponse" - } - } - } - }, - "404": { - "description": "Not Found", - "content": { - "application/json": { - "schema": { - "$ref": "#/components/schemas/NotFoundResponse" - } - } - } - }, - "200": { - "description": "successful operation", - "content": { - "application/json": { - "schema": { - "$ref": "#/components/schemas/HashResponse" - } - } - } - } - }, - "security": [ - { - "bearerAuth": [ - [ - "permHashRead" - ] - ] - } - ], - "description": "GET request for for a to-one relationship link. Returns the resource record of the object that is part of the specified relation.", - "parameters": [ - { - "name": "id", - "in": "path", - "required": true, - "schema": { - "type": "integer", - "format": "int32", - "example": 10 - } - } - ] - }, - "patch": { - "tags": [ - "Hashs" - ], - "responses": { - "400": { - "description": "Invalid request", - "content": { - "application/json": { - "schema": { - "$ref": "#/components/schemas/ErrorResponse" - } - } - } - }, - "401": { - "description": "Authentication failed", - "content": { - "application/json": { - "schema": { - "$ref": "#/components/schemas/ErrorResponse" - } - } - } - }, - "204": { - "description": "Succesfull operation" - }, - "404": { - "description": "Not Found", - "content": { - "application/json": { - "schema": { - "$ref": "#/components/schemas/NotFoundResponse" - } - } - } - } - }, - "security": [ - { - "bearerAuth": [ - [ - "permHashUpdate" - ] - ] - } - ], - "description": "", - "requestBody": { - "required": true, - "content": { - "application/json": { - "schema": { - "$ref": "#/components/schemas/HashRelationChunk" - } - } - } - }, - "parameters": [] - } - }, - "/api/v2/ui/hashes/{id:[0-9]+}/{relation:hashlist}": { - "get": { - "tags": [ - "Hashs" - ], - "responses": { - "400": { - "description": "Invalid request", - "content": { - "application/json": { - "schema": { - "$ref": "#/components/schemas/ErrorResponse" - } - } - } - }, - "401": { - "description": "Authentication failed", - "content": { - "application/json": { - "schema": { - "$ref": "#/components/schemas/ErrorResponse" - } - } - } - }, - "404": { - "description": "Not Found", - "content": { - "application/json": { - "schema": { - "$ref": "#/components/schemas/NotFoundResponse" - } - } - } - }, - "200": { - "description": "successful operation", - "content": { - "application/json": { - "schema": { - "$ref": "#/components/schemas/HashRelationHashlistGetResponse" - } - } - } - } - }, - "security": [ - { - "bearerAuth": [ - [ - "permHashRead" - ] - ] - } - ], - "description": "GET request to retrieve a single object.", - "parameters": [ - { - "name": "id", - "in": "path", - "required": true, - "schema": { - "type": "integer", - "format": "int32", - "example": 10 - } - } - ] - } - }, - "/api/v2/ui/hashes/{id:[0-9]+}/relationships/{relation:hashlist}": { - "get": { - "tags": [ - "Hashs" - ], - "responses": { - "400": { - "description": "Invalid request", - "content": { - "application/json": { - "schema": { - "$ref": "#/components/schemas/ErrorResponse" - } - } - } - }, - "401": { - "description": "Authentication failed", - "content": { - "application/json": { - "schema": { - "$ref": "#/components/schemas/ErrorResponse" - } - } - } - }, - "404": { - "description": "Not Found", - "content": { - "application/json": { - "schema": { - "$ref": "#/components/schemas/NotFoundResponse" - } - } - } - }, - "200": { - "description": "successful operation", - "content": { - "application/json": { - "schema": { - "$ref": "#/components/schemas/HashResponse" - } - } - } - } - }, - "security": [ - { - "bearerAuth": [ - [ - "permHashRead" - ] - ] - } - ], - "description": "GET request for for a to-one relationship link. Returns the resource record of the object that is part of the specified relation.", - "parameters": [ - { - "name": "id", - "in": "path", - "required": true, - "schema": { - "type": "integer", - "format": "int32", - "example": 10 - } - } - ] - }, - "patch": { - "tags": [ - "Hashs" - ], - "responses": { - "400": { - "description": "Invalid request", - "content": { - "application/json": { - "schema": { - "$ref": "#/components/schemas/ErrorResponse" - } - } - } - }, - "401": { - "description": "Authentication failed", - "content": { - "application/json": { - "schema": { - "$ref": "#/components/schemas/ErrorResponse" - } - } - } - }, - "204": { - "description": "Succesfull operation" - }, - "404": { - "description": "Not Found", - "content": { - "application/json": { - "schema": { - "$ref": "#/components/schemas/NotFoundResponse" - } - } - } - } - }, - "security": [ - { - "bearerAuth": [ - [ - "permHashUpdate" - ] - ] - } - ], - "description": "", - "requestBody": { - "required": true, - "content": { - "application/json": { - "schema": { - "$ref": "#/components/schemas/HashRelationHashlist" - } - } - } - }, - "parameters": [] - } - }, - "/api/v2/ui/hashes/{id:[0-9]+}": { - "get": { - "tags": [ - "Hashs" - ], - "responses": { - "400": { - "description": "Invalid request", - "content": { - "application/json": { - "schema": { - "$ref": "#/components/schemas/ErrorResponse" - } - } - } - }, - "401": { - "description": "Authentication failed", - "content": { - "application/json": { - "schema": { - "$ref": "#/components/schemas/ErrorResponse" - } - } - } - }, - "404": { - "description": "Not Found", - "content": { - "application/json": { - "schema": { - "$ref": "#/components/schemas/NotFoundResponse" - } - } - } - }, - "200": { - "description": "successful operation", - "content": { - "application/json": { - "schema": { - "$ref": "#/components/schemas/HashResponse" - } - } - } - } - }, - "security": [ - { - "bearerAuth": [ - [ - "permHashRead" - ] - ] - } - ], - "description": "GET request to retrieve a single object.", - "parameters": [ - { - "name": "id", - "in": "path", - "required": true, - "schema": { - "type": "integer", - "format": "int32", - "example": 10 - } - }, - { - "name": "include", - "in": "query", - "schema": { - "type": "string" - }, - "description": "Items to include. Comma seperated" - } - ] - } - }, - "/api/v2/ui/hashlists": { - "get": { - "tags": [ - "Hashlists" - ], - "responses": { - "400": { - "description": "Invalid request", - "content": { - "application/json": { - "schema": { - "$ref": "#/components/schemas/ErrorResponse" - } - } - } - }, - "401": { - "description": "Authentication failed", - "content": { - "application/json": { - "schema": { - "$ref": "#/components/schemas/ErrorResponse" - } - } - } - }, - "200": { - "description": "successful operation", - "content": { - "application/json": { - "schema": { - "type": "array", - "items": { - "$ref": "#/components/schemas/HashlistResponse" - } - } - } - } - } - }, - "security": [ - { - "bearerAuth": [ - [ - "permHashlistRead" - ] - ] - } - ], - "description": "GET many request to retrieve multiple objects.", - "parameters": [ - { - "name": "page[after]", - "in": "path", - "schema": { - "type": "integer", - "format": "int32" - }, - "example": 0, - "description": "Pointer to paginate to retrieve the data after the value provided" - }, - { - "name": "page[before]", - "in": "path", - "schema": { - "type": "integer", - "format": "int32" - }, - "example": 0, - "description": "Pointer to paginate to retrieve the data before the value provided" - }, - { - "name": "page[size]", - "in": "path", - "schema": { - "type": "integer", - "format": "int32" - }, - "example": 100, - "description": "Amout of data to retrieve inside a single page" - }, - { - "name": "filter", - "in": "path", - "style": "deepobject", - "explode": true, - "schema": { - "type": "object" - }, - "description": "Filters results using a query", - "example": "\"filter[hashlistId__gt]\": 200" - }, - { - "name": "include", - "in": "path", - "schema": { - "type": "string" - }, - "description": "Items to include, comma seperated. Possible options: accessGroup,hashType,hashes,hashlists,tasks" - } - ] - }, - "post": { - "tags": [ - "Hashlists" - ], - "responses": { - "400": { - "description": "Invalid request", - "content": { - "application/json": { - "schema": { - "$ref": "#/components/schemas/ErrorResponse" - } - } - } - }, - "401": { - "description": "Authentication failed", - "content": { - "application/json": { - "schema": { - "$ref": "#/components/schemas/ErrorResponse" - } - } - } - }, - "201": { - "description": "successful operation", - "content": { - "application/json": { - "schema": { - "$ref": "#/components/schemas/HashlistPostPatchResponse" - } - } - } - } - }, - "security": [ - { - "bearerAuth": [ - [ - "permHashlistCreate" - ] - ] - } - ], - "description": "POST request to create a new object. The request must contain the resource record as data with the attributes of the new object.To add relationships, a relationships object can be added with the resource records of the relations that are part of this object.", - "requestBody": { - "required": true, - "content": { - "application/json": { - "schema": { - "$ref": "#/components/schemas/HashlistCreate" - } - } - } - }, - "parameters": [] - }, - "patch": { - "tags": [ - "Hashlists" - ], - "responses": { - "400": { - "description": "Invalid request", - "content": { - "application/json": { - "schema": { - "$ref": "#/components/schemas/ErrorResponse" - } - } - } - }, - "401": { - "description": "Authentication failed", - "content": { - "application/json": { - "schema": { - "$ref": "#/components/schemas/ErrorResponse" - } - } - } - } - }, - "security": [ - { - "bearerAuth": [ - [ - "permHashlistUpdate" - ] - ] - } - ], - "description": "PATCH request to update attributes of a single object.", - "parameters": [] - }, - "delete": { - "tags": [ - "Hashlists" - ], - "responses": { - "400": { - "description": "Invalid request", - "content": { - "application/json": { - "schema": { - "$ref": "#/components/schemas/ErrorResponse" - } - } - } - }, - "401": { - "description": "Authentication failed", - "content": { - "application/json": { - "schema": { - "$ref": "#/components/schemas/ErrorResponse" - } - } - } - } - }, - "security": [ - { - "bearerAuth": [ - [ - "permHashlistDelete" - ] - ] - } - ], - "description": "", - "parameters": [] - } - }, - "/api/v2/ui/hashlists/count": { - "get": { - "tags": [ - "Hashlists" - ], - "responses": { - "400": { - "description": "Invalid request", - "content": { - "application/json": { - "schema": { - "$ref": "#/components/schemas/ErrorResponse" - } - } - } - }, - "401": { - "description": "Authentication failed", - "content": { - "application/json": { - "schema": { - "$ref": "#/components/schemas/ErrorResponse" - } - } - } - }, - "200": { - "description": "successful operation", - "content": { - "application/json": { - "schema": { - "type": "array", - "items": { - "$ref": "#/components/schemas/HashlistResponse" - } - } - } - } - } - }, - "security": [ - { - "bearerAuth": [ - [ - "permHashlistRead" - ] - ] - } - ], - "description": "GET many request to retrieve multiple objects.", - "parameters": [ - { - "name": "page[after]", - "in": "path", - "schema": { - "type": "integer", - "format": "int32" - }, - "example": 0, - "description": "Pointer to paginate to retrieve the data after the value provided" - }, - { - "name": "page[before]", - "in": "path", - "schema": { - "type": "integer", - "format": "int32" - }, - "example": 0, - "description": "Pointer to paginate to retrieve the data before the value provided" - }, - { - "name": "page[size]", - "in": "path", - "schema": { - "type": "integer", - "format": "int32" - }, - "example": 100, - "description": "Amout of data to retrieve inside a single page" - }, - { - "name": "filter", - "in": "path", - "style": "deepobject", - "explode": true, - "schema": { - "type": "object" - }, - "description": "Filters results using a query", - "example": "\"filter[hashlistId__gt]\": 200" - }, - { - "name": "include", - "in": "path", - "schema": { - "type": "string" - }, - "description": "Items to include, comma seperated. Possible options: accessGroup,hashType,hashes,hashlists,tasks" - } - ] - } - }, - "/api/v2/ui/hashlists/{id:[0-9]+}/{relation:accessGroup}": { - "get": { - "tags": [ - "Hashlists" - ], - "responses": { - "400": { - "description": "Invalid request", - "content": { - "application/json": { - "schema": { - "$ref": "#/components/schemas/ErrorResponse" - } - } - } - }, - "401": { - "description": "Authentication failed", - "content": { - "application/json": { - "schema": { - "$ref": "#/components/schemas/ErrorResponse" - } - } - } - }, - "404": { - "description": "Not Found", - "content": { - "application/json": { - "schema": { - "$ref": "#/components/schemas/NotFoundResponse" - } - } - } - }, - "200": { - "description": "successful operation", - "content": { - "application/json": { - "schema": { - "$ref": "#/components/schemas/HashlistRelationAccessGroupGetResponse" - } - } - } - } - }, - "security": [ - { - "bearerAuth": [ - [ - "permHashlistRead" - ] - ] - } - ], - "description": "GET request to retrieve a single object.", - "parameters": [ - { - "name": "id", - "in": "path", - "required": true, - "schema": { - "type": "integer", - "format": "int32", - "example": 10 - } - } - ] - } - }, - "/api/v2/ui/hashlists/{id:[0-9]+}/relationships/{relation:accessGroup}": { - "get": { - "tags": [ - "Hashlists" - ], - "responses": { - "400": { - "description": "Invalid request", - "content": { - "application/json": { - "schema": { - "$ref": "#/components/schemas/ErrorResponse" - } - } - } - }, - "401": { - "description": "Authentication failed", - "content": { - "application/json": { - "schema": { - "$ref": "#/components/schemas/ErrorResponse" - } - } - } - }, - "404": { - "description": "Not Found", - "content": { - "application/json": { - "schema": { - "$ref": "#/components/schemas/NotFoundResponse" - } - } - } - }, - "200": { - "description": "successful operation", - "content": { - "application/json": { - "schema": { - "$ref": "#/components/schemas/HashlistResponse" - } - } - } - } - }, - "security": [ - { - "bearerAuth": [ - [ - "permHashlistRead" - ] - ] - } - ], - "description": "GET request for for a to-one relationship link. Returns the resource record of the object that is part of the specified relation.", - "parameters": [ - { - "name": "id", - "in": "path", - "required": true, - "schema": { - "type": "integer", - "format": "int32", - "example": 10 - } - } - ] - }, - "patch": { - "tags": [ - "Hashlists" - ], - "responses": { - "400": { - "description": "Invalid request", - "content": { - "application/json": { - "schema": { - "$ref": "#/components/schemas/ErrorResponse" - } - } - } - }, - "401": { - "description": "Authentication failed", - "content": { - "application/json": { - "schema": { - "$ref": "#/components/schemas/ErrorResponse" - } - } - } - }, - "204": { - "description": "Succesfull operation" - }, - "404": { - "description": "Not Found", - "content": { - "application/json": { - "schema": { - "$ref": "#/components/schemas/NotFoundResponse" - } - } - } - } - }, - "security": [ - { - "bearerAuth": [ - [ - "permHashlistUpdate" - ] - ] - } - ], - "description": "", - "requestBody": { - "required": true, - "content": { - "application/json": { - "schema": { - "$ref": "#/components/schemas/HashlistRelationAccessGroup" - } - } - } - }, - "parameters": [] - } - }, - "/api/v2/ui/hashlists/{id:[0-9]+}/{relation:hashType}": { - "get": { - "tags": [ - "Hashlists" - ], - "responses": { - "400": { - "description": "Invalid request", - "content": { - "application/json": { - "schema": { - "$ref": "#/components/schemas/ErrorResponse" - } - } - } - }, - "401": { - "description": "Authentication failed", - "content": { - "application/json": { - "schema": { - "$ref": "#/components/schemas/ErrorResponse" - } - } - } - }, - "404": { - "description": "Not Found", - "content": { - "application/json": { - "schema": { - "$ref": "#/components/schemas/NotFoundResponse" - } - } - } - }, - "200": { - "description": "successful operation", - "content": { - "application/json": { - "schema": { - "$ref": "#/components/schemas/HashlistRelationHashTypeGetResponse" - } - } - } - } - }, - "security": [ - { - "bearerAuth": [ - [ - "permHashlistRead" - ] - ] - } - ], - "description": "GET request to retrieve a single object.", - "parameters": [ - { - "name": "id", - "in": "path", - "required": true, - "schema": { - "type": "integer", - "format": "int32", - "example": 10 - } - } - ] - } - }, - "/api/v2/ui/hashlists/{id:[0-9]+}/relationships/{relation:hashType}": { - "get": { - "tags": [ - "Hashlists" - ], - "responses": { - "400": { - "description": "Invalid request", - "content": { - "application/json": { - "schema": { - "$ref": "#/components/schemas/ErrorResponse" - } - } - } - }, - "401": { - "description": "Authentication failed", - "content": { - "application/json": { - "schema": { - "$ref": "#/components/schemas/ErrorResponse" - } - } - } - }, - "404": { - "description": "Not Found", - "content": { - "application/json": { - "schema": { - "$ref": "#/components/schemas/NotFoundResponse" - } - } - } - }, - "200": { - "description": "successful operation", - "content": { - "application/json": { - "schema": { - "$ref": "#/components/schemas/HashlistResponse" - } - } - } - } - }, - "security": [ - { - "bearerAuth": [ - [ - "permHashlistRead" - ] - ] - } - ], - "description": "GET request for for a to-one relationship link. Returns the resource record of the object that is part of the specified relation.", - "parameters": [ - { - "name": "id", - "in": "path", - "required": true, - "schema": { - "type": "integer", - "format": "int32", - "example": 10 - } - } - ] - }, - "patch": { - "tags": [ - "Hashlists" - ], - "responses": { - "400": { - "description": "Invalid request", - "content": { - "application/json": { - "schema": { - "$ref": "#/components/schemas/ErrorResponse" - } - } - } - }, - "401": { - "description": "Authentication failed", - "content": { - "application/json": { - "schema": { - "$ref": "#/components/schemas/ErrorResponse" - } - } - } - }, - "204": { - "description": "Succesfull operation" - }, - "404": { - "description": "Not Found", - "content": { - "application/json": { - "schema": { - "$ref": "#/components/schemas/NotFoundResponse" - } - } - } - } - }, - "security": [ - { - "bearerAuth": [ - [ - "permHashlistUpdate" - ] - ] - } - ], - "description": "", - "requestBody": { - "required": true, - "content": { - "application/json": { - "schema": { - "$ref": "#/components/schemas/HashlistRelationHashType" - } - } - } - }, - "parameters": [] - } - }, - "/api/v2/ui/hashlists/{id:[0-9]+}/{relation:hashes}": { - "get": { - "tags": [ - "Hashlists" - ], - "responses": { - "400": { - "description": "Invalid request", - "content": { - "application/json": { - "schema": { - "$ref": "#/components/schemas/ErrorResponse" - } - } - } - }, - "401": { - "description": "Authentication failed", - "content": { - "application/json": { - "schema": { - "$ref": "#/components/schemas/ErrorResponse" - } - } - } - }, - "404": { - "description": "Not Found", - "content": { - "application/json": { - "schema": { - "$ref": "#/components/schemas/NotFoundResponse" - } - } - } - }, - "200": { - "description": "successful operation", - "content": { - "application/json": { - "schema": { - "$ref": "#/components/schemas/HashlistRelationHashesGetResponse" - } - } - } - } - }, - "security": [ - { - "bearerAuth": [ - [ - "permHashlistRead" - ] - ] - } - ], - "description": "GET request to retrieve a single object.", - "parameters": [ - { - "name": "id", - "in": "path", - "required": true, - "schema": { - "type": "integer", - "format": "int32", - "example": 10 - } - } - ] - } - }, - "/api/v2/ui/hashlists/{id:[0-9]+}/relationships/{relation:hashes}": { - "get": { - "tags": [ - "Hashlists" - ], - "responses": { - "400": { - "description": "Invalid request", - "content": { - "application/json": { - "schema": { - "$ref": "#/components/schemas/ErrorResponse" - } - } - } - }, - "401": { - "description": "Authentication failed", - "content": { - "application/json": { - "schema": { - "$ref": "#/components/schemas/ErrorResponse" - } - } - } - }, - "404": { - "description": "Not Found", - "content": { - "application/json": { - "schema": { - "$ref": "#/components/schemas/NotFoundResponse" - } - } - } - }, - "200": { - "description": "successful operation", - "content": { - "application/json": { - "schema": { - "$ref": "#/components/schemas/HashlistResponse" - } - } - } - } - }, - "security": [ - { - "bearerAuth": [ - [ - "permHashlistRead" - ] - ] - } - ], - "description": "GET request for for a to-one relationship link. Returns the resource record of the object that is part of the specified relation.", - "parameters": [ - { - "name": "id", - "in": "path", - "required": true, - "schema": { - "type": "integer", - "format": "int32", - "example": 10 - } - } - ] - }, - "patch": { - "tags": [ - "Hashlists" - ], - "responses": { - "400": { - "description": "Invalid request", - "content": { - "application/json": { - "schema": { - "$ref": "#/components/schemas/ErrorResponse" - } - } - } - }, - "401": { - "description": "Authentication failed", - "content": { - "application/json": { - "schema": { - "$ref": "#/components/schemas/ErrorResponse" - } - } - } - }, - "204": { - "description": "Succesfull operation" - }, - "404": { - "description": "Not Found", - "content": { - "application/json": { - "schema": { - "$ref": "#/components/schemas/NotFoundResponse" - } - } - } - } - }, - "security": [ - { - "bearerAuth": [ - [ - "permHashlistUpdate" - ] - ] - } - ], - "description": "", - "requestBody": { - "required": true, - "content": { - "application/json": { - "schema": { - "$ref": "#/components/schemas/HashlistRelationHashes" - } - } - } - }, - "parameters": [] - }, - "post": { - "tags": [ - "Hashlists" - ], - "responses": { - "400": { - "description": "Invalid request", - "content": { - "application/json": { - "schema": { - "$ref": "#/components/schemas/ErrorResponse" - } - } - } - }, - "401": { - "description": "Authentication failed", - "content": { - "application/json": { - "schema": { - "$ref": "#/components/schemas/ErrorResponse" - } - } - } - }, - "204": { - "description": "successfully created" - }, - "404": { - "description": "Not Found", - "content": { - "application/json": { - "schema": { - "$ref": "#/components/schemas/NotFoundResponse" - } - } - } - } - }, - "security": [ - { - "bearerAuth": [ - [ - "permHashlistCreate" - ] - ] - } - ], - "description": "", - "requestBody": { - "required": true, - "content": { - "application/json": [] - } - }, - "parameters": [] - }, - "delete": { - "tags": [ - "Hashlists" - ], - "responses": { - "400": { - "description": "Invalid request", - "content": { - "application/json": { - "schema": { - "$ref": "#/components/schemas/ErrorResponse" - } - } - } - }, - "401": { - "description": "Authentication failed", - "content": { - "application/json": { - "schema": { - "$ref": "#/components/schemas/ErrorResponse" - } - } - } - }, - "204": { - "description": "successfully deleted" - }, - "404": { - "description": "Not Found", - "content": { - "application/json": { - "schema": { - "$ref": "#/components/schemas/NotFoundResponse" - } - } - } - } - }, - "security": [ - { - "bearerAuth": [ - [ - "permHashlistDelete" - ] - ] - } - ], - "description": "", - "requestBody": { - "required": true, - "content": { - "application/json": { - "schema": { - "$ref": "#/components/schemas/HashlistRelationHashes" - } - } - } - }, - "parameters": [] - } - }, - "/api/v2/ui/hashlists/{id:[0-9]+}/{relation:hashlists}": { - "get": { - "tags": [ - "Hashlists" - ], - "responses": { - "400": { - "description": "Invalid request", - "content": { - "application/json": { - "schema": { - "$ref": "#/components/schemas/ErrorResponse" - } - } - } - }, - "401": { - "description": "Authentication failed", - "content": { - "application/json": { - "schema": { - "$ref": "#/components/schemas/ErrorResponse" - } - } - } - }, - "404": { - "description": "Not Found", - "content": { - "application/json": { - "schema": { - "$ref": "#/components/schemas/NotFoundResponse" - } - } - } - }, - "200": { - "description": "successful operation", - "content": { - "application/json": { - "schema": { - "$ref": "#/components/schemas/HashlistRelationHashlistsGetResponse" - } - } - } - } - }, - "security": [ - { - "bearerAuth": [ - [ - "permHashlistRead" - ] - ] - } - ], - "description": "GET request to retrieve a single object.", - "parameters": [ - { - "name": "id", - "in": "path", - "required": true, - "schema": { - "type": "integer", - "format": "int32", - "example": 10 - } - } - ] - } - }, - "/api/v2/ui/hashlists/{id:[0-9]+}/relationships/{relation:hashlists}": { - "get": { - "tags": [ - "Hashlists" - ], - "responses": { - "400": { - "description": "Invalid request", - "content": { - "application/json": { - "schema": { - "$ref": "#/components/schemas/ErrorResponse" - } - } - } - }, - "401": { - "description": "Authentication failed", - "content": { - "application/json": { - "schema": { - "$ref": "#/components/schemas/ErrorResponse" - } - } - } - }, - "404": { - "description": "Not Found", - "content": { - "application/json": { - "schema": { - "$ref": "#/components/schemas/NotFoundResponse" - } - } - } - }, - "200": { - "description": "successful operation", - "content": { - "application/json": { - "schema": { - "$ref": "#/components/schemas/HashlistResponse" - } - } - } - } - }, - "security": [ - { - "bearerAuth": [ - [ - "permHashlistRead" - ] - ] - } - ], - "description": "GET request for for a to-one relationship link. Returns the resource record of the object that is part of the specified relation.", - "parameters": [ - { - "name": "id", - "in": "path", - "required": true, - "schema": { - "type": "integer", - "format": "int32", - "example": 10 - } - } - ] - }, - "patch": { - "tags": [ - "Hashlists" - ], - "responses": { - "400": { - "description": "Invalid request", - "content": { - "application/json": { - "schema": { - "$ref": "#/components/schemas/ErrorResponse" - } - } - } - }, - "401": { - "description": "Authentication failed", - "content": { - "application/json": { - "schema": { - "$ref": "#/components/schemas/ErrorResponse" - } - } - } - }, - "204": { - "description": "Succesfull operation" - }, - "404": { - "description": "Not Found", - "content": { - "application/json": { - "schema": { - "$ref": "#/components/schemas/NotFoundResponse" - } - } - } - } - }, - "security": [ - { - "bearerAuth": [ - [ - "permHashlistUpdate" - ] - ] - } - ], - "description": "", - "requestBody": { - "required": true, - "content": { - "application/json": { - "schema": { - "$ref": "#/components/schemas/HashlistRelationHashlists" - } - } - } - }, - "parameters": [] - }, - "post": { - "tags": [ - "Hashlists" - ], - "responses": { - "400": { - "description": "Invalid request", - "content": { - "application/json": { - "schema": { - "$ref": "#/components/schemas/ErrorResponse" - } - } - } - }, - "401": { - "description": "Authentication failed", - "content": { - "application/json": { - "schema": { - "$ref": "#/components/schemas/ErrorResponse" - } - } - } - }, - "204": { - "description": "successfully created" - }, - "404": { - "description": "Not Found", - "content": { - "application/json": { - "schema": { - "$ref": "#/components/schemas/NotFoundResponse" - } - } - } - } - }, - "security": [ - { - "bearerAuth": [ - [ - "permHashlistCreate" - ] - ] - } - ], - "description": "", - "requestBody": { - "required": true, - "content": { - "application/json": [] - } - }, - "parameters": [] - }, - "delete": { - "tags": [ - "Hashlists" - ], - "responses": { - "400": { - "description": "Invalid request", - "content": { - "application/json": { - "schema": { - "$ref": "#/components/schemas/ErrorResponse" - } - } - } - }, - "401": { - "description": "Authentication failed", - "content": { - "application/json": { - "schema": { - "$ref": "#/components/schemas/ErrorResponse" - } - } - } - }, - "204": { - "description": "successfully deleted" - }, - "404": { - "description": "Not Found", - "content": { - "application/json": { - "schema": { - "$ref": "#/components/schemas/NotFoundResponse" - } - } - } - } - }, - "security": [ - { - "bearerAuth": [ - [ - "permHashlistDelete" - ] - ] - } - ], - "description": "", - "requestBody": { - "required": true, - "content": { - "application/json": { - "schema": { - "$ref": "#/components/schemas/HashlistRelationHashlists" - } - } - } - }, - "parameters": [] - } - }, - "/api/v2/ui/hashlists/{id:[0-9]+}/{relation:tasks}": { - "get": { - "tags": [ - "Hashlists" - ], - "responses": { - "400": { - "description": "Invalid request", - "content": { - "application/json": { - "schema": { - "$ref": "#/components/schemas/ErrorResponse" - } - } - } - }, - "401": { - "description": "Authentication failed", - "content": { - "application/json": { - "schema": { - "$ref": "#/components/schemas/ErrorResponse" - } - } - } - }, - "404": { - "description": "Not Found", - "content": { - "application/json": { - "schema": { - "$ref": "#/components/schemas/NotFoundResponse" - } - } - } - }, - "200": { - "description": "successful operation", - "content": { - "application/json": { - "schema": { - "$ref": "#/components/schemas/HashlistRelationTasksGetResponse" - } - } - } - } - }, - "security": [ - { - "bearerAuth": [ - [ - "permHashlistRead" - ] - ] - } - ], - "description": "GET request to retrieve a single object.", - "parameters": [ - { - "name": "id", - "in": "path", - "required": true, - "schema": { - "type": "integer", - "format": "int32", - "example": 10 - } - } - ] - } - }, - "/api/v2/ui/hashlists/{id:[0-9]+}/relationships/{relation:tasks}": { - "get": { - "tags": [ - "Hashlists" - ], - "responses": { - "400": { - "description": "Invalid request", - "content": { - "application/json": { - "schema": { - "$ref": "#/components/schemas/ErrorResponse" - } - } - } - }, - "401": { - "description": "Authentication failed", - "content": { - "application/json": { - "schema": { - "$ref": "#/components/schemas/ErrorResponse" - } - } - } - }, - "404": { - "description": "Not Found", - "content": { - "application/json": { - "schema": { - "$ref": "#/components/schemas/NotFoundResponse" - } - } - } - }, - "200": { - "description": "successful operation", - "content": { - "application/json": { - "schema": { - "$ref": "#/components/schemas/HashlistResponse" - } - } - } - } - }, - "security": [ - { - "bearerAuth": [ - [ - "permHashlistRead" - ] - ] - } - ], - "description": "GET request for for a to-one relationship link. Returns the resource record of the object that is part of the specified relation.", - "parameters": [ - { - "name": "id", - "in": "path", - "required": true, - "schema": { - "type": "integer", - "format": "int32", - "example": 10 - } - } - ] - }, - "patch": { - "tags": [ - "Hashlists" - ], - "responses": { - "400": { - "description": "Invalid request", - "content": { - "application/json": { - "schema": { - "$ref": "#/components/schemas/ErrorResponse" - } - } - } - }, - "401": { - "description": "Authentication failed", - "content": { - "application/json": { - "schema": { - "$ref": "#/components/schemas/ErrorResponse" - } - } - } - }, - "204": { - "description": "Succesfull operation" - }, - "404": { - "description": "Not Found", - "content": { - "application/json": { - "schema": { - "$ref": "#/components/schemas/NotFoundResponse" - } - } - } - } - }, - "security": [ - { - "bearerAuth": [ - [ - "permHashlistUpdate" - ] - ] - } - ], - "description": "", - "requestBody": { - "required": true, - "content": { - "application/json": { - "schema": { - "$ref": "#/components/schemas/HashlistRelationTasks" - } - } - } - }, - "parameters": [] - }, - "post": { - "tags": [ - "Hashlists" - ], - "responses": { - "400": { - "description": "Invalid request", - "content": { - "application/json": { - "schema": { - "$ref": "#/components/schemas/ErrorResponse" - } - } - } - }, - "401": { - "description": "Authentication failed", - "content": { - "application/json": { - "schema": { - "$ref": "#/components/schemas/ErrorResponse" - } - } - } - }, - "204": { - "description": "successfully created" - }, - "404": { - "description": "Not Found", - "content": { - "application/json": { - "schema": { - "$ref": "#/components/schemas/NotFoundResponse" - } - } - } - } - }, - "security": [ - { - "bearerAuth": [ - [ - "permHashlistCreate" - ] - ] - } - ], - "description": "", - "requestBody": { - "required": true, - "content": { - "application/json": [] - } - }, - "parameters": [] - }, - "delete": { - "tags": [ - "Hashlists" - ], - "responses": { - "400": { - "description": "Invalid request", - "content": { - "application/json": { - "schema": { - "$ref": "#/components/schemas/ErrorResponse" - } - } - } - }, - "401": { - "description": "Authentication failed", - "content": { - "application/json": { - "schema": { - "$ref": "#/components/schemas/ErrorResponse" - } - } - } - }, - "204": { - "description": "successfully deleted" - }, - "404": { - "description": "Not Found", - "content": { - "application/json": { - "schema": { - "$ref": "#/components/schemas/NotFoundResponse" - } - } - } - } - }, - "security": [ - { - "bearerAuth": [ - [ - "permHashlistDelete" - ] - ] - } - ], - "description": "", - "requestBody": { - "required": true, - "content": { - "application/json": { - "schema": { - "$ref": "#/components/schemas/HashlistRelationTasks" - } - } - } - }, - "parameters": [] - } - }, - "/api/v2/ui/hashlists/{id:[0-9]+}": { - "get": { - "tags": [ - "Hashlists" - ], - "responses": { - "400": { - "description": "Invalid request", - "content": { - "application/json": { - "schema": { - "$ref": "#/components/schemas/ErrorResponse" - } - } - } - }, - "401": { - "description": "Authentication failed", - "content": { - "application/json": { - "schema": { - "$ref": "#/components/schemas/ErrorResponse" - } - } - } - }, - "404": { - "description": "Not Found", - "content": { - "application/json": { - "schema": { - "$ref": "#/components/schemas/NotFoundResponse" - } - } - } - }, - "200": { - "description": "successful operation", - "content": { - "application/json": { - "schema": { - "$ref": "#/components/schemas/HashlistResponse" - } - } - } - } - }, - "security": [ - { - "bearerAuth": [ - [ - "permHashlistRead" - ] - ] - } - ], - "description": "GET request to retrieve a single object.", - "parameters": [ - { - "name": "id", - "in": "path", - "required": true, - "schema": { - "type": "integer", - "format": "int32", - "example": 10 - } - }, - { - "name": "include", - "in": "query", - "schema": { - "type": "string" - }, - "description": "Items to include. Comma seperated" - } - ] - }, - "patch": { - "tags": [ - "Hashlists" - ], - "responses": { - "400": { - "description": "Invalid request", - "content": { - "application/json": { - "schema": { - "$ref": "#/components/schemas/ErrorResponse" - } - } - } - }, - "401": { - "description": "Authentication failed", - "content": { - "application/json": { - "schema": { - "$ref": "#/components/schemas/ErrorResponse" - } - } - } - }, - "404": { - "description": "Not Found", - "content": { - "application/json": { - "schema": { - "$ref": "#/components/schemas/NotFoundResponse" - } - } - } - }, - "200": { - "description": "successful operation", - "content": { - "application/json": { - "schema": { - "$ref": "#/components/schemas/HashlistPostPatchResponse" - } - } - } - } - }, - "security": [ - { - "bearerAuth": [ - [ - "permHashlistUpdate" - ] - ] - } - ], - "description": "PATCH request to update attributes of a single object.", - "requestBody": { - "required": true, - "content": { - "application/json": { - "schema": { - "$ref": "#/components/schemas/HashlistPatch" - } - } - } - }, - "parameters": [] - }, - "delete": { - "tags": [ - "Hashlists" - ], - "responses": { - "400": { - "description": "Invalid request", - "content": { - "application/json": { - "schema": { - "$ref": "#/components/schemas/ErrorResponse" - } - } - } - }, - "401": { - "description": "Authentication failed", - "content": { - "application/json": { - "schema": { - "$ref": "#/components/schemas/ErrorResponse" - } - } - } - }, - "404": { - "description": "Not Found", - "content": { - "application/json": { - "schema": { - "$ref": "#/components/schemas/NotFoundResponse" - } - } - } - }, - "204": { - "description": "successfully deleted" - } - }, - "security": [ - { - "bearerAuth": [ - [ - "permHashlistDelete" - ] - ] - } - ], - "description": "", - "requestBody": { - "required": true, - "content": { - "application/json": [] - } - }, - "parameters": [] - } - }, - "/api/v2/ui/hashtypes": { - "get": { - "tags": [ - "HashTypes" - ], - "responses": { - "400": { - "description": "Invalid request", - "content": { - "application/json": { - "schema": { - "$ref": "#/components/schemas/ErrorResponse" - } - } - } - }, - "401": { - "description": "Authentication failed", - "content": { - "application/json": { - "schema": { - "$ref": "#/components/schemas/ErrorResponse" - } - } - } - }, - "200": { - "description": "successful operation", - "content": { - "application/json": { - "schema": { - "type": "array", - "items": { - "$ref": "#/components/schemas/HashTypeResponse" - } - } - } - } - } - }, - "security": [ - { - "bearerAuth": [ - [ - "permHashTypeRead" - ] - ] - } - ], - "description": "GET many request to retrieve multiple objects.", - "parameters": [ - { - "name": "page[after]", - "in": "path", - "schema": { - "type": "integer", - "format": "int32" - }, - "example": 0, - "description": "Pointer to paginate to retrieve the data after the value provided" - }, - { - "name": "page[before]", - "in": "path", - "schema": { - "type": "integer", - "format": "int32" - }, - "example": 0, - "description": "Pointer to paginate to retrieve the data before the value provided" - }, - { - "name": "page[size]", - "in": "path", - "schema": { - "type": "integer", - "format": "int32" - }, - "example": 100, - "description": "Amout of data to retrieve inside a single page" - }, - { - "name": "filter", - "in": "path", - "style": "deepobject", - "explode": true, - "schema": { - "type": "object" - }, - "description": "Filters results using a query", - "example": "\"filter[hashlistId__gt]\": 200" - }, - { - "name": "include", - "in": "path", - "schema": { - "type": "string" - }, - "description": "Items to include, comma seperated. Possible options: " - } - ] - }, - "post": { - "tags": [ - "HashTypes" - ], - "responses": { - "400": { - "description": "Invalid request", - "content": { - "application/json": { - "schema": { - "$ref": "#/components/schemas/ErrorResponse" - } - } - } - }, - "401": { - "description": "Authentication failed", - "content": { - "application/json": { - "schema": { - "$ref": "#/components/schemas/ErrorResponse" - } - } - } - }, - "201": { - "description": "successful operation", - "content": { - "application/json": { - "schema": { - "$ref": "#/components/schemas/HashTypePostPatchResponse" - } - } - } - } - }, - "security": [ - { - "bearerAuth": [ - [ - "permHashTypeCreate" - ] - ] - } - ], - "description": "POST request to create a new object. The request must contain the resource record as data with the attributes of the new object.To add relationships, a relationships object can be added with the resource records of the relations that are part of this object.", - "requestBody": { - "required": true, - "content": { - "application/json": { - "schema": { - "$ref": "#/components/schemas/HashTypeCreate" - } - } - } - }, - "parameters": [] - }, - "patch": { - "tags": [ - "HashTypes" - ], - "responses": { - "400": { - "description": "Invalid request", - "content": { - "application/json": { - "schema": { - "$ref": "#/components/schemas/ErrorResponse" - } - } - } - }, - "401": { - "description": "Authentication failed", - "content": { - "application/json": { - "schema": { - "$ref": "#/components/schemas/ErrorResponse" - } - } - } - } - }, - "security": [ - { - "bearerAuth": [ - [ - "permHashTypeUpdate" - ] - ] - } - ], - "description": "PATCH request to update attributes of a single object.", - "parameters": [] - }, - "delete": { - "tags": [ - "HashTypes" - ], - "responses": { - "400": { - "description": "Invalid request", - "content": { - "application/json": { - "schema": { - "$ref": "#/components/schemas/ErrorResponse" - } - } - } - }, - "401": { - "description": "Authentication failed", - "content": { - "application/json": { - "schema": { - "$ref": "#/components/schemas/ErrorResponse" - } - } - } - } - }, - "security": [ - { - "bearerAuth": [ - [ - "permHashTypeDelete" - ] - ] - } - ], - "description": "", - "parameters": [] - } - }, - "/api/v2/ui/hashtypes/count": { - "get": { - "tags": [ - "HashTypes" - ], - "responses": { - "400": { - "description": "Invalid request", - "content": { - "application/json": { - "schema": { - "$ref": "#/components/schemas/ErrorResponse" - } - } - } - }, - "401": { - "description": "Authentication failed", - "content": { - "application/json": { - "schema": { - "$ref": "#/components/schemas/ErrorResponse" - } - } - } - }, - "200": { - "description": "successful operation", - "content": { - "application/json": { - "schema": { - "type": "array", - "items": { - "$ref": "#/components/schemas/HashTypeResponse" - } - } - } - } - } - }, - "security": [ - { - "bearerAuth": [ - [ - "permHashTypeRead" - ] - ] - } - ], - "description": "GET many request to retrieve multiple objects.", - "parameters": [ - { - "name": "page[after]", - "in": "path", - "schema": { - "type": "integer", - "format": "int32" - }, - "example": 0, - "description": "Pointer to paginate to retrieve the data after the value provided" - }, - { - "name": "page[before]", - "in": "path", - "schema": { - "type": "integer", - "format": "int32" - }, - "example": 0, - "description": "Pointer to paginate to retrieve the data before the value provided" - }, - { - "name": "page[size]", - "in": "path", - "schema": { - "type": "integer", - "format": "int32" - }, - "example": 100, - "description": "Amout of data to retrieve inside a single page" - }, - { - "name": "filter", - "in": "path", - "style": "deepobject", - "explode": true, - "schema": { - "type": "object" - }, - "description": "Filters results using a query", - "example": "\"filter[hashlistId__gt]\": 200" - }, - { - "name": "include", - "in": "path", - "schema": { - "type": "string" - }, - "description": "Items to include, comma seperated. Possible options: " - } - ] - } - }, - "/api/v2/ui/hashtypes/{id:[0-9]+}": { - "get": { - "tags": [ - "HashTypes" - ], - "responses": { - "400": { - "description": "Invalid request", - "content": { - "application/json": { - "schema": { - "$ref": "#/components/schemas/ErrorResponse" - } - } - } - }, - "401": { - "description": "Authentication failed", - "content": { - "application/json": { - "schema": { - "$ref": "#/components/schemas/ErrorResponse" - } - } - } - }, - "404": { - "description": "Not Found", - "content": { - "application/json": { - "schema": { - "$ref": "#/components/schemas/NotFoundResponse" - } - } - } - }, - "200": { - "description": "successful operation", - "content": { - "application/json": { - "schema": { - "$ref": "#/components/schemas/HashTypeResponse" - } - } - } - } - }, - "security": [ - { - "bearerAuth": [ - [ - "permHashTypeRead" - ] - ] - } - ], - "description": "GET request to retrieve a single object.", - "parameters": [ - { - "name": "id", - "in": "path", - "required": true, - "schema": { - "type": "integer", - "format": "int32", - "example": 10 - } - }, - { - "name": "include", - "in": "query", - "schema": { - "type": "string" - }, - "description": "Items to include. Comma seperated" - } - ] - }, - "patch": { - "tags": [ - "HashTypes" - ], - "responses": { - "400": { - "description": "Invalid request", - "content": { - "application/json": { - "schema": { - "$ref": "#/components/schemas/ErrorResponse" - } - } - } - }, - "401": { - "description": "Authentication failed", - "content": { - "application/json": { - "schema": { - "$ref": "#/components/schemas/ErrorResponse" - } - } - } - }, - "404": { - "description": "Not Found", - "content": { - "application/json": { - "schema": { - "$ref": "#/components/schemas/NotFoundResponse" - } - } - } - }, - "200": { - "description": "successful operation", - "content": { - "application/json": { - "schema": { - "$ref": "#/components/schemas/HashTypePostPatchResponse" - } - } - } - } - }, - "security": [ - { - "bearerAuth": [ - [ - "permHashTypeUpdate" - ] - ] - } - ], - "description": "PATCH request to update attributes of a single object.", - "requestBody": { - "required": true, - "content": { - "application/json": { - "schema": { - "$ref": "#/components/schemas/HashTypePatch" - } - } - } - }, - "parameters": [] - }, - "delete": { - "tags": [ - "HashTypes" - ], - "responses": { - "400": { - "description": "Invalid request", - "content": { - "application/json": { - "schema": { - "$ref": "#/components/schemas/ErrorResponse" - } - } - } - }, - "401": { - "description": "Authentication failed", - "content": { - "application/json": { - "schema": { - "$ref": "#/components/schemas/ErrorResponse" - } - } - } - }, - "404": { - "description": "Not Found", - "content": { - "application/json": { - "schema": { - "$ref": "#/components/schemas/NotFoundResponse" - } - } - } - }, - "204": { - "description": "successfully deleted" - } - }, - "security": [ - { - "bearerAuth": [ - [ - "permHashTypeDelete" - ] - ] - } - ], - "description": "", - "requestBody": { - "required": true, - "content": { - "application/json": [] - } - }, - "parameters": [] - } - }, - "/api/v2/ui/healthcheckagents": { - "get": { - "tags": [ - "HealthCheckAgents" - ], - "responses": { - "400": { - "description": "Invalid request", - "content": { - "application/json": { - "schema": { - "$ref": "#/components/schemas/ErrorResponse" - } - } - } - }, - "401": { - "description": "Authentication failed", - "content": { - "application/json": { - "schema": { - "$ref": "#/components/schemas/ErrorResponse" - } - } - } - }, - "200": { - "description": "successful operation", - "content": { - "application/json": { - "schema": { - "type": "array", - "items": { - "$ref": "#/components/schemas/HealthCheckAgentResponse" - } - } - } - } - } - }, - "security": [ - { - "bearerAuth": [ - [ - "permHealthCheckAgentRead" - ] - ] - } - ], - "description": "GET many request to retrieve multiple objects.", - "parameters": [ - { - "name": "page[after]", - "in": "path", - "schema": { - "type": "integer", - "format": "int32" - }, - "example": 0, - "description": "Pointer to paginate to retrieve the data after the value provided" - }, - { - "name": "page[before]", - "in": "path", - "schema": { - "type": "integer", - "format": "int32" - }, - "example": 0, - "description": "Pointer to paginate to retrieve the data before the value provided" - }, - { - "name": "page[size]", - "in": "path", - "schema": { - "type": "integer", - "format": "int32" - }, - "example": 100, - "description": "Amout of data to retrieve inside a single page" - }, - { - "name": "filter", - "in": "path", - "style": "deepobject", - "explode": true, - "schema": { - "type": "object" - }, - "description": "Filters results using a query", - "example": "\"filter[hashlistId__gt]\": 200" - }, - { - "name": "include", - "in": "path", - "schema": { - "type": "string" - }, - "description": "Items to include, comma seperated. Possible options: agent,healthCheck" - } - ] - } - }, - "/api/v2/ui/healthcheckagents/count": { - "get": { - "tags": [ - "HealthCheckAgents" - ], - "responses": { - "400": { - "description": "Invalid request", - "content": { - "application/json": { - "schema": { - "$ref": "#/components/schemas/ErrorResponse" - } - } - } - }, - "401": { - "description": "Authentication failed", - "content": { - "application/json": { - "schema": { - "$ref": "#/components/schemas/ErrorResponse" - } - } - } - }, - "200": { - "description": "successful operation", - "content": { - "application/json": { - "schema": { - "type": "array", - "items": { - "$ref": "#/components/schemas/HealthCheckAgentResponse" - } - } - } - } - } - }, - "security": [ - { - "bearerAuth": [ - [ - "permHealthCheckAgentRead" - ] - ] - } - ], - "description": "GET many request to retrieve multiple objects.", - "parameters": [ - { - "name": "page[after]", - "in": "path", - "schema": { - "type": "integer", - "format": "int32" - }, - "example": 0, - "description": "Pointer to paginate to retrieve the data after the value provided" - }, - { - "name": "page[before]", - "in": "path", - "schema": { - "type": "integer", - "format": "int32" - }, - "example": 0, - "description": "Pointer to paginate to retrieve the data before the value provided" - }, - { - "name": "page[size]", - "in": "path", - "schema": { - "type": "integer", - "format": "int32" - }, - "example": 100, - "description": "Amout of data to retrieve inside a single page" - }, - { - "name": "filter", - "in": "path", - "style": "deepobject", - "explode": true, - "schema": { - "type": "object" - }, - "description": "Filters results using a query", - "example": "\"filter[hashlistId__gt]\": 200" - }, - { - "name": "include", - "in": "path", - "schema": { - "type": "string" - }, - "description": "Items to include, comma seperated. Possible options: agent,healthCheck" - } - ] - } - }, - "/api/v2/ui/healthcheckagents/{id:[0-9]+}/{relation:agent}": { - "get": { - "tags": [ - "HealthCheckAgents" - ], - "responses": { - "400": { - "description": "Invalid request", - "content": { - "application/json": { - "schema": { - "$ref": "#/components/schemas/ErrorResponse" - } - } - } - }, - "401": { - "description": "Authentication failed", - "content": { - "application/json": { - "schema": { - "$ref": "#/components/schemas/ErrorResponse" - } - } - } - }, - "404": { - "description": "Not Found", - "content": { - "application/json": { - "schema": { - "$ref": "#/components/schemas/NotFoundResponse" - } - } - } - }, - "200": { - "description": "successful operation", - "content": { - "application/json": { - "schema": { - "$ref": "#/components/schemas/HealthCheckAgentRelationAgentGetResponse" - } - } - } - } - }, - "security": [ - { - "bearerAuth": [ - [ - "permHealthCheckAgentRead" - ] - ] - } - ], - "description": "GET request to retrieve a single object.", - "parameters": [ - { - "name": "id", - "in": "path", - "required": true, - "schema": { - "type": "integer", - "format": "int32", - "example": 10 - } - } - ] - } - }, - "/api/v2/ui/healthcheckagents/{id:[0-9]+}/relationships/{relation:agent}": { - "get": { - "tags": [ - "HealthCheckAgents" - ], - "responses": { - "400": { - "description": "Invalid request", - "content": { - "application/json": { - "schema": { - "$ref": "#/components/schemas/ErrorResponse" - } - } - } - }, - "401": { - "description": "Authentication failed", - "content": { - "application/json": { - "schema": { - "$ref": "#/components/schemas/ErrorResponse" - } - } - } - }, - "404": { - "description": "Not Found", - "content": { - "application/json": { - "schema": { - "$ref": "#/components/schemas/NotFoundResponse" - } - } - } - }, - "200": { - "description": "successful operation", - "content": { - "application/json": { - "schema": { - "$ref": "#/components/schemas/HealthCheckAgentResponse" - } - } - } - } - }, - "security": [ - { - "bearerAuth": [ - [ - "permHealthCheckAgentRead" - ] - ] - } - ], - "description": "GET request for for a to-one relationship link. Returns the resource record of the object that is part of the specified relation.", - "parameters": [ - { - "name": "id", - "in": "path", - "required": true, - "schema": { - "type": "integer", - "format": "int32", - "example": 10 - } - } - ] - }, - "patch": { - "tags": [ - "HealthCheckAgents" - ], - "responses": { - "400": { - "description": "Invalid request", - "content": { - "application/json": { - "schema": { - "$ref": "#/components/schemas/ErrorResponse" - } - } - } - }, - "401": { - "description": "Authentication failed", - "content": { - "application/json": { - "schema": { - "$ref": "#/components/schemas/ErrorResponse" - } - } - } - }, - "204": { - "description": "Succesfull operation" - }, - "404": { - "description": "Not Found", - "content": { - "application/json": { - "schema": { - "$ref": "#/components/schemas/NotFoundResponse" - } - } - } - } - }, - "security": [ - { - "bearerAuth": [ - [ - "permHealthCheckAgentUpdate" - ] - ] - } - ], - "description": "", - "requestBody": { - "required": true, - "content": { - "application/json": { - "schema": { - "$ref": "#/components/schemas/HealthCheckAgentRelationAgent" - } - } - } - }, - "parameters": [] - } - }, - "/api/v2/ui/healthcheckagents/{id:[0-9]+}/{relation:healthCheck}": { - "get": { - "tags": [ - "HealthCheckAgents" - ], - "responses": { - "400": { - "description": "Invalid request", - "content": { - "application/json": { - "schema": { - "$ref": "#/components/schemas/ErrorResponse" - } - } - } - }, - "401": { - "description": "Authentication failed", - "content": { - "application/json": { - "schema": { - "$ref": "#/components/schemas/ErrorResponse" - } - } - } - }, - "404": { - "description": "Not Found", - "content": { - "application/json": { - "schema": { - "$ref": "#/components/schemas/NotFoundResponse" - } - } - } - }, - "200": { - "description": "successful operation", - "content": { - "application/json": { - "schema": { - "$ref": "#/components/schemas/HealthCheckAgentRelationHealthCheckGetResponse" - } - } - } - } - }, - "security": [ - { - "bearerAuth": [ - [ - "permHealthCheckAgentRead" - ] - ] - } - ], - "description": "GET request to retrieve a single object.", - "parameters": [ - { - "name": "id", - "in": "path", - "required": true, - "schema": { - "type": "integer", - "format": "int32", - "example": 10 - } - } - ] - } - }, - "/api/v2/ui/healthcheckagents/{id:[0-9]+}/relationships/{relation:healthCheck}": { - "get": { - "tags": [ - "HealthCheckAgents" - ], - "responses": { - "400": { - "description": "Invalid request", - "content": { - "application/json": { - "schema": { - "$ref": "#/components/schemas/ErrorResponse" - } - } - } - }, - "401": { - "description": "Authentication failed", - "content": { - "application/json": { - "schema": { - "$ref": "#/components/schemas/ErrorResponse" - } - } - } - }, - "404": { - "description": "Not Found", - "content": { - "application/json": { - "schema": { - "$ref": "#/components/schemas/NotFoundResponse" - } - } - } - }, - "200": { - "description": "successful operation", - "content": { - "application/json": { - "schema": { - "$ref": "#/components/schemas/HealthCheckAgentResponse" - } - } - } - } - }, - "security": [ - { - "bearerAuth": [ - [ - "permHealthCheckAgentRead" - ] - ] - } - ], - "description": "GET request for for a to-one relationship link. Returns the resource record of the object that is part of the specified relation.", - "parameters": [ - { - "name": "id", - "in": "path", - "required": true, - "schema": { - "type": "integer", - "format": "int32", - "example": 10 - } - } - ] - }, - "patch": { - "tags": [ - "HealthCheckAgents" - ], - "responses": { - "400": { - "description": "Invalid request", - "content": { - "application/json": { - "schema": { - "$ref": "#/components/schemas/ErrorResponse" - } - } - } - }, - "401": { - "description": "Authentication failed", - "content": { - "application/json": { - "schema": { - "$ref": "#/components/schemas/ErrorResponse" - } - } - } - }, - "204": { - "description": "Succesfull operation" - }, - "404": { - "description": "Not Found", - "content": { - "application/json": { - "schema": { - "$ref": "#/components/schemas/NotFoundResponse" - } - } - } - } - }, - "security": [ - { - "bearerAuth": [ - [ - "permHealthCheckAgentUpdate" - ] - ] - } - ], - "description": "", - "requestBody": { - "required": true, - "content": { - "application/json": { - "schema": { - "$ref": "#/components/schemas/HealthCheckAgentRelationHealthCheck" - } - } - } - }, - "parameters": [] - } - }, - "/api/v2/ui/healthcheckagents/{id:[0-9]+}": { - "get": { - "tags": [ - "HealthCheckAgents" - ], - "responses": { - "400": { - "description": "Invalid request", - "content": { - "application/json": { - "schema": { - "$ref": "#/components/schemas/ErrorResponse" - } - } - } - }, - "401": { - "description": "Authentication failed", - "content": { - "application/json": { - "schema": { - "$ref": "#/components/schemas/ErrorResponse" - } - } - } - }, - "404": { - "description": "Not Found", - "content": { - "application/json": { - "schema": { - "$ref": "#/components/schemas/NotFoundResponse" - } - } - } - }, - "200": { - "description": "successful operation", - "content": { - "application/json": { - "schema": { - "$ref": "#/components/schemas/HealthCheckAgentResponse" - } - } - } - } - }, - "security": [ - { - "bearerAuth": [ - [ - "permHealthCheckAgentRead" - ] - ] - } - ], - "description": "GET request to retrieve a single object.", - "parameters": [ - { - "name": "id", - "in": "path", - "required": true, - "schema": { - "type": "integer", - "format": "int32", - "example": 10 - } - }, - { - "name": "include", - "in": "query", - "schema": { - "type": "string" - }, - "description": "Items to include. Comma seperated" - } - ] - } - }, - "/api/v2/ui/healthchecks": { - "get": { - "tags": [ - "HealthChecks" - ], - "responses": { - "400": { - "description": "Invalid request", - "content": { - "application/json": { - "schema": { - "$ref": "#/components/schemas/ErrorResponse" - } - } - } - }, - "401": { - "description": "Authentication failed", - "content": { - "application/json": { - "schema": { - "$ref": "#/components/schemas/ErrorResponse" - } - } - } - }, - "200": { - "description": "successful operation", - "content": { - "application/json": { - "schema": { - "type": "array", - "items": { - "$ref": "#/components/schemas/HealthCheckResponse" - } - } - } - } - } - }, - "security": [ - { - "bearerAuth": [ - [ - "permHealthCheckRead" - ] - ] - } - ], - "description": "GET many request to retrieve multiple objects.", - "parameters": [ - { - "name": "page[after]", - "in": "path", - "schema": { - "type": "integer", - "format": "int32" - }, - "example": 0, - "description": "Pointer to paginate to retrieve the data after the value provided" - }, - { - "name": "page[before]", - "in": "path", - "schema": { - "type": "integer", - "format": "int32" - }, - "example": 0, - "description": "Pointer to paginate to retrieve the data before the value provided" - }, - { - "name": "page[size]", - "in": "path", - "schema": { - "type": "integer", - "format": "int32" - }, - "example": 100, - "description": "Amout of data to retrieve inside a single page" - }, - { - "name": "filter", - "in": "path", - "style": "deepobject", - "explode": true, - "schema": { - "type": "object" - }, - "description": "Filters results using a query", - "example": "\"filter[hashlistId__gt]\": 200" - }, - { - "name": "include", - "in": "path", - "schema": { - "type": "string" - }, - "description": "Items to include, comma seperated. Possible options: crackerBinary,hashType,healthCheckAgents" - } - ] - }, - "post": { - "tags": [ - "HealthChecks" - ], - "responses": { - "400": { - "description": "Invalid request", - "content": { - "application/json": { - "schema": { - "$ref": "#/components/schemas/ErrorResponse" - } - } - } - }, - "401": { - "description": "Authentication failed", - "content": { - "application/json": { - "schema": { - "$ref": "#/components/schemas/ErrorResponse" - } - } - } - }, - "201": { - "description": "successful operation", - "content": { - "application/json": { - "schema": { - "$ref": "#/components/schemas/HealthCheckPostPatchResponse" - } - } - } - } - }, - "security": [ - { - "bearerAuth": [ - [ - "permHealthCheckCreate" - ] - ] - } - ], - "description": "POST request to create a new object. The request must contain the resource record as data with the attributes of the new object.To add relationships, a relationships object can be added with the resource records of the relations that are part of this object.", - "requestBody": { - "required": true, - "content": { - "application/json": { - "schema": { - "$ref": "#/components/schemas/HealthCheckCreate" - } - } - } - }, - "parameters": [] - }, - "patch": { - "tags": [ - "HealthChecks" - ], - "responses": { - "400": { - "description": "Invalid request", - "content": { - "application/json": { - "schema": { - "$ref": "#/components/schemas/ErrorResponse" - } - } - } - }, - "401": { - "description": "Authentication failed", - "content": { - "application/json": { - "schema": { - "$ref": "#/components/schemas/ErrorResponse" - } - } - } - } - }, - "security": [ - { - "bearerAuth": [ - [ - "permHealthCheckUpdate" - ] - ] - } - ], - "description": "PATCH request to update attributes of a single object.", - "parameters": [] - }, - "delete": { - "tags": [ - "HealthChecks" - ], - "responses": { - "400": { - "description": "Invalid request", - "content": { - "application/json": { - "schema": { - "$ref": "#/components/schemas/ErrorResponse" - } - } - } - }, - "401": { - "description": "Authentication failed", - "content": { - "application/json": { - "schema": { - "$ref": "#/components/schemas/ErrorResponse" - } - } - } - } - }, - "security": [ - { - "bearerAuth": [ - [ - "permHealthCheckDelete" - ] - ] - } - ], - "description": "", - "parameters": [] - } - }, - "/api/v2/ui/healthchecks/count": { - "get": { - "tags": [ - "HealthChecks" - ], - "responses": { - "400": { - "description": "Invalid request", - "content": { - "application/json": { - "schema": { - "$ref": "#/components/schemas/ErrorResponse" - } - } - } - }, - "401": { - "description": "Authentication failed", - "content": { - "application/json": { - "schema": { - "$ref": "#/components/schemas/ErrorResponse" - } - } - } - }, - "200": { - "description": "successful operation", - "content": { - "application/json": { - "schema": { - "type": "array", - "items": { - "$ref": "#/components/schemas/HealthCheckResponse" - } - } - } - } - } - }, - "security": [ - { - "bearerAuth": [ - [ - "permHealthCheckRead" - ] - ] - } - ], - "description": "GET many request to retrieve multiple objects.", - "parameters": [ - { - "name": "page[after]", - "in": "path", - "schema": { - "type": "integer", - "format": "int32" - }, - "example": 0, - "description": "Pointer to paginate to retrieve the data after the value provided" - }, - { - "name": "page[before]", - "in": "path", - "schema": { - "type": "integer", - "format": "int32" - }, - "example": 0, - "description": "Pointer to paginate to retrieve the data before the value provided" - }, - { - "name": "page[size]", - "in": "path", - "schema": { - "type": "integer", - "format": "int32" - }, - "example": 100, - "description": "Amout of data to retrieve inside a single page" - }, - { - "name": "filter", - "in": "path", - "style": "deepobject", - "explode": true, - "schema": { - "type": "object" - }, - "description": "Filters results using a query", - "example": "\"filter[hashlistId__gt]\": 200" - }, - { - "name": "include", - "in": "path", - "schema": { - "type": "string" - }, - "description": "Items to include, comma seperated. Possible options: crackerBinary,hashType,healthCheckAgents" - } - ] - } - }, - "/api/v2/ui/healthchecks/{id:[0-9]+}/{relation:crackerBinary}": { - "get": { - "tags": [ - "HealthChecks" - ], - "responses": { - "400": { - "description": "Invalid request", - "content": { - "application/json": { - "schema": { - "$ref": "#/components/schemas/ErrorResponse" - } - } - } - }, - "401": { - "description": "Authentication failed", - "content": { - "application/json": { - "schema": { - "$ref": "#/components/schemas/ErrorResponse" - } - } - } - }, - "404": { - "description": "Not Found", - "content": { - "application/json": { - "schema": { - "$ref": "#/components/schemas/NotFoundResponse" - } - } - } - }, - "200": { - "description": "successful operation", - "content": { - "application/json": { - "schema": { - "$ref": "#/components/schemas/HealthCheckRelationCrackerBinaryGetResponse" - } - } - } - } - }, - "security": [ - { - "bearerAuth": [ - [ - "permHealthCheckRead" - ] - ] - } - ], - "description": "GET request to retrieve a single object.", - "parameters": [ - { - "name": "id", - "in": "path", - "required": true, - "schema": { - "type": "integer", - "format": "int32", - "example": 10 - } - } - ] - } - }, - "/api/v2/ui/healthchecks/{id:[0-9]+}/relationships/{relation:crackerBinary}": { - "get": { - "tags": [ - "HealthChecks" - ], - "responses": { - "400": { - "description": "Invalid request", - "content": { - "application/json": { - "schema": { - "$ref": "#/components/schemas/ErrorResponse" - } - } - } - }, - "401": { - "description": "Authentication failed", - "content": { - "application/json": { - "schema": { - "$ref": "#/components/schemas/ErrorResponse" - } - } - } - }, - "404": { - "description": "Not Found", - "content": { - "application/json": { - "schema": { - "$ref": "#/components/schemas/NotFoundResponse" - } - } - } - }, - "200": { - "description": "successful operation", - "content": { - "application/json": { - "schema": { - "$ref": "#/components/schemas/HealthCheckResponse" - } - } - } - } - }, - "security": [ - { - "bearerAuth": [ - [ - "permHealthCheckRead" - ] - ] - } - ], - "description": "GET request for for a to-one relationship link. Returns the resource record of the object that is part of the specified relation.", - "parameters": [ - { - "name": "id", - "in": "path", - "required": true, - "schema": { - "type": "integer", - "format": "int32", - "example": 10 - } - } - ] - }, - "patch": { - "tags": [ - "HealthChecks" - ], - "responses": { - "400": { - "description": "Invalid request", - "content": { - "application/json": { - "schema": { - "$ref": "#/components/schemas/ErrorResponse" - } - } - } - }, - "401": { - "description": "Authentication failed", - "content": { - "application/json": { - "schema": { - "$ref": "#/components/schemas/ErrorResponse" - } - } - } - }, - "204": { - "description": "Succesfull operation" - }, - "404": { - "description": "Not Found", - "content": { - "application/json": { - "schema": { - "$ref": "#/components/schemas/NotFoundResponse" - } - } - } - } - }, - "security": [ - { - "bearerAuth": [ - [ - "permHealthCheckUpdate" - ] - ] - } - ], - "description": "", - "requestBody": { - "required": true, - "content": { - "application/json": { - "schema": { - "$ref": "#/components/schemas/HealthCheckRelationCrackerBinary" - } - } - } - }, - "parameters": [] - } - }, - "/api/v2/ui/healthchecks/{id:[0-9]+}/{relation:hashType}": { - "get": { - "tags": [ - "HealthChecks" - ], - "responses": { - "400": { - "description": "Invalid request", - "content": { - "application/json": { - "schema": { - "$ref": "#/components/schemas/ErrorResponse" - } - } - } - }, - "401": { - "description": "Authentication failed", - "content": { - "application/json": { - "schema": { - "$ref": "#/components/schemas/ErrorResponse" - } - } - } - }, - "404": { - "description": "Not Found", - "content": { - "application/json": { - "schema": { - "$ref": "#/components/schemas/NotFoundResponse" - } - } - } - }, - "200": { - "description": "successful operation", - "content": { - "application/json": { - "schema": { - "$ref": "#/components/schemas/HealthCheckRelationHashTypeGetResponse" - } - } - } - } - }, - "security": [ - { - "bearerAuth": [ - [ - "permHealthCheckRead" - ] - ] - } - ], - "description": "GET request to retrieve a single object.", - "parameters": [ - { - "name": "id", - "in": "path", - "required": true, - "schema": { - "type": "integer", - "format": "int32", - "example": 10 - } - } - ] - } - }, - "/api/v2/ui/healthchecks/{id:[0-9]+}/relationships/{relation:hashType}": { - "get": { - "tags": [ - "HealthChecks" - ], - "responses": { - "400": { - "description": "Invalid request", - "content": { - "application/json": { - "schema": { - "$ref": "#/components/schemas/ErrorResponse" - } - } - } - }, - "401": { - "description": "Authentication failed", - "content": { - "application/json": { - "schema": { - "$ref": "#/components/schemas/ErrorResponse" - } - } - } - }, - "404": { - "description": "Not Found", - "content": { - "application/json": { - "schema": { - "$ref": "#/components/schemas/NotFoundResponse" - } - } - } - }, - "200": { - "description": "successful operation", - "content": { - "application/json": { - "schema": { - "$ref": "#/components/schemas/HealthCheckResponse" - } - } - } - } - }, - "security": [ - { - "bearerAuth": [ - [ - "permHealthCheckRead" - ] - ] - } - ], - "description": "GET request for for a to-one relationship link. Returns the resource record of the object that is part of the specified relation.", - "parameters": [ - { - "name": "id", - "in": "path", - "required": true, - "schema": { - "type": "integer", - "format": "int32", - "example": 10 - } - } - ] - }, - "patch": { - "tags": [ - "HealthChecks" - ], - "responses": { - "400": { - "description": "Invalid request", - "content": { - "application/json": { - "schema": { - "$ref": "#/components/schemas/ErrorResponse" - } - } - } - }, - "401": { - "description": "Authentication failed", - "content": { - "application/json": { - "schema": { - "$ref": "#/components/schemas/ErrorResponse" - } - } - } - }, - "204": { - "description": "Succesfull operation" - }, - "404": { - "description": "Not Found", - "content": { - "application/json": { - "schema": { - "$ref": "#/components/schemas/NotFoundResponse" - } - } - } - } - }, - "security": [ - { - "bearerAuth": [ - [ - "permHealthCheckUpdate" - ] - ] - } - ], - "description": "", - "requestBody": { - "required": true, - "content": { - "application/json": { - "schema": { - "$ref": "#/components/schemas/HealthCheckRelationHashType" - } - } - } - }, - "parameters": [] - } - }, - "/api/v2/ui/healthchecks/{id:[0-9]+}/{relation:healthCheckAgents}": { - "get": { - "tags": [ - "HealthChecks" - ], - "responses": { - "400": { - "description": "Invalid request", - "content": { - "application/json": { - "schema": { - "$ref": "#/components/schemas/ErrorResponse" - } - } - } - }, - "401": { - "description": "Authentication failed", - "content": { - "application/json": { - "schema": { - "$ref": "#/components/schemas/ErrorResponse" - } - } - } - }, - "404": { - "description": "Not Found", - "content": { - "application/json": { - "schema": { - "$ref": "#/components/schemas/NotFoundResponse" - } - } - } - }, - "200": { - "description": "successful operation", - "content": { - "application/json": { - "schema": { - "$ref": "#/components/schemas/HealthCheckRelationHealthCheckAgentsGetResponse" - } - } - } - } - }, - "security": [ - { - "bearerAuth": [ - [ - "permHealthCheckRead" - ] - ] - } - ], - "description": "GET request to retrieve a single object.", - "parameters": [ - { - "name": "id", - "in": "path", - "required": true, - "schema": { - "type": "integer", - "format": "int32", - "example": 10 - } - } - ] - } - }, - "/api/v2/ui/healthchecks/{id:[0-9]+}/relationships/{relation:healthCheckAgents}": { - "get": { - "tags": [ - "HealthChecks" - ], - "responses": { - "400": { - "description": "Invalid request", - "content": { - "application/json": { - "schema": { - "$ref": "#/components/schemas/ErrorResponse" - } - } - } - }, - "401": { - "description": "Authentication failed", - "content": { - "application/json": { - "schema": { - "$ref": "#/components/schemas/ErrorResponse" - } - } - } - }, - "404": { - "description": "Not Found", - "content": { - "application/json": { - "schema": { - "$ref": "#/components/schemas/NotFoundResponse" - } - } - } - }, - "200": { - "description": "successful operation", - "content": { - "application/json": { - "schema": { - "$ref": "#/components/schemas/HealthCheckResponse" - } - } - } - } - }, - "security": [ - { - "bearerAuth": [ - [ - "permHealthCheckRead" - ] - ] - } - ], - "description": "GET request for for a to-one relationship link. Returns the resource record of the object that is part of the specified relation.", - "parameters": [ - { - "name": "id", - "in": "path", - "required": true, - "schema": { - "type": "integer", - "format": "int32", - "example": 10 - } - } - ] - }, - "patch": { - "tags": [ - "HealthChecks" - ], - "responses": { - "400": { - "description": "Invalid request", - "content": { - "application/json": { - "schema": { - "$ref": "#/components/schemas/ErrorResponse" - } - } - } - }, - "401": { - "description": "Authentication failed", - "content": { - "application/json": { - "schema": { - "$ref": "#/components/schemas/ErrorResponse" - } - } - } - }, - "204": { - "description": "Succesfull operation" - }, - "404": { - "description": "Not Found", - "content": { - "application/json": { - "schema": { - "$ref": "#/components/schemas/NotFoundResponse" - } - } - } - } - }, - "security": [ - { - "bearerAuth": [ - [ - "permHealthCheckUpdate" - ] - ] - } - ], - "description": "", - "requestBody": { - "required": true, - "content": { - "application/json": { - "schema": { - "$ref": "#/components/schemas/HealthCheckRelationHealthCheckAgents" - } - } - } - }, - "parameters": [] - }, - "post": { - "tags": [ - "HealthChecks" - ], - "responses": { - "400": { - "description": "Invalid request", - "content": { - "application/json": { - "schema": { - "$ref": "#/components/schemas/ErrorResponse" - } - } - } - }, - "401": { - "description": "Authentication failed", - "content": { - "application/json": { - "schema": { - "$ref": "#/components/schemas/ErrorResponse" - } - } - } - }, - "204": { - "description": "successfully created" - }, - "404": { - "description": "Not Found", - "content": { - "application/json": { - "schema": { - "$ref": "#/components/schemas/NotFoundResponse" - } - } - } - } - }, - "security": [ - { - "bearerAuth": [ - [ - "permHealthCheckCreate" - ] - ] - } - ], - "description": "", - "requestBody": { - "required": true, - "content": { - "application/json": [] - } - }, - "parameters": [] - }, - "delete": { - "tags": [ - "HealthChecks" - ], - "responses": { - "400": { - "description": "Invalid request", - "content": { - "application/json": { - "schema": { - "$ref": "#/components/schemas/ErrorResponse" - } - } - } - }, - "401": { - "description": "Authentication failed", - "content": { - "application/json": { - "schema": { - "$ref": "#/components/schemas/ErrorResponse" - } - } - } - }, - "204": { - "description": "successfully deleted" - }, - "404": { - "description": "Not Found", - "content": { - "application/json": { - "schema": { - "$ref": "#/components/schemas/NotFoundResponse" - } - } - } - } - }, - "security": [ - { - "bearerAuth": [ - [ - "permHealthCheckDelete" - ] - ] - } - ], - "description": "", - "requestBody": { - "required": true, - "content": { - "application/json": { - "schema": { - "$ref": "#/components/schemas/HealthCheckRelationHealthCheckAgents" - } - } - } - }, - "parameters": [] - } - }, - "/api/v2/ui/healthchecks/{id:[0-9]+}": { - "get": { - "tags": [ - "HealthChecks" - ], - "responses": { - "400": { - "description": "Invalid request", - "content": { - "application/json": { - "schema": { - "$ref": "#/components/schemas/ErrorResponse" - } - } - } - }, - "401": { - "description": "Authentication failed", - "content": { - "application/json": { - "schema": { - "$ref": "#/components/schemas/ErrorResponse" - } - } - } - }, - "404": { - "description": "Not Found", - "content": { - "application/json": { - "schema": { - "$ref": "#/components/schemas/NotFoundResponse" - } - } - } - }, - "200": { - "description": "successful operation", - "content": { - "application/json": { - "schema": { - "$ref": "#/components/schemas/HealthCheckResponse" - } - } - } - } - }, - "security": [ - { - "bearerAuth": [ - [ - "permHealthCheckRead" - ] - ] - } - ], - "description": "GET request to retrieve a single object.", - "parameters": [ - { - "name": "id", - "in": "path", - "required": true, - "schema": { - "type": "integer", - "format": "int32", - "example": 10 - } - }, - { - "name": "include", - "in": "query", - "schema": { - "type": "string" - }, - "description": "Items to include. Comma seperated" - } - ] - }, - "patch": { - "tags": [ - "HealthChecks" - ], - "responses": { - "400": { - "description": "Invalid request", - "content": { - "application/json": { - "schema": { - "$ref": "#/components/schemas/ErrorResponse" - } - } - } - }, - "401": { - "description": "Authentication failed", - "content": { - "application/json": { - "schema": { - "$ref": "#/components/schemas/ErrorResponse" - } - } - } - }, - "404": { - "description": "Not Found", - "content": { - "application/json": { - "schema": { - "$ref": "#/components/schemas/NotFoundResponse" - } - } - } - }, - "200": { - "description": "successful operation", - "content": { - "application/json": { - "schema": { - "$ref": "#/components/schemas/HealthCheckPostPatchResponse" - } - } - } - } - }, - "security": [ - { - "bearerAuth": [ - [ - "permHealthCheckUpdate" - ] - ] - } - ], - "description": "PATCH request to update attributes of a single object.", - "requestBody": { - "required": true, - "content": { - "application/json": { - "schema": { - "$ref": "#/components/schemas/HealthCheckPatch" - } - } - } - }, - "parameters": [] - }, - "delete": { - "tags": [ - "HealthChecks" - ], - "responses": { - "400": { - "description": "Invalid request", - "content": { - "application/json": { - "schema": { - "$ref": "#/components/schemas/ErrorResponse" - } - } - } - }, - "401": { - "description": "Authentication failed", - "content": { - "application/json": { - "schema": { - "$ref": "#/components/schemas/ErrorResponse" - } - } - } - }, - "404": { - "description": "Not Found", - "content": { - "application/json": { - "schema": { - "$ref": "#/components/schemas/NotFoundResponse" - } - } - } - }, - "204": { - "description": "successfully deleted" - } - }, - "security": [ - { - "bearerAuth": [ - [ - "permHealthCheckDelete" - ] - ] - } - ], - "description": "", - "requestBody": { - "required": true, - "content": { - "application/json": [] - } - }, - "parameters": [] - } - }, - "/api/v2/ui/logentries": { - "get": { - "tags": [ - "LogEntrys" - ], - "responses": { - "400": { - "description": "Invalid request", - "content": { - "application/json": { - "schema": { - "$ref": "#/components/schemas/ErrorResponse" - } - } - } - }, - "401": { - "description": "Authentication failed", - "content": { - "application/json": { - "schema": { - "$ref": "#/components/schemas/ErrorResponse" - } - } - } - }, - "200": { - "description": "successful operation", - "content": { - "application/json": { - "schema": { - "type": "array", - "items": { - "$ref": "#/components/schemas/LogEntryResponse" - } - } - } - } - } - }, - "security": [ - { - "bearerAuth": [ - [ - "permLogEntryRead" - ] - ] - } - ], - "description": "GET many request to retrieve multiple objects.", - "parameters": [ - { - "name": "page[after]", - "in": "path", - "schema": { - "type": "integer", - "format": "int32" - }, - "example": 0, - "description": "Pointer to paginate to retrieve the data after the value provided" - }, - { - "name": "page[before]", - "in": "path", - "schema": { - "type": "integer", - "format": "int32" - }, - "example": 0, - "description": "Pointer to paginate to retrieve the data before the value provided" - }, - { - "name": "page[size]", - "in": "path", - "schema": { - "type": "integer", - "format": "int32" - }, - "example": 100, - "description": "Amout of data to retrieve inside a single page" - }, - { - "name": "filter", - "in": "path", - "style": "deepobject", - "explode": true, - "schema": { - "type": "object" - }, - "description": "Filters results using a query", - "example": "\"filter[hashlistId__gt]\": 200" - }, - { - "name": "include", - "in": "path", - "schema": { - "type": "string" - }, - "description": "Items to include, comma seperated. Possible options: " - } - ] - }, - "post": { - "tags": [ - "LogEntrys" - ], - "responses": { - "400": { - "description": "Invalid request", - "content": { - "application/json": { - "schema": { - "$ref": "#/components/schemas/ErrorResponse" - } - } - } - }, - "401": { - "description": "Authentication failed", - "content": { - "application/json": { - "schema": { - "$ref": "#/components/schemas/ErrorResponse" - } - } - } - }, - "201": { - "description": "successful operation", - "content": { - "application/json": { - "schema": { - "$ref": "#/components/schemas/LogEntryPostPatchResponse" - } - } - } - } - }, - "security": [ - { - "bearerAuth": [ - [ - "permLogEntryCreate" - ] - ] - } - ], - "description": "POST request to create a new object. The request must contain the resource record as data with the attributes of the new object.To add relationships, a relationships object can be added with the resource records of the relations that are part of this object.", - "requestBody": { - "required": true, - "content": { - "application/json": { - "schema": { - "$ref": "#/components/schemas/LogEntryCreate" - } - } - } - }, - "parameters": [] - }, - "patch": { - "tags": [ - "LogEntrys" - ], - "responses": { - "400": { - "description": "Invalid request", - "content": { - "application/json": { - "schema": { - "$ref": "#/components/schemas/ErrorResponse" - } - } - } - }, - "401": { - "description": "Authentication failed", - "content": { - "application/json": { - "schema": { - "$ref": "#/components/schemas/ErrorResponse" - } - } - } - } - }, - "security": [ - { - "bearerAuth": [ - [ - "permLogEntryUpdate" - ] - ] - } - ], - "description": "PATCH request to update attributes of a single object.", - "parameters": [] - }, - "delete": { - "tags": [ - "LogEntrys" - ], - "responses": { - "400": { - "description": "Invalid request", - "content": { - "application/json": { - "schema": { - "$ref": "#/components/schemas/ErrorResponse" - } - } - } - }, - "401": { - "description": "Authentication failed", - "content": { - "application/json": { - "schema": { - "$ref": "#/components/schemas/ErrorResponse" - } - } - } - } - }, - "security": [ - { - "bearerAuth": [ - [ - "permLogEntryDelete" - ] - ] - } - ], - "description": "", - "parameters": [] - } - }, - "/api/v2/ui/logentries/count": { - "get": { - "tags": [ - "LogEntrys" - ], - "responses": { - "400": { - "description": "Invalid request", - "content": { - "application/json": { - "schema": { - "$ref": "#/components/schemas/ErrorResponse" - } - } - } - }, - "401": { - "description": "Authentication failed", - "content": { - "application/json": { - "schema": { - "$ref": "#/components/schemas/ErrorResponse" - } - } - } - }, - "200": { - "description": "successful operation", - "content": { - "application/json": { - "schema": { - "type": "array", - "items": { - "$ref": "#/components/schemas/LogEntryResponse" - } - } - } - } - } - }, - "security": [ - { - "bearerAuth": [ - [ - "permLogEntryRead" - ] - ] - } - ], - "description": "GET many request to retrieve multiple objects.", - "parameters": [ - { - "name": "page[after]", - "in": "path", - "schema": { - "type": "integer", - "format": "int32" - }, - "example": 0, - "description": "Pointer to paginate to retrieve the data after the value provided" - }, - { - "name": "page[before]", - "in": "path", - "schema": { - "type": "integer", - "format": "int32" - }, - "example": 0, - "description": "Pointer to paginate to retrieve the data before the value provided" - }, - { - "name": "page[size]", - "in": "path", - "schema": { - "type": "integer", - "format": "int32" - }, - "example": 100, - "description": "Amout of data to retrieve inside a single page" - }, - { - "name": "filter", - "in": "path", - "style": "deepobject", - "explode": true, - "schema": { - "type": "object" - }, - "description": "Filters results using a query", - "example": "\"filter[hashlistId__gt]\": 200" - }, - { - "name": "include", - "in": "path", - "schema": { - "type": "string" - }, - "description": "Items to include, comma seperated. Possible options: " - } - ] - } - }, - "/api/v2/ui/logentries/{id:[0-9]+}": { - "get": { - "tags": [ - "LogEntrys" - ], - "responses": { - "400": { - "description": "Invalid request", - "content": { - "application/json": { - "schema": { - "$ref": "#/components/schemas/ErrorResponse" - } - } - } - }, - "401": { - "description": "Authentication failed", - "content": { - "application/json": { - "schema": { - "$ref": "#/components/schemas/ErrorResponse" - } - } - } - }, - "404": { - "description": "Not Found", - "content": { - "application/json": { - "schema": { - "$ref": "#/components/schemas/NotFoundResponse" - } - } - } - }, - "200": { - "description": "successful operation", - "content": { - "application/json": { - "schema": { - "$ref": "#/components/schemas/LogEntryResponse" - } - } - } - } - }, - "security": [ - { - "bearerAuth": [ - [ - "permLogEntryRead" - ] - ] - } - ], - "description": "GET request to retrieve a single object.", - "parameters": [ - { - "name": "id", - "in": "path", - "required": true, - "schema": { - "type": "integer", - "format": "int32", - "example": 10 - } - }, - { - "name": "include", - "in": "query", - "schema": { - "type": "string" - }, - "description": "Items to include. Comma seperated" - } - ] - }, - "patch": { - "tags": [ - "LogEntrys" - ], - "responses": { - "400": { - "description": "Invalid request", - "content": { - "application/json": { - "schema": { - "$ref": "#/components/schemas/ErrorResponse" - } - } - } - }, - "401": { - "description": "Authentication failed", - "content": { - "application/json": { - "schema": { - "$ref": "#/components/schemas/ErrorResponse" - } - } - } - }, - "404": { - "description": "Not Found", - "content": { - "application/json": { - "schema": { - "$ref": "#/components/schemas/NotFoundResponse" - } - } - } - }, - "200": { - "description": "successful operation", - "content": { - "application/json": { - "schema": { - "$ref": "#/components/schemas/LogEntryPostPatchResponse" - } - } - } - } - }, - "security": [ - { - "bearerAuth": [ - [ - "permLogEntryUpdate" - ] - ] - } - ], - "description": "PATCH request to update attributes of a single object.", - "requestBody": { - "required": true, - "content": { - "application/json": { - "schema": { - "$ref": "#/components/schemas/LogEntryPatch" - } - } - } - }, - "parameters": [] - }, - "delete": { - "tags": [ - "LogEntrys" - ], - "responses": { - "400": { - "description": "Invalid request", - "content": { - "application/json": { - "schema": { - "$ref": "#/components/schemas/ErrorResponse" - } - } - } - }, - "401": { - "description": "Authentication failed", - "content": { - "application/json": { - "schema": { - "$ref": "#/components/schemas/ErrorResponse" - } - } - } - }, - "404": { - "description": "Not Found", - "content": { - "application/json": { - "schema": { - "$ref": "#/components/schemas/NotFoundResponse" - } - } - } - }, - "204": { - "description": "successfully deleted" - } - }, - "security": [ - { - "bearerAuth": [ - [ - "permLogEntryDelete" - ] - ] - } - ], - "description": "", - "requestBody": { - "required": true, - "content": { - "application/json": [] - } - }, - "parameters": [] - } - }, - "/api/v2/ui/notifications": { - "get": { - "tags": [ - "NotificationSettings" - ], - "responses": { - "400": { - "description": "Invalid request", - "content": { - "application/json": { - "schema": { - "$ref": "#/components/schemas/ErrorResponse" - } - } - } - }, - "401": { - "description": "Authentication failed", - "content": { - "application/json": { - "schema": { - "$ref": "#/components/schemas/ErrorResponse" - } - } - } - }, - "200": { - "description": "successful operation", - "content": { - "application/json": { - "schema": { - "type": "array", - "items": { - "$ref": "#/components/schemas/NotificationSettingResponse" - } - } - } - } - } - }, - "security": [ - { - "bearerAuth": [ - [ - "permNotificationSettingRead" - ] - ] - } - ], - "description": "GET many request to retrieve multiple objects.", - "parameters": [ - { - "name": "page[after]", - "in": "path", - "schema": { - "type": "integer", - "format": "int32" - }, - "example": 0, - "description": "Pointer to paginate to retrieve the data after the value provided" - }, - { - "name": "page[before]", - "in": "path", - "schema": { - "type": "integer", - "format": "int32" - }, - "example": 0, - "description": "Pointer to paginate to retrieve the data before the value provided" - }, - { - "name": "page[size]", - "in": "path", - "schema": { - "type": "integer", - "format": "int32" - }, - "example": 100, - "description": "Amout of data to retrieve inside a single page" - }, - { - "name": "filter", - "in": "path", - "style": "deepobject", - "explode": true, - "schema": { - "type": "object" - }, - "description": "Filters results using a query", - "example": "\"filter[hashlistId__gt]\": 200" - }, - { - "name": "include", - "in": "path", - "schema": { - "type": "string" - }, - "description": "Items to include, comma seperated. Possible options: user" - } - ] - }, - "post": { - "tags": [ - "NotificationSettings" - ], - "responses": { - "400": { - "description": "Invalid request", - "content": { - "application/json": { - "schema": { - "$ref": "#/components/schemas/ErrorResponse" - } - } - } - }, - "401": { - "description": "Authentication failed", - "content": { - "application/json": { - "schema": { - "$ref": "#/components/schemas/ErrorResponse" - } - } - } - }, - "201": { - "description": "successful operation", - "content": { - "application/json": { - "schema": { - "$ref": "#/components/schemas/NotificationSettingPostPatchResponse" - } - } - } - } - }, - "security": [ - { - "bearerAuth": [ - [ - "permNotificationSettingCreate" - ] - ] - } - ], - "description": "POST request to create a new object. The request must contain the resource record as data with the attributes of the new object.To add relationships, a relationships object can be added with the resource records of the relations that are part of this object.", - "requestBody": { - "required": true, - "content": { - "application/json": { - "schema": { - "$ref": "#/components/schemas/NotificationSettingCreate" - } - } - } - }, - "parameters": [] - }, - "patch": { - "tags": [ - "NotificationSettings" - ], - "responses": { - "400": { - "description": "Invalid request", - "content": { - "application/json": { - "schema": { - "$ref": "#/components/schemas/ErrorResponse" - } - } - } - }, - "401": { - "description": "Authentication failed", - "content": { - "application/json": { - "schema": { - "$ref": "#/components/schemas/ErrorResponse" - } - } - } - } - }, - "security": [ - { - "bearerAuth": [ - [ - "permNotificationSettingUpdate" - ] - ] - } - ], - "description": "PATCH request to update attributes of a single object.", - "parameters": [] - }, - "delete": { - "tags": [ - "NotificationSettings" - ], - "responses": { - "400": { - "description": "Invalid request", - "content": { - "application/json": { - "schema": { - "$ref": "#/components/schemas/ErrorResponse" - } - } - } - }, - "401": { - "description": "Authentication failed", - "content": { - "application/json": { - "schema": { - "$ref": "#/components/schemas/ErrorResponse" - } - } - } - } - }, - "security": [ - { - "bearerAuth": [ - [ - "permNotificationSettingDelete" - ] - ] - } - ], - "description": "", - "parameters": [] - } - }, - "/api/v2/ui/notifications/count": { - "get": { - "tags": [ - "NotificationSettings" - ], - "responses": { - "400": { - "description": "Invalid request", - "content": { - "application/json": { - "schema": { - "$ref": "#/components/schemas/ErrorResponse" - } - } - } - }, - "401": { - "description": "Authentication failed", - "content": { - "application/json": { - "schema": { - "$ref": "#/components/schemas/ErrorResponse" - } - } - } - }, - "200": { - "description": "successful operation", - "content": { - "application/json": { - "schema": { - "type": "array", - "items": { - "$ref": "#/components/schemas/NotificationSettingResponse" - } - } - } - } - } - }, - "security": [ - { - "bearerAuth": [ - [ - "permNotificationSettingRead" - ] - ] - } - ], - "description": "GET many request to retrieve multiple objects.", - "parameters": [ - { - "name": "page[after]", - "in": "path", - "schema": { - "type": "integer", - "format": "int32" - }, - "example": 0, - "description": "Pointer to paginate to retrieve the data after the value provided" - }, - { - "name": "page[before]", - "in": "path", - "schema": { - "type": "integer", - "format": "int32" - }, - "example": 0, - "description": "Pointer to paginate to retrieve the data before the value provided" - }, - { - "name": "page[size]", - "in": "path", - "schema": { - "type": "integer", - "format": "int32" - }, - "example": 100, - "description": "Amout of data to retrieve inside a single page" - }, - { - "name": "filter", - "in": "path", - "style": "deepobject", - "explode": true, - "schema": { - "type": "object" - }, - "description": "Filters results using a query", - "example": "\"filter[hashlistId__gt]\": 200" - }, - { - "name": "include", - "in": "path", - "schema": { - "type": "string" - }, - "description": "Items to include, comma seperated. Possible options: user" - } - ] - } - }, - "/api/v2/ui/notifications/{id:[0-9]+}/{relation:user}": { - "get": { - "tags": [ - "NotificationSettings" - ], - "responses": { - "400": { - "description": "Invalid request", - "content": { - "application/json": { - "schema": { - "$ref": "#/components/schemas/ErrorResponse" - } - } - } - }, - "401": { - "description": "Authentication failed", - "content": { - "application/json": { - "schema": { - "$ref": "#/components/schemas/ErrorResponse" - } - } - } - }, - "404": { - "description": "Not Found", - "content": { - "application/json": { - "schema": { - "$ref": "#/components/schemas/NotFoundResponse" - } - } - } - }, - "200": { - "description": "successful operation", - "content": { - "application/json": { - "schema": { - "$ref": "#/components/schemas/NotificationSettingRelationUserGetResponse" - } - } - } - } - }, - "security": [ - { - "bearerAuth": [ - [ - "permNotificationSettingRead" - ] - ] - } - ], - "description": "GET request to retrieve a single object.", - "parameters": [ - { - "name": "id", - "in": "path", - "required": true, - "schema": { - "type": "integer", - "format": "int32", - "example": 10 - } - } - ] - } - }, - "/api/v2/ui/notifications/{id:[0-9]+}/relationships/{relation:user}": { - "get": { - "tags": [ - "NotificationSettings" - ], - "responses": { - "400": { - "description": "Invalid request", - "content": { - "application/json": { - "schema": { - "$ref": "#/components/schemas/ErrorResponse" - } - } - } - }, - "401": { - "description": "Authentication failed", - "content": { - "application/json": { - "schema": { - "$ref": "#/components/schemas/ErrorResponse" - } - } - } - }, - "404": { - "description": "Not Found", - "content": { - "application/json": { - "schema": { - "$ref": "#/components/schemas/NotFoundResponse" - } - } - } - }, - "200": { - "description": "successful operation", - "content": { - "application/json": { - "schema": { - "$ref": "#/components/schemas/NotificationSettingResponse" - } - } - } - } - }, - "security": [ - { - "bearerAuth": [ - [ - "permNotificationSettingRead" - ] - ] - } - ], - "description": "GET request for for a to-one relationship link. Returns the resource record of the object that is part of the specified relation.", - "parameters": [ - { - "name": "id", - "in": "path", - "required": true, - "schema": { - "type": "integer", - "format": "int32", - "example": 10 - } - } - ] - }, - "patch": { - "tags": [ - "NotificationSettings" - ], - "responses": { - "400": { - "description": "Invalid request", - "content": { - "application/json": { - "schema": { - "$ref": "#/components/schemas/ErrorResponse" - } - } - } - }, - "401": { - "description": "Authentication failed", - "content": { - "application/json": { - "schema": { - "$ref": "#/components/schemas/ErrorResponse" - } - } - } - }, - "204": { - "description": "Succesfull operation" - }, - "404": { - "description": "Not Found", - "content": { - "application/json": { - "schema": { - "$ref": "#/components/schemas/NotFoundResponse" - } - } - } - } - }, - "security": [ - { - "bearerAuth": [ - [ - "permNotificationSettingUpdate" - ] - ] - } - ], - "description": "", - "requestBody": { - "required": true, - "content": { - "application/json": { - "schema": { - "$ref": "#/components/schemas/NotificationSettingRelationUser" - } - } - } - }, - "parameters": [] - } - }, - "/api/v2/ui/notifications/{id:[0-9]+}": { - "get": { - "tags": [ - "NotificationSettings" - ], - "responses": { - "400": { - "description": "Invalid request", - "content": { - "application/json": { - "schema": { - "$ref": "#/components/schemas/ErrorResponse" - } - } - } - }, - "401": { - "description": "Authentication failed", - "content": { - "application/json": { - "schema": { - "$ref": "#/components/schemas/ErrorResponse" - } - } - } - }, - "404": { - "description": "Not Found", - "content": { - "application/json": { - "schema": { - "$ref": "#/components/schemas/NotFoundResponse" - } - } - } - }, - "200": { - "description": "successful operation", - "content": { - "application/json": { - "schema": { - "$ref": "#/components/schemas/NotificationSettingResponse" - } - } - } - } - }, - "security": [ - { - "bearerAuth": [ - [ - "permNotificationSettingRead" - ] - ] - } - ], - "description": "GET request to retrieve a single object.", - "parameters": [ - { - "name": "id", - "in": "path", - "required": true, - "schema": { - "type": "integer", - "format": "int32", - "example": 10 - } - }, - { - "name": "include", - "in": "query", - "schema": { - "type": "string" - }, - "description": "Items to include. Comma seperated" - } - ] - }, - "patch": { - "tags": [ - "NotificationSettings" - ], - "responses": { - "400": { - "description": "Invalid request", - "content": { - "application/json": { - "schema": { - "$ref": "#/components/schemas/ErrorResponse" - } - } - } - }, - "401": { - "description": "Authentication failed", - "content": { - "application/json": { - "schema": { - "$ref": "#/components/schemas/ErrorResponse" - } - } - } - }, - "404": { - "description": "Not Found", - "content": { - "application/json": { - "schema": { - "$ref": "#/components/schemas/NotFoundResponse" - } - } - } - }, - "200": { - "description": "successful operation", - "content": { - "application/json": { - "schema": { - "$ref": "#/components/schemas/NotificationSettingPostPatchResponse" - } - } - } - } - }, - "security": [ - { - "bearerAuth": [ - [ - "permNotificationSettingUpdate" - ] - ] - } - ], - "description": "PATCH request to update attributes of a single object.", - "requestBody": { - "required": true, - "content": { - "application/json": { - "schema": { - "$ref": "#/components/schemas/NotificationSettingPatch" - } - } - } - }, - "parameters": [] - }, - "delete": { - "tags": [ - "NotificationSettings" - ], - "responses": { - "400": { - "description": "Invalid request", - "content": { - "application/json": { - "schema": { - "$ref": "#/components/schemas/ErrorResponse" - } - } - } - }, - "401": { - "description": "Authentication failed", - "content": { - "application/json": { - "schema": { - "$ref": "#/components/schemas/ErrorResponse" - } - } - } - }, - "404": { - "description": "Not Found", - "content": { - "application/json": { - "schema": { - "$ref": "#/components/schemas/NotFoundResponse" - } - } - } - }, - "204": { - "description": "successfully deleted" - } - }, - "security": [ - { - "bearerAuth": [ - [ - "permNotificationSettingDelete" - ] - ] - } - ], - "description": "", - "requestBody": { - "required": true, - "content": { - "application/json": [] - } - }, - "parameters": [] - } - }, - "/api/v2/ui/preprocessors": { - "get": { - "tags": [ - "Preprocessors" - ], - "responses": { - "400": { - "description": "Invalid request", - "content": { - "application/json": { - "schema": { - "$ref": "#/components/schemas/ErrorResponse" - } - } - } - }, - "401": { - "description": "Authentication failed", - "content": { - "application/json": { - "schema": { - "$ref": "#/components/schemas/ErrorResponse" - } - } - } - }, - "200": { - "description": "successful operation", - "content": { - "application/json": { - "schema": { - "type": "array", - "items": { - "$ref": "#/components/schemas/PreprocessorResponse" - } - } - } - } - } - }, - "security": [ - { - "bearerAuth": [ - [ - "permPreprocessorRead" - ] - ] - } - ], - "description": "GET many request to retrieve multiple objects.", - "parameters": [ - { - "name": "page[after]", - "in": "path", - "schema": { - "type": "integer", - "format": "int32" - }, - "example": 0, - "description": "Pointer to paginate to retrieve the data after the value provided" - }, - { - "name": "page[before]", - "in": "path", - "schema": { - "type": "integer", - "format": "int32" - }, - "example": 0, - "description": "Pointer to paginate to retrieve the data before the value provided" - }, - { - "name": "page[size]", - "in": "path", - "schema": { - "type": "integer", - "format": "int32" - }, - "example": 100, - "description": "Amout of data to retrieve inside a single page" - }, - { - "name": "filter", - "in": "path", - "style": "deepobject", - "explode": true, - "schema": { - "type": "object" - }, - "description": "Filters results using a query", - "example": "\"filter[hashlistId__gt]\": 200" - }, - { - "name": "include", - "in": "path", - "schema": { - "type": "string" - }, - "description": "Items to include, comma seperated. Possible options: " - } - ] - }, - "post": { - "tags": [ - "Preprocessors" - ], - "responses": { - "400": { - "description": "Invalid request", - "content": { - "application/json": { - "schema": { - "$ref": "#/components/schemas/ErrorResponse" - } - } - } - }, - "401": { - "description": "Authentication failed", - "content": { - "application/json": { - "schema": { - "$ref": "#/components/schemas/ErrorResponse" - } - } - } - }, - "201": { - "description": "successful operation", - "content": { - "application/json": { - "schema": { - "$ref": "#/components/schemas/PreprocessorPostPatchResponse" - } - } - } - } - }, - "security": [ - { - "bearerAuth": [ - [ - "permPreprocessorCreate" - ] - ] - } - ], - "description": "POST request to create a new object. The request must contain the resource record as data with the attributes of the new object.To add relationships, a relationships object can be added with the resource records of the relations that are part of this object.", - "requestBody": { - "required": true, - "content": { - "application/json": { - "schema": { - "$ref": "#/components/schemas/PreprocessorCreate" - } - } - } - }, - "parameters": [] - }, - "patch": { - "tags": [ - "Preprocessors" - ], - "responses": { - "400": { - "description": "Invalid request", - "content": { - "application/json": { - "schema": { - "$ref": "#/components/schemas/ErrorResponse" - } - } - } - }, - "401": { - "description": "Authentication failed", - "content": { - "application/json": { - "schema": { - "$ref": "#/components/schemas/ErrorResponse" - } - } - } - } - }, - "security": [ - { - "bearerAuth": [ - [ - "permPreprocessorUpdate" - ] - ] - } - ], - "description": "PATCH request to update attributes of a single object.", - "parameters": [] - }, - "delete": { - "tags": [ - "Preprocessors" - ], - "responses": { - "400": { - "description": "Invalid request", - "content": { - "application/json": { - "schema": { - "$ref": "#/components/schemas/ErrorResponse" - } - } - } - }, - "401": { - "description": "Authentication failed", - "content": { - "application/json": { - "schema": { - "$ref": "#/components/schemas/ErrorResponse" - } - } - } - } - }, - "security": [ - { - "bearerAuth": [ - [ - "permPreprocessorDelete" - ] - ] - } - ], - "description": "", - "parameters": [] - } - }, - "/api/v2/ui/preprocessors/count": { - "get": { - "tags": [ - "Preprocessors" - ], - "responses": { - "400": { - "description": "Invalid request", - "content": { - "application/json": { - "schema": { - "$ref": "#/components/schemas/ErrorResponse" - } - } - } - }, - "401": { - "description": "Authentication failed", - "content": { - "application/json": { - "schema": { - "$ref": "#/components/schemas/ErrorResponse" - } - } - } - }, - "200": { - "description": "successful operation", - "content": { - "application/json": { - "schema": { - "type": "array", - "items": { - "$ref": "#/components/schemas/PreprocessorResponse" - } - } - } - } - } - }, - "security": [ - { - "bearerAuth": [ - [ - "permPreprocessorRead" - ] - ] - } - ], - "description": "GET many request to retrieve multiple objects.", - "parameters": [ - { - "name": "page[after]", - "in": "path", - "schema": { - "type": "integer", - "format": "int32" - }, - "example": 0, - "description": "Pointer to paginate to retrieve the data after the value provided" - }, - { - "name": "page[before]", - "in": "path", - "schema": { - "type": "integer", - "format": "int32" - }, - "example": 0, - "description": "Pointer to paginate to retrieve the data before the value provided" - }, - { - "name": "page[size]", - "in": "path", - "schema": { - "type": "integer", - "format": "int32" - }, - "example": 100, - "description": "Amout of data to retrieve inside a single page" - }, - { - "name": "filter", - "in": "path", - "style": "deepobject", - "explode": true, - "schema": { - "type": "object" - }, - "description": "Filters results using a query", - "example": "\"filter[hashlistId__gt]\": 200" - }, - { - "name": "include", - "in": "path", - "schema": { - "type": "string" - }, - "description": "Items to include, comma seperated. Possible options: " - } - ] - } - }, - "/api/v2/ui/preprocessors/{id:[0-9]+}": { - "get": { - "tags": [ - "Preprocessors" - ], - "responses": { - "400": { - "description": "Invalid request", - "content": { - "application/json": { - "schema": { - "$ref": "#/components/schemas/ErrorResponse" - } - } - } - }, - "401": { - "description": "Authentication failed", - "content": { - "application/json": { - "schema": { - "$ref": "#/components/schemas/ErrorResponse" - } - } - } - }, - "404": { - "description": "Not Found", - "content": { - "application/json": { - "schema": { - "$ref": "#/components/schemas/NotFoundResponse" - } - } - } - }, - "200": { - "description": "successful operation", - "content": { - "application/json": { - "schema": { - "$ref": "#/components/schemas/PreprocessorResponse" - } - } - } - } - }, - "security": [ - { - "bearerAuth": [ - [ - "permPreprocessorRead" - ] - ] - } - ], - "description": "GET request to retrieve a single object.", - "parameters": [ - { - "name": "id", - "in": "path", - "required": true, - "schema": { - "type": "integer", - "format": "int32", - "example": 10 - } - }, - { - "name": "include", - "in": "query", - "schema": { - "type": "string" - }, - "description": "Items to include. Comma seperated" - } - ] - }, - "patch": { - "tags": [ - "Preprocessors" - ], - "responses": { - "400": { - "description": "Invalid request", - "content": { - "application/json": { - "schema": { - "$ref": "#/components/schemas/ErrorResponse" - } - } - } - }, - "401": { - "description": "Authentication failed", - "content": { - "application/json": { - "schema": { - "$ref": "#/components/schemas/ErrorResponse" - } - } - } - }, - "404": { - "description": "Not Found", - "content": { - "application/json": { - "schema": { - "$ref": "#/components/schemas/NotFoundResponse" - } - } - } - }, - "200": { - "description": "successful operation", - "content": { - "application/json": { - "schema": { - "$ref": "#/components/schemas/PreprocessorPostPatchResponse" - } - } - } - } - }, - "security": [ - { - "bearerAuth": [ - [ - "permPreprocessorUpdate" - ] - ] - } - ], - "description": "PATCH request to update attributes of a single object.", - "requestBody": { - "required": true, - "content": { - "application/json": { - "schema": { - "$ref": "#/components/schemas/PreprocessorPatch" - } - } - } - }, - "parameters": [] - }, - "delete": { - "tags": [ - "Preprocessors" - ], - "responses": { - "400": { - "description": "Invalid request", - "content": { - "application/json": { - "schema": { - "$ref": "#/components/schemas/ErrorResponse" - } - } - } - }, - "401": { - "description": "Authentication failed", - "content": { - "application/json": { - "schema": { - "$ref": "#/components/schemas/ErrorResponse" - } - } - } - }, - "404": { - "description": "Not Found", - "content": { - "application/json": { - "schema": { - "$ref": "#/components/schemas/NotFoundResponse" - } - } - } - }, - "204": { - "description": "successfully deleted" - } - }, - "security": [ - { - "bearerAuth": [ - [ - "permPreprocessorDelete" - ] - ] - } - ], - "description": "", - "requestBody": { - "required": true, - "content": { - "application/json": [] - } - }, - "parameters": [] - } - }, - "/api/v2/ui/pretasks": { - "get": { - "tags": [ - "Pretasks" - ], - "responses": { - "400": { - "description": "Invalid request", - "content": { - "application/json": { - "schema": { - "$ref": "#/components/schemas/ErrorResponse" - } - } - } - }, - "401": { - "description": "Authentication failed", - "content": { - "application/json": { - "schema": { - "$ref": "#/components/schemas/ErrorResponse" - } - } - } - }, - "200": { - "description": "successful operation", - "content": { - "application/json": { - "schema": { - "type": "array", - "items": { - "$ref": "#/components/schemas/PretaskResponse" - } - } - } - } - } - }, - "security": [ - { - "bearerAuth": [ - [ - "permPretaskRead" - ] - ] - } - ], - "description": "GET many request to retrieve multiple objects.", - "parameters": [ - { - "name": "page[after]", - "in": "path", - "schema": { - "type": "integer", - "format": "int32" - }, - "example": 0, - "description": "Pointer to paginate to retrieve the data after the value provided" - }, - { - "name": "page[before]", - "in": "path", - "schema": { - "type": "integer", - "format": "int32" - }, - "example": 0, - "description": "Pointer to paginate to retrieve the data before the value provided" - }, - { - "name": "page[size]", - "in": "path", - "schema": { - "type": "integer", - "format": "int32" - }, - "example": 100, - "description": "Amout of data to retrieve inside a single page" - }, - { - "name": "filter", - "in": "path", - "style": "deepobject", - "explode": true, - "schema": { - "type": "object" - }, - "description": "Filters results using a query", - "example": "\"filter[hashlistId__gt]\": 200" - }, - { - "name": "include", - "in": "path", - "schema": { - "type": "string" - }, - "description": "Items to include, comma seperated. Possible options: pretaskFiles" - } - ] - }, - "post": { - "tags": [ - "Pretasks" - ], - "responses": { - "400": { - "description": "Invalid request", - "content": { - "application/json": { - "schema": { - "$ref": "#/components/schemas/ErrorResponse" - } - } - } - }, - "401": { - "description": "Authentication failed", - "content": { - "application/json": { - "schema": { - "$ref": "#/components/schemas/ErrorResponse" - } - } - } - }, - "201": { - "description": "successful operation", - "content": { - "application/json": { - "schema": { - "$ref": "#/components/schemas/PretaskPostPatchResponse" - } - } - } - } - }, - "security": [ - { - "bearerAuth": [ - [ - "permPretaskCreate" - ] - ] - } - ], - "description": "POST request to create a new object. The request must contain the resource record as data with the attributes of the new object.To add relationships, a relationships object can be added with the resource records of the relations that are part of this object.", - "requestBody": { - "required": true, - "content": { - "application/json": { - "schema": { - "$ref": "#/components/schemas/PretaskCreate" - } - } - } - }, - "parameters": [] - }, - "patch": { - "tags": [ - "Pretasks" - ], - "responses": { - "400": { - "description": "Invalid request", - "content": { - "application/json": { - "schema": { - "$ref": "#/components/schemas/ErrorResponse" - } - } - } - }, - "401": { - "description": "Authentication failed", - "content": { - "application/json": { - "schema": { - "$ref": "#/components/schemas/ErrorResponse" - } - } - } - } - }, - "security": [ - { - "bearerAuth": [ - [ - "permPretaskUpdate" - ] - ] - } - ], - "description": "PATCH request to update attributes of a single object.", - "parameters": [] - }, - "delete": { - "tags": [ - "Pretasks" - ], - "responses": { - "400": { - "description": "Invalid request", - "content": { - "application/json": { - "schema": { - "$ref": "#/components/schemas/ErrorResponse" - } - } - } - }, - "401": { - "description": "Authentication failed", - "content": { - "application/json": { - "schema": { - "$ref": "#/components/schemas/ErrorResponse" - } - } - } - } - }, - "security": [ - { - "bearerAuth": [ - [ - "permPretaskDelete" - ] - ] - } - ], - "description": "", - "parameters": [] - } - }, - "/api/v2/ui/pretasks/count": { - "get": { - "tags": [ - "Pretasks" - ], - "responses": { - "400": { - "description": "Invalid request", - "content": { - "application/json": { - "schema": { - "$ref": "#/components/schemas/ErrorResponse" - } - } - } - }, - "401": { - "description": "Authentication failed", - "content": { - "application/json": { - "schema": { - "$ref": "#/components/schemas/ErrorResponse" - } - } - } - }, - "200": { - "description": "successful operation", - "content": { - "application/json": { - "schema": { - "type": "array", - "items": { - "$ref": "#/components/schemas/PretaskResponse" - } - } - } - } - } - }, - "security": [ - { - "bearerAuth": [ - [ - "permPretaskRead" - ] - ] - } - ], - "description": "GET many request to retrieve multiple objects.", - "parameters": [ - { - "name": "page[after]", - "in": "path", - "schema": { - "type": "integer", - "format": "int32" - }, - "example": 0, - "description": "Pointer to paginate to retrieve the data after the value provided" - }, - { - "name": "page[before]", - "in": "path", - "schema": { - "type": "integer", - "format": "int32" - }, - "example": 0, - "description": "Pointer to paginate to retrieve the data before the value provided" - }, - { - "name": "page[size]", - "in": "path", - "schema": { - "type": "integer", - "format": "int32" - }, - "example": 100, - "description": "Amout of data to retrieve inside a single page" - }, - { - "name": "filter", - "in": "path", - "style": "deepobject", - "explode": true, - "schema": { - "type": "object" - }, - "description": "Filters results using a query", - "example": "\"filter[hashlistId__gt]\": 200" - }, - { - "name": "include", - "in": "path", - "schema": { - "type": "string" - }, - "description": "Items to include, comma seperated. Possible options: pretaskFiles" - } - ] - } - }, - "/api/v2/ui/pretasks/{id:[0-9]+}/{relation:pretaskFiles}": { - "get": { - "tags": [ - "Pretasks" - ], - "responses": { - "400": { - "description": "Invalid request", - "content": { - "application/json": { - "schema": { - "$ref": "#/components/schemas/ErrorResponse" - } - } - } - }, - "401": { - "description": "Authentication failed", - "content": { - "application/json": { - "schema": { - "$ref": "#/components/schemas/ErrorResponse" - } - } - } - }, - "404": { - "description": "Not Found", - "content": { - "application/json": { - "schema": { - "$ref": "#/components/schemas/NotFoundResponse" - } - } - } - }, - "200": { - "description": "successful operation", - "content": { - "application/json": { - "schema": { - "$ref": "#/components/schemas/PretaskRelationPretaskFilesGetResponse" - } - } - } - } - }, - "security": [ - { - "bearerAuth": [ - [ - "permPretaskRead" - ] - ] - } - ], - "description": "GET request to retrieve a single object.", - "parameters": [ - { - "name": "id", - "in": "path", - "required": true, - "schema": { - "type": "integer", - "format": "int32", - "example": 10 - } - } - ] - } - }, - "/api/v2/ui/pretasks/{id:[0-9]+}/relationships/{relation:pretaskFiles}": { - "get": { - "tags": [ - "Pretasks" - ], - "responses": { - "400": { - "description": "Invalid request", - "content": { - "application/json": { - "schema": { - "$ref": "#/components/schemas/ErrorResponse" - } - } - } - }, - "401": { - "description": "Authentication failed", - "content": { - "application/json": { - "schema": { - "$ref": "#/components/schemas/ErrorResponse" - } - } - } - }, - "404": { - "description": "Not Found", - "content": { - "application/json": { - "schema": { - "$ref": "#/components/schemas/NotFoundResponse" - } - } - } - }, - "200": { - "description": "successful operation", - "content": { - "application/json": { - "schema": { - "$ref": "#/components/schemas/PretaskResponse" - } - } - } - } - }, - "security": [ - { - "bearerAuth": [ - [ - "permPretaskRead" - ] - ] - } - ], - "description": "GET request for for a to-one relationship link. Returns the resource record of the object that is part of the specified relation.", - "parameters": [ - { - "name": "id", - "in": "path", - "required": true, - "schema": { - "type": "integer", - "format": "int32", - "example": 10 - } - } - ] - }, - "patch": { - "tags": [ - "Pretasks" - ], - "responses": { - "400": { - "description": "Invalid request", - "content": { - "application/json": { - "schema": { - "$ref": "#/components/schemas/ErrorResponse" - } - } - } - }, - "401": { - "description": "Authentication failed", - "content": { - "application/json": { - "schema": { - "$ref": "#/components/schemas/ErrorResponse" - } - } - } - }, - "204": { - "description": "Succesfull operation" - }, - "404": { - "description": "Not Found", - "content": { - "application/json": { - "schema": { - "$ref": "#/components/schemas/NotFoundResponse" - } - } - } - } - }, - "security": [ - { - "bearerAuth": [ - [ - "permPretaskUpdate" - ] - ] - } - ], - "description": "", - "requestBody": { - "required": true, - "content": { - "application/json": { - "schema": { - "$ref": "#/components/schemas/PretaskRelationPretaskFiles" - } - } - } - }, - "parameters": [] - }, - "post": { - "tags": [ - "Pretasks" - ], - "responses": { - "400": { - "description": "Invalid request", - "content": { - "application/json": { - "schema": { - "$ref": "#/components/schemas/ErrorResponse" - } - } - } - }, - "401": { - "description": "Authentication failed", - "content": { - "application/json": { - "schema": { - "$ref": "#/components/schemas/ErrorResponse" - } - } - } - }, - "204": { - "description": "successfully created" - }, - "404": { - "description": "Not Found", - "content": { - "application/json": { - "schema": { - "$ref": "#/components/schemas/NotFoundResponse" - } - } - } - } - }, - "security": [ - { - "bearerAuth": [ - [ - "permPretaskCreate" - ] - ] - } - ], - "description": "", - "requestBody": { - "required": true, - "content": { - "application/json": [] - } - }, - "parameters": [] - }, - "delete": { - "tags": [ - "Pretasks" - ], - "responses": { - "400": { - "description": "Invalid request", - "content": { - "application/json": { - "schema": { - "$ref": "#/components/schemas/ErrorResponse" - } - } - } - }, - "401": { - "description": "Authentication failed", - "content": { - "application/json": { - "schema": { - "$ref": "#/components/schemas/ErrorResponse" - } - } - } - }, - "204": { - "description": "successfully deleted" - }, - "404": { - "description": "Not Found", - "content": { - "application/json": { - "schema": { - "$ref": "#/components/schemas/NotFoundResponse" - } - } - } - } - }, - "security": [ - { - "bearerAuth": [ - [ - "permPretaskDelete" - ] - ] - } - ], - "description": "", - "requestBody": { - "required": true, - "content": { - "application/json": { - "schema": { - "$ref": "#/components/schemas/PretaskRelationPretaskFiles" - } - } - } - }, - "parameters": [] - } - }, - "/api/v2/ui/pretasks/{id:[0-9]+}": { - "get": { - "tags": [ - "Pretasks" - ], - "responses": { - "400": { - "description": "Invalid request", - "content": { - "application/json": { - "schema": { - "$ref": "#/components/schemas/ErrorResponse" - } - } - } - }, - "401": { - "description": "Authentication failed", - "content": { - "application/json": { - "schema": { - "$ref": "#/components/schemas/ErrorResponse" - } - } - } - }, - "404": { - "description": "Not Found", - "content": { - "application/json": { - "schema": { - "$ref": "#/components/schemas/NotFoundResponse" - } - } - } - }, - "200": { - "description": "successful operation", - "content": { - "application/json": { - "schema": { - "$ref": "#/components/schemas/PretaskResponse" - } - } - } - } - }, - "security": [ - { - "bearerAuth": [ - [ - "permPretaskRead" - ] - ] - } - ], - "description": "GET request to retrieve a single object.", - "parameters": [ - { - "name": "id", - "in": "path", - "required": true, - "schema": { - "type": "integer", - "format": "int32", - "example": 10 - } - }, - { - "name": "include", - "in": "query", - "schema": { - "type": "string" - }, - "description": "Items to include. Comma seperated" - } - ] - }, - "patch": { - "tags": [ - "Pretasks" - ], - "responses": { - "400": { - "description": "Invalid request", - "content": { - "application/json": { - "schema": { - "$ref": "#/components/schemas/ErrorResponse" - } - } - } - }, - "401": { - "description": "Authentication failed", - "content": { - "application/json": { - "schema": { - "$ref": "#/components/schemas/ErrorResponse" - } - } - } - }, - "404": { - "description": "Not Found", - "content": { - "application/json": { - "schema": { - "$ref": "#/components/schemas/NotFoundResponse" - } - } - } - }, - "200": { - "description": "successful operation", - "content": { - "application/json": { - "schema": { - "$ref": "#/components/schemas/PretaskPostPatchResponse" - } - } - } - } - }, - "security": [ - { - "bearerAuth": [ - [ - "permPretaskUpdate" - ] - ] - } - ], - "description": "PATCH request to update attributes of a single object.", - "requestBody": { - "required": true, - "content": { - "application/json": { - "schema": { - "$ref": "#/components/schemas/PretaskPatch" - } - } - } - }, - "parameters": [] - }, - "delete": { - "tags": [ - "Pretasks" - ], - "responses": { - "400": { - "description": "Invalid request", - "content": { - "application/json": { - "schema": { - "$ref": "#/components/schemas/ErrorResponse" - } - } - } - }, - "401": { - "description": "Authentication failed", - "content": { - "application/json": { - "schema": { - "$ref": "#/components/schemas/ErrorResponse" - } - } - } - }, - "404": { - "description": "Not Found", - "content": { - "application/json": { - "schema": { - "$ref": "#/components/schemas/NotFoundResponse" - } - } - } - }, - "204": { - "description": "successfully deleted" - } - }, - "security": [ - { - "bearerAuth": [ - [ - "permPretaskDelete" - ] - ] - } - ], - "description": "", - "requestBody": { - "required": true, - "content": { - "application/json": [] - } - }, - "parameters": [] - } - }, - "/api/v2/ui/speeds": { - "get": { - "tags": [ - "Speeds" - ], - "responses": { - "400": { - "description": "Invalid request", - "content": { - "application/json": { - "schema": { - "$ref": "#/components/schemas/ErrorResponse" - } - } - } - }, - "401": { - "description": "Authentication failed", - "content": { - "application/json": { - "schema": { - "$ref": "#/components/schemas/ErrorResponse" - } - } - } - }, - "200": { - "description": "successful operation", - "content": { - "application/json": { - "schema": { - "type": "array", - "items": { - "$ref": "#/components/schemas/SpeedResponse" - } - } - } - } - } - }, - "security": [ - { - "bearerAuth": [ - [ - "permSpeedRead" - ] - ] - } - ], - "description": "GET many request to retrieve multiple objects.", - "parameters": [ - { - "name": "page[after]", - "in": "path", - "schema": { - "type": "integer", - "format": "int32" - }, - "example": 0, - "description": "Pointer to paginate to retrieve the data after the value provided" - }, - { - "name": "page[before]", - "in": "path", - "schema": { - "type": "integer", - "format": "int32" - }, - "example": 0, - "description": "Pointer to paginate to retrieve the data before the value provided" - }, - { - "name": "page[size]", - "in": "path", - "schema": { - "type": "integer", - "format": "int32" - }, - "example": 100, - "description": "Amout of data to retrieve inside a single page" - }, - { - "name": "filter", - "in": "path", - "style": "deepobject", - "explode": true, - "schema": { - "type": "object" - }, - "description": "Filters results using a query", - "example": "\"filter[hashlistId__gt]\": 200" - }, - { - "name": "include", - "in": "path", - "schema": { - "type": "string" - }, - "description": "Items to include, comma seperated. Possible options: agent,task" - } - ] - } - }, - "/api/v2/ui/speeds/count": { - "get": { - "tags": [ - "Speeds" - ], - "responses": { - "400": { - "description": "Invalid request", - "content": { - "application/json": { - "schema": { - "$ref": "#/components/schemas/ErrorResponse" - } - } - } - }, - "401": { - "description": "Authentication failed", - "content": { - "application/json": { - "schema": { - "$ref": "#/components/schemas/ErrorResponse" - } - } - } - }, - "200": { - "description": "successful operation", - "content": { - "application/json": { - "schema": { - "type": "array", - "items": { - "$ref": "#/components/schemas/SpeedResponse" - } - } - } - } - } - }, - "security": [ - { - "bearerAuth": [ - [ - "permSpeedRead" - ] - ] - } - ], - "description": "GET many request to retrieve multiple objects.", - "parameters": [ - { - "name": "page[after]", - "in": "path", - "schema": { - "type": "integer", - "format": "int32" - }, - "example": 0, - "description": "Pointer to paginate to retrieve the data after the value provided" - }, - { - "name": "page[before]", - "in": "path", - "schema": { - "type": "integer", - "format": "int32" - }, - "example": 0, - "description": "Pointer to paginate to retrieve the data before the value provided" - }, - { - "name": "page[size]", - "in": "path", - "schema": { - "type": "integer", - "format": "int32" - }, - "example": 100, - "description": "Amout of data to retrieve inside a single page" - }, - { - "name": "filter", - "in": "path", - "style": "deepobject", - "explode": true, - "schema": { - "type": "object" - }, - "description": "Filters results using a query", - "example": "\"filter[hashlistId__gt]\": 200" - }, - { - "name": "include", - "in": "path", - "schema": { - "type": "string" - }, - "description": "Items to include, comma seperated. Possible options: agent,task" - } - ] - } - }, - "/api/v2/ui/speeds/{id:[0-9]+}/{relation:agent}": { - "get": { - "tags": [ - "Speeds" - ], - "responses": { - "400": { - "description": "Invalid request", - "content": { - "application/json": { - "schema": { - "$ref": "#/components/schemas/ErrorResponse" - } - } - } - }, - "401": { - "description": "Authentication failed", - "content": { - "application/json": { - "schema": { - "$ref": "#/components/schemas/ErrorResponse" - } - } - } - }, - "404": { - "description": "Not Found", - "content": { - "application/json": { - "schema": { - "$ref": "#/components/schemas/NotFoundResponse" - } - } - } - }, - "200": { - "description": "successful operation", - "content": { - "application/json": { - "schema": { - "$ref": "#/components/schemas/SpeedRelationAgentGetResponse" - } - } - } - } - }, - "security": [ - { - "bearerAuth": [ - [ - "permSpeedRead" - ] - ] - } - ], - "description": "GET request to retrieve a single object.", - "parameters": [ - { - "name": "id", - "in": "path", - "required": true, - "schema": { - "type": "integer", - "format": "int32", - "example": 10 - } - } - ] - } - }, - "/api/v2/ui/speeds/{id:[0-9]+}/relationships/{relation:agent}": { - "get": { - "tags": [ - "Speeds" - ], - "responses": { - "400": { - "description": "Invalid request", - "content": { - "application/json": { - "schema": { - "$ref": "#/components/schemas/ErrorResponse" - } - } - } - }, - "401": { - "description": "Authentication failed", - "content": { - "application/json": { - "schema": { - "$ref": "#/components/schemas/ErrorResponse" - } - } - } - }, - "404": { - "description": "Not Found", - "content": { - "application/json": { - "schema": { - "$ref": "#/components/schemas/NotFoundResponse" - } - } - } - }, - "200": { - "description": "successful operation", - "content": { - "application/json": { - "schema": { - "$ref": "#/components/schemas/SpeedResponse" - } - } - } - } - }, - "security": [ - { - "bearerAuth": [ - [ - "permSpeedRead" - ] - ] - } - ], - "description": "GET request for for a to-one relationship link. Returns the resource record of the object that is part of the specified relation.", - "parameters": [ - { - "name": "id", - "in": "path", - "required": true, - "schema": { - "type": "integer", - "format": "int32", - "example": 10 - } - } - ] - }, - "patch": { - "tags": [ - "Speeds" - ], - "responses": { - "400": { - "description": "Invalid request", - "content": { - "application/json": { - "schema": { - "$ref": "#/components/schemas/ErrorResponse" - } - } - } - }, - "401": { - "description": "Authentication failed", - "content": { - "application/json": { - "schema": { - "$ref": "#/components/schemas/ErrorResponse" - } - } - } - }, - "204": { - "description": "Succesfull operation" - }, - "404": { - "description": "Not Found", - "content": { - "application/json": { - "schema": { - "$ref": "#/components/schemas/NotFoundResponse" - } - } - } - } - }, - "security": [ - { - "bearerAuth": [ - [ - "permSpeedUpdate" - ] - ] - } - ], - "description": "", - "requestBody": { - "required": true, - "content": { - "application/json": { - "schema": { - "$ref": "#/components/schemas/SpeedRelationAgent" - } - } - } - }, - "parameters": [] - } - }, - "/api/v2/ui/speeds/{id:[0-9]+}/{relation:task}": { - "get": { - "tags": [ - "Speeds" - ], - "responses": { - "400": { - "description": "Invalid request", - "content": { - "application/json": { - "schema": { - "$ref": "#/components/schemas/ErrorResponse" - } - } - } - }, - "401": { - "description": "Authentication failed", - "content": { - "application/json": { - "schema": { - "$ref": "#/components/schemas/ErrorResponse" - } - } - } - }, - "404": { - "description": "Not Found", - "content": { - "application/json": { - "schema": { - "$ref": "#/components/schemas/NotFoundResponse" - } - } - } - }, - "200": { - "description": "successful operation", - "content": { - "application/json": { - "schema": { - "$ref": "#/components/schemas/SpeedRelationTaskGetResponse" - } - } - } - } - }, - "security": [ - { - "bearerAuth": [ - [ - "permSpeedRead" - ] - ] - } - ], - "description": "GET request to retrieve a single object.", - "parameters": [ - { - "name": "id", - "in": "path", - "required": true, - "schema": { - "type": "integer", - "format": "int32", - "example": 10 - } - } - ] - } - }, - "/api/v2/ui/speeds/{id:[0-9]+}/relationships/{relation:task}": { - "get": { - "tags": [ - "Speeds" - ], - "responses": { - "400": { - "description": "Invalid request", - "content": { - "application/json": { - "schema": { - "$ref": "#/components/schemas/ErrorResponse" - } - } - } - }, - "401": { - "description": "Authentication failed", - "content": { - "application/json": { - "schema": { - "$ref": "#/components/schemas/ErrorResponse" - } - } - } - }, - "404": { - "description": "Not Found", - "content": { - "application/json": { - "schema": { - "$ref": "#/components/schemas/NotFoundResponse" - } - } - } - }, - "200": { - "description": "successful operation", - "content": { - "application/json": { - "schema": { - "$ref": "#/components/schemas/SpeedResponse" - } - } - } - } - }, - "security": [ - { - "bearerAuth": [ - [ - "permSpeedRead" - ] - ] - } - ], - "description": "GET request for for a to-one relationship link. Returns the resource record of the object that is part of the specified relation.", - "parameters": [ - { - "name": "id", - "in": "path", - "required": true, - "schema": { - "type": "integer", - "format": "int32", - "example": 10 - } - } - ] - }, - "patch": { - "tags": [ - "Speeds" - ], - "responses": { - "400": { - "description": "Invalid request", - "content": { - "application/json": { - "schema": { - "$ref": "#/components/schemas/ErrorResponse" - } - } - } - }, - "401": { - "description": "Authentication failed", - "content": { - "application/json": { - "schema": { - "$ref": "#/components/schemas/ErrorResponse" - } - } - } - }, - "204": { - "description": "Succesfull operation" - }, - "404": { - "description": "Not Found", - "content": { - "application/json": { - "schema": { - "$ref": "#/components/schemas/NotFoundResponse" - } - } - } - } - }, - "security": [ - { - "bearerAuth": [ - [ - "permSpeedUpdate" - ] - ] - } - ], - "description": "", - "requestBody": { - "required": true, - "content": { - "application/json": { - "schema": { - "$ref": "#/components/schemas/SpeedRelationTask" - } - } - } - }, - "parameters": [] - } - }, - "/api/v2/ui/speeds/{id:[0-9]+}": { - "get": { - "tags": [ - "Speeds" - ], - "responses": { - "400": { - "description": "Invalid request", - "content": { - "application/json": { - "schema": { - "$ref": "#/components/schemas/ErrorResponse" - } - } - } - }, - "401": { - "description": "Authentication failed", - "content": { - "application/json": { - "schema": { - "$ref": "#/components/schemas/ErrorResponse" - } - } - } - }, - "404": { - "description": "Not Found", - "content": { - "application/json": { - "schema": { - "$ref": "#/components/schemas/NotFoundResponse" - } - } - } - }, - "200": { - "description": "successful operation", - "content": { - "application/json": { - "schema": { - "$ref": "#/components/schemas/SpeedResponse" - } - } - } - } - }, - "security": [ - { - "bearerAuth": [ - [ - "permSpeedRead" - ] - ] - } - ], - "description": "GET request to retrieve a single object.", - "parameters": [ - { - "name": "id", - "in": "path", - "required": true, - "schema": { - "type": "integer", - "format": "int32", - "example": 10 - } - }, - { - "name": "include", - "in": "query", - "schema": { - "type": "string" - }, - "description": "Items to include. Comma seperated" - } - ] - } - }, - "/api/v2/ui/supertasks": { - "get": { - "tags": [ - "Supertasks" - ], - "responses": { - "400": { - "description": "Invalid request", - "content": { - "application/json": { - "schema": { - "$ref": "#/components/schemas/ErrorResponse" - } - } - } - }, - "401": { - "description": "Authentication failed", - "content": { - "application/json": { - "schema": { - "$ref": "#/components/schemas/ErrorResponse" - } - } - } - }, - "200": { - "description": "successful operation", - "content": { - "application/json": { - "schema": { - "type": "array", - "items": { - "$ref": "#/components/schemas/SupertaskResponse" - } - } - } - } - } - }, - "security": [ - { - "bearerAuth": [ - [ - "permSupertaskRead" - ] - ] - } - ], - "description": "GET many request to retrieve multiple objects.", - "parameters": [ - { - "name": "page[after]", - "in": "path", - "schema": { - "type": "integer", - "format": "int32" - }, - "example": 0, - "description": "Pointer to paginate to retrieve the data after the value provided" - }, - { - "name": "page[before]", - "in": "path", - "schema": { - "type": "integer", - "format": "int32" - }, - "example": 0, - "description": "Pointer to paginate to retrieve the data before the value provided" - }, - { - "name": "page[size]", - "in": "path", - "schema": { - "type": "integer", - "format": "int32" - }, - "example": 100, - "description": "Amout of data to retrieve inside a single page" - }, - { - "name": "filter", - "in": "path", - "style": "deepobject", - "explode": true, - "schema": { - "type": "object" - }, - "description": "Filters results using a query", - "example": "\"filter[hashlistId__gt]\": 200" - }, - { - "name": "include", - "in": "path", - "schema": { - "type": "string" - }, - "description": "Items to include, comma seperated. Possible options: pretasks" - } - ] - }, - "post": { - "tags": [ - "Supertasks" - ], - "responses": { - "400": { - "description": "Invalid request", - "content": { - "application/json": { - "schema": { - "$ref": "#/components/schemas/ErrorResponse" - } - } - } - }, - "401": { - "description": "Authentication failed", - "content": { - "application/json": { - "schema": { - "$ref": "#/components/schemas/ErrorResponse" - } - } - } - }, - "201": { - "description": "successful operation", - "content": { - "application/json": { - "schema": { - "$ref": "#/components/schemas/SupertaskPostPatchResponse" - } - } - } - } - }, - "security": [ - { - "bearerAuth": [ - [ - "permSupertaskCreate" - ] - ] - } - ], - "description": "POST request to create a new object. The request must contain the resource record as data with the attributes of the new object.To add relationships, a relationships object can be added with the resource records of the relations that are part of this object.", - "requestBody": { - "required": true, - "content": { - "application/json": { - "schema": { - "$ref": "#/components/schemas/SupertaskCreate" - } - } - } - }, - "parameters": [] - }, - "patch": { - "tags": [ - "Supertasks" - ], - "responses": { - "400": { - "description": "Invalid request", - "content": { - "application/json": { - "schema": { - "$ref": "#/components/schemas/ErrorResponse" - } - } - } - }, - "401": { - "description": "Authentication failed", - "content": { - "application/json": { - "schema": { - "$ref": "#/components/schemas/ErrorResponse" - } - } - } - } - }, - "security": [ - { - "bearerAuth": [ - [ - "permSupertaskUpdate" - ] - ] - } - ], - "description": "PATCH request to update attributes of a single object.", - "parameters": [] - }, - "delete": { - "tags": [ - "Supertasks" - ], - "responses": { - "400": { - "description": "Invalid request", - "content": { - "application/json": { - "schema": { - "$ref": "#/components/schemas/ErrorResponse" - } - } - } - }, - "401": { - "description": "Authentication failed", - "content": { - "application/json": { - "schema": { - "$ref": "#/components/schemas/ErrorResponse" - } - } - } - } - }, - "security": [ - { - "bearerAuth": [ - [ - "permSupertaskDelete" - ] - ] - } - ], - "description": "", - "parameters": [] - } - }, - "/api/v2/ui/supertasks/count": { - "get": { - "tags": [ - "Supertasks" - ], - "responses": { - "400": { - "description": "Invalid request", - "content": { - "application/json": { - "schema": { - "$ref": "#/components/schemas/ErrorResponse" - } - } - } - }, - "401": { - "description": "Authentication failed", - "content": { - "application/json": { - "schema": { - "$ref": "#/components/schemas/ErrorResponse" - } - } - } - }, - "200": { - "description": "successful operation", - "content": { - "application/json": { - "schema": { - "type": "array", - "items": { - "$ref": "#/components/schemas/SupertaskResponse" - } - } - } - } - } - }, - "security": [ - { - "bearerAuth": [ - [ - "permSupertaskRead" - ] - ] - } - ], - "description": "GET many request to retrieve multiple objects.", - "parameters": [ - { - "name": "page[after]", - "in": "path", - "schema": { - "type": "integer", - "format": "int32" - }, - "example": 0, - "description": "Pointer to paginate to retrieve the data after the value provided" - }, - { - "name": "page[before]", - "in": "path", - "schema": { - "type": "integer", - "format": "int32" - }, - "example": 0, - "description": "Pointer to paginate to retrieve the data before the value provided" - }, - { - "name": "page[size]", - "in": "path", - "schema": { - "type": "integer", - "format": "int32" - }, - "example": 100, - "description": "Amout of data to retrieve inside a single page" - }, - { - "name": "filter", - "in": "path", - "style": "deepobject", - "explode": true, - "schema": { - "type": "object" - }, - "description": "Filters results using a query", - "example": "\"filter[hashlistId__gt]\": 200" - }, - { - "name": "include", - "in": "path", - "schema": { - "type": "string" - }, - "description": "Items to include, comma seperated. Possible options: pretasks" - } - ] - } - }, - "/api/v2/ui/supertasks/{id:[0-9]+}/{relation:pretasks}": { - "get": { - "tags": [ - "Supertasks" - ], - "responses": { - "400": { - "description": "Invalid request", - "content": { - "application/json": { - "schema": { - "$ref": "#/components/schemas/ErrorResponse" - } - } - } - }, - "401": { - "description": "Authentication failed", - "content": { - "application/json": { - "schema": { - "$ref": "#/components/schemas/ErrorResponse" - } - } - } - }, - "404": { - "description": "Not Found", - "content": { - "application/json": { - "schema": { - "$ref": "#/components/schemas/NotFoundResponse" - } - } - } - }, - "200": { - "description": "successful operation", - "content": { - "application/json": { - "schema": { - "$ref": "#/components/schemas/SupertaskRelationPretasksGetResponse" - } - } - } - } - }, - "security": [ - { - "bearerAuth": [ - [ - "permSupertaskRead" - ] - ] - } - ], - "description": "GET request to retrieve a single object.", - "parameters": [ - { - "name": "id", - "in": "path", - "required": true, - "schema": { - "type": "integer", - "format": "int32", - "example": 10 - } - } - ] - } - }, - "/api/v2/ui/supertasks/{id:[0-9]+}/relationships/{relation:pretasks}": { - "get": { - "tags": [ - "Supertasks" - ], - "responses": { - "400": { - "description": "Invalid request", - "content": { - "application/json": { - "schema": { - "$ref": "#/components/schemas/ErrorResponse" - } - } - } - }, - "401": { - "description": "Authentication failed", - "content": { - "application/json": { - "schema": { - "$ref": "#/components/schemas/ErrorResponse" - } - } - } - }, - "404": { - "description": "Not Found", - "content": { - "application/json": { - "schema": { - "$ref": "#/components/schemas/NotFoundResponse" - } - } - } - }, - "200": { - "description": "successful operation", - "content": { - "application/json": { - "schema": { - "$ref": "#/components/schemas/SupertaskResponse" - } - } - } - } - }, - "security": [ - { - "bearerAuth": [ - [ - "permSupertaskRead" - ] - ] - } - ], - "description": "GET request for for a to-one relationship link. Returns the resource record of the object that is part of the specified relation.", - "parameters": [ - { - "name": "id", - "in": "path", - "required": true, - "schema": { - "type": "integer", - "format": "int32", - "example": 10 - } - } - ] - }, - "patch": { - "tags": [ - "Supertasks" - ], - "responses": { - "400": { - "description": "Invalid request", - "content": { - "application/json": { - "schema": { - "$ref": "#/components/schemas/ErrorResponse" - } - } - } - }, - "401": { - "description": "Authentication failed", - "content": { - "application/json": { - "schema": { - "$ref": "#/components/schemas/ErrorResponse" - } - } - } - }, - "204": { - "description": "Succesfull operation" - }, - "404": { - "description": "Not Found", - "content": { - "application/json": { - "schema": { - "$ref": "#/components/schemas/NotFoundResponse" - } - } - } - } - }, - "security": [ - { - "bearerAuth": [ - [ - "permSupertaskUpdate" - ] - ] - } - ], - "description": "", - "requestBody": { - "required": true, - "content": { - "application/json": { - "schema": { - "$ref": "#/components/schemas/SupertaskRelationPretasks" - } - } - } - }, - "parameters": [] - }, - "post": { - "tags": [ - "Supertasks" - ], - "responses": { - "400": { - "description": "Invalid request", - "content": { - "application/json": { - "schema": { - "$ref": "#/components/schemas/ErrorResponse" - } - } - } - }, - "401": { - "description": "Authentication failed", - "content": { - "application/json": { - "schema": { - "$ref": "#/components/schemas/ErrorResponse" - } - } - } - }, - "204": { - "description": "successfully created" - }, - "404": { - "description": "Not Found", - "content": { - "application/json": { - "schema": { - "$ref": "#/components/schemas/NotFoundResponse" - } - } - } - } - }, - "security": [ - { - "bearerAuth": [ - [ - "permSupertaskCreate" - ] - ] - } - ], - "description": "", - "requestBody": { - "required": true, - "content": { - "application/json": [] - } - }, - "parameters": [] - }, - "delete": { - "tags": [ - "Supertasks" - ], - "responses": { - "400": { - "description": "Invalid request", - "content": { - "application/json": { - "schema": { - "$ref": "#/components/schemas/ErrorResponse" - } - } - } - }, - "401": { - "description": "Authentication failed", - "content": { - "application/json": { - "schema": { - "$ref": "#/components/schemas/ErrorResponse" - } - } - } - }, - "204": { - "description": "successfully deleted" - }, - "404": { - "description": "Not Found", - "content": { - "application/json": { - "schema": { - "$ref": "#/components/schemas/NotFoundResponse" - } - } - } - } - }, - "security": [ - { - "bearerAuth": [ - [ - "permSupertaskDelete" - ] - ] - } - ], - "description": "", - "requestBody": { - "required": true, - "content": { - "application/json": { - "schema": { - "$ref": "#/components/schemas/SupertaskRelationPretasks" - } - } - } - }, - "parameters": [] - } - }, - "/api/v2/ui/supertasks/{id:[0-9]+}": { - "get": { - "tags": [ - "Supertasks" - ], - "responses": { - "400": { - "description": "Invalid request", - "content": { - "application/json": { - "schema": { - "$ref": "#/components/schemas/ErrorResponse" - } - } - } - }, - "401": { - "description": "Authentication failed", - "content": { - "application/json": { - "schema": { - "$ref": "#/components/schemas/ErrorResponse" - } - } - } - }, - "404": { - "description": "Not Found", - "content": { - "application/json": { - "schema": { - "$ref": "#/components/schemas/NotFoundResponse" - } - } - } - }, - "200": { - "description": "successful operation", - "content": { - "application/json": { - "schema": { - "$ref": "#/components/schemas/SupertaskResponse" - } - } - } - } - }, - "security": [ - { - "bearerAuth": [ - [ - "permSupertaskRead" - ] - ] - } - ], - "description": "GET request to retrieve a single object.", - "parameters": [ - { - "name": "id", - "in": "path", - "required": true, - "schema": { - "type": "integer", - "format": "int32", - "example": 10 - } - }, - { - "name": "include", - "in": "query", - "schema": { - "type": "string" - }, - "description": "Items to include. Comma seperated" - } - ] - }, - "patch": { - "tags": [ - "Supertasks" - ], - "responses": { - "400": { - "description": "Invalid request", - "content": { - "application/json": { - "schema": { - "$ref": "#/components/schemas/ErrorResponse" - } - } - } - }, - "401": { - "description": "Authentication failed", - "content": { - "application/json": { - "schema": { - "$ref": "#/components/schemas/ErrorResponse" - } - } - } - }, - "404": { - "description": "Not Found", - "content": { - "application/json": { - "schema": { - "$ref": "#/components/schemas/NotFoundResponse" - } - } - } - }, - "200": { - "description": "successful operation", - "content": { - "application/json": { - "schema": { - "$ref": "#/components/schemas/SupertaskPostPatchResponse" - } - } - } - } - }, - "security": [ - { - "bearerAuth": [ - [ - "permSupertaskUpdate" - ] - ] - } - ], - "description": "PATCH request to update attributes of a single object.", - "requestBody": { - "required": true, - "content": { - "application/json": { - "schema": { - "$ref": "#/components/schemas/SupertaskPatch" - } - } - } - }, - "parameters": [] - }, - "delete": { - "tags": [ - "Supertasks" - ], - "responses": { - "400": { - "description": "Invalid request", - "content": { - "application/json": { - "schema": { - "$ref": "#/components/schemas/ErrorResponse" - } - } - } - }, - "401": { - "description": "Authentication failed", - "content": { - "application/json": { - "schema": { - "$ref": "#/components/schemas/ErrorResponse" - } - } - } - }, - "404": { - "description": "Not Found", - "content": { - "application/json": { - "schema": { - "$ref": "#/components/schemas/NotFoundResponse" - } - } - } - }, - "204": { - "description": "successfully deleted" - } - }, - "security": [ - { - "bearerAuth": [ - [ - "permSupertaskDelete" - ] - ] - } - ], - "description": "", - "requestBody": { - "required": true, - "content": { - "application/json": [] - } - }, - "parameters": [] - } - }, - "/api/v2/ui/tasks": { - "get": { - "tags": [ - "Tasks" - ], - "responses": { - "400": { - "description": "Invalid request", - "content": { - "application/json": { - "schema": { - "$ref": "#/components/schemas/ErrorResponse" - } - } - } - }, - "401": { - "description": "Authentication failed", - "content": { - "application/json": { - "schema": { - "$ref": "#/components/schemas/ErrorResponse" - } - } - } - }, - "200": { - "description": "successful operation", - "content": { - "application/json": { - "schema": { - "type": "array", - "items": { - "$ref": "#/components/schemas/TaskResponse" - } - } - } - } - } - }, - "security": [ - { - "bearerAuth": [ - [ - "permTaskRead" - ] - ] - } - ], - "description": "GET many request to retrieve multiple objects.", - "parameters": [ - { - "name": "page[after]", - "in": "path", - "schema": { - "type": "integer", - "format": "int32" - }, - "example": 0, - "description": "Pointer to paginate to retrieve the data after the value provided" - }, - { - "name": "page[before]", - "in": "path", - "schema": { - "type": "integer", - "format": "int32" - }, - "example": 0, - "description": "Pointer to paginate to retrieve the data before the value provided" - }, - { - "name": "page[size]", - "in": "path", - "schema": { - "type": "integer", - "format": "int32" - }, - "example": 100, - "description": "Amout of data to retrieve inside a single page" - }, - { - "name": "filter", - "in": "path", - "style": "deepobject", - "explode": true, - "schema": { - "type": "object" - }, - "description": "Filters results using a query", - "example": "\"filter[hashlistId__gt]\": 200" - }, - { - "name": "include", - "in": "path", - "schema": { - "type": "string" - }, - "description": "Items to include, comma seperated. Possible options: crackerBinary,crackerBinaryType,hashlist,assignedAgents,files,speeds" - } - ] - }, - "post": { - "tags": [ - "Tasks" - ], - "responses": { - "400": { - "description": "Invalid request", - "content": { - "application/json": { - "schema": { - "$ref": "#/components/schemas/ErrorResponse" - } - } - } - }, - "401": { - "description": "Authentication failed", - "content": { - "application/json": { - "schema": { - "$ref": "#/components/schemas/ErrorResponse" - } - } - } - }, - "201": { - "description": "successful operation", - "content": { - "application/json": { - "schema": { - "$ref": "#/components/schemas/TaskPostPatchResponse" - } - } - } - } - }, - "security": [ - { - "bearerAuth": [ - [ - "permTaskCreate" - ] - ] - } - ], - "description": "POST request to create a new object. The request must contain the resource record as data with the attributes of the new object.To add relationships, a relationships object can be added with the resource records of the relations that are part of this object.", - "requestBody": { - "required": true, - "content": { - "application/json": { - "schema": { - "$ref": "#/components/schemas/TaskCreate" - } - } - } - }, - "parameters": [] - }, - "patch": { - "tags": [ - "Tasks" - ], - "responses": { - "400": { - "description": "Invalid request", - "content": { - "application/json": { - "schema": { - "$ref": "#/components/schemas/ErrorResponse" - } - } - } - }, - "401": { - "description": "Authentication failed", - "content": { - "application/json": { - "schema": { - "$ref": "#/components/schemas/ErrorResponse" - } - } - } - } - }, - "security": [ - { - "bearerAuth": [ - [ - "permTaskUpdate" - ] - ] - } - ], - "description": "PATCH request to update attributes of a single object.", - "parameters": [] - }, - "delete": { - "tags": [ - "Tasks" - ], - "responses": { - "400": { - "description": "Invalid request", - "content": { - "application/json": { - "schema": { - "$ref": "#/components/schemas/ErrorResponse" - } - } - } - }, - "401": { - "description": "Authentication failed", - "content": { - "application/json": { - "schema": { - "$ref": "#/components/schemas/ErrorResponse" - } - } - } - } - }, - "security": [ - { - "bearerAuth": [ - [ - "permTaskDelete" - ] - ] - } - ], - "description": "", - "parameters": [] - } - }, - "/api/v2/ui/tasks/count": { - "get": { - "tags": [ - "Tasks" - ], - "responses": { - "400": { - "description": "Invalid request", - "content": { - "application/json": { - "schema": { - "$ref": "#/components/schemas/ErrorResponse" - } - } - } - }, - "401": { - "description": "Authentication failed", - "content": { - "application/json": { - "schema": { - "$ref": "#/components/schemas/ErrorResponse" - } - } - } - }, - "200": { - "description": "successful operation", - "content": { - "application/json": { - "schema": { - "type": "array", - "items": { - "$ref": "#/components/schemas/TaskResponse" - } - } - } - } - } - }, - "security": [ - { - "bearerAuth": [ - [ - "permTaskRead" - ] - ] - } - ], - "description": "GET many request to retrieve multiple objects.", - "parameters": [ - { - "name": "page[after]", - "in": "path", - "schema": { - "type": "integer", - "format": "int32" - }, - "example": 0, - "description": "Pointer to paginate to retrieve the data after the value provided" - }, - { - "name": "page[before]", - "in": "path", - "schema": { - "type": "integer", - "format": "int32" - }, - "example": 0, - "description": "Pointer to paginate to retrieve the data before the value provided" - }, - { - "name": "page[size]", - "in": "path", - "schema": { - "type": "integer", - "format": "int32" - }, - "example": 100, - "description": "Amout of data to retrieve inside a single page" - }, - { - "name": "filter", - "in": "path", - "style": "deepobject", - "explode": true, - "schema": { - "type": "object" - }, - "description": "Filters results using a query", - "example": "\"filter[hashlistId__gt]\": 200" - }, - { - "name": "include", - "in": "path", - "schema": { - "type": "string" - }, - "description": "Items to include, comma seperated. Possible options: crackerBinary,crackerBinaryType,hashlist,assignedAgents,files,speeds" - } - ] - } - }, - "/api/v2/ui/tasks/{id:[0-9]+}/{relation:crackerBinary}": { - "get": { - "tags": [ - "Tasks" - ], - "responses": { - "400": { - "description": "Invalid request", - "content": { - "application/json": { - "schema": { - "$ref": "#/components/schemas/ErrorResponse" - } - } - } - }, - "401": { - "description": "Authentication failed", - "content": { - "application/json": { - "schema": { - "$ref": "#/components/schemas/ErrorResponse" - } - } - } - }, - "404": { - "description": "Not Found", - "content": { - "application/json": { - "schema": { - "$ref": "#/components/schemas/NotFoundResponse" - } - } - } - }, - "200": { - "description": "successful operation", - "content": { - "application/json": { - "schema": { - "$ref": "#/components/schemas/TaskRelationCrackerBinaryGetResponse" - } - } - } - } - }, - "security": [ - { - "bearerAuth": [ - [ - "permTaskRead" - ] - ] - } - ], - "description": "GET request to retrieve a single object.", - "parameters": [ - { - "name": "id", - "in": "path", - "required": true, - "schema": { - "type": "integer", - "format": "int32", - "example": 10 - } - } - ] - } - }, - "/api/v2/ui/tasks/{id:[0-9]+}/relationships/{relation:crackerBinary}": { - "get": { - "tags": [ - "Tasks" - ], - "responses": { - "400": { - "description": "Invalid request", - "content": { - "application/json": { - "schema": { - "$ref": "#/components/schemas/ErrorResponse" - } - } - } - }, - "401": { - "description": "Authentication failed", - "content": { - "application/json": { - "schema": { - "$ref": "#/components/schemas/ErrorResponse" - } - } - } - }, - "404": { - "description": "Not Found", - "content": { - "application/json": { - "schema": { - "$ref": "#/components/schemas/NotFoundResponse" - } - } - } - }, - "200": { - "description": "successful operation", - "content": { - "application/json": { - "schema": { - "$ref": "#/components/schemas/TaskResponse" - } - } - } - } - }, - "security": [ - { - "bearerAuth": [ - [ - "permTaskRead" - ] - ] - } - ], - "description": "GET request for for a to-one relationship link. Returns the resource record of the object that is part of the specified relation.", - "parameters": [ - { - "name": "id", - "in": "path", - "required": true, - "schema": { - "type": "integer", - "format": "int32", - "example": 10 - } - } - ] - }, - "patch": { - "tags": [ - "Tasks" - ], - "responses": { - "400": { - "description": "Invalid request", - "content": { - "application/json": { - "schema": { - "$ref": "#/components/schemas/ErrorResponse" - } - } - } - }, - "401": { - "description": "Authentication failed", - "content": { - "application/json": { - "schema": { - "$ref": "#/components/schemas/ErrorResponse" - } - } - } - }, - "204": { - "description": "Succesfull operation" - }, - "404": { - "description": "Not Found", - "content": { - "application/json": { - "schema": { - "$ref": "#/components/schemas/NotFoundResponse" - } - } - } - } - }, - "security": [ - { - "bearerAuth": [ - [ - "permTaskUpdate" - ] - ] - } - ], - "description": "", - "requestBody": { - "required": true, - "content": { - "application/json": { - "schema": { - "$ref": "#/components/schemas/TaskRelationCrackerBinary" - } - } - } - }, - "parameters": [] - } - }, - "/api/v2/ui/tasks/{id:[0-9]+}/{relation:crackerBinaryType}": { - "get": { - "tags": [ - "Tasks" - ], - "responses": { - "400": { - "description": "Invalid request", - "content": { - "application/json": { - "schema": { - "$ref": "#/components/schemas/ErrorResponse" - } - } - } - }, - "401": { - "description": "Authentication failed", - "content": { - "application/json": { - "schema": { - "$ref": "#/components/schemas/ErrorResponse" - } - } - } - }, - "404": { - "description": "Not Found", - "content": { - "application/json": { - "schema": { - "$ref": "#/components/schemas/NotFoundResponse" - } - } - } - }, - "200": { - "description": "successful operation", - "content": { - "application/json": { - "schema": { - "$ref": "#/components/schemas/TaskRelationCrackerBinaryTypeGetResponse" - } - } - } - } - }, - "security": [ - { - "bearerAuth": [ - [ - "permTaskRead" - ] - ] - } - ], - "description": "GET request to retrieve a single object.", - "parameters": [ - { - "name": "id", - "in": "path", - "required": true, - "schema": { - "type": "integer", - "format": "int32", - "example": 10 - } - } - ] - } - }, - "/api/v2/ui/tasks/{id:[0-9]+}/relationships/{relation:crackerBinaryType}": { - "get": { - "tags": [ - "Tasks" - ], - "responses": { - "400": { - "description": "Invalid request", - "content": { - "application/json": { - "schema": { - "$ref": "#/components/schemas/ErrorResponse" - } - } - } - }, - "401": { - "description": "Authentication failed", - "content": { - "application/json": { - "schema": { - "$ref": "#/components/schemas/ErrorResponse" - } - } - } - }, - "404": { - "description": "Not Found", - "content": { - "application/json": { - "schema": { - "$ref": "#/components/schemas/NotFoundResponse" - } - } - } - }, - "200": { - "description": "successful operation", - "content": { - "application/json": { - "schema": { - "$ref": "#/components/schemas/TaskResponse" - } - } - } - } - }, - "security": [ - { - "bearerAuth": [ - [ - "permTaskRead" - ] - ] - } - ], - "description": "GET request for for a to-one relationship link. Returns the resource record of the object that is part of the specified relation.", - "parameters": [ - { - "name": "id", - "in": "path", - "required": true, - "schema": { - "type": "integer", - "format": "int32", - "example": 10 - } - } - ] - }, - "patch": { - "tags": [ - "Tasks" - ], - "responses": { - "400": { - "description": "Invalid request", - "content": { - "application/json": { - "schema": { - "$ref": "#/components/schemas/ErrorResponse" - } - } - } - }, - "401": { - "description": "Authentication failed", - "content": { - "application/json": { - "schema": { - "$ref": "#/components/schemas/ErrorResponse" - } - } - } - }, - "204": { - "description": "Succesfull operation" - }, - "404": { - "description": "Not Found", - "content": { - "application/json": { - "schema": { - "$ref": "#/components/schemas/NotFoundResponse" - } - } - } - } - }, - "security": [ - { - "bearerAuth": [ - [ - "permTaskUpdate" - ] - ] - } - ], - "description": "", - "requestBody": { - "required": true, - "content": { - "application/json": { - "schema": { - "$ref": "#/components/schemas/TaskRelationCrackerBinaryType" - } - } - } - }, - "parameters": [] - } - }, - "/api/v2/ui/tasks/{id:[0-9]+}/{relation:hashlist}": { - "get": { - "tags": [ - "Tasks" - ], - "responses": { - "400": { - "description": "Invalid request", - "content": { - "application/json": { - "schema": { - "$ref": "#/components/schemas/ErrorResponse" - } - } - } - }, - "401": { - "description": "Authentication failed", - "content": { - "application/json": { - "schema": { - "$ref": "#/components/schemas/ErrorResponse" - } - } - } - }, - "404": { - "description": "Not Found", - "content": { - "application/json": { - "schema": { - "$ref": "#/components/schemas/NotFoundResponse" - } - } - } - }, - "200": { - "description": "successful operation", - "content": { - "application/json": { - "schema": { - "$ref": "#/components/schemas/TaskRelationHashlistGetResponse" - } - } - } - } - }, - "security": [ - { - "bearerAuth": [ - [ - "permTaskRead" - ] - ] - } - ], - "description": "GET request to retrieve a single object.", - "parameters": [ - { - "name": "id", - "in": "path", - "required": true, - "schema": { - "type": "integer", - "format": "int32", - "example": 10 - } - } - ] - } - }, - "/api/v2/ui/tasks/{id:[0-9]+}/relationships/{relation:hashlist}": { - "get": { - "tags": [ - "Tasks" - ], - "responses": { - "400": { - "description": "Invalid request", - "content": { - "application/json": { - "schema": { - "$ref": "#/components/schemas/ErrorResponse" - } - } - } - }, - "401": { - "description": "Authentication failed", - "content": { - "application/json": { - "schema": { - "$ref": "#/components/schemas/ErrorResponse" - } - } - } - }, - "404": { - "description": "Not Found", - "content": { - "application/json": { - "schema": { - "$ref": "#/components/schemas/NotFoundResponse" - } - } - } - }, - "200": { - "description": "successful operation", - "content": { - "application/json": { - "schema": { - "$ref": "#/components/schemas/TaskResponse" - } - } - } - } - }, - "security": [ - { - "bearerAuth": [ - [ - "permTaskRead" - ] - ] - } - ], - "description": "GET request for for a to-one relationship link. Returns the resource record of the object that is part of the specified relation.", - "parameters": [ - { - "name": "id", - "in": "path", - "required": true, - "schema": { - "type": "integer", - "format": "int32", - "example": 10 - } - } - ] - }, - "patch": { - "tags": [ - "Tasks" - ], - "responses": { - "400": { - "description": "Invalid request", - "content": { - "application/json": { - "schema": { - "$ref": "#/components/schemas/ErrorResponse" - } - } - } - }, - "401": { - "description": "Authentication failed", - "content": { - "application/json": { - "schema": { - "$ref": "#/components/schemas/ErrorResponse" - } - } - } - }, - "204": { - "description": "Succesfull operation" - }, - "404": { - "description": "Not Found", - "content": { - "application/json": { - "schema": { - "$ref": "#/components/schemas/NotFoundResponse" - } - } - } - } - }, - "security": [ - { - "bearerAuth": [ - [ - "permTaskUpdate" - ] - ] - } - ], - "description": "", - "requestBody": { - "required": true, - "content": { - "application/json": { - "schema": { - "$ref": "#/components/schemas/TaskRelationHashlist" - } - } - } - }, - "parameters": [] - } - }, - "/api/v2/ui/tasks/{id:[0-9]+}/{relation:assignedAgents}": { - "get": { - "tags": [ - "Tasks" - ], - "responses": { - "400": { - "description": "Invalid request", - "content": { - "application/json": { - "schema": { - "$ref": "#/components/schemas/ErrorResponse" - } - } - } - }, - "401": { - "description": "Authentication failed", - "content": { - "application/json": { - "schema": { - "$ref": "#/components/schemas/ErrorResponse" - } - } - } - }, - "404": { - "description": "Not Found", - "content": { - "application/json": { - "schema": { - "$ref": "#/components/schemas/NotFoundResponse" - } - } - } - }, - "200": { - "description": "successful operation", - "content": { - "application/json": { - "schema": { - "$ref": "#/components/schemas/TaskRelationAssignedAgentsGetResponse" - } - } - } - } - }, - "security": [ - { - "bearerAuth": [ - [ - "permTaskRead" - ] - ] - } - ], - "description": "GET request to retrieve a single object.", - "parameters": [ - { - "name": "id", - "in": "path", - "required": true, - "schema": { - "type": "integer", - "format": "int32", - "example": 10 - } - } - ] - } - }, - "/api/v2/ui/tasks/{id:[0-9]+}/relationships/{relation:assignedAgents}": { - "get": { - "tags": [ - "Tasks" - ], - "responses": { - "400": { - "description": "Invalid request", - "content": { - "application/json": { - "schema": { - "$ref": "#/components/schemas/ErrorResponse" - } - } - } - }, - "401": { - "description": "Authentication failed", - "content": { - "application/json": { - "schema": { - "$ref": "#/components/schemas/ErrorResponse" - } - } - } - }, - "404": { - "description": "Not Found", - "content": { - "application/json": { - "schema": { - "$ref": "#/components/schemas/NotFoundResponse" - } - } - } - }, - "200": { - "description": "successful operation", - "content": { - "application/json": { - "schema": { - "$ref": "#/components/schemas/TaskResponse" - } - } - } - } - }, - "security": [ - { - "bearerAuth": [ - [ - "permTaskRead" - ] - ] - } - ], - "description": "GET request for for a to-one relationship link. Returns the resource record of the object that is part of the specified relation.", - "parameters": [ - { - "name": "id", - "in": "path", - "required": true, - "schema": { - "type": "integer", - "format": "int32", - "example": 10 - } - } - ] - }, - "patch": { - "tags": [ - "Tasks" - ], - "responses": { - "400": { - "description": "Invalid request", - "content": { - "application/json": { - "schema": { - "$ref": "#/components/schemas/ErrorResponse" - } - } - } - }, - "401": { - "description": "Authentication failed", - "content": { - "application/json": { - "schema": { - "$ref": "#/components/schemas/ErrorResponse" - } - } - } - }, - "204": { - "description": "Succesfull operation" - }, - "404": { - "description": "Not Found", - "content": { - "application/json": { - "schema": { - "$ref": "#/components/schemas/NotFoundResponse" - } - } - } - } - }, - "security": [ - { - "bearerAuth": [ - [ - "permTaskUpdate" - ] - ] - } - ], - "description": "", - "requestBody": { - "required": true, - "content": { - "application/json": { - "schema": { - "$ref": "#/components/schemas/TaskRelationAssignedAgents" - } - } - } - }, - "parameters": [] - }, - "post": { - "tags": [ - "Tasks" - ], - "responses": { - "400": { - "description": "Invalid request", - "content": { - "application/json": { - "schema": { - "$ref": "#/components/schemas/ErrorResponse" - } - } - } - }, - "401": { - "description": "Authentication failed", - "content": { - "application/json": { - "schema": { - "$ref": "#/components/schemas/ErrorResponse" - } - } - } - }, - "204": { - "description": "successfully created" - }, - "404": { - "description": "Not Found", - "content": { - "application/json": { - "schema": { - "$ref": "#/components/schemas/NotFoundResponse" - } - } - } - } - }, - "security": [ - { - "bearerAuth": [ - [ - "permTaskCreate" - ] - ] - } - ], - "description": "", - "requestBody": { - "required": true, - "content": { - "application/json": [] - } - }, - "parameters": [] - }, - "delete": { - "tags": [ - "Tasks" - ], - "responses": { - "400": { - "description": "Invalid request", - "content": { - "application/json": { - "schema": { - "$ref": "#/components/schemas/ErrorResponse" - } - } - } - }, - "401": { - "description": "Authentication failed", - "content": { - "application/json": { - "schema": { - "$ref": "#/components/schemas/ErrorResponse" - } - } - } - }, - "204": { - "description": "successfully deleted" - }, - "404": { - "description": "Not Found", - "content": { - "application/json": { - "schema": { - "$ref": "#/components/schemas/NotFoundResponse" - } - } - } - } - }, - "security": [ - { - "bearerAuth": [ - [ - "permTaskDelete" - ] - ] - } - ], - "description": "", - "requestBody": { - "required": true, - "content": { - "application/json": { - "schema": { - "$ref": "#/components/schemas/TaskRelationAssignedAgents" - } - } - } - }, - "parameters": [] - } - }, - "/api/v2/ui/tasks/{id:[0-9]+}/{relation:files}": { - "get": { - "tags": [ - "Tasks" - ], - "responses": { - "400": { - "description": "Invalid request", - "content": { - "application/json": { - "schema": { - "$ref": "#/components/schemas/ErrorResponse" - } - } - } - }, - "401": { - "description": "Authentication failed", - "content": { - "application/json": { - "schema": { - "$ref": "#/components/schemas/ErrorResponse" - } - } - } - }, - "404": { - "description": "Not Found", - "content": { - "application/json": { - "schema": { - "$ref": "#/components/schemas/NotFoundResponse" - } - } - } - }, - "200": { - "description": "successful operation", - "content": { - "application/json": { - "schema": { - "$ref": "#/components/schemas/TaskRelationFilesGetResponse" - } - } - } - } - }, - "security": [ - { - "bearerAuth": [ - [ - "permTaskRead" - ] - ] - } - ], - "description": "GET request to retrieve a single object.", - "parameters": [ - { - "name": "id", - "in": "path", - "required": true, - "schema": { - "type": "integer", - "format": "int32", - "example": 10 - } - } - ] - } - }, - "/api/v2/ui/tasks/{id:[0-9]+}/relationships/{relation:files}": { - "get": { - "tags": [ - "Tasks" - ], - "responses": { - "400": { - "description": "Invalid request", - "content": { - "application/json": { - "schema": { - "$ref": "#/components/schemas/ErrorResponse" - } - } - } - }, - "401": { - "description": "Authentication failed", - "content": { - "application/json": { - "schema": { - "$ref": "#/components/schemas/ErrorResponse" - } - } - } - }, - "404": { - "description": "Not Found", - "content": { - "application/json": { - "schema": { - "$ref": "#/components/schemas/NotFoundResponse" - } - } - } - }, - "200": { - "description": "successful operation", - "content": { - "application/json": { - "schema": { - "$ref": "#/components/schemas/TaskResponse" - } - } - } - } - }, - "security": [ - { - "bearerAuth": [ - [ - "permTaskRead" - ] - ] - } - ], - "description": "GET request for for a to-one relationship link. Returns the resource record of the object that is part of the specified relation.", - "parameters": [ - { - "name": "id", - "in": "path", - "required": true, - "schema": { - "type": "integer", - "format": "int32", - "example": 10 - } - } - ] - }, - "patch": { - "tags": [ - "Tasks" - ], - "responses": { - "400": { - "description": "Invalid request", - "content": { - "application/json": { - "schema": { - "$ref": "#/components/schemas/ErrorResponse" - } - } - } - }, - "401": { - "description": "Authentication failed", - "content": { - "application/json": { - "schema": { - "$ref": "#/components/schemas/ErrorResponse" - } - } - } - }, - "204": { - "description": "Succesfull operation" - }, - "404": { - "description": "Not Found", - "content": { - "application/json": { - "schema": { - "$ref": "#/components/schemas/NotFoundResponse" - } - } - } - } - }, - "security": [ - { - "bearerAuth": [ - [ - "permTaskUpdate" - ] - ] - } - ], - "description": "", - "requestBody": { - "required": true, - "content": { - "application/json": { - "schema": { - "$ref": "#/components/schemas/TaskRelationFiles" - } - } - } - }, - "parameters": [] - }, - "post": { - "tags": [ - "Tasks" - ], - "responses": { - "400": { - "description": "Invalid request", - "content": { - "application/json": { - "schema": { - "$ref": "#/components/schemas/ErrorResponse" - } - } - } - }, - "401": { - "description": "Authentication failed", - "content": { - "application/json": { - "schema": { - "$ref": "#/components/schemas/ErrorResponse" - } - } - } - }, - "204": { - "description": "successfully created" - }, - "404": { - "description": "Not Found", - "content": { - "application/json": { - "schema": { - "$ref": "#/components/schemas/NotFoundResponse" - } - } - } - } - }, - "security": [ - { - "bearerAuth": [ - [ - "permTaskCreate" - ] - ] - } - ], - "description": "", - "requestBody": { - "required": true, - "content": { - "application/json": [] - } - }, - "parameters": [] - }, - "delete": { - "tags": [ - "Tasks" - ], - "responses": { - "400": { - "description": "Invalid request", - "content": { - "application/json": { - "schema": { - "$ref": "#/components/schemas/ErrorResponse" - } - } - } - }, - "401": { - "description": "Authentication failed", - "content": { - "application/json": { - "schema": { - "$ref": "#/components/schemas/ErrorResponse" - } - } - } - }, - "204": { - "description": "successfully deleted" - }, - "404": { - "description": "Not Found", - "content": { - "application/json": { - "schema": { - "$ref": "#/components/schemas/NotFoundResponse" - } - } - } - } - }, - "security": [ - { - "bearerAuth": [ - [ - "permTaskDelete" - ] - ] - } - ], - "description": "", - "requestBody": { - "required": true, - "content": { - "application/json": { - "schema": { - "$ref": "#/components/schemas/TaskRelationFiles" - } - } - } - }, - "parameters": [] - } - }, - "/api/v2/ui/tasks/{id:[0-9]+}/{relation:speeds}": { - "get": { - "tags": [ - "Tasks" - ], - "responses": { - "400": { - "description": "Invalid request", - "content": { - "application/json": { - "schema": { - "$ref": "#/components/schemas/ErrorResponse" - } - } - } - }, - "401": { - "description": "Authentication failed", - "content": { - "application/json": { - "schema": { - "$ref": "#/components/schemas/ErrorResponse" - } - } - } - }, - "404": { - "description": "Not Found", - "content": { - "application/json": { - "schema": { - "$ref": "#/components/schemas/NotFoundResponse" - } - } - } - }, - "200": { - "description": "successful operation", - "content": { - "application/json": { - "schema": { - "$ref": "#/components/schemas/TaskRelationSpeedsGetResponse" - } - } - } - } - }, - "security": [ - { - "bearerAuth": [ - [ - "permTaskRead" - ] - ] - } - ], - "description": "GET request to retrieve a single object.", - "parameters": [ - { - "name": "id", - "in": "path", - "required": true, - "schema": { - "type": "integer", - "format": "int32", - "example": 10 - } - } - ] - } - }, - "/api/v2/ui/tasks/{id:[0-9]+}/relationships/{relation:speeds}": { - "get": { - "tags": [ - "Tasks" - ], - "responses": { - "400": { - "description": "Invalid request", - "content": { - "application/json": { - "schema": { - "$ref": "#/components/schemas/ErrorResponse" - } - } - } - }, - "401": { - "description": "Authentication failed", - "content": { - "application/json": { - "schema": { - "$ref": "#/components/schemas/ErrorResponse" - } - } - } - }, - "404": { - "description": "Not Found", - "content": { - "application/json": { - "schema": { - "$ref": "#/components/schemas/NotFoundResponse" - } - } - } - }, - "200": { - "description": "successful operation", - "content": { - "application/json": { - "schema": { - "$ref": "#/components/schemas/TaskResponse" - } - } - } - } - }, - "security": [ - { - "bearerAuth": [ - [ - "permTaskRead" - ] - ] - } - ], - "description": "GET request for for a to-one relationship link. Returns the resource record of the object that is part of the specified relation.", - "parameters": [ - { - "name": "id", - "in": "path", - "required": true, - "schema": { - "type": "integer", - "format": "int32", - "example": 10 - } - } - ] - }, - "patch": { - "tags": [ - "Tasks" - ], - "responses": { - "400": { - "description": "Invalid request", - "content": { - "application/json": { - "schema": { - "$ref": "#/components/schemas/ErrorResponse" - } - } - } - }, - "401": { - "description": "Authentication failed", - "content": { - "application/json": { - "schema": { - "$ref": "#/components/schemas/ErrorResponse" - } - } - } - }, - "204": { - "description": "Succesfull operation" - }, - "404": { - "description": "Not Found", - "content": { - "application/json": { - "schema": { - "$ref": "#/components/schemas/NotFoundResponse" - } - } - } - } - }, - "security": [ - { - "bearerAuth": [ - [ - "permTaskUpdate" - ] - ] - } - ], - "description": "", - "requestBody": { - "required": true, - "content": { - "application/json": { - "schema": { - "$ref": "#/components/schemas/TaskRelationSpeeds" - } - } - } - }, - "parameters": [] - }, - "post": { - "tags": [ - "Tasks" - ], - "responses": { - "400": { - "description": "Invalid request", - "content": { - "application/json": { - "schema": { - "$ref": "#/components/schemas/ErrorResponse" - } - } - } - }, - "401": { - "description": "Authentication failed", - "content": { - "application/json": { - "schema": { - "$ref": "#/components/schemas/ErrorResponse" - } - } - } - }, - "204": { - "description": "successfully created" - }, - "404": { - "description": "Not Found", - "content": { - "application/json": { - "schema": { - "$ref": "#/components/schemas/NotFoundResponse" - } - } - } - } - }, - "security": [ - { - "bearerAuth": [ - [ - "permTaskCreate" - ] - ] - } - ], - "description": "", - "requestBody": { - "required": true, - "content": { - "application/json": [] - } - }, - "parameters": [] - }, - "delete": { - "tags": [ - "Tasks" - ], - "responses": { - "400": { - "description": "Invalid request", - "content": { - "application/json": { - "schema": { - "$ref": "#/components/schemas/ErrorResponse" - } - } - } - }, - "401": { - "description": "Authentication failed", - "content": { - "application/json": { - "schema": { - "$ref": "#/components/schemas/ErrorResponse" - } - } - } - }, - "204": { - "description": "successfully deleted" - }, - "404": { - "description": "Not Found", - "content": { - "application/json": { - "schema": { - "$ref": "#/components/schemas/NotFoundResponse" - } - } - } - } - }, - "security": [ - { - "bearerAuth": [ - [ - "permTaskDelete" - ] - ] - } - ], - "description": "", - "requestBody": { - "required": true, - "content": { - "application/json": { - "schema": { - "$ref": "#/components/schemas/TaskRelationSpeeds" - } - } - } - }, - "parameters": [] - } - }, - "/api/v2/ui/tasks/{id:[0-9]+}": { - "get": { - "tags": [ - "Tasks" - ], - "responses": { - "400": { - "description": "Invalid request", - "content": { - "application/json": { - "schema": { - "$ref": "#/components/schemas/ErrorResponse" - } - } - } - }, - "401": { - "description": "Authentication failed", - "content": { - "application/json": { - "schema": { - "$ref": "#/components/schemas/ErrorResponse" - } - } - } - }, - "404": { - "description": "Not Found", - "content": { - "application/json": { - "schema": { - "$ref": "#/components/schemas/NotFoundResponse" - } - } - } - }, - "200": { - "description": "successful operation", - "content": { - "application/json": { - "schema": { - "$ref": "#/components/schemas/TaskResponse" - } - } - } - } - }, - "security": [ - { - "bearerAuth": [ - [ - "permTaskRead" - ] - ] - } - ], - "description": "GET request to retrieve a single object.", - "parameters": [ - { - "name": "id", - "in": "path", - "required": true, - "schema": { - "type": "integer", - "format": "int32", - "example": 10 - } - }, - { - "name": "include", - "in": "query", - "schema": { - "type": "string" - }, - "description": "Items to include. Comma seperated" - } - ] - }, - "patch": { - "tags": [ - "Tasks" - ], - "responses": { - "400": { - "description": "Invalid request", - "content": { - "application/json": { - "schema": { - "$ref": "#/components/schemas/ErrorResponse" - } - } - } - }, - "401": { - "description": "Authentication failed", - "content": { - "application/json": { - "schema": { - "$ref": "#/components/schemas/ErrorResponse" - } - } - } - }, - "404": { - "description": "Not Found", - "content": { - "application/json": { - "schema": { - "$ref": "#/components/schemas/NotFoundResponse" - } - } - } - }, - "200": { - "description": "successful operation", - "content": { - "application/json": { - "schema": { - "$ref": "#/components/schemas/TaskPostPatchResponse" - } - } - } - } - }, - "security": [ - { - "bearerAuth": [ - [ - "permTaskUpdate" - ] - ] - } - ], - "description": "PATCH request to update attributes of a single object.", - "requestBody": { - "required": true, - "content": { - "application/json": { - "schema": { - "$ref": "#/components/schemas/TaskPatch" - } - } - } - }, - "parameters": [] - }, - "delete": { - "tags": [ - "Tasks" - ], - "responses": { - "400": { - "description": "Invalid request", - "content": { - "application/json": { - "schema": { - "$ref": "#/components/schemas/ErrorResponse" - } - } - } - }, - "401": { - "description": "Authentication failed", - "content": { - "application/json": { - "schema": { - "$ref": "#/components/schemas/ErrorResponse" - } - } - } - }, - "404": { - "description": "Not Found", - "content": { - "application/json": { - "schema": { - "$ref": "#/components/schemas/NotFoundResponse" - } - } - } - }, - "204": { - "description": "successfully deleted" - } - }, - "security": [ - { - "bearerAuth": [ - [ - "permTaskDelete" - ] - ] - } - ], - "description": "", - "requestBody": { - "required": true, - "content": { - "application/json": [] - } - }, - "parameters": [] - } - }, - "/api/v2/ui/taskwrappers": { - "get": { - "tags": [ - "TaskWrappers" - ], - "responses": { - "400": { - "description": "Invalid request", - "content": { - "application/json": { - "schema": { - "$ref": "#/components/schemas/ErrorResponse" - } - } - } - }, - "401": { - "description": "Authentication failed", - "content": { - "application/json": { - "schema": { - "$ref": "#/components/schemas/ErrorResponse" - } - } - } - }, - "200": { - "description": "successful operation", - "content": { - "application/json": { - "schema": { - "type": "array", - "items": { - "$ref": "#/components/schemas/TaskWrapperResponse" - } - } - } - } - } - }, - "security": [ - { - "bearerAuth": [ - [ - "permTaskWrapperRead" - ] - ] - } - ], - "description": "GET many request to retrieve multiple objects.", - "parameters": [ - { - "name": "page[after]", - "in": "path", - "schema": { - "type": "integer", - "format": "int32" - }, - "example": 0, - "description": "Pointer to paginate to retrieve the data after the value provided" - }, - { - "name": "page[before]", - "in": "path", - "schema": { - "type": "integer", - "format": "int32" - }, - "example": 0, - "description": "Pointer to paginate to retrieve the data before the value provided" - }, - { - "name": "page[size]", - "in": "path", - "schema": { - "type": "integer", - "format": "int32" - }, - "example": 100, - "description": "Amout of data to retrieve inside a single page" - }, - { - "name": "filter", - "in": "path", - "style": "deepobject", - "explode": true, - "schema": { - "type": "object" - }, - "description": "Filters results using a query", - "example": "\"filter[hashlistId__gt]\": 200" - }, - { - "name": "include", - "in": "path", - "schema": { - "type": "string" - }, - "description": "Items to include, comma seperated. Possible options: accessGroup,hashlist,hashType,tasks" - } - ] - }, - "patch": { - "tags": [ - "TaskWrappers" - ], - "responses": { - "400": { - "description": "Invalid request", - "content": { - "application/json": { - "schema": { - "$ref": "#/components/schemas/ErrorResponse" - } - } - } - }, - "401": { - "description": "Authentication failed", - "content": { - "application/json": { - "schema": { - "$ref": "#/components/schemas/ErrorResponse" - } - } - } - } - }, - "security": [ - { - "bearerAuth": [ - [ - "permTaskWrapperUpdate" - ] - ] - } - ], - "description": "PATCH request to update attributes of a single object.", - "parameters": [] - }, - "delete": { - "tags": [ - "TaskWrappers" - ], - "responses": { - "400": { - "description": "Invalid request", - "content": { - "application/json": { - "schema": { - "$ref": "#/components/schemas/ErrorResponse" - } - } - } - }, - "401": { - "description": "Authentication failed", - "content": { - "application/json": { - "schema": { - "$ref": "#/components/schemas/ErrorResponse" - } - } - } - } - }, - "security": [ - { - "bearerAuth": [ - [ - "permTaskWrapperDelete" - ] - ] - } - ], - "description": "", - "parameters": [] - } - }, - "/api/v2/ui/taskwrappers/count": { - "get": { - "tags": [ - "TaskWrappers" - ], - "responses": { - "400": { - "description": "Invalid request", - "content": { - "application/json": { - "schema": { - "$ref": "#/components/schemas/ErrorResponse" - } - } - } - }, - "401": { - "description": "Authentication failed", - "content": { - "application/json": { - "schema": { - "$ref": "#/components/schemas/ErrorResponse" - } - } - } - }, - "200": { - "description": "successful operation", - "content": { - "application/json": { - "schema": { - "type": "array", - "items": { - "$ref": "#/components/schemas/TaskWrapperResponse" - } - } - } - } - } - }, - "security": [ - { - "bearerAuth": [ - [ - "permTaskWrapperRead" - ] - ] - } - ], - "description": "GET many request to retrieve multiple objects.", - "parameters": [ - { - "name": "page[after]", - "in": "path", - "schema": { - "type": "integer", - "format": "int32" - }, - "example": 0, - "description": "Pointer to paginate to retrieve the data after the value provided" - }, - { - "name": "page[before]", - "in": "path", - "schema": { - "type": "integer", - "format": "int32" - }, - "example": 0, - "description": "Pointer to paginate to retrieve the data before the value provided" - }, - { - "name": "page[size]", - "in": "path", - "schema": { - "type": "integer", - "format": "int32" - }, - "example": 100, - "description": "Amout of data to retrieve inside a single page" - }, - { - "name": "filter", - "in": "path", - "style": "deepobject", - "explode": true, - "schema": { - "type": "object" - }, - "description": "Filters results using a query", - "example": "\"filter[hashlistId__gt]\": 200" - }, - { - "name": "include", - "in": "path", - "schema": { - "type": "string" - }, - "description": "Items to include, comma seperated. Possible options: accessGroup,hashlist,hashType,tasks" - } - ] - } - }, - "/api/v2/ui/taskwrappers/{id:[0-9]+}/{relation:accessGroup}": { - "get": { - "tags": [ - "TaskWrappers" - ], - "responses": { - "400": { - "description": "Invalid request", - "content": { - "application/json": { - "schema": { - "$ref": "#/components/schemas/ErrorResponse" - } - } - } - }, - "401": { - "description": "Authentication failed", - "content": { - "application/json": { - "schema": { - "$ref": "#/components/schemas/ErrorResponse" - } - } - } - }, - "404": { - "description": "Not Found", - "content": { - "application/json": { - "schema": { - "$ref": "#/components/schemas/NotFoundResponse" - } - } - } - }, - "200": { - "description": "successful operation", - "content": { - "application/json": { - "schema": { - "$ref": "#/components/schemas/TaskWrapperRelationAccessGroupGetResponse" - } - } - } - } - }, - "security": [ - { - "bearerAuth": [ - [ - "permTaskWrapperRead" - ] - ] - } - ], - "description": "GET request to retrieve a single object.", - "parameters": [ - { - "name": "id", - "in": "path", - "required": true, - "schema": { - "type": "integer", - "format": "int32", - "example": 10 - } - } - ] - } - }, - "/api/v2/ui/taskwrappers/{id:[0-9]+}/relationships/{relation:accessGroup}": { - "get": { - "tags": [ - "TaskWrappers" - ], - "responses": { - "400": { - "description": "Invalid request", - "content": { - "application/json": { - "schema": { - "$ref": "#/components/schemas/ErrorResponse" - } - } - } - }, - "401": { - "description": "Authentication failed", - "content": { - "application/json": { - "schema": { - "$ref": "#/components/schemas/ErrorResponse" - } - } - } - }, - "404": { - "description": "Not Found", - "content": { - "application/json": { - "schema": { - "$ref": "#/components/schemas/NotFoundResponse" - } - } - } - }, - "200": { - "description": "successful operation", - "content": { - "application/json": { - "schema": { - "$ref": "#/components/schemas/TaskWrapperResponse" - } - } - } - } - }, - "security": [ - { - "bearerAuth": [ - [ - "permTaskWrapperRead" - ] - ] - } - ], - "description": "GET request for for a to-one relationship link. Returns the resource record of the object that is part of the specified relation.", - "parameters": [ - { - "name": "id", - "in": "path", - "required": true, - "schema": { - "type": "integer", - "format": "int32", - "example": 10 - } - } - ] - }, - "patch": { - "tags": [ - "TaskWrappers" - ], - "responses": { - "400": { - "description": "Invalid request", - "content": { - "application/json": { - "schema": { - "$ref": "#/components/schemas/ErrorResponse" - } - } - } - }, - "401": { - "description": "Authentication failed", - "content": { - "application/json": { - "schema": { - "$ref": "#/components/schemas/ErrorResponse" - } - } - } - }, - "204": { - "description": "Succesfull operation" - }, - "404": { - "description": "Not Found", - "content": { - "application/json": { - "schema": { - "$ref": "#/components/schemas/NotFoundResponse" - } - } - } - } - }, - "security": [ - { - "bearerAuth": [ - [ - "permTaskWrapperUpdate" - ] - ] - } - ], - "description": "", - "requestBody": { - "required": true, - "content": { - "application/json": { - "schema": { - "$ref": "#/components/schemas/TaskWrapperRelationAccessGroup" - } - } - } - }, - "parameters": [] - } - }, - "/api/v2/ui/taskwrappers/{id:[0-9]+}/{relation:hashlist}": { - "get": { - "tags": [ - "TaskWrappers" - ], - "responses": { - "400": { - "description": "Invalid request", - "content": { - "application/json": { - "schema": { - "$ref": "#/components/schemas/ErrorResponse" - } - } - } - }, - "401": { - "description": "Authentication failed", - "content": { - "application/json": { - "schema": { - "$ref": "#/components/schemas/ErrorResponse" - } - } - } - }, - "404": { - "description": "Not Found", - "content": { - "application/json": { - "schema": { - "$ref": "#/components/schemas/NotFoundResponse" - } - } - } - }, - "200": { - "description": "successful operation", - "content": { - "application/json": { - "schema": { - "$ref": "#/components/schemas/TaskWrapperRelationHashlistGetResponse" - } - } - } - } - }, - "security": [ - { - "bearerAuth": [ - [ - "permTaskWrapperRead" - ] - ] - } - ], - "description": "GET request to retrieve a single object.", - "parameters": [ - { - "name": "id", - "in": "path", - "required": true, - "schema": { - "type": "integer", - "format": "int32", - "example": 10 - } - } - ] - } - }, - "/api/v2/ui/taskwrappers/{id:[0-9]+}/relationships/{relation:hashlist}": { - "get": { - "tags": [ - "TaskWrappers" - ], - "responses": { - "400": { - "description": "Invalid request", - "content": { - "application/json": { - "schema": { - "$ref": "#/components/schemas/ErrorResponse" - } - } - } - }, - "401": { - "description": "Authentication failed", - "content": { - "application/json": { - "schema": { - "$ref": "#/components/schemas/ErrorResponse" - } - } - } - }, - "404": { - "description": "Not Found", - "content": { - "application/json": { - "schema": { - "$ref": "#/components/schemas/NotFoundResponse" - } - } - } - }, - "200": { - "description": "successful operation", - "content": { - "application/json": { - "schema": { - "$ref": "#/components/schemas/TaskWrapperResponse" - } - } - } - } - }, - "security": [ - { - "bearerAuth": [ - [ - "permTaskWrapperRead" - ] - ] - } - ], - "description": "GET request for for a to-one relationship link. Returns the resource record of the object that is part of the specified relation.", - "parameters": [ - { - "name": "id", - "in": "path", - "required": true, - "schema": { - "type": "integer", - "format": "int32", - "example": 10 - } - } - ] - }, - "patch": { - "tags": [ - "TaskWrappers" - ], - "responses": { - "400": { - "description": "Invalid request", - "content": { - "application/json": { - "schema": { - "$ref": "#/components/schemas/ErrorResponse" - } - } - } - }, - "401": { - "description": "Authentication failed", - "content": { - "application/json": { - "schema": { - "$ref": "#/components/schemas/ErrorResponse" - } - } - } - }, - "204": { - "description": "Succesfull operation" - }, - "404": { - "description": "Not Found", - "content": { - "application/json": { - "schema": { - "$ref": "#/components/schemas/NotFoundResponse" - } - } - } - } - }, - "security": [ - { - "bearerAuth": [ - [ - "permTaskWrapperUpdate" - ] - ] - } - ], - "description": "", - "requestBody": { - "required": true, - "content": { - "application/json": { - "schema": { - "$ref": "#/components/schemas/TaskWrapperRelationHashlist" - } - } - } - }, - "parameters": [] - } - }, - "/api/v2/ui/taskwrappers/{id:[0-9]+}/{relation:hashType}": { - "get": { - "tags": [ - "TaskWrappers" - ], - "responses": { - "400": { - "description": "Invalid request", - "content": { - "application/json": { - "schema": { - "$ref": "#/components/schemas/ErrorResponse" - } - } - } - }, - "401": { - "description": "Authentication failed", - "content": { - "application/json": { - "schema": { - "$ref": "#/components/schemas/ErrorResponse" - } - } - } - }, - "404": { - "description": "Not Found", - "content": { - "application/json": { - "schema": { - "$ref": "#/components/schemas/NotFoundResponse" - } - } - } - }, - "200": { - "description": "successful operation", - "content": { - "application/json": { - "schema": { - "$ref": "#/components/schemas/TaskWrapperRelationHashTypeGetResponse" - } - } - } - } - }, - "security": [ - { - "bearerAuth": [ - [ - "permTaskWrapperRead" - ] - ] - } - ], - "description": "GET request to retrieve a single object.", - "parameters": [ - { - "name": "id", - "in": "path", - "required": true, - "schema": { - "type": "integer", - "format": "int32", - "example": 10 - } - } - ] - } - }, - "/api/v2/ui/taskwrappers/{id:[0-9]+}/relationships/{relation:hashType}": { - "get": { - "tags": [ - "TaskWrappers" - ], - "responses": { - "400": { - "description": "Invalid request", - "content": { - "application/json": { - "schema": { - "$ref": "#/components/schemas/ErrorResponse" - } - } - } - }, - "401": { - "description": "Authentication failed", - "content": { - "application/json": { - "schema": { - "$ref": "#/components/schemas/ErrorResponse" - } - } - } - }, - "404": { - "description": "Not Found", - "content": { - "application/json": { - "schema": { - "$ref": "#/components/schemas/NotFoundResponse" - } - } - } - }, - "200": { - "description": "successful operation", - "content": { - "application/json": { - "schema": { - "$ref": "#/components/schemas/TaskWrapperResponse" - } - } - } - } - }, - "security": [ - { - "bearerAuth": [ - [ - "permTaskWrapperRead" - ] - ] - } - ], - "description": "GET request for for a to-one relationship link. Returns the resource record of the object that is part of the specified relation.", - "parameters": [ - { - "name": "id", - "in": "path", - "required": true, - "schema": { - "type": "integer", - "format": "int32", - "example": 10 - } - } - ] - }, - "patch": { - "tags": [ - "TaskWrappers" - ], - "responses": { - "400": { - "description": "Invalid request", - "content": { - "application/json": { - "schema": { - "$ref": "#/components/schemas/ErrorResponse" - } - } - } - }, - "401": { - "description": "Authentication failed", - "content": { - "application/json": { - "schema": { - "$ref": "#/components/schemas/ErrorResponse" - } - } - } - }, - "204": { - "description": "Succesfull operation" - }, - "404": { - "description": "Not Found", - "content": { - "application/json": { - "schema": { - "$ref": "#/components/schemas/NotFoundResponse" - } - } - } - } - }, - "security": [ - { - "bearerAuth": [ - [ - "permTaskWrapperUpdate" - ] - ] - } - ], - "description": "", - "requestBody": { - "required": true, - "content": { - "application/json": { - "schema": { - "$ref": "#/components/schemas/TaskWrapperRelationHashType" - } - } - } - }, - "parameters": [] - } - }, - "/api/v2/ui/taskwrappers/{id:[0-9]+}/{relation:tasks}": { - "get": { - "tags": [ - "TaskWrappers" - ], - "responses": { - "400": { - "description": "Invalid request", - "content": { - "application/json": { - "schema": { - "$ref": "#/components/schemas/ErrorResponse" - } - } - } - }, - "401": { - "description": "Authentication failed", - "content": { - "application/json": { - "schema": { - "$ref": "#/components/schemas/ErrorResponse" - } - } - } - }, - "404": { - "description": "Not Found", - "content": { - "application/json": { - "schema": { - "$ref": "#/components/schemas/NotFoundResponse" - } - } - } - }, - "200": { - "description": "successful operation", - "content": { - "application/json": { - "schema": { - "$ref": "#/components/schemas/TaskWrapperRelationTasksGetResponse" - } - } - } - } - }, - "security": [ - { - "bearerAuth": [ - [ - "permTaskWrapperRead" - ] - ] - } - ], - "description": "GET request to retrieve a single object.", - "parameters": [ - { - "name": "id", - "in": "path", - "required": true, - "schema": { - "type": "integer", - "format": "int32", - "example": 10 - } - } - ] - } - }, - "/api/v2/ui/taskwrappers/{id:[0-9]+}/relationships/{relation:tasks}": { - "get": { - "tags": [ - "TaskWrappers" - ], - "responses": { - "400": { - "description": "Invalid request", - "content": { - "application/json": { - "schema": { - "$ref": "#/components/schemas/ErrorResponse" - } - } - } - }, - "401": { - "description": "Authentication failed", - "content": { - "application/json": { - "schema": { - "$ref": "#/components/schemas/ErrorResponse" - } - } - } - }, - "404": { - "description": "Not Found", - "content": { - "application/json": { - "schema": { - "$ref": "#/components/schemas/NotFoundResponse" - } - } - } - }, - "200": { - "description": "successful operation", - "content": { - "application/json": { - "schema": { - "$ref": "#/components/schemas/TaskWrapperResponse" - } - } - } - } - }, - "security": [ - { - "bearerAuth": [ - [ - "permTaskWrapperRead" - ] - ] - } - ], - "description": "GET request for for a to-one relationship link. Returns the resource record of the object that is part of the specified relation.", - "parameters": [ - { - "name": "id", - "in": "path", - "required": true, - "schema": { - "type": "integer", - "format": "int32", - "example": 10 - } - } - ] - }, - "patch": { - "tags": [ - "TaskWrappers" - ], - "responses": { - "400": { - "description": "Invalid request", - "content": { - "application/json": { - "schema": { - "$ref": "#/components/schemas/ErrorResponse" - } - } - } - }, - "401": { - "description": "Authentication failed", - "content": { - "application/json": { - "schema": { - "$ref": "#/components/schemas/ErrorResponse" - } - } - } - }, - "204": { - "description": "Succesfull operation" - }, - "404": { - "description": "Not Found", - "content": { - "application/json": { - "schema": { - "$ref": "#/components/schemas/NotFoundResponse" - } - } - } - } - }, - "security": [ - { - "bearerAuth": [ - [ - "permTaskWrapperUpdate" - ] - ] - } - ], - "description": "", - "requestBody": { - "required": true, - "content": { - "application/json": { - "schema": { - "$ref": "#/components/schemas/TaskWrapperRelationTasks" - } - } - } - }, - "parameters": [] - }, - "post": { - "tags": [ - "TaskWrappers" - ], - "responses": { - "400": { - "description": "Invalid request", - "content": { - "application/json": { - "schema": { - "$ref": "#/components/schemas/ErrorResponse" - } - } - } - }, - "401": { - "description": "Authentication failed", - "content": { - "application/json": { - "schema": { - "$ref": "#/components/schemas/ErrorResponse" - } - } - } - }, - "204": { - "description": "successfully created" - }, - "404": { - "description": "Not Found", - "content": { - "application/json": { - "schema": { - "$ref": "#/components/schemas/NotFoundResponse" - } - } - } - } - }, - "security": [ - { - "bearerAuth": [ - [ - "permTaskWrapperCreate" - ] - ] - } - ], - "description": "", - "requestBody": { - "required": true, - "content": { - "application/json": [] - } - }, - "parameters": [] - }, - "delete": { - "tags": [ - "TaskWrappers" - ], - "responses": { - "400": { - "description": "Invalid request", - "content": { - "application/json": { - "schema": { - "$ref": "#/components/schemas/ErrorResponse" - } - } - } - }, - "401": { - "description": "Authentication failed", - "content": { - "application/json": { - "schema": { - "$ref": "#/components/schemas/ErrorResponse" - } - } - } - }, - "204": { - "description": "successfully deleted" - }, - "404": { - "description": "Not Found", - "content": { - "application/json": { - "schema": { - "$ref": "#/components/schemas/NotFoundResponse" - } - } - } - } - }, - "security": [ - { - "bearerAuth": [ - [ - "permTaskWrapperDelete" - ] - ] - } - ], - "description": "", - "requestBody": { - "required": true, - "content": { - "application/json": { - "schema": { - "$ref": "#/components/schemas/TaskWrapperRelationTasks" - } - } - } - }, - "parameters": [] - } - }, - "/api/v2/ui/taskwrappers/{id:[0-9]+}": { - "get": { - "tags": [ - "TaskWrappers" - ], - "responses": { - "400": { - "description": "Invalid request", - "content": { - "application/json": { - "schema": { - "$ref": "#/components/schemas/ErrorResponse" - } - } - } - }, - "401": { - "description": "Authentication failed", - "content": { - "application/json": { - "schema": { - "$ref": "#/components/schemas/ErrorResponse" - } - } - } - }, - "404": { - "description": "Not Found", - "content": { - "application/json": { - "schema": { - "$ref": "#/components/schemas/NotFoundResponse" - } - } - } - }, - "200": { - "description": "successful operation", - "content": { - "application/json": { - "schema": { - "$ref": "#/components/schemas/TaskWrapperResponse" - } - } - } - } - }, - "security": [ - { - "bearerAuth": [ - [ - "permTaskWrapperRead" - ] - ] - } - ], - "description": "GET request to retrieve a single object.", - "parameters": [ - { - "name": "id", - "in": "path", - "required": true, - "schema": { - "type": "integer", - "format": "int32", - "example": 10 - } - }, - { - "name": "include", - "in": "query", - "schema": { - "type": "string" - }, - "description": "Items to include. Comma seperated" - } - ] - }, - "patch": { - "tags": [ - "TaskWrappers" - ], - "responses": { - "400": { - "description": "Invalid request", - "content": { - "application/json": { - "schema": { - "$ref": "#/components/schemas/ErrorResponse" - } - } - } - }, - "401": { - "description": "Authentication failed", - "content": { - "application/json": { - "schema": { - "$ref": "#/components/schemas/ErrorResponse" - } - } - } - }, - "404": { - "description": "Not Found", - "content": { - "application/json": { - "schema": { - "$ref": "#/components/schemas/NotFoundResponse" - } - } - } - }, - "200": { - "description": "successful operation", - "content": { - "application/json": { - "schema": { - "$ref": "#/components/schemas/TaskWrapperPostPatchResponse" - } - } - } - } - }, - "security": [ - { - "bearerAuth": [ - [ - "permTaskWrapperUpdate" - ] - ] - } - ], - "description": "PATCH request to update attributes of a single object.", - "requestBody": { - "required": true, - "content": { - "application/json": { - "schema": { - "$ref": "#/components/schemas/TaskWrapperPatch" - } - } - } - }, - "parameters": [] - }, - "delete": { - "tags": [ - "TaskWrappers" - ], - "responses": { - "400": { - "description": "Invalid request", - "content": { - "application/json": { - "schema": { - "$ref": "#/components/schemas/ErrorResponse" - } - } - } - }, - "401": { - "description": "Authentication failed", - "content": { - "application/json": { - "schema": { - "$ref": "#/components/schemas/ErrorResponse" - } - } - } - }, - "404": { - "description": "Not Found", - "content": { - "application/json": { - "schema": { - "$ref": "#/components/schemas/NotFoundResponse" - } - } - } - }, - "204": { - "description": "successfully deleted" - } - }, - "security": [ - { - "bearerAuth": [ - [ - "permTaskWrapperDelete" - ] - ] - } - ], - "description": "", - "requestBody": { - "required": true, - "content": { - "application/json": [] - } - }, - "parameters": [] - } - }, - "/api/v2/ui/users": { - "get": { - "tags": [ - "Users" - ], - "responses": { - "400": { - "description": "Invalid request", - "content": { - "application/json": { - "schema": { - "$ref": "#/components/schemas/ErrorResponse" - } - } - } - }, - "401": { - "description": "Authentication failed", - "content": { - "application/json": { - "schema": { - "$ref": "#/components/schemas/ErrorResponse" - } - } - } - }, - "200": { - "description": "successful operation", - "content": { - "application/json": { - "schema": { - "type": "array", - "items": { - "$ref": "#/components/schemas/UserResponse" - } - } - } - } - } - }, - "security": [ - { - "bearerAuth": [ - [ - "permUserRead" - ] - ] - } - ], - "description": "GET many request to retrieve multiple objects.", - "parameters": [ - { - "name": "page[after]", - "in": "path", - "schema": { - "type": "integer", - "format": "int32" - }, - "example": 0, - "description": "Pointer to paginate to retrieve the data after the value provided" - }, - { - "name": "page[before]", - "in": "path", - "schema": { - "type": "integer", - "format": "int32" - }, - "example": 0, - "description": "Pointer to paginate to retrieve the data before the value provided" - }, - { - "name": "page[size]", - "in": "path", - "schema": { - "type": "integer", - "format": "int32" - }, - "example": 100, - "description": "Amout of data to retrieve inside a single page" - }, - { - "name": "filter", - "in": "path", - "style": "deepobject", - "explode": true, - "schema": { - "type": "object" - }, - "description": "Filters results using a query", - "example": "\"filter[hashlistId__gt]\": 200" - }, - { - "name": "include", - "in": "path", - "schema": { - "type": "string" - }, - "description": "Items to include, comma seperated. Possible options: globalPermissionGroup,accessGroups" - } - ] - }, - "post": { - "tags": [ - "Users" - ], - "responses": { - "400": { - "description": "Invalid request", - "content": { - "application/json": { - "schema": { - "$ref": "#/components/schemas/ErrorResponse" - } - } - } - }, - "401": { - "description": "Authentication failed", - "content": { - "application/json": { - "schema": { - "$ref": "#/components/schemas/ErrorResponse" - } - } - } - }, - "201": { - "description": "successful operation", - "content": { - "application/json": { - "schema": { - "$ref": "#/components/schemas/UserPostPatchResponse" - } - } - } - } - }, - "security": [ - { - "bearerAuth": [ - [ - "permUserCreate" - ] - ] - } - ], - "description": "POST request to create a new object. The request must contain the resource record as data with the attributes of the new object.To add relationships, a relationships object can be added with the resource records of the relations that are part of this object.", - "requestBody": { - "required": true, - "content": { - "application/json": { - "schema": { - "$ref": "#/components/schemas/UserCreate" - } - } - } - }, - "parameters": [] - }, - "patch": { - "tags": [ - "Users" - ], - "responses": { - "400": { - "description": "Invalid request", - "content": { - "application/json": { - "schema": { - "$ref": "#/components/schemas/ErrorResponse" - } - } - } - }, - "401": { - "description": "Authentication failed", - "content": { - "application/json": { - "schema": { - "$ref": "#/components/schemas/ErrorResponse" - } - } - } - } - }, - "security": [ - { - "bearerAuth": [ - [ - "permUserUpdate" - ] - ] - } - ], - "description": "PATCH request to update attributes of a single object.", - "parameters": [] - }, - "delete": { - "tags": [ - "Users" - ], - "responses": { - "400": { - "description": "Invalid request", - "content": { - "application/json": { - "schema": { - "$ref": "#/components/schemas/ErrorResponse" - } - } - } - }, - "401": { - "description": "Authentication failed", - "content": { - "application/json": { - "schema": { - "$ref": "#/components/schemas/ErrorResponse" - } - } - } - } - }, - "security": [ - { - "bearerAuth": [ - [ - "permUserDelete" - ] - ] - } - ], - "description": "", - "parameters": [] - } - }, - "/api/v2/ui/users/count": { - "get": { - "tags": [ - "Users" - ], - "responses": { - "400": { - "description": "Invalid request", - "content": { - "application/json": { - "schema": { - "$ref": "#/components/schemas/ErrorResponse" - } - } - } - }, - "401": { - "description": "Authentication failed", - "content": { - "application/json": { - "schema": { - "$ref": "#/components/schemas/ErrorResponse" - } - } - } - }, - "200": { - "description": "successful operation", - "content": { - "application/json": { - "schema": { - "type": "array", - "items": { - "$ref": "#/components/schemas/UserResponse" - } - } - } - } - } - }, - "security": [ - { - "bearerAuth": [ - [ - "permUserRead" - ] - ] - } - ], - "description": "GET many request to retrieve multiple objects.", - "parameters": [ - { - "name": "page[after]", - "in": "path", - "schema": { - "type": "integer", - "format": "int32" - }, - "example": 0, - "description": "Pointer to paginate to retrieve the data after the value provided" - }, - { - "name": "page[before]", - "in": "path", - "schema": { - "type": "integer", - "format": "int32" - }, - "example": 0, - "description": "Pointer to paginate to retrieve the data before the value provided" - }, - { - "name": "page[size]", - "in": "path", - "schema": { - "type": "integer", - "format": "int32" - }, - "example": 100, - "description": "Amout of data to retrieve inside a single page" - }, - { - "name": "filter", - "in": "path", - "style": "deepobject", - "explode": true, - "schema": { - "type": "object" - }, - "description": "Filters results using a query", - "example": "\"filter[hashlistId__gt]\": 200" - }, - { - "name": "include", - "in": "path", - "schema": { - "type": "string" - }, - "description": "Items to include, comma seperated. Possible options: globalPermissionGroup,accessGroups" - } - ] - } - }, - "/api/v2/ui/users/{id:[0-9]+}/{relation:globalPermissionGroup}": { - "get": { - "tags": [ - "Users" - ], - "responses": { - "400": { - "description": "Invalid request", - "content": { - "application/json": { - "schema": { - "$ref": "#/components/schemas/ErrorResponse" - } - } - } - }, - "401": { - "description": "Authentication failed", - "content": { - "application/json": { - "schema": { - "$ref": "#/components/schemas/ErrorResponse" - } - } - } - }, - "404": { - "description": "Not Found", - "content": { - "application/json": { - "schema": { - "$ref": "#/components/schemas/NotFoundResponse" - } - } - } - }, - "200": { - "description": "successful operation", - "content": { - "application/json": { - "schema": { - "$ref": "#/components/schemas/UserRelationGlobalPermissionGroupGetResponse" - } - } - } - } - }, - "security": [ - { - "bearerAuth": [ - [ - "permUserRead" - ] - ] - } - ], - "description": "GET request to retrieve a single object.", - "parameters": [ - { - "name": "id", - "in": "path", - "required": true, - "schema": { - "type": "integer", - "format": "int32", - "example": 10 - } - } - ] - } - }, - "/api/v2/ui/users/{id:[0-9]+}/relationships/{relation:globalPermissionGroup}": { - "get": { - "tags": [ - "Users" - ], - "responses": { - "400": { - "description": "Invalid request", - "content": { - "application/json": { - "schema": { - "$ref": "#/components/schemas/ErrorResponse" - } - } - } - }, - "401": { - "description": "Authentication failed", - "content": { - "application/json": { - "schema": { - "$ref": "#/components/schemas/ErrorResponse" - } - } - } - }, - "404": { - "description": "Not Found", - "content": { - "application/json": { - "schema": { - "$ref": "#/components/schemas/NotFoundResponse" - } - } - } - }, - "200": { - "description": "successful operation", - "content": { - "application/json": { - "schema": { - "$ref": "#/components/schemas/UserResponse" - } - } - } - } - }, - "security": [ - { - "bearerAuth": [ - [ - "permUserRead" - ] - ] - } - ], - "description": "GET request for for a to-one relationship link. Returns the resource record of the object that is part of the specified relation.", - "parameters": [ - { - "name": "id", - "in": "path", - "required": true, - "schema": { - "type": "integer", - "format": "int32", - "example": 10 - } - } - ] - }, - "patch": { - "tags": [ - "Users" - ], - "responses": { - "400": { - "description": "Invalid request", - "content": { - "application/json": { - "schema": { - "$ref": "#/components/schemas/ErrorResponse" - } - } - } - }, - "401": { - "description": "Authentication failed", - "content": { - "application/json": { - "schema": { - "$ref": "#/components/schemas/ErrorResponse" - } - } - } - }, - "204": { - "description": "Succesfull operation" - }, - "404": { - "description": "Not Found", - "content": { - "application/json": { - "schema": { - "$ref": "#/components/schemas/NotFoundResponse" - } - } - } - } - }, - "security": [ - { - "bearerAuth": [ - [ - "permUserUpdate" - ] - ] - } - ], - "description": "", - "requestBody": { - "required": true, - "content": { - "application/json": { - "schema": { - "$ref": "#/components/schemas/UserRelationGlobalPermissionGroup" - } - } - } - }, - "parameters": [] - } - }, - "/api/v2/ui/users/{id:[0-9]+}/{relation:accessGroups}": { - "get": { - "tags": [ - "Users" - ], - "responses": { - "400": { - "description": "Invalid request", - "content": { - "application/json": { - "schema": { - "$ref": "#/components/schemas/ErrorResponse" - } - } - } - }, - "401": { - "description": "Authentication failed", - "content": { - "application/json": { - "schema": { - "$ref": "#/components/schemas/ErrorResponse" - } - } - } - }, - "404": { - "description": "Not Found", - "content": { - "application/json": { - "schema": { - "$ref": "#/components/schemas/NotFoundResponse" - } - } - } - }, - "200": { - "description": "successful operation", - "content": { - "application/json": { - "schema": { - "$ref": "#/components/schemas/UserRelationAccessGroupsGetResponse" - } - } - } - } - }, - "security": [ - { - "bearerAuth": [ - [ - "permUserRead" - ] - ] - } - ], - "description": "GET request to retrieve a single object.", - "parameters": [ - { - "name": "id", - "in": "path", - "required": true, - "schema": { - "type": "integer", - "format": "int32", - "example": 10 - } - } - ] - } - }, - "/api/v2/ui/users/{id:[0-9]+}/relationships/{relation:accessGroups}": { - "get": { - "tags": [ - "Users" - ], - "responses": { - "400": { - "description": "Invalid request", - "content": { - "application/json": { - "schema": { - "$ref": "#/components/schemas/ErrorResponse" - } - } - } - }, - "401": { - "description": "Authentication failed", - "content": { - "application/json": { - "schema": { - "$ref": "#/components/schemas/ErrorResponse" - } - } - } - }, - "404": { - "description": "Not Found", - "content": { - "application/json": { - "schema": { - "$ref": "#/components/schemas/NotFoundResponse" - } - } - } - }, - "200": { - "description": "successful operation", - "content": { - "application/json": { - "schema": { - "$ref": "#/components/schemas/UserResponse" - } - } - } - } - }, - "security": [ - { - "bearerAuth": [ - [ - "permUserRead" - ] - ] - } - ], - "description": "GET request for for a to-one relationship link. Returns the resource record of the object that is part of the specified relation.", - "parameters": [ - { - "name": "id", - "in": "path", - "required": true, - "schema": { - "type": "integer", - "format": "int32", - "example": 10 - } - } - ] - }, - "patch": { - "tags": [ - "Users" - ], - "responses": { - "400": { - "description": "Invalid request", - "content": { - "application/json": { - "schema": { - "$ref": "#/components/schemas/ErrorResponse" - } - } - } - }, - "401": { - "description": "Authentication failed", - "content": { - "application/json": { - "schema": { - "$ref": "#/components/schemas/ErrorResponse" - } - } - } - }, - "204": { - "description": "Succesfull operation" - }, - "404": { - "description": "Not Found", - "content": { - "application/json": { - "schema": { - "$ref": "#/components/schemas/NotFoundResponse" - } - } - } - } - }, - "security": [ - { - "bearerAuth": [ - [ - "permUserUpdate" - ] - ] - } - ], - "description": "", - "requestBody": { - "required": true, - "content": { - "application/json": { - "schema": { - "$ref": "#/components/schemas/UserRelationAccessGroups" - } - } - } - }, - "parameters": [] - }, - "post": { - "tags": [ - "Users" - ], - "responses": { - "400": { - "description": "Invalid request", - "content": { - "application/json": { - "schema": { - "$ref": "#/components/schemas/ErrorResponse" - } - } - } - }, - "401": { - "description": "Authentication failed", - "content": { - "application/json": { - "schema": { - "$ref": "#/components/schemas/ErrorResponse" - } - } - } - }, - "204": { - "description": "successfully created" - }, - "404": { - "description": "Not Found", - "content": { - "application/json": { - "schema": { - "$ref": "#/components/schemas/NotFoundResponse" - } - } - } - } - }, - "security": [ - { - "bearerAuth": [ - [ - "permUserCreate" - ] - ] - } - ], - "description": "", - "requestBody": { - "required": true, - "content": { - "application/json": [] - } - }, - "parameters": [] - }, - "delete": { - "tags": [ - "Users" - ], - "responses": { - "400": { - "description": "Invalid request", - "content": { - "application/json": { - "schema": { - "$ref": "#/components/schemas/ErrorResponse" - } - } - } - }, - "401": { - "description": "Authentication failed", - "content": { - "application/json": { - "schema": { - "$ref": "#/components/schemas/ErrorResponse" - } - } - } - }, - "204": { - "description": "successfully deleted" - }, - "404": { - "description": "Not Found", - "content": { - "application/json": { - "schema": { - "$ref": "#/components/schemas/NotFoundResponse" - } - } - } - } - }, - "security": [ - { - "bearerAuth": [ - [ - "permUserDelete" - ] - ] - } - ], - "description": "", - "requestBody": { - "required": true, - "content": { - "application/json": { - "schema": { - "$ref": "#/components/schemas/UserRelationAccessGroups" - } - } - } - }, - "parameters": [] - } - }, - "/api/v2/ui/users/{id:[0-9]+}": { - "get": { - "tags": [ - "Users" - ], - "responses": { - "400": { - "description": "Invalid request", - "content": { - "application/json": { - "schema": { - "$ref": "#/components/schemas/ErrorResponse" - } - } - } - }, - "401": { - "description": "Authentication failed", - "content": { - "application/json": { - "schema": { - "$ref": "#/components/schemas/ErrorResponse" - } - } - } - }, - "404": { - "description": "Not Found", - "content": { - "application/json": { - "schema": { - "$ref": "#/components/schemas/NotFoundResponse" - } - } - } - }, - "200": { - "description": "successful operation", - "content": { - "application/json": { - "schema": { - "$ref": "#/components/schemas/UserResponse" - } - } - } - } - }, - "security": [ - { - "bearerAuth": [ - [ - "permUserRead" - ] - ] - } - ], - "description": "GET request to retrieve a single object.", - "parameters": [ - { - "name": "id", - "in": "path", - "required": true, - "schema": { - "type": "integer", - "format": "int32", - "example": 10 - } - }, - { - "name": "include", - "in": "query", - "schema": { - "type": "string" - }, - "description": "Items to include. Comma seperated" - } - ] - }, - "patch": { - "tags": [ - "Users" - ], - "responses": { - "400": { - "description": "Invalid request", - "content": { - "application/json": { - "schema": { - "$ref": "#/components/schemas/ErrorResponse" - } - } - } - }, - "401": { - "description": "Authentication failed", - "content": { - "application/json": { - "schema": { - "$ref": "#/components/schemas/ErrorResponse" - } - } - } - }, - "404": { - "description": "Not Found", - "content": { - "application/json": { - "schema": { - "$ref": "#/components/schemas/NotFoundResponse" - } - } - } - }, - "200": { - "description": "successful operation", - "content": { - "application/json": { - "schema": { - "$ref": "#/components/schemas/UserPostPatchResponse" - } - } - } - } - }, - "security": [ - { - "bearerAuth": [ - [ - "permUserUpdate" - ] - ] - } - ], - "description": "PATCH request to update attributes of a single object.", - "requestBody": { - "required": true, - "content": { - "application/json": { - "schema": { - "$ref": "#/components/schemas/UserPatch" - } - } - } - }, - "parameters": [] - }, - "delete": { - "tags": [ - "Users" - ], - "responses": { - "400": { - "description": "Invalid request", - "content": { - "application/json": { - "schema": { - "$ref": "#/components/schemas/ErrorResponse" - } - } - } - }, - "401": { - "description": "Authentication failed", - "content": { - "application/json": { - "schema": { - "$ref": "#/components/schemas/ErrorResponse" - } - } - } - }, - "404": { - "description": "Not Found", - "content": { - "application/json": { - "schema": { - "$ref": "#/components/schemas/NotFoundResponse" - } - } - } - }, - "204": { - "description": "successfully deleted" - } - }, - "security": [ - { - "bearerAuth": [ - [ - "permUserDelete" - ] - ] - } - ], - "description": "", - "requestBody": { - "required": true, - "content": { - "application/json": [] - } - }, - "parameters": [] - } - }, - "/api/v2/ui/vouchers": { - "get": { - "tags": [ - "RegVouchers" - ], - "responses": { - "400": { - "description": "Invalid request", - "content": { - "application/json": { - "schema": { - "$ref": "#/components/schemas/ErrorResponse" - } - } - } - }, - "401": { - "description": "Authentication failed", - "content": { - "application/json": { - "schema": { - "$ref": "#/components/schemas/ErrorResponse" - } - } - } - }, - "200": { - "description": "successful operation", - "content": { - "application/json": { - "schema": { - "type": "array", - "items": { - "$ref": "#/components/schemas/RegVoucherResponse" - } - } - } - } - } - }, - "security": [ - { - "bearerAuth": [ - [ - "permRegVoucherRead" - ] - ] - } - ], - "description": "GET many request to retrieve multiple objects.", - "parameters": [ - { - "name": "page[after]", - "in": "path", - "schema": { - "type": "integer", - "format": "int32" - }, - "example": 0, - "description": "Pointer to paginate to retrieve the data after the value provided" - }, - { - "name": "page[before]", - "in": "path", - "schema": { - "type": "integer", - "format": "int32" - }, - "example": 0, - "description": "Pointer to paginate to retrieve the data before the value provided" - }, - { - "name": "page[size]", - "in": "path", - "schema": { - "type": "integer", - "format": "int32" - }, - "example": 100, - "description": "Amout of data to retrieve inside a single page" - }, - { - "name": "filter", - "in": "path", - "style": "deepobject", - "explode": true, - "schema": { - "type": "object" - }, - "description": "Filters results using a query", - "example": "\"filter[hashlistId__gt]\": 200" - }, - { - "name": "include", - "in": "path", - "schema": { - "type": "string" - }, - "description": "Items to include, comma seperated. Possible options: " - } - ] - }, - "post": { - "tags": [ - "RegVouchers" - ], - "responses": { - "400": { - "description": "Invalid request", - "content": { - "application/json": { - "schema": { - "$ref": "#/components/schemas/ErrorResponse" - } - } - } - }, - "401": { - "description": "Authentication failed", - "content": { - "application/json": { - "schema": { - "$ref": "#/components/schemas/ErrorResponse" - } - } - } - }, - "201": { - "description": "successful operation", - "content": { - "application/json": { - "schema": { - "$ref": "#/components/schemas/RegVoucherPostPatchResponse" - } - } - } - } - }, - "security": [ - { - "bearerAuth": [ - [ - "permRegVoucherCreate" - ] - ] - } - ], - "description": "POST request to create a new object. The request must contain the resource record as data with the attributes of the new object.To add relationships, a relationships object can be added with the resource records of the relations that are part of this object.", - "requestBody": { - "required": true, - "content": { - "application/json": { - "schema": { - "$ref": "#/components/schemas/RegVoucherCreate" - } - } - } - }, - "parameters": [] - }, - "patch": { - "tags": [ - "RegVouchers" - ], - "responses": { - "400": { - "description": "Invalid request", - "content": { - "application/json": { - "schema": { - "$ref": "#/components/schemas/ErrorResponse" - } - } - } - }, - "401": { - "description": "Authentication failed", - "content": { - "application/json": { - "schema": { - "$ref": "#/components/schemas/ErrorResponse" - } - } - } - } - }, - "security": [ - { - "bearerAuth": [ - [ - "permRegVoucherUpdate" - ] - ] - } - ], - "description": "PATCH request to update attributes of a single object.", - "parameters": [] - }, - "delete": { - "tags": [ - "RegVouchers" - ], - "responses": { - "400": { - "description": "Invalid request", - "content": { - "application/json": { - "schema": { - "$ref": "#/components/schemas/ErrorResponse" - } - } - } - }, - "401": { - "description": "Authentication failed", - "content": { - "application/json": { - "schema": { - "$ref": "#/components/schemas/ErrorResponse" - } - } - } - } - }, - "security": [ - { - "bearerAuth": [ - [ - "permRegVoucherDelete" - ] - ] - } - ], - "description": "", - "parameters": [] - } - }, - "/api/v2/ui/vouchers/count": { - "get": { - "tags": [ - "RegVouchers" - ], - "responses": { - "400": { - "description": "Invalid request", - "content": { - "application/json": { - "schema": { - "$ref": "#/components/schemas/ErrorResponse" - } - } - } - }, - "401": { - "description": "Authentication failed", - "content": { - "application/json": { - "schema": { - "$ref": "#/components/schemas/ErrorResponse" - } - } - } - }, - "200": { - "description": "successful operation", - "content": { - "application/json": { - "schema": { - "type": "array", - "items": { - "$ref": "#/components/schemas/RegVoucherResponse" - } - } - } - } - } - }, - "security": [ - { - "bearerAuth": [ - [ - "permRegVoucherRead" - ] - ] - } - ], - "description": "GET many request to retrieve multiple objects.", - "parameters": [ - { - "name": "page[after]", - "in": "path", - "schema": { - "type": "integer", - "format": "int32" - }, - "example": 0, - "description": "Pointer to paginate to retrieve the data after the value provided" - }, - { - "name": "page[before]", - "in": "path", - "schema": { - "type": "integer", - "format": "int32" - }, - "example": 0, - "description": "Pointer to paginate to retrieve the data before the value provided" - }, - { - "name": "page[size]", - "in": "path", - "schema": { - "type": "integer", - "format": "int32" - }, - "example": 100, - "description": "Amout of data to retrieve inside a single page" - }, - { - "name": "filter", - "in": "path", - "style": "deepobject", - "explode": true, - "schema": { - "type": "object" - }, - "description": "Filters results using a query", - "example": "\"filter[hashlistId__gt]\": 200" - }, - { - "name": "include", - "in": "path", - "schema": { - "type": "string" - }, - "description": "Items to include, comma seperated. Possible options: " - } - ] - } - }, - "/api/v2/ui/vouchers/{id:[0-9]+}": { - "get": { - "tags": [ - "RegVouchers" - ], - "responses": { - "400": { - "description": "Invalid request", - "content": { - "application/json": { - "schema": { - "$ref": "#/components/schemas/ErrorResponse" - } - } - } - }, - "401": { - "description": "Authentication failed", - "content": { - "application/json": { - "schema": { - "$ref": "#/components/schemas/ErrorResponse" - } - } - } - }, - "404": { - "description": "Not Found", - "content": { - "application/json": { - "schema": { - "$ref": "#/components/schemas/NotFoundResponse" - } - } - } - }, - "200": { - "description": "successful operation", - "content": { - "application/json": { - "schema": { - "$ref": "#/components/schemas/RegVoucherResponse" - } - } - } - } - }, - "security": [ - { - "bearerAuth": [ - [ - "permRegVoucherRead" - ] - ] - } - ], - "description": "GET request to retrieve a single object.", - "parameters": [ - { - "name": "id", - "in": "path", - "required": true, - "schema": { - "type": "integer", - "format": "int32", - "example": 10 - } - }, - { - "name": "include", - "in": "query", - "schema": { - "type": "string" - }, - "description": "Items to include. Comma seperated" - } - ] - }, - "patch": { - "tags": [ - "RegVouchers" - ], - "responses": { - "400": { - "description": "Invalid request", - "content": { - "application/json": { - "schema": { - "$ref": "#/components/schemas/ErrorResponse" - } - } - } - }, - "401": { - "description": "Authentication failed", - "content": { - "application/json": { - "schema": { - "$ref": "#/components/schemas/ErrorResponse" - } - } - } - }, - "404": { - "description": "Not Found", - "content": { - "application/json": { - "schema": { - "$ref": "#/components/schemas/NotFoundResponse" - } - } - } - }, - "200": { - "description": "successful operation", - "content": { - "application/json": { - "schema": { - "$ref": "#/components/schemas/RegVoucherPostPatchResponse" - } - } - } - } - }, - "security": [ - { - "bearerAuth": [ - [ - "permRegVoucherUpdate" - ] - ] - } - ], - "description": "PATCH request to update attributes of a single object.", - "requestBody": { - "required": true, - "content": { - "application/json": { - "schema": { - "$ref": "#/components/schemas/RegVoucherPatch" - } - } - } - }, - "parameters": [] - }, - "delete": { - "tags": [ - "RegVouchers" - ], - "responses": { - "400": { - "description": "Invalid request", - "content": { - "application/json": { - "schema": { - "$ref": "#/components/schemas/ErrorResponse" - } - } - } - }, - "401": { - "description": "Authentication failed", - "content": { - "application/json": { - "schema": { - "$ref": "#/components/schemas/ErrorResponse" - } - } - } - }, - "404": { - "description": "Not Found", - "content": { - "application/json": { - "schema": { - "$ref": "#/components/schemas/NotFoundResponse" - } - } - } - }, - "204": { - "description": "successfully deleted" - } - }, - "security": [ - { - "bearerAuth": [ - [ - "permRegVoucherDelete" - ] - ] - } - ], - "description": "", - "requestBody": { - "required": true, - "content": { - "application/json": [] - } - }, - "parameters": [] - } - }, - "/api/v2/helper/abortChunk": { - "post": { - "description": "Endpoint to stop a running chunk.
      ", - "requestBody": { - "description": "ChunkID is the ID of the chunk that needs to be aborted.
      ", - "required": true, - "content": { - "application/json": { - "schema": { - "$ref": "#/components/schemas/AbortChunkHelperAPI" - } - } - } - }, - "responses": { - "200": { - "description": "successful operation", - "content": { - "application/json": { - "schema": { - "$ref": "#/components/schemas/AbortChunkHelperAPIResponse" - } - } - } - } - } - } - }, - "/api/v2/helper/assignAgent": { - "post": { - "description": "This endpoint is responsible for assigning a task to a specific agent.
      ", - "requestBody": { - "description": "The agentId is the Id of the agent that has to be assigned to the task.
      The taskId is the Id of the task that will be assigned to the agent. If this is set to 0,
      the agent will be unassigned from its current assigned task.
      ", - "required": true, - "content": { - "application/json": { - "schema": { - "$ref": "#/components/schemas/AssignAgentHelperAPI" - } - } - } - }, - "responses": { - "200": { - "description": "successful operation", - "content": { - "application/json": { - "schema": { - "$ref": "#/components/schemas/AssignAgentHelperAPIResponse" - } - } - } - } - } - } - }, - "/api/v2/helper/changeOwnPassword": { - "post": { - "description": "Endpoint to set a password of an user.
      ", - "requestBody": { - "description": "oldPassword is the current password of the user.
      newPassword is the new password that you want to set.
      confirmPassword is the new password again to confirm it.
      ", - "required": true, - "content": { - "application/json": { - "schema": { - "$ref": "#/components/schemas/ChangeOwnPasswordHelperAPI" - } - } - } - }, - "responses": { - "200": { - "description": "successful operation", - "content": { - "application/json": { - "schema": { - "$ref": "#/components/schemas/ChangeOwnPasswordHelperAPIResponse" - } - } - } - } - } - } - }, - "/api/v2/helper/createSupertask": { - "post": { - "description": "Endpoint to create a supertask from a supertask template
      ", - "requestBody": { - "description": "supertaskTemplateId is the the Id of the supertakstemplate of which you want to create a supertask of.
      hashlistId is the Id of the hashlist that has to be used for the supertask.
      crackerVersionId is the Id of the crackerversion that is used for the created supertask.
      ", - "required": true, - "content": { - "application/json": { - "schema": { - "$ref": "#/components/schemas/CreateSupertaskHelperAPI" - } - } - } - }, - "responses": { - "200": { - "description": "successful operation", - "content": { - "application/json": { - "schema": { - "$ref": "#/components/schemas/TaskWrapperSingleResponse" - } - } - } - } - } - } - }, - "/api/v2/helper/createSuperHashlist": { - "post": { - "description": "Endpoint to create a super hashlist from multiple hashlists
      ", - "requestBody": { - "description": "Hashlistids is an array of hashlist ids of the hashlists that have to be combined into a superhashlist.
      Name is the name of the newly created superhashlist.
      ", - "required": true, - "content": { - "application/json": { - "schema": { - "$ref": "#/components/schemas/CreateSuperHashlistHelperAPI" - } - } - } - }, - "responses": { - "200": { - "description": "successful operation", - "content": { - "application/json": { - "schema": { - "$ref": "#/components/schemas/HashlistSingleResponse" - } - } - } - } - } - } - }, - "/api/v2/helper/exportCrackedHashes": { - "post": { - "description": "Endpoint to export cracked hashes.
      ", - "requestBody": { - "description": "hashlistId is the Id of the hashlist where you want to export the hashes of.
      ", - "required": true, - "content": { - "application/json": { - "schema": { - "$ref": "#/components/schemas/ExportCrackedHashesHelperAPI" - } - } - } - }, - "responses": { - "200": { - "description": "successful operation", - "content": { - "application/json": { - "schema": { - "$ref": "#/components/schemas/FileSingleResponse" - } - } - } - } - } - } - }, - "/api/v2/helper/exportLeftHashes": { - "post": { - "description": "Endpoint to export uncracked hashes of a hashlist.
      ", - "requestBody": { - "description": "hashlistId is the id of the hashlist where you want to export the uncracked hashes of.
      ", - "required": true, - "content": { - "application/json": { - "schema": { - "$ref": "#/components/schemas/ExportLeftHashesHelperAPI" - } - } - } - }, - "responses": { - "200": { - "description": "successful operation", - "content": { - "application/json": { - "schema": { - "$ref": "#/components/schemas/FileSingleResponse" - } - } - } - } - } - } - }, - "/api/v2/helper/exportWordlist": { - "post": { - "description": "Endpoint to export a wordlist of the cracked hashes inside a hashlist.
      ", - "requestBody": { - "description": "hashlistId is the Id of the hashlist where you want to export the wordlist of.
      ", - "required": true, - "content": { - "application/json": { - "schema": { - "$ref": "#/components/schemas/ExportWordlistHelperAPI" - } - } - } - }, - "responses": { - "200": { - "description": "successful operation", - "content": { - "application/json": { - "schema": { - "$ref": "#/components/schemas/FileSingleResponse" - } - } - } - } - } - } - }, - "/api/v2/helper/getAccessGroups": { - "get": { - "description": "", - "parameters": [], - "responses": { - "200": { - "description": "successful operation" - } - } - } - }, - "/api/v2/helper/getFile": { - "get": { - "description": "Endpoint to download files
      ", - "parameters": [ - { - "in": "query", - "name": "file", - "schema": { - "type": "integer", - "format": "int32" - }, - "required": true, - "example": 1, - "description": "The ID of the file to download." - } - ], - "responses": { - "200": { - "description": "successful operation" - } - } - } - }, - "/api/v2/helper/getUserPermission": { - "get": { - "description": "", - "parameters": [], - "responses": { - "200": { - "description": "successful operation" - } - } - } - }, - "/api/v2/helper/importCrackedHashes": { - "post": { - "description": "Endpoint to import cracked hashes into a hashlist.
      ", - "requestBody": { - "description": "HashlistId is the Id of the hashlist where you want to import the cracked hashes into.
      SourceData is the cracked hashes you want to import.
      Seperator is the seperator that has been used for the salt in the hashes.
      ", - "required": true, - "content": { - "application/json": { - "schema": { - "$ref": "#/components/schemas/ImportCrackedHashesHelperAPI" - } - } - } - }, - "responses": { - "200": { - "description": "successful operation", - "content": { - "application/json": { - "schema": { - "$ref": "#/components/schemas/ImportCrackedHashesHelperAPIResponse" - } - } - } - } - } - } - }, - "/api/v2/helper/importFile": { - "post": { - "description": " File import API
      Based on TUS protocol: https://tus.io/protocols/resumable-upload.html

      1) Client 'Announce' file at ./api/v2/helper/importFile'
      - Ensure Upload-Metadata: filename= base64-encoded-filename is set
      2) Server checks filename does not exists yet:
      - Checked not part of ongoing transfer (.part / .metatadata in import directory)
      - Checked not uploaded yet (import/)
      If all conditions are met, upload is created and user informed about UUID to push to.
      3) Client pushes parts to ./api/v2/ui/files/
      - Checked if upload timeout is not expired
      4) Server check if upload is completed
      - Checked if not present yet (import/)
      - Marks file and stores as import/
      ", - "requestBody": { - "description": "Import file has no POST parameters
      ", - "required": true, - "content": { - "application/json": { - "schema": { - "$ref": "#/components/schemas/ImportFileHelperAPI" - } - } - } - }, - "parameters": [ - { - "name": "Upload-Metadata", - "in": "header", - "required": "true", - "schema": { - "type": "string", - "pattern": "^([a-zA-Z0-9]+ [A-Za-z0-9+/=]+)(,[a-zA-Z0-9]+ [A-Za-z0-9+/=]+)*$" - }, - "example": "filename ZXhhbXBsZS50eHQ=", - "description": " The Upload-Metadata header contains one or more comma-separated key-value pairs.\n Each pair is formatted as ` `, where:\n - `key` is a string without spaces.\n - `value` is base64-encoded" - }, - { - "name": "Upload-Length", - "in": "header", - "schema": { - "type": "integer", - "minimum": 1 - }, - "example": 10000, - "description": "The total size of the upload in bytes. Must be a positive integer.\n Required if `Upload-Defer-Length` is not set." - }, - { - "name": "Upload-Defer-Length", - "in": "header", - "schema": { - "type": "integer" - }, - "example": 1, - "description": "Indicates that the upload length is not known at creation time.\n Value must be `1`. If present, `Upload-Length` must be omitted." - } - ], - "responses": { - "201": { - "description": "succesful operation", - "headers": { - "Tus-Resumable": { - "description": "Indicates the TUS version the server supports.\n Must always be set to `1.0.0` in compliant servers.", - "schema": { - "type": "string", - "enum": "enum: ['1.0.0']" - } - }, - "Location": { - "description": "Location of the file where the user can push to.", - "schema": { - "type": "string" - } - } - }, - "content": { - "application/pdf": { - "type": "string", - "format": "binary" - } - } - } - } - } - }, - "/api/v2/helper/importFile/{id:[0-9]{14}-[0-9a-f]{32}}": { - "head": { - "description": "A HEAD request is used in the TUS protocol to determine the offset at which the upload should be continued.
      And to retrieve the upload status.
      ", - "responses": { - "200": { - "description": "sucessful request", - "headers": { - "Tus-Resumable": { - "description": "Indicates the TUS version the server supports.\n Must always be set to `1.0.0` in compliant servers.", - "schema": { - "type": "string", - "enum": "enum: ['1.0.0']" - } - }, - "Upload-Offset": { - "description": "Number of bytes already received", - "schema": { - "type": "integer" - } - }, - "Upload-Length": { - "description": "Total upload length (if known)", - "schema": { - "type": "integer" - } - }, - "Upload-Defer-Length": { - "description": "Indicates deferred upload length (if applicable)", - "schema": { - "type": "string" - } - }, - "Upload-Metadata": { - "description": "Original metadata sent during creation", - "schema": { - "type": "string" - } - } - } - } - } - }, - "patch": { - "description": "Given the offset in the 'Upload Offset' header, the user can use this PATCH endpoint in order to resume the upload.
      ", - "parameters": [ - { - "name": "Upload-Offset", - "in": "header", - "required": "true", - "schema": { - "type": "integer" - }, - "example": "512", - "description": " The Upload-Offset header\u2019s value MUST be equal to the current offset of the resource" - }, - { - "name": "Content-Type", - "in": "header", - "required": "true", - "schema": { - "type": "string", - "enum": [ - "application/offset+octet-stream" - ] - } - } - ], - "requestBody": [ - { - "required": "true", - "description": "The binary data to push to the file", - "content": { - "application/offset+octet-stream": { - "schema": { - "type": "string", - "format": "binary" - } - } - } - } - ], - "responses": { - "204": { - "description": "Chunk accepted", - "headers": { - "Tus-Resumable": { - "description": "Indicates the TUS version the server supports.\n Must always be set to `1.0.0` in compliant servers.", - "schema": { - "type": "string", - "enum": "enum: ['1.0.0']" - } - }, - "Upload-Offset": { - "description": "The new offset after the chunk is accepted. Indicates how many bytes were received so far.", - "schema": { - "type": "integer" - } - } - } - } - } - }, - "delete": { - "description": "Endpoint to delete the file
      " - } - }, - "/api/v2/helper/purgeTask": { - "post": { - "description": "Endpoint to purge a task. Meaning all chunks of a task will be deleted and keyspace and progress will be set to 0.
      ", - "requestBody": { - "description": "taskId is the id of the task that should be purged.
      ", - "required": true, - "content": { - "application/json": { - "schema": { - "$ref": "#/components/schemas/PurgeTaskHelperAPI" - } - } - } - }, - "responses": { - "200": { - "description": "successful operation", - "content": { - "application/json": { - "schema": { - "$ref": "#/components/schemas/PurgeTaskHelperAPIResponse" - } - } - } - } - } - } - }, - "/api/v2/helper/recountFileLines": { - "post": { - "description": "Endpoint to recount files for when there is size mismatch
      ", - "requestBody": { - "description": "FileId is the id of the file that needs to be recounted.
      ", - "required": true, - "content": { - "application/json": { - "schema": { - "$ref": "#/components/schemas/RecountFileLinesHelperAPI" - } - } - } - }, - "responses": { - "200": { - "description": "successful operation", - "content": { - "application/json": { - "schema": { - "$ref": "#/components/schemas/FileSingleResponse" - } - } - } - } - } - } - }, - "/api/v2/helper/resetChunk": { - "post": { - "description": "Endpoint to reset a chunk.
      ", - "requestBody": { - "description": "chunkId is the id of the chunk which you want to reset.
      ", - "required": true, - "content": { - "application/json": { - "schema": { - "$ref": "#/components/schemas/ResetChunkHelperAPI" - } - } - } - }, - "responses": { - "200": { - "description": "successful operation", - "content": { - "application/json": { - "schema": { - "$ref": "#/components/schemas/ResetChunkHelperAPIResponse" - } - } - } - } - } - } - }, - "/api/v2/helper/resetUserPassword": { - "post": { - "description": "", - "requestBody": { - "description": "", - "required": true, - "content": { - "application/json": { - "schema": { - "$ref": "#/components/schemas/ResetUserPasswordHelperAPI" - } - } - } - }, - "responses": { - "200": { - "description": "successful operation", - "content": { - "application/json": { - "schema": { - "$ref": "#/components/schemas/ResetUserPasswordHelperAPIResponse" - } - } - } - } - } - } - }, - "/api/v2/helper/setUserPassword": { - "post": { - "description": "Endpoint to set a password of an user.
      ", - "requestBody": { - "description": "userId is the id of the user of which you want to change the password.
      password is the new password that you want to set.
      ", - "required": true, - "content": { - "application/json": { - "schema": { - "$ref": "#/components/schemas/SetUserPasswordHelperAPI" - } - } - } - }, - "responses": { - "200": { - "description": "successful operation", - "content": { - "application/json": { - "schema": { - "$ref": "#/components/schemas/SetUserPasswordHelperAPIResponse" - } - } - } - } - } - } - }, - "/api/v2/helper/unassignAgent": { - "post": { - "description": "Endpoint to unassign an agent.
      ", - "requestBody": { - "description": "agentId is the id of the agent which you want to unassign.
      ", - "required": true, - "content": { - "application/json": { - "schema": { - "$ref": "#/components/schemas/UnassignAgentHelperAPI" - } - } - } - }, - "responses": { - "200": { - "description": "successful operation", - "content": { - "application/json": { - "schema": { - "$ref": "#/components/schemas/UnassignAgentHelperAPIResponse" - } - } - } - } - } - } - }, - "/api/v2/auth/token": { - "post": { - "tags": [ - "Login" - ], - "requestBody": { - "required": true, - "content": { - "application/json": { - "schema": { - "$ref": "#/components/schemas/TokenRequest" - } - } - } - }, - "responses": { - "200": { - "description": "Success", - "content": { - "application/json": { - "schema": { - "$ref": "#/components/schemas/Token" - } - } - } - }, - "401": { - "description": "Authentication failed", - "content": { - "application/json": { - "schema": { - "$ref": "#/components/schemas/ErrorResponse" - } - } - } - }, - "404": { - "description": "Not Found", - "content": { - "application/json": { - "schema": { - "$ref": "#/components/schemas/NotFoundResponse" - } - } - } - } - }, - "security": [ - { - "basicAuth": [] - } - ] - } - } - }, - "components": { - "schemas": { - "ListResponse": { - "type": "object", - "properties": { - "expand": { - "type": "string", - "example": "hashlist" - }, - "page[after]": { - "type": "integer", - "example": 0 - }, - "page[before]": { - "type": "integer", - "example": 0 - }, - "page[size]": { - "type": "integer", - "example": 100 - } - } - }, - "ErrorResponse": { - "type": "object", - "properties": { - "title": { - "type": "string", - "example": "about=>blank" - }, - "type": { - "type": "string", - "example": "Error details here" - }, - "status": { - "type": "integer", - "example": 400 - } - } - }, - "NotFoundResponse": { - "type": "object", - "properties": { - "message": { - "type": "string", - "example": "404 Not Found" - }, - "exception": { - "type": "object", - "properties": { - "type": { - "type": "string", - "example": "Slim\\Exception\\HttpNotFoundException" - }, - "code": { - "type": "integer", - "example": 404 - }, - "message": { - "type": "string", - "example": "Not Found" - }, - "file": { - "type": "string", - "example": "../hashtopolis/server/vendor/slim/slim/Slim/Middleware/RoutingMiddleware.php" - }, - "line": { - "type": "integer", - "example": 91 - } - } - } - } - }, - "AccessGroupCreate": { - "type": "object", - "properties": { - "data": { - "type": "object", - "properties": { - "type": { - "type": "string", - "default": "AccessGroup" - }, - "attributes": { - "type": "object", - "properties": { - "groupName": { - "type": "string" - } - } - } - } - } - } - }, - "AccessGroupPatch": { - "type": "object", - "properties": { - "data": { - "type": "object", - "properties": { - "type": { - "type": "string", - "default": "AccessGroup" - }, - "attributes": { - "type": "object", - "properties": { - "groupName": { - "type": "string" - } - } - } - } - } - } - }, - "AccessGroupResponse": { - "type": "object", - "properties": { - "jsonapi": { - "type": "object", - "properties": { - "version": { - "type": "string", - "default": "1.1" - }, - "ext": { - "type": "string", - "default": "https://jsonapi.org/profiles/ethanresnick/cursor-pagination" - } - } - }, - "links": { - "type": "object", - "properties": { - "self": { - "type": "string", - "default": "/api/v2/ui/accessgroups?page[size]=25" - }, - "first": { - "type": "string", - "default": "/api/v2/ui/accessgroups?page[size]=25&page[after]=0" - }, - "last": { - "type": "string", - "default": "/api/v2/ui/accessgroups?page[size]=25&page[before]=500" - }, - "next": { - "type": "string", - "default": "/api/v2/ui/accessgroups?page[size]=25&page[after]=25" - }, - "previous": { - "type": "string", - "default": "/api/v2/ui/accessgroups?page[size]=25&page[before]=25" - } - } - }, - "data": { - "type": "array", - "items": { - "type": "object", - "properties": { - "id": { - "type": "integer" - }, - "type": { - "type": "string", - "default": "AccessGroup" - }, - "attributes": { - "type": "object", - "properties": { - "groupName": { - "type": "string" - } - } - } - } - } - }, - "relationships": { - "type": "object", - "properties": [ - { - "properties": { - "agentMembers": { - "type": "object", - "properties": { - "links": { - "type": "object", - "properties": { - "self": { - "type": "string", - "default": "/api/v2/ui/accessgroups/relationships/agentMembers" - }, - "related": { - "type": "string", - "default": "/api/v2/ui/accessgroups/agentMembers" - } - } - } - } - } - } - }, - { - "properties": { - "userMembers": { - "type": "object", - "properties": { - "links": { - "type": "object", - "properties": { - "self": { - "type": "string", - "default": "/api/v2/ui/accessgroups/relationships/userMembers" - }, - "related": { - "type": "string", - "default": "/api/v2/ui/accessgroups/userMembers" - } - } - } - } - } - } - } - ] - }, - "included": { - "type": "array", - "items": { - "type": "object", - "properties": [ - { - "properties": { - "id": { - "type": "integer" - }, - "type": { - "type": "string", - "default": "userMembers" - }, - "attributes": { - "type": "object", - "properties": { - "id": { - "type": "integer" - }, - "name": { - "type": "string" - }, - "email": { - "type": "string" - }, - "passwordHash": { - "type": "string" - }, - "passwordSalt": { - "type": "string" - }, - "isValid": { - "type": "boolean" - }, - "isComputedPassword": { - "type": "boolean" - }, - "lastLoginDate": { - "type": "integer", - "format": "int64" - }, - "registeredSince": { - "type": "integer", - "format": "int64" - }, - "sessionLifetime": { - "type": "integer" - }, - "globalPermissionGroupId": { - "type": "integer" - }, - "yubikey": { - "type": "string" - }, - "otp1": { - "type": "string" - }, - "otp2": { - "type": "string" - }, - "otp3": { - "type": "string" - }, - "otp4": { - "type": "string" - } - } - } - } - }, - { - "properties": { - "id": { - "type": "integer" - }, - "type": { - "type": "string", - "default": "agentMembers" - }, - "attributes": { - "type": "object", - "properties": { - "agentId": { - "type": "integer" - }, - "agentName": { - "type": "string" - }, - "uid": { - "type": "string" - }, - "os": { - "type": "integer" - }, - "devices": { - "type": "string" - }, - "cmdPars": { - "type": "string" - }, - "ignoreErrors": { - "type": "integer", - "enum": [ - 0, - 1, - 2 - ] - }, - "isActive": { - "type": "boolean" - }, - "isTrusted": { - "type": "boolean" - }, - "token": { - "type": "string" - }, - "lastAct": { - "type": "string" - }, - "lastTime": { - "type": "integer", - "format": "int64" - }, - "lastIp": { - "type": "string" - }, - "userId": { - "type": "integer" - }, - "cpuOnly": { - "type": "boolean" - }, - "clientSignature": { - "type": "string" - } - } - } - } - } - ] - } - } - } - }, - "AccessGroupRelation": { - "type": "object", - "properties": { - "data": { - "type": "object", - "properties": { - "type": { - "type": "string", - "default": null - }, - "id": { - "type": "integer", - "default": 1 - } - } - } - } - }, - "AccessGroupRelationGetResponse": { - "type": "object", - "properties": { - "data": { - "type": "object", - "properties": { - "type": { - "type": "string", - "default": null - }, - "id": { - "type": "integer", - "default": 1 - } - } - } - } - }, - "AccessGroupSingleResponse": { - "type": "object", - "properties": { - "data": { - "type": "array", - "items": { - "type": "object", - "properties": { - "id": { - "type": "integer" - }, - "type": { - "type": "string", - "default": "AccessGroup" - }, - "attributes": { - "type": "object", - "properties": { - "groupName": { - "type": "string" - } - } - } - } - } - }, - "relationships": { - "type": "object", - "properties": [ - { - "properties": { - "agentMembers": { - "type": "object", - "properties": { - "links": { - "type": "object", - "properties": { - "self": { - "type": "string", - "default": "/api/v2/ui/accessgroups/relationships/agentMembers" - }, - "related": { - "type": "string", - "default": "/api/v2/ui/accessgroups/agentMembers" - } - } - } - } - } - } - }, - { - "properties": { - "userMembers": { - "type": "object", - "properties": { - "links": { - "type": "object", - "properties": { - "self": { - "type": "string", - "default": "/api/v2/ui/accessgroups/relationships/userMembers" - }, - "related": { - "type": "string", - "default": "/api/v2/ui/accessgroups/userMembers" - } - } - } - } - } - } - } - ] - }, - "included": { - "type": "array", - "items": { - "type": "object", - "properties": [ - { - "properties": { - "id": { - "type": "integer" - }, - "type": { - "type": "string", - "default": "userMembers" - }, - "attributes": { - "type": "object", - "properties": { - "id": { - "type": "integer" - }, - "name": { - "type": "string" - }, - "email": { - "type": "string" - }, - "passwordHash": { - "type": "string" - }, - "passwordSalt": { - "type": "string" - }, - "isValid": { - "type": "boolean" - }, - "isComputedPassword": { - "type": "boolean" - }, - "lastLoginDate": { - "type": "integer", - "format": "int64" - }, - "registeredSince": { - "type": "integer", - "format": "int64" - }, - "sessionLifetime": { - "type": "integer" - }, - "globalPermissionGroupId": { - "type": "integer" - }, - "yubikey": { - "type": "string" - }, - "otp1": { - "type": "string" - }, - "otp2": { - "type": "string" - }, - "otp3": { - "type": "string" - }, - "otp4": { - "type": "string" - } - } - } - } - }, - { - "properties": { - "id": { - "type": "integer" - }, - "type": { - "type": "string", - "default": "agentMembers" - }, - "attributes": { - "type": "object", - "properties": { - "agentId": { - "type": "integer" - }, - "agentName": { - "type": "string" - }, - "uid": { - "type": "string" - }, - "os": { - "type": "integer" - }, - "devices": { - "type": "string" - }, - "cmdPars": { - "type": "string" - }, - "ignoreErrors": { - "type": "integer", - "enum": [ - 0, - 1, - 2 - ] - }, - "isActive": { - "type": "boolean" - }, - "isTrusted": { - "type": "boolean" - }, - "token": { - "type": "string" - }, - "lastAct": { - "type": "string" - }, - "lastTime": { - "type": "integer", - "format": "int64" - }, - "lastIp": { - "type": "string" - }, - "userId": { - "type": "integer" - }, - "cpuOnly": { - "type": "boolean" - }, - "clientSignature": { - "type": "string" - } - } - } - } - } - ] - } - } - } - }, - "AccessGroupPostPatchResponse": { - "type": "object", - "properties": { - "jsonapi": { - "type": "object", - "properties": { - "version": { - "type": "string", - "default": "1.1" - }, - "ext": { - "type": "string", - "default": "https://jsonapi.org/profiles/ethanresnick/cursor-pagination" - } - } - }, - "data": { - "type": "array", - "items": { - "type": "object", - "properties": { - "id": { - "type": "integer" - }, - "type": { - "type": "string", - "default": "AccessGroup" - }, - "attributes": { - "type": "object", - "properties": { - "groupName": { - "type": "string" - } - } - } - } - } - } - } - }, - "AccessGroupListResponse": { - "allOf": [ - { - "$ref": "#/components/schemas/ListResponse" - }, - { - "type": "object", - "properties": { - "values": { - "type": "array", - "items": { - "$ref": "#/components/schemas/AccessGroupResponse" - } - } - } - } - ] - }, - "AccessGroupRelationUserMembers": { - "type": "object", - "properties": { - "data": { - "type": "array", - "items": { - "type": "object", - "properties": { - "type": { - "type": "string", - "default": "userMembers" - }, - "id": { - "type": "integer", - "default": 1 - } - } - } - } - } - }, - "AccessGroupRelationUserMembersGetResponse": { - "type": "object", - "properties": { - "data": { - "type": "array", - "items": { - "type": "object", - "properties": { - "type": { - "type": "string", - "default": "userMembers" - }, - "id": { - "type": "integer", - "default": 1 - } - } - } - } - } - }, - "AccessGroupRelationAgentMembers": { - "type": "object", - "properties": { - "data": { - "type": "array", - "items": { - "type": "object", - "properties": { - "type": { - "type": "string", - "default": "agentMembers" - }, - "id": { - "type": "integer", - "default": 1 - } - } - } - } - } - }, - "AccessGroupRelationAgentMembersGetResponse": { - "type": "object", - "properties": { - "data": { - "type": "array", - "items": { - "type": "object", - "properties": { - "type": { - "type": "string", - "default": "agentMembers" - }, - "id": { - "type": "integer", - "default": 1 - } - } - } - } - } - }, - "AssignmentCreate": { - "type": "object", - "properties": { - "data": { - "type": "object", - "properties": { - "type": { - "type": "string", - "default": "Assignment" - }, - "attributes": { - "type": "object", - "properties": { - "taskId": { - "type": "integer" - }, - "agentId": { - "type": "integer" - }, - "benchmark": { - "type": "string" - } - } - } - } - } - } - }, - "AssignmentPatch": { - "type": "object", - "properties": { - "data": { - "type": "object", - "properties": { - "type": { - "type": "string", - "default": "Assignment" - }, - "attributes": { - "type": "object", - "properties": { - "agentId": { - "type": "integer" - }, - "benchmark": { - "type": "string" - }, - "taskId": { - "type": "integer" - } - } - } - } - } - } - }, - "AssignmentResponse": { - "type": "object", - "properties": { - "jsonapi": { - "type": "object", - "properties": { - "version": { - "type": "string", - "default": "1.1" - }, - "ext": { - "type": "string", - "default": "https://jsonapi.org/profiles/ethanresnick/cursor-pagination" - } - } - }, - "links": { - "type": "object", - "properties": { - "self": { - "type": "string", - "default": "/api/v2/ui/agentassignments?page[size]=25" - }, - "first": { - "type": "string", - "default": "/api/v2/ui/agentassignments?page[size]=25&page[after]=0" - }, - "last": { - "type": "string", - "default": "/api/v2/ui/agentassignments?page[size]=25&page[before]=500" - }, - "next": { - "type": "string", - "default": "/api/v2/ui/agentassignments?page[size]=25&page[after]=25" - }, - "previous": { - "type": "string", - "default": "/api/v2/ui/agentassignments?page[size]=25&page[before]=25" - } - } - }, - "data": { - "type": "array", - "items": { - "type": "object", - "properties": { - "id": { - "type": "integer" - }, - "type": { - "type": "string", - "default": "Assignment" - }, - "attributes": { - "type": "object", - "properties": { - "taskId": { - "type": "integer" - }, - "agentId": { - "type": "integer" - }, - "benchmark": { - "type": "string" - } - } - } - } - } - }, - "relationships": { - "type": "object", - "properties": [ - { - "properties": { - "agent": { - "type": "object", - "properties": { - "links": { - "type": "object", - "properties": { - "self": { - "type": "string", - "default": "/api/v2/ui/agentassignments/relationships/agent" - }, - "related": { - "type": "string", - "default": "/api/v2/ui/agentassignments/agent" - } - } - } - } - } - } - }, - { - "properties": { - "task": { - "type": "object", - "properties": { - "links": { - "type": "object", - "properties": { - "self": { - "type": "string", - "default": "/api/v2/ui/agentassignments/relationships/task" - }, - "related": { - "type": "string", - "default": "/api/v2/ui/agentassignments/task" - } - } - } - } - } - } - } - ] - }, - "included": { - "type": "array", - "items": { - "type": "object", - "properties": [ - { - "properties": { - "id": { - "type": "integer" - }, - "type": { - "type": "string", - "default": "agent" - }, - "attributes": { - "type": "object", - "properties": { - "agentId": { - "type": "integer" - }, - "agentName": { - "type": "string" - }, - "uid": { - "type": "string" - }, - "os": { - "type": "integer" - }, - "devices": { - "type": "string" - }, - "cmdPars": { - "type": "string" - }, - "ignoreErrors": { - "type": "integer", - "enum": [ - 0, - 1, - 2 - ] - }, - "isActive": { - "type": "boolean" - }, - "isTrusted": { - "type": "boolean" - }, - "token": { - "type": "string" - }, - "lastAct": { - "type": "string" - }, - "lastTime": { - "type": "integer", - "format": "int64" - }, - "lastIp": { - "type": "string" - }, - "userId": { - "type": "integer" - }, - "cpuOnly": { - "type": "boolean" - }, - "clientSignature": { - "type": "string" - } - } - } - } - }, - { - "properties": { - "id": { - "type": "integer" - }, - "type": { - "type": "string", - "default": "task" - }, - "attributes": { - "type": "object", - "properties": { - "hashlistId": { - "type": "integer" - }, - "files": { - "type": "array", - "items": { - "type": "integer" - } - }, - "taskId": { - "type": "integer" - }, - "taskName": { - "type": "string" - }, - "attackCmd": { - "type": "string" - }, - "chunkTime": { - "type": "integer" - }, - "statusTimer": { - "type": "integer" - }, - "keyspace": { - "type": "integer", - "format": "int64" - }, - "keyspaceProgress": { - "type": "integer", - "format": "int64" - }, - "priority": { - "type": "integer" - }, - "maxAgents": { - "type": "integer" - }, - "color": { - "type": "string" - }, - "isSmall": { - "type": "boolean" - }, - "isCpuTask": { - "type": "boolean" - }, - "useNewBench": { - "type": "boolean" - }, - "skipKeyspace": { - "type": "integer", - "format": "int64" - }, - "crackerBinaryId": { - "type": "integer" - }, - "crackerBinaryTypeId": { - "type": "integer" - }, - "taskWrapperId": { - "type": "integer" - }, - "isArchived": { - "type": "boolean" - }, - "notes": { - "type": "string" - }, - "staticChunks": { - "type": "integer" - }, - "chunkSize": { - "type": "integer", - "format": "int64" - }, - "forcePipe": { - "type": "boolean" - }, - "preprocessorId": { - "type": "integer" - }, - "preprocessorCommand": { - "type": "string" - } - } - } - } - } - ] - } - } - } - }, - "AssignmentRelationAgentMembers": { - "type": "object", - "properties": { - "data": { - "type": "array", - "items": { - "type": "object", - "properties": { - "type": { - "type": "string", - "default": "agentMembers" - }, - "id": { - "type": "integer", - "default": 1 - } - } - } - } - } - }, - "AssignmentRelationAgentMembersGetResponse": { - "type": "object", - "properties": { - "data": { - "type": "array", - "items": { - "type": "object", - "properties": { - "type": { - "type": "string", - "default": "agentMembers" - }, - "id": { - "type": "integer", - "default": 1 - } - } - } - } - } - }, - "AssignmentSingleResponse": { - "type": "object", - "properties": { - "data": { - "type": "array", - "items": { - "type": "object", - "properties": { - "id": { - "type": "integer" - }, - "type": { - "type": "string", - "default": "Assignment" - }, - "attributes": { - "type": "object", - "properties": { - "taskId": { - "type": "integer" - }, - "agentId": { - "type": "integer" - }, - "benchmark": { - "type": "string" - } - } - } - } - } - }, - "relationships": { - "type": "object", - "properties": [ - { - "properties": { - "agent": { - "type": "object", - "properties": { - "links": { - "type": "object", - "properties": { - "self": { - "type": "string", - "default": "/api/v2/ui/agentassignments/relationships/agent" - }, - "related": { - "type": "string", - "default": "/api/v2/ui/agentassignments/agent" - } - } - } - } - } - } - }, - { - "properties": { - "task": { - "type": "object", - "properties": { - "links": { - "type": "object", - "properties": { - "self": { - "type": "string", - "default": "/api/v2/ui/agentassignments/relationships/task" - }, - "related": { - "type": "string", - "default": "/api/v2/ui/agentassignments/task" - } - } - } - } - } - } - } - ] - }, - "included": { - "type": "array", - "items": { - "type": "object", - "properties": [ - { - "properties": { - "id": { - "type": "integer" - }, - "type": { - "type": "string", - "default": "agent" - }, - "attributes": { - "type": "object", - "properties": { - "agentId": { - "type": "integer" - }, - "agentName": { - "type": "string" - }, - "uid": { - "type": "string" - }, - "os": { - "type": "integer" - }, - "devices": { - "type": "string" - }, - "cmdPars": { - "type": "string" - }, - "ignoreErrors": { - "type": "integer", - "enum": [ - 0, - 1, - 2 - ] - }, - "isActive": { - "type": "boolean" - }, - "isTrusted": { - "type": "boolean" - }, - "token": { - "type": "string" - }, - "lastAct": { - "type": "string" - }, - "lastTime": { - "type": "integer", - "format": "int64" - }, - "lastIp": { - "type": "string" - }, - "userId": { - "type": "integer" - }, - "cpuOnly": { - "type": "boolean" - }, - "clientSignature": { - "type": "string" - } - } - } - } - }, - { - "properties": { - "id": { - "type": "integer" - }, - "type": { - "type": "string", - "default": "task" - }, - "attributes": { - "type": "object", - "properties": { - "hashlistId": { - "type": "integer" - }, - "files": { - "type": "array", - "items": { - "type": "integer" - } - }, - "taskId": { - "type": "integer" - }, - "taskName": { - "type": "string" - }, - "attackCmd": { - "type": "string" - }, - "chunkTime": { - "type": "integer" - }, - "statusTimer": { - "type": "integer" - }, - "keyspace": { - "type": "integer", - "format": "int64" - }, - "keyspaceProgress": { - "type": "integer", - "format": "int64" - }, - "priority": { - "type": "integer" - }, - "maxAgents": { - "type": "integer" - }, - "color": { - "type": "string" - }, - "isSmall": { - "type": "boolean" - }, - "isCpuTask": { - "type": "boolean" - }, - "useNewBench": { - "type": "boolean" - }, - "skipKeyspace": { - "type": "integer", - "format": "int64" - }, - "crackerBinaryId": { - "type": "integer" - }, - "crackerBinaryTypeId": { - "type": "integer" - }, - "taskWrapperId": { - "type": "integer" - }, - "isArchived": { - "type": "boolean" - }, - "notes": { - "type": "string" - }, - "staticChunks": { - "type": "integer" - }, - "chunkSize": { - "type": "integer", - "format": "int64" - }, - "forcePipe": { - "type": "boolean" - }, - "preprocessorId": { - "type": "integer" - }, - "preprocessorCommand": { - "type": "string" - } - } - } - } - } - ] - } - } - } - }, - "AssignmentPostPatchResponse": { - "type": "object", - "properties": { - "jsonapi": { - "type": "object", - "properties": { - "version": { - "type": "string", - "default": "1.1" - }, - "ext": { - "type": "string", - "default": "https://jsonapi.org/profiles/ethanresnick/cursor-pagination" - } - } - }, - "data": { - "type": "array", - "items": { - "type": "object", - "properties": { - "id": { - "type": "integer" - }, - "type": { - "type": "string", - "default": "Assignment" - }, - "attributes": { - "type": "object", - "properties": { - "taskId": { - "type": "integer" - }, - "agentId": { - "type": "integer" - }, - "benchmark": { - "type": "string" - } - } - } - } - } - } - } - }, - "AssignmentListResponse": { - "allOf": [ - { - "$ref": "#/components/schemas/ListResponse" - }, - { - "type": "object", - "properties": { - "values": { - "type": "array", - "items": { - "$ref": "#/components/schemas/AssignmentResponse" - } - } - } - } - ] - }, - "AssignmentRelationAgent": { - "type": "object", - "properties": { - "data": { - "type": "object", - "properties": { - "type": { - "type": "string", - "default": "agent" - }, - "id": { - "type": "integer", - "default": 1 - } - } - } - } - }, - "AssignmentRelationAgentGetResponse": { - "type": "object", - "properties": { - "data": { - "type": "object", - "properties": { - "type": { - "type": "string", - "default": "agent" - }, - "id": { - "type": "integer", - "default": 1 - } - } - } - } - }, - "AssignmentRelationTask": { - "type": "object", - "properties": { - "data": { - "type": "object", - "properties": { - "type": { - "type": "string", - "default": "task" - }, - "id": { - "type": "integer", - "default": 1 - } - } - } - } - }, - "AssignmentRelationTaskGetResponse": { - "type": "object", - "properties": { - "data": { - "type": "object", - "properties": { - "type": { - "type": "string", - "default": "task" - }, - "id": { - "type": "integer", - "default": 1 - } - } - } - } - }, - "AgentBinaryCreate": { - "type": "object", - "properties": { - "data": { - "type": "object", - "properties": { - "type": { - "type": "string", - "default": "AgentBinary" - }, - "attributes": { - "type": "object", - "properties": { - "type": { - "type": "string" - }, - "version": { - "type": "string" - }, - "operatingSystems": { - "type": "string" - }, - "filename": { - "type": "string" - }, - "updateTrack": { - "type": "string" - } - } - } - } - } - } - }, - "AgentBinaryPatch": { - "type": "object", - "properties": { - "data": { - "type": "object", - "properties": { - "type": { - "type": "string", - "default": "AgentBinary" - }, - "attributes": { - "type": "object", - "properties": { - "filename": { - "type": "string" - }, - "operatingSystems": { - "type": "string" - }, - "type": { - "type": "string" - }, - "updateTrack": { - "type": "string" - }, - "version": { - "type": "string" - } - } - } - } - } - } - }, - "AgentBinaryResponse": { - "type": "object", - "properties": { - "jsonapi": { - "type": "object", - "properties": { - "version": { - "type": "string", - "default": "1.1" - }, - "ext": { - "type": "string", - "default": "https://jsonapi.org/profiles/ethanresnick/cursor-pagination" - } - } - }, - "links": { - "type": "object", - "properties": { - "self": { - "type": "string", - "default": "/api/v2/ui/agentbinaries?page[size]=25" - }, - "first": { - "type": "string", - "default": "/api/v2/ui/agentbinaries?page[size]=25&page[after]=0" - }, - "last": { - "type": "string", - "default": "/api/v2/ui/agentbinaries?page[size]=25&page[before]=500" - }, - "next": { - "type": "string", - "default": "/api/v2/ui/agentbinaries?page[size]=25&page[after]=25" - }, - "previous": { - "type": "string", - "default": "/api/v2/ui/agentbinaries?page[size]=25&page[before]=25" - } - } - }, - "data": { - "type": "array", - "items": { - "type": "object", - "properties": { - "id": { - "type": "integer" - }, - "type": { - "type": "string", - "default": "AgentBinary" - }, - "attributes": { - "type": "object", - "properties": { - "type": { - "type": "string" - }, - "version": { - "type": "string" - }, - "operatingSystems": { - "type": "string" - }, - "filename": { - "type": "string" - }, - "updateTrack": { - "type": "string" - }, - "updateAvailable": { - "type": "string" - } - } - } - } - } - }, - "relationships": { - "type": "object", - "properties": [] - }, - "included": { - "type": "array", - "items": { - "type": "object", - "properties": [] - } - } - } - }, - "AgentBinaryRelationTask": { - "type": "object", - "properties": { - "data": { - "type": "object", - "properties": { - "type": { - "type": "string", - "default": "task" - }, - "id": { - "type": "integer", - "default": 1 - } - } - } - } - }, - "AgentBinaryRelationTaskGetResponse": { - "type": "object", - "properties": { - "data": { - "type": "object", - "properties": { - "type": { - "type": "string", - "default": "task" - }, - "id": { - "type": "integer", - "default": 1 - } - } - } - } - }, - "AgentBinarySingleResponse": { - "type": "object", - "properties": { - "data": { - "type": "array", - "items": { - "type": "object", - "properties": { - "id": { - "type": "integer" - }, - "type": { - "type": "string", - "default": "AgentBinary" - }, - "attributes": { - "type": "object", - "properties": { - "type": { - "type": "string" - }, - "version": { - "type": "string" - }, - "operatingSystems": { - "type": "string" - }, - "filename": { - "type": "string" - }, - "updateTrack": { - "type": "string" - }, - "updateAvailable": { - "type": "string" - } - } - } - } - } - }, - "relationships": { - "type": "object", - "properties": [] - }, - "included": { - "type": "array", - "items": { - "type": "object", - "properties": [] - } - } - } - }, - "AgentBinaryPostPatchResponse": { - "type": "object", - "properties": { - "jsonapi": { - "type": "object", - "properties": { - "version": { - "type": "string", - "default": "1.1" - }, - "ext": { - "type": "string", - "default": "https://jsonapi.org/profiles/ethanresnick/cursor-pagination" - } - } - }, - "data": { - "type": "array", - "items": { - "type": "object", - "properties": { - "id": { - "type": "integer" - }, - "type": { - "type": "string", - "default": "AgentBinary" - }, - "attributes": { - "type": "object", - "properties": { - "type": { - "type": "string" - }, - "version": { - "type": "string" - }, - "operatingSystems": { - "type": "string" - }, - "filename": { - "type": "string" - }, - "updateTrack": { - "type": "string" - }, - "updateAvailable": { - "type": "string" - } - } - } - } - } - } - } - }, - "AgentBinaryListResponse": { - "allOf": [ - { - "$ref": "#/components/schemas/ListResponse" - }, - { - "type": "object", - "properties": { - "values": { - "type": "array", - "items": { - "$ref": "#/components/schemas/AgentBinaryResponse" - } - } - } - } - ] - }, - "AgentErrorCreate": { - "type": "object", - "properties": { - "data": { - "type": "object", - "properties": { - "type": { - "type": "string", - "default": "AgentError" - }, - "attributes": { - "type": "object", - "properties": [] - } - } - } - } - }, - "AgentErrorPatch": { - "type": "object", - "properties": { - "data": { - "type": "object", - "properties": { - "type": { - "type": "string", - "default": "AgentError" - }, - "attributes": { - "type": "object", - "properties": [] - } - } - } - } - }, - "AgentErrorResponse": { - "type": "object", - "properties": { - "jsonapi": { - "type": "object", - "properties": { - "version": { - "type": "string", - "default": "1.1" - }, - "ext": { - "type": "string", - "default": "https://jsonapi.org/profiles/ethanresnick/cursor-pagination" - } - } - }, - "links": { - "type": "object", - "properties": { - "self": { - "type": "string", - "default": "/api/v2/ui/agenterrors?page[size]=25" - }, - "first": { - "type": "string", - "default": "/api/v2/ui/agenterrors?page[size]=25&page[after]=0" - }, - "last": { - "type": "string", - "default": "/api/v2/ui/agenterrors?page[size]=25&page[before]=500" - }, - "next": { - "type": "string", - "default": "/api/v2/ui/agenterrors?page[size]=25&page[after]=25" - }, - "previous": { - "type": "string", - "default": "/api/v2/ui/agenterrors?page[size]=25&page[before]=25" - } - } - }, - "data": { - "type": "array", - "items": { - "type": "object", - "properties": { - "id": { - "type": "integer" - }, - "type": { - "type": "string", - "default": "AgentError" - }, - "attributes": { - "type": "object", - "properties": { - "agentId": { - "type": "integer" - }, - "taskId": { - "type": "integer" - }, - "chunkId": { - "type": "integer" - }, - "time": { - "type": "integer", - "format": "int64" - }, - "error": { - "type": "string" - } - } - } - } - } - }, - "relationships": { - "type": "object", - "properties": [ - { - "properties": { - "task": { - "type": "object", - "properties": { - "links": { - "type": "object", - "properties": { - "self": { - "type": "string", - "default": "/api/v2/ui/agenterrors/relationships/task" - }, - "related": { - "type": "string", - "default": "/api/v2/ui/agenterrors/task" - } - } - } - } - } - } - } - ] - }, - "included": { - "type": "array", - "items": { - "type": "object", - "properties": [ - { - "properties": { - "id": { - "type": "integer" - }, - "type": { - "type": "string", - "default": "task" - }, - "attributes": { - "type": "object", - "properties": { - "hashlistId": { - "type": "integer" - }, - "files": { - "type": "array", - "items": { - "type": "integer" - } - }, - "taskId": { - "type": "integer" - }, - "taskName": { - "type": "string" - }, - "attackCmd": { - "type": "string" - }, - "chunkTime": { - "type": "integer" - }, - "statusTimer": { - "type": "integer" - }, - "keyspace": { - "type": "integer", - "format": "int64" - }, - "keyspaceProgress": { - "type": "integer", - "format": "int64" - }, - "priority": { - "type": "integer" - }, - "maxAgents": { - "type": "integer" - }, - "color": { - "type": "string" - }, - "isSmall": { - "type": "boolean" - }, - "isCpuTask": { - "type": "boolean" - }, - "useNewBench": { - "type": "boolean" - }, - "skipKeyspace": { - "type": "integer", - "format": "int64" - }, - "crackerBinaryId": { - "type": "integer" - }, - "crackerBinaryTypeId": { - "type": "integer" - }, - "taskWrapperId": { - "type": "integer" - }, - "isArchived": { - "type": "boolean" - }, - "notes": { - "type": "string" - }, - "staticChunks": { - "type": "integer" - }, - "chunkSize": { - "type": "integer", - "format": "int64" - }, - "forcePipe": { - "type": "boolean" - }, - "preprocessorId": { - "type": "integer" - }, - "preprocessorCommand": { - "type": "string" - } - } - } - } - } - ] - } - } - } - }, - "AgentErrorRelationTask": { - "type": "object", - "properties": { - "data": { - "type": "object", - "properties": { - "type": { - "type": "string", - "default": "task" - }, - "id": { - "type": "integer", - "default": 1 - } - } - } - } - }, - "AgentErrorRelationTaskGetResponse": { - "type": "object", - "properties": { - "data": { - "type": "object", - "properties": { - "type": { - "type": "string", - "default": "task" - }, - "id": { - "type": "integer", - "default": 1 - } - } - } - } - }, - "AgentErrorSingleResponse": { - "type": "object", - "properties": { - "data": { - "type": "array", - "items": { - "type": "object", - "properties": { - "id": { - "type": "integer" - }, - "type": { - "type": "string", - "default": "AgentError" - }, - "attributes": { - "type": "object", - "properties": { - "agentId": { - "type": "integer" - }, - "taskId": { - "type": "integer" - }, - "chunkId": { - "type": "integer" - }, - "time": { - "type": "integer", - "format": "int64" - }, - "error": { - "type": "string" - } - } - } - } - } - }, - "relationships": { - "type": "object", - "properties": [ - { - "properties": { - "task": { - "type": "object", - "properties": { - "links": { - "type": "object", - "properties": { - "self": { - "type": "string", - "default": "/api/v2/ui/agenterrors/relationships/task" - }, - "related": { - "type": "string", - "default": "/api/v2/ui/agenterrors/task" - } - } - } - } - } - } - } - ] - }, - "included": { - "type": "array", - "items": { - "type": "object", - "properties": [ - { - "properties": { - "id": { - "type": "integer" - }, - "type": { - "type": "string", - "default": "task" - }, - "attributes": { - "type": "object", - "properties": { - "hashlistId": { - "type": "integer" - }, - "files": { - "type": "array", - "items": { - "type": "integer" - } - }, - "taskId": { - "type": "integer" - }, - "taskName": { - "type": "string" - }, - "attackCmd": { - "type": "string" - }, - "chunkTime": { - "type": "integer" - }, - "statusTimer": { - "type": "integer" - }, - "keyspace": { - "type": "integer", - "format": "int64" - }, - "keyspaceProgress": { - "type": "integer", - "format": "int64" - }, - "priority": { - "type": "integer" - }, - "maxAgents": { - "type": "integer" - }, - "color": { - "type": "string" - }, - "isSmall": { - "type": "boolean" - }, - "isCpuTask": { - "type": "boolean" - }, - "useNewBench": { - "type": "boolean" - }, - "skipKeyspace": { - "type": "integer", - "format": "int64" - }, - "crackerBinaryId": { - "type": "integer" - }, - "crackerBinaryTypeId": { - "type": "integer" - }, - "taskWrapperId": { - "type": "integer" - }, - "isArchived": { - "type": "boolean" - }, - "notes": { - "type": "string" - }, - "staticChunks": { - "type": "integer" - }, - "chunkSize": { - "type": "integer", - "format": "int64" - }, - "forcePipe": { - "type": "boolean" - }, - "preprocessorId": { - "type": "integer" - }, - "preprocessorCommand": { - "type": "string" - } - } - } - } - } - ] - } - } - } - }, - "AgentErrorPostPatchResponse": { - "type": "object", - "properties": { - "jsonapi": { - "type": "object", - "properties": { - "version": { - "type": "string", - "default": "1.1" - }, - "ext": { - "type": "string", - "default": "https://jsonapi.org/profiles/ethanresnick/cursor-pagination" - } - } - }, - "data": { - "type": "array", - "items": { - "type": "object", - "properties": { - "id": { - "type": "integer" - }, - "type": { - "type": "string", - "default": "AgentError" - }, - "attributes": { - "type": "object", - "properties": { - "agentId": { - "type": "integer" - }, - "taskId": { - "type": "integer" - }, - "chunkId": { - "type": "integer" - }, - "time": { - "type": "integer", - "format": "int64" - }, - "error": { - "type": "string" - } - } - } - } - } - } - } - }, - "AgentErrorListResponse": { - "allOf": [ - { - "$ref": "#/components/schemas/ListResponse" - }, - { - "type": "object", - "properties": { - "values": { - "type": "array", - "items": { - "$ref": "#/components/schemas/AgentErrorResponse" - } - } - } - } - ] - }, - "AgentCreate": { - "type": "object", - "properties": { - "data": { - "type": "object", - "properties": { - "type": { - "type": "string", - "default": "Agent" - }, - "attributes": { - "type": "object", - "properties": { - "agentName": { - "type": "string" - }, - "uid": { - "type": "string" - }, - "os": { - "type": "integer" - }, - "devices": { - "type": "string" - }, - "cmdPars": { - "type": "string" - }, - "ignoreErrors": { - "type": "integer", - "enum": [ - 0, - 1, - 2 - ] - }, - "isActive": { - "type": "boolean" - }, - "isTrusted": { - "type": "boolean" - }, - "token": { - "type": "string" - }, - "userId": { - "type": "integer" - }, - "cpuOnly": { - "type": "boolean" - }, - "clientSignature": { - "type": "string" - } - } - } - } - } - } - }, - "AgentPatch": { - "type": "object", - "properties": { - "data": { - "type": "object", - "properties": { - "type": { - "type": "string", - "default": "Agent" - }, - "attributes": { - "type": "object", - "properties": { - "agentName": { - "type": "string" - }, - "clientSignature": { - "type": "string" - }, - "cmdPars": { - "type": "string" - }, - "cpuOnly": { - "type": "boolean" - }, - "devices": { - "type": "string" - }, - "ignoreErrors": { - "type": "integer", - "enum": [ - 0, - 1, - 2 - ] - }, - "isActive": { - "type": "boolean" - }, - "isTrusted": { - "type": "boolean" - }, - "os": { - "type": "integer" - }, - "token": { - "type": "string" - }, - "uid": { - "type": "string" - }, - "userId": { - "type": "integer" - } - } - } - } - } - } - }, - "AgentResponse": { - "type": "object", - "properties": { - "jsonapi": { - "type": "object", - "properties": { - "version": { - "type": "string", - "default": "1.1" - }, - "ext": { - "type": "string", - "default": "https://jsonapi.org/profiles/ethanresnick/cursor-pagination" - } - } - }, - "links": { - "type": "object", - "properties": { - "self": { - "type": "string", - "default": "/api/v2/ui/agents?page[size]=25" - }, - "first": { - "type": "string", - "default": "/api/v2/ui/agents?page[size]=25&page[after]=0" - }, - "last": { - "type": "string", - "default": "/api/v2/ui/agents?page[size]=25&page[before]=500" - }, - "next": { - "type": "string", - "default": "/api/v2/ui/agents?page[size]=25&page[after]=25" - }, - "previous": { - "type": "string", - "default": "/api/v2/ui/agents?page[size]=25&page[before]=25" - } - } - }, - "data": { - "type": "array", - "items": { - "type": "object", - "properties": { - "id": { - "type": "integer" - }, - "type": { - "type": "string", - "default": "Agent" - }, - "attributes": { - "type": "object", - "properties": { - "agentName": { - "type": "string" - }, - "uid": { - "type": "string" - }, - "os": { - "type": "integer" - }, - "devices": { - "type": "string" - }, - "cmdPars": { - "type": "string" - }, - "ignoreErrors": { - "type": "integer", - "enum": [ - 0, - 1, - 2 - ] - }, - "isActive": { - "type": "boolean" - }, - "isTrusted": { - "type": "boolean" - }, - "token": { - "type": "string" - }, - "lastAct": { - "type": "string" - }, - "lastTime": { - "type": "integer", - "format": "int64" - }, - "lastIp": { - "type": "string" - }, - "userId": { - "type": "integer" - }, - "cpuOnly": { - "type": "boolean" - }, - "clientSignature": { - "type": "string" - } - } - } - } - } - }, - "relationships": { - "type": "object", - "properties": [ - { - "properties": { - "accessGroups": { - "type": "object", - "properties": { - "links": { - "type": "object", - "properties": { - "self": { - "type": "string", - "default": "/api/v2/ui/agents/relationships/accessGroups" - }, - "related": { - "type": "string", - "default": "/api/v2/ui/agents/accessGroups" - } - } - } - } - } - } - }, - { - "properties": { - "agentErrors": { - "type": "object", - "properties": { - "links": { - "type": "object", - "properties": { - "self": { - "type": "string", - "default": "/api/v2/ui/agents/relationships/agentErrors" - }, - "related": { - "type": "string", - "default": "/api/v2/ui/agents/agentErrors" - } - } - } - } - } - } - }, - { - "properties": { - "agentStats": { - "type": "object", - "properties": { - "links": { - "type": "object", - "properties": { - "self": { - "type": "string", - "default": "/api/v2/ui/agents/relationships/agentStats" - }, - "related": { - "type": "string", - "default": "/api/v2/ui/agents/agentStats" - } - } - } - } - } - } - }, - { - "properties": { - "assignments": { - "type": "object", - "properties": { - "links": { - "type": "object", - "properties": { - "self": { - "type": "string", - "default": "/api/v2/ui/agents/relationships/assignments" - }, - "related": { - "type": "string", - "default": "/api/v2/ui/agents/assignments" - } - } - } - } - } - } - }, - { - "properties": { - "chunks": { - "type": "object", - "properties": { - "links": { - "type": "object", - "properties": { - "self": { - "type": "string", - "default": "/api/v2/ui/agents/relationships/chunks" - }, - "related": { - "type": "string", - "default": "/api/v2/ui/agents/chunks" - } - } - } - } - } - } - }, - { - "properties": { - "tasks": { - "type": "object", - "properties": { - "links": { - "type": "object", - "properties": { - "self": { - "type": "string", - "default": "/api/v2/ui/agents/relationships/tasks" - }, - "related": { - "type": "string", - "default": "/api/v2/ui/agents/tasks" - } - } - } - } - } - } - } - ] - }, - "included": { - "type": "array", - "items": { - "type": "object", - "properties": [ - { - "properties": { - "id": { - "type": "integer" - }, - "type": { - "type": "string", - "default": "accessGroups" - }, - "attributes": { - "type": "object", - "properties": { - "accessGroupId": { - "type": "integer" - }, - "groupName": { - "type": "string" - } - } - } - } - }, - { - "properties": { - "id": { - "type": "integer" - }, - "type": { - "type": "string", - "default": "agentStats" - }, - "attributes": { - "type": "object", - "properties": { - "agentStatId": { - "type": "integer" - }, - "agentId": { - "type": "integer" - }, - "statType": { - "type": "integer" - }, - "time": { - "type": "integer", - "format": "int64" - }, - "value": { - "type": "array", - "items": { - "type": "integer" - } - } - } - } - } - }, - { - "properties": { - "id": { - "type": "integer" - }, - "type": { - "type": "string", - "default": "agentErrors" - }, - "attributes": { - "type": "object", - "properties": { - "agentErrorId": { - "type": "integer" - }, - "agentId": { - "type": "integer" - }, - "taskId": { - "type": "integer" - }, - "chunkId": { - "type": "integer" - }, - "time": { - "type": "integer", - "format": "int64" - }, - "error": { - "type": "string" - } - } - } - } - }, - { - "properties": { - "id": { - "type": "integer" - }, - "type": { - "type": "string", - "default": "chunks" - }, - "attributes": { - "type": "object", - "properties": { - "chunkId": { - "type": "integer" - }, - "taskId": { - "type": "integer" - }, - "skip": { - "type": "integer" - }, - "length": { - "type": "integer" - }, - "agentId": { - "type": "integer" - }, - "dispatchTime": { - "type": "integer", - "format": "int64" - }, - "solveTime": { - "type": "integer", - "format": "int64" - }, - "checkpoint": { - "type": "integer", - "format": "int64" - }, - "progress": { - "type": "integer" - }, - "state": { - "type": "integer" - }, - "cracked": { - "type": "integer" - }, - "speed": { - "type": "integer", - "format": "int64" - } - } - } - } - }, - { - "properties": { - "id": { - "type": "integer" - }, - "type": { - "type": "string", - "default": "tasks" - }, - "attributes": { - "type": "object", - "properties": { - "hashlistId": { - "type": "integer" - }, - "files": { - "type": "array", - "items": { - "type": "integer" - } - }, - "taskId": { - "type": "integer" - }, - "taskName": { - "type": "string" - }, - "attackCmd": { - "type": "string" - }, - "chunkTime": { - "type": "integer" - }, - "statusTimer": { - "type": "integer" - }, - "keyspace": { - "type": "integer", - "format": "int64" - }, - "keyspaceProgress": { - "type": "integer", - "format": "int64" - }, - "priority": { - "type": "integer" - }, - "maxAgents": { - "type": "integer" - }, - "color": { - "type": "string" - }, - "isSmall": { - "type": "boolean" - }, - "isCpuTask": { - "type": "boolean" - }, - "useNewBench": { - "type": "boolean" - }, - "skipKeyspace": { - "type": "integer", - "format": "int64" - }, - "crackerBinaryId": { - "type": "integer" - }, - "crackerBinaryTypeId": { - "type": "integer" - }, - "taskWrapperId": { - "type": "integer" - }, - "isArchived": { - "type": "boolean" - }, - "notes": { - "type": "string" - }, - "staticChunks": { - "type": "integer" - }, - "chunkSize": { - "type": "integer", - "format": "int64" - }, - "forcePipe": { - "type": "boolean" - }, - "preprocessorId": { - "type": "integer" - }, - "preprocessorCommand": { - "type": "string" - } - } - } - } - }, - { - "properties": { - "id": { - "type": "integer" - }, - "type": { - "type": "string", - "default": "assignments" - }, - "attributes": { - "type": "object", - "properties": { - "assignmentId": { - "type": "integer" - }, - "taskId": { - "type": "integer" - }, - "agentId": { - "type": "integer" - }, - "benchmark": { - "type": "string" - } - } - } - } - } - ] - } - } - } - }, - "AgentRelationTask": { - "type": "object", - "properties": { - "data": { - "type": "object", - "properties": { - "type": { - "type": "string", - "default": "task" - }, - "id": { - "type": "integer", - "default": 1 - } - } - } - } - }, - "AgentRelationTaskGetResponse": { - "type": "object", - "properties": { - "data": { - "type": "object", - "properties": { - "type": { - "type": "string", - "default": "task" - }, - "id": { - "type": "integer", - "default": 1 - } - } - } - } - }, - "AgentSingleResponse": { - "type": "object", - "properties": { - "data": { - "type": "array", - "items": { - "type": "object", - "properties": { - "id": { - "type": "integer" - }, - "type": { - "type": "string", - "default": "Agent" - }, - "attributes": { - "type": "object", - "properties": { - "agentName": { - "type": "string" - }, - "uid": { - "type": "string" - }, - "os": { - "type": "integer" - }, - "devices": { - "type": "string" - }, - "cmdPars": { - "type": "string" - }, - "ignoreErrors": { - "type": "integer", - "enum": [ - 0, - 1, - 2 - ] - }, - "isActive": { - "type": "boolean" - }, - "isTrusted": { - "type": "boolean" - }, - "token": { - "type": "string" - }, - "lastAct": { - "type": "string" - }, - "lastTime": { - "type": "integer", - "format": "int64" - }, - "lastIp": { - "type": "string" - }, - "userId": { - "type": "integer" - }, - "cpuOnly": { - "type": "boolean" - }, - "clientSignature": { - "type": "string" - } - } - } - } - } - }, - "relationships": { - "type": "object", - "properties": [ - { - "properties": { - "accessGroups": { - "type": "object", - "properties": { - "links": { - "type": "object", - "properties": { - "self": { - "type": "string", - "default": "/api/v2/ui/agents/relationships/accessGroups" - }, - "related": { - "type": "string", - "default": "/api/v2/ui/agents/accessGroups" - } - } - } - } - } - } - }, - { - "properties": { - "agentErrors": { - "type": "object", - "properties": { - "links": { - "type": "object", - "properties": { - "self": { - "type": "string", - "default": "/api/v2/ui/agents/relationships/agentErrors" - }, - "related": { - "type": "string", - "default": "/api/v2/ui/agents/agentErrors" - } - } - } - } - } - } - }, - { - "properties": { - "agentStats": { - "type": "object", - "properties": { - "links": { - "type": "object", - "properties": { - "self": { - "type": "string", - "default": "/api/v2/ui/agents/relationships/agentStats" - }, - "related": { - "type": "string", - "default": "/api/v2/ui/agents/agentStats" - } - } - } - } - } - } - }, - { - "properties": { - "assignments": { - "type": "object", - "properties": { - "links": { - "type": "object", - "properties": { - "self": { - "type": "string", - "default": "/api/v2/ui/agents/relationships/assignments" - }, - "related": { - "type": "string", - "default": "/api/v2/ui/agents/assignments" - } - } - } - } - } - } - }, - { - "properties": { - "chunks": { - "type": "object", - "properties": { - "links": { - "type": "object", - "properties": { - "self": { - "type": "string", - "default": "/api/v2/ui/agents/relationships/chunks" - }, - "related": { - "type": "string", - "default": "/api/v2/ui/agents/chunks" - } - } - } - } - } - } - }, - { - "properties": { - "tasks": { - "type": "object", - "properties": { - "links": { - "type": "object", - "properties": { - "self": { - "type": "string", - "default": "/api/v2/ui/agents/relationships/tasks" - }, - "related": { - "type": "string", - "default": "/api/v2/ui/agents/tasks" - } - } - } - } - } - } - } - ] - }, - "included": { - "type": "array", - "items": { - "type": "object", - "properties": [ - { - "properties": { - "id": { - "type": "integer" - }, - "type": { - "type": "string", - "default": "accessGroups" - }, - "attributes": { - "type": "object", - "properties": { - "accessGroupId": { - "type": "integer" - }, - "groupName": { - "type": "string" - } - } - } - } - }, - { - "properties": { - "id": { - "type": "integer" - }, - "type": { - "type": "string", - "default": "agentStats" - }, - "attributes": { - "type": "object", - "properties": { - "agentStatId": { - "type": "integer" - }, - "agentId": { - "type": "integer" - }, - "statType": { - "type": "integer" - }, - "time": { - "type": "integer", - "format": "int64" - }, - "value": { - "type": "array", - "items": { - "type": "integer" - } - } - } - } - } - }, - { - "properties": { - "id": { - "type": "integer" - }, - "type": { - "type": "string", - "default": "agentErrors" - }, - "attributes": { - "type": "object", - "properties": { - "agentErrorId": { - "type": "integer" - }, - "agentId": { - "type": "integer" - }, - "taskId": { - "type": "integer" - }, - "chunkId": { - "type": "integer" - }, - "time": { - "type": "integer", - "format": "int64" - }, - "error": { - "type": "string" - } - } - } - } - }, - { - "properties": { - "id": { - "type": "integer" - }, - "type": { - "type": "string", - "default": "chunks" - }, - "attributes": { - "type": "object", - "properties": { - "chunkId": { - "type": "integer" - }, - "taskId": { - "type": "integer" - }, - "skip": { - "type": "integer" - }, - "length": { - "type": "integer" - }, - "agentId": { - "type": "integer" - }, - "dispatchTime": { - "type": "integer", - "format": "int64" - }, - "solveTime": { - "type": "integer", - "format": "int64" - }, - "checkpoint": { - "type": "integer", - "format": "int64" - }, - "progress": { - "type": "integer" - }, - "state": { - "type": "integer" - }, - "cracked": { - "type": "integer" - }, - "speed": { - "type": "integer", - "format": "int64" - } - } - } - } - }, - { - "properties": { - "id": { - "type": "integer" - }, - "type": { - "type": "string", - "default": "tasks" - }, - "attributes": { - "type": "object", - "properties": { - "hashlistId": { - "type": "integer" - }, - "files": { - "type": "array", - "items": { - "type": "integer" - } - }, - "taskId": { - "type": "integer" - }, - "taskName": { - "type": "string" - }, - "attackCmd": { - "type": "string" - }, - "chunkTime": { - "type": "integer" - }, - "statusTimer": { - "type": "integer" - }, - "keyspace": { - "type": "integer", - "format": "int64" - }, - "keyspaceProgress": { - "type": "integer", - "format": "int64" - }, - "priority": { - "type": "integer" - }, - "maxAgents": { - "type": "integer" - }, - "color": { - "type": "string" - }, - "isSmall": { - "type": "boolean" - }, - "isCpuTask": { - "type": "boolean" - }, - "useNewBench": { - "type": "boolean" - }, - "skipKeyspace": { - "type": "integer", - "format": "int64" - }, - "crackerBinaryId": { - "type": "integer" - }, - "crackerBinaryTypeId": { - "type": "integer" - }, - "taskWrapperId": { - "type": "integer" - }, - "isArchived": { - "type": "boolean" - }, - "notes": { - "type": "string" - }, - "staticChunks": { - "type": "integer" - }, - "chunkSize": { - "type": "integer", - "format": "int64" - }, - "forcePipe": { - "type": "boolean" - }, - "preprocessorId": { - "type": "integer" - }, - "preprocessorCommand": { - "type": "string" - } - } - } - } - }, - { - "properties": { - "id": { - "type": "integer" - }, - "type": { - "type": "string", - "default": "assignments" - }, - "attributes": { - "type": "object", - "properties": { - "assignmentId": { - "type": "integer" - }, - "taskId": { - "type": "integer" - }, - "agentId": { - "type": "integer" - }, - "benchmark": { - "type": "string" - } - } - } - } - } - ] - } - } - } - }, - "AgentPostPatchResponse": { - "type": "object", - "properties": { - "jsonapi": { - "type": "object", - "properties": { - "version": { - "type": "string", - "default": "1.1" - }, - "ext": { - "type": "string", - "default": "https://jsonapi.org/profiles/ethanresnick/cursor-pagination" - } - } - }, - "data": { - "type": "array", - "items": { - "type": "object", - "properties": { - "id": { - "type": "integer" - }, - "type": { - "type": "string", - "default": "Agent" - }, - "attributes": { - "type": "object", - "properties": { - "agentName": { - "type": "string" - }, - "uid": { - "type": "string" - }, - "os": { - "type": "integer" - }, - "devices": { - "type": "string" - }, - "cmdPars": { - "type": "string" - }, - "ignoreErrors": { - "type": "integer", - "enum": [ - 0, - 1, - 2 - ] - }, - "isActive": { - "type": "boolean" - }, - "isTrusted": { - "type": "boolean" - }, - "token": { - "type": "string" - }, - "lastAct": { - "type": "string" - }, - "lastTime": { - "type": "integer", - "format": "int64" - }, - "lastIp": { - "type": "string" - }, - "userId": { - "type": "integer" - }, - "cpuOnly": { - "type": "boolean" - }, - "clientSignature": { - "type": "string" - } - } - } - } - } - } - } - }, - "AgentListResponse": { - "allOf": [ - { - "$ref": "#/components/schemas/ListResponse" - }, - { - "type": "object", - "properties": { - "values": { - "type": "array", - "items": { - "$ref": "#/components/schemas/AgentResponse" - } - } - } - } - ] - }, - "AgentRelationAccessGroups": { - "type": "object", - "properties": { - "data": { - "type": "array", - "items": { - "type": "object", - "properties": { - "type": { - "type": "string", - "default": "accessGroups" - }, - "id": { - "type": "integer", - "default": 1 - } - } - } - } - } - }, - "AgentRelationAccessGroupsGetResponse": { - "type": "object", - "properties": { - "data": { - "type": "array", - "items": { - "type": "object", - "properties": { - "type": { - "type": "string", - "default": "accessGroups" - }, - "id": { - "type": "integer", - "default": 1 - } - } - } - } - } - }, - "AgentRelationAgentStats": { - "type": "object", - "properties": { - "data": { - "type": "array", - "items": { - "type": "object", - "properties": { - "type": { - "type": "string", - "default": "agentStats" - }, - "id": { - "type": "integer", - "default": 1 - } - } - } - } - } - }, - "AgentRelationAgentStatsGetResponse": { - "type": "object", - "properties": { - "data": { - "type": "array", - "items": { - "type": "object", - "properties": { - "type": { - "type": "string", - "default": "agentStats" - }, - "id": { - "type": "integer", - "default": 1 - } - } - } - } - } - }, - "AgentRelationAgentErrors": { - "type": "object", - "properties": { - "data": { - "type": "array", - "items": { - "type": "object", - "properties": { - "type": { - "type": "string", - "default": "agentErrors" - }, - "id": { - "type": "integer", - "default": 1 - } - } - } - } - } - }, - "AgentRelationAgentErrorsGetResponse": { - "type": "object", - "properties": { - "data": { - "type": "array", - "items": { - "type": "object", - "properties": { - "type": { - "type": "string", - "default": "agentErrors" - }, - "id": { - "type": "integer", - "default": 1 - } - } - } - } - } - }, - "AgentRelationChunks": { - "type": "object", - "properties": { - "data": { - "type": "array", - "items": { - "type": "object", - "properties": { - "type": { - "type": "string", - "default": "chunks" - }, - "id": { - "type": "integer", - "default": 1 - } - } - } - } - } - }, - "AgentRelationChunksGetResponse": { - "type": "object", - "properties": { - "data": { - "type": "array", - "items": { - "type": "object", - "properties": { - "type": { - "type": "string", - "default": "chunks" - }, - "id": { - "type": "integer", - "default": 1 - } - } - } - } - } - }, - "AgentRelationTasks": { - "type": "object", - "properties": { - "data": { - "type": "array", - "items": { - "type": "object", - "properties": { - "type": { - "type": "string", - "default": "tasks" - }, - "id": { - "type": "integer", - "default": 1 - } - } - } - } - } - }, - "AgentRelationTasksGetResponse": { - "type": "object", - "properties": { - "data": { - "type": "array", - "items": { - "type": "object", - "properties": { - "type": { - "type": "string", - "default": "tasks" - }, - "id": { - "type": "integer", - "default": 1 - } - } - } - } - } - }, - "AgentRelationAssignments": { - "type": "object", - "properties": { - "data": { - "type": "array", - "items": { - "type": "object", - "properties": { - "type": { - "type": "string", - "default": "assignments" - }, - "id": { - "type": "integer", - "default": 1 - } - } - } - } - } - }, - "AgentRelationAssignmentsGetResponse": { - "type": "object", - "properties": { - "data": { - "type": "array", - "items": { - "type": "object", - "properties": { - "type": { - "type": "string", - "default": "assignments" - }, - "id": { - "type": "integer", - "default": 1 - } - } - } - } - } - }, - "AgentStatCreate": { - "type": "object", - "properties": { - "data": { - "type": "object", - "properties": { - "type": { - "type": "string", - "default": "AgentStat" - }, - "attributes": { - "type": "object", - "properties": [] - } - } - } - } - }, - "AgentStatPatch": { - "type": "object", - "properties": { - "data": { - "type": "object", - "properties": { - "type": { - "type": "string", - "default": "AgentStat" - }, - "attributes": { - "type": "object", - "properties": [] - } - } - } - } - }, - "AgentStatResponse": { - "type": "object", - "properties": { - "jsonapi": { - "type": "object", - "properties": { - "version": { - "type": "string", - "default": "1.1" - }, - "ext": { - "type": "string", - "default": "https://jsonapi.org/profiles/ethanresnick/cursor-pagination" - } - } - }, - "links": { - "type": "object", - "properties": { - "self": { - "type": "string", - "default": "/api/v2/ui/agentstats?page[size]=25" - }, - "first": { - "type": "string", - "default": "/api/v2/ui/agentstats?page[size]=25&page[after]=0" - }, - "last": { - "type": "string", - "default": "/api/v2/ui/agentstats?page[size]=25&page[before]=500" - }, - "next": { - "type": "string", - "default": "/api/v2/ui/agentstats?page[size]=25&page[after]=25" - }, - "previous": { - "type": "string", - "default": "/api/v2/ui/agentstats?page[size]=25&page[before]=25" - } - } - }, - "data": { - "type": "array", - "items": { - "type": "object", - "properties": { - "id": { - "type": "integer" - }, - "type": { - "type": "string", - "default": "AgentStat" - }, - "attributes": { - "type": "object", - "properties": { - "agentId": { - "type": "integer" - }, - "statType": { - "type": "integer" - }, - "time": { - "type": "integer", - "format": "int64" - }, - "value": { - "type": "array", - "items": { - "type": "integer" - } - } - } - } - } - } - }, - "relationships": { - "type": "object", - "properties": [] - }, - "included": { - "type": "array", - "items": { - "type": "object", - "properties": [] - } - } - } - }, - "AgentStatRelationAssignments": { - "type": "object", - "properties": { - "data": { - "type": "array", - "items": { - "type": "object", - "properties": { - "type": { - "type": "string", - "default": "assignments" - }, - "id": { - "type": "integer", - "default": 1 - } - } - } - } - } - }, - "AgentStatRelationAssignmentsGetResponse": { - "type": "object", - "properties": { - "data": { - "type": "array", - "items": { - "type": "object", - "properties": { - "type": { - "type": "string", - "default": "assignments" - }, - "id": { - "type": "integer", - "default": 1 - } - } - } - } - } - }, - "AgentStatSingleResponse": { - "type": "object", - "properties": { - "data": { - "type": "array", - "items": { - "type": "object", - "properties": { - "id": { - "type": "integer" - }, - "type": { - "type": "string", - "default": "AgentStat" - }, - "attributes": { - "type": "object", - "properties": { - "agentId": { - "type": "integer" - }, - "statType": { - "type": "integer" - }, - "time": { - "type": "integer", - "format": "int64" - }, - "value": { - "type": "array", - "items": { - "type": "integer" - } - } - } - } - } - } - }, - "relationships": { - "type": "object", - "properties": [] - }, - "included": { - "type": "array", - "items": { - "type": "object", - "properties": [] - } - } - } - }, - "AgentStatPostPatchResponse": { - "type": "object", - "properties": { - "jsonapi": { - "type": "object", - "properties": { - "version": { - "type": "string", - "default": "1.1" - }, - "ext": { - "type": "string", - "default": "https://jsonapi.org/profiles/ethanresnick/cursor-pagination" - } - } - }, - "data": { - "type": "array", - "items": { - "type": "object", - "properties": { - "id": { - "type": "integer" - }, - "type": { - "type": "string", - "default": "AgentStat" - }, - "attributes": { - "type": "object", - "properties": { - "agentId": { - "type": "integer" - }, - "statType": { - "type": "integer" - }, - "time": { - "type": "integer", - "format": "int64" - }, - "value": { - "type": "array", - "items": { - "type": "integer" - } - } - } - } - } - } - } - } - }, - "AgentStatListResponse": { - "allOf": [ - { - "$ref": "#/components/schemas/ListResponse" - }, - { - "type": "object", - "properties": { - "values": { - "type": "array", - "items": { - "$ref": "#/components/schemas/AgentStatResponse" - } - } - } - } - ] - }, - "ChunkCreate": { - "type": "object", - "properties": { - "data": { - "type": "object", - "properties": { - "type": { - "type": "string", - "default": "Chunk" - }, - "attributes": { - "type": "object", - "properties": [] - } - } - } - } - }, - "ChunkPatch": { - "type": "object", - "properties": { - "data": { - "type": "object", - "properties": { - "type": { - "type": "string", - "default": "Chunk" - }, - "attributes": { - "type": "object", - "properties": [] - } - } - } - } - }, - "ChunkResponse": { - "type": "object", - "properties": { - "jsonapi": { - "type": "object", - "properties": { - "version": { - "type": "string", - "default": "1.1" - }, - "ext": { - "type": "string", - "default": "https://jsonapi.org/profiles/ethanresnick/cursor-pagination" - } - } - }, - "links": { - "type": "object", - "properties": { - "self": { - "type": "string", - "default": "/api/v2/ui/chunks?page[size]=25" - }, - "first": { - "type": "string", - "default": "/api/v2/ui/chunks?page[size]=25&page[after]=0" - }, - "last": { - "type": "string", - "default": "/api/v2/ui/chunks?page[size]=25&page[before]=500" - }, - "next": { - "type": "string", - "default": "/api/v2/ui/chunks?page[size]=25&page[after]=25" - }, - "previous": { - "type": "string", - "default": "/api/v2/ui/chunks?page[size]=25&page[before]=25" - } - } - }, - "data": { - "type": "array", - "items": { - "type": "object", - "properties": { - "id": { - "type": "integer" - }, - "type": { - "type": "string", - "default": "Chunk" - }, - "attributes": { - "type": "object", - "properties": { - "taskId": { - "type": "integer" - }, - "skip": { - "type": "integer" - }, - "length": { - "type": "integer" - }, - "agentId": { - "type": "integer" - }, - "dispatchTime": { - "type": "integer", - "format": "int64" - }, - "solveTime": { - "type": "integer", - "format": "int64" - }, - "checkpoint": { - "type": "integer", - "format": "int64" - }, - "progress": { - "type": "integer" - }, - "state": { - "type": "integer" - }, - "cracked": { - "type": "integer" - }, - "speed": { - "type": "integer", - "format": "int64" - } - } - } - } - } - }, - "relationships": { - "type": "object", - "properties": [ - { - "properties": { - "agent": { - "type": "object", - "properties": { - "links": { - "type": "object", - "properties": { - "self": { - "type": "string", - "default": "/api/v2/ui/chunks/relationships/agent" - }, - "related": { - "type": "string", - "default": "/api/v2/ui/chunks/agent" - } - } - } - } - } - } - }, - { - "properties": { - "task": { - "type": "object", - "properties": { - "links": { - "type": "object", - "properties": { - "self": { - "type": "string", - "default": "/api/v2/ui/chunks/relationships/task" - }, - "related": { - "type": "string", - "default": "/api/v2/ui/chunks/task" - } - } - } - } - } - } - } - ] - }, - "included": { - "type": "array", - "items": { - "type": "object", - "properties": [ - { - "properties": { - "id": { - "type": "integer" - }, - "type": { - "type": "string", - "default": "agent" - }, - "attributes": { - "type": "object", - "properties": { - "agentId": { - "type": "integer" - }, - "agentName": { - "type": "string" - }, - "uid": { - "type": "string" - }, - "os": { - "type": "integer" - }, - "devices": { - "type": "string" - }, - "cmdPars": { - "type": "string" - }, - "ignoreErrors": { - "type": "integer", - "enum": [ - 0, - 1, - 2 - ] - }, - "isActive": { - "type": "boolean" - }, - "isTrusted": { - "type": "boolean" - }, - "token": { - "type": "string" - }, - "lastAct": { - "type": "string" - }, - "lastTime": { - "type": "integer", - "format": "int64" - }, - "lastIp": { - "type": "string" - }, - "userId": { - "type": "integer" - }, - "cpuOnly": { - "type": "boolean" - }, - "clientSignature": { - "type": "string" - } - } - } - } - }, - { - "properties": { - "id": { - "type": "integer" - }, - "type": { - "type": "string", - "default": "task" - }, - "attributes": { - "type": "object", - "properties": { - "hashlistId": { - "type": "integer" - }, - "files": { - "type": "array", - "items": { - "type": "integer" - } - }, - "taskId": { - "type": "integer" - }, - "taskName": { - "type": "string" - }, - "attackCmd": { - "type": "string" - }, - "chunkTime": { - "type": "integer" - }, - "statusTimer": { - "type": "integer" - }, - "keyspace": { - "type": "integer", - "format": "int64" - }, - "keyspaceProgress": { - "type": "integer", - "format": "int64" - }, - "priority": { - "type": "integer" - }, - "maxAgents": { - "type": "integer" - }, - "color": { - "type": "string" - }, - "isSmall": { - "type": "boolean" - }, - "isCpuTask": { - "type": "boolean" - }, - "useNewBench": { - "type": "boolean" - }, - "skipKeyspace": { - "type": "integer", - "format": "int64" - }, - "crackerBinaryId": { - "type": "integer" - }, - "crackerBinaryTypeId": { - "type": "integer" - }, - "taskWrapperId": { - "type": "integer" - }, - "isArchived": { - "type": "boolean" - }, - "notes": { - "type": "string" - }, - "staticChunks": { - "type": "integer" - }, - "chunkSize": { - "type": "integer", - "format": "int64" - }, - "forcePipe": { - "type": "boolean" - }, - "preprocessorId": { - "type": "integer" - }, - "preprocessorCommand": { - "type": "string" - } - } - } - } - } - ] - } - } - } - }, - "ChunkRelationAssignments": { - "type": "object", - "properties": { - "data": { - "type": "array", - "items": { - "type": "object", - "properties": { - "type": { - "type": "string", - "default": "assignments" - }, - "id": { - "type": "integer", - "default": 1 - } - } - } - } - } - }, - "ChunkRelationAssignmentsGetResponse": { - "type": "object", - "properties": { - "data": { - "type": "array", - "items": { - "type": "object", - "properties": { - "type": { - "type": "string", - "default": "assignments" - }, - "id": { - "type": "integer", - "default": 1 - } - } - } - } - } - }, - "ChunkSingleResponse": { - "type": "object", - "properties": { - "data": { - "type": "array", - "items": { - "type": "object", - "properties": { - "id": { - "type": "integer" - }, - "type": { - "type": "string", - "default": "Chunk" - }, - "attributes": { - "type": "object", - "properties": { - "taskId": { - "type": "integer" - }, - "skip": { - "type": "integer" - }, - "length": { - "type": "integer" - }, - "agentId": { - "type": "integer" - }, - "dispatchTime": { - "type": "integer", - "format": "int64" - }, - "solveTime": { - "type": "integer", - "format": "int64" - }, - "checkpoint": { - "type": "integer", - "format": "int64" - }, - "progress": { - "type": "integer" - }, - "state": { - "type": "integer" - }, - "cracked": { - "type": "integer" - }, - "speed": { - "type": "integer", - "format": "int64" - } - } - } - } - } - }, - "relationships": { - "type": "object", - "properties": [ - { - "properties": { - "agent": { - "type": "object", - "properties": { - "links": { - "type": "object", - "properties": { - "self": { - "type": "string", - "default": "/api/v2/ui/chunks/relationships/agent" - }, - "related": { - "type": "string", - "default": "/api/v2/ui/chunks/agent" - } - } - } - } - } - } - }, - { - "properties": { - "task": { - "type": "object", - "properties": { - "links": { - "type": "object", - "properties": { - "self": { - "type": "string", - "default": "/api/v2/ui/chunks/relationships/task" - }, - "related": { - "type": "string", - "default": "/api/v2/ui/chunks/task" - } - } - } - } - } - } - } - ] - }, - "included": { - "type": "array", - "items": { - "type": "object", - "properties": [ - { - "properties": { - "id": { - "type": "integer" - }, - "type": { - "type": "string", - "default": "agent" - }, - "attributes": { - "type": "object", - "properties": { - "agentId": { - "type": "integer" - }, - "agentName": { - "type": "string" - }, - "uid": { - "type": "string" - }, - "os": { - "type": "integer" - }, - "devices": { - "type": "string" - }, - "cmdPars": { - "type": "string" - }, - "ignoreErrors": { - "type": "integer", - "enum": [ - 0, - 1, - 2 - ] - }, - "isActive": { - "type": "boolean" - }, - "isTrusted": { - "type": "boolean" - }, - "token": { - "type": "string" - }, - "lastAct": { - "type": "string" - }, - "lastTime": { - "type": "integer", - "format": "int64" - }, - "lastIp": { - "type": "string" - }, - "userId": { - "type": "integer" - }, - "cpuOnly": { - "type": "boolean" - }, - "clientSignature": { - "type": "string" - } - } - } - } - }, - { - "properties": { - "id": { - "type": "integer" - }, - "type": { - "type": "string", - "default": "task" - }, - "attributes": { - "type": "object", - "properties": { - "hashlistId": { - "type": "integer" - }, - "files": { - "type": "array", - "items": { - "type": "integer" - } - }, - "taskId": { - "type": "integer" - }, - "taskName": { - "type": "string" - }, - "attackCmd": { - "type": "string" - }, - "chunkTime": { - "type": "integer" - }, - "statusTimer": { - "type": "integer" - }, - "keyspace": { - "type": "integer", - "format": "int64" - }, - "keyspaceProgress": { - "type": "integer", - "format": "int64" - }, - "priority": { - "type": "integer" - }, - "maxAgents": { - "type": "integer" - }, - "color": { - "type": "string" - }, - "isSmall": { - "type": "boolean" - }, - "isCpuTask": { - "type": "boolean" - }, - "useNewBench": { - "type": "boolean" - }, - "skipKeyspace": { - "type": "integer", - "format": "int64" - }, - "crackerBinaryId": { - "type": "integer" - }, - "crackerBinaryTypeId": { - "type": "integer" - }, - "taskWrapperId": { - "type": "integer" - }, - "isArchived": { - "type": "boolean" - }, - "notes": { - "type": "string" - }, - "staticChunks": { - "type": "integer" - }, - "chunkSize": { - "type": "integer", - "format": "int64" - }, - "forcePipe": { - "type": "boolean" - }, - "preprocessorId": { - "type": "integer" - }, - "preprocessorCommand": { - "type": "string" - } - } - } - } - } - ] - } - } - } - }, - "ChunkPostPatchResponse": { - "type": "object", - "properties": { - "jsonapi": { - "type": "object", - "properties": { - "version": { - "type": "string", - "default": "1.1" - }, - "ext": { - "type": "string", - "default": "https://jsonapi.org/profiles/ethanresnick/cursor-pagination" - } - } - }, - "data": { - "type": "array", - "items": { - "type": "object", - "properties": { - "id": { - "type": "integer" - }, - "type": { - "type": "string", - "default": "Chunk" - }, - "attributes": { - "type": "object", - "properties": { - "taskId": { - "type": "integer" - }, - "skip": { - "type": "integer" - }, - "length": { - "type": "integer" - }, - "agentId": { - "type": "integer" - }, - "dispatchTime": { - "type": "integer", - "format": "int64" - }, - "solveTime": { - "type": "integer", - "format": "int64" - }, - "checkpoint": { - "type": "integer", - "format": "int64" - }, - "progress": { - "type": "integer" - }, - "state": { - "type": "integer" - }, - "cracked": { - "type": "integer" - }, - "speed": { - "type": "integer", - "format": "int64" - } - } - } - } - } - } - } - }, - "ChunkListResponse": { - "allOf": [ - { - "$ref": "#/components/schemas/ListResponse" - }, - { - "type": "object", - "properties": { - "values": { - "type": "array", - "items": { - "$ref": "#/components/schemas/ChunkResponse" - } - } - } - } - ] - }, - "ChunkRelationAgent": { - "type": "object", - "properties": { - "data": { - "type": "object", - "properties": { - "type": { - "type": "string", - "default": "agent" - }, - "id": { - "type": "integer", - "default": 1 - } - } - } - } - }, - "ChunkRelationAgentGetResponse": { - "type": "object", - "properties": { - "data": { - "type": "object", - "properties": { - "type": { - "type": "string", - "default": "agent" - }, - "id": { - "type": "integer", - "default": 1 - } - } - } - } - }, - "ChunkRelationTask": { - "type": "object", - "properties": { - "data": { - "type": "object", - "properties": { - "type": { - "type": "string", - "default": "task" - }, - "id": { - "type": "integer", - "default": 1 - } - } - } - } - }, - "ChunkRelationTaskGetResponse": { - "type": "object", - "properties": { - "data": { - "type": "object", - "properties": { - "type": { - "type": "string", - "default": "task" - }, - "id": { - "type": "integer", - "default": 1 - } - } - } - } - }, - "ConfigCreate": { - "type": "object", - "properties": { - "data": { - "type": "object", - "properties": { - "type": { - "type": "string", - "default": "Config" - }, - "attributes": { - "type": "object", - "properties": { - "configSectionId": { - "type": "integer" - }, - "item": { - "type": "string" - }, - "value": { - "type": "string" - } - } - } - } - } - } - }, - "ConfigPatch": { - "type": "object", - "properties": { - "data": { - "type": "object", - "properties": { - "type": { - "type": "string", - "default": "Config" - }, - "attributes": { - "type": "object", - "properties": { - "configSectionId": { - "type": "integer" - }, - "item": { - "type": "string" - }, - "value": { - "type": "string" - } - } - } - } - } - } - }, - "ConfigResponse": { - "type": "object", - "properties": { - "jsonapi": { - "type": "object", - "properties": { - "version": { - "type": "string", - "default": "1.1" - }, - "ext": { - "type": "string", - "default": "https://jsonapi.org/profiles/ethanresnick/cursor-pagination" - } - } - }, - "links": { - "type": "object", - "properties": { - "self": { - "type": "string", - "default": "/api/v2/ui/configs?page[size]=25" - }, - "first": { - "type": "string", - "default": "/api/v2/ui/configs?page[size]=25&page[after]=0" - }, - "last": { - "type": "string", - "default": "/api/v2/ui/configs?page[size]=25&page[before]=500" - }, - "next": { - "type": "string", - "default": "/api/v2/ui/configs?page[size]=25&page[after]=25" - }, - "previous": { - "type": "string", - "default": "/api/v2/ui/configs?page[size]=25&page[before]=25" - } - } - }, - "data": { - "type": "array", - "items": { - "type": "object", - "properties": { - "id": { - "type": "integer" - }, - "type": { - "type": "string", - "default": "Config" - }, - "attributes": { - "type": "object", - "properties": { - "configSectionId": { - "type": "integer" - }, - "item": { - "type": "string" - }, - "value": { - "type": "string" - } - } - } - } - } - }, - "relationships": { - "type": "object", - "properties": [ - { - "properties": { - "configSection": { - "type": "object", - "properties": { - "links": { - "type": "object", - "properties": { - "self": { - "type": "string", - "default": "/api/v2/ui/configs/relationships/configSection" - }, - "related": { - "type": "string", - "default": "/api/v2/ui/configs/configSection" - } - } - } - } - } - } - } - ] - }, - "included": { - "type": "array", - "items": { - "type": "object", - "properties": [ - { - "properties": { - "id": { - "type": "integer" - }, - "type": { - "type": "string", - "default": "configSection" - }, - "attributes": { - "type": "object", - "properties": { - "configSectionId": { - "type": "integer" - }, - "sectionName": { - "type": "string" - } - } - } - } - } - ] - } - } - } - }, - "ConfigRelationTask": { - "type": "object", - "properties": { - "data": { - "type": "object", - "properties": { - "type": { - "type": "string", - "default": "task" - }, - "id": { - "type": "integer", - "default": 1 - } - } - } - } - }, - "ConfigRelationTaskGetResponse": { - "type": "object", - "properties": { - "data": { - "type": "object", - "properties": { - "type": { - "type": "string", - "default": "task" - }, - "id": { - "type": "integer", - "default": 1 - } - } - } - } - }, - "ConfigSingleResponse": { - "type": "object", - "properties": { - "data": { - "type": "array", - "items": { - "type": "object", - "properties": { - "id": { - "type": "integer" - }, - "type": { - "type": "string", - "default": "Config" - }, - "attributes": { - "type": "object", - "properties": { - "configSectionId": { - "type": "integer" - }, - "item": { - "type": "string" - }, - "value": { - "type": "string" - } - } - } - } - } - }, - "relationships": { - "type": "object", - "properties": [ - { - "properties": { - "configSection": { - "type": "object", - "properties": { - "links": { - "type": "object", - "properties": { - "self": { - "type": "string", - "default": "/api/v2/ui/configs/relationships/configSection" - }, - "related": { - "type": "string", - "default": "/api/v2/ui/configs/configSection" - } - } - } - } - } - } - } - ] - }, - "included": { - "type": "array", - "items": { - "type": "object", - "properties": [ - { - "properties": { - "id": { - "type": "integer" - }, - "type": { - "type": "string", - "default": "configSection" - }, - "attributes": { - "type": "object", - "properties": { - "configSectionId": { - "type": "integer" - }, - "sectionName": { - "type": "string" - } - } - } - } - } - ] - } - } - } - }, - "ConfigPostPatchResponse": { - "type": "object", - "properties": { - "jsonapi": { - "type": "object", - "properties": { - "version": { - "type": "string", - "default": "1.1" - }, - "ext": { - "type": "string", - "default": "https://jsonapi.org/profiles/ethanresnick/cursor-pagination" - } - } - }, - "data": { - "type": "array", - "items": { - "type": "object", - "properties": { - "id": { - "type": "integer" - }, - "type": { - "type": "string", - "default": "Config" - }, - "attributes": { - "type": "object", - "properties": { - "configSectionId": { - "type": "integer" - }, - "item": { - "type": "string" - }, - "value": { - "type": "string" - } - } - } - } - } - } - } - }, - "ConfigListResponse": { - "allOf": [ - { - "$ref": "#/components/schemas/ListResponse" - }, - { - "type": "object", - "properties": { - "values": { - "type": "array", - "items": { - "$ref": "#/components/schemas/ConfigResponse" - } - } - } - } - ] - }, - "ConfigRelationConfigSection": { - "type": "object", - "properties": { - "data": { - "type": "object", - "properties": { - "type": { - "type": "string", - "default": "configSection" - }, - "id": { - "type": "integer", - "default": 1 - } - } - } - } - }, - "ConfigRelationConfigSectionGetResponse": { - "type": "object", - "properties": { - "data": { - "type": "object", - "properties": { - "type": { - "type": "string", - "default": "configSection" - }, - "id": { - "type": "integer", - "default": 1 - } - } - } - } - }, - "ConfigSectionCreate": { - "type": "object", - "properties": { - "data": { - "type": "object", - "properties": { - "type": { - "type": "string", - "default": "ConfigSection" - }, - "attributes": { - "type": "object", - "properties": { - "sectionName": { - "type": "string" - } - } - } - } - } - } - }, - "ConfigSectionPatch": { - "type": "object", - "properties": { - "data": { - "type": "object", - "properties": { - "type": { - "type": "string", - "default": "ConfigSection" - }, - "attributes": { - "type": "object", - "properties": { - "sectionName": { - "type": "string" - } - } - } - } - } - } - }, - "ConfigSectionResponse": { - "type": "object", - "properties": { - "jsonapi": { - "type": "object", - "properties": { - "version": { - "type": "string", - "default": "1.1" - }, - "ext": { - "type": "string", - "default": "https://jsonapi.org/profiles/ethanresnick/cursor-pagination" - } - } - }, - "links": { - "type": "object", - "properties": { - "self": { - "type": "string", - "default": "/api/v2/ui/configsections?page[size]=25" - }, - "first": { - "type": "string", - "default": "/api/v2/ui/configsections?page[size]=25&page[after]=0" - }, - "last": { - "type": "string", - "default": "/api/v2/ui/configsections?page[size]=25&page[before]=500" - }, - "next": { - "type": "string", - "default": "/api/v2/ui/configsections?page[size]=25&page[after]=25" - }, - "previous": { - "type": "string", - "default": "/api/v2/ui/configsections?page[size]=25&page[before]=25" - } - } - }, - "data": { - "type": "array", - "items": { - "type": "object", - "properties": { - "id": { - "type": "integer" - }, - "type": { - "type": "string", - "default": "ConfigSection" - }, - "attributes": { - "type": "object", - "properties": { - "sectionName": { - "type": "string" - } - } - } - } - } - }, - "relationships": { - "type": "object", - "properties": [] - }, - "included": { - "type": "array", - "items": { - "type": "object", - "properties": [] - } - } - } - }, - "ConfigSectionRelationConfigSection": { - "type": "object", - "properties": { - "data": { - "type": "object", - "properties": { - "type": { - "type": "string", - "default": "configSection" - }, - "id": { - "type": "integer", - "default": 1 - } - } - } - } - }, - "ConfigSectionRelationConfigSectionGetResponse": { - "type": "object", - "properties": { - "data": { - "type": "object", - "properties": { - "type": { - "type": "string", - "default": "configSection" - }, - "id": { - "type": "integer", - "default": 1 - } - } - } - } - }, - "ConfigSectionSingleResponse": { - "type": "object", - "properties": { - "data": { - "type": "array", - "items": { - "type": "object", - "properties": { - "id": { - "type": "integer" - }, - "type": { - "type": "string", - "default": "ConfigSection" - }, - "attributes": { - "type": "object", - "properties": { - "sectionName": { - "type": "string" - } - } - } - } - } - }, - "relationships": { - "type": "object", - "properties": [] - }, - "included": { - "type": "array", - "items": { - "type": "object", - "properties": [] - } - } - } - }, - "ConfigSectionPostPatchResponse": { - "type": "object", - "properties": { - "jsonapi": { - "type": "object", - "properties": { - "version": { - "type": "string", - "default": "1.1" - }, - "ext": { - "type": "string", - "default": "https://jsonapi.org/profiles/ethanresnick/cursor-pagination" - } - } - }, - "data": { - "type": "array", - "items": { - "type": "object", - "properties": { - "id": { - "type": "integer" - }, - "type": { - "type": "string", - "default": "ConfigSection" - }, - "attributes": { - "type": "object", - "properties": { - "sectionName": { - "type": "string" - } - } - } - } - } - } - } - }, - "ConfigSectionListResponse": { - "allOf": [ - { - "$ref": "#/components/schemas/ListResponse" - }, - { - "type": "object", - "properties": { - "values": { - "type": "array", - "items": { - "$ref": "#/components/schemas/ConfigSectionResponse" - } - } - } - } - ] - }, - "CrackerBinaryCreate": { - "type": "object", - "properties": { - "data": { - "type": "object", - "properties": { - "type": { - "type": "string", - "default": "CrackerBinary" - }, - "attributes": { - "type": "object", - "properties": { - "crackerBinaryTypeId": { - "type": "integer" - }, - "version": { - "type": "string" - }, - "downloadUrl": { - "type": "string" - }, - "binaryName": { - "type": "string" - } - } - } - } - } - } - }, - "CrackerBinaryPatch": { - "type": "object", - "properties": { - "data": { - "type": "object", - "properties": { - "type": { - "type": "string", - "default": "CrackerBinary" - }, - "attributes": { - "type": "object", - "properties": { - "binaryName": { - "type": "string" - }, - "crackerBinaryTypeId": { - "type": "integer" - }, - "downloadUrl": { - "type": "string" - }, - "version": { - "type": "string" - } - } - } - } - } - } - }, - "CrackerBinaryResponse": { - "type": "object", - "properties": { - "jsonapi": { - "type": "object", - "properties": { - "version": { - "type": "string", - "default": "1.1" - }, - "ext": { - "type": "string", - "default": "https://jsonapi.org/profiles/ethanresnick/cursor-pagination" - } - } - }, - "links": { - "type": "object", - "properties": { - "self": { - "type": "string", - "default": "/api/v2/ui/crackers?page[size]=25" - }, - "first": { - "type": "string", - "default": "/api/v2/ui/crackers?page[size]=25&page[after]=0" - }, - "last": { - "type": "string", - "default": "/api/v2/ui/crackers?page[size]=25&page[before]=500" - }, - "next": { - "type": "string", - "default": "/api/v2/ui/crackers?page[size]=25&page[after]=25" - }, - "previous": { - "type": "string", - "default": "/api/v2/ui/crackers?page[size]=25&page[before]=25" - } - } - }, - "data": { - "type": "array", - "items": { - "type": "object", - "properties": { - "id": { - "type": "integer" - }, - "type": { - "type": "string", - "default": "CrackerBinary" - }, - "attributes": { - "type": "object", - "properties": { - "crackerBinaryTypeId": { - "type": "integer" - }, - "version": { - "type": "string" - }, - "downloadUrl": { - "type": "string" - }, - "binaryName": { - "type": "string" - } - } - } - } - } - }, - "relationships": { - "type": "object", - "properties": [ - { - "properties": { - "crackerBinaryType": { - "type": "object", - "properties": { - "links": { - "type": "object", - "properties": { - "self": { - "type": "string", - "default": "/api/v2/ui/crackers/relationships/crackerBinaryType" - }, - "related": { - "type": "string", - "default": "/api/v2/ui/crackers/crackerBinaryType" - } - } - } - } - } - } - }, - { - "properties": { - "tasks": { - "type": "object", - "properties": { - "links": { - "type": "object", - "properties": { - "self": { - "type": "string", - "default": "/api/v2/ui/crackers/relationships/tasks" - }, - "related": { - "type": "string", - "default": "/api/v2/ui/crackers/tasks" - } - } - } - } - } - } - } - ] - }, - "included": { - "type": "array", - "items": { - "type": "object", - "properties": [ - { - "properties": { - "id": { - "type": "integer" - }, - "type": { - "type": "string", - "default": "crackerBinaryType" - }, - "attributes": { - "type": "object", - "properties": { - "crackerBinaryTypeId": { - "type": "integer" - }, - "typeName": { - "type": "string" - }, - "isChunkingAvailable": { - "type": "boolean" - } - } - } - } - }, - { - "properties": { - "id": { - "type": "integer" - }, - "type": { - "type": "string", - "default": "tasks" - }, - "attributes": { - "type": "object", - "properties": { - "hashlistId": { - "type": "integer" - }, - "files": { - "type": "array", - "items": { - "type": "integer" - } - }, - "taskId": { - "type": "integer" - }, - "taskName": { - "type": "string" - }, - "attackCmd": { - "type": "string" - }, - "chunkTime": { - "type": "integer" - }, - "statusTimer": { - "type": "integer" - }, - "keyspace": { - "type": "integer", - "format": "int64" - }, - "keyspaceProgress": { - "type": "integer", - "format": "int64" - }, - "priority": { - "type": "integer" - }, - "maxAgents": { - "type": "integer" - }, - "color": { - "type": "string" - }, - "isSmall": { - "type": "boolean" - }, - "isCpuTask": { - "type": "boolean" - }, - "useNewBench": { - "type": "boolean" - }, - "skipKeyspace": { - "type": "integer", - "format": "int64" - }, - "crackerBinaryId": { - "type": "integer" - }, - "crackerBinaryTypeId": { - "type": "integer" - }, - "taskWrapperId": { - "type": "integer" - }, - "isArchived": { - "type": "boolean" - }, - "notes": { - "type": "string" - }, - "staticChunks": { - "type": "integer" - }, - "chunkSize": { - "type": "integer", - "format": "int64" - }, - "forcePipe": { - "type": "boolean" - }, - "preprocessorId": { - "type": "integer" - }, - "preprocessorCommand": { - "type": "string" - } - } - } - } - } - ] - } - } - } - }, - "CrackerBinaryRelationConfigSection": { - "type": "object", - "properties": { - "data": { - "type": "object", - "properties": { - "type": { - "type": "string", - "default": "configSection" - }, - "id": { - "type": "integer", - "default": 1 - } - } - } - } - }, - "CrackerBinaryRelationConfigSectionGetResponse": { - "type": "object", - "properties": { - "data": { - "type": "object", - "properties": { - "type": { - "type": "string", - "default": "configSection" - }, - "id": { - "type": "integer", - "default": 1 - } - } - } - } - }, - "CrackerBinarySingleResponse": { - "type": "object", - "properties": { - "data": { - "type": "array", - "items": { - "type": "object", - "properties": { - "id": { - "type": "integer" - }, - "type": { - "type": "string", - "default": "CrackerBinary" - }, - "attributes": { - "type": "object", - "properties": { - "crackerBinaryTypeId": { - "type": "integer" - }, - "version": { - "type": "string" - }, - "downloadUrl": { - "type": "string" - }, - "binaryName": { - "type": "string" - } - } - } - } - } - }, - "relationships": { - "type": "object", - "properties": [ - { - "properties": { - "crackerBinaryType": { - "type": "object", - "properties": { - "links": { - "type": "object", - "properties": { - "self": { - "type": "string", - "default": "/api/v2/ui/crackers/relationships/crackerBinaryType" - }, - "related": { - "type": "string", - "default": "/api/v2/ui/crackers/crackerBinaryType" - } - } - } - } - } - } - }, - { - "properties": { - "tasks": { - "type": "object", - "properties": { - "links": { - "type": "object", - "properties": { - "self": { - "type": "string", - "default": "/api/v2/ui/crackers/relationships/tasks" - }, - "related": { - "type": "string", - "default": "/api/v2/ui/crackers/tasks" - } - } - } - } - } - } - } - ] - }, - "included": { - "type": "array", - "items": { - "type": "object", - "properties": [ - { - "properties": { - "id": { - "type": "integer" - }, - "type": { - "type": "string", - "default": "crackerBinaryType" - }, - "attributes": { - "type": "object", - "properties": { - "crackerBinaryTypeId": { - "type": "integer" - }, - "typeName": { - "type": "string" - }, - "isChunkingAvailable": { - "type": "boolean" - } - } - } - } - }, - { - "properties": { - "id": { - "type": "integer" - }, - "type": { - "type": "string", - "default": "tasks" - }, - "attributes": { - "type": "object", - "properties": { - "hashlistId": { - "type": "integer" - }, - "files": { - "type": "array", - "items": { - "type": "integer" - } - }, - "taskId": { - "type": "integer" - }, - "taskName": { - "type": "string" - }, - "attackCmd": { - "type": "string" - }, - "chunkTime": { - "type": "integer" - }, - "statusTimer": { - "type": "integer" - }, - "keyspace": { - "type": "integer", - "format": "int64" - }, - "keyspaceProgress": { - "type": "integer", - "format": "int64" - }, - "priority": { - "type": "integer" - }, - "maxAgents": { - "type": "integer" - }, - "color": { - "type": "string" - }, - "isSmall": { - "type": "boolean" - }, - "isCpuTask": { - "type": "boolean" - }, - "useNewBench": { - "type": "boolean" - }, - "skipKeyspace": { - "type": "integer", - "format": "int64" - }, - "crackerBinaryId": { - "type": "integer" - }, - "crackerBinaryTypeId": { - "type": "integer" - }, - "taskWrapperId": { - "type": "integer" - }, - "isArchived": { - "type": "boolean" - }, - "notes": { - "type": "string" - }, - "staticChunks": { - "type": "integer" - }, - "chunkSize": { - "type": "integer", - "format": "int64" - }, - "forcePipe": { - "type": "boolean" - }, - "preprocessorId": { - "type": "integer" - }, - "preprocessorCommand": { - "type": "string" - } - } - } - } - } - ] - } - } - } - }, - "CrackerBinaryPostPatchResponse": { - "type": "object", - "properties": { - "jsonapi": { - "type": "object", - "properties": { - "version": { - "type": "string", - "default": "1.1" - }, - "ext": { - "type": "string", - "default": "https://jsonapi.org/profiles/ethanresnick/cursor-pagination" - } - } - }, - "data": { - "type": "array", - "items": { - "type": "object", - "properties": { - "id": { - "type": "integer" - }, - "type": { - "type": "string", - "default": "CrackerBinary" - }, - "attributes": { - "type": "object", - "properties": { - "crackerBinaryTypeId": { - "type": "integer" - }, - "version": { - "type": "string" - }, - "downloadUrl": { - "type": "string" - }, - "binaryName": { - "type": "string" - } - } - } - } - } - } - } - }, - "CrackerBinaryListResponse": { - "allOf": [ - { - "$ref": "#/components/schemas/ListResponse" - }, - { - "type": "object", - "properties": { - "values": { - "type": "array", - "items": { - "$ref": "#/components/schemas/CrackerBinaryResponse" - } - } - } - } - ] - }, - "CrackerBinaryRelationCrackerBinaryType": { - "type": "object", - "properties": { - "data": { - "type": "object", - "properties": { - "type": { - "type": "string", - "default": "crackerBinaryType" - }, - "id": { - "type": "integer", - "default": 1 - } - } - } - } - }, - "CrackerBinaryRelationCrackerBinaryTypeGetResponse": { - "type": "object", - "properties": { - "data": { - "type": "object", - "properties": { - "type": { - "type": "string", - "default": "crackerBinaryType" - }, - "id": { - "type": "integer", - "default": 1 - } - } - } - } - }, - "CrackerBinaryRelationTasks": { - "type": "object", - "properties": { - "data": { - "type": "array", - "items": { - "type": "object", - "properties": { - "type": { - "type": "string", - "default": "tasks" - }, - "id": { - "type": "integer", - "default": 1 - } - } - } - } - } - }, - "CrackerBinaryRelationTasksGetResponse": { - "type": "object", - "properties": { - "data": { - "type": "array", - "items": { - "type": "object", - "properties": { - "type": { - "type": "string", - "default": "tasks" - }, - "id": { - "type": "integer", - "default": 1 - } - } - } - } - } - }, - "CrackerBinaryTypeCreate": { - "type": "object", - "properties": { - "data": { - "type": "object", - "properties": { - "type": { - "type": "string", - "default": "CrackerBinaryType" - }, - "attributes": { - "type": "object", - "properties": { - "typeName": { - "type": "string" - } - } - } - } - } - } - }, - "CrackerBinaryTypePatch": { - "type": "object", - "properties": { - "data": { - "type": "object", - "properties": { - "type": { - "type": "string", - "default": "CrackerBinaryType" - }, - "attributes": { - "type": "object", - "properties": { - "isChunkingAvailable": { - "type": "boolean" - }, - "typeName": { - "type": "string" - } - } - } - } - } - } - }, - "CrackerBinaryTypeResponse": { - "type": "object", - "properties": { - "jsonapi": { - "type": "object", - "properties": { - "version": { - "type": "string", - "default": "1.1" - }, - "ext": { - "type": "string", - "default": "https://jsonapi.org/profiles/ethanresnick/cursor-pagination" - } - } - }, - "links": { - "type": "object", - "properties": { - "self": { - "type": "string", - "default": "/api/v2/ui/crackertypes?page[size]=25" - }, - "first": { - "type": "string", - "default": "/api/v2/ui/crackertypes?page[size]=25&page[after]=0" - }, - "last": { - "type": "string", - "default": "/api/v2/ui/crackertypes?page[size]=25&page[before]=500" - }, - "next": { - "type": "string", - "default": "/api/v2/ui/crackertypes?page[size]=25&page[after]=25" - }, - "previous": { - "type": "string", - "default": "/api/v2/ui/crackertypes?page[size]=25&page[before]=25" - } - } - }, - "data": { - "type": "array", - "items": { - "type": "object", - "properties": { - "id": { - "type": "integer" - }, - "type": { - "type": "string", - "default": "CrackerBinaryType" - }, - "attributes": { - "type": "object", - "properties": { - "typeName": { - "type": "string" - }, - "isChunkingAvailable": { - "type": "boolean" - } - } - } - } - } - }, - "relationships": { - "type": "object", - "properties": [ - { - "properties": { - "crackerVersions": { - "type": "object", - "properties": { - "links": { - "type": "object", - "properties": { - "self": { - "type": "string", - "default": "/api/v2/ui/crackertypes/relationships/crackerVersions" - }, - "related": { - "type": "string", - "default": "/api/v2/ui/crackertypes/crackerVersions" - } - } - } - } - } - } - }, - { - "properties": { - "tasks": { - "type": "object", - "properties": { - "links": { - "type": "object", - "properties": { - "self": { - "type": "string", - "default": "/api/v2/ui/crackertypes/relationships/tasks" - }, - "related": { - "type": "string", - "default": "/api/v2/ui/crackertypes/tasks" - } - } - } - } - } - } - } - ] - }, - "included": { - "type": "array", - "items": { - "type": "object", - "properties": [ - { - "properties": { - "id": { - "type": "integer" - }, - "type": { - "type": "string", - "default": "crackerVersions" - }, - "attributes": { - "type": "object", - "properties": { - "crackerBinaryId": { - "type": "integer" - }, - "crackerBinaryTypeId": { - "type": "integer" - }, - "version": { - "type": "string" - }, - "downloadUrl": { - "type": "string" - }, - "binaryName": { - "type": "string" - } - } - } - } - }, - { - "properties": { - "id": { - "type": "integer" - }, - "type": { - "type": "string", - "default": "tasks" - }, - "attributes": { - "type": "object", - "properties": { - "hashlistId": { - "type": "integer" - }, - "files": { - "type": "array", - "items": { - "type": "integer" - } - }, - "taskId": { - "type": "integer" - }, - "taskName": { - "type": "string" - }, - "attackCmd": { - "type": "string" - }, - "chunkTime": { - "type": "integer" - }, - "statusTimer": { - "type": "integer" - }, - "keyspace": { - "type": "integer", - "format": "int64" - }, - "keyspaceProgress": { - "type": "integer", - "format": "int64" - }, - "priority": { - "type": "integer" - }, - "maxAgents": { - "type": "integer" - }, - "color": { - "type": "string" - }, - "isSmall": { - "type": "boolean" - }, - "isCpuTask": { - "type": "boolean" - }, - "useNewBench": { - "type": "boolean" - }, - "skipKeyspace": { - "type": "integer", - "format": "int64" - }, - "crackerBinaryId": { - "type": "integer" - }, - "crackerBinaryTypeId": { - "type": "integer" - }, - "taskWrapperId": { - "type": "integer" - }, - "isArchived": { - "type": "boolean" - }, - "notes": { - "type": "string" - }, - "staticChunks": { - "type": "integer" - }, - "chunkSize": { - "type": "integer", - "format": "int64" - }, - "forcePipe": { - "type": "boolean" - }, - "preprocessorId": { - "type": "integer" - }, - "preprocessorCommand": { - "type": "string" - } - } - } - } - } - ] - } - } - } - }, - "CrackerBinaryTypeRelationTasks": { - "type": "object", - "properties": { - "data": { - "type": "array", - "items": { - "type": "object", - "properties": { - "type": { - "type": "string", - "default": "tasks" - }, - "id": { - "type": "integer", - "default": 1 - } - } - } - } - } - }, - "CrackerBinaryTypeRelationTasksGetResponse": { - "type": "object", - "properties": { - "data": { - "type": "array", - "items": { - "type": "object", - "properties": { - "type": { - "type": "string", - "default": "tasks" - }, - "id": { - "type": "integer", - "default": 1 - } - } - } - } - } - }, - "CrackerBinaryTypeSingleResponse": { - "type": "object", - "properties": { - "data": { - "type": "array", - "items": { - "type": "object", - "properties": { - "id": { - "type": "integer" - }, - "type": { - "type": "string", - "default": "CrackerBinaryType" - }, - "attributes": { - "type": "object", - "properties": { - "typeName": { - "type": "string" - }, - "isChunkingAvailable": { - "type": "boolean" - } - } - } - } - } - }, - "relationships": { - "type": "object", - "properties": [ - { - "properties": { - "crackerVersions": { - "type": "object", - "properties": { - "links": { - "type": "object", - "properties": { - "self": { - "type": "string", - "default": "/api/v2/ui/crackertypes/relationships/crackerVersions" - }, - "related": { - "type": "string", - "default": "/api/v2/ui/crackertypes/crackerVersions" - } - } - } - } - } - } - }, - { - "properties": { - "tasks": { - "type": "object", - "properties": { - "links": { - "type": "object", - "properties": { - "self": { - "type": "string", - "default": "/api/v2/ui/crackertypes/relationships/tasks" - }, - "related": { - "type": "string", - "default": "/api/v2/ui/crackertypes/tasks" - } - } - } - } - } - } - } - ] - }, - "included": { - "type": "array", - "items": { - "type": "object", - "properties": [ - { - "properties": { - "id": { - "type": "integer" - }, - "type": { - "type": "string", - "default": "crackerVersions" - }, - "attributes": { - "type": "object", - "properties": { - "crackerBinaryId": { - "type": "integer" - }, - "crackerBinaryTypeId": { - "type": "integer" - }, - "version": { - "type": "string" - }, - "downloadUrl": { - "type": "string" - }, - "binaryName": { - "type": "string" - } - } - } - } - }, - { - "properties": { - "id": { - "type": "integer" - }, - "type": { - "type": "string", - "default": "tasks" - }, - "attributes": { - "type": "object", - "properties": { - "hashlistId": { - "type": "integer" - }, - "files": { - "type": "array", - "items": { - "type": "integer" - } - }, - "taskId": { - "type": "integer" - }, - "taskName": { - "type": "string" - }, - "attackCmd": { - "type": "string" - }, - "chunkTime": { - "type": "integer" - }, - "statusTimer": { - "type": "integer" - }, - "keyspace": { - "type": "integer", - "format": "int64" - }, - "keyspaceProgress": { - "type": "integer", - "format": "int64" - }, - "priority": { - "type": "integer" - }, - "maxAgents": { - "type": "integer" - }, - "color": { - "type": "string" - }, - "isSmall": { - "type": "boolean" - }, - "isCpuTask": { - "type": "boolean" - }, - "useNewBench": { - "type": "boolean" - }, - "skipKeyspace": { - "type": "integer", - "format": "int64" - }, - "crackerBinaryId": { - "type": "integer" - }, - "crackerBinaryTypeId": { - "type": "integer" - }, - "taskWrapperId": { - "type": "integer" - }, - "isArchived": { - "type": "boolean" - }, - "notes": { - "type": "string" - }, - "staticChunks": { - "type": "integer" - }, - "chunkSize": { - "type": "integer", - "format": "int64" - }, - "forcePipe": { - "type": "boolean" - }, - "preprocessorId": { - "type": "integer" - }, - "preprocessorCommand": { - "type": "string" - } - } - } - } - } - ] - } - } - } - }, - "CrackerBinaryTypePostPatchResponse": { - "type": "object", - "properties": { - "jsonapi": { - "type": "object", - "properties": { - "version": { - "type": "string", - "default": "1.1" - }, - "ext": { - "type": "string", - "default": "https://jsonapi.org/profiles/ethanresnick/cursor-pagination" - } - } - }, - "data": { - "type": "array", - "items": { - "type": "object", - "properties": { - "id": { - "type": "integer" - }, - "type": { - "type": "string", - "default": "CrackerBinaryType" - }, - "attributes": { - "type": "object", - "properties": { - "typeName": { - "type": "string" - }, - "isChunkingAvailable": { - "type": "boolean" - } - } - } - } - } - } - } - }, - "CrackerBinaryTypeListResponse": { - "allOf": [ - { - "$ref": "#/components/schemas/ListResponse" - }, - { - "type": "object", - "properties": { - "values": { - "type": "array", - "items": { - "$ref": "#/components/schemas/CrackerBinaryTypeResponse" - } - } - } - } - ] - }, - "CrackerBinaryTypeRelationCrackerVersions": { - "type": "object", - "properties": { - "data": { - "type": "array", - "items": { - "type": "object", - "properties": { - "type": { - "type": "string", - "default": "crackerVersions" - }, - "id": { - "type": "integer", - "default": 1 - } - } - } - } - } - }, - "CrackerBinaryTypeRelationCrackerVersionsGetResponse": { - "type": "object", - "properties": { - "data": { - "type": "array", - "items": { - "type": "object", - "properties": { - "type": { - "type": "string", - "default": "crackerVersions" - }, - "id": { - "type": "integer", - "default": 1 - } - } - } - } - } - }, - "FileCreate": { - "type": "object", - "properties": { - "data": { - "type": "object", - "properties": { - "type": { - "type": "string", - "default": "File" - }, - "attributes": { - "type": "object", - "properties": { - "sourceType": { - "type": "string" - }, - "sourceData": { - "type": "string" - }, - "filename": { - "type": "string" - }, - "isSecret": { - "type": "boolean" - }, - "fileType": { - "type": "integer" - }, - "accessGroupId": { - "type": "integer" - } - } - } - } - } - } - }, - "FilePatch": { - "type": "object", - "properties": { - "data": { - "type": "object", - "properties": { - "type": { - "type": "string", - "default": "File" - }, - "attributes": { - "type": "object", - "properties": { - "accessGroupId": { - "type": "integer" - }, - "fileType": { - "type": "integer" - }, - "filename": { - "type": "string" - }, - "isSecret": { - "type": "boolean" - } - } - } - } - } - } - }, - "FileResponse": { - "type": "object", - "properties": { - "jsonapi": { - "type": "object", - "properties": { - "version": { - "type": "string", - "default": "1.1" - }, - "ext": { - "type": "string", - "default": "https://jsonapi.org/profiles/ethanresnick/cursor-pagination" - } - } - }, - "links": { - "type": "object", - "properties": { - "self": { - "type": "string", - "default": "/api/v2/ui/files?page[size]=25" - }, - "first": { - "type": "string", - "default": "/api/v2/ui/files?page[size]=25&page[after]=0" - }, - "last": { - "type": "string", - "default": "/api/v2/ui/files?page[size]=25&page[before]=500" - }, - "next": { - "type": "string", - "default": "/api/v2/ui/files?page[size]=25&page[after]=25" - }, - "previous": { - "type": "string", - "default": "/api/v2/ui/files?page[size]=25&page[before]=25" - } - } - }, - "data": { - "type": "array", - "items": { - "type": "object", - "properties": { - "id": { - "type": "integer" - }, - "type": { - "type": "string", - "default": "File" - }, - "attributes": { - "type": "object", - "properties": { - "filename": { - "type": "string" - }, - "size": { - "type": "integer", - "format": "int64" - }, - "isSecret": { - "type": "boolean" - }, - "fileType": { - "type": "integer" - }, - "accessGroupId": { - "type": "integer" - }, - "lineCount": { - "type": "integer", - "format": "int64" - } - } - } - } - } - }, - "relationships": { - "type": "object", - "properties": [ - { - "properties": { - "accessGroup": { - "type": "object", - "properties": { - "links": { - "type": "object", - "properties": { - "self": { - "type": "string", - "default": "/api/v2/ui/files/relationships/accessGroup" - }, - "related": { - "type": "string", - "default": "/api/v2/ui/files/accessGroup" - } - } - } - } - } - } - } - ] - }, - "included": { - "type": "array", - "items": { - "type": "object", - "properties": [ - { - "properties": { - "id": { - "type": "integer" - }, - "type": { - "type": "string", - "default": "accessGroup" - }, - "attributes": { - "type": "object", - "properties": { - "accessGroupId": { - "type": "integer" - }, - "groupName": { - "type": "string" - } - } - } - } - } - ] - } - } - } - }, - "FileRelationTasks": { - "type": "object", - "properties": { - "data": { - "type": "array", - "items": { - "type": "object", - "properties": { - "type": { - "type": "string", - "default": "tasks" - }, - "id": { - "type": "integer", - "default": 1 - } - } - } - } - } - }, - "FileRelationTasksGetResponse": { - "type": "object", - "properties": { - "data": { - "type": "array", - "items": { - "type": "object", - "properties": { - "type": { - "type": "string", - "default": "tasks" - }, - "id": { - "type": "integer", - "default": 1 - } - } - } - } - } - }, - "FileSingleResponse": { - "type": "object", - "properties": { - "data": { - "type": "array", - "items": { - "type": "object", - "properties": { - "id": { - "type": "integer" - }, - "type": { - "type": "string", - "default": "File" - }, - "attributes": { - "type": "object", - "properties": { - "filename": { - "type": "string" - }, - "size": { - "type": "integer", - "format": "int64" - }, - "isSecret": { - "type": "boolean" - }, - "fileType": { - "type": "integer" - }, - "accessGroupId": { - "type": "integer" - }, - "lineCount": { - "type": "integer", - "format": "int64" - } - } - } - } - } - }, - "relationships": { - "type": "object", - "properties": [ - { - "properties": { - "accessGroup": { - "type": "object", - "properties": { - "links": { - "type": "object", - "properties": { - "self": { - "type": "string", - "default": "/api/v2/ui/files/relationships/accessGroup" - }, - "related": { - "type": "string", - "default": "/api/v2/ui/files/accessGroup" - } - } - } - } - } - } - } - ] - }, - "included": { - "type": "array", - "items": { - "type": "object", - "properties": [ - { - "properties": { - "id": { - "type": "integer" - }, - "type": { - "type": "string", - "default": "accessGroup" - }, - "attributes": { - "type": "object", - "properties": { - "accessGroupId": { - "type": "integer" - }, - "groupName": { - "type": "string" - } - } - } - } - } - ] - } - } - } - }, - "FilePostPatchResponse": { - "type": "object", - "properties": { - "jsonapi": { - "type": "object", - "properties": { - "version": { - "type": "string", - "default": "1.1" - }, - "ext": { - "type": "string", - "default": "https://jsonapi.org/profiles/ethanresnick/cursor-pagination" - } - } - }, - "data": { - "type": "array", - "items": { - "type": "object", - "properties": { - "id": { - "type": "integer" - }, - "type": { - "type": "string", - "default": "File" - }, - "attributes": { - "type": "object", - "properties": { - "filename": { - "type": "string" - }, - "size": { - "type": "integer", - "format": "int64" - }, - "isSecret": { - "type": "boolean" - }, - "fileType": { - "type": "integer" - }, - "accessGroupId": { - "type": "integer" - }, - "lineCount": { - "type": "integer", - "format": "int64" - } - } - } - } - } - } - } - }, - "FileListResponse": { - "allOf": [ - { - "$ref": "#/components/schemas/ListResponse" - }, - { - "type": "object", - "properties": { - "values": { - "type": "array", - "items": { - "$ref": "#/components/schemas/FileResponse" - } - } - } - } - ] - }, - "FileRelationAccessGroup": { - "type": "object", - "properties": { - "data": { - "type": "object", - "properties": { - "type": { - "type": "string", - "default": "accessGroup" - }, - "id": { - "type": "integer", - "default": 1 - } - } - } - } - }, - "FileRelationAccessGroupGetResponse": { - "type": "object", - "properties": { - "data": { - "type": "object", - "properties": { - "type": { - "type": "string", - "default": "accessGroup" - }, - "id": { - "type": "integer", - "default": 1 - } - } - } - } - }, - "RightGroupCreate": { - "type": "object", - "properties": { - "data": { - "type": "object", - "properties": { - "type": { - "type": "string", - "default": "RightGroup" - }, - "attributes": { - "type": "object", - "properties": { - "name": { - "type": "string" - }, - "permissions": { - "type": "object" - } - } - } - } - } - } - }, - "RightGroupPatch": { - "type": "object", - "properties": { - "data": { - "type": "object", - "properties": { - "type": { - "type": "string", - "default": "RightGroup" - }, - "attributes": { - "type": "object", - "properties": { - "name": { - "type": "string" - }, - "permissions": { - "type": "object" - } - } - } - } - } - } - }, - "RightGroupResponse": { - "type": "object", - "properties": { - "jsonapi": { - "type": "object", - "properties": { - "version": { - "type": "string", - "default": "1.1" - }, - "ext": { - "type": "string", - "default": "https://jsonapi.org/profiles/ethanresnick/cursor-pagination" - } - } - }, - "links": { - "type": "object", - "properties": { - "self": { - "type": "string", - "default": "/api/v2/ui/globalpermissiongroups?page[size]=25" - }, - "first": { - "type": "string", - "default": "/api/v2/ui/globalpermissiongroups?page[size]=25&page[after]=0" - }, - "last": { - "type": "string", - "default": "/api/v2/ui/globalpermissiongroups?page[size]=25&page[before]=500" - }, - "next": { - "type": "string", - "default": "/api/v2/ui/globalpermissiongroups?page[size]=25&page[after]=25" - }, - "previous": { - "type": "string", - "default": "/api/v2/ui/globalpermissiongroups?page[size]=25&page[before]=25" - } - } - }, - "data": { - "type": "array", - "items": { - "type": "object", - "properties": { - "id": { - "type": "integer" - }, - "type": { - "type": "string", - "default": "RightGroup" - }, - "attributes": { - "type": "object", - "properties": { - "name": { - "type": "string" - }, - "permissions": { - "type": "object" - } - } - } - } - } - }, - "relationships": { - "type": "object", - "properties": [ - { - "properties": { - "userMembers": { - "type": "object", - "properties": { - "links": { - "type": "object", - "properties": { - "self": { - "type": "string", - "default": "/api/v2/ui/globalpermissiongroups/relationships/userMembers" - }, - "related": { - "type": "string", - "default": "/api/v2/ui/globalpermissiongroups/userMembers" - } - } - } - } - } - } - } - ] - }, - "included": { - "type": "array", - "items": { - "type": "object", - "properties": [ - { - "properties": { - "id": { - "type": "integer" - }, - "type": { - "type": "string", - "default": "userMembers" - }, - "attributes": { - "type": "object", - "properties": { - "id": { - "type": "integer" - }, - "name": { - "type": "string" - }, - "email": { - "type": "string" - }, - "passwordHash": { - "type": "string" - }, - "passwordSalt": { - "type": "string" - }, - "isValid": { - "type": "boolean" - }, - "isComputedPassword": { - "type": "boolean" - }, - "lastLoginDate": { - "type": "integer", - "format": "int64" - }, - "registeredSince": { - "type": "integer", - "format": "int64" - }, - "sessionLifetime": { - "type": "integer" - }, - "globalPermissionGroupId": { - "type": "integer" - }, - "yubikey": { - "type": "string" - }, - "otp1": { - "type": "string" - }, - "otp2": { - "type": "string" - }, - "otp3": { - "type": "string" - }, - "otp4": { - "type": "string" - } - } - } - } - } - ] - } - } - } - }, - "RightGroupRelationAccessGroup": { - "type": "object", - "properties": { - "data": { - "type": "object", - "properties": { - "type": { - "type": "string", - "default": "accessGroup" - }, - "id": { - "type": "integer", - "default": 1 - } - } - } - } - }, - "RightGroupRelationAccessGroupGetResponse": { - "type": "object", - "properties": { - "data": { - "type": "object", - "properties": { - "type": { - "type": "string", - "default": "accessGroup" - }, - "id": { - "type": "integer", - "default": 1 - } - } - } - } - }, - "RightGroupSingleResponse": { - "type": "object", - "properties": { - "data": { - "type": "array", - "items": { - "type": "object", - "properties": { - "id": { - "type": "integer" - }, - "type": { - "type": "string", - "default": "RightGroup" - }, - "attributes": { - "type": "object", - "properties": { - "name": { - "type": "string" - }, - "permissions": { - "type": "object" - } - } - } - } - } - }, - "relationships": { - "type": "object", - "properties": [ - { - "properties": { - "userMembers": { - "type": "object", - "properties": { - "links": { - "type": "object", - "properties": { - "self": { - "type": "string", - "default": "/api/v2/ui/globalpermissiongroups/relationships/userMembers" - }, - "related": { - "type": "string", - "default": "/api/v2/ui/globalpermissiongroups/userMembers" - } - } - } - } - } - } - } - ] - }, - "included": { - "type": "array", - "items": { - "type": "object", - "properties": [ - { - "properties": { - "id": { - "type": "integer" - }, - "type": { - "type": "string", - "default": "userMembers" - }, - "attributes": { - "type": "object", - "properties": { - "id": { - "type": "integer" - }, - "name": { - "type": "string" - }, - "email": { - "type": "string" - }, - "passwordHash": { - "type": "string" - }, - "passwordSalt": { - "type": "string" - }, - "isValid": { - "type": "boolean" - }, - "isComputedPassword": { - "type": "boolean" - }, - "lastLoginDate": { - "type": "integer", - "format": "int64" - }, - "registeredSince": { - "type": "integer", - "format": "int64" - }, - "sessionLifetime": { - "type": "integer" - }, - "globalPermissionGroupId": { - "type": "integer" - }, - "yubikey": { - "type": "string" - }, - "otp1": { - "type": "string" - }, - "otp2": { - "type": "string" - }, - "otp3": { - "type": "string" - }, - "otp4": { - "type": "string" - } - } - } - } - } - ] - } - } - } - }, - "RightGroupPostPatchResponse": { - "type": "object", - "properties": { - "jsonapi": { - "type": "object", - "properties": { - "version": { - "type": "string", - "default": "1.1" - }, - "ext": { - "type": "string", - "default": "https://jsonapi.org/profiles/ethanresnick/cursor-pagination" - } - } - }, - "data": { - "type": "array", - "items": { - "type": "object", - "properties": { - "id": { - "type": "integer" - }, - "type": { - "type": "string", - "default": "RightGroup" - }, - "attributes": { - "type": "object", - "properties": { - "name": { - "type": "string" - }, - "permissions": { - "type": "object" - } - } - } - } - } - } - } - }, - "RightGroupListResponse": { - "allOf": [ - { - "$ref": "#/components/schemas/ListResponse" - }, - { - "type": "object", - "properties": { - "values": { - "type": "array", - "items": { - "$ref": "#/components/schemas/RightGroupResponse" - } - } - } - } - ] - }, - "RightGroupRelationUserMembers": { - "type": "object", - "properties": { - "data": { - "type": "array", - "items": { - "type": "object", - "properties": { - "type": { - "type": "string", - "default": "userMembers" - }, - "id": { - "type": "integer", - "default": 1 - } - } - } - } - } - }, - "RightGroupRelationUserMembersGetResponse": { - "type": "object", - "properties": { - "data": { - "type": "array", - "items": { - "type": "object", - "properties": { - "type": { - "type": "string", - "default": "userMembers" - }, - "id": { - "type": "integer", - "default": 1 - } - } - } - } - } - }, - "HashCreate": { - "type": "object", - "properties": { - "data": { - "type": "object", - "properties": { - "type": { - "type": "string", - "default": "Hash" - }, - "attributes": { - "type": "object", - "properties": { - "hashlistId": { - "type": "integer" - }, - "hash": { - "type": "string" - }, - "salt": { - "type": "string" - }, - "plaintext": { - "type": "string" - }, - "timeCracked": { - "type": "integer", - "format": "int64" - }, - "chunkId": { - "type": "integer" - }, - "isCracked": { - "type": "boolean" - }, - "crackPos": { - "type": "integer", - "format": "int64" - } - } - } - } - } - } - }, - "HashPatch": { - "type": "object", - "properties": { - "data": { - "type": "object", - "properties": { - "type": { - "type": "string", - "default": "Hash" - }, - "attributes": { - "type": "object", - "properties": { - "chunkId": { - "type": "integer" - }, - "crackPos": { - "type": "integer", - "format": "int64" - }, - "hash": { - "type": "string" - }, - "hashlistId": { - "type": "integer" - }, - "isCracked": { - "type": "boolean" - }, - "plaintext": { - "type": "string" - }, - "salt": { - "type": "string" - }, - "timeCracked": { - "type": "integer", - "format": "int64" - } - } - } - } - } - } - }, - "HashResponse": { - "type": "object", - "properties": { - "jsonapi": { - "type": "object", - "properties": { - "version": { - "type": "string", - "default": "1.1" - }, - "ext": { - "type": "string", - "default": "https://jsonapi.org/profiles/ethanresnick/cursor-pagination" - } - } - }, - "links": { - "type": "object", - "properties": { - "self": { - "type": "string", - "default": "/api/v2/ui/hashes?page[size]=25" - }, - "first": { - "type": "string", - "default": "/api/v2/ui/hashes?page[size]=25&page[after]=0" - }, - "last": { - "type": "string", - "default": "/api/v2/ui/hashes?page[size]=25&page[before]=500" - }, - "next": { - "type": "string", - "default": "/api/v2/ui/hashes?page[size]=25&page[after]=25" - }, - "previous": { - "type": "string", - "default": "/api/v2/ui/hashes?page[size]=25&page[before]=25" - } - } - }, - "data": { - "type": "array", - "items": { - "type": "object", - "properties": { - "id": { - "type": "integer" - }, - "type": { - "type": "string", - "default": "Hash" - }, - "attributes": { - "type": "object", - "properties": { - "hashlistId": { - "type": "integer" - }, - "hash": { - "type": "string" - }, - "salt": { - "type": "string" - }, - "plaintext": { - "type": "string" - }, - "timeCracked": { - "type": "integer", - "format": "int64" - }, - "chunkId": { - "type": "integer" - }, - "isCracked": { - "type": "boolean" - }, - "crackPos": { - "type": "integer", - "format": "int64" - } - } - } - } - } - }, - "relationships": { - "type": "object", - "properties": [ - { - "properties": { - "chunk": { - "type": "object", - "properties": { - "links": { - "type": "object", - "properties": { - "self": { - "type": "string", - "default": "/api/v2/ui/hashes/relationships/chunk" - }, - "related": { - "type": "string", - "default": "/api/v2/ui/hashes/chunk" - } - } - } - } - } - } - }, - { - "properties": { - "hashlist": { - "type": "object", - "properties": { - "links": { - "type": "object", - "properties": { - "self": { - "type": "string", - "default": "/api/v2/ui/hashes/relationships/hashlist" - }, - "related": { - "type": "string", - "default": "/api/v2/ui/hashes/hashlist" - } - } - } - } - } - } - } - ] - }, - "included": { - "type": "array", - "items": { - "type": "object", - "properties": [ - { - "properties": { - "id": { - "type": "integer" - }, - "type": { - "type": "string", - "default": "chunk" - }, - "attributes": { - "type": "object", - "properties": { - "chunkId": { - "type": "integer" - }, - "taskId": { - "type": "integer" - }, - "skip": { - "type": "integer" - }, - "length": { - "type": "integer" - }, - "agentId": { - "type": "integer" - }, - "dispatchTime": { - "type": "integer", - "format": "int64" - }, - "solveTime": { - "type": "integer", - "format": "int64" - }, - "checkpoint": { - "type": "integer", - "format": "int64" - }, - "progress": { - "type": "integer" - }, - "state": { - "type": "integer" - }, - "cracked": { - "type": "integer" - }, - "speed": { - "type": "integer", - "format": "int64" - } - } - } - } - }, - { - "properties": { - "id": { - "type": "integer" - }, - "type": { - "type": "string", - "default": "hashlist" - }, - "attributes": { - "type": "object", - "properties": { - "hashlistSeperator": { - "type": "string" - }, - "sourceType": { - "type": "string" - }, - "sourceData": { - "type": "string" - }, - "hashlistId": { - "type": "integer" - }, - "name": { - "type": "string" - }, - "format": { - "type": "integer", - "enum": [ - 0, - 1, - 2, - 3 - ] - }, - "hashTypeId": { - "type": "integer" - }, - "hashCount": { - "type": "integer" - }, - "separator": { - "type": "string" - }, - "cracked": { - "type": "integer" - }, - "isSecret": { - "type": "boolean" - }, - "isHexSalt": { - "type": "boolean" - }, - "isSalted": { - "type": "boolean" - }, - "accessGroupId": { - "type": "integer" - }, - "notes": { - "type": "string" - }, - "useBrain": { - "type": "boolean" - }, - "brainFeatures": { - "type": "integer" - }, - "isArchived": { - "type": "boolean" - } - } - } - } - } - ] - } - } - } - }, - "HashRelationUserMembers": { - "type": "object", - "properties": { - "data": { - "type": "array", - "items": { - "type": "object", - "properties": { - "type": { - "type": "string", - "default": "userMembers" - }, - "id": { - "type": "integer", - "default": 1 - } - } - } - } - } - }, - "HashRelationUserMembersGetResponse": { - "type": "object", - "properties": { - "data": { - "type": "array", - "items": { - "type": "object", - "properties": { - "type": { - "type": "string", - "default": "userMembers" - }, - "id": { - "type": "integer", - "default": 1 - } - } - } - } - } - }, - "HashSingleResponse": { - "type": "object", - "properties": { - "data": { - "type": "array", - "items": { - "type": "object", - "properties": { - "id": { - "type": "integer" - }, - "type": { - "type": "string", - "default": "Hash" - }, - "attributes": { - "type": "object", - "properties": { - "hashlistId": { - "type": "integer" - }, - "hash": { - "type": "string" - }, - "salt": { - "type": "string" - }, - "plaintext": { - "type": "string" - }, - "timeCracked": { - "type": "integer", - "format": "int64" - }, - "chunkId": { - "type": "integer" - }, - "isCracked": { - "type": "boolean" - }, - "crackPos": { - "type": "integer", - "format": "int64" - } - } - } - } - } - }, - "relationships": { - "type": "object", - "properties": [ - { - "properties": { - "chunk": { - "type": "object", - "properties": { - "links": { - "type": "object", - "properties": { - "self": { - "type": "string", - "default": "/api/v2/ui/hashes/relationships/chunk" - }, - "related": { - "type": "string", - "default": "/api/v2/ui/hashes/chunk" - } - } - } - } - } - } - }, - { - "properties": { - "hashlist": { - "type": "object", - "properties": { - "links": { - "type": "object", - "properties": { - "self": { - "type": "string", - "default": "/api/v2/ui/hashes/relationships/hashlist" - }, - "related": { - "type": "string", - "default": "/api/v2/ui/hashes/hashlist" - } - } - } - } - } - } - } - ] - }, - "included": { - "type": "array", - "items": { - "type": "object", - "properties": [ - { - "properties": { - "id": { - "type": "integer" - }, - "type": { - "type": "string", - "default": "chunk" - }, - "attributes": { - "type": "object", - "properties": { - "chunkId": { - "type": "integer" - }, - "taskId": { - "type": "integer" - }, - "skip": { - "type": "integer" - }, - "length": { - "type": "integer" - }, - "agentId": { - "type": "integer" - }, - "dispatchTime": { - "type": "integer", - "format": "int64" - }, - "solveTime": { - "type": "integer", - "format": "int64" - }, - "checkpoint": { - "type": "integer", - "format": "int64" - }, - "progress": { - "type": "integer" - }, - "state": { - "type": "integer" - }, - "cracked": { - "type": "integer" - }, - "speed": { - "type": "integer", - "format": "int64" - } - } - } - } - }, - { - "properties": { - "id": { - "type": "integer" - }, - "type": { - "type": "string", - "default": "hashlist" - }, - "attributes": { - "type": "object", - "properties": { - "hashlistSeperator": { - "type": "string" - }, - "sourceType": { - "type": "string" - }, - "sourceData": { - "type": "string" - }, - "hashlistId": { - "type": "integer" - }, - "name": { - "type": "string" - }, - "format": { - "type": "integer", - "enum": [ - 0, - 1, - 2, - 3 - ] - }, - "hashTypeId": { - "type": "integer" - }, - "hashCount": { - "type": "integer" - }, - "separator": { - "type": "string" - }, - "cracked": { - "type": "integer" - }, - "isSecret": { - "type": "boolean" - }, - "isHexSalt": { - "type": "boolean" - }, - "isSalted": { - "type": "boolean" - }, - "accessGroupId": { - "type": "integer" - }, - "notes": { - "type": "string" - }, - "useBrain": { - "type": "boolean" - }, - "brainFeatures": { - "type": "integer" - }, - "isArchived": { - "type": "boolean" - } - } - } - } - } - ] - } - } - } - }, - "HashPostPatchResponse": { - "type": "object", - "properties": { - "jsonapi": { - "type": "object", - "properties": { - "version": { - "type": "string", - "default": "1.1" - }, - "ext": { - "type": "string", - "default": "https://jsonapi.org/profiles/ethanresnick/cursor-pagination" - } - } - }, - "data": { - "type": "array", - "items": { - "type": "object", - "properties": { - "id": { - "type": "integer" - }, - "type": { - "type": "string", - "default": "Hash" - }, - "attributes": { - "type": "object", - "properties": { - "hashlistId": { - "type": "integer" - }, - "hash": { - "type": "string" - }, - "salt": { - "type": "string" - }, - "plaintext": { - "type": "string" - }, - "timeCracked": { - "type": "integer", - "format": "int64" - }, - "chunkId": { - "type": "integer" - }, - "isCracked": { - "type": "boolean" - }, - "crackPos": { - "type": "integer", - "format": "int64" - } - } - } - } - } - } - } - }, - "HashListResponse": { - "allOf": [ - { - "$ref": "#/components/schemas/ListResponse" - }, - { - "type": "object", - "properties": { - "values": { - "type": "array", - "items": { - "$ref": "#/components/schemas/HashResponse" - } - } - } - } - ] - }, - "HashRelationChunk": { - "type": "object", - "properties": { - "data": { - "type": "object", - "properties": { - "type": { - "type": "string", - "default": "chunk" - }, - "id": { - "type": "integer", - "default": 1 - } - } - } - } - }, - "HashRelationChunkGetResponse": { - "type": "object", - "properties": { - "data": { - "type": "object", - "properties": { - "type": { - "type": "string", - "default": "chunk" - }, - "id": { - "type": "integer", - "default": 1 - } - } - } - } - }, - "HashRelationHashlist": { - "type": "object", - "properties": { - "data": { - "type": "object", - "properties": { - "type": { - "type": "string", - "default": "hashlist" - }, - "id": { - "type": "integer", - "default": 1 - } - } - } - } - }, - "HashRelationHashlistGetResponse": { - "type": "object", - "properties": { - "data": { - "type": "object", - "properties": { - "type": { - "type": "string", - "default": "hashlist" - }, - "id": { - "type": "integer", - "default": 1 - } - } - } - } - }, - "HashlistCreate": { - "type": "object", - "properties": { - "data": { - "type": "object", - "properties": { - "type": { - "type": "string", - "default": "Hashlist" - }, - "attributes": { - "type": "object", - "properties": { - "hashlistSeperator": { - "type": "string" - }, - "sourceType": { - "type": "string" - }, - "sourceData": { - "type": "string" - }, - "name": { - "type": "string" - }, - "format": { - "type": "integer", - "enum": [ - 0, - 1, - 2, - 3 - ] - }, - "hashTypeId": { - "type": "integer" - }, - "hashCount": { - "type": "integer" - }, - "separator": { - "type": "string" - }, - "isSecret": { - "type": "boolean" - }, - "isHexSalt": { - "type": "boolean" - }, - "isSalted": { - "type": "boolean" - }, - "accessGroupId": { - "type": "integer" - }, - "notes": { - "type": "string" - }, - "useBrain": { - "type": "boolean" - }, - "brainFeatures": { - "type": "integer" - }, - "isArchived": { - "type": "boolean" - } - } - } - } - } - } - }, - "HashlistPatch": { - "type": "object", - "properties": { - "data": { - "type": "object", - "properties": { - "type": { - "type": "string", - "default": "Hashlist" - }, - "attributes": { - "type": "object", - "properties": { - "accessGroupId": { - "type": "integer" - }, - "isArchived": { - "type": "boolean" - }, - "isSecret": { - "type": "boolean" - }, - "name": { - "type": "string" - }, - "notes": { - "type": "string" - } - } - } - } - } - } - }, - "HashlistResponse": { - "type": "object", - "properties": { - "jsonapi": { - "type": "object", - "properties": { - "version": { - "type": "string", - "default": "1.1" - }, - "ext": { - "type": "string", - "default": "https://jsonapi.org/profiles/ethanresnick/cursor-pagination" - } - } - }, - "links": { - "type": "object", - "properties": { - "self": { - "type": "string", - "default": "/api/v2/ui/hashlists?page[size]=25" - }, - "first": { - "type": "string", - "default": "/api/v2/ui/hashlists?page[size]=25&page[after]=0" - }, - "last": { - "type": "string", - "default": "/api/v2/ui/hashlists?page[size]=25&page[before]=500" - }, - "next": { - "type": "string", - "default": "/api/v2/ui/hashlists?page[size]=25&page[after]=25" - }, - "previous": { - "type": "string", - "default": "/api/v2/ui/hashlists?page[size]=25&page[before]=25" - } - } - }, - "data": { - "type": "array", - "items": { - "type": "object", - "properties": { - "id": { - "type": "integer" - }, - "type": { - "type": "string", - "default": "Hashlist" - }, - "attributes": { - "type": "object", - "properties": { - "name": { - "type": "string" - }, - "format": { - "type": "integer", - "enum": [ - 0, - 1, - 2, - 3 - ] - }, - "hashTypeId": { - "type": "integer" - }, - "hashCount": { - "type": "integer" - }, - "separator": { - "type": "string" - }, - "cracked": { - "type": "integer" - }, - "isSecret": { - "type": "boolean" - }, - "isHexSalt": { - "type": "boolean" - }, - "isSalted": { - "type": "boolean" - }, - "accessGroupId": { - "type": "integer" - }, - "notes": { - "type": "string" - }, - "useBrain": { - "type": "boolean" - }, - "brainFeatures": { - "type": "integer" - }, - "isArchived": { - "type": "boolean" - } - } - } - } - } - }, - "relationships": { - "type": "object", - "properties": [ - { - "properties": { - "accessGroup": { - "type": "object", - "properties": { - "links": { - "type": "object", - "properties": { - "self": { - "type": "string", - "default": "/api/v2/ui/hashlists/relationships/accessGroup" - }, - "related": { - "type": "string", - "default": "/api/v2/ui/hashlists/accessGroup" - } - } - } - } - } - } - }, - { - "properties": { - "hashType": { - "type": "object", - "properties": { - "links": { - "type": "object", - "properties": { - "self": { - "type": "string", - "default": "/api/v2/ui/hashlists/relationships/hashType" - }, - "related": { - "type": "string", - "default": "/api/v2/ui/hashlists/hashType" - } - } - } - } - } - } - }, - { - "properties": { - "hashes": { - "type": "object", - "properties": { - "links": { - "type": "object", - "properties": { - "self": { - "type": "string", - "default": "/api/v2/ui/hashlists/relationships/hashes" - }, - "related": { - "type": "string", - "default": "/api/v2/ui/hashlists/hashes" - } - } - } - } - } - } - }, - { - "properties": { - "hashlists": { - "type": "object", - "properties": { - "links": { - "type": "object", - "properties": { - "self": { - "type": "string", - "default": "/api/v2/ui/hashlists/relationships/hashlists" - }, - "related": { - "type": "string", - "default": "/api/v2/ui/hashlists/hashlists" - } - } - } - } - } - } - }, - { - "properties": { - "tasks": { - "type": "object", - "properties": { - "links": { - "type": "object", - "properties": { - "self": { - "type": "string", - "default": "/api/v2/ui/hashlists/relationships/tasks" - }, - "related": { - "type": "string", - "default": "/api/v2/ui/hashlists/tasks" - } - } - } - } - } - } - } - ] - }, - "included": { - "type": "array", - "items": { - "type": "object", - "properties": [ - { - "properties": { - "id": { - "type": "integer" - }, - "type": { - "type": "string", - "default": "accessGroup" - }, - "attributes": { - "type": "object", - "properties": { - "accessGroupId": { - "type": "integer" - }, - "groupName": { - "type": "string" - } - } - } - } - }, - { - "properties": { - "id": { - "type": "integer" - }, - "type": { - "type": "string", - "default": "hashType" - }, - "attributes": { - "type": "object", - "properties": { - "hashTypeId": { - "type": "integer" - }, - "description": { - "type": "string" - }, - "isSalted": { - "type": "boolean" - }, - "isSlowHash": { - "type": "boolean" - } - } - } - } - }, - { - "properties": { - "id": { - "type": "integer" - }, - "type": { - "type": "string", - "default": "hashes" - }, - "attributes": { - "type": "object", - "properties": { - "hashId": { - "type": "integer" - }, - "hashlistId": { - "type": "integer" - }, - "hash": { - "type": "string" - }, - "salt": { - "type": "string" - }, - "plaintext": { - "type": "string" - }, - "timeCracked": { - "type": "integer", - "format": "int64" - }, - "chunkId": { - "type": "integer" - }, - "isCracked": { - "type": "boolean" - }, - "crackPos": { - "type": "integer", - "format": "int64" - } - } - } - } - }, - { - "properties": { - "id": { - "type": "integer" - }, - "type": { - "type": "string", - "default": "hashlists" - }, - "attributes": { - "type": "object", - "properties": { - "hashlistSeperator": { - "type": "string" - }, - "sourceType": { - "type": "string" - }, - "sourceData": { - "type": "string" - }, - "hashlistId": { - "type": "integer" - }, - "name": { - "type": "string" - }, - "format": { - "type": "integer", - "enum": [ - 0, - 1, - 2, - 3 - ] - }, - "hashTypeId": { - "type": "integer" - }, - "hashCount": { - "type": "integer" - }, - "separator": { - "type": "string" - }, - "cracked": { - "type": "integer" - }, - "isSecret": { - "type": "boolean" - }, - "isHexSalt": { - "type": "boolean" - }, - "isSalted": { - "type": "boolean" - }, - "accessGroupId": { - "type": "integer" - }, - "notes": { - "type": "string" - }, - "useBrain": { - "type": "boolean" - }, - "brainFeatures": { - "type": "integer" - }, - "isArchived": { - "type": "boolean" - } - } - } - } - }, - { - "properties": { - "id": { - "type": "integer" - }, - "type": { - "type": "string", - "default": "tasks" - }, - "attributes": { - "type": "object", - "properties": { - "hashlistId": { - "type": "integer" - }, - "files": { - "type": "array", - "items": { - "type": "integer" - } - }, - "taskId": { - "type": "integer" - }, - "taskName": { - "type": "string" - }, - "attackCmd": { - "type": "string" - }, - "chunkTime": { - "type": "integer" - }, - "statusTimer": { - "type": "integer" - }, - "keyspace": { - "type": "integer", - "format": "int64" - }, - "keyspaceProgress": { - "type": "integer", - "format": "int64" - }, - "priority": { - "type": "integer" - }, - "maxAgents": { - "type": "integer" - }, - "color": { - "type": "string" - }, - "isSmall": { - "type": "boolean" - }, - "isCpuTask": { - "type": "boolean" - }, - "useNewBench": { - "type": "boolean" - }, - "skipKeyspace": { - "type": "integer", - "format": "int64" - }, - "crackerBinaryId": { - "type": "integer" - }, - "crackerBinaryTypeId": { - "type": "integer" - }, - "taskWrapperId": { - "type": "integer" - }, - "isArchived": { - "type": "boolean" - }, - "notes": { - "type": "string" - }, - "staticChunks": { - "type": "integer" - }, - "chunkSize": { - "type": "integer", - "format": "int64" - }, - "forcePipe": { - "type": "boolean" - }, - "preprocessorId": { - "type": "integer" - }, - "preprocessorCommand": { - "type": "string" - } - } - } - } - } - ] - } - } - } - }, - "HashlistRelationHashlist": { - "type": "object", - "properties": { - "data": { - "type": "object", - "properties": { - "type": { - "type": "string", - "default": "hashlist" - }, - "id": { - "type": "integer", - "default": 1 - } - } - } - } - }, - "HashlistRelationHashlistGetResponse": { - "type": "object", - "properties": { - "data": { - "type": "object", - "properties": { - "type": { - "type": "string", - "default": "hashlist" - }, - "id": { - "type": "integer", - "default": 1 - } - } - } - } - }, - "HashlistSingleResponse": { - "type": "object", - "properties": { - "data": { - "type": "array", - "items": { - "type": "object", - "properties": { - "id": { - "type": "integer" - }, - "type": { - "type": "string", - "default": "Hashlist" - }, - "attributes": { - "type": "object", - "properties": { - "name": { - "type": "string" - }, - "format": { - "type": "integer", - "enum": [ - 0, - 1, - 2, - 3 - ] - }, - "hashTypeId": { - "type": "integer" - }, - "hashCount": { - "type": "integer" - }, - "separator": { - "type": "string" - }, - "cracked": { - "type": "integer" - }, - "isSecret": { - "type": "boolean" - }, - "isHexSalt": { - "type": "boolean" - }, - "isSalted": { - "type": "boolean" - }, - "accessGroupId": { - "type": "integer" - }, - "notes": { - "type": "string" - }, - "useBrain": { - "type": "boolean" - }, - "brainFeatures": { - "type": "integer" - }, - "isArchived": { - "type": "boolean" - } - } - } - } - } - }, - "relationships": { - "type": "object", - "properties": [ - { - "properties": { - "accessGroup": { - "type": "object", - "properties": { - "links": { - "type": "object", - "properties": { - "self": { - "type": "string", - "default": "/api/v2/ui/hashlists/relationships/accessGroup" - }, - "related": { - "type": "string", - "default": "/api/v2/ui/hashlists/accessGroup" - } - } - } - } - } - } - }, - { - "properties": { - "hashType": { - "type": "object", - "properties": { - "links": { - "type": "object", - "properties": { - "self": { - "type": "string", - "default": "/api/v2/ui/hashlists/relationships/hashType" - }, - "related": { - "type": "string", - "default": "/api/v2/ui/hashlists/hashType" - } - } - } - } - } - } - }, - { - "properties": { - "hashes": { - "type": "object", - "properties": { - "links": { - "type": "object", - "properties": { - "self": { - "type": "string", - "default": "/api/v2/ui/hashlists/relationships/hashes" - }, - "related": { - "type": "string", - "default": "/api/v2/ui/hashlists/hashes" - } - } - } - } - } - } - }, - { - "properties": { - "hashlists": { - "type": "object", - "properties": { - "links": { - "type": "object", - "properties": { - "self": { - "type": "string", - "default": "/api/v2/ui/hashlists/relationships/hashlists" - }, - "related": { - "type": "string", - "default": "/api/v2/ui/hashlists/hashlists" - } - } - } - } - } - } - }, - { - "properties": { - "tasks": { - "type": "object", - "properties": { - "links": { - "type": "object", - "properties": { - "self": { - "type": "string", - "default": "/api/v2/ui/hashlists/relationships/tasks" - }, - "related": { - "type": "string", - "default": "/api/v2/ui/hashlists/tasks" - } - } - } - } - } - } - } - ] - }, - "included": { - "type": "array", - "items": { - "type": "object", - "properties": [ - { - "properties": { - "id": { - "type": "integer" - }, - "type": { - "type": "string", - "default": "accessGroup" - }, - "attributes": { - "type": "object", - "properties": { - "accessGroupId": { - "type": "integer" - }, - "groupName": { - "type": "string" - } - } - } - } - }, - { - "properties": { - "id": { - "type": "integer" - }, - "type": { - "type": "string", - "default": "hashType" - }, - "attributes": { - "type": "object", - "properties": { - "hashTypeId": { - "type": "integer" - }, - "description": { - "type": "string" - }, - "isSalted": { - "type": "boolean" - }, - "isSlowHash": { - "type": "boolean" - } - } - } - } - }, - { - "properties": { - "id": { - "type": "integer" - }, - "type": { - "type": "string", - "default": "hashes" - }, - "attributes": { - "type": "object", - "properties": { - "hashId": { - "type": "integer" - }, - "hashlistId": { - "type": "integer" - }, - "hash": { - "type": "string" - }, - "salt": { - "type": "string" - }, - "plaintext": { - "type": "string" - }, - "timeCracked": { - "type": "integer", - "format": "int64" - }, - "chunkId": { - "type": "integer" - }, - "isCracked": { - "type": "boolean" - }, - "crackPos": { - "type": "integer", - "format": "int64" - } - } - } - } - }, - { - "properties": { - "id": { - "type": "integer" - }, - "type": { - "type": "string", - "default": "hashlists" - }, - "attributes": { - "type": "object", - "properties": { - "hashlistSeperator": { - "type": "string" - }, - "sourceType": { - "type": "string" - }, - "sourceData": { - "type": "string" - }, - "hashlistId": { - "type": "integer" - }, - "name": { - "type": "string" - }, - "format": { - "type": "integer", - "enum": [ - 0, - 1, - 2, - 3 - ] - }, - "hashTypeId": { - "type": "integer" - }, - "hashCount": { - "type": "integer" - }, - "separator": { - "type": "string" - }, - "cracked": { - "type": "integer" - }, - "isSecret": { - "type": "boolean" - }, - "isHexSalt": { - "type": "boolean" - }, - "isSalted": { - "type": "boolean" - }, - "accessGroupId": { - "type": "integer" - }, - "notes": { - "type": "string" - }, - "useBrain": { - "type": "boolean" - }, - "brainFeatures": { - "type": "integer" - }, - "isArchived": { - "type": "boolean" - } - } - } - } - }, - { - "properties": { - "id": { - "type": "integer" - }, - "type": { - "type": "string", - "default": "tasks" - }, - "attributes": { - "type": "object", - "properties": { - "hashlistId": { - "type": "integer" - }, - "files": { - "type": "array", - "items": { - "type": "integer" - } - }, - "taskId": { - "type": "integer" - }, - "taskName": { - "type": "string" - }, - "attackCmd": { - "type": "string" - }, - "chunkTime": { - "type": "integer" - }, - "statusTimer": { - "type": "integer" - }, - "keyspace": { - "type": "integer", - "format": "int64" - }, - "keyspaceProgress": { - "type": "integer", - "format": "int64" - }, - "priority": { - "type": "integer" - }, - "maxAgents": { - "type": "integer" - }, - "color": { - "type": "string" - }, - "isSmall": { - "type": "boolean" - }, - "isCpuTask": { - "type": "boolean" - }, - "useNewBench": { - "type": "boolean" - }, - "skipKeyspace": { - "type": "integer", - "format": "int64" - }, - "crackerBinaryId": { - "type": "integer" - }, - "crackerBinaryTypeId": { - "type": "integer" - }, - "taskWrapperId": { - "type": "integer" - }, - "isArchived": { - "type": "boolean" - }, - "notes": { - "type": "string" - }, - "staticChunks": { - "type": "integer" - }, - "chunkSize": { - "type": "integer", - "format": "int64" - }, - "forcePipe": { - "type": "boolean" - }, - "preprocessorId": { - "type": "integer" - }, - "preprocessorCommand": { - "type": "string" - } - } - } - } - } - ] - } - } - } - }, - "HashlistPostPatchResponse": { - "type": "object", - "properties": { - "jsonapi": { - "type": "object", - "properties": { - "version": { - "type": "string", - "default": "1.1" - }, - "ext": { - "type": "string", - "default": "https://jsonapi.org/profiles/ethanresnick/cursor-pagination" - } - } - }, - "data": { - "type": "array", - "items": { - "type": "object", - "properties": { - "id": { - "type": "integer" - }, - "type": { - "type": "string", - "default": "Hashlist" - }, - "attributes": { - "type": "object", - "properties": { - "name": { - "type": "string" - }, - "format": { - "type": "integer", - "enum": [ - 0, - 1, - 2, - 3 - ] - }, - "hashTypeId": { - "type": "integer" - }, - "hashCount": { - "type": "integer" - }, - "separator": { - "type": "string" - }, - "cracked": { - "type": "integer" - }, - "isSecret": { - "type": "boolean" - }, - "isHexSalt": { - "type": "boolean" - }, - "isSalted": { - "type": "boolean" - }, - "accessGroupId": { - "type": "integer" - }, - "notes": { - "type": "string" - }, - "useBrain": { - "type": "boolean" - }, - "brainFeatures": { - "type": "integer" - }, - "isArchived": { - "type": "boolean" - } - } - } - } - } - } - } - }, - "HashlistListResponse": { - "allOf": [ - { - "$ref": "#/components/schemas/ListResponse" - }, - { - "type": "object", - "properties": { - "values": { - "type": "array", - "items": { - "$ref": "#/components/schemas/HashlistResponse" - } - } - } - } - ] - }, - "HashlistRelationAccessGroup": { - "type": "object", - "properties": { - "data": { - "type": "object", - "properties": { - "type": { - "type": "string", - "default": "accessGroup" - }, - "id": { - "type": "integer", - "default": 1 - } - } - } - } - }, - "HashlistRelationAccessGroupGetResponse": { - "type": "object", - "properties": { - "data": { - "type": "object", - "properties": { - "type": { - "type": "string", - "default": "accessGroup" - }, - "id": { - "type": "integer", - "default": 1 - } - } - } - } - }, - "HashlistRelationHashType": { - "type": "object", - "properties": { - "data": { - "type": "object", - "properties": { - "type": { - "type": "string", - "default": "hashType" - }, - "id": { - "type": "integer", - "default": 1 - } - } - } - } - }, - "HashlistRelationHashTypeGetResponse": { - "type": "object", - "properties": { - "data": { - "type": "object", - "properties": { - "type": { - "type": "string", - "default": "hashType" - }, - "id": { - "type": "integer", - "default": 1 - } - } - } - } - }, - "HashlistRelationHashes": { - "type": "object", - "properties": { - "data": { - "type": "array", - "items": { - "type": "object", - "properties": { - "type": { - "type": "string", - "default": "hashes" - }, - "id": { - "type": "integer", - "default": 1 - } - } - } - } - } - }, - "HashlistRelationHashesGetResponse": { - "type": "object", - "properties": { - "data": { - "type": "array", - "items": { - "type": "object", - "properties": { - "type": { - "type": "string", - "default": "hashes" - }, - "id": { - "type": "integer", - "default": 1 - } - } - } - } - } - }, - "HashlistRelationHashlists": { - "type": "object", - "properties": { - "data": { - "type": "array", - "items": { - "type": "object", - "properties": { - "type": { - "type": "string", - "default": "hashlists" - }, - "id": { - "type": "integer", - "default": 1 - } - } - } - } - } - }, - "HashlistRelationHashlistsGetResponse": { - "type": "object", - "properties": { - "data": { - "type": "array", - "items": { - "type": "object", - "properties": { - "type": { - "type": "string", - "default": "hashlists" - }, - "id": { - "type": "integer", - "default": 1 - } - } - } - } - } - }, - "HashlistRelationTasks": { - "type": "object", - "properties": { - "data": { - "type": "array", - "items": { - "type": "object", - "properties": { - "type": { - "type": "string", - "default": "tasks" - }, - "id": { - "type": "integer", - "default": 1 - } - } - } - } - } - }, - "HashlistRelationTasksGetResponse": { - "type": "object", - "properties": { - "data": { - "type": "array", - "items": { - "type": "object", - "properties": { - "type": { - "type": "string", - "default": "tasks" - }, - "id": { - "type": "integer", - "default": 1 - } - } - } - } - } - }, - "HashTypeCreate": { - "type": "object", - "properties": { - "data": { - "type": "object", - "properties": { - "type": { - "type": "string", - "default": "HashType" - }, - "attributes": { - "type": "object", - "properties": { - "hashTypeId": { - "type": "integer" - }, - "description": { - "type": "string" - }, - "isSalted": { - "type": "boolean" - }, - "isSlowHash": { - "type": "boolean" - } - } - } - } - } - } - }, - "HashTypePatch": { - "type": "object", - "properties": { - "data": { - "type": "object", - "properties": { - "type": { - "type": "string", - "default": "HashType" - }, - "attributes": { - "type": "object", - "properties": { - "description": { - "type": "string" - }, - "isSalted": { - "type": "boolean" - }, - "isSlowHash": { - "type": "boolean" - } - } - } - } - } - } - }, - "HashTypeResponse": { - "type": "object", - "properties": { - "jsonapi": { - "type": "object", - "properties": { - "version": { - "type": "string", - "default": "1.1" - }, - "ext": { - "type": "string", - "default": "https://jsonapi.org/profiles/ethanresnick/cursor-pagination" - } - } - }, - "links": { - "type": "object", - "properties": { - "self": { - "type": "string", - "default": "/api/v2/ui/hashtypes?page[size]=25" - }, - "first": { - "type": "string", - "default": "/api/v2/ui/hashtypes?page[size]=25&page[after]=0" - }, - "last": { - "type": "string", - "default": "/api/v2/ui/hashtypes?page[size]=25&page[before]=500" - }, - "next": { - "type": "string", - "default": "/api/v2/ui/hashtypes?page[size]=25&page[after]=25" - }, - "previous": { - "type": "string", - "default": "/api/v2/ui/hashtypes?page[size]=25&page[before]=25" - } - } - }, - "data": { - "type": "array", - "items": { - "type": "object", - "properties": { - "id": { - "type": "integer" - }, - "type": { - "type": "string", - "default": "HashType" - }, - "attributes": { - "type": "object", - "properties": { - "description": { - "type": "string" - }, - "isSalted": { - "type": "boolean" - }, - "isSlowHash": { - "type": "boolean" - } - } - } - } - } - }, - "relationships": { - "type": "object", - "properties": [] - }, - "included": { - "type": "array", - "items": { - "type": "object", - "properties": [] - } - } - } - }, - "HashTypeRelationTasks": { - "type": "object", - "properties": { - "data": { - "type": "array", - "items": { - "type": "object", - "properties": { - "type": { - "type": "string", - "default": "tasks" - }, - "id": { - "type": "integer", - "default": 1 - } - } - } - } - } - }, - "HashTypeRelationTasksGetResponse": { - "type": "object", - "properties": { - "data": { - "type": "array", - "items": { - "type": "object", - "properties": { - "type": { - "type": "string", - "default": "tasks" - }, - "id": { - "type": "integer", - "default": 1 - } - } - } - } - } - }, - "HashTypeSingleResponse": { - "type": "object", - "properties": { - "data": { - "type": "array", - "items": { - "type": "object", - "properties": { - "id": { - "type": "integer" - }, - "type": { - "type": "string", - "default": "HashType" - }, - "attributes": { - "type": "object", - "properties": { - "description": { - "type": "string" - }, - "isSalted": { - "type": "boolean" - }, - "isSlowHash": { - "type": "boolean" - } - } - } - } - } - }, - "relationships": { - "type": "object", - "properties": [] - }, - "included": { - "type": "array", - "items": { - "type": "object", - "properties": [] - } - } - } - }, - "HashTypePostPatchResponse": { - "type": "object", - "properties": { - "jsonapi": { - "type": "object", - "properties": { - "version": { - "type": "string", - "default": "1.1" - }, - "ext": { - "type": "string", - "default": "https://jsonapi.org/profiles/ethanresnick/cursor-pagination" - } - } - }, - "data": { - "type": "array", - "items": { - "type": "object", - "properties": { - "id": { - "type": "integer" - }, - "type": { - "type": "string", - "default": "HashType" - }, - "attributes": { - "type": "object", - "properties": { - "description": { - "type": "string" - }, - "isSalted": { - "type": "boolean" - }, - "isSlowHash": { - "type": "boolean" - } - } - } - } - } - } - } - }, - "HashTypeListResponse": { - "allOf": [ - { - "$ref": "#/components/schemas/ListResponse" - }, - { - "type": "object", - "properties": { - "values": { - "type": "array", - "items": { - "$ref": "#/components/schemas/HashTypeResponse" - } - } - } - } - ] - }, - "HealthCheckAgentCreate": { - "type": "object", - "properties": { - "data": { - "type": "object", - "properties": { - "type": { - "type": "string", - "default": "HealthCheckAgent" - }, - "attributes": { - "type": "object", - "properties": [] - } - } - } - } - }, - "HealthCheckAgentPatch": { - "type": "object", - "properties": { - "data": { - "type": "object", - "properties": { - "type": { - "type": "string", - "default": "HealthCheckAgent" - }, - "attributes": { - "type": "object", - "properties": [] - } - } - } - } - }, - "HealthCheckAgentResponse": { - "type": "object", - "properties": { - "jsonapi": { - "type": "object", - "properties": { - "version": { - "type": "string", - "default": "1.1" - }, - "ext": { - "type": "string", - "default": "https://jsonapi.org/profiles/ethanresnick/cursor-pagination" - } - } - }, - "links": { - "type": "object", - "properties": { - "self": { - "type": "string", - "default": "/api/v2/ui/healthcheckagents?page[size]=25" - }, - "first": { - "type": "string", - "default": "/api/v2/ui/healthcheckagents?page[size]=25&page[after]=0" - }, - "last": { - "type": "string", - "default": "/api/v2/ui/healthcheckagents?page[size]=25&page[before]=500" - }, - "next": { - "type": "string", - "default": "/api/v2/ui/healthcheckagents?page[size]=25&page[after]=25" - }, - "previous": { - "type": "string", - "default": "/api/v2/ui/healthcheckagents?page[size]=25&page[before]=25" - } - } - }, - "data": { - "type": "array", - "items": { - "type": "object", - "properties": { - "id": { - "type": "integer" - }, - "type": { - "type": "string", - "default": "HealthCheckAgent" - }, - "attributes": { - "type": "object", - "properties": { - "healthCheckId": { - "type": "integer" - }, - "agentId": { - "type": "integer" - }, - "status": { - "type": "integer" - }, - "cracked": { - "type": "integer" - }, - "numGpus": { - "type": "integer" - }, - "start": { - "type": "integer", - "format": "int64" - }, - "end": { - "type": "integer", - "format": "int64" - }, - "errors": { - "type": "string" - } - } - } - } - } - }, - "relationships": { - "type": "object", - "properties": [ - { - "properties": { - "agent": { - "type": "object", - "properties": { - "links": { - "type": "object", - "properties": { - "self": { - "type": "string", - "default": "/api/v2/ui/healthcheckagents/relationships/agent" - }, - "related": { - "type": "string", - "default": "/api/v2/ui/healthcheckagents/agent" - } - } - } - } - } - } - }, - { - "properties": { - "healthCheck": { - "type": "object", - "properties": { - "links": { - "type": "object", - "properties": { - "self": { - "type": "string", - "default": "/api/v2/ui/healthcheckagents/relationships/healthCheck" - }, - "related": { - "type": "string", - "default": "/api/v2/ui/healthcheckagents/healthCheck" - } - } - } - } - } - } - } - ] - }, - "included": { - "type": "array", - "items": { - "type": "object", - "properties": [ - { - "properties": { - "id": { - "type": "integer" - }, - "type": { - "type": "string", - "default": "agent" - }, - "attributes": { - "type": "object", - "properties": { - "agentId": { - "type": "integer" - }, - "agentName": { - "type": "string" - }, - "uid": { - "type": "string" - }, - "os": { - "type": "integer" - }, - "devices": { - "type": "string" - }, - "cmdPars": { - "type": "string" - }, - "ignoreErrors": { - "type": "integer", - "enum": [ - 0, - 1, - 2 - ] - }, - "isActive": { - "type": "boolean" - }, - "isTrusted": { - "type": "boolean" - }, - "token": { - "type": "string" - }, - "lastAct": { - "type": "string" - }, - "lastTime": { - "type": "integer", - "format": "int64" - }, - "lastIp": { - "type": "string" - }, - "userId": { - "type": "integer" - }, - "cpuOnly": { - "type": "boolean" - }, - "clientSignature": { - "type": "string" - } - } - } - } - }, - { - "properties": { - "id": { - "type": "integer" - }, - "type": { - "type": "string", - "default": "healthCheck" - }, - "attributes": { - "type": "object", - "properties": { - "healthCheckId": { - "type": "integer" - }, - "time": { - "type": "integer", - "format": "int64" - }, - "status": { - "type": "integer" - }, - "checkType": { - "type": "integer" - }, - "hashtypeId": { - "type": "integer" - }, - "crackerBinaryId": { - "type": "integer" - }, - "expectedCracks": { - "type": "integer" - }, - "attackCmd": { - "type": "string" - } - } - } - } - } - ] - } - } - } - }, - "HealthCheckAgentRelationTasks": { - "type": "object", - "properties": { - "data": { - "type": "array", - "items": { - "type": "object", - "properties": { - "type": { - "type": "string", - "default": "tasks" - }, - "id": { - "type": "integer", - "default": 1 - } - } - } - } - } - }, - "HealthCheckAgentRelationTasksGetResponse": { - "type": "object", - "properties": { - "data": { - "type": "array", - "items": { - "type": "object", - "properties": { - "type": { - "type": "string", - "default": "tasks" - }, - "id": { - "type": "integer", - "default": 1 - } - } - } - } - } - }, - "HealthCheckAgentSingleResponse": { - "type": "object", - "properties": { - "data": { - "type": "array", - "items": { - "type": "object", - "properties": { - "id": { - "type": "integer" - }, - "type": { - "type": "string", - "default": "HealthCheckAgent" - }, - "attributes": { - "type": "object", - "properties": { - "healthCheckId": { - "type": "integer" - }, - "agentId": { - "type": "integer" - }, - "status": { - "type": "integer" - }, - "cracked": { - "type": "integer" - }, - "numGpus": { - "type": "integer" - }, - "start": { - "type": "integer", - "format": "int64" - }, - "end": { - "type": "integer", - "format": "int64" - }, - "errors": { - "type": "string" - } - } - } - } - } - }, - "relationships": { - "type": "object", - "properties": [ - { - "properties": { - "agent": { - "type": "object", - "properties": { - "links": { - "type": "object", - "properties": { - "self": { - "type": "string", - "default": "/api/v2/ui/healthcheckagents/relationships/agent" - }, - "related": { - "type": "string", - "default": "/api/v2/ui/healthcheckagents/agent" - } - } - } - } - } - } - }, - { - "properties": { - "healthCheck": { - "type": "object", - "properties": { - "links": { - "type": "object", - "properties": { - "self": { - "type": "string", - "default": "/api/v2/ui/healthcheckagents/relationships/healthCheck" - }, - "related": { - "type": "string", - "default": "/api/v2/ui/healthcheckagents/healthCheck" - } - } - } - } - } - } - } - ] - }, - "included": { - "type": "array", - "items": { - "type": "object", - "properties": [ - { - "properties": { - "id": { - "type": "integer" - }, - "type": { - "type": "string", - "default": "agent" - }, - "attributes": { - "type": "object", - "properties": { - "agentId": { - "type": "integer" - }, - "agentName": { - "type": "string" - }, - "uid": { - "type": "string" - }, - "os": { - "type": "integer" - }, - "devices": { - "type": "string" - }, - "cmdPars": { - "type": "string" - }, - "ignoreErrors": { - "type": "integer", - "enum": [ - 0, - 1, - 2 - ] - }, - "isActive": { - "type": "boolean" - }, - "isTrusted": { - "type": "boolean" - }, - "token": { - "type": "string" - }, - "lastAct": { - "type": "string" - }, - "lastTime": { - "type": "integer", - "format": "int64" - }, - "lastIp": { - "type": "string" - }, - "userId": { - "type": "integer" - }, - "cpuOnly": { - "type": "boolean" - }, - "clientSignature": { - "type": "string" - } - } - } - } - }, - { - "properties": { - "id": { - "type": "integer" - }, - "type": { - "type": "string", - "default": "healthCheck" - }, - "attributes": { - "type": "object", - "properties": { - "healthCheckId": { - "type": "integer" - }, - "time": { - "type": "integer", - "format": "int64" - }, - "status": { - "type": "integer" - }, - "checkType": { - "type": "integer" - }, - "hashtypeId": { - "type": "integer" - }, - "crackerBinaryId": { - "type": "integer" - }, - "expectedCracks": { - "type": "integer" - }, - "attackCmd": { - "type": "string" - } - } - } - } - } - ] - } - } - } - }, - "HealthCheckAgentPostPatchResponse": { - "type": "object", - "properties": { - "jsonapi": { - "type": "object", - "properties": { - "version": { - "type": "string", - "default": "1.1" - }, - "ext": { - "type": "string", - "default": "https://jsonapi.org/profiles/ethanresnick/cursor-pagination" - } - } - }, - "data": { - "type": "array", - "items": { - "type": "object", - "properties": { - "id": { - "type": "integer" - }, - "type": { - "type": "string", - "default": "HealthCheckAgent" - }, - "attributes": { - "type": "object", - "properties": { - "healthCheckId": { - "type": "integer" - }, - "agentId": { - "type": "integer" - }, - "status": { - "type": "integer" - }, - "cracked": { - "type": "integer" - }, - "numGpus": { - "type": "integer" - }, - "start": { - "type": "integer", - "format": "int64" - }, - "end": { - "type": "integer", - "format": "int64" - }, - "errors": { - "type": "string" - } - } - } - } - } - } - } - }, - "HealthCheckAgentListResponse": { - "allOf": [ - { - "$ref": "#/components/schemas/ListResponse" - }, - { - "type": "object", - "properties": { - "values": { - "type": "array", - "items": { - "$ref": "#/components/schemas/HealthCheckAgentResponse" - } - } - } - } - ] - }, - "HealthCheckAgentRelationAgent": { - "type": "object", - "properties": { - "data": { - "type": "object", - "properties": { - "type": { - "type": "string", - "default": "agent" - }, - "id": { - "type": "integer", - "default": 1 - } - } - } - } - }, - "HealthCheckAgentRelationAgentGetResponse": { - "type": "object", - "properties": { - "data": { - "type": "object", - "properties": { - "type": { - "type": "string", - "default": "agent" - }, - "id": { - "type": "integer", - "default": 1 - } - } - } - } - }, - "HealthCheckAgentRelationHealthCheck": { - "type": "object", - "properties": { - "data": { - "type": "object", - "properties": { - "type": { - "type": "string", - "default": "healthCheck" - }, - "id": { - "type": "integer", - "default": 1 - } - } - } - } - }, - "HealthCheckAgentRelationHealthCheckGetResponse": { - "type": "object", - "properties": { - "data": { - "type": "object", - "properties": { - "type": { - "type": "string", - "default": "healthCheck" - }, - "id": { - "type": "integer", - "default": 1 - } - } - } - } - }, - "HealthCheckCreate": { - "type": "object", - "properties": { - "data": { - "type": "object", - "properties": { - "type": { - "type": "string", - "default": "HealthCheck" - }, - "attributes": { - "type": "object", - "properties": { - "checkType": { - "type": "integer" - }, - "hashtypeId": { - "type": "integer" - }, - "crackerBinaryId": { - "type": "integer" - } - } - } - } - } - } - }, - "HealthCheckPatch": { - "type": "object", - "properties": { - "data": { - "type": "object", - "properties": { - "type": { - "type": "string", - "default": "HealthCheck" - }, - "attributes": { - "type": "object", - "properties": { - "checkType": { - "type": "integer" - }, - "crackerBinaryId": { - "type": "integer" - }, - "hashtypeId": { - "type": "integer" - } - } - } - } - } - } - }, - "HealthCheckResponse": { - "type": "object", - "properties": { - "jsonapi": { - "type": "object", - "properties": { - "version": { - "type": "string", - "default": "1.1" - }, - "ext": { - "type": "string", - "default": "https://jsonapi.org/profiles/ethanresnick/cursor-pagination" - } - } - }, - "links": { - "type": "object", - "properties": { - "self": { - "type": "string", - "default": "/api/v2/ui/healthchecks?page[size]=25" - }, - "first": { - "type": "string", - "default": "/api/v2/ui/healthchecks?page[size]=25&page[after]=0" - }, - "last": { - "type": "string", - "default": "/api/v2/ui/healthchecks?page[size]=25&page[before]=500" - }, - "next": { - "type": "string", - "default": "/api/v2/ui/healthchecks?page[size]=25&page[after]=25" - }, - "previous": { - "type": "string", - "default": "/api/v2/ui/healthchecks?page[size]=25&page[before]=25" - } - } - }, - "data": { - "type": "array", - "items": { - "type": "object", - "properties": { - "id": { - "type": "integer" - }, - "type": { - "type": "string", - "default": "HealthCheck" - }, - "attributes": { - "type": "object", - "properties": { - "time": { - "type": "integer", - "format": "int64" - }, - "status": { - "type": "integer" - }, - "checkType": { - "type": "integer" - }, - "hashtypeId": { - "type": "integer" - }, - "crackerBinaryId": { - "type": "integer" - }, - "expectedCracks": { - "type": "integer" - }, - "attackCmd": { - "type": "string" - } - } - } - } - } - }, - "relationships": { - "type": "object", - "properties": [ - { - "properties": { - "crackerBinary": { - "type": "object", - "properties": { - "links": { - "type": "object", - "properties": { - "self": { - "type": "string", - "default": "/api/v2/ui/healthchecks/relationships/crackerBinary" - }, - "related": { - "type": "string", - "default": "/api/v2/ui/healthchecks/crackerBinary" - } - } - } - } - } - } - }, - { - "properties": { - "hashType": { - "type": "object", - "properties": { - "links": { - "type": "object", - "properties": { - "self": { - "type": "string", - "default": "/api/v2/ui/healthchecks/relationships/hashType" - }, - "related": { - "type": "string", - "default": "/api/v2/ui/healthchecks/hashType" - } - } - } - } - } - } - }, - { - "properties": { - "healthCheckAgents": { - "type": "object", - "properties": { - "links": { - "type": "object", - "properties": { - "self": { - "type": "string", - "default": "/api/v2/ui/healthchecks/relationships/healthCheckAgents" - }, - "related": { - "type": "string", - "default": "/api/v2/ui/healthchecks/healthCheckAgents" - } - } - } - } - } - } - } - ] - }, - "included": { - "type": "array", - "items": { - "type": "object", - "properties": [ - { - "properties": { - "id": { - "type": "integer" - }, - "type": { - "type": "string", - "default": "crackerBinary" - }, - "attributes": { - "type": "object", - "properties": { - "crackerBinaryId": { - "type": "integer" - }, - "crackerBinaryTypeId": { - "type": "integer" - }, - "version": { - "type": "string" - }, - "downloadUrl": { - "type": "string" - }, - "binaryName": { - "type": "string" - } - } - } - } - }, - { - "properties": { - "id": { - "type": "integer" - }, - "type": { - "type": "string", - "default": "hashType" - }, - "attributes": { - "type": "object", - "properties": { - "hashTypeId": { - "type": "integer" - }, - "description": { - "type": "string" - }, - "isSalted": { - "type": "boolean" - }, - "isSlowHash": { - "type": "boolean" - } - } - } - } - }, - { - "properties": { - "id": { - "type": "integer" - }, - "type": { - "type": "string", - "default": "healthCheckAgents" - }, - "attributes": { - "type": "object", - "properties": { - "healthCheckAgentId": { - "type": "integer" - }, - "healthCheckId": { - "type": "integer" - }, - "agentId": { - "type": "integer" - }, - "status": { - "type": "integer" - }, - "cracked": { - "type": "integer" - }, - "numGpus": { - "type": "integer" - }, - "start": { - "type": "integer", - "format": "int64" - }, - "end": { - "type": "integer", - "format": "int64" - }, - "errors": { - "type": "string" - } - } - } - } - } - ] - } - } - } - }, - "HealthCheckRelationHealthCheck": { - "type": "object", - "properties": { - "data": { - "type": "object", - "properties": { - "type": { - "type": "string", - "default": "healthCheck" - }, - "id": { - "type": "integer", - "default": 1 - } - } - } - } - }, - "HealthCheckRelationHealthCheckGetResponse": { - "type": "object", - "properties": { - "data": { - "type": "object", - "properties": { - "type": { - "type": "string", - "default": "healthCheck" - }, - "id": { - "type": "integer", - "default": 1 - } - } - } - } - }, - "HealthCheckSingleResponse": { - "type": "object", - "properties": { - "data": { - "type": "array", - "items": { - "type": "object", - "properties": { - "id": { - "type": "integer" - }, - "type": { - "type": "string", - "default": "HealthCheck" - }, - "attributes": { - "type": "object", - "properties": { - "time": { - "type": "integer", - "format": "int64" - }, - "status": { - "type": "integer" - }, - "checkType": { - "type": "integer" - }, - "hashtypeId": { - "type": "integer" - }, - "crackerBinaryId": { - "type": "integer" - }, - "expectedCracks": { - "type": "integer" - }, - "attackCmd": { - "type": "string" - } - } - } - } - } - }, - "relationships": { - "type": "object", - "properties": [ - { - "properties": { - "crackerBinary": { - "type": "object", - "properties": { - "links": { - "type": "object", - "properties": { - "self": { - "type": "string", - "default": "/api/v2/ui/healthchecks/relationships/crackerBinary" - }, - "related": { - "type": "string", - "default": "/api/v2/ui/healthchecks/crackerBinary" - } - } - } - } - } - } - }, - { - "properties": { - "hashType": { - "type": "object", - "properties": { - "links": { - "type": "object", - "properties": { - "self": { - "type": "string", - "default": "/api/v2/ui/healthchecks/relationships/hashType" - }, - "related": { - "type": "string", - "default": "/api/v2/ui/healthchecks/hashType" - } - } - } - } - } - } - }, - { - "properties": { - "healthCheckAgents": { - "type": "object", - "properties": { - "links": { - "type": "object", - "properties": { - "self": { - "type": "string", - "default": "/api/v2/ui/healthchecks/relationships/healthCheckAgents" - }, - "related": { - "type": "string", - "default": "/api/v2/ui/healthchecks/healthCheckAgents" - } - } - } - } - } - } - } - ] - }, - "included": { - "type": "array", - "items": { - "type": "object", - "properties": [ - { - "properties": { - "id": { - "type": "integer" - }, - "type": { - "type": "string", - "default": "crackerBinary" - }, - "attributes": { - "type": "object", - "properties": { - "crackerBinaryId": { - "type": "integer" - }, - "crackerBinaryTypeId": { - "type": "integer" - }, - "version": { - "type": "string" - }, - "downloadUrl": { - "type": "string" - }, - "binaryName": { - "type": "string" - } - } - } - } - }, - { - "properties": { - "id": { - "type": "integer" - }, - "type": { - "type": "string", - "default": "hashType" - }, - "attributes": { - "type": "object", - "properties": { - "hashTypeId": { - "type": "integer" - }, - "description": { - "type": "string" - }, - "isSalted": { - "type": "boolean" - }, - "isSlowHash": { - "type": "boolean" - } - } - } - } - }, - { - "properties": { - "id": { - "type": "integer" - }, - "type": { - "type": "string", - "default": "healthCheckAgents" - }, - "attributes": { - "type": "object", - "properties": { - "healthCheckAgentId": { - "type": "integer" - }, - "healthCheckId": { - "type": "integer" - }, - "agentId": { - "type": "integer" - }, - "status": { - "type": "integer" - }, - "cracked": { - "type": "integer" - }, - "numGpus": { - "type": "integer" - }, - "start": { - "type": "integer", - "format": "int64" - }, - "end": { - "type": "integer", - "format": "int64" - }, - "errors": { - "type": "string" - } - } - } - } - } - ] - } - } - } - }, - "HealthCheckPostPatchResponse": { - "type": "object", - "properties": { - "jsonapi": { - "type": "object", - "properties": { - "version": { - "type": "string", - "default": "1.1" - }, - "ext": { - "type": "string", - "default": "https://jsonapi.org/profiles/ethanresnick/cursor-pagination" - } - } - }, - "data": { - "type": "array", - "items": { - "type": "object", - "properties": { - "id": { - "type": "integer" - }, - "type": { - "type": "string", - "default": "HealthCheck" - }, - "attributes": { - "type": "object", - "properties": { - "time": { - "type": "integer", - "format": "int64" - }, - "status": { - "type": "integer" - }, - "checkType": { - "type": "integer" - }, - "hashtypeId": { - "type": "integer" - }, - "crackerBinaryId": { - "type": "integer" - }, - "expectedCracks": { - "type": "integer" - }, - "attackCmd": { - "type": "string" - } - } - } - } - } - } - } - }, - "HealthCheckListResponse": { - "allOf": [ - { - "$ref": "#/components/schemas/ListResponse" - }, - { - "type": "object", - "properties": { - "values": { - "type": "array", - "items": { - "$ref": "#/components/schemas/HealthCheckResponse" - } - } - } - } - ] - }, - "HealthCheckRelationCrackerBinary": { - "type": "object", - "properties": { - "data": { - "type": "object", - "properties": { - "type": { - "type": "string", - "default": "crackerBinary" - }, - "id": { - "type": "integer", - "default": 1 - } - } - } - } - }, - "HealthCheckRelationCrackerBinaryGetResponse": { - "type": "object", - "properties": { - "data": { - "type": "object", - "properties": { - "type": { - "type": "string", - "default": "crackerBinary" - }, - "id": { - "type": "integer", - "default": 1 - } - } - } - } - }, - "HealthCheckRelationHashType": { - "type": "object", - "properties": { - "data": { - "type": "object", - "properties": { - "type": { - "type": "string", - "default": "hashType" - }, - "id": { - "type": "integer", - "default": 1 - } - } - } - } - }, - "HealthCheckRelationHashTypeGetResponse": { - "type": "object", - "properties": { - "data": { - "type": "object", - "properties": { - "type": { - "type": "string", - "default": "hashType" - }, - "id": { - "type": "integer", - "default": 1 - } - } - } - } - }, - "HealthCheckRelationHealthCheckAgents": { - "type": "object", - "properties": { - "data": { - "type": "array", - "items": { - "type": "object", - "properties": { - "type": { - "type": "string", - "default": "healthCheckAgents" - }, - "id": { - "type": "integer", - "default": 1 - } - } - } - } - } - }, - "HealthCheckRelationHealthCheckAgentsGetResponse": { - "type": "object", - "properties": { - "data": { - "type": "array", - "items": { - "type": "object", - "properties": { - "type": { - "type": "string", - "default": "healthCheckAgents" - }, - "id": { - "type": "integer", - "default": 1 - } - } - } - } - } - }, - "LogEntryCreate": { - "type": "object", - "properties": { - "data": { - "type": "object", - "properties": { - "type": { - "type": "string", - "default": "LogEntry" - }, - "attributes": { - "type": "object", - "properties": [] - } - } - } - } - }, - "LogEntryPatch": { - "type": "object", - "properties": { - "data": { - "type": "object", - "properties": { - "type": { - "type": "string", - "default": "LogEntry" - }, - "attributes": { - "type": "object", - "properties": [] - } - } - } - } - }, - "LogEntryResponse": { - "type": "object", - "properties": { - "jsonapi": { - "type": "object", - "properties": { - "version": { - "type": "string", - "default": "1.1" - }, - "ext": { - "type": "string", - "default": "https://jsonapi.org/profiles/ethanresnick/cursor-pagination" - } - } - }, - "links": { - "type": "object", - "properties": { - "self": { - "type": "string", - "default": "/api/v2/ui/logentries?page[size]=25" - }, - "first": { - "type": "string", - "default": "/api/v2/ui/logentries?page[size]=25&page[after]=0" - }, - "last": { - "type": "string", - "default": "/api/v2/ui/logentries?page[size]=25&page[before]=500" - }, - "next": { - "type": "string", - "default": "/api/v2/ui/logentries?page[size]=25&page[after]=25" - }, - "previous": { - "type": "string", - "default": "/api/v2/ui/logentries?page[size]=25&page[before]=25" - } - } - }, - "data": { - "type": "array", - "items": { - "type": "object", - "properties": { - "id": { - "type": "integer" - }, - "type": { - "type": "string", - "default": "LogEntry" - }, - "attributes": { - "type": "object", - "properties": { - "issuer": { - "type": "string" - }, - "issuerId": { - "type": "string" - }, - "level": { - "type": "string" - }, - "message": { - "type": "string" - }, - "time": { - "type": "integer", - "format": "int64" - } - } - } - } - } - }, - "relationships": { - "type": "object", - "properties": [] - }, - "included": { - "type": "array", - "items": { - "type": "object", - "properties": [] - } - } - } - }, - "LogEntryRelationHealthCheckAgents": { - "type": "object", - "properties": { - "data": { - "type": "array", - "items": { - "type": "object", - "properties": { - "type": { - "type": "string", - "default": "healthCheckAgents" - }, - "id": { - "type": "integer", - "default": 1 - } - } - } - } - } - }, - "LogEntryRelationHealthCheckAgentsGetResponse": { - "type": "object", - "properties": { - "data": { - "type": "array", - "items": { - "type": "object", - "properties": { - "type": { - "type": "string", - "default": "healthCheckAgents" - }, - "id": { - "type": "integer", - "default": 1 - } - } - } - } - } - }, - "LogEntrySingleResponse": { - "type": "object", - "properties": { - "data": { - "type": "array", - "items": { - "type": "object", - "properties": { - "id": { - "type": "integer" - }, - "type": { - "type": "string", - "default": "LogEntry" - }, - "attributes": { - "type": "object", - "properties": { - "issuer": { - "type": "string" - }, - "issuerId": { - "type": "string" - }, - "level": { - "type": "string" - }, - "message": { - "type": "string" - }, - "time": { - "type": "integer", - "format": "int64" - } - } - } - } - } - }, - "relationships": { - "type": "object", - "properties": [] - }, - "included": { - "type": "array", - "items": { - "type": "object", - "properties": [] - } - } - } - }, - "LogEntryPostPatchResponse": { - "type": "object", - "properties": { - "jsonapi": { - "type": "object", - "properties": { - "version": { - "type": "string", - "default": "1.1" - }, - "ext": { - "type": "string", - "default": "https://jsonapi.org/profiles/ethanresnick/cursor-pagination" - } - } - }, - "data": { - "type": "array", - "items": { - "type": "object", - "properties": { - "id": { - "type": "integer" - }, - "type": { - "type": "string", - "default": "LogEntry" - }, - "attributes": { - "type": "object", - "properties": { - "issuer": { - "type": "string" - }, - "issuerId": { - "type": "string" - }, - "level": { - "type": "string" - }, - "message": { - "type": "string" - }, - "time": { - "type": "integer", - "format": "int64" - } - } - } - } - } - } - } - }, - "LogEntryListResponse": { - "allOf": [ - { - "$ref": "#/components/schemas/ListResponse" - }, - { - "type": "object", - "properties": { - "values": { - "type": "array", - "items": { - "$ref": "#/components/schemas/LogEntryResponse" - } - } - } - } - ] - }, - "NotificationSettingCreate": { - "type": "object", - "properties": { - "data": { - "type": "object", - "properties": { - "type": { - "type": "string", - "default": "NotificationSetting" - }, - "attributes": { - "type": "object", - "properties": { - "actionFilter": { - "type": "string" - }, - "action": { - "type": "string" - }, - "notification": { - "type": "string" - }, - "receiver": { - "type": "string" - } - } - } - } - } - } - }, - "NotificationSettingPatch": { - "type": "object", - "properties": { - "data": { - "type": "object", - "properties": { - "type": { - "type": "string", - "default": "NotificationSetting" - }, - "attributes": { - "type": "object", - "properties": { - "action": { - "type": "string" - }, - "isActive": { - "type": "boolean" - }, - "notification": { - "type": "string" - }, - "receiver": { - "type": "string" - } - } - } - } - } - } - }, - "NotificationSettingResponse": { - "type": "object", - "properties": { - "jsonapi": { - "type": "object", - "properties": { - "version": { - "type": "string", - "default": "1.1" - }, - "ext": { - "type": "string", - "default": "https://jsonapi.org/profiles/ethanresnick/cursor-pagination" - } - } - }, - "links": { - "type": "object", - "properties": { - "self": { - "type": "string", - "default": "/api/v2/ui/notifications?page[size]=25" - }, - "first": { - "type": "string", - "default": "/api/v2/ui/notifications?page[size]=25&page[after]=0" - }, - "last": { - "type": "string", - "default": "/api/v2/ui/notifications?page[size]=25&page[before]=500" - }, - "next": { - "type": "string", - "default": "/api/v2/ui/notifications?page[size]=25&page[after]=25" - }, - "previous": { - "type": "string", - "default": "/api/v2/ui/notifications?page[size]=25&page[before]=25" - } - } - }, - "data": { - "type": "array", - "items": { - "type": "object", - "properties": { - "id": { - "type": "integer" - }, - "type": { - "type": "string", - "default": "NotificationSetting" - }, - "attributes": { - "type": "object", - "properties": { - "action": { - "type": "string" - }, - "objectId": { - "type": "integer" - }, - "notification": { - "type": "string" - }, - "userId": { - "type": "integer" - }, - "receiver": { - "type": "string" - }, - "isActive": { - "type": "boolean" - } - } - } - } - } - }, - "relationships": { - "type": "object", - "properties": [ - { - "properties": { - "user": { - "type": "object", - "properties": { - "links": { - "type": "object", - "properties": { - "self": { - "type": "string", - "default": "/api/v2/ui/notifications/relationships/user" - }, - "related": { - "type": "string", - "default": "/api/v2/ui/notifications/user" - } - } - } - } - } - } - } - ] - }, - "included": { - "type": "array", - "items": { - "type": "object", - "properties": [ - { - "properties": { - "id": { - "type": "integer" - }, - "type": { - "type": "string", - "default": "user" - }, - "attributes": { - "type": "object", - "properties": { - "id": { - "type": "integer" - }, - "name": { - "type": "string" - }, - "email": { - "type": "string" - }, - "passwordHash": { - "type": "string" - }, - "passwordSalt": { - "type": "string" - }, - "isValid": { - "type": "boolean" - }, - "isComputedPassword": { - "type": "boolean" - }, - "lastLoginDate": { - "type": "integer", - "format": "int64" - }, - "registeredSince": { - "type": "integer", - "format": "int64" - }, - "sessionLifetime": { - "type": "integer" - }, - "globalPermissionGroupId": { - "type": "integer" - }, - "yubikey": { - "type": "string" - }, - "otp1": { - "type": "string" - }, - "otp2": { - "type": "string" - }, - "otp3": { - "type": "string" - }, - "otp4": { - "type": "string" - } - } - } - } - } - ] - } - } - } - }, - "NotificationSettingRelationHealthCheckAgents": { - "type": "object", - "properties": { - "data": { - "type": "array", - "items": { - "type": "object", - "properties": { - "type": { - "type": "string", - "default": "healthCheckAgents" - }, - "id": { - "type": "integer", - "default": 1 - } - } - } - } - } - }, - "NotificationSettingRelationHealthCheckAgentsGetResponse": { - "type": "object", - "properties": { - "data": { - "type": "array", - "items": { - "type": "object", - "properties": { - "type": { - "type": "string", - "default": "healthCheckAgents" - }, - "id": { - "type": "integer", - "default": 1 - } - } - } - } - } - }, - "NotificationSettingSingleResponse": { - "type": "object", - "properties": { - "data": { - "type": "array", - "items": { - "type": "object", - "properties": { - "id": { - "type": "integer" - }, - "type": { - "type": "string", - "default": "NotificationSetting" - }, - "attributes": { - "type": "object", - "properties": { - "action": { - "type": "string" - }, - "objectId": { - "type": "integer" - }, - "notification": { - "type": "string" - }, - "userId": { - "type": "integer" - }, - "receiver": { - "type": "string" - }, - "isActive": { - "type": "boolean" - } - } - } - } - } - }, - "relationships": { - "type": "object", - "properties": [ - { - "properties": { - "user": { - "type": "object", - "properties": { - "links": { - "type": "object", - "properties": { - "self": { - "type": "string", - "default": "/api/v2/ui/notifications/relationships/user" - }, - "related": { - "type": "string", - "default": "/api/v2/ui/notifications/user" - } - } - } - } - } - } - } - ] - }, - "included": { - "type": "array", - "items": { - "type": "object", - "properties": [ - { - "properties": { - "id": { - "type": "integer" - }, - "type": { - "type": "string", - "default": "user" - }, - "attributes": { - "type": "object", - "properties": { - "id": { - "type": "integer" - }, - "name": { - "type": "string" - }, - "email": { - "type": "string" - }, - "passwordHash": { - "type": "string" - }, - "passwordSalt": { - "type": "string" - }, - "isValid": { - "type": "boolean" - }, - "isComputedPassword": { - "type": "boolean" - }, - "lastLoginDate": { - "type": "integer", - "format": "int64" - }, - "registeredSince": { - "type": "integer", - "format": "int64" - }, - "sessionLifetime": { - "type": "integer" - }, - "globalPermissionGroupId": { - "type": "integer" - }, - "yubikey": { - "type": "string" - }, - "otp1": { - "type": "string" - }, - "otp2": { - "type": "string" - }, - "otp3": { - "type": "string" - }, - "otp4": { - "type": "string" - } - } - } - } - } - ] - } - } - } - }, - "NotificationSettingPostPatchResponse": { - "type": "object", - "properties": { - "jsonapi": { - "type": "object", - "properties": { - "version": { - "type": "string", - "default": "1.1" - }, - "ext": { - "type": "string", - "default": "https://jsonapi.org/profiles/ethanresnick/cursor-pagination" - } - } - }, - "data": { - "type": "array", - "items": { - "type": "object", - "properties": { - "id": { - "type": "integer" - }, - "type": { - "type": "string", - "default": "NotificationSetting" - }, - "attributes": { - "type": "object", - "properties": { - "action": { - "type": "string" - }, - "objectId": { - "type": "integer" - }, - "notification": { - "type": "string" - }, - "userId": { - "type": "integer" - }, - "receiver": { - "type": "string" - }, - "isActive": { - "type": "boolean" - } - } - } - } - } - } - } - }, - "NotificationSettingListResponse": { - "allOf": [ - { - "$ref": "#/components/schemas/ListResponse" - }, - { - "type": "object", - "properties": { - "values": { - "type": "array", - "items": { - "$ref": "#/components/schemas/NotificationSettingResponse" - } - } - } - } - ] - }, - "NotificationSettingRelationUser": { - "type": "object", - "properties": { - "data": { - "type": "object", - "properties": { - "type": { - "type": "string", - "default": "user" - }, - "id": { - "type": "integer", - "default": 1 - } - } - } - } - }, - "NotificationSettingRelationUserGetResponse": { - "type": "object", - "properties": { - "data": { - "type": "object", - "properties": { - "type": { - "type": "string", - "default": "user" - }, - "id": { - "type": "integer", - "default": 1 - } - } - } - } - }, - "PreprocessorCreate": { - "type": "object", - "properties": { - "data": { - "type": "object", - "properties": { - "type": { - "type": "string", - "default": "Preprocessor" - }, - "attributes": { - "type": "object", - "properties": { - "name": { - "type": "string" - }, - "url": { - "type": "string" - }, - "binaryName": { - "type": "string" - }, - "keyspaceCommand": { - "type": "string" - }, - "skipCommand": { - "type": "string" - }, - "limitCommand": { - "type": "string" - } - } - } - } - } - } - }, - "PreprocessorPatch": { - "type": "object", - "properties": { - "data": { - "type": "object", - "properties": { - "type": { - "type": "string", - "default": "Preprocessor" - }, - "attributes": { - "type": "object", - "properties": { - "binaryName": { - "type": "string" - }, - "keyspaceCommand": { - "type": "string" - }, - "limitCommand": { - "type": "string" - }, - "name": { - "type": "string" - }, - "skipCommand": { - "type": "string" - }, - "url": { - "type": "string" - } - } - } - } - } - } - }, - "PreprocessorResponse": { - "type": "object", - "properties": { - "jsonapi": { - "type": "object", - "properties": { - "version": { - "type": "string", - "default": "1.1" - }, - "ext": { - "type": "string", - "default": "https://jsonapi.org/profiles/ethanresnick/cursor-pagination" - } - } - }, - "links": { - "type": "object", - "properties": { - "self": { - "type": "string", - "default": "/api/v2/ui/preprocessors?page[size]=25" - }, - "first": { - "type": "string", - "default": "/api/v2/ui/preprocessors?page[size]=25&page[after]=0" - }, - "last": { - "type": "string", - "default": "/api/v2/ui/preprocessors?page[size]=25&page[before]=500" - }, - "next": { - "type": "string", - "default": "/api/v2/ui/preprocessors?page[size]=25&page[after]=25" - }, - "previous": { - "type": "string", - "default": "/api/v2/ui/preprocessors?page[size]=25&page[before]=25" - } - } - }, - "data": { - "type": "array", - "items": { - "type": "object", - "properties": { - "id": { - "type": "integer" - }, - "type": { - "type": "string", - "default": "Preprocessor" - }, - "attributes": { - "type": "object", - "properties": { - "name": { - "type": "string" - }, - "url": { - "type": "string" - }, - "binaryName": { - "type": "string" - }, - "keyspaceCommand": { - "type": "string" - }, - "skipCommand": { - "type": "string" - }, - "limitCommand": { - "type": "string" - } - } - } - } - } - }, - "relationships": { - "type": "object", - "properties": [] - }, - "included": { - "type": "array", - "items": { - "type": "object", - "properties": [] - } - } - } - }, - "PreprocessorRelationUser": { - "type": "object", - "properties": { - "data": { - "type": "object", - "properties": { - "type": { - "type": "string", - "default": "user" - }, - "id": { - "type": "integer", - "default": 1 - } - } - } - } - }, - "PreprocessorRelationUserGetResponse": { - "type": "object", - "properties": { - "data": { - "type": "object", - "properties": { - "type": { - "type": "string", - "default": "user" - }, - "id": { - "type": "integer", - "default": 1 - } - } - } - } - }, - "PreprocessorSingleResponse": { - "type": "object", - "properties": { - "data": { - "type": "array", - "items": { - "type": "object", - "properties": { - "id": { - "type": "integer" - }, - "type": { - "type": "string", - "default": "Preprocessor" - }, - "attributes": { - "type": "object", - "properties": { - "name": { - "type": "string" - }, - "url": { - "type": "string" - }, - "binaryName": { - "type": "string" - }, - "keyspaceCommand": { - "type": "string" - }, - "skipCommand": { - "type": "string" - }, - "limitCommand": { - "type": "string" - } - } - } - } - } - }, - "relationships": { - "type": "object", - "properties": [] - }, - "included": { - "type": "array", - "items": { - "type": "object", - "properties": [] - } - } - } - }, - "PreprocessorPostPatchResponse": { - "type": "object", - "properties": { - "jsonapi": { - "type": "object", - "properties": { - "version": { - "type": "string", - "default": "1.1" - }, - "ext": { - "type": "string", - "default": "https://jsonapi.org/profiles/ethanresnick/cursor-pagination" - } - } - }, - "data": { - "type": "array", - "items": { - "type": "object", - "properties": { - "id": { - "type": "integer" - }, - "type": { - "type": "string", - "default": "Preprocessor" - }, - "attributes": { - "type": "object", - "properties": { - "name": { - "type": "string" - }, - "url": { - "type": "string" - }, - "binaryName": { - "type": "string" - }, - "keyspaceCommand": { - "type": "string" - }, - "skipCommand": { - "type": "string" - }, - "limitCommand": { - "type": "string" - } - } - } - } - } - } - } - }, - "PreprocessorListResponse": { - "allOf": [ - { - "$ref": "#/components/schemas/ListResponse" - }, - { - "type": "object", - "properties": { - "values": { - "type": "array", - "items": { - "$ref": "#/components/schemas/PreprocessorResponse" - } - } - } - } - ] - }, - "PretaskCreate": { - "type": "object", - "properties": { - "data": { - "type": "object", - "properties": { - "type": { - "type": "string", - "default": "Pretask" - }, - "attributes": { - "type": "object", - "properties": { - "files": { - "type": "array", - "items": { - "type": "integer" - } - }, - "taskName": { - "type": "string" - }, - "attackCmd": { - "type": "string" - }, - "chunkTime": { - "type": "integer" - }, - "statusTimer": { - "type": "integer" - }, - "color": { - "type": "string" - }, - "isSmall": { - "type": "boolean" - }, - "isCpuTask": { - "type": "boolean" - }, - "useNewBench": { - "type": "boolean" - }, - "priority": { - "type": "integer" - }, - "maxAgents": { - "type": "integer" - }, - "isMaskImport": { - "type": "boolean" - }, - "crackerBinaryTypeId": { - "type": "integer" - } - } - } - } - } - } - }, - "PretaskPatch": { - "type": "object", - "properties": { - "data": { - "type": "object", - "properties": { - "type": { - "type": "string", - "default": "Pretask" - }, - "attributes": { - "type": "object", - "properties": { - "attackCmd": { - "type": "string" - }, - "chunkTime": { - "type": "integer" - }, - "color": { - "type": "string" - }, - "crackerBinaryTypeId": { - "type": "integer" - }, - "isCpuTask": { - "type": "boolean" - }, - "isMaskImport": { - "type": "boolean" - }, - "isSmall": { - "type": "boolean" - }, - "maxAgents": { - "type": "integer" - }, - "priority": { - "type": "integer" - }, - "statusTimer": { - "type": "integer" - }, - "taskName": { - "type": "string" - } - } - } - } - } - } - }, - "PretaskResponse": { - "type": "object", - "properties": { - "jsonapi": { - "type": "object", - "properties": { - "version": { - "type": "string", - "default": "1.1" - }, - "ext": { - "type": "string", - "default": "https://jsonapi.org/profiles/ethanresnick/cursor-pagination" - } - } - }, - "links": { - "type": "object", - "properties": { - "self": { - "type": "string", - "default": "/api/v2/ui/pretasks?page[size]=25" - }, - "first": { - "type": "string", - "default": "/api/v2/ui/pretasks?page[size]=25&page[after]=0" - }, - "last": { - "type": "string", - "default": "/api/v2/ui/pretasks?page[size]=25&page[before]=500" - }, - "next": { - "type": "string", - "default": "/api/v2/ui/pretasks?page[size]=25&page[after]=25" - }, - "previous": { - "type": "string", - "default": "/api/v2/ui/pretasks?page[size]=25&page[before]=25" - } - } - }, - "data": { - "type": "array", - "items": { - "type": "object", - "properties": { - "id": { - "type": "integer" - }, - "type": { - "type": "string", - "default": "Pretask" - }, - "attributes": { - "type": "object", - "properties": { - "taskName": { - "type": "string" - }, - "attackCmd": { - "type": "string" - }, - "chunkTime": { - "type": "integer" - }, - "statusTimer": { - "type": "integer" - }, - "color": { - "type": "string" - }, - "isSmall": { - "type": "boolean" - }, - "isCpuTask": { - "type": "boolean" - }, - "useNewBench": { - "type": "boolean" - }, - "priority": { - "type": "integer" - }, - "maxAgents": { - "type": "integer" - }, - "isMaskImport": { - "type": "boolean" - }, - "crackerBinaryTypeId": { - "type": "integer" - } - } - } - } - } - }, - "relationships": { - "type": "object", - "properties": [ - { - "properties": { - "pretaskFiles": { - "type": "object", - "properties": { - "links": { - "type": "object", - "properties": { - "self": { - "type": "string", - "default": "/api/v2/ui/pretasks/relationships/pretaskFiles" - }, - "related": { - "type": "string", - "default": "/api/v2/ui/pretasks/pretaskFiles" - } - } - } - } - } - } - } - ] - }, - "included": { - "type": "array", - "items": { - "type": "object", - "properties": [ - { - "properties": { - "id": { - "type": "integer" - }, - "type": { - "type": "string", - "default": "pretaskFiles" - }, - "attributes": { - "type": "object", - "properties": { - "sourceType": { - "type": "string" - }, - "sourceData": { - "type": "string" - }, - "fileId": { - "type": "integer" - }, - "filename": { - "type": "string" - }, - "size": { - "type": "integer", - "format": "int64" - }, - "isSecret": { - "type": "boolean" - }, - "fileType": { - "type": "integer" - }, - "accessGroupId": { - "type": "integer" - }, - "lineCount": { - "type": "integer", - "format": "int64" - } - } - } - } - } - ] - } - } - } - }, - "PretaskRelationUser": { - "type": "object", - "properties": { - "data": { - "type": "object", - "properties": { - "type": { - "type": "string", - "default": "user" - }, - "id": { - "type": "integer", - "default": 1 - } - } - } - } - }, - "PretaskRelationUserGetResponse": { - "type": "object", - "properties": { - "data": { - "type": "object", - "properties": { - "type": { - "type": "string", - "default": "user" - }, - "id": { - "type": "integer", - "default": 1 - } - } - } - } - }, - "PretaskSingleResponse": { - "type": "object", - "properties": { - "data": { - "type": "array", - "items": { - "type": "object", - "properties": { - "id": { - "type": "integer" - }, - "type": { - "type": "string", - "default": "Pretask" - }, - "attributes": { - "type": "object", - "properties": { - "taskName": { - "type": "string" - }, - "attackCmd": { - "type": "string" - }, - "chunkTime": { - "type": "integer" - }, - "statusTimer": { - "type": "integer" - }, - "color": { - "type": "string" - }, - "isSmall": { - "type": "boolean" - }, - "isCpuTask": { - "type": "boolean" - }, - "useNewBench": { - "type": "boolean" - }, - "priority": { - "type": "integer" - }, - "maxAgents": { - "type": "integer" - }, - "isMaskImport": { - "type": "boolean" - }, - "crackerBinaryTypeId": { - "type": "integer" - } - } - } - } - } - }, - "relationships": { - "type": "object", - "properties": [ - { - "properties": { - "pretaskFiles": { - "type": "object", - "properties": { - "links": { - "type": "object", - "properties": { - "self": { - "type": "string", - "default": "/api/v2/ui/pretasks/relationships/pretaskFiles" - }, - "related": { - "type": "string", - "default": "/api/v2/ui/pretasks/pretaskFiles" - } - } - } - } - } - } - } - ] - }, - "included": { - "type": "array", - "items": { - "type": "object", - "properties": [ - { - "properties": { - "id": { - "type": "integer" - }, - "type": { - "type": "string", - "default": "pretaskFiles" - }, - "attributes": { - "type": "object", - "properties": { - "sourceType": { - "type": "string" - }, - "sourceData": { - "type": "string" - }, - "fileId": { - "type": "integer" - }, - "filename": { - "type": "string" - }, - "size": { - "type": "integer", - "format": "int64" - }, - "isSecret": { - "type": "boolean" - }, - "fileType": { - "type": "integer" - }, - "accessGroupId": { - "type": "integer" - }, - "lineCount": { - "type": "integer", - "format": "int64" - } - } - } - } - } - ] - } - } - } - }, - "PretaskPostPatchResponse": { - "type": "object", - "properties": { - "jsonapi": { - "type": "object", - "properties": { - "version": { - "type": "string", - "default": "1.1" - }, - "ext": { - "type": "string", - "default": "https://jsonapi.org/profiles/ethanresnick/cursor-pagination" - } - } - }, - "data": { - "type": "array", - "items": { - "type": "object", - "properties": { - "id": { - "type": "integer" - }, - "type": { - "type": "string", - "default": "Pretask" - }, - "attributes": { - "type": "object", - "properties": { - "taskName": { - "type": "string" - }, - "attackCmd": { - "type": "string" - }, - "chunkTime": { - "type": "integer" - }, - "statusTimer": { - "type": "integer" - }, - "color": { - "type": "string" - }, - "isSmall": { - "type": "boolean" - }, - "isCpuTask": { - "type": "boolean" - }, - "useNewBench": { - "type": "boolean" - }, - "priority": { - "type": "integer" - }, - "maxAgents": { - "type": "integer" - }, - "isMaskImport": { - "type": "boolean" - }, - "crackerBinaryTypeId": { - "type": "integer" - } - } - } - } - } - } - } - }, - "PretaskListResponse": { - "allOf": [ - { - "$ref": "#/components/schemas/ListResponse" - }, - { - "type": "object", - "properties": { - "values": { - "type": "array", - "items": { - "$ref": "#/components/schemas/PretaskResponse" - } - } - } - } - ] - }, - "PretaskRelationPretaskFiles": { - "type": "object", - "properties": { - "data": { - "type": "array", - "items": { - "type": "object", - "properties": { - "type": { - "type": "string", - "default": "pretaskFiles" - }, - "id": { - "type": "integer", - "default": 1 - } - } - } - } - } - }, - "PretaskRelationPretaskFilesGetResponse": { - "type": "object", - "properties": { - "data": { - "type": "array", - "items": { - "type": "object", - "properties": { - "type": { - "type": "string", - "default": "pretaskFiles" - }, - "id": { - "type": "integer", - "default": 1 - } - } - } - } - } - }, - "SpeedCreate": { - "type": "object", - "properties": { - "data": { - "type": "object", - "properties": { - "type": { - "type": "string", - "default": "Speed" - }, - "attributes": { - "type": "object", - "properties": [] - } - } - } - } - }, - "SpeedPatch": { - "type": "object", - "properties": { - "data": { - "type": "object", - "properties": { - "type": { - "type": "string", - "default": "Speed" - }, - "attributes": { - "type": "object", - "properties": [] - } - } - } - } - }, - "SpeedResponse": { - "type": "object", - "properties": { - "jsonapi": { - "type": "object", - "properties": { - "version": { - "type": "string", - "default": "1.1" - }, - "ext": { - "type": "string", - "default": "https://jsonapi.org/profiles/ethanresnick/cursor-pagination" - } - } - }, - "links": { - "type": "object", - "properties": { - "self": { - "type": "string", - "default": "/api/v2/ui/speeds?page[size]=25" - }, - "first": { - "type": "string", - "default": "/api/v2/ui/speeds?page[size]=25&page[after]=0" - }, - "last": { - "type": "string", - "default": "/api/v2/ui/speeds?page[size]=25&page[before]=500" - }, - "next": { - "type": "string", - "default": "/api/v2/ui/speeds?page[size]=25&page[after]=25" - }, - "previous": { - "type": "string", - "default": "/api/v2/ui/speeds?page[size]=25&page[before]=25" - } - } - }, - "data": { - "type": "array", - "items": { - "type": "object", - "properties": { - "id": { - "type": "integer" - }, - "type": { - "type": "string", - "default": "Speed" - }, - "attributes": { - "type": "object", - "properties": { - "agentId": { - "type": "integer" - }, - "taskId": { - "type": "integer" - }, - "speed": { - "type": "integer", - "format": "int64" - }, - "time": { - "type": "integer", - "format": "int64" - } - } - } - } - } - }, - "relationships": { - "type": "object", - "properties": [ - { - "properties": { - "agent": { - "type": "object", - "properties": { - "links": { - "type": "object", - "properties": { - "self": { - "type": "string", - "default": "/api/v2/ui/speeds/relationships/agent" - }, - "related": { - "type": "string", - "default": "/api/v2/ui/speeds/agent" - } - } - } - } - } - } - }, - { - "properties": { - "task": { - "type": "object", - "properties": { - "links": { - "type": "object", - "properties": { - "self": { - "type": "string", - "default": "/api/v2/ui/speeds/relationships/task" - }, - "related": { - "type": "string", - "default": "/api/v2/ui/speeds/task" - } - } - } - } - } - } - } - ] - }, - "included": { - "type": "array", - "items": { - "type": "object", - "properties": [ - { - "properties": { - "id": { - "type": "integer" - }, - "type": { - "type": "string", - "default": "agent" - }, - "attributes": { - "type": "object", - "properties": { - "agentId": { - "type": "integer" - }, - "agentName": { - "type": "string" - }, - "uid": { - "type": "string" - }, - "os": { - "type": "integer" - }, - "devices": { - "type": "string" - }, - "cmdPars": { - "type": "string" - }, - "ignoreErrors": { - "type": "integer", - "enum": [ - 0, - 1, - 2 - ] - }, - "isActive": { - "type": "boolean" - }, - "isTrusted": { - "type": "boolean" - }, - "token": { - "type": "string" - }, - "lastAct": { - "type": "string" - }, - "lastTime": { - "type": "integer", - "format": "int64" - }, - "lastIp": { - "type": "string" - }, - "userId": { - "type": "integer" - }, - "cpuOnly": { - "type": "boolean" - }, - "clientSignature": { - "type": "string" - } - } - } - } - }, - { - "properties": { - "id": { - "type": "integer" - }, - "type": { - "type": "string", - "default": "task" - }, - "attributes": { - "type": "object", - "properties": { - "hashlistId": { - "type": "integer" - }, - "files": { - "type": "array", - "items": { - "type": "integer" - } - }, - "taskId": { - "type": "integer" - }, - "taskName": { - "type": "string" - }, - "attackCmd": { - "type": "string" - }, - "chunkTime": { - "type": "integer" - }, - "statusTimer": { - "type": "integer" - }, - "keyspace": { - "type": "integer", - "format": "int64" - }, - "keyspaceProgress": { - "type": "integer", - "format": "int64" - }, - "priority": { - "type": "integer" - }, - "maxAgents": { - "type": "integer" - }, - "color": { - "type": "string" - }, - "isSmall": { - "type": "boolean" - }, - "isCpuTask": { - "type": "boolean" - }, - "useNewBench": { - "type": "boolean" - }, - "skipKeyspace": { - "type": "integer", - "format": "int64" - }, - "crackerBinaryId": { - "type": "integer" - }, - "crackerBinaryTypeId": { - "type": "integer" - }, - "taskWrapperId": { - "type": "integer" - }, - "isArchived": { - "type": "boolean" - }, - "notes": { - "type": "string" - }, - "staticChunks": { - "type": "integer" - }, - "chunkSize": { - "type": "integer", - "format": "int64" - }, - "forcePipe": { - "type": "boolean" - }, - "preprocessorId": { - "type": "integer" - }, - "preprocessorCommand": { - "type": "string" - } - } - } - } - } - ] - } - } - } - }, - "SpeedRelationPretaskFiles": { - "type": "object", - "properties": { - "data": { - "type": "array", - "items": { - "type": "object", - "properties": { - "type": { - "type": "string", - "default": "pretaskFiles" - }, - "id": { - "type": "integer", - "default": 1 - } - } - } - } - } - }, - "SpeedRelationPretaskFilesGetResponse": { - "type": "object", - "properties": { - "data": { - "type": "array", - "items": { - "type": "object", - "properties": { - "type": { - "type": "string", - "default": "pretaskFiles" - }, - "id": { - "type": "integer", - "default": 1 - } - } - } - } - } - }, - "SpeedSingleResponse": { - "type": "object", - "properties": { - "data": { - "type": "array", - "items": { - "type": "object", - "properties": { - "id": { - "type": "integer" - }, - "type": { - "type": "string", - "default": "Speed" - }, - "attributes": { - "type": "object", - "properties": { - "agentId": { - "type": "integer" - }, - "taskId": { - "type": "integer" - }, - "speed": { - "type": "integer", - "format": "int64" - }, - "time": { - "type": "integer", - "format": "int64" - } - } - } - } - } - }, - "relationships": { - "type": "object", - "properties": [ - { - "properties": { - "agent": { - "type": "object", - "properties": { - "links": { - "type": "object", - "properties": { - "self": { - "type": "string", - "default": "/api/v2/ui/speeds/relationships/agent" - }, - "related": { - "type": "string", - "default": "/api/v2/ui/speeds/agent" - } - } - } - } - } - } - }, - { - "properties": { - "task": { - "type": "object", - "properties": { - "links": { - "type": "object", - "properties": { - "self": { - "type": "string", - "default": "/api/v2/ui/speeds/relationships/task" - }, - "related": { - "type": "string", - "default": "/api/v2/ui/speeds/task" - } - } - } - } - } - } - } - ] - }, - "included": { - "type": "array", - "items": { - "type": "object", - "properties": [ - { - "properties": { - "id": { - "type": "integer" - }, - "type": { - "type": "string", - "default": "agent" - }, - "attributes": { - "type": "object", - "properties": { - "agentId": { - "type": "integer" - }, - "agentName": { - "type": "string" - }, - "uid": { - "type": "string" - }, - "os": { - "type": "integer" - }, - "devices": { - "type": "string" - }, - "cmdPars": { - "type": "string" - }, - "ignoreErrors": { - "type": "integer", - "enum": [ - 0, - 1, - 2 - ] - }, - "isActive": { - "type": "boolean" - }, - "isTrusted": { - "type": "boolean" - }, - "token": { - "type": "string" - }, - "lastAct": { - "type": "string" - }, - "lastTime": { - "type": "integer", - "format": "int64" - }, - "lastIp": { - "type": "string" - }, - "userId": { - "type": "integer" - }, - "cpuOnly": { - "type": "boolean" - }, - "clientSignature": { - "type": "string" - } - } - } - } - }, - { - "properties": { - "id": { - "type": "integer" - }, - "type": { - "type": "string", - "default": "task" - }, - "attributes": { - "type": "object", - "properties": { - "hashlistId": { - "type": "integer" - }, - "files": { - "type": "array", - "items": { - "type": "integer" - } - }, - "taskId": { - "type": "integer" - }, - "taskName": { - "type": "string" - }, - "attackCmd": { - "type": "string" - }, - "chunkTime": { - "type": "integer" - }, - "statusTimer": { - "type": "integer" - }, - "keyspace": { - "type": "integer", - "format": "int64" - }, - "keyspaceProgress": { - "type": "integer", - "format": "int64" - }, - "priority": { - "type": "integer" - }, - "maxAgents": { - "type": "integer" - }, - "color": { - "type": "string" - }, - "isSmall": { - "type": "boolean" - }, - "isCpuTask": { - "type": "boolean" - }, - "useNewBench": { - "type": "boolean" - }, - "skipKeyspace": { - "type": "integer", - "format": "int64" - }, - "crackerBinaryId": { - "type": "integer" - }, - "crackerBinaryTypeId": { - "type": "integer" - }, - "taskWrapperId": { - "type": "integer" - }, - "isArchived": { - "type": "boolean" - }, - "notes": { - "type": "string" - }, - "staticChunks": { - "type": "integer" - }, - "chunkSize": { - "type": "integer", - "format": "int64" - }, - "forcePipe": { - "type": "boolean" - }, - "preprocessorId": { - "type": "integer" - }, - "preprocessorCommand": { - "type": "string" - } - } - } - } - } - ] - } - } - } - }, - "SpeedPostPatchResponse": { - "type": "object", - "properties": { - "jsonapi": { - "type": "object", - "properties": { - "version": { - "type": "string", - "default": "1.1" - }, - "ext": { - "type": "string", - "default": "https://jsonapi.org/profiles/ethanresnick/cursor-pagination" - } - } - }, - "data": { - "type": "array", - "items": { - "type": "object", - "properties": { - "id": { - "type": "integer" - }, - "type": { - "type": "string", - "default": "Speed" - }, - "attributes": { - "type": "object", - "properties": { - "agentId": { - "type": "integer" - }, - "taskId": { - "type": "integer" - }, - "speed": { - "type": "integer", - "format": "int64" - }, - "time": { - "type": "integer", - "format": "int64" - } - } - } - } - } - } - } - }, - "SpeedListResponse": { - "allOf": [ - { - "$ref": "#/components/schemas/ListResponse" - }, - { - "type": "object", - "properties": { - "values": { - "type": "array", - "items": { - "$ref": "#/components/schemas/SpeedResponse" - } - } - } - } - ] - }, - "SpeedRelationAgent": { - "type": "object", - "properties": { - "data": { - "type": "object", - "properties": { - "type": { - "type": "string", - "default": "agent" - }, - "id": { - "type": "integer", - "default": 1 - } - } - } - } - }, - "SpeedRelationAgentGetResponse": { - "type": "object", - "properties": { - "data": { - "type": "object", - "properties": { - "type": { - "type": "string", - "default": "agent" - }, - "id": { - "type": "integer", - "default": 1 - } - } - } - } - }, - "SpeedRelationTask": { - "type": "object", - "properties": { - "data": { - "type": "object", - "properties": { - "type": { - "type": "string", - "default": "task" - }, - "id": { - "type": "integer", - "default": 1 - } - } - } - } - }, - "SpeedRelationTaskGetResponse": { - "type": "object", - "properties": { - "data": { - "type": "object", - "properties": { - "type": { - "type": "string", - "default": "task" - }, - "id": { - "type": "integer", - "default": 1 - } - } - } - } - }, - "SupertaskCreate": { - "type": "object", - "properties": { - "data": { - "type": "object", - "properties": { - "type": { - "type": "string", - "default": "Supertask" - }, - "attributes": { - "type": "object", - "properties": { - "pretasks": { - "type": "array", - "items": { - "type": "integer" - } - }, - "supertaskName": { - "type": "string" - } - } - } - } - } - } - }, - "SupertaskPatch": { - "type": "object", - "properties": { - "data": { - "type": "object", - "properties": { - "type": { - "type": "string", - "default": "Supertask" - }, - "attributes": { - "type": "object", - "properties": { - "supertaskName": { - "type": "string" - } - } - } - } - } - } - }, - "SupertaskResponse": { - "type": "object", - "properties": { - "jsonapi": { - "type": "object", - "properties": { - "version": { - "type": "string", - "default": "1.1" - }, - "ext": { - "type": "string", - "default": "https://jsonapi.org/profiles/ethanresnick/cursor-pagination" - } - } - }, - "links": { - "type": "object", - "properties": { - "self": { - "type": "string", - "default": "/api/v2/ui/supertasks?page[size]=25" - }, - "first": { - "type": "string", - "default": "/api/v2/ui/supertasks?page[size]=25&page[after]=0" - }, - "last": { - "type": "string", - "default": "/api/v2/ui/supertasks?page[size]=25&page[before]=500" - }, - "next": { - "type": "string", - "default": "/api/v2/ui/supertasks?page[size]=25&page[after]=25" - }, - "previous": { - "type": "string", - "default": "/api/v2/ui/supertasks?page[size]=25&page[before]=25" - } - } - }, - "data": { - "type": "array", - "items": { - "type": "object", - "properties": { - "id": { - "type": "integer" - }, - "type": { - "type": "string", - "default": "Supertask" - }, - "attributes": { - "type": "object", - "properties": { - "supertaskName": { - "type": "string" - } - } - } - } - } - }, - "relationships": { - "type": "object", - "properties": [ - { - "properties": { - "pretasks": { - "type": "object", - "properties": { - "links": { - "type": "object", - "properties": { - "self": { - "type": "string", - "default": "/api/v2/ui/supertasks/relationships/pretasks" - }, - "related": { - "type": "string", - "default": "/api/v2/ui/supertasks/pretasks" - } - } - } - } - } - } - } - ] - }, - "included": { - "type": "array", - "items": { - "type": "object", - "properties": [ - { - "properties": { - "id": { - "type": "integer" - }, - "type": { - "type": "string", - "default": "pretasks" - }, - "attributes": { - "type": "object", - "properties": { - "files": { - "type": "array", - "items": { - "type": "integer" - } - }, - "pretaskId": { - "type": "integer" - }, - "taskName": { - "type": "string" - }, - "attackCmd": { - "type": "string" - }, - "chunkTime": { - "type": "integer" - }, - "statusTimer": { - "type": "integer" - }, - "color": { - "type": "string" - }, - "isSmall": { - "type": "boolean" - }, - "isCpuTask": { - "type": "boolean" - }, - "useNewBench": { - "type": "boolean" - }, - "priority": { - "type": "integer" - }, - "maxAgents": { - "type": "integer" - }, - "isMaskImport": { - "type": "boolean" - }, - "crackerBinaryTypeId": { - "type": "integer" - } - } - } - } - } - ] - } - } - } - }, - "SupertaskRelationTask": { - "type": "object", - "properties": { - "data": { - "type": "object", - "properties": { - "type": { - "type": "string", - "default": "task" - }, - "id": { - "type": "integer", - "default": 1 - } - } - } - } - }, - "SupertaskRelationTaskGetResponse": { - "type": "object", - "properties": { - "data": { - "type": "object", - "properties": { - "type": { - "type": "string", - "default": "task" - }, - "id": { - "type": "integer", - "default": 1 - } - } - } - } - }, - "SupertaskSingleResponse": { - "type": "object", - "properties": { - "data": { - "type": "array", - "items": { - "type": "object", - "properties": { - "id": { - "type": "integer" - }, - "type": { - "type": "string", - "default": "Supertask" - }, - "attributes": { - "type": "object", - "properties": { - "supertaskName": { - "type": "string" - } - } - } - } - } - }, - "relationships": { - "type": "object", - "properties": [ - { - "properties": { - "pretasks": { - "type": "object", - "properties": { - "links": { - "type": "object", - "properties": { - "self": { - "type": "string", - "default": "/api/v2/ui/supertasks/relationships/pretasks" - }, - "related": { - "type": "string", - "default": "/api/v2/ui/supertasks/pretasks" - } - } - } - } - } - } - } - ] - }, - "included": { - "type": "array", - "items": { - "type": "object", - "properties": [ - { - "properties": { - "id": { - "type": "integer" - }, - "type": { - "type": "string", - "default": "pretasks" - }, - "attributes": { - "type": "object", - "properties": { - "files": { - "type": "array", - "items": { - "type": "integer" - } - }, - "pretaskId": { - "type": "integer" - }, - "taskName": { - "type": "string" - }, - "attackCmd": { - "type": "string" - }, - "chunkTime": { - "type": "integer" - }, - "statusTimer": { - "type": "integer" - }, - "color": { - "type": "string" - }, - "isSmall": { - "type": "boolean" - }, - "isCpuTask": { - "type": "boolean" - }, - "useNewBench": { - "type": "boolean" - }, - "priority": { - "type": "integer" - }, - "maxAgents": { - "type": "integer" - }, - "isMaskImport": { - "type": "boolean" - }, - "crackerBinaryTypeId": { - "type": "integer" - } - } - } - } - } - ] - } - } - } - }, - "SupertaskPostPatchResponse": { - "type": "object", - "properties": { - "jsonapi": { - "type": "object", - "properties": { - "version": { - "type": "string", - "default": "1.1" - }, - "ext": { - "type": "string", - "default": "https://jsonapi.org/profiles/ethanresnick/cursor-pagination" - } - } - }, - "data": { - "type": "array", - "items": { - "type": "object", - "properties": { - "id": { - "type": "integer" - }, - "type": { - "type": "string", - "default": "Supertask" - }, - "attributes": { - "type": "object", - "properties": { - "supertaskName": { - "type": "string" - } - } - } - } - } - } - } - }, - "SupertaskListResponse": { - "allOf": [ - { - "$ref": "#/components/schemas/ListResponse" - }, - { - "type": "object", - "properties": { - "values": { - "type": "array", - "items": { - "$ref": "#/components/schemas/SupertaskResponse" - } - } - } - } - ] - }, - "SupertaskRelationPretasks": { - "type": "object", - "properties": { - "data": { - "type": "array", - "items": { - "type": "object", - "properties": { - "type": { - "type": "string", - "default": "pretasks" - }, - "id": { - "type": "integer", - "default": 1 - } - } - } - } - } - }, - "SupertaskRelationPretasksGetResponse": { - "type": "object", - "properties": { - "data": { - "type": "array", - "items": { - "type": "object", - "properties": { - "type": { - "type": "string", - "default": "pretasks" - }, - "id": { - "type": "integer", - "default": 1 - } - } - } - } - } - }, - "TaskCreate": { - "type": "object", - "properties": { - "data": { - "type": "object", - "properties": { - "type": { - "type": "string", - "default": "Task" - }, - "attributes": { - "type": "object", - "properties": { - "hashlistId": { - "type": "integer" - }, - "files": { - "type": "array", - "items": { - "type": "integer" - } - }, - "taskName": { - "type": "string" - }, - "attackCmd": { - "type": "string" - }, - "chunkTime": { - "type": "integer" - }, - "statusTimer": { - "type": "integer" - }, - "priority": { - "type": "integer" - }, - "maxAgents": { - "type": "integer" - }, - "color": { - "type": "string" - }, - "isSmall": { - "type": "boolean" - }, - "isCpuTask": { - "type": "boolean" - }, - "useNewBench": { - "type": "boolean" - }, - "skipKeyspace": { - "type": "integer", - "format": "int64" - }, - "crackerBinaryId": { - "type": "integer" - }, - "crackerBinaryTypeId": { - "type": "integer" - }, - "isArchived": { - "type": "boolean" - }, - "notes": { - "type": "string" - }, - "staticChunks": { - "type": "integer" - }, - "chunkSize": { - "type": "integer", - "format": "int64" - }, - "forcePipe": { - "type": "boolean" - }, - "preprocessorId": { - "type": "integer" - }, - "preprocessorCommand": { - "type": "string" - } - } - } - } - } - } - }, - "TaskPatch": { - "type": "object", - "properties": { - "data": { - "type": "object", - "properties": { - "type": { - "type": "string", - "default": "Task" - }, - "attributes": { - "type": "object", - "properties": { - "attackCmd": { - "type": "string" - }, - "chunkTime": { - "type": "integer" - }, - "color": { - "type": "string" - }, - "isArchived": { - "type": "boolean" - }, - "isCpuTask": { - "type": "boolean" - }, - "isSmall": { - "type": "boolean" - }, - "maxAgents": { - "type": "integer" - }, - "notes": { - "type": "string" - }, - "priority": { - "type": "integer" - }, - "statusTimer": { - "type": "integer" - }, - "taskName": { - "type": "string" - } - } - } - } - } - } - }, - "TaskResponse": { - "type": "object", - "properties": { - "jsonapi": { - "type": "object", - "properties": { - "version": { - "type": "string", - "default": "1.1" - }, - "ext": { - "type": "string", - "default": "https://jsonapi.org/profiles/ethanresnick/cursor-pagination" - } - } - }, - "links": { - "type": "object", - "properties": { - "self": { - "type": "string", - "default": "/api/v2/ui/tasks?page[size]=25" - }, - "first": { - "type": "string", - "default": "/api/v2/ui/tasks?page[size]=25&page[after]=0" - }, - "last": { - "type": "string", - "default": "/api/v2/ui/tasks?page[size]=25&page[before]=500" - }, - "next": { - "type": "string", - "default": "/api/v2/ui/tasks?page[size]=25&page[after]=25" - }, - "previous": { - "type": "string", - "default": "/api/v2/ui/tasks?page[size]=25&page[before]=25" - } - } - }, - "data": { - "type": "array", - "items": { - "type": "object", - "properties": { - "id": { - "type": "integer" - }, - "type": { - "type": "string", - "default": "Task" - }, - "attributes": { - "type": "object", - "properties": { - "taskName": { - "type": "string" - }, - "attackCmd": { - "type": "string" - }, - "chunkTime": { - "type": "integer" - }, - "statusTimer": { - "type": "integer" - }, - "keyspace": { - "type": "integer", - "format": "int64" - }, - "keyspaceProgress": { - "type": "integer", - "format": "int64" - }, - "priority": { - "type": "integer" - }, - "maxAgents": { - "type": "integer" - }, - "color": { - "type": "string" - }, - "isSmall": { - "type": "boolean" - }, - "isCpuTask": { - "type": "boolean" - }, - "useNewBench": { - "type": "boolean" - }, - "skipKeyspace": { - "type": "integer", - "format": "int64" - }, - "crackerBinaryId": { - "type": "integer" - }, - "crackerBinaryTypeId": { - "type": "integer" - }, - "taskWrapperId": { - "type": "integer" - }, - "isArchived": { - "type": "boolean" - }, - "notes": { - "type": "string" - }, - "staticChunks": { - "type": "integer" - }, - "chunkSize": { - "type": "integer", - "format": "int64" - }, - "forcePipe": { - "type": "boolean" - }, - "preprocessorId": { - "type": "integer" - }, - "preprocessorCommand": { - "type": "string" - } - } - } - } - } - }, - "relationships": { - "type": "object", - "properties": [ - { - "properties": { - "assignedAgents": { - "type": "object", - "properties": { - "links": { - "type": "object", - "properties": { - "self": { - "type": "string", - "default": "/api/v2/ui/tasks/relationships/assignedAgents" - }, - "related": { - "type": "string", - "default": "/api/v2/ui/tasks/assignedAgents" - } - } - } - } - } - } - }, - { - "properties": { - "crackerBinary": { - "type": "object", - "properties": { - "links": { - "type": "object", - "properties": { - "self": { - "type": "string", - "default": "/api/v2/ui/tasks/relationships/crackerBinary" - }, - "related": { - "type": "string", - "default": "/api/v2/ui/tasks/crackerBinary" - } - } - } - } - } - } - }, - { - "properties": { - "crackerBinaryType": { - "type": "object", - "properties": { - "links": { - "type": "object", - "properties": { - "self": { - "type": "string", - "default": "/api/v2/ui/tasks/relationships/crackerBinaryType" - }, - "related": { - "type": "string", - "default": "/api/v2/ui/tasks/crackerBinaryType" - } - } - } - } - } - } - }, - { - "properties": { - "files": { - "type": "object", - "properties": { - "links": { - "type": "object", - "properties": { - "self": { - "type": "string", - "default": "/api/v2/ui/tasks/relationships/files" - }, - "related": { - "type": "string", - "default": "/api/v2/ui/tasks/files" - } - } - } - } - } - } - }, - { - "properties": { - "hashlist": { - "type": "object", - "properties": { - "links": { - "type": "object", - "properties": { - "self": { - "type": "string", - "default": "/api/v2/ui/tasks/relationships/hashlist" - }, - "related": { - "type": "string", - "default": "/api/v2/ui/tasks/hashlist" - } - } - } - } - } - } - }, - { - "properties": { - "speeds": { - "type": "object", - "properties": { - "links": { - "type": "object", - "properties": { - "self": { - "type": "string", - "default": "/api/v2/ui/tasks/relationships/speeds" - }, - "related": { - "type": "string", - "default": "/api/v2/ui/tasks/speeds" - } - } - } - } - } - } - } - ] - }, - "included": { - "type": "array", - "items": { - "type": "object", - "properties": [ - { - "properties": { - "id": { - "type": "integer" - }, - "type": { - "type": "string", - "default": "crackerBinary" - }, - "attributes": { - "type": "object", - "properties": { - "crackerBinaryId": { - "type": "integer" - }, - "crackerBinaryTypeId": { - "type": "integer" - }, - "version": { - "type": "string" - }, - "downloadUrl": { - "type": "string" - }, - "binaryName": { - "type": "string" - } - } - } - } - }, - { - "properties": { - "id": { - "type": "integer" - }, - "type": { - "type": "string", - "default": "crackerBinaryType" - }, - "attributes": { - "type": "object", - "properties": { - "crackerBinaryTypeId": { - "type": "integer" - }, - "typeName": { - "type": "string" - }, - "isChunkingAvailable": { - "type": "boolean" - } - } - } - } - }, - { - "properties": { - "id": { - "type": "integer" - }, - "type": { - "type": "string", - "default": "hashlist" - }, - "attributes": { - "type": "object", - "properties": { - "hashlistSeperator": { - "type": "string" - }, - "sourceType": { - "type": "string" - }, - "sourceData": { - "type": "string" - }, - "hashlistId": { - "type": "integer" - }, - "name": { - "type": "string" - }, - "format": { - "type": "integer", - "enum": [ - 0, - 1, - 2, - 3 - ] - }, - "hashTypeId": { - "type": "integer" - }, - "hashCount": { - "type": "integer" - }, - "separator": { - "type": "string" - }, - "cracked": { - "type": "integer" - }, - "isSecret": { - "type": "boolean" - }, - "isHexSalt": { - "type": "boolean" - }, - "isSalted": { - "type": "boolean" - }, - "accessGroupId": { - "type": "integer" - }, - "notes": { - "type": "string" - }, - "useBrain": { - "type": "boolean" - }, - "brainFeatures": { - "type": "integer" - }, - "isArchived": { - "type": "boolean" - } - } - } - } - }, - { - "properties": { - "id": { - "type": "integer" - }, - "type": { - "type": "string", - "default": "assignedAgents" - }, - "attributes": { - "type": "object", - "properties": { - "agentId": { - "type": "integer" - }, - "agentName": { - "type": "string" - }, - "uid": { - "type": "string" - }, - "os": { - "type": "integer" - }, - "devices": { - "type": "string" - }, - "cmdPars": { - "type": "string" - }, - "ignoreErrors": { - "type": "integer", - "enum": [ - 0, - 1, - 2 - ] - }, - "isActive": { - "type": "boolean" - }, - "isTrusted": { - "type": "boolean" - }, - "token": { - "type": "string" - }, - "lastAct": { - "type": "string" - }, - "lastTime": { - "type": "integer", - "format": "int64" - }, - "lastIp": { - "type": "string" - }, - "userId": { - "type": "integer" - }, - "cpuOnly": { - "type": "boolean" - }, - "clientSignature": { - "type": "string" - } - } - } - } - }, - { - "properties": { - "id": { - "type": "integer" - }, - "type": { - "type": "string", - "default": "files" - }, - "attributes": { - "type": "object", - "properties": { - "sourceType": { - "type": "string" - }, - "sourceData": { - "type": "string" - }, - "fileId": { - "type": "integer" - }, - "filename": { - "type": "string" - }, - "size": { - "type": "integer", - "format": "int64" - }, - "isSecret": { - "type": "boolean" - }, - "fileType": { - "type": "integer" - }, - "accessGroupId": { - "type": "integer" - }, - "lineCount": { - "type": "integer", - "format": "int64" - } - } - } - } - }, - { - "properties": { - "id": { - "type": "integer" - }, - "type": { - "type": "string", - "default": "speeds" - }, - "attributes": { - "type": "object", - "properties": { - "speedId": { - "type": "integer" - }, - "agentId": { - "type": "integer" - }, - "taskId": { - "type": "integer" - }, - "speed": { - "type": "integer", - "format": "int64" - }, - "time": { - "type": "integer", - "format": "int64" - } - } - } - } - } - ] - } - } - } - }, - "TaskRelationPretasks": { - "type": "object", - "properties": { - "data": { - "type": "array", - "items": { - "type": "object", - "properties": { - "type": { - "type": "string", - "default": "pretasks" - }, - "id": { - "type": "integer", - "default": 1 - } - } - } - } - } - }, - "TaskRelationPretasksGetResponse": { - "type": "object", - "properties": { - "data": { - "type": "array", - "items": { - "type": "object", - "properties": { - "type": { - "type": "string", - "default": "pretasks" - }, - "id": { - "type": "integer", - "default": 1 - } - } - } - } - } - }, - "TaskSingleResponse": { - "type": "object", - "properties": { - "data": { - "type": "array", - "items": { - "type": "object", - "properties": { - "id": { - "type": "integer" - }, - "type": { - "type": "string", - "default": "Task" - }, - "attributes": { - "type": "object", - "properties": { - "taskName": { - "type": "string" - }, - "attackCmd": { - "type": "string" - }, - "chunkTime": { - "type": "integer" - }, - "statusTimer": { - "type": "integer" - }, - "keyspace": { - "type": "integer", - "format": "int64" - }, - "keyspaceProgress": { - "type": "integer", - "format": "int64" - }, - "priority": { - "type": "integer" - }, - "maxAgents": { - "type": "integer" - }, - "color": { - "type": "string" - }, - "isSmall": { - "type": "boolean" - }, - "isCpuTask": { - "type": "boolean" - }, - "useNewBench": { - "type": "boolean" - }, - "skipKeyspace": { - "type": "integer", - "format": "int64" - }, - "crackerBinaryId": { - "type": "integer" - }, - "crackerBinaryTypeId": { - "type": "integer" - }, - "taskWrapperId": { - "type": "integer" - }, - "isArchived": { - "type": "boolean" - }, - "notes": { - "type": "string" - }, - "staticChunks": { - "type": "integer" - }, - "chunkSize": { - "type": "integer", - "format": "int64" - }, - "forcePipe": { - "type": "boolean" - }, - "preprocessorId": { - "type": "integer" - }, - "preprocessorCommand": { - "type": "string" - } - } - } - } - } - }, - "relationships": { - "type": "object", - "properties": [ - { - "properties": { - "assignedAgents": { - "type": "object", - "properties": { - "links": { - "type": "object", - "properties": { - "self": { - "type": "string", - "default": "/api/v2/ui/tasks/relationships/assignedAgents" - }, - "related": { - "type": "string", - "default": "/api/v2/ui/tasks/assignedAgents" - } - } - } - } - } - } - }, - { - "properties": { - "crackerBinary": { - "type": "object", - "properties": { - "links": { - "type": "object", - "properties": { - "self": { - "type": "string", - "default": "/api/v2/ui/tasks/relationships/crackerBinary" - }, - "related": { - "type": "string", - "default": "/api/v2/ui/tasks/crackerBinary" - } - } - } - } - } - } - }, - { - "properties": { - "crackerBinaryType": { - "type": "object", - "properties": { - "links": { - "type": "object", - "properties": { - "self": { - "type": "string", - "default": "/api/v2/ui/tasks/relationships/crackerBinaryType" - }, - "related": { - "type": "string", - "default": "/api/v2/ui/tasks/crackerBinaryType" - } - } - } - } - } - } - }, - { - "properties": { - "files": { - "type": "object", - "properties": { - "links": { - "type": "object", - "properties": { - "self": { - "type": "string", - "default": "/api/v2/ui/tasks/relationships/files" - }, - "related": { - "type": "string", - "default": "/api/v2/ui/tasks/files" - } - } - } - } - } - } - }, - { - "properties": { - "hashlist": { - "type": "object", - "properties": { - "links": { - "type": "object", - "properties": { - "self": { - "type": "string", - "default": "/api/v2/ui/tasks/relationships/hashlist" - }, - "related": { - "type": "string", - "default": "/api/v2/ui/tasks/hashlist" - } - } - } - } - } - } - }, - { - "properties": { - "speeds": { - "type": "object", - "properties": { - "links": { - "type": "object", - "properties": { - "self": { - "type": "string", - "default": "/api/v2/ui/tasks/relationships/speeds" - }, - "related": { - "type": "string", - "default": "/api/v2/ui/tasks/speeds" - } - } - } - } - } - } - } - ] - }, - "included": { - "type": "array", - "items": { - "type": "object", - "properties": [ - { - "properties": { - "id": { - "type": "integer" - }, - "type": { - "type": "string", - "default": "crackerBinary" - }, - "attributes": { - "type": "object", - "properties": { - "crackerBinaryId": { - "type": "integer" - }, - "crackerBinaryTypeId": { - "type": "integer" - }, - "version": { - "type": "string" - }, - "downloadUrl": { - "type": "string" - }, - "binaryName": { - "type": "string" - } - } - } - } - }, - { - "properties": { - "id": { - "type": "integer" - }, - "type": { - "type": "string", - "default": "crackerBinaryType" - }, - "attributes": { - "type": "object", - "properties": { - "crackerBinaryTypeId": { - "type": "integer" - }, - "typeName": { - "type": "string" - }, - "isChunkingAvailable": { - "type": "boolean" - } - } - } - } - }, - { - "properties": { - "id": { - "type": "integer" - }, - "type": { - "type": "string", - "default": "hashlist" - }, - "attributes": { - "type": "object", - "properties": { - "hashlistSeperator": { - "type": "string" - }, - "sourceType": { - "type": "string" - }, - "sourceData": { - "type": "string" - }, - "hashlistId": { - "type": "integer" - }, - "name": { - "type": "string" - }, - "format": { - "type": "integer", - "enum": [ - 0, - 1, - 2, - 3 - ] - }, - "hashTypeId": { - "type": "integer" - }, - "hashCount": { - "type": "integer" - }, - "separator": { - "type": "string" - }, - "cracked": { - "type": "integer" - }, - "isSecret": { - "type": "boolean" - }, - "isHexSalt": { - "type": "boolean" - }, - "isSalted": { - "type": "boolean" - }, - "accessGroupId": { - "type": "integer" - }, - "notes": { - "type": "string" - }, - "useBrain": { - "type": "boolean" - }, - "brainFeatures": { - "type": "integer" - }, - "isArchived": { - "type": "boolean" - } - } - } - } - }, - { - "properties": { - "id": { - "type": "integer" - }, - "type": { - "type": "string", - "default": "assignedAgents" - }, - "attributes": { - "type": "object", - "properties": { - "agentId": { - "type": "integer" - }, - "agentName": { - "type": "string" - }, - "uid": { - "type": "string" - }, - "os": { - "type": "integer" - }, - "devices": { - "type": "string" - }, - "cmdPars": { - "type": "string" - }, - "ignoreErrors": { - "type": "integer", - "enum": [ - 0, - 1, - 2 - ] - }, - "isActive": { - "type": "boolean" - }, - "isTrusted": { - "type": "boolean" - }, - "token": { - "type": "string" - }, - "lastAct": { - "type": "string" - }, - "lastTime": { - "type": "integer", - "format": "int64" - }, - "lastIp": { - "type": "string" - }, - "userId": { - "type": "integer" - }, - "cpuOnly": { - "type": "boolean" - }, - "clientSignature": { - "type": "string" - } - } - } - } - }, - { - "properties": { - "id": { - "type": "integer" - }, - "type": { - "type": "string", - "default": "files" - }, - "attributes": { - "type": "object", - "properties": { - "sourceType": { - "type": "string" - }, - "sourceData": { - "type": "string" - }, - "fileId": { - "type": "integer" - }, - "filename": { - "type": "string" - }, - "size": { - "type": "integer", - "format": "int64" - }, - "isSecret": { - "type": "boolean" - }, - "fileType": { - "type": "integer" - }, - "accessGroupId": { - "type": "integer" - }, - "lineCount": { - "type": "integer", - "format": "int64" - } - } - } - } - }, - { - "properties": { - "id": { - "type": "integer" - }, - "type": { - "type": "string", - "default": "speeds" - }, - "attributes": { - "type": "object", - "properties": { - "speedId": { - "type": "integer" - }, - "agentId": { - "type": "integer" - }, - "taskId": { - "type": "integer" - }, - "speed": { - "type": "integer", - "format": "int64" - }, - "time": { - "type": "integer", - "format": "int64" - } - } - } - } - } - ] - } - } - } - }, - "TaskPostPatchResponse": { - "type": "object", - "properties": { - "jsonapi": { - "type": "object", - "properties": { - "version": { - "type": "string", - "default": "1.1" - }, - "ext": { - "type": "string", - "default": "https://jsonapi.org/profiles/ethanresnick/cursor-pagination" - } - } - }, - "data": { - "type": "array", - "items": { - "type": "object", - "properties": { - "id": { - "type": "integer" - }, - "type": { - "type": "string", - "default": "Task" - }, - "attributes": { - "type": "object", - "properties": { - "taskName": { - "type": "string" - }, - "attackCmd": { - "type": "string" - }, - "chunkTime": { - "type": "integer" - }, - "statusTimer": { - "type": "integer" - }, - "keyspace": { - "type": "integer", - "format": "int64" - }, - "keyspaceProgress": { - "type": "integer", - "format": "int64" - }, - "priority": { - "type": "integer" - }, - "maxAgents": { - "type": "integer" - }, - "color": { - "type": "string" - }, - "isSmall": { - "type": "boolean" - }, - "isCpuTask": { - "type": "boolean" - }, - "useNewBench": { - "type": "boolean" - }, - "skipKeyspace": { - "type": "integer", - "format": "int64" - }, - "crackerBinaryId": { - "type": "integer" - }, - "crackerBinaryTypeId": { - "type": "integer" - }, - "taskWrapperId": { - "type": "integer" - }, - "isArchived": { - "type": "boolean" - }, - "notes": { - "type": "string" - }, - "staticChunks": { - "type": "integer" - }, - "chunkSize": { - "type": "integer", - "format": "int64" - }, - "forcePipe": { - "type": "boolean" - }, - "preprocessorId": { - "type": "integer" - }, - "preprocessorCommand": { - "type": "string" - } - } - } - } - } - } - } - }, - "TaskListResponse": { - "allOf": [ - { - "$ref": "#/components/schemas/ListResponse" - }, - { - "type": "object", - "properties": { - "values": { - "type": "array", - "items": { - "$ref": "#/components/schemas/TaskResponse" - } - } - } - } - ] - }, - "TaskRelationCrackerBinary": { - "type": "object", - "properties": { - "data": { - "type": "object", - "properties": { - "type": { - "type": "string", - "default": "crackerBinary" - }, - "id": { - "type": "integer", - "default": 1 - } - } - } - } - }, - "TaskRelationCrackerBinaryGetResponse": { - "type": "object", - "properties": { - "data": { - "type": "object", - "properties": { - "type": { - "type": "string", - "default": "crackerBinary" - }, - "id": { - "type": "integer", - "default": 1 - } - } - } - } - }, - "TaskRelationCrackerBinaryType": { - "type": "object", - "properties": { - "data": { - "type": "object", - "properties": { - "type": { - "type": "string", - "default": "crackerBinaryType" - }, - "id": { - "type": "integer", - "default": 1 - } - } - } - } - }, - "TaskRelationCrackerBinaryTypeGetResponse": { - "type": "object", - "properties": { - "data": { - "type": "object", - "properties": { - "type": { - "type": "string", - "default": "crackerBinaryType" - }, - "id": { - "type": "integer", - "default": 1 - } - } - } - } - }, - "TaskRelationHashlist": { - "type": "object", - "properties": { - "data": { - "type": "object", - "properties": { - "type": { - "type": "string", - "default": "hashlist" - }, - "id": { - "type": "integer", - "default": 1 - } - } - } - } - }, - "TaskRelationHashlistGetResponse": { - "type": "object", - "properties": { - "data": { - "type": "object", - "properties": { - "type": { - "type": "string", - "default": "hashlist" - }, - "id": { - "type": "integer", - "default": 1 - } - } - } - } - }, - "TaskRelationAssignedAgents": { - "type": "object", - "properties": { - "data": { - "type": "array", - "items": { - "type": "object", - "properties": { - "type": { - "type": "string", - "default": "assignedAgents" - }, - "id": { - "type": "integer", - "default": 1 - } - } - } - } - } - }, - "TaskRelationAssignedAgentsGetResponse": { - "type": "object", - "properties": { - "data": { - "type": "array", - "items": { - "type": "object", - "properties": { - "type": { - "type": "string", - "default": "assignedAgents" - }, - "id": { - "type": "integer", - "default": 1 - } - } - } - } - } - }, - "TaskRelationFiles": { - "type": "object", - "properties": { - "data": { - "type": "array", - "items": { - "type": "object", - "properties": { - "type": { - "type": "string", - "default": "files" - }, - "id": { - "type": "integer", - "default": 1 - } - } - } - } - } - }, - "TaskRelationFilesGetResponse": { - "type": "object", - "properties": { - "data": { - "type": "array", - "items": { - "type": "object", - "properties": { - "type": { - "type": "string", - "default": "files" - }, - "id": { - "type": "integer", - "default": 1 - } - } - } - } - } - }, - "TaskRelationSpeeds": { - "type": "object", - "properties": { - "data": { - "type": "array", - "items": { - "type": "object", - "properties": { - "type": { - "type": "string", - "default": "speeds" - }, - "id": { - "type": "integer", - "default": 1 - } - } - } - } - } - }, - "TaskRelationSpeedsGetResponse": { - "type": "object", - "properties": { - "data": { - "type": "array", - "items": { - "type": "object", - "properties": { - "type": { - "type": "string", - "default": "speeds" - }, - "id": { - "type": "integer", - "default": 1 - } - } - } - } - } - }, - "TaskWrapperCreate": { - "type": "object", - "properties": { - "data": { - "type": "object", - "properties": { - "type": { - "type": "string", - "default": "TaskWrapper" - }, - "attributes": { - "type": "object", - "properties": { - "priority": { - "type": "integer" - }, - "maxAgents": { - "type": "integer" - }, - "accessGroupId": { - "type": "integer" - }, - "taskWrapperName": { - "type": "string" - }, - "isArchived": { - "type": "boolean" - } - } - } - } - } - } - }, - "TaskWrapperPatch": { - "type": "object", - "properties": { - "data": { - "type": "object", - "properties": { - "type": { - "type": "string", - "default": "TaskWrapper" - }, - "attributes": { - "type": "object", - "properties": { - "accessGroupId": { - "type": "integer" - }, - "isArchived": { - "type": "boolean" - }, - "maxAgents": { - "type": "integer" - }, - "priority": { - "type": "integer" - }, - "taskWrapperName": { - "type": "string" - } - } - } - } - } - } - }, - "TaskWrapperResponse": { - "type": "object", - "properties": { - "jsonapi": { - "type": "object", - "properties": { - "version": { - "type": "string", - "default": "1.1" - }, - "ext": { - "type": "string", - "default": "https://jsonapi.org/profiles/ethanresnick/cursor-pagination" - } - } - }, - "links": { - "type": "object", - "properties": { - "self": { - "type": "string", - "default": "/api/v2/ui/taskwrappers?page[size]=25" - }, - "first": { - "type": "string", - "default": "/api/v2/ui/taskwrappers?page[size]=25&page[after]=0" - }, - "last": { - "type": "string", - "default": "/api/v2/ui/taskwrappers?page[size]=25&page[before]=500" - }, - "next": { - "type": "string", - "default": "/api/v2/ui/taskwrappers?page[size]=25&page[after]=25" - }, - "previous": { - "type": "string", - "default": "/api/v2/ui/taskwrappers?page[size]=25&page[before]=25" - } - } - }, - "data": { - "type": "array", - "items": { - "type": "object", - "properties": { - "id": { - "type": "integer" - }, - "type": { - "type": "string", - "default": "TaskWrapper" - }, - "attributes": { - "type": "object", - "properties": { - "priority": { - "type": "integer" - }, - "maxAgents": { - "type": "integer" - }, - "taskType": { - "type": "integer", - "enum": [ - 0, - 1 - ] - }, - "hashlistId": { - "type": "integer" - }, - "accessGroupId": { - "type": "integer" - }, - "taskWrapperName": { - "type": "string" - }, - "isArchived": { - "type": "boolean" - }, - "cracked": { - "type": "integer" - } - } - } - } - } - }, - "relationships": { - "type": "object", - "properties": [ - { - "properties": { - "accessGroup": { - "type": "object", - "properties": { - "links": { - "type": "object", - "properties": { - "self": { - "type": "string", - "default": "/api/v2/ui/taskwrappers/relationships/accessGroup" - }, - "related": { - "type": "string", - "default": "/api/v2/ui/taskwrappers/accessGroup" - } - } - } - } - } - } - }, - { - "properties": { - "hashType": { - "type": "object", - "properties": { - "links": { - "type": "object", - "properties": { - "self": { - "type": "string", - "default": "/api/v2/ui/taskwrappers/relationships/hashType" - }, - "related": { - "type": "string", - "default": "/api/v2/ui/taskwrappers/hashType" - } - } - } - } - } - } - }, - { - "properties": { - "hashlist": { - "type": "object", - "properties": { - "links": { - "type": "object", - "properties": { - "self": { - "type": "string", - "default": "/api/v2/ui/taskwrappers/relationships/hashlist" - }, - "related": { - "type": "string", - "default": "/api/v2/ui/taskwrappers/hashlist" - } - } - } - } - } - } - }, - { - "properties": { - "tasks": { - "type": "object", - "properties": { - "links": { - "type": "object", - "properties": { - "self": { - "type": "string", - "default": "/api/v2/ui/taskwrappers/relationships/tasks" - }, - "related": { - "type": "string", - "default": "/api/v2/ui/taskwrappers/tasks" - } - } - } - } - } - } - } - ] - }, - "included": { - "type": "array", - "items": { - "type": "object", - "properties": [ - { - "properties": { - "id": { - "type": "integer" - }, - "type": { - "type": "string", - "default": "accessGroup" - }, - "attributes": { - "type": "object", - "properties": { - "accessGroupId": { - "type": "integer" - }, - "groupName": { - "type": "string" - } - } - } - } - }, - { - "properties": { - "id": { - "type": "integer" - }, - "type": { - "type": "string", - "default": "hashlist" - }, - "attributes": { - "type": "object", - "properties": { - "hashlistSeperator": { - "type": "string" - }, - "sourceType": { - "type": "string" - }, - "sourceData": { - "type": "string" - }, - "hashlistId": { - "type": "integer" - }, - "name": { - "type": "string" - }, - "format": { - "type": "integer", - "enum": [ - 0, - 1, - 2, - 3 - ] - }, - "hashTypeId": { - "type": "integer" - }, - "hashCount": { - "type": "integer" - }, - "separator": { - "type": "string" - }, - "cracked": { - "type": "integer" - }, - "isSecret": { - "type": "boolean" - }, - "isHexSalt": { - "type": "boolean" - }, - "isSalted": { - "type": "boolean" - }, - "accessGroupId": { - "type": "integer" - }, - "notes": { - "type": "string" - }, - "useBrain": { - "type": "boolean" - }, - "brainFeatures": { - "type": "integer" - }, - "isArchived": { - "type": "boolean" - } - } - } - } - }, - { - "properties": { - "id": { - "type": "integer" - }, - "type": { - "type": "string", - "default": "hashType" - }, - "attributes": { - "type": "object", - "properties": { - "hashTypeId": { - "type": "integer" - }, - "description": { - "type": "string" - }, - "isSalted": { - "type": "boolean" - }, - "isSlowHash": { - "type": "boolean" - } - } - } - } - }, - { - "properties": { - "id": { - "type": "integer" - }, - "type": { - "type": "string", - "default": "tasks" - }, - "attributes": { - "type": "object", - "properties": { - "hashlistId": { - "type": "integer" - }, - "files": { - "type": "array", - "items": { - "type": "integer" - } - }, - "taskId": { - "type": "integer" - }, - "taskName": { - "type": "string" - }, - "attackCmd": { - "type": "string" - }, - "chunkTime": { - "type": "integer" - }, - "statusTimer": { - "type": "integer" - }, - "keyspace": { - "type": "integer", - "format": "int64" - }, - "keyspaceProgress": { - "type": "integer", - "format": "int64" - }, - "priority": { - "type": "integer" - }, - "maxAgents": { - "type": "integer" - }, - "color": { - "type": "string" - }, - "isSmall": { - "type": "boolean" - }, - "isCpuTask": { - "type": "boolean" - }, - "useNewBench": { - "type": "boolean" - }, - "skipKeyspace": { - "type": "integer", - "format": "int64" - }, - "crackerBinaryId": { - "type": "integer" - }, - "crackerBinaryTypeId": { - "type": "integer" - }, - "taskWrapperId": { - "type": "integer" - }, - "isArchived": { - "type": "boolean" - }, - "notes": { - "type": "string" - }, - "staticChunks": { - "type": "integer" - }, - "chunkSize": { - "type": "integer", - "format": "int64" - }, - "forcePipe": { - "type": "boolean" - }, - "preprocessorId": { - "type": "integer" - }, - "preprocessorCommand": { - "type": "string" - } - } - } - } - } - ] - } - } - } - }, - "TaskWrapperRelationSpeeds": { - "type": "object", - "properties": { - "data": { - "type": "array", - "items": { - "type": "object", - "properties": { - "type": { - "type": "string", - "default": "speeds" - }, - "id": { - "type": "integer", - "default": 1 - } - } - } - } - } - }, - "TaskWrapperRelationSpeedsGetResponse": { - "type": "object", - "properties": { - "data": { - "type": "array", - "items": { - "type": "object", - "properties": { - "type": { - "type": "string", - "default": "speeds" - }, - "id": { - "type": "integer", - "default": 1 - } - } - } - } - } - }, - "TaskWrapperSingleResponse": { - "type": "object", - "properties": { - "data": { - "type": "array", - "items": { - "type": "object", - "properties": { - "id": { - "type": "integer" - }, - "type": { - "type": "string", - "default": "TaskWrapper" - }, - "attributes": { - "type": "object", - "properties": { - "priority": { - "type": "integer" - }, - "maxAgents": { - "type": "integer" - }, - "taskType": { - "type": "integer", - "enum": [ - 0, - 1 - ] - }, - "hashlistId": { - "type": "integer" - }, - "accessGroupId": { - "type": "integer" - }, - "taskWrapperName": { - "type": "string" - }, - "isArchived": { - "type": "boolean" - }, - "cracked": { - "type": "integer" - } - } - } - } - } - }, - "relationships": { - "type": "object", - "properties": [ - { - "properties": { - "accessGroup": { - "type": "object", - "properties": { - "links": { - "type": "object", - "properties": { - "self": { - "type": "string", - "default": "/api/v2/ui/taskwrappers/relationships/accessGroup" - }, - "related": { - "type": "string", - "default": "/api/v2/ui/taskwrappers/accessGroup" - } - } - } - } - } - } - }, - { - "properties": { - "hashType": { - "type": "object", - "properties": { - "links": { - "type": "object", - "properties": { - "self": { - "type": "string", - "default": "/api/v2/ui/taskwrappers/relationships/hashType" - }, - "related": { - "type": "string", - "default": "/api/v2/ui/taskwrappers/hashType" - } - } - } - } - } - } - }, - { - "properties": { - "hashlist": { - "type": "object", - "properties": { - "links": { - "type": "object", - "properties": { - "self": { - "type": "string", - "default": "/api/v2/ui/taskwrappers/relationships/hashlist" - }, - "related": { - "type": "string", - "default": "/api/v2/ui/taskwrappers/hashlist" - } - } - } - } - } - } - }, - { - "properties": { - "tasks": { - "type": "object", - "properties": { - "links": { - "type": "object", - "properties": { - "self": { - "type": "string", - "default": "/api/v2/ui/taskwrappers/relationships/tasks" - }, - "related": { - "type": "string", - "default": "/api/v2/ui/taskwrappers/tasks" - } - } - } - } - } - } - } - ] - }, - "included": { - "type": "array", - "items": { - "type": "object", - "properties": [ - { - "properties": { - "id": { - "type": "integer" - }, - "type": { - "type": "string", - "default": "accessGroup" - }, - "attributes": { - "type": "object", - "properties": { - "accessGroupId": { - "type": "integer" - }, - "groupName": { - "type": "string" - } - } - } - } - }, - { - "properties": { - "id": { - "type": "integer" - }, - "type": { - "type": "string", - "default": "hashlist" - }, - "attributes": { - "type": "object", - "properties": { - "hashlistSeperator": { - "type": "string" - }, - "sourceType": { - "type": "string" - }, - "sourceData": { - "type": "string" - }, - "hashlistId": { - "type": "integer" - }, - "name": { - "type": "string" - }, - "format": { - "type": "integer", - "enum": [ - 0, - 1, - 2, - 3 - ] - }, - "hashTypeId": { - "type": "integer" - }, - "hashCount": { - "type": "integer" - }, - "separator": { - "type": "string" - }, - "cracked": { - "type": "integer" - }, - "isSecret": { - "type": "boolean" - }, - "isHexSalt": { - "type": "boolean" - }, - "isSalted": { - "type": "boolean" - }, - "accessGroupId": { - "type": "integer" - }, - "notes": { - "type": "string" - }, - "useBrain": { - "type": "boolean" - }, - "brainFeatures": { - "type": "integer" - }, - "isArchived": { - "type": "boolean" - } - } - } - } - }, - { - "properties": { - "id": { - "type": "integer" - }, - "type": { - "type": "string", - "default": "hashType" - }, - "attributes": { - "type": "object", - "properties": { - "hashTypeId": { - "type": "integer" - }, - "description": { - "type": "string" - }, - "isSalted": { - "type": "boolean" - }, - "isSlowHash": { - "type": "boolean" - } - } - } - } - }, - { - "properties": { - "id": { - "type": "integer" - }, - "type": { - "type": "string", - "default": "tasks" - }, - "attributes": { - "type": "object", - "properties": { - "hashlistId": { - "type": "integer" - }, - "files": { - "type": "array", - "items": { - "type": "integer" - } - }, - "taskId": { - "type": "integer" - }, - "taskName": { - "type": "string" - }, - "attackCmd": { - "type": "string" - }, - "chunkTime": { - "type": "integer" - }, - "statusTimer": { - "type": "integer" - }, - "keyspace": { - "type": "integer", - "format": "int64" - }, - "keyspaceProgress": { - "type": "integer", - "format": "int64" - }, - "priority": { - "type": "integer" - }, - "maxAgents": { - "type": "integer" - }, - "color": { - "type": "string" - }, - "isSmall": { - "type": "boolean" - }, - "isCpuTask": { - "type": "boolean" - }, - "useNewBench": { - "type": "boolean" - }, - "skipKeyspace": { - "type": "integer", - "format": "int64" - }, - "crackerBinaryId": { - "type": "integer" - }, - "crackerBinaryTypeId": { - "type": "integer" - }, - "taskWrapperId": { - "type": "integer" - }, - "isArchived": { - "type": "boolean" - }, - "notes": { - "type": "string" - }, - "staticChunks": { - "type": "integer" - }, - "chunkSize": { - "type": "integer", - "format": "int64" - }, - "forcePipe": { - "type": "boolean" - }, - "preprocessorId": { - "type": "integer" - }, - "preprocessorCommand": { - "type": "string" - } - } - } - } - } - ] - } - } - } - }, - "TaskWrapperPostPatchResponse": { - "type": "object", - "properties": { - "jsonapi": { - "type": "object", - "properties": { - "version": { - "type": "string", - "default": "1.1" - }, - "ext": { - "type": "string", - "default": "https://jsonapi.org/profiles/ethanresnick/cursor-pagination" - } - } - }, - "data": { - "type": "array", - "items": { - "type": "object", - "properties": { - "id": { - "type": "integer" - }, - "type": { - "type": "string", - "default": "TaskWrapper" - }, - "attributes": { - "type": "object", - "properties": { - "priority": { - "type": "integer" - }, - "maxAgents": { - "type": "integer" - }, - "taskType": { - "type": "integer", - "enum": [ - 0, - 1 - ] - }, - "hashlistId": { - "type": "integer" - }, - "accessGroupId": { - "type": "integer" - }, - "taskWrapperName": { - "type": "string" - }, - "isArchived": { - "type": "boolean" - }, - "cracked": { - "type": "integer" - } - } - } - } - } - } - } - }, - "TaskWrapperListResponse": { - "allOf": [ - { - "$ref": "#/components/schemas/ListResponse" - }, - { - "type": "object", - "properties": { - "values": { - "type": "array", - "items": { - "$ref": "#/components/schemas/TaskWrapperResponse" - } - } - } - } - ] - }, - "TaskWrapperRelationAccessGroup": { - "type": "object", - "properties": { - "data": { - "type": "object", - "properties": { - "type": { - "type": "string", - "default": "accessGroup" - }, - "id": { - "type": "integer", - "default": 1 - } - } - } - } - }, - "TaskWrapperRelationAccessGroupGetResponse": { - "type": "object", - "properties": { - "data": { - "type": "object", - "properties": { - "type": { - "type": "string", - "default": "accessGroup" - }, - "id": { - "type": "integer", - "default": 1 - } - } - } - } - }, - "TaskWrapperRelationHashlist": { - "type": "object", - "properties": { - "data": { - "type": "object", - "properties": { - "type": { - "type": "string", - "default": "hashlist" - }, - "id": { - "type": "integer", - "default": 1 - } - } - } - } - }, - "TaskWrapperRelationHashlistGetResponse": { - "type": "object", - "properties": { - "data": { - "type": "object", - "properties": { - "type": { - "type": "string", - "default": "hashlist" - }, - "id": { - "type": "integer", - "default": 1 - } - } - } - } - }, - "TaskWrapperRelationHashType": { - "type": "object", - "properties": { - "data": { - "type": "object", - "properties": { - "type": { - "type": "string", - "default": "hashType" - }, - "id": { - "type": "integer", - "default": 1 - } - } - } - } - }, - "TaskWrapperRelationHashTypeGetResponse": { - "type": "object", - "properties": { - "data": { - "type": "object", - "properties": { - "type": { - "type": "string", - "default": "hashType" - }, - "id": { - "type": "integer", - "default": 1 - } - } - } - } - }, - "TaskWrapperRelationTasks": { - "type": "object", - "properties": { - "data": { - "type": "array", - "items": { - "type": "object", - "properties": { - "type": { - "type": "string", - "default": "tasks" - }, - "id": { - "type": "integer", - "default": 1 - } - } - } - } - } - }, - "TaskWrapperRelationTasksGetResponse": { - "type": "object", - "properties": { - "data": { - "type": "array", - "items": { - "type": "object", - "properties": { - "type": { - "type": "string", - "default": "tasks" - }, - "id": { - "type": "integer", - "default": 1 - } - } - } - } - } - }, - "UserCreate": { - "type": "object", - "properties": { - "data": { - "type": "object", - "properties": { - "type": { - "type": "string", - "default": "User" - }, - "attributes": { - "type": "object", - "properties": { - "name": { - "type": "string" - }, - "email": { - "type": "string" - }, - "globalPermissionGroupId": { - "type": "integer" - } - } - } - } - } - } - }, - "UserPatch": { - "type": "object", - "properties": { - "data": { - "type": "object", - "properties": { - "type": { - "type": "string", - "default": "User" - }, - "attributes": { - "type": "object", - "properties": { - "email": { - "type": "string" - }, - "globalPermissionGroupId": { - "type": "integer" - }, - "isValid": { - "type": "boolean" - }, - "name": { - "type": "string" - } - } - } - } - } - } - }, - "UserResponse": { - "type": "object", - "properties": { - "jsonapi": { - "type": "object", - "properties": { - "version": { - "type": "string", - "default": "1.1" - }, - "ext": { - "type": "string", - "default": "https://jsonapi.org/profiles/ethanresnick/cursor-pagination" - } - } - }, - "links": { - "type": "object", - "properties": { - "self": { - "type": "string", - "default": "/api/v2/ui/users?page[size]=25" - }, - "first": { - "type": "string", - "default": "/api/v2/ui/users?page[size]=25&page[after]=0" - }, - "last": { - "type": "string", - "default": "/api/v2/ui/users?page[size]=25&page[before]=500" - }, - "next": { - "type": "string", - "default": "/api/v2/ui/users?page[size]=25&page[after]=25" - }, - "previous": { - "type": "string", - "default": "/api/v2/ui/users?page[size]=25&page[before]=25" - } - } - }, - "data": { - "type": "array", - "items": { - "type": "object", - "properties": { - "id": { - "type": "integer" - }, - "type": { - "type": "string", - "default": "User" - }, - "attributes": { - "type": "object", - "properties": { - "name": { - "type": "string" - }, - "email": { - "type": "string" - }, - "passwordHash": { - "type": "string" - }, - "passwordSalt": { - "type": "string" - }, - "isValid": { - "type": "boolean" - }, - "isComputedPassword": { - "type": "boolean" - }, - "lastLoginDate": { - "type": "integer", - "format": "int64" - }, - "registeredSince": { - "type": "integer", - "format": "int64" - }, - "sessionLifetime": { - "type": "integer" - }, - "globalPermissionGroupId": { - "type": "integer" - }, - "yubikey": { - "type": "string" - }, - "otp1": { - "type": "string" - }, - "otp2": { - "type": "string" - }, - "otp3": { - "type": "string" - }, - "otp4": { - "type": "string" - } - } - } - } - } - }, - "relationships": { - "type": "object", - "properties": [ - { - "properties": { - "accessGroups": { - "type": "object", - "properties": { - "links": { - "type": "object", - "properties": { - "self": { - "type": "string", - "default": "/api/v2/ui/users/relationships/accessGroups" - }, - "related": { - "type": "string", - "default": "/api/v2/ui/users/accessGroups" - } - } - } - } - } - } - }, - { - "properties": { - "globalPermissionGroup": { - "type": "object", - "properties": { - "links": { - "type": "object", - "properties": { - "self": { - "type": "string", - "default": "/api/v2/ui/users/relationships/globalPermissionGroup" - }, - "related": { - "type": "string", - "default": "/api/v2/ui/users/globalPermissionGroup" - } - } - } - } - } - } - } - ] - }, - "included": { - "type": "array", - "items": { - "type": "object", - "properties": [ - { - "properties": { - "id": { - "type": "integer" - }, - "type": { - "type": "string", - "default": "globalPermissionGroup" - }, - "attributes": { - "type": "object", - "properties": { - "id": { - "type": "integer" - }, - "name": { - "type": "string" - }, - "permissions": { - "type": "object" - } - } - } - } - }, - { - "properties": { - "id": { - "type": "integer" - }, - "type": { - "type": "string", - "default": "accessGroups" - }, - "attributes": { - "type": "object", - "properties": { - "accessGroupId": { - "type": "integer" - }, - "groupName": { - "type": "string" - } - } - } - } - } - ] - } - } - } - }, - "UserRelationTasks": { - "type": "object", - "properties": { - "data": { - "type": "array", - "items": { - "type": "object", - "properties": { - "type": { - "type": "string", - "default": "tasks" - }, - "id": { - "type": "integer", - "default": 1 - } - } - } - } - } - }, - "UserRelationTasksGetResponse": { - "type": "object", - "properties": { - "data": { - "type": "array", - "items": { - "type": "object", - "properties": { - "type": { - "type": "string", - "default": "tasks" - }, - "id": { - "type": "integer", - "default": 1 - } - } - } - } - } - }, - "UserSingleResponse": { - "type": "object", - "properties": { - "data": { - "type": "array", - "items": { - "type": "object", - "properties": { - "id": { - "type": "integer" - }, - "type": { - "type": "string", - "default": "User" - }, - "attributes": { - "type": "object", - "properties": { - "name": { - "type": "string" - }, - "email": { - "type": "string" - }, - "passwordHash": { - "type": "string" - }, - "passwordSalt": { - "type": "string" - }, - "isValid": { - "type": "boolean" - }, - "isComputedPassword": { - "type": "boolean" - }, - "lastLoginDate": { - "type": "integer", - "format": "int64" - }, - "registeredSince": { - "type": "integer", - "format": "int64" - }, - "sessionLifetime": { - "type": "integer" - }, - "globalPermissionGroupId": { - "type": "integer" - }, - "yubikey": { - "type": "string" - }, - "otp1": { - "type": "string" - }, - "otp2": { - "type": "string" - }, - "otp3": { - "type": "string" - }, - "otp4": { - "type": "string" - } - } - } - } - } - }, - "relationships": { - "type": "object", - "properties": [ - { - "properties": { - "accessGroups": { - "type": "object", - "properties": { - "links": { - "type": "object", - "properties": { - "self": { - "type": "string", - "default": "/api/v2/ui/users/relationships/accessGroups" - }, - "related": { - "type": "string", - "default": "/api/v2/ui/users/accessGroups" - } - } - } - } - } - } - }, - { - "properties": { - "globalPermissionGroup": { - "type": "object", - "properties": { - "links": { - "type": "object", - "properties": { - "self": { - "type": "string", - "default": "/api/v2/ui/users/relationships/globalPermissionGroup" - }, - "related": { - "type": "string", - "default": "/api/v2/ui/users/globalPermissionGroup" - } - } - } - } - } - } - } - ] - }, - "included": { - "type": "array", - "items": { - "type": "object", - "properties": [ - { - "properties": { - "id": { - "type": "integer" - }, - "type": { - "type": "string", - "default": "globalPermissionGroup" - }, - "attributes": { - "type": "object", - "properties": { - "id": { - "type": "integer" - }, - "name": { - "type": "string" - }, - "permissions": { - "type": "object" - } - } - } - } - }, - { - "properties": { - "id": { - "type": "integer" - }, - "type": { - "type": "string", - "default": "accessGroups" - }, - "attributes": { - "type": "object", - "properties": { - "accessGroupId": { - "type": "integer" - }, - "groupName": { - "type": "string" - } - } - } - } - } - ] - } - } - } - }, - "UserPostPatchResponse": { - "type": "object", - "properties": { - "jsonapi": { - "type": "object", - "properties": { - "version": { - "type": "string", - "default": "1.1" - }, - "ext": { - "type": "string", - "default": "https://jsonapi.org/profiles/ethanresnick/cursor-pagination" - } - } - }, - "data": { - "type": "array", - "items": { - "type": "object", - "properties": { - "id": { - "type": "integer" - }, - "type": { - "type": "string", - "default": "User" - }, - "attributes": { - "type": "object", - "properties": { - "name": { - "type": "string" - }, - "email": { - "type": "string" - }, - "passwordHash": { - "type": "string" - }, - "passwordSalt": { - "type": "string" - }, - "isValid": { - "type": "boolean" - }, - "isComputedPassword": { - "type": "boolean" - }, - "lastLoginDate": { - "type": "integer", - "format": "int64" - }, - "registeredSince": { - "type": "integer", - "format": "int64" - }, - "sessionLifetime": { - "type": "integer" - }, - "globalPermissionGroupId": { - "type": "integer" - }, - "yubikey": { - "type": "string" - }, - "otp1": { - "type": "string" - }, - "otp2": { - "type": "string" - }, - "otp3": { - "type": "string" - }, - "otp4": { - "type": "string" - } - } - } - } - } - } - } - }, - "UserListResponse": { - "allOf": [ - { - "$ref": "#/components/schemas/ListResponse" - }, - { - "type": "object", - "properties": { - "values": { - "type": "array", - "items": { - "$ref": "#/components/schemas/UserResponse" - } - } - } - } - ] - }, - "UserRelationGlobalPermissionGroup": { - "type": "object", - "properties": { - "data": { - "type": "object", - "properties": { - "type": { - "type": "string", - "default": "globalPermissionGroup" - }, - "id": { - "type": "integer", - "default": 1 - } - } - } - } - }, - "UserRelationGlobalPermissionGroupGetResponse": { - "type": "object", - "properties": { - "data": { - "type": "object", - "properties": { - "type": { - "type": "string", - "default": "globalPermissionGroup" - }, - "id": { - "type": "integer", - "default": 1 - } - } - } - } - }, - "UserRelationAccessGroups": { - "type": "object", - "properties": { - "data": { - "type": "array", - "items": { - "type": "object", - "properties": { - "type": { - "type": "string", - "default": "accessGroups" - }, - "id": { - "type": "integer", - "default": 1 - } - } - } - } - } - }, - "UserRelationAccessGroupsGetResponse": { - "type": "object", - "properties": { - "data": { - "type": "array", - "items": { - "type": "object", - "properties": { - "type": { - "type": "string", - "default": "accessGroups" - }, - "id": { - "type": "integer", - "default": 1 - } - } - } - } - } - }, - "RegVoucherCreate": { - "type": "object", - "properties": { - "data": { - "type": "object", - "properties": { - "type": { - "type": "string", - "default": "RegVoucher" - }, - "attributes": { - "type": "object", - "properties": { - "voucher": { - "type": "string" - } - } - } - } - } - } - }, - "RegVoucherPatch": { - "type": "object", - "properties": { - "data": { - "type": "object", - "properties": { - "type": { - "type": "string", - "default": "RegVoucher" - }, - "attributes": { - "type": "object", - "properties": { - "voucher": { - "type": "string" - } - } - } - } - } - } - }, - "RegVoucherResponse": { - "type": "object", - "properties": { - "jsonapi": { - "type": "object", - "properties": { - "version": { - "type": "string", - "default": "1.1" - }, - "ext": { - "type": "string", - "default": "https://jsonapi.org/profiles/ethanresnick/cursor-pagination" - } - } - }, - "links": { - "type": "object", - "properties": { - "self": { - "type": "string", - "default": "/api/v2/ui/vouchers?page[size]=25" - }, - "first": { - "type": "string", - "default": "/api/v2/ui/vouchers?page[size]=25&page[after]=0" - }, - "last": { - "type": "string", - "default": "/api/v2/ui/vouchers?page[size]=25&page[before]=500" - }, - "next": { - "type": "string", - "default": "/api/v2/ui/vouchers?page[size]=25&page[after]=25" - }, - "previous": { - "type": "string", - "default": "/api/v2/ui/vouchers?page[size]=25&page[before]=25" - } - } - }, - "data": { - "type": "array", - "items": { - "type": "object", - "properties": { - "id": { - "type": "integer" - }, - "type": { - "type": "string", - "default": "RegVoucher" - }, - "attributes": { - "type": "object", - "properties": { - "voucher": { - "type": "string" - }, - "time": { - "type": "integer", - "format": "int64" - } - } - } - } - } - }, - "relationships": { - "type": "object", - "properties": [] - }, - "included": { - "type": "array", - "items": { - "type": "object", - "properties": [] - } - } - } - }, - "RegVoucherRelationAccessGroups": { - "type": "object", - "properties": { - "data": { - "type": "array", - "items": { - "type": "object", - "properties": { - "type": { - "type": "string", - "default": "accessGroups" - }, - "id": { - "type": "integer", - "default": 1 - } - } - } - } - } - }, - "RegVoucherRelationAccessGroupsGetResponse": { - "type": "object", - "properties": { - "data": { - "type": "array", - "items": { - "type": "object", - "properties": { - "type": { - "type": "string", - "default": "accessGroups" - }, - "id": { - "type": "integer", - "default": 1 - } - } - } - } - } - }, - "RegVoucherSingleResponse": { - "type": "object", - "properties": { - "data": { - "type": "array", - "items": { - "type": "object", - "properties": { - "id": { - "type": "integer" - }, - "type": { - "type": "string", - "default": "RegVoucher" - }, - "attributes": { - "type": "object", - "properties": { - "voucher": { - "type": "string" - }, - "time": { - "type": "integer", - "format": "int64" - } - } - } - } - } - }, - "relationships": { - "type": "object", - "properties": [] - }, - "included": { - "type": "array", - "items": { - "type": "object", - "properties": [] - } - } - } - }, - "RegVoucherPostPatchResponse": { - "type": "object", - "properties": { - "jsonapi": { - "type": "object", - "properties": { - "version": { - "type": "string", - "default": "1.1" - }, - "ext": { - "type": "string", - "default": "https://jsonapi.org/profiles/ethanresnick/cursor-pagination" - } - } - }, - "data": { - "type": "array", - "items": { - "type": "object", - "properties": { - "id": { - "type": "integer" - }, - "type": { - "type": "string", - "default": "RegVoucher" - }, - "attributes": { - "type": "object", - "properties": { - "voucher": { - "type": "string" - }, - "time": { - "type": "integer", - "format": "int64" - } - } - } - } - } - } - } - }, - "RegVoucherListResponse": { - "allOf": [ - { - "$ref": "#/components/schemas/ListResponse" - }, - { - "type": "object", - "properties": { - "values": { - "type": "array", - "items": { - "$ref": "#/components/schemas/RegVoucherResponse" - } - } - } - } - ] - }, - "AbortChunkHelperAPI": { - "type": "object", - "properties": { - "chunkId": { - "type": "integer" - } - } - }, - "AbortChunkHelperAPIresponse": { - "type": "array", - "items": { - "type": "object", - "properties": { - "Abort": { - "type": "string", - "default": "Success" - } - } - } - }, - "AssignAgentHelperAPI": { - "type": "object", - "properties": { - "agentId": { - "type": "integer" - }, - "taskId": { - "type": "integer" - } - } - }, - "AssignAgentHelperAPIresponse": { - "type": "array", - "items": { - "type": "object", - "properties": { - "Assign": { - "type": "string", - "default": "Success" - } - } - } - }, - "ChangeOwnPasswordHelperAPI": { - "type": "object", - "properties": { - "oldPassword": { - "type": "string" - }, - "newPassword": { - "type": "string" - }, - "confirmPassword": { - "type": "string" - } - } - }, - "ChangeOwnPasswordHelperAPIresponse": { - "type": "array", - "items": { - "type": "object", - "properties": { - "Change password": { - "type": "string", - "default": "Password succesfully updated!" - } - } - } - }, - "CreateSupertaskHelperAPI": { - "type": "object", - "properties": { - "supertaskTemplateId": { - "type": "integer" - }, - "hashlistId": { - "type": "integer" - }, - "crackerVersionId": { - "type": "integer" - } - } - }, - "CreateSuperHashlistHelperAPI": { - "type": "object", - "properties": { - "hashlistIds": { - "type": "array", - "items": { - "type": "integer" - } - }, - "name": { - "type": "string" - } - } - }, - "ExportCrackedHashesHelperAPI": { - "type": "object", - "properties": { - "hashlistId": { - "type": "integer" - } - } - }, - "ExportLeftHashesHelperAPI": { - "type": "object", - "properties": { - "hashlistId": { - "type": "integer" - } - } - }, - "ExportWordlistHelperAPI": { - "type": "object", - "properties": { - "hashlistId": { - "type": "integer" - } - } - }, - "GetAccessGroupsHelperAPI": { - "type": "object", - "properties": [] - }, - "GetFileHelperAPI": { - "type": "object", - "properties": [] - }, - "GetUserPermissionHelperAPI": { - "type": "object", - "properties": [] - }, - "ImportCrackedHashesHelperAPI": { - "type": "object", - "properties": { - "hashlistId": { - "type": "integer" - }, - "sourceData": { - "type": "string" - }, - "separator": { - "type": "string" - } - } - }, - "ImportCrackedHashesHelperAPIresponse": { - "type": "array", - "items": { - "type": "object", - "properties": { - "totalLines": { - "type": "string", - "default": 100 - }, - "newCracked": { - "type": "string", - "default": 5 - }, - "alreadyCracked": { - "type": "string", - "default": 2 - }, - "invalid": { - "type": "string", - "default": 1 - }, - "notFound": { - "type": "string", - "default": 1 - }, - "processTime": { - "type": "string", - "default": 60 - }, - "tooLongPlaintexts": { - "type": "string", - "default": 4 - } - } - } - }, - "ImportFileHelperAPI": { - "type": "object", - "properties": [] - }, - "PurgeTaskHelperAPI": { - "type": "object", - "properties": { - "taskId": { - "type": "integer" - } - } - }, - "PurgeTaskHelperAPIresponse": { - "type": "array", - "items": { - "type": "object", - "properties": { - "Purge": { - "type": "string", - "default": "Success" - } - } - } - }, - "RecountFileLinesHelperAPI": { - "type": "object", - "properties": { - "fileId": { - "type": "integer" - } - } - }, - "ResetChunkHelperAPI": { - "type": "object", - "properties": { - "chunkId": { - "type": "integer" - } - } - }, - "ResetChunkHelperAPIresponse": { - "type": "array", - "items": { - "type": "object", - "properties": { - "Reset": { - "type": "string", - "default": "Success" - } - } - } - }, - "ResetUserPasswordHelperAPI": { - "type": "object", - "properties": { - "email": { - "type": "string" - }, - "username": { - "type": "string" - } - } - }, - "ResetUserPasswordHelperAPIresponse": { - "type": "array", - "items": { - "type": "object", - "properties": { - "Reset": { - "type": "string", - "default": "Success" - } - } - } - }, - "SetUserPasswordHelperAPI": { - "type": "object", - "properties": { - "userId": { - "type": "integer" - }, - "password": { - "type": "string" - } - } - }, - "SetUserPasswordHelperAPIresponse": { - "type": "array", - "items": { - "type": "object", - "properties": { - "Set password": { - "type": "string", - "default": "Success" - } - } - } - }, - "UnassignAgentHelperAPI": { - "type": "object", - "properties": { - "agentId": { - "type": "integer" - } - } - }, - "UnassignAgentHelperAPIresponse": { - "type": "array", - "items": { - "type": "object", - "properties": { - "Unassign": { - "type": "string", - "default": "Success" - } - } - } - }, - "Token": { - "type": "object", - "properties": { - "token": { - "type": "string" - }, - "expires": { - "type": "integer" - } - }, - "additionalProperties": false - }, - "TokenRequest": { - "type": "array", - "items": { - "type": "string", - "example": "role.all" - } - }, - "ObjectRequest": { - "type": "object", - "properties": { - "expand": { - "type": "string" - }, - "expires": { - "type": "integer" - } - }, - "additionalProperties": false - }, - "ObjectListRequest": { - "type": "object", - "properties": { - "expand": { - "type": "string" - }, - "filter": { - "type": "array", - "items": { - "type": "string", - "example": "" - } - } - }, - "additionalProperties": false - }, - "UnassignAgentHelperAPIResponse": { - "type": "object", - "properties": { - "message": { - "type": "string", - "example": "Agent successfully unassigned" - } - } - }, - "AssignAgentHelperAPIResponse": { - "type": "object", - "properties": { - "message": { - "type": "string", - "example": "AssignAgentHelperAPIResponse message" - } - } - }, - "ImportCrackedHashesHelperAPIResponse": { - "type": "object", - "properties": { - "message": { - "type": "string", - "example": "ImportCrackedHashesHelperAPIResponse message" - } - } - }, - "AbortChunkHelperAPIResponse": { - "type": "object", - "properties": { - "message": { - "type": "string", - "example": "AbortChunkHelperAPIResponse message" - } - } - }, - "ResetUserPasswordHelperAPIResponse": { - "type": "object", - "properties": { - "message": { - "type": "string", - "example": "ResetUserPasswordHelperAPIResponse message" - } - } - }, - "PurgeTaskHelperAPIResponse": { - "type": "object", - "properties": { - "message": { - "type": "string", - "example": "PurgeTaskHelperAPIResponse message" - } - } - }, - "ResetChunkHelperAPIResponse": { - "type": "object", - "properties": { - "message": { - "type": "string", - "example": "ResetChunkHelperAPIResponse message" - } - } - }, - "SetUserPasswordHelperAPIResponse": { - "type": "object", - "properties": { - "message": { - "type": "string", - "example": "SetUserPasswordHelperAPIResponse message" - } - } - }, - "ChangeOwnPasswordHelperAPIResponse": { - "type": "object", - "properties": { - "message": { - "type": "string", - "example": "ChangeOwnPasswordHelperAPIResponse message" - } - } - } - }, - "securitySchemes": { - "bearerAuth": { - "type": "http", - "description": "JWT Authorization header using the Bearer scheme.", - "scheme": "bearer", - "bearerFormat": "JWT", - "scopes": [ - "permAccessGroupCreate", - "permAccessGroupDelete", - "permAccessGroupRead", - "permAccessGroupUpdate", - "permAgentAssignmentCreate", - "permAgentAssignmentDelete", - "permAgentAssignmentRead", - "permAgentAssignmentUpdate", - "permAgentBinaryCreate", - "permAgentBinaryDelete", - "permAgentBinaryRead", - "permAgentBinaryUpdate", - "permAgentCreate", - "permAgentDelete", - "permAgentErrorDelete", - "permAgentErrorRead", - "permAgentErrorUpdate", - "permAgentRead", - "permAgentStatDelete", - "permAgentStatRead", - "permAgentUpdate", - "permChunkRead", - "permChunkUpdate", - "permConfigRead", - "permConfigSectionRead", - "permConfigUpdate", - "permCrackerBinaryCreate", - "permCrackerBinaryDelete", - "permCrackerBinaryRead", - "permCrackerBinaryTypeCreate", - "permCrackerBinaryTypeDelete", - "permCrackerBinaryTypeRead", - "permCrackerBinaryTypeUpdate", - "permCrackerBinaryUpdate", - "permFileCreate", - "permFileDelete", - "permFileRead", - "permFileUpdate", - "permHashRead", - "permHashTypeCreate", - "permHashTypeDelete", - "permHashTypeRead", - "permHashTypeUpdate", - "permHashUpdate", - "permHashlistCreate", - "permHashlistDelete", - "permHashlistRead", - "permHashlistUpdate", - "permHealthCheckAgentRead", - "permHealthCheckAgentUpdate", - "permHealthCheckCreate", - "permHealthCheckDelete", - "permHealthCheckRead", - "permHealthCheckUpdate", - "permLogEntryCreate", - "permLogEntryDelete", - "permLogEntryRead", - "permLogEntryUpdate", - "permNotificationSettingCreate", - "permNotificationSettingDelete", - "permNotificationSettingRead", - "permNotificationSettingUpdate", - "permPreprocessorCreate", - "permPreprocessorDelete", - "permPreprocessorRead", - "permPreprocessorUpdate", - "permPretaskCreate", - "permPretaskDelete", - "permPretaskRead", - "permPretaskUpdate", - "permRegVoucherCreate", - "permRegVoucherDelete", - "permRegVoucherRead", - "permRegVoucherUpdate", - "permRightGroupCreate", - "permRightGroupDelete", - "permRightGroupRead", - "permRightGroupUpdate", - "permSpeedRead", - "permSpeedUpdate", - "permSupertaskCreate", - "permSupertaskDelete", - "permSupertaskRead", - "permSupertaskUpdate", - "permTaskCreate", - "permTaskDelete", - "permTaskRead", - "permTaskUpdate", - "permTaskWrapperCreate", - "permTaskWrapperDelete", - "permTaskWrapperRead", - "permTaskWrapperUpdate", - "permUserCreate", - "permUserDelete", - "permUserRead", - "permUserUpdate" - ] - }, - "basicAuth": { - "type": "http", - "description": "Basic Authorization header.", - "scheme": "basic" - } - } - } -} \ No newline at end of file From 7e8b8f03ad8e122bd3b8b46403f188e00f01a57d Mon Sep 17 00:00:00 2001 From: Sein Coray Date: Wed, 20 Aug 2025 11:07:49 +0200 Subject: [PATCH 152/691] restored readme for mkdocs setup documentation --- doc/README.md | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) create mode 100644 doc/README.md diff --git a/doc/README.md b/doc/README.md new file mode 100644 index 000000000..a59a1a98e --- /dev/null +++ b/doc/README.md @@ -0,0 +1,16 @@ +## MKDocs Local Setup + +1. Make sure you are in the root of the server project and setup a virtual enviroment there. +2. Install mkdocs +3. Install required mkdocs extensions +4. Start the server +5. Browse to http://127.0.0.1:8000 + +``` bash +cd hashtopolis +virtualenv venv +source venv/bin/activate +pip3 install mkdocs +pip3 install $(mkdocs get-deps) +mkdocs server +``` From c07b4d65103f5f0577d22f2769b30ecacc90c873 Mon Sep 17 00:00:00 2001 From: Sein Coray Date: Wed, 20 Aug 2025 11:13:06 +0200 Subject: [PATCH 153/691] removed all uneccessary trailing spaces and newlines --- doc/faq_tips/faq.md | 174 ++++---------------------------------------- 1 file changed, 16 insertions(+), 158 deletions(-) diff --git a/doc/faq_tips/faq.md b/doc/faq_tips/faq.md index 441295388..56fa831ea 100644 --- a/doc/faq_tips/faq.md +++ b/doc/faq_tips/faq.md @@ -2,36 +2,24 @@ ## Installation & Setup - - ❓ How do I install Hashtopolis? -**Answer**: The easiest way to install Hashtopolis is with the Docker images that can be retrieved from the [Docker Hub](https://hub.docker.com/u/hashtopolis). Follow the instructions from the [documentation](../installation_guidelines/basic_install.md). +**Answer**: The easiest way to install Hashtopolis is with the Docker images that can be retrieved from [Docker Hub](https://hub.docker.com/u/hashtopolis). Follow the instructions from the [documentation](../installation_guidelines/basic_install.md). --- - - ❓ Can I run Hashtopolis on a server already running something else (e.g. Homebridge)? **Answer**: Yes, as long as the server has enough resources. - - --- - - ❓ How do I make the agent start automatically on Ubuntu? **Answer**: To auto-start the agent on boot, create a `systemd` service file in `/etc/systemd/system/hashtopolis-agent.service` that runs the agent script with Python. Enable it using `systemctl enable hashtopolis-agent` and start it with `systemctl start hashtopolis-agent`. Ensure your agent configuration (`config.json`) is correctly set before enabling. - - --- - - ❓ How can I mount folders (import, files, binaries) to a local directory instead of using a Docker volume? **Answer**: By default (when using the standard `docker-compose` setup), Hashtopolis stores folders like `import`, `files`, and `binaries` in a Docker volume. You can list this volume using `docker volume ls` and access it inside the container at `/usr/local/share/hashtopolis`. @@ -104,13 +92,8 @@ docker compose up Finally, copy your data back into the corresponding folders. - - - --- - - ❓ How can I debug MySQL queries? **Answer**: If you're encountering unusual issues and want to understand what queries Hashtopolis is executing on the database, you can enable query logging in MySQL. @@ -130,13 +113,8 @@ tail -f *.log This enables the general query log, which logs all incoming SQL statements. You can inspect these logs to trace how the application interacts with the database. - - - --- - - ❓ Why does Hashtopolis fail and how can I debug errors? **Answer**: Troubleshooting Hashtopolis can sometimes be challenging. A common error you might encounter is: @@ -148,55 +126,49 @@ Error during speed benchmark, return code: 255 Output: This usually means something is misconfigured in the Hashcat setup. To debug: 1. **Stop the Hashtopolis agent** (if running in a background process or screen). - + 2. **Restart the agent manually with the** `**--debug**` **flag**: - + ``` python3 agent.py --debug ``` - + 3. Look in the debug output for a line starting with `CALL:` — this shows the exact Hashcat command being executed. - + 4. **Navigate to the relevant cracker binary directory**: - + ``` cd crackers/1/ ``` - + _(Note: Check the actual cracker ID used by your task in the Hashtopolis web UI under the Crackers section.)_ - + 5. **Copy the** `**CALL:**` **command and remove**: - + - `--machine-readable` - + - `--quiet` - + - `-p ""` _(as tab characters can cause issues when copying)_ - + 6. **Run the simplified Hashcat command manually** and check the terminal output. Example: - + ``` ./hashcat.bin --progress-only --restore-disable --potfile-disable --session=hashtopolis -a3 ../../hashlists/2 ?l?l?l?l?l?l?a --hash-type=0 -o ../../hashlists/2.out ``` - This should help reveal any specific errors or misconfigurations in the command line. - - - --- - - ❓ Can I fake an agent for debugging the server API? **Answer**: Yes, you can simulate an agent to test how the Hashtopolis server API behaves. This is especially useful for replicating hard-to-reproduce production issues. 1. **Ensure the agent is registered** at the server and has a valid token. - + 2. Use the following Python code to simulate agent-server interactions: - + ``` #!/usr/bin/python3 @@ -259,88 +231,53 @@ elif status == 'OK': This lets you debug API interactions manually without needing a live cracking job or agent setup. - - - --- - - - ❓ Is internet access required to run Hashtopolis? **Answer**: No. - - --- - - ❓ Can I run Hashtopolis on ARM (e.g., Raspberry Pi)? **Answer**: Not officially supported. ARM builds must be custom-built. - - --- - - ## Server Configuration & Issues - - ❓ Why does Apache show only a directory or a 500 error? **Answer**: A 500 error or directory index display usually indicates PHP is either not installed, disabled, or misconfigured. Ensure that `libapache2-mod-php` is installed and enabled. Also, verify that your `php.ini` and `.htaccess` files don't contain invalid directives. Check Apache error logs at `/var/log/apache2/error.log` for more specific issues. - - --- - - ❓ How to fix a failed first login in Docker? **Answer**: Check if the backend logs show “initialization successful”. Docker environment variables must be set correctly. - - --- - - ❓ How to upgrade Hashtopolis without data loss? **Answer**: Back up the database, pull the latest version from Git, and apply the update through the upgrade feature. - - --- - - ❓ PHP Fatal error:  Allowed memory size of 268435456 bytes exhausted - What can I do now? - This guide shows how to raise PHP's memory limit in a Dockerized setup using a `custom.ini` file mounted into the PHP container. It also includes example `docker-compose.yml` snippets for common images. 1) **Create `custom.ini` next to your `docker-compose.yml`** Add your PHP overrides (uppercase `M` is conventional, PHP is case-insensitive here): - ```ini - ; custom.ini - memory_limit = 256M - upload_max_filesize = 256M - max_execution_time = 60 - ``` - Adjust `memory_limit` to your needs (e.g., `512M`, `1G`). @@ -351,195 +288,116 @@ max_execution_time = 60 Add this to your **backend** service’s `volumes:` list in `docker-compose.yml`: - ```yaml - ./custom.ini:/usr/local/etc/php/conf.d/custom.ini ``` - > The path `/usr/local/etc/php/conf.d/` is correct for official PHP images (`php:*`). - - 3) **Recreate or restart the container** Make sure the container reloads the INI: - - ```bash - # Start or recreate after changes - docker compose up -d - - # or, if the stack is already running and only the ini changed: - docker compose restart backend - ``` - **Done!** Your PHP container will now use the memory settings from `custom.ini`. - - - --- - - ## Hashcat Questions - - ❓ Is `--increment` supported? **Answer**: No, not directly. Workaround: create individual masks or use “Import Supertask” for manual mask input. - - --- - - ❓ Can Hashtopolis use custom Hashcat builds? **Answer**: Yes, upload them through the admin interface as separate binaries. - - --- - - ❓ What if a client only uses one of multiple GPUs? **Answer**: This is likely due to small chunk size or a single hash. Larger workloads will utilize more GPUs. - - --- - - ❓ How do you deal with huge wordlists (e.g. 20–50 GB)? **Answer**: Split files, SCP them to the server or serve them via Python’s HTTP server. - - --- - - ## Tasks & Distribution - - ❓ How are tasks split across clients? **Answer**: Based on keyspace ranges (e.g. Client A: AAAA–BBBB, Client B: CCCC–DDDD). - - --- - - ❓ Can I assign specific agents to specific users or tasks? **Answer**: Admins can manage this in task settings or manually configure allowed agents. - - --- - - ❓ How are tasks prioritized? **Answer**: Tasks are prioritized numerically. - - --- - - ## Interface & Features - ❓ Does Hashtopolis support notifications (e.g. Telegram, Discord)? **Answer**: Yes, Discord and Telegram bot notifications are supported but require manual setup. - - --- - - ## File Management - - ❓ Can large wordlists be remotely deleted from agents? **Answer**: Requires manual script or reconfiguration. - - --- - - ## Troubleshooting & Performance - - ❓ Why is only 4 GB of VRAM used on a 10 GB RTX 3080? **Answer**: Hashcat uses only as much memory as needed. More memory ≠ more speed. - - --- - - ❓ What are “zaps” in status logs? **Answer**: Notification that another client already cracked a hash, allowing the client to skip it. - - --- - - ## Security & Access Control - - ❓ Is there a way to trust all agents by default? **Answer**: No, but there’s an open feature request for it: [GitHub Issue #721](https://github.com/hashtopolis/server/issues/721) - - --- - - ❓ Can an API token be shared across multiple agents? **Answer**: Yes, using the same token is fine for basic usage. - - ---- \ No newline at end of file +--- From 4eeded8b945f1517e998eaf3983d0601221fd50c Mon Sep 17 00:00:00 2001 From: Sein Coray Date: Wed, 20 Aug 2025 11:16:22 +0200 Subject: [PATCH 154/691] fixed consistency in volume/dir example and removed wrong line --- doc/faq_tips/faq.md | 15 ++++----------- 1 file changed, 4 insertions(+), 11 deletions(-) diff --git a/doc/faq_tips/faq.md b/doc/faq_tips/faq.md index 56fa831ea..971ae2254 100644 --- a/doc/faq_tips/faq.md +++ b/doc/faq_tips/faq.md @@ -24,7 +24,7 @@ **Answer**: By default (when using the standard `docker-compose` setup), Hashtopolis stores folders like `import`, `files`, and `binaries` in a Docker volume. You can list this volume using `docker volume ls` and access it inside the container at `/usr/local/share/hashtopolis`. -To use host directories instead of Docker volumes, you can change the mount paths in your `docker-compose.yml` file like this: +To use host directories instead of Docker volumes, you can change the mount paths in your `docker-compose.yml` file like this (in this example the folders would then be mounted into `/opt/hashtopolis/` on the host: ``` version: '3.7' @@ -32,7 +32,6 @@ services: hashtopolis-backend: container_name: hashtopolis-backend image: hashtopolis/backend:latest - restart: always volumes: - /opt/hashtopolis/config:/usr/local/share/hashtopolis/config:Z - /opt/hashtopolis/log:/usr/local/share/hashtopolis/log:Z @@ -54,7 +53,6 @@ services: db: container_name: db image: mysql:8.0 - restart: always volumes: - db:/var/lib/mysql environment: @@ -67,31 +65,26 @@ services: image: hashtopolis/frontend:latest environment: HASHTOPOLIS_BACKEND_URL: $HASHTOPOLIS_BACKEND_URL - restart: always depends_on: - hashtopolis-backend ports: - 4200:80 volumes: db: - hashtopolis: ``` -Before recreating the containers, make sure to copy data out of the Docker volume: - +Before recreating the containers, make sure to copy data out of the Docker volume (if you have already used hashtopolis with the volume): ``` -docker cp hashtopolis-backend:/usr/local/share/hashtopolis +docker cp hashtopolis-backend:/usr/local/share/hashtopolis /opt/hashtopolis ``` Then shut down and bring the containers back up: ``` docker compose down -docker compose up +docker compose up -d ``` -Finally, copy your data back into the corresponding folders. - --- ❓ How can I debug MySQL queries? From a1b11d8de10a9e2b3ffe61da5e46fb52fae6d31f Mon Sep 17 00:00:00 2001 From: Sein Coray Date: Wed, 20 Aug 2025 12:05:12 +0200 Subject: [PATCH 155/691] updated all questions, adjusted styles and consistent listing, fixed factual mistakes --- doc/faq_tips/faq.md | 167 ++++++++++++++++++++++++++------------------ 1 file changed, 100 insertions(+), 67 deletions(-) diff --git a/doc/faq_tips/faq.md b/doc/faq_tips/faq.md index 971ae2254..2583976bd 100644 --- a/doc/faq_tips/faq.md +++ b/doc/faq_tips/faq.md @@ -4,25 +4,51 @@ ❓ How do I install Hashtopolis? -**Answer**: The easiest way to install Hashtopolis is with the Docker images that can be retrieved from [Docker Hub](https://hub.docker.com/u/hashtopolis). Follow the instructions from the [documentation](../installation_guidelines/basic_install.md). +The easiest way to install Hashtopolis is with the Docker images that can be retrieved from [Docker Hub](https://hub.docker.com/u/hashtopolis). +Follow the instructions from the [documentation](../installation_guidelines/basic_install.md). --- ❓ Can I run Hashtopolis on a server already running something else (e.g. Homebridge)? -**Answer**: Yes, as long as the server has enough resources. +Yes, as long as the server has enough resources. --- ❓ How do I make the agent start automatically on Ubuntu? -**Answer**: To auto-start the agent on boot, create a `systemd` service file in `/etc/systemd/system/hashtopolis-agent.service` that runs the agent script with Python. Enable it using `systemctl enable hashtopolis-agent` and start it with `systemctl start hashtopolis-agent`. Ensure your agent configuration (`config.json`) is correctly set before enabling. +To auto-start the agent on boot, create a `systemd` service file in `/etc/systemd/system/hashtopolis-agent.service` that runs the agent script with Python, for example: + +``` +[Unit] +Description=Hashtopolis Agent +After=network.target +StartLimitIntervalSec=0 + +[Service] +Type=simple +Restart=always +RestartSec=10 +User=root +ExecStart=/usr/bin/python3 /root/agents/hashtopolis.zip +StandardInput=tty-force +WorkingDirectory=/root/agents/ + +[Install] +WantedBy=multi-user.target +``` + +Make sure you adjust the running user and paths to your needs. +Reload the confis with `systemctl daemon-reload`. +Enable it using `systemctl enable hashtopolis-agent` and start it with `systemctl start hashtopolis-agent`. +Ensure your agent configuration (`config.json`) is correctly set before enabling. --- ❓ How can I mount folders (import, files, binaries) to a local directory instead of using a Docker volume? -**Answer**: By default (when using the standard `docker-compose` setup), Hashtopolis stores folders like `import`, `files`, and `binaries` in a Docker volume. You can list this volume using `docker volume ls` and access it inside the container at `/usr/local/share/hashtopolis`. +By default (when using the standard `docker compose` setup), Hashtopolis stores folders like `import`, `files`, and `binaries` in a Docker volume. +You can list this volume using `docker volume ls` and access it inside the container at `/usr/local/share/hashtopolis`. To use host directories instead of Docker volumes, you can change the mount paths in your `docker-compose.yml` file like this (in this example the folders would then be mounted into `/opt/hashtopolis/` on the host: @@ -73,13 +99,12 @@ volumes: db: ``` -Before recreating the containers, make sure to copy data out of the Docker volume (if you have already used hashtopolis with the volume): +Before recreating the containers, make sure to copy data out of the Docker volume (if you have already used Hashtopolis with the volume): ``` docker cp hashtopolis-backend:/usr/local/share/hashtopolis /opt/hashtopolis ``` Then shut down and bring the containers back up: - ``` docker compose down docker compose up -d @@ -89,7 +114,7 @@ docker compose up -d ❓ How can I debug MySQL queries? -**Answer**: If you're encountering unusual issues and want to understand what queries Hashtopolis is executing on the database, you can enable query logging in MySQL. +If you're encountering unusual issues and want to understand what queries Hashtopolis is executing on the database, you can enable query logging in MySQL. Steps to do this inside a Docker container: @@ -104,13 +129,17 @@ cd /var/lib/mysql tail -f *.log ``` -This enables the general query log, which logs all incoming SQL statements. You can inspect these logs to trace how the application interacts with the database. +This enables the general query log, which logs all incoming SQL statements. +You can inspect these logs to trace how the application interacts with the database. + +> [!Caution] +> Activating logging can increase the load on your MySQL server and when being active over a longer time, it can fill up your log file to large sizes quickly! --- ❓ Why does Hashtopolis fail and how can I debug errors? -**Answer**: Troubleshooting Hashtopolis can sometimes be challenging. A common error you might encounter is: +Troubleshooting Hashtopolis can sometimes be challenging. A common error you might encounter is: ``` Error during speed benchmark, return code: 255 Output: @@ -120,35 +149,33 @@ This usually means something is misconfigured in the Hashcat setup. To debug: 1. **Stop the Hashtopolis agent** (if running in a background process or screen). -2. **Restart the agent manually with the** `**--debug**` **flag**: +2. **Restart the agent manually with the** `--debug` **flag**: - ``` - python3 agent.py --debug - ``` +``` +python3 agent.py --debug +``` 3. Look in the debug output for a line starting with `CALL:` — this shows the exact Hashcat command being executed. 4. **Navigate to the relevant cracker binary directory**: - ``` - cd crackers/1/ - ``` - - _(Note: Check the actual cracker ID used by your task in the Hashtopolis web UI under the Crackers section.)_ +``` +cd crackers/1/ +``` -5. **Copy the** `**CALL:**` **command and remove**: +> [!Note] +> Check the actual cracker ID used by your task in the Hashtopolis web UI under the Crackers section.) +5. **Copy the** `CALL:` **command and remove**: - `--machine-readable` - - `--quiet` - - `-p ""` _(as tab characters can cause issues when copying)_ 6. **Run the simplified Hashcat command manually** and check the terminal output. Example: - ``` - ./hashcat.bin --progress-only --restore-disable --potfile-disable --session=hashtopolis -a3 ../../hashlists/2 ?l?l?l?l?l?l?a --hash-type=0 -o ../../hashlists/2.out - ``` +``` +./hashcat.bin --progress-only --restore-disable --potfile-disable --session=hashtopolis -a3 ../../hashlists/2 ?l?l?l?l?l?l?a --hash-type=0 -o ../../hashlists/2.out +``` This should help reveal any specific errors or misconfigurations in the command line. @@ -156,13 +183,12 @@ This should help reveal any specific errors or misconfigurations in the command ❓ Can I fake an agent for debugging the server API? -**Answer**: Yes, you can simulate an agent to test how the Hashtopolis server API behaves. This is especially useful for replicating hard-to-reproduce production issues. +Yes, you can simulate an agent to test how the Hashtopolis server API behaves. This is especially useful for replicating hard-to-reproduce production issues. 1. **Ensure the agent is registered** at the server and has a valid token. 2. Use the following Python code to simulate agent-server interactions: - ``` #!/usr/bin/python3 import requests @@ -228,13 +254,17 @@ This lets you debug API interactions manually without needing a live cracking jo ❓ Is internet access required to run Hashtopolis? -**Answer**: No. +No. + +> [!Note] +> By default Hashtopolis tries to retrieve hashcat from their official download URL on hashcat.net. +> If you run Hashtopolis in an offline environment, you need to adjust the download URL in the cracker settings. --- ❓ Can I run Hashtopolis on ARM (e.g., Raspberry Pi)? -**Answer**: Not officially supported. ARM builds must be custom-built. +It is not officially supported and there are no pre-built docker images available. ARM builds must be custom made. --- @@ -242,29 +272,39 @@ This lets you debug API interactions manually without needing a live cracking jo ❓ Why does Apache show only a directory or a 500 error? -**Answer**: A 500 error or directory index display usually indicates PHP is either not installed, disabled, or misconfigured. Ensure that `libapache2-mod-php` is installed and enabled. Also, verify that your `php.ini` and `.htaccess` files don't contain invalid directives. Check Apache error logs at `/var/log/apache2/error.log` for more specific issues. +A 500 error or directory index ususally indicates PHP is either not installed, disabled, or misconfigured. +Ensure that `libapache2-mod-php` is installed and enabled. +Also, verify that your `php.ini` and `.htaccess` files don't contain invalid directives. +When encountering 500 Internal Server Errors, check Apache error logs at `/var/log/apache2/error.log` for information about the error. --- ❓ How to fix a failed first login in Docker? -**Answer**: Check if the backend logs show “initialization successful”. Docker environment variables must be set correctly. +Check if the backend logs show `initialization successful`. +Docker environment variables must be set correctly (e.g. by using the example given in `env.example`. --- ❓ How to upgrade Hashtopolis without data loss? -**Answer**: Back up the database, pull the latest version from Git, and apply the update through the upgrade feature. +If you run Hashtopolis in a dockerized setup with docker-compose, all the data which should be persistent is stored in volumes or mounted into the containers. +In this case you simply can pull the newest images with `docker compose pull` and then recreate them with `docker compose up -d`. + +In case you run a setup directly on a server, back up the database, pull the latest version from Git. +When accessing Hashtopolis the first time afterwards, the required updates are executed automatically. --- ❓ PHP Fatal error:  Allowed memory size of 268435456 bytes exhausted - What can I do now? -This guide shows how to raise PHP's memory limit in a Dockerized setup using a `custom.ini` file mounted into the PHP container. It also includes example `docker-compose.yml` snippets for common images. +If there is enough RAM available, it is possible to raise PHP's memory limit in a dockerized setup using a `custom.ini` file mounted into the Hashtopolis container. + +1. **Create a file `custom.ini` next to your `docker-compose.yml`** -1) **Create `custom.ini` next to your `docker-compose.yml`** + Adjust your desired memory limit (`M` for Megabytes, or `G` for Gigabytes). + The other two values are optional to adjust, but need to remain in there, as otherwise they are overwritten with the new `custom.ini` not containing them. -Add your PHP overrides (uppercase `M` is conventional, PHP is case-insensitive here): ```ini ; custom.ini @@ -273,61 +313,54 @@ upload_max_filesize = 256M max_execution_time = 60 ``` -- Adjust `memory_limit` to your needs (e.g., `512M`, `1G`). - -- The other two values are optional and not directly related to the memory issue. - 2) **Mount `custom.ini` into the PHP container** +2. **Mount `custom.ini` into the PHP container** - Add this to your **backend** service’s `volumes:` list in `docker-compose.yml`: + Add this to your hashtopolis-backend service’s `volumes:` list in `docker-compose.yml`: ```yaml - -- ./custom.ini:/usr/local/etc/php/conf.d/custom.ini - +... + volumes: + - ./custom.ini:/usr/local/etc/php/conf.d/custom.ini +... ``` -> The path `/usr/local/etc/php/conf.d/` is correct for official PHP images (`php:*`). - - 3) **Recreate or restart the container** +3. **Recreate the container** -Make sure the container reloads the INI: + Trigger a recreation and updating the volumes setting: ```bash -# Start or recreate after changes docker compose up -d - -# or, if the stack is already running and only the ini changed: -docker compose restart backend ``` -**Done!** Your PHP container will now use the memory settings from `custom.ini`. - --- ## Hashcat Questions ❓ Is `--increment` supported? -**Answer**: No, not directly. Workaround: create individual masks or use “Import Supertask” for manual mask input. +No, Hashcat internally handles `--increment` the same way as if it would be multiple tasks executed after each other. +Due to this it does not allow to manage it as a single task as Hashtopolis would need it. + +To work around this: create individual brute force tasks with each of the masks of the different lengths (either manually or use `Import Supertask`). --- ❓ Can Hashtopolis use custom Hashcat builds? -**Answer**: Yes, upload them through the admin interface as separate binaries. +Yes. In order to add a new one, add it as a new version and provide a download link where it is served to the agents as HTTP download. --- ❓ What if a client only uses one of multiple GPUs? -**Answer**: This is likely due to small chunk size or a single hash. Larger workloads will utilize more GPUs. +This is likely due to small chunk size or a suboptimal task. Larger workloads will utilize more GPUs. --- ❓ How do you deal with huge wordlists (e.g. 20–50 GB)? -**Answer**: Split files, SCP them to the server or serve them via Python’s HTTP server. +Copy the files into the import folder of the server and then import them or add them via a HTTP download link. --- @@ -335,19 +368,19 @@ docker compose restart backend ❓ How are tasks split across clients? -**Answer**: Based on keyspace ranges (e.g. Client A: AAAA–BBBB, Client B: CCCC–DDDD). +Based on keyspace ranges (e.g. Client A: AAAA–BBBB, Client B: CCCC–DDDD for a bruteforce task). --- ❓ Can I assign specific agents to specific users or tasks? -**Answer**: Admins can manage this in task settings or manually configure allowed agents. +Admins can manage this by creating groups of users and agents to manage which users can access which tasks and which agents can work on them. --- ❓ How are tasks prioritized? -**Answer**: Tasks are prioritized numerically. +Tasks are prioritized numerically. --- @@ -355,7 +388,7 @@ docker compose restart backend ❓ Does Hashtopolis support notifications (e.g. Telegram, Discord)? -**Answer**: Yes, Discord and Telegram bot notifications are supported but require manual setup. +Yes, Discord and Telegram bot notifications are supported but require manual setup. --- @@ -363,7 +396,7 @@ docker compose restart backend ❓ Can large wordlists be remotely deleted from agents? -**Answer**: Requires manual script or reconfiguration. +Requires manual deletion on the agent side if they are not deleted on the server side. --- @@ -371,13 +404,13 @@ docker compose restart backend ❓ Why is only 4 GB of VRAM used on a 10 GB RTX 3080? -**Answer**: Hashcat uses only as much memory as needed. More memory ≠ more speed. +Hashcat uses only as much memory as needed. More memory ≠ more speed. --- -❓ What are “zaps” in status logs? +❓ What are `zaps` in status logs? -**Answer**: Notification that another client already cracked a hash, allowing the client to skip it. +Zaps are notification to agents that another agent already cracked a hash, allowing the agent to remove it from its own left list. --- @@ -385,12 +418,12 @@ docker compose restart backend ❓ Is there a way to trust all agents by default? -**Answer**: No, but there’s an open feature request for it: [GitHub Issue #721](https://github.com/hashtopolis/server/issues/721) +No, but there’s an open feature request for it: [GitHub Issue #721](https://github.com/hashtopolis/server/issues/721) --- -❓ Can an API token be shared across multiple agents? +❓ Can a User API token be shared across multiple users? -**Answer**: Yes, using the same token is fine for basic usage. +Yes, using the same token is fine for basic usage. --- From db5aa40ab44fb2159cc0b0a40ad2a07b9bcdcf61 Mon Sep 17 00:00:00 2001 From: Sein Coray Date: Wed, 20 Aug 2025 12:06:24 +0200 Subject: [PATCH 156/691] fixed changelog listing --- doc/changelog.md | 1 + 1 file changed, 1 insertion(+) diff --git a/doc/changelog.md b/doc/changelog.md index e410082ba..9f37c403c 100644 --- a/doc/changelog.md +++ b/doc/changelog.md @@ -29,6 +29,7 @@ Release 0.14.3 comes with an update to the tech preview of the new API. Be aware, it is a preview, it contains bugs and it will change; To use it, please see https://github.com/hashtopolis/server/wiki/Installation. Changes/Bugfixes on new UI: + - After updating a task, the tasks table is also updated - Files can now be deleted via the context menu of the files-table - Step sequence corrected according to agent registration From b3766673816f30cc0b4671315c6885d208469768 Mon Sep 17 00:00:00 2001 From: Sein Coray Date: Wed, 20 Aug 2025 12:19:43 +0200 Subject: [PATCH 157/691] typo fix Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com> --- doc/README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/doc/README.md b/doc/README.md index a59a1a98e..b25d87833 100644 --- a/doc/README.md +++ b/doc/README.md @@ -1,6 +1,6 @@ ## MKDocs Local Setup -1. Make sure you are in the root of the server project and setup a virtual enviroment there. +1. Make sure you are in the root of the server project and setup a virtual environment there. 2. Install mkdocs 3. Install required mkdocs extensions 4. Start the server From c01adc4b5deeb7e42d62e8acfad28a676ccd7484 Mon Sep 17 00:00:00 2001 From: Sein Coray Date: Wed, 20 Aug 2025 12:19:55 +0200 Subject: [PATCH 158/691] typo fix Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com> --- doc/faq_tips/faq.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/doc/faq_tips/faq.md b/doc/faq_tips/faq.md index 2583976bd..8a781d029 100644 --- a/doc/faq_tips/faq.md +++ b/doc/faq_tips/faq.md @@ -39,7 +39,7 @@ WantedBy=multi-user.target ``` Make sure you adjust the running user and paths to your needs. -Reload the confis with `systemctl daemon-reload`. +Reload the configs with `systemctl daemon-reload`. Enable it using `systemctl enable hashtopolis-agent` and start it with `systemctl start hashtopolis-agent`. Ensure your agent configuration (`config.json`) is correctly set before enabling. From 8f3f4c9d307a667a5be422223a3af8fad27b1cf9 Mon Sep 17 00:00:00 2001 From: Sein Coray Date: Wed, 20 Aug 2025 12:20:09 +0200 Subject: [PATCH 159/691] typo fix Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com> --- doc/faq_tips/faq.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/doc/faq_tips/faq.md b/doc/faq_tips/faq.md index 8a781d029..ce50884fc 100644 --- a/doc/faq_tips/faq.md +++ b/doc/faq_tips/faq.md @@ -272,7 +272,7 @@ It is not officially supported and there are no pre-built docker images availabl ❓ Why does Apache show only a directory or a 500 error? -A 500 error or directory index ususally indicates PHP is either not installed, disabled, or misconfigured. +A 500 error or directory index usually indicates PHP is either not installed, disabled, or misconfigured. Ensure that `libapache2-mod-php` is installed and enabled. Also, verify that your `php.ini` and `.htaccess` files don't contain invalid directives. When encountering 500 Internal Server Errors, check Apache error logs at `/var/log/apache2/error.log` for information about the error. From 11dd21b89be1ed0d94bf71546b7a569f1e4f867b Mon Sep 17 00:00:00 2001 From: Sein Coray Date: Wed, 20 Aug 2025 12:20:10 +0200 Subject: [PATCH 160/691] added gitignore and note regarding the openapi.json file --- doc/.gitignore | 2 +- doc/README.md | 2 ++ 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/doc/.gitignore b/doc/.gitignore index d3ec28174..c85ac21e1 100755 --- a/doc/.gitignore +++ b/doc/.gitignore @@ -1,4 +1,4 @@ *.aux *.log *.synctex.gz - +openapi.json diff --git a/doc/README.md b/doc/README.md index b25d87833..05116b17b 100644 --- a/doc/README.md +++ b/doc/README.md @@ -14,3 +14,5 @@ pip3 install mkdocs pip3 install $(mkdocs get-deps) mkdocs server ``` + +When testing the API reference you need to retrieve the openapi.json file from the Hashtopolis server (e.g. via `http://localhost:8080/api/v2/openapi.json) and place it inside this folder. From adc3989371aade3a3612c2f56eab07edf5f7e34e Mon Sep 17 00:00:00 2001 From: jessevz Date: Wed, 20 Aug 2025 12:55:24 +0200 Subject: [PATCH 161/691] update-hashes.py now understand new format --- ci/files/update-hashes.py | 17 ++++++++++++----- 1 file changed, 12 insertions(+), 5 deletions(-) diff --git a/ci/files/update-hashes.py b/ci/files/update-hashes.py index bb04d82be..3d5725df2 100644 --- a/ci/files/update-hashes.py +++ b/ci/files/update-hashes.py @@ -3,6 +3,7 @@ import json import sys import os +import re class HashType: @@ -13,7 +14,7 @@ def __init__(self, hashType, description, salted, slowHash): self.slowHash = slowHash -url = "https://raw.githubusercontent.com/hashcat/hashcat/refs/tags/v7.0.0/docs/hashcat-example_hashes.md" +url = "https://raw.githubusercontent.com/hashcat/hashcat/refs/tags/v7.1.1/docs/hashcat-example-hashes.md" binary = sys.argv[1] # The hashcat binary is the first argument if not os.path.isfile(binary): print("usage: python3 update-hashes.py ") @@ -38,8 +39,11 @@ def __init__(self, hashType, description, salted, slowHash): for line in lines[4:]: # skip first 4 header lines splitted = line.split("|") - hashType = splitted[1].strip().strip("`") - description = splitted[2].strip().strip("`") + if len(splitted) == 1: # table is finished + break + hashType = re.search(r"\[`?(\d+)`?\]", splitted[1]).group(1) + description = splitted[2].strip().split("`")[1] + print(description) r = requests.get(url + hashType, headers=headers) if (r.status_code != 200): args[2] = hashType @@ -54,8 +58,8 @@ def __init__(self, hashType, description, salted, slowHash): print('if (!isset($PRESENT["PLACEHOLDER"])){') print(" $hashTypes = [") for hashType in new_hashtypes: - print(f' new HashType( {hashType.hashType}, "{hashType.description}", {int(hashType.salted)}, {int(hashType.slowHash)}),') -print(" ]") + print(f' new HashType( {hashType.hashType}, "{hashType.description}", {int(hashType.salted)}, {int(hashType.slowHash)}),') +print(" ];") print(' foreach ($hashtypes as $hashtype) {') print(' $check = Factory::getHashTypeFactory()->get($hashtype->getId());') print(' if ($check === null) {') @@ -68,3 +72,6 @@ def __init__(self, hashType, description, salted, slowHash): print("Add the following to the install script:") for hashType in new_hashtypes: print(f" ({hashType.hashType}, '{hashType.description}', {int(hashType.salted)}, {int(hashType.slowHash)}),") + + +print("Dont forgot to check if all hashtypes where salted = '1', are actually salted in a way that Hashtopolis understands!") \ No newline at end of file From b1811b747050c036a5d309ae21e4c9aa8065a4b4 Mon Sep 17 00:00:00 2001 From: jessevz Date: Wed, 20 Aug 2025 12:55:56 +0200 Subject: [PATCH 162/691] Added hashtypes added in Hashcat 7.1.1 --- src/install/hashtopolis.sql | 3 + .../updates/update_v0.14.4_v0.14.x.php | 200 ++++++++++-------- 2 files changed, 110 insertions(+), 93 deletions(-) diff --git a/src/install/hashtopolis.sql b/src/install/hashtopolis.sql index f2a1e0c94..9c000dac8 100644 --- a/src/install/hashtopolis.sql +++ b/src/install/hashtopolis.sql @@ -338,6 +338,8 @@ INSERT INTO `HashType` (`hashTypeId`, `description`, `isSalted`, `isSlowHash`) V (1000, 'NTLM', 0, 0), (1100, 'Domain Cached Credentials (DCC), MS Cache', 1, 0), (1300, 'SHA-224', 0, 0), + (1310, 'sha224($pass.$salt)', 1, 0), + (1320, 'sha224($salt.$pass)', 1, 0), (1400, 'SHA256', 0, 0), (1410, 'sha256($pass.$salt)', 1, 0), (1411, 'SSHA-256(Base64), LDAP {SSHA256}', 0, 0), @@ -410,6 +412,7 @@ INSERT INTO `HashType` (`hashTypeId`, `description`, `isSalted`, `isSlowHash`) V (5500, 'NetNTLMv1-VANILLA / NetNTLMv1+ESS', 0, 0), (5600, 'NetNTLMv2', 0, 0), (5700, 'Cisco-IOS SHA256', 0, 0), + (5720, 'Cisco-ISE Hashed Password (SHA256)', 1, 0), (5800, 'Samsung Android Password/PIN', 1, 0), (6000, 'RipeMD160', 0, 0), (6050, 'HMAC-RIPEMD160 (key = $pass)', 1, 0), diff --git a/src/install/updates/update_v0.14.4_v0.14.x.php b/src/install/updates/update_v0.14.4_v0.14.x.php index e88397e31..d1163fbf8 100644 --- a/src/install/updates/update_v0.14.4_v0.14.x.php +++ b/src/install/updates/update_v0.14.4_v0.14.x.php @@ -12,100 +12,114 @@ if (!isset($PRESENT["v0.14.x_update_hashtypes"])){ $hashTypes = [ - new HashType( 2630, "md5(md5($pass.$salt))", 1, 0), - new HashType( 3610, "md5(md5(md5($pass)).$salt)", 1, 0), - new HashType( 3730, "md5($salt1.strtoupper(md5($salt2.$pass)))", 1, 0), - new HashType( 4420, "md5(sha1($pass.$salt))", 1, 0), - new HashType( 4430, "md5(sha1($salt.$pass))", 1, 0), - new HashType( 6050, "HMAC-RIPEMD160 (key = $pass)", 1, 0), - new HashType( 6060, "HMAC-RIPEMD160 (key = $salt)", 1, 0), - new HashType( 7350, "IPMI2 RAKP HMAC-MD5", 1, 0), - new HashType( 10510, "PDF 1.3 - 1.6 (Acrobat 4 - 8) w/ RC4-40", 1, 1), - new HashType( 12150, "Apache Shiro 1 SHA-512", 1, 1), - new HashType( 14200, "RACF KDFAES", 1, 1), - new HashType( 16501, "Perl Mojolicious session cookie (HMAC-SHA256, >= v9.19)", 1, 0), - new HashType( 17020, "GPG (AES-128/AES-256 (SHA-512($pass)))", 1, 1), - new HashType( 17030, "GPG (AES-128/AES-256 (SHA-256($pass)))", 1, 1), - new HashType( 17040, "GPG (CAST5 (SHA-1($pass)))", 1, 1), - new HashType( 19210, "QNX 7 /etc/shadow (SHA512)", 1, 1), - new HashType( 20712, "RSA Security Analytics / NetWitness (sha256)", 1, 0), - new HashType( 20730, "sha256(sha256($pass.$salt))", 1, 0), - new HashType( 21310, "md5($salt1.sha1($salt2.$pass))", 1, 0), - new HashType( 21900, "md5(md5(md5($pass.$salt1)).$salt2)", 1, 0), - new HashType( 22800, "Simpla CMS - md5($salt.$pass.md5($pass))", 1, 0), - new HashType( 24000, "BestCrypt v4 Volume Encryption", 1, 1), - new HashType( 26610, "MetaMask Wallet (short hash, plaintext check)", 1, 1), - new HashType( 29800, "Bisq .wallet (scrypt)", 1, 1), - new HashType( 29910, "ENCsecurity Datavault (PBKDF2/no keychain)", 1, 1), - new HashType( 29920, "ENCsecurity Datavault (PBKDF2/keychain)", 1, 1), - new HashType( 29930, "ENCsecurity Datavault (MD5/no keychain)", 1, 1), - new HashType( 29940, "ENCsecurity Datavault (MD5/keychain)", 1, 1), - new HashType( 30420, "DANE RFC7929/RFC8162 SHA2-256", 0, 0), - new HashType( 30500, "md5(md5($salt).md5(md5($pass)))", 1, 0), - new HashType( 30600, "bcrypt(sha256($pass)) / bcryptsha256", 1, 1), - new HashType( 30601, "bcrypt-sha256 v2 bcrypt(HMAC-SHA256($pass))", 1, 1), - new HashType( 30700, "Anope IRC Services (enc_sha256)", 1, 0), - new HashType( 30901, "Bitcoin raw private key (P2PKH), compressed", 0, 0), - new HashType( 30902, "Bitcoin raw private key (P2PKH), uncompressed", 0, 0), - new HashType( 30903, "Bitcoin raw private key (P2WPKH, Bech32), compressed", 0, 0), - new HashType( 30904, "Bitcoin raw private key (P2WPKH, Bech32), uncompressed", 0, 0), - new HashType( 30905, "Bitcoin raw private key (P2SH(P2WPKH)), compressed", 0, 0), - new HashType( 30906, "Bitcoin raw private key (P2SH(P2WPKH)), uncompressed", 0, 0), - new HashType( 31000, "BLAKE2s-256", 0, 0), - new HashType( 31100, "ShangMi 3 (SM3)", 0, 0), - new HashType( 31200, "Veeam VBK", 1, 1), - new HashType( 31300, "MS SNTP", 1, 0), - new HashType( 31400, "SecureCRT MasterPassphrase v2", 1, 0), - new HashType( 31500, "Domain Cached Credentials (DCC), MS Cache (NT)", 1, 1), - new HashType( 31600, "Domain Cached Credentials 2 (DCC2), MS Cache 2, (NT)", 1, 1), - new HashType( 31700, "md5(md5(md5($pass).$salt1).$salt2)", 1, 0), - new HashType( 31800, "1Password, mobilekeychain (1Password 8)", 1, 1), - new HashType( 31900, "MetaMask Mobile Wallet", 1, 1), - new HashType( 32000, "NetIQ SSPR (MD5)", 1, 1), - new HashType( 32010, "NetIQ SSPR (SHA1)", 1, 1), - new HashType( 32020, "NetIQ SSPR (SHA-1 with Salt)", 1, 1), - new HashType( 32030, "NetIQ SSPR (SHA-256 with Salt)", 1, 1), - new HashType( 32031, "Adobe AEM (SSPR, SHA-256 with Salt)", 1, 1), - new HashType( 32040, "NetIQ SSPR (SHA-512 with Salt)", 1, 1), - new HashType( 32041, "Adobe AEM (SSPR, SHA-512 with Salt)", 1, 1), - new HashType( 32050, "NetIQ SSPR (PBKDF2WithHmacSHA1)", 1, 1), - new HashType( 32060, "NetIQ SSPR (PBKDF2WithHmacSHA256)", 1, 1), - new HashType( 32070, "NetIQ SSPR (PBKDF2WithHmacSHA512)", 1, 1), - new HashType( 32100, "Kerberos 5, etype 17, AS-REP", 1, 1), - new HashType( 32200, "Kerberos 5, etype 18, AS-REP", 1, 1), - new HashType( 32300, "Empire CMS (Admin password)", 1, 0), - new HashType( 32410, "sha512(sha512($pass).$salt)", 1, 0), - new HashType( 32420, "sha512(sha512_bin($pass).$salt)", 1, 0), - new HashType( 32500, "Dogechain.info Wallet", 1, 1), - new HashType( 32600, "CubeCart (whirlpool($salt.$pass.$salt))", 1, 0), - new HashType( 32700, "Kremlin Encrypt 3.0 w/NewDES", 1, 1), - new HashType( 32800, "md5(sha1(md5($pass)))", 0, 0), - new HashType( 32900, "PBKDF1-SHA1", 1, 1), - new HashType( 33000, "md5($salt1.$pass.$salt2)", 1, 0), - new HashType( 33100, "md5($salt.md5($pass).$salt)", 1, 0), - new HashType( 33300, "HMAC-BLAKE2S (key = $pass)", 1, 0), - new HashType( 33400, "mega.nz password-protected link (PBKDF2-HMAC-SHA512)", 1, 1), - new HashType( 33500, "RC4 40-bit DropN", 1, 0), - new HashType( 33501, "RC4 72-bit DropN", 1, 0), - new HashType( 33502, "RC4 104-bit DropN", 1, 0), - new HashType( 33600, "RIPEMD-320", 0, 0), - new HashType( 33650, "HMAC-RIPEMD320 (key = $pass)", 1, 0), - new HashType( 33660, "HMAC-RIPEMD320 (key = $salt)", 1, 0), - new HashType( 33700, "Microsoft Online Account (PBKDF2-HMAC-SHA256 + AES256)", 1, 1), - new HashType( 33800, "WBB4 (Woltlab Burning Board) Plugin [bcrypt(bcrypt($pass))]", 1, 1), - new HashType( 33900, "Citrix NetScaler (PBKDF2-HMAC-SHA256)", 1, 1), - new HashType( 34000, "Argon2", 1, 1), - new HashType( 34100, "LUKS v2 argon2id + SHA-256 + AES", 1, 1), - new HashType( 34200, "MurmurHash64A", 1, 0), - new HashType( 34201, "MurmurHash64A (zero seed)", 0, 0), - new HashType( 34211, "MurmurHash64A truncated (zero seed)", 0, 0), - new HashType( 70000, "argon2id [Bridged: reference implementation + tunings]", 1, 1), - new HashType( 70100, "scrypt [Bridged: Scrypt-Jane ROMix]", 1, 1), - new HashType( 70200, "scrypt [Bridged: Scrypt-Yescrypt]", 1, 1), - new HashType( 72000, "Generic Hash [Bridged: Python Interpreter free-threading]", 1, 1), - new HashType( 73000, "Generic Hash [Bridged: Python Interpreter with GIL]", 1, 1), + new HashType( 1310, "sha224($pass.$salt)", 1, 0), + new HashType( 1320, "sha224($salt.$pass)", 1, 0), + new HashType( 2630, "md5(md5($pass.$salt))", 1, 0), + new HashType( 3610, "md5(md5(md5($pass)).$salt)", 1, 0), + new HashType( 3730, "md5($salt1.strtoupper(md5($salt2.$pass)))", 1, 0), + new HashType( 4420, "md5(sha1($pass.$salt))", 1, 0), + new HashType( 4430, "md5(sha1($salt.$pass))", 1, 0), + new HashType( 5720, "Cisco-ISE Hashed Password (SHA256)", 1, 0), + new HashType( 6050, "HMAC-RIPEMD160 (key = $pass)", 1, 0), + new HashType( 6060, "HMAC-RIPEMD160 (key = $salt)", 1, 0), + new HashType( 7350, "IPMI2 RAKP HMAC-MD5", 1, 0), + new HashType( 8501, "AS/400 DES", 1, 0), + new HashType( 10510, "PDF 1.3 - 1.6 (Acrobat 4 - 8) w/ RC4-40", 1, 1), + new HashType( 12150, "Apache Shiro 1 SHA-512", 1, 1), + new HashType( 14200, "RACF KDFAES", 1, 1), + new HashType( 16501, "Perl Mojolicious session cookie (HMAC-SHA256, >= v9.19)", 1, 0), + new HashType( 17020, "GPG (AES-128/AES-256 (SHA-512($pass)))", 1, 1), + new HashType( 17030, "GPG (AES-128/AES-256 (SHA-256($pass)))", 1, 1), + new HashType( 17040, "GPG (CAST5 (SHA-1($pass)))", 1, 1), + new HashType( 19210, "QNX 7 /etc/shadow (SHA512)", 1, 1), + new HashType( 20712, "RSA Security Analytics / NetWitness (sha256)", 1, 0), + new HashType( 20730, "sha256(sha256($pass.$salt))", 1, 0), + new HashType( 21310, "md5($salt1.sha1($salt2.$pass))", 1, 0), + new HashType( 21900, "md5(md5(md5($pass.$salt1)).$salt2)", 1, 0), + new HashType( 22800, "Simpla CMS - md5($salt.$pass.md5($pass))", 1, 0), + new HashType( 24000, "BestCrypt v4 Volume Encryption", 1, 1), + new HashType( 26610, "MetaMask Wallet (short hash, plaintext check)", 1, 1), + new HashType( 29800, "Bisq .wallet (scrypt)", 1, 1), + new HashType( 29910, "ENCsecurity Datavault (PBKDF2/no keychain)", 1, 1), + new HashType( 29920, "ENCsecurity Datavault (PBKDF2/keychain)", 1, 1), + new HashType( 29930, "ENCsecurity Datavault (MD5/no keychain)", 1, 1), + new HashType( 29940, "ENCsecurity Datavault (MD5/keychain)", 1, 1), + new HashType( 30420, "DANE RFC7929/RFC8162 SHA2-256", 0, 0), + new HashType( 30500, "md5(md5($salt).md5(md5($pass)))", 1, 0), + new HashType( 30600, "bcrypt(sha256($pass))", 1, 1), + new HashType( 30601, "bcrypt(HMAC-SHA256($pass))", 1, 1), + new HashType( 30700, "Anope IRC Services (enc_sha256)", 1, 0), + new HashType( 30901, "Bitcoin raw private key (P2PKH), compressed", 0, 0), + new HashType( 30902, "Bitcoin raw private key (P2PKH), uncompressed", 0, 0), + new HashType( 30903, "Bitcoin raw private key (P2WPKH, Bech32), compressed", 0, 0), + new HashType( 30904, "Bitcoin raw private key (P2WPKH, Bech32), uncompressed", 0, 0), + new HashType( 30905, "Bitcoin raw private key (P2SH(P2WPKH)), compressed", 0, 0), + new HashType( 30906, "Bitcoin raw private key (P2SH(P2WPKH)), uncompressed", 0, 0), + new HashType( 31000, "BLAKE2s-256", 0, 0), + new HashType( 31100, "ShangMi 3 (SM3)", 0, 0), + new HashType( 31200, "Veeam VBK", 1, 1), + new HashType( 31300, "MS SNTP", 1, 0), + new HashType( 31400, "SecureCRT MasterPassphrase v2", 1, 0), + new HashType( 31500, "Domain Cached Credentials (DCC), MS Cache (NT)", 1, 1), + new HashType( 31600, "Domain Cached Credentials 2 (DCC2), MS Cache 2, (NT)", 1, 1), + new HashType( 31700, "md5(md5(md5($pass).$salt1).$salt2)", 1, 0), + new HashType( 31800, "1Password, mobilekeychain (1Password 8)", 1, 1), + new HashType( 31900, "MetaMask Mobile Wallet", 1, 1), + new HashType( 32000, "NetIQ SSPR (MD5)", 1, 1), + new HashType( 32010, "NetIQ SSPR (SHA1)", 1, 1), + new HashType( 32020, "NetIQ SSPR (SHA-1 with Salt)", 1, 1), + new HashType( 32030, "NetIQ SSPR (SHA-256 with Salt)", 1, 1), + new HashType( 32031, "Adobe AEM (SSPR, SHA-256 with Salt)", 1, 1), + new HashType( 32040, "NetIQ SSPR (SHA-512 with Salt)", 1, 1), + new HashType( 32041, "Adobe AEM (SSPR, SHA-512 with Salt)", 1, 1), + new HashType( 32050, "NetIQ SSPR (PBKDF2WithHmacSHA1)", 1, 1), + new HashType( 32060, "NetIQ SSPR (PBKDF2WithHmacSHA256)", 1, 1), + new HashType( 32070, "NetIQ SSPR (PBKDF2WithHmacSHA512)", 1, 1), + new HashType( 32100, "Kerberos 5, etype 17, AS-REP", 1, 1), + new HashType( 32200, "Kerberos 5, etype 18, AS-REP", 1, 1), + new HashType( 32300, "Empire CMS (Admin password)", 1, 0), + new HashType( 32410, "sha512(sha512($pass).$salt)", 1, 0), + new HashType( 32420, "sha512(sha512_bin($pass).$salt)", 1, 0), + new HashType( 32500, "Dogechain.info Wallet", 1, 1), + new HashType( 32600, "CubeCart (whirlpool($salt.$pass.$salt))", 1, 0), + new HashType( 32700, "Kremlin Encrypt 3.0 w/NewDES", 1, 1), + new HashType( 32800, "md5(sha1(md5($pass)))", 0, 0), + new HashType( 32900, "PBKDF1-SHA1", 1, 1), + new HashType( 33000, "md5($salt1.$pass.$salt2)", 1, 0), + new HashType( 33100, "md5($salt.md5($pass).$salt)", 1, 0), + new HashType( 33300, "HMAC-BLAKE2S (key = $pass)", 1, 0), + new HashType( 33400, "mega.nz password-protected link (PBKDF2-HMAC-SHA512)", 1, 1), + new HashType( 33500, "RC4 40-bit DropN", 1, 0), + new HashType( 33501, "RC4 72-bit DropN", 1, 0), + new HashType( 33502, "RC4 104-bit DropN", 1, 0), + new HashType( 33600, "RIPEMD-320", 0, 0), + new HashType( 33650, "HMAC-RIPEMD320 (key = $pass)", 1, 0), + new HashType( 33660, "HMAC-RIPEMD320 (key = $salt)", 1, 0), + new HashType( 33700, "Microsoft Online Account (PBKDF2-HMAC-SHA256 + AES256)", 1, 1), + new HashType( 33800, "WBB4 (Woltlab Burning Board) [bcrypt(bcrypt($pass))]", 1, 1), + new HashType( 33900, "Citrix NetScaler (PBKDF2-HMAC-SHA256)", 1, 1), + new HashType( 34000, "Argon2", 1, 1), + new HashType( 34100, "LUKS v2 argon2 + SHA-256 + AES", 1, 1), + new HashType( 34200, "MurmurHash64A", 1, 0), + new HashType( 34201, "MurmurHash64A (zero seed)", 0, 0), + new HashType( 34211, "MurmurHash64A truncated (zero seed)", 0, 0), + new HashType( 34300, "KeePass (KDBX v4)", 1, 1), + new HashType( 34400, "sha224(sha224($pass))", 0, 0), + new HashType( 34500, "sha224(sha1($pass))", 0, 0), + new HashType( 34600, "MD6 (256)", 0, 0), + new HashType( 34700, "Blockchain, My Wallet, Legacy Wallets", 1, 0), + new HashType( 34800, "BLAKE2b-256", 0, 0), + new HashType( 34810, "BLAKE2b-256($pass.$salt)", 1, 0), + new HashType( 34820, "BLAKE2b-256($salt.$pass)", 1, 0), + new HashType( 35000, "SAP CODVN H (PWDSALTEDHASH) isSHA512", 1, 1), + new HashType( 35100, "sm3crypt $sm3$, SM3 (Unix)", 1, 1), + new HashType( 35200, "AS/400 SSHA1", 1, 0), + new HashType( 70000, "Argon2id [Bridged: reference implementation + tunings]", 1, 1), + new HashType( 70100, "scrypt [Bridged: Scrypt-Jane SMix]", 1, 1), + new HashType( 70200, "scrypt [Bridged: Scrypt-Yescrypt]", 1, 1), + new HashType( 72000, "Generic Hash [Bridged: Python Interpreter free-threading]", 1, 1), + new HashType( 73000, "Generic Hash [Bridged: Python Interpreter with GIL]", 1, 1), ]; - foreach ($hashtypes as $hashtype) { $check = Factory::getHashTypeFactory()->get($hashtype->getId()); if ($check === null) { From df1cb1a1562a148b271ed8dff137b1c6c969bdc8 Mon Sep 17 00:00:00 2001 From: jessevz Date: Wed, 20 Aug 2025 14:14:09 +0200 Subject: [PATCH 163/691] Fixed salt of newly added hashtypes --- src/install/hashtopolis.sql | 124 ++++++++++-------- .../updates/update_v0.14.4_v0.14.x.php | 118 ++++++++--------- 2 files changed, 127 insertions(+), 115 deletions(-) diff --git a/src/install/hashtopolis.sql b/src/install/hashtopolis.sql index 9c000dac8..8596137ba 100644 --- a/src/install/hashtopolis.sql +++ b/src/install/hashtopolis.sql @@ -384,7 +384,7 @@ INSERT INTO `HashType` (`hashTypeId`, `description`, `isSalted`, `isSlowHash`) V (3610, 'md5(md5(md5($pass)).$salt)', 1, 0), (3710, 'md5($salt.md5($pass))', 1, 0), (3711, 'Mediawiki B type', 0, 0), - (3730, 'md5($salt1.strtoupper(md5($salt2.$pass)))', 1, 0), + (3730, 'md5($salt1.strtoupper(md5($salt2.$pass)))', 0, 0), (3800, 'md5($salt.$pass.$salt)', 1, 0), (3910, 'md5(md5($pass).md5($salt))', 1, 0), (4010, 'md5($salt.md5($salt.$pass))', 1, 0), @@ -412,7 +412,7 @@ INSERT INTO `HashType` (`hashTypeId`, `description`, `isSalted`, `isSlowHash`) V (5500, 'NetNTLMv1-VANILLA / NetNTLMv1+ESS', 0, 0), (5600, 'NetNTLMv2', 0, 0), (5700, 'Cisco-IOS SHA256', 0, 0), - (5720, 'Cisco-ISE Hashed Password (SHA256)', 1, 0), + (5720, 'Cisco-ISE Hashed Password (SHA256)', 0, 0), (5800, 'Samsung Android Password/PIN', 1, 0), (6000, 'RipeMD160', 0, 0), (6050, 'HMAC-RIPEMD160 (key = $pass)', 1, 0), @@ -441,7 +441,7 @@ INSERT INTO `HashType` (`hashTypeId`, `description`, `isSalted`, `isSlowHash`) V (7100, 'OS X v10.8 / v10.9', 0, 1), (7200, 'GRUB 2', 0, 1), (7300, 'IPMI2 RAKP HMAC-SHA1', 1, 0), - (7350, 'IPMI2 RAKP HMAC-MD5', 1, 0), + (7350, 'IPMI2 RAKP HMAC-MD5', 0, 0), (7400, 'sha256crypt, SHA256(Unix)', 0, 0), (7401, 'MySQL $A$ (sha256crypt)', 0, 0), (7500, 'Kerberos 5 AS-REQ Pre-Auth', 0, 0), @@ -456,6 +456,7 @@ INSERT INTO `HashType` (`hashTypeId`, `description`, `isSalted`, `isSlowHash`) V (8300, 'DNSSEC (NSEC3)', 1, 0), (8400, 'WBB3, Woltlab Burning Board 3', 1, 0), (8500, 'RACF', 0, 0), + (8501, 'AS/400 DES', 0, 0), (8600, 'Lotus Notes/Domino 5', 0, 0), (8700, 'Lotus Notes/Domino 6', 0, 0), (8800, 'Android FDE <= 4.3', 0, 1), @@ -482,7 +483,7 @@ INSERT INTO `HashType` (`hashTypeId`, `description`, `isSalted`, `isSlowHash`) V (10410, 'PDF 1.1 - 1.3 (Acrobat 2 - 4), collider #1', 0, 0), (10420, 'PDF 1.1 - 1.3 (Acrobat 2 - 4), collider #2', 0, 0), (10500, 'PDF 1.4 - 1.6 (Acrobat 5 - 8)', 0, 0), - (10510, 'PDF 1.3 - 1.6 (Acrobat 4 - 8) w/ RC4-40', 1, 1), + (10510, 'PDF 1.3 - 1.6 (Acrobat 4 - 8) w/ RC4-40', 0, 1), (10600, 'PDF 1.7 Level 3 (Acrobat 9)', 0, 0), (10700, 'PDF 1.7 Level 8 (Acrobat 10 - 11)', 0, 0), (10800, 'SHA384', 0, 0), @@ -510,7 +511,7 @@ INSERT INTO `HashType` (`hashTypeId`, `description`, `isSalted`, `isSlowHash`) V (12000, 'PBKDF2-HMAC-SHA1', 0, 1), (12001, 'Atlassian (PBKDF2-HMAC-SHA1)', 0, 1), (12100, 'PBKDF2-HMAC-SHA512', 0, 1), - (12150, 'Apache Shiro 1 SHA-512', 1, 1), + (12150, 'Apache Shiro 1 SHA-512', 0, 1), (12200, 'eCryptfs', 0, 1), (12300, 'Oracle T: Type (Oracle 12+)', 0, 1), (12400, 'BSDiCrypt, Extended DES', 0, 0), @@ -554,7 +555,7 @@ INSERT INTO `HashType` (`hashTypeId`, `description`, `isSalted`, `isSlowHash`) V (13900, 'OpenCart', 1, 0), (14000, 'DES (PT = $salt, key = $pass)', 1, 0), (14100, '3DES (PT = $salt, key = $pass)', 1, 0), - (14200, 'RACF KDFAES', 1, 1), + (14200, 'RACF KDFAES', 0, 1), (14400, 'sha1(CX)', 1, 0), (14500, 'Linux Kernel Crypto API (2.4)', 0, 0), (14600, 'LUKS 10', 0, 1), @@ -578,16 +579,16 @@ INSERT INTO `HashType` (`hashTypeId`, `description`, `isSalted`, `isSlowHash`) V (16300, 'Ethereum Pre-Sale Wallet, PBKDF2-HMAC-SHA256', 0, 1), (16400, 'CRAM-MD5 Dovecot', 0, 0), (16500, 'JWT (JSON Web Token)', 0, 0), - (16501, 'Perl Mojolicious session cookie (HMAC-SHA256, >= v9.19)', 1, 0), + (16501, 'Perl Mojolicious session cookie (HMAC-SHA256, >= v9.19)', 0, 0), (16600, 'Electrum Wallet (Salt-Type 1-3)', 0, 0), (16700, 'FileVault 2', 0, 1), (16800, 'WPA-PMKID-PBKDF2', 0, 1), (16801, 'WPA-PMKID-PMK', 0, 1), (16900, 'Ansible Vault', 0, 1), (17010, 'GPG (AES-128/AES-256 (SHA-1($pass)))', 0, 1), - (17020, 'GPG (AES-128/AES-256 (SHA-512($pass)))', 1, 1), - (17030, 'GPG (AES-128/AES-256 (SHA-256($pass)))', 1, 1), - (17040, 'GPG (CAST5 (SHA-1($pass)))', 1, 1), + (17020, 'GPG (AES-128/AES-256 (SHA-512($pass)))', 0, 1), + (17030, 'GPG (AES-128/AES-256 (SHA-256($pass)))', 0, 1), + (17040, 'GPG (CAST5 (SHA-1($pass)))', 0, 1), (17200, 'PKZIP (Compressed)', 0, 0), (17210, 'PKZIP (Uncompressed)', 0, 0), (17220, 'PKZIP (Compressed Multi-File)', 0, 0), @@ -613,7 +614,7 @@ INSERT INTO `HashType` (`hashTypeId`, `description`, `isSalted`, `isSlowHash`) V (19000, 'QNX /etc/shadow (MD5)', 0, 1), (19100, 'QNX /etc/shadow (SHA256)', 0, 1), (19200, 'QNX /etc/shadow (SHA512)', 0, 1), - (19210, 'QNX 7 /etc/shadow (SHA512)', 1, 1), + (19210, 'QNX 7 /etc/shadow (SHA512)', 0, 1), (19300, 'sha1($salt1.$pass.$salt2)', 0, 0), (19500, 'Ruby on Rails Restful-Authentication', 0, 0), (19600, 'Kerberos 5 TGS-REP etype 17 (AES128-CTS-HMAC-SHA1-96)', 0, 1), @@ -648,7 +649,7 @@ INSERT INTO `HashType` (`hashTypeId`, `description`, `isSalted`, `isSlowHash`) V (21600, 'Web2py pbkdf2-sha512', 0, 0), (21700, 'Electrum Wallet (Salt-Type 4)', 0, 0), (21800, 'Electrum Wallet (Salt-Type 5)', 0, 0), - (21900, 'md5(md5(md5($pass.$salt1)).$salt2)', 1, 0), + (21900, 'md5(md5(md5($pass.$salt1)).$salt2)', 0, 0), (22000, 'WPA-PBKDF2-PMKID+EAPOL', 0, 0), (22001, 'WPA-PMK-PMKID+EAPOL', 0, 0), (22100, 'BitLocker', 0, 0), @@ -677,7 +678,7 @@ INSERT INTO `HashType` (`hashTypeId`, `description`, `isSalted`, `isSlowHash`) V (23700, 'RAR3-p (Uncompressed)', 0, 0), (23800, 'RAR3-p (Compressed)', 0, 0), (23900, 'BestCrypt v3 Volume Encryption', 0, 0), - (24000, 'BestCrypt v4 Volume Encryption', 1, 1), + (24000, 'BestCrypt v4 Volume Encryption', 0, 1), (24100, 'MongoDB ServerKey SCRAM-SHA-1', 0, 0), (24200, 'MongoDB ServerKey SCRAM-SHA-256', 0, 0), (24300, 'sha1($salt.sha1($pass.$salt))', 1, 0), @@ -707,7 +708,7 @@ INSERT INTO `HashType` (`hashTypeId`, `description`, `isSalted`, `isSlowHash`) V (26403, 'AES-256-ECB NOKDF (PT = $salt, key = $pass)', 0, 0), (26500, 'iPhone passcode (UID key + System Keybag)', 0, 0), (26600, 'MetaMask Wallet', 0, 1), - (26610, 'MetaMask Wallet (short hash, plaintext check)', 1, 1), + (26610, 'MetaMask Wallet (short hash, plaintext check)', 0, 1), (26700, 'SNMPv3 HMAC-SHA224-128', 0, 0), (26800, 'SNMPv3 HMAC-SHA256-192', 0, 0), (26900, 'SNMPv3 HMAC-SHA384-256', 0, 0), @@ -789,18 +790,18 @@ INSERT INTO `HashType` (`hashTypeId`, `description`, `isSalted`, `isSlowHash`) V (29543, 'LUKS v1 RIPEMD-160 + Twofish', 0, 1), (29600, 'Terra Station Wallet (AES256-CBC(PBKDF2($pass)))', 0, 1), (29700, 'KeePass 1 (AES/Twofish) and KeePass 2 (AES) - keyfile only mode', 0, 1), - (29800, 'Bisq .wallet (scrypt)', 1, 1), - (29910, 'ENCsecurity Datavault (PBKDF2/no keychain)', 1, 1), - (29920, 'ENCsecurity Datavault (PBKDF2/keychain)', 1, 1), - (29930, 'ENCsecurity Datavault (MD5/no keychain)', 1, 1), - (29940, 'ENCsecurity Datavault (MD5/keychain)', 1, 1), + (29800, 'Bisq .wallet (scrypt)', 0, 1), + (29910, 'ENCsecurity Datavault (PBKDF2/no keychain)', 0, 1), + (29920, 'ENCsecurity Datavault (PBKDF2/keychain)', 0, 1), + (29930, 'ENCsecurity Datavault (MD5/no keychain)', 0, 1), + (29940, 'ENCsecurity Datavault (MD5/keychain)', 0, 1), (30000, 'Python Werkzeug MD5 (HMAC-MD5 (key = $salt))', 0, 0), (30120, 'Python Werkzeug SHA256 (HMAC-SHA256 (key = $salt))', 0, 0), (30420, 'DANE RFC7929/RFC8162 SHA2-256', 0, 0), (30500, 'md5(md5($salt).md5(md5($pass)))', 1, 0), - (30600, 'bcrypt(sha256($pass)) / bcryptsha256', 1, 1), - (30601, 'bcrypt-sha256 v2 bcrypt(HMAC-SHA256($pass))', 1, 1), - (30700, 'Anope IRC Services (enc_sha256)', 1, 0), + (30600, 'bcrypt(sha256($pass)) / bcryptsha256', 0, 1), + (30601, 'bcrypt-sha256 v2 bcrypt(HMAC-SHA256($pass))', 0, 1), + (30700, 'Anope IRC Services (enc_sha256)', 0, 0), (30901, 'Bitcoin raw private key (P2PKH), compressed', 0, 0), (30902, 'Bitcoin raw private key (P2PKH), uncompressed', 0, 0), (30903, 'Bitcoin raw private key (P2WPKH, Bech32), compressed', 0, 0), @@ -809,57 +810,68 @@ INSERT INTO `HashType` (`hashTypeId`, `description`, `isSalted`, `isSlowHash`) V (30906, 'Bitcoin raw private key (P2SH(P2WPKH)), uncompressed', 0, 0), (31000, 'BLAKE2s-256', 0, 0), (31100, 'ShangMi 3 (SM3)', 0, 0), - (31200, 'Veeam VBK', 1, 1), - (31300, 'MS SNTP', 1, 0), - (31400, 'SecureCRT MasterPassphrase v2', 1, 0), + (31200, 'Veeam VBK', 0, 1), + (31300, 'MS SNTP', 0, 0), + (31400, 'SecureCRT MasterPassphrase v2', 0, 0), (31500, 'Domain Cached Credentials (DCC), MS Cache (NT)', 1, 1), - (31600, 'Domain Cached Credentials 2 (DCC2), MS Cache 2, (NT)', 1, 1), + (31600, 'Domain Cached Credentials 2 (DCC2), MS Cache 2, (NT)', 0, 1), (31700, 'md5(md5(md5($pass).$salt1).$salt2)', 1, 0), - (31800, '1Password, mobilekeychain (1Password 8)', 1, 1), - (31900, 'MetaMask Mobile Wallet', 1, 1), - (32000, 'NetIQ SSPR (MD5)', 1, 1), - (32010, 'NetIQ SSPR (SHA1)', 1, 1), - (32020, 'NetIQ SSPR (SHA-1 with Salt)', 1, 1), - (32030, 'NetIQ SSPR (SHA-256 with Salt)', 1, 1), - (32031, 'Adobe AEM (SSPR, SHA-256 with Salt)', 1, 1), - (32040, 'NetIQ SSPR (SHA-512 with Salt)', 1, 1), - (32041, 'Adobe AEM (SSPR, SHA-512 with Salt)', 1, 1), - (32050, 'NetIQ SSPR (PBKDF2WithHmacSHA1)', 1, 1), - (32060, 'NetIQ SSPR (PBKDF2WithHmacSHA256)', 1, 1), - (32070, 'NetIQ SSPR (PBKDF2WithHmacSHA512)', 1, 1), - (32100, 'Kerberos 5, etype 17, AS-REP', 1, 1), - (32200, 'Kerberos 5, etype 18, AS-REP', 1, 1), + (31800, '1Password, mobilekeychain (1Password 8)', 0, 1), + (31900, 'MetaMask Mobile Wallet', 0, 1), + (32000, 'NetIQ SSPR (MD5)', 0, 1), + (32010, 'NetIQ SSPR (SHA1)', 0, 1), + (32020, 'NetIQ SSPR (SHA-1 with Salt)', 0, 1), + (32030, 'NetIQ SSPR (SHA-256 with Salt)', 0, 1), + (32031, 'Adobe AEM (SSPR, SHA-256 with Salt)', 0, 1), + (32040, 'NetIQ SSPR (SHA-512 with Salt)', 0, 1), + (32041, 'Adobe AEM (SSPR, SHA-512 with Salt)', 0, 1), + (32050, 'NetIQ SSPR (PBKDF2WithHmacSHA1)', 0, 1), + (32060, 'NetIQ SSPR (PBKDF2WithHmacSHA256)', 0, 1), + (32070, 'NetIQ SSPR (PBKDF2WithHmacSHA512)', 0, 1), + (32100, 'Kerberos 5, etype 17, AS-REP', 0, 1), + (32200, 'Kerberos 5, etype 18, AS-REP', 0, 1), (32300, 'Empire CMS (Admin password)', 1, 0), (32410, 'sha512(sha512($pass).$salt)', 1, 0), (32420, 'sha512(sha512_bin($pass).$salt)', 1, 0), - (32500, 'Dogechain.info Wallet', 1, 1), + (32500, 'Dogechain.info Wallet', 0, 1), (32600, 'CubeCart (whirlpool($salt.$pass.$salt))', 1, 0), - (32700, 'Kremlin Encrypt 3.0 w/NewDES', 1, 1), + (32700, 'Kremlin Encrypt 3.0 w/NewDES', 0, 1), (32800, 'md5(sha1(md5($pass)))', 0, 0), (32900, 'PBKDF1-SHA1', 1, 1), (33000, 'md5($salt1.$pass.$salt2)', 1, 0), (33100, 'md5($salt.md5($pass).$salt)', 1, 0), (33300, 'HMAC-BLAKE2S (key = $pass)', 1, 0), - (33400, 'mega.nz password-protected link (PBKDF2-HMAC-SHA512)', 1, 1), - (33500, 'RC4 40-bit DropN', 1, 0), - (33501, 'RC4 72-bit DropN', 1, 0), - (33502, 'RC4 104-bit DropN', 1, 0), + (33400, 'mega.nz password-protected link (PBKDF2-HMAC-SHA512)', 0, 1), + (33500, 'RC4 40-bit DropN', 0, 0), + (33501, 'RC4 72-bit DropN', 0, 0), + (33502, 'RC4 104-bit DropN', 0, 0), (33600, 'RIPEMD-320', 0, 0), (33650, 'HMAC-RIPEMD320 (key = $pass)', 1, 0), (33660, 'HMAC-RIPEMD320 (key = $salt)', 1, 0), - (33700, 'Microsoft Online Account (PBKDF2-HMAC-SHA256 + AES256)', 1, 1), - (33800, 'WBB4 (Woltlab Burning Board) Plugin [bcrypt(bcrypt($pass))]', 1, 1), - (33900, 'Citrix NetScaler (PBKDF2-HMAC-SHA256)', 1, 1), - (34000, 'Argon2', 1, 1), - (34100, 'LUKS v2 argon2id + SHA-256 + AES', 1, 1), + (33700, 'Microsoft Online Account (PBKDF2-HMAC-SHA256 + AES256)', 0, 1), + (33800, 'WBB4 (Woltlab Burning Board) Plugin [bcrypt(bcrypt($pass))]', 0, 1), + (33900, 'Citrix NetScaler (PBKDF2-HMAC-SHA256)', 0, 1), + (34000, 'Argon2', 0, 1), + (34100, 'LUKS v2 argon2id + SHA-256 + AES', 0, 1), (34200, 'MurmurHash64A', 1, 0), (34201, 'MurmurHash64A (zero seed)', 0, 0), (34211, 'MurmurHash64A truncated (zero seed)', 0, 0), - (70000, 'argon2id [Bridged: reference implementation + tunings]', 1, 1), - (70100, 'scrypt [Bridged: Scrypt-Jane ROMix]', 1, 1), - (70200, 'scrypt [Bridged: Scrypt-Yescrypt]', 1, 1), - (72000, 'Generic Hash [Bridged: Python Interpreter free-threading]', 1, 1), - (73000, 'Generic Hash [Bridged: Python Interpreter with GIL]', 1, 1), + (34300, 'KeePass (KDBX v4)', 0, 1), + (34400, 'sha224(sha224($pass))', 0, 0), + (34500, 'sha224(sha1($pass))', 0, 0), + (34600, 'MD6 (256)', 0, 0), + (34700, 'Blockchain, My Wallet, Legacy Wallets', 0, 0), + (34800, 'BLAKE2b-256', 0, 0), + (34810, 'BLAKE2b-256($pass.$salt)', 1, 0), + (34820, 'BLAKE2b-256($salt.$pass)', 1, 0), + (35000, 'SAP CODVN H (PWDSALTEDHASH) isSHA512', 1, 1), + (35100, 'sm3crypt $sm3$, SM3 (Unix)', 1, 1), + (35200, 'AS/400 SSHA1', 1, 0), + (70000, 'argon2id [Bridged: reference implementation + tunings]', 0, 1), + (70100, 'scrypt [Bridged: Scrypt-Jane ROMix]', 0, 1), + (70200, 'scrypt [Bridged: Scrypt-Yescrypt]', 0, 1), + (72000, 'Generic Hash [Bridged: Python Interpreter free-threading]', 0, 1), + (73000, 'Generic Hash [Bridged: Python Interpreter with GIL]', 0, 1), (99999, 'Plaintext', 0, 0); CREATE TABLE `LogEntry` ( diff --git a/src/install/updates/update_v0.14.4_v0.14.x.php b/src/install/updates/update_v0.14.4_v0.14.x.php index d1163fbf8..10ebe4d6e 100644 --- a/src/install/updates/update_v0.14.4_v0.14.x.php +++ b/src/install/updates/update_v0.14.4_v0.14.x.php @@ -16,39 +16,39 @@ new HashType( 1320, "sha224($salt.$pass)", 1, 0), new HashType( 2630, "md5(md5($pass.$salt))", 1, 0), new HashType( 3610, "md5(md5(md5($pass)).$salt)", 1, 0), - new HashType( 3730, "md5($salt1.strtoupper(md5($salt2.$pass)))", 1, 0), + new HashType( 3730, "md5($salt1.strtoupper(md5($salt2.$pass)))", 0, 0), new HashType( 4420, "md5(sha1($pass.$salt))", 1, 0), new HashType( 4430, "md5(sha1($salt.$pass))", 1, 0), - new HashType( 5720, "Cisco-ISE Hashed Password (SHA256)", 1, 0), + new HashType( 5720, "Cisco-ISE Hashed Password (SHA256)", 0, 0), new HashType( 6050, "HMAC-RIPEMD160 (key = $pass)", 1, 0), new HashType( 6060, "HMAC-RIPEMD160 (key = $salt)", 1, 0), - new HashType( 7350, "IPMI2 RAKP HMAC-MD5", 1, 0), - new HashType( 8501, "AS/400 DES", 1, 0), - new HashType( 10510, "PDF 1.3 - 1.6 (Acrobat 4 - 8) w/ RC4-40", 1, 1), - new HashType( 12150, "Apache Shiro 1 SHA-512", 1, 1), - new HashType( 14200, "RACF KDFAES", 1, 1), - new HashType( 16501, "Perl Mojolicious session cookie (HMAC-SHA256, >= v9.19)", 1, 0), - new HashType( 17020, "GPG (AES-128/AES-256 (SHA-512($pass)))", 1, 1), - new HashType( 17030, "GPG (AES-128/AES-256 (SHA-256($pass)))", 1, 1), - new HashType( 17040, "GPG (CAST5 (SHA-1($pass)))", 1, 1), - new HashType( 19210, "QNX 7 /etc/shadow (SHA512)", 1, 1), + new HashType( 7350, "IPMI2 RAKP HMAC-MD5", 0, 0), + new HashType( 8501, "AS/400 DES", 0, 0), + new HashType( 10510, "PDF 1.3 - 1.6 (Acrobat 4 - 8) w/ RC4-40", 0, 1), + new HashType( 12150, "Apache Shiro 1 SHA-512", 0, 1), + new HashType( 14200, "RACF KDFAES", 0, 1), + new HashType( 16501, "Perl Mojolicious session cookie (HMAC-SHA256, >= v9.19)", 0, 0), + new HashType( 17020, "GPG (AES-128/AES-256 (SHA-512($pass)))", 0, 1), + new HashType( 17030, "GPG (AES-128/AES-256 (SHA-256($pass)))", 0, 1), + new HashType( 17040, "GPG (CAST5 (SHA-1($pass)))", 0, 1), + new HashType( 19210, "QNX 7 /etc/shadow (SHA512)", 0, 1), new HashType( 20712, "RSA Security Analytics / NetWitness (sha256)", 1, 0), new HashType( 20730, "sha256(sha256($pass.$salt))", 1, 0), new HashType( 21310, "md5($salt1.sha1($salt2.$pass))", 1, 0), - new HashType( 21900, "md5(md5(md5($pass.$salt1)).$salt2)", 1, 0), + new HashType( 21900, "md5(md5(md5($pass.$salt1)).$salt2)", 0, 0), new HashType( 22800, "Simpla CMS - md5($salt.$pass.md5($pass))", 1, 0), - new HashType( 24000, "BestCrypt v4 Volume Encryption", 1, 1), - new HashType( 26610, "MetaMask Wallet (short hash, plaintext check)", 1, 1), - new HashType( 29800, "Bisq .wallet (scrypt)", 1, 1), - new HashType( 29910, "ENCsecurity Datavault (PBKDF2/no keychain)", 1, 1), - new HashType( 29920, "ENCsecurity Datavault (PBKDF2/keychain)", 1, 1), - new HashType( 29930, "ENCsecurity Datavault (MD5/no keychain)", 1, 1), - new HashType( 29940, "ENCsecurity Datavault (MD5/keychain)", 1, 1), + new HashType( 24000, "BestCrypt v4 Volume Encryption", 0, 1), + new HashType( 26610, "MetaMask Wallet (short hash, plaintext check)", 0, 1), + new HashType( 29800, "Bisq .wallet (scrypt)", 0, 1), + new HashType( 29910, "ENCsecurity Datavault (PBKDF2/no keychain)", 0, 1), + new HashType( 29920, "ENCsecurity Datavault (PBKDF2/keychain)", 0, 1), + new HashType( 29930, "ENCsecurity Datavault (MD5/no keychain)", 0, 1), + new HashType( 29940, "ENCsecurity Datavault (MD5/keychain)", 0, 1), new HashType( 30420, "DANE RFC7929/RFC8162 SHA2-256", 0, 0), new HashType( 30500, "md5(md5($salt).md5(md5($pass)))", 1, 0), - new HashType( 30600, "bcrypt(sha256($pass))", 1, 1), - new HashType( 30601, "bcrypt(HMAC-SHA256($pass))", 1, 1), - new HashType( 30700, "Anope IRC Services (enc_sha256)", 1, 0), + new HashType( 30600, "bcrypt(sha256($pass))", 0, 1), + new HashType( 30601, "bcrypt(HMAC-SHA256($pass))", 0, 1), + new HashType( 30700, "Anope IRC Services (enc_sha256)", 0, 0), new HashType( 30901, "Bitcoin raw private key (P2PKH), compressed", 0, 0), new HashType( 30902, "Bitcoin raw private key (P2PKH), uncompressed", 0, 0), new HashType( 30903, "Bitcoin raw private key (P2WPKH, Bech32), compressed", 0, 0), @@ -57,68 +57,68 @@ new HashType( 30906, "Bitcoin raw private key (P2SH(P2WPKH)), uncompressed", 0, 0), new HashType( 31000, "BLAKE2s-256", 0, 0), new HashType( 31100, "ShangMi 3 (SM3)", 0, 0), - new HashType( 31200, "Veeam VBK", 1, 1), - new HashType( 31300, "MS SNTP", 1, 0), - new HashType( 31400, "SecureCRT MasterPassphrase v2", 1, 0), + new HashType( 31200, "Veeam VBK", 0, 1), + new HashType( 31300, "MS SNTP", 0, 0), + new HashType( 31400, "SecureCRT MasterPassphrase v2", 0, 0), new HashType( 31500, "Domain Cached Credentials (DCC), MS Cache (NT)", 1, 1), - new HashType( 31600, "Domain Cached Credentials 2 (DCC2), MS Cache 2, (NT)", 1, 1), + new HashType( 31600, "Domain Cached Credentials 2 (DCC2), MS Cache 2, (NT)", 0, 1), new HashType( 31700, "md5(md5(md5($pass).$salt1).$salt2)", 1, 0), - new HashType( 31800, "1Password, mobilekeychain (1Password 8)", 1, 1), - new HashType( 31900, "MetaMask Mobile Wallet", 1, 1), - new HashType( 32000, "NetIQ SSPR (MD5)", 1, 1), - new HashType( 32010, "NetIQ SSPR (SHA1)", 1, 1), - new HashType( 32020, "NetIQ SSPR (SHA-1 with Salt)", 1, 1), - new HashType( 32030, "NetIQ SSPR (SHA-256 with Salt)", 1, 1), - new HashType( 32031, "Adobe AEM (SSPR, SHA-256 with Salt)", 1, 1), - new HashType( 32040, "NetIQ SSPR (SHA-512 with Salt)", 1, 1), - new HashType( 32041, "Adobe AEM (SSPR, SHA-512 with Salt)", 1, 1), - new HashType( 32050, "NetIQ SSPR (PBKDF2WithHmacSHA1)", 1, 1), - new HashType( 32060, "NetIQ SSPR (PBKDF2WithHmacSHA256)", 1, 1), - new HashType( 32070, "NetIQ SSPR (PBKDF2WithHmacSHA512)", 1, 1), - new HashType( 32100, "Kerberos 5, etype 17, AS-REP", 1, 1), - new HashType( 32200, "Kerberos 5, etype 18, AS-REP", 1, 1), + new HashType( 31800, "1Password, mobilekeychain (1Password 8)", 0, 1), + new HashType( 31900, "MetaMask Mobile Wallet", 0, 1), + new HashType( 32000, "NetIQ SSPR (MD5)", 0, 1), + new HashType( 32010, "NetIQ SSPR (SHA1)", 0, 1), + new HashType( 32020, "NetIQ SSPR (SHA-1 with Salt)", 0, 1), + new HashType( 32030, "NetIQ SSPR (SHA-256 with Salt)", 0, 1), + new HashType( 32031, "Adobe AEM (SSPR, SHA-256 with Salt)", 0, 1), + new HashType( 32040, "NetIQ SSPR (SHA-512 with Salt)", 0, 1), + new HashType( 32041, "Adobe AEM (SSPR, SHA-512 with Salt)", 0, 1), + new HashType( 32050, "NetIQ SSPR (PBKDF2WithHmacSHA1)", 0, 1), + new HashType( 32060, "NetIQ SSPR (PBKDF2WithHmacSHA256)", 0, 1), + new HashType( 32070, "NetIQ SSPR (PBKDF2WithHmacSHA512)", 0, 1), + new HashType( 32100, "Kerberos 5, etype 17, AS-REP", 0, 1), + new HashType( 32200, "Kerberos 5, etype 18, AS-REP", 0, 1), new HashType( 32300, "Empire CMS (Admin password)", 1, 0), new HashType( 32410, "sha512(sha512($pass).$salt)", 1, 0), new HashType( 32420, "sha512(sha512_bin($pass).$salt)", 1, 0), - new HashType( 32500, "Dogechain.info Wallet", 1, 1), + new HashType( 32500, "Dogechain.info Wallet", 0, 1), new HashType( 32600, "CubeCart (whirlpool($salt.$pass.$salt))", 1, 0), - new HashType( 32700, "Kremlin Encrypt 3.0 w/NewDES", 1, 1), + new HashType( 32700, "Kremlin Encrypt 3.0 w/NewDES", 0, 1), new HashType( 32800, "md5(sha1(md5($pass)))", 0, 0), new HashType( 32900, "PBKDF1-SHA1", 1, 1), new HashType( 33000, "md5($salt1.$pass.$salt2)", 1, 0), new HashType( 33100, "md5($salt.md5($pass).$salt)", 1, 0), new HashType( 33300, "HMAC-BLAKE2S (key = $pass)", 1, 0), - new HashType( 33400, "mega.nz password-protected link (PBKDF2-HMAC-SHA512)", 1, 1), - new HashType( 33500, "RC4 40-bit DropN", 1, 0), - new HashType( 33501, "RC4 72-bit DropN", 1, 0), - new HashType( 33502, "RC4 104-bit DropN", 1, 0), + new HashType( 33400, "mega.nz password-protected link (PBKDF2-HMAC-SHA512)", 0, 1), + new HashType( 33500, "RC4 40-bit DropN", 0, 0), + new HashType( 33501, "RC4 72-bit DropN", 0, 0), + new HashType( 33502, "RC4 104-bit DropN", 0, 0), new HashType( 33600, "RIPEMD-320", 0, 0), new HashType( 33650, "HMAC-RIPEMD320 (key = $pass)", 1, 0), new HashType( 33660, "HMAC-RIPEMD320 (key = $salt)", 1, 0), - new HashType( 33700, "Microsoft Online Account (PBKDF2-HMAC-SHA256 + AES256)", 1, 1), - new HashType( 33800, "WBB4 (Woltlab Burning Board) [bcrypt(bcrypt($pass))]", 1, 1), - new HashType( 33900, "Citrix NetScaler (PBKDF2-HMAC-SHA256)", 1, 1), - new HashType( 34000, "Argon2", 1, 1), - new HashType( 34100, "LUKS v2 argon2 + SHA-256 + AES", 1, 1), + new HashType( 33700, "Microsoft Online Account (PBKDF2-HMAC-SHA256 + AES256)", 0, 1), + new HashType( 33800, "WBB4 (Woltlab Burning Board) [bcrypt(bcrypt($pass))]", 0, 1), + new HashType( 33900, "Citrix NetScaler (PBKDF2-HMAC-SHA256)", 0, 1), + new HashType( 34000, "Argon2", 0, 1), + new HashType( 34100, "LUKS v2 argon2 + SHA-256 + AES", 0, 1), new HashType( 34200, "MurmurHash64A", 1, 0), new HashType( 34201, "MurmurHash64A (zero seed)", 0, 0), new HashType( 34211, "MurmurHash64A truncated (zero seed)", 0, 0), - new HashType( 34300, "KeePass (KDBX v4)", 1, 1), + new HashType( 34300, "KeePass (KDBX v4)", 0, 1), new HashType( 34400, "sha224(sha224($pass))", 0, 0), new HashType( 34500, "sha224(sha1($pass))", 0, 0), new HashType( 34600, "MD6 (256)", 0, 0), - new HashType( 34700, "Blockchain, My Wallet, Legacy Wallets", 1, 0), + new HashType( 34700, "Blockchain, My Wallet, Legacy Wallets", 0, 0), new HashType( 34800, "BLAKE2b-256", 0, 0), new HashType( 34810, "BLAKE2b-256($pass.$salt)", 1, 0), new HashType( 34820, "BLAKE2b-256($salt.$pass)", 1, 0), new HashType( 35000, "SAP CODVN H (PWDSALTEDHASH) isSHA512", 1, 1), new HashType( 35100, "sm3crypt $sm3$, SM3 (Unix)", 1, 1), new HashType( 35200, "AS/400 SSHA1", 1, 0), - new HashType( 70000, "Argon2id [Bridged: reference implementation + tunings]", 1, 1), - new HashType( 70100, "scrypt [Bridged: Scrypt-Jane SMix]", 1, 1), - new HashType( 70200, "scrypt [Bridged: Scrypt-Yescrypt]", 1, 1), - new HashType( 72000, "Generic Hash [Bridged: Python Interpreter free-threading]", 1, 1), - new HashType( 73000, "Generic Hash [Bridged: Python Interpreter with GIL]", 1, 1), + new HashType( 70000, "Argon2id [Bridged: reference implementation + tunings]", 0, 1), + new HashType( 70100, "scrypt [Bridged: Scrypt-Jane SMix]", 0, 1), + new HashType( 70200, "scrypt [Bridged: Scrypt-Yescrypt]", 0, 1), + new HashType( 72000, "Generic Hash [Bridged: Python Interpreter free-threading]", 0, 1), + new HashType( 73000, "Generic Hash [Bridged: Python Interpreter with GIL]", 0, 1), ]; foreach ($hashtypes as $hashtype) { $check = Factory::getHashTypeFactory()->get($hashtype->getId()); From 81fdfe83d88dcb296f85fc38e75a64f37507e3e9 Mon Sep 17 00:00:00 2001 From: jessevz Date: Wed, 20 Aug 2025 15:07:35 +0200 Subject: [PATCH 164/691] Fixed review suggestions --- ci/files/update-hashes.py | 2 +- src/install/hashtopolis.sql | 34 +++++++++---------- .../updates/update_v0.14.4_v0.14.x.php | 2 +- 3 files changed, 19 insertions(+), 19 deletions(-) diff --git a/ci/files/update-hashes.py b/ci/files/update-hashes.py index 3d5725df2..d6311649b 100644 --- a/ci/files/update-hashes.py +++ b/ci/files/update-hashes.py @@ -60,7 +60,7 @@ def __init__(self, hashType, description, salted, slowHash): for hashType in new_hashtypes: print(f' new HashType( {hashType.hashType}, "{hashType.description}", {int(hashType.salted)}, {int(hashType.slowHash)}),') print(" ];") -print(' foreach ($hashtypes as $hashtype) {') +print(' foreach ($hashTypes as $hashtype) {') print(' $check = Factory::getHashTypeFactory()->get($hashtype->getId());') print(' if ($check === null) {') print(' Factory::getHashTypeFactory()->save($hashtype);') diff --git a/src/install/hashtopolis.sql b/src/install/hashtopolis.sql index 8596137ba..75225f0e5 100644 --- a/src/install/hashtopolis.sql +++ b/src/install/hashtopolis.sql @@ -799,8 +799,8 @@ INSERT INTO `HashType` (`hashTypeId`, `description`, `isSalted`, `isSlowHash`) V (30120, 'Python Werkzeug SHA256 (HMAC-SHA256 (key = $salt))', 0, 0), (30420, 'DANE RFC7929/RFC8162 SHA2-256', 0, 0), (30500, 'md5(md5($salt).md5(md5($pass)))', 1, 0), - (30600, 'bcrypt(sha256($pass)) / bcryptsha256', 0, 1), - (30601, 'bcrypt-sha256 v2 bcrypt(HMAC-SHA256($pass))', 0, 1), + (30600, 'bcrypt(sha256($pass))', 0, 1), + (30601, 'bcrypt(HMAC-SHA256($pass))', 0, 1), (30700, 'Anope IRC Services (enc_sha256)', 0, 0), (30901, 'Bitcoin raw private key (P2PKH), compressed', 0, 0), (30902, 'Bitcoin raw private key (P2PKH), uncompressed', 0, 0), @@ -849,26 +849,26 @@ INSERT INTO `HashType` (`hashTypeId`, `description`, `isSalted`, `isSlowHash`) V (33650, 'HMAC-RIPEMD320 (key = $pass)', 1, 0), (33660, 'HMAC-RIPEMD320 (key = $salt)', 1, 0), (33700, 'Microsoft Online Account (PBKDF2-HMAC-SHA256 + AES256)', 0, 1), - (33800, 'WBB4 (Woltlab Burning Board) Plugin [bcrypt(bcrypt($pass))]', 0, 1), + (33800, 'WBB4 (Woltlab Burning Board) [bcrypt(bcrypt($pass))]', 0, 1), (33900, 'Citrix NetScaler (PBKDF2-HMAC-SHA256)', 0, 1), (34000, 'Argon2', 0, 1), - (34100, 'LUKS v2 argon2id + SHA-256 + AES', 0, 1), + (34100, 'LUKS v2 argon2 + SHA-256 + AES', 0, 1), (34200, 'MurmurHash64A', 1, 0), (34201, 'MurmurHash64A (zero seed)', 0, 0), (34211, 'MurmurHash64A truncated (zero seed)', 0, 0), - (34300, 'KeePass (KDBX v4)', 0, 1), - (34400, 'sha224(sha224($pass))', 0, 0), - (34500, 'sha224(sha1($pass))', 0, 0), - (34600, 'MD6 (256)', 0, 0), - (34700, 'Blockchain, My Wallet, Legacy Wallets', 0, 0), - (34800, 'BLAKE2b-256', 0, 0), - (34810, 'BLAKE2b-256($pass.$salt)', 1, 0), - (34820, 'BLAKE2b-256($salt.$pass)', 1, 0), - (35000, 'SAP CODVN H (PWDSALTEDHASH) isSHA512', 1, 1), - (35100, 'sm3crypt $sm3$, SM3 (Unix)', 1, 1), - (35200, 'AS/400 SSHA1', 1, 0), - (70000, 'argon2id [Bridged: reference implementation + tunings]', 0, 1), - (70100, 'scrypt [Bridged: Scrypt-Jane ROMix]', 0, 1), + (34300, 'KeePass (KDBX v4)', 0, 1), + (34400, 'sha224(sha224($pass))', 0, 0), + (34500, 'sha224(sha1($pass))', 0, 0), + (34600, 'MD6 (256)', 0, 0), + (34700, 'Blockchain, My Wallet, Legacy Wallets', 0, 0), + (34800, 'BLAKE2b-256', 0, 0), + (34810, 'BLAKE2b-256($pass.$salt)', 1, 0), + (34820, 'BLAKE2b-256($salt.$pass)', 1, 0), + (35000, 'SAP CODVN H (PWDSALTEDHASH) isSHA512', 1, 1), + (35100, 'sm3crypt $sm3$, SM3 (Unix)', 1, 1), + (35200, 'AS/400 SSHA1', 1, 0), + (70000, 'Argon2id [Bridged: reference implementation + tunings]', 0, 1), + (70100, 'scrypt [Bridged: Scrypt-Jane SMix]', 0, 1), (70200, 'scrypt [Bridged: Scrypt-Yescrypt]', 0, 1), (72000, 'Generic Hash [Bridged: Python Interpreter free-threading]', 0, 1), (73000, 'Generic Hash [Bridged: Python Interpreter with GIL]', 0, 1), diff --git a/src/install/updates/update_v0.14.4_v0.14.x.php b/src/install/updates/update_v0.14.4_v0.14.x.php index 10ebe4d6e..46adb0093 100644 --- a/src/install/updates/update_v0.14.4_v0.14.x.php +++ b/src/install/updates/update_v0.14.4_v0.14.x.php @@ -120,7 +120,7 @@ new HashType( 72000, "Generic Hash [Bridged: Python Interpreter free-threading]", 0, 1), new HashType( 73000, "Generic Hash [Bridged: Python Interpreter with GIL]", 0, 1), ]; - foreach ($hashtypes as $hashtype) { + foreach ($hashTypes as $hashtype) { $check = Factory::getHashTypeFactory()->get($hashtype->getId()); if ($check === null) { Factory::getHashTypeFactory()->save($hashtype); From a8b0bf59df40df819ecc7a781f0cc7b04bc1bdaa Mon Sep 17 00:00:00 2001 From: jessevz Date: Wed, 20 Aug 2025 15:21:19 +0200 Subject: [PATCH 165/691] Fixed wrong indentation --- src/install/hashtopolis.sql | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/install/hashtopolis.sql b/src/install/hashtopolis.sql index 75225f0e5..5de437742 100644 --- a/src/install/hashtopolis.sql +++ b/src/install/hashtopolis.sql @@ -338,8 +338,8 @@ INSERT INTO `HashType` (`hashTypeId`, `description`, `isSalted`, `isSlowHash`) V (1000, 'NTLM', 0, 0), (1100, 'Domain Cached Credentials (DCC), MS Cache', 1, 0), (1300, 'SHA-224', 0, 0), - (1310, 'sha224($pass.$salt)', 1, 0), - (1320, 'sha224($salt.$pass)', 1, 0), + (1310, 'sha224($pass.$salt)', 1, 0), + (1320, 'sha224($salt.$pass)', 1, 0), (1400, 'SHA256', 0, 0), (1410, 'sha256($pass.$salt)', 1, 0), (1411, 'SSHA-256(Base64), LDAP {SSHA256}', 0, 0), From ac1b7cec39847bd08305e0926b0e016574a38be0 Mon Sep 17 00:00:00 2001 From: Sein Coray Date: Wed, 20 Aug 2025 15:23:43 +0200 Subject: [PATCH 166/691] removed commented note about documentation --- doc/index.md | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) diff --git a/doc/index.md b/doc/index.md index c2f05c32e..288c28b3a 100644 --- a/doc/index.md +++ b/doc/index.md @@ -1,10 +1,5 @@ # What is Hashtopolis? - - **Hashtopolis** is an open-source platform designed to distribute and manage password cracking tasks across multiple machines. Password cracking is a *pleasantly parallel* problem, meaning it can be divided into many independent subtasks that run simultaneously without needing to communicate with each other. Each agent can work on a different portion of the attack without waiting for others. This makes cracking highly scalable: the more resources you have, the faster the overall process will run. Hashtopolis takes full advantage of this by coordinating multiple agents to work in parallel, maximizing resource utilization and significantly reducing cracking time. @@ -62,4 +57,4 @@ This manual aims to describe all the functionalities and settings existing in Ha - [**Installation Guidelines**](./installation_guidelines/basic_install.md): Covers basic installation steps to deploy a Hashtopolis instance. It also contains advanced installation procedures for air-gapped environments, HTTPS configuration, as well as many other advanced features. - [**User Manual**](./user_manual/agents.md): goes deeper than the basic workflow into each aspect of Hashtopolis. This aims to cover all the existing features and settings. - [**FAQ and Tips**](./faq_tips/faq.md): gathers most of the questions that were asked on different channels (discord, wiki, etc.). -- [**API Reference**](./api.md): contains all the details related to the API in case you need to automate some processes or want to develop your own front end. \ No newline at end of file +- [**API Reference**](./api.md): contains all the details related to the API in case you need to automate some processes or want to develop your own front end. From 59483f77431fffd115b74504466cfd710c93bd26 Mon Sep 17 00:00:00 2001 From: jessevz Date: Wed, 20 Aug 2025 15:44:07 +0200 Subject: [PATCH 167/691] NOt allowed to delete logs with the API anymore (#1520) Co-authored-by: jessevz --- src/api/v2/index.php | 2 +- src/inc/apiv2/model/logentries.routes.php | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/api/v2/index.php b/src/api/v2/index.php index f5948a0d3..f172cb17a 100644 --- a/src/api/v2/index.php +++ b/src/api/v2/index.php @@ -242,7 +242,7 @@ public static function addCORSheaders(Request $request, $response) { //Quirck to handle HTexceptions without status code, this can be removed when all HTexceptions have been migrated error_log($exception->getMessage()); $code = $exception->getCode(); - if ($code == 0) { + if ($code == 0 || $code == 1) { $code = 500; } diff --git a/src/inc/apiv2/model/logentries.routes.php b/src/inc/apiv2/model/logentries.routes.php index 2e7f34763..a05241fbd 100644 --- a/src/inc/apiv2/model/logentries.routes.php +++ b/src/inc/apiv2/model/logentries.routes.php @@ -22,7 +22,7 @@ public static function getDBAclass(): string { } protected function deleteObject(object $object): void { - Factory::getLogEntryFactory()->delete($object); + assert(False, "Logentries cannot be deleted via API"); } } From 2d095081c4030f526ea54525302898df26cd9e0f Mon Sep 17 00:00:00 2001 From: jessevz Date: Mon, 25 Aug 2025 10:31:53 +0200 Subject: [PATCH 168/691] Changed status code of updating password (#1521) Co-authored-by: jessevz --- src/inc/utils/UserUtils.class.php | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/inc/utils/UserUtils.class.php b/src/inc/utils/UserUtils.class.php index 538b85b77..a66eb3e67 100644 --- a/src/inc/utils/UserUtils.class.php +++ b/src/inc/utils/UserUtils.class.php @@ -137,16 +137,16 @@ public static function setRights($userId, $groupId, $adminUser) { */ public static function changePassword($user, $oldPassword, $newPassword, $confirmPassword) { if (!Encryption::passwordVerify($oldPassword, $user->getPasswordSalt(), $user->getPasswordHash())) { - throw new HTException("Your old password is wrong!"); + throw new HttpError("Your old password is wrong!"); } else if (strlen($newPassword) < 4) { - throw new HTException("Your password is too short!"); + throw new HttpError("Your password is too short!"); } else if ($newPassword != $confirmPassword) { - throw new HTException("Your new passwords do not match!"); + throw new HttpError("Your new passwords do not match!"); } else if ($newPassword == $oldPassword) { - throw new HTException("Your new password is the same as the old one!"); + throw new HttpError("Your new password is the same as the old one!"); } $newSalt = Util::randomString(20); $newHash = Encryption::passwordHash($newPassword, $newSalt); From 4ae030819d9e6e9e15228e58fb87a729a4f09bac Mon Sep 17 00:00:00 2001 From: jessevz Date: Tue, 26 Aug 2025 09:07:55 +0200 Subject: [PATCH 169/691] =?UTF-8?q?Created=20helper=20endpoint=20to=20retr?= =?UTF-8?q?ieve=20current=20logged=20in=20user,=20regardles=E2=80=A6=20(#1?= =?UTF-8?q?483)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * Created helper endpoint to retrieve current logged in user, regardless of permissions * Added require for getCurrentUser route * Made it possible for users to alter own attributes, even when no permmisions to manage users * Undone accidently removed error handler * Cleaned up comment --------- Co-authored-by: jessevz --- src/api/v2/index.php | 1 + .../apiv2/common/AbstractBaseAPI.class.php | 4 + .../apiv2/common/AbstractModelAPI.class.php | 32 ++++--- src/inc/apiv2/helper/currentUser.routes.php | 87 +++++++++++++++++++ 4 files changed, 113 insertions(+), 11 deletions(-) create mode 100644 src/inc/apiv2/helper/currentUser.routes.php diff --git a/src/api/v2/index.php b/src/api/v2/index.php index f172cb17a..9aa076ca1 100644 --- a/src/api/v2/index.php +++ b/src/api/v2/index.php @@ -298,6 +298,7 @@ public static function addCORSheaders(Request $request, $response) { require __DIR__ . "/../../inc/apiv2/helper/abortChunk.routes.php"; require __DIR__ . "/../../inc/apiv2/helper/assignAgent.routes.php"; require __DIR__ . "/../../inc/apiv2/helper/changeOwnPassword.routes.php"; +require __DIR__ . "/../../inc/apiv2/helper/currentUser.routes.php"; require __DIR__ . "/../../inc/apiv2/helper/createSupertask.routes.php"; require __DIR__ . "/../../inc/apiv2/helper/createSuperHashlist.routes.php"; require __DIR__ . "/../../inc/apiv2/helper/exportCrackedHashes.routes.php"; diff --git a/src/inc/apiv2/common/AbstractBaseAPI.class.php b/src/inc/apiv2/common/AbstractBaseAPI.class.php index 93b565ae3..f0890cf82 100644 --- a/src/inc/apiv2/common/AbstractBaseAPI.class.php +++ b/src/inc/apiv2/common/AbstractBaseAPI.class.php @@ -180,6 +180,10 @@ final protected function mapFeatures($features): array { final protected function getCurrentUser(): User { return $this->user; } + + public function setCurrentUser(User $user): void { + $this->user = $user; + } protected static function getModelFactory(string $model): object { diff --git a/src/inc/apiv2/common/AbstractModelAPI.class.php b/src/inc/apiv2/common/AbstractModelAPI.class.php index e06f2e67d..e1c046845 100644 --- a/src/inc/apiv2/common/AbstractModelAPI.class.php +++ b/src/inc/apiv2/common/AbstractModelAPI.class.php @@ -997,8 +997,7 @@ public function getOne(Request $request, Response $response, array $args): Respo return self::getOneResource($this, $object, $request, $response); } - - + /** * API entry point for modification of single object * @param Request $request @@ -1010,18 +1009,13 @@ public function getOne(Request $request, Response $response, array $args): Respo * @throws HttpForbidden * @throws ResourceNotFoundError */ - public function patchOne(Request $request, Response $response, array $args): Response { - $this->preCommon($request); - - // use doFetch to also have additional checks completed - $object = $this->doFetch($args['id']); - - $data = $request->getParsedBody()['data']; + public function patchSingleObject(Request $request, Response $response, mixed $object, mixed $data) { if (!$this->validateResourceRecord($data)) { return errorResponse($response, "No valid resource identifier object was given as data!", 403); } - $aliasedFeatures = $this->getAliasedFeatures(); + $attributes = $data['attributes']; + $aliasedFeatures = $this->getAliasedFeatures(); // Validate incoming data foreach (array_keys($attributes) as $key) { @@ -1037,7 +1031,23 @@ public function patchOne(Request $request, Response $response, array $args): Res // Return updated object $newObject = $this->getFactory()->get($object->getId()); - return self::getOneResource($this, $newObject, $request, $response, 200); + return $this->getOneResource($this, $newObject, $request, $response, 200); + } + + /** + * API entry point for modification of single object + * @param Request $request + * @param Response $response + * @param array $args + */ + public function patchOne(Request $request, Response $response, array $args): Response { + $this->preCommon($request); + + // use doFetch to also have additional checks completed + $object = $this->doFetch($args['id']); + + $data = $request->getParsedBody()['data']; + return $this->patchSingleObject($request, $response, $object, $data); } //follows style of bulk methods: https://github.com/json-api/json-api/blob/9c7a03dbc37f80f6ca81b16d444c960e96dd7a57/extensions/bulk/index.md diff --git a/src/inc/apiv2/helper/currentUser.routes.php b/src/inc/apiv2/helper/currentUser.routes.php new file mode 100644 index 000000000..42ca06b44 --- /dev/null +++ b/src/inc/apiv2/helper/currentUser.routes.php @@ -0,0 +1,87 @@ +preCommon($request); + $user = $this->getCurrentUser(); + $userResource = self::obj2Resource($user); + + $ret = self::createJsonResponse(data: $userResource); + + $body = $response->getBody(); + $body->write($this->ret2json($ret)); + + return $response->withStatus(200) + ->withHeader("Content-Type", 'application/vnd.api+json;'); + } + + /** + * @param $data + * @return object|array|null + */ + public function actionPost($data): object|array|null { + assert(False, "GetCurrentUser has no actionPOST"); + } + + // PATCH endpoint in order to patch attributes of own user, even when user doesnt have permissions to alter users + public function actionPatch(Request $request, Response $response, array $args): Response + { + $data = $request->getParsedBody()['data']; + $this->preCommon($request); + $user = $this->getCurrentUser(); + $userRoute = new UserAPI($this->container); + $userRoute->setCurrentUser($user); + return $userRoute->patchSingleObject($request, $response, $user, $data); + } + + static public function register($app): void { + $baseUri = currentUserHelperAPI::getBaseUri(); + + /* Allow CORS preflight requests */ + $app->options($baseUri, function (Request $request, Response $response): Response { + return $response; + }); + $app->get($baseUri, "CurrentUserHelperAPI:handleGet"); + $app->patch($baseUri, "CurrentUserHelperAPI:actionPatch"); + } + + /** + * getCurrentUser is different because it returns via another function + */ + public static function getResponse(): array|string|null { + return null; + } +} + +currentUserHelperAPI::register($app); From 34ee32d9cc1d32d274cffb1684aff7277328fa3f Mon Sep 17 00:00:00 2001 From: Sein Coray Date: Tue, 26 Aug 2025 09:39:13 +0200 Subject: [PATCH 170/691] moved enhancement in changelog to right place --- doc/changelog.md | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/doc/changelog.md b/doc/changelog.md index 545e0bc20..0a12c97ea 100644 --- a/doc/changelog.md +++ b/doc/changelog.md @@ -1,5 +1,12 @@ # Changelog +## v0.14.5 -> vx.x.x + +**Enhancements** + +- Updated OpenAPI docs to latest API updates + + ## v0.14.4 -> v0.14.5 **Enhancements** @@ -7,7 +14,6 @@ - Include new agent compatible with hashcat 7.0.0+ (note 7.1.0 and 7.1.1 are not compatible due to an issue in hashcat, see https://github.com/hashcat/hashcat/issues/4446) - Added three more indexes in MySQL to improve the task view drastically (Note: these are not created on update due to performance issues, only on new installs) - Added an additional multi-column index in MySQL on the chunk table to increase performance for agents getting tasks (Note: these are not created on update due to performance issues, only on new installs) -- Updated OpenAPI docs to latest API updates ## v0.14.3 -> v0.14.4 From 4418ae98d52c19a61040ffae164270d783a802d8 Mon Sep 17 00:00:00 2001 From: Sein Coray Date: Tue, 26 Aug 2025 09:46:02 +0200 Subject: [PATCH 171/691] fixed accidentally reverted fix on merge --- src/install/hashtopolis.sql | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/install/hashtopolis.sql b/src/install/hashtopolis.sql index b39c5dc74..d46be354c 100644 --- a/src/install/hashtopolis.sql +++ b/src/install/hashtopolis.sql @@ -54,7 +54,7 @@ CREATE TABLE `AgentBinary` ( `updateAvailable` VARCHAR(20) NOT NULL ) ENGINE = InnoDB; -INSERT INTO `AgentBinary` (`agentBinaryId`, `type`, `version`, `operatingSystems`, `filename`, `updateTrack`, `updateAvailable`) VALUES +INSERT INTO `AgentBinary` (`agentBinaryId`, `binaryType`, `version`, `operatingSystems`, `filename`, `updateTrack`, `updateAvailable`) VALUES (1, 'python', '0.7.4', 'Windows, Linux, OS X', 'hashtopolis.zip', 'stable', ''); CREATE TABLE `AgentError` ( From 1b8778828a782ce2d74ec4faa113ad5271c5bf7d Mon Sep 17 00:00:00 2001 From: jessevz Date: Mon, 1 Sep 2025 11:03:50 +0200 Subject: [PATCH 172/691] Added url file upload for new API (#1534) Co-authored-by: jessevz --- src/inc/apiv2/model/files.routes.php | 7 +++++-- src/inc/utils/FileUtils.class.php | 6 ++++-- 2 files changed, 9 insertions(+), 4 deletions(-) diff --git a/src/inc/apiv2/model/files.routes.php b/src/inc/apiv2/model/files.routes.php index 0f88f6f7a..fb36b72ac 100644 --- a/src/inc/apiv2/model/files.routes.php +++ b/src/inc/apiv2/model/files.routes.php @@ -116,9 +116,12 @@ protected function createObject(array $data): int { /* Since we are renaming the file _before_ import the name is temporary changed */ $dummyPost["imfile"] = [$data[File::FILENAME]]; break; + case "url": + $dummyPost["url"] = $data["sourceData"]; + break; default: // TODO: Choice validation are model based checks - throw new HttpError("sourceType value '" . $data["sourceType"] . "' is not supported (choices inline, import"); + throw new HttpError("sourceType value '" . $data["sourceType"] . "' is not supported (choices inline, import, url"); } /* TODO: Hackish view to revert back to required (hardcoded) view */ @@ -144,7 +147,7 @@ protected function createObject(array $data): int { } catch (Exception $e) { /* In case of errors, ensure old state is restored */ - if (($data["sourceType"] == "import") && ($data[File::FILENAME] != $data["sourceData"])) { + if ($doRenameImport) { rename( $this->getImportPath() . $data[File::FILENAME], $this->getImportPath() . $data["sourceData"] diff --git a/src/inc/utils/FileUtils.class.php b/src/inc/utils/FileUtils.class.php index 43623682a..660e6915c 100644 --- a/src/inc/utils/FileUtils.class.php +++ b/src/inc/utils/FileUtils.class.php @@ -206,9 +206,11 @@ public static function add($source, $file, $post, $view) { break; case "url": // from url - $realname = str_replace(" ", "_", htmlentities(basename($post["url"]), ENT_QUOTES, "UTF-8")); + $realname = (isset($post["filename"])) ? $post["filename"] : + str_replace(" ", "_", htmlentities(basename($post["url"]), ENT_QUOTES, "UTF-8")); + if (strlen($realname) == 0) { - throw new HttpError("Empty URL provided!"); + throw new HttpError("Empty URL/name provided!"); } else if ($realname[0] == '.') { $realname[0] = "_"; From c5fd68ff3ac82f1a175fbd90e8e15cd10f443879 Mon Sep 17 00:00:00 2001 From: Sein Coray Date: Mon, 1 Sep 2025 18:41:53 +0200 Subject: [PATCH 173/691] replaced version comparison function with composer/semvar (#1539) * replaced version comparison function with composer/semvar * fixed comparisons * fixed bracket issue * we now have to run composer before we can use anything (this would've happened later anyway) * moving the composer install (which is needed as it's overwritten by the devcontainer docker-compose file) to before checking for connection * added missing shell * updated composer.lock * just copy over the openapi.json file, no markdown conversion * also fix openapi.json on docs.yml --- .github/actions/start-hashtopolis/action.yml | 5 +- .github/workflows/ci.yml | 4 +- .github/workflows/docs-build.yml | 3 +- .github/workflows/docs.yml | 3 +- Dockerfile | 11 +- ci/HashtopolisTestFramework.class.php | 5 +- composer.json | 3 +- composer.lock | 79 ++++++++++- doc/changelog.md | 5 + src/inc/Util.class.php | 39 ++---- src/inc/api/APICheckClientVersion.class.php | 5 +- src/inc/load.php | 2 + src/inc/utils/AgentBinaryUtils.class.php | 8 +- src/inc/utils/CrackerBinaryUtils.class.php | 5 +- src/install/updates/update.php | 8 +- .../updates/update_v0.14.4_v0.14.5.php | 7 + .../updates/update_v0.14.4_v0.14.x.php | 131 ------------------ .../updates/update_v0.2.0-beta_v0.2.0.php | 3 +- src/install/updates/update_v0.2.x_v0.3.0.php | 3 +- src/install/updates/update_v0.3.1_v0.3.2.php | 3 +- src/install/updates/update_v0.3.2_v0.4.0.php | 3 +- src/install/updates/update_v0.8.0_v0.9.0.php | 3 +- 22 files changed, 148 insertions(+), 190 deletions(-) delete mode 100644 src/install/updates/update_v0.14.4_v0.14.x.php diff --git a/.github/actions/start-hashtopolis/action.yml b/.github/actions/start-hashtopolis/action.yml index b5faa2209..95d982955 100644 --- a/.github/actions/start-hashtopolis/action.yml +++ b/.github/actions/start-hashtopolis/action.yml @@ -8,6 +8,9 @@ runs: working-directory: .devcontainer run: docker compose up -d shell: bash + - name: Install composer dependencies packages + run: docker exec hashtopolis-server-dev composer install --working-dir=/var/www/html/ + shell: bash - name: Wait until entrypoint is finished and Hashtopolis is started run: bash .github/scripts/await-hashtopolis-startup.sh - shell: bash \ No newline at end of file + shell: bash diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 512630ccf..cc14f4d88 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -22,8 +22,6 @@ jobs: run: docker exec -u root hashtopolis-server-dev bash -c "chown -R www-data:www-data /var/www/html/src && chmod -R g+w /var/www/html/src" - name: Run test suite run: docker exec hashtopolis-server-dev php /var/www/html/ci/run.php -vmaster - - name: Install composer dependencies packages - run: docker exec hashtopolis-server-dev composer install --working-dir=/var/www/html/ - name: Test with pytest run: docker exec hashtopolis-server-dev pytest /var/www/html/ci/apiv2 - name: Test if pytest is removing all test objects @@ -33,4 +31,4 @@ jobs: run: docker logs hashtopolis-server-dev - name: Show installed files tree in /var/www/html if: ${{ always() }} - run: docker exec hashtopolis-server-dev find /var/www/html \ No newline at end of file + run: docker exec hashtopolis-server-dev find /var/www/html diff --git a/.github/workflows/docs-build.yml b/.github/workflows/docs-build.yml index 3c384247c..da16380cd 100644 --- a/.github/workflows/docs-build.yml +++ b/.github/workflows/docs-build.yml @@ -27,14 +27,13 @@ jobs: sudo apt-get install -y lftp sudo apt-get install nodejs sudo apt-get install npm - sudo npm i openapi-to-md -g - name: Start Hashtopolis server uses: ./.github/actions/start-hashtopolis - name: Download newest apiv2 spec run: | wget http://localhost:8080/api/v2/openapi.json -P /tmp/ cat /tmp/openapi.json - openapi-to-md /tmp/openapi.json ./doc/api/ + mv /tmp/openapi.json ./doc/ - name: Create function level documentation with phpdocumentor run: | wget https://phpdoc.org/phpDocumentor.phar -P /tmp/ diff --git a/.github/workflows/docs.yml b/.github/workflows/docs.yml index 8a00bf9e5..c48bf4ddc 100644 --- a/.github/workflows/docs.yml +++ b/.github/workflows/docs.yml @@ -27,14 +27,13 @@ jobs: sudo apt-get install -y lftp sudo apt-get install nodejs sudo apt-get install npm - sudo npm i openapi-to-md -g - name: Start Hashtopolis server uses: ./.github/actions/start-hashtopolis - name: Download newest apiv2 spec run: | wget http://localhost:8080/api/v2/openapi.json -P /tmp/ cat /tmp/openapi.json - openapi-to-md /tmp/openapi.json ./doc/api/ + mv /tmp/openapi.json ./doc/ - name: Create function level documentation with phpdocumentor run: | wget https://phpdoc.org/phpDocumentor.phar -P /tmp/ diff --git a/Dockerfile b/Dockerfile index d42b8068d..33da5c9b6 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,4 +1,4 @@ -FROM alpine/git as preprocess +FROM alpine/git AS preprocess COPY .gi[t] /.git @@ -6,7 +6,7 @@ RUN cd / && git rev-parse --short HEAD > /HEAD; exit 0 # BASE image # ----BEGIN---- -FROM php:8-apache as hashtopolis-server-base +FROM php:8-apache AS hashtopolis-server-base # Enable possible build args for injecting user commands ARG CONTAINER_USER_CMD_PRE @@ -96,7 +96,7 @@ ENTRYPOINT [ "docker-entrypoint.sh" ] # DEVELOPMENT Image # ----BEGIN---- -FROM hashtopolis-server-base as hashtopolis-server-dev +FROM hashtopolis-server-base AS hashtopolis-server-dev # Setting up development requirements, install xdebug RUN yes | pecl install xdebug-3.4.0beta1 && docker-php-ext-enable xdebug \ @@ -143,10 +143,13 @@ USER vscode # PRODUCTION Image # ----BEGIN---- -FROM hashtopolis-server-base as hashtopolis-server-prod +FROM hashtopolis-server-base AS hashtopolis-server-prod COPY --chown=www-data:www-data ./src/ $HASHTOPOLIS_DOCUMENT_ROOT +# protect install/update directory +RUN echo "Order deny,allow\nDeny from all" > "${HASHTOPOLIS_DOCUMENT_ROOT}/install/.htaccess" + RUN mv "$PHP_INI_DIR/php.ini-production" "$PHP_INI_DIR/php.ini" \ && touch "/usr/local/etc/php/conf.d/custom.ini" \ && echo "memory_limit = 256m" >> /usr/local/etc/php/conf.d/custom.ini \ diff --git a/ci/HashtopolisTestFramework.class.php b/ci/HashtopolisTestFramework.class.php index 89325ff2d..f2a975784 100644 --- a/ci/HashtopolisTestFramework.class.php +++ b/ci/HashtopolisTestFramework.class.php @@ -1,6 +1,7 @@ getMinVersion()) > 0 || $instance->getMinVersion() == 'master')) { + if (!$upgrade && $version != 'master' && (Comparator::lessThan($version, $instance->getMinVersion()) || $instance->getMinVersion() == 'master')) { echo "Ignoring " . $instance->getTestName() . ": minimum " . $instance->getMinVersion() . " required, but testing $version...\n"; return false; } - if ($instance->getMaxVersion() != 'master' && (Util::versionComparison($version, $instance->getMaxVersion()) < 0 || $version == 'master')) { + if ($instance->getMaxVersion() != 'master' && (Comparator::greaterThan($version, $instance->getMaxVersion()) || $version == 'master')) { echo "Ignoring " . $instance->getTestName() . ": maximum " . $instance->getMaxVersion() . " required, but testing $version...\n"; return false; } diff --git a/composer.json b/composer.json index 71e85fb34..9dbf758cf 100644 --- a/composer.json +++ b/composer.json @@ -28,7 +28,8 @@ "slim/psr7": "^1.5", "slim/slim": "^4.10", "tuupola/slim-basic-auth": "^3.3", - "tuupola/slim-jwt-auth": "^3.6" + "tuupola/slim-jwt-auth": "^3.6", + "composer/semver": "^3.4" }, "require-dev": { "jangregor/phpstan-prophecy": "^1.0.0", diff --git a/composer.lock b/composer.lock index 18b6e0c14..5a6444b93 100644 --- a/composer.lock +++ b/composer.lock @@ -4,8 +4,85 @@ "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies", "This file is @generated automatically" ], - "content-hash": "448d813b74a8b1d0a517cf71e22a34a6", + "content-hash": "4e2c70025b277832ee47cab84d7a2ad9", "packages": [ + { + "name": "composer/semver", + "version": "3.4.4", + "source": { + "type": "git", + "url": "https://github.com/composer/semver.git", + "reference": "198166618906cb2de69b95d7d47e5fa8aa1b2b95" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/composer/semver/zipball/198166618906cb2de69b95d7d47e5fa8aa1b2b95", + "reference": "198166618906cb2de69b95d7d47e5fa8aa1b2b95", + "shasum": "" + }, + "require": { + "php": "^5.3.2 || ^7.0 || ^8.0" + }, + "require-dev": { + "phpstan/phpstan": "^1.11", + "symfony/phpunit-bridge": "^3 || ^7" + }, + "type": "library", + "extra": { + "branch-alias": { + "dev-main": "3.x-dev" + } + }, + "autoload": { + "psr-4": { + "Composer\\Semver\\": "src" + } + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "authors": [ + { + "name": "Nils Adermann", + "email": "naderman@naderman.de", + "homepage": "http://www.naderman.de" + }, + { + "name": "Jordi Boggiano", + "email": "j.boggiano@seld.be", + "homepage": "http://seld.be" + }, + { + "name": "Rob Bast", + "email": "rob.bast@gmail.com", + "homepage": "http://robbast.nl" + } + ], + "description": "Semver library that offers utilities, version constraint parsing and validation.", + "keywords": [ + "semantic", + "semver", + "validation", + "versioning" + ], + "support": { + "irc": "ircs://irc.libera.chat:6697/composer", + "issues": "https://github.com/composer/semver/issues", + "source": "https://github.com/composer/semver/tree/3.4.4" + }, + "funding": [ + { + "url": "https://packagist.com", + "type": "custom" + }, + { + "url": "https://github.com/composer", + "type": "github" + } + ], + "time": "2025-08-20T19:15:30+00:00" + }, { "name": "crell/api-problem", "version": "3.7.0", diff --git a/doc/changelog.md b/doc/changelog.md index 0a12c97ea..70187f233 100644 --- a/doc/changelog.md +++ b/doc/changelog.md @@ -5,6 +5,11 @@ **Enhancements** - Updated OpenAPI docs to latest API updates +- Improved version comparison to avoid update script issues + +**Bugfixes** + +- Fixed missing .htaccess to avoid access to install directory on docker setups ## v0.14.4 -> v0.14.5 diff --git a/src/inc/Util.class.php b/src/inc/Util.class.php index 8168328ee..2d9982352 100755 --- a/src/inc/Util.class.php +++ b/src/inc/Util.class.php @@ -27,6 +27,7 @@ use DBA\FileDelete; use DBA\Factory; use DBA\Speed; +use Composer\Semver\Comparator; /** * @@ -198,7 +199,7 @@ public static function checkAgentVersion($type, $version, $silent = false) { } $binary = Factory::getAgentBinaryFactory()->filter([Factory::FILTER => $qF], true); if ($binary != null) { - if (Util::versionComparison($binary->getVersion(), $version) == 1) { + if (Comparator::lessThan($binary->getVersion(), $version)) { if (!$silent) { echo "update $type version... "; } @@ -941,34 +942,12 @@ public static function getStaticArray($val, $id) { * @return int */ public static function versionComparisonBinary($binary1, $binary2) { - return Util::versionComparison($binary1->getVersion(), $binary2->getVersion()); - } - - /** - * @param string $version1 - * @param string $version2 - * @return int 1 if version2 is newer, 0 if equal and -1 if version1 is newer - */ - public static function versionComparison($version1, $version2) { - $version1 = explode(".", $version1); - $version2 = explode(".", $version2); - - for ($i = 0; $i < sizeof($version1) && $i < sizeof($version2); $i++) { - $num1 = (int)$version1[$i]; - $num2 = (int)$version2[$i]; - if ($num1 > $num2) { - return -1; - } - else if ($num1 < $num2) { - return 1; - } + if (Comparator::greaterThan($binary1->getVersion(), $binary2->getVersion())){ + return 1; } - if (sizeof($version1) > sizeof($version2)) { + else if (Comparator::lessThan($binary1->getVersion(), $binary2->getVersion())){ return -1; } - else if (sizeof($version1) < sizeof($version2)) { - return 1; - } return 0; } @@ -984,7 +963,13 @@ public static function updateVersionComparison($versionString1, $versionString2) $version1 = substr($versionString1, 8, strpos($versionString1, "_", 7) - 8); $version2 = substr($versionString2, 8, strpos($versionString2, "_", 7) - 8); - return Util::versionComparison($version2, $version1); + if(Comparator::greaterThan($version2, $version1)){ + return 1; + } + else if(Comparator::lessThan($version2, $version1)){ + return -1; + } + return 0; } /** diff --git a/src/inc/api/APICheckClientVersion.class.php b/src/inc/api/APICheckClientVersion.class.php index 64547fd0e..53d699b31 100644 --- a/src/inc/api/APICheckClientVersion.class.php +++ b/src/inc/api/APICheckClientVersion.class.php @@ -3,6 +3,7 @@ use DBA\AgentBinary; use DBA\QueryFilter; use DBA\Factory; +use Composer\Semver\Comparator; class APICheckClientVersion extends APIBasic { public function execute($QUERY = array()) { @@ -23,7 +24,7 @@ public function execute($QUERY = array()) { } $this->updateAgent(PActions::CHECK_CLIENT_VERSION); - if (Util::versionComparison($result->getVersion(), $version) == -1) { + if (Comparator::lessThan($result->getVersion(), $version)) { DServerLog::log(DServerLog::DEBUG, "Agent " . $this->agent->getId() . " got notified about client update"); $this->sendResponse(array( PResponseClientUpdate::ACTION => PActions::CHECK_CLIENT_VERSION, @@ -42,4 +43,4 @@ public function execute($QUERY = array()) { ); } } -} \ No newline at end of file +} diff --git a/src/inc/load.php b/src/inc/load.php index 70e1a61f2..23e0ceff7 100755 --- a/src/inc/load.php +++ b/src/inc/load.php @@ -12,6 +12,8 @@ session_start(); +require_once(dirname(__FILE__) . "/../../vendor/autoload.php"); + require_once(dirname(__FILE__) . "/info.php"); include(dirname(__FILE__) . "/confv2.php"); diff --git a/src/inc/utils/AgentBinaryUtils.class.php b/src/inc/utils/AgentBinaryUtils.class.php index c7c9d265e..d9325c9ad 100644 --- a/src/inc/utils/AgentBinaryUtils.class.php +++ b/src/inc/utils/AgentBinaryUtils.class.php @@ -4,8 +4,10 @@ use DBA\QueryFilter; use DBA\User; use DBA\Factory; +use Composer\Semver\Comparator; + +require_once(__DIR__ . "/../apiv2/common/ErrorHandler.class.php"); -require_once __DIR__ . '/../apiv2/common/ErrorHandler.class.php'; class AgentBinaryUtils { /** * @param string $type @@ -226,9 +228,9 @@ public static function getAgentUpdate($agent, $track) { if (strlen($latest) == 0) { throw new HTException("Failed to retrieve latest version!"); } - if (Util::versionComparison($agent->getVersion(), $latest) > 0) { + if (Comparator::lessThan($agent->getVersion(), $latest)) { return $latest; } return false; } -} \ No newline at end of file +} diff --git a/src/inc/utils/CrackerBinaryUtils.class.php b/src/inc/utils/CrackerBinaryUtils.class.php index 5634c565b..97a4da603 100644 --- a/src/inc/utils/CrackerBinaryUtils.class.php +++ b/src/inc/utils/CrackerBinaryUtils.class.php @@ -3,6 +3,7 @@ use DBA\CrackerBinary; use DBA\QueryFilter; use DBA\Factory; +use Composer\Semver\Comparator; class CrackerBinaryUtils { /** @@ -16,7 +17,7 @@ public static function getNewestVersion($crackerBinaryTypeId) { /** @var $newest CrackerBinary */ $newest = null; foreach ($binaries as $binary) { - if ($newest == null || Util::versionComparison($binary->getVersion(), $newest->getVersion()) < 0) { + if ($newest == null || Comparator::greaterThan($binary->getVersion(), $newest->getVersion())) { $newest = $binary; } } @@ -25,4 +26,4 @@ public static function getNewestVersion($crackerBinaryTypeId) { } return $newest; } -} \ No newline at end of file +} diff --git a/src/install/updates/update.php b/src/install/updates/update.php index 59f9bbad0..df99379b1 100644 --- a/src/install/updates/update.php +++ b/src/install/updates/update.php @@ -3,6 +3,7 @@ use DBA\LikeFilterInsensitive; use DBA\StoredValue; use DBA\Factory; +use Composer\Semver\Comparator; /* * This script should automatically determine the current base function and go through @@ -46,10 +47,9 @@ usort($allFiles, array("Util", "updateVersionComparison")); foreach ($allFiles as $file) { if (Util::startsWith($file, "update_v")) { - // check version - $minor = Util::getMinorVersion(substr($file, 8, strpos($file, "_", 7) - 8)); - if (Util::versionComparison($minor, Util::getMinorVersion($storedVersion->getVal())) < 1) { - // script needs to be checked + $startVersion = substr($file, 8, strpos($file, "_", 7) - 8); + if (Comparator::greaterThanOrEqualTo($startVersion, $storedVersion->getVal())) { + // script needs to be executed include(dirname(__FILE__) . "/" . $file); } } diff --git a/src/install/updates/update_v0.14.4_v0.14.5.php b/src/install/updates/update_v0.14.4_v0.14.5.php index ff3347ba9..b3aaac8bd 100644 --- a/src/install/updates/update_v0.14.4_v0.14.5.php +++ b/src/install/updates/update_v0.14.4_v0.14.5.php @@ -10,6 +10,13 @@ $EXECUTED["v0.14.4_agentBinaries"] = true; } +if (!isset($PRESENT["v0.14.4_update_agent_binary"])) { + if (Util::databaseColumnExists("AgentBinary", "type")) { + Factory::getAgentFactory()->getDB()->query("ALTER TABLE `AgentBinary` RENAME COLUMN `type` to `binaryType`;"); + $EXECUTED["v0.14.4_update_agent_binary"] = true; + } +} + if (!isset($PRESENT["v0.14.4_update_hashtypes"])){ $hashTypes = [ new HashType( 1310, "sha224($pass.$salt)", 1, 0), diff --git a/src/install/updates/update_v0.14.4_v0.14.x.php b/src/install/updates/update_v0.14.4_v0.14.x.php deleted file mode 100644 index 46adb0093..000000000 --- a/src/install/updates/update_v0.14.4_v0.14.x.php +++ /dev/null @@ -1,131 +0,0 @@ -getDB()->query("ALTER TABLE `AgentBinary` RENAME COLUMN `type` to `binaryType`;"); - $EXECUTED["v0.14.x_update_agent_binary"] = true; - } -} - -if (!isset($PRESENT["v0.14.x_update_hashtypes"])){ - $hashTypes = [ - new HashType( 1310, "sha224($pass.$salt)", 1, 0), - new HashType( 1320, "sha224($salt.$pass)", 1, 0), - new HashType( 2630, "md5(md5($pass.$salt))", 1, 0), - new HashType( 3610, "md5(md5(md5($pass)).$salt)", 1, 0), - new HashType( 3730, "md5($salt1.strtoupper(md5($salt2.$pass)))", 0, 0), - new HashType( 4420, "md5(sha1($pass.$salt))", 1, 0), - new HashType( 4430, "md5(sha1($salt.$pass))", 1, 0), - new HashType( 5720, "Cisco-ISE Hashed Password (SHA256)", 0, 0), - new HashType( 6050, "HMAC-RIPEMD160 (key = $pass)", 1, 0), - new HashType( 6060, "HMAC-RIPEMD160 (key = $salt)", 1, 0), - new HashType( 7350, "IPMI2 RAKP HMAC-MD5", 0, 0), - new HashType( 8501, "AS/400 DES", 0, 0), - new HashType( 10510, "PDF 1.3 - 1.6 (Acrobat 4 - 8) w/ RC4-40", 0, 1), - new HashType( 12150, "Apache Shiro 1 SHA-512", 0, 1), - new HashType( 14200, "RACF KDFAES", 0, 1), - new HashType( 16501, "Perl Mojolicious session cookie (HMAC-SHA256, >= v9.19)", 0, 0), - new HashType( 17020, "GPG (AES-128/AES-256 (SHA-512($pass)))", 0, 1), - new HashType( 17030, "GPG (AES-128/AES-256 (SHA-256($pass)))", 0, 1), - new HashType( 17040, "GPG (CAST5 (SHA-1($pass)))", 0, 1), - new HashType( 19210, "QNX 7 /etc/shadow (SHA512)", 0, 1), - new HashType( 20712, "RSA Security Analytics / NetWitness (sha256)", 1, 0), - new HashType( 20730, "sha256(sha256($pass.$salt))", 1, 0), - new HashType( 21310, "md5($salt1.sha1($salt2.$pass))", 1, 0), - new HashType( 21900, "md5(md5(md5($pass.$salt1)).$salt2)", 0, 0), - new HashType( 22800, "Simpla CMS - md5($salt.$pass.md5($pass))", 1, 0), - new HashType( 24000, "BestCrypt v4 Volume Encryption", 0, 1), - new HashType( 26610, "MetaMask Wallet (short hash, plaintext check)", 0, 1), - new HashType( 29800, "Bisq .wallet (scrypt)", 0, 1), - new HashType( 29910, "ENCsecurity Datavault (PBKDF2/no keychain)", 0, 1), - new HashType( 29920, "ENCsecurity Datavault (PBKDF2/keychain)", 0, 1), - new HashType( 29930, "ENCsecurity Datavault (MD5/no keychain)", 0, 1), - new HashType( 29940, "ENCsecurity Datavault (MD5/keychain)", 0, 1), - new HashType( 30420, "DANE RFC7929/RFC8162 SHA2-256", 0, 0), - new HashType( 30500, "md5(md5($salt).md5(md5($pass)))", 1, 0), - new HashType( 30600, "bcrypt(sha256($pass))", 0, 1), - new HashType( 30601, "bcrypt(HMAC-SHA256($pass))", 0, 1), - new HashType( 30700, "Anope IRC Services (enc_sha256)", 0, 0), - new HashType( 30901, "Bitcoin raw private key (P2PKH), compressed", 0, 0), - new HashType( 30902, "Bitcoin raw private key (P2PKH), uncompressed", 0, 0), - new HashType( 30903, "Bitcoin raw private key (P2WPKH, Bech32), compressed", 0, 0), - new HashType( 30904, "Bitcoin raw private key (P2WPKH, Bech32), uncompressed", 0, 0), - new HashType( 30905, "Bitcoin raw private key (P2SH(P2WPKH)), compressed", 0, 0), - new HashType( 30906, "Bitcoin raw private key (P2SH(P2WPKH)), uncompressed", 0, 0), - new HashType( 31000, "BLAKE2s-256", 0, 0), - new HashType( 31100, "ShangMi 3 (SM3)", 0, 0), - new HashType( 31200, "Veeam VBK", 0, 1), - new HashType( 31300, "MS SNTP", 0, 0), - new HashType( 31400, "SecureCRT MasterPassphrase v2", 0, 0), - new HashType( 31500, "Domain Cached Credentials (DCC), MS Cache (NT)", 1, 1), - new HashType( 31600, "Domain Cached Credentials 2 (DCC2), MS Cache 2, (NT)", 0, 1), - new HashType( 31700, "md5(md5(md5($pass).$salt1).$salt2)", 1, 0), - new HashType( 31800, "1Password, mobilekeychain (1Password 8)", 0, 1), - new HashType( 31900, "MetaMask Mobile Wallet", 0, 1), - new HashType( 32000, "NetIQ SSPR (MD5)", 0, 1), - new HashType( 32010, "NetIQ SSPR (SHA1)", 0, 1), - new HashType( 32020, "NetIQ SSPR (SHA-1 with Salt)", 0, 1), - new HashType( 32030, "NetIQ SSPR (SHA-256 with Salt)", 0, 1), - new HashType( 32031, "Adobe AEM (SSPR, SHA-256 with Salt)", 0, 1), - new HashType( 32040, "NetIQ SSPR (SHA-512 with Salt)", 0, 1), - new HashType( 32041, "Adobe AEM (SSPR, SHA-512 with Salt)", 0, 1), - new HashType( 32050, "NetIQ SSPR (PBKDF2WithHmacSHA1)", 0, 1), - new HashType( 32060, "NetIQ SSPR (PBKDF2WithHmacSHA256)", 0, 1), - new HashType( 32070, "NetIQ SSPR (PBKDF2WithHmacSHA512)", 0, 1), - new HashType( 32100, "Kerberos 5, etype 17, AS-REP", 0, 1), - new HashType( 32200, "Kerberos 5, etype 18, AS-REP", 0, 1), - new HashType( 32300, "Empire CMS (Admin password)", 1, 0), - new HashType( 32410, "sha512(sha512($pass).$salt)", 1, 0), - new HashType( 32420, "sha512(sha512_bin($pass).$salt)", 1, 0), - new HashType( 32500, "Dogechain.info Wallet", 0, 1), - new HashType( 32600, "CubeCart (whirlpool($salt.$pass.$salt))", 1, 0), - new HashType( 32700, "Kremlin Encrypt 3.0 w/NewDES", 0, 1), - new HashType( 32800, "md5(sha1(md5($pass)))", 0, 0), - new HashType( 32900, "PBKDF1-SHA1", 1, 1), - new HashType( 33000, "md5($salt1.$pass.$salt2)", 1, 0), - new HashType( 33100, "md5($salt.md5($pass).$salt)", 1, 0), - new HashType( 33300, "HMAC-BLAKE2S (key = $pass)", 1, 0), - new HashType( 33400, "mega.nz password-protected link (PBKDF2-HMAC-SHA512)", 0, 1), - new HashType( 33500, "RC4 40-bit DropN", 0, 0), - new HashType( 33501, "RC4 72-bit DropN", 0, 0), - new HashType( 33502, "RC4 104-bit DropN", 0, 0), - new HashType( 33600, "RIPEMD-320", 0, 0), - new HashType( 33650, "HMAC-RIPEMD320 (key = $pass)", 1, 0), - new HashType( 33660, "HMAC-RIPEMD320 (key = $salt)", 1, 0), - new HashType( 33700, "Microsoft Online Account (PBKDF2-HMAC-SHA256 + AES256)", 0, 1), - new HashType( 33800, "WBB4 (Woltlab Burning Board) [bcrypt(bcrypt($pass))]", 0, 1), - new HashType( 33900, "Citrix NetScaler (PBKDF2-HMAC-SHA256)", 0, 1), - new HashType( 34000, "Argon2", 0, 1), - new HashType( 34100, "LUKS v2 argon2 + SHA-256 + AES", 0, 1), - new HashType( 34200, "MurmurHash64A", 1, 0), - new HashType( 34201, "MurmurHash64A (zero seed)", 0, 0), - new HashType( 34211, "MurmurHash64A truncated (zero seed)", 0, 0), - new HashType( 34300, "KeePass (KDBX v4)", 0, 1), - new HashType( 34400, "sha224(sha224($pass))", 0, 0), - new HashType( 34500, "sha224(sha1($pass))", 0, 0), - new HashType( 34600, "MD6 (256)", 0, 0), - new HashType( 34700, "Blockchain, My Wallet, Legacy Wallets", 0, 0), - new HashType( 34800, "BLAKE2b-256", 0, 0), - new HashType( 34810, "BLAKE2b-256($pass.$salt)", 1, 0), - new HashType( 34820, "BLAKE2b-256($salt.$pass)", 1, 0), - new HashType( 35000, "SAP CODVN H (PWDSALTEDHASH) isSHA512", 1, 1), - new HashType( 35100, "sm3crypt $sm3$, SM3 (Unix)", 1, 1), - new HashType( 35200, "AS/400 SSHA1", 1, 0), - new HashType( 70000, "Argon2id [Bridged: reference implementation + tunings]", 0, 1), - new HashType( 70100, "scrypt [Bridged: Scrypt-Jane SMix]", 0, 1), - new HashType( 70200, "scrypt [Bridged: Scrypt-Yescrypt]", 0, 1), - new HashType( 72000, "Generic Hash [Bridged: Python Interpreter free-threading]", 0, 1), - new HashType( 73000, "Generic Hash [Bridged: Python Interpreter with GIL]", 0, 1), - ]; - foreach ($hashTypes as $hashtype) { - $check = Factory::getHashTypeFactory()->get($hashtype->getId()); - if ($check === null) { - Factory::getHashTypeFactory()->save($hashtype); - } - } - $EXECUTED["v0.14.x_update_hashtypes"] = true; -} -?> \ No newline at end of file diff --git a/src/install/updates/update_v0.2.0-beta_v0.2.0.php b/src/install/updates/update_v0.2.0-beta_v0.2.0.php index 5e1fc79a7..9f055dbee 100644 --- a/src/install/updates/update_v0.2.0-beta_v0.2.0.php +++ b/src/install/updates/update_v0.2.0-beta_v0.2.0.php @@ -3,6 +3,7 @@ use DBA\AgentBinary; use DBA\QueryFilter; use DBA\Factory; +use Composer\Semver\Comparator; require_once(dirname(__FILE__) . "/../../inc/load.php"); @@ -20,7 +21,7 @@ $qF = new QueryFilter("type", "csharp", "="); $binary = Factory::getAgentBinaryFactory()->filter([Factory::FILTER => $qF], true); if ($binary != null) { - if (Util::versionComparison($binary->getVersion(), "0.40") == 1) { + if (Comparator::lessThan($binary->getVersion(), "0.40")) { echo "update version... "; $binary->setVersion("0.40"); Factory::getAgentBinaryFactory()->update($binary); diff --git a/src/install/updates/update_v0.2.x_v0.3.0.php b/src/install/updates/update_v0.2.x_v0.3.0.php index 472c858d0..4a2b50a30 100644 --- a/src/install/updates/update_v0.2.x_v0.3.0.php +++ b/src/install/updates/update_v0.2.x_v0.3.0.php @@ -4,6 +4,7 @@ use DBA\Config; use DBA\QueryFilter; use DBA\Factory; +use Composer\Semver\Comparator; require_once(dirname(__FILE__) . "/../../inc/load.php"); @@ -40,7 +41,7 @@ $qF = new QueryFilter("type", "csharp", "="); $binary = Factory::getAgentBinaryFactory()->filter([Factory::FILTER => $qF], true); if ($binary != null) { - if (Util::versionComparison($binary->getVersion(), "0.43") == 1) { + if (Comparator::lessThan($binary->getVersion(), "0.43")) { echo "update version... "; $binary->setVersion("0.43"); Factory::getAgentBinaryFactory()->update($binary); diff --git a/src/install/updates/update_v0.3.1_v0.3.2.php b/src/install/updates/update_v0.3.1_v0.3.2.php index 9a6db7959..438b7a765 100644 --- a/src/install/updates/update_v0.3.1_v0.3.2.php +++ b/src/install/updates/update_v0.3.1_v0.3.2.php @@ -3,6 +3,7 @@ use DBA\AgentBinary; use DBA\QueryFilter; use DBA\Factory; +use Composer\Semver\Comparator; require_once(dirname(__FILE__) . "/../../inc/load.php"); @@ -16,7 +17,7 @@ $qF = new QueryFilter("type", "csharp", "="); $binary = Factory::getAgentBinaryFactory()->filter([Factory::FILTER => $qF], true); if ($binary != null) { - if (Util::versionComparison($binary->getVersion(), "0.43.13") == 1) { + if (Comparator::lessThan($binary->getVersion(), "0.43.13")) { echo "update version... "; $binary->setVersion("0.43.13"); Factory::getAgentBinaryFactory()->update($binary); diff --git a/src/install/updates/update_v0.3.2_v0.4.0.php b/src/install/updates/update_v0.3.2_v0.4.0.php index 5b9330489..bc7c924ee 100644 --- a/src/install/updates/update_v0.3.2_v0.4.0.php +++ b/src/install/updates/update_v0.3.2_v0.4.0.php @@ -3,6 +3,7 @@ use DBA\AgentBinary; use DBA\QueryFilter; use DBA\Factory; +use Composer\Semver\Comparator; require_once(dirname(__FILE__) . "/../../inc/load.php"); @@ -89,7 +90,7 @@ $qF = new QueryFilter("type", "csharp", "="); $binary = Factory::getAgentBinaryFactory()->filter([Factory::FILTER => $qF], true); if ($binary != null) { - if (Util::versionComparison($binary->getVersion(), "0.46.2") == 1) { + if (Comparator::lessThan($binary->getVersion(), "0.46.2")) { echo "update version... "; $binary->setVersion("0.46.2"); Factory::getAgentBinaryFactory()->update($binary); diff --git a/src/install/updates/update_v0.8.0_v0.9.0.php b/src/install/updates/update_v0.8.0_v0.9.0.php index fbdb8d11b..2ad73117e 100644 --- a/src/install/updates/update_v0.8.0_v0.9.0.php +++ b/src/install/updates/update_v0.8.0_v0.9.0.php @@ -6,6 +6,7 @@ use DBA\QueryFilter; use DBA\HashType; use DBA\AgentBinary; +use Composer\Semver\Comparator; if (!isset($TEST)) { /** @noinspection PhpIncludeInspection */ @@ -31,7 +32,7 @@ $qF = new QueryFilter("type", "python", "="); $binary = Factory::getAgentBinaryFactory()->filter([Factory::FILTER => $qF], true); if ($binary != null) { - if (Util::versionComparison($binary->getVersion(), "0.3.0") == 1) { + if (Comparator::lessThan($binary->getVersion(), "0.3.0")) { echo "update python version... "; $binary->setVersion("0.3.0"); Factory::getAgentBinaryFactory()->update($binary); From 4be8ffe516d1a37d36b3f0ad2c16030b37304d6c Mon Sep 17 00:00:00 2001 From: Sein Coray Date: Tue, 2 Sep 2025 12:59:34 +0200 Subject: [PATCH 174/691] Docker image size reduced (#1540) * try to reduce the image size * revert moving of composer install as it's later missing and we only would save 2MB * fixed install command --- Dockerfile | 26 ++++++++++---------------- 1 file changed, 10 insertions(+), 16 deletions(-) diff --git a/Dockerfile b/Dockerfile index 33da5c9b6..9333ebf4c 100644 --- a/Dockerfile +++ b/Dockerfile @@ -40,17 +40,21 @@ RUN apt-get update \ && apt-get -y install mariadb-client \ && apt-get -y install libpng-dev \ && apt-get -y install ssmtp \ -\ + \ # Install extensions (optional) && docker-php-ext-install pdo_mysql gd \ -\ - # Install composer + \ + # Install Composer && curl -sS https://getcomposer.org/installer | php \ && mv composer.phar /usr/local/bin/composer \ # Enable URL rewriting using .htaccess && a2enmod rewrite \ # Enable headers - && a2enmod headers + && a2enmod headers \ + # Clean Up + && apt-get autoremove -y \ + && apt-get clean -y \ + && rm -rf /var/lib/apt/lists/* RUN sed -i 's/KeepAliveTimeout 5/KeepAliveTimeout 10/' /etc/apache2/apache2.conf RUN echo "ServerTokens Prod" >> /etc/apache2/apache2.conf \ @@ -80,6 +84,7 @@ RUN mkdir -p ${HASHTOPOLIS_DOCUMENT_ROOT} \ COPY --from=preprocess /HEA[D] ${HASHTOPOLIS_DOCUMENT_ROOT}/../.git/ +# Install composer COPY composer.json ${HASHTOPOLIS_DOCUMENT_ROOT}/../ RUN composer install --working-dir=${HASHTOPOLIS_DOCUMENT_ROOT}/.. @@ -122,12 +127,6 @@ RUN apt-get update \ #TODO: Should source from ./ci/apiv2/requirements.txt RUN pip3 install click click_log confidence pytest tuspy --break-system-packages -# Clean up -RUN apt-get autoremove -y \ - && apt-get clean -y \ - && rm -rf /var/lib/apt/lists/* - - # Adding VSCode user and fixing permissions RUN groupadd vscode && useradd -rm -d /var/www -s /bin/bash -g vscode -G www-data -u 1001 vscode \ && chown -R vscode:www-data /var/www \ @@ -154,12 +153,7 @@ RUN mv "$PHP_INI_DIR/php.ini-production" "$PHP_INI_DIR/php.ini" \ && touch "/usr/local/etc/php/conf.d/custom.ini" \ && echo "memory_limit = 256m" >> /usr/local/etc/php/conf.d/custom.ini \ && echo "upload_max_filesize = 256m" >> /usr/local/etc/php/conf.d/custom.ini \ - && echo "max_execution_time = 60" >> /usr/local/etc/php/conf.d/custom.ini \ - \ - # Clean up - && apt-get autoremove -y \ - && apt-get clean -y \ - && rm -rf /var/lib/apt/lists/* + && echo "max_execution_time = 60" >> /usr/local/etc/php/conf.d/custom.ini USER www-data # ----END---- From 8176f9d0fd81e4062ebd93d80f6843698dc43683 Mon Sep 17 00:00:00 2001 From: jessevz Date: Tue, 2 Sep 2025 13:48:51 +0200 Subject: [PATCH 175/691] Added helper to retrieve more details for task --- .../apiv2/helper/taskExtraDetails.routes.php | 110 ++++++++++++++++++ 1 file changed, 110 insertions(+) create mode 100644 src/inc/apiv2/helper/taskExtraDetails.routes.php diff --git a/src/inc/apiv2/helper/taskExtraDetails.routes.php b/src/inc/apiv2/helper/taskExtraDetails.routes.php new file mode 100644 index 000000000..1b13fc080 --- /dev/null +++ b/src/inc/apiv2/helper/taskExtraDetails.routes.php @@ -0,0 +1,110 @@ +preCommon($request); + + $taskId = $request->getQueryParams()['task']; + if ($taskId == null) { + throw new HttpErrorException("No task query param has been provided"); + } + $taskId = intval($taskId); + if ($taskId === 0) { + throw new HttpErrorException("No valid integer provided as task"); + } + + $qF = new QueryFilter(Chunk::TASK_ID, $taskId, "="); + $chunks = Factory::getChunkFactory()->filter([Factory::FILTER => $qF]); + $currentSpeed = 0; + $cProgress = 0; + foreach ($chunks as $chunk) { + $cProgress += $chunk->getCheckpoint() - $chunk->getSkip(); + if (time() - max($chunk->getSolveTime(), $chunk->getDispatchTime()) < SConfig::getInstance()->getVal(DConfig::CHUNK_TIMEOUT) && $chunk->getProgress() < 10000) { + $currentSpeed += $chunk->getSpeed(); + } + + $timeChunks = $chunks; + usort($timeChunks, "Util::compareChunksTime"); + $timeSpent = 0; + $current = 0; + foreach ($timeChunks as $c) { + if ($c->getDispatchTime() > $current) { + $timeSpent += $c->getSolveTime() - $c->getDispatchTime(); + $current = $c->getSolveTime(); + } + else if ($c->getSolveTime() > $current) { + $timeSpent += $c->getSolveTime() - $current; + $current = $c->getSolveTime(); + } + } + $task = Factory::getTaskFactory()->get($taskId); + $estimatedTime = round($timeSpent / ($cProgress / $task->getKeyspace()) - $timeSpent); + // $body = $response->getBody(); + // $body->write($this->ret2json($ret)); + $responseObject = [ + "estimatedTime" => $estimatedTime, + "timeSpent" => $timeSpent, + "currentSpeed" => Util::nicenum($currentSpeed, 10000, 1000) . "H/s", + ]; + + return self::getMetaResponse($responseObject, $request, $response); + // return $response->withStatus(200) + // ->withHeader("Content-Type", 'application/vnd.api+json;'); + // } + } + } + + #[NoReturn] public function actionPost($data): object|array|null { + assert(False, "TaskExtraDetails has no POST"); + } + + static public function register($app): void { + $baseUri = TaskExtraDetailsHelper::getBaseUri(); + + /* Allow CORS preflight requests */ + $app->options($baseUri, function (Request $request, Response $response): Response { + return $response; + }); + $app->get($baseUri, "TaskExtraDetailsHelper:handleGet"); + } + + /** + * getAccessGroups is different because it returns via another function + */ + public static function getResponse(): array|string|null { + return null; + } +} + +TaskExtraDetailsHelper::register($app); From 52dc033c939dad921ea1b5a47d2a3aac4c56c504 Mon Sep 17 00:00:00 2001 From: jessevz Date: Tue, 2 Sep 2025 18:22:37 +0200 Subject: [PATCH 176/691] Fixed missing import --- src/api/v2/index.php | 1 + src/inc/apiv2/helper/taskExtraDetails.routes.php | 8 ++------ 2 files changed, 3 insertions(+), 6 deletions(-) diff --git a/src/api/v2/index.php b/src/api/v2/index.php index 9aa076ca1..f5b851bbb 100644 --- a/src/api/v2/index.php +++ b/src/api/v2/index.php @@ -315,6 +315,7 @@ public static function addCORSheaders(Request $request, $response) { require __DIR__ . "/../../inc/apiv2/helper/resetChunk.routes.php"; require __DIR__ . "/../../inc/apiv2/helper/resetUserPassword.routes.php"; require __DIR__ . "/../../inc/apiv2/helper/setUserPassword.routes.php"; +require __DIR__ . "/../../inc/apiv2/helper/taskExtraDetails.routes.php"; require __DIR__ . "/../../inc/apiv2/helper/unassignAgent.routes.php"; diff --git a/src/inc/apiv2/helper/taskExtraDetails.routes.php b/src/inc/apiv2/helper/taskExtraDetails.routes.php index 1b13fc080..40de3e4fd 100644 --- a/src/inc/apiv2/helper/taskExtraDetails.routes.php +++ b/src/inc/apiv2/helper/taskExtraDetails.routes.php @@ -70,18 +70,14 @@ public function handleGet(Request $request, Response $response): Response { } $task = Factory::getTaskFactory()->get($taskId); $estimatedTime = round($timeSpent / ($cProgress / $task->getKeyspace()) - $timeSpent); - // $body = $response->getBody(); - // $body->write($this->ret2json($ret)); + $currentSpeed = ($currentSpeed > 0) ? Util::nicenum($currentSpeed, 10000, 1000) . "H/s" : 0; $responseObject = [ "estimatedTime" => $estimatedTime, "timeSpent" => $timeSpent, - "currentSpeed" => Util::nicenum($currentSpeed, 10000, 1000) . "H/s", + "currentSpeed" => $currentSpeed, ]; return self::getMetaResponse($responseObject, $request, $response); - // return $response->withStatus(200) - // ->withHeader("Content-Type", 'application/vnd.api+json;'); - // } } } From db26c0ab5d92dda6c9403673bdeaadc3dcfa25aa Mon Sep 17 00:00:00 2001 From: jessevz Date: Wed, 3 Sep 2025 14:51:17 +0200 Subject: [PATCH 177/691] Fixed a reference error by incorrect capitalisation --- src/inc/apiv2/common/openAPISchema.routes.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/inc/apiv2/common/openAPISchema.routes.php b/src/inc/apiv2/common/openAPISchema.routes.php index fc0fb3146..8d7f03970 100644 --- a/src/inc/apiv2/common/openAPISchema.routes.php +++ b/src/inc/apiv2/common/openAPISchema.routes.php @@ -495,7 +495,7 @@ function makeDescription($isRelation, $method, $singleObject): string { $ref = null; if (is_array($request_response)) { $responseProperties = mapToProperties($request_response); - $components[$name . "response"] = $responseProperties; + $components[$name . "Response"] = $responseProperties; $ref = "#/components/schemas/" . $name . "Response"; } else if (is_string($request_response)) { From e76d2c599fccda63f628c758f0c05cb0d9e9bc65 Mon Sep 17 00:00:00 2001 From: jessevz Date: Wed, 3 Sep 2025 17:10:01 +0200 Subject: [PATCH 178/691] Added more validation for assigning agents --- src/inc/utils/AgentUtils.class.php | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/src/inc/utils/AgentUtils.class.php b/src/inc/utils/AgentUtils.class.php index 621df9638..a06e27c6d 100644 --- a/src/inc/utils/AgentUtils.class.php +++ b/src/inc/utils/AgentUtils.class.php @@ -405,13 +405,20 @@ public static function assign(int $agentId, int $taskId, User $user): ?Assignmen $qF = new QueryFilter(Agent::AGENT_ID, $agent->getId(), "="); $assignments = Factory::getAssignmentFactory()->filter([Factory::FILTER => $qF]); + if ($assignments[0]->getTaskId() === $taskId) { + throw new HttpError("Agent is already assigned to this task"); + } $benchmark = 0; if (sizeof($assignments) > 0) { for ($i = 1; $i < sizeof($assignments); $i++) { // clean up if required Factory::getAssignmentFactory()->delete($assignments[$i]); } - Factory::getAssignmentFactory()->mset($assignments[0], [Assignment::TASK_ID => $task->getId(), Assignment::BENCHMARK => $benchmark]); + $assignment = $assignments[0]; + Factory::getAssignmentFactory()->mset($assignment, [Assignment::TASK_ID => $task->getId(), Assignment::BENCHMARK => $benchmark]); + $assignment->setTaskId($task->getId()); + $assignment->setAgentId($agent->getId()); + $assignment->setBenchmark($benchmark); } else { $assignment = new Assignment(null, $task->getId(), $agent->getId(), $benchmark); From e0d9555eeebdfd2e98704e6cf04b0414661df6cd Mon Sep 17 00:00:00 2001 From: Sein Coray Date: Thu, 4 Sep 2025 08:25:28 +0200 Subject: [PATCH 179/691] fixed double quotes to single quotes to avoid issues with dollar sign in names (#1562) --- ci/files/update-hashes.py | 4 +- .../updates/update_v0.14.4_v0.14.5.php | 214 +++++++++--------- 2 files changed, 109 insertions(+), 109 deletions(-) diff --git a/ci/files/update-hashes.py b/ci/files/update-hashes.py index d6311649b..a59c9ab3e 100644 --- a/ci/files/update-hashes.py +++ b/ci/files/update-hashes.py @@ -58,7 +58,7 @@ def __init__(self, hashType, description, salted, slowHash): print('if (!isset($PRESENT["PLACEHOLDER"])){') print(" $hashTypes = [") for hashType in new_hashtypes: - print(f' new HashType( {hashType.hashType}, "{hashType.description}", {int(hashType.salted)}, {int(hashType.slowHash)}),') + print(f" new HashType( {hashType.hashType}, '{hashType.description}', {int(hashType.salted)}, {int(hashType.slowHash)}),") print(" ];") print(' foreach ($hashTypes as $hashtype) {') print(' $check = Factory::getHashTypeFactory()->get($hashtype->getId());') @@ -74,4 +74,4 @@ def __init__(self, hashType, description, salted, slowHash): print(f" ({hashType.hashType}, '{hashType.description}', {int(hashType.salted)}, {int(hashType.slowHash)}),") -print("Dont forgot to check if all hashtypes where salted = '1', are actually salted in a way that Hashtopolis understands!") \ No newline at end of file +print("Dont forgot to check if all hashtypes where salted = '1', are actually salted in a way that Hashtopolis understands!") diff --git a/src/install/updates/update_v0.14.4_v0.14.5.php b/src/install/updates/update_v0.14.4_v0.14.5.php index b3aaac8bd..318f3241c 100644 --- a/src/install/updates/update_v0.14.4_v0.14.5.php +++ b/src/install/updates/update_v0.14.4_v0.14.5.php @@ -19,113 +19,113 @@ if (!isset($PRESENT["v0.14.4_update_hashtypes"])){ $hashTypes = [ - new HashType( 1310, "sha224($pass.$salt)", 1, 0), - new HashType( 1320, "sha224($salt.$pass)", 1, 0), - new HashType( 2630, "md5(md5($pass.$salt))", 1, 0), - new HashType( 3610, "md5(md5(md5($pass)).$salt)", 1, 0), - new HashType( 3730, "md5($salt1.strtoupper(md5($salt2.$pass)))", 0, 0), - new HashType( 4420, "md5(sha1($pass.$salt))", 1, 0), - new HashType( 4430, "md5(sha1($salt.$pass))", 1, 0), - new HashType( 5720, "Cisco-ISE Hashed Password (SHA256)", 0, 0), - new HashType( 6050, "HMAC-RIPEMD160 (key = $pass)", 1, 0), - new HashType( 6060, "HMAC-RIPEMD160 (key = $salt)", 1, 0), - new HashType( 7350, "IPMI2 RAKP HMAC-MD5", 0, 0), - new HashType( 8501, "AS/400 DES", 0, 0), - new HashType( 10510, "PDF 1.3 - 1.6 (Acrobat 4 - 8) w/ RC4-40", 0, 1), - new HashType( 12150, "Apache Shiro 1 SHA-512", 0, 1), - new HashType( 14200, "RACF KDFAES", 0, 1), - new HashType( 16501, "Perl Mojolicious session cookie (HMAC-SHA256, >= v9.19)", 0, 0), - new HashType( 17020, "GPG (AES-128/AES-256 (SHA-512($pass)))", 0, 1), - new HashType( 17030, "GPG (AES-128/AES-256 (SHA-256($pass)))", 0, 1), - new HashType( 17040, "GPG (CAST5 (SHA-1($pass)))", 0, 1), - new HashType( 19210, "QNX 7 /etc/shadow (SHA512)", 0, 1), - new HashType( 20712, "RSA Security Analytics / NetWitness (sha256)", 1, 0), - new HashType( 20730, "sha256(sha256($pass.$salt))", 1, 0), - new HashType( 21310, "md5($salt1.sha1($salt2.$pass))", 1, 0), - new HashType( 21900, "md5(md5(md5($pass.$salt1)).$salt2)", 0, 0), - new HashType( 22800, "Simpla CMS - md5($salt.$pass.md5($pass))", 1, 0), - new HashType( 24000, "BestCrypt v4 Volume Encryption", 0, 1), - new HashType( 26610, "MetaMask Wallet (short hash, plaintext check)", 0, 1), - new HashType( 29800, "Bisq .wallet (scrypt)", 0, 1), - new HashType( 29910, "ENCsecurity Datavault (PBKDF2/no keychain)", 0, 1), - new HashType( 29920, "ENCsecurity Datavault (PBKDF2/keychain)", 0, 1), - new HashType( 29930, "ENCsecurity Datavault (MD5/no keychain)", 0, 1), - new HashType( 29940, "ENCsecurity Datavault (MD5/keychain)", 0, 1), - new HashType( 30420, "DANE RFC7929/RFC8162 SHA2-256", 0, 0), - new HashType( 30500, "md5(md5($salt).md5(md5($pass)))", 1, 0), - new HashType( 30600, "bcrypt(sha256($pass))", 0, 1), - new HashType( 30601, "bcrypt(HMAC-SHA256($pass))", 0, 1), - new HashType( 30700, "Anope IRC Services (enc_sha256)", 0, 0), - new HashType( 30901, "Bitcoin raw private key (P2PKH), compressed", 0, 0), - new HashType( 30902, "Bitcoin raw private key (P2PKH), uncompressed", 0, 0), - new HashType( 30903, "Bitcoin raw private key (P2WPKH, Bech32), compressed", 0, 0), - new HashType( 30904, "Bitcoin raw private key (P2WPKH, Bech32), uncompressed", 0, 0), - new HashType( 30905, "Bitcoin raw private key (P2SH(P2WPKH)), compressed", 0, 0), - new HashType( 30906, "Bitcoin raw private key (P2SH(P2WPKH)), uncompressed", 0, 0), - new HashType( 31000, "BLAKE2s-256", 0, 0), - new HashType( 31100, "ShangMi 3 (SM3)", 0, 0), - new HashType( 31200, "Veeam VBK", 0, 1), - new HashType( 31300, "MS SNTP", 0, 0), - new HashType( 31400, "SecureCRT MasterPassphrase v2", 0, 0), - new HashType( 31500, "Domain Cached Credentials (DCC), MS Cache (NT)", 1, 1), - new HashType( 31600, "Domain Cached Credentials 2 (DCC2), MS Cache 2, (NT)", 0, 1), - new HashType( 31700, "md5(md5(md5($pass).$salt1).$salt2)", 1, 0), - new HashType( 31800, "1Password, mobilekeychain (1Password 8)", 0, 1), - new HashType( 31900, "MetaMask Mobile Wallet", 0, 1), - new HashType( 32000, "NetIQ SSPR (MD5)", 0, 1), - new HashType( 32010, "NetIQ SSPR (SHA1)", 0, 1), - new HashType( 32020, "NetIQ SSPR (SHA-1 with Salt)", 0, 1), - new HashType( 32030, "NetIQ SSPR (SHA-256 with Salt)", 0, 1), - new HashType( 32031, "Adobe AEM (SSPR, SHA-256 with Salt)", 0, 1), - new HashType( 32040, "NetIQ SSPR (SHA-512 with Salt)", 0, 1), - new HashType( 32041, "Adobe AEM (SSPR, SHA-512 with Salt)", 0, 1), - new HashType( 32050, "NetIQ SSPR (PBKDF2WithHmacSHA1)", 0, 1), - new HashType( 32060, "NetIQ SSPR (PBKDF2WithHmacSHA256)", 0, 1), - new HashType( 32070, "NetIQ SSPR (PBKDF2WithHmacSHA512)", 0, 1), - new HashType( 32100, "Kerberos 5, etype 17, AS-REP", 0, 1), - new HashType( 32200, "Kerberos 5, etype 18, AS-REP", 0, 1), - new HashType( 32300, "Empire CMS (Admin password)", 1, 0), - new HashType( 32410, "sha512(sha512($pass).$salt)", 1, 0), - new HashType( 32420, "sha512(sha512_bin($pass).$salt)", 1, 0), - new HashType( 32500, "Dogechain.info Wallet", 0, 1), - new HashType( 32600, "CubeCart (whirlpool($salt.$pass.$salt))", 1, 0), - new HashType( 32700, "Kremlin Encrypt 3.0 w/NewDES", 0, 1), - new HashType( 32800, "md5(sha1(md5($pass)))", 0, 0), - new HashType( 32900, "PBKDF1-SHA1", 1, 1), - new HashType( 33000, "md5($salt1.$pass.$salt2)", 1, 0), - new HashType( 33100, "md5($salt.md5($pass).$salt)", 1, 0), - new HashType( 33300, "HMAC-BLAKE2S (key = $pass)", 1, 0), - new HashType( 33400, "mega.nz password-protected link (PBKDF2-HMAC-SHA512)", 0, 1), - new HashType( 33500, "RC4 40-bit DropN", 0, 0), - new HashType( 33501, "RC4 72-bit DropN", 0, 0), - new HashType( 33502, "RC4 104-bit DropN", 0, 0), - new HashType( 33600, "RIPEMD-320", 0, 0), - new HashType( 33650, "HMAC-RIPEMD320 (key = $pass)", 1, 0), - new HashType( 33660, "HMAC-RIPEMD320 (key = $salt)", 1, 0), - new HashType( 33700, "Microsoft Online Account (PBKDF2-HMAC-SHA256 + AES256)", 0, 1), - new HashType( 33800, "WBB4 (Woltlab Burning Board) [bcrypt(bcrypt($pass))]", 0, 1), - new HashType( 33900, "Citrix NetScaler (PBKDF2-HMAC-SHA256)", 0, 1), - new HashType( 34000, "Argon2", 0, 1), - new HashType( 34100, "LUKS v2 argon2 + SHA-256 + AES", 0, 1), - new HashType( 34200, "MurmurHash64A", 1, 0), - new HashType( 34201, "MurmurHash64A (zero seed)", 0, 0), - new HashType( 34211, "MurmurHash64A truncated (zero seed)", 0, 0), - new HashType( 34300, "KeePass (KDBX v4)", 0, 1), - new HashType( 34400, "sha224(sha224($pass))", 0, 0), - new HashType( 34500, "sha224(sha1($pass))", 0, 0), - new HashType( 34600, "MD6 (256)", 0, 0), - new HashType( 34700, "Blockchain, My Wallet, Legacy Wallets", 0, 0), - new HashType( 34800, "BLAKE2b-256", 0, 0), - new HashType( 34810, "BLAKE2b-256($pass.$salt)", 1, 0), - new HashType( 34820, "BLAKE2b-256($salt.$pass)", 1, 0), - new HashType( 35000, "SAP CODVN H (PWDSALTEDHASH) isSHA512", 1, 1), - new HashType( 35100, "sm3crypt $sm3$, SM3 (Unix)", 1, 1), - new HashType( 35200, "AS/400 SSHA1", 1, 0), - new HashType( 70000, "Argon2id [Bridged: reference implementation + tunings]", 0, 1), - new HashType( 70100, "scrypt [Bridged: Scrypt-Jane SMix]", 0, 1), - new HashType( 70200, "scrypt [Bridged: Scrypt-Yescrypt]", 0, 1), - new HashType( 72000, "Generic Hash [Bridged: Python Interpreter free-threading]", 0, 1), - new HashType( 73000, "Generic Hash [Bridged: Python Interpreter with GIL]", 0, 1), + new HashType( 1310, 'sha224($pass.$salt)', 1, 0), + new HashType( 1320, 'sha224($salt.$pass)', 1, 0), + new HashType( 2630, 'md5(md5($pass.$salt))', 1, 0), + new HashType( 3610, 'md5(md5(md5($pass)).$salt)', 1, 0), + new HashType( 3730, 'md5($salt1.strtoupper(md5($salt2.$pass)))', 0, 0), + new HashType( 4420, 'md5(sha1($pass.$salt))', 1, 0), + new HashType( 4430, 'md5(sha1($salt.$pass))', 1, 0), + new HashType( 5720, 'Cisco-ISE Hashed Password (SHA256)', 0, 0), + new HashType( 6050, 'HMAC-RIPEMD160 (key = $pass)', 1, 0), + new HashType( 6060, 'HMAC-RIPEMD160 (key = $salt)', 1, 0), + new HashType( 7350, 'IPMI2 RAKP HMAC-MD5', 0, 0), + new HashType( 8501, 'AS/400 DES', 0, 0), + new HashType( 10510, 'PDF 1.3 - 1.6 (Acrobat 4 - 8) w/ RC4-40', 0, 1), + new HashType( 12150, 'Apache Shiro 1 SHA-512', 0, 1), + new HashType( 14200, 'RACF KDFAES', 0, 1), + new HashType( 16501, 'Perl Mojolicious session cookie (HMAC-SHA256, >= v9.19)', 0, 0), + new HashType( 17020, 'GPG (AES-128/AES-256 (SHA-512($pass)))', 0, 1), + new HashType( 17030, 'GPG (AES-128/AES-256 (SHA-256($pass)))', 0, 1), + new HashType( 17040, 'GPG (CAST5 (SHA-1($pass)))', 0, 1), + new HashType( 19210, 'QNX 7 /etc/shadow (SHA512)', 0, 1), + new HashType( 20712, 'RSA Security Analytics / NetWitness (sha256)', 1, 0), + new HashType( 20730, 'sha256(sha256($pass.$salt))', 1, 0), + new HashType( 21310, 'md5($salt1.sha1($salt2.$pass))', 1, 0), + new HashType( 21900, 'md5(md5(md5($pass.$salt1)).$salt2)', 0, 0), + new HashType( 22800, 'Simpla CMS - md5($salt.$pass.md5($pass))', 1, 0), + new HashType( 24000, 'BestCrypt v4 Volume Encryption', 0, 1), + new HashType( 26610, 'MetaMask Wallet (short hash, plaintext check)', 0, 1), + new HashType( 29800, 'Bisq .wallet (scrypt)', 0, 1), + new HashType( 29910, 'ENCsecurity Datavault (PBKDF2/no keychain)', 0, 1), + new HashType( 29920, 'ENCsecurity Datavault (PBKDF2/keychain)', 0, 1), + new HashType( 29930, 'ENCsecurity Datavault (MD5/no keychain)', 0, 1), + new HashType( 29940, 'ENCsecurity Datavault (MD5/keychain)', 0, 1), + new HashType( 30420, 'DANE RFC7929/RFC8162 SHA2-256', 0, 0), + new HashType( 30500, 'md5(md5($salt).md5(md5($pass)))', 1, 0), + new HashType( 30600, 'bcrypt(sha256($pass))', 0, 1), + new HashType( 30601, 'bcrypt(HMAC-SHA256($pass))', 0, 1), + new HashType( 30700, 'Anope IRC Services (enc_sha256)', 0, 0), + new HashType( 30901, 'Bitcoin raw private key (P2PKH), compressed', 0, 0), + new HashType( 30902, 'Bitcoin raw private key (P2PKH), uncompressed', 0, 0), + new HashType( 30903, 'Bitcoin raw private key (P2WPKH, Bech32), compressed', 0, 0), + new HashType( 30904, 'Bitcoin raw private key (P2WPKH, Bech32), uncompressed', 0, 0), + new HashType( 30905, 'Bitcoin raw private key (P2SH(P2WPKH)), compressed', 0, 0), + new HashType( 30906, 'Bitcoin raw private key (P2SH(P2WPKH)), uncompressed', 0, 0), + new HashType( 31000, 'BLAKE2s-256', 0, 0), + new HashType( 31100, 'ShangMi 3 (SM3)', 0, 0), + new HashType( 31200, 'Veeam VBK', 0, 1), + new HashType( 31300, 'MS SNTP', 0, 0), + new HashType( 31400, 'SecureCRT MasterPassphrase v2', 0, 0), + new HashType( 31500, 'Domain Cached Credentials (DCC), MS Cache (NT)', 1, 1), + new HashType( 31600, 'Domain Cached Credentials 2 (DCC2), MS Cache 2, (NT)', 0, 1), + new HashType( 31700, 'md5(md5(md5($pass).$salt1).$salt2)', 1, 0), + new HashType( 31800, '1Password, mobilekeychain (1Password 8)', 0, 1), + new HashType( 31900, 'MetaMask Mobile Wallet', 0, 1), + new HashType( 32000, 'NetIQ SSPR (MD5)', 0, 1), + new HashType( 32010, 'NetIQ SSPR (SHA1)', 0, 1), + new HashType( 32020, 'NetIQ SSPR (SHA-1 with Salt)', 0, 1), + new HashType( 32030, 'NetIQ SSPR (SHA-256 with Salt)', 0, 1), + new HashType( 32031, 'Adobe AEM (SSPR, SHA-256 with Salt)', 0, 1), + new HashType( 32040, 'NetIQ SSPR (SHA-512 with Salt)', 0, 1), + new HashType( 32041, 'Adobe AEM (SSPR, SHA-512 with Salt)', 0, 1), + new HashType( 32050, 'NetIQ SSPR (PBKDF2WithHmacSHA1)', 0, 1), + new HashType( 32060, 'NetIQ SSPR (PBKDF2WithHmacSHA256)', 0, 1), + new HashType( 32070, 'NetIQ SSPR (PBKDF2WithHmacSHA512)', 0, 1), + new HashType( 32100, 'Kerberos 5, etype 17, AS-REP', 0, 1), + new HashType( 32200, 'Kerberos 5, etype 18, AS-REP', 0, 1), + new HashType( 32300, 'Empire CMS (Admin password)', 1, 0), + new HashType( 32410, 'sha512(sha512($pass).$salt)', 1, 0), + new HashType( 32420, 'sha512(sha512_bin($pass).$salt)', 1, 0), + new HashType( 32500, 'Dogechain.info Wallet', 0, 1), + new HashType( 32600, 'CubeCart (whirlpool($salt.$pass.$salt))', 1, 0), + new HashType( 32700, 'Kremlin Encrypt 3.0 w/NewDES', 0, 1), + new HashType( 32800, 'md5(sha1(md5($pass)))', 0, 0), + new HashType( 32900, 'PBKDF1-SHA1', 1, 1), + new HashType( 33000, 'md5($salt1.$pass.$salt2)', 1, 0), + new HashType( 33100, 'md5($salt.md5($pass).$salt)', 1, 0), + new HashType( 33300, 'HMAC-BLAKE2S (key = $pass)', 1, 0), + new HashType( 33400, 'mega.nz password-protected link (PBKDF2-HMAC-SHA512)', 0, 1), + new HashType( 33500, 'RC4 40-bit DropN', 0, 0), + new HashType( 33501, 'RC4 72-bit DropN', 0, 0), + new HashType( 33502, 'RC4 104-bit DropN', 0, 0), + new HashType( 33600, 'RIPEMD-320', 0, 0), + new HashType( 33650, 'HMAC-RIPEMD320 (key = $pass)', 1, 0), + new HashType( 33660, 'HMAC-RIPEMD320 (key = $salt)', 1, 0), + new HashType( 33700, 'Microsoft Online Account (PBKDF2-HMAC-SHA256 + AES256)', 0, 1), + new HashType( 33800, 'WBB4 (Woltlab Burning Board) [bcrypt(bcrypt($pass))]', 0, 1), + new HashType( 33900, 'Citrix NetScaler (PBKDF2-HMAC-SHA256)', 0, 1), + new HashType( 34000, 'Argon2', 0, 1), + new HashType( 34100, 'LUKS v2 argon2 + SHA-256 + AES', 0, 1), + new HashType( 34200, 'MurmurHash64A', 1, 0), + new HashType( 34201, 'MurmurHash64A (zero seed)', 0, 0), + new HashType( 34211, 'MurmurHash64A truncated (zero seed)', 0, 0), + new HashType( 34300, 'KeePass (KDBX v4)', 0, 1), + new HashType( 34400, 'sha224(sha224($pass))', 0, 0), + new HashType( 34500, 'sha224(sha1($pass))', 0, 0), + new HashType( 34600, 'MD6 (256)', 0, 0), + new HashType( 34700, 'Blockchain, My Wallet, Legacy Wallets', 0, 0), + new HashType( 34800, 'BLAKE2b-256', 0, 0), + new HashType( 34810, 'BLAKE2b-256($pass.$salt)', 1, 0), + new HashType( 34820, 'BLAKE2b-256($salt.$pass)', 1, 0), + new HashType( 35000, 'SAP CODVN H (PWDSALTEDHASH) isSHA512', 1, 1), + new HashType( 35100, 'sm3crypt $sm3$, SM3 (Unix)', 1, 1), + new HashType( 35200, 'AS/400 SSHA1', 1, 0), + new HashType( 70000, 'Argon2id [Bridged: reference implementation + tunings]', 0, 1), + new HashType( 70100, 'scrypt [Bridged: Scrypt-Jane SMix]', 0, 1), + new HashType( 70200, 'scrypt [Bridged: Scrypt-Yescrypt]', 0, 1), + new HashType( 72000, 'Generic Hash [Bridged: Python Interpreter free-threading]', 0, 1), + new HashType( 73000, 'Generic Hash [Bridged: Python Interpreter with GIL]', 0, 1), ]; foreach ($hashTypes as $hashtype) { $check = Factory::getHashTypeFactory()->get($hashtype->getId()); From 86c3805973f290b869357a647b10364048e5bd2c Mon Sep 17 00:00:00 2001 From: jessevz Date: Thu, 4 Sep 2025 09:14:07 +0200 Subject: [PATCH 180/691] Fixed null pointer bug --- src/inc/utils/AgentUtils.class.php | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/inc/utils/AgentUtils.class.php b/src/inc/utils/AgentUtils.class.php index a06e27c6d..e3cea4074 100644 --- a/src/inc/utils/AgentUtils.class.php +++ b/src/inc/utils/AgentUtils.class.php @@ -405,12 +405,12 @@ public static function assign(int $agentId, int $taskId, User $user): ?Assignmen $qF = new QueryFilter(Agent::AGENT_ID, $agent->getId(), "="); $assignments = Factory::getAssignmentFactory()->filter([Factory::FILTER => $qF]); - if ($assignments[0]->getTaskId() === $taskId) { - throw new HttpError("Agent is already assigned to this task"); - } $benchmark = 0; if (sizeof($assignments) > 0) { + if ($assignments[0]->getTaskId() === $taskId) { + throw new HttpError("Agent is already assigned to this task"); + } for ($i = 1; $i < sizeof($assignments); $i++) { // clean up if required Factory::getAssignmentFactory()->delete($assignments[$i]); } From b8cdf5ae52543ecaf767fc031bf55f2a2f5f33b9 Mon Sep 17 00:00:00 2001 From: Sein Coray Date: Thu, 4 Sep 2025 15:34:32 +0200 Subject: [PATCH 181/691] added documentation for reset/fresh install --- .../advanced_install.md | 31 ++++++++++++++++++- 1 file changed, 30 insertions(+), 1 deletion(-) diff --git a/doc/installation_guidelines/advanced_install.md b/doc/installation_guidelines/advanced_install.md index 022a997d4..76745f2d0 100644 --- a/doc/installation_guidelines/advanced_install.md +++ b/doc/installation_guidelines/advanced_install.md @@ -221,4 +221,33 @@ docker compose down docker compose up ``` -Finally, copy the data back into the appropriate folders after recreating the containers. \ No newline at end of file +Finally, copy the data back into the appropriate folders after recreating the containers. + +## Set up a fresh and clean instance + +When there is the need for a complete reset/clean setup (e.g. for testing), you can do following steps to completely remove all data. + +> [!CAUTION] +> The following steps will delete all data in your hashtopolis instance (including the database, users, tasks, agents, etc.)! + +These steps assume that you have set up your hashtopolis instance using a `docker-compose.yml` file. + +First stop all running all containers and clean them up: + +``` +cd +docker compose down +``` + +In case you have mounted directories for files and other data instead of using a docker volume, clean these directories by removing all files inside (wordlists, rules, etc.). + +Delete the docker volumes for the database and hashtopolis data (if you don't have the folders mounted otherwise). +Use `docker volume ls` to determine which volumes exist (typically they are prefixed with the name of the folder containing the `docker-compose.yml`). + +For each of the relevant volume, delete it by using `docker volume rm `. + +Afterwards, you can start up the dockers again which should then be in a complete clean state and a freshly set up instance: + +``` +docker compose up -d +``` From f82a5bc6f254cad31bcca2dfbc905c24a8958d94 Mon Sep 17 00:00:00 2001 From: Sein Coray Date: Thu, 4 Sep 2025 15:41:59 +0200 Subject: [PATCH 182/691] added wget command for agent download --- doc/installation_guidelines/basic_install.md | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/doc/installation_guidelines/basic_install.md b/doc/installation_guidelines/basic_install.md index 508de0eae..a9e1cf445 100644 --- a/doc/installation_guidelines/basic_install.md +++ b/doc/installation_guidelines/basic_install.md @@ -53,7 +53,9 @@ docker compose up --detach ## Agent installation + ### Prerequisites + To install the agent, ensure that the following prerequisites are met: 1. Python: Python 3 must be installed on the agent system. If Python 3 is not installed, refer to the official Python installation guide. You can verify the installation by running the following command in your terminal: @@ -80,6 +82,7 @@ pip install requests psutil ``` ### Download the Hashtopolis agent + 1. Connect to the Hashtopolis server: ```http://:8080``` and log in. Navigate to the page *Agents > Show Agents* and click on the button *'+ New Agent'*. 2. On that page you can click on "..." and choose to download the agent binary or copy the URL of the agent binary and download the agent using wget/curl: @@ -87,6 +90,12 @@ pip install requests psutil curl -o hashtopolis.zip "http://:8080/agents.php?download=1" ``` +or + +``` +wget --content-disposition "http://:8080/agents.php?download=1" +``` + ### Start and register a new agent 1. Activate your python virtual environment if not done before: From 2a6b04fc8528e3a92a863c88a6860ce84d106fc8 Mon Sep 17 00:00:00 2001 From: Sein Coray Date: Thu, 4 Sep 2025 16:26:17 +0200 Subject: [PATCH 183/691] added section for backup/restore --- doc/installation_guidelines/advanced_install.md | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/doc/installation_guidelines/advanced_install.md b/doc/installation_guidelines/advanced_install.md index 76745f2d0..960d0c68e 100644 --- a/doc/installation_guidelines/advanced_install.md +++ b/doc/installation_guidelines/advanced_install.md @@ -223,6 +223,16 @@ docker compose up Finally, copy the data back into the appropriate folders after recreating the containers. +## Backup and Restore + +What the best way to backup and restore your hashtopolis instance depends heavily on the way the instance is set up and what configurations are made. +Therefore, there is no guide available for backing up / restoring which works for everyone, but some considerations which need to be taken into account: + +- Depending on the amount of data (files, database size, etc.) in the hashtopolis instance, a complete backup can become quite large. If it is needed to just be able to restore information about executed tasks, progress etc. (e.g. in case of a fatal failure of the system) it is enough to just back up the database, but of course this would not allow a easy restore to a previous state. +- If you plan to do a backup in a way to be able to completely restore it to the previous state (files, logs, database, users, etc.), you need to be careful to include all required items into your backup and when restoring make sure that nothing gets left out during that process, otherwise you may end up with a semi-broken or non-functional hashtopolis instance. +- In case you have set up your hashtopolis instance only using volumes (one for the database, one for all the hashtopolis data), backup up the complete content of these volumes is enough to have all data backed up. +- Restoring only parts (some tasks, only users, other database parts) from a backup is very tricky and should only be done by experts and very easily goes wrong when primary keys are not sequential and not updated for auto increment in the database. + ## Set up a fresh and clean instance When there is the need for a complete reset/clean setup (e.g. for testing), you can do following steps to completely remove all data. From f9d5a8cc30bed9ef0fdb8754d159fa6a9fa9012f Mon Sep 17 00:00:00 2001 From: Sein Coray Date: Fri, 5 Sep 2025 08:28:54 +0200 Subject: [PATCH 184/691] fixed grammatical proposals --- doc/installation_guidelines/advanced_install.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/doc/installation_guidelines/advanced_install.md b/doc/installation_guidelines/advanced_install.md index 960d0c68e..d16ac76dd 100644 --- a/doc/installation_guidelines/advanced_install.md +++ b/doc/installation_guidelines/advanced_install.md @@ -249,14 +249,14 @@ cd docker compose down ``` -In case you have mounted directories for files and other data instead of using a docker volume, clean these directories by removing all files inside (wordlists, rules, etc.). +In case you have mounted directories for files and other data instead of using a docker volume, clean these directories by removing all files within (wordlists, rules, etc.). Delete the docker volumes for the database and hashtopolis data (if you don't have the folders mounted otherwise). Use `docker volume ls` to determine which volumes exist (typically they are prefixed with the name of the folder containing the `docker-compose.yml`). For each of the relevant volume, delete it by using `docker volume rm `. -Afterwards, you can start up the dockers again which should then be in a complete clean state and a freshly set up instance: +Afterwards, you can start up the containers again which should then be in a complete clean state and a freshly set up instance: ``` docker compose up -d From 74998166487b521c026c42e96bfeb72d3786249a Mon Sep 17 00:00:00 2001 From: jessevz Date: Tue, 9 Sep 2025 10:39:02 +0200 Subject: [PATCH 185/691] Moved formatting of speed to frontend --- src/inc/apiv2/helper/taskExtraDetails.routes.php | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/src/inc/apiv2/helper/taskExtraDetails.routes.php b/src/inc/apiv2/helper/taskExtraDetails.routes.php index 40de3e4fd..79ca96e5f 100644 --- a/src/inc/apiv2/helper/taskExtraDetails.routes.php +++ b/src/inc/apiv2/helper/taskExtraDetails.routes.php @@ -1,5 +1,6 @@ getCheckpoint() - $chunk->getSkip(); if (time() - max($chunk->getSolveTime(), $chunk->getDispatchTime()) < SConfig::getInstance()->getVal(DConfig::CHUNK_TIMEOUT) && $chunk->getProgress() < 10000) { $currentSpeed += $chunk->getSpeed(); + } } $timeChunks = $chunks; @@ -69,8 +71,8 @@ public function handleGet(Request $request, Response $response): Response { } } $task = Factory::getTaskFactory()->get($taskId); - $estimatedTime = round($timeSpent / ($cProgress / $task->getKeyspace()) - $timeSpent); - $currentSpeed = ($currentSpeed > 0) ? Util::nicenum($currentSpeed, 10000, 1000) . "H/s" : 0; + $keyspace = $task->getKeyspace(); + $estimatedTime = ($keyspace > 0) ? round($timeSpent / ($cProgress / $keyspace) - $timeSpent) : 0; $responseObject = [ "estimatedTime" => $estimatedTime, "timeSpent" => $timeSpent, @@ -78,7 +80,6 @@ public function handleGet(Request $request, Response $response): Response { ]; return self::getMetaResponse($responseObject, $request, $response); - } } #[NoReturn] public function actionPost($data): object|array|null { From 0852cd95570fae54b87fcc445188952d5c976258 Mon Sep 17 00:00:00 2001 From: jessevz Date: Thu, 11 Sep 2025 14:13:35 +0200 Subject: [PATCH 186/691] Fixed copilot suggestions --- src/inc/apiv2/helper/taskExtraDetails.routes.php | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/src/inc/apiv2/helper/taskExtraDetails.routes.php b/src/inc/apiv2/helper/taskExtraDetails.routes.php index 79ca96e5f..7b74c2555 100644 --- a/src/inc/apiv2/helper/taskExtraDetails.routes.php +++ b/src/inc/apiv2/helper/taskExtraDetails.routes.php @@ -37,13 +37,17 @@ public function handleGet(Request $request, Response $response): Response { $this->preCommon($request); $taskId = $request->getQueryParams()['task']; - if ($taskId == null) { + if ($taskId === null) { throw new HttpErrorException("No task query param has been provided"); } $taskId = intval($taskId); if ($taskId === 0) { throw new HttpErrorException("No valid integer provided as task"); } + $task = Factory::getTaskFactory()->get($taskId); + if ($task === null) { + throw new HttpErrorException("No task found for provided task ID"); + } $qF = new QueryFilter(Chunk::TASK_ID, $taskId, "="); $chunks = Factory::getChunkFactory()->filter([Factory::FILTER => $qF]); @@ -70,9 +74,8 @@ public function handleGet(Request $request, Response $response): Response { $current = $c->getSolveTime(); } } - $task = Factory::getTaskFactory()->get($taskId); $keyspace = $task->getKeyspace(); - $estimatedTime = ($keyspace > 0) ? round($timeSpent / ($cProgress / $keyspace) - $timeSpent) : 0; + $estimatedTime = ($keyspace > 0 && $cProgress > 0) ? round($timeSpent / ($cProgress / $keyspace) - $timeSpent) : 0; $responseObject = [ "estimatedTime" => $estimatedTime, "timeSpent" => $timeSpent, @@ -83,7 +86,7 @@ public function handleGet(Request $request, Response $response): Response { } #[NoReturn] public function actionPost($data): object|array|null { - assert(False, "TaskExtraDetails has no POST"); + assert(false, "TaskExtraDetails has no POST"); } static public function register($app): void { From 2a3df0100e0719c3729b55fb8d18993b7b9714bf Mon Sep 17 00:00:00 2001 From: jessevz Date: Wed, 17 Sep 2025 09:07:22 +0200 Subject: [PATCH 187/691] Fixed bug in pagination where filters where not used for pagination --- src/dba/PaginationFilter.class.php | 22 ++++++++++++++----- .../apiv2/common/AbstractModelAPI.class.php | 2 +- 2 files changed, 18 insertions(+), 6 deletions(-) diff --git a/src/dba/PaginationFilter.class.php b/src/dba/PaginationFilter.class.php index 16169fb75..a32abb7d7 100644 --- a/src/dba/PaginationFilter.class.php +++ b/src/dba/PaginationFilter.class.php @@ -8,18 +8,23 @@ class PaginationFilter extends Filter { private $operator; private $tieBreakerKey; private $tieBreakerValue; + private $filters; /** * @var AbstractModelFactory */ private $factory; - function __construct($key, $value, $operator, $tieBreakerKey, $tieBreakerValue, $factory = null) { + function __construct($key, $value, $operator, $tieBreakerKey, $tieBreakerValue, $filters = [], $factory = null) { + /** + * @param QueryFilter[] $filters + */ $this->key = $key; $this->value = $value; $this->operator = $operator; $this->factory = $factory; $this->tieBreakerKey = $tieBreakerKey; $this->tieBreakerValue = $tieBreakerValue; + $this->filters = $filters; } function getQueryString($table = "") { @@ -29,15 +34,22 @@ function getQueryString($table = "") { if ($this->factory != null) { $table = $this->factory->getModelTable() . "."; } + $parts = array_map(fn($filter) => $filter->getQueryString(), $this->filters); //ex. SELECT hashTypeId, description, isSalted, isSlowHash FROM HashType // where (HashType.isSalted < 1) OR (HashType.isSalted = 1 and HashType.hashTypeId < 12600) // ORDER BY HashType.isSalted DESC, HashType.hashTypeId DESC LIMIT 25; - return "(" . $table . $this->key . $this->operator . "?" . ") OR (" . $this->key . "=" . "?" - . " AND " . $this->tieBreakerKey . $this->operator . "?)"; + $queryString = "(" . $table . $this->key . $this->operator . "?" . ") OR (" . $this->key . "=" . "?" + . " AND " . $this->tieBreakerKey . $this->operator . "?"; + if (count($this->filters) > 0) { + $queryString = $queryString . " AND ". implode(" AND ", $parts); + } + $queryString .= ")"; + return $queryString; } function getValue() { - return [$this->value, $this->value, $this->tieBreakerValue]; + $values = [$this->value, $this->value, $this->tieBreakerValue]; + return array_merge($values, array_map(fn($filter) => $filter->getValue(), $this->filters)); } function getHasValue() { @@ -46,4 +58,4 @@ function getHasValue() { } return true; } -} +} \ No newline at end of file diff --git a/src/inc/apiv2/common/AbstractModelAPI.class.php b/src/inc/apiv2/common/AbstractModelAPI.class.php index e1c046845..82faeeab8 100644 --- a/src/inc/apiv2/common/AbstractModelAPI.class.php +++ b/src/inc/apiv2/common/AbstractModelAPI.class.php @@ -710,7 +710,7 @@ public static function getManyResources(object $apiClass, Request $request, Resp $secondary_cursor_key = key($secondary_cursor); $secondary_cursor_key = $secondary_cursor_key == '_id' ? array_column($aliasedfeatures, 'alias', 'dbname')[$apiClass->getPrimaryKey()] : $secondary_cursor_key; $finalFs[Factory::FILTER][] = new PaginationFilter($primary_cursor_key, current($primary_cursor), - $operator, $secondary_cursor_key, current($secondary_cursor)); + $operator, $secondary_cursor_key, current($secondary_cursor),$qFs_Filter); } else { $finalFs[Factory::FILTER][] = new QueryFilter($primary_cursor_key, current($primary_cursor), $operator, $factory); } From 1529bb6d99dfbdfc1e779d2ac784421ea1c3f36f Mon Sep 17 00:00:00 2001 From: jessevz Date: Wed, 17 Sep 2025 10:56:11 +0200 Subject: [PATCH 188/691] Fixed copilot suggestions --- src/inc/apiv2/common/AbstractModelAPI.class.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/inc/apiv2/common/AbstractModelAPI.class.php b/src/inc/apiv2/common/AbstractModelAPI.class.php index 82faeeab8..384ddbb16 100644 --- a/src/inc/apiv2/common/AbstractModelAPI.class.php +++ b/src/inc/apiv2/common/AbstractModelAPI.class.php @@ -710,7 +710,7 @@ public static function getManyResources(object $apiClass, Request $request, Resp $secondary_cursor_key = key($secondary_cursor); $secondary_cursor_key = $secondary_cursor_key == '_id' ? array_column($aliasedfeatures, 'alias', 'dbname')[$apiClass->getPrimaryKey()] : $secondary_cursor_key; $finalFs[Factory::FILTER][] = new PaginationFilter($primary_cursor_key, current($primary_cursor), - $operator, $secondary_cursor_key, current($secondary_cursor),$qFs_Filter); + $operator, $secondary_cursor_key, current($secondary_cursor), $qFs_Filter); } else { $finalFs[Factory::FILTER][] = new QueryFilter($primary_cursor_key, current($primary_cursor), $operator, $factory); } From 310af41b9ea25d60ea4bd8cf8d0f7ca6a590f929 Mon Sep 17 00:00:00 2001 From: jessevz Date: Thu, 18 Sep 2025 17:53:51 +0200 Subject: [PATCH 189/691] Deletes taskwrapper when last task has been deleted --- src/inc/utils/TaskUtils.class.php | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/src/inc/utils/TaskUtils.class.php b/src/inc/utils/TaskUtils.class.php index 0a6f9b3b1..dbdbde179 100644 --- a/src/inc/utils/TaskUtils.class.php +++ b/src/inc/utils/TaskUtils.class.php @@ -1140,6 +1140,11 @@ public static function deleteTask($task) { $qF = new QueryFilter(Chunk::TASK_ID, $task->getId(), "="); Factory::getChunkFactory()->massDeletion([Factory::FILTER => $qF]); Factory::getTaskFactory()->delete($task); + $taskWrapper = Factory::getTaskWrapperFactory()->get($task->getTaskWrapperId()); + // If last task of taskwrapper has been deleted, delete taskwrapper aswell + if (count(self::getTasksOfWrapper($taskWrapper->getId())) === 0) { + Factory::getTaskWrapperFactory()->delete($taskWrapper); + } LockUtils::deleteLockFile($task->getId()); } From 9e072b764965582b0407412c762c14ec101a0954 Mon Sep 17 00:00:00 2001 From: jessevz Date: Thu, 18 Sep 2025 18:12:06 +0200 Subject: [PATCH 190/691] Made it possible to signal if a relationship is readonly, and made the taskwrapper-task relationship immutable --- src/inc/apiv2/common/AbstractModelAPI.class.php | 8 +++++++- src/inc/apiv2/model/taskwrappers.routes.php | 1 + 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/src/inc/apiv2/common/AbstractModelAPI.class.php b/src/inc/apiv2/common/AbstractModelAPI.class.php index e1c046845..4a2360cb1 100644 --- a/src/inc/apiv2/common/AbstractModelAPI.class.php +++ b/src/inc/apiv2/common/AbstractModelAPI.class.php @@ -1526,6 +1526,9 @@ protected function updateToManyRelationship(Request $request, array $data, array if ($relationKey == null) { throw new HttpError("Relation does not exist!"); } + if ($relation["readonly"] === true) { + throw new HttpError("This relationship is readonly"); + } $relationType = $relation['relationType']; $features = $this->getFeaturesOther($relationType); @@ -1593,7 +1596,10 @@ public function postToManyRelationshipLink(Request $request, Response $response, $relation = $this->getToManyRelationships()[$args['relation']]; $relationKey = $relation['relationKey']; if ($relationKey == null) { - throw new HttpError("Relation does not exist!"); + throw new HttpError('Relation does not exist!'); + } + if ($relation['readonly'] === true) { + throw new HttpError('This relationship is readonly'); } // check if the object queried exists diff --git a/src/inc/apiv2/model/taskwrappers.routes.php b/src/inc/apiv2/model/taskwrappers.routes.php index c4452231a..b691766e0 100644 --- a/src/inc/apiv2/model/taskwrappers.routes.php +++ b/src/inc/apiv2/model/taskwrappers.routes.php @@ -92,6 +92,7 @@ public static function getToManyRelationships(): array { 'relationType' => Task::class, 'relationKey' => Task::TASK_WRAPPER_ID, + 'readonly' => true // Not allowed to change tasks of a taskwrapper ], ]; } From 879239ee4d8fdcf1dcb28bf92cba79b8819627ab Mon Sep 17 00:00:00 2001 From: jessevz Date: Fri, 19 Sep 2025 11:37:20 +0200 Subject: [PATCH 191/691] Added more task validation in backend --- src/inc/apiv2/model/taskwrappers.routes.php | 8 +++++++- src/inc/utils/TaskwrapperUtils.class.php | 4 ++++ 2 files changed, 11 insertions(+), 1 deletion(-) diff --git a/src/inc/apiv2/model/taskwrappers.routes.php b/src/inc/apiv2/model/taskwrappers.routes.php index b691766e0..32cc44816 100644 --- a/src/inc/apiv2/model/taskwrappers.routes.php +++ b/src/inc/apiv2/model/taskwrappers.routes.php @@ -119,7 +119,13 @@ protected function deleteObject(object $object): void { $joined = Factory::getTaskFactory()->filter([Factory::FILTER => $qF, Factory::JOIN => $jF]); $task = $joined[Factory::getTaskFactory()->getModelName()][0]; // api=true to avoid TaskUtils::delete setting 'Location:' header - TaskUtils::delete($task->getId(), $this->getCurrentUser(), true); + if ($task !== null) { + TaskUtils::delete($task->getId(), $this->getCurrentUser(), true); + } else { + // This should not happen because every taskwrapper should have a task + // but since there are no database constraints this cant be enforced. + Factory::getTaskWrapperFactory()->delete($object); + } break; case DTaskTypes::SUPERTASK: TaskUtils::deleteSupertask($object->getId(), $this->getCurrentUser()); diff --git a/src/inc/utils/TaskwrapperUtils.class.php b/src/inc/utils/TaskwrapperUtils.class.php index 794988aae..b65f2bda9 100644 --- a/src/inc/utils/TaskwrapperUtils.class.php +++ b/src/inc/utils/TaskwrapperUtils.class.php @@ -4,6 +4,7 @@ use DBA\Task; use DBA\QueryFilter; use DBA\JoinFilter; +require_once __DIR__ . '/../apiv2/common/ErrorHandler.class.php'; class TaskwrapperUtils { @@ -31,6 +32,9 @@ public static function updatePriority($taskWrapperId, $priority, $user) { $jF = new JoinFilter(Factory::getTaskWrapperFactory(), Task::TASK_WRAPPER_ID, TaskWrapper::TASK_WRAPPER_ID); $joined = Factory::getTaskFactory()->filter([Factory::FILTER => $qF, Factory::JOIN => $jF]); $task = $joined[Factory::getTaskFactory()->getModelName()][0]; + if ($task === null) { + throw new HttpError("Invallid task, Taskwrapper does not have a task"); + } TaskUtils::updatePriority($task->getId(), $priority, $user); break; From a212022c307c78f523aa40deb9ccf84afb724abc Mon Sep 17 00:00:00 2001 From: jessevz Date: Fri, 19 Sep 2025 11:52:48 +0200 Subject: [PATCH 192/691] Fixed copilot spelling suggestion --- src/inc/utils/TaskwrapperUtils.class.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/inc/utils/TaskwrapperUtils.class.php b/src/inc/utils/TaskwrapperUtils.class.php index b65f2bda9..1909b6156 100644 --- a/src/inc/utils/TaskwrapperUtils.class.php +++ b/src/inc/utils/TaskwrapperUtils.class.php @@ -33,7 +33,7 @@ public static function updatePriority($taskWrapperId, $priority, $user) { $joined = Factory::getTaskFactory()->filter([Factory::FILTER => $qF, Factory::JOIN => $jF]); $task = $joined[Factory::getTaskFactory()->getModelName()][0]; if ($task === null) { - throw new HttpError("Invallid task, Taskwrapper does not have a task"); + throw new HttpError("Invalid task, Taskwrapper does not have a task"); } TaskUtils::updatePriority($task->getId(), $priority, $user); From 2eddaa8d448e7fc289a7afdd8cd6dd61efddfc23 Mon Sep 17 00:00:00 2001 From: jessevz Date: Wed, 24 Sep 2025 16:57:29 +0200 Subject: [PATCH 193/691] Fixed bug in pagination where filters where not used for pagination (#1591) * Fixed bug in pagination where filters where not used for pagination * Fixed copilot suggestions --------- Co-authored-by: jessevz --- src/dba/PaginationFilter.class.php | 22 ++++++++++++++----- .../apiv2/common/AbstractModelAPI.class.php | 2 +- 2 files changed, 18 insertions(+), 6 deletions(-) diff --git a/src/dba/PaginationFilter.class.php b/src/dba/PaginationFilter.class.php index 16169fb75..a32abb7d7 100644 --- a/src/dba/PaginationFilter.class.php +++ b/src/dba/PaginationFilter.class.php @@ -8,18 +8,23 @@ class PaginationFilter extends Filter { private $operator; private $tieBreakerKey; private $tieBreakerValue; + private $filters; /** * @var AbstractModelFactory */ private $factory; - function __construct($key, $value, $operator, $tieBreakerKey, $tieBreakerValue, $factory = null) { + function __construct($key, $value, $operator, $tieBreakerKey, $tieBreakerValue, $filters = [], $factory = null) { + /** + * @param QueryFilter[] $filters + */ $this->key = $key; $this->value = $value; $this->operator = $operator; $this->factory = $factory; $this->tieBreakerKey = $tieBreakerKey; $this->tieBreakerValue = $tieBreakerValue; + $this->filters = $filters; } function getQueryString($table = "") { @@ -29,15 +34,22 @@ function getQueryString($table = "") { if ($this->factory != null) { $table = $this->factory->getModelTable() . "."; } + $parts = array_map(fn($filter) => $filter->getQueryString(), $this->filters); //ex. SELECT hashTypeId, description, isSalted, isSlowHash FROM HashType // where (HashType.isSalted < 1) OR (HashType.isSalted = 1 and HashType.hashTypeId < 12600) // ORDER BY HashType.isSalted DESC, HashType.hashTypeId DESC LIMIT 25; - return "(" . $table . $this->key . $this->operator . "?" . ") OR (" . $this->key . "=" . "?" - . " AND " . $this->tieBreakerKey . $this->operator . "?)"; + $queryString = "(" . $table . $this->key . $this->operator . "?" . ") OR (" . $this->key . "=" . "?" + . " AND " . $this->tieBreakerKey . $this->operator . "?"; + if (count($this->filters) > 0) { + $queryString = $queryString . " AND ". implode(" AND ", $parts); + } + $queryString .= ")"; + return $queryString; } function getValue() { - return [$this->value, $this->value, $this->tieBreakerValue]; + $values = [$this->value, $this->value, $this->tieBreakerValue]; + return array_merge($values, array_map(fn($filter) => $filter->getValue(), $this->filters)); } function getHasValue() { @@ -46,4 +58,4 @@ function getHasValue() { } return true; } -} +} \ No newline at end of file diff --git a/src/inc/apiv2/common/AbstractModelAPI.class.php b/src/inc/apiv2/common/AbstractModelAPI.class.php index 4a2360cb1..04185ff61 100644 --- a/src/inc/apiv2/common/AbstractModelAPI.class.php +++ b/src/inc/apiv2/common/AbstractModelAPI.class.php @@ -710,7 +710,7 @@ public static function getManyResources(object $apiClass, Request $request, Resp $secondary_cursor_key = key($secondary_cursor); $secondary_cursor_key = $secondary_cursor_key == '_id' ? array_column($aliasedfeatures, 'alias', 'dbname')[$apiClass->getPrimaryKey()] : $secondary_cursor_key; $finalFs[Factory::FILTER][] = new PaginationFilter($primary_cursor_key, current($primary_cursor), - $operator, $secondary_cursor_key, current($secondary_cursor)); + $operator, $secondary_cursor_key, current($secondary_cursor), $qFs_Filter); } else { $finalFs[Factory::FILTER][] = new QueryFilter($primary_cursor_key, current($primary_cursor), $operator, $factory); } From 09c3fc66d794637562b754da4d7a6fe44d9e3f8e Mon Sep 17 00:00:00 2001 From: Sein Coray Date: Thu, 25 Sep 2025 10:06:42 +0200 Subject: [PATCH 194/691] fixed version ordering to reverse on task creation --- src/tasks.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/tasks.php b/src/tasks.php index e1a6ae273..c4ea3b72b 100755 --- a/src/tasks.php +++ b/src/tasks.php @@ -413,7 +413,7 @@ $oF = new OrderFilter(CrackerBinary::CRACKER_BINARY_ID, "DESC"); UI::add('binaries', Factory::getCrackerBinaryTypeFactory()->filter([])); $versions = Factory::getCrackerBinaryFactory()->filter([Factory::ORDER => $oF]); - usort($versions, ["Util", "versionComparisonBinary"]); + array_reverse(usort($versions, ["Util", "versionComparisonBinary"])); UI::add('versions', $versions); UI::add('pageTitle', "Create Task"); } From e84075a931ded9528f0c4eab45a95969d0b829f9 Mon Sep 17 00:00:00 2001 From: jessevz Date: Thu, 2 Oct 2025 15:52:47 +0200 Subject: [PATCH 195/691] Made it so that no hard error gets thrown when no permission for included data --- .../apiv2/common/AbstractBaseAPI.class.php | 23 +++++++++++++++---- .../apiv2/common/AbstractModelAPI.class.php | 3 +++ 2 files changed, 22 insertions(+), 4 deletions(-) diff --git a/src/inc/apiv2/common/AbstractBaseAPI.class.php b/src/inc/apiv2/common/AbstractBaseAPI.class.php index f0890cf82..f942890a0 100644 --- a/src/inc/apiv2/common/AbstractBaseAPI.class.php +++ b/src/inc/apiv2/common/AbstractBaseAPI.class.php @@ -79,7 +79,9 @@ abstract public function getRequiredPermissions(string $method): array; /** @var mixed|null $permissionErrors contained detailed results of last * validatePermissions function call */ - private mixed $permissionErrors; + protected mixed $permissionErrors = null; + + protected mixed $missing_permissions = []; /** * @var array|null list of model classes which will need to be filtered for public attributes because @@ -967,9 +969,17 @@ protected function makeExpandables(Request $request, array $validExpandables): a array_push($required_perms, ...$expandedPerms); } $permissionResponse = $this->validatePermissions($required_perms, $permsExpandMatching); - if ($permissionResponse === FALSE) { - throw new HttpError('Permissions missing on expand parameter objects! || ' . join('||', $this->permissionErrors)); + $expands_to_remove = []; + + // remove expands with missing permissions + foreach($this->missing_permissions as $missing_permission) { + $expands_to_remove = array_merge($expands_to_remove, $permsExpandMatching[$missing_permission]); } + $queryExpands = array_diff($queryExpands, $expands_to_remove); + + // if ($permissionResponse === FALSE) { + // throw new HttpError('Permissions missing on expand parameter objects! || ' . join('||', $this->permissionErrors)); + // } return $queryExpands; } @@ -1255,6 +1265,7 @@ protected function validatePermissions(array $required_perms, array $permsExpand } } $this->permissionErrors = array("No '" . join(",", $missing_permissions) . "' permission(s). [required_permissions='" . join(", ", $required_perms) . "', user_permissions='" . join(", ", $user_available_perms) . "']"); + $this->missing_permissions = $missing_permissions; return FALSE; } else { @@ -1451,8 +1462,12 @@ protected static function getOneResource(object $apiClass, object $object, Reque $linksSelf = $request->getUri()->getPath() . ((!empty($linksQuery)) ? '?' . $linksQuery : ''); $links = ["self" => $linksSelf]; + $metaData = []; + if ($apiClass->permissionErrors !== null) { + $metadata["Include errors"] = $apiClass->permissionErrors; + } // Generate JSON:API GET output - $ret = self::createJsonResponse($dataResources[0], $links, $includedResources); + $ret = self::createJsonResponse($dataResources[0], $links, $includedResources, $metaData); $body = $response->getBody(); $body->write($apiClass->ret2json($ret)); diff --git a/src/inc/apiv2/common/AbstractModelAPI.class.php b/src/inc/apiv2/common/AbstractModelAPI.class.php index 384ddbb16..99830ce53 100644 --- a/src/inc/apiv2/common/AbstractModelAPI.class.php +++ b/src/inc/apiv2/common/AbstractModelAPI.class.php @@ -846,6 +846,9 @@ public static function getManyResources(object $apiClass, Request $request, Resp ]; $metadata = ["page" => ["total_elements" => $total]]; + if ($apiClass->permissionErrors !== null) { + $metadata["Include errors"] = $apiClass->permissionErrors; + } // Generate JSON:API GET output $ret = self::createJsonResponse($dataResources, $links, $includedResources, $metadata); From 32e01895a5fcf15da9658407a7e04065ecf5be4b Mon Sep 17 00:00:00 2001 From: s3inlc Date: Mon, 6 Oct 2025 17:02:46 +0200 Subject: [PATCH 196/691] filetypes and counts are inserted on exported files --- src/inc/utils/HashlistUtils.class.php | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/src/inc/utils/HashlistUtils.class.php b/src/inc/utils/HashlistUtils.class.php index 04601a6b8..377ca7770 100644 --- a/src/inc/utils/HashlistUtils.class.php +++ b/src/inc/utils/HashlistUtils.class.php @@ -213,7 +213,7 @@ public static function createWordlists($hashlistId, $user) { fclose($wordlistFile); //add file to files list - $file = new File(null, $wordlistName, Util::filesize($wordlistFilename), $hashlist->getIsSecret(), 0, $hashlist->getAccessGroupId(), $wordCount); + $file = new File(null, $wordlistName, Util::filesize($wordlistFilename), $hashlist->getIsSecret(), DFileType::WORDLIST, $hashlist->getAccessGroupId(), $wordCount); $file = Factory::getFileFactory()->save($file); # TODO: returning wordCount and wordlistName are not really required here as the name and the count are already given in the file object return [$wordCount, $wordlistName, $file]; @@ -711,6 +711,7 @@ public static function export($hashlistId, $user) { $pagingSize = SConfig::getInstance()->getVal(DConfig::HASHES_PAGE_SIZE); } $separator = SConfig::getInstance()->getVal(DConfig::FIELD_SEPARATOR); + $numEntries = 0; for ($x = 0; $x * $pagingSize < $count; $x++) { $oF = new OrderFilter($orderObject, "ASC LIMIT " . ($x * $pagingSize) . ",$pagingSize"); $entries = $factory->filter([Factory::FILTER => [$qF1, $qF2], Factory::ORDER => $oF]); @@ -733,12 +734,13 @@ public static function export($hashlistId, $user) { break; } } + $numEntries += sizeof($entries); fputs($file, $buffer); } fclose($file); usleep(1000000); - $file = new File(null, $tmpname, Util::filesize($tmpfile), $hashlist->getIsSecret(), 0, $hashlist->getAccessGroupId(), null); + $file = new File(null, $tmpname, Util::filesize($tmpfile), $hashlist->getIsSecret(), DFileType::OTHER, $hashlist->getAccessGroupId(), $numEntries); $file = Factory::getFileFactory()->save($file); return $file; } @@ -1098,6 +1100,7 @@ public static function leftlist($hashlistId, $user) { if (SConfig::getInstance()->getVal(DConfig::HASHES_PAGE_SIZE) !== false) { $pagingSize = SConfig::getInstance()->getVal(DConfig::HASHES_PAGE_SIZE); } + $numEntries = 0; for ($x = 0; $x * $pagingSize < $count; $x++) { $oF = new OrderFilter(Hash::HASH_ID, "ASC LIMIT " . ($x * $pagingSize) . ",$pagingSize"); $entries = Factory::getHashFactory()->filter([Factory::FILTER => [$qF1, $qF2], Factory::ORDER => $oF]); @@ -1109,12 +1112,13 @@ public static function leftlist($hashlistId, $user) { } $buffer .= "\n"; } + $numEntries += sizeof($numEntries); fputs($file, $buffer); } fclose($file); usleep(1000000); - $file = new File(null, $tmpname, Util::filesize($tmpfile), $hashlist->getIsSecret(), 0, $hashlist->getAccessGroupId(), null); + $file = new File(null, $tmpname, Util::filesize($tmpfile), $hashlist->getIsSecret(), DFileType::OTHER, $hashlist->getAccessGroupId(), $numEntries); return Factory::getFileFactory()->save($file); } From 68d4cc5ab09a7a20c51f4a99ea4ee507d5b0e030 Mon Sep 17 00:00:00 2001 From: s3inlc Date: Mon, 6 Oct 2025 17:14:05 +0200 Subject: [PATCH 197/691] fixed typo in counting --- src/inc/utils/HashlistUtils.class.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/inc/utils/HashlistUtils.class.php b/src/inc/utils/HashlistUtils.class.php index 377ca7770..e2dece3c2 100644 --- a/src/inc/utils/HashlistUtils.class.php +++ b/src/inc/utils/HashlistUtils.class.php @@ -1112,7 +1112,7 @@ public static function leftlist($hashlistId, $user) { } $buffer .= "\n"; } - $numEntries += sizeof($numEntries); + $numEntries += sizeof($entries); fputs($file, $buffer); } fclose($file); From 0681c76ce6b5856243f5592f1d8685bca61da1f8 Mon Sep 17 00:00:00 2001 From: s3inlc Date: Tue, 7 Oct 2025 10:03:54 +0200 Subject: [PATCH 198/691] in some cases (e.g. PDOException) the return code is not an int and in these cases we set it to code 500 to avoid issues. --- src/api/v2/index.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/api/v2/index.php b/src/api/v2/index.php index f5b851bbb..e9fb96cd9 100644 --- a/src/api/v2/index.php +++ b/src/api/v2/index.php @@ -242,7 +242,7 @@ public static function addCORSheaders(Request $request, $response) { //Quirck to handle HTexceptions without status code, this can be removed when all HTexceptions have been migrated error_log($exception->getMessage()); $code = $exception->getCode(); - if ($code == 0 || $code == 1) { + if ($code == 0 || $code == 1 || !is_integer($code)) { $code = 500; } From 49d4edbcd61a345f23bdb0f7879223ec84ec8597 Mon Sep 17 00:00:00 2001 From: s3inlc Date: Tue, 7 Oct 2025 10:13:15 +0200 Subject: [PATCH 199/691] fix the version sorting by properly having the return statements --- src/tasks.php | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/tasks.php b/src/tasks.php index c4ea3b72b..8540f71fd 100755 --- a/src/tasks.php +++ b/src/tasks.php @@ -413,7 +413,8 @@ $oF = new OrderFilter(CrackerBinary::CRACKER_BINARY_ID, "DESC"); UI::add('binaries', Factory::getCrackerBinaryTypeFactory()->filter([])); $versions = Factory::getCrackerBinaryFactory()->filter([Factory::ORDER => $oF]); - array_reverse(usort($versions, ["Util", "versionComparisonBinary"])); + usort($versions, ["Util", "versionComparisonBinary"]); + $versions = array_reverse($versions); UI::add('versions', $versions); UI::add('pageTitle', "Create Task"); } From ed9ec3ddd7b732e1f635838ea361dc70523a9dd6 Mon Sep 17 00:00:00 2001 From: s3inlc Date: Tue, 7 Oct 2025 10:34:04 +0200 Subject: [PATCH 200/691] fixed some typing issues where values can be null --- src/inc/utils/PretaskUtils.class.php | 6 +++--- src/inc/utils/SupertaskUtils.class.php | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/inc/utils/PretaskUtils.class.php b/src/inc/utils/PretaskUtils.class.php index 5ccd89595..4d28c2ca6 100644 --- a/src/inc/utils/PretaskUtils.class.php +++ b/src/inc/utils/PretaskUtils.class.php @@ -291,14 +291,14 @@ public static function runPretask($pretaskId, $hashlistId, $name, $crackerBinary * @param int $cpuOnly * @param int $isSmall * @param int $benchmarkType - * @param array $files + * @param array|null $files * @param int $crackerBinaryTypeId - * @param int $maxAgents + * @param int|null $maxAgents * @param int $priority * @return Pretask * @throws HttpError */ - public static function createPretask(string $name, string $cmdLine, int $chunkTime, int $statusTimer, string $color, int $cpuOnly, int $isSmall, int $benchmarkType, array $files, int $crackerBinaryTypeId, int $maxAgents, int $priority = 0): Pretask { + public static function createPretask(string $name, string $cmdLine, int $chunkTime, int $statusTimer, string $color, int $cpuOnly, int $isSmall, int $benchmarkType, array|null $files, int $crackerBinaryTypeId, int|null $maxAgents, int $priority = 0): Pretask { $crackerBinaryType = Factory::getCrackerBinaryTypeFactory()->get($crackerBinaryTypeId); if (strlen($name) == 0) { diff --git a/src/inc/utils/SupertaskUtils.class.php b/src/inc/utils/SupertaskUtils.class.php index e538a103d..0a7d7670d 100644 --- a/src/inc/utils/SupertaskUtils.class.php +++ b/src/inc/utils/SupertaskUtils.class.php @@ -324,7 +324,7 @@ public static function runSupertask($supertaskId, $hashlistId, $crackerId) { * @return Supertask * @throws HttpError */ - public static function createSupertask(string $name, array $pretasks): Supertask { + public static function createSupertask(string $name, array|null $pretasks): Supertask { if (sizeof($pretasks) == 0) { throw new HttpError("Cannot create empty supertask!"); } From 20f760ee9f599e9b6bfc897d8320e7f8b7f330c6 Mon Sep 17 00:00:00 2001 From: s3inlc Date: Tue, 7 Oct 2025 11:21:48 +0200 Subject: [PATCH 201/691] fix separator naming for hashlist creation from new api --- src/inc/apiv2/model/hashlists.routes.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/inc/apiv2/model/hashlists.routes.php b/src/inc/apiv2/model/hashlists.routes.php index 8278be8a0..69c10f78d 100644 --- a/src/inc/apiv2/model/hashlists.routes.php +++ b/src/inc/apiv2/model/hashlists.routes.php @@ -135,10 +135,10 @@ protected function createObject(array $data): int { $data[Hashlist::IS_SALTED], $data[Hashlist::IS_SECRET], $data[Hashlist::HEX_SALT], - $data["hashlistSeperator"] ?? "", + $data["separator"] ?? "", $data[Hashlist::FORMAT], $data[Hashlist::HASH_TYPE_ID], - $data[Hashlist::SALT_SEPARATOR] ?? $data["hashlistSeperator"] ?? "", + $data[Hashlist::SALT_SEPARATOR] ?? $data["separator"] ?? "", $data[UQueryHashlist::HASHLIST_ACCESS_GROUP_ID], $data["sourceType"], $dummyPost, From dd36a053778f3609586475083003365b46b323d6 Mon Sep 17 00:00:00 2001 From: jessevz Date: Tue, 7 Oct 2025 11:45:07 +0200 Subject: [PATCH 202/691] Added helper endpoint to get the cracks of a task --- src/api/v2/index.php | 2 +- .../apiv2/helper/getCracksOfTask.routes.php | 113 ++++++++++++++++++ 2 files changed, 114 insertions(+), 1 deletion(-) create mode 100644 src/inc/apiv2/helper/getCracksOfTask.routes.php diff --git a/src/api/v2/index.php b/src/api/v2/index.php index e9fb96cd9..bf1f76f91 100644 --- a/src/api/v2/index.php +++ b/src/api/v2/index.php @@ -317,6 +317,6 @@ public static function addCORSheaders(Request $request, $response) { require __DIR__ . "/../../inc/apiv2/helper/setUserPassword.routes.php"; require __DIR__ . "/../../inc/apiv2/helper/taskExtraDetails.routes.php"; require __DIR__ . "/../../inc/apiv2/helper/unassignAgent.routes.php"; - +require __DIR__ . "/../../inc/apiv2/helper/getCracksOfTask.routes.php"; $app->run(); diff --git a/src/inc/apiv2/helper/getCracksOfTask.routes.php b/src/inc/apiv2/helper/getCracksOfTask.routes.php new file mode 100644 index 000000000..65250cad7 --- /dev/null +++ b/src/inc/apiv2/helper/getCracksOfTask.routes.php @@ -0,0 +1,113 @@ + "query", + "name" => "task", + "schema" => [ + "type" => "integer", + "format" => "int32" + ], + "required" => true, + "example" => 1, + "description" => "The ID of the task." + ] + ]; + } + + /** + * Endpoint to download files + * @param Request $request + * @param Response $response + * @return Response + * @throws HTException + * @throws HttpErrorException + * @throws HttpForbidden + */ + public function handleGet(Request $request, Response $response): Response { + $this->preCommon($request); + $task = Factory::getTaskFactory()->get($_GET['task']); + if ($task == null) { + throw new HttpError("No task has been found with provided task id"); + } + $hashlists = Util::checkSuperHashlist(Factory::getHashlistFactory()->get(Factory::getTaskWrapperFactory()->get($task->getTaskWrapperId())->getHashlistId())); + if ($hashlists[0]->getFormat() == DHashlistFormat::PLAIN) { + $hashFactory = Factory::getHashFactory(); + } + else { + $hashFactory = Factory::getHashBinaryFactory(); + } + $qF = new QueryFilter(Chunk::TASK_ID, $task->getId(), "="); + $chunks = Factory::getChunkFactory()->filter([Factory::FILTER => $qF]); + $chunkIds = array(); + foreach ($chunks as $chunk) { + $chunkIds[] = $chunk->getId(); + } + $queryFilters[] = new ContainFilter(Hash::CHUNK_ID, $chunkIds); + $queryFilters[] = new QueryFilter(Hash::IS_CRACKED, 1, "="); + $hashes = $hashFactory->filter([Factory::FILTER => $queryFilters]); + $converted = []; + + foreach ($hashes as $hash) { + $converted[] = self::obj2Resource($hash); + } + $ret = self::createJsonResponse(data: $converted); + + $body = $response->getBody(); + $body->write($this->ret2json($ret)); + + return $response->withStatus(200) + ->withHeader("Content-Type", 'application/vnd.api+json;'); + } + + static public function register($app): void { + $baseUri = getCracksOfTaskHelper::getBaseUri(); + + /* Allow CORS preflight requests */ + $app->options($baseUri, function (Request $request, Response $response): Response { + return $response; + }); + $app->get($baseUri, "getCracksOfTaskHelper:handleGet"); + } +} + +getCracksOfTaskHelper::register($app); \ No newline at end of file From 9812627dba23353c3cfd8334383c3bf1c88f141c Mon Sep 17 00:00:00 2001 From: jessevz Date: Tue, 7 Oct 2025 11:47:22 +0200 Subject: [PATCH 203/691] Updated some comments --- src/inc/apiv2/helper/getCracksOfTask.routes.php | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/src/inc/apiv2/helper/getCracksOfTask.routes.php b/src/inc/apiv2/helper/getCracksOfTask.routes.php index 65250cad7..b74157ef2 100644 --- a/src/inc/apiv2/helper/getCracksOfTask.routes.php +++ b/src/inc/apiv2/helper/getCracksOfTask.routes.php @@ -55,13 +55,11 @@ public function getParamsSwagger(): array { } /** - * Endpoint to download files + * Endpoint to get the cracked hashes of a certain task * @param Request $request * @param Response $response * @return Response - * @throws HTException * @throws HttpErrorException - * @throws HttpForbidden */ public function handleGet(Request $request, Response $response): Response { $this->preCommon($request); From 8e8f0bdc47570de81d63f2ba2c57362f9b8a10b5 Mon Sep 17 00:00:00 2001 From: s3inlc Date: Tue, 7 Oct 2025 12:12:00 +0200 Subject: [PATCH 204/691] added searchHashes helper --- src/api/v2/index.php | 3 +- src/inc/apiv2/helper/searchHashes.routes.php | 152 +++++++++++++++++++ 2 files changed, 154 insertions(+), 1 deletion(-) create mode 100644 src/inc/apiv2/helper/searchHashes.routes.php diff --git a/src/api/v2/index.php b/src/api/v2/index.php index e9fb96cd9..8e4add55f 100644 --- a/src/api/v2/index.php +++ b/src/api/v2/index.php @@ -314,9 +314,10 @@ public static function addCORSheaders(Request $request, $response) { require __DIR__ . "/../../inc/apiv2/helper/recountFileLines.routes.php"; require __DIR__ . "/../../inc/apiv2/helper/resetChunk.routes.php"; require __DIR__ . "/../../inc/apiv2/helper/resetUserPassword.routes.php"; +require __DIR__ . "/../../inc/apiv2/helper/searchHashes.routes.php"; require __DIR__ . "/../../inc/apiv2/helper/setUserPassword.routes.php"; require __DIR__ . "/../../inc/apiv2/helper/taskExtraDetails.routes.php"; -require __DIR__ . "/../../inc/apiv2/helper/unassignAgent.routes.php"; +require __DIR__ . "/../../inc/apiv2/helper/unassignAgent.routes.php";add $app->run(); diff --git a/src/inc/apiv2/helper/searchHashes.routes.php b/src/inc/apiv2/helper/searchHashes.routes.php new file mode 100644 index 000000000..51be3ce51 --- /dev/null +++ b/src/inc/apiv2/helper/searchHashes.routes.php @@ -0,0 +1,152 @@ + ["type" => "str"], # base64 encoded search input + "separator" => ['type' => 'str'], + "isSalted" => ['type' => 'bool'], + ]; + } + + public static function getResponse(): array { + return [ + ["found" => False, + "query" => "12345678", + ], + ["found" => True, + "query" => "54321", + "matches" => [[ + "hashlistId" => 4, + "hash" => "5432173922", + "salt" => "", + "plaintext" => "plain", + "timeCracked" => 0, + "chunkId" => null, + "isCracked" => true, + "crackPos" => 0, + ], + [ + "hashlistId" => 4, + "hash" => "12345654321", + "salt" => "", + "plaintext" => "", + "timeCracked" => 0, + "chunkId" => null, + "isCracked" => false, + "crackPos" => 0, + ] + ], + ] + ]; + } + + /** + * Endpoint to import cracked hashes into a hashlist. + * @throws HttpError + */ + public function actionPost($data): object|array|null { + $search = base64_decode($data['searchData']); + $isSalted = $data['isSalted']; + $separator = $data['separator']; + + if (strlen($search) == 0) { + throw new HttpError("Search query cannot be empty!"); + } + else if ($search === false) { + throw new HttpError("Search query is not valid base64!"); + } + else if ($isSalted && strlen($separator) == 0) { + throw new HttpError("Salt separator cannot be empty!"); + } + + $search = str_replace("\r\n", "\n", $search); + $search = explode("\n", $search); + $resultEntries = array(); + $userHashlists = HashlistUtils::getHashlists(Login::getInstance()->getUser(), false); + $userHashlists += HashlistUtils::getHashlists(Login::getInstance()->getUser(), true); + foreach ($search as $searchEntry) { + if (strlen($searchEntry) == 0) { + continue; + } + + // test if hash contains salt + if ($isSalted) { + $split = explode($separator, $searchEntry); + $hash = $split[0]; + unset($split[0]); + $salt = implode($separator, $split); + } + else { + $hash = $searchEntry; + $salt = ""; + } + + // TODO: add option to select if exact match or like match + + $filters = array(); + $filters[] = new LikeFilterInsensitive(Hash::HASH, "%" . $hash . "%"); + $filters[] = new ContainFilter(Hash::HASHLIST_ID, Util::arrayOfIds($userHashlists), Factory::getHashFactory()); + if (strlen($salt) > 0) { + $filters[] = new QueryFilter(Hash::SALT, $salt, "="); + } + $jF = new JoinFilter(Factory::getHashlistFactory(), Hash::HASHLIST_ID, Hashlist::HASHLIST_ID); + $joined = Factory::getHashFactory()->filter([Factory::FILTER => $filters, Factory::JOIN => $jF]); + + $qF1 = new LikeFilterInsensitive(Hash::PLAINTEXT, "%" . $searchEntry . "%"); + $qF2 = new ContainFilter(Hash::HASHLIST_ID, Util::arrayOfIds($userHashlists), Factory::getHashFactory()); + $joined2 = Factory::getHashFactory()->filter([Factory::FILTER => [$qF1, $qF2], Factory::JOIN => $jF]); + /** @var $hashes Hash[] */ + $hashes = $joined2[Factory::getHashFactory()->getModelName()]; + for ($i = 0; $i < sizeof($hashes); $i++) { + $joined[Factory::getHashFactory()->getModelName()][] = $joined2[Factory::getHashFactory()->getModelName()][$i]; + $joined[Factory::getHashlistFactory()->getModelName()][] = $joined2[Factory::getHashlistFactory()->getModelName()][$i]; + } + + $resultEntry = []; + /** @var $hashes Hash[] */ + $hashes = $joined[Factory::getHashFactory()->getModelName()]; + if (sizeof($hashes) == 0) { + $resultEntry["found"] = false; + $resultEntry["query"] = $searchEntry; + } + else { + $resultEntry["found"] = true; + $resultEntry["query"] = $searchEntry; + $matches = []; + for ($i = 0; $i < sizeof($hashes); $i++) { + /** @var $hash Hash */ + $hash = $joined[Factory::getHashFactory()->getModelName()][$i]; + $matches[] = $hash; + } + $resultEntry["matches"] = $matches; + } + $resultEntries[] = $resultEntry; + } + return $resultEntries; + } +} + +ImportCrackedHashesHelperAPI::register($app); \ No newline at end of file From 7eac5f71e5e21776c302f2be299aa0e1063ceee5 Mon Sep 17 00:00:00 2001 From: s3inlc Date: Tue, 7 Oct 2025 12:12:14 +0200 Subject: [PATCH 205/691] removed typo --- src/api/v2/index.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/api/v2/index.php b/src/api/v2/index.php index 8e4add55f..2636e934e 100644 --- a/src/api/v2/index.php +++ b/src/api/v2/index.php @@ -317,7 +317,7 @@ public static function addCORSheaders(Request $request, $response) { require __DIR__ . "/../../inc/apiv2/helper/searchHashes.routes.php"; require __DIR__ . "/../../inc/apiv2/helper/setUserPassword.routes.php"; require __DIR__ . "/../../inc/apiv2/helper/taskExtraDetails.routes.php"; -require __DIR__ . "/../../inc/apiv2/helper/unassignAgent.routes.php";add +require __DIR__ . "/../../inc/apiv2/helper/unassignAgent.routes.php"; $app->run(); From a72ca691ee5f5da71dc8b87dc3f2a3063df5ca61 Mon Sep 17 00:00:00 2001 From: Sein Coray Date: Tue, 7 Oct 2025 12:15:49 +0200 Subject: [PATCH 206/691] Update src/inc/apiv2/helper/searchHashes.routes.php Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com> --- src/inc/apiv2/helper/searchHashes.routes.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/inc/apiv2/helper/searchHashes.routes.php b/src/inc/apiv2/helper/searchHashes.routes.php index 51be3ce51..c05a4ec9e 100644 --- a/src/inc/apiv2/helper/searchHashes.routes.php +++ b/src/inc/apiv2/helper/searchHashes.routes.php @@ -149,4 +149,4 @@ public function actionPost($data): object|array|null { } } -ImportCrackedHashesHelperAPI::register($app); \ No newline at end of file +SearchHashesHelperAPI::register($app); \ No newline at end of file From 21113724fe3e024e16fed7a6fd935af7d4081dfe Mon Sep 17 00:00:00 2001 From: Sein Coray Date: Tue, 7 Oct 2025 12:16:23 +0200 Subject: [PATCH 207/691] Update src/inc/apiv2/helper/searchHashes.routes.php Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com> --- src/inc/apiv2/helper/searchHashes.routes.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/inc/apiv2/helper/searchHashes.routes.php b/src/inc/apiv2/helper/searchHashes.routes.php index c05a4ec9e..7cdbe54a9 100644 --- a/src/inc/apiv2/helper/searchHashes.routes.php +++ b/src/inc/apiv2/helper/searchHashes.routes.php @@ -128,7 +128,7 @@ public function actionPost($data): object|array|null { $resultEntry = []; /** @var $hashes Hash[] */ $hashes = $joined[Factory::getHashFactory()->getModelName()]; - if (sizeof($hashes) == 0) { + if (empty($hashes)) { $resultEntry["found"] = false; $resultEntry["query"] = $searchEntry; } From c49ef30fcc66d792cc92bfbc03e8369374b38578 Mon Sep 17 00:00:00 2001 From: Sein Coray Date: Tue, 7 Oct 2025 12:16:34 +0200 Subject: [PATCH 208/691] Update src/inc/apiv2/helper/searchHashes.routes.php Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com> --- src/inc/apiv2/helper/searchHashes.routes.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/inc/apiv2/helper/searchHashes.routes.php b/src/inc/apiv2/helper/searchHashes.routes.php index 7cdbe54a9..2d87a282e 100644 --- a/src/inc/apiv2/helper/searchHashes.routes.php +++ b/src/inc/apiv2/helper/searchHashes.routes.php @@ -64,7 +64,7 @@ public static function getResponse(): array { } /** - * Endpoint to import cracked hashes into a hashlist. + * Endpoint to search for hashes in accessible hashlists. * @throws HttpError */ public function actionPost($data): object|array|null { From 6573e1ae7c2656bdd64fba449ef20bb925449c73 Mon Sep 17 00:00:00 2001 From: Sein Coray Date: Tue, 7 Oct 2025 12:16:42 +0200 Subject: [PATCH 209/691] Update src/inc/apiv2/helper/searchHashes.routes.php Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com> --- src/inc/apiv2/helper/searchHashes.routes.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/inc/apiv2/helper/searchHashes.routes.php b/src/inc/apiv2/helper/searchHashes.routes.php index 2d87a282e..946b7aa4e 100644 --- a/src/inc/apiv2/helper/searchHashes.routes.php +++ b/src/inc/apiv2/helper/searchHashes.routes.php @@ -33,10 +33,10 @@ public function getFormFields(): array { public static function getResponse(): array { return [ - ["found" => False, + ["found" => false, "query" => "12345678", ], - ["found" => True, + ["found" => true, "query" => "54321", "matches" => [[ "hashlistId" => 4, From 953977a8ab6e9f954f40b1a2ba49f97610c42797 Mon Sep 17 00:00:00 2001 From: s3inlc Date: Tue, 7 Oct 2025 14:57:11 +0200 Subject: [PATCH 210/691] fix the version comparison for the agent update process so that the agents get notified if a new version is available --- src/inc/api/APICheckClientVersion.class.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/inc/api/APICheckClientVersion.class.php b/src/inc/api/APICheckClientVersion.class.php index 53d699b31..89ff03151 100644 --- a/src/inc/api/APICheckClientVersion.class.php +++ b/src/inc/api/APICheckClientVersion.class.php @@ -24,7 +24,7 @@ public function execute($QUERY = array()) { } $this->updateAgent(PActions::CHECK_CLIENT_VERSION); - if (Comparator::lessThan($result->getVersion(), $version)) { + if (Comparator::greaterThan($result->getVersion(), $version)) { DServerLog::log(DServerLog::DEBUG, "Agent " . $this->agent->getId() . " got notified about client update"); $this->sendResponse(array( PResponseClientUpdate::ACTION => PActions::CHECK_CLIENT_VERSION, From 360f8600ecf766576f500d97de844e767753dc96 Mon Sep 17 00:00:00 2001 From: s3inlc Date: Tue, 7 Oct 2025 15:24:05 +0200 Subject: [PATCH 211/691] fixed user retrieval for the helper --- src/inc/apiv2/helper/searchHashes.routes.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/inc/apiv2/helper/searchHashes.routes.php b/src/inc/apiv2/helper/searchHashes.routes.php index 946b7aa4e..ce0df0758 100644 --- a/src/inc/apiv2/helper/searchHashes.routes.php +++ b/src/inc/apiv2/helper/searchHashes.routes.php @@ -85,8 +85,8 @@ public function actionPost($data): object|array|null { $search = str_replace("\r\n", "\n", $search); $search = explode("\n", $search); $resultEntries = array(); - $userHashlists = HashlistUtils::getHashlists(Login::getInstance()->getUser(), false); - $userHashlists += HashlistUtils::getHashlists(Login::getInstance()->getUser(), true); + $userHashlists = HashlistUtils::getHashlists(self::getCurrentUser(), false); + $userHashlists += HashlistUtils::getHashlists(self::getCurrentUser(), true); foreach ($search as $searchEntry) { if (strlen($searchEntry) == 0) { continue; From 647983d6f251eda677199683b92d21312d431a0b Mon Sep 17 00:00:00 2001 From: s3inlc Date: Tue, 7 Oct 2025 15:30:45 +0200 Subject: [PATCH 212/691] get rid of the warning that index key 0 does not exist because there are no entries in empty tables --- src/inc/apiv2/common/AbstractModelAPI.class.php | 3 +++ 1 file changed, 3 insertions(+) diff --git a/src/inc/apiv2/common/AbstractModelAPI.class.php b/src/inc/apiv2/common/AbstractModelAPI.class.php index 04185ff61..1a7655fce 100644 --- a/src/inc/apiv2/common/AbstractModelAPI.class.php +++ b/src/inc/apiv2/common/AbstractModelAPI.class.php @@ -579,6 +579,9 @@ protected static function getMinMaxCursor($apiClass, string $sort, array $filter if (array_key_exists(Factory::JOIN, $filters)) { $result = $result[$factory->getModelname()]; } + if (sizeof($result) == 0) { + return null; + } return $result[0]; } From d67c3dc099545c995270e8afa4394742ff152ab6 Mon Sep 17 00:00:00 2001 From: jessevz Date: Tue, 7 Oct 2025 15:38:47 +0200 Subject: [PATCH 213/691] Fixed code review --- src/api/v2/index.php | 2 +- src/inc/apiv2/helper/getCracksOfTask.routes.php | 11 ++++++----- 2 files changed, 7 insertions(+), 6 deletions(-) diff --git a/src/api/v2/index.php b/src/api/v2/index.php index bf1f76f91..c20635439 100644 --- a/src/api/v2/index.php +++ b/src/api/v2/index.php @@ -306,6 +306,7 @@ public static function addCORSheaders(Request $request, $response) { require __DIR__ . "/../../inc/apiv2/helper/exportWordlist.routes.php"; require __DIR__ . "/../../inc/apiv2/helper/getAccessGroups.routes.php"; require __DIR__ . "/../../inc/apiv2/helper/getAgentBinary.routes.php"; +require __DIR__ . "/../../inc/apiv2/helper/getCracksOfTask.routes.php"; require __DIR__ . "/../../inc/apiv2/helper/getFile.routes.php"; require __DIR__ . "/../../inc/apiv2/helper/getUserPermission.routes.php"; require __DIR__ . "/../../inc/apiv2/helper/importCrackedHashes.routes.php"; @@ -317,6 +318,5 @@ public static function addCORSheaders(Request $request, $response) { require __DIR__ . "/../../inc/apiv2/helper/setUserPassword.routes.php"; require __DIR__ . "/../../inc/apiv2/helper/taskExtraDetails.routes.php"; require __DIR__ . "/../../inc/apiv2/helper/unassignAgent.routes.php"; -require __DIR__ . "/../../inc/apiv2/helper/getCracksOfTask.routes.php"; $app->run(); diff --git a/src/inc/apiv2/helper/getCracksOfTask.routes.php b/src/inc/apiv2/helper/getCracksOfTask.routes.php index b74157ef2..6e1b7669b 100644 --- a/src/inc/apiv2/helper/getCracksOfTask.routes.php +++ b/src/inc/apiv2/helper/getCracksOfTask.routes.php @@ -7,13 +7,14 @@ use Psr\Http\Message\ServerRequestInterface as Request; use DBA\Factory; use DBA\Hash; +use DBA\Hashlist; use DBA\QueryFilter; use DBA\Task; use Middlewares\Utils\HttpErrorException; require_once(dirname(__FILE__) . "/../common/AbstractHelperAPI.class.php"); -class getCracksOfTaskHelper extends AbstractHelperAPI { +class GetCracksOfTaskHelper extends AbstractHelperAPI { public static function getBaseUri(): string { return "/api/v2/helper/getCracksOfTask"; } @@ -23,7 +24,7 @@ public static function getAvailableMethods(): array { } public function getRequiredPermissions(string $method): array { - return [Hash::PERM_READ, Task::PERM_READ]; + return [Hashlist::PERM_READ, Hash::PERM_READ, Task::PERM_READ]; } public static function getResponse(): null { @@ -63,7 +64,7 @@ public function getParamsSwagger(): array { */ public function handleGet(Request $request, Response $response): Response { $this->preCommon($request); - $task = Factory::getTaskFactory()->get($_GET['task']); + $task = Factory::getTaskFactory()->get($request->getQueryParams()['task']); if ($task == null) { throw new HttpError("No task has been found with provided task id"); } @@ -98,7 +99,7 @@ public function handleGet(Request $request, Response $response): Response { } static public function register($app): void { - $baseUri = getCracksOfTaskHelper::getBaseUri(); + $baseUri = GetCracksOfTaskHelper::getBaseUri(); /* Allow CORS preflight requests */ $app->options($baseUri, function (Request $request, Response $response): Response { @@ -108,4 +109,4 @@ static public function register($app): void { } } -getCracksOfTaskHelper::register($app); \ No newline at end of file +GetCracksOfTaskHelper::register($app); \ No newline at end of file From 6f62ebee07e48982985d64ffd92d5d1cb1f526fe Mon Sep 17 00:00:00 2001 From: s3inlc Date: Tue, 7 Oct 2025 16:56:23 +0200 Subject: [PATCH 214/691] reverted changes of saltSeparator to separator and fixed where the root of the issue was with base64 date not decoded before processing --- src/inc/apiv2/helper/importCrackedHashes.routes.php | 4 +++- src/inc/apiv2/model/hashlists.routes.php | 4 ++-- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/src/inc/apiv2/helper/importCrackedHashes.routes.php b/src/inc/apiv2/helper/importCrackedHashes.routes.php index 2248d5512..5c2ca9ee7 100644 --- a/src/inc/apiv2/helper/importCrackedHashes.routes.php +++ b/src/inc/apiv2/helper/importCrackedHashes.routes.php @@ -50,7 +50,9 @@ public static function getResponse(): array { public function actionPost($data): object|array|null { $hashlist = self::getHashlist($data[Hashlist::HASHLIST_ID]); - $result = HashlistUtils::processZap($hashlist->getId(), $data["separator"], "paste", ["hashfield" => $data["sourceData"]], [], $this->getCurrentUser()); + $importData = base64_decode($data["sourceData"]); + + $result = HashlistUtils::processZap($hashlist->getId(), $data["separator"], "paste", ["hashfield" => $importData], [], $this->getCurrentUser()); return [ "totalLines" => $result[0], diff --git a/src/inc/apiv2/model/hashlists.routes.php b/src/inc/apiv2/model/hashlists.routes.php index 69c10f78d..99eda1fe6 100644 --- a/src/inc/apiv2/model/hashlists.routes.php +++ b/src/inc/apiv2/model/hashlists.routes.php @@ -135,10 +135,10 @@ protected function createObject(array $data): int { $data[Hashlist::IS_SALTED], $data[Hashlist::IS_SECRET], $data[Hashlist::HEX_SALT], - $data["separator"] ?? "", + $data["saltSeparator"] ?? "", $data[Hashlist::FORMAT], $data[Hashlist::HASH_TYPE_ID], - $data[Hashlist::SALT_SEPARATOR] ?? $data["separator"] ?? "", + $data[Hashlist::SALT_SEPARATOR] ?? $data["saltSeparator"] ?? "", $data[UQueryHashlist::HASHLIST_ACCESS_GROUP_ID], $data["sourceType"], $dummyPost, From c3c061aaec822d487ca31e5a03ac6f3647fdf19e Mon Sep 17 00:00:00 2001 From: s3inlc Date: Tue, 7 Oct 2025 17:36:48 +0200 Subject: [PATCH 215/691] 'user' should be 'users' in the array handed to the underlaying function --- src/inc/apiv2/model/notifications.routes.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/inc/apiv2/model/notifications.routes.php b/src/inc/apiv2/model/notifications.routes.php index 91ee5a242..2bea8d61b 100644 --- a/src/inc/apiv2/model/notifications.routes.php +++ b/src/inc/apiv2/model/notifications.routes.php @@ -47,7 +47,7 @@ protected function createObject(array $data): int { $dummyPost = []; switch (DNotificationType::getObjectType($data[NotificationSetting::ACTION])) { case DNotificationObjectType::USER: - $dummyPost['user'] = $data['actionFilter']; + $dummyPost['users'] = $data['actionFilter']; break; case DNotificationObjectType::AGENT: $dummyPost['agents'] = $data['actionFilter']; From 26ddb8b611928011925102c5221b9b6f2abd127f Mon Sep 17 00:00:00 2001 From: Eric Wasson <229096365+Eric-Wasson@users.noreply.github.com> Date: Tue, 7 Oct 2025 17:48:54 +0200 Subject: [PATCH 216/691] Fixed deprecated feature policy header and added some new permissions to deny that aren't needed --- 000-default.conf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/000-default.conf b/000-default.conf index dd2b8133e..fd3e8444e 100644 --- a/000-default.conf +++ b/000-default.conf @@ -12,7 +12,7 @@ Require all granted Header always set Referrer-Policy "same-origin" - Header always set Feature-Policy "geolocation none;midi none;notifications none;push none;sync-xhr self;microphone none;camera none;magnetometer none;gyroscope none;speaker none;vibrate none;fullscreen self;payment none;" + Header always set Permissions-Policy "geolocation none;midi none;notifications none;push none;sync-xhr self;microphone none;camera none;magnetometer none;gyroscope none;speaker none;vibrate none;fullscreen self;payment none;bluetooth none;display-capture none;usb none;" Header always set Content-Security-Policy "frame-ancestors 'none';" Header always set X-Frame-Options "DENY" Header always set X-Content-Type-Options "nosniff" From 39843909a85a58b302235fa884ad8861b9206a0e Mon Sep 17 00:00:00 2001 From: s3inlc Date: Wed, 8 Oct 2025 08:44:11 +0200 Subject: [PATCH 217/691] fix the tests for the cracked import where the data needs to be base64 encoded and sent in the json --- ci/apiv2/hashtopolis.py | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/ci/apiv2/hashtopolis.py b/ci/apiv2/hashtopolis.py index 211b5c815..0578c6763 100644 --- a/ci/apiv2/hashtopolis.py +++ b/ci/apiv2/hashtopolis.py @@ -4,6 +4,7 @@ # PoC testing/development framework for APIv2 # Written in python to work on creation of hashtopolis APIv2 python binding. # +import base64 from base64 import b64encode import copy import json @@ -1022,10 +1023,10 @@ def export_wordlist(self, hashlist): response = self._helper_request("exportWordlist", payload) return File(**response['data']) - def import_cracked_hashes(self, hashlist, source_data, separator): + def import_cracked_hashes(self, hashlist, source_data: str, separator): payload = { 'hashlistId': hashlist.id, - 'sourceData': source_data, + 'sourceData': base64.b64encode(source_data.encode()).decode(), 'separator': separator, } response = self._helper_request("importCrackedHashes", payload) From 9acba5de54fb1453a6a7a9a5a5710fc67ba002d3 Mon Sep 17 00:00:00 2001 From: s3inlc Date: Wed, 8 Oct 2025 09:46:28 +0200 Subject: [PATCH 218/691] updated purgeTask process to also reset the cracked count in the taskwrapper, added some comments to make purge process better understandable --- src/inc/utils/TaskUtils.class.php | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/src/inc/utils/TaskUtils.class.php b/src/inc/utils/TaskUtils.class.php index dbdbde179..296ceaae2 100644 --- a/src/inc/utils/TaskUtils.class.php +++ b/src/inc/utils/TaskUtils.class.php @@ -541,22 +541,34 @@ public static function purgeTask($taskId, $user) { throw new HTException("No access to this task!"); } Factory::getAgentFactory()->getDB()->beginTransaction(); + + // reset all benchmarks on assignments $qF = new QueryFilter(Assignment::TASK_ID, $task->getId(), "="); $uS = new UpdateSet(Assignment::BENCHMARK, 0); Factory::getAssignmentFactory()->massUpdate([Factory::FILTER => $qF, Factory::UPDATE => $uS]); + + // get all chunk ids of this task $chunks = Factory::getChunkFactory()->filter([Factory::FILTER => $qF]); $chunkIds = array(); foreach ($chunks as $chunk) { $chunkIds[] = $chunk->getId(); } if (sizeof($chunkIds) > 0) { + // remove relation of all hashes which were cracked with the chunks which are going to be deleted $qF2 = new ContainFilter(Hash::CHUNK_ID, $chunkIds); $uS = new UpdateSet(Hash::CHUNK_ID, null); Factory::getHashFactory()->massUpdate([Factory::FILTER => $qF2, Factory::UPDATE => $uS]); Factory::getHashBinaryFactory()->massUpdate([Factory::FILTER => $qF2, Factory::UPDATE => $uS]); } + + // delete all chunks and set keyspace and progress of task to 0 Factory::getChunkFactory()->massDeletion([Factory::FILTER => $qF]); Factory::getTaskFactory()->mset($task, [Task::KEYSPACE => 0, Task::KEYSPACE_PROGRESS => 0]); + + // set cracked count of taskwrapper to 0 + $taskWrapper->setCracked(0); + Factory::getTaskWrapperFactory()->update($taskWrapper); + Factory::getAgentFactory()->getDB()->commit(); } From 8797f45bc6bb0100ef6d6c35d1bac174b6565251 Mon Sep 17 00:00:00 2001 From: s3inlc Date: Wed, 8 Oct 2025 14:36:26 +0200 Subject: [PATCH 219/691] fixed searchHashes helper to return the objects properly --- src/inc/apiv2/helper/searchHashes.routes.php | 78 +++++++++++++++----- 1 file changed, 60 insertions(+), 18 deletions(-) diff --git a/src/inc/apiv2/helper/searchHashes.routes.php b/src/inc/apiv2/helper/searchHashes.routes.php index ce0df0758..9c8731aa1 100644 --- a/src/inc/apiv2/helper/searchHashes.routes.php +++ b/src/inc/apiv2/helper/searchHashes.routes.php @@ -39,25 +39,67 @@ public static function getResponse(): array { ["found" => true, "query" => "54321", "matches" => [[ - "hashlistId" => 4, - "hash" => "5432173922", - "salt" => "", - "plaintext" => "plain", - "timeCracked" => 0, - "chunkId" => null, - "isCracked" => true, - "crackPos" => 0, + "type" => "hash", + "id" => 552, + "attributes" => [ + "hashlistId" => 5, + "hash" => "7682543218768", + "salt" => "", + "plaintext" => "", + "timeCracked" => 0, + "chunkId" => null, + "isCracked" => false, + "crackPos" => 0 + ], + "links" => [ + "self" => "/api/v2/ui/hashes/552" + ], + "relationships" => [ + "chunk" => [ + "links" => [ + "self" => "/api/v2/ui/hashes/552/relationships/chunk", + "related" => "/api/v2/ui/hashes/552/chunk" + ] + ], + "hashlist" => [ + "links" => [ + "self" => "/api/v2/ui/hashes/552/relationships/hashlist", + "related" => "/api/v2/ui/hashes/552/hashlist" + ] + ] + ] ], [ - "hashlistId" => 4, - "hash" => "12345654321", - "salt" => "", - "plaintext" => "", - "timeCracked" => 0, - "chunkId" => null, - "isCracked" => false, - "crackPos" => 0, - ] + "type" => "hash", + "id" => 1, + "attributes" => [ + "hashlistId" => 5, + "hash" => "54321768671", + "salt" => "", + "plaintext" => "", + "timeCracked" => 0, + "chunkId" => null, + "isCracked" => false, + "crackPos" => 0 + ], + "links" => [ + "self" => "/api/v2/ui/hashes/1" + ], + "relationships" => [ + "chunk" => [ + "links" => [ + "self" => "/api/v2/ui/hashes/1/relationships/chunk", + "related" => "/api/v2/ui/hashes/1/chunk" + ] + ], + "hashlist" => [ + "links" => [ + "self" => "/api/v2/ui/hashes/1/relationships/hashlist", + "related" => "/api/v2/ui/hashes/1/hashlist" + ] + ] + ] + ], ], ] ]; @@ -139,7 +181,7 @@ public function actionPost($data): object|array|null { for ($i = 0; $i < sizeof($hashes); $i++) { /** @var $hash Hash */ $hash = $joined[Factory::getHashFactory()->getModelName()][$i]; - $matches[] = $hash; + $matches[] = self::obj2Resource($hash);; } $resultEntry["matches"] = $matches; } From 9e739062b295a8b9c6a73dba54c6364f8930795c Mon Sep 17 00:00:00 2001 From: s3inlc Date: Wed, 8 Oct 2025 16:11:29 +0200 Subject: [PATCH 220/691] prepare for pre-release 1.0.0-rainbow --- doc/changelog.md | 4 +++- src/inc/info.php | 2 +- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/doc/changelog.md b/doc/changelog.md index b70c8afd2..aa2d41bac 100644 --- a/doc/changelog.md +++ b/doc/changelog.md @@ -1,15 +1,17 @@ # Changelog -## v0.14.6 -> vx.x.x +## v0.14.6 -> v1.0.0-rainbow **Enhancements** - Updated OpenAPI docs to latest API updates - Improved version comparison to avoid update script issues +- Many more enhancements to improve functionality on new frontend **Bugfixes** - Fixed missing .htaccess to avoid access to install directory on docker setups +- Many more bugfixes to work correctly with the new frontend ## v0.14.5 -> v0.14.6 diff --git a/src/inc/info.php b/src/inc/info.php index 0a452c42a..bf86fac9c 100644 --- a/src/inc/info.php +++ b/src/inc/info.php @@ -1,6 +1,6 @@ Date: Wed, 8 Oct 2025 16:23:33 +0200 Subject: [PATCH 221/691] force confidence to version 0.16 as there is a bug in 0.17 --- ci/apiv2/requirements.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ci/apiv2/requirements.txt b/ci/apiv2/requirements.txt index ee8311e29..231ced6ea 100644 --- a/ci/apiv2/requirements.txt +++ b/ci/apiv2/requirements.txt @@ -1,5 +1,5 @@ click click_log -confidence +confidence==0.17 pytest tuspy From bbdd8195e20a911581aae984f3708053642f5203 Mon Sep 17 00:00:00 2001 From: gluafamichl <> Date: Mon, 13 Oct 2025 14:34:24 +0200 Subject: [PATCH 222/691] Add: return cprogress from TaskExtraDetailHelper, required for frontend's Visual Graph component --- src/inc/apiv2/helper/taskExtraDetails.routes.php | 1 + 1 file changed, 1 insertion(+) diff --git a/src/inc/apiv2/helper/taskExtraDetails.routes.php b/src/inc/apiv2/helper/taskExtraDetails.routes.php index 7b74c2555..b471827fe 100644 --- a/src/inc/apiv2/helper/taskExtraDetails.routes.php +++ b/src/inc/apiv2/helper/taskExtraDetails.routes.php @@ -80,6 +80,7 @@ public function handleGet(Request $request, Response $response): Response { "estimatedTime" => $estimatedTime, "timeSpent" => $timeSpent, "currentSpeed" => $currentSpeed, + "cprogress" => $cProgress, ]; return self::getMetaResponse($responseObject, $request, $response); From b24188954da8b38ebf7a05704527807ebc32a4ab Mon Sep 17 00:00:00 2001 From: jessevz Date: Mon, 13 Oct 2025 16:46:40 +0200 Subject: [PATCH 223/691] Fixed error in tests by removing deprecated {extension} from new confidence version --- ci/apiv2/hashtopolis.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/ci/apiv2/hashtopolis.py b/ci/apiv2/hashtopolis.py index 0578c6763..1d98f8735 100644 --- a/ci/apiv2/hashtopolis.py +++ b/ci/apiv2/hashtopolis.py @@ -52,9 +52,9 @@ def __init__(self, *args, **kwargs): class HashtopolisConfig(object): def __init__(self): # Request access TOKEN, used throughout the test - load_order = (str(Path(__file__).parent.joinpath('{name}-defaults.{extension}')),) \ + load_order = (str(Path(__file__).parent.joinpath('{name}-defaults{suffix}')),) \ + confidence.DEFAULT_LOAD_ORDER - self._cfg = confidence.load_name('hashtopolis-test', load_order=load_order) + self._cfg = confidence.load_name('hashtopolis-test', load_order=load_order, format=confidence.YAML()) self._hashtopolis_uri = self._cfg['hashtopolis_uri'] self._api_endpoint = self._hashtopolis_uri + '/api/v2' self.username = self._cfg['username'] From ff3d699a4f5c8c3727cfa5d89e85ab51b4720b54 Mon Sep 17 00:00:00 2001 From: jessevz Date: Mon, 13 Oct 2025 16:59:16 +0200 Subject: [PATCH 224/691] Also applied the same fix in hashtopolis_agent.py --- ci/apiv2/hashtopolis_agent.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/ci/apiv2/hashtopolis_agent.py b/ci/apiv2/hashtopolis_agent.py index 48a3bb996..703cbb7ad 100644 --- a/ci/apiv2/hashtopolis_agent.py +++ b/ci/apiv2/hashtopolis_agent.py @@ -46,9 +46,9 @@ class ProcessState(enum.IntEnum): class HashtopolisConfig(object): def __init__(self): # Request access TOKEN, used throughout the test - load_order = (str(Path(__file__).parent.joinpath('{name}-defaults.{extension}')),) \ + load_order = (str(Path(__file__).parent.joinpath('{name}-defaults{suffix}')),) \ + confidence.DEFAULT_LOAD_ORDER - self._cfg = confidence.load_name('hashtopolis-test', load_order=load_order) + self._cfg = confidence.load_name('hashtopolis-test', load_order=load_order, format=confidence.YAML()) self._hashtopolis_uri = self._cfg['hashtopolis_uri'] self._api_endpoint = self._hashtopolis_uri + '/api/v2' self.username = self._cfg['username'] From e27c7a3b8826591f0be8ba924b7920fa6191461b Mon Sep 17 00:00:00 2001 From: jessevz Date: Mon, 13 Oct 2025 17:06:25 +0200 Subject: [PATCH 225/691] Applied same fix --- ci/apiv2/hashtopolis_agent.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/ci/apiv2/hashtopolis_agent.py b/ci/apiv2/hashtopolis_agent.py index 703cbb7ad..f515eb01c 100644 --- a/ci/apiv2/hashtopolis_agent.py +++ b/ci/apiv2/hashtopolis_agent.py @@ -60,9 +60,9 @@ class DummyAgent(object): # State: Early Alpha def __init__(self, token=None, voucher=None): # Request access TOKEN, used throughout the test - load_order = (str(Path(__file__).parent.joinpath('{name}-defaults.{extension}')),) \ + load_order = (str(Path(__file__).parent.joinpath('{name}-defaults{suffix}')),) \ + confidence.DEFAULT_LOAD_ORDER - self._cfg = confidence.load_name('hashtopolis-test', load_order=load_order) + self._cfg = confidence.load_name('hashtopolis-test', load_order=load_order, format=confidence.YAML()) self._hashtopolis_uri = self._cfg['hashtopolis_uri'] self._api_endpoint = self._hashtopolis_uri + '/api/server.php' From 671c7116a2625d83205ace8d26bee5330eab9659 Mon Sep 17 00:00:00 2001 From: s3inlc Date: Thu, 16 Oct 2025 10:39:31 +0200 Subject: [PATCH 226/691] enforce confidence 0.16 on test docker build to avoid problems --- Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index 9333ebf4c..53afdc371 100644 --- a/Dockerfile +++ b/Dockerfile @@ -125,7 +125,7 @@ RUN apt-get update \ && apt-get install -y python3 python3-pip python3-requests python3-pytest #TODO: Should source from ./ci/apiv2/requirements.txt -RUN pip3 install click click_log confidence pytest tuspy --break-system-packages +RUN pip3 install click click_log confidence==0.16 pytest tuspy --break-system-packages # Adding VSCode user and fixing permissions RUN groupadd vscode && useradd -rm -d /var/www -s /bin/bash -g vscode -G www-data -u 1001 vscode \ From 24b38de5d46955f6531a53b72813a7c6f10adca1 Mon Sep 17 00:00:00 2001 From: s3inlc Date: Thu, 16 Oct 2025 13:30:19 +0200 Subject: [PATCH 227/691] prepare for release --- doc/changelog.md | 10 ++++++++++ src/inc/info.php | 2 +- 2 files changed, 11 insertions(+), 1 deletion(-) diff --git a/doc/changelog.md b/doc/changelog.md index aa2d41bac..c65aabaa5 100644 --- a/doc/changelog.md +++ b/doc/changelog.md @@ -1,5 +1,15 @@ # Changelog +## v1.0.0-rainbow -> v1.0.0-rainbow2 + +**Enhancements** + +- Return cprogress from TaskExtraDetailHelper, required for frontend's Visual Graph component (#1674) + +**Bugfixes** + +- Fixed searchHashes helper to return the objects properly (#1662) + ## v0.14.6 -> v1.0.0-rainbow **Enhancements** diff --git a/src/inc/info.php b/src/inc/info.php index bf86fac9c..50046b3e4 100644 --- a/src/inc/info.php +++ b/src/inc/info.php @@ -1,6 +1,6 @@ Date: Thu, 16 Oct 2025 16:06:15 +0200 Subject: [PATCH 228/691] Bugfix: only use the mask as subtask name in supertask import to avoid too long names --- src/inc/utils/SupertaskUtils.class.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/inc/utils/SupertaskUtils.class.php b/src/inc/utils/SupertaskUtils.class.php index 0a7d7670d..7e77053ca 100644 --- a/src/inc/utils/SupertaskUtils.class.php +++ b/src/inc/utils/SupertaskUtils.class.php @@ -422,7 +422,7 @@ private static function createImportPretasks($masks, $isSmall, $maxAgents, $isCp } $cmd = str_replace("COMMA_PLACEHOLDER", "\\,", $cmd); $cmd = str_replace("HASH_PLACEHOLDER", "\\#", $cmd); - $preTaskName = implode(",", $mask); + $preTaskName = $pattern; $preTaskName = str_replace("COMMA_PLACEHOLDER", "\\,", $preTaskName); $preTaskName = str_replace("HASH_PLACEHOLDER", "\\#", $preTaskName); @@ -510,4 +510,4 @@ public static function addPretaskToSupertask($supertaskId, $pretaskId) { $supertaskPretask = new SupertaskPretask(null, $supertaskId, $pretaskId); Factory::getSupertaskPretaskFactory()->save($supertaskPretask); } -} \ No newline at end of file +} From d897121fb40f55a43098d794e3625bee18acae40 Mon Sep 17 00:00:00 2001 From: Eric Wasson <229096365+Eric-Wasson@users.noreply.github.com> Date: Thu, 23 Oct 2025 15:51:53 +0200 Subject: [PATCH 229/691] Implemented fetching sparse fieldsets of JSON API standard in new API --- .../apiv2/common/AbstractBaseAPI.class.php | 20 ++++++++++++++----- .../apiv2/common/AbstractModelAPI.class.php | 7 ++++--- 2 files changed, 19 insertions(+), 8 deletions(-) diff --git a/src/inc/apiv2/common/AbstractBaseAPI.class.php b/src/inc/apiv2/common/AbstractBaseAPI.class.php index f0890cf82..e61bb11c6 100644 --- a/src/inc/apiv2/common/AbstractBaseAPI.class.php +++ b/src/inc/apiv2/common/AbstractBaseAPI.class.php @@ -551,7 +551,7 @@ protected function obj2Array(object $obj): array { * @throws NotFoundExceptionInterface * @throws ContainerExceptionInterface */ - protected function obj2Resource(object $obj, array $expandResult = []): array { + protected function obj2Resource(object $obj, array $expandResult = [], array $sparseFieldsets = null): array { // Convert values to JSON supported types $features = $obj->getFeatures(); $kv = $obj->getKeyValueDict(); @@ -569,6 +569,16 @@ protected function obj2Resource(object $obj, array $expandResult = []): array { if ($feature['private'] === true) { continue; } + + // If sparse fieldsets (https://jsonapi.org/format/#fetching-sparse-fieldsets) is used, return only the requested data + if (is_array($sparseFieldsets)) { + if (array_key_exists($this->getObjectTypeName($obj), $sparseFieldsets)) { + if (!in_array($feature['alias'], $sparseFieldsets[$this->getObjectTypeName($obj)])) { + continue; + } + } + } + // Hide the primaryKey from the attributes since this is used as indentifier (id) in response if ($feature['pk'] === true) { continue; @@ -1420,7 +1430,7 @@ protected static function getOneResource(object $apiClass, object $object, Reque // Convert objects to data resources foreach ($objects as $object) { // Create object - $newObject = $apiClass->obj2Resource($object, $expandResult); + $newObject = $apiClass->obj2Resource($object, $expandResult, $request->getQueryParams()['fields'] ?? null); // For compound document, included resources foreach ($expands as $expand) { @@ -1428,7 +1438,7 @@ protected static function getOneResource(object $apiClass, object $object, Reque $expandResultObject = $expandResult[$expand][$object->getId()]; if (is_array($expandResultObject)) { foreach ($expandResultObject as $expandObject) { - $includedResources[] = $apiClass->obj2Resource($expandObject); + $includedResources[] = $apiClass->obj2Resource($expandObject, [], $request->getQueryParams()['fields'] ?? null); } } else { @@ -1436,7 +1446,7 @@ protected static function getOneResource(object $apiClass, object $object, Reque // to-only relation which is nullable continue; } - $includedResources[] = $apiClass->obj2Resource($expandResultObject); + $includedResources[] = $apiClass->obj2Resource($expandResultObject, [], $request->getQueryParams()['fields'] ?? null); } } } @@ -1483,4 +1493,4 @@ protected static function getMetaResponse(array $meta, Request $request, Respons static public function getAvailableMethods(): array { return ["GET", "POST", "PATCH", "DELETE"]; } -} \ No newline at end of file +} diff --git a/src/inc/apiv2/common/AbstractModelAPI.class.php b/src/inc/apiv2/common/AbstractModelAPI.class.php index 1a7655fce..d94d9d0a4 100644 --- a/src/inc/apiv2/common/AbstractModelAPI.class.php +++ b/src/inc/apiv2/common/AbstractModelAPI.class.php @@ -747,7 +747,7 @@ public static function getManyResources(object $apiClass, Request $request, Resp // Convert objects to data resources foreach ($objects as $object) { // Create object - $newObject = $apiClass->obj2Resource($object, $expandResult); + $newObject = $apiClass->obj2Resource($object, $expandResult, $request->getQueryParams()['fields'] ?? null); // For compound document, included resources foreach ($expands as $expand) { @@ -755,14 +755,14 @@ public static function getManyResources(object $apiClass, Request $request, Resp $expandResultObject = $expandResult[$expand][$object->getId()]; if (is_array($expandResultObject)) { foreach ($expandResultObject as $expandObject) { - $includedResources = self::addToRelatedResources($includedResources, $apiClass->obj2Resource($expandObject)); + $includedResources = self::addToRelatedResources($includedResources, $apiClass->obj2Resource($expandObject, [], $request->getQueryParams()['fields'] ?? null)); } } else { if ($expandResultObject === null) { // to-only relation which is nullable continue; } - $includedResources = self::addToRelatedResources($includedResources, $apiClass->obj2Resource($expandResultObject)); + $includedResources = self::addToRelatedResources($includedResources, $apiClass->obj2Resource($expandResultObject, [], $request->getQueryParams()['fields'] ?? null)); } } } @@ -770,6 +770,7 @@ public static function getManyResources(object $apiClass, Request $request, Resp // Add to result output $dataResources[] = $newObject; } + $baseUrl = Util::buildServerUrl(); //build last link $lastParams = $request->getQueryParams(); From 2fe8c0ca2d36e6e1a2fae6c02abcee934dafb66c Mon Sep 17 00:00:00 2001 From: s3inlc Date: Fri, 24 Oct 2025 13:51:38 +0200 Subject: [PATCH 230/691] prepare for release --- doc/changelog.md | 11 +++++++++++ src/inc/info.php | 2 +- 2 files changed, 12 insertions(+), 1 deletion(-) diff --git a/doc/changelog.md b/doc/changelog.md index c65aabaa5..e5f288f30 100644 --- a/doc/changelog.md +++ b/doc/changelog.md @@ -1,5 +1,16 @@ # Changelog +## v1.0.0-rainbow2 -> v1.0.0-rainbow3 + +**Enhancements** + +- No hard error when permission is missing from includes (#1627) + +**Bugfixes** + +- Only use the mask as subtask name in supertask import to avoid too long names (#1681) +- Fixed error in tests by removing deprecated {extension} from new confidence version (#1677) + ## v1.0.0-rainbow -> v1.0.0-rainbow2 **Enhancements** diff --git a/src/inc/info.php b/src/inc/info.php index 50046b3e4..e040382f0 100644 --- a/src/inc/info.php +++ b/src/inc/info.php @@ -1,6 +1,6 @@ Date: Fri, 24 Oct 2025 13:55:54 +0200 Subject: [PATCH 231/691] lift confidence version limitation as update problem is fixed now --- Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index 53afdc371..9333ebf4c 100644 --- a/Dockerfile +++ b/Dockerfile @@ -125,7 +125,7 @@ RUN apt-get update \ && apt-get install -y python3 python3-pip python3-requests python3-pytest #TODO: Should source from ./ci/apiv2/requirements.txt -RUN pip3 install click click_log confidence==0.16 pytest tuspy --break-system-packages +RUN pip3 install click click_log confidence pytest tuspy --break-system-packages # Adding VSCode user and fixing permissions RUN groupadd vscode && useradd -rm -d /var/www -s /bin/bash -g vscode -G www-data -u 1001 vscode \ From 02e16107c067eb9ade5a6a500da5756dc407f8c8 Mon Sep 17 00:00:00 2001 From: jessevz Date: Mon, 27 Oct 2025 16:23:03 +0100 Subject: [PATCH 232/691] Fixed status calculation in backend --- src/inc/apiv2/model/tasks.routes.php | 36 +++++++++++++++------------- 1 file changed, 20 insertions(+), 16 deletions(-) diff --git a/src/inc/apiv2/model/tasks.routes.php b/src/inc/apiv2/model/tasks.routes.php index c62b1caf1..89663653f 100644 --- a/src/inc/apiv2/model/tasks.routes.php +++ b/src/inc/apiv2/model/tasks.routes.php @@ -4,6 +4,7 @@ use DBA\Factory; use DBA\Agent; +use DBA\Aggregation; use DBA\Assignment; use DBA\Chunk; use DBA\CrackerBinary; @@ -162,32 +163,35 @@ protected function createObject(array $data): int { //TODO make aggregate data queryable and not included by default static function aggregateData(object $object): array { + $qF = new QueryFilter(Assignment::TASK_ID, $object->getId(), "="); + $activeAgents = Factory::getAssignmentFactory()->countFilter([Factory::FILTER => $qF]); + $aggregatedData["activeAgents"] = $activeAgents; + $keyspace = $object->getKeyspace(); $keyspaceProgress = $object->getKeyspaceProgress(); + $qF1 = new QueryFilter(Chunk::TASK_ID, $object->getId(), "="); + $agg1 = new Aggregation(Chunk::CHECKPOINT, Aggregation::SUM); + $agg2 = new Aggregation(Chunk::SKIP, Aggregation::SUM); + $agg3 = new Aggregation(Chunk::DISPATCH_TIME, Aggregation::MAX); + $agg4 = new Aggregation(Chunk::SOLVE_TIME, Aggregation::MAX); + $results = Factory::getChunkFactory()->multicolAggregationFilter([Factory::FILTER => $qF1], [$agg1, $agg2, $agg3, $agg4]); + + $progress = $results[$agg1->getName()] - $results[$agg2->getName()]; + $maxTime = max($results[$agg3->getName()], $results[$agg4->getName()]); + + //status 1 is running, 2 is idle and 3 is completed + $status = 2; + if (time() - $maxTime < SConfig::getInstance()->getVal(DConfig::CHUNK_TIMEOUT) && ($progress < $object->getKeyspace() || $object->getUsePreprocessor() && $object->getKeyspace() == DPrince::PRINCE_KEYSPACE)) { + $status = 1; + } $aggregatedData["dispatched"] = Util::showperc($keyspaceProgress, $keyspace); $aggregatedData["searched"] = Util::showperc(TaskUtils::getTaskProgress($object), $keyspace); - $qF = new QueryFilter(Chunk::TASK_ID, $object->getId(), "="); - $chunks = Factory::getChunkFactory()->filter([Factory::FILTER => $qF]); - - $activeAgents = []; - foreach ($chunks as $chunk) { - if (time() - max($chunk->getSolveTime(), $chunk->getDispatchTime()) < SConfig::getInstance()->getVal(DConfig::CHUNK_TIMEOUT) && $chunk->getProgress() < 10000) { - $activeAgents[$chunk->getAgentId()] = true; - } - } - - //status 1 is running, 2 is idle and 3 is completed - $status = 2; if ($keyspaceProgress >= $keyspace && $keyspaceProgress > 0) { $status = 3; } - elseif (count($activeAgents) > 0) { - $status = 1; - } - $aggregatedData["activeAgents"] = array_keys($activeAgents); $aggregatedData["status"] = $status; return $aggregatedData; From cd61bffe03fa03b3b4f7b512013c7172e05b042f Mon Sep 17 00:00:00 2001 From: Eric Wasson <229096365+Eric-Wasson@users.noreply.github.com> Date: Mon, 27 Oct 2025 16:24:35 +0100 Subject: [PATCH 233/691] Added sparse fieldset support for the aggregated data --- .../apiv2/common/AbstractBaseAPI.class.php | 5 +- src/inc/apiv2/model/tasks.routes.php | 57 +++++++++++-------- 2 files changed, 36 insertions(+), 26 deletions(-) diff --git a/src/inc/apiv2/common/AbstractBaseAPI.class.php b/src/inc/apiv2/common/AbstractBaseAPI.class.php index e61bb11c6..bfcf7de5b 100644 --- a/src/inc/apiv2/common/AbstractBaseAPI.class.php +++ b/src/inc/apiv2/common/AbstractBaseAPI.class.php @@ -151,7 +151,7 @@ protected function getUpdateHandlers($id, $current_user): array { * Overridable function to aggregate data in the object. Currently only used for Tasks * returns the aggregated data in key value pairs */ - public static function aggregateData(object $object): array { + public static function aggregateData(object $object, array $sparseFieldsets = null): array { return []; } @@ -591,8 +591,7 @@ protected function obj2Resource(object $obj, array $expandResult = [], array $sp $attributes[$feature['alias']] = $apiClass::db2json($feature, $kv[$name]); } - //TODO: only aggregate data when it has been included - $aggregatedData = $apiClass::aggregateData($obj); + $aggregatedData = $apiClass::aggregateData($obj, $sparseFieldsets); $attributes = array_merge($attributes, $aggregatedData); /* Build JSON::API relationship resource */ diff --git a/src/inc/apiv2/model/tasks.routes.php b/src/inc/apiv2/model/tasks.routes.php index c62b1caf1..fabdaddd7 100644 --- a/src/inc/apiv2/model/tasks.routes.php +++ b/src/inc/apiv2/model/tasks.routes.php @@ -160,36 +160,47 @@ protected function createObject(array $data): int { return $task->getId(); } - //TODO make aggregate data queryable and not included by default - static function aggregateData(object $object): array { + //TODO make aggregate data queryable + static function aggregateData(object $object, array $sparseFieldsets = null): array { + $aggregatedData = []; $keyspace = $object->getKeyspace(); $keyspaceProgress = $object->getKeyspaceProgress(); - $aggregatedData["dispatched"] = Util::showperc($keyspaceProgress, $keyspace); - $aggregatedData["searched"] = Util::showperc(TaskUtils::getTaskProgress($object), $keyspace); - - $qF = new QueryFilter(Chunk::TASK_ID, $object->getId(), "="); - $chunks = Factory::getChunkFactory()->filter([Factory::FILTER => $qF]); - - $activeAgents = []; - foreach ($chunks as $chunk) { - if (time() - max($chunk->getSolveTime(), $chunk->getDispatchTime()) < SConfig::getInstance()->getVal(DConfig::CHUNK_TIMEOUT) && $chunk->getProgress() < 10000) { - $activeAgents[$chunk->getAgentId()] = true; - } + if(is_array($sparseFieldsets) && array_key_exists('task', $sparseFieldsets) && in_array("dispatched", $sparseFieldsets['task']) ) { + $aggregatedData["dispatched"] = Util::showperc($keyspaceProgress, $keyspace); } - - //status 1 is running, 2 is idle and 3 is completed - $status = 2; - if ($keyspaceProgress >= $keyspace && $keyspaceProgress > 0) { - $status = 3; + + if(is_array($sparseFieldsets) && array_key_exists('task', $sparseFieldsets) && in_array("searched", $sparseFieldsets['task']) ) { + $aggregatedData["searched"] = Util::showperc(TaskUtils::getTaskProgress($object), $keyspace); + } + + if(is_array($sparseFieldsets) && array_key_exists('task', $sparseFieldsets) && in_array("activeAgents", $sparseFieldsets['task']) ) { + $qF = new QueryFilter(Chunk::TASK_ID, $object->getId(), "="); + $chunks = Factory::getChunkFactory()->filter([Factory::FILTER => $qF]); + + $activeAgents = []; + foreach ($chunks as $chunk) { + if (time() - max($chunk->getSolveTime(), $chunk->getDispatchTime()) < SConfig::getInstance()->getVal(DConfig::CHUNK_TIMEOUT) && $chunk->getProgress() < 10000) { + $activeAgents[$chunk->getAgentId()] = true; + } + } + + $aggregatedData["activeAgents"] = array_keys($activeAgents); } - elseif (count($activeAgents) > 0) { - $status = 1; + + if(is_array($sparseFieldsets) && array_key_exists('task', $sparseFieldsets) && in_array("searched", $sparseFieldsets['task']) ) { + //status 1 is running, 2 is idle and 3 is completed + $status = 2; + if ($keyspaceProgress >= $keyspace && $keyspaceProgress > 0) { + $status = 3; + } + elseif (count($activeAgents) > 0) { + $status = 1; + } + + $aggregatedData["status"] = $status; } - $aggregatedData["activeAgents"] = array_keys($activeAgents); - $aggregatedData["status"] = $status; - return $aggregatedData; } From 70ff641a5114b45cb7e108ab34942955f90ebbd6 Mon Sep 17 00:00:00 2001 From: Eric Wasson <229096365+Eric-Wasson@users.noreply.github.com> Date: Wed, 29 Oct 2025 10:21:13 +0100 Subject: [PATCH 234/691] Implemented sparse fieldsets PR feedback and improved handling of aggregated data --- .../apiv2/common/AbstractBaseAPI.class.php | 20 +++---- .../apiv2/common/AbstractModelAPI.class.php | 6 +- src/inc/apiv2/model/tasks.routes.php | 59 ++++++++++--------- 3 files changed, 41 insertions(+), 44 deletions(-) diff --git a/src/inc/apiv2/common/AbstractBaseAPI.class.php b/src/inc/apiv2/common/AbstractBaseAPI.class.php index bfcf7de5b..839339932 100644 --- a/src/inc/apiv2/common/AbstractBaseAPI.class.php +++ b/src/inc/apiv2/common/AbstractBaseAPI.class.php @@ -551,7 +551,7 @@ protected function obj2Array(object $obj): array { * @throws NotFoundExceptionInterface * @throws ContainerExceptionInterface */ - protected function obj2Resource(object $obj, array $expandResult = [], array $sparseFieldsets = null): array { + protected function obj2Resource(object $obj, array $expandResult = [], array $sparseFieldsets = null, array $aggregateFieldsets = null): array { // Convert values to JSON supported types $features = $obj->getFeatures(); $kv = $obj->getKeyValueDict(); @@ -571,12 +571,8 @@ protected function obj2Resource(object $obj, array $expandResult = [], array $sp } // If sparse fieldsets (https://jsonapi.org/format/#fetching-sparse-fieldsets) is used, return only the requested data - if (is_array($sparseFieldsets)) { - if (array_key_exists($this->getObjectTypeName($obj), $sparseFieldsets)) { - if (!in_array($feature['alias'], $sparseFieldsets[$this->getObjectTypeName($obj)])) { - continue; - } - } + if (is_array($sparseFieldsets) && array_key_exists($this->getObjectTypeName($obj), $sparseFieldsets) && !in_array($feature['alias'], $sparseFieldsets[$this->getObjectTypeName($obj)])) { + continue; } // Hide the primaryKey from the attributes since this is used as indentifier (id) in response @@ -590,8 +586,8 @@ protected function obj2Resource(object $obj, array $expandResult = [], array $sp $attributes[$feature['alias']] = $apiClass::db2json($feature, $kv[$name]); } - - $aggregatedData = $apiClass::aggregateData($obj, $sparseFieldsets); + + $aggregatedData = $apiClass::aggregateData($obj, $aggregateFieldsets); $attributes = array_merge($attributes, $aggregatedData); /* Build JSON::API relationship resource */ @@ -1429,7 +1425,7 @@ protected static function getOneResource(object $apiClass, object $object, Reque // Convert objects to data resources foreach ($objects as $object) { // Create object - $newObject = $apiClass->obj2Resource($object, $expandResult, $request->getQueryParams()['fields'] ?? null); + $newObject = $apiClass->obj2Resource($object, $expandResult, $request->getQueryParams()['fields'] ?? null, $request->getQueryParams()['aggregate'] ?? null); // For compound document, included resources foreach ($expands as $expand) { @@ -1437,7 +1433,7 @@ protected static function getOneResource(object $apiClass, object $object, Reque $expandResultObject = $expandResult[$expand][$object->getId()]; if (is_array($expandResultObject)) { foreach ($expandResultObject as $expandObject) { - $includedResources[] = $apiClass->obj2Resource($expandObject, [], $request->getQueryParams()['fields'] ?? null); + $includedResources[] = $apiClass->obj2Resource($expandObject, [], $request->getQueryParams()['fields'] ?? null, $request->getQueryParams()['aggregate'] ?? null); } } else { @@ -1445,7 +1441,7 @@ protected static function getOneResource(object $apiClass, object $object, Reque // to-only relation which is nullable continue; } - $includedResources[] = $apiClass->obj2Resource($expandResultObject, [], $request->getQueryParams()['fields'] ?? null); + $includedResources[] = $apiClass->obj2Resource($expandResultObject, [], $request->getQueryParams()['fields'] ?? null, $request->getQueryParams()['aggregate'] ?? null); } } } diff --git a/src/inc/apiv2/common/AbstractModelAPI.class.php b/src/inc/apiv2/common/AbstractModelAPI.class.php index d94d9d0a4..43d0ed7fe 100644 --- a/src/inc/apiv2/common/AbstractModelAPI.class.php +++ b/src/inc/apiv2/common/AbstractModelAPI.class.php @@ -747,7 +747,7 @@ public static function getManyResources(object $apiClass, Request $request, Resp // Convert objects to data resources foreach ($objects as $object) { // Create object - $newObject = $apiClass->obj2Resource($object, $expandResult, $request->getQueryParams()['fields'] ?? null); + $newObject = $apiClass->obj2Resource($object, $expandResult, $request->getQueryParams()['fields'] ?? null, $request->getQueryParams()['aggregate'] ?? null); // For compound document, included resources foreach ($expands as $expand) { @@ -755,14 +755,14 @@ public static function getManyResources(object $apiClass, Request $request, Resp $expandResultObject = $expandResult[$expand][$object->getId()]; if (is_array($expandResultObject)) { foreach ($expandResultObject as $expandObject) { - $includedResources = self::addToRelatedResources($includedResources, $apiClass->obj2Resource($expandObject, [], $request->getQueryParams()['fields'] ?? null)); + $includedResources = self::addToRelatedResources($includedResources, $apiClass->obj2Resource($expandObject, [], $request->getQueryParams()['fields'] ?? null, $request->getQueryParams()['aggregate'] ?? null)); } } else { if ($expandResultObject === null) { // to-only relation which is nullable continue; } - $includedResources = self::addToRelatedResources($includedResources, $apiClass->obj2Resource($expandResultObject, [], $request->getQueryParams()['fields'] ?? null)); + $includedResources = self::addToRelatedResources($includedResources, $apiClass->obj2Resource($expandResultObject, [], $request->getQueryParams()['fields'] ?? null, $request->getQueryParams()['aggregate'] ?? null)); } } } diff --git a/src/inc/apiv2/model/tasks.routes.php b/src/inc/apiv2/model/tasks.routes.php index fabdaddd7..546f7de43 100644 --- a/src/inc/apiv2/model/tasks.routes.php +++ b/src/inc/apiv2/model/tasks.routes.php @@ -160,45 +160,46 @@ protected function createObject(array $data): int { return $task->getId(); } - //TODO make aggregate data queryable - static function aggregateData(object $object, array $sparseFieldsets = null): array { + static function aggregateData(object $object, array $aggregateFieldsets = null): array { $aggregatedData = []; $keyspace = $object->getKeyspace(); $keyspaceProgress = $object->getKeyspaceProgress(); - if(is_array($sparseFieldsets) && array_key_exists('task', $sparseFieldsets) && in_array("dispatched", $sparseFieldsets['task']) ) { - $aggregatedData["dispatched"] = Util::showperc($keyspaceProgress, $keyspace); - } + if(is_null($aggregateFieldsets) || (is_array($aggregateFieldsets) && array_key_exists('task', $aggregateFieldsets))) { + if(is_null($aggregateFieldsets) || in_array("dispatched", $aggregateFieldsets['task'])) { + $aggregatedData["dispatched"] = Util::showperc($keyspaceProgress, $keyspace); + } - if(is_array($sparseFieldsets) && array_key_exists('task', $sparseFieldsets) && in_array("searched", $sparseFieldsets['task']) ) { - $aggregatedData["searched"] = Util::showperc(TaskUtils::getTaskProgress($object), $keyspace); - } + if(is_null($aggregateFieldsets) || in_array("searched", $aggregateFieldsets['task'])) { + $aggregatedData["searched"] = Util::showperc(TaskUtils::getTaskProgress($object), $keyspace); + } - if(is_array($sparseFieldsets) && array_key_exists('task', $sparseFieldsets) && in_array("activeAgents", $sparseFieldsets['task']) ) { - $qF = new QueryFilter(Chunk::TASK_ID, $object->getId(), "="); - $chunks = Factory::getChunkFactory()->filter([Factory::FILTER => $qF]); - - $activeAgents = []; - foreach ($chunks as $chunk) { - if (time() - max($chunk->getSolveTime(), $chunk->getDispatchTime()) < SConfig::getInstance()->getVal(DConfig::CHUNK_TIMEOUT) && $chunk->getProgress() < 10000) { - $activeAgents[$chunk->getAgentId()] = true; + if(is_null($aggregateFieldsets) || in_array("activeAgents", $aggregateFieldsets['task'])) { + $qF = new QueryFilter(Chunk::TASK_ID, $object->getId(), "="); + $chunks = Factory::getChunkFactory()->filter([Factory::FILTER => $qF]); + + $activeAgents = []; + foreach ($chunks as $chunk) { + if (time() - max($chunk->getSolveTime(), $chunk->getDispatchTime()) < SConfig::getInstance()->getVal(DConfig::CHUNK_TIMEOUT) && $chunk->getProgress() < 10000) { + $activeAgents[$chunk->getAgentId()] = true; + } } + + $aggregatedData["activeAgents"] = array_keys($activeAgents); } - - $aggregatedData["activeAgents"] = array_keys($activeAgents); - } - if(is_array($sparseFieldsets) && array_key_exists('task', $sparseFieldsets) && in_array("searched", $sparseFieldsets['task']) ) { - //status 1 is running, 2 is idle and 3 is completed - $status = 2; - if ($keyspaceProgress >= $keyspace && $keyspaceProgress > 0) { - $status = 3; - } - elseif (count($activeAgents) > 0) { - $status = 1; + if(is_null($aggregateFieldsets) || in_array("status", $aggregateFieldsets['task'])) { + //status 1 is running, 2 is idle and 3 is completed + $status = 2; + if ($keyspaceProgress >= $keyspace && $keyspaceProgress > 0) { + $status = 3; + } + elseif (count($activeAgents) > 0) { + $status = 1; + } + + $aggregatedData["status"] = $status; } - - $aggregatedData["status"] = $status; } return $aggregatedData; From fa7f1fac41b0add27b8025d19c37139fd1ca7a2d Mon Sep 17 00:00:00 2001 From: jessevz Date: Wed, 29 Oct 2025 13:08:29 +0100 Subject: [PATCH 235/691] Forced to upgrade agentbinary to new binaryType in order to make sure it doesnt have old table column name --- src/inc/Util.class.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/inc/Util.class.php b/src/inc/Util.class.php index 2d9982352..762441667 100755 --- a/src/inc/Util.class.php +++ b/src/inc/Util.class.php @@ -195,7 +195,7 @@ public static function checkAgentVersion($type, $version, $silent = false) { $qF = new QueryFilter(AgentBinary::BINARY_TYPE, $type, "="); if (Util::databaseColumnExists("AgentBinary", "type")) { // This check is needed for older updates when agentbinary column still got old 'type' name - $qF = new QueryFilter("type", $type, "="); + Factory::getAgentFactory()->getDB()->query("ALTER TABLE `AgentBinary` RENAME COLUMN `type` to `binaryType`;"); } $binary = Factory::getAgentBinaryFactory()->filter([Factory::FILTER => $qF], true); if ($binary != null) { From 05466b04a5c0796d7445110c9ae80ec44f22d6c6 Mon Sep 17 00:00:00 2001 From: Eric Wasson <229096365+Eric-Wasson@users.noreply.github.com> Date: Thu, 30 Oct 2025 11:37:34 +0100 Subject: [PATCH 236/691] Added an improved CORS implementation --- docker-compose.yml | 3 ++- env.example | 1 + src/api/v2/index.php | 16 +++++++++++++--- 3 files changed, 16 insertions(+), 4 deletions(-) diff --git a/docker-compose.yml b/docker-compose.yml index 91b14c1ce..352713e80 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -14,7 +14,8 @@ services: HASHTOPOLIS_DB_DATABASE: $MYSQL_DATABASE HASHTOPOLIS_ADMIN_USER: $HASHTOPOLIS_ADMIN_USER HASHTOPOLIS_ADMIN_PASSWORD: $HASHTOPOLIS_ADMIN_PASSWORD - HASHTOPOLIS_APIV2_ENABLE: $HASHTOPOLIS_APIV2_ENABLE + HASHTOPOLIS_APIV2_ENABLE: $HASHTOPOLIS_APIV2_ENABLE + HASHTOPOLIS_FRONTEND_URLS: $HASHTOPOLIS_FRONTEND_URLS depends_on: - db ports: diff --git a/env.example b/env.example index f8d3ba184..58e29a5ba 100644 --- a/env.example +++ b/env.example @@ -9,3 +9,4 @@ HASHTOPOLIS_DB_HOST=db HASHTOPOLIS_APIV2_ENABLE=0 HASHTOPOLIS_BACKEND_URL=http://localhost:8080/api/v2 +HASHTOPOLIS_FRONTEND_URLS=http://127.0.0.1:4200,https://127.0.0.1:4200,http://localhost:4200,https://localhost:4200,http://127.0.0.1:8080,https://127.0.0.1:8080,http://localhost:8080,https://localhost:8080 diff --git a/src/api/v2/index.php b/src/api/v2/index.php index 9f18a34d7..ab35fe01d 100644 --- a/src/api/v2/index.php +++ b/src/api/v2/index.php @@ -173,8 +173,6 @@ public function process(Request $request, RequestHandler $handler): Response { } -/* FIXME: CORS wildcard hack should require proper implementation and validation */ - /* This middleware will append the response header Access-Control-Allow-Methods with all allowed methods */ class CorsHackMiddleware implements MiddlewareInterface { @@ -190,7 +188,19 @@ public static function addCORSheaders(Request $request, $response) { $methods = $routingResults->getAllowedMethods(); $requestHeaders = $request->getHeaderLine('Access-Control-Request-Headers'); - $response = $response->withHeader('Access-Control-Allow-Origin', '*'); + if (getenv('HASHTOPOLIS_FRONTEND_URLS') !== false) { + if(in_array($_SERVER['HTTP_ORIGIN'], explode(',', getenv('HASHTOPOLIS_FRONTEND_URLS')), true)) { + $response = $response->withHeader('Access-Control-Allow-Origin', $_SERVER['HTTP_ORIGIN']); + } + else { + Util::createLogEntry(DLogEntryIssuer::USER, Login::getInstance()->getUserID(), DLogEntry::WARN, "CORS error: Allow-Origin doesn't match. Please make sure to include the used frontend in the .env file."); + } + } + else { + //No frontend URLs given in .env file, switch to default allow all + $response = $response->withHeader('Access-Control-Allow-Origin', '*'); + } + $response = $response->withHeader('Access-Control-Allow-Methods', implode(',', $methods)); $response = $response->withHeader('Access-Control-Allow-Headers', $requestHeaders); From c7054525fe3aa2914b0ac3821dd7e0b80ca8ad77 Mon Sep 17 00:00:00 2001 From: jessevz Date: Thu, 30 Oct 2025 14:15:16 +0100 Subject: [PATCH 237/691] Added legacy function for old agent upgrades --- src/inc/Util.class.php | 41 +++++++++++++++++-- .../updates/update_v0.10.x_v0.11.0.php | 2 +- .../updates/update_v0.11.x_v0.12.0.php | 2 +- .../updates/update_v0.12.x_v0.13.0.php | 4 +- .../updates/update_v0.13.x_v0.13.1.php | 2 +- .../updates/update_v0.14.3_v0.14.4.php | 2 +- .../updates/update_v0.14.4_v0.14.5.php | 9 ++-- .../updates/update_v0.14.x_v0.14.2.php | 2 +- src/install/updates/update_v0.5.x_v0.6.0.php | 4 +- src/install/updates/update_v0.6.0_v0.7.0.php | 4 +- src/install/updates/update_v0.7.x_v0.8.0.php | 4 +- src/install/updates/update_v0.9.0_v0.10.0.php | 2 +- 12 files changed, 56 insertions(+), 22 deletions(-) diff --git a/src/inc/Util.class.php b/src/inc/Util.class.php index 762441667..c9c222d9a 100755 --- a/src/inc/Util.class.php +++ b/src/inc/Util.class.php @@ -186,6 +186,43 @@ public static function getGitCommit($hashOnly = false) { return $gitcommit; } + /** + * function to check agent version for older update scripts, that still has + * the 'type' field in AgentBinary instead of 'binaryType' + */ + public static function checkAgentVersionLegacy($type, $version, $silent = false) { + $agentBinaryFactory = Factory::getAgentBinaryFactory(); + $dict = $agentBinaryFactory->getNullObject()->getKeyValueDict(); + unset($dict["binaryType"]); + $dict["type"] = null; + $keys = array_keys($dict); + + $query = "SELECT " . implode(", ", $keys) . " FROM " . $agentBinaryFactory->getModelTable(); + $query .= " WHERE type=?"; + $dbh = $agentBinaryFactory->getDB(); + $stmt = $dbh->prepare($query); + $vals = [$type]; + $stmt->execute($vals); + + $row = $stmt->fetch(PDO::FETCH_ASSOC); + if($row != null) { + $pkName = $agentBinaryFactory->getNullObject()->getPrimaryKey(); + $pk = $row[$pkName]; + $row["binaryType"] = $row["type"]; + $binary = $agentBinaryFactory->createObjectFromDict($pk, $row); + + if (Comparator::lessThan($binary->getVersion(), $version)) { + if (!$silent) { + echo "update $type version... "; + } + Factory::getAgentBinaryFactory()->set($binary, AgentBinary::VERSION, $version); + if (!$silent) { + echo "OK"; + } + } + } + } + /** * @param string $type * @param string $version @@ -193,10 +230,6 @@ public static function getGitCommit($hashOnly = false) { */ public static function checkAgentVersion($type, $version, $silent = false) { $qF = new QueryFilter(AgentBinary::BINARY_TYPE, $type, "="); - if (Util::databaseColumnExists("AgentBinary", "type")) { - // This check is needed for older updates when agentbinary column still got old 'type' name - Factory::getAgentFactory()->getDB()->query("ALTER TABLE `AgentBinary` RENAME COLUMN `type` to `binaryType`;"); - } $binary = Factory::getAgentBinaryFactory()->filter([Factory::FILTER => $qF], true); if ($binary != null) { if (Comparator::lessThan($binary->getVersion(), $version)) { diff --git a/src/install/updates/update_v0.10.x_v0.11.0.php b/src/install/updates/update_v0.10.x_v0.11.0.php index a15de5648..261b650f8 100644 --- a/src/install/updates/update_v0.10.x_v0.11.0.php +++ b/src/install/updates/update_v0.10.x_v0.11.0.php @@ -30,7 +30,7 @@ } if (!isset($PRESENT["v0.10.x_agentBinaries"])) { - Util::checkAgentVersion("python", "0.5.0", true); + Util::checkAgentVersionLegacy("python", "0.5.0", true); $EXECUTED["v0.10.x_agentBinaries"] = true; } diff --git a/src/install/updates/update_v0.11.x_v0.12.0.php b/src/install/updates/update_v0.11.x_v0.12.0.php index 2bad299f8..df5259e26 100644 --- a/src/install/updates/update_v0.11.x_v0.12.0.php +++ b/src/install/updates/update_v0.11.x_v0.12.0.php @@ -24,7 +24,7 @@ } if (!isset($PRESENT["v0.11.x_agentBinaries"])) { - Util::checkAgentVersion("python", "0.6.0", true); + Util::checkAgentVersionLegacy("python", "0.6.0", true); $EXECUTED["v0.11.x_agentBinaries"] = true; } diff --git a/src/install/updates/update_v0.12.x_v0.13.0.php b/src/install/updates/update_v0.12.x_v0.13.0.php index 69c86f241..272458c74 100644 --- a/src/install/updates/update_v0.12.x_v0.13.0.php +++ b/src/install/updates/update_v0.12.x_v0.13.0.php @@ -252,12 +252,12 @@ } if (!isset($PRESENT["v0.12.x_agentBinaries"])) { - Util::checkAgentVersion("python", "0.6.0.10", true); + Util::checkAgentVersionLegacy("python", "0.6.0.10", true); $EXECUTED["v0.12.x_agentBinaries"] = true; } if (!isset($PRESENT["v0.12.x_agentBinaries_1"])) { - Util::checkAgentVersion("python", "0.7.0", true); + Util::checkAgentVersionLegacy("python", "0.7.0", true); $EXECUTED["v0.12.x_agentBinaries_1"] = true; } diff --git a/src/install/updates/update_v0.13.x_v0.13.1.php b/src/install/updates/update_v0.13.x_v0.13.1.php index e2a092218..6b948cd40 100644 --- a/src/install/updates/update_v0.13.x_v0.13.1.php +++ b/src/install/updates/update_v0.13.x_v0.13.1.php @@ -39,7 +39,7 @@ } if (!isset($PRESENT["v0.13.x_agentBinaries"])) { - Util::checkAgentVersion("python", "0.7.1", true); + Util::checkAgentVersionLegacy("python", "0.7.1", true); $EXECUTED["v0.13.x_agentBinaries"] = true; } if (!isset($PRESENT["v0.13.x_hash_length"])) { diff --git a/src/install/updates/update_v0.14.3_v0.14.4.php b/src/install/updates/update_v0.14.3_v0.14.4.php index f73a91fcc..d535bba92 100644 --- a/src/install/updates/update_v0.14.3_v0.14.4.php +++ b/src/install/updates/update_v0.14.3_v0.14.4.php @@ -5,6 +5,6 @@ use DBA\QueryFilter; if (!isset($PRESENT["v0.14.3_agentBinaries"])) { - Util::checkAgentVersion("python", "0.7.3", true); + Util::checkAgentVersionLegacy("python", "0.7.3", true); $EXECUTED["v0.14.3_agentBinaries"] = true; } diff --git a/src/install/updates/update_v0.14.4_v0.14.5.php b/src/install/updates/update_v0.14.4_v0.14.5.php index 318f3241c..955af1458 100644 --- a/src/install/updates/update_v0.14.4_v0.14.5.php +++ b/src/install/updates/update_v0.14.4_v0.14.5.php @@ -5,10 +5,6 @@ use DBA\HashType; use DBA\QueryFilter; -if (!isset($PRESENT["v0.14.4_agentBinaries"])) { - Util::checkAgentVersion("python", "0.7.4", true); - $EXECUTED["v0.14.4_agentBinaries"] = true; -} if (!isset($PRESENT["v0.14.4_update_agent_binary"])) { if (Util::databaseColumnExists("AgentBinary", "type")) { @@ -17,6 +13,11 @@ } } +if (!isset($PRESENT["v0.14.4_agentBinaries"])) { + Util::checkAgentVersion("python", "0.7.4", true); + $EXECUTED["v0.14.4_agentBinaries"] = true; +} + if (!isset($PRESENT["v0.14.4_update_hashtypes"])){ $hashTypes = [ new HashType( 1310, 'sha224($pass.$salt)', 1, 0), diff --git a/src/install/updates/update_v0.14.x_v0.14.2.php b/src/install/updates/update_v0.14.x_v0.14.2.php index 9ab496add..f73e3315d 100644 --- a/src/install/updates/update_v0.14.x_v0.14.2.php +++ b/src/install/updates/update_v0.14.x_v0.14.2.php @@ -10,6 +10,6 @@ } if (!isset($PRESENT["v0.14.x_agentBinaries"])) { - Util::checkAgentVersion("python", "0.7.2", true); + Util::checkAgentVersionLegacy("python", "0.7.2", true); $EXECUTED["v0.14.x_agentBinaries"] = true; } diff --git a/src/install/updates/update_v0.5.x_v0.6.0.php b/src/install/updates/update_v0.5.x_v0.6.0.php index de5ac70c9..374daa291 100644 --- a/src/install/updates/update_v0.5.x_v0.6.0.php +++ b/src/install/updates/update_v0.5.x_v0.6.0.php @@ -14,8 +14,8 @@ echo "Apply updates...\n"; echo "Check agent binaries... "; -Util::checkAgentVersion("python", "0.1.4"); -Util::checkAgentVersion("csharp", "0.52.2"); +Util::checkAgentVersionLegacy("python", "0.1.4"); +Util::checkAgentVersionLegacy("csharp", "0.52.2"); echo "\n"; echo "Create new permissions... "; diff --git a/src/install/updates/update_v0.6.0_v0.7.0.php b/src/install/updates/update_v0.6.0_v0.7.0.php index 473e0c7cf..e4613236e 100644 --- a/src/install/updates/update_v0.6.0_v0.7.0.php +++ b/src/install/updates/update_v0.6.0_v0.7.0.php @@ -12,8 +12,8 @@ echo "Apply updates...\n"; echo "Check agent binaries... "; -Util::checkAgentVersion("python", "0.1.7"); -Util::checkAgentVersion("csharp", "0.52.4"); +Util::checkAgentVersionLegacy("python", "0.1.7"); +Util::checkAgentVersionLegacy("csharp", "0.52.4"); echo "\n"; echo "Creating User API..."; diff --git a/src/install/updates/update_v0.7.x_v0.8.0.php b/src/install/updates/update_v0.7.x_v0.8.0.php index 0f08f6a4c..2d3348e5a 100644 --- a/src/install/updates/update_v0.7.x_v0.8.0.php +++ b/src/install/updates/update_v0.7.x_v0.8.0.php @@ -15,8 +15,8 @@ echo "Apply updates...\n"; echo "Check agent binaries... "; -Util::checkAgentVersion("python", "0.2.0"); -Util::checkAgentVersion("csharp", "0.52.4"); +Util::checkAgentVersionLegacy("python", "0.2.0"); +Util::checkAgentVersionLegacy("csharp", "0.52.4"); echo "\n"; echo "Add debug output tables... "; diff --git a/src/install/updates/update_v0.9.0_v0.10.0.php b/src/install/updates/update_v0.9.0_v0.10.0.php index 67123c5d7..f838289b0 100644 --- a/src/install/updates/update_v0.9.0_v0.10.0.php +++ b/src/install/updates/update_v0.9.0_v0.10.0.php @@ -79,6 +79,6 @@ Factory::getAgentBinaryFactory()->update($agent); } - Util::checkAgentVersion("python", "0.4.0", true); + Util::checkAgentVersionLegacy("python", "0.4.0", true); $EXECUTED["v0.9.0_agentBinaries"] = true; } From 9e3baf2c16e4d92a1fc5b9a08511f35a926e4ec8 Mon Sep 17 00:00:00 2001 From: s3inlc Date: Mon, 3 Nov 2025 08:18:45 +0100 Subject: [PATCH 238/691] prepare for release --- doc/changelog.md | 7 +++++++ src/inc/info.php | 2 +- 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/doc/changelog.md b/doc/changelog.md index e5f288f30..5a46b5058 100644 --- a/doc/changelog.md +++ b/doc/changelog.md @@ -1,5 +1,12 @@ # Changelog +## v1.0.0-rainbow3 -> v1.0.0-rainbow4 + +**Bugfixes** + +- Fixed status calculation in backend (#1716) +- Fixed upgrade of agentbinary to new binaryType (#1722) + ## v1.0.0-rainbow2 -> v1.0.0-rainbow3 **Enhancements** diff --git a/src/inc/info.php b/src/inc/info.php index e040382f0..c46c8b5ba 100644 --- a/src/inc/info.php +++ b/src/inc/info.php @@ -1,6 +1,6 @@ Date: Mon, 3 Nov 2025 14:41:59 +0100 Subject: [PATCH 239/691] Implemented CORS header PR feedback --- src/api/v2/index.php | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/api/v2/index.php b/src/api/v2/index.php index ab35fe01d..fd4b372a5 100644 --- a/src/api/v2/index.php +++ b/src/api/v2/index.php @@ -189,11 +189,11 @@ public static function addCORSheaders(Request $request, $response) { $requestHeaders = $request->getHeaderLine('Access-Control-Request-Headers'); if (getenv('HASHTOPOLIS_FRONTEND_URLS') !== false) { - if(in_array($_SERVER['HTTP_ORIGIN'], explode(',', getenv('HASHTOPOLIS_FRONTEND_URLS')), true)) { - $response = $response->withHeader('Access-Control-Allow-Origin', $_SERVER['HTTP_ORIGIN']); + if(in_array($request->getHeaderLine('HTTP_ORIGIN'), explode(',', getenv('HASHTOPOLIS_FRONTEND_URLS')), true)) { + $response = $response->withHeader('Access-Control-Allow-Origin', $request->getHeaderLine('HTTP_ORIGIN')); } else { - Util::createLogEntry(DLogEntryIssuer::USER, Login::getInstance()->getUserID(), DLogEntry::WARN, "CORS error: Allow-Origin doesn't match. Please make sure to include the used frontend in the .env file."); + error_log("CORS error: Allow-Origin doesn't match. Please make sure to include the used frontend in the .env file."); } } else { From 2eef41cea8682d2e4163ea19b9c3a3c6b452f114 Mon Sep 17 00:00:00 2001 From: jessevz Date: Mon, 3 Nov 2025 15:34:26 +0100 Subject: [PATCH 240/691] Made responses smaller by not pretty printing the json --- src/inc/apiv2/common/AbstractBaseAPI.class.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/inc/apiv2/common/AbstractBaseAPI.class.php b/src/inc/apiv2/common/AbstractBaseAPI.class.php index f942890a0..7261574e7 100644 --- a/src/inc/apiv2/common/AbstractBaseAPI.class.php +++ b/src/inc/apiv2/common/AbstractBaseAPI.class.php @@ -745,7 +745,7 @@ protected function object2Array(object $object, array $expands = []): array { * @throws JsonException */ protected static function ret2json(array $result): string { - return json_encode($result, JSON_UNESCAPED_SLASHES | JSON_PRETTY_PRINT | JSON_THROW_ON_ERROR) . PHP_EOL; + return json_encode($result, JSON_UNESCAPED_SLASHES | JSON_THROW_ON_ERROR) . PHP_EOL; } /** From 6cfbe71a9892fde7762393dcb9b206769c3b2f6a Mon Sep 17 00:00:00 2001 From: jessevz Date: Mon, 3 Nov 2025 16:42:04 +0100 Subject: [PATCH 241/691] Added active chunk as data to agent --- src/inc/apiv2/model/agents.routes.php | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/src/inc/apiv2/model/agents.routes.php b/src/inc/apiv2/model/agents.routes.php index d6472ecc4..73df194f3 100644 --- a/src/inc/apiv2/model/agents.routes.php +++ b/src/inc/apiv2/model/agents.routes.php @@ -11,6 +11,7 @@ use DBA\Assignment; use DBA\Chunk; use DBA\JoinFilter; +use DBA\QueryFilter; use DBA\Task; use DBA\User; use JetBrains\PhpStorm\NoReturn; @@ -37,6 +38,17 @@ protected function getUpdateHandlers($id, $current_user): array { ]; } + static function aggregateData(object $object): array { + $qFs = []; + $qFs[] = new QueryFilter(Chunk::AGENT_ID, $object->getId(), "="); + $qFs[] = new QueryFilter(Chunk::STATE, 2, "="); + $active_chunk = Factory::getChunkFactory()->filter([Factory::FILTER => $qFs], true); + $aggregatedData["activeChunk"] = $active_chunk->getKeyValueDict(); + + + return $aggregatedData; + } + protected function getSingleACL(User $user, object $object): bool { $accessGroupsUser = Util::arrayOfIds(AccessUtils::getAccessGroupsOfUser($user)); /** @var Agent $object */ From 38464bc997714c4612ba5e9a2855f2ca64185173 Mon Sep 17 00:00:00 2001 From: Eric Wasson <229096365+Eric-Wasson@users.noreply.github.com> Date: Tue, 4 Nov 2025 13:20:30 +0100 Subject: [PATCH 242/691] CORS: fixed HTTPS handling and updated docs --- doc/installation_guidelines/tls.md | 4 ++-- env.example | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/doc/installation_guidelines/tls.md b/doc/installation_guidelines/tls.md index ef2b7b613..662fd2633 100644 --- a/doc/installation_guidelines/tls.md +++ b/doc/installation_guidelines/tls.md @@ -97,7 +97,7 @@ http { } ``` -3. Update the value of `HASHTOPOLIS_BACKEND_URL` in the `.env` file to reflect the changes done above. +3. Update the value of `HASHTOPOLIS_BACKEND_URL` in the `.env` file to reflect the changes done above. If your server name isn't localhost, be sure to also update the comma-separated list of `HASHTOPOLIS_FRONTEND_URLS` to include new https frontend. 4. Start the containers ``` @@ -105,4 +105,4 @@ http { docker compose up ``` -5. Visit hashtopolis at https://localhost/ \ No newline at end of file +5. Visit hashtopolis at https://localhost/ diff --git a/env.example b/env.example index 58e29a5ba..dc2e81434 100644 --- a/env.example +++ b/env.example @@ -9,4 +9,4 @@ HASHTOPOLIS_DB_HOST=db HASHTOPOLIS_APIV2_ENABLE=0 HASHTOPOLIS_BACKEND_URL=http://localhost:8080/api/v2 -HASHTOPOLIS_FRONTEND_URLS=http://127.0.0.1:4200,https://127.0.0.1:4200,http://localhost:4200,https://localhost:4200,http://127.0.0.1:8080,https://127.0.0.1:8080,http://localhost:8080,https://localhost:8080 +HASHTOPOLIS_FRONTEND_URLS=http://127.0.0.1:4200,http://localhost:4200,http://127.0.0.1:8080,http://localhost:8080,https://127.0.0.1,https://localhost From 2f4d29573a7014cf9a98716be19c824235ba84c2 Mon Sep 17 00:00:00 2001 From: jessevz Date: Mon, 10 Nov 2025 15:15:14 +0100 Subject: [PATCH 243/691] Add active chunk to agent --- .../apiv2/common/AbstractBaseAPI.class.php | 82 +++++++++++++------ .../apiv2/common/AbstractModelAPI.class.php | 35 +------- src/inc/apiv2/model/agents.routes.php | 13 +-- src/inc/apiv2/model/tasks.routes.php | 2 +- 4 files changed, 68 insertions(+), 64 deletions(-) diff --git a/src/inc/apiv2/common/AbstractBaseAPI.class.php b/src/inc/apiv2/common/AbstractBaseAPI.class.php index 7261574e7..11dc59147 100644 --- a/src/inc/apiv2/common/AbstractBaseAPI.class.php +++ b/src/inc/apiv2/common/AbstractBaseAPI.class.php @@ -153,7 +153,8 @@ protected function getUpdateHandlers($id, $current_user): array { * Overridable function to aggregate data in the object. Currently only used for Tasks * returns the aggregated data in key value pairs */ - public static function aggregateData(object $object): array { + public static function aggregateData(object $object, array &$includedData=[]): array + { return []; } @@ -553,7 +554,7 @@ protected function obj2Array(object $obj): array { * @throws NotFoundExceptionInterface * @throws ContainerExceptionInterface */ - protected function obj2Resource(object $obj, array $expandResult = []): array { + protected function obj2Resource(object $obj, array &$expandResult = []): array { // Convert values to JSON supported types $features = $obj->getFeatures(); $kv = $obj->getKeyValueDict(); @@ -584,7 +585,7 @@ protected function obj2Resource(object $obj, array $expandResult = []): array { } //TODO: only aggregate data when it has been included - $aggregatedData = $apiClass::aggregateData($obj); + $aggregatedData = $apiClass::aggregateData($obj, $expandResult); $attributes = array_merge($attributes, $aggregatedData); /* Build JSON::API relationship resource */ @@ -1154,8 +1155,59 @@ protected function makeOrderFilterTemplates(Request $request, array $features, s return $orderTemplates; } - - + + protected static function addToRelatedResources(array $relatedResources, array $relatedResource): array { + $alreadyExists = false; + $searchType = $relatedResource["type"]; + $searchId = $relatedResource["id"]; + foreach ($relatedResources as $resource) { + if ($resource["id"] == $searchId && $resource["type"] == $searchType) { + $alreadyExists = true; + break; + } + } + if (!$alreadyExists) { + $relatedResources[] = $relatedResource; + } + return $relatedResources; + } + + protected function processExpands( + object $apiClass, + array $expands, + object $object, + array $expandResult, + array $includedResources +): array { + + // Add missing expands to expands in case they have been added in aggregateData() + $expandKeys = array_keys($expandResult); + $diffs = array_diff($expandKeys, $expands); + $expands = array_merge($expandKeys, $diffs); + + foreach ($expands as $expand) { + if (!array_key_exists($object->getId(), $expandResult[$expand])) { + continue; + } + + $expandResultObject = $expandResult[$expand][$object->getId()]; + + if (is_array($expandResultObject)) { + foreach ($expandResultObject as $expandObject) { + $includedResources = self::addToRelatedResources($includedResources, $apiClass->obj2Resource($expandObject)); + } + } else { + if ($expandResultObject === null) { + // to-only relation which is nullable + continue; + } + $includedResources = self::addToRelatedResources($includedResources, $apiClass->obj2Resource($expandResultObject)); + } + } + + return $includedResources; +} + /** * Validate if user is allowed to access hashlist * @throws HttpForbidden @@ -1432,25 +1484,7 @@ protected static function getOneResource(object $apiClass, object $object, Reque foreach ($objects as $object) { // Create object $newObject = $apiClass->obj2Resource($object, $expandResult); - - // For compound document, included resources - foreach ($expands as $expand) { - if (array_key_exists($object->getId(), $expandResult[$expand])) { - $expandResultObject = $expandResult[$expand][$object->getId()]; - if (is_array($expandResultObject)) { - foreach ($expandResultObject as $expandObject) { - $includedResources[] = $apiClass->obj2Resource($expandObject); - } - } - else { - if ($expandResultObject === null) { - // to-only relation which is nullable - continue; - } - $includedResources[] = $apiClass->obj2Resource($expandResultObject); - } - } - } + $includedResources = $apiClass->processExpands($apiClass, $expands, $object, $expandResult, $includedResources); // Add to result output $dataResources[] = $newObject; diff --git a/src/inc/apiv2/common/AbstractModelAPI.class.php b/src/inc/apiv2/common/AbstractModelAPI.class.php index 0a6890b76..82fa47c97 100644 --- a/src/inc/apiv2/common/AbstractModelAPI.class.php +++ b/src/inc/apiv2/common/AbstractModelAPI.class.php @@ -447,22 +447,6 @@ final protected function ResourceRecordArrayToUpdateArray($data, $parentId): arr return $updates; } - protected static function addToRelatedResources(array $relatedResources, array $relatedResource): array { - $alreadyExists = false; - $searchType = $relatedResource["type"]; - $searchId = $relatedResource["id"]; - foreach ($relatedResources as $resource) { - if ($resource["id"] == $searchId && $resource["type"] == $searchType) { - $alreadyExists = true; - break; - } - } - if (!$alreadyExists) { - $relatedResources[] = $relatedResource; - } - return $relatedResources; - } - protected static function calculate_next_cursor(string|int $cursor, bool $ascending=true) { if (is_int($cursor)) { if ($ascending) { @@ -748,24 +732,7 @@ public static function getManyResources(object $apiClass, Request $request, Resp foreach ($objects as $object) { // Create object $newObject = $apiClass->obj2Resource($object, $expandResult); - - // For compound document, included resources - foreach ($expands as $expand) { - if (array_key_exists($object->getId(), $expandResult[$expand])) { - $expandResultObject = $expandResult[$expand][$object->getId()]; - if (is_array($expandResultObject)) { - foreach ($expandResultObject as $expandObject) { - $includedResources = self::addToRelatedResources($includedResources, $apiClass->obj2Resource($expandObject)); - } - } else { - if ($expandResultObject === null) { - // to-only relation which is nullable - continue; - } - $includedResources = self::addToRelatedResources($includedResources, $apiClass->obj2Resource($expandResultObject)); - } - } - } + $includedResources = $apiClass->processExpands($apiClass, $expands, $object, $expandResult, $includedResources); // Add to result output $dataResources[] = $newObject; diff --git a/src/inc/apiv2/model/agents.routes.php b/src/inc/apiv2/model/agents.routes.php index 73df194f3..01a82c0e3 100644 --- a/src/inc/apiv2/model/agents.routes.php +++ b/src/inc/apiv2/model/agents.routes.php @@ -38,15 +38,18 @@ protected function getUpdateHandlers($id, $current_user): array { ]; } - static function aggregateData(object $object): array { + static function aggregateData(object $object, array &$included_data = []): array { + $agentId = $object->getId(); $qFs = []; - $qFs[] = new QueryFilter(Chunk::AGENT_ID, $object->getId(), "="); + $qFs[] = new QueryFilter(Chunk::AGENT_ID, $agentId, "="); $qFs[] = new QueryFilter(Chunk::STATE, 2, "="); - $active_chunk = Factory::getChunkFactory()->filter([Factory::FILTER => $qFs], true); - $aggregatedData["activeChunk"] = $active_chunk->getKeyValueDict(); + $active_chunk = Factory::getChunkFactory()->filter([Factory::FILTER => $qFs], true); + if ($active_chunk !== NULL) { + $included_data["chunks"][$agentId] = [$active_chunk]; + } - return $aggregatedData; + return []; } protected function getSingleACL(User $user, object $object): bool { diff --git a/src/inc/apiv2/model/tasks.routes.php b/src/inc/apiv2/model/tasks.routes.php index 89663653f..9e6b0a071 100644 --- a/src/inc/apiv2/model/tasks.routes.php +++ b/src/inc/apiv2/model/tasks.routes.php @@ -162,7 +162,7 @@ protected function createObject(array $data): int { } //TODO make aggregate data queryable and not included by default - static function aggregateData(object $object): array { + static function aggregateData(object $object, array &$included_data = []): array { $qF = new QueryFilter(Assignment::TASK_ID, $object->getId(), "="); $activeAgents = Factory::getAssignmentFactory()->countFilter([Factory::FILTER => $qF]); $aggregatedData["activeAgents"] = $activeAgents; From e6dd9a46af6e7ae0419bab32be293efe86aa1b66 Mon Sep 17 00:00:00 2001 From: jessevz Date: Mon, 10 Nov 2025 17:20:35 +0100 Subject: [PATCH 244/691] Fixed copilot suggestions --- .../apiv2/common/AbstractBaseAPI.class.php | 19 +++++++++++++------ src/inc/apiv2/model/agents.routes.php | 10 +++++++++- 2 files changed, 22 insertions(+), 7 deletions(-) diff --git a/src/inc/apiv2/common/AbstractBaseAPI.class.php b/src/inc/apiv2/common/AbstractBaseAPI.class.php index 11dc59147..a3b1fe75e 100644 --- a/src/inc/apiv2/common/AbstractBaseAPI.class.php +++ b/src/inc/apiv2/common/AbstractBaseAPI.class.php @@ -150,8 +150,15 @@ protected function getUpdateHandlers($id, $current_user): array { } /** - * Overridable function to aggregate data in the object. Currently only used for Tasks - * returns the aggregated data in key value pairs + * Overridable function to aggregate data in the object. Used for Tasks and Agents. + * + * @param object $object The object to aggregate data from. + * @param array &$includedData Array passed by reference; implementations can add related resources + * for inclusion in the response by appending to this array. + * @return array Aggregated data as key-value pairs. + * + * Implementations should use $includedData to collect related resources that should be included + * in the API response, such as related entities or additional data. */ public static function aggregateData(object $object, array &$includedData=[]): array { @@ -1183,7 +1190,7 @@ protected function processExpands( // Add missing expands to expands in case they have been added in aggregateData() $expandKeys = array_keys($expandResult); $diffs = array_diff($expandKeys, $expands); - $expands = array_merge($expandKeys, $diffs); + $expands = array_merge($expands, $diffs); foreach ($expands as $expand) { if (!array_key_exists($object->getId(), $expandResult[$expand])) { @@ -1197,16 +1204,16 @@ protected function processExpands( $includedResources = self::addToRelatedResources($includedResources, $apiClass->obj2Resource($expandObject)); } } else { - if ($expandResultObject === null) { + if ($expandResultObject === null) { // to-only relation which is nullable continue; - } + } $includedResources = self::addToRelatedResources($includedResources, $apiClass->obj2Resource($expandResultObject)); } } return $includedResources; -} + } /** * Validate if user is allowed to access hashlist diff --git a/src/inc/apiv2/model/agents.routes.php b/src/inc/apiv2/model/agents.routes.php index 01a82c0e3..b3eba78d8 100644 --- a/src/inc/apiv2/model/agents.routes.php +++ b/src/inc/apiv2/model/agents.routes.php @@ -38,11 +38,19 @@ protected function getUpdateHandlers($id, $current_user): array { ]; } + /** + * Overridable function to aggregate data in the object. active chunk of agent is appended to + * $included_data. + * + * @param object $object the agent object were data is aggregated from + * @param array &$includedData + * @return array not used here + */ static function aggregateData(object $object, array &$included_data = []): array { $agentId = $object->getId(); $qFs = []; $qFs[] = new QueryFilter(Chunk::AGENT_ID, $agentId, "="); - $qFs[] = new QueryFilter(Chunk::STATE, 2, "="); + $qFs[] = new QueryFilter(Chunk::STATE, DHashcatStatus::RUNNING, "="); $active_chunk = Factory::getChunkFactory()->filter([Factory::FILTER => $qFs], true); if ($active_chunk !== NULL) { From fd210422f2c736c044e4048c72a6949d4fe826ff Mon Sep 17 00:00:00 2001 From: jessevz Date: Wed, 12 Nov 2025 10:42:41 +0100 Subject: [PATCH 245/691] Fixed bug that included errors where not added to response because of a typo --- src/inc/apiv2/common/AbstractBaseAPI.class.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/inc/apiv2/common/AbstractBaseAPI.class.php b/src/inc/apiv2/common/AbstractBaseAPI.class.php index a3b1fe75e..fa2de0c9f 100644 --- a/src/inc/apiv2/common/AbstractBaseAPI.class.php +++ b/src/inc/apiv2/common/AbstractBaseAPI.class.php @@ -1505,7 +1505,7 @@ protected static function getOneResource(object $apiClass, object $object, Reque $metaData = []; if ($apiClass->permissionErrors !== null) { - $metadata["Include errors"] = $apiClass->permissionErrors; + $metaData["Include errors"] = $apiClass->permissionErrors; } // Generate JSON:API GET output $ret = self::createJsonResponse($dataResources[0], $links, $includedResources, $metaData); From 2a9890cd85a76d9cbe4a56c36b88fe8f5656dccb Mon Sep 17 00:00:00 2001 From: jessevz Date: Wed, 12 Nov 2025 15:42:41 +0100 Subject: [PATCH 246/691] Added helper endpoint to generate image of the progress of a task --- .../helper/getTaskProgressImage.routes.php | 221 ++++++++++++++++++ 1 file changed, 221 insertions(+) create mode 100644 src/inc/apiv2/helper/getTaskProgressImage.routes.php diff --git a/src/inc/apiv2/helper/getTaskProgressImage.routes.php b/src/inc/apiv2/helper/getTaskProgressImage.routes.php new file mode 100644 index 000000000..c2137c834 --- /dev/null +++ b/src/inc/apiv2/helper/getTaskProgressImage.routes.php @@ -0,0 +1,221 @@ + "query", + "name" => "supertask", + "schema" => [ + "type" => "integer", + "format" => "int32" + ], + "required" => true, + "example" => 1, + "description" => "The ID of the supertask where you want to create the progress image of." + ], + [ + "in" => "query", + "name" => "task", + "schema" => [ + "type" => "integer", + "format" => "int32" + ], + "required" => true, + "example" => 1, + "description" => "The ID of the task where you want to create the progress image of." + ] + ]; + } + + /** + * Endpoint to download files + * @param Request $request + * @param Response $response + * @return Response + * @throws HTException + * @throws HttpErrorException + * @throws HttpForbidden + */ + public function handleGet(Request $request, Response $response): Response { + $this->preCommon($request); + $task_id = $request->getQueryParams()['task']; + $supertask_id = $request->getQueryParams()['supertask']; + + //check if task exists and get information + if ($task_id) { + $task = Factory::getTaskFactory()->get($task_id); + if ($task == null) { + throw new HttpNotFoundException($request, "Invalid file"); + } + $taskWrapper = Factory::getTaskWrapperFactory()->get($task->getTaskWrapperId()); + if ($taskWrapper == null) { + throw new HttpError("Inconsistency on task!"); + } + } + else if ($supertask_id) { + $taskWrapper = Factory::getTaskWrapperFactory()->get($_GET['supertask']); + if ($taskWrapper == null) { + throw new HttpError("Invalid task wrapper!"); + } + } else { + throw new HttpError("No task or super task has been provided"); + } + + $size = array(1500, 32); + + //create image + $image = imagecreatetruecolor($size[0], $size[1]); + imagesavealpha($image, true); + + //set colors + $transparency = imagecolorallocatealpha($image, 0, 0, 0, 127); + $yellow = imagecolorallocate($image, 255, 255, 0); + $red = imagecolorallocate($image, 255, 0, 0); + $grey = imagecolorallocate($image, 192, 192, 192); + $green = imagecolorallocate($image, 0, 255, 0); + $blue = imagecolorallocate($image, 60, 60, 245); + + //prepare image + imagefill($image, 0, 0, $transparency); + + if ($taskWrapper->getTaskType() == DTaskTypes::SUPERTASK && isset($supertask_id)) { + // handle supertask progress drawing here + $qF = new QueryFilter(Task::TASK_WRAPPER_ID, $taskWrapper->getId(), "="); + $oF = new OrderFilter(Task::PRIORITY, "DESC"); + $tasks = Factory::getTaskFactory()->filter([Factory::FILTER => $qF, Factory::ORDER => $oF]); + $numTasks = sizeof($tasks); + for ($i = 0; $i < sizeof($tasks); $i++) { + $qF = new QueryFilter(Chunk::TASK_ID, $tasks[$i]->getId(), "="); + $chunks = Factory::getChunkFactory()->filter([Factory::FILTER => $qF]); + $progress = 0; + foreach ($chunks as $chunk) { + $progress += $chunk->getCheckpoint(); + } + $qF = new QueryFilter(Chunk::TASK_ID, $tasks[$i]->getId(), "="); + $chunks = Factory::getChunkFactory()->filter([Factory::FILTER => $qF]); + $cracked = 0; + foreach ($chunks as $chunk) { + $cracked += $chunk->getCracked(); + } + if ($cracked > 0) { + imagefilledrectangle($image, $i * $size[0] / $numTasks, 0, ($i + 1) * $size[0] / $numTasks, $size[1] - 1, $green); + } + else if ($tasks[$i]->getKeyspace() > 0 && $progress >= $tasks[$i]->getKeyspace()) { + imagefilledrectangle($image, $i * $size[0] / $numTasks, 0, ($i + 1) * $size[0] / $numTasks, $size[1] - 1, $blue); + } + else if ($tasks[$i]->getKeyspace() > 0 && $progress > 0) { + imagefilledrectangle($image, $i * $size[0] / $numTasks, 0, ($i + 1) * $size[0] / $numTasks, $size[1] - 1, $yellow); + } + else { + imagefilledrectangle($image, $i * $size[0] / $numTasks, 0, ($i + 1) * $size[0] / $numTasks, $size[1] - 1, $grey); + } + } + } + else { + $progress = $task->getKeyspaceProgress(); + $keyspace = max($task->getKeyspace(), 1); + + //load chunks + $qF = new QueryFilter(Task::TASK_ID, $task->getId(), "="); + $chunks = Factory::getChunkFactory()->filter([Factory::FILTER => $qF]); + foreach ($chunks as $chunk) { + if ($task->getUsePreprocessor() == 1 && $task->getKeyspace() <= 0) { + continue; + } + $start = floor(($size[0] - 1) * $chunk->getSkip() / $keyspace); + $end = floor(($size[0] - 1) * ($chunk->getSkip() + $chunk->getLength()) / $keyspace) - 1; + //division by 10000 is required because rprogress is saved in percents with two decimals + $current = floor(($size[0] - 1) * ($chunk->getSkip() + $chunk->getLength() * $chunk->getProgress() / 10000) / $keyspace) - 1; + + if ($current > $end) { + $current = $end; + } + + if ($end - $start < 3) { + if ($chunk->getState() >= 6) { + imagefilledrectangle($image, $start, 0, $end, $size[1] - 1, $red); + } + else if ($chunk->getCracked() > 0) { + imagefilledrectangle($image, $start, 0, $end, $size[1] - 1, $green); + } + else { + imagefilledrectangle($image, $start, 0, $end, $size[1] - 1, $yellow); + } + } + else { + if ($chunk->getState() >= 6) { + imagerectangle($image, $start, 0, $end, ($size[1] - 1), $red); + } + else { + imagerectangle($image, $start, 0, $end, ($size[1] - 1), $grey); + } + if ($chunk->getCracked() > 0) { + imagefilledrectangle($image, $start + 1, 1, $current - 1, $size[1] - 2, $green); + } + else { + imagefilledrectangle($image, $start + 1, 1, $current - 1, $size[1] - 2, $yellow); + } + } + } + } + + //send image data to output + imagepng($image); + return $response->withStatus(200) + ->withHeader("Content-Type", "image/png") + ->withHeader("Cache-Control", "no-cache"); + } + + static public function register($app): void { + $baseUri = GetTaskProgressImageHelperAPI::getBaseUri(); + + /* Allow CORS preflight requests */ + $app->options($baseUri, function (Request $request, Response $response): Response { + return $response; + }); + $app->get($baseUri, "GetTaskProgressImageHelperAPI:handleGet"); + } +} + +GetTaskProgressImageHelperAPI::register($app); \ No newline at end of file From 91b664ffeca682a0a9b6ae5e9b426f6fc129cc44 Mon Sep 17 00:00:00 2001 From: jessevz Date: Thu, 13 Nov 2025 11:15:16 +0100 Subject: [PATCH 247/691] fixed copilot suggestions --- src/inc/apiv2/helper/getTaskProgressImage.routes.php | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/src/inc/apiv2/helper/getTaskProgressImage.routes.php b/src/inc/apiv2/helper/getTaskProgressImage.routes.php index c2137c834..300292e33 100644 --- a/src/inc/apiv2/helper/getTaskProgressImage.routes.php +++ b/src/inc/apiv2/helper/getTaskProgressImage.routes.php @@ -50,7 +50,7 @@ public function getParamsSwagger(): array { "type" => "integer", "format" => "int32" ], - "required" => true, + "required" => false, "example" => 1, "description" => "The ID of the supertask where you want to create the progress image of." ], @@ -61,7 +61,7 @@ public function getParamsSwagger(): array { "type" => "integer", "format" => "int32" ], - "required" => true, + "required" => false, "example" => 1, "description" => "The ID of the task where you want to create the progress image of." ] @@ -86,7 +86,7 @@ public function handleGet(Request $request, Response $response): Response { if ($task_id) { $task = Factory::getTaskFactory()->get($task_id); if ($task == null) { - throw new HttpNotFoundException($request, "Invalid file"); + throw new HttpNotFoundException($request, "Invalid task"); } $taskWrapper = Factory::getTaskWrapperFactory()->get($task->getTaskWrapperId()); if ($taskWrapper == null) { @@ -94,7 +94,7 @@ public function handleGet(Request $request, Response $response): Response { } } else if ($supertask_id) { - $taskWrapper = Factory::getTaskWrapperFactory()->get($_GET['supertask']); + $taskWrapper = Factory::getTaskWrapperFactory()->get($supertask_id); if ($taskWrapper == null) { throw new HttpError("Invalid task wrapper!"); } @@ -201,7 +201,11 @@ public function handleGet(Request $request, Response $response): Response { } //send image data to output + ob_start($image); imagepng($image); + $imageData = ob_get_clean(); + imagedestroy($image); + $response->getBody()->write($imageData); return $response->withStatus(200) ->withHeader("Content-Type", "image/png") ->withHeader("Cache-Control", "no-cache"); From 060fa8ecc3bf023d7af6b388e628d397faae5eca Mon Sep 17 00:00:00 2001 From: jessevz Date: Thu, 13 Nov 2025 11:28:57 +0100 Subject: [PATCH 248/691] Fixed bug --- src/inc/apiv2/helper/getTaskProgressImage.routes.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/inc/apiv2/helper/getTaskProgressImage.routes.php b/src/inc/apiv2/helper/getTaskProgressImage.routes.php index 300292e33..6b2960d09 100644 --- a/src/inc/apiv2/helper/getTaskProgressImage.routes.php +++ b/src/inc/apiv2/helper/getTaskProgressImage.routes.php @@ -201,7 +201,7 @@ public function handleGet(Request $request, Response $response): Response { } //send image data to output - ob_start($image); + ob_start(); imagepng($image); $imageData = ob_get_clean(); imagedestroy($image); From 0c57922ea0c514d62c257e1daaa8ee9e32ee1d9a Mon Sep 17 00:00:00 2001 From: jessevz Date: Thu, 13 Nov 2025 12:17:24 +0100 Subject: [PATCH 249/691] Added new composer option to not automatically block insecure packages (temporarily solution) --- composer.json | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/composer.json b/composer.json index 9dbf758cf..65755317f 100644 --- a/composer.json +++ b/composer.json @@ -44,7 +44,10 @@ "phpstan/extension-installer": true }, "process-timeout": 0, - "sort-packages": true + "sort-packages": true, + "audit": { + "block-insecure": false + } }, "autoload": { "psr-4": { From 44c980bc3c8b223fc512e68831f6f0394b1089a2 Mon Sep 17 00:00:00 2001 From: s3inlc Date: Fri, 14 Nov 2025 14:21:09 +0100 Subject: [PATCH 250/691] only include a WHERE statement into the query when at least one filter part is present --- src/dba/AbstractModelFactory.class.php | 3 +++ 1 file changed, 3 insertions(+) diff --git a/src/dba/AbstractModelFactory.class.php b/src/dba/AbstractModelFactory.class.php index e4bc12106..d6c034b1d 100755 --- a/src/dba/AbstractModelFactory.class.php +++ b/src/dba/AbstractModelFactory.class.php @@ -746,6 +746,9 @@ private function applyFilters(&$vals, $filters) { array_push($vals, $v); } } + if (sizeof($parts) == 0) { + return ""; + } return " WHERE " . implode(" AND ", $parts); } From f42acd3210a43e2e3f55026a4eb1fc45b944b997 Mon Sep 17 00:00:00 2001 From: sein Date: Fri, 14 Nov 2025 21:57:10 +0100 Subject: [PATCH 251/691] added mapping possibility for tables and columns of tables to avoid keyword issues --- src/dba/AbstractModel.class.php | 2 +- src/dba/AbstractModelFactory.class.php | 351 +++++++++--------- src/dba/Aggregation.class.php | 29 +- src/dba/ComparisonFilter.class.php | 28 +- src/dba/ContainFilter.class.php | 19 +- src/dba/Filter.class.php | 5 +- src/dba/Group.class.php | 2 +- src/dba/GroupFilter.class.php | 19 +- src/dba/JoinFilter.class.php | 2 +- src/dba/LikeFilter.class.php | 21 +- src/dba/LikeFilterInsensitive.class.php | 21 +- src/dba/Order.class.php | 2 +- src/dba/OrderFilter.class.php | 19 +- src/dba/PaginationFilter.class.php | 28 +- src/dba/QueryFilter.class.php | 25 +- src/dba/QueryFilterNoCase.class.php | 25 +- src/dba/QueryFilterWithNull.class.php | 27 +- src/dba/UpdateSet.class.php | 10 +- src/dba/Util.class.php | 8 +- src/dba/init.php | 2 +- .../models/AbstractModelFactory.template.txt | 6 +- src/dba/models/AccessGroup.class.php | 4 +- src/dba/models/AccessGroupAgent.class.php | 6 +- .../models/AccessGroupAgentFactory.class.php | 6 +- src/dba/models/AccessGroupFactory.class.php | 6 +- src/dba/models/AccessGroupUser.class.php | 6 +- .../models/AccessGroupUserFactory.class.php | 6 +- src/dba/models/Agent.class.php | 32 +- src/dba/models/AgentBinary.class.php | 14 +- src/dba/models/AgentBinaryFactory.class.php | 6 +- src/dba/models/AgentError.class.php | 12 +- src/dba/models/AgentErrorFactory.class.php | 6 +- src/dba/models/AgentFactory.class.php | 6 +- src/dba/models/AgentStat.class.php | 10 +- src/dba/models/AgentStatFactory.class.php | 6 +- src/dba/models/AgentZap.class.php | 6 +- src/dba/models/AgentZapFactory.class.php | 6 +- src/dba/models/ApiGroup.class.php | 6 +- src/dba/models/ApiGroupFactory.class.php | 6 +- src/dba/models/ApiKey.class.php | 14 +- src/dba/models/ApiKeyFactory.class.php | 6 +- src/dba/models/Assignment.class.php | 8 +- src/dba/models/AssignmentFactory.class.php | 6 +- src/dba/models/Chunk.class.php | 24 +- src/dba/models/ChunkFactory.class.php | 6 +- src/dba/models/Config.class.php | 8 +- src/dba/models/ConfigFactory.class.php | 6 +- src/dba/models/ConfigSection.class.php | 4 +- src/dba/models/ConfigSectionFactory.class.php | 6 +- src/dba/models/CrackerBinary.class.php | 10 +- src/dba/models/CrackerBinaryFactory.class.php | 6 +- src/dba/models/CrackerBinaryType.class.php | 6 +- .../models/CrackerBinaryTypeFactory.class.php | 6 +- src/dba/models/File.class.php | 14 +- src/dba/models/FileDelete.class.php | 6 +- src/dba/models/FileDeleteFactory.class.php | 6 +- src/dba/models/FileDownload.class.php | 8 +- src/dba/models/FileDownloadFactory.class.php | 6 +- src/dba/models/FileFactory.class.php | 6 +- src/dba/models/FilePretask.class.php | 6 +- src/dba/models/FilePretaskFactory.class.php | 6 +- src/dba/models/FileTask.class.php | 6 +- src/dba/models/FileTaskFactory.class.php | 6 +- src/dba/models/Hash.class.php | 18 +- src/dba/models/HashBinary.class.php | 18 +- src/dba/models/HashBinaryFactory.class.php | 6 +- src/dba/models/HashFactory.class.php | 6 +- src/dba/models/HashType.class.php | 8 +- src/dba/models/HashTypeFactory.class.php | 6 +- src/dba/models/Hashlist.class.php | 30 +- src/dba/models/HashlistFactory.class.php | 6 +- src/dba/models/HashlistHashlist.class.php | 6 +- .../models/HashlistHashlistFactory.class.php | 6 +- src/dba/models/HealthCheck.class.php | 16 +- src/dba/models/HealthCheckAgent.class.php | 18 +- .../models/HealthCheckAgentFactory.class.php | 6 +- src/dba/models/HealthCheckFactory.class.php | 6 +- src/dba/models/LogEntry.class.php | 12 +- src/dba/models/LogEntryFactory.class.php | 6 +- src/dba/models/NotificationSetting.class.php | 14 +- .../NotificationSettingFactory.class.php | 6 +- src/dba/models/Preprocessor.class.php | 14 +- src/dba/models/PreprocessorFactory.class.php | 6 +- src/dba/models/Pretask.class.php | 26 +- src/dba/models/PretaskFactory.class.php | 6 +- src/dba/models/RegVoucher.class.php | 6 +- src/dba/models/RegVoucherFactory.class.php | 6 +- src/dba/models/RightGroup.class.php | 6 +- src/dba/models/RightGroupFactory.class.php | 6 +- src/dba/models/Session.class.php | 14 +- src/dba/models/SessionFactory.class.php | 6 +- src/dba/models/Speed.class.php | 10 +- src/dba/models/SpeedFactory.class.php | 6 +- src/dba/models/StoredValue.class.php | 4 +- src/dba/models/StoredValueFactory.class.php | 6 +- src/dba/models/Supertask.class.php | 4 +- src/dba/models/SupertaskFactory.class.php | 6 +- src/dba/models/SupertaskPretask.class.php | 6 +- .../models/SupertaskPretaskFactory.class.php | 6 +- src/dba/models/Task.class.php | 48 +-- src/dba/models/TaskDebugOutput.class.php | 6 +- .../models/TaskDebugOutputFactory.class.php | 6 +- src/dba/models/TaskFactory.class.php | 6 +- src/dba/models/TaskWrapper.class.php | 18 +- src/dba/models/TaskWrapperFactory.class.php | 6 +- src/dba/models/User.class.php | 32 +- src/dba/models/UserFactory.class.php | 6 +- src/dba/models/Zap.class.php | 10 +- src/dba/models/ZapFactory.class.php | 6 +- src/dba/models/generator.php | 7 +- src/inc/utils/HashlistUtils.class.php | 1 + src/inc/utils/UserUtils.class.php | 1 + src/install/hashtopolis.sql | 10 +- .../updates/update_v1.0.0-rainbow4_vx.x.x.php | 18 + 114 files changed, 866 insertions(+), 640 deletions(-) create mode 100644 src/install/updates/update_v1.0.0-rainbow4_vx.x.x.php diff --git a/src/dba/AbstractModel.class.php b/src/dba/AbstractModel.class.php index 3563f2dcd..aa85dc5e8 100755 --- a/src/dba/AbstractModel.class.php +++ b/src/dba/AbstractModel.class.php @@ -24,7 +24,7 @@ abstract function getPrimaryKeyValue(); * @param $id string * @return */ - abstract function setId($id): void; + abstract function setId(string $id): void; /** * this function returns the models id diff --git a/src/dba/AbstractModelFactory.class.php b/src/dba/AbstractModelFactory.class.php index d6c034b1d..762640ce1 100755 --- a/src/dba/AbstractModelFactory.class.php +++ b/src/dba/AbstractModelFactory.class.php @@ -2,6 +2,7 @@ namespace DBA; +use JsonSchema\Constraints\Drafts\Draft06\AnyOfConstraint; use MassUpdateSet; use PDO, PDOStatement, PDOException; use UI; @@ -12,17 +13,19 @@ * models from Database. It handles the DB calling and caching of objects. */ abstract class AbstractModelFactory { + private const MAPPING_PREFIX = "htp_"; + /** - * @var PDO + * @var PDO|null */ - private static $dbh = null; + private static ?PDO $dbh = null; /** * Return the Models name * * @return string The name of the model associated with this factory */ - abstract function getModelName(); + abstract function getModelName(): string; /** * Return the Models associated table @@ -32,14 +35,19 @@ abstract function getModelName(); * * @return string The name of the table associated with this factory */ - abstract function getModelTable(); + abstract function getModelTable(): string; + + /** + * @return bool + */ + abstract function isMapping(): bool; /** * Returns wether the associated model is able to be cached or not * * @return boolean True, if the object might be cached, False if not */ - abstract function isCachable(); + abstract function isCachable(): bool; /** * Returns wether the models valid time on cache. @@ -49,7 +57,7 @@ abstract function isCachable(); * * @return int valid time in seconds, -1 if model shouldn't be cached */ - abstract function getCacheValidTime(); + abstract function getCacheValidTime(): int; /** * Returns an empty instance of the associated object @@ -60,7 +68,7 @@ abstract function getCacheValidTime(); * * @return AbstractModel */ - abstract function getNullObject(); + abstract function getNullObject(): AbstractModel; /** * This function inits, an objects values from a dict and returns it; @@ -71,7 +79,42 @@ abstract function getNullObject(); * @param $dict array dict of values and keys * @return AbstractModel An object of the factories type */ - abstract function createObjectFromDict($pk, $dict); + abstract function createObjectFromDict(string $pk, array $dict): AbstractModel; + + public function getMappedModelTable(): string { + if ($this->isMapping()) { + return self::MAPPING_PREFIX . $this->getModelName(); + } + return $this->getModelName(); + } + + private static function getMappedModelKeys(AbstractModel $model): array { + // check the keys of the table for required mapping from features + $keys = []; + $features = $model->getFeatures(); + foreach (array_keys($model->getKeyValueDict()) as $key) { + if ($features[$key]["dba_mapping"]) { + $keys[] = self::MAPPING_PREFIX . $key; + } + else { + $keys[] = $key; + } + } + return $keys; + } + + /** + * @param AbstractModel $model + * @param string $key + * @return string + */ + public static function getMappedModelKey(AbstractModel $model, string $key): string { + $features = $model->getFeatures(); + if ($features[$key]["dba_mapping"]) { + return self::MAPPING_PREFIX . $key; + } + return $key; + } /** * Saves the passed model in database, and returns it with the real id @@ -84,29 +127,17 @@ abstract function createObjectFromDict($pk, $dict); * The Function returns null if the object could not be placed into the * database * @param $model AbstractModel model to save - * @return AbstractModel + * @return AbstractModel|null */ - public function save($model) { + public function save(AbstractModel $model): ?AbstractModel { $dict = $model->getKeyValueDict(); - $query = "INSERT INTO " . $this->getModelTable(); - $keys = array_keys($dict); + $query = "INSERT INTO " . $this->getMappedModelTable(); $vals = array_values($dict); + $keys = self::getMappedModelKeys($model); - $placeHolder = "("; - $query .= " ("; - for ($i = 0; $i < count($keys); $i++) { - if ($i != count($keys) - 1) { - $query = $query . $keys[$i] . ","; - $placeHolder = $placeHolder . "?,"; - } - else { - $query = $query . $keys[$i]; - $placeHolder = $placeHolder . "?"; - } - } - $query = $query . ")"; - $placeHolder = $placeHolder . ")"; + $query .= " (" . implode(",", $keys) . ") "; + $placeHolder = " (" . implode(",", array_fill(0, count($keys), "?")) . ")"; $query = $query . " VALUES " . $placeHolder; @@ -131,7 +162,7 @@ public function save($model) { * @param $arr array * @return Filter[] */ - private function getFilters($arr) { + private function getFilters(array $arr): array { if (!is_array($arr['filter'])) { $arr['filter'] = array($arr['filter']); } @@ -145,7 +176,7 @@ private function getFilters($arr) { * @param $arr array * @return Order[] */ - private function getOrders($arr) { + private function getOrders(array $arr): array { if (!is_array($arr['order'])) { $arr['order'] = array($arr['order']); } @@ -159,7 +190,7 @@ private function getOrders($arr) { * @param $arr array * @return Group[] */ - private function getGroups($arr) { + private function getGroups(array $arr): array { if (!is_array($arr['group'])) { $arr['group'] = array($arr['group']); } @@ -173,7 +204,7 @@ private function getGroups($arr) { * @param $arr array * @return Join[] */ - private function getJoins($arr) { + private function getJoins(array $arr): array { if (!is_array($arr['join'])) { $arr['join'] = array($arr['join']); } @@ -192,27 +223,27 @@ private function getJoins($arr) { * @param $model AbstractModel model to update * @return PDOStatement */ - public function update($model) { + public function update(AbstractModel $model): PDOStatement { $dict = $model->getKeyValueDict(); - $query = "UPDATE " . $this->getModelTable() . " SET "; + $query = "UPDATE " . $this->getMappedModelTable() . " SET "; - $keys = array_keys($dict); + $keys = self::getMappedModelKeys($model); $values = array(); for ($i = 0; $i < count($keys); $i++) { if ($i != count($keys) - 1) { $query = $query . $keys[$i] . "=?,"; - array_push($values, $dict[$keys[$i]]); + $values[] = $dict[$keys[$i]]; } else { $query = $query . $keys[$i] . "=?"; - array_push($values, $dict[$keys[$i]]); + $values[] = $dict[$keys[$i]]; } } $query = $query . " WHERE " . $model->getPrimaryKey() . "=?"; - array_push($values, $model->getPrimaryKeyValue()); + $values[] = $model->getPrimaryKeyValue(); $stmt = $this->getDB()->prepare($query); $stmt->execute($values); @@ -227,18 +258,18 @@ public function update($model) { * @param $arr array key-value associations for update * @return PDOStatement */ - public function mset(&$model, $arr) { - $query = "UPDATE " . $this->getModelTable() . " SET "; + public function mset(AbstractModel &$model, array $arr): PDOStatement { + $query = "UPDATE " . $this->getMappedModelTable() . " SET "; $elements = []; $values = []; foreach ($arr as $key => $val) { - $elements[] = $key . "=? "; - array_push($values, $val); + $elements[] = self::getMappedModelKey($model, $key) . "=? "; + $values[] = $val; } $query .= implode(", ", $elements); $query = $query . " WHERE " . $model->getPrimaryKey() . "=?"; - array_push($values, $model->getPrimaryKeyValue()); + $values[] = $model->getPrimaryKeyValue(); $stmt = $this->getDB()->prepare($query); $stmt->execute($values); @@ -253,16 +284,16 @@ public function mset(&$model, $arr) { * Returns the return of PDO::execute() * @param $model AbstractModel primary key of model * @param $key string key of the column to update - * @param $value string|int value to set + * @param $value * @return PDOStatement */ - public function set(&$model, $key, $value) { - $query = "UPDATE " . $this->getModelTable() . " SET " . $key . "=?"; + public function set(AbstractModel &$model, string $key, $value): PDOStatement { + $query = "UPDATE " . $this->getMappedModelTable() . " SET " . self::getMappedModelKey($model, $key) . "=?"; $values = []; $query = $query . " WHERE " . $model->getPrimaryKey() . "=?"; - array_push($values, $value); - array_push($values, $model->getPrimaryKeyValue()); + $values[] = $value; + $values[] = $model->getPrimaryKeyValue(); $stmt = $this->getDB()->prepare($query); $stmt->execute($values); @@ -280,13 +311,14 @@ public function set(&$model, $key, $value) { * @param $value int amount of increment * @return PDOStatement */ - public function inc(&$model, $key, $value = 1) { - $query = "UPDATE " . $this->getModelTable() . " SET " . $key . "=" . $key . "+?"; + public function inc(AbstractModel &$model, string $key, int $value = 1): PDOStatement { + $mapped_key = self::getMappedModelKey($model, $key); + $query = "UPDATE " . $this->getMappedModelTable() . " SET " . $mapped_key . "=" . $mapped_key . "+?"; $values = []; $query = $query . " WHERE " . $model->getPrimaryKey() . "=?"; - array_push($values, $value); - array_push($values, $model->getPrimaryKeyValue()); + $values[] = $value; + $values[] = $model->getPrimaryKeyValue(); $stmt = $this->getDB()->prepare($query); $stmt->execute($values); @@ -304,13 +336,14 @@ public function inc(&$model, $key, $value = 1) { * @param $value int amount of increment * @return PDOStatement */ - public function dec(&$model, $key, $value = 1) { - $query = "UPDATE " . $this->getModelTable() . " SET " . $key . "=" . $key . "-?"; + public function dec(AbstractModel &$model, string $key, int $value = 1): PDOStatement { + $mapped_key = self::getMappedModelKey($model, $key); + $query = "UPDATE " . $this->getMappedModelTable() . " SET " . $mapped_key . "=" . $mapped_key . "-?"; $values = []; $query = $query . " WHERE " . $model->getPrimaryKey() . "=?"; - array_push($values, $value); - array_push($values, $model->getPrimaryKeyValue()); + $values[] = $value; + $values[] = $model->getPrimaryKeyValue(); $stmt = $this->getDB()->prepare($query); $stmt->execute($values); @@ -323,29 +356,16 @@ public function dec(&$model, $key, $value = 1) { * @param $models AbstractModel[] * @return bool|PDOStatement */ - public function massSave($models) { + public function massSave(array $models): bool|PDOStatement { if (sizeof($models) == 0) { return false; } - $dict = $models[0]->getKeyValueDict(); - $query = "INSERT INTO " . $this->getModelTable(); - $query .= "( "; - $keys = array_keys($dict); + $keys = self::getMappedModelKeys($models[0]); + $query = "INSERT INTO " . $this->getMappedModelTable(); - $placeHolder = "("; - for ($i = 0; $i < count($keys); $i++) { - if ($i != count($keys) - 1) { - $query = $query . $keys[$i] . ","; - $placeHolder = $placeHolder . "?,"; - } - else { - $query = $query . $keys[$i]; - $placeHolder = $placeHolder . "?"; - } - } - $query = $query . ")"; - $placeHolder = $placeHolder . ")"; + $query .= " (" . implode(",", $keys) . ") "; + $placeHolder = " (" . implode(",", array_fill(0, count($keys), "?")) . ")"; $query = $query . " VALUES "; $vals = array(); @@ -358,7 +378,7 @@ public function massSave($models) { $models[$x]->setId(null); } $dict = $models[$x]->getKeyValueDict(); - foreach (array_values($dict) as $val) { + foreach ($dict as $val) { $vals[] = $val; } } @@ -375,15 +395,15 @@ public function massSave($models) { * @param $op string either min or max * @return mixed */ - public function minMaxFilter($options, $sumColumn, $op) { + public function minMaxFilter(array $options, string $sumColumn, string $op): mixed { if (strtolower($op) == "min") { $op = "MIN"; } else { $op = "MAX"; } - $query = "SELECT $op($sumColumn) AS column_" . strtolower($op) . " "; - $query = $query . " FROM " . $this->getModelTable(); + $query = "SELECT $op(" . self::getMappedModelKey($this->getNullObject(), $sumColumn) . ") AS column_" . strtolower($op) . " "; + $query = $query . " FROM " . $this->getMappedModelTable(); $vals = array(); @@ -417,11 +437,11 @@ public function multicolAggregationFilter($options, $aggregations) { $elements = []; foreach ($aggregations as $aggregation) { - $elements[] = $aggregation->getQueryString(); + $elements[] = $aggregation->getQueryString($this); } $query = "SELECT " . join(",", $elements); - $query = $query . " FROM " . $this->getModelTable(); + $query = $query . " FROM " . $this->getMappedModelTable(); $vals = array(); @@ -440,8 +460,8 @@ public function multicolAggregationFilter($options, $aggregations) { } public function sumFilter($options, $sumColumn) { - $query = "SELECT SUM($sumColumn) AS sum "; - $query = $query . " FROM " . $this->getModelTable(); + $query = "SELECT SUM(" . self::getMappedModelKey($this->getNullObject(), $sumColumn) . ") AS sum "; + $query = $query . " FROM " . $this->getMappedModelTable(); $vals = array(); @@ -471,10 +491,10 @@ public function sumFilter($options, $sumColumn) { public function countFilter($options) { $query = "SELECT COUNT(*) AS count "; - $query = $query . " FROM " . $this->getModelTable(); + $query = $query . " FROM " . $this->getMappedModelTable(); $vals = array(); - + if (array_key_exists('join', $options)) { $query .= $this->applyJoins($options['join']); } @@ -512,17 +532,10 @@ public function countFilter($options) { * to use this function * * @param $pk string primary key - * @return AbstractModel the with pk associated model or Null - * + * @return AbstractModel|null the with pk associated model or Null */ public function get($pk) { - if (!$this->isCachable()) { - return $this->getFromDB($pk); - } - else { - // TODO: Implement caching - return $this->getFromDB($pk); - } + return $this->getFromDB($pk); } /** @@ -533,30 +546,16 @@ public function get($pk) { * If the model is set to be cachable, the cache will also be updated * * @param $pk string primary key - * @return AbstractModel the with pk associated model or Null + * @return AbstractModel|null the with pk associated model or Null */ - public function getFromDB($pk) { - $query = "SELECT "; - - $keys = array_keys($this->getNullObject()->getKeyValueDict()); - - for ($i = 0; $i < count($keys); $i++) { - if ($i != count($keys) - 1) { - $query = $query . $keys[$i] . ","; - } - else { - $query = $query . $keys[$i]; - } - } - $query = $query . " FROM " . $this->getModelTable(); - - $query = $query . " WHERE " . $this->getNullObject()->getPrimaryKey() . "=?"; + public function getFromDB($pk): ?AbstractModel { + $keys = self::getMappedModelKeys($this->getNullObject()); + $query = "SELECT " . implode(", ", $keys); + $query .= " FROM " . $this->getMappedModelTable(); + $query .= " WHERE " . $this->getNullObject()->getPrimaryKey() . "=?"; $stmt = $this->getDB()->prepare($query); - $stmt->execute(array( - $pk - ) - ); + $stmt->execute(array($pk)); if ($stmt->rowCount() != 0) { $row = $stmt->fetch(PDO::FETCH_ASSOC); return $this->createObjectFromDict($pk, $row); @@ -582,25 +581,16 @@ public function getFromDB($pk) { * @param $options array containing option settings * @return AbstractModel[]|AbstractModel Returns a list of matching objects or Null */ - private function filterWithJoin($options) { + private function filterWithJoin(array $options): array|AbstractModel { $joins = $this->getJoins($options); - if (!is_array($joins)) { - $joins = array($joins); - } - $keys = array_keys($this->getNullObject()->getKeyValueDict()); - $prefixedKeys = array(); $factories = array($this); - foreach ($keys as $key) { - $prefixedKeys[] = $this->getModelTable() . "." . $key; - $tables[] = $this->getModelTable(); - } - $query = "SELECT " . Util::createPrefixedString($this->getModelTable(), $this->getNullObject()->getKeyValueDict()); + $query = "SELECT " . Util::createPrefixedString($this->getMappedModelTable(), self::getMappedModelKeys($this->getNullObject())); foreach ($joins as $join) { $joinFactory = $join->getOtherFactory(); $factories[] = $joinFactory; - $query .= ", " . Util::createPrefixedString($joinFactory->getModelTable(), $joinFactory->getNullObject()->getKeyValueDict()); + $query .= ", " . Util::createPrefixedString($joinFactory->getMappedModelTable(), self::getMappedModelKeys($joinFactory->getNullObject())); } - $query .= " FROM " . $this->getModelTable(); + $query .= " FROM " . $this->getMappedModelTable(); foreach ($joins as $join) { $joinFactory = $join->getOtherFactory(); @@ -608,9 +598,9 @@ private function filterWithJoin($options) { if ($join->getOverrideOwnFactory() != null) { $localFactory = $join->getOverrideOwnFactory(); } - $match1 = $join->getMatch1(); - $match2 = $join->getMatch2(); - $query .= " INNER JOIN " . $joinFactory->getModelTable() . " ON " . $localFactory->getModelTable() . "." . $match1 . "=" . $joinFactory->getModelTable() . "." . $match2 . " "; + $match1 = self::getMappedModelKey($localFactory->getNullObject(), $join->getMatch1()); + $match2 = self::getMappedModelKey($joinFactory->getNullObject(), $join->getMatch2()); + $query .= " INNER JOIN " . $joinFactory->getMappedModelTable() . " ON " . $localFactory->getMappedModelTable() . "." . $match1 . "=" . $joinFactory->getMappedModelTable() . "." . $match2 . " "; } // Apply all normal filter to this query @@ -627,9 +617,7 @@ private function filterWithJoin($options) { if (!array_key_exists("order", $options)) { // Add a asc order on the primary keys as a standard $oF = new OrderFilter($this->getNullObject()->getPrimaryKey(), "ASC"); - $orderOptions = array( - $oF - ); + $orderOptions = array($oF); $options['order'] = $orderOptions; } $query .= $this->applyOrder($options['order']); @@ -652,8 +640,8 @@ private function filterWithJoin($options) { while ($row = $stmt->fetch(PDO::FETCH_ASSOC)) { foreach ($row as $k => $v) { foreach ($factories as $factory) { - if (Util::startsWith($k, $factory->getModelTable())) { - $column = str_replace($factory->getModelTable() . ".", "", $k); + if (Util::startsWith($k, $factory->getMappedModelTable())) { + $column = str_replace($factory->getMappedModelTable() . ".", "", $k); $values[$factory->getModelTable()][$column] = $v; } } @@ -661,21 +649,26 @@ private function filterWithJoin($options) { foreach ($factories as $factory) { $model = $factory->createObjectFromDict($values[$factory->getModelTable()][$factory->getNullObject()->getPrimaryKey()], $values[$factory->getModelTable()]); - array_push($res[$factory->getModelTable()], $model); + $res[$factory->getModelTable()][] = $model; } } return $res; } - public function filter($options, $single = false) { + /** + * @param array $options + * @param bool $single + * @return array|AbstractModel|null + */ + public function filter(array $options, bool $single = false) { // Check if we need to join and if so pass on to internal Function if (array_key_exists('join', $options)) { return $this->filterWithJoin($options); } - $keys = array_keys($this->getNullObject()->getKeyValueDict()); - $query = "SELECT " . implode(", ", $keys) . " FROM " . $this->getModelTable(); + $keys = self::getMappedModelKeys($this->getNullObject()); + $query = "SELECT " . implode(", ", $keys) . " FROM " . $this->getMappedModelTable(); $vals = array(); if (array_key_exists("filter", $options)) { @@ -693,7 +686,7 @@ public function filter($options, $single = false) { $options['order'] = $orderOptions; } $query .= $this->applyOrder($options['order']); - + if (array_key_exists("limit", $options)) { $query .= $this->applyLimit($options['limit']); } @@ -710,7 +703,7 @@ public function filter($options, $single = false) { $pk = $row[$pkName]; $model = $this->createObjectFromDict($pk, $row); - array_push($objects, $model); + $objects[] = $model; } if ($single) { @@ -725,45 +718,51 @@ public function filter($options, $single = false) { return $objects; } - private function applyFilters(&$vals, $filters) { + /** + * @param $vals + * @param $filters Filter|Filter[] + * @return string + */ + private function applyFilters(&$vals, Filter|array $filters): string { $parts = array(); if (!is_array($filters)) { $filters = array($filters); } foreach ($filters as $filter) { - $parts[] = $filter->getQueryString(); + $parts[] = $filter->getQueryString($this, true); if (!$filter->getHasValue()) { continue; } $v = $filter->getValue(); if (is_array($v)) { foreach ($v as $val) { - array_push($vals, $val); + $vals[] = $val; } } else { - array_push($vals, $v); + $vals[] = $v; } } - if (sizeof($parts) == 0) { - return ""; - } return " WHERE " . implode(" AND ", $parts); } - private function applyOrder($orders) { + /** + * @param $orders Order|Order[] + * @return string + */ + private function applyOrder(Order|array $orders): string { $orderQueries = array(); if (!is_array($orders)) { $orders = array($orders); } foreach ($orders as $order) { - $orderQueries[] = $order->getQueryString($this->getModelTable()); + $orderQueries[] = $order->getQueryString($this, true); } return " ORDER BY " . implode(", ", $orderQueries); } - - private function applyJoins($joins) { + + private function applyJoins($joins): string { $query = ""; foreach ($joins as $join) { $joinFactory = $join->getOtherFactory(); @@ -771,26 +770,26 @@ private function applyJoins($joins) { if ($join->getOverrideOwnFactory() != null) { $localFactory = $join->getOverrideOwnFactory(); } - $match1 = $join->getMatch1(); - $match2 = $join->getMatch2(); - $query .= " INNER JOIN " . $joinFactory->getModelTable() . " ON " . $localFactory->getModelTable() . "." . $match1 . "=" . $joinFactory->getModelTable() . "." . $match2 . " "; + $match1 = self::getMappedModelKey($localFactory->getNullObject(), $join->getMatch1()); + $match2 = self::getMappedModelKey($joinFactory->getNullObject(), $join->getMatch2()); + $query .= " INNER JOIN " . $joinFactory->getMappedModelTable() . " ON " . $localFactory->getMappedModelTable() . "." . $match1 . "=" . $joinFactory->getMappedModelTable() . "." . $match2 . " "; } return $query; } - + //applylimit is slightly different than the other apply functions, since you can only limit by a single value //the $limit argument is a single object LimitFilter object instead of an array of objects. - private function applyLimit($limit) { - return " LIMIT " . $limit->getQueryString(); + private function applyLimit($limit): string { + return " LIMIT " . $limit->getQueryString($this); } - private function applyGroups($groups) { + private function applyGroups($groups): string { $groupsQueries = array(); if (!is_array($groups)) { $groups = array($groups); } foreach ($groups as $group) { - $groupsQueries[] = $group->getQueryString($this->getModelTable()); + $groupsQueries[] = $group->getQueryString($this, true); } return " GROUP BY " . implode(", ", $groupsQueries); } @@ -803,9 +802,9 @@ private function applyGroups($groups) { * @param $model AbstractModel * @return bool */ - public function delete($model) { + public function delete($model): bool { if ($model != null) { - $query = "DELETE FROM " . $this->getModelTable() . " WHERE " . $model->getPrimaryKey() . " = ?"; + $query = "DELETE FROM " . $this->getMappedModelTable() . " WHERE " . $model->getPrimaryKey() . " = ?"; $stmt = $this->getDB()->prepare($query); return $stmt->execute(array( $model->getPrimaryKeyValue() @@ -819,8 +818,8 @@ public function delete($model) { * @param $options array * @return PDOStatement */ - public function massDeletion($options) { - $query = "DELETE FROM " . $this->getModelTable(); + public function massDeletion(array $options): PDOStatement { + $query = "DELETE FROM " . $this->getMappedModelTable(); $vals = array(); @@ -840,36 +839,36 @@ public function massDeletion($options) { * @param $updates MassUpdateSet[] * @return null */ - public function massSingleUpdate($matchingColumn, $updateColumn, $updates) { - $query = "UPDATE " . $this->getModelName(); + public function massSingleUpdate($matchingColumn, $updateColumn, array $updates) { + $query = "UPDATE " . $this->getMappedModelTable(); if (sizeof($updates) == 0) { return null; } - $query .= " SET `$updateColumn` = ( CASE "; + $query .= " SET ".self::getMappedModelKey($this->getNullObject(),$updateColumn)." = ( CASE "; $vals = array(); foreach ($updates as $update) { - $query .= $update->getMassQuery($matchingColumn); - array_push($vals, $update->getMatchValue()); - array_push($vals, $update->getUpdateValue()); + $query .= $update->getMassQuery(self::getMappedModelKey($this->getNullObject(),$matchingColumn)); + $vals[] = $update->getMatchValue(); + $vals[] = $update->getUpdateValue(); } $matchingArr = array(); foreach ($updates as $update) { - array_push($vals, $update->getMatchValue()); + $vals[] = $update->getMatchValue(); $matchingArr[] = "?"; } - $query .= "END) WHERE $matchingColumn IN (" . implode(",", $matchingArr) . ")"; + $query .= "END) WHERE ".self::getMappedModelKey($this->getNullObject(), $matchingColumn)." IN (" . implode(",", $matchingArr) . ")"; $dbh = self::getDB(); $stmt = $dbh->prepare($query); return $stmt->execute($vals); } - public function massUpdate($options) { - $query = "UPDATE " . $this->getModelTable(); + public function massUpdate($options): bool { + $query = "UPDATE " . $this->getMappedModelTable(); $vals = array(); @@ -885,13 +884,13 @@ public function massUpdate($options) { for ($i = 0; $i < count($updateOptions); $i++) { $option = $updateOptions[$i]; - array_push($vals, $option->getValue()); + $vals[] = $option->getValue(); if ($i != count($updateOptions) - 1) { - $query = $query . $option->getQuery() . " , "; + $query = $query . $option->getQuery($this) . " , "; } else { - $query = $query . $option->getQuery(); + $query = $query . $option->getQuery($this); } } } @@ -910,7 +909,7 @@ public function massUpdate($options) { * @param bool $test * @return PDO */ - public function getDB($test = false) { + public function getDB(bool $test = false): ?PDO { if (!$test) { $dsn = 'mysql:dbname=' . DBA_DB . ";host=" . DBA_SERVER . ";port=" . DBA_PORT; $user = DBA_USER; diff --git a/src/dba/Aggregation.class.php b/src/dba/Aggregation.class.php index be775c434..8889abcc7 100755 --- a/src/dba/Aggregation.class.php +++ b/src/dba/Aggregation.class.php @@ -10,32 +10,33 @@ class Aggregation { /** * @var AbstractModelFactory */ - private $factory; - - const SUM = "SUM"; - const MAX = "MAX"; - const MIN = "MIN"; - const COUNT = "COUNT"; + private $overrideFactory; + + const SUM = "SUM"; + const MAX = "MAX"; + const MIN = "MIN"; + const COUNT = "COUNT"; - function __construct($column, $function, $factory = null) { + function __construct($column, $function, $overrideFactory = null) { $this->column = $column; $this->function = $function; - $this->factory = $factory; + $this->overrideFactory = $overrideFactory; } function getName() { return strtolower($this->function) . "_" . $this->column; } - function getQueryString($table = "") { - if ($table != "") { - $table = $table . "."; + function getQueryString(AbstractModelFactory $factory, bool $includeTable = false) { + if ($this->overrideFactory != null) { + $factory = $this->overrideFactory; } - if ($this->factory != null) { - $table = $this->factory->getModelTable() . "."; + $table = ""; + if ($includeTable) { + $table = $factory->getMappedModelTable() . "."; } - return $this->function . "(" . $table . $this->column . ") AS " . $this->getName(); + return $this->function . "(" . $table . AbstractModelFactory::getMappedModelKey($factory->getNullObject(), $this->column) . ") AS " . $this->getName(); } } diff --git a/src/dba/ComparisonFilter.class.php b/src/dba/ComparisonFilter.class.php index d8c4abcfd..897404fbe 100755 --- a/src/dba/ComparisonFilter.class.php +++ b/src/dba/ComparisonFilter.class.php @@ -3,38 +3,44 @@ namespace DBA; class ComparisonFilter extends Filter { - private $key1; - private $key2; - private $operator; + private string $key1; + private string $key2; + private string $operator; /** * @var AbstractModelFactory */ private $overrideFactory; - function __construct($key1, $key2, $operator, $overrideFactory = null) { + function __construct(string $key1, string $key2, string $operator, AbstractModelFactory $overrideFactory = null) { $this->key1 = $key1; $this->key2 = $key2; $this->operator = $operator; $this->overrideFactory = $overrideFactory; } - function getQueryString($table = "") { - if ($table != "") { - $table = $table . "."; - } + /** + * @param AbstractModelFactory $factory + * @param bool $includeTable + * @return string + */ + function getQueryString(AbstractModelFactory $factory, bool $includeTable = false): string { if ($this->overrideFactory != null) { - $table = $this->overrideFactory->getModelTable() . "."; + $factory = $this->overrideFactory; + } + $table = ""; + if ($includeTable) { + $table = $factory->getMappedModelTable() . "."; } - return $table . $this->key1 . $this->operator . $table . $this->key2; + return $table . AbstractModelFactory::getMappedModelKey($factory->getNullObject(), $this->key1) . $this->operator . $table . AbstractModelFactory::getMappedModelKey($factory->getNullObject(), $this->key2); } function getValue() { return null; } - function getHasValue() { + function getHasValue(): bool { return false; } } diff --git a/src/dba/ContainFilter.class.php b/src/dba/ContainFilter.class.php index f1d609d41..df294f64c 100755 --- a/src/dba/ContainFilter.class.php +++ b/src/dba/ContainFilter.class.php @@ -8,22 +8,23 @@ class ContainFilter extends Filter { /** * @var AbstractModelFactory */ - private $factory; + private $overrideFactory; private $inverse; - function __construct($key, $values, $factory = null, $inverse = false) { + function __construct($key, $values, $overrideFactory = null, $inverse = false) { $this->key = $key; $this->values = $values; - $this->factory = $factory; + $this->overrideFactory = $overrideFactory; $this->inverse = $inverse; } - function getQueryString($table = "") { - if ($table != "") { - $table = $table . "."; + function getQueryString(AbstractModelFactory $factory, bool $includeTable = false): string { + if ($this->overrideFactory != null) { + $factory = $this->overrideFactory; } - if ($this->factory != null) { - $table = $this->factory->getModelTable() . "."; + $table = ""; + if ($includeTable) { + $table = $factory->getMappedModelTable() . "."; } $app = array(); @@ -36,7 +37,7 @@ function getQueryString($table = "") { } return "FALSE"; } - return $table . $this->key . (($this->inverse) ? " NOT" : "") . " IN (" . implode(",", $app) . ")"; + return $table . AbstractModelFactory::getMappedModelKey($factory->getNullObject(), $this->key) . (($this->inverse) ? " NOT" : "") . " IN (" . implode(",", $app) . ")"; } function getValue() { diff --git a/src/dba/Filter.class.php b/src/dba/Filter.class.php index 8eff888f3..f21cf04aa 100644 --- a/src/dba/Filter.class.php +++ b/src/dba/Filter.class.php @@ -4,10 +4,11 @@ abstract class Filter { /** - * @param $table string + * @param AbstractModelFactory $factory + * @param bool $includeTable * @return string */ - abstract function getQueryString($table = ""); + abstract function getQueryString(AbstractModelFactory $factory, bool $includeTable = false): string; abstract function getValue(); diff --git a/src/dba/Group.class.php b/src/dba/Group.class.php index 7d1d55ad5..d27171037 100644 --- a/src/dba/Group.class.php +++ b/src/dba/Group.class.php @@ -3,5 +3,5 @@ namespace DBA; abstract class Group { - abstract function getQueryString($table = ""); + abstract function getQueryString(AbstractModelFactory $factory, bool $includeTable = false); } \ No newline at end of file diff --git a/src/dba/GroupFilter.class.php b/src/dba/GroupFilter.class.php index a6064e080..b077dc339 100644 --- a/src/dba/GroupFilter.class.php +++ b/src/dba/GroupFilter.class.php @@ -7,22 +7,23 @@ class GroupFilter extends Group { /** * @var AbstractModelFactory */ - private $factory; + private $overrideFactory; - function __construct($by, $factory = null) { + function __construct($by, $overrideFactory = null) { $this->by = $by; - $this->factory = $factory; + $this->overrideFactory = $overrideFactory; } - function getQueryString($table = "") { - if ($table != "") { - $table = $table . "."; + function getQueryString(AbstractModelFactory $factory, bool $includeTable = false): string { + if ($this->overrideFactory != null) { + $factory = $this->overrideFactory; } - if ($this->factory != null) { - $table = $this->factory->getModelTable() . "."; + $table = ""; + if ($includeTable) { + $table = $factory->getMappedModelTable() . "."; } - return $table . $this->by . " "; + return $table . AbstractModelFactory::getMappedModelKey($factory->getNullObject(), $this->by) . " "; } } diff --git a/src/dba/JoinFilter.class.php b/src/dba/JoinFilter.class.php index 9828a3ac6..f23d80a78 100755 --- a/src/dba/JoinFilter.class.php +++ b/src/dba/JoinFilter.class.php @@ -40,7 +40,7 @@ function __construct($otherFactory, $matching1, $matching2, $overrideOwnFactory $this->match1 = $matching1; $this->match2 = $matching2; - $this->otherTableName = $this->otherFactory->getModelTable(); + $this->otherTableName = $this->otherFactory->getMappedModelTable(); $this->overrideOwnFactory = $overrideOwnFactory; } diff --git a/src/dba/LikeFilter.class.php b/src/dba/LikeFilter.class.php index 6ddd2036a..8de40e3fd 100755 --- a/src/dba/LikeFilter.class.php +++ b/src/dba/LikeFilter.class.php @@ -9,12 +9,12 @@ class LikeFilter extends Filter { /** * @var AbstractModelFactory */ - private $factory; + private $overrideFactory; - function __construct($key, $value, $factory = null) { + function __construct($key, $value, $overrideFactory = null) { $this->key = $key; $this->value = $value; - $this->factory = $factory; + $this->overrideFactory = $overrideFactory; $this->match = true; } @@ -22,12 +22,13 @@ function setMatch($status) { $this->match = $status; } - function getQueryString($table = "") { - if ($table != "") { - $table = $table . "."; + function getQueryString(AbstractModelFactory $factory, bool $includeTable = false): string { + if ($this->overrideFactory != null) { + $factory = $this->overrideFactory; } - if ($this->factory != null) { - $table = $this->factory->getModelTable() . "."; + $table = ""; + if ($includeTable) { + $table = $factory->getMappedModelTable() . "."; } $inv = ""; @@ -35,14 +36,14 @@ function getQueryString($table = "") { $inv = " NOT"; } - return $table . $this->key . $inv . " LIKE BINARY ?"; + return $table . AbstractModelFactory::getMappedModelKey($factory->getNullObject(), $this->key) . $inv . " LIKE BINARY ?"; } function getValue() { return $this->value; } - function getHasValue() { + function getHasValue(): bool { return true; } } diff --git a/src/dba/LikeFilterInsensitive.class.php b/src/dba/LikeFilterInsensitive.class.php index 0e59edf60..557680b0a 100755 --- a/src/dba/LikeFilterInsensitive.class.php +++ b/src/dba/LikeFilterInsensitive.class.php @@ -8,30 +8,31 @@ class LikeFilterInsensitive extends Filter { /** * @var AbstractModelFactory */ - private $factory; + private $overrideFactory; - function __construct($key, $value, $factory = null) { + function __construct($key, $value, $overrideFactory = null) { $this->key = $key; $this->value = $value; - $this->factory = $factory; + $this->overrideFactory = $overrideFactory; } - function getQueryString($table = "") { - if ($table != "") { - $table = $table . "."; + function getQueryString(AbstractModelFactory $factory, bool $includeTable = false): string { + if ($this->overrideFactory != null) { + $factory = $this->overrideFactory; } - if ($this->factory != null) { - $table = $this->factory->getModelTable() . "."; + $table = ""; + if ($includeTable) { + $table = $factory->getMappedModelTable() . "."; } - return "LOWER(" . $table . $this->key . ") LIKE LOWER(?)"; + return "LOWER(" . $table . AbstractModelFactory::getMappedModelKey($factory->getNullObject(),$this->key) . ") LIKE LOWER(?)"; } function getValue() { return $this->value; } - function getHasValue() { + function getHasValue(): bool { return true; } } diff --git a/src/dba/Order.class.php b/src/dba/Order.class.php index 7bfd08e57..587ec043d 100644 --- a/src/dba/Order.class.php +++ b/src/dba/Order.class.php @@ -3,5 +3,5 @@ namespace DBA; abstract class Order { - abstract function getQueryString($table = ""); + abstract function getQueryString(AbstractModelFactory $factory, bool $includeTable = false): string; } \ No newline at end of file diff --git a/src/dba/OrderFilter.class.php b/src/dba/OrderFilter.class.php index 51d75e6cc..04b168b58 100755 --- a/src/dba/OrderFilter.class.php +++ b/src/dba/OrderFilter.class.php @@ -8,23 +8,24 @@ class OrderFilter extends Order { /** * @var AbstractModelFactory */ - private $factory; + private $overrideFactory; - function __construct($by, $type, $factory = null) { + function __construct($by, $type, $overrideFactory = null) { $this->by = $by; $this->type = $type; - $this->factory = $factory; + $this->overrideFactory = $overrideFactory; } - function getQueryString($table = "") { - if ($table != "") { - $table = $table . "."; + function getQueryString(AbstractModelFactory $factory, bool $includeTable = false): string { + if ($this->overrideFactory != null) { + $factory = $this->overrideFactory; } - if ($this->factory != null) { - $table = $this->factory->getModelTable() . "."; + $table = ""; + if ($includeTable) { + $table = $factory->getMappedModelTable() . "."; } - return $table . $this->by . " " . $this->type; + return $table . AbstractModelFactory::getMappedModelKey($factory->getNullObject(), $this->by) . " " . $this->type; } } diff --git a/src/dba/PaginationFilter.class.php b/src/dba/PaginationFilter.class.php index a32abb7d7..200aba97f 100644 --- a/src/dba/PaginationFilter.class.php +++ b/src/dba/PaginationFilter.class.php @@ -12,38 +12,40 @@ class PaginationFilter extends Filter { /** * @var AbstractModelFactory */ - private $factory; + private $overrideFactory; - function __construct($key, $value, $operator, $tieBreakerKey, $tieBreakerValue, $filters = [], $factory = null) { + function __construct($key, $value, $operator, $tieBreakerKey, $tieBreakerValue, $filters = [], $overrideFactory = null) { /** * @param QueryFilter[] $filters */ $this->key = $key; $this->value = $value; $this->operator = $operator; - $this->factory = $factory; + $this->overrideFactory = $overrideFactory; $this->tieBreakerKey = $tieBreakerKey; $this->tieBreakerValue = $tieBreakerValue; $this->filters = $filters; } - function getQueryString($table = "") { - if ($table != "") { - $table = $table . "."; + function getQueryString(AbstractModelFactory $factory, bool $includeTable = false): string { + if ($this->overrideFactory != null) { + $factory = $this->overrideFactory; } - if ($this->factory != null) { - $table = $this->factory->getModelTable() . "."; + $table = ""; + if ($includeTable) { + $table = $factory->getMappedModelTable() . "."; } + $parts = array_map(fn($filter) => $filter->getQueryString(), $this->filters); //ex. SELECT hashTypeId, description, isSalted, isSlowHash FROM HashType // where (HashType.isSalted < 1) OR (HashType.isSalted = 1 and HashType.hashTypeId < 12600) // ORDER BY HashType.isSalted DESC, HashType.hashTypeId DESC LIMIT 25; - $queryString = "(" . $table . $this->key . $this->operator . "?" . ") OR (" . $this->key . "=" . "?" - . " AND " . $this->tieBreakerKey . $this->operator . "?"; + $queryString = "(" . $table . AbstractModelFactory::getMappedModelKey($factory->getNullObject(), $this->key) . $this->operator . "?" . ") OR (" . AbstractModelFactory::getMappedModelKey($factory->getNullObject(), $this->key) . "=" . "?" + . " AND " . AbstractModelFactory::getMappedModelKey($factory->getNullObject(), $this->tieBreakerKey) . $this->operator . "?"; if (count($this->filters) > 0) { - $queryString = $queryString . " AND ". implode(" AND ", $parts); + $queryString = $queryString . " AND " . implode(" AND ", $parts); } - $queryString .= ")"; + $queryString .= ")"; return $queryString; } @@ -52,7 +54,7 @@ function getValue() { return array_merge($values, array_map(fn($filter) => $filter->getValue(), $this->filters)); } - function getHasValue() { + function getHasValue(): bool { if ($this->value === null) { return false; } diff --git a/src/dba/QueryFilter.class.php b/src/dba/QueryFilter.class.php index 19929f591..ec7a56ccd 100755 --- a/src/dba/QueryFilter.class.php +++ b/src/dba/QueryFilter.class.php @@ -9,30 +9,31 @@ class QueryFilter extends Filter { /** * @var AbstractModelFactory */ - private $factory; + private $overrideFactory; - function __construct($key, $value, $operator, $factory = null) { + function __construct($key, $value, $operator, $overrideFactory = null) { $this->key = $key; $this->value = $value; $this->operator = $operator; - $this->factory = $factory; + $this->overrideFactory = $overrideFactory; } - function getQueryString($table = "") { - if ($table != "") { - $table = $table . "."; + function getQueryString(AbstractModelFactory $factory, bool $includeTable = false): string { + if ($this->overrideFactory != null) { + $factory = $this->overrideFactory; } - if ($this->factory != null) { - $table = $this->factory->getModelTable() . "."; + $table = ""; + if ($includeTable) { + $table = $factory->getMappedModelTable() . "."; } if ($this->value === null) { if ($this->operator == '<>') { - return $table . $this->key . " IS NOT NULL "; + return $table . AbstractModelFactory::getMappedModelKey($factory->getNullObject(), $this->key) . " IS NOT NULL "; } - return $table . $this->key . " IS NULL "; + return $table . AbstractModelFactory::getMappedModelKey($factory->getNullObject(), $this->key) . " IS NULL "; } - return $table . $this->key . $this->operator . "?"; + return $table . AbstractModelFactory::getMappedModelKey($factory->getNullObject(), $this->key) . $this->operator . "?"; } function getValue() { @@ -42,7 +43,7 @@ function getValue() { return $this->value; } - function getHasValue() { + function getHasValue(): bool { if ($this->value === null) { return false; } diff --git a/src/dba/QueryFilterNoCase.class.php b/src/dba/QueryFilterNoCase.class.php index 43567018d..793d3ade9 100644 --- a/src/dba/QueryFilterNoCase.class.php +++ b/src/dba/QueryFilterNoCase.class.php @@ -9,30 +9,31 @@ class QueryFilterNoCase extends Filter { /** * @var AbstractModelFactory */ - private $factory; + private $overrideFactory; - function __construct($key, $value, $operator, $factory = null) { + function __construct($key, $value, $operator, $overrideFactory = null) { $this->key = $key; $this->value = $value; $this->operator = $operator; - $this->factory = $factory; + $this->overrideFactory = $overrideFactory; } - function getQueryString($table = "") { - if ($table != "") { - $table = $table . "."; + function getQueryString(AbstractModelFactory $factory, bool $includeTable = false): string { + if ($this->overrideFactory != null) { + $factory = $this->overrideFactory; } - if ($this->factory != null) { - $table = $this->factory->getModelTable() . "."; + $table = ""; + if ($includeTable) { + $table = $factory->getMappedModelTable() . "."; } if ($this->value === null) { if ($this->operator == '<>') { - return $table . $this->key . " IS NOT NULL "; + return $table . AbstractModelFactory::getMappedModelKey($factory->getNullObject(), $this->key) . " IS NOT NULL "; } - return $table . $this->key . " IS NULL "; + return $table . AbstractModelFactory::getMappedModelKey($factory->getNullObject(), $this->key) . " IS NULL "; } - return "(LOWER(" . $table . $this->key . ") " . $this->operator . "? OR " . $table . $this->key . $this->operator . "?)"; + return "(LOWER(" . $table . AbstractModelFactory::getMappedModelKey($factory->getNullObject(), $this->key) . ") " . $this->operator . "? OR " . $table . AbstractModelFactory::getMappedModelKey($factory->getNullObject(), $this->key) . $this->operator . "?)"; } function getValue() { @@ -42,7 +43,7 @@ function getValue() { return array($this->value, $this->value); } - function getHasValue() { + function getHasValue(): bool { if ($this->value === null) { return false; } diff --git a/src/dba/QueryFilterWithNull.class.php b/src/dba/QueryFilterWithNull.class.php index 090b2920d..6ada2f10b 100644 --- a/src/dba/QueryFilterWithNull.class.php +++ b/src/dba/QueryFilterWithNull.class.php @@ -10,34 +10,35 @@ class QueryFilterWithNull extends Filter { /** * @var AbstractModelFactory */ - private $factory; + private $overrideFactory; - function __construct($key, $value, $operator, $matchNull, $factory = null) { + function __construct($key, $value, $operator, $matchNull, $overrideFactory = null) { $this->key = $key; $this->value = $value; $this->operator = $operator; - $this->factory = $factory; + $this->overrideFactory = $overrideFactory; $this->matchNull = $matchNull; } - function getQueryString($table = "") { - if ($table != "") { - $table = $table . "."; + function getQueryString(AbstractModelFactory $factory, bool $includeTable = false): string { + if ($this->overrideFactory != null) { + $factory = $this->overrideFactory; } - if ($this->factory != null) { - $table = $this->factory->getModelTable() . "."; + $table = ""; + if ($includeTable) { + $table = $factory->getMappedModelTable() . "."; } if ($this->value === null) { if ($this->operator == '<>') { - return $table . $this->key . " IS NOT NULL "; + return $table . AbstractModelFactory::getMappedModelKey($factory->getNullObject(), $this->key) . " IS NOT NULL "; } - return $table . $this->key . " IS NULL "; + return $table . AbstractModelFactory::getMappedModelKey($factory->getNullObject(), $this->key) . " IS NULL "; } if ($this->matchNull) { - return "(" . $table . $this->key . $this->operator . "? OR " . $table . $this->key . " IS NULL)"; + return "(" . $table . AbstractModelFactory::getMappedModelKey($factory->getNullObject(), $this->key) . $this->operator . "? OR " . $table . AbstractModelFactory::getMappedModelKey($factory->getNullObject(), $this->key) . " IS NULL)"; } - return "(" . $table . $this->key . $this->operator . "? OR " . $table . $this->key . " IS NOT NULL)"; + return "(" . $table . AbstractModelFactory::getMappedModelKey($factory->getNullObject(), $this->key) . $this->operator . "? OR " . $table . AbstractModelFactory::getMappedModelKey($factory->getNullObject(), $this->key) . " IS NOT NULL)"; } function getValue() { @@ -47,7 +48,7 @@ function getValue() { return $this->value; } - function getHasValue() { + function getHasValue(): bool { if ($this->value === null) { return false; } diff --git a/src/dba/UpdateSet.class.php b/src/dba/UpdateSet.class.php index 69fcfcc4f..c05e05024 100644 --- a/src/dba/UpdateSet.class.php +++ b/src/dba/UpdateSet.class.php @@ -1,5 +1,7 @@ value = $value; } - function getQuery($table = "") { - return $table . $this->key . "=?"; + function getQuery(AbstractModelFactory $factory, bool $includeTable = false): string { + $table = ""; + if ($includeTable) { + $table = $factory->getMappedModelTable() . "."; + } + return $table . AbstractModelFactory::getMappedModelKey($factory->getNullObject(), $this->key) . "=?"; } function getValue() { diff --git a/src/dba/Util.class.php b/src/dba/Util.class.php index e9604eb4f..c09c18189 100644 --- a/src/dba/Util.class.php +++ b/src/dba/Util.class.php @@ -31,13 +31,13 @@ public static function cast($obj, $to_class) { /** * Used to create the full select string of a table query * @param $table string - * @param $dict array + * @param $keys array * @return string */ - public static function createPrefixedString($table, $dict) { + public static function createPrefixedString(string $table, array $keys): string { $arr = array(); - foreach ($dict as $key => $val) { - $arr[] = "`$table`.`$key` AS `$table.$key`"; + foreach ($keys as $key) { + $arr[] = "$table.$key AS '$table.$key'"; } return implode(", ", $arr); } diff --git a/src/dba/init.php b/src/dba/init.php index 4ab7cebc6..7af80230d 100644 --- a/src/dba/init.php +++ b/src/dba/init.php @@ -39,4 +39,4 @@ } require_once(dirname(__FILE__) . "/Factory.class.php"); -define("DBA_VERSION", "1.0.0"); \ No newline at end of file +define("DBA_VERSION", "1.0.0"); diff --git a/src/dba/models/AbstractModelFactory.template.txt b/src/dba/models/AbstractModelFactory.template.txt index c1b027d3c..40e8978a1 100644 --- a/src/dba/models/AbstractModelFactory.template.txt +++ b/src/dba/models/AbstractModelFactory.template.txt @@ -10,6 +10,10 @@ class __MODEL_NAME__Factory extends AbstractModelFactory { function getModelTable(): string { return "__MODEL_NAME__"; } + + function isMapping(): bool { + return __MODEL_DBA_MAPPING__; + } function isCachable(): bool { return false; @@ -40,7 +44,7 @@ class __MODEL_NAME__Factory extends AbstractModelFactory { * @param bool $single * @return __MODEL_NAME__|__MODEL_NAME__[] */ - function filter($options, $single = false) { + function filter(array $options, bool $single = false) { $join = false; if (array_key_exists('join', $options)) { $join = true; diff --git a/src/dba/models/AccessGroup.class.php b/src/dba/models/AccessGroup.class.php index 0af23e071..8f3c3e2c2 100644 --- a/src/dba/models/AccessGroup.class.php +++ b/src/dba/models/AccessGroup.class.php @@ -21,8 +21,8 @@ function getKeyValueDict(): array { static function getFeatures(): array { $dict = array(); - $dict['accessGroupId'] = ['read_only' => True, "type" => "int", "subtype" => "unset", "choices" => "unset", "null" => False, "pk" => True, "protected" => True, "private" => False, "alias" => "accessGroupId", "public" => False]; - $dict['groupName'] = ['read_only' => False, "type" => "str(50)", "subtype" => "unset", "choices" => "unset", "null" => False, "pk" => False, "protected" => False, "private" => False, "alias" => "groupName", "public" => False]; + $dict['accessGroupId'] = ['read_only' => True, "type" => "int", "subtype" => "unset", "choices" => "unset", "null" => False, "pk" => True, "protected" => True, "private" => False, "alias" => "accessGroupId", "public" => False, "dba_mapping" => False]; + $dict['groupName'] = ['read_only' => False, "type" => "str(50)", "subtype" => "unset", "choices" => "unset", "null" => False, "pk" => False, "protected" => False, "private" => False, "alias" => "groupName", "public" => False, "dba_mapping" => False]; return $dict; } diff --git a/src/dba/models/AccessGroupAgent.class.php b/src/dba/models/AccessGroupAgent.class.php index 321486960..81918fcfe 100644 --- a/src/dba/models/AccessGroupAgent.class.php +++ b/src/dba/models/AccessGroupAgent.class.php @@ -24,9 +24,9 @@ function getKeyValueDict(): array { static function getFeatures(): array { $dict = array(); - $dict['accessGroupAgentId'] = ['read_only' => True, "type" => "int", "subtype" => "unset", "choices" => "unset", "null" => False, "pk" => True, "protected" => True, "private" => False, "alias" => "accessGroupAgentId", "public" => False]; - $dict['accessGroupId'] = ['read_only' => True, "type" => "int", "subtype" => "unset", "choices" => "unset", "null" => False, "pk" => False, "protected" => False, "private" => False, "alias" => "accessGroupId", "public" => False]; - $dict['agentId'] = ['read_only' => True, "type" => "int", "subtype" => "unset", "choices" => "unset", "null" => False, "pk" => False, "protected" => False, "private" => False, "alias" => "agentId", "public" => False]; + $dict['accessGroupAgentId'] = ['read_only' => True, "type" => "int", "subtype" => "unset", "choices" => "unset", "null" => False, "pk" => True, "protected" => True, "private" => False, "alias" => "accessGroupAgentId", "public" => False, "dba_mapping" => False]; + $dict['accessGroupId'] = ['read_only' => True, "type" => "int", "subtype" => "unset", "choices" => "unset", "null" => False, "pk" => False, "protected" => False, "private" => False, "alias" => "accessGroupId", "public" => False, "dba_mapping" => False]; + $dict['agentId'] = ['read_only' => True, "type" => "int", "subtype" => "unset", "choices" => "unset", "null" => False, "pk" => False, "protected" => False, "private" => False, "alias" => "agentId", "public" => False, "dba_mapping" => False]; return $dict; } diff --git a/src/dba/models/AccessGroupAgentFactory.class.php b/src/dba/models/AccessGroupAgentFactory.class.php index 50db0ee05..cf9acba76 100644 --- a/src/dba/models/AccessGroupAgentFactory.class.php +++ b/src/dba/models/AccessGroupAgentFactory.class.php @@ -10,6 +10,10 @@ function getModelName(): string { function getModelTable(): string { return "AccessGroupAgent"; } + + function isMapping(): bool { + return False; + } function isCachable(): bool { return false; @@ -40,7 +44,7 @@ function createObjectFromDict($pk, $dict): AccessGroupAgent { * @param bool $single * @return AccessGroupAgent|AccessGroupAgent[] */ - function filter($options, $single = false) { + function filter(array $options, bool $single = false) { $join = false; if (array_key_exists('join', $options)) { $join = true; diff --git a/src/dba/models/AccessGroupFactory.class.php b/src/dba/models/AccessGroupFactory.class.php index b10cd4a6e..e46be4fec 100644 --- a/src/dba/models/AccessGroupFactory.class.php +++ b/src/dba/models/AccessGroupFactory.class.php @@ -10,6 +10,10 @@ function getModelName(): string { function getModelTable(): string { return "AccessGroup"; } + + function isMapping(): bool { + return False; + } function isCachable(): bool { return false; @@ -40,7 +44,7 @@ function createObjectFromDict($pk, $dict): AccessGroup { * @param bool $single * @return AccessGroup|AccessGroup[] */ - function filter($options, $single = false) { + function filter(array $options, bool $single = false) { $join = false; if (array_key_exists('join', $options)) { $join = true; diff --git a/src/dba/models/AccessGroupUser.class.php b/src/dba/models/AccessGroupUser.class.php index 2bc945a2c..f65e8f0dc 100644 --- a/src/dba/models/AccessGroupUser.class.php +++ b/src/dba/models/AccessGroupUser.class.php @@ -24,9 +24,9 @@ function getKeyValueDict(): array { static function getFeatures(): array { $dict = array(); - $dict['accessGroupUserId'] = ['read_only' => True, "type" => "int", "subtype" => "unset", "choices" => "unset", "null" => False, "pk" => True, "protected" => True, "private" => False, "alias" => "accessGroupUserId", "public" => False]; - $dict['accessGroupId'] = ['read_only' => True, "type" => "int", "subtype" => "unset", "choices" => "unset", "null" => False, "pk" => False, "protected" => False, "private" => False, "alias" => "accessGroupId", "public" => False]; - $dict['userId'] = ['read_only' => True, "type" => "int", "subtype" => "unset", "choices" => "unset", "null" => False, "pk" => False, "protected" => False, "private" => False, "alias" => "userId", "public" => False]; + $dict['accessGroupUserId'] = ['read_only' => True, "type" => "int", "subtype" => "unset", "choices" => "unset", "null" => False, "pk" => True, "protected" => True, "private" => False, "alias" => "accessGroupUserId", "public" => False, "dba_mapping" => False]; + $dict['accessGroupId'] = ['read_only' => True, "type" => "int", "subtype" => "unset", "choices" => "unset", "null" => False, "pk" => False, "protected" => False, "private" => False, "alias" => "accessGroupId", "public" => False, "dba_mapping" => False]; + $dict['userId'] = ['read_only' => True, "type" => "int", "subtype" => "unset", "choices" => "unset", "null" => False, "pk" => False, "protected" => False, "private" => False, "alias" => "userId", "public" => False, "dba_mapping" => False]; return $dict; } diff --git a/src/dba/models/AccessGroupUserFactory.class.php b/src/dba/models/AccessGroupUserFactory.class.php index 3892a02be..595fb0782 100644 --- a/src/dba/models/AccessGroupUserFactory.class.php +++ b/src/dba/models/AccessGroupUserFactory.class.php @@ -10,6 +10,10 @@ function getModelName(): string { function getModelTable(): string { return "AccessGroupUser"; } + + function isMapping(): bool { + return False; + } function isCachable(): bool { return false; @@ -40,7 +44,7 @@ function createObjectFromDict($pk, $dict): AccessGroupUser { * @param bool $single * @return AccessGroupUser|AccessGroupUser[] */ - function filter($options, $single = false) { + function filter(array $options, bool $single = false) { $join = false; if (array_key_exists('join', $options)) { $join = true; diff --git a/src/dba/models/Agent.class.php b/src/dba/models/Agent.class.php index b4a98e529..0a088661a 100644 --- a/src/dba/models/Agent.class.php +++ b/src/dba/models/Agent.class.php @@ -63,22 +63,22 @@ function getKeyValueDict(): array { static function getFeatures(): array { $dict = array(); - $dict['agentId'] = ['read_only' => True, "type" => "int", "subtype" => "unset", "choices" => "unset", "null" => False, "pk" => True, "protected" => True, "private" => False, "alias" => "agentId", "public" => False]; - $dict['agentName'] = ['read_only' => False, "type" => "str(100)", "subtype" => "unset", "choices" => "unset", "null" => False, "pk" => False, "protected" => False, "private" => False, "alias" => "agentName", "public" => False]; - $dict['uid'] = ['read_only' => False, "type" => "str(100)", "subtype" => "unset", "choices" => "unset", "null" => False, "pk" => False, "protected" => False, "private" => False, "alias" => "uid", "public" => False]; - $dict['os'] = ['read_only' => False, "type" => "int", "subtype" => "unset", "choices" => "unset", "null" => False, "pk" => False, "protected" => False, "private" => False, "alias" => "os", "public" => False]; - $dict['devices'] = ['read_only' => False, "type" => "str(65535)", "subtype" => "unset", "choices" => "unset", "null" => False, "pk" => False, "protected" => False, "private" => False, "alias" => "devices", "public" => False]; - $dict['cmdPars'] = ['read_only' => False, "type" => "str(65535)", "subtype" => "unset", "choices" => "unset", "null" => False, "pk" => False, "protected" => False, "private" => False, "alias" => "cmdPars", "public" => False]; - $dict['ignoreErrors'] = ['read_only' => False, "type" => "int", "subtype" => "unset", "choices" => [0 => "Deactivate agent on error", 1 => "Keep agent running, but save errors", 2 => "Keep agent running and discard errors", ], "null" => False, "pk" => False, "protected" => False, "private" => False, "alias" => "ignoreErrors", "public" => False]; - $dict['isActive'] = ['read_only' => False, "type" => "bool", "subtype" => "unset", "choices" => "unset", "null" => False, "pk" => False, "protected" => False, "private" => False, "alias" => "isActive", "public" => False]; - $dict['isTrusted'] = ['read_only' => False, "type" => "bool", "subtype" => "unset", "choices" => "unset", "null" => False, "pk" => False, "protected" => False, "private" => False, "alias" => "isTrusted", "public" => False]; - $dict['token'] = ['read_only' => False, "type" => "str(30)", "subtype" => "unset", "choices" => "unset", "null" => False, "pk" => False, "protected" => False, "private" => False, "alias" => "token", "public" => False]; - $dict['lastAct'] = ['read_only' => True, "type" => "str(50)", "subtype" => "unset", "choices" => "unset", "null" => False, "pk" => False, "protected" => True, "private" => False, "alias" => "lastAct", "public" => False]; - $dict['lastTime'] = ['read_only' => True, "type" => "int64", "subtype" => "unset", "choices" => "unset", "null" => False, "pk" => False, "protected" => True, "private" => False, "alias" => "lastTime", "public" => False]; - $dict['lastIp'] = ['read_only' => True, "type" => "str(50)", "subtype" => "unset", "choices" => "unset", "null" => False, "pk" => False, "protected" => True, "private" => False, "alias" => "lastIp", "public" => False]; - $dict['userId'] = ['read_only' => False, "type" => "int", "subtype" => "unset", "choices" => "unset", "null" => True, "pk" => False, "protected" => False, "private" => False, "alias" => "userId", "public" => False]; - $dict['cpuOnly'] = ['read_only' => False, "type" => "bool", "subtype" => "unset", "choices" => "unset", "null" => False, "pk" => False, "protected" => False, "private" => False, "alias" => "cpuOnly", "public" => False]; - $dict['clientSignature'] = ['read_only' => False, "type" => "str(50)", "subtype" => "unset", "choices" => "unset", "null" => False, "pk" => False, "protected" => False, "private" => False, "alias" => "clientSignature", "public" => False]; + $dict['agentId'] = ['read_only' => True, "type" => "int", "subtype" => "unset", "choices" => "unset", "null" => False, "pk" => True, "protected" => True, "private" => False, "alias" => "agentId", "public" => False, "dba_mapping" => False]; + $dict['agentName'] = ['read_only' => False, "type" => "str(100)", "subtype" => "unset", "choices" => "unset", "null" => False, "pk" => False, "protected" => False, "private" => False, "alias" => "agentName", "public" => False, "dba_mapping" => False]; + $dict['uid'] = ['read_only' => False, "type" => "str(100)", "subtype" => "unset", "choices" => "unset", "null" => False, "pk" => False, "protected" => False, "private" => False, "alias" => "uid", "public" => False, "dba_mapping" => False]; + $dict['os'] = ['read_only' => False, "type" => "int", "subtype" => "unset", "choices" => "unset", "null" => False, "pk" => False, "protected" => False, "private" => False, "alias" => "os", "public" => False, "dba_mapping" => False]; + $dict['devices'] = ['read_only' => False, "type" => "str(65535)", "subtype" => "unset", "choices" => "unset", "null" => False, "pk" => False, "protected" => False, "private" => False, "alias" => "devices", "public" => False, "dba_mapping" => False]; + $dict['cmdPars'] = ['read_only' => False, "type" => "str(65535)", "subtype" => "unset", "choices" => "unset", "null" => False, "pk" => False, "protected" => False, "private" => False, "alias" => "cmdPars", "public" => False, "dba_mapping" => False]; + $dict['ignoreErrors'] = ['read_only' => False, "type" => "int", "subtype" => "unset", "choices" => [0 => "Deactivate agent on error", 1 => "Keep agent running, but save errors", 2 => "Keep agent running and discard errors", ], "null" => False, "pk" => False, "protected" => False, "private" => False, "alias" => "ignoreErrors", "public" => False, "dba_mapping" => False]; + $dict['isActive'] = ['read_only' => False, "type" => "bool", "subtype" => "unset", "choices" => "unset", "null" => False, "pk" => False, "protected" => False, "private" => False, "alias" => "isActive", "public" => False, "dba_mapping" => False]; + $dict['isTrusted'] = ['read_only' => False, "type" => "bool", "subtype" => "unset", "choices" => "unset", "null" => False, "pk" => False, "protected" => False, "private" => False, "alias" => "isTrusted", "public" => False, "dba_mapping" => False]; + $dict['token'] = ['read_only' => False, "type" => "str(30)", "subtype" => "unset", "choices" => "unset", "null" => False, "pk" => False, "protected" => False, "private" => False, "alias" => "token", "public" => False, "dba_mapping" => False]; + $dict['lastAct'] = ['read_only' => True, "type" => "str(50)", "subtype" => "unset", "choices" => "unset", "null" => False, "pk" => False, "protected" => True, "private" => False, "alias" => "lastAct", "public" => False, "dba_mapping" => False]; + $dict['lastTime'] = ['read_only' => True, "type" => "int64", "subtype" => "unset", "choices" => "unset", "null" => False, "pk" => False, "protected" => True, "private" => False, "alias" => "lastTime", "public" => False, "dba_mapping" => False]; + $dict['lastIp'] = ['read_only' => True, "type" => "str(50)", "subtype" => "unset", "choices" => "unset", "null" => False, "pk" => False, "protected" => True, "private" => False, "alias" => "lastIp", "public" => False, "dba_mapping" => False]; + $dict['userId'] = ['read_only' => False, "type" => "int", "subtype" => "unset", "choices" => "unset", "null" => True, "pk" => False, "protected" => False, "private" => False, "alias" => "userId", "public" => False, "dba_mapping" => False]; + $dict['cpuOnly'] = ['read_only' => False, "type" => "bool", "subtype" => "unset", "choices" => "unset", "null" => False, "pk" => False, "protected" => False, "private" => False, "alias" => "cpuOnly", "public" => False, "dba_mapping" => False]; + $dict['clientSignature'] = ['read_only' => False, "type" => "str(50)", "subtype" => "unset", "choices" => "unset", "null" => False, "pk" => False, "protected" => False, "private" => False, "alias" => "clientSignature", "public" => False, "dba_mapping" => False]; return $dict; } diff --git a/src/dba/models/AgentBinary.class.php b/src/dba/models/AgentBinary.class.php index d866ae9f5..78567d295 100644 --- a/src/dba/models/AgentBinary.class.php +++ b/src/dba/models/AgentBinary.class.php @@ -36,13 +36,13 @@ function getKeyValueDict(): array { static function getFeatures(): array { $dict = array(); - $dict['agentBinaryId'] = ['read_only' => True, "type" => "int", "subtype" => "unset", "choices" => "unset", "null" => False, "pk" => True, "protected" => True, "private" => False, "alias" => "agentBinaryId", "public" => False]; - $dict['binaryType'] = ['read_only' => False, "type" => "str(20)", "subtype" => "unset", "choices" => "unset", "null" => False, "pk" => False, "protected" => False, "private" => False, "alias" => "binaryType", "public" => False]; - $dict['version'] = ['read_only' => False, "type" => "str(20)", "subtype" => "unset", "choices" => "unset", "null" => False, "pk" => False, "protected" => False, "private" => False, "alias" => "version", "public" => False]; - $dict['operatingSystems'] = ['read_only' => False, "type" => "str(50)", "subtype" => "unset", "choices" => "unset", "null" => False, "pk" => False, "protected" => False, "private" => False, "alias" => "operatingSystems", "public" => False]; - $dict['filename'] = ['read_only' => False, "type" => "str(50)", "subtype" => "unset", "choices" => "unset", "null" => False, "pk" => False, "protected" => False, "private" => False, "alias" => "filename", "public" => False]; - $dict['updateTrack'] = ['read_only' => False, "type" => "str(20)", "subtype" => "unset", "choices" => "unset", "null" => False, "pk" => False, "protected" => False, "private" => False, "alias" => "updateTrack", "public" => False]; - $dict['updateAvailable'] = ['read_only' => True, "type" => "str(20)", "subtype" => "unset", "choices" => "unset", "null" => False, "pk" => False, "protected" => True, "private" => False, "alias" => "updateAvailable", "public" => False]; + $dict['agentBinaryId'] = ['read_only' => True, "type" => "int", "subtype" => "unset", "choices" => "unset", "null" => False, "pk" => True, "protected" => True, "private" => False, "alias" => "agentBinaryId", "public" => False, "dba_mapping" => False]; + $dict['binaryType'] = ['read_only' => False, "type" => "str(20)", "subtype" => "unset", "choices" => "unset", "null" => False, "pk" => False, "protected" => False, "private" => False, "alias" => "binaryType", "public" => False, "dba_mapping" => False]; + $dict['version'] = ['read_only' => False, "type" => "str(20)", "subtype" => "unset", "choices" => "unset", "null" => False, "pk" => False, "protected" => False, "private" => False, "alias" => "version", "public" => False, "dba_mapping" => False]; + $dict['operatingSystems'] = ['read_only' => False, "type" => "str(50)", "subtype" => "unset", "choices" => "unset", "null" => False, "pk" => False, "protected" => False, "private" => False, "alias" => "operatingSystems", "public" => False, "dba_mapping" => False]; + $dict['filename'] = ['read_only' => False, "type" => "str(50)", "subtype" => "unset", "choices" => "unset", "null" => False, "pk" => False, "protected" => False, "private" => False, "alias" => "filename", "public" => False, "dba_mapping" => False]; + $dict['updateTrack'] = ['read_only' => False, "type" => "str(20)", "subtype" => "unset", "choices" => "unset", "null" => False, "pk" => False, "protected" => False, "private" => False, "alias" => "updateTrack", "public" => False, "dba_mapping" => False]; + $dict['updateAvailable'] = ['read_only' => True, "type" => "str(20)", "subtype" => "unset", "choices" => "unset", "null" => False, "pk" => False, "protected" => True, "private" => False, "alias" => "updateAvailable", "public" => False, "dba_mapping" => False]; return $dict; } diff --git a/src/dba/models/AgentBinaryFactory.class.php b/src/dba/models/AgentBinaryFactory.class.php index 7ef11d666..8b939ff2c 100644 --- a/src/dba/models/AgentBinaryFactory.class.php +++ b/src/dba/models/AgentBinaryFactory.class.php @@ -10,6 +10,10 @@ function getModelName(): string { function getModelTable(): string { return "AgentBinary"; } + + function isMapping(): bool { + return False; + } function isCachable(): bool { return false; @@ -40,7 +44,7 @@ function createObjectFromDict($pk, $dict): AgentBinary { * @param bool $single * @return AgentBinary|AgentBinary[] */ - function filter($options, $single = false) { + function filter(array $options, bool $single = false) { $join = false; if (array_key_exists('join', $options)) { $join = true; diff --git a/src/dba/models/AgentError.class.php b/src/dba/models/AgentError.class.php index 8099db80f..3bb0daa21 100644 --- a/src/dba/models/AgentError.class.php +++ b/src/dba/models/AgentError.class.php @@ -33,12 +33,12 @@ function getKeyValueDict(): array { static function getFeatures(): array { $dict = array(); - $dict['agentErrorId'] = ['read_only' => True, "type" => "int", "subtype" => "unset", "choices" => "unset", "null" => False, "pk" => True, "protected" => True, "private" => False, "alias" => "agentErrorId", "public" => False]; - $dict['agentId'] = ['read_only' => True, "type" => "int", "subtype" => "unset", "choices" => "unset", "null" => False, "pk" => False, "protected" => True, "private" => False, "alias" => "agentId", "public" => False]; - $dict['taskId'] = ['read_only' => True, "type" => "int", "subtype" => "unset", "choices" => "unset", "null" => False, "pk" => False, "protected" => True, "private" => False, "alias" => "taskId", "public" => False]; - $dict['chunkId'] = ['read_only' => True, "type" => "int", "subtype" => "unset", "choices" => "unset", "null" => False, "pk" => False, "protected" => True, "private" => False, "alias" => "chunkId", "public" => False]; - $dict['time'] = ['read_only' => True, "type" => "int64", "subtype" => "unset", "choices" => "unset", "null" => False, "pk" => False, "protected" => True, "private" => False, "alias" => "time", "public" => False]; - $dict['error'] = ['read_only' => True, "type" => "str(65535)", "subtype" => "unset", "choices" => "unset", "null" => False, "pk" => False, "protected" => True, "private" => False, "alias" => "error", "public" => False]; + $dict['agentErrorId'] = ['read_only' => True, "type" => "int", "subtype" => "unset", "choices" => "unset", "null" => False, "pk" => True, "protected" => True, "private" => False, "alias" => "agentErrorId", "public" => False, "dba_mapping" => False]; + $dict['agentId'] = ['read_only' => True, "type" => "int", "subtype" => "unset", "choices" => "unset", "null" => False, "pk" => False, "protected" => True, "private" => False, "alias" => "agentId", "public" => False, "dba_mapping" => False]; + $dict['taskId'] = ['read_only' => True, "type" => "int", "subtype" => "unset", "choices" => "unset", "null" => False, "pk" => False, "protected" => True, "private" => False, "alias" => "taskId", "public" => False, "dba_mapping" => False]; + $dict['chunkId'] = ['read_only' => True, "type" => "int", "subtype" => "unset", "choices" => "unset", "null" => False, "pk" => False, "protected" => True, "private" => False, "alias" => "chunkId", "public" => False, "dba_mapping" => False]; + $dict['time'] = ['read_only' => True, "type" => "int64", "subtype" => "unset", "choices" => "unset", "null" => False, "pk" => False, "protected" => True, "private" => False, "alias" => "time", "public" => False, "dba_mapping" => False]; + $dict['error'] = ['read_only' => True, "type" => "str(65535)", "subtype" => "unset", "choices" => "unset", "null" => False, "pk" => False, "protected" => True, "private" => False, "alias" => "error", "public" => False, "dba_mapping" => False]; return $dict; } diff --git a/src/dba/models/AgentErrorFactory.class.php b/src/dba/models/AgentErrorFactory.class.php index f4dae014e..87dcd275d 100644 --- a/src/dba/models/AgentErrorFactory.class.php +++ b/src/dba/models/AgentErrorFactory.class.php @@ -10,6 +10,10 @@ function getModelName(): string { function getModelTable(): string { return "AgentError"; } + + function isMapping(): bool { + return False; + } function isCachable(): bool { return false; @@ -40,7 +44,7 @@ function createObjectFromDict($pk, $dict): AgentError { * @param bool $single * @return AgentError|AgentError[] */ - function filter($options, $single = false) { + function filter(array $options, bool $single = false) { $join = false; if (array_key_exists('join', $options)) { $join = true; diff --git a/src/dba/models/AgentFactory.class.php b/src/dba/models/AgentFactory.class.php index 1b9dbbea6..80cc0de40 100644 --- a/src/dba/models/AgentFactory.class.php +++ b/src/dba/models/AgentFactory.class.php @@ -10,6 +10,10 @@ function getModelName(): string { function getModelTable(): string { return "Agent"; } + + function isMapping(): bool { + return False; + } function isCachable(): bool { return false; @@ -40,7 +44,7 @@ function createObjectFromDict($pk, $dict): Agent { * @param bool $single * @return Agent|Agent[] */ - function filter($options, $single = false) { + function filter(array $options, bool $single = false) { $join = false; if (array_key_exists('join', $options)) { $join = true; diff --git a/src/dba/models/AgentStat.class.php b/src/dba/models/AgentStat.class.php index 705650b2f..6255810aa 100644 --- a/src/dba/models/AgentStat.class.php +++ b/src/dba/models/AgentStat.class.php @@ -30,11 +30,11 @@ function getKeyValueDict(): array { static function getFeatures(): array { $dict = array(); - $dict['agentStatId'] = ['read_only' => True, "type" => "int", "subtype" => "unset", "choices" => "unset", "null" => False, "pk" => True, "protected" => True, "private" => False, "alias" => "agentStatId", "public" => False]; - $dict['agentId'] = ['read_only' => True, "type" => "int", "subtype" => "unset", "choices" => "unset", "null" => False, "pk" => False, "protected" => True, "private" => False, "alias" => "agentId", "public" => False]; - $dict['statType'] = ['read_only' => True, "type" => "int", "subtype" => "unset", "choices" => "unset", "null" => False, "pk" => False, "protected" => True, "private" => False, "alias" => "statType", "public" => False]; - $dict['time'] = ['read_only' => True, "type" => "int64", "subtype" => "unset", "choices" => "unset", "null" => False, "pk" => False, "protected" => True, "private" => False, "alias" => "time", "public" => False]; - $dict['value'] = ['read_only' => True, "type" => "array", "subtype" => "int", "choices" => "unset", "null" => False, "pk" => False, "protected" => True, "private" => False, "alias" => "value", "public" => False]; + $dict['agentStatId'] = ['read_only' => True, "type" => "int", "subtype" => "unset", "choices" => "unset", "null" => False, "pk" => True, "protected" => True, "private" => False, "alias" => "agentStatId", "public" => False, "dba_mapping" => False]; + $dict['agentId'] = ['read_only' => True, "type" => "int", "subtype" => "unset", "choices" => "unset", "null" => False, "pk" => False, "protected" => True, "private" => False, "alias" => "agentId", "public" => False, "dba_mapping" => False]; + $dict['statType'] = ['read_only' => True, "type" => "int", "subtype" => "unset", "choices" => "unset", "null" => False, "pk" => False, "protected" => True, "private" => False, "alias" => "statType", "public" => False, "dba_mapping" => False]; + $dict['time'] = ['read_only' => True, "type" => "int64", "subtype" => "unset", "choices" => "unset", "null" => False, "pk" => False, "protected" => True, "private" => False, "alias" => "time", "public" => False, "dba_mapping" => False]; + $dict['value'] = ['read_only' => True, "type" => "array", "subtype" => "int", "choices" => "unset", "null" => False, "pk" => False, "protected" => True, "private" => False, "alias" => "value", "public" => False, "dba_mapping" => False]; return $dict; } diff --git a/src/dba/models/AgentStatFactory.class.php b/src/dba/models/AgentStatFactory.class.php index d1feb1a4f..bef329273 100644 --- a/src/dba/models/AgentStatFactory.class.php +++ b/src/dba/models/AgentStatFactory.class.php @@ -10,6 +10,10 @@ function getModelName(): string { function getModelTable(): string { return "AgentStat"; } + + function isMapping(): bool { + return False; + } function isCachable(): bool { return false; @@ -40,7 +44,7 @@ function createObjectFromDict($pk, $dict): AgentStat { * @param bool $single * @return AgentStat|AgentStat[] */ - function filter($options, $single = false) { + function filter(array $options, bool $single = false) { $join = false; if (array_key_exists('join', $options)) { $join = true; diff --git a/src/dba/models/AgentZap.class.php b/src/dba/models/AgentZap.class.php index aab1dbd4e..8c8ac9a6f 100644 --- a/src/dba/models/AgentZap.class.php +++ b/src/dba/models/AgentZap.class.php @@ -24,9 +24,9 @@ function getKeyValueDict(): array { static function getFeatures(): array { $dict = array(); - $dict['agentZapId'] = ['read_only' => True, "type" => "int", "subtype" => "unset", "choices" => "unset", "null" => False, "pk" => True, "protected" => True, "private" => False, "alias" => "agentZapId", "public" => False]; - $dict['agentId'] = ['read_only' => True, "type" => "int", "subtype" => "unset", "choices" => "unset", "null" => False, "pk" => False, "protected" => True, "private" => False, "alias" => "agentId", "public" => False]; - $dict['lastZapId'] = ['read_only' => True, "type" => "str(128)", "subtype" => "unset", "choices" => "unset", "null" => False, "pk" => False, "protected" => True, "private" => False, "alias" => "lastZapId", "public" => False]; + $dict['agentZapId'] = ['read_only' => True, "type" => "int", "subtype" => "unset", "choices" => "unset", "null" => False, "pk" => True, "protected" => True, "private" => False, "alias" => "agentZapId", "public" => False, "dba_mapping" => False]; + $dict['agentId'] = ['read_only' => True, "type" => "int", "subtype" => "unset", "choices" => "unset", "null" => False, "pk" => False, "protected" => True, "private" => False, "alias" => "agentId", "public" => False, "dba_mapping" => False]; + $dict['lastZapId'] = ['read_only' => True, "type" => "str(128)", "subtype" => "unset", "choices" => "unset", "null" => False, "pk" => False, "protected" => True, "private" => False, "alias" => "lastZapId", "public" => False, "dba_mapping" => False]; return $dict; } diff --git a/src/dba/models/AgentZapFactory.class.php b/src/dba/models/AgentZapFactory.class.php index 247d34443..5ec939e7b 100644 --- a/src/dba/models/AgentZapFactory.class.php +++ b/src/dba/models/AgentZapFactory.class.php @@ -10,6 +10,10 @@ function getModelName(): string { function getModelTable(): string { return "AgentZap"; } + + function isMapping(): bool { + return False; + } function isCachable(): bool { return false; @@ -40,7 +44,7 @@ function createObjectFromDict($pk, $dict): AgentZap { * @param bool $single * @return AgentZap|AgentZap[] */ - function filter($options, $single = false) { + function filter(array $options, bool $single = false) { $join = false; if (array_key_exists('join', $options)) { $join = true; diff --git a/src/dba/models/ApiGroup.class.php b/src/dba/models/ApiGroup.class.php index 846f568db..445a042eb 100644 --- a/src/dba/models/ApiGroup.class.php +++ b/src/dba/models/ApiGroup.class.php @@ -24,9 +24,9 @@ function getKeyValueDict(): array { static function getFeatures(): array { $dict = array(); - $dict['apiGroupId'] = ['read_only' => True, "type" => "int", "subtype" => "unset", "choices" => "unset", "null" => False, "pk" => True, "protected" => True, "private" => False, "alias" => "apiGroupId", "public" => False]; - $dict['permissions'] = ['read_only' => False, "type" => "str(65535)", "subtype" => "unset", "choices" => "unset", "null" => False, "pk" => False, "protected" => False, "private" => False, "alias" => "permissions", "public" => False]; - $dict['name'] = ['read_only' => False, "type" => "str(100)", "subtype" => "unset", "choices" => "unset", "null" => False, "pk" => False, "protected" => False, "private" => False, "alias" => "name", "public" => False]; + $dict['apiGroupId'] = ['read_only' => True, "type" => "int", "subtype" => "unset", "choices" => "unset", "null" => False, "pk" => True, "protected" => True, "private" => False, "alias" => "apiGroupId", "public" => False, "dba_mapping" => False]; + $dict['permissions'] = ['read_only' => False, "type" => "str(65535)", "subtype" => "unset", "choices" => "unset", "null" => False, "pk" => False, "protected" => False, "private" => False, "alias" => "permissions", "public" => False, "dba_mapping" => False]; + $dict['name'] = ['read_only' => False, "type" => "str(100)", "subtype" => "unset", "choices" => "unset", "null" => False, "pk" => False, "protected" => False, "private" => False, "alias" => "name", "public" => False, "dba_mapping" => False]; return $dict; } diff --git a/src/dba/models/ApiGroupFactory.class.php b/src/dba/models/ApiGroupFactory.class.php index 6df0e8112..c1c1b6574 100644 --- a/src/dba/models/ApiGroupFactory.class.php +++ b/src/dba/models/ApiGroupFactory.class.php @@ -10,6 +10,10 @@ function getModelName(): string { function getModelTable(): string { return "ApiGroup"; } + + function isMapping(): bool { + return False; + } function isCachable(): bool { return false; @@ -40,7 +44,7 @@ function createObjectFromDict($pk, $dict): ApiGroup { * @param bool $single * @return ApiGroup|ApiGroup[] */ - function filter($options, $single = false) { + function filter(array $options, bool $single = false) { $join = false; if (array_key_exists('join', $options)) { $join = true; diff --git a/src/dba/models/ApiKey.class.php b/src/dba/models/ApiKey.class.php index 54def9e85..f4db23497 100644 --- a/src/dba/models/ApiKey.class.php +++ b/src/dba/models/ApiKey.class.php @@ -36,13 +36,13 @@ function getKeyValueDict(): array { static function getFeatures(): array { $dict = array(); - $dict['apiKeyId'] = ['read_only' => True, "type" => "int", "subtype" => "unset", "choices" => "unset", "null" => False, "pk" => True, "protected" => True, "private" => False, "alias" => "apiKeyId", "public" => False]; - $dict['startValid'] = ['read_only' => False, "type" => "int64", "subtype" => "unset", "choices" => "unset", "null" => False, "pk" => False, "protected" => False, "private" => False, "alias" => "startValid", "public" => False]; - $dict['endValid'] = ['read_only' => False, "type" => "int64", "subtype" => "unset", "choices" => "unset", "null" => False, "pk" => False, "protected" => False, "private" => False, "alias" => "endValid", "public" => False]; - $dict['accessKey'] = ['read_only' => True, "type" => "str(256)", "subtype" => "unset", "choices" => "unset", "null" => False, "pk" => False, "protected" => True, "private" => False, "alias" => "accessKey", "public" => False]; - $dict['accessCount'] = ['read_only' => True, "type" => "int", "subtype" => "unset", "choices" => "unset", "null" => False, "pk" => False, "protected" => True, "private" => False, "alias" => "accessCount", "public" => False]; - $dict['userId'] = ['read_only' => False, "type" => "int", "subtype" => "unset", "choices" => "unset", "null" => False, "pk" => False, "protected" => False, "private" => False, "alias" => "userId", "public" => False]; - $dict['apiGroupId'] = ['read_only' => False, "type" => "int", "subtype" => "unset", "choices" => "unset", "null" => False, "pk" => False, "protected" => False, "private" => False, "alias" => "apiGroupId", "public" => False]; + $dict['apiKeyId'] = ['read_only' => True, "type" => "int", "subtype" => "unset", "choices" => "unset", "null" => False, "pk" => True, "protected" => True, "private" => False, "alias" => "apiKeyId", "public" => False, "dba_mapping" => False]; + $dict['startValid'] = ['read_only' => False, "type" => "int64", "subtype" => "unset", "choices" => "unset", "null" => False, "pk" => False, "protected" => False, "private" => False, "alias" => "startValid", "public" => False, "dba_mapping" => False]; + $dict['endValid'] = ['read_only' => False, "type" => "int64", "subtype" => "unset", "choices" => "unset", "null" => False, "pk" => False, "protected" => False, "private" => False, "alias" => "endValid", "public" => False, "dba_mapping" => False]; + $dict['accessKey'] = ['read_only' => True, "type" => "str(256)", "subtype" => "unset", "choices" => "unset", "null" => False, "pk" => False, "protected" => True, "private" => False, "alias" => "accessKey", "public" => False, "dba_mapping" => False]; + $dict['accessCount'] = ['read_only' => True, "type" => "int", "subtype" => "unset", "choices" => "unset", "null" => False, "pk" => False, "protected" => True, "private" => False, "alias" => "accessCount", "public" => False, "dba_mapping" => False]; + $dict['userId'] = ['read_only' => False, "type" => "int", "subtype" => "unset", "choices" => "unset", "null" => False, "pk" => False, "protected" => False, "private" => False, "alias" => "userId", "public" => False, "dba_mapping" => False]; + $dict['apiGroupId'] = ['read_only' => False, "type" => "int", "subtype" => "unset", "choices" => "unset", "null" => False, "pk" => False, "protected" => False, "private" => False, "alias" => "apiGroupId", "public" => False, "dba_mapping" => False]; return $dict; } diff --git a/src/dba/models/ApiKeyFactory.class.php b/src/dba/models/ApiKeyFactory.class.php index 2a376aba0..a71ec81b7 100644 --- a/src/dba/models/ApiKeyFactory.class.php +++ b/src/dba/models/ApiKeyFactory.class.php @@ -10,6 +10,10 @@ function getModelName(): string { function getModelTable(): string { return "ApiKey"; } + + function isMapping(): bool { + return False; + } function isCachable(): bool { return false; @@ -40,7 +44,7 @@ function createObjectFromDict($pk, $dict): ApiKey { * @param bool $single * @return ApiKey|ApiKey[] */ - function filter($options, $single = false) { + function filter(array $options, bool $single = false) { $join = false; if (array_key_exists('join', $options)) { $join = true; diff --git a/src/dba/models/Assignment.class.php b/src/dba/models/Assignment.class.php index 77e871e40..3c4d76c4a 100644 --- a/src/dba/models/Assignment.class.php +++ b/src/dba/models/Assignment.class.php @@ -27,10 +27,10 @@ function getKeyValueDict(): array { static function getFeatures(): array { $dict = array(); - $dict['assignmentId'] = ['read_only' => True, "type" => "int", "subtype" => "unset", "choices" => "unset", "null" => False, "pk" => True, "protected" => True, "private" => False, "alias" => "assignmentId", "public" => False]; - $dict['taskId'] = ['read_only' => True, "type" => "int", "subtype" => "unset", "choices" => "unset", "null" => False, "pk" => False, "protected" => False, "private" => False, "alias" => "taskId", "public" => False]; - $dict['agentId'] = ['read_only' => True, "type" => "int", "subtype" => "unset", "choices" => "unset", "null" => False, "pk" => False, "protected" => False, "private" => False, "alias" => "agentId", "public" => False]; - $dict['benchmark'] = ['read_only' => False, "type" => "str(50)", "subtype" => "unset", "choices" => "unset", "null" => True, "pk" => False, "protected" => False, "private" => False, "alias" => "benchmark", "public" => False]; + $dict['assignmentId'] = ['read_only' => True, "type" => "int", "subtype" => "unset", "choices" => "unset", "null" => False, "pk" => True, "protected" => True, "private" => False, "alias" => "assignmentId", "public" => False, "dba_mapping" => False]; + $dict['taskId'] = ['read_only' => True, "type" => "int", "subtype" => "unset", "choices" => "unset", "null" => False, "pk" => False, "protected" => False, "private" => False, "alias" => "taskId", "public" => False, "dba_mapping" => False]; + $dict['agentId'] = ['read_only' => True, "type" => "int", "subtype" => "unset", "choices" => "unset", "null" => False, "pk" => False, "protected" => False, "private" => False, "alias" => "agentId", "public" => False, "dba_mapping" => False]; + $dict['benchmark'] = ['read_only' => False, "type" => "str(50)", "subtype" => "unset", "choices" => "unset", "null" => True, "pk" => False, "protected" => False, "private" => False, "alias" => "benchmark", "public" => False, "dba_mapping" => False]; return $dict; } diff --git a/src/dba/models/AssignmentFactory.class.php b/src/dba/models/AssignmentFactory.class.php index 94e944a03..438f7bfdf 100644 --- a/src/dba/models/AssignmentFactory.class.php +++ b/src/dba/models/AssignmentFactory.class.php @@ -10,6 +10,10 @@ function getModelName(): string { function getModelTable(): string { return "Assignment"; } + + function isMapping(): bool { + return False; + } function isCachable(): bool { return false; @@ -40,7 +44,7 @@ function createObjectFromDict($pk, $dict): Assignment { * @param bool $single * @return Assignment|Assignment[] */ - function filter($options, $single = false) { + function filter(array $options, bool $single = false) { $join = false; if (array_key_exists('join', $options)) { $join = true; diff --git a/src/dba/models/Chunk.class.php b/src/dba/models/Chunk.class.php index c85487d5d..b4066dd35 100644 --- a/src/dba/models/Chunk.class.php +++ b/src/dba/models/Chunk.class.php @@ -51,18 +51,18 @@ function getKeyValueDict(): array { static function getFeatures(): array { $dict = array(); - $dict['chunkId'] = ['read_only' => True, "type" => "int", "subtype" => "unset", "choices" => "unset", "null" => False, "pk" => True, "protected" => True, "private" => False, "alias" => "chunkId", "public" => False]; - $dict['taskId'] = ['read_only' => True, "type" => "int", "subtype" => "unset", "choices" => "unset", "null" => False, "pk" => False, "protected" => True, "private" => False, "alias" => "taskId", "public" => False]; - $dict['skip'] = ['read_only' => True, "type" => "uint64", "subtype" => "unset", "choices" => "unset", "null" => False, "pk" => False, "protected" => True, "private" => False, "alias" => "skip", "public" => False]; - $dict['length'] = ['read_only' => True, "type" => "uint64", "subtype" => "unset", "choices" => "unset", "null" => False, "pk" => False, "protected" => True, "private" => False, "alias" => "length", "public" => False]; - $dict['agentId'] = ['read_only' => True, "type" => "int", "subtype" => "unset", "choices" => "unset", "null" => False, "pk" => False, "protected" => True, "private" => False, "alias" => "agentId", "public" => False]; - $dict['dispatchTime'] = ['read_only' => True, "type" => "int64", "subtype" => "unset", "choices" => "unset", "null" => False, "pk" => False, "protected" => True, "private" => False, "alias" => "dispatchTime", "public" => False]; - $dict['solveTime'] = ['read_only' => True, "type" => "int64", "subtype" => "unset", "choices" => "unset", "null" => False, "pk" => False, "protected" => True, "private" => False, "alias" => "solveTime", "public" => False]; - $dict['checkpoint'] = ['read_only' => True, "type" => "int64", "subtype" => "unset", "choices" => "unset", "null" => False, "pk" => False, "protected" => True, "private" => False, "alias" => "checkpoint", "public" => False]; - $dict['progress'] = ['read_only' => True, "type" => "int", "subtype" => "unset", "choices" => "unset", "null" => False, "pk" => False, "protected" => True, "private" => False, "alias" => "progress", "public" => False]; - $dict['state'] = ['read_only' => True, "type" => "int", "subtype" => "unset", "choices" => "unset", "null" => False, "pk" => False, "protected" => True, "private" => False, "alias" => "state", "public" => False]; - $dict['cracked'] = ['read_only' => True, "type" => "int", "subtype" => "unset", "choices" => "unset", "null" => False, "pk" => False, "protected" => True, "private" => False, "alias" => "cracked", "public" => False]; - $dict['speed'] = ['read_only' => True, "type" => "int64", "subtype" => "unset", "choices" => "unset", "null" => False, "pk" => False, "protected" => True, "private" => False, "alias" => "speed", "public" => False]; + $dict['chunkId'] = ['read_only' => True, "type" => "int", "subtype" => "unset", "choices" => "unset", "null" => False, "pk" => True, "protected" => True, "private" => False, "alias" => "chunkId", "public" => False, "dba_mapping" => False]; + $dict['taskId'] = ['read_only' => True, "type" => "int", "subtype" => "unset", "choices" => "unset", "null" => False, "pk" => False, "protected" => True, "private" => False, "alias" => "taskId", "public" => False, "dba_mapping" => False]; + $dict['skip'] = ['read_only' => True, "type" => "uint64", "subtype" => "unset", "choices" => "unset", "null" => False, "pk" => False, "protected" => True, "private" => False, "alias" => "skip", "public" => False, "dba_mapping" => False]; + $dict['length'] = ['read_only' => True, "type" => "uint64", "subtype" => "unset", "choices" => "unset", "null" => False, "pk" => False, "protected" => True, "private" => False, "alias" => "length", "public" => False, "dba_mapping" => False]; + $dict['agentId'] = ['read_only' => True, "type" => "int", "subtype" => "unset", "choices" => "unset", "null" => False, "pk" => False, "protected" => True, "private" => False, "alias" => "agentId", "public" => False, "dba_mapping" => False]; + $dict['dispatchTime'] = ['read_only' => True, "type" => "int64", "subtype" => "unset", "choices" => "unset", "null" => False, "pk" => False, "protected" => True, "private" => False, "alias" => "dispatchTime", "public" => False, "dba_mapping" => False]; + $dict['solveTime'] = ['read_only' => True, "type" => "int64", "subtype" => "unset", "choices" => "unset", "null" => False, "pk" => False, "protected" => True, "private" => False, "alias" => "solveTime", "public" => False, "dba_mapping" => False]; + $dict['checkpoint'] = ['read_only' => True, "type" => "int64", "subtype" => "unset", "choices" => "unset", "null" => False, "pk" => False, "protected" => True, "private" => False, "alias" => "checkpoint", "public" => False, "dba_mapping" => False]; + $dict['progress'] = ['read_only' => True, "type" => "int", "subtype" => "unset", "choices" => "unset", "null" => False, "pk" => False, "protected" => True, "private" => False, "alias" => "progress", "public" => False, "dba_mapping" => False]; + $dict['state'] = ['read_only' => True, "type" => "int", "subtype" => "unset", "choices" => "unset", "null" => False, "pk" => False, "protected" => True, "private" => False, "alias" => "state", "public" => False, "dba_mapping" => False]; + $dict['cracked'] = ['read_only' => True, "type" => "int", "subtype" => "unset", "choices" => "unset", "null" => False, "pk" => False, "protected" => True, "private" => False, "alias" => "cracked", "public" => False, "dba_mapping" => False]; + $dict['speed'] = ['read_only' => True, "type" => "int64", "subtype" => "unset", "choices" => "unset", "null" => False, "pk" => False, "protected" => True, "private" => False, "alias" => "speed", "public" => False, "dba_mapping" => False]; return $dict; } diff --git a/src/dba/models/ChunkFactory.class.php b/src/dba/models/ChunkFactory.class.php index 32fd633c5..4802503d8 100644 --- a/src/dba/models/ChunkFactory.class.php +++ b/src/dba/models/ChunkFactory.class.php @@ -10,6 +10,10 @@ function getModelName(): string { function getModelTable(): string { return "Chunk"; } + + function isMapping(): bool { + return False; + } function isCachable(): bool { return false; @@ -40,7 +44,7 @@ function createObjectFromDict($pk, $dict): Chunk { * @param bool $single * @return Chunk|Chunk[] */ - function filter($options, $single = false) { + function filter(array $options, bool $single = false) { $join = false; if (array_key_exists('join', $options)) { $join = true; diff --git a/src/dba/models/Config.class.php b/src/dba/models/Config.class.php index 733711fb2..dc63e14ae 100644 --- a/src/dba/models/Config.class.php +++ b/src/dba/models/Config.class.php @@ -27,10 +27,10 @@ function getKeyValueDict(): array { static function getFeatures(): array { $dict = array(); - $dict['configId'] = ['read_only' => True, "type" => "int", "subtype" => "unset", "choices" => "unset", "null" => False, "pk" => True, "protected" => True, "private" => False, "alias" => "configId", "public" => False]; - $dict['configSectionId'] = ['read_only' => True, "type" => "int", "subtype" => "unset", "choices" => "unset", "null" => False, "pk" => False, "protected" => False, "private" => False, "alias" => "configSectionId", "public" => False]; - $dict['item'] = ['read_only' => False, "type" => "str(128)", "subtype" => "unset", "choices" => "unset", "null" => False, "pk" => False, "protected" => False, "private" => False, "alias" => "item", "public" => False]; - $dict['value'] = ['read_only' => False, "type" => "str(65535)", "subtype" => "unset", "choices" => "unset", "null" => False, "pk" => False, "protected" => False, "private" => False, "alias" => "value", "public" => False]; + $dict['configId'] = ['read_only' => True, "type" => "int", "subtype" => "unset", "choices" => "unset", "null" => False, "pk" => True, "protected" => True, "private" => False, "alias" => "configId", "public" => False, "dba_mapping" => False]; + $dict['configSectionId'] = ['read_only' => True, "type" => "int", "subtype" => "unset", "choices" => "unset", "null" => False, "pk" => False, "protected" => False, "private" => False, "alias" => "configSectionId", "public" => False, "dba_mapping" => False]; + $dict['item'] = ['read_only' => False, "type" => "str(128)", "subtype" => "unset", "choices" => "unset", "null" => False, "pk" => False, "protected" => False, "private" => False, "alias" => "item", "public" => False, "dba_mapping" => False]; + $dict['value'] = ['read_only' => False, "type" => "str(65535)", "subtype" => "unset", "choices" => "unset", "null" => False, "pk" => False, "protected" => False, "private" => False, "alias" => "value", "public" => False, "dba_mapping" => False]; return $dict; } diff --git a/src/dba/models/ConfigFactory.class.php b/src/dba/models/ConfigFactory.class.php index 0c761ffb5..448d9e08f 100644 --- a/src/dba/models/ConfigFactory.class.php +++ b/src/dba/models/ConfigFactory.class.php @@ -10,6 +10,10 @@ function getModelName(): string { function getModelTable(): string { return "Config"; } + + function isMapping(): bool { + return False; + } function isCachable(): bool { return false; @@ -40,7 +44,7 @@ function createObjectFromDict($pk, $dict): Config { * @param bool $single * @return Config|Config[] */ - function filter($options, $single = false) { + function filter(array $options, bool $single = false) { $join = false; if (array_key_exists('join', $options)) { $join = true; diff --git a/src/dba/models/ConfigSection.class.php b/src/dba/models/ConfigSection.class.php index 558108c23..5d67e2ea7 100644 --- a/src/dba/models/ConfigSection.class.php +++ b/src/dba/models/ConfigSection.class.php @@ -21,8 +21,8 @@ function getKeyValueDict(): array { static function getFeatures(): array { $dict = array(); - $dict['configSectionId'] = ['read_only' => True, "type" => "int", "subtype" => "unset", "choices" => "unset", "null" => False, "pk" => True, "protected" => True, "private" => False, "alias" => "configSectionId", "public" => False]; - $dict['sectionName'] = ['read_only' => False, "type" => "str(100)", "subtype" => "unset", "choices" => "unset", "null" => False, "pk" => False, "protected" => False, "private" => False, "alias" => "sectionName", "public" => False]; + $dict['configSectionId'] = ['read_only' => True, "type" => "int", "subtype" => "unset", "choices" => "unset", "null" => False, "pk" => True, "protected" => True, "private" => False, "alias" => "configSectionId", "public" => False, "dba_mapping" => False]; + $dict['sectionName'] = ['read_only' => False, "type" => "str(100)", "subtype" => "unset", "choices" => "unset", "null" => False, "pk" => False, "protected" => False, "private" => False, "alias" => "sectionName", "public" => False, "dba_mapping" => False]; return $dict; } diff --git a/src/dba/models/ConfigSectionFactory.class.php b/src/dba/models/ConfigSectionFactory.class.php index a56eaee08..07a977032 100644 --- a/src/dba/models/ConfigSectionFactory.class.php +++ b/src/dba/models/ConfigSectionFactory.class.php @@ -10,6 +10,10 @@ function getModelName(): string { function getModelTable(): string { return "ConfigSection"; } + + function isMapping(): bool { + return False; + } function isCachable(): bool { return false; @@ -40,7 +44,7 @@ function createObjectFromDict($pk, $dict): ConfigSection { * @param bool $single * @return ConfigSection|ConfigSection[] */ - function filter($options, $single = false) { + function filter(array $options, bool $single = false) { $join = false; if (array_key_exists('join', $options)) { $join = true; diff --git a/src/dba/models/CrackerBinary.class.php b/src/dba/models/CrackerBinary.class.php index a2bc40bc8..202ca96f7 100644 --- a/src/dba/models/CrackerBinary.class.php +++ b/src/dba/models/CrackerBinary.class.php @@ -30,11 +30,11 @@ function getKeyValueDict(): array { static function getFeatures(): array { $dict = array(); - $dict['crackerBinaryId'] = ['read_only' => True, "type" => "int", "subtype" => "unset", "choices" => "unset", "null" => False, "pk" => True, "protected" => True, "private" => False, "alias" => "crackerBinaryId", "public" => False]; - $dict['crackerBinaryTypeId'] = ['read_only' => True, "type" => "int", "subtype" => "unset", "choices" => "unset", "null" => False, "pk" => False, "protected" => False, "private" => False, "alias" => "crackerBinaryTypeId", "public" => False]; - $dict['version'] = ['read_only' => False, "type" => "str(20)", "subtype" => "unset", "choices" => "unset", "null" => False, "pk" => False, "protected" => False, "private" => False, "alias" => "version", "public" => False]; - $dict['downloadUrl'] = ['read_only' => False, "type" => "str(150)", "subtype" => "unset", "choices" => "unset", "null" => False, "pk" => False, "protected" => False, "private" => False, "alias" => "downloadUrl", "public" => False]; - $dict['binaryName'] = ['read_only' => False, "type" => "str(50)", "subtype" => "unset", "choices" => "unset", "null" => False, "pk" => False, "protected" => False, "private" => False, "alias" => "binaryName", "public" => False]; + $dict['crackerBinaryId'] = ['read_only' => True, "type" => "int", "subtype" => "unset", "choices" => "unset", "null" => False, "pk" => True, "protected" => True, "private" => False, "alias" => "crackerBinaryId", "public" => False, "dba_mapping" => False]; + $dict['crackerBinaryTypeId'] = ['read_only' => True, "type" => "int", "subtype" => "unset", "choices" => "unset", "null" => False, "pk" => False, "protected" => False, "private" => False, "alias" => "crackerBinaryTypeId", "public" => False, "dba_mapping" => False]; + $dict['version'] = ['read_only' => False, "type" => "str(20)", "subtype" => "unset", "choices" => "unset", "null" => False, "pk" => False, "protected" => False, "private" => False, "alias" => "version", "public" => False, "dba_mapping" => False]; + $dict['downloadUrl'] = ['read_only' => False, "type" => "str(150)", "subtype" => "unset", "choices" => "unset", "null" => False, "pk" => False, "protected" => False, "private" => False, "alias" => "downloadUrl", "public" => False, "dba_mapping" => False]; + $dict['binaryName'] = ['read_only' => False, "type" => "str(50)", "subtype" => "unset", "choices" => "unset", "null" => False, "pk" => False, "protected" => False, "private" => False, "alias" => "binaryName", "public" => False, "dba_mapping" => False]; return $dict; } diff --git a/src/dba/models/CrackerBinaryFactory.class.php b/src/dba/models/CrackerBinaryFactory.class.php index 51a5ff4bf..c95a43342 100644 --- a/src/dba/models/CrackerBinaryFactory.class.php +++ b/src/dba/models/CrackerBinaryFactory.class.php @@ -10,6 +10,10 @@ function getModelName(): string { function getModelTable(): string { return "CrackerBinary"; } + + function isMapping(): bool { + return False; + } function isCachable(): bool { return false; @@ -40,7 +44,7 @@ function createObjectFromDict($pk, $dict): CrackerBinary { * @param bool $single * @return CrackerBinary|CrackerBinary[] */ - function filter($options, $single = false) { + function filter(array $options, bool $single = false) { $join = false; if (array_key_exists('join', $options)) { $join = true; diff --git a/src/dba/models/CrackerBinaryType.class.php b/src/dba/models/CrackerBinaryType.class.php index 2c9979bb1..27d0d69c6 100644 --- a/src/dba/models/CrackerBinaryType.class.php +++ b/src/dba/models/CrackerBinaryType.class.php @@ -24,9 +24,9 @@ function getKeyValueDict(): array { static function getFeatures(): array { $dict = array(); - $dict['crackerBinaryTypeId'] = ['read_only' => True, "type" => "int", "subtype" => "unset", "choices" => "unset", "null" => False, "pk" => True, "protected" => True, "private" => False, "alias" => "crackerBinaryTypeId", "public" => False]; - $dict['typeName'] = ['read_only' => False, "type" => "str(30)", "subtype" => "unset", "choices" => "unset", "null" => False, "pk" => False, "protected" => False, "private" => False, "alias" => "typeName", "public" => False]; - $dict['isChunkingAvailable'] = ['read_only' => False, "type" => "bool", "subtype" => "unset", "choices" => "unset", "null" => False, "pk" => False, "protected" => False, "private" => False, "alias" => "isChunkingAvailable", "public" => False]; + $dict['crackerBinaryTypeId'] = ['read_only' => True, "type" => "int", "subtype" => "unset", "choices" => "unset", "null" => False, "pk" => True, "protected" => True, "private" => False, "alias" => "crackerBinaryTypeId", "public" => False, "dba_mapping" => False]; + $dict['typeName'] = ['read_only' => False, "type" => "str(30)", "subtype" => "unset", "choices" => "unset", "null" => False, "pk" => False, "protected" => False, "private" => False, "alias" => "typeName", "public" => False, "dba_mapping" => False]; + $dict['isChunkingAvailable'] = ['read_only' => False, "type" => "bool", "subtype" => "unset", "choices" => "unset", "null" => False, "pk" => False, "protected" => False, "private" => False, "alias" => "isChunkingAvailable", "public" => False, "dba_mapping" => False]; return $dict; } diff --git a/src/dba/models/CrackerBinaryTypeFactory.class.php b/src/dba/models/CrackerBinaryTypeFactory.class.php index 19d1b8105..7b4f8e54f 100644 --- a/src/dba/models/CrackerBinaryTypeFactory.class.php +++ b/src/dba/models/CrackerBinaryTypeFactory.class.php @@ -10,6 +10,10 @@ function getModelName(): string { function getModelTable(): string { return "CrackerBinaryType"; } + + function isMapping(): bool { + return False; + } function isCachable(): bool { return false; @@ -40,7 +44,7 @@ function createObjectFromDict($pk, $dict): CrackerBinaryType { * @param bool $single * @return CrackerBinaryType|CrackerBinaryType[] */ - function filter($options, $single = false) { + function filter(array $options, bool $single = false) { $join = false; if (array_key_exists('join', $options)) { $join = true; diff --git a/src/dba/models/File.class.php b/src/dba/models/File.class.php index 999be7af5..f5b9b5059 100644 --- a/src/dba/models/File.class.php +++ b/src/dba/models/File.class.php @@ -36,13 +36,13 @@ function getKeyValueDict(): array { static function getFeatures(): array { $dict = array(); - $dict['fileId'] = ['read_only' => True, "type" => "int", "subtype" => "unset", "choices" => "unset", "null" => False, "pk" => True, "protected" => True, "private" => False, "alias" => "fileId", "public" => False]; - $dict['filename'] = ['read_only' => False, "type" => "str(100)", "subtype" => "unset", "choices" => "unset", "null" => False, "pk" => False, "protected" => False, "private" => False, "alias" => "filename", "public" => False]; - $dict['size'] = ['read_only' => True, "type" => "int64", "subtype" => "unset", "choices" => "unset", "null" => False, "pk" => False, "protected" => True, "private" => False, "alias" => "size", "public" => False]; - $dict['isSecret'] = ['read_only' => False, "type" => "bool", "subtype" => "unset", "choices" => "unset", "null" => False, "pk" => False, "protected" => False, "private" => False, "alias" => "isSecret", "public" => False]; - $dict['fileType'] = ['read_only' => False, "type" => "int", "subtype" => "unset", "choices" => "unset", "null" => False, "pk" => False, "protected" => False, "private" => False, "alias" => "fileType", "public" => False]; - $dict['accessGroupId'] = ['read_only' => False, "type" => "int", "subtype" => "unset", "choices" => "unset", "null" => False, "pk" => False, "protected" => False, "private" => False, "alias" => "accessGroupId", "public" => False]; - $dict['lineCount'] = ['read_only' => True, "type" => "int64", "subtype" => "unset", "choices" => "unset", "null" => False, "pk" => False, "protected" => True, "private" => False, "alias" => "lineCount", "public" => False]; + $dict['fileId'] = ['read_only' => True, "type" => "int", "subtype" => "unset", "choices" => "unset", "null" => False, "pk" => True, "protected" => True, "private" => False, "alias" => "fileId", "public" => False, "dba_mapping" => False]; + $dict['filename'] = ['read_only' => False, "type" => "str(100)", "subtype" => "unset", "choices" => "unset", "null" => False, "pk" => False, "protected" => False, "private" => False, "alias" => "filename", "public" => False, "dba_mapping" => False]; + $dict['size'] = ['read_only' => True, "type" => "int64", "subtype" => "unset", "choices" => "unset", "null" => False, "pk" => False, "protected" => True, "private" => False, "alias" => "size", "public" => False, "dba_mapping" => False]; + $dict['isSecret'] = ['read_only' => False, "type" => "bool", "subtype" => "unset", "choices" => "unset", "null" => False, "pk" => False, "protected" => False, "private" => False, "alias" => "isSecret", "public" => False, "dba_mapping" => False]; + $dict['fileType'] = ['read_only' => False, "type" => "int", "subtype" => "unset", "choices" => "unset", "null" => False, "pk" => False, "protected" => False, "private" => False, "alias" => "fileType", "public" => False, "dba_mapping" => False]; + $dict['accessGroupId'] = ['read_only' => False, "type" => "int", "subtype" => "unset", "choices" => "unset", "null" => False, "pk" => False, "protected" => False, "private" => False, "alias" => "accessGroupId", "public" => False, "dba_mapping" => False]; + $dict['lineCount'] = ['read_only' => True, "type" => "int64", "subtype" => "unset", "choices" => "unset", "null" => False, "pk" => False, "protected" => True, "private" => False, "alias" => "lineCount", "public" => False, "dba_mapping" => False]; return $dict; } diff --git a/src/dba/models/FileDelete.class.php b/src/dba/models/FileDelete.class.php index b93228ced..77cc44dc8 100644 --- a/src/dba/models/FileDelete.class.php +++ b/src/dba/models/FileDelete.class.php @@ -24,9 +24,9 @@ function getKeyValueDict(): array { static function getFeatures(): array { $dict = array(); - $dict['fileDeleteId'] = ['read_only' => True, "type" => "int", "subtype" => "unset", "choices" => "unset", "null" => False, "pk" => True, "protected" => True, "private" => False, "alias" => "fileDeleteId", "public" => False]; - $dict['filename'] = ['read_only' => True, "type" => "str(256)", "subtype" => "unset", "choices" => "unset", "null" => False, "pk" => False, "protected" => True, "private" => False, "alias" => "filename", "public" => False]; - $dict['time'] = ['read_only' => True, "type" => "int64", "subtype" => "unset", "choices" => "unset", "null" => False, "pk" => False, "protected" => True, "private" => False, "alias" => "time", "public" => False]; + $dict['fileDeleteId'] = ['read_only' => True, "type" => "int", "subtype" => "unset", "choices" => "unset", "null" => False, "pk" => True, "protected" => True, "private" => False, "alias" => "fileDeleteId", "public" => False, "dba_mapping" => False]; + $dict['filename'] = ['read_only' => True, "type" => "str(256)", "subtype" => "unset", "choices" => "unset", "null" => False, "pk" => False, "protected" => True, "private" => False, "alias" => "filename", "public" => False, "dba_mapping" => False]; + $dict['time'] = ['read_only' => True, "type" => "int64", "subtype" => "unset", "choices" => "unset", "null" => False, "pk" => False, "protected" => True, "private" => False, "alias" => "time", "public" => False, "dba_mapping" => False]; return $dict; } diff --git a/src/dba/models/FileDeleteFactory.class.php b/src/dba/models/FileDeleteFactory.class.php index 5961d2395..a6805c17b 100644 --- a/src/dba/models/FileDeleteFactory.class.php +++ b/src/dba/models/FileDeleteFactory.class.php @@ -10,6 +10,10 @@ function getModelName(): string { function getModelTable(): string { return "FileDelete"; } + + function isMapping(): bool { + return False; + } function isCachable(): bool { return false; @@ -40,7 +44,7 @@ function createObjectFromDict($pk, $dict): FileDelete { * @param bool $single * @return FileDelete|FileDelete[] */ - function filter($options, $single = false) { + function filter(array $options, bool $single = false) { $join = false; if (array_key_exists('join', $options)) { $join = true; diff --git a/src/dba/models/FileDownload.class.php b/src/dba/models/FileDownload.class.php index 59082ccf0..1d33ad38f 100644 --- a/src/dba/models/FileDownload.class.php +++ b/src/dba/models/FileDownload.class.php @@ -27,10 +27,10 @@ function getKeyValueDict(): array { static function getFeatures(): array { $dict = array(); - $dict['fileDownloadId'] = ['read_only' => True, "type" => "int", "subtype" => "unset", "choices" => "unset", "null" => False, "pk" => True, "protected" => True, "private" => False, "alias" => "fileDownloadId", "public" => False]; - $dict['time'] = ['read_only' => True, "type" => "int64", "subtype" => "unset", "choices" => "unset", "null" => False, "pk" => False, "protected" => True, "private" => False, "alias" => "time", "public" => False]; - $dict['fileId'] = ['read_only' => True, "type" => "int", "subtype" => "unset", "choices" => "unset", "null" => False, "pk" => False, "protected" => True, "private" => False, "alias" => "fileId", "public" => False]; - $dict['status'] = ['read_only' => True, "type" => "int", "subtype" => "unset", "choices" => "unset", "null" => False, "pk" => False, "protected" => True, "private" => False, "alias" => "status", "public" => False]; + $dict['fileDownloadId'] = ['read_only' => True, "type" => "int", "subtype" => "unset", "choices" => "unset", "null" => False, "pk" => True, "protected" => True, "private" => False, "alias" => "fileDownloadId", "public" => False, "dba_mapping" => False]; + $dict['time'] = ['read_only' => True, "type" => "int64", "subtype" => "unset", "choices" => "unset", "null" => False, "pk" => False, "protected" => True, "private" => False, "alias" => "time", "public" => False, "dba_mapping" => False]; + $dict['fileId'] = ['read_only' => True, "type" => "int", "subtype" => "unset", "choices" => "unset", "null" => False, "pk" => False, "protected" => True, "private" => False, "alias" => "fileId", "public" => False, "dba_mapping" => False]; + $dict['status'] = ['read_only' => True, "type" => "int", "subtype" => "unset", "choices" => "unset", "null" => False, "pk" => False, "protected" => True, "private" => False, "alias" => "status", "public" => False, "dba_mapping" => False]; return $dict; } diff --git a/src/dba/models/FileDownloadFactory.class.php b/src/dba/models/FileDownloadFactory.class.php index 86b1cf503..57902630f 100644 --- a/src/dba/models/FileDownloadFactory.class.php +++ b/src/dba/models/FileDownloadFactory.class.php @@ -10,6 +10,10 @@ function getModelName(): string { function getModelTable(): string { return "FileDownload"; } + + function isMapping(): bool { + return False; + } function isCachable(): bool { return false; @@ -40,7 +44,7 @@ function createObjectFromDict($pk, $dict): FileDownload { * @param bool $single * @return FileDownload|FileDownload[] */ - function filter($options, $single = false) { + function filter(array $options, bool $single = false) { $join = false; if (array_key_exists('join', $options)) { $join = true; diff --git a/src/dba/models/FileFactory.class.php b/src/dba/models/FileFactory.class.php index b24486e33..45b033c16 100644 --- a/src/dba/models/FileFactory.class.php +++ b/src/dba/models/FileFactory.class.php @@ -10,6 +10,10 @@ function getModelName(): string { function getModelTable(): string { return "File"; } + + function isMapping(): bool { + return False; + } function isCachable(): bool { return false; @@ -40,7 +44,7 @@ function createObjectFromDict($pk, $dict): File { * @param bool $single * @return File|File[] */ - function filter($options, $single = false) { + function filter(array $options, bool $single = false) { $join = false; if (array_key_exists('join', $options)) { $join = true; diff --git a/src/dba/models/FilePretask.class.php b/src/dba/models/FilePretask.class.php index 97af21b7a..d23a114bc 100644 --- a/src/dba/models/FilePretask.class.php +++ b/src/dba/models/FilePretask.class.php @@ -24,9 +24,9 @@ function getKeyValueDict(): array { static function getFeatures(): array { $dict = array(); - $dict['filePretaskId'] = ['read_only' => True, "type" => "int", "subtype" => "unset", "choices" => "unset", "null" => False, "pk" => True, "protected" => True, "private" => False, "alias" => "filePretaskId", "public" => False]; - $dict['fileId'] = ['read_only' => True, "type" => "int", "subtype" => "unset", "choices" => "unset", "null" => False, "pk" => False, "protected" => False, "private" => False, "alias" => "fileId", "public" => False]; - $dict['pretaskId'] = ['read_only' => True, "type" => "int", "subtype" => "unset", "choices" => "unset", "null" => False, "pk" => False, "protected" => False, "private" => False, "alias" => "pretaskId", "public" => False]; + $dict['filePretaskId'] = ['read_only' => True, "type" => "int", "subtype" => "unset", "choices" => "unset", "null" => False, "pk" => True, "protected" => True, "private" => False, "alias" => "filePretaskId", "public" => False, "dba_mapping" => False]; + $dict['fileId'] = ['read_only' => True, "type" => "int", "subtype" => "unset", "choices" => "unset", "null" => False, "pk" => False, "protected" => False, "private" => False, "alias" => "fileId", "public" => False, "dba_mapping" => False]; + $dict['pretaskId'] = ['read_only' => True, "type" => "int", "subtype" => "unset", "choices" => "unset", "null" => False, "pk" => False, "protected" => False, "private" => False, "alias" => "pretaskId", "public" => False, "dba_mapping" => False]; return $dict; } diff --git a/src/dba/models/FilePretaskFactory.class.php b/src/dba/models/FilePretaskFactory.class.php index 0f201531f..244df0449 100644 --- a/src/dba/models/FilePretaskFactory.class.php +++ b/src/dba/models/FilePretaskFactory.class.php @@ -10,6 +10,10 @@ function getModelName(): string { function getModelTable(): string { return "FilePretask"; } + + function isMapping(): bool { + return False; + } function isCachable(): bool { return false; @@ -40,7 +44,7 @@ function createObjectFromDict($pk, $dict): FilePretask { * @param bool $single * @return FilePretask|FilePretask[] */ - function filter($options, $single = false) { + function filter(array $options, bool $single = false) { $join = false; if (array_key_exists('join', $options)) { $join = true; diff --git a/src/dba/models/FileTask.class.php b/src/dba/models/FileTask.class.php index 5507fad3d..90e45b4c6 100644 --- a/src/dba/models/FileTask.class.php +++ b/src/dba/models/FileTask.class.php @@ -24,9 +24,9 @@ function getKeyValueDict(): array { static function getFeatures(): array { $dict = array(); - $dict['fileTaskId'] = ['read_only' => True, "type" => "int", "subtype" => "unset", "choices" => "unset", "null" => False, "pk" => True, "protected" => True, "private" => False, "alias" => "fileTaskId", "public" => False]; - $dict['fileId'] = ['read_only' => True, "type" => "int", "subtype" => "unset", "choices" => "unset", "null" => False, "pk" => False, "protected" => False, "private" => False, "alias" => "fileId", "public" => False]; - $dict['taskId'] = ['read_only' => True, "type" => "int", "subtype" => "unset", "choices" => "unset", "null" => False, "pk" => False, "protected" => False, "private" => False, "alias" => "taskId", "public" => False]; + $dict['fileTaskId'] = ['read_only' => True, "type" => "int", "subtype" => "unset", "choices" => "unset", "null" => False, "pk" => True, "protected" => True, "private" => False, "alias" => "fileTaskId", "public" => False, "dba_mapping" => False]; + $dict['fileId'] = ['read_only' => True, "type" => "int", "subtype" => "unset", "choices" => "unset", "null" => False, "pk" => False, "protected" => False, "private" => False, "alias" => "fileId", "public" => False, "dba_mapping" => False]; + $dict['taskId'] = ['read_only' => True, "type" => "int", "subtype" => "unset", "choices" => "unset", "null" => False, "pk" => False, "protected" => False, "private" => False, "alias" => "taskId", "public" => False, "dba_mapping" => False]; return $dict; } diff --git a/src/dba/models/FileTaskFactory.class.php b/src/dba/models/FileTaskFactory.class.php index 65b12d772..668bdfbf1 100644 --- a/src/dba/models/FileTaskFactory.class.php +++ b/src/dba/models/FileTaskFactory.class.php @@ -10,6 +10,10 @@ function getModelName(): string { function getModelTable(): string { return "FileTask"; } + + function isMapping(): bool { + return False; + } function isCachable(): bool { return false; @@ -40,7 +44,7 @@ function createObjectFromDict($pk, $dict): FileTask { * @param bool $single * @return FileTask|FileTask[] */ - function filter($options, $single = false) { + function filter(array $options, bool $single = false) { $join = false; if (array_key_exists('join', $options)) { $join = true; diff --git a/src/dba/models/Hash.class.php b/src/dba/models/Hash.class.php index 5c966112c..2892d8e7d 100644 --- a/src/dba/models/Hash.class.php +++ b/src/dba/models/Hash.class.php @@ -42,15 +42,15 @@ function getKeyValueDict(): array { static function getFeatures(): array { $dict = array(); - $dict['hashId'] = ['read_only' => True, "type" => "int", "subtype" => "unset", "choices" => "unset", "null" => False, "pk" => True, "protected" => True, "private" => False, "alias" => "hashId", "public" => False]; - $dict['hashlistId'] = ['read_only' => True, "type" => "int", "subtype" => "unset", "choices" => "unset", "null" => False, "pk" => False, "protected" => False, "private" => False, "alias" => "hashlistId", "public" => False]; - $dict['hash'] = ['read_only' => False, "type" => "str(65535)", "subtype" => "unset", "choices" => "unset", "null" => False, "pk" => False, "protected" => False, "private" => False, "alias" => "hash", "public" => False]; - $dict['salt'] = ['read_only' => False, "type" => "str(256)", "subtype" => "unset", "choices" => "unset", "null" => False, "pk" => False, "protected" => False, "private" => False, "alias" => "salt", "public" => False]; - $dict['plaintext'] = ['read_only' => False, "type" => "str(256)", "subtype" => "unset", "choices" => "unset", "null" => False, "pk" => False, "protected" => False, "private" => False, "alias" => "plaintext", "public" => False]; - $dict['timeCracked'] = ['read_only' => False, "type" => "int64", "subtype" => "unset", "choices" => "unset", "null" => False, "pk" => False, "protected" => False, "private" => False, "alias" => "timeCracked", "public" => False]; - $dict['chunkId'] = ['read_only' => False, "type" => "int", "subtype" => "unset", "choices" => "unset", "null" => False, "pk" => False, "protected" => False, "private" => False, "alias" => "chunkId", "public" => False]; - $dict['isCracked'] = ['read_only' => False, "type" => "bool", "subtype" => "unset", "choices" => "unset", "null" => False, "pk" => False, "protected" => False, "private" => False, "alias" => "isCracked", "public" => False]; - $dict['crackPos'] = ['read_only' => False, "type" => "int64", "subtype" => "unset", "choices" => "unset", "null" => False, "pk" => False, "protected" => False, "private" => False, "alias" => "crackPos", "public" => False]; + $dict['hashId'] = ['read_only' => True, "type" => "int", "subtype" => "unset", "choices" => "unset", "null" => False, "pk" => True, "protected" => True, "private" => False, "alias" => "hashId", "public" => False, "dba_mapping" => False]; + $dict['hashlistId'] = ['read_only' => True, "type" => "int", "subtype" => "unset", "choices" => "unset", "null" => False, "pk" => False, "protected" => False, "private" => False, "alias" => "hashlistId", "public" => False, "dba_mapping" => False]; + $dict['hash'] = ['read_only' => False, "type" => "str(65535)", "subtype" => "unset", "choices" => "unset", "null" => False, "pk" => False, "protected" => False, "private" => False, "alias" => "hash", "public" => False, "dba_mapping" => False]; + $dict['salt'] = ['read_only' => False, "type" => "str(256)", "subtype" => "unset", "choices" => "unset", "null" => False, "pk" => False, "protected" => False, "private" => False, "alias" => "salt", "public" => False, "dba_mapping" => False]; + $dict['plaintext'] = ['read_only' => False, "type" => "str(256)", "subtype" => "unset", "choices" => "unset", "null" => False, "pk" => False, "protected" => False, "private" => False, "alias" => "plaintext", "public" => False, "dba_mapping" => False]; + $dict['timeCracked'] = ['read_only' => False, "type" => "int64", "subtype" => "unset", "choices" => "unset", "null" => False, "pk" => False, "protected" => False, "private" => False, "alias" => "timeCracked", "public" => False, "dba_mapping" => False]; + $dict['chunkId'] = ['read_only' => False, "type" => "int", "subtype" => "unset", "choices" => "unset", "null" => False, "pk" => False, "protected" => False, "private" => False, "alias" => "chunkId", "public" => False, "dba_mapping" => False]; + $dict['isCracked'] = ['read_only' => False, "type" => "bool", "subtype" => "unset", "choices" => "unset", "null" => False, "pk" => False, "protected" => False, "private" => False, "alias" => "isCracked", "public" => False, "dba_mapping" => False]; + $dict['crackPos'] = ['read_only' => False, "type" => "int64", "subtype" => "unset", "choices" => "unset", "null" => False, "pk" => False, "protected" => False, "private" => False, "alias" => "crackPos", "public" => False, "dba_mapping" => False]; return $dict; } diff --git a/src/dba/models/HashBinary.class.php b/src/dba/models/HashBinary.class.php index 3eeebd6a1..ce31df06c 100644 --- a/src/dba/models/HashBinary.class.php +++ b/src/dba/models/HashBinary.class.php @@ -42,15 +42,15 @@ function getKeyValueDict(): array { static function getFeatures(): array { $dict = array(); - $dict['hashBinaryId'] = ['read_only' => True, "type" => "int", "subtype" => "unset", "choices" => "unset", "null" => False, "pk" => True, "protected" => True, "private" => False, "alias" => "hashBinaryId", "public" => False]; - $dict['hashlistId'] = ['read_only' => True, "type" => "int", "subtype" => "unset", "choices" => "unset", "null" => False, "pk" => False, "protected" => False, "private" => False, "alias" => "hashlistId", "public" => False]; - $dict['essid'] = ['read_only' => False, "type" => "str(100)", "subtype" => "unset", "choices" => "unset", "null" => False, "pk" => False, "protected" => False, "private" => False, "alias" => "essid", "public" => False]; - $dict['hash'] = ['read_only' => False, "type" => "str(4294967295)", "subtype" => "unset", "choices" => "unset", "null" => False, "pk" => False, "protected" => False, "private" => False, "alias" => "hash", "public" => False]; - $dict['plaintext'] = ['read_only' => False, "type" => "str(1024)", "subtype" => "unset", "choices" => "unset", "null" => False, "pk" => False, "protected" => False, "private" => False, "alias" => "plaintext", "public" => False]; - $dict['timeCracked'] = ['read_only' => False, "type" => "int64", "subtype" => "unset", "choices" => "unset", "null" => False, "pk" => False, "protected" => False, "private" => False, "alias" => "timeCracked", "public" => False]; - $dict['chunkId'] = ['read_only' => False, "type" => "int", "subtype" => "unset", "choices" => "unset", "null" => False, "pk" => False, "protected" => False, "private" => False, "alias" => "chunkId", "public" => False]; - $dict['isCracked'] = ['read_only' => False, "type" => "bool", "subtype" => "unset", "choices" => "unset", "null" => False, "pk" => False, "protected" => False, "private" => False, "alias" => "isCracked", "public" => False]; - $dict['crackPos'] = ['read_only' => False, "type" => "int64", "subtype" => "unset", "choices" => "unset", "null" => False, "pk" => False, "protected" => False, "private" => False, "alias" => "crackPos", "public" => False]; + $dict['hashBinaryId'] = ['read_only' => True, "type" => "int", "subtype" => "unset", "choices" => "unset", "null" => False, "pk" => True, "protected" => True, "private" => False, "alias" => "hashBinaryId", "public" => False, "dba_mapping" => False]; + $dict['hashlistId'] = ['read_only' => True, "type" => "int", "subtype" => "unset", "choices" => "unset", "null" => False, "pk" => False, "protected" => False, "private" => False, "alias" => "hashlistId", "public" => False, "dba_mapping" => False]; + $dict['essid'] = ['read_only' => False, "type" => "str(100)", "subtype" => "unset", "choices" => "unset", "null" => False, "pk" => False, "protected" => False, "private" => False, "alias" => "essid", "public" => False, "dba_mapping" => False]; + $dict['hash'] = ['read_only' => False, "type" => "str(4294967295)", "subtype" => "unset", "choices" => "unset", "null" => False, "pk" => False, "protected" => False, "private" => False, "alias" => "hash", "public" => False, "dba_mapping" => False]; + $dict['plaintext'] = ['read_only' => False, "type" => "str(1024)", "subtype" => "unset", "choices" => "unset", "null" => False, "pk" => False, "protected" => False, "private" => False, "alias" => "plaintext", "public" => False, "dba_mapping" => False]; + $dict['timeCracked'] = ['read_only' => False, "type" => "int64", "subtype" => "unset", "choices" => "unset", "null" => False, "pk" => False, "protected" => False, "private" => False, "alias" => "timeCracked", "public" => False, "dba_mapping" => False]; + $dict['chunkId'] = ['read_only' => False, "type" => "int", "subtype" => "unset", "choices" => "unset", "null" => False, "pk" => False, "protected" => False, "private" => False, "alias" => "chunkId", "public" => False, "dba_mapping" => False]; + $dict['isCracked'] = ['read_only' => False, "type" => "bool", "subtype" => "unset", "choices" => "unset", "null" => False, "pk" => False, "protected" => False, "private" => False, "alias" => "isCracked", "public" => False, "dba_mapping" => False]; + $dict['crackPos'] = ['read_only' => False, "type" => "int64", "subtype" => "unset", "choices" => "unset", "null" => False, "pk" => False, "protected" => False, "private" => False, "alias" => "crackPos", "public" => False, "dba_mapping" => False]; return $dict; } diff --git a/src/dba/models/HashBinaryFactory.class.php b/src/dba/models/HashBinaryFactory.class.php index 736273be7..7fcd54a65 100644 --- a/src/dba/models/HashBinaryFactory.class.php +++ b/src/dba/models/HashBinaryFactory.class.php @@ -10,6 +10,10 @@ function getModelName(): string { function getModelTable(): string { return "HashBinary"; } + + function isMapping(): bool { + return False; + } function isCachable(): bool { return false; @@ -40,7 +44,7 @@ function createObjectFromDict($pk, $dict): HashBinary { * @param bool $single * @return HashBinary|HashBinary[] */ - function filter($options, $single = false) { + function filter(array $options, bool $single = false) { $join = false; if (array_key_exists('join', $options)) { $join = true; diff --git a/src/dba/models/HashFactory.class.php b/src/dba/models/HashFactory.class.php index a5ac288dd..27f9198ad 100644 --- a/src/dba/models/HashFactory.class.php +++ b/src/dba/models/HashFactory.class.php @@ -10,6 +10,10 @@ function getModelName(): string { function getModelTable(): string { return "Hash"; } + + function isMapping(): bool { + return False; + } function isCachable(): bool { return false; @@ -40,7 +44,7 @@ function createObjectFromDict($pk, $dict): Hash { * @param bool $single * @return Hash|Hash[] */ - function filter($options, $single = false) { + function filter(array $options, bool $single = false) { $join = false; if (array_key_exists('join', $options)) { $join = true; diff --git a/src/dba/models/HashType.class.php b/src/dba/models/HashType.class.php index 0391543fc..89883ad1d 100644 --- a/src/dba/models/HashType.class.php +++ b/src/dba/models/HashType.class.php @@ -27,10 +27,10 @@ function getKeyValueDict(): array { static function getFeatures(): array { $dict = array(); - $dict['hashTypeId'] = ['read_only' => True, "type" => "int", "subtype" => "unset", "choices" => "unset", "null" => False, "pk" => True, "protected" => False, "private" => False, "alias" => "hashTypeId", "public" => False]; - $dict['description'] = ['read_only' => False, "type" => "str(256)", "subtype" => "unset", "choices" => "unset", "null" => False, "pk" => False, "protected" => False, "private" => False, "alias" => "description", "public" => False]; - $dict['isSalted'] = ['read_only' => False, "type" => "bool", "subtype" => "unset", "choices" => "unset", "null" => False, "pk" => False, "protected" => False, "private" => False, "alias" => "isSalted", "public" => False]; - $dict['isSlowHash'] = ['read_only' => False, "type" => "bool", "subtype" => "unset", "choices" => "unset", "null" => False, "pk" => False, "protected" => False, "private" => False, "alias" => "isSlowHash", "public" => False]; + $dict['hashTypeId'] = ['read_only' => True, "type" => "int", "subtype" => "unset", "choices" => "unset", "null" => False, "pk" => True, "protected" => False, "private" => False, "alias" => "hashTypeId", "public" => False, "dba_mapping" => False]; + $dict['description'] = ['read_only' => False, "type" => "str(256)", "subtype" => "unset", "choices" => "unset", "null" => False, "pk" => False, "protected" => False, "private" => False, "alias" => "description", "public" => False, "dba_mapping" => False]; + $dict['isSalted'] = ['read_only' => False, "type" => "bool", "subtype" => "unset", "choices" => "unset", "null" => False, "pk" => False, "protected" => False, "private" => False, "alias" => "isSalted", "public" => False, "dba_mapping" => False]; + $dict['isSlowHash'] = ['read_only' => False, "type" => "bool", "subtype" => "unset", "choices" => "unset", "null" => False, "pk" => False, "protected" => False, "private" => False, "alias" => "isSlowHash", "public" => False, "dba_mapping" => False]; return $dict; } diff --git a/src/dba/models/HashTypeFactory.class.php b/src/dba/models/HashTypeFactory.class.php index 689ca6791..b457b61bb 100644 --- a/src/dba/models/HashTypeFactory.class.php +++ b/src/dba/models/HashTypeFactory.class.php @@ -10,6 +10,10 @@ function getModelName(): string { function getModelTable(): string { return "HashType"; } + + function isMapping(): bool { + return False; + } function isCachable(): bool { return false; @@ -40,7 +44,7 @@ function createObjectFromDict($pk, $dict): HashType { * @param bool $single * @return HashType|HashType[] */ - function filter($options, $single = false) { + function filter(array $options, bool $single = false) { $join = false; if (array_key_exists('join', $options)) { $join = true; diff --git a/src/dba/models/Hashlist.class.php b/src/dba/models/Hashlist.class.php index aa5a9940b..2cdddfca4 100644 --- a/src/dba/models/Hashlist.class.php +++ b/src/dba/models/Hashlist.class.php @@ -60,21 +60,21 @@ function getKeyValueDict(): array { static function getFeatures(): array { $dict = array(); - $dict['hashlistId'] = ['read_only' => True, "type" => "int", "subtype" => "unset", "choices" => "unset", "null" => False, "pk" => True, "protected" => True, "private" => False, "alias" => "hashlistId", "public" => False]; - $dict['hashlistName'] = ['read_only' => False, "type" => "str(100)", "subtype" => "unset", "choices" => "unset", "null" => False, "pk" => False, "protected" => False, "private" => False, "alias" => "name", "public" => False]; - $dict['format'] = ['read_only' => True, "type" => "int", "subtype" => "unset", "choices" => [0 => "Hashlist format is PLAIN", 1 => "Hashlist format is WPA", 2 => "Hashlist format is BINARY", 3 => "Hashlist is SUPERHASHLIST", ], "null" => False, "pk" => False, "protected" => False, "private" => False, "alias" => "format", "public" => False]; - $dict['hashTypeId'] = ['read_only' => True, "type" => "int", "subtype" => "unset", "choices" => "unset", "null" => False, "pk" => False, "protected" => False, "private" => False, "alias" => "hashTypeId", "public" => False]; - $dict['hashCount'] = ['read_only' => True, "type" => "int", "subtype" => "unset", "choices" => "unset", "null" => False, "pk" => False, "protected" => False, "private" => False, "alias" => "hashCount", "public" => False]; - $dict['saltSeparator'] = ['read_only' => True, "type" => "str(10)", "subtype" => "unset", "choices" => "unset", "null" => True, "pk" => False, "protected" => False, "private" => False, "alias" => "separator", "public" => False]; - $dict['cracked'] = ['read_only' => True, "type" => "int", "subtype" => "unset", "choices" => "unset", "null" => False, "pk" => False, "protected" => True, "private" => False, "alias" => "cracked", "public" => False]; - $dict['isSecret'] = ['read_only' => False, "type" => "bool", "subtype" => "unset", "choices" => "unset", "null" => False, "pk" => False, "protected" => False, "private" => False, "alias" => "isSecret", "public" => False]; - $dict['hexSalt'] = ['read_only' => True, "type" => "bool", "subtype" => "unset", "choices" => "unset", "null" => False, "pk" => False, "protected" => False, "private" => False, "alias" => "isHexSalt", "public" => False]; - $dict['isSalted'] = ['read_only' => True, "type" => "bool", "subtype" => "unset", "choices" => "unset", "null" => False, "pk" => False, "protected" => False, "private" => False, "alias" => "isSalted", "public" => False]; - $dict['accessGroupId'] = ['read_only' => False, "type" => "int", "subtype" => "unset", "choices" => "unset", "null" => False, "pk" => False, "protected" => False, "private" => False, "alias" => "accessGroupId", "public" => False]; - $dict['notes'] = ['read_only' => False, "type" => "str(65535)", "subtype" => "unset", "choices" => "unset", "null" => False, "pk" => False, "protected" => False, "private" => False, "alias" => "notes", "public" => False]; - $dict['brainId'] = ['read_only' => True, "type" => "bool", "subtype" => "unset", "choices" => "unset", "null" => False, "pk" => False, "protected" => False, "private" => False, "alias" => "useBrain", "public" => False]; - $dict['brainFeatures'] = ['read_only' => True, "type" => "int", "subtype" => "unset", "choices" => "unset", "null" => False, "pk" => False, "protected" => False, "private" => False, "alias" => "brainFeatures", "public" => False]; - $dict['isArchived'] = ['read_only' => False, "type" => "bool", "subtype" => "unset", "choices" => "unset", "null" => False, "pk" => False, "protected" => False, "private" => False, "alias" => "isArchived", "public" => False]; + $dict['hashlistId'] = ['read_only' => True, "type" => "int", "subtype" => "unset", "choices" => "unset", "null" => False, "pk" => True, "protected" => True, "private" => False, "alias" => "hashlistId", "public" => False, "dba_mapping" => False]; + $dict['hashlistName'] = ['read_only' => False, "type" => "str(100)", "subtype" => "unset", "choices" => "unset", "null" => False, "pk" => False, "protected" => False, "private" => False, "alias" => "name", "public" => False, "dba_mapping" => False]; + $dict['format'] = ['read_only' => True, "type" => "int", "subtype" => "unset", "choices" => [0 => "Hashlist format is PLAIN", 1 => "Hashlist format is WPA", 2 => "Hashlist format is BINARY", 3 => "Hashlist is SUPERHASHLIST", ], "null" => False, "pk" => False, "protected" => False, "private" => False, "alias" => "format", "public" => False, "dba_mapping" => False]; + $dict['hashTypeId'] = ['read_only' => True, "type" => "int", "subtype" => "unset", "choices" => "unset", "null" => False, "pk" => False, "protected" => False, "private" => False, "alias" => "hashTypeId", "public" => False, "dba_mapping" => False]; + $dict['hashCount'] = ['read_only' => True, "type" => "int", "subtype" => "unset", "choices" => "unset", "null" => False, "pk" => False, "protected" => False, "private" => False, "alias" => "hashCount", "public" => False, "dba_mapping" => False]; + $dict['saltSeparator'] = ['read_only' => True, "type" => "str(10)", "subtype" => "unset", "choices" => "unset", "null" => True, "pk" => False, "protected" => False, "private" => False, "alias" => "separator", "public" => False, "dba_mapping" => False]; + $dict['cracked'] = ['read_only' => True, "type" => "int", "subtype" => "unset", "choices" => "unset", "null" => False, "pk" => False, "protected" => True, "private" => False, "alias" => "cracked", "public" => False, "dba_mapping" => False]; + $dict['isSecret'] = ['read_only' => False, "type" => "bool", "subtype" => "unset", "choices" => "unset", "null" => False, "pk" => False, "protected" => False, "private" => False, "alias" => "isSecret", "public" => False, "dba_mapping" => False]; + $dict['hexSalt'] = ['read_only' => True, "type" => "bool", "subtype" => "unset", "choices" => "unset", "null" => False, "pk" => False, "protected" => False, "private" => False, "alias" => "isHexSalt", "public" => False, "dba_mapping" => False]; + $dict['isSalted'] = ['read_only' => True, "type" => "bool", "subtype" => "unset", "choices" => "unset", "null" => False, "pk" => False, "protected" => False, "private" => False, "alias" => "isSalted", "public" => False, "dba_mapping" => False]; + $dict['accessGroupId'] = ['read_only' => False, "type" => "int", "subtype" => "unset", "choices" => "unset", "null" => False, "pk" => False, "protected" => False, "private" => False, "alias" => "accessGroupId", "public" => False, "dba_mapping" => False]; + $dict['notes'] = ['read_only' => False, "type" => "str(65535)", "subtype" => "unset", "choices" => "unset", "null" => False, "pk" => False, "protected" => False, "private" => False, "alias" => "notes", "public" => False, "dba_mapping" => False]; + $dict['brainId'] = ['read_only' => True, "type" => "bool", "subtype" => "unset", "choices" => "unset", "null" => False, "pk" => False, "protected" => False, "private" => False, "alias" => "useBrain", "public" => False, "dba_mapping" => False]; + $dict['brainFeatures'] = ['read_only' => True, "type" => "int", "subtype" => "unset", "choices" => "unset", "null" => False, "pk" => False, "protected" => False, "private" => False, "alias" => "brainFeatures", "public" => False, "dba_mapping" => False]; + $dict['isArchived'] = ['read_only' => False, "type" => "bool", "subtype" => "unset", "choices" => "unset", "null" => False, "pk" => False, "protected" => False, "private" => False, "alias" => "isArchived", "public" => False, "dba_mapping" => False]; return $dict; } diff --git a/src/dba/models/HashlistFactory.class.php b/src/dba/models/HashlistFactory.class.php index 42ab7a250..8314c21c3 100644 --- a/src/dba/models/HashlistFactory.class.php +++ b/src/dba/models/HashlistFactory.class.php @@ -10,6 +10,10 @@ function getModelName(): string { function getModelTable(): string { return "Hashlist"; } + + function isMapping(): bool { + return False; + } function isCachable(): bool { return false; @@ -40,7 +44,7 @@ function createObjectFromDict($pk, $dict): Hashlist { * @param bool $single * @return Hashlist|Hashlist[] */ - function filter($options, $single = false) { + function filter(array $options, bool $single = false) { $join = false; if (array_key_exists('join', $options)) { $join = true; diff --git a/src/dba/models/HashlistHashlist.class.php b/src/dba/models/HashlistHashlist.class.php index 08824b7c9..56c7e7e1b 100644 --- a/src/dba/models/HashlistHashlist.class.php +++ b/src/dba/models/HashlistHashlist.class.php @@ -24,9 +24,9 @@ function getKeyValueDict(): array { static function getFeatures(): array { $dict = array(); - $dict['hashlistHashlistId'] = ['read_only' => True, "type" => "int", "subtype" => "unset", "choices" => "unset", "null" => False, "pk" => True, "protected" => True, "private" => False, "alias" => "hashlistHashlistId", "public" => False]; - $dict['parentHashlistId'] = ['read_only' => True, "type" => "int", "subtype" => "unset", "choices" => "unset", "null" => False, "pk" => False, "protected" => False, "private" => False, "alias" => "parentHashlistId", "public" => False]; - $dict['hashlistId'] = ['read_only' => True, "type" => "int", "subtype" => "unset", "choices" => "unset", "null" => False, "pk" => False, "protected" => False, "private" => False, "alias" => "hashlistId", "public" => False]; + $dict['hashlistHashlistId'] = ['read_only' => True, "type" => "int", "subtype" => "unset", "choices" => "unset", "null" => False, "pk" => True, "protected" => True, "private" => False, "alias" => "hashlistHashlistId", "public" => False, "dba_mapping" => False]; + $dict['parentHashlistId'] = ['read_only' => True, "type" => "int", "subtype" => "unset", "choices" => "unset", "null" => False, "pk" => False, "protected" => False, "private" => False, "alias" => "parentHashlistId", "public" => False, "dba_mapping" => False]; + $dict['hashlistId'] = ['read_only' => True, "type" => "int", "subtype" => "unset", "choices" => "unset", "null" => False, "pk" => False, "protected" => False, "private" => False, "alias" => "hashlistId", "public" => False, "dba_mapping" => False]; return $dict; } diff --git a/src/dba/models/HashlistHashlistFactory.class.php b/src/dba/models/HashlistHashlistFactory.class.php index 4fcba249f..a8a1b0e0c 100644 --- a/src/dba/models/HashlistHashlistFactory.class.php +++ b/src/dba/models/HashlistHashlistFactory.class.php @@ -10,6 +10,10 @@ function getModelName(): string { function getModelTable(): string { return "HashlistHashlist"; } + + function isMapping(): bool { + return False; + } function isCachable(): bool { return false; @@ -40,7 +44,7 @@ function createObjectFromDict($pk, $dict): HashlistHashlist { * @param bool $single * @return HashlistHashlist|HashlistHashlist[] */ - function filter($options, $single = false) { + function filter(array $options, bool $single = false) { $join = false; if (array_key_exists('join', $options)) { $join = true; diff --git a/src/dba/models/HealthCheck.class.php b/src/dba/models/HealthCheck.class.php index b1f555976..b623a9d60 100644 --- a/src/dba/models/HealthCheck.class.php +++ b/src/dba/models/HealthCheck.class.php @@ -39,14 +39,14 @@ function getKeyValueDict(): array { static function getFeatures(): array { $dict = array(); - $dict['healthCheckId'] = ['read_only' => True, "type" => "int", "subtype" => "unset", "choices" => "unset", "null" => False, "pk" => True, "protected" => True, "private" => False, "alias" => "healthCheckId", "public" => False]; - $dict['time'] = ['read_only' => True, "type" => "int64", "subtype" => "unset", "choices" => "unset", "null" => False, "pk" => False, "protected" => True, "private" => False, "alias" => "time", "public" => False]; - $dict['status'] = ['read_only' => True, "type" => "int", "subtype" => "unset", "choices" => "unset", "null" => False, "pk" => False, "protected" => True, "private" => False, "alias" => "status", "public" => False]; - $dict['checkType'] = ['read_only' => False, "type" => "int", "subtype" => "unset", "choices" => "unset", "null" => False, "pk" => False, "protected" => False, "private" => False, "alias" => "checkType", "public" => False]; - $dict['hashtypeId'] = ['read_only' => True, "type" => "int", "subtype" => "unset", "choices" => "unset", "null" => False, "pk" => False, "protected" => False, "private" => False, "alias" => "hashtypeId", "public" => False]; - $dict['crackerBinaryId'] = ['read_only' => True, "type" => "int", "subtype" => "unset", "choices" => "unset", "null" => False, "pk" => False, "protected" => False, "private" => False, "alias" => "crackerBinaryId", "public" => False]; - $dict['expectedCracks'] = ['read_only' => True, "type" => "int", "subtype" => "unset", "choices" => "unset", "null" => False, "pk" => False, "protected" => True, "private" => False, "alias" => "expectedCracks", "public" => False]; - $dict['attackCmd'] = ['read_only' => True, "type" => "str(65535)", "subtype" => "unset", "choices" => "unset", "null" => False, "pk" => False, "protected" => True, "private" => False, "alias" => "attackCmd", "public" => False]; + $dict['healthCheckId'] = ['read_only' => True, "type" => "int", "subtype" => "unset", "choices" => "unset", "null" => False, "pk" => True, "protected" => True, "private" => False, "alias" => "healthCheckId", "public" => False, "dba_mapping" => False]; + $dict['time'] = ['read_only' => True, "type" => "int64", "subtype" => "unset", "choices" => "unset", "null" => False, "pk" => False, "protected" => True, "private" => False, "alias" => "time", "public" => False, "dba_mapping" => False]; + $dict['status'] = ['read_only' => True, "type" => "int", "subtype" => "unset", "choices" => "unset", "null" => False, "pk" => False, "protected" => True, "private" => False, "alias" => "status", "public" => False, "dba_mapping" => False]; + $dict['checkType'] = ['read_only' => False, "type" => "int", "subtype" => "unset", "choices" => "unset", "null" => False, "pk" => False, "protected" => False, "private" => False, "alias" => "checkType", "public" => False, "dba_mapping" => False]; + $dict['hashtypeId'] = ['read_only' => True, "type" => "int", "subtype" => "unset", "choices" => "unset", "null" => False, "pk" => False, "protected" => False, "private" => False, "alias" => "hashtypeId", "public" => False, "dba_mapping" => False]; + $dict['crackerBinaryId'] = ['read_only' => True, "type" => "int", "subtype" => "unset", "choices" => "unset", "null" => False, "pk" => False, "protected" => False, "private" => False, "alias" => "crackerBinaryId", "public" => False, "dba_mapping" => False]; + $dict['expectedCracks'] = ['read_only' => True, "type" => "int", "subtype" => "unset", "choices" => "unset", "null" => False, "pk" => False, "protected" => True, "private" => False, "alias" => "expectedCracks", "public" => False, "dba_mapping" => False]; + $dict['attackCmd'] = ['read_only' => True, "type" => "str(65535)", "subtype" => "unset", "choices" => "unset", "null" => False, "pk" => False, "protected" => True, "private" => False, "alias" => "attackCmd", "public" => False, "dba_mapping" => False]; return $dict; } diff --git a/src/dba/models/HealthCheckAgent.class.php b/src/dba/models/HealthCheckAgent.class.php index 3f60d8c8b..2c936b44a 100644 --- a/src/dba/models/HealthCheckAgent.class.php +++ b/src/dba/models/HealthCheckAgent.class.php @@ -42,15 +42,15 @@ function getKeyValueDict(): array { static function getFeatures(): array { $dict = array(); - $dict['healthCheckAgentId'] = ['read_only' => True, "type" => "int", "subtype" => "unset", "choices" => "unset", "null" => False, "pk" => True, "protected" => True, "private" => False, "alias" => "healthCheckAgentId", "public" => False]; - $dict['healthCheckId'] = ['read_only' => True, "type" => "int", "subtype" => "unset", "choices" => "unset", "null" => False, "pk" => False, "protected" => True, "private" => False, "alias" => "healthCheckId", "public" => False]; - $dict['agentId'] = ['read_only' => True, "type" => "int", "subtype" => "unset", "choices" => "unset", "null" => False, "pk" => False, "protected" => True, "private" => False, "alias" => "agentId", "public" => False]; - $dict['status'] = ['read_only' => True, "type" => "int", "subtype" => "unset", "choices" => "unset", "null" => False, "pk" => False, "protected" => True, "private" => False, "alias" => "status", "public" => False]; - $dict['cracked'] = ['read_only' => True, "type" => "int", "subtype" => "unset", "choices" => "unset", "null" => False, "pk" => False, "protected" => True, "private" => False, "alias" => "cracked", "public" => False]; - $dict['numGpus'] = ['read_only' => True, "type" => "int", "subtype" => "unset", "choices" => "unset", "null" => False, "pk" => False, "protected" => True, "private" => False, "alias" => "numGpus", "public" => False]; - $dict['start'] = ['read_only' => True, "type" => "int64", "subtype" => "unset", "choices" => "unset", "null" => False, "pk" => False, "protected" => True, "private" => False, "alias" => "start", "public" => False]; - $dict['end'] = ['read_only' => True, "type" => "int64", "subtype" => "unset", "choices" => "unset", "null" => False, "pk" => False, "protected" => True, "private" => False, "alias" => "end", "public" => False]; - $dict['errors'] = ['read_only' => True, "type" => "str(65535)", "subtype" => "unset", "choices" => "unset", "null" => False, "pk" => False, "protected" => True, "private" => False, "alias" => "errors", "public" => False]; + $dict['healthCheckAgentId'] = ['read_only' => True, "type" => "int", "subtype" => "unset", "choices" => "unset", "null" => False, "pk" => True, "protected" => True, "private" => False, "alias" => "healthCheckAgentId", "public" => False, "dba_mapping" => False]; + $dict['healthCheckId'] = ['read_only' => True, "type" => "int", "subtype" => "unset", "choices" => "unset", "null" => False, "pk" => False, "protected" => True, "private" => False, "alias" => "healthCheckId", "public" => False, "dba_mapping" => False]; + $dict['agentId'] = ['read_only' => True, "type" => "int", "subtype" => "unset", "choices" => "unset", "null" => False, "pk" => False, "protected" => True, "private" => False, "alias" => "agentId", "public" => False, "dba_mapping" => False]; + $dict['status'] = ['read_only' => True, "type" => "int", "subtype" => "unset", "choices" => "unset", "null" => False, "pk" => False, "protected" => True, "private" => False, "alias" => "status", "public" => False, "dba_mapping" => False]; + $dict['cracked'] = ['read_only' => True, "type" => "int", "subtype" => "unset", "choices" => "unset", "null" => False, "pk" => False, "protected" => True, "private" => False, "alias" => "cracked", "public" => False, "dba_mapping" => False]; + $dict['numGpus'] = ['read_only' => True, "type" => "int", "subtype" => "unset", "choices" => "unset", "null" => False, "pk" => False, "protected" => True, "private" => False, "alias" => "numGpus", "public" => False, "dba_mapping" => False]; + $dict['start'] = ['read_only' => True, "type" => "int64", "subtype" => "unset", "choices" => "unset", "null" => False, "pk" => False, "protected" => True, "private" => False, "alias" => "start", "public" => False, "dba_mapping" => False]; + $dict['end'] = ['read_only' => True, "type" => "int64", "subtype" => "unset", "choices" => "unset", "null" => False, "pk" => False, "protected" => True, "private" => False, "alias" => "end", "public" => False, "dba_mapping" => True]; + $dict['errors'] = ['read_only' => True, "type" => "str(65535)", "subtype" => "unset", "choices" => "unset", "null" => False, "pk" => False, "protected" => True, "private" => False, "alias" => "errors", "public" => False, "dba_mapping" => False]; return $dict; } diff --git a/src/dba/models/HealthCheckAgentFactory.class.php b/src/dba/models/HealthCheckAgentFactory.class.php index f7fd56465..d447f429d 100644 --- a/src/dba/models/HealthCheckAgentFactory.class.php +++ b/src/dba/models/HealthCheckAgentFactory.class.php @@ -10,6 +10,10 @@ function getModelName(): string { function getModelTable(): string { return "HealthCheckAgent"; } + + function isMapping(): bool { + return False; + } function isCachable(): bool { return false; @@ -40,7 +44,7 @@ function createObjectFromDict($pk, $dict): HealthCheckAgent { * @param bool $single * @return HealthCheckAgent|HealthCheckAgent[] */ - function filter($options, $single = false) { + function filter(array $options, bool $single = false) { $join = false; if (array_key_exists('join', $options)) { $join = true; diff --git a/src/dba/models/HealthCheckFactory.class.php b/src/dba/models/HealthCheckFactory.class.php index 2921257f7..1615f4278 100644 --- a/src/dba/models/HealthCheckFactory.class.php +++ b/src/dba/models/HealthCheckFactory.class.php @@ -10,6 +10,10 @@ function getModelName(): string { function getModelTable(): string { return "HealthCheck"; } + + function isMapping(): bool { + return False; + } function isCachable(): bool { return false; @@ -40,7 +44,7 @@ function createObjectFromDict($pk, $dict): HealthCheck { * @param bool $single * @return HealthCheck|HealthCheck[] */ - function filter($options, $single = false) { + function filter(array $options, bool $single = false) { $join = false; if (array_key_exists('join', $options)) { $join = true; diff --git a/src/dba/models/LogEntry.class.php b/src/dba/models/LogEntry.class.php index 9e3c1ca5b..e2d85f078 100644 --- a/src/dba/models/LogEntry.class.php +++ b/src/dba/models/LogEntry.class.php @@ -33,12 +33,12 @@ function getKeyValueDict(): array { static function getFeatures(): array { $dict = array(); - $dict['logEntryId'] = ['read_only' => True, "type" => "int", "subtype" => "unset", "choices" => "unset", "null" => False, "pk" => True, "protected" => True, "private" => False, "alias" => "logEntryId", "public" => False]; - $dict['issuer'] = ['read_only' => True, "type" => "str(50)", "subtype" => "unset", "choices" => "unset", "null" => False, "pk" => False, "protected" => True, "private" => False, "alias" => "issuer", "public" => False]; - $dict['issuerId'] = ['read_only' => True, "type" => "str(50)", "subtype" => "unset", "choices" => "unset", "null" => False, "pk" => False, "protected" => True, "private" => False, "alias" => "issuerId", "public" => False]; - $dict['level'] = ['read_only' => True, "type" => "str(50)", "subtype" => "unset", "choices" => "unset", "null" => False, "pk" => False, "protected" => True, "private" => False, "alias" => "level", "public" => False]; - $dict['message'] = ['read_only' => True, "type" => "str(65535)", "subtype" => "unset", "choices" => "unset", "null" => False, "pk" => False, "protected" => True, "private" => False, "alias" => "message", "public" => False]; - $dict['time'] = ['read_only' => True, "type" => "int64", "subtype" => "unset", "choices" => "unset", "null" => False, "pk" => False, "protected" => True, "private" => False, "alias" => "time", "public" => False]; + $dict['logEntryId'] = ['read_only' => True, "type" => "int", "subtype" => "unset", "choices" => "unset", "null" => False, "pk" => True, "protected" => True, "private" => False, "alias" => "logEntryId", "public" => False, "dba_mapping" => False]; + $dict['issuer'] = ['read_only' => True, "type" => "str(50)", "subtype" => "unset", "choices" => "unset", "null" => False, "pk" => False, "protected" => True, "private" => False, "alias" => "issuer", "public" => False, "dba_mapping" => False]; + $dict['issuerId'] = ['read_only' => True, "type" => "str(50)", "subtype" => "unset", "choices" => "unset", "null" => False, "pk" => False, "protected" => True, "private" => False, "alias" => "issuerId", "public" => False, "dba_mapping" => False]; + $dict['level'] = ['read_only' => True, "type" => "str(50)", "subtype" => "unset", "choices" => "unset", "null" => False, "pk" => False, "protected" => True, "private" => False, "alias" => "level", "public" => False, "dba_mapping" => False]; + $dict['message'] = ['read_only' => True, "type" => "str(65535)", "subtype" => "unset", "choices" => "unset", "null" => False, "pk" => False, "protected" => True, "private" => False, "alias" => "message", "public" => False, "dba_mapping" => False]; + $dict['time'] = ['read_only' => True, "type" => "int64", "subtype" => "unset", "choices" => "unset", "null" => False, "pk" => False, "protected" => True, "private" => False, "alias" => "time", "public" => False, "dba_mapping" => False]; return $dict; } diff --git a/src/dba/models/LogEntryFactory.class.php b/src/dba/models/LogEntryFactory.class.php index d63898c05..abfdb6976 100644 --- a/src/dba/models/LogEntryFactory.class.php +++ b/src/dba/models/LogEntryFactory.class.php @@ -10,6 +10,10 @@ function getModelName(): string { function getModelTable(): string { return "LogEntry"; } + + function isMapping(): bool { + return False; + } function isCachable(): bool { return false; @@ -40,7 +44,7 @@ function createObjectFromDict($pk, $dict): LogEntry { * @param bool $single * @return LogEntry|LogEntry[] */ - function filter($options, $single = false) { + function filter(array $options, bool $single = false) { $join = false; if (array_key_exists('join', $options)) { $join = true; diff --git a/src/dba/models/NotificationSetting.class.php b/src/dba/models/NotificationSetting.class.php index 527728b5a..f8c37b4e7 100644 --- a/src/dba/models/NotificationSetting.class.php +++ b/src/dba/models/NotificationSetting.class.php @@ -36,13 +36,13 @@ function getKeyValueDict(): array { static function getFeatures(): array { $dict = array(); - $dict['notificationSettingId'] = ['read_only' => True, "type" => "int", "subtype" => "unset", "choices" => "unset", "null" => False, "pk" => True, "protected" => True, "private" => False, "alias" => "notificationSettingId", "public" => False]; - $dict['action'] = ['read_only' => False, "type" => "str(50)", "subtype" => "unset", "choices" => "unset", "null" => False, "pk" => False, "protected" => False, "private" => False, "alias" => "action", "public" => False]; - $dict['objectId'] = ['read_only' => True, "type" => "int", "subtype" => "unset", "choices" => "unset", "null" => False, "pk" => False, "protected" => True, "private" => False, "alias" => "objectId", "public" => False]; - $dict['notification'] = ['read_only' => False, "type" => "str(50)", "subtype" => "unset", "choices" => "unset", "null" => False, "pk" => False, "protected" => False, "private" => False, "alias" => "notification", "public" => False]; - $dict['userId'] = ['read_only' => True, "type" => "int", "subtype" => "unset", "choices" => "unset", "null" => False, "pk" => False, "protected" => True, "private" => False, "alias" => "userId", "public" => False]; - $dict['receiver'] = ['read_only' => False, "type" => "str(256)", "subtype" => "unset", "choices" => "unset", "null" => False, "pk" => False, "protected" => False, "private" => False, "alias" => "receiver", "public" => False]; - $dict['isActive'] = ['read_only' => False, "type" => "bool", "subtype" => "unset", "choices" => "unset", "null" => False, "pk" => False, "protected" => False, "private" => False, "alias" => "isActive", "public" => False]; + $dict['notificationSettingId'] = ['read_only' => True, "type" => "int", "subtype" => "unset", "choices" => "unset", "null" => False, "pk" => True, "protected" => True, "private" => False, "alias" => "notificationSettingId", "public" => False, "dba_mapping" => False]; + $dict['action'] = ['read_only' => False, "type" => "str(50)", "subtype" => "unset", "choices" => "unset", "null" => False, "pk" => False, "protected" => False, "private" => False, "alias" => "action", "public" => False, "dba_mapping" => False]; + $dict['objectId'] = ['read_only' => True, "type" => "int", "subtype" => "unset", "choices" => "unset", "null" => False, "pk" => False, "protected" => True, "private" => False, "alias" => "objectId", "public" => False, "dba_mapping" => False]; + $dict['notification'] = ['read_only' => False, "type" => "str(50)", "subtype" => "unset", "choices" => "unset", "null" => False, "pk" => False, "protected" => False, "private" => False, "alias" => "notification", "public" => False, "dba_mapping" => False]; + $dict['userId'] = ['read_only' => True, "type" => "int", "subtype" => "unset", "choices" => "unset", "null" => False, "pk" => False, "protected" => True, "private" => False, "alias" => "userId", "public" => False, "dba_mapping" => False]; + $dict['receiver'] = ['read_only' => False, "type" => "str(256)", "subtype" => "unset", "choices" => "unset", "null" => False, "pk" => False, "protected" => False, "private" => False, "alias" => "receiver", "public" => False, "dba_mapping" => False]; + $dict['isActive'] = ['read_only' => False, "type" => "bool", "subtype" => "unset", "choices" => "unset", "null" => False, "pk" => False, "protected" => False, "private" => False, "alias" => "isActive", "public" => False, "dba_mapping" => False]; return $dict; } diff --git a/src/dba/models/NotificationSettingFactory.class.php b/src/dba/models/NotificationSettingFactory.class.php index acf982ced..d77a8a374 100644 --- a/src/dba/models/NotificationSettingFactory.class.php +++ b/src/dba/models/NotificationSettingFactory.class.php @@ -10,6 +10,10 @@ function getModelName(): string { function getModelTable(): string { return "NotificationSetting"; } + + function isMapping(): bool { + return False; + } function isCachable(): bool { return false; @@ -40,7 +44,7 @@ function createObjectFromDict($pk, $dict): NotificationSetting { * @param bool $single * @return NotificationSetting|NotificationSetting[] */ - function filter($options, $single = false) { + function filter(array $options, bool $single = false) { $join = false; if (array_key_exists('join', $options)) { $join = true; diff --git a/src/dba/models/Preprocessor.class.php b/src/dba/models/Preprocessor.class.php index d690a8154..6a92cfbc8 100644 --- a/src/dba/models/Preprocessor.class.php +++ b/src/dba/models/Preprocessor.class.php @@ -36,13 +36,13 @@ function getKeyValueDict(): array { static function getFeatures(): array { $dict = array(); - $dict['preprocessorId'] = ['read_only' => True, "type" => "int", "subtype" => "unset", "choices" => "unset", "null" => False, "pk" => True, "protected" => True, "private" => False, "alias" => "preprocessorId", "public" => False]; - $dict['name'] = ['read_only' => False, "type" => "str(256)", "subtype" => "unset", "choices" => "unset", "null" => False, "pk" => False, "protected" => False, "private" => False, "alias" => "name", "public" => False]; - $dict['url'] = ['read_only' => False, "type" => "str(512)", "subtype" => "unset", "choices" => "unset", "null" => False, "pk" => False, "protected" => False, "private" => False, "alias" => "url", "public" => False]; - $dict['binaryName'] = ['read_only' => False, "type" => "str(256)", "subtype" => "unset", "choices" => "unset", "null" => False, "pk" => False, "protected" => False, "private" => False, "alias" => "binaryName", "public" => False]; - $dict['keyspaceCommand'] = ['read_only' => False, "type" => "str(256)", "subtype" => "unset", "choices" => "unset", "null" => False, "pk" => False, "protected" => False, "private" => False, "alias" => "keyspaceCommand", "public" => False]; - $dict['skipCommand'] = ['read_only' => False, "type" => "str(256)", "subtype" => "unset", "choices" => "unset", "null" => False, "pk" => False, "protected" => False, "private" => False, "alias" => "skipCommand", "public" => False]; - $dict['limitCommand'] = ['read_only' => False, "type" => "str(256)", "subtype" => "unset", "choices" => "unset", "null" => False, "pk" => False, "protected" => False, "private" => False, "alias" => "limitCommand", "public" => False]; + $dict['preprocessorId'] = ['read_only' => True, "type" => "int", "subtype" => "unset", "choices" => "unset", "null" => False, "pk" => True, "protected" => True, "private" => False, "alias" => "preprocessorId", "public" => False, "dba_mapping" => False]; + $dict['name'] = ['read_only' => False, "type" => "str(256)", "subtype" => "unset", "choices" => "unset", "null" => False, "pk" => False, "protected" => False, "private" => False, "alias" => "name", "public" => False, "dba_mapping" => False]; + $dict['url'] = ['read_only' => False, "type" => "str(512)", "subtype" => "unset", "choices" => "unset", "null" => False, "pk" => False, "protected" => False, "private" => False, "alias" => "url", "public" => False, "dba_mapping" => False]; + $dict['binaryName'] = ['read_only' => False, "type" => "str(256)", "subtype" => "unset", "choices" => "unset", "null" => False, "pk" => False, "protected" => False, "private" => False, "alias" => "binaryName", "public" => False, "dba_mapping" => False]; + $dict['keyspaceCommand'] = ['read_only' => False, "type" => "str(256)", "subtype" => "unset", "choices" => "unset", "null" => False, "pk" => False, "protected" => False, "private" => False, "alias" => "keyspaceCommand", "public" => False, "dba_mapping" => False]; + $dict['skipCommand'] = ['read_only' => False, "type" => "str(256)", "subtype" => "unset", "choices" => "unset", "null" => False, "pk" => False, "protected" => False, "private" => False, "alias" => "skipCommand", "public" => False, "dba_mapping" => False]; + $dict['limitCommand'] = ['read_only' => False, "type" => "str(256)", "subtype" => "unset", "choices" => "unset", "null" => False, "pk" => False, "protected" => False, "private" => False, "alias" => "limitCommand", "public" => False, "dba_mapping" => False]; return $dict; } diff --git a/src/dba/models/PreprocessorFactory.class.php b/src/dba/models/PreprocessorFactory.class.php index 9897181d8..1b22bbef3 100644 --- a/src/dba/models/PreprocessorFactory.class.php +++ b/src/dba/models/PreprocessorFactory.class.php @@ -10,6 +10,10 @@ function getModelName(): string { function getModelTable(): string { return "Preprocessor"; } + + function isMapping(): bool { + return False; + } function isCachable(): bool { return false; @@ -40,7 +44,7 @@ function createObjectFromDict($pk, $dict): Preprocessor { * @param bool $single * @return Preprocessor|Preprocessor[] */ - function filter($options, $single = false) { + function filter(array $options, bool $single = false) { $join = false; if (array_key_exists('join', $options)) { $join = true; diff --git a/src/dba/models/Pretask.class.php b/src/dba/models/Pretask.class.php index 1e5910ae3..da6e97eb3 100644 --- a/src/dba/models/Pretask.class.php +++ b/src/dba/models/Pretask.class.php @@ -54,19 +54,19 @@ function getKeyValueDict(): array { static function getFeatures(): array { $dict = array(); - $dict['pretaskId'] = ['read_only' => True, "type" => "int", "subtype" => "unset", "choices" => "unset", "null" => False, "pk" => True, "protected" => True, "private" => False, "alias" => "pretaskId", "public" => False]; - $dict['taskName'] = ['read_only' => False, "type" => "str(100)", "subtype" => "unset", "choices" => "unset", "null" => False, "pk" => False, "protected" => False, "private" => False, "alias" => "taskName", "public" => False]; - $dict['attackCmd'] = ['read_only' => False, "type" => "str(65535)", "subtype" => "unset", "choices" => "unset", "null" => False, "pk" => False, "protected" => False, "private" => False, "alias" => "attackCmd", "public" => False]; - $dict['chunkTime'] = ['read_only' => False, "type" => "int", "subtype" => "unset", "choices" => "unset", "null" => False, "pk" => False, "protected" => False, "private" => False, "alias" => "chunkTime", "public" => False]; - $dict['statusTimer'] = ['read_only' => False, "type" => "int", "subtype" => "unset", "choices" => "unset", "null" => False, "pk" => False, "protected" => False, "private" => False, "alias" => "statusTimer", "public" => False]; - $dict['color'] = ['read_only' => False, "type" => "str(20)", "subtype" => "unset", "choices" => "unset", "null" => False, "pk" => False, "protected" => False, "private" => False, "alias" => "color", "public" => False]; - $dict['isSmall'] = ['read_only' => False, "type" => "bool", "subtype" => "unset", "choices" => "unset", "null" => False, "pk" => False, "protected" => False, "private" => False, "alias" => "isSmall", "public" => False]; - $dict['isCpuTask'] = ['read_only' => False, "type" => "bool", "subtype" => "unset", "choices" => "unset", "null" => False, "pk" => False, "protected" => False, "private" => False, "alias" => "isCpuTask", "public" => False]; - $dict['useNewBench'] = ['read_only' => True, "type" => "bool", "subtype" => "unset", "choices" => "unset", "null" => False, "pk" => False, "protected" => False, "private" => False, "alias" => "useNewBench", "public" => False]; - $dict['priority'] = ['read_only' => False, "type" => "int", "subtype" => "unset", "choices" => "unset", "null" => False, "pk" => False, "protected" => False, "private" => False, "alias" => "priority", "public" => False]; - $dict['maxAgents'] = ['read_only' => False, "type" => "int", "subtype" => "unset", "choices" => "unset", "null" => False, "pk" => False, "protected" => False, "private" => False, "alias" => "maxAgents", "public" => False]; - $dict['isMaskImport'] = ['read_only' => False, "type" => "bool", "subtype" => "unset", "choices" => "unset", "null" => False, "pk" => False, "protected" => False, "private" => False, "alias" => "isMaskImport", "public" => False]; - $dict['crackerBinaryTypeId'] = ['read_only' => False, "type" => "int", "subtype" => "unset", "choices" => "unset", "null" => False, "pk" => False, "protected" => False, "private" => False, "alias" => "crackerBinaryTypeId", "public" => False]; + $dict['pretaskId'] = ['read_only' => True, "type" => "int", "subtype" => "unset", "choices" => "unset", "null" => False, "pk" => True, "protected" => True, "private" => False, "alias" => "pretaskId", "public" => False, "dba_mapping" => False]; + $dict['taskName'] = ['read_only' => False, "type" => "str(100)", "subtype" => "unset", "choices" => "unset", "null" => False, "pk" => False, "protected" => False, "private" => False, "alias" => "taskName", "public" => False, "dba_mapping" => False]; + $dict['attackCmd'] = ['read_only' => False, "type" => "str(65535)", "subtype" => "unset", "choices" => "unset", "null" => False, "pk" => False, "protected" => False, "private" => False, "alias" => "attackCmd", "public" => False, "dba_mapping" => False]; + $dict['chunkTime'] = ['read_only' => False, "type" => "int", "subtype" => "unset", "choices" => "unset", "null" => False, "pk" => False, "protected" => False, "private" => False, "alias" => "chunkTime", "public" => False, "dba_mapping" => False]; + $dict['statusTimer'] = ['read_only' => False, "type" => "int", "subtype" => "unset", "choices" => "unset", "null" => False, "pk" => False, "protected" => False, "private" => False, "alias" => "statusTimer", "public" => False, "dba_mapping" => False]; + $dict['color'] = ['read_only' => False, "type" => "str(20)", "subtype" => "unset", "choices" => "unset", "null" => False, "pk" => False, "protected" => False, "private" => False, "alias" => "color", "public" => False, "dba_mapping" => False]; + $dict['isSmall'] = ['read_only' => False, "type" => "bool", "subtype" => "unset", "choices" => "unset", "null" => False, "pk" => False, "protected" => False, "private" => False, "alias" => "isSmall", "public" => False, "dba_mapping" => False]; + $dict['isCpuTask'] = ['read_only' => False, "type" => "bool", "subtype" => "unset", "choices" => "unset", "null" => False, "pk" => False, "protected" => False, "private" => False, "alias" => "isCpuTask", "public" => False, "dba_mapping" => False]; + $dict['useNewBench'] = ['read_only' => True, "type" => "bool", "subtype" => "unset", "choices" => "unset", "null" => False, "pk" => False, "protected" => False, "private" => False, "alias" => "useNewBench", "public" => False, "dba_mapping" => False]; + $dict['priority'] = ['read_only' => False, "type" => "int", "subtype" => "unset", "choices" => "unset", "null" => False, "pk" => False, "protected" => False, "private" => False, "alias" => "priority", "public" => False, "dba_mapping" => False]; + $dict['maxAgents'] = ['read_only' => False, "type" => "int", "subtype" => "unset", "choices" => "unset", "null" => False, "pk" => False, "protected" => False, "private" => False, "alias" => "maxAgents", "public" => False, "dba_mapping" => False]; + $dict['isMaskImport'] = ['read_only' => False, "type" => "bool", "subtype" => "unset", "choices" => "unset", "null" => False, "pk" => False, "protected" => False, "private" => False, "alias" => "isMaskImport", "public" => False, "dba_mapping" => False]; + $dict['crackerBinaryTypeId'] = ['read_only' => False, "type" => "int", "subtype" => "unset", "choices" => "unset", "null" => False, "pk" => False, "protected" => False, "private" => False, "alias" => "crackerBinaryTypeId", "public" => False, "dba_mapping" => False]; return $dict; } diff --git a/src/dba/models/PretaskFactory.class.php b/src/dba/models/PretaskFactory.class.php index 1a39b350f..9f0028694 100644 --- a/src/dba/models/PretaskFactory.class.php +++ b/src/dba/models/PretaskFactory.class.php @@ -10,6 +10,10 @@ function getModelName(): string { function getModelTable(): string { return "Pretask"; } + + function isMapping(): bool { + return False; + } function isCachable(): bool { return false; @@ -40,7 +44,7 @@ function createObjectFromDict($pk, $dict): Pretask { * @param bool $single * @return Pretask|Pretask[] */ - function filter($options, $single = false) { + function filter(array $options, bool $single = false) { $join = false; if (array_key_exists('join', $options)) { $join = true; diff --git a/src/dba/models/RegVoucher.class.php b/src/dba/models/RegVoucher.class.php index 443a4221e..32f66d4fb 100644 --- a/src/dba/models/RegVoucher.class.php +++ b/src/dba/models/RegVoucher.class.php @@ -24,9 +24,9 @@ function getKeyValueDict(): array { static function getFeatures(): array { $dict = array(); - $dict['regVoucherId'] = ['read_only' => True, "type" => "int", "subtype" => "unset", "choices" => "unset", "null" => False, "pk" => True, "protected" => True, "private" => False, "alias" => "regVoucherId", "public" => False]; - $dict['voucher'] = ['read_only' => False, "type" => "str(100)", "subtype" => "unset", "choices" => "unset", "null" => False, "pk" => False, "protected" => False, "private" => False, "alias" => "voucher", "public" => False]; - $dict['time'] = ['read_only' => True, "type" => "int64", "subtype" => "unset", "choices" => "unset", "null" => False, "pk" => False, "protected" => True, "private" => False, "alias" => "time", "public" => False]; + $dict['regVoucherId'] = ['read_only' => True, "type" => "int", "subtype" => "unset", "choices" => "unset", "null" => False, "pk" => True, "protected" => True, "private" => False, "alias" => "regVoucherId", "public" => False, "dba_mapping" => False]; + $dict['voucher'] = ['read_only' => False, "type" => "str(100)", "subtype" => "unset", "choices" => "unset", "null" => False, "pk" => False, "protected" => False, "private" => False, "alias" => "voucher", "public" => False, "dba_mapping" => False]; + $dict['time'] = ['read_only' => True, "type" => "int64", "subtype" => "unset", "choices" => "unset", "null" => False, "pk" => False, "protected" => True, "private" => False, "alias" => "time", "public" => False, "dba_mapping" => False]; return $dict; } diff --git a/src/dba/models/RegVoucherFactory.class.php b/src/dba/models/RegVoucherFactory.class.php index 47a517a08..dc0279df4 100644 --- a/src/dba/models/RegVoucherFactory.class.php +++ b/src/dba/models/RegVoucherFactory.class.php @@ -10,6 +10,10 @@ function getModelName(): string { function getModelTable(): string { return "RegVoucher"; } + + function isMapping(): bool { + return False; + } function isCachable(): bool { return false; @@ -40,7 +44,7 @@ function createObjectFromDict($pk, $dict): RegVoucher { * @param bool $single * @return RegVoucher|RegVoucher[] */ - function filter($options, $single = false) { + function filter(array $options, bool $single = false) { $join = false; if (array_key_exists('join', $options)) { $join = true; diff --git a/src/dba/models/RightGroup.class.php b/src/dba/models/RightGroup.class.php index ef0af1c51..7dfb03647 100644 --- a/src/dba/models/RightGroup.class.php +++ b/src/dba/models/RightGroup.class.php @@ -24,9 +24,9 @@ function getKeyValueDict(): array { static function getFeatures(): array { $dict = array(); - $dict['rightGroupId'] = ['read_only' => True, "type" => "int", "subtype" => "unset", "choices" => "unset", "null" => False, "pk" => True, "protected" => True, "private" => False, "alias" => "rightGroupId", "public" => False]; - $dict['groupName'] = ['read_only' => False, "type" => "str(50)", "subtype" => "unset", "choices" => "unset", "null" => False, "pk" => False, "protected" => False, "private" => False, "alias" => "name", "public" => False]; - $dict['permissions'] = ['read_only' => False, "type" => "dict", "subtype" => "bool", "choices" => "unset", "null" => True, "pk" => False, "protected" => False, "private" => False, "alias" => "permissions", "public" => False]; + $dict['rightGroupId'] = ['read_only' => True, "type" => "int", "subtype" => "unset", "choices" => "unset", "null" => False, "pk" => True, "protected" => True, "private" => False, "alias" => "id", "public" => False, "dba_mapping" => False]; + $dict['groupName'] = ['read_only' => False, "type" => "str(50)", "subtype" => "unset", "choices" => "unset", "null" => False, "pk" => False, "protected" => False, "private" => False, "alias" => "name", "public" => False, "dba_mapping" => False]; + $dict['permissions'] = ['read_only' => False, "type" => "dict", "subtype" => "bool", "choices" => "unset", "null" => True, "pk" => False, "protected" => False, "private" => False, "alias" => "permissions", "public" => False, "dba_mapping" => False]; return $dict; } diff --git a/src/dba/models/RightGroupFactory.class.php b/src/dba/models/RightGroupFactory.class.php index b0b93dd3a..8b1de4539 100644 --- a/src/dba/models/RightGroupFactory.class.php +++ b/src/dba/models/RightGroupFactory.class.php @@ -10,6 +10,10 @@ function getModelName(): string { function getModelTable(): string { return "RightGroup"; } + + function isMapping(): bool { + return False; + } function isCachable(): bool { return false; @@ -40,7 +44,7 @@ function createObjectFromDict($pk, $dict): RightGroup { * @param bool $single * @return RightGroup|RightGroup[] */ - function filter($options, $single = false) { + function filter(array $options, bool $single = false) { $join = false; if (array_key_exists('join', $options)) { $join = true; diff --git a/src/dba/models/Session.class.php b/src/dba/models/Session.class.php index 374a93b51..56f47b795 100644 --- a/src/dba/models/Session.class.php +++ b/src/dba/models/Session.class.php @@ -36,13 +36,13 @@ function getKeyValueDict(): array { static function getFeatures(): array { $dict = array(); - $dict['sessionId'] = ['read_only' => True, "type" => "int", "subtype" => "unset", "choices" => "unset", "null" => False, "pk" => True, "protected" => True, "private" => False, "alias" => "sessionId", "public" => False]; - $dict['userId'] = ['read_only' => True, "type" => "int", "subtype" => "unset", "choices" => "unset", "null" => False, "pk" => False, "protected" => True, "private" => False, "alias" => "userId", "public" => False]; - $dict['sessionStartDate'] = ['read_only' => True, "type" => "int64", "subtype" => "unset", "choices" => "unset", "null" => False, "pk" => False, "protected" => True, "private" => False, "alias" => "sessionStartDate", "public" => False]; - $dict['lastActionDate'] = ['read_only' => True, "type" => "int64", "subtype" => "unset", "choices" => "unset", "null" => False, "pk" => False, "protected" => True, "private" => False, "alias" => "lastActionDate", "public" => False]; - $dict['isOpen'] = ['read_only' => True, "type" => "bool", "subtype" => "unset", "choices" => "unset", "null" => False, "pk" => False, "protected" => True, "private" => False, "alias" => "isOpen", "public" => False]; - $dict['sessionLifetime'] = ['read_only' => True, "type" => "int", "subtype" => "unset", "choices" => "unset", "null" => False, "pk" => False, "protected" => True, "private" => False, "alias" => "sessionLifetime", "public" => False]; - $dict['sessionKey'] = ['read_only' => True, "type" => "str(256)", "subtype" => "unset", "choices" => "unset", "null" => False, "pk" => False, "protected" => True, "private" => False, "alias" => "sessionKey", "public" => False]; + $dict['sessionId'] = ['read_only' => True, "type" => "int", "subtype" => "unset", "choices" => "unset", "null" => False, "pk" => True, "protected" => True, "private" => False, "alias" => "sessionId", "public" => False, "dba_mapping" => False]; + $dict['userId'] = ['read_only' => True, "type" => "int", "subtype" => "unset", "choices" => "unset", "null" => False, "pk" => False, "protected" => True, "private" => False, "alias" => "userId", "public" => False, "dba_mapping" => False]; + $dict['sessionStartDate'] = ['read_only' => True, "type" => "int64", "subtype" => "unset", "choices" => "unset", "null" => False, "pk" => False, "protected" => True, "private" => False, "alias" => "sessionStartDate", "public" => False, "dba_mapping" => False]; + $dict['lastActionDate'] = ['read_only' => True, "type" => "int64", "subtype" => "unset", "choices" => "unset", "null" => False, "pk" => False, "protected" => True, "private" => False, "alias" => "lastActionDate", "public" => False, "dba_mapping" => False]; + $dict['isOpen'] = ['read_only' => True, "type" => "bool", "subtype" => "unset", "choices" => "unset", "null" => False, "pk" => False, "protected" => True, "private" => False, "alias" => "isOpen", "public" => False, "dba_mapping" => False]; + $dict['sessionLifetime'] = ['read_only' => True, "type" => "int", "subtype" => "unset", "choices" => "unset", "null" => False, "pk" => False, "protected" => True, "private" => False, "alias" => "sessionLifetime", "public" => False, "dba_mapping" => False]; + $dict['sessionKey'] = ['read_only' => True, "type" => "str(256)", "subtype" => "unset", "choices" => "unset", "null" => False, "pk" => False, "protected" => True, "private" => False, "alias" => "sessionKey", "public" => False, "dba_mapping" => False]; return $dict; } diff --git a/src/dba/models/SessionFactory.class.php b/src/dba/models/SessionFactory.class.php index fc20c5c9c..6ab2cf470 100644 --- a/src/dba/models/SessionFactory.class.php +++ b/src/dba/models/SessionFactory.class.php @@ -10,6 +10,10 @@ function getModelName(): string { function getModelTable(): string { return "Session"; } + + function isMapping(): bool { + return False; + } function isCachable(): bool { return false; @@ -40,7 +44,7 @@ function createObjectFromDict($pk, $dict): Session { * @param bool $single * @return Session|Session[] */ - function filter($options, $single = false) { + function filter(array $options, bool $single = false) { $join = false; if (array_key_exists('join', $options)) { $join = true; diff --git a/src/dba/models/Speed.class.php b/src/dba/models/Speed.class.php index b937f6a8d..08c6dd2eb 100644 --- a/src/dba/models/Speed.class.php +++ b/src/dba/models/Speed.class.php @@ -30,11 +30,11 @@ function getKeyValueDict(): array { static function getFeatures(): array { $dict = array(); - $dict['speedId'] = ['read_only' => True, "type" => "int", "subtype" => "unset", "choices" => "unset", "null" => False, "pk" => True, "protected" => True, "private" => False, "alias" => "speedId", "public" => False]; - $dict['agentId'] = ['read_only' => True, "type" => "int", "subtype" => "unset", "choices" => "unset", "null" => False, "pk" => False, "protected" => True, "private" => False, "alias" => "agentId", "public" => False]; - $dict['taskId'] = ['read_only' => True, "type" => "int", "subtype" => "unset", "choices" => "unset", "null" => False, "pk" => False, "protected" => True, "private" => False, "alias" => "taskId", "public" => False]; - $dict['speed'] = ['read_only' => True, "type" => "int64", "subtype" => "unset", "choices" => "unset", "null" => False, "pk" => False, "protected" => True, "private" => False, "alias" => "speed", "public" => False]; - $dict['time'] = ['read_only' => True, "type" => "int64", "subtype" => "unset", "choices" => "unset", "null" => False, "pk" => False, "protected" => True, "private" => False, "alias" => "time", "public" => False]; + $dict['speedId'] = ['read_only' => True, "type" => "int", "subtype" => "unset", "choices" => "unset", "null" => False, "pk" => True, "protected" => True, "private" => False, "alias" => "speedId", "public" => False, "dba_mapping" => False]; + $dict['agentId'] = ['read_only' => True, "type" => "int", "subtype" => "unset", "choices" => "unset", "null" => False, "pk" => False, "protected" => True, "private" => False, "alias" => "agentId", "public" => False, "dba_mapping" => False]; + $dict['taskId'] = ['read_only' => True, "type" => "int", "subtype" => "unset", "choices" => "unset", "null" => False, "pk" => False, "protected" => True, "private" => False, "alias" => "taskId", "public" => False, "dba_mapping" => False]; + $dict['speed'] = ['read_only' => True, "type" => "int64", "subtype" => "unset", "choices" => "unset", "null" => False, "pk" => False, "protected" => True, "private" => False, "alias" => "speed", "public" => False, "dba_mapping" => False]; + $dict['time'] = ['read_only' => True, "type" => "int64", "subtype" => "unset", "choices" => "unset", "null" => False, "pk" => False, "protected" => True, "private" => False, "alias" => "time", "public" => False, "dba_mapping" => False]; return $dict; } diff --git a/src/dba/models/SpeedFactory.class.php b/src/dba/models/SpeedFactory.class.php index 7ecada0f2..df1314dd8 100644 --- a/src/dba/models/SpeedFactory.class.php +++ b/src/dba/models/SpeedFactory.class.php @@ -10,6 +10,10 @@ function getModelName(): string { function getModelTable(): string { return "Speed"; } + + function isMapping(): bool { + return False; + } function isCachable(): bool { return false; @@ -40,7 +44,7 @@ function createObjectFromDict($pk, $dict): Speed { * @param bool $single * @return Speed|Speed[] */ - function filter($options, $single = false) { + function filter(array $options, bool $single = false) { $join = false; if (array_key_exists('join', $options)) { $join = true; diff --git a/src/dba/models/StoredValue.class.php b/src/dba/models/StoredValue.class.php index 83afa4647..df59954bf 100644 --- a/src/dba/models/StoredValue.class.php +++ b/src/dba/models/StoredValue.class.php @@ -21,8 +21,8 @@ function getKeyValueDict(): array { static function getFeatures(): array { $dict = array(); - $dict['storedValueId'] = ['read_only' => True, "type" => "str(50)", "subtype" => "unset", "choices" => "unset", "null" => False, "pk" => True, "protected" => True, "private" => False, "alias" => "storedValueId", "public" => False]; - $dict['val'] = ['read_only' => False, "type" => "str(256)", "subtype" => "unset", "choices" => "unset", "null" => False, "pk" => False, "protected" => False, "private" => False, "alias" => "val", "public" => False]; + $dict['storedValueId'] = ['read_only' => True, "type" => "str(50)", "subtype" => "unset", "choices" => "unset", "null" => False, "pk" => True, "protected" => True, "private" => False, "alias" => "storedValueId", "public" => False, "dba_mapping" => False]; + $dict['val'] = ['read_only' => False, "type" => "str(256)", "subtype" => "unset", "choices" => "unset", "null" => False, "pk" => False, "protected" => False, "private" => False, "alias" => "val", "public" => False, "dba_mapping" => False]; return $dict; } diff --git a/src/dba/models/StoredValueFactory.class.php b/src/dba/models/StoredValueFactory.class.php index 4aab838a3..85e2a06ef 100644 --- a/src/dba/models/StoredValueFactory.class.php +++ b/src/dba/models/StoredValueFactory.class.php @@ -10,6 +10,10 @@ function getModelName(): string { function getModelTable(): string { return "StoredValue"; } + + function isMapping(): bool { + return False; + } function isCachable(): bool { return false; @@ -40,7 +44,7 @@ function createObjectFromDict($pk, $dict): StoredValue { * @param bool $single * @return StoredValue|StoredValue[] */ - function filter($options, $single = false) { + function filter(array $options, bool $single = false) { $join = false; if (array_key_exists('join', $options)) { $join = true; diff --git a/src/dba/models/Supertask.class.php b/src/dba/models/Supertask.class.php index 072f1c2dc..2ad17c241 100644 --- a/src/dba/models/Supertask.class.php +++ b/src/dba/models/Supertask.class.php @@ -21,8 +21,8 @@ function getKeyValueDict(): array { static function getFeatures(): array { $dict = array(); - $dict['supertaskId'] = ['read_only' => True, "type" => "int", "subtype" => "unset", "choices" => "unset", "null" => False, "pk" => True, "protected" => True, "private" => False, "alias" => "supertaskId", "public" => False]; - $dict['supertaskName'] = ['read_only' => False, "type" => "str(50)", "subtype" => "unset", "choices" => "unset", "null" => False, "pk" => False, "protected" => False, "private" => False, "alias" => "supertaskName", "public" => False]; + $dict['supertaskId'] = ['read_only' => True, "type" => "int", "subtype" => "unset", "choices" => "unset", "null" => False, "pk" => True, "protected" => True, "private" => False, "alias" => "supertaskId", "public" => False, "dba_mapping" => False]; + $dict['supertaskName'] = ['read_only' => False, "type" => "str(50)", "subtype" => "unset", "choices" => "unset", "null" => False, "pk" => False, "protected" => False, "private" => False, "alias" => "supertaskName", "public" => False, "dba_mapping" => False]; return $dict; } diff --git a/src/dba/models/SupertaskFactory.class.php b/src/dba/models/SupertaskFactory.class.php index d95b26026..e287257d8 100644 --- a/src/dba/models/SupertaskFactory.class.php +++ b/src/dba/models/SupertaskFactory.class.php @@ -10,6 +10,10 @@ function getModelName(): string { function getModelTable(): string { return "Supertask"; } + + function isMapping(): bool { + return False; + } function isCachable(): bool { return false; @@ -40,7 +44,7 @@ function createObjectFromDict($pk, $dict): Supertask { * @param bool $single * @return Supertask|Supertask[] */ - function filter($options, $single = false) { + function filter(array $options, bool $single = false) { $join = false; if (array_key_exists('join', $options)) { $join = true; diff --git a/src/dba/models/SupertaskPretask.class.php b/src/dba/models/SupertaskPretask.class.php index 73295a792..deb8db7a0 100644 --- a/src/dba/models/SupertaskPretask.class.php +++ b/src/dba/models/SupertaskPretask.class.php @@ -24,9 +24,9 @@ function getKeyValueDict(): array { static function getFeatures(): array { $dict = array(); - $dict['supertaskPretaskId'] = ['read_only' => True, "type" => "int", "subtype" => "unset", "choices" => "unset", "null" => False, "pk" => True, "protected" => True, "private" => False, "alias" => "supertaskPretaskId", "public" => False]; - $dict['supertaskId'] = ['read_only' => True, "type" => "int", "subtype" => "unset", "choices" => "unset", "null" => False, "pk" => False, "protected" => False, "private" => False, "alias" => "supertaskId", "public" => False]; - $dict['pretaskId'] = ['read_only' => True, "type" => "int", "subtype" => "unset", "choices" => "unset", "null" => False, "pk" => False, "protected" => False, "private" => False, "alias" => "pretaskId", "public" => False]; + $dict['supertaskPretaskId'] = ['read_only' => True, "type" => "int", "subtype" => "unset", "choices" => "unset", "null" => False, "pk" => True, "protected" => True, "private" => False, "alias" => "supertaskPretaskId", "public" => False, "dba_mapping" => False]; + $dict['supertaskId'] = ['read_only' => True, "type" => "int", "subtype" => "unset", "choices" => "unset", "null" => False, "pk" => False, "protected" => False, "private" => False, "alias" => "supertaskId", "public" => False, "dba_mapping" => False]; + $dict['pretaskId'] = ['read_only' => True, "type" => "int", "subtype" => "unset", "choices" => "unset", "null" => False, "pk" => False, "protected" => False, "private" => False, "alias" => "pretaskId", "public" => False, "dba_mapping" => False]; return $dict; } diff --git a/src/dba/models/SupertaskPretaskFactory.class.php b/src/dba/models/SupertaskPretaskFactory.class.php index ecda00a55..da9000576 100644 --- a/src/dba/models/SupertaskPretaskFactory.class.php +++ b/src/dba/models/SupertaskPretaskFactory.class.php @@ -10,6 +10,10 @@ function getModelName(): string { function getModelTable(): string { return "SupertaskPretask"; } + + function isMapping(): bool { + return False; + } function isCachable(): bool { return false; @@ -40,7 +44,7 @@ function createObjectFromDict($pk, $dict): SupertaskPretask { * @param bool $single * @return SupertaskPretask|SupertaskPretask[] */ - function filter($options, $single = false) { + function filter(array $options, bool $single = false) { $join = false; if (array_key_exists('join', $options)) { $join = true; diff --git a/src/dba/models/Task.class.php b/src/dba/models/Task.class.php index 9a6538502..98f356cd8 100644 --- a/src/dba/models/Task.class.php +++ b/src/dba/models/Task.class.php @@ -87,30 +87,30 @@ function getKeyValueDict(): array { static function getFeatures(): array { $dict = array(); - $dict['taskId'] = ['read_only' => True, "type" => "int", "subtype" => "unset", "choices" => "unset", "null" => False, "pk" => True, "protected" => True, "private" => False, "alias" => "taskId", "public" => False]; - $dict['taskName'] = ['read_only' => False, "type" => "str(256)", "subtype" => "unset", "choices" => "unset", "null" => False, "pk" => False, "protected" => False, "private" => False, "alias" => "taskName", "public" => False]; - $dict['attackCmd'] = ['read_only' => False, "type" => "str(65535)", "subtype" => "unset", "choices" => "unset", "null" => False, "pk" => False, "protected" => False, "private" => False, "alias" => "attackCmd", "public" => False]; - $dict['chunkTime'] = ['read_only' => False, "type" => "int", "subtype" => "unset", "choices" => "unset", "null" => False, "pk" => False, "protected" => False, "private" => False, "alias" => "chunkTime", "public" => False]; - $dict['statusTimer'] = ['read_only' => False, "type" => "int", "subtype" => "unset", "choices" => "unset", "null" => False, "pk" => False, "protected" => False, "private" => False, "alias" => "statusTimer", "public" => False]; - $dict['keyspace'] = ['read_only' => True, "type" => "int64", "subtype" => "unset", "choices" => "unset", "null" => False, "pk" => False, "protected" => True, "private" => False, "alias" => "keyspace", "public" => False]; - $dict['keyspaceProgress'] = ['read_only' => True, "type" => "int64", "subtype" => "unset", "choices" => "unset", "null" => False, "pk" => False, "protected" => True, "private" => False, "alias" => "keyspaceProgress", "public" => False]; - $dict['priority'] = ['read_only' => False, "type" => "int", "subtype" => "unset", "choices" => "unset", "null" => False, "pk" => False, "protected" => False, "private" => False, "alias" => "priority", "public" => False]; - $dict['maxAgents'] = ['read_only' => False, "type" => "int", "subtype" => "unset", "choices" => "unset", "null" => False, "pk" => False, "protected" => False, "private" => False, "alias" => "maxAgents", "public" => False]; - $dict['color'] = ['read_only' => False, "type" => "str(50)", "subtype" => "unset", "choices" => "unset", "null" => True, "pk" => False, "protected" => False, "private" => False, "alias" => "color", "public" => False]; - $dict['isSmall'] = ['read_only' => False, "type" => "bool", "subtype" => "unset", "choices" => "unset", "null" => False, "pk" => False, "protected" => False, "private" => False, "alias" => "isSmall", "public" => False]; - $dict['isCpuTask'] = ['read_only' => False, "type" => "bool", "subtype" => "unset", "choices" => "unset", "null" => False, "pk" => False, "protected" => False, "private" => False, "alias" => "isCpuTask", "public" => False]; - $dict['useNewBench'] = ['read_only' => True, "type" => "bool", "subtype" => "unset", "choices" => "unset", "null" => False, "pk" => False, "protected" => False, "private" => False, "alias" => "useNewBench", "public" => False]; - $dict['skipKeyspace'] = ['read_only' => True, "type" => "int64", "subtype" => "unset", "choices" => "unset", "null" => False, "pk" => False, "protected" => False, "private" => False, "alias" => "skipKeyspace", "public" => False]; - $dict['crackerBinaryId'] = ['read_only' => True, "type" => "int", "subtype" => "unset", "choices" => "unset", "null" => False, "pk" => False, "protected" => False, "private" => False, "alias" => "crackerBinaryId", "public" => False]; - $dict['crackerBinaryTypeId'] = ['read_only' => True, "type" => "int", "subtype" => "unset", "choices" => "unset", "null" => False, "pk" => False, "protected" => False, "private" => False, "alias" => "crackerBinaryTypeId", "public" => False]; - $dict['taskWrapperId'] = ['read_only' => True, "type" => "int", "subtype" => "unset", "choices" => "unset", "null" => False, "pk" => False, "protected" => True, "private" => False, "alias" => "taskWrapperId", "public" => False]; - $dict['isArchived'] = ['read_only' => False, "type" => "bool", "subtype" => "unset", "choices" => "unset", "null" => False, "pk" => False, "protected" => False, "private" => False, "alias" => "isArchived", "public" => False]; - $dict['notes'] = ['read_only' => False, "type" => "str(65535)", "subtype" => "unset", "choices" => "unset", "null" => False, "pk" => False, "protected" => False, "private" => False, "alias" => "notes", "public" => False]; - $dict['staticChunks'] = ['read_only' => True, "type" => "int", "subtype" => "unset", "choices" => "unset", "null" => False, "pk" => False, "protected" => False, "private" => False, "alias" => "staticChunks", "public" => False]; - $dict['chunkSize'] = ['read_only' => True, "type" => "int64", "subtype" => "unset", "choices" => "unset", "null" => False, "pk" => False, "protected" => False, "private" => False, "alias" => "chunkSize", "public" => False]; - $dict['forcePipe'] = ['read_only' => True, "type" => "bool", "subtype" => "unset", "choices" => "unset", "null" => False, "pk" => False, "protected" => False, "private" => False, "alias" => "forcePipe", "public" => False]; - $dict['usePreprocessor'] = ['read_only' => True, "type" => "int", "subtype" => "unset", "choices" => "unset", "null" => False, "pk" => False, "protected" => False, "private" => False, "alias" => "preprocessorId", "public" => False]; - $dict['preprocessorCommand'] = ['read_only' => True, "type" => "str(256)", "subtype" => "unset", "choices" => "unset", "null" => False, "pk" => False, "protected" => False, "private" => False, "alias" => "preprocessorCommand", "public" => False]; + $dict['taskId'] = ['read_only' => True, "type" => "int", "subtype" => "unset", "choices" => "unset", "null" => False, "pk" => True, "protected" => True, "private" => False, "alias" => "taskId", "public" => False, "dba_mapping" => False]; + $dict['taskName'] = ['read_only' => False, "type" => "str(256)", "subtype" => "unset", "choices" => "unset", "null" => False, "pk" => False, "protected" => False, "private" => False, "alias" => "taskName", "public" => False, "dba_mapping" => False]; + $dict['attackCmd'] = ['read_only' => False, "type" => "str(65535)", "subtype" => "unset", "choices" => "unset", "null" => False, "pk" => False, "protected" => False, "private" => False, "alias" => "attackCmd", "public" => False, "dba_mapping" => False]; + $dict['chunkTime'] = ['read_only' => False, "type" => "int", "subtype" => "unset", "choices" => "unset", "null" => False, "pk" => False, "protected" => False, "private" => False, "alias" => "chunkTime", "public" => False, "dba_mapping" => False]; + $dict['statusTimer'] = ['read_only' => False, "type" => "int", "subtype" => "unset", "choices" => "unset", "null" => False, "pk" => False, "protected" => False, "private" => False, "alias" => "statusTimer", "public" => False, "dba_mapping" => False]; + $dict['keyspace'] = ['read_only' => True, "type" => "int64", "subtype" => "unset", "choices" => "unset", "null" => False, "pk" => False, "protected" => True, "private" => False, "alias" => "keyspace", "public" => False, "dba_mapping" => False]; + $dict['keyspaceProgress'] = ['read_only' => True, "type" => "int64", "subtype" => "unset", "choices" => "unset", "null" => False, "pk" => False, "protected" => True, "private" => False, "alias" => "keyspaceProgress", "public" => False, "dba_mapping" => False]; + $dict['priority'] = ['read_only' => False, "type" => "int", "subtype" => "unset", "choices" => "unset", "null" => False, "pk" => False, "protected" => False, "private" => False, "alias" => "priority", "public" => False, "dba_mapping" => False]; + $dict['maxAgents'] = ['read_only' => False, "type" => "int", "subtype" => "unset", "choices" => "unset", "null" => False, "pk" => False, "protected" => False, "private" => False, "alias" => "maxAgents", "public" => False, "dba_mapping" => False]; + $dict['color'] = ['read_only' => False, "type" => "str(50)", "subtype" => "unset", "choices" => "unset", "null" => True, "pk" => False, "protected" => False, "private" => False, "alias" => "color", "public" => False, "dba_mapping" => False]; + $dict['isSmall'] = ['read_only' => False, "type" => "bool", "subtype" => "unset", "choices" => "unset", "null" => False, "pk" => False, "protected" => False, "private" => False, "alias" => "isSmall", "public" => False, "dba_mapping" => False]; + $dict['isCpuTask'] = ['read_only' => False, "type" => "bool", "subtype" => "unset", "choices" => "unset", "null" => False, "pk" => False, "protected" => False, "private" => False, "alias" => "isCpuTask", "public" => False, "dba_mapping" => False]; + $dict['useNewBench'] = ['read_only' => True, "type" => "bool", "subtype" => "unset", "choices" => "unset", "null" => False, "pk" => False, "protected" => False, "private" => False, "alias" => "useNewBench", "public" => False, "dba_mapping" => False]; + $dict['skipKeyspace'] = ['read_only' => True, "type" => "int64", "subtype" => "unset", "choices" => "unset", "null" => False, "pk" => False, "protected" => False, "private" => False, "alias" => "skipKeyspace", "public" => False, "dba_mapping" => False]; + $dict['crackerBinaryId'] = ['read_only' => True, "type" => "int", "subtype" => "unset", "choices" => "unset", "null" => False, "pk" => False, "protected" => False, "private" => False, "alias" => "crackerBinaryId", "public" => False, "dba_mapping" => False]; + $dict['crackerBinaryTypeId'] = ['read_only' => True, "type" => "int", "subtype" => "unset", "choices" => "unset", "null" => False, "pk" => False, "protected" => False, "private" => False, "alias" => "crackerBinaryTypeId", "public" => False, "dba_mapping" => False]; + $dict['taskWrapperId'] = ['read_only' => True, "type" => "int", "subtype" => "unset", "choices" => "unset", "null" => False, "pk" => False, "protected" => True, "private" => False, "alias" => "taskWrapperId", "public" => False, "dba_mapping" => False]; + $dict['isArchived'] = ['read_only' => False, "type" => "bool", "subtype" => "unset", "choices" => "unset", "null" => False, "pk" => False, "protected" => False, "private" => False, "alias" => "isArchived", "public" => False, "dba_mapping" => False]; + $dict['notes'] = ['read_only' => False, "type" => "str(65535)", "subtype" => "unset", "choices" => "unset", "null" => False, "pk" => False, "protected" => False, "private" => False, "alias" => "notes", "public" => False, "dba_mapping" => False]; + $dict['staticChunks'] = ['read_only' => True, "type" => "int", "subtype" => "unset", "choices" => "unset", "null" => False, "pk" => False, "protected" => False, "private" => False, "alias" => "staticChunks", "public" => False, "dba_mapping" => False]; + $dict['chunkSize'] = ['read_only' => True, "type" => "int64", "subtype" => "unset", "choices" => "unset", "null" => False, "pk" => False, "protected" => False, "private" => False, "alias" => "chunkSize", "public" => False, "dba_mapping" => False]; + $dict['forcePipe'] = ['read_only' => True, "type" => "bool", "subtype" => "unset", "choices" => "unset", "null" => False, "pk" => False, "protected" => False, "private" => False, "alias" => "forcePipe", "public" => False, "dba_mapping" => False]; + $dict['usePreprocessor'] = ['read_only' => True, "type" => "int", "subtype" => "unset", "choices" => "unset", "null" => False, "pk" => False, "protected" => False, "private" => False, "alias" => "preprocessorId", "public" => False, "dba_mapping" => False]; + $dict['preprocessorCommand'] = ['read_only' => True, "type" => "str(256)", "subtype" => "unset", "choices" => "unset", "null" => False, "pk" => False, "protected" => False, "private" => False, "alias" => "preprocessorCommand", "public" => False, "dba_mapping" => False]; return $dict; } diff --git a/src/dba/models/TaskDebugOutput.class.php b/src/dba/models/TaskDebugOutput.class.php index 80f680f7d..5cd65d24a 100644 --- a/src/dba/models/TaskDebugOutput.class.php +++ b/src/dba/models/TaskDebugOutput.class.php @@ -24,9 +24,9 @@ function getKeyValueDict(): array { static function getFeatures(): array { $dict = array(); - $dict['taskDebugOutputId'] = ['read_only' => True, "type" => "int", "subtype" => "unset", "choices" => "unset", "null" => False, "pk" => True, "protected" => True, "private" => False, "alias" => "taskDebugOutputId", "public" => False]; - $dict['taskId'] = ['read_only' => True, "type" => "int", "subtype" => "unset", "choices" => "unset", "null" => False, "pk" => False, "protected" => False, "private" => False, "alias" => "taskId", "public" => False]; - $dict['output'] = ['read_only' => True, "type" => "str(256)", "subtype" => "unset", "choices" => "unset", "null" => False, "pk" => False, "protected" => False, "private" => False, "alias" => "output", "public" => False]; + $dict['taskDebugOutputId'] = ['read_only' => True, "type" => "int", "subtype" => "unset", "choices" => "unset", "null" => False, "pk" => True, "protected" => True, "private" => False, "alias" => "taskDebugOutputId", "public" => False, "dba_mapping" => False]; + $dict['taskId'] = ['read_only' => True, "type" => "int", "subtype" => "unset", "choices" => "unset", "null" => False, "pk" => False, "protected" => False, "private" => False, "alias" => "taskId", "public" => False, "dba_mapping" => False]; + $dict['output'] = ['read_only' => True, "type" => "str(256)", "subtype" => "unset", "choices" => "unset", "null" => False, "pk" => False, "protected" => False, "private" => False, "alias" => "output", "public" => False, "dba_mapping" => False]; return $dict; } diff --git a/src/dba/models/TaskDebugOutputFactory.class.php b/src/dba/models/TaskDebugOutputFactory.class.php index e57c2cb6b..5190c9c2e 100644 --- a/src/dba/models/TaskDebugOutputFactory.class.php +++ b/src/dba/models/TaskDebugOutputFactory.class.php @@ -10,6 +10,10 @@ function getModelName(): string { function getModelTable(): string { return "TaskDebugOutput"; } + + function isMapping(): bool { + return False; + } function isCachable(): bool { return false; @@ -40,7 +44,7 @@ function createObjectFromDict($pk, $dict): TaskDebugOutput { * @param bool $single * @return TaskDebugOutput|TaskDebugOutput[] */ - function filter($options, $single = false) { + function filter(array $options, bool $single = false) { $join = false; if (array_key_exists('join', $options)) { $join = true; diff --git a/src/dba/models/TaskFactory.class.php b/src/dba/models/TaskFactory.class.php index d9ea543fe..9b7a16f23 100644 --- a/src/dba/models/TaskFactory.class.php +++ b/src/dba/models/TaskFactory.class.php @@ -10,6 +10,10 @@ function getModelName(): string { function getModelTable(): string { return "Task"; } + + function isMapping(): bool { + return False; + } function isCachable(): bool { return false; @@ -40,7 +44,7 @@ function createObjectFromDict($pk, $dict): Task { * @param bool $single * @return Task|Task[] */ - function filter($options, $single = false) { + function filter(array $options, bool $single = false) { $join = false; if (array_key_exists('join', $options)) { $join = true; diff --git a/src/dba/models/TaskWrapper.class.php b/src/dba/models/TaskWrapper.class.php index e060ed836..5b1ac624a 100644 --- a/src/dba/models/TaskWrapper.class.php +++ b/src/dba/models/TaskWrapper.class.php @@ -42,15 +42,15 @@ function getKeyValueDict(): array { static function getFeatures(): array { $dict = array(); - $dict['taskWrapperId'] = ['read_only' => True, "type" => "int", "subtype" => "unset", "choices" => "unset", "null" => False, "pk" => True, "protected" => True, "private" => False, "alias" => "taskWrapperId", "public" => False]; - $dict['priority'] = ['read_only' => False, "type" => "int", "subtype" => "unset", "choices" => "unset", "null" => False, "pk" => False, "protected" => False, "private" => False, "alias" => "priority", "public" => False]; - $dict['maxAgents'] = ['read_only' => False, "type" => "int", "subtype" => "unset", "choices" => "unset", "null" => False, "pk" => False, "protected" => False, "private" => False, "alias" => "maxAgents", "public" => False]; - $dict['taskType'] = ['read_only' => True, "type" => "int", "subtype" => "unset", "choices" => [0 => "TaskType is Task", 1 => "TaskType is Supertask", ], "null" => False, "pk" => False, "protected" => True, "private" => False, "alias" => "taskType", "public" => False]; - $dict['hashlistId'] = ['read_only' => True, "type" => "int", "subtype" => "unset", "choices" => "unset", "null" => False, "pk" => False, "protected" => True, "private" => False, "alias" => "hashlistId", "public" => False]; - $dict['accessGroupId'] = ['read_only' => False, "type" => "int", "subtype" => "unset", "choices" => "unset", "null" => False, "pk" => False, "protected" => False, "private" => False, "alias" => "accessGroupId", "public" => False]; - $dict['taskWrapperName'] = ['read_only' => False, "type" => "str(100)", "subtype" => "unset", "choices" => "unset", "null" => False, "pk" => False, "protected" => False, "private" => False, "alias" => "taskWrapperName", "public" => False]; - $dict['isArchived'] = ['read_only' => False, "type" => "bool", "subtype" => "unset", "choices" => "unset", "null" => False, "pk" => False, "protected" => False, "private" => False, "alias" => "isArchived", "public" => False]; - $dict['cracked'] = ['read_only' => True, "type" => "int", "subtype" => "unset", "choices" => "unset", "null" => False, "pk" => False, "protected" => True, "private" => False, "alias" => "cracked", "public" => False]; + $dict['taskWrapperId'] = ['read_only' => True, "type" => "int", "subtype" => "unset", "choices" => "unset", "null" => False, "pk" => True, "protected" => True, "private" => False, "alias" => "taskWrapperId", "public" => False, "dba_mapping" => False]; + $dict['priority'] = ['read_only' => False, "type" => "int", "subtype" => "unset", "choices" => "unset", "null" => False, "pk" => False, "protected" => False, "private" => False, "alias" => "priority", "public" => False, "dba_mapping" => False]; + $dict['maxAgents'] = ['read_only' => False, "type" => "int", "subtype" => "unset", "choices" => "unset", "null" => False, "pk" => False, "protected" => False, "private" => False, "alias" => "maxAgents", "public" => False, "dba_mapping" => False]; + $dict['taskType'] = ['read_only' => True, "type" => "int", "subtype" => "unset", "choices" => [0 => "TaskType is Task", 1 => "TaskType is Supertask", ], "null" => False, "pk" => False, "protected" => True, "private" => False, "alias" => "taskType", "public" => False, "dba_mapping" => False]; + $dict['hashlistId'] = ['read_only' => True, "type" => "int", "subtype" => "unset", "choices" => "unset", "null" => False, "pk" => False, "protected" => True, "private" => False, "alias" => "hashlistId", "public" => False, "dba_mapping" => False]; + $dict['accessGroupId'] = ['read_only' => False, "type" => "int", "subtype" => "unset", "choices" => "unset", "null" => False, "pk" => False, "protected" => False, "private" => False, "alias" => "accessGroupId", "public" => False, "dba_mapping" => False]; + $dict['taskWrapperName'] = ['read_only' => False, "type" => "str(100)", "subtype" => "unset", "choices" => "unset", "null" => False, "pk" => False, "protected" => False, "private" => False, "alias" => "taskWrapperName", "public" => False, "dba_mapping" => False]; + $dict['isArchived'] = ['read_only' => False, "type" => "bool", "subtype" => "unset", "choices" => "unset", "null" => False, "pk" => False, "protected" => False, "private" => False, "alias" => "isArchived", "public" => False, "dba_mapping" => False]; + $dict['cracked'] = ['read_only' => True, "type" => "int", "subtype" => "unset", "choices" => "unset", "null" => False, "pk" => False, "protected" => True, "private" => False, "alias" => "cracked", "public" => False, "dba_mapping" => False]; return $dict; } diff --git a/src/dba/models/TaskWrapperFactory.class.php b/src/dba/models/TaskWrapperFactory.class.php index 1830ecdf0..4bab3456e 100644 --- a/src/dba/models/TaskWrapperFactory.class.php +++ b/src/dba/models/TaskWrapperFactory.class.php @@ -10,6 +10,10 @@ function getModelName(): string { function getModelTable(): string { return "TaskWrapper"; } + + function isMapping(): bool { + return False; + } function isCachable(): bool { return false; @@ -40,7 +44,7 @@ function createObjectFromDict($pk, $dict): TaskWrapper { * @param bool $single * @return TaskWrapper|TaskWrapper[] */ - function filter($options, $single = false) { + function filter(array $options, bool $single = false) { $join = false; if (array_key_exists('join', $options)) { $join = true; diff --git a/src/dba/models/User.class.php b/src/dba/models/User.class.php index bac5ad944..0abec6aef 100644 --- a/src/dba/models/User.class.php +++ b/src/dba/models/User.class.php @@ -63,22 +63,22 @@ function getKeyValueDict(): array { static function getFeatures(): array { $dict = array(); - $dict['userId'] = ['read_only' => True, "type" => "int", "subtype" => "unset", "choices" => "unset", "null" => False, "pk" => True, "protected" => True, "private" => False, "alias" => "userId", "public" => True]; - $dict['username'] = ['read_only' => False, "type" => "str(100)", "subtype" => "unset", "choices" => "unset", "null" => False, "pk" => False, "protected" => False, "private" => False, "alias" => "name", "public" => True]; - $dict['email'] = ['read_only' => False, "type" => "str(150)", "subtype" => "unset", "choices" => "unset", "null" => False, "pk" => False, "protected" => False, "private" => False, "alias" => "email", "public" => False]; - $dict['passwordHash'] = ['read_only' => True, "type" => "str(256)", "subtype" => "unset", "choices" => "unset", "null" => False, "pk" => False, "protected" => True, "private" => True, "alias" => "passwordHash", "public" => False]; - $dict['passwordSalt'] = ['read_only' => True, "type" => "str(256)", "subtype" => "unset", "choices" => "unset", "null" => False, "pk" => False, "protected" => True, "private" => True, "alias" => "passwordSalt", "public" => False]; - $dict['isValid'] = ['read_only' => False, "type" => "bool", "subtype" => "unset", "choices" => "unset", "null" => True, "pk" => False, "protected" => False, "private" => False, "alias" => "isValid", "public" => False]; - $dict['isComputedPassword'] = ['read_only' => True, "type" => "bool", "subtype" => "unset", "choices" => "unset", "null" => False, "pk" => False, "protected" => True, "private" => False, "alias" => "isComputedPassword", "public" => False]; - $dict['lastLoginDate'] = ['read_only' => True, "type" => "int64", "subtype" => "unset", "choices" => "unset", "null" => False, "pk" => False, "protected" => True, "private" => False, "alias" => "lastLoginDate", "public" => False]; - $dict['registeredSince'] = ['read_only' => True, "type" => "int64", "subtype" => "unset", "choices" => "unset", "null" => False, "pk" => False, "protected" => True, "private" => False, "alias" => "registeredSince", "public" => False]; - $dict['sessionLifetime'] = ['read_only' => True, "type" => "int", "subtype" => "unset", "choices" => "unset", "null" => False, "pk" => False, "protected" => True, "private" => False, "alias" => "sessionLifetime", "public" => False]; - $dict['rightGroupId'] = ['read_only' => False, "type" => "int", "subtype" => "unset", "choices" => "unset", "null" => False, "pk" => False, "protected" => False, "private" => False, "alias" => "globalPermissionGroupId", "public" => False]; - $dict['yubikey'] = ['read_only' => True, "type" => "str(256)", "subtype" => "unset", "choices" => "unset", "null" => False, "pk" => False, "protected" => True, "private" => False, "alias" => "yubikey", "public" => False]; - $dict['otp1'] = ['read_only' => True, "type" => "str(256)", "subtype" => "unset", "choices" => "unset", "null" => False, "pk" => False, "protected" => True, "private" => False, "alias" => "otp1", "public" => False]; - $dict['otp2'] = ['read_only' => True, "type" => "str(256)", "subtype" => "unset", "choices" => "unset", "null" => False, "pk" => False, "protected" => True, "private" => False, "alias" => "otp2", "public" => False]; - $dict['otp3'] = ['read_only' => True, "type" => "str(256)", "subtype" => "unset", "choices" => "unset", "null" => False, "pk" => False, "protected" => True, "private" => False, "alias" => "otp3", "public" => False]; - $dict['otp4'] = ['read_only' => True, "type" => "str(256)", "subtype" => "unset", "choices" => "unset", "null" => False, "pk" => False, "protected" => True, "private" => False, "alias" => "otp4", "public" => False]; + $dict['userId'] = ['read_only' => True, "type" => "int", "subtype" => "unset", "choices" => "unset", "null" => False, "pk" => True, "protected" => True, "private" => False, "alias" => "id", "public" => True, "dba_mapping" => False]; + $dict['username'] = ['read_only' => False, "type" => "str(100)", "subtype" => "unset", "choices" => "unset", "null" => False, "pk" => False, "protected" => False, "private" => False, "alias" => "name", "public" => True, "dba_mapping" => False]; + $dict['email'] = ['read_only' => False, "type" => "str(150)", "subtype" => "unset", "choices" => "unset", "null" => False, "pk" => False, "protected" => False, "private" => False, "alias" => "email", "public" => False, "dba_mapping" => False]; + $dict['passwordHash'] = ['read_only' => True, "type" => "str(256)", "subtype" => "unset", "choices" => "unset", "null" => False, "pk" => False, "protected" => True, "private" => True, "alias" => "passwordHash", "public" => False, "dba_mapping" => False]; + $dict['passwordSalt'] = ['read_only' => True, "type" => "str(256)", "subtype" => "unset", "choices" => "unset", "null" => False, "pk" => False, "protected" => True, "private" => True, "alias" => "passwordSalt", "public" => False, "dba_mapping" => False]; + $dict['isValid'] = ['read_only' => False, "type" => "bool", "subtype" => "unset", "choices" => "unset", "null" => True, "pk" => False, "protected" => False, "private" => False, "alias" => "isValid", "public" => False, "dba_mapping" => False]; + $dict['isComputedPassword'] = ['read_only' => True, "type" => "bool", "subtype" => "unset", "choices" => "unset", "null" => False, "pk" => False, "protected" => True, "private" => False, "alias" => "isComputedPassword", "public" => False, "dba_mapping" => False]; + $dict['lastLoginDate'] = ['read_only' => True, "type" => "int64", "subtype" => "unset", "choices" => "unset", "null" => False, "pk" => False, "protected" => True, "private" => False, "alias" => "lastLoginDate", "public" => False, "dba_mapping" => False]; + $dict['registeredSince'] = ['read_only' => True, "type" => "int64", "subtype" => "unset", "choices" => "unset", "null" => False, "pk" => False, "protected" => True, "private" => False, "alias" => "registeredSince", "public" => False, "dba_mapping" => False]; + $dict['sessionLifetime'] = ['read_only' => True, "type" => "int", "subtype" => "unset", "choices" => "unset", "null" => False, "pk" => False, "protected" => True, "private" => False, "alias" => "sessionLifetime", "public" => False, "dba_mapping" => False]; + $dict['rightGroupId'] = ['read_only' => False, "type" => "int", "subtype" => "unset", "choices" => "unset", "null" => False, "pk" => False, "protected" => False, "private" => False, "alias" => "globalPermissionGroupId", "public" => False, "dba_mapping" => False]; + $dict['yubikey'] = ['read_only' => True, "type" => "str(256)", "subtype" => "unset", "choices" => "unset", "null" => False, "pk" => False, "protected" => True, "private" => False, "alias" => "yubikey", "public" => False, "dba_mapping" => False]; + $dict['otp1'] = ['read_only' => True, "type" => "str(256)", "subtype" => "unset", "choices" => "unset", "null" => False, "pk" => False, "protected" => True, "private" => False, "alias" => "otp1", "public" => False, "dba_mapping" => False]; + $dict['otp2'] = ['read_only' => True, "type" => "str(256)", "subtype" => "unset", "choices" => "unset", "null" => False, "pk" => False, "protected" => True, "private" => False, "alias" => "otp2", "public" => False, "dba_mapping" => False]; + $dict['otp3'] = ['read_only' => True, "type" => "str(256)", "subtype" => "unset", "choices" => "unset", "null" => False, "pk" => False, "protected" => True, "private" => False, "alias" => "otp3", "public" => False, "dba_mapping" => False]; + $dict['otp4'] = ['read_only' => True, "type" => "str(256)", "subtype" => "unset", "choices" => "unset", "null" => False, "pk" => False, "protected" => True, "private" => False, "alias" => "otp4", "public" => False, "dba_mapping" => False]; return $dict; } diff --git a/src/dba/models/UserFactory.class.php b/src/dba/models/UserFactory.class.php index bb2112b2c..4a1641713 100644 --- a/src/dba/models/UserFactory.class.php +++ b/src/dba/models/UserFactory.class.php @@ -10,6 +10,10 @@ function getModelName(): string { function getModelTable(): string { return "User"; } + + function isMapping(): bool { + return True; + } function isCachable(): bool { return false; @@ -40,7 +44,7 @@ function createObjectFromDict($pk, $dict): User { * @param bool $single * @return User|User[] */ - function filter($options, $single = false) { + function filter(array $options, bool $single = false) { $join = false; if (array_key_exists('join', $options)) { $join = true; diff --git a/src/dba/models/Zap.class.php b/src/dba/models/Zap.class.php index 65e05545e..f816e63c9 100644 --- a/src/dba/models/Zap.class.php +++ b/src/dba/models/Zap.class.php @@ -30,11 +30,11 @@ function getKeyValueDict(): array { static function getFeatures(): array { $dict = array(); - $dict['zapId'] = ['read_only' => True, "type" => "int", "subtype" => "unset", "choices" => "unset", "null" => False, "pk" => True, "protected" => True, "private" => False, "alias" => "zapId", "public" => False]; - $dict['hash'] = ['read_only' => True, "type" => "str(65535)", "subtype" => "unset", "choices" => "unset", "null" => False, "pk" => False, "protected" => True, "private" => False, "alias" => "hash", "public" => False]; - $dict['solveTime'] = ['read_only' => True, "type" => "int64", "subtype" => "unset", "choices" => "unset", "null" => False, "pk" => False, "protected" => True, "private" => False, "alias" => "solveTime", "public" => False]; - $dict['agentId'] = ['read_only' => True, "type" => "int", "subtype" => "unset", "choices" => "unset", "null" => False, "pk" => False, "protected" => True, "private" => False, "alias" => "agentId", "public" => False]; - $dict['hashlistId'] = ['read_only' => True, "type" => "int", "subtype" => "unset", "choices" => "unset", "null" => False, "pk" => False, "protected" => True, "private" => False, "alias" => "hashlistId", "public" => False]; + $dict['zapId'] = ['read_only' => True, "type" => "int", "subtype" => "unset", "choices" => "unset", "null" => False, "pk" => True, "protected" => True, "private" => False, "alias" => "zapId", "public" => False, "dba_mapping" => False]; + $dict['hash'] = ['read_only' => True, "type" => "str(65535)", "subtype" => "unset", "choices" => "unset", "null" => False, "pk" => False, "protected" => True, "private" => False, "alias" => "hash", "public" => False, "dba_mapping" => False]; + $dict['solveTime'] = ['read_only' => True, "type" => "int64", "subtype" => "unset", "choices" => "unset", "null" => False, "pk" => False, "protected" => True, "private" => False, "alias" => "solveTime", "public" => False, "dba_mapping" => False]; + $dict['agentId'] = ['read_only' => True, "type" => "int", "subtype" => "unset", "choices" => "unset", "null" => False, "pk" => False, "protected" => True, "private" => False, "alias" => "agentId", "public" => False, "dba_mapping" => False]; + $dict['hashlistId'] = ['read_only' => True, "type" => "int", "subtype" => "unset", "choices" => "unset", "null" => False, "pk" => False, "protected" => True, "private" => False, "alias" => "hashlistId", "public" => False, "dba_mapping" => False]; return $dict; } diff --git a/src/dba/models/ZapFactory.class.php b/src/dba/models/ZapFactory.class.php index c3a142607..e526effcb 100644 --- a/src/dba/models/ZapFactory.class.php +++ b/src/dba/models/ZapFactory.class.php @@ -10,6 +10,10 @@ function getModelName(): string { function getModelTable(): string { return "Zap"; } + + function isMapping(): bool { + return False; + } function isCachable(): bool { return false; @@ -40,7 +44,7 @@ function createObjectFromDict($pk, $dict): Zap { * @param bool $single * @return Zap|Zap[] */ - function filter($options, $single = false) { + function filter(array $options, bool $single = false) { $join = false; if (array_key_exists('join', $options)) { $join = true; diff --git a/src/dba/models/generator.php b/src/dba/models/generator.php index c56fa7e2a..0c6c1f070 100644 --- a/src/dba/models/generator.php +++ b/src/dba/models/generator.php @@ -279,7 +279,7 @@ ['name' => 'cracked', 'read_only' => True, 'type' => 'int', 'protected' => True], ['name' => 'numGpus', 'read_only' => True, 'type' => 'int', 'protected' => True], ['name' => 'start', 'read_only' => True, 'type' => 'int64', 'protected' => True], - ['name' => 'end', 'read_only' => True, 'type' => 'int64', 'protected' => True], + ['name' => 'end', 'read_only' => True, 'type' => 'int64', 'protected' => True, 'dba_mapping' => True], ['name' => 'errors', 'read_only' => True, 'type' => 'str(65535)', 'protected' => True], ], ]; @@ -445,6 +445,7 @@ ['name' => 'otp3', 'read_only' => True, 'type' => 'str(256)', 'protected' => True], ['name' => 'otp4', 'read_only' => True, 'type' => 'str(256)', 'protected' => True], ], + "dba_mapping" => True, ]; $CONF['Zap'] = [ 'columns' => [ @@ -568,7 +569,8 @@ function getTypingType($str, $nullable = false): string { '"protected" => ' . (array_key_exists("protected", $COLUMN) ? ($COLUMN['protected'] ? 'True' : 'False') : 'False') . ', ' . '"private" => ' . (array_key_exists("private", $COLUMN) ? ($COLUMN['private'] ? 'True' : 'False') : 'False') . ', ' . '"alias" => "' . (array_key_exists("alias", $COLUMN) ? $COLUMN['alias'] : $COLUMN['name']) . '", ' . - '"public" => ' . (array_key_exists("public", $COLUMN) ? ($COLUMN['public'] ? 'True' : 'False') : 'False') . + '"public" => ' . (array_key_exists("public", $COLUMN) ? ($COLUMN['public'] ? 'True' : 'False') : 'False') . ', ' . + '"dba_mapping" => ' . (array_key_exists("dba_mapping", $COLUMN) ? ($COLUMN['dba_mapping'] ? 'True' : 'False') : 'False') . '];'; $keyVal[] = "\$dict['$col'] = \$this->$col;"; $variables[] = "const " . makeConstant($col) . " = \"$col\";"; @@ -593,6 +595,7 @@ function getTypingType($str, $nullable = false): string { $class = file_get_contents(dirname(__FILE__) . "/AbstractModelFactory.template.txt"); $class = str_replace("__MODEL_NAME__", $NAME, $class); + $class = str_replace("__MODEL_DBA_MAPPING__", (array_key_exists("dba_mapping", $MODEL_CONF) ? ($MODEL_CONF['dba_mapping'] ? 'True' : 'False') : 'False'), $class); $dict = array(); $dict2 = array(); foreach ($COLUMNS as $COLUMN) { diff --git a/src/inc/utils/HashlistUtils.class.php b/src/inc/utils/HashlistUtils.class.php index e2dece3c2..2c75c9745 100644 --- a/src/inc/utils/HashlistUtils.class.php +++ b/src/inc/utils/HashlistUtils.class.php @@ -7,6 +7,7 @@ use DBA\Hashlist; use DBA\HashlistHashlist; use DBA\HashBinary; +use DBA\UpdateSet; use DBA\User; use DBA\File; use DBA\JoinFilter; diff --git a/src/inc/utils/UserUtils.class.php b/src/inc/utils/UserUtils.class.php index a66eb3e67..31fd8fb1b 100644 --- a/src/inc/utils/UserUtils.class.php +++ b/src/inc/utils/UserUtils.class.php @@ -1,5 +1,6 @@ getDB()->query("ALTER TABLE `HealthCheckAgent` RENAME COLUMN `end` to `htp_end`;"); + } + if (Util::databaseTableExists("User")) { + Factory::getAgentFactory()->getDB()->query("RENAME TABLE `User` TO `htp_User`;"); + } + $EXECUTED["v1.0.0-rainbow4_prefix_user_and_end"] = true; +} + From 122201e4e21cae40afb83ccd8b267659e680264b Mon Sep 17 00:00:00 2001 From: Sein Coray Date: Fri, 14 Nov 2025 22:17:05 +0100 Subject: [PATCH 252/691] Update src/dba/Util.class.php Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com> --- src/dba/Util.class.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/dba/Util.class.php b/src/dba/Util.class.php index c09c18189..0129e01e8 100644 --- a/src/dba/Util.class.php +++ b/src/dba/Util.class.php @@ -37,7 +37,7 @@ public static function cast($obj, $to_class) { public static function createPrefixedString(string $table, array $keys): string { $arr = array(); foreach ($keys as $key) { - $arr[] = "$table.$key AS '$table.$key'"; + $arr[] = "$table.$key AS $table.$key"; } return implode(", ", $arr); } From 8340c8795d3a3860b363d4c2e03063553ecd4e1d Mon Sep 17 00:00:00 2001 From: Sein Coray Date: Fri, 14 Nov 2025 22:18:12 +0100 Subject: [PATCH 253/691] Update src/dba/AbstractModelFactory.class.php Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com> --- src/dba/AbstractModelFactory.class.php | 1 - 1 file changed, 1 deletion(-) diff --git a/src/dba/AbstractModelFactory.class.php b/src/dba/AbstractModelFactory.class.php index 762640ce1..b77720dfb 100755 --- a/src/dba/AbstractModelFactory.class.php +++ b/src/dba/AbstractModelFactory.class.php @@ -2,7 +2,6 @@ namespace DBA; -use JsonSchema\Constraints\Drafts\Draft06\AnyOfConstraint; use MassUpdateSet; use PDO, PDOStatement, PDOException; use UI; From 4e6cd2b6e6ec812ee6abc1ae850d847e939a318d Mon Sep 17 00:00:00 2001 From: sein Date: Fri, 14 Nov 2025 22:25:27 +0100 Subject: [PATCH 254/691] fixed mapping of dict keys from mapped columns, including suggestions from copilot --- src/dba/AbstractModelFactory.class.php | 10 ++++------ src/dba/PaginationFilter.class.php | 4 ++-- src/dba/UpdateSet.class.php | 1 + src/dba/models/AbstractModelFactory.template.txt | 2 +- src/dba/models/HealthCheckAgentFactory.class.php | 1 + src/dba/models/generator.php | 14 ++++++++++++-- 6 files changed, 21 insertions(+), 11 deletions(-) diff --git a/src/dba/AbstractModelFactory.class.php b/src/dba/AbstractModelFactory.class.php index 762640ce1..7792cf83a 100755 --- a/src/dba/AbstractModelFactory.class.php +++ b/src/dba/AbstractModelFactory.class.php @@ -228,21 +228,19 @@ public function update(AbstractModel $model): PDOStatement { $query = "UPDATE " . $this->getMappedModelTable() . " SET "; + $values = array_values($dict); $keys = self::getMappedModelKeys($model); - $values = array(); for ($i = 0; $i < count($keys); $i++) { if ($i != count($keys) - 1) { - $query = $query . $keys[$i] . "=?,"; - $values[] = $dict[$keys[$i]]; + $query .= $keys[$i] . "=?, "; } else { - $query = $query . $keys[$i] . "=?"; - $values[] = $dict[$keys[$i]]; + $query .= $keys[$i] . "=?"; } } - $query = $query . " WHERE " . $model->getPrimaryKey() . "=?"; + $query .= " WHERE " . $model->getPrimaryKey() . "=?"; $values[] = $model->getPrimaryKeyValue(); $stmt = $this->getDB()->prepare($query); diff --git a/src/dba/PaginationFilter.class.php b/src/dba/PaginationFilter.class.php index 200aba97f..97deb62d4 100644 --- a/src/dba/PaginationFilter.class.php +++ b/src/dba/PaginationFilter.class.php @@ -36,7 +36,7 @@ function getQueryString(AbstractModelFactory $factory, bool $includeTable = fals $table = $factory->getMappedModelTable() . "."; } - $parts = array_map(fn($filter) => $filter->getQueryString(), $this->filters); + $parts = array_map(fn($filter) => $filter->getQueryString($factory, true), $this->filters); //ex. SELECT hashTypeId, description, isSalted, isSlowHash FROM HashType // where (HashType.isSalted < 1) OR (HashType.isSalted = 1 and HashType.hashTypeId < 12600) // ORDER BY HashType.isSalted DESC, HashType.hashTypeId DESC LIMIT 25; @@ -60,4 +60,4 @@ function getHasValue(): bool { } return true; } -} \ No newline at end of file +} diff --git a/src/dba/UpdateSet.class.php b/src/dba/UpdateSet.class.php index c05e05024..aa1baa4ad 100644 --- a/src/dba/UpdateSet.class.php +++ b/src/dba/UpdateSet.class.php @@ -16,6 +16,7 @@ function getQuery(AbstractModelFactory $factory, bool $includeTable = false): st if ($includeTable) { $table = $factory->getMappedModelTable() . "."; } + return $table . AbstractModelFactory::getMappedModelKey($factory->getNullObject(), $this->key) . "=?"; } diff --git a/src/dba/models/AbstractModelFactory.template.txt b/src/dba/models/AbstractModelFactory.template.txt index 40e8978a1..3fb525236 100644 --- a/src/dba/models/AbstractModelFactory.template.txt +++ b/src/dba/models/AbstractModelFactory.template.txt @@ -35,7 +35,7 @@ class __MODEL_NAME__Factory extends AbstractModelFactory { * @param array $dict * @return __MODEL_NAME__ */ - function createObjectFromDict($pk, $dict): __MODEL_NAME__ { + function createObjectFromDict($pk, $dict): __MODEL_NAME__ {__MODEL_MAPPING_DICT__ return new __MODEL_NAME__(__MODEL__DICT2__); } diff --git a/src/dba/models/HealthCheckAgentFactory.class.php b/src/dba/models/HealthCheckAgentFactory.class.php index d447f429d..c55658d3e 100644 --- a/src/dba/models/HealthCheckAgentFactory.class.php +++ b/src/dba/models/HealthCheckAgentFactory.class.php @@ -36,6 +36,7 @@ function getNullObject(): HealthCheckAgent { * @return HealthCheckAgent */ function createObjectFromDict($pk, $dict): HealthCheckAgent { + $dict['end'] = $dict['htp_end']; return new HealthCheckAgent($dict['healthCheckAgentId'], $dict['healthCheckId'], $dict['agentId'], $dict['status'], $dict['cracked'], $dict['numGpus'], $dict['start'], $dict['end'], $dict['errors']); } diff --git a/src/dba/models/generator.php b/src/dba/models/generator.php index 0c6c1f070..972a4b1b0 100644 --- a/src/dba/models/generator.php +++ b/src/dba/models/generator.php @@ -596,8 +596,9 @@ function getTypingType($str, $nullable = false): string { $class = file_get_contents(dirname(__FILE__) . "/AbstractModelFactory.template.txt"); $class = str_replace("__MODEL_NAME__", $NAME, $class); $class = str_replace("__MODEL_DBA_MAPPING__", (array_key_exists("dba_mapping", $MODEL_CONF) ? ($MODEL_CONF['dba_mapping'] ? 'True' : 'False') : 'False'), $class); - $dict = array(); - $dict2 = array(); + $dict = []; + $dict2 = []; + $mapping = []; foreach ($COLUMNS as $COLUMN) { $col = $COLUMN['name']; if (sizeof($dict) == 0) { @@ -607,10 +608,19 @@ function getTypingType($str, $nullable = false): string { else { $dict[] = "null"; $dict2[] = "\$dict['$col']"; + if (array_key_exists("dba_mapping", $COLUMN) && $COLUMN['dba_mapping']) { + $mapping[] = "\$dict['$col'] = \$dict['htp_$col'];"; + } } } $class = str_replace("__MODEL_DICT__", implode(", ", $dict), $class); $class = str_replace("__MODEL__DICT2__", implode(", ", $dict2), $class); + if (count($mapping) > 0) { + $class = str_replace("__MODEL_MAPPING_DICT__", "\n " . implode("\n ", $mapping), $class); + } + else { + $class = str_replace("__MODEL_MAPPING_DICT__", "", $class); + } file_put_contents(dirname(__FILE__) . "/" . $NAME . "Factory.class.php", $class); } From 84bc8af7f5a08debe81775b4dbf2e21a92439d88 Mon Sep 17 00:00:00 2001 From: sein Date: Fri, 14 Nov 2025 22:34:27 +0100 Subject: [PATCH 255/691] reverted change of copilot which messed up assignment of values --- src/dba/Util.class.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/dba/Util.class.php b/src/dba/Util.class.php index 0129e01e8..19e902b91 100644 --- a/src/dba/Util.class.php +++ b/src/dba/Util.class.php @@ -37,7 +37,7 @@ public static function cast($obj, $to_class) { public static function createPrefixedString(string $table, array $keys): string { $arr = array(); foreach ($keys as $key) { - $arr[] = "$table.$key AS $table.$key"; + $arr[] = "$table.$key AS '$table.$key'"; } return implode(", ", $arr); } @@ -54,4 +54,4 @@ public static function startsWith($search, $pattern) { } return false; } -} \ No newline at end of file +} From 9020b4eb9fcd570d9d98f55e43c300bf8fe24389 Mon Sep 17 00:00:00 2001 From: sein Date: Fri, 14 Nov 2025 22:34:42 +0100 Subject: [PATCH 256/691] added all missing use statements --- src/inc/utils/AccessGroupUtils.class.php | 3 ++- src/inc/utils/AgentUtils.class.php | 3 ++- src/inc/utils/TaskUtils.class.php | 1 + 3 files changed, 5 insertions(+), 2 deletions(-) diff --git a/src/inc/utils/AccessGroupUtils.class.php b/src/inc/utils/AccessGroupUtils.class.php index 4e458542d..47d434c79 100644 --- a/src/inc/utils/AccessGroupUtils.class.php +++ b/src/inc/utils/AccessGroupUtils.class.php @@ -4,6 +4,7 @@ use DBA\Chunk; use DBA\ContainFilter; use DBA\TaskWrapper; +use DBA\UpdateSet; use DBA\QueryFilter; use DBA\AccessGroupUser; use DBA\AccessGroupAgent; @@ -207,4 +208,4 @@ public static function getGroup($groupId) { } return $group; } -} \ No newline at end of file +} diff --git a/src/inc/utils/AgentUtils.class.php b/src/inc/utils/AgentUtils.class.php index e3cea4074..0c954706a 100644 --- a/src/inc/utils/AgentUtils.class.php +++ b/src/inc/utils/AgentUtils.class.php @@ -14,6 +14,7 @@ use DBA\AgentStat; use DBA\OrderFilter; use DBA\ContainFilter; +use DBA\UpdateSet; use DBA\Factory; use DBA\HealthCheckAgent; use DBA\Speed; @@ -576,4 +577,4 @@ public static function deleteVoucher($voucher) { } Factory::getRegVoucherFactory()->delete($voucher); } -} \ No newline at end of file +} diff --git a/src/inc/utils/TaskUtils.class.php b/src/inc/utils/TaskUtils.class.php index 296ceaae2..c96881b3a 100644 --- a/src/inc/utils/TaskUtils.class.php +++ b/src/inc/utils/TaskUtils.class.php @@ -23,6 +23,7 @@ use DBA\Hashlist; use DBA\AccessGroupUser; use DBA\TaskDebugOutput; +use DBA\UpdateSet; use DBA\Factory; use DBA\Speed; use DBA\Aggregation; From f7cee31ff2e4259b56978e34ada9225f2c5594fb Mon Sep 17 00:00:00 2001 From: sein Date: Fri, 14 Nov 2025 22:44:21 +0100 Subject: [PATCH 257/691] reverted remove of test required statement --- src/dba/AbstractModelFactory.class.php | 3 +++ 1 file changed, 3 insertions(+) diff --git a/src/dba/AbstractModelFactory.class.php b/src/dba/AbstractModelFactory.class.php index 67874b0cc..8db2ca1cd 100755 --- a/src/dba/AbstractModelFactory.class.php +++ b/src/dba/AbstractModelFactory.class.php @@ -2,6 +2,9 @@ namespace DBA; +// this is needed for tests (not really great, but no other way currently) +use JsonSchema\Constraints\Drafts\Draft06\AnyOfConstraint; + use MassUpdateSet; use PDO, PDOStatement, PDOException; use UI; From 2ee10071b3058ad48c771985dd798e3ac2d30ee0 Mon Sep 17 00:00:00 2001 From: sein Date: Fri, 14 Nov 2025 23:34:21 +0100 Subject: [PATCH 258/691] fixed remaining broken tests --- src/dba/AbstractModelFactory.class.php | 3 --- src/inc/Util.class.php | 1 + src/inc/utils/SupertaskUtils.class.php | 2 +- 3 files changed, 2 insertions(+), 4 deletions(-) diff --git a/src/dba/AbstractModelFactory.class.php b/src/dba/AbstractModelFactory.class.php index 8db2ca1cd..67874b0cc 100755 --- a/src/dba/AbstractModelFactory.class.php +++ b/src/dba/AbstractModelFactory.class.php @@ -2,9 +2,6 @@ namespace DBA; -// this is needed for tests (not really great, but no other way currently) -use JsonSchema\Constraints\Drafts\Draft06\AnyOfConstraint; - use MassUpdateSet; use PDO, PDOStatement, PDOException; use UI; diff --git a/src/inc/Util.class.php b/src/inc/Util.class.php index c9c222d9a..9e7f4bca1 100755 --- a/src/inc/Util.class.php +++ b/src/inc/Util.class.php @@ -26,6 +26,7 @@ use DBA\AgentStat; use DBA\FileDelete; use DBA\Factory; +use DBA\UpdateSet; use DBA\Speed; use Composer\Semver\Comparator; diff --git a/src/inc/utils/SupertaskUtils.class.php b/src/inc/utils/SupertaskUtils.class.php index 7e77053ca..3db20afcd 100644 --- a/src/inc/utils/SupertaskUtils.class.php +++ b/src/inc/utils/SupertaskUtils.class.php @@ -216,7 +216,7 @@ public static function getAllSupertasks() { */ public static function getPretasksOfSupertask($supertaskId) { $oF = new OrderFilter(Pretask::PRIORITY, "DESC", Factory::getPretaskFactory()); - $qF = new QueryFilter(SupertaskPretask::SUPERTASK_ID, $supertaskId, "="); + $qF = new QueryFilter(SupertaskPretask::SUPERTASK_ID, $supertaskId, "=", Factory::getSupertaskPretaskFactory()); $jF = new JoinFilter(Factory::getSupertaskPretaskFactory(), Pretask::PRETASK_ID, SupertaskPretask::PRETASK_ID); $joined = Factory::getPretaskFactory()->filter([Factory::ORDER => $oF, Factory::JOIN => $jF, Factory::FILTER => $qF]); return $joined[Factory::getPretaskFactory()->getModelName()]; From 3184ee738e735a65debf6cd5dd26e697ffa518d1 Mon Sep 17 00:00:00 2001 From: s3inlc Date: Wed, 19 Nov 2025 11:41:40 +0100 Subject: [PATCH 259/691] internally allow the database to return value keys lowercased --- src/dba/models/AbstractModelFactory.template.txt | 9 +++++++-- src/dba/models/AccessGroupAgentFactory.class.php | 9 +++++++-- src/dba/models/AccessGroupFactory.class.php | 9 +++++++-- src/dba/models/AccessGroupUserFactory.class.php | 9 +++++++-- src/dba/models/AgentBinaryFactory.class.php | 9 +++++++-- src/dba/models/AgentErrorFactory.class.php | 9 +++++++-- src/dba/models/AgentFactory.class.php | 9 +++++++-- src/dba/models/AgentStatFactory.class.php | 9 +++++++-- src/dba/models/AgentZapFactory.class.php | 9 +++++++-- src/dba/models/ApiGroupFactory.class.php | 9 +++++++-- src/dba/models/ApiKeyFactory.class.php | 9 +++++++-- src/dba/models/AssignmentFactory.class.php | 9 +++++++-- src/dba/models/ChunkFactory.class.php | 9 +++++++-- src/dba/models/ConfigFactory.class.php | 9 +++++++-- src/dba/models/ConfigSectionFactory.class.php | 9 +++++++-- src/dba/models/CrackerBinaryFactory.class.php | 9 +++++++-- src/dba/models/CrackerBinaryTypeFactory.class.php | 9 +++++++-- src/dba/models/FileDeleteFactory.class.php | 9 +++++++-- src/dba/models/FileDownloadFactory.class.php | 9 +++++++-- src/dba/models/FileFactory.class.php | 9 +++++++-- src/dba/models/FilePretaskFactory.class.php | 9 +++++++-- src/dba/models/FileTaskFactory.class.php | 9 +++++++-- src/dba/models/HashBinaryFactory.class.php | 9 +++++++-- src/dba/models/HashFactory.class.php | 9 +++++++-- src/dba/models/HashTypeFactory.class.php | 9 +++++++-- src/dba/models/HashlistFactory.class.php | 9 +++++++-- src/dba/models/HashlistHashlistFactory.class.php | 9 +++++++-- src/dba/models/HealthCheckAgentFactory.class.php | 9 +++++++-- src/dba/models/HealthCheckFactory.class.php | 9 +++++++-- src/dba/models/LogEntryFactory.class.php | 9 +++++++-- src/dba/models/NotificationSettingFactory.class.php | 9 +++++++-- src/dba/models/PreprocessorFactory.class.php | 9 +++++++-- src/dba/models/PretaskFactory.class.php | 9 +++++++-- src/dba/models/RegVoucherFactory.class.php | 9 +++++++-- src/dba/models/RightGroupFactory.class.php | 9 +++++++-- src/dba/models/SessionFactory.class.php | 9 +++++++-- src/dba/models/SpeedFactory.class.php | 9 +++++++-- src/dba/models/StoredValueFactory.class.php | 9 +++++++-- src/dba/models/SupertaskFactory.class.php | 9 +++++++-- src/dba/models/SupertaskPretaskFactory.class.php | 9 +++++++-- src/dba/models/TaskDebugOutputFactory.class.php | 9 +++++++-- src/dba/models/TaskFactory.class.php | 9 +++++++-- src/dba/models/TaskWrapperFactory.class.php | 9 +++++++-- src/dba/models/UserFactory.class.php | 9 +++++++-- src/dba/models/ZapFactory.class.php | 9 +++++++-- src/dba/models/generator.php | 2 +- 46 files changed, 316 insertions(+), 91 deletions(-) diff --git a/src/dba/models/AbstractModelFactory.template.txt b/src/dba/models/AbstractModelFactory.template.txt index 3fb525236..0662bc532 100644 --- a/src/dba/models/AbstractModelFactory.template.txt +++ b/src/dba/models/AbstractModelFactory.template.txt @@ -35,7 +35,12 @@ class __MODEL_NAME__Factory extends AbstractModelFactory { * @param array $dict * @return __MODEL_NAME__ */ - function createObjectFromDict($pk, $dict): __MODEL_NAME__ {__MODEL_MAPPING_DICT__ + function createObjectFromDict($pk, $dict): __MODEL_NAME__ { + $conv = []; + foreach ($dict as $key => $val) { + $conv[strtolower($key)] = $val; + } + $dict = $conv;__MODEL_MAPPING_DICT__ return new __MODEL_NAME__(__MODEL__DICT2__); } @@ -81,4 +86,4 @@ class __MODEL_NAME__Factory extends AbstractModelFactory { function save($model): __MODEL_NAME__ { return Util::cast(parent::save($model), __MODEL_NAME__::class); } -} \ No newline at end of file +} diff --git a/src/dba/models/AccessGroupAgentFactory.class.php b/src/dba/models/AccessGroupAgentFactory.class.php index cf9acba76..c33f564ec 100644 --- a/src/dba/models/AccessGroupAgentFactory.class.php +++ b/src/dba/models/AccessGroupAgentFactory.class.php @@ -36,7 +36,12 @@ function getNullObject(): AccessGroupAgent { * @return AccessGroupAgent */ function createObjectFromDict($pk, $dict): AccessGroupAgent { - return new AccessGroupAgent($dict['accessGroupAgentId'], $dict['accessGroupId'], $dict['agentId']); + $conv = []; + foreach ($dict as $key => $val) { + $conv[strtolower($key)] = $val; + } + $dict = $conv; + return new AccessGroupAgent($dict['accessgroupagentid'], $dict['accessgroupid'], $dict['agentid']); } /** @@ -81,4 +86,4 @@ function get($pk): ?AccessGroupAgent { function save($model): AccessGroupAgent { return Util::cast(parent::save($model), AccessGroupAgent::class); } -} \ No newline at end of file +} diff --git a/src/dba/models/AccessGroupFactory.class.php b/src/dba/models/AccessGroupFactory.class.php index e46be4fec..04e3c85dd 100644 --- a/src/dba/models/AccessGroupFactory.class.php +++ b/src/dba/models/AccessGroupFactory.class.php @@ -36,7 +36,12 @@ function getNullObject(): AccessGroup { * @return AccessGroup */ function createObjectFromDict($pk, $dict): AccessGroup { - return new AccessGroup($dict['accessGroupId'], $dict['groupName']); + $conv = []; + foreach ($dict as $key => $val) { + $conv[strtolower($key)] = $val; + } + $dict = $conv; + return new AccessGroup($dict['accessgroupid'], $dict['groupname']); } /** @@ -81,4 +86,4 @@ function get($pk): ?AccessGroup { function save($model): AccessGroup { return Util::cast(parent::save($model), AccessGroup::class); } -} \ No newline at end of file +} diff --git a/src/dba/models/AccessGroupUserFactory.class.php b/src/dba/models/AccessGroupUserFactory.class.php index 595fb0782..768af44ac 100644 --- a/src/dba/models/AccessGroupUserFactory.class.php +++ b/src/dba/models/AccessGroupUserFactory.class.php @@ -36,7 +36,12 @@ function getNullObject(): AccessGroupUser { * @return AccessGroupUser */ function createObjectFromDict($pk, $dict): AccessGroupUser { - return new AccessGroupUser($dict['accessGroupUserId'], $dict['accessGroupId'], $dict['userId']); + $conv = []; + foreach ($dict as $key => $val) { + $conv[strtolower($key)] = $val; + } + $dict = $conv; + return new AccessGroupUser($dict['accessgroupuserid'], $dict['accessgroupid'], $dict['userid']); } /** @@ -81,4 +86,4 @@ function get($pk): ?AccessGroupUser { function save($model): AccessGroupUser { return Util::cast(parent::save($model), AccessGroupUser::class); } -} \ No newline at end of file +} diff --git a/src/dba/models/AgentBinaryFactory.class.php b/src/dba/models/AgentBinaryFactory.class.php index 8b939ff2c..4de969beb 100644 --- a/src/dba/models/AgentBinaryFactory.class.php +++ b/src/dba/models/AgentBinaryFactory.class.php @@ -36,7 +36,12 @@ function getNullObject(): AgentBinary { * @return AgentBinary */ function createObjectFromDict($pk, $dict): AgentBinary { - return new AgentBinary($dict['agentBinaryId'], $dict['binaryType'], $dict['version'], $dict['operatingSystems'], $dict['filename'], $dict['updateTrack'], $dict['updateAvailable']); + $conv = []; + foreach ($dict as $key => $val) { + $conv[strtolower($key)] = $val; + } + $dict = $conv; + return new AgentBinary($dict['agentbinaryid'], $dict['binarytype'], $dict['version'], $dict['operatingsystems'], $dict['filename'], $dict['updatetrack'], $dict['updateavailable']); } /** @@ -81,4 +86,4 @@ function get($pk): ?AgentBinary { function save($model): AgentBinary { return Util::cast(parent::save($model), AgentBinary::class); } -} \ No newline at end of file +} diff --git a/src/dba/models/AgentErrorFactory.class.php b/src/dba/models/AgentErrorFactory.class.php index 87dcd275d..a2209080f 100644 --- a/src/dba/models/AgentErrorFactory.class.php +++ b/src/dba/models/AgentErrorFactory.class.php @@ -36,7 +36,12 @@ function getNullObject(): AgentError { * @return AgentError */ function createObjectFromDict($pk, $dict): AgentError { - return new AgentError($dict['agentErrorId'], $dict['agentId'], $dict['taskId'], $dict['chunkId'], $dict['time'], $dict['error']); + $conv = []; + foreach ($dict as $key => $val) { + $conv[strtolower($key)] = $val; + } + $dict = $conv; + return new AgentError($dict['agenterrorid'], $dict['agentid'], $dict['taskid'], $dict['chunkid'], $dict['time'], $dict['error']); } /** @@ -81,4 +86,4 @@ function get($pk): ?AgentError { function save($model): AgentError { return Util::cast(parent::save($model), AgentError::class); } -} \ No newline at end of file +} diff --git a/src/dba/models/AgentFactory.class.php b/src/dba/models/AgentFactory.class.php index 80cc0de40..3f341d2ce 100644 --- a/src/dba/models/AgentFactory.class.php +++ b/src/dba/models/AgentFactory.class.php @@ -36,7 +36,12 @@ function getNullObject(): Agent { * @return Agent */ function createObjectFromDict($pk, $dict): Agent { - return new Agent($dict['agentId'], $dict['agentName'], $dict['uid'], $dict['os'], $dict['devices'], $dict['cmdPars'], $dict['ignoreErrors'], $dict['isActive'], $dict['isTrusted'], $dict['token'], $dict['lastAct'], $dict['lastTime'], $dict['lastIp'], $dict['userId'], $dict['cpuOnly'], $dict['clientSignature']); + $conv = []; + foreach ($dict as $key => $val) { + $conv[strtolower($key)] = $val; + } + $dict = $conv; + return new Agent($dict['agentid'], $dict['agentname'], $dict['uid'], $dict['os'], $dict['devices'], $dict['cmdpars'], $dict['ignoreerrors'], $dict['isactive'], $dict['istrusted'], $dict['token'], $dict['lastact'], $dict['lasttime'], $dict['lastip'], $dict['userid'], $dict['cpuonly'], $dict['clientsignature']); } /** @@ -81,4 +86,4 @@ function get($pk): ?Agent { function save($model): Agent { return Util::cast(parent::save($model), Agent::class); } -} \ No newline at end of file +} diff --git a/src/dba/models/AgentStatFactory.class.php b/src/dba/models/AgentStatFactory.class.php index bef329273..ab291170b 100644 --- a/src/dba/models/AgentStatFactory.class.php +++ b/src/dba/models/AgentStatFactory.class.php @@ -36,7 +36,12 @@ function getNullObject(): AgentStat { * @return AgentStat */ function createObjectFromDict($pk, $dict): AgentStat { - return new AgentStat($dict['agentStatId'], $dict['agentId'], $dict['statType'], $dict['time'], $dict['value']); + $conv = []; + foreach ($dict as $key => $val) { + $conv[strtolower($key)] = $val; + } + $dict = $conv; + return new AgentStat($dict['agentstatid'], $dict['agentid'], $dict['stattype'], $dict['time'], $dict['value']); } /** @@ -81,4 +86,4 @@ function get($pk): ?AgentStat { function save($model): AgentStat { return Util::cast(parent::save($model), AgentStat::class); } -} \ No newline at end of file +} diff --git a/src/dba/models/AgentZapFactory.class.php b/src/dba/models/AgentZapFactory.class.php index 5ec939e7b..0443fbabb 100644 --- a/src/dba/models/AgentZapFactory.class.php +++ b/src/dba/models/AgentZapFactory.class.php @@ -36,7 +36,12 @@ function getNullObject(): AgentZap { * @return AgentZap */ function createObjectFromDict($pk, $dict): AgentZap { - return new AgentZap($dict['agentZapId'], $dict['agentId'], $dict['lastZapId']); + $conv = []; + foreach ($dict as $key => $val) { + $conv[strtolower($key)] = $val; + } + $dict = $conv; + return new AgentZap($dict['agentzapid'], $dict['agentid'], $dict['lastzapid']); } /** @@ -81,4 +86,4 @@ function get($pk): ?AgentZap { function save($model): AgentZap { return Util::cast(parent::save($model), AgentZap::class); } -} \ No newline at end of file +} diff --git a/src/dba/models/ApiGroupFactory.class.php b/src/dba/models/ApiGroupFactory.class.php index c1c1b6574..f8dce979c 100644 --- a/src/dba/models/ApiGroupFactory.class.php +++ b/src/dba/models/ApiGroupFactory.class.php @@ -36,7 +36,12 @@ function getNullObject(): ApiGroup { * @return ApiGroup */ function createObjectFromDict($pk, $dict): ApiGroup { - return new ApiGroup($dict['apiGroupId'], $dict['permissions'], $dict['name']); + $conv = []; + foreach ($dict as $key => $val) { + $conv[strtolower($key)] = $val; + } + $dict = $conv; + return new ApiGroup($dict['apigroupid'], $dict['permissions'], $dict['name']); } /** @@ -81,4 +86,4 @@ function get($pk): ?ApiGroup { function save($model): ApiGroup { return Util::cast(parent::save($model), ApiGroup::class); } -} \ No newline at end of file +} diff --git a/src/dba/models/ApiKeyFactory.class.php b/src/dba/models/ApiKeyFactory.class.php index a71ec81b7..4fb5a406d 100644 --- a/src/dba/models/ApiKeyFactory.class.php +++ b/src/dba/models/ApiKeyFactory.class.php @@ -36,7 +36,12 @@ function getNullObject(): ApiKey { * @return ApiKey */ function createObjectFromDict($pk, $dict): ApiKey { - return new ApiKey($dict['apiKeyId'], $dict['startValid'], $dict['endValid'], $dict['accessKey'], $dict['accessCount'], $dict['userId'], $dict['apiGroupId']); + $conv = []; + foreach ($dict as $key => $val) { + $conv[strtolower($key)] = $val; + } + $dict = $conv; + return new ApiKey($dict['apikeyid'], $dict['startvalid'], $dict['endvalid'], $dict['accesskey'], $dict['accesscount'], $dict['userid'], $dict['apigroupid']); } /** @@ -81,4 +86,4 @@ function get($pk): ?ApiKey { function save($model): ApiKey { return Util::cast(parent::save($model), ApiKey::class); } -} \ No newline at end of file +} diff --git a/src/dba/models/AssignmentFactory.class.php b/src/dba/models/AssignmentFactory.class.php index 438f7bfdf..8a755acd4 100644 --- a/src/dba/models/AssignmentFactory.class.php +++ b/src/dba/models/AssignmentFactory.class.php @@ -36,7 +36,12 @@ function getNullObject(): Assignment { * @return Assignment */ function createObjectFromDict($pk, $dict): Assignment { - return new Assignment($dict['assignmentId'], $dict['taskId'], $dict['agentId'], $dict['benchmark']); + $conv = []; + foreach ($dict as $key => $val) { + $conv[strtolower($key)] = $val; + } + $dict = $conv; + return new Assignment($dict['assignmentid'], $dict['taskid'], $dict['agentid'], $dict['benchmark']); } /** @@ -81,4 +86,4 @@ function get($pk): ?Assignment { function save($model): Assignment { return Util::cast(parent::save($model), Assignment::class); } -} \ No newline at end of file +} diff --git a/src/dba/models/ChunkFactory.class.php b/src/dba/models/ChunkFactory.class.php index 4802503d8..57e0fe26b 100644 --- a/src/dba/models/ChunkFactory.class.php +++ b/src/dba/models/ChunkFactory.class.php @@ -36,7 +36,12 @@ function getNullObject(): Chunk { * @return Chunk */ function createObjectFromDict($pk, $dict): Chunk { - return new Chunk($dict['chunkId'], $dict['taskId'], $dict['skip'], $dict['length'], $dict['agentId'], $dict['dispatchTime'], $dict['solveTime'], $dict['checkpoint'], $dict['progress'], $dict['state'], $dict['cracked'], $dict['speed']); + $conv = []; + foreach ($dict as $key => $val) { + $conv[strtolower($key)] = $val; + } + $dict = $conv; + return new Chunk($dict['chunkid'], $dict['taskid'], $dict['skip'], $dict['length'], $dict['agentid'], $dict['dispatchtime'], $dict['solvetime'], $dict['checkpoint'], $dict['progress'], $dict['state'], $dict['cracked'], $dict['speed']); } /** @@ -81,4 +86,4 @@ function get($pk): ?Chunk { function save($model): Chunk { return Util::cast(parent::save($model), Chunk::class); } -} \ No newline at end of file +} diff --git a/src/dba/models/ConfigFactory.class.php b/src/dba/models/ConfigFactory.class.php index 448d9e08f..ded4d1a50 100644 --- a/src/dba/models/ConfigFactory.class.php +++ b/src/dba/models/ConfigFactory.class.php @@ -36,7 +36,12 @@ function getNullObject(): Config { * @return Config */ function createObjectFromDict($pk, $dict): Config { - return new Config($dict['configId'], $dict['configSectionId'], $dict['item'], $dict['value']); + $conv = []; + foreach ($dict as $key => $val) { + $conv[strtolower($key)] = $val; + } + $dict = $conv; + return new Config($dict['configid'], $dict['configsectionid'], $dict['item'], $dict['value']); } /** @@ -81,4 +86,4 @@ function get($pk): ?Config { function save($model): Config { return Util::cast(parent::save($model), Config::class); } -} \ No newline at end of file +} diff --git a/src/dba/models/ConfigSectionFactory.class.php b/src/dba/models/ConfigSectionFactory.class.php index 07a977032..102e21a95 100644 --- a/src/dba/models/ConfigSectionFactory.class.php +++ b/src/dba/models/ConfigSectionFactory.class.php @@ -36,7 +36,12 @@ function getNullObject(): ConfigSection { * @return ConfigSection */ function createObjectFromDict($pk, $dict): ConfigSection { - return new ConfigSection($dict['configSectionId'], $dict['sectionName']); + $conv = []; + foreach ($dict as $key => $val) { + $conv[strtolower($key)] = $val; + } + $dict = $conv; + return new ConfigSection($dict['configsectionid'], $dict['sectionname']); } /** @@ -81,4 +86,4 @@ function get($pk): ?ConfigSection { function save($model): ConfigSection { return Util::cast(parent::save($model), ConfigSection::class); } -} \ No newline at end of file +} diff --git a/src/dba/models/CrackerBinaryFactory.class.php b/src/dba/models/CrackerBinaryFactory.class.php index c95a43342..bd86b3284 100644 --- a/src/dba/models/CrackerBinaryFactory.class.php +++ b/src/dba/models/CrackerBinaryFactory.class.php @@ -36,7 +36,12 @@ function getNullObject(): CrackerBinary { * @return CrackerBinary */ function createObjectFromDict($pk, $dict): CrackerBinary { - return new CrackerBinary($dict['crackerBinaryId'], $dict['crackerBinaryTypeId'], $dict['version'], $dict['downloadUrl'], $dict['binaryName']); + $conv = []; + foreach ($dict as $key => $val) { + $conv[strtolower($key)] = $val; + } + $dict = $conv; + return new CrackerBinary($dict['crackerbinaryid'], $dict['crackerbinarytypeid'], $dict['version'], $dict['downloadurl'], $dict['binaryname']); } /** @@ -81,4 +86,4 @@ function get($pk): ?CrackerBinary { function save($model): CrackerBinary { return Util::cast(parent::save($model), CrackerBinary::class); } -} \ No newline at end of file +} diff --git a/src/dba/models/CrackerBinaryTypeFactory.class.php b/src/dba/models/CrackerBinaryTypeFactory.class.php index 7b4f8e54f..ecc0bf450 100644 --- a/src/dba/models/CrackerBinaryTypeFactory.class.php +++ b/src/dba/models/CrackerBinaryTypeFactory.class.php @@ -36,7 +36,12 @@ function getNullObject(): CrackerBinaryType { * @return CrackerBinaryType */ function createObjectFromDict($pk, $dict): CrackerBinaryType { - return new CrackerBinaryType($dict['crackerBinaryTypeId'], $dict['typeName'], $dict['isChunkingAvailable']); + $conv = []; + foreach ($dict as $key => $val) { + $conv[strtolower($key)] = $val; + } + $dict = $conv; + return new CrackerBinaryType($dict['crackerbinarytypeid'], $dict['typename'], $dict['ischunkingavailable']); } /** @@ -81,4 +86,4 @@ function get($pk): ?CrackerBinaryType { function save($model): CrackerBinaryType { return Util::cast(parent::save($model), CrackerBinaryType::class); } -} \ No newline at end of file +} diff --git a/src/dba/models/FileDeleteFactory.class.php b/src/dba/models/FileDeleteFactory.class.php index a6805c17b..876020942 100644 --- a/src/dba/models/FileDeleteFactory.class.php +++ b/src/dba/models/FileDeleteFactory.class.php @@ -36,7 +36,12 @@ function getNullObject(): FileDelete { * @return FileDelete */ function createObjectFromDict($pk, $dict): FileDelete { - return new FileDelete($dict['fileDeleteId'], $dict['filename'], $dict['time']); + $conv = []; + foreach ($dict as $key => $val) { + $conv[strtolower($key)] = $val; + } + $dict = $conv; + return new FileDelete($dict['filedeleteid'], $dict['filename'], $dict['time']); } /** @@ -81,4 +86,4 @@ function get($pk): ?FileDelete { function save($model): FileDelete { return Util::cast(parent::save($model), FileDelete::class); } -} \ No newline at end of file +} diff --git a/src/dba/models/FileDownloadFactory.class.php b/src/dba/models/FileDownloadFactory.class.php index 57902630f..2075f6115 100644 --- a/src/dba/models/FileDownloadFactory.class.php +++ b/src/dba/models/FileDownloadFactory.class.php @@ -36,7 +36,12 @@ function getNullObject(): FileDownload { * @return FileDownload */ function createObjectFromDict($pk, $dict): FileDownload { - return new FileDownload($dict['fileDownloadId'], $dict['time'], $dict['fileId'], $dict['status']); + $conv = []; + foreach ($dict as $key => $val) { + $conv[strtolower($key)] = $val; + } + $dict = $conv; + return new FileDownload($dict['filedownloadid'], $dict['time'], $dict['fileid'], $dict['status']); } /** @@ -81,4 +86,4 @@ function get($pk): ?FileDownload { function save($model): FileDownload { return Util::cast(parent::save($model), FileDownload::class); } -} \ No newline at end of file +} diff --git a/src/dba/models/FileFactory.class.php b/src/dba/models/FileFactory.class.php index 45b033c16..31b8562dd 100644 --- a/src/dba/models/FileFactory.class.php +++ b/src/dba/models/FileFactory.class.php @@ -36,7 +36,12 @@ function getNullObject(): File { * @return File */ function createObjectFromDict($pk, $dict): File { - return new File($dict['fileId'], $dict['filename'], $dict['size'], $dict['isSecret'], $dict['fileType'], $dict['accessGroupId'], $dict['lineCount']); + $conv = []; + foreach ($dict as $key => $val) { + $conv[strtolower($key)] = $val; + } + $dict = $conv; + return new File($dict['fileid'], $dict['filename'], $dict['size'], $dict['issecret'], $dict['filetype'], $dict['accessgroupid'], $dict['linecount']); } /** @@ -81,4 +86,4 @@ function get($pk): ?File { function save($model): File { return Util::cast(parent::save($model), File::class); } -} \ No newline at end of file +} diff --git a/src/dba/models/FilePretaskFactory.class.php b/src/dba/models/FilePretaskFactory.class.php index 244df0449..62bdbbafb 100644 --- a/src/dba/models/FilePretaskFactory.class.php +++ b/src/dba/models/FilePretaskFactory.class.php @@ -36,7 +36,12 @@ function getNullObject(): FilePretask { * @return FilePretask */ function createObjectFromDict($pk, $dict): FilePretask { - return new FilePretask($dict['filePretaskId'], $dict['fileId'], $dict['pretaskId']); + $conv = []; + foreach ($dict as $key => $val) { + $conv[strtolower($key)] = $val; + } + $dict = $conv; + return new FilePretask($dict['filepretaskid'], $dict['fileid'], $dict['pretaskid']); } /** @@ -81,4 +86,4 @@ function get($pk): ?FilePretask { function save($model): FilePretask { return Util::cast(parent::save($model), FilePretask::class); } -} \ No newline at end of file +} diff --git a/src/dba/models/FileTaskFactory.class.php b/src/dba/models/FileTaskFactory.class.php index 668bdfbf1..16831b76c 100644 --- a/src/dba/models/FileTaskFactory.class.php +++ b/src/dba/models/FileTaskFactory.class.php @@ -36,7 +36,12 @@ function getNullObject(): FileTask { * @return FileTask */ function createObjectFromDict($pk, $dict): FileTask { - return new FileTask($dict['fileTaskId'], $dict['fileId'], $dict['taskId']); + $conv = []; + foreach ($dict as $key => $val) { + $conv[strtolower($key)] = $val; + } + $dict = $conv; + return new FileTask($dict['filetaskid'], $dict['fileid'], $dict['taskid']); } /** @@ -81,4 +86,4 @@ function get($pk): ?FileTask { function save($model): FileTask { return Util::cast(parent::save($model), FileTask::class); } -} \ No newline at end of file +} diff --git a/src/dba/models/HashBinaryFactory.class.php b/src/dba/models/HashBinaryFactory.class.php index 7fcd54a65..a36097db8 100644 --- a/src/dba/models/HashBinaryFactory.class.php +++ b/src/dba/models/HashBinaryFactory.class.php @@ -36,7 +36,12 @@ function getNullObject(): HashBinary { * @return HashBinary */ function createObjectFromDict($pk, $dict): HashBinary { - return new HashBinary($dict['hashBinaryId'], $dict['hashlistId'], $dict['essid'], $dict['hash'], $dict['plaintext'], $dict['timeCracked'], $dict['chunkId'], $dict['isCracked'], $dict['crackPos']); + $conv = []; + foreach ($dict as $key => $val) { + $conv[strtolower($key)] = $val; + } + $dict = $conv; + return new HashBinary($dict['hashbinaryid'], $dict['hashlistid'], $dict['essid'], $dict['hash'], $dict['plaintext'], $dict['timecracked'], $dict['chunkid'], $dict['iscracked'], $dict['crackpos']); } /** @@ -81,4 +86,4 @@ function get($pk): ?HashBinary { function save($model): HashBinary { return Util::cast(parent::save($model), HashBinary::class); } -} \ No newline at end of file +} diff --git a/src/dba/models/HashFactory.class.php b/src/dba/models/HashFactory.class.php index 27f9198ad..ef611a1f4 100644 --- a/src/dba/models/HashFactory.class.php +++ b/src/dba/models/HashFactory.class.php @@ -36,7 +36,12 @@ function getNullObject(): Hash { * @return Hash */ function createObjectFromDict($pk, $dict): Hash { - return new Hash($dict['hashId'], $dict['hashlistId'], $dict['hash'], $dict['salt'], $dict['plaintext'], $dict['timeCracked'], $dict['chunkId'], $dict['isCracked'], $dict['crackPos']); + $conv = []; + foreach ($dict as $key => $val) { + $conv[strtolower($key)] = $val; + } + $dict = $conv; + return new Hash($dict['hashid'], $dict['hashlistid'], $dict['hash'], $dict['salt'], $dict['plaintext'], $dict['timecracked'], $dict['chunkid'], $dict['iscracked'], $dict['crackpos']); } /** @@ -81,4 +86,4 @@ function get($pk): ?Hash { function save($model): Hash { return Util::cast(parent::save($model), Hash::class); } -} \ No newline at end of file +} diff --git a/src/dba/models/HashTypeFactory.class.php b/src/dba/models/HashTypeFactory.class.php index b457b61bb..3121da8ab 100644 --- a/src/dba/models/HashTypeFactory.class.php +++ b/src/dba/models/HashTypeFactory.class.php @@ -36,7 +36,12 @@ function getNullObject(): HashType { * @return HashType */ function createObjectFromDict($pk, $dict): HashType { - return new HashType($dict['hashTypeId'], $dict['description'], $dict['isSalted'], $dict['isSlowHash']); + $conv = []; + foreach ($dict as $key => $val) { + $conv[strtolower($key)] = $val; + } + $dict = $conv; + return new HashType($dict['hashtypeid'], $dict['description'], $dict['issalted'], $dict['isslowhash']); } /** @@ -81,4 +86,4 @@ function get($pk): ?HashType { function save($model): HashType { return Util::cast(parent::save($model), HashType::class); } -} \ No newline at end of file +} diff --git a/src/dba/models/HashlistFactory.class.php b/src/dba/models/HashlistFactory.class.php index 8314c21c3..3d4d71064 100644 --- a/src/dba/models/HashlistFactory.class.php +++ b/src/dba/models/HashlistFactory.class.php @@ -36,7 +36,12 @@ function getNullObject(): Hashlist { * @return Hashlist */ function createObjectFromDict($pk, $dict): Hashlist { - return new Hashlist($dict['hashlistId'], $dict['hashlistName'], $dict['format'], $dict['hashTypeId'], $dict['hashCount'], $dict['saltSeparator'], $dict['cracked'], $dict['isSecret'], $dict['hexSalt'], $dict['isSalted'], $dict['accessGroupId'], $dict['notes'], $dict['brainId'], $dict['brainFeatures'], $dict['isArchived']); + $conv = []; + foreach ($dict as $key => $val) { + $conv[strtolower($key)] = $val; + } + $dict = $conv; + return new Hashlist($dict['hashlistid'], $dict['hashlistname'], $dict['format'], $dict['hashtypeid'], $dict['hashcount'], $dict['saltseparator'], $dict['cracked'], $dict['issecret'], $dict['hexsalt'], $dict['issalted'], $dict['accessgroupid'], $dict['notes'], $dict['brainid'], $dict['brainfeatures'], $dict['isarchived']); } /** @@ -81,4 +86,4 @@ function get($pk): ?Hashlist { function save($model): Hashlist { return Util::cast(parent::save($model), Hashlist::class); } -} \ No newline at end of file +} diff --git a/src/dba/models/HashlistHashlistFactory.class.php b/src/dba/models/HashlistHashlistFactory.class.php index a8a1b0e0c..38c712972 100644 --- a/src/dba/models/HashlistHashlistFactory.class.php +++ b/src/dba/models/HashlistHashlistFactory.class.php @@ -36,7 +36,12 @@ function getNullObject(): HashlistHashlist { * @return HashlistHashlist */ function createObjectFromDict($pk, $dict): HashlistHashlist { - return new HashlistHashlist($dict['hashlistHashlistId'], $dict['parentHashlistId'], $dict['hashlistId']); + $conv = []; + foreach ($dict as $key => $val) { + $conv[strtolower($key)] = $val; + } + $dict = $conv; + return new HashlistHashlist($dict['hashlisthashlistid'], $dict['parenthashlistid'], $dict['hashlistid']); } /** @@ -81,4 +86,4 @@ function get($pk): ?HashlistHashlist { function save($model): HashlistHashlist { return Util::cast(parent::save($model), HashlistHashlist::class); } -} \ No newline at end of file +} diff --git a/src/dba/models/HealthCheckAgentFactory.class.php b/src/dba/models/HealthCheckAgentFactory.class.php index c55658d3e..0e85f0f0b 100644 --- a/src/dba/models/HealthCheckAgentFactory.class.php +++ b/src/dba/models/HealthCheckAgentFactory.class.php @@ -36,8 +36,13 @@ function getNullObject(): HealthCheckAgent { * @return HealthCheckAgent */ function createObjectFromDict($pk, $dict): HealthCheckAgent { + $conv = []; + foreach ($dict as $key => $val) { + $conv[strtolower($key)] = $val; + } + $dict = $conv; $dict['end'] = $dict['htp_end']; - return new HealthCheckAgent($dict['healthCheckAgentId'], $dict['healthCheckId'], $dict['agentId'], $dict['status'], $dict['cracked'], $dict['numGpus'], $dict['start'], $dict['end'], $dict['errors']); + return new HealthCheckAgent($dict['healthcheckagentid'], $dict['healthcheckid'], $dict['agentid'], $dict['status'], $dict['cracked'], $dict['numgpus'], $dict['start'], $dict['end'], $dict['errors']); } /** @@ -82,4 +87,4 @@ function get($pk): ?HealthCheckAgent { function save($model): HealthCheckAgent { return Util::cast(parent::save($model), HealthCheckAgent::class); } -} \ No newline at end of file +} diff --git a/src/dba/models/HealthCheckFactory.class.php b/src/dba/models/HealthCheckFactory.class.php index 1615f4278..4eff86586 100644 --- a/src/dba/models/HealthCheckFactory.class.php +++ b/src/dba/models/HealthCheckFactory.class.php @@ -36,7 +36,12 @@ function getNullObject(): HealthCheck { * @return HealthCheck */ function createObjectFromDict($pk, $dict): HealthCheck { - return new HealthCheck($dict['healthCheckId'], $dict['time'], $dict['status'], $dict['checkType'], $dict['hashtypeId'], $dict['crackerBinaryId'], $dict['expectedCracks'], $dict['attackCmd']); + $conv = []; + foreach ($dict as $key => $val) { + $conv[strtolower($key)] = $val; + } + $dict = $conv; + return new HealthCheck($dict['healthcheckid'], $dict['time'], $dict['status'], $dict['checktype'], $dict['hashtypeid'], $dict['crackerbinaryid'], $dict['expectedcracks'], $dict['attackcmd']); } /** @@ -81,4 +86,4 @@ function get($pk): ?HealthCheck { function save($model): HealthCheck { return Util::cast(parent::save($model), HealthCheck::class); } -} \ No newline at end of file +} diff --git a/src/dba/models/LogEntryFactory.class.php b/src/dba/models/LogEntryFactory.class.php index abfdb6976..ffeff41e5 100644 --- a/src/dba/models/LogEntryFactory.class.php +++ b/src/dba/models/LogEntryFactory.class.php @@ -36,7 +36,12 @@ function getNullObject(): LogEntry { * @return LogEntry */ function createObjectFromDict($pk, $dict): LogEntry { - return new LogEntry($dict['logEntryId'], $dict['issuer'], $dict['issuerId'], $dict['level'], $dict['message'], $dict['time']); + $conv = []; + foreach ($dict as $key => $val) { + $conv[strtolower($key)] = $val; + } + $dict = $conv; + return new LogEntry($dict['logentryid'], $dict['issuer'], $dict['issuerid'], $dict['level'], $dict['message'], $dict['time']); } /** @@ -81,4 +86,4 @@ function get($pk): ?LogEntry { function save($model): LogEntry { return Util::cast(parent::save($model), LogEntry::class); } -} \ No newline at end of file +} diff --git a/src/dba/models/NotificationSettingFactory.class.php b/src/dba/models/NotificationSettingFactory.class.php index d77a8a374..8b8202252 100644 --- a/src/dba/models/NotificationSettingFactory.class.php +++ b/src/dba/models/NotificationSettingFactory.class.php @@ -36,7 +36,12 @@ function getNullObject(): NotificationSetting { * @return NotificationSetting */ function createObjectFromDict($pk, $dict): NotificationSetting { - return new NotificationSetting($dict['notificationSettingId'], $dict['action'], $dict['objectId'], $dict['notification'], $dict['userId'], $dict['receiver'], $dict['isActive']); + $conv = []; + foreach ($dict as $key => $val) { + $conv[strtolower($key)] = $val; + } + $dict = $conv; + return new NotificationSetting($dict['notificationsettingid'], $dict['action'], $dict['objectid'], $dict['notification'], $dict['userid'], $dict['receiver'], $dict['isactive']); } /** @@ -81,4 +86,4 @@ function get($pk): ?NotificationSetting { function save($model): NotificationSetting { return Util::cast(parent::save($model), NotificationSetting::class); } -} \ No newline at end of file +} diff --git a/src/dba/models/PreprocessorFactory.class.php b/src/dba/models/PreprocessorFactory.class.php index 1b22bbef3..2c2d57045 100644 --- a/src/dba/models/PreprocessorFactory.class.php +++ b/src/dba/models/PreprocessorFactory.class.php @@ -36,7 +36,12 @@ function getNullObject(): Preprocessor { * @return Preprocessor */ function createObjectFromDict($pk, $dict): Preprocessor { - return new Preprocessor($dict['preprocessorId'], $dict['name'], $dict['url'], $dict['binaryName'], $dict['keyspaceCommand'], $dict['skipCommand'], $dict['limitCommand']); + $conv = []; + foreach ($dict as $key => $val) { + $conv[strtolower($key)] = $val; + } + $dict = $conv; + return new Preprocessor($dict['preprocessorid'], $dict['name'], $dict['url'], $dict['binaryname'], $dict['keyspacecommand'], $dict['skipcommand'], $dict['limitcommand']); } /** @@ -81,4 +86,4 @@ function get($pk): ?Preprocessor { function save($model): Preprocessor { return Util::cast(parent::save($model), Preprocessor::class); } -} \ No newline at end of file +} diff --git a/src/dba/models/PretaskFactory.class.php b/src/dba/models/PretaskFactory.class.php index 9f0028694..37a22dcbf 100644 --- a/src/dba/models/PretaskFactory.class.php +++ b/src/dba/models/PretaskFactory.class.php @@ -36,7 +36,12 @@ function getNullObject(): Pretask { * @return Pretask */ function createObjectFromDict($pk, $dict): Pretask { - return new Pretask($dict['pretaskId'], $dict['taskName'], $dict['attackCmd'], $dict['chunkTime'], $dict['statusTimer'], $dict['color'], $dict['isSmall'], $dict['isCpuTask'], $dict['useNewBench'], $dict['priority'], $dict['maxAgents'], $dict['isMaskImport'], $dict['crackerBinaryTypeId']); + $conv = []; + foreach ($dict as $key => $val) { + $conv[strtolower($key)] = $val; + } + $dict = $conv; + return new Pretask($dict['pretaskid'], $dict['taskname'], $dict['attackcmd'], $dict['chunktime'], $dict['statustimer'], $dict['color'], $dict['issmall'], $dict['iscputask'], $dict['usenewbench'], $dict['priority'], $dict['maxagents'], $dict['ismaskimport'], $dict['crackerbinarytypeid']); } /** @@ -81,4 +86,4 @@ function get($pk): ?Pretask { function save($model): Pretask { return Util::cast(parent::save($model), Pretask::class); } -} \ No newline at end of file +} diff --git a/src/dba/models/RegVoucherFactory.class.php b/src/dba/models/RegVoucherFactory.class.php index dc0279df4..a7f716c37 100644 --- a/src/dba/models/RegVoucherFactory.class.php +++ b/src/dba/models/RegVoucherFactory.class.php @@ -36,7 +36,12 @@ function getNullObject(): RegVoucher { * @return RegVoucher */ function createObjectFromDict($pk, $dict): RegVoucher { - return new RegVoucher($dict['regVoucherId'], $dict['voucher'], $dict['time']); + $conv = []; + foreach ($dict as $key => $val) { + $conv[strtolower($key)] = $val; + } + $dict = $conv; + return new RegVoucher($dict['regvoucherid'], $dict['voucher'], $dict['time']); } /** @@ -81,4 +86,4 @@ function get($pk): ?RegVoucher { function save($model): RegVoucher { return Util::cast(parent::save($model), RegVoucher::class); } -} \ No newline at end of file +} diff --git a/src/dba/models/RightGroupFactory.class.php b/src/dba/models/RightGroupFactory.class.php index 8b1de4539..1f5ce9de5 100644 --- a/src/dba/models/RightGroupFactory.class.php +++ b/src/dba/models/RightGroupFactory.class.php @@ -36,7 +36,12 @@ function getNullObject(): RightGroup { * @return RightGroup */ function createObjectFromDict($pk, $dict): RightGroup { - return new RightGroup($dict['rightGroupId'], $dict['groupName'], $dict['permissions']); + $conv = []; + foreach ($dict as $key => $val) { + $conv[strtolower($key)] = $val; + } + $dict = $conv; + return new RightGroup($dict['rightgroupid'], $dict['groupname'], $dict['permissions']); } /** @@ -81,4 +86,4 @@ function get($pk): ?RightGroup { function save($model): RightGroup { return Util::cast(parent::save($model), RightGroup::class); } -} \ No newline at end of file +} diff --git a/src/dba/models/SessionFactory.class.php b/src/dba/models/SessionFactory.class.php index 6ab2cf470..cde449f85 100644 --- a/src/dba/models/SessionFactory.class.php +++ b/src/dba/models/SessionFactory.class.php @@ -36,7 +36,12 @@ function getNullObject(): Session { * @return Session */ function createObjectFromDict($pk, $dict): Session { - return new Session($dict['sessionId'], $dict['userId'], $dict['sessionStartDate'], $dict['lastActionDate'], $dict['isOpen'], $dict['sessionLifetime'], $dict['sessionKey']); + $conv = []; + foreach ($dict as $key => $val) { + $conv[strtolower($key)] = $val; + } + $dict = $conv; + return new Session($dict['sessionid'], $dict['userid'], $dict['sessionstartdate'], $dict['lastactiondate'], $dict['isopen'], $dict['sessionlifetime'], $dict['sessionkey']); } /** @@ -81,4 +86,4 @@ function get($pk): ?Session { function save($model): Session { return Util::cast(parent::save($model), Session::class); } -} \ No newline at end of file +} diff --git a/src/dba/models/SpeedFactory.class.php b/src/dba/models/SpeedFactory.class.php index df1314dd8..60039986c 100644 --- a/src/dba/models/SpeedFactory.class.php +++ b/src/dba/models/SpeedFactory.class.php @@ -36,7 +36,12 @@ function getNullObject(): Speed { * @return Speed */ function createObjectFromDict($pk, $dict): Speed { - return new Speed($dict['speedId'], $dict['agentId'], $dict['taskId'], $dict['speed'], $dict['time']); + $conv = []; + foreach ($dict as $key => $val) { + $conv[strtolower($key)] = $val; + } + $dict = $conv; + return new Speed($dict['speedid'], $dict['agentid'], $dict['taskid'], $dict['speed'], $dict['time']); } /** @@ -81,4 +86,4 @@ function get($pk): ?Speed { function save($model): Speed { return Util::cast(parent::save($model), Speed::class); } -} \ No newline at end of file +} diff --git a/src/dba/models/StoredValueFactory.class.php b/src/dba/models/StoredValueFactory.class.php index 85e2a06ef..acc335354 100644 --- a/src/dba/models/StoredValueFactory.class.php +++ b/src/dba/models/StoredValueFactory.class.php @@ -36,7 +36,12 @@ function getNullObject(): StoredValue { * @return StoredValue */ function createObjectFromDict($pk, $dict): StoredValue { - return new StoredValue($dict['storedValueId'], $dict['val']); + $conv = []; + foreach ($dict as $key => $val) { + $conv[strtolower($key)] = $val; + } + $dict = $conv; + return new StoredValue($dict['storedvalueid'], $dict['val']); } /** @@ -81,4 +86,4 @@ function get($pk): ?StoredValue { function save($model): StoredValue { return Util::cast(parent::save($model), StoredValue::class); } -} \ No newline at end of file +} diff --git a/src/dba/models/SupertaskFactory.class.php b/src/dba/models/SupertaskFactory.class.php index e287257d8..5d20ea7da 100644 --- a/src/dba/models/SupertaskFactory.class.php +++ b/src/dba/models/SupertaskFactory.class.php @@ -36,7 +36,12 @@ function getNullObject(): Supertask { * @return Supertask */ function createObjectFromDict($pk, $dict): Supertask { - return new Supertask($dict['supertaskId'], $dict['supertaskName']); + $conv = []; + foreach ($dict as $key => $val) { + $conv[strtolower($key)] = $val; + } + $dict = $conv; + return new Supertask($dict['supertaskid'], $dict['supertaskname']); } /** @@ -81,4 +86,4 @@ function get($pk): ?Supertask { function save($model): Supertask { return Util::cast(parent::save($model), Supertask::class); } -} \ No newline at end of file +} diff --git a/src/dba/models/SupertaskPretaskFactory.class.php b/src/dba/models/SupertaskPretaskFactory.class.php index da9000576..74dc6d04c 100644 --- a/src/dba/models/SupertaskPretaskFactory.class.php +++ b/src/dba/models/SupertaskPretaskFactory.class.php @@ -36,7 +36,12 @@ function getNullObject(): SupertaskPretask { * @return SupertaskPretask */ function createObjectFromDict($pk, $dict): SupertaskPretask { - return new SupertaskPretask($dict['supertaskPretaskId'], $dict['supertaskId'], $dict['pretaskId']); + $conv = []; + foreach ($dict as $key => $val) { + $conv[strtolower($key)] = $val; + } + $dict = $conv; + return new SupertaskPretask($dict['supertaskpretaskid'], $dict['supertaskid'], $dict['pretaskid']); } /** @@ -81,4 +86,4 @@ function get($pk): ?SupertaskPretask { function save($model): SupertaskPretask { return Util::cast(parent::save($model), SupertaskPretask::class); } -} \ No newline at end of file +} diff --git a/src/dba/models/TaskDebugOutputFactory.class.php b/src/dba/models/TaskDebugOutputFactory.class.php index 5190c9c2e..fc7a6a922 100644 --- a/src/dba/models/TaskDebugOutputFactory.class.php +++ b/src/dba/models/TaskDebugOutputFactory.class.php @@ -36,7 +36,12 @@ function getNullObject(): TaskDebugOutput { * @return TaskDebugOutput */ function createObjectFromDict($pk, $dict): TaskDebugOutput { - return new TaskDebugOutput($dict['taskDebugOutputId'], $dict['taskId'], $dict['output']); + $conv = []; + foreach ($dict as $key => $val) { + $conv[strtolower($key)] = $val; + } + $dict = $conv; + return new TaskDebugOutput($dict['taskdebugoutputid'], $dict['taskid'], $dict['output']); } /** @@ -81,4 +86,4 @@ function get($pk): ?TaskDebugOutput { function save($model): TaskDebugOutput { return Util::cast(parent::save($model), TaskDebugOutput::class); } -} \ No newline at end of file +} diff --git a/src/dba/models/TaskFactory.class.php b/src/dba/models/TaskFactory.class.php index 9b7a16f23..57a573388 100644 --- a/src/dba/models/TaskFactory.class.php +++ b/src/dba/models/TaskFactory.class.php @@ -36,7 +36,12 @@ function getNullObject(): Task { * @return Task */ function createObjectFromDict($pk, $dict): Task { - return new Task($dict['taskId'], $dict['taskName'], $dict['attackCmd'], $dict['chunkTime'], $dict['statusTimer'], $dict['keyspace'], $dict['keyspaceProgress'], $dict['priority'], $dict['maxAgents'], $dict['color'], $dict['isSmall'], $dict['isCpuTask'], $dict['useNewBench'], $dict['skipKeyspace'], $dict['crackerBinaryId'], $dict['crackerBinaryTypeId'], $dict['taskWrapperId'], $dict['isArchived'], $dict['notes'], $dict['staticChunks'], $dict['chunkSize'], $dict['forcePipe'], $dict['usePreprocessor'], $dict['preprocessorCommand']); + $conv = []; + foreach ($dict as $key => $val) { + $conv[strtolower($key)] = $val; + } + $dict = $conv; + return new Task($dict['taskid'], $dict['taskname'], $dict['attackcmd'], $dict['chunktime'], $dict['statustimer'], $dict['keyspace'], $dict['keyspaceprogress'], $dict['priority'], $dict['maxagents'], $dict['color'], $dict['issmall'], $dict['iscputask'], $dict['usenewbench'], $dict['skipkeyspace'], $dict['crackerbinaryid'], $dict['crackerbinarytypeid'], $dict['taskwrapperid'], $dict['isarchived'], $dict['notes'], $dict['staticchunks'], $dict['chunksize'], $dict['forcepipe'], $dict['usepreprocessor'], $dict['preprocessorcommand']); } /** @@ -81,4 +86,4 @@ function get($pk): ?Task { function save($model): Task { return Util::cast(parent::save($model), Task::class); } -} \ No newline at end of file +} diff --git a/src/dba/models/TaskWrapperFactory.class.php b/src/dba/models/TaskWrapperFactory.class.php index 4bab3456e..af14dcd4b 100644 --- a/src/dba/models/TaskWrapperFactory.class.php +++ b/src/dba/models/TaskWrapperFactory.class.php @@ -36,7 +36,12 @@ function getNullObject(): TaskWrapper { * @return TaskWrapper */ function createObjectFromDict($pk, $dict): TaskWrapper { - return new TaskWrapper($dict['taskWrapperId'], $dict['priority'], $dict['maxAgents'], $dict['taskType'], $dict['hashlistId'], $dict['accessGroupId'], $dict['taskWrapperName'], $dict['isArchived'], $dict['cracked']); + $conv = []; + foreach ($dict as $key => $val) { + $conv[strtolower($key)] = $val; + } + $dict = $conv; + return new TaskWrapper($dict['taskwrapperid'], $dict['priority'], $dict['maxagents'], $dict['tasktype'], $dict['hashlistid'], $dict['accessgroupid'], $dict['taskwrappername'], $dict['isarchived'], $dict['cracked']); } /** @@ -81,4 +86,4 @@ function get($pk): ?TaskWrapper { function save($model): TaskWrapper { return Util::cast(parent::save($model), TaskWrapper::class); } -} \ No newline at end of file +} diff --git a/src/dba/models/UserFactory.class.php b/src/dba/models/UserFactory.class.php index 4a1641713..5cea1449e 100644 --- a/src/dba/models/UserFactory.class.php +++ b/src/dba/models/UserFactory.class.php @@ -36,7 +36,12 @@ function getNullObject(): User { * @return User */ function createObjectFromDict($pk, $dict): User { - return new User($dict['userId'], $dict['username'], $dict['email'], $dict['passwordHash'], $dict['passwordSalt'], $dict['isValid'], $dict['isComputedPassword'], $dict['lastLoginDate'], $dict['registeredSince'], $dict['sessionLifetime'], $dict['rightGroupId'], $dict['yubikey'], $dict['otp1'], $dict['otp2'], $dict['otp3'], $dict['otp4']); + $conv = []; + foreach ($dict as $key => $val) { + $conv[strtolower($key)] = $val; + } + $dict = $conv; + return new User($dict['userid'], $dict['username'], $dict['email'], $dict['passwordhash'], $dict['passwordsalt'], $dict['isvalid'], $dict['iscomputedpassword'], $dict['lastlogindate'], $dict['registeredsince'], $dict['sessionlifetime'], $dict['rightgroupid'], $dict['yubikey'], $dict['otp1'], $dict['otp2'], $dict['otp3'], $dict['otp4']); } /** @@ -81,4 +86,4 @@ function get($pk): ?User { function save($model): User { return Util::cast(parent::save($model), User::class); } -} \ No newline at end of file +} diff --git a/src/dba/models/ZapFactory.class.php b/src/dba/models/ZapFactory.class.php index e526effcb..1c41d03ae 100644 --- a/src/dba/models/ZapFactory.class.php +++ b/src/dba/models/ZapFactory.class.php @@ -36,7 +36,12 @@ function getNullObject(): Zap { * @return Zap */ function createObjectFromDict($pk, $dict): Zap { - return new Zap($dict['zapId'], $dict['hash'], $dict['solveTime'], $dict['agentId'], $dict['hashlistId']); + $conv = []; + foreach ($dict as $key => $val) { + $conv[strtolower($key)] = $val; + } + $dict = $conv; + return new Zap($dict['zapid'], $dict['hash'], $dict['solvetime'], $dict['agentid'], $dict['hashlistid']); } /** @@ -81,4 +86,4 @@ function get($pk): ?Zap { function save($model): Zap { return Util::cast(parent::save($model), Zap::class); } -} \ No newline at end of file +} diff --git a/src/dba/models/generator.php b/src/dba/models/generator.php index 972a4b1b0..2e5edc4de 100644 --- a/src/dba/models/generator.php +++ b/src/dba/models/generator.php @@ -600,7 +600,7 @@ function getTypingType($str, $nullable = false): string { $dict2 = []; $mapping = []; foreach ($COLUMNS as $COLUMN) { - $col = $COLUMN['name']; + $col = strtolower($COLUMN['name']); if (sizeof($dict) == 0) { $dict[] = "-1"; $dict2[] = "\$dict['$col']"; From 21bdb34e0d215926bc6ef4c4b8f5b9ba271411ce Mon Sep 17 00:00:00 2001 From: Eric Wasson <229096365+Eric-Wasson@users.noreply.github.com> Date: Thu, 20 Nov 2025 13:29:35 +0100 Subject: [PATCH 260/691] Added backend handling of overwriting on import pre-cracked hashes --- .../helper/importCrackedHashes.routes.php | 3 +- src/inc/handlers/HashlistHandler.class.php | 2 +- src/inc/user-api/UserAPIHashlist.class.php | 3 +- src/inc/utils/HashlistUtils.class.php | 30 ++++++++++++++----- 4 files changed, 28 insertions(+), 10 deletions(-) diff --git a/src/inc/apiv2/helper/importCrackedHashes.routes.php b/src/inc/apiv2/helper/importCrackedHashes.routes.php index 5c2ca9ee7..a9a6d4632 100644 --- a/src/inc/apiv2/helper/importCrackedHashes.routes.php +++ b/src/inc/apiv2/helper/importCrackedHashes.routes.php @@ -28,6 +28,7 @@ public function getFormFields(): array { Hashlist::HASHLIST_ID => ["type" => "int"], "sourceData" => ['type' => 'str'], "separator" => ['type' => 'str'], + "overwrite" => ['type' => 'int'], ]; } @@ -52,7 +53,7 @@ public function actionPost($data): object|array|null { $importData = base64_decode($data["sourceData"]); - $result = HashlistUtils::processZap($hashlist->getId(), $data["separator"], "paste", ["hashfield" => $importData], [], $this->getCurrentUser()); + $result = HashlistUtils::processZap($hashlist->getId(), $data["separator"], "paste", ["hashfield" => $importData], [], $this->getCurrentUser(), (isset($data["overwrite"]) && intval($data["overwrite"]) == 1) ? true : false); return [ "totalLines" => $result[0], diff --git a/src/inc/handlers/HashlistHandler.class.php b/src/inc/handlers/HashlistHandler.class.php index 1e2672282..05024e0c5 100644 --- a/src/inc/handlers/HashlistHandler.class.php +++ b/src/inc/handlers/HashlistHandler.class.php @@ -49,7 +49,7 @@ public function handle($action) { break; case DHashlistAction::PROCESS_ZAP: AccessControl::getInstance()->checkPermission(DHashlistAction::PROCESS_ZAP_PERM); - $data = HashlistUtils::processZap($_POST['hashlist'], $_POST['separator'], $_POST['source'], $_POST, $_FILES, AccessControl::getInstance()->getUser()); + $data = HashlistUtils::processZap($_POST['hashlist'], $_POST['separator'], $_POST['source'], $_POST, $_FILES, AccessControl::getInstance()->getUser(), (isset($_POST["overwrite"]) && intval($_POST["overwrite"]) == 1) ? true : false); UI::addMessage(UI::SUCCESS, "Processed pre-cracked hashes: " . $data[0] . " total lines, " . $data[1] . " new cracked hashes, " . $data[2] . " were already cracked, " . $data[3] . " invalid lines, " . $data[4] . " not matching entries (" . $data[5] . "s)!"); if ($data[6] > 0) { UI::addMessage(UI::WARN, $data[6] . " entries with too long plaintext"); diff --git a/src/inc/user-api/UserAPIHashlist.class.php b/src/inc/user-api/UserAPIHashlist.class.php index 472298bae..affacb26f 100644 --- a/src/inc/user-api/UserAPIHashlist.class.php +++ b/src/inc/user-api/UserAPIHashlist.class.php @@ -182,7 +182,8 @@ private function importCracked($QUERY) { 'paste', ['hashfield' => base64_decode($QUERY[UQueryHashlist::HASHLIST_DATA])], [], - $this->user + $this->user, + false ); $response = [ UResponseHashlist::SECTION => $QUERY[UQueryHashlist::SECTION], diff --git a/src/inc/utils/HashlistUtils.class.php b/src/inc/utils/HashlistUtils.class.php index e2dece3c2..d7a18e66f 100644 --- a/src/inc/utils/HashlistUtils.class.php +++ b/src/inc/utils/HashlistUtils.class.php @@ -303,10 +303,11 @@ public static function rename($hashlistId, $name, $user) { * @param array $post * @param array $files * @param User $user + * @param boolean $overwritePlaintext * @return int[] * @throws HTException */ - public static function processZap($hashlistId, $separator, $source, $post, $files, $user) { + public static function processZap($hashlistId, $separator, $source, $post, $files, $user, $overwritePlaintext) { // pre-crack hashes processor $hashlist = HashlistUtils::getHashlist($hashlistId); if (!AccessUtils::userCanAccessHashlists($hashlist, $user)) { @@ -427,7 +428,9 @@ public static function processZap($hashlistId, $separator, $source, $post, $file } else if ($hashEntry->getIsCracked() == 1) { $alreadyCracked++; - continue; + if (!$overwritePlaintext) { + continue; + } } $plain = str_replace($hash . $separator . $hashEntry->getSalt() . $separator, "", $data); if (strlen($plain) > SConfig::getInstance()->getVal(DConfig::PLAINTEXT_MAX_LENGTH)) { @@ -435,8 +438,12 @@ public static function processZap($hashlistId, $separator, $source, $post, $file continue; } $hashFactory->mset($hashEntry, [Hash::PLAINTEXT => $plain, Hash::IS_CRACKED => 1, Hash::TIME_CRACKED => time()]); - $newCracked++; - $crackedIn[$hashEntry->getHashlistId()]++; + + if ($hashEntry->getIsCracked() != 1) { + $newCracked++; + $crackedIn[$hashEntry->getHashlistId()]++; + } + if ($hashlist->getFormat() == DHashlistFormat::PLAIN) { $zaps[] = new Zap(null, $hashEntry->getHash(), time(), null, $hashlist->getId()); } @@ -469,19 +476,28 @@ public static function processZap($hashlistId, $separator, $source, $post, $file foreach ($hashEntries as $hashEntry) { if ($hashEntry->getIsCracked() == 1) { $alreadyCracked++; - continue; + if (!$overwritePlaintext) { + continue; + } } + $plain = str_replace($hash . $separator, "", $data); + if (strlen($plain) > SConfig::getInstance()->getVal(DConfig::PLAINTEXT_MAX_LENGTH)) { $tooLong++; continue; } + $hashFactory->mset($hashEntry, [Hash::PLAINTEXT => $plain, Hash::IS_CRACKED => 1, Hash::TIME_CRACKED => time()]); - $crackedIn[$hashEntry->getHashlistId()]++; + + if ($hashEntry->getIsCracked() != 1) { + $newCracked++; + $crackedIn[$hashEntry->getHashlistId()]++; + } + if ($hashlist->getFormat() == DHashlistFormat::PLAIN) { $zaps[] = new Zap(null, $hashEntry->getHash(), time(), null, $hashlist->getId()); } - $newCracked++; } } $bufferCount++; From af3f9458f3c0cace9bebd053414bfe2bb8d0d57b Mon Sep 17 00:00:00 2001 From: Eric Wasson <229096365+Eric-Wasson@users.noreply.github.com> Date: Thu, 20 Nov 2025 15:22:10 +0100 Subject: [PATCH 261/691] Fixed test for overwrite on import pre-cracked hashes --- ci/tests/HashlistTest.class.php | 1 + 1 file changed, 1 insertion(+) diff --git a/ci/tests/HashlistTest.class.php b/ci/tests/HashlistTest.class.php index cb7d2e4c6..b799b402c 100644 --- a/ci/tests/HashlistTest.class.php +++ b/ci/tests/HashlistTest.class.php @@ -109,6 +109,7 @@ private function testImportCracked() { "request" => "importCracked", "hashlistId" => 1, "separator" => ":", + "overwrite" => 0, // sending 3 founds of the hashlist "data" => "MDAyODA4MGU3ZmE4YzgxMjY4ZWYzNDBkN2Q2OTI2ODE6Zm91bmQxCjAwMmU5NWQ4MmJlMzAzOTZmY2NkMzc1ZmYyM2Y4YjRjOmZvdW5kMgowMDM0YzVlNDE4YWU0ZjJlYmE1OTBhMTY2OTZlZGJiMzpmb3VuZDM=", "accessKey" => "mykey" From 7e202938ffdb38b530fd9ac749c34d950af9e9ee Mon Sep 17 00:00:00 2001 From: Eric Wasson <229096365+Eric-Wasson@users.noreply.github.com> Date: Fri, 21 Nov 2025 13:52:38 +0100 Subject: [PATCH 262/691] Added backend handling of importing pre-cracked hashes by upload file and url --- .../helper/importCrackedHashes.routes.php | 30 +++++++++++++++++-- src/inc/apiv2/model/hashlists.routes.php | 8 +++-- 2 files changed, 33 insertions(+), 5 deletions(-) diff --git a/src/inc/apiv2/helper/importCrackedHashes.routes.php b/src/inc/apiv2/helper/importCrackedHashes.routes.php index a9a6d4632..b5fc01d4b 100644 --- a/src/inc/apiv2/helper/importCrackedHashes.routes.php +++ b/src/inc/apiv2/helper/importCrackedHashes.routes.php @@ -26,6 +26,7 @@ public function getRequiredPermissions(string $method): array { public function getFormFields(): array { return [ Hashlist::HASHLIST_ID => ["type" => "int"], + "sourceType" => ['type' => 'str'], "sourceData" => ['type' => 'str'], "separator" => ['type' => 'str'], "overwrite" => ['type' => 'int'], @@ -47,13 +48,38 @@ public static function getResponse(): array { /** * Endpoint to import cracked hashes into a hashlist. * @throws HTException + * @throws HttpError */ public function actionPost($data): object|array|null { $hashlist = self::getHashlist($data[Hashlist::HASHLIST_ID]); - $importData = base64_decode($data["sourceData"]); + // Cast to processZap compatible upload format + $dummyPost = []; + switch ($data["sourceType"]) { + case "paste": + $dummyPost["hashfield"] = base64_decode($data["sourceData"]); + break; + case "import": + $dummyPost["importfile"] = $data["sourceData"]; + break; + case "url": + $dummyPost["url"] = $data["sourceData"]; + break; + default: + // TODO: Choice validation are model based checks + throw new HttpErrorException("sourceType value '" . $data["sourceType"] . "' is not supported (choices paste, import, url"); + } + + if ($data["sourceType"] == "paste") { + if (strlen($data["sourceData"]) == 0) { + throw new HttpError("sourceType=paste, requires sourceData to be non-empty"); + } + else if ($dummyPost["hashfield"] === false) { + throw new HttpError("sourceData not valid base64 encoding"); + } + } - $result = HashlistUtils::processZap($hashlist->getId(), $data["separator"], "paste", ["hashfield" => $importData], [], $this->getCurrentUser(), (isset($data["overwrite"]) && intval($data["overwrite"]) == 1) ? true : false); + $result = HashlistUtils::processZap($hashlist->getId(), $data["separator"], $data["sourceType"], $dummyPost, [], $this->getCurrentUser(), (isset($data["overwrite"]) && intval($data["overwrite"]) == 1) ? true : false); return [ "totalLines" => $result[0], diff --git a/src/inc/apiv2/model/hashlists.routes.php b/src/inc/apiv2/model/hashlists.routes.php index 99eda1fe6..d50f9382f 100644 --- a/src/inc/apiv2/model/hashlists.routes.php +++ b/src/inc/apiv2/model/hashlists.routes.php @@ -102,6 +102,7 @@ public function getFormFields(): array { /** * @throws HttpErrorException + * @throws HttpError * @throws HTException */ protected function createObject(array $data): int { @@ -122,11 +123,12 @@ protected function createObject(array $data): int { throw new HttpErrorException("sourceType value '" . $data["sourceType"] . "' is not supported (choices paste, import, url"); } - // TODO: validate input is valid base64 encoded if ($data["sourceType"] == "paste") { if (strlen($data["sourceData"]) == 0) { - // TODO: Should be 400 instead - throw new HttpErrorException("sourceType=paste, requires sourceData to be non-empty"); + throw new HttpError("sourceType=paste, requires sourceData to be non-empty"); + } + else if ($dummyPost["hashfield"] === false) { + throw new HttpError("sourceData not valid base64 encoding"); } } From 3e2280ae754305fc410c963565b74d842cc53b96 Mon Sep 17 00:00:00 2001 From: jessevz Date: Mon, 24 Nov 2025 12:09:57 +0100 Subject: [PATCH 263/691] Added missing include (#1769) * Added missing include * Pinned dockerfile on php 8.4 since not all packages have 8.5 support --------- Co-authored-by: jessevz --- Dockerfile | 4 ++-- src/api/v2/index.php | 1 + 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/Dockerfile b/Dockerfile index 9333ebf4c..dbd1f3106 100644 --- a/Dockerfile +++ b/Dockerfile @@ -6,7 +6,7 @@ RUN cd / && git rev-parse --short HEAD > /HEAD; exit 0 # BASE image # ----BEGIN---- -FROM php:8-apache AS hashtopolis-server-base +FROM php:8.4-apache AS hashtopolis-server-base # Enable possible build args for injecting user commands ARG CONTAINER_USER_CMD_PRE @@ -104,7 +104,7 @@ ENTRYPOINT [ "docker-entrypoint.sh" ] FROM hashtopolis-server-base AS hashtopolis-server-dev # Setting up development requirements, install xdebug -RUN yes | pecl install xdebug-3.4.0beta1 && docker-php-ext-enable xdebug \ +RUN yes | pecl install xdebug && docker-php-ext-enable xdebug \ && echo "zend_extension=$(find /usr/local/lib/php/extensions/ -name xdebug.so)" > /usr/local/etc/php/conf.d/xdebug.ini \ && echo "xdebug.mode = debug" >> /usr/local/etc/php/conf.d/xdebug.ini \ && echo "xdebug.start_with_request = yes" >> /usr/local/etc/php/conf.d/xdebug.ini \ diff --git a/src/api/v2/index.php b/src/api/v2/index.php index 9f18a34d7..6e768c8bc 100644 --- a/src/api/v2/index.php +++ b/src/api/v2/index.php @@ -308,6 +308,7 @@ public static function addCORSheaders(Request $request, $response) { require __DIR__ . "/../../inc/apiv2/helper/getAgentBinary.routes.php"; require __DIR__ . "/../../inc/apiv2/helper/getCracksOfTask.routes.php"; require __DIR__ . "/../../inc/apiv2/helper/getFile.routes.php"; +require __DIR__ . "/../../inc/apiv2/helper/getTaskProgressImage.routes.php"; require __DIR__ . "/../../inc/apiv2/helper/getUserPermission.routes.php"; require __DIR__ . "/../../inc/apiv2/helper/importCrackedHashes.routes.php"; require __DIR__ . "/../../inc/apiv2/helper/importFile.routes.php"; From 18042260fd92c7bbe2ad38d4b8ab59b96e2e73f7 Mon Sep 17 00:00:00 2001 From: s3inlc Date: Wed, 26 Nov 2025 11:04:21 +0100 Subject: [PATCH 264/691] force casting to int for boolean filter values as they are stored as int in the db --- src/inc/apiv2/common/AbstractBaseAPI.class.php | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/src/inc/apiv2/common/AbstractBaseAPI.class.php b/src/inc/apiv2/common/AbstractBaseAPI.class.php index fa2de0c9f..97e6920f2 100644 --- a/src/inc/apiv2/common/AbstractBaseAPI.class.php +++ b/src/inc/apiv2/common/AbstractBaseAPI.class.php @@ -1042,12 +1042,15 @@ protected function makeFilter(array $filters, object $apiClass): array { if (is_null($value)) { throw new HttpForbidden("Filter parameter '" . $filter . "' is not valid boolean value"); } + $value = (int)$value; break; case 'int': $value = filter_var($value, FILTER_VALIDATE_INT, FILTER_NULL_ON_FAILURE); if (is_null($value)) { throw new HttpForbidden("Filter parameter '" . $filter . "' is not valid integer value"); } + $value = (int)$value; + break; } } unset($value); @@ -1539,4 +1542,4 @@ protected static function getMetaResponse(array $meta, Request $request, Respons static public function getAvailableMethods(): array { return ["GET", "POST", "PATCH", "DELETE"]; } -} \ No newline at end of file +} From 52c327af1372463e1b7b88e45a21397ddcb15345 Mon Sep 17 00:00:00 2001 From: s3inlc Date: Wed, 26 Nov 2025 11:18:25 +0100 Subject: [PATCH 265/691] fixed remaining adjustments to make lowercaseing work --- src/dba/AbstractModelFactory.class.php | 16 +++++++++++----- 1 file changed, 11 insertions(+), 5 deletions(-) diff --git a/src/dba/AbstractModelFactory.class.php b/src/dba/AbstractModelFactory.class.php index 67874b0cc..0d34ba4d4 100755 --- a/src/dba/AbstractModelFactory.class.php +++ b/src/dba/AbstractModelFactory.class.php @@ -636,16 +636,17 @@ private function filterWithJoin(array $options): array|AbstractModel { while ($row = $stmt->fetch(PDO::FETCH_ASSOC)) { foreach ($row as $k => $v) { + $k = strtolower($k); foreach ($factories as $factory) { - if (Util::startsWith($k, $factory->getMappedModelTable())) { - $column = str_replace($factory->getMappedModelTable() . ".", "", $k); - $values[$factory->getModelTable()][$column] = $v; + if (Util::startsWith($k, strtolower($factory->getMappedModelTable()))) { + $column = str_replace(strtolower($factory->getMappedModelTable()) . ".", "", $k); + $values[$factory->getModelTable()][strtolower($column)] = $v; } } } foreach ($factories as $factory) { - $model = $factory->createObjectFromDict($values[$factory->getModelTable()][$factory->getNullObject()->getPrimaryKey()], $values[$factory->getModelTable()]); + $model = $factory->createObjectFromDict($values[$factory->getModelTable()][strtolower($factory->getNullObject()->getPrimaryKey())], $values[$factory->getModelTable()]); $res[$factory->getModelTable()][] = $model; } } @@ -698,7 +699,12 @@ public function filter(array $options, bool $single = false) { while ($row = $stmt->fetch(PDO::FETCH_ASSOC)) { $pkName = $this->getNullObject()->getPrimaryKey(); - $pk = $row[$pkName]; + if (isset($row[strtolower($pkName)])) { + $pk = $row[strtolower($pkName)]; + } + else { + $pk = $row[$pkName]; + } $model = $this->createObjectFromDict($pk, $row); $objects[] = $model; } From 32e652fdcf1bb39dd59c0cddf47142add9b0ca92 Mon Sep 17 00:00:00 2001 From: s3inlc Date: Wed, 26 Nov 2025 11:27:23 +0100 Subject: [PATCH 266/691] remove order from countFilter as this is not allowed --- src/dba/AbstractModelFactory.class.php | 12 ------------ 1 file changed, 12 deletions(-) diff --git a/src/dba/AbstractModelFactory.class.php b/src/dba/AbstractModelFactory.class.php index d6c034b1d..8b3021e4c 100755 --- a/src/dba/AbstractModelFactory.class.php +++ b/src/dba/AbstractModelFactory.class.php @@ -483,18 +483,6 @@ public function countFilter($options) { $query .= $this->applyFilters($vals, $options['filter']); } - if (!array_key_exists("order", $options)) { - // Add a asc order on the primary keys as a standard - $oF = new OrderFilter($this->getNullObject()->getPrimaryKey(), "ASC"); - $orderOptions = array( - $oF - ); - $options['order'] = $orderOptions; - } - if (count($options['order']) != 0) { - $query .= $this->applyOrder($options['order']); - } - $dbh = self::getDB(); $stmt = $dbh->prepare($query); $stmt->execute($vals); From 2d199c13bd3aeb513e11281af97b65cafe8d3376 Mon Sep 17 00:00:00 2001 From: s3inlc Date: Wed, 26 Nov 2025 12:11:48 +0100 Subject: [PATCH 267/691] if not primary key is provided on object creation, the column is not built into the query as it is autoincremented --- src/dba/AbstractModelFactory.class.php | 33 +++++++++++++++++--------- 1 file changed, 22 insertions(+), 11 deletions(-) diff --git a/src/dba/AbstractModelFactory.class.php b/src/dba/AbstractModelFactory.class.php index 0d34ba4d4..1b23381c3 100755 --- a/src/dba/AbstractModelFactory.class.php +++ b/src/dba/AbstractModelFactory.class.php @@ -133,8 +133,14 @@ public function save(AbstractModel $model): ?AbstractModel { $query = "INSERT INTO " . $this->getMappedModelTable(); $vals = array_values($dict); + $keys = self::getMappedModelKeys($model); + if($vals[0] === -1 || $vals[0] === null){ + array_splice($vals, 0, 1); + array_splice($keys, 0, 1); + } + $query .= " (" . implode(",", $keys) . ") "; $placeHolder = " (" . implode(",", array_fill(0, count($keys), "?")) . ")"; @@ -144,16 +150,21 @@ public function save(AbstractModel $model): ?AbstractModel { $stmt = $dbh->prepare($query); $stmt->execute($vals); - $id = intval($dbh->lastInsertId()); - if ($id != 0) { - $model->setId($id); - return $model; - } - else if ($model->getId() != 0) { - return $model; + if ($model->getId() === null || $model->getId() === -1) { + $id = intval($dbh->lastInsertId()); + if ($id != 0) { + $model->setId($id); + return $model; + } + else if ($model->getId() != 0) { + return $model; + } + else { + return null; + } } else { - return null; + return $model; } } @@ -361,6 +372,8 @@ public function massSave(array $models): bool|PDOStatement { $keys = self::getMappedModelKeys($models[0]); $query = "INSERT INTO " . $this->getMappedModelTable(); + array_splice($keys, 0, 1); + $query .= " (" . implode(",", $keys) . ") "; $placeHolder = " (" . implode(",", array_fill(0, count($keys), "?")) . ")"; @@ -371,10 +384,8 @@ public function massSave(array $models): bool|PDOStatement { if ($x < sizeof($models) - 1) { $query .= ", "; } - if ($models[$x]->getId() === 0) { - $models[$x]->setId(null); - } $dict = $models[$x]->getKeyValueDict(); + array_splice($dict, 0, 1); foreach ($dict as $val) { $vals[] = $val; } From 0041a73f60a9e447670234afa58ea0689bfc47d8 Mon Sep 17 00:00:00 2001 From: s3inlc Date: Wed, 26 Nov 2025 12:14:41 +0100 Subject: [PATCH 268/691] save returned user model on creation to retrieve user id correctly --- src/inc/load.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/inc/load.php b/src/inc/load.php index 23e0ceff7..5a21f3f44 100755 --- a/src/inc/load.php +++ b/src/inc/load.php @@ -128,7 +128,7 @@ $newHash = password_hash($CIPHER, PASSWORD_BCRYPT, $options); $user = new User(null, $username, $email, $newHash, $newSalt, 1, 1, 0, time(), 3600, $group->getId(), 0, "", "", "", ""); - Factory::getUserFactory()->save($user); + $user = Factory::getUserFactory()->save($user); // create default group $group = AccessUtils::getOrCreateDefaultAccessGroup(); From 5a867300a93b9d417f1f082e7fda750aabfe7fe3 Mon Sep 17 00:00:00 2001 From: s3inlc Date: Wed, 26 Nov 2025 12:22:43 +0100 Subject: [PATCH 269/691] replaced all LIMIT comma style queries with LIMIT OFFSET --- src/chunks.php | 2 +- src/cracks.php | 2 +- src/getFound.php | 4 ++-- src/getHashlist.php | 4 ++-- src/hashes.php | 2 +- src/inc/utils/HashlistUtils.class.php | 16 ++++++++++------ src/tasks.php | 2 +- 7 files changed, 18 insertions(+), 14 deletions(-) diff --git a/src/chunks.php b/src/chunks.php index 636bf838c..9febd4de5 100755 --- a/src/chunks.php +++ b/src/chunks.php @@ -32,7 +32,7 @@ $numentries = Factory::getChunkFactory()->countFilter([]); UI::add('maxpage', floor($numentries / $PAGESIZE)); $limit = $page * $PAGESIZE; - $oF = new OrderFilter(Chunk::SOLVE_TIME, "DESC LIMIT $limit, $PAGESIZE", Factory::getChunkFactory()); + $oF = new OrderFilter(Chunk::SOLVE_TIME, "DESC LIMIT $PAGESIZE OFFSET $limit", Factory::getChunkFactory()); UI::add('all', false); UI::add('pageTitle', "Chunks Activity (page " . ($page + 1) . ")"); } diff --git a/src/cracks.php b/src/cracks.php index e63cfca4e..03a3dd052 100644 --- a/src/cracks.php +++ b/src/cracks.php @@ -68,7 +68,7 @@ $qF1 = new QueryFilter(Hash::IS_CRACKED, 1, "="); $qF2 = new ContainFilter(Hash::HASHLIST_ID, $hashlistIds); -$oF = new OrderFilter(Hash::TIME_CRACKED, "DESC LIMIT " . (SConfig::getInstance()->getVal(DConfig::HASHES_PER_PAGE) * ($currentPage - 1)) . ", " . SConfig::getInstance()->getVal(DConfig::HASHES_PER_PAGE)); +$oF = new OrderFilter(Hash::TIME_CRACKED, "DESC LIMIT " . SConfig::getInstance()->getVal(DConfig::HASHES_PER_PAGE) . " OFFSET " . (SConfig::getInstance()->getVal(DConfig::HASHES_PER_PAGE) * ($currentPage - 1))); $hashes = $hashFactory->filter([Factory::FILTER => [$qF1, $qF2], Factory::ORDER => $oF]); $crackDetailsPrimary = new DataSet(); diff --git a/src/getFound.php b/src/getFound.php index 51b6242f7..353f34d54 100644 --- a/src/getFound.php +++ b/src/getFound.php @@ -49,7 +49,7 @@ $limit = 0; $size = SConfig::getInstance()->getVal(DConfig::BATCH_SIZE); do { - $oF = new OrderFilter(Hash::HASH_ID, "ASC LIMIT $limit,$size"); + $oF = new OrderFilter(Hash::HASH_ID, "ASC LIMIT $size OFFSET $limit"); $qF1 = new QueryFilter(Hash::HASHLIST_ID, $hashlist->getId(), "="); $qF2 = new QueryFilter(Hash::IS_CRACKED, 1, "="); $current = Factory::getHashFactory()->filter([Factory::FILTER => [$qF1, $qF2], Factory::ORDER => $oF]); @@ -68,4 +68,4 @@ } while (sizeof($current) > 0); } break; -} \ No newline at end of file +} diff --git a/src/getHashlist.php b/src/getHashlist.php index ea35c8802..08edb2dc0 100644 --- a/src/getHashlist.php +++ b/src/getHashlist.php @@ -57,7 +57,7 @@ $limit = 0; $size = SConfig::getInstance()->getVal(DConfig::BATCH_SIZE); do { - $oF = new OrderFilter(Hash::HASH_ID, "ASC LIMIT $limit,$size"); + $oF = new OrderFilter(Hash::HASH_ID, "ASC LIMIT $size OFFSET $limit"); $qF1 = new QueryFilter(Hash::HASHLIST_ID, $hashlist->getId(), "="); $qF2 = new QueryFilter(Hash::IS_CRACKED, 0, "="); if ($brain) { @@ -102,4 +102,4 @@ if ($count == 0) { die("No hashes are available to crack!"); -} \ No newline at end of file +} diff --git a/src/hashes.php b/src/hashes.php index 6c3b5c95f..af6af3a1e 100755 --- a/src/hashes.php +++ b/src/hashes.php @@ -195,7 +195,7 @@ UI::add('previousPage', $previousPage); UI::add('currentPage', $currentPage); -$oF = new OrderFilter($hashFactory->getNullObject()->getPrimaryKey(), "ASC LIMIT " . (SConfig::getInstance()->getVal(DConfig::HASHES_PER_PAGE) * $currentPage) . ", " . SConfig::getInstance()->getVal(DConfig::HASHES_PER_PAGE)); +$oF = new OrderFilter($hashFactory->getNullObject()->getPrimaryKey(), "ASC LIMIT " . SConfig::getInstance()->getVal(DConfig::HASHES_PER_PAGE)) . " OFFSET " . (SConfig::getInstance()->getVal(DConfig::HASHES_PER_PAGE) * $currentPage); $hashes = $hashFactory->filter([Factory::FILTER => $queryFilters, Factory::ORDER => $oF]); if (isset($_GET['crackpos']) && $_GET['crackpos'] == 'true') { diff --git a/src/inc/utils/HashlistUtils.class.php b/src/inc/utils/HashlistUtils.class.php index 2c75c9745..0e79c6f32 100644 --- a/src/inc/utils/HashlistUtils.class.php +++ b/src/inc/utils/HashlistUtils.class.php @@ -4,6 +4,7 @@ use DBA\QueryFilter; use DBA\ContainFilter; use DBA\OrderFilter; +use DBA\LimitFilter; use DBA\Hashlist; use DBA\HashlistHashlist; use DBA\HashBinary; @@ -198,8 +199,9 @@ public static function createWordlists($hashlistId, $user) { $size = $hashFactory->countFilter([Factory::FILTER => [$qF1, $qF2]]); for ($x = 0; $x * $pagingSize < $size; $x++) { $buffer = ""; - $oF = new OrderFilter(Hash::HASH_ID, "ASC LIMIT " . ($x * $pagingSize) . ", $pagingSize"); - $hashes = $hashFactory->filter([Factory::FILTER => [$qF1, $qF2], Factory::ORDER => $oF]); + $oF = new OrderFilter(Hash::HASH_ID, "ASC"); + $lF = new LimitFilter($pagingSize, $x * $pagingSize); + $hashes = $hashFactory->filter([Factory::FILTER => [$qF1, $qF2], Factory::ORDER => $oF, Factory::LIMIT => $lF]); foreach ($hashes as $hash) { $plain = $hash->getPlaintext(); if (strlen($plain) >= 8 && substr($plain, 0, 5) == "\$HEX[" && substr($plain, strlen($plain) - 1, 1) == "]") { @@ -714,8 +716,9 @@ public static function export($hashlistId, $user) { $separator = SConfig::getInstance()->getVal(DConfig::FIELD_SEPARATOR); $numEntries = 0; for ($x = 0; $x * $pagingSize < $count; $x++) { - $oF = new OrderFilter($orderObject, "ASC LIMIT " . ($x * $pagingSize) . ",$pagingSize"); - $entries = $factory->filter([Factory::FILTER => [$qF1, $qF2], Factory::ORDER => $oF]); + $oF = new OrderFilter($orderObject, "ASC"); + $lF = new LimitFilter($pagingSize, $x * $pagingSize); + $entries = $factory->filter([Factory::FILTER => [$qF1, $qF2], Factory::ORDER => $oF, Factory::LIMIT => $lF]); $buffer = ""; foreach ($entries as $entry) { switch ($format->getFormat()) { @@ -1103,8 +1106,9 @@ public static function leftlist($hashlistId, $user) { } $numEntries = 0; for ($x = 0; $x * $pagingSize < $count; $x++) { - $oF = new OrderFilter(Hash::HASH_ID, "ASC LIMIT " . ($x * $pagingSize) . ",$pagingSize"); - $entries = Factory::getHashFactory()->filter([Factory::FILTER => [$qF1, $qF2], Factory::ORDER => $oF]); + $oF = new OrderFilter(Hash::HASH_ID, "ASC"); + $lF = new LimitFilter($pagingSize, $x * $pagingSize); + $entries = Factory::getHashFactory()->filter([Factory::FILTER => [$qF1, $qF2], Factory::ORDER => $oF, Factory::LIMIT => $lF]); $buffer = ""; foreach ($entries as $entry) { $buffer .= $entry->getHash(); diff --git a/src/tasks.php b/src/tasks.php index 8540f71fd..d718507b4 100755 --- a/src/tasks.php +++ b/src/tasks.php @@ -257,7 +257,7 @@ } UI::add('page', $page); $limit = $page * $chunkPageSize; - $oFp = new OrderFilter(Chunk::SOLVE_TIME, "DESC LIMIT $limit, $chunkPageSize", Factory::getChunkFactory()); + $oFp = new OrderFilter(Chunk::SOLVE_TIME, "DESC LIMIT $chunkPageSize OFFSET $limit", Factory::getChunkFactory()); UI::add('chunksPageTitle', "All chunks (page " . ($page + 1) . ")"); $qF = new QueryFilter(Chunk::TASK_ID, $task->getId(), "="); From cfae596b1a91b9458180615fa8449aaee55c7319 Mon Sep 17 00:00:00 2001 From: jessevz Date: Wed, 26 Nov 2025 13:25:47 +0100 Subject: [PATCH 270/691] Added the hashlist of found hash in the searchHashes helper endpoint (#1777) Co-authored-by: jessevz --- src/inc/apiv2/helper/searchHashes.routes.php | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/src/inc/apiv2/helper/searchHashes.routes.php b/src/inc/apiv2/helper/searchHashes.routes.php index 9c8731aa1..b420c677d 100644 --- a/src/inc/apiv2/helper/searchHashes.routes.php +++ b/src/inc/apiv2/helper/searchHashes.routes.php @@ -110,14 +110,14 @@ public static function getResponse(): array { * @throws HttpError */ public function actionPost($data): object|array|null { - $search = base64_decode($data['searchData']); + $search = base64_decode($data['searchData'], true); $isSalted = $data['isSalted']; $separator = $data['separator']; if (strlen($search) == 0) { throw new HttpError("Search query cannot be empty!"); } - else if ($search === false) { + else if ($search === false || mb_check_encoding($search, "UTF-8") == false) { throw new HttpError("Search query is not valid base64!"); } else if ($isSalted && strlen($separator) == 0) { @@ -181,7 +181,12 @@ public function actionPost($data): object|array|null { for ($i = 0; $i < sizeof($hashes); $i++) { /** @var $hash Hash */ $hash = $joined[Factory::getHashFactory()->getModelName()][$i]; - $matches[] = self::obj2Resource($hash);; + $hashlist = $joined[Factory::getHashlistFactory()->getModelName()][$i]; + $hashResource = self::obj2Resource($hash); + $hashlistResource = self::obj2Resource($hashlist); + $hashResource["attributes"]["hashlist"] = $hashlistResource["attributes"]; + + $matches[] = $hashResource; } $resultEntry["matches"] = $matches; } From cf71d316d2701f90c55e0cf4bf6e38328bd19450 Mon Sep 17 00:00:00 2001 From: jessevz Date: Wed, 26 Nov 2025 14:40:31 +0100 Subject: [PATCH 271/691] Added index for timeCracked on Hash table --- src/install/hashtopolis.sql | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/install/hashtopolis.sql b/src/install/hashtopolis.sql index 0cf7be2cd..01072a1d1 100644 --- a/src/install/hashtopolis.sql +++ b/src/install/hashtopolis.sql @@ -1183,7 +1183,8 @@ ALTER TABLE `Hash` ADD KEY `hashlistId` (`hashlistId`), ADD KEY `chunkId` (`chunkId`), ADD KEY `isCracked` (`isCracked`), - ADD KEY `hash` (`hash`(500)); + ADD KEY `hash` (`hash`(500)), + ADD KEY `timeCracked` (`timeCracked`); ALTER TABLE `HashBinary` ADD PRIMARY KEY (`hashBinaryId`), From eea734857647234ad1b75cd94e47af01283ea49d Mon Sep 17 00:00:00 2001 From: jessevz Date: Wed, 26 Nov 2025 15:08:09 +0100 Subject: [PATCH 272/691] Upgraded deprecated jwt library to maintained jwt library (#1785) * Upgraded deprecated jwt library to maintained jwt library * Updated composer dependencies --------- Co-authored-by: jessevz --- composer.json | 8 +- composer.lock | 643 ++++++++++++++++++++++--------------------- src/api/v2/index.php | 65 +++-- 3 files changed, 388 insertions(+), 328 deletions(-) diff --git a/composer.json b/composer.json index 65755317f..53728bde6 100644 --- a/composer.json +++ b/composer.json @@ -17,19 +17,19 @@ } ], "require": { - "php": "^8.0", + "php": "^8.2", "ext-json": "*", "ext-pdo": "*", + "composer/semver": "^3.4", "crell/api-problem": "^3.6", + "jimtools/jwt-auth": "^2.3", "middlewares/encoder": "^2.1", "middlewares/negotiation": "^2.1", "monolog/monolog": "^2.8", "php-di/php-di": "7.0.7", "slim/psr7": "^1.5", "slim/slim": "^4.10", - "tuupola/slim-basic-auth": "^3.3", - "tuupola/slim-jwt-auth": "^3.6", - "composer/semver": "^3.4" + "tuupola/slim-basic-auth": "^3.3" }, "require-dev": { "jangregor/phpstan-prophecy": "^1.0.0", diff --git a/composer.lock b/composer.lock index 5a6444b93..6ccdd2afe 100644 --- a/composer.lock +++ b/composer.lock @@ -4,7 +4,7 @@ "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies", "This file is @generated automatically" ], - "content-hash": "4e2c70025b277832ee47cab84d7a2ad9", + "content-hash": "6f8ce7872d6f4bc07dc58f3b9d468d4d", "packages": [ { "name": "composer/semver", @@ -212,25 +212,31 @@ }, { "name": "firebase/php-jwt", - "version": "v5.5.1", + "version": "v6.11.1", "source": { "type": "git", "url": "https://github.com/firebase/php-jwt.git", - "reference": "83b609028194aa042ea33b5af2d41a7427de80e6" + "reference": "d1e91ecf8c598d073d0995afa8cd5c75c6e19e66" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/firebase/php-jwt/zipball/83b609028194aa042ea33b5af2d41a7427de80e6", - "reference": "83b609028194aa042ea33b5af2d41a7427de80e6", + "url": "https://api.github.com/repos/firebase/php-jwt/zipball/d1e91ecf8c598d073d0995afa8cd5c75c6e19e66", + "reference": "d1e91ecf8c598d073d0995afa8cd5c75c6e19e66", "shasum": "" }, "require": { - "php": ">=5.3.0" + "php": "^8.0" }, "require-dev": { - "phpunit/phpunit": ">=4.8 <=9" + "guzzlehttp/guzzle": "^7.4", + "phpspec/prophecy-phpunit": "^2.0", + "phpunit/phpunit": "^9.5", + "psr/cache": "^2.0||^3.0", + "psr/http-client": "^1.0", + "psr/http-factory": "^1.0" }, "suggest": { + "ext-sodium": "Support EdDSA (Ed25519) signatures", "paragonie/sodium_compat": "Support EdDSA (Ed25519) signatures when libsodium is not present" }, "type": "library", @@ -263,9 +269,80 @@ ], "support": { "issues": "https://github.com/firebase/php-jwt/issues", - "source": "https://github.com/firebase/php-jwt/tree/v5.5.1" + "source": "https://github.com/firebase/php-jwt/tree/v6.11.1" }, - "time": "2021-11-08T20:18:51+00:00" + "time": "2025-04-09T20:32:01+00:00" + }, + { + "name": "jimtools/jwt-auth", + "version": "2.3.0", + "source": { + "type": "git", + "url": "https://github.com/JimTools/jwt-auth.git", + "reference": "2e89098a2dde0968326d42073098ae4bcc87b740" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/JimTools/jwt-auth/zipball/2e89098a2dde0968326d42073098ae4bcc87b740", + "reference": "2e89098a2dde0968326d42073098ae4bcc87b740", + "shasum": "" + }, + "require": { + "firebase/php-jwt": "^6.0", + "php": "~8.2 || ~8.3 || ~8.4 || ~8.5", + "psr/http-message": "^1.0 || ^2.0", + "psr/http-server-middleware": "^1.0" + }, + "replace": { + "tuupola/slim-jwt-auth": "*" + }, + "require-dev": { + "equip/dispatch": "^2.0", + "friendsofphp/php-cs-fixer": "^3.89", + "laminas/laminas-diactoros": "^3.7", + "phpstan/phpstan": "^2.1", + "phpunit/phpunit": "^11.5 || ^12.4", + "rector/rector": "^2.2" + }, + "type": "library", + "autoload": { + "psr-4": { + "JimTools\\JwtAuth\\": "src" + } + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "authors": [ + { + "name": "James Read", + "email": "james.read.18@gmail.com", + "homepage": "https://github.com/jimtools", + "role": "Developer" + } + ], + "description": "Drop in replacement for tuupola/slim-jwt-auth", + "homepage": "https://github.com/jimtools/jwt-auth", + "keywords": [ + "auth", + "json", + "jwt", + "middleware", + "psr-15", + "psr-7" + ], + "support": { + "issues": "https://github.com/JimTools/jwt-auth/issues", + "source": "https://github.com/JimTools/jwt-auth/tree/2.3.0" + }, + "funding": [ + { + "url": "https://github.com/JimTools", + "type": "github" + } + ], + "time": "2025-10-29T20:23:22+00:00" }, { "name": "laravel/serializable-closure", @@ -654,16 +731,16 @@ }, { "name": "php-di/invoker", - "version": "2.3.6", + "version": "2.3.7", "source": { "type": "git", "url": "https://github.com/PHP-DI/Invoker.git", - "reference": "59f15608528d8a8838d69b422a919fd6b16aa576" + "reference": "3c1ddfdef181431fbc4be83378f6d036d59e81e1" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/PHP-DI/Invoker/zipball/59f15608528d8a8838d69b422a919fd6b16aa576", - "reference": "59f15608528d8a8838d69b422a919fd6b16aa576", + "url": "https://api.github.com/repos/PHP-DI/Invoker/zipball/3c1ddfdef181431fbc4be83378f6d036d59e81e1", + "reference": "3c1ddfdef181431fbc4be83378f6d036d59e81e1", "shasum": "" }, "require": { @@ -673,7 +750,7 @@ "require-dev": { "athletic/athletic": "~0.1.8", "mnapoli/hard-mode": "~0.3.0", - "phpunit/phpunit": "^9.0" + "phpunit/phpunit": "^9.0 || ^10 || ^11 || ^12" }, "type": "library", "autoload": { @@ -697,7 +774,7 @@ ], "support": { "issues": "https://github.com/PHP-DI/Invoker/issues", - "source": "https://github.com/PHP-DI/Invoker/tree/2.3.6" + "source": "https://github.com/PHP-DI/Invoker/tree/2.3.7" }, "funding": [ { @@ -705,7 +782,7 @@ "type": "github" } ], - "time": "2025-01-17T12:49:27+00:00" + "time": "2025-08-30T10:22:22+00:00" }, { "name": "php-di/php-di", @@ -1150,16 +1227,16 @@ }, { "name": "slim/psr7", - "version": "1.7.1", + "version": "1.8.0", "source": { "type": "git", "url": "https://github.com/slimphp/Slim-Psr7.git", - "reference": "fe98653e7983010aa85c1d137c9b9ad5a1cd187d" + "reference": "76e7e3b1cdfd583e9035c4c966c08e01e45ce959" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/slimphp/Slim-Psr7/zipball/fe98653e7983010aa85c1d137c9b9ad5a1cd187d", - "reference": "fe98653e7983010aa85c1d137c9b9ad5a1cd187d", + "url": "https://api.github.com/repos/slimphp/Slim-Psr7/zipball/76e7e3b1cdfd583e9035c4c966c08e01e45ce959", + "reference": "76e7e3b1cdfd583e9035c4c966c08e01e45ce959", "shasum": "" }, "require": { @@ -1167,23 +1244,20 @@ "php": "^8.0", "psr/http-factory": "^1.1", "psr/http-message": "^1.0 || ^2.0", - "ralouphie/getallheaders": "^3.0", - "symfony/polyfill-php80": "^1.29" + "ralouphie/getallheaders": "^3.0" }, "provide": { "psr/http-factory-implementation": "^1.0", "psr/http-message-implementation": "^1.0 || ^2.0" }, "require-dev": { - "adriansuter/php-autoload-override": "^1.4", + "adriansuter/php-autoload-override": "^1.5|| ^2.0", "ext-json": "*", "http-interop/http-factory-tests": "^1.0 || ^2.0", - "php-http/psr7-integration-tests": "^1.4", - "phpspec/prophecy": "^1.19", - "phpspec/prophecy-phpunit": "^2.2", + "php-http/psr7-integration-tests": "^1.5", "phpstan/phpstan": "^2.1", "phpunit/phpunit": "^9.6 || ^10", - "squizlabs/php_codesniffer": "^3.10" + "squizlabs/php_codesniffer": "^3.13" }, "type": "library", "autoload": { @@ -1226,28 +1300,28 @@ ], "support": { "issues": "https://github.com/slimphp/Slim-Psr7/issues", - "source": "https://github.com/slimphp/Slim-Psr7/tree/1.7.1" + "source": "https://github.com/slimphp/Slim-Psr7/tree/1.8.0" }, - "time": "2025-05-13T14:24:12+00:00" + "time": "2025-11-02T17:51:19+00:00" }, { "name": "slim/slim", - "version": "4.14.0", + "version": "4.15.1", "source": { "type": "git", "url": "https://github.com/slimphp/Slim.git", - "reference": "5943393b88716eb9e82c4161caa956af63423913" + "reference": "887893516557506f254d950425ce7f5387a26970" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/slimphp/Slim/zipball/5943393b88716eb9e82c4161caa956af63423913", - "reference": "5943393b88716eb9e82c4161caa956af63423913", + "url": "https://api.github.com/repos/slimphp/Slim/zipball/887893516557506f254d950425ce7f5387a26970", + "reference": "887893516557506f254d950425ce7f5387a26970", "shasum": "" }, "require": { "ext-json": "*", "nikic/fast-route": "^1.3", - "php": "^7.4 || ^8.0", + "php": "~7.4.0 || ~8.0.0 || ~8.1.0 || ~8.2.0 || ~8.3.0 || ~8.4.0 || ~8.5.0", "psr/container": "^1.0 || ^2.0", "psr/http-factory": "^1.1", "psr/http-message": "^1.1 || ^2.0", @@ -1256,7 +1330,7 @@ "psr/log": "^1.1 || ^2.0 || ^3.0" }, "require-dev": { - "adriansuter/php-autoload-override": "^1.4", + "adriansuter/php-autoload-override": "^1.4 || ^2", "ext-simplexml": "*", "guzzlehttp/psr7": "^2.6", "httpsoft/http-message": "^1.1", @@ -1266,12 +1340,12 @@ "nyholm/psr7-server": "^1.1", "phpspec/prophecy": "^1.19", "phpspec/prophecy-phpunit": "^2.1", - "phpstan/phpstan": "^1.11", - "phpunit/phpunit": "^9.6", + "phpstan/phpstan": "^1 || ^2", + "phpunit/phpunit": "^9.6 || ^10 || ^11 || ^12", "slim/http": "^1.3", "slim/psr7": "^1.6", "squizlabs/php_codesniffer": "^3.10", - "vimeo/psalm": "^5.24" + "vimeo/psalm": "^5 || ^6" }, "suggest": { "ext-simplexml": "Needed to support XML format in BodyParsingMiddleware", @@ -1298,17 +1372,17 @@ { "name": "Andrew Smith", "email": "a.smith@silentworks.co.uk", - "homepage": "http://silentworks.co.uk" + "homepage": "https://silentworks.co.uk" }, { "name": "Rob Allen", "email": "rob@akrabat.com", - "homepage": "http://akrabat.com" + "homepage": "https://akrabat.com" }, { "name": "Pierre Berube", "email": "pierre@lgse.com", - "homepage": "http://www.lgse.com" + "homepage": "https://www.lgse.com" }, { "name": "Gabriel Manricks", @@ -1344,87 +1418,7 @@ "type": "tidelift" } ], - "time": "2024-06-13T08:54:48+00:00" - }, - { - "name": "symfony/polyfill-php80", - "version": "v1.32.0", - "source": { - "type": "git", - "url": "https://github.com/symfony/polyfill-php80.git", - "reference": "0cc9dd0f17f61d8131e7df6b84bd344899fe2608" - }, - "dist": { - "type": "zip", - "url": "https://api.github.com/repos/symfony/polyfill-php80/zipball/0cc9dd0f17f61d8131e7df6b84bd344899fe2608", - "reference": "0cc9dd0f17f61d8131e7df6b84bd344899fe2608", - "shasum": "" - }, - "require": { - "php": ">=7.2" - }, - "type": "library", - "extra": { - "thanks": { - "url": "https://github.com/symfony/polyfill", - "name": "symfony/polyfill" - } - }, - "autoload": { - "files": [ - "bootstrap.php" - ], - "psr-4": { - "Symfony\\Polyfill\\Php80\\": "" - }, - "classmap": [ - "Resources/stubs" - ] - }, - "notification-url": "https://packagist.org/downloads/", - "license": [ - "MIT" - ], - "authors": [ - { - "name": "Ion Bazan", - "email": "ion.bazan@gmail.com" - }, - { - "name": "Nicolas Grekas", - "email": "p@tchwork.com" - }, - { - "name": "Symfony Community", - "homepage": "https://symfony.com/contributors" - } - ], - "description": "Symfony polyfill backporting some PHP 8.0+ features to lower PHP versions", - "homepage": "https://symfony.com", - "keywords": [ - "compatibility", - "polyfill", - "portable", - "shim" - ], - "support": { - "source": "https://github.com/symfony/polyfill-php80/tree/v1.32.0" - }, - "funding": [ - { - "url": "https://symfony.com/sponsor", - "type": "custom" - }, - { - "url": "https://github.com/fabpot", - "type": "github" - }, - { - "url": "https://tidelift.com/funding/github/packagist/symfony/symfony", - "type": "tidelift" - } - ], - "time": "2025-01-02T08:10:11+00:00" + "time": "2025-11-21T12:23:44+00:00" }, { "name": "tuupola/callable-handler", @@ -1616,77 +1610,6 @@ }, "time": "2024-10-01T09:13:06+00:00" }, - { - "name": "tuupola/slim-jwt-auth", - "version": "3.8.0", - "source": { - "type": "git", - "url": "https://github.com/tuupola/slim-jwt-auth.git", - "reference": "7829d4482034e9eb5e051f3a1619db0c704ba7e7" - }, - "dist": { - "type": "zip", - "url": "https://api.github.com/repos/tuupola/slim-jwt-auth/zipball/7829d4482034e9eb5e051f3a1619db0c704ba7e7", - "reference": "7829d4482034e9eb5e051f3a1619db0c704ba7e7", - "shasum": "" - }, - "require": { - "firebase/php-jwt": "^3.0|^4.0|^5.0", - "php": "^7.4|^8.0", - "psr/http-message": "^1.0|^2.0", - "psr/http-server-middleware": "^1.0", - "psr/log": "^1.0|^2.0|^3.0", - "tuupola/callable-handler": "^1.0", - "tuupola/http-factory": "^1.3" - }, - "require-dev": { - "equip/dispatch": "^2.0", - "laminas/laminas-diactoros": "^2.0|^3.0", - "overtrue/phplint": "^1.0", - "phpstan/phpstan": "^1.10", - "phpunit/phpunit": "^7.0|^8.5.30|^9.0", - "squizlabs/php_codesniffer": "^3.7" - }, - "type": "library", - "extra": { - "branch-alias": { - "dev-3.x": "3.0.x-dev" - } - }, - "autoload": { - "psr-4": { - "Tuupola\\Middleware\\": "src" - } - }, - "notification-url": "https://packagist.org/downloads/", - "license": [ - "MIT" - ], - "authors": [ - { - "name": "Mika Tuupola", - "email": "tuupola@appelsiini.net", - "homepage": "https://appelsiini.net/", - "role": "Developer" - } - ], - "description": "PSR-7 and PSR-15 JWT Authentication Middleware", - "homepage": "https://github.com/tuupola/slim-jwt-auth", - "keywords": [ - "auth", - "json", - "jwt", - "middleware", - "psr-15", - "psr-7" - ], - "support": { - "issues": "https://github.com/tuupola/slim-jwt-auth/issues", - "source": "https://github.com/tuupola/slim-jwt-auth/tree/3.8.0" - }, - "abandoned": "jimtools/jwt-auth", - "time": "2023-10-20T09:51:26+00:00" - }, { "name": "willdurand/negotiation", "version": "3.1.0", @@ -1924,16 +1847,16 @@ }, { "name": "myclabs/deep-copy", - "version": "1.13.1", + "version": "1.13.4", "source": { "type": "git", "url": "https://github.com/myclabs/DeepCopy.git", - "reference": "1720ddd719e16cf0db4eb1c6eca108031636d46c" + "reference": "07d290f0c47959fd5eed98c95ee5602db07e0b6a" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/myclabs/DeepCopy/zipball/1720ddd719e16cf0db4eb1c6eca108031636d46c", - "reference": "1720ddd719e16cf0db4eb1c6eca108031636d46c", + "url": "https://api.github.com/repos/myclabs/DeepCopy/zipball/07d290f0c47959fd5eed98c95ee5602db07e0b6a", + "reference": "07d290f0c47959fd5eed98c95ee5602db07e0b6a", "shasum": "" }, "require": { @@ -1972,7 +1895,7 @@ ], "support": { "issues": "https://github.com/myclabs/DeepCopy/issues", - "source": "https://github.com/myclabs/DeepCopy/tree/1.13.1" + "source": "https://github.com/myclabs/DeepCopy/tree/1.13.4" }, "funding": [ { @@ -1980,20 +1903,20 @@ "type": "tidelift" } ], - "time": "2025-04-29T12:36:36+00:00" + "time": "2025-08-01T08:46:24+00:00" }, { "name": "nikic/php-parser", - "version": "v5.5.0", + "version": "v5.6.2", "source": { "type": "git", "url": "https://github.com/nikic/PHP-Parser.git", - "reference": "ae59794362fe85e051a58ad36b289443f57be7a9" + "reference": "3a454ca033b9e06b63282ce19562e892747449bb" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/nikic/PHP-Parser/zipball/ae59794362fe85e051a58ad36b289443f57be7a9", - "reference": "ae59794362fe85e051a58ad36b289443f57be7a9", + "url": "https://api.github.com/repos/nikic/PHP-Parser/zipball/3a454ca033b9e06b63282ce19562e892747449bb", + "reference": "3a454ca033b9e06b63282ce19562e892747449bb", "shasum": "" }, "require": { @@ -2012,7 +1935,7 @@ "type": "library", "extra": { "branch-alias": { - "dev-master": "5.0-dev" + "dev-master": "5.x-dev" } }, "autoload": { @@ -2036,9 +1959,9 @@ ], "support": { "issues": "https://github.com/nikic/PHP-Parser/issues", - "source": "https://github.com/nikic/PHP-Parser/tree/v5.5.0" + "source": "https://github.com/nikic/PHP-Parser/tree/v5.6.2" }, - "time": "2025-05-31T08:24:38+00:00" + "time": "2025-10-21T19:32:17+00:00" }, { "name": "phar-io/manifest", @@ -2213,16 +2136,16 @@ }, { "name": "phpdocumentor/reflection-docblock", - "version": "5.6.2", + "version": "5.6.4", "source": { "type": "git", "url": "https://github.com/phpDocumentor/ReflectionDocBlock.git", - "reference": "92dde6a5919e34835c506ac8c523ef095a95ed62" + "reference": "90a04bcbf03784066f16038e87e23a0a83cee3c2" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/phpDocumentor/ReflectionDocBlock/zipball/92dde6a5919e34835c506ac8c523ef095a95ed62", - "reference": "92dde6a5919e34835c506ac8c523ef095a95ed62", + "url": "https://api.github.com/repos/phpDocumentor/ReflectionDocBlock/zipball/90a04bcbf03784066f16038e87e23a0a83cee3c2", + "reference": "90a04bcbf03784066f16038e87e23a0a83cee3c2", "shasum": "" }, "require": { @@ -2271,22 +2194,22 @@ "description": "With this component, a library can provide support for annotations via DocBlocks or otherwise retrieve information that is embedded in a DocBlock.", "support": { "issues": "https://github.com/phpDocumentor/ReflectionDocBlock/issues", - "source": "https://github.com/phpDocumentor/ReflectionDocBlock/tree/5.6.2" + "source": "https://github.com/phpDocumentor/ReflectionDocBlock/tree/5.6.4" }, - "time": "2025-04-13T19:20:35+00:00" + "time": "2025-11-17T21:13:10+00:00" }, { "name": "phpdocumentor/type-resolver", - "version": "1.10.0", + "version": "1.12.0", "source": { "type": "git", "url": "https://github.com/phpDocumentor/TypeResolver.git", - "reference": "679e3ce485b99e84c775d28e2e96fade9a7fb50a" + "reference": "92a98ada2b93d9b201a613cb5a33584dde25f195" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/phpDocumentor/TypeResolver/zipball/679e3ce485b99e84c775d28e2e96fade9a7fb50a", - "reference": "679e3ce485b99e84c775d28e2e96fade9a7fb50a", + "url": "https://api.github.com/repos/phpDocumentor/TypeResolver/zipball/92a98ada2b93d9b201a613cb5a33584dde25f195", + "reference": "92a98ada2b93d9b201a613cb5a33584dde25f195", "shasum": "" }, "require": { @@ -2329,36 +2252,37 @@ "description": "A PSR-5 based resolver of Class names, Types and Structural Element Names", "support": { "issues": "https://github.com/phpDocumentor/TypeResolver/issues", - "source": "https://github.com/phpDocumentor/TypeResolver/tree/1.10.0" + "source": "https://github.com/phpDocumentor/TypeResolver/tree/1.12.0" }, - "time": "2024-11-09T15:12:26+00:00" + "time": "2025-11-21T15:09:14+00:00" }, { "name": "phpspec/prophecy", - "version": "v1.22.0", + "version": "v1.24.0", "source": { "type": "git", "url": "https://github.com/phpspec/prophecy.git", - "reference": "35f1adb388946d92e6edab2aa2cb2b60e132ebd5" + "reference": "a24f1bda2d00a03877f7f99d9e6b150baf543f6d" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/phpspec/prophecy/zipball/35f1adb388946d92e6edab2aa2cb2b60e132ebd5", - "reference": "35f1adb388946d92e6edab2aa2cb2b60e132ebd5", + "url": "https://api.github.com/repos/phpspec/prophecy/zipball/a24f1bda2d00a03877f7f99d9e6b150baf543f6d", + "reference": "a24f1bda2d00a03877f7f99d9e6b150baf543f6d", "shasum": "" }, "require": { "doctrine/instantiator": "^1.2 || ^2.0", - "php": "^7.4 || 8.0.* || 8.1.* || 8.2.* || 8.3.* || 8.4.*", + "php": "8.2.* || 8.3.* || 8.4.* || 8.5.*", "phpdocumentor/reflection-docblock": "^5.2", "sebastian/comparator": "^3.0 || ^4.0 || ^5.0 || ^6.0 || ^7.0", - "sebastian/recursion-context": "^3.0 || ^4.0 || ^5.0 || ^6.0 || ^7.0" + "sebastian/recursion-context": "^3.0 || ^4.0 || ^5.0 || ^6.0 || ^7.0", + "symfony/deprecation-contracts": "^2.5 || ^3.1" }, "require-dev": { - "friendsofphp/php-cs-fixer": "^3.40", - "phpspec/phpspec": "^6.0 || ^7.0", + "friendsofphp/php-cs-fixer": "^3.88", + "phpspec/phpspec": "^6.0 || ^7.0 || ^8.0", "phpstan/phpstan": "^2.1.13", - "phpunit/phpunit": "^8.0 || ^9.0 || ^10.0" + "phpunit/phpunit": "^11.0 || ^12.0" }, "type": "library", "extra": { @@ -2399,9 +2323,9 @@ ], "support": { "issues": "https://github.com/phpspec/prophecy/issues", - "source": "https://github.com/phpspec/prophecy/tree/v1.22.0" + "source": "https://github.com/phpspec/prophecy/tree/v1.24.0" }, - "time": "2025-04-29T14:58:06+00:00" + "time": "2025-11-21T13:10:52+00:00" }, { "name": "phpspec/prophecy-phpunit", @@ -2508,16 +2432,16 @@ }, { "name": "phpstan/phpdoc-parser", - "version": "2.1.0", + "version": "2.3.0", "source": { "type": "git", "url": "https://github.com/phpstan/phpdoc-parser.git", - "reference": "9b30d6fd026b2c132b3985ce6b23bec09ab3aa68" + "reference": "1e0cd5370df5dd2e556a36b9c62f62e555870495" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/phpstan/phpdoc-parser/zipball/9b30d6fd026b2c132b3985ce6b23bec09ab3aa68", - "reference": "9b30d6fd026b2c132b3985ce6b23bec09ab3aa68", + "url": "https://api.github.com/repos/phpstan/phpdoc-parser/zipball/1e0cd5370df5dd2e556a36b9c62f62e555870495", + "reference": "1e0cd5370df5dd2e556a36b9c62f62e555870495", "shasum": "" }, "require": { @@ -2549,22 +2473,17 @@ "description": "PHPDoc parser with support for nullable, intersection and generic types", "support": { "issues": "https://github.com/phpstan/phpdoc-parser/issues", - "source": "https://github.com/phpstan/phpdoc-parser/tree/2.1.0" + "source": "https://github.com/phpstan/phpdoc-parser/tree/2.3.0" }, - "time": "2025-02-19T13:28:12+00:00" + "time": "2025-08-30T15:50:23+00:00" }, { "name": "phpstan/phpstan", - "version": "1.12.27", - "source": { - "type": "git", - "url": "https://github.com/phpstan/phpstan.git", - "reference": "3a6e423c076ab39dfedc307e2ac627ef579db162" - }, + "version": "1.12.32", "dist": { "type": "zip", - "url": "https://api.github.com/repos/phpstan/phpstan/zipball/3a6e423c076ab39dfedc307e2ac627ef579db162", - "reference": "3a6e423c076ab39dfedc307e2ac627ef579db162", + "url": "https://api.github.com/repos/phpstan/phpstan/zipball/2770dcdf5078d0b0d53f94317e06affe88419aa8", + "reference": "2770dcdf5078d0b0d53f94317e06affe88419aa8", "shasum": "" }, "require": { @@ -2609,7 +2528,7 @@ "type": "github" } ], - "time": "2025-05-21T20:51:45+00:00" + "time": "2025-09-30T10:16:31+00:00" }, { "name": "phpunit/php-code-coverage", @@ -2932,16 +2851,16 @@ }, { "name": "phpunit/phpunit", - "version": "9.6.23", + "version": "9.6.29", "source": { "type": "git", "url": "https://github.com/sebastianbergmann/phpunit.git", - "reference": "43d2cb18d0675c38bd44982a5d1d88f6d53d8d95" + "reference": "9ecfec57835a5581bc888ea7e13b51eb55ab9dd3" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/sebastianbergmann/phpunit/zipball/43d2cb18d0675c38bd44982a5d1d88f6d53d8d95", - "reference": "43d2cb18d0675c38bd44982a5d1d88f6d53d8d95", + "url": "https://api.github.com/repos/sebastianbergmann/phpunit/zipball/9ecfec57835a5581bc888ea7e13b51eb55ab9dd3", + "reference": "9ecfec57835a5581bc888ea7e13b51eb55ab9dd3", "shasum": "" }, "require": { @@ -2952,7 +2871,7 @@ "ext-mbstring": "*", "ext-xml": "*", "ext-xmlwriter": "*", - "myclabs/deep-copy": "^1.13.1", + "myclabs/deep-copy": "^1.13.4", "phar-io/manifest": "^2.0.4", "phar-io/version": "^3.2.1", "php": ">=7.3", @@ -2963,11 +2882,11 @@ "phpunit/php-timer": "^5.0.3", "sebastian/cli-parser": "^1.0.2", "sebastian/code-unit": "^1.0.8", - "sebastian/comparator": "^4.0.8", + "sebastian/comparator": "^4.0.9", "sebastian/diff": "^4.0.6", "sebastian/environment": "^5.1.5", - "sebastian/exporter": "^4.0.6", - "sebastian/global-state": "^5.0.7", + "sebastian/exporter": "^4.0.8", + "sebastian/global-state": "^5.0.8", "sebastian/object-enumerator": "^4.0.4", "sebastian/resource-operations": "^3.0.4", "sebastian/type": "^3.2.1", @@ -3015,7 +2934,7 @@ "support": { "issues": "https://github.com/sebastianbergmann/phpunit/issues", "security": "https://github.com/sebastianbergmann/phpunit/security/policy", - "source": "https://github.com/sebastianbergmann/phpunit/tree/9.6.23" + "source": "https://github.com/sebastianbergmann/phpunit/tree/9.6.29" }, "funding": [ { @@ -3039,7 +2958,7 @@ "type": "tidelift" } ], - "time": "2025-05-02T06:40:34+00:00" + "time": "2025-09-24T06:29:11+00:00" }, { "name": "sebastian/cli-parser", @@ -3210,16 +3129,16 @@ }, { "name": "sebastian/comparator", - "version": "4.0.8", + "version": "4.0.9", "source": { "type": "git", "url": "https://github.com/sebastianbergmann/comparator.git", - "reference": "fa0f136dd2334583309d32b62544682ee972b51a" + "reference": "67a2df3a62639eab2cc5906065e9805d4fd5dfc5" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/sebastianbergmann/comparator/zipball/fa0f136dd2334583309d32b62544682ee972b51a", - "reference": "fa0f136dd2334583309d32b62544682ee972b51a", + "url": "https://api.github.com/repos/sebastianbergmann/comparator/zipball/67a2df3a62639eab2cc5906065e9805d4fd5dfc5", + "reference": "67a2df3a62639eab2cc5906065e9805d4fd5dfc5", "shasum": "" }, "require": { @@ -3272,15 +3191,27 @@ ], "support": { "issues": "https://github.com/sebastianbergmann/comparator/issues", - "source": "https://github.com/sebastianbergmann/comparator/tree/4.0.8" + "source": "https://github.com/sebastianbergmann/comparator/tree/4.0.9" }, "funding": [ { "url": "https://github.com/sebastianbergmann", "type": "github" + }, + { + "url": "https://liberapay.com/sebastianbergmann", + "type": "liberapay" + }, + { + "url": "https://thanks.dev/u/gh/sebastianbergmann", + "type": "thanks_dev" + }, + { + "url": "https://tidelift.com/funding/github/packagist/sebastian/comparator", + "type": "tidelift" } ], - "time": "2022-09-14T12:41:17+00:00" + "time": "2025-08-10T06:51:50+00:00" }, { "name": "sebastian/complexity", @@ -3470,16 +3401,16 @@ }, { "name": "sebastian/exporter", - "version": "4.0.6", + "version": "4.0.8", "source": { "type": "git", "url": "https://github.com/sebastianbergmann/exporter.git", - "reference": "78c00df8f170e02473b682df15bfcdacc3d32d72" + "reference": "14c6ba52f95a36c3d27c835d65efc7123c446e8c" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/sebastianbergmann/exporter/zipball/78c00df8f170e02473b682df15bfcdacc3d32d72", - "reference": "78c00df8f170e02473b682df15bfcdacc3d32d72", + "url": "https://api.github.com/repos/sebastianbergmann/exporter/zipball/14c6ba52f95a36c3d27c835d65efc7123c446e8c", + "reference": "14c6ba52f95a36c3d27c835d65efc7123c446e8c", "shasum": "" }, "require": { @@ -3535,28 +3466,40 @@ ], "support": { "issues": "https://github.com/sebastianbergmann/exporter/issues", - "source": "https://github.com/sebastianbergmann/exporter/tree/4.0.6" + "source": "https://github.com/sebastianbergmann/exporter/tree/4.0.8" }, "funding": [ { "url": "https://github.com/sebastianbergmann", "type": "github" + }, + { + "url": "https://liberapay.com/sebastianbergmann", + "type": "liberapay" + }, + { + "url": "https://thanks.dev/u/gh/sebastianbergmann", + "type": "thanks_dev" + }, + { + "url": "https://tidelift.com/funding/github/packagist/sebastian/exporter", + "type": "tidelift" } ], - "time": "2024-03-02T06:33:00+00:00" + "time": "2025-09-24T06:03:27+00:00" }, { "name": "sebastian/global-state", - "version": "5.0.7", + "version": "5.0.8", "source": { "type": "git", "url": "https://github.com/sebastianbergmann/global-state.git", - "reference": "bca7df1f32ee6fe93b4d4a9abbf69e13a4ada2c9" + "reference": "b6781316bdcd28260904e7cc18ec983d0d2ef4f6" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/sebastianbergmann/global-state/zipball/bca7df1f32ee6fe93b4d4a9abbf69e13a4ada2c9", - "reference": "bca7df1f32ee6fe93b4d4a9abbf69e13a4ada2c9", + "url": "https://api.github.com/repos/sebastianbergmann/global-state/zipball/b6781316bdcd28260904e7cc18ec983d0d2ef4f6", + "reference": "b6781316bdcd28260904e7cc18ec983d0d2ef4f6", "shasum": "" }, "require": { @@ -3599,15 +3542,27 @@ ], "support": { "issues": "https://github.com/sebastianbergmann/global-state/issues", - "source": "https://github.com/sebastianbergmann/global-state/tree/5.0.7" + "source": "https://github.com/sebastianbergmann/global-state/tree/5.0.8" }, "funding": [ { "url": "https://github.com/sebastianbergmann", "type": "github" + }, + { + "url": "https://liberapay.com/sebastianbergmann", + "type": "liberapay" + }, + { + "url": "https://thanks.dev/u/gh/sebastianbergmann", + "type": "thanks_dev" + }, + { + "url": "https://tidelift.com/funding/github/packagist/sebastian/global-state", + "type": "tidelift" } ], - "time": "2024-03-02T06:35:11+00:00" + "time": "2025-08-10T07:10:35+00:00" }, { "name": "sebastian/lines-of-code", @@ -3780,16 +3735,16 @@ }, { "name": "sebastian/recursion-context", - "version": "4.0.5", + "version": "4.0.6", "source": { "type": "git", "url": "https://github.com/sebastianbergmann/recursion-context.git", - "reference": "e75bd0f07204fec2a0af9b0f3cfe97d05f92efc1" + "reference": "539c6691e0623af6dc6f9c20384c120f963465a0" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/sebastianbergmann/recursion-context/zipball/e75bd0f07204fec2a0af9b0f3cfe97d05f92efc1", - "reference": "e75bd0f07204fec2a0af9b0f3cfe97d05f92efc1", + "url": "https://api.github.com/repos/sebastianbergmann/recursion-context/zipball/539c6691e0623af6dc6f9c20384c120f963465a0", + "reference": "539c6691e0623af6dc6f9c20384c120f963465a0", "shasum": "" }, "require": { @@ -3831,15 +3786,27 @@ "homepage": "https://github.com/sebastianbergmann/recursion-context", "support": { "issues": "https://github.com/sebastianbergmann/recursion-context/issues", - "source": "https://github.com/sebastianbergmann/recursion-context/tree/4.0.5" + "source": "https://github.com/sebastianbergmann/recursion-context/tree/4.0.6" }, "funding": [ { "url": "https://github.com/sebastianbergmann", "type": "github" + }, + { + "url": "https://liberapay.com/sebastianbergmann", + "type": "liberapay" + }, + { + "url": "https://thanks.dev/u/gh/sebastianbergmann", + "type": "thanks_dev" + }, + { + "url": "https://tidelift.com/funding/github/packagist/sebastian/recursion-context", + "type": "tidelift" } ], - "time": "2023-02-03T06:07:39+00:00" + "time": "2025-08-10T06:57:39+00:00" }, { "name": "sebastian/resource-operations", @@ -4006,16 +3973,16 @@ }, { "name": "squizlabs/php_codesniffer", - "version": "3.13.2", + "version": "3.13.5", "source": { "type": "git", "url": "https://github.com/PHPCSStandards/PHP_CodeSniffer.git", - "reference": "5b5e3821314f947dd040c70f7992a64eac89025c" + "reference": "0ca86845ce43291e8f5692c7356fccf3bcf02bf4" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/PHPCSStandards/PHP_CodeSniffer/zipball/5b5e3821314f947dd040c70f7992a64eac89025c", - "reference": "5b5e3821314f947dd040c70f7992a64eac89025c", + "url": "https://api.github.com/repos/PHPCSStandards/PHP_CodeSniffer/zipball/0ca86845ce43291e8f5692c7356fccf3bcf02bf4", + "reference": "0ca86845ce43291e8f5692c7356fccf3bcf02bf4", "shasum": "" }, "require": { @@ -4032,11 +3999,6 @@ "bin/phpcs" ], "type": "library", - "extra": { - "branch-alias": { - "dev-master": "3.x-dev" - } - }, "notification-url": "https://packagist.org/downloads/", "license": [ "BSD-3-Clause" @@ -4086,20 +4048,87 @@ "type": "thanks_dev" } ], - "time": "2025-06-17T22:17:01+00:00" + "time": "2025-11-04T16:30:35+00:00" + }, + { + "name": "symfony/deprecation-contracts", + "version": "v3.6.0", + "source": { + "type": "git", + "url": "https://github.com/symfony/deprecation-contracts.git", + "reference": "63afe740e99a13ba87ec199bb07bbdee937a5b62" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/symfony/deprecation-contracts/zipball/63afe740e99a13ba87ec199bb07bbdee937a5b62", + "reference": "63afe740e99a13ba87ec199bb07bbdee937a5b62", + "shasum": "" + }, + "require": { + "php": ">=8.1" + }, + "type": "library", + "extra": { + "thanks": { + "url": "https://github.com/symfony/contracts", + "name": "symfony/contracts" + }, + "branch-alias": { + "dev-main": "3.6-dev" + } + }, + "autoload": { + "files": [ + "function.php" + ] + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "authors": [ + { + "name": "Nicolas Grekas", + "email": "p@tchwork.com" + }, + { + "name": "Symfony Community", + "homepage": "https://symfony.com/contributors" + } + ], + "description": "A generic function and convention to trigger deprecation notices", + "homepage": "https://symfony.com", + "support": { + "source": "https://github.com/symfony/deprecation-contracts/tree/v3.6.0" + }, + "funding": [ + { + "url": "https://symfony.com/sponsor", + "type": "custom" + }, + { + "url": "https://github.com/fabpot", + "type": "github" + }, + { + "url": "https://tidelift.com/funding/github/packagist/symfony/symfony", + "type": "tidelift" + } + ], + "time": "2024-09-25T14:21:43+00:00" }, { "name": "theseer/tokenizer", - "version": "1.2.3", + "version": "1.3.1", "source": { "type": "git", "url": "https://github.com/theseer/tokenizer.git", - "reference": "737eda637ed5e28c3413cb1ebe8bb52cbf1ca7a2" + "reference": "b7489ce515e168639d17feec34b8847c326b0b3c" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/theseer/tokenizer/zipball/737eda637ed5e28c3413cb1ebe8bb52cbf1ca7a2", - "reference": "737eda637ed5e28c3413cb1ebe8bb52cbf1ca7a2", + "url": "https://api.github.com/repos/theseer/tokenizer/zipball/b7489ce515e168639d17feec34b8847c326b0b3c", + "reference": "b7489ce515e168639d17feec34b8847c326b0b3c", "shasum": "" }, "require": { @@ -4128,7 +4157,7 @@ "description": "A small library for converting tokenized PHP source code into XML and potentially other formats", "support": { "issues": "https://github.com/theseer/tokenizer/issues", - "source": "https://github.com/theseer/tokenizer/tree/1.2.3" + "source": "https://github.com/theseer/tokenizer/tree/1.3.1" }, "funding": [ { @@ -4136,32 +4165,32 @@ "type": "github" } ], - "time": "2024-03-03T12:36:25+00:00" + "time": "2025-11-17T20:03:58+00:00" }, { "name": "webmozart/assert", - "version": "1.11.0", + "version": "1.12.1", "source": { "type": "git", "url": "https://github.com/webmozarts/assert.git", - "reference": "11cb2199493b2f8a3b53e7f19068fc6aac760991" + "reference": "9be6926d8b485f55b9229203f962b51ed377ba68" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/webmozarts/assert/zipball/11cb2199493b2f8a3b53e7f19068fc6aac760991", - "reference": "11cb2199493b2f8a3b53e7f19068fc6aac760991", + "url": "https://api.github.com/repos/webmozarts/assert/zipball/9be6926d8b485f55b9229203f962b51ed377ba68", + "reference": "9be6926d8b485f55b9229203f962b51ed377ba68", "shasum": "" }, "require": { "ext-ctype": "*", + "ext-date": "*", + "ext-filter": "*", "php": "^7.2 || ^8.0" }, - "conflict": { - "phpstan/phpstan": "<0.12.20", - "vimeo/psalm": "<4.6.1 || 4.6.2" - }, - "require-dev": { - "phpunit/phpunit": "^8.5.13" + "suggest": { + "ext-intl": "", + "ext-simplexml": "", + "ext-spl": "" }, "type": "library", "extra": { @@ -4192,9 +4221,9 @@ ], "support": { "issues": "https://github.com/webmozarts/assert/issues", - "source": "https://github.com/webmozarts/assert/tree/1.11.0" + "source": "https://github.com/webmozarts/assert/tree/1.12.1" }, - "time": "2022-06-03T18:03:27+00:00" + "time": "2025-10-29T15:56:20+00:00" } ], "aliases": [], @@ -4203,7 +4232,7 @@ "prefer-stable": false, "prefer-lowest": false, "platform": { - "php": "^8.0", + "php": "^8.2", "ext-json": "*", "ext-pdo": "*" }, diff --git a/src/api/v2/index.php b/src/api/v2/index.php index 6e768c8bc..889a4acf9 100644 --- a/src/api/v2/index.php +++ b/src/api/v2/index.php @@ -30,11 +30,16 @@ use Skeleton\Domain\Token; -use Tuupola\Middleware\JwtAuthentication; use Tuupola\Middleware\HttpBasicAuthentication; use Tuupola\Middleware\HttpBasicAuthentication\AuthenticatorInterface; use Tuupola\Middleware\CorsMiddleware; +use JimTools\JwtAuth\Decoder\FirebaseDecoder; +use JimTools\JwtAuth\Middleware\JwtAuthentication; +use JimTools\JwtAuth\Options; +use JimTools\JwtAuth\Secret; +use JimTools\JwtAuth\Exceptions\AuthorizationException; + use Middlewares\DeflateEncoder; use Skeleton\Application\Response\UnauthorizedResponse; @@ -48,6 +53,9 @@ use DBA\Session; use DBA\User; use DBA\Factory; +use JimTools\JwtAuth\Handlers\BeforeHandlerInterface; +use JimTools\JwtAuth\Rules\RequestPathRule; +use Psr\Http\Message\ServerRequestInterface; require __DIR__ . "/../../../vendor/autoload.php"; require __DIR__ . "/../../inc/apiv2/common/ErrorHandler.class.php"; @@ -60,6 +68,17 @@ AppFactory::setContainer($container); +class JWTBeforeHandler implements BeforeHandlerInterface { + /** + * @param array{decoded: array, token: string} $arguments + */ + public function __invoke(ServerRequestInterface $request, array $arguments): ServerRequestInterface + { + // adds the decoded userId and scope to the request attributes + return $request->withAttribute("userId", $arguments["decoded"]["userId"])->withAttribute("scope", $arguments["decoded"]["scope"]); + } +} + /* Authentication middleware for token retrival */ class HashtopolisAuthenticator implements AuthenticatorInterface { @@ -121,23 +140,23 @@ public function get($key): string { /* API token validation */ $container->set("JwtAuthentication", function (\Psr\Container\ContainerInterface $container) { include(dirname(__FILE__) . '/../../inc/confv2.php'); - return new JwtAuthentication([ - "path" => "/", - "ignore" => ["/api/v2/auth/token", "/api/v2/helper/resetUserPassword", "/api/v2/openapi.json"], - "secret" => $PEPPER[0], - "attribute" => false, - "secure" => false, - "error" => function ($response, $arguments) { - return errorResponse($response, $arguments["message"], 401); - }, - "before" => function ($request, $arguments) use ($container) { - // TODO: Validate if user is still allowed to login - return $request->withAttribute("userId", $arguments["decoded"]["userId"])->withAttribute("scope", $arguments["decoded"]["scope"]); - }, - ]); -}); + $decoder = new FirebaseDecoder( + new Secret($PEPPER[0], 'HS256') + ); + + $options = new Options( + isSecure: false, + before: new JWTBeforeHandler, + attribute: null + ); + $rules = [ + new RequestPathRule(ignore: ["/api/v2/auth/token", "/api/v2/helper/resetUserPassword", "/api/v2/openapi.json"]) + ]; + return new JwtAuthentication($options, $decoder, $rules); +}); + /* Pre-parse incoming request body */ class JsonBodyParserMiddleware implements MiddlewareInterface { @@ -245,8 +264,20 @@ public static function addCORSheaders(Request $request, $response) { if ($code == 0 || $code == 1 || !is_integer($code)) { $code = 500; } + + $msg = $exception->getMessage(); + + if ($exception instanceof AuthorizationException && empty($msg)) { + //the JWT authorization exceptions are wrapped in an outer exception + $previous = $exception->getPrevious(); + if ($previous !== null) { + $code = 400; + $msg = $previous->getMessage(); + } + } + - return errorResponse($response, $exception->getMessage(), $code); + return errorResponse($response, $msg, $code); }; $errorMiddleware->setDefaultErrorHandler($customErrorHandler); $app->addRoutingMiddleware(); //Routing middleware has to be added after the default error handler From c2cada2e244b2c151eee3960fd784e2f5a12a819 Mon Sep 17 00:00:00 2001 From: s3inlc Date: Wed, 26 Nov 2025 15:18:15 +0100 Subject: [PATCH 273/691] replace aliasing for joins with more general character --- src/dba/AbstractModelFactory.class.php | 2 +- src/dba/Util.class.php | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/dba/AbstractModelFactory.class.php b/src/dba/AbstractModelFactory.class.php index bd65c6368..6a16dd127 100755 --- a/src/dba/AbstractModelFactory.class.php +++ b/src/dba/AbstractModelFactory.class.php @@ -638,7 +638,7 @@ private function filterWithJoin(array $options): array|AbstractModel { $k = strtolower($k); foreach ($factories as $factory) { if (Util::startsWith($k, strtolower($factory->getMappedModelTable()))) { - $column = str_replace(strtolower($factory->getMappedModelTable()) . ".", "", $k); + $column = str_replace(strtolower($factory->getMappedModelTable()) . "_", "", $k); $values[$factory->getModelTable()][strtolower($column)] = $v; } } diff --git a/src/dba/Util.class.php b/src/dba/Util.class.php index 19e902b91..6463d7cfc 100644 --- a/src/dba/Util.class.php +++ b/src/dba/Util.class.php @@ -37,7 +37,7 @@ public static function cast($obj, $to_class) { public static function createPrefixedString(string $table, array $keys): string { $arr = array(); foreach ($keys as $key) { - $arr[] = "$table.$key AS '$table.$key'"; + $arr[] = "$table.$key AS " . $table . "_" . $key; } return implode(", ", $arr); } From 08b35506305edb8d735ec56290328dc7f30da826 Mon Sep 17 00:00:00 2001 From: s3inlc Date: Thu, 27 Nov 2025 13:39:35 +0100 Subject: [PATCH 274/691] fix check for setup on agent table instead of user table --- src/inc/load.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/inc/load.php b/src/inc/load.php index 5a21f3f44..b34c38803 100755 --- a/src/inc/load.php +++ b/src/inc/load.php @@ -67,7 +67,7 @@ die("Database connection failed!"); } try { - Factory::getUserFactory()->filter([], true); + Factory::getAgentFactory()->filter([], true); } catch (PDOException $e) { $query = file_get_contents(dirname(__FILE__) . "/../install/hashtopolis.sql"); From e3d445970df1647a1d9698e8d0ca7207529ec317 Mon Sep 17 00:00:00 2001 From: s3inlc Date: Thu, 27 Nov 2025 14:33:06 +0100 Subject: [PATCH 275/691] bases on first model in massSave include pk or not --- src/dba/AbstractModelFactory.class.php | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) diff --git a/src/dba/AbstractModelFactory.class.php b/src/dba/AbstractModelFactory.class.php index 6a16dd127..fa7dfe0db 100755 --- a/src/dba/AbstractModelFactory.class.php +++ b/src/dba/AbstractModelFactory.class.php @@ -372,7 +372,13 @@ public function massSave(array $models): bool|PDOStatement { $keys = self::getMappedModelKeys($models[0]); $query = "INSERT INTO " . $this->getMappedModelTable(); - array_splice($keys, 0, 1); + $pkInclude = false; + if ($models[0]->getId() !== -1 && $models[0]->getId() !== null) { + $pkInclude = true; + } + else { + array_splice($keys, 0, 1); + } $query .= " (" . implode(",", $keys) . ") "; $placeHolder = " (" . implode(",", array_fill(0, count($keys), "?")) . ")"; @@ -385,7 +391,9 @@ public function massSave(array $models): bool|PDOStatement { $query .= ", "; } $dict = $models[$x]->getKeyValueDict(); - array_splice($dict, 0, 1); + if (!$pkInclude) { + array_splice($dict, 0, 1); + } foreach ($dict as $val) { $vals[] = $val; } From a760f44963bad590a3edfbc4b057e4e1cbe8f184 Mon Sep 17 00:00:00 2001 From: s3inlc Date: Thu, 27 Nov 2025 14:42:15 +0100 Subject: [PATCH 276/691] unassign agents from tasks they should not work on anymore --- src/inc/api/APIGetTask.class.php | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/src/inc/api/APIGetTask.class.php b/src/inc/api/APIGetTask.class.php index 6b1cf5c6b..b14db44b6 100644 --- a/src/inc/api/APIGetTask.class.php +++ b/src/inc/api/APIGetTask.class.php @@ -56,9 +56,11 @@ public function execute($QUERY = array()) { if ($currentTask == null) { // we checked the task and it is completed DServerLog::log(DServerLog::TRACE, "No best task available and current assigned task is fullfilled", [$this->agent]); + Factory::getAssignmentFactory()->delete($assignment); $this->noTask(); } if (TaskUtils::isSaturatedByOtherAgents($currentTask, $this->agent)) { + Factory::getAssignmentFactory()->delete($assignment); $this->noTask(); } // assignment is still good -> send this task @@ -187,4 +189,4 @@ private function sendTask($task, $assignment) { $this->sendResponse($response); } -} \ No newline at end of file +} From 3da637ea7b760493232cb7221cee4ba48a483407 Mon Sep 17 00:00:00 2001 From: s3inlc Date: Thu, 27 Nov 2025 14:57:51 +0100 Subject: [PATCH 277/691] test incorrectly expected that agent still would be assigned to task when he calls getChunk (after it got unassigned from a task) --- ci/tests/integration/MaxAgentsTest.class.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/ci/tests/integration/MaxAgentsTest.class.php b/ci/tests/integration/MaxAgentsTest.class.php index 322d5e5f0..551ae1a4e 100644 --- a/ci/tests/integration/MaxAgentsTest.class.php +++ b/ci/tests/integration/MaxAgentsTest.class.php @@ -126,7 +126,7 @@ private function testTaskMaxAgents($hashlistId) { "action" => "getChunk", "taskId" => $task1Id, "token" => $agent2["token"]]); - if ($response["response"] !== "ERROR" || $response["message"] != "Task already saturated by other agents, no other task available!") { + if ($response["response"] !== "ERROR" || $response["message"] != "You are not assigned to this task!") { $this->testFailed("MaxAgentsTest:testTaskMaxAgents()", sprintf("Expected getChunk to fail, instead got: %s", implode(", ", $response))); return; } @@ -607,4 +607,4 @@ public function getTestName() { } } -HashtopolisTestFramework::register(new MaxAgentsTest()); \ No newline at end of file +HashtopolisTestFramework::register(new MaxAgentsTest()); From dec8b78d9a5d41045ca2aa5acd55fd5f6be1b04a Mon Sep 17 00:00:00 2001 From: s3inlc Date: Fri, 28 Nov 2025 11:29:54 +0100 Subject: [PATCH 278/691] fix incorrect brackets in new offset order filter --- src/hashes.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/hashes.php b/src/hashes.php index af6af3a1e..196c51283 100755 --- a/src/hashes.php +++ b/src/hashes.php @@ -195,7 +195,7 @@ UI::add('previousPage', $previousPage); UI::add('currentPage', $currentPage); -$oF = new OrderFilter($hashFactory->getNullObject()->getPrimaryKey(), "ASC LIMIT " . SConfig::getInstance()->getVal(DConfig::HASHES_PER_PAGE)) . " OFFSET " . (SConfig::getInstance()->getVal(DConfig::HASHES_PER_PAGE) * $currentPage); +$oF = new OrderFilter($hashFactory->getNullObject()->getPrimaryKey(), "ASC LIMIT " . (SConfig::getInstance()->getVal(DConfig::HASHES_PER_PAGE)) . " OFFSET " . (SConfig::getInstance()->getVal(DConfig::HASHES_PER_PAGE) * $currentPage)); $hashes = $hashFactory->filter([Factory::FILTER => $queryFilters, Factory::ORDER => $oF]); if (isset($_GET['crackpos']) && $_GET['crackpos'] == 'true') { From 3ef2525bac79e6c0e2ae3b86a913f1999e9bc7a4 Mon Sep 17 00:00:00 2001 From: s3inlc Date: Fri, 28 Nov 2025 11:32:54 +0100 Subject: [PATCH 279/691] initial rework for dual support of mysql and postgres, moved to use migrations, currently only initial setup will work --- Dockerfile | 10 +- ...er-compose.yml => docker-compose.mysql.yml | 3 +- docker-compose.postgres.yml | 45 + docker-entrypoint.sh | 39 +- env.example => env.mysql.example | 0 env.postgres.example | 10 + src/dba/AbstractModelFactory.class.php | 51 +- src/dba/init.php | 1 + src/inc/confv2.php | 22 +- src/inc/load.php | 17 +- .../updates/update_v1.0.0-rainbow4_vx.x.x.php | 5 + .../mysql/20251127000000_initial.sql} | 100 +- .../postgres/20251127000000_initial.sql | 1193 +++++++++++++++++ 13 files changed, 1410 insertions(+), 86 deletions(-) rename docker-compose.yml => docker-compose.mysql.yml (96%) create mode 100644 docker-compose.postgres.yml rename env.example => env.mysql.example (100%) create mode 100644 env.postgres.example rename src/{install/hashtopolis.sql => migrations/mysql/20251127000000_initial.sql} (96%) create mode 100644 src/migrations/postgres/20251127000000_initial.sql diff --git a/Dockerfile b/Dockerfile index dbd1f3106..813615d76 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,3 +1,7 @@ +FROM rust:1.91-trixie AS prebuild + +RUN cargo install sqlx-cli --no-default-features --features native-tls,mysql,postgres + FROM alpine/git AS preprocess COPY .gi[t] /.git @@ -37,12 +41,12 @@ RUN apt-get update \ # # Install git, procps, lsb-release (useful for CLI installs) && apt-get -y install git iproute2 procps lsb-release \ - && apt-get -y install mariadb-client \ + && apt-get -y install mariadb-client postgresql-client libpq-dev \ && apt-get -y install libpng-dev \ && apt-get -y install ssmtp \ \ # Install extensions (optional) - && docker-php-ext-install pdo_mysql gd \ + && docker-php-ext-install pdo_mysql pgsql pdo_pgsql gd \ \ # Install Composer && curl -sS https://getcomposer.org/installer | php \ @@ -82,6 +86,8 @@ RUN mkdir -p ${HASHTOPOLIS_DOCUMENT_ROOT} \ && chown www-data:www-data ${HASHTOPOLIS_BINARIES_PATH} \ && chmod g+w ${HASHTOPOLIS_BINARIES_PATH} +COPY --from=prebuild /usr/local/cargo/bin/sqlx /usr/bin/ + COPY --from=preprocess /HEA[D] ${HASHTOPOLIS_DOCUMENT_ROOT}/../.git/ # Install composer diff --git a/docker-compose.yml b/docker-compose.mysql.yml similarity index 96% rename from docker-compose.yml rename to docker-compose.mysql.yml index 91b14c1ce..93cbff4c2 100644 --- a/docker-compose.yml +++ b/docker-compose.mysql.yml @@ -8,6 +8,7 @@ services: - hashtopolis:/usr/local/share/hashtopolis:Z # - ./ssmtp.conf:/etc/ssmtp/ssmtp.conf environment: + HASHTOPOLIS_DB_TYPE: mysql HASHTOPOLIS_DB_USER: $MYSQL_USER HASHTOPOLIS_DB_PASS: $MYSQL_PASSWORD HASHTOPOLIS_DB_HOST: $HASHTOPOLIS_DB_HOST @@ -36,7 +37,7 @@ services: environment: HASHTOPOLIS_BACKEND_URL: $HASHTOPOLIS_BACKEND_URL restart: always - depends_on: + depends_on: - hashtopolis-backend ports: - 4200:80 diff --git a/docker-compose.postgres.yml b/docker-compose.postgres.yml new file mode 100644 index 000000000..a7553595e --- /dev/null +++ b/docker-compose.postgres.yml @@ -0,0 +1,45 @@ +version: '3.7' +services: + hashtopolis-backend: + container_name: hashtopolis-backend + image: hashtopolis/backend:latest + restart: always + volumes: + - hashtopolis:/usr/local/share/hashtopolis:Z + # - ./ssmtp.conf:/etc/ssmtp/ssmtp.conf + environment: + HASHTOPOLIS_DB_TYPE: postgres + HASHTOPOLIS_DB_USER: $POSTGRES_USER + HASHTOPOLIS_DB_PASS: $POSTGRES_PASSWORD + HASHTOPOLIS_DB_HOST: $HASHTOPOLIS_DB_HOST + HASHTOPOLIS_DB_DATABASE: $POSTGRES_DATABASE + HASHTOPOLIS_ADMIN_USER: $HASHTOPOLIS_ADMIN_USER + HASHTOPOLIS_ADMIN_PASSWORD: $HASHTOPOLIS_ADMIN_PASSWORD + HASHTOPOLIS_APIV2_ENABLE: $HASHTOPOLIS_APIV2_ENABLE + depends_on: + - db + ports: + - 8080:80 + db: + container_name: db + image: postgres:13 + restart: always + volumes: + - db:/var/lib/postgresql/data + environment: + POSTGRES_DB: $POSTGRES_DATABASE + POSTGRES_USER: $POSTGRES_USER + POSTGRES_PASSWORD: $POSTGRES_PASSWORD + hashtopolis-frontend: + container_name: hashtopolis-frontend + image: hashtopolis/frontend:latest + environment: + HASHTOPOLIS_BACKEND_URL: $HASHTOPOLIS_BACKEND_URL + restart: always + depends_on: + - hashtopolis-backend + ports: + - 4200:80 +volumes: + db: + hashtopolis: diff --git a/docker-entrypoint.sh b/docker-entrypoint.sh index ac7a2cde4..5b6fc174a 100755 --- a/docker-entrypoint.sh +++ b/docker-entrypoint.sh @@ -10,20 +10,35 @@ for path in ${paths[@]}; do fi done -echo "Testing database." -MYSQL="mysql -u${HASHTOPOLIS_DB_USER} -p${HASHTOPOLIS_DB_PASS} -h ${HASHTOPOLIS_DB_HOST} --skip-ssl" -$MYSQL -e "SELECT 1" > /dev/null 2>&1 -ERROR=$? +echo "Testing database..." +if [[ "$HASHTOPOLIS_DB_TYPE" == "mysql" ]]; then + echo "Using MySQL..." + DB_CMD="mysql -u${HASHTOPOLIS_DB_USER} -p${HASHTOPOLIS_DB_PASS} -h ${HASHTOPOLIS_DB_HOST} --skip-ssl" + DB_TYPE="mysql" +elif [[ "$HASHTOPOLIS_DB_TYPE" == "postgres" ]]; then + echo "Using postgres..." + DB_CMD="psql -U${HASHTOPOLIS_DB_USER} -h ${HASHTOPOLIS_DB_HOST} ${HASHTOPOLIS_DB_DATABASE}" + DB_TYPE="postgres" +else + echo "INVALID DATABASE TYPE PROVIDED: $HASHTOPOLIS_DB_TYPE" + exit 1 +fi -while [ $ERROR -ne 0 ]; -do - echo "Database not ready or unable to connect. Retrying in 5s." - sleep 5 - $MYSQL -e "SELECT 1" > /dev/null 2>&1 - ERROR=$? +while :; do + if [[ $DB_TYPE == "mysql" ]]; then + $DB_CMD -e "SELECT 1" > /dev/null 2>&1 + ERROR=$? + elif [[ $DB_TYPE == "postgres" ]]; then + PGPASSWORD="${HASHTOPOLIS_DB_PASS}" $DB_CMD -c "SELECT 1" > /dev/null 2>&1 + ERROR=$? + fi + if [ $ERROR -eq 0 ]; then + break + fi + echo "Database not ready or unable to connect. Retrying in 5s." + sleep 5 done - -echo "Database ready." +echo "Database ready!" echo "Setting up folders" if [ ! -d ${HASHTOPOLIS_FILES_PATH} ];then diff --git a/env.example b/env.mysql.example similarity index 100% rename from env.example rename to env.mysql.example diff --git a/env.postgres.example b/env.postgres.example new file mode 100644 index 000000000..166f366d4 --- /dev/null +++ b/env.postgres.example @@ -0,0 +1,10 @@ +POSTGRES_DATABASE=hashtopolis +POSTGRES_USER=hashtopolis +POSTGRES_PASSWORD=hashtopolis + +HASHTOPOLIS_ADMIN_USER=admin +HASHTOPOLIS_ADMIN_PASSWORD=hashtopolis +HASHTOPOLIS_DB_HOST=db + +HASHTOPOLIS_APIV2_ENABLE=0 +HASHTOPOLIS_BACKEND_URL=http://localhost:8080/api/v2 diff --git a/src/dba/AbstractModelFactory.class.php b/src/dba/AbstractModelFactory.class.php index fa7dfe0db..c576f2fa1 100755 --- a/src/dba/AbstractModelFactory.class.php +++ b/src/dba/AbstractModelFactory.class.php @@ -920,30 +920,49 @@ public function massUpdate($options): bool { * @return PDO */ public function getDB(bool $test = false): ?PDO { - if (!$test) { - $dsn = 'mysql:dbname=' . DBA_DB . ";host=" . DBA_SERVER . ";port=" . DBA_PORT; - $user = DBA_USER; - $password = DBA_PASS; - } - else { - global $CONN; - // The utf8mb4 is here to force php to connect with that encoding, so you can save emoji's or other non ascii chars (specifically, unicode characters outside of the BMP) into the database. - // If you are running into issues with this line, we could make this configurable. - $dsn = 'mysql:dbname=' . $CONN['db'] . ";host=" . $CONN['server'] . ";port=" . $CONN['port'] . ";charset=utf8mb4"; - $user = $CONN['user']; - $password = $CONN['pass']; - } - if (self::$dbh !== null) { return self::$dbh; } - try { - self::$dbh = new PDO($dsn, $user, $password); + $dbUser = @DBA_USER; + $dbPass = @DBA_PASS; + $dbType = @DBA_TYPE; + $dbHost = @DBA_SERVER; + $dbPort = @DBA_PORT; + $dbDB = @DBA_DB; + if ($test) { // if the connection is beeing tested, take credentials from legacy global variable + global $CONN; + $dbUser = $CONN['user']; + $dbPass = $CONN['pass']; + $dbType = $CONN['type']; + $dbHost = $CONN['server']; + $dbPort = $CONN['port']; + $dbDB = $CONN['db']; + } + + if ($dbType == 'mysql') { + // connect as mysql + $dsn = "mysql:dbname=$dbDB;host=$dbHost;port=$dbPort;charset=utf8mb4"; + self::$dbh = new PDO($dsn, $dbUser, $dbPass); + } + else if ($dbType == 'postgres') { + // connect as postgres + $dsn = "pgsql:dbname=$dbDB;host=$dbHost;port=$dbPort;user=$dbUser;password=$dbPass"; + self::$dbh = new PDO($dsn); + } + else { + // unknown type + if ($test) { + return null; + } + throw new Exception("Fatal Error: Unknown database type specified!"); + } + self::$dbh->setAttribute(PDO::ATTR_ERRMODE, PDO::ERRMODE_EXCEPTION); return self::$dbh; } catch (PDOException $e) { + echo $e->getMessage()."\n"; if ($test) { return null; } diff --git a/src/dba/init.php b/src/dba/init.php index 7af80230d..04a043954 100644 --- a/src/dba/init.php +++ b/src/dba/init.php @@ -6,6 +6,7 @@ define("DBA_USER", (isset($CONN['user'])) ? $CONN['user'] : ""); define("DBA_PASS", (isset($CONN['pass'])) ? $CONN['pass'] : ""); define("DBA_PORT", (isset($CONN['port'])) ? $CONN['port'] : ""); +define("DBA_TYPE", (isset($CONN['type'])) ? $CONN['type'] : ""); require_once(dirname(__FILE__) . "/AbstractModel.class.php"); require_once(dirname(__FILE__) . "/AbstractModelFactory.class.php"); diff --git a/src/inc/confv2.php b/src/inc/confv2.php index dd63271d5..d13484e72 100644 --- a/src/inc/confv2.php +++ b/src/inc/confv2.php @@ -24,7 +24,25 @@ $CONN['pass'] = getenv('HASHTOPOLIS_DB_PASS'); $CONN['server'] = getenv('HASHTOPOLIS_DB_HOST'); $CONN['db'] = getenv('HASHTOPOLIS_DB_DATABASE'); - $CONN['port'] = 3306; + if (getenv('HASHTOPOLIS_DB_TYPE') !== false) { + $CONN['type'] = getenv('HASHTOPOLIS_DB_TYPE'); + } + else { + $CONN['type'] = 'mysql'; + } + if (getenv('HASHTOPOLIS_DB_PORT') !== false) { + $CONN['port'] = getenv('HASHTOPOLIS_DB_PORT'); + } + else { + switch($CONN['type']) { + case 'mysql': + $CONN['port'] = '3306'; + break; + case 'postgres': + $CONN['port'] = '5432'; + break; + } + } $DIRECTORIES = [ "files" => "/usr/local/share/hashtopolis/files", @@ -51,4 +69,4 @@ $PEPPER = $CONFIG['PEPPER']; } else { $CONFIG = []; -} \ No newline at end of file +} diff --git a/src/inc/load.php b/src/inc/load.php index b34c38803..a588caeb2 100755 --- a/src/inc/load.php +++ b/src/inc/load.php @@ -66,13 +66,24 @@ //connection not valid die("Database connection failed!"); } +$initialSetup = false; try { Factory::getAgentFactory()->filter([], true); } catch (PDOException $e) { - $query = file_get_contents(dirname(__FILE__) . "/../install/hashtopolis.sql"); - Factory::getAgentFactory()->getDB()->query($query); - + // initial setup, run only on the very first time + // the boolean is stored to later when the database is migrated, some initial queries can be done + $initialSetup = true; +} + + +$database_uri = DBA_TYPE . "://" . DBA_USER . ":" . DBA_PASS . "@" . DBA_SERVER . ":" . DBA_PORT . "/" . DBA_DB; +exec('/usr/bin/sqlx migrate run --source ' . dirname(__FILE__) . '/../migrations/' . DBA_TYPE . '/ -D ' . $database_uri, $output, $retval); +if ($retval !== 0) { + die("Failed to run migrations: \n" . implode("\n", $output)); +} + +if ($initialSetup === true) { // determine the base url $baseUrl = explode("/", $_SERVER['REQUEST_URI']); unset($baseUrl[sizeof($baseUrl) - 1]); diff --git a/src/install/updates/update_v1.0.0-rainbow4_vx.x.x.php b/src/install/updates/update_v1.0.0-rainbow4_vx.x.x.php index 388be7f5c..7759616ee 100644 --- a/src/install/updates/update_v1.0.0-rainbow4_vx.x.x.php +++ b/src/install/updates/update_v1.0.0-rainbow4_vx.x.x.php @@ -6,6 +6,11 @@ use DBA\QueryFilter; +if (DBA_TYPE == 'postgres' || Util::databaseTableExists("_sqlx_migrations")) { + // this system is already using migrations, so it should NEVER do any of the updates + return; +} + if (!isset($PRESENT["v1.0.0-rainbow4_prefix_user_and_end"])) { if (Util::databaseColumnExists("HealthCheckAgent", "end")) { Factory::getAgentFactory()->getDB()->query("ALTER TABLE `HealthCheckAgent` RENAME COLUMN `end` to `htp_end`;"); diff --git a/src/install/hashtopolis.sql b/src/migrations/mysql/20251127000000_initial.sql similarity index 96% rename from src/install/hashtopolis.sql rename to src/migrations/mysql/20251127000000_initial.sql index 01072a1d1..2dc14d914 100644 --- a/src/install/hashtopolis.sql +++ b/src/migrations/mysql/20251127000000_initial.sql @@ -8,24 +8,24 @@ SET time_zone = "+00:00"; /*!40101 SET NAMES utf8mb4 */; -- Create tables and insert default entries -CREATE TABLE `AccessGroup` ( +CREATE TABLE IF NOT EXISTS `AccessGroup` ( `accessGroupId` INT(11) NOT NULL, `groupName` VARCHAR(50) NOT NULL ) ENGINE = InnoDB; -CREATE TABLE `AccessGroupAgent` ( +CREATE TABLE IF NOT EXISTS `AccessGroupAgent` ( `accessGroupAgentId` INT(11) NOT NULL, `accessGroupId` INT(11) NOT NULL, `agentId` INT(11) NOT NULL ) ENGINE = InnoDB; -CREATE TABLE `AccessGroupUser` ( +CREATE TABLE IF NOT EXISTS `AccessGroupUser` ( `accessGroupUserId` INT(11) NOT NULL, `accessGroupId` INT(11) NOT NULL, `userId` INT(11) NOT NULL ) ENGINE = InnoDB; -CREATE TABLE `Agent` ( +CREATE TABLE IF NOT EXISTS `Agent` ( `agentId` INT(11) NOT NULL, `agentName` VARCHAR(100) NOT NULL, `uid` VARCHAR(100) NOT NULL, @@ -44,7 +44,7 @@ CREATE TABLE `Agent` ( `clientSignature` VARCHAR(50) NOT NULL ) ENGINE = InnoDB; -CREATE TABLE `AgentBinary` ( +CREATE TABLE IF NOT EXISTS `AgentBinary` ( `agentBinaryId` INT(11) NOT NULL, `binaryType` VARCHAR(20) NOT NULL, `version` VARCHAR(20) NOT NULL, @@ -57,7 +57,7 @@ CREATE TABLE `AgentBinary` ( INSERT INTO `AgentBinary` (`agentBinaryId`, `binaryType`, `version`, `operatingSystems`, `filename`, `updateTrack`, `updateAvailable`) VALUES (1, 'python', '0.7.4', 'Windows, Linux, OS X', 'hashtopolis.zip', 'stable', ''); -CREATE TABLE `AgentError` ( +CREATE TABLE IF NOT EXISTS `AgentError` ( `agentErrorId` INT(11) NOT NULL, `agentId` INT(11) NOT NULL, `taskId` INT(11) DEFAULT NULL, @@ -66,7 +66,7 @@ CREATE TABLE `AgentError` ( `chunkId` INT(11) NULL ) ENGINE = InnoDB; -CREATE TABLE `AgentStat` ( +CREATE TABLE IF NOT EXISTS `AgentStat` ( `agentStatId` INT(11) NOT NULL, `agentId` INT(11) NOT NULL, `statType` INT(11) NOT NULL, @@ -74,20 +74,20 @@ CREATE TABLE `AgentStat` ( `value` VARCHAR(128) NOT NULL ) ENGINE = InnoDB; -CREATE TABLE `AgentZap` ( +CREATE TABLE IF NOT EXISTS `AgentZap` ( `agentZapId` INT(11) NOT NULL, `agentId` INT(11) NOT NULL, `lastZapId` INT(11) NULL ) ENGINE = InnoDB; -CREATE TABLE `Assignment` ( +CREATE TABLE IF NOT EXISTS `Assignment` ( `assignmentId` INT(11) NOT NULL, `taskId` INT(11) NOT NULL, `agentId` INT(11) NOT NULL, `benchmark` VARCHAR(50) NOT NULL ) ENGINE = InnoDB; -CREATE TABLE `Chunk` ( +CREATE TABLE IF NOT EXISTS `Chunk` ( `chunkId` INT(11) NOT NULL, `taskId` INT(11) NOT NULL, `skip` BIGINT(20) UNSIGNED NOT NULL, @@ -102,7 +102,7 @@ CREATE TABLE `Chunk` ( `speed` BIGINT(20) NOT NULL ) ENGINE = InnoDB; -CREATE TABLE `Config` ( +CREATE TABLE IF NOT EXISTS `Config` ( `configId` INT(11) NOT NULL, `configSectionId` INT(11) NOT NULL, `item` VARCHAR(80) NOT NULL, @@ -175,7 +175,7 @@ INSERT INTO `Config` (`configId`, `configSectionId`, `item`, `value`) VALUES (79, 3, 'maxPageSize', '50000'); -CREATE TABLE `ConfigSection` ( +CREATE TABLE IF NOT EXISTS `ConfigSection` ( `configSectionId` INT(11) NOT NULL, `sectionName` VARCHAR(100) NOT NULL ) ENGINE = InnoDB; @@ -189,7 +189,7 @@ INSERT INTO `ConfigSection` (`configSectionId`, `sectionName`) VALUES (6, 'Multicast'), (7, 'Notifications'); -CREATE TABLE `CrackerBinary` ( +CREATE TABLE IF NOT EXISTS `CrackerBinary` ( `crackerBinaryId` INT(11) NOT NULL, `crackerBinaryTypeId` INT(11) NOT NULL, `version` VARCHAR(20) NOT NULL, @@ -200,7 +200,7 @@ CREATE TABLE `CrackerBinary` ( INSERT INTO `CrackerBinary` (`crackerBinaryId`, `crackerBinaryTypeId`, `version`, `downloadUrl`, `binaryName`) VALUES (1, 1, '7.1.2', 'https://hashcat.net/files/hashcat-7.1.2.7z', 'hashcat'); -CREATE TABLE `CrackerBinaryType` ( +CREATE TABLE IF NOT EXISTS `CrackerBinaryType` ( `crackerBinaryTypeId` INT(11) NOT NULL, `typeName` VARCHAR(30) NOT NULL, `isChunkingAvailable` TINYINT(4) NOT NULL @@ -209,7 +209,7 @@ CREATE TABLE `CrackerBinaryType` ( INSERT INTO `CrackerBinaryType` (`crackerBinaryTypeId`, `typeName`, `isChunkingAvailable`) VALUES (1, 'hashcat', 1); -CREATE TABLE `File` ( +CREATE TABLE IF NOT EXISTS `File` ( `fileId` INT(11) NOT NULL, `filename` VARCHAR(100) NOT NULL, `size` BIGINT(20) NOT NULL, @@ -219,25 +219,25 @@ CREATE TABLE `File` ( `lineCount` BIGINT(20) DEFAULT NULL ) ENGINE = InnoDB; -CREATE TABLE `FilePretask` ( +CREATE TABLE IF NOT EXISTS `FilePretask` ( `filePretaskId` INT(11) NOT NULL, `fileId` INT(11) NOT NULL, `pretaskId` INT(11) NOT NULL ) ENGINE = InnoDB; -CREATE TABLE `FileTask` ( +CREATE TABLE IF NOT EXISTS `FileTask` ( `fileTaskId` INT(11) NOT NULL, `fileId` INT(11) NOT NULL, `taskId` INT(11) NOT NULL ) ENGINE = InnoDB; -CREATE TABLE `FileDelete` ( +CREATE TABLE IF NOT EXISTS `FileDelete` ( `fileDeleteId` INT(11) NOT NULL, `filename` VARCHAR(256) NOT NULL, `time` BIGINT NOT NULL ) ENGINE=InnoDB; -CREATE TABLE `Hash` ( +CREATE TABLE IF NOT EXISTS `Hash` ( `hashId` INT(11) NOT NULL, `hashlistId` INT(11) NOT NULL, `hash` MEDIUMTEXT NOT NULL, @@ -249,7 +249,7 @@ CREATE TABLE `Hash` ( `crackPos` BIGINT NOT NULL ) ENGINE = InnoDB; -CREATE TABLE `HashBinary` ( +CREATE TABLE IF NOT EXISTS `HashBinary` ( `hashBinaryId` INT(11) NOT NULL, `hashlistId` INT(11) NOT NULL, `essid` VARCHAR(100) NOT NULL, @@ -261,7 +261,7 @@ CREATE TABLE `HashBinary` ( `crackPos` BIGINT NOT NULL ) ENGINE = InnoDB; -CREATE TABLE `Hashlist` ( +CREATE TABLE IF NOT EXISTS `Hashlist` ( `hashlistId` INT(11) NOT NULL, `hashlistName` VARCHAR(100) NOT NULL, `format` INT(11) NOT NULL, @@ -279,13 +279,13 @@ CREATE TABLE `Hashlist` ( `isArchived` TINYINT(4) NOT NULL ) ENGINE = InnoDB; -CREATE TABLE `HashlistHashlist` ( +CREATE TABLE IF NOT EXISTS `HashlistHashlist` ( `hashlistHashlistId` INT(11) NOT NULL, `parentHashlistId` INT(11) NOT NULL, `hashlistId` INT(11) NOT NULL ) ENGINE = InnoDB; -CREATE TABLE `HashType` ( +CREATE TABLE IF NOT EXISTS `HashType` ( `hashTypeId` INT(11) NOT NULL, `description` VARCHAR(256) NOT NULL, `isSalted` TINYINT(4) NOT NULL, @@ -874,7 +874,7 @@ INSERT INTO `HashType` (`hashTypeId`, `description`, `isSalted`, `isSlowHash`) V (73000, 'Generic Hash [Bridged: Python Interpreter with GIL]', 0, 1), (99999, 'Plaintext', 0, 0); -CREATE TABLE `LogEntry` ( +CREATE TABLE IF NOT EXISTS `LogEntry` ( `logEntryId` INT(11) NOT NULL, `issuer` VARCHAR(50) NOT NULL, `issuerId` VARCHAR(50) NOT NULL, @@ -883,7 +883,7 @@ CREATE TABLE `LogEntry` ( `time` BIGINT NOT NULL ) ENGINE = InnoDB; -CREATE TABLE `NotificationSetting` ( +CREATE TABLE IF NOT EXISTS `NotificationSetting` ( `notificationSettingId` INT(11) NOT NULL, `action` VARCHAR(50) NOT NULL, `objectId` INT(11) NULL, @@ -893,7 +893,7 @@ CREATE TABLE `NotificationSetting` ( `isActive` TINYINT(4) NOT NULL )ENGINE = InnoDB; -CREATE TABLE `Pretask` ( +CREATE TABLE IF NOT EXISTS `Pretask` ( `pretaskId` INT(11) NOT NULL, `taskName` VARCHAR(100) NOT NULL, `attackCmd` TEXT NOT NULL, @@ -909,13 +909,13 @@ CREATE TABLE `Pretask` ( `crackerBinaryTypeId` INT(11) NOT NULL ) ENGINE = InnoDB; -CREATE TABLE `RegVoucher` ( +CREATE TABLE IF NOT EXISTS `RegVoucher` ( `regVoucherId` INT(11) NOT NULL, `voucher` VARCHAR(100) NOT NULL, `time` BIGINT NOT NULL ) ENGINE = InnoDB; -CREATE TABLE `RightGroup` ( +CREATE TABLE IF NOT EXISTS `RightGroup` ( `rightGroupId` INT(11) NOT NULL, `groupName` VARCHAR(50) NOT NULL, `permissions` TEXT NOT NULL @@ -924,7 +924,7 @@ CREATE TABLE `RightGroup` ( INSERT INTO `RightGroup` (`rightGroupId`, `groupName`, `permissions`) VALUES (1, 'Administrator', 'ALL'); -CREATE TABLE `Session` ( +CREATE TABLE IF NOT EXISTS `Session` ( `sessionId` INT(11) NOT NULL, `userId` INT(11) NOT NULL, `sessionStartDate` BIGINT NOT NULL, @@ -934,7 +934,7 @@ CREATE TABLE `Session` ( `sessionKey` VARCHAR(256) NOT NULL ) ENGINE = InnoDB; -CREATE TABLE `Speed` ( +CREATE TABLE IF NOT EXISTS `Speed` ( `speedId` INT(11) NOT NULL, `agentId` INT(11) NOT NULL, `taskId` INT(11) NOT NULL, @@ -942,23 +942,23 @@ CREATE TABLE `Speed` ( `time` BIGINT(20) NOT NULL ) ENGINE=InnoDB; -CREATE TABLE `StoredValue` ( +CREATE TABLE IF NOT EXISTS `StoredValue` ( `storedValueId` VARCHAR(50) NOT NULL, `val` VARCHAR(256) NOT NULL ) ENGINE = InnoDB; -CREATE TABLE `Supertask` ( +CREATE TABLE IF NOT EXISTS `Supertask` ( `supertaskId` INT(11) NOT NULL, `supertaskName` VARCHAR(50) NOT NULL ) ENGINE = InnoDB; -CREATE TABLE `SupertaskPretask` ( +CREATE TABLE IF NOT EXISTS `SupertaskPretask` ( `supertaskPretaskId` INT(11) NOT NULL, `supertaskId` INT(11) NOT NULL, `pretaskId` INT(11) NOT NULL ) ENGINE = InnoDB; -CREATE TABLE `Task` ( +CREATE TABLE IF NOT EXISTS `Task` ( `taskId` INT(11) NOT NULL, `taskName` VARCHAR(256) NOT NULL, `attackCmd` TEXT NOT NULL, @@ -985,13 +985,13 @@ CREATE TABLE `Task` ( `preprocessorCommand` VARCHAR(256) NOT NULL ) ENGINE = InnoDB; -CREATE TABLE `TaskDebugOutput` ( +CREATE TABLE IF NOT EXISTS `TaskDebugOutput` ( `taskDebugOutputId` INT(11) NOT NULL, `taskId` INT(11) NOT NULL, `output` VARCHAR(256) NOT NULL ) ENGINE=InnoDB; - -CREATE TABLE `TaskWrapper` ( + +CREATE TABLE IF NOT EXISTS `TaskWrapper` ( `taskWrapperId` INT(11) NOT NULL, `priority` INT(11) NOT NULL, `maxAgents` INT(11) NOT NULL, @@ -1003,7 +1003,7 @@ CREATE TABLE `TaskWrapper` ( `cracked` INT(11) NOT NULL )ENGINE = InnoDB; -CREATE TABLE `htp_User` ( +CREATE TABLE IF NOT EXISTS `htp_User` ( `userId` INT(11) NOT NULL, `username` VARCHAR(100) NOT NULL, `email` VARCHAR(150) NOT NULL, @@ -1022,7 +1022,7 @@ CREATE TABLE `htp_User` ( `otp4` VARCHAR(256) DEFAULT NULL ) ENGINE = InnoDB; -CREATE TABLE `Zap` ( +CREATE TABLE IF NOT EXISTS `Zap` ( `zapId` INT(11) NOT NULL, `hash` MEDIUMTEXT NOT NULL, `solveTime` BIGINT NOT NULL, @@ -1030,7 +1030,7 @@ CREATE TABLE `Zap` ( `hashlistId` INT(11) NOT NULL ) ENGINE = InnoDB; -CREATE TABLE `ApiKey` ( +CREATE TABLE IF NOT EXISTS `ApiKey` ( `apiKeyId` INT(11) NOT NULL, `startValid` BIGINT(20) NOT NULL, `endValid` BIGINT(20) NOT NULL, @@ -1040,13 +1040,13 @@ CREATE TABLE `ApiKey` ( `apiGroupId` INT(11) NOT NULL ) ENGINE=InnoDB; -CREATE TABLE `ApiGroup` ( +CREATE TABLE IF NOT EXISTS `ApiGroup` ( `apiGroupId` INT(11) NOT NULL, `name` VARCHAR(100) NOT NULL, `permissions` TEXT NOT NULL ) ENGINE=InnoDB; -CREATE TABLE `FileDownload` ( +CREATE TABLE IF NOT EXISTS `FileDownload` ( `fileDownloadId` INT(11) NOT NULL, `time` BIGINT NOT NULL, `fileId` INT(11) NOT NULL, @@ -1056,7 +1056,7 @@ CREATE TABLE `FileDownload` ( INSERT INTO `ApiGroup` ( `apiGroupId`, `name`, `permissions`) VALUES (1, 'Administrators', 'ALL'); -CREATE TABLE `HealthCheck` ( +CREATE TABLE IF NOT EXISTS `HealthCheck` ( `healthCheckId` INT(11) NOT NULL, `time` BIGINT(20) NOT NULL, `status` INT(11) NOT NULL, @@ -1067,7 +1067,7 @@ CREATE TABLE `HealthCheck` ( `attackCmd` TEXT NOT NULL ) ENGINE=InnoDB; -CREATE TABLE `HealthCheckAgent` ( +CREATE TABLE IF NOT EXISTS `HealthCheckAgent` ( `healthCheckAgentId` INT(11) NOT NULL, `healthCheckId` INT(11) NOT NULL, `agentId` INT(11) NOT NULL, @@ -1079,7 +1079,7 @@ CREATE TABLE `HealthCheckAgent` ( `errors` TEXT NOT NULL ) ENGINE=InnoDB; -CREATE TABLE `Preprocessor` ( +CREATE TABLE IF NOT EXISTS `Preprocessor` ( `preprocessorId` INT(11) NOT NULL, `name` VARCHAR(256) NOT NULL, `url` VARCHAR(512) NOT NULL, @@ -1412,10 +1412,10 @@ ALTER TABLE `AccessGroupAgent` ALTER TABLE `AccessGroupUser` ADD CONSTRAINT `AccessGroupUser_ibfk_1` FOREIGN KEY (`accessGroupId`) REFERENCES `AccessGroup` (`accessGroupId`), - ADD CONSTRAINT `AccessGroupUser_ibfk_2` FOREIGN KEY (`userId`) REFERENCES `User` (`userId`); + ADD CONSTRAINT `AccessGroupUser_ibfk_2` FOREIGN KEY (`userId`) REFERENCES `htp_User` (`userId`); ALTER TABLE `Agent` - ADD CONSTRAINT `Agent_ibfk_1` FOREIGN KEY (`userId`) REFERENCES `User` (`userId`); + ADD CONSTRAINT `Agent_ibfk_1` FOREIGN KEY (`userId`) REFERENCES `htp_User` (`userId`); ALTER TABLE `AgentError` ADD CONSTRAINT `AgentError_ibfk_1` FOREIGN KEY (`agentId`) REFERENCES `Agent` (`agentId`), @@ -1429,7 +1429,7 @@ ALTER TABLE `AgentZap` ADD CONSTRAINT `AgentZap_ibfk_2` FOREIGN KEY (`lastZapId`) REFERENCES `Zap` (`zapId`); ALTER TABLE `ApiKey` - ADD CONSTRAINT `ApiKey_ibfk_1` FOREIGN KEY (`userId`) REFERENCES `User` (`userId`), + ADD CONSTRAINT `ApiKey_ibfk_1` FOREIGN KEY (`userId`) REFERENCES `htp_User` (`userId`), ADD CONSTRAINT `ApiKey_ibfk_2` FOREIGN KEY (`apiGroupId`) REFERENCES `ApiGroup` (`apiGroupId`); ALTER TABLE `Assignment` @@ -1484,13 +1484,13 @@ ALTER TABLE `HealthCheckAgent` ADD CONSTRAINT `HealthCheckAgent_ibfk_2` FOREIGN KEY (`healthCheckId`) REFERENCES `HealthCheck` (`healthCheckId`); ALTER TABLE `NotificationSetting` - ADD CONSTRAINT `NotificationSetting_ibfk_1` FOREIGN KEY (`userId`) REFERENCES `User` (`userId`); + ADD CONSTRAINT `NotificationSetting_ibfk_1` FOREIGN KEY (`userId`) REFERENCES `htp_User` (`userId`); ALTER TABLE `Pretask` ADD CONSTRAINT `Pretask_ibfk_1` FOREIGN KEY (`crackerBinaryTypeId`) REFERENCES `CrackerBinaryType` (`crackerBinaryTypeId`); ALTER TABLE `Session` - ADD CONSTRAINT `Session_ibfk_1` FOREIGN KEY (`userId`) REFERENCES `User` (`userId`); + ADD CONSTRAINT `Session_ibfk_1` FOREIGN KEY (`userId`) REFERENCES `htp_User` (`userId`); ALTER TABLE `Speed` ADD CONSTRAINT `Speed_ibfk_1` FOREIGN KEY (`agentId`) REFERENCES `Agent` (`agentId`), diff --git a/src/migrations/postgres/20251127000000_initial.sql b/src/migrations/postgres/20251127000000_initial.sql new file mode 100644 index 000000000..273e7694d --- /dev/null +++ b/src/migrations/postgres/20251127000000_initial.sql @@ -0,0 +1,1193 @@ +-- Create tables and insert default entries +CREATE TABLE AccessGroup ( + accessGroupId SERIAL NOT NULL PRIMARY KEY, + groupName TEXT NOT NULL +); +CREATE TABLE AccessGroupAgent ( + accessGroupAgentId SERIAL NOT NULL PRIMARY KEY, + accessGroupId INT NOT NULL, + agentId INT NOT NULL +); +CREATE TABLE AccessGroupUser ( + accessGroupUserId SERIAL NOT NULL PRIMARY KEY, + accessGroupId INT NOT NULL, + userId INT NOT NULL +); +CREATE TABLE Agent ( + agentId SERIAL NOT NULL PRIMARY KEY, + agentName TEXT NOT NULL, + uid TEXT NOT NULL, + os INT NOT NULL, + devices TEXT NOT NULL, + cmdPars TEXT NOT NULL, + ignoreErrors INT NOT NULL, + isActive INT NOT NULL, + isTrusted INT NOT NULL, + token TEXT NOT NULL, + lastAct TEXT NOT NULL, + lastTime BIGINT NOT NULL, + lastIp TEXT NOT NULL, + userId INT DEFAULT NULL, + cpuOnly INT NOT NULL, + clientSignature TEXT NOT NULL +); +CREATE TABLE AgentBinary ( + agentBinaryId SERIAL NOT NULL PRIMARY KEY, + binaryType TEXT NOT NULL, + version TEXT NOT NULL, + operatingSystems TEXT NOT NULL, + filename TEXT NOT NULL, + updateTrack TEXT NOT NULL, + updateAvailable TEXT NOT NULL +); +INSERT INTO AgentBinary (agentBinaryId, binaryType, version, operatingSystems, filename, updateTrack, updateAvailable) VALUES + (1, 'python', '0.7.4', 'Windows, Linux, OS X', 'hashtopolis.zip', 'stable', ''); + +CREATE TABLE AgentError ( + agentErrorId SERIAL NOT NULL PRIMARY KEY, + agentId INT NOT NULL, + taskId INT DEFAULT NULL, + time BIGINT NOT NULL, + error TEXT NOT NULL, + chunkId INT NULL +); +CREATE TABLE AgentStat ( + agentStatId SERIAL NOT NULL PRIMARY KEY, + agentId INT NOT NULL, + statType INT NOT NULL, + time BIGINT NOT NULL, + value TEXT NOT NULL +); +CREATE TABLE AgentZap ( + agentZapId SERIAL NOT NULL PRIMARY KEY, + agentId INT NOT NULL, + lastZapId INT NULL +); +CREATE TABLE Assignment ( + assignmentId SERIAL NOT NULL PRIMARY KEY, + taskId INT NOT NULL, + agentId INT NOT NULL, + benchmark TEXT NOT NULL +); +CREATE TABLE Chunk ( + chunkId SERIAL NOT NULL PRIMARY KEY, + taskId INT NOT NULL, + skip BIGINT NOT NULL, + length BIGINT NOT NULL, + agentId INT NULL, + dispatchTime BIGINT NOT NULL, + solveTime BIGINT NOT NULL, + checkpoint BIGINT NOT NULL, + progress INT NULL, + state INT NOT NULL, + cracked INT NOT NULL, + speed BIGINT NOT NULL +); +CREATE TABLE Config ( + configId SERIAL NOT NULL PRIMARY KEY, + configSectionId INT NOT NULL, + item TEXT NOT NULL, + value TEXT NOT NULL +); +INSERT INTO Config (configId, configSectionId, item, value) VALUES + (1, 1, 'agenttimeout', '30'), + (2, 1, 'benchtime', '30'), + (3, 1, 'chunktime', '600'), + (4, 1, 'chunktimeout', '30'), + (9, 1, 'fieldseparator', ':'), + (10, 1, 'hashlistAlias', '#HL#'), + (11, 1, 'statustimer', '5'), + (12, 4, 'timefmt', 'd.m.Y, H:i:s'), + (13, 1, 'blacklistChars', '&|"''{}()[]$<>;'), + (14, 3, 'numLogEntries', '5000'), + (15, 1, 'disptolerance', '20'), + (16, 3, 'batchSize', '50000'), + (18, 2, 'yubikey_id', ''), + (19, 2, 'yubikey_key', ''), + (20, 2, 'yubikey_url', 'https://api.yubico.com/wsapi/2.0/verify'), + (22, 3, 'pagingSize', '5000'), + (23, 3, 'plainTextMaxLength', '200'), + (24, 3, 'hashMaxLength', '1024'), + (25, 5, 'emailSender', 'hashtopolis@example.org'), + (26, 5, 'emailSenderName', 'Hashtopolis'), + (27, 5, 'baseHost', ''), + (28, 3, 'maxHashlistSize', '5000000'), + (29, 4, 'hideImportMasks', '1'), + (30, 7, 'telegramBotToken', ''), + (31, 5, 'contactEmail', ''), + (32, 5, 'voucherDeletion', '0'), + (33, 4, 'hashesPerPage', '1000'), + (34, 4, 'hideIpInfo', '0'), + (35, 1, 'defaultBenchmark', '1'), + (36, 4, 'showTaskPerformance', '0'), + (37, 1, 'ruleSplitSmallTasks', '0'), + (38, 1, 'ruleSplitAlways', '0'), + (39, 1, 'ruleSplitDisable', '1'), + (41, 4, 'agentStatLimit', '100'), + (42, 1, 'agentDataLifetime', '3600'), + (43, 4, 'agentStatTension', '0'), + (44, 6, 'multicastEnable', '0'), + (45, 6, 'multicastDevice', 'eth0'), + (46, 6, 'multicastTransferRateEnable', '0'), + (47, 6, 'multicastTranserRate', '500000'), + (48, 1, 'disableTrimming', '0'), + (49, 5, 'serverLogLevel', '20'), + (50, 7, 'notificationsProxyEnable', '0'), + (60, 7, 'notificationsProxyServer', ''), + (61, 7, 'notificationsProxyPort', '8080'), + (62, 7, 'notificationsProxyType', 'HTTP'), + (63, 1, 'priority0Start', '0'), + (64, 5, 'baseUrl', ''), + (65, 4, 'maxSessionLength', '48'), + (66, 1, 'hashcatBrainEnable', '0'), + (67, 1, 'hashcatBrainHost', ''), + (68, 1, 'hashcatBrainPort', '0'), + (69, 1, 'hashcatBrainPass', ''), + (70, 1, 'hashlistImportCheck', '0'), + (71, 5, 'allowDeregister', '0'), + (72, 4, 'agentTempThreshold1', '70'), + (73, 4, 'agentTempThreshold2', '80'), + (74, 4, 'agentUtilThreshold1', '90'), + (75, 4, 'agentUtilThreshold2', '75'), + (76, 3, 'uApiSendTaskIsComplete', '0'), + (77, 1, 'hcErrorIgnore', 'DeviceGetFanSpeed'), + (78, 3, 'defaultPageSize', '10000'), + (79, 3, 'maxPageSize', '50000'); + + +CREATE TABLE ConfigSection ( + configSectionId SERIAL NOT NULL PRIMARY KEY, + sectionName TEXT NOT NULL +); +INSERT INTO ConfigSection (configSectionId, sectionName) VALUES + (1, 'Cracking/Tasks'), + (2, 'Yubikey'), + (3, 'Finetuning'), + (4, 'UI'), + (5, 'Server'), + (6, 'Multicast'), + (7, 'Notifications'); + +CREATE TABLE CrackerBinary ( + crackerBinaryId SERIAL NOT NULL PRIMARY KEY, + crackerBinaryTypeId INT NOT NULL, + version TEXT NOT NULL, + downloadUrl TEXT NOT NULL, + binaryName TEXT NOT NULL +); +INSERT INTO CrackerBinary (crackerBinaryId, crackerBinaryTypeId, version, downloadUrl, binaryName) VALUES + (1, 1, '7.1.2', 'https://hashcat.net/files/hashcat-7.1.2.7z', 'hashcat'); + +CREATE TABLE CrackerBinaryType ( + crackerBinaryTypeId SERIAL NOT NULL PRIMARY KEY, + typeName TEXT NOT NULL, + isChunkingAvailable INT NOT NULL +); +INSERT INTO CrackerBinaryType (crackerBinaryTypeId, typeName, isChunkingAvailable) VALUES + (1, 'hashcat', 1); + +CREATE TABLE File ( + fileId SERIAL NOT NULL PRIMARY KEY, + filename TEXT NOT NULL, + size BIGINT NOT NULL, + isSecret INT NOT NULL, + fileType INT NOT NULL, + accessGroupId INT NOT NULL, + lineCount BIGINT DEFAULT NULL +); +CREATE TABLE FilePretask ( + filePretaskId SERIAL NOT NULL PRIMARY KEY, + fileId INT NOT NULL, + pretaskId INT NOT NULL +); +CREATE TABLE FileTask ( + fileTaskId SERIAL NOT NULL PRIMARY KEY, + fileId INT NOT NULL, + taskId INT NOT NULL +); +CREATE TABLE FileDelete ( + fileDeleteId SERIAL NOT NULL PRIMARY KEY, + filename TEXT NOT NULL, + time BIGINT NOT NULL +); +CREATE TABLE Hash ( + hashId SERIAL NOT NULL PRIMARY KEY, + hashlistId INT NOT NULL, + hash TEXT NOT NULL, + salt TEXT DEFAULT NULL, + plaintext TEXT DEFAULT NULL, + timeCracked BIGINT DEFAULT NULL, + chunkId INT DEFAULT NULL, + isCracked INT NOT NULL, + crackPos BIGINT NOT NULL +); +CREATE TABLE HashBinary ( + hashBinaryId SERIAL NOT NULL PRIMARY KEY, + hashlistId INT NOT NULL, + essid TEXT NOT NULL, + hash TEXT NOT NULL, + plaintext TEXT DEFAULT NULL, + timeCracked BIGINT DEFAULT NULL, + chunkId INT DEFAULT NULL, + isCracked INT NOT NULL, + crackPos BIGINT NOT NULL +); +CREATE TABLE Hashlist ( + hashlistId SERIAL NOT NULL PRIMARY KEY, + hashlistName TEXT NOT NULL, + format INT NOT NULL, + hashTypeId INT NOT NULL, + hashCount INT NOT NULL, + saltSeparator TEXT DEFAULT NULL, + cracked INT NOT NULL, + isSecret INT NOT NULL, + hexSalt INT NOT NULL, + isSalted INT NOT NULL, + accessGroupId INT NOT NULL, + notes TEXT NOT NULL, + brainId INT NOT NULL, + brainFeatures INT NOT NULL, + isArchived INT NOT NULL +); +CREATE TABLE HashlistHashlist ( + hashlistHashlistId SERIAL NOT NULL PRIMARY KEY, + parentHashlistId INT NOT NULL, + hashlistId INT NOT NULL +); +CREATE TABLE HashType ( + hashTypeId SERIAL NOT NULL PRIMARY KEY, + description TEXT NOT NULL, + isSalted INT NOT NULL, + isSlowHash INT NOT NULL +); +INSERT INTO HashType (hashTypeId, description, isSalted, isSlowHash) VALUES + (0, 'MD5', 0, 0), + (10, 'md5($pass.$salt)', 1, 0), + (11, 'Joomla < 2.5.18', 1, 0), + (12, 'PostgreSQL', 1, 0), + (20, 'md5($salt.$pass)', 1, 0), + (21, 'osCommerce, xt:Commerce', 1, 0), + (22, 'Juniper Netscreen/SSG (ScreenOS)', 1, 0), + (23, 'Skype', 1, 0), + (24, 'SolarWinds Serv-U', 0, 0), + (30, 'md5(utf16le($pass).$salt)', 1, 0), + (40, 'md5($salt.utf16le($pass))', 1, 0), + (50, 'HMAC-MD5 (key = $pass)', 1, 0), + (60, 'HMAC-MD5 (key = $salt)', 1, 0), + (70, 'md5(utf16le($pass))', 0, 0), + (100, 'SHA1', 0, 0), + (101, 'nsldap, SHA-1(Base64), Netscape LDAP SHA', 0, 0), + (110, 'sha1($pass.$salt)', 1, 0), + (111, 'nsldaps, SSHA-1(Base64), Netscape LDAP SSHA', 0, 0), + (112, 'Oracle S: Type (Oracle 11+)', 1, 0), + (120, 'sha1($salt.$pass)', 1, 0), + (121, 'SMF >= v1.1', 1, 0), + (122, 'OS X v10.4, v10.5, v10.6', 0, 0), + (124, 'Django (SHA-1)', 0, 0), + (125, 'ArubaOS', 0, 0), + (130, 'sha1(utf16le($pass).$salt)', 1, 0), + (131, 'MSSQL(2000)', 0, 0), + (132, 'MSSQL(2005)', 0, 0), + (133, 'PeopleSoft', 0, 0), + (140, 'sha1($salt.utf16le($pass))', 1, 0), + (141, 'EPiServer 6.x < v4', 0, 0), + (150, 'HMAC-SHA1 (key = $pass)', 1, 0), + (160, 'HMAC-SHA1 (key = $salt)', 1, 0), + (170, 'sha1(utf16le($pass))', 0, 0), + (200, 'MySQL323', 0, 0), + (300, 'MySQL4.1/MySQL5+', 0, 0), + (400, 'phpass, MD5(Wordpress), MD5(Joomla), MD5(phpBB3)', 0, 0), + (500, 'md5crypt, MD5(Unix), FreeBSD MD5, Cisco-IOS MD5 2', 0, 0), + (501, 'Juniper IVE', 0, 0), + (600, 'BLAKE2b-512', 0, 0), + (610, 'BLAKE2b-512($pass.$salt)', 1, 0), + (620, 'BLAKE2b-512($salt.$pass)', 1, 0), + (900, 'MD4', 0, 0), + (1000, 'NTLM', 0, 0), + (1100, 'Domain Cached Credentials (DCC), MS Cache', 1, 0), + (1300, 'SHA-224', 0, 0), + (1310, 'sha224($pass.$salt)', 1, 0), + (1320, 'sha224($salt.$pass)', 1, 0), + (1400, 'SHA256', 0, 0), + (1410, 'sha256($pass.$salt)', 1, 0), + (1411, 'SSHA-256(Base64), LDAP {SSHA256}', 0, 0), + (1420, 'sha256($salt.$pass)', 1, 0), + (1421, 'hMailServer', 0, 0), + (1430, 'sha256(utf16le($pass).$salt)', 1, 0), + (1440, 'sha256($salt.utf16le($pass))', 1, 0), + (1441, 'EPiServer 6.x >= v4', 0, 0), + (1450, 'HMAC-SHA256 (key = $pass)', 1, 0), + (1460, 'HMAC-SHA256 (key = $salt)', 1, 0), + (1470, 'sha256(utf16le($pass))', 0, 0), + (1500, 'descrypt, DES(Unix), Traditional DES', 0, 0), + (1600, 'md5apr1, MD5(APR), Apache MD5', 0, 0), + (1700, 'SHA512', 0, 0), + (1710, 'sha512($pass.$salt)', 1, 0), + (1711, 'SSHA-512(Base64), LDAP {SSHA512}', 0, 0), + (1720, 'sha512($salt.$pass)', 1, 0), + (1722, 'OS X v10.7', 0, 0), + (1730, 'sha512(utf16le($pass).$salt)', 1, 0), + (1731, 'MSSQL(2012), MSSQL(2014)', 0, 0), + (1740, 'sha512($salt.utf16le($pass))', 1, 0), + (1750, 'HMAC-SHA512 (key = $pass)', 1, 0), + (1760, 'HMAC-SHA512 (key = $salt)', 1, 0), + (1770, 'sha512(utf16le($pass))', 0, 0), + (1800, 'sha512crypt, SHA512(Unix)', 0, 0), + (2000, 'STDOUT', 0, 0), + (2100, 'Domain Cached Credentials 2 (DCC2), MS Cache', 0, 1), + (2400, 'Cisco-PIX MD5', 0, 0), + (2410, 'Cisco-ASA MD5', 1, 0), + (2500, 'WPA/WPA2', 0, 1), + (2501, 'WPA-EAPOL-PMK', 0, 1), + (2600, 'md5(md5($pass))', 0, 0), + (2611, 'vBulletin < v3.8.5', 1, 0), + (2612, 'PHPS', 0, 0), + (2630, 'md5(md5($pass.$salt))', 1, 0), + (2711, 'vBulletin >= v3.8.5', 1, 0), + (2811, 'IPB2+, MyBB1.2+', 1, 0), + (3000, 'LM', 0, 0), + (3100, 'Oracle H: Type (Oracle 7+), DES(Oracle)', 1, 0), + (3200, 'bcrypt, Blowfish(OpenBSD)', 0, 0), + (3500, 'md5(md5(md5($pass)))', 0, 0), + (3610, 'md5(md5(md5($pass)).$salt)', 1, 0), + (3710, 'md5($salt.md5($pass))', 1, 0), + (3711, 'Mediawiki B type', 0, 0), + (3730, 'md5($salt1.strtoupper(md5($salt2.$pass)))', 0, 0), + (3800, 'md5($salt.$pass.$salt)', 1, 0), + (3910, 'md5(md5($pass).md5($salt))', 1, 0), + (4010, 'md5($salt.md5($salt.$pass))', 1, 0), + (4110, 'md5($salt.md5($pass.$salt))', 1, 0), + (4300, 'md5(strtoupper(md5($pass)))', 0, 0), + (4400, 'md5(sha1($pass))', 0, 0), + (4410, 'md5(sha1($pass).$salt)', 1, 0), + (4420, 'md5(sha1($pass.$salt))', 1, 0), + (4430, 'md5(sha1($salt.$pass))', 1, 0), + (4500, 'sha1(sha1($pass))', 0, 0), + (4510, 'sha1(sha1($pass).$salt)', 1, 0), + (4520, 'sha1($salt.sha1($pass))', 1, 0), + (4521, 'Redmine Project Management Web App', 0, 0), + (4522, 'PunBB', 0, 0), + (4700, 'sha1(md5($pass))', 0, 0), + (4710, 'sha1(md5($pass).$salt)', 1, 0), + (4711, 'Huawei sha1(md5($pass).$salt)', 1, 0), + (4800, 'MD5(Chap), iSCSI CHAP authentication', 1, 0), + (4900, 'sha1($salt.$pass.$salt)', 1, 0), + (5000, 'SHA-3(Keccak)', 0, 0), + (5100, 'Half MD5', 0, 0), + (5200, 'Password Safe v3', 0, 1), + (5300, 'IKE-PSK MD5', 0, 0), + (5400, 'IKE-PSK SHA1', 0, 0), + (5500, 'NetNTLMv1-VANILLA / NetNTLMv1+ESS', 0, 0), + (5600, 'NetNTLMv2', 0, 0), + (5700, 'Cisco-IOS SHA256', 0, 0), + (5720, 'Cisco-ISE Hashed Password (SHA256)', 0, 0), + (5800, 'Samsung Android Password/PIN', 1, 0), + (6000, 'RipeMD160', 0, 0), + (6050, 'HMAC-RIPEMD160 (key = $pass)', 1, 0), + (6060, 'HMAC-RIPEMD160 (key = $salt)', 1, 0), + (6100, 'Whirlpool', 0, 0), + (6211, 'TrueCrypt 5.0+ PBKDF2-HMAC-RipeMD160 + AES/Serpent/Twofish', 0, 1), + (6212, 'TrueCrypt 5.0+ PBKDF2-HMAC-RipeMD160 + AES-Twofish/Serpent-AES/Twofish-Serpent', 0, 1), + (6213, 'TrueCrypt 5.0+ PBKDF2-HMAC-RipeMD160 + AES-Twofish-Serpent/Serpent-Twofish-AES', 0, 1), + (6221, 'TrueCrypt 5.0+ SHA512 + AES/Serpent/Twofish', 0, 1), + (6222, 'TrueCrypt 5.0+ SHA512 + AES-Twofish/Serpent-AES/Twofish-Serpent', 0, 1), + (6223, 'TrueCrypt 5.0+ SHA512 + AES-Twofish-Serpent/Serpent-Twofish-AES', 0, 1), + (6231, 'TrueCrypt 5.0+ Whirlpool + AES/Serpent/Twofish', 0, 1), + (6232, 'TrueCrypt 5.0+ Whirlpool + AES-Twofish/Serpent-AES/Twofish-Serpent', 0, 1), + (6233, 'TrueCrypt 5.0+ Whirlpool + AES-Twofish-Serpent/Serpent-Twofish-AES', 0, 1), + (6241, 'TrueCrypt 5.0+ PBKDF2-HMAC-RipeMD160 + AES/Serpent/Twofish + boot', 0, 1), + (6242, 'TrueCrypt 5.0+ PBKDF2-HMAC-RipeMD160 + AES-Twofish/Serpent-AES/Twofish-Serpent + boot', 0, 1), + (6243, 'TrueCrypt 5.0+ PBKDF2-HMAC-RipeMD160 + AES-Twofish-Serpent/Serpent-Twofish-AES + boot', 0, 1), + (6300, 'AIX {smd5}', 0, 0), + (6400, 'AIX {ssha256}', 0, 1), + (6500, 'AIX {ssha512}', 0, 1), + (6600, '1Password, Agile Keychain', 0, 1), + (6700, 'AIX {ssha1}', 0, 1), + (6800, 'Lastpass', 1, 1), + (6900, 'GOST R 34.11-94', 0, 0), + (7000, 'Fortigate (FortiOS)', 0, 0), + (7100, 'OS X v10.8 / v10.9', 0, 1), + (7200, 'GRUB 2', 0, 1), + (7300, 'IPMI2 RAKP HMAC-SHA1', 1, 0), + (7350, 'IPMI2 RAKP HMAC-MD5', 0, 0), + (7400, 'sha256crypt, SHA256(Unix)', 0, 0), + (7401, 'MySQL $A$ (sha256crypt)', 0, 0), + (7500, 'Kerberos 5 AS-REQ Pre-Auth', 0, 0), + (7700, 'SAP CODVN B (BCODE)', 0, 0), + (7701, 'SAP CODVN B (BCODE) from RFC_READ_TABLE', 0, 0), + (7800, 'SAP CODVN F/G (PASSCODE)', 0, 0), + (7801, 'SAP CODVN F/G (PASSCODE) from RFC_READ_TABLE', 0, 0), + (7900, 'Drupal7', 0, 0), + (8000, 'Sybase ASE', 0, 0), + (8100, 'Citrix Netscaler', 0, 0), + (8200, '1Password, Cloud Keychain', 0, 1), + (8300, 'DNSSEC (NSEC3)', 1, 0), + (8400, 'WBB3, Woltlab Burning Board 3', 1, 0), + (8500, 'RACF', 0, 0), + (8501, 'AS/400 DES', 0, 0), + (8600, 'Lotus Notes/Domino 5', 0, 0), + (8700, 'Lotus Notes/Domino 6', 0, 0), + (8800, 'Android FDE <= 4.3', 0, 1), + (8900, 'scrypt', 1, 0), + (9000, 'Password Safe v2', 0, 0), + (9100, 'Lotus Notes/Domino', 0, 1), + (9200, 'Cisco $8$', 0, 1), + (9300, 'Cisco $9$', 0, 0), + (9400, 'Office 2007', 0, 1), + (9500, 'Office 2010', 0, 1), + (9600, 'Office 2013', 0, 1), + (9700, 'MS Office ⇐ 2003 MD5 + RC4, oldoffice$0, oldoffice$1', 0, 0), + (9710, 'MS Office <= 2003 $0/$1, MD5 + RC4, collider #1', 0, 0), + (9720, 'MS Office <= 2003 $0/$1, MD5 + RC4, collider #2', 0, 0), + (9800, 'MS Office ⇐ 2003 SHA1 + RC4, oldoffice$3, oldoffice$4', 0, 0), + (9810, 'MS Office <= 2003 $3, SHA1 + RC4, collider #1', 0, 0), + (9820, 'MS Office <= 2003 $3, SHA1 + RC4, collider #2', 0, 0), + (9900, 'Radmin2', 0, 0), + (10000, 'Django (PBKDF2-SHA256)', 0, 1), + (10100, 'SipHash', 1, 0), + (10200, 'Cram MD5', 0, 0), + (10300, 'SAP CODVN H (PWDSALTEDHASH) iSSHA-1', 0, 0), + (10400, 'PDF 1.1 - 1.3 (Acrobat 2 - 4)', 0, 0), + (10410, 'PDF 1.1 - 1.3 (Acrobat 2 - 4), collider #1', 0, 0), + (10420, 'PDF 1.1 - 1.3 (Acrobat 2 - 4), collider #2', 0, 0), + (10500, 'PDF 1.4 - 1.6 (Acrobat 5 - 8)', 0, 0), + (10510, 'PDF 1.3 - 1.6 (Acrobat 4 - 8) w/ RC4-40', 0, 1), + (10600, 'PDF 1.7 Level 3 (Acrobat 9)', 0, 0), + (10700, 'PDF 1.7 Level 8 (Acrobat 10 - 11)', 0, 0), + (10800, 'SHA384', 0, 0), + (10810, 'sha384($pass.$salt)', 1, 0), + (10820, 'sha384($salt.$pass)', 1, 0), + (10830, 'sha384(utf16le($pass).$salt)', 1, 0), + (10840, 'sha384($salt.utf16le($pass))', 1, 0), + (10870, 'sha384(utf16le($pass))', 0, 0), + (10900, 'PBKDF2-HMAC-SHA256', 0, 1), + (10901, 'RedHat 389-DS LDAP (PBKDF2-HMAC-SHA256)', 0, 1), + (11000, 'PrestaShop', 1, 0), + (11100, 'PostgreSQL Challenge-Response Authentication (MD5)', 0, 0), + (11200, 'MySQL Challenge-Response Authentication (SHA1)', 0, 0), + (11300, 'Bitcoin/Litecoin wallet.dat', 0, 1), + (11400, 'SIP digest authentication (MD5)', 0, 0), + (11500, 'CRC32', 1, 0), + (11600, '7-Zip', 0, 0), + (11700, 'GOST R 34.11-2012 (Streebog) 256-bit', 0, 0), + (11750, 'HMAC-Streebog-256 (key = $pass), big-endian', 0, 0), + (11760, 'HMAC-Streebog-256 (key = $salt), big-endian', 0, 0), + (11800, 'GOST R 34.11-2012 (Streebog) 512-bit', 0, 0), + (11850, 'HMAC-Streebog-512 (key = $pass), big-endian', 0, 0), + (11860, 'HMAC-Streebog-512 (key = $salt), big-endian', 0, 0), + (11900, 'PBKDF2-HMAC-MD5', 0, 1), + (12000, 'PBKDF2-HMAC-SHA1', 0, 1), + (12001, 'Atlassian (PBKDF2-HMAC-SHA1)', 0, 1), + (12100, 'PBKDF2-HMAC-SHA512', 0, 1), + (12150, 'Apache Shiro 1 SHA-512', 0, 1), + (12200, 'eCryptfs', 0, 1), + (12300, 'Oracle T: Type (Oracle 12+)', 0, 1), + (12400, 'BSDiCrypt, Extended DES', 0, 0), + (12500, 'RAR3-hp', 0, 0), + (12600, 'ColdFusion 10+', 1, 0), + (12700, 'Blockchain, My Wallet', 0, 1), + (12800, 'MS-AzureSync PBKDF2-HMAC-SHA256', 0, 1), + (12900, 'Android FDE (Samsung DEK)', 0, 1), + (13000, 'RAR5', 0, 1), + (13100, 'Kerberos 5 TGS-REP etype 23', 0, 0), + (13200, 'AxCrypt', 0, 0), + (13300, 'AxCrypt in memory SHA1', 0, 0), + (13400, 'Keepass 1/2 AES/Twofish with/without keyfile', 0, 0), + (13500, 'PeopleSoft PS_TOKEN', 1, 0), + (13600, 'WinZip', 0, 1), + (13711, 'VeraCrypt PBKDF2-HMAC-RIPEMD160 + AES, Serpent, Twofish', 0, 1), + (13712, 'VeraCrypt PBKDF2-HMAC-RIPEMD160 + AES-Twofish, Serpent-AES, Twofish-Serpent', 0, 1), + (13713, 'VeraCrypt PBKDF2-HMAC-RIPEMD160 + Serpent-Twofish-AES', 0, 1), + (13721, 'VeraCrypt PBKDF2-HMAC-SHA512 + AES, Serpent, Twofish', 0, 1), + (13722, 'VeraCrypt PBKDF2-HMAC-SHA512 + AES-Twofish, Serpent-AES, Twofish-Serpent', 0, 1), + (13723, 'VeraCrypt PBKDF2-HMAC-SHA512 + Serpent-Twofish-AES', 0, 1), + (13731, 'VeraCrypt PBKDF2-HMAC-Whirlpool + AES, Serpent, Twofish', 0, 1), + (13732, 'VeraCrypt PBKDF2-HMAC-Whirlpool + AES-Twofish, Serpent-AES, Twofish-Serpent', 0, 1), + (13733, 'VeraCrypt PBKDF2-HMAC-Whirlpool + Serpent-Twofish-AES', 0, 1), + (13741, 'VeraCrypt PBKDF2-HMAC-RIPEMD160 + boot-mode + AES', 0, 1), + (13742, 'VeraCrypt PBKDF2-HMAC-RIPEMD160 + boot-mode + AES-Twofish', 0, 1), + (13743, 'VeraCrypt PBKDF2-HMAC-RIPEMD160 + boot-mode + AES-Twofish-Serpent', 0, 1), + (13751, 'VeraCrypt PBKDF2-HMAC-SHA256 + AES, Serpent, Twofish', 0, 1), + (13752, 'VeraCrypt PBKDF2-HMAC-SHA256 + AES-Twofish, Serpent-AES, Twofish-Serpent', 0, 1), + (13753, 'VeraCrypt PBKDF2-HMAC-SHA256 + Serpent-Twofish-AES', 0, 1), + (13761, 'VeraCrypt PBKDF2-HMAC-SHA256 + boot-mode (PIM + AES | Twofish)', 0, 1), + (13762, 'VeraCrypt PBKDF2-HMAC-SHA256 + boot-mode + Serpent-AES', 0, 1), + (13763, 'VeraCrypt PBKDF2-HMAC-SHA256 + boot-mode + Serpent-Twofish-AES', 0, 1), + (13771, 'VeraCrypt Streebog-512 + XTS 512 bit', 0, 1), + (13772, 'VeraCrypt Streebog-512 + XTS 1024 bit', 0, 1), + (13773, 'VeraCrypt Streebog-512 + XTS 1536 bit', 0, 1), + (13781, 'VeraCrypt Streebog-512 + XTS 512 bit + boot-mode (legacy)', 0, 1), + (13782, 'VeraCrypt Streebog-512 + XTS 1024 bit + boot-mode (legacy)', 0, 1), + (13783, 'VeraCrypt Streebog-512 + XTS 1536 bit + boot-mode (legacy)', 0, 1), + (13800, 'Windows 8+ phone PIN/Password', 1, 0), + (13900, 'OpenCart', 1, 0), + (14000, 'DES (PT = $salt, key = $pass)', 1, 0), + (14100, '3DES (PT = $salt, key = $pass)', 1, 0), + (14200, 'RACF KDFAES', 0, 1), + (14400, 'sha1(CX)', 1, 0), + (14500, 'Linux Kernel Crypto API (2.4)', 0, 0), + (14600, 'LUKS 10', 0, 1), + (14700, 'iTunes Backup < 10.0 11', 0, 1), + (14800, 'iTunes Backup >= 10.0 11', 0, 1), + (14900, 'Skip32 12', 1, 0), + (15000, 'FileZilla Server >= 0.9.55', 1, 0), + (15100, 'Juniper/NetBSD sha1crypt', 0, 1), + (15200, 'Blockchain, My Wallet, V2', 0, 0), + (15300, 'DPAPI masterkey file v1 and v2', 0, 1), + (15310, 'DPAPI masterkey file v1 (context 3)', 0, 1), + (15400, 'ChaCha20', 0, 0), + (15500, 'JKS Java Key Store Private Keys (SHA1)', 0, 0), + (15600, 'Ethereum Wallet, PBKDF2-HMAC-SHA256', 0, 1), + (15700, 'Ethereum Wallet, SCRYPT', 0, 0), + (15900, 'DPAPI master key file version 2 + Active Directory domain context', 0, 1), + (15910, 'DPAPI masterkey file v2 (context 3)', 0, 1), + (16000, 'Tripcode', 0, 0), + (16100, 'TACACS+', 0, 0), + (16200, 'Apple Secure Notes', 0, 1), + (16300, 'Ethereum Pre-Sale Wallet, PBKDF2-HMAC-SHA256', 0, 1), + (16400, 'CRAM-MD5 Dovecot', 0, 0), + (16500, 'JWT (JSON Web Token)', 0, 0), + (16501, 'Perl Mojolicious session cookie (HMAC-SHA256, >= v9.19)', 0, 0), + (16600, 'Electrum Wallet (Salt-Type 1-3)', 0, 0), + (16700, 'FileVault 2', 0, 1), + (16800, 'WPA-PMKID-PBKDF2', 0, 1), + (16801, 'WPA-PMKID-PMK', 0, 1), + (16900, 'Ansible Vault', 0, 1), + (17010, 'GPG (AES-128/AES-256 (SHA-1($pass)))', 0, 1), + (17020, 'GPG (AES-128/AES-256 (SHA-512($pass)))', 0, 1), + (17030, 'GPG (AES-128/AES-256 (SHA-256($pass)))', 0, 1), + (17040, 'GPG (CAST5 (SHA-1($pass)))', 0, 1), + (17200, 'PKZIP (Compressed)', 0, 0), + (17210, 'PKZIP (Uncompressed)', 0, 0), + (17220, 'PKZIP (Compressed Multi-File)', 0, 0), + (17225, 'PKZIP (Mixed Multi-File)', 0, 0), + (17230, 'PKZIP (Compressed Multi-File Checksum-Only)', 0, 0), + (17300, 'SHA3-224', 0, 0), + (17400, 'SHA3-256', 0, 0), + (17500, 'SHA3-384', 0, 0), + (17600, 'SHA3-512', 0, 0), + (17700, 'Keccak-224', 0, 0), + (17800, 'Keccak-256', 0, 0), + (17900, 'Keccak-384', 0, 0), + (18000, 'Keccak-512', 0, 0), + (18100, 'TOTP (HMAC-SHA1)', 1, 0), + (18200, 'Kerberos 5 AS-REP etype 23', 0, 1), + (18300, 'Apple File System (APFS)', 0, 1), + (18400, 'Open Document Format (ODF) 1.2 (SHA-256, AES)', 0, 1), + (18500, 'sha1(md5(md5($pass)))', 0, 0), + (18600, 'Open Document Format (ODF) 1.1 (SHA-1, Blowfish)', 0, 1), + (18700, 'Java Object hashCode()', 0, 1), + (18800, 'Blockchain, My Wallet, Second Password (SHA256)', 0, 1), + (18900, 'Android Backup', 0, 1), + (19000, 'QNX /etc/shadow (MD5)', 0, 1), + (19100, 'QNX /etc/shadow (SHA256)', 0, 1), + (19200, 'QNX /etc/shadow (SHA512)', 0, 1), + (19210, 'QNX 7 /etc/shadow (SHA512)', 0, 1), + (19300, 'sha1($salt1.$pass.$salt2)', 0, 0), + (19500, 'Ruby on Rails Restful-Authentication', 0, 0), + (19600, 'Kerberos 5 TGS-REP etype 17 (AES128-CTS-HMAC-SHA1-96)', 0, 1), + (19700, 'Kerberos 5 TGS-REP etype 18 (AES256-CTS-HMAC-SHA1-96)', 0, 1), + (19800, 'Kerberos 5, etype 17, Pre-Auth', 0, 1), + (19900, 'Kerberos 5, etype 18, Pre-Auth', 0, 1), + (20011, 'DiskCryptor SHA512 + XTS 512 bit (AES) / DiskCryptor SHA512 + XTS 512 bit (Twofish) / DiskCryptor SHA512 + XTS 512 bit (Serpent)', 0, 1), + (20012, 'DiskCryptor SHA512 + XTS 1024 bit (AES-Twofish) / DiskCryptor SHA512 + XTS 1024 bit (Twofish-Serpent) / DiskCryptor SHA512 + XTS 1024 bit (Serpent-AES)', 0, 1), + (20013, 'DiskCryptor SHA512 + XTS 1536 bit (AES-Twofish-Serpent)', 0, 1), + (20200, 'Python passlib pbkdf2-sha512', 0, 1), + (20300, 'Python passlib pbkdf2-sha256', 0, 1), + (20400, 'Python passlib pbkdf2-sha1', 0, 0), + (20500, 'PKZIP Master Key', 0, 0), + (20510, 'PKZIP Master Key (6 byte optimization)', 0, 0), + (20600, 'Oracle Transportation Management (SHA256)', 0, 0), + (20710, 'sha256(sha256($pass).$salt)', 1, 0), + (20711, 'AuthMe sha256', 0, 0), + (20712, 'RSA Security Analytics / NetWitness (sha256)', 1, 0), + (20720, 'sha256($salt.sha256($pass))', 1, 0), + (20730, 'sha256(sha256($pass.$salt))', 1, 0), + (20800, 'sha256(md5($pass))', 0, 0), + (20900, 'md5(sha1($pass).md5($pass).sha1($pass))', 0, 0), + (21000, 'BitShares v0.x - sha512(sha512_bin(pass))', 0, 0), + (21100, 'sha1(md5($pass.$salt))', 1, 0), + (21200, 'md5(sha1($salt).md5($pass))', 1, 0), + (21300, 'md5($salt.sha1($salt.$pass))', 1, 0), + (21310, 'md5($salt1.sha1($salt2.$pass))', 1, 0), + (21400, 'sha256(sha256_bin(pass))', 0, 0), + (21420, 'sha256($salt.sha256_bin($pass))', 1, 0), + (21500, 'SolarWinds Orion', 0, 0), + (21501, 'SolarWinds Orion v2', 0, 0), + (21600, 'Web2py pbkdf2-sha512', 0, 0), + (21700, 'Electrum Wallet (Salt-Type 4)', 0, 0), + (21800, 'Electrum Wallet (Salt-Type 5)', 0, 0), + (21900, 'md5(md5(md5($pass.$salt1)).$salt2)', 0, 0), + (22000, 'WPA-PBKDF2-PMKID+EAPOL', 0, 0), + (22001, 'WPA-PMK-PMKID+EAPOL', 0, 0), + (22100, 'BitLocker', 0, 0), + (22200, 'Citrix NetScaler (SHA512)', 0, 0), + (22300, 'sha256($salt.$pass.$salt)', 1, 0), + (22301, 'Telegram client app passcode (SHA256)', 0, 0), + (22400, 'AES Crypt (SHA256)', 0, 0), + (22500, 'MultiBit Classic .key (MD5)', 0, 0), + (22600, 'Telegram Desktop App Passcode (PBKDF2-HMAC-SHA1)', 0, 0), + (22700, 'MultiBit HD (scrypt)', 0, 1), + (22800, 'Simpla CMS - md5($salt.$pass.md5($pass))', 1, 0), + (22911, 'RSA/DSA/EC/OPENSSH Private Keys ($0$)', 0, 0), + (22921, 'RSA/DSA/EC/OPENSSH Private Keys ($6$)', 0, 0), + (22931, 'RSA/DSA/EC/OPENSSH Private Keys ($1, $3$)', 0, 0), + (22941, 'RSA/DSA/EC/OPENSSH Private Keys ($4$)', 0, 0), + (22951, 'RSA/DSA/EC/OPENSSH Private Keys ($5$)', 0, 0), + (23001, 'SecureZIP AES-128', 0, 0), + (23002, 'SecureZIP AES-192', 0, 0), + (23003, 'SecureZIP AES-256', 0, 0), + (23100, 'Apple Keychain', 0, 1), + (23200, 'XMPP SCRAM PBKDF2-SHA1', 0, 0), + (23300, 'Apple iWork', 0, 0), + (23400, 'Bitwarden', 0, 0), + (23500, 'AxCrypt 2 AES-128', 0, 0), + (23600, 'AxCrypt 2 AES-256', 0, 0), + (23700, 'RAR3-p (Uncompressed)', 0, 0), + (23800, 'RAR3-p (Compressed)', 0, 0), + (23900, 'BestCrypt v3 Volume Encryption', 0, 0), + (24000, 'BestCrypt v4 Volume Encryption', 0, 1), + (24100, 'MongoDB ServerKey SCRAM-SHA-1', 0, 0), + (24200, 'MongoDB ServerKey SCRAM-SHA-256', 0, 0), + (24300, 'sha1($salt.sha1($pass.$salt))', 1, 0), + (24410, 'PKCS#8 Private Keys (PBKDF2-HMAC-SHA1 + 3DES/AES)', 0, 0), + (24420, 'PKCS#8 Private Keys (PBKDF2-HMAC-SHA256 + 3DES/AES)', 0, 0), + (24500, 'Telegram Desktop >= v2.1.14 (PBKDF2-HMAC-SHA512)', 0, 0), + (24600, 'SQLCipher', 0, 0), + (24700, 'Stuffit5', 0, 0), + (24800, 'Umbraco HMAC-SHA1', 0, 0), + (24900, 'Dahua Authentication MD5', 0, 0), + (25000, 'SNMPv3 HMAC-MD5-96/HMAC-SHA1-96', 0, 1), + (25100, 'SNMPv3 HMAC-MD5-96', 0, 1), + (25200, 'SNMPv3 HMAC-SHA1-96', 0, 1), + (25300, 'MS Office 2016 - SheetProtection', 0, 0), + (25400, 'PDF 1.4 - 1.6 (Acrobat 5 - 8) - edit password', 0, 0), + (25500, 'Stargazer Stellar Wallet XLM', 0, 0), + (25600, 'bcrypt(md5($pass)) / bcryptmd5', 0, 1), + (25700, 'MurmurHash', 1, 0), + (25800, 'bcrypt(sha1($pass)) / bcryptsha1', 0, 1), + (25900, 'KNX IP Secure - Device Authentication Code', 0, 0), + (26000, 'Mozilla key3.db', 0, 0), + (26100, 'Mozilla key4.db', 0, 0), + (26200, 'OpenEdge Progress Encode', 0, 0), + (26300, 'FortiGate256 (FortiOS256)', 0, 0), + (26401, 'AES-128-ECB NOKDF (PT = $salt, key = $pass)', 0, 0), + (26402, 'AES-192-ECB NOKDF (PT = $salt, key = $pass)', 0, 0), + (26403, 'AES-256-ECB NOKDF (PT = $salt, key = $pass)', 0, 0), + (26500, 'iPhone passcode (UID key + System Keybag)', 0, 0), + (26600, 'MetaMask Wallet', 0, 1), + (26610, 'MetaMask Wallet (short hash, plaintext check)', 0, 1), + (26700, 'SNMPv3 HMAC-SHA224-128', 0, 0), + (26800, 'SNMPv3 HMAC-SHA256-192', 0, 0), + (26900, 'SNMPv3 HMAC-SHA384-256', 0, 0), + (27000, 'NetNTLMv1 / NetNTLMv1+ESS (NT)', 0, 0), + (27100, 'NetNTLMv2 (NT)', 0, 0), + (27200, 'Ruby on Rails Restful Auth (one round, no sitekey)', 1, 0), + (27300, 'SNMPv3 HMAC-SHA512-384', 0, 0), + (27400, 'VMware VMX (PBKDF2-HMAC-SHA1 + AES-256-CBC)', 0, 0), + (27500, 'VirtualBox (PBKDF2-HMAC-SHA256 & AES-128-XTS)', 0, 1), + (27600, 'VirtualBox (PBKDF2-HMAC-SHA256 & AES-256-XTS)', 0, 1), + (27700, 'MultiBit Classic .wallet (scrypt)', 0, 0), + (27800, 'MurmurHash3', 1, 0), + (27900, 'CRC32C', 1, 0), + (28000, 'CRC64Jones', 1, 0), + (28100, 'Windows Hello PIN/Password', 0, 1), + (28200, 'Exodus Desktop Wallet (scrypt)', 0, 0), + (28300, 'Teamspeak 3 (channel hash)', 0, 0), + (28400, 'bcrypt(sha512($pass)) / bcryptsha512', 0, 0), + (28501, 'Bitcoin WIF private key (P2PKH), compressed', 0, 0), + (28502, 'Bitcoin WIF private key (P2PKH), uncompressed', 0, 0), + (28503, 'Bitcoin WIF private key (P2WPKH, Bech32), compressed', 0, 0), + (28504, 'Bitcoin WIF private key (P2WPKH, Bech32), uncompressed', 0, 0), + (28505, 'Bitcoin WIF private key (P2SH(P2WPKH)), compressed', 0, 0), + (28506, 'Bitcoin WIF private key (P2SH(P2WPKH)), uncompressed', 0, 0), + (28600, 'PostgreSQL SCRAM-SHA-256', 0, 1), + (28700, 'Amazon AWS4-HMAC-SHA256', 0, 0), + (28800, 'Kerberos 5, etype 17, DB', 0, 1), + (28900, 'Kerberos 5, etype 18, DB', 0, 1), + (29000, 'sha1($salt.sha1(utf16le($username).'':''.utf16le($pass)))', 0, 0), + (29100, 'Flask Session Cookie ($salt.$salt.$pass)', 0, 0), + (29200, 'Radmin3', 0, 0), + (29311, 'TrueCrypt RIPEMD160 + XTS 512 bit', 0, 0), + (29312, 'TrueCrypt RIPEMD160 + XTS 1024 bit', 0, 0), + (29313, 'TrueCrypt RIPEMD160 + XTS 1536 bit', 0, 0), + (29321, 'TrueCrypt SHA512 + XTS 512 bit', 0, 0), + (29322, 'TrueCrypt SHA512 + XTS 1024 bit', 0, 0), + (29323, 'TrueCrypt SHA512 + XTS 1536 bit', 0, 0), + (29331, 'TrueCrypt Whirlpool + XTS 512 bit', 0, 0), + (29332, 'TrueCrypt Whirlpool + XTS 1024 bit', 0, 0), + (29333, 'TrueCrypt Whirlpool + XTS 1536 bit', 0, 0), + (29341, 'TrueCrypt RIPEMD160 + XTS 512 bit + boot-mode', 0, 0), + (29342, 'TrueCrypt RIPEMD160 + XTS 1024 bit + boot-mode', 0, 0), + (29343, 'TrueCrypt RIPEMD160 + XTS 1536 bit + boot-mode', 0, 0), + (29411, 'VeraCrypt RIPEMD160 + XTS 512 bit', 0, 0), + (29412, 'VeraCrypt RIPEMD160 + XTS 1024 bit', 0, 0), + (29413, 'VeraCrypt RIPEMD160 + XTS 1536 bit', 0, 0), + (29421, 'VeraCrypt SHA512 + XTS 512 bit', 0, 0), + (29422, 'VeraCrypt SHA512 + XTS 1024 bit', 0, 0), + (29423, 'VeraCrypt SHA512 + XTS 1536 bit', 0, 0), + (29431, 'VeraCrypt Whirlpool + XTS 512 bit', 0, 0), + (29432, 'VeraCrypt Whirlpool + XTS 1024 bit', 0, 0), + (29433, 'VeraCrypt Whirlpool + XTS 1536 bit', 0, 0), + (29441, 'VeraCrypt RIPEMD160 + XTS 512 bit + boot-mode', 0, 0), + (29442, 'VeraCrypt RIPEMD160 + XTS 1024 bit + boot-mode', 0, 0), + (29443, 'VeraCrypt RIPEMD160 + XTS 1536 bit + boot-mode', 0, 0), + (29451, 'VeraCrypt SHA256 + XTS 512 bit', 0, 0), + (29452, 'VeraCrypt SHA256 + XTS 1024 bit', 0, 0), + (29453, 'VeraCrypt SHA256 + XTS 1536 bit', 0, 0), + (29461, 'VeraCrypt SHA256 + XTS 512 bit + boot-mode', 0, 0), + (29462, 'VeraCrypt SHA256 + XTS 1024 bit + boot-mode', 0, 0), + (29463, 'VeraCrypt SHA256 + XTS 1536 bit + boot-mode', 0, 0), + (29471, 'VeraCrypt Streebog-512 + XTS 512 bit', 0, 0), + (29472, 'VeraCrypt Streebog-512 + XTS 1024 bit', 0, 0), + (29473, 'VeraCrypt Streebog-512 + XTS 1536 bit', 0, 0), + (29481, 'VeraCrypt Streebog-512 + XTS 512 bit + boot-mode', 0, 0), + (29482, 'VeraCrypt Streebog-512 + XTS 1024 bit + boot-mode', 0, 0), + (29483, 'VeraCrypt Streebog-512 + XTS 1536 bit + boot-mode', 0, 0), + (29511, 'LUKS v1 SHA-1 + AES', 0, 1), + (29512, 'LUKS v1 SHA-1 + Serpent', 0, 1), + (29513, 'LUKS v1 SHA-1 + Twofish', 0, 1), + (29521, 'LUKS v1 SHA-256 + AES', 0, 1), + (29522, 'LUKS v1 SHA-256 + Serpent', 0, 1), + (29523, 'LUKS v1 SHA-256 + Twofish', 0, 1), + (29531, 'LUKS v1 SHA-512 + AES', 0, 1), + (29532, 'LUKS v1 SHA-512 + Serpent', 0, 1), + (29533, 'LUKS v1 SHA-512 + Twofish', 0, 1), + (29541, 'LUKS v1 RIPEMD-160 + AES', 0, 1), + (29542, 'LUKS v1 RIPEMD-160 + Serpent', 0, 1), + (29543, 'LUKS v1 RIPEMD-160 + Twofish', 0, 1), + (29600, 'Terra Station Wallet (AES256-CBC(PBKDF2($pass)))', 0, 1), + (29700, 'KeePass 1 (AES/Twofish) and KeePass 2 (AES) - keyfile only mode', 0, 1), + (29800, 'Bisq .wallet (scrypt)', 0, 1), + (29910, 'ENCsecurity Datavault (PBKDF2/no keychain)', 0, 1), + (29920, 'ENCsecurity Datavault (PBKDF2/keychain)', 0, 1), + (29930, 'ENCsecurity Datavault (MD5/no keychain)', 0, 1), + (29940, 'ENCsecurity Datavault (MD5/keychain)', 0, 1), + (30000, 'Python Werkzeug MD5 (HMAC-MD5 (key = $salt))', 0, 0), + (30120, 'Python Werkzeug SHA256 (HMAC-SHA256 (key = $salt))', 0, 0), + (30420, 'DANE RFC7929/RFC8162 SHA2-256', 0, 0), + (30500, 'md5(md5($salt).md5(md5($pass)))', 1, 0), + (30600, 'bcrypt(sha256($pass))', 0, 1), + (30601, 'bcrypt(HMAC-SHA256($pass))', 0, 1), + (30700, 'Anope IRC Services (enc_sha256)', 0, 0), + (30901, 'Bitcoin raw private key (P2PKH), compressed', 0, 0), + (30902, 'Bitcoin raw private key (P2PKH), uncompressed', 0, 0), + (30903, 'Bitcoin raw private key (P2WPKH, Bech32), compressed', 0, 0), + (30904, 'Bitcoin raw private key (P2WPKH, Bech32), uncompressed', 0, 0), + (30905, 'Bitcoin raw private key (P2SH(P2WPKH)), compressed', 0, 0), + (30906, 'Bitcoin raw private key (P2SH(P2WPKH)), uncompressed', 0, 0), + (31000, 'BLAKE2s-256', 0, 0), + (31100, 'ShangMi 3 (SM3)', 0, 0), + (31200, 'Veeam VBK', 0, 1), + (31300, 'MS SNTP', 0, 0), + (31400, 'SecureCRT MasterPassphrase v2', 0, 0), + (31500, 'Domain Cached Credentials (DCC), MS Cache (NT)', 1, 1), + (31600, 'Domain Cached Credentials 2 (DCC2), MS Cache 2, (NT)', 0, 1), + (31700, 'md5(md5(md5($pass).$salt1).$salt2)', 1, 0), + (31800, '1Password, mobilekeychain (1Password 8)', 0, 1), + (31900, 'MetaMask Mobile Wallet', 0, 1), + (32000, 'NetIQ SSPR (MD5)', 0, 1), + (32010, 'NetIQ SSPR (SHA1)', 0, 1), + (32020, 'NetIQ SSPR (SHA-1 with Salt)', 0, 1), + (32030, 'NetIQ SSPR (SHA-256 with Salt)', 0, 1), + (32031, 'Adobe AEM (SSPR, SHA-256 with Salt)', 0, 1), + (32040, 'NetIQ SSPR (SHA-512 with Salt)', 0, 1), + (32041, 'Adobe AEM (SSPR, SHA-512 with Salt)', 0, 1), + (32050, 'NetIQ SSPR (PBKDF2WithHmacSHA1)', 0, 1), + (32060, 'NetIQ SSPR (PBKDF2WithHmacSHA256)', 0, 1), + (32070, 'NetIQ SSPR (PBKDF2WithHmacSHA512)', 0, 1), + (32100, 'Kerberos 5, etype 17, AS-REP', 0, 1), + (32200, 'Kerberos 5, etype 18, AS-REP', 0, 1), + (32300, 'Empire CMS (Admin password)', 1, 0), + (32410, 'sha512(sha512($pass).$salt)', 1, 0), + (32420, 'sha512(sha512_bin($pass).$salt)', 1, 0), + (32500, 'Dogechain.info Wallet', 0, 1), + (32600, 'CubeCart (whirlpool($salt.$pass.$salt))', 1, 0), + (32700, 'Kremlin Encrypt 3.0 w/NewDES', 0, 1), + (32800, 'md5(sha1(md5($pass)))', 0, 0), + (32900, 'PBKDF1-SHA1', 1, 1), + (33000, 'md5($salt1.$pass.$salt2)', 1, 0), + (33100, 'md5($salt.md5($pass).$salt)', 1, 0), + (33300, 'HMAC-BLAKE2S (key = $pass)', 1, 0), + (33400, 'mega.nz password-protected link (PBKDF2-HMAC-SHA512)', 0, 1), + (33500, 'RC4 40-bit DropN', 0, 0), + (33501, 'RC4 72-bit DropN', 0, 0), + (33502, 'RC4 104-bit DropN', 0, 0), + (33600, 'RIPEMD-320', 0, 0), + (33650, 'HMAC-RIPEMD320 (key = $pass)', 1, 0), + (33660, 'HMAC-RIPEMD320 (key = $salt)', 1, 0), + (33700, 'Microsoft Online Account (PBKDF2-HMAC-SHA256 + AES256)', 0, 1), + (33800, 'WBB4 (Woltlab Burning Board) [bcrypt(bcrypt($pass))]', 0, 1), + (33900, 'Citrix NetScaler (PBKDF2-HMAC-SHA256)', 0, 1), + (34000, 'Argon2', 0, 1), + (34100, 'LUKS v2 argon2 + SHA-256 + AES', 0, 1), + (34200, 'MurmurHash64A', 1, 0), + (34201, 'MurmurHash64A (zero seed)', 0, 0), + (34211, 'MurmurHash64A truncated (zero seed)', 0, 0), + (34300, 'KeePass (KDBX v4)', 0, 1), + (34400, 'sha224(sha224($pass))', 0, 0), + (34500, 'sha224(sha1($pass))', 0, 0), + (34600, 'MD6 (256)', 0, 0), + (34700, 'Blockchain, My Wallet, Legacy Wallets', 0, 0), + (34800, 'BLAKE2b-256', 0, 0), + (34810, 'BLAKE2b-256($pass.$salt)', 1, 0), + (34820, 'BLAKE2b-256($salt.$pass)', 1, 0), + (35000, 'SAP CODVN H (PWDSALTEDHASH) isSHA512', 1, 1), + (35100, 'sm3crypt $sm3$, SM3 (Unix)', 1, 1), + (35200, 'AS/400 SSHA1', 1, 0), + (70000, 'Argon2id [Bridged: reference implementation + tunings]', 0, 1), + (70100, 'scrypt [Bridged: Scrypt-Jane SMix]', 0, 1), + (70200, 'scrypt [Bridged: Scrypt-Yescrypt]', 0, 1), + (72000, 'Generic Hash [Bridged: Python Interpreter free-threading]', 0, 1), + (73000, 'Generic Hash [Bridged: Python Interpreter with GIL]', 0, 1), + (99999, 'Plaintext', 0, 0); + +CREATE TABLE LogEntry ( + logEntryId SERIAL NOT NULL PRIMARY KEY, + issuer TEXT NOT NULL, + issuerId TEXT NOT NULL, + level TEXT NOT NULL, + message TEXT NOT NULL, + time BIGINT NOT NULL +); +CREATE TABLE NotificationSetting ( + notificationSettingId SERIAL NOT NULL PRIMARY KEY, + action TEXT NOT NULL, + objectId INT NULL, + notification TEXT NOT NULL, + userId INT NOT NULL, + receiver TEXT NOT NULL, + isActive INT NOT NULL +); +CREATE TABLE Pretask ( + pretaskId SERIAL NOT NULL PRIMARY KEY, + taskName TEXT NOT NULL, + attackCmd TEXT NOT NULL, + chunkTime INT NOT NULL, + statusTimer INT NOT NULL, + color TEXT NULL, + isSmall INT NOT NULL, + isCpuTask INT NOT NULL, + useNewBench INT NOT NULL, + priority INT NOT NULL, + maxAgents INT NOT NULL, + isMaskImport INT NOT NULL, + crackerBinaryTypeId INT NOT NULL +); +CREATE TABLE RegVoucher ( + regVoucherId SERIAL NOT NULL PRIMARY KEY, + voucher TEXT NOT NULL, + time BIGINT NOT NULL +); +CREATE TABLE RightGroup ( + rightGroupId SERIAL NOT NULL PRIMARY KEY, + groupName TEXT NOT NULL, + permissions TEXT NOT NULL +); +INSERT INTO RightGroup (rightGroupId, groupName, permissions) VALUES + (1, 'Administrator', 'ALL'); + +CREATE TABLE Session ( + sessionId SERIAL NOT NULL PRIMARY KEY, + userId INT NOT NULL, + sessionStartDate BIGINT NOT NULL, + lastActionDate BIGINT NOT NULL, + isOpen INT NOT NULL, + sessionLifetime INT NOT NULL, + sessionKey TEXT NOT NULL +); +CREATE TABLE Speed ( + speedId SERIAL NOT NULL PRIMARY KEY, + agentId INT NOT NULL, + taskId INT NOT NULL, + speed BIGINT NOT NULL, + time BIGINT NOT NULL +); +CREATE TABLE StoredValue ( + storedValueId TEXT NOT NULL PRIMARY KEY, + val TEXT NOT NULL +); +CREATE TABLE Supertask ( + supertaskId SERIAL NOT NULL PRIMARY KEY, + supertaskName TEXT NOT NULL +); +CREATE TABLE SupertaskPretask ( + supertaskPretaskId SERIAL NOT NULL PRIMARY KEY, + supertaskId INT NOT NULL, + pretaskId INT NOT NULL +); +CREATE TABLE Task ( + taskId SERIAL NOT NULL PRIMARY KEY, + taskName TEXT NOT NULL, + attackCmd TEXT NOT NULL, + chunkTime INT NOT NULL, + statusTimer INT NOT NULL, + keyspace BIGINT NOT NULL, + keyspaceProgress BIGINT NOT NULL, + priority INT NOT NULL, + maxAgents INT NOT NULL, + color TEXT NULL, + isSmall INT NOT NULL, + isCpuTask INT NOT NULL, + useNewBench INT NOT NULL, + skipKeyspace BIGINT NOT NULL, + crackerBinaryId INT DEFAULT NULL, + crackerBinaryTypeId INT NULL, + taskWrapperId INT NOT NULL, + isArchived INT NOT NULL, + notes TEXT NOT NULL, + staticChunks INT NOT NULL, + chunkSize BIGINT NOT NULL, + forcePipe INT NOT NULL, + usePreprocessor INT NOT NULL, + preprocessorCommand TEXT NOT NULL +); +CREATE TABLE TaskDebugOutput ( + taskDebugOutputId SERIAL NOT NULL PRIMARY KEY, + taskId INT NOT NULL, + output TEXT NOT NULL +); +CREATE TABLE TaskWrapper ( + taskWrapperId SERIAL NOT NULL PRIMARY KEY, + priority INT NOT NULL, + maxAgents INT NOT NULL, + taskType INT NOT NULL, + hashlistId INT NOT NULL, + accessGroupId INT DEFAULT NULL, + taskWrapperName TEXT NOT NULL, + isArchived INT NOT NULL, + cracked INT NOT NULL +); +CREATE TABLE htp_User ( + userId SERIAL NOT NULL PRIMARY KEY, + username TEXT NOT NULL, + email TEXT NOT NULL, + passwordHash TEXT NOT NULL, + passwordSalt TEXT NOT NULL, + isValid INT NOT NULL, + isComputedPassword INT NOT NULL, + lastLoginDate BIGINT NOT NULL, + registeredSince BIGINT NOT NULL, + sessionLifetime INT NOT NULL, + rightGroupId INT NOT NULL, + yubikey TEXT DEFAULT NULL, + otp1 TEXT DEFAULT NULL, + otp2 TEXT DEFAULT NULL, + otp3 TEXT DEFAULT NULL, + otp4 TEXT DEFAULT NULL +); +CREATE TABLE Zap ( + zapId SERIAL NOT NULL PRIMARY KEY, + hash TEXT NOT NULL, + solveTime BIGINT NOT NULL, + agentId INT NULL, + hashlistId INT NOT NULL +); +CREATE TABLE ApiKey ( + apiKeyId SERIAL NOT NULL PRIMARY KEY, + startValid BIGINT NOT NULL, + endValid BIGINT NOT NULL, + accessKey TEXT NOT NULL, + accessCount INT NOT NULL, + userId INT NOT NULL, + apiGroupId INT NOT NULL +); +CREATE TABLE ApiGroup ( + apiGroupId SERIAL NOT NULL PRIMARY KEY, + name TEXT NOT NULL, + permissions TEXT NOT NULL +); +CREATE TABLE FileDownload ( + fileDownloadId SERIAL NOT NULL PRIMARY KEY, + time BIGINT NOT NULL, + fileId INT NOT NULL, + status INT NOT NULL +); +INSERT INTO ApiGroup ( apiGroupId, name, permissions) VALUES + (1, 'Administrators', 'ALL'); + +CREATE TABLE HealthCheck ( + healthCheckId SERIAL NOT NULL PRIMARY KEY, + time BIGINT NOT NULL, + status INT NOT NULL, + checkType INT NOT NULL, + hashtypeId INT NOT NULL, + crackerBinaryId INT NOT NULL, + expectedCracks INT NOT NULL, + attackCmd TEXT NOT NULL +); +CREATE TABLE HealthCheckAgent ( + healthCheckAgentId SERIAL NOT NULL PRIMARY KEY, + healthCheckId INT NOT NULL, + agentId INT NOT NULL, + status INT NOT NULL, + cracked INT NOT NULL, + numGpus INT NOT NULL, + start BIGINT NOT NULL, + htp_end BIGINT NOT NULL, + errors TEXT NOT NULL +); +CREATE TABLE Preprocessor ( + preprocessorId SERIAL NOT NULL PRIMARY KEY, + name TEXT NOT NULL, + url TEXT NOT NULL, + binaryName TEXT NOT NULL, + keyspaceCommand TEXT NULL, + skipCommand TEXT NULL, + limitCommand TEXT NULL +); +INSERT INTO Preprocessor ( preprocessorId, name, url, binaryName, keyspaceCommand, skipCommand, limitCommand) VALUES + (1, 'Prince', 'https://github.com/hashcat/princeprocessor/releases/download/v0.22/princeprocessor-0.22.7z', 'pp', '--keyspace', '--skip', '--limit'); + +-- Add Indexes + +CREATE INDEX IF NOT EXISTS accessGroupId_idx ON AccessGroupAgent (accessGroupId); +CREATE INDEX IF NOT EXISTS agentId_idx ON AccessGroupAgent (agentId); + +CREATE INDEX IF NOT EXISTS accessGroupId_idx ON AccessGroupUser (accessGroupId); +CREATE INDEX IF NOT EXISTS userId_idx ON AccessGroupUser (userId); + +CREATE INDEX IF NOT EXISTS userId_idx ON Agent (userId); + +CREATE INDEX IF NOT EXISTS agentId_idx ON AgentError (agentId); +CREATE INDEX IF NOT EXISTS taskId_idx ON AgentError (taskId); + +CREATE INDEX IF NOT EXISTS agentId_idx ON AgentStat (agentId); + +CREATE INDEX IF NOT EXISTS agentId_idx ON AgentZap (agentId); +CREATE INDEX IF NOT EXISTS lastZapId_idx ON AgentZap (lastZapId); + +CREATE INDEX IF NOT EXISTS taskId_idx ON Assignment (taskId); +CREATE INDEX IF NOT EXISTS agentId_idx ON Assignment (agentId); + +CREATE INDEX IF NOT EXISTS taskId_idx ON Chunk (taskId); +CREATE INDEX IF NOT EXISTS progress_idx ON Chunk (progress); +CREATE INDEX IF NOT EXISTS agentId_idx ON Chunk (agentId); + +CREATE INDEX IF NOT EXISTS configSectionId_idx ON Config (configSectionId); + +CREATE INDEX IF NOT EXISTS crackerBinaryTypeId_idx ON CrackerBinary (crackerBinaryTypeId); + +CREATE INDEX IF NOT EXISTS fileId_idx ON FilePretask (fileId); +CREATE INDEX IF NOT EXISTS pretaskId_idx ON FilePretask (pretaskId); + +CREATE INDEX IF NOT EXISTS fileId_idx ON FileTask (fileId); +CREATE INDEX IF NOT EXISTS taskId_idx ON FileTask (taskId); + +CREATE INDEX IF NOT EXISTS hashlistId_idx ON Hash (hashlistId); +CREATE INDEX IF NOT EXISTS chunkId_idx ON Hash (chunkId); +CREATE INDEX IF NOT EXISTS isCracked_idx ON Hash (isCracked); +CREATE INDEX IF NOT EXISTS hash_idx ON Hash (hash); +CREATE INDEX IF NOT EXISTS timeCracked_idx ON Hash (timeCracked); + +CREATE INDEX IF NOT EXISTS hashlistId_idx ON HashBinary (hashlistId); +CREATE INDEX IF NOT EXISTS chunkId_idx ON HashBinary (chunkId); + +CREATE INDEX IF NOT EXISTS hashTypeId_idx ON Hashlist (hashTypeId); + +CREATE INDEX IF NOT EXISTS parentHashlistId_idx ON HashlistHashlist (parentHashlistId); +CREATE INDEX IF NOT EXISTS hashlistId_idx ON HashlistHashlist (hashlistId); + +CREATE INDEX IF NOT EXISTS userId_idx ON NotificationSetting (userId); + +CREATE INDEX IF NOT EXISTS userId_idx ON Session (userId); + +CREATE INDEX IF NOT EXISTS agentId_idx ON Speed (agentId); +CREATE INDEX IF NOT EXISTS taskId_idx ON Speed (taskId); + +CREATE INDEX IF NOT EXISTS supertaskId_idx ON SupertaskPretask (supertaskId); +CREATE INDEX IF NOT EXISTS pretaskId_idx ON SupertaskPretask (pretaskId); + +CREATE INDEX IF NOT EXISTS crackerBinaryId_idx ON Task (crackerBinaryId); + +CREATE INDEX IF NOT EXISTS hashlistId_idx ON TaskWrapper (hashlistId); +CREATE INDEX IF NOT EXISTS priority_idx ON TaskWrapper (priority); +CREATE INDEX IF NOT EXISTS isArchived_idx ON TaskWrapper (isArchived); +CREATE INDEX IF NOT EXISTS accessGroupId_idx ON TaskWrapper (accessGroupId); + +CREATE INDEX IF NOT EXISTS rightGroupId_idx ON htp_User (rightGroupId); + +CREATE INDEX IF NOT EXISTS agentId_idx ON Zap (agentId); +CREATE INDEX IF NOT EXISTS hashlistId_idx ON Zap (hashlistId); + +-- Add Constraints +ALTER TABLE AccessGroupAgent ADD CONSTRAINT AccessGroupAgent_ibfk_1 FOREIGN KEY (accessGroupId) REFERENCES AccessGroup (accessGroupId); +ALTER TABLE AccessGroupAgent ADD CONSTRAINT AccessGroupAgent_ibfk_2 FOREIGN KEY (agentId) REFERENCES Agent (agentId); + +ALTER TABLE AccessGroupUser ADD CONSTRAINT AccessGroupUser_ibfk_1 FOREIGN KEY (accessGroupId) REFERENCES AccessGroup (accessGroupId); +ALTER TABLE AccessGroupUser ADD CONSTRAINT AccessGroupUser_ibfk_2 FOREIGN KEY (userId) REFERENCES htp_User (userId); + +ALTER TABLE Agent ADD CONSTRAINT Agent_ibfk_1 FOREIGN KEY (userId) REFERENCES htp_User (userId); + +ALTER TABLE AgentError ADD CONSTRAINT AgentError_ibfk_1 FOREIGN KEY (agentId) REFERENCES Agent (agentId); +ALTER TABLE AgentError ADD CONSTRAINT AgentError_ibfk_2 FOREIGN KEY (taskId) REFERENCES Task (taskId); + +ALTER TABLE AgentStat ADD CONSTRAINT AgentStat_ibfk_1 FOREIGN KEY (agentId) REFERENCES Agent (agentId); + +ALTER TABLE AgentZap ADD CONSTRAINT AgentZap_ibfk_1 FOREIGN KEY (agentId) REFERENCES Agent (agentId); +ALTER TABLE AgentZap ADD CONSTRAINT AgentZap_ibfk_2 FOREIGN KEY (lastZapId) REFERENCES Zap (zapId); + +ALTER TABLE ApiKey ADD CONSTRAINT ApiKey_ibfk_1 FOREIGN KEY (userId) REFERENCES htp_User (userId); +ALTER TABLE ApiKey ADD CONSTRAINT ApiKey_ibfk_2 FOREIGN KEY (apiGroupId) REFERENCES ApiGroup (apiGroupId); + +ALTER TABLE Assignment ADD CONSTRAINT Assignment_ibfk_1 FOREIGN KEY (taskId) REFERENCES Task (taskId); +ALTER TABLE Assignment ADD CONSTRAINT Assignment_ibfk_2 FOREIGN KEY (agentId) REFERENCES Agent (agentId); + +ALTER TABLE Chunk ADD CONSTRAINT Chunk_ibfk_1 FOREIGN KEY (taskId) REFERENCES Task (taskId); +ALTER TABLE Chunk ADD CONSTRAINT Chunk_ibfk_2 FOREIGN KEY (agentId) REFERENCES Agent (agentId); + +ALTER TABLE Config ADD CONSTRAINT Config_ibfk_1 FOREIGN KEY (configSectionId) REFERENCES ConfigSection (configSectionId); + +ALTER TABLE CrackerBinary ADD CONSTRAINT CrackerBinary_ibfk_1 FOREIGN KEY (crackerBinaryTypeId) REFERENCES CrackerBinaryType (crackerBinaryTypeId); + +ALTER TABLE File ADD CONSTRAINT File_ibfk_1 FOREIGN KEY (accessGroupId) REFERENCES AccessGroup (accessGroupId); + +ALTER TABLE FilePretask ADD CONSTRAINT FilePretask_ibfk_1 FOREIGN KEY (fileId) REFERENCES File (fileId); +ALTER TABLE FilePretask ADD CONSTRAINT FilePretask_ibfk_2 FOREIGN KEY (pretaskId) REFERENCES Pretask (pretaskId); + +ALTER TABLE FileTask ADD CONSTRAINT FileTask_ibfk_1 FOREIGN KEY (fileId) REFERENCES File (fileId); +ALTER TABLE FileTask ADD CONSTRAINT FileTask_ibfk_2 FOREIGN KEY (taskId) REFERENCES Task (taskId); + +ALTER TABLE Hash ADD CONSTRAINT Hash_ibfk_1 FOREIGN KEY (hashlistId) REFERENCES Hashlist (hashlistId); +ALTER TABLE Hash ADD CONSTRAINT Hash_ibfk_2 FOREIGN KEY (chunkId) REFERENCES Chunk (chunkId); + +ALTER TABLE HashBinary ADD CONSTRAINT HashBinary_ibfk_1 FOREIGN KEY (hashlistId) REFERENCES Hashlist (hashlistId); +ALTER TABLE HashBinary ADD CONSTRAINT HashBinary_ibfk_2 FOREIGN KEY (chunkId) REFERENCES Chunk (chunkId); + +ALTER TABLE Hashlist ADD CONSTRAINT Hashlist_ibfk_1 FOREIGN KEY (hashTypeId) REFERENCES HashType (hashTypeId); +ALTER TABLE Hashlist ADD CONSTRAINT Hashlist_ibfk_2 FOREIGN KEY (accessGroupId) REFERENCES AccessGroup (accessGroupId); + +ALTER TABLE HashlistHashlist ADD CONSTRAINT HashlistHashlist_ibfk_1 FOREIGN KEY (parentHashlistId) REFERENCES Hashlist (hashlistId); +ALTER TABLE HashlistHashlist ADD CONSTRAINT HashlistHashlist_ibfk_2 FOREIGN KEY (hashlistId) REFERENCES Hashlist (hashlistId); + +ALTER TABLE HealthCheck ADD CONSTRAINT HealthCheck_ibfk_1 FOREIGN KEY (crackerBinaryId) REFERENCES CrackerBinary (crackerBinaryId); + +ALTER TABLE HealthCheckAgent ADD CONSTRAINT HealthCheckAgent_ibfk_1 FOREIGN KEY (agentId) REFERENCES Agent (agentId); +ALTER TABLE HealthCheckAgent ADD CONSTRAINT HealthCheckAgent_ibfk_2 FOREIGN KEY (healthCheckId) REFERENCES HealthCheck (healthCheckId); + +ALTER TABLE NotificationSetting ADD CONSTRAINT NotificationSetting_ibfk_1 FOREIGN KEY (userId) REFERENCES htp_User (userId); + +ALTER TABLE Pretask ADD CONSTRAINT Pretask_ibfk_1 FOREIGN KEY (crackerBinaryTypeId) REFERENCES CrackerBinaryType (crackerBinaryTypeId); + +ALTER TABLE Session ADD CONSTRAINT Session_ibfk_1 FOREIGN KEY (userId) REFERENCES htp_User (userId); + +ALTER TABLE Speed ADD CONSTRAINT Speed_ibfk_1 FOREIGN KEY (agentId) REFERENCES Agent (agentId); +ALTER TABLE Speed ADD CONSTRAINT Speed_ibfk_2 FOREIGN KEY (taskId) REFERENCES Task (taskId); + +ALTER TABLE SupertaskPretask ADD CONSTRAINT SupertaskPretask_ibfk_1 FOREIGN KEY (supertaskId) REFERENCES Supertask (supertaskId); +ALTER TABLE SupertaskPretask ADD CONSTRAINT SupertaskPretask_ibfk_2 FOREIGN KEY (pretaskId) REFERENCES Pretask (pretaskId); + +ALTER TABLE Task ADD CONSTRAINT Task_ibfk_1 FOREIGN KEY (crackerBinaryId) REFERENCES CrackerBinary (crackerBinaryId); +ALTER TABLE Task ADD CONSTRAINT Task_ibfk_2 FOREIGN KEY (crackerBinaryTypeId) REFERENCES CrackerBinaryType (crackerBinaryTypeId); +ALTER TABLE Task ADD CONSTRAINT Task_ibfk_3 FOREIGN KEY (taskWrapperId) REFERENCES TaskWrapper (taskWrapperId); + +ALTER TABLE TaskDebugOutput ADD CONSTRAINT TaskDebugOutput_ibfk_1 FOREIGN KEY (taskId) REFERENCES Task (taskId); + +ALTER TABLE TaskWrapper ADD CONSTRAINT TaskWrapper_ibfk_1 FOREIGN KEY (hashlistId) REFERENCES Hashlist (hashlistId); +ALTER TABLE TaskWrapper ADD CONSTRAINT TaskWrapper_ibfk_2 FOREIGN KEY (accessGroupId) REFERENCES AccessGroup (accessGroupId); + +ALTER TABLE htp_User ADD CONSTRAINT User_ibfk_1 FOREIGN KEY (rightGroupId) REFERENCES RightGroup (rightGroupId); + +ALTER TABLE Zap ADD CONSTRAINT Zap_ibfk_1 FOREIGN KEY (agentId) REFERENCES Agent (agentId); +ALTER TABLE Zap ADD CONSTRAINT Zap_ibfk_2 FOREIGN KEY (hashlistId) REFERENCES Hashlist (hashlistId); + From 53bc9b9b97d7a30da7bbfae293c606f68feb49b0 Mon Sep 17 00:00:00 2001 From: s3inlc Date: Fri, 28 Nov 2025 11:40:27 +0100 Subject: [PATCH 280/691] removed any intermediary transaction starts/commits during hashlist operations --- src/inc/utils/HashlistUtils.class.php | 14 +++----------- 1 file changed, 3 insertions(+), 11 deletions(-) diff --git a/src/inc/utils/HashlistUtils.class.php b/src/inc/utils/HashlistUtils.class.php index 0e79c6f32..5cca2cdc4 100644 --- a/src/inc/utils/HashlistUtils.class.php +++ b/src/inc/utils/HashlistUtils.class.php @@ -493,8 +493,6 @@ public static function processZap($hashlistId, $separator, $source, $post, $file $ll = Factory::getHashlistFactory()->get($l->getId()); Factory::getHashlistFactory()->inc($ll, Hashlist::CRACKED, $crackedIn[$ll->getId()]); } - Factory::getAgentFactory()->getDB()->commit(); - Factory::getAgentFactory()->getDB()->beginTransaction(); foreach ($hashlists as $l) { $crackedIn[$l->getId()] = 0; } @@ -607,15 +605,11 @@ public static function delete($hashlistId, $user) { while ($deleted > 0) { $result = Factory::getHashFactory()->massDeletion([Factory::FILTER => $qF, Factory::ORDER => $oF]); $deleted = $result->rowCount(); - Factory::getAgentFactory()->getDB()->commit(); - Factory::getAgentFactory()->getDB()->beginTransaction(); } } else { // in case there is only one hashlist to delete, truncate the Hash table. Factory::getAgentFactory()->getDB()->query("TRUNCATE TABLE Hash"); - // Make sure that a transaction is active, this is what the rest of the function expects. - Factory::getAgentFactory()->getDB()->beginTransaction(); } break; case 1: @@ -801,6 +795,7 @@ public static function createHashlist($name, $isSalted, $isSecret, $isHexSalted, } Factory::getAgentFactory()->getDB()->beginTransaction(); + $hashlist = new Hashlist(null, $name, $format, $hashtype, 0, $separator, 0, $secret, $hexsalted, $salted, $accessGroup->getId(), '', $brainId, $brainFeatures, 0); $hashlist = Factory::getHashlistFactory()->save($hashlist); @@ -835,9 +830,9 @@ public static function createHashlist($name, $isSalted, $isSecret, $isHexSalted, } $file = fopen($tmpfile, "rb"); if (!$file) { + Factory::getAgentFactory()->getDB()->rollback(); throw new HttpError("Failed to open file!"); } - Factory::getAgentFactory()->getDB()->commit(); $added = 0; $preFound = 0; @@ -855,7 +850,6 @@ public static function createHashlist($name, $isSalted, $isSecret, $isHexSalted, $saltSeparator = ""; } rewind($file); - Factory::getAgentFactory()->getDB()->beginTransaction(); $values = array(); $bufferCount = 0; while (!feof($file)) { @@ -900,8 +894,6 @@ public static function createHashlist($name, $isSalted, $isSecret, $isHexSalted, if ($bufferCount >= 10000) { $result = Factory::getHashFactory()->massSave($values); $added += $result->rowCount(); - Factory::getAgentFactory()->getDB()->commit(); - Factory::getAgentFactory()->getDB()->beginTransaction(); $values = array(); $bufferCount = 0; } @@ -913,7 +905,6 @@ public static function createHashlist($name, $isSalted, $isSecret, $isHexSalted, fclose($file); unlink($tmpfile); Factory::getHashlistFactory()->mset($hashlist, [Hashlist::HASH_COUNT => $added, Hashlist::CRACKED => $preFound]); - Factory::getAgentFactory()->getDB()->commit(); Util::createLogEntry("User", $user->getId(), DLogEntry::INFO, "New Hashlist created: " . $hashlist->getHashlistName()); NotificationHandler::checkNotifications(DNotificationType::NEW_HASHLIST, new DataSet(array(DPayloadKeys::HASHLIST => $hashlist))); @@ -1003,6 +994,7 @@ public static function createHashlist($name, $isSalted, $isSecret, $isHexSalted, NotificationHandler::checkNotifications(DNotificationType::NEW_HASHLIST, new DataSet(array(DPayloadKeys::HASHLIST => $hashlist))); break; } + Factory::getAgentFactory()->getDB()->commit(); return $hashlist; } From c6a889d4ad4d26478e1a178a477e54513b1d93ef Mon Sep 17 00:00:00 2001 From: s3inlc Date: Fri, 28 Nov 2025 11:50:02 +0100 Subject: [PATCH 281/691] simply do delete statement of hashlist hash entries and let the DB optimize if needed --- src/inc/utils/HashlistUtils.class.php | 15 ++------------- 1 file changed, 2 insertions(+), 13 deletions(-) diff --git a/src/inc/utils/HashlistUtils.class.php b/src/inc/utils/HashlistUtils.class.php index 5cca2cdc4..9074b3f39 100644 --- a/src/inc/utils/HashlistUtils.class.php +++ b/src/inc/utils/HashlistUtils.class.php @@ -598,19 +598,8 @@ public static function delete($hashlistId, $user) { switch ($hashlist->getFormat()) { case 0: $count = Factory::getHashlistFactory()->countFilter([]); - if ($count > 1) { - $deleted = 1; - $qF = new QueryFilter(Hash::HASHLIST_ID, $hashlist->getId(), "="); - $oF = new OrderFilter(Hash::HASH_ID, "ASC LIMIT 20000"); - while ($deleted > 0) { - $result = Factory::getHashFactory()->massDeletion([Factory::FILTER => $qF, Factory::ORDER => $oF]); - $deleted = $result->rowCount(); - } - } - else { - // in case there is only one hashlist to delete, truncate the Hash table. - Factory::getAgentFactory()->getDB()->query("TRUNCATE TABLE Hash"); - } + $qF = new QueryFilter(Hash::HASHLIST_ID, $hashlist->getId(), "="); + Factory::getHashFactory()->massDeletion([Factory::FILTER => $qF]); break; case 1: case 2: From d7fe7a2436fceaa3c6034f133a94fc08b328411a Mon Sep 17 00:00:00 2001 From: s3inlc Date: Fri, 28 Nov 2025 11:57:21 +0100 Subject: [PATCH 282/691] refactored all error handler includes into load.php --- src/inc/load.php | 1 + src/inc/utils/AccessControlUtils.class.php | 3 +-- src/inc/utils/AccessGroupUtils.class.php | 1 - src/inc/utils/AgentUtils.class.php | 1 - src/inc/utils/CrackerUtils.class.php | 3 +-- src/inc/utils/FileUtils.class.php | 3 +-- src/inc/utils/HashlistUtils.class.php | 1 - src/inc/utils/HashtypeUtils.class.php | 3 +-- src/inc/utils/HealthUtils.class.php | 3 +-- src/inc/utils/NotificationUtils.class.php | 3 +-- src/inc/utils/PreprocessorUtils.class.php | 3 +-- src/inc/utils/PretaskUtils.class.php | 1 - src/inc/utils/SupertaskUtils.class.php | 1 - src/inc/utils/TaskUtils.class.php | 1 - src/inc/utils/TaskwrapperUtils.class.php | 3 +-- src/inc/utils/UserUtils.class.php | 3 +-- 16 files changed, 10 insertions(+), 24 deletions(-) diff --git a/src/inc/load.php b/src/inc/load.php index b34c38803..8a6462596 100755 --- a/src/inc/load.php +++ b/src/inc/load.php @@ -33,6 +33,7 @@ require_once(dirname(__FILE__) . "/notifications/Notification.class.php"); require_once(dirname(__FILE__) . "/api/APIBasic.class.php"); require_once(dirname(__FILE__) . "/user-api/UserAPIBasic.class.php"); +require_once(dirname(__FILE__) . "/apiv2/common/ErrorHandler.class.php"); $directories = array('handlers', 'api', 'defines', 'utils', 'notifications', 'user-api'); foreach ($directories as $directory) { $dir = scandir(dirname(__FILE__) . "/$directory/"); diff --git a/src/inc/utils/AccessControlUtils.class.php b/src/inc/utils/AccessControlUtils.class.php index 996521dfd..253ccf8c0 100644 --- a/src/inc/utils/AccessControlUtils.class.php +++ b/src/inc/utils/AccessControlUtils.class.php @@ -5,7 +5,6 @@ use DBA\RightGroup; use DBA\Factory; -require_once __DIR__ . '/../apiv2/common/ErrorHandler.class.php'; class AccessControlUtils { /** * @param int $groupId @@ -130,4 +129,4 @@ public static function getGroup($groupId) { } return $group; } -} \ No newline at end of file +} diff --git a/src/inc/utils/AccessGroupUtils.class.php b/src/inc/utils/AccessGroupUtils.class.php index 47d434c79..72b502b23 100644 --- a/src/inc/utils/AccessGroupUtils.class.php +++ b/src/inc/utils/AccessGroupUtils.class.php @@ -12,7 +12,6 @@ use DBA\Factory; use DBA\File; -require_once __DIR__ . '/../apiv2/common/ErrorHandler.class.php'; class AccessGroupUtils { /** * @param int $groupId diff --git a/src/inc/utils/AgentUtils.class.php b/src/inc/utils/AgentUtils.class.php index 0c954706a..aca163fe8 100644 --- a/src/inc/utils/AgentUtils.class.php +++ b/src/inc/utils/AgentUtils.class.php @@ -19,7 +19,6 @@ use DBA\HealthCheckAgent; use DBA\Speed; -require_once __DIR__ . '/../apiv2/common/ErrorHandler.class.php'; class AgentUtils { /** * @param AgentStat $deviceUtil diff --git a/src/inc/utils/CrackerUtils.class.php b/src/inc/utils/CrackerUtils.class.php index 0215112c4..ff02c3e95 100644 --- a/src/inc/utils/CrackerUtils.class.php +++ b/src/inc/utils/CrackerUtils.class.php @@ -8,7 +8,6 @@ use DBA\Factory; use DBA\Pretask; -require_once __DIR__ . '/../apiv2/common/ErrorHandler.class.php'; class CrackerUtils { /** * @param CrackerBinaryType $cracker @@ -154,4 +153,4 @@ public static function getBinary($binaryId) { } return $binary; } -} \ No newline at end of file +} diff --git a/src/inc/utils/FileUtils.class.php b/src/inc/utils/FileUtils.class.php index 660e6915c..cada5fb65 100644 --- a/src/inc/utils/FileUtils.class.php +++ b/src/inc/utils/FileUtils.class.php @@ -12,7 +12,6 @@ use DBA\ContainFilter; use DBA\FileDelete; use DBA\Factory; -require_once __DIR__ . '/../apiv2/common/ErrorHandler.class.php'; class FileUtils { /** @@ -364,4 +363,4 @@ public static function fileCountLines($fileId) { Factory::getFileFactory()->set($file, File::LINE_COUNT, $count); } } -} \ No newline at end of file +} diff --git a/src/inc/utils/HashlistUtils.class.php b/src/inc/utils/HashlistUtils.class.php index 0e79c6f32..586a3bd1b 100644 --- a/src/inc/utils/HashlistUtils.class.php +++ b/src/inc/utils/HashlistUtils.class.php @@ -23,7 +23,6 @@ use DBA\AgentZap; use DBA\Factory; use DBA\Speed; -require_once __DIR__ . '/../apiv2/common/ErrorHandler.class.php'; class HashlistUtils { /** diff --git a/src/inc/utils/HashtypeUtils.class.php b/src/inc/utils/HashtypeUtils.class.php index b2cb9856d..668d2d0e1 100644 --- a/src/inc/utils/HashtypeUtils.class.php +++ b/src/inc/utils/HashtypeUtils.class.php @@ -6,7 +6,6 @@ use DBA\QueryFilter; use DBA\Factory; -require_once __DIR__ . '/../apiv2/common/ErrorHandler.class.php'; class HashtypeUtils { /** * @param int $hashtypeId @@ -63,4 +62,4 @@ public static function addHashtype(int $hashtypeId, string $description, int $is Util::createLogEntry("User", $user->getId(), DLogEntry::INFO, "New Hashtype added: " . $hashtype->getDescription()); return $hashtype; } -} \ No newline at end of file +} diff --git a/src/inc/utils/HealthUtils.class.php b/src/inc/utils/HealthUtils.class.php index 4e113ae58..6e0ca2f38 100644 --- a/src/inc/utils/HealthUtils.class.php +++ b/src/inc/utils/HealthUtils.class.php @@ -6,7 +6,6 @@ use DBA\Factory; use DBA\HealthCheck; -require_once __DIR__ . '/../apiv2/common/ErrorHandler.class.php'; class HealthUtils { /** * @param int $checkAgentId @@ -224,4 +223,4 @@ public static function deleteHealthCheck($healthCheckId) { Factory::getHealthCheckAgentFactory()->massDeletion([Factory::FILTER => $qF]); Factory::getHealthCheckFactory()->delete($healthCheck); } -} \ No newline at end of file +} diff --git a/src/inc/utils/NotificationUtils.class.php b/src/inc/utils/NotificationUtils.class.php index 385d2418f..6697c3ad4 100644 --- a/src/inc/utils/NotificationUtils.class.php +++ b/src/inc/utils/NotificationUtils.class.php @@ -4,7 +4,6 @@ use DBA\User; use DBA\Factory; -require_once __DIR__ . '/../apiv2/common/ErrorHandler.class.php'; class NotificationUtils { /** * @param string $actionType @@ -125,4 +124,4 @@ public static function getNotification($notification) { } return $notification; } -} \ No newline at end of file +} diff --git a/src/inc/utils/PreprocessorUtils.class.php b/src/inc/utils/PreprocessorUtils.class.php index 97a942078..6afceafb4 100644 --- a/src/inc/utils/PreprocessorUtils.class.php +++ b/src/inc/utils/PreprocessorUtils.class.php @@ -4,7 +4,6 @@ use DBA\Preprocessor; use DBA\QueryFilter; use DBA\Task; -require_once __DIR__ . '/../apiv2/common/ErrorHandler.class.php'; class PreprocessorUtils { @@ -235,4 +234,4 @@ public static function editPreprocessor($preprocessorId, $name, $binaryName, $ur ] ); } -} \ No newline at end of file +} diff --git a/src/inc/utils/PretaskUtils.class.php b/src/inc/utils/PretaskUtils.class.php index 4d28c2ca6..005f5964b 100644 --- a/src/inc/utils/PretaskUtils.class.php +++ b/src/inc/utils/PretaskUtils.class.php @@ -9,7 +9,6 @@ use DBA\SupertaskPretask; use DBA\Factory; -require_once __DIR__ . '/../apiv2/common/ErrorHandler.class.php'; class PretaskUtils { /** * @param int $pretaskId diff --git a/src/inc/utils/SupertaskUtils.class.php b/src/inc/utils/SupertaskUtils.class.php index 3db20afcd..69219d898 100644 --- a/src/inc/utils/SupertaskUtils.class.php +++ b/src/inc/utils/SupertaskUtils.class.php @@ -13,7 +13,6 @@ use DBA\Factory; use DBA\File; use DBA\FilePretask; -require_once __DIR__ . '/../apiv2/common/ErrorHandler.class.php'; class SupertaskUtils { /** diff --git a/src/inc/utils/TaskUtils.class.php b/src/inc/utils/TaskUtils.class.php index c96881b3a..f2df2ad92 100644 --- a/src/inc/utils/TaskUtils.class.php +++ b/src/inc/utils/TaskUtils.class.php @@ -27,7 +27,6 @@ use DBA\Factory; use DBA\Speed; use DBA\Aggregation; -require_once __DIR__ . '/../apiv2/common/ErrorHandler.class.php'; class TaskUtils { /** diff --git a/src/inc/utils/TaskwrapperUtils.class.php b/src/inc/utils/TaskwrapperUtils.class.php index 1909b6156..7ebe1548b 100644 --- a/src/inc/utils/TaskwrapperUtils.class.php +++ b/src/inc/utils/TaskwrapperUtils.class.php @@ -4,7 +4,6 @@ use DBA\Task; use DBA\QueryFilter; use DBA\JoinFilter; -require_once __DIR__ . '/../apiv2/common/ErrorHandler.class.php'; class TaskwrapperUtils { @@ -45,4 +44,4 @@ public static function updatePriority($taskWrapperId, $priority, $user) { assert(False, "Internal Error: taskType not recognized"); } } -} \ No newline at end of file +} diff --git a/src/inc/utils/UserUtils.class.php b/src/inc/utils/UserUtils.class.php index 31fd8fb1b..4051efbb8 100644 --- a/src/inc/utils/UserUtils.class.php +++ b/src/inc/utils/UserUtils.class.php @@ -8,7 +8,6 @@ use DBA\NotificationSetting; use DBA\Agent; use DBA\Factory; -require_once __DIR__ . '/../apiv2/common/ErrorHandler.class.php'; class UserUtils { /** @@ -238,4 +237,4 @@ public static function getUser($userId) { } return $user; } -} \ No newline at end of file +} From 1818850937e742ce7c10e3f28baf7ec33a3decf1 Mon Sep 17 00:00:00 2001 From: Eric Wasson <229096365+Eric-Wasson@users.noreply.github.com> Date: Fri, 28 Nov 2025 15:36:27 +0100 Subject: [PATCH 283/691] Fixed sparse fieldsets array handling and one small aggregate data error --- src/inc/apiv2/common/AbstractBaseAPI.class.php | 7 ++++++- src/inc/apiv2/model/tasks.routes.php | 4 +++- 2 files changed, 9 insertions(+), 2 deletions(-) diff --git a/src/inc/apiv2/common/AbstractBaseAPI.class.php b/src/inc/apiv2/common/AbstractBaseAPI.class.php index 839339932..dd427c90d 100644 --- a/src/inc/apiv2/common/AbstractBaseAPI.class.php +++ b/src/inc/apiv2/common/AbstractBaseAPI.class.php @@ -561,6 +561,11 @@ protected function obj2Resource(object $obj, array $expandResult = [], array $sp $attributes = []; $relationships = []; + + $sparseFieldsetsForObj = null; + if (is_array($sparseFieldsets) && array_key_exists($this->getObjectTypeName($obj), $sparseFieldsets)) { + $sparseFieldsetsForObj = explode(",", $sparseFieldsets[$this->getObjectTypeName($obj)]); + } /* Collect attributes */ foreach ($features as $name => $feature) { @@ -571,7 +576,7 @@ protected function obj2Resource(object $obj, array $expandResult = [], array $sp } // If sparse fieldsets (https://jsonapi.org/format/#fetching-sparse-fieldsets) is used, return only the requested data - if (is_array($sparseFieldsets) && array_key_exists($this->getObjectTypeName($obj), $sparseFieldsets) && !in_array($feature['alias'], $sparseFieldsets[$this->getObjectTypeName($obj)])) { + if (is_array($sparseFieldsetsForObj) && !in_array($feature['alias'], $sparseFieldsetsForObj)) { continue; } diff --git a/src/inc/apiv2/model/tasks.routes.php b/src/inc/apiv2/model/tasks.routes.php index 546f7de43..c845cde6e 100644 --- a/src/inc/apiv2/model/tasks.routes.php +++ b/src/inc/apiv2/model/tasks.routes.php @@ -166,6 +166,8 @@ static function aggregateData(object $object, array $aggregateFieldsets = null): $keyspaceProgress = $object->getKeyspaceProgress(); if(is_null($aggregateFieldsets) || (is_array($aggregateFieldsets) && array_key_exists('task', $aggregateFieldsets))) { + $aggregateFieldsets['task'] = explode(",", $aggregateFieldsets['task']); + if(is_null($aggregateFieldsets) || in_array("dispatched", $aggregateFieldsets['task'])) { $aggregatedData["dispatched"] = Util::showperc($keyspaceProgress, $keyspace); } @@ -174,11 +176,11 @@ static function aggregateData(object $object, array $aggregateFieldsets = null): $aggregatedData["searched"] = Util::showperc(TaskUtils::getTaskProgress($object), $keyspace); } + $activeAgents = []; if(is_null($aggregateFieldsets) || in_array("activeAgents", $aggregateFieldsets['task'])) { $qF = new QueryFilter(Chunk::TASK_ID, $object->getId(), "="); $chunks = Factory::getChunkFactory()->filter([Factory::FILTER => $qF]); - $activeAgents = []; foreach ($chunks as $chunk) { if (time() - max($chunk->getSolveTime(), $chunk->getDispatchTime()) < SConfig::getInstance()->getVal(DConfig::CHUNK_TIMEOUT) && $chunk->getProgress() < 10000) { $activeAgents[$chunk->getAgentId()] = true; From a98ef7dc3e177aa586860c62f371c322f04d208c Mon Sep 17 00:00:00 2001 From: s3inlc Date: Fri, 28 Nov 2025 15:40:16 +0100 Subject: [PATCH 284/691] added update for faking sqlx migration for existing mysql systems --- src/install/updates/update_v1.0.0-rainbow4_vx.x.x.php | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/src/install/updates/update_v1.0.0-rainbow4_vx.x.x.php b/src/install/updates/update_v1.0.0-rainbow4_vx.x.x.php index 7759616ee..5dcbf5782 100644 --- a/src/install/updates/update_v1.0.0-rainbow4_vx.x.x.php +++ b/src/install/updates/update_v1.0.0-rainbow4_vx.x.x.php @@ -21,3 +21,11 @@ $EXECUTED["v1.0.0-rainbow4_prefix_user_and_end"] = true; } +if (!isset($PRESENT["v1.0.0-rainbow4_migration_to_migrations"])) { + if (!Util::databaseTableExists("_sqlx_migrations")) { + // this creates the existing state for sqlx to continue with migrations for all further updates + Factory::getAgentFactory()->getDB()->query("CREATE TABLE `_sqlx_migrations` (`version` bigint NOT NULL, `description` text NOT NULL, `installed_on` timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP, `success` tinyint(1) NOT NULL, `checksum` blob NOT NULL, `execution_time` bigint NOT NULL, PRIMARY KEY (`version`) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_0900_ai_ci;"); + Factory::getAgentFactory()->getDB()->query("INSERT INTO `_sqlx_migrations` VALUES (20251127000000,'initial','2025-11-28 14:29:13',1,0x87B4F9CE14A0C5A131A84D96044E89BAD641D0043E19141341C2DE2D307A25B748EF4F356CF4E0ACE439F84EC6C8F77A," . time() . ");"); + } + $EXECUTED["v1.0.0-rainbow4_migration_to_migrations"] = true; +} From 2b0834782498e41958c16249d15c7897286f3888 Mon Sep 17 00:00:00 2001 From: s3inlc Date: Fri, 28 Nov 2025 15:57:55 +0100 Subject: [PATCH 285/691] set execution time of fake sqlx migration to 1 --- src/install/updates/update_v1.0.0-rainbow4_vx.x.x.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/install/updates/update_v1.0.0-rainbow4_vx.x.x.php b/src/install/updates/update_v1.0.0-rainbow4_vx.x.x.php index 5dcbf5782..88134032d 100644 --- a/src/install/updates/update_v1.0.0-rainbow4_vx.x.x.php +++ b/src/install/updates/update_v1.0.0-rainbow4_vx.x.x.php @@ -25,7 +25,7 @@ if (!Util::databaseTableExists("_sqlx_migrations")) { // this creates the existing state for sqlx to continue with migrations for all further updates Factory::getAgentFactory()->getDB()->query("CREATE TABLE `_sqlx_migrations` (`version` bigint NOT NULL, `description` text NOT NULL, `installed_on` timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP, `success` tinyint(1) NOT NULL, `checksum` blob NOT NULL, `execution_time` bigint NOT NULL, PRIMARY KEY (`version`) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_0900_ai_ci;"); - Factory::getAgentFactory()->getDB()->query("INSERT INTO `_sqlx_migrations` VALUES (20251127000000,'initial','2025-11-28 14:29:13',1,0x87B4F9CE14A0C5A131A84D96044E89BAD641D0043E19141341C2DE2D307A25B748EF4F356CF4E0ACE439F84EC6C8F77A," . time() . ");"); + Factory::getAgentFactory()->getDB()->query("INSERT INTO `_sqlx_migrations` VALUES (20251127000000,'initial','2025-11-28 14:29:13',1,0x87B4F9CE14A0C5A131A84D96044E89BAD641D0043E19141341C2DE2D307A25B748EF4F356CF4E0ACE439F84EC6C8F77A,1);"); } $EXECUTED["v1.0.0-rainbow4_migration_to_migrations"] = true; } From 7349062f2eeb196ad79b367d6f31ab8b94c49591 Mon Sep 17 00:00:00 2001 From: s3inlc Date: Fri, 28 Nov 2025 16:14:25 +0100 Subject: [PATCH 286/691] setting sequences for all tables to avoid collisions in serials --- .../postgres/20251127000000_initial.sql | 47 ++++++++++++++++++- 1 file changed, 46 insertions(+), 1 deletion(-) diff --git a/src/migrations/postgres/20251127000000_initial.sql b/src/migrations/postgres/20251127000000_initial.sql index 273e7694d..a296d65eb 100644 --- a/src/migrations/postgres/20251127000000_initial.sql +++ b/src/migrations/postgres/20251127000000_initial.sql @@ -1039,8 +1039,53 @@ CREATE TABLE Preprocessor ( INSERT INTO Preprocessor ( preprocessorId, name, url, binaryName, keyspaceCommand, skipCommand, limitCommand) VALUES (1, 'Prince', 'https://github.com/hashcat/princeprocessor/releases/download/v0.22/princeprocessor-0.22.7z', 'pp', '--keyspace', '--skip', '--limit'); --- Add Indexes +-- Set sequences for all tables with SERIAL +SELECT pg_catalog.setval(pg_get_serial_sequence('AccessGroup', 'accessgroupid'), MAX(accessGroupId)) from AccessGroup; +SELECT pg_catalog.setval(pg_get_serial_sequence('AccessGroupAgent', 'accessgroupagentid'), MAX(accessGroupAgentId)) from AccessGroupAgent; +SELECT pg_catalog.setval(pg_get_serial_sequence('AccessGroupUser', 'accessgroupuserid'), MAX(accessGroupUserId)) from AccessGroupUser; +SELECT pg_catalog.setval(pg_get_serial_sequence('Agent', 'agentid'), MAX(agentId)) from Agent; +SELECT pg_catalog.setval(pg_get_serial_sequence('AgentBinary', 'agentbinaryid'), MAX(agentBinaryId)) from AgentBinary; +SELECT pg_catalog.setval(pg_get_serial_sequence('AgentError', 'agenterrorid'), MAX(agentErrorId)) from AgentError; +SELECT pg_catalog.setval(pg_get_serial_sequence('AgentStat', 'agentstatid'), MAX(agentStatId)) from AgentStat; +SELECT pg_catalog.setval(pg_get_serial_sequence('AgentZap', 'agentzapid'), MAX(agentZapId)) from AgentZap; +SELECT pg_catalog.setval(pg_get_serial_sequence('Assignment', 'assignmentid'), MAX(assignmentId)) from Assignment; +SELECT pg_catalog.setval(pg_get_serial_sequence('Chunk', 'chunkid'), MAX(chunkId)) from Chunk; +SELECT pg_catalog.setval(pg_get_serial_sequence('Config', 'configid'), MAX(configId)) from Config; +SELECT pg_catalog.setval(pg_get_serial_sequence('ConfigSection', 'configsectionid'), MAX(configSectionId)) from ConfigSection; +SELECT pg_catalog.setval(pg_get_serial_sequence('CrackerBinary', 'crackerbinaryid'), MAX(crackerBinaryId)) from CrackerBinary; +SELECT pg_catalog.setval(pg_get_serial_sequence('CrackerBinaryType', 'crackerbinarytypeid'), MAX(crackerBinaryTypeId)) from CrackerBinaryType; +SELECT pg_catalog.setval(pg_get_serial_sequence('File', 'fileid'), MAX(fileId)) from File; +SELECT pg_catalog.setval(pg_get_serial_sequence('FilePretask', 'filepretaskid'), MAX(filePretaskId)) from FilePretask; +SELECT pg_catalog.setval(pg_get_serial_sequence('FileTask', 'filetaskid'), MAX(fileTaskId)) from FileTask; +SELECT pg_catalog.setval(pg_get_serial_sequence('FileDelete', 'filedeleteid'), MAX(fileDeleteId)) from FileDelete; +SELECT pg_catalog.setval(pg_get_serial_sequence('Hash', 'hashid'), MAX(hashId)) from Hash; +SELECT pg_catalog.setval(pg_get_serial_sequence('HashBinary', 'hashbinaryid'), MAX(hashBinaryId)) from HashBinary; +SELECT pg_catalog.setval(pg_get_serial_sequence('Hashlist', 'hashlistid'), MAX(hashlistId)) from Hashlist; +SELECT pg_catalog.setval(pg_get_serial_sequence('HashlistHashlist', 'hashlisthashlistid'), MAX(hashlistHashlistId)) from HashlistHashlist; +SELECT pg_catalog.setval(pg_get_serial_sequence('HashType', 'hashtypeid'), MAX(hashTypeId)) from HashType; +SELECT pg_catalog.setval(pg_get_serial_sequence('LogEntry', 'logentryid'), MAX(logEntryId)) from LogEntry; +SELECT pg_catalog.setval(pg_get_serial_sequence('NotificationSetting', 'notificationsettingid'), MAX(notificationSettingId)) from NotificationSetting; +SELECT pg_catalog.setval(pg_get_serial_sequence('Pretask', 'pretaskid'), MAX(pretaskId)) from Pretask; +SELECT pg_catalog.setval(pg_get_serial_sequence('RegVoucher', 'regvoucherid'), MAX(regVoucherId)) from RegVoucher; +SELECT pg_catalog.setval(pg_get_serial_sequence('RightGroup', 'rightgroupid'), MAX(rightGroupId)) from RightGroup; +SELECT pg_catalog.setval(pg_get_serial_sequence('Session', 'sessionid'), MAX(sessionId)) from Session; +SELECT pg_catalog.setval(pg_get_serial_sequence('Speed', 'speedid'), MAX(speedId)) from Speed; +SELECT pg_catalog.setval(pg_get_serial_sequence('Supertask', 'supertaskid'), MAX(supertaskId)) from Supertask; +SELECT pg_catalog.setval(pg_get_serial_sequence('SupertaskPretask', 'supertaskpretaskid'), MAX(supertaskPretaskId)) from SupertaskPretask; +SELECT pg_catalog.setval(pg_get_serial_sequence('Task', 'taskid'), MAX(taskId)) from Task; +SELECT pg_catalog.setval(pg_get_serial_sequence('TaskDebugOutput', 'taskdebugoutputid'), MAX(taskDebugOutputId)) from TaskDebugOutput; +SELECT pg_catalog.setval(pg_get_serial_sequence('TaskWrapper', 'taskwrapperid'), MAX(taskWrapperId)) from TaskWrapper; +SELECT pg_catalog.setval(pg_get_serial_sequence('htp_User', 'userid'), MAX(userId)) from htp_User; +SELECT pg_catalog.setval(pg_get_serial_sequence('Zap', 'zapid'), MAX(zapId)) from Zap; +SELECT pg_catalog.setval(pg_get_serial_sequence('ApiKey', 'apikeyid'), MAX(apiKeyId)) from ApiKey; +SELECT pg_catalog.setval(pg_get_serial_sequence('ApiGroup', 'apigroupid'), MAX(apiGroupId)) from ApiGroup; +SELECT pg_catalog.setval(pg_get_serial_sequence('FileDownload', 'filedownloadid'), MAX(fileDownloadId)) from FileDownload; +SELECT pg_catalog.setval(pg_get_serial_sequence('HealthCheck', 'healthcheckid'), MAX(healthCheckId)) from HealthCheck; +SELECT pg_catalog.setval(pg_get_serial_sequence('HealthCheckAgent', 'healthcheckagentid'), MAX(healthCheckAgentId)) from HealthCheckAgent; +SELECT pg_catalog.setval(pg_get_serial_sequence('Preprocessor', 'preprocessorid'), MAX(preprocessorId)) from Preprocessor; + +-- Add Indexes CREATE INDEX IF NOT EXISTS accessGroupId_idx ON AccessGroupAgent (accessGroupId); CREATE INDEX IF NOT EXISTS agentId_idx ON AccessGroupAgent (agentId); From e83e710edddee7cfe61fce7b737753d1be999dfd Mon Sep 17 00:00:00 2001 From: sein Date: Sat, 29 Nov 2025 11:13:32 +0100 Subject: [PATCH 287/691] fixed order of execution of update scripts so they are executed from old to new --- src/install/updates/update.php | 1 + 1 file changed, 1 insertion(+) diff --git a/src/install/updates/update.php b/src/install/updates/update.php index df99379b1..4131b5103 100644 --- a/src/install/updates/update.php +++ b/src/install/updates/update.php @@ -45,6 +45,7 @@ if ($upgradePossible) { // we can actually check if there are upgrades to be applied $allFiles = scandir(dirname(__FILE__)); usort($allFiles, array("Util", "updateVersionComparison")); + $allFiles = array_reverse($allFiles); foreach ($allFiles as $file) { if (Util::startsWith($file, "update_v")) { $startVersion = substr($file, 8, strpos($file, "_", 7) - 8); From 8ba28237883f79ebf20152eeca81cc52d435d152 Mon Sep 17 00:00:00 2001 From: Sein Coray Date: Sat, 29 Nov 2025 11:15:17 +0100 Subject: [PATCH 288/691] fixed sql query for migrations insert --- src/install/updates/update_v1.0.0-rainbow4_vx.x.x.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/install/updates/update_v1.0.0-rainbow4_vx.x.x.php b/src/install/updates/update_v1.0.0-rainbow4_vx.x.x.php index 88134032d..2680918eb 100644 --- a/src/install/updates/update_v1.0.0-rainbow4_vx.x.x.php +++ b/src/install/updates/update_v1.0.0-rainbow4_vx.x.x.php @@ -24,7 +24,7 @@ if (!isset($PRESENT["v1.0.0-rainbow4_migration_to_migrations"])) { if (!Util::databaseTableExists("_sqlx_migrations")) { // this creates the existing state for sqlx to continue with migrations for all further updates - Factory::getAgentFactory()->getDB()->query("CREATE TABLE `_sqlx_migrations` (`version` bigint NOT NULL, `description` text NOT NULL, `installed_on` timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP, `success` tinyint(1) NOT NULL, `checksum` blob NOT NULL, `execution_time` bigint NOT NULL, PRIMARY KEY (`version`) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_0900_ai_ci;"); + Factory::getAgentFactory()->getDB()->query("CREATE TABLE `_sqlx_migrations` (`version` bigint NOT NULL, `description` text NOT NULL, `installed_on` timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP, `success` tinyint(1) NOT NULL, `checksum` blob NOT NULL, `execution_time` bigint NOT NULL, PRIMARY KEY (`version`)) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_0900_ai_ci;"); Factory::getAgentFactory()->getDB()->query("INSERT INTO `_sqlx_migrations` VALUES (20251127000000,'initial','2025-11-28 14:29:13',1,0x87B4F9CE14A0C5A131A84D96044E89BAD641D0043E19141341C2DE2D307A25B748EF4F356CF4E0ACE439F84EC6C8F77A,1);"); } $EXECUTED["v1.0.0-rainbow4_migration_to_migrations"] = true; From 14f68741e73f134be7ce74b9e8836d5fce2109a0 Mon Sep 17 00:00:00 2001 From: Sein Coray Date: Sat, 29 Nov 2025 11:17:32 +0100 Subject: [PATCH 289/691] removed selective update execution part and added one last force upgrade at the beginning --- src/inc/load.php | 24 ++++-------------------- 1 file changed, 4 insertions(+), 20 deletions(-) diff --git a/src/inc/load.php b/src/inc/load.php index 43cf555c7..4e1ac868b 100755 --- a/src/inc/load.php +++ b/src/inc/load.php @@ -77,6 +77,10 @@ $initialSetup = true; } +// this only needs to be present for the very first upgrade from non-migration to migrations to make sure the last updates are executed before migration +if (!$initialSetup && !Util::databaseTableExists("_sqlx_migrations")) { + include(dirname(__FILE__) . "/../install/updates/update.php"); +} $database_uri = DBA_TYPE . "://" . DBA_USER . ":" . DBA_PASS . "@" . DBA_SERVER . ":" . DBA_PORT . "/" . DBA_DB; exec('/usr/bin/sqlx migrate run --source ' . dirname(__FILE__) . '/../migrations/' . DBA_TYPE . '/ -D ' . $database_uri, $output, $retval); @@ -170,22 +174,6 @@ UI::add('toggledarkmode', 0); } -$updateExecuted = false; -// check if update is needed -// (note if the version was retrieved with git, but the git folder was removed, smaller updates are not recognized because the build value is missing) -$storedVersion = Factory::getStoredValueFactory()->get("version"); -if ($storedVersion == null || $storedVersion->getVal() != explode("+", $VERSION)[0] && file_exists(dirname(__FILE__) . "/../install/updates/update.php")) { - include(dirname(__FILE__) . "/../install/updates/update.php"); - $updateExecuted = $upgradePossible; -} -else { // in case it is not a version upgrade, but the person retrieved a new version via git or copying - $storedBuild = Factory::getStoredValueFactory()->get("build"); - if ($storedBuild == null || ($BUILD != 'repository' && $storedBuild->getVal() != $BUILD) || ($BUILD == 'repository' && strlen(Util::getGitCommit(true)) > 0 && $storedBuild->getVal() != Util::getGitCommit(true)) && file_exists(dirname(__FILE__) . "/../install/updates/update.php")) { - include(dirname(__FILE__) . "/../install/updates/update.php"); - $updateExecuted = $upgradePossible; - } -} - if (strlen(Util::getGitCommit()) == 0) { $storedBuild = Factory::getStoredValueFactory()->get("build"); if ($storedBuild != null) { @@ -196,10 +184,6 @@ UI::add('menu', Menu::get()); UI::add('messages', []); -if ($updateExecuted) { - UI::addMessage(UI::SUCCESS, "An automatic upgrade was executed! " . sizeof($EXECUTED) . " changes applied on DB!"); -} - UI::add('pageTitle', ""); UI::add('login', Login::getInstance()); if (Login::getInstance()->isLoggedin()) { From 68a918af868b15879be500de56a4bc48a161a25b Mon Sep 17 00:00:00 2001 From: Sein Coray Date: Sat, 29 Nov 2025 12:06:43 +0100 Subject: [PATCH 290/691] prevent access to migrations dir --- src/migrations/.htaccess | 2 ++ 1 file changed, 2 insertions(+) create mode 100644 src/migrations/.htaccess diff --git a/src/migrations/.htaccess b/src/migrations/.htaccess new file mode 100644 index 000000000..896fbc5a3 --- /dev/null +++ b/src/migrations/.htaccess @@ -0,0 +1,2 @@ +Order deny,allow +Deny from all \ No newline at end of file From cd9d006735b61fc29b9998ddeed3c325159eace7 Mon Sep 17 00:00:00 2001 From: Sein Coray Date: Sat, 29 Nov 2025 14:49:16 +0100 Subject: [PATCH 291/691] made style and order consistent in files --- .../mysql/20251127000000_initial.sql | 192 +++++++++--------- .../postgres/20251127000000_initial.sql | 111 ++++++---- 2 files changed, 171 insertions(+), 132 deletions(-) diff --git a/src/migrations/mysql/20251127000000_initial.sql b/src/migrations/mysql/20251127000000_initial.sql index 2dc14d914..c70d4ddb0 100644 --- a/src/migrations/mysql/20251127000000_initial.sql +++ b/src/migrations/mysql/20251127000000_initial.sql @@ -1,7 +1,6 @@ SET SQL_MODE = "NO_AUTO_VALUE_ON_ZERO"; SET time_zone = "+00:00"; - /*!40101 SET @OLD_CHARACTER_SET_CLIENT = @@CHARACTER_SET_CLIENT */; /*!40101 SET @OLD_CHARACTER_SET_RESULTS = @@CHARACTER_SET_RESULTS */; /*!40101 SET @OLD_COLLATION_CONNECTION = @@COLLATION_CONNECTION */; @@ -46,7 +45,7 @@ CREATE TABLE IF NOT EXISTS `Agent` ( CREATE TABLE IF NOT EXISTS `AgentBinary` ( `agentBinaryId` INT(11) NOT NULL, - `binaryType` VARCHAR(20) NOT NULL, + `binaryType` VARCHAR(20) NOT NULL, `version` VARCHAR(20) NOT NULL, `operatingSystems` VARCHAR(50) NOT NULL, `filename` VARCHAR(50) NOT NULL, @@ -67,10 +66,10 @@ CREATE TABLE IF NOT EXISTS `AgentError` ( ) ENGINE = InnoDB; CREATE TABLE IF NOT EXISTS `AgentStat` ( - `agentStatId` INT(11) NOT NULL, - `agentId` INT(11) NOT NULL, - `statType` INT(11) NOT NULL, - `time` BIGINT NOT NULL, + `agentStatId` INT(11) NOT NULL, + `agentId` INT(11) NOT NULL, + `statType` INT(11) NOT NULL, + `time` BIGINT NOT NULL, `value` VARCHAR(128) NOT NULL ) ENGINE = InnoDB; @@ -80,6 +79,25 @@ CREATE TABLE IF NOT EXISTS `AgentZap` ( `lastZapId` INT(11) NULL ) ENGINE = InnoDB; +CREATE TABLE IF NOT EXISTS `ApiKey` ( + `apiKeyId` INT(11) NOT NULL, + `startValid` BIGINT(20) NOT NULL, + `endValid` BIGINT(20) NOT NULL, + `accessKey` VARCHAR(256) NOT NULL, + `accessCount` INT(11) NOT NULL, + `userId` INT(11) NOT NULL, + `apiGroupId` INT(11) NOT NULL +) ENGINE=InnoDB; + +CREATE TABLE IF NOT EXISTS `ApiGroup` ( + `apiGroupId` INT(11) NOT NULL, + `name` VARCHAR(100) NOT NULL, + `permissions` TEXT NOT NULL +) ENGINE=InnoDB; + +INSERT INTO `ApiGroup` ( `apiGroupId`, `name`, `permissions`) VALUES + (1, 'Administrators', 'ALL'); + CREATE TABLE IF NOT EXISTS `Assignment` ( `assignmentId` INT(11) NOT NULL, `taskId` INT(11) NOT NULL, @@ -174,7 +192,6 @@ INSERT INTO `Config` (`configId`, `configSectionId`, `item`, `value`) VALUES (78, 3, 'defaultPageSize', '10000'), (79, 3, 'maxPageSize', '50000'); - CREATE TABLE IF NOT EXISTS `ConfigSection` ( `configSectionId` INT(11) NOT NULL, `sectionName` VARCHAR(100) NOT NULL @@ -219,6 +236,13 @@ CREATE TABLE IF NOT EXISTS `File` ( `lineCount` BIGINT(20) DEFAULT NULL ) ENGINE = InnoDB; +CREATE TABLE IF NOT EXISTS `FileDownload` ( + `fileDownloadId` INT(11) NOT NULL, + `time` BIGINT NOT NULL, + `fileId` INT(11) NOT NULL, + `status` INT(11) NOT NULL +) ENGINE=InnoDB; + CREATE TABLE IF NOT EXISTS `FilePretask` ( `filePretaskId` INT(11) NOT NULL, `fileId` INT(11) NOT NULL, @@ -253,7 +277,7 @@ CREATE TABLE IF NOT EXISTS `HashBinary` ( `hashBinaryId` INT(11) NOT NULL, `hashlistId` INT(11) NOT NULL, `essid` VARCHAR(100) NOT NULL, - `hash` LONGTEXT NOT NULL, + `hash` LONGTEXT NOT NULL, `plaintext` VARCHAR(1024) DEFAULT NULL, `timeCracked` BIGINT DEFAULT NULL, `chunkId` INT(11) DEFAULT NULL, @@ -874,6 +898,48 @@ INSERT INTO `HashType` (`hashTypeId`, `description`, `isSalted`, `isSlowHash`) V (73000, 'Generic Hash [Bridged: Python Interpreter with GIL]', 0, 1), (99999, 'Plaintext', 0, 0); +CREATE TABLE IF NOT EXISTS `HealthCheck` ( + `healthCheckId` INT(11) NOT NULL, + `time` BIGINT(20) NOT NULL, + `status` INT(11) NOT NULL, + `checkType` INT(11) NOT NULL, + `hashtypeId` INT(11) NOT NULL, + `crackerBinaryId` INT(11) NOT NULL, + `expectedCracks` INT(11) NOT NULL, + `attackCmd` TEXT NOT NULL +) ENGINE=InnoDB; + +CREATE TABLE IF NOT EXISTS `HealthCheckAgent` ( + `healthCheckAgentId` INT(11) NOT NULL, + `healthCheckId` INT(11) NOT NULL, + `agentId` INT(11) NOT NULL, + `status` INT(11) NOT NULL, + `cracked` INT(11) NOT NULL, + `numGpus` INT(11) NOT NULL, + `start` BIGINT(20) NOT NULL, + `htp_end` BIGINT(20) NOT NULL, + `errors` TEXT NOT NULL +) ENGINE=InnoDB; + +CREATE TABLE IF NOT EXISTS `htp_User` ( + `userId` INT(11) NOT NULL, + `username` VARCHAR(100) NOT NULL, + `email` VARCHAR(150) NOT NULL, + `passwordHash` VARCHAR(256) NOT NULL, + `passwordSalt` VARCHAR(256) NOT NULL, + `isValid` TINYINT(4) NOT NULL, + `isComputedPassword` TINYINT(4) NOT NULL, + `lastLoginDate` BIGINT NOT NULL, + `registeredSince` BIGINT NOT NULL, + `sessionLifetime` INT(11) NOT NULL, + `rightGroupId` INT(11) NOT NULL, + `yubikey` VARCHAR(256) DEFAULT NULL, + `otp1` VARCHAR(256) DEFAULT NULL, + `otp2` VARCHAR(256) DEFAULT NULL, + `otp3` VARCHAR(256) DEFAULT NULL, + `otp4` VARCHAR(256) DEFAULT NULL +) ENGINE = InnoDB; + CREATE TABLE IF NOT EXISTS `LogEntry` ( `logEntryId` INT(11) NOT NULL, `issuer` VARCHAR(50) NOT NULL, @@ -893,6 +959,16 @@ CREATE TABLE IF NOT EXISTS `NotificationSetting` ( `isActive` TINYINT(4) NOT NULL )ENGINE = InnoDB; +CREATE TABLE IF NOT EXISTS `Preprocessor` ( + `preprocessorId` INT(11) NOT NULL, + `name` VARCHAR(256) NOT NULL, + `url` VARCHAR(512) NOT NULL, + `binaryName` VARCHAR(256) NOT NULL, + `keyspaceCommand` VARCHAR(256) NULL, + `skipCommand` VARCHAR(256) NULL, + `limitCommand` VARCHAR(256) NULL +) ENGINE=InnoDB; + CREATE TABLE IF NOT EXISTS `Pretask` ( `pretaskId` INT(11) NOT NULL, `taskName` VARCHAR(100) NOT NULL, @@ -1003,25 +1079,6 @@ CREATE TABLE IF NOT EXISTS `TaskWrapper` ( `cracked` INT(11) NOT NULL )ENGINE = InnoDB; -CREATE TABLE IF NOT EXISTS `htp_User` ( - `userId` INT(11) NOT NULL, - `username` VARCHAR(100) NOT NULL, - `email` VARCHAR(150) NOT NULL, - `passwordHash` VARCHAR(256) NOT NULL, - `passwordSalt` VARCHAR(256) NOT NULL, - `isValid` TINYINT(4) NOT NULL, - `isComputedPassword` TINYINT(4) NOT NULL, - `lastLoginDate` BIGINT NOT NULL, - `registeredSince` BIGINT NOT NULL, - `sessionLifetime` INT(11) NOT NULL, - `rightGroupId` INT(11) NOT NULL, - `yubikey` VARCHAR(256) DEFAULT NULL, - `otp1` VARCHAR(256) DEFAULT NULL, - `otp2` VARCHAR(256) DEFAULT NULL, - `otp3` VARCHAR(256) DEFAULT NULL, - `otp4` VARCHAR(256) DEFAULT NULL -) ENGINE = InnoDB; - CREATE TABLE IF NOT EXISTS `Zap` ( `zapId` INT(11) NOT NULL, `hash` MEDIUMTEXT NOT NULL, @@ -1030,65 +1087,6 @@ CREATE TABLE IF NOT EXISTS `Zap` ( `hashlistId` INT(11) NOT NULL ) ENGINE = InnoDB; -CREATE TABLE IF NOT EXISTS `ApiKey` ( - `apiKeyId` INT(11) NOT NULL, - `startValid` BIGINT(20) NOT NULL, - `endValid` BIGINT(20) NOT NULL, - `accessKey` VARCHAR(256) NOT NULL, - `accessCount` INT(11) NOT NULL, - `userId` INT(11) NOT NULL, - `apiGroupId` INT(11) NOT NULL -) ENGINE=InnoDB; - -CREATE TABLE IF NOT EXISTS `ApiGroup` ( - `apiGroupId` INT(11) NOT NULL, - `name` VARCHAR(100) NOT NULL, - `permissions` TEXT NOT NULL -) ENGINE=InnoDB; - -CREATE TABLE IF NOT EXISTS `FileDownload` ( - `fileDownloadId` INT(11) NOT NULL, - `time` BIGINT NOT NULL, - `fileId` INT(11) NOT NULL, - `status` INT(11) NOT NULL -) ENGINE=InnoDB; - -INSERT INTO `ApiGroup` ( `apiGroupId`, `name`, `permissions`) VALUES - (1, 'Administrators', 'ALL'); - -CREATE TABLE IF NOT EXISTS `HealthCheck` ( - `healthCheckId` INT(11) NOT NULL, - `time` BIGINT(20) NOT NULL, - `status` INT(11) NOT NULL, - `checkType` INT(11) NOT NULL, - `hashtypeId` INT(11) NOT NULL, - `crackerBinaryId` INT(11) NOT NULL, - `expectedCracks` INT(11) NOT NULL, - `attackCmd` TEXT NOT NULL -) ENGINE=InnoDB; - -CREATE TABLE IF NOT EXISTS `HealthCheckAgent` ( - `healthCheckAgentId` INT(11) NOT NULL, - `healthCheckId` INT(11) NOT NULL, - `agentId` INT(11) NOT NULL, - `status` INT(11) NOT NULL, - `cracked` INT(11) NOT NULL, - `numGpus` INT(11) NOT NULL, - `start` BIGINT(20) NOT NULL, - `htp_end` BIGINT(20) NOT NULL, - `errors` TEXT NOT NULL -) ENGINE=InnoDB; - -CREATE TABLE IF NOT EXISTS `Preprocessor` ( - `preprocessorId` INT(11) NOT NULL, - `name` VARCHAR(256) NOT NULL, - `url` VARCHAR(512) NOT NULL, - `binaryName` VARCHAR(256) NOT NULL, - `keyspaceCommand` VARCHAR(256) NULL, - `skipCommand` VARCHAR(256) NULL, - `limitCommand` VARCHAR(256) NULL -) ENGINE=InnoDB; - INSERT INTO `Preprocessor` ( `preprocessorId`, `name`, `url`, `binaryName`, `keyspaceCommand`, `skipCommand`, `limitCommand`) VALUES (1, 'Prince', 'https://github.com/hashcat/princeprocessor/releases/download/v0.22/princeprocessor-0.22.7z', 'pp', '--keyspace', '--skip', '--limit'); @@ -1209,6 +1207,11 @@ ALTER TABLE `HealthCheck` ALTER TABLE `HealthCheckAgent` ADD PRIMARY KEY (`healthCheckAgentId`); +ALTER TABLE `htp_User` + ADD PRIMARY KEY (`userId`), + ADD UNIQUE KEY `username` (`username`), + ADD KEY `rightGroupId` (`rightGroupId`); + ALTER TABLE `LogEntry` ADD PRIMARY KEY (`logEntryId`); @@ -1259,11 +1262,6 @@ ALTER TABLE `TaskWrapper` ADD KEY `isArchived` (`isArchived`), ADD KEY `accessGroupId` (`accessGroupId`); -ALTER TABLE `htp_User` - ADD PRIMARY KEY (`userId`), - ADD UNIQUE KEY `username` (`username`), - ADD KEY `rightGroupId` (`rightGroupId`); - ALTER TABLE `Zap` ADD PRIMARY KEY (`zapId`), ADD KEY `agentId` (`agentId`), @@ -1359,6 +1357,9 @@ ALTER TABLE `HealthCheck` ALTER TABLE `HealthCheckAgent` MODIFY `healthCheckAgentId` INT(11) NOT NULL AUTO_INCREMENT; +ALTER TABLE `htp_User` + MODIFY `userId` INT(11) NOT NULL AUTO_INCREMENT; + ALTER TABLE `LogEntry` MODIFY `logEntryId` INT(11) NOT NULL AUTO_INCREMENT; @@ -1396,9 +1397,6 @@ ALTER TABLE `TaskDebugOutput` ALTER TABLE `TaskWrapper` MODIFY `taskWrapperId` INT(11) NOT NULL AUTO_INCREMENT; -ALTER TABLE `htp_User` - MODIFY `userId` INT(11) NOT NULL AUTO_INCREMENT; - ALTER TABLE `Zap` MODIFY `zapId` INT(11) NOT NULL AUTO_INCREMENT; @@ -1483,6 +1481,9 @@ ALTER TABLE `HealthCheckAgent` ADD CONSTRAINT `HealthCheckAgent_ibfk_1` FOREIGN KEY (`agentId`) REFERENCES `Agent` (`agentId`), ADD CONSTRAINT `HealthCheckAgent_ibfk_2` FOREIGN KEY (`healthCheckId`) REFERENCES `HealthCheck` (`healthCheckId`); +ALTER TABLE `htp_User` + ADD CONSTRAINT `User_ibfk_1` FOREIGN KEY (`rightGroupId`) REFERENCES `RightGroup` (`rightGroupId`); + ALTER TABLE `NotificationSetting` ADD CONSTRAINT `NotificationSetting_ibfk_1` FOREIGN KEY (`userId`) REFERENCES `htp_User` (`userId`); @@ -1512,9 +1513,6 @@ ALTER TABLE `TaskWrapper` ADD CONSTRAINT `TaskWrapper_ibfk_1` FOREIGN KEY (`hashlistId`) REFERENCES `Hashlist` (`hashlistId`), ADD CONSTRAINT `TaskWrapper_ibfk_2` FOREIGN KEY (`accessGroupId`) REFERENCES `AccessGroup` (`accessGroupId`); -ALTER TABLE `htp_User` - ADD CONSTRAINT `User_ibfk_1` FOREIGN KEY (`rightGroupId`) REFERENCES `RightGroup` (`rightGroupId`); - ALTER TABLE `Zap` ADD CONSTRAINT `Zap_ibfk_1` FOREIGN KEY (`agentId`) REFERENCES `Agent` (`agentId`), ADD CONSTRAINT `Zap_ibfk_2` FOREIGN KEY (`hashlistId`) REFERENCES `Hashlist` (`hashlistId`); diff --git a/src/migrations/postgres/20251127000000_initial.sql b/src/migrations/postgres/20251127000000_initial.sql index a296d65eb..8b6664d47 100644 --- a/src/migrations/postgres/20251127000000_initial.sql +++ b/src/migrations/postgres/20251127000000_initial.sql @@ -3,18 +3,21 @@ CREATE TABLE AccessGroup ( accessGroupId SERIAL NOT NULL PRIMARY KEY, groupName TEXT NOT NULL ); + CREATE TABLE AccessGroupAgent ( accessGroupAgentId SERIAL NOT NULL PRIMARY KEY, accessGroupId INT NOT NULL, agentId INT NOT NULL ); + CREATE TABLE AccessGroupUser ( accessGroupUserId SERIAL NOT NULL PRIMARY KEY, accessGroupId INT NOT NULL, userId INT NOT NULL ); + CREATE TABLE Agent ( - agentId SERIAL NOT NULL PRIMARY KEY, + agentId SERIAL NOT NULL PRIMARY KEY, agentName TEXT NOT NULL, uid TEXT NOT NULL, os INT NOT NULL, @@ -31,15 +34,17 @@ CREATE TABLE Agent ( cpuOnly INT NOT NULL, clientSignature TEXT NOT NULL ); + CREATE TABLE AgentBinary ( - agentBinaryId SERIAL NOT NULL PRIMARY KEY, - binaryType TEXT NOT NULL, + agentBinaryId SERIAL NOT NULL PRIMARY KEY, + binaryType TEXT NOT NULL, version TEXT NOT NULL, operatingSystems TEXT NOT NULL, filename TEXT NOT NULL, updateTrack TEXT NOT NULL, updateAvailable TEXT NOT NULL ); + INSERT INTO AgentBinary (agentBinaryId, binaryType, version, operatingSystems, filename, updateTrack, updateAvailable) VALUES (1, 'python', '0.7.4', 'Windows, Linux, OS X', 'hashtopolis.zip', 'stable', ''); @@ -51,6 +56,7 @@ CREATE TABLE AgentError ( error TEXT NOT NULL, chunkId INT NULL ); + CREATE TABLE AgentStat ( agentStatId SERIAL NOT NULL PRIMARY KEY, agentId INT NOT NULL, @@ -58,19 +64,22 @@ CREATE TABLE AgentStat ( time BIGINT NOT NULL, value TEXT NOT NULL ); + CREATE TABLE AgentZap ( agentZapId SERIAL NOT NULL PRIMARY KEY, agentId INT NOT NULL, lastZapId INT NULL ); + CREATE TABLE Assignment ( assignmentId SERIAL NOT NULL PRIMARY KEY, taskId INT NOT NULL, agentId INT NOT NULL, benchmark TEXT NOT NULL ); + CREATE TABLE Chunk ( - chunkId SERIAL NOT NULL PRIMARY KEY, + chunkId SERIAL NOT NULL PRIMARY KEY, taskId INT NOT NULL, skip BIGINT NOT NULL, length BIGINT NOT NULL, @@ -83,12 +92,14 @@ CREATE TABLE Chunk ( cracked INT NOT NULL, speed BIGINT NOT NULL ); + CREATE TABLE Config ( - configId SERIAL NOT NULL PRIMARY KEY, + configId SERIAL NOT NULL PRIMARY KEY, configSectionId INT NOT NULL, item TEXT NOT NULL, value TEXT NOT NULL ); + INSERT INTO Config (configId, configSectionId, item, value) VALUES (1, 1, 'agenttimeout', '30'), (2, 1, 'benchtime', '30'), @@ -154,11 +165,11 @@ INSERT INTO Config (configId, configSectionId, item, value) VALUES (78, 3, 'defaultPageSize', '10000'), (79, 3, 'maxPageSize', '50000'); - CREATE TABLE ConfigSection ( configSectionId SERIAL NOT NULL PRIMARY KEY, sectionName TEXT NOT NULL ); + INSERT INTO ConfigSection (configSectionId, sectionName) VALUES (1, 'Cracking/Tasks'), (2, 'Yubikey'), @@ -169,12 +180,13 @@ INSERT INTO ConfigSection (configSectionId, sectionName) VALUES (7, 'Notifications'); CREATE TABLE CrackerBinary ( - crackerBinaryId SERIAL NOT NULL PRIMARY KEY, + crackerBinaryId SERIAL NOT NULL PRIMARY KEY, crackerBinaryTypeId INT NOT NULL, version TEXT NOT NULL, downloadUrl TEXT NOT NULL, binaryName TEXT NOT NULL ); + INSERT INTO CrackerBinary (crackerBinaryId, crackerBinaryTypeId, version, downloadUrl, binaryName) VALUES (1, 1, '7.1.2', 'https://hashcat.net/files/hashcat-7.1.2.7z', 'hashcat'); @@ -183,11 +195,12 @@ CREATE TABLE CrackerBinaryType ( typeName TEXT NOT NULL, isChunkingAvailable INT NOT NULL ); + INSERT INTO CrackerBinaryType (crackerBinaryTypeId, typeName, isChunkingAvailable) VALUES (1, 'hashcat', 1); CREATE TABLE File ( - fileId SERIAL NOT NULL PRIMARY KEY, + fileId SERIAL NOT NULL PRIMARY KEY, filename TEXT NOT NULL, size BIGINT NOT NULL, isSecret INT NOT NULL, @@ -195,23 +208,27 @@ CREATE TABLE File ( accessGroupId INT NOT NULL, lineCount BIGINT DEFAULT NULL ); + CREATE TABLE FilePretask ( filePretaskId SERIAL NOT NULL PRIMARY KEY, fileId INT NOT NULL, pretaskId INT NOT NULL ); + CREATE TABLE FileTask ( fileTaskId SERIAL NOT NULL PRIMARY KEY, fileId INT NOT NULL, taskId INT NOT NULL ); + CREATE TABLE FileDelete ( fileDeleteId SERIAL NOT NULL PRIMARY KEY, filename TEXT NOT NULL, time BIGINT NOT NULL ); + CREATE TABLE Hash ( - hashId SERIAL NOT NULL PRIMARY KEY, + hashId SERIAL NOT NULL PRIMARY KEY, hashlistId INT NOT NULL, hash TEXT NOT NULL, salt TEXT DEFAULT NULL, @@ -221,6 +238,7 @@ CREATE TABLE Hash ( isCracked INT NOT NULL, crackPos BIGINT NOT NULL ); + CREATE TABLE HashBinary ( hashBinaryId SERIAL NOT NULL PRIMARY KEY, hashlistId INT NOT NULL, @@ -232,8 +250,9 @@ CREATE TABLE HashBinary ( isCracked INT NOT NULL, crackPos BIGINT NOT NULL ); + CREATE TABLE Hashlist ( - hashlistId SERIAL NOT NULL PRIMARY KEY, + hashlistId SERIAL NOT NULL PRIMARY KEY, hashlistName TEXT NOT NULL, format INT NOT NULL, hashTypeId INT NOT NULL, @@ -249,17 +268,20 @@ CREATE TABLE Hashlist ( brainFeatures INT NOT NULL, isArchived INT NOT NULL ); + CREATE TABLE HashlistHashlist ( hashlistHashlistId SERIAL NOT NULL PRIMARY KEY, parentHashlistId INT NOT NULL, hashlistId INT NOT NULL ); + CREATE TABLE HashType ( - hashTypeId SERIAL NOT NULL PRIMARY KEY, + hashTypeId SERIAL NOT NULL PRIMARY KEY, description TEXT NOT NULL, isSalted INT NOT NULL, isSlowHash INT NOT NULL ); + INSERT INTO HashType (hashTypeId, description, isSalted, isSlowHash) VALUES (0, 'MD5', 0, 0), (10, 'md5($pass.$salt)', 1, 0), @@ -850,6 +872,7 @@ CREATE TABLE LogEntry ( message TEXT NOT NULL, time BIGINT NOT NULL ); + CREATE TABLE NotificationSetting ( notificationSettingId SERIAL NOT NULL PRIMARY KEY, action TEXT NOT NULL, @@ -859,8 +882,9 @@ CREATE TABLE NotificationSetting ( receiver TEXT NOT NULL, isActive INT NOT NULL ); + CREATE TABLE Pretask ( - pretaskId SERIAL NOT NULL PRIMARY KEY, + pretaskId SERIAL NOT NULL PRIMARY KEY, taskName TEXT NOT NULL, attackCmd TEXT NOT NULL, chunkTime INT NOT NULL, @@ -874,21 +898,24 @@ CREATE TABLE Pretask ( isMaskImport INT NOT NULL, crackerBinaryTypeId INT NOT NULL ); + CREATE TABLE RegVoucher ( regVoucherId SERIAL NOT NULL PRIMARY KEY, voucher TEXT NOT NULL, time BIGINT NOT NULL ); + CREATE TABLE RightGroup ( rightGroupId SERIAL NOT NULL PRIMARY KEY, groupName TEXT NOT NULL, permissions TEXT NOT NULL ); + INSERT INTO RightGroup (rightGroupId, groupName, permissions) VALUES (1, 'Administrator', 'ALL'); CREATE TABLE Session ( - sessionId SERIAL NOT NULL PRIMARY KEY, + sessionId SERIAL NOT NULL PRIMARY KEY, userId INT NOT NULL, sessionStartDate BIGINT NOT NULL, lastActionDate BIGINT NOT NULL, @@ -896,6 +923,7 @@ CREATE TABLE Session ( sessionLifetime INT NOT NULL, sessionKey TEXT NOT NULL ); + CREATE TABLE Speed ( speedId SERIAL NOT NULL PRIMARY KEY, agentId INT NOT NULL, @@ -903,21 +931,25 @@ CREATE TABLE Speed ( speed BIGINT NOT NULL, time BIGINT NOT NULL ); + CREATE TABLE StoredValue ( storedValueId TEXT NOT NULL PRIMARY KEY, val TEXT NOT NULL ); + CREATE TABLE Supertask ( - supertaskId SERIAL NOT NULL PRIMARY KEY, + supertaskId SERIAL NOT NULL PRIMARY KEY, supertaskName TEXT NOT NULL ); + CREATE TABLE SupertaskPretask ( supertaskPretaskId SERIAL NOT NULL PRIMARY KEY, supertaskId INT NOT NULL, pretaskId INT NOT NULL ); + CREATE TABLE Task ( - taskId SERIAL NOT NULL PRIMARY KEY, + taskId SERIAL NOT NULL PRIMARY KEY, taskName TEXT NOT NULL, attackCmd TEXT NOT NULL, chunkTime INT NOT NULL, @@ -942,13 +974,15 @@ CREATE TABLE Task ( usePreprocessor INT NOT NULL, preprocessorCommand TEXT NOT NULL ); + CREATE TABLE TaskDebugOutput ( taskDebugOutputId SERIAL NOT NULL PRIMARY KEY, taskId INT NOT NULL, output TEXT NOT NULL ); + CREATE TABLE TaskWrapper ( - taskWrapperId SERIAL NOT NULL PRIMARY KEY, + taskWrapperId SERIAL NOT NULL PRIMARY KEY, priority INT NOT NULL, maxAgents INT NOT NULL, taskType INT NOT NULL, @@ -958,8 +992,9 @@ CREATE TABLE TaskWrapper ( isArchived INT NOT NULL, cracked INT NOT NULL ); + CREATE TABLE htp_User ( - userId SERIAL NOT NULL PRIMARY KEY, + userId SERIAL NOT NULL PRIMARY KEY, username TEXT NOT NULL, email TEXT NOT NULL, passwordHash TEXT NOT NULL, @@ -976,15 +1011,17 @@ CREATE TABLE htp_User ( otp3 TEXT DEFAULT NULL, otp4 TEXT DEFAULT NULL ); + CREATE TABLE Zap ( - zapId SERIAL NOT NULL PRIMARY KEY, + zapId SERIAL NOT NULL PRIMARY KEY, hash TEXT NOT NULL, solveTime BIGINT NOT NULL, agentId INT NULL, hashlistId INT NOT NULL ); + CREATE TABLE ApiKey ( - apiKeyId SERIAL NOT NULL PRIMARY KEY, + apiKeyId SERIAL NOT NULL PRIMARY KEY, startValid BIGINT NOT NULL, endValid BIGINT NOT NULL, accessKey TEXT NOT NULL, @@ -992,22 +1029,25 @@ CREATE TABLE ApiKey ( userId INT NOT NULL, apiGroupId INT NOT NULL ); + CREATE TABLE ApiGroup ( - apiGroupId SERIAL NOT NULL PRIMARY KEY, + apiGroupId SERIAL NOT NULL PRIMARY KEY, name TEXT NOT NULL, permissions TEXT NOT NULL ); + CREATE TABLE FileDownload ( fileDownloadId SERIAL NOT NULL PRIMARY KEY, time BIGINT NOT NULL, fileId INT NOT NULL, status INT NOT NULL ); + INSERT INTO ApiGroup ( apiGroupId, name, permissions) VALUES (1, 'Administrators', 'ALL'); CREATE TABLE HealthCheck ( - healthCheckId SERIAL NOT NULL PRIMARY KEY, + healthCheckId SERIAL NOT NULL PRIMARY KEY, time BIGINT NOT NULL, status INT NOT NULL, checkType INT NOT NULL, @@ -1016,6 +1056,7 @@ CREATE TABLE HealthCheck ( expectedCracks INT NOT NULL, attackCmd TEXT NOT NULL ); + CREATE TABLE HealthCheckAgent ( healthCheckAgentId SERIAL NOT NULL PRIMARY KEY, healthCheckId INT NOT NULL, @@ -1027,8 +1068,9 @@ CREATE TABLE HealthCheckAgent ( htp_end BIGINT NOT NULL, errors TEXT NOT NULL ); + CREATE TABLE Preprocessor ( - preprocessorId SERIAL NOT NULL PRIMARY KEY, + preprocessorId SERIAL NOT NULL PRIMARY KEY, name TEXT NOT NULL, url TEXT NOT NULL, binaryName TEXT NOT NULL, @@ -1036,6 +1078,7 @@ CREATE TABLE Preprocessor ( skipCommand TEXT NULL, limitCommand TEXT NULL ); + INSERT INTO Preprocessor ( preprocessorId, name, url, binaryName, keyspaceCommand, skipCommand, limitCommand) VALUES (1, 'Prince', 'https://github.com/hashcat/princeprocessor/releases/download/v0.22/princeprocessor-0.22.7z', 'pp', '--keyspace', '--skip', '--limit'); @@ -1048,6 +1091,8 @@ SELECT pg_catalog.setval(pg_get_serial_sequence('AgentBinary', 'agentbinaryid'), SELECT pg_catalog.setval(pg_get_serial_sequence('AgentError', 'agenterrorid'), MAX(agentErrorId)) from AgentError; SELECT pg_catalog.setval(pg_get_serial_sequence('AgentStat', 'agentstatid'), MAX(agentStatId)) from AgentStat; SELECT pg_catalog.setval(pg_get_serial_sequence('AgentZap', 'agentzapid'), MAX(agentZapId)) from AgentZap; +SELECT pg_catalog.setval(pg_get_serial_sequence('ApiKey', 'apikeyid'), MAX(apiKeyId)) from ApiKey; +SELECT pg_catalog.setval(pg_get_serial_sequence('ApiGroup', 'apigroupid'), MAX(apiGroupId)) from ApiGroup; SELECT pg_catalog.setval(pg_get_serial_sequence('Assignment', 'assignmentid'), MAX(assignmentId)) from Assignment; SELECT pg_catalog.setval(pg_get_serial_sequence('Chunk', 'chunkid'), MAX(chunkId)) from Chunk; SELECT pg_catalog.setval(pg_get_serial_sequence('Config', 'configid'), MAX(configId)) from Config; @@ -1055,6 +1100,7 @@ SELECT pg_catalog.setval(pg_get_serial_sequence('ConfigSection', 'configsectioni SELECT pg_catalog.setval(pg_get_serial_sequence('CrackerBinary', 'crackerbinaryid'), MAX(crackerBinaryId)) from CrackerBinary; SELECT pg_catalog.setval(pg_get_serial_sequence('CrackerBinaryType', 'crackerbinarytypeid'), MAX(crackerBinaryTypeId)) from CrackerBinaryType; SELECT pg_catalog.setval(pg_get_serial_sequence('File', 'fileid'), MAX(fileId)) from File; +SELECT pg_catalog.setval(pg_get_serial_sequence('FileDownload', 'filedownloadid'), MAX(fileDownloadId)) from FileDownload; SELECT pg_catalog.setval(pg_get_serial_sequence('FilePretask', 'filepretaskid'), MAX(filePretaskId)) from FilePretask; SELECT pg_catalog.setval(pg_get_serial_sequence('FileTask', 'filetaskid'), MAX(fileTaskId)) from FileTask; SELECT pg_catalog.setval(pg_get_serial_sequence('FileDelete', 'filedeleteid'), MAX(fileDeleteId)) from FileDelete; @@ -1063,8 +1109,12 @@ SELECT pg_catalog.setval(pg_get_serial_sequence('HashBinary', 'hashbinaryid'), M SELECT pg_catalog.setval(pg_get_serial_sequence('Hashlist', 'hashlistid'), MAX(hashlistId)) from Hashlist; SELECT pg_catalog.setval(pg_get_serial_sequence('HashlistHashlist', 'hashlisthashlistid'), MAX(hashlistHashlistId)) from HashlistHashlist; SELECT pg_catalog.setval(pg_get_serial_sequence('HashType', 'hashtypeid'), MAX(hashTypeId)) from HashType; +SELECT pg_catalog.setval(pg_get_serial_sequence('HealthCheck', 'healthcheckid'), MAX(healthCheckId)) from HealthCheck; +SELECT pg_catalog.setval(pg_get_serial_sequence('HealthCheckAgent', 'healthcheckagentid'), MAX(healthCheckAgentId)) from HealthCheckAgent; +SELECT pg_catalog.setval(pg_get_serial_sequence('htp_User', 'userid'), MAX(userId)) from htp_User; SELECT pg_catalog.setval(pg_get_serial_sequence('LogEntry', 'logentryid'), MAX(logEntryId)) from LogEntry; SELECT pg_catalog.setval(pg_get_serial_sequence('NotificationSetting', 'notificationsettingid'), MAX(notificationSettingId)) from NotificationSetting; +SELECT pg_catalog.setval(pg_get_serial_sequence('Preprocessor', 'preprocessorid'), MAX(preprocessorId)) from Preprocessor; SELECT pg_catalog.setval(pg_get_serial_sequence('Pretask', 'pretaskid'), MAX(pretaskId)) from Pretask; SELECT pg_catalog.setval(pg_get_serial_sequence('RegVoucher', 'regvoucherid'), MAX(regVoucherId)) from RegVoucher; SELECT pg_catalog.setval(pg_get_serial_sequence('RightGroup', 'rightgroupid'), MAX(rightGroupId)) from RightGroup; @@ -1075,15 +1125,7 @@ SELECT pg_catalog.setval(pg_get_serial_sequence('SupertaskPretask', 'supertaskpr SELECT pg_catalog.setval(pg_get_serial_sequence('Task', 'taskid'), MAX(taskId)) from Task; SELECT pg_catalog.setval(pg_get_serial_sequence('TaskDebugOutput', 'taskdebugoutputid'), MAX(taskDebugOutputId)) from TaskDebugOutput; SELECT pg_catalog.setval(pg_get_serial_sequence('TaskWrapper', 'taskwrapperid'), MAX(taskWrapperId)) from TaskWrapper; -SELECT pg_catalog.setval(pg_get_serial_sequence('htp_User', 'userid'), MAX(userId)) from htp_User; SELECT pg_catalog.setval(pg_get_serial_sequence('Zap', 'zapid'), MAX(zapId)) from Zap; -SELECT pg_catalog.setval(pg_get_serial_sequence('ApiKey', 'apikeyid'), MAX(apiKeyId)) from ApiKey; -SELECT pg_catalog.setval(pg_get_serial_sequence('ApiGroup', 'apigroupid'), MAX(apiGroupId)) from ApiGroup; -SELECT pg_catalog.setval(pg_get_serial_sequence('FileDownload', 'filedownloadid'), MAX(fileDownloadId)) from FileDownload; -SELECT pg_catalog.setval(pg_get_serial_sequence('HealthCheck', 'healthcheckid'), MAX(healthCheckId)) from HealthCheck; -SELECT pg_catalog.setval(pg_get_serial_sequence('HealthCheckAgent', 'healthcheckagentid'), MAX(healthCheckAgentId)) from HealthCheckAgent; -SELECT pg_catalog.setval(pg_get_serial_sequence('Preprocessor', 'preprocessorid'), MAX(preprocessorId)) from Preprocessor; - -- Add Indexes CREATE INDEX IF NOT EXISTS accessGroupId_idx ON AccessGroupAgent (accessGroupId); @@ -1133,6 +1175,8 @@ CREATE INDEX IF NOT EXISTS hashTypeId_idx ON Hashlist (hashTypeId); CREATE INDEX IF NOT EXISTS parentHashlistId_idx ON HashlistHashlist (parentHashlistId); CREATE INDEX IF NOT EXISTS hashlistId_idx ON HashlistHashlist (hashlistId); +CREATE INDEX IF NOT EXISTS rightGroupId_idx ON htp_User (rightGroupId); + CREATE INDEX IF NOT EXISTS userId_idx ON NotificationSetting (userId); CREATE INDEX IF NOT EXISTS userId_idx ON Session (userId); @@ -1150,8 +1194,6 @@ CREATE INDEX IF NOT EXISTS priority_idx ON TaskWrapper (priority); CREATE INDEX IF NOT EXISTS isArchived_idx ON TaskWrapper (isArchived); CREATE INDEX IF NOT EXISTS accessGroupId_idx ON TaskWrapper (accessGroupId); -CREATE INDEX IF NOT EXISTS rightGroupId_idx ON htp_User (rightGroupId); - CREATE INDEX IF NOT EXISTS agentId_idx ON Zap (agentId); CREATE INDEX IF NOT EXISTS hashlistId_idx ON Zap (hashlistId); @@ -1210,6 +1252,8 @@ ALTER TABLE HealthCheck ADD CONSTRAINT HealthCheck_ibfk_1 FOREIGN KEY (crackerBi ALTER TABLE HealthCheckAgent ADD CONSTRAINT HealthCheckAgent_ibfk_1 FOREIGN KEY (agentId) REFERENCES Agent (agentId); ALTER TABLE HealthCheckAgent ADD CONSTRAINT HealthCheckAgent_ibfk_2 FOREIGN KEY (healthCheckId) REFERENCES HealthCheck (healthCheckId); +ALTER TABLE htp_User ADD CONSTRAINT User_ibfk_1 FOREIGN KEY (rightGroupId) REFERENCES RightGroup (rightGroupId); + ALTER TABLE NotificationSetting ADD CONSTRAINT NotificationSetting_ibfk_1 FOREIGN KEY (userId) REFERENCES htp_User (userId); ALTER TABLE Pretask ADD CONSTRAINT Pretask_ibfk_1 FOREIGN KEY (crackerBinaryTypeId) REFERENCES CrackerBinaryType (crackerBinaryTypeId); @@ -1231,8 +1275,5 @@ ALTER TABLE TaskDebugOutput ADD CONSTRAINT TaskDebugOutput_ibfk_1 FOREIGN KEY (t ALTER TABLE TaskWrapper ADD CONSTRAINT TaskWrapper_ibfk_1 FOREIGN KEY (hashlistId) REFERENCES Hashlist (hashlistId); ALTER TABLE TaskWrapper ADD CONSTRAINT TaskWrapper_ibfk_2 FOREIGN KEY (accessGroupId) REFERENCES AccessGroup (accessGroupId); -ALTER TABLE htp_User ADD CONSTRAINT User_ibfk_1 FOREIGN KEY (rightGroupId) REFERENCES RightGroup (rightGroupId); - ALTER TABLE Zap ADD CONSTRAINT Zap_ibfk_1 FOREIGN KEY (agentId) REFERENCES Agent (agentId); ALTER TABLE Zap ADD CONSTRAINT Zap_ibfk_2 FOREIGN KEY (hashlistId) REFERENCES Hashlist (hashlistId); - From bd8ddb7353d7803d396b8d391af4fee198045aa3 Mon Sep 17 00:00:00 2001 From: Sein Coray Date: Sat, 29 Nov 2025 14:58:06 +0100 Subject: [PATCH 292/691] added checksum for existing upgrades --- src/install/updates/update_v1.0.0-rainbow4_vx.x.x.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/install/updates/update_v1.0.0-rainbow4_vx.x.x.php b/src/install/updates/update_v1.0.0-rainbow4_vx.x.x.php index 2680918eb..45bd0ccc5 100644 --- a/src/install/updates/update_v1.0.0-rainbow4_vx.x.x.php +++ b/src/install/updates/update_v1.0.0-rainbow4_vx.x.x.php @@ -25,7 +25,7 @@ if (!Util::databaseTableExists("_sqlx_migrations")) { // this creates the existing state for sqlx to continue with migrations for all further updates Factory::getAgentFactory()->getDB()->query("CREATE TABLE `_sqlx_migrations` (`version` bigint NOT NULL, `description` text NOT NULL, `installed_on` timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP, `success` tinyint(1) NOT NULL, `checksum` blob NOT NULL, `execution_time` bigint NOT NULL, PRIMARY KEY (`version`)) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_0900_ai_ci;"); - Factory::getAgentFactory()->getDB()->query("INSERT INTO `_sqlx_migrations` VALUES (20251127000000,'initial','2025-11-28 14:29:13',1,0x87B4F9CE14A0C5A131A84D96044E89BAD641D0043E19141341C2DE2D307A25B748EF4F356CF4E0ACE439F84EC6C8F77A,1);"); + Factory::getAgentFactory()->getDB()->query("INSERT INTO `_sqlx_migrations` VALUES (20251127000000,'initial','2025-11-28 14:29:13',1,0x22F3A0D84CF66E9694946A244FBC19B314F0EA85B9B5C66A3C2BB67EE365AA78D025D9C90FBCCE8E4896FD20988A6740,1);"); } $EXECUTED["v1.0.0-rainbow4_migration_to_migrations"] = true; } From c3c02093f3cbf94e2491100eb194fd1c742aeb35 Mon Sep 17 00:00:00 2001 From: Sein Coray Date: Sat, 29 Nov 2025 15:28:58 +0100 Subject: [PATCH 293/691] updated github actions to run both systems --- ...r-compose.yml => docker-compose.mysql.yml} | 1 + .devcontainer/docker-compose.postgres.yml | 51 +++++++++++++++++++ .github/actions/start-hashtopolis/action.yml | 8 ++- .github/workflows/ci.yml | 7 +++ .github/workflows/docs-build.yml | 2 + .github/workflows/docs.yml | 4 +- 6 files changed, 71 insertions(+), 2 deletions(-) rename .devcontainer/{docker-compose.yml => docker-compose.mysql.yml} (97%) create mode 100644 .devcontainer/docker-compose.postgres.yml diff --git a/.devcontainer/docker-compose.yml b/.devcontainer/docker-compose.mysql.yml similarity index 97% rename from .devcontainer/docker-compose.yml rename to .devcontainer/docker-compose.mysql.yml index fbbd36ad1..55cb7ccc2 100644 --- a/.devcontainer/docker-compose.yml +++ b/.devcontainer/docker-compose.mysql.yml @@ -9,6 +9,7 @@ services: - CONTAINER_USER_CMD_PRE - CONTAINER_USER_CMD_POST environment: + HASHTOPOLIS_DB_TYPE: mysql HASHTOPOLIS_DB_USER: hashtopolis HASHTOPOLIS_DB_PASS: hashtopolis HASHTOPOLIS_DB_HOST: hashtopolis-db-dev diff --git a/.devcontainer/docker-compose.postgres.yml b/.devcontainer/docker-compose.postgres.yml new file mode 100644 index 000000000..3cabdf5db --- /dev/null +++ b/.devcontainer/docker-compose.postgres.yml @@ -0,0 +1,51 @@ +version: "3.7" +services: + hashtopolis-server-dev: + container_name: hashtopolis-server-dev + build: + context: .. + target: hashtopolis-server-dev + args: + - CONTAINER_USER_CMD_PRE + - CONTAINER_USER_CMD_POST + environment: + HASHTOPOLIS_DB_TYPE: postgres + HASHTOPOLIS_DB_USER: hashtopolis + HASHTOPOLIS_DB_PASS: hashtopolis + HASHTOPOLIS_DB_HOST: hashtopolis-db-dev + HASHTOPOLIS_DB_DATABASE: hashtopolis + HASHTOPOLIS_APIV2_ENABLE: 1 + depends_on: + - hashtopolis-db-dev + ports: + - "8080:80" + volumes: + # This is where VS Code should expect to find your project's source code + # and the value of "workspaceFolder" in .devcontainer/devcontainer.json + - ..:/var/www/html + - hashtopolis-server-dev:/usr/local/share/hashtopolis:Z + networks: + - hashtopolis_dev + hashtopolis-db-dev: + container_name: hashtopolis-db-dev + image: mysql:8.0 + restart: always + ports: + - "3306:3306" + volumes: + - hashtopolis-db-dev:/var/lib/mysql + environment: + MYSQL_ROOT_PASSWORD: hashtopolis + MYSQL_DATABASE: hashtopolis + MYSQL_USER: hashtopolis + MYSQL_PASSWORD: hashtopolis + networks: + - hashtopolis_dev +volumes: + hashtopolis-db-dev: + hashtopolis-server-dev: + +networks: + hashtopolis_dev: + # This network will also be used by the python-agent + name: hashtopolis_dev diff --git a/.github/actions/start-hashtopolis/action.yml b/.github/actions/start-hashtopolis/action.yml index 95d982955..f2cd6c7c9 100644 --- a/.github/actions/start-hashtopolis/action.yml +++ b/.github/actions/start-hashtopolis/action.yml @@ -1,12 +1,18 @@ name: Start Hashtopolis server description: Starts application containers and waits for Hashtopolis to be ready. +inputs: + db_system: + description: "Used to set which DB system should be used" + required: true + default: "mysql" + runs: using: "composite" steps: - name: Start application containers working-directory: .devcontainer - run: docker compose up -d + run: docker compose up -f docker-compose.${{ env.INPUT_DB_SYSTEM }}.yml shell: bash - name: Install composer dependencies packages run: docker exec hashtopolis-server-dev composer install --working-dir=/var/www/html/ diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index cc14f4d88..7a8fe8fa9 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -13,11 +13,18 @@ on: jobs: build: runs-on: ubuntu-latest + strategy: + matrix: + include: + - db_system: mysql + - db_system: postgres steps: - name: Checkout repository uses: actions/checkout@v3 - name: Start Hashtopolis server uses: ./.github/actions/start-hashtopolis + with: + db_system: ${{ matrix.db_system }} - name: Give Apache permissions on necessary directories # for the tests, only src/files and src/inc/utils/locks seem necessary run: docker exec -u root hashtopolis-server-dev bash -c "chown -R www-data:www-data /var/www/html/src && chmod -R g+w /var/www/html/src" - name: Run test suite diff --git a/.github/workflows/docs-build.yml b/.github/workflows/docs-build.yml index da16380cd..5a7727326 100644 --- a/.github/workflows/docs-build.yml +++ b/.github/workflows/docs-build.yml @@ -29,6 +29,8 @@ jobs: sudo apt-get install npm - name: Start Hashtopolis server uses: ./.github/actions/start-hashtopolis + with: + db_system: "mysql" - name: Download newest apiv2 spec run: | wget http://localhost:8080/api/v2/openapi.json -P /tmp/ diff --git a/.github/workflows/docs.yml b/.github/workflows/docs.yml index c48bf4ddc..93f1f22af 100644 --- a/.github/workflows/docs.yml +++ b/.github/workflows/docs.yml @@ -26,9 +26,11 @@ jobs: sudo apt-get install php sudo apt-get install -y lftp sudo apt-get install nodejs - sudo apt-get install npm + sudo apt-get install npm - name: Start Hashtopolis server uses: ./.github/actions/start-hashtopolis + with: + db_system: "mysql" - name: Download newest apiv2 spec run: | wget http://localhost:8080/api/v2/openapi.json -P /tmp/ From 73b1bdc2d27a861f09da26c729e5e601b6b3fa85 Mon Sep 17 00:00:00 2001 From: Sein Coray Date: Sat, 29 Nov 2025 15:35:51 +0100 Subject: [PATCH 294/691] fixed github input --- .github/actions/start-hashtopolis/action.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/actions/start-hashtopolis/action.yml b/.github/actions/start-hashtopolis/action.yml index f2cd6c7c9..014031dad 100644 --- a/.github/actions/start-hashtopolis/action.yml +++ b/.github/actions/start-hashtopolis/action.yml @@ -12,7 +12,7 @@ runs: steps: - name: Start application containers working-directory: .devcontainer - run: docker compose up -f docker-compose.${{ env.INPUT_DB_SYSTEM }}.yml + run: docker compose -f docker-compose.${{ github.event.inputs.db_system }}.yml -f shell: bash - name: Install composer dependencies packages run: docker exec hashtopolis-server-dev composer install --working-dir=/var/www/html/ From bf3b2cdfdcf56e2f08a4504581d747b34146db9b Mon Sep 17 00:00:00 2001 From: Sein Coray Date: Sat, 29 Nov 2025 15:36:40 +0100 Subject: [PATCH 295/691] removed double -f --- .github/actions/start-hashtopolis/action.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/actions/start-hashtopolis/action.yml b/.github/actions/start-hashtopolis/action.yml index 014031dad..bfd935c39 100644 --- a/.github/actions/start-hashtopolis/action.yml +++ b/.github/actions/start-hashtopolis/action.yml @@ -12,7 +12,7 @@ runs: steps: - name: Start application containers working-directory: .devcontainer - run: docker compose -f docker-compose.${{ github.event.inputs.db_system }}.yml -f + run: docker compose -f docker-compose.${{ github.event.inputs.db_system }}.yml shell: bash - name: Install composer dependencies packages run: docker exec hashtopolis-server-dev composer install --working-dir=/var/www/html/ From e06acaed90ad0640ab3a898d480695a50bbeee63 Mon Sep 17 00:00:00 2001 From: Sein Coray Date: Sat, 29 Nov 2025 15:38:41 +0100 Subject: [PATCH 296/691] input style fix --- .github/actions/start-hashtopolis/action.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/actions/start-hashtopolis/action.yml b/.github/actions/start-hashtopolis/action.yml index bfd935c39..cab103fde 100644 --- a/.github/actions/start-hashtopolis/action.yml +++ b/.github/actions/start-hashtopolis/action.yml @@ -12,7 +12,7 @@ runs: steps: - name: Start application containers working-directory: .devcontainer - run: docker compose -f docker-compose.${{ github.event.inputs.db_system }}.yml + run: docker compose -f docker-compose.${{ inputs.db_system }}.yml shell: bash - name: Install composer dependencies packages run: docker exec hashtopolis-server-dev composer install --working-dir=/var/www/html/ From 9a26d1c6dd918356dba216a47ccd61e3e41a47df Mon Sep 17 00:00:00 2001 From: Sein Coray Date: Sat, 29 Nov 2025 15:39:22 +0100 Subject: [PATCH 297/691] syntax fix --- .github/actions/start-hashtopolis/action.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/actions/start-hashtopolis/action.yml b/.github/actions/start-hashtopolis/action.yml index cab103fde..30f8cc8f0 100644 --- a/.github/actions/start-hashtopolis/action.yml +++ b/.github/actions/start-hashtopolis/action.yml @@ -12,7 +12,7 @@ runs: steps: - name: Start application containers working-directory: .devcontainer - run: docker compose -f docker-compose.${{ inputs.db_system }}.yml + run: docker compose -f docker-compose.${{ inputs.db_system }}.yml up shell: bash - name: Install composer dependencies packages run: docker exec hashtopolis-server-dev composer install --working-dir=/var/www/html/ From 4a076e69cd7a679303f5e6c44ed08a9044130e6b Mon Sep 17 00:00:00 2001 From: Sein Coray Date: Sat, 29 Nov 2025 15:45:36 +0100 Subject: [PATCH 298/691] fix workflow with -d on compose and postgres config --- .devcontainer/docker-compose.postgres.yml | 16 ++++++---------- .github/actions/start-hashtopolis/action.yml | 2 +- 2 files changed, 7 insertions(+), 11 deletions(-) diff --git a/.devcontainer/docker-compose.postgres.yml b/.devcontainer/docker-compose.postgres.yml index 3cabdf5db..6b7181c84 100644 --- a/.devcontainer/docker-compose.postgres.yml +++ b/.devcontainer/docker-compose.postgres.yml @@ -28,19 +28,15 @@ services: - hashtopolis_dev hashtopolis-db-dev: container_name: hashtopolis-db-dev - image: mysql:8.0 + image: postgres:13 restart: always - ports: - - "3306:3306" volumes: - - hashtopolis-db-dev:/var/lib/mysql + - db:/var/lib/postgresql/data environment: - MYSQL_ROOT_PASSWORD: hashtopolis - MYSQL_DATABASE: hashtopolis - MYSQL_USER: hashtopolis - MYSQL_PASSWORD: hashtopolis - networks: - - hashtopolis_dev + POSTGRES_DB: hashtopolis + POSTGRES_USER: hashtopolis + POSTGRES_PASSWORD: hashtopolis + volumes: hashtopolis-db-dev: hashtopolis-server-dev: diff --git a/.github/actions/start-hashtopolis/action.yml b/.github/actions/start-hashtopolis/action.yml index 30f8cc8f0..764854f7e 100644 --- a/.github/actions/start-hashtopolis/action.yml +++ b/.github/actions/start-hashtopolis/action.yml @@ -12,7 +12,7 @@ runs: steps: - name: Start application containers working-directory: .devcontainer - run: docker compose -f docker-compose.${{ inputs.db_system }}.yml up + run: docker compose -f docker-compose.${{ inputs.db_system }}.yml up -d shell: bash - name: Install composer dependencies packages run: docker exec hashtopolis-server-dev composer install --working-dir=/var/www/html/ From 445e1bc74fa1b30f65845f27aa86000c457dc16c Mon Sep 17 00:00:00 2001 From: Sein Coray Date: Sat, 29 Nov 2025 15:47:32 +0100 Subject: [PATCH 299/691] fixed docker compose refer --- .devcontainer/docker-compose.postgres.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.devcontainer/docker-compose.postgres.yml b/.devcontainer/docker-compose.postgres.yml index 6b7181c84..da92d3ef2 100644 --- a/.devcontainer/docker-compose.postgres.yml +++ b/.devcontainer/docker-compose.postgres.yml @@ -31,7 +31,7 @@ services: image: postgres:13 restart: always volumes: - - db:/var/lib/postgresql/data + - hashtopolis-db-dev:/var/lib/postgresql/data environment: POSTGRES_DB: hashtopolis POSTGRES_USER: hashtopolis From 309bcf4b668d5183857d2c68df3605cc206aff8c Mon Sep 17 00:00:00 2001 From: Sein Coray Date: Sat, 29 Nov 2025 15:59:26 +0100 Subject: [PATCH 300/691] add exposed port --- .devcontainer/docker-compose.postgres.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.devcontainer/docker-compose.postgres.yml b/.devcontainer/docker-compose.postgres.yml index da92d3ef2..73f1556b5 100644 --- a/.devcontainer/docker-compose.postgres.yml +++ b/.devcontainer/docker-compose.postgres.yml @@ -30,6 +30,8 @@ services: container_name: hashtopolis-db-dev image: postgres:13 restart: always + ports: + - "5432:5432" volumes: - hashtopolis-db-dev:/var/lib/postgresql/data environment: From 18230a76eb8255386c4f655cfa14de1d0e4a1268 Mon Sep 17 00:00:00 2001 From: Sein Coray Date: Sat, 29 Nov 2025 16:18:46 +0100 Subject: [PATCH 301/691] fixed postgres devcontainer compose --- .devcontainer/docker-compose.postgres.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.devcontainer/docker-compose.postgres.yml b/.devcontainer/docker-compose.postgres.yml index 73f1556b5..0a7747910 100644 --- a/.devcontainer/docker-compose.postgres.yml +++ b/.devcontainer/docker-compose.postgres.yml @@ -38,6 +38,8 @@ services: POSTGRES_DB: hashtopolis POSTGRES_USER: hashtopolis POSTGRES_PASSWORD: hashtopolis + networks: + - hashtopolis_dev volumes: hashtopolis-db-dev: From ba5b1acc2989aff733d50c02f2bb1feb9706d70f Mon Sep 17 00:00:00 2001 From: Sein Coray Date: Sat, 29 Nov 2025 16:19:03 +0100 Subject: [PATCH 302/691] execute legacy test framework only with mysql --- .github/workflows/ci.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 7a8fe8fa9..8ddd46e12 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -28,6 +28,7 @@ jobs: - name: Give Apache permissions on necessary directories # for the tests, only src/files and src/inc/utils/locks seem necessary run: docker exec -u root hashtopolis-server-dev bash -c "chown -R www-data:www-data /var/www/html/src && chmod -R g+w /var/www/html/src" - name: Run test suite + if: ${{ matrix.db_system == 'mysql' }} # the legacy is only supposed to work with mysql run: docker exec hashtopolis-server-dev php /var/www/html/ci/run.php -vmaster - name: Test with pytest run: docker exec hashtopolis-server-dev pytest /var/www/html/ci/apiv2 From 2d34f61f7e3d4e6594d6f945442bb6ab0cf176ac Mon Sep 17 00:00:00 2001 From: Sein Coray Date: Sat, 29 Nov 2025 16:25:51 +0100 Subject: [PATCH 303/691] fixed path to initial sql --- ci/server/setup.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ci/server/setup.php b/ci/server/setup.php index f78a93282..aa7f50c29 100644 --- a/ci/server/setup.php +++ b/ci/server/setup.php @@ -30,7 +30,7 @@ try { $db->query("CREATE DATABASE IF NOT EXISTS hashtopolis;"); $db->query("USE hashtopolis;"); - $db->query(file_get_contents($envPath . "src/install/hashtopolis.sql")); + $db->query(file_get_contents($envPath . "src/migrations/mysql/20251127000000_initial.sql")); } catch (PDOException $e) { fwrite(STDERR, "Failed to initialize database: " . $e->getMessage()); From 9910401f70a18050b30ce693cf2f03f17ce2dcfa Mon Sep 17 00:00:00 2001 From: Sein Coray Date: Sat, 29 Nov 2025 16:30:48 +0100 Subject: [PATCH 304/691] fix second occurrence of initial sql --- ci/HashtopolisTest.class.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ci/HashtopolisTest.class.php b/ci/HashtopolisTest.class.php index 47031a970..26d7d7968 100644 --- a/ci/HashtopolisTest.class.php +++ b/ci/HashtopolisTest.class.php @@ -76,7 +76,7 @@ public function init($version) { // load DB if ($version == "master") { - Factory::getAgentFactory()->getDB()->query(file_get_contents(dirname(__FILE__) ."/../src/install/hashtopolis.sql")); + Factory::getAgentFactory()->getDB()->query(file_get_contents(dirname(__FILE__) ."/../src/migrations/mysql/20251127000000_initial.sql")); } else { Factory::getAgentFactory()->getDB()->query(file_get_contents(dirname(__FILE__) . "/files/db_" . $version . ".sql")); From fb707140b1a80e33954469990d11d359cac830c3 Mon Sep 17 00:00:00 2001 From: Sein Coray Date: Sat, 29 Nov 2025 16:42:40 +0100 Subject: [PATCH 305/691] create separate compose files for the tests to avoid clashing with devcontainer specific mount --- .github/actions/start-hashtopolis/action.yml | 2 +- .github/docker-compose.mysql.yml | 47 ++++++++++++++++++++ .github/docker-compose.postgres.yml | 47 ++++++++++++++++++++ ci/apiv2/hashtopolis-test-defaults.yaml | 2 +- docker-compose.mysql.yml | 2 +- 5 files changed, 97 insertions(+), 3 deletions(-) create mode 100644 .github/docker-compose.mysql.yml create mode 100644 .github/docker-compose.postgres.yml diff --git a/.github/actions/start-hashtopolis/action.yml b/.github/actions/start-hashtopolis/action.yml index 764854f7e..aed00868d 100644 --- a/.github/actions/start-hashtopolis/action.yml +++ b/.github/actions/start-hashtopolis/action.yml @@ -11,7 +11,7 @@ runs: using: "composite" steps: - name: Start application containers - working-directory: .devcontainer + working-directory: .github run: docker compose -f docker-compose.${{ inputs.db_system }}.yml up -d shell: bash - name: Install composer dependencies packages diff --git a/.github/docker-compose.mysql.yml b/.github/docker-compose.mysql.yml new file mode 100644 index 000000000..d8ed694c2 --- /dev/null +++ b/.github/docker-compose.mysql.yml @@ -0,0 +1,47 @@ +version: "3.7" +services: + hashtopolis-server-dev: + container_name: hashtopolis-server-dev + build: + context: .. + target: hashtopolis-server-dev + args: + - CONTAINER_USER_CMD_PRE + - CONTAINER_USER_CMD_POST + environment: + HASHTOPOLIS_DB_TYPE: mysql + HASHTOPOLIS_DB_USER: hashtopolis + HASHTOPOLIS_DB_PASS: hashtopolis + HASHTOPOLIS_DB_HOST: hashtopolis-db-dev + HASHTOPOLIS_DB_DATABASE: hashtopolis + HASHTOPOLIS_APIV2_ENABLE: 1 + depends_on: + - hashtopolis-db-dev + ports: + - "8080:80" + volumes: + - hashtopolis-server-dev:/usr/local/share/hashtopolis:Z + networks: + - hashtopolis_dev + hashtopolis-db-dev: + container_name: hashtopolis-db-dev + image: mysql:8.0 + restart: always + ports: + - "3306:3306" + volumes: + - hashtopolis-db-dev:/var/lib/mysql + environment: + MYSQL_ROOT_PASSWORD: hashtopolis + MYSQL_DATABASE: hashtopolis + MYSQL_USER: hashtopolis + MYSQL_PASSWORD: hashtopolis + networks: + - hashtopolis_dev +volumes: + hashtopolis-db-dev: + hashtopolis-server-dev: + +networks: + hashtopolis_dev: + name: hashtopolis_dev diff --git a/.github/docker-compose.postgres.yml b/.github/docker-compose.postgres.yml new file mode 100644 index 000000000..b4c53d290 --- /dev/null +++ b/.github/docker-compose.postgres.yml @@ -0,0 +1,47 @@ +version: "3.7" +services: + hashtopolis-server-dev: + container_name: hashtopolis-server-dev + build: + context: .. + target: hashtopolis-server-dev + args: + - CONTAINER_USER_CMD_PRE + - CONTAINER_USER_CMD_POST + environment: + HASHTOPOLIS_DB_TYPE: postgres + HASHTOPOLIS_DB_USER: hashtopolis + HASHTOPOLIS_DB_PASS: hashtopolis + HASHTOPOLIS_DB_HOST: hashtopolis-db-dev + HASHTOPOLIS_DB_DATABASE: hashtopolis + HASHTOPOLIS_APIV2_ENABLE: 1 + depends_on: + - hashtopolis-db-dev + ports: + - "8080:80" + volumes: + - hashtopolis-server-dev:/usr/local/share/hashtopolis:Z + networks: + - hashtopolis_dev + hashtopolis-db-dev: + container_name: hashtopolis-db-dev + image: postgres:13 + restart: always + ports: + - "5432:5432" + volumes: + - hashtopolis-db-dev:/var/lib/postgresql/data + environment: + POSTGRES_DB: hashtopolis + POSTGRES_USER: hashtopolis + POSTGRES_PASSWORD: hashtopolis + networks: + - hashtopolis_dev + +volumes: + hashtopolis-db-dev: + hashtopolis-server-dev: + +networks: + hashtopolis_dev: + name: hashtopolis_dev diff --git a/ci/apiv2/hashtopolis-test-defaults.yaml b/ci/apiv2/hashtopolis-test-defaults.yaml index 1b0a7eb66..d24a95c4b 100644 --- a/ci/apiv2/hashtopolis-test-defaults.yaml +++ b/ci/apiv2/hashtopolis-test-defaults.yaml @@ -1,3 +1,3 @@ -hashtopolis_uri: 'http://localhost:80' +hashtopolis_uri: 'http://localhost:8080' username: 'admin' password: 'hashtopolis' diff --git a/docker-compose.mysql.yml b/docker-compose.mysql.yml index 416f5290b..03010d489 100644 --- a/docker-compose.mysql.yml +++ b/docker-compose.mysql.yml @@ -15,7 +15,7 @@ services: HASHTOPOLIS_DB_DATABASE: $MYSQL_DATABASE HASHTOPOLIS_ADMIN_USER: $HASHTOPOLIS_ADMIN_USER HASHTOPOLIS_ADMIN_PASSWORD: $HASHTOPOLIS_ADMIN_PASSWORD - HASHTOPOLIS_APIV2_ENABLE: $HASHTOPOLIS_APIV2_ENABLE + HASHTOPOLIS_APIV2_ENABLE: $HASHTOPOLIS_APIV2_ENABLE HASHTOPOLIS_FRONTEND_URLS: $HASHTOPOLIS_FRONTEND_URLS depends_on: - db From 7861d4d775662cdcec64ad4d8e1857dea4cf243c Mon Sep 17 00:00:00 2001 From: Sein Coray Date: Sat, 29 Nov 2025 16:43:24 +0100 Subject: [PATCH 306/691] comment out unnecessary part --- .github/actions/start-hashtopolis/action.yml | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/.github/actions/start-hashtopolis/action.yml b/.github/actions/start-hashtopolis/action.yml index aed00868d..d7d180a14 100644 --- a/.github/actions/start-hashtopolis/action.yml +++ b/.github/actions/start-hashtopolis/action.yml @@ -14,9 +14,10 @@ runs: working-directory: .github run: docker compose -f docker-compose.${{ inputs.db_system }}.yml up -d shell: bash - - name: Install composer dependencies packages - run: docker exec hashtopolis-server-dev composer install --working-dir=/var/www/html/ - shell: bash +# should not be needed anymore as it is installed during build +# - name: Install composer dependencies packages +# run: docker exec hashtopolis-server-dev composer install --working-dir=/var/www/html/ +# shell: bash - name: Wait until entrypoint is finished and Hashtopolis is started run: bash .github/scripts/await-hashtopolis-startup.sh shell: bash From d2059a59d38a44ebe83ec67cdabc5274e5a720c0 Mon Sep 17 00:00:00 2001 From: Sein Coray Date: Sat, 29 Nov 2025 16:54:32 +0100 Subject: [PATCH 307/691] really only call upgrade on mysql setups --- src/inc/load.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/inc/load.php b/src/inc/load.php index 4e1ac868b..e2ac8502f 100755 --- a/src/inc/load.php +++ b/src/inc/load.php @@ -78,7 +78,7 @@ } // this only needs to be present for the very first upgrade from non-migration to migrations to make sure the last updates are executed before migration -if (!$initialSetup && !Util::databaseTableExists("_sqlx_migrations")) { +if (!$initialSetup && DBA_TYPE == "mysql" && !Util::databaseTableExists("_sqlx_migrations")) { include(dirname(__FILE__) . "/../install/updates/update.php"); } From b17e8cbbc4311256f3bae45a23dd99d4f1742ab1 Mon Sep 17 00:00:00 2001 From: Sein Coray Date: Sat, 29 Nov 2025 16:55:25 +0100 Subject: [PATCH 308/691] no manual init for test needed --- ci/HashtopolisTest.class.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/ci/HashtopolisTest.class.php b/ci/HashtopolisTest.class.php index 26d7d7968..1ed518c3f 100644 --- a/ci/HashtopolisTest.class.php +++ b/ci/HashtopolisTest.class.php @@ -70,7 +70,7 @@ public function init($version) { global $PEPPER, $VERSION; // drop old data and create empty DB - Factory::getAgentFactory()->getDB()->query("DROP DATABASE IF EXISTS hashtopolis"); + /*Factory::getAgentFactory()->getDB()->query("DROP DATABASE IF EXISTS hashtopolis"); Factory::getAgentFactory()->getDB()->query("CREATE DATABASE hashtopolis"); Factory::getAgentFactory()->getDB()->query("USE hashtopolis"); @@ -92,7 +92,7 @@ public function init($version) { $accessGroup = new AccessGroupUser(null, 1, $this->user->getId()); Factory::getAccessGroupUserFactory()->save($accessGroup); $this->apiKey = new ApiKey(null, 0, time() + 3600, 'mykey', 0, $this->user->getId(), 1); - $this->apiKey = Factory::getApiKeyFactory()->save($this->apiKey); + $this->apiKey = Factory::getApiKeyFactory()->save($this->apiKey);*/ // $versionStore = new StoredValue("version", ($version == 'master') ? explode("+", $VERSION)[0] : $version); // Factory::getStoredValueFactory()->save($versionStore); // $buildStore = new StoredValue("build", ($version == 'master') ? Util::getGitCommit(true) : $this->RELEASES[$version]); From 69e8372c57b0bf50d2ab3f05de1f19f5d89af97c Mon Sep 17 00:00:00 2001 From: Sein Coray Date: Sat, 29 Nov 2025 16:56:59 +0100 Subject: [PATCH 309/691] just only create api key, everything else should be created from basic setup --- ci/HashtopolisTest.class.php | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/ci/HashtopolisTest.class.php b/ci/HashtopolisTest.class.php index 1ed518c3f..fb59bf071 100644 --- a/ci/HashtopolisTest.class.php +++ b/ci/HashtopolisTest.class.php @@ -82,17 +82,17 @@ public function init($version) { Factory::getAgentFactory()->getDB()->query(file_get_contents(dirname(__FILE__) . "/files/db_" . $version . ".sql")); } - sleep(1); + sleep(1);*/ // insert user and api key - $salt = Util::randomString(30); + /*$salt = Util::randomString(30); $hash = Encryption::passwordHash(HashtopolisTest::USER_PASS, $salt); $this->user = new User(null, 'testuser', '', $hash, $salt, 1, 0, 0, 0, 3600, AccessUtils::getOrCreateDefaultAccessGroup()->getId(), 0, '', '', '', ''); $this->user = Factory::getUserFactory()->save($this->user); $accessGroup = new AccessGroupUser(null, 1, $this->user->getId()); - Factory::getAccessGroupUserFactory()->save($accessGroup); - $this->apiKey = new ApiKey(null, 0, time() + 3600, 'mykey', 0, $this->user->getId(), 1); - $this->apiKey = Factory::getApiKeyFactory()->save($this->apiKey);*/ + Factory::getAccessGroupUserFactory()->save($accessGroup);*/ + $this->apiKey = new ApiKey(null, 0, time() + 3600, 'mykey', 0, 1, 1); + $this->apiKey = Factory::getApiKeyFactory()->save($this->apiKey); // $versionStore = new StoredValue("version", ($version == 'master') ? explode("+", $VERSION)[0] : $version); // Factory::getStoredValueFactory()->save($versionStore); // $buildStore = new StoredValue("build", ($version == 'master') ? Util::getGitCommit(true) : $this->RELEASES[$version]); From 05682a9cd4a4178918fd2689cf820bb29aef2d39 Mon Sep 17 00:00:00 2001 From: Sein Coray Date: Sat, 29 Nov 2025 17:09:39 +0100 Subject: [PATCH 310/691] set test user pass to default --- ci/HashtopolisTest.class.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ci/HashtopolisTest.class.php b/ci/HashtopolisTest.class.php index fb59bf071..76b321440 100644 --- a/ci/HashtopolisTest.class.php +++ b/ci/HashtopolisTest.class.php @@ -19,7 +19,7 @@ abstract class HashtopolisTest { protected $user; protected $apiKey; - const USER_PASS = "HG78Ghdfs87gh"; + const USER_PASS = "hashtopolis"; const RUN_FULL = 0; const RUN_FAST = 1; From 468456c7faabfcbeaad3b71a53023272cef8d110 Mon Sep 17 00:00:00 2001 From: Sein Coray Date: Sat, 29 Nov 2025 17:10:27 +0100 Subject: [PATCH 311/691] reversed hashtopolis test parameters to default --- ci/apiv2/hashtopolis-test-defaults.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ci/apiv2/hashtopolis-test-defaults.yaml b/ci/apiv2/hashtopolis-test-defaults.yaml index d24a95c4b..1b0a7eb66 100644 --- a/ci/apiv2/hashtopolis-test-defaults.yaml +++ b/ci/apiv2/hashtopolis-test-defaults.yaml @@ -1,3 +1,3 @@ -hashtopolis_uri: 'http://localhost:8080' +hashtopolis_uri: 'http://localhost:80' username: 'admin' password: 'hashtopolis' From 342cc1b031e247ace3527d393c50901c0be4d864 Mon Sep 17 00:00:00 2001 From: Sein Coray Date: Sat, 29 Nov 2025 17:17:49 +0100 Subject: [PATCH 312/691] create additional access group on tests --- ci/HashtopolisTest.class.php | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/ci/HashtopolisTest.class.php b/ci/HashtopolisTest.class.php index 76b321440..40d1ee5cf 100644 --- a/ci/HashtopolisTest.class.php +++ b/ci/HashtopolisTest.class.php @@ -88,9 +88,9 @@ public function init($version) { /*$salt = Util::randomString(30); $hash = Encryption::passwordHash(HashtopolisTest::USER_PASS, $salt); $this->user = new User(null, 'testuser', '', $hash, $salt, 1, 0, 0, 0, 3600, AccessUtils::getOrCreateDefaultAccessGroup()->getId(), 0, '', '', '', ''); - $this->user = Factory::getUserFactory()->save($this->user); - $accessGroup = new AccessGroupUser(null, 1, $this->user->getId()); - Factory::getAccessGroupUserFactory()->save($accessGroup);*/ + $this->user = Factory::getUserFactory()->save($this->user);*/ + $accessGroup = new AccessGroupUser(null, 1, 1); + Factory::getAccessGroupUserFactory()->save($accessGroup); $this->apiKey = new ApiKey(null, 0, time() + 3600, 'mykey', 0, 1, 1); $this->apiKey = Factory::getApiKeyFactory()->save($this->apiKey); // $versionStore = new StoredValue("version", ($version == 'master') ? explode("+", $VERSION)[0] : $version); From 19d5453f1ceea767f8c874213adc640b2232c06f Mon Sep 17 00:00:00 2001 From: Sein Coray Date: Sat, 29 Nov 2025 17:26:12 +0100 Subject: [PATCH 313/691] avoid creating multiple relations --- ci/HashtopolisTest.class.php | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/ci/HashtopolisTest.class.php b/ci/HashtopolisTest.class.php index 40d1ee5cf..87d3f7b16 100644 --- a/ci/HashtopolisTest.class.php +++ b/ci/HashtopolisTest.class.php @@ -89,8 +89,7 @@ public function init($version) { $hash = Encryption::passwordHash(HashtopolisTest::USER_PASS, $salt); $this->user = new User(null, 'testuser', '', $hash, $salt, 1, 0, 0, 0, 3600, AccessUtils::getOrCreateDefaultAccessGroup()->getId(), 0, '', '', '', ''); $this->user = Factory::getUserFactory()->save($this->user);*/ - $accessGroup = new AccessGroupUser(null, 1, 1); - Factory::getAccessGroupUserFactory()->save($accessGroup); + AccessUtils::getOrCreateDefaultAccessGroup(); $this->apiKey = new ApiKey(null, 0, time() + 3600, 'mykey', 0, 1, 1); $this->apiKey = Factory::getApiKeyFactory()->save($this->apiKey); // $versionStore = new StoredValue("version", ($version == 'master') ? explode("+", $VERSION)[0] : $version); From e6c0e9841a20fc0b0fae3181a226d3afcc5c54d2 Mon Sep 17 00:00:00 2001 From: Sein Coray Date: Sat, 29 Nov 2025 17:35:45 +0100 Subject: [PATCH 314/691] deactivate legacy tests for now --- .github/workflows/ci.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 8ddd46e12..02a3260ff 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -27,9 +27,9 @@ jobs: db_system: ${{ matrix.db_system }} - name: Give Apache permissions on necessary directories # for the tests, only src/files and src/inc/utils/locks seem necessary run: docker exec -u root hashtopolis-server-dev bash -c "chown -R www-data:www-data /var/www/html/src && chmod -R g+w /var/www/html/src" - - name: Run test suite - if: ${{ matrix.db_system == 'mysql' }} # the legacy is only supposed to work with mysql - run: docker exec hashtopolis-server-dev php /var/www/html/ci/run.php -vmaster +# - name: Run test suite +# if: ${{ matrix.db_system == 'mysql' }} # the legacy is only supposed to work with mysql +# run: docker exec hashtopolis-server-dev php /var/www/html/ci/run.php -vmaster - name: Test with pytest run: docker exec hashtopolis-server-dev pytest /var/www/html/ci/apiv2 - name: Test if pytest is removing all test objects From d6444f1261ea83d1f5034cd6a2d08696a5d53e63 Mon Sep 17 00:00:00 2001 From: jessevz Date: Mon, 1 Dec 2025 10:27:21 +0100 Subject: [PATCH 315/691] Ignore OPTIONS request to validate with JWT (#1796) Co-authored-by: jessevz --- src/api/v2/index.php | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/src/api/v2/index.php b/src/api/v2/index.php index 2eb515c84..535c5e919 100644 --- a/src/api/v2/index.php +++ b/src/api/v2/index.php @@ -54,6 +54,7 @@ use DBA\User; use DBA\Factory; use JimTools\JwtAuth\Handlers\BeforeHandlerInterface; +use JimTools\JwtAuth\Rules\RequestMethodRule; use JimTools\JwtAuth\Rules\RequestPathRule; use Psr\Http\Message\ServerRequestInterface; @@ -152,7 +153,8 @@ public function get($key): string { ); $rules = [ - new RequestPathRule(ignore: ["/api/v2/auth/token", "/api/v2/helper/resetUserPassword", "/api/v2/openapi.json"]) + new RequestPathRule(ignore: ["/api/v2/auth/token", "/api/v2/helper/resetUserPassword", "/api/v2/openapi.json"]), + new RequestMethodRule(ignore: ["OPTIONS"]) ]; return new JwtAuthentication($options, $decoder, $rules); }); @@ -207,9 +209,10 @@ public static function addCORSheaders(Request $request, $response) { $methods = $routingResults->getAllowedMethods(); $requestHeaders = $request->getHeaderLine('Access-Control-Request-Headers'); - if (getenv('HASHTOPOLIS_FRONTEND_URLS') !== false) { - if(in_array($request->getHeaderLine('HTTP_ORIGIN'), explode(',', getenv('HASHTOPOLIS_FRONTEND_URLS')), true)) { - $response = $response->withHeader('Access-Control-Allow-Origin', $request->getHeaderLine('HTTP_ORIGIN')); + $frontend_urls = getenv('HASHTOPOLIS_FRONTEND_URLS'); + if ($frontend_urls !== false) { + if(in_array($request->getHeaderLine('Origin'), explode(',', $frontend_urls), true)) { + $response = $response->withHeader('Access-Control-Allow-Origin', $request->getHeaderLine('Origin')); } else { error_log("CORS error: Allow-Origin doesn't match. Please make sure to include the used frontend in the .env file."); From 1ba1c0996a54a048f1874e23d39480ab140ac95f Mon Sep 17 00:00:00 2001 From: s3inlc Date: Mon, 1 Dec 2025 12:17:59 +0100 Subject: [PATCH 316/691] removed order filter default on sum and minmax filters --- src/dba/AbstractModelFactory.class.php | 24 ------------------------ 1 file changed, 24 deletions(-) diff --git a/src/dba/AbstractModelFactory.class.php b/src/dba/AbstractModelFactory.class.php index c576f2fa1..cd98eaf7d 100755 --- a/src/dba/AbstractModelFactory.class.php +++ b/src/dba/AbstractModelFactory.class.php @@ -427,18 +427,6 @@ public function minMaxFilter(array $options, string $sumColumn, string $op): mix $query .= $this->applyFilters($vals, $options['filter']); } - if (!array_key_exists("order", $options)) { - // Add a asc order on the primary keys as a standard - $oF = new OrderFilter($this->getNullObject()->getPrimaryKey(), "ASC"); - $orderOptions = array( - $oF - ); - $options['order'] = $orderOptions; - } - if (count($options['order']) != 0) { - $query .= $this->applyOrder($this->getOrders($options)); - } - $dbh = self::getDB(); $stmt = $dbh->prepare($query); $stmt->execute($vals); @@ -485,18 +473,6 @@ public function sumFilter($options, $sumColumn) { $query .= $this->applyFilters($vals, $options['filter']); } - if (!array_key_exists("order", $options)) { - // Add a asc order on the primary keys as a standard - $oF = new OrderFilter($this->getNullObject()->getPrimaryKey(), "ASC"); - $orderOptions = array( - $oF - ); - $options['order'] = $orderOptions; - } - if (count($options['order']) != 0) { - $query .= $this->applyOrder($this->getOrders($options)); - } - $dbh = self::getDB(); $stmt = $dbh->prepare($query); $stmt->execute($vals); From d029205f8c5867e7bbc061d58b26bf6303f06943 Mon Sep 17 00:00:00 2001 From: s3inlc Date: Mon, 1 Dec 2025 12:18:25 +0100 Subject: [PATCH 317/691] changed mysql specific LIKE BINARY to LIKE .. COLLATE C to achieve binary comparision --- src/dba/LikeFilter.class.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/dba/LikeFilter.class.php b/src/dba/LikeFilter.class.php index 8de40e3fd..ce68a82ac 100755 --- a/src/dba/LikeFilter.class.php +++ b/src/dba/LikeFilter.class.php @@ -36,7 +36,7 @@ function getQueryString(AbstractModelFactory $factory, bool $includeTable = fals $inv = " NOT"; } - return $table . AbstractModelFactory::getMappedModelKey($factory->getNullObject(), $this->key) . $inv . " LIKE BINARY ?"; + return $table . AbstractModelFactory::getMappedModelKey($factory->getNullObject(), $this->key) . $inv . " LIKE ? COLLATE \"C\""; } function getValue() { From 7103ac92282e442b274562a19e839a0c5e10fcfa Mon Sep 17 00:00:00 2001 From: s3inlc Date: Mon, 1 Dec 2025 13:28:15 +0100 Subject: [PATCH 318/691] differ between mysql and postgres in this very specific case of like comparision --- src/dba/LikeFilter.class.php | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/src/dba/LikeFilter.class.php b/src/dba/LikeFilter.class.php index ce68a82ac..0c4413652 100755 --- a/src/dba/LikeFilter.class.php +++ b/src/dba/LikeFilter.class.php @@ -36,7 +36,12 @@ function getQueryString(AbstractModelFactory $factory, bool $includeTable = fals $inv = " NOT"; } - return $table . AbstractModelFactory::getMappedModelKey($factory->getNullObject(), $this->key) . $inv . " LIKE ? COLLATE \"C\""; + // it is not ideal to have to make a distinction between the DB types here, but currently there does not seem to be another solution to achieve real case-sensitive like filtering + $likeStatement = " BINARY LIKE ?"; + if (DBA_TYPE == 'postgres') { + $likeStatement = " LIKE ? COLLATE \"C\""; + } + return $table . AbstractModelFactory::getMappedModelKey($factory->getNullObject(), $this->key) . $inv . $likeStatement; } function getValue() { From f124259cfe4ef73cc07cdfe832aa45c23ef053bc Mon Sep 17 00:00:00 2001 From: s3inlc Date: Mon, 1 Dec 2025 14:35:15 +0100 Subject: [PATCH 319/691] make the default access group created on migration to avoid primary key sequence issues --- src/inc/utils/AccessUtils.class.php | 1 + src/install/updates/update_v1.0.0-rainbow4_vx.x.x.php | 2 +- src/migrations/mysql/20251127000000_initial.sql | 6 +++++- src/migrations/postgres/20251127000000_initial.sql | 3 +++ 4 files changed, 10 insertions(+), 2 deletions(-) diff --git a/src/inc/utils/AccessUtils.class.php b/src/inc/utils/AccessUtils.class.php index a1db60d7d..1b3989ed8 100644 --- a/src/inc/utils/AccessUtils.class.php +++ b/src/inc/utils/AccessUtils.class.php @@ -164,6 +164,7 @@ public static function getAccessGroupsOfAgent(Agent $agent): array { public static function getOrCreateDefaultAccessGroup() { $accessGroup = Factory::getAccessGroupFactory()->get(1); if ($accessGroup == null) { + // this should never happen anymore (unless someone deleted access group with ID 1) $accessGroup = new AccessGroup(1, "Default Group"); $accessGroup = Factory::getAccessGroupFactory()->save($accessGroup); } diff --git a/src/install/updates/update_v1.0.0-rainbow4_vx.x.x.php b/src/install/updates/update_v1.0.0-rainbow4_vx.x.x.php index 45bd0ccc5..29e278f86 100644 --- a/src/install/updates/update_v1.0.0-rainbow4_vx.x.x.php +++ b/src/install/updates/update_v1.0.0-rainbow4_vx.x.x.php @@ -25,7 +25,7 @@ if (!Util::databaseTableExists("_sqlx_migrations")) { // this creates the existing state for sqlx to continue with migrations for all further updates Factory::getAgentFactory()->getDB()->query("CREATE TABLE `_sqlx_migrations` (`version` bigint NOT NULL, `description` text NOT NULL, `installed_on` timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP, `success` tinyint(1) NOT NULL, `checksum` blob NOT NULL, `execution_time` bigint NOT NULL, PRIMARY KEY (`version`)) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_0900_ai_ci;"); - Factory::getAgentFactory()->getDB()->query("INSERT INTO `_sqlx_migrations` VALUES (20251127000000,'initial','2025-11-28 14:29:13',1,0x22F3A0D84CF66E9694946A244FBC19B314F0EA85B9B5C66A3C2BB67EE365AA78D025D9C90FBCCE8E4896FD20988A6740,1);"); + Factory::getAgentFactory()->getDB()->query("INSERT INTO `_sqlx_migrations` VALUES (20251127000000,'initial','2025-11-28 14:29:13',1,0xA5A8F03AAD0827C86C4A380D935BF1CCB3B5D5F174D7FC40B3D267FD0B6BB7DD4181A9C25EFC5CFCE24DF760F4C2D881,1);"); } $EXECUTED["v1.0.0-rainbow4_migration_to_migrations"] = true; } diff --git a/src/migrations/mysql/20251127000000_initial.sql b/src/migrations/mysql/20251127000000_initial.sql index c70d4ddb0..3e0f0dfba 100644 --- a/src/migrations/mysql/20251127000000_initial.sql +++ b/src/migrations/mysql/20251127000000_initial.sql @@ -12,6 +12,9 @@ CREATE TABLE IF NOT EXISTS `AccessGroup` ( `groupName` VARCHAR(50) NOT NULL ) ENGINE = InnoDB; +INSERT INTO `AccessGroup` (`accessGroupId`, `groupName`) VALUES + (1, 'Default Group'); + CREATE TABLE IF NOT EXISTS `AccessGroupAgent` ( `accessGroupAgentId` INT(11) NOT NULL, `accessGroupId` INT(11) NOT NULL, @@ -1272,7 +1275,8 @@ ALTER TABLE `Preprocessor` -- Add AUTO_INCREMENT for tables ALTER TABLE `AccessGroup` - MODIFY `accessGroupId` INT(11) NOT NULL AUTO_INCREMENT; + MODIFY `accessGroupId` INT(11) NOT NULL AUTO_INCREMENT, + AUTO_INCREMENT = 2; ALTER TABLE `AccessGroupAgent` MODIFY `accessGroupAgentId` INT(11) NOT NULL AUTO_INCREMENT; diff --git a/src/migrations/postgres/20251127000000_initial.sql b/src/migrations/postgres/20251127000000_initial.sql index 8b6664d47..cfab4cf07 100644 --- a/src/migrations/postgres/20251127000000_initial.sql +++ b/src/migrations/postgres/20251127000000_initial.sql @@ -4,6 +4,9 @@ CREATE TABLE AccessGroup ( groupName TEXT NOT NULL ); +INSERT INTO AccessGroup (accessGroupId, groupName) VALUES + (1, 'Default Group'); + CREATE TABLE AccessGroupAgent ( accessGroupAgentId SERIAL NOT NULL PRIMARY KEY, accessGroupId INT NOT NULL, From 364ca92798c5b27166a8ef33c3144fa711d8bdf4 Mon Sep 17 00:00:00 2001 From: s3inlc Date: Mon, 1 Dec 2025 14:45:34 +0100 Subject: [PATCH 320/691] fixed order typo in like filter --- src/dba/LikeFilter.class.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/dba/LikeFilter.class.php b/src/dba/LikeFilter.class.php index 0c4413652..eedccaaf6 100755 --- a/src/dba/LikeFilter.class.php +++ b/src/dba/LikeFilter.class.php @@ -37,7 +37,7 @@ function getQueryString(AbstractModelFactory $factory, bool $includeTable = fals } // it is not ideal to have to make a distinction between the DB types here, but currently there does not seem to be another solution to achieve real case-sensitive like filtering - $likeStatement = " BINARY LIKE ?"; + $likeStatement = " LIKE BINARY ?"; if (DBA_TYPE == 'postgres') { $likeStatement = " LIKE ? COLLATE \"C\""; } From 7650aef16b23b4c75ea75e14d89be3dd8a623386 Mon Sep 17 00:00:00 2001 From: s3inlc Date: Mon, 1 Dec 2025 16:07:22 +0100 Subject: [PATCH 321/691] removed debug output --- src/dba/AbstractModelFactory.class.php | 1 - 1 file changed, 1 deletion(-) diff --git a/src/dba/AbstractModelFactory.class.php b/src/dba/AbstractModelFactory.class.php index cd98eaf7d..e78ced3ae 100755 --- a/src/dba/AbstractModelFactory.class.php +++ b/src/dba/AbstractModelFactory.class.php @@ -938,7 +938,6 @@ public function getDB(bool $test = false): ?PDO { return self::$dbh; } catch (PDOException $e) { - echo $e->getMessage()."\n"; if ($test) { return null; } From 7f74e6df056027acb8f622fc7c3c053abe59d7cf Mon Sep 17 00:00:00 2001 From: Sein Coray Date: Mon, 1 Dec 2025 16:34:41 +0100 Subject: [PATCH 322/691] Update src/dba/AbstractModelFactory.class.php Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com> --- src/dba/AbstractModelFactory.class.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/dba/AbstractModelFactory.class.php b/src/dba/AbstractModelFactory.class.php index e78ced3ae..c17de0893 100755 --- a/src/dba/AbstractModelFactory.class.php +++ b/src/dba/AbstractModelFactory.class.php @@ -906,7 +906,7 @@ public function getDB(bool $test = false): ?PDO { $dbHost = @DBA_SERVER; $dbPort = @DBA_PORT; $dbDB = @DBA_DB; - if ($test) { // if the connection is beeing tested, take credentials from legacy global variable + if ($test) { // if the connection is being tested, take credentials from legacy global variable global $CONN; $dbUser = $CONN['user']; $dbPass = $CONN['pass']; From b7e749f07e29c5e46523f33d23f8d6ba8f0e16be Mon Sep 17 00:00:00 2001 From: s3inlc Date: Tue, 2 Dec 2025 09:55:31 +0100 Subject: [PATCH 323/691] added options list to github action --- .github/actions/start-hashtopolis/action.yml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/.github/actions/start-hashtopolis/action.yml b/.github/actions/start-hashtopolis/action.yml index d7d180a14..8af48aa9b 100644 --- a/.github/actions/start-hashtopolis/action.yml +++ b/.github/actions/start-hashtopolis/action.yml @@ -6,6 +6,9 @@ inputs: description: "Used to set which DB system should be used" required: true default: "mysql" + options: + - "mysql" + - "postgres" runs: using: "composite" From c9ae11a2e47b5a181238a7073bc8add8ac091b1a Mon Sep 17 00:00:00 2001 From: s3inlc Date: Tue, 2 Dec 2025 10:37:49 +0100 Subject: [PATCH 324/691] test running old test suite with changes --- .github/workflows/ci.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 02a3260ff..8ddd46e12 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -27,9 +27,9 @@ jobs: db_system: ${{ matrix.db_system }} - name: Give Apache permissions on necessary directories # for the tests, only src/files and src/inc/utils/locks seem necessary run: docker exec -u root hashtopolis-server-dev bash -c "chown -R www-data:www-data /var/www/html/src && chmod -R g+w /var/www/html/src" -# - name: Run test suite -# if: ${{ matrix.db_system == 'mysql' }} # the legacy is only supposed to work with mysql -# run: docker exec hashtopolis-server-dev php /var/www/html/ci/run.php -vmaster + - name: Run test suite + if: ${{ matrix.db_system == 'mysql' }} # the legacy is only supposed to work with mysql + run: docker exec hashtopolis-server-dev php /var/www/html/ci/run.php -vmaster - name: Test with pytest run: docker exec hashtopolis-server-dev pytest /var/www/html/ci/apiv2 - name: Test if pytest is removing all test objects From 3c4df126c8b81a87d41b2999717f39a3e51cba64 Mon Sep 17 00:00:00 2001 From: s3inlc Date: Tue, 2 Dec 2025 11:01:25 +0100 Subject: [PATCH 325/691] definitely removing old legacy test in ci workflow --- .github/workflows/ci.yml | 3 --- 1 file changed, 3 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 8ddd46e12..22dbc4653 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -27,9 +27,6 @@ jobs: db_system: ${{ matrix.db_system }} - name: Give Apache permissions on necessary directories # for the tests, only src/files and src/inc/utils/locks seem necessary run: docker exec -u root hashtopolis-server-dev bash -c "chown -R www-data:www-data /var/www/html/src && chmod -R g+w /var/www/html/src" - - name: Run test suite - if: ${{ matrix.db_system == 'mysql' }} # the legacy is only supposed to work with mysql - run: docker exec hashtopolis-server-dev php /var/www/html/ci/run.php -vmaster - name: Test with pytest run: docker exec hashtopolis-server-dev pytest /var/www/html/ci/apiv2 - name: Test if pytest is removing all test objects From 6321130fd3c57a602149a299316afe10db8a9f1d Mon Sep 17 00:00:00 2001 From: jessevz Date: Tue, 2 Dec 2025 11:58:37 +0100 Subject: [PATCH 326/691] Fixed bug in legacy agentbinary update, by directly performing update logic in order to skip get() which result in bug --- src/inc/Util.class.php | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/src/inc/Util.class.php b/src/inc/Util.class.php index 9e7f4bca1..61c14e64e 100755 --- a/src/inc/Util.class.php +++ b/src/inc/Util.class.php @@ -216,7 +216,16 @@ public static function checkAgentVersionLegacy($type, $version, $silent = false) if (!$silent) { echo "update $type version... "; } - Factory::getAgentBinaryFactory()->set($binary, AgentBinary::VERSION, $version); + + $query = "UPDATE " . $agentBinaryFactory->getModelTable() . " SET " . AgentBinary::VERSION . "=?"; + + $values = []; + $query = $query . " WHERE " . $binary->getPrimaryKey() . "=?"; + $values[] = $version; + $values[] = $binary->getPrimaryKeyValue(); + + $stmt = $dbh->prepare($query); + $stmt->execute($values); if (!$silent) { echo "OK"; } From d0ae9871d961b48c14931d4844a8890de9c9201e Mon Sep 17 00:00:00 2001 From: s3inlc Date: Tue, 2 Dec 2025 13:37:41 +0100 Subject: [PATCH 327/691] restructure the tests slightly to improve overview --- ci/apiv2/DEBUGGING.md | 40 ++++ ci/apiv2/HACKING.md | 145 ------------- ci/apiv2/PERMISSIONS_REWORK.md | 194 ------------------ ci/apiv2/poc_openapi_perm_test.sh | 8 - ci/apiv2/test_openapi_permissions.sh | 8 + .../create_accessgroup_001.json | 0 .../create_accessgroup_002.json | 0 .../create_agentbinary_001.json | 0 .../{ => testfiles}/create_cracker_001.json | 0 .../{ => testfiles}/create_cracker_002.json | 0 .../create_crackertype_001.json | 0 .../create_crackertype_002.json | 0 ci/apiv2/{ => testfiles}/create_file_001.json | 0 .../{ => testfiles}/create_hashlist_001.json | 0 .../{ => testfiles}/create_hashlist_002.json | 0 .../{ => testfiles}/create_hashlist_003.json | 0 .../{ => testfiles}/create_hashtype_001.json | 0 .../create_healthcheck_001.json | 0 .../create_notification_001.json | 0 .../create_preprocessor_001.json | 0 .../{ => testfiles}/create_pretask_001.json | 0 ci/apiv2/testfiles/create_pretask_002.json | 15 ++ .../{ => testfiles}/create_pretask_003.json | 0 .../{ => testfiles}/create_supertask_001.json | 0 ci/apiv2/{ => testfiles}/create_task_001.json | 0 ci/apiv2/{ => testfiles}/create_task_002.json | 0 ci/apiv2/{ => testfiles}/create_task_003.json | 0 ci/apiv2/utils.py | 2 +- 28 files changed, 64 insertions(+), 348 deletions(-) create mode 100644 ci/apiv2/DEBUGGING.md delete mode 100644 ci/apiv2/HACKING.md delete mode 100644 ci/apiv2/PERMISSIONS_REWORK.md delete mode 100644 ci/apiv2/poc_openapi_perm_test.sh create mode 100644 ci/apiv2/test_openapi_permissions.sh rename ci/apiv2/{ => testfiles}/create_accessgroup_001.json (100%) rename ci/apiv2/{ => testfiles}/create_accessgroup_002.json (100%) rename ci/apiv2/{ => testfiles}/create_agentbinary_001.json (100%) rename ci/apiv2/{ => testfiles}/create_cracker_001.json (100%) rename ci/apiv2/{ => testfiles}/create_cracker_002.json (100%) rename ci/apiv2/{ => testfiles}/create_crackertype_001.json (100%) rename ci/apiv2/{ => testfiles}/create_crackertype_002.json (100%) rename ci/apiv2/{ => testfiles}/create_file_001.json (100%) rename ci/apiv2/{ => testfiles}/create_hashlist_001.json (100%) rename ci/apiv2/{ => testfiles}/create_hashlist_002.json (100%) rename ci/apiv2/{ => testfiles}/create_hashlist_003.json (100%) rename ci/apiv2/{ => testfiles}/create_hashtype_001.json (100%) rename ci/apiv2/{ => testfiles}/create_healthcheck_001.json (100%) rename ci/apiv2/{ => testfiles}/create_notification_001.json (100%) rename ci/apiv2/{ => testfiles}/create_preprocessor_001.json (100%) rename ci/apiv2/{ => testfiles}/create_pretask_001.json (100%) create mode 100644 ci/apiv2/testfiles/create_pretask_002.json rename ci/apiv2/{ => testfiles}/create_pretask_003.json (100%) rename ci/apiv2/{ => testfiles}/create_supertask_001.json (100%) rename ci/apiv2/{ => testfiles}/create_task_001.json (100%) rename ci/apiv2/{ => testfiles}/create_task_002.json (100%) rename ci/apiv2/{ => testfiles}/create_task_003.json (100%) diff --git a/ci/apiv2/DEBUGGING.md b/ci/apiv2/DEBUGGING.md new file mode 100644 index 000000000..2c83a5725 --- /dev/null +++ b/ci/apiv2/DEBUGGING.md @@ -0,0 +1,40 @@ +#### Examples + +Common sequences of commands used in development setups + +Initialize token: +``` +TOKEN=$(curl -X POST --user admin:hashtopolis http://localhost:8080/api/v2/auth/token | jq -r .token) +``` + +Fetch object: +``` +curl --compressed --header "Authorization: Bearer $TOKEN" -g 'http://localhost:8080/api/v2/ui/hashtypes?page[size]=5' +``` + +Access database (MySQL): +``` +mysql -u $HASHTOPOLIS_DB_USER -p$HASHTOPOLIS_DB_PASS -h $HASHTOPOLIS_DB_HOST -D $HASHTOPOLIS_DB_DATABASE +``` + +Access database (PostgreSQL): +``` +psql -U${HASHTOPOLIS_DB_USER} -h${HASHTOPOLIS_DB_HOST} +``` + +Enable query logging: +``` +docker exec $(docker ps -aqf "ancestor=mysql:8.0") mysql -u root -phashtopolis -e "SET global log_output = 'FILE'; SET global general_log_file='/tmp/mysql_all.log'; SET global general_log = 1;" +docker exec $(docker ps -aqf "ancestor=mysql:8.0") tail -f /tmp/mysql_all.log +``` + +Shortcut for testing within development setup: +``` +cd ~/src/hashtopolis/server/ci/apiv2 +pytest --exitfirst --last-failed +``` + +Run a specific test from the terminal +``` +cd /var/www/html/ci/apiv2 && python3 -m pytest test_task.py::TaskTest::test_toggle_archive_task_supertask_type -v -s +``` diff --git a/ci/apiv2/HACKING.md b/ci/apiv2/HACKING.md deleted file mode 100644 index 2a2418fe9..000000000 --- a/ci/apiv2/HACKING.md +++ /dev/null @@ -1,145 +0,0 @@ -#### Examples -Common sequences of commands used in development setups - -Initilise token: -``` -TOKEN=$(curl -X POST --user admin:hashtopolis http://localhost:8080/api/v2/auth/token | jq -r .token) -``` - - -Fetch object: -``` -curl --compressed --header "Authorization: Bearer $TOKEN" -g 'http://localhost:8080/api/v2/ui/hashtypes?page[size]=5' -``` - -Access database: -``` -mysql -u $HASHTOPOLIS_DB_USER -p$HASHTOPOLIS_DB_PASS -h $HASHTOPOLIS_DB_HOST -D $HASHTOPOLIS_DB_DATABASE -``` - -Enable query logging: -``` -docker exec $(docker ps -aqf "ancestor=mysql:8.0") mysql -u root -phashtopolis -e "SET global log_output = 'FILE'; SET global general_log_file='/tmp/mysql_all.log'; SET global general_log = 1;" -docker exec $(docker ps -aqf "ancestor=mysql:8.0") tail -f /tmp/mysql_all.log -``` - -Shortcut for testing within development setup: -``` -cd ~/src/hashtopolis/server/ci/apiv2 -pytest --exitfirst --last-failed -``` -Run a specific test from the terminal -``` -cd /var/www/html/ci/apiv2 && python3 -m pytest test_task.py::TaskTest::test_toggle_archive_task_supertask_type -v -s -``` -### paper flipchart scribbles - -#### v2 beta - -# Items with '#' are (partially) implemented - -* /api/v2/ - * ./agent : for now aligning to the PHP-api - * ./auth : local OAuth provider - * ./ui : all queries for angular, cli etc. -# * ./agents [GET, POST] -# * ./{id} [GET, PATCH, DELETE] -# * ./{id}/healthchecks [GET, POST] -# * ./{id}/healthchecks/{id} [GET, (PATCH?,) DELETE] -# * ./{id}/healthcheckagents [GET, POST] -# * ./{id}/healthcheckagents/{id} [GET, (PATCH?,) DELETE] -# * ./agentstats [GET] -# * ./agentstats/${id} [DELETE] -# * ./agentbinaries [GET, POST] -# * ./agentbinaries/{id} [GET, PATCH, DELETE] -# * ./chunks [GET] -# * ./{id} [GET] - * ./{id}/abort [POST] - * ./{id}/reset [POST] -# * ./configs [GET, PATCH] - * ./recount-cracked [POST] - * ./rescan-files [POST] - * ./configsections [GET] -# * ./crackers [GET, POST] -# * ./{id} [GET, PATCH, DELETE] - * ./{id}/versions [GET, POST] - * ./{id}/versions/{id} [GET, DELETE, PATCH] - * ./fields [-] - * ./notification-types [GET] - * ./notification-triggers [GET] -# * ./files [GET, POST] -# * ./{id} [GET, PATCH, DELETE] -# * ./hashes [GET (output-format set in GET)] -# * ./{id} [GET (output-format set in GET)] -# * ./hashlists [GET, POST] -# * ./{id} [GET, PATCH, DELETE] - * ./{id}/add-cracked [POST] - * ./{id}/export-cracked [POST] -# * ./hashtypes [GET, POST] -# * ./{id} [GET, PATCH, DELETE] - * ./logs [GET] - * ./{id} [GET] -# * ./logentries [GET] -# * ./{id} [GET] -# * ./notifications [GET, POST] -# * ./{id} [GET, PATCH, ?DELETE?] - * ./notification-settings [GET, POST] - * ./{id} [GET, PATCH, DELETE] - * ./permissiongroups [GET, POST] - * ./{id} [GET, PATCH, DELETE] -# * ./preprocessors [GET, POST] -# * ./{id} [GET, PATCH, DELETE] - * ./pretaskgroup [GET, POST] - * ./{id} [GET, PATCH, DELETE] - * ./import/hcmask [POST] -# * ./pretasks [GET, POST] -# * ./{id} [GET, PATCH, DELETE] -# * ./superhashlists [GET, POST] -# * ./{id} [GET, PATCH, DELETE] - * ./taskgroups [GET] - * ./{tgid} [GET, PATCH, DELETE] - * ./{tgid}/set-toppriority [POST] -# * ./tasks [GET, POST] -# * ./{tid} [GET, PATCH, DELETE] - * ./{tid}/unassign-agents [POST] - * ./{tid}/assign-agents [POST] - * ./{tid}/reset [POST] - * ./{tid}/set-toppriority [POST] - * ./tests [-] - * ./connection [GET] - * ./access [GET] -# * ./tokens [GET, POST] -# * ./{tid} [GET, PATCH, DELETE] -# * ./users/ [GET, POST] -# * ./{id} [GET, PATCH, DELETE] -# * ./vouchers [GET, POST] -# * ./{id} [GET, PATCH, DELETE] - - -# * ./crackertypes [GET, POST] -# * ./{id} [GET, PATCH, DELETE] - - -# Type devs mapping static values (StatType), om generator (bvb DAgentStatsType) casten naar field types. - -#### abbreviations used - -* id - * an ID within the respective scope - -* tid - * taskId (used to differentiate from tgid) - -* tgid - * taskGroupId (used to differentiate from tid) - - -#### additional notes - -permissiongroups should be reflecting the following scopes: - * user (global) - * user (project) - * team (project) - * token - - diff --git a/ci/apiv2/PERMISSIONS_REWORK.md b/ci/apiv2/PERMISSIONS_REWORK.md deleted file mode 100644 index 1d96cd60c..000000000 --- a/ci/apiv2/PERMISSIONS_REWORK.md +++ /dev/null @@ -1,194 +0,0 @@ -Intro -===== -- Current Group API and User API are not consistant can compatible with each-other. -- Permissions seems very fine-grain e.g. set for certain action, request to make more generic. - - - -Suggestion -========== -4 Base groups - - VIEW: View/Search/Qeuery list of objects. View object details. - - CREATE: Create new object. - - MANAGE: Alter existing object. - - DELETE: Delete existing object. - -all set per API endpoint - - -Behaviour in dual-setup (old and new UI) ----------------------------------------- - - Option A: - - Changing (old) permissions will set new permissions if-and-only-if all required old permissions are set. - - Changing (new) permissions will set old permissions of this mapping. - - Option B: - - Yet-an-other-permission schema which only applies to the new UI. - - -Current permission scheme to new permission scheme mapping -========================================================== -Current permission scheme and in brackets the proposed new permissions layout - - -- Access Management (GUI - group) - - Can view Hashlists [VIEW_HASHLIST] - - Can manage hashlists [MANAGE_HASHLIST] - - Can create hashlists [CREATE_HASHLIST] - - Can create superhashlists [CREATE_SUPERHASHLIST] - - User can view cracked/uncracked hashes [VIEW_HASHES] - - Can view agents [VIEW_AGENTS] - - Can manage agents [MANAGE_AGENTS] - - Can create agents [CREATE_AGENTS] - - Can view tasks [VIEW_TASKS] - - Can run preconfigured tasks [CREATE_TASK] - - Can create/delete tasks [CREATE_TASK,DELETE_TASK] - - Can change tasks (set priority, rename, etc.) [CHANGE_TASK] - - Can view preconfigured tasks [VIEW_PERCONFIGURED_TASK] - - Can create/delete preconfigured tasks [CREATE_PRECONFIGURED_TASK] - - Can manage preconfigured tasks [MANAGE_PRECONFIGURED_TASK] - - Can view preconfigured supertasks [VIEW_PRECONFIGURED_SUPERTASK] - - Can create/delete supertasks [MANGE_SUPERTASK] - - Can manage preconfigured supertasks. [MANAGE_PRECONFIGURED_SUPERTASK] - - Can view files [VIEW_FILES] - - Can manage files [MANAGE_FILES, DELETE_FILES] - - Can add files [MANAGE_FILES] - - Can configure cracker binaries [MANGE_CRACKER_BINARIES] - - Can access server configuration [MANAGE_CONFIG] - - Can manage users [MANAGE_USERS] - - Can manage access groups. [MANAGE_GROUPS, MANAGE_PERMISSIONS] - - -- User API (API Management) - - Test - - Connection testing [VIEW_TEST] - - Verifying the API key and test if user has access to the API [VIEW_TEST] - - Agent - - Creating new vouchers [CREATE_VOUCHER] - - Get a list of available agent binaries [VIEW_AGENT_BINARIES] - - List existing vouchers [VIEW_VOUCHER] - - Delete an existing voucher [DELETE_VOUCHER] - - List all agents [VIEW_AGENTS] - - Get details about an agent [VIEW_AGENTS] - - Set an agent active/inactive [MANAGE_AGENTS] - - Change the owner of an agent [MANAGE_AGENTS] - - Set the name of an agent [MANAGE_AGENTS] - - Set if an agent is CPU only or not [MANAGE_AGENTS] - - Set extra flags for an agent [MANAGE_AGENTS] - - Set how errors from an agent should be handled [MANAGE_AGENTS] - - Set if an agent is trusted or not [MANAGE_AGENTS] - - Delete agents [DELETE_AGENTS] - - Task - - List all tasks [VIEW_TASKS] - - Get details of a task [VIEW_TASKS] - - List subtasks of a running supertask [VIEW_TASKS] - - Get details of a chunk [VIEW_CHUNKS] - - Retrieve all cracked hashes by a task [VIEW_HASHES] - - Create a new task [CREATE_TASKS] - - Run an existing preconfigured task with a hashlist [CREATE_TASKS] - - Run a configured supertask with a hashlist [CREATE_TASKS] - - Set the priority of a task [MANAGE_TASKS] - - Set task priority to the previous highest plus one hundred [MANAGE_TASKS] - - Set the priority of a supertask [MANAGE_TASKS] - - Set supertask priority to the previous highest plus one hundred [MANAGE_TASKS] - - Rename a task [MANAGE_TASKS] - - Set the color of a task [MANAGE_TASKS] - - Set if a task is CPU only or not [MANAGE_TASKS] - - Set if a task is small or not [MANAGE_TASKS] - - Set max agents for tasks [MANAGE_TASKS] - - Unassign an agent from a task [MANAGE_AGENTS] - - Assign agents to a task MANAGE_AGENTS] - - Delete a task [DELETE_TASKS] - - Purge a task [MANAGE_TASKS] - - Set the name of a supertask [MANAGE_SUPERTASKS] - - Delete a supertask [MANAGE_SUPERTASKS] - - Archive tasks [MANAGE_TASKS] - - Archive supertasks [MANAGE_SUPERTASKS] - - Pretask - - List all preconfigured tasks [VIEW_PRETASKS] - - Get details about a preconfigured task [VIEW_PRETASKS] - - Create preconfigured tasks [CREATE_PRETASKS] - - Set preconfigured tasks priorities [MANAGE_PRETASKS] - - Set max agents for a preconfigured task [MANAGE_PRETASKS] - - Rename preconfigured tasks [MANAGE_PRETASKS] - - Set the color of a preconfigured task [MANAGE_PRETASKS] - - Change the chunk size for a preconfigured task [MANAGE_PRETASKS] - - Set if a preconfigured task is CPU only or not [MANAGE_PRETASKS] - - Set if a preconfigured task is small or not [MANAGE_PRETASKS] - - Delete preconfigured tasks [DELETE_PRETASKS] - - Supertask - - List all supertasks [VIEW_SUPERTASKS] - - Get details of a supertask [VIEW_SUPERTASKS] - - Create a supertask [CREATE_SUPERTASKS] - - Import a supertask from masks [CREATE_SUPERTASKS] - - Rename a configured supertask [MANAGE_SUPERTASKS] - - Delete a supertask [DELETE_SUPERTASKS] - - Create supertask out base command with files [CREATE_SUPERTASKS] - - Hashlist - - List all hashlists [VIEW_HASHLISTS] - - Get details of a hashlist [VIEW_HASHLISTS] - - Create a new hashlist [CREATE_HASHLISTS] - - Rename hashlists [MANAGE_HASHLISTS] - - Set if a hashlist is secret or not [MANAGE_HASHLISTS] - - Query to archive/un-archie hashlist [MANAGE_HASHLISTS] - - Import cracked hashes [MANAGE_HASHLISTS] - - Export cracked hashes [VIEW_HASHES] - - Generate wordlist from founds [VIEW_HASHES] - - Export a left list of uncracked hashes - - Delete hashlists [DELETE_HASHLISTS] - - Query for specific hashes [VIEW_HASHES] - - Query cracked hashes of a hashlist [VIEW_HASHES] - - Superhashlist - - List all superhashlists [VIEW_SUPERHASHLISTS] - - Get details about a superhashlist [VIEW_SUPERHASHLISTS] - - Create superhashlists [CREATE_SUPERHASHLISTS] - - Delete superhashlists [DELETE_SUPERHASHLISTS] - - File - - List all files [VIEW_FILES] - - Get details of a file [VIEW_FILES] - - Add new files [CREATE_FILES] - - Rename files [MANAGE_FILES] - - Set if a file is secret or not [MANAGE_FILES] - - Delete files [DELETE_FILES] - - Change type of files [MANAGE_FILES] - - Cracker - - List all crackers [VIEW_CRACKERS] - - Get details of a cracker [VIEW_CRACKERS] - - Delete a specific version of a cracker [MANAGE_CRACKERS] - - Deleting crackers [DELETE_CRACKERS] - - Create new crackers [CREATE_CRACKERS] - - Add new cracker versions [MANAGE_CRACKERS] - - Update cracker versions [MANAGE_CRACKERS] - - Config - - List available sections in config [VIEW_CONFIGS] - - List config options of a given section [VIEW_CONFIGS] - - Get current value of a config [VIEW_CONFIGS] - - Change values of configs [MANAGE_CONFIGS] - - User - - List all users [VIEW_USERS] - - Get details of a user [VIEW_USERS] - - Create new users [CREATE_USERS] - - Disable a user account [MANAGE_USERS] - - Enable a user account [MANAGE_USERS] - - Set a user's password [MANAGE_USERS] - - Change the permission group for a user [MANAGE_USERS] - - Group - - List all groups [VIEW_GROUPS] - - Get details of a group [VIEW_GROUPS] - - Create new groups [CREATE_GROUPS] - - Abort all chunks dispatched to agents of this group [MANAGE_AGENTS] - - Delete groups [DELETE_GROUPS] - - Add agents to groups [MANAGE_AGENTS] - - Add users to groups [MANAGE_USERS] - - Remove agents from groups [MANAGE_AGENTS] - - Remove users from groups [MANAGE_USERS] - - Access - - List permission groups [VIEW_PERMISSIONS] - - Get details of a permission group [VIEW_PERMISSIONS] - - Create a new permission group [CREATE_PERMISSIONS] - - Delete permission groups [DELETE_PERMISSIONS] - - Update permissions of a group [MANAGE_PERMISSIONS] - - Account - - Get account information [MANAGE_USERS] - - Change email [MANAGE_USERS] - - Update session length [MANAGE_USERS] - - Change password [MANAGE_USERS] \ No newline at end of file diff --git a/ci/apiv2/poc_openapi_perm_test.sh b/ci/apiv2/poc_openapi_perm_test.sh deleted file mode 100644 index 05f9bb512..000000000 --- a/ci/apiv2/poc_openapi_perm_test.sh +++ /dev/null @@ -1,8 +0,0 @@ -#!/bin/sh -# -# PoC to use openapi.json for automated unit testing. This will test of 'GET' permission is available on all API listing endpoints' -# -for ENDPOINT in $(curl -s 'http://localhost:8080/api/v2/openapi.json' | jq -r '.paths | keys[]' | grep -v '}'); do - echo -n "$ENDPOINT..."; - curl --header "Content-Type: application/json" -X GET --header "Authorization: Bearer $TOKEN" "http://localhost:8080$ENDPOINT" -s -d '{}' | grep -q '403' && echo "FAIL" || echo "OK" -done diff --git a/ci/apiv2/test_openapi_permissions.sh b/ci/apiv2/test_openapi_permissions.sh new file mode 100644 index 000000000..837f462a5 --- /dev/null +++ b/ci/apiv2/test_openapi_permissions.sh @@ -0,0 +1,8 @@ +#!/bin/sh +# +# PoC to use openapi.json for automated unit testing. This will test of 'GET' permission is available on all API listing endpoints' +# +for ENDPOINT in $(curl -s 'http://localhost:8080/api/v2/openapi.json' | jq -r '.paths | keys[]' | grep -v '}'); do + echo -n "$ENDPOINT..."; + curl --header "Content-Type: application/json" -X GET --header "Authorization: Bearer $TOKEN" "http://localhost:8080$ENDPOINT" -s -d '{}' | grep -q '403' && echo "FAIL" || echo "OK" +done diff --git a/ci/apiv2/create_accessgroup_001.json b/ci/apiv2/testfiles/create_accessgroup_001.json similarity index 100% rename from ci/apiv2/create_accessgroup_001.json rename to ci/apiv2/testfiles/create_accessgroup_001.json diff --git a/ci/apiv2/create_accessgroup_002.json b/ci/apiv2/testfiles/create_accessgroup_002.json similarity index 100% rename from ci/apiv2/create_accessgroup_002.json rename to ci/apiv2/testfiles/create_accessgroup_002.json diff --git a/ci/apiv2/create_agentbinary_001.json b/ci/apiv2/testfiles/create_agentbinary_001.json similarity index 100% rename from ci/apiv2/create_agentbinary_001.json rename to ci/apiv2/testfiles/create_agentbinary_001.json diff --git a/ci/apiv2/create_cracker_001.json b/ci/apiv2/testfiles/create_cracker_001.json similarity index 100% rename from ci/apiv2/create_cracker_001.json rename to ci/apiv2/testfiles/create_cracker_001.json diff --git a/ci/apiv2/create_cracker_002.json b/ci/apiv2/testfiles/create_cracker_002.json similarity index 100% rename from ci/apiv2/create_cracker_002.json rename to ci/apiv2/testfiles/create_cracker_002.json diff --git a/ci/apiv2/create_crackertype_001.json b/ci/apiv2/testfiles/create_crackertype_001.json similarity index 100% rename from ci/apiv2/create_crackertype_001.json rename to ci/apiv2/testfiles/create_crackertype_001.json diff --git a/ci/apiv2/create_crackertype_002.json b/ci/apiv2/testfiles/create_crackertype_002.json similarity index 100% rename from ci/apiv2/create_crackertype_002.json rename to ci/apiv2/testfiles/create_crackertype_002.json diff --git a/ci/apiv2/create_file_001.json b/ci/apiv2/testfiles/create_file_001.json similarity index 100% rename from ci/apiv2/create_file_001.json rename to ci/apiv2/testfiles/create_file_001.json diff --git a/ci/apiv2/create_hashlist_001.json b/ci/apiv2/testfiles/create_hashlist_001.json similarity index 100% rename from ci/apiv2/create_hashlist_001.json rename to ci/apiv2/testfiles/create_hashlist_001.json diff --git a/ci/apiv2/create_hashlist_002.json b/ci/apiv2/testfiles/create_hashlist_002.json similarity index 100% rename from ci/apiv2/create_hashlist_002.json rename to ci/apiv2/testfiles/create_hashlist_002.json diff --git a/ci/apiv2/create_hashlist_003.json b/ci/apiv2/testfiles/create_hashlist_003.json similarity index 100% rename from ci/apiv2/create_hashlist_003.json rename to ci/apiv2/testfiles/create_hashlist_003.json diff --git a/ci/apiv2/create_hashtype_001.json b/ci/apiv2/testfiles/create_hashtype_001.json similarity index 100% rename from ci/apiv2/create_hashtype_001.json rename to ci/apiv2/testfiles/create_hashtype_001.json diff --git a/ci/apiv2/create_healthcheck_001.json b/ci/apiv2/testfiles/create_healthcheck_001.json similarity index 100% rename from ci/apiv2/create_healthcheck_001.json rename to ci/apiv2/testfiles/create_healthcheck_001.json diff --git a/ci/apiv2/create_notification_001.json b/ci/apiv2/testfiles/create_notification_001.json similarity index 100% rename from ci/apiv2/create_notification_001.json rename to ci/apiv2/testfiles/create_notification_001.json diff --git a/ci/apiv2/create_preprocessor_001.json b/ci/apiv2/testfiles/create_preprocessor_001.json similarity index 100% rename from ci/apiv2/create_preprocessor_001.json rename to ci/apiv2/testfiles/create_preprocessor_001.json diff --git a/ci/apiv2/create_pretask_001.json b/ci/apiv2/testfiles/create_pretask_001.json similarity index 100% rename from ci/apiv2/create_pretask_001.json rename to ci/apiv2/testfiles/create_pretask_001.json diff --git a/ci/apiv2/testfiles/create_pretask_002.json b/ci/apiv2/testfiles/create_pretask_002.json new file mode 100644 index 000000000..f497939bd --- /dev/null +++ b/ci/apiv2/testfiles/create_pretask_002.json @@ -0,0 +1,15 @@ +{ + "taskName": "Example - create_pretasks_001", + "attackCmd": "-a3 ?l?l?l?l?l", + "chunkTime": 600, + "statusTimer": 700, + "color": "7C6EFF", + "isSmall": true, + "isCpuTask": true, + "useNewBench": true, + "priority": 10, + "maxAgents": 10, + "isMaskImport": false, + "crackerBinaryTypeId": 1, + "files": [] +} diff --git a/ci/apiv2/create_pretask_003.json b/ci/apiv2/testfiles/create_pretask_003.json similarity index 100% rename from ci/apiv2/create_pretask_003.json rename to ci/apiv2/testfiles/create_pretask_003.json diff --git a/ci/apiv2/create_supertask_001.json b/ci/apiv2/testfiles/create_supertask_001.json similarity index 100% rename from ci/apiv2/create_supertask_001.json rename to ci/apiv2/testfiles/create_supertask_001.json diff --git a/ci/apiv2/create_task_001.json b/ci/apiv2/testfiles/create_task_001.json similarity index 100% rename from ci/apiv2/create_task_001.json rename to ci/apiv2/testfiles/create_task_001.json diff --git a/ci/apiv2/create_task_002.json b/ci/apiv2/testfiles/create_task_002.json similarity index 100% rename from ci/apiv2/create_task_002.json rename to ci/apiv2/testfiles/create_task_002.json diff --git a/ci/apiv2/create_task_003.json b/ci/apiv2/testfiles/create_task_003.json similarity index 100% rename from ci/apiv2/create_task_003.json rename to ci/apiv2/testfiles/create_task_003.json diff --git a/ci/apiv2/utils.py b/ci/apiv2/utils.py index 9467ddd3e..48da1431a 100644 --- a/ci/apiv2/utils.py +++ b/ci/apiv2/utils.py @@ -37,7 +37,7 @@ def _do_create_obj_from_file(model_class, file_prefix, extra_payload={}, **kwargs): file_id = kwargs.get('file_id') or '001' - p = Path(__file__).parent.joinpath(f'{file_prefix}_{file_id}.json') + p = Path(__file__).parent.joinpath(f'testfiles/{file_prefix}_{file_id}.json') payload = json.loads(p.read_text('UTF-8')) final_payload = {**payload, **extra_payload} obj = model_class(**final_payload) From 83d012090f650b1e2a119fadbae12c6109d414e3 Mon Sep 17 00:00:00 2001 From: s3inlc Date: Tue, 2 Dec 2025 14:06:00 +0100 Subject: [PATCH 328/691] structured all json files into further subdirs to have them tied to their models to keep overview with more new test files added, for example added further tests for pretask --- ci/apiv2/test_pretask.py | 38 +++++++++++++++++-- ci/apiv2/test_supertask.py | 2 +- .../create_accessgroup_001.json | 0 .../create_accessgroup_002.json | 0 .../create_agentbinary_001.json | 0 .../{ => cracker}/create_cracker_001.json | 0 .../{ => cracker}/create_cracker_002.json | 0 .../create_crackertype_001.json | 0 .../create_crackertype_002.json | 0 .../testfiles/{ => file}/create_file_001.json | 0 .../{ => hashlist}/create_hashlist_001.json | 0 .../{ => hashlist}/create_hashlist_002.json | 0 .../{ => hashlist}/create_hashlist_003.json | 0 .../{ => hashtype}/create_hashtype_001.json | 0 .../create_healthcheck_001.json | 0 .../create_notification_001.json | 0 .../create_preprocessor_001.json | 0 .../{ => pretask}/create_pretask_001.json | 0 .../create_pretask_002.json} | 0 .../create_pretask_chunk_negative.json | 15 ++++++++ .../pretask/create_pretask_chunk_zero.json | 15 ++++++++ .../create_pretask_inv_attackcmd.json} | 0 .../pretask/create_pretask_inv_name.json | 15 ++++++++ .../{ => supertask}/create_supertask_001.json | 0 .../testfiles/{ => task}/create_task_001.json | 0 .../testfiles/{ => task}/create_task_002.json | 0 .../testfiles/{ => task}/create_task_003.json | 0 ci/apiv2/utils.py | 2 +- 28 files changed, 81 insertions(+), 6 deletions(-) rename ci/apiv2/testfiles/{ => accessgroup}/create_accessgroup_001.json (100%) rename ci/apiv2/testfiles/{ => accessgroup}/create_accessgroup_002.json (100%) rename ci/apiv2/testfiles/{ => agentbinary}/create_agentbinary_001.json (100%) rename ci/apiv2/testfiles/{ => cracker}/create_cracker_001.json (100%) rename ci/apiv2/testfiles/{ => cracker}/create_cracker_002.json (100%) rename ci/apiv2/testfiles/{ => crackertype}/create_crackertype_001.json (100%) rename ci/apiv2/testfiles/{ => crackertype}/create_crackertype_002.json (100%) rename ci/apiv2/testfiles/{ => file}/create_file_001.json (100%) rename ci/apiv2/testfiles/{ => hashlist}/create_hashlist_001.json (100%) rename ci/apiv2/testfiles/{ => hashlist}/create_hashlist_002.json (100%) rename ci/apiv2/testfiles/{ => hashlist}/create_hashlist_003.json (100%) rename ci/apiv2/testfiles/{ => hashtype}/create_hashtype_001.json (100%) rename ci/apiv2/testfiles/{ => healthcheck}/create_healthcheck_001.json (100%) rename ci/apiv2/testfiles/{ => notification}/create_notification_001.json (100%) rename ci/apiv2/testfiles/{ => preprocessor}/create_preprocessor_001.json (100%) rename ci/apiv2/testfiles/{ => pretask}/create_pretask_001.json (100%) rename ci/apiv2/testfiles/{create_pretask_003.json => pretask/create_pretask_002.json} (100%) create mode 100644 ci/apiv2/testfiles/pretask/create_pretask_chunk_negative.json create mode 100644 ci/apiv2/testfiles/pretask/create_pretask_chunk_zero.json rename ci/apiv2/testfiles/{create_pretask_002.json => pretask/create_pretask_inv_attackcmd.json} (100%) create mode 100644 ci/apiv2/testfiles/pretask/create_pretask_inv_name.json rename ci/apiv2/testfiles/{ => supertask}/create_supertask_001.json (100%) rename ci/apiv2/testfiles/{ => task}/create_task_001.json (100%) rename ci/apiv2/testfiles/{ => task}/create_task_002.json (100%) rename ci/apiv2/testfiles/{ => task}/create_task_003.json (100%) diff --git a/ci/apiv2/test_pretask.py b/ci/apiv2/test_pretask.py index 5bbf2aab3..16b49a251 100644 --- a/ci/apiv2/test_pretask.py +++ b/ci/apiv2/test_pretask.py @@ -1,5 +1,5 @@ -from hashtopolis import Pretask -from utils import BaseTest +from hashtopolis import Pretask, HashtopolisError +from utils import BaseTest,do_create_pretask class PretaskTest(BaseTest): @@ -16,6 +16,14 @@ def test_patch(self): model_obj = self.create_test_object() self._test_patch(model_obj, 'taskName') + def test_patch_missing_alias(self): + model_obj = self.create_test_object() + model_obj.attackCmd = "-a 3 ?l?l?l" + with self.assertRaises(HashtopolisError) as e: + model_obj.save() + self.assertEqual(e.exception.status_code, 500) + self.assertEqual(e.exception.title, f"The attack command does not contain the hashlist alias!") + def test_delete(self): model_obj = self.create_test_object(delete=False) self._test_delete(model_obj) @@ -25,6 +33,28 @@ def test_expandables(self): expandables = ['pretaskFiles'] self._test_expandables(model_obj, expandables) - def test_create_pretask_alt(self): - model_obj = self.create_test_object(file_id='003') + def test_create_alt(self): + model_obj = self.create_test_object(file_id='002') + self._test_create(model_obj) + + def test_create_missing_alias(self): + with self.assertRaises(HashtopolisError) as e: + model_obj = self.create_test_object(file_id='inv_attackcmd') + self.assertEqual(e.exception.status_code, 400) + self.assertEqual(e.exception.title, "The attack command does not contain the hashlist alias!") + + def test_create_empty_name(self): + with self.assertRaises(HashtopolisError) as e: + model_obj = self.create_test_object(file_id='inv_name') + self.assertEqual(e.exception.status_code, 400) + self.assertEqual(e.exception.title, "Name cannot be empty!") + + def test_create_chunktime_zero(self): + model_obj = self.create_test_object(file_id='chunk_zero') + self._test_create(model_obj) + self.assertGreater(model_obj.chunkTime, 0) + + def test_create_chunktime_negative(self): + model_obj = self.create_test_object(file_id='chunk_negative') self._test_create(model_obj) + self.assertGreater(model_obj.chunkTime, 0) diff --git a/ci/apiv2/test_supertask.py b/ci/apiv2/test_supertask.py index ac8874bea..395f58710 100644 --- a/ci/apiv2/test_supertask.py +++ b/ci/apiv2/test_supertask.py @@ -31,7 +31,7 @@ def test_new_pretasks(self): # Quirk for expanding object to allow update to take place work_obj = Supertask.objects.prefetch_related('pretasks').get(pk=model_obj.id) - new_pretasks = [self.create_pretask(file_id="003") for i in range(2)] + new_pretasks = [self.create_pretask(file_id="002") for i in range(2)] selected_pretasks = [work_obj.pretasks_set[0], new_pretasks[1]] work_obj.pretasks_set = selected_pretasks work_obj.save() diff --git a/ci/apiv2/testfiles/create_accessgroup_001.json b/ci/apiv2/testfiles/accessgroup/create_accessgroup_001.json similarity index 100% rename from ci/apiv2/testfiles/create_accessgroup_001.json rename to ci/apiv2/testfiles/accessgroup/create_accessgroup_001.json diff --git a/ci/apiv2/testfiles/create_accessgroup_002.json b/ci/apiv2/testfiles/accessgroup/create_accessgroup_002.json similarity index 100% rename from ci/apiv2/testfiles/create_accessgroup_002.json rename to ci/apiv2/testfiles/accessgroup/create_accessgroup_002.json diff --git a/ci/apiv2/testfiles/create_agentbinary_001.json b/ci/apiv2/testfiles/agentbinary/create_agentbinary_001.json similarity index 100% rename from ci/apiv2/testfiles/create_agentbinary_001.json rename to ci/apiv2/testfiles/agentbinary/create_agentbinary_001.json diff --git a/ci/apiv2/testfiles/create_cracker_001.json b/ci/apiv2/testfiles/cracker/create_cracker_001.json similarity index 100% rename from ci/apiv2/testfiles/create_cracker_001.json rename to ci/apiv2/testfiles/cracker/create_cracker_001.json diff --git a/ci/apiv2/testfiles/create_cracker_002.json b/ci/apiv2/testfiles/cracker/create_cracker_002.json similarity index 100% rename from ci/apiv2/testfiles/create_cracker_002.json rename to ci/apiv2/testfiles/cracker/create_cracker_002.json diff --git a/ci/apiv2/testfiles/create_crackertype_001.json b/ci/apiv2/testfiles/crackertype/create_crackertype_001.json similarity index 100% rename from ci/apiv2/testfiles/create_crackertype_001.json rename to ci/apiv2/testfiles/crackertype/create_crackertype_001.json diff --git a/ci/apiv2/testfiles/create_crackertype_002.json b/ci/apiv2/testfiles/crackertype/create_crackertype_002.json similarity index 100% rename from ci/apiv2/testfiles/create_crackertype_002.json rename to ci/apiv2/testfiles/crackertype/create_crackertype_002.json diff --git a/ci/apiv2/testfiles/create_file_001.json b/ci/apiv2/testfiles/file/create_file_001.json similarity index 100% rename from ci/apiv2/testfiles/create_file_001.json rename to ci/apiv2/testfiles/file/create_file_001.json diff --git a/ci/apiv2/testfiles/create_hashlist_001.json b/ci/apiv2/testfiles/hashlist/create_hashlist_001.json similarity index 100% rename from ci/apiv2/testfiles/create_hashlist_001.json rename to ci/apiv2/testfiles/hashlist/create_hashlist_001.json diff --git a/ci/apiv2/testfiles/create_hashlist_002.json b/ci/apiv2/testfiles/hashlist/create_hashlist_002.json similarity index 100% rename from ci/apiv2/testfiles/create_hashlist_002.json rename to ci/apiv2/testfiles/hashlist/create_hashlist_002.json diff --git a/ci/apiv2/testfiles/create_hashlist_003.json b/ci/apiv2/testfiles/hashlist/create_hashlist_003.json similarity index 100% rename from ci/apiv2/testfiles/create_hashlist_003.json rename to ci/apiv2/testfiles/hashlist/create_hashlist_003.json diff --git a/ci/apiv2/testfiles/create_hashtype_001.json b/ci/apiv2/testfiles/hashtype/create_hashtype_001.json similarity index 100% rename from ci/apiv2/testfiles/create_hashtype_001.json rename to ci/apiv2/testfiles/hashtype/create_hashtype_001.json diff --git a/ci/apiv2/testfiles/create_healthcheck_001.json b/ci/apiv2/testfiles/healthcheck/create_healthcheck_001.json similarity index 100% rename from ci/apiv2/testfiles/create_healthcheck_001.json rename to ci/apiv2/testfiles/healthcheck/create_healthcheck_001.json diff --git a/ci/apiv2/testfiles/create_notification_001.json b/ci/apiv2/testfiles/notification/create_notification_001.json similarity index 100% rename from ci/apiv2/testfiles/create_notification_001.json rename to ci/apiv2/testfiles/notification/create_notification_001.json diff --git a/ci/apiv2/testfiles/create_preprocessor_001.json b/ci/apiv2/testfiles/preprocessor/create_preprocessor_001.json similarity index 100% rename from ci/apiv2/testfiles/create_preprocessor_001.json rename to ci/apiv2/testfiles/preprocessor/create_preprocessor_001.json diff --git a/ci/apiv2/testfiles/create_pretask_001.json b/ci/apiv2/testfiles/pretask/create_pretask_001.json similarity index 100% rename from ci/apiv2/testfiles/create_pretask_001.json rename to ci/apiv2/testfiles/pretask/create_pretask_001.json diff --git a/ci/apiv2/testfiles/create_pretask_003.json b/ci/apiv2/testfiles/pretask/create_pretask_002.json similarity index 100% rename from ci/apiv2/testfiles/create_pretask_003.json rename to ci/apiv2/testfiles/pretask/create_pretask_002.json diff --git a/ci/apiv2/testfiles/pretask/create_pretask_chunk_negative.json b/ci/apiv2/testfiles/pretask/create_pretask_chunk_negative.json new file mode 100644 index 000000000..d57a1f07e --- /dev/null +++ b/ci/apiv2/testfiles/pretask/create_pretask_chunk_negative.json @@ -0,0 +1,15 @@ +{ + "taskName": "Example - create_pretasks_001", + "attackCmd": "#HL# -a3 ?l?l?l?l?l", + "chunkTime": -100, + "statusTimer": 700, + "color": "7C6EFF", + "isSmall": true, + "isCpuTask": true, + "useNewBench": true, + "priority": 10, + "maxAgents": 10, + "isMaskImport": false, + "crackerBinaryTypeId": 1, + "files": [] +} diff --git a/ci/apiv2/testfiles/pretask/create_pretask_chunk_zero.json b/ci/apiv2/testfiles/pretask/create_pretask_chunk_zero.json new file mode 100644 index 000000000..3eee8d2b9 --- /dev/null +++ b/ci/apiv2/testfiles/pretask/create_pretask_chunk_zero.json @@ -0,0 +1,15 @@ +{ + "taskName": "Example - create_pretasks_001", + "attackCmd": "#HL# -a3 ?l?l?l?l?l", + "chunkTime": 0, + "statusTimer": 700, + "color": "7C6EFF", + "isSmall": true, + "isCpuTask": true, + "useNewBench": true, + "priority": 10, + "maxAgents": 10, + "isMaskImport": false, + "crackerBinaryTypeId": 1, + "files": [] +} diff --git a/ci/apiv2/testfiles/create_pretask_002.json b/ci/apiv2/testfiles/pretask/create_pretask_inv_attackcmd.json similarity index 100% rename from ci/apiv2/testfiles/create_pretask_002.json rename to ci/apiv2/testfiles/pretask/create_pretask_inv_attackcmd.json diff --git a/ci/apiv2/testfiles/pretask/create_pretask_inv_name.json b/ci/apiv2/testfiles/pretask/create_pretask_inv_name.json new file mode 100644 index 000000000..147685cc3 --- /dev/null +++ b/ci/apiv2/testfiles/pretask/create_pretask_inv_name.json @@ -0,0 +1,15 @@ +{ + "taskName": "", + "attackCmd": "#HL# -a3 ?l?l?l?l?l", + "chunkTime": 600, + "statusTimer": 700, + "color": "7C6EFF", + "isSmall": true, + "isCpuTask": true, + "useNewBench": true, + "priority": 10, + "maxAgents": 10, + "isMaskImport": false, + "crackerBinaryTypeId": 1, + "files": [] +} diff --git a/ci/apiv2/testfiles/create_supertask_001.json b/ci/apiv2/testfiles/supertask/create_supertask_001.json similarity index 100% rename from ci/apiv2/testfiles/create_supertask_001.json rename to ci/apiv2/testfiles/supertask/create_supertask_001.json diff --git a/ci/apiv2/testfiles/create_task_001.json b/ci/apiv2/testfiles/task/create_task_001.json similarity index 100% rename from ci/apiv2/testfiles/create_task_001.json rename to ci/apiv2/testfiles/task/create_task_001.json diff --git a/ci/apiv2/testfiles/create_task_002.json b/ci/apiv2/testfiles/task/create_task_002.json similarity index 100% rename from ci/apiv2/testfiles/create_task_002.json rename to ci/apiv2/testfiles/task/create_task_002.json diff --git a/ci/apiv2/testfiles/create_task_003.json b/ci/apiv2/testfiles/task/create_task_003.json similarity index 100% rename from ci/apiv2/testfiles/create_task_003.json rename to ci/apiv2/testfiles/task/create_task_003.json diff --git a/ci/apiv2/utils.py b/ci/apiv2/utils.py index 48da1431a..90179a3aa 100644 --- a/ci/apiv2/utils.py +++ b/ci/apiv2/utils.py @@ -37,7 +37,7 @@ def _do_create_obj_from_file(model_class, file_prefix, extra_payload={}, **kwargs): file_id = kwargs.get('file_id') or '001' - p = Path(__file__).parent.joinpath(f'testfiles/{file_prefix}_{file_id}.json') + p = Path(__file__).parent.joinpath(f'testfiles/{model_class.__name__.lower()}/{file_prefix}_{file_id}.json') payload = json.loads(p.read_text('UTF-8')) final_payload = {**payload, **extra_payload} obj = model_class(**final_payload) From cf0e5c9a43cfa0da15522ef400671e7c52f38d45 Mon Sep 17 00:00:00 2001 From: Eric Wasson <229096365+Eric-Wasson@users.noreply.github.com> Date: Tue, 2 Dec 2025 14:19:04 +0100 Subject: [PATCH 329/691] Fixed merge errors --- src/inc/apiv2/common/AbstractBaseAPI.class.php | 14 +++++++++----- .../apiv2/helper/getTaskProgressImage.routes.php | 4 ++-- src/inc/apiv2/model/agents.routes.php | 2 +- src/inc/apiv2/model/tasks.routes.php | 4 +++- 4 files changed, 15 insertions(+), 9 deletions(-) diff --git a/src/inc/apiv2/common/AbstractBaseAPI.class.php b/src/inc/apiv2/common/AbstractBaseAPI.class.php index 7396551de..5499615db 100644 --- a/src/inc/apiv2/common/AbstractBaseAPI.class.php +++ b/src/inc/apiv2/common/AbstractBaseAPI.class.php @@ -602,7 +602,7 @@ protected function obj2Resource(object $obj, array &$expandResult = [], array $s $attributes[$feature['alias']] = $apiClass::db2json($feature, $kv[$name]); } - $aggregatedData = $apiClass::aggregateData($obj, $aggregateFieldsets); + $aggregatedData = $apiClass::aggregateData($obj, $expandResult, $aggregateFieldsets); $attributes = array_merge($attributes, $aggregatedData); /* Build JSON::API relationship resource */ @@ -1197,7 +1197,9 @@ protected function processExpands( array $expands, object $object, array $expandResult, - array $includedResources + array $includedResources, + array $sparseFieldsets = null, + array $aggregateFieldsets = null ): array { // Add missing expands to expands in case they have been added in aggregateData() @@ -1214,14 +1216,16 @@ protected function processExpands( if (is_array($expandResultObject)) { foreach ($expandResultObject as $expandObject) { - $includedResources = self::addToRelatedResources($includedResources, $apiClass->obj2Resource($expandObject)); + $noFurtherExpands = []; + $includedResources = self::addToRelatedResources($includedResources, $apiClass->obj2Resource($expandObject, $noFurtherExpands, $sparseFieldsets, $aggregateFieldsets)); } } else { if ($expandResultObject === null) { // to-only relation which is nullable continue; } - $includedResources = self::addToRelatedResources($includedResources, $apiClass->obj2Resource($expandResultObject)); + $noFurtherExpands = []; + $includedResources = self::addToRelatedResources($includedResources, $apiClass->obj2Resource($expandResultObject, $noFurtherExpands, $sparseFieldsets, $aggregateFieldsets)); } } @@ -1503,7 +1507,7 @@ protected static function getOneResource(object $apiClass, object $object, Reque // Convert objects to data resources foreach ($objects as $object) { // Create object -x $newObject = $apiClass->obj2Resource($object, $expandResult, $request->getQueryParams()['fields'] ?? null, $request->getQueryParams()['aggregate'] ?? null); + $newObject = $apiClass->obj2Resource($object, $expandResult, $request->getQueryParams()['fields'] ?? null, $request->getQueryParams()['aggregate'] ?? null); $includedResources = $apiClass->processExpands($apiClass, $expands, $object, $expandResult, $includedResources, $request->getQueryParams()['fields'] ?? null, $request->getQueryParams()['aggregate'] ?? null); // Add to result output diff --git a/src/inc/apiv2/helper/getTaskProgressImage.routes.php b/src/inc/apiv2/helper/getTaskProgressImage.routes.php index 6b2960d09..3877655a9 100644 --- a/src/inc/apiv2/helper/getTaskProgressImage.routes.php +++ b/src/inc/apiv2/helper/getTaskProgressImage.routes.php @@ -79,8 +79,8 @@ public function getParamsSwagger(): array { */ public function handleGet(Request $request, Response $response): Response { $this->preCommon($request); - $task_id = $request->getQueryParams()['task']; - $supertask_id = $request->getQueryParams()['supertask']; + $task_id = $request->getQueryParams()['task'] ?? null; + $supertask_id = $request->getQueryParams()['supertask'] ?? null; //check if task exists and get information if ($task_id) { diff --git a/src/inc/apiv2/model/agents.routes.php b/src/inc/apiv2/model/agents.routes.php index b3eba78d8..69b2e4571 100644 --- a/src/inc/apiv2/model/agents.routes.php +++ b/src/inc/apiv2/model/agents.routes.php @@ -46,7 +46,7 @@ protected function getUpdateHandlers($id, $current_user): array { * @param array &$includedData * @return array not used here */ - static function aggregateData(object $object, array &$included_data = []): array { + static function aggregateData(object $object, array &$included_data = [], array $aggregateFieldsets = null): array { $agentId = $object->getId(); $qFs = []; $qFs[] = new QueryFilter(Chunk::AGENT_ID, $agentId, "="); diff --git a/src/inc/apiv2/model/tasks.routes.php b/src/inc/apiv2/model/tasks.routes.php index 36e1e943b..3d85543d5 100644 --- a/src/inc/apiv2/model/tasks.routes.php +++ b/src/inc/apiv2/model/tasks.routes.php @@ -166,7 +166,9 @@ static function aggregateData(object $object, array &$included_data = [], array $aggregatedData = []; if (is_null($aggregateFieldsets) || (is_array($aggregateFieldsets) && array_key_exists('task', $aggregateFieldsets))) { - $aggregateFieldsets['task'] = explode(",", $aggregateFieldsets['task']); + if (!is_null($aggregateFieldsets)) { + $aggregateFieldsets['task'] = explode(",", $aggregateFieldsets['task']); + } $activeAgents = []; if (is_null($aggregateFieldsets) || in_array("activeAgents", $aggregateFieldsets['task'])) { From 81b6ec47a177b50ade9498d124fc9af553b22ac9 Mon Sep 17 00:00:00 2001 From: s3inlc Date: Tue, 2 Dec 2025 15:02:26 +0100 Subject: [PATCH 330/691] completed similar coverage as legacy tests for Pretask model, fixed missing checks in new api --- ci/apiv2/test_pretask.py | 78 ++++++++++++++++++++++++- src/inc/apiv2/model/pretasks.routes.php | 4 +- src/inc/utils/PretaskUtils.class.php | 3 + 3 files changed, 83 insertions(+), 2 deletions(-) diff --git a/ci/apiv2/test_pretask.py b/ci/apiv2/test_pretask.py index 16b49a251..2d0c2590c 100644 --- a/ci/apiv2/test_pretask.py +++ b/ci/apiv2/test_pretask.py @@ -12,10 +12,46 @@ def test_create(self): model_obj = self.create_test_object() self._test_create(model_obj) - def test_patch(self): + def test_patch_name(self): model_obj = self.create_test_object() self._test_patch(model_obj, 'taskName') + def test_patch_color(self): + model_obj = self.create_test_object() + self._test_patch(model_obj, 'color', "deadbf") + + def test_patch_priority(self): + model_obj = self.create_test_object() + self._test_patch(model_obj, 'priority', 500) + + def test_patch_priority_zero(self): + model_obj = self.create_test_object() + self._test_patch(model_obj, 'priority', 0) + + def test_patch_priority_negative(self): + model_obj = self.create_test_object() + self._test_patch(model_obj, 'priority', -500) + + def test_patch_maxAgents(self): + model_obj = self.create_test_object() + self._test_patch(model_obj, 'maxAgents', 10) + + def test_patch_maxAgents_zero(self): + model_obj = self.create_test_object() + self._test_patch(model_obj, 'maxAgents', 0) + + def test_patch_isSmall(self): + model_obj = self.create_test_object() + self._test_patch(model_obj, 'isSmall', 1) + model_obj = self.create_test_object() + self._test_patch(model_obj, 'isSmall', True) + + def test_patch_isCpuTask(self): + model_obj = self.create_test_object() + self._test_patch(model_obj, 'isCpuTask', 1) + model_obj = self.create_test_object() + self._test_patch(model_obj, 'isCpuTask', True) + def test_patch_missing_alias(self): model_obj = self.create_test_object() model_obj.attackCmd = "-a 3 ?l?l?l" @@ -24,6 +60,46 @@ def test_patch_missing_alias(self): self.assertEqual(e.exception.status_code, 500) self.assertEqual(e.exception.title, f"The attack command does not contain the hashlist alias!") + def test_patch_empty_name(self): + model_obj = self.create_test_object() + model_obj.taskName = "" + with self.assertRaises(HashtopolisError) as e: + model_obj.save() + self.assertEqual(e.exception.status_code, 500) + self.assertEqual(e.exception.title, "Name cannot be empty!") + + def test_patch_maxAgents_negative(self): + model_obj = self.create_test_object() + model_obj.maxAgents = -5 + with self.assertRaises(HashtopolisError) as e: + model_obj.save() + self.assertEqual(e.exception.status_code, 500) + self.assertEqual(e.exception.title, "Max agents cannot be negative!") + + def test_patch_invalid_color(self): + model_obj = self.create_test_object() + model_obj.color = "hello1" + with self.assertRaises(HashtopolisError) as e: + model_obj.save() + self.assertEqual(e.exception.status_code, 500) + self.assertEqual(e.exception.title, "Invalid color!") + + def test_patch_invalid_isSmall(self): + model_obj = self.create_test_object() + model_obj.isSmall = 4 + with self.assertRaises(HashtopolisError) as e: + model_obj.save() + self.assertEqual(e.exception.status_code, 400) + self.assertEqual(e.exception.title, "Key 'isSmall' is not of type boolean") + + def test_patch_invalid_isCpuTask(self): + model_obj = self.create_test_object() + model_obj.isCpuTask = "test" + with self.assertRaises(HashtopolisError) as e: + model_obj.save() + self.assertEqual(e.exception.status_code, 400) + self.assertEqual(e.exception.title, "Key 'isCpuTask' is not of type boolean") + def test_delete(self): model_obj = self.create_test_object(delete=False) self._test_delete(model_obj) diff --git a/src/inc/apiv2/model/pretasks.routes.php b/src/inc/apiv2/model/pretasks.routes.php index 85e4dff67..81a5f8b2e 100644 --- a/src/inc/apiv2/model/pretasks.routes.php +++ b/src/inc/apiv2/model/pretasks.routes.php @@ -68,6 +68,8 @@ protected function getUpdateHandlers($id, $current_user): array { return [ Pretask::ATTACK_CMD => fn($value) => PretaskUtils::changeAttack($id, $value), Pretask::COLOR => fn($value) => PretaskUtils::setColor($id, $value), + Pretask::TASK_NAME => fn($value) => PretaskUtils::renamePretask($id, $value), + Pretask::MAX_AGENTS => fn($value) => PretaskUtils::setMaxAgents($id, $value), ]; } @@ -79,4 +81,4 @@ protected function deleteObject(object $object): void { } } -PreTaskAPI::register($app); \ No newline at end of file +PreTaskAPI::register($app); diff --git a/src/inc/utils/PretaskUtils.class.php b/src/inc/utils/PretaskUtils.class.php index 005f5964b..526606a97 100644 --- a/src/inc/utils/PretaskUtils.class.php +++ b/src/inc/utils/PretaskUtils.class.php @@ -125,6 +125,9 @@ public static function setMaxAgents($pretaskId, $maxAgents) { throw new HTException("Max agents needs to be a number!"); } $maxAgents = intval($maxAgents); + if ($maxAgents < 0) { + throw new HTException("Max agents cannot be negative!"); + } Factory::getPretaskFactory()->set($pretask, Pretask::MAX_AGENTS, $maxAgents); } From 9f90283f9fb172cebac183b9399d7fd5c963d069 Mon Sep 17 00:00:00 2001 From: s3inlc Date: Wed, 3 Dec 2025 09:28:05 +0100 Subject: [PATCH 331/691] renamed all indexes to be unique, restructured file to have alphabetical order and readable spacing --- .../postgres/20251127000000_initial.sql | 598 +++++++++--------- 1 file changed, 299 insertions(+), 299 deletions(-) diff --git a/src/migrations/postgres/20251127000000_initial.sql b/src/migrations/postgres/20251127000000_initial.sql index cfab4cf07..cbf8aec8a 100644 --- a/src/migrations/postgres/20251127000000_initial.sql +++ b/src/migrations/postgres/20251127000000_initial.sql @@ -1,7 +1,7 @@ -- Create tables and insert default entries CREATE TABLE AccessGroup ( accessGroupId SERIAL NOT NULL PRIMARY KEY, - groupName TEXT NOT NULL + groupName TEXT NOT NULL ); INSERT INTO AccessGroup (accessGroupId, groupName) VALUES @@ -9,43 +9,43 @@ INSERT INTO AccessGroup (accessGroupId, groupName) VALUES CREATE TABLE AccessGroupAgent ( accessGroupAgentId SERIAL NOT NULL PRIMARY KEY, - accessGroupId INT NOT NULL, - agentId INT NOT NULL + accessGroupId INT NOT NULL, + agentId INT NOT NULL ); CREATE TABLE AccessGroupUser ( accessGroupUserId SERIAL NOT NULL PRIMARY KEY, - accessGroupId INT NOT NULL, - userId INT NOT NULL + accessGroupId INT NOT NULL, + userId INT NOT NULL ); CREATE TABLE Agent ( agentId SERIAL NOT NULL PRIMARY KEY, - agentName TEXT NOT NULL, - uid TEXT NOT NULL, - os INT NOT NULL, - devices TEXT NOT NULL, - cmdPars TEXT NOT NULL, - ignoreErrors INT NOT NULL, - isActive INT NOT NULL, - isTrusted INT NOT NULL, - token TEXT NOT NULL, - lastAct TEXT NOT NULL, - lastTime BIGINT NOT NULL, - lastIp TEXT NOT NULL, - userId INT DEFAULT NULL, - cpuOnly INT NOT NULL, - clientSignature TEXT NOT NULL + agentName TEXT NOT NULL, + uid TEXT NOT NULL, + os INT NOT NULL, + devices TEXT NOT NULL, + cmdPars TEXT NOT NULL, + ignoreErrors INT NOT NULL, + isActive INT NOT NULL, + isTrusted INT NOT NULL, + token TEXT NOT NULL, + lastAct TEXT NOT NULL, + lastTime BIGINT NOT NULL, + lastIp TEXT NOT NULL, + userId INT DEFAULT NULL, + cpuOnly INT NOT NULL, + clientSignature TEXT NOT NULL ); CREATE TABLE AgentBinary ( agentBinaryId SERIAL NOT NULL PRIMARY KEY, - binaryType TEXT NOT NULL, - version TEXT NOT NULL, - operatingSystems TEXT NOT NULL, - filename TEXT NOT NULL, - updateTrack TEXT NOT NULL, - updateAvailable TEXT NOT NULL + binaryType TEXT NOT NULL, + version TEXT NOT NULL, + operatingSystems TEXT NOT NULL, + filename TEXT NOT NULL, + updateTrack TEXT NOT NULL, + updateAvailable TEXT NOT NULL ); INSERT INTO AgentBinary (agentBinaryId, binaryType, version, operatingSystems, filename, updateTrack, updateAvailable) VALUES @@ -53,43 +53,62 @@ INSERT INTO AgentBinary (agentBinaryId, binaryType, version, operatingSystems, f CREATE TABLE AgentError ( agentErrorId SERIAL NOT NULL PRIMARY KEY, - agentId INT NOT NULL, - taskId INT DEFAULT NULL, - time BIGINT NOT NULL, - error TEXT NOT NULL, - chunkId INT NULL + agentId INT NOT NULL, + taskId INT DEFAULT NULL, + time BIGINT NOT NULL, + error TEXT NOT NULL, + chunkId INT NULL ); CREATE TABLE AgentStat ( agentStatId SERIAL NOT NULL PRIMARY KEY, - agentId INT NOT NULL, - statType INT NOT NULL, - time BIGINT NOT NULL, - value TEXT NOT NULL + agentId INT NOT NULL, + statType INT NOT NULL, + time BIGINT NOT NULL, + value TEXT NOT NULL ); CREATE TABLE AgentZap ( agentZapId SERIAL NOT NULL PRIMARY KEY, - agentId INT NOT NULL, - lastZapId INT NULL + agentId INT NOT NULL, + lastZapId INT NULL ); +CREATE TABLE ApiKey ( + apiKeyId SERIAL NOT NULL PRIMARY KEY, + startValid BIGINT NOT NULL, + endValid BIGINT NOT NULL, + accessKey TEXT NOT NULL, + accessCount INT NOT NULL, + userId INT NOT NULL, + apiGroupId INT NOT NULL +); + +CREATE TABLE ApiGroup ( + apiGroupId SERIAL NOT NULL PRIMARY KEY, + name TEXT NOT NULL, + permissions TEXT NOT NULL +); + +INSERT INTO ApiGroup ( apiGroupId, name, permissions) VALUES + (1, 'Administrators', 'ALL'); + CREATE TABLE Assignment ( assignmentId SERIAL NOT NULL PRIMARY KEY, - taskId INT NOT NULL, - agentId INT NOT NULL, - benchmark TEXT NOT NULL + taskId INT NOT NULL, + agentId INT NOT NULL, + benchmark TEXT NOT NULL ); CREATE TABLE Chunk ( chunkId SERIAL NOT NULL PRIMARY KEY, taskId INT NOT NULL, - skip BIGINT NOT NULL, - length BIGINT NOT NULL, + skip BIGINT NOT NULL, + length BIGINT NOT NULL, agentId INT NULL, - dispatchTime BIGINT NOT NULL, - solveTime BIGINT NOT NULL, - checkpoint BIGINT NOT NULL, + dispatchTime BIGINT NOT NULL, + solveTime BIGINT NOT NULL, + checkpoint BIGINT NOT NULL, progress INT NULL, state INT NOT NULL, cracked INT NOT NULL, @@ -98,9 +117,9 @@ CREATE TABLE Chunk ( CREATE TABLE Config ( configId SERIAL NOT NULL PRIMARY KEY, - configSectionId INT NOT NULL, - item TEXT NOT NULL, - value TEXT NOT NULL + configSectionId INT NOT NULL, + item TEXT NOT NULL, + value TEXT NOT NULL ); INSERT INTO Config (configId, configSectionId, item, value) VALUES @@ -170,7 +189,7 @@ INSERT INTO Config (configId, configSectionId, item, value) VALUES CREATE TABLE ConfigSection ( configSectionId SERIAL NOT NULL PRIMARY KEY, - sectionName TEXT NOT NULL + sectionName TEXT NOT NULL ); INSERT INTO ConfigSection (configSectionId, sectionName) VALUES @@ -184,10 +203,10 @@ INSERT INTO ConfigSection (configSectionId, sectionName) VALUES CREATE TABLE CrackerBinary ( crackerBinaryId SERIAL NOT NULL PRIMARY KEY, - crackerBinaryTypeId INT NOT NULL, - version TEXT NOT NULL, - downloadUrl TEXT NOT NULL, - binaryName TEXT NOT NULL + crackerBinaryTypeId INT NOT NULL, + version TEXT NOT NULL, + downloadUrl TEXT NOT NULL, + binaryName TEXT NOT NULL ); INSERT INTO CrackerBinary (crackerBinaryId, crackerBinaryTypeId, version, downloadUrl, binaryName) VALUES @@ -195,8 +214,8 @@ INSERT INTO CrackerBinary (crackerBinaryId, crackerBinaryTypeId, version, downlo CREATE TABLE CrackerBinaryType ( crackerBinaryTypeId SERIAL NOT NULL PRIMARY KEY, - typeName TEXT NOT NULL, - isChunkingAvailable INT NOT NULL + typeName TEXT NOT NULL, + isChunkingAvailable INT NOT NULL ); INSERT INTO CrackerBinaryType (crackerBinaryTypeId, typeName, isChunkingAvailable) VALUES @@ -204,12 +223,25 @@ INSERT INTO CrackerBinaryType (crackerBinaryTypeId, typeName, isChunkingAvailabl CREATE TABLE File ( fileId SERIAL NOT NULL PRIMARY KEY, - filename TEXT NOT NULL, - size BIGINT NOT NULL, - isSecret INT NOT NULL, - fileType INT NOT NULL, - accessGroupId INT NOT NULL, - lineCount BIGINT DEFAULT NULL + filename TEXT NOT NULL, + size BIGINT NOT NULL, + isSecret INT NOT NULL, + fileType INT NOT NULL, + accessGroupId INT NOT NULL, + lineCount BIGINT DEFAULT NULL +); + +CREATE TABLE FileDelete ( + fileDeleteId SERIAL NOT NULL PRIMARY KEY, + filename TEXT NOT NULL, + time BIGINT NOT NULL +); + +CREATE TABLE FileDownload ( + fileDownloadId SERIAL NOT NULL PRIMARY KEY, + time BIGINT NOT NULL, + fileId INT NOT NULL, + status INT NOT NULL ); CREATE TABLE FilePretask ( @@ -220,69 +252,63 @@ CREATE TABLE FilePretask ( CREATE TABLE FileTask ( fileTaskId SERIAL NOT NULL PRIMARY KEY, - fileId INT NOT NULL, - taskId INT NOT NULL -); - -CREATE TABLE FileDelete ( - fileDeleteId SERIAL NOT NULL PRIMARY KEY, - filename TEXT NOT NULL, - time BIGINT NOT NULL + fileId INT NOT NULL, + taskId INT NOT NULL ); CREATE TABLE Hash ( hashId SERIAL NOT NULL PRIMARY KEY, - hashlistId INT NOT NULL, + hashlistId INT NOT NULL, hash TEXT NOT NULL, - salt TEXT DEFAULT NULL, - plaintext TEXT DEFAULT NULL, - timeCracked BIGINT DEFAULT NULL, - chunkId INT DEFAULT NULL, - isCracked INT NOT NULL, - crackPos BIGINT NOT NULL + salt TEXT DEFAULT NULL, + plaintext TEXT DEFAULT NULL, + timeCracked BIGINT DEFAULT NULL, + chunkId INT DEFAULT NULL, + isCracked INT NOT NULL, + crackPos BIGINT NOT NULL ); CREATE TABLE HashBinary ( hashBinaryId SERIAL NOT NULL PRIMARY KEY, - hashlistId INT NOT NULL, - essid TEXT NOT NULL, - hash TEXT NOT NULL, - plaintext TEXT DEFAULT NULL, - timeCracked BIGINT DEFAULT NULL, - chunkId INT DEFAULT NULL, + hashlistId INT NOT NULL, + essid TEXT NOT NULL, + hash TEXT NOT NULL, + plaintext TEXT DEFAULT NULL, + timeCracked BIGINT DEFAULT NULL, + chunkId INT DEFAULT NULL, isCracked INT NOT NULL, - crackPos BIGINT NOT NULL + crackPos BIGINT NOT NULL ); CREATE TABLE Hashlist ( hashlistId SERIAL NOT NULL PRIMARY KEY, - hashlistName TEXT NOT NULL, - format INT NOT NULL, - hashTypeId INT NOT NULL, - hashCount INT NOT NULL, - saltSeparator TEXT DEFAULT NULL, - cracked INT NOT NULL, - isSecret INT NOT NULL, - hexSalt INT NOT NULL, - isSalted INT NOT NULL, - accessGroupId INT NOT NULL, - notes TEXT NOT NULL, - brainId INT NOT NULL, - brainFeatures INT NOT NULL, - isArchived INT NOT NULL + hashlistName TEXT NOT NULL, + format INT NOT NULL, + hashTypeId INT NOT NULL, + hashCount INT NOT NULL, + saltSeparator TEXT DEFAULT NULL, + cracked INT NOT NULL, + isSecret INT NOT NULL, + hexSalt INT NOT NULL, + isSalted INT NOT NULL, + accessGroupId INT NOT NULL, + notes TEXT NOT NULL, + brainId INT NOT NULL, + brainFeatures INT NOT NULL, + isArchived INT NOT NULL ); CREATE TABLE HashlistHashlist ( hashlistHashlistId SERIAL NOT NULL PRIMARY KEY, - parentHashlistId INT NOT NULL, - hashlistId INT NOT NULL + parentHashlistId INT NOT NULL, + hashlistId INT NOT NULL ); CREATE TABLE HashType ( hashTypeId SERIAL NOT NULL PRIMARY KEY, - description TEXT NOT NULL, - isSalted INT NOT NULL, - isSlowHash INT NOT NULL + description TEXT NOT NULL, + isSalted INT NOT NULL, + isSlowHash INT NOT NULL ); INSERT INTO HashType (hashTypeId, description, isSalted, isSlowHash) VALUES @@ -867,51 +893,106 @@ INSERT INTO HashType (hashTypeId, description, isSalted, isSlowHash) VALUES (73000, 'Generic Hash [Bridged: Python Interpreter with GIL]', 0, 1), (99999, 'Plaintext', 0, 0); +CREATE TABLE HealthCheck ( + healthCheckId SERIAL NOT NULL PRIMARY KEY, + time BIGINT NOT NULL, + status INT NOT NULL, + checkType INT NOT NULL, + hashtypeId INT NOT NULL, + crackerBinaryId INT NOT NULL, + expectedCracks INT NOT NULL, + attackCmd TEXT NOT NULL +); + +CREATE TABLE HealthCheckAgent ( + healthCheckAgentId SERIAL NOT NULL PRIMARY KEY, + healthCheckId INT NOT NULL, + agentId INT NOT NULL, + status INT NOT NULL, + cracked INT NOT NULL, + numGpus INT NOT NULL, + start BIGINT NOT NULL, + htp_end BIGINT NOT NULL, + errors TEXT NOT NULL +); + +CREATE TABLE htp_User ( + userId SERIAL NOT NULL PRIMARY KEY, + username TEXT NOT NULL, + email TEXT NOT NULL, + passwordHash TEXT NOT NULL, + passwordSalt TEXT NOT NULL, + isValid INT NOT NULL, + isComputedPassword INT NOT NULL, + lastLoginDate BIGINT NOT NULL, + registeredSince BIGINT NOT NULL, + sessionLifetime INT NOT NULL, + rightGroupId INT NOT NULL, + yubikey TEXT DEFAULT NULL, + otp1 TEXT DEFAULT NULL, + otp2 TEXT DEFAULT NULL, + otp3 TEXT DEFAULT NULL, + otp4 TEXT DEFAULT NULL +); + CREATE TABLE LogEntry ( logEntryId SERIAL NOT NULL PRIMARY KEY, - issuer TEXT NOT NULL, - issuerId TEXT NOT NULL, - level TEXT NOT NULL, - message TEXT NOT NULL, - time BIGINT NOT NULL + issuer TEXT NOT NULL, + issuerId TEXT NOT NULL, + level TEXT NOT NULL, + message TEXT NOT NULL, + time BIGINT NOT NULL ); CREATE TABLE NotificationSetting ( notificationSettingId SERIAL NOT NULL PRIMARY KEY, - action TEXT NOT NULL, - objectId INT NULL, - notification TEXT NOT NULL, - userId INT NOT NULL, - receiver TEXT NOT NULL, - isActive INT NOT NULL + action TEXT NOT NULL, + objectId INT NULL, + notification TEXT NOT NULL, + userId INT NOT NULL, + receiver TEXT NOT NULL, + isActive INT NOT NULL ); +CREATE TABLE Preprocessor ( + preprocessorId SERIAL NOT NULL PRIMARY KEY, + name TEXT NOT NULL, + url TEXT NOT NULL, + binaryName TEXT NOT NULL, + keyspaceCommand TEXT NULL, + skipCommand TEXT NULL, + limitCommand TEXT NULL +); + +INSERT INTO Preprocessor ( preprocessorId, name, url, binaryName, keyspaceCommand, skipCommand, limitCommand) VALUES + (1, 'Prince', 'https://github.com/hashcat/princeprocessor/releases/download/v0.22/princeprocessor-0.22.7z', 'pp', '--keyspace', '--skip', '--limit'); + CREATE TABLE Pretask ( pretaskId SERIAL NOT NULL PRIMARY KEY, - taskName TEXT NOT NULL, - attackCmd TEXT NOT NULL, - chunkTime INT NOT NULL, - statusTimer INT NOT NULL, - color TEXT NULL, - isSmall INT NOT NULL, - isCpuTask INT NOT NULL, - useNewBench INT NOT NULL, - priority INT NOT NULL, - maxAgents INT NOT NULL, - isMaskImport INT NOT NULL, - crackerBinaryTypeId INT NOT NULL + taskName TEXT NOT NULL, + attackCmd TEXT NOT NULL, + chunkTime INT NOT NULL, + statusTimer INT NOT NULL, + color TEXT NULL, + isSmall INT NOT NULL, + isCpuTask INT NOT NULL, + useNewBench INT NOT NULL, + priority INT NOT NULL, + maxAgents INT NOT NULL, + isMaskImport INT NOT NULL, + crackerBinaryTypeId INT NOT NULL ); CREATE TABLE RegVoucher ( regVoucherId SERIAL NOT NULL PRIMARY KEY, - voucher TEXT NOT NULL, - time BIGINT NOT NULL + voucher TEXT NOT NULL, + time BIGINT NOT NULL ); CREATE TABLE RightGroup ( rightGroupId SERIAL NOT NULL PRIMARY KEY, - groupName TEXT NOT NULL, - permissions TEXT NOT NULL + groupName TEXT NOT NULL, + permissions TEXT NOT NULL ); INSERT INTO RightGroup (rightGroupId, groupName, permissions) VALUES @@ -919,12 +1000,12 @@ INSERT INTO RightGroup (rightGroupId, groupName, permissions) VALUES CREATE TABLE Session ( sessionId SERIAL NOT NULL PRIMARY KEY, - userId INT NOT NULL, - sessionStartDate BIGINT NOT NULL, - lastActionDate BIGINT NOT NULL, - isOpen INT NOT NULL, - sessionLifetime INT NOT NULL, - sessionKey TEXT NOT NULL + userId INT NOT NULL, + sessionStartDate BIGINT NOT NULL, + lastActionDate BIGINT NOT NULL, + isOpen INT NOT NULL, + sessionLifetime INT NOT NULL, + sessionKey TEXT NOT NULL ); CREATE TABLE Speed ( @@ -942,149 +1023,68 @@ CREATE TABLE StoredValue ( CREATE TABLE Supertask ( supertaskId SERIAL NOT NULL PRIMARY KEY, - supertaskName TEXT NOT NULL + supertaskName TEXT NOT NULL ); CREATE TABLE SupertaskPretask ( supertaskPretaskId SERIAL NOT NULL PRIMARY KEY, - supertaskId INT NOT NULL, - pretaskId INT NOT NULL + supertaskId INT NOT NULL, + pretaskId INT NOT NULL ); CREATE TABLE Task ( taskId SERIAL NOT NULL PRIMARY KEY, - taskName TEXT NOT NULL, - attackCmd TEXT NOT NULL, - chunkTime INT NOT NULL, - statusTimer INT NOT NULL, - keyspace BIGINT NOT NULL, - keyspaceProgress BIGINT NOT NULL, - priority INT NOT NULL, - maxAgents INT NOT NULL, - color TEXT NULL, - isSmall INT NOT NULL, - isCpuTask INT NOT NULL, - useNewBench INT NOT NULL, - skipKeyspace BIGINT NOT NULL, - crackerBinaryId INT DEFAULT NULL, - crackerBinaryTypeId INT NULL, - taskWrapperId INT NOT NULL, - isArchived INT NOT NULL, - notes TEXT NOT NULL, - staticChunks INT NOT NULL, - chunkSize BIGINT NOT NULL, - forcePipe INT NOT NULL, - usePreprocessor INT NOT NULL, - preprocessorCommand TEXT NOT NULL + taskName TEXT NOT NULL, + attackCmd TEXT NOT NULL, + chunkTime INT NOT NULL, + statusTimer INT NOT NULL, + keyspace BIGINT NOT NULL, + keyspaceProgress BIGINT NOT NULL, + priority INT NOT NULL, + maxAgents INT NOT NULL, + color TEXT NULL, + isSmall INT NOT NULL, + isCpuTask INT NOT NULL, + useNewBench INT NOT NULL, + skipKeyspace BIGINT NOT NULL, + crackerBinaryId INT DEFAULT NULL, + crackerBinaryTypeId INT NULL, + taskWrapperId INT NOT NULL, + isArchived INT NOT NULL, + notes TEXT NOT NULL, + staticChunks INT NOT NULL, + chunkSize BIGINT NOT NULL, + forcePipe INT NOT NULL, + usePreprocessor INT NOT NULL, + preprocessorCommand TEXT NOT NULL ); CREATE TABLE TaskDebugOutput ( taskDebugOutputId SERIAL NOT NULL PRIMARY KEY, - taskId INT NOT NULL, - output TEXT NOT NULL + taskId INT NOT NULL, + output TEXT NOT NULL ); CREATE TABLE TaskWrapper ( taskWrapperId SERIAL NOT NULL PRIMARY KEY, - priority INT NOT NULL, - maxAgents INT NOT NULL, - taskType INT NOT NULL, - hashlistId INT NOT NULL, - accessGroupId INT DEFAULT NULL, - taskWrapperName TEXT NOT NULL, - isArchived INT NOT NULL, - cracked INT NOT NULL -); - -CREATE TABLE htp_User ( - userId SERIAL NOT NULL PRIMARY KEY, - username TEXT NOT NULL, - email TEXT NOT NULL, - passwordHash TEXT NOT NULL, - passwordSalt TEXT NOT NULL, - isValid INT NOT NULL, - isComputedPassword INT NOT NULL, - lastLoginDate BIGINT NOT NULL, - registeredSince BIGINT NOT NULL, - sessionLifetime INT NOT NULL, - rightGroupId INT NOT NULL, - yubikey TEXT DEFAULT NULL, - otp1 TEXT DEFAULT NULL, - otp2 TEXT DEFAULT NULL, - otp3 TEXT DEFAULT NULL, - otp4 TEXT DEFAULT NULL + priority INT NOT NULL, + maxAgents INT NOT NULL, + taskType INT NOT NULL, + hashlistId INT NOT NULL, + accessGroupId INT DEFAULT NULL, + taskWrapperName TEXT NOT NULL, + isArchived INT NOT NULL, + cracked INT NOT NULL ); CREATE TABLE Zap ( zapId SERIAL NOT NULL PRIMARY KEY, - hash TEXT NOT NULL, - solveTime BIGINT NOT NULL, + hash TEXT NOT NULL, + solveTime BIGINT NOT NULL, agentId INT NULL, hashlistId INT NOT NULL ); -CREATE TABLE ApiKey ( - apiKeyId SERIAL NOT NULL PRIMARY KEY, - startValid BIGINT NOT NULL, - endValid BIGINT NOT NULL, - accessKey TEXT NOT NULL, - accessCount INT NOT NULL, - userId INT NOT NULL, - apiGroupId INT NOT NULL -); - -CREATE TABLE ApiGroup ( - apiGroupId SERIAL NOT NULL PRIMARY KEY, - name TEXT NOT NULL, - permissions TEXT NOT NULL -); - -CREATE TABLE FileDownload ( - fileDownloadId SERIAL NOT NULL PRIMARY KEY, - time BIGINT NOT NULL, - fileId INT NOT NULL, - status INT NOT NULL -); - -INSERT INTO ApiGroup ( apiGroupId, name, permissions) VALUES - (1, 'Administrators', 'ALL'); - -CREATE TABLE HealthCheck ( - healthCheckId SERIAL NOT NULL PRIMARY KEY, - time BIGINT NOT NULL, - status INT NOT NULL, - checkType INT NOT NULL, - hashtypeId INT NOT NULL, - crackerBinaryId INT NOT NULL, - expectedCracks INT NOT NULL, - attackCmd TEXT NOT NULL -); - -CREATE TABLE HealthCheckAgent ( - healthCheckAgentId SERIAL NOT NULL PRIMARY KEY, - healthCheckId INT NOT NULL, - agentId INT NOT NULL, - status INT NOT NULL, - cracked INT NOT NULL, - numGpus INT NOT NULL, - start BIGINT NOT NULL, - htp_end BIGINT NOT NULL, - errors TEXT NOT NULL -); - -CREATE TABLE Preprocessor ( - preprocessorId SERIAL NOT NULL PRIMARY KEY, - name TEXT NOT NULL, - url TEXT NOT NULL, - binaryName TEXT NOT NULL, - keyspaceCommand TEXT NULL, - skipCommand TEXT NULL, - limitCommand TEXT NULL -); - -INSERT INTO Preprocessor ( preprocessorId, name, url, binaryName, keyspaceCommand, skipCommand, limitCommand) VALUES - (1, 'Prince', 'https://github.com/hashcat/princeprocessor/releases/download/v0.22/princeprocessor-0.22.7z', 'pp', '--keyspace', '--skip', '--limit'); - -- Set sequences for all tables with SERIAL SELECT pg_catalog.setval(pg_get_serial_sequence('AccessGroup', 'accessgroupid'), MAX(accessGroupId)) from AccessGroup; SELECT pg_catalog.setval(pg_get_serial_sequence('AccessGroupAgent', 'accessgroupagentid'), MAX(accessGroupAgentId)) from AccessGroupAgent; @@ -1131,74 +1131,74 @@ SELECT pg_catalog.setval(pg_get_serial_sequence('TaskWrapper', 'taskwrapperid'), SELECT pg_catalog.setval(pg_get_serial_sequence('Zap', 'zapid'), MAX(zapId)) from Zap; -- Add Indexes -CREATE INDEX IF NOT EXISTS accessGroupId_idx ON AccessGroupAgent (accessGroupId); -CREATE INDEX IF NOT EXISTS agentId_idx ON AccessGroupAgent (agentId); +CREATE INDEX IF NOT EXISTS AccessGroupAgent_accessGroupId_idx ON AccessGroupAgent (accessGroupId); +CREATE INDEX IF NOT EXISTS AccessGroupAgent_agentId_idx ON AccessGroupAgent (agentId); -CREATE INDEX IF NOT EXISTS accessGroupId_idx ON AccessGroupUser (accessGroupId); -CREATE INDEX IF NOT EXISTS userId_idx ON AccessGroupUser (userId); +CREATE INDEX IF NOT EXISTS AccessGroupUser_accessGroupId_idx ON AccessGroupUser (accessGroupId); +CREATE INDEX IF NOT EXISTS AccessGroupUser_userId_idx ON AccessGroupUser (userId); -CREATE INDEX IF NOT EXISTS userId_idx ON Agent (userId); +CREATE INDEX IF NOT EXISTS Agent_userId_idx ON Agent (userId); -CREATE INDEX IF NOT EXISTS agentId_idx ON AgentError (agentId); -CREATE INDEX IF NOT EXISTS taskId_idx ON AgentError (taskId); +CREATE INDEX IF NOT EXISTS AgentError_agentId_idx ON AgentError (agentId); +CREATE INDEX IF NOT EXISTS AgentError_taskId_idx ON AgentError (taskId); -CREATE INDEX IF NOT EXISTS agentId_idx ON AgentStat (agentId); +CREATE INDEX IF NOT EXISTS AgentStat_agentId_idx ON AgentStat (agentId); -CREATE INDEX IF NOT EXISTS agentId_idx ON AgentZap (agentId); -CREATE INDEX IF NOT EXISTS lastZapId_idx ON AgentZap (lastZapId); +CREATE INDEX IF NOT EXISTS AgentZap_agentId_idx ON AgentZap (agentId); +CREATE INDEX IF NOT EXISTS AgentZap_lastZapId_idx ON AgentZap (lastZapId); -CREATE INDEX IF NOT EXISTS taskId_idx ON Assignment (taskId); -CREATE INDEX IF NOT EXISTS agentId_idx ON Assignment (agentId); +CREATE INDEX IF NOT EXISTS Assignment_taskId_idx ON Assignment (taskId); +CREATE INDEX IF NOT EXISTS Assignment_agentId_idx ON Assignment (agentId); -CREATE INDEX IF NOT EXISTS taskId_idx ON Chunk (taskId); -CREATE INDEX IF NOT EXISTS progress_idx ON Chunk (progress); -CREATE INDEX IF NOT EXISTS agentId_idx ON Chunk (agentId); +CREATE INDEX IF NOT EXISTS Chunk_taskId_idx ON Chunk (taskId); +CREATE INDEX IF NOT EXISTS Chunk_progress_idx ON Chunk (progress); +CREATE INDEX IF NOT EXISTS Chunk_agentId_idx ON Chunk (agentId); -CREATE INDEX IF NOT EXISTS configSectionId_idx ON Config (configSectionId); +CREATE INDEX IF NOT EXISTS Config_configSectionId_idx ON Config (configSectionId); -CREATE INDEX IF NOT EXISTS crackerBinaryTypeId_idx ON CrackerBinary (crackerBinaryTypeId); +CREATE INDEX IF NOT EXISTS CrackerBinary_crackerBinaryTypeId_idx ON CrackerBinary (crackerBinaryTypeId); -CREATE INDEX IF NOT EXISTS fileId_idx ON FilePretask (fileId); -CREATE INDEX IF NOT EXISTS pretaskId_idx ON FilePretask (pretaskId); +CREATE INDEX IF NOT EXISTS FilePretask_fileId_idx ON FilePretask (fileId); +CREATE INDEX IF NOT EXISTS FilePretask_pretaskId_idx ON FilePretask (pretaskId); -CREATE INDEX IF NOT EXISTS fileId_idx ON FileTask (fileId); -CREATE INDEX IF NOT EXISTS taskId_idx ON FileTask (taskId); +CREATE INDEX IF NOT EXISTS FileTask_fileId_idx ON FileTask (fileId); +CREATE INDEX IF NOT EXISTS FileTask_taskId_idx ON FileTask (taskId); -CREATE INDEX IF NOT EXISTS hashlistId_idx ON Hash (hashlistId); -CREATE INDEX IF NOT EXISTS chunkId_idx ON Hash (chunkId); -CREATE INDEX IF NOT EXISTS isCracked_idx ON Hash (isCracked); -CREATE INDEX IF NOT EXISTS hash_idx ON Hash (hash); -CREATE INDEX IF NOT EXISTS timeCracked_idx ON Hash (timeCracked); +CREATE INDEX IF NOT EXISTS Hash_hashlistId_idx ON Hash (hashlistId); +CREATE INDEX IF NOT EXISTS Hash_chunkId_idx ON Hash (chunkId); +CREATE INDEX IF NOT EXISTS Hash_isCracked_idx ON Hash (isCracked); +CREATE INDEX IF NOT EXISTS Hash_hash_idx ON Hash (hash); +CREATE INDEX IF NOT EXISTS Hash_timeCracked_idx ON Hash (timeCracked); -CREATE INDEX IF NOT EXISTS hashlistId_idx ON HashBinary (hashlistId); -CREATE INDEX IF NOT EXISTS chunkId_idx ON HashBinary (chunkId); +CREATE INDEX IF NOT EXISTS HashBinary_hashlistId_idx ON HashBinary (hashlistId); +CREATE INDEX IF NOT EXISTS HashBinary_chunkId_idx ON HashBinary (chunkId); -CREATE INDEX IF NOT EXISTS hashTypeId_idx ON Hashlist (hashTypeId); +CREATE INDEX IF NOT EXISTS Hashlist_hashTypeId_idx ON Hashlist (hashTypeId); -CREATE INDEX IF NOT EXISTS parentHashlistId_idx ON HashlistHashlist (parentHashlistId); -CREATE INDEX IF NOT EXISTS hashlistId_idx ON HashlistHashlist (hashlistId); +CREATE INDEX IF NOT EXISTS HashlistHashlist_parentHashlistId_idx ON HashlistHashlist (parentHashlistId); +CREATE INDEX IF NOT EXISTS HashlistHashlist_hashlistId_idx ON HashlistHashlist (hashlistId); -CREATE INDEX IF NOT EXISTS rightGroupId_idx ON htp_User (rightGroupId); +CREATE INDEX IF NOT EXISTS htp_User_rightGroupId_idx ON htp_User (rightGroupId); -CREATE INDEX IF NOT EXISTS userId_idx ON NotificationSetting (userId); +CREATE INDEX IF NOT EXISTS NotificationSetting_userId_idx ON NotificationSetting (userId); -CREATE INDEX IF NOT EXISTS userId_idx ON Session (userId); +CREATE INDEX IF NOT EXISTS Session_userId_idx ON Session (userId); -CREATE INDEX IF NOT EXISTS agentId_idx ON Speed (agentId); -CREATE INDEX IF NOT EXISTS taskId_idx ON Speed (taskId); +CREATE INDEX IF NOT EXISTS Speed_agentId_idx ON Speed (agentId); +CREATE INDEX IF NOT EXISTS Speed_taskId_idx ON Speed (taskId); -CREATE INDEX IF NOT EXISTS supertaskId_idx ON SupertaskPretask (supertaskId); -CREATE INDEX IF NOT EXISTS pretaskId_idx ON SupertaskPretask (pretaskId); +CREATE INDEX IF NOT EXISTS SupertaskPretask_supertaskId_idx ON SupertaskPretask (supertaskId); +CREATE INDEX IF NOT EXISTS SupertaskPretask_pretaskId_idx ON SupertaskPretask (pretaskId); -CREATE INDEX IF NOT EXISTS crackerBinaryId_idx ON Task (crackerBinaryId); +CREATE INDEX IF NOT EXISTS Task_crackerBinaryId_idx ON Task (crackerBinaryId); -CREATE INDEX IF NOT EXISTS hashlistId_idx ON TaskWrapper (hashlistId); -CREATE INDEX IF NOT EXISTS priority_idx ON TaskWrapper (priority); -CREATE INDEX IF NOT EXISTS isArchived_idx ON TaskWrapper (isArchived); -CREATE INDEX IF NOT EXISTS accessGroupId_idx ON TaskWrapper (accessGroupId); +CREATE INDEX IF NOT EXISTS TaskWrapper_hashlistId_idx ON TaskWrapper (hashlistId); +CREATE INDEX IF NOT EXISTS TaskWrapper_priority_idx ON TaskWrapper (priority); +CREATE INDEX IF NOT EXISTS TaskWrapper_isArchived_idx ON TaskWrapper (isArchived); +CREATE INDEX IF NOT EXISTS TaskWrapper_accessGroupId_idx ON TaskWrapper (accessGroupId); -CREATE INDEX IF NOT EXISTS agentId_idx ON Zap (agentId); -CREATE INDEX IF NOT EXISTS hashlistId_idx ON Zap (hashlistId); +CREATE INDEX IF NOT EXISTS Zap_agentId_idx ON Zap (agentId); +CREATE INDEX IF NOT EXISTS Zap_hashlistId_idx ON Zap (hashlistId); -- Add Constraints ALTER TABLE AccessGroupAgent ADD CONSTRAINT AccessGroupAgent_ibfk_1 FOREIGN KEY (accessGroupId) REFERENCES AccessGroup (accessGroupId); From b8440e58aeee434469d4b913d78d076b45a4b37d Mon Sep 17 00:00:00 2001 From: Eric Wasson <229096365+Eric-Wasson@users.noreply.github.com> Date: Wed, 3 Dec 2025 10:22:50 +0100 Subject: [PATCH 332/691] Updated tests --- ci/apiv2/hashtopolis.py | 4 +++- ci/apiv2/test_hashlist.py | 12 ++++++------ 2 files changed, 9 insertions(+), 7 deletions(-) diff --git a/ci/apiv2/hashtopolis.py b/ci/apiv2/hashtopolis.py index 1d98f8735..dde1de2b9 100644 --- a/ci/apiv2/hashtopolis.py +++ b/ci/apiv2/hashtopolis.py @@ -1023,11 +1023,13 @@ def export_wordlist(self, hashlist): response = self._helper_request("exportWordlist", payload) return File(**response['data']) - def import_cracked_hashes(self, hashlist, source_data: str, separator): + def import_cracked_hashes(self, hashlist, source_type, source_data: str, separator, overwrite): payload = { 'hashlistId': hashlist.id, + 'sourceType': source_type, 'sourceData': base64.b64encode(source_data.encode()).decode(), 'separator': separator, + 'overwrite': overwrite, } response = self._helper_request("importCrackedHashes", payload) return response['meta'] diff --git a/ci/apiv2/test_hashlist.py b/ci/apiv2/test_hashlist.py index 401be59ac..186c0a25b 100644 --- a/ci/apiv2/test_hashlist.py +++ b/ci/apiv2/test_hashlist.py @@ -68,7 +68,7 @@ def test_export_wordlist(self): cracked = "cc03e747a6afbbcbf8be7668acfebee5:test123" helper = Helper() - helper.import_cracked_hashes(model_obj, cracked, ':') + helper.import_cracked_hashes(model_obj, 'paste', cracked, ':', 0) file = helper.export_wordlist(model_obj) @@ -84,7 +84,7 @@ def test_import_cracked_hashes(self): cracked = "cc03e747a6afbbcbf8be7668acfebee5:test123" helper = Helper() - result = helper.import_cracked_hashes(model_obj, cracked, ':') + result = helper.import_cracked_hashes(model_obj, 'paste', cracked, ':', 0) self.assertEqual(result['totalLines'], 1) self.assertEqual(result['newCracked'], 1) @@ -98,7 +98,7 @@ def test_import_cracked_hashes_invalid(self): cracked = "cc03e747a6afbbcbf8be7668acfebee5__test123" helper = Helper() - result = helper.import_cracked_hashes(model_obj, cracked, ':') + result = helper.import_cracked_hashes(model_obj, 'paste', cracked, ':', 0) self.assertEqual(result['totalLines'], 1) self.assertEqual(result['invalid'], 1) @@ -112,7 +112,7 @@ def test_import_cracked_hashes_notfound(self): cracked = "ffffffffffffffffffffffffffffffff:test123" helper = Helper() - result = helper.import_cracked_hashes(model_obj, cracked, ':') + result = helper.import_cracked_hashes(model_obj, 'paste', cracked, ':', 0) self.assertEqual(result['totalLines'], 1) self.assertEqual(result['notFound'], 1) @@ -126,9 +126,9 @@ def test_import_cracked_hashes_already_cracked(self): cracked = "cc03e747a6afbbcbf8be7668acfebee5:test123" helper = Helper() - helper.import_cracked_hashes(model_obj, cracked, ':') + helper.import_cracked_hashes(model_obj, 'paste', cracked, ':', 0) - result = helper.import_cracked_hashes(model_obj, cracked, ':') + result = helper.import_cracked_hashes(model_obj, 'paste', cracked, ':', 0) self.assertEqual(result['totalLines'], 1) self.assertEqual(result['alreadyCracked'], 1) From 81ec8c3dafad37a2d438eccce2ddca01cd7ced25 Mon Sep 17 00:00:00 2001 From: Eric Wasson <229096365+Eric-Wasson@users.noreply.github.com> Date: Wed, 3 Dec 2025 10:52:41 +0100 Subject: [PATCH 333/691] Fixed sequence of marking hashes as cracked --- src/inc/utils/HashlistUtils.class.php | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/src/inc/utils/HashlistUtils.class.php b/src/inc/utils/HashlistUtils.class.php index 8c053805b..90d22270c 100644 --- a/src/inc/utils/HashlistUtils.class.php +++ b/src/inc/utils/HashlistUtils.class.php @@ -439,13 +439,14 @@ public static function processZap($hashlistId, $separator, $source, $post, $file $tooLong++; continue; } - $hashFactory->mset($hashEntry, [Hash::PLAINTEXT => $plain, Hash::IS_CRACKED => 1, Hash::TIME_CRACKED => time()]); if ($hashEntry->getIsCracked() != 1) { $newCracked++; $crackedIn[$hashEntry->getHashlistId()]++; } + $hashFactory->mset($hashEntry, [Hash::PLAINTEXT => $plain, Hash::IS_CRACKED => 1, Hash::TIME_CRACKED => time()]); + if ($hashlist->getFormat() == DHashlistFormat::PLAIN) { $zaps[] = new Zap(null, $hashEntry->getHash(), time(), null, $hashlist->getId()); } @@ -490,13 +491,13 @@ public static function processZap($hashlistId, $separator, $source, $post, $file continue; } - $hashFactory->mset($hashEntry, [Hash::PLAINTEXT => $plain, Hash::IS_CRACKED => 1, Hash::TIME_CRACKED => time()]); - if ($hashEntry->getIsCracked() != 1) { $newCracked++; $crackedIn[$hashEntry->getHashlistId()]++; } + $hashFactory->mset($hashEntry, [Hash::PLAINTEXT => $plain, Hash::IS_CRACKED => 1, Hash::TIME_CRACKED => time()]); + if ($hashlist->getFormat() == DHashlistFormat::PLAIN) { $zaps[] = new Zap(null, $hashEntry->getHash(), time(), null, $hashlist->getId()); } From a6b3df28a6ad9c52f93110ad3101005e8c08aff2 Mon Sep 17 00:00:00 2001 From: s3inlc Date: Wed, 3 Dec 2025 10:53:28 +0100 Subject: [PATCH 334/691] moved hashtopolis.py into its own repo to be used as library and install it as dependency --- ci/apiv2/hashtopolis.py | 1061 ------------------------------------- ci/apiv2/requirements.txt | 3 +- 2 files changed, 1 insertion(+), 1063 deletions(-) delete mode 100644 ci/apiv2/hashtopolis.py diff --git a/ci/apiv2/hashtopolis.py b/ci/apiv2/hashtopolis.py deleted file mode 100644 index 1d98f8735..000000000 --- a/ci/apiv2/hashtopolis.py +++ /dev/null @@ -1,1061 +0,0 @@ -#!/usr/bin/env python -# -*- coding: utf-8 -*- -# -# PoC testing/development framework for APIv2 -# Written in python to work on creation of hashtopolis APIv2 python binding. -# -import base64 -from base64 import b64encode -import copy -import json -import logging -from pathlib import Path -import requests -import sys -import urllib - -import http -import confidence -import tusclient.client -from tusclient.exceptions import TusCommunicationError - -logger = logging.getLogger(__name__) - -HTTP_DEBUG = False - -# Monkey patching to allow http debugging -if HTTP_DEBUG: - http_logger = logging.getLogger('http.client') - http.client.HTTPConnection.debuglevel = 0 - def print_to_log(*args): # noqa:E301 - http_logger.debug(" ".join(args)) - http.client.print = print_to_log - -cls_registry = {} - - -class HashtopolisError(Exception): - def __init__(self, *args, **kwargs): - print(kwargs) - super().__init__(*args) - self.title = kwargs.get("title", "") - self.type = kwargs.get("type", "") - self.status = kwargs.get("status", None) - - # TODO: These are the old exception details, if all exceptions have been refactored, - # these following lines can be removed. - self.exception_details = kwargs.get('exception_details', []) - self.message = kwargs.get('message', '') - self.status_code = kwargs.get('status_code', None) - - -class HashtopolisConfig(object): - def __init__(self): - # Request access TOKEN, used throughout the test - load_order = (str(Path(__file__).parent.joinpath('{name}-defaults{suffix}')),) \ - + confidence.DEFAULT_LOAD_ORDER - self._cfg = confidence.load_name('hashtopolis-test', load_order=load_order, format=confidence.YAML()) - self._hashtopolis_uri = self._cfg['hashtopolis_uri'] - self._api_endpoint = self._hashtopolis_uri + '/api/v2' - self.username = self._cfg['username'] - self.password = self._cfg['password'] - - -class HashtopolisResponseError(HashtopolisError): - pass - - -class IncludedCache(object): - """ - Cast (potentially) included objects to object structure which - allows for caching and easier retrival - """ - def __init__(self, included_objects): - self._cache = {} - for included_obj in included_objects: - self._cache[self.get_object_uuid(included_obj)] = included_obj - - @staticmethod - def get_object_uuid(obj): - """ Generate unique key identifier for object """ - return "%s.%i" % (obj['type'], obj['id']) - - def get(self, obj): - return self._cache[self.get_object_uuid(obj)] - - -class HashtopolisConnector(object): - # Cache authorisation token per endpoint - token = {} - token_expires = {} - - @staticmethod - def resp_to_json(response): - content_type_header = response.headers.get('Content-Type', '') - if any([x in content_type_header for x in ('application/vnd.api+json', 'application/json', - 'application/problem+json')]): - return response.json() - else: - raise HashtopolisResponseError("Response type '%s' is not valid JSON document, text='%s'" % - (content_type_header, response.text), - status_code=response.status_code) - - def __init__(self, model_uri, config): - self._model_uri = model_uri - self._api_endpoint = config._api_endpoint - self._hashtopolis_uri = config._hashtopolis_uri - self.config = config - - def authenticate(self): - if self._api_endpoint not in HashtopolisConnector.token: - # Request access TOKEN, used throughout the test - - logger.info("Start authentication") - auth_uri = self._api_endpoint + '/auth/token' - auth = (self.config.username, self.config.password) - r = requests.post(auth_uri, auth=auth) - self.validate_status_code(r, [201], "Authentication failed") - - r_json = self.resp_to_json(r) - HashtopolisConnector.token[self._api_endpoint] = r_json['token'] - HashtopolisConnector.token_expires[self._api_endpoint] = r_json['token'] - - self._token = HashtopolisConnector.token[self._api_endpoint] - self._token_expires = HashtopolisConnector.token_expires[self._api_endpoint] - - self._headers = { - 'Authorization': 'Bearer ' + self._token - } - - def create_to_many_payload(self, objects, attributes, field): - records = [] - for obj, attribute in zip(objects, attributes): - records.append({ - "type": type(obj).__name__, - "id": obj.id, - "attributes": { - field: attribute - } - }) - return {"data": records} - - def create_payload(self, obj, attributes, id=None): - payload = {"data": { - "type": type(obj).__name__, - "attributes": attributes - }} - if id is not None: - payload["data"]["id"] = id - return payload - - def validate_status_code(self, r, expected_status_code, error_msg): - """ Validate response and convert to python exception """ - # Status code 204 is special and should have no JSON output - if r.status_code == 204: - assert (r.text == '') - return - - # Expected responses below should be valid JSON - r_json = self.resp_to_json(r) - - # Application hits a problem - if r.status_code not in expected_status_code: - raise HashtopolisResponseError( - "%s (status_code=%s): %s" % (error_msg, r.status_code, r.text), - # TODO old exception details can be removed when it has been refactored everywhere. - status_code=r.status_code, - exception_details=r_json.get('exception', []), - message=r_json.get('message', None), - status=r_json.get('status', None), - type=r_json.get('type', None), - title=r_json.get('title', None)) - - # TODO: this does not work anymore for new pagination style - # def validate_pagination_links(self, response, page): - # """Validate all the links that are used for paginated data""" - # data = response["data"] - # highest_id = max(data, key=lambda obj: obj['id'])['id'] - # lowest_id = min(data, key=lambda obj: obj['id'])['id'] - - # links = response["links"] - # query_params = urllib.parse.parse_qs(urllib.parse.urlparse(links["next"]).query) - # assert (int(query_params["page[size]"][0]) == page["size"]) - # assert (int(query_params["page[after]"][0]) == highest_id) - # query_params = urllib.parse.parse_qs(urllib.parse.urlparse(links["prev"]).query) - # assert (int(query_params["page[size]"][0]) == page["size"]) - # assert (int(query_params["page[before]"][0]) == lowest_id) - # query_params = urllib.parse.parse_qs(urllib.parse.urlparse(links["first"]).query) - # assert (int(query_params["page[size]"][0]) == page["size"]) - # assert (int(query_params["page[after]"][0]) == 0) - # query_params = urllib.parse.parse_qs(urllib.parse.urlparse(links["last"]).query) - # TODO not really a straightforward way to validate the last link - - def get_single_page(self, page, filter): - """Gets a single page by using the page parameters""" - self.authenticate() - headers = self._headers - request_uri = self._api_endpoint + self._model_uri - payload = {} - - for k, v in page.items(): - payload[f"page[{k}]"] = v - if filter: - for k, v in filter.items(): - payload[f"filter[{k}]"] = v - - request_uri = self._api_endpoint + self._model_uri + '?' + urllib.parse.urlencode(payload) - r = requests.get(request_uri, headers=headers) - logger.debug("Request URI: %s", urllib.parse.unquote(r.url)) - self.validate_status_code(r, [200], "paging failed") - response = self.resp_to_json(r) - logger.debug("Response %s", json.dumps(response, indent=4)) - - # validate page links - # self.validate_pagination_links(response, page) - return response["data"] - - # todo refactor start_offset into page variable - def filter(self, include, ordering, filter, start_offset): - self.authenticate() - headers = self._headers - - after_dict = {"primary": {"id": start_offset}} - after_param = b64encode(json.dumps(after_dict).encode('utf-8')).decode('utf-8') - - payload = {} - if (start_offset): - payload['page[after]'] = after_param - if filter: - for k, v in filter.items(): - payload[f"filter[{k}]"] = v - - if include: - payload['include'] = ','.join(include) if type(include) in (list, tuple) else include - if ordering: - payload['sort'] = ','.join(ordering) if type(ordering) in (list, tuple) else ordering - - request_uri = self._api_endpoint + self._model_uri + '?' + urllib.parse.urlencode(payload) - while True: - r = requests.get(request_uri, headers=headers) - logger.debug("Request URI: %s", urllib.parse.unquote(r.url)) - self.validate_status_code(r, [200], "Filtering failed") - response = self.resp_to_json(r) - logger.debug("Response %s", json.dumps(response, indent=4)) - - # Buffer all included objects - included_cache = IncludedCache(response.get('included', [])) - - # Iterate over response objects - for obj in response['data']: - yield (obj, included_cache) - - if 'links' not in response or 'next' not in response['links'] or not response['links']['next']: - break - request_uri = response['links']['next'] - - def get_one(self, pk, include): - self.authenticate() - uri = self._api_endpoint + self._model_uri + f'/{pk}' - headers = self._headers - - payload = {} - if include is not None: - payload['include'] = ','.join(include) if type(include) in (list, tuple) else include - - r = requests.get(uri, headers=headers, data=payload) - self.validate_status_code(r, [200], "Get single object failed") - return self.resp_to_json(r) - - def delete_many(self, objects): - self.authenticate() - uri = self._api_endpoint + self._model_uri - headers = self._headers - headers['Content-Type'] = 'application/json' - records = [] - for obj in objects: - records.append({ - "type": type(obj).__name__, - "id": obj.id, - }) - payload = {"data": records} - logger.debug("Sending bulk DELETE payload: %s to %s", json.dumps(payload), uri) - r = requests.delete(uri, headers=headers, data=json.dumps(payload)) - self.validate_status_code(r, [204], "deleting failed") - - def patch_many(self, objects, attributes, field): - """ - Used to test PATCH many endpoint. - - args: - objects [Object]: the database objects that have to be PATCHED - field string: the field that has to be changed in the object - attributes [any]: these are the actual attributes you want to set the objects to, where object[0] will be - patched with attributes[0] on the set field - """ - assert len(objects) == len(attributes) - self.authenticate() - uri = self._api_endpoint + self._model_uri - headers = self._headers - headers['Content-Type'] = 'application/json' - payload = self.create_to_many_payload(objects, attributes, field) - logger.debug("Sending bulk PATCH payload: %s to %s", json.dumps(payload), uri) - r = requests.patch(uri, headers=headers, data=json.dumps(payload)) - self.validate_status_code(r, [200], "Patching failed") - - def patch_one(self, obj): - if not obj.has_changed(): - logger.debug("Object '%s' has not changed, no PATCH required", obj) - return - - self.authenticate() - uri = self._hashtopolis_uri + obj.uri - headers = self._headers - headers['Content-Type'] = 'application/json' - attributes = {} - - for k, v in obj.diff().items(): - logger.debug("Going to patch object '%s' property '%s' from '%s' to '%s'", obj, k, v[0], v[1]) - attributes[k] = v[1] - - payload = self.create_payload(obj, attributes, id=obj.id) - logger.debug("Sending PATCH payload: %s to %s", json.dumps(payload), uri) - r = requests.patch(uri, headers=headers, data=json.dumps(payload)) - self.validate_status_code(r, [200], "Patching failed") - - # TODO: Validate if return objects matches digital twin - obj.set_initial(self.resp_to_json(r)['data'].copy()) - - def send_patch(self, uri, data): - self.authenticate() - headers = self._headers - headers['Content-Type'] = 'application/json' - logger.debug("Sending PATCH payload: %s to %s", json.dumps(data), uri) - r = requests.patch(uri, headers=headers, data=json.dumps(data)) - self.validate_status_code(r, [204], "Patching failed") - - def patch_to_many_relationships(self, obj): - for k, v in obj.diff_includes().items(): - attributes = [] - logger.debug("Going to patch object '%s' property '%s' from '%s' to '%s'", obj, k, v[0], v[1]) - for include_id in v[1]: - attributes.append({"type": k, "id": include_id}) - data = {"data": attributes} - uri = self._hashtopolis_uri + obj.uri + "/relationships/" + k - self.send_patch(uri, data) - - def create(self, obj): - # Check if object to be created is new - assert obj._new_model is True - - self.authenticate() - uri = self._api_endpoint + self._model_uri - headers = self._headers - headers['Content-Type'] = 'application/json' - - attributes = obj.get_fields() - payload = self.create_payload(obj, attributes) - - logger.debug("Sending POST payload: %s to %s", json.dumps(payload), uri) - r = requests.post(uri, headers=headers, data=json.dumps(payload)) - self.validate_status_code(r, [201], "Creation of object failed") - - # TODO: Validate if return objects matches digital twin - obj.set_initial(self.resp_to_json(r)['data'].copy()) - - def delete(self, obj): - """ Delete object from database """ - # TODO: Check if object to be deleted actually exists - assert obj._new_model is False - - self.authenticate() - uri = self._hashtopolis_uri + obj.uri - headers = self._headers - payload = {} - - r = requests.delete(uri, headers=headers, data=json.dumps(payload)) - self.validate_status_code(r, [204], "Deletion of object failed") - - # TODO: Cleanup object to allow re-creation - - def count(self, filter): - self.authenticate() - uri = self._api_endpoint + self._model_uri + "/count" - headers = self._headers - payload = {} - if filter: - for k, v in filter.items(): - payload[f"filter[{k}]"] = v - - logger.debug("Sending GET payload: %s to %s", json.dumps(payload), uri) - r = requests.get(uri, headers=headers, params=payload) - self.validate_status_code(r, [200], "Getting count failed") - return self.resp_to_json(r)['meta'] - - -# Build Django ORM style django.query interface -class QuerySet(): - def __init__(self, cls, include=None, ordering=None, filters=None, pages=None): - self.cls = cls - self.include = include - self.ordering = ordering - self.filters = filters - self.pages = pages - - def __iter__(self): - yield from self.__getitem__(slice(None, None, 1)) - - def __getitem__(self, k): - if isinstance(k, int): - return list(self.filter_(k, k + 1, 1))[0] - - if isinstance(k, slice): - return self.filter_(k.start or 0, k.stop or sys.maxsize, k.step or 1) - - def get_pagination(self): - objs = self.cls.get_conn().get_single_page(self.pages, self.filters) - parsed_objs = [] - for obj in objs: - parsed_objs.append(self.cls._model(**obj)) - return parsed_objs - - def filter_(self, start, stop, step): - index = start or 0 - cursor = index - - # pk field is special and should be translated - if self.filters is None: - filters = None - else: - filters = self.filters.copy() - if 'pk' in filters: - filters['id'] = filters['pk'] - del filters['pk'] - - filter_generator = self.cls.get_conn().filter(self.include, self.ordering, filters, start_offset=cursor) - - while index < stop: - # Fetch new entries in chunks default to server - try: - (obj, included_cache) = next(filter_generator) - except StopIteration: - return - - # Return value - model_obj = self.cls._model(**obj) - model_obj.set_prefetched_relationships(included_cache) - yield model_obj - - index += 1 - - # Remove items skipped by step - for _ in range(step - 1): - try: - _ = next(filter_generator) - except StopIteration: - return - - def order_by(self, *ordering): - self.ordering = ordering - return self - - def filter(self, **filters): - self.filters = filters - return self - - def page(self, **pages): - self.pages = pages - return self - - def all(self): - # yield from self - return self - - def get(self, **filters): - if filters: - self.filters = filters - - # Generiek retrival, only need two entries to find out failures - objs = list(self.__getitem__(slice(0, 2, 1))) - if len(objs) == 0: - raise self.cls._model.DoesNotExist - elif len(objs) > 1: - raise self.cls._model.MultipleObjectsReturned - return objs[0] - - def __len__(self): - return len(list(iter(self))) - - -class ManagerBase(type): - conn = {} - # Cache configuration values - config = None - - @classmethod - def prefetch_related(cls, *include): - return QuerySet(cls, include=include) - - @classmethod - def get_conn(cls): - if cls.config is None: - cls.config = HashtopolisConfig() - - if cls._model_uri not in cls.conn: - cls.conn[cls._model_uri] = HashtopolisConnector(cls._model_uri, cls.config) - return cls.conn[cls._model_uri] - - @classmethod - def all(cls): - """ - Retrieve all backend objects - """ - return cls.filter() - - @classmethod - def patch(cls, obj): - # TODO also patch to one relationships - cls.get_conn().patch_to_many_relationships(obj) - cls.get_conn().patch_one(obj) - - @classmethod - def patch_many(cls, objects, attributes, field): - cls.get_conn().patch_many(objects, attributes, field) - - @classmethod - def delete_many(cls, objects): - cls.get_conn().delete_many(objects) - - @classmethod - def create(cls, obj): - cls.get_conn().create(obj) - - @classmethod - def delete(cls, obj): - cls.get_conn().delete(obj) - - @classmethod - def get_first(cls): - """ - Retrieve first object - TODO: Error handling if first object does not exists - """ - return cls.all()[0] - - @classmethod - def get(cls, **filters): - return QuerySet(cls, filters=filters).get() - - @classmethod - def count(cls, **filters): - return cls.get_conn().count(filter=filters) - - @classmethod - def paginate(cls, **pages): - return QuerySet(cls, pages=pages) - - @classmethod - def filter(cls, **filters): - return QuerySet(cls, filters=filters) - - -class ObjectDoesNotExist(Exception): - """The requested object does not exist""" - - -class MultipleObjectsReturned(Exception): - """The query returned multiple objects when only one was expected.""" - - -# Build Django ORM style 'ModelName.objects' interface -class ModelBase(type): - def __new__(cls, clsname, bases, attrs, uri=None, **kwargs): - parents = [b for b in bases if isinstance(b, ModelBase)] - if not parents: - return super().__new__(cls, clsname, bases, attrs) - - new_class = super().__new__(cls, clsname, bases, attrs) - - setattr(new_class, 'objects', type('Manager', (ManagerBase,), {'_model_uri': uri})) - setattr(new_class.objects, '_model', new_class) - - def add_to_class(class_name, class_type): - setattr(new_class, - class_name, - type(class_name, (class_type,), { - "__qualname__": "%s.%s" % (new_class.__qualname__, class_name), - '__module__': "%s" % (__name__) - })) - add_to_class('DoesNotExist', ObjectDoesNotExist) - add_to_class('MultipleObjectsReturned', MultipleObjectsReturned) - - cls_registry[clsname] = new_class - - # Insert Meta properties - if hasattr(new_class, 'Meta'): - META_FIELDS = ['verbose_name', 'verbose_name_plural'] - for field in META_FIELDS: - if hasattr(new_class.Meta, field): - setattr(new_class, field, getattr(new_class.Meta, field)) - - if not hasattr(new_class, 'verbose_name'): - new_class.verbose_name = new_class.__name__ - - if not hasattr(new_class, 'verbose_name_plural'): - new_class.verbose_name_plural = new_class.verbose_name + 's' - - return new_class - - -class Model(metaclass=ModelBase): - def __init__(self, *args, **kwargs): - if 'links' in kwargs: - # Loading of existing model - self.set_initial(kwargs) - else: - self.set_initial({'attributes': kwargs}) - super().__init__() - - def __repr__(self): - return self.__uri - - def __eq__(self, other): - return (self.get_fields() == other.get_fields()) - - def _dict2obj(self, dict): - """ - Convert resource object dictionary to an model Object - """ - uri = dict['links']['self'] - uri_without_id = '/'.join(uri.split('/')[:-1]) - # Loop through all the registers classes - for _, model in cls_registry.items(): - model_uri = model.objects._model_uri - # Check if part of the uri is in the model uri - if uri_without_id.endswith(model_uri): - return model(**dict) - # If we are here, it means that no uri matched, thus we don't know the object. - raise TypeError(f"Object identifier '{uri}' not valid/defined model") - - def set_initial(self, kv): - self.__fields = [] - self.__included = [] - self._new_model = True - # Store fields allowing us to detect changed values - if 'links' in kv: - self.__initial = copy.deepcopy(kv) - self.__uri = kv['links']['self'] - self.__id = kv['id'] - self._new_model = False - else: - # New model - self.__initial = {} - - self.__relationships = kv.get('relationships', {}) - - # Create attribute values - for k, v in kv['attributes'].items(): - setattr(self, k, v) - self.__fields.append(k) - - def set_prefetched_relationships(self, included_cache): - """ - Populate prefetched relationships - """ - for relationship_name, resource_identifier_object in self.__relationships.items(): - if 'data' not in resource_identifier_object: - # TODO Deal with 'link' type related relationships - continue - - resource_identifier_object_data_type = type(resource_identifier_object['data']) - if resource_identifier_object_data_type is type(None): - # Empty to-one relationship - setattr(self, relationship_name, None) - self.__included.append(relationship_name) - elif resource_identifier_object_data_type is dict: - # Non-empty to-one relationship - to_one_relation_obj = self._dict2obj(included_cache.get(resource_identifier_object['data'])) - setattr(self, relationship_name, to_one_relation_obj) - self.__included.append(relationship_name) - elif resource_identifier_object_data_type is list: - to_many_relation_objs = [] - # to-many relationship - for obj in resource_identifier_object['data']: - to_many_relation_objs.append(self._dict2obj(included_cache.get(obj))) - setattr(self, relationship_name + '_set', to_many_relation_objs) - self.__included.append(relationship_name + "_set") - else: - raise AssertionError("Invalid resource indentifier object class type=%s" % - resource_identifier_object_data_type) - - def get_fields(self): - return dict([(k, getattr(self, k)) for k in sorted(self.__fields)]) - - def diff(self): - # Stored database values - d_initial = self.__initial['attributes'] - # Possible changes values - d_current = self.get_fields() - diffs = [] - for key, v_current in d_current.items(): - v_innitial = d_initial[key] - if v_current != v_innitial: - diffs.append((key, (v_innitial, v_current))) - - return dict(diffs) - - def diff_includes(self): - diffs = [] - # Find includeables sets which have changed - for include in self.__included: - if include.endswith('_set'): - innitial_name = include[:-4] - # Retrieve innitial keys - v_innitial = self.__initial['relationships'][innitial_name]['data'] - v_innitial_ids = [x['id'] for x in v_innitial] - # Retrieve new/current keys - v_current = getattr(self, include) - v_current_ids = [x.id for x in v_current] - # Use ID of ojbects as new current/update identifiers - if sorted(v_innitial_ids) != sorted(v_current_ids): - diffs.append((innitial_name, (v_innitial_ids, v_current_ids))) - - return dict(diffs) - - def has_changed(self): - return bool(self.diff()) - - def save(self): - if self._new_model: - self.objects.create(self) - else: - self.objects.patch(self) - return self - - def delete(self): - if not self._new_model: - self.objects.delete(self) - - def serialize(self): - retval = dict([(x, getattr(self, x)) for x in self.__fields] + [('_self', self.__uri), ('_id', self.__id)]) - for includeable in self.__included: - if includeable.endswith('_set'): - retval[includeable] = [x.serialize() for x in getattr(self, includeable)] - else: - retval[includeable] = getattr(self, includeable).serialize() - return retval - - @property - def id(self): - return self.__id - - @property - def pk(self): - return self.__id - - @property - def uri(self): - return self.__uri - - -## -# Begin of API objects -# -class AccessGroup(Model, uri="/ui/accessgroups"): - pass - - -class Agent(Model, uri="/ui/agents"): - pass - - -class AgentStat(Model, uri="/ui/agentstats"): - pass - - -class AgentBinary(Model, uri="/ui/agentbinaries"): - class Meta: - verbose_name_plural = 'AgentBinaries' - - -class AgentAssignment(Model, uri="/ui/agentassignments"): - pass - - -class Chunk(Model, uri="/ui/chunks"): - pass - - -class Config(Model, uri="/ui/configs"): - pass - - -class ConfigSection(Model, uri="/ui/configsections"): - pass - - -class Cracker(Model, uri="/ui/crackers"): - pass - - -class CrackerType(Model, uri="/ui/crackertypes"): - pass - - -class File(Model, uri="/ui/files"): - pass - - -class GlobalPermissionGroup(Model, uri="/ui/globalpermissiongroups"): - pass - - -class Hash(Model, uri="/ui/hashes"): - class Meta: - verbose_name_plural = 'Hashes' - - -class Hashlist(Model, uri="/ui/hashlists"): - pass - - -class HashType(Model, uri="/ui/hashtypes"): - pass - - -class HealthCheck(Model, uri="/ui/healthchecks"): - pass - - -class HealthCheckAgent(Model, uri="/ui/healthcheckagents"): - pass - - -class LogEntry(Model, uri="/ui/logentries"): - class Meta: - verbose_name_plural = 'LogEntries' - - -class Notification(Model, uri="/ui/notifications"): - pass - - -class Preprocessor(Model, uri="/ui/preprocessors"): - pass - - -class Pretask(Model, uri="/ui/pretasks"): - pass - - -class Speed(Model, uri="/ui/speeds"): - pass - - -class Supertask(Model, uri="/ui/supertasks"): - pass - - -class Task(Model, uri="/ui/tasks"): - pass - - -class TaskWrapper(Model, uri="/ui/taskwrappers"): - pass - - -class User(Model, uri="/ui/users"): - pass - - -class Voucher(Model, uri="/ui/vouchers"): - pass -# -# End of API objects -## - - -class FileImport(HashtopolisConnector): - def __init__(self): - super().__init__("/helper/importFile", HashtopolisConfig()) - - def __repr__(self): - return self._self - - def do_upload(self, filename, file_stream, chunk_size=1000000000): - self.authenticate() - - uri = self._api_endpoint + self._model_uri - - my_client = tusclient.client.TusClient(uri) - my_client.set_headers(self._headers) - - metadata = {"filename": filename, - "filetype": "application/text"} - uploader = my_client.uploader( - file_stream=file_stream, - chunk_size=chunk_size, - upload_checksum=True, - metadata=metadata - ) - try: - uploader.upload() - except TusCommunicationError as e: - response_content = e.response_content.decode('utf-8') - raise HashtopolisResponseError(f"{e}: {response_content}", - exception_details=response_content, - status_code=e.status_code) - - -class Meta(HashtopolisConnector): - def __init__(self): - super().__init__("/openapi.json", HashtopolisConfig()) - - def get_meta(self): - self.authenticate() - uri = self._api_endpoint + self._model_uri - r = requests.get(uri, headers={"Accept-Encoding": "gzip"}) - self.validate_status_code(r, [200], "Unable to retrieve Meta definitions") - return self.resp_to_json(r) - - -class Helper(HashtopolisConnector): - def __init__(self): - super().__init__("/helper/", HashtopolisConfig()) - - def _helper_request(self, helper_uri, payload): - self.authenticate() - uri = self._api_endpoint + self._model_uri + helper_uri - headers = self._headers - headers['Content-Type'] = 'application/json' - - logging.debug(f"Makeing POST request to {uri}, headers={headers} payload={payload}") - r = requests.post(uri, headers=headers, data=json.dumps(payload)) - self.validate_status_code(r, [200], f"Helper request at {uri} failed") - if r.status_code == 204: - return None - else: - return self.resp_to_json(r) - - def _helper_get_request_file(self, helper_uri, payload, range=None): - self.authenticate() - uri = self._api_endpoint + self._model_uri + helper_uri - headers = self._headers - if range: - headers["Range"] = range - - logging.debug(f"Sending GET request to {uri}, with params:{payload}") - r = requests.get(uri, headers=headers, params=payload) - if range is None: - assert r.status_code == 200 - else: - assert r.status_code == 206 - logging.debug(f"received file contents: \n {r.text}") - return r.text - - def _test_authentication(self, username, password): - auth_uri = self._api_endpoint + '/auth/token' - auth = (username, password) - r = requests.post(auth_uri, auth=auth) - self.validate_status_code(r, [201], "Authentication failed") - - def abort_chunk(self, chunk): - payload = { - 'chunkId': chunk.id, - } - return self._helper_request("abortChunk", payload) - - def create_supertask(self, supertask, hashlist, cracker): - payload = { - 'supertaskTemplateId': supertask.id, - 'hashlistId': hashlist.id, - 'crackerVersionId': cracker.id, - } - # Response is JSON:API type - response = self._helper_request("createSupertask", payload) - return TaskWrapper(**response['data']) - - def create_superhashlist(self, name, hashlists): - payload = { - 'name': name, - 'hashlistIds': [x.id for x in hashlists], - } - # Response is JSON:API type - response = self._helper_request("createSuperHashlist", payload) - return Hashlist(**response['data']) - - def set_user_password(self, user, password): - payload = { - 'userId': user.id, - 'password': password, - } - return self._helper_request("setUserPassword", payload) - - def reset_chunk(self, chunk): - payload = { - 'chunkId': chunk.id, - } - return self._helper_request("resetChunk", payload) - - def purge_task(self, task): - payload = { - 'taskId': task.id, - } - return self._helper_request("purgeTask", payload) - - def export_cracked_hashes(self, hashlist): - payload = { - 'hashlistId': hashlist.id, - } - response = self._helper_request("exportCrackedHashes", payload) - return File(**response['data']) - - def export_left_hashes(self, hashlist): - payload = { - 'hashlistId': hashlist.id, - } - response = self._helper_request("exportLeftHashes", payload) - return File(**response['data']) - - def export_wordlist(self, hashlist): - payload = { - 'hashlistId': hashlist.id, - } - response = self._helper_request("exportWordlist", payload) - return File(**response['data']) - - def import_cracked_hashes(self, hashlist, source_data: str, separator): - payload = { - 'hashlistId': hashlist.id, - 'sourceData': base64.b64encode(source_data.encode()).decode(), - 'separator': separator, - } - response = self._helper_request("importCrackedHashes", payload) - return response['meta'] - - def get_file(self, file, range=None): - payload = { - 'file': file.id - } - return self._helper_get_request_file("getFile", payload, range) - - def recount_file_lines(self, file): - payload = { - 'fileId': file.id, - } - response = self._helper_request("recountFileLines", payload) - return File(**response['meta']) - - def unassign_agent(self, agent): - payload = { - 'agentId': agent.id, - } - response = self._helper_request("unassignAgent", payload) - return response['meta'] - - def assign_agent(self, agent, task): - payload = { - 'agentId': agent.id, - 'taskId': task.id, - } - response = self._helper_request("assignAgent", payload) - return response['meta'] diff --git a/ci/apiv2/requirements.txt b/ci/apiv2/requirements.txt index 231ced6ea..65a033fe5 100644 --- a/ci/apiv2/requirements.txt +++ b/ci/apiv2/requirements.txt @@ -1,5 +1,4 @@ click click_log -confidence==0.17 pytest -tuspy +git+https://github.com/hashtopolis/hashtopolis-pylib.git From dbd373bcd90e1f18b23b9d2acc7580e45918ce63 Mon Sep 17 00:00:00 2001 From: s3inlc Date: Wed, 3 Dec 2025 10:56:21 +0100 Subject: [PATCH 335/691] updated dockerfile to use dependencies from file on build --- Dockerfile | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/Dockerfile b/Dockerfile index 813615d76..cdac90612 100644 --- a/Dockerfile +++ b/Dockerfile @@ -130,8 +130,9 @@ RUN yes | pecl install xdebug && docker-php-ext-enable xdebug \ RUN apt-get update \ && apt-get install -y python3 python3-pip python3-requests python3-pytest -#TODO: Should source from ./ci/apiv2/requirements.txt -RUN pip3 install click click_log confidence pytest tuspy --break-system-packages +# install dependencies from ./ci/apiv2/requirements.txt +COPY ./ci/apiv2/requirements.txt /tmp/requirements.txt +RUN pip3 install -r /tmp/requirements.txt --break-system-packages # Adding VSCode user and fixing permissions RUN groupadd vscode && useradd -rm -d /var/www -s /bin/bash -g vscode -G www-data -u 1001 vscode \ From 27094b03b2f43bedff9c0a8a24d715022eb8fdd0 Mon Sep 17 00:00:00 2001 From: s3inlc Date: Wed, 3 Dec 2025 11:18:06 +0100 Subject: [PATCH 336/691] force to use correct working directory for tests --- .github/workflows/ci.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 22dbc4653..3513676a0 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -28,9 +28,9 @@ jobs: - name: Give Apache permissions on necessary directories # for the tests, only src/files and src/inc/utils/locks seem necessary run: docker exec -u root hashtopolis-server-dev bash -c "chown -R www-data:www-data /var/www/html/src && chmod -R g+w /var/www/html/src" - name: Test with pytest - run: docker exec hashtopolis-server-dev pytest /var/www/html/ci/apiv2 + run: docker exec -w /var/www/html/ci/apiv2 hashtopolis-server-dev pytest - name: Test if pytest is removing all test objects - run: docker exec hashtopolis-server-dev python3 /var/www/html/ci/apiv2/htcli.py run delete-test-data + run: docker exec -w /var/www/html/ci/apiv2 hashtopolis-server-dev python3 htcli.py run delete-test-data - name: Show docker log files if: ${{ always() }} run: docker logs hashtopolis-server-dev From 82c36c51de2afed8b4a72ee93b9d38682c53483e Mon Sep 17 00:00:00 2001 From: Sein Coray Date: Wed, 3 Dec 2025 14:02:56 +0100 Subject: [PATCH 337/691] Update Git dependency for python-hashtopolis --- ci/apiv2/requirements.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ci/apiv2/requirements.txt b/ci/apiv2/requirements.txt index 65a033fe5..24261b12e 100644 --- a/ci/apiv2/requirements.txt +++ b/ci/apiv2/requirements.txt @@ -1,4 +1,4 @@ click click_log pytest -git+https://github.com/hashtopolis/hashtopolis-pylib.git +git+https://github.com/hashtopolis/python-hashtopolis.git From 4acc04a154fd0f89bb0b0aad26547026d9c3d4fe Mon Sep 17 00:00:00 2001 From: s3inlc Date: Wed, 3 Dec 2025 15:35:29 +0100 Subject: [PATCH 338/691] added all user tests covered in the old test framework, one test still failing due some bug --- ci/apiv2/test_user.py | 109 +++++++++++++++++++++++++-- ci/apiv2/utils.py | 1 + src/dba/models/User.class.php | 4 +- src/dba/models/generator.php | 4 +- src/inc/apiv2/model/users.routes.php | 6 +- src/inc/utils/UserUtils.class.php | 3 + 6 files changed, 114 insertions(+), 13 deletions(-) diff --git a/ci/apiv2/test_user.py b/ci/apiv2/test_user.py index 65bd98565..2ad619247 100644 --- a/ci/apiv2/test_user.py +++ b/ci/apiv2/test_user.py @@ -1,4 +1,4 @@ -from hashtopolis import User, Helper +from hashtopolis import User, Helper, HashtopolisError from utils import BaseTest @@ -14,13 +14,12 @@ def test_create(self): def test_patch(self): gp_group = self.create_globalpermissiongroup() - user = self.create_user() - - user.globalPermissionGroupId = gp_group.id - user.save() + model_obj = self.create_test_object() + self._test_patch(model_obj, 'globalPermissionGroupId', gp_group.id) - obj = user.objects.get(id=user.id) - self.assertEqual(obj.globalPermissionGroupId, gp_group.id) + def test_patch_email(self): + model_obj = self.create_test_object() + self._test_patch(model_obj, 'email', "some.valid@email.org") def test_delete(self): model_obj = self.create_test_object(delete=False) @@ -34,6 +33,11 @@ def test_expand(self): def test_disable_enable_user(self): user = self.create_test_object() + # set a password so we can afterwards test with + password = "testing123" + helper = Helper() + helper.set_user_password(user, password) + # Disable User user.isValid = False user.save() @@ -41,6 +45,13 @@ def test_disable_enable_user(self): obj = User.objects.get(id=user.id) self.assertFalse(obj.isValid) + # check that the user is not able to log in, even with the correct password + helper = Helper() + with self.assertRaises(HashtopolisError) as e: + helper._test_authentication(user.name, password) + self.assertEqual(e.exception.status_code, 401) + self.assertEqual(e.exception.title, f"Authentication failed") + # Enable user user.isValid = True user.save() @@ -48,6 +59,17 @@ def test_disable_enable_user(self): obj = User.objects.get(id=user.id) self.assertTrue(obj.isValid) + def test_disable_own_user(self): + # we assume on test setups, there is always user with id 1 existing which was initially created and used for the test run + user = User.objects.get(id=1) + user.isValid = False + with self.assertRaises(HashtopolisError) as e: + user.save() + self.assertEqual(e.exception.status_code, 500) + self.assertEqual(e.exception.title, f"You cannot disable yourself!") + user = User.objects.get(id=1) + self.assertTrue(user.isValid) + def test_helper_set_user_password(self): user = self.create_test_object() newPassword = "testing123" @@ -55,7 +77,80 @@ def test_helper_set_user_password(self): helper.set_user_password(user, newPassword) helper._test_authentication(user.name, newPassword) + def test_helper_set_empty_user_password(self): + user = self.create_test_object() + helper = Helper() + with self.assertRaises(HashtopolisError) as e: + helper.set_user_password(user, "") + self.assertEqual(e.exception.status_code, 500) + self.assertEqual(e.exception.title, f"Password cannot be of zero length!") + def test_bulk_deactivate(self): users = [self.create_test_object() for i in range(5)] active_attributes = [False for i in range(5)] User.objects.patch_many(users, active_attributes, "isValid") + + def test_patch_invalid_email(self): + model_obj = self.create_test_object() + model_obj.email = "this-is-no-email" + with self.assertRaises(HashtopolisError) as e: + model_obj.save() + self.assertEqual(e.exception.status_code, 500) + self.assertEqual(e.exception.title, f"Invalid email address!") + + def test_patch_empty_email(self): + model_obj = self.create_test_object() + model_obj.email = "" + with self.assertRaises(HashtopolisError) as e: + model_obj.save() + self.assertEqual(e.exception.status_code, 500) + self.assertEqual(e.exception.title, f"Invalid email address!") + + def test_patch_invalid_session_lifetime_zero(self): + model_obj = self.create_test_object() + model_obj.sessionLifetime = 0 + with self.assertRaises(HashtopolisError) as e: + model_obj.save() + self.assertEqual(e.exception.status_code, 500) + self.assertEqual(e.exception.title, f"Lifetime must be larger than 1 minute and smaller than 48 hours!") + + def test_patch_invalid_session_lifetime_negative(self): + model_obj = self.create_test_object() + model_obj.sessionLifetime = -5000 + with self.assertRaises(HashtopolisError) as e: + model_obj.save() + self.assertEqual(e.exception.status_code, 500) + self.assertEqual(e.exception.title, f"Lifetime must be larger than 1 minute and smaller than 48 hours!") + + def test_patch_invalid_session_lifetime_large(self): + model_obj = self.create_test_object() + model_obj.sessionLifetime = 500000 + with self.assertRaises(HashtopolisError) as e: + model_obj.save() + self.assertEqual(e.exception.status_code, 500) + self.assertEqual(e.exception.title, f"Lifetime must be larger than 1 minute and smaller than 48 hours!") + + def test_patch_registeredSince(self): + model_obj = self.create_test_object() + model_obj.registeredSince = 123456 + with self.assertRaises(HashtopolisError) as e: + model_obj.save() + self.assertEqual(e.exception.status_code, 403) + self.assertEqual(e.exception.title, f"Key 'registeredSince' is immutable") + + def test_patch_lastLoginDate(self): + model_obj = self.create_test_object() + model_obj.lastLoginDate = 99999999 + with self.assertRaises(HashtopolisError) as e: + model_obj.save() + self.assertEqual(e.exception.status_code, 403) + self.assertEqual(e.exception.title, f"Key 'lastLoginDate' is immutable") + + def test_patch_username(self): + model_obj = self.create_test_object() + model_obj.username = "fancy-username" + with self.assertRaises(HashtopolisError) as e: + model_obj.save() + self.assertEqual(e.exception.status_code, 403) + self.assertEqual(e.exception.title, f"Key 'username' is immutable") + diff --git a/ci/apiv2/utils.py b/ci/apiv2/utils.py index 90179a3aa..dc0e2ba0a 100644 --- a/ci/apiv2/utils.py +++ b/ci/apiv2/utils.py @@ -190,6 +190,7 @@ def do_create_user(global_permission_group_id=1): email='test@example.com', globalPermissionGroupId=global_permission_group_id, isValid=True, + sessionLifetime=3600, ) obj = User(**payload) obj.save() diff --git a/src/dba/models/User.class.php b/src/dba/models/User.class.php index 0abec6aef..ae49f9061 100644 --- a/src/dba/models/User.class.php +++ b/src/dba/models/User.class.php @@ -64,7 +64,7 @@ function getKeyValueDict(): array { static function getFeatures(): array { $dict = array(); $dict['userId'] = ['read_only' => True, "type" => "int", "subtype" => "unset", "choices" => "unset", "null" => False, "pk" => True, "protected" => True, "private" => False, "alias" => "id", "public" => True, "dba_mapping" => False]; - $dict['username'] = ['read_only' => False, "type" => "str(100)", "subtype" => "unset", "choices" => "unset", "null" => False, "pk" => False, "protected" => False, "private" => False, "alias" => "name", "public" => True, "dba_mapping" => False]; + $dict['username'] = ['read_only' => True, "type" => "str(100)", "subtype" => "unset", "choices" => "unset", "null" => False, "pk" => False, "protected" => False, "private" => False, "alias" => "name", "public" => True, "dba_mapping" => False]; $dict['email'] = ['read_only' => False, "type" => "str(150)", "subtype" => "unset", "choices" => "unset", "null" => False, "pk" => False, "protected" => False, "private" => False, "alias" => "email", "public" => False, "dba_mapping" => False]; $dict['passwordHash'] = ['read_only' => True, "type" => "str(256)", "subtype" => "unset", "choices" => "unset", "null" => False, "pk" => False, "protected" => True, "private" => True, "alias" => "passwordHash", "public" => False, "dba_mapping" => False]; $dict['passwordSalt'] = ['read_only' => True, "type" => "str(256)", "subtype" => "unset", "choices" => "unset", "null" => False, "pk" => False, "protected" => True, "private" => True, "alias" => "passwordSalt", "public" => False, "dba_mapping" => False]; @@ -72,7 +72,7 @@ static function getFeatures(): array { $dict['isComputedPassword'] = ['read_only' => True, "type" => "bool", "subtype" => "unset", "choices" => "unset", "null" => False, "pk" => False, "protected" => True, "private" => False, "alias" => "isComputedPassword", "public" => False, "dba_mapping" => False]; $dict['lastLoginDate'] = ['read_only' => True, "type" => "int64", "subtype" => "unset", "choices" => "unset", "null" => False, "pk" => False, "protected" => True, "private" => False, "alias" => "lastLoginDate", "public" => False, "dba_mapping" => False]; $dict['registeredSince'] = ['read_only' => True, "type" => "int64", "subtype" => "unset", "choices" => "unset", "null" => False, "pk" => False, "protected" => True, "private" => False, "alias" => "registeredSince", "public" => False, "dba_mapping" => False]; - $dict['sessionLifetime'] = ['read_only' => True, "type" => "int", "subtype" => "unset", "choices" => "unset", "null" => False, "pk" => False, "protected" => True, "private" => False, "alias" => "sessionLifetime", "public" => False, "dba_mapping" => False]; + $dict['sessionLifetime'] = ['read_only' => False, "type" => "int", "subtype" => "unset", "choices" => "unset", "null" => False, "pk" => False, "protected" => False, "private" => False, "alias" => "sessionLifetime", "public" => False, "dba_mapping" => False]; $dict['rightGroupId'] = ['read_only' => False, "type" => "int", "subtype" => "unset", "choices" => "unset", "null" => False, "pk" => False, "protected" => False, "private" => False, "alias" => "globalPermissionGroupId", "public" => False, "dba_mapping" => False]; $dict['yubikey'] = ['read_only' => True, "type" => "str(256)", "subtype" => "unset", "choices" => "unset", "null" => False, "pk" => False, "protected" => True, "private" => False, "alias" => "yubikey", "public" => False, "dba_mapping" => False]; $dict['otp1'] = ['read_only' => True, "type" => "str(256)", "subtype" => "unset", "choices" => "unset", "null" => False, "pk" => False, "protected" => True, "private" => False, "alias" => "otp1", "public" => False, "dba_mapping" => False]; diff --git a/src/dba/models/generator.php b/src/dba/models/generator.php index 2e5edc4de..a6f9d7d61 100644 --- a/src/dba/models/generator.php +++ b/src/dba/models/generator.php @@ -429,7 +429,7 @@ $CONF['User'] = [ 'columns' => [ ['name' => 'userId', 'read_only' => True, 'type' => 'int', 'protected' => True, 'alias' => 'id', 'public' => True], - ['name' => 'username', 'read_only' => False, 'type' => 'str(100)', 'alias' => 'name', 'public' => True], + ['name' => 'username', 'read_only' => True, 'type' => 'str(100)', 'alias' => 'name', 'public' => True], ['name' => 'email', 'read_only' => False, 'type' => 'str(150)'], ['name' => 'passwordHash', 'read_only' => True, 'type' => 'str(256)', 'protected' => True, 'private' => True], ['name' => 'passwordSalt', 'read_only' => True, 'protected' => True, 'type' => 'str(256)', 'private' => True], @@ -437,7 +437,7 @@ ['name' => 'isComputedPassword', 'read_only' => True, 'type' => 'bool', 'protected' => True,], ['name' => 'lastLoginDate', 'read_only' => True, 'type' => 'int64', 'protected' => True], ['name' => 'registeredSince', 'read_only' => True, 'type' => 'int64', 'protected' => True], - ['name' => 'sessionLifetime', 'read_only' => True, 'type' => 'int', 'protected' => True], + ['name' => 'sessionLifetime', 'read_only' => False, 'type' => 'int', 'protected' => False], ['name' => 'rightGroupId', 'read_only' => False, 'type' => 'int', 'alias' => 'globalPermissionGroupId', 'relation' => 'RightGroup'], ['name' => 'yubikey', 'read_only' => True, 'type' => 'str(256)', 'protected' => True], ['name' => 'otp1', 'read_only' => True, 'type' => 'str(256)', 'protected' => True], diff --git a/src/inc/apiv2/model/users.routes.php b/src/inc/apiv2/model/users.routes.php index caa2ed72e..917937ca1 100644 --- a/src/inc/apiv2/model/users.routes.php +++ b/src/inc/apiv2/model/users.routes.php @@ -120,10 +120,12 @@ private function toggleValidityUser($userId, $isValid, $current_user): void { protected function getUpdateHandlers($id, $current_user): array { return [ User::RIGHT_GROUP_ID => fn($value) => UserUtils::setRights($id, $value, $current_user), - User::IS_VALID => fn($value) => $this->toggleValidityUser($id, $value, $current_user) + User::IS_VALID => fn($value) => $this->toggleValidityUser($id, $value, $current_user), + User::EMAIL => fn($value) => AccountUtils::setEmail($value, UserUtils::getUser($id)), + User::SESSION_LIFETIME => fn($value) => AccountUtils::updateSessionLifetime($value, UserUtils::getUser($id)), ]; } } -UserAPI::register($app); \ No newline at end of file +UserAPI::register($app); diff --git a/src/inc/utils/UserUtils.class.php b/src/inc/utils/UserUtils.class.php index 4051efbb8..d6f7fcd78 100644 --- a/src/inc/utils/UserUtils.class.php +++ b/src/inc/utils/UserUtils.class.php @@ -165,6 +165,9 @@ public static function setPassword($userId, $password, $adminUser) { if ($user->getId() == $adminUser->getId()) { throw new HTException("To change your own password go to your settings!"); } + else if (strlen($password) == 0) { + throw new HTException("Password cannot be of zero length!"); + } $newSalt = Util::randomString(20); $newHash = Encryption::passwordHash($password, $newSalt); From e449ac21a3a58405d610040cba7ad8d10721180f Mon Sep 17 00:00:00 2001 From: s3inlc Date: Mon, 8 Dec 2025 10:21:06 +0100 Subject: [PATCH 339/691] added confidence explicitly again as dependency --- ci/apiv2/requirements.txt | 1 + 1 file changed, 1 insertion(+) diff --git a/ci/apiv2/requirements.txt b/ci/apiv2/requirements.txt index 24261b12e..51f53dcda 100644 --- a/ci/apiv2/requirements.txt +++ b/ci/apiv2/requirements.txt @@ -2,3 +2,4 @@ click click_log pytest git+https://github.com/hashtopolis/python-hashtopolis.git +confidence From 2dcff2944026348c9aeb196e21deedde62d7d447 Mon Sep 17 00:00:00 2001 From: s3inlc Date: Mon, 8 Dec 2025 10:25:45 +0100 Subject: [PATCH 340/691] set mysql as default dba if type is not set --- docker-entrypoint.sh | 3 +++ 1 file changed, 3 insertions(+) diff --git a/docker-entrypoint.sh b/docker-entrypoint.sh index 5b6fc174a..c0fc53d29 100755 --- a/docker-entrypoint.sh +++ b/docker-entrypoint.sh @@ -9,6 +9,9 @@ for path in ${paths[@]}; do exit 1 fi done +if [[ -z "${HASHTOPOLIS_DB_TYPE+x}" ]]; then + HASHTOPOLIS_DB_TYPE="mysql" +fi echo "Testing database..." if [[ "$HASHTOPOLIS_DB_TYPE" == "mysql" ]]; then From 81e67f712086f84511ed713813b93fcb8521b3ef Mon Sep 17 00:00:00 2001 From: s3inlc Date: Mon, 8 Dec 2025 12:27:07 +0100 Subject: [PATCH 341/691] added missing use DBA\UpdateSet --- src/inc/api/APISendProgress.class.php | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/inc/api/APISendProgress.class.php b/src/inc/api/APISendProgress.class.php index 0f5311cf8..d40c6bf13 100644 --- a/src/inc/api/APISendProgress.class.php +++ b/src/inc/api/APISendProgress.class.php @@ -19,6 +19,7 @@ use DBA\Factory; use DBA\TaskWrapper; use DBA\Speed; +use DBA\UpdateSet; class APISendProgress extends APIBasic { public function execute($QUERY = array()) { @@ -543,4 +544,4 @@ public function execute($QUERY = array()) { ) ); } -} \ No newline at end of file +} From a2b0d31c018985a268b7e5ddab25fdd1b1d4bb6e Mon Sep 17 00:00:00 2001 From: s3inlc Date: Mon, 8 Dec 2025 12:32:19 +0100 Subject: [PATCH 342/691] two other places where the use statements still were missing --- src/install/updates/update_v0.5.x_v0.6.0.php | 1 + src/install/updates/update_v0.7.x_v0.8.0.php | 1 + 2 files changed, 2 insertions(+) diff --git a/src/install/updates/update_v0.5.x_v0.6.0.php b/src/install/updates/update_v0.5.x_v0.6.0.php index 374daa291..6df1412b8 100644 --- a/src/install/updates/update_v0.5.x_v0.6.0.php +++ b/src/install/updates/update_v0.5.x_v0.6.0.php @@ -5,6 +5,7 @@ use DBA\RightGroup; use DBA\User; use DBA\Factory; +use DBA\UpdateSet; /** @noinspection PhpIncludeInspection */ require_once(dirname(__FILE__) . "/../../inc/db.php"); diff --git a/src/install/updates/update_v0.7.x_v0.8.0.php b/src/install/updates/update_v0.7.x_v0.8.0.php index 2d3348e5a..ccdf6c800 100644 --- a/src/install/updates/update_v0.7.x_v0.8.0.php +++ b/src/install/updates/update_v0.7.x_v0.8.0.php @@ -4,6 +4,7 @@ use DBA\File; use DBA\Config; use DBA\ConfigSection; +use DBA\UpdateSet; /** @noinspection PhpIncludeInspection */ require_once(dirname(__FILE__) . "/../../inc/db.php"); From faaf405564f827cefbda0df79243151f27b9bd38 Mon Sep 17 00:00:00 2001 From: s3inlc Date: Mon, 8 Dec 2025 14:07:25 +0100 Subject: [PATCH 343/691] fix query where filter was using wrong factory --- src/tasks.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/tasks.php b/src/tasks.php index d718507b4..8951f706e 100755 --- a/src/tasks.php +++ b/src/tasks.php @@ -184,7 +184,7 @@ UI::add('agentsSpeed', $agentsSpeed); $assignAgents = array(); - $qF = new QueryFilter(AccessGroupAgent::ACCESS_GROUP_ID, $hashlist->getAccessGroupId(), "="); + $qF = new QueryFilter(AccessGroupAgent::ACCESS_GROUP_ID, $hashlist->getAccessGroupId(), "=", Factory::getAccessGroupAgentFactory()); $jF = new JoinFilter(Factory::getAccessGroupAgentFactory(), AccessGroupAgent::AGENT_ID, Agent::AGENT_ID); $allAgents = Factory::getAgentFactory()->filter([Factory::FILTER => $qF, Factory::JOIN => $jF])[Factory::getAgentFactory()->getModelName()]; foreach ($allAgents as $agent) { From d7f6b4a774f1c338574ba7fa8ce2f60ff89ba25c Mon Sep 17 00:00:00 2001 From: s3inlc Date: Tue, 9 Dec 2025 09:19:40 +0100 Subject: [PATCH 344/691] added new unique index update for postgres --- src/migrations/mysql/20251209091723_postgres-index-fix.sql | 1 + src/migrations/postgres/20251209091723_postgres-index-fix.sql | 2 ++ 2 files changed, 3 insertions(+) create mode 100644 src/migrations/mysql/20251209091723_postgres-index-fix.sql create mode 100644 src/migrations/postgres/20251209091723_postgres-index-fix.sql diff --git a/src/migrations/mysql/20251209091723_postgres-index-fix.sql b/src/migrations/mysql/20251209091723_postgres-index-fix.sql new file mode 100644 index 000000000..5c12d9e57 --- /dev/null +++ b/src/migrations/mysql/20251209091723_postgres-index-fix.sql @@ -0,0 +1 @@ +-- This migration is only a placeholder to keep migrations parallel diff --git a/src/migrations/postgres/20251209091723_postgres-index-fix.sql b/src/migrations/postgres/20251209091723_postgres-index-fix.sql new file mode 100644 index 000000000..9273d4e75 --- /dev/null +++ b/src/migrations/postgres/20251209091723_postgres-index-fix.sql @@ -0,0 +1,2 @@ +DROP INDEX IF EXISTS hash_hash_idx; +CREATE UNIQUE INDEX IF NOT EXISTS hash_hash_idx ON hash(hashtext(hash)); From 78d2b0653c5b3a813097f269a85db34f6121ee77 Mon Sep 17 00:00:00 2001 From: s3inlc Date: Tue, 9 Dec 2025 09:36:31 +0100 Subject: [PATCH 345/691] index must not be uniqe for hash --- src/migrations/postgres/20251209091723_postgres-index-fix.sql | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/migrations/postgres/20251209091723_postgres-index-fix.sql b/src/migrations/postgres/20251209091723_postgres-index-fix.sql index 9273d4e75..02d242646 100644 --- a/src/migrations/postgres/20251209091723_postgres-index-fix.sql +++ b/src/migrations/postgres/20251209091723_postgres-index-fix.sql @@ -1,2 +1,2 @@ DROP INDEX IF EXISTS hash_hash_idx; -CREATE UNIQUE INDEX IF NOT EXISTS hash_hash_idx ON hash(hashtext(hash)); +CREATE INDEX IF NOT EXISTS hash_hash_idx ON hash(hashtext(hash)); From 5bfe2e8d14dcb3c5e9ec4a9b00d0d135f6aa914e Mon Sep 17 00:00:00 2001 From: s3inlc Date: Tue, 9 Dec 2025 10:10:26 +0100 Subject: [PATCH 346/691] force aggregation names to be lowercase always to be compatible with case-insensitive DBs --- src/dba/Aggregation.class.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/dba/Aggregation.class.php b/src/dba/Aggregation.class.php index 8889abcc7..bf25e9677 100755 --- a/src/dba/Aggregation.class.php +++ b/src/dba/Aggregation.class.php @@ -24,7 +24,7 @@ function __construct($column, $function, $overrideFactory = null) { } function getName() { - return strtolower($this->function) . "_" . $this->column; + return strtolower($this->function) . "_" . strtolower($this->column); } function getQueryString(AbstractModelFactory $factory, bool $includeTable = false) { From 5214f3453f300564fec75e53468b0463877293c2 Mon Sep 17 00:00:00 2001 From: s3inlc Date: Tue, 9 Dec 2025 11:32:50 +0100 Subject: [PATCH 347/691] set batch size of inserts on hashlist creation to 5000 --- src/inc/utils/HashlistUtils.class.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/inc/utils/HashlistUtils.class.php b/src/inc/utils/HashlistUtils.class.php index a3d4d8127..89527d7a1 100644 --- a/src/inc/utils/HashlistUtils.class.php +++ b/src/inc/utils/HashlistUtils.class.php @@ -879,7 +879,7 @@ public static function createHashlist($name, $isSalted, $isSecret, $isHexSalted, $preFound++; } $bufferCount++; - if ($bufferCount >= 10000) { + if ($bufferCount >= 5000) { $result = Factory::getHashFactory()->massSave($values); $added += $result->rowCount(); $values = array(); From 6f5334ec0115af53e7ecae8e3a04e015b7486c33 Mon Sep 17 00:00:00 2001 From: s3inlc Date: Tue, 9 Dec 2025 12:03:49 +0100 Subject: [PATCH 348/691] finished user tests --- ci/apiv2/test_user.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/ci/apiv2/test_user.py b/ci/apiv2/test_user.py index 2ad619247..cdbb3c9fb 100644 --- a/ci/apiv2/test_user.py +++ b/ci/apiv2/test_user.py @@ -148,9 +148,9 @@ def test_patch_lastLoginDate(self): def test_patch_username(self): model_obj = self.create_test_object() - model_obj.username = "fancy-username" + model_obj.name = "fancy-username" with self.assertRaises(HashtopolisError) as e: model_obj.save() self.assertEqual(e.exception.status_code, 403) - self.assertEqual(e.exception.title, f"Key 'username' is immutable") + self.assertEqual(e.exception.title, f"Key 'name' is immutable") From 62e9f72a66d4bd85981165e93378ac9c1c539be9 Mon Sep 17 00:00:00 2001 From: s3inlc Date: Tue, 9 Dec 2025 12:04:10 +0100 Subject: [PATCH 349/691] fixed attribute tests failing due to user required fields --- ci/apiv2/test_attributes.py | 3 +++ 1 file changed, 3 insertions(+) diff --git a/ci/apiv2/test_attributes.py b/ci/apiv2/test_attributes.py index 86d94ce9b..1e6ac44a8 100644 --- a/ci/apiv2/test_attributes.py +++ b/ci/apiv2/test_attributes.py @@ -16,6 +16,7 @@ def test_patch_read_only(self): name=username, email='test@example.com', globalPermissionGroupId=1, + sessionLifetime=6000, ) user.save() @@ -45,6 +46,7 @@ def test_create_protected(self): email='test@example.com', globalPermissionGroupId=1, passwordHash='test', + sessionLifetime=6000, ) with self.assertRaises(HashtopolisError) as e: user.save() @@ -59,6 +61,7 @@ def test_get_private(self): name=username, email='test@example.com', globalPermissionGroupId=1, + sessionLifetime=6000, ) user.save() From 2b0a567bdaf9e0c47d6d126b6805eee7e8e83116 Mon Sep 17 00:00:00 2001 From: s3inlc Date: Tue, 9 Dec 2025 12:04:23 +0100 Subject: [PATCH 350/691] clean up unnecessary file --- src/dba/models.py | 614 ---------------------------------------------- 1 file changed, 614 deletions(-) delete mode 100644 src/dba/models.py diff --git a/src/dba/models.py b/src/dba/models.py deleted file mode 100644 index d0d63c3c7..000000000 --- a/src/dba/models.py +++ /dev/null @@ -1,614 +0,0 @@ -# This is an auto-generated Django model module. -# You'll have to do the following manually to clean this up: -# * Rearrange models' order -# * Make sure each model has one field with primary_key=True -# * Make sure each ForeignKey and OneToOneField has `on_delete` set to the desired behavior -# * Remove `managed = False` lines if you wish to allow Django to create, modify, and delete the table -# Feel free to rename the models, but don't rename db_table values or field names. -#from django.db import models - -class models: - DO_NOTHING = 'do_nothing' - class Field: - def __init__(self, **kwargs): - pass - class Model: - pass - class AutoField(Field): - pass - - class CharField(Field): - pass - class IntegerField(Field): - pass - class TextField(Field): - pass - class BigIntegerField(Field): - pass - class ForeignKey(Field): - def __init__(self, related_model, on_cascade, **kwargs): - pass - -class Accessgroup(models.Model): - accessgroupid = models.AutoField(db_column='accessGroupId', primary_key=True) - groupname = models.CharField(db_column='groupName', max_length=50) - - class Meta: - managed = False - db_table = 'AccessGroup' - - -class Accessgroupagent(models.Model): - accessgroupagentid = models.AutoField(db_column='accessGroupAgentId', primary_key=True) - accessgroupid = models.ForeignKey(Accessgroup, models.DO_NOTHING, db_column='accessGroupId') - agentid = models.ForeignKey('Agent', models.DO_NOTHING, db_column='agentId') - - class Meta: - managed = False - db_table = 'AccessGroupAgent' - - -class Accessgroupuser(models.Model): - accessgroupuserid = models.AutoField(db_column='accessGroupUserId', primary_key=True) - accessgroupid = models.ForeignKey(Accessgroup, models.DO_NOTHING, db_column='accessGroupId') - userid = models.ForeignKey('User', models.DO_NOTHING, db_column='userId') - - class Meta: - managed = False - db_table = 'AccessGroupUser' - - -class Agent(models.Model): - agentid = models.AutoField(db_column='agentId', primary_key=True) - agentname = models.CharField(db_column='agentName', max_length=100) - uid = models.CharField(max_length=100) - os = models.IntegerField() - devices = models.TextField() - cmdpars = models.CharField(db_column='cmdPars', max_length=256) - ignoreerrors = models.IntegerField(db_column='ignoreErrors') - isactive = models.IntegerField(db_column='isActive') - istrusted = models.IntegerField(db_column='isTrusted') - token = models.CharField(max_length=30) - lastact = models.CharField(db_column='lastAct', max_length=50) - lasttime = models.BigIntegerField(db_column='lastTime') - lastip = models.CharField(db_column='lastIp', max_length=50) - userid = models.ForeignKey('User', models.DO_NOTHING, db_column='userId', blank=True, null=True) - cpuonly = models.IntegerField(db_column='cpuOnly') - clientsignature = models.CharField(db_column='clientSignature', max_length=50) - - class Meta: - managed = False - db_table = 'Agent' - - -class Agentbinary(models.Model): - agentbinaryid = models.AutoField(db_column='agentBinaryId', primary_key=True) - type = models.CharField(max_length=20) - version = models.CharField(max_length=20) - operatingsystems = models.CharField(db_column='operatingSystems', max_length=50) - filename = models.CharField(max_length=50) - updatetrack = models.CharField(db_column='updateTrack', max_length=20) - updateavailable = models.CharField(db_column='updateAvailable', max_length=20) - - class Meta: - managed = False - db_table = 'AgentBinary' - - -class Agenterror(models.Model): - agenterrorid = models.AutoField(db_column='agentErrorId', primary_key=True) - agentid = models.ForeignKey(Agent, models.DO_NOTHING, db_column='agentId') - taskid = models.ForeignKey('Task', models.DO_NOTHING, db_column='taskId', blank=True, null=True) - time = models.BigIntegerField() - error = models.TextField() - chunkid = models.IntegerField(db_column='chunkId', blank=True, null=True) - - class Meta: - managed = False - db_table = 'AgentError' - - -class Agentstat(models.Model): - agentstatid = models.AutoField(db_column='agentStatId', primary_key=True) - agentid = models.ForeignKey(Agent, models.DO_NOTHING, db_column='agentId') - stattype = models.IntegerField(db_column='statType') - time = models.BigIntegerField() - value = models.CharField(max_length=128) - - class Meta: - managed = False - db_table = 'AgentStat' - - -class Agentzap(models.Model): - agentzapid = models.AutoField(db_column='agentZapId', primary_key=True) - agentid = models.ForeignKey(Agent, models.DO_NOTHING, db_column='agentId') - lastzapid = models.ForeignKey('Zap', models.DO_NOTHING, db_column='lastZapId', blank=True, null=True) - - class Meta: - managed = False - db_table = 'AgentZap' - - -class Apigroup(models.Model): - apigroupid = models.AutoField(db_column='apiGroupId', primary_key=True) - name = models.CharField(max_length=100) - permissions = models.TextField() - - class Meta: - managed = False - db_table = 'ApiGroup' - - -class Apikey(models.Model): - apikeyid = models.AutoField(db_column='apiKeyId', primary_key=True) - startvalid = models.BigIntegerField(db_column='startValid') - endvalid = models.BigIntegerField(db_column='endValid') - accesskey = models.CharField(db_column='accessKey', max_length=256) - accesscount = models.IntegerField(db_column='accessCount') - userid = models.ForeignKey('User', models.DO_NOTHING, db_column='userId') - apigroupid = models.ForeignKey(Apigroup, models.DO_NOTHING, db_column='apiGroupId') - - class Meta: - managed = False - db_table = 'ApiKey' - - -class Assignment(models.Model): - assignmentid = models.AutoField(db_column='assignmentId', primary_key=True) - taskid = models.ForeignKey('Task', models.DO_NOTHING, db_column='taskId') - agentid = models.ForeignKey(Agent, models.DO_NOTHING, db_column='agentId') - benchmark = models.CharField(max_length=50) - - class Meta: - managed = False - db_table = 'Assignment' - - -class Chunk(models.Model): - chunkid = models.AutoField(db_column='chunkId', primary_key=True) - taskid = models.ForeignKey('Task', models.DO_NOTHING, db_column='taskId') - skip = models.PositiveBigIntegerField() - length = models.PositiveBigIntegerField() - agentid = models.ForeignKey(Agent, models.DO_NOTHING, db_column='agentId', blank=True, null=True) - dispatchtime = models.BigIntegerField(db_column='dispatchTime') - solvetime = models.BigIntegerField(db_column='solveTime') - checkpoint = models.PositiveBigIntegerField() - progress = models.IntegerField(blank=True, null=True) - state = models.IntegerField() - cracked = models.IntegerField() - speed = models.BigIntegerField() - - class Meta: - managed = False - db_table = 'Chunk' - - -class Config(models.Model): - configid = models.AutoField(db_column='configId', primary_key=True) - configsectionid = models.ForeignKey('Configsection', models.DO_NOTHING, db_column='configSectionId') - item = models.CharField(max_length=80) - value = models.TextField() - - class Meta: - managed = False - db_table = 'Config' - - -class Configsection(models.Model): - configsectionid = models.AutoField(db_column='configSectionId', primary_key=True) - sectionname = models.CharField(db_column='sectionName', max_length=100) - - class Meta: - managed = False - db_table = 'ConfigSection' - - -class Crackerbinary(models.Model): - crackerbinaryid = models.AutoField(db_column='crackerBinaryId', primary_key=True) - crackerbinarytypeid = models.ForeignKey('Crackerbinarytype', models.DO_NOTHING, db_column='crackerBinaryTypeId') - version = models.CharField(max_length=20) - downloadurl = models.CharField(db_column='downloadUrl', max_length=150) - binaryname = models.CharField(db_column='binaryName', max_length=50) - - class Meta: - managed = False - db_table = 'CrackerBinary' - - -class Crackerbinarytype(models.Model): - crackerbinarytypeid = models.AutoField(db_column='crackerBinaryTypeId', primary_key=True) - typename = models.CharField(db_column='typeName', max_length=30) - ischunkingavailable = models.IntegerField(db_column='isChunkingAvailable') - - class Meta: - managed = False - db_table = 'CrackerBinaryType' - - -class File(models.Model): - fileid = models.AutoField(db_column='fileId', primary_key=True) - filename = models.CharField(max_length=100) - size = models.BigIntegerField() - issecret = models.IntegerField(db_column='isSecret') - filetype = models.IntegerField(db_column='fileType') - accessgroupid = models.ForeignKey(Accessgroup, models.DO_NOTHING, db_column='accessGroupId') - linecount = models.BigIntegerField(db_column='lineCount', blank=True, null=True) - - class Meta: - managed = False - db_table = 'File' - - -class Filedelete(models.Model): - filedeleteid = models.AutoField(db_column='fileDeleteId', primary_key=True) - filename = models.CharField(max_length=256) - time = models.BigIntegerField() - - class Meta: - managed = False - db_table = 'FileDelete' - - -class Filedownload(models.Model): - filedownloadid = models.AutoField(db_column='fileDownloadId', primary_key=True) - time = models.BigIntegerField() - fileid = models.ForeignKey(File, models.DO_NOTHING, db_column='fileId') - status = models.IntegerField() - - class Meta: - managed = False - db_table = 'FileDownload' - - -class Filepretask(models.Model): - filepretaskid = models.AutoField(db_column='filePretaskId', primary_key=True) - fileid = models.ForeignKey(File, models.DO_NOTHING, db_column='fileId') - pretaskid = models.ForeignKey('Pretask', models.DO_NOTHING, db_column='pretaskId') - - class Meta: - managed = False - db_table = 'FilePretask' - - -class Filetask(models.Model): - filetaskid = models.AutoField(db_column='fileTaskId', primary_key=True) - fileid = models.ForeignKey(File, models.DO_NOTHING, db_column='fileId') - taskid = models.ForeignKey('Task', models.DO_NOTHING, db_column='taskId') - - class Meta: - managed = False - db_table = 'FileTask' - - -class Hash(models.Model): - hashid = models.AutoField(db_column='hashId', primary_key=True) - hashlistid = models.ForeignKey('Hashlist', models.DO_NOTHING, db_column='hashlistId') - hash = models.TextField() - salt = models.CharField(max_length=256, blank=True, null=True) - plaintext = models.CharField(max_length=256, blank=True, null=True) - timecracked = models.BigIntegerField(db_column='timeCracked', blank=True, null=True) - chunkid = models.ForeignKey(Chunk, models.DO_NOTHING, db_column='chunkId', blank=True, null=True) - iscracked = models.IntegerField(db_column='isCracked') - crackpos = models.BigIntegerField(db_column='crackPos') - - class Meta: - managed = False - db_table = 'Hash' - - -class Hashbinary(models.Model): - hashbinaryid = models.AutoField(db_column='hashBinaryId', primary_key=True) - hashlistid = models.ForeignKey('Hashlist', models.DO_NOTHING, db_column='hashlistId') - essid = models.CharField(max_length=100) - hash = models.TextField() - plaintext = models.CharField(max_length=1024, blank=True, null=True) - timecracked = models.BigIntegerField(db_column='timeCracked', blank=True, null=True) - chunkid = models.ForeignKey(Chunk, models.DO_NOTHING, db_column='chunkId', blank=True, null=True) - iscracked = models.IntegerField(db_column='isCracked') - crackpos = models.BigIntegerField(db_column='crackPos') - - class Meta: - managed = False - db_table = 'HashBinary' - - -class Hashtype(models.Model): - hashtypeid = models.IntegerField(db_column='hashTypeId', primary_key=True) - description = models.CharField(max_length=256) - issalted = models.IntegerField(db_column='isSalted') - isslowhash = models.IntegerField(db_column='isSlowHash') - - class Meta: - managed = False - db_table = 'HashType' - - -class Hashlist(models.Model): - hashlistid = models.AutoField(db_column='hashlistId', primary_key=True) - hashlistname = models.CharField(db_column='hashlistName', max_length=100) - format = models.IntegerField() - hashtypeid = models.ForeignKey(Hashtype, models.DO_NOTHING, db_column='hashTypeId') - hashcount = models.IntegerField(db_column='hashCount') - saltseparator = models.CharField(db_column='saltSeparator', max_length=10, blank=True, null=True) - cracked = models.IntegerField() - issecret = models.IntegerField(db_column='isSecret') - hexsalt = models.IntegerField(db_column='hexSalt') - issalted = models.IntegerField(db_column='isSalted') - accessgroupid = models.ForeignKey(Accessgroup, models.DO_NOTHING, db_column='accessGroupId') - notes = models.TextField() - brainid = models.IntegerField(db_column='brainId') - brainfeatures = models.IntegerField(db_column='brainFeatures') - isarchived = models.IntegerField(db_column='isArchived') - - class Meta: - managed = False - db_table = 'Hashlist' - - -class Hashlisthashlist(models.Model): - hashlisthashlistid = models.AutoField(db_column='hashlistHashlistId', primary_key=True) - parenthashlistid = models.ForeignKey(Hashlist, models.DO_NOTHING, db_column='parentHashlistId') - hashlistid = models.ForeignKey(Hashlist, models.DO_NOTHING, db_column='hashlistId') - - class Meta: - managed = False - db_table = 'HashlistHashlist' - - -class Healthcheck(models.Model): - healthcheckid = models.AutoField(db_column='healthCheckId', primary_key=True) - time = models.BigIntegerField() - status = models.IntegerField() - checktype = models.IntegerField(db_column='checkType') - hashtypeid = models.IntegerField(db_column='hashtypeId') - crackerbinaryid = models.ForeignKey(Crackerbinary, models.DO_NOTHING, db_column='crackerBinaryId') - expectedcracks = models.IntegerField(db_column='expectedCracks') - attackcmd = models.CharField(db_column='attackCmd', max_length=256) - - class Meta: - managed = False - db_table = 'HealthCheck' - - -class Healthcheckagent(models.Model): - healthcheckagentid = models.AutoField(db_column='healthCheckAgentId', primary_key=True) - healthcheckid = models.ForeignKey(Healthcheck, models.DO_NOTHING, db_column='healthCheckId') - agentid = models.ForeignKey(Agent, models.DO_NOTHING, db_column='agentId') - status = models.IntegerField() - cracked = models.IntegerField() - numgpus = models.IntegerField(db_column='numGpus') - start = models.BigIntegerField() - end = models.BigIntegerField() - errors = models.TextField() - - class Meta: - managed = False - db_table = 'HealthCheckAgent' - - -class Logentry(models.Model): - logentryid = models.AutoField(db_column='logEntryId', primary_key=True) - issuer = models.CharField(max_length=50) - issuerid = models.CharField(db_column='issuerId', max_length=50) - level = models.CharField(max_length=50) - message = models.TextField() - time = models.BigIntegerField() - - class Meta: - managed = False - db_table = 'LogEntry' - - -class Notificationsetting(models.Model): - notificationsettingid = models.AutoField(db_column='notificationSettingId', primary_key=True) - action = models.CharField(max_length=50) - objectid = models.IntegerField(db_column='objectId', blank=True, null=True) - notification = models.CharField(max_length=50) - userid = models.ForeignKey('User', models.DO_NOTHING, db_column='userId') - receiver = models.CharField(max_length=256) - isactive = models.IntegerField(db_column='isActive') - - class Meta: - managed = False - db_table = 'NotificationSetting' - - -class Preprocessor(models.Model): - preprocessorid = models.AutoField(db_column='preprocessorId', primary_key=True) - name = models.CharField(max_length=256) - url = models.CharField(max_length=512) - binaryname = models.CharField(db_column='binaryName', max_length=256) - keyspacecommand = models.CharField(db_column='keyspaceCommand', max_length=256, blank=True, null=True) - skipcommand = models.CharField(db_column='skipCommand', max_length=256, blank=True, null=True) - limitcommand = models.CharField(db_column='limitCommand', max_length=256, blank=True, null=True) - - class Meta: - managed = False - db_table = 'Preprocessor' - - -class Pretask(models.Model): - pretaskid = models.AutoField(db_column='pretaskId', primary_key=True) - taskname = models.CharField(db_column='taskName', max_length=100) - attackcmd = models.CharField(db_column='attackCmd', max_length=256) - chunktime = models.IntegerField(db_column='chunkTime') - statustimer = models.IntegerField(db_column='statusTimer') - color = models.CharField(max_length=20, blank=True, null=True) - issmall = models.IntegerField(db_column='isSmall') - iscputask = models.IntegerField(db_column='isCpuTask') - usenewbench = models.IntegerField(db_column='useNewBench') - priority = models.IntegerField() - maxagents = models.IntegerField(db_column='maxAgents') - ismaskimport = models.IntegerField(db_column='isMaskImport') - crackerbinarytypeid = models.ForeignKey(Crackerbinarytype, models.DO_NOTHING, db_column='crackerBinaryTypeId') - - class Meta: - managed = False - db_table = 'Pretask' - - -class Regvoucher(models.Model): - regvoucherid = models.AutoField(db_column='regVoucherId', primary_key=True) - voucher = models.CharField(max_length=100) - time = models.BigIntegerField() - - class Meta: - managed = False - db_table = 'RegVoucher' - - -class Rightgroup(models.Model): - rightgroupid = models.AutoField(db_column='rightGroupId', primary_key=True) - groupname = models.CharField(db_column='groupName', max_length=50) - permissions = models.TextField() - - class Meta: - managed = False - db_table = 'RightGroup' - - -class Session(models.Model): - sessionid = models.AutoField(db_column='sessionId', primary_key=True) - userid = models.ForeignKey('User', models.DO_NOTHING, db_column='userId') - sessionstartdate = models.BigIntegerField(db_column='sessionStartDate') - lastactiondate = models.BigIntegerField(db_column='lastActionDate') - isopen = models.IntegerField(db_column='isOpen') - sessionlifetime = models.IntegerField(db_column='sessionLifetime') - sessionkey = models.CharField(db_column='sessionKey', max_length=256) - - class Meta: - managed = False - db_table = 'Session' - - -class Speed(models.Model): - speedid = models.AutoField(db_column='speedId', primary_key=True) - agentid = models.ForeignKey(Agent, models.DO_NOTHING, db_column='agentId') - taskid = models.ForeignKey('Task', models.DO_NOTHING, db_column='taskId') - speed = models.BigIntegerField() - time = models.BigIntegerField() - - class Meta: - managed = False - db_table = 'Speed' - - -class Storedvalue(models.Model): - storedvalueid = models.CharField(db_column='storedValueId', primary_key=True, max_length=50) - val = models.CharField(max_length=256) - - class Meta: - managed = False - db_table = 'StoredValue' - - -class Supertask(models.Model): - supertaskid = models.AutoField(db_column='supertaskId', primary_key=True) - supertaskname = models.CharField(db_column='supertaskName', max_length=50) - - class Meta: - managed = False - db_table = 'Supertask' - - -class Supertaskpretask(models.Model): - supertaskpretaskid = models.AutoField(db_column='supertaskPretaskId', primary_key=True) - supertaskid = models.ForeignKey(Supertask, models.DO_NOTHING, db_column='supertaskId') - pretaskid = models.ForeignKey(Pretask, models.DO_NOTHING, db_column='pretaskId') - - class Meta: - managed = False - db_table = 'SupertaskPretask' - - -class Task(models.Model): - taskid = models.AutoField(db_column='taskId', primary_key=True) - taskname = models.CharField(db_column='taskName', max_length=256) - attackcmd = models.CharField(db_column='attackCmd', max_length=256) - chunktime = models.IntegerField(db_column='chunkTime') - statustimer = models.IntegerField(db_column='statusTimer') - keyspace = models.BigIntegerField() - keyspaceprogress = models.BigIntegerField(db_column='keyspaceProgress') - priority = models.IntegerField() - maxagents = models.IntegerField(db_column='maxAgents') - color = models.CharField(max_length=20, blank=True, null=True) - issmall = models.IntegerField(db_column='isSmall') - iscputask = models.IntegerField(db_column='isCpuTask') - usenewbench = models.IntegerField(db_column='useNewBench') - skipkeyspace = models.BigIntegerField(db_column='skipKeyspace') - crackerbinaryid = models.ForeignKey(Crackerbinary, models.DO_NOTHING, db_column='crackerBinaryId', blank=True, null=True) - crackerbinarytypeid = models.ForeignKey(Crackerbinarytype, models.DO_NOTHING, db_column='crackerBinaryTypeId', blank=True, null=True) - taskwrapperid = models.ForeignKey('Taskwrapper', models.DO_NOTHING, db_column='taskWrapperId') - isarchived = models.IntegerField(db_column='isArchived') - notes = models.TextField() - staticchunks = models.IntegerField(db_column='staticChunks') - chunksize = models.BigIntegerField(db_column='chunkSize') - forcepipe = models.IntegerField(db_column='forcePipe') - usepreprocessor = models.IntegerField(db_column='usePreprocessor') - preprocessorcommand = models.CharField(db_column='preprocessorCommand', max_length=256) - - class Meta: - managed = False - db_table = 'Task' - - -class Taskdebugoutput(models.Model): - taskdebugoutputid = models.AutoField(db_column='taskDebugOutputId', primary_key=True) - taskid = models.ForeignKey(Task, models.DO_NOTHING, db_column='taskId') - output = models.CharField(max_length=256) - - class Meta: - managed = False - db_table = 'TaskDebugOutput' - - -class Taskwrapper(models.Model): - taskwrapperid = models.AutoField(db_column='taskWrapperId', primary_key=True) - priority = models.IntegerField() - maxagents = models.IntegerField(db_column='maxAgents') - tasktype = models.IntegerField(db_column='taskType') - hashlistid = models.ForeignKey(Hashlist, models.DO_NOTHING, db_column='hashlistId') - accessgroupid = models.ForeignKey(Accessgroup, models.DO_NOTHING, db_column='accessGroupId', blank=True, null=True) - taskwrappername = models.CharField(db_column='taskWrapperName', max_length=100) - isarchived = models.IntegerField(db_column='isArchived') - cracked = models.IntegerField() - - class Meta: - managed = False - db_table = 'TaskWrapper' - - -class User(models.Model): - userid = models.AutoField(db_column='userId', primary_key=True) - username = models.CharField(unique=True, max_length=100) - email = models.CharField(max_length=150) - passwordhash = models.CharField(db_column='passwordHash', max_length=256) - passwordsalt = models.CharField(db_column='passwordSalt', max_length=256) - isvalid = models.IntegerField(db_column='isValid') - iscomputedpassword = models.IntegerField(db_column='isComputedPassword') - lastlogindate = models.BigIntegerField(db_column='lastLoginDate') - registeredsince = models.BigIntegerField(db_column='registeredSince') - sessionlifetime = models.IntegerField(db_column='sessionLifetime') - rightgroupid = models.ForeignKey(Rightgroup, models.DO_NOTHING, db_column='rightGroupId') - yubikey = models.CharField(max_length=256, blank=True, null=True) - otp1 = models.CharField(max_length=256, blank=True, null=True) - otp2 = models.CharField(max_length=256, blank=True, null=True) - otp3 = models.CharField(max_length=256, blank=True, null=True) - otp4 = models.CharField(max_length=256, blank=True, null=True) - - class Meta: - managed = False - db_table = 'User' - - -class Zap(models.Model): - zapid = models.AutoField(db_column='zapId', primary_key=True) - hash = models.TextField() - solvetime = models.BigIntegerField(db_column='solveTime') - agentid = models.ForeignKey(Agent, models.DO_NOTHING, db_column='agentId', blank=True, null=True) - hashlistid = models.ForeignKey(Hashlist, models.DO_NOTHING, db_column='hashlistId') - - class Meta: - managed = False - db_table = 'Zap' From 2a1f6c41daa424ce3de28ed2b97bd91a62ac456b Mon Sep 17 00:00:00 2001 From: s3inlc Date: Tue, 9 Dec 2025 12:05:12 +0100 Subject: [PATCH 351/691] AccountTest can be deleted as it is covered in user tests --- ci/tests/AccountTest.class.php | 125 --------------------------------- 1 file changed, 125 deletions(-) delete mode 100644 ci/tests/AccountTest.class.php diff --git a/ci/tests/AccountTest.class.php b/ci/tests/AccountTest.class.php deleted file mode 100644 index 1077982d9..000000000 --- a/ci/tests/AccountTest.class.php +++ /dev/null @@ -1,125 +0,0 @@ -getTestName() . "..."); - parent::init($version); - } - - public function run() { - HashtopolisTestFramework::log(HashtopolisTestFramework::LOG_INFO, "Running " . $this->getTestName() . "..."); - $this->testGetInformation(["userId" => 1, "rightGroupId" => 1]); - $this->testSetEmail('otheremail@example.org'); - $this->testGetInformation(["userId" => 1, "rightGroupId" => 1, 'email' => 'otheremail@example.org']); - $this->testSetEmail('invalid-email', false); - $this->testSetEmail('', false); - $this->testGetInformation(["userId" => 1, "rightGroupId" => 1, 'email' => 'otheremail@example.org']); - $this->testSetSessionLength(6000); - $this->testSetSessionLength(500000, false); - $this->testSetSessionLength(0, false); - $this->testSetSessionLength(-6000, false); - $this->testGetInformation(["userId" => 1, "rightGroupId" => 1, 'email' => 'otheremail@example.org', 'sessionLength' => 6000]); - $this->testChangePassword(HashtopolisTest::USER_PASS, 'newPassword'); - $this->testChangePassword(HashtopolisTest::USER_PASS, 'newPassword', false); - $this->testChangePassword('newPassword', 'newPassword', false); - $this->testChangePassword('newPassword', '', false); - $this->testChangePassword('newPassword', '123', false); - HashtopolisTestFramework::log(HashtopolisTestFramework::LOG_INFO, $this->getTestName() . " completed"); - } - - private function testChangePassword($old, $new, $assert = true) { - $response = HashtopolisTestFramework::doRequest([ - "section" => "account", - "request" => "changePassword", - "oldPassword" => $old, - "newPassword" => $new, - "accessKey" => "mykey" - ], HashtopolisTestFramework::REQUEST_UAPI - ); - if ($response === false) { - $this->testFailed("AccountTest:testChangePassword($old,$new,$assert)", "Empty response"); - } - else if (!$this->validState($response['response'], $assert)) { - $this->testFailed("AccountTest:testChangePassword($old,$new,$assert)", "Response does not match assert"); - } - else { - $this->testSuccess("AccountTest:testChangePassword($old,$new,$assert)"); - } - } - - private function testSetSessionLength($length, $assert = true) { - $response = HashtopolisTestFramework::doRequest([ - "section" => "account", - "request" => "setSessionLength", - "sessionLength" => $length, - "accessKey" => "mykey" - ], HashtopolisTestFramework::REQUEST_UAPI - ); - if ($response === false) { - $this->testFailed("AccountTest:testSetSessionLength($length,$assert)", "Empty response"); - } - else if (!$this->validState($response['response'], $assert)) { - $this->testFailed("AccountTest:testSetSessionLength($length,$assert)", "Response does not match assert"); - } - else { - $this->testSuccess("AccountTest:testSetSessionLength($length,$assert)"); - } - } - - private function testSetEmail($email, $assert = true) { - $response = HashtopolisTestFramework::doRequest([ - "section" => "account", - "request" => "setEmail", - "email" => $email, - "accessKey" => "mykey" - ], HashtopolisTestFramework::REQUEST_UAPI - ); - if ($response === false) { - $this->testFailed("AccountTest:testSetEmail($email,$assert)", "Empty response"); - } - else if (!$this->validState($response['response'], $assert)) { - $this->testFailed("AccountTest:testSetEmail($email,$assert)", "Response does not match assert"); - } - else { - $this->testSuccess("AccountTest:testSetEmail($email,$assert)"); - } - } - - private function testGetInformation($data, $assert = true) { - $response = HashtopolisTestFramework::doRequest([ - "section" => "account", - "request" => "getInformation", - "accessKey" => "mykey" - ], HashtopolisTestFramework::REQUEST_UAPI - ); - if ($response === false) { - $this->testFailed("AccountTest:testGetInformation([" . implode(", ", $data) . "],$assert)", "Empty response"); - } - else if (!$this->validState($response['response'], $assert)) { - $this->testFailed("AccountTest:testGetInformation([" . implode(", ", $data) . "],$assert)", "Response does not match assert"); - } - else { - if (!$assert) { - $this->testSuccess("AccountTest:testGetInformation([" . implode(", ", $data) . "],$assert)"); - return; - } - foreach ($data as $key => $val) { - if (!isset($response[$key]) || $val != $response[$key]) { - $this->testFailed("AccountTest:testGetInformation([" . implode(", ", $data) . "],$assert)", "Response OK, but wrong response"); - return; - } - } - $this->testSuccess("AccountTest:testGetInformation([" . implode(", ", $data) . "],$assert)"); - } - } - - public function getTestName() { - return "Account Test"; - } -} - -HashtopolisTestFramework::register(new AccountTest()); \ No newline at end of file From c502fbcda011859d531a4d26d00bf2d547374002 Mon Sep 17 00:00:00 2001 From: s3inlc Date: Tue, 9 Dec 2025 15:58:46 +0100 Subject: [PATCH 352/691] completed agent basic tests --- ci/apiv2/test_agent.py | 33 +++++++++++++++++++++++---- src/dba/models/Agent.class.php | 6 ++--- src/dba/models/generator.php | 6 ++--- src/inc/apiv2/model/agents.routes.php | 3 ++- 4 files changed, 36 insertions(+), 12 deletions(-) diff --git a/ci/apiv2/test_agent.py b/ci/apiv2/test_agent.py index 262e06703..e60b37f7d 100644 --- a/ci/apiv2/test_agent.py +++ b/ci/apiv2/test_agent.py @@ -1,4 +1,5 @@ -from test_task import TaskTest +import test_task +import test_user from hashtopolis import Agent, Helper from hashtopolis import HashtopolisError @@ -25,14 +26,35 @@ def test_patch_field_ignorerrors_invalid_choice(self): self._test_patch(model_obj, 'ignoreErrors', 5) self.assertEqual(e.exception.status_code, 400) + def test_patch_field_name_empty(self): + model_obj = self.create_test_object() + with self.assertRaises(HashtopolisError) as e: + self._test_patch(model_obj, 'agentName', '') + self.assertEqual(e.exception.status_code, 500) + + def test_patch_field_token(self): + model_obj = self.create_test_object() + with self.assertRaises(HashtopolisError) as e: + self._test_patch(model_obj, 'token', 'whatever') + self.assertEqual(e.exception.status_code, 403) + + def test_patch_field_user(self): + user_test = test_user.UserTest() + user_test.setUp() + + user_obj = user_test.create_test_object() + model_obj = self.create_test_object() + self._test_patch(model_obj, 'userId', user_obj.id) + + user_test.tearDown() + def test_name_too_long(self): model_obj = self.create_test_object() too_long_name = "a" * 101 with self.assertRaises(HashtopolisError) as e: self._test_patch(model_obj, 'agentName', too_long_name) # name exceeds max size of 100 self.assertEqual(e.exception.status_code, 400) - self.assertEqual(e.exception.title, - f"The string value: '{too_long_name}' is too long. The max size is '100'") + self.assertEqual(e.exception.title, f"The string value: '{too_long_name}' is too long. The max size is '100'") def test_expandables(self): model_obj = self.create_test_object() @@ -42,8 +64,9 @@ def test_expandables(self): def test_assign_unassign_agent(self): agent_obj = self.create_test_object() - task_test = TaskTest() - task_obj = task_test.create_test_object(delete=True) + task_test = test_task.TaskTest() + task_test.setUp() + task_obj = task_test.create_test_object() helper = Helper() diff --git a/src/dba/models/Agent.class.php b/src/dba/models/Agent.class.php index 0a088661a..58bacc91a 100644 --- a/src/dba/models/Agent.class.php +++ b/src/dba/models/Agent.class.php @@ -67,18 +67,18 @@ static function getFeatures(): array { $dict['agentName'] = ['read_only' => False, "type" => "str(100)", "subtype" => "unset", "choices" => "unset", "null" => False, "pk" => False, "protected" => False, "private" => False, "alias" => "agentName", "public" => False, "dba_mapping" => False]; $dict['uid'] = ['read_only' => False, "type" => "str(100)", "subtype" => "unset", "choices" => "unset", "null" => False, "pk" => False, "protected" => False, "private" => False, "alias" => "uid", "public" => False, "dba_mapping" => False]; $dict['os'] = ['read_only' => False, "type" => "int", "subtype" => "unset", "choices" => "unset", "null" => False, "pk" => False, "protected" => False, "private" => False, "alias" => "os", "public" => False, "dba_mapping" => False]; - $dict['devices'] = ['read_only' => False, "type" => "str(65535)", "subtype" => "unset", "choices" => "unset", "null" => False, "pk" => False, "protected" => False, "private" => False, "alias" => "devices", "public" => False, "dba_mapping" => False]; + $dict['devices'] = ['read_only' => True, "type" => "str(65535)", "subtype" => "unset", "choices" => "unset", "null" => False, "pk" => False, "protected" => False, "private" => False, "alias" => "devices", "public" => False, "dba_mapping" => False]; $dict['cmdPars'] = ['read_only' => False, "type" => "str(65535)", "subtype" => "unset", "choices" => "unset", "null" => False, "pk" => False, "protected" => False, "private" => False, "alias" => "cmdPars", "public" => False, "dba_mapping" => False]; $dict['ignoreErrors'] = ['read_only' => False, "type" => "int", "subtype" => "unset", "choices" => [0 => "Deactivate agent on error", 1 => "Keep agent running, but save errors", 2 => "Keep agent running and discard errors", ], "null" => False, "pk" => False, "protected" => False, "private" => False, "alias" => "ignoreErrors", "public" => False, "dba_mapping" => False]; $dict['isActive'] = ['read_only' => False, "type" => "bool", "subtype" => "unset", "choices" => "unset", "null" => False, "pk" => False, "protected" => False, "private" => False, "alias" => "isActive", "public" => False, "dba_mapping" => False]; $dict['isTrusted'] = ['read_only' => False, "type" => "bool", "subtype" => "unset", "choices" => "unset", "null" => False, "pk" => False, "protected" => False, "private" => False, "alias" => "isTrusted", "public" => False, "dba_mapping" => False]; - $dict['token'] = ['read_only' => False, "type" => "str(30)", "subtype" => "unset", "choices" => "unset", "null" => False, "pk" => False, "protected" => False, "private" => False, "alias" => "token", "public" => False, "dba_mapping" => False]; + $dict['token'] = ['read_only' => True, "type" => "str(30)", "subtype" => "unset", "choices" => "unset", "null" => False, "pk" => False, "protected" => False, "private" => False, "alias" => "token", "public" => False, "dba_mapping" => False]; $dict['lastAct'] = ['read_only' => True, "type" => "str(50)", "subtype" => "unset", "choices" => "unset", "null" => False, "pk" => False, "protected" => True, "private" => False, "alias" => "lastAct", "public" => False, "dba_mapping" => False]; $dict['lastTime'] = ['read_only' => True, "type" => "int64", "subtype" => "unset", "choices" => "unset", "null" => False, "pk" => False, "protected" => True, "private" => False, "alias" => "lastTime", "public" => False, "dba_mapping" => False]; $dict['lastIp'] = ['read_only' => True, "type" => "str(50)", "subtype" => "unset", "choices" => "unset", "null" => False, "pk" => False, "protected" => True, "private" => False, "alias" => "lastIp", "public" => False, "dba_mapping" => False]; $dict['userId'] = ['read_only' => False, "type" => "int", "subtype" => "unset", "choices" => "unset", "null" => True, "pk" => False, "protected" => False, "private" => False, "alias" => "userId", "public" => False, "dba_mapping" => False]; $dict['cpuOnly'] = ['read_only' => False, "type" => "bool", "subtype" => "unset", "choices" => "unset", "null" => False, "pk" => False, "protected" => False, "private" => False, "alias" => "cpuOnly", "public" => False, "dba_mapping" => False]; - $dict['clientSignature'] = ['read_only' => False, "type" => "str(50)", "subtype" => "unset", "choices" => "unset", "null" => False, "pk" => False, "protected" => False, "private" => False, "alias" => "clientSignature", "public" => False, "dba_mapping" => False]; + $dict['clientSignature'] = ['read_only' => True, "type" => "str(50)", "subtype" => "unset", "choices" => "unset", "null" => False, "pk" => False, "protected" => False, "private" => False, "alias" => "clientSignature", "public" => False, "dba_mapping" => False]; return $dict; } diff --git a/src/dba/models/generator.php b/src/dba/models/generator.php index a6f9d7d61..f47b62e9b 100644 --- a/src/dba/models/generator.php +++ b/src/dba/models/generator.php @@ -55,18 +55,18 @@ ['name' => 'agentName', 'read_only' => False, 'type' => 'str(100)'], ['name' => 'uid', 'read_only' => False, 'type' => 'str(100)'], ['name' => 'os', 'read_only' => False, 'type' => 'int'], - ['name' => 'devices', 'read_only' => False, 'type' => 'str(65535)'], + ['name' => 'devices', 'read_only' => True, 'type' => 'str(65535)'], ['name' => 'cmdPars', 'read_only' => False, 'type' => 'str(65535)'], ['name' => 'ignoreErrors', 'read_only' => False, 'type' => 'int', 'choices' => $FieldIgnoreErrorsChoices], ['name' => 'isActive', 'read_only' => False, 'type' => 'bool'], ['name' => 'isTrusted', 'read_only' => False, 'type' => 'bool'], - ['name' => 'token', 'read_only' => False, 'type' => 'str(30)'], + ['name' => 'token', 'read_only' => True, 'type' => 'str(30)'], ['name' => 'lastAct', 'read_only' => True, 'type' => 'str(50)', 'protected' => True], ['name' => 'lastTime', 'read_only' => True, 'type' => 'int64', 'protected' => True], ['name' => 'lastIp', 'read_only' => True, 'type' => 'str(50)', 'protected' => True], ['name' => 'userId', 'read_only' => False, 'type' => 'int', 'null' => True, 'relation' => 'User'], ['name' => 'cpuOnly', 'read_only' => False, 'type' => 'bool'], - ['name' => 'clientSignature', 'read_only' => False, 'type' => 'str(50)'], + ['name' => 'clientSignature', 'read_only' => True, 'type' => 'str(50)'], ], ]; $CONF['AgentBinary'] = [ diff --git a/src/inc/apiv2/model/agents.routes.php b/src/inc/apiv2/model/agents.routes.php index 69b2e4571..cd8814cae 100644 --- a/src/inc/apiv2/model/agents.routes.php +++ b/src/inc/apiv2/model/agents.routes.php @@ -35,6 +35,7 @@ public static function getDBAclass(): string { protected function getUpdateHandlers($id, $current_user): array { return [ Agent::IGNORE_ERRORS => fn($value) => AgentUtils::changeIgnoreErrors($id, $value, $current_user), + Agent::AGENT_NAME => fn($value) => AgentUtils::rename($id, $value, $current_user), ]; } @@ -140,4 +141,4 @@ protected function deleteObject(object $object): void { } } -AgentAPI::register($app); \ No newline at end of file +AgentAPI::register($app); From 822cabfd01e8303e05c41446e25d58147ff68d03 Mon Sep 17 00:00:00 2001 From: s3inlc Date: Tue, 9 Dec 2025 16:08:47 +0100 Subject: [PATCH 353/691] completed basic tests for accessgroups --- ci/apiv2/test_accessgroup.py | 8 +++++++- src/inc/apiv2/model/accessgroups.routes.php | 7 ++++++- src/inc/utils/AccessGroupUtils.class.php | 9 +++++++++ 3 files changed, 22 insertions(+), 2 deletions(-) diff --git a/ci/apiv2/test_accessgroup.py b/ci/apiv2/test_accessgroup.py index c4def7ff1..ab4fe64c2 100644 --- a/ci/apiv2/test_accessgroup.py +++ b/ci/apiv2/test_accessgroup.py @@ -1,4 +1,4 @@ -from hashtopolis import AccessGroup +from hashtopolis import AccessGroup, HashtopolisError from utils import BaseTest @@ -16,6 +16,12 @@ def test_patch(self): model_obj = self.create_test_object() self._test_patch(model_obj, 'groupName') + def test_patch_empty_name(self): + model_obj = self.create_test_object() + with self.assertRaises(HashtopolisError) as e: + self._test_patch(model_obj, 'groupName', '') + self.assertEqual(e.exception.status_code, 500) + def test_delete(self): model_obj = self.create_test_object(delete=False) self._test_delete(model_obj) diff --git a/src/inc/apiv2/model/accessgroups.routes.php b/src/inc/apiv2/model/accessgroups.routes.php index ef2374248..8b8329cb5 100644 --- a/src/inc/apiv2/model/accessgroups.routes.php +++ b/src/inc/apiv2/model/accessgroups.routes.php @@ -43,6 +43,11 @@ public static function getToManyRelationships(): array { ]; } + protected function getUpdateHandlers($id, $current_user): array { + return [ + AccessGroup::GROUP_NAME => fn($value) => AccessGroupUtils::rename($id, $value), + ]; + } /** * @throws HTException @@ -60,4 +65,4 @@ protected function deleteObject(object $object): void { } } -AccessGroupAPI::register($app); \ No newline at end of file +AccessGroupAPI::register($app); diff --git a/src/inc/utils/AccessGroupUtils.class.php b/src/inc/utils/AccessGroupUtils.class.php index 72b502b23..589ab4f85 100644 --- a/src/inc/utils/AccessGroupUtils.class.php +++ b/src/inc/utils/AccessGroupUtils.class.php @@ -58,6 +58,15 @@ public static function createGroup($groupName) { return $group; } + public static function rename($accessGroupId, $newname) { + $accessGroup = AccessGroupUtils::getGroup($accessGroupId); + $name = htmlentities($newname, ENT_QUOTES, "UTF-8"); + if (strlen($name) == 0) { + throw new HTException("AccessGroup name cannot be empty!"); + } + Factory::getAccessGroupFactory()->set($accessGroup, AccessGroup::GROUP_NAME, $name); + } + /** * @param int $groupId * @param $user From 022983ee2545d707862ee907080dad24f202b797 Mon Sep 17 00:00:00 2001 From: s3inlc Date: Tue, 9 Dec 2025 16:13:52 +0100 Subject: [PATCH 354/691] finished basic agentassignment test --- ci/apiv2/test_agentassignment.py | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/ci/apiv2/test_agentassignment.py b/ci/apiv2/test_agentassignment.py index 1d7b2362f..b85b4627e 100644 --- a/ci/apiv2/test_agentassignment.py +++ b/ci/apiv2/test_agentassignment.py @@ -20,3 +20,8 @@ def test_patch(self): def test_delete(self): model_obj = self.create_test_object(delete=False) self._test_delete(model_obj) + + def test_expandables(self): + model_obj = self.create_test_object() + expandables = ['task', 'agent'] + self._test_expandables(model_obj, expandables) From e2171e5f2cb3b8c8dab3cfaa4cf73309efc291ed Mon Sep 17 00:00:00 2001 From: s3inlc Date: Tue, 9 Dec 2025 16:22:32 +0100 Subject: [PATCH 355/691] added test for creating an assignment when agent is requesting task --- ci/apiv2/test_agentassignment.py | 24 +++++++++++++++++++++++- 1 file changed, 23 insertions(+), 1 deletion(-) diff --git a/ci/apiv2/test_agentassignment.py b/ci/apiv2/test_agentassignment.py index b85b4627e..6c3810a9a 100644 --- a/ci/apiv2/test_agentassignment.py +++ b/ci/apiv2/test_agentassignment.py @@ -1,6 +1,7 @@ from hashtopolis import AgentAssignment -from utils import BaseTest +from hashtopolis_agent import DummyAgent +from utils import BaseTest, do_create_dummy_agent class AgentStatTest(BaseTest): @@ -25,3 +26,24 @@ def test_expandables(self): model_obj = self.create_test_object() expandables = ['task', 'agent'] self._test_expandables(model_obj, expandables) + + def test_agent_assign_task(self): + (dummy, agent) = do_create_dummy_agent() + hashlist = self.create_hashlist() + task = self.create_task(hashlist) + + # no assignment should exist yet + check = AgentAssignment.objects.filter(taskId=task.id) + + self.assertEqual(len(check), 0) + + taskId = dummy.get_task() + + self.assertEqual(taskId, task.id) + + # after the agent asked for a task, there should be an assignment + check = AgentAssignment.objects.filter(taskId=task.id) + + self.assertEqual(len(check), 1) + self.assertEqual(check[0].agentId, agent.id) + self.assertEqual(check[0].taskId, task.id) From fbda613f55eec8658e776828483c1af213e46fb0 Mon Sep 17 00:00:00 2001 From: jessevz Date: Wed, 10 Dec 2025 08:44:58 +0100 Subject: [PATCH 356/691] made docker-compose.mysql.yml as the default devcontainer docker-compose file --- .devcontainer/devcontainer.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.devcontainer/devcontainer.json b/.devcontainer/devcontainer.json index 7d48a8074..4f6d4eb31 100644 --- a/.devcontainer/devcontainer.json +++ b/.devcontainer/devcontainer.json @@ -1,7 +1,7 @@ // See https://aka.ms/vscode-remote/devcontainer.json for format details. { "name": "Hashtopolis Devcontainer", - "dockerComposeFile": "docker-compose.yml", + "dockerComposeFile": "docker-compose.mysql.yml", "service": "hashtopolis-server-dev", "runServices": [ "hashtopolis-db-dev" From 7a3c2280efb82549c7fa9e381a43c9008f2542b9 Mon Sep 17 00:00:00 2001 From: jessevz Date: Wed, 10 Dec 2025 10:35:02 +0100 Subject: [PATCH 357/691] Made dockerfile smaller by using smaller slim base image --- Dockerfile | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index cdac90612..3bc71a83c 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,4 +1,6 @@ -FROM rust:1.91-trixie AS prebuild +FROM rust:1.91-slim-trixie AS prebuild + +RUN apt-get update && apt-get install -y pkg-config libssl-dev RUN cargo install sqlx-cli --no-default-features --features native-tls,mysql,postgres From a07fafe79fec9368dbc1039503a2b37ab04be36d Mon Sep 17 00:00:00 2001 From: jessevz Date: Tue, 16 Dec 2025 16:37:45 +0100 Subject: [PATCH 358/691] Make user includable from agent (#1827) Co-authored-by: jessevz --- src/inc/apiv2/model/agents.routes.php | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/src/inc/apiv2/model/agents.routes.php b/src/inc/apiv2/model/agents.routes.php index 69b2e4571..9a9d5faa7 100644 --- a/src/inc/apiv2/model/agents.routes.php +++ b/src/inc/apiv2/model/agents.routes.php @@ -127,6 +127,17 @@ public static function getToManyRelationships(): array { ], ]; } + + public static function getToOneRelationships(): array { + return [ + 'user' => [ + 'key' => Agent::USER_ID, + + 'relationType' => User::class, + 'relationKey' => User::USER_ID, + ], + ]; + } #[NoReturn] protected function createObject(array $data): int { assert(False, "Agents cannot be created via API"); From 358406c665d2466308388f9996eda0388a80d260 Mon Sep 17 00:00:00 2001 From: jessevz Date: Wed, 17 Dec 2025 08:33:06 +0100 Subject: [PATCH 359/691] Upgraded to php 8.5 and upgraded dependencies (#1824) Co-authored-by: jessevz --- Dockerfile | 2 +- composer.lock | 50 +++++++++++++++++++++++++------------------------- 2 files changed, 26 insertions(+), 26 deletions(-) diff --git a/Dockerfile b/Dockerfile index 3bc71a83c..0f6f659b4 100644 --- a/Dockerfile +++ b/Dockerfile @@ -12,7 +12,7 @@ RUN cd / && git rev-parse --short HEAD > /HEAD; exit 0 # BASE image # ----BEGIN---- -FROM php:8.4-apache AS hashtopolis-server-base +FROM php:8.5-apache AS hashtopolis-server-base # Enable possible build args for injecting user commands ARG CONTAINER_USER_CMD_PRE diff --git a/composer.lock b/composer.lock index 6ccdd2afe..e66c83657 100644 --- a/composer.lock +++ b/composer.lock @@ -275,16 +275,16 @@ }, { "name": "jimtools/jwt-auth", - "version": "2.3.0", + "version": "2.3.1", "source": { "type": "git", "url": "https://github.com/JimTools/jwt-auth.git", - "reference": "2e89098a2dde0968326d42073098ae4bcc87b740" + "reference": "433da5594eb26c349472142a08c1bfe336bdd708" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/JimTools/jwt-auth/zipball/2e89098a2dde0968326d42073098ae4bcc87b740", - "reference": "2e89098a2dde0968326d42073098ae4bcc87b740", + "url": "https://api.github.com/repos/JimTools/jwt-auth/zipball/433da5594eb26c349472142a08c1bfe336bdd708", + "reference": "433da5594eb26c349472142a08c1bfe336bdd708", "shasum": "" }, "require": { @@ -334,7 +334,7 @@ ], "support": { "issues": "https://github.com/JimTools/jwt-auth/issues", - "source": "https://github.com/JimTools/jwt-auth/tree/2.3.0" + "source": "https://github.com/JimTools/jwt-auth/tree/2.3.1" }, "funding": [ { @@ -342,7 +342,7 @@ "type": "github" } ], - "time": "2025-10-29T20:23:22+00:00" + "time": "2025-11-30T15:18:13+00:00" }, { "name": "laravel/serializable-closure", @@ -1907,16 +1907,16 @@ }, { "name": "nikic/php-parser", - "version": "v5.6.2", + "version": "v5.7.0", "source": { "type": "git", "url": "https://github.com/nikic/PHP-Parser.git", - "reference": "3a454ca033b9e06b63282ce19562e892747449bb" + "reference": "dca41cd15c2ac9d055ad70dbfd011130757d1f82" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/nikic/PHP-Parser/zipball/3a454ca033b9e06b63282ce19562e892747449bb", - "reference": "3a454ca033b9e06b63282ce19562e892747449bb", + "url": "https://api.github.com/repos/nikic/PHP-Parser/zipball/dca41cd15c2ac9d055ad70dbfd011130757d1f82", + "reference": "dca41cd15c2ac9d055ad70dbfd011130757d1f82", "shasum": "" }, "require": { @@ -1959,9 +1959,9 @@ ], "support": { "issues": "https://github.com/nikic/PHP-Parser/issues", - "source": "https://github.com/nikic/PHP-Parser/tree/v5.6.2" + "source": "https://github.com/nikic/PHP-Parser/tree/v5.7.0" }, - "time": "2025-10-21T19:32:17+00:00" + "time": "2025-12-06T11:56:16+00:00" }, { "name": "phar-io/manifest", @@ -2136,16 +2136,16 @@ }, { "name": "phpdocumentor/reflection-docblock", - "version": "5.6.4", + "version": "5.6.5", "source": { "type": "git", "url": "https://github.com/phpDocumentor/ReflectionDocBlock.git", - "reference": "90a04bcbf03784066f16038e87e23a0a83cee3c2" + "reference": "90614c73d3800e187615e2dd236ad0e2a01bf761" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/phpDocumentor/ReflectionDocBlock/zipball/90a04bcbf03784066f16038e87e23a0a83cee3c2", - "reference": "90a04bcbf03784066f16038e87e23a0a83cee3c2", + "url": "https://api.github.com/repos/phpDocumentor/ReflectionDocBlock/zipball/90614c73d3800e187615e2dd236ad0e2a01bf761", + "reference": "90614c73d3800e187615e2dd236ad0e2a01bf761", "shasum": "" }, "require": { @@ -2194,9 +2194,9 @@ "description": "With this component, a library can provide support for annotations via DocBlocks or otherwise retrieve information that is embedded in a DocBlock.", "support": { "issues": "https://github.com/phpDocumentor/ReflectionDocBlock/issues", - "source": "https://github.com/phpDocumentor/ReflectionDocBlock/tree/5.6.4" + "source": "https://github.com/phpDocumentor/ReflectionDocBlock/tree/5.6.5" }, - "time": "2025-11-17T21:13:10+00:00" + "time": "2025-11-27T19:50:05+00:00" }, { "name": "phpdocumentor/type-resolver", @@ -2851,16 +2851,16 @@ }, { "name": "phpunit/phpunit", - "version": "9.6.29", + "version": "9.6.31", "source": { "type": "git", "url": "https://github.com/sebastianbergmann/phpunit.git", - "reference": "9ecfec57835a5581bc888ea7e13b51eb55ab9dd3" + "reference": "945d0b7f346a084ce5549e95289962972c4272e5" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/sebastianbergmann/phpunit/zipball/9ecfec57835a5581bc888ea7e13b51eb55ab9dd3", - "reference": "9ecfec57835a5581bc888ea7e13b51eb55ab9dd3", + "url": "https://api.github.com/repos/sebastianbergmann/phpunit/zipball/945d0b7f346a084ce5549e95289962972c4272e5", + "reference": "945d0b7f346a084ce5549e95289962972c4272e5", "shasum": "" }, "require": { @@ -2934,7 +2934,7 @@ "support": { "issues": "https://github.com/sebastianbergmann/phpunit/issues", "security": "https://github.com/sebastianbergmann/phpunit/security/policy", - "source": "https://github.com/sebastianbergmann/phpunit/tree/9.6.29" + "source": "https://github.com/sebastianbergmann/phpunit/tree/9.6.31" }, "funding": [ { @@ -2958,7 +2958,7 @@ "type": "tidelift" } ], - "time": "2025-09-24T06:29:11+00:00" + "time": "2025-12-06T07:45:52+00:00" }, { "name": "sebastian/cli-parser", @@ -4237,5 +4237,5 @@ "ext-pdo": "*" }, "platform-dev": {}, - "plugin-api-version": "2.6.0" + "plugin-api-version": "2.9.0" } From 767dc50eb586819534596f3ee04811ccb2876aa9 Mon Sep 17 00:00:00 2001 From: jessevz Date: Wed, 17 Dec 2025 08:38:35 +0100 Subject: [PATCH 360/691] =?UTF-8?q?Added=20calculating=20of=20pretask=20au?= =?UTF-8?q?xiliary=20keyspace,=20so=20that=20frontend=20can=E2=80=A6=20(#1?= =?UTF-8?q?820)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * Added calculating of pretask auxiliary keyspace, so that frontend can calculate keyspace --------- Co-authored-by: jessevz --- src/inc/apiv2/model/pretasks.routes.php | 27 +++++++++++++++++++++++-- 1 file changed, 25 insertions(+), 2 deletions(-) diff --git a/src/inc/apiv2/model/pretasks.routes.php b/src/inc/apiv2/model/pretasks.routes.php index 81a5f8b2e..c542f4196 100644 --- a/src/inc/apiv2/model/pretasks.routes.php +++ b/src/inc/apiv2/model/pretasks.routes.php @@ -2,10 +2,10 @@ use DBA\Factory; use DBA\QueryFilter; -use DBA\OrderFilter; use DBA\File; use DBA\FilePretask; +use DBA\JoinFilter; use DBA\Pretask; require_once(dirname(__FILE__) . "/../common/AbstractModelAPI.class.php"); @@ -63,7 +63,30 @@ protected function createObject(array $data): int { ); return $pretask->getId(); } - + + //TODO make aggregate data queryable and not included by default + static function aggregateData(object $object, array &$included_data = [], array $aggregateFieldsets = null): array { + $aggregatedData = []; + if (is_null($aggregateFieldsets) || (is_array($aggregateFieldsets) && array_key_exists('pretask', $aggregateFieldsets))) { + + $qF1 = new QueryFilter(FilePretask::PRETASK_ID, $object->getId(), "=", Factory::getFilePretaskFactory()); + $jF1 = new JoinFilter(Factory::getFilePretaskFactory(), File::FILE_ID, FilePretask::FILE_ID); + $files = Factory::getFileFactory()->filter([Factory::FILTER => $qF1, Factory::JOIN => $jF1]); + $files = $files[Factory::getFileFactory()->getModelName()]; + + $lineCountProduct = 1; + foreach ($files as $file) { + $lineCount = $file->getLineCount(); + if ($lineCount !== null) { + $lineCountProduct = $lineCountProduct * $lineCount; + } + } + $aggregatedData["auxiliaryKeyspace"] = $lineCountProduct; + } + + return $aggregatedData; + } + protected function getUpdateHandlers($id, $current_user): array { return [ Pretask::ATTACK_CMD => fn($value) => PretaskUtils::changeAttack($id, $value), From bcffa3b2b37000fab254190f8b966ab7caef1425 Mon Sep 17 00:00:00 2001 From: s3inlc Date: Wed, 17 Dec 2025 11:17:35 +0100 Subject: [PATCH 361/691] read db port env variable in db check --- docker-entrypoint.sh | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/docker-entrypoint.sh b/docker-entrypoint.sh index c0fc53d29..251ffda4d 100755 --- a/docker-entrypoint.sh +++ b/docker-entrypoint.sh @@ -18,10 +18,16 @@ if [[ "$HASHTOPOLIS_DB_TYPE" == "mysql" ]]; then echo "Using MySQL..." DB_CMD="mysql -u${HASHTOPOLIS_DB_USER} -p${HASHTOPOLIS_DB_PASS} -h ${HASHTOPOLIS_DB_HOST} --skip-ssl" DB_TYPE="mysql" + if [[ -n "${HASHTOPOLIS_DB_PORT}" ]]; then + DB_CMD="${DB_CMD} -P${HASHTOPOLIS_DB_PORT}" + fi elif [[ "$HASHTOPOLIS_DB_TYPE" == "postgres" ]]; then echo "Using postgres..." DB_CMD="psql -U${HASHTOPOLIS_DB_USER} -h ${HASHTOPOLIS_DB_HOST} ${HASHTOPOLIS_DB_DATABASE}" DB_TYPE="postgres" + if [[ -n "${HASHTOPOLIS_DB_PORT}" ]]; then + DB_CMD="${DB_CMD} -p${HASHTOPOLIS_DB_PORT}" + fi else echo "INVALID DATABASE TYPE PROVIDED: $HASHTOPOLIS_DB_TYPE" exit 1 From f975b65def3dfdc0630f72f80028cadf05340b4b Mon Sep 17 00:00:00 2001 From: jessevz Date: Thu, 18 Dec 2025 09:27:25 +0100 Subject: [PATCH 362/691] Fixed the ACL of the agent route (#1844) Co-authored-by: jessevz --- src/inc/apiv2/model/agents.routes.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/inc/apiv2/model/agents.routes.php b/src/inc/apiv2/model/agents.routes.php index 9a9d5faa7..8909fb438 100644 --- a/src/inc/apiv2/model/agents.routes.php +++ b/src/inc/apiv2/model/agents.routes.php @@ -74,7 +74,7 @@ protected function getFilterACL(): array { return [ Factory::JOIN => [ new JoinFilter(Factory::getAccessGroupAgentFactory(), Agent::AGENT_ID, AccessGroupAgent::AGENT_ID) - ], Factory::FILTER => [new ContainFilter(AccessGroupAgent::ACCESS_GROUP_ID, $accessGroups), + ], Factory::FILTER => [new ContainFilter(AccessGroupAgent::ACCESS_GROUP_ID, $accessGroups, Factory::getAccessGroupAgentFactory()), ] ]; } From 1966d0377f91f1bd141d9f95f5f5a75a8b699531 Mon Sep 17 00:00:00 2001 From: s3inlc Date: Tue, 13 Jan 2026 11:44:58 +0100 Subject: [PATCH 363/691] refactored load.php into different use case startup parts --- ci/server/setup.php | 4 +- docker-entrypoint.sh | 2 +- src/about.php | 2 +- src/access.php | 2 +- src/account.php | 2 +- src/agentStatus.php | 2 +- src/agents.php | 2 +- src/ajax/get_subtasks.php | 4 +- src/api.php | 2 +- src/api/server.php | 2 +- src/api/taskimg.php | 2 +- src/api/user.php | 2 +- src/api/v2/index.php | 6 +- src/binaries.php | 2 +- src/chunks.php | 2 +- src/config.php | 2 +- src/crackers.php | 2 +- src/cracks.php | 2 +- src/files.php | 2 +- src/forgot.php | 2 +- src/getFile.php | 4 +- src/getFound.php | 2 +- src/getHashlist.php | 2 +- src/groups.php | 2 +- src/hashes.php | 2 +- src/hashlists.php | 2 +- src/hashtypes.php | 2 +- src/health.php | 2 +- src/help.php | 2 +- src/inc/apiv2/auth/token.routes.php | 4 +- .../apiv2/common/AbstractBaseAPI.class.php | 2 +- .../apiv2/common/AbstractModelAPI.class.php | 2 + src/inc/apiv2/helper/importFile.routes.php | 4 +- src/inc/startup/include.php | 45 ++++++++ src/inc/startup/load.php | 58 ++++++++++ src/inc/{load.php => startup/setup.php} | 101 ++---------------- src/index.php | 2 +- src/install/index.php | 4 +- src/install/updates/reset.php | 2 +- .../updates/update_v0.2.0-beta_v0.2.0.php | 2 +- src/install/updates/update_v0.2.x_v0.3.0.php | 2 +- src/install/updates/update_v0.3.0_v0.3.1.php | 2 +- src/install/updates/update_v0.3.1_v0.3.2.php | 2 +- src/install/updates/update_v0.3.2_v0.4.0.php | 2 +- src/install/updates/update_v0.4.0_v0.5.0.php | 4 +- src/log.php | 2 +- src/login.php | 2 +- src/logout.php | 2 +- src/notifications.php | 2 +- src/preprocessors.php | 2 +- src/pretasks.php | 2 +- src/report.php | 4 +- src/search.php | 2 +- src/superhashlists.php | 2 +- src/supertasks.php | 2 +- src/tasks.php | 2 +- src/users.php | 2 +- 57 files changed, 175 insertions(+), 157 deletions(-) create mode 100755 src/inc/startup/include.php create mode 100755 src/inc/startup/load.php rename src/inc/{load.php => startup/setup.php} (55%) diff --git a/ci/server/setup.php b/ci/server/setup.php index aa7f50c29..869c6e2a1 100644 --- a/ci/server/setup.php +++ b/ci/server/setup.php @@ -37,6 +37,6 @@ exit(-1); } -$load = file_get_contents($envPath . "src/inc/load.php"); +$load = file_get_contents($envPath . "src/inc/setup/load.php"); $load = str_replace('ini_set("display_errors", "0");', 'ini_set("display_errors", "1");', $load); -file_put_contents($envPath . "src/inc/load.php", $load); +file_put_contents($envPath . "src/inc/setup/load.php", $load); diff --git a/docker-entrypoint.sh b/docker-entrypoint.sh index 251ffda4d..72d5b2196 100755 --- a/docker-entrypoint.sh +++ b/docker-entrypoint.sh @@ -68,7 +68,7 @@ fi # required to trigger the initialization echo "Start initialization process..." -php -f ${HASHTOPOLIS_DOCUMENT_ROOT}/inc/load.php +php -f ${HASHTOPOLIS_DOCUMENT_ROOT}/inc/startup/setup.php echo "Initialization complete!" diff --git a/src/about.php b/src/about.php index 67e883401..eeadd25e3 100755 --- a/src/about.php +++ b/src/about.php @@ -1,6 +1,6 @@ checkPermission(DViewControl::ABOUT_VIEW_PERM); diff --git a/src/access.php b/src/access.php index 01a3a51ba..925fd780f 100755 --- a/src/access.php +++ b/src/access.php @@ -4,7 +4,7 @@ use DBA\User; use DBA\Factory; -require_once(dirname(__FILE__) . "/inc/load.php"); +require_once(dirname(__FILE__) . "/inc/startup/load.php"); if (!Login::getInstance()->isLoggedin()) { header("Location: index.php?err=4" . time() . "&fw=" . urlencode($_SERVER['PHP_SELF'] . "?" . $_SERVER['QUERY_STRING'])); diff --git a/src/account.php b/src/account.php index c8bf6df1b..aa626c1ba 100755 --- a/src/account.php +++ b/src/account.php @@ -4,7 +4,7 @@ use DBA\APiKey; use DBA\QueryFilter; -require_once(dirname(__FILE__) . "/inc/load.php"); +require_once(dirname(__FILE__) . "/inc/startup/load.php"); if (!Login::getInstance()->isLoggedin()) { diff --git a/src/agentStatus.php b/src/agentStatus.php index 0b016676e..355d595f6 100644 --- a/src/agentStatus.php +++ b/src/agentStatus.php @@ -11,7 +11,7 @@ use DBA\Agent; use DBA\Factory; -require_once(dirname(__FILE__) . "/inc/load.php"); +require_once(dirname(__FILE__) . "/inc/startup/load.php"); if (!Login::getInstance()->isLoggedin()) { header("Location: index.php?err=4" . time() . "&fw=" . urlencode($_SERVER['PHP_SELF'] . "?" . $_SERVER['QUERY_STRING'])); diff --git a/src/agents.php b/src/agents.php index c501b4605..3f11f6f63 100755 --- a/src/agents.php +++ b/src/agents.php @@ -13,7 +13,7 @@ use DBA\QueryFilter; use DBA\Factory; -require_once(dirname(__FILE__) . "/inc/load.php"); +require_once(dirname(__FILE__) . "/inc/startup/load.php"); if (isset($_GET['download'])) { $agentHandler = new AgentHandler(); diff --git a/src/ajax/get_subtasks.php b/src/ajax/get_subtasks.php index 1963fc7f5..3dcd8a3f1 100644 --- a/src/ajax/get_subtasks.php +++ b/src/ajax/get_subtasks.php @@ -5,7 +5,7 @@ use DBA\Task; use DBA\Factory; -require_once(dirname(__FILE__) . "/../inc/load.php"); +require_once(dirname(__FILE__) . "/../inc/startup/load.php"); // test if task exists $taskWrapper = Factory::getTaskWrapperFactory()->get($_GET['taskWrapperId']); @@ -65,4 +65,4 @@ Template::loadInstance("tasks/subtasks"); UI::add('subtaskList', $subtaskList); UI::add('showArchived', $showArchived); -echo Template::getInstance()->render(UI::getObjects()); \ No newline at end of file +echo Template::getInstance()->render(UI::getObjects()); diff --git a/src/api.php b/src/api.php index acc37db83..2b66a2b09 100644 --- a/src/api.php +++ b/src/api.php @@ -5,7 +5,7 @@ use DBA\Factory; use DBA\User; -require_once(dirname(__FILE__) . "/inc/load.php"); +require_once(dirname(__FILE__) . "/inc/startup/load.php"); if (!Login::getInstance()->isLoggedin()) { header("Location: index.php?err=4" . time() . "&fw=" . urlencode($_SERVER['PHP_SELF'] . "?" . $_SERVER['QUERY_STRING'])); diff --git a/src/api/server.php b/src/api/server.php index a508bd714..881a8272c 100755 --- a/src/api/server.php +++ b/src/api/server.php @@ -7,7 +7,7 @@ * The input is sent as JSON encoded data and the response will also be in JSON */ -require_once(dirname(__FILE__) . "/../inc/load.php"); +require_once(dirname(__FILE__) . "/../inc/startup/include.php"); set_time_limit(0); header("Content-Type: application/json"); diff --git a/src/api/taskimg.php b/src/api/taskimg.php index b3e7deeda..da48d670f 100755 --- a/src/api/taskimg.php +++ b/src/api/taskimg.php @@ -10,7 +10,7 @@ use DBA\Task; use DBA\Factory; -require_once(dirname(__FILE__) . "/../inc/load.php"); +require_once(dirname(__FILE__) . "/../inc/startup/include.php"); //check if there is a session if (!Login::getInstance()->isLoggedin()) { diff --git a/src/api/user.php b/src/api/user.php index c81d83751..1b5401933 100644 --- a/src/api/user.php +++ b/src/api/user.php @@ -7,7 +7,7 @@ * The input is sent as JSON encoded data and the response will also be in JSON */ -require_once(dirname(__FILE__) . "/../inc/load.php"); +require_once(dirname(__FILE__) . "/../inc/startup/include.php"); set_time_limit(0); header("Content-Type: application/json"); diff --git a/src/api/v2/index.php b/src/api/v2/index.php index 535c5e919..c1a1b2901 100644 --- a/src/api/v2/index.php +++ b/src/api/v2/index.php @@ -58,10 +58,10 @@ use JimTools\JwtAuth\Rules\RequestPathRule; use Psr\Http\Message\ServerRequestInterface; -require __DIR__ . "/../../../vendor/autoload.php"; -require __DIR__ . "/../../inc/apiv2/common/ErrorHandler.class.php"; +require_once(__DIR__ . "/../../../vendor/autoload.php"); +require_once(__DIR__ . "/../../inc/apiv2/common/ErrorHandler.class.php"); -require_once(dirname(__FILE__) . "/../../inc/load.php"); +require_once(dirname(__FILE__) . "/../../inc/startup/include.php"); /* Construct container for middleware */ diff --git a/src/binaries.php b/src/binaries.php index 01689701c..8228382c9 100755 --- a/src/binaries.php +++ b/src/binaries.php @@ -2,7 +2,7 @@ use DBA\Factory; -require_once(dirname(__FILE__) . "/inc/load.php"); +require_once(dirname(__FILE__) . "/inc/startup/load.php"); if (!Login::getInstance()->isLoggedin()) { header("Location: index.php?err=4" . time() . "&fw=" . urlencode($_SERVER['PHP_SELF'] . "?" . $_SERVER['QUERY_STRING'])); diff --git a/src/chunks.php b/src/chunks.php index 9febd4de5..0b891c6f0 100755 --- a/src/chunks.php +++ b/src/chunks.php @@ -7,7 +7,7 @@ use DBA\QueryFilter; use DBA\Factory; -require_once(dirname(__FILE__) . "/inc/load.php"); +require_once(dirname(__FILE__) . "/inc/startup/load.php"); if (!Login::getInstance()->isLoggedin()) { header("Location: index.php?err=4" . time() . "&fw=" . urlencode($_SERVER['PHP_SELF'] . "?" . $_SERVER['QUERY_STRING'])); diff --git a/src/config.php b/src/config.php index 21bacdfa8..f867172af 100755 --- a/src/config.php +++ b/src/config.php @@ -4,7 +4,7 @@ use DBA\Config; use DBA\Factory; -require_once(dirname(__FILE__) . "/inc/load.php"); +require_once(dirname(__FILE__) . "/inc/startup/load.php"); if (!Login::getInstance()->isLoggedin()) { header("Location: index.php?err=4" . time() . "&fw=" . urlencode($_SERVER['PHP_SELF'] . "?" . $_SERVER['QUERY_STRING'])); diff --git a/src/crackers.php b/src/crackers.php index 92fba1018..104062cdf 100755 --- a/src/crackers.php +++ b/src/crackers.php @@ -6,7 +6,7 @@ use DBA\QueryFilter; use DBA\Factory; -require_once(dirname(__FILE__) . "/inc/load.php"); +require_once(dirname(__FILE__) . "/inc/startup/load.php"); if (!Login::getInstance()->isLoggedin()) { header("Location: index.php?err=4" . time() . "&fw=" . urlencode($_SERVER['PHP_SELF'] . "?" . $_SERVER['QUERY_STRING'])); diff --git a/src/cracks.php b/src/cracks.php index 03a3dd052..a7394bc18 100644 --- a/src/cracks.php +++ b/src/cracks.php @@ -9,7 +9,7 @@ use DBA\OrderFilter; use DBA\QueryFilter; -require_once(dirname(__FILE__) . "/inc/load.php"); +require_once(dirname(__FILE__) . "/inc/startup/load.php"); if (!Login::getInstance()->isLoggedin()) { header("Location: index.php?err=4" . time() . "&fw=" . urlencode($_SERVER['PHP_SELF'] . "?" . $_SERVER['QUERY_STRING'])); diff --git a/src/files.php b/src/files.php index ac8da358b..38c1d2cc4 100755 --- a/src/files.php +++ b/src/files.php @@ -6,7 +6,7 @@ use DBA\ContainFilter; use DBA\Factory; -require_once(dirname(__FILE__) . "/inc/load.php"); +require_once(dirname(__FILE__) . "/inc/startup/load.php"); if (!Login::getInstance()->isLoggedin()) { header("Location: index.php?err=4" . time() . "&fw=" . urlencode($_SERVER['PHP_SELF'] . "?" . $_SERVER['QUERY_STRING'])); diff --git a/src/forgot.php b/src/forgot.php index 1a1b0e794..886d824a1 100755 --- a/src/forgot.php +++ b/src/forgot.php @@ -1,6 +1,6 @@ checkPermission(DViewControl::FORGOT_VIEW_PERM); diff --git a/src/getFile.php b/src/getFile.php index 8f0dedd11..2ccbddd0e 100644 --- a/src/getFile.php +++ b/src/getFile.php @@ -5,7 +5,7 @@ use DBA\ApiKey; use DBA\Factory; -require_once(dirname(__FILE__) . "/inc/load.php"); +require_once(dirname(__FILE__) . "/inc/startup/load.php"); ini_set("max_execution_time", 100000); @@ -154,4 +154,4 @@ } -fclose($fp); \ No newline at end of file +fclose($fp); diff --git a/src/getFound.php b/src/getFound.php index 353f34d54..3fafdd364 100644 --- a/src/getFound.php +++ b/src/getFound.php @@ -8,7 +8,7 @@ use DBA\QueryFilter; use DBA\Factory; -require_once(dirname(__FILE__) . "/inc/load.php"); +require_once(dirname(__FILE__) . "/inc/startup/load.php"); AccessControl::getInstance()->checkPermission(DViewControl::GETHASHLIST_VIEW_PERM); diff --git a/src/getHashlist.php b/src/getHashlist.php index 08edb2dc0..b37c7131d 100644 --- a/src/getHashlist.php +++ b/src/getHashlist.php @@ -10,7 +10,7 @@ use DBA\Factory; use DBA\Assignment; -require_once(dirname(__FILE__) . "/inc/load.php"); +require_once(dirname(__FILE__) . "/inc/startup/load.php"); AccessControl::getInstance()->checkPermission(DViewControl::GETHASHLIST_VIEW_PERM); diff --git a/src/groups.php b/src/groups.php index 3d7524744..4b381f5a5 100755 --- a/src/groups.php +++ b/src/groups.php @@ -10,7 +10,7 @@ use DBA\User; use DBA\Factory; -require_once(dirname(__FILE__) . "/inc/load.php"); +require_once(dirname(__FILE__) . "/inc/startup/load.php"); if (!Login::getInstance()->isLoggedin()) { header("Location: index.php?err=4" . time() . "&fw=" . urlencode($_SERVER['PHP_SELF'] . "?" . $_SERVER['QUERY_STRING'])); diff --git a/src/hashes.php b/src/hashes.php index 196c51283..2cd9961cf 100755 --- a/src/hashes.php +++ b/src/hashes.php @@ -10,7 +10,7 @@ use DBA\Task; use DBA\Factory; -require_once(dirname(__FILE__) . "/inc/load.php"); +require_once(dirname(__FILE__) . "/inc/startup/load.php"); if (!Login::getInstance()->isLoggedin()) { header("Location: index.php?err=4" . time() . "&fw=" . urlencode($_SERVER['PHP_SELF'] . "?" . $_SERVER['QUERY_STRING'])); diff --git a/src/hashlists.php b/src/hashlists.php index 57a423d8a..a45043dae 100755 --- a/src/hashlists.php +++ b/src/hashlists.php @@ -12,7 +12,7 @@ use DBA\TaskWrapper; use DBA\Factory; -require_once(dirname(__FILE__) . "/inc/load.php"); +require_once(dirname(__FILE__) . "/inc/startup/load.php"); if (!Login::getInstance()->isLoggedin()) { header("Location: index.php?err=4" . time() . "&fw=" . urlencode($_SERVER['PHP_SELF'] . "?" . $_SERVER['QUERY_STRING'])); diff --git a/src/hashtypes.php b/src/hashtypes.php index 413e2d834..50792fcdb 100755 --- a/src/hashtypes.php +++ b/src/hashtypes.php @@ -2,7 +2,7 @@ use DBA\Factory; -require_once(dirname(__FILE__) . "/inc/load.php"); +require_once(dirname(__FILE__) . "/inc/startup/load.php"); if (!Login::getInstance()->isLoggedin()) { header("Location: index.php?err=4" . time() . "&fw=" . urlencode($_SERVER['PHP_SELF'] . "?" . $_SERVER['QUERY_STRING'])); diff --git a/src/health.php b/src/health.php index 9fead27da..31db24d1b 100644 --- a/src/health.php +++ b/src/health.php @@ -7,7 +7,7 @@ use DBA\QueryFilter; use DBA\HealthCheckAgent; -require_once(dirname(__FILE__) . "/inc/load.php"); +require_once(dirname(__FILE__) . "/inc/startup/load.php"); if (!Login::getInstance()->isLoggedin()) { header("Location: index.php?err=4" . time() . "&fw=" . urlencode($_SERVER['PHP_SELF'] . "?" . $_SERVER['QUERY_STRING'])); diff --git a/src/help.php b/src/help.php index f5172f379..e0b5e4859 100755 --- a/src/help.php +++ b/src/help.php @@ -1,6 +1,6 @@ checkPermission(DViewControl::HELP_VIEW_PERM); diff --git a/src/inc/apiv2/auth/token.routes.php b/src/inc/apiv2/auth/token.routes.php index 7f1f01317..c513deb46 100644 --- a/src/inc/apiv2/auth/token.routes.php +++ b/src/inc/apiv2/auth/token.routes.php @@ -11,7 +11,7 @@ use DBA\User; use DBA\Factory; -require_once(dirname(__FILE__) . "/../../load.php"); +require_once(dirname(__FILE__) . "/../../startup/include.php"); $app->group("/api/v2/auth/token", function (RouteCollectorProxy $group) { /* Allow preflight requests */ @@ -104,4 +104,4 @@ return $response->withStatus(201) ->withHeader("Content-Type", "application/json"); }); -}); \ No newline at end of file +}); diff --git a/src/inc/apiv2/common/AbstractBaseAPI.class.php b/src/inc/apiv2/common/AbstractBaseAPI.class.php index 5499615db..66879569e 100644 --- a/src/inc/apiv2/common/AbstractBaseAPI.class.php +++ b/src/inc/apiv2/common/AbstractBaseAPI.class.php @@ -52,7 +52,7 @@ use DBA\SupertaskPretask; use Psr\Container\ContainerInterface; -require_once(dirname(__FILE__) . "/../../load.php"); +require_once(dirname(__FILE__) . "/../../startup/include.php"); /** diff --git a/src/inc/apiv2/common/AbstractModelAPI.class.php b/src/inc/apiv2/common/AbstractModelAPI.class.php index 1126d03a5..817638a57 100644 --- a/src/inc/apiv2/common/AbstractModelAPI.class.php +++ b/src/inc/apiv2/common/AbstractModelAPI.class.php @@ -751,6 +751,8 @@ public static function getManyResources(object $apiClass, Request $request, Resp } else if (isset($lastCursorObject)){ $new_cursor = $apiClass::calculate_next_cursor($lastCursorObject->getId(), !$isNegativeSort); $last_cursor = $apiClass::build_cursor($primaryFilter, $new_cursor); + } else { + $last_cursor = null; } $lastParams['page']['before'] = $last_cursor; $linksLast = $baseUrl . $request->getUri()->getPath() . '?' . urldecode(http_build_query($lastParams)); diff --git a/src/inc/apiv2/helper/importFile.routes.php b/src/inc/apiv2/helper/importFile.routes.php index da74b472a..2e361db80 100644 --- a/src/inc/apiv2/helper/importFile.routes.php +++ b/src/inc/apiv2/helper/importFile.routes.php @@ -9,7 +9,7 @@ /* Default timeout interval for considering an upload stale/incomplete */ const DEFAULT_UPLOAD_EXPIRES_TIMEOUT = 3600; -require_once(dirname(__FILE__) . "/../../load.php"); +require_once(dirname(__FILE__) . "/../../startup/include.php"); require_once(dirname(__FILE__) . "/../common/AbstractHelperAPI.class.php"); /* File import API @@ -387,4 +387,4 @@ static public function register($app): void { } } -ImportFileHelperAPI::register($app); \ No newline at end of file +ImportFileHelperAPI::register($app); diff --git a/src/inc/startup/include.php b/src/inc/startup/include.php new file mode 100755 index 000000000..eed9c70aa --- /dev/null +++ b/src/inc/startup/include.php @@ -0,0 +1,45 @@ +get("build"); + if ($storedBuild != null) { + UI::add('build', $storedBuild->getVal()); + } +} + +UI::add('menu', Menu::get()); +UI::add('messages', []); + +UI::add('pageTitle', ""); +UI::add('login', Login::getInstance()); +if (Login::getInstance()->isLoggedin()) { + UI::add('user', Login::getInstance()->getUser()); + AccessControl::getInstance(Login::getInstance()->getUser()); +} + +UI::add('config', SConfig::getInstance()); + +define("APP_NAME", (SConfig::getInstance()->getVal(DConfig::S_NAME) == 1) ? "Hashtopussy" : "Hashtopolis"); + +//set autorefresh to false for all pages +UI::add('autorefresh', -1); + +UI::add('accessControl', AccessControl::getInstance()); + +// CSRF setup +CSRF::init(); diff --git a/src/inc/load.php b/src/inc/startup/setup.php similarity index 55% rename from src/inc/load.php rename to src/inc/startup/setup.php index e2ac8502f..f78354ea9 100755 --- a/src/inc/load.php +++ b/src/inc/startup/setup.php @@ -1,5 +1,9 @@ $path) { @@ -79,28 +46,16 @@ // this only needs to be present for the very first upgrade from non-migration to migrations to make sure the last updates are executed before migration if (!$initialSetup && DBA_TYPE == "mysql" && !Util::databaseTableExists("_sqlx_migrations")) { - include(dirname(__FILE__) . "/../install/updates/update.php"); + include(dirname(__FILE__) . "/../../install/updates/update.php"); } $database_uri = DBA_TYPE . "://" . DBA_USER . ":" . DBA_PASS . "@" . DBA_SERVER . ":" . DBA_PORT . "/" . DBA_DB; -exec('/usr/bin/sqlx migrate run --source ' . dirname(__FILE__) . '/../migrations/' . DBA_TYPE . '/ -D ' . $database_uri, $output, $retval); +exec('/usr/bin/sqlx migrate run --source ' . dirname(__FILE__) . '/../../migrations/' . DBA_TYPE . '/ -D ' . $database_uri, $output, $retval); if ($retval !== 0) { die("Failed to run migrations: \n" . implode("\n", $output)); } if ($initialSetup === true) { - // determine the base url - $baseUrl = explode("/", $_SERVER['REQUEST_URI']); - unset($baseUrl[sizeof($baseUrl) - 1]); - try { - $urlConfig = ConfigUtils::get(DConfig::BASE_URL); - } - catch (HTException $e) { - die("Failure in config: " . $e->getMessage()); - } - $urlConfig->setValue(implode("/", $baseUrl)); - Factory::getConfigFactory()->update($urlConfig); - // if peppers are not set, generate them and save them if (!isset($PEPPER)) { $PEPPER = [ @@ -160,45 +115,3 @@ Util::checkDataDirectory(DDirectories::LOG, $DIRECTORIES['log']); Util::checkDataDirectory(DDirectories::CONFIG, $DIRECTORIES['config']); -$LANG = new Lang(); -UI::add('version', $VERSION); -UI::add('host', $HOST); -UI::add('gitcommit', Util::getGitCommit()); -UI::add('build', ''); - -// Darkmode -if (isset($_COOKIE['toggledarkmode']) && $_COOKIE['toggledarkmode'] == '1') { - UI::add('toggledarkmode', 1); -} -else { - UI::add('toggledarkmode', 0); -} - -if (strlen(Util::getGitCommit()) == 0) { - $storedBuild = Factory::getStoredValueFactory()->get("build"); - if ($storedBuild != null) { - UI::add('build', $storedBuild->getVal()); - } -} - -UI::add('menu', Menu::get()); -UI::add('messages', []); - -UI::add('pageTitle', ""); -UI::add('login', Login::getInstance()); -if (Login::getInstance()->isLoggedin()) { - UI::add('user', Login::getInstance()->getUser()); - AccessControl::getInstance(Login::getInstance()->getUser()); -} - -UI::add('config', SConfig::getInstance()); - -define("APP_NAME", (SConfig::getInstance()->getVal(DConfig::S_NAME) == 1) ? "Hashtopussy" : "Hashtopolis"); - -//set autorefresh to false for all pages -UI::add('autorefresh', -1); - -UI::add('accessControl', AccessControl::getInstance()); - -// CSRF setup -CSRF::init(); diff --git a/src/index.php b/src/index.php index 6673749e4..51b3be03b 100755 --- a/src/index.php +++ b/src/index.php @@ -1,6 +1,6 @@ checkPermission(DViewControl::INDEX_VIEW_PERM); diff --git a/src/install/index.php b/src/install/index.php index 707417330..2168362fe 100755 --- a/src/install/index.php +++ b/src/install/index.php @@ -7,9 +7,9 @@ use DBA\Factory; use DBA\StoredValue; -require_once(dirname(__FILE__) . "/../inc/load.php"); +require_once(dirname(__FILE__) . "/../inc/startup/load.php"); -$write_files = array(".", "../inc/Encryption.class.php", "../inc/load.php", "../files", "../templates", "../inc", "../files", "../lang", "../"); +$write_files = array(".", "../inc/Encryption.class.php", "../inc/startup/load.php", "../files", "../templates", "../inc", "../files", "../lang", "../"); if ($INSTALL) { die("Installation is already done!"); diff --git a/src/install/updates/reset.php b/src/install/updates/reset.php index 22176a176..ee9da5687 100644 --- a/src/install/updates/reset.php +++ b/src/install/updates/reset.php @@ -2,7 +2,7 @@ use DBA\Factory; -require_once(dirname(__FILE__) . "/../../inc/load.php"); +require_once(dirname(__FILE__) . "/../../inc/startup/load.php"); /** * Use this file if you want to reset the password for an admin account. Fill in the values and just run it once. diff --git a/src/install/updates/update_v0.2.0-beta_v0.2.0.php b/src/install/updates/update_v0.2.0-beta_v0.2.0.php index 9f055dbee..b8fa591cc 100644 --- a/src/install/updates/update_v0.2.0-beta_v0.2.0.php +++ b/src/install/updates/update_v0.2.0-beta_v0.2.0.php @@ -5,7 +5,7 @@ use DBA\Factory; use Composer\Semver\Comparator; -require_once(dirname(__FILE__) . "/../../inc/load.php"); +require_once(dirname(__FILE__) . "/../../inc/startup/load.php"); echo "Apply updates...\n"; diff --git a/src/install/updates/update_v0.2.x_v0.3.0.php b/src/install/updates/update_v0.2.x_v0.3.0.php index 4a2b50a30..ec5126d74 100644 --- a/src/install/updates/update_v0.2.x_v0.3.0.php +++ b/src/install/updates/update_v0.2.x_v0.3.0.php @@ -6,7 +6,7 @@ use DBA\Factory; use Composer\Semver\Comparator; -require_once(dirname(__FILE__) . "/../../inc/load.php"); +require_once(dirname(__FILE__) . "/../../inc/startup/load.php"); echo "Apply updates...\n"; diff --git a/src/install/updates/update_v0.3.0_v0.3.1.php b/src/install/updates/update_v0.3.0_v0.3.1.php index 672f1bf40..de4f594bc 100644 --- a/src/install/updates/update_v0.3.0_v0.3.1.php +++ b/src/install/updates/update_v0.3.0_v0.3.1.php @@ -2,7 +2,7 @@ use DBA\Factory; -require_once(dirname(__FILE__) . "/../../inc/load.php"); +require_once(dirname(__FILE__) . "/../../inc/startup/load.php"); echo "Apply updates...\n"; diff --git a/src/install/updates/update_v0.3.1_v0.3.2.php b/src/install/updates/update_v0.3.1_v0.3.2.php index 438b7a765..a1aaedc2d 100644 --- a/src/install/updates/update_v0.3.1_v0.3.2.php +++ b/src/install/updates/update_v0.3.1_v0.3.2.php @@ -5,7 +5,7 @@ use DBA\Factory; use Composer\Semver\Comparator; -require_once(dirname(__FILE__) . "/../../inc/load.php"); +require_once(dirname(__FILE__) . "/../../inc/startup/load.php"); echo "Apply updates...\n"; diff --git a/src/install/updates/update_v0.3.2_v0.4.0.php b/src/install/updates/update_v0.3.2_v0.4.0.php index bc7c924ee..c2d8a93a0 100644 --- a/src/install/updates/update_v0.3.2_v0.4.0.php +++ b/src/install/updates/update_v0.3.2_v0.4.0.php @@ -5,7 +5,7 @@ use DBA\Factory; use Composer\Semver\Comparator; -require_once(dirname(__FILE__) . "/../../inc/load.php"); +require_once(dirname(__FILE__) . "/../../inc/startup/load.php"); echo "Apply updates...\n"; diff --git a/src/install/updates/update_v0.4.0_v0.5.0.php b/src/install/updates/update_v0.4.0_v0.5.0.php index 257426b57..d897cb520 100644 --- a/src/install/updates/update_v0.4.0_v0.5.0.php +++ b/src/install/updates/update_v0.4.0_v0.5.0.php @@ -132,7 +132,7 @@ echo "OK\n"; echo "Reload full include... (Warning about sessions might show up, which can be ignored)"; -require_once(dirname(__FILE__) . "/../../inc/load.php"); +require_once(dirname(__FILE__) . "/../../inc/startup/load.php"); echo "OK\n"; echo "Starting with refilling data...\n"; @@ -298,4 +298,4 @@ $DB->commit(); -echo "Update complete!\n"; \ No newline at end of file +echo "Update complete!\n"; diff --git a/src/log.php b/src/log.php index 4bc5049df..ac7d65990 100755 --- a/src/log.php +++ b/src/log.php @@ -5,7 +5,7 @@ use DBA\QueryFilter; use DBA\Factory; -require_once(dirname(__FILE__) . "/inc/load.php"); +require_once(dirname(__FILE__) . "/inc/startup/load.php"); if (!Login::getInstance()->isLoggedin()) { header("Location: index.php?err=4" . time() . "&fw=" . urlencode($_SERVER['PHP_SELF'] . "?" . $_SERVER['QUERY_STRING'])); diff --git a/src/login.php b/src/login.php index c0b0a5a1e..58841f7a8 100755 --- a/src/login.php +++ b/src/login.php @@ -1,6 +1,6 @@ checkPermission(DViewControl::LOGIN_VIEW_PERM); diff --git a/src/logout.php b/src/logout.php index 3a32cb1e1..b2e6fc1ba 100755 --- a/src/logout.php +++ b/src/logout.php @@ -1,6 +1,6 @@ checkPermission(DViewControl::LOGOUT_VIEW_PERM); diff --git a/src/notifications.php b/src/notifications.php index 6e7aeceed..567770393 100755 --- a/src/notifications.php +++ b/src/notifications.php @@ -10,7 +10,7 @@ use DBA\User; use DBA\Factory; -require_once(dirname(__FILE__) . "/inc/load.php"); +require_once(dirname(__FILE__) . "/inc/startup/load.php"); if (!Login::getInstance()->isLoggedin()) { header("Location: index.php?err=4" . time() . "&fw=" . urlencode($_SERVER['PHP_SELF'] . "?" . $_SERVER['QUERY_STRING'])); diff --git a/src/preprocessors.php b/src/preprocessors.php index 0a39aaca1..639a37c5f 100755 --- a/src/preprocessors.php +++ b/src/preprocessors.php @@ -4,7 +4,7 @@ use DBA\Preprocessor; use DBA\Factory; -require_once(dirname(__FILE__) . "/inc/load.php"); +require_once(dirname(__FILE__) . "/inc/startup/load.php"); if (!Login::getInstance()->isLoggedin()) { header("Location: index.php?err=4" . time() . "&fw=" . urlencode($_SERVER['PHP_SELF'] . "?" . $_SERVER['QUERY_STRING'])); diff --git a/src/pretasks.php b/src/pretasks.php index 39db1d902..76a37f3b0 100755 --- a/src/pretasks.php +++ b/src/pretasks.php @@ -9,7 +9,7 @@ use DBA\SupertaskPretask; use DBA\Factory; -require_once(dirname(__FILE__) . "/inc/load.php"); +require_once(dirname(__FILE__) . "/inc/startup/load.php"); if (!Login::getInstance()->isLoggedin()) { header("Location: index.php?err=4" . time() . "&fw=" . urlencode($_SERVER['PHP_SELF'] . "?" . $_SERVER['QUERY_STRING'])); diff --git a/src/report.php b/src/report.php index 3b49fb712..b3f4f0360 100644 --- a/src/report.php +++ b/src/report.php @@ -8,7 +8,7 @@ use DBA\Task; use DBA\HealthCheckAgent; -require_once(dirname(__FILE__) . "/inc/load.php"); +require_once(dirname(__FILE__) . "/inc/startup/load.php"); if (!Login::getInstance()->isLoggedin()) { header("Location: index.php?err=4" . time() . "&fw=" . urlencode($_SERVER['PHP_SELF'] . "?" . $_SERVER['QUERY_STRING'])); @@ -134,4 +134,4 @@ // cleanup unlink($baseName . ".aux"); -unlink($baseName . ".log"); \ No newline at end of file +unlink($baseName . ".log"); diff --git a/src/search.php b/src/search.php index cfa959324..9d7348567 100755 --- a/src/search.php +++ b/src/search.php @@ -1,6 +1,6 @@ isLoggedin()) { header("Location: index.php?err=4" . time() . "&fw=" . urlencode($_SERVER['PHP_SELF'] . "?" . $_SERVER['QUERY_STRING'])); diff --git a/src/superhashlists.php b/src/superhashlists.php index 01a7634b5..f26b429be 100755 --- a/src/superhashlists.php +++ b/src/superhashlists.php @@ -6,7 +6,7 @@ use DBA\QueryFilter; use DBA\Factory; -require_once(dirname(__FILE__) . "/inc/load.php"); +require_once(dirname(__FILE__) . "/inc/startup/load.php"); if (!Login::getInstance()->isLoggedin()) { header("Location: index.php?err=4" . time() . "&fw=" . urlencode($_SERVER['PHP_SELF'] . "?" . $_SERVER['QUERY_STRING'])); diff --git a/src/supertasks.php b/src/supertasks.php index cb86d31e8..03bdf318e 100755 --- a/src/supertasks.php +++ b/src/supertasks.php @@ -10,7 +10,7 @@ use DBA\File; use DBA\FilePretask; -require_once(dirname(__FILE__) . "/inc/load.php"); +require_once(dirname(__FILE__) . "/inc/startup/load.php"); if (!Login::getInstance()->isLoggedin()) { header("Location: index.php?err=4" . time() . "&fw=" . urlencode($_SERVER['PHP_SELF'] . "?" . $_SERVER['QUERY_STRING'])); diff --git a/src/tasks.php b/src/tasks.php index 8951f706e..504a50c8b 100755 --- a/src/tasks.php +++ b/src/tasks.php @@ -13,7 +13,7 @@ use DBA\QueryFilter; use DBA\Factory; -require_once(dirname(__FILE__) . "/inc/load.php"); +require_once(dirname(__FILE__) . "/inc/startup/load.php"); if (!Login::getInstance()->isLoggedin()) { header("Location: index.php?err=4" . time() . "&fw=" . urlencode($_SERVER['PHP_SELF'] . "?" . $_SERVER['QUERY_STRING'])); diff --git a/src/users.php b/src/users.php index 6fb4179b8..a535d9ab1 100755 --- a/src/users.php +++ b/src/users.php @@ -6,7 +6,7 @@ use DBA\JoinFilter; use DBA\Factory; -require_once(dirname(__FILE__) . "/inc/load.php"); +require_once(dirname(__FILE__) . "/inc/startup/load.php"); if (!Login::getInstance()->isLoggedin()) { header("Location: index.php?err=4" . time() . "&fw=" . urlencode($_SERVER['PHP_SELF'] . "?" . $_SERVER['QUERY_STRING'])); From cc04e95b4ea066fe6cdf1383fdaf6a7f2e2eb20b Mon Sep 17 00:00:00 2001 From: s3inlc Date: Tue, 13 Jan 2026 11:49:28 +0100 Subject: [PATCH 364/691] fixed typo in CI setup --- ci/server/setup.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/ci/server/setup.php b/ci/server/setup.php index 869c6e2a1..7fbe63816 100644 --- a/ci/server/setup.php +++ b/ci/server/setup.php @@ -37,6 +37,6 @@ exit(-1); } -$load = file_get_contents($envPath . "src/inc/setup/load.php"); +$load = file_get_contents($envPath . "src/inc/startup/load.php"); $load = str_replace('ini_set("display_errors", "0");', 'ini_set("display_errors", "1");', $load); -file_put_contents($envPath . "src/inc/setup/load.php", $load); +file_put_contents($envPath . "src/inc/startup/load.php", $load); From 182c0f63c11a62c201e4279c62f06c4aa48a69e6 Mon Sep 17 00:00:00 2001 From: s3inlc Date: Tue, 13 Jan 2026 11:53:05 +0100 Subject: [PATCH 365/691] app name needs to be defined --- src/inc/startup/include.php | 2 ++ src/inc/startup/load.php | 2 -- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/inc/startup/include.php b/src/inc/startup/include.php index eed9c70aa..7a6033c89 100755 --- a/src/inc/startup/include.php +++ b/src/inc/startup/include.php @@ -43,3 +43,5 @@ // include DBA require_once($baseDir . "/../dba/init.php"); + +define("APP_NAME", (SConfig::getInstance()->getVal(DConfig::S_NAME) == 1) ? "Hashtopussy" : "Hashtopolis"); diff --git a/src/inc/startup/load.php b/src/inc/startup/load.php index 82a61a058..0f5eacaf2 100755 --- a/src/inc/startup/load.php +++ b/src/inc/startup/load.php @@ -47,8 +47,6 @@ UI::add('config', SConfig::getInstance()); -define("APP_NAME", (SConfig::getInstance()->getVal(DConfig::S_NAME) == 1) ? "Hashtopussy" : "Hashtopolis"); - //set autorefresh to false for all pages UI::add('autorefresh', -1); From f2c9803fadce1100d3db63aeb7ec56cba147bd05 Mon Sep 17 00:00:00 2001 From: s3inlc Date: Tue, 13 Jan 2026 12:02:52 +0100 Subject: [PATCH 366/691] app name must be defined after include --- src/inc/startup/include.php | 2 -- src/inc/startup/load.php | 2 ++ src/inc/startup/setup.php | 1 + 3 files changed, 3 insertions(+), 2 deletions(-) diff --git a/src/inc/startup/include.php b/src/inc/startup/include.php index 7a6033c89..eed9c70aa 100755 --- a/src/inc/startup/include.php +++ b/src/inc/startup/include.php @@ -43,5 +43,3 @@ // include DBA require_once($baseDir . "/../dba/init.php"); - -define("APP_NAME", (SConfig::getInstance()->getVal(DConfig::S_NAME) == 1) ? "Hashtopussy" : "Hashtopolis"); diff --git a/src/inc/startup/load.php b/src/inc/startup/load.php index 0f5eacaf2..cce394357 100755 --- a/src/inc/startup/load.php +++ b/src/inc/startup/load.php @@ -45,6 +45,8 @@ AccessControl::getInstance(Login::getInstance()->getUser()); } +define("APP_NAME", (SConfig::getInstance()->getVal(DConfig::S_NAME) == 1) ? "Hashtopussy" : "Hashtopolis"); + UI::add('config', SConfig::getInstance()); //set autorefresh to false for all pages diff --git a/src/inc/startup/setup.php b/src/inc/startup/setup.php index f78354ea9..ee3992a58 100755 --- a/src/inc/startup/setup.php +++ b/src/inc/startup/setup.php @@ -115,3 +115,4 @@ Util::checkDataDirectory(DDirectories::LOG, $DIRECTORIES['log']); Util::checkDataDirectory(DDirectories::CONFIG, $DIRECTORIES['config']); +define("APP_NAME", (SConfig::getInstance()->getVal(DConfig::S_NAME) == 1) ? "Hashtopussy" : "Hashtopolis"); From 5d02ebc9c959398e38c29db76b4f7857205c114c Mon Sep 17 00:00:00 2001 From: s3inlc Date: Tue, 13 Jan 2026 14:05:26 +0100 Subject: [PATCH 367/691] set default variable --- src/inc/startup/include.php | 2 ++ 1 file changed, 2 insertions(+) diff --git a/src/inc/startup/include.php b/src/inc/startup/include.php index eed9c70aa..59a2f32c2 100755 --- a/src/inc/startup/include.php +++ b/src/inc/startup/include.php @@ -3,6 +3,8 @@ // set to 1 for debugging ini_set("display_errors", "0"); +define("APP_NAME", "Hashtopolis"); + $baseDir = dirname(__FILE__) . "/.."; require_once($baseDir . "/../../vendor/autoload.php"); From 6fc55d7ed4b908d51de71c3379ca22f392d8687d Mon Sep 17 00:00:00 2001 From: s3inlc Date: Tue, 13 Jan 2026 14:11:05 +0100 Subject: [PATCH 368/691] lang creation included --- src/inc/startup/include.php | 4 ++++ src/inc/startup/load.php | 1 - 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/src/inc/startup/include.php b/src/inc/startup/include.php index 59a2f32c2..39e51a38d 100755 --- a/src/inc/startup/include.php +++ b/src/inc/startup/include.php @@ -45,3 +45,7 @@ // include DBA require_once($baseDir . "/../dba/init.php"); + +// legacy, but needed for email sending +// TODO: this later should be replaced with a singleton +$LANG = new Lang(); diff --git a/src/inc/startup/load.php b/src/inc/startup/load.php index cce394357..f0cb5b092 100755 --- a/src/inc/startup/load.php +++ b/src/inc/startup/load.php @@ -14,7 +14,6 @@ require_once(dirname(__FILE__) . "/include.php"); -$LANG = new Lang(); UI::add('version', $VERSION); UI::add('host', $HOST); UI::add('gitcommit', Util::getGitCommit()); From 4f6acefe1ad2ca36306d94de240c28a976f76a8f Mon Sep 17 00:00:00 2001 From: s3inlc Date: Wed, 14 Jan 2026 10:16:57 +0100 Subject: [PATCH 369/691] added helpers 'rebuildChunkCache' and 'rescanGlobalFiles' --- ci/apiv2/test_chunk.py | 10 ++++ ci/apiv2/test_file.py | 11 +++++ src/api/v2/index.php | 2 + .../apiv2/helper/rebuildChunkCache.routes.php | 47 +++++++++++++++++++ .../apiv2/helper/rescanGlobalFiles.routes.php | 45 ++++++++++++++++++ 5 files changed, 115 insertions(+) create mode 100644 src/inc/apiv2/helper/rebuildChunkCache.routes.php create mode 100644 src/inc/apiv2/helper/rescanGlobalFiles.routes.php diff --git a/ci/apiv2/test_chunk.py b/ci/apiv2/test_chunk.py index 9da39374c..11d782ec3 100644 --- a/ci/apiv2/test_chunk.py +++ b/ci/apiv2/test_chunk.py @@ -39,3 +39,13 @@ def test_helper_purge_task(self): chunks = Chunk.objects.filter(taskId=retval['task'].id) self.assertEqual(len(chunks), 0) + + def test_helper_rebuild_chunk_cache(self): + # Note: it is currently only tested that the call to the helper works, but not that it would fix anything correctly. + # The problem is, that we cannot set the values of chunks and hashlists to "wrong" values via the API. + + self.create_test_object() + + helper = Helper() + response = helper.rebuild_chunk_cache() + self.assertEqual({"Rebuild": "Success", "correctedChunks": 0, "correctedHashlists": 0}, response) \ No newline at end of file diff --git a/ci/apiv2/test_file.py b/ci/apiv2/test_file.py index 710aabd7b..aabba0f2c 100644 --- a/ci/apiv2/test_file.py +++ b/ci/apiv2/test_file.py @@ -57,3 +57,14 @@ def test_range_request_get_file(self): def test_bulk_delete(self): files = [self.create_test_object(delete=False) for i in range(5)] File.objects.delete_many(files) + + def test_helper_rescan_global_files(self): + model_obj1 = self.create_test_object() + model_obj2 = self.create_test_object() + + helper = Helper() + data = helper.rescan_global_files() + self.assertEqual(data, {"Rescan": "Success"}) + + check_obj1 = File.objects.get(fileId=model_obj1.id) + self.assertEqual(3, check_obj1.lineCount) diff --git a/src/api/v2/index.php b/src/api/v2/index.php index 535c5e919..e3b7af3a3 100644 --- a/src/api/v2/index.php +++ b/src/api/v2/index.php @@ -357,7 +357,9 @@ public static function addCORSheaders(Request $request, $response) { require __DIR__ . "/../../inc/apiv2/helper/importCrackedHashes.routes.php"; require __DIR__ . "/../../inc/apiv2/helper/importFile.routes.php"; require __DIR__ . "/../../inc/apiv2/helper/purgeTask.routes.php"; +require __DIR__ . "/../../inc/apiv2/helper/rebuildChunkCache.routes.php"; require __DIR__ . "/../../inc/apiv2/helper/recountFileLines.routes.php"; +require __DIR__ . "/../../inc/apiv2/helper/rescanGlobalFiles.routes.php"; require __DIR__ . "/../../inc/apiv2/helper/resetChunk.routes.php"; require __DIR__ . "/../../inc/apiv2/helper/resetUserPassword.routes.php"; require __DIR__ . "/../../inc/apiv2/helper/searchHashes.routes.php"; diff --git a/src/inc/apiv2/helper/rebuildChunkCache.routes.php b/src/inc/apiv2/helper/rebuildChunkCache.routes.php new file mode 100644 index 000000000..224d219b1 --- /dev/null +++ b/src/inc/apiv2/helper/rebuildChunkCache.routes.php @@ -0,0 +1,47 @@ + "Success"]; + } + + /** + * Endpoint to recount files for when there is size mismatch + * @param $data + * @return object|array|null + * @throws ContainerExceptionInterface + * @throws NotFoundExceptionInterface + */ + public function actionPost($data): object|array|null { + $result = ConfigUtils::rebuildCache(); + $response = $this->getResponse(); + $response["correctedChunks"] = $result[0]; + $response["correctedHashlists"] = $result[1]; + return $response; + } +} + +RebuildChunkCacheHelperAPI::register($app); diff --git a/src/inc/apiv2/helper/rescanGlobalFiles.routes.php b/src/inc/apiv2/helper/rescanGlobalFiles.routes.php new file mode 100644 index 000000000..fd7f537d1 --- /dev/null +++ b/src/inc/apiv2/helper/rescanGlobalFiles.routes.php @@ -0,0 +1,45 @@ + "Success"]; + } + + /** + * Endpoint to recount files for when there is size mismatch + * @param $data + * @return object|array|null + * @throws ContainerExceptionInterface + * @throws NotFoundExceptionInterface + * @throws HTMessages + */ + public function actionPost($data): object|array|null { + ConfigUtils::scanFiles(); + return $this->getResponse(); + } +} + +RescanGlobalFilesHelperAPI::register($app); From 867a897f19d665759127a8aa994c4da3ac3f4c66 Mon Sep 17 00:00:00 2001 From: s3inlc Date: Wed, 14 Jan 2026 11:30:24 +0100 Subject: [PATCH 370/691] added additional check to avoid log entries if a hash just was already cracked --- src/inc/api/APISendProgress.class.php | 16 ++++++++++------ 1 file changed, 10 insertions(+), 6 deletions(-) diff --git a/src/inc/api/APISendProgress.class.php b/src/inc/api/APISendProgress.class.php index d40c6bf13..f84344304 100644 --- a/src/inc/api/APISendProgress.class.php +++ b/src/inc/api/APISendProgress.class.php @@ -230,13 +230,17 @@ public function execute($QUERY = array()) { $qF3 = new QueryFilter(Hash::IS_CRACKED, 0, "="); $hashes = Factory::getHashFactory()->filter([Factory::FILTER => [$qF1, $qF2, $qF3]]); if (sizeof($hashes) == 0) { - //This can happen if agent rebuild the hash incorrectly - //Log the skipped hash so that admin can spot this false negative - $logMessage = "Hash has been cracked but skipped! This happened while cracking hashlist with ID: " - . $hashlist->getId() . " during chunk with ID: " . $chunk->getId() . " This happens when the agent returns + // check without IS_CRACKED=0 to check if the hash was already cracked, or if it really cannot be found (which then triggers the log entry) + $check = Factory::getHashFactory()->filter([Factory::FILTER => [$qF1, $qF2]]); + if (sizeof($check) == 0) { + //This can happen if agent rebuild the hash incorrectly + //Log the skipped hash so that admin can spot this false negative + $logMessage = "Hash has been cracked but skipped! This happened while cracking hashlist with ID: " + . $hashlist->getId() . " during chunk with ID: " . $chunk->getId() . " This happens when the agent returns a cracked hash that does not exist in the database. This can happen when hashcat malforms the hash."; - Util::createLogEntry(DLogEntryIssuer::API, $this->agent->getToken(), DLogEntry::FATAL, $logMessage); - DServerLog::log(DServerLog::FATAL, $logMessage); + Util::createLogEntry(DLogEntryIssuer::API, $this->agent->getToken(), DLogEntry::FATAL, $logMessage); + DServerLog::log(DServerLog::FATAL, $logMessage); + } $skipped++; break; From 4bbf2f09e2970238f8b7448b721b798418d5d00e Mon Sep 17 00:00:00 2001 From: s3inlc Date: Wed, 14 Jan 2026 14:11:01 +0100 Subject: [PATCH 371/691] added the two needed helpers for the supertaskbuilder --- src/api/v2/index.php | 125 +++++++++--------- .../helper/bulkSupertaskBuilder.routes.php | 48 +++++++ .../helper/maskSupertaskBuilder.routes.php | 47 +++++++ src/inc/utils/SupertaskUtils.class.php | 6 +- 4 files changed, 164 insertions(+), 62 deletions(-) create mode 100644 src/inc/apiv2/helper/bulkSupertaskBuilder.routes.php create mode 100644 src/inc/apiv2/helper/maskSupertaskBuilder.routes.php diff --git a/src/api/v2/index.php b/src/api/v2/index.php index 9a3c01e40..a67c5bcc9 100644 --- a/src/api/v2/index.php +++ b/src/api/v2/index.php @@ -306,65 +306,70 @@ public static function addCORSheaders(Request $request, $response) { }); -require __DIR__ . "/../../inc/apiv2/auth/token.routes.php"; - -require __DIR__ . "/../../inc/apiv2/common/openAPISchema.routes.php"; - -require __DIR__ . "/../../inc/apiv2/model/accessgroups.routes.php"; -require __DIR__ . "/../../inc/apiv2/model/agentassignments.routes.php"; -require __DIR__ . "/../../inc/apiv2/model/agentbinaries.routes.php"; -require __DIR__ . "/../../inc/apiv2/model/agenterrors.routes.php"; -require __DIR__ . "/../../inc/apiv2/model/agents.routes.php"; -require __DIR__ . "/../../inc/apiv2/model/agentstats.routes.php"; -require __DIR__ . "/../../inc/apiv2/model/chunks.routes.php"; -require __DIR__ . "/../../inc/apiv2/model/configs.routes.php"; -require __DIR__ . "/../../inc/apiv2/model/configsections.routes.php"; -require __DIR__ . "/../../inc/apiv2/model/crackers.routes.php"; -require __DIR__ . "/../../inc/apiv2/model/crackertypes.routes.php"; -require __DIR__ . "/../../inc/apiv2/model/files.routes.php"; -require __DIR__ . "/../../inc/apiv2/model/globalpermissiongroups.routes.php"; -require __DIR__ . "/../../inc/apiv2/model/hashes.routes.php"; -require __DIR__ . "/../../inc/apiv2/model/hashlists.routes.php"; -require __DIR__ . "/../../inc/apiv2/model/hashtypes.routes.php"; -require __DIR__ . "/../../inc/apiv2/model/healthcheckagents.routes.php"; -require __DIR__ . "/../../inc/apiv2/model/healthchecks.routes.php"; -require __DIR__ . "/../../inc/apiv2/model/logentries.routes.php"; -require __DIR__ . "/../../inc/apiv2/model/notifications.routes.php"; -require __DIR__ . "/../../inc/apiv2/model/preprocessors.routes.php"; -require __DIR__ . "/../../inc/apiv2/model/pretasks.routes.php"; -require __DIR__ . "/../../inc/apiv2/model/speeds.routes.php"; -require __DIR__ . "/../../inc/apiv2/model/supertasks.routes.php"; -require __DIR__ . "/../../inc/apiv2/model/tasks.routes.php"; -require __DIR__ . "/../../inc/apiv2/model/taskwrappers.routes.php"; -require __DIR__ . "/../../inc/apiv2/model/users.routes.php"; -require __DIR__ . "/../../inc/apiv2/model/vouchers.routes.php"; - -require __DIR__ . "/../../inc/apiv2/helper/abortChunk.routes.php"; -require __DIR__ . "/../../inc/apiv2/helper/assignAgent.routes.php"; -require __DIR__ . "/../../inc/apiv2/helper/changeOwnPassword.routes.php"; -require __DIR__ . "/../../inc/apiv2/helper/currentUser.routes.php"; -require __DIR__ . "/../../inc/apiv2/helper/createSupertask.routes.php"; -require __DIR__ . "/../../inc/apiv2/helper/createSuperHashlist.routes.php"; -require __DIR__ . "/../../inc/apiv2/helper/exportCrackedHashes.routes.php"; -require __DIR__ . "/../../inc/apiv2/helper/exportLeftHashes.routes.php"; -require __DIR__ . "/../../inc/apiv2/helper/exportWordlist.routes.php"; -require __DIR__ . "/../../inc/apiv2/helper/getAccessGroups.routes.php"; -require __DIR__ . "/../../inc/apiv2/helper/getAgentBinary.routes.php"; -require __DIR__ . "/../../inc/apiv2/helper/getCracksOfTask.routes.php"; -require __DIR__ . "/../../inc/apiv2/helper/getFile.routes.php"; -require __DIR__ . "/../../inc/apiv2/helper/getTaskProgressImage.routes.php"; -require __DIR__ . "/../../inc/apiv2/helper/getUserPermission.routes.php"; -require __DIR__ . "/../../inc/apiv2/helper/importCrackedHashes.routes.php"; -require __DIR__ . "/../../inc/apiv2/helper/importFile.routes.php"; -require __DIR__ . "/../../inc/apiv2/helper/purgeTask.routes.php"; -require __DIR__ . "/../../inc/apiv2/helper/rebuildChunkCache.routes.php"; -require __DIR__ . "/../../inc/apiv2/helper/recountFileLines.routes.php"; -require __DIR__ . "/../../inc/apiv2/helper/rescanGlobalFiles.routes.php"; -require __DIR__ . "/../../inc/apiv2/helper/resetChunk.routes.php"; -require __DIR__ . "/../../inc/apiv2/helper/resetUserPassword.routes.php"; -require __DIR__ . "/../../inc/apiv2/helper/searchHashes.routes.php"; -require __DIR__ . "/../../inc/apiv2/helper/setUserPassword.routes.php"; -require __DIR__ . "/../../inc/apiv2/helper/taskExtraDetails.routes.php"; -require __DIR__ . "/../../inc/apiv2/helper/unassignAgent.routes.php"; +require_once(__DIR__ . "/../../inc/apiv2/auth/token.routes.php"); +require_once(__DIR__ . "/../../inc/apiv2/common/openAPISchema.routes.php"); + +$modelDir = __DIR__ . "/../../inc/apiv2/model"; + +require_once($modelDir . "/accessgroups.routes.php"); +require_once($modelDir . "/agentassignments.routes.php"); +require_once($modelDir . "/agentbinaries.routes.php"); +require_once($modelDir . "/agenterrors.routes.php"); +require_once($modelDir . "/agents.routes.php"); +require_once($modelDir . "/agentstats.routes.php"); +require_once($modelDir . "/chunks.routes.php"); +require_once($modelDir . "/configs.routes.php"); +require_once($modelDir . "/configsections.routes.php"); +require_once($modelDir . "/crackers.routes.php"); +require_once($modelDir . "/crackertypes.routes.php"); +require_once($modelDir . "/files.routes.php"); +require_once($modelDir . "/globalpermissiongroups.routes.php"); +require_once($modelDir . "/hashes.routes.php"); +require_once($modelDir . "/hashlists.routes.php"); +require_once($modelDir . "/hashtypes.routes.php"); +require_once($modelDir . "/healthcheckagents.routes.php"); +require_once($modelDir . "/healthchecks.routes.php"); +require_once($modelDir . "/logentries.routes.php"); +require_once($modelDir . "/notifications.routes.php"); +require_once($modelDir . "/preprocessors.routes.php"); +require_once($modelDir . "/pretasks.routes.php"); +require_once($modelDir . "/speeds.routes.php"); +require_once($modelDir . "/supertasks.routes.php"); +require_once($modelDir . "/tasks.routes.php"); +require_once($modelDir . "/taskwrappers.routes.php"); +require_once($modelDir . "/users.routes.php"); +require_once($modelDir . "/vouchers.routes.php"); + +$helperDir = __DIR__ . "/../../inc/apiv2/helper"; + +require_once($helperDir . "/abortChunk.routes.php"); +require_once($helperDir . "/assignAgent.routes.php"); +require_once($helperDir . "/bulkSupertaskBuilder.routes.php"); +require_once($helperDir . "/changeOwnPassword.routes.php"); +require_once($helperDir . "/currentUser.routes.php"); +require_once($helperDir . "/createSupertask.routes.php"); +require_once($helperDir . "/createSuperHashlist.routes.php"); +require_once($helperDir . "/exportCrackedHashes.routes.php"); +require_once($helperDir . "/exportLeftHashes.routes.php"); +require_once($helperDir . "/exportWordlist.routes.php"); +require_once($helperDir . "/getAccessGroups.routes.php"); +require_once($helperDir . "/getAgentBinary.routes.php"); +require_once($helperDir . "/getCracksOfTask.routes.php"); +require_once($helperDir . "/getFile.routes.php"); +require_once($helperDir . "/getTaskProgressImage.routes.php"); +require_once($helperDir . "/getUserPermission.routes.php"); +require_once($helperDir . "/importCrackedHashes.routes.php"); +require_once($helperDir . "/importFile.routes.php"); +require_once($helperDir . "/maskSupertaskBuilder.routes.php"); +require_once($helperDir . "/purgeTask.routes.php"); +require_once($helperDir . "/rebuildChunkCache.routes.php"); +require_once($helperDir . "/recountFileLines.routes.php"); +require_once($helperDir . "/rescanGlobalFiles.routes.php"); +require_once($helperDir . "/resetChunk.routes.php"); +require_once($helperDir . "/resetUserPassword.routes.php"); +require_once($helperDir . "/searchHashes.routes.php"); +require_once($helperDir . "/setUserPassword.routes.php"); +require_once($helperDir . "/taskExtraDetails.routes.php"); +require_once($helperDir . "/unassignAgent.routes.php"); $app->run(); diff --git a/src/inc/apiv2/helper/bulkSupertaskBuilder.routes.php b/src/inc/apiv2/helper/bulkSupertaskBuilder.routes.php new file mode 100644 index 000000000..1fc5e52a8 --- /dev/null +++ b/src/inc/apiv2/helper/bulkSupertaskBuilder.routes.php @@ -0,0 +1,48 @@ + ['type' => 'str'], + "isCpu" => ['type' => 'bool'], + "isSmall" => ['type' => 'bool'], + "crackerBinaryTypeId" => ['type' => 'int'], + "benchtype" => ['type' => 'str'], + "command" => ['type' => 'str'], + "maxAgents" => ['type' => 'int'], + "basefiles" => ["type" => "array", "subtype" => "int"], + "iterfiles" => ["type" => "array", "subtype" => "int"], + ]; + } + + public static function getResponse(): string { + return "Supertask"; + } + + /** + * Endpoint to import cracked hashes into a hashlist. + * @throws HTException + */ + public function actionPost($data): object|array|null { + return SupertaskUtils::bulkSupertask($data['name'], $data['command'], $data['isCpu'], $data['maxAgents'], $data['isSmall'], $data['crackerBinaryTypeId'], $data['benchtype'], $data['basefiles'], $data['iterfiles'], Login::getInstance()->getUser()); + } +} + +BulkSupertaskBuilderHelperAPI::register($app); \ No newline at end of file diff --git a/src/inc/apiv2/helper/maskSupertaskBuilder.routes.php b/src/inc/apiv2/helper/maskSupertaskBuilder.routes.php new file mode 100644 index 000000000..1cd70e651 --- /dev/null +++ b/src/inc/apiv2/helper/maskSupertaskBuilder.routes.php @@ -0,0 +1,47 @@ + ['type' => 'str'], + "isCpu" => ['type' => 'bool'], + "isSmall" => ['type' => 'bool'], + "optimized" => ['type' => 'bool'], + "crackerBinaryTypeId" => ['type' => 'int'], + "benchtype" => ['type' => 'str'], + "masks" => ['type' => 'str'], + "maxAgents" => ['type' => 'int'], + ]; + } + + public static function getResponse(): string { + return "Supertask"; + } + + /** + * Endpoint to import cracked hashes into a hashlist. + * @throws HTException + */ + public function actionPost($data): object|array|null { + return SupertaskUtils::importSupertask($data['name'], $data['isCpu'], $data['maxAgents'], $data['isSmall'], $data['optimized'], $data['crackerBinaryTypeId'], explode("\n", str_replace("\r\n", "\n", $data['masks'])), $data['benchtype']); + } +} + +MaskSupertaskBuilderHelperAPI::register($app); \ No newline at end of file diff --git a/src/inc/utils/SupertaskUtils.class.php b/src/inc/utils/SupertaskUtils.class.php index 69219d898..ac56b6bb3 100644 --- a/src/inc/utils/SupertaskUtils.class.php +++ b/src/inc/utils/SupertaskUtils.class.php @@ -27,7 +27,7 @@ class SupertaskUtils { * @param User $user * @throws HTException */ - public static function bulkSupertask($name, $command, $isCpuOnly, $maxAgents, $isSmall, $crackerBinaryTypeId, $benchtype, $basefiles, $iterfiles, $user) { + public static function bulkSupertask($name, $command, $isCpuOnly, $maxAgents, $isSmall, $crackerBinaryTypeId, $benchtype, $basefiles, $iterfiles, $user): Supertask { $isCpuOnly = ($isCpuOnly) ? 1 : 0; $isSmall = ($isSmall) ? 1 : 0; $benchtype = ($benchtype == 'speed') ? 1 : 0; @@ -86,6 +86,7 @@ public static function bulkSupertask($name, $command, $isCpuOnly, $maxAgents, $i Factory::getSupertaskPretaskFactory()->save($relation); } Factory::getAgentFactory()->getDB()->commit(); + return $supertask; } /** @@ -359,7 +360,7 @@ public static function createSupertask(string $name, array|null $pretasks): Supe * @param string $benchtype * @throws HTException */ - public static function importSupertask($name, $isCpuOnly, $maxAgents, $isSmall, $useOptimized, $crackerBinaryTypeId, $masks, $benchtype) { + public static function importSupertask($name, $isCpuOnly, $maxAgents, $isSmall, $useOptimized, $crackerBinaryTypeId, $masks, $benchtype): Supertask { $isCpuOnly = ($isCpuOnly) ? 1 : 0; $isSmall = ($isSmall) ? 1 : 0; $useOptimized = ($useOptimized) ? true : false; @@ -386,6 +387,7 @@ public static function importSupertask($name, $isCpuOnly, $maxAgents, $isSmall, Factory::getSupertaskPretaskFactory()->save($relation); } Factory::getAgentFactory()->getDB()->commit(); + return $supertask; } /** From e0d5b64fa3bda12ef400afdb3187688d856778e9 Mon Sep 17 00:00:00 2001 From: s3inlc Date: Wed, 14 Jan 2026 14:48:16 +0100 Subject: [PATCH 372/691] check if global constant needs to be defined or not --- src/inc/startup/include.php | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/src/inc/startup/include.php b/src/inc/startup/include.php index 39e51a38d..99557d455 100755 --- a/src/inc/startup/include.php +++ b/src/inc/startup/include.php @@ -3,7 +3,9 @@ // set to 1 for debugging ini_set("display_errors", "0"); -define("APP_NAME", "Hashtopolis"); +if(!defined("APP_NAME")) { + define("APP_NAME", "Hashtopolis"); +} $baseDir = dirname(__FILE__) . "/.."; From ee9e685935264c7b46e6be70177e44d282e7d04c Mon Sep 17 00:00:00 2001 From: jessevz Date: Wed, 14 Jan 2026 17:51:42 +0100 Subject: [PATCH 373/691] Added OAUTH authentication to backend (#1859) * Made it possible to authenticate to backend using OAUTH identity/access token --------- Co-authored-by: jessevz --- .devcontainer/docker-compose.mysql.yml | 1 + .devcontainer/docker-compose.postgres.yml | 1 + .gitignore | 3 + docker-compose.mysql.yml | 1 + docker-compose.postgres.yml | 1 + jwks.json.example | 31 +++++ src/api/v2/index.php | 4 +- src/inc/apiv2/auth/token.routes.php | 148 ++++++++++++++++------ 8 files changed, 147 insertions(+), 43 deletions(-) create mode 100644 jwks.json.example diff --git a/.devcontainer/docker-compose.mysql.yml b/.devcontainer/docker-compose.mysql.yml index 55cb7ccc2..bd5b56fd1 100644 --- a/.devcontainer/docker-compose.mysql.yml +++ b/.devcontainer/docker-compose.mysql.yml @@ -24,6 +24,7 @@ services: # and the value of "workspaceFolder" in .devcontainer/devcontainer.json - ..:/var/www/html - hashtopolis-server-dev:/usr/local/share/hashtopolis:Z + # - ./jwks.json:/keys/jwks.json:ro networks: - hashtopolis_dev hashtopolis-db-dev: diff --git a/.devcontainer/docker-compose.postgres.yml b/.devcontainer/docker-compose.postgres.yml index 0a7747910..4ba0f1a4b 100644 --- a/.devcontainer/docker-compose.postgres.yml +++ b/.devcontainer/docker-compose.postgres.yml @@ -24,6 +24,7 @@ services: # and the value of "workspaceFolder" in .devcontainer/devcontainer.json - ..:/var/www/html - hashtopolis-server-dev:/usr/local/share/hashtopolis:Z + # - ./jwks.json:/keys/jwks.json:ro networks: - hashtopolis_dev hashtopolis-db-dev: diff --git a/.gitignore b/.gitignore index 8ffd0597b..3efd096c0 100755 --- a/.gitignore +++ b/.gitignore @@ -13,6 +13,9 @@ src/files/* *.phpproj.user *.lock* +# the public keys for oauth +jwks.json + # dynamically created by installer src/install/.htaccess diff --git a/docker-compose.mysql.yml b/docker-compose.mysql.yml index 03010d489..bf95d225f 100644 --- a/docker-compose.mysql.yml +++ b/docker-compose.mysql.yml @@ -7,6 +7,7 @@ services: volumes: - hashtopolis:/usr/local/share/hashtopolis:Z # - ./ssmtp.conf:/etc/ssmtp/ssmtp.conf + # - ./jwks.json:/keys/jwks.json:ro environment: HASHTOPOLIS_DB_TYPE: mysql HASHTOPOLIS_DB_USER: $MYSQL_USER diff --git a/docker-compose.postgres.yml b/docker-compose.postgres.yml index a7553595e..2b5bdc56d 100644 --- a/docker-compose.postgres.yml +++ b/docker-compose.postgres.yml @@ -7,6 +7,7 @@ services: volumes: - hashtopolis:/usr/local/share/hashtopolis:Z # - ./ssmtp.conf:/etc/ssmtp/ssmtp.conf + # - ./jwks.json:/keys/jwks.json:ro environment: HASHTOPOLIS_DB_TYPE: postgres HASHTOPOLIS_DB_USER: $POSTGRES_USER diff --git a/jwks.json.example b/jwks.json.example new file mode 100644 index 000000000..a83e3a989 --- /dev/null +++ b/jwks.json.example @@ -0,0 +1,31 @@ +# Example jwks file for the keys that are needed for Open ID Connect +{ + "keys": [ + { + "kid": "3VcAf_wFO6KQz4RiKowja6IW35QJ40RkXSBgkgcfTfw", + "kty": "RSA", + "alg": "RS256", + "use": "sig", + "n": "qvuxqeloNtBwAwIOlfu48bd9-VnELl2D0DdGfUGKh_0_5gFgbXiGytGG11a_IC6qqlmmIWU4xuy-2Q2uytrQAkrZMTPmsT88ZrT84HCMUlxgqU5QWUPRGmlwGDuuPNXyeYDPbEtX9du8PQb6DNuu2kWMLmm_xjYwQzIzMPxR49xsR9h0N-wMHwc-fmSgkR02Io96I1NkQX3DHCuVvPFBp5cUhfb5lXwHGe1cdx3D4koA0y0NJ1EsOjfuMDv4AUtZFqqUKDEbg-ADoYA4HtfHOjcciMYXkEbb5FejlVCsppF_HMWuFtNqF6_V0FOfKvmNnJ0WzUD9NR6BJ_VqDxGNGQ", + "e": "AQAB", + "x5c": [ + "MIICmzCCAYMCBgGbjmGlkjANBgkqhkiG9w0BAQsFADARMQ8wDQYDVQQDDAZtYXN0ZXIwHhcNMjYwMTA1MTMzNzAyWhcNMzYwMTA1MTMzODQyWjARMQ8wDQYDVQQDDAZtYXN0ZXIwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQCq+7Gp6Wg20HADAg6V+7jxt335WcQuXYPQN0Z9QYqH/T/mAWBteIbK0YbXVr8gLqqqWaYhZTjG7L7ZDa7K2tACStkxM+axPzxmtPzgcIxSXGCpTlBZQ9EaaXAYO6481fJ5gM9sS1f127w9BvoM267aRYwuab/GNjBDMjMw/FHj3GxH2HQ37AwfBz5+ZKCRHTYij3ojU2RBfcMcK5W88UGnlxSF9vmVfAcZ7Vx3HcPiSgDTLQ0nUSw6N+4wO/gBS1kWqpQoMRuD4AOhgDge18c6NxyIxheQRtvkV6OVUKymkX8cxa4W02oXr9XQU58q+Y2cnRbNQP01HoEn9WoPEY0ZAgMBAAEwDQYJKoZIhvcNAQELBQADggEBABLaxd6HGIbKKd3hU56XbQHMcwbFTpPtL/P56JBUhcCVG1sCoLSE4csVW0o9Si1toKqh8hAtWDYA0/tm/IEjkwt3TcXdWjA/XoKGDbkz508aLDM2ni2CXq1p3wXwesCiGhkblg+liiNPyb2wU9RpmYRKkn16Qsb2qEw6AS1uaph0/+XLAPWENr5/pjJOgXQqok2VIOiAcrsnayE6zPDFQ2d2uYAKLOKNFgUKZ7K92DGH+qD8IheV8F6Wjs7cea7LZcgq0dlV85lmIQ8dZyQunL2QwGewIGVSShvT97vivk/xS86Zf9qQcaANAuvff/g1lCdxg2bFr8PewOXp3zQlqdU=" + ], + "x5t": "e0BNs1RTbxcrnk9Rnjs1n4pxcuY", + "x5t#S256": "wCTM8mdXANWTaYDj3w5cRm0yD5ybINNlULtxpAuA7gw" + }, + { + "kid": "UzDpZMBnNvfqtOmhny4gqZdjQLGWYuy2gAN3Wk_hm4Y", + "kty": "RSA", + "alg": "RSA-OAEP", + "use": "enc", + "n": "xGHOeXyy6B8_V1BsELJb5XWHfWJHS4w45oxvYbT--Dl6miixwrRizOCnpGz81JIPJZ_Dg-qGi372tQo10xegeg71h7GRMeCcGDA7QN7PXSLnwphkBQvV_uBzYnxDm98ZRLsBmyMnLRCEPdVxJX1_nxaqCk3-KbZxLVuEJM-AAMPlA0TcC5ZIB8pSWeYA_DhGswRb_t67GMEyXHKzNAvA_Bhc7E-FZ-C66WLH5e0bv47W2KSzCtJZNpRHGb-CdeJYzg7rR4M9PzGnCmtc1YEocWsgqHJ0lDO3Sl1g4XtIW84UPi2wBEvoBgQuT2UPhni9TqVd62yJ1F8F_MC4ZEIgpw", + "e": "AQAB", + "x5c": [ + "MIICmzCCAYMCBgGbjmGl7DANBgkqhkiG9w0BAQsFADARMQ8wDQYDVQQDDAZtYXN0ZXIwHhcNMjYwMTA1MTMzNzAyWhcNMzYwMTA1MTMzODQyWjARMQ8wDQYDVQQDDAZtYXN0ZXIwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDEYc55fLLoHz9XUGwQslvldYd9YkdLjDjmjG9htP74OXqaKLHCtGLM4KekbPzUkg8ln8OD6oaLfva1CjXTF6B6DvWHsZEx4JwYMDtA3s9dIufCmGQFC9X+4HNifEOb3xlEuwGbIyctEIQ91XElfX+fFqoKTf4ptnEtW4Qkz4AAw+UDRNwLlkgHylJZ5gD8OEazBFv+3rsYwTJccrM0C8D8GFzsT4Vn4LrpYsfl7Ru/jtbYpLMK0lk2lEcZv4J14ljODutHgz0/MacKa1zVgShxayCocnSUM7dKXWDhe0hbzhQ+LbAES+gGBC5PZQ+GeL1OpV3rbInUXwX8wLhkQiCnAgMBAAEwDQYJKoZIhvcNAQELBQADggEBAMLa57gi0EgnVStdw6JGbjOYURhto8Gfahs/STDrpkmkMuvAh0bRzwi8yiJs75jX7ykBFNrAslsdnohMicXyjrHaMNbMwPeip9/XMISS7kR5sDqyz1AA+s28oyWAB9HWu5ntiD93LlJj+UU4qZ5+SpmKzRDs2MMhL8aWozuOwABGI4VrfvFRJL8O3J6ewxUeCikpEfB9UWkE+B+N/q8Wsn92n76z8UhqsdLOJVp1LwIuwOIcK9oCFZnSwfiGXSfK4e2QfxF6hWVAEdkQaKXsNZmxrqWE9CxdQp6ouOGaqiplzWUBDuWptNoaM57tLNo0jl0d6C1XPFUlzO9TfQHilEU=" + ], + "x5t": "HlsH_q2fqXiyZrxi4iWlbXoO51w", + "x5t#S256": "ByDXBjBIXVPzmIEts-GeqhlxhMQL1S2tM-8npsv2-jo" + } + ] +} \ No newline at end of file diff --git a/src/api/v2/index.php b/src/api/v2/index.php index a67c5bcc9..f07eb5db9 100644 --- a/src/api/v2/index.php +++ b/src/api/v2/index.php @@ -143,7 +143,7 @@ public function get($key): string { include(dirname(__FILE__) . '/../../inc/confv2.php'); $decoder = new FirebaseDecoder( - new Secret($PEPPER[0], 'HS256') + new Secret($PEPPER[0], 'HS256', hash("sha256", $PEPPER[0])) ); $options = new Options( @@ -153,7 +153,7 @@ public function get($key): string { ); $rules = [ - new RequestPathRule(ignore: ["/api/v2/auth/token", "/api/v2/helper/resetUserPassword", "/api/v2/openapi.json"]), + new RequestPathRule(ignore: ["/api/v2/auth/token", "/api/v2/auth/oauth-token", "/api/v2/helper/resetUserPassword", "/api/v2/openapi.json"]), new RequestMethodRule(ignore: ["OPTIONS"]) ]; return new JwtAuthentication($options, $decoder, $rules); diff --git a/src/inc/apiv2/auth/token.routes.php b/src/inc/apiv2/auth/token.routes.php index c513deb46..ac1f6c12c 100644 --- a/src/inc/apiv2/auth/token.routes.php +++ b/src/inc/apiv2/auth/token.routes.php @@ -10,9 +10,108 @@ use DBA\QueryFilter; use DBA\User; use DBA\Factory; +use Firebase\JWT\JWK; require_once(dirname(__FILE__) . "/../../startup/include.php"); +function generateTokenForUser(Request $request, string $userName, int $expires) { + include(dirname(__FILE__) . '/../../confv2.php'); + $jti = bin2hex(random_bytes(16)); + + $requested_scopes = $request->getParsedBody() ?: ["todo.all"]; + + $valid_scopes = [ + "todo.create", + "todo.read", + "todo.update", + "todo.delete", + "todo.list", + "todo.all" + ]; + + $scopes = array_filter($requested_scopes, function ($needle) use ($valid_scopes) { + return in_array($needle, $valid_scopes); + }); + // FIXME: This is duplicated and should be passed by HttpBasicMiddleware + $filter = new QueryFilter(User::USERNAME, $userName, "="); + $check = Factory::getUserFactory()->filter([Factory::FILTER => $filter]); + $user = $check[0]; + + if (empty($user)) { + throw new HttpError("No user with this userName in the database"); + } + + $secret = $PEPPER[0]; + $now = new DateTime(); + + $payload = [ + "iat" => $now->getTimeStamp(), + "exp" => $expires, + "jti" => $jti, + "userId" => $user->getId(), + "scope" => $scopes, + "iss" => "Hashtopolis", + "kid" => hash("sha256", $secret) + ]; + + $token = JWT::encode($payload, $secret, "HS256"); + + return $token; +} + +function extractBearerToken(Request $request): ?string { + $header = $request->getHeaderLine('Authorization'); + + if (!$header) { + return null; + } + + if (!preg_match('/^Bearer\s+(.+)$/i', $header, $matches)) { + return null; + } + + return trim($matches[1]); +} + +// Exchanges an oauth token for a application JWT token +$app->group("/api/v2/auth/oauth-token", function (RouteCollectorProxy $group) { + + $group->post('', function (Request $request, Response $response, array $args): Response { + $jwks_file = file_get_contents("/keys/jwks.json"); + if (!$jwks_file) { + throw new HttpError("No jwks.json found, upload the jwks public keys to /keys/jwks.json to use OIDC authentication"); + } + $jwks = json_decode($jwks_file, true); + + if ($jwks === null) { + throw new HttpError("Incorrect json inside jwks.json, make sure to upload a valid json file"); + } + $keys = JWK::parseKeySet($jwks); + $jwt = extractBearerToken($request); + if ($jwt === null) { + throw new HttpError("No jwt Token found in the Bearer header"); + } + $decoded_jwt = JWT::decode($jwt, $keys); + + if(!property_exists($decoded_jwt, "preferred_username")) { + throw new HttpError("The OAUTH token doesnt have a 'preferred_username' claim, which is needed to validate the user"); + } + $userName = $decoded_jwt->preferred_username; + + $future = new DateTime("now +2 hours"); + $token = generateTokenForUser($request, $userName, $future->getTimestamp()); + $data["token"] = $token; + $data["expires"] = $future->getTimestamp(); + + $body = $response->getBody(); + $body->write(json_encode($data, JSON_UNESCAPED_SLASHES)); + + return $response->withStatus(201) + ->withHeader("Content-Type", "application/json"); + }); +}); + +// This routes needs to be protected by httpbasicauthentication middleware $app->group("/api/v2/auth/token", function (RouteCollectorProxy $group) { /* Allow preflight requests */ $group->options('', function (Request $request, Response $response, array $args): Response { @@ -20,50 +119,15 @@ }); $group->post('', function (Request $request, Response $response, array $args): Response { - include(dirname(__FILE__) . '/../../confv2.php'); - - $requested_scopes = $request->getParsedBody() ?: ["todo.all"]; - - $valid_scopes = [ - "todo.create", - "todo.read", - "todo.update", - "todo.delete", - "todo.list", - "todo.all" - ]; - - $scopes = array_filter($requested_scopes, function ($needle) use ($valid_scopes) { - return in_array($needle, $valid_scopes); - }); - $now = new DateTime(); $future = new DateTime("now +2 hours"); - $server = $request->getServerParams(); - - $jti = bin2hex(random_bytes(16)); - - // FIXME: This is duplicated and should be passed by HttpBasicMiddleware - $filter = new QueryFilter(User::USERNAME, $request->getAttribute('user'), "="); - $check = Factory::getUserFactory()->filter([Factory::FILTER => $filter]); - $user = $check[0]; - - $payload = [ - "iat" => $now->getTimeStamp(), - "exp" => $future->getTimeStamp(), - "jti" => $jti, - "userId" => $user->getId(), - "scope" => $scopes - ]; - - $secret = $PEPPER[0]; - $token = JWT::encode($payload, $secret, "HS256"); + $token = generateTokenForUser($request, $request->getAttribute('user'), $future->getTimestamp()); $data["token"] = $token; - $data["expires"] = $future->getTimeStamp(); + $data["expires"] = $future->getTimestamp(); $body = $response->getBody(); - $body->write(json_encode($data, JSON_UNESCAPED_SLASHES | JSON_PRETTY_PRINT)); + $body->write(json_encode($data, JSON_UNESCAPED_SLASHES)); return $response->withStatus(201) ->withHeader("Content-Type", "application/json"); @@ -84,22 +148,24 @@ $jti = bin2hex(random_bytes(16)); + $secret = $PEPPER[0]; $payload = [ "iat" => $now->getTimeStamp(), "exp" => $future->getTimeStamp(), "jti" => $jti, "userId" => $request->getAttribute(('userId')), - "scope" => $request->getAttribute("scope") + "scope" => $request->getAttribute("scope"), + "iss" => "Hashtopolis", + "kid" => hash("sha256", $secret) ]; - $secret = $PEPPER[0]; $token = JWT::encode($payload, $secret, "HS256"); $data["token"] = $token; $data["expires"] = $future->getTimeStamp(); $body = $response->getBody(); - $body->write(json_encode($data, JSON_UNESCAPED_SLASHES | JSON_PRETTY_PRINT)); + $body->write(json_encode($data, JSON_UNESCAPED_SLASHES)); return $response->withStatus(201) ->withHeader("Content-Type", "application/json"); From 85cdf0f49ff85ec587749345824e7f6c74b0ee9c Mon Sep 17 00:00:00 2001 From: jessevz Date: Thu, 15 Jan 2026 15:59:15 +0100 Subject: [PATCH 374/691] Made it possible to sort on 1 to 1 relationship attributes (#1833) * Made it possible to sort on 1 to 1 relationship attributes * Added the possibility to do left, right and outer joins to the ORM, and filtering on joins * Added to the orm a coalesce order filter which is needed to order on taskwrappername or taskname * Added different types of joins to the abstractmodelfactory * Added an additional way to parse the filters, needed for the taskwrappers to handle the unconventional relation between taskwrapper and task * Fixed bug in creating join filter --------- Co-authored-by: jessevz Co-authored-by: Sein Coray --- src/dba/AbstractModelFactory.class.php | 16 ++++-- src/dba/CoalesceOrderFilter.class.php | 22 +++++++ src/dba/Join.class.php | 10 ++++ src/dba/JoinFilter.class.php | 37 +++++++++++- src/dba/OrderFilter.class.php | 8 +++ src/dba/init.php | 1 + .../apiv2/common/AbstractBaseAPI.class.php | 57 +++++++++++++++++-- .../apiv2/common/AbstractModelAPI.class.php | 52 +++++++++-------- src/inc/apiv2/model/tasks.routes.php | 2 +- src/inc/apiv2/model/taskwrappers.routes.php | 39 +++++++++++++ 10 files changed, 209 insertions(+), 35 deletions(-) create mode 100644 src/dba/CoalesceOrderFilter.class.php diff --git a/src/dba/AbstractModelFactory.class.php b/src/dba/AbstractModelFactory.class.php index c17de0893..90c046eae 100755 --- a/src/dba/AbstractModelFactory.class.php +++ b/src/dba/AbstractModelFactory.class.php @@ -562,6 +562,7 @@ public function getFromDB($pk): ?AbstractModel { * @return AbstractModel[]|AbstractModel Returns a list of matching objects or Null */ private function filterWithJoin(array $options): array|AbstractModel { + $vals = array(); $joins = $this->getJoins($options); $factories = array($this); $query = "SELECT " . Util::createPrefixedString($this->getMappedModelTable(), self::getMappedModelKeys($this->getNullObject())); @@ -580,11 +581,14 @@ private function filterWithJoin(array $options): array|AbstractModel { } $match1 = self::getMappedModelKey($localFactory->getNullObject(), $join->getMatch1()); $match2 = self::getMappedModelKey($joinFactory->getNullObject(), $join->getMatch2()); - $query .= " INNER JOIN " . $joinFactory->getMappedModelTable() . " ON " . $localFactory->getMappedModelTable() . "." . $match1 . "=" . $joinFactory->getMappedModelTable() . "." . $match2 . " "; + $query .= " " . $join->getJoinType() . " JOIN " . $joinFactory->getMappedModelTable() . " ON " . $localFactory->getMappedModelTable() . "." . $match1 . "=" . $joinFactory->getMappedModelTable() . "." . $match2 . " "; + $joinQueryFilters = $join->getQueryFilters(); + if (count($joinQueryFilters) > 0) { + $query .= $this->applyFilters($vals, $joinQueryFilters, true) ; + } } // Apply all normal filter to this query - $vals = array(); if (array_key_exists("filter", $options)) { $query .= $this->applyFilters($vals, $options['filter']); } @@ -605,7 +609,6 @@ private function filterWithJoin(array $options): array|AbstractModel { if (array_key_exists("limit", $options)) { $query .= $this->applyLimit($options['limit']); } - $dbh = self::getDB(); $stmt = $dbh->prepare($query); $stmt->execute($vals); @@ -709,7 +712,7 @@ public function filter(array $options, bool $single = false) { * @param $filters Filter|Filter[] * @return string */ - private function applyFilters(&$vals, Filter|array $filters): string { + private function applyFilters(&$vals, Filter|array $filters, bool $isJoinFilter = false): string { $parts = array(); if (!is_array($filters)) { $filters = array($filters); @@ -730,6 +733,9 @@ private function applyFilters(&$vals, Filter|array $filters): string { $vals[] = $v; } } + if ($isJoinFilter) { + return " AND " . implode(" AND ", $parts); + } return " WHERE " . implode(" AND ", $parts); } @@ -758,7 +764,7 @@ private function applyJoins($joins): string { } $match1 = self::getMappedModelKey($localFactory->getNullObject(), $join->getMatch1()); $match2 = self::getMappedModelKey($joinFactory->getNullObject(), $join->getMatch2()); - $query .= " INNER JOIN " . $joinFactory->getMappedModelTable() . " ON " . $localFactory->getMappedModelTable() . "." . $match1 . "=" . $joinFactory->getMappedModelTable() . "." . $match2 . " "; + $query .= " " . $join->getJoinType() . " JOIN " . $joinFactory->getMappedModelTable() . " ON " . $localFactory->getMappedModelTable() . "." . $match1 . "=" . $joinFactory->getMappedModelTable() . "." . $match2 . " "; } return $query; } diff --git a/src/dba/CoalesceOrderFilter.class.php b/src/dba/CoalesceOrderFilter.class.php new file mode 100644 index 000000000..26ae2efb3 --- /dev/null +++ b/src/dba/CoalesceOrderFilter.class.php @@ -0,0 +1,22 @@ +columns = $columns; + $this->type = $type; + } + + function getQueryString(AbstractModelFactory $factory, bool $includeTable = false): string { + $mapped_columns = []; + foreach($this->columns as $column) { + array_push($mapped_columns, AbstractModelFactory::getMappedModelKey($factory->getNullObject(), $column)); + } + return "COALESCE(" . implode(", ", $mapped_columns) . ") " . $this->type; + } +} \ No newline at end of file diff --git a/src/dba/Join.class.php b/src/dba/Join.class.php index 917095fc1..eb89d69be 100644 --- a/src/dba/Join.class.php +++ b/src/dba/Join.class.php @@ -17,4 +17,14 @@ abstract function getMatch1(); * @return string */ abstract function getMatch2(); + + /** + * @return string + */ + abstract function getJoinType(); + + /** + * @return QueryFilter[] array of queryfilters that have to be performed on the join + */ + abstract function getQueryFilters(); } \ No newline at end of file diff --git a/src/dba/JoinFilter.class.php b/src/dba/JoinFilter.class.php index f23d80a78..150fa3cd9 100755 --- a/src/dba/JoinFilter.class.php +++ b/src/dba/JoinFilter.class.php @@ -27,6 +27,21 @@ class JoinFilter extends Join { * @var AbstractModelFactory */ private $overrideOwnFactory; + + /** + * @var string + */ + private $joinType; + + /** + * @var QueryFilter[] array of queryfilters that have to be performed on the join + */ + private $queryFilters; + + // string constants for the join types + public const string INNER = "INNER"; + public const string LEFT = "LEFT"; + public const string RIGHT = "RIGHT"; /** * JoinFilter constructor. @@ -34,11 +49,14 @@ class JoinFilter extends Join { * @param $matching1 string * @param $matching2 string * @param $overrideOwnFactory AbstractModelFactory + * @param $joinType string is normally inner, left or right */ - function __construct($otherFactory, $matching1, $matching2, $overrideOwnFactory = null) { + function __construct($otherFactory, $matching1, $matching2, $overrideOwnFactory = null, $joinType = JoinFilter::INNER, $queryFilters = []) { $this->otherFactory = $otherFactory; $this->match1 = $matching1; $this->match2 = $matching2; + $this->joinType = $joinType; + $this->queryFilters = $queryFilters; $this->otherTableName = $this->otherFactory->getMappedModelTable(); $this->overrideOwnFactory = $overrideOwnFactory; @@ -62,6 +80,23 @@ function getMatch2() { function getOtherTableName() { return $this->otherTableName; } + + function getJoinType() { + return $this->joinType; + } + + function setJoinType($joinType) { + $this->joinType = $joinType; + } + + + function getQueryFilters() { + return $this->queryFilters; + } + + function setQueryFilters(array $queryFilters) { + $this->queryFilters = $queryFilters; + } /** * @return AbstractModelFactory diff --git a/src/dba/OrderFilter.class.php b/src/dba/OrderFilter.class.php index 04b168b58..7ea05b1c8 100755 --- a/src/dba/OrderFilter.class.php +++ b/src/dba/OrderFilter.class.php @@ -15,6 +15,14 @@ function __construct($by, $type, $overrideFactory = null) { $this->type = $type; $this->overrideFactory = $overrideFactory; } + + function getBy(): string { + return $this->by; + } + + function getType(): string { + return $this->type; + } function getQueryString(AbstractModelFactory $factory, bool $includeTable = false): string { if ($this->overrideFactory != null) { diff --git a/src/dba/init.php b/src/dba/init.php index 04a043954..c08691c6e 100644 --- a/src/dba/init.php +++ b/src/dba/init.php @@ -13,6 +13,7 @@ require_once(dirname(__FILE__) . "/Aggregation.class.php"); require_once(dirname(__FILE__) . "/Filter.class.php"); require_once(dirname(__FILE__) . "/Order.class.php"); +require_once(dirname(__FILE__) . "/CoalesceOrderFilter.class.php"); require_once(dirname(__FILE__) . "/Join.class.php"); require_once(dirname(__FILE__) . "/Group.class.php"); require_once(dirname(__FILE__) . "/Limit.class.php"); diff --git a/src/inc/apiv2/common/AbstractBaseAPI.class.php b/src/inc/apiv2/common/AbstractBaseAPI.class.php index 66879569e..53ea182be 100644 --- a/src/inc/apiv2/common/AbstractBaseAPI.class.php +++ b/src/inc/apiv2/common/AbstractBaseAPI.class.php @@ -144,6 +144,16 @@ protected function getFeatures(): array { } return $features; } + + /** + * Get features based on DBA model features + * + * @param string $dbaClass is the dba class to get the features from + */ + //TODO doesnt retrieve features based on form fields, could be done by adding api class in relationship objects + final protected function getFeaturesOther(string $dbaClass): array { + return call_user_func($dbaClass . '::getFeatures'); + } protected function getUpdateHandlers($id, $current_user): array { return []; @@ -174,6 +184,11 @@ public function getAliasedFeatures(): array { $features = $this->getFeatures(); return $this->mapFeatures($features); } + + public function getAliasedFeaturesOther($dbaClass): array { + $features = $this->getFeaturesOther($dbaClass); + return $this->mapFeatures($features); + } final protected function mapFeatures($features): array { $mappedFeatures = []; @@ -183,6 +198,18 @@ final protected function mapFeatures($features): array { } return $mappedFeatures; } + + public static function getToOneRelationships(): array { + return []; + } + + public static function getToManyRelationships(): array { + return []; + } + + public function getAllRelationships(): array { + return array_merge($this->getToOneRelationships(), $this->getToManyRelationships()); + } /** * Retrieve currently logged-in user @@ -1145,19 +1172,39 @@ protected function makeOrderFilterTemplates(Request $request, array $features, s $orderings = $this->getQueryParameterAsList($request, 'sort'); $contains_primary_key = false; foreach ($orderings as $order) { - if (preg_match('/^(?P[-])?(?P[_a-zA-Z]+)$/', $order, $matches)) { + $factory = null; + $joinKey = null; + $features_sort = $features; + if (preg_match('/^(?P[-])?(?P[_a-zA-Z.]+)$/', $order, $matches)) { // Special filtering of _id to use for uniform access to model primary key $cast_key = $matches['key'] == 'id' ? $this->getPrimaryKey() : $matches['key']; if ($cast_key == $this->getPrimaryKey()) { $contains_primary_key = true; } - if (array_key_exists($cast_key, $features)) { - $remappedKey = $features[$cast_key]['dbname']; + if (strpos($cast_key, ".")) { + $parts = explode(".", $cast_key); + if (count($parts) == 2) { // Only relations of 1 deep allowed ex. task.keyspace + $relationString = $parts[0]; + //currently getting all relationships, but its probably only possible to sort on 1 to 1 relations + $relations = $this->getAllRelationships(); + if (array_key_exists($relationString, $relations)) { + $relationClass = $relations[$relationString]['relationType']; + $relationFeatures = $this->getAliasedFeaturesOther($relationClass); + $factory = $this->getModelFactory($relationClass); + $joinKey = $relations[$relationString]['relationKey']; + $key = $relations[$relationString]['key']; + $features_sort = $relationFeatures; + $cast_key = $parts[1]; + } + } + } + if (array_key_exists($cast_key, $features_sort)) { + $remappedKey = $features_sort[$cast_key]['dbname']; $type = ($matches['operator'] == '-') ? "DESC" : "ASC"; if ($reverseSort) { $type = ($type == "ASC") ? "DESC" : "ASC"; } - $orderTemplates[] = ['by' => $remappedKey, 'type' => $type]; + $orderTemplates[] = ['by' => $remappedKey, 'type' => $type, 'factory' => $factory, 'joinKey' => $joinKey, 'key' => $key]; } else { throw new HttpForbidden("Ordering parameter '" . $order . "' is not valid"); @@ -1170,7 +1217,7 @@ protected function makeOrderFilterTemplates(Request $request, array $features, s //when no primary key has been added in the sort parameter, add the default case of sorting on primary key as last sort if (!$contains_primary_key) { - $orderTemplates[] = ['by' => $this->getPrimaryKey(), 'type' => $defaultSort]; + $orderTemplates[] = ['by' => $this->getPrimaryKey(), 'type' => $defaultSort, 'factory' => null, 'joinKey' => null]; } return $orderTemplates; diff --git a/src/inc/apiv2/common/AbstractModelAPI.class.php b/src/inc/apiv2/common/AbstractModelAPI.class.php index 817638a57..0da840ab2 100644 --- a/src/inc/apiv2/common/AbstractModelAPI.class.php +++ b/src/inc/apiv2/common/AbstractModelAPI.class.php @@ -23,14 +23,6 @@ abstract protected function createObject(array $data): int; abstract protected function deleteObject(object $object): void; - public static function getToOneRelationships(): array { - return []; - } - - public static function getToManyRelationships(): array { - return []; - } - /** * Available 'expand' parameters on $object */ @@ -126,16 +118,6 @@ public function getFeaturesWithoutFormfields(): array { return $this->mapFeatures($features); } - /** - * Get features based on DBA model features - * - * @param string $dbaClass is the dba class to get the features from - */ - //TODO doesnt retrieve features based on form fields, could be done by adding api class in relationship objects - final protected function getFeaturesOther(string $dbaClass): array { - return call_user_func($dbaClass . '::getFeatures'); - } - /** * Find primary key for another DBA object * A little bit hacky because the getPrimaryKey function in dbaClass is not static @@ -446,7 +428,7 @@ final protected function ResourceRecordArrayToUpdateArray($data, $parentId): arr } return $updates; } - + protected static function calculate_next_cursor(string|int $cursor, bool $ascending=true) { if (is_int($cursor)) { if ($ascending) { @@ -547,16 +529,23 @@ protected static function compare_keys($key1, $key2, $isNegativeSort) { protected static function getMinMaxCursor($apiClass, string $sort, array $filters, $request, $aliasedfeatures) { $filters[Factory::LIMIT] = new LimitFilter(1); - + $primaryKey = $apiClass->getPrimaryKey(); // Descending queries are used to retrieve the last element. For this all sorts have to be reversed, since // if all order quereis are reversed and limit to 1, you will retrieve the last element. $reverseSort = ($sort == "DESC") ? true : false; $orderTemplates = $apiClass->makeOrderFilterTemplates($request, $aliasedfeatures, $sort, $reverseSort); $orderFilters = []; + $joinFilters = []; foreach ($orderTemplates as $orderTemplate) { - $orderFilters[] = new OrderFilter($orderTemplate['by'], $orderTemplate['type']); + $orderFilters[] = new OrderFilter($orderTemplate['by'], $orderTemplate['type'], $orderTemplate['factory']); + if ($orderTemplate['factory'] !== null){ + // if factory of ordertemplate is not null, sort is happening on joined table + $otherFactory = $orderTemplate['factory']; + $joinFilters[] = new JoinFilter($otherFactory, $orderTemplate['joinKey'], $apiClass->getPrimaryKeyOther($otherFactory->getNullObject()::class)); + } } $filters[Factory::ORDER] = $orderFilters; + $filters[Factory::JOIN] = $joinFilters; $factory = $apiClass->getFactory(); $result = $factory->filter($filters); //handle joined queries @@ -569,6 +558,14 @@ protected static function getMinMaxCursor($apiClass, string $sort, array $filter return $result[0]; } + /** + * overridable function to parse filters, currently only needed for taskWrapper endpoint + * to handle the taskwrapper -> task relation, to be able to treat it as a to one relationship + */ + protected function parseFilters(array $filters) { + return $filters; + } + /** * API entry point for requesting multiple objects * @throws HttpError @@ -661,23 +658,32 @@ public static function getManyResources(object $apiClass, Request $request, Resp } else { $defaultSort = "ASC"; } + $primaryKey = $apiClass->getPrimaryKey(); $orderTemplates = $apiClass->makeOrderFilterTemplates($request, $aliasedfeatures, $defaultSort); $orderTemplates[0]["type"] = $defaultSort; $primaryFilter = $orderTemplates[0]['by']; $orderFilters = []; + $joinFilters = []; // Build actual order filters foreach ($orderTemplates as $orderTemplate) { // $aFs[Factory::ORDER][] = new OrderFilter($orderTemplate['by'], $orderTemplate['type']); - $orderFilters[] = new OrderFilter($orderTemplate['by'], $orderTemplate['type']); + $orderFilters[] = new OrderFilter($orderTemplate['by'], $orderTemplate['type'], $orderTemplate['factory']); + if ($orderTemplate['factory'] !== null) { + // if factory of ordertemplate is not null, sort is happening on joined table + $otherFactory = $orderTemplate['factory']; + $joinFilters[] = new JoinFilter($otherFactory, $orderTemplate['joinKey'], $orderTemplate['key']); + } } + $aFs[Factory::ORDER] = $orderFilters; + $aFs[Factory::JOIN] = $joinFilters; /* Include relation filters */ $finalFs = array_merge($aFs, $relationFs); + $finalFs = $apiClass->parseFilters($finalFs); - $primaryKey = $apiClass->getPrimaryKey(); //TODO it would be even better if its possible to see if the primary filter is unique, instead of primary key. //But this probably needs to be added in getFeatures() then. $primaryKeyIsNotPrimaryFilter = $primaryFilter != $primaryKey; diff --git a/src/inc/apiv2/model/tasks.routes.php b/src/inc/apiv2/model/tasks.routes.php index 3d85543d5..7f3b8bee5 100644 --- a/src/inc/apiv2/model/tasks.routes.php +++ b/src/inc/apiv2/model/tasks.routes.php @@ -120,7 +120,7 @@ public static function getToManyRelationships(): array { ] ]; } - + public function getFormFields(): array { // TODO Form declarations in more generic class to allow auto-generated OpenAPI specifications return [ diff --git a/src/inc/apiv2/model/taskwrappers.routes.php b/src/inc/apiv2/model/taskwrappers.routes.php index 32cc44816..d333d0083 100644 --- a/src/inc/apiv2/model/taskwrappers.routes.php +++ b/src/inc/apiv2/model/taskwrappers.routes.php @@ -1,11 +1,13 @@ HashType::class, 'relationKey' => HashType::HASH_TYPE_ID, ], + 'task' => [ + 'key' => TaskWrapper::TASK_WRAPPER_ID, + + 'relationType' => Task::class, + 'relationKey' => Task::TASK_WRAPPER_ID, + 'readonly' => true // Not allowed to change tasks of a taskwrapper + ], ]; } @@ -97,6 +106,36 @@ public static function getToManyRelationships(): array { ]; } + protected function parseFilters(array $filters) { + //This is in order to handle filters and sorting on columns + if (isset($filters[Factory::JOIN])) { + $joinFilters = $filters[Factory::JOIN]; + foreach ($joinFilters as $joinFilter) { + if ($joinFilter->getOtherTableName() == Task::class) { + // This is a leftjoin where the task type is 0 which means not a supertask. This is in order to + // create a to 1 relationship where the taskwrapper will have the normal task as a relation and a supertask will have null + // This way it becomes possible to filter or sort on the included single task. + $joinFilter->setJoinType(JoinFilter::LEFT); + $qf = new QueryFilter(TaskWrapper::TASK_TYPE, DTaskTypes::NORMAL, "="); + $joinFilter->setQueryFilters([$qf]); + } + } + + // parse the order and filter + // Because the frontend shows taskwrappername for supertasks and taskname for normaltasks, the orders and filters for the + // name needs to be changed to coalesce filters to get the correct value between these 2. + // Another possibility where this hack is not needed would be to also store the taskname of normal tasks in the + // taskwrapper + foreach ($filters[Factory::ORDER] as &$orderfilter) { + if ($orderfilter->getBy() == Task::TASK_NAME) { + $newOrderFilter = new CoalesceOrderFilter([Task::TASK_NAME, TaskWrapper::TASK_WRAPPER_NAME], $orderfilter->getType()); + $orderfilter = $newOrderFilter; + } + } + unset($orderfilter); + } + return $filters; + } #[NoReturn] protected function createObject(array $data): int { assert(False, "TaskWrappers cannot be created via API"); From 7a011ca8730649b7223b3ff68e4a6f1914f6b5a8 Mon Sep 17 00:00:00 2001 From: s3inlc Date: Fri, 16 Jan 2026 10:17:16 +0100 Subject: [PATCH 375/691] updated agent stat cleaning to also clean up Speed table from old entries --- src/inc/Util.class.php | 3 +++ 1 file changed, 3 insertions(+) diff --git a/src/inc/Util.class.php b/src/inc/Util.class.php index 61c14e64e..a8a31ece9 100755 --- a/src/inc/Util.class.php +++ b/src/inc/Util.class.php @@ -641,6 +641,9 @@ public static function agentStatCleaning() { $qF = new QueryFilter(AgentStat::TIME, time() - $lifetime, "<="); Factory::getAgentStatFactory()->massDeletion([Factory::FILTER => $qF]); + $qF = new QueryFilter(Speed::TIME, time() - $lifetime, "<="); + Factory::getSpeedFactory()->massDeletion([Factory::FILTER => $qF]); + Factory::getStoredValueFactory()->set($entry, StoredValue::VAL, time()); } } From ea4a87cda28be670f6484b80928a4615008510d9 Mon Sep 17 00:00:00 2001 From: s3inlc Date: Fri, 16 Jan 2026 10:28:52 +0100 Subject: [PATCH 376/691] made primary keys of Speed, AgentStat and LogEntry to bigints --- src/migrations/mysql/20260116102500_bigint-keys-stats.sql | 3 +++ src/migrations/postgres/20260116102500_bigint-keys-stats.sql | 3 +++ 2 files changed, 6 insertions(+) create mode 100644 src/migrations/mysql/20260116102500_bigint-keys-stats.sql create mode 100644 src/migrations/postgres/20260116102500_bigint-keys-stats.sql diff --git a/src/migrations/mysql/20260116102500_bigint-keys-stats.sql b/src/migrations/mysql/20260116102500_bigint-keys-stats.sql new file mode 100644 index 000000000..0826fba09 --- /dev/null +++ b/src/migrations/mysql/20260116102500_bigint-keys-stats.sql @@ -0,0 +1,3 @@ +ALTER TABLE AgentStat MODIFY agentStatId BIGINT NOT NULL AUTO_INCREMENT; +ALTER TABLE Speed MODIFY speedId BIGINT NOT NULL AUTO_INCREMENT; +ALTER TABLE LogEntry MODIFY logEntryId BIGINT NOT NULL AUTO_INCREMENT; diff --git a/src/migrations/postgres/20260116102500_bigint-keys-stats.sql b/src/migrations/postgres/20260116102500_bigint-keys-stats.sql new file mode 100644 index 000000000..eab1d181e --- /dev/null +++ b/src/migrations/postgres/20260116102500_bigint-keys-stats.sql @@ -0,0 +1,3 @@ +ALTER TABLE AgentStat ALTER COLUMN agentStatId TYPE BIGINT USING id::bigint; +ALTER TABLE Speed ALTER COLUMN speedId TYPE BIGINT USING id::bigint; +ALTER TABLE LogEntry ALTER COLUMN logEntryId TYPE BIGINT USING id::bigint; From 3bc98505d378e1c8359ae9380ea9d6c1051120d6 Mon Sep 17 00:00:00 2001 From: s3inlc Date: Fri, 16 Jan 2026 11:18:20 +0100 Subject: [PATCH 377/691] fixed casting in postgres migration --- .../postgres/20260116102500_bigint-keys-stats.sql | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/migrations/postgres/20260116102500_bigint-keys-stats.sql b/src/migrations/postgres/20260116102500_bigint-keys-stats.sql index eab1d181e..24ba1a88f 100644 --- a/src/migrations/postgres/20260116102500_bigint-keys-stats.sql +++ b/src/migrations/postgres/20260116102500_bigint-keys-stats.sql @@ -1,3 +1,3 @@ -ALTER TABLE AgentStat ALTER COLUMN agentStatId TYPE BIGINT USING id::bigint; -ALTER TABLE Speed ALTER COLUMN speedId TYPE BIGINT USING id::bigint; -ALTER TABLE LogEntry ALTER COLUMN logEntryId TYPE BIGINT USING id::bigint; +ALTER TABLE AgentStat ALTER COLUMN agentStatId TYPE BIGSERIAL USING agentStatId::bigint; +ALTER TABLE Speed ALTER COLUMN speedId TYPE BIGSERIAL USING speedId::bigint; +ALTER TABLE LogEntry ALTER COLUMN logEntryId TYPE BIGSERIAL USING logEntryId::bigint; From 7a4a4a1107b1e7d5ea524d43e77c0c089116e9ce Mon Sep 17 00:00:00 2001 From: s3inlc Date: Fri, 16 Jan 2026 11:38:44 +0100 Subject: [PATCH 378/691] fixed postgres migration --- .../postgres/20260116102500_bigint-keys-stats.sql | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/src/migrations/postgres/20260116102500_bigint-keys-stats.sql b/src/migrations/postgres/20260116102500_bigint-keys-stats.sql index 24ba1a88f..8b8d3e007 100644 --- a/src/migrations/postgres/20260116102500_bigint-keys-stats.sql +++ b/src/migrations/postgres/20260116102500_bigint-keys-stats.sql @@ -1,3 +1,8 @@ -ALTER TABLE AgentStat ALTER COLUMN agentStatId TYPE BIGSERIAL USING agentStatId::bigint; -ALTER TABLE Speed ALTER COLUMN speedId TYPE BIGSERIAL USING speedId::bigint; -ALTER TABLE LogEntry ALTER COLUMN logEntryId TYPE BIGSERIAL USING logEntryId::bigint; +ALTER TABLE AgentStat ALTER COLUMN agentStatId TYPE BIGINT USING agentStatId::bigint; +ALTER SEQUENCE agentstat_agentstatid_seq AS BIGINT; + +ALTER TABLE Speed ALTER COLUMN speedId TYPE BIGINT USING speedId::bigint; +ALTER SEQUENCE speed_speedid_seq AS BIGINT; + +ALTER TABLE LogEntry ALTER COLUMN logEntryId TYPE BIGINT USING logEntryId::bigint; +ALTER SEQUENCE logentry_logentryid_seq AS BIGINT; From aaa5e93e4c8ebabd983f582d0feade787ec86c41 Mon Sep 17 00:00:00 2001 From: s3inlc Date: Fri, 16 Jan 2026 14:10:22 +0100 Subject: [PATCH 379/691] pre-merge migration rename --- ...bigint-keys-stats.sql => 20260116140300_bigint-keys-stats.sql} | 0 ...bigint-keys-stats.sql => 20260116140300_bigint-keys-stats.sql} | 0 2 files changed, 0 insertions(+), 0 deletions(-) rename src/migrations/mysql/{20260116102500_bigint-keys-stats.sql => 20260116140300_bigint-keys-stats.sql} (100%) rename src/migrations/postgres/{20260116102500_bigint-keys-stats.sql => 20260116140300_bigint-keys-stats.sql} (100%) diff --git a/src/migrations/mysql/20260116102500_bigint-keys-stats.sql b/src/migrations/mysql/20260116140300_bigint-keys-stats.sql similarity index 100% rename from src/migrations/mysql/20260116102500_bigint-keys-stats.sql rename to src/migrations/mysql/20260116140300_bigint-keys-stats.sql diff --git a/src/migrations/postgres/20260116102500_bigint-keys-stats.sql b/src/migrations/postgres/20260116140300_bigint-keys-stats.sql similarity index 100% rename from src/migrations/postgres/20260116102500_bigint-keys-stats.sql rename to src/migrations/postgres/20260116140300_bigint-keys-stats.sql From 519b938e5af50aff4c4d379c67556c5134c03708 Mon Sep 17 00:00:00 2001 From: s3inlc Date: Mon, 19 Jan 2026 08:46:11 +0100 Subject: [PATCH 380/691] casting crackpos to int as it may be empty string --- src/inc/api/APISendProgress.class.php | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/inc/api/APISendProgress.class.php b/src/inc/api/APISendProgress.class.php index f84344304..c069e4faf 100644 --- a/src/inc/api/APISendProgress.class.php +++ b/src/inc/api/APISendProgress.class.php @@ -247,11 +247,11 @@ public function execute($QUERY = array()) { } else if (sizeof($splitLine) == 5) { $plain = $splitLine[2]; // if hash is salted - $crackPos = $splitLine[4]; + $crackPos = intval($splitLine[4]); } else { $plain = $splitLine[1]; - $crackPos = $splitLine[3]; + $crackPos = intval($splitLine[3]); } foreach ($hashes as $hash) { @@ -312,7 +312,7 @@ public function execute($QUERY = array()) { $identification .= SConfig::getInstance()->getVal(DConfig::FIELD_SEPARATOR) . $essid; } $plain = $splitLine[1]; - $crackPos = $splitLine[3]; + $crackPos = intval($splitLine[3]); $qF1 = new QueryFilter(HashBinary::ESSID, $identification, "="); $qF2 = new QueryFilter(HashBinary::IS_CRACKED, 0, "="); $hashes = Factory::getHashBinaryFactory()->filter([Factory::FILTER => [$qF1, $qF2]]); @@ -333,7 +333,7 @@ public function execute($QUERY = array()) { // save binary password // result sent: ..\hashcat_luks_testfiles\luks_tests\hashcat_ripemd160_aes_cbc-essiv_128.luks:hashcat:68617368636174:12 $plain = $splitLine[1]; - $crackPos = $splitLine[3]; + $crackPos = intval($splitLine[3]); $qF1 = new QueryFilter(HashBinary::HASHLIST_ID, $totalHashlist->getId(), "="); $qF2 = new QueryFilter(HashBinary::IS_CRACKED, 0, "="); $hashes = Factory::getHashBinaryFactory()->filter([Factory::FILTER => [$qF1, $qF2]]); From 9f7bc982e9ac4803271987de334b66061a0fefc4 Mon Sep 17 00:00:00 2001 From: s3inlc Date: Mon, 19 Jan 2026 11:18:31 +0100 Subject: [PATCH 381/691] add ELSE statement for integers to avoid casting issues --- src/dba/AbstractModelFactory.class.php | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/src/dba/AbstractModelFactory.class.php b/src/dba/AbstractModelFactory.class.php index 90c046eae..7dba603f6 100755 --- a/src/dba/AbstractModelFactory.class.php +++ b/src/dba/AbstractModelFactory.class.php @@ -841,10 +841,12 @@ public function massSingleUpdate($matchingColumn, $updateColumn, array $updates) $vals = array(); + $integerValue = false; foreach ($updates as $update) { $query .= $update->getMassQuery(self::getMappedModelKey($this->getNullObject(),$matchingColumn)); $vals[] = $update->getMatchValue(); $vals[] = $update->getUpdateValue(); + $integerValue = is_int($update->getUpdateValue); } $matchingArr = array(); @@ -853,6 +855,13 @@ public function massSingleUpdate($matchingColumn, $updateColumn, array $updates) $matchingArr[] = "?"; } + // this covers the specific case when integer values are updated and the db system does not know what type the case statements would have + // mysql does not really care, but postgres does + // the trick we use here works for both systems (as opposed to cast it to int/bigint in postgres with ::bigint where we would need to branch based on the db) + if ($integerValue) { + $query .= " ELSE 2147483648 "; // 32 bit int max + 1 + } + $query .= "END) WHERE ".self::getMappedModelKey($this->getNullObject(), $matchingColumn)." IN (" . implode(",", $matchingArr) . ")"; $dbh = self::getDB(); $stmt = $dbh->prepare($query); From fde30682e034d0bf4911047f44f64a5c6891880e Mon Sep 17 00:00:00 2001 From: s3inlc Date: Mon, 19 Jan 2026 13:55:47 +0100 Subject: [PATCH 382/691] refactored check for integer value directly into if statement --- src/dba/AbstractModelFactory.class.php | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/src/dba/AbstractModelFactory.class.php b/src/dba/AbstractModelFactory.class.php index 7dba603f6..c55f2780b 100755 --- a/src/dba/AbstractModelFactory.class.php +++ b/src/dba/AbstractModelFactory.class.php @@ -841,12 +841,10 @@ public function massSingleUpdate($matchingColumn, $updateColumn, array $updates) $vals = array(); - $integerValue = false; foreach ($updates as $update) { $query .= $update->getMassQuery(self::getMappedModelKey($this->getNullObject(),$matchingColumn)); $vals[] = $update->getMatchValue(); $vals[] = $update->getUpdateValue(); - $integerValue = is_int($update->getUpdateValue); } $matchingArr = array(); @@ -858,7 +856,7 @@ public function massSingleUpdate($matchingColumn, $updateColumn, array $updates) // this covers the specific case when integer values are updated and the db system does not know what type the case statements would have // mysql does not really care, but postgres does // the trick we use here works for both systems (as opposed to cast it to int/bigint in postgres with ::bigint where we would need to branch based on the db) - if ($integerValue) { + if (is_int($updates[0]->getUpdateValue())) { $query .= " ELSE 2147483648 "; // 32 bit int max + 1 } From 0f49ddeeb4e510083190a18cb5dd832179ca4c6c Mon Sep 17 00:00:00 2001 From: s3inlc Date: Mon, 19 Jan 2026 15:00:05 +0100 Subject: [PATCH 383/691] cleanup config --- src/inc/defines/config.php | 1 - src/inc/startup/include.php | 4 +--- src/inc/startup/load.php | 2 -- src/inc/startup/setup.php | 2 -- 4 files changed, 1 insertion(+), 8 deletions(-) diff --git a/src/inc/defines/config.php b/src/inc/defines/config.php index 3d78005b6..03b2e9f2a 100644 --- a/src/inc/defines/config.php +++ b/src/inc/defines/config.php @@ -93,7 +93,6 @@ class DConfig { const EMAIL_SENDER_NAME = "emailSenderName"; const CONTACT_EMAIL = "contactEmail"; const VOUCHER_DELETION = "voucherDeletion"; - const S_NAME = "jeSuisHashtopussy"; const SERVER_LOG_LEVEL = "serverLogLevel"; const ALLOW_DEREGISTER = "allowDeregister"; diff --git a/src/inc/startup/include.php b/src/inc/startup/include.php index 99557d455..39e51a38d 100755 --- a/src/inc/startup/include.php +++ b/src/inc/startup/include.php @@ -3,9 +3,7 @@ // set to 1 for debugging ini_set("display_errors", "0"); -if(!defined("APP_NAME")) { - define("APP_NAME", "Hashtopolis"); -} +define("APP_NAME", "Hashtopolis"); $baseDir = dirname(__FILE__) . "/.."; diff --git a/src/inc/startup/load.php b/src/inc/startup/load.php index f0cb5b092..316389bb6 100755 --- a/src/inc/startup/load.php +++ b/src/inc/startup/load.php @@ -44,8 +44,6 @@ AccessControl::getInstance(Login::getInstance()->getUser()); } -define("APP_NAME", (SConfig::getInstance()->getVal(DConfig::S_NAME) == 1) ? "Hashtopussy" : "Hashtopolis"); - UI::add('config', SConfig::getInstance()); //set autorefresh to false for all pages diff --git a/src/inc/startup/setup.php b/src/inc/startup/setup.php index ee3992a58..b55084343 100755 --- a/src/inc/startup/setup.php +++ b/src/inc/startup/setup.php @@ -114,5 +114,3 @@ Util::checkDataDirectory(DDirectories::IMPORT, $DIRECTORIES['import']); Util::checkDataDirectory(DDirectories::LOG, $DIRECTORIES['log']); Util::checkDataDirectory(DDirectories::CONFIG, $DIRECTORIES['config']); - -define("APP_NAME", (SConfig::getInstance()->getVal(DConfig::S_NAME) == 1) ? "Hashtopussy" : "Hashtopolis"); From 433853f83dc216ef1199246bec4be5eeaf351051 Mon Sep 17 00:00:00 2001 From: jessevz Date: Tue, 20 Jan 2026 16:33:29 +0100 Subject: [PATCH 384/691] Fixed POST requests to helpers when no data has been provided (#1869) Co-authored-by: jessevz --- src/inc/apiv2/common/AbstractHelperAPI.class.php | 14 +++++++++----- 1 file changed, 9 insertions(+), 5 deletions(-) diff --git a/src/inc/apiv2/common/AbstractHelperAPI.class.php b/src/inc/apiv2/common/AbstractHelperAPI.class.php index 2ea5d8692..99d9064c6 100644 --- a/src/inc/apiv2/common/AbstractHelperAPI.class.php +++ b/src/inc/apiv2/common/AbstractHelperAPI.class.php @@ -42,11 +42,15 @@ public function processPost(Request $request, Response $response, array $args): $data = $request->getParsedBody(); $allFeatures = $this->getAliasedFeatures(); - // Validate if correct parameters are sent - $this->validateParameters($data, $allFeatures); - - /* Validate type of parameters */ - $this->validateData($data, $allFeatures); + if ($data !== null) { + // Validate if correct parameters are sent + $this->validateParameters($data, $allFeatures); + + /* Validate type of parameters */ + $this->validateData($data, $allFeatures); + } else { + $data = []; + } /* All creation of object */ $newObject = $this->actionPost($data); From b4dd6019abc1c0265a37760ae3318b8ba8b527de Mon Sep 17 00:00:00 2001 From: jessevz Date: Tue, 20 Jan 2026 17:16:14 +0100 Subject: [PATCH 385/691] Upgraded mysql to 8.4 --- .devcontainer/docker-compose.mysql.yml | 2 +- docker-compose.mysql.yml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.devcontainer/docker-compose.mysql.yml b/.devcontainer/docker-compose.mysql.yml index bd5b56fd1..0c6817f97 100644 --- a/.devcontainer/docker-compose.mysql.yml +++ b/.devcontainer/docker-compose.mysql.yml @@ -29,7 +29,7 @@ services: - hashtopolis_dev hashtopolis-db-dev: container_name: hashtopolis-db-dev - image: mysql:8.0 + image: mysql:8.4 restart: always ports: - "3306:3306" diff --git a/docker-compose.mysql.yml b/docker-compose.mysql.yml index bf95d225f..d28928764 100644 --- a/docker-compose.mysql.yml +++ b/docker-compose.mysql.yml @@ -24,7 +24,7 @@ services: - 8080:80 db: container_name: db - image: mysql:8.0 + image: mysql:8.4 restart: always volumes: - db:/var/lib/mysql From b315a52a087c71ac6070e16dc1fb95389a8c6596 Mon Sep 17 00:00:00 2001 From: jessevz Date: Tue, 20 Jan 2026 17:18:35 +0100 Subject: [PATCH 386/691] Also upgraded to mysql 8.4 in github actions --- .github/docker-compose.mysql.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/docker-compose.mysql.yml b/.github/docker-compose.mysql.yml index d8ed694c2..f8b016f2f 100644 --- a/.github/docker-compose.mysql.yml +++ b/.github/docker-compose.mysql.yml @@ -25,7 +25,7 @@ services: - hashtopolis_dev hashtopolis-db-dev: container_name: hashtopolis-db-dev - image: mysql:8.0 + image: mysql:8.4 restart: always ports: - "3306:3306" From 1df4b6a68e089040eac55c151b1028e76a9b6970 Mon Sep 17 00:00:00 2001 From: jessevz Date: Thu, 22 Jan 2026 11:03:23 +0100 Subject: [PATCH 387/691] Upgrade to postgres 18 --- .devcontainer/docker-compose.postgres.yml | 4 ++-- .github/docker-compose.postgres.yml | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/.devcontainer/docker-compose.postgres.yml b/.devcontainer/docker-compose.postgres.yml index 4ba0f1a4b..ed985a0d0 100644 --- a/.devcontainer/docker-compose.postgres.yml +++ b/.devcontainer/docker-compose.postgres.yml @@ -29,12 +29,12 @@ services: - hashtopolis_dev hashtopolis-db-dev: container_name: hashtopolis-db-dev - image: postgres:13 + image: postgres:18 restart: always ports: - "5432:5432" volumes: - - hashtopolis-db-dev:/var/lib/postgresql/data + - hashtopolis-db-dev:/var/lib/postgresql environment: POSTGRES_DB: hashtopolis POSTGRES_USER: hashtopolis diff --git a/.github/docker-compose.postgres.yml b/.github/docker-compose.postgres.yml index b4c53d290..d52312acf 100644 --- a/.github/docker-compose.postgres.yml +++ b/.github/docker-compose.postgres.yml @@ -25,12 +25,12 @@ services: - hashtopolis_dev hashtopolis-db-dev: container_name: hashtopolis-db-dev - image: postgres:13 + image: postgres:18 restart: always ports: - "5432:5432" volumes: - - hashtopolis-db-dev:/var/lib/postgresql/data + - hashtopolis-db-dev:/var/lib/postgresql environment: POSTGRES_DB: hashtopolis POSTGRES_USER: hashtopolis From 1138cef0211730428c20324176206b29d17309b9 Mon Sep 17 00:00:00 2001 From: jessevz Date: Thu, 22 Jan 2026 11:05:38 +0100 Subject: [PATCH 388/691] 1177 enhancement apiv2 importfile fix todos (#1874) * Added more input validation in POST to the importfile helper * Added automatic removing of outdated import files --------- Co-authored-by: jessevz --- Dockerfile | 41 ++++---- docker-entrypoint.sh | 31 +++--- src/inc/Util.class.php | 106 ++++++++++++++------- src/inc/api/APISendProgress.class.php | 3 +- src/inc/apiv2/helper/importFile.routes.php | 94 ++++++++++++------ src/inc/confv2.php | 9 +- src/inc/defines/global.php | 7 +- src/inc/startup/setup.php | 1 + 8 files changed, 183 insertions(+), 109 deletions(-) diff --git a/Dockerfile b/Dockerfile index 0f6f659b4..b87a3e8ec 100644 --- a/Dockerfile +++ b/Dockerfile @@ -30,6 +30,9 @@ ENV HASHTOPOLIS_IMPORT_PATH=${HASHTOPOLIS_PATH}/import ENV HASHTOPOLIS_LOG_PATH=${HASHTOPOLIS_PATH}/log ENV HASHTOPOLIS_CONFIG_PATH=${HASHTOPOLIS_PATH}/config ENV HASHTOPOLIS_BINARIES_PATH=${HASHTOPOLIS_PATH}/binaries +ENV HASHTOPOLIS_TUS_PATH=/var/tmp/tus +ENV HASHTOPOLIS_TEMP_UPLOADS_PATH=${HASHTOPOLIS_TUS_PATH}/uploads +ENV HASHTOPOLIS_TEMP_META_PATH=${HASHTOPOLIS_TUS_PATH}/meta # Add support for TLS inspection corporate setups, see .env.sample for details ENV NODE_EXTRA_CA_CERTS=/etc/ssl/certs/ca-certificates.crt @@ -67,26 +70,24 @@ RUN echo "ServerTokens Prod" >> /etc/apache2/apache2.conf \ && echo "ServerSignature Off" >> /etc/apache2/apache2.conf -RUN mkdir -p ${HASHTOPOLIS_DOCUMENT_ROOT} \ - && mkdir ${HASHTOPOLIS_DOCUMENT_ROOT}/../../.git/ \ - && mkdir -p ${HASHTOPOLIS_PATH} \ - && chown www-data:www-data ${HASHTOPOLIS_PATH} \ - && chmod g+w ${HASHTOPOLIS_PATH} \ - && mkdir -p ${HASHTOPOLIS_FILES_PATH} \ - && chown www-data:www-data ${HASHTOPOLIS_FILES_PATH} \ - && chmod g+w ${HASHTOPOLIS_FILES_PATH} \ - && mkdir -p ${HASHTOPOLIS_IMPORT_PATH} \ - && chown www-data:www-data ${HASHTOPOLIS_IMPORT_PATH} \ - && chmod g+w ${HASHTOPOLIS_IMPORT_PATH} \ - && mkdir -p ${HASHTOPOLIS_LOG_PATH} \ - && chown www-data:www-data ${HASHTOPOLIS_LOG_PATH} \ - && chmod g+w ${HASHTOPOLIS_LOG_PATH} \ - && mkdir -p ${HASHTOPOLIS_CONFIG_PATH} \ - && chown www-data:www-data ${HASHTOPOLIS_CONFIG_PATH} \ - && chmod g+w ${HASHTOPOLIS_CONFIG_PATH} \ - && mkdir -p ${HASHTOPOLIS_BINARIES_PATH} \ - && chown www-data:www-data ${HASHTOPOLIS_BINARIES_PATH} \ - && chmod g+w ${HASHTOPOLIS_BINARIES_PATH} +RUN mkdir -p \ + ${HASHTOPOLIS_DOCUMENT_ROOT} \ + ${HASHTOPOLIS_DOCUMENT_ROOT}/../../.git/ \ + ${HASHTOPOLIS_PATH} \ + ${HASHTOPOLIS_FILES_PATH} \ + ${HASHTOPOLIS_IMPORT_PATH} \ + ${HASHTOPOLIS_LOG_PATH} \ + ${HASHTOPOLIS_CONFIG_PATH} \ + ${HASHTOPOLIS_BINARIES_PATH} \ + ${HASHTOPOLIS_TUS_PATH} \ + ${HASHTOPOLIS_TEMP_UPLOADS_PATH} \ + ${HASHTOPOLIS_TEMP_META_PATH} \ + && chown -R www-data:www-data \ + ${HASHTOPOLIS_PATH} \ + ${HASHTOPOLIS_TUS_PATH} \ + && chmod -R g+w \ + ${HASHTOPOLIS_PATH} \ + ${HASHTOPOLIS_TUS_PATH} COPY --from=prebuild /usr/local/cargo/bin/sqlx /usr/bin/ diff --git a/docker-entrypoint.sh b/docker-entrypoint.sh index 72d5b2196..367142e97 100755 --- a/docker-entrypoint.sh +++ b/docker-entrypoint.sh @@ -49,22 +49,23 @@ while :; do done echo "Database ready!" +directories=( + "${HASHTOPOLIS_FILES_PATH}" + "${HASHTOPOLIS_CONFIG_PATH}" + "${HASHTOPOLIS_LOG_PATH}" + "${HASHTOPOLIS_IMPORT_PATH}" + "${HASHTOPOLIS_BINARIES_PATH}" + "${HASHTOPOLIS_TUS_PATH}" + "${HASHTOPOLIS_TEMP_UPLOADS_PATH}" + "${HASHTOPOLIS_TEMP_META_PATH}" +) + echo "Setting up folders" -if [ ! -d ${HASHTOPOLIS_FILES_PATH} ];then - mkdir -p ${HASHTOPOLIS_FILES_PATH} && chown www-data:www-data ${HASHTOPOLIS_FILES_PATH} -fi -if [ ! -d ${HASHTOPOLIS_CONFIG_PATH} ];then - mkdir -p ${HASHTOPOLIS_CONFIG_PATH} && chown www-data:www-data ${HASHTOPOLIS_CONFIG_PATH} -fi -if [ ! -d ${HASHTOPOLIS_LOG_PATH} ];then - mkdir -p ${HASHTOPOLIS_LOG_PATH} && chown www-data:www-data ${HASHTOPOLIS_LOG_PATH} -fi -if [ ! -d ${HASHTOPOLIS_IMPORT_PATH} ];then - mkdir -p ${HASHTOPOLIS_IMPORT_PATH} && chown www-data:www-data ${HASHTOPOLIS_IMPORT_PATH} -fi -if [ ! -d ${HASHTOPOLIS_BINARIES_PATH} ];then - mkdir -p ${HASHTOPOLIS_BINARIES_PATH} && chown www-data:www-data ${HASHTOPOLIS_BINARIES_PATH} -fi +for dir in "${directories[@]}"; do + if [ ! -d "$dir" ];then + mkdir -p "$dir" && chown www-data:www-data "$dir" + fi +done # required to trigger the initialization echo "Start initialization process..." diff --git a/src/inc/Util.class.php b/src/inc/Util.class.php index a8a31ece9..273eb7d85 100755 --- a/src/inc/Util.class.php +++ b/src/inc/Util.class.php @@ -621,6 +621,21 @@ public static function checkTaskWrapperCompleted($taskWrapper) { } return true; } + + public static function cleaning() { + $entry = Factory::getStoredValueFactory()->get(DCleaning::LAST_CLEANING); + if ($entry == null) { + $entry = new StoredValue(DCleaning::LAST_CLEANING, 0); + Factory::getStoredValueFactory()->save($entry); + } + $time = time(); + if ($time - $entry->getVal() > 600) { + self::agentStatCleaning(); + self::zapCleaning(); + self::tusFileCleaning(); + Factory::getStoredValueFactory()->set($entry, StoredValue::VAL, $time); + } + } /** * Checks if it is longer than 10 mins since the last time it was checked if there are @@ -628,48 +643,69 @@ public static function checkTaskWrapperCompleted($taskWrapper) { * and old entries are deleted. */ public static function agentStatCleaning() { - $entry = Factory::getStoredValueFactory()->get(DStats::LAST_STAT_CLEANING); - if ($entry == null) { - $entry = new StoredValue(DStats::LAST_STAT_CLEANING, 0); - Factory::getStoredValueFactory()->save($entry); - } - if (time() - $entry->getVal() > 600) { - $lifetime = intval(SConfig::getInstance()->getVal(DConfig::AGENT_DATA_LIFETIME)); - if ($lifetime <= 0) { - $lifetime = 3600; - } - $qF = new QueryFilter(AgentStat::TIME, time() - $lifetime, "<="); - Factory::getAgentStatFactory()->massDeletion([Factory::FILTER => $qF]); - - $qF = new QueryFilter(Speed::TIME, time() - $lifetime, "<="); - Factory::getSpeedFactory()->massDeletion([Factory::FILTER => $qF]); - - Factory::getStoredValueFactory()->set($entry, StoredValue::VAL, time()); + $lifetime = intval(SConfig::getInstance()->getVal(DConfig::AGENT_DATA_LIFETIME)); + if ($lifetime <= 0) { + $lifetime = 3600; } + $qF = new QueryFilter(AgentStat::TIME, time() - $lifetime, "<="); + Factory::getAgentStatFactory()->massDeletion([Factory::FILTER => $qF]); + + $qF = new QueryFilter(Speed::TIME, time() - $lifetime, "<="); + Factory::getSpeedFactory()->massDeletion([Factory::FILTER => $qF]); + } /** * Used by the solver. Cleans the zap-queue */ public static function zapCleaning() { - $entry = Factory::getStoredValueFactory()->get(DZaps::LAST_ZAP_CLEANING); - if ($entry == null) { - $entry = new StoredValue(DZaps::LAST_ZAP_CLEANING, 0); - Factory::getStoredValueFactory()->save($entry); - } - if (time() - $entry->getVal() > 600) { - $zapFilter = new QueryFilter(Zap::SOLVE_TIME, time() - 600, "<="); - - // delete dependencies on AgentZap - $zaps = Factory::getZapFactory()->filter([Factory::FILTER => $zapFilter]); - $zapIds = Util::arrayOfIds($zaps); - $uS = new UpdateSet(AgentZap::LAST_ZAP_ID, null); - $qF = new ContainFilter(AgentZap::LAST_ZAP_ID, $zapIds); - Factory::getAgentZapFactory()->massUpdate([Factory::FILTER => $qF, Factory::UPDATE => $uS]); - - Factory::getZapFactory()->massDeletion([Factory::FILTER => $zapFilter]); - - Factory::getStoredValueFactory()->set($entry, StoredValue::VAL, time()); + $zapFilter = new QueryFilter(Zap::SOLVE_TIME, time() - 600, "<="); + + // delete dependencies on AgentZap + $zaps = Factory::getZapFactory()->filter([Factory::FILTER => $zapFilter]); + $zapIds = Util::arrayOfIds($zaps); + $uS = new UpdateSet(AgentZap::LAST_ZAP_ID, null); + $qF = new ContainFilter(AgentZap::LAST_ZAP_ID, $zapIds); + Factory::getAgentZapFactory()->massUpdate([Factory::FILTER => $qF, Factory::UPDATE => $uS]); + + Factory::getZapFactory()->massDeletion([Factory::FILTER => $zapFilter]); + } + + /** + * Cleans up stale TUS upload files. + * + * This method scans the TUS metadata directory for .meta files, reads their + * metadata to determine upload expiration, and removes expired metadata files + * together with their corresponding upload (.part) files. It performs file + * system operations and may delete files on disk. + */ + public static function tusFileCleaning() { + $tusDirectory = Factory::getStoredValueFactory()->get(DDirectories::TUS)->getVal(); + $uploadDirectory = $tusDirectory . DIRECTORY_SEPARATOR . "uploads" . DIRECTORY_SEPARATOR; + $metaDirectory = $tusDirectory . DIRECTORY_SEPARATOR . "meta" . DIRECTORY_SEPARATOR; + $expiration_time = time() + 3600; + if (file_exists($metaDirectory) && is_dir($metaDirectory)) { + if ($metaDirectoryHandler = opendir($metaDirectory)){ + while ($file = readdir($metaDirectoryHandler)) { + if (str_ends_with($file, ".meta")) { + $metaFile = $metaDirectory . $file; + $metadata = (array)json_decode(file_get_contents($metaFile), true) ; + if (!isset($metadata['upload_expires'])) { + continue; + } + if ($metadata['upload_expires'] > $expiration_time) { + $uploadFile = $uploadDirectory . pathinfo($file, PATHINFO_FILENAME) . ".part"; + if (file_exists($metaFile)) { + unlink($metaFile); + } + if (file_exists($uploadFile)){ + unlink($uploadFile); + } + } + } + } + closedir($metaDirectoryHandler); + } } } diff --git a/src/inc/api/APISendProgress.class.php b/src/inc/api/APISendProgress.class.php index c069e4faf..c2d9a243e 100644 --- a/src/inc/api/APISendProgress.class.php +++ b/src/inc/api/APISendProgress.class.php @@ -537,8 +537,7 @@ public function execute($QUERY = array()) { DServerLog::log(DServerLog::TRACE, "Checked zaps and sending new ones to agent", [$this->agent, $zaps]); break; } - Util::zapCleaning(); - Util::agentStatCleaning(); + Util::cleaning(); $this->sendResponse(array( PResponseSendProgress::ACTION => PActions::SEND_PROGRESS, PResponseSendProgress::RESPONSE => PValues::SUCCESS, diff --git a/src/inc/apiv2/helper/importFile.routes.php b/src/inc/apiv2/helper/importFile.routes.php index 2e361db80..fec46de03 100644 --- a/src/inc/apiv2/helper/importFile.routes.php +++ b/src/inc/apiv2/helper/importFile.routes.php @@ -37,14 +37,20 @@ public function getRequiredPermissions(string $method): array { return []; } - static function getUploadPath(string $id): string { - return "/tmp/" . $id . '.part'; - } - - static function getMetaPath(string $id): string { - return "/tmp/" . $id . '.meta'; - } - +static function getUploadPath(string $id): string { + return Factory::getStoredValueFactory()->get(DDirectories::TUS)->getVal() . DIRECTORY_SEPARATOR . 'uploads' . + DIRECTORY_SEPARATOR . basename($id) . ".part"; +} + +static function getMetaPath(string $id): string { + return Factory::getStoredValueFactory()->get(DDirectories::TUS)->getVal() . DIRECTORY_SEPARATOR . 'meta' + . DIRECTORY_SEPARATOR . basename($id) . ".meta"; +} + +static function getImportPath(string $id): string { + return Factory::getStoredValueFactory()->get(DDirectories::IMPORT)->getVal() . DIRECTORY_SEPARATOR . basename($id); +} + /** * Import file has no POST parameters */ @@ -52,11 +58,6 @@ public function getFormFields(): array { return []; } - - static function getImportPath(string $id): string { - return Factory::getStoredValueFactory()->get(DDirectories::IMPORT)->getVal() . "/" . $id; - } - static function getChecksumAlgorithm(): array { return ['md5', 'sha1', 'crc32']; } @@ -86,8 +87,10 @@ function actionPost(array $data): object|array|null { * And to retrieve the upload status. */ function processHead(Request $request, Response $response, array $args): Response { - // TODO return 404 or 410 if entry is not found $filename = self::getUploadPath($args['id']); + if (!is_file($filename)) { + return $response->withStatus(404); + } $currentSize = filesize($filename); $ds = self::getMetaStorage($args['id']); @@ -155,6 +158,10 @@ function processPost(Request $request, Response $response, array $args): Respons $list = explode(",", $update["upload_metadata_raw"]); foreach ($list as $item) { list($key, $b64val) = explode(" ", $item); + if (!isset($b64val)) { + $response->getBody()->write("Error Upload-Metadata, should be a key value pair that is separated by a space, no value has been provided"); + return $response->withStatus(400); + } if (($val = base64_decode($b64val, true)) === false) { $response->getBody()->write("Error Upload-Metadata '$key' invalid base64 encoding"); return $response->withStatus(400); @@ -163,7 +170,7 @@ function processPost(Request $request, Response $response, array $args): Respons } } // TODO: Should filename be mandatory? - if (array_key_exists('filename', $update_metadata)) { + if (isset($update_metadata) && array_key_exists('filename', $update_metadata)) { $filename = $update_metadata['filename']; /* Generate unique upload identifier */ $id = date("YmdHis") . "-" . md5($filename); @@ -178,6 +185,10 @@ function processPost(Request $request, Response $response, array $args): Respons } $update["upload_metadata"] = $update_metadata; + if ($request->hasHeader('Upload-Defer-Length') && $request->hasHeader('Upload-Length')) { + $response->getBody()->write('Error: Cannot provide both Upload-Length and Upload-Defer-Length'); + return $response->withStatus(400); + } if ($request->hasHeader('Upload-Defer-Length')) { if ($request->getHeader('Upload-Defer-Length')[0] == "1") { $update["upload_defer_length"] = true; @@ -252,9 +263,12 @@ function processPatch(Request $request, Response $response, array $args): Respon /* Validate if upload time is still valid */ $now = new DateTimeImmutable(); + if (!isset($ds['upload_expires'])) { + throw new HttpError("The meta file of this upload is incorrect"); + } $dt = (new DateTime())->setTimeStamp($ds['upload_expires']); if (($dt->getTimestamp() - $now->getTimestamp()) <= 0) { - // TODO: Remove expired uploads + Util::tusFileCleaning(); $response->getBody()->write('Upload token expired'); return $response->withStatus(410); } @@ -302,9 +316,12 @@ function processPatch(Request $request, Response $response, array $args): Respon self::updateStorage($args['id'], $update); } } - - file_put_contents($filename, $chunk, FILE_APPEND); - + + if (file_put_contents($filename, $chunk, FILE_APPEND) === false) { + $response->getBody()->write('Failed to write to file'); + return $response->withStatus(400); + } + clearstatcache(); $newSize = filesize($filename); @@ -333,7 +350,8 @@ function processPatch(Request $request, Response $response, array $args): Respon else { $statusMsg = "Next chunk please"; } - + + $dt = (new DateTime())->setTimeStamp($ds['upload_expires']); $response->getBody()->write($statusMsg); return $response->withStatus(204) ->withHeader("Tus-Resumable", "1.0.0") @@ -342,18 +360,32 @@ function processPatch(Request $request, Response $response, array $args): Respon ->withHeader('Upload-Expires', $dt->format(DateTimeInterface::RFC7231)) ->WithHeader("Access-Control-Expose-Headers", "Tus-Resumable, Upload-Length, Upload-Offset"); } - - /** - * Endpoint to delete the file - */ + function processDelete(Request $request, Response $response, array $args): Response { - // // TODO delete file - - // // TODO return 404 or 410 if entry is not found - return $response->withStatus(204) - ->withHeader("Tus-Resumable", "1.0.0") - ->WithHeader("Access-Control-Expose-Headers", "Tus-Resumable"); + /* Return 404 if entry is not found */ + $filename_upload = self::getUploadPath($args['id']); + $filename_meta = self::getMetaPath($args['id']); + $uploadExists = file_exists($filename_upload); + $metaExists = file_exists($filename_meta); + if (!$uploadExists && !$metaExists) { + throw new HttpError("Upload ID doesnt exists"); + } + if ($uploadExists) { + $isDeletedUpload = unlink($filename_upload); + } + if ($metaExists) { + $isDeletedMeta = unlink($filename_meta); + } + + if (!$isDeletedMeta || !$isDeletedUpload) { + throw new HttpError("Something went wrong while deleting the files"); + } + + return $response->withStatus(204) + ->withHeader("Tus-Resumable", "1.0.0") + ->WithHeader("Access-Control-Expose-Headers", "Tus-Resumable"); } + static public function register($app): void { $me = get_called_class(); @@ -373,7 +405,7 @@ static public function register($app): void { $group->post('', $me . ":processPost")->setName($me . ":processPost"); }); - + $app->group($baseUri . "/{id:[0-9]{14}-[0-9a-f]{32}}", function (RouteCollectorProxy $group) use ($me) { /* Allow preflight requests */ $group->options('', function (Request $request, Response $response, array $args): Response { diff --git a/src/inc/confv2.php b/src/inc/confv2.php index d13484e72..fe94080c1 100644 --- a/src/inc/confv2.php +++ b/src/inc/confv2.php @@ -10,7 +10,8 @@ "files" => dirname(__FILE__) . "/../files/", "import" => dirname(__FILE__) . "/../import/", "log" => dirname(__FILE__) . "/../log/", - "config" => dirname(__FILE__) . "/../config/" + "config" => dirname(__FILE__) . "/../config/", + "tus" => "/var/tmp/tus/", ]; } @@ -48,7 +49,8 @@ "files" => "/usr/local/share/hashtopolis/files", "import" => "/usr/local/share/hashtopolis/import", "log" => "/usr/local/share/hashtopolis/log", - "config" => "/usr/local/share/hashtopolis/config" + "config" => "/usr/local/share/hashtopolis/config", + "tus" => "/var/tmp/tus/", ]; // update from env if set @@ -61,6 +63,9 @@ if (getenv('HASHTOPOLIS_LOG_PATH') !== false) { $DIRECTORIES["log"] = getenv('HASHTOPOLIS_LOG_PATH'); } + if (getenv('HASHTOPOLIS_TUS_PATH') !== false) { + $DIRECTORIES["tus"] = getenv('HASHTOPOLIS_TUS_PATH'); + } } // load data // test if config file exists diff --git a/src/inc/defines/global.php b/src/inc/defines/global.php index 9323d88ac..662aa3bb8 100644 --- a/src/inc/defines/global.php +++ b/src/inc/defines/global.php @@ -4,8 +4,8 @@ class DLimits { const ACCESS_GROUP_MAX_LENGTH = 50; } -class DZaps { - const LAST_ZAP_CLEANING = "lastZapCleaning"; +class DCleaning { + const LAST_CLEANING = "lastCleaning"; } class DDirectories { @@ -13,6 +13,7 @@ class DDirectories { const IMPORT = "directory_import"; const LOG = "directory_log"; const CONFIG = "directory_config"; + const TUS = "directory_tus"; } // log entry types @@ -36,8 +37,6 @@ class DStats { const TASKS_FINISHED = "tasksFinished"; const TASKS_RUNNING = "tasksRunning"; const TASKS_QUEUED = "tasksQueued"; - - const LAST_STAT_CLEANING = "lastStatCleaning"; } class DPrince { diff --git a/src/inc/startup/setup.php b/src/inc/startup/setup.php index b55084343..233cb8558 100755 --- a/src/inc/startup/setup.php +++ b/src/inc/startup/setup.php @@ -114,3 +114,4 @@ Util::checkDataDirectory(DDirectories::IMPORT, $DIRECTORIES['import']); Util::checkDataDirectory(DDirectories::LOG, $DIRECTORIES['log']); Util::checkDataDirectory(DDirectories::CONFIG, $DIRECTORIES['config']); +Util::checkDataDirectory(DDirectories::TUS, $DIRECTORIES['tus']); \ No newline at end of file From 646b5d19a98586d8d0a75c2b6c12cf9243a7d56a Mon Sep 17 00:00:00 2001 From: jessevz Date: Mon, 26 Jan 2026 16:37:12 +0100 Subject: [PATCH 389/691] Fix bug in user creation (#1887) * Fix bug in user creation * Made user session lifetime configurable --------- Co-authored-by: jessevz --- src/dba/models/User.class.php | 2 +- src/inc/apiv2/model/users.routes.php | 2 ++ src/inc/utils/UserUtils.class.php | 4 ++-- 3 files changed, 5 insertions(+), 3 deletions(-) diff --git a/src/dba/models/User.class.php b/src/dba/models/User.class.php index ae49f9061..16c812510 100644 --- a/src/dba/models/User.class.php +++ b/src/dba/models/User.class.php @@ -72,7 +72,7 @@ static function getFeatures(): array { $dict['isComputedPassword'] = ['read_only' => True, "type" => "bool", "subtype" => "unset", "choices" => "unset", "null" => False, "pk" => False, "protected" => True, "private" => False, "alias" => "isComputedPassword", "public" => False, "dba_mapping" => False]; $dict['lastLoginDate'] = ['read_only' => True, "type" => "int64", "subtype" => "unset", "choices" => "unset", "null" => False, "pk" => False, "protected" => True, "private" => False, "alias" => "lastLoginDate", "public" => False, "dba_mapping" => False]; $dict['registeredSince'] = ['read_only' => True, "type" => "int64", "subtype" => "unset", "choices" => "unset", "null" => False, "pk" => False, "protected" => True, "private" => False, "alias" => "registeredSince", "public" => False, "dba_mapping" => False]; - $dict['sessionLifetime'] = ['read_only' => False, "type" => "int", "subtype" => "unset", "choices" => "unset", "null" => False, "pk" => False, "protected" => False, "private" => False, "alias" => "sessionLifetime", "public" => False, "dba_mapping" => False]; + $dict['sessionLifetime'] = ['read_only' => False, "type" => "int", "subtype" => "unset", "choices" => "unset", "null" => True, "pk" => False, "protected" => False, "private" => False, "alias" => "sessionLifetime", "public" => False, "dba_mapping" => False]; $dict['rightGroupId'] = ['read_only' => False, "type" => "int", "subtype" => "unset", "choices" => "unset", "null" => False, "pk" => False, "protected" => False, "private" => False, "alias" => "globalPermissionGroupId", "public" => False, "dba_mapping" => False]; $dict['yubikey'] = ['read_only' => True, "type" => "str(256)", "subtype" => "unset", "choices" => "unset", "null" => False, "pk" => False, "protected" => True, "private" => False, "alias" => "yubikey", "public" => False, "dba_mapping" => False]; $dict['otp1'] = ['read_only' => True, "type" => "str(256)", "subtype" => "unset", "choices" => "unset", "null" => False, "pk" => False, "protected" => True, "private" => False, "alias" => "otp1", "public" => False, "dba_mapping" => False]; diff --git a/src/inc/apiv2/model/users.routes.php b/src/inc/apiv2/model/users.routes.php index 917937ca1..f117f8ffe 100644 --- a/src/inc/apiv2/model/users.routes.php +++ b/src/inc/apiv2/model/users.routes.php @@ -86,6 +86,7 @@ protected function createObject($data): int { $data[User::RIGHT_GROUP_ID], $this->getCurrentUser(), $data[User::IS_VALID] ?? false, + $data[User::SESSION_LIFETIME] ?? 3600 ); return $user->getId(); @@ -95,6 +96,7 @@ function getAllPostParameters(array $features): array { $features = parent::getAllPostParameters($features); unset($features[User::IS_VALID]); + unset($features[User::SESSION_LIFETIME]); return $features; } diff --git a/src/inc/utils/UserUtils.class.php b/src/inc/utils/UserUtils.class.php index d6f7fcd78..824ac1f16 100644 --- a/src/inc/utils/UserUtils.class.php +++ b/src/inc/utils/UserUtils.class.php @@ -186,7 +186,7 @@ public static function setPassword($userId, $password, $adminUser) { * @throws HttpConflict * @throws HttpError */ - public static function createUser(string $username, string $email, int $rightGroupId, User $adminUser, bool $isValid = true): User { + public static function createUser(string $username, string $email, int $rightGroupId, User $adminUser, bool $isValid = true, int $session_lifetime=3600): User { $username = htmlentities($username, ENT_QUOTES, "UTF-8"); $group = AccessControlUtils::getGroup($rightGroupId); if (!filter_var($email, FILTER_VALIDATE_EMAIL) || strlen($email) == 0) { @@ -206,7 +206,7 @@ public static function createUser(string $username, string $email, int $rightGro $newPass = Util::randomString(10); $newSalt = Util::randomString(20); $newHash = Encryption::passwordHash($newPass, $newSalt); - $user = new User(null, $username, $email, $newHash, $newSalt, $isValid ? 1: 0, 1, 0, time(), 3600, $group->getId(), 0, "", "", "", ""); + $user = new User(null, $username, $email, $newHash, $newSalt, $isValid ? 1: 0, 1, 0, time(), $session_lifetime, $group->getId(), 0, "", "", "", ""); Factory::getUserFactory()->save($user); // add user to default group From a7e6bafc07fd983e47ec0ce189c02d963abc7985 Mon Sep 17 00:00:00 2001 From: jessevz Date: Tue, 27 Jan 2026 11:42:02 +0100 Subject: [PATCH 390/691] First check permissions before importing file (#1882) * First check permissions before importing file --------- Co-authored-by: jessevz --- src/inc/Util.class.php | 15 ++++++++++----- 1 file changed, 10 insertions(+), 5 deletions(-) diff --git a/src/inc/Util.class.php b/src/inc/Util.class.php index 273eb7d85..6f879cf57 100755 --- a/src/inc/Util.class.php +++ b/src/inc/Util.class.php @@ -1138,12 +1138,17 @@ public static function uploadFile($target, $type, $sourcedata) { case "import": if (file_exists(Factory::getStoredValueFactory()->get(DDirectories::IMPORT)->getVal() . "/" . $sourcedata)) { - rename(Factory::getStoredValueFactory()->get(DDirectories::IMPORT)->getVal() . "/" . $sourcedata, $target); - if (file_exists($target)) { - $success = true; - } + if (is_readable(Factory::getStoredValueFactory()->get(DDirectories::IMPORT)->getVal() . "/" . $sourcedata)) { + rename(Factory::getStoredValueFactory()->get(DDirectories::IMPORT)->getVal() . "/" . $sourcedata, $target); + if (file_exists($target)) { + $success = true; + } + else { + $msg = "Renaming of file from import directory failed!"; + } + } else { - $msg = "Renaming of file from import directory failed!"; + $msg = "Incorrect permissions of import file, Hashtopolis server can't read the file"; } } else { From 1c13a80476ef80841173605f0197406b2a52b64f Mon Sep 17 00:00:00 2001 From: jessevz Date: Tue, 27 Jan 2026 12:02:41 +0100 Subject: [PATCH 391/691] Added helper to retrieve files in the import directory (#1877) * Added helper to retrieve files in the import directory --------- Co-authored-by: jessevz --- src/inc/apiv2/helper/importFile.routes.php | 26 ++++++++++++++++++++++ 1 file changed, 26 insertions(+) diff --git a/src/inc/apiv2/helper/importFile.routes.php b/src/inc/apiv2/helper/importFile.routes.php index fec46de03..862776034 100644 --- a/src/inc/apiv2/helper/importFile.routes.php +++ b/src/inc/apiv2/helper/importFile.routes.php @@ -386,6 +386,31 @@ function processDelete(Request $request, Response $response, array $args): Respo ->WithHeader("Access-Control-Expose-Headers", "Tus-Resumable"); } + /** + * Scans the import-directory for files. Directories are ignored. + * @return array of all files in the top-level directory /../import + */ + function scanImportDirectory() { + $directory = Factory::getStoredValueFactory()->get(DDirectories::IMPORT)->getVal() . "/"; + if (file_exists($directory) && is_dir($directory)) { + $importDirectory = opendir($directory); + $importFiles = array(); + while ($file = readdir($importDirectory)) { + if ($file[0] != '.' && !is_dir($file)) { + $importFiles[] = array("file" => $file, "size" => Util::filesize($directory . "/" . $file)); + } + } + sort($importFiles); + return $importFiles; + } + return array(); + } + + function processGet(Request $request, Response $response, array $args): Response { + $importFiles = $this->scanImportDirectory(); + return self::getMetaResponse($importFiles, $request, $response); + } + static public function register($app): void { $me = get_called_class(); @@ -404,6 +429,7 @@ static public function register($app): void { }); $group->post('', $me . ":processPost")->setName($me . ":processPost"); + $group->get('', $me . ":processGet")->setName($me . ":processGet"); }); $app->group($baseUri . "/{id:[0-9]{14}-[0-9a-f]{32}}", function (RouteCollectorProxy $group) use ($me) { From 5d00fc42d6a409816b1532e23ad93ecf4b77e308 Mon Sep 17 00:00:00 2001 From: jessevz Date: Wed, 28 Jan 2026 09:02:35 +0100 Subject: [PATCH 392/691] Test pipeline (#1884) * Use Phpstan as static code anlyser in github actions --------- Co-authored-by: jessevz --- .github/workflows/ci.yml | 2 +- .github/workflows/docs-build.yml | 2 +- .github/workflows/docs.yml | 2 +- .github/workflows/phpstan.yml | 32 +++ composer.json | 3 +- composer.lock | 202 +++++++----------- phpstan.neon | 7 + src/inc/apiv2/auth/token.routes.php | 8 + .../apiv2/common/AbstractBaseAPI.class.php | 31 +-- .../apiv2/common/AbstractHelperAPI.class.php | 12 +- .../apiv2/common/AbstractModelAPI.class.php | 17 +- src/inc/apiv2/common/ErrorHandler.class.php | 3 +- src/inc/apiv2/common/openAPISchema.routes.php | 9 +- src/inc/apiv2/helper/abortChunk.routes.php | 2 + src/inc/apiv2/helper/assignAgent.routes.php | 2 + .../helper/bulkSupertaskBuilder.routes.php | 2 + .../apiv2/helper/changeOwnPassword.routes.php | 2 + .../helper/createSuperHashlist.routes.php | 2 + .../apiv2/helper/createSupertask.routes.php | 2 + src/inc/apiv2/helper/currentUser.routes.php | 5 +- .../helper/exportCrackedHashes.routes.php | 2 + .../apiv2/helper/exportLeftHashes.routes.php | 2 + .../apiv2/helper/exportWordlist.routes.php | 2 + .../apiv2/helper/getAccessGroups.routes.php | 7 +- .../apiv2/helper/getAgentBinary.routes.php | 7 +- .../apiv2/helper/getCracksOfTask.routes.php | 7 +- src/inc/apiv2/helper/getFile.routes.php | 7 +- .../helper/getTaskProgressImage.routes.php | 9 +- .../apiv2/helper/getUserPermission.routes.php | 7 +- .../helper/importCrackedHashes.routes.php | 2 + src/inc/apiv2/helper/importFile.routes.php | 15 +- .../helper/maskSupertaskBuilder.routes.php | 2 + src/inc/apiv2/helper/purgeTask.routes.php | 2 + .../apiv2/helper/rebuildChunkCache.routes.php | 2 + .../apiv2/helper/recountFileLines.routes.php | 2 + .../apiv2/helper/rescanGlobalFiles.routes.php | 2 + src/inc/apiv2/helper/resetChunk.routes.php | 2 + .../apiv2/helper/resetUserPassword.routes.php | 2 + src/inc/apiv2/helper/searchHashes.routes.php | 8 +- .../apiv2/helper/setUserPassword.routes.php | 2 + .../apiv2/helper/taskExtraDetails.routes.php | 7 +- src/inc/apiv2/helper/unassignAgent.routes.php | 2 + src/inc/apiv2/model/accessgroups.routes.php | 2 + .../apiv2/model/agentassignments.routes.php | 2 + src/inc/apiv2/model/agentbinaries.routes.php | 2 + src/inc/apiv2/model/agenterrors.routes.php | 11 +- src/inc/apiv2/model/agents.routes.php | 11 +- src/inc/apiv2/model/agentstats.routes.php | 11 +- src/inc/apiv2/model/chunks.routes.php | 15 +- src/inc/apiv2/model/configs.routes.php | 11 +- src/inc/apiv2/model/configsections.routes.php | 15 +- src/inc/apiv2/model/crackers.routes.php | 2 + src/inc/apiv2/model/crackertypes.routes.php | 2 + src/inc/apiv2/model/files.routes.php | 2 + .../model/globalpermissiongroups.routes.php | 2 + src/inc/apiv2/model/hashes.routes.php | 15 +- src/inc/apiv2/model/hashlists.routes.php | 12 +- src/inc/apiv2/model/hashtypes.routes.php | 2 + .../apiv2/model/healthcheckagents.routes.php | 14 +- src/inc/apiv2/model/healthchecks.routes.php | 2 + src/inc/apiv2/model/logentries.routes.php | 9 +- src/inc/apiv2/model/notifications.routes.php | 2 + src/inc/apiv2/model/preprocessors.routes.php | 2 + src/inc/apiv2/model/pretasks.routes.php | 6 +- src/inc/apiv2/model/speeds.routes.php | 15 +- src/inc/apiv2/model/supertasks.routes.php | 10 +- src/inc/apiv2/model/tasks.routes.php | 6 +- src/inc/apiv2/model/taskwrappers.routes.php | 9 +- src/inc/apiv2/model/users.routes.php | 2 + src/inc/apiv2/model/vouchers.routes.php | 2 + 70 files changed, 371 insertions(+), 272 deletions(-) create mode 100644 .github/workflows/phpstan.yml create mode 100644 phpstan.neon diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 3513676a0..9df7dd899 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -20,7 +20,7 @@ jobs: - db_system: postgres steps: - name: Checkout repository - uses: actions/checkout@v3 + uses: actions/checkout@v6 - name: Start Hashtopolis server uses: ./.github/actions/start-hashtopolis with: diff --git a/.github/workflows/docs-build.yml b/.github/workflows/docs-build.yml index 5a7727326..30b4bd52b 100644 --- a/.github/workflows/docs-build.yml +++ b/.github/workflows/docs-build.yml @@ -10,7 +10,7 @@ jobs: steps: - name: Check out the repository - uses: actions/checkout@v4 + uses: actions/checkout@v6 with: fetch-depth: 0 - name: Set up Python diff --git a/.github/workflows/docs.yml b/.github/workflows/docs.yml index 93f1f22af..c48e26091 100644 --- a/.github/workflows/docs.yml +++ b/.github/workflows/docs.yml @@ -10,7 +10,7 @@ jobs: steps: - name: Check out the repository - uses: actions/checkout@v4 + uses: actions/checkout@v6 with: fetch-depth: 0 - name: Set up Python diff --git a/.github/workflows/phpstan.yml b/.github/workflows/phpstan.yml new file mode 100644 index 000000000..9ea43ef2f --- /dev/null +++ b/.github/workflows/phpstan.yml @@ -0,0 +1,32 @@ +name: PHPStan + +on: + push: + branches: + - master + - dev + pull_request: + branches: + - master + - dev + +jobs: + phpstan: + runs-on: ubuntu-latest + + steps: + - name: Checkout code + uses: actions/checkout@v6 + + - name: Set up PHP + uses: shivammathur/setup-php@v2 + with: + php-version: '8.5' + tools: composer + coverage: none + + - name: Install dependencies + run: composer install --no-interaction --no-progress --prefer-dist + + - name: Run PHPStan + run: vendor/bin/phpstan analyse \ No newline at end of file diff --git a/composer.json b/composer.json index 53728bde6..f3ad2af72 100644 --- a/composer.json +++ b/composer.json @@ -32,10 +32,9 @@ "tuupola/slim-basic-auth": "^3.3" }, "require-dev": { - "jangregor/phpstan-prophecy": "^1.0.0", "phpspec/prophecy-phpunit": "^2.0", "phpstan/extension-installer": "^1.1.0", - "phpstan/phpstan": "^1.8", + "phpstan/phpstan": "^2.1", "phpunit/phpunit": "^9.5.25", "squizlabs/php_codesniffer": "^3.7" }, diff --git a/composer.lock b/composer.lock index e66c83657..e65baa43c 100644 --- a/composer.lock +++ b/composer.lock @@ -4,7 +4,7 @@ "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies", "This file is @generated automatically" ], - "content-hash": "6f8ce7872d6f4bc07dc58f3b9d468d4d", + "content-hash": "05373de718f2b591023edb0d6a9b2628", "packages": [ { "name": "composer/semver", @@ -85,27 +85,27 @@ }, { "name": "crell/api-problem", - "version": "3.7.0", + "version": "3.7.1", "source": { "type": "git", "url": "https://github.com/Crell/ApiProblem.git", - "reference": "b41d66dc1d403b2d406699e2e05bb2b48efe3b7f" + "reference": "3b52858d05736b68f08dd1e48e4235362de22831" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/Crell/ApiProblem/zipball/b41d66dc1d403b2d406699e2e05bb2b48efe3b7f", - "reference": "b41d66dc1d403b2d406699e2e05bb2b48efe3b7f", + "url": "https://api.github.com/repos/Crell/ApiProblem/zipball/3b52858d05736b68f08dd1e48e4235362de22831", + "reference": "3b52858d05736b68f08dd1e48e4235362de22831", "shasum": "" }, "require": { "php": "^7.4 || ^8.0" }, "require-dev": { - "nyholm/psr7": "^1.8", - "phpstan/phpstan": "^1.3", - "phpunit/phpunit": "^7.0 || ^8.0 || ^9.0", - "psr/http-factory": "^1.0", - "psr/http-message": "1.*" + "nyholm/psr7": "^1.8.2", + "phpstan/phpstan": "^2.1.33", + "phpunit/phpunit": "^7.0 || ^8.0 || ^9.6.31", + "psr/http-factory": "^1.1", + "psr/http-message": "^1.1" }, "suggest": { "psr/http-factory": "Common interfaces for PSR-7 HTTP message factories", @@ -144,7 +144,7 @@ ], "support": { "issues": "https://github.com/Crell/ApiProblem/issues", - "source": "https://github.com/Crell/ApiProblem/tree/3.7.0" + "source": "https://github.com/Crell/ApiProblem/tree/3.7.1" }, "funding": [ { @@ -152,7 +152,7 @@ "type": "github" } ], - "time": "2024-09-30T22:47:27+00:00" + "time": "2026-01-12T20:12:58+00:00" }, { "name": "fig/http-message-util", @@ -579,16 +579,16 @@ }, { "name": "monolog/monolog", - "version": "2.10.0", + "version": "2.11.0", "source": { "type": "git", "url": "https://github.com/Seldaek/monolog.git", - "reference": "5cf826f2991858b54d5c3809bee745560a1042a7" + "reference": "37308608e599f34a1a4845b16440047ec98a172a" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/Seldaek/monolog/zipball/5cf826f2991858b54d5c3809bee745560a1042a7", - "reference": "5cf826f2991858b54d5c3809bee745560a1042a7", + "url": "https://api.github.com/repos/Seldaek/monolog/zipball/37308608e599f34a1a4845b16440047ec98a172a", + "reference": "37308608e599f34a1a4845b16440047ec98a172a", "shasum": "" }, "require": { @@ -606,7 +606,7 @@ "graylog2/gelf-php": "^1.4.2 || ^2@dev", "guzzlehttp/guzzle": "^7.4", "guzzlehttp/psr7": "^2.2", - "mongodb/mongodb": "^1.8", + "mongodb/mongodb": "^1.8 || ^2.0", "php-amqplib/php-amqplib": "~2.4 || ^3", "phpspec/prophecy": "^1.15", "phpstan/phpstan": "^1.10", @@ -665,7 +665,7 @@ ], "support": { "issues": "https://github.com/Seldaek/monolog/issues", - "source": "https://github.com/Seldaek/monolog/tree/2.10.0" + "source": "https://github.com/Seldaek/monolog/tree/2.11.0" }, "funding": [ { @@ -677,7 +677,7 @@ "type": "tidelift" } ], - "time": "2024-11-12T12:43:37+00:00" + "time": "2026-01-01T13:05:00+00:00" }, { "name": "nikic/fast-route", @@ -1718,30 +1718,29 @@ }, { "name": "doctrine/instantiator", - "version": "2.0.0", + "version": "2.1.0", "source": { "type": "git", "url": "https://github.com/doctrine/instantiator.git", - "reference": "c6222283fa3f4ac679f8b9ced9a4e23f163e80d0" + "reference": "23da848e1a2308728fe5fdddabf4be17ff9720c7" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/doctrine/instantiator/zipball/c6222283fa3f4ac679f8b9ced9a4e23f163e80d0", - "reference": "c6222283fa3f4ac679f8b9ced9a4e23f163e80d0", + "url": "https://api.github.com/repos/doctrine/instantiator/zipball/23da848e1a2308728fe5fdddabf4be17ff9720c7", + "reference": "23da848e1a2308728fe5fdddabf4be17ff9720c7", "shasum": "" }, "require": { - "php": "^8.1" + "php": "^8.4" }, "require-dev": { - "doctrine/coding-standard": "^11", + "doctrine/coding-standard": "^14", "ext-pdo": "*", "ext-phar": "*", "phpbench/phpbench": "^1.2", - "phpstan/phpstan": "^1.9.4", - "phpstan/phpstan-phpunit": "^1.3", - "phpunit/phpunit": "^9.5.27", - "vimeo/psalm": "^5.4" + "phpstan/phpstan": "^2.1", + "phpstan/phpstan-phpunit": "^2.0", + "phpunit/phpunit": "^10.5.58" }, "type": "library", "autoload": { @@ -1768,7 +1767,7 @@ ], "support": { "issues": "https://github.com/doctrine/instantiator/issues", - "source": "https://github.com/doctrine/instantiator/tree/2.0.0" + "source": "https://github.com/doctrine/instantiator/tree/2.1.0" }, "funding": [ { @@ -1784,66 +1783,7 @@ "type": "tidelift" } ], - "time": "2022-12-30T00:23:10+00:00" - }, - { - "name": "jangregor/phpstan-prophecy", - "version": "1.0.2", - "source": { - "type": "git", - "url": "https://github.com/Jan0707/phpstan-prophecy.git", - "reference": "5ee56c7db1d58f0578c82a35e3c1befe840e85a9" - }, - "dist": { - "type": "zip", - "url": "https://api.github.com/repos/Jan0707/phpstan-prophecy/zipball/5ee56c7db1d58f0578c82a35e3c1befe840e85a9", - "reference": "5ee56c7db1d58f0578c82a35e3c1befe840e85a9", - "shasum": "" - }, - "require": { - "php": "^7.1 || ^8.0", - "phpstan/phpstan": "^1.0.0" - }, - "conflict": { - "phpspec/prophecy": "<1.7.0 || >=2.0.0", - "phpunit/phpunit": "<6.0.0 || >=12.0.0" - }, - "require-dev": { - "ergebnis/composer-normalize": "^2.1.1", - "ergebnis/license": "^1.0.0", - "ergebnis/php-cs-fixer-config": "~2.2.0", - "phpspec/prophecy": "^1.7.0", - "phpunit/phpunit": "^6.0.0 || ^7.0.0 || ^8.0.0 || ^9.0.0" - }, - "type": "phpstan-extension", - "extra": { - "phpstan": { - "includes": [ - "extension.neon" - ] - } - }, - "autoload": { - "psr-4": { - "JanGregor\\Prophecy\\": "src/" - } - }, - "notification-url": "https://packagist.org/downloads/", - "license": [ - "MIT" - ], - "authors": [ - { - "name": "Jan Gregor Emge-Triebel", - "email": "jan@jangregor.me" - } - ], - "description": "Provides a phpstan/phpstan extension for phpspec/prophecy", - "support": { - "issues": "https://github.com/Jan0707/phpstan-prophecy/issues", - "source": "https://github.com/Jan0707/phpstan-prophecy/tree/1.0.2" - }, - "time": "2024-04-03T08:15:54+00:00" + "time": "2026-01-05T06:47:08+00:00" }, { "name": "myclabs/deep-copy", @@ -2136,16 +2076,16 @@ }, { "name": "phpdocumentor/reflection-docblock", - "version": "5.6.5", + "version": "5.6.6", "source": { "type": "git", "url": "https://github.com/phpDocumentor/ReflectionDocBlock.git", - "reference": "90614c73d3800e187615e2dd236ad0e2a01bf761" + "reference": "5cee1d3dfc2d2aa6599834520911d246f656bcb8" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/phpDocumentor/ReflectionDocBlock/zipball/90614c73d3800e187615e2dd236ad0e2a01bf761", - "reference": "90614c73d3800e187615e2dd236ad0e2a01bf761", + "url": "https://api.github.com/repos/phpDocumentor/ReflectionDocBlock/zipball/5cee1d3dfc2d2aa6599834520911d246f656bcb8", + "reference": "5cee1d3dfc2d2aa6599834520911d246f656bcb8", "shasum": "" }, "require": { @@ -2155,7 +2095,7 @@ "phpdocumentor/reflection-common": "^2.2", "phpdocumentor/type-resolver": "^1.7", "phpstan/phpdoc-parser": "^1.7|^2.0", - "webmozart/assert": "^1.9.1" + "webmozart/assert": "^1.9.1 || ^2" }, "require-dev": { "mockery/mockery": "~1.3.5 || ~1.6.0", @@ -2194,9 +2134,9 @@ "description": "With this component, a library can provide support for annotations via DocBlocks or otherwise retrieve information that is embedded in a DocBlock.", "support": { "issues": "https://github.com/phpDocumentor/ReflectionDocBlock/issues", - "source": "https://github.com/phpDocumentor/ReflectionDocBlock/tree/5.6.5" + "source": "https://github.com/phpDocumentor/ReflectionDocBlock/tree/5.6.6" }, - "time": "2025-11-27T19:50:05+00:00" + "time": "2025-12-22T21:13:58+00:00" }, { "name": "phpdocumentor/type-resolver", @@ -2432,16 +2372,16 @@ }, { "name": "phpstan/phpdoc-parser", - "version": "2.3.0", + "version": "2.3.2", "source": { "type": "git", "url": "https://github.com/phpstan/phpdoc-parser.git", - "reference": "1e0cd5370df5dd2e556a36b9c62f62e555870495" + "reference": "a004701b11273a26cd7955a61d67a7f1e525a45a" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/phpstan/phpdoc-parser/zipball/1e0cd5370df5dd2e556a36b9c62f62e555870495", - "reference": "1e0cd5370df5dd2e556a36b9c62f62e555870495", + "url": "https://api.github.com/repos/phpstan/phpdoc-parser/zipball/a004701b11273a26cd7955a61d67a7f1e525a45a", + "reference": "a004701b11273a26cd7955a61d67a7f1e525a45a", "shasum": "" }, "require": { @@ -2473,21 +2413,21 @@ "description": "PHPDoc parser with support for nullable, intersection and generic types", "support": { "issues": "https://github.com/phpstan/phpdoc-parser/issues", - "source": "https://github.com/phpstan/phpdoc-parser/tree/2.3.0" + "source": "https://github.com/phpstan/phpdoc-parser/tree/2.3.2" }, - "time": "2025-08-30T15:50:23+00:00" + "time": "2026-01-25T14:56:51+00:00" }, { "name": "phpstan/phpstan", - "version": "1.12.32", + "version": "2.1.37", "dist": { "type": "zip", - "url": "https://api.github.com/repos/phpstan/phpstan/zipball/2770dcdf5078d0b0d53f94317e06affe88419aa8", - "reference": "2770dcdf5078d0b0d53f94317e06affe88419aa8", + "url": "https://api.github.com/repos/phpstan/phpstan/zipball/28cd424c5ea984128c95cfa7ea658808e8954e49", + "reference": "28cd424c5ea984128c95cfa7ea658808e8954e49", "shasum": "" }, "require": { - "php": "^7.2|^8.0" + "php": "^7.4|^8.0" }, "conflict": { "phpstan/phpstan-shim": "*" @@ -2528,7 +2468,7 @@ "type": "github" } ], - "time": "2025-09-30T10:16:31+00:00" + "time": "2026-01-24T08:21:55+00:00" }, { "name": "phpunit/php-code-coverage", @@ -2851,16 +2791,16 @@ }, { "name": "phpunit/phpunit", - "version": "9.6.31", + "version": "9.6.34", "source": { "type": "git", "url": "https://github.com/sebastianbergmann/phpunit.git", - "reference": "945d0b7f346a084ce5549e95289962972c4272e5" + "reference": "b36f02317466907a230d3aa1d34467041271ef4a" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/sebastianbergmann/phpunit/zipball/945d0b7f346a084ce5549e95289962972c4272e5", - "reference": "945d0b7f346a084ce5549e95289962972c4272e5", + "url": "https://api.github.com/repos/sebastianbergmann/phpunit/zipball/b36f02317466907a230d3aa1d34467041271ef4a", + "reference": "b36f02317466907a230d3aa1d34467041271ef4a", "shasum": "" }, "require": { @@ -2882,7 +2822,7 @@ "phpunit/php-timer": "^5.0.3", "sebastian/cli-parser": "^1.0.2", "sebastian/code-unit": "^1.0.8", - "sebastian/comparator": "^4.0.9", + "sebastian/comparator": "^4.0.10", "sebastian/diff": "^4.0.6", "sebastian/environment": "^5.1.5", "sebastian/exporter": "^4.0.8", @@ -2934,7 +2874,7 @@ "support": { "issues": "https://github.com/sebastianbergmann/phpunit/issues", "security": "https://github.com/sebastianbergmann/phpunit/security/policy", - "source": "https://github.com/sebastianbergmann/phpunit/tree/9.6.31" + "source": "https://github.com/sebastianbergmann/phpunit/tree/9.6.34" }, "funding": [ { @@ -2958,7 +2898,7 @@ "type": "tidelift" } ], - "time": "2025-12-06T07:45:52+00:00" + "time": "2026-01-27T05:45:00+00:00" }, { "name": "sebastian/cli-parser", @@ -3129,16 +3069,16 @@ }, { "name": "sebastian/comparator", - "version": "4.0.9", + "version": "4.0.10", "source": { "type": "git", "url": "https://github.com/sebastianbergmann/comparator.git", - "reference": "67a2df3a62639eab2cc5906065e9805d4fd5dfc5" + "reference": "e4df00b9b3571187db2831ae9aada2c6efbd715d" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/sebastianbergmann/comparator/zipball/67a2df3a62639eab2cc5906065e9805d4fd5dfc5", - "reference": "67a2df3a62639eab2cc5906065e9805d4fd5dfc5", + "url": "https://api.github.com/repos/sebastianbergmann/comparator/zipball/e4df00b9b3571187db2831ae9aada2c6efbd715d", + "reference": "e4df00b9b3571187db2831ae9aada2c6efbd715d", "shasum": "" }, "require": { @@ -3191,7 +3131,7 @@ ], "support": { "issues": "https://github.com/sebastianbergmann/comparator/issues", - "source": "https://github.com/sebastianbergmann/comparator/tree/4.0.9" + "source": "https://github.com/sebastianbergmann/comparator/tree/4.0.10" }, "funding": [ { @@ -3211,7 +3151,7 @@ "type": "tidelift" } ], - "time": "2025-08-10T06:51:50+00:00" + "time": "2026-01-24T09:22:56+00:00" }, { "name": "sebastian/complexity", @@ -4169,23 +4109,23 @@ }, { "name": "webmozart/assert", - "version": "1.12.1", + "version": "2.1.2", "source": { "type": "git", "url": "https://github.com/webmozarts/assert.git", - "reference": "9be6926d8b485f55b9229203f962b51ed377ba68" + "reference": "ce6a2f100c404b2d32a1dd1270f9b59ad4f57649" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/webmozarts/assert/zipball/9be6926d8b485f55b9229203f962b51ed377ba68", - "reference": "9be6926d8b485f55b9229203f962b51ed377ba68", + "url": "https://api.github.com/repos/webmozarts/assert/zipball/ce6a2f100c404b2d32a1dd1270f9b59ad4f57649", + "reference": "ce6a2f100c404b2d32a1dd1270f9b59ad4f57649", "shasum": "" }, "require": { "ext-ctype": "*", "ext-date": "*", "ext-filter": "*", - "php": "^7.2 || ^8.0" + "php": "^8.2" }, "suggest": { "ext-intl": "", @@ -4195,7 +4135,7 @@ "type": "library", "extra": { "branch-alias": { - "dev-master": "1.10-dev" + "dev-feature/2-0": "2.0-dev" } }, "autoload": { @@ -4211,6 +4151,10 @@ { "name": "Bernhard Schussek", "email": "bschussek@gmail.com" + }, + { + "name": "Woody Gilk", + "email": "woody.gilk@gmail.com" } ], "description": "Assertions to validate method input/output with nice error messages.", @@ -4221,9 +4165,9 @@ ], "support": { "issues": "https://github.com/webmozarts/assert/issues", - "source": "https://github.com/webmozarts/assert/tree/1.12.1" + "source": "https://github.com/webmozarts/assert/tree/2.1.2" }, - "time": "2025-10-29T15:56:20+00:00" + "time": "2026-01-13T14:02:24+00:00" } ], "aliases": [], diff --git a/phpstan.neon b/phpstan.neon new file mode 100644 index 000000000..3d3f345fd --- /dev/null +++ b/phpstan.neon @@ -0,0 +1,7 @@ +parameters: + paths: + - src/inc/apiv2 + level: 4 + scanDirectories: + - src/dba + - src/inc \ No newline at end of file diff --git a/src/inc/apiv2/auth/token.routes.php b/src/inc/apiv2/auth/token.routes.php index ac1f6c12c..b394d2cbc 100644 --- a/src/inc/apiv2/auth/token.routes.php +++ b/src/inc/apiv2/auth/token.routes.php @@ -16,6 +16,9 @@ function generateTokenForUser(Request $request, string $userName, int $expires) { include(dirname(__FILE__) . '/../../confv2.php'); + if (!isset($PEPPER)) { + throw new HttpError("Pepper is not set"); + } $jti = bin2hex(random_bytes(16)); $requested_scopes = $request->getParsedBody() ?: ["todo.all"]; @@ -74,6 +77,8 @@ function extractBearerToken(Request $request): ?string { } // Exchanges an oauth token for a application JWT token +use Slim\App; +/** @var App $app */ $app->group("/api/v2/auth/oauth-token", function (RouteCollectorProxy $group) { $group->post('', function (Request $request, Response $response, array $args): Response { @@ -147,6 +152,9 @@ function extractBearerToken(Request $request): ?string { $future = new DateTime("now +2 hours"); $jti = bin2hex(random_bytes(16)); + if (!isset($PEPPER)) { + throw new HttpError("Pepper is not set"); + } $secret = $PEPPER[0]; $payload = [ diff --git a/src/inc/apiv2/common/AbstractBaseAPI.class.php b/src/inc/apiv2/common/AbstractBaseAPI.class.php index 53ea182be..a7e3ed19a 100644 --- a/src/inc/apiv2/common/AbstractBaseAPI.class.php +++ b/src/inc/apiv2/common/AbstractBaseAPI.class.php @@ -63,8 +63,8 @@ abstract public static function getBaseUri(): string; abstract public function getRequiredPermissions(string $method): array; - /** @var DBA\User|null $user is currently logged in user */ - private User|null $user; + /** @var DBA\User $user is currently logged in user */ + private User $user; /** @var RouteParserInterface|null $routeParser contains routing information * which are for example used dynamic creation of _self references @@ -170,7 +170,7 @@ protected function getUpdateHandlers($id, $current_user): array { * Implementations should use $includedData to collect related resources that should be included * in the API response, such as related entities or additional data. */ - public static function aggregateData(object $object, array &$includedData = [], array $aggregateFieldsets = null): array + public static function aggregateData(object $object, array &$includedData = [], ?array $aggregateFieldsets = null): array { return []; } @@ -294,7 +294,7 @@ protected static function getModelFactory(string $model): object { case User::class: return Factory::getUserFactory(); } - assert(False, "Model '$model' cannot be mapped to Factory"); + throw new HttpError("Model '$model' cannot be mapped to Factory"); } /** @@ -559,7 +559,7 @@ protected static function json2db(array $feature, mixed $obj): ?string { /** * Convert JSON object value to DB insert value, supported by DBA * @throws NotFoundExceptionInterface - * @throws ContainerExceptionInterface, + * @throws ContainerExceptionInterface */ protected function obj2Array(object $obj): array { // Convert values to JSON supported types @@ -588,7 +588,7 @@ protected function obj2Array(object $obj): array { * @throws NotFoundExceptionInterface * @throws ContainerExceptionInterface */ - protected function obj2Resource(object $obj, array &$expandResult = [], array $sparseFieldsets = null, array $aggregateFieldsets = null): array { + protected function obj2Resource(object $obj, array &$expandResult = [], ?array $sparseFieldsets = null, ?array $aggregateFieldsets = null): array { // Convert values to JSON supported types $features = $obj->getFeatures(); $kv = $obj->getKeyValueDict(); @@ -1144,7 +1144,7 @@ protected function makeFilter(array $filters, object $apiClass): array { $qFs[] = new ContainFilter($remappedKey, $valueList, $factory, true); break; default: - assert(False, "Operator '" . $operator . "' not implemented"); + throw new HttpError("Operator '" . $operator . "' not implemented"); } if ($query_operator) { @@ -1174,6 +1174,7 @@ protected function makeOrderFilterTemplates(Request $request, array $features, s foreach ($orderings as $order) { $factory = null; $joinKey = null; + $key = null; $features_sort = $features; if (preg_match('/^(?P[-])?(?P[_a-zA-Z.]+)$/', $order, $matches)) { // Special filtering of _id to use for uniform access to model primary key @@ -1245,8 +1246,8 @@ protected function processExpands( object $object, array $expandResult, array $includedResources, - array $sparseFieldsets = null, - array $aggregateFieldsets = null + ?array $sparseFieldsets = null, + ?array $aggregateFieldsets = null ): array { // Add missing expands to expands in case they have been added in aggregateData() @@ -1347,7 +1348,7 @@ protected function validatePermissions(array $required_perms, array $permsExpand $missingPermissionMatching = true; // if we also have permissions from expanded entries we need to check them as well - if (count($permsExpandMatching) && $this instanceof AbstractModelAPI) { + if (count($permsExpandMatching)) { foreach ($missing_permissions as $missing_permission) { $expands = $permsExpandMatching[$missing_permission]; foreach ($expands as $expand) { @@ -1577,9 +1578,9 @@ protected static function getOneResource(object $apiClass, object $object, Reque $body = $response->getBody(); $body->write($apiClass->ret2json($ret)); - return $response->withStatus($statusCode) - ->withHeader("Content-Type", "application/vnd.api+json") - ->withHeader("Location", $dataResources[0]["links"]["self"]); + return $response->withHeader("Content-Type", "application/vnd.api+json") + ->withHeader("Location", $dataResources[0]["links"]["self"]) + ->withStatus($statusCode); //for location we use links value from $dataresources because if we use $linksSelf, the wrong location gets returned in //case of a POST request } @@ -1589,12 +1590,12 @@ protected static function getOneResource(object $apiClass, object $object, Reque /** * @throws JsonException */ - protected static function getMetaResponse(array $meta, Request $request, Response $response, int $statusCode = 200): MessageInterface|Response { + protected static function getMetaResponse(array $meta, Request $request, Response $response, int $statusCode = 200): Response { $ret = self::createJsonResponse(meta: $meta); $body = $response->getBody(); $body->write(self::ret2json($ret)); - return $response->withStatus($statusCode)->withHeader("Content-Type", "application/vnd.api+json"); + return $response->withHeader("Content-Type", "application/vnd.api+json")->withStatus($statusCode); } /** diff --git a/src/inc/apiv2/common/AbstractHelperAPI.class.php b/src/inc/apiv2/common/AbstractHelperAPI.class.php index 99d9064c6..8ad531479 100644 --- a/src/inc/apiv2/common/AbstractHelperAPI.class.php +++ b/src/inc/apiv2/common/AbstractHelperAPI.class.php @@ -6,6 +6,7 @@ use Psr\Http\Message\MessageInterface; use Psr\Http\Message\ResponseInterface as Response; use Psr\Http\Message\ServerRequestInterface as Request; +use Slim\App; use Slim\Exception\HttpForbiddenException; abstract class AbstractHelperAPI extends AbstractBaseAPI { @@ -69,14 +70,15 @@ public function processPost(Request $request, Response $response, array $args): } elseif (is_array($newObject)) { return self::getMetaResponse($newObject, $request, $response); + } else { + throw new HttpError("Unable to process request!"); } - throw new HttpError("Unable to process request!"); } /** * Override-able registering of options */ - static public function register($app): void { + static public function register(App $app): void { $me = get_called_class(); $baseUri = $me::getBaseUri(); @@ -131,13 +133,13 @@ protected function handleRangeRequest(int &$start, int &$end, int &$size, &$fp): return false; } if ($range == '-') { - $c_start = $size - substr($range, 1); + $c_start = $size - (int) substr($range, 1); } else { $range = explode('-', $range); - $c_start = $range[0]; + $c_start = (int) $range[0]; if ((isset($range[1]) && is_numeric($range[1]))) { - $c_end = $range[1]; + $c_end = (int) $range[1]; } else { $c_end = $size; diff --git a/src/inc/apiv2/common/AbstractModelAPI.class.php b/src/inc/apiv2/common/AbstractModelAPI.class.php index 0da840ab2..faaec7f4c 100644 --- a/src/inc/apiv2/common/AbstractModelAPI.class.php +++ b/src/inc/apiv2/common/AbstractModelAPI.class.php @@ -6,6 +6,7 @@ use Psr\Http\Message\ResponseInterface as Response; use Psr\Http\Message\ServerRequestInterface as Request; +use Slim\App; use DBA\AbstractModelFactory; use DBA\Aggregation; use DBA\JoinFilter; @@ -379,7 +380,7 @@ public function deleteOne(Request $request, Response $response, array $args): Re * @throws ResourceNotFoundError * @throws HttpForbidden */ - protected function doFetch(string $pk, AbstractModelFactory $otherFactory = null): mixed { + protected function doFetch(string $pk, ?AbstractModelFactory $otherFactory = null): mixed { if ($otherFactory != null) { $object = $otherFactory->get($pk); } @@ -545,7 +546,9 @@ protected static function getMinMaxCursor($apiClass, string $sort, array $filter } } $filters[Factory::ORDER] = $orderFilters; - $filters[Factory::JOIN] = $joinFilters; + if (!empty($joinFilters)) { + $filters[Factory::JOIN] = $joinFilters; + } $factory = $apiClass->getFactory(); $result = $factory->filter($filters); //handle joined queries @@ -692,7 +695,7 @@ public static function getManyResources(object $apiClass, Request $request, Resp //pagination filters need to be added after max has been calculated $finalFs[Factory::LIMIT] = new LimitFilter($pageSize); - if (isset($paginationCursor)) { + if (isset($paginationCursor) && isset($operator)) { $decoded_cursor = $apiClass->decode_cursor($paginationCursor); $primary_cursor = $decoded_cursor["primary"]; $primary_cursor_key = key($primary_cursor); @@ -984,14 +987,15 @@ public function getOne(Request $request, Response $response, array $args): Respo * API entry point for modification of single object * @param Request $request * @param Response $response - * @param array $args + * @param mixed $object + * @param mixed $data * @return Response * @throws HTException * @throws HttpError * @throws HttpForbidden * @throws ResourceNotFoundError */ - public function patchSingleObject(Request $request, Response $response, mixed $object, mixed $data) { + public function patchSingleObject(Request $request, Response $response, mixed $object, mixed $data): Response { if (!$this->validateResourceRecord($data)) { return errorResponse($response, "No valid resource identifier object was given as data!", 403); } @@ -1711,6 +1715,7 @@ public function deleteToManyRelationshipLink(Request $request, Response $respons } } else { + $updates = []; foreach ($data as $item) { if (!$this->validateResourceRecord($item)) { $encoded_item = json_encode($item); @@ -1800,7 +1805,7 @@ final public function getPatchValidFeatures(): array { /** * Override-able registering of options */ - static public function register($app): void { + static public function register(App $app): void { $me = get_called_class(); $baseUri = $me::getBaseUri(); $baseUriOne = $baseUri . '/{id:[0-9]+}'; diff --git a/src/inc/apiv2/common/ErrorHandler.class.php b/src/inc/apiv2/common/ErrorHandler.class.php index b25f95e73..f73c7ada1 100644 --- a/src/inc/apiv2/common/ErrorHandler.class.php +++ b/src/inc/apiv2/common/ErrorHandler.class.php @@ -1,11 +1,10 @@ setStatus($status); diff --git a/src/inc/apiv2/common/openAPISchema.routes.php b/src/inc/apiv2/common/openAPISchema.routes.php index 8d7f03970..be678bb25 100644 --- a/src/inc/apiv2/common/openAPISchema.routes.php +++ b/src/inc/apiv2/common/openAPISchema.routes.php @@ -61,7 +61,7 @@ function typeLookup($feature): array { ; -function parsePhpDoc($doc): array|string|null { +function parsePhpDoc($doc): array|string { $cleanedDoc = preg_replace([ '/^\/\*\*/', // Remove opening /** '/\*\/$/', // Remove closing */ @@ -351,6 +351,8 @@ function makeDescription($isRelation, $method, $singleObject): string { return $description; } +use Slim\App; +/** @var App $app */ $app->group("/api/v2/openapi.json", function (RouteCollectorProxy $group) use ($app) { /* Allow CORS preflight requests */ $group->options('', function (Request $request, Response $response): Response { @@ -536,6 +538,9 @@ function makeDescription($isRelation, $method, $singleObject): string { $isToMany = array_key_exists($relation, $class::getToManyRelationships()); $isToOne = array_key_exists($relation, $class::getToOneRelationships()); assert(!($isToMany && $isToOne), "An relationship cant be a to one and to many at the same time."); + } else { + $isToMany = $isToOne = false; + $relation = null; } $expandables = implode(",", $class->getExpandables()); @@ -584,7 +589,7 @@ function makeDescription($isRelation, $method, $singleObject): string { $json_api_header = makeJsonApiHeader(); $links = makeLinks($uri); $properties_return_post_patch = array_merge($json_api_header, $properties_return_post_patch); - $properties_create = buildPatchPost(makeProperties($class->getAllPostParameters($class->getCreateValidFeatures(), true)), $name); + $properties_create = buildPatchPost(makeProperties($class->getAllPostParameters($class->getCreateValidFeatures())), $name); $properties_get = array_merge($json_api_header, $links, $properties_get_single, $included); $properties_patch = buildPatchPost(makeProperties($class->getPatchValidFeatures(), true), $name); $properties_patch_post_relation = buildPostPatchRelation($relation, ($isToMany && !$isToOne)); diff --git a/src/inc/apiv2/helper/abortChunk.routes.php b/src/inc/apiv2/helper/abortChunk.routes.php index d2e006ba0..aff67874b 100644 --- a/src/inc/apiv2/helper/abortChunk.routes.php +++ b/src/inc/apiv2/helper/abortChunk.routes.php @@ -42,4 +42,6 @@ public function actionPost(array $data): object|array|null { } } +use Slim\App; +/** @var App $app */ AbortChunkHelperAPI::register($app); \ No newline at end of file diff --git a/src/inc/apiv2/helper/assignAgent.routes.php b/src/inc/apiv2/helper/assignAgent.routes.php index df227afff..d91add758 100644 --- a/src/inc/apiv2/helper/assignAgent.routes.php +++ b/src/inc/apiv2/helper/assignAgent.routes.php @@ -45,4 +45,6 @@ public function actionPost($data): object|array|null { } } +use Slim\App; +/** @var App $app */ AssignAgentHelperAPI::register($app); \ No newline at end of file diff --git a/src/inc/apiv2/helper/bulkSupertaskBuilder.routes.php b/src/inc/apiv2/helper/bulkSupertaskBuilder.routes.php index 1fc5e52a8..b07ade2e2 100644 --- a/src/inc/apiv2/helper/bulkSupertaskBuilder.routes.php +++ b/src/inc/apiv2/helper/bulkSupertaskBuilder.routes.php @@ -45,4 +45,6 @@ public function actionPost($data): object|array|null { } } +use Slim\App; +/** @var App $app */ BulkSupertaskBuilderHelperAPI::register($app); \ No newline at end of file diff --git a/src/inc/apiv2/helper/changeOwnPassword.routes.php b/src/inc/apiv2/helper/changeOwnPassword.routes.php index aae4747e2..60344f654 100644 --- a/src/inc/apiv2/helper/changeOwnPassword.routes.php +++ b/src/inc/apiv2/helper/changeOwnPassword.routes.php @@ -46,4 +46,6 @@ public function actionPost($data): object|array|null { } } +use Slim\App; +/** @var App $app */ ChangeOwnPasswordHelperAPI::register($app); \ No newline at end of file diff --git a/src/inc/apiv2/helper/createSuperHashlist.routes.php b/src/inc/apiv2/helper/createSuperHashlist.routes.php index 6aedd4b64..20bce869a 100644 --- a/src/inc/apiv2/helper/createSuperHashlist.routes.php +++ b/src/inc/apiv2/helper/createSuperHashlist.routes.php @@ -65,4 +65,6 @@ public function actionPost($data): object|array|null { } } +use Slim\App; +/** @var App $app */ CreateSuperHashlistHelperAPI::register($app); \ No newline at end of file diff --git a/src/inc/apiv2/helper/createSupertask.routes.php b/src/inc/apiv2/helper/createSupertask.routes.php index 554453073..cc7e681e0 100644 --- a/src/inc/apiv2/helper/createSupertask.routes.php +++ b/src/inc/apiv2/helper/createSupertask.routes.php @@ -71,4 +71,6 @@ public function actionPost($data): object|array|null { } } +use Slim\App; +/** @var App $app */ CreateSupertaskHelperAPI::register($app); \ No newline at end of file diff --git a/src/inc/apiv2/helper/currentUser.routes.php b/src/inc/apiv2/helper/currentUser.routes.php index 42ca06b44..4cb385728 100644 --- a/src/inc/apiv2/helper/currentUser.routes.php +++ b/src/inc/apiv2/helper/currentUser.routes.php @@ -1,6 +1,5 @@ getKeyspaceProgress(); $keyspace = max($task->getKeyspace(), 1); @@ -222,4 +221,6 @@ static public function register($app): void { } } +use Slim\App; +/** @var App $app */ GetTaskProgressImageHelperAPI::register($app); \ No newline at end of file diff --git a/src/inc/apiv2/helper/getUserPermission.routes.php b/src/inc/apiv2/helper/getUserPermission.routes.php index 6de07efba..04ce44fce 100644 --- a/src/inc/apiv2/helper/getUserPermission.routes.php +++ b/src/inc/apiv2/helper/getUserPermission.routes.php @@ -1,7 +1,6 @@ withHeader("Content-Type", 'application/vnd.api+json;'); } - #[NoReturn] public function actionPost($data): object|array|null { - assert(False, "GetAccessGroups has no POST"); + public function actionPost($data): object|array|null { + throw new HttpError("GetAccessGroups has no POST"); } static public function register($app): void { @@ -70,4 +69,6 @@ public static function getResponse(): array|string|null { } } +use Slim\App; +/** @var App $app */ GetUserPermissionHelperAPI::register($app); diff --git a/src/inc/apiv2/helper/importCrackedHashes.routes.php b/src/inc/apiv2/helper/importCrackedHashes.routes.php index 5c2ca9ee7..c1a4755bc 100644 --- a/src/inc/apiv2/helper/importCrackedHashes.routes.php +++ b/src/inc/apiv2/helper/importCrackedHashes.routes.php @@ -66,4 +66,6 @@ public function actionPost($data): object|array|null { } } +use Slim\App; +/** @var App $app */ ImportCrackedHashesHelperAPI::register($app); \ No newline at end of file diff --git a/src/inc/apiv2/helper/importFile.routes.php b/src/inc/apiv2/helper/importFile.routes.php index 862776034..4ad5b01ec 100644 --- a/src/inc/apiv2/helper/importFile.routes.php +++ b/src/inc/apiv2/helper/importFile.routes.php @@ -6,6 +6,7 @@ use Random\RandomException; use Slim\Routing\RouteCollectorProxy; use DBA\Factory; +use Slim\App; /* Default timeout interval for considering an upload stale/incomplete */ const DEFAULT_UPLOAD_EXPIRES_TIMEOUT = 3600; @@ -157,8 +158,8 @@ function processPost(Request $request, Response $response, array $args): Respons $update_metadata = []; $list = explode(",", $update["upload_metadata_raw"]); foreach ($list as $item) { - list($key, $b64val) = explode(" ", $item); - if (!isset($b64val)) { + list($key, $b64val) = explode(" ", $item, 2); + if ($b64val == null) { $response->getBody()->write("Error Upload-Metadata, should be a key value pair that is separated by a space, no value has been provided"); return $response->withStatus(400); } @@ -183,7 +184,7 @@ function processPost(Request $request, Response $response, array $args): Respons else { $id = bin2hex(random_bytes(16)); } - $update["upload_metadata"] = $update_metadata; + $update["upload_metadata"] = $update_metadata ?? null; if ($request->hasHeader('Upload-Defer-Length') && $request->hasHeader('Upload-Length')) { $response->getBody()->write('Error: Cannot provide both Upload-Length and Upload-Defer-Length'); @@ -295,11 +296,11 @@ function processPatch(Request $request, Response $response, array $args): Respon $chunkHash = base64_encode(sha1($chunk, true)); break; case "crc32": - $chunkHash = base64_encode(crc32($chunk, true)); + $chunkHash = base64_encode(crc32($chunk)); break; default: /* Since algorithms are checked in regex, this should never happen */ - assert(False); + throw new HttpError("Hash algorithm not supported"); } if ($chunkHash != $incomingHash) { @@ -367,6 +368,7 @@ function processDelete(Request $request, Response $response, array $args): Respo $filename_meta = self::getMetaPath($args['id']); $uploadExists = file_exists($filename_upload); $metaExists = file_exists($filename_meta); + $isDeletedMeta = $isDeletedUpload = false; if (!$uploadExists && !$metaExists) { throw new HttpError("Upload ID doesnt exists"); } @@ -412,7 +414,7 @@ function processGet(Request $request, Response $response, array $args): Response } - static public function register($app): void { + static public function register(App $app): void { $me = get_called_class(); $baseUri = $me::getBaseUri(); @@ -445,4 +447,5 @@ static public function register($app): void { } } +/** @var App $app */ ImportFileHelperAPI::register($app); diff --git a/src/inc/apiv2/helper/maskSupertaskBuilder.routes.php b/src/inc/apiv2/helper/maskSupertaskBuilder.routes.php index 1cd70e651..5e702b4ff 100644 --- a/src/inc/apiv2/helper/maskSupertaskBuilder.routes.php +++ b/src/inc/apiv2/helper/maskSupertaskBuilder.routes.php @@ -44,4 +44,6 @@ public function actionPost($data): object|array|null { } } +use Slim\App; +/** @var App $app */ MaskSupertaskBuilderHelperAPI::register($app); \ No newline at end of file diff --git a/src/inc/apiv2/helper/purgeTask.routes.php b/src/inc/apiv2/helper/purgeTask.routes.php index 00cc39889..4bba08f1b 100644 --- a/src/inc/apiv2/helper/purgeTask.routes.php +++ b/src/inc/apiv2/helper/purgeTask.routes.php @@ -43,4 +43,6 @@ public function actionPost($data): object|array|null { } } +use Slim\App; +/** @var App $app */ PurgeTaskHelperAPI::register($app); \ No newline at end of file diff --git a/src/inc/apiv2/helper/rebuildChunkCache.routes.php b/src/inc/apiv2/helper/rebuildChunkCache.routes.php index 224d219b1..dfa3e6d2f 100644 --- a/src/inc/apiv2/helper/rebuildChunkCache.routes.php +++ b/src/inc/apiv2/helper/rebuildChunkCache.routes.php @@ -44,4 +44,6 @@ public function actionPost($data): object|array|null { } } +use Slim\App; +/** @var App $app */ RebuildChunkCacheHelperAPI::register($app); diff --git a/src/inc/apiv2/helper/recountFileLines.routes.php b/src/inc/apiv2/helper/recountFileLines.routes.php index 80fe8e25c..1427321d6 100644 --- a/src/inc/apiv2/helper/recountFileLines.routes.php +++ b/src/inc/apiv2/helper/recountFileLines.routes.php @@ -50,4 +50,6 @@ public function actionPost($data): object|array|null { } } +use Slim\App; +/** @var App $app */ RecountFileLinesHelperAPI::register($app); \ No newline at end of file diff --git a/src/inc/apiv2/helper/rescanGlobalFiles.routes.php b/src/inc/apiv2/helper/rescanGlobalFiles.routes.php index fd7f537d1..d24068fec 100644 --- a/src/inc/apiv2/helper/rescanGlobalFiles.routes.php +++ b/src/inc/apiv2/helper/rescanGlobalFiles.routes.php @@ -42,4 +42,6 @@ public function actionPost($data): object|array|null { } } +use Slim\App; +/** @var App $app */ RescanGlobalFilesHelperAPI::register($app); diff --git a/src/inc/apiv2/helper/resetChunk.routes.php b/src/inc/apiv2/helper/resetChunk.routes.php index 13a6e2eac..373fabc49 100644 --- a/src/inc/apiv2/helper/resetChunk.routes.php +++ b/src/inc/apiv2/helper/resetChunk.routes.php @@ -41,4 +41,6 @@ public function actionPost(array $data): object|array|null { } } +use Slim\App; +/** @var App $app */ ResetChunkHelperAPI::register($app); \ No newline at end of file diff --git a/src/inc/apiv2/helper/resetUserPassword.routes.php b/src/inc/apiv2/helper/resetUserPassword.routes.php index e75bc7488..aa9339eb9 100644 --- a/src/inc/apiv2/helper/resetUserPassword.routes.php +++ b/src/inc/apiv2/helper/resetUserPassword.routes.php @@ -43,4 +43,6 @@ public function actionPost($data): array|null { } } +use Slim\App; +/** @var App $app */ ResetUserPasswordHelperAPI::register($app); diff --git a/src/inc/apiv2/helper/searchHashes.routes.php b/src/inc/apiv2/helper/searchHashes.routes.php index b420c677d..fb32100d6 100644 --- a/src/inc/apiv2/helper/searchHashes.routes.php +++ b/src/inc/apiv2/helper/searchHashes.routes.php @@ -160,7 +160,7 @@ public function actionPost($data): object|array|null { $qF1 = new LikeFilterInsensitive(Hash::PLAINTEXT, "%" . $searchEntry . "%"); $qF2 = new ContainFilter(Hash::HASHLIST_ID, Util::arrayOfIds($userHashlists), Factory::getHashFactory()); $joined2 = Factory::getHashFactory()->filter([Factory::FILTER => [$qF1, $qF2], Factory::JOIN => $jF]); - /** @var $hashes Hash[] */ + /** @var Hash[] $hashes */ $hashes = $joined2[Factory::getHashFactory()->getModelName()]; for ($i = 0; $i < sizeof($hashes); $i++) { $joined[Factory::getHashFactory()->getModelName()][] = $joined2[Factory::getHashFactory()->getModelName()][$i]; @@ -168,7 +168,7 @@ public function actionPost($data): object|array|null { } $resultEntry = []; - /** @var $hashes Hash[] */ + /** @var Hash[] $hashes */ $hashes = $joined[Factory::getHashFactory()->getModelName()]; if (empty($hashes)) { $resultEntry["found"] = false; @@ -179,7 +179,7 @@ public function actionPost($data): object|array|null { $resultEntry["query"] = $searchEntry; $matches = []; for ($i = 0; $i < sizeof($hashes); $i++) { - /** @var $hash Hash */ + /** @var Hash $hash */ $hash = $joined[Factory::getHashFactory()->getModelName()][$i]; $hashlist = $joined[Factory::getHashlistFactory()->getModelName()][$i]; $hashResource = self::obj2Resource($hash); @@ -196,4 +196,6 @@ public function actionPost($data): object|array|null { } } +use Slim\App; +/** @var App $app */ SearchHashesHelperAPI::register($app); \ No newline at end of file diff --git a/src/inc/apiv2/helper/setUserPassword.routes.php b/src/inc/apiv2/helper/setUserPassword.routes.php index c8faa04a9..80985ce70 100644 --- a/src/inc/apiv2/helper/setUserPassword.routes.php +++ b/src/inc/apiv2/helper/setUserPassword.routes.php @@ -49,4 +49,6 @@ public function actionPost($data): object|array|null { } } +use Slim\App; +/** @var App $app */ SetUserPasswordHelperAPI::register($app); \ No newline at end of file diff --git a/src/inc/apiv2/helper/taskExtraDetails.routes.php b/src/inc/apiv2/helper/taskExtraDetails.routes.php index b471827fe..a939f606f 100644 --- a/src/inc/apiv2/helper/taskExtraDetails.routes.php +++ b/src/inc/apiv2/helper/taskExtraDetails.routes.php @@ -4,7 +4,6 @@ use DBA\Chunk; use DBA\Factory; use DBA\QueryFilter; -use JetBrains\PhpStorm\NoReturn; use Middlewares\Utils\HttpErrorException; use Psr\Container\ContainerExceptionInterface; use Psr\Container\NotFoundExceptionInterface; @@ -86,8 +85,8 @@ public function handleGet(Request $request, Response $response): Response { return self::getMetaResponse($responseObject, $request, $response); } - #[NoReturn] public function actionPost($data): object|array|null { - assert(false, "TaskExtraDetails has no POST"); + public function actionPost($data): object|array|null { + throw new HttpError("TaskExtraDetails has no POST"); } static public function register($app): void { @@ -108,4 +107,6 @@ public static function getResponse(): array|string|null { } } +use Slim\App; +/** @var App $app */ TaskExtraDetailsHelper::register($app); diff --git a/src/inc/apiv2/helper/unassignAgent.routes.php b/src/inc/apiv2/helper/unassignAgent.routes.php index 48474a27e..56e0ef20e 100644 --- a/src/inc/apiv2/helper/unassignAgent.routes.php +++ b/src/inc/apiv2/helper/unassignAgent.routes.php @@ -42,4 +42,6 @@ public function actionPost($data): object|array|null { } } +use Slim\App; +/** @var App $app */ UnassignAgentHelperAPI::register($app); \ No newline at end of file diff --git a/src/inc/apiv2/model/accessgroups.routes.php b/src/inc/apiv2/model/accessgroups.routes.php index 8b8329cb5..91e6a8bdb 100644 --- a/src/inc/apiv2/model/accessgroups.routes.php +++ b/src/inc/apiv2/model/accessgroups.routes.php @@ -65,4 +65,6 @@ protected function deleteObject(object $object): void { } } +use Slim\App; +/** @var App $app */ AccessGroupAPI::register($app); diff --git a/src/inc/apiv2/model/agentassignments.routes.php b/src/inc/apiv2/model/agentassignments.routes.php index d3006d6a5..71b11a7c8 100644 --- a/src/inc/apiv2/model/agentassignments.routes.php +++ b/src/inc/apiv2/model/agentassignments.routes.php @@ -98,4 +98,6 @@ protected function deleteObject(object $object): void { } } +use Slim\App; +/** @var App $app */ AgentAssignmentAPI::register($app); \ No newline at end of file diff --git a/src/inc/apiv2/model/agentbinaries.routes.php b/src/inc/apiv2/model/agentbinaries.routes.php index d4f852a61..878701584 100644 --- a/src/inc/apiv2/model/agentbinaries.routes.php +++ b/src/inc/apiv2/model/agentbinaries.routes.php @@ -49,4 +49,6 @@ protected function getUpdateHandlers($id, $current_user): array { } } +use Slim\App; +/** @var App $app */ AgentBinaryAPI::register($app); \ No newline at end of file diff --git a/src/inc/apiv2/model/agenterrors.routes.php b/src/inc/apiv2/model/agenterrors.routes.php index 305c4bcc1..a5380bf9f 100644 --- a/src/inc/apiv2/model/agenterrors.routes.php +++ b/src/inc/apiv2/model/agenterrors.routes.php @@ -9,7 +9,6 @@ use DBA\Factory; use DBA\TaskWrapper; use DBA\User; -use JetBrains\PhpStorm\NoReturn; require_once(dirname(__FILE__) . "/../common/AbstractModelAPI.class.php"); @@ -65,12 +64,12 @@ protected function getFilterACL(): array { ]; } - #[NoReturn] protected function createObject(array $data): int { - assert(False, "AgentErrors cannot be created via API"); + protected function createObject(array $data): int { + throw new HttpError("AgentErrors cannot be created via API"); } - #[NoReturn] public function updateObject(int $objectId, array $data): void { - assert(False, "AgentErrors cannot be updated via API"); + public function updateObject(int $objectId, array $data): void { + throw new HttpError("AgentErrors cannot be updated via API"); } protected function deleteObject(object $object): void { @@ -78,4 +77,6 @@ protected function deleteObject(object $object): void { } } +use Slim\App; +/** @var App $app */ AgentErrorAPI::register($app); \ No newline at end of file diff --git a/src/inc/apiv2/model/agents.routes.php b/src/inc/apiv2/model/agents.routes.php index d6f76963b..f75dae5a3 100644 --- a/src/inc/apiv2/model/agents.routes.php +++ b/src/inc/apiv2/model/agents.routes.php @@ -14,7 +14,6 @@ use DBA\QueryFilter; use DBA\Task; use DBA\User; -use JetBrains\PhpStorm\NoReturn; require_once(dirname(__FILE__) . "/../common/AbstractModelAPI.class.php"); @@ -44,10 +43,10 @@ protected function getUpdateHandlers($id, $current_user): array { * $included_data. * * @param object $object the agent object were data is aggregated from - * @param array &$includedData + * @param array &$included_data * @return array not used here */ - static function aggregateData(object $object, array &$included_data = [], array $aggregateFieldsets = null): array { + static function aggregateData(object $object, array &$included_data = [], ?array $aggregateFieldsets = null): array { $agentId = $object->getId(); $qFs = []; $qFs[] = new QueryFilter(Chunk::AGENT_ID, $agentId, "="); @@ -140,8 +139,8 @@ public static function getToOneRelationships(): array { ]; } - #[NoReturn] protected function createObject(array $data): int { - assert(False, "Agents cannot be created via API"); + protected function createObject(array $data): int { + throw new HttpError("Agents cannot be created via API"); } /** @@ -152,4 +151,6 @@ protected function deleteObject(object $object): void { } } +use Slim\App; +/** @var App $app */ AgentAPI::register($app); diff --git a/src/inc/apiv2/model/agentstats.routes.php b/src/inc/apiv2/model/agentstats.routes.php index 5e9caac59..1c36196f1 100644 --- a/src/inc/apiv2/model/agentstats.routes.php +++ b/src/inc/apiv2/model/agentstats.routes.php @@ -7,7 +7,6 @@ use DBA\AgentStat; use DBA\JoinFilter; use DBA\User; -use JetBrains\PhpStorm\NoReturn; require_once(dirname(__FILE__) . "/../common/AbstractModelAPI.class.php"); @@ -46,12 +45,12 @@ protected function getFilterACL(): array { ]; } - #[NoReturn] protected function createObject(array $data): int { - assert(False, "AgentStats cannot be created via API"); + protected function createObject(array $data): int { + throw new HttpError("AgentStats cannot be created via API"); } - #[NoReturn] public function updateObject(int $objectId, array $data): void { - assert(False, "AgentStats cannot be updated via API"); + public function updateObject(int $objectId, array $data): void { + throw new HttpError("AgentStats cannot be updated via API"); } protected function deleteObject(object $object): void { @@ -59,4 +58,6 @@ protected function deleteObject(object $object): void { } } +use Slim\App; +/** @var App $app */ AgentStatAPI::register($app); \ No newline at end of file diff --git a/src/inc/apiv2/model/chunks.routes.php b/src/inc/apiv2/model/chunks.routes.php index a217d76f3..83bd91c93 100644 --- a/src/inc/apiv2/model/chunks.routes.php +++ b/src/inc/apiv2/model/chunks.routes.php @@ -12,7 +12,6 @@ use DBA\Task; use DBA\TaskWrapper; use DBA\User; -use JetBrains\PhpStorm\NoReturn; require_once(dirname(__FILE__) . "/../common/AbstractModelAPI.class.php"); @@ -77,17 +76,19 @@ public static function getToOneRelationships(): array { ]; } - #[NoReturn] protected function createObject(array $data): int { - assert(False, "Chunks cannot be created via API"); + protected function createObject(array $data): int { + throw new HttpError("Chunks cannot be created via API"); } - #[NoReturn] public function updateObject(int $objectId, array $data): void { - assert(False, "Chunks cannot be updated via API"); + public function updateObject(int $objectId, array $data): void { + throw new HttpError("Chunks cannot be updated via API"); } - #[NoReturn] protected function deleteObject(object $object): void { - assert(False, "Chunks cannot be deleted via API"); + protected function deleteObject(object $object): void { + throw new HttpError("Chunks cannot be deleted via API"); } } +use Slim\App; +/** @var App $app */ ChunkAPI::register($app); \ No newline at end of file diff --git a/src/inc/apiv2/model/configs.routes.php b/src/inc/apiv2/model/configs.routes.php index bbab7f121..c4ddf3461 100644 --- a/src/inc/apiv2/model/configs.routes.php +++ b/src/inc/apiv2/model/configs.routes.php @@ -2,7 +2,6 @@ use DBA\Config; use DBA\ConfigSection; -use JetBrains\PhpStorm\NoReturn; require_once(dirname(__FILE__) . "/../common/AbstractModelAPI.class.php"); @@ -31,12 +30,12 @@ public static function getToOneRelationships(): array { ]; } - #[NoReturn] protected function createObject(array $data): int { - assert(False, "Configs cannot be created via API"); + protected function createObject(array $data): int { + throw new HttpError("Configs cannot be created via API"); } - #[NoReturn] protected function deleteObject(object $object): void { - assert(False, "Configs cannot be deleted via API"); + protected function deleteObject(object $object): void { + throw new HttpError("Configs cannot be deleted via API"); } /** @@ -47,4 +46,6 @@ protected function updateObjects(array $objects): void { } } +use Slim\App; +/** @var App $app */ ConfigAPI::register($app); \ No newline at end of file diff --git a/src/inc/apiv2/model/configsections.routes.php b/src/inc/apiv2/model/configsections.routes.php index 60b0bfc96..133729c9b 100644 --- a/src/inc/apiv2/model/configsections.routes.php +++ b/src/inc/apiv2/model/configsections.routes.php @@ -1,7 +1,6 @@ fn($value) => HashListUtils::setArchived($id, $value, $current_user), - Hashlist::NOTES => fn($value) => HashListUtils::editNotes($id, $value, $current_user), - Hashlist::IS_SECRET => fn($value) => HashListUtils::setSecret($id, $value, $current_user), - Hashlist::HASHLIST_NAME => fn($value) => HashListUtils::rename($id, $value, $current_user), - Hashlist::ACCESS_GROUP_ID => fn($value) => HashListUtils::changeAccessGroup($id, $value, $current_user) + Hashlist::IS_ARCHIVED => fn($value) => HashlistUtils::setArchived($id, $value, $current_user), + Hashlist::NOTES => fn($value) => HashlistUtils::editNotes($id, $value, $current_user), + Hashlist::IS_SECRET => fn($value) => HashlistUtils::setSecret($id, $value, $current_user), + Hashlist::HASHLIST_NAME => fn($value) => HashlistUtils::rename($id, $value, $current_user), + Hashlist::ACCESS_GROUP_ID => fn($value) => HashlistUtils::changeAccessGroup($id, $value, $current_user) ]; } } +use Slim\App; +/** @var App $app */ HashlistAPI::register($app); \ No newline at end of file diff --git a/src/inc/apiv2/model/hashtypes.routes.php b/src/inc/apiv2/model/hashtypes.routes.php index c83d94c6d..8cd48512e 100644 --- a/src/inc/apiv2/model/hashtypes.routes.php +++ b/src/inc/apiv2/model/hashtypes.routes.php @@ -37,4 +37,6 @@ protected function deleteObject(object $object): void { } } +use Slim\App; +/** @var App $app */ HashTypeAPI::register($app); \ No newline at end of file diff --git a/src/inc/apiv2/model/healthcheckagents.routes.php b/src/inc/apiv2/model/healthcheckagents.routes.php index eea339fac..5c9832716 100644 --- a/src/inc/apiv2/model/healthcheckagents.routes.php +++ b/src/inc/apiv2/model/healthcheckagents.routes.php @@ -65,18 +65,20 @@ public static function getToOneRelationships(): array { ]; } - #[NoReturn] protected function createObject(array $object): int { - assert(False, "HealthCheckAgents cannot be created via API"); + protected function createObject(array $object): int { + throw new HttpError("HealthCheckAgents cannot be created via API"); } - #[NoReturn] public function updateObject(int $objectId, array $data): void { - assert(False, "HealthCheckAgents cannot be updated via API"); + public function updateObject(int $objectId, array $data): void { + throw new HttpError("HealthCheckAgents cannot be updated via API"); } - #[NoReturn] protected function deleteObject(object $object): void { + protected function deleteObject(object $object): void { /* Dummy code to implement abstract functions */ - assert(False, "HealthCheckAgents cannot be deleted via API"); + throw new HttpError("HealthCheckAgents cannot be deleted via API"); } } +use Slim\App; +/** @var App $app */ HealthCheckAgentAPI::register($app); \ No newline at end of file diff --git a/src/inc/apiv2/model/healthchecks.routes.php b/src/inc/apiv2/model/healthchecks.routes.php index 2a49e1f6f..3d4a71289 100644 --- a/src/inc/apiv2/model/healthchecks.routes.php +++ b/src/inc/apiv2/model/healthchecks.routes.php @@ -67,4 +67,6 @@ protected function deleteObject(object $object): void { } } +use Slim\App; +/** @var App $app */ HealthCheckAPI::register($app); \ No newline at end of file diff --git a/src/inc/apiv2/model/logentries.routes.php b/src/inc/apiv2/model/logentries.routes.php index a05241fbd..97795b542 100644 --- a/src/inc/apiv2/model/logentries.routes.php +++ b/src/inc/apiv2/model/logentries.routes.php @@ -3,7 +3,6 @@ use DBA\Factory; use DBA\LogEntry; -use JetBrains\PhpStorm\NoReturn; require_once(dirname(__FILE__) . "/../common/AbstractModelAPI.class.php"); @@ -17,13 +16,15 @@ public static function getDBAclass(): string { return LogEntry::class; } - #[NoReturn] protected function createObject(array $data): int { - assert(False, "Logentries cannot be created via API"); + protected function createObject(array $data): int { + throw new HttpError("Logentries cannot be created via API"); } protected function deleteObject(object $object): void { - assert(False, "Logentries cannot be deleted via API"); + throw new HttpError("Logentries cannot be deleted via API"); } } +use Slim\App; +/** @var App $app */ LogEntryAPI::register($app); \ No newline at end of file diff --git a/src/inc/apiv2/model/notifications.routes.php b/src/inc/apiv2/model/notifications.routes.php index 2bea8d61b..caba4dea2 100644 --- a/src/inc/apiv2/model/notifications.routes.php +++ b/src/inc/apiv2/model/notifications.routes.php @@ -84,4 +84,6 @@ protected function getUpdateHandlers($id, $current_user): array { } } +use Slim\App; +/** @var App $app */ NotificationSettingAPI::register($app); \ No newline at end of file diff --git a/src/inc/apiv2/model/preprocessors.routes.php b/src/inc/apiv2/model/preprocessors.routes.php index 49e8ffc40..367fd5ed6 100644 --- a/src/inc/apiv2/model/preprocessors.routes.php +++ b/src/inc/apiv2/model/preprocessors.routes.php @@ -52,4 +52,6 @@ protected function deleteObject(object $object): void { } } +use Slim\App; +/** @var App $app */ PreprocessorAPI::register($app); \ No newline at end of file diff --git a/src/inc/apiv2/model/pretasks.routes.php b/src/inc/apiv2/model/pretasks.routes.php index c542f4196..5082ce9ab 100644 --- a/src/inc/apiv2/model/pretasks.routes.php +++ b/src/inc/apiv2/model/pretasks.routes.php @@ -65,9 +65,9 @@ protected function createObject(array $data): int { } //TODO make aggregate data queryable and not included by default - static function aggregateData(object $object, array &$included_data = [], array $aggregateFieldsets = null): array { + static function aggregateData(object $object, array &$included_data = [], ?array $aggregateFieldsets = null): array { $aggregatedData = []; - if (is_null($aggregateFieldsets) || (is_array($aggregateFieldsets) && array_key_exists('pretask', $aggregateFieldsets))) { + if (is_null($aggregateFieldsets) || array_key_exists('pretask', $aggregateFieldsets)) { $qF1 = new QueryFilter(FilePretask::PRETASK_ID, $object->getId(), "=", Factory::getFilePretaskFactory()); $jF1 = new JoinFilter(Factory::getFilePretaskFactory(), File::FILE_ID, FilePretask::FILE_ID); @@ -104,4 +104,6 @@ protected function deleteObject(object $object): void { } } +use Slim\App; +/** @var App $app */ PreTaskAPI::register($app); diff --git a/src/inc/apiv2/model/speeds.routes.php b/src/inc/apiv2/model/speeds.routes.php index 98d9e448f..a84cab475 100644 --- a/src/inc/apiv2/model/speeds.routes.php +++ b/src/inc/apiv2/model/speeds.routes.php @@ -11,7 +11,6 @@ use DBA\Task; use DBA\TaskWrapper; use DBA\User; -use JetBrains\PhpStorm\NoReturn; require_once(dirname(__FILE__) . "/../common/AbstractModelAPI.class.php"); @@ -88,17 +87,19 @@ public static function getToOneRelationships(): array { ]; } - #[NoReturn] protected function createObject(array $data): int { - assert(False, "Speeds cannot be created via API"); + protected function createObject(array $data): int { + throw new HttpError("Speeds cannot be created via API"); } - #[NoReturn] public function updateObject(int $objectId, array $data): void { - assert(False, "Speeds cannot be updated via API"); + public function updateObject(int $objectId, array $data): void { + throw new HttpError("Speeds cannot be updated via API"); } - #[NoReturn] protected function deleteObject(object $object): void { - assert(False, "Speeds cannot be deleted via API"); + protected function deleteObject(object $object): void { + throw new HttpError("Speeds cannot be deleted via API"); } } +use Slim\App; +/** @var App $app */ SpeedAPI::register($app); \ No newline at end of file diff --git a/src/inc/apiv2/model/supertasks.routes.php b/src/inc/apiv2/model/supertasks.routes.php index 0488c67f1..7165a1035 100644 --- a/src/inc/apiv2/model/supertasks.routes.php +++ b/src/inc/apiv2/model/supertasks.routes.php @@ -72,12 +72,12 @@ public function updateToManyRelationship(Request $request, array $data, array $a // Find out which to add and remove $currentPretasks = SupertaskUtils::getPretasksOfSupertask($id); - function compare_ids($a, $b) { + $compare_ids = static function($a, $b) { return ($a->getId() - $b->getId()); - } + }; - $toAddPretasks = array_udiff($wantedPretasks, $currentPretasks, 'compare_ids'); - $toRemovePretasks = array_udiff($currentPretasks, $wantedPretasks, 'compare_ids'); + $toAddPretasks = array_udiff($wantedPretasks, $currentPretasks, $compare_ids); + $toRemovePretasks = array_udiff($currentPretasks, $wantedPretasks, $compare_ids); $factory = $this->getFactory(); $factory->getDB()->beginTransaction(); //start transaction to be able roll back @@ -103,4 +103,6 @@ protected function deleteObject(object $object): void { } } +use Slim\App; +/** @var App $app */ SupertaskAPI::register($app); \ No newline at end of file diff --git a/src/inc/apiv2/model/tasks.routes.php b/src/inc/apiv2/model/tasks.routes.php index 7f3b8bee5..c2ed6bb35 100644 --- a/src/inc/apiv2/model/tasks.routes.php +++ b/src/inc/apiv2/model/tasks.routes.php @@ -162,10 +162,10 @@ protected function createObject(array $data): int { } //TODO make aggregate data queryable and not included by default - static function aggregateData(object $object, array &$included_data = [], array $aggregateFieldsets = null): array { + static function aggregateData(object $object, array &$included_data = [], ?array $aggregateFieldsets = null): array { $aggregatedData = []; - if (is_null($aggregateFieldsets) || (is_array($aggregateFieldsets) && array_key_exists('task', $aggregateFieldsets))) { + if (is_null($aggregateFieldsets) || array_key_exists('task', $aggregateFieldsets)) { if (!is_null($aggregateFieldsets)) { $aggregateFieldsets['task'] = explode(",", $aggregateFieldsets['task']); } @@ -232,4 +232,6 @@ protected function getUpdateHandlers($id, $current_user): array { } } +use Slim\App; +/** @var App $app */ TaskAPI::register($app); diff --git a/src/inc/apiv2/model/taskwrappers.routes.php b/src/inc/apiv2/model/taskwrappers.routes.php index d333d0083..b3f6851ba 100644 --- a/src/inc/apiv2/model/taskwrappers.routes.php +++ b/src/inc/apiv2/model/taskwrappers.routes.php @@ -13,7 +13,6 @@ use DBA\Task; use DBA\TaskWrapper; use DBA\User; -use JetBrains\PhpStorm\NoReturn; require_once(dirname(__FILE__) . "/../common/AbstractModelAPI.class.php"); @@ -137,8 +136,8 @@ protected function parseFilters(array $filters) { return $filters; } - #[NoReturn] protected function createObject(array $data): int { - assert(False, "TaskWrappers cannot be created via API"); + protected function createObject(array $data): int { + throw new HttpError("TaskWrappers cannot be created via API"); } protected function getUpdateHandlers($id, $current_user): array { @@ -170,9 +169,11 @@ protected function deleteObject(object $object): void { TaskUtils::deleteSupertask($object->getId(), $this->getCurrentUser()); break; default: - assert(False, "Internal Error: taskType not recognized"); + throw new HttpError("Internal Error: taskType not recognized"); } } } +use Slim\App; +/** @var App $app */ TaskWrapperAPI::register($app); \ No newline at end of file diff --git a/src/inc/apiv2/model/users.routes.php b/src/inc/apiv2/model/users.routes.php index f117f8ffe..80eea1dd9 100644 --- a/src/inc/apiv2/model/users.routes.php +++ b/src/inc/apiv2/model/users.routes.php @@ -130,4 +130,6 @@ protected function getUpdateHandlers($id, $current_user): array { } +use Slim\App; +/** @var App $app */ UserAPI::register($app); diff --git a/src/inc/apiv2/model/vouchers.routes.php b/src/inc/apiv2/model/vouchers.routes.php index 88c348a9f..fbaf79342 100644 --- a/src/inc/apiv2/model/vouchers.routes.php +++ b/src/inc/apiv2/model/vouchers.routes.php @@ -34,4 +34,6 @@ protected function deleteObject(object $object): void { } } +use Slim\App; +/** @var App $app */ VoucherAPI::register($app); \ No newline at end of file From 316ba9c482be5ba7ac54a28ef6da0ab4ac822678 Mon Sep 17 00:00:00 2001 From: jessevz Date: Wed, 28 Jan 2026 14:42:17 +0100 Subject: [PATCH 393/691] Made start with filtering on included section --- .../CoalesceLikeFilterInsensitive.class.php | 44 +++++++++++++++++++ src/dba/init.php | 1 + src/inc/apiv2/model/taskwrappers.routes.php | 7 +++ 3 files changed, 52 insertions(+) create mode 100644 src/dba/CoalesceLikeFilterInsensitive.class.php diff --git a/src/dba/CoalesceLikeFilterInsensitive.class.php b/src/dba/CoalesceLikeFilterInsensitive.class.php new file mode 100644 index 000000000..1a6fc7137 --- /dev/null +++ b/src/dba/CoalesceLikeFilterInsensitive.class.php @@ -0,0 +1,44 @@ +columns = $columns; + $this->value = $value; + $this->overrideFactory = $overrideFactory; + } + + function getQueryString(AbstractModelFactory $factory, bool $includeTable = false): string { + if ($this->overrideFactory != null) { + $factory = $this->overrideFactory; + } + $table = ""; + if ($includeTable) { + $table = $factory->getMappedModelTable() . "."; + } + $mapped_columns = []; + foreach($this->columns as $column) { + array_push($mapped_columns, $table . AbstractModelFactory::getMappedModelKey($factory->getNullObject(), $column)); + } + + return "LOWER(" . "COALESCE(" . implode(", ", $mapped_columns) . ") " . ") LIKE LOWER(?)"; + } + + function getValue() { + return $this->value; + } + + function getHasValue(): bool { + return true; + } +} diff --git a/src/dba/init.php b/src/dba/init.php index c08691c6e..681788500 100644 --- a/src/dba/init.php +++ b/src/dba/init.php @@ -13,6 +13,7 @@ require_once(dirname(__FILE__) . "/Aggregation.class.php"); require_once(dirname(__FILE__) . "/Filter.class.php"); require_once(dirname(__FILE__) . "/Order.class.php"); +require_once(dirname(__FILE__) . "/CoalesceLikeFilterInsensitive.class.php"); require_once(dirname(__FILE__) . "/CoalesceOrderFilter.class.php"); require_once(dirname(__FILE__) . "/Join.class.php"); require_once(dirname(__FILE__) . "/Group.class.php"); diff --git a/src/inc/apiv2/model/taskwrappers.routes.php b/src/inc/apiv2/model/taskwrappers.routes.php index b3f6851ba..8cb99c1e8 100644 --- a/src/inc/apiv2/model/taskwrappers.routes.php +++ b/src/inc/apiv2/model/taskwrappers.routes.php @@ -1,6 +1,7 @@ Date: Wed, 28 Jan 2026 15:57:22 +0100 Subject: [PATCH 394/691] Fixed bug where there was no support for upload-metadata without value (#1901) Co-authored-by: jessevz --- src/inc/apiv2/helper/importFile.routes.php | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/src/inc/apiv2/helper/importFile.routes.php b/src/inc/apiv2/helper/importFile.routes.php index 4ad5b01ec..6e4a61f9b 100644 --- a/src/inc/apiv2/helper/importFile.routes.php +++ b/src/inc/apiv2/helper/importFile.routes.php @@ -160,14 +160,15 @@ function processPost(Request $request, Response $response, array $args): Respons foreach ($list as $item) { list($key, $b64val) = explode(" ", $item, 2); if ($b64val == null) { - $response->getBody()->write("Error Upload-Metadata, should be a key value pair that is separated by a space, no value has been provided"); - return $response->withStatus(400); + // Some keys dont have a value + $update_metadata[$key] = null; } if (($val = base64_decode($b64val, true)) === false) { $response->getBody()->write("Error Upload-Metadata '$key' invalid base64 encoding"); return $response->withStatus(400); + } else { + $update_metadata[$key] = $val; } - $update_metadata[$key] = $val; } } // TODO: Should filename be mandatory? From c76756c02a2d262f0a12159ed023d245be85d93a Mon Sep 17 00:00:00 2001 From: jessevz Date: Wed, 4 Feb 2026 16:43:49 +0100 Subject: [PATCH 395/691] Upgraded PHPUnit for CVE-2026-24765 (#1902) Co-authored-by: jessevz --- composer.json | 2 +- composer.lock | 717 +++++++++++++++++++++++--------------------------- 2 files changed, 333 insertions(+), 386 deletions(-) diff --git a/composer.json b/composer.json index f3ad2af72..5b85bde79 100644 --- a/composer.json +++ b/composer.json @@ -35,7 +35,7 @@ "phpspec/prophecy-phpunit": "^2.0", "phpstan/extension-installer": "^1.1.0", "phpstan/phpstan": "^2.1", - "phpunit/phpunit": "^9.5.25", + "phpunit/phpunit": "^12.5.7", "squizlabs/php_codesniffer": "^3.7" }, "config": { diff --git a/composer.lock b/composer.lock index e65baa43c..6679dbe38 100644 --- a/composer.lock +++ b/composer.lock @@ -4,7 +4,7 @@ "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies", "This file is @generated automatically" ], - "content-hash": "05373de718f2b591023edb0d6a9b2628", + "content-hash": "d707b8562d3314e500ae1bba0dc702ad", "packages": [ { "name": "composer/semver", @@ -2472,35 +2472,34 @@ }, { "name": "phpunit/php-code-coverage", - "version": "9.2.32", + "version": "12.5.2", "source": { "type": "git", "url": "https://github.com/sebastianbergmann/php-code-coverage.git", - "reference": "85402a822d1ecf1db1096959413d35e1c37cf1a5" + "reference": "4a9739b51cbcb355f6e95659612f92e282a7077b" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/sebastianbergmann/php-code-coverage/zipball/85402a822d1ecf1db1096959413d35e1c37cf1a5", - "reference": "85402a822d1ecf1db1096959413d35e1c37cf1a5", + "url": "https://api.github.com/repos/sebastianbergmann/php-code-coverage/zipball/4a9739b51cbcb355f6e95659612f92e282a7077b", + "reference": "4a9739b51cbcb355f6e95659612f92e282a7077b", "shasum": "" }, "require": { "ext-dom": "*", "ext-libxml": "*", "ext-xmlwriter": "*", - "nikic/php-parser": "^4.19.1 || ^5.1.0", - "php": ">=7.3", - "phpunit/php-file-iterator": "^3.0.6", - "phpunit/php-text-template": "^2.0.4", - "sebastian/code-unit-reverse-lookup": "^2.0.3", - "sebastian/complexity": "^2.0.3", - "sebastian/environment": "^5.1.5", - "sebastian/lines-of-code": "^1.0.4", - "sebastian/version": "^3.0.2", - "theseer/tokenizer": "^1.2.3" + "nikic/php-parser": "^5.7.0", + "php": ">=8.3", + "phpunit/php-file-iterator": "^6.0", + "phpunit/php-text-template": "^5.0", + "sebastian/complexity": "^5.0", + "sebastian/environment": "^8.0.3", + "sebastian/lines-of-code": "^4.0", + "sebastian/version": "^6.0", + "theseer/tokenizer": "^2.0.1" }, "require-dev": { - "phpunit/phpunit": "^9.6" + "phpunit/phpunit": "^12.5.1" }, "suggest": { "ext-pcov": "PHP extension that provides line coverage", @@ -2509,7 +2508,7 @@ "type": "library", "extra": { "branch-alias": { - "dev-main": "9.2.x-dev" + "dev-main": "12.5.x-dev" } }, "autoload": { @@ -2538,40 +2537,52 @@ "support": { "issues": "https://github.com/sebastianbergmann/php-code-coverage/issues", "security": "https://github.com/sebastianbergmann/php-code-coverage/security/policy", - "source": "https://github.com/sebastianbergmann/php-code-coverage/tree/9.2.32" + "source": "https://github.com/sebastianbergmann/php-code-coverage/tree/12.5.2" }, "funding": [ { "url": "https://github.com/sebastianbergmann", "type": "github" + }, + { + "url": "https://liberapay.com/sebastianbergmann", + "type": "liberapay" + }, + { + "url": "https://thanks.dev/u/gh/sebastianbergmann", + "type": "thanks_dev" + }, + { + "url": "https://tidelift.com/funding/github/packagist/phpunit/php-code-coverage", + "type": "tidelift" } ], - "time": "2024-08-22T04:23:01+00:00" + "time": "2025-12-24T07:03:04+00:00" }, { "name": "phpunit/php-file-iterator", - "version": "3.0.6", + "version": "6.0.0", "source": { "type": "git", "url": "https://github.com/sebastianbergmann/php-file-iterator.git", - "reference": "cf1c2e7c203ac650e352f4cc675a7021e7d1b3cf" + "reference": "961bc913d42fe24a257bfff826a5068079ac7782" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/sebastianbergmann/php-file-iterator/zipball/cf1c2e7c203ac650e352f4cc675a7021e7d1b3cf", - "reference": "cf1c2e7c203ac650e352f4cc675a7021e7d1b3cf", + "url": "https://api.github.com/repos/sebastianbergmann/php-file-iterator/zipball/961bc913d42fe24a257bfff826a5068079ac7782", + "reference": "961bc913d42fe24a257bfff826a5068079ac7782", "shasum": "" }, "require": { - "php": ">=7.3" + "php": ">=8.3" }, "require-dev": { - "phpunit/phpunit": "^9.3" + "phpunit/phpunit": "^12.0" }, "type": "library", "extra": { "branch-alias": { - "dev-master": "3.0-dev" + "dev-main": "6.0-dev" } }, "autoload": { @@ -2598,7 +2609,8 @@ ], "support": { "issues": "https://github.com/sebastianbergmann/php-file-iterator/issues", - "source": "https://github.com/sebastianbergmann/php-file-iterator/tree/3.0.6" + "security": "https://github.com/sebastianbergmann/php-file-iterator/security/policy", + "source": "https://github.com/sebastianbergmann/php-file-iterator/tree/6.0.0" }, "funding": [ { @@ -2606,28 +2618,28 @@ "type": "github" } ], - "time": "2021-12-02T12:48:52+00:00" + "time": "2025-02-07T04:58:37+00:00" }, { "name": "phpunit/php-invoker", - "version": "3.1.1", + "version": "6.0.0", "source": { "type": "git", "url": "https://github.com/sebastianbergmann/php-invoker.git", - "reference": "5a10147d0aaf65b58940a0b72f71c9ac0423cc67" + "reference": "12b54e689b07a25a9b41e57736dfab6ec9ae5406" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/sebastianbergmann/php-invoker/zipball/5a10147d0aaf65b58940a0b72f71c9ac0423cc67", - "reference": "5a10147d0aaf65b58940a0b72f71c9ac0423cc67", + "url": "https://api.github.com/repos/sebastianbergmann/php-invoker/zipball/12b54e689b07a25a9b41e57736dfab6ec9ae5406", + "reference": "12b54e689b07a25a9b41e57736dfab6ec9ae5406", "shasum": "" }, "require": { - "php": ">=7.3" + "php": ">=8.3" }, "require-dev": { "ext-pcntl": "*", - "phpunit/phpunit": "^9.3" + "phpunit/phpunit": "^12.0" }, "suggest": { "ext-pcntl": "*" @@ -2635,7 +2647,7 @@ "type": "library", "extra": { "branch-alias": { - "dev-master": "3.1-dev" + "dev-main": "6.0-dev" } }, "autoload": { @@ -2661,7 +2673,8 @@ ], "support": { "issues": "https://github.com/sebastianbergmann/php-invoker/issues", - "source": "https://github.com/sebastianbergmann/php-invoker/tree/3.1.1" + "security": "https://github.com/sebastianbergmann/php-invoker/security/policy", + "source": "https://github.com/sebastianbergmann/php-invoker/tree/6.0.0" }, "funding": [ { @@ -2669,32 +2682,32 @@ "type": "github" } ], - "time": "2020-09-28T05:58:55+00:00" + "time": "2025-02-07T04:58:58+00:00" }, { "name": "phpunit/php-text-template", - "version": "2.0.4", + "version": "5.0.0", "source": { "type": "git", "url": "https://github.com/sebastianbergmann/php-text-template.git", - "reference": "5da5f67fc95621df9ff4c4e5a84d6a8a2acf7c28" + "reference": "e1367a453f0eda562eedb4f659e13aa900d66c53" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/sebastianbergmann/php-text-template/zipball/5da5f67fc95621df9ff4c4e5a84d6a8a2acf7c28", - "reference": "5da5f67fc95621df9ff4c4e5a84d6a8a2acf7c28", + "url": "https://api.github.com/repos/sebastianbergmann/php-text-template/zipball/e1367a453f0eda562eedb4f659e13aa900d66c53", + "reference": "e1367a453f0eda562eedb4f659e13aa900d66c53", "shasum": "" }, "require": { - "php": ">=7.3" + "php": ">=8.3" }, "require-dev": { - "phpunit/phpunit": "^9.3" + "phpunit/phpunit": "^12.0" }, "type": "library", "extra": { "branch-alias": { - "dev-master": "2.0-dev" + "dev-main": "5.0-dev" } }, "autoload": { @@ -2720,7 +2733,8 @@ ], "support": { "issues": "https://github.com/sebastianbergmann/php-text-template/issues", - "source": "https://github.com/sebastianbergmann/php-text-template/tree/2.0.4" + "security": "https://github.com/sebastianbergmann/php-text-template/security/policy", + "source": "https://github.com/sebastianbergmann/php-text-template/tree/5.0.0" }, "funding": [ { @@ -2728,32 +2742,32 @@ "type": "github" } ], - "time": "2020-10-26T05:33:50+00:00" + "time": "2025-02-07T04:59:16+00:00" }, { "name": "phpunit/php-timer", - "version": "5.0.3", + "version": "8.0.0", "source": { "type": "git", "url": "https://github.com/sebastianbergmann/php-timer.git", - "reference": "5a63ce20ed1b5bf577850e2c4e87f4aa902afbd2" + "reference": "f258ce36aa457f3aa3339f9ed4c81fc66dc8c2cc" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/sebastianbergmann/php-timer/zipball/5a63ce20ed1b5bf577850e2c4e87f4aa902afbd2", - "reference": "5a63ce20ed1b5bf577850e2c4e87f4aa902afbd2", + "url": "https://api.github.com/repos/sebastianbergmann/php-timer/zipball/f258ce36aa457f3aa3339f9ed4c81fc66dc8c2cc", + "reference": "f258ce36aa457f3aa3339f9ed4c81fc66dc8c2cc", "shasum": "" }, "require": { - "php": ">=7.3" + "php": ">=8.3" }, "require-dev": { - "phpunit/phpunit": "^9.3" + "phpunit/phpunit": "^12.0" }, "type": "library", "extra": { "branch-alias": { - "dev-master": "5.0-dev" + "dev-main": "8.0-dev" } }, "autoload": { @@ -2779,7 +2793,8 @@ ], "support": { "issues": "https://github.com/sebastianbergmann/php-timer/issues", - "source": "https://github.com/sebastianbergmann/php-timer/tree/5.0.3" + "security": "https://github.com/sebastianbergmann/php-timer/security/policy", + "source": "https://github.com/sebastianbergmann/php-timer/tree/8.0.0" }, "funding": [ { @@ -2787,24 +2802,23 @@ "type": "github" } ], - "time": "2020-10-26T13:16:10+00:00" + "time": "2025-02-07T04:59:38+00:00" }, { "name": "phpunit/phpunit", - "version": "9.6.34", + "version": "12.5.8", "source": { "type": "git", "url": "https://github.com/sebastianbergmann/phpunit.git", - "reference": "b36f02317466907a230d3aa1d34467041271ef4a" + "reference": "37ddb96c14bfee10304825edbb7e66d341ec6889" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/sebastianbergmann/phpunit/zipball/b36f02317466907a230d3aa1d34467041271ef4a", - "reference": "b36f02317466907a230d3aa1d34467041271ef4a", + "url": "https://api.github.com/repos/sebastianbergmann/phpunit/zipball/37ddb96c14bfee10304825edbb7e66d341ec6889", + "reference": "37ddb96c14bfee10304825edbb7e66d341ec6889", "shasum": "" }, "require": { - "doctrine/instantiator": "^1.5.0 || ^2", "ext-dom": "*", "ext-json": "*", "ext-libxml": "*", @@ -2814,27 +2828,22 @@ "myclabs/deep-copy": "^1.13.4", "phar-io/manifest": "^2.0.4", "phar-io/version": "^3.2.1", - "php": ">=7.3", - "phpunit/php-code-coverage": "^9.2.32", - "phpunit/php-file-iterator": "^3.0.6", - "phpunit/php-invoker": "^3.1.1", - "phpunit/php-text-template": "^2.0.4", - "phpunit/php-timer": "^5.0.3", - "sebastian/cli-parser": "^1.0.2", - "sebastian/code-unit": "^1.0.8", - "sebastian/comparator": "^4.0.10", - "sebastian/diff": "^4.0.6", - "sebastian/environment": "^5.1.5", - "sebastian/exporter": "^4.0.8", - "sebastian/global-state": "^5.0.8", - "sebastian/object-enumerator": "^4.0.4", - "sebastian/resource-operations": "^3.0.4", - "sebastian/type": "^3.2.1", - "sebastian/version": "^3.0.2" - }, - "suggest": { - "ext-soap": "To be able to generate mocks based on WSDL files", - "ext-xdebug": "PHP extension that provides line coverage as well as branch and path coverage" + "php": ">=8.3", + "phpunit/php-code-coverage": "^12.5.2", + "phpunit/php-file-iterator": "^6.0.0", + "phpunit/php-invoker": "^6.0.0", + "phpunit/php-text-template": "^5.0.0", + "phpunit/php-timer": "^8.0.0", + "sebastian/cli-parser": "^4.2.0", + "sebastian/comparator": "^7.1.4", + "sebastian/diff": "^7.0.0", + "sebastian/environment": "^8.0.3", + "sebastian/exporter": "^7.0.2", + "sebastian/global-state": "^8.0.2", + "sebastian/object-enumerator": "^7.0.0", + "sebastian/type": "^6.0.3", + "sebastian/version": "^6.0.0", + "staabm/side-effects-detector": "^1.0.5" }, "bin": [ "phpunit" @@ -2842,7 +2851,7 @@ "type": "library", "extra": { "branch-alias": { - "dev-master": "9.6-dev" + "dev-main": "12.5-dev" } }, "autoload": { @@ -2874,7 +2883,7 @@ "support": { "issues": "https://github.com/sebastianbergmann/phpunit/issues", "security": "https://github.com/sebastianbergmann/phpunit/security/policy", - "source": "https://github.com/sebastianbergmann/phpunit/tree/9.6.34" + "source": "https://github.com/sebastianbergmann/phpunit/tree/12.5.8" }, "funding": [ { @@ -2898,32 +2907,32 @@ "type": "tidelift" } ], - "time": "2026-01-27T05:45:00+00:00" + "time": "2026-01-27T06:12:29+00:00" }, { "name": "sebastian/cli-parser", - "version": "1.0.2", + "version": "4.2.0", "source": { "type": "git", "url": "https://github.com/sebastianbergmann/cli-parser.git", - "reference": "2b56bea83a09de3ac06bb18b92f068e60cc6f50b" + "reference": "90f41072d220e5c40df6e8635f5dafba2d9d4d04" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/sebastianbergmann/cli-parser/zipball/2b56bea83a09de3ac06bb18b92f068e60cc6f50b", - "reference": "2b56bea83a09de3ac06bb18b92f068e60cc6f50b", + "url": "https://api.github.com/repos/sebastianbergmann/cli-parser/zipball/90f41072d220e5c40df6e8635f5dafba2d9d4d04", + "reference": "90f41072d220e5c40df6e8635f5dafba2d9d4d04", "shasum": "" }, "require": { - "php": ">=7.3" + "php": ">=8.3" }, "require-dev": { - "phpunit/phpunit": "^9.3" + "phpunit/phpunit": "^12.0" }, "type": "library", "extra": { "branch-alias": { - "dev-master": "1.0-dev" + "dev-main": "4.2-dev" } }, "autoload": { @@ -2946,153 +2955,60 @@ "homepage": "https://github.com/sebastianbergmann/cli-parser", "support": { "issues": "https://github.com/sebastianbergmann/cli-parser/issues", - "source": "https://github.com/sebastianbergmann/cli-parser/tree/1.0.2" + "security": "https://github.com/sebastianbergmann/cli-parser/security/policy", + "source": "https://github.com/sebastianbergmann/cli-parser/tree/4.2.0" }, "funding": [ { "url": "https://github.com/sebastianbergmann", "type": "github" - } - ], - "time": "2024-03-02T06:27:43+00:00" - }, - { - "name": "sebastian/code-unit", - "version": "1.0.8", - "source": { - "type": "git", - "url": "https://github.com/sebastianbergmann/code-unit.git", - "reference": "1fc9f64c0927627ef78ba436c9b17d967e68e120" - }, - "dist": { - "type": "zip", - "url": "https://api.github.com/repos/sebastianbergmann/code-unit/zipball/1fc9f64c0927627ef78ba436c9b17d967e68e120", - "reference": "1fc9f64c0927627ef78ba436c9b17d967e68e120", - "shasum": "" - }, - "require": { - "php": ">=7.3" - }, - "require-dev": { - "phpunit/phpunit": "^9.3" - }, - "type": "library", - "extra": { - "branch-alias": { - "dev-master": "1.0-dev" - } - }, - "autoload": { - "classmap": [ - "src/" - ] - }, - "notification-url": "https://packagist.org/downloads/", - "license": [ - "BSD-3-Clause" - ], - "authors": [ - { - "name": "Sebastian Bergmann", - "email": "sebastian@phpunit.de", - "role": "lead" - } - ], - "description": "Collection of value objects that represent the PHP code units", - "homepage": "https://github.com/sebastianbergmann/code-unit", - "support": { - "issues": "https://github.com/sebastianbergmann/code-unit/issues", - "source": "https://github.com/sebastianbergmann/code-unit/tree/1.0.8" - }, - "funding": [ + }, { - "url": "https://github.com/sebastianbergmann", - "type": "github" - } - ], - "time": "2020-10-26T13:08:54+00:00" - }, - { - "name": "sebastian/code-unit-reverse-lookup", - "version": "2.0.3", - "source": { - "type": "git", - "url": "https://github.com/sebastianbergmann/code-unit-reverse-lookup.git", - "reference": "ac91f01ccec49fb77bdc6fd1e548bc70f7faa3e5" - }, - "dist": { - "type": "zip", - "url": "https://api.github.com/repos/sebastianbergmann/code-unit-reverse-lookup/zipball/ac91f01ccec49fb77bdc6fd1e548bc70f7faa3e5", - "reference": "ac91f01ccec49fb77bdc6fd1e548bc70f7faa3e5", - "shasum": "" - }, - "require": { - "php": ">=7.3" - }, - "require-dev": { - "phpunit/phpunit": "^9.3" - }, - "type": "library", - "extra": { - "branch-alias": { - "dev-master": "2.0-dev" - } - }, - "autoload": { - "classmap": [ - "src/" - ] - }, - "notification-url": "https://packagist.org/downloads/", - "license": [ - "BSD-3-Clause" - ], - "authors": [ + "url": "https://liberapay.com/sebastianbergmann", + "type": "liberapay" + }, { - "name": "Sebastian Bergmann", - "email": "sebastian@phpunit.de" - } - ], - "description": "Looks up which function or method a line of code belongs to", - "homepage": "https://github.com/sebastianbergmann/code-unit-reverse-lookup/", - "support": { - "issues": "https://github.com/sebastianbergmann/code-unit-reverse-lookup/issues", - "source": "https://github.com/sebastianbergmann/code-unit-reverse-lookup/tree/2.0.3" - }, - "funding": [ + "url": "https://thanks.dev/u/gh/sebastianbergmann", + "type": "thanks_dev" + }, { - "url": "https://github.com/sebastianbergmann", - "type": "github" + "url": "https://tidelift.com/funding/github/packagist/sebastian/cli-parser", + "type": "tidelift" } ], - "time": "2020-09-28T05:30:19+00:00" + "time": "2025-09-14T09:36:45+00:00" }, { "name": "sebastian/comparator", - "version": "4.0.10", + "version": "7.1.4", "source": { "type": "git", "url": "https://github.com/sebastianbergmann/comparator.git", - "reference": "e4df00b9b3571187db2831ae9aada2c6efbd715d" + "reference": "6a7de5df2e094f9a80b40a522391a7e6022df5f6" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/sebastianbergmann/comparator/zipball/e4df00b9b3571187db2831ae9aada2c6efbd715d", - "reference": "e4df00b9b3571187db2831ae9aada2c6efbd715d", + "url": "https://api.github.com/repos/sebastianbergmann/comparator/zipball/6a7de5df2e094f9a80b40a522391a7e6022df5f6", + "reference": "6a7de5df2e094f9a80b40a522391a7e6022df5f6", "shasum": "" }, "require": { - "php": ">=7.3", - "sebastian/diff": "^4.0", - "sebastian/exporter": "^4.0" + "ext-dom": "*", + "ext-mbstring": "*", + "php": ">=8.3", + "sebastian/diff": "^7.0", + "sebastian/exporter": "^7.0" }, "require-dev": { - "phpunit/phpunit": "^9.3" + "phpunit/phpunit": "^12.2" + }, + "suggest": { + "ext-bcmath": "For comparing BcMath\\Number objects" }, "type": "library", "extra": { "branch-alias": { - "dev-master": "4.0-dev" + "dev-main": "7.1-dev" } }, "autoload": { @@ -3131,7 +3047,8 @@ ], "support": { "issues": "https://github.com/sebastianbergmann/comparator/issues", - "source": "https://github.com/sebastianbergmann/comparator/tree/4.0.10" + "security": "https://github.com/sebastianbergmann/comparator/security/policy", + "source": "https://github.com/sebastianbergmann/comparator/tree/7.1.4" }, "funding": [ { @@ -3151,33 +3068,33 @@ "type": "tidelift" } ], - "time": "2026-01-24T09:22:56+00:00" + "time": "2026-01-24T09:28:48+00:00" }, { "name": "sebastian/complexity", - "version": "2.0.3", + "version": "5.0.0", "source": { "type": "git", "url": "https://github.com/sebastianbergmann/complexity.git", - "reference": "25f207c40d62b8b7aa32f5ab026c53561964053a" + "reference": "bad4316aba5303d0221f43f8cee37eb58d384bbb" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/sebastianbergmann/complexity/zipball/25f207c40d62b8b7aa32f5ab026c53561964053a", - "reference": "25f207c40d62b8b7aa32f5ab026c53561964053a", + "url": "https://api.github.com/repos/sebastianbergmann/complexity/zipball/bad4316aba5303d0221f43f8cee37eb58d384bbb", + "reference": "bad4316aba5303d0221f43f8cee37eb58d384bbb", "shasum": "" }, "require": { - "nikic/php-parser": "^4.18 || ^5.0", - "php": ">=7.3" + "nikic/php-parser": "^5.0", + "php": ">=8.3" }, "require-dev": { - "phpunit/phpunit": "^9.3" + "phpunit/phpunit": "^12.0" }, "type": "library", "extra": { "branch-alias": { - "dev-master": "2.0-dev" + "dev-main": "5.0-dev" } }, "autoload": { @@ -3200,7 +3117,8 @@ "homepage": "https://github.com/sebastianbergmann/complexity", "support": { "issues": "https://github.com/sebastianbergmann/complexity/issues", - "source": "https://github.com/sebastianbergmann/complexity/tree/2.0.3" + "security": "https://github.com/sebastianbergmann/complexity/security/policy", + "source": "https://github.com/sebastianbergmann/complexity/tree/5.0.0" }, "funding": [ { @@ -3208,33 +3126,33 @@ "type": "github" } ], - "time": "2023-12-22T06:19:30+00:00" + "time": "2025-02-07T04:55:25+00:00" }, { "name": "sebastian/diff", - "version": "4.0.6", + "version": "7.0.0", "source": { "type": "git", "url": "https://github.com/sebastianbergmann/diff.git", - "reference": "ba01945089c3a293b01ba9badc29ad55b106b0bc" + "reference": "7ab1ea946c012266ca32390913653d844ecd085f" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/sebastianbergmann/diff/zipball/ba01945089c3a293b01ba9badc29ad55b106b0bc", - "reference": "ba01945089c3a293b01ba9badc29ad55b106b0bc", + "url": "https://api.github.com/repos/sebastianbergmann/diff/zipball/7ab1ea946c012266ca32390913653d844ecd085f", + "reference": "7ab1ea946c012266ca32390913653d844ecd085f", "shasum": "" }, "require": { - "php": ">=7.3" + "php": ">=8.3" }, "require-dev": { - "phpunit/phpunit": "^9.3", - "symfony/process": "^4.2 || ^5" + "phpunit/phpunit": "^12.0", + "symfony/process": "^7.2" }, "type": "library", "extra": { "branch-alias": { - "dev-master": "4.0-dev" + "dev-main": "7.0-dev" } }, "autoload": { @@ -3266,7 +3184,8 @@ ], "support": { "issues": "https://github.com/sebastianbergmann/diff/issues", - "source": "https://github.com/sebastianbergmann/diff/tree/4.0.6" + "security": "https://github.com/sebastianbergmann/diff/security/policy", + "source": "https://github.com/sebastianbergmann/diff/tree/7.0.0" }, "funding": [ { @@ -3274,27 +3193,27 @@ "type": "github" } ], - "time": "2024-03-02T06:30:58+00:00" + "time": "2025-02-07T04:55:46+00:00" }, { "name": "sebastian/environment", - "version": "5.1.5", + "version": "8.0.3", "source": { "type": "git", "url": "https://github.com/sebastianbergmann/environment.git", - "reference": "830c43a844f1f8d5b7a1f6d6076b784454d8b7ed" + "reference": "24a711b5c916efc6d6e62aa65aa2ec98fef77f68" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/sebastianbergmann/environment/zipball/830c43a844f1f8d5b7a1f6d6076b784454d8b7ed", - "reference": "830c43a844f1f8d5b7a1f6d6076b784454d8b7ed", + "url": "https://api.github.com/repos/sebastianbergmann/environment/zipball/24a711b5c916efc6d6e62aa65aa2ec98fef77f68", + "reference": "24a711b5c916efc6d6e62aa65aa2ec98fef77f68", "shasum": "" }, "require": { - "php": ">=7.3" + "php": ">=8.3" }, "require-dev": { - "phpunit/phpunit": "^9.3" + "phpunit/phpunit": "^12.0" }, "suggest": { "ext-posix": "*" @@ -3302,7 +3221,7 @@ "type": "library", "extra": { "branch-alias": { - "dev-master": "5.1-dev" + "dev-main": "8.0-dev" } }, "autoload": { @@ -3321,7 +3240,7 @@ } ], "description": "Provides functionality to handle HHVM/PHP environments", - "homepage": "http://www.github.com/sebastianbergmann/environment", + "homepage": "https://github.com/sebastianbergmann/environment", "keywords": [ "Xdebug", "environment", @@ -3329,42 +3248,55 @@ ], "support": { "issues": "https://github.com/sebastianbergmann/environment/issues", - "source": "https://github.com/sebastianbergmann/environment/tree/5.1.5" + "security": "https://github.com/sebastianbergmann/environment/security/policy", + "source": "https://github.com/sebastianbergmann/environment/tree/8.0.3" }, "funding": [ { "url": "https://github.com/sebastianbergmann", "type": "github" + }, + { + "url": "https://liberapay.com/sebastianbergmann", + "type": "liberapay" + }, + { + "url": "https://thanks.dev/u/gh/sebastianbergmann", + "type": "thanks_dev" + }, + { + "url": "https://tidelift.com/funding/github/packagist/sebastian/environment", + "type": "tidelift" } ], - "time": "2023-02-03T06:03:51+00:00" + "time": "2025-08-12T14:11:56+00:00" }, { "name": "sebastian/exporter", - "version": "4.0.8", + "version": "7.0.2", "source": { "type": "git", "url": "https://github.com/sebastianbergmann/exporter.git", - "reference": "14c6ba52f95a36c3d27c835d65efc7123c446e8c" + "reference": "016951ae10980765e4e7aee491eb288c64e505b7" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/sebastianbergmann/exporter/zipball/14c6ba52f95a36c3d27c835d65efc7123c446e8c", - "reference": "14c6ba52f95a36c3d27c835d65efc7123c446e8c", + "url": "https://api.github.com/repos/sebastianbergmann/exporter/zipball/016951ae10980765e4e7aee491eb288c64e505b7", + "reference": "016951ae10980765e4e7aee491eb288c64e505b7", "shasum": "" }, "require": { - "php": ">=7.3", - "sebastian/recursion-context": "^4.0" + "ext-mbstring": "*", + "php": ">=8.3", + "sebastian/recursion-context": "^7.0" }, "require-dev": { - "ext-mbstring": "*", - "phpunit/phpunit": "^9.3" + "phpunit/phpunit": "^12.0" }, "type": "library", "extra": { "branch-alias": { - "dev-master": "4.0-dev" + "dev-main": "7.0-dev" } }, "autoload": { @@ -3406,7 +3338,8 @@ ], "support": { "issues": "https://github.com/sebastianbergmann/exporter/issues", - "source": "https://github.com/sebastianbergmann/exporter/tree/4.0.8" + "security": "https://github.com/sebastianbergmann/exporter/security/policy", + "source": "https://github.com/sebastianbergmann/exporter/tree/7.0.2" }, "funding": [ { @@ -3426,38 +3359,35 @@ "type": "tidelift" } ], - "time": "2025-09-24T06:03:27+00:00" + "time": "2025-09-24T06:16:11+00:00" }, { "name": "sebastian/global-state", - "version": "5.0.8", + "version": "8.0.2", "source": { "type": "git", "url": "https://github.com/sebastianbergmann/global-state.git", - "reference": "b6781316bdcd28260904e7cc18ec983d0d2ef4f6" + "reference": "ef1377171613d09edd25b7816f05be8313f9115d" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/sebastianbergmann/global-state/zipball/b6781316bdcd28260904e7cc18ec983d0d2ef4f6", - "reference": "b6781316bdcd28260904e7cc18ec983d0d2ef4f6", + "url": "https://api.github.com/repos/sebastianbergmann/global-state/zipball/ef1377171613d09edd25b7816f05be8313f9115d", + "reference": "ef1377171613d09edd25b7816f05be8313f9115d", "shasum": "" }, "require": { - "php": ">=7.3", - "sebastian/object-reflector": "^2.0", - "sebastian/recursion-context": "^4.0" + "php": ">=8.3", + "sebastian/object-reflector": "^5.0", + "sebastian/recursion-context": "^7.0" }, "require-dev": { "ext-dom": "*", - "phpunit/phpunit": "^9.3" - }, - "suggest": { - "ext-uopz": "*" + "phpunit/phpunit": "^12.0" }, "type": "library", "extra": { "branch-alias": { - "dev-master": "5.0-dev" + "dev-main": "8.0-dev" } }, "autoload": { @@ -3476,13 +3406,14 @@ } ], "description": "Snapshotting of global state", - "homepage": "http://www.github.com/sebastianbergmann/global-state", + "homepage": "https://www.github.com/sebastianbergmann/global-state", "keywords": [ "global state" ], "support": { "issues": "https://github.com/sebastianbergmann/global-state/issues", - "source": "https://github.com/sebastianbergmann/global-state/tree/5.0.8" + "security": "https://github.com/sebastianbergmann/global-state/security/policy", + "source": "https://github.com/sebastianbergmann/global-state/tree/8.0.2" }, "funding": [ { @@ -3502,33 +3433,33 @@ "type": "tidelift" } ], - "time": "2025-08-10T07:10:35+00:00" + "time": "2025-08-29T11:29:25+00:00" }, { "name": "sebastian/lines-of-code", - "version": "1.0.4", + "version": "4.0.0", "source": { "type": "git", "url": "https://github.com/sebastianbergmann/lines-of-code.git", - "reference": "e1e4a170560925c26d424b6a03aed157e7dcc5c5" + "reference": "97ffee3bcfb5805568d6af7f0f893678fc076d2f" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/sebastianbergmann/lines-of-code/zipball/e1e4a170560925c26d424b6a03aed157e7dcc5c5", - "reference": "e1e4a170560925c26d424b6a03aed157e7dcc5c5", + "url": "https://api.github.com/repos/sebastianbergmann/lines-of-code/zipball/97ffee3bcfb5805568d6af7f0f893678fc076d2f", + "reference": "97ffee3bcfb5805568d6af7f0f893678fc076d2f", "shasum": "" }, "require": { - "nikic/php-parser": "^4.18 || ^5.0", - "php": ">=7.3" + "nikic/php-parser": "^5.0", + "php": ">=8.3" }, "require-dev": { - "phpunit/phpunit": "^9.3" + "phpunit/phpunit": "^12.0" }, "type": "library", "extra": { "branch-alias": { - "dev-master": "1.0-dev" + "dev-main": "4.0-dev" } }, "autoload": { @@ -3551,7 +3482,8 @@ "homepage": "https://github.com/sebastianbergmann/lines-of-code", "support": { "issues": "https://github.com/sebastianbergmann/lines-of-code/issues", - "source": "https://github.com/sebastianbergmann/lines-of-code/tree/1.0.4" + "security": "https://github.com/sebastianbergmann/lines-of-code/security/policy", + "source": "https://github.com/sebastianbergmann/lines-of-code/tree/4.0.0" }, "funding": [ { @@ -3559,34 +3491,34 @@ "type": "github" } ], - "time": "2023-12-22T06:20:34+00:00" + "time": "2025-02-07T04:57:28+00:00" }, { "name": "sebastian/object-enumerator", - "version": "4.0.4", + "version": "7.0.0", "source": { "type": "git", "url": "https://github.com/sebastianbergmann/object-enumerator.git", - "reference": "5c9eeac41b290a3712d88851518825ad78f45c71" + "reference": "1effe8e9b8e068e9ae228e542d5d11b5d16db894" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/sebastianbergmann/object-enumerator/zipball/5c9eeac41b290a3712d88851518825ad78f45c71", - "reference": "5c9eeac41b290a3712d88851518825ad78f45c71", + "url": "https://api.github.com/repos/sebastianbergmann/object-enumerator/zipball/1effe8e9b8e068e9ae228e542d5d11b5d16db894", + "reference": "1effe8e9b8e068e9ae228e542d5d11b5d16db894", "shasum": "" }, "require": { - "php": ">=7.3", - "sebastian/object-reflector": "^2.0", - "sebastian/recursion-context": "^4.0" + "php": ">=8.3", + "sebastian/object-reflector": "^5.0", + "sebastian/recursion-context": "^7.0" }, "require-dev": { - "phpunit/phpunit": "^9.3" + "phpunit/phpunit": "^12.0" }, "type": "library", "extra": { "branch-alias": { - "dev-master": "4.0-dev" + "dev-main": "7.0-dev" } }, "autoload": { @@ -3608,7 +3540,8 @@ "homepage": "https://github.com/sebastianbergmann/object-enumerator/", "support": { "issues": "https://github.com/sebastianbergmann/object-enumerator/issues", - "source": "https://github.com/sebastianbergmann/object-enumerator/tree/4.0.4" + "security": "https://github.com/sebastianbergmann/object-enumerator/security/policy", + "source": "https://github.com/sebastianbergmann/object-enumerator/tree/7.0.0" }, "funding": [ { @@ -3616,32 +3549,32 @@ "type": "github" } ], - "time": "2020-10-26T13:12:34+00:00" + "time": "2025-02-07T04:57:48+00:00" }, { "name": "sebastian/object-reflector", - "version": "2.0.4", + "version": "5.0.0", "source": { "type": "git", "url": "https://github.com/sebastianbergmann/object-reflector.git", - "reference": "b4f479ebdbf63ac605d183ece17d8d7fe49c15c7" + "reference": "4bfa827c969c98be1e527abd576533293c634f6a" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/sebastianbergmann/object-reflector/zipball/b4f479ebdbf63ac605d183ece17d8d7fe49c15c7", - "reference": "b4f479ebdbf63ac605d183ece17d8d7fe49c15c7", + "url": "https://api.github.com/repos/sebastianbergmann/object-reflector/zipball/4bfa827c969c98be1e527abd576533293c634f6a", + "reference": "4bfa827c969c98be1e527abd576533293c634f6a", "shasum": "" }, "require": { - "php": ">=7.3" + "php": ">=8.3" }, "require-dev": { - "phpunit/phpunit": "^9.3" + "phpunit/phpunit": "^12.0" }, "type": "library", "extra": { "branch-alias": { - "dev-master": "2.0-dev" + "dev-main": "5.0-dev" } }, "autoload": { @@ -3663,7 +3596,8 @@ "homepage": "https://github.com/sebastianbergmann/object-reflector/", "support": { "issues": "https://github.com/sebastianbergmann/object-reflector/issues", - "source": "https://github.com/sebastianbergmann/object-reflector/tree/2.0.4" + "security": "https://github.com/sebastianbergmann/object-reflector/security/policy", + "source": "https://github.com/sebastianbergmann/object-reflector/tree/5.0.0" }, "funding": [ { @@ -3671,32 +3605,32 @@ "type": "github" } ], - "time": "2020-10-26T13:14:26+00:00" + "time": "2025-02-07T04:58:17+00:00" }, { "name": "sebastian/recursion-context", - "version": "4.0.6", + "version": "7.0.1", "source": { "type": "git", "url": "https://github.com/sebastianbergmann/recursion-context.git", - "reference": "539c6691e0623af6dc6f9c20384c120f963465a0" + "reference": "0b01998a7d5b1f122911a66bebcb8d46f0c82d8c" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/sebastianbergmann/recursion-context/zipball/539c6691e0623af6dc6f9c20384c120f963465a0", - "reference": "539c6691e0623af6dc6f9c20384c120f963465a0", + "url": "https://api.github.com/repos/sebastianbergmann/recursion-context/zipball/0b01998a7d5b1f122911a66bebcb8d46f0c82d8c", + "reference": "0b01998a7d5b1f122911a66bebcb8d46f0c82d8c", "shasum": "" }, "require": { - "php": ">=7.3" + "php": ">=8.3" }, "require-dev": { - "phpunit/phpunit": "^9.3" + "phpunit/phpunit": "^12.0" }, "type": "library", "extra": { "branch-alias": { - "dev-master": "4.0-dev" + "dev-main": "7.0-dev" } }, "autoload": { @@ -3726,7 +3660,8 @@ "homepage": "https://github.com/sebastianbergmann/recursion-context", "support": { "issues": "https://github.com/sebastianbergmann/recursion-context/issues", - "source": "https://github.com/sebastianbergmann/recursion-context/tree/4.0.6" + "security": "https://github.com/sebastianbergmann/recursion-context/security/policy", + "source": "https://github.com/sebastianbergmann/recursion-context/tree/7.0.1" }, "funding": [ { @@ -3746,86 +3681,32 @@ "type": "tidelift" } ], - "time": "2025-08-10T06:57:39+00:00" - }, - { - "name": "sebastian/resource-operations", - "version": "3.0.4", - "source": { - "type": "git", - "url": "https://github.com/sebastianbergmann/resource-operations.git", - "reference": "05d5692a7993ecccd56a03e40cd7e5b09b1d404e" - }, - "dist": { - "type": "zip", - "url": "https://api.github.com/repos/sebastianbergmann/resource-operations/zipball/05d5692a7993ecccd56a03e40cd7e5b09b1d404e", - "reference": "05d5692a7993ecccd56a03e40cd7e5b09b1d404e", - "shasum": "" - }, - "require": { - "php": ">=7.3" - }, - "require-dev": { - "phpunit/phpunit": "^9.0" - }, - "type": "library", - "extra": { - "branch-alias": { - "dev-main": "3.0-dev" - } - }, - "autoload": { - "classmap": [ - "src/" - ] - }, - "notification-url": "https://packagist.org/downloads/", - "license": [ - "BSD-3-Clause" - ], - "authors": [ - { - "name": "Sebastian Bergmann", - "email": "sebastian@phpunit.de" - } - ], - "description": "Provides a list of PHP built-in functions that operate on resources", - "homepage": "https://www.github.com/sebastianbergmann/resource-operations", - "support": { - "source": "https://github.com/sebastianbergmann/resource-operations/tree/3.0.4" - }, - "funding": [ - { - "url": "https://github.com/sebastianbergmann", - "type": "github" - } - ], - "time": "2024-03-14T16:00:52+00:00" + "time": "2025-08-13T04:44:59+00:00" }, { "name": "sebastian/type", - "version": "3.2.1", + "version": "6.0.3", "source": { "type": "git", "url": "https://github.com/sebastianbergmann/type.git", - "reference": "75e2c2a32f5e0b3aef905b9ed0b179b953b3d7c7" + "reference": "e549163b9760b8f71f191651d22acf32d56d6d4d" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/sebastianbergmann/type/zipball/75e2c2a32f5e0b3aef905b9ed0b179b953b3d7c7", - "reference": "75e2c2a32f5e0b3aef905b9ed0b179b953b3d7c7", + "url": "https://api.github.com/repos/sebastianbergmann/type/zipball/e549163b9760b8f71f191651d22acf32d56d6d4d", + "reference": "e549163b9760b8f71f191651d22acf32d56d6d4d", "shasum": "" }, "require": { - "php": ">=7.3" + "php": ">=8.3" }, "require-dev": { - "phpunit/phpunit": "^9.5" + "phpunit/phpunit": "^12.0" }, "type": "library", "extra": { "branch-alias": { - "dev-master": "3.2-dev" + "dev-main": "6.0-dev" } }, "autoload": { @@ -3848,37 +3729,50 @@ "homepage": "https://github.com/sebastianbergmann/type", "support": { "issues": "https://github.com/sebastianbergmann/type/issues", - "source": "https://github.com/sebastianbergmann/type/tree/3.2.1" + "security": "https://github.com/sebastianbergmann/type/security/policy", + "source": "https://github.com/sebastianbergmann/type/tree/6.0.3" }, "funding": [ { "url": "https://github.com/sebastianbergmann", "type": "github" + }, + { + "url": "https://liberapay.com/sebastianbergmann", + "type": "liberapay" + }, + { + "url": "https://thanks.dev/u/gh/sebastianbergmann", + "type": "thanks_dev" + }, + { + "url": "https://tidelift.com/funding/github/packagist/sebastian/type", + "type": "tidelift" } ], - "time": "2023-02-03T06:13:03+00:00" + "time": "2025-08-09T06:57:12+00:00" }, { "name": "sebastian/version", - "version": "3.0.2", + "version": "6.0.0", "source": { "type": "git", "url": "https://github.com/sebastianbergmann/version.git", - "reference": "c6c1022351a901512170118436c764e473f6de8c" + "reference": "3e6ccf7657d4f0a59200564b08cead899313b53c" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/sebastianbergmann/version/zipball/c6c1022351a901512170118436c764e473f6de8c", - "reference": "c6c1022351a901512170118436c764e473f6de8c", + "url": "https://api.github.com/repos/sebastianbergmann/version/zipball/3e6ccf7657d4f0a59200564b08cead899313b53c", + "reference": "3e6ccf7657d4f0a59200564b08cead899313b53c", "shasum": "" }, "require": { - "php": ">=7.3" + "php": ">=8.3" }, "type": "library", "extra": { "branch-alias": { - "dev-master": "3.0-dev" + "dev-main": "6.0-dev" } }, "autoload": { @@ -3901,7 +3795,8 @@ "homepage": "https://github.com/sebastianbergmann/version", "support": { "issues": "https://github.com/sebastianbergmann/version/issues", - "source": "https://github.com/sebastianbergmann/version/tree/3.0.2" + "security": "https://github.com/sebastianbergmann/version/security/policy", + "source": "https://github.com/sebastianbergmann/version/tree/6.0.0" }, "funding": [ { @@ -3909,7 +3804,7 @@ "type": "github" } ], - "time": "2020-09-28T06:39:44+00:00" + "time": "2025-02-07T05:00:38+00:00" }, { "name": "squizlabs/php_codesniffer", @@ -3990,6 +3885,58 @@ ], "time": "2025-11-04T16:30:35+00:00" }, + { + "name": "staabm/side-effects-detector", + "version": "1.0.5", + "source": { + "type": "git", + "url": "https://github.com/staabm/side-effects-detector.git", + "reference": "d8334211a140ce329c13726d4a715adbddd0a163" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/staabm/side-effects-detector/zipball/d8334211a140ce329c13726d4a715adbddd0a163", + "reference": "d8334211a140ce329c13726d4a715adbddd0a163", + "shasum": "" + }, + "require": { + "ext-tokenizer": "*", + "php": "^7.4 || ^8.0" + }, + "require-dev": { + "phpstan/extension-installer": "^1.4.3", + "phpstan/phpstan": "^1.12.6", + "phpunit/phpunit": "^9.6.21", + "symfony/var-dumper": "^5.4.43", + "tomasvotruba/type-coverage": "1.0.0", + "tomasvotruba/unused-public": "1.0.0" + }, + "type": "library", + "autoload": { + "classmap": [ + "lib/" + ] + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "description": "A static analysis tool to detect side effects in PHP code", + "keywords": [ + "static analysis" + ], + "support": { + "issues": "https://github.com/staabm/side-effects-detector/issues", + "source": "https://github.com/staabm/side-effects-detector/tree/1.0.5" + }, + "funding": [ + { + "url": "https://github.com/staabm", + "type": "github" + } + ], + "time": "2024-10-20T05:08:20+00:00" + }, { "name": "symfony/deprecation-contracts", "version": "v3.6.0", @@ -4059,23 +4006,23 @@ }, { "name": "theseer/tokenizer", - "version": "1.3.1", + "version": "2.0.1", "source": { "type": "git", "url": "https://github.com/theseer/tokenizer.git", - "reference": "b7489ce515e168639d17feec34b8847c326b0b3c" + "reference": "7989e43bf381af0eac72e4f0ca5bcbfa81658be4" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/theseer/tokenizer/zipball/b7489ce515e168639d17feec34b8847c326b0b3c", - "reference": "b7489ce515e168639d17feec34b8847c326b0b3c", + "url": "https://api.github.com/repos/theseer/tokenizer/zipball/7989e43bf381af0eac72e4f0ca5bcbfa81658be4", + "reference": "7989e43bf381af0eac72e4f0ca5bcbfa81658be4", "shasum": "" }, "require": { "ext-dom": "*", "ext-tokenizer": "*", "ext-xmlwriter": "*", - "php": "^7.2 || ^8.0" + "php": "^8.1" }, "type": "library", "autoload": { @@ -4097,7 +4044,7 @@ "description": "A small library for converting tokenized PHP source code into XML and potentially other formats", "support": { "issues": "https://github.com/theseer/tokenizer/issues", - "source": "https://github.com/theseer/tokenizer/tree/1.3.1" + "source": "https://github.com/theseer/tokenizer/tree/2.0.1" }, "funding": [ { @@ -4105,7 +4052,7 @@ "type": "github" } ], - "time": "2025-11-17T20:03:58+00:00" + "time": "2025-12-08T11:19:18+00:00" }, { "name": "webmozart/assert", From 7f726b8f8117a03a2af9f3a293281ba69e0213b3 Mon Sep 17 00:00:00 2001 From: Sein Coray Date: Thu, 5 Feb 2026 15:53:56 +0100 Subject: [PATCH 396/691] adding additional indexes --- .../mysql/20260205140244_indexes.sql | 58 +++++++++++++++++++ .../postgres/20260205140244_indexes.sql | 20 +++++++ 2 files changed, 78 insertions(+) create mode 100644 src/migrations/mysql/20260205140244_indexes.sql create mode 100644 src/migrations/postgres/20260205140244_indexes.sql diff --git a/src/migrations/mysql/20260205140244_indexes.sql b/src/migrations/mysql/20260205140244_indexes.sql new file mode 100644 index 000000000..6f91839a0 --- /dev/null +++ b/src/migrations/mysql/20260205140244_indexes.sql @@ -0,0 +1,58 @@ +-- define stored procedures to create/drop indexes only if they don't exist yet +DROP PROCEDURE IF EXISTS `CreateIndex`; +CREATE PROCEDURE `CreateIndex` +( + IN given_table VARCHAR(64), + IN given_index VARCHAR(64), + IN given_columns VARCHAR(64) +) +BEGIN + + DECLARE IndexIsThere INTEGER; + + SELECT COUNT(1) INTO IndexIsThere + FROM INFORMATION_SCHEMA.STATISTICS + WHERE table_name = given_table + AND index_name = given_index; + + IF IndexIsThere = 0 THEN + SET @sqlstmt = CONCAT('CREATE INDEX ', given_index, ' ON ', given_table, ' (', given_columns, ')'); + PREPARE st FROM @sqlstmt; + EXECUTE st; + DEALLOCATE PREPARE st; + ELSE + SELECT CONCAT('Index ', given_index, ' already exists on Table ', given_table) CreateindexErrorMessage; + END IF; + +END; + +DROP PROCEDURE IF EXISTS `DropIndex`; +CREATE PROCEDURE `DropIndex` +( + IN given_index VARCHAR(64) +) +BEGIN + + DECLARE IndexIsThere INTEGER; + + SELECT COUNT(1) INTO IndexIsThere + FROM INFORMATION_SCHEMA.STATISTICS + WHERE index_name = given_index; + + IF IndexIsThere = 0 THEN + SELECT CONCAT('Index ', given_index, ' does not exist') DropindexErrorMessage; + ELSE + SET @sqlstmt = CONCAT('DROP INDEX ', given_index); + PREPARE st FROM @sqlstmt; + EXECUTE st; + DEALLOCATE PREPARE st; + END IF; + +END; + +-- create new indexes on some isArchived columns which is used on a lot of queries +CALL CreateIndex('Hashlist', 'Hashlist_isArchived_idx', 'isArchived'); +CALL CreateIndex('Task', 'Task_isArchived_priority_idx', 'isArchived, priority'); + +CALL DropIndex('TaskWrapper_isArchived_idx'); -- we drop and replace the single isArchived index with the following composite one +CALL CreateIndex('TaskWrapper', 'TaskWrapper_isArchived_priority_idx', 'isArchived, priority'); diff --git a/src/migrations/postgres/20260205140244_indexes.sql b/src/migrations/postgres/20260205140244_indexes.sql new file mode 100644 index 000000000..a3a78cc74 --- /dev/null +++ b/src/migrations/postgres/20260205140244_indexes.sql @@ -0,0 +1,20 @@ + +-- create indexes on foreign keys which are not created automatically on postgres +CREATE INDEX IF NOT EXISTS ApiKey_apiGroupId_idx ON ApiKey(apiGroupId); +CREATE INDEX IF NOT EXISTS ApiKey_userId_idx ON ApiKey(userId); +CREATE INDEX IF NOT EXISTS File_accessGroupId_idx ON File(accessGroupId); +CREATE INDEX IF NOT EXISTS Hashlist_accessGroupId_idx ON Hashlist(accessGroupId); +CREATE INDEX IF NOT EXISTS HealthCheck_crackerBinaryId_idx ON HealthCheck(crackerBinaryId); +CREATE INDEX IF NOT EXISTS HealthCheckAgent_healthCheckId_idx ON HealthCheckAgent(healthCheckId); +CREATE INDEX IF NOT EXISTS HealthCheckAgent_agentId_idx ON healthCheckAgent(agentId); +CREATE INDEX IF NOT EXISTS Pretask_crackerBinaryTypeId_idx ON Pretask(crackerBinaryTypeId); +CREATE INDEX IF NOT EXISTS Task_taskWrapperId_idx ON Task(taskWrapperId); +CREATE INDEX IF NOT EXISTS Task_crackerBinaryTypeId_idx ON Task(crackerBinaryTypeId); +CREATE INDEX IF NOT EXISTS TaskDebugOutput_taskId_idx ON TaskDebugOutput(taskId); + +-- create new indexes on some isArchived columns which is used on a lot of queries +CREATE INDEX IF NOT EXISTS Hashlist_isArchived_idx ON Hashlist(isArchived); +CREATE INDEX IF NOT EXISTS Task_isArchived_priority_idx ON Task(isArchived, priority); +DROP INDEX IF EXISTS TaskWrapper_isArchived_idx; -- we drop and replace the single isArchived index with the following composite one +CREATE INDEX IF NOT EXISTS TaskWrapper_isArchived_priority_idx ON TaskWrapper(isArchived, priority); + From 07538a657d127c50a670985592f663a3f6e63a17 Mon Sep 17 00:00:00 2001 From: Sein Coray Date: Thu, 5 Feb 2026 16:03:36 +0100 Subject: [PATCH 397/691] Update src/migrations/postgres/20260205140244_indexes.sql Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com> --- src/migrations/postgres/20260205140244_indexes.sql | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/migrations/postgres/20260205140244_indexes.sql b/src/migrations/postgres/20260205140244_indexes.sql index a3a78cc74..356101bb6 100644 --- a/src/migrations/postgres/20260205140244_indexes.sql +++ b/src/migrations/postgres/20260205140244_indexes.sql @@ -6,7 +6,7 @@ CREATE INDEX IF NOT EXISTS File_accessGroupId_idx ON File(accessGroupId); CREATE INDEX IF NOT EXISTS Hashlist_accessGroupId_idx ON Hashlist(accessGroupId); CREATE INDEX IF NOT EXISTS HealthCheck_crackerBinaryId_idx ON HealthCheck(crackerBinaryId); CREATE INDEX IF NOT EXISTS HealthCheckAgent_healthCheckId_idx ON HealthCheckAgent(healthCheckId); -CREATE INDEX IF NOT EXISTS HealthCheckAgent_agentId_idx ON healthCheckAgent(agentId); +CREATE INDEX IF NOT EXISTS HealthCheckAgent_agentId_idx ON HealthCheckAgent(agentId); CREATE INDEX IF NOT EXISTS Pretask_crackerBinaryTypeId_idx ON Pretask(crackerBinaryTypeId); CREATE INDEX IF NOT EXISTS Task_taskWrapperId_idx ON Task(taskWrapperId); CREATE INDEX IF NOT EXISTS Task_crackerBinaryTypeId_idx ON Task(crackerBinaryTypeId); From ccc43835c95a5025cadfbd87fd73b66ffc88398c Mon Sep 17 00:00:00 2001 From: Sein Coray Date: Thu, 5 Feb 2026 16:22:26 +0100 Subject: [PATCH 398/691] fix index drop procedure, naming of indexes consistent with existing ones --- src/migrations/mysql/20260205140244_indexes.sql | 16 +++++++++------- 1 file changed, 9 insertions(+), 7 deletions(-) diff --git a/src/migrations/mysql/20260205140244_indexes.sql b/src/migrations/mysql/20260205140244_indexes.sql index 6f91839a0..df6c8d614 100644 --- a/src/migrations/mysql/20260205140244_indexes.sql +++ b/src/migrations/mysql/20260205140244_indexes.sql @@ -29,6 +29,7 @@ END; DROP PROCEDURE IF EXISTS `DropIndex`; CREATE PROCEDURE `DropIndex` ( + IN given_table VARCHAR(64), IN given_index VARCHAR(64) ) BEGIN @@ -37,12 +38,13 @@ BEGIN SELECT COUNT(1) INTO IndexIsThere FROM INFORMATION_SCHEMA.STATISTICS - WHERE index_name = given_index; + WHERE table_name = given_table + AND index_name = given_index; IF IndexIsThere = 0 THEN - SELECT CONCAT('Index ', given_index, ' does not exist') DropindexErrorMessage; + SELECT CONCAT('Index ', given_index, ' does not exist on table ', given_table) DropindexErrorMessage; ELSE - SET @sqlstmt = CONCAT('DROP INDEX ', given_index); + SET @sqlstmt = CONCAT('DROP INDEX ', given_index, ' ON ', given_table); PREPARE st FROM @sqlstmt; EXECUTE st; DEALLOCATE PREPARE st; @@ -51,8 +53,8 @@ BEGIN END; -- create new indexes on some isArchived columns which is used on a lot of queries -CALL CreateIndex('Hashlist', 'Hashlist_isArchived_idx', 'isArchived'); -CALL CreateIndex('Task', 'Task_isArchived_priority_idx', 'isArchived, priority'); +CALL CreateIndex('Hashlist', 'isArchived', 'isArchived'); +CALL CreateIndex('Task', 'isArchived_priority', 'isArchived, priority'); -CALL DropIndex('TaskWrapper_isArchived_idx'); -- we drop and replace the single isArchived index with the following composite one -CALL CreateIndex('TaskWrapper', 'TaskWrapper_isArchived_priority_idx', 'isArchived, priority'); +CALL DropIndex('TaskWrapper', 'isArchived'); -- we drop and replace the single isArchived index with the following composite one +CALL CreateIndex('TaskWrapper', 'isArchived_priority', 'isArchived, priority'); From eb767f70cd0549d2219e9bf9912e6712f60e1ff2 Mon Sep 17 00:00:00 2001 From: s3inlc Date: Fri, 6 Feb 2026 14:53:31 +0100 Subject: [PATCH 399/691] changed to composite index also for hashlists --- src/migrations/mysql/20260205140244_indexes.sql | 2 +- src/migrations/postgres/20260205140244_indexes.sql | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/migrations/mysql/20260205140244_indexes.sql b/src/migrations/mysql/20260205140244_indexes.sql index df6c8d614..438e8be51 100644 --- a/src/migrations/mysql/20260205140244_indexes.sql +++ b/src/migrations/mysql/20260205140244_indexes.sql @@ -53,7 +53,7 @@ BEGIN END; -- create new indexes on some isArchived columns which is used on a lot of queries -CALL CreateIndex('Hashlist', 'isArchived', 'isArchived'); +CALL CreateIndex('Hashlist', 'isArchived', 'isArchived, hashlistId'); CALL CreateIndex('Task', 'isArchived_priority', 'isArchived, priority'); CALL DropIndex('TaskWrapper', 'isArchived'); -- we drop and replace the single isArchived index with the following composite one diff --git a/src/migrations/postgres/20260205140244_indexes.sql b/src/migrations/postgres/20260205140244_indexes.sql index 356101bb6..29010be7b 100644 --- a/src/migrations/postgres/20260205140244_indexes.sql +++ b/src/migrations/postgres/20260205140244_indexes.sql @@ -13,7 +13,7 @@ CREATE INDEX IF NOT EXISTS Task_crackerBinaryTypeId_idx ON Task(crackerBinaryTyp CREATE INDEX IF NOT EXISTS TaskDebugOutput_taskId_idx ON TaskDebugOutput(taskId); -- create new indexes on some isArchived columns which is used on a lot of queries -CREATE INDEX IF NOT EXISTS Hashlist_isArchived_idx ON Hashlist(isArchived); +CREATE INDEX IF NOT EXISTS Hashlist_isArchived_idx ON Hashlist(isArchived, hashlistId); CREATE INDEX IF NOT EXISTS Task_isArchived_priority_idx ON Task(isArchived, priority); DROP INDEX IF EXISTS TaskWrapper_isArchived_idx; -- we drop and replace the single isArchived index with the following composite one CREATE INDEX IF NOT EXISTS TaskWrapper_isArchived_priority_idx ON TaskWrapper(isArchived, priority); From 28e0239bd001c56bc1aa9a2c756c19e13cd697d0 Mon Sep 17 00:00:00 2001 From: s3inlc Date: Fri, 6 Feb 2026 15:49:43 +0100 Subject: [PATCH 400/691] refactored all filter,group,update array keys to use the constants --- src/dba/AbstractModelFactory.class.php | 106 ++++++++++++------------- 1 file changed, 53 insertions(+), 53 deletions(-) diff --git a/src/dba/AbstractModelFactory.class.php b/src/dba/AbstractModelFactory.class.php index c55f2780b..54385c9e9 100755 --- a/src/dba/AbstractModelFactory.class.php +++ b/src/dba/AbstractModelFactory.class.php @@ -173,11 +173,11 @@ public function save(AbstractModel $model): ?AbstractModel { * @return Filter[] */ private function getFilters(array $arr): array { - if (!is_array($arr['filter'])) { - $arr['filter'] = array($arr['filter']); + if (!is_array($arr[Factory::FILTER])) { + $arr[Factory::FILTER] = array($arr[Factory::FILTER]); } - if (isset($arr['filter'])) { - return $arr['filter']; + if (isset($arr[Factory::FILTER])) { + return $arr[Factory::FILTER]; } return array(); } @@ -187,11 +187,11 @@ private function getFilters(array $arr): array { * @return Order[] */ private function getOrders(array $arr): array { - if (!is_array($arr['order'])) { - $arr['order'] = array($arr['order']); + if (!is_array($arr[Factory::ORDER])) { + $arr[Factory::ORDER] = array($arr[Factory::ORDER]); } - if (isset($arr['order'])) { - return $arr['order']; + if (isset($arr[Factory::ORDER])) { + return $arr[Factory::ORDER]; } return array(); } @@ -201,11 +201,11 @@ private function getOrders(array $arr): array { * @return Group[] */ private function getGroups(array $arr): array { - if (!is_array($arr['group'])) { - $arr['group'] = array($arr['group']); + if (!is_array($arr[Factory::GROUP])) { + $arr[Factory::GROUP] = array($arr[Factory::GROUP]); } - if (isset($arr['group'])) { - return $arr['group']; + if (isset($arr[Factory::GROUP])) { + return $arr[Factory::GROUP]; } return array(); } @@ -215,11 +215,11 @@ private function getGroups(array $arr): array { * @return Join[] */ private function getJoins(array $arr): array { - if (!is_array($arr['join'])) { - $arr['join'] = array($arr['join']); + if (!is_array($arr[Factory::JOIN])) { + $arr[Factory::JOIN] = array($arr[Factory::JOIN]); } - if (isset($arr['join'])) { - return $arr['join']; + if (isset($arr[Factory::JOIN])) { + return $arr[Factory::JOIN]; } return array(); } @@ -423,8 +423,8 @@ public function minMaxFilter(array $options, string $sumColumn, string $op): mix $vals = array(); - if (array_key_exists("filter", $options)) { - $query .= $this->applyFilters($vals, $options['filter']); + if (array_key_exists(Factory::FILTER, $options)) { + $query .= $this->applyFilters($vals, $options[Factory::FILTER]); } $dbh = self::getDB(); @@ -449,11 +449,11 @@ public function multicolAggregationFilter($options, $aggregations) { $vals = array(); - if (array_key_exists('join', $options)) { - $query .= $this->applyJoins($options['join']); + if (array_key_exists(Factory::JOIN, $options)) { + $query .= $this->applyJoins($options[Factory::JOIN]); } - if (array_key_exists("filter", $options)) { - $query .= $this->applyFilters($vals, $options['filter']); + if (array_key_exists(Factory::FILTER, $options)) { + $query .= $this->applyFilters($vals, $options[Factory::FILTER]); } $dbh = self::getDB(); @@ -469,8 +469,8 @@ public function sumFilter($options, $sumColumn) { $vals = array(); - if (array_key_exists("filter", $options)) { - $query .= $this->applyFilters($vals, $options['filter']); + if (array_key_exists(Factory::FILTER, $options)) { + $query .= $this->applyFilters($vals, $options[Factory::FILTER]); } $dbh = self::getDB(); @@ -487,12 +487,12 @@ public function countFilter($options) { $vals = array(); - if (array_key_exists('join', $options)) { - $query .= $this->applyJoins($options['join']); + if (array_key_exists(Factory::JOIN, $options)) { + $query .= $this->applyJoins($options[Factory::JOIN]); } - if (array_key_exists("filter", $options)) { - $query .= $this->applyFilters($vals, $options['filter']); + if (array_key_exists(Factory::FILTER, $options)) { + $query .= $this->applyFilters($vals, $options[Factory::FILTER]); } $dbh = self::getDB(); @@ -554,9 +554,9 @@ public function getFromDB($pk): ?AbstractModel { * structure * * $options = array(); - * $options['filter'] is an array of QueryFilter options - * $options['order'] is an array of OrderFilter options - * $options['join'] is an array of JoinFilter options + * $options[Factory::FILTER] is an array of QueryFilter options + * $options[Factory::ORDER] is an array of OrderFilter options + * $options[Factory::JOIN] is an array of JoinFilter options * * @param $options array containing option settings * @return AbstractModel[]|AbstractModel Returns a list of matching objects or Null @@ -589,25 +589,25 @@ private function filterWithJoin(array $options): array|AbstractModel { } // Apply all normal filter to this query - if (array_key_exists("filter", $options)) { - $query .= $this->applyFilters($vals, $options['filter']); + if (array_key_exists(Factory::FILTER, $options)) { + $query .= $this->applyFilters($vals, $options[Factory::FILTER]); } - if (array_key_exists("group", $options)) { + if (array_key_exists(Factory::GROUP, $options)) { $query .= $this->applyGroups($this->getGroups($options)); } // Apply order filter - if (!array_key_exists("order", $options)) { + if (!array_key_exists(Factory::ORDER, $options)) { // Add a asc order on the primary keys as a standard $oF = new OrderFilter($this->getNullObject()->getPrimaryKey(), "ASC"); $orderOptions = array($oF); - $options['order'] = $orderOptions; + $options[Factory::ORDER] = $orderOptions; } - $query .= $this->applyOrder($options['order']); + $query .= $this->applyOrder($options[Factory::ORDER]); - if (array_key_exists("limit", $options)) { - $query .= $this->applyLimit($options['limit']); + if (array_key_exists(Factory::LIMIT, $options)) { + $query .= $this->applyLimit($options[Factory::LIMIT]); } $dbh = self::getDB(); $stmt = $dbh->prepare($query); @@ -647,7 +647,7 @@ private function filterWithJoin(array $options): array|AbstractModel { */ public function filter(array $options, bool $single = false) { // Check if we need to join and if so pass on to internal Function - if (array_key_exists('join', $options)) { + if (array_key_exists(Factory::JOIN, $options)) { return $this->filterWithJoin($options); } @@ -655,24 +655,24 @@ public function filter(array $options, bool $single = false) { $query = "SELECT " . implode(", ", $keys) . " FROM " . $this->getMappedModelTable(); $vals = array(); - if (array_key_exists("filter", $options)) { - $query .= $this->applyFilters($vals, $options['filter']); + if (array_key_exists(Factory::FILTER, $options)) { + $query .= $this->applyFilters($vals, $options[Factory::FILTER]); } - if (array_key_exists("group", $options)) { + if (array_key_exists(Factory::GROUP, $options)) { $query .= $this->applyGroups($this->getGroups($options)); } - if (!array_key_exists("order", $options)) { + if (!array_key_exists(Factory::ORDER, $options)) { // Add a asc order on the primary keys as a standard $oF = new OrderFilter($this->getNullObject()->getPrimaryKey(), "ASC"); $orderOptions = array($oF); - $options['order'] = $orderOptions; + $options[Factory::ORDER] = $orderOptions; } - $query .= $this->applyOrder($options['order']); + $query .= $this->applyOrder($options[Factory::ORDER]); - if (array_key_exists("limit", $options)) { - $query .= $this->applyLimit($options['limit']); + if (array_key_exists(Factory::LIMIT, $options)) { + $query .= $this->applyLimit($options[Factory::LIMIT]); } $dbh = self::getDB(); @@ -815,7 +815,7 @@ public function massDeletion(array $options): PDOStatement { $vals = array(); - if (array_key_exists("filter", $options)) { + if (array_key_exists(Factory::FILTER, $options)) { $query .= $this->applyFilters($vals, $this->getFilters($options)); } @@ -871,11 +871,11 @@ public function massUpdate($options): bool { $vals = array(); - if (array_key_exists("update", $options)) { + if (array_key_exists(Factory::UPDATE, $options)) { $query = $query . " SET "; - $updateOptions = $options['update']; + $updateOptions = $options[Factory::UPDATE]; if (!is_array($updateOptions)) { $updateOptions = array($updateOptions); } @@ -894,8 +894,8 @@ public function massUpdate($options): bool { } } - if (array_key_exists("filter", $options)) { - $query .= $this->applyFilters($vals, $options['filter']); + if (array_key_exists(Factory::FILTER, $options)) { + $query .= $this->applyFilters($vals, $options[Factory::FILTER]); } $dbh = self::getDB(); From b1c67ca003288db58fa9a8a62e6d2856918b0b40 Mon Sep 17 00:00:00 2001 From: jessevz Date: Wed, 11 Feb 2026 14:47:02 +0100 Subject: [PATCH 401/691] Made a lot of progress --- src/dba/AbstractModelFactory.class.php | 1 + src/dba/CoalesceColumn.class.php | 25 ++++++ .../CoalesceLikeFilterInsensitive.class.php | 16 ++-- src/dba/CoalesceOrderFilter.class.php | 5 +- src/dba/LikeFilterInsensitive.class.php | 4 + src/dba/init.php | 1 + .../apiv2/common/AbstractBaseAPI.class.php | 89 ++++++++++++++----- .../apiv2/common/AbstractModelAPI.class.php | 14 ++- src/inc/apiv2/model/taskwrappers.routes.php | 29 ++++-- 9 files changed, 137 insertions(+), 47 deletions(-) create mode 100644 src/dba/CoalesceColumn.class.php diff --git a/src/dba/AbstractModelFactory.class.php b/src/dba/AbstractModelFactory.class.php index c55f2780b..7726ad3ce 100755 --- a/src/dba/AbstractModelFactory.class.php +++ b/src/dba/AbstractModelFactory.class.php @@ -494,6 +494,7 @@ public function countFilter($options) { if (array_key_exists("filter", $options)) { $query .= $this->applyFilters($vals, $options['filter']); } + error_log($query); $dbh = self::getDB(); $stmt = $dbh->prepare($query); diff --git a/src/dba/CoalesceColumn.class.php b/src/dba/CoalesceColumn.class.php new file mode 100644 index 000000000..466c2483d --- /dev/null +++ b/src/dba/CoalesceColumn.class.php @@ -0,0 +1,25 @@ +value = $value; + $this->factory = $factory; + } + + function getValue() { + return $this->value; + } + + function getFactory() { + return $this->factory; + } +} \ No newline at end of file diff --git a/src/dba/CoalesceLikeFilterInsensitive.class.php b/src/dba/CoalesceLikeFilterInsensitive.class.php index 1a6fc7137..8094c3d58 100644 --- a/src/dba/CoalesceLikeFilterInsensitive.class.php +++ b/src/dba/CoalesceLikeFilterInsensitive.class.php @@ -3,14 +3,16 @@ namespace DBA; class CoalesceLikeFilterInsensitive extends Filter { - private $key; private $value; /** * @var AbstractModelFactory */ private $overrideFactory; - private $columns; + /** + * @var CoalesceColumn[] $columns + */ + private array $columns; function __construct($columns, $value, $overrideFactory = null) { $this->columns = $columns; @@ -22,16 +24,12 @@ function getQueryString(AbstractModelFactory $factory, bool $includeTable = fals if ($this->overrideFactory != null) { $factory = $this->overrideFactory; } - $table = ""; - if ($includeTable) { - $table = $factory->getMappedModelTable() . "."; - } $mapped_columns = []; foreach($this->columns as $column) { - array_push($mapped_columns, $table . AbstractModelFactory::getMappedModelKey($factory->getNullObject(), $column)); + $columnFactory = $column->getFactory(); + array_push($mapped_columns, $columnFactory->getMappedModelTable() . "." . AbstractModelFactory::getMappedModelKey($columnFactory->getNullObject(), $column->getValue())); } - - return "LOWER(" . "COALESCE(" . implode(", ", $mapped_columns) . ") " . ") LIKE LOWER(?)"; + return "LOWER(" . "COALESCE(" . implode(", ", $mapped_columns) . ")" . ") LIKE LOWER(?)"; } function getValue() { diff --git a/src/dba/CoalesceOrderFilter.class.php b/src/dba/CoalesceOrderFilter.class.php index 26ae2efb3..cd1bed5c2 100644 --- a/src/dba/CoalesceOrderFilter.class.php +++ b/src/dba/CoalesceOrderFilter.class.php @@ -4,6 +4,9 @@ class CoalesceOrderFilter extends Order { // The columns to do the COALESCE function on + /** + * @var CoalesceColumn[] $columns + */ private $columns; private $type; @@ -15,7 +18,7 @@ function __construct($columns, $type) { function getQueryString(AbstractModelFactory $factory, bool $includeTable = false): string { $mapped_columns = []; foreach($this->columns as $column) { - array_push($mapped_columns, AbstractModelFactory::getMappedModelKey($factory->getNullObject(), $column)); + array_push($mapped_columns, AbstractModelFactory::getMappedModelKey($column->getFactory()->getNullObject(), $column->getValue())); } return "COALESCE(" . implode(", ", $mapped_columns) . ") " . $this->type; } diff --git a/src/dba/LikeFilterInsensitive.class.php b/src/dba/LikeFilterInsensitive.class.php index 557680b0a..30da9c860 100755 --- a/src/dba/LikeFilterInsensitive.class.php +++ b/src/dba/LikeFilterInsensitive.class.php @@ -35,4 +35,8 @@ function getValue() { function getHasValue(): bool { return true; } + + function getKey() { + return $this->key; + } } diff --git a/src/dba/init.php b/src/dba/init.php index 681788500..f48ee7e83 100644 --- a/src/dba/init.php +++ b/src/dba/init.php @@ -13,6 +13,7 @@ require_once(dirname(__FILE__) . "/Aggregation.class.php"); require_once(dirname(__FILE__) . "/Filter.class.php"); require_once(dirname(__FILE__) . "/Order.class.php"); +require_once(dirname(__FILE__) . "/CoalesceColumn.class.php"); require_once(dirname(__FILE__) . "/CoalesceLikeFilterInsensitive.class.php"); require_once(dirname(__FILE__) . "/CoalesceOrderFilter.class.php"); require_once(dirname(__FILE__) . "/Join.class.php"); diff --git a/src/inc/apiv2/common/AbstractBaseAPI.class.php b/src/inc/apiv2/common/AbstractBaseAPI.class.php index a7e3ed19a..e9596d92f 100644 --- a/src/inc/apiv2/common/AbstractBaseAPI.class.php +++ b/src/inc/apiv2/common/AbstractBaseAPI.class.php @@ -1,5 +1,6 @@ getQueryParameterFamily($request, 'filter'); } + + protected static function checkJoinExists(array $joins, $modelName) { + foreach($joins as $join) { + if ($join->getOtherFactory()->getModelName() === $modelName) { + return true; + } + } + return false; + } /** * Check for valid filter parameters and build QueryFilter * @throws HttpForbidden * @throws InternalError */ - protected function makeFilter(array $filters, object $apiClass): array { + protected function makeFilter(array $filters, object $apiClass, array &$joinFilters = []): array { + // protected function makeFilter(array $filters, object $apiClass, array &$joinFilters): array { $qFs = []; $features = $apiClass->getAliasedFeatures(); $factory = $apiClass->getFactory(); foreach ($filters as $filter => $value) { - if (preg_match('/^(?P[_a-zA-Z0-9]+?)(?|__eq|__ne|__lt|__lte|__gt|__gte|__contains|__startswith|__endswith|__icontains|__istartswith|__iendswith|__in|__nin)$/', $filter, $matches) == 0) { + if (preg_match('/^(?P[_a-zA-Z0-9.]+?)(?|__eq|__ne|__lt|__lte|__gt|__gte|__contains|__startswith|__endswith|__icontains|__istartswith|__iendswith|__in|__nin)$/', $filter, $matches) == 0) { throw new HttpForbidden("Filter parameter '" . $filter . "' is not valid"); } // Special filtering of _id to use for uniform access to model primary key $cast_key = $matches['key'] == 'id' ? array_column($features, 'alias', 'dbname')[$this->getPrimaryKey()] : $matches['key']; + if (strpos($cast_key, ".")) { + //When the key contains a "." it should be a relation in format: "task.taskname" where task is the relation. + $relationObject = $this->retrieveRelationKey($cast_key); + $factory = $relationObject->factory; + $cast_key = $relationObject->cast_key; + if (!self::checkJoinExists($joinFilters, $factory->getModelName())) { + $joinFilters[] = new JoinFilter($factory, $relationObject->joinKey, $relationObject->key); + } + $features = $relationObject->features_relation; + } if (!array_key_exists($cast_key, $features)) { throw new HttpForbidden("Filter parameter '" . $filter . "' is not valid (key not valid field)"); @@ -1158,7 +1180,38 @@ protected function makeFilter(array $filters, object $apiClass): array { } return $qFs; } - + + /** + * Retrieves the relation from a sort/filter value. ex task.taskName when task is a relation for the current + * Model endpoint. This works only for relations of 1 deep + */ + protected function retrieveRelationKey(string $value): object { + $parts = explode(".", $value); + if (count($parts) == 2) { + $relationString = $parts[0]; + $relations = $this->getAllRelationships(); + if (array_key_exists($relationString, $relations)) { + $relationClass = $relations[$relationString]['relationType']; + $relationFeatures = $this->getAliasedFeaturesOther($relationClass); + $factory = $this->getModelFactory($relationClass); + $joinKey = $relations[$relationString]['relationKey']; + $key = $relations[$relationString]['key']; + $features_relation = $relationFeatures; + $value = $parts[1]; + return (object) [ + "factory" => $factory, + "joinKey" => $joinKey, + "key" => $key, + "features_relation" => $features_relation, + "cast_key" => $value + ]; + } else { + throw new HttpError("Invalid relation: " . $relationString); + } + } else { + throw new HttpError("Invalid key, multiple '.' found in key, but only relationships of one deep is allowed"); + } + } /** * Check for valid ordering parameters and build QueryFilter @@ -1172,9 +1225,6 @@ protected function makeOrderFilterTemplates(Request $request, array $features, s $orderings = $this->getQueryParameterAsList($request, 'sort'); $contains_primary_key = false; foreach ($orderings as $order) { - $factory = null; - $joinKey = null; - $key = null; $features_sort = $features; if (preg_match('/^(?P[-])?(?P[_a-zA-Z.]+)$/', $order, $matches)) { // Special filtering of _id to use for uniform access to model primary key @@ -1183,29 +1233,20 @@ protected function makeOrderFilterTemplates(Request $request, array $features, s $contains_primary_key = true; } if (strpos($cast_key, ".")) { - $parts = explode(".", $cast_key); - if (count($parts) == 2) { // Only relations of 1 deep allowed ex. task.keyspace - $relationString = $parts[0]; - //currently getting all relationships, but its probably only possible to sort on 1 to 1 relations - $relations = $this->getAllRelationships(); - if (array_key_exists($relationString, $relations)) { - $relationClass = $relations[$relationString]['relationType']; - $relationFeatures = $this->getAliasedFeaturesOther($relationClass); - $factory = $this->getModelFactory($relationClass); - $joinKey = $relations[$relationString]['relationKey']; - $key = $relations[$relationString]['key']; - $features_sort = $relationFeatures; - $cast_key = $parts[1]; - } - } - } + $relationObject = $this->retrieveRelationKey($cast_key); + $factory = $relationObject->factory; + $joinKey = $relationObject->joinKey; + $cast_key = $relationObject->cast_key; + $key = $relationObject->key; + $features_sort = $relationObject->features_relation; + } if (array_key_exists($cast_key, $features_sort)) { $remappedKey = $features_sort[$cast_key]['dbname']; $type = ($matches['operator'] == '-') ? "DESC" : "ASC"; if ($reverseSort) { $type = ($type == "ASC") ? "DESC" : "ASC"; } - $orderTemplates[] = ['by' => $remappedKey, 'type' => $type, 'factory' => $factory, 'joinKey' => $joinKey, 'key' => $key]; + $orderTemplates[] = ['by' => $remappedKey, 'type' => $type, 'factory' => $factory ?? null, 'joinKey' => $joinKey ?? null, 'key' => $key ?? null]; } else { throw new HttpForbidden("Ordering parameter '" . $order . "' is not valid"); diff --git a/src/inc/apiv2/common/AbstractModelAPI.class.php b/src/inc/apiv2/common/AbstractModelAPI.class.php index faaec7f4c..012288c7c 100644 --- a/src/inc/apiv2/common/AbstractModelAPI.class.php +++ b/src/inc/apiv2/common/AbstractModelAPI.class.php @@ -599,10 +599,11 @@ public static function getManyResources(object $apiClass, Request $request, Resp /* Object filter definition */ $aFs = []; + $joinFilters = []; /* Generate filters */ $filters = $apiClass->getFilters($request); - $qFs_Filter = $apiClass->makeFilter($filters, $apiClass); + $qFs_Filter = $apiClass->makeFilter($filters, $apiClass, $joinFilters); $group = Factory::getRightGroupFactory()->get($apiClass->getCurrentUser()->getRightGroupId()); if ($group->getPermissions() !== 'ALL') { // Only add permission filters when no admin user $aFs_ACL = $apiClass->getFilterACL(); @@ -628,6 +629,11 @@ public static function getManyResources(object $apiClass, Request $request, Resp //this is used to reverse the array to show the data correctly for the user $reverseArray = false; + $aFs[Factory::JOIN] = $joinFilters; + $aFs = $apiClass->parseFilters($aFs); + foreach($aFs[Factory::JOIN] as $a) { + error_log($a->getOtherTableName()); + } $firstCursorObject = $apiClass->getMinMaxCursor($apiClass, "ASC", $aFs, $request, $aliasedfeatures); $lastCursorObject = $apiClass->getMinMaxCursor($apiClass, "DESC", $aFs, $request, $aliasedfeatures); @@ -667,7 +673,6 @@ public static function getManyResources(object $apiClass, Request $request, Resp $orderTemplates[0]["type"] = $defaultSort; $primaryFilter = $orderTemplates[0]['by']; $orderFilters = []; - $joinFilters = []; // Build actual order filters foreach ($orderTemplates as $orderTemplate) { @@ -676,7 +681,9 @@ public static function getManyResources(object $apiClass, Request $request, Resp if ($orderTemplate['factory'] !== null) { // if factory of ordertemplate is not null, sort is happening on joined table $otherFactory = $orderTemplate['factory']; - $joinFilters[] = new JoinFilter($otherFactory, $orderTemplate['joinKey'], $orderTemplate['key']); + if (!$apiClass::checkJoinExists($joinFilters, $otherFactory->getModelName())) { + $joinFilters[] = new JoinFilter($otherFactory, $orderTemplate['joinKey'], $orderTemplate['key']); + } } } @@ -685,7 +692,6 @@ public static function getManyResources(object $apiClass, Request $request, Resp /* Include relation filters */ $finalFs = array_merge($aFs, $relationFs); - $finalFs = $apiClass->parseFilters($finalFs); //TODO it would be even better if its possible to see if the primary filter is unique, instead of primary key. //But this probably needs to be added in getFeatures() then. diff --git a/src/inc/apiv2/model/taskwrappers.routes.php b/src/inc/apiv2/model/taskwrappers.routes.php index 8cb99c1e8..47cd97688 100644 --- a/src/inc/apiv2/model/taskwrappers.routes.php +++ b/src/inc/apiv2/model/taskwrappers.routes.php @@ -1,6 +1,7 @@ getBy() == Task::TASK_NAME) { - $newOrderFilter = new CoalesceOrderFilter([Task::TASK_NAME, TaskWrapper::TASK_WRAPPER_NAME], $orderfilter->getType()); - $orderfilter = $newOrderFilter; + if (isset($filters[Factory::ORDER])) { + foreach ($filters[Factory::ORDER] as &$orderfilter) { + if ($orderfilter->getBy() == Task::TASK_NAME) { + $coalesceColumns = [new CoalesceColumn(Task::TASK_NAME, Factory::getTaskFactory()), new CoalesceColumn(TaskWrapper::TASK_WRAPPER_NAME, Factory::getTaskWrapperFactory())]; + $newOrderFilter = new CoalesceOrderFilter($coalesceColumns, $orderfilter->getType()); + $orderfilter = $newOrderFilter; + } } + unset($orderfilter); } - unset($orderfilter); - - foreach($filters[Factory::FILTER] as &$filter) { - $newFilter = new CoalesceLikeFilterInsensitive(); + if (isset($filters[Factory::FILTER])) { + foreach($filters[Factory::FILTER] as &$filter) { + if ($filter instanceof LikeFilterInsensitive && $filter->getKey() == Task::TASK_NAME) { + $coalesceColumns = [new CoalesceColumn(Task::TASK_NAME, Factory::getTaskFactory()), new CoalesceColumn(TaskWrapper::TASK_WRAPPER_NAME, Factory::getTaskWrapperFactory())]; + $newFilter = new CoalesceLikeFilterInsensitive($coalesceColumns, $filter->getValue()); + $filter = $newFilter; + } + } + unset($filter); } - unset($filter); } return $filters; } From b1492dac16974f95ddc1007c36d1357202b99631 Mon Sep 17 00:00:00 2001 From: s3inlc Date: Thu, 12 Feb 2026 08:40:56 +0100 Subject: [PATCH 402/691] update composite indexes --- src/migrations/mysql/20260205140244_indexes.sql | 4 ++-- src/migrations/postgres/20260205140244_indexes.sql | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/migrations/mysql/20260205140244_indexes.sql b/src/migrations/mysql/20260205140244_indexes.sql index 438e8be51..edf10bd5d 100644 --- a/src/migrations/mysql/20260205140244_indexes.sql +++ b/src/migrations/mysql/20260205140244_indexes.sql @@ -54,7 +54,7 @@ END; -- create new indexes on some isArchived columns which is used on a lot of queries CALL CreateIndex('Hashlist', 'isArchived', 'isArchived, hashlistId'); -CALL CreateIndex('Task', 'isArchived_priority', 'isArchived, priority'); +CALL CreateIndex('Task', 'isArchived_priority_taskId', 'isArchived, priority DESC, taskId ASC'); CALL DropIndex('TaskWrapper', 'isArchived'); -- we drop and replace the single isArchived index with the following composite one -CALL CreateIndex('TaskWrapper', 'isArchived_priority', 'isArchived, priority'); +CALL CreateIndex('TaskWrapper', 'isArchived_priority_taskWrapperId', 'isArchived, priority DESC, taskWrapperId ASC'); diff --git a/src/migrations/postgres/20260205140244_indexes.sql b/src/migrations/postgres/20260205140244_indexes.sql index 29010be7b..939d23281 100644 --- a/src/migrations/postgres/20260205140244_indexes.sql +++ b/src/migrations/postgres/20260205140244_indexes.sql @@ -14,7 +14,7 @@ CREATE INDEX IF NOT EXISTS TaskDebugOutput_taskId_idx ON TaskDebugOutput(taskId) -- create new indexes on some isArchived columns which is used on a lot of queries CREATE INDEX IF NOT EXISTS Hashlist_isArchived_idx ON Hashlist(isArchived, hashlistId); -CREATE INDEX IF NOT EXISTS Task_isArchived_priority_idx ON Task(isArchived, priority); +CREATE INDEX IF NOT EXISTS Task_isArchived_priority_taskId_idx ON Task(isArchived, priority DESC, taskId ASC); DROP INDEX IF EXISTS TaskWrapper_isArchived_idx; -- we drop and replace the single isArchived index with the following composite one -CREATE INDEX IF NOT EXISTS TaskWrapper_isArchived_priority_idx ON TaskWrapper(isArchived, priority); +CREATE INDEX IF NOT EXISTS TaskWrapper_isArchived_priority_taskWrapperId_idx ON TaskWrapper(isArchived, priority DESC, taskWrapperId ASC); From f86d9092525f766465c8f1bbb7df32481454fc1c Mon Sep 17 00:00:00 2001 From: s3inlc Date: Thu, 12 Feb 2026 09:53:20 +0100 Subject: [PATCH 403/691] first implementation of columnFilter --- src/dba/AbstractModelFactory.class.php | 25 +++++++++++++++++++++++++ 1 file changed, 25 insertions(+) diff --git a/src/dba/AbstractModelFactory.class.php b/src/dba/AbstractModelFactory.class.php index 54385c9e9..284731f70 100755 --- a/src/dba/AbstractModelFactory.class.php +++ b/src/dba/AbstractModelFactory.class.php @@ -463,6 +463,31 @@ public function multicolAggregationFilter($options, $aggregations) { return $stmt->fetch(PDO::FETCH_ASSOC); } + /** + * @param $options array options of query (filters and joins) + * @param $column string single column key which should be retrieved + * @return array of the column entries returned from this query + */ + public function columnFilter(array $options, string $column): array { + $query = "SELECT " . Util::createPrefixedString($this->getMappedModelTable(), [self::getMappedModelKey($this->getNullObject(), $column)]); + $query = $query . " FROM " . $this->getMappedModelTable(); + + $vals = array(); + + if (array_key_exists(Factory::JOIN, $options)) { + $query .= $this->applyJoins($options[Factory::JOIN]); + } + if (array_key_exists(Factory::FILTER, $options)) { + $query .= $this->applyFilters($vals, $options[Factory::FILTER]); + } + + $dbh = self::getDB(); + $stmt = $dbh->prepare($query); + $stmt->execute($vals); + + return $stmt->fetch(PDO::FETCH_ASSOC); + } + public function sumFilter($options, $sumColumn) { $query = "SELECT SUM(" . self::getMappedModelKey($this->getNullObject(), $sumColumn) . ") AS sum "; $query = $query . " FROM " . $this->getMappedModelTable(); From 7eea3a591efe1a07e2154108354ebdb8ca695a4e Mon Sep 17 00:00:00 2001 From: s3inlc Date: Thu, 12 Feb 2026 09:56:53 +0100 Subject: [PATCH 404/691] first phpunit test to check --- .github/workflows/ci.yml | 2 ++ ci/phpunit/dba/AbstractModelFactoryTest.php | 17 +++++++++++++++++ 2 files changed, 19 insertions(+) create mode 100644 ci/phpunit/dba/AbstractModelFactoryTest.php diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 9df7dd899..00705c5a8 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -27,6 +27,8 @@ jobs: db_system: ${{ matrix.db_system }} - name: Give Apache permissions on necessary directories # for the tests, only src/files and src/inc/utils/locks seem necessary run: docker exec -u root hashtopolis-server-dev bash -c "chown -R www-data:www-data /var/www/html/src && chmod -R g+w /var/www/html/src" + - name: PHPUnittest Run + run: docker exec -w /var/www/html/ hashtopolis-server-dev ./vendor/bin/phpunit ci/phpunit - name: Test with pytest run: docker exec -w /var/www/html/ci/apiv2 hashtopolis-server-dev pytest - name: Test if pytest is removing all test objects diff --git a/ci/phpunit/dba/AbstractModelFactoryTest.php b/ci/phpunit/dba/AbstractModelFactoryTest.php new file mode 100644 index 000000000..7c96715ee --- /dev/null +++ b/ci/phpunit/dba/AbstractModelFactoryTest.php @@ -0,0 +1,17 @@ +use PHPUnit\Framework\TestCase; +use DBA; + +final class AbstractModelFactoryTest extends TestCase { + public function testGetDBWithTest(): void { + $db = Factory::getAgentFactory()->getDB(true); + + $this->assertSame($db, null); + } + + public function testSimpleFilter(): void { + $qF = new QueryFilter(User::USER_ID, 99999, "="); + $user = Factory::getUserFactory()->filter([Factory::FILTER => $qF]); + + $this->assertSame($user, null); + } +} From c60420857f2e41689e746094b76e54dc08383947 Mon Sep 17 00:00:00 2001 From: s3inlc Date: Thu, 12 Feb 2026 10:26:42 +0100 Subject: [PATCH 405/691] test with updated test settings --- ci/phpunit/dba/AbstractModelFactoryTest.php | 35 +++-- composer.json | 7 +- composer.lock | 154 +++++++++++--------- src/dba/AbstractModelFactory.class.php | 7 +- 4 files changed, 115 insertions(+), 88 deletions(-) diff --git a/ci/phpunit/dba/AbstractModelFactoryTest.php b/ci/phpunit/dba/AbstractModelFactoryTest.php index 7c96715ee..444c17f63 100644 --- a/ci/phpunit/dba/AbstractModelFactoryTest.php +++ b/ci/phpunit/dba/AbstractModelFactoryTest.php @@ -1,17 +1,26 @@ +getDB(true); - - $this->assertSame($db, null); - } - - public function testSimpleFilter(): void { - $qF = new QueryFilter(User::USER_ID, 99999, "="); - $user = Factory::getUserFactory()->filter([Factory::FILTER => $qF]); - - $this->assertSame($user, null); - } + /** + * @throws Exception + */ + public function testGetDBWithTest(): void { + $db = Factory::getAgentFactory()->getDB(true); + + $this->assertSame(null, $db); + } + + public function testSimpleFilter(): void { + $qF = new QueryFilter(User::USER_ID, 99999, "="); + $user = Factory::getUserFactory()->filter([Factory::FILTER => $qF]); + + $this->assertSame(null, $user); + } } diff --git a/composer.json b/composer.json index 5b85bde79..4899507cd 100644 --- a/composer.json +++ b/composer.json @@ -55,8 +55,11 @@ }, "autoload-dev": { "psr-4": { - "Tests\\": "tests/" - } + "Tests\\DBA\\": "ci/phpunit/dba/" + }, + "files": [ + "src/inc/startup/include.php" + ] }, "scripts": { "start": "php -S localhost:8080 -t src", diff --git a/composer.lock b/composer.lock index 6679dbe38..e1928b805 100644 --- a/composer.lock +++ b/composer.lock @@ -85,20 +85,20 @@ }, { "name": "crell/api-problem", - "version": "3.7.1", + "version": "3.8.0", "source": { "type": "git", "url": "https://github.com/Crell/ApiProblem.git", - "reference": "3b52858d05736b68f08dd1e48e4235362de22831" + "reference": "ddd6893a0aac8ecbebd6a6741b82eff974fc3b4b" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/Crell/ApiProblem/zipball/3b52858d05736b68f08dd1e48e4235362de22831", - "reference": "3b52858d05736b68f08dd1e48e4235362de22831", + "url": "https://api.github.com/repos/Crell/ApiProblem/zipball/ddd6893a0aac8ecbebd6a6741b82eff974fc3b4b", + "reference": "ddd6893a0aac8ecbebd6a6741b82eff974fc3b4b", "shasum": "" }, "require": { - "php": "^7.4 || ^8.0" + "php": "^8.3" }, "require-dev": { "nyholm/psr7": "^1.8.2", @@ -144,7 +144,7 @@ ], "support": { "issues": "https://github.com/Crell/ApiProblem/issues", - "source": "https://github.com/Crell/ApiProblem/tree/3.7.1" + "source": "https://github.com/Crell/ApiProblem/tree/3.8.0" }, "funding": [ { @@ -152,7 +152,7 @@ "type": "github" } ], - "time": "2026-01-12T20:12:58+00:00" + "time": "2026-02-03T20:47:47+00:00" }, { "name": "fig/http-message-util", @@ -1670,29 +1670,29 @@ "packages-dev": [ { "name": "doctrine/deprecations", - "version": "1.1.5", + "version": "1.1.6", "source": { "type": "git", "url": "https://github.com/doctrine/deprecations.git", - "reference": "459c2f5dd3d6a4633d3b5f46ee2b1c40f57d3f38" + "reference": "d4fe3e6fd9bb9e72557a19674f44d8ac7db4c6ca" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/doctrine/deprecations/zipball/459c2f5dd3d6a4633d3b5f46ee2b1c40f57d3f38", - "reference": "459c2f5dd3d6a4633d3b5f46ee2b1c40f57d3f38", + "url": "https://api.github.com/repos/doctrine/deprecations/zipball/d4fe3e6fd9bb9e72557a19674f44d8ac7db4c6ca", + "reference": "d4fe3e6fd9bb9e72557a19674f44d8ac7db4c6ca", "shasum": "" }, "require": { "php": "^7.1 || ^8.0" }, "conflict": { - "phpunit/phpunit": "<=7.5 || >=13" + "phpunit/phpunit": "<=7.5 || >=14" }, "require-dev": { - "doctrine/coding-standard": "^9 || ^12 || ^13", - "phpstan/phpstan": "1.4.10 || 2.1.11", + "doctrine/coding-standard": "^9 || ^12 || ^14", + "phpstan/phpstan": "1.4.10 || 2.1.30", "phpstan/phpstan-phpunit": "^1.0 || ^2", - "phpunit/phpunit": "^7.5 || ^8.5 || ^9.6 || ^10.5 || ^11.5 || ^12", + "phpunit/phpunit": "^7.5 || ^8.5 || ^9.6 || ^10.5 || ^11.5 || ^12.4 || ^13.0", "psr/log": "^1 || ^2 || ^3" }, "suggest": { @@ -1712,35 +1712,36 @@ "homepage": "https://www.doctrine-project.org/", "support": { "issues": "https://github.com/doctrine/deprecations/issues", - "source": "https://github.com/doctrine/deprecations/tree/1.1.5" + "source": "https://github.com/doctrine/deprecations/tree/1.1.6" }, - "time": "2025-04-07T20:06:18+00:00" + "time": "2026-02-07T07:09:04+00:00" }, { "name": "doctrine/instantiator", - "version": "2.1.0", + "version": "2.0.0", "source": { "type": "git", "url": "https://github.com/doctrine/instantiator.git", - "reference": "23da848e1a2308728fe5fdddabf4be17ff9720c7" + "reference": "c6222283fa3f4ac679f8b9ced9a4e23f163e80d0" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/doctrine/instantiator/zipball/23da848e1a2308728fe5fdddabf4be17ff9720c7", - "reference": "23da848e1a2308728fe5fdddabf4be17ff9720c7", + "url": "https://api.github.com/repos/doctrine/instantiator/zipball/c6222283fa3f4ac679f8b9ced9a4e23f163e80d0", + "reference": "c6222283fa3f4ac679f8b9ced9a4e23f163e80d0", "shasum": "" }, "require": { - "php": "^8.4" + "php": "^8.1" }, "require-dev": { - "doctrine/coding-standard": "^14", + "doctrine/coding-standard": "^11", "ext-pdo": "*", "ext-phar": "*", "phpbench/phpbench": "^1.2", - "phpstan/phpstan": "^2.1", - "phpstan/phpstan-phpunit": "^2.0", - "phpunit/phpunit": "^10.5.58" + "phpstan/phpstan": "^1.9.4", + "phpstan/phpstan-phpunit": "^1.3", + "phpunit/phpunit": "^9.5.27", + "vimeo/psalm": "^5.4" }, "type": "library", "autoload": { @@ -1767,7 +1768,7 @@ ], "support": { "issues": "https://github.com/doctrine/instantiator/issues", - "source": "https://github.com/doctrine/instantiator/tree/2.1.0" + "source": "https://github.com/doctrine/instantiator/tree/2.0.0" }, "funding": [ { @@ -1783,7 +1784,7 @@ "type": "tidelift" } ], - "time": "2026-01-05T06:47:08+00:00" + "time": "2022-12-30T00:23:10+00:00" }, { "name": "myclabs/deep-copy", @@ -2198,31 +2199,31 @@ }, { "name": "phpspec/prophecy", - "version": "v1.24.0", + "version": "v1.25.0", "source": { "type": "git", "url": "https://github.com/phpspec/prophecy.git", - "reference": "a24f1bda2d00a03877f7f99d9e6b150baf543f6d" + "reference": "7ab965042096282307992f1b9abff020095757f0" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/phpspec/prophecy/zipball/a24f1bda2d00a03877f7f99d9e6b150baf543f6d", - "reference": "a24f1bda2d00a03877f7f99d9e6b150baf543f6d", + "url": "https://api.github.com/repos/phpspec/prophecy/zipball/7ab965042096282307992f1b9abff020095757f0", + "reference": "7ab965042096282307992f1b9abff020095757f0", "shasum": "" }, "require": { "doctrine/instantiator": "^1.2 || ^2.0", "php": "8.2.* || 8.3.* || 8.4.* || 8.5.*", "phpdocumentor/reflection-docblock": "^5.2", - "sebastian/comparator": "^3.0 || ^4.0 || ^5.0 || ^6.0 || ^7.0", - "sebastian/recursion-context": "^3.0 || ^4.0 || ^5.0 || ^6.0 || ^7.0", + "sebastian/comparator": "^3.0 || ^4.0 || ^5.0 || ^6.0 || ^7.0 || ^8.0", + "sebastian/recursion-context": "^3.0 || ^4.0 || ^5.0 || ^6.0 || ^7.0 || ^8.0", "symfony/deprecation-contracts": "^2.5 || ^3.1" }, "require-dev": { - "friendsofphp/php-cs-fixer": "^3.88", + "php-cs-fixer/shim": "^3.93.1", "phpspec/phpspec": "^6.0 || ^7.0 || ^8.0", - "phpstan/phpstan": "^2.1.13", - "phpunit/phpunit": "^11.0 || ^12.0" + "phpstan/phpstan": "^2.1.13, <2.1.34 || ^2.1.39", + "phpunit/phpunit": "^11.0 || ^12.0 || ^13.0" }, "type": "library", "extra": { @@ -2263,28 +2264,28 @@ ], "support": { "issues": "https://github.com/phpspec/prophecy/issues", - "source": "https://github.com/phpspec/prophecy/tree/v1.24.0" + "source": "https://github.com/phpspec/prophecy/tree/v1.25.0" }, - "time": "2025-11-21T13:10:52+00:00" + "time": "2026-02-09T11:58:00+00:00" }, { "name": "phpspec/prophecy-phpunit", - "version": "v2.4.0", + "version": "v2.5.0", "source": { "type": "git", "url": "https://github.com/phpspec/prophecy-phpunit.git", - "reference": "d3c28041d9390c9bca325a08c5b2993ac855bded" + "reference": "89f91b01d0640b7820e427e02a007bc6489d8a26" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/phpspec/prophecy-phpunit/zipball/d3c28041d9390c9bca325a08c5b2993ac855bded", - "reference": "d3c28041d9390c9bca325a08c5b2993ac855bded", + "url": "https://api.github.com/repos/phpspec/prophecy-phpunit/zipball/89f91b01d0640b7820e427e02a007bc6489d8a26", + "reference": "89f91b01d0640b7820e427e02a007bc6489d8a26", "shasum": "" }, "require": { "php": "^7.3 || ^8", "phpspec/prophecy": "^1.18", - "phpunit/phpunit": "^9.1 || ^10.1 || ^11.0 || ^12.0" + "phpunit/phpunit": "^9.1 || ^10.1 || ^11.0 || ^12.0 || ^13.0" }, "require-dev": { "phpstan/phpstan": "^1.10" @@ -2318,9 +2319,9 @@ ], "support": { "issues": "https://github.com/phpspec/prophecy-phpunit/issues", - "source": "https://github.com/phpspec/prophecy-phpunit/tree/v2.4.0" + "source": "https://github.com/phpspec/prophecy-phpunit/tree/v2.5.0" }, - "time": "2025-05-13T13:52:32+00:00" + "time": "2026-02-09T15:40:55+00:00" }, { "name": "phpstan/extension-installer", @@ -2419,11 +2420,11 @@ }, { "name": "phpstan/phpstan", - "version": "2.1.37", + "version": "2.1.39", "dist": { "type": "zip", - "url": "https://api.github.com/repos/phpstan/phpstan/zipball/28cd424c5ea984128c95cfa7ea658808e8954e49", - "reference": "28cd424c5ea984128c95cfa7ea658808e8954e49", + "url": "https://api.github.com/repos/phpstan/phpstan/zipball/c6f73a2af4cbcd99c931d0fb8f08548cc0fa8224", + "reference": "c6f73a2af4cbcd99c931d0fb8f08548cc0fa8224", "shasum": "" }, "require": { @@ -2468,20 +2469,20 @@ "type": "github" } ], - "time": "2026-01-24T08:21:55+00:00" + "time": "2026-02-11T14:48:56+00:00" }, { "name": "phpunit/php-code-coverage", - "version": "12.5.2", + "version": "12.5.3", "source": { "type": "git", "url": "https://github.com/sebastianbergmann/php-code-coverage.git", - "reference": "4a9739b51cbcb355f6e95659612f92e282a7077b" + "reference": "b015312f28dd75b75d3422ca37dff2cd1a565e8d" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/sebastianbergmann/php-code-coverage/zipball/4a9739b51cbcb355f6e95659612f92e282a7077b", - "reference": "4a9739b51cbcb355f6e95659612f92e282a7077b", + "url": "https://api.github.com/repos/sebastianbergmann/php-code-coverage/zipball/b015312f28dd75b75d3422ca37dff2cd1a565e8d", + "reference": "b015312f28dd75b75d3422ca37dff2cd1a565e8d", "shasum": "" }, "require": { @@ -2537,7 +2538,7 @@ "support": { "issues": "https://github.com/sebastianbergmann/php-code-coverage/issues", "security": "https://github.com/sebastianbergmann/php-code-coverage/security/policy", - "source": "https://github.com/sebastianbergmann/php-code-coverage/tree/12.5.2" + "source": "https://github.com/sebastianbergmann/php-code-coverage/tree/12.5.3" }, "funding": [ { @@ -2557,20 +2558,20 @@ "type": "tidelift" } ], - "time": "2025-12-24T07:03:04+00:00" + "time": "2026-02-06T06:01:44+00:00" }, { "name": "phpunit/php-file-iterator", - "version": "6.0.0", + "version": "6.0.1", "source": { "type": "git", "url": "https://github.com/sebastianbergmann/php-file-iterator.git", - "reference": "961bc913d42fe24a257bfff826a5068079ac7782" + "reference": "3d1cd096ef6bea4bf2762ba586e35dbd317cbfd5" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/sebastianbergmann/php-file-iterator/zipball/961bc913d42fe24a257bfff826a5068079ac7782", - "reference": "961bc913d42fe24a257bfff826a5068079ac7782", + "url": "https://api.github.com/repos/sebastianbergmann/php-file-iterator/zipball/3d1cd096ef6bea4bf2762ba586e35dbd317cbfd5", + "reference": "3d1cd096ef6bea4bf2762ba586e35dbd317cbfd5", "shasum": "" }, "require": { @@ -2610,15 +2611,27 @@ "support": { "issues": "https://github.com/sebastianbergmann/php-file-iterator/issues", "security": "https://github.com/sebastianbergmann/php-file-iterator/security/policy", - "source": "https://github.com/sebastianbergmann/php-file-iterator/tree/6.0.0" + "source": "https://github.com/sebastianbergmann/php-file-iterator/tree/6.0.1" }, "funding": [ { "url": "https://github.com/sebastianbergmann", "type": "github" + }, + { + "url": "https://liberapay.com/sebastianbergmann", + "type": "liberapay" + }, + { + "url": "https://thanks.dev/u/gh/sebastianbergmann", + "type": "thanks_dev" + }, + { + "url": "https://tidelift.com/funding/github/packagist/phpunit/php-file-iterator", + "type": "tidelift" } ], - "time": "2025-02-07T04:58:37+00:00" + "time": "2026-02-02T14:04:18+00:00" }, { "name": "phpunit/php-invoker", @@ -2806,16 +2819,16 @@ }, { "name": "phpunit/phpunit", - "version": "12.5.8", + "version": "12.5.11", "source": { "type": "git", "url": "https://github.com/sebastianbergmann/phpunit.git", - "reference": "37ddb96c14bfee10304825edbb7e66d341ec6889" + "reference": "9b518cb40f9474572c9f0178e96ff3dc1cf02bf1" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/sebastianbergmann/phpunit/zipball/37ddb96c14bfee10304825edbb7e66d341ec6889", - "reference": "37ddb96c14bfee10304825edbb7e66d341ec6889", + "url": "https://api.github.com/repos/sebastianbergmann/phpunit/zipball/9b518cb40f9474572c9f0178e96ff3dc1cf02bf1", + "reference": "9b518cb40f9474572c9f0178e96ff3dc1cf02bf1", "shasum": "" }, "require": { @@ -2829,8 +2842,8 @@ "phar-io/manifest": "^2.0.4", "phar-io/version": "^3.2.1", "php": ">=8.3", - "phpunit/php-code-coverage": "^12.5.2", - "phpunit/php-file-iterator": "^6.0.0", + "phpunit/php-code-coverage": "^12.5.3", + "phpunit/php-file-iterator": "^6.0.1", "phpunit/php-invoker": "^6.0.0", "phpunit/php-text-template": "^5.0.0", "phpunit/php-timer": "^8.0.0", @@ -2841,6 +2854,7 @@ "sebastian/exporter": "^7.0.2", "sebastian/global-state": "^8.0.2", "sebastian/object-enumerator": "^7.0.0", + "sebastian/recursion-context": "^7.0.1", "sebastian/type": "^6.0.3", "sebastian/version": "^6.0.0", "staabm/side-effects-detector": "^1.0.5" @@ -2883,7 +2897,7 @@ "support": { "issues": "https://github.com/sebastianbergmann/phpunit/issues", "security": "https://github.com/sebastianbergmann/phpunit/security/policy", - "source": "https://github.com/sebastianbergmann/phpunit/tree/12.5.8" + "source": "https://github.com/sebastianbergmann/phpunit/tree/12.5.11" }, "funding": [ { @@ -2907,7 +2921,7 @@ "type": "tidelift" } ], - "time": "2026-01-27T06:12:29+00:00" + "time": "2026-02-10T12:32:02+00:00" }, { "name": "sebastian/cli-parser", diff --git a/src/dba/AbstractModelFactory.class.php b/src/dba/AbstractModelFactory.class.php index 284731f70..bd13ca54f 100755 --- a/src/dba/AbstractModelFactory.class.php +++ b/src/dba/AbstractModelFactory.class.php @@ -2,6 +2,7 @@ namespace DBA; +use Exception; use MassUpdateSet; use PDO, PDOStatement, PDOException; use UI; @@ -931,7 +932,8 @@ public function massUpdate($options): bool { /** * Returns the DB connection if possible * @param bool $test - * @return PDO + * @return ?PDO + * @throws Exception */ public function getDB(bool $test = false): ?PDO { if (self::$dbh !== null) { @@ -979,8 +981,7 @@ public function getDB(bool $test = false): ?PDO { if ($test) { return null; } - UI::printError(UI::ERROR, "Fatal Error! Database connection failed: " . $e->getMessage()); - return null; + throw new Exception("Fatal Error! Database connection failed: " . $e->getMessage()); } } } From da277f5d28b892edb9805c09205b80c4a5860bc7 Mon Sep 17 00:00:00 2001 From: s3inlc Date: Thu, 12 Feb 2026 10:33:52 +0100 Subject: [PATCH 406/691] changed includes to require_once to avoid problems on double includes --- src/inc/startup/include.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/inc/startup/include.php b/src/inc/startup/include.php index 39e51a38d..0cdc8ccff 100755 --- a/src/inc/startup/include.php +++ b/src/inc/startup/include.php @@ -39,9 +39,9 @@ } } -include($baseDir . "/protocol.php"); +require_once($baseDir . "/protocol.php"); -include($baseDir . "/mask.php"); +require_once($baseDir . "/mask.php"); // include DBA require_once($baseDir . "/../dba/init.php"); From 78bb045e0c48fbe388c63ca79bb3adc8253fd2b3 Mon Sep 17 00:00:00 2001 From: s3inlc Date: Thu, 12 Feb 2026 10:59:24 +0100 Subject: [PATCH 407/691] fixed and documented test --- ci/phpunit/dba/AbstractModelFactoryTest.php | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/ci/phpunit/dba/AbstractModelFactoryTest.php b/ci/phpunit/dba/AbstractModelFactoryTest.php index 444c17f63..629b941f7 100644 --- a/ci/phpunit/dba/AbstractModelFactoryTest.php +++ b/ci/phpunit/dba/AbstractModelFactoryTest.php @@ -17,10 +17,19 @@ public function testGetDBWithTest(): void { $this->assertSame(null, $db); } + /** + * Tests both cases to be used on a simple QueryFilter with no result. + * When single is true, null must be returned if no matching entry was found, empty array otherwise + * + * @return void + */ public function testSimpleFilter(): void { $qF = new QueryFilter(User::USER_ID, 99999, "="); - $user = Factory::getUserFactory()->filter([Factory::FILTER => $qF]); + $user = Factory::getUserFactory()->filter([Factory::FILTER => $qF], true); $this->assertSame(null, $user); + + $user = Factory::getUserFactory()->filter([Factory::FILTER => $qF]); + $this->assertSame([], $user); } } From de9a0f64d6ac8c11a2bdbc2c21fbb9996abffe01 Mon Sep 17 00:00:00 2001 From: s3inlc Date: Thu, 12 Feb 2026 11:11:01 +0100 Subject: [PATCH 408/691] make sure files are included only once --- src/api/v2/index.php | 2 +- src/inc/startup/include.php | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/api/v2/index.php b/src/api/v2/index.php index f07eb5db9..732dcfe18 100644 --- a/src/api/v2/index.php +++ b/src/api/v2/index.php @@ -140,7 +140,7 @@ public function get($key): string { /* API token validation */ $container->set("JwtAuthentication", function (\Psr\Container\ContainerInterface $container) { - include(dirname(__FILE__) . '/../../inc/confv2.php'); + require_once(dirname(__FILE__) . '/../../inc/confv2.php'); $decoder = new FirebaseDecoder( new Secret($PEPPER[0], 'HS256', hash("sha256", $PEPPER[0])) diff --git a/src/inc/startup/include.php b/src/inc/startup/include.php index 0cdc8ccff..bc8fc4ea3 100755 --- a/src/inc/startup/include.php +++ b/src/inc/startup/include.php @@ -11,7 +11,7 @@ require_once($baseDir . "/info.php"); -include($baseDir . "/confv2.php"); +require_once($baseDir . "/confv2.php"); // include all .class.php files in inc dir $dir = scandir($baseDir); From a59e399953294e25ddaa34783bb6706dfb95a568 Mon Sep 17 00:00:00 2001 From: s3inlc Date: Thu, 12 Feb 2026 11:21:27 +0100 Subject: [PATCH 409/691] make sure some variables are set before using autoload --- src/inc/startup/include.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/inc/startup/include.php b/src/inc/startup/include.php index bc8fc4ea3..d9d191da4 100755 --- a/src/inc/startup/include.php +++ b/src/inc/startup/include.php @@ -7,12 +7,12 @@ $baseDir = dirname(__FILE__) . "/.."; -require_once($baseDir . "/../../vendor/autoload.php"); - require_once($baseDir . "/info.php"); require_once($baseDir . "/confv2.php"); +require_once($baseDir . "/../../vendor/autoload.php"); + // include all .class.php files in inc dir $dir = scandir($baseDir); foreach ($dir as $entry) { From 36d8bc0bddec04a7f9d7199a5986f5e6d3e2a437 Mon Sep 17 00:00:00 2001 From: s3inlc Date: Thu, 12 Feb 2026 11:28:14 +0100 Subject: [PATCH 410/691] instead of trying to include file via composer, we include it directly for the test --- ci/phpunit/dba/AbstractModelFactoryTest.php | 2 ++ composer.json | 5 +---- 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/ci/phpunit/dba/AbstractModelFactoryTest.php b/ci/phpunit/dba/AbstractModelFactoryTest.php index 629b941f7..3c0a1f8d1 100644 --- a/ci/phpunit/dba/AbstractModelFactoryTest.php +++ b/ci/phpunit/dba/AbstractModelFactoryTest.php @@ -7,6 +7,8 @@ use DBA\QueryFilter; use DBA\User; +require_once(dirname(__FILE__) . '/../../../src/inc/startup/include.php'); + final class AbstractModelFactoryTest extends TestCase { /** * @throws Exception diff --git a/composer.json b/composer.json index 4899507cd..ca0852321 100644 --- a/composer.json +++ b/composer.json @@ -56,10 +56,7 @@ "autoload-dev": { "psr-4": { "Tests\\DBA\\": "ci/phpunit/dba/" - }, - "files": [ - "src/inc/startup/include.php" - ] + } }, "scripts": { "start": "php -S localhost:8080 -t src", From f7eaf439282a2dcffcbc4c096532c6fb4d933bc2 Mon Sep 17 00:00:00 2001 From: s3inlc Date: Thu, 12 Feb 2026 11:31:28 +0100 Subject: [PATCH 411/691] pre-merge migrations rename --- .../{20260205140244_indexes.sql => 20260212113000_indexes.sql} | 0 .../{20260205140244_indexes.sql => 20260212113000_indexes.sql} | 0 2 files changed, 0 insertions(+), 0 deletions(-) rename src/migrations/mysql/{20260205140244_indexes.sql => 20260212113000_indexes.sql} (100%) rename src/migrations/postgres/{20260205140244_indexes.sql => 20260212113000_indexes.sql} (100%) diff --git a/src/migrations/mysql/20260205140244_indexes.sql b/src/migrations/mysql/20260212113000_indexes.sql similarity index 100% rename from src/migrations/mysql/20260205140244_indexes.sql rename to src/migrations/mysql/20260212113000_indexes.sql diff --git a/src/migrations/postgres/20260205140244_indexes.sql b/src/migrations/postgres/20260212113000_indexes.sql similarity index 100% rename from src/migrations/postgres/20260205140244_indexes.sql rename to src/migrations/postgres/20260212113000_indexes.sql From dd0458baf2d0a01f4934de233905748f858b9745 Mon Sep 17 00:00:00 2001 From: s3inlc Date: Thu, 12 Feb 2026 11:33:38 +0100 Subject: [PATCH 412/691] switch order --- src/inc/startup/include.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/inc/startup/include.php b/src/inc/startup/include.php index d9d191da4..bc8fc4ea3 100755 --- a/src/inc/startup/include.php +++ b/src/inc/startup/include.php @@ -7,12 +7,12 @@ $baseDir = dirname(__FILE__) . "/.."; +require_once($baseDir . "/../../vendor/autoload.php"); + require_once($baseDir . "/info.php"); require_once($baseDir . "/confv2.php"); -require_once($baseDir . "/../../vendor/autoload.php"); - // include all .class.php files in inc dir $dir = scandir($baseDir); foreach ($dir as $entry) { From 28da21e83b5522d612c9161a130ed7de4b460b5d Mon Sep 17 00:00:00 2001 From: s3inlc Date: Thu, 12 Feb 2026 14:20:16 +0100 Subject: [PATCH 413/691] refactored away global variables --- ci/HashtopolisTest.class.php | 5 - ci/HashtopolisTestFramework.class.php | 6 +- ci/bundle.sh | 12 - ci/run.php | 3 +- src/api/v2/index.php | 4 +- src/dba/AbstractModelFactory.class.php | 30 +-- src/dba/LikeFilter.class.php | 4 +- src/dba/init.php | 10 +- src/inc/CSRF.class.php | 14 +- src/inc/Encryption.class.php | 22 +- src/inc/Login.class.php | 6 +- src/inc/StartupConfig.class.php | 249 ++++++++++++++++++ src/inc/api/APILogin.class.php | 4 +- src/inc/apiv2/auth/token.routes.php | 11 +- src/inc/confv2.php | 77 ------ src/inc/info.php | 8 - src/inc/startup/include.php | 10 +- src/inc/startup/load.php | 4 +- src/inc/startup/setup.php | 44 ++-- src/install/index.php | 8 +- src/install/updates/update.php | 11 +- .../updates/update_v0.10.x_v0.11.0.php | 3 +- .../updates/update_v0.11.x_v0.12.0.php | 3 +- .../updates/update_v0.12.x_v0.13.0.php | 3 +- .../updates/update_v0.13.x_v0.13.1.php | 3 +- src/install/updates/update_v0.4.0_v0.5.0.php | 2 +- src/install/updates/update_v0.9.0_v0.10.0.php | 3 +- .../updates/update_v1.0.0-rainbow4_vx.x.x.php | 2 +- 28 files changed, 333 insertions(+), 228 deletions(-) delete mode 100644 ci/bundle.sh create mode 100644 src/inc/StartupConfig.class.php delete mode 100644 src/inc/confv2.php delete mode 100644 src/inc/info.php diff --git a/ci/HashtopolisTest.class.php b/ci/HashtopolisTest.class.php index 87d3f7b16..d4424a333 100644 --- a/ci/HashtopolisTest.class.php +++ b/ci/HashtopolisTest.class.php @@ -41,9 +41,6 @@ abstract class HashtopolisTest { ]; public function initAndUpgrade($fromVersion) { - // these global variables are needed in the included update.php script - global $VERSION, $BUILD, $TEST; - HashtopolisTestFramework::log(HashtopolisTestFramework::LOG_INFO, "Initialize old version $fromVersion..."); $this->init($fromVersion); @@ -67,8 +64,6 @@ public static function multiImplode($glue, $array) { } public function init($version) { - global $PEPPER, $VERSION; - // drop old data and create empty DB /*Factory::getAgentFactory()->getDB()->query("DROP DATABASE IF EXISTS hashtopolis"); Factory::getAgentFactory()->getDB()->query("CREATE DATABASE hashtopolis"); diff --git a/ci/HashtopolisTestFramework.class.php b/ci/HashtopolisTestFramework.class.php index f2a975784..405142368 100644 --- a/ci/HashtopolisTestFramework.class.php +++ b/ci/HashtopolisTestFramework.class.php @@ -64,8 +64,6 @@ public function executeWithUpgrade($fromVersion, $testNames, $runType) { } private function backupDatabase() { - global $CONN; - if (!file_exists(dirname(__FILE__) . "/../ci/db-backups")) { mkdir(dirname(__FILE__) . "/../ci/db-backups"); } @@ -74,7 +72,7 @@ private function backupDatabase() { HashtopolisTestFramework::log(HashtopolisTestFramework::LOG_INFO, "Backup database to " . $this->dbBackupFile . "..."); // Note that the '-y' option avoids requirement on 'PROCESS' privilege for the 'hashtopolis' user! - exec("mysqldump hashtopolis -y -h".$CONN['server'] . " -P".$CONN['port'] . " -u".$CONN['user'] . " -p".$CONN['pass'] ." --skip-ssl > " . $this->dbBackupFile, $output, $status); + exec("mysqldump hashtopolis -y -h". StartupConfig::getInstance()->getDatabaseServer() . " -P" . StartupConfig::getInstance()->getDatabasePort() . " -u" . StartupConfig::getInstance()->getDatabaseUser() . " -p" . StartupConfig::getInstance()->getDatabasePassword() ." --skip-ssl > " . $this->dbBackupFile, $output, $status); if ($status != 0) { $this->dbBackupFile = ""; @@ -84,8 +82,6 @@ private function backupDatabase() { } private function restoreDatabase() { - global $CONN; - if (!empty($this->dbBackupFile)) { HashtopolisTestFramework::log(HashtopolisTestFramework::LOG_INFO, "Restoring database from " . $this->dbBackupFile . "..."); diff --git a/ci/bundle.sh b/ci/bundle.sh deleted file mode 100644 index a1b5fe843..000000000 --- a/ci/bundle.sh +++ /dev/null @@ -1,12 +0,0 @@ -#!/bin/bash - -if [ -f server.zip ]; then - rm server.zip -fi - -count=$(git log $(git describe --tags --abbrev=0)..HEAD --oneline | wc -l | tr -d ' ') -sed -i -E 's/BUILD = "repository"/BUILD = "'"$count"'"/g' ../src/inc/info.php -cd ../src/ -zip -r ../ci/server.zip * -x "*.gitignore" -x "*.txt" -x "*README.md" -x "*generator.php" -cd ../ci/ -sed -i -E 's/BUILD = "'"$count"'"/BUILD = "repository"/g' ../src/inc/info.php \ No newline at end of file diff --git a/ci/run.php b/ci/run.php index 747d4bb12..753680951 100644 --- a/ci/run.php +++ b/ci/run.php @@ -4,10 +4,9 @@ * This is the entry point to run the full environment */ -require_once(dirname(__FILE__) . "/../src/inc/confv2.php"); +require_once(dirname(__FILE__) . "/../src/inc/StartupConfig.class.php"); require_once(dirname(__FILE__) . "/../src/dba/init.php"); require_once(dirname(__FILE__) . "/../src/inc/defines/config.php"); -require_once(dirname(__FILE__) . "/../src/inc/info.php"); require_once(dirname(__FILE__) . "/../src/inc/Util.class.php"); require_once(dirname(__FILE__) . "/../src/inc/Encryption.class.php"); require_once(dirname(__FILE__) . "/../src/inc/utils/AccessUtils.class.php"); diff --git a/src/api/v2/index.php b/src/api/v2/index.php index 732dcfe18..0c558b591 100644 --- a/src/api/v2/index.php +++ b/src/api/v2/index.php @@ -140,10 +140,8 @@ public function get($key): string { /* API token validation */ $container->set("JwtAuthentication", function (\Psr\Container\ContainerInterface $container) { - require_once(dirname(__FILE__) . '/../../inc/confv2.php'); - $decoder = new FirebaseDecoder( - new Secret($PEPPER[0], 'HS256', hash("sha256", $PEPPER[0])) + new Secret(StartupConfig::getInstance()->getPepper(0), 'HS256', hash("sha256", StartupConfig::getInstance()->getPepper(0))) ); $options = new Options( diff --git a/src/dba/AbstractModelFactory.class.php b/src/dba/AbstractModelFactory.class.php index bd13ca54f..e8fe252d0 100755 --- a/src/dba/AbstractModelFactory.class.php +++ b/src/dba/AbstractModelFactory.class.php @@ -5,6 +5,7 @@ use Exception; use MassUpdateSet; use PDO, PDOStatement, PDOException; +use StartupConfig; use UI; /** @@ -935,25 +936,24 @@ public function massUpdate($options): bool { * @return ?PDO * @throws Exception */ - public function getDB(bool $test = false): ?PDO { + public function getDB(bool $test = false, array $testProperties = []): ?PDO { if (self::$dbh !== null) { return self::$dbh; } try { - $dbUser = @DBA_USER; - $dbPass = @DBA_PASS; - $dbType = @DBA_TYPE; - $dbHost = @DBA_SERVER; - $dbPort = @DBA_PORT; - $dbDB = @DBA_DB; - if ($test) { // if the connection is being tested, take credentials from legacy global variable - global $CONN; - $dbUser = $CONN['user']; - $dbPass = $CONN['pass']; - $dbType = $CONN['type']; - $dbHost = $CONN['server']; - $dbPort = $CONN['port']; - $dbDB = $CONN['db']; + $dbUser = StartupConfig::getInstance()->getDatabaseUser(); + $dbPass = StartupConfig::getInstance()->getDatabasePassword(); + $dbType = StartupConfig::getInstance()->getDatabaseType(); + $dbHost = StartupConfig::getInstance()->getDatabaseServer(); + $dbPort = StartupConfig::getInstance()->getDatabasePort(); + $dbDB = StartupConfig::getInstance()->getDatabaseDB(); + if ($test) { // if the connection is being tested, take credentials from argument properties + $dbUser = $testProperties['user']; + $dbPass = $testProperties['pass']; + $dbType = $testProperties['type']; + $dbHost = $testProperties['server']; + $dbPort = $testProperties['port']; + $dbDB = $testProperties['db']; } if ($dbType == 'mysql') { diff --git a/src/dba/LikeFilter.class.php b/src/dba/LikeFilter.class.php index eedccaaf6..7661fafe5 100755 --- a/src/dba/LikeFilter.class.php +++ b/src/dba/LikeFilter.class.php @@ -2,6 +2,8 @@ namespace DBA; +use StartupConfig; + class LikeFilter extends Filter { private $key; private $value; @@ -38,7 +40,7 @@ function getQueryString(AbstractModelFactory $factory, bool $includeTable = fals // it is not ideal to have to make a distinction between the DB types here, but currently there does not seem to be another solution to achieve real case-sensitive like filtering $likeStatement = " LIKE BINARY ?"; - if (DBA_TYPE == 'postgres') { + if (StartupConfig::getInstance()->getDatabaseType() == 'postgres') { $likeStatement = " LIKE ? COLLATE \"C\""; } return $table . AbstractModelFactory::getMappedModelKey($factory->getNullObject(), $this->key) . $inv . $likeStatement; diff --git a/src/dba/init.php b/src/dba/init.php index c08691c6e..904467704 100644 --- a/src/dba/init.php +++ b/src/dba/init.php @@ -1,13 +1,5 @@ getPepper(3)])) { // generate a secret - $_SESSION[$PEPPER[3]] = Util::randomString(40); + $_SESSION[StartupConfig::getInstance()->getPepper(3)] = Util::randomString(40); } // set a token $key = Util::randomString(30); - UI::add('csrf', $key . ":" . base64_encode(hash("sha256", $key . $_SESSION[$PEPPER[3]] . $key, true))); + UI::add('csrf', $key . ":" . base64_encode(hash("sha256", $key . $_SESSION[StartupConfig::getInstance()->getPepper(3)] . $key, true))); } public static function check($csrf) { - global $PEPPER; - $csrf = explode(":", $csrf); if (sizeof($csrf) != 2) { UI::addMessage(UI::ERROR, "Invalid form submission!"); return false; } - else if (!isset($_SESSION[$PEPPER[3]])) { + else if (!isset($_SESSION[StartupConfig::getInstance()->getPepper(3)])) { UI::addMessage(UI::ERROR, "Invalid form submission!"); return false; } $key = $csrf[0]; - $check = base64_encode(hash("sha256", $key . $_SESSION[$PEPPER[3]] . $key, true)); + $check = base64_encode(hash("sha256", $key . $_SESSION[StartupConfig::getInstance()->getPepper(3)] . $key, true)); if ($check == $csrf[1]) { return true; } diff --git a/src/inc/Encryption.class.php b/src/inc/Encryption.class.php index ba931d7f2..5b6d9428d 100755 --- a/src/inc/Encryption.class.php +++ b/src/inc/Encryption.class.php @@ -14,14 +14,12 @@ class Encryption { * @return string base64 encoded hash */ public static function sessionHash($id, $startTime, $username) { - global $PEPPER; - $KEY = pack('H*', hash("sha256", $startTime)); $cycles = Encryption::getCount($username . $startTime, 500, 1000); $CIPHER = $username . $startTime; - $CIPHER = openssl_encrypt($CIPHER, 'blowfish', $KEY, 0, substr($PEPPER[0], 0, 8)); + $CIPHER = openssl_encrypt($CIPHER, 'blowfish', $KEY, 0, substr(StartupConfig::getInstance()->getPepper(0), 0, 8)); for ($x = 0; $x < $cycles; $x++) { - $KEY = pack('H*', hash("sha256", $CIPHER . $id . $PEPPER[0] . $KEY)); + $KEY = pack('H*', hash("sha256", $CIPHER . $id . StartupConfig::getInstance()->getPepper(0) . $KEY)); } return Util::strToHex($KEY); } @@ -65,18 +63,14 @@ public static function validPassword($string) { * @return string hash */ public static function passwordHash($password, $salt) { - global $PEPPER; - - $CIPHER = $PEPPER[1] . $password . $salt; + $CIPHER = StartupConfig::getInstance()->getPepper(1) . $password . $salt; $options = array('cost' => 12); $CIPHER = password_hash($CIPHER, PASSWORD_BCRYPT, $options); return $CIPHER; } public static function passwordVerify($password, $salt, $hash) { - global $PEPPER; - - $CIPHER = $PEPPER[1] . $password . $salt; + $CIPHER = StartupConfig::getInstance()->getPepper(1) . $password . $salt; if (!password_verify($CIPHER, $hash)) { return false; } @@ -108,14 +102,12 @@ private static function getCount($string, $mincycles = 3000, $maxcycles = 5000) * @return string base64 encoded hash */ public static function validationHash($id, $username) { - global $PEPPER; - $KEY = pack('H*', hash("sha256", $id)); - $cycles = Encryption::getCount($username . $PEPPER[2], 500, 1000); + $cycles = Encryption::getCount($username . StartupConfig::getInstance()->getPepper(2), 500, 1000); $CIPHER = $id . $username; - $CIPHER = openssl_encrypt($CIPHER, 'blowfish', $KEY, 0, substr($PEPPER[2], 0, 8)); + $CIPHER = openssl_encrypt($CIPHER, 'blowfish', $KEY, 0, substr(StartupConfig::getInstance()->getPepper(2), 0, 8)); for ($x = 0; $x < $cycles; $x++) { - $KEY = pack('H*', hash("sha256", $CIPHER . $id . $PEPPER[2] . $username . $KEY)); + $KEY = pack('H*', hash("sha256", $CIPHER . $id . StartupConfig::getInstance()->getPepper(2) . $username . $KEY)); } return Util::strToHex($KEY); } diff --git a/src/inc/Login.class.php b/src/inc/Login.class.php index 9b4f8c2f3..996d8cce9 100755 --- a/src/inc/Login.class.php +++ b/src/inc/Login.class.php @@ -105,11 +105,11 @@ public function getUser() { * @param string $username username of the user to be logged in * @param string $password password which was entered on login form * @param string $otp OTP login field - * @return true on success and false on failure + * @return bool true on success and false on failure */ - public function login($username, $password, $otp = NULL) { + public function login(string $username, string $password, $otp = NULL): bool { /****** Check password ******/ - if ($this->valid == true) { + if ($this->valid) { return false; } $filter = new QueryFilter(User::USERNAME, $username, "="); diff --git a/src/inc/StartupConfig.class.php b/src/inc/StartupConfig.class.php new file mode 100644 index 000000000..3f52af2fe --- /dev/null +++ b/src/inc/StartupConfig.class.php @@ -0,0 +1,249 @@ +directories = [ + "files" => "/usr/local/share/hashtopolis/files", + "import" => "/usr/local/share/hashtopolis/import", + "log" => "/usr/local/share/hashtopolis/log", + "config" => "/usr/local/share/hashtopolis/config", + "tus" => "/var/tmp/tus/", + ]; + + $this->db_properties = [ + self::DB_PROPERTY_TYPE => "", + self::DB_PROPERTY_USER => "", + self::DB_PROPERTY_PASS => "", + self::DB_PROPERTY_DB => "", + self::DB_PROPERTY_SERVER => "", + self::DB_PROPERTY_PORT => "0", + ]; + + $this->peppers = ["", "", "", ""]; + + // this is a legacy check for old setups (through manual install) where some settings were stored in the conf.php + if (file_exists(dirname(__FILE__) . "/conf.php")) { + $this->loadLegacyConfig(); + } + else { + $this->loadEnv(); + } + + // at this point a config.json MUST exist (either from migration from legacy setup or from docker startup + // we still test for existence, just in case + if (file_exists($this->getDirectoryConfig() . "/config.json")) { + $config = json_decode(file_get_contents($this->getDirectoryConfig() . "/config.json"), true); + if (isset($config['PEPPER']) && sizeof($config['PEPPER']) == 4) { + $this->peppers = $config['PEPPER']; + } + } + } + + /** + * Loads the required config values from the environment variables + * + * @return void + */ + private function loadEnv(): void { + $this->db_properties[self::DB_PROPERTY_USER] = getenv('HASHTOPOLIS_DB_USER'); + $this->db_properties[self::DB_PROPERTY_PASS] = getenv('HASHTOPOLIS_DB_PASS'); + $this->db_properties[self::DB_PROPERTY_SERVER] = getenv('HASHTOPOLIS_DB_HOST'); + $this->db_properties[self::DB_PROPERTY_DB] = getenv('HASHTOPOLIS_DB_DATABASE'); + + if (getenv('HASHTOPOLIS_DB_TYPE') !== false) { + $this->db_properties[self::DB_PROPERTY_TYPE] = getenv('HASHTOPOLIS_DB_TYPE'); + } + else { + $this->db_properties[self::DB_PROPERTY_TYPE] = "mysql"; + } + + if (getenv('HASHTOPOLIS_DB_PORT') !== false) { + $this->db_properties[self::DB_PROPERTY_PORT] = getenv('HASHTOPOLIS_DB_PORT'); + } + else { + switch ($this->db_properties[self::DB_PROPERTY_TYPE]) { + case 'mysql': + $this->db_properties[self::DB_PROPERTY_PORT] = '3306'; + break; + case 'postgres': + $this->db_properties[self::DB_PROPERTY_PORT] = '5432'; + break; + } + } + + // update from env if set + if (getenv('HASHTOPOLIS_FILES_PATH') !== false) { + $this->directories[self::DIRECTORY_FILES] = getenv('HASHTOPOLIS_FILES_PATH'); + } + if (getenv('HASHTOPOLIS_IMPORT_PATH') !== false) { + $this->directories[self::DIRECTORY_IMPORT] = getenv('HASHTOPOLIS_IMPORT_PATH'); + } + if (getenv('HASHTOPOLIS_LOG_PATH') !== false) { + $this->directories[self::DIRECTORY_LOG] = getenv('HASHTOPOLIS_LOG_PATH'); + } + if (getenv('HASHTOPOLIS_CONFIG_PATH') !== false) { + $this->directories[self::DIRECTORY_CONFIG] = getenv('HASHTOPOLIS_CONFIG_PATH'); + } + if (getenv('HASHTOPOLIS_TUS_PATH') !== false) { + $this->directories[self::DIRECTORY_TUS] = getenv('HASHTOPOLIS_TUS_PATH'); + } + } + + /** + * @return void + * @deprecated + * + * Loads the required config values from an old format conf.php file which was created on setups using + * the built-in install routine. + * + */ + private function loadLegacyConfig(): void { + $CONN = []; // make analyzer happy, the $CONN MUST be set in the old style conf.php file + + // this is either an existing setup, or a new setup without docker + include(dirname(__FILE__) . "/conf.php"); + + // check if directories is set, otherwise set the defaults for it + if (!isset($DIRECTORIES)) { + $this->directories = [ + "files" => dirname(__FILE__) . "/../files/", + "import" => dirname(__FILE__) . "/../import/", + "log" => dirname(__FILE__) . "/../log/", + "config" => dirname(__FILE__) . "/../config/", + "tus" => "/var/tmp/tus/", + ]; + } + + // extract old database settings format + $this->db_properties[self::DB_PROPERTY_TYPE] = "mysql"; // old setups can only by mysql + $this->db_properties[self::DB_PROPERTY_USER] = $CONN['user']; + $this->db_properties[self::DB_PROPERTY_PASS] = $CONN['pass']; + $this->db_properties[self::DB_PROPERTY_DB] = $CONN['db']; + $this->db_properties[self::DB_PROPERTY_SERVER] = $CONN['server']; + $this->db_properties[self::DB_PROPERTY_PORT] = $CONN['port']; + + // if a pepper is set from an older version, we have to save it to the new file location + if (isset($PEPPER) && !file_exists($this->directories['config'] . "/config.json")) { + file_put_contents($this->directories['config'] . "/config.json", json_encode(array('PEPPER' => $PEPPER))); + } + } + + public function getDirectories(): array { + return $this->directories; + } + + public function getDirectoryFiles(): string { + return $this->directories[self::DIRECTORY_FILES]; + } + + public function getDirectoryImport(): string { + return $this->directories[self::DIRECTORY_IMPORT]; + } + + public function getDirectoryLog(): string { + return $this->directories[self::DIRECTORY_LOG]; + } + + public function getDirectoryConfig(): string { + return $this->directories[self::DIRECTORY_CONFIG]; + } + + public function getDirectoryTus(): string { + return $this->directories[self::DIRECTORY_TUS]; + } + + public function getDatabaseType(): string { + return $this->db_properties[self::DB_PROPERTY_TYPE]; + } + + public function getDatabaseUser(): string { + return $this->db_properties[self::DB_PROPERTY_USER]; + } + + public function getDatabasePassword(): string { + return $this->db_properties[self::DB_PROPERTY_PASS]; + } + + public function getDatabaseDB(): string { + return $this->db_properties[self::DB_PROPERTY_DB]; + } + + public function getDatabaseServer(): string { + return $this->db_properties[self::DB_PROPERTY_SERVER]; + } + + public function getDatabasePort(): string { + return $this->db_properties[self::DB_PROPERTY_PORT]; + } + + public function getPepper(int $index): string { + if ($index < 0 || $index > sizeof($this->peppers)) { + return ""; + } + return $this->peppers[$index]; + } + + public function getVersion(): string { + return "v1.0.0-rainbow4"; + } + + public function getBuild(): string { + return "repository"; + } + + public function getHost(): string { + $host = @$_SERVER['HTTP_HOST']; + if (str_contains($host, ":")) { + $host = substr($host, 0, strpos($host, ":")); + } + if ($host === null){ + $host = ""; + } + return $host; + } +} \ No newline at end of file diff --git a/src/inc/api/APILogin.class.php b/src/inc/api/APILogin.class.php index ea041cd29..604c3be9f 100644 --- a/src/inc/api/APILogin.class.php +++ b/src/inc/api/APILogin.class.php @@ -5,8 +5,6 @@ class APILogin extends APIBasic { public function execute($QUERY = array()) { - global $VERSION; - if (!PQueryLogin::isValid($QUERY)) { $this->sendErrorResponse(PActions::LOGIN, "Invalid login query!"); } @@ -21,7 +19,7 @@ public function execute($QUERY = array()) { PResponseLogin::RESPONSE => PValues::SUCCESS, PResponseLogin::MULTICAST => (SConfig::getInstance()->getVal(DConfig::MULTICAST_ENABLE)) ? true : false, PResponseLogin::TIMEOUT => (int)SConfig::getInstance()->getVal(DConfig::AGENT_TIMEOUT), - PResponseLogin::VERSION => $VERSION . " (" . Util::getGitCommit() . ")" + PResponseLogin::VERSION => StartupConfig::getInstance()->getVersion() . " (" . Util::getGitCommit() . ")" ) ); } diff --git a/src/inc/apiv2/auth/token.routes.php b/src/inc/apiv2/auth/token.routes.php index b394d2cbc..7ad1f02ee 100644 --- a/src/inc/apiv2/auth/token.routes.php +++ b/src/inc/apiv2/auth/token.routes.php @@ -15,10 +15,6 @@ require_once(dirname(__FILE__) . "/../../startup/include.php"); function generateTokenForUser(Request $request, string $userName, int $expires) { - include(dirname(__FILE__) . '/../../confv2.php'); - if (!isset($PEPPER)) { - throw new HttpError("Pepper is not set"); - } $jti = bin2hex(random_bytes(16)); $requested_scopes = $request->getParsedBody() ?: ["todo.all"]; @@ -44,7 +40,7 @@ function generateTokenForUser(Request $request, string $userName, int $expires) throw new HttpError("No user with this userName in the database"); } - $secret = $PEPPER[0]; + $secret = StartupConfig::getInstance()->getPepper(0); $now = new DateTime(); $payload = [ @@ -152,11 +148,8 @@ function extractBearerToken(Request $request): ?string { $future = new DateTime("now +2 hours"); $jti = bin2hex(random_bytes(16)); - if (!isset($PEPPER)) { - throw new HttpError("Pepper is not set"); - } - $secret = $PEPPER[0]; + $secret = StartupConfig::getInstance()->getPepper(0); $payload = [ "iat" => $now->getTimeStamp(), "exp" => $future->getTimeStamp(), diff --git a/src/inc/confv2.php b/src/inc/confv2.php deleted file mode 100644 index fe94080c1..000000000 --- a/src/inc/confv2.php +++ /dev/null @@ -1,77 +0,0 @@ - dirname(__FILE__) . "/../files/", - "import" => dirname(__FILE__) . "/../import/", - "log" => dirname(__FILE__) . "/../log/", - "config" => dirname(__FILE__) . "/../config/", - "tus" => "/var/tmp/tus/", - ]; - } - - // if a pepper is set from an older version, we have to save it to the new file location - if (isset($PEPPER) && !file_exists($DIRECTORIES['config'] . "/config.json")) { - file_put_contents($DIRECTORIES['config'] . "/config.json", json_encode(array('PEPPER' => $PEPPER))); - } -} else { - // read env variables (when running with docker-compose) - $CONN['user'] = getenv('HASHTOPOLIS_DB_USER'); - $CONN['pass'] = getenv('HASHTOPOLIS_DB_PASS'); - $CONN['server'] = getenv('HASHTOPOLIS_DB_HOST'); - $CONN['db'] = getenv('HASHTOPOLIS_DB_DATABASE'); - if (getenv('HASHTOPOLIS_DB_TYPE') !== false) { - $CONN['type'] = getenv('HASHTOPOLIS_DB_TYPE'); - } - else { - $CONN['type'] = 'mysql'; - } - if (getenv('HASHTOPOLIS_DB_PORT') !== false) { - $CONN['port'] = getenv('HASHTOPOLIS_DB_PORT'); - } - else { - switch($CONN['type']) { - case 'mysql': - $CONN['port'] = '3306'; - break; - case 'postgres': - $CONN['port'] = '5432'; - break; - } - } - - $DIRECTORIES = [ - "files" => "/usr/local/share/hashtopolis/files", - "import" => "/usr/local/share/hashtopolis/import", - "log" => "/usr/local/share/hashtopolis/log", - "config" => "/usr/local/share/hashtopolis/config", - "tus" => "/var/tmp/tus/", - ]; - - // update from env if set - if (getenv('HASHTOPOLIS_FILES_PATH') !== false) { - $DIRECTORIES["files"] = getenv('HASHTOPOLIS_FILES_PATH'); - } - if (getenv('HASHTOPOLIS_IMPORT_PATH') !== false) { - $DIRECTORIES["import"] = getenv('HASHTOPOLIS_IMPORT_PATH'); - } - if (getenv('HASHTOPOLIS_LOG_PATH') !== false) { - $DIRECTORIES["log"] = getenv('HASHTOPOLIS_LOG_PATH'); - } - if (getenv('HASHTOPOLIS_TUS_PATH') !== false) { - $DIRECTORIES["tus"] = getenv('HASHTOPOLIS_TUS_PATH'); - } -} -// load data -// test if config file exists -if (file_exists($DIRECTORIES['config'] . "/config.json")) { - $CONFIG = json_decode(file_get_contents($DIRECTORIES['config'] . "/config.json"), true); - $PEPPER = $CONFIG['PEPPER']; -} else { - $CONFIG = []; -} diff --git a/src/inc/info.php b/src/inc/info.php deleted file mode 100644 index c46c8b5ba..000000000 --- a/src/inc/info.php +++ /dev/null @@ -1,8 +0,0 @@ -getVersion()); +UI::add('host', StartupConfig::getInstance()->getHost()); UI::add('gitcommit', Util::getGitCommit()); UI::add('build', ''); diff --git a/src/inc/startup/setup.php b/src/inc/startup/setup.php index 233cb8558..8bb7feea0 100755 --- a/src/inc/startup/setup.php +++ b/src/inc/startup/setup.php @@ -1,8 +1,8 @@ $path) { +foreach (StartupConfig::getInstance()->getDirectories() as $name => $path) { if (!file_exists($path)) { if (mkdir($path) === false) { die("Unable to create directory '$path'!"); } - } elseif (!is_writable($path)) { + } + elseif (!is_writable($path)) { die("Directory '$path' is not writable!"); } } // check if the system is set up and installed -if (Factory::getUserFactory()->getDB(true) === null) { +if (Factory::getUserFactory()->getDB() === null) { //connection not valid die("Database connection failed!"); } @@ -45,36 +46,37 @@ } // this only needs to be present for the very first upgrade from non-migration to migrations to make sure the last updates are executed before migration -if (!$initialSetup && DBA_TYPE == "mysql" && !Util::databaseTableExists("_sqlx_migrations")) { +if (!$initialSetup && StartupConfig::getInstance()->getDatabaseType() == "mysql" && !Util::databaseTableExists("_sqlx_migrations")) { include(dirname(__FILE__) . "/../../install/updates/update.php"); } -$database_uri = DBA_TYPE . "://" . DBA_USER . ":" . DBA_PASS . "@" . DBA_SERVER . ":" . DBA_PORT . "/" . DBA_DB; -exec('/usr/bin/sqlx migrate run --source ' . dirname(__FILE__) . '/../../migrations/' . DBA_TYPE . '/ -D ' . $database_uri, $output, $retval); +$database_uri = StartupConfig::getInstance()->getDatabaseType() . "://" . StartupConfig::getInstance()->getDatabaseUser() . ":" . StartupConfig::getInstance()->getDatabasePassword() . "@" . StartupConfig::getInstance()->getDatabaseServer() . ":" . StartupConfig::getInstance()->getDatabasePort() . "/" . StartupConfig::getInstance()->getDatabaseDB(); +exec('/usr/bin/sqlx migrate run --source ' . dirname(__FILE__) . '/../../migrations/' . StartupConfig::getInstance()->getDatabaseType() . '/ -D ' . $database_uri, $output, $retval); if ($retval !== 0) { die("Failed to run migrations: \n" . implode("\n", $output)); } if ($initialSetup === true) { // if peppers are not set, generate them and save them - if (!isset($PEPPER)) { - $PEPPER = [ + if (strlen(StartupConfig::getInstance()->getPepper(0)) == 0) { + $pepper = [ Util::randomString(32), Util::randomString(32), Util::randomString(32), Util::randomString(32) ]; - - $json_config_filepath = $DIRECTORIES['config'] . "/config.json"; - if (file_put_contents($json_config_filepath, json_encode(array('PEPPER' =>$PEPPER))) === false) { + + $json_config_filepath = StartupConfig::getInstance()->getDirectoryConfig() . "/config.json"; + if (file_put_contents($json_config_filepath, json_encode(array('PEPPER' => $pepper))) === false) { die("Cannot write configuration file '$json_config_filepath'!"); } + StartupConfig::reload(); } // save version and build - $version = new StoredValue("version", explode("+", $VERSION)[0]); + $version = new StoredValue("version", explode("+", StartupConfig::getInstance()->getVersion())[0]); Factory::getStoredValueFactory()->save($version); - $build = new StoredValue("build", $BUILD); + $build = new StoredValue("build", StartupConfig::getInstance()->getBuild()); Factory::getStoredValueFactory()->save($build); // create default user @@ -94,7 +96,7 @@ $group = Factory::getRightGroupFactory()->filter([Factory::FILTER => $qF]); $group = $group[0]; $newSalt = Util::randomString(20); - $CIPHER = $PEPPER[1] . $password . $newSalt; + $CIPHER = StartupConfig::getInstance()->getPepper(1) . $password . $newSalt; $options = array('cost' => 12); $newHash = password_hash($CIPHER, PASSWORD_BCRYPT, $options); @@ -110,8 +112,8 @@ } // check if directories are saved in config -Util::checkDataDirectory(DDirectories::FILES, $DIRECTORIES['files']); -Util::checkDataDirectory(DDirectories::IMPORT, $DIRECTORIES['import']); -Util::checkDataDirectory(DDirectories::LOG, $DIRECTORIES['log']); -Util::checkDataDirectory(DDirectories::CONFIG, $DIRECTORIES['config']); -Util::checkDataDirectory(DDirectories::TUS, $DIRECTORIES['tus']); \ No newline at end of file +Util::checkDataDirectory(DDirectories::FILES, StartupConfig::getInstance()->getDirectoryFiles()); +Util::checkDataDirectory(DDirectories::IMPORT, StartupConfig::getInstance()->getDirectoryImport()); +Util::checkDataDirectory(DDirectories::LOG, StartupConfig::getInstance()->getDirectoryLog()); +Util::checkDataDirectory(DDirectories::CONFIG, StartupConfig::getInstance()->getDirectoryConfig()); +Util::checkDataDirectory(DDirectories::TUS, StartupConfig::getInstance()->getDirectoryTus()); \ No newline at end of file diff --git a/src/install/index.php b/src/install/index.php index 2168362fe..176aef624 100755 --- a/src/install/index.php +++ b/src/install/index.php @@ -15,8 +15,6 @@ die("Installation is already done!"); } -/** @var array $CONN */ - $STEP = 0; if (isset($_COOKIE['step'])) { $STEP = $_COOKIE['step']; @@ -84,9 +82,9 @@ file_put_contents(dirname(__FILE__) . "/../import/.htaccess", "Order deny,allow\nDeny from all"); // save version and build into database - $version = new StoredValue("version", explode("+", $VERSION)[0]); + $version = new StoredValue("version", explode("+", StartupConfig::getInstance()->getVersion())[0]); Factory::getStoredValueFactory()->save($version); - $build = new StoredValue("build", $BUILD); + $build = new StoredValue("build", StartupConfig::getInstance()->getBuild()); Factory::getStoredValueFactory()->save($build); setcookie("step", "", time() - 10); setcookie("prev", "", time() - 10); @@ -126,7 +124,7 @@ 'db' => $_POST['db'], 'port' => $_POST['port'] ); - if (Factory::getUserFactory()->getDB(true) === null) { + if (Factory::getUserFactory()->getDB(true, $CONN) === null) { //connection not valid $fail = true; } diff --git a/src/install/updates/update.php b/src/install/updates/update.php index 4131b5103..2f2505d27 100644 --- a/src/install/updates/update.php +++ b/src/install/updates/update.php @@ -11,9 +11,8 @@ */ if (!isset($TEST)) { - require_once(dirname(__FILE__) . "/../../inc/confv2.php"); + require_once(dirname(__FILE__) . "/../../inc/StartupConfig.class.php"); require_once(dirname(__FILE__) . "/../../dba/init.php"); - require_once(dirname(__FILE__) . "/../../inc/info.php"); require_once(dirname(__FILE__) . "/../../inc/Util.class.php"); } @@ -32,13 +31,13 @@ $upgradePossible = true; if ($storedVersion == null) { // we just save the current version and assume that the upgrade was executed up to this version - $storedVersion = new StoredValue("version", explode("+", $VERSION)[0]); + $storedVersion = new StoredValue("version", explode("+", StartupConfig::getInstance()->getVersion())[0]); Factory::getStoredValueFactory()->save($storedVersion); $upgradePossible = false; } if ($storedBuild == null) { // we just save the current build and assume that the upgrade was executed up to this build - $storedBuild = new StoredValue("build", ($BUILD == 'repository') ? Util::getGitCommit(true) : $BUILD); + $storedBuild = new StoredValue("build", (StartupConfig::getInstance()->getBuild() == 'repository') ? Util::getGitCommit(true) : StartupConfig::getInstance()->getBuild()); Factory::getStoredValueFactory()->save($storedBuild); $upgradePossible = false; } @@ -66,8 +65,8 @@ } // save the new version - $storedVersion->setVal(explode("+", $VERSION)[0]); + $storedVersion->setVal(explode("+", StartupConfig::getInstance()->getVersion())[0]); Factory::getStoredValueFactory()->update($storedVersion); - $storedBuild->setVal(($BUILD == 'repository') ? Util::getGitCommit(true) : $BUILD); + $storedBuild->setVal((StartupConfig::getInstance()->getBuild() == 'repository') ? Util::getGitCommit(true) : StartupConfig::getInstance()->getBuild()); Factory::getStoredValueFactory()->update($storedBuild); } diff --git a/src/install/updates/update_v0.10.x_v0.11.0.php b/src/install/updates/update_v0.10.x_v0.11.0.php index 261b650f8..aeddfac5f 100644 --- a/src/install/updates/update_v0.10.x_v0.11.0.php +++ b/src/install/updates/update_v0.10.x_v0.11.0.php @@ -5,8 +5,7 @@ use DBA\HashType; if (!isset($TEST)) { - require_once(dirname(__FILE__) . "/../../inc/confv2.php"); - require_once(dirname(__FILE__) . "/../../inc/info.php"); + require_once(dirname(__FILE__) . "/../../inc/StartupConfig.class.php"); require_once(dirname(__FILE__) . "/../../dba/init.php"); require_once(dirname(__FILE__) . "/../../inc/Util.class.php"); } diff --git a/src/install/updates/update_v0.11.x_v0.12.0.php b/src/install/updates/update_v0.11.x_v0.12.0.php index df5259e26..88d33f682 100644 --- a/src/install/updates/update_v0.11.x_v0.12.0.php +++ b/src/install/updates/update_v0.11.x_v0.12.0.php @@ -6,8 +6,7 @@ use DBA\QueryFilter; if (!isset($TEST)) { - require_once(dirname(__FILE__) . "/../../inc/confv2.php"); - require_once(dirname(__FILE__) . "/../../inc/info.php"); + require_once(dirname(__FILE__) . "/../../inc/StartupConfig.class.php"); require_once(dirname(__FILE__) . "/../../dba/init.php"); require_once(dirname(__FILE__) . "/../../inc/Util.class.php"); } diff --git a/src/install/updates/update_v0.12.x_v0.13.0.php b/src/install/updates/update_v0.12.x_v0.13.0.php index 272458c74..f7bbddb51 100644 --- a/src/install/updates/update_v0.12.x_v0.13.0.php +++ b/src/install/updates/update_v0.12.x_v0.13.0.php @@ -4,8 +4,7 @@ use DBA\HashType; if (!isset($TEST)) { - require_once(dirname(__FILE__) . "/../../inc/confv2.php"); - require_once(dirname(__FILE__) . "/../../inc/info.php"); + require_once(dirname(__FILE__) . "/../../inc/StartupConfig.class.php"); require_once(dirname(__FILE__) . "/../../dba/init.php"); require_once(dirname(__FILE__) . "/../../inc/Util.class.php"); } diff --git a/src/install/updates/update_v0.13.x_v0.13.1.php b/src/install/updates/update_v0.13.x_v0.13.1.php index 6b948cd40..b3eff3201 100644 --- a/src/install/updates/update_v0.13.x_v0.13.1.php +++ b/src/install/updates/update_v0.13.x_v0.13.1.php @@ -5,8 +5,7 @@ if (!isset($TEST)) { /** @noinspection PhpIncludeInspection */ - require_once(dirname(__FILE__) . "/../../inc/confv2.php"); - require_once(dirname(__FILE__) . "/../../inc/info.php"); + require_once(dirname(__FILE__) . "/../../inc/StartupConfig.class.php"); require_once(dirname(__FILE__) . "/../../dba/init.php"); require_once(dirname(__FILE__) . "/../../inc/Util.class.php"); } diff --git a/src/install/updates/update_v0.4.0_v0.5.0.php b/src/install/updates/update_v0.4.0_v0.5.0.php index d897cb520..d69e21371 100644 --- a/src/install/updates/update_v0.4.0_v0.5.0.php +++ b/src/install/updates/update_v0.4.0_v0.5.0.php @@ -118,7 +118,7 @@ $DB->exec("SET @tables = NULL; SELECT GROUP_CONCAT(table_schema, '.', table_name) INTO @tables FROM information_schema.tables - WHERE table_schema = '" . $CONN['db'] . "'; + WHERE table_schema = '" . StartupConfig::getInstance()->getDatabaseDB() . "'; SET @tables = CONCAT('DROP TABLE ', @tables); PREPARE stmt FROM @tables; diff --git a/src/install/updates/update_v0.9.0_v0.10.0.php b/src/install/updates/update_v0.9.0_v0.10.0.php index f838289b0..998a1a718 100644 --- a/src/install/updates/update_v0.9.0_v0.10.0.php +++ b/src/install/updates/update_v0.9.0_v0.10.0.php @@ -6,8 +6,7 @@ use DBA\AgentBinary; if (!isset($TEST)) { - require_once(dirname(__FILE__) . "/../../inc/confv2.php"); - require_once(dirname(__FILE__) . "/../../inc/info.php"); + require_once(dirname(__FILE__) . "/../../inc/StartupConfig.class.php"); require_once(dirname(__FILE__) . "/../../dba/init.php"); require_once(dirname(__FILE__) . "/../../inc/Util.class.php"); } diff --git a/src/install/updates/update_v1.0.0-rainbow4_vx.x.x.php b/src/install/updates/update_v1.0.0-rainbow4_vx.x.x.php index 29e278f86..15edcabe3 100644 --- a/src/install/updates/update_v1.0.0-rainbow4_vx.x.x.php +++ b/src/install/updates/update_v1.0.0-rainbow4_vx.x.x.php @@ -6,7 +6,7 @@ use DBA\QueryFilter; -if (DBA_TYPE == 'postgres' || Util::databaseTableExists("_sqlx_migrations")) { +if (StartupConfig::getInstance()->getDatabaseType() == 'postgres' || Util::databaseTableExists("_sqlx_migrations")) { // this system is already using migrations, so it should NEVER do any of the updates return; } From 1fe468ea221a86296be6cde21b38b0e990f61030 Mon Sep 17 00:00:00 2001 From: s3inlc Date: Thu, 12 Feb 2026 14:26:24 +0100 Subject: [PATCH 414/691] added flags to print warnings and deprecations --- .github/workflows/ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 00705c5a8..73c4f46c7 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -28,7 +28,7 @@ jobs: - name: Give Apache permissions on necessary directories # for the tests, only src/files and src/inc/utils/locks seem necessary run: docker exec -u root hashtopolis-server-dev bash -c "chown -R www-data:www-data /var/www/html/src && chmod -R g+w /var/www/html/src" - name: PHPUnittest Run - run: docker exec -w /var/www/html/ hashtopolis-server-dev ./vendor/bin/phpunit ci/phpunit + run: docker exec -w /var/www/html/ hashtopolis-server-dev ./vendor/bin/phpunit ci/phpunit --display-warnings --display-deprecations - name: Test with pytest run: docker exec -w /var/www/html/ci/apiv2 hashtopolis-server-dev pytest - name: Test if pytest is removing all test objects From cc3c5f579666fdae501fc7256ff1bc8d3388ba2d Mon Sep 17 00:00:00 2001 From: s3inlc Date: Thu, 12 Feb 2026 14:40:19 +0100 Subject: [PATCH 415/691] added test for columnFilter function --- ci/phpunit/dba/AbstractModelFactoryTest.php | 30 +++++++++++++++++++++ 1 file changed, 30 insertions(+) diff --git a/ci/phpunit/dba/AbstractModelFactoryTest.php b/ci/phpunit/dba/AbstractModelFactoryTest.php index 3c0a1f8d1..c57496ef2 100644 --- a/ci/phpunit/dba/AbstractModelFactoryTest.php +++ b/ci/phpunit/dba/AbstractModelFactoryTest.php @@ -1,6 +1,8 @@ filter([Factory::FILTER => $qF]); $this->assertSame([], $user); } + + /** + * Tests the columnFilter function which returns an array of values of the given column of matching rows + * + * @return void + */ + public function testColumnFilter(): void { + // add some data + $hashlist_1 = new Hashlist(null, "hashlist 1", \DHashlistFormat::PLAIN, 0, 0, ':', 0, 0, 0, 0, \AccessUtils::getOrCreateDefaultAccessGroup()->getId(), "", 0, 0, 0); + $hashlist_2 = new Hashlist(null, "hashlist 2", \DHashlistFormat::PLAIN, 0, 0, ':', 0, 0, 0, 1, \AccessUtils::getOrCreateDefaultAccessGroup()->getId(), "", 0, 0, 0); + $hashlist_3 = new Hashlist(null, "hashlist 3", \DHashlistFormat::PLAIN, 0, 0, ':', 0, 0, 0, 0, \AccessUtils::getOrCreateDefaultAccessGroup()->getId(), "", 0, 0, 0); + $hashlist_1 = Factory::getHashlistFactory()->save($hashlist_1); + $hashlist_2 = Factory::getHashlistFactory()->save($hashlist_2); + $hashlist_3 = Factory::getHashlistFactory()->save($hashlist_3); + + $oF = new OrderFilter(Hashlist::HASHLIST_ID, "ASC"); + + // test column filter to retrieve some of their IDs + $qF = new QueryFilter(Hashlist::IS_SALTED, 0, "="); + $ids = Factory::getHashlistFactory()->columnFilter([Factory::FILTER => $qF, Factory::ORDER => $oF], Hashlist::HASHLIST_ID); + + // hashlist 1 and 3 should be returned + $this->assertSame([$hashlist_1->getId(), $hashlist_3->getId()], $ids); + + $qF = new QueryFilter(Hashlist::CRACKED, 0, ">"); + $ids = Factory::getHashlistFactory()->columnFilter([Factory::FILTER => $qF, Factory::ORDER => $oF], Hashlist::HASHLIST_ID); + $this->assertSame([], $ids); + } } From cd77f3d106f7150ea90d7fcdbeb8b5c4b21d27b7 Mon Sep 17 00:00:00 2001 From: s3inlc Date: Thu, 12 Feb 2026 14:52:26 +0100 Subject: [PATCH 416/691] fixed columnFilter function --- src/dba/AbstractModelFactory.class.php | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/dba/AbstractModelFactory.class.php b/src/dba/AbstractModelFactory.class.php index e8fe252d0..e0c74b6e6 100755 --- a/src/dba/AbstractModelFactory.class.php +++ b/src/dba/AbstractModelFactory.class.php @@ -487,7 +487,8 @@ public function columnFilter(array $options, string $column): array { $stmt = $dbh->prepare($query); $stmt->execute($vals); - return $stmt->fetch(PDO::FETCH_ASSOC); + // we make sure that only the numeric key entries are passed back, otherwise there could be double entries + return array_filter($stmt->fetch(PDO::FETCH_ASSOC), fn($_, $k) => is_int($k), ARRAY_FILTER_USE_KEY); } public function sumFilter($options, $sumColumn) { From 804b8ce93b05700f017160c35a9fc38a136d2a37 Mon Sep 17 00:00:00 2001 From: Sein Coray Date: Thu, 12 Feb 2026 14:56:52 +0100 Subject: [PATCH 417/691] Update src/inc/StartupConfig.class.php Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com> --- src/inc/StartupConfig.class.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/inc/StartupConfig.class.php b/src/inc/StartupConfig.class.php index 3f52af2fe..3ad528918 100644 --- a/src/inc/StartupConfig.class.php +++ b/src/inc/StartupConfig.class.php @@ -222,7 +222,7 @@ public function getDatabasePort(): string { } public function getPepper(int $index): string { - if ($index < 0 || $index > sizeof($this->peppers)) { + if ($index < 0 || $index >= count($this->peppers)) { return ""; } return $this->peppers[$index]; From 618269a5b42aac0b089a09fc11a303558dc0db7b Mon Sep 17 00:00:00 2001 From: s3inlc Date: Thu, 12 Feb 2026 15:05:32 +0100 Subject: [PATCH 418/691] implemented some suggestions from copilot --- src/dba/AbstractModelFactory.class.php | 2 +- src/inc/StartupConfig.class.php | 3 +++ src/install/index.php | 3 ++- 3 files changed, 6 insertions(+), 2 deletions(-) diff --git a/src/dba/AbstractModelFactory.class.php b/src/dba/AbstractModelFactory.class.php index e0c74b6e6..8cfeac0de 100755 --- a/src/dba/AbstractModelFactory.class.php +++ b/src/dba/AbstractModelFactory.class.php @@ -948,7 +948,7 @@ public function getDB(bool $test = false, array $testProperties = []): ?PDO { $dbHost = StartupConfig::getInstance()->getDatabaseServer(); $dbPort = StartupConfig::getInstance()->getDatabasePort(); $dbDB = StartupConfig::getInstance()->getDatabaseDB(); - if ($test) { // if the connection is being tested, take credentials from argument properties + if ($test && sizeof($testProperties) == 6) { // if the connection is being tested, take credentials from argument properties $dbUser = $testProperties['user']; $dbPass = $testProperties['pass']; $dbType = $testProperties['type']; diff --git a/src/inc/StartupConfig.class.php b/src/inc/StartupConfig.class.php index 3f52af2fe..36ee9e68a 100644 --- a/src/inc/StartupConfig.class.php +++ b/src/inc/StartupConfig.class.php @@ -158,6 +158,9 @@ private function loadLegacyConfig(): void { "tus" => "/var/tmp/tus/", ]; } + else { + $this->directories = $DIRECTORIES; + } // extract old database settings format $this->db_properties[self::DB_PROPERTY_TYPE] = "mysql"; // old setups can only by mysql diff --git a/src/install/index.php b/src/install/index.php index 176aef624..05de8d45d 100755 --- a/src/install/index.php +++ b/src/install/index.php @@ -122,7 +122,8 @@ 'pass' => $_POST['pass'], 'server' => $_POST['server'], 'db' => $_POST['db'], - 'port' => $_POST['port'] + 'port' => $_POST['port'], + 'type' => 'mysql', ); if (Factory::getUserFactory()->getDB(true, $CONN) === null) { //connection not valid From a7737137f33aef69e7c48438505ca75168974a34 Mon Sep 17 00:00:00 2001 From: s3inlc Date: Thu, 12 Feb 2026 15:10:21 +0100 Subject: [PATCH 419/691] set to fetch all --- src/dba/AbstractModelFactory.class.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/dba/AbstractModelFactory.class.php b/src/dba/AbstractModelFactory.class.php index 8cfeac0de..0728eb391 100755 --- a/src/dba/AbstractModelFactory.class.php +++ b/src/dba/AbstractModelFactory.class.php @@ -488,7 +488,7 @@ public function columnFilter(array $options, string $column): array { $stmt->execute($vals); // we make sure that only the numeric key entries are passed back, otherwise there could be double entries - return array_filter($stmt->fetch(PDO::FETCH_ASSOC), fn($_, $k) => is_int($k), ARRAY_FILTER_USE_KEY); + return array_filter($stmt->fetchAll(PDO::FETCH_ASSOC), fn($_, $k) => is_int($k), ARRAY_FILTER_USE_KEY); } public function sumFilter($options, $sumColumn) { From 70c2f9562779f641b07b36dd80d4bad22a42ed02 Mon Sep 17 00:00:00 2001 From: s3inlc Date: Thu, 12 Feb 2026 15:17:21 +0100 Subject: [PATCH 420/691] fetch all NUM only --- src/dba/AbstractModelFactory.class.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/dba/AbstractModelFactory.class.php b/src/dba/AbstractModelFactory.class.php index 0728eb391..6562839eb 100755 --- a/src/dba/AbstractModelFactory.class.php +++ b/src/dba/AbstractModelFactory.class.php @@ -488,7 +488,7 @@ public function columnFilter(array $options, string $column): array { $stmt->execute($vals); // we make sure that only the numeric key entries are passed back, otherwise there could be double entries - return array_filter($stmt->fetchAll(PDO::FETCH_ASSOC), fn($_, $k) => is_int($k), ARRAY_FILTER_USE_KEY); + return $stmt->fetchAll(PDO::FETCH_NUM); } public function sumFilter($options, $sumColumn) { From 11dde2e8a0d8f270ff7df2082c95067c66a9d101 Mon Sep 17 00:00:00 2001 From: s3inlc Date: Thu, 12 Feb 2026 15:23:30 +0100 Subject: [PATCH 421/691] fixed remapping of result array into flat array --- src/dba/AbstractModelFactory.class.php | 22 +++++++++++++--------- 1 file changed, 13 insertions(+), 9 deletions(-) diff --git a/src/dba/AbstractModelFactory.class.php b/src/dba/AbstractModelFactory.class.php index 6562839eb..262734ae3 100755 --- a/src/dba/AbstractModelFactory.class.php +++ b/src/dba/AbstractModelFactory.class.php @@ -138,7 +138,7 @@ public function save(AbstractModel $model): ?AbstractModel { $keys = self::getMappedModelKeys($model); - if($vals[0] === -1 || $vals[0] === null){ + if ($vals[0] === -1 || $vals[0] === null) { array_splice($vals, 0, 1); array_splice($keys, 0, 1); } @@ -487,8 +487,12 @@ public function columnFilter(array $options, string $column): array { $stmt = $dbh->prepare($query); $stmt->execute($vals); - // we make sure that only the numeric key entries are passed back, otherwise there could be double entries - return $stmt->fetchAll(PDO::FETCH_NUM); + // put result into one array + $result = []; + while ($row = $stmt->fetch(PDO::FETCH_NUM)) { + $result[] = $row[0]; + } + return $result; } public function sumFilter($options, $sumColumn) { @@ -612,7 +616,7 @@ private function filterWithJoin(array $options): array|AbstractModel { $query .= " " . $join->getJoinType() . " JOIN " . $joinFactory->getMappedModelTable() . " ON " . $localFactory->getMappedModelTable() . "." . $match1 . "=" . $joinFactory->getMappedModelTable() . "." . $match2 . " "; $joinQueryFilters = $join->getQueryFilters(); if (count($joinQueryFilters) > 0) { - $query .= $this->applyFilters($vals, $joinQueryFilters, true) ; + $query .= $this->applyFilters($vals, $joinQueryFilters, true); } } @@ -865,12 +869,12 @@ public function massSingleUpdate($matchingColumn, $updateColumn, array $updates) if (sizeof($updates) == 0) { return null; } - $query .= " SET ".self::getMappedModelKey($this->getNullObject(),$updateColumn)." = ( CASE "; + $query .= " SET " . self::getMappedModelKey($this->getNullObject(), $updateColumn) . " = ( CASE "; $vals = array(); foreach ($updates as $update) { - $query .= $update->getMassQuery(self::getMappedModelKey($this->getNullObject(),$matchingColumn)); + $query .= $update->getMassQuery(self::getMappedModelKey($this->getNullObject(), $matchingColumn)); $vals[] = $update->getMatchValue(); $vals[] = $update->getUpdateValue(); } @@ -888,7 +892,7 @@ public function massSingleUpdate($matchingColumn, $updateColumn, array $updates) $query .= " ELSE 2147483648 "; // 32 bit int max + 1 } - $query .= "END) WHERE ".self::getMappedModelKey($this->getNullObject(), $matchingColumn)." IN (" . implode(",", $matchingArr) . ")"; + $query .= "END) WHERE " . self::getMappedModelKey($this->getNullObject(), $matchingColumn) . " IN (" . implode(",", $matchingArr) . ")"; $dbh = self::getDB(); $stmt = $dbh->prepare($query); return $stmt->execute($vals); @@ -956,7 +960,7 @@ public function getDB(bool $test = false, array $testProperties = []): ?PDO { $dbPort = $testProperties['port']; $dbDB = $testProperties['db']; } - + if ($dbType == 'mysql') { // connect as mysql $dsn = "mysql:dbname=$dbDB;host=$dbHost;port=$dbPort;charset=utf8mb4"; @@ -974,7 +978,7 @@ public function getDB(bool $test = false, array $testProperties = []): ?PDO { } throw new Exception("Fatal Error: Unknown database type specified!"); } - + self::$dbh->setAttribute(PDO::ATTR_ERRMODE, PDO::ERRMODE_EXCEPTION); return self::$dbh; } From 71f13221ebb9121a569cc03b2eb65aa798879233 Mon Sep 17 00:00:00 2001 From: s3inlc Date: Thu, 12 Feb 2026 15:30:50 +0100 Subject: [PATCH 422/691] test connection should work correctly therefore assuming not null --- ci/phpunit/dba/AbstractModelFactoryTest.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ci/phpunit/dba/AbstractModelFactoryTest.php b/ci/phpunit/dba/AbstractModelFactoryTest.php index c57496ef2..e8c46eb62 100644 --- a/ci/phpunit/dba/AbstractModelFactoryTest.php +++ b/ci/phpunit/dba/AbstractModelFactoryTest.php @@ -18,7 +18,7 @@ final class AbstractModelFactoryTest extends TestCase { public function testGetDBWithTest(): void { $db = Factory::getAgentFactory()->getDB(true); - $this->assertSame(null, $db); + $this->assertNotNull($db); } /** From 3e0735dafdecc1cdf68aaddbbc7e14b36ceb5454 Mon Sep 17 00:00:00 2001 From: s3inlc Date: Thu, 12 Feb 2026 15:36:29 +0100 Subject: [PATCH 423/691] added cleanup function to test --- ci/phpunit/dba/AbstractModelFactoryTest.php | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/ci/phpunit/dba/AbstractModelFactoryTest.php b/ci/phpunit/dba/AbstractModelFactoryTest.php index e8c46eb62..349e19ef8 100644 --- a/ci/phpunit/dba/AbstractModelFactoryTest.php +++ b/ci/phpunit/dba/AbstractModelFactoryTest.php @@ -1,6 +1,8 @@ "); $ids = Factory::getHashlistFactory()->columnFilter([Factory::FILTER => $qF, Factory::ORDER => $oF], Hashlist::HASHLIST_ID); $this->assertSame([], $ids); + + // clean up + Factory::getHashlistFactory()->massDeletion([Factory::FILTER => new ContainFilter(Hashlist::HASHLIST_ID, [$hashlist_1->getId(), $hashlist_2->getId(), $hashlist_3->getId()])]); } } From 51875b921020dec0760dcf16497872c54a0e4716 Mon Sep 17 00:00:00 2001 From: s3inlc Date: Thu, 12 Feb 2026 15:50:03 +0100 Subject: [PATCH 424/691] fixed some warnings for missing explicit nullable typing --- src/dba/ComparisonFilter.class.php | 4 ++-- src/inc/HTMessages.class.php | 2 +- src/inc/utils/NotificationUtils.class.php | 2 +- src/inc/utils/RunnerUtils.class.php | 2 +- 4 files changed, 5 insertions(+), 5 deletions(-) diff --git a/src/dba/ComparisonFilter.class.php b/src/dba/ComparisonFilter.class.php index 897404fbe..31ed7ff0f 100755 --- a/src/dba/ComparisonFilter.class.php +++ b/src/dba/ComparisonFilter.class.php @@ -8,11 +8,11 @@ class ComparisonFilter extends Filter { private string $operator; /** - * @var AbstractModelFactory + * @var AbstractModelFactory|null */ private $overrideFactory; - function __construct(string $key1, string $key2, string $operator, AbstractModelFactory $overrideFactory = null) { + function __construct(string $key1, string $key2, string $operator, ?AbstractModelFactory $overrideFactory = null) { $this->key1 = $key1; $this->key2 = $key2; $this->operator = $operator; diff --git a/src/inc/HTMessages.class.php b/src/inc/HTMessages.class.php index c7b690be3..d342f441b 100644 --- a/src/inc/HTMessages.class.php +++ b/src/inc/HTMessages.class.php @@ -3,7 +3,7 @@ class HTMessages extends Exception { private $arr = []; - public function __construct($message = "", $code = 0, Throwable $previous = NULL) { + public function __construct($message = "", $code = 0, ?Throwable $previous = NULL) { $this->arr = $message; $this->message = implode("\n", $this->arr); } diff --git a/src/inc/utils/NotificationUtils.class.php b/src/inc/utils/NotificationUtils.class.php index 6697c3ad4..9ec550034 100644 --- a/src/inc/utils/NotificationUtils.class.php +++ b/src/inc/utils/NotificationUtils.class.php @@ -16,7 +16,7 @@ class NotificationUtils { * @throws HttpError */ - public static function createNotification(string $actionType, string $notification, string $receiver, array $post, User $user = null): NotificationSetting { + public static function createNotification(string $actionType, string $notification, string $receiver, array $post, ?User $user = null): NotificationSetting { if ($user == null) { $user = Login::getInstance()->getUser(); }; diff --git a/src/inc/utils/RunnerUtils.class.php b/src/inc/utils/RunnerUtils.class.php index b0f4f53cd..5b6ec3e33 100644 --- a/src/inc/utils/RunnerUtils.class.php +++ b/src/inc/utils/RunnerUtils.class.php @@ -57,7 +57,7 @@ public static function stopService() { * @return boolean */ private static function isAvailable() { - if (!`which python3`) { + if (!shell_exec("which python3")) { return false; } $path = self::getDir() . "/runner.zip"; From 0bd2329772938ce1b53da9d0a711045e3dae395e Mon Sep 17 00:00:00 2001 From: s3inlc Date: Fri, 13 Feb 2026 08:34:18 +0100 Subject: [PATCH 425/691] changed retrieving of column with fetchAll --- src/dba/AbstractModelFactory.class.php | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) diff --git a/src/dba/AbstractModelFactory.class.php b/src/dba/AbstractModelFactory.class.php index 262734ae3..0a408ee7c 100755 --- a/src/dba/AbstractModelFactory.class.php +++ b/src/dba/AbstractModelFactory.class.php @@ -487,12 +487,7 @@ public function columnFilter(array $options, string $column): array { $stmt = $dbh->prepare($query); $stmt->execute($vals); - // put result into one array - $result = []; - while ($row = $stmt->fetch(PDO::FETCH_NUM)) { - $result[] = $row[0]; - } - return $result; + return $stmt->fetchAll(PDO::FETCH_COLUMN); } public function sumFilter($options, $sumColumn) { From e2c252f9e6f080d7b42daaa9e600debe9bb83ebf Mon Sep 17 00:00:00 2001 From: s3inlc Date: Fri, 13 Feb 2026 16:25:22 +0100 Subject: [PATCH 426/691] completed namespace refactoring, not fully complete yet --- ci/HashtopolisTest.class.php | 11 +- ci/HashtopolisTestFramework.class.php | 6 +- ci/phpunit/dba/AbstractModelFactoryTest.php | 18 +- ci/run.php | 1 + ci/server/setup.php | 2 + ci/tests/AgentTest.class.php | 3 + ci/tests/ConfigTest.class.php | 6 + ci/tests/CrackerTest.class.php | 3 + ci/tests/FileTest.class.php | 3 + ci/tests/GroupTest.class.php | 3 + ci/tests/HashlistTest.class.php | 3 + ci/tests/PretaskTest.class.php | 3 + ci/tests/TaskTest.class.php | 3 + ci/tests/TestTest.class.php | 3 + ci/tests/UserTest.class.php | 5 + ci/tests/integration/MaxAgentsTest.class.php | 3 + ci/tests/integration/RuleSplitTest.class.php | 4 +- composer.json | 3 +- src/about.php | 5 + src/access.php | 17 +- src/account.php | 15 +- src/agentStatus.php | 30 +- src/agents.php | 40 +- src/ajax/get_subtasks.php | 14 +- src/api.php | 20 +- src/api/server.php | 24 + src/api/taskimg.php | 12 +- src/api/user.php | 19 + src/api/v2/index.php | 364 +++--- src/binaries.php | 11 +- src/chunks.php | 19 +- src/config.php | 16 +- src/crackers.php | 23 +- src/cracks.php | 28 +- ...tractModel.class.php => AbstractModel.php} | 2 +- ...ory.class.php => AbstractModelFactory.php} | 12 +- ...{Aggregation.class.php => Aggregation.php} | 20 +- ...lter.class.php => CoalesceOrderFilter.php} | 16 +- ...nFilter.class.php => ComparisonFilter.php} | 9 +- ...tainFilter.class.php => ContainFilter.php} | 20 +- src/dba/{Factory.class.php => Factory.php} | 225 ++-- src/dba/{Filter.class.php => Filter.php} | 2 +- src/dba/{Group.class.php => Group.php} | 2 +- ...{GroupFilter.class.php => GroupFilter.php} | 11 +- src/dba/Join.class.php | 30 - src/dba/Join.php | 21 + src/dba/JoinFilter.class.php | 109 -- src/dba/JoinFilter.php | 86 ++ .../{LikeFilter.class.php => LikeFilter.php} | 22 +- ...ve.class.php => LikeFilterInsensitive.php} | 16 +- src/dba/Limit.class.php | 11 - src/dba/Limit.php | 7 + src/dba/LimitFilter.class.php | 34 - src/dba/LimitFilter.php | 34 + src/dba/MassUpdateSet.class.php | 23 - src/dba/MassUpdateSet.php | 25 + src/dba/{Order.class.php => Order.php} | 2 +- ...{OrderFilter.class.php => OrderFilter.php} | 18 +- ...nFilter.class.php => PaginationFilter.php} | 6 +- ...{QueryFilter.class.php => QueryFilter.php} | 18 +- ...NoCase.class.php => QueryFilterNoCase.php} | 18 +- ...Null.class.php => QueryFilterWithNull.php} | 20 +- .../{UpdateSet.class.php => UpdateSet.php} | 10 +- src/dba/{Util.class.php => Util.php} | 19 +- src/dba/init.php | 52 +- src/dba/models/AbstractModel.template.txt | 4 +- .../models/AbstractModelFactory.template.txt | 7 +- ...{AccessGroup.class.php => AccessGroup.php} | 4 +- ...upAgent.class.php => AccessGroupAgent.php} | 4 +- ....class.php => AccessGroupAgentFactory.php} | 7 +- ...ctory.class.php => AccessGroupFactory.php} | 7 +- ...roupUser.class.php => AccessGroupUser.php} | 4 +- ...y.class.php => AccessGroupUserFactory.php} | 7 +- src/dba/models/{Agent.class.php => Agent.php} | 4 +- ...{AgentBinary.class.php => AgentBinary.php} | 4 +- ...ctory.class.php => AgentBinaryFactory.php} | 7 +- .../{AgentError.class.php => AgentError.php} | 4 +- ...actory.class.php => AgentErrorFactory.php} | 7 +- ...gentFactory.class.php => AgentFactory.php} | 7 +- .../{AgentStat.class.php => AgentStat.php} | 4 +- ...Factory.class.php => AgentStatFactory.php} | 7 +- .../{AgentZap.class.php => AgentZap.php} | 4 +- ...pFactory.class.php => AgentZapFactory.php} | 7 +- .../{ApiGroup.class.php => ApiGroup.php} | 4 +- ...pFactory.class.php => ApiGroupFactory.php} | 7 +- .../models/{ApiKey.class.php => ApiKey.php} | 4 +- ...KeyFactory.class.php => ApiKeyFactory.php} | 7 +- .../{Assignment.class.php => Assignment.php} | 4 +- ...actory.class.php => AssignmentFactory.php} | 7 +- src/dba/models/{Chunk.class.php => Chunk.php} | 4 +- ...hunkFactory.class.php => ChunkFactory.php} | 7 +- .../models/{Config.class.php => Config.php} | 4 +- ...figFactory.class.php => ConfigFactory.php} | 7 +- ...figSection.class.php => ConfigSection.php} | 4 +- ...ory.class.php => ConfigSectionFactory.php} | 7 +- ...ckerBinary.class.php => CrackerBinary.php} | 4 +- ...ory.class.php => CrackerBinaryFactory.php} | 7 +- ...ryType.class.php => CrackerBinaryType.php} | 4 +- ...class.php => CrackerBinaryTypeFactory.php} | 7 +- src/dba/models/Factory.template.txt | 4 +- src/dba/models/{File.class.php => File.php} | 4 +- .../{FileDelete.class.php => FileDelete.php} | 4 +- ...actory.class.php => FileDeleteFactory.php} | 7 +- ...ileDownload.class.php => FileDownload.php} | 4 +- ...tory.class.php => FileDownloadFactory.php} | 7 +- ...{FileFactory.class.php => FileFactory.php} | 7 +- ...{FilePretask.class.php => FilePretask.php} | 4 +- ...ctory.class.php => FilePretaskFactory.php} | 7 +- .../{FileTask.class.php => FileTask.php} | 4 +- ...kFactory.class.php => FileTaskFactory.php} | 7 +- src/dba/models/{Hash.class.php => Hash.php} | 4 +- .../{HashBinary.class.php => HashBinary.php} | 4 +- ...actory.class.php => HashBinaryFactory.php} | 7 +- ...{HashFactory.class.php => HashFactory.php} | 7 +- .../{HashType.class.php => HashType.php} | 4 +- ...eFactory.class.php => HashTypeFactory.php} | 7 +- .../{Hashlist.class.php => Hashlist.php} | 4 +- ...tFactory.class.php => HashlistFactory.php} | 7 +- ...ashlist.class.php => HashlistHashlist.php} | 4 +- ....class.php => HashlistHashlistFactory.php} | 7 +- ...{HealthCheck.class.php => HealthCheck.php} | 4 +- ...ckAgent.class.php => HealthCheckAgent.php} | 4 +- ....class.php => HealthCheckAgentFactory.php} | 7 +- ...ctory.class.php => HealthCheckFactory.php} | 7 +- .../{LogEntry.class.php => LogEntry.php} | 4 +- ...yFactory.class.php => LogEntryFactory.php} | 7 +- ...ting.class.php => NotificationSetting.php} | 4 +- ...ass.php => NotificationSettingFactory.php} | 7 +- ...reprocessor.class.php => Preprocessor.php} | 4 +- ...tory.class.php => PreprocessorFactory.php} | 7 +- .../models/{Pretask.class.php => Pretask.php} | 4 +- ...skFactory.class.php => PretaskFactory.php} | 7 +- .../{RegVoucher.class.php => RegVoucher.php} | 4 +- ...actory.class.php => RegVoucherFactory.php} | 7 +- .../{RightGroup.class.php => RightGroup.php} | 4 +- ...actory.class.php => RightGroupFactory.php} | 7 +- .../models/{Session.class.php => Session.php} | 4 +- ...onFactory.class.php => SessionFactory.php} | 7 +- src/dba/models/{Speed.class.php => Speed.php} | 4 +- ...peedFactory.class.php => SpeedFactory.php} | 7 +- ...{StoredValue.class.php => StoredValue.php} | 4 +- ...ctory.class.php => StoredValueFactory.php} | 7 +- .../{Supertask.class.php => Supertask.php} | 4 +- ...Factory.class.php => SupertaskFactory.php} | 7 +- ...Pretask.class.php => SupertaskPretask.php} | 4 +- ....class.php => SupertaskPretaskFactory.php} | 7 +- src/dba/models/{Task.class.php => Task.php} | 4 +- ...ugOutput.class.php => TaskDebugOutput.php} | 4 +- ...y.class.php => TaskDebugOutputFactory.php} | 7 +- ...{TaskFactory.class.php => TaskFactory.php} | 7 +- ...{TaskWrapper.class.php => TaskWrapper.php} | 4 +- ...ctory.class.php => TaskWrapperFactory.php} | 7 +- src/dba/models/{User.class.php => User.php} | 6 +- ...{UserFactory.class.php => UserFactory.php} | 7 +- src/dba/models/{Zap.class.php => Zap.php} | 4 +- .../{ZapFactory.class.php => ZapFactory.php} | 7 +- src/dba/models/generator.php | 35 +- src/files.php | 24 +- src/forgot.php | 8 + src/getFile.php | 17 +- src/getFound.php | 20 +- src/getHashlist.php | 25 +- src/groups.php | 28 +- src/hashes.php | 43 +- src/hashlists.php | 39 +- src/hashtypes.php | 11 +- src/health.php | 24 +- src/help.php | 5 + src/inc/{CSRF.class.php => CSRF.php} | 6 + src/inc/{Dataset.class.php => DataSet.php} | 2 + .../{Encryption.class.php => Encryption.php} | 5 + ...{HTException.class.php => HTException.php} | 4 + .../{HTMessages.class.php => HTMessages.php} | 5 + src/inc/{Lang.class.php => Lang.php} | 2 + src/inc/{Login.class.php => Login.php} | 19 +- src/inc/{Menu.class.php => Menu.php} | 1 + src/inc/{SConfig.class.php => SConfig.php} | 4 +- ...rtupConfig.class.php => StartupConfig.php} | 4 +- src/inc/{UI.class.php => UI.php} | 4 + src/inc/{Util.class.php => Util.php} | 119 +- src/inc/agent/PActions.php | 25 + src/inc/agent/PQuery.php | 17 + src/inc/agent/PQueryCheckClientVersion.php | 15 + src/inc/agent/PQueryClientError.php | 16 + src/inc/agent/PQueryDeRegister.php | 12 + src/inc/agent/PQueryDownloadBinary.php | 16 + src/inc/agent/PQueryGetChunk.php | 14 + src/inc/agent/PQueryGetFile.php | 15 + src/inc/agent/PQueryGetFileStatus.php | 12 + src/inc/agent/PQueryGetFound.php | 14 + src/inc/agent/PQueryGetHashlist.php | 14 + src/inc/agent/PQueryGetHealthCheck.php | 12 + src/inc/agent/PQueryGetTask.php | 12 + src/inc/agent/PQueryLogin.php | 14 + src/inc/agent/PQueryRegister.php | 16 + src/inc/agent/PQuerySendBenchmark.php | 16 + src/inc/agent/PQuerySendHealthCheck.php | 19 + src/inc/agent/PQuerySendKeyspace.php | 15 + src/inc/agent/PQuerySendProgress.php | 25 + src/inc/agent/PQueryUpdateInformation.php | 16 + src/inc/agent/PResponse.php | 8 + src/inc/agent/PResponseBinaryDownload.php | 12 + src/inc/agent/PResponseClientUpdate.php | 8 + src/inc/agent/PResponseDeRegister.php | 7 + src/inc/agent/PResponseError.php | 7 + src/inc/agent/PResponseErrorMessage.php | 7 + src/inc/agent/PResponseGetChunk.php | 10 + src/inc/agent/PResponseGetFile.php | 10 + src/inc/agent/PResponseGetFileStatus.php | 7 + src/inc/agent/PResponseGetFound.php | 7 + src/inc/agent/PResponseGetHashlist.php | 7 + src/inc/agent/PResponseGetHealthCheck.php | 11 + src/inc/agent/PResponseGetTask.php | 28 + src/inc/agent/PResponseLogin.php | 9 + src/inc/agent/PResponseRegister.php | 7 + src/inc/agent/PResponseSendBenchmark.php | 7 + src/inc/agent/PResponseSendHealthCheck.php | 7 + src/inc/agent/PResponseSendKeyspace.php | 7 + src/inc/agent/PResponseSendProgress.php | 10 + src/inc/agent/PValues.php | 10 + src/inc/agent/PValuesBenchmarkType.php | 8 + src/inc/agent/PValuesChunkType.php | 12 + src/inc/agent/PValuesDownloadBinaryType.php | 11 + src/inc/agent/PValuesDownloadVersion.php | 8 + src/inc/agent/PValuesTask.php | 7 + src/inc/agent/PValuesUpdateVersion.php | 8 + .../api/{APIBasic.class.php => APIBasic.php} | 14 +- ...on.class.php => APICheckClientVersion.php} | 17 +- ...ientError.class.php => APIClientError.php} | 24 +- ...Agent.class.php => APIDeRegisterAgent.php} | 11 + ...Binary.class.php => APIDownloadBinary.php} | 13 +- ...{APIGetChunk.class.php => APIGetChunk.php} | 40 +- .../{APIGetFile.class.php => APIGetFile.php} | 17 +- ...eStatus.class.php => APIGetFileStatus.php} | 7 +- ...{APIGetFound.class.php => APIGetFound.php} | 14 +- ...tHashlist.class.php => APIGetHashlist.php} | 14 +- ...hCheck.class.php => APIGetHealthCheck.php} | 12 +- .../{APIGetTask.class.php => APIGetTask.php} | 26 +- .../api/{APILogin.class.php => APILogin.php} | 15 +- ...erAgent.class.php => APIRegisterAgent.php} | 29 +- ...nchmark.class.php => APISendBenchmark.php} | 26 +- ...Check.class.php => APISendHealthCheck.php} | 16 +- ...Keyspace.class.php => APISendKeyspace.php} | 19 +- ...Progress.class.php => APISendProgress.php} | 64 +- ...ection.class.php => APITestConnection.php} | 6 + ...ass.php => APIUpdateClientInformation.php} | 13 +- .../apiv2/auth/HashtopolisAuthenticator.php | 38 + src/inc/apiv2/auth/JWTBeforeHandler.php | 16 + src/inc/apiv2/auth/token.routes.php | 8 +- ...tBaseAPI.class.php => AbstractBaseAPI.php} | 235 ++-- ...perAPI.class.php => AbstractHelperAPI.php} | 26 +- ...odelAPI.class.php => AbstractModelAPI.php} | 289 +++-- src/inc/apiv2/common/ClassMapper.php | 16 + src/inc/apiv2/common/ErrorHandler.class.php | 47 - src/inc/apiv2/common/OpenAPISchemaUtils.php | 344 ++++++ src/inc/apiv2/common/openAPISchema.routes.php | 379 +----- src/inc/apiv2/error/ErrorHandler.php | 21 + src/inc/apiv2/error/HttpConflict.php | 10 + src/inc/apiv2/error/HttpError.php | 10 + src/inc/apiv2/error/HttpForbidden.php | 10 + src/inc/apiv2/error/InternalError.php | 10 + src/inc/apiv2/error/ResourceNotFoundError.php | 11 + ...unk.routes.php => AbortChunkHelperAPI.php} | 13 +- ...nt.routes.php => AssignAgentHelperAPI.php} | 15 +- ....php => BulkSupertaskBuilderHelperAPI.php} | 13 +- ...tes.php => ChangeOwnPasswordHelperAPI.php} | 10 +- ...s.php => CreateSuperHashlistHelperAPI.php} | 23 +- ...outes.php => CreateSupertaskHelperAPI.php} | 26 +- ...er.routes.php => CurrentUserHelperAPI.php} | 26 +- ...s.php => ExportCrackedHashesHelperAPI.php} | 15 +- ...utes.php => ExportLeftHashesHelperAPI.php} | 15 +- ...routes.php => ExportWordlistHelperAPI.php} | 15 +- ...outes.php => GetAccessGroupsHelperAPI.php} | 15 +- ...routes.php => GetAgentBinaryHelperAPI.php} | 16 +- ...k.routes.php => GetCracksOfTaskHelper.php} | 57 +- ...etFile.routes.php => GetFileHelperAPI.php} | 16 +- ....php => GetTaskProgressImageHelperAPI.php} | 46 +- ...tes.php => GetUserPermissionHelperAPI.php} | 17 +- ...s.php => ImportCrackedHashesHelperAPI.php} | 13 +- ...ile.routes.php => ImportFileHelperAPI.php} | 111 +- ....php => MaskSupertaskBuilderHelperAPI.php} | 13 +- ...Task.routes.php => PurgeTaskHelperAPI.php} | 15 +- ...tes.php => RebuildChunkCacheHelperAPI.php} | 14 +- ...utes.php => RecountFileLinesHelperAPI.php} | 15 +- ...tes.php => RescanGlobalFilesHelperAPI.php} | 15 +- ...unk.routes.php => ResetChunkHelperAPI.php} | 11 +- ...tes.php => ResetUserPasswordHelperAPI.php} | 12 +- ...s.routes.php => SearchHashesHelperAPI.php} | 32 +- ...outes.php => SetUserPasswordHelperAPI.php} | 11 +- ....routes.php => TaskExtraDetailsHelper.php} | 40 +- ....routes.php => UnassignAgentHelperAPI.php} | 15 +- ...ssgroups.routes.php => AccessGroupAPI.php} | 18 +- .../model/{agents.routes.php => AgentAPI.php} | 51 +- ...ents.routes.php => AgentAssignmentAPI.php} | 36 +- ...binaries.routes.php => AgentBinaryAPI.php} | 15 +- ...enterrors.routes.php => AgentErrorAPI.php} | 34 +- ...agentstats.routes.php => AgentStatAPI.php} | 28 +- .../model/{chunks.routes.php => ChunkAPI.php} | 41 +- .../{configs.routes.php => ConfigAPI.php} | 20 +- ...ctions.routes.php => ConfigSectionAPI.php} | 19 +- ...ackers.routes.php => CrackerBinaryAPI.php} | 19 +- ...es.routes.php => CrackerBinaryTypeAPI.php} | 20 +- .../model/{files.routes.php => FileAPI.php} | 30 +- ...outes.php => GlobalPermissionGroupAPI.php} | 19 +- .../model/{hashes.routes.php => HashAPI.php} | 33 +- .../{hashtypes.routes.php => HashTypeAPI.php} | 12 +- .../{hashlists.routes.php => HashlistAPI.php} | 34 +- ...thchecks.routes.php => HealthCheckAPI.php} | 18 +- ...nts.routes.php => HealthCheckAgentAPI.php} | 36 +- ...{logentries.routes.php => LogEntryAPI.php} | 18 +- ....routes.php => NotificationSettingAPI.php} | 19 +- .../{pretasks.routes.php => PreTaskAPI.php} | 29 +- ...cessors.routes.php => PreprocessorAPI.php} | 16 +- .../model/{speeds.routes.php => SpeedAPI.php} | 40 +- ...supertasks.routes.php => SupertaskAPI.php} | 26 +- .../model/{tasks.routes.php => TaskAPI.php} | 63 +- ...wrappers.routes.php => TaskWrapperAPI.php} | 49 +- .../model/{users.routes.php => UserAPI.php} | 24 +- .../{vouchers.routes.php => VoucherAPI.php} | 15 +- src/inc/apiv2/util/CorsHackMiddleware.php | 47 + .../apiv2/util/JsonBodyParserMiddleware.php | 31 + .../apiv2/util/TokenAsParameterMiddleware.php | 21 + src/inc/defines/DAccessControl.php | 87 ++ src/inc/defines/DAccessControlAction.php | 14 + ...ccessGroups.php => DAccessGroupAction.php} | 10 +- src/inc/defines/DAccessLevel.php | 13 + .../defines/{users.php => DAccountAction.php} | 27 +- .../defines/{agents.php => DAgentAction.php} | 31 +- src/inc/defines/DAgentBinaryAction.php | 23 + src/inc/defines/DAgentIgnoreErrors.php | 9 + src/inc/defines/DAgentStatsType.php | 9 + src/inc/defines/{api.php => DApiAction.php} | 2 + src/inc/defines/DCleaning.php | 7 + src/inc/defines/DConfig.php | 270 +++++ src/inc/defines/DConfigAction.php | 17 + src/inc/defines/DConfigType.php | 11 + ...rBinaries.php => DCrackerBinaryAction.php} | 21 +- ...deviceCompress.php => DDeviceCompress.php} | 2 + src/inc/defines/DDirectories.php | 11 + .../defines/{files.php => DFileAction.php} | 9 +- ...leDownload.php => DFileDownloadStatus.php} | 2 + src/inc/defines/DFileType.php | 10 + src/inc/defines/DForgotAction.php | 8 + .../{hashcat.php => DHashcatStatus.php} | 2 + .../{hashlists.php => DHashlistAction.php} | 18 +- src/inc/defines/DHashlistFormat.php | 10 + src/inc/defines/DHashtypeAction.php | 11 + src/inc/defines/DHealthCheck.php | 7 + src/inc/defines/DHealthCheckAction.php | 14 + src/inc/defines/DHealthCheckAgentStatus.php | 9 + src/inc/defines/DHealthCheckMode.php | 8 + src/inc/defines/DHealthCheckStatus.php | 9 + src/inc/defines/DHealthCheckType.php | 7 + src/inc/defines/DLimits.php | 7 + src/inc/defines/DLogEntry.php | 10 + src/inc/defines/DLogEntryIssuer.php | 8 + src/inc/defines/DNotificationAction.php | 14 + src/inc/defines/DNotificationObjectType.php | 12 + src/inc/defines/DNotificationType.php | 70 ++ src/inc/defines/DOperatingSystem.php | 9 + src/inc/defines/DPayloadKeys.php | 13 + src/inc/defines/DPlatforms.php | 18 + ...processors.php => DPreprocessorAction.php} | 2 + src/inc/defines/DPretaskAction.php | 35 + src/inc/defines/DPrince.php | 7 + src/inc/defines/DProxyTypes.php | 10 + src/inc/defines/DSearchAction.php | 8 + src/inc/defines/{log.php => DServerLog.php} | 31 +- src/inc/defines/DStats.php | 13 + src/inc/defines/DSupertaskAction.php | 26 + .../defines/{tasks.php => DTaskAction.php} | 74 +- src/inc/defines/DTaskStaticChunking.php | 9 + src/inc/defines/DTaskTypes.php | 8 + src/inc/defines/DUserAction.php | 23 + src/inc/defines/DViewControl.php | 38 + src/inc/defines/UApi.php | 48 + src/inc/defines/UQuery.php | 9 + src/inc/defines/UQueryAccess.php | 9 + src/inc/defines/UQueryAccount.php | 11 + src/inc/defines/UQueryAgent.php | 15 + src/inc/defines/UQueryConfig.php | 9 + src/inc/defines/UQueryCracker.php | 13 + src/inc/defines/UQueryFile.php | 15 + src/inc/defines/UQueryGroup.php | 11 + src/inc/defines/UQueryHashlist.php | 22 + src/inc/defines/UQuerySuperhashlist.php | 9 + src/inc/defines/UQueryTask.php | 47 + src/inc/defines/UQueryUser.php | 14 + src/inc/defines/UResponse.php | 9 + src/inc/defines/UResponseAccess.php | 15 + src/inc/defines/UResponseAccount.php | 10 + src/inc/defines/UResponseAgent.php | 37 + src/inc/defines/UResponseConfig.php | 16 + src/inc/defines/UResponseCracker.php | 18 + src/inc/defines/UResponseErrorMessage.php | 7 + src/inc/defines/UResponseFile.php | 17 + src/inc/defines/UResponseGroup.php | 14 + src/inc/defines/UResponseHashlist.php | 43 + src/inc/defines/UResponseSuperhashlist.php | 20 + src/inc/defines/UResponseTask.php | 96 ++ src/inc/defines/UResponseUser.php | 18 + src/inc/defines/USection.php | 25 + src/inc/defines/USectionAccess.php | 22 + src/inc/defines/USectionAccount.php | 20 + src/inc/defines/USectionAgent.php | 41 + src/inc/defines/USectionConfig.php | 20 + src/inc/defines/USectionCracker.php | 27 + src/inc/defines/USectionFile.php | 27 + src/inc/defines/USectionGroup.php | 31 + src/inc/defines/USectionHashlist.php | 40 + src/inc/defines/USectionPretask.php | 35 + src/inc/defines/USectionSuperhashlist.php | 20 + src/inc/defines/USectionSupertask.php | 26 + src/inc/defines/USectionTask.php | 67 ++ src/inc/defines/USectionTest.php | 16 + src/inc/defines/USectionUser.php | 26 + src/inc/defines/UValues.php | 10 + src/inc/defines/accessControl.php | 157 --- src/inc/defines/config.php | 421 ------- src/inc/defines/global.php | 56 - src/inc/defines/health.php | 38 - src/inc/defines/notifications.php | 157 --- src/inc/defines/userApi.php | 1042 ----------------- ...ler.class.php => AccessControlHandler.php} | 8 + ...ndler.class.php => AccessGroupHandler.php} | 8 + ...ntHandler.class.php => AccountHandler.php} | 10 +- ...ndler.class.php => AgentBinaryHandler.php} | 9 + ...gentHandler.class.php => AgentHandler.php} | 11 +- .../{ApiHandler.class.php => ApiHandler.php} | 7 + ...figHandler.class.php => ConfigHandler.php} | 12 +- ...erHandler.class.php => CrackerHandler.php} | 8 + ...{FileHandler.class.php => FileHandler.php} | 8 + ...gotHandler.class.php => ForgotHandler.php} | 7 + .../{Handler.class.php => Handler.php} | 2 + ...tHandler.class.php => HashlistHandler.php} | 16 +- ...eHandler.class.php => HashtypeHandler.php} | 8 + ...lthHandler.class.php => HealthHandler.php} | 9 + ...dler.class.php => NotificationHandler.php} | 51 +- ...dler.class.php => PreprocessorHandler.php} | 8 + ...skHandler.class.php => PretaskHandler.php} | 8 + ...rchHandler.class.php => SearchHandler.php} | 25 +- ...Handler.class.php => SupertaskHandler.php} | 9 + ...{TaskHandler.class.php => TaskHandler.php} | 32 +- ...sersHandler.class.php => UsersHandler.php} | 9 + src/inc/mask.php | 7 - ....class.php => HashtopolisNotification.php} | 12 +- ...php => HashtopolisNotificationChatBot.php} | 6 + ...HashtopolisNotificationDiscordWebhook.php} | 6 + ...s.php => HashtopolisNotificationEmail.php} | 4 + ...php => HashtopolisNotificationExample.php} | 2 + ...s.php => HashtopolisNotificationSlack.php} | 6 + ...hp => HashtopolisNotificationTelegram.php} | 6 + src/inc/protocol.php | 436 ------- src/inc/startup/include.php | 20 +- src/inc/startup/load.php | 17 +- src/inc/startup/setup.php | 16 +- .../{Statement.class.php => Statement.php} | 3 + .../{Template.class.php => Template.php} | 3 + .../UserAPIAccess.php} | 18 + .../UserAPIAccount.php} | 13 + .../UserAPIAgent.php} | 26 +- .../UserAPIBasic.php} | 37 +- .../UserAPIConfig.php} | 18 +- .../UserAPICracker.php} | 12 + .../UserAPIFile.php} | 13 + .../UserAPIGroup.php} | 12 + .../UserAPIHashlist.php} | 14 +- .../UserAPIPretask.php} | 14 +- .../UserAPISuperhashlist.php} | 16 + .../UserAPISupertask.php} | 11 + .../UserAPITask.php} | 27 +- .../UserAPITest.php} | 14 +- .../UserAPIUser.php} | 12 + ...essControl.class.php => AccessControl.php} | 11 +- ...Utils.class.php => AccessControlUtils.php} | 23 +- ...upUtils.class.php => AccessGroupUtils.php} | 42 +- ...{AccessUtils.class.php => AccessUtils.php} | 39 +- src/inc/utils/AccountUtils.php | 14 +- ...ryUtils.class.php => AgentBinaryUtils.php} | 34 +- .../{AgentUtils.class.php => AgentUtils.php} | 134 ++- .../{ApiUtils.class.php => ApiUtils.php} | 13 +- ...entUtils.class.php => AssignmentUtils.php} | 11 +- .../{ChunkUtils.class.php => ChunkUtils.php} | 23 +- ...{ConfigUtils.class.php => ConfigUtils.php} | 48 +- ...Utils.class.php => CrackerBinaryUtils.php} | 12 +- ...rackerUtils.class.php => CrackerUtils.php} | 20 +- ...dUtils.class.php => FileDownloadUtils.php} | 11 +- .../{FileUtils.class.php => FileUtils.php} | 36 +- ...hlistUtils.class.php => HashlistUtils.php} | 69 +- ...htypeUtils.class.php => HashtypeUtils.php} | 16 +- ...{HealthUtils.class.php => HealthUtils.php} | 22 +- src/inc/utils/{Lock.class.php => Lock.php} | 4 + .../{LockUtils.class.php => LockUtils.php} | 12 +- ...nUtils.class.php => NotificationUtils.php} | 25 +- ...rUtils.class.php => PreprocessorUtils.php} | 44 +- ...retaskUtils.class.php => PretaskUtils.php} | 33 +- ...{RunnerUtils.class.php => RunnerUtils.php} | 6 + ...taskUtils.class.php => SupertaskUtils.php} | 39 +- .../{TaskUtils.class.php => TaskUtils.php} | 106 +- ...erUtils.class.php => TaskWrapperUtils.php} | 26 +- .../{UserUtils.class.php => UserUtils.php} | 44 +- src/index.php | 5 + src/install/index.php | 27 +- src/install/updates/reset.php | 5 +- src/install/updates/update.php | 18 +- .../updates/update_v0.10.x_v0.11.0.php | 16 +- .../updates/update_v0.11.x_v0.12.0.php | 18 +- .../updates/update_v0.12.x_v0.13.0.php | 13 +- .../updates/update_v0.13.x_v0.13.1.php | 14 +- .../updates/update_v0.14.2_v0.14.3.php | 2 +- .../updates/update_v0.14.3_v0.14.4.php | 4 +- .../updates/update_v0.14.3_v0.14.x.php | 9 +- .../updates/update_v0.14.4_v0.14.5.php | 7 +- .../updates/update_v0.14.x_v0.14.2.php | 3 +- .../updates/update_v0.2.0-beta_v0.2.0.php | 33 - src/install/updates/update_v0.2.x_v0.3.0.php | 68 -- src/install/updates/update_v0.3.0_v0.3.1.php | 13 - src/install/updates/update_v0.3.1_v0.3.2.php | 29 - src/install/updates/update_v0.3.2_v0.4.0.php | 102 -- src/install/updates/update_v0.4.0_v0.5.0.php | 301 ----- src/install/updates/update_v0.5.x_v0.6.0.php | 14 +- src/install/updates/update_v0.6.0_v0.7.0.php | 11 +- src/install/updates/update_v0.7.x_v0.8.0.php | 19 +- src/install/updates/update_v0.8.0_v0.9.0.php | 22 +- src/install/updates/update_v0.9.0_v0.10.0.php | 17 +- .../updates/update_v1.0.0-rainbow4_vx.x.x.php | 7 +- src/log.php | 14 +- src/login.php | 5 + src/logout.php | 4 + src/notifications.php | 33 +- src/preprocessors.php | 16 +- src/pretasks.php | 33 +- src/report.php | 22 +- src/search.php | 10 + src/superhashlists.php | 20 +- src/supertasks.php | 33 +- src/tasks.php | 47 +- src/users.php | 20 +- 538 files changed, 7493 insertions(+), 6086 deletions(-) rename src/dba/{AbstractModel.class.php => AbstractModel.php} (96%) rename src/dba/{AbstractModelFactory.class.php => AbstractModelFactory.php} (99%) rename src/dba/{Aggregation.class.php => Aggregation.php} (71%) rename src/dba/{CoalesceOrderFilter.class.php => CoalesceOrderFilter.php} (52%) rename src/dba/{ComparisonFilter.class.php => ComparisonFilter.php} (90%) rename src/dba/{ContainFilter.class.php => ContainFilter.php} (73%) rename src/dba/{Factory.class.php => Factory.php} (53%) rename src/dba/{Filter.class.php => Filter.php} (92%) rename src/dba/{Group.class.php => Group.php} (82%) rename src/dba/{GroupFilter.class.php => GroupFilter.php} (74%) delete mode 100644 src/dba/Join.class.php create mode 100644 src/dba/Join.php delete mode 100755 src/dba/JoinFilter.class.php create mode 100755 src/dba/JoinFilter.php rename src/dba/{LikeFilter.class.php => LikeFilter.php} (76%) rename src/dba/{LikeFilterInsensitive.class.php => LikeFilterInsensitive.php} (72%) delete mode 100644 src/dba/Limit.class.php create mode 100644 src/dba/Limit.php delete mode 100644 src/dba/LimitFilter.class.php create mode 100644 src/dba/LimitFilter.php delete mode 100644 src/dba/MassUpdateSet.class.php create mode 100644 src/dba/MassUpdateSet.php rename src/dba/{Order.class.php => Order.php} (83%) rename src/dba/{OrderFilter.class.php => OrderFilter.php} (74%) rename src/dba/{PaginationFilter.class.php => PaginationFilter.php} (96%) rename src/dba/{QueryFilter.class.php => QueryFilter.php} (78%) rename src/dba/{QueryFilterNoCase.class.php => QueryFilterNoCase.php} (79%) rename src/dba/{QueryFilterWithNull.class.php => QueryFilterWithNull.php} (82%) rename src/dba/{UpdateSet.class.php => UpdateSet.php} (73%) rename src/dba/{Util.class.php => Util.php} (71%) rename src/dba/models/{AccessGroup.class.php => AccessGroup.php} (96%) rename src/dba/models/{AccessGroupAgent.class.php => AccessGroupAgent.php} (97%) rename src/dba/models/{AccessGroupAgentFactory.class.php => AccessGroupAgentFactory.php} (91%) rename src/dba/models/{AccessGroupFactory.class.php => AccessGroupFactory.php} (90%) rename src/dba/models/{AccessGroupUser.class.php => AccessGroupUser.php} (97%) rename src/dba/models/{AccessGroupUserFactory.class.php => AccessGroupUserFactory.php} (91%) rename src/dba/models/{Agent.class.php => Agent.php} (99%) rename src/dba/models/{AgentBinary.class.php => AgentBinary.php} (98%) rename src/dba/models/{AgentBinaryFactory.class.php => AgentBinaryFactory.php} (91%) rename src/dba/models/{AgentError.class.php => AgentError.php} (98%) rename src/dba/models/{AgentErrorFactory.class.php => AgentErrorFactory.php} (91%) rename src/dba/models/{AgentFactory.class.php => AgentFactory.php} (92%) rename src/dba/models/{AgentStat.class.php => AgentStat.php} (97%) rename src/dba/models/{AgentStatFactory.class.php => AgentStatFactory.php} (91%) rename src/dba/models/{AgentZap.class.php => AgentZap.php} (97%) rename src/dba/models/{AgentZapFactory.class.php => AgentZapFactory.php} (90%) rename src/dba/models/{ApiGroup.class.php => ApiGroup.php} (97%) rename src/dba/models/{ApiGroupFactory.class.php => ApiGroupFactory.php} (90%) rename src/dba/models/{ApiKey.class.php => ApiKey.php} (98%) rename src/dba/models/{ApiKeyFactory.class.php => ApiKeyFactory.php} (91%) rename src/dba/models/{Assignment.class.php => Assignment.php} (97%) rename src/dba/models/{AssignmentFactory.class.php => AssignmentFactory.php} (91%) rename src/dba/models/{Chunk.class.php => Chunk.php} (99%) rename src/dba/models/{ChunkFactory.class.php => ChunkFactory.php} (91%) rename src/dba/models/{Config.class.php => Config.php} (97%) rename src/dba/models/{ConfigFactory.class.php => ConfigFactory.php} (90%) rename src/dba/models/{ConfigSection.class.php => ConfigSection.php} (96%) rename src/dba/models/{ConfigSectionFactory.class.php => ConfigSectionFactory.php} (91%) rename src/dba/models/{CrackerBinary.class.php => CrackerBinary.php} (98%) rename src/dba/models/{CrackerBinaryFactory.class.php => CrackerBinaryFactory.php} (91%) rename src/dba/models/{CrackerBinaryType.class.php => CrackerBinaryType.php} (97%) rename src/dba/models/{CrackerBinaryTypeFactory.class.php => CrackerBinaryTypeFactory.php} (91%) rename src/dba/models/{File.class.php => File.php} (98%) rename src/dba/models/{FileDelete.class.php => FileDelete.php} (97%) rename src/dba/models/{FileDeleteFactory.class.php => FileDeleteFactory.php} (90%) rename src/dba/models/{FileDownload.class.php => FileDownload.php} (97%) rename src/dba/models/{FileDownloadFactory.class.php => FileDownloadFactory.php} (91%) rename src/dba/models/{FileFactory.class.php => FileFactory.php} (91%) rename src/dba/models/{FilePretask.class.php => FilePretask.php} (97%) rename src/dba/models/{FilePretaskFactory.class.php => FilePretaskFactory.php} (91%) rename src/dba/models/{FileTask.class.php => FileTask.php} (97%) rename src/dba/models/{FileTaskFactory.class.php => FileTaskFactory.php} (90%) rename src/dba/models/{Hash.class.php => Hash.php} (98%) rename src/dba/models/{HashBinary.class.php => HashBinary.php} (98%) rename src/dba/models/{HashBinaryFactory.class.php => HashBinaryFactory.php} (91%) rename src/dba/models/{HashFactory.class.php => HashFactory.php} (91%) rename src/dba/models/{HashType.class.php => HashType.php} (97%) rename src/dba/models/{HashTypeFactory.class.php => HashTypeFactory.php} (91%) rename src/dba/models/{Hashlist.class.php => Hashlist.php} (99%) rename src/dba/models/{HashlistFactory.class.php => HashlistFactory.php} (92%) rename src/dba/models/{HashlistHashlist.class.php => HashlistHashlist.php} (97%) rename src/dba/models/{HashlistHashlistFactory.class.php => HashlistHashlistFactory.php} (91%) rename src/dba/models/{HealthCheck.class.php => HealthCheck.php} (98%) rename src/dba/models/{HealthCheckAgent.class.php => HealthCheckAgent.php} (98%) rename src/dba/models/{HealthCheckAgentFactory.class.php => HealthCheckAgentFactory.php} (91%) rename src/dba/models/{HealthCheckFactory.class.php => HealthCheckFactory.php} (91%) rename src/dba/models/{LogEntry.class.php => LogEntry.php} (98%) rename src/dba/models/{LogEntryFactory.class.php => LogEntryFactory.php} (91%) rename src/dba/models/{NotificationSetting.class.php => NotificationSetting.php} (98%) rename src/dba/models/{NotificationSettingFactory.class.php => NotificationSettingFactory.php} (91%) rename src/dba/models/{Preprocessor.class.php => Preprocessor.php} (98%) rename src/dba/models/{PreprocessorFactory.class.php => PreprocessorFactory.php} (91%) rename src/dba/models/{Pretask.class.php => Pretask.php} (99%) rename src/dba/models/{PretaskFactory.class.php => PretaskFactory.php} (91%) rename src/dba/models/{RegVoucher.class.php => RegVoucher.php} (97%) rename src/dba/models/{RegVoucherFactory.class.php => RegVoucherFactory.php} (90%) rename src/dba/models/{RightGroup.class.php => RightGroup.php} (97%) rename src/dba/models/{RightGroupFactory.class.php => RightGroupFactory.php} (91%) rename src/dba/models/{Session.class.php => Session.php} (98%) rename src/dba/models/{SessionFactory.class.php => SessionFactory.php} (91%) rename src/dba/models/{Speed.class.php => Speed.php} (97%) rename src/dba/models/{SpeedFactory.class.php => SpeedFactory.php} (90%) rename src/dba/models/{StoredValue.class.php => StoredValue.php} (96%) rename src/dba/models/{StoredValueFactory.class.php => StoredValueFactory.php} (90%) rename src/dba/models/{Supertask.class.php => Supertask.php} (96%) rename src/dba/models/{SupertaskFactory.class.php => SupertaskFactory.php} (90%) rename src/dba/models/{SupertaskPretask.class.php => SupertaskPretask.php} (97%) rename src/dba/models/{SupertaskPretaskFactory.class.php => SupertaskPretaskFactory.php} (91%) rename src/dba/models/{Task.class.php => Task.php} (99%) rename src/dba/models/{TaskDebugOutput.class.php => TaskDebugOutput.php} (97%) rename src/dba/models/{TaskDebugOutputFactory.class.php => TaskDebugOutputFactory.php} (91%) rename src/dba/models/{TaskFactory.class.php => TaskFactory.php} (92%) rename src/dba/models/{TaskWrapper.class.php => TaskWrapper.php} (98%) rename src/dba/models/{TaskWrapperFactory.class.php => TaskWrapperFactory.php} (91%) rename src/dba/models/{User.class.php => User.php} (97%) rename src/dba/models/{UserFactory.class.php => UserFactory.php} (92%) rename src/dba/models/{Zap.class.php => Zap.php} (97%) rename src/dba/models/{ZapFactory.class.php => ZapFactory.php} (90%) rename src/inc/{CSRF.class.php => CSRF.php} (90%) rename src/inc/{Dataset.class.php => DataSet.php} (95%) rename src/inc/{Encryption.class.php => Encryption.php} (97%) rename src/inc/{HTException.class.php => HTException.php} (57%) rename src/inc/{HTMessages.class.php => HTMessages.php} (84%) rename src/inc/{Lang.class.php => Lang.php} (99%) rename src/inc/{Login.class.php => Login.php} (93%) rename src/inc/{Menu.class.php => Menu.php} (98%) rename src/inc/{SConfig.class.php => SConfig.php} (91%) rename src/inc/{StartupConfig.class.php => StartupConfig.php} (99%) rename src/inc/{UI.class.php => UI.php} (95%) rename src/inc/{Util.class.php => Util.php} (95%) create mode 100644 src/inc/agent/PActions.php create mode 100644 src/inc/agent/PQuery.php create mode 100644 src/inc/agent/PQueryCheckClientVersion.php create mode 100644 src/inc/agent/PQueryClientError.php create mode 100644 src/inc/agent/PQueryDeRegister.php create mode 100644 src/inc/agent/PQueryDownloadBinary.php create mode 100644 src/inc/agent/PQueryGetChunk.php create mode 100644 src/inc/agent/PQueryGetFile.php create mode 100644 src/inc/agent/PQueryGetFileStatus.php create mode 100644 src/inc/agent/PQueryGetFound.php create mode 100644 src/inc/agent/PQueryGetHashlist.php create mode 100644 src/inc/agent/PQueryGetHealthCheck.php create mode 100644 src/inc/agent/PQueryGetTask.php create mode 100644 src/inc/agent/PQueryLogin.php create mode 100644 src/inc/agent/PQueryRegister.php create mode 100644 src/inc/agent/PQuerySendBenchmark.php create mode 100644 src/inc/agent/PQuerySendHealthCheck.php create mode 100644 src/inc/agent/PQuerySendKeyspace.php create mode 100644 src/inc/agent/PQuerySendProgress.php create mode 100644 src/inc/agent/PQueryUpdateInformation.php create mode 100644 src/inc/agent/PResponse.php create mode 100644 src/inc/agent/PResponseBinaryDownload.php create mode 100644 src/inc/agent/PResponseClientUpdate.php create mode 100644 src/inc/agent/PResponseDeRegister.php create mode 100644 src/inc/agent/PResponseError.php create mode 100644 src/inc/agent/PResponseErrorMessage.php create mode 100644 src/inc/agent/PResponseGetChunk.php create mode 100644 src/inc/agent/PResponseGetFile.php create mode 100644 src/inc/agent/PResponseGetFileStatus.php create mode 100644 src/inc/agent/PResponseGetFound.php create mode 100644 src/inc/agent/PResponseGetHashlist.php create mode 100644 src/inc/agent/PResponseGetHealthCheck.php create mode 100644 src/inc/agent/PResponseGetTask.php create mode 100644 src/inc/agent/PResponseLogin.php create mode 100644 src/inc/agent/PResponseRegister.php create mode 100644 src/inc/agent/PResponseSendBenchmark.php create mode 100644 src/inc/agent/PResponseSendHealthCheck.php create mode 100644 src/inc/agent/PResponseSendKeyspace.php create mode 100644 src/inc/agent/PResponseSendProgress.php create mode 100644 src/inc/agent/PValues.php create mode 100644 src/inc/agent/PValuesBenchmarkType.php create mode 100644 src/inc/agent/PValuesChunkType.php create mode 100644 src/inc/agent/PValuesDownloadBinaryType.php create mode 100644 src/inc/agent/PValuesDownloadVersion.php create mode 100644 src/inc/agent/PValuesTask.php create mode 100644 src/inc/agent/PValuesUpdateVersion.php rename src/inc/api/{APIBasic.class.php => APIBasic.php} (81%) rename src/inc/api/{APICheckClientVersion.class.php => APICheckClientVersion.php} (84%) rename src/inc/api/{APIClientError.class.php => APIClientError.php} (85%) rename src/inc/api/{APIDeRegisterAgent.class.php => APIDeRegisterAgent.php} (80%) rename src/inc/api/{APIDownloadBinary.class.php => APIDownloadBinary.php} (93%) rename src/inc/api/{APIGetChunk.class.php => APIGetChunk.php} (91%) rename src/inc/api/{APIGetFile.class.php => APIGetFile.php} (89%) rename src/inc/api/{APIGetFileStatus.class.php => APIGetFileStatus.php} (81%) rename src/inc/api/{APIGetFound.class.php => APIGetFound.php} (91%) rename src/inc/api/{APIGetHashlist.class.php => APIGetHashlist.php} (91%) rename src/inc/api/{APIGetHealthCheck.class.php => APIGetHealthCheck.php} (86%) rename src/inc/api/{APIGetTask.class.php => APIGetTask.php} (94%) rename src/inc/api/{APILogin.class.php => APILogin.php} (76%) rename src/inc/api/{APIRegisterAgent.class.php => APIRegisterAgent.php} (76%) rename src/inc/api/{APISendBenchmark.class.php => APISendBenchmark.php} (88%) rename src/inc/api/{APISendHealthCheck.class.php => APISendHealthCheck.php} (87%) rename src/inc/api/{APISendKeyspace.class.php => APISendKeyspace.php} (89%) rename src/inc/api/{APISendProgress.class.php => APISendProgress.php} (95%) rename src/inc/api/{APITestConnection.class.php => APITestConnection.php} (76%) rename src/inc/api/{APIUpdateClientInformation.class.php => APIUpdateClientInformation.php} (86%) create mode 100644 src/inc/apiv2/auth/HashtopolisAuthenticator.php create mode 100644 src/inc/apiv2/auth/JWTBeforeHandler.php rename src/inc/apiv2/common/{AbstractBaseAPI.class.php => AbstractBaseAPI.php} (93%) rename src/inc/apiv2/common/{AbstractHelperAPI.class.php => AbstractHelperAPI.php} (93%) rename src/inc/apiv2/common/{AbstractModelAPI.class.php => AbstractModelAPI.php} (94%) create mode 100644 src/inc/apiv2/common/ClassMapper.php delete mode 100644 src/inc/apiv2/common/ErrorHandler.class.php create mode 100644 src/inc/apiv2/common/OpenAPISchemaUtils.php create mode 100644 src/inc/apiv2/error/ErrorHandler.php create mode 100644 src/inc/apiv2/error/HttpConflict.php create mode 100644 src/inc/apiv2/error/HttpError.php create mode 100644 src/inc/apiv2/error/HttpForbidden.php create mode 100644 src/inc/apiv2/error/InternalError.php create mode 100644 src/inc/apiv2/error/ResourceNotFoundError.php rename src/inc/apiv2/helper/{abortChunk.routes.php => AbortChunkHelperAPI.php} (82%) rename src/inc/apiv2/helper/{assignAgent.routes.php => AssignAgentHelperAPI.php} (79%) rename src/inc/apiv2/helper/{bulkSupertaskBuilder.routes.php => BulkSupertaskBuilderHelperAPI.php} (84%) rename src/inc/apiv2/helper/{changeOwnPassword.routes.php => ChangeOwnPasswordHelperAPI.php} (88%) rename src/inc/apiv2/helper/{createSuperHashlist.routes.php => CreateSuperHashlistHelperAPI.php} (77%) rename src/inc/apiv2/helper/{createSupertask.routes.php => CreateSupertaskHelperAPI.php} (81%) rename src/inc/apiv2/helper/{currentUser.routes.php => CurrentUserHelperAPI.php} (85%) rename src/inc/apiv2/helper/{exportCrackedHashes.routes.php => ExportCrackedHashesHelperAPI.php} (78%) rename src/inc/apiv2/helper/{exportLeftHashes.routes.php => ExportLeftHashesHelperAPI.php} (78%) rename src/inc/apiv2/helper/{exportWordlist.routes.php => ExportWordlistHelperAPI.php} (79%) rename src/inc/apiv2/helper/{getAccessGroups.routes.php => GetAccessGroupsHelperAPI.php} (88%) rename src/inc/apiv2/helper/{getAgentBinary.routes.php => GetAgentBinaryHelperAPI.php} (93%) rename src/inc/apiv2/helper/{getCracksOfTask.routes.php => GetCracksOfTaskHelper.php} (74%) rename src/inc/apiv2/helper/{getFile.routes.php => GetFileHelperAPI.php} (93%) rename src/inc/apiv2/helper/{getTaskProgressImage.routes.php => GetTaskProgressImageHelperAPI.php} (93%) rename src/inc/apiv2/helper/{getUserPermission.routes.php => GetUserPermissionHelperAPI.php} (88%) rename src/inc/apiv2/helper/{importCrackedHashes.routes.php => ImportCrackedHashesHelperAPI.php} (88%) rename src/inc/apiv2/helper/{importFile.routes.php => ImportFileHelperAPI.php} (89%) rename src/inc/apiv2/helper/{maskSupertaskBuilder.routes.php => MaskSupertaskBuilderHelperAPI.php} (83%) rename src/inc/apiv2/helper/{purgeTask.routes.php => PurgeTaskHelperAPI.php} (81%) rename src/inc/apiv2/helper/{rebuildChunkCache.routes.php => RebuildChunkCacheHelperAPI.php} (71%) rename src/inc/apiv2/helper/{recountFileLines.routes.php => RecountFileLinesHelperAPI.php} (81%) rename src/inc/apiv2/helper/{rescanGlobalFiles.routes.php => RescanGlobalFilesHelperAPI.php} (68%) rename src/inc/apiv2/helper/{resetChunk.routes.php => ResetChunkHelperAPI.php} (82%) rename src/inc/apiv2/helper/{resetUserPassword.routes.php => ResetUserPasswordHelperAPI.php} (83%) rename src/inc/apiv2/helper/{searchHashes.routes.php => SearchHashesHelperAPI.php} (91%) rename src/inc/apiv2/helper/{setUserPassword.routes.php => SetUserPasswordHelperAPI.php} (85%) rename src/inc/apiv2/helper/{taskExtraDetails.routes.php => TaskExtraDetailsHelper.php} (84%) rename src/inc/apiv2/helper/{unassignAgent.routes.php => UnassignAgentHelperAPI.php} (74%) rename src/inc/apiv2/model/{accessgroups.routes.php => AccessGroupAPI.php} (81%) rename src/inc/apiv2/model/{agents.routes.php => AgentAPI.php} (82%) rename src/inc/apiv2/model/{agentassignments.routes.php => AgentAssignmentAPI.php} (79%) rename src/inc/apiv2/model/{agentbinaries.routes.php => AgentBinaryAPI.php} (82%) rename src/inc/apiv2/model/{agenterrors.routes.php => AgentErrorAPI.php} (79%) rename src/inc/apiv2/model/{agentstats.routes.php => AgentStatAPI.php} (76%) rename src/inc/apiv2/model/{chunks.routes.php => ChunkAPI.php} (80%) rename src/inc/apiv2/model/{configs.routes.php => ConfigAPI.php} (73%) rename src/inc/apiv2/model/{configsections.routes.php => ConfigSectionAPI.php} (71%) rename src/inc/apiv2/model/{crackers.routes.php => CrackerBinaryAPI.php} (79%) rename src/inc/apiv2/model/{crackertypes.routes.php => CrackerBinaryTypeAPI.php} (79%) rename src/inc/apiv2/model/{files.routes.php => FileAPI.php} (91%) rename src/inc/apiv2/model/{globalpermissiongroups.routes.php => GlobalPermissionGroupAPI.php} (84%) rename src/inc/apiv2/model/{hashes.routes.php => HashAPI.php} (77%) rename src/inc/apiv2/model/{hashtypes.routes.php => HashTypeAPI.php} (74%) rename src/inc/apiv2/model/{hashlists.routes.php => HashlistAPI.php} (89%) rename src/inc/apiv2/model/{healthchecks.routes.php => HealthCheckAPI.php} (79%) rename src/inc/apiv2/model/{healthcheckagents.routes.php => HealthCheckAgentAPI.php} (77%) rename src/inc/apiv2/model/{logentries.routes.php => LogEntryAPI.php} (66%) rename src/inc/apiv2/model/{notifications.routes.php => NotificationSettingAPI.php} (86%) rename src/inc/apiv2/model/{pretasks.routes.php => PreTaskAPI.php} (87%) rename src/inc/apiv2/model/{preprocessors.routes.php => PreprocessorAPI.php} (83%) rename src/inc/apiv2/model/{speeds.routes.php => SpeedAPI.php} (82%) rename src/inc/apiv2/model/{supertasks.routes.php => SupertaskAPI.php} (86%) rename src/inc/apiv2/model/{tasks.routes.php => TaskAPI.php} (88%) rename src/inc/apiv2/model/{taskwrappers.routes.php => TaskWrapperAPI.php} (87%) rename src/inc/apiv2/model/{users.routes.php => UserAPI.php} (86%) rename src/inc/apiv2/model/{vouchers.routes.php => VoucherAPI.php} (69%) create mode 100644 src/inc/apiv2/util/CorsHackMiddleware.php create mode 100644 src/inc/apiv2/util/JsonBodyParserMiddleware.php create mode 100644 src/inc/apiv2/util/TokenAsParameterMiddleware.php create mode 100644 src/inc/defines/DAccessControl.php create mode 100644 src/inc/defines/DAccessControlAction.php rename src/inc/defines/{accessGroups.php => DAccessGroupAction.php} (71%) create mode 100644 src/inc/defines/DAccessLevel.php rename src/inc/defines/{users.php => DAccountAction.php} (55%) rename src/inc/defines/{agents.php => DAgentAction.php} (62%) create mode 100644 src/inc/defines/DAgentBinaryAction.php create mode 100644 src/inc/defines/DAgentIgnoreErrors.php create mode 100644 src/inc/defines/DAgentStatsType.php rename src/inc/defines/{api.php => DApiAction.php} (86%) create mode 100644 src/inc/defines/DCleaning.php create mode 100644 src/inc/defines/DConfig.php create mode 100644 src/inc/defines/DConfigAction.php create mode 100644 src/inc/defines/DConfigType.php rename src/inc/defines/{crackerBinaries.php => DCrackerBinaryAction.php} (62%) rename src/inc/defines/{deviceCompress.php => DDeviceCompress.php} (90%) create mode 100644 src/inc/defines/DDirectories.php rename src/inc/defines/{files.php => DFileAction.php} (82%) rename src/inc/defines/{fileDownload.php => DFileDownloadStatus.php} (77%) create mode 100644 src/inc/defines/DFileType.php create mode 100644 src/inc/defines/DForgotAction.php rename src/inc/defines/{hashcat.php => DHashcatStatus.php} (93%) rename src/inc/defines/{hashlists.php => DHashlistAction.php} (80%) create mode 100644 src/inc/defines/DHashlistFormat.php create mode 100644 src/inc/defines/DHashtypeAction.php create mode 100644 src/inc/defines/DHealthCheck.php create mode 100644 src/inc/defines/DHealthCheckAction.php create mode 100644 src/inc/defines/DHealthCheckAgentStatus.php create mode 100644 src/inc/defines/DHealthCheckMode.php create mode 100644 src/inc/defines/DHealthCheckStatus.php create mode 100644 src/inc/defines/DHealthCheckType.php create mode 100644 src/inc/defines/DLimits.php create mode 100644 src/inc/defines/DLogEntry.php create mode 100644 src/inc/defines/DLogEntryIssuer.php create mode 100644 src/inc/defines/DNotificationAction.php create mode 100644 src/inc/defines/DNotificationObjectType.php create mode 100644 src/inc/defines/DNotificationType.php create mode 100644 src/inc/defines/DOperatingSystem.php create mode 100644 src/inc/defines/DPayloadKeys.php create mode 100644 src/inc/defines/DPlatforms.php rename src/inc/defines/{preprocessors.php => DPreprocessorAction.php} (92%) create mode 100644 src/inc/defines/DPretaskAction.php create mode 100644 src/inc/defines/DPrince.php create mode 100644 src/inc/defines/DProxyTypes.php create mode 100644 src/inc/defines/DSearchAction.php rename src/inc/defines/{log.php => DServerLog.php} (79%) create mode 100644 src/inc/defines/DStats.php create mode 100644 src/inc/defines/DSupertaskAction.php rename src/inc/defines/{tasks.php => DTaskAction.php} (54%) create mode 100644 src/inc/defines/DTaskStaticChunking.php create mode 100644 src/inc/defines/DTaskTypes.php create mode 100644 src/inc/defines/DUserAction.php create mode 100644 src/inc/defines/DViewControl.php create mode 100644 src/inc/defines/UApi.php create mode 100644 src/inc/defines/UQuery.php create mode 100644 src/inc/defines/UQueryAccess.php create mode 100644 src/inc/defines/UQueryAccount.php create mode 100644 src/inc/defines/UQueryAgent.php create mode 100644 src/inc/defines/UQueryConfig.php create mode 100644 src/inc/defines/UQueryCracker.php create mode 100644 src/inc/defines/UQueryFile.php create mode 100644 src/inc/defines/UQueryGroup.php create mode 100644 src/inc/defines/UQueryHashlist.php create mode 100644 src/inc/defines/UQuerySuperhashlist.php create mode 100644 src/inc/defines/UQueryTask.php create mode 100644 src/inc/defines/UQueryUser.php create mode 100644 src/inc/defines/UResponse.php create mode 100644 src/inc/defines/UResponseAccess.php create mode 100644 src/inc/defines/UResponseAccount.php create mode 100644 src/inc/defines/UResponseAgent.php create mode 100644 src/inc/defines/UResponseConfig.php create mode 100644 src/inc/defines/UResponseCracker.php create mode 100644 src/inc/defines/UResponseErrorMessage.php create mode 100644 src/inc/defines/UResponseFile.php create mode 100644 src/inc/defines/UResponseGroup.php create mode 100644 src/inc/defines/UResponseHashlist.php create mode 100644 src/inc/defines/UResponseSuperhashlist.php create mode 100644 src/inc/defines/UResponseTask.php create mode 100644 src/inc/defines/UResponseUser.php create mode 100644 src/inc/defines/USection.php create mode 100644 src/inc/defines/USectionAccess.php create mode 100644 src/inc/defines/USectionAccount.php create mode 100644 src/inc/defines/USectionAgent.php create mode 100644 src/inc/defines/USectionConfig.php create mode 100644 src/inc/defines/USectionCracker.php create mode 100644 src/inc/defines/USectionFile.php create mode 100644 src/inc/defines/USectionGroup.php create mode 100644 src/inc/defines/USectionHashlist.php create mode 100644 src/inc/defines/USectionPretask.php create mode 100644 src/inc/defines/USectionSuperhashlist.php create mode 100644 src/inc/defines/USectionSupertask.php create mode 100644 src/inc/defines/USectionTask.php create mode 100644 src/inc/defines/USectionTest.php create mode 100644 src/inc/defines/USectionUser.php create mode 100644 src/inc/defines/UValues.php delete mode 100644 src/inc/defines/accessControl.php delete mode 100644 src/inc/defines/config.php delete mode 100644 src/inc/defines/global.php delete mode 100644 src/inc/defines/health.php delete mode 100644 src/inc/defines/notifications.php delete mode 100644 src/inc/defines/userApi.php rename src/inc/handlers/{AccessControlHandler.class.php => AccessControlHandler.php} (86%) rename src/inc/handlers/{AccessGroupHandler.class.php => AccessGroupHandler.php} (89%) rename src/inc/handlers/{AccountHandler.class.php => AccountHandler.php} (93%) rename src/inc/handlers/{AgentBinaryHandler.class.php => AgentBinaryHandler.php} (90%) rename src/inc/handlers/{AgentHandler.class.php => AgentHandler.php} (95%) rename src/inc/handlers/{ApiHandler.class.php => ApiHandler.php} (90%) rename src/inc/handlers/{ConfigHandler.class.php => ConfigHandler.php} (86%) rename src/inc/handlers/{CrackerHandler.class.php => CrackerHandler.php} (90%) rename src/inc/handlers/{FileHandler.class.php => FileHandler.php} (90%) rename src/inc/handlers/{ForgotHandler.class.php => ForgotHandler.php} (79%) rename src/inc/handlers/{Handler.class.php => Handler.php} (73%) rename src/inc/handlers/{HashlistHandler.class.php => HashlistHandler.php} (94%) rename src/inc/handlers/{HashtypeHandler.class.php => HashtypeHandler.php} (82%) rename src/inc/handlers/{HealthHandler.class.php => HealthHandler.php} (82%) rename src/inc/handlers/{NotificationHandler.class.php => NotificationHandler.php} (86%) rename src/inc/handlers/{PreprocessorHandler.class.php => PreprocessorHandler.php} (88%) rename src/inc/handlers/{PretaskHandler.class.php => PretaskHandler.php} (94%) rename src/inc/handlers/{SearchHandler.class.php => SearchHandler.php} (87%) rename src/inc/handlers/{SupertaskHandler.class.php => SupertaskHandler.php} (91%) rename src/inc/handlers/{TaskHandler.class.php => TaskHandler.php} (93%) rename src/inc/handlers/{UsersHandler.class.php => UsersHandler.php} (90%) delete mode 100644 src/inc/mask.php rename src/inc/notifications/{Notification.class.php => HashtopolisNotification.php} (97%) rename src/inc/notifications/{NotificationChatBot.class.php => HashtopolisNotificationChatBot.php} (91%) rename src/inc/notifications/{NotificationDiscord.class.php => HashtopolisNotificationDiscordWebhook.php} (92%) rename src/inc/notifications/{NotificationEmail.class.php => HashtopolisNotificationEmail.php} (89%) rename src/inc/notifications/{NotificationExample.class.php => HashtopolisNotificationExample.php} (92%) rename src/inc/notifications/{NotificationSlack.class.php => HashtopolisNotificationSlack.php} (91%) rename src/inc/notifications/{NotificationTelegram.class.php => HashtopolisNotificationTelegram.php} (91%) delete mode 100644 src/inc/protocol.php rename src/inc/templating/{Statement.class.php => Statement.php} (99%) rename src/inc/templating/{Template.class.php => Template.php} (99%) rename src/inc/{user-api/UserAPIAccess.class.php => user_api/UserAPIAccess.php} (87%) rename src/inc/{user-api/UserAPIAccount.class.php => user_api/UserAPIAccount.php} (86%) rename src/inc/{user-api/UserAPIAgent.class.php => user_api/UserAPIAgent.php} (93%) rename src/inc/{user-api/UserAPIBasic.class.php => user_api/UserAPIBasic.php} (88%) rename src/inc/{user-api/UserAPIConfig.class.php => user_api/UserAPIConfig.php} (91%) rename src/inc/{user-api/UserAPICracker.class.php => user_api/UserAPICracker.php} (93%) rename src/inc/{user-api/UserAPIFile.class.php => user_api/UserAPIFile.php} (93%) rename src/inc/{user-api/UserAPIGroup.class.php => user_api/UserAPIGroup.php} (93%) rename src/inc/{user-api/UserAPIHashlist.class.php => user_api/UserAPIHashlist.php} (96%) rename src/inc/{user-api/UserAPIPretask.class.php => user_api/UserAPIPretask.php} (95%) rename src/inc/{user-api/UserAPISuperhashlist.class.php => user_api/UserAPISuperhashlist.php} (89%) rename src/inc/{user-api/UserAPISupertask.class.php => user_api/UserAPISupertask.php} (94%) rename src/inc/{user-api/UserAPITask.class.php => user_api/UserAPITask.php} (97%) rename src/inc/{user-api/UserAPITest.class.php => user_api/UserAPITest.php} (82%) rename src/inc/{user-api/UserAPIUser.class.php => user_api/UserAPIUser.php} (92%) rename src/inc/utils/{AccessControl.class.php => AccessControl.php} (92%) rename src/inc/utils/{AccessControlUtils.class.php => AccessControlUtils.php} (89%) rename src/inc/utils/{AccessGroupUtils.class.php => AccessGroupUtils.php} (89%) rename src/inc/utils/{AccessUtils.class.php => AccessUtils.php} (87%) rename src/inc/utils/{AgentBinaryUtils.class.php => AgentBinaryUtils.php} (94%) rename src/inc/utils/{AgentUtils.class.php => AgentUtils.php} (92%) rename src/inc/utils/{ApiUtils.class.php => ApiUtils.php} (94%) rename src/inc/utils/{AssignmentUtils.class.php => AssignmentUtils.php} (79%) rename src/inc/utils/{ChunkUtils.class.php => ChunkUtils.php} (93%) rename src/inc/utils/{ConfigUtils.class.php => ConfigUtils.php} (91%) rename src/inc/utils/{CrackerBinaryUtils.class.php => CrackerBinaryUtils.php} (77%) rename src/inc/utils/{CrackerUtils.class.php => CrackerUtils.php} (91%) rename src/inc/utils/{FileDownloadUtils.class.php => FileDownloadUtils.php} (81%) rename src/inc/utils/{FileUtils.class.php => FileUtils.php} (94%) rename src/inc/utils/{HashlistUtils.class.php => HashlistUtils.php} (96%) rename src/inc/utils/{HashtypeUtils.class.php => HashtypeUtils.php} (84%) rename src/inc/utils/{HealthUtils.class.php => HealthUtils.php} (92%) rename src/inc/utils/{Lock.class.php => Lock.php} (95%) rename src/inc/utils/{LockUtils.class.php => LockUtils.php} (92%) rename src/inc/utils/{NotificationUtils.class.php => NotificationUtils.php} (86%) rename src/inc/utils/{PreprocessorUtils.class.php => PreprocessorUtils.php} (93%) rename src/inc/utils/{PretaskUtils.class.php => PretaskUtils.php} (93%) rename src/inc/utils/{RunnerUtils.class.php => RunnerUtils.php} (95%) rename src/inc/utils/{SupertaskUtils.class.php => SupertaskUtils.php} (95%) rename src/inc/utils/{TaskUtils.class.php => TaskUtils.php} (96%) rename src/inc/utils/{TaskwrapperUtils.class.php => TaskWrapperUtils.php} (77%) rename src/inc/utils/{UserUtils.class.php => UserUtils.php} (88%) delete mode 100644 src/install/updates/update_v0.2.0-beta_v0.2.0.php delete mode 100644 src/install/updates/update_v0.2.x_v0.3.0.php delete mode 100644 src/install/updates/update_v0.3.0_v0.3.1.php delete mode 100644 src/install/updates/update_v0.3.1_v0.3.2.php delete mode 100644 src/install/updates/update_v0.3.2_v0.4.0.php delete mode 100644 src/install/updates/update_v0.4.0_v0.5.0.php diff --git a/ci/HashtopolisTest.class.php b/ci/HashtopolisTest.class.php index d4424a333..0b2cdc1fe 100644 --- a/ci/HashtopolisTest.class.php +++ b/ci/HashtopolisTest.class.php @@ -1,11 +1,12 @@ getId(), "", 0, 0, 0); - $hashlist_2 = new Hashlist(null, "hashlist 2", \DHashlistFormat::PLAIN, 0, 0, ':', 0, 0, 0, 1, \AccessUtils::getOrCreateDefaultAccessGroup()->getId(), "", 0, 0, 0); - $hashlist_3 = new Hashlist(null, "hashlist 3", \DHashlistFormat::PLAIN, 0, 0, ':', 0, 0, 0, 0, \AccessUtils::getOrCreateDefaultAccessGroup()->getId(), "", 0, 0, 0); + $hashlist_1 = new Hashlist(null, "hashlist 1", \DHashlistFormat::PLAIN, 0, 0, ':', 0, 0, 0, 0, \Hashtopolis\inc\utils\AccessUtils::getOrCreateDefaultAccessGroup()->getId(), "", 0, 0, 0); + $hashlist_2 = new Hashlist(null, "hashlist 2", \DHashlistFormat::PLAIN, 0, 0, ':', 0, 0, 0, 1, \Hashtopolis\inc\utils\AccessUtils::getOrCreateDefaultAccessGroup()->getId(), "", 0, 0, 0); + $hashlist_3 = new Hashlist(null, "hashlist 3", \DHashlistFormat::PLAIN, 0, 0, ':', 0, 0, 0, 0, \Hashtopolis\inc\utils\AccessUtils::getOrCreateDefaultAccessGroup()->getId(), "", 0, 0, 0); $hashlist_1 = Factory::getHashlistFactory()->save($hashlist_1); $hashlist_2 = Factory::getHashlistFactory()->save($hashlist_2); $hashlist_3 = Factory::getHashlistFactory()->save($hashlist_3); diff --git a/ci/run.php b/ci/run.php index 753680951..709d37afc 100644 --- a/ci/run.php +++ b/ci/run.php @@ -1,6 +1,7 @@ checkPermission(DViewControl::ABOUT_VIEW_PERM); diff --git a/src/access.php b/src/access.php index 925fd780f..753f2fe0b 100755 --- a/src/access.php +++ b/src/access.php @@ -1,8 +1,19 @@ , token: string} $arguments - */ - public function __invoke(ServerRequestInterface $request, array $arguments): ServerRequestInterface - { - // adds the decoded userId and scope to the request attributes - return $request->withAttribute("userId", $arguments["decoded"]["userId"])->withAttribute("scope", $arguments["decoded"]["scope"]); - } -} - -/* Authentication middleware for token retrival */ - -class HashtopolisAuthenticator implements AuthenticatorInterface { - public function __invoke(array $arguments): bool { - $username = $arguments["user"]; - $password = $arguments["password"]; - - $filter = new QueryFilter(User::USERNAME, $username, "="); - - $user = Factory::getUserFactory()->filter([Factory::FILTER => $filter], true); - if ($user === null) { - return false; - } - - if ($user->getIsValid() != 1) { - return false; - } - else if (!Encryption::passwordVerify($password, $user->getPasswordSalt(), $user->getPasswordHash())) { - Util::createLogEntry(DLogEntryIssuer::USER, $user->getId(), DLogEntry::WARN, "Failed login attempt due to wrong password!"); - return false; - } - Factory::getUserFactory()->set($user, User::LAST_LOGIN_DATE, time()); - return true; - } -} - -$container->set("HttpBasicAuthentication", function (\Psr\Container\ContainerInterface $container) { +$container->set("HttpBasicAuthentication", function (ContainerInterface $container) { return new HttpBasicAuthentication([ "path" => "/api/v2/auth/token", "secure" => false, "error" => function ($response, $arguments) { - return errorResponse($response, $arguments["message"], 401); + return ErrorHandler::errorResponse($response, $arguments["message"], 401); }, "authenticator" => new HashtopolisAuthenticator, "before" => function ($request, $arguments) { @@ -120,34 +129,20 @@ public function __invoke(array $arguments): bool { ]); }); -/* Quick to create auto-generated lookup table between DBA Objects and APIv2 classes */ - -class ClassMapper { - private array $store = array(); - - public function add($key, $value): void { - $this->store[$key] = $value; - } - - public function get($key): string { - return $this->store[$key]; - } -} - $container->set("classMapper", function () { return new ClassMapper(); }); /* API token validation */ -$container->set("JwtAuthentication", function (\Psr\Container\ContainerInterface $container) { +$container->set("JwtAuthentication", function (ContainerInterface $container) { $decoder = new FirebaseDecoder( new Secret(StartupConfig::getInstance()->getPepper(0), 'HS256', hash("sha256", StartupConfig::getInstance()->getPepper(0))) ); $options = new Options( isSecure: false, - before: new JWTBeforeHandler, - attribute: null + attribute: null, + before: new JWTBeforeHandler ); $rules = [ @@ -156,79 +151,6 @@ public function get($key): string { ]; return new JwtAuthentication($options, $decoder, $rules); }); - -/* Pre-parse incoming request body */ - -class JsonBodyParserMiddleware implements MiddlewareInterface { - public function process(Request $request, RequestHandler $handler): Response { - $contentType = $request->getHeaderLine('Content-Type'); - - if (strstr($contentType, 'application/json') || strstr($contentType, 'application/vnd.api+json')) { - $contents = json_decode(file_get_contents('php://input'), true); - if (json_last_error() === JSON_ERROR_NONE) { - $request = $request->withParsedBody($contents); - } - else { - $response = new Response(); - return errorResponse($response, "Malformed request", 400); - } - } - - return $handler->handle($request); - } -} - -/* Quirk to map token as parameter (useful for debugging) to 'Authorization Header (for JWT input) */ - -class TokenAsParameterMiddleware implements MiddlewareInterface { - public function process(Request $request, RequestHandler $handler): Response { - $data = $request->getQueryParams(); - if (array_key_exists('token', $data)) { - $request = $request->withHeader('Authorization', 'Bearer ' . $data['token']); - }; - - return $handler->handle($request); - } -} - - -/* This middleware will append the response header Access-Control-Allow-Methods with all allowed methods */ - -class CorsHackMiddleware implements MiddlewareInterface { - public function process(Request $request, RequestHandler $handler): Response { - $response = $handler->handle($request); - - return $this::addCORSheaders($request, $response); - } - - public static function addCORSheaders(Request $request, $response) { - $routeContext = RouteContext::fromRequest($request); - $routingResults = $routeContext->getRoutingResults(); - $methods = $routingResults->getAllowedMethods(); - $requestHeaders = $request->getHeaderLine('Access-Control-Request-Headers'); - - $frontend_urls = getenv('HASHTOPOLIS_FRONTEND_URLS'); - if ($frontend_urls !== false) { - if(in_array($request->getHeaderLine('Origin'), explode(',', $frontend_urls), true)) { - $response = $response->withHeader('Access-Control-Allow-Origin', $request->getHeaderLine('Origin')); - } - else { - error_log("CORS error: Allow-Origin doesn't match. Please make sure to include the used frontend in the .env file."); - } - } - else { - //No frontend URLs given in .env file, switch to default allow all - $response = $response->withHeader('Access-Control-Allow-Origin', '*'); - } - - $response = $response->withHeader('Access-Control-Allow-Methods', implode(',', $methods)); - $response = $response->withHeader('Access-Control-Allow-Headers', $requestHeaders); - - // Optional: Allow Ajax CORS requests with Authorization header - // $response = $response->withHeader('Access-Control-Allow-Credentials', 'true'); - return $response; - } -} /* * SLIM framework middleware requires specific order to ensure middleware layers are executed in correct order. @@ -269,7 +191,7 @@ public static function addCORSheaders(Request $request, $response) { $response = $app->getResponseFactory()->createResponse(); $response = CorsHackMiddleware::addCORSheaders($request, $response); - //Quirck to handle HTexceptions without status code, this can be removed when all HTexceptions have been migrated + //Quirk to handle HTExceptions without status code, this can be removed when all HTExceptions have been migrated error_log($exception->getMessage()); $code = $exception->getCode(); if ($code == 0 || $code == 1 || !is_integer($code)) { @@ -286,9 +208,8 @@ public static function addCORSheaders(Request $request, $response) { $msg = $previous->getMessage(); } } - - return errorResponse($response, $msg, $code); + return ErrorHandler::errorResponse($response, $msg, $code); }; $errorMiddleware->setDefaultErrorHandler($customErrorHandler); $app->addRoutingMiddleware(); //Routing middleware has to be added after the default error handler @@ -300,74 +221,71 @@ public static function addCORSheaders(Request $request, $response) { bool $logErrors, bool $logErrorDetails) use ($app) { $response = $app->getResponseFactory()->createResponse(); - return errorResponse($response, $exception->getMessage(), 405); + return ErrorHandler::errorResponse($response, $exception->getMessage(), 405); }); - -require_once(__DIR__ . "/../../inc/apiv2/auth/token.routes.php"); -require_once(__DIR__ . "/../../inc/apiv2/common/openAPISchema.routes.php"); - -$modelDir = __DIR__ . "/../../inc/apiv2/model"; - -require_once($modelDir . "/accessgroups.routes.php"); -require_once($modelDir . "/agentassignments.routes.php"); -require_once($modelDir . "/agentbinaries.routes.php"); -require_once($modelDir . "/agenterrors.routes.php"); -require_once($modelDir . "/agents.routes.php"); -require_once($modelDir . "/agentstats.routes.php"); -require_once($modelDir . "/chunks.routes.php"); -require_once($modelDir . "/configs.routes.php"); -require_once($modelDir . "/configsections.routes.php"); -require_once($modelDir . "/crackers.routes.php"); -require_once($modelDir . "/crackertypes.routes.php"); -require_once($modelDir . "/files.routes.php"); -require_once($modelDir . "/globalpermissiongroups.routes.php"); -require_once($modelDir . "/hashes.routes.php"); -require_once($modelDir . "/hashlists.routes.php"); -require_once($modelDir . "/hashtypes.routes.php"); -require_once($modelDir . "/healthcheckagents.routes.php"); -require_once($modelDir . "/healthchecks.routes.php"); -require_once($modelDir . "/logentries.routes.php"); -require_once($modelDir . "/notifications.routes.php"); -require_once($modelDir . "/preprocessors.routes.php"); -require_once($modelDir . "/pretasks.routes.php"); -require_once($modelDir . "/speeds.routes.php"); -require_once($modelDir . "/supertasks.routes.php"); -require_once($modelDir . "/tasks.routes.php"); -require_once($modelDir . "/taskwrappers.routes.php"); -require_once($modelDir . "/users.routes.php"); -require_once($modelDir . "/vouchers.routes.php"); - -$helperDir = __DIR__ . "/../../inc/apiv2/helper"; - -require_once($helperDir . "/abortChunk.routes.php"); -require_once($helperDir . "/assignAgent.routes.php"); -require_once($helperDir . "/bulkSupertaskBuilder.routes.php"); -require_once($helperDir . "/changeOwnPassword.routes.php"); -require_once($helperDir . "/currentUser.routes.php"); -require_once($helperDir . "/createSupertask.routes.php"); -require_once($helperDir . "/createSuperHashlist.routes.php"); -require_once($helperDir . "/exportCrackedHashes.routes.php"); -require_once($helperDir . "/exportLeftHashes.routes.php"); -require_once($helperDir . "/exportWordlist.routes.php"); -require_once($helperDir . "/getAccessGroups.routes.php"); -require_once($helperDir . "/getAgentBinary.routes.php"); -require_once($helperDir . "/getCracksOfTask.routes.php"); -require_once($helperDir . "/getFile.routes.php"); -require_once($helperDir . "/getTaskProgressImage.routes.php"); -require_once($helperDir . "/getUserPermission.routes.php"); -require_once($helperDir . "/importCrackedHashes.routes.php"); -require_once($helperDir . "/importFile.routes.php"); -require_once($helperDir . "/maskSupertaskBuilder.routes.php"); -require_once($helperDir . "/purgeTask.routes.php"); -require_once($helperDir . "/rebuildChunkCache.routes.php"); -require_once($helperDir . "/recountFileLines.routes.php"); -require_once($helperDir . "/rescanGlobalFiles.routes.php"); -require_once($helperDir . "/resetChunk.routes.php"); -require_once($helperDir . "/resetUserPassword.routes.php"); -require_once($helperDir . "/searchHashes.routes.php"); -require_once($helperDir . "/setUserPassword.routes.php"); -require_once($helperDir . "/taskExtraDetails.routes.php"); -require_once($helperDir . "/unassignAgent.routes.php"); +include(__DIR__ . "/../../inc/apiv2/common/openAPISchema.routes.php"); +include(__DIR__ . "/../../inc/apiv2/auth/token.routes.php"); + +// register model APIs +AccessGroupAPI::register($app); +AgentAPI::register($app); +AgentAssignmentAPI::register($app); +AgentBinaryAPI::register($app); +AgentErrorAPI::register($app); +AgentStatAPI::register($app); +ChunkAPI::register($app); +ConfigAPI::register($app); +ConfigSectionAPI::register($app); +CrackerBinaryAPI::register($app); +CrackerBinaryTypeAPI::register($app); +FileAPI::register($app); +GlobalPermissionGroupAPI::register($app); +HashAPI::register($app); +HashlistAPI::register($app); +HashTypeAPI::register($app); +HealthCheckAgentAPI::register($app); +HealthCheckAPI::register($app); +LogEntryAPI::register($app); +NotificationSettingAPI::register($app); +PreprocessorAPI::register($app); +PreTaskAPI::register($app); +SpeedAPI::register($app); +SupertaskAPI::register($app); +TaskAPI::register($app); +TaskWrapperAPI::register($app); +UserAPI::register($app); +VoucherAPI::register($app); + +// register helpers +AbortChunkHelperAPI::register($app); +AssignAgentHelperAPI::register($app); +BulkSupertaskBuilderHelperAPI::register($app); +ChangeOwnPasswordHelperAPI::register($app); +CreateSuperHashlistHelperAPI::register($app); +CreateSupertaskHelperAPI::register($app); +CurrentUserHelperAPI::register($app); +ExportCrackedHashesHelperAPI::register($app); +ExportLeftHashesHelperAPI::register($app); +ExportWordlistHelperAPI::register($app); +GetAccessGroupsHelperAPI::register($app); +GetAgentBinaryHelperAPI::register($app); +GetCracksOfTaskHelper::register($app); +GetFileHelperAPI::register($app); +GetTaskProgressImageHelperAPI::register($app); +GetUserPermissionHelperAPI::register($app); +ImportCrackedHashesHelperAPI::register($app); +ImportFileHelperAPI::register($app); +MaskSupertaskBuilderHelperAPI::register($app); +PurgeTaskHelperAPI::register($app); +RebuildChunkCacheHelperAPI::register($app); +RecountFileLinesHelperAPI::register($app); +RescanGlobalFilesHelperAPI::register($app); +ResetChunkHelperAPI::register($app); +ResetUserPasswordHelperAPI::register($app); +SearchHashesHelperAPI::register($app); +SetUserPasswordHelperAPI::register($app); +TaskExtraDetailsHelper::register($app); +UnassignAgentHelperAPI::register($app); $app->run(); diff --git a/src/binaries.php b/src/binaries.php index 8228382c9..58614d7da 100755 --- a/src/binaries.php +++ b/src/binaries.php @@ -1,6 +1,15 @@ getId(), "="); $binaries = Factory::getCrackerBinaryFactory()->filter([Factory::FILTER => $qF]); $arr = array(); - usort($binaries, ["Util", "versionComparisonBinary"]); + usort($binaries, ["Hashtopolis\inc\Util", "versionComparisonBinary"]); foreach ($binaries as $binary) { if (!isset($arr[$binary->getVersion()])) { $arr[$binary->getVersion()] = $binary->getVersion(); diff --git a/src/cracks.php b/src/cracks.php index a7394bc18..8f0edd163 100644 --- a/src/cracks.php +++ b/src/cracks.php @@ -1,13 +1,25 @@ $v) { $k = strtolower($k); foreach ($factories as $factory) { - if (Util::startsWith($k, strtolower($factory->getMappedModelTable()))) { + if (str_starts_with($k, strtolower($factory->getMappedModelTable()))) { $column = str_replace(strtolower($factory->getMappedModelTable()) . "_", "", $k); $values[$factory->getModelTable()][strtolower($column)] = $v; } diff --git a/src/dba/Aggregation.class.php b/src/dba/Aggregation.php similarity index 71% rename from src/dba/Aggregation.class.php rename to src/dba/Aggregation.php index bf25e9677..66f615e3b 100755 --- a/src/dba/Aggregation.class.php +++ b/src/dba/Aggregation.php @@ -1,33 +1,29 @@ column = $column; $this->function = $function; $this->overrideFactory = $overrideFactory; } - function getName() { + function getName(): string { return strtolower($this->function) . "_" . strtolower($this->column); } - function getQueryString(AbstractModelFactory $factory, bool $includeTable = false) { + function getQueryString(AbstractModelFactory $factory, bool $includeTable = false): string { if ($this->overrideFactory != null) { $factory = $this->overrideFactory; } diff --git a/src/dba/CoalesceOrderFilter.class.php b/src/dba/CoalesceOrderFilter.php similarity index 52% rename from src/dba/CoalesceOrderFilter.class.php rename to src/dba/CoalesceOrderFilter.php index 26ae2efb3..9875331d7 100644 --- a/src/dba/CoalesceOrderFilter.class.php +++ b/src/dba/CoalesceOrderFilter.php @@ -1,21 +1,25 @@ columns = $columns; $this->type = $type; } function getQueryString(AbstractModelFactory $factory, bool $includeTable = false): string { $mapped_columns = []; - foreach($this->columns as $column) { - array_push($mapped_columns, AbstractModelFactory::getMappedModelKey($factory->getNullObject(), $column)); + foreach ($this->columns as $column) { + $mapped_columns[] = AbstractModelFactory::getMappedModelKey($factory->getNullObject(), $column); } return "COALESCE(" . implode(", ", $mapped_columns) . ") " . $this->type; } diff --git a/src/dba/ComparisonFilter.class.php b/src/dba/ComparisonFilter.php similarity index 90% rename from src/dba/ComparisonFilter.class.php rename to src/dba/ComparisonFilter.php index 31ed7ff0f..49c370a1b 100755 --- a/src/dba/ComparisonFilter.class.php +++ b/src/dba/ComparisonFilter.php @@ -1,16 +1,13 @@ key1 = $key1; @@ -36,7 +33,7 @@ function getQueryString(AbstractModelFactory $factory, bool $includeTable = fals return $table . AbstractModelFactory::getMappedModelKey($factory->getNullObject(), $this->key1) . $this->operator . $table . AbstractModelFactory::getMappedModelKey($factory->getNullObject(), $this->key2); } - function getValue() { + function getValue(): null { return null; } diff --git a/src/dba/ContainFilter.class.php b/src/dba/ContainFilter.php similarity index 73% rename from src/dba/ContainFilter.class.php rename to src/dba/ContainFilter.php index df294f64c..d01c2c18e 100755 --- a/src/dba/ContainFilter.class.php +++ b/src/dba/ContainFilter.php @@ -1,17 +1,15 @@ key = $key; $this->values = $values; $this->overrideFactory = $overrideFactory; @@ -40,11 +38,11 @@ function getQueryString(AbstractModelFactory $factory, bool $includeTable = fals return $table . AbstractModelFactory::getMappedModelKey($factory->getNullObject(), $this->key) . (($this->inverse) ? " NOT" : "") . " IN (" . implode(",", $app) . ")"; } - function getValue() { + function getValue(): array { return $this->values; } - function getHasValue() { + function getHasValue(): bool { return true; } } diff --git a/src/dba/Factory.class.php b/src/dba/Factory.php similarity index 53% rename from src/dba/Factory.class.php rename to src/dba/Factory.php index 8a38f879d..1debfb909 100644 --- a/src/dba/Factory.class.php +++ b/src/dba/Factory.php @@ -1,54 +1,99 @@ by = $by; $this->overrideFactory = $overrideFactory; } diff --git a/src/dba/Join.class.php b/src/dba/Join.class.php deleted file mode 100644 index eb89d69be..000000000 --- a/src/dba/Join.class.php +++ /dev/null @@ -1,30 +0,0 @@ -otherFactory = $otherFactory; - $this->match1 = $matching1; - $this->match2 = $matching2; - $this->joinType = $joinType; - $this->queryFilters = $queryFilters; - - $this->otherTableName = $this->otherFactory->getMappedModelTable(); - $this->overrideOwnFactory = $overrideOwnFactory; - } - - /** - * @return AbstractModelFactory - */ - function getOtherFactory() { - return $this->otherFactory; - } - - function getMatch1() { - return $this->match1; - } - - function getMatch2() { - return $this->match2; - } - - function getOtherTableName() { - return $this->otherTableName; - } - - function getJoinType() { - return $this->joinType; - } - - function setJoinType($joinType) { - $this->joinType = $joinType; - } - - - function getQueryFilters() { - return $this->queryFilters; - } - - function setQueryFilters(array $queryFilters) { - $this->queryFilters = $queryFilters; - } - - /** - * @return AbstractModelFactory - */ - function getOverrideOwnFactory() { - return $this->overrideOwnFactory; - } -} - - diff --git a/src/dba/JoinFilter.php b/src/dba/JoinFilter.php new file mode 100755 index 000000000..f980a429c --- /dev/null +++ b/src/dba/JoinFilter.php @@ -0,0 +1,86 @@ +otherFactory = $otherFactory; + $this->match1 = $matching1; + $this->match2 = $matching2; + $this->joinType = $joinType; + $this->queryFilters = $queryFilters; + + $this->otherTableName = $this->otherFactory->getMappedModelTable(); + $this->overrideOwnFactory = $overrideOwnFactory; + } + + /** + * @return AbstractModelFactory + */ + function getOtherFactory(): AbstractModelFactory { + return $this->otherFactory; + } + + function getMatch1(): string { + return $this->match1; + } + + function getMatch2(): string { + return $this->match2; + } + + function getOtherTableName(): string { + return $this->otherTableName; + } + + function getJoinType(): string { + return $this->joinType; + } + + function setJoinType($joinType): void { + $this->joinType = $joinType; + } + + function getQueryFilters(): array { + return $this->queryFilters; + } + + function setQueryFilters(array $queryFilters): void { + $this->queryFilters = $queryFilters; + } + + function getOverrideOwnFactory(): ?AbstractModelFactory { + return $this->overrideOwnFactory; + } +} + + diff --git a/src/dba/LikeFilter.class.php b/src/dba/LikeFilter.php similarity index 76% rename from src/dba/LikeFilter.class.php rename to src/dba/LikeFilter.php index 7661fafe5..ddbbbc98b 100755 --- a/src/dba/LikeFilter.class.php +++ b/src/dba/LikeFilter.php @@ -1,26 +1,24 @@ key = $key; $this->value = $value; $this->overrideFactory = $overrideFactory; $this->match = true; } - function setMatch($status) { + function setMatch($status): void { $this->match = $status; } @@ -46,7 +44,7 @@ function getQueryString(AbstractModelFactory $factory, bool $includeTable = fals return $table . AbstractModelFactory::getMappedModelKey($factory->getNullObject(), $this->key) . $inv . $likeStatement; } - function getValue() { + function getValue(): string { return $this->value; } diff --git a/src/dba/LikeFilterInsensitive.class.php b/src/dba/LikeFilterInsensitive.php similarity index 72% rename from src/dba/LikeFilterInsensitive.class.php rename to src/dba/LikeFilterInsensitive.php index 557680b0a..9a08f5aca 100755 --- a/src/dba/LikeFilterInsensitive.class.php +++ b/src/dba/LikeFilterInsensitive.php @@ -1,16 +1,14 @@ key = $key; $this->value = $value; $this->overrideFactory = $overrideFactory; @@ -28,7 +26,7 @@ function getQueryString(AbstractModelFactory $factory, bool $includeTable = fals return "LOWER(" . $table . AbstractModelFactory::getMappedModelKey($factory->getNullObject(),$this->key) . ") LIKE LOWER(?)"; } - function getValue() { + function getValue(): string { return $this->value; } diff --git a/src/dba/Limit.class.php b/src/dba/Limit.class.php deleted file mode 100644 index 4d26ecf4c..000000000 --- a/src/dba/Limit.class.php +++ /dev/null @@ -1,11 +0,0 @@ -limit = intval($limit); - $this->offset = $offset !== null ? intval($offset) : null; -} - - function getQueryString() { - $queryString = $this->limit; - if ($this->offset != null) { - $queryString = $queryString . " OFFSET " . $this->offset; - } - return $queryString; - } -} - - diff --git a/src/dba/LimitFilter.php b/src/dba/LimitFilter.php new file mode 100644 index 000000000..57bd007e4 --- /dev/null +++ b/src/dba/LimitFilter.php @@ -0,0 +1,34 @@ +limit = intval($limit); + $this->offset = $offset !== null ? intval($offset) : null; + } + + function getQueryString(): string { + $queryString = $this->limit; + if ($this->offset != null) { + $queryString = $queryString . " OFFSET " . $this->offset; + } + return $queryString; + } +} + + diff --git a/src/dba/MassUpdateSet.class.php b/src/dba/MassUpdateSet.class.php deleted file mode 100644 index 55937a88e..000000000 --- a/src/dba/MassUpdateSet.class.php +++ /dev/null @@ -1,23 +0,0 @@ -matchValue = $matchValue; - $this->updateValue = $updateValue; - } - - function getMatchValue() { - return $this->matchValue; - } - - function getUpdateValue() { - return $this->updateValue; - } - - function getMassQuery($key) { - return "WHEN " . $key . " = ? THEN ? "; - } -} \ No newline at end of file diff --git a/src/dba/MassUpdateSet.php b/src/dba/MassUpdateSet.php new file mode 100644 index 000000000..2300695b8 --- /dev/null +++ b/src/dba/MassUpdateSet.php @@ -0,0 +1,25 @@ +matchValue = $matchValue; + $this->updateValue = $updateValue; + } + + function getMatchValue(): string { + return $this->matchValue; + } + + function getUpdateValue(): mixed { + return $this->updateValue; + } + + function getMassQuery($key): string { + return "WHEN " . $key . " = ? THEN ? "; + } +} \ No newline at end of file diff --git a/src/dba/Order.class.php b/src/dba/Order.php similarity index 83% rename from src/dba/Order.class.php rename to src/dba/Order.php index 587ec043d..657577394 100644 --- a/src/dba/Order.class.php +++ b/src/dba/Order.php @@ -1,6 +1,6 @@ by = $by; $this->type = $type; $this->overrideFactory = $overrideFactory; } - + function getBy(): string { return $this->by; } - + function getType(): string { return $this->type; } diff --git a/src/dba/PaginationFilter.class.php b/src/dba/PaginationFilter.php similarity index 96% rename from src/dba/PaginationFilter.class.php rename to src/dba/PaginationFilter.php index 97deb62d4..9687860ce 100644 --- a/src/dba/PaginationFilter.class.php +++ b/src/dba/PaginationFilter.php @@ -1,6 +1,6 @@ key = $key; $this->value = $value; $this->operator = $operator; @@ -36,7 +34,7 @@ function getQueryString(AbstractModelFactory $factory, bool $includeTable = fals return $table . AbstractModelFactory::getMappedModelKey($factory->getNullObject(), $this->key) . $this->operator . "?"; } - function getValue() { + function getValue(): mixed { if ($this->value === null) { return null; } diff --git a/src/dba/QueryFilterNoCase.class.php b/src/dba/QueryFilterNoCase.php similarity index 79% rename from src/dba/QueryFilterNoCase.class.php rename to src/dba/QueryFilterNoCase.php index 793d3ade9..4e142eecf 100644 --- a/src/dba/QueryFilterNoCase.class.php +++ b/src/dba/QueryFilterNoCase.php @@ -1,17 +1,15 @@ key = $key; $this->value = $value; $this->operator = $operator; @@ -36,7 +34,7 @@ function getQueryString(AbstractModelFactory $factory, bool $includeTable = fals return "(LOWER(" . $table . AbstractModelFactory::getMappedModelKey($factory->getNullObject(), $this->key) . ") " . $this->operator . "? OR " . $table . AbstractModelFactory::getMappedModelKey($factory->getNullObject(), $this->key) . $this->operator . "?)"; } - function getValue() { + function getValue(): ?array { if ($this->value === null) { return null; } diff --git a/src/dba/QueryFilterWithNull.class.php b/src/dba/QueryFilterWithNull.php similarity index 82% rename from src/dba/QueryFilterWithNull.class.php rename to src/dba/QueryFilterWithNull.php index 6ada2f10b..a59acfe03 100644 --- a/src/dba/QueryFilterWithNull.class.php +++ b/src/dba/QueryFilterWithNull.php @@ -1,18 +1,16 @@ key = $key; $this->value = $value; $this->operator = $operator; @@ -41,7 +39,7 @@ function getQueryString(AbstractModelFactory $factory, bool $includeTable = fals return "(" . $table . AbstractModelFactory::getMappedModelKey($factory->getNullObject(), $this->key) . $this->operator . "? OR " . $table . AbstractModelFactory::getMappedModelKey($factory->getNullObject(), $this->key) . " IS NOT NULL)"; } - function getValue() { + function getValue(): mixed { if ($this->value === null) { return null; } diff --git a/src/dba/UpdateSet.class.php b/src/dba/UpdateSet.php similarity index 73% rename from src/dba/UpdateSet.class.php rename to src/dba/UpdateSet.php index aa1baa4ad..fea72ccc6 100644 --- a/src/dba/UpdateSet.class.php +++ b/src/dba/UpdateSet.php @@ -1,12 +1,12 @@ key = $key; $this->value = $value; } @@ -20,7 +20,7 @@ function getQuery(AbstractModelFactory $factory, bool $includeTable = false): st return $table . AbstractModelFactory::getMappedModelKey($factory->getNullObject(), $this->key) . "=?"; } - function getValue() { + function getValue(): mixed { return $this->value; } } diff --git a/src/dba/Util.class.php b/src/dba/Util.php similarity index 71% rename from src/dba/Util.class.php rename to src/dba/Util.php index 6463d7cfc..5cabf1fd6 100644 --- a/src/dba/Util.class.php +++ b/src/dba/Util.php @@ -1,6 +1,6 @@ True, "type" => "bool", "subtype" => "unset", "choices" => "unset", "null" => False, "pk" => False, "protected" => True, "private" => False, "alias" => "isComputedPassword", "public" => False, "dba_mapping" => False]; $dict['lastLoginDate'] = ['read_only' => True, "type" => "int64", "subtype" => "unset", "choices" => "unset", "null" => False, "pk" => False, "protected" => True, "private" => False, "alias" => "lastLoginDate", "public" => False, "dba_mapping" => False]; $dict['registeredSince'] = ['read_only' => True, "type" => "int64", "subtype" => "unset", "choices" => "unset", "null" => False, "pk" => False, "protected" => True, "private" => False, "alias" => "registeredSince", "public" => False, "dba_mapping" => False]; - $dict['sessionLifetime'] = ['read_only' => False, "type" => "int", "subtype" => "unset", "choices" => "unset", "null" => True, "pk" => False, "protected" => False, "private" => False, "alias" => "sessionLifetime", "public" => False, "dba_mapping" => False]; + $dict['sessionLifetime'] = ['read_only' => False, "type" => "int", "subtype" => "unset", "choices" => "unset", "null" => False, "pk" => False, "protected" => False, "private" => False, "alias" => "sessionLifetime", "public" => False, "dba_mapping" => False]; $dict['rightGroupId'] = ['read_only' => False, "type" => "int", "subtype" => "unset", "choices" => "unset", "null" => False, "pk" => False, "protected" => False, "private" => False, "alias" => "globalPermissionGroupId", "public" => False, "dba_mapping" => False]; $dict['yubikey'] = ['read_only' => True, "type" => "str(256)", "subtype" => "unset", "choices" => "unset", "null" => False, "pk" => False, "protected" => True, "private" => False, "alias" => "yubikey", "public" => False, "dba_mapping" => False]; $dict['otp1'] = ['read_only' => True, "type" => "str(256)", "subtype" => "unset", "choices" => "unset", "null" => False, "pk" => False, "protected" => True, "private" => False, "alias" => "otp1", "public" => False, "dba_mapping" => False]; diff --git a/src/dba/models/UserFactory.class.php b/src/dba/models/UserFactory.php similarity index 92% rename from src/dba/models/UserFactory.class.php rename to src/dba/models/UserFactory.php index 5cea1449e..2d3c421cf 100644 --- a/src/dba/models/UserFactory.class.php +++ b/src/dba/models/UserFactory.php @@ -1,6 +1,9 @@ [ ['name' => 'agentStatId', 'read_only' => True, 'type' => 'int', 'protected' => True], - ['name' => 'agentId', 'read_only' => True, 'protected' => True, 'type' => 'int', 'protected' => True, 'relation' => 'Agent'], - ['name' => 'statType', 'read_only' => True, 'protected' => True, 'type' => 'int', 'protected' => True], - ['name' => 'time', 'read_only' => True, 'protected' => True, 'type' => 'int64', 'protected' => True], - ['name' => 'value', 'read_only' => True, 'protected' => True, 'type' => 'array', 'subtype' => 'int', 'protected' => True], + ['name' => 'agentId', 'read_only' => True, 'protected' => True, 'type' => 'int', 'relation' => 'Agent'], + ['name' => 'statType', 'read_only' => True, 'protected' => True, 'type' => 'int'], + ['name' => 'time', 'read_only' => True, 'protected' => True, 'type' => 'int64'], + ['name' => 'value', 'read_only' => True, 'protected' => True, 'type' => 'array', 'subtype' => 'int'], ], ]; $CONF['AgentZap'] = [ @@ -591,7 +595,7 @@ function getTypingType($str, $nullable = false): string { $class = str_replace("__MODEL_VARIABLE_NAMES__", implode("\n ", $variables), $class); $class = str_replace("__MODEL_PERMISSION_DEFINES__", implode("\n ", $crud_defines), $class); - file_put_contents(dirname(__FILE__) . "/" . $NAME . ".class.php", $class); + file_put_contents(dirname(__FILE__) . "/" . $NAME . ".php", $class); $class = file_get_contents(dirname(__FILE__) . "/AbstractModelFactory.template.txt"); $class = str_replace("__MODEL_NAME__", $NAME, $class); @@ -622,21 +626,24 @@ function getTypingType($str, $nullable = false): string { $class = str_replace("__MODEL_MAPPING_DICT__", "", $class); } - file_put_contents(dirname(__FILE__) . "/" . $NAME . "Factory.class.php", $class); + file_put_contents(dirname(__FILE__) . "/" . $NAME . "Factory.php", $class); } $class = file_get_contents(dirname(__FILE__) . "/Factory.template.txt"); $static = array(); $functions = array(); +$include_models = []; foreach ($CONF as $NAME => $COLUMNS) { + $include_models[] = "use Hashtopolis\\dba\\models\\{$NAME}Factory;"; $lowerName = strtolower($NAME[0]) . substr($NAME, 1); - $static[] = "private static \$" . $lowerName . "Factory = null;"; - $functions[] = "public static function get" . $NAME . "Factory() {\n if (self::\$" . $lowerName . "Factory == null) {\n \$f = new " . $NAME . "Factory();\n self::\$" . $lowerName . "Factory = \$f;\n return \$f;\n } else {\n return self::\$" . $lowerName . "Factory;\n }\n }"; + $static[] = "private static ?" . $NAME . "Factory \$" . $lowerName . "Factory = null;"; + $functions[] = "public static function get" . $NAME . "Factory(): " . $NAME . "Factory {\n if (self::\$" . $lowerName . "Factory == null) {\n \$f = new " . $NAME . "Factory();\n self::\$" . $lowerName . "Factory = \$f;\n return \$f;\n } else {\n return self::\$" . $lowerName . "Factory;\n }\n }"; } +$class = str_replace("__MODEL_INCLUDE__", implode("\n", $include_models), $class); $class = str_replace("__MODEL_STATIC__", implode("\n ", $static), $class); $class = str_replace("__MODEL_FUNCTIONS__", implode("\n \n ", $functions), $class); -file_put_contents(dirname(__FILE__) . "/../Factory.class.php", $class); +file_put_contents(dirname(__FILE__) . "/../Factory.php", $class); function makeConstant($name) { diff --git a/src/files.php b/src/files.php index 38c1d2cc4..f33bca0e2 100755 --- a/src/files.php +++ b/src/files.php @@ -1,10 +1,24 @@ checkPermission(DViewControl::FORGOT_VIEW_PERM); diff --git a/src/getFile.php b/src/getFile.php index 2ccbddd0e..fc3858d18 100644 --- a/src/getFile.php +++ b/src/getFile.php @@ -1,9 +1,18 @@ getFormat() == DHashlistFormat::PLAIN) { $hashFactory = Factory::getHashFactory(); - $hashClass = \DBA\Hash::class; + $hashClass = Hash::class; } else { $hashFactory = Factory::getHashBinaryFactory(); @@ -63,7 +74,7 @@ if ($hashlist->getFormat() == DHashlistFormat::WPA) { $isWpa = true; } - $hashClass = \DBA\HashBinary::class; + $hashClass = HashBinary::class; } $src = "hashlist"; $srcId = $list->getId(); @@ -82,11 +93,11 @@ $hashlists = Util::checkSuperHashlist(Factory::getHashlistFactory()->get(Factory::getTaskWrapperFactory()->get(Factory::getTaskFactory()->get($chunk->getTaskId())->getTaskWrapperId())->getHashlistId())); if ($hashlists[0]->getFormat() == DHashlistFormat::PLAIN) { $hashFactory = Factory::getHashFactory(); - $hashClass = \DBA\Hash::class; + $hashClass = Hash::class; } else { $hashFactory = Factory::getHashBinaryFactory(); - $hashClass = \DBA\HashBinary::class; + $hashClass = HashBinary::class; if ($hashlists[0]->getFormat() == DHashlistFormat::WPA) { $isWpa = true; } @@ -106,7 +117,7 @@ $hashlists = Util::checkSuperHashlist(Factory::getHashlistFactory()->get(Factory::getTaskWrapperFactory()->get($task->getTaskWrapperId())->getHashlistId())); if ($hashlists[0]->getFormat() == DHashlistFormat::PLAIN) { $hashFactory = Factory::getHashFactory(); - $hashClass = \DBA\Hash::class; + $hashClass = Hash::class; } else { $hashFactory = Factory::getHashBinaryFactory(); @@ -114,7 +125,7 @@ if ($hashlists[0]->getFormat() == DHashlistFormat::WPA) { $isWpa = true; } - $hashClass = \DBA\HashBinary::class; + $hashClass = HashBinary::class; } $qF = new QueryFilter(Chunk::TASK_ID, $task->getId(), "="); $chunks = Factory::getChunkFactory()->filter([Factory::FILTER => $qF]); @@ -207,7 +218,7 @@ $output = ""; foreach ($hashes as $hash) { - $hash = \DBA\Util::cast($hash, $hashClass); + $hash = \Hashtopolis\dba\Util::cast($hash, $hashClass); if ($displaying == "") { if (!$binaryFormat) { $output .= htmlentities($hash->getHash(), ENT_QUOTES, "UTF-8"); diff --git a/src/hashlists.php b/src/hashlists.php index a45043dae..21c800874 100755 --- a/src/hashlists.php +++ b/src/hashlists.php @@ -1,16 +1,31 @@ filter([])); $versions = Factory::getCrackerBinaryFactory()->filter([]); - usort($versions, ["Util", "versionComparisonBinary"]); + usort($versions, ["Hashtopolis\inc\Util", "versionComparisonBinary"]); UI::add('versions', $versions); UI::add('pageTitle', "Hashlist details for " . $list->getVal('hashlist')->getHashlistName()); diff --git a/src/hashtypes.php b/src/hashtypes.php index 50792fcdb..d384c10d3 100755 --- a/src/hashtypes.php +++ b/src/hashtypes.php @@ -1,6 +1,15 @@ filter([])); $versions = Factory::getCrackerBinaryFactory()->filter([Factory::ORDER => $oF]); - usort($versions, ["Util", "versionComparisonBinary"]); + usort($versions, ["Hashtopolis\inc\Util", "versionComparisonBinary"]); UI::add('versions', $versions); } diff --git a/src/help.php b/src/help.php index e0b5e4859..f01bde4fd 100755 --- a/src/help.php +++ b/src/help.php @@ -1,5 +1,10 @@ checkPermission(DViewControl::HELP_VIEW_PERM); diff --git a/src/inc/CSRF.class.php b/src/inc/CSRF.php similarity index 90% rename from src/inc/CSRF.class.php rename to src/inc/CSRF.php index 4fdd841b6..4888806f6 100644 --- a/src/inc/CSRF.class.php +++ b/src/inc/CSRF.php @@ -1,5 +1,11 @@ getPepper(3)])) { diff --git a/src/inc/Dataset.class.php b/src/inc/DataSet.php similarity index 95% rename from src/inc/Dataset.class.php rename to src/inc/DataSet.php index a788bc274..7ab6db0ae 100755 --- a/src/inc/Dataset.class.php +++ b/src/inc/DataSet.php @@ -1,5 +1,7 @@ prepare($query); $vals = [$type]; $stmt->execute($vals); - + $row = $stmt->fetch(PDO::FETCH_ASSOC); - if($row != null) { + if ($row != null) { $pkName = $agentBinaryFactory->getNullObject()->getPrimaryKey(); $pk = $row[$pkName]; $row["binaryType"] = $row["type"]; $binary = $agentBinaryFactory->createObjectFromDict($pk, $row); - + if (Comparator::lessThan($binary->getVersion(), $version)) { if (!$silent) { echo "update $type version... "; } - + $query = "UPDATE " . $agentBinaryFactory->getModelTable() . " SET " . AgentBinary::VERSION . "=?"; $values = []; @@ -232,7 +250,7 @@ public static function checkAgentVersionLegacy($type, $version, $silent = false) } } } - + /** * @param string $type * @param string $version @@ -621,7 +639,7 @@ public static function checkTaskWrapperCompleted($taskWrapper) { } return true; } - + public static function cleaning() { $entry = Factory::getStoredValueFactory()->get(DCleaning::LAST_CLEANING); if ($entry == null) { @@ -670,7 +688,7 @@ public static function zapCleaning() { Factory::getZapFactory()->massDeletion([Factory::FILTER => $zapFilter]); } - + /** * Cleans up stale TUS upload files. * @@ -682,14 +700,14 @@ public static function zapCleaning() { public static function tusFileCleaning() { $tusDirectory = Factory::getStoredValueFactory()->get(DDirectories::TUS)->getVal(); $uploadDirectory = $tusDirectory . DIRECTORY_SEPARATOR . "uploads" . DIRECTORY_SEPARATOR; - $metaDirectory = $tusDirectory . DIRECTORY_SEPARATOR . "meta" . DIRECTORY_SEPARATOR; + $metaDirectory = $tusDirectory . DIRECTORY_SEPARATOR . "meta" . DIRECTORY_SEPARATOR; $expiration_time = time() + 3600; if (file_exists($metaDirectory) && is_dir($metaDirectory)) { - if ($metaDirectoryHandler = opendir($metaDirectory)){ + if ($metaDirectoryHandler = opendir($metaDirectory)) { while ($file = readdir($metaDirectoryHandler)) { if (str_ends_with($file, ".meta")) { $metaFile = $metaDirectory . $file; - $metadata = (array)json_decode(file_get_contents($metaFile), true) ; + $metadata = (array)json_decode(file_get_contents($metaFile), true); if (!isset($metadata['upload_expires'])) { continue; } @@ -698,7 +716,7 @@ public static function tusFileCleaning() { if (file_exists($metaFile)) { unlink($metaFile); } - if (file_exists($uploadFile)){ + if (file_exists($uploadFile)) { unlink($uploadFile); } } @@ -1024,10 +1042,10 @@ public static function getStaticArray($val, $id) { * @return int */ public static function versionComparisonBinary($binary1, $binary2) { - if (Comparator::greaterThan($binary1->getVersion(), $binary2->getVersion())){ + if (Comparator::greaterThan($binary1->getVersion(), $binary2->getVersion())) { return 1; } - else if (Comparator::lessThan($binary1->getVersion(), $binary2->getVersion())){ + else if (Comparator::lessThan($binary1->getVersion(), $binary2->getVersion())) { return -1; } return 0; @@ -1045,10 +1063,10 @@ public static function updateVersionComparison($versionString1, $versionString2) $version1 = substr($versionString1, 8, strpos($versionString1, "_", 7) - 8); $version2 = substr($versionString2, 8, strpos($versionString2, "_", 7) - 8); - if(Comparator::greaterThan($version2, $version1)){ + if (Comparator::greaterThan($version2, $version1)) { return 1; } - else if(Comparator::lessThan($version2, $version1)){ + else if (Comparator::lessThan($version2, $version1)) { return -1; } return 0; @@ -1146,7 +1164,7 @@ public static function uploadFile($target, $type, $sourcedata) { else { $msg = "Renaming of file from import directory failed!"; } - } + } else { $msg = "Incorrect permissions of import file, Hashtopolis server can't read the file"; } @@ -1229,7 +1247,7 @@ public static function buildServerUrl() { $protocol = (isset($_SERVER['HTTPS']) && (strcasecmp('off', $_SERVER['HTTPS']) !== 0)) ? "https://" : "http://"; $hostname = $_SERVER['HTTP_HOST']; $port = $_SERVER['SERVER_PORT']; - + if ($protocol == "https://" && $port == 443 || $protocol == "http://" && $port == 80) { $port = ""; } @@ -1331,7 +1349,7 @@ public static function compareChunksTime($a, $b) { * @param string $text * html content of the email * @param string $plaintext plaintext version of the email content - * @return true on success, false on failure + * @return bool true on success, false on failure */ public static function sendMail($address, $subject, $text, $plaintext) { $boundary = uniqid('np'); @@ -1424,6 +1442,7 @@ public static function setMaxHashLength($limit) { $result = $DB->query("SELECT MAX(LENGTH(" . Hash::HASH . ")) as maxLength FROM " . Factory::getHashFactory()->getModelTable()); $maxLength = $result->fetch()['maxLength']; if ($limit >= $maxLength) { + // TODO: this is not database agnostic and may have to be removed anyway as the datatype is different now if ($DB->query("ALTER TABLE " . Factory::getHashFactory()->getModelTable() . " MODIFY " . Hash::HASH . " VARCHAR($limit) NOT NULL;") === false) { return false; } @@ -1453,6 +1472,7 @@ public static function setPlaintextMaxLength($limit) { $result = $DB->query("SELECT MAX(LENGTH(" . Hash::PLAINTEXT . ")) as maxLength FROM " . Factory::getHashFactory()->getModelTable()); $maxLength = $result->fetch()['maxLength']; if ($limit >= $maxLength) { + // TODO: this is not database agnostic and may have to be removed anyway as the datatype is different now if ($DB->query("ALTER TABLE " . Factory::getHashFactory()->getModelTable() . " MODIFY " . Hash::PLAINTEXT . " VARCHAR($limit);") === false) { return false; } @@ -1541,10 +1561,3 @@ public static function checkDataDirectory($key, $dir) { } } } - - - - - - - diff --git a/src/inc/agent/PActions.php b/src/inc/agent/PActions.php new file mode 100644 index 000000000..1b0ebe183 --- /dev/null +++ b/src/inc/agent/PActions.php @@ -0,0 +1,25 @@ +agent]); $this->sendErrorResponse(PActions::GET_CHUNK, "Agent is inactive!"); } - - $LOCKFILE = LOCK::CHUNKING.$task->getId(); + + $LOCKFILE = LOCK::CHUNKING . $task->getId(); LockUtils::get($LOCKFILE); DServerLog::log(DServerLog::TRACE, "Retrieved lock for chunking!", [$this->agent]); @@ -107,7 +127,7 @@ public function execute($QUERY = array()) { $this->sendErrorResponse(PActions::GET_CHUNK, "Task already saturated by other agents, no other task available!"); } } - + if (TaskUtils::isSaturatedByOtherAgents($task, $this->agent)) { Factory::getAgentFactory()->getDB()->commit(); LockUtils::release($LOCKFILE); @@ -117,7 +137,7 @@ public function execute($QUERY = array()) { else { DServerLog::log(DServerLog::TRACE, "Determine important task", [$this->agent, $task, $bestTask]); $bestTask = TaskUtils::getImportantTask($bestTask, $task); - + if ($bestTask->getId() != $task->getId()) { Factory::getAgentFactory()->getDB()->commit(); DServerLog::log(DServerLog::INFO, "Task with higher priority available!", [$this->agent]); @@ -173,7 +193,7 @@ protected function sendChunk($chunk) { return; // this can be safely done before the commit/release, because the only sendChunk which comes really at the end check for null before, so a lock which is not released cannot happen } Factory::getAgentFactory()->getDB()->commit(); - LockUtils::release(Lock::CHUNKING.$chunk->getTaskId()); + LockUtils::release(Lock::CHUNKING . $chunk->getTaskId()); DServerLog::log(DServerLog::TRACE, "Released lock for chunking!", [$this->agent]); $this->sendResponse(array( PResponseGetChunk::ACTION => PActions::GET_CHUNK, diff --git a/src/inc/api/APIGetFile.class.php b/src/inc/api/APIGetFile.php similarity index 89% rename from src/inc/api/APIGetFile.class.php rename to src/inc/api/APIGetFile.php index 736e629e6..dc287b803 100644 --- a/src/inc/api/APIGetFile.class.php +++ b/src/inc/api/APIGetFile.php @@ -1,10 +1,17 @@ agent->getToken(), DLogEntry::FATAL, $logMessage); DServerLog::log(DServerLog::FATAL, $logMessage); } - + $skipped++; break; } diff --git a/src/inc/api/APITestConnection.class.php b/src/inc/api/APITestConnection.php similarity index 76% rename from src/inc/api/APITestConnection.class.php rename to src/inc/api/APITestConnection.php index c85840180..8330e0c73 100644 --- a/src/inc/api/APITestConnection.class.php +++ b/src/inc/api/APITestConnection.php @@ -1,5 +1,11 @@ sendResponse(array( diff --git a/src/inc/api/APIUpdateClientInformation.class.php b/src/inc/api/APIUpdateClientInformation.php similarity index 86% rename from src/inc/api/APIUpdateClientInformation.class.php rename to src/inc/api/APIUpdateClientInformation.php index ab1309622..0c49ee799 100644 --- a/src/inc/api/APIUpdateClientInformation.class.php +++ b/src/inc/api/APIUpdateClientInformation.php @@ -1,7 +1,14 @@ filter([Factory::FILTER => $filter], true); + if ($user === null) { + return false; + } + + if ($user->getIsValid() != 1) { + return false; + } + else if (!Encryption::passwordVerify($password, $user->getPasswordSalt(), $user->getPasswordHash())) { + Util::createLogEntry(DLogEntryIssuer::USER, $user->getId(), DLogEntry::WARN, "Failed login attempt due to wrong password!"); + return false; + } + Factory::getUserFactory()->set($user, User::LAST_LOGIN_DATE, time()); + return true; + } +} \ No newline at end of file diff --git a/src/inc/apiv2/auth/JWTBeforeHandler.php b/src/inc/apiv2/auth/JWTBeforeHandler.php new file mode 100644 index 000000000..2a4092338 --- /dev/null +++ b/src/inc/apiv2/auth/JWTBeforeHandler.php @@ -0,0 +1,16 @@ +, token: string} $arguments + */ + public function __invoke(ServerRequestInterface $request, array $arguments): ServerRequestInterface { + // adds the decoded userId and scope to the request attributes + return $request->withAttribute("userId", $arguments["decoded"]["userId"])->withAttribute("scope", $arguments["decoded"]["scope"]); + } +} \ No newline at end of file diff --git a/src/inc/apiv2/auth/token.routes.php b/src/inc/apiv2/auth/token.routes.php index 7ad1f02ee..992cc5a91 100644 --- a/src/inc/apiv2/auth/token.routes.php +++ b/src/inc/apiv2/auth/token.routes.php @@ -2,14 +2,16 @@ use Firebase\JWT\JWT; +use Hashtopolis\inc\apiv2\common\error\HttpError; +use Hashtopolis\inc\StartupConfig; use Psr\Http\Message\ResponseInterface as Response; use Psr\Http\Message\ServerRequestInterface as Request; use Slim\Routing\RouteCollectorProxy; -use DBA\QueryFilter; -use DBA\User; -use DBA\Factory; +use Hashtopolis\dba\QueryFilter; +use Hashtopolis\dba\models\User; +use Hashtopolis\dba\Factory; use Firebase\JWT\JWK; require_once(dirname(__FILE__) . "/../../startup/include.php"); diff --git a/src/inc/apiv2/common/AbstractBaseAPI.class.php b/src/inc/apiv2/common/AbstractBaseAPI.php similarity index 93% rename from src/inc/apiv2/common/AbstractBaseAPI.class.php rename to src/inc/apiv2/common/AbstractBaseAPI.php index a7e3ed19a..5a2717778 100644 --- a/src/inc/apiv2/common/AbstractBaseAPI.class.php +++ b/src/inc/apiv2/common/AbstractBaseAPI.php @@ -1,58 +1,66 @@ getFeatures(); return $this->mapFeatures($features); } - + public function getAliasedFeaturesOther($dbaClass): array { $features = $this->getFeaturesOther($dbaClass); return $this->mapFeatures($features); @@ -198,7 +205,7 @@ final protected function mapFeatures($features): array { } return $mappedFeatures; } - + public static function getToOneRelationships(): array { return []; } @@ -206,7 +213,7 @@ public static function getToOneRelationships(): array { public static function getToManyRelationships(): array { return []; } - + public function getAllRelationships(): array { return array_merge($this->getToOneRelationships(), $this->getToManyRelationships()); } @@ -217,12 +224,15 @@ public function getAllRelationships(): array { final protected function getCurrentUser(): User { return $this->user; } - + public function setCurrentUser(User $user): void { $this->user = $user; } + /** + * @throws HttpError + */ protected static function getModelFactory(string $model): object { switch ($model) { case AccessGroup::class: @@ -301,7 +311,7 @@ protected static function getModelFactory(string $model): object { * @param string $model * @param int $pk * @return object - * @throws ResourceNotFoundError + * @throws ResourceNotFoundError|HttpError */ final protected static function fetchOne(string $model, int $pk): object { $factory = self::getModelFactory($model); @@ -312,38 +322,74 @@ final protected static function fetchOne(string $model, int $pk): object { return $object; } + /** + * @throws HttpError + * @throws ResourceNotFoundError + */ final protected static function getChunk(int $pk): Chunk { return self::fetchOne(Chunk::class, $pk); } + /** + * @throws HttpError + * @throws ResourceNotFoundError + */ final protected static function getCrackerBinary(int $pk): CrackerBinary { return self::fetchOne(CrackerBinary::class, $pk); } + /** + * @throws HttpError + * @throws ResourceNotFoundError + */ final protected static function getHashlist(int $pk): Hashlist { return self::fetchOne(Hashlist::class, $pk); } + /** + * @throws HttpError + * @throws ResourceNotFoundError + */ final protected static function getPretask(int $pk): Pretask { return self::fetchOne(Pretask::class, $pk); } + /** + * @throws HttpError + * @throws ResourceNotFoundError + */ final protected static function getRightGroup(int $pk): RightGroup { return self::fetchOne(RightGroup::class, $pk); } + /** + * @throws HttpError + * @throws ResourceNotFoundError + */ final protected static function getSupertask(int $pk): Supertask { return self::fetchOne(Supertask::class, $pk); } + /** + * @throws HttpError + * @throws ResourceNotFoundError + */ final protected static function getTask(int $pk): Task { return self::fetchOne(Task::class, $pk); } + /** + * @throws HttpError + * @throws ResourceNotFoundError + */ final protected static function getTaskWrapper(int $pk): TaskWrapper { return self::fetchOne(TaskWrapper::class, $pk); } + /** + * @throws HttpError + * @throws ResourceNotFoundError + */ final protected static function getUser(int $pk): User { return self::fetchOne(User::class, $pk); } @@ -598,7 +644,7 @@ protected function obj2Resource(object $obj, array &$expandResult = [], ?array $ $attributes = []; $relationships = []; - + $sparseFieldsetsForObj = null; if (is_array($sparseFieldsets) && array_key_exists($this->getObjectTypeName($obj), $sparseFieldsets)) { $sparseFieldsetsForObj = explode(",", $sparseFieldsets[$this->getObjectTypeName($obj)]); @@ -611,13 +657,13 @@ protected function obj2Resource(object $obj, array &$expandResult = [], ?array $ if ($feature['private'] === true) { continue; } - + // If sparse fieldsets (https://jsonapi.org/format/#fetching-sparse-fieldsets) is used, return only the requested data if (is_array($sparseFieldsetsForObj) && !in_array($feature['alias'], $sparseFieldsetsForObj)) { continue; } - - // Hide the primaryKey from the attributes since this is used as indentifier (id) in response + + // Hide the primaryKey from the attributes since this is used as identifier (id) in response if ($feature['pk'] === true) { continue; } @@ -628,7 +674,7 @@ protected function obj2Resource(object $obj, array &$expandResult = [], ?array $ $attributes[$feature['alias']] = $apiClass::db2json($feature, $kv[$name]); } - + $aggregatedData = $apiClass::aggregateData($obj, $expandResult, $aggregateFieldsets); $attributes = array_merge($attributes, $aggregatedData); @@ -711,7 +757,7 @@ protected function obj2Resource(object $obj, array &$expandResult = [], ?array $ * @throws NotFoundExceptionInterface * @throws ContainerExceptionInterface */ - protected function joinQuery(mixed $objFactory, DBA\QueryFilter $qF, DBA\JoinFilter $jF): array { + protected function joinQuery(mixed $objFactory, QueryFilter $qF, JoinFilter $jF): array { $joined = $objFactory->filter([Factory::FILTER => $qF, Factory::JOIN => $jF]); $objects = $joined[$objFactory->getModelName()]; @@ -727,7 +773,7 @@ protected function joinQuery(mixed $objFactory, DBA\QueryFilter $qF, DBA\JoinFil * @throws NotFoundExceptionInterface * @throws ContainerExceptionInterface */ - protected function filterQuery(mixed $objFactory, DBA\QueryFilter $qF): array { + protected function filterQuery(mixed $objFactory, QueryFilter $qF): array { $objects = $objFactory->filter([Factory::FILTER => $qF]); $ret = []; @@ -790,7 +836,7 @@ protected function object2Array(object $object, array $expands = []): array { * @throws JsonException */ protected static function ret2json(array $result): string { - return json_encode($result, JSON_UNESCAPED_SLASHES | JSON_THROW_ON_ERROR) . PHP_EOL; + return json_encode($result, JSON_UNESCAPED_SLASHES | JSON_THROW_ON_ERROR) . PHP_EOL; } /** @@ -842,7 +888,7 @@ protected function isAllowedToMutate(array $features, string $key, bool $toNull if ($features[$key]['private']) { throw new HttpForbidden("Key '$key' is private"); } - if ($toNull && $features[$key]['null'] == false){ + if ($toNull && !$features[$key]['null']) { throw new HttpForbidden("Key '$key' can not be set to NULL!"); } } @@ -1015,13 +1061,13 @@ protected function makeExpandables(Request $request, array $validExpandables): a } $permissionResponse = $this->validatePermissions($required_perms, $permsExpandMatching); $expands_to_remove = []; - + // remove expands with missing permissions - foreach($this->missing_permissions as $missing_permission) { + foreach ($this->missing_permissions as $missing_permission) { $expands_to_remove = array_merge($expands_to_remove, $permsExpandMatching[$missing_permission]); } $queryExpands = array_diff($queryExpands, $expands_to_remove); - + // if ($permissionResponse === FALSE) { // throw new HttpError('Permissions missing on expand parameter objects! || ' . join('||', $this->permissionErrors)); // } @@ -1051,6 +1097,7 @@ function getFilters(Request $request): array { * Check for valid filter parameters and build QueryFilter * @throws HttpForbidden * @throws InternalError + * @throws HttpError */ protected function makeFilter(array $filters, object $apiClass): array { $qFs = []; @@ -1164,9 +1211,10 @@ protected function makeFilter(array $filters, object $apiClass): array { * Check for valid ordering parameters and build QueryFilter * @throws InternalError * @throws HttpForbidden + * @throws HttpError */ protected function makeOrderFilterTemplates(Request $request, array $features, string $defaultSort = 'ASC', - bool $reverseSort = false): array { + bool $reverseSort = false): array { $orderTemplates = []; $orderings = $this->getQueryParameterAsList($request, 'sort'); @@ -1184,21 +1232,21 @@ protected function makeOrderFilterTemplates(Request $request, array $features, s } if (strpos($cast_key, ".")) { $parts = explode(".", $cast_key); - if (count($parts) == 2) { // Only relations of 1 deep allowed ex. task.keyspace - $relationString = $parts[0]; - //currently getting all relationships, but its probably only possible to sort on 1 to 1 relations - $relations = $this->getAllRelationships(); - if (array_key_exists($relationString, $relations)) { - $relationClass = $relations[$relationString]['relationType']; - $relationFeatures = $this->getAliasedFeaturesOther($relationClass); - $factory = $this->getModelFactory($relationClass); - $joinKey = $relations[$relationString]['relationKey']; - $key = $relations[$relationString]['key']; - $features_sort = $relationFeatures; - $cast_key = $parts[1]; - } + if (count($parts) == 2) { // Only relations of 1 deep allowed ex. task.keyspace + $relationString = $parts[0]; + //currently getting all relationships, but its probably only possible to sort on 1 to 1 relations + $relations = $this->getAllRelationships(); + if (array_key_exists($relationString, $relations)) { + $relationClass = $relations[$relationString]['relationType']; + $relationFeatures = $this->getAliasedFeaturesOther($relationClass); + $factory = $this->getModelFactory($relationClass); + $joinKey = $relations[$relationString]['relationKey']; + $key = $relations[$relationString]['key']; + $features_sort = $relationFeatures; + $cast_key = $parts[1]; } } + } if (array_key_exists($cast_key, $features_sort)) { $remappedKey = $features_sort[$cast_key]['dbname']; $type = ($matches['operator'] == '-') ? "DESC" : "ASC"; @@ -1223,7 +1271,7 @@ protected function makeOrderFilterTemplates(Request $request, array $features, s return $orderTemplates; } - + protected static function addToRelatedResources(array $relatedResources, array $relatedResource): array { $alreadyExists = false; $searchType = $relatedResource["type"]; @@ -1239,7 +1287,7 @@ protected static function addToRelatedResources(array $relatedResources, array $ } return $relatedResources; } - + protected function processExpands( object $apiClass, array $expands, @@ -1248,38 +1296,39 @@ protected function processExpands( array $includedResources, ?array $sparseFieldsets = null, ?array $aggregateFieldsets = null -): array { + ): array { // Add missing expands to expands in case they have been added in aggregateData() $expandKeys = array_keys($expandResult); $diffs = array_diff($expandKeys, $expands); $expands = array_merge($expands, $diffs); - + foreach ($expands as $expand) { if (!array_key_exists($object->getId(), $expandResult[$expand])) { - continue; + continue; } - + $expandResultObject = $expandResult[$expand][$object->getId()]; - + if (is_array($expandResultObject)) { foreach ($expandResultObject as $expandObject) { $noFurtherExpands = []; $includedResources = self::addToRelatedResources($includedResources, $apiClass->obj2Resource($expandObject, $noFurtherExpands, $sparseFieldsets, $aggregateFieldsets)); } - } else { - if ($expandResultObject === null) { - // to-only relation which is nullable - continue; - } + } + else { + if ($expandResultObject === null) { + // to-only relation which is nullable + continue; + } $noFurtherExpands = []; $includedResources = self::addToRelatedResources($includedResources, $apiClass->obj2Resource($expandResultObject, $noFurtherExpands, $sparseFieldsets, $aggregateFieldsets)); } } - + return $includedResources; } - + /** * Validate if user is allowed to access hashlist * @throws HttpForbidden diff --git a/src/inc/apiv2/common/AbstractHelperAPI.class.php b/src/inc/apiv2/common/AbstractHelperAPI.php similarity index 93% rename from src/inc/apiv2/common/AbstractHelperAPI.class.php rename to src/inc/apiv2/common/AbstractHelperAPI.php index 8ad531479..fe570e70c 100644 --- a/src/inc/apiv2/common/AbstractHelperAPI.class.php +++ b/src/inc/apiv2/common/AbstractHelperAPI.php @@ -1,20 +1,24 @@ "succes"] or if the endpoint returns an object it should return + * Function in order to create swagger documentation. Should return either a map of strings that + * describes the output ex: ["assign" => "success"] or if the endpoint returns an object it should return * the string representation of that object ex: File. */ abstract public static function getResponse(): array|string|null; @@ -46,10 +50,11 @@ public function processPost(Request $request, Response $response, array $args): if ($data !== null) { // Validate if correct parameters are sent $this->validateParameters($data, $allFeatures); - + /* Validate type of parameters */ $this->validateData($data, $allFeatures); - } else { + } + else { $data = []; } @@ -70,7 +75,8 @@ public function processPost(Request $request, Response $response, array $args): } elseif (is_array($newObject)) { return self::getMetaResponse($newObject, $request, $response); - } else { + } + else { throw new HttpError("Unable to process request!"); } } @@ -133,13 +139,13 @@ protected function handleRangeRequest(int &$start, int &$end, int &$size, &$fp): return false; } if ($range == '-') { - $c_start = $size - (int) substr($range, 1); + $c_start = $size - (int)substr($range, 1); } else { $range = explode('-', $range); - $c_start = (int) $range[0]; + $c_start = (int)$range[0]; if ((isset($range[1]) && is_numeric($range[1]))) { - $c_end = (int) $range[1]; + $c_end = (int)$range[1]; } else { $c_end = $size; diff --git a/src/inc/apiv2/common/AbstractModelAPI.class.php b/src/inc/apiv2/common/AbstractModelAPI.php similarity index 94% rename from src/inc/apiv2/common/AbstractModelAPI.class.php rename to src/inc/apiv2/common/AbstractModelAPI.php index faaec7f4c..daf259006 100644 --- a/src/inc/apiv2/common/AbstractModelAPI.class.php +++ b/src/inc/apiv2/common/AbstractModelAPI.php @@ -1,21 +1,25 @@ get($this->getCurrentUser()->getRightGroupId()); if ($group->getPermissions() !== 'ALL' && $otherFactory == null && $this->getSingleACL($this->getCurrentUser(), - $object) === false) { + $object + ) === false) { throw new HttpForbidden("No access to this object!", 403); } @@ -429,78 +439,85 @@ final protected function ResourceRecordArrayToUpdateArray($data, $parentId): arr } return $updates; } - - protected static function calculate_next_cursor(string|int $cursor, bool $ascending=true) { + + protected static function calculate_next_cursor(string|int $cursor, bool $ascending = true): int|string { if (is_int($cursor)) { if ($ascending) { return $cursor + 1; - } else { + } + else { return $cursor - 1; } - } elseif (is_string($cursor)) { - $len = strlen($cursor); - $lastChar = $cursor[$len - 1]; - $ord = ord($lastChar); - if ($ascending) { - if ($len == 0) { - return '~'; - } - - if ($ord < 126) { - return substr($cursor, 0, $len-1) . chr($ord + 1); - } else { - return $cursor . '!'; // '!' is lowest printable ascii - } - }else { - if ($len == 0) { - return ""; - } - if ($ord > 33) { - return substr($cursor, 0, $len-1) . chr($ord - 1); - } else - return substr($cursor, 0, $len-1); + } + elseif (is_string($cursor)) { + $len = strlen($cursor); + $lastChar = $cursor[$len - 1]; + $ord = ord($lastChar); + if ($ascending) { + if ($len == 0) { + return '~'; } - } else { + + if ($ord < 126) { + return substr($cursor, 0, $len - 1) . chr($ord + 1); + } + else { + return $cursor . '!'; // '!' is lowest printable ascii + } + } + else { + if ($len == 0) { + return ""; + } + if ($ord > 33) { + return substr($cursor, 0, $len - 1) . chr($ord - 1); + } + else { + return substr($cursor, 0, $len - 1); + } + } + } + else { throw new HttpError("Internal error", 500); } } - + /** * The cursor is base64 encoded in the following json format: * {"primary":{"isSlowHash":0},"secondary":{"hashTypeId":10810}} - * This containts a primary filter which is the main sorting filter, but to handle duplicates, it has an optional + * This contains a primary filter which is the main sorting filter, but to handle duplicates, it has an optional * secondary filter for when the primary filter is not unique. This way there is an unique secondary filter to * handle tie breaks. - * + * * @param mixed $primaryFilter The main filter that is sorted on * @param mixed $primaryId the value of the primaryFilter * @param bool $hasSecondaryFilter This is a boolean to set whether there is a secondary filter * @param mixed $secondaryFilter An unique secondary filter to use as a tiebreaker when the main filter is not unique * @param object $secondaryId The value of the secondary filter - - * @return string a base64 encoded json string that contains the filters. + * @return string a base64 encoded json string that contains the filters. */ - protected static function build_cursor($primaryFilter, $primaryId, $hasSecondaryFilter = false, - $secondaryFilter= null, $secondaryId = null) { + protected static function build_cursor($primaryFilter, $primaryId, $hasSecondaryFilter = false, $secondaryFilter = null, $secondaryId = null): string { $cursor = ["primary" => [$primaryFilter => $primaryId]]; if ($hasSecondaryFilter) { assert($secondaryId !== null && $secondaryFilter !== null, - "Secondary id and filter should be set"); + "Secondary id and filter should be set" + ); //Add the primary key as a secondary cursor to guarantee the cursor is unique $cursor["secondary"] = [$secondaryFilter => $secondaryId]; } $json = json_encode($cursor); return urlencode(base64_encode($json)); } - + /** * Function to decode the cursor from base64 format - * + * * @param string $encoded_cursor in base64 format - * - * @return string the decoded cursor in a json string format + * + * @return string the decoded cursor in a json string format + * @throws HttpError */ - protected static function decode_cursor(string $encoded_cursor) { + protected static function decode_cursor(string $encoded_cursor): string { $json = base64_decode($encoded_cursor); if ($json == false) { throw new HttpError("Invallid pagination cursor, cursor has to be base64 encoded"); @@ -511,36 +528,39 @@ protected static function decode_cursor(string $encoded_cursor) { } return $cursor; } - - protected static function compare_keys($key1, $key2, $isNegativeSort) { + + protected static function compare_keys($key1, $key2, $isNegativeSort): bool|int { if (is_string($key1) && is_string($key2)) { - if ($isNegativeSort){ + if ($isNegativeSort) { return strcmp($key2, $key1); - } else { + } + else { return strcmp($key1, $key2); } - } else { + } + else { if ($isNegativeSort) { return $key2 > $key1; - } else { + } + else { return $key1 > $key2; } } } - + protected static function getMinMaxCursor($apiClass, string $sort, array $filters, $request, $aliasedfeatures) { $filters[Factory::LIMIT] = new LimitFilter(1); $primaryKey = $apiClass->getPrimaryKey(); // Descending queries are used to retrieve the last element. For this all sorts have to be reversed, since // if all order quereis are reversed and limit to 1, you will retrieve the last element. - $reverseSort = ($sort == "DESC") ? true : false; + $reverseSort = $sort == "DESC"; $orderTemplates = $apiClass->makeOrderFilterTemplates($request, $aliasedfeatures, $sort, $reverseSort); $orderFilters = []; $joinFilters = []; foreach ($orderTemplates as $orderTemplate) { $orderFilters[] = new OrderFilter($orderTemplate['by'], $orderTemplate['type'], $orderTemplate['factory']); - if ($orderTemplate['factory'] !== null){ - // if factory of ordertemplate is not null, sort is happening on joined table + if ($orderTemplate['factory'] !== null) { + // if factory of orderTemplate is not null, sort is happening on joined table $otherFactory = $orderTemplate['factory']; $joinFilters[] = new JoinFilter($otherFactory, $orderTemplate['joinKey'], $apiClass->getPrimaryKeyOther($otherFactory->getNullObject()::class)); } @@ -560,46 +580,47 @@ protected static function getMinMaxCursor($apiClass, string $sort, array $filter } return $result[0]; } - + /** * overridable function to parse filters, currently only needed for taskWrapper endpoint - * to handle the taskwrapper -> task relation, to be able to treat it as a to one relationship + * to handle the taskWrapper -> task relation, to be able to treat it as a to one relationship */ - protected function parseFilters(array $filters) { + protected function parseFilters(array $filters): array { return $filters; } - + /** * API entry point for requesting multiple objects * @throws HttpError */ public static function getManyResources(object $apiClass, Request $request, Response $response, array $relationFs = []): Response { $apiClass->preCommon($request); - + $aliasedfeatures = $apiClass->getAliasedFeatures(); $factory = $apiClass->getFactory(); - + $defaultPageSize = 10000; $maxPageSize = 50000; // TODO: if 0.14.4 release has happened, following parameters can be retrieved from config // $defaultPageSize = SConfig::getInstance()->getVal(DConfig::DEFAULT_PAGE_SIZE); // $maxPageSize = SConfig::getInstance()->getVal(DConfig::MAX_PAGE_SIZE); - + $pageAfter = $apiClass->getQueryParameterFamilyMember($request, 'page', 'after'); $pageBefore = $apiClass->getQueryParameterFamilyMember($request, 'page', 'before'); $pageSize = $apiClass->getQueryParameterFamilyMember($request, 'page', 'size') ?? $defaultPageSize; if (!is_numeric($pageSize) || $pageSize < 0) { throw new HttpError("Invalid parameter, page[size] must be a positive integer"); - } elseif ($pageSize > $maxPageSize) { + } + elseif ($pageSize > $maxPageSize) { throw new HttpError(sprintf("You requested a size of %d, but %d is the maximum.", $pageSize, $maxPageSize)); } - + $validExpandables = $apiClass::getExpandables(); $expands = $apiClass->makeExpandables($request, $validExpandables); - + /* Object filter definition */ $aFs = []; - + /* Generate filters */ $filters = $apiClass->getFilters($request); $qFs_Filter = $apiClass->makeFilter($filters, $apiClass); @@ -617,58 +638,63 @@ public static function getManyResources(object $apiClass, Request $request, Resp if (count($qFs_Filter) > 0) { $aFs[Factory::FILTER] = $qFs_Filter; } - + /** * Create pagination - * + * * TODO: Deny pagination with un-stable sorting */ $sortList = $apiClass->getQueryParameterAsList($request, 'sort'); $isNegativeSort = $sortList != null && $sortList[0][0] == '-'; //this is used to reverse the array to show the data correctly for the user $reverseArray = false; - + $firstCursorObject = $apiClass->getMinMaxCursor($apiClass, "ASC", $aFs, $request, $aliasedfeatures); $lastCursorObject = $apiClass->getMinMaxCursor($apiClass, "DESC", $aFs, $request, $aliasedfeatures); - + if (!$isNegativeSort && !isset($pageBefore) && isset($pageAfter)) { // this happens when going to the next page while having an ascending sort $defaultSort = "ASC"; $reverseArray = false; $operator = ">"; $paginationCursor = $pageAfter; - } else if (!$isNegativeSort && isset($pageBefore) && !isset($pageAfter)) { + } + else if (!$isNegativeSort && isset($pageBefore) && !isset($pageAfter)) { // this happens when going to the previous page while having an ascending sort $defaultSort = "DESC"; $reverseArray = true; $operator = "<"; $paginationCursor = $pageBefore; - } else if ($isNegativeSort && (isset($pageBefore) && !isset($pageAfter))) { + } + else if ($isNegativeSort && (isset($pageBefore) && !isset($pageAfter))) { // this happens when going to the previous page while having a descending sort $defaultSort = "ASC"; $reverseArray = true; $operator = ">"; $paginationCursor = $pageBefore; - } else if ($isNegativeSort && isset($pageAfter) && !isset($pageBefore)) { + } + else if ($isNegativeSort && isset($pageAfter) && !isset($pageBefore)) { // this happens when going to the next page while having an ascending sort $defaultSort = "DESC"; $reverseArray = false; $operator = "<"; $paginationCursor = $pageAfter; - } else if ($isNegativeSort) { + } + else if ($isNegativeSort) { //the default negative case to retrieve the first elements in a descending way $defaultSort = "DESC"; - } else { + } + else { $defaultSort = "ASC"; } $primaryKey = $apiClass->getPrimaryKey(); - + $orderTemplates = $apiClass->makeOrderFilterTemplates($request, $aliasedfeatures, $defaultSort); $orderTemplates[0]["type"] = $defaultSort; $primaryFilter = $orderTemplates[0]['by']; $orderFilters = []; $joinFilters = []; - + // Build actual order filters foreach ($orderTemplates as $orderTemplate) { // $aFs[Factory::ORDER][] = new OrderFilter($orderTemplate['by'], $orderTemplate['type']); @@ -679,22 +705,22 @@ public static function getManyResources(object $apiClass, Request $request, Resp $joinFilters[] = new JoinFilter($otherFactory, $orderTemplate['joinKey'], $orderTemplate['key']); } } - + $aFs[Factory::ORDER] = $orderFilters; $aFs[Factory::JOIN] = $joinFilters; - + /* Include relation filters */ $finalFs = array_merge($aFs, $relationFs); $finalFs = $apiClass->parseFilters($finalFs); - + //TODO it would be even better if its possible to see if the primary filter is unique, instead of primary key. //But this probably needs to be added in getFeatures() then. $primaryKeyIsNotPrimaryFilter = $primaryFilter != $primaryKey; $total = $factory->countFilter($finalFs); - + //pagination filters need to be added after max has been calculated $finalFs[Factory::LIMIT] = new LimitFilter($pageSize); - + if (isset($paginationCursor) && isset($operator)) { $decoded_cursor = $apiClass->decode_cursor($paginationCursor); $primary_cursor = $decoded_cursor["primary"]; @@ -703,18 +729,20 @@ public static function getManyResources(object $apiClass, Request $request, Resp $primary_cursor_key = $primary_cursor_key == 'id' ? array_column($aliasedfeatures, 'alias', 'dbname')[$apiClass->getPrimaryKey()] : $primary_cursor_key; $secondary_cursor = $decoded_cursor["secondary"]; if ($secondary_cursor) { - $secondary_cursor_key = key($secondary_cursor); - $secondary_cursor_key = $secondary_cursor_key == '_id' ? array_column($aliasedfeatures, 'alias', 'dbname')[$apiClass->getPrimaryKey()] : $secondary_cursor_key; - $finalFs[Factory::FILTER][] = new PaginationFilter($primary_cursor_key, current($primary_cursor), - $operator, $secondary_cursor_key, current($secondary_cursor), $qFs_Filter); - } else { + $secondary_cursor_key = key($secondary_cursor); + $secondary_cursor_key = $secondary_cursor_key == '_id' ? array_column($aliasedfeatures, 'alias', 'dbname')[$apiClass->getPrimaryKey()] : $secondary_cursor_key; + $finalFs[Factory::FILTER][] = new PaginationFilter($primary_cursor_key, current($primary_cursor), + $operator, $secondary_cursor_key, current($secondary_cursor), $qFs_Filter + ); + } + else { $finalFs[Factory::FILTER][] = new QueryFilter($primary_cursor_key, current($primary_cursor), $operator, $factory); } } - + /* Request objects */ $filterObjects = $factory->filter($finalFs); - + /* JOIN statements will return related modules as well, discard for now */ if (array_key_exists(Factory::JOIN, $finalFs)) { $objects = $filterObjects[$factory->getModelname()]; @@ -725,28 +753,28 @@ public static function getManyResources(object $apiClass, Request $request, Resp if ($reverseArray) { $objects = array_reverse($objects); } - + /* Resolve all expandables */ $expandResult = []; foreach ($expands as $expand) { // mapping from $objectId -> result objects in $expandResult[$expand] = $apiClass->fetchExpandObjects($objects, $expand); } - + /* Convert objects to JSON:API */ $dataResources = []; $includedResources = []; - + // Convert objects to data resources foreach ($objects as $object) { // Create object $newObject = $apiClass->obj2Resource($object, $expandResult, $request->getQueryParams()['fields'] ?? null, $request->getQueryParams()['aggregate'] ?? null); $includedResources = $apiClass->processExpands($apiClass, $expands, $object, $expandResult, $includedResources, $request->getQueryParams()['fields'] ?? null, $request->getQueryParams()['aggregate'] ?? null); - + // Add to result output $dataResources[] = $newObject; } - + $baseUrl = Util::buildServerUrl(); //build last link $lastParams = $request->getQueryParams(); @@ -757,31 +785,33 @@ public static function getManyResources(object $apiClass, Request $request, Resp if ($primaryKeyIsNotPrimaryFilter && isset($lastCursorObject)) { $new_secondary_cursor = $apiClass::calculate_next_cursor($lastCursorObject->getId(), !$isNegativeSort); $last_cursor = $apiClass::build_cursor($primaryFilter, $lastCursorObject->expose()[$primaryFilter], $primaryKeyIsNotPrimaryFilter, $primaryKey, $new_secondary_cursor); - } else if (isset($lastCursorObject)){ + } + else if (isset($lastCursorObject)) { $new_cursor = $apiClass::calculate_next_cursor($lastCursorObject->getId(), !$isNegativeSort); $last_cursor = $apiClass::build_cursor($primaryFilter, $new_cursor); - } else { + } + else { $last_cursor = null; } $lastParams['page']['before'] = $last_cursor; - $linksLast = $baseUrl . $request->getUri()->getPath() . '?' . urldecode(http_build_query($lastParams)); - + $linksLast = $baseUrl . $request->getUri()->getPath() . '?' . urldecode(http_build_query($lastParams)); + // Build self link $selfParams = $request->getQueryParams(); - + if (isset($selfParams['page']['after'])) { $selfParams['page']['after'] = urlencode($selfParams['page']['after']); } if (isset($selfParams['page']['before'])) { $selfParams['page']['before'] = urlencode($selfParams['page']['before']); } - + $selfParams['page']['size'] = $pageSize; - $linksSelf = $baseUrl . $request->getUri()->getPath() . '?' . urldecode(http_build_query($selfParams)); - + $linksSelf = $baseUrl . $request->getUri()->getPath() . '?' . urldecode(http_build_query($selfParams)); + $linksNext = null; $linksPrev = null; - + if (!empty($objects)) { // retrieve last object in page and retrieve the attribute based on the filter $firstObject = $objects[0]->expose(); @@ -790,7 +820,7 @@ public static function getManyResources(object $apiClass, Request $request, Resp $nextId = $lastObject[$primaryFilter]; $nextPrimaryKey = $lastObject[$primaryKey]; $previousPrimaryKey = $firstObject[$primaryKey]; - + //only set next page when its not the last page if (isset($lastCursorObject) && $nextPrimaryKey !== $lastCursorObject->getId()) { $nextParams = $selfParams; @@ -798,7 +828,7 @@ public static function getManyResources(object $apiClass, Request $request, Resp $next_cursor = $apiClass::build_cursor($primaryFilter, $nextId, $primaryKeyIsNotPrimaryFilter, $primaryKey, $nextPrimaryKey); $nextParams['page']['after'] = $next_cursor; unset($nextParams['page']['before']); - $linksNext = $baseUrl . $request->getUri()->getPath() . '?' . urldecode(http_build_query($nextParams)); + $linksNext = $baseUrl . $request->getUri()->getPath() . '?' . urldecode(http_build_query($nextParams)); } // Build prev link //only set previous page when its not the first page @@ -808,35 +838,35 @@ public static function getManyResources(object $apiClass, Request $request, Resp $previous_cursor = $apiClass::build_cursor($primaryFilter, $prevId, $primaryKeyIsNotPrimaryFilter, $primaryKey, $previousPrimaryKey); $prevParams['page']['before'] = $previous_cursor; unset($prevParams['page']['after']); - $linksPrev = $baseUrl . $request->getUri()->getPath() . '?' . urldecode(http_build_query($prevParams)); + $linksPrev = $baseUrl . $request->getUri()->getPath() . '?' . urldecode(http_build_query($prevParams)); } } - + //build first link $firstParams = $request->getQueryParams(); unset($firstParams['page']['before']); $firstParams['page']['size'] = $pageSize; // $firstParams['page']['after'] = urlencode($min); unset($firstParams['page']['after']); - $linksFirst = $baseUrl . $request->getUri()->getPath() . '?' . urldecode(http_build_query($firstParams)); + $linksFirst = $baseUrl . $request->getUri()->getPath() . '?' . urldecode(http_build_query($firstParams)); $links = [ - "self" => $linksSelf, - "first" => $linksFirst, - "last" => $linksLast, - "next" => $linksNext, - "prev" => $linksPrev, - ]; - + "self" => $linksSelf, + "first" => $linksFirst, + "last" => $linksLast, + "next" => $linksNext, + "prev" => $linksPrev, + ]; + $metadata = ["page" => ["total_elements" => $total]]; if ($apiClass->permissionErrors !== null) { $metadata["Include errors"] = $apiClass->permissionErrors; } // Generate JSON:API GET output $ret = self::createJsonResponse($dataResources, $links, $includedResources, $metadata); - + $body = $response->getBody(); $body->write($apiClass->ret2json($ret)); - + return $response->withStatus(200) ->withHeader("Content-Type", 'application/vnd.api+json; ext="https://jsonapi.org/profiles/ethanresnick/cursor-pagination"'); } @@ -973,6 +1003,7 @@ public function count(Request $request, Response $response, array $args): Respon * @throws HttpForbidden * @throws NotFoundExceptionInterface * @throws ResourceNotFoundError + * @throws HttpError */ public function getOne(Request $request, Response $response, array $args): Response { $this->preCommon($request); @@ -982,7 +1013,7 @@ public function getOne(Request $request, Response $response, array $args): Respo return self::getOneResource($this, $object, $request, $response); } - + /** * API entry point for modification of single object * @param Request $request @@ -999,7 +1030,7 @@ public function patchSingleObject(Request $request, Response $response, mixed $o if (!$this->validateResourceRecord($data)) { return errorResponse($response, "No valid resource identifier object was given as data!", 403); } - + $attributes = $data['attributes']; $aliasedFeatures = $this->getAliasedFeatures(); @@ -1025,6 +1056,11 @@ public function patchSingleObject(Request $request, Response $response, mixed $o * @param Request $request * @param Response $response * @param array $args + * @return Response + * @throws HTException + * @throws HttpError + * @throws HttpForbidden + * @throws ResourceNotFoundError */ public function patchOne(Request $request, Response $response, array $args): Response { $this->preCommon($request); @@ -1179,6 +1215,7 @@ public function post(Request $request, Response $response, array $args): Respons * @throws InternalError * @throws NotFoundExceptionInterface * @throws ResourceNotFoundError + * @throws HttpError */ public function getToOneRelatedResource(Request $request, Response $response, array $args): Response { $this->preCommon($request); @@ -1238,6 +1275,7 @@ public function getToOneRelatedResource(Request $request, Response $response, ar * @throws JsonException * @throws NotFoundExceptionInterface * @throws ResourceNotFoundError + * @throws HttpError */ public function getToOneRelationshipLink(Request $request, Response $response, array $args): Response { $this->preCommon($request); @@ -1425,6 +1463,7 @@ public function getToManyRelatedResource(Request $request, Response $response, a * @throws JsonException * @throws NotFoundExceptionInterface * @throws ResourceNotFoundError + * @throws HttpError */ public function getToManyRelationshipLink(Request $request, Response $response, array $args): Response { $this->preCommon($request); diff --git a/src/inc/apiv2/common/ClassMapper.php b/src/inc/apiv2/common/ClassMapper.php new file mode 100644 index 000000000..31864d3ca --- /dev/null +++ b/src/inc/apiv2/common/ClassMapper.php @@ -0,0 +1,16 @@ +store[$key] = $value; + } + + public function get($key): string { + return $this->store[$key]; + } +} \ No newline at end of file diff --git a/src/inc/apiv2/common/ErrorHandler.class.php b/src/inc/apiv2/common/ErrorHandler.class.php deleted file mode 100644 index f73c7ada1..000000000 --- a/src/inc/apiv2/common/ErrorHandler.class.php +++ /dev/null @@ -1,47 +0,0 @@ -setStatus($status); - - $body = $response->getBody(); - $body->write($problem->asJson(true)); - - return $response - ->withHeader("Content-type", "application/problem+json") - ->withStatus($status); -} - -class ResourceNotFoundError extends Exception { - public function __construct(string $message = "Resource not found", int $code = 404) { - parent::__construct($message, $code); - } -} - -class HttpError extends Exception { - public function __construct(string $message = "Bad request", int $code = 400) { - parent::__construct($message, $code); - } -} - -class HttpForbidden extends Exception { - public function __construct(string $message = "Forbidden", int $code = 403) { - parent::__construct($message, $code); - } -} - -class HttpConflict extends Exception { - public function __construct(string $message = "Resource already exists", int $code = 409) { - parent::__construct($message, $code); - } -} - -class InternalError extends Exception { - public function __construct(string $message = "Internal error", int $code = 500) { - parent::__construct($message, $code); - } -} diff --git a/src/inc/apiv2/common/OpenAPISchemaUtils.php b/src/inc/apiv2/common/OpenAPISchemaUtils.php new file mode 100644 index 000000000..8acb876d3 --- /dev/null +++ b/src/inc/apiv2/common/OpenAPISchemaUtils.php @@ -0,0 +1,344 @@ + $type, + "type_format" => $type_format, + "type_enum" => $type_enum, + "subtype" => $sub_type + ]; + } + + static function parsePhpDoc($doc): array|string { + $cleanedDoc = preg_replace([ + '/^\/\*\*/', // Remove opening /** + '/\*\/$/', // Remove closing */ + '/^\s*\*\s?/m' // Remove leading * on each line + ], '', $doc); + //markdown friendly line end + return str_replace("\n", "
      ", $cleanedDoc); + } + + // "jsonapi": { + // "version": "1.1", + // "ext": [ + // "https://jsonapi.org/profiles/ethanresnick/cursor-pagination" + // ] + // }, + static function makeJsonApiHeader(): array { + return ["jsonapi" => [ + "type" => "object", + "properties" => [ + "version" => [ + "type" => "string", + "default" => "1.1" + ], + "ext" => [ + "type" => "string", + "default" => "https://jsonapi.org/profiles/ethanresnick/cursor-pagination" + ] + ] + ] + ]; + } + + // "links": { + // "self": "/api/v2/ui/hashlists?page[size]=10000", + // "first": "/api/v2/ui/hashlists?page[size]=10000&page[after]=0", + // "last": "/api/v2/ui/hashlists?page[size]=10000&page[before]=345", + // "next": null, + // "prev": "/api/v2/ui/hashlists?page[size]=10000&page[before]=114" + // }, + static function makeLinks($uri): array { + $self = $uri . "?page[size]=25"; + return ["links" => [ + "type" => "object", + "properties" => [ + "self" => [ + "type" => "string", + "default" => $self + ], + "first" => [ + "type" => "string", + "default" => $self . "&page[after]=0" + ], + "last" => [ + "type" => "string", + "default" => $self . "&page[before]=500" + ], + "next" => [ + "type" => "string", + "default" => $self . "&page[after]=25" + ], + "previous" => [ + "type" => "string", + "default" => $self . "&page[before]=25" + ] + ] + ] + ]; + } + + //TODO relationship array is unnecessarily indexed in the swagger UI + static function makeRelationships($class, $uri): array { + $properties = []; + $relationshipsNames = array_merge(array_keys($class->getToOneRelationships()), array_keys($class->getToManyRelationships())); + sort($relationshipsNames); + foreach ($relationshipsNames as $relationshipName) { + $self = $uri . "/relationships/" . $relationshipName; + $related = $uri . "/" . $relationshipName; + $properties[] = [ + "properties" => [ + $relationshipName => [ + "type" => "object", + "properties" => [ + "links" => [ + "type" => "object", + "properties" => [ + "self" => [ + "type" => "string", + "default" => $self + ], + "related" => [ + "type" => "string", + "default" => $related + ] + ] + ] + ] + ] + + ] + ]; + } + return $properties; + } + + static function getTUSHeader(): array { + return [ + "description" => "Indicates the TUS version the server supports. + Must always be set to `1.0.0` in compliant servers.", + "schema" => [ + "type" => "string", + "enum" => "enum: ['1.0.0']" + ] + ]; + } + + //TODO expandables array is unnecessarily indexed in the swagger UI + static function makeExpandables($class, $container): array { + $properties = []; + $expandables = array_merge($class->getToOneRelationships(), $class->getToManyRelationships()); + foreach ($expandables as $expand => $expandVal) { + $expandClass = $expandVal["relationType"]; + $expandApiClass = new ($container->get('classMapper')->get($expandClass))($container); + $properties[] = [ + "properties" => [ + "id" => [ + "type" => "integer" + ], + "type" => [ + "type" => "string", + "default" => $expand + ], + "attributes" => [ + "type" => "object", + "properties" => makeProperties($expandApiClass->getAliasedFeatures()) + ] + ] + ]; + }; + return $properties; + } + + static function mapToProperties($map): array { + $properties = array_map(function ($value) { + return [ + "type" => "string", + "default" => $value, + ]; + }, $map); + return [ + "type" => "array", + "items" => [ + "type" => "object", + "properties" => $properties + ] + ]; + } + + /** + * @throws HttpErrorException + */ + static function makeProperties($features, $skipPK = false): array { + $propertyVal = []; + foreach ($features as $feature) { + if ($skipPK && $feature['pk']) { + continue; + } + $ret = typeLookup($feature); + $propertyVal[$feature['alias']]["type"] = $ret["type"]; + if ($ret["type_format"] !== null) { + $propertyVal[$feature['alias']]["format"] = $ret["type_format"]; + } + if ($ret["type_enum"] !== null) { + $propertyVal[$feature['alias']]["enum"] = $ret["type_enum"]; + } + if ($ret["subtype"] !== null) { + $propertyVal[$feature['alias']]["items"]["type"] = $ret["subtype"]; + } + } + return $propertyVal; + } + + static function buildPatchPost($properties, $name, $id = null): array { + $result = ["data" => [ + "type" => "object", + "properties" => [ + "type" => [ + "type" => "string", + "default" => $name + ], + "attributes" => [ + "type" => "object", + "properties" => $properties + ] + ] + ] + ]; + + if ($id) { + $result["data"]["properties"]["id"] = [ + "type" => "integer", + ]; + } + return $result; + } + + /** + * This function builds the post/patch attributes for a relationship. When $istomany is false, + * it would build the attributes for a to one relationship. If it is true it will build it for a too many relationship. + * */ + static function buildPostPatchRelation($name, $isToMany): array { + $resourceRecord = [ + "type" => "object", + "properties" => [ + "type" => [ + "type" => "string", + "default" => $name + ], + "id" => [ + "type" => "integer", + "default" => 1 + ] + ] + ]; + if ($isToMany) { + return ["data" => [ + "type" => "array", + "items" => $resourceRecord + ] + ]; + } + else { + return ["data" => $resourceRecord]; + } + } + + static function makeDescription($isRelation, $method, $singleObject): string { + $description = ""; + switch ($method) { + case "get": + if ($isRelation) { + if ($singleObject) { + $description = "GET request for for a to-one relationship link. Returns the resource record of the object that is part of the specified relation."; + } + else { + $description = "GET request for a to-many relationship link. Returns a list of resource records of objects that are part of the specified relation."; + } + } + else { + if ($singleObject) { + $description = "GET request to retrieve a single object."; + } + else { + $description = "GET many request to retrieve multiple objects."; + } + } + break; + case "post": + if ($isRelation) { + if ($singleObject) { + $description = "POST request to create a to-one relationship link."; + } + else { + $description = "POST request to create a to-many relationship link."; + } + } + else { + $description = "POST request to create a new object. The request must contain the resource record as data with the attributes of the new object." + . "To add relationships, a relationships object can be added with the resource records of the relations that are part of this object."; + } + break; + case "patch": + if ($isRelation) { + if ($singleObject) { + $description = "PATCH request to update a to one relationship."; + } + else { + $description = "PATCH request to update a to-many relationship link."; + } + } + else { + $description = "PATCH request to update attributes of a single object."; + } + } + return $description; + } +} \ No newline at end of file diff --git a/src/inc/apiv2/common/openAPISchema.routes.php b/src/inc/apiv2/common/openAPISchema.routes.php index be678bb25..871fab62b 100644 --- a/src/inc/apiv2/common/openAPISchema.routes.php +++ b/src/inc/apiv2/common/openAPISchema.routes.php @@ -1,356 +1,15 @@ $type, - "type_format" => $type_format, - "type_enum" => $type_enum, - "subtype" => $sub_type - ]; -} - -; - -function parsePhpDoc($doc): array|string { - $cleanedDoc = preg_replace([ - '/^\/\*\*/', // Remove opening /** - '/\*\/$/', // Remove closing */ - '/^\s*\*\s?/m' // Remove leading * on each line - ], '', $doc); - //markdown friendly line end - return str_replace("\n", "
      ", $cleanedDoc); -} - - -// "jsonapi": { -// "version": "1.1", -// "ext": [ -// "https://jsonapi.org/profiles/ethanresnick/cursor-pagination" -// ] -// }, -function makeJsonApiHeader(): array { - return ["jsonapi" => [ - "type" => "object", - "properties" => [ - "version" => [ - "type" => "string", - "default" => "1.1" - ], - "ext" => [ - "type" => "string", - "default" => "https://jsonapi.org/profiles/ethanresnick/cursor-pagination" - ] - ] - ] - ]; -} - -// "links": { -// "self": "/api/v2/ui/hashlists?page[size]=10000", -// "first": "/api/v2/ui/hashlists?page[size]=10000&page[after]=0", -// "last": "/api/v2/ui/hashlists?page[size]=10000&page[before]=345", -// "next": null, -// "prev": "/api/v2/ui/hashlists?page[size]=10000&page[before]=114" -// }, -function makeLinks($uri): array { - $self = $uri . "?page[size]=25"; - return ["links" => [ - "type" => "object", - "properties" => [ - "self" => [ - "type" => "string", - "default" => $self - ], - "first" => [ - "type" => "string", - "default" => $self . "&page[after]=0" - ], - "last" => [ - "type" => "string", - "default" => $self . "&page[before]=500" - ], - "next" => [ - "type" => "string", - "default" => $self . "&page[after]=25" - ], - "previous" => [ - "type" => "string", - "default" => $self . "&page[before]=25" - ] - ] - ] - ]; -} - -//TODO relationship array is unnecessarily indexed in the swagger UI -function makeRelationships($class, $uri): array { - $properties = []; - $relationshipsNames = array_merge(array_keys($class->getToOneRelationships()), array_keys($class->getToManyRelationships())); - sort($relationshipsNames); - foreach ($relationshipsNames as $relationshipName) { - $self = $uri . "/relationships/" . $relationshipName; - $related = $uri . "/" . $relationshipName; - $properties[] = [ - "properties" => [ - $relationshipName => [ - "type" => "object", - "properties" => [ - "links" => [ - "type" => "object", - "properties" => [ - "self" => [ - "type" => "string", - "default" => $self - ], - "related" => [ - "type" => "string", - "default" => $related - ] - ] - ] - ] - ] - - ] - ]; - } - return $properties; -} - -function getTUSheader(): array { - return [ - "description" => "Indicates the TUS version the server supports. - Must always be set to `1.0.0` in compliant servers.", - "schema" => [ - "type" => "string", - "enum" => "enum: ['1.0.0']" - ] - ]; -} - -//TODO expandables array is unnecessarily indexed in the swagger UI -function makeExpandables($class, $container): array { - $properties = []; - $expandables = array_merge($class->getToOneRelationships(), $class->getToManyRelationships()); - foreach ($expandables as $expand => $expandVal) { - $expandClass = $expandVal["relationType"]; - $expandApiClass = new ($container->get('classMapper')->get($expandClass))($container); - $properties[] = [ - "properties" => [ - "id" => [ - "type" => "integer" - ], - "type" => [ - "type" => "string", - "default" => $expand - ], - "attributes" => [ - "type" => "object", - "properties" => makeProperties($expandApiClass->getAliasedFeatures()) - ] - ] - ]; - }; - return $properties; -} - -function mapToProperties($map): array { - $properties = array_map(function ($value) { - return [ - "type" => "string", - "default" => $value, - ]; - }, $map); - return [ - "type" => "array", - "items" => [ - "type" => "object", - "properties" => $properties - ] - ]; -} - -/** - * @throws HttpErrorException - */ -function makeProperties($features, $skipPK = false): array { - $propertyVal = []; - foreach ($features as $feature) { - if ($skipPK && $feature['pk']) { - continue; - } - $ret = typeLookup($feature); - $propertyVal[$feature['alias']]["type"] = $ret["type"]; - if ($ret["type_format"] !== null) { - $propertyVal[$feature['alias']]["format"] = $ret["type_format"]; - } - if ($ret["type_enum"] !== null) { - $propertyVal[$feature['alias']]["enum"] = $ret["type_enum"]; - } - if ($ret["subtype"] !== null) { - $propertyVal[$feature['alias']]["items"]["type"] = $ret["subtype"]; - } - } - return $propertyVal; -} - -; - -function buildPatchPost($properties, $name, $id = null): array { - $result = ["data" => [ - "type" => "object", - "properties" => [ - "type" => [ - "type" => "string", - "default" => $name - ], - "attributes" => [ - "type" => "object", - "properties" => $properties - ] - ] - ] - ]; - - if ($id) { - $result["data"]["properties"]["id"] = [ - "type" => "integer", - ]; - } - return $result; -} - -/** - * This function builds the post/patch attributes for a relationship. When $istomany is false, - * it would build the attributes for a to one relationship. If it is true it will build it for a too many relationship. - * */ -function buildPostPatchRelation($name, $isToMany): array { - $resourceRecord = [ - "type" => "object", - "properties" => [ - "type" => [ - "type" => "string", - "default" => $name - ], - "id" => [ - "type" => "integer", - "default" => 1 - ] - ] - ]; - if ($isToMany) { - return ["data" => [ - "type" => "array", - "items" => $resourceRecord - ] - ]; - } - else { - return ["data" => $resourceRecord]; - } -} - -function makeDescription($isRelation, $method, $singleObject): string { - $description = ""; - switch ($method) { - case "get": - if ($isRelation) { - if ($singleObject) { - $description = "GET request for for a to-one relationship link. Returns the resource record of the object that is part of the specified relation."; - } - else { - $description = "GET request for a to-many relationship link. Returns a list of resource records of objects that are part of the specified relation."; - } - } - else { - if ($singleObject) { - $description = "GET request to retrieve a single object."; - } - else { - $description = "GET many request to retrieve multiple objects."; - } - } - break; - case "post": - if ($isRelation) { - if ($singleObject) { - $description = "POST request to create a to-one relationship link."; - } - else { - $description = "POST request to create a to-many relationship link."; - } - } - else { - $description = "POST request to create a new object. The request must contain the resource record as data with the attributes of the new object." - . "To add relationships, a relationships object can be added with the resource records of the relations that are part of this object."; - } - break; - case "patch": - if ($isRelation) { - if ($singleObject) { - $description = "PATCH request to update a to one relationship."; - } - else { - $description = "PATCH request to update a to-many relationship link."; - } - } - else { - $description = "PATCH request to update attributes of a single object."; - } - } - return $description; -} - use Slim\App; /** @var App $app */ $app->group("/api/v2/openapi.json", function (RouteCollectorProxy $group) use ($app) { @@ -467,9 +126,9 @@ function makeDescription($isRelation, $method, $singleObject): string { $name = $class::class; $apiMethod = ($apiMethod == "processPost" && $name !== "ImportFileHelperAPI") ? "actionPost" : $apiMethod; $reflectionApiMethod = new ReflectionMethod($name, $apiMethod); - $paths[$path][$method]["description"] = parsePhpDoc($reflectionApiMethod->getDocComment()); + $paths[$path][$method]["description"] = OpenAPISchemaUtils::parsePhpDoc($reflectionApiMethod->getDocComment()); $parameters = $class->getCreateValidFeatures(); - $properties = makeProperties($parameters); + $properties = OpenAPISchemaUtils::makeProperties($parameters); $components[$name] = [ "type" => "object", @@ -477,7 +136,7 @@ function makeDescription($isRelation, $method, $singleObject): string { ]; if ($method == "post") { $reflectionMethodFormFields = new ReflectionMethod($name, "getFormFields"); - $bodyDescription = parsePhpDoc($reflectionMethodFormFields->getDocComment()); + $bodyDescription = OpenAPISchemaUtils::parsePhpDoc($reflectionMethodFormFields->getDocComment()); $paths[$path][$method]["requestBody"] = [ "description" => $bodyDescription, "required" => true, @@ -496,7 +155,7 @@ function makeDescription($isRelation, $method, $singleObject): string { $request_response = $class->getResponse(); $ref = null; if (is_array($request_response)) { - $responseProperties = mapToProperties($request_response); + $responseProperties = OpenAPISchemaUtils::mapToProperties($request_response); $components[$name . "Response"] = $responseProperties; $ref = "#/components/schemas/" . $name . "Response"; } @@ -563,7 +222,7 @@ function makeDescription($isRelation, $method, $singleObject): string { ], "attributes" => [ "type" => "object", - "properties" => makeProperties($class->getFeaturesWithoutFormfields(), true) + "properties" => OpenAPISchemaUtils::makeProperties($class->getFeaturesWithoutFormfields(), true) ], ] ] @@ -572,27 +231,27 @@ function makeDescription($isRelation, $method, $singleObject): string { $relationships = ["relationships" => [ "type" => "object", - "properties" => makeRelationships($class, $uri) + "properties" => OpenAPISchemaUtils::makeRelationships($class, $uri) ] ]; $included = ["included" => [ "type" => "array", "items" => [ "type" => "object", - "properties" => makeExpandables($class, $app->getContainer()) + "properties" => OpenAPISchemaUtils::makeExpandables($class, $app->getContainer()) ], ] ]; $properties_get_single = array_merge($properties_return_post_patch, $relationships, $included); - $json_api_header = makeJsonApiHeader(); - $links = makeLinks($uri); + $json_api_header = OpenAPISchemaUtils::makeJsonApiHeader(); + $links = OpenAPISchemaUtils::makeLinks($uri); $properties_return_post_patch = array_merge($json_api_header, $properties_return_post_patch); - $properties_create = buildPatchPost(makeProperties($class->getAllPostParameters($class->getCreateValidFeatures())), $name); + $properties_create = OpenAPISchemaUtils::buildPatchPost(OpenAPISchemaUtils::makeProperties($class->getAllPostParameters($class->getCreateValidFeatures())), $name); $properties_get = array_merge($json_api_header, $links, $properties_get_single, $included); - $properties_patch = buildPatchPost(makeProperties($class->getPatchValidFeatures(), true), $name); - $properties_patch_post_relation = buildPostPatchRelation($relation, ($isToMany && !$isToOne)); + $properties_patch = OpenAPISchemaUtils::buildPatchPost(OpenAPISchemaUtils::makeProperties($class->getPatchValidFeatures(), true), $name); + $properties_patch_post_relation = OpenAPISchemaUtils::buildPostPatchRelation($relation, ($isToMany && !$isToOne)); $responseGetRelation = $properties_patch_post_relation; $components[$name . "Create"] = @@ -702,7 +361,7 @@ function makeDescription($isRelation, $method, $singleObject): string { ] ]; - $paths[$path][$method]["description"] = makeDescription($isRelation, $method, $singleObject); + $paths[$path][$method]["description"] = OpenAPISchemaUtils::makeDescription($isRelation, $method, $singleObject); if ($isRelation && in_array($method, ["post", "patch", "delete"], true)) { $paths[$path][$method]["responses"]["204"] = @@ -1195,7 +854,7 @@ function makeDescription($isRelation, $method, $singleObject): string { $paths["/api/v2/helper/importFile/{id:[0-9]{14}-[0-9a-f]{32}}"]["head"]["responses"]["200"] = [ "description" => "successful request", "headers" => [ - "Tus-Resumable" => getTUSheader(), + "Tus-Resumable" => OpenAPISchemaUtils::getTUSHeader(), "Upload-Offset" => [ "description" => "Number of bytes already received", "schema" => [ @@ -1226,7 +885,7 @@ function makeDescription($isRelation, $method, $singleObject): string { $paths["/api/v2/helper/importFile"]["post"]["responses"]["201"] = [ "description" => "successful operation", "headers" => [ - "Tus-Resumable" => getTUSheader(), + "Tus-Resumable" => OpenAPISchemaUtils::getTUSHeader(), "Location" => [ "description" => "Location of the file where the user can push to.", "schema" => [ @@ -1244,7 +903,7 @@ function makeDescription($isRelation, $method, $singleObject): string { $paths["/api/v2/helper/importFile/{id:[0-9]{14}-[0-9a-f]{32}}"]["patch"]["responses"]["204"] = [ "description" => "Chunk accepted", "headers" => [ - "Tus-Resumable" => getTUSheader(), + "Tus-Resumable" => OpenAPISchemaUtils::getTUSHeader(), "Upload-Offset" => [ "description" => "The new offset after the chunk is accepted. Indicates how many bytes were received so far.", "schema" => [ diff --git a/src/inc/apiv2/error/ErrorHandler.php b/src/inc/apiv2/error/ErrorHandler.php new file mode 100644 index 000000000..f40022525 --- /dev/null +++ b/src/inc/apiv2/error/ErrorHandler.php @@ -0,0 +1,21 @@ +setStatus($status); + + $body = $response->getBody(); + $body->write($problem->asJson(true)); + + return $response + ->withHeader("Content-type", "application/problem+json") + ->withStatus($status); + } +} \ No newline at end of file diff --git a/src/inc/apiv2/error/HttpConflict.php b/src/inc/apiv2/error/HttpConflict.php new file mode 100644 index 000000000..1b32855ed --- /dev/null +++ b/src/inc/apiv2/error/HttpConflict.php @@ -0,0 +1,10 @@ +getId(), $this->getCurrentUser()); return self::getResponse(); } -} - -use Slim\App; -/** @var App $app */ -AbortChunkHelperAPI::register($app); \ No newline at end of file +} \ No newline at end of file diff --git a/src/inc/apiv2/helper/assignAgent.routes.php b/src/inc/apiv2/helper/AssignAgentHelperAPI.php similarity index 79% rename from src/inc/apiv2/helper/assignAgent.routes.php rename to src/inc/apiv2/helper/AssignAgentHelperAPI.php index d91add758..37960eec7 100644 --- a/src/inc/apiv2/helper/assignAgent.routes.php +++ b/src/inc/apiv2/helper/AssignAgentHelperAPI.php @@ -1,9 +1,13 @@ getCurrentUser()); @@ -44,7 +49,3 @@ public function actionPost($data): object|array|null { return self::getResponse(); } } - -use Slim\App; -/** @var App $app */ -AssignAgentHelperAPI::register($app); \ No newline at end of file diff --git a/src/inc/apiv2/helper/bulkSupertaskBuilder.routes.php b/src/inc/apiv2/helper/BulkSupertaskBuilderHelperAPI.php similarity index 84% rename from src/inc/apiv2/helper/bulkSupertaskBuilder.routes.php rename to src/inc/apiv2/helper/BulkSupertaskBuilderHelperAPI.php index b07ade2e2..ec9b7b9ef 100644 --- a/src/inc/apiv2/helper/bulkSupertaskBuilder.routes.php +++ b/src/inc/apiv2/helper/BulkSupertaskBuilderHelperAPI.php @@ -1,9 +1,12 @@ getUser()); } } - -use Slim\App; -/** @var App $app */ -BulkSupertaskBuilderHelperAPI::register($app); \ No newline at end of file diff --git a/src/inc/apiv2/helper/changeOwnPassword.routes.php b/src/inc/apiv2/helper/ChangeOwnPasswordHelperAPI.php similarity index 88% rename from src/inc/apiv2/helper/changeOwnPassword.routes.php rename to src/inc/apiv2/helper/ChangeOwnPasswordHelperAPI.php index 60344f654..20ea156bc 100644 --- a/src/inc/apiv2/helper/changeOwnPassword.routes.php +++ b/src/inc/apiv2/helper/ChangeOwnPasswordHelperAPI.php @@ -1,6 +1,10 @@ getResponse(); } } - -use Slim\App; -/** @var App $app */ -ChangeOwnPasswordHelperAPI::register($app); \ No newline at end of file diff --git a/src/inc/apiv2/helper/createSuperHashlist.routes.php b/src/inc/apiv2/helper/CreateSuperHashlistHelperAPI.php similarity index 77% rename from src/inc/apiv2/helper/createSuperHashlist.routes.php rename to src/inc/apiv2/helper/CreateSuperHashlistHelperAPI.php index 20bce869a..d2fe36ffd 100644 --- a/src/inc/apiv2/helper/createSuperHashlist.routes.php +++ b/src/inc/apiv2/helper/CreateSuperHashlistHelperAPI.php @@ -1,13 +1,16 @@ getParsedBody()['data']; $this->preCommon($request); $user = $this->getCurrentUser(); @@ -63,7 +71,7 @@ public function actionPatch(Request $request, Response $response, array $args): $userRoute->setCurrentUser($user); return $userRoute->patchSingleObject($request, $response, $user, $data); } - + static public function register($app): void { $baseUri = currentUserHelperAPI::getBaseUri(); @@ -82,7 +90,3 @@ public static function getResponse(): array|string|null { return null; } } - -use Slim\App; -/** @var App $app */ -currentUserHelperAPI::register($app); diff --git a/src/inc/apiv2/helper/exportCrackedHashes.routes.php b/src/inc/apiv2/helper/ExportCrackedHashesHelperAPI.php similarity index 78% rename from src/inc/apiv2/helper/exportCrackedHashes.routes.php rename to src/inc/apiv2/helper/ExportCrackedHashesHelperAPI.php index fd104ca8f..f81d58cca 100644 --- a/src/inc/apiv2/helper/exportCrackedHashes.routes.php +++ b/src/inc/apiv2/helper/ExportCrackedHashesHelperAPI.php @@ -1,10 +1,13 @@ getId(), $this->getCurrentUser()); } } - -use Slim\App; -/** @var App $app */ -ExportCrackedHashesHelperAPI::register($app); \ No newline at end of file diff --git a/src/inc/apiv2/helper/exportLeftHashes.routes.php b/src/inc/apiv2/helper/ExportLeftHashesHelperAPI.php similarity index 78% rename from src/inc/apiv2/helper/exportLeftHashes.routes.php rename to src/inc/apiv2/helper/ExportLeftHashesHelperAPI.php index b24a00a66..0aae98dd5 100644 --- a/src/inc/apiv2/helper/exportLeftHashes.routes.php +++ b/src/inc/apiv2/helper/ExportLeftHashesHelperAPI.php @@ -1,10 +1,13 @@ getId(), $this->getCurrentUser()); } } - -use Slim\App; -/** @var App $app */ -ExportLeftHashesHelperAPI::register($app); \ No newline at end of file diff --git a/src/inc/apiv2/helper/exportWordlist.routes.php b/src/inc/apiv2/helper/ExportWordlistHelperAPI.php similarity index 79% rename from src/inc/apiv2/helper/exportWordlist.routes.php rename to src/inc/apiv2/helper/ExportWordlistHelperAPI.php index 1e980f3ab..e43edd279 100644 --- a/src/inc/apiv2/helper/exportWordlist.routes.php +++ b/src/inc/apiv2/helper/ExportWordlistHelperAPI.php @@ -1,10 +1,13 @@ preCommon($request); @@ -103,8 +103,4 @@ static public function register($app): void { }); $app->get($baseUri, "getAgentBinaryHelperAPI:handleGet"); } -} - -use Slim\App; -/** @var App $app */ -GetAgentBinaryHelperAPI::register($app); \ No newline at end of file +} \ No newline at end of file diff --git a/src/inc/apiv2/helper/getCracksOfTask.routes.php b/src/inc/apiv2/helper/GetCracksOfTaskHelper.php similarity index 74% rename from src/inc/apiv2/helper/getCracksOfTask.routes.php rename to src/inc/apiv2/helper/GetCracksOfTaskHelper.php index 0ba14ff94..4bb8f94bb 100644 --- a/src/inc/apiv2/helper/getCracksOfTask.routes.php +++ b/src/inc/apiv2/helper/GetCracksOfTaskHelper.php @@ -1,17 +1,25 @@ "query", - "name" => "task", - "schema" => [ - "type" => "integer", - "format" => "int32" - ], - "required" => true, - "example" => 1, - "description" => "The ID of the task." + "in" => "query", + "name" => "task", + "schema" => [ + "type" => "integer", + "format" => "int32" + ], + "required" => true, + "example" => 1, + "description" => "The ID of the task." ] ]; } @@ -59,7 +70,11 @@ public function getParamsSwagger(): array { * @param Request $request * @param Response $response * @return Response - * @throws HttpErrorException + * @throws HttpError + * @throws HTException + * @throws JsonException + * @throws ContainerExceptionInterface + * @throws NotFoundExceptionInterface */ public function handleGet(Request $request, Response $response): Response { $this->preCommon($request); @@ -107,7 +122,3 @@ static public function register($app): void { $app->get($baseUri, "getCracksOfTaskHelper:handleGet"); } } - -use Slim\App; -/** @var App $app */ -GetCracksOfTaskHelper::register($app); \ No newline at end of file diff --git a/src/inc/apiv2/helper/getFile.routes.php b/src/inc/apiv2/helper/GetFileHelperAPI.php similarity index 93% rename from src/inc/apiv2/helper/getFile.routes.php rename to src/inc/apiv2/helper/GetFileHelperAPI.php index ab0447d32..4880fa4fc 100644 --- a/src/inc/apiv2/helper/getFile.routes.php +++ b/src/inc/apiv2/helper/GetFileHelperAPI.php @@ -1,15 +1,18 @@ preCommon($request); @@ -109,7 +111,3 @@ static public function register($app): void { $app->get($baseUri, "getFileHelperAPI:handleGet"); } } - -use Slim\App; -/** @var App $app */ -GetFileHelperAPI::register($app); \ No newline at end of file diff --git a/src/inc/apiv2/helper/getTaskProgressImage.routes.php b/src/inc/apiv2/helper/GetTaskProgressImageHelperAPI.php similarity index 93% rename from src/inc/apiv2/helper/getTaskProgressImage.routes.php rename to src/inc/apiv2/helper/GetTaskProgressImageHelperAPI.php index e135c3347..674f7bf3a 100644 --- a/src/inc/apiv2/helper/getTaskProgressImage.routes.php +++ b/src/inc/apiv2/helper/GetTaskProgressImageHelperAPI.php @@ -1,17 +1,22 @@ preCommon($request); $task_id = $request->getQueryParams()['task'] ?? null; $supertask_id = $request->getQueryParams()['supertask'] ?? null; - + //check if task exists and get information if ($task_id) { $task = Factory::getTaskFactory()->get($task_id); @@ -97,16 +104,17 @@ public function handleGet(Request $request, Response $response): Response { if ($taskWrapper == null) { throw new HttpError("Invalid task wrapper!"); } - } else { + } + else { throw new HttpError("No task or super task has been provided"); } - + $size = array(1500, 32); - + //create image $image = imagecreatetruecolor($size[0], $size[1]); imagesavealpha($image, true); - + //set colors $transparency = imagecolorallocatealpha($image, 0, 0, 0, 127); $yellow = imagecolorallocate($image, 255, 255, 0); @@ -114,10 +122,10 @@ public function handleGet(Request $request, Response $response): Response { $grey = imagecolorallocate($image, 192, 192, 192); $green = imagecolorallocate($image, 0, 255, 0); $blue = imagecolorallocate($image, 60, 60, 245); - + //prepare image imagefill($image, 0, 0, $transparency); - + if ($taskWrapper->getTaskType() == DTaskTypes::SUPERTASK && isset($supertask_id)) { // handle supertask progress drawing here $qF = new QueryFilter(Task::TASK_WRAPPER_ID, $taskWrapper->getId(), "="); @@ -198,7 +206,7 @@ public function handleGet(Request $request, Response $response): Response { } } } - + //send image data to output ob_start(); imagepng($image); @@ -220,7 +228,3 @@ static public function register($app): void { $app->get($baseUri, "GetTaskProgressImageHelperAPI:handleGet"); } } - -use Slim\App; -/** @var App $app */ -GetTaskProgressImageHelperAPI::register($app); \ No newline at end of file diff --git a/src/inc/apiv2/helper/getUserPermission.routes.php b/src/inc/apiv2/helper/GetUserPermissionHelperAPI.php similarity index 88% rename from src/inc/apiv2/helper/getUserPermission.routes.php rename to src/inc/apiv2/helper/GetUserPermissionHelperAPI.php index 04ce44fce..b14d18a34 100644 --- a/src/inc/apiv2/helper/getUserPermission.routes.php +++ b/src/inc/apiv2/helper/GetUserPermissionHelperAPI.php @@ -1,13 +1,17 @@ withHeader("Content-Type", 'application/vnd.api+json;'); } + /** + * @throws HttpError + */ public function actionPost($data): object|array|null { throw new HttpError("GetAccessGroups has no POST"); } @@ -69,6 +75,3 @@ public static function getResponse(): array|string|null { } } -use Slim\App; -/** @var App $app */ -GetUserPermissionHelperAPI::register($app); diff --git a/src/inc/apiv2/helper/importCrackedHashes.routes.php b/src/inc/apiv2/helper/ImportCrackedHashesHelperAPI.php similarity index 88% rename from src/inc/apiv2/helper/importCrackedHashes.routes.php rename to src/inc/apiv2/helper/ImportCrackedHashesHelperAPI.php index c1a4755bc..cb9e3f75a 100644 --- a/src/inc/apiv2/helper/importCrackedHashes.routes.php +++ b/src/inc/apiv2/helper/ImportCrackedHashesHelperAPI.php @@ -1,9 +1,12 @@ get(DDirectories::TUS)->getVal() . DIRECTORY_SEPARATOR . 'uploads' . - DIRECTORY_SEPARATOR . basename($id) . ".part"; -} - -static function getMetaPath(string $id): string { - return Factory::getStoredValueFactory()->get(DDirectories::TUS)->getVal() . DIRECTORY_SEPARATOR . 'meta' - . DIRECTORY_SEPARATOR . basename($id) . ".meta"; -} - -static function getImportPath(string $id): string { - return Factory::getStoredValueFactory()->get(DDirectories::IMPORT)->getVal() . DIRECTORY_SEPARATOR . basename($id); -} - + static function getUploadPath(string $id): string { + return Factory::getStoredValueFactory()->get(DDirectories::TUS)->getVal() . DIRECTORY_SEPARATOR . 'uploads' . + DIRECTORY_SEPARATOR . basename($id) . ".part"; + } + + static function getMetaPath(string $id): string { + return Factory::getStoredValueFactory()->get(DDirectories::TUS)->getVal() . DIRECTORY_SEPARATOR . 'meta' + . DIRECTORY_SEPARATOR . basename($id) . ".meta"; + } + + static function getImportPath(string $id): string { + return Factory::getStoredValueFactory()->get(DDirectories::IMPORT)->getVal() . DIRECTORY_SEPARATOR . basename($id); + } + /** * Import file has no POST parameters */ @@ -166,7 +173,8 @@ function processPost(Request $request, Response $response, array $args): Respons if (($val = base64_decode($b64val, true)) === false) { $response->getBody()->write("Error Upload-Metadata '$key' invalid base64 encoding"); return $response->withStatus(400); - } else { + } + else { $update_metadata[$key] = $val; } } @@ -220,6 +228,7 @@ function processPost(Request $request, Response $response, array $args): Respons /** * Given the offset in the 'Upload Offset' header, the user can use this PATCH endpoint in order to resume the upload. + * @throws \Hashtopolis\inc\apiv2\common\HttpError */ function processPatch(Request $request, Response $response, array $args): Response { // Check for Content-Type: application/offset+octet-stream or return 415 @@ -318,12 +327,12 @@ function processPatch(Request $request, Response $response, array $args): Respon self::updateStorage($args['id'], $update); } } - + if (file_put_contents($filename, $chunk, FILE_APPEND) === false) { $response->getBody()->write('Failed to write to file'); return $response->withStatus(400); } - + clearstatcache(); $newSize = filesize($filename); @@ -352,7 +361,7 @@ function processPatch(Request $request, Response $response, array $args): Respon else { $statusMsg = "Next chunk please"; } - + $dt = (new DateTime())->setTimeStamp($ds['upload_expires']); $response->getBody()->write($statusMsg); return $response->withStatus(204) @@ -362,38 +371,38 @@ function processPatch(Request $request, Response $response, array $args): Respon ->withHeader('Upload-Expires', $dt->format(DateTimeInterface::RFC7231)) ->WithHeader("Access-Control-Expose-Headers", "Tus-Resumable, Upload-Length, Upload-Offset"); } - + function processDelete(Request $request, Response $response, array $args): Response { - /* Return 404 if entry is not found */ - $filename_upload = self::getUploadPath($args['id']); - $filename_meta = self::getMetaPath($args['id']); - $uploadExists = file_exists($filename_upload); - $metaExists = file_exists($filename_meta); - $isDeletedMeta = $isDeletedUpload = false; - if (!$uploadExists && !$metaExists) { - throw new HttpError("Upload ID doesnt exists"); - } - if ($uploadExists) { - $isDeletedUpload = unlink($filename_upload); - } - if ($metaExists) { - $isDeletedMeta = unlink($filename_meta); - } - - if (!$isDeletedMeta || !$isDeletedUpload) { + /* Return 404 if entry is not found */ + $filename_upload = self::getUploadPath($args['id']); + $filename_meta = self::getMetaPath($args['id']); + $uploadExists = file_exists($filename_upload); + $metaExists = file_exists($filename_meta); + $isDeletedMeta = $isDeletedUpload = false; + if (!$uploadExists && !$metaExists) { + throw new HttpError("Upload ID doesnt exists"); + } + if ($uploadExists) { + $isDeletedUpload = unlink($filename_upload); + } + if ($metaExists) { + $isDeletedMeta = unlink($filename_meta); + } + + if (!$isDeletedMeta || !$isDeletedUpload) { throw new HttpError("Something went wrong while deleting the files"); - } - - return $response->withStatus(204) - ->withHeader("Tus-Resumable", "1.0.0") - ->WithHeader("Access-Control-Expose-Headers", "Tus-Resumable"); + } + + return $response->withStatus(204) + ->withHeader("Tus-Resumable", "1.0.0") + ->WithHeader("Access-Control-Expose-Headers", "Tus-Resumable"); } - + /** * Scans the import-directory for files. Directories are ignored. * @return array of all files in the top-level directory /../import */ - function scanImportDirectory() { + function scanImportDirectory(): array { $directory = Factory::getStoredValueFactory()->get(DDirectories::IMPORT)->getVal() . "/"; if (file_exists($directory) && is_dir($directory)) { $importDirectory = opendir($directory); @@ -408,12 +417,12 @@ function scanImportDirectory() { } return array(); } - + function processGet(Request $request, Response $response, array $args): Response { $importFiles = $this->scanImportDirectory(); return self::getMetaResponse($importFiles, $request, $response); } - + static public function register(App $app): void { $me = get_called_class(); @@ -434,7 +443,7 @@ static public function register(App $app): void { $group->post('', $me . ":processPost")->setName($me . ":processPost"); $group->get('', $me . ":processGet")->setName($me . ":processGet"); }); - + $app->group($baseUri . "/{id:[0-9]{14}-[0-9a-f]{32}}", function (RouteCollectorProxy $group) use ($me) { /* Allow preflight requests */ $group->options('', function (Request $request, Response $response, array $args): Response { @@ -448,5 +457,3 @@ static public function register(App $app): void { } } -/** @var App $app */ -ImportFileHelperAPI::register($app); diff --git a/src/inc/apiv2/helper/maskSupertaskBuilder.routes.php b/src/inc/apiv2/helper/MaskSupertaskBuilderHelperAPI.php similarity index 83% rename from src/inc/apiv2/helper/maskSupertaskBuilder.routes.php rename to src/inc/apiv2/helper/MaskSupertaskBuilderHelperAPI.php index 5e702b4ff..7e92e7b28 100644 --- a/src/inc/apiv2/helper/maskSupertaskBuilder.routes.php +++ b/src/inc/apiv2/helper/MaskSupertaskBuilderHelperAPI.php @@ -1,9 +1,12 @@ getId(), $this->getCurrentUser()); return $this->getResponse(); } -} - -use Slim\App; -/** @var App $app */ -PurgeTaskHelperAPI::register($app); \ No newline at end of file +} \ No newline at end of file diff --git a/src/inc/apiv2/helper/rebuildChunkCache.routes.php b/src/inc/apiv2/helper/RebuildChunkCacheHelperAPI.php similarity index 71% rename from src/inc/apiv2/helper/rebuildChunkCache.routes.php rename to src/inc/apiv2/helper/RebuildChunkCacheHelperAPI.php index dfa3e6d2f..89b910639 100644 --- a/src/inc/apiv2/helper/rebuildChunkCache.routes.php +++ b/src/inc/apiv2/helper/RebuildChunkCacheHelperAPI.php @@ -1,11 +1,10 @@ getCurrentUser()); FileUtils::fileCountLines($data[File::FILE_ID]); @@ -49,7 +52,3 @@ public function actionPost($data): object|array|null { return $this->object2Array(FileUtils::getFile($data[File::FILE_ID], $this->getCurrentUser())); } } - -use Slim\App; -/** @var App $app */ -RecountFileLinesHelperAPI::register($app); \ No newline at end of file diff --git a/src/inc/apiv2/helper/rescanGlobalFiles.routes.php b/src/inc/apiv2/helper/RescanGlobalFilesHelperAPI.php similarity index 68% rename from src/inc/apiv2/helper/rescanGlobalFiles.routes.php rename to src/inc/apiv2/helper/RescanGlobalFilesHelperAPI.php index d24068fec..97e5161c1 100644 --- a/src/inc/apiv2/helper/rescanGlobalFiles.routes.php +++ b/src/inc/apiv2/helper/RescanGlobalFilesHelperAPI.php @@ -1,11 +1,11 @@ getResponse(); } } - -use Slim\App; -/** @var App $app */ -ResetChunkHelperAPI::register($app); \ No newline at end of file diff --git a/src/inc/apiv2/helper/resetUserPassword.routes.php b/src/inc/apiv2/helper/ResetUserPasswordHelperAPI.php similarity index 83% rename from src/inc/apiv2/helper/resetUserPassword.routes.php rename to src/inc/apiv2/helper/ResetUserPasswordHelperAPI.php index aa9339eb9..2e62c62db 100644 --- a/src/inc/apiv2/helper/resetUserPassword.routes.php +++ b/src/inc/apiv2/helper/ResetUserPasswordHelperAPI.php @@ -1,9 +1,12 @@ getResponse(); } } - -use Slim\App; -/** @var App $app */ -SetUserPasswordHelperAPI::register($app); \ No newline at end of file diff --git a/src/inc/apiv2/helper/taskExtraDetails.routes.php b/src/inc/apiv2/helper/TaskExtraDetailsHelper.php similarity index 84% rename from src/inc/apiv2/helper/taskExtraDetails.routes.php rename to src/inc/apiv2/helper/TaskExtraDetailsHelper.php index a939f606f..e766855fe 100644 --- a/src/inc/apiv2/helper/taskExtraDetails.routes.php +++ b/src/inc/apiv2/helper/TaskExtraDetailsHelper.php @@ -1,16 +1,19 @@ preCommon($request); - + $taskId = $request->getQueryParams()['task']; if ($taskId === null) { throw new HttpErrorException("No task query param has been provided"); @@ -47,7 +55,7 @@ public function handleGet(Request $request, Response $response): Response { if ($task === null) { throw new HttpErrorException("No task found for provided task ID"); } - + $qF = new QueryFilter(Chunk::TASK_ID, $taskId, "="); $chunks = Factory::getChunkFactory()->filter([Factory::FILTER => $qF]); $currentSpeed = 0; @@ -58,9 +66,9 @@ public function handleGet(Request $request, Response $response): Response { $currentSpeed += $chunk->getSpeed(); } } - + $timeChunks = $chunks; - usort($timeChunks, "Util::compareChunksTime"); + usort($timeChunks, "Hashtopolis\inc\Util"); $timeSpent = 0; $current = 0; foreach ($timeChunks as $c) { @@ -81,10 +89,13 @@ public function handleGet(Request $request, Response $response): Response { "currentSpeed" => $currentSpeed, "cprogress" => $cProgress, ]; - + return self::getMetaResponse($responseObject, $request, $response); } + /** + * @throws HttpError + */ public function actionPost($data): object|array|null { throw new HttpError("TaskExtraDetails has no POST"); } @@ -107,6 +118,3 @@ public static function getResponse(): array|string|null { } } -use Slim\App; -/** @var App $app */ -TaskExtraDetailsHelper::register($app); diff --git a/src/inc/apiv2/helper/unassignAgent.routes.php b/src/inc/apiv2/helper/UnassignAgentHelperAPI.php similarity index 74% rename from src/inc/apiv2/helper/unassignAgent.routes.php rename to src/inc/apiv2/helper/UnassignAgentHelperAPI.php index 56e0ef20e..071ed1f9a 100644 --- a/src/inc/apiv2/helper/unassignAgent.routes.php +++ b/src/inc/apiv2/helper/UnassignAgentHelperAPI.php @@ -1,9 +1,13 @@ getCurrentUser()); @@ -41,7 +46,3 @@ public function actionPost($data): object|array|null { return $this->getResponse(); } } - -use Slim\App; -/** @var App $app */ -UnassignAgentHelperAPI::register($app); \ No newline at end of file diff --git a/src/inc/apiv2/model/accessgroups.routes.php b/src/inc/apiv2/model/AccessGroupAPI.php similarity index 81% rename from src/inc/apiv2/model/accessgroups.routes.php rename to src/inc/apiv2/model/AccessGroupAPI.php index 91e6a8bdb..6a39ec6c3 100644 --- a/src/inc/apiv2/model/accessgroups.routes.php +++ b/src/inc/apiv2/model/AccessGroupAPI.php @@ -1,12 +1,15 @@ getId(); $qFs = []; $qFs[] = new QueryFilter(Chunk::AGENT_ID, $agentId, "="); $qFs[] = new QueryFilter(Chunk::STATE, DHashcatStatus::RUNNING, "="); - + $active_chunk = Factory::getChunkFactory()->filter([Factory::FILTER => $qFs], true); if ($active_chunk !== NULL) { $included_data["chunks"][$agentId] = [$active_chunk]; } - + return []; } @@ -127,7 +135,7 @@ public static function getToManyRelationships(): array { ], ]; } - + public static function getToOneRelationships(): array { return [ 'user' => [ @@ -139,6 +147,9 @@ public static function getToOneRelationships(): array { ]; } + /** + * @throws HttpError + */ protected function createObject(array $data): int { throw new HttpError("Agents cannot be created via API"); } @@ -150,7 +161,3 @@ protected function deleteObject(object $object): void { AgentUtils::delete($object->getId(), $this->getCurrentUser()); } } - -use Slim\App; -/** @var App $app */ -AgentAPI::register($app); diff --git a/src/inc/apiv2/model/agentassignments.routes.php b/src/inc/apiv2/model/AgentAssignmentAPI.php similarity index 79% rename from src/inc/apiv2/model/agentassignments.routes.php rename to src/inc/apiv2/model/AgentAssignmentAPI.php index 71b11a7c8..f47be5ca8 100644 --- a/src/inc/apiv2/model/agentassignments.routes.php +++ b/src/inc/apiv2/model/AgentAssignmentAPI.php @@ -1,20 +1,25 @@ getAgentId(), 0, $this->getCurrentUser()); } } - -use Slim\App; -/** @var App $app */ -AgentAssignmentAPI::register($app); \ No newline at end of file diff --git a/src/inc/apiv2/model/agentbinaries.routes.php b/src/inc/apiv2/model/AgentBinaryAPI.php similarity index 82% rename from src/inc/apiv2/model/agentbinaries.routes.php rename to src/inc/apiv2/model/AgentBinaryAPI.php index 878701584..219e8ab9a 100644 --- a/src/inc/apiv2/model/agentbinaries.routes.php +++ b/src/inc/apiv2/model/AgentBinaryAPI.php @@ -1,12 +1,13 @@ delete($object); } } - -use Slim\App; -/** @var App $app */ -AgentErrorAPI::register($app); \ No newline at end of file diff --git a/src/inc/apiv2/model/agentstats.routes.php b/src/inc/apiv2/model/AgentStatAPI.php similarity index 76% rename from src/inc/apiv2/model/agentstats.routes.php rename to src/inc/apiv2/model/AgentStatAPI.php index 1c36196f1..221385efa 100644 --- a/src/inc/apiv2/model/agentstats.routes.php +++ b/src/inc/apiv2/model/AgentStatAPI.php @@ -1,14 +1,18 @@ delete($object); } } - -use Slim\App; -/** @var App $app */ -AgentStatAPI::register($app); \ No newline at end of file diff --git a/src/inc/apiv2/model/chunks.routes.php b/src/inc/apiv2/model/ChunkAPI.php similarity index 80% rename from src/inc/apiv2/model/chunks.routes.php rename to src/inc/apiv2/model/ChunkAPI.php index 83bd91c93..afb271c61 100644 --- a/src/inc/apiv2/model/chunks.routes.php +++ b/src/inc/apiv2/model/ChunkAPI.php @@ -1,19 +1,23 @@ getId()); } } - -use Slim\App; -/** @var App $app */ -CrackerBinaryAPI::register($app); \ No newline at end of file diff --git a/src/inc/apiv2/model/crackertypes.routes.php b/src/inc/apiv2/model/CrackerBinaryTypeAPI.php similarity index 79% rename from src/inc/apiv2/model/crackertypes.routes.php rename to src/inc/apiv2/model/CrackerBinaryTypeAPI.php index a18dea9c9..7d9a7abb6 100644 --- a/src/inc/apiv2/model/crackertypes.routes.php +++ b/src/inc/apiv2/model/CrackerBinaryTypeAPI.php @@ -1,14 +1,16 @@ getId()); } } - -use Slim\App; -/** @var App $app */ -CrackerBinaryTypeAPI::register($app); \ No newline at end of file diff --git a/src/inc/apiv2/model/files.routes.php b/src/inc/apiv2/model/FileAPI.php similarity index 91% rename from src/inc/apiv2/model/files.routes.php rename to src/inc/apiv2/model/FileAPI.php index d1e5db037..ef030bc0b 100644 --- a/src/inc/apiv2/model/files.routes.php +++ b/src/inc/apiv2/model/FileAPI.php @@ -1,17 +1,24 @@ getId()); } } - -use Slim\App; -/** @var App $app */ -HashTypeAPI::register($app); \ No newline at end of file diff --git a/src/inc/apiv2/model/hashlists.routes.php b/src/inc/apiv2/model/HashlistAPI.php similarity index 89% rename from src/inc/apiv2/model/hashlists.routes.php rename to src/inc/apiv2/model/HashlistAPI.php index 656c82a63..9d11ff130 100644 --- a/src/inc/apiv2/model/hashlists.routes.php +++ b/src/inc/apiv2/model/HashlistAPI.php @@ -1,20 +1,26 @@ getId()); } } - -use Slim\App; -/** @var App $app */ -HealthCheckAPI::register($app); \ No newline at end of file diff --git a/src/inc/apiv2/model/healthcheckagents.routes.php b/src/inc/apiv2/model/HealthCheckAgentAPI.php similarity index 77% rename from src/inc/apiv2/model/healthcheckagents.routes.php rename to src/inc/apiv2/model/HealthCheckAgentAPI.php index 5c9832716..3ebb71414 100644 --- a/src/inc/apiv2/model/healthcheckagents.routes.php +++ b/src/inc/apiv2/model/HealthCheckAgentAPI.php @@ -1,17 +1,20 @@ getId(); } - + //TODO make aggregate data queryable and not included by default static function aggregateData(object $object, array &$included_data = [], ?array $aggregateFieldsets = null): array { $aggregatedData = []; if (is_null($aggregateFieldsets) || array_key_exists('pretask', $aggregateFieldsets)) { - + $qF1 = new QueryFilter(FilePretask::PRETASK_ID, $object->getId(), "=", Factory::getFilePretaskFactory()); $jF1 = new JoinFilter(Factory::getFilePretaskFactory(), File::FILE_ID, FilePretask::FILE_ID); $files = Factory::getFileFactory()->filter([Factory::FILTER => $qF1, Factory::JOIN => $jF1]); @@ -83,10 +87,10 @@ static function aggregateData(object $object, array &$included_data = [], ?array } $aggregatedData["auxiliaryKeyspace"] = $lineCountProduct; } - + return $aggregatedData; } - + protected function getUpdateHandlers($id, $current_user): array { return [ Pretask::ATTACK_CMD => fn($value) => PretaskUtils::changeAttack($id, $value), @@ -104,6 +108,3 @@ protected function deleteObject(object $object): void { } } -use Slim\App; -/** @var App $app */ -PreTaskAPI::register($app); diff --git a/src/inc/apiv2/model/preprocessors.routes.php b/src/inc/apiv2/model/PreprocessorAPI.php similarity index 83% rename from src/inc/apiv2/model/preprocessors.routes.php rename to src/inc/apiv2/model/PreprocessorAPI.php index 367fd5ed6..80ea95a59 100644 --- a/src/inc/apiv2/model/preprocessors.routes.php +++ b/src/inc/apiv2/model/PreprocessorAPI.php @@ -1,12 +1,12 @@ getId()); } } - -use Slim\App; -/** @var App $app */ -PreprocessorAPI::register($app); \ No newline at end of file diff --git a/src/inc/apiv2/model/speeds.routes.php b/src/inc/apiv2/model/SpeedAPI.php similarity index 82% rename from src/inc/apiv2/model/speeds.routes.php rename to src/inc/apiv2/model/SpeedAPI.php index a84cab475..2da8cdb28 100644 --- a/src/inc/apiv2/model/speeds.routes.php +++ b/src/inc/apiv2/model/SpeedAPI.php @@ -1,18 +1,23 @@ getId() - $b->getId()); }; @@ -102,7 +100,3 @@ protected function deleteObject(object $object): void { SupertaskUtils::deleteSupertask($object->getId()); } } - -use Slim\App; -/** @var App $app */ -SupertaskAPI::register($app); \ No newline at end of file diff --git a/src/inc/apiv2/model/tasks.routes.php b/src/inc/apiv2/model/TaskAPI.php similarity index 88% rename from src/inc/apiv2/model/tasks.routes.php rename to src/inc/apiv2/model/TaskAPI.php index c2ed6bb35..815da2c59 100644 --- a/src/inc/apiv2/model/tasks.routes.php +++ b/src/inc/apiv2/model/TaskAPI.php @@ -1,25 +1,33 @@ countFilter([Factory::FILTER => $qF]); $aggregatedData["activeAgents"] = $activeAgents; } - + $keyspace = $object->getKeyspace(); $keyspaceProgress = $object->getKeyspaceProgress(); if (is_null($aggregateFieldsets) || in_array("dispatched", $aggregateFieldsets['task'])) { $aggregatedData["dispatched"] = Util::showperc($keyspaceProgress, $keyspace); } - + if (is_null($aggregateFieldsets) || in_array("searched", $aggregateFieldsets['task'])) { $aggregatedData["searched"] = Util::showperc(TaskUtils::getTaskProgress($object), $keyspace); } @@ -195,20 +203,20 @@ static function aggregateData(object $object, array &$included_data = [], ?array $agg3 = new Aggregation(Chunk::DISPATCH_TIME, Aggregation::MAX); $agg4 = new Aggregation(Chunk::SOLVE_TIME, Aggregation::MAX); $results = Factory::getChunkFactory()->multicolAggregationFilter([Factory::FILTER => $qF1], [$agg1, $agg2, $agg3, $agg4]); - + $progress = $results[$agg1->getName()] - $results[$agg2->getName()]; $maxTime = max($results[$agg3->getName()], $results[$agg4->getName()]); - + //status 1 is running, 2 is idle and 3 is completed $status = 2; - if (time() - $maxTime < SConfig::getInstance()->getVal(DConfig::CHUNK_TIMEOUT) && ($progress < $keyspace || $object->getUsePreprocessor() && $keyspace == DPrince::PRINCE_KEYSPACE)) { + if (time() - $maxTime < SConfig::getInstance()->getVal(DConfig::CHUNK_TIMEOUT) && ($progress < $keyspace || $object->getUsePreprocessor() && $keyspace == DPrince::PRINCE_KEYSPACE)) { $status = 1; } - + if ($keyspaceProgress >= $keyspace && $keyspaceProgress > 0) { $status = 3; } - + $aggregatedData["status"] = $status; } } @@ -232,6 +240,3 @@ protected function getUpdateHandlers($id, $current_user): array { } } -use Slim\App; -/** @var App $app */ -TaskAPI::register($app); diff --git a/src/inc/apiv2/model/taskwrappers.routes.php b/src/inc/apiv2/model/TaskWrapperAPI.php similarity index 87% rename from src/inc/apiv2/model/taskwrappers.routes.php rename to src/inc/apiv2/model/TaskWrapperAPI.php index b3f6851ba..5988ce474 100644 --- a/src/inc/apiv2/model/taskwrappers.routes.php +++ b/src/inc/apiv2/model/TaskWrapperAPI.php @@ -1,20 +1,26 @@ setQueryFilters([$qf]); } } - + // parse the order and filter // Because the frontend shows taskwrappername for supertasks and taskname for normaltasks, the orders and filters for the // name needs to be changed to coalesce filters to get the correct value between these 2. @@ -136,6 +142,9 @@ protected function parseFilters(array $filters) { return $filters; } + /** + * @throws HttpError + */ protected function createObject(array $data): int { throw new HttpError("TaskWrappers cannot be created via API"); } @@ -148,6 +157,7 @@ protected function getUpdateHandlers($id, $current_user): array { /** * @throws HTException + * @throws HttpError */ protected function deleteObject(object $object): void { switch ($object->getTaskType()) { @@ -159,7 +169,8 @@ protected function deleteObject(object $object): void { // api=true to avoid TaskUtils::delete setting 'Location:' header if ($task !== null) { TaskUtils::delete($task->getId(), $this->getCurrentUser(), true); - } else { + } + else { // This should not happen because every taskwrapper should have a task // but since there are no database constraints this cant be enforced. Factory::getTaskWrapperFactory()->delete($object); @@ -169,11 +180,7 @@ protected function deleteObject(object $object): void { TaskUtils::deleteSupertask($object->getId(), $this->getCurrentUser()); break; default: - throw new HttpError("Internal Error: taskType not recognized"); + throw new HttpError("Internal Error: taskType not recognized"); } } } - -use Slim\App; -/** @var App $app */ -TaskWrapperAPI::register($app); \ No newline at end of file diff --git a/src/inc/apiv2/model/users.routes.php b/src/inc/apiv2/model/UserAPI.php similarity index 86% rename from src/inc/apiv2/model/users.routes.php rename to src/inc/apiv2/model/UserAPI.php index 80eea1dd9..103a21740 100644 --- a/src/inc/apiv2/model/users.routes.php +++ b/src/inc/apiv2/model/UserAPI.php @@ -1,15 +1,20 @@ getId()); } } - -use Slim\App; -/** @var App $app */ -VoucherAPI::register($app); \ No newline at end of file diff --git a/src/inc/apiv2/util/CorsHackMiddleware.php b/src/inc/apiv2/util/CorsHackMiddleware.php new file mode 100644 index 000000000..f2f1f8684 --- /dev/null +++ b/src/inc/apiv2/util/CorsHackMiddleware.php @@ -0,0 +1,47 @@ +handle($request); + + return $this::addCORSHeaders($request, $response); + } + + public static function addCORSHeaders(Request $request, $response) { + $routeContext = RouteContext::fromRequest($request); + $routingResults = $routeContext->getRoutingResults(); + $methods = $routingResults->getAllowedMethods(); + $requestHeaders = $request->getHeaderLine('Access-Control-Request-Headers'); + + $frontend_urls = getenv('HASHTOPOLIS_FRONTEND_URLS'); + if ($frontend_urls !== false) { + if (in_array($request->getHeaderLine('Origin'), explode(',', $frontend_urls), true)) { + $response = $response->withHeader('Access-Control-Allow-Origin', $request->getHeaderLine('Origin')); + } + else { + error_log("CORS error: Allow-Origin doesn't match. Please make sure to include the used frontend in the .env file."); + } + } + else { + //No frontend URLs given in .env file, switch to default allow all + $response = $response->withHeader('Access-Control-Allow-Origin', '*'); + } + + $response = $response->withHeader('Access-Control-Allow-Methods', implode(',', $methods)); + $response = $response->withHeader('Access-Control-Allow-Headers', $requestHeaders); + + // Optional: Allow Ajax CORS requests with Authorization header + // $response = $response->withHeader('Access-Control-Allow-Credentials', 'true'); + return $response; + } +} \ No newline at end of file diff --git a/src/inc/apiv2/util/JsonBodyParserMiddleware.php b/src/inc/apiv2/util/JsonBodyParserMiddleware.php new file mode 100644 index 000000000..2e94400a4 --- /dev/null +++ b/src/inc/apiv2/util/JsonBodyParserMiddleware.php @@ -0,0 +1,31 @@ +getHeaderLine('Content-Type'); + + if (strstr($contentType, 'application/json') || strstr($contentType, 'application/vnd.api+json')) { + $contents = json_decode(file_get_contents('php://input'), true); + if (json_last_error() === JSON_ERROR_NONE) { + $request = $request->withParsedBody($contents); + } + else { + $response = new Response(); + return ErrorHandler::errorResponse($response, "Malformed request", 400); + } + } + + return $handler->handle($request); + } +} \ No newline at end of file diff --git a/src/inc/apiv2/util/TokenAsParameterMiddleware.php b/src/inc/apiv2/util/TokenAsParameterMiddleware.php new file mode 100644 index 000000000..cda86f3fb --- /dev/null +++ b/src/inc/apiv2/util/TokenAsParameterMiddleware.php @@ -0,0 +1,21 @@ +getQueryParams(); + if (array_key_exists('token', $data)) { + $request = $request->withHeader('Authorization', 'Bearer ' . $data['token']); + }; + + return $handler->handle($request); + } +} \ No newline at end of file diff --git a/src/inc/defines/DAccessControl.php b/src/inc/defines/DAccessControl.php new file mode 100644 index 000000000..c563c93f7 --- /dev/null +++ b/src/inc/defines/DAccessControl.php @@ -0,0 +1,87 @@ +getMessage()); + } + return $oClass->getConstants(); + } + + /** + * @param $access string + * @return string description + */ + public static function getDescription($access) { + if (is_array($access)) { + $access = $access[0]; + } + return match ($access) { + DAccessControl::VIEW_HASHLIST_ACCESS[0] => "Can view Hashlists", + DAccessControl::MANAGE_HASHLIST_ACCESS => "Can manage hashlists", + DAccessControl::CREATE_HASHLIST_ACCESS => "Can create hashlists", + DAccessControl::CREATE_SUPERHASHLIST_ACCESS => "Can create superhashlists", + DAccessControl::VIEW_AGENT_ACCESS[0] => "Can view agents
      Also granted with manage/create agents permission.", + DAccessControl::MANAGE_AGENT_ACCESS => "Can manage agents", + DAccessControl::CREATE_AGENT_ACCESS => "Can create agents", + DAccessControl::VIEW_TASK_ACCESS[0] => "Can view tasks
      Also granted with change/create tasks permission.", + DAccessControl::RUN_TASK_ACCESS[0] => "Can run preconfigured tasks", + DAccessControl::CREATE_TASK_ACCESS[0] => "Can create/delete tasks", + DAccessControl::CREATE_PRETASK_ACCESS => "Can create/delete preconfigured tasks", + DAccessControl::CREATE_SUPERTASK_ACCESS => "Can create/delete supertasks", + DAccessControl::VIEW_FILE_ACCESS[0] => "Can view files
      Also granted with manage/add files permission.", + DAccessControl::MANAGE_FILE_ACCESS => "Can manage files", + DAccessControl::ADD_FILE_ACCESS => "Can add files", + DAccessControl::CRACKER_BINARY_ACCESS => "Can configure cracker binaries", + DAccessControl::SERVER_CONFIG_ACCESS => "Can access server configuration", + DAccessControl::USER_CONFIG_ACCESS => "Can manage users", + DAccessControl::LOGIN_ACCESS => "Can login and access normal user account features", + DAccessControl::VIEW_HASHES_ACCESS => "User can view cracked/uncracked hashes", + DAccessControl::MANAGE_TASK_ACCESS => "Can change tasks (set priority, rename, etc.)", + DAccessControl::VIEW_PRETASK_ACCESS[0] => "Can view preconfigured tasks
      Also granted with manage/create preconfigured tasks permission.", + DAccessControl::MANAGE_PRETASK_ACCESS => "Can manage preconfigured tasks", + DAccessControl::VIEW_SUPERTASK_ACCESS[0] => "Can view preconfigured supertasks
      Also granted with manage/create supertasks permission.", + DAccessControl::MANAGE_SUPERTASK_ACCESS => "Can manage preconfigured supertasks.", + DAccessControl::MANAGE_ACCESS_GROUP_ACCESS => "Can manage access groups.", + default => "__" . $access . "__", + }; + } +} diff --git a/src/inc/defines/DAccessControlAction.php b/src/inc/defines/DAccessControlAction.php new file mode 100644 index 000000000..c3a6c1429 --- /dev/null +++ b/src/inc/defines/DAccessControlAction.php @@ -0,0 +1,14 @@ +getMessage()); + } + return $oClass->getConstants(); + } + + /** + * Gives the selection for the configuration values which are selections. + * @param string $config + * @return DataSet + */ + public static function getSelection($config) { + return match ($config) { + DConfig::NOTIFICATIONS_PROXY_TYPE => new DataSet([ + DProxyTypes::HTTP => DProxyTypes::HTTP, + DProxyTypes::HTTPS => DProxyTypes::HTTPS, + DProxyTypes::SOCKS4 => DProxyTypes::SOCKS4, + DProxyTypes::SOCKS5 => DProxyTypes::SOCKS5 + ] + ), + DConfig::SERVER_LOG_LEVEL => new DataSet([ + DServerLog::TRACE => "TRACE", + DServerLog::DEBUG => "DEBUG", + DServerLog::INFO => "INFO", + DServerLog::WARNING => "WARNING", + DServerLog::ERROR => "ERROR", + DServerLog::FATAL => "FATAL" + ] + ), + default => new DataSet(["Not found!"]), + }; + } + + /** + * Gives the format which a config input should have. Default is string if it's not a known config. + * @param $config string + * @return string + */ + public static function getConfigType($config) { + return match ($config) { + DConfig::BENCHMARK_TIME => DConfigType::NUMBER_INPUT, + DConfig::CHUNK_DURATION => DConfigType::NUMBER_INPUT, + DConfig::CHUNK_TIMEOUT => DConfigType::NUMBER_INPUT, + DConfig::AGENT_TIMEOUT => DConfigType::NUMBER_INPUT, + DConfig::HASHES_PAGE_SIZE => DConfigType::NUMBER_INPUT, + DConfig::FIELD_SEPARATOR => DConfigType::STRING_INPUT, + DConfig::HASHLIST_ALIAS => DConfigType::STRING_INPUT, + DConfig::STATUS_TIMER => DConfigType::NUMBER_INPUT, + DConfig::BLACKLIST_CHARS => DConfigType::STRING_INPUT, + DConfig::NUMBER_LOGENTRIES => DConfigType::NUMBER_INPUT, + DConfig::TIME_FORMAT => DConfigType::STRING_INPUT, + DConfig::BASE_URL => DConfigType::STRING_INPUT, + Dconfig::DISP_TOLERANCE => DConfigType::NUMBER_INPUT, + DConfig::BATCH_SIZE => DConfigType::NUMBER_INPUT, + DConfig::BASE_HOST => DConfigType::STRING_INPUT, + DConfig::DONATE_OFF => DConfigType::TICKBOX, + DConfig::PLAINTEXT_MAX_LENGTH => DConfigType::NUMBER_INPUT, + DConfig::HASH_MAX_LENGTH => DConfigType::NUMBER_INPUT, + DConfig::EMAIL_SENDER => DConfigType::EMAIL, + DConfig::MAX_HASHLIST_SIZE => DConfigType::NUMBER_INPUT, + DConfig::HIDE_IMPORT_MASKS => DConfigType::TICKBOX, + DConfig::TELEGRAM_BOT_TOKEN => DConfigType::STRING_INPUT, + DConfig::CONTACT_EMAIL => DConfigType::EMAIL, + DConfig::VOUCHER_DELETION => DConfigType::TICKBOX, + DConfig::HASHES_PER_PAGE => DConfigType::NUMBER_INPUT, + DConfig::HIDE_IP_INFO => DConfigType::TICKBOX, + DConfig::EMAIL_SENDER_NAME => DConfigType::STRING_INPUT, + DConfig::DEFAULT_BENCH => DConfigType::TICKBOX, + DConfig::SHOW_TASK_PERFORMANCE => DConfigType::TICKBOX, + DConfig::RULE_SPLIT_ALWAYS => DConfigType::TICKBOX, + DConfig::RULE_SPLIT_SMALL_TASKS => DConfigType::TICKBOX, + DConfig::RULE_SPLIT_DISABLE => DConfigType::TICKBOX, + DConfig::AGENT_STAT_LIMIT => DConfigType::NUMBER_INPUT, + DConfig::AGENT_DATA_LIFETIME => DConfigType::NUMBER_INPUT, + DConfig::AGENT_STAT_TENSION => DConfigType::TICKBOX, + DConfig::MULTICAST_ENABLE => DConfigType::TICKBOX, + DConfig::MULTICAST_DEVICE => DConfigType::STRING_INPUT, + DConfig::MULTICAST_TR_ENABLE => DConfigType::TICKBOX, + DConfig::MULTICAST_TR => DConfigType::NUMBER_INPUT, + DConfig::NOTIFICATIONS_PROXY_ENABLE => DConfigType::TICKBOX, + DConfig::NOTIFICATIONS_PROXY_PORT => DConfigType::NUMBER_INPUT, + DConfig::NOTIFICATIONS_PROXY_SERVER => DConfigType::STRING_INPUT, + DConfig::NOTIFICATIONS_PROXY_TYPE => DConfigType::SELECT, + DConfig::DISABLE_TRIMMING => DConfigType::TICKBOX, + DConfig::PRIORITY_0_START => DConfigType::TICKBOX, + DConfig::SERVER_LOG_LEVEL => DConfigType::SELECT, + DConfig::MAX_SESSION_LENGTH => DConfigType::NUMBER_INPUT, + DConfig::HASHCAT_BRAIN_ENABLE => DConfigType::TICKBOX, + DConfig::HASHCAT_BRAIN_HOST => DConfigType::STRING_INPUT, + DConfig::HASHCAT_BRAIN_PORT => DConfigType::NUMBER_INPUT, + DConfig::HASHCAT_BRAIN_PASS => DConfigType::STRING_INPUT, + DConfig::HASHLIST_IMPORT_CHECK => DConfigType::TICKBOX, + DConfig::ALLOW_DEREGISTER => DConfigType::TICKBOX, + DConfig::AGENT_TEMP_THRESHOLD_1 => DConfigType::NUMBER_INPUT, + DConfig::AGENT_TEMP_THRESHOLD_2 => DConfigType::NUMBER_INPUT, + DConfig::AGENT_UTIL_THRESHOLD_1 => DConfigType::NUMBER_INPUT, + DConfig::AGENT_UTIL_THRESHOLD_2 => DConfigType::NUMBER_INPUT, + DConfig::UAPI_SEND_TASK_IS_COMPLETE => DConfigType::TICKBOX, + DConfig::HC_ERROR_IGNORE => DConfigType::STRING_INPUT, + DConfig::DEFAULT_PAGE_SIZE => DConfigType::NUMBER_INPUT, + DConfig::MAX_PAGE_SIZE => DConfigType::NUMBER_INPUT, + default => DConfigType::STRING_INPUT, + }; + } + + /** + * @param $config string + * @return string + */ + public static function getConfigDescription($config) { + return match ($config) { + DConfig::BENCHMARK_TIME => "Time in seconds an agent should benchmark a task.", + DConfig::CHUNK_DURATION => "Time in seconds a client should be working on a single chunk.", + DConfig::CHUNK_TIMEOUT => "Time in seconds the server will consider an issued chunk as inactive or timed out and will reallocate to another client.", + DConfig::AGENT_TIMEOUT => "Time in seconds the server will consider a client inactive or timed out.", + DConfig::HASHES_PAGE_SIZE => "Number of hashes shown on each page of the hashes view.", + DConfig::FIELD_SEPARATOR => "The separator character used to separate hash and plain (or salt).", + DConfig::HASHLIST_ALIAS => "The string used as hashlist alias when creating a task.", + DConfig::STATUS_TIMER => "Default interval in seconds clients should report back to the server for a task. (cracks, status, and progress).", + DConfig::BLACKLIST_CHARS => "Characters that are not allowed to be used in attack command inputs.", + DConfig::NUMBER_LOGENTRIES => "Number of log entries that should be saved. When this number is exceeded by 120%, the oldest will be overwritten.", + DConfig::TIME_FORMAT => "Set the time format. Use syntax for PHPs date() method.", + DConfig::BASE_URL => "Base url for the webpage (this does not include hostname and is normally determined automatically on the installation).", + DConfig::DISP_TOLERANCE => "Allowable deviation in the final chunk of a task in percent.
      (avoids issuing small chunks when the remaining part of a task is slightly bigger than the normal chunk size).", + DConfig::BATCH_SIZE => "Batch size of SQL query when hashlist is sent to the agent.", + DConfig::YUBIKEY_ID => "Yubikey Client ID.", + DConfig::YUBIKEY_KEY => "Yubikey Secret Key.", + DConfig::YUBIKEY_URL => "Yubikey API URL.", + DConfig::BASE_HOST => "Base hostname/port/protocol to use. Only fill this in to override the auto-determined value.", + DConfig::DONATE_OFF => "Hide donation information.", + DConfig::PLAINTEXT_MAX_LENGTH => "Max length of a plaintext. (WARNING: This change may take a long time depending on DB size!)", + DConfig::HASH_MAX_LENGTH => "Max length of a hash. (WARNING: This change may take a long time depending on DB size!)", + DConfig::EMAIL_SENDER => "Email address used as sender on notification emails.", + DConfig::MAX_HASHLIST_SIZE => "Max size of a hashlist in lines. (Prevents uploading very large lists).", + DConfig::HIDE_IMPORT_MASKS => "Hide pre configured tasks that were imported through a mask import.", + DConfig::TELEGRAM_BOT_TOKEN => "Telegram bot token used to send telegram notifications.", + DConfig::CONTACT_EMAIL => "Admin email address that will be displayed on the webpage footer. (Leave empty to hide)", + DConfig::VOUCHER_DELETION => "Vouchers can be used multiple times and will not be deleted automatically.", + DConfig::HASHES_PER_PAGE => "Number of hashes per page on hashes view.", + DConfig::HIDE_IP_INFO => "Hide agent's IP information.", + DConfig::EMAIL_SENDER_NAME => "Sender's name on emails sent from " . APP_NAME . ".", + DConfig::DEFAULT_BENCH => "Use speed benchmark as default.", + DConfig::SHOW_TASK_PERFORMANCE => "Show cracks/minute for tasks which are running.", + DConfig::RULE_SPLIT_SMALL_TASKS => "When rule splitting is applied for tasks, always make them a small task.", + DConfig::RULE_SPLIT_ALWAYS => "Even do rule splitting when there are not enough rules but just the benchmark is too high.
      Can result in subtasks with just one rule.", + DConfig::RULE_SPLIT_DISABLE => "Disable automatic task splitting with large rule files.", + DConfig::AGENT_STAT_LIMIT => "Maximal number of data points showing of agent gpu data.", + DConfig::AGENT_DATA_LIFETIME => "Minimum time in seconds how long agent gpu/cpu utilisation and gpu temperature data is kept on the server.", + DConfig::AGENT_STAT_TENSION => "Draw straigth lines in agent data graph instead of bezier curves.", + DConfig::MULTICAST_ENABLE => "Enable UDP multicast distribution of files to agents. (Make sure you did all the preparation before activating)
      You can read more informations here: https://github.com/hashtopolis/runner", + DConfig::MULTICAST_DEVICE => "Network device of the server to be used for the multicast distribution.", + DConfig::MULTICAST_TR_ENABLE => "Instead of the built in UFTP flow control, use a static set transfer rate
      (Important: Setting this value wrong can affect the functionality, only use this if you are sure this transfer rate is feasible)", + DConfig::MULTICAST_TR => "Set static transfer rate in case it is activated (in Kbit/s)", + DConfig::NOTIFICATIONS_PROXY_ENABLE => "Enable using a proxy for sending notifications.", + DConfig::NOTIFICATIONS_PROXY_PORT => "Set the port for the notifications proxy.", + DConfig::NOTIFICATIONS_PROXY_SERVER => "Server url of the proxy to use for notifications.", + DConfig::NOTIFICATIONS_PROXY_TYPE => "Proxy type to use for notifications.", + DConfig::DISABLE_TRIMMING => "Disable trimming of chunks and redo whole chunks.", + DConfig::PRIORITY_0_START => "Also automatically assign tasks with priority 0.", + DConfig::SERVER_LOG_LEVEL => "Server level to be logged on the server to file.", + DConfig::MAX_SESSION_LENGTH => "Max session length users can configure (in hours).", + DConfig::HASHCAT_BRAIN_ENABLE => "Allow hashcat brain to be used for hashlists", + DConfig::HASHCAT_BRAIN_HOST => "Host to be used for hashcat brain (must be reachable by agents)", + DConfig::HASHCAT_BRAIN_PORT => "Port for hashcat brain", + DConfig::HASHCAT_BRAIN_PASS => "Password to be used to access hashcat brain server", + DConfig::HASHLIST_IMPORT_CHECK => "Check all hashes of a hashlist on import in case they are already cracked in another list", + DConfig::ALLOW_DEREGISTER => "Allow clients to deregister themselves automatically from the server.", + DConfig::AGENT_TEMP_THRESHOLD_1 => "Temperature threshold from which on an agent is shown in orange on the agent status page.", + DConfig::AGENT_TEMP_THRESHOLD_2 => "Temperature threshold from which on an agent is shown in red on the agent status page.", + DConfig::AGENT_UTIL_THRESHOLD_1 => "Util value where an agent is shown in orange on the agent status page, if below.", + DConfig::AGENT_UTIL_THRESHOLD_2 => "Util value where an agent is shown in red on the agent status page, if below.", + DConfig::UAPI_SEND_TASK_IS_COMPLETE => "Also send 'isComplete' for each task on the User API when listing all tasks (might affect performance)", + DConfig::HC_ERROR_IGNORE => "Ignore error messages from crackers which contain given strings (multiple values separated by comma)", + DConfig::DEFAULT_PAGE_SIZE => "The default page size of items that are returned in API calls.", + DConfig::MAX_PAGE_SIZE => "The maximum page size of items that are allowed to return in an API call.", + default => $config, + }; + } +} \ No newline at end of file diff --git a/src/inc/defines/DConfigAction.php b/src/inc/defines/DConfigAction.php new file mode 100644 index 000000000..880839110 --- /dev/null +++ b/src/inc/defines/DConfigAction.php @@ -0,0 +1,17 @@ + "AMD", diff --git a/src/inc/defines/DDirectories.php b/src/inc/defines/DDirectories.php new file mode 100644 index 000000000..cc0fbeefa --- /dev/null +++ b/src/inc/defines/DDirectories.php @@ -0,0 +1,11 @@ + DAccessControl::VIEW_TASK_ACCESS, + DNotificationType::AGENT_ERROR, DNotificationType::OWN_AGENT_ERROR, DNotificationType::DELETE_AGENT => DAccessControl::VIEW_AGENT_ACCESS, + DNotificationType::NEW_HASHLIST, DNotificationType::HASHLIST_ALL_CRACKED, DNotificationType::HASHLIST_CRACKED_HASH, DNotificationType::DELETE_HASHLIST => DAccessControl::VIEW_HASHLIST_ACCESS, + DNotificationType::USER_CREATED, DNotificationType::USER_DELETED, DNotificationType::USER_LOGIN_FAILED => DAccessControl::USER_CONFIG_ACCESS, + DNotificationType::NEW_AGENT => DAccessControl::MANAGE_AGENT_ACCESS, + default => DAccessControl::SERVER_CONFIG_ACCESS, + }; + } + + public static function getObjectType($notificationType) { + return match ($notificationType) { + DNotificationType::TASK_COMPLETE, DNotificationType::DELETE_TASK => DNotificationObjectType::TASK, + DNotificationType::AGENT_ERROR, DNotificationType::OWN_AGENT_ERROR, DNotificationType::DELETE_AGENT => DNotificationObjectType::AGENT, + DNotificationType::HASHLIST_ALL_CRACKED, DNotificationType::HASHLIST_CRACKED_HASH, DNotificationType::DELETE_HASHLIST => DNotificationObjectType::HASHLIST, + DNotificationType::USER_DELETED, DNotificationType::USER_LOGIN_FAILED => DNotificationObjectType::USER, + default => DNotificationObjectType::NONE, + }; + } +} \ No newline at end of file diff --git a/src/inc/defines/DOperatingSystem.php b/src/inc/defines/DOperatingSystem.php new file mode 100644 index 000000000..897556b52 --- /dev/null +++ b/src/inc/defines/DOperatingSystem.php @@ -0,0 +1,9 @@ + "Linux", + DPlatforms::MAC_OSX => "Max OSX", + DPlatforms::WINDOWS => "Windows", + default => "Unknown", + }; + } +} \ No newline at end of file diff --git a/src/inc/defines/preprocessors.php b/src/inc/defines/DPreprocessorAction.php similarity index 92% rename from src/inc/defines/preprocessors.php rename to src/inc/defines/DPreprocessorAction.php index fd43ea5c3..7363ffd22 100644 --- a/src/inc/defines/preprocessors.php +++ b/src/inc/defines/DPreprocessorAction.php @@ -1,5 +1,7 @@ "TRACE", + DServerLog::DEBUG => "DEBUG", + DServerLog::INFO => "INFO", + DServerLog::WARNING => "WARN", + DServerLog::ERROR => "ERROR", + DServerLog::FATAL => "FATAL", + default => "EMPTY", + }; } } \ No newline at end of file diff --git a/src/inc/defines/DStats.php b/src/inc/defines/DStats.php new file mode 100644 index 000000000..99a2b5fb4 --- /dev/null +++ b/src/inc/defines/DStats.php @@ -0,0 +1,13 @@ +getMessage()); + } + return $oClass->getConstants(); + } + + static function getSection($section) { + return match ($section) { + USection::TEST => new USectionTest(), + USection::AGENT => new USectionAgent(), + USection::TASK => new USectionTask(), + USection::PRETASK => new USectionPretask(), + USection::SUPERTASK => new USectionSupertask(), + USection::HASHLIST => new USectionHashlist(), + USection::SUPERHASHLIST => new USectionSuperhashlist(), + USection::FILE => new USectionFile(), + USection::CRACKER => new USectionCracker(), + USection::CONFIG => new USectionConfig(), + USection::USER => new USectionUser(), + USection::GROUP => new USectionGroup(), + USection::ACCESS => new USectionAccess(), + USection::ACCOUNT => new USectionAccount(), + default => null, + }; + } + + static function getDescription($section, $constant) { + $sectionObject = UApi::getSection($section); + if ($sectionObject == null) { + return "__" . $section . "_" . $constant . "__"; + } + return $sectionObject->describe($constant); + } +} \ No newline at end of file diff --git a/src/inc/defines/UQuery.php b/src/inc/defines/UQuery.php new file mode 100644 index 000000000..8fda1970e --- /dev/null +++ b/src/inc/defines/UQuery.php @@ -0,0 +1,9 @@ + "List permission groups", + USectionAccess::GET_GROUP => "Get details of a permission group", + USectionAccess::CREATE_GROUP => "Create a new permission group", + USectionAccess::DELETE_GROUP => "Delete permission groups", + USectionAccess::SET_PERMISSIONS => "Update permissions of a group", + default => "__" . $constant . "__", + }; + } +} \ No newline at end of file diff --git a/src/inc/defines/USectionAccount.php b/src/inc/defines/USectionAccount.php new file mode 100644 index 000000000..25fb882f3 --- /dev/null +++ b/src/inc/defines/USectionAccount.php @@ -0,0 +1,20 @@ + "Get account information", + USectionAccount::SET_EMAIL => "Change email", + USectionAccount::SET_SESSION_LENGTH => "Update session length", + USectionAccount::CHANGE_PASSWORD => "Change password", + default => "__" . $constant . "__", + }; + } +} \ No newline at end of file diff --git a/src/inc/defines/USectionAgent.php b/src/inc/defines/USectionAgent.php new file mode 100644 index 000000000..bf11f9d62 --- /dev/null +++ b/src/inc/defines/USectionAgent.php @@ -0,0 +1,41 @@ + "Creating new vouchers", + USectionAgent::GET_BINARIES => "Get a list of available agent binaries", + USectionAgent::LIST_VOUCHERS => "List existing vouchers", + USectionAgent::DELETE_VOUCHER => "Delete an existing voucher", + USectionAgent::LIST_AGENTS => "List all agents", + USectionAgent::GET => "Get details about an agent", + USectionAgent::SET_ACTIVE => "Set an agent active/inactive", + USectionAgent::CHANGE_OWNER => "Change the owner of an agent", + USectionAgent::SET_NAME => "Set the name of an agent", + USectionAgent::SET_CPU_ONLY => "Set if an agent is CPU only or not", + USectionAgent::SET_EXTRA_PARAMS => "Set extra flags for an agent", + USectionAgent::SET_ERROR_FLAG => "Set how errors from an agent should be handled", + USectionAgent::SET_TRUSTED => "Set if an agent is trusted or not", + USectionAgent::DELETE_AGENT => "Delete agents", + default => "__" . $constant . "__", + }; + } +} \ No newline at end of file diff --git a/src/inc/defines/USectionConfig.php b/src/inc/defines/USectionConfig.php new file mode 100644 index 000000000..13ecb9cde --- /dev/null +++ b/src/inc/defines/USectionConfig.php @@ -0,0 +1,20 @@ + "List available sections in config", + USectionConfig::LIST_CONFIG => "List config options of a given section", + USectionConfig::GET_CONFIG => "Get current value of a config", + USectionConfig::SET_CONFIG => "Change values of configs", + default => "__" . $constant . "__", + }; + } +} \ No newline at end of file diff --git a/src/inc/defines/USectionCracker.php b/src/inc/defines/USectionCracker.php new file mode 100644 index 000000000..2f3b11fb4 --- /dev/null +++ b/src/inc/defines/USectionCracker.php @@ -0,0 +1,27 @@ + "List all crackers", + USectionCracker::GET_CRACKER => "Get details of a cracker", + USectionCracker::DELETE_VERSION => "Delete a specific version of a cracker", + USectionCracker::DELETE_CRACKER => "Deleting crackers", + USectionCracker::CREATE_CRACKER => "Create new crackers", + USectionCracker::ADD_VERSION => "Add new cracker versions", + USectionCracker::UPDATE_VERSION => "Update cracker versions", + default => "__" . $constant . "__", + }; + } +} \ No newline at end of file diff --git a/src/inc/defines/USectionFile.php b/src/inc/defines/USectionFile.php new file mode 100644 index 000000000..9f43c6b78 --- /dev/null +++ b/src/inc/defines/USectionFile.php @@ -0,0 +1,27 @@ + "List all files", + USectionFile::GET_FILE => "Get details of a file", + USectionFile::ADD_FILE => "Add new files", + USectionFile::RENAME_FILE => "Rename files", + USectionFile::SET_SECRET => "Set if a file is secret or not", + USectionFile::DELETE_FILE => "Delete files", + USectionFile::SET_FILE_TYPE => "Change type of files", + default => "__" . $constant . "__", + }; + } +} \ No newline at end of file diff --git a/src/inc/defines/USectionGroup.php b/src/inc/defines/USectionGroup.php new file mode 100644 index 000000000..2d4688f8b --- /dev/null +++ b/src/inc/defines/USectionGroup.php @@ -0,0 +1,31 @@ + "List all groups", + USectionGroup::GET_GROUP => "Get details of a group", + USectionGroup::CREATE_GROUP => "Create new groups", + USectionGroup::ABORT_CHUNKS_GROUP => "Abort all chunks dispatched to agents of this group", + USectionGroup::DELETE_GROUP => "Delete groups", + USectionGroup::ADD_AGENT => "Add agents to groups", + USectionGroup::ADD_USER => "Add users to groups", + USectionGroup::REMOVE_AGENT => "Remove agents from groups", + USectionGroup::REMOVE_USER => "Remove users from groups", + default => "__" . $constant . "__", + }; + } +} \ No newline at end of file diff --git a/src/inc/defines/USectionHashlist.php b/src/inc/defines/USectionHashlist.php new file mode 100644 index 000000000..31240fe6b --- /dev/null +++ b/src/inc/defines/USectionHashlist.php @@ -0,0 +1,40 @@ + "List all hashlists", + USectionHashlist::GET_HASHLIST => "Get details of a hashlist", + USectionHashlist::CREATE_HASHLIST => "Create a new hashlist", + USectionHashlist::SET_HASHLIST_NAME => "Rename hashlists", + USectionHashlist::SET_SECRET => "Set if a hashlist is secret or not", + USectionHashlist::IMPORT_CRACKED => "Import cracked hashes", + USectionHashlist::EXPORT_CRACKED => "Export cracked hashes", + USectionHashlist::GENERATE_WORDLIST => "Generate wordlist from founds", + USectionHashlist::EXPORT_LEFT => "Export a left list of uncracked hashes", + USectionHashlist::DELETE_HASHLIST => "Delete hashlists", + USectionHashlist::GET_HASH => "Query for specific hashes", + USectionHashlist::GET_CRACKED => "Query cracked hashes of a hashlist", + USectionHashlist::SET_ARCHIVED => "Query to archive/un-archie hashlist", + default => "__" . $constant . "__", + }; + } +} \ No newline at end of file diff --git a/src/inc/defines/USectionPretask.php b/src/inc/defines/USectionPretask.php new file mode 100644 index 000000000..0b077d5a0 --- /dev/null +++ b/src/inc/defines/USectionPretask.php @@ -0,0 +1,35 @@ + "List all preconfigured tasks", + USectionPretask::GET_PRETASK => "Get details about a preconfigured task", + USectionPretask::CREATE_PRETASK => "Create preconfigured tasks", + USectionPretask::SET_PRETASK_PRIORITY => "Set preconfigured tasks priorities", + USectionPretask::SET_PRETASK_NAME => "Rename preconfigured tasks", + USectionPretask::SET_PRETASK_COLOR => "Set the color of a preconfigured task", + USectionPretask::SET_PRETASK_CHUNKSIZE => "Change the chunk size for a preconfigured task", + USectionPretask::SET_PRETASK_CPU_ONLY => "Set if a preconfigured task is CPU only or not", + USectionPretask::SET_PRETASK_SMALL => "Set if a preconfigured task is small or not", + USectionPretask::DELETE_PRETASK => "Delete preconfigured tasks", + USectionPretask::SET_PRETASK_MAX_AGENTS => "Set max agents for a preconfigured task", + default => "__" . $constant . "__", + }; + } +} \ No newline at end of file diff --git a/src/inc/defines/USectionSuperhashlist.php b/src/inc/defines/USectionSuperhashlist.php new file mode 100644 index 000000000..049b76db2 --- /dev/null +++ b/src/inc/defines/USectionSuperhashlist.php @@ -0,0 +1,20 @@ + "List all superhashlists", + USectionSuperhashlist::GET_SUPERHASHLIST => "Get details about a superhashlist", + USectionSuperhashlist::CREATE_SUPERHASHLIST => "Create superhashlists", + USectionSuperhashlist::DELETE_SUPERHASHLIST => "Delete superhashlists", + default => "__" . $constant . "__", + }; + } +} \ No newline at end of file diff --git a/src/inc/defines/USectionSupertask.php b/src/inc/defines/USectionSupertask.php new file mode 100644 index 000000000..e2cf0e7b7 --- /dev/null +++ b/src/inc/defines/USectionSupertask.php @@ -0,0 +1,26 @@ + "List all supertasks", + USectionSupertask::GET_SUPERTASK => "Get details of a supertask", + USectionSupertask::CREATE_SUPERTASK => "Create a supertask", + USectionSupertask::IMPORT_SUPERTASK => "Import a supertask from masks", + USectionSupertask::SET_SUPERTASK_NAME => "Rename a configured supertask", + USectionSupertask::DELETE_SUPERTASK => "Delete a supertask", + USectionSupertask::BULK_SUPERTASK => "Create supertask out base command with files", + default => "__" . $constant . "__", + }; + } +} \ No newline at end of file diff --git a/src/inc/defines/USectionTask.php b/src/inc/defines/USectionTask.php new file mode 100644 index 000000000..13be4ddf0 --- /dev/null +++ b/src/inc/defines/USectionTask.php @@ -0,0 +1,67 @@ + "List all tasks", + USectionTask::GET_TASK => "Get details of a task", + USectionTask::LIST_SUBTASKS => "List subtasks of a running supertask", + USectionTask::GET_CHUNK => "Get details of a chunk", + USectionTask::CREATE_TASK => "Create a new task", + USectionTask::RUN_PRETASK => "Run an existing preconfigured task with a hashlist", + USectionTask::RUN_SUPERTASK => "Run a configured supertask with a hashlist", + USectionTask::SET_TASK_PRIORITY => "Set the priority of a task", + USectionTask::SET_TASK_TOP_PRIORITY => "Set task priority to the previous highest plus one hundred", + USectionTask::SET_SUPERTASK_PRIORITY => "Set the priority of a supertask", + USectionTask::SET_SUPERTASK_TOP_PRIORITY => "Set supertask priority to the previous highest plus one hundred", + USectionTask::SET_TASK_NAME => "Rename a task", + USectionTask::SET_TASK_COLOR => "Set the color of a task", + USectionTask::SET_TASK_CPU_ONLY => "Set if a task is CPU only or not", + USectionTask::SET_TASK_SMALL => "Set if a task is small or not", + USectionTask::TASK_UNASSIGN_AGENT => "Unassign an agent from a task", + USectionTask::DELETE_TASK => "Delete a task", + USectionTask::PURGE_TASK => "Purge a task", + USectionTask::SET_SUPERTASK_NAME => "Set the name of a supertask", + USectionTask::DELETE_SUPERTASK => "Delete a supertask", + USectionTask::ARCHIVE_TASK => "Archive tasks", + USectionTask::ARCHIVE_SUPERTASK => "Archive supertasks", + USectionTask::GET_CRACKED => "Retrieve all cracked hashes by a task", + USectionTask::SET_TASK_MAX_AGENTS => "Set max agents for tasks", + USectionTask::TASK_ASSIGN_AGENT => "Assign agents to a task", + default => "__" . $constant . "__", + }; + } +} \ No newline at end of file diff --git a/src/inc/defines/USectionTest.php b/src/inc/defines/USectionTest.php new file mode 100644 index 000000000..86e9a2f20 --- /dev/null +++ b/src/inc/defines/USectionTest.php @@ -0,0 +1,16 @@ + "Connection testing", + USectionTest::ACCESS => "Verifying the API key and test if user has access to the API", + default => "__" . $constant . "__", + }; + } +} \ No newline at end of file diff --git a/src/inc/defines/USectionUser.php b/src/inc/defines/USectionUser.php new file mode 100644 index 000000000..5109ad9d5 --- /dev/null +++ b/src/inc/defines/USectionUser.php @@ -0,0 +1,26 @@ + "List all users", + USectionUser::GET_USER => "Get details of a user", + USectionUser::CREATE_USER => "Create new users", + USectionUser::DISABLE_USER => "Disable a user account", + USectionUser::ENABLE_USER => "Enable a user account", + USectionUser::SET_USER_PASSWORD => "Set a user's password", + USectionUser::SET_USER_RIGHT_GROUP => "Change the permission group for a user", + default => "__" . $constant . "__", + }; + } +} \ No newline at end of file diff --git a/src/inc/defines/UValues.php b/src/inc/defines/UValues.php new file mode 100644 index 000000000..50a87b803 --- /dev/null +++ b/src/inc/defines/UValues.php @@ -0,0 +1,10 @@ +getMessage()); - } - return $oClass->getConstants(); - } - - /** - * @param $access string - * @return string description - */ - public static function getDescription($access) { - if (is_array($access)) { - $access = $access[0]; - } - switch ($access) { - case DAccessControl::VIEW_HASHLIST_ACCESS[0]: - return "Can view Hashlists"; - case DAccessControl::MANAGE_HASHLIST_ACCESS: - return "Can manage hashlists"; - case DAccessControl::CREATE_HASHLIST_ACCESS: - return "Can create hashlists"; - case DAccessControl::CREATE_SUPERHASHLIST_ACCESS: - return "Can create superhashlists"; - case DAccessControl::VIEW_AGENT_ACCESS[0]: - return "Can view agents
      Also granted with manage/create agents permission."; - case DAccessControl::MANAGE_AGENT_ACCESS: - return "Can manage agents"; - case DAccessControl::CREATE_AGENT_ACCESS: - return "Can create agents"; - case DAccessControl::VIEW_TASK_ACCESS[0]: - return "Can view tasks
      Also granted with change/create tasks permission."; - case DAccessControl::RUN_TASK_ACCESS[0]: - return "Can run preconfigured tasks"; - case DAccessControl::CREATE_TASK_ACCESS[0]: - return "Can create/delete tasks"; - case DAccessControl::CREATE_PRETASK_ACCESS: - return "Can create/delete preconfigured tasks"; - case DAccessControl::CREATE_SUPERTASK_ACCESS: - return "Can create/delete supertasks"; - case DAccessControl::VIEW_FILE_ACCESS[0]: - return "Can view files
      Also granted with manage/add files permission."; - case DAccessControl::MANAGE_FILE_ACCESS: - return "Can manage files"; - case DAccessControl::ADD_FILE_ACCESS: - return "Can add files"; - case DAccessControl::CRACKER_BINARY_ACCESS: - return "Can configure cracker binaries"; - case DAccessControl::SERVER_CONFIG_ACCESS: - return "Can access server configuration"; - case DAccessControl::USER_CONFIG_ACCESS: - return "Can manage users"; - case DAccessControl::LOGIN_ACCESS: - return "Can login and access normal user account features"; - case DAccessControl::VIEW_HASHES_ACCESS: - return "User can view cracked/uncracked hashes"; - case DAccessControl::MANAGE_TASK_ACCESS: - return "Can change tasks (set priority, rename, etc.)"; - case DAccessControl::VIEW_PRETASK_ACCESS[0]: - return "Can view preconfigured tasks
      Also granted with manage/create preconfigured tasks permission."; - case DAccessControl::MANAGE_PRETASK_ACCESS: - return "Can manage preconfigured tasks"; - case DAccessControl::VIEW_SUPERTASK_ACCESS[0]: - return "Can view preconfigured supertasks
      Also granted with manage/create supertasks permission."; - case DAccessControl::MANAGE_SUPERTASK_ACCESS: - return "Can manage preconfigured supertasks."; - case DAccessControl::MANAGE_ACCESS_GROUP_ACCESS: - return "Can manage access groups."; - } - return "__" . $access . "__"; - } -} - -/** - * Class DViewControl - * This defines the permissions required to view the according page - */ -class DViewControl { - const ABOUT_VIEW_PERM = DAccessControl::PUBLIC_ACCESS; - const ACCESS_VIEW_PERM = DAccessControl::USER_CONFIG_ACCESS; - const ACCOUNT_VIEW_PERM = DAccessControl::LOGIN_ACCESS; - const AGENTS_VIEW_PERM = DAccessControl::VIEW_AGENT_ACCESS; - const BINARIES_VIEW_PERM = DAccessControl::SERVER_CONFIG_ACCESS; - const CHUNKS_VIEW_PERM = DAccessControl::VIEW_TASK_ACCESS; - const CONFIG_VIEW_PERM = DAccessControl::SERVER_CONFIG_ACCESS; - const CRACKERS_VIEW_PERM = DAccessControl::CRACKER_BINARY_ACCESS; - const FILES_VIEW_PERM = DAccessControl::VIEW_FILE_ACCESS; - const FORGOT_VIEW_PERM = DAccessControl::PUBLIC_ACCESS; - const GETFILE_VIEW_PERM = DAccessControl::PUBLIC_ACCESS; - const GETHASHLIST_VIEW_PERM = DAccessControl::PUBLIC_ACCESS; - const GROUPS_VIEW_PERM = DAccessControl::MANAGE_ACCESS_GROUP_ACCESS; - const HASHES_VIEW_PERM = DAccessControl::VIEW_HASHES_ACCESS; - const HASHLISTS_VIEW_PERM = DAccessControl::VIEW_HASHLIST_ACCESS; - const HASHTYPES_VIEW_PERM = DAccessControl::SERVER_CONFIG_ACCESS; - const HELP_VIEW_PERM = DAccessControl::PUBLIC_ACCESS; - const INDEX_VIEW_PERM = DAccessControl::PUBLIC_ACCESS; - const LOG_VIEW_PERM = DAccessControl::PUBLIC_ACCESS; - const LOGIN_VIEW_PERM = DAccessControl::PUBLIC_ACCESS; - const LOGOUT_VIEW_PERM = DAccessControl::LOGIN_ACCESS; - const NOTIFICATIONS_VIEW_PERM = DAccessControl::LOGIN_ACCESS; - const PRETASKS_VIEW_PERM = DAccessControl::VIEW_PRETASK_ACCESS; - const SEARCH_VIEW_PERM = DAccessControl::VIEW_HASHES_ACCESS; - const SUPERHASHLISTS_VIEW_PERM = DAccessControl::VIEW_HASHLIST_ACCESS; - const SUPERTASKS_VIEW_PERM = DAccessControl::VIEW_SUPERTASK_ACCESS; - const TASKS_VIEW_PERM = DAccessControl::VIEW_TASK_ACCESS; - const USERS_VIEW_PERM = DAccessControl::USER_CONFIG_ACCESS; - const API_VIEW_PERM = DAccessControl::USER_CONFIG_ACCESS; - const HEALTH_VIEW_PERM = DAccessControl::SERVER_CONFIG_ACCESS; - const PREPROCESSORS_VIEW_PERM = DAccessControl::SERVER_CONFIG_ACCESS; -} - -class DAccessControlAction { - const CREATE_GROUP = "createGroup"; - const CREATE_GROUP_PERM = DAccessControl::MANAGE_ACCESS_GROUP_ACCESS; - - const DELETE_GROUP = "deleteGroup"; - const DELETE_GROUP_PERM = DAccessControl::MANAGE_ACCESS_GROUP_ACCESS; - - const EDIT = "edit"; - const EDIT_PERM = DAccessControl::USER_CONFIG_ACCESS; -} \ No newline at end of file diff --git a/src/inc/defines/config.php b/src/inc/defines/config.php deleted file mode 100644 index 03b2e9f2a..000000000 --- a/src/inc/defines/config.php +++ /dev/null @@ -1,421 +0,0 @@ -getMessage()); - } - return $oClass->getConstants(); - } - - /** - * Gives the selection for the configuration values which are selections. - * @param string $config - * @return DataSet - */ - public static function getSelection($config) { - switch ($config) { - case DConfig::NOTIFICATIONS_PROXY_TYPE: - return new DataSet([ - DProxyTypes::HTTP => DProxyTypes::HTTP, - DProxyTypes::HTTPS => DProxyTypes::HTTPS, - DProxyTypes::SOCKS4 => DProxyTypes::SOCKS4, - DProxyTypes::SOCKS5 => DProxyTypes::SOCKS5 - ] - ); - case DConfig::SERVER_LOG_LEVEL: - return new DataSet([ - DServerLog::TRACE => "TRACE", - DServerLog::DEBUG => "DEBUG", - DServerLog::INFO => "INFO", - DServerLog::WARNING => "WARNING", - DServerLog::ERROR => "ERROR", - DServerLog::FATAL => "FATAL" - ] - ); - } - return new DataSet(["Not found!"]); - } - - /** - * Gives the format which a config input should have. Default is string if it's not a known config. - * @param $config string - * @return string - */ - public static function getConfigType($config) { - switch ($config) { - case DConfig::BENCHMARK_TIME: - return DConfigType::NUMBER_INPUT; - case DConfig::CHUNK_DURATION: - return DConfigType::NUMBER_INPUT; - case DConfig::CHUNK_TIMEOUT: - return DConfigType::NUMBER_INPUT; - case DConfig::AGENT_TIMEOUT: - return DConfigType::NUMBER_INPUT; - case DConfig::HASHES_PAGE_SIZE: - return DConfigType::NUMBER_INPUT; - case DConfig::FIELD_SEPARATOR: - return DConfigType::STRING_INPUT; - case DConfig::HASHLIST_ALIAS: - return DConfigType::STRING_INPUT; - case DConfig::STATUS_TIMER: - return DConfigType::NUMBER_INPUT; - case DConfig::BLACKLIST_CHARS: - return DConfigType::STRING_INPUT; - case DConfig::NUMBER_LOGENTRIES: - return DConfigType::NUMBER_INPUT; - case DConfig::TIME_FORMAT: - return DConfigType::STRING_INPUT; - case DConfig::BASE_URL: - return DConfigType::STRING_INPUT; - case Dconfig::DISP_TOLERANCE: - return DConfigType::NUMBER_INPUT; - case DConfig::BATCH_SIZE: - return DConfigType::NUMBER_INPUT; - case DConfig::BASE_HOST: - return DConfigType::STRING_INPUT; - case DConfig::DONATE_OFF: - return DConfigType::TICKBOX; - case DConfig::PLAINTEXT_MAX_LENGTH: - return DConfigType::NUMBER_INPUT; - case DConfig::HASH_MAX_LENGTH: - return DConfigType::NUMBER_INPUT; - case DConfig::EMAIL_SENDER: - return DConfigType::EMAIL; - case DConfig::MAX_HASHLIST_SIZE: - return DConfigType::NUMBER_INPUT; - case DConfig::HIDE_IMPORT_MASKS: - return DConfigType::TICKBOX; - case DConfig::TELEGRAM_BOT_TOKEN: - return DConfigType::STRING_INPUT; - case DConfig::CONTACT_EMAIL: - return DConfigType::EMAIL; - case DConfig::VOUCHER_DELETION: - return DConfigType::TICKBOX; - case DConfig::HASHES_PER_PAGE: - return DConfigType::NUMBER_INPUT; - case DConfig::HIDE_IP_INFO: - return DConfigType::TICKBOX; - case DConfig::EMAIL_SENDER_NAME: - return DConfigType::STRING_INPUT; - case DConfig::DEFAULT_BENCH: - return DConfigType::TICKBOX; - case DConfig::SHOW_TASK_PERFORMANCE: - return DConfigType::TICKBOX; - case DConfig::RULE_SPLIT_ALWAYS: - return DConfigType::TICKBOX; - case DConfig::RULE_SPLIT_SMALL_TASKS: - return DConfigType::TICKBOX; - case DConfig::RULE_SPLIT_DISABLE: - return DConfigType::TICKBOX; - case DConfig::AGENT_STAT_LIMIT: - return DConfigType::NUMBER_INPUT; - case DConfig::AGENT_DATA_LIFETIME: - return DConfigType::NUMBER_INPUT; - case DConfig::AGENT_STAT_TENSION: - return DConfigType::TICKBOX; - case DConfig::MULTICAST_ENABLE: - return DConfigType::TICKBOX; - case DConfig::MULTICAST_DEVICE: - return DConfigType::STRING_INPUT; - case DConfig::MULTICAST_TR_ENABLE: - return DConfigType::TICKBOX; - case DConfig::MULTICAST_TR: - return DConfigType::NUMBER_INPUT; - case DConfig::NOTIFICATIONS_PROXY_ENABLE: - return DConfigType::TICKBOX; - case DConfig::NOTIFICATIONS_PROXY_PORT: - return DConfigType::NUMBER_INPUT; - case DConfig::NOTIFICATIONS_PROXY_SERVER: - return DConfigType::STRING_INPUT; - case DConfig::NOTIFICATIONS_PROXY_TYPE: - return DConfigType::SELECT; - case DConfig::DISABLE_TRIMMING: - return DConfigType::TICKBOX; - case DConfig::PRIORITY_0_START: - return DConfigType::TICKBOX; - case DConfig::SERVER_LOG_LEVEL: - return DConfigType::SELECT; - case DConfig::MAX_SESSION_LENGTH: - return DConfigType::NUMBER_INPUT; - case DConfig::HASHCAT_BRAIN_ENABLE: - return DConfigType::TICKBOX; - case DConfig::HASHCAT_BRAIN_HOST: - return DConfigType::STRING_INPUT; - case DConfig::HASHCAT_BRAIN_PORT: - return DConfigType::NUMBER_INPUT; - case DConfig::HASHCAT_BRAIN_PASS: - return DConfigType::STRING_INPUT; - case DConfig::HASHLIST_IMPORT_CHECK: - return DConfigType::TICKBOX; - case DConfig::ALLOW_DEREGISTER: - return DConfigType::TICKBOX; - case DConfig::AGENT_TEMP_THRESHOLD_1: - return DConfigType::NUMBER_INPUT; - case DConfig::AGENT_TEMP_THRESHOLD_2: - return DConfigType::NUMBER_INPUT; - case DConfig::AGENT_UTIL_THRESHOLD_1: - return DConfigType::NUMBER_INPUT; - case DConfig::AGENT_UTIL_THRESHOLD_2: - return DConfigType::NUMBER_INPUT; - case DConfig::UAPI_SEND_TASK_IS_COMPLETE: - return DConfigType::TICKBOX; - case DConfig::HC_ERROR_IGNORE: - return DConfigType::STRING_INPUT; - case DConfig::DEFAULT_PAGE_SIZE: - return DConfigType::NUMBER_INPUT; - case DConfig::MAX_PAGE_SIZE: - return DConfigType::NUMBER_INPUT; - } - return DConfigType::STRING_INPUT; - } - - /** - * @param $config string - * @return string - */ - public static function getConfigDescription($config) { - switch ($config) { - case DConfig::BENCHMARK_TIME: - return "Time in seconds an agent should benchmark a task."; - case DConfig::CHUNK_DURATION: - return "Time in seconds a client should be working on a single chunk."; - case DConfig::CHUNK_TIMEOUT: - return "Time in seconds the server will consider an issued chunk as inactive or timed out and will reallocate to another client."; - case DConfig::AGENT_TIMEOUT: - return "Time in seconds the server will consider a client inactive or timed out."; - case DConfig::HASHES_PAGE_SIZE: - return "Number of hashes shown on each page of the hashes view."; - case DConfig::FIELD_SEPARATOR: - return "The separator character used to separate hash and plain (or salt)."; - case DConfig::HASHLIST_ALIAS: - return "The string used as hashlist alias when creating a task."; - case DConfig::STATUS_TIMER: - return "Default interval in seconds clients should report back to the server for a task. (cracks, status, and progress)."; - case DConfig::BLACKLIST_CHARS: - return "Characters that are not allowed to be used in attack command inputs."; - case DConfig::NUMBER_LOGENTRIES: - return "Number of log entries that should be saved. When this number is exceeded by 120%, the oldest will be overwritten."; - case DConfig::TIME_FORMAT: - return "Set the time format. Use syntax for PHPs date() method."; - case DConfig::BASE_URL: - return "Base url for the webpage (this does not include hostname and is normally determined automatically on the installation)."; - case DConfig::DISP_TOLERANCE: - return "Allowable deviation in the final chunk of a task in percent.
      (avoids issuing small chunks when the remaining part of a task is slightly bigger than the normal chunk size)."; - case DConfig::BATCH_SIZE: - return "Batch size of SQL query when hashlist is sent to the agent."; - case DConfig::YUBIKEY_ID: - return "Yubikey Client ID."; - case DConfig::YUBIKEY_KEY: - return "Yubikey Secret Key."; - case DConfig::YUBIKEY_URL: - return "Yubikey API URL."; - case DConfig::BASE_HOST: - return "Base hostname/port/protocol to use. Only fill this in to override the auto-determined value."; - case DConfig::DONATE_OFF: - return "Hide donation information."; - case DConfig::PLAINTEXT_MAX_LENGTH: - return "Max length of a plaintext. (WARNING: This change may take a long time depending on DB size!)"; - case DConfig::HASH_MAX_LENGTH: - return "Max length of a hash. (WARNING: This change may take a long time depending on DB size!)"; - case DConfig::EMAIL_SENDER: - return "Email address used as sender on notification emails."; - case DConfig::MAX_HASHLIST_SIZE: - return "Max size of a hashlist in lines. (Prevents uploading very large lists)."; - case DConfig::HIDE_IMPORT_MASKS: - return "Hide pre configured tasks that were imported through a mask import."; - case DConfig::TELEGRAM_BOT_TOKEN: - return "Telegram bot token used to send telegram notifications."; - case DConfig::CONTACT_EMAIL: - return "Admin email address that will be displayed on the webpage footer. (Leave empty to hide)"; - case DConfig::VOUCHER_DELETION: - return "Vouchers can be used multiple times and will not be deleted automatically."; - case DConfig::HASHES_PER_PAGE: - return "Number of hashes per page on hashes view."; - case DConfig::HIDE_IP_INFO: - return "Hide agent's IP information."; - case DConfig::EMAIL_SENDER_NAME: - return "Sender's name on emails sent from " . APP_NAME . "."; - case DConfig::DEFAULT_BENCH: - return "Use speed benchmark as default."; - case DConfig::SHOW_TASK_PERFORMANCE: - return "Show cracks/minute for tasks which are running."; - case DConfig::RULE_SPLIT_SMALL_TASKS: - return "When rule splitting is applied for tasks, always make them a small task."; - case DConfig::RULE_SPLIT_ALWAYS: - return "Even do rule splitting when there are not enough rules but just the benchmark is too high.
      Can result in subtasks with just one rule."; - case DConfig::RULE_SPLIT_DISABLE: - return "Disable automatic task splitting with large rule files."; - case DConfig::AGENT_STAT_LIMIT: - return "Maximal number of data points showing of agent gpu data."; - case DConfig::AGENT_DATA_LIFETIME: - return "Minimum time in seconds how long agent gpu/cpu utilisation and gpu temperature data is kept on the server."; - case DConfig::AGENT_STAT_TENSION: - return "Draw straigth lines in agent data graph instead of bezier curves."; - case DConfig::MULTICAST_ENABLE: - return "Enable UDP multicast distribution of files to agents. (Make sure you did all the preparation before activating)
      You can read more informations here: https://github.com/hashtopolis/runner"; - case DConfig::MULTICAST_DEVICE: - return "Network device of the server to be used for the multicast distribution."; - case DConfig::MULTICAST_TR_ENABLE: - return "Instead of the built in UFTP flow control, use a static set transfer rate
      (Important: Setting this value wrong can affect the functionality, only use this if you are sure this transfer rate is feasible)"; - case DConfig::MULTICAST_TR: - return "Set static transfer rate in case it is activated (in Kbit/s)"; - case DConfig::NOTIFICATIONS_PROXY_ENABLE: - return "Enable using a proxy for sending notifications."; - case DConfig::NOTIFICATIONS_PROXY_PORT: - return "Set the port for the notifications proxy."; - case DConfig::NOTIFICATIONS_PROXY_SERVER: - return "Server url of the proxy to use for notifications."; - case DConfig::NOTIFICATIONS_PROXY_TYPE: - return "Proxy type to use for notifications."; - case DConfig::DISABLE_TRIMMING: - return "Disable trimming of chunks and redo whole chunks."; - case DConfig::PRIORITY_0_START: - return "Also automatically assign tasks with priority 0."; - case DConfig::SERVER_LOG_LEVEL: - return "Server level to be logged on the server to file."; - case DConfig::MAX_SESSION_LENGTH: - return "Max session length users can configure (in hours)."; - case DConfig::HASHCAT_BRAIN_ENABLE: - return "Allow hashcat brain to be used for hashlists"; - case DConfig::HASHCAT_BRAIN_HOST: - return "Host to be used for hashcat brain (must be reachable by agents)"; - case DConfig::HASHCAT_BRAIN_PORT: - return "Port for hashcat brain"; - case DConfig::HASHCAT_BRAIN_PASS: - return "Password to be used to access hashcat brain server"; - case DConfig::HASHLIST_IMPORT_CHECK: - return "Check all hashes of a hashlist on import in case they are already cracked in another list"; - case DConfig::ALLOW_DEREGISTER: - return "Allow clients to deregister themselves automatically from the server."; - case DConfig::AGENT_TEMP_THRESHOLD_1: - return "Temperature threshold from which on an agent is shown in orange on the agent status page."; - case DConfig::AGENT_TEMP_THRESHOLD_2: - return "Temperature threshold from which on an agent is shown in red on the agent status page."; - case DConfig::AGENT_UTIL_THRESHOLD_1: - return "Util value where an agent is shown in orange on the agent status page, if below."; - case DConfig::AGENT_UTIL_THRESHOLD_2: - return "Util value where an agent is shown in red on the agent status page, if below."; - case DConfig::UAPI_SEND_TASK_IS_COMPLETE: - return "Also send 'isComplete' for each task on the User API when listing all tasks (might affect performance)"; - case DConfig::HC_ERROR_IGNORE: - return "Ignore error messages from crackers which contain given strings (multiple values separated by comma)"; - case DConfig::DEFAULT_PAGE_SIZE: - return "The default page size of items that are returned in API calls."; - case DConfig::MAX_PAGE_SIZE: - return "The maximum page size of items that are allowed to return in an API call."; - } - return $config; - } -} diff --git a/src/inc/defines/global.php b/src/inc/defines/global.php deleted file mode 100644 index 662aa3bb8..000000000 --- a/src/inc/defines/global.php +++ /dev/null @@ -1,56 +0,0 @@ -getMessage()); - } - return $oClass->getConstants(); - } - - static function getSection($section) { - switch ($section) { - case USection::TEST: - return new USectionTest(); - case USection::AGENT: - return new USectionAgent(); - case USection::TASK: - return new USectionTask(); - case USection::PRETASK: - return new USectionPretask(); - case USection::SUPERTASK: - return new USectionSupertask(); - case USection::HASHLIST: - return new USectionHashlist(); - case USection::SUPERHASHLIST: - return new USectionSuperhashlist(); - case USection::FILE: - return new USectionFile(); - case USection::CRACKER: - return new USectionCracker(); - case USection::CONFIG: - return new USectionConfig(); - case USection::USER: - return new USectionUser(); - case USection::GROUP: - return new USectionGroup(); - case USection::ACCESS: - return new USectionAccess(); - case USection::ACCOUNT: - return new USectionAccount(); - } - return null; - } - - static function getDescription($section, $constant) { - $sectionObject = UApi::getSection($section); - if ($sectionObject == null) { - return "__" . $section . "_" . $constant . "__"; - } - return $sectionObject->describe($constant); - } -} - -class USection extends UApi { - const TEST = "test"; - const AGENT = "agent"; - const TASK = "task"; - const PRETASK = "pretask"; - const SUPERTASK = "supertask"; - const HASHLIST = "hashlist"; - const SUPERHASHLIST = "superhashlist"; - const FILE = "file"; - const CRACKER = "cracker"; - const CONFIG = "config"; - const USER = "user"; - const GROUP = "group"; - const ACCESS = "access"; - const ACCOUNT = "account"; - - public function describe($section) { - // placeholder - return $section; - } -} - -class USectionTest extends UApi { - const CONNECTION = "connection"; - const ACCESS = "access"; - - public function describe($constant) { - switch ($constant) { - case USectionTest::CONNECTION: - return "Connection testing"; - case USectionTest::ACCESS: - return "Verifying the API key and test if user has access to the API"; - default: - return "__" . $constant . "__"; - } - } -} - -class USectionAgent extends UApi { - const CREATE_VOUCHER = "createVoucher"; - const GET_BINARIES = "getBinaries"; - const LIST_VOUCHERS = "listVouchers"; - const DELETE_VOUCHER = "deleteVoucher"; - - const LIST_AGENTS = "listAgents"; - const GET = "get"; - const SET_ACTIVE = "setActive"; - const CHANGE_OWNER = "changeOwner"; - const SET_NAME = "setName"; - const SET_CPU_ONLY = "setCpuOnly"; - const SET_EXTRA_PARAMS = "setExtraParams"; - const SET_ERROR_FLAG = "setErrorFlag"; - const SET_TRUSTED = "setTrusted"; - const DELETE_AGENT = "deleteAgent"; - - public function describe($constant) { - switch ($constant) { - case USectionAgent::CREATE_VOUCHER: - return "Creating new vouchers"; - case USectionAgent::GET_BINARIES: - return "Get a list of available agent binaries"; - case USectionAgent::LIST_VOUCHERS: - return "List existing vouchers"; - case USectionAgent::DELETE_VOUCHER: - return "Delete an existing voucher"; - case USectionAgent::LIST_AGENTS: - return "List all agents"; - case USectionAgent::GET: - return "Get details about an agent"; - case USectionAgent::SET_ACTIVE: - return "Set an agent active/inactive"; - case USectionAgent::CHANGE_OWNER: - return "Change the owner of an agent"; - case USectionAgent::SET_NAME: - return "Set the name of an agent"; - case USectionAgent::SET_CPU_ONLY: - return "Set if an agent is CPU only or not"; - case USectionAgent::SET_EXTRA_PARAMS: - return "Set extra flags for an agent"; - case USectionAgent::SET_ERROR_FLAG: - return "Set how errors from an agent should be handled"; - case USectionAgent::SET_TRUSTED: - return "Set if an agent is trusted or not"; - case USectionAgent::DELETE_AGENT: - return "Delete agents"; - default: - return "__" . $constant . "__"; - } - } -} - -class USectionTask extends UApi { - const LIST_TASKS = "listTasks"; - const GET_TASK = "getTask"; - const LIST_SUBTASKS = "listSubtasks"; - const GET_CHUNK = "getChunk"; - const GET_CRACKED = "getCracked"; - - const CREATE_TASK = "createTask"; - const RUN_PRETASK = "runPretask"; - const RUN_SUPERTASK = "runSupertask"; - - const SET_TASK_PRIORITY = "setTaskPriority"; - const SET_TASK_TOP_PRIORITY = "setTaskTopPriority"; - const SET_SUPERTASK_PRIORITY = "setSupertaskPriority"; - const SET_SUPERTASK_MAX_AGENTS = "setSupertaskMaxAgents"; - const SET_SUPERTASK_TOP_PRIORITY = "setSupertaskTopPriority"; - const SET_TASK_NAME = "setTaskName"; - const SET_TASK_COLOR = "setTaskColor"; - const SET_TASK_CPU_ONLY = "setTaskCpuOnly"; - const SET_TASK_SMALL = "setTaskSmall"; - const SET_TASK_MAX_AGENTS = "setTaskMaxAgents"; - const TASK_UNASSIGN_AGENT = "taskUnassignAgent"; - const TASK_ASSIGN_AGENT = "taskAssignAgent"; - const DELETE_TASK = "deleteTask"; - const PURGE_TASK = "purgeTask"; - - const SET_SUPERTASK_NAME = "setSupertaskName"; - const DELETE_SUPERTASK = "deleteSupertask"; - - const ARCHIVE_TASK = "archiveTask"; - const ARCHIVE_SUPERTASK = "archiveSupertask"; - - public function describe($constant) { - switch ($constant) { - case USectionTask::LIST_TASKS: - return "List all tasks"; - case USectionTask::GET_TASK: - return "Get details of a task"; - case USectionTask::LIST_SUBTASKS: - return "List subtasks of a running supertask"; - case USectionTask::GET_CHUNK: - return "Get details of a chunk"; - case USectionTask::CREATE_TASK: - return "Create a new task"; - case USectionTask::RUN_PRETASK: - return "Run an existing preconfigured task with a hashlist"; - case USectionTask::RUN_SUPERTASK: - return "Run a configured supertask with a hashlist"; - case USectionTask::SET_TASK_PRIORITY: - return "Set the priority of a task"; - case USectionTask::SET_TASK_TOP_PRIORITY: - return "Set task priority to the previous highest plus one hundred"; - case USectionTask::SET_SUPERTASK_PRIORITY: - return "Set the priority of a supertask"; - case USectionTask::SET_SUPERTASK_TOP_PRIORITY: - return "Set supertask priority to the previous highest plus one hundred"; - case USectionTask::SET_TASK_NAME: - return "Rename a task"; - case USectionTask::SET_TASK_COLOR: - return "Set the color of a task"; - case USectionTask::SET_TASK_CPU_ONLY: - return "Set if a task is CPU only or not"; - case USectionTask::SET_TASK_SMALL: - return "Set if a task is small or not"; - case USectionTask::TASK_UNASSIGN_AGENT: - return "Unassign an agent from a task"; - case USectionTask::DELETE_TASK: - return "Delete a task"; - case USectionTask::PURGE_TASK: - return "Purge a task"; - case USectionTask::SET_SUPERTASK_NAME: - return "Set the name of a supertask"; - case USectionTask::DELETE_SUPERTASK: - return "Delete a supertask"; - case USectionTask::ARCHIVE_TASK: - return "Archive tasks"; - case USectionTask::ARCHIVE_SUPERTASK: - return "Archive supertasks"; - case USectionTask::GET_CRACKED: - return "Retrieve all cracked hashes by a task"; - case USectionTask::SET_TASK_MAX_AGENTS: - return "Set max agents for tasks"; - case USectionTask::TASK_ASSIGN_AGENT: - return "Assign agents to a task"; - default: - return "__" . $constant . "__"; - } - } -} - -class USectionPretask extends UApi { - const LIST_PRETASKS = "listPretasks"; - const GET_PRETASK = "getPretask"; - const CREATE_PRETASK = "createPretask"; - - const SET_PRETASK_PRIORITY = "setPretaskPriority"; - const SET_PRETASK_MAX_AGENTS = "setPretaskMaxAgents"; - const SET_PRETASK_NAME = "setPretaskName"; - const SET_PRETASK_COLOR = "setPretaskColor"; - const SET_PRETASK_CHUNKSIZE = "setPretaskChunksize"; - const SET_PRETASK_CPU_ONLY = "setPretaskCpuOnly"; - const SET_PRETASK_SMALL = "setPretaskSmall"; - const DELETE_PRETASK = "deletePretask"; - - public function describe($constant) { - switch ($constant) { - case USectionPretask::LIST_PRETASKS: - return "List all preconfigured tasks"; - case USectionPretask::GET_PRETASK: - return "Get details about a preconfigured task"; - case USectionPretask::CREATE_PRETASK: - return "Create preconfigured tasks"; - case USectionPretask::SET_PRETASK_PRIORITY: - return "Set preconfigured tasks priorities"; - case USectionPretask::SET_PRETASK_NAME: - return "Rename preconfigured tasks"; - case USectionPretask::SET_PRETASK_COLOR: - return "Set the color of a preconfigured task"; - case USectionPretask::SET_PRETASK_CHUNKSIZE: - return "Change the chunk size for a preconfigured task"; - case USectionPretask::SET_PRETASK_CPU_ONLY: - return "Set if a preconfigured task is CPU only or not"; - case USectionPretask::SET_PRETASK_SMALL: - return "Set if a preconfigured task is small or not"; - case USectionPretask::DELETE_PRETASK: - return "Delete preconfigured tasks"; - case USectionPretask::SET_PRETASK_MAX_AGENTS: - return "Set max agents for a preconfigured task"; - default: - return "__" . $constant . "__"; - } - } -} - -class USectionSupertask extends UApi { - const LIST_SUPERTASKS = "listSupertasks"; - const GET_SUPERTASK = "getSupertask"; - const CREATE_SUPERTASK = "createSupertask"; - const IMPORT_SUPERTASK = "importSupertask"; - const SET_SUPERTASK_NAME = "setSupertaskName"; - const DELETE_SUPERTASK = "deleteSupertask"; - const BULK_SUPERTASK = "bulkSupertask"; - - public function describe($constant) { - switch ($constant) { - case USectionSupertask::LIST_SUPERTASKS: - return "List all supertasks"; - case USectionSupertask::GET_SUPERTASK: - return "Get details of a supertask"; - case USectionSupertask::CREATE_SUPERTASK: - return "Create a supertask"; - case USectionSupertask::IMPORT_SUPERTASK: - return "Import a supertask from masks"; - case USectionSupertask::SET_SUPERTASK_NAME: - return "Rename a configured supertask"; - case USectionSupertask::DELETE_SUPERTASK: - return "Delete a supertask"; - case USectionSupertask::BULK_SUPERTASK: - return "Create supertask out base command with files"; - default: - return "__" . $constant . "__"; - } - } -} - -class USectionHashlist extends UApi { - const LIST_HASLISTS = "listHashlists"; - const GET_HASHLIST = "getHashlist"; - const CREATE_HASHLIST = "createHashlist"; - const SET_HASHLIST_NAME = "setHashlistName"; - const SET_SECRET = "setSecret"; - const SET_ARCHIVED = "setArchived"; - - const IMPORT_CRACKED = "importCracked"; - const EXPORT_CRACKED = "exportCracked"; - const GENERATE_WORDLIST = "generateWordlist"; - const EXPORT_LEFT = "exportLeft"; - - const DELETE_HASHLIST = "deleteHashlist"; - const GET_HASH = "getHash"; - const GET_CRACKED = "getCracked"; - - public function describe($constant) { - switch ($constant) { - case USectionHashlist::LIST_HASLISTS: - return "List all hashlists"; - case USectionHashlist::GET_HASHLIST: - return "Get details of a hashlist"; - case USectionHashlist::CREATE_HASHLIST: - return "Create a new hashlist"; - case USectionHashlist::SET_HASHLIST_NAME: - return "Rename hashlists"; - case USectionHashlist::SET_SECRET: - return "Set if a hashlist is secret or not"; - case USectionHashlist::IMPORT_CRACKED: - return "Import cracked hashes"; - case USectionHashlist::EXPORT_CRACKED: - return "Export cracked hashes"; - case USectionHashlist::GENERATE_WORDLIST: - return "Generate wordlist from founds"; - case USectionHashlist::EXPORT_LEFT: - return "Export a left list of uncracked hashes"; - case USectionHashlist::DELETE_HASHLIST: - return "Delete hashlists"; - case USectionHashlist::GET_HASH: - return "Query for specific hashes"; - case USectionHashlist::GET_CRACKED: - return "Query cracked hashes of a hashlist"; - case USectionHashlist::SET_ARCHIVED: - return "Query to archive/un-archie hashlist"; - default: - return "__" . $constant . "__"; - } - } -} - -class USectionSuperhashlist extends UApi { - const LIST_SUPERHASHLISTS = "listSuperhashlists"; - const GET_SUPERHASHLIST = "getSuperhashlist"; - const CREATE_SUPERHASHLIST = "createSuperhashlist"; - const DELETE_SUPERHASHLIST = "deleteSuperhashlist"; - - public function describe($constant) { - switch ($constant) { - case USectionSuperhashlist::LIST_SUPERHASHLISTS: - return "List all superhashlists"; - case USectionSuperhashlist::GET_SUPERHASHLIST: - return "Get details about a superhashlist"; - case USectionSuperhashlist::CREATE_SUPERHASHLIST: - return "Create superhashlists"; - case USectionSuperhashlist::DELETE_SUPERHASHLIST: - return "Delete superhashlists"; - default: - return "__" . $constant . "__"; - } - } -} - -class USectionFile extends UApi { - const LIST_FILES = "listFiles"; - const GET_FILE = "getFile"; - const ADD_FILE = "addFile"; - - const RENAME_FILE = "renameFile"; - const SET_SECRET = "setSecret"; - const DELETE_FILE = "deleteFile"; - const SET_FILE_TYPE = "setFileType"; - - public function describe($constant) { - switch ($constant) { - case USectionFile::LIST_FILES: - return "List all files"; - case USectionFile::GET_FILE: - return "Get details of a file"; - case USectionFile::ADD_FILE: - return "Add new files"; - case USectionFile::RENAME_FILE: - return "Rename files"; - case USectionFile::SET_SECRET: - return "Set if a file is secret or not"; - case USectionFile::DELETE_FILE: - return "Delete files"; - case USectionFile::SET_FILE_TYPE: - return "Change type of files"; - default: - return "__" . $constant . "__"; - } - } -} - -class USectionCracker extends UApi { - const LIST_CRACKERS = "listCrackers"; - const GET_CRACKER = "getCracker"; - const DELETE_VERSION = "deleteVersion"; - const DELETE_CRACKER = "deleteCracker"; - - const CREATE_CRACKER = "createCracker"; - const ADD_VERSION = "addVersion"; - const UPDATE_VERSION = "updateVersion"; - - public function describe($constant) { - switch ($constant) { - case USectionCracker::LIST_CRACKERS: - return "List all crackers"; - case USectionCracker::GET_CRACKER: - return "Get details of a cracker"; - case USectionCracker::DELETE_VERSION: - return "Delete a specific version of a cracker"; - case USectionCracker::DELETE_CRACKER: - return "Deleting crackers"; - case USectionCracker::CREATE_CRACKER: - return "Create new crackers"; - case USectionCracker::ADD_VERSION: - return "Add new cracker versions"; - case USectionCracker::UPDATE_VERSION: - return "Update cracker versions"; - default: - return "__" . $constant . "__"; - } - } -} - -class USectionConfig extends UApi { - const LIST_SECTIONS = "listSections"; - const LIST_CONFIG = "listConfig"; - const GET_CONFIG = "getConfig"; - const SET_CONFIG = "setConfig"; - - public function describe($constant) { - switch ($constant) { - case USectionConfig::LIST_SECTIONS: - return "List available sections in config"; - case USectionConfig::LIST_CONFIG: - return "List config options of a given section"; - case USectionConfig::GET_CONFIG: - return "Get current value of a config"; - case USectionConfig::SET_CONFIG: - return "Change values of configs"; - default: - return "__" . $constant . "__"; - } - } -} - -class USectionUser extends UApi { - const LIST_USERS = "listUsers"; - const GET_USER = "getUser"; - const CREATE_USER = "createUser"; - const DISABLE_USER = "disableUser"; - const ENABLE_USER = "enableUser"; - const SET_USER_PASSWORD = "setUserPassword"; - const SET_USER_RIGHT_GROUP = "setUserRightGroup"; - - public function describe($constant) { - switch ($constant) { - case USectionUser::LIST_USERS: - return "List all users"; - case USectionUser::GET_USER: - return "Get details of a user"; - case USectionUser::CREATE_USER: - return "Create new users"; - case USectionUser::DISABLE_USER: - return "Disable a user account"; - case USectionUser::ENABLE_USER: - return "Enable a user account"; - case USectionUser::SET_USER_PASSWORD: - return "Set a user's password"; - case USectionUser::SET_USER_RIGHT_GROUP: - return "Change the permission group for a user"; - default: - return "__" . $constant . "__"; - } - } -} - -class USectionGroup extends UApi { - const LIST_GROUPS = "listGroups"; - const GET_GROUP = "getGroup"; - const CREATE_GROUP = "createGroup"; - const ABORT_CHUNKS_GROUP = "abortChunksGroup"; - const DELETE_GROUP = "deleteGroup"; - - const ADD_AGENT = "addAgent"; - const ADD_USER = "addUser"; - const REMOVE_AGENT = "removeAgent"; - const REMOVE_USER = "removeUser"; - - public function describe($constant) { - switch ($constant) { - case USectionGroup::LIST_GROUPS: - return "List all groups"; - case USectionGroup::GET_GROUP: - return "Get details of a group"; - case USectionGroup::CREATE_GROUP: - return "Create new groups"; - case USectionGroup::ABORT_CHUNKS_GROUP: - return "Abort all chunks dispatched to agents of this group"; - case USectionGroup::DELETE_GROUP: - return "Delete groups"; - case USectionGroup::ADD_AGENT: - return "Add agents to groups"; - case USectionGroup::ADD_USER: - return "Add users to groups"; - case USectionGroup::REMOVE_AGENT: - return "Remove agents from groups"; - case USectionGroup::REMOVE_USER: - return "Remove users from groups"; - default: - return "__" . $constant . "__"; - } - } -} - -class USectionAccess extends UApi { - const LIST_GROUPS = "listGroups"; - const GET_GROUP = "getGroup"; - const CREATE_GROUP = "createGroup"; - const DELETE_GROUP = "deleteGroup"; - const SET_PERMISSIONS = "setPermissions"; - - public function describe($constant) { - switch ($constant) { - case USectionAccess::LIST_GROUPS: - return "List permission groups"; - case USectionAccess::GET_GROUP: - return "Get details of a permission group"; - case USectionAccess::CREATE_GROUP: - return "Create a new permission group"; - case USectionAccess::DELETE_GROUP: - return "Delete permission groups"; - case USectionAccess::SET_PERMISSIONS: - return "Update permissions of a group"; - default: - return "__" . $constant . "__"; - } - } -} - -class USectionAccount extends UApi { - const GET_INFORMATION = "getInformation"; - const SET_EMAIL = "setEmail"; - const SET_SESSION_LENGTH = "setSessionLength"; - const CHANGE_PASSWORD = "changePassword"; - - public function describe($constant) { - switch ($constant) { - case USectionAccount::GET_INFORMATION: - return "Get account information"; - case USectionAccount::SET_EMAIL: - return "Change email"; - case USectionAccount::SET_SESSION_LENGTH: - return "Update session length"; - case USectionAccount::CHANGE_PASSWORD: - return "Change password"; - default: - return "__" . $constant . "__"; - } - } -} diff --git a/src/inc/handlers/AccessControlHandler.class.php b/src/inc/handlers/AccessControlHandler.php similarity index 86% rename from src/inc/handlers/AccessControlHandler.class.php rename to src/inc/handlers/AccessControlHandler.php index 7d0c8fd85..c20d79d1b 100644 --- a/src/inc/handlers/AccessControlHandler.class.php +++ b/src/inc/handlers/AccessControlHandler.php @@ -1,5 +1,13 @@ getMessage()); } - catch (HTMessages $m) { - UI::addMessage(UI::ERROR, $m->getHTMLMessage()); - } } } \ No newline at end of file diff --git a/src/inc/handlers/CrackerHandler.class.php b/src/inc/handlers/CrackerHandler.php similarity index 90% rename from src/inc/handlers/CrackerHandler.class.php rename to src/inc/handlers/CrackerHandler.php index 80f455d67..774854386 100644 --- a/src/inc/handlers/CrackerHandler.class.php +++ b/src/inc/handlers/CrackerHandler.php @@ -1,5 +1,13 @@ filter([Factory::FILTER => [$qF1, $qF2]]); foreach ($notifications as $notification) { DServerLog::log(DServerLog::TRACE, "Checking if we should send notification: " - . $action . ":" . $notification->getUserId()); + . $action . ":" . $notification->getUserId() + ); try { if ($notification->getObjectId() != null) { if (!self::matchesObjectInNotification($notification, $payload)) { @@ -64,15 +82,16 @@ public static function checkNotifications($action, $payload) { DServerLog::log(DServerLog::TRACE, "Discarding notification. User not authorized."); continue; } - + DServerLog::log(DServerLog::TRACE, "Sending notification", [$notification, $payload]); HashtopolisNotification::getInstances()[$notification->getNotification()]->execute($action, $payload, $notification); - } catch (Throwable $e) { + } + catch (Throwable $e) { DServerLog::log(DServerLog::ERROR, "Failed to send notification", [$e->getMessage(), $e->getTraceAsString()]); } } } - + private static function isAuthorizedToReceiveNotification($action, $notification, $payload): bool { switch ($action) { // Hashlists @@ -82,7 +101,7 @@ private static function isAuthorizedToReceiveNotification($action, $notification case DNotificationType::NEW_HASHLIST: $hashlist = $payload->getVal(DPayloadKeys::HASHLIST); return AccessUtils::userCanAccessHashlists($hashlist, self::getUserFromNotification($notification)); - + // Tasks case DNotificationType::TASK_COMPLETE: case DNotificationType::DELETE_TASK: @@ -90,35 +109,35 @@ private static function isAuthorizedToReceiveNotification($action, $notification $task = $payload->getVal(DPayloadKeys::TASK); $taskWrapper = Factory::getTaskWrapperFactory()->get($task->getTaskWrapperId()); return AccessUtils::userCanAccessTask($taskWrapper, self::getUserFromNotification($notification)); - + // Agents case DNotificationType::AGENT_ERROR: case DNotificationType::OWN_AGENT_ERROR: case DNotificationType::DELETE_AGENT: $agent = $payload->getVal(DPayloadKeys::AGENT); return AccessUtils::userCanAccessAgent($agent, self::getUserFromNotification($notification)); - + case DNotificationType::NEW_AGENT: $accessControl = AccessControl::getInstance(self::getUserFromNotification($notification)); return $accessControl->hasPermission(DAccessControl::MANAGE_AGENT_ACCESS); - + // Users case DNotificationType::USER_DELETED: case DNotificationType::USER_LOGIN_FAILED: case DNotificationType::USER_CREATED: $accessControl = AccessControl::getInstance(self::getUserFromNotification($notification)); return $accessControl->hasPermission(DAccessControl::USER_CONFIG_ACCESS); - + case DNotificationType::LOG_ERROR: case DNotificationType::LOG_WARN: case DNotificationType::LOG_FATAL: $accessControl = AccessControl::getInstance(self::getUserFromNotification($notification)); return $accessControl->hasPermission(DAccessControl::SERVER_CONFIG_ACCESS); } - + return false; } - + private static function matchesObjectInNotification($notification, $payload): bool { $obj = 0; switch (DNotificationType::getObjectType($notification->getAction())) { @@ -137,7 +156,7 @@ private static function matchesObjectInNotification($notification, $payload): bo } return $obj != 0 && $obj == $notification->getObjectId(); } - + private static function getUserFromNotification($notification): User { return Factory::getUserFactory()->get($notification->getUserId()); } diff --git a/src/inc/handlers/PreprocessorHandler.class.php b/src/inc/handlers/PreprocessorHandler.php similarity index 88% rename from src/inc/handlers/PreprocessorHandler.class.php rename to src/inc/handlers/PreprocessorHandler.php index f8cc52f5e..19e5a9af7 100644 --- a/src/inc/handlers/PreprocessorHandler.class.php +++ b/src/inc/handlers/PreprocessorHandler.php @@ -1,5 +1,13 @@ getValue()) { $config->setValue('0'); } - else{ + else { $config->setValue('1'); } break; diff --git a/src/inc/user-api/UserAPICracker.class.php b/src/inc/user_api/UserAPICracker.php similarity index 93% rename from src/inc/user-api/UserAPICracker.class.php rename to src/inc/user_api/UserAPICracker.php index 94964ca2c..3fd2e671c 100644 --- a/src/inc/user-api/UserAPICracker.class.php +++ b/src/inc/user_api/UserAPICracker.php @@ -1,5 +1,17 @@ user); $this->sendSuccessResponse($QUERY); } - + /** * @param array $QUERY * @throws HTException diff --git a/src/inc/user-api/UserAPISuperhashlist.class.php b/src/inc/user_api/UserAPISuperhashlist.php similarity index 89% rename from src/inc/user-api/UserAPISuperhashlist.class.php rename to src/inc/user_api/UserAPISuperhashlist.php index 3e862912a..a31ae07ff 100644 --- a/src/inc/user-api/UserAPISuperhashlist.class.php +++ b/src/inc/user_api/UserAPISuperhashlist.php @@ -1,5 +1,21 @@ user); $this->sendSuccessResponse($QUERY); } - - /** + + /** * @param array $QUERY * @throws HTException */ @@ -216,7 +235,7 @@ private function setTaskMaxAgents($QUERY) { TaskUtils::setTaskMaxAgents($QUERY[UQueryTask::TASK_ID], $QUERY[UQueryTask::TASK_MAX_AGENTS], $this->user); $this->sendSuccessResponse($QUERY); } - + /** * @param array $QUERY * @throws HTException @@ -228,7 +247,7 @@ private function setSuperTaskMaxAgents($QUERY) { TaskUtils::setSuperTaskMaxAgents($QUERY[UQueryTask::SUPERTASK_ID], $QUERY[UQueryTask::SUPERTASK_MAX_AGENTS], $this->user); $this->sendSuccessResponse($QUERY); } - + /** * @param array $QUERY * @throws HTException diff --git a/src/inc/user-api/UserAPITest.class.php b/src/inc/user_api/UserAPITest.php similarity index 82% rename from src/inc/user-api/UserAPITest.class.php rename to src/inc/user_api/UserAPITest.php index 3b6837ab8..9d5bbdfae 100644 --- a/src/inc/user-api/UserAPITest.class.php +++ b/src/inc/user_api/UserAPITest.php @@ -1,8 +1,16 @@ rightGroup->getPermissions() == 'ALL') { - return true; // ALL denotes admin permissions which are independant of which access variables exactly exist + return true; // ALL denotes admin permissions which are independent of which access variables exactly exist } if (!is_array($perm)) { $perm = array($perm); diff --git a/src/inc/utils/AccessControlUtils.class.php b/src/inc/utils/AccessControlUtils.php similarity index 89% rename from src/inc/utils/AccessControlUtils.class.php rename to src/inc/utils/AccessControlUtils.php index 253ccf8c0..921aa918f 100644 --- a/src/inc/utils/AccessControlUtils.class.php +++ b/src/inc/utils/AccessControlUtils.php @@ -1,9 +1,16 @@ filter([]); } + /** + * @throws HTException + */ public static function addToPermissions($groupId, $perm) { $group = AccessControlUtils::getGroup($groupId); $current_permissions = $group->getPermissions(); @@ -29,11 +39,11 @@ public static function addToPermissions($groupId, $perm) { throw new HTException("Administrator group cannot be changed!"); } $current_permissions_decoded = json_decode($current_permissions, true); - + $merged_permissions = array_merge($current_permissions_decoded, $perm); Factory::getRightGroupFactory()->set($group, RightGroup::PERMISSIONS, json_encode($merged_permissions)); } - + /** * @param int $groupId * @param array $perm @@ -104,6 +114,7 @@ public static function createGroup(string $groupName): RightGroup { /** * @param int $groupId * @throws HttpError + * @throws HTException */ public static function deleteGroup($groupId) { $group = AccessControlUtils::getGroup($groupId); diff --git a/src/inc/utils/AccessGroupUtils.class.php b/src/inc/utils/AccessGroupUtils.php similarity index 89% rename from src/inc/utils/AccessGroupUtils.class.php rename to src/inc/utils/AccessGroupUtils.php index 589ab4f85..8b3dc9290 100644 --- a/src/inc/utils/AccessGroupUtils.class.php +++ b/src/inc/utils/AccessGroupUtils.php @@ -1,16 +1,28 @@ DLimits::ACCESS_GROUP_MAX_LENGTH) { @@ -58,6 +71,9 @@ public static function createGroup($groupName) { return $group; } + /** + * @throws HTException + */ public static function rename($accessGroupId, $newname) { $accessGroup = AccessGroupUtils::getGroup($accessGroupId); $name = htmlentities($newname, ENT_QUOTES, "UTF-8"); @@ -186,7 +202,7 @@ public static function deleteGroup($groupId) { $qF = new QueryFilter(Hashlist::ACCESS_GROUP_ID, $group->getId(), "="); $uS = new UpdateSet(Hashlist::ACCESS_GROUP_ID, $default->getId()); Factory::getHashlistFactory()->massUpdate([Factory::FILTER => $qF, Factory::UPDATE => $uS]); - + // update associations of files with this group $qF = new QueryFilter(File::ACCESS_GROUP_ID, $group->getId(), "="); $uS = new UpdateSet(File::ACCESS_GROUP_ID, $default->getId()); diff --git a/src/inc/utils/AccessUtils.class.php b/src/inc/utils/AccessUtils.php similarity index 87% rename from src/inc/utils/AccessUtils.class.php rename to src/inc/utils/AccessUtils.php index 1b3989ed8..00b08e162 100644 --- a/src/inc/utils/AccessUtils.class.php +++ b/src/inc/utils/AccessUtils.php @@ -1,17 +1,22 @@ $permission_set) { + foreach (json_decode($val) as $rightgroup_perm => $permission_set) { if ($permission_set) { $user_available_perms = array_unique(array_merge($user_available_perms, AbstractBaseAPI::$acl_mapping[$rightgroup_perm])); } } // Create output document - $retval_perms = array_combine($all_perms, array_fill(0,count($all_perms), false)); - foreach($user_available_perms as $perm) { + $retval_perms = array_combine($all_perms, array_fill(0, count($all_perms), false)); + foreach ($user_available_perms as $perm) { $retval_perms[$perm] = True; } } diff --git a/src/inc/utils/AccountUtils.php b/src/inc/utils/AccountUtils.php index 4937a56ab..a1dfc6055 100644 --- a/src/inc/utils/AccountUtils.php +++ b/src/inc/utils/AccountUtils.php @@ -1,7 +1,17 @@ getId(), DLogEntry::INFO, "Binary " . $agentBinary->getFilename() . " was updated!"); } - + public static function editUpdateTracker($binaryId, $updateTracker, $user) { $binary = AgentBinaryUtils::getBinary($binaryId); if ($updateTracker != $binary->getUpdateTrack()) { Factory::getAgentBinaryFactory()->mset($binary, [ - AgentBinary::UPDATE_AVAILABLE => '', - AgentBinary::UPDATE_TRACK => $updateTracker - ] - ); - } else { + AgentBinary::UPDATE_AVAILABLE => '', + AgentBinary::UPDATE_TRACK => $updateTracker + ] + ); + } + else { Factory::getAgentBinaryFactory()->set($binary, AgentBinary::UPDATE_TRACK, $updateTracker); } Util::createLogEntry(DLogEntryIssuer::USER, $user->getId(), DLogEntry::INFO, "Binary " . $binary->getFilename() . " was updated!"); } - + public static function editName($binaryId, $filename, $user) { if (!file_exists(dirname(__FILE__) . "/../../bin/" . basename($filename))) { throw new HTException("Provided filename does not exist!"); @@ -101,7 +107,7 @@ public static function editName($binaryId, $filename, $user) { Factory::getAgentBinaryFactory()->set($agentBinary, AgentBinary::FILENAME, $filename); Util::createLogEntry(DLogEntryIssuer::USER, $user->getId(), DLogEntry::INFO, "Binary " . $agentBinary->getFilename() . " was updated!"); } - + public static function editType($binaryId, $type, $user) { $agentBinary = AgentBinaryUtils::getBinary($binaryId); diff --git a/src/inc/utils/AgentUtils.class.php b/src/inc/utils/AgentUtils.php similarity index 92% rename from src/inc/utils/AgentUtils.class.php rename to src/inc/utils/AgentUtils.php index aca163fe8..fe2b01066 100644 --- a/src/inc/utils/AgentUtils.class.php +++ b/src/inc/utils/AgentUtils.php @@ -1,23 +1,39 @@ $max) ? $t : $max; } - return strval($max)."°"; + return strval($max) . "°"; } - + /** * @param AgentStat $cpuUtil * @return string @@ -177,9 +193,9 @@ public static function getCpuUtilStatusValue($cpuUtil) { $sum += $u; } $avg = $sum / sizeof($cpuUtil); - return round($avg, 1)."%"; + return round($avg, 1) . "%"; } - + /** * @param Agent $agent * @param mixed $types @@ -190,7 +206,7 @@ public static function getGraphData($agent, $types) { if ($limit <= 0) { $limit = 100; } - + $qF1 = new ContainFilter(AgentStat::STAT_TYPE, $types); $qF2 = new QueryFilter(AgentStat::AGENT_ID, $agent->getId(), "="); $oF1 = new OrderFilter(AgentStat::TIME, "DESC"); @@ -252,7 +268,7 @@ public static function getGraphData($agent, $types) { } return ["xlabels" => $xlabels, "sets" => $datasets, "axes" => $axes]; } - + /** * @param int $agentId * @param boolean $isCpuOnly @@ -263,7 +279,7 @@ public static function setAgentCpu($agentId, $isCpuOnly, $user) { $agent = AgentUtils::getAgent($agentId, $user); Factory::getAgentFactory()->set($agent, Agent::CPU_ONLY, ($isCpuOnly) ? 1 : 0); } - + /** * @param int $agentId * @param User $user @@ -271,11 +287,11 @@ public static function setAgentCpu($agentId, $isCpuOnly, $user) { */ public static function clearErrors($agentId, $user) { $agent = AgentUtils::getAgent($agentId, $user); - + $qF = new QueryFilter(AgentError::AGENT_ID, $agent->getId(), "="); Factory::getAgentErrorFactory()->massDeletion([Factory::FILTER => $qF]); } - + /** * @param int $agentId * @param string $newname @@ -290,7 +306,7 @@ public static function rename($agentId, $newname, $user) { } Factory::getAgentFactory()->set($agent, Agent::AGENT_NAME, $name); } - + /** * @param int $agentId * @param User $user @@ -298,13 +314,13 @@ public static function rename($agentId, $newname, $user) { */ public static function delete($agentId, $user) { $agent = AgentUtils::getAgent($agentId, $user); - + Factory::getAgentFactory()->getDB()->beginTransaction(); $name = $agent->getAgentName(); - + $payload = new DataSet(array(DPayloadKeys::AGENT => $agent)); NotificationHandler::checkNotifications(DNotificationType::DELETE_AGENT, $payload); - + if (AgentUtils::deleteDependencies($agent)) { Factory::getAgentFactory()->getDB()->commit(); Util::createLogEntry("User", (($user == null) ? 0 : ($user->getId())), DLogEntry::INFO, "Agent " . $name . " got deleted."); @@ -314,7 +330,7 @@ public static function delete($agentId, $user) { throw new HTException("Error occured on deletion of agent!"); } } - + /** * @param Agent $agent * @return boolean @@ -331,26 +347,26 @@ public static function deleteDependencies($agent) { } $qF = new QueryFilter(AgentError::AGENT_ID, $agent->getId(), "="); Factory::getAgentErrorFactory()->massDeletion([Factory::FILTER => $qF]); - + $qF = new QueryFilter(AgentStat::AGENT_ID, $agent->getId(), "="); Factory::getAgentStatFactory()->massDeletion([Factory::FILTER => $qF]); - + $qF = new QueryFilter(AgentZap::AGENT_ID, $agent->getId(), "="); Factory::getAgentZapFactory()->massDeletion([Factory::FILTER => $qF]); - + $qF = new QueryFilter(HealthCheckAgent::AGENT_ID, $agent->getId(), "="); Factory::getHealthCheckAgentFactory()->massDeletion([Factory::FILTER => $qF]); - + $qF = new QueryFilter(Speed::AGENT_ID, $agent->getId(), "="); Factory::getSpeedFactory()->massDeletion([Factory::FILTER => $qF]); - + $qF = new QueryFilter(Zap::AGENT_ID, $agent->getId(), "="); $uS = new UpdateSet(Zap::AGENT_ID, null); Factory::getZapFactory()->massUpdate([Factory::FILTER => $qF, Factory::UPDATE => $uS]); - + $qF = new QueryFilter(AccessGroupAgent::AGENT_ID, $agent->getId(), "="); Factory::getAccessGroupAgentFactory()->massDeletion([Factory::FILTER => $qF]); - + $chunks = Factory::getChunkFactory()->filter([Factory::FILTER => $qF]); $chunkIds = array(); foreach ($chunks as $chunk) { @@ -373,7 +389,7 @@ public static function deleteDependencies($agent) { */ public static function assign(int $agentId, int $taskId, User $user): ?Assignment { $agent = AgentUtils::getAgent($agentId, $user); - + if ($taskId == 0 || empty($taskId)) { // unassign $qF = new QueryFilter(Agent::AGENT_ID, $agent->getId(), "="); Factory::getAssignmentFactory()->massDeletion([Factory::FILTER => $qF]); @@ -383,7 +399,7 @@ public static function assign(int $agentId, int $taskId, User $user): ?Assignmen } return null; } - + $task = Factory::getTaskFactory()->get(intval($taskId)); if ($task == null) { throw new HttpError("Invalid task!"); @@ -391,21 +407,21 @@ public static function assign(int $agentId, int $taskId, User $user): ?Assignmen else if (!AccessUtils::agentCanAccessTask($agent, $task)) { throw new HttpError("This agent cannot access this task - either group mismatch, or agent is not configured as Trusted to access secret tasks"); } - + $taskWrapper = Factory::getTaskWrapperFactory()->get($task->getTaskWrapperId()); if (!AccessUtils::userCanAccessTask($taskWrapper, $user)) { throw new HttpError("No access to this task!"); } - + $qF = new QueryFilter(Assignment::TASK_ID, $task->getId(), "="); $assignments = Factory::getAssignmentFactory()->filter([Factory::FILTER => $qF]); if ($task->getIsSmall() && sizeof($assignments) > 0) { throw new HttpError("You cannot assign agent to this task as the limit of assignments is reached!"); } - + $qF = new QueryFilter(Agent::AGENT_ID, $agent->getId(), "="); $assignments = Factory::getAssignmentFactory()->filter([Factory::FILTER => $qF]); - + $benchmark = 0; if (sizeof($assignments) > 0) { if ($assignments[0]->getTaskId() === $taskId) { @@ -430,7 +446,7 @@ public static function assign(int $agentId, int $taskId, User $user): ?Assignmen } return $assignment; } - + /** * @param int $agentId * @param int $ignoreErrors @@ -445,7 +461,7 @@ public static function changeIgnoreErrors($agentId, $ignoreErrors, $user) { } Factory::getAgentFactory()->set($agent, Agent::IGNORE_ERRORS, $ignore); } - + /** * @param int $agentId * @param User $user @@ -462,7 +478,7 @@ public static function getAgent($agentId, $user = null) { } return $agent; } - + /** * @param int $agentId * @param boolean $trusted @@ -473,7 +489,7 @@ public static function setTrusted($agentId, $trusted, $user) { $agent = AgentUtils::getAgent($agentId, $user); Factory::getAgentFactory()->set($agent, Agent::IS_TRUSTED, ($trusted) ? 1 : 0); } - + /** * @param int $agentId * @param int|string $ownerId @@ -502,7 +518,7 @@ public static function changeOwner($agentId, $ownerId, $user) { } Util::createLogEntry(DLogEntryIssuer::USER, $user->getId(), DLogEntry::INFO, "Owner for agent " . $agent->getAgentName() . " was changed to " . $username); } - + /** * @param int $agentId * @param string $cmdParameters @@ -516,7 +532,7 @@ public static function changeCmdParameters($agentId, $cmdParameters, $user) { } Factory::getAgentFactory()->set($agent, Agent::CMD_PARS, $cmdParameters); } - + /** * @param int $agentId * @param boolean $active @@ -532,7 +548,7 @@ public static function setActive($agentId, $active, $user, $toggle = false) { else if (!AccessUtils::userCanAccessAgent($agent, $user)) { throw new HTException("No access to this agent!"); } - + if ($toggle) { $set = ($agent->getIsActive() == 1) ? 0 : 1; } @@ -553,12 +569,12 @@ public static function createVoucher(string $newVoucher): RegVoucher { if ($check != null) { throw new HttpConflict("Same voucher already exists!"); } - + $key = htmlentities($newVoucher, ENT_QUOTES, "UTF-8"); $voucher = new RegVoucher(null, $key, time()); return Factory::getRegVoucherFactory()->save($voucher); } - + /** * @param int|string $voucher * @throws HTException diff --git a/src/inc/utils/ApiUtils.class.php b/src/inc/utils/ApiUtils.php similarity index 94% rename from src/inc/utils/ApiUtils.class.php rename to src/inc/utils/ApiUtils.php index 531797b6c..10f69e04f 100644 --- a/src/inc/utils/ApiUtils.class.php +++ b/src/inc/utils/ApiUtils.php @@ -1,9 +1,14 @@ [attributes] * @throws HTException - * + * * This is a new updateConfigs function that unlike the updateConfig is compliant * for the APIv2 */ @@ -77,7 +90,7 @@ public static function updateConfigs($arr) { $currentConfig = Factory::getConfigFactory()->get($id); $newValue = $attributes[Config::VALUE] ?? null; $name = $currentConfig->getItem(); - + if (is_null($newValue)) { throw new HTException("No new config value provided"); } @@ -87,7 +100,7 @@ public static function updateConfigs($arr) { if ($currentConfig->getValue() === $newValue) { continue; //The value was not changed so we dont need to update it } - + $lengthLimits = [ DConfig::HASH_MAX_LENGTH => 'setMaxHashLength', DConfig::PLAINTEXT_MAX_LENGTH => 'setPlaintextMaxLength' @@ -95,17 +108,18 @@ public static function updateConfigs($arr) { if (isset($lengthLimits[$name])) { $limit = intval($newValue); if (!Util::{$lengthLimits[$name]}($limit)) { - throw new HTException("Failed to update {$name}!"); + throw new HTException("Failed to update {$name}!"); } } - + SConfig::getInstance()->addValue($name, $newValue); $currentConfig->setValue($newValue); ConfigUtils::set($currentConfig, false); - } + } SConfig::reload(); } + /** * @param array $arr * @throws HTException diff --git a/src/inc/utils/CrackerBinaryUtils.class.php b/src/inc/utils/CrackerBinaryUtils.php similarity index 77% rename from src/inc/utils/CrackerBinaryUtils.class.php rename to src/inc/utils/CrackerBinaryUtils.php index 97a4da603..721ffb80f 100644 --- a/src/inc/utils/CrackerBinaryUtils.class.php +++ b/src/inc/utils/CrackerBinaryUtils.php @@ -1,14 +1,18 @@ getUser(); }; - + $receiver = trim($receiver); if (!isset(HashtopolisNotification::getInstances()[$notification])) { throw new HttpError("This notification is not available!"); @@ -32,7 +43,7 @@ public static function createNotification(string $actionType, string $notificati throw new HttpError("You need to fill in a receiver!"); } else if (!AccessControl::getInstance()->hasPermission(DNotificationType::getRequiredPermission($actionType))) { - throw new HttpError("You are not allowed to use this action type!"); + throw new HttpError("You are not allowed to use this action type!"); } $objectId = null; switch (DNotificationType::getObjectType($actionType)) { @@ -68,7 +79,7 @@ public static function createNotification(string $actionType, string $notificati $objectId = $task->getId(); break; } - + $notificationSetting = new NotificationSetting(null, $actionType, $objectId, $notification, $user->getId(), $receiver, 1); return Factory::getNotificationSettingFactory()->save($notificationSetting); } diff --git a/src/inc/utils/PreprocessorUtils.class.php b/src/inc/utils/PreprocessorUtils.php similarity index 93% rename from src/inc/utils/PreprocessorUtils.class.php rename to src/inc/utils/PreprocessorUtils.php index 6afceafb4..90954e644 100644 --- a/src/inc/utils/PreprocessorUtils.class.php +++ b/src/inc/utils/PreprocessorUtils.php @@ -1,9 +1,15 @@ set($preprocessor, Preprocessor::NAME, $name); } - + /** * @param $preprocessorId * @param $binaryName @@ -112,10 +118,11 @@ public static function editName($preprocessorId, $name) { * @throws HTException when BinaryName is empty or contains blacklisted characters */ public static function editBinaryName($preprocessorId, $binaryName) { - + if (strlen($binaryName) == 0) { throw new HTException("Binary basename cannot be empty!"); - } else if (Util::containsBlacklistedChars($binaryName)) { + } + else if (Util::containsBlacklistedChars($binaryName)) { throw new HTException("The binary name must contain no blacklisted characters!"); } $preprocessor = PreprocessorUtils::getPreprocessor($preprocessorId); @@ -129,10 +136,11 @@ public static function editBinaryName($preprocessorId, $binaryName) { * @throws HTException when keyspaceCommand is empty or contains blacklisted characters */ public static function editKeyspaceCommand($preprocessorId, $keyspaceCommand) { - + if (strlen($keyspaceCommand) == 0) { $keyspaceCommand == null; - } else if (Util::containsBlacklistedChars($keyspaceCommand)) { + } + else if (Util::containsBlacklistedChars($keyspaceCommand)) { throw new HTException("The keyspace command must contain no blacklisted characters!"); } $preprocessor = PreprocessorUtils::getPreprocessor($preprocessorId); @@ -146,16 +154,17 @@ public static function editKeyspaceCommand($preprocessorId, $keyspaceCommand) { * @throws HTException when skipCommand is empty or contains blacklisted characters */ public static function editSkipCommand($preprocessorId, $skipCommand) { - + if (strlen($skipCommand) == 0) { $skipCommand == null; - } else if (Util::containsBlacklistedChars($skipCommand)) { + } + else if (Util::containsBlacklistedChars($skipCommand)) { throw new HTException("The skip command must contain no blacklisted characters!"); } $preprocessor = PreprocessorUtils::getPreprocessor($preprocessorId); Factory::getPreprocessorFactory()->set($preprocessor, Preprocessor::SKIP_COMMAND, $skipCommand); } - + /** * @param $preprocessorId * @param $limitCommand @@ -163,16 +172,17 @@ public static function editSkipCommand($preprocessorId, $skipCommand) { * @throws HTException when limitCommand is empty or contains blacklisted characters */ public static function editLimitCommand($preprocessorId, $limitCommand) { - + if (strlen($limitCommand) == 0) { $limitCommand == null; - } else if (Util::containsBlacklistedChars($limitCommand)) { + } + else if (Util::containsBlacklistedChars($limitCommand)) { throw new HTException("The limit command must contain no blacklisted characters!"); } $preprocessor = PreprocessorUtils::getPreprocessor($preprocessorId); Factory::getPreprocessorFactory()->set($preprocessor, Preprocessor::LIMIT_COMMAND, $limitCommand); } - + /** * @param $preprocessorId * @param $name diff --git a/src/inc/utils/PretaskUtils.class.php b/src/inc/utils/PretaskUtils.php similarity index 93% rename from src/inc/utils/PretaskUtils.class.php rename to src/inc/utils/PretaskUtils.php index 526606a97..77a934e2a 100644 --- a/src/inc/utils/PretaskUtils.class.php +++ b/src/inc/utils/PretaskUtils.php @@ -1,13 +1,26 @@ set($pretask, Pretask::PRIORITY, intval($priority)); } - - /** + + /** * @param int $pretaskId * @param int $maxAgents * @throws HTException diff --git a/src/inc/utils/RunnerUtils.class.php b/src/inc/utils/RunnerUtils.php similarity index 95% rename from src/inc/utils/RunnerUtils.class.php rename to src/inc/utils/RunnerUtils.php index 5b6ec3e33..110ed8248 100644 --- a/src/inc/utils/RunnerUtils.class.php +++ b/src/inc/utils/RunnerUtils.php @@ -1,5 +1,11 @@ $pretask->getPriority()) { $wrapperPriority = $pretask->getPriority(); } - } - + } + $taskWrapper = new TaskWrapper(null, $wrapperPriority, $wrapperMaxAgents, DTaskTypes::SUPERTASK, $hashlist->getId(), $hashlist->getAccessGroupId(), $supertask->getSupertaskName(), 0, 0); $taskWrapper = Factory::getTaskWrapperFactory()->save($taskWrapper); diff --git a/src/inc/utils/TaskUtils.class.php b/src/inc/utils/TaskUtils.php similarity index 96% rename from src/inc/utils/TaskUtils.class.php rename to src/inc/utils/TaskUtils.php index f2df2ad92..e5cb3c520 100644 --- a/src/inc/utils/TaskUtils.class.php +++ b/src/inc/utils/TaskUtils.php @@ -1,32 +1,52 @@ set($task, Task::IS_ARCHIVED, 1); } - + /** * @param int $taskId * @param bool $taskState @@ -635,7 +655,7 @@ public static function setTaskMaxAgents($taskId, $maxAgents, $user) { Factory::getTaskWrapperFactory()->set($taskWrapper, TaskWrapper::MAX_AGENTS, $maxAgents); } } - + /** * @param int $superTaskId * @param int $maxAgents @@ -647,7 +667,7 @@ public static function setSuperTaskMaxAgents($superTaskId, $maxAgents, $user) { $maxAgents = intval($maxAgents); Factory::getTaskWrapperFactory()->set($taskWrapper, TaskWrapper::MAX_AGENTS, $maxAgents); } - + /** * @param int $taskId * @param string $color @@ -1031,7 +1051,7 @@ public static function getBestTask($agent, $all = false) { else if ($fullyCracked) { continue; // all hashes of this hashlist are cracked, so we continue } - + $candidateTasks = self::getCandidateTasks($agent, $accessGroups, $taskWrapper); if (!$all && !empty($candidateTasks)) { return current($candidateTasks); @@ -1045,11 +1065,11 @@ public static function getBestTask($agent, $all = false) { } return null; } - + private static function getCandidateTasks($agent, $accessGroups, $taskWrapper) { $totalAssignments = 0; $candidateTasks = []; - + // load assigned tasks for this TaskWrapper $qF = new QueryFilter(Task::TASK_WRAPPER_ID, $taskWrapper->getId(), "="); $oF = new OrderFilter(Task::PRIORITY, "DESC"); @@ -1061,14 +1081,14 @@ private static function getCandidateTasks($agent, $accessGroups, $taskWrapper) { if ($taskWrapper->getMaxAgents() > 0 && $totalAssignments >= $taskWrapper->getMaxAgents()) { return []; } - + // check if it's a small task or maxAgents limits the number of assignments if ($task->getIsSmall() == 1 || $task->getMaxAgents() > 0) { if (self::isSaturatedByOtherAgents($task, $agent)) { continue; } } - + // check if a task suits to this agent $files = TaskUtils::getFilesOfTask($task); $permitted = true; @@ -1083,18 +1103,18 @@ private static function getCandidateTasks($agent, $accessGroups, $taskWrapper) { if (!$permitted) { continue; // at least one of the files required for this task is secret and the agent not, so this task cannot be used } - + // we need to check now if the task is already completed or fully dispatched $task = TaskUtils::checkTask($task, $agent); if ($task == null) { continue; // if it is completed we go to the next } - + // check if it's a cpu/gpu task if ($task->getIsCpuTask() != $agent->getCpuOnly()) { continue; } - + // accumulate all candidate tasks $candidateTasks[] = $task; } @@ -1196,11 +1216,11 @@ public static function checkTask($task, $agent = null) { else if ($task->getUsePreprocessor() && $task->getKeyspace() == DPrince::PRINCE_KEYSPACE) { return $task; } - + $qF1 = new QueryFilter(Chunk::TASK_ID, $task->getId(), "="); $qF2 = new QueryFilter(Chunk::PROGRESS, 10000, ">="); $sum = Factory::getChunkFactory()->sumFilter([Factory::FILTER => [$qF1, $qF2]], Chunk::LENGTH); - + $dispatched = $task->getSkipKeyspace() + $sum; $completed = $task->getSkipKeyspace() + $sum; @@ -1420,9 +1440,9 @@ public static function getCrackerInfo($task, $modifier = "info") { public static function numberOfOtherAssignedAgents($task, $agent) { $qF1 = new QueryFilter(Assignment::TASK_ID, $task->getId(), "="); $qF2 = new QueryFilter(Assignment::AGENT_ID, $agent->getId(), "<>"); - return Factory::getAssignmentFactory()->countFilter([Factory::FILTER => [$qF1, $qF2]]); + return Factory::getAssignmentFactory()->countFilter([Factory::FILTER => [$qF1, $qF2]]); } - + /** * Check if a task already has enough agents - apart from given agent - working on it, * with respect to the 'maxAgents' configuration @@ -1436,7 +1456,7 @@ public static function isSaturatedByOtherAgents($task, $agent) { return ($task->getIsSmall() == 1 && $numAssignments > 0) || // at least one agent is already assigned here ($task->getMaxAgents() > 0 && $numAssignments >= $task->getMaxAgents()); // at least maxAgents agents are already assigned } - + public static function getTaskProgress($task) { $qF1 = new QueryFilter(Chunk::TASK_ID, $task->getId(), "="); diff --git a/src/inc/utils/TaskwrapperUtils.class.php b/src/inc/utils/TaskWrapperUtils.php similarity index 77% rename from src/inc/utils/TaskwrapperUtils.class.php rename to src/inc/utils/TaskWrapperUtils.php index 7ebe1548b..67cd05b9f 100644 --- a/src/inc/utils/TaskwrapperUtils.class.php +++ b/src/inc/utils/TaskWrapperUtils.php @@ -1,12 +1,18 @@ getTaskType()) { @@ -34,7 +40,7 @@ public static function updatePriority($taskWrapperId, $priority, $user) { if ($task === null) { throw new HttpError("Invalid task, Taskwrapper does not have a task"); } - + TaskUtils::updatePriority($task->getId(), $priority, $user); break; case DTaskTypes::SUPERTASK: diff --git a/src/inc/utils/UserUtils.class.php b/src/inc/utils/UserUtils.php similarity index 88% rename from src/inc/utils/UserUtils.class.php rename to src/inc/utils/UserUtils.php index 824ac1f16..f944b96da 100644 --- a/src/inc/utils/UserUtils.class.php +++ b/src/inc/utils/UserUtils.php @@ -1,13 +1,29 @@ mset($user, [User::PASSWORD_HASH => $newHash, User::PASSWORD_SALT => $newSalt, User::IS_COMPUTED_PASSWORD => 0]); } - + /** * @param int $userId * @param string $password @@ -186,7 +202,7 @@ public static function setPassword($userId, $password, $adminUser) { * @throws HttpConflict * @throws HttpError */ - public static function createUser(string $username, string $email, int $rightGroupId, User $adminUser, bool $isValid = true, int $session_lifetime=3600): User { + public static function createUser(string $username, string $email, int $rightGroupId, User $adminUser, bool $isValid = true, int $session_lifetime = 3600): User { $username = htmlentities($username, ENT_QUOTES, "UTF-8"); $group = AccessControlUtils::getGroup($rightGroupId); if (!filter_var($email, FILTER_VALIDATE_EMAIL) || strlen($email) == 0) { @@ -206,7 +222,7 @@ public static function createUser(string $username, string $email, int $rightGro $newPass = Util::randomString(10); $newSalt = Util::randomString(20); $newHash = Encryption::passwordHash($newPass, $newSalt); - $user = new User(null, $username, $email, $newHash, $newSalt, $isValid ? 1: 0, 1, 0, time(), $session_lifetime, $group->getId(), 0, "", "", "", ""); + $user = new User(null, $username, $email, $newHash, $newSalt, $isValid ? 1 : 0, 1, 0, time(), $session_lifetime, $group->getId(), 0, "", "", "", ""); Factory::getUserFactory()->save($user); // add user to default group diff --git a/src/index.php b/src/index.php index 51b3be03b..969f403df 100755 --- a/src/index.php +++ b/src/index.php @@ -1,5 +1,10 @@ checkPermission(DViewControl::INDEX_VIEW_PERM); diff --git a/src/install/index.php b/src/install/index.php index 05de8d45d..0171be4f0 100755 --- a/src/install/index.php +++ b/src/install/index.php @@ -1,16 +1,31 @@ getDB()->query("ALTER TABLE `Task` MODIFY `attackCmd` TEXT NOT NULL;"); diff --git a/src/install/updates/update_v0.14.3_v0.14.4.php b/src/install/updates/update_v0.14.3_v0.14.4.php index d535bba92..fa73b3324 100644 --- a/src/install/updates/update_v0.14.3_v0.14.4.php +++ b/src/install/updates/update_v0.14.3_v0.14.4.php @@ -1,8 +1,6 @@ getDB()->query("ALTER TABLE `LogEntry` CHANGE `level` `level` VARCHAR(20) NOT NULL"); -echo "OK\n"; - -echo "Change plaintext error on BinaryHash... "; -Factory::getAgentFactory()->getDB()->query("ALTER TABLE `HashBinary` CHANGE `plaintext` `plaintext` VARCHAR(200) NULL DEFAULT NULL;"); -echo "OK\n"; - -echo "Check csharp binary... "; -$qF = new QueryFilter("type", "csharp", "="); -$binary = Factory::getAgentBinaryFactory()->filter([Factory::FILTER => $qF], true); -if ($binary != null) { - if (Comparator::lessThan($binary->getVersion(), "0.40")) { - echo "update version... "; - $binary->setVersion("0.40"); - Factory::getAgentBinaryFactory()->update($binary); - echo "OK"; - } -} -echo "\n"; - -echo "Update complete!\n"; diff --git a/src/install/updates/update_v0.2.x_v0.3.0.php b/src/install/updates/update_v0.2.x_v0.3.0.php deleted file mode 100644 index ec5126d74..000000000 --- a/src/install/updates/update_v0.2.x_v0.3.0.php +++ /dev/null @@ -1,68 +0,0 @@ -getDB()->query("ALTER TABLE `Task` ADD `skipKeyspace` BIGINT NOT NULL"); -echo "OK\n"; - -echo "Add Notification Table and Settings..."; -Factory::getAgentFactory()->getDB()->query("CREATE TABLE `NotificationSetting` (`notificationSettingId` INT(11) NOT NULL, `action` VARCHAR(50) COLLATE utf8_unicode_ci NOT NULL, `objectId` INT(11) NOT NULL, `notification` VARCHAR(50) COLLATE utf8_unicode_ci NOT NULL, `userId` INT(11) NOT NULL, `receiver` VARCHAR(200) COLLATE utf8_unicode_ci NOT NULL, `isActive` TINYINT(4) NOT NULL) ENGINE=InnoDB"); -echo "#"; -Factory::getAgentFactory()->getDB()->query("ALTER TABLE `NotificationSetting` ADD PRIMARY KEY (`notificationSettingId`), ADD KEY `NotificationSetting_ibfk_1` (`userId`)"); -echo "#"; -Factory::getAgentFactory()->getDB()->query("ALTER TABLE `NotificationSetting` MODIFY `notificationSettingId` INT(11) NOT NULL AUTO_INCREMENT"); -echo "#"; -Factory::getAgentFactory()->getDB()->query("ALTER TABLE `NotificationSetting` ADD CONSTRAINT `NotificationSetting_ibfk_1` FOREIGN KEY (`userId`) REFERENCES `User` (`userId`)"); -echo "OK\n"; - -echo "Applying new zapping...\n"; -echo "Dropping old zap table... "; -Factory::getAgentFactory()->getDB()->query("DROP TABLE `Zap`"); -echo "OK\n"; -echo "Creating new zap table... "; -Factory::getAgentFactory()->getDB()->query("CREATE TABLE `Zap` (`zapId` INT(11) AUTO_INCREMENT PRIMARY KEY NOT NULL,`hash` VARCHAR(512) NOT NULL,`solveTime` INT(11) NOT NULL,`agentId` INT(11) NOT NULL,`hashlistId` INT(11) NOT NULL)"); -echo "OK\n"; -echo "Creating agentZap table... "; -Factory::getAgentFactory()->getDB()->query("CREATE TABLE `AgentZap` (`agentId` INT(11) AUTO_INCREMENT PRIMARY KEY NOT NULL, `lastZapId` INT(11) NOT NULL)"); -echo "OK\n"; -echo "New zapping changes applied!\n"; - -echo "Check csharp binary... "; -$qF = new QueryFilter("type", "csharp", "="); -$binary = Factory::getAgentBinaryFactory()->filter([Factory::FILTER => $qF], true); -if ($binary != null) { - if (Comparator::lessThan($binary->getVersion(), "0.43")) { - echo "update version... "; - $binary->setVersion("0.43"); - Factory::getAgentBinaryFactory()->update($binary); - echo "OK"; - } -} -echo "\n"; - -echo "Please enter the base URL of the webpage (without protocol and hostname, just relatively to the root / of the domain):\n"; -$url = readline(); -$qF = new QueryFilter(Config::ITEM, DConfig::BASE_URL, "="); -$entry = Factory::getConfigFactory()->filter([Factory::FILTER => $qF], true); -echo "applying... "; -if ($entry == null) { - $entry = new Config(0, DConfig::BASE_URL, $url); - Factory::getConfigFactory()->save($entry); -} -else { - $entry->setValue($url); - Factory::getConfigFactory()->update($entry); -} -echo "OK\n"; - -echo "Update complete!\n"; diff --git a/src/install/updates/update_v0.3.0_v0.3.1.php b/src/install/updates/update_v0.3.0_v0.3.1.php deleted file mode 100644 index de4f594bc..000000000 --- a/src/install/updates/update_v0.3.0_v0.3.1.php +++ /dev/null @@ -1,13 +0,0 @@ -getDB()->query("ALTER TABLE `Zap` CHANGE `agentId` `agentId` INT(11) NULL"); -echo "OK\n"; - -echo "Update complete!\n"; diff --git a/src/install/updates/update_v0.3.1_v0.3.2.php b/src/install/updates/update_v0.3.1_v0.3.2.php deleted file mode 100644 index a1aaedc2d..000000000 --- a/src/install/updates/update_v0.3.1_v0.3.2.php +++ /dev/null @@ -1,29 +0,0 @@ -getDB()->query("ALTER TABLE `Zap` CHANGE `agentId` `agentId` INT(11) NULL"); -echo "OK\n"; - -echo "Check csharp binary... "; -$qF = new QueryFilter("type", "csharp", "="); -$binary = Factory::getAgentBinaryFactory()->filter([Factory::FILTER => $qF], true); -if ($binary != null) { - if (Comparator::lessThan($binary->getVersion(), "0.43.13")) { - echo "update version... "; - $binary->setVersion("0.43.13"); - Factory::getAgentBinaryFactory()->update($binary); - echo "OK"; - } -} -echo "\n"; - -echo "Update complete!\n"; diff --git a/src/install/updates/update_v0.3.2_v0.4.0.php b/src/install/updates/update_v0.3.2_v0.4.0.php deleted file mode 100644 index c2d8a93a0..000000000 --- a/src/install/updates/update_v0.3.2_v0.4.0.php +++ /dev/null @@ -1,102 +0,0 @@ -getDB()->query("INSERT INTO `Config` (`configId`, `item`, `value`) VALUES (NULL, 'disptolerance', '20'), (NULL, 'batchSize', '10000'), (NULL, 'donateOff', '0')"); -echo "OK\n"; - -echo "Change zap table... "; -Factory::getAgentFactory()->getDB()->query("ALTER TABLE `Zap` CHANGE `agentId` `agentId` INT(11) NULL"); -echo "OK\n"; - -echo "Add hash index... "; -Factory::getAgentFactory()->getDB()->query("ALTER TABLE `Hash` ADD INDEX(`hash`);"); -echo "OK\n"; - -echo "Increase hash length... "; -Factory::getAgentFactory()->getDB()->query("ALTER TABLE `Hash` CHANGE `hash` `hash` VARCHAR(1024) NOT NULL;"); -echo "OK\n"; - -echo "Add Yubikey... "; -Factory::getAgentFactory()->getDB()->query("INSERT INTO `Config` (`configId`, `item`, `value`) VALUES (NULL, 'yubikey_id', '')"); -Factory::getAgentFactory()->getDB()->query("INSERT INTO `Config` (`configId`, `item`, `value`) VALUES (NULL, 'yubikey_key', '')"); -Factory::getAgentFactory()->getDB()->query("INSERT INTO `Config` (`configId`, `item`, `value`) VALUES (NULL, 'yubikey_url', 'https://api.yubico.com/wsapi/2.0/verify')"); -Factory::getAgentFactory()->getDB()->query("ALTER TABLE `User` ADD yubikey INT(1) NOT NULL, ADD otp1 VARCHAR(50) NOT NULL, ADD otp2 VARCHAR(50) NOT NULL, ADD otp3 VARCHAR(50) NOT NULL, ADD otp4 VARCHAR(50) NOT NULL;"); -echo "OK\n"; - -echo "Add new Hashtypes... "; -Factory::getAgentFactory()->getDB()->query("INSERT INTO HashType (hashTypeId, description, isSalted) VALUES - (600,'BLAKE2b-512',0), - (9710,'MS Office <= 2003 $0/$1, MD5 + RC4, collider #1',0), - (9720,'MS Office <= 2003 $0/$1, MD5 + RC4, collider #2',0), - (9810,'MS Office <= 2003 $3, SHA1 + RC4, collider #1',0), - (9820,'MS Office <= 2003 $3, SHA1 + RC4, collider #2',0), - (10410,'PDF 1.1 - 1.3 (Acrobat 2 - 4), collider #1',0), - (10420,'PDF 1.1 - 1.3 (Acrobat 2 - 4), collider #2',0), - (12001,'Atlassian (PBKDF2-HMAC-SHA1)',0), - (13711,'VeraCrypt PBKDF2-HMAC-RIPEMD160 + AES, Serpent, Twofish',0), - (13712,'VeraCrypt PBKDF2-HMAC-RIPEMD160 + AES-Twofish, Serpent-AES, Twofish-Serpent',0), - (13713,'VeraCrypt PBKDF2-HMAC-RIPEMD160 + Serpent-Twofish-AES',0), - (13721,'VeraCrypt PBKDF2-HMAC-SHA512 + AES, Serpent, Twofish',0), - (13722,'VeraCrypt PBKDF2-HMAC-SHA512 + AES-Twofish, Serpent-AES, Twofish-Serpent',0), - (13723,'VeraCrypt PBKDF2-HMAC-SHA512 + Serpent-Twofish-AES',0), - (13731,'VeraCrypt PBKDF2-HMAC-Whirlpool + AES, Serpent, Twofish',0), - (13732,'VeraCrypt PBKDF2-HMAC-Whirlpool + AES-Twofish, Serpent-AES, Twofish-Serpent',0), - (13733,'VeraCrypt PBKDF2-HMAC-Whirlpool + Serpent-Twofish-AES',0), - (13751,'VeraCrypt PBKDF2-HMAC-SHA256 + AES, Serpent, Twofish',0), - (13752,'VeraCrypt PBKDF2-HMAC-SHA256 + AES-Twofish, Serpent-AES, Twofish-Serpent',0), - (13753,'VeraCrypt PBKDF2-HMAC-SHA256 + Serpent-Twofish-AES',0), - (15000,'FileZilla Server >= 0.9.55',0), - (15100,'Juniper/NetBSD sha1crypt',0), - (15200,'Blockchain, My Wallet, V2',0), - (15300,'DPAPI masterkey file v1 and v2',0), - (15400,'ChaCha20',0), - (15500,'JKS Java Key Store Private Keys (SHA1)',0), - (15600,'Ethereum Wallet, PBKDF2-HMAC-SHA256',0), - (15700,'Ethereum Wallet, SCRYPT',0);" -); -echo "OK\n"; - -echo "Update Task table... "; -Factory::getAgentFactory()->getDB()->query("ALTER TABLE `Task` ADD taskType INT(11);"); -Factory::getAgentFactory()->getDB()->query("UPDATE `Task` SET taskType=1 WHERE 1"); -echo "OK\n"; - -echo "Create TaskTask table... "; -Factory::getAgentFactory()->getDB()->query("CREATE TABLE `TaskTask` (`taskTaskId` INT(11) NOT NULL, `taskId` INT(11) NOT NULL, `subtaskId` INT(11) NOT NULL) ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE=utf8_bin;"); -echo "."; -Factory::getAgentFactory()->getDB()->query("ALTER TABLE `TaskTask` ADD PRIMARY KEY (`taskTaskId`), ADD KEY `taskId` (`taskId`), ADD KEY `subtaskId` (`subtaskId`);"); -echo "."; -Factory::getAgentFactory()->getDB()->query("ALTER TABLE `TaskTask` MODIFY `taskTaskId` INT(11) NOT NULL AUTO_INCREMENT;"); -echo "."; -Factory::getAgentFactory()->getDB()->query("ALTER TABLE `TaskTask` ADD CONSTRAINT FOREIGN KEY (`subtaskId`) REFERENCES `Task` (`taskId`);"); -echo "."; -Factory::getAgentFactory()->getDB()->query("ALTER TABLE `TaskTask` ADD CONSTRAINT FOREIGN KEY (`taskId`) REFERENCES `Task` (`taskId`);"); -echo "OK\n"; - -echo "Update config... "; -Factory::getAgentFactory()->getDB()->query("INSERT INTO `Config` (`configId`, `item`, `value`) VALUES (NULL, 'baseHost', '')"); -echo "OK\n"; - -echo "Check csharp binary... "; -$qF = new QueryFilter("type", "csharp", "="); -$binary = Factory::getAgentBinaryFactory()->filter([Factory::FILTER => $qF], true); -if ($binary != null) { - if (Comparator::lessThan($binary->getVersion(), "0.46.2")) { - echo "update version... "; - $binary->setVersion("0.46.2"); - Factory::getAgentBinaryFactory()->update($binary); - echo "OK"; - } -} -echo "\n"; - -echo "Update complete!\n"; diff --git a/src/install/updates/update_v0.4.0_v0.5.0.php b/src/install/updates/update_v0.4.0_v0.5.0.php deleted file mode 100644 index d69e21371..000000000 --- a/src/install/updates/update_v0.4.0_v0.5.0.php +++ /dev/null @@ -1,301 +0,0 @@ -getDB(); -$DB->beginTransaction(); - -echo "Apply updates...\n"; - -echo "Disable checks... "; -$DB->exec("SET foreign_key_checks = 0;"); -echo "OK\n"; - -echo "Read Config table... "; -$stmt = $DB->query("SELECT * FROM `Config` WHERE 1"); -$configs = $stmt->fetchAll(); -// read some important values -$saved = array(); -foreach ($configs as $config) { - $saved[$config['item']] = $config['value']; -} -echo "OK\n"; - -echo "Read users... "; -$stmt = $DB->query("SELECT * FROM `User` WHERE 1"); -$users = $stmt->fetchAll(); -echo "OK\n"; - -echo "Read agents... "; -$stmt = $DB->query("SELECT * FROM `Agent` WHERE 1"); -$agents = $stmt->fetchAll(); -echo "OK\n"; - -echo "Read files... "; -$stmt = $DB->query("SELECT * FROM `File` WHERE 1"); -$files = $stmt->fetchAll(); -echo "OK\n"; - -echo "Read taskFile... "; -$stmt = $DB->query("SELECT * FROM `TaskFile` WHERE 1"); -$taskFiles = $stmt->fetchAll(); -echo "OK\n"; - -echo "Read hashlists... "; -$stmt = $DB->query("SELECT * FROM `Hashlist` WHERE 1"); -$hashlists = $stmt->fetchAll(); -echo "OK\n"; - -echo "Read superhashlists... "; -$stmt = $DB->query("SELECT * FROM `SuperHashlistHashlist` WHERE 1"); -$superhashlistsHashlists = $stmt->fetchAll(); -echo "OK\n"; - -echo "Read hashes... "; -$stmt = $DB->query("SELECT * FROM `Hash` WHERE 1"); -$hashes = $stmt->fetchAll(); -echo "OK\n"; - -echo "Read binary hashes... "; -$stmt = $DB->query("SELECT * FROM `HashBinary` WHERE 1"); -$binaryHashes = $stmt->fetchAll(); -echo "OK\n"; - -echo "Read tasks... "; -$stmt = $DB->query("SELECT * FROM `Task` WHERE 1"); -$tasks = $stmt->fetchAll(); -echo "OK\n"; - -echo "Read supertasks... "; -$stmt = $DB->query("SELECT * FROM `Supertask` WHERE 1"); -$supertasks = $stmt->fetchAll(); -echo "OK\n"; - -echo "Read supertaskTasks... "; -$stmt = $DB->query("SELECT * FROM `SupertaskTask` WHERE 1"); -$supertaskTasks = $stmt->fetchAll(); -echo "OK\n"; - -echo "Read hash types... "; -$stmt = $DB->query("SELECT * FROM `HashType` WHERE 1"); -$hashTypes = $stmt->fetchAll(); -echo "OK\n"; - -echo "All data loaded! Removing old tables... "; -$DB->exec("SET @tables = NULL; -SELECT GROUP_CONCAT(table_schema, '.', table_name) INTO @tables - FROM information_schema.tables - WHERE table_schema = '" . StartupConfig::getInstance()->getDatabaseDB() . "'; - -SET @tables = CONCAT('DROP TABLE ', @tables); -PREPARE stmt FROM @tables; -EXECUTE stmt; -DEALLOCATE PREPARE stmt;" -); -echo "OK\n"; - -echo "Importing new scheme... "; -$DB->exec(file_get_contents(dirname(__FILE__) . "/../hashtopolis.sql")); -echo "OK\n"; - -echo "Reload full include... (Warning about sessions might show up, which can be ignored)"; -require_once(dirname(__FILE__) . "/../../inc/startup/load.php"); -echo "OK\n"; - -echo "Starting with refilling data...\n"; - -echo "Create default access group... "; -$DB->exec("INSERT INTO `AccessGroup` (`accessGroupId`, `groupName`) VALUES (1, 'Default Group');"); -echo "OK\n"; - -echo "Add Hashcat to CrackerBinaryType table... "; -$DB->exec("INSERT INTO `CrackerBinaryType` (`crackerBinaryTypeId`, `typeName`, `isChunkingAvailable`) VALUES (1, 'Hashcat', 1);"); -echo "OK\n"; - -echo "Save hash types... "; -$t = []; -foreach ($hashTypes as $hashType) { - $ht = Factory::getHashTypeFactory()->get($hashType['hashTypeId']); - if ($ht == null) { - $t[] = new HashType($hashType['hashTypeId'], $hashType['description'], $hashType['isSalted']); - } -} -if (sizeof($t) > 0) { - Factory::getHashTypeFactory()->massSave($t); -} -echo "OK\n"; - -echo "Save users... "; -$u = []; -$ug = []; -foreach ($users as $user) { - $u[] = new User($user['userId'], $user['username'], $user['email'], $user['passwordHash'], $user['passwordSalt'], $user['isValid'], $user['isComputedPassword'], $user['lastLoginDate'], $user['registeredSince'], $user['sessionLifetime'], $user['rightGroupId'], $user['yubikey'], $user['otp1'], $user['otp2'], $user['otp3'], $user['otp4']); - $ug[] = new AccessGroupUser(0, 1, $user['userId']); -} -if (sizeof($u) > 0) { - Factory::getUserFactory()->massSave($u); - Factory::getAccessGroupUserFactory()->massSave($ug); -} -echo "OK\n"; - -echo "Save agents... "; -$a = []; -$ag = []; -foreach ($agents as $agent) { - $a[] = new Agent($agent['agentId'], $agent['agentName'], $agent['uid'], $agent['os'], $agent['gpus'], $agent['cmdPars'], $agent['ignoreErrors'], $agent['isActive'], $agent['isTrusted'], $agent['token'], $agent['lastAct'], $agent['lastTime'], $agent['lastIp'], $agent['userId'], $agent['cpuOnly'], ""); - $ag[] = new AccessGroupAgent(0, 1, $agent['agentId']); -} -if (sizeof($a) > 0) { - Factory::getAgentFactory()->massSave($a); - Factory::getAccessGroupAgentFactory()->massSave($ag); -} -echo "OK\n"; - -echo "Save files... "; -$f = []; -$fileIds = []; -foreach ($files as $file) { - $fileIds[] = $file['fileId']; - $f[] = new File($file['fileId'], $file['filename'], $file['size'], $file['secret'], $file['fileType']); -} -if (sizeof($f) > 0) { - Factory::getFileFactory()->massSave($f); -} -echo "OK\n"; - -echo "Save hashlists... "; -$h = []; -foreach ($hashlists as $hashlist) { - $h[] = new Hashlist($hashlist['hashlistId'], $hashlist['hashlistName'], $hashlist['format'], $hashlist['hashTypeId'], $hashlist['hashCount'], $hashlist['saltSeparator'], $hashlist['cracked'], $hashlist['secret'], $hashlist['hexSalt'], $hashlist['isSalted'], 1); -} -if (sizeof($h) > 0) { - Factory::getHashlistFactory()->massSave($h); -} -echo "OK\n"; - -echo "Save superhashlistsHashlists... "; -$h = []; -foreach ($superhashlistsHashlists as $superhashlistsHashlist) { - $h[] = new HashlistHashlist($superhashlistsHashlist['superHashlistHashlistId'], $superhashlistsHashlist['superHashlistId'], $superhashlistsHashlist['hashlistId']); -} -if (sizeof($h) > 0) { - Factory::getHashlistHashlistFactory()->massSave($h); -} -echo "OK\n"; - -echo "Save hashes... "; -$h = []; -foreach ($hashes as $hash) { - $h[] = new Hash($hash['hashId'], $hash['hashlistId'], $hash['hash'], $hash['salt'], $hash['plaintext'], $hash['time'], null, $hash['isCracked'], 0); - if (sizeof($h) >= 1000) { - Factory::getHashFactory()->massSave($h); - $h = []; - } -} -if (sizeof($h) > 0) { - Factory::getHashFactory()->massSave($h); -} -echo "OK\n"; - -echo "Save binary hashes... "; -$h = []; -foreach ($binaryHashes as $binaryHash) { - $h[] = new HashBinary($binaryHash['hashBinaryId'], $binaryHash['hashlistId'], $binaryHash['essid'], $binaryHash['hash'], $binaryHash['plaintext'], $binaryHash['time'], null, $binaryHash['isCracked'], 0); -} -if (sizeof($h) > 0) { - Factory::getHashBinaryFactory()->massSave($h); -} -echo "OK\n"; - -echo "Save pretasks... "; -$t = []; -$taskIds = []; -foreach ($tasks as $task) { - if ($task['taskType'] != 0 || $task['hashlistId'] != null) { - continue; // we only transfer pretasks - } - $taskIds[] = $task['taskId']; - $isMask = (strpos($task['taskName'], "HIDDEN: ") === 0) ? 1 : 0; - if ($isMask == 1) { - $task['taskName'] = str_replace("HIDDEN: ", "", $task['taskName']); - } - $t[] = new Pretask($task['taskId'], $task['taskName'], $task['attackCmd'], $task['chunkTime'], $task['statusTimer'], $task['color'], $task['isSmall'], $task['isCpuTask'], $task['useNewBench'], $task['priority'], $isMask, 1); -} -if (sizeof($t) > 0) { - Factory::getPretaskFactory()->massSave($t); -} -echo "OK\n"; - -echo "Save task files... "; -$f = []; -foreach ($taskFiles as $taskFile) { - if (!in_array($taskFile['taskId'], $taskIds) || !in_array($taskFile['fileId'], $fileIds)) { - continue; // file is not from a pretask - } - $f[] = new FilePretask($taskFile['taskFileId'], $taskFile['fileId'], $taskFile['taskId']); -} -if (sizeof($f) > 0) { - Factory::getFilePretaskFactory()->massSave($f); -} -echo "OK\n"; - -echo "Save supertasks... "; -$s = []; -foreach ($supertasks as $supertask) { - $s[] = new Supertask($supertask['supertaskId'], $supertask['supertaskName']); -} -if (sizeof($s) > 0) { - Factory::getSupertaskFactory()->massSave($s); -} -echo "OK\n"; - -echo "Save supertasks tasks... "; -$s = []; -foreach ($supertaskTasks as $supertaskTask) { - $s[] = new SupertaskPretask($supertaskTask['supertaskTaskId'], $supertaskTask['supertaskId'], $supertaskTask['taskId']); -} -if (sizeof($s) > 0) { - Factory::getSupertaskPretaskFactory()->massSave($s); -} -echo "OK\n"; - -echo "Re-enable checks... "; -$DB->exec("SET foreign_key_checks = 1;"); -echo "OK\n"; - -$DB->commit(); - -echo "Update complete!\n"; diff --git a/src/install/updates/update_v0.5.x_v0.6.0.php b/src/install/updates/update_v0.5.x_v0.6.0.php index 6df1412b8..b872db580 100644 --- a/src/install/updates/update_v0.5.x_v0.6.0.php +++ b/src/install/updates/update_v0.5.x_v0.6.0.php @@ -1,16 +1,16 @@ save($config); echo "OK\n"; diff --git a/src/install/updates/update_v0.7.x_v0.8.0.php b/src/install/updates/update_v0.7.x_v0.8.0.php index ccdf6c800..9f9b53fbb 100644 --- a/src/install/updates/update_v0.7.x_v0.8.0.php +++ b/src/install/updates/update_v0.7.x_v0.8.0.php @@ -1,17 +1,20 @@ getDatabaseType() == 'postgres' || Util::databaseTableExists("_sqlx_migrations")) { diff --git a/src/log.php b/src/log.php index ac7d65990..0b8ba4c3f 100755 --- a/src/log.php +++ b/src/log.php @@ -1,9 +1,15 @@ checkPermission(DViewControl::LOGIN_VIEW_PERM); diff --git a/src/logout.php b/src/logout.php index b2e6fc1ba..d7893e58f 100755 --- a/src/logout.php +++ b/src/logout.php @@ -1,5 +1,9 @@ checkPermission(DViewControl::LOGOUT_VIEW_PERM); diff --git a/src/notifications.php b/src/notifications.php index 567770393..f83f58487 100755 --- a/src/notifications.php +++ b/src/notifications.php @@ -1,14 +1,29 @@ isLoggedin()) { diff --git a/src/superhashlists.php b/src/superhashlists.php index f26b429be..b131bc674 100755 --- a/src/superhashlists.php +++ b/src/superhashlists.php @@ -1,10 +1,20 @@ getUser())); UI::add('binaries', Factory::getCrackerBinaryTypeFactory()->filter([])); $versions = Factory::getCrackerBinaryFactory()->filter([]); - usort($versions, ["Util", "versionComparisonBinary"]); + usort($versions, ["Hashtopolis\inc\Util", "versionComparisonBinary"]); UI::add('versions', $versions); UI::add('pageTitle', "Issue Supertask"); } diff --git a/src/tasks.php b/src/tasks.php index 504a50c8b..31e434449 100755 --- a/src/tasks.php +++ b/src/tasks.php @@ -1,17 +1,36 @@ filter([])); $versions = Factory::getCrackerBinaryFactory()->filter([Factory::ORDER => $oF]); - usort($versions, ["Util", "versionComparisonBinary"]); + usort($versions, ["Hashtopolis\inc\Util", "versionComparisonBinary"]); $versions = array_reverse($versions); UI::add('versions', $versions); UI::add('pageTitle', "Create Task"); diff --git a/src/users.php b/src/users.php index a535d9ab1..f31054ece 100755 --- a/src/users.php +++ b/src/users.php @@ -1,10 +1,20 @@ Date: Mon, 16 Feb 2026 10:21:33 +0100 Subject: [PATCH 427/691] Changed to using Concat in sql instead of coalesce to handle empty string in taskwrapper --- ...olumn.class.php => ConcatColumn.class.php} | 2 +- ... => ConcatLikeFilterInsensitive.class.php} | 6 ++--- ....class.php => ConcatOrderFilter.class.php} | 6 ++--- src/dba/init.php | 6 ++--- .../apiv2/common/AbstractModelAPI.class.php | 25 ++++++++++--------- src/inc/apiv2/model/taskwrappers.routes.php | 15 +++++------ 6 files changed, 31 insertions(+), 29 deletions(-) rename src/dba/{CoalesceColumn.class.php => ConcatColumn.class.php} (93%) rename src/dba/{CoalesceLikeFilterInsensitive.class.php => ConcatLikeFilterInsensitive.class.php} (83%) rename src/dba/{CoalesceOrderFilter.class.php => ConcatOrderFilter.class.php} (77%) diff --git a/src/dba/CoalesceColumn.class.php b/src/dba/ConcatColumn.class.php similarity index 93% rename from src/dba/CoalesceColumn.class.php rename to src/dba/ConcatColumn.class.php index 466c2483d..458cd0d23 100644 --- a/src/dba/CoalesceColumn.class.php +++ b/src/dba/ConcatColumn.class.php @@ -2,7 +2,7 @@ namespace DBA; -class CoalesceColumn { +class ConcatColumn { private $value; /** * @var AbstractModelFactory diff --git a/src/dba/CoalesceLikeFilterInsensitive.class.php b/src/dba/ConcatLikeFilterInsensitive.class.php similarity index 83% rename from src/dba/CoalesceLikeFilterInsensitive.class.php rename to src/dba/ConcatLikeFilterInsensitive.class.php index 8094c3d58..466ce73ee 100644 --- a/src/dba/CoalesceLikeFilterInsensitive.class.php +++ b/src/dba/ConcatLikeFilterInsensitive.class.php @@ -2,7 +2,7 @@ namespace DBA; -class CoalesceLikeFilterInsensitive extends Filter { +class ConcatLikeFilterInsensitive extends Filter { private $value; /** * @var AbstractModelFactory @@ -10,7 +10,7 @@ class CoalesceLikeFilterInsensitive extends Filter { private $overrideFactory; /** - * @var CoalesceColumn[] $columns + * @var ConcatColumn[] $columns */ private array $columns; @@ -29,7 +29,7 @@ function getQueryString(AbstractModelFactory $factory, bool $includeTable = fals $columnFactory = $column->getFactory(); array_push($mapped_columns, $columnFactory->getMappedModelTable() . "." . AbstractModelFactory::getMappedModelKey($columnFactory->getNullObject(), $column->getValue())); } - return "LOWER(" . "COALESCE(" . implode(", ", $mapped_columns) . ")" . ") LIKE LOWER(?)"; + return "LOWER(" . "CONCAT(" . implode(", ", $mapped_columns) . ")" . ") LIKE LOWER(?)"; } function getValue() { diff --git a/src/dba/CoalesceOrderFilter.class.php b/src/dba/ConcatOrderFilter.class.php similarity index 77% rename from src/dba/CoalesceOrderFilter.class.php rename to src/dba/ConcatOrderFilter.class.php index cd1bed5c2..66dda5661 100644 --- a/src/dba/CoalesceOrderFilter.class.php +++ b/src/dba/ConcatOrderFilter.class.php @@ -2,10 +2,10 @@ namespace DBA; -class CoalesceOrderFilter extends Order { +class ConcatOrderFilter extends Order { // The columns to do the COALESCE function on /** - * @var CoalesceColumn[] $columns + * @var ConcatColumn[] $columns */ private $columns; private $type; @@ -20,6 +20,6 @@ function getQueryString(AbstractModelFactory $factory, bool $includeTable = fals foreach($this->columns as $column) { array_push($mapped_columns, AbstractModelFactory::getMappedModelKey($column->getFactory()->getNullObject(), $column->getValue())); } - return "COALESCE(" . implode(", ", $mapped_columns) . ") " . $this->type; + return "CONCAT(" . implode(", ", $mapped_columns) . ") " . $this->type; } } \ No newline at end of file diff --git a/src/dba/init.php b/src/dba/init.php index f48ee7e83..e3ce4b0c9 100644 --- a/src/dba/init.php +++ b/src/dba/init.php @@ -13,9 +13,9 @@ require_once(dirname(__FILE__) . "/Aggregation.class.php"); require_once(dirname(__FILE__) . "/Filter.class.php"); require_once(dirname(__FILE__) . "/Order.class.php"); -require_once(dirname(__FILE__) . "/CoalesceColumn.class.php"); -require_once(dirname(__FILE__) . "/CoalesceLikeFilterInsensitive.class.php"); -require_once(dirname(__FILE__) . "/CoalesceOrderFilter.class.php"); +require_once(dirname(__FILE__) . "/ConcatColumn.class.php"); +require_once(dirname(__FILE__) . "/ConcatLikeFilterInsensitive.class.php"); +require_once(dirname(__FILE__) . "/ConcatOrderFilter.class.php"); require_once(dirname(__FILE__) . "/Join.class.php"); require_once(dirname(__FILE__) . "/Group.class.php"); require_once(dirname(__FILE__) . "/Limit.class.php"); diff --git a/src/inc/apiv2/common/AbstractModelAPI.class.php b/src/inc/apiv2/common/AbstractModelAPI.class.php index 012288c7c..d3f93e58d 100644 --- a/src/inc/apiv2/common/AbstractModelAPI.class.php +++ b/src/inc/apiv2/common/AbstractModelAPI.class.php @@ -530,25 +530,25 @@ protected static function compare_keys($key1, $key2, $isNegativeSort) { protected static function getMinMaxCursor($apiClass, string $sort, array $filters, $request, $aliasedfeatures) { $filters[Factory::LIMIT] = new LimitFilter(1); - $primaryKey = $apiClass->getPrimaryKey(); // Descending queries are used to retrieve the last element. For this all sorts have to be reversed, since - // if all order quereis are reversed and limit to 1, you will retrieve the last element. + // if all order queries are reversed and limit to 1, you will retrieve the last element. $reverseSort = ($sort == "DESC") ? true : false; $orderTemplates = $apiClass->makeOrderFilterTemplates($request, $aliasedfeatures, $sort, $reverseSort); $orderFilters = []; - $joinFilters = []; + // TODO this logic is now done twice, once for the max and once for the min, this should be moved outside this function + // and given as an argument foreach ($orderTemplates as $orderTemplate) { $orderFilters[] = new OrderFilter($orderTemplate['by'], $orderTemplate['type'], $orderTemplate['factory']); if ($orderTemplate['factory'] !== null){ // if factory of ordertemplate is not null, sort is happening on joined table $otherFactory = $orderTemplate['factory']; - $joinFilters[] = new JoinFilter($otherFactory, $orderTemplate['joinKey'], $apiClass->getPrimaryKeyOther($otherFactory->getNullObject()::class)); + if (!$apiClass::checkJoinExists($filters[Factory::JOIN], $otherFactory->getModelName())) { + $filters[Factory::JOIN][] = new JoinFilter($otherFactory, $orderTemplate['joinKey'], $apiClass->getPrimaryKeyOther($otherFactory->getNullObject()::class)); + } } } $filters[Factory::ORDER] = $orderFilters; - if (!empty($joinFilters)) { - $filters[Factory::JOIN] = $joinFilters; - } + $filters = $apiClass->parseFilters($filters); $factory = $apiClass->getFactory(); $result = $factory->filter($filters); //handle joined queries @@ -611,7 +611,11 @@ public static function getManyResources(object $apiClass, Request $request, Resp $qFs_Filter = array_merge($aFs_ACL[Factory::FILTER], $qFs_Filter); } if (isset($aFs_ACL[Factory::JOIN])) { - $aFs[Factory::JOIN] = $aFs_ACL[Factory::JOIN]; + foreach($aFs_ACL[Factory::JOIN] as $filter) { + if(!$apiClass::checkJoinExists($joinFilters, $filter->getOtherFactory()->getModelName())) { + $joinFilters[] = $filter; + } + } } } @@ -630,10 +634,6 @@ public static function getManyResources(object $apiClass, Request $request, Resp $reverseArray = false; $aFs[Factory::JOIN] = $joinFilters; - $aFs = $apiClass->parseFilters($aFs); - foreach($aFs[Factory::JOIN] as $a) { - error_log($a->getOtherTableName()); - } $firstCursorObject = $apiClass->getMinMaxCursor($apiClass, "ASC", $aFs, $request, $aliasedfeatures); $lastCursorObject = $apiClass->getMinMaxCursor($apiClass, "DESC", $aFs, $request, $aliasedfeatures); @@ -692,6 +692,7 @@ public static function getManyResources(object $apiClass, Request $request, Resp /* Include relation filters */ $finalFs = array_merge($aFs, $relationFs); + $finalFs = $apiClass->parseFilters($finalFs); //TODO it would be even better if its possible to see if the primary filter is unique, instead of primary key. //But this probably needs to be added in getFeatures() then. diff --git a/src/inc/apiv2/model/taskwrappers.routes.php b/src/inc/apiv2/model/taskwrappers.routes.php index 47cd97688..827773e5f 100644 --- a/src/inc/apiv2/model/taskwrappers.routes.php +++ b/src/inc/apiv2/model/taskwrappers.routes.php @@ -1,9 +1,9 @@ getBy() == Task::TASK_NAME) { - $coalesceColumns = [new CoalesceColumn(Task::TASK_NAME, Factory::getTaskFactory()), new CoalesceColumn(TaskWrapper::TASK_WRAPPER_NAME, Factory::getTaskWrapperFactory())]; - $newOrderFilter = new CoalesceOrderFilter($coalesceColumns, $orderfilter->getType()); + $concatColumns = [new ConcatColumn(Task::TASK_NAME, Factory::getTaskFactory()), new ConcatColumn(TaskWrapper::TASK_WRAPPER_NAME, Factory::getTaskWrapperFactory())]; + $newOrderFilter = new ConcatOrderFilter($concatColumns, $orderfilter->getType()); $orderfilter = $newOrderFilter; } } @@ -143,8 +143,9 @@ protected function parseFilters(array $filters) { if (isset($filters[Factory::FILTER])) { foreach($filters[Factory::FILTER] as &$filter) { if ($filter instanceof LikeFilterInsensitive && $filter->getKey() == Task::TASK_NAME) { - $coalesceColumns = [new CoalesceColumn(Task::TASK_NAME, Factory::getTaskFactory()), new CoalesceColumn(TaskWrapper::TASK_WRAPPER_NAME, Factory::getTaskWrapperFactory())]; - $newFilter = new CoalesceLikeFilterInsensitive($coalesceColumns, $filter->getValue()); + $concatColumns = [new ConcatColumn(TaskWrapper::TASK_WRAPPER_NAME, Factory::getTaskWrapperFactory()), new ConcatColumn(Task::TASK_NAME, Factory::getTaskFactory())]; + // $coalesceColumns = [new CoalesceColumn(Task::TASK_NAME, Factory::getTaskFactory()), new CoalesceColumn(TaskWrapper::TASK_WRAPPER_NAME, Factory::getTaskWrapperFactory())]; + $newFilter = new ConcatLikeFilterInsensitive($concatColumns, $filter->getValue()); $filter = $newFilter; } } From ebacb18462a3ec8cb344da7a6fdc202d801413a7 Mon Sep 17 00:00:00 2001 From: s3inlc Date: Mon, 16 Feb 2026 11:35:28 +0100 Subject: [PATCH 428/691] fixed typing in model factory and fixed include paths --- ci/phpunit/dba/AbstractModelFactoryTest.php | 11 ++++++----- src/dba/models/AbstractModelFactory.template.txt | 2 +- src/dba/models/AccessGroupAgentFactory.php | 2 +- src/dba/models/AccessGroupFactory.php | 2 +- src/dba/models/AccessGroupUserFactory.php | 2 +- src/dba/models/AgentBinaryFactory.php | 2 +- src/dba/models/AgentErrorFactory.php | 2 +- src/dba/models/AgentFactory.php | 2 +- src/dba/models/AgentStatFactory.php | 2 +- src/dba/models/AgentZapFactory.php | 2 +- src/dba/models/ApiGroupFactory.php | 2 +- src/dba/models/ApiKeyFactory.php | 2 +- src/dba/models/AssignmentFactory.php | 2 +- src/dba/models/ChunkFactory.php | 2 +- src/dba/models/ConfigFactory.php | 2 +- src/dba/models/ConfigSectionFactory.php | 2 +- src/dba/models/CrackerBinaryFactory.php | 2 +- src/dba/models/CrackerBinaryTypeFactory.php | 2 +- src/dba/models/FileDeleteFactory.php | 2 +- src/dba/models/FileDownloadFactory.php | 2 +- src/dba/models/FileFactory.php | 2 +- src/dba/models/FilePretaskFactory.php | 2 +- src/dba/models/FileTaskFactory.php | 2 +- src/dba/models/HashBinaryFactory.php | 2 +- src/dba/models/HashFactory.php | 2 +- src/dba/models/HashTypeFactory.php | 2 +- src/dba/models/HashlistFactory.php | 2 +- src/dba/models/HashlistHashlistFactory.php | 2 +- src/dba/models/HealthCheckAgentFactory.php | 2 +- src/dba/models/HealthCheckFactory.php | 2 +- src/dba/models/LogEntryFactory.php | 2 +- src/dba/models/NotificationSettingFactory.php | 2 +- src/dba/models/PreprocessorFactory.php | 2 +- src/dba/models/PretaskFactory.php | 2 +- src/dba/models/RegVoucherFactory.php | 2 +- src/dba/models/RightGroupFactory.php | 2 +- src/dba/models/SessionFactory.php | 2 +- src/dba/models/SpeedFactory.php | 2 +- src/dba/models/StoredValueFactory.php | 2 +- src/dba/models/SupertaskFactory.php | 2 +- src/dba/models/SupertaskPretaskFactory.php | 2 +- src/dba/models/TaskDebugOutputFactory.php | 2 +- src/dba/models/TaskFactory.php | 2 +- src/dba/models/TaskWrapperFactory.php | 2 +- src/dba/models/UserFactory.php | 2 +- src/dba/models/ZapFactory.php | 2 +- src/inc/startup/include.php | 2 +- 47 files changed, 52 insertions(+), 51 deletions(-) diff --git a/ci/phpunit/dba/AbstractModelFactoryTest.php b/ci/phpunit/dba/AbstractModelFactoryTest.php index ef39ae9ef..fee2a8feb 100644 --- a/ci/phpunit/dba/AbstractModelFactoryTest.php +++ b/ci/phpunit/dba/AbstractModelFactoryTest.php @@ -3,13 +3,14 @@ namespace Tests\DBA; use Hashtopolis\dba\ContainFilter; -use Hashtopolis\dba\Hashlist; +use Hashtopolis\dba\models\Hashlist; use Hashtopolis\dba\OrderFilter; use Exception; +use Hashtopolis\inc\defines\DHashlistFormat; use PHPUnit\Framework\TestCase; use Hashtopolis\dba\Factory; use Hashtopolis\dba\QueryFilter; -use Hashtopolis\dba\User; +use Hashtopolis\dba\models\User; require_once(dirname(__FILE__) . '/../../../src/inc/startup/include.php'); @@ -46,9 +47,9 @@ public function testSimpleFilter(): void { */ public function testColumnFilter(): void { // add some data - $hashlist_1 = new Hashlist(null, "hashlist 1", \DHashlistFormat::PLAIN, 0, 0, ':', 0, 0, 0, 0, \Hashtopolis\inc\utils\AccessUtils::getOrCreateDefaultAccessGroup()->getId(), "", 0, 0, 0); - $hashlist_2 = new Hashlist(null, "hashlist 2", \DHashlistFormat::PLAIN, 0, 0, ':', 0, 0, 0, 1, \Hashtopolis\inc\utils\AccessUtils::getOrCreateDefaultAccessGroup()->getId(), "", 0, 0, 0); - $hashlist_3 = new Hashlist(null, "hashlist 3", \DHashlistFormat::PLAIN, 0, 0, ':', 0, 0, 0, 0, \Hashtopolis\inc\utils\AccessUtils::getOrCreateDefaultAccessGroup()->getId(), "", 0, 0, 0); + $hashlist_1 = new Hashlist(null, "hashlist 1", DHashlistFormat::PLAIN, 0, 0, ':', 0, 0, 0, 0, \Hashtopolis\inc\utils\AccessUtils::getOrCreateDefaultAccessGroup()->getId(), "", 0, 0, 0); + $hashlist_2 = new Hashlist(null, "hashlist 2", DHashlistFormat::PLAIN, 0, 0, ':', 0, 0, 0, 1, \Hashtopolis\inc\utils\AccessUtils::getOrCreateDefaultAccessGroup()->getId(), "", 0, 0, 0); + $hashlist_3 = new Hashlist(null, "hashlist 3", DHashlistFormat::PLAIN, 0, 0, ':', 0, 0, 0, 0, \Hashtopolis\inc\utils\AccessUtils::getOrCreateDefaultAccessGroup()->getId(), "", 0, 0, 0); $hashlist_1 = Factory::getHashlistFactory()->save($hashlist_1); $hashlist_2 = Factory::getHashlistFactory()->save($hashlist_2); $hashlist_3 = Factory::getHashlistFactory()->save($hashlist_3); diff --git a/src/dba/models/AbstractModelFactory.template.txt b/src/dba/models/AbstractModelFactory.template.txt index a597d2711..a1d9c0bef 100644 --- a/src/dba/models/AbstractModelFactory.template.txt +++ b/src/dba/models/AbstractModelFactory.template.txt @@ -52,7 +52,7 @@ class __MODEL_NAME__Factory extends AbstractModelFactory { * @param bool $single * @return __MODEL_NAME__|__MODEL_NAME__[] */ - function filter(array $options, bool $single = false): __MODEL_NAME__|array { + function filter(array $options, bool $single = false): __MODEL_NAME__|array|null { $join = false; if (array_key_exists('join', $options)) { $join = true; diff --git a/src/dba/models/AccessGroupAgentFactory.php b/src/dba/models/AccessGroupAgentFactory.php index a23518672..bc7720a23 100644 --- a/src/dba/models/AccessGroupAgentFactory.php +++ b/src/dba/models/AccessGroupAgentFactory.php @@ -52,7 +52,7 @@ function createObjectFromDict($pk, $dict): AccessGroupAgent { * @param bool $single * @return AccessGroupAgent|AccessGroupAgent[] */ - function filter(array $options, bool $single = false): AccessGroupAgent|array { + function filter(array $options, bool $single = false): AccessGroupAgent|array|null { $join = false; if (array_key_exists('join', $options)) { $join = true; diff --git a/src/dba/models/AccessGroupFactory.php b/src/dba/models/AccessGroupFactory.php index 727df8981..9e839ec01 100644 --- a/src/dba/models/AccessGroupFactory.php +++ b/src/dba/models/AccessGroupFactory.php @@ -52,7 +52,7 @@ function createObjectFromDict($pk, $dict): AccessGroup { * @param bool $single * @return AccessGroup|AccessGroup[] */ - function filter(array $options, bool $single = false): AccessGroup|array { + function filter(array $options, bool $single = false): AccessGroup|array|null { $join = false; if (array_key_exists('join', $options)) { $join = true; diff --git a/src/dba/models/AccessGroupUserFactory.php b/src/dba/models/AccessGroupUserFactory.php index bd30b1c43..3ba0d1aa7 100644 --- a/src/dba/models/AccessGroupUserFactory.php +++ b/src/dba/models/AccessGroupUserFactory.php @@ -52,7 +52,7 @@ function createObjectFromDict($pk, $dict): AccessGroupUser { * @param bool $single * @return AccessGroupUser|AccessGroupUser[] */ - function filter(array $options, bool $single = false): AccessGroupUser|array { + function filter(array $options, bool $single = false): AccessGroupUser|array|null { $join = false; if (array_key_exists('join', $options)) { $join = true; diff --git a/src/dba/models/AgentBinaryFactory.php b/src/dba/models/AgentBinaryFactory.php index 310318244..24e719480 100644 --- a/src/dba/models/AgentBinaryFactory.php +++ b/src/dba/models/AgentBinaryFactory.php @@ -52,7 +52,7 @@ function createObjectFromDict($pk, $dict): AgentBinary { * @param bool $single * @return AgentBinary|AgentBinary[] */ - function filter(array $options, bool $single = false): AgentBinary|array { + function filter(array $options, bool $single = false): AgentBinary|array|null { $join = false; if (array_key_exists('join', $options)) { $join = true; diff --git a/src/dba/models/AgentErrorFactory.php b/src/dba/models/AgentErrorFactory.php index dcfb58406..8c2588120 100644 --- a/src/dba/models/AgentErrorFactory.php +++ b/src/dba/models/AgentErrorFactory.php @@ -52,7 +52,7 @@ function createObjectFromDict($pk, $dict): AgentError { * @param bool $single * @return AgentError|AgentError[] */ - function filter(array $options, bool $single = false): AgentError|array { + function filter(array $options, bool $single = false): AgentError|array|null { $join = false; if (array_key_exists('join', $options)) { $join = true; diff --git a/src/dba/models/AgentFactory.php b/src/dba/models/AgentFactory.php index 94836354f..5bd4a2378 100644 --- a/src/dba/models/AgentFactory.php +++ b/src/dba/models/AgentFactory.php @@ -52,7 +52,7 @@ function createObjectFromDict($pk, $dict): Agent { * @param bool $single * @return Agent|Agent[] */ - function filter(array $options, bool $single = false): Agent|array { + function filter(array $options, bool $single = false): Agent|array|null { $join = false; if (array_key_exists('join', $options)) { $join = true; diff --git a/src/dba/models/AgentStatFactory.php b/src/dba/models/AgentStatFactory.php index 24e0eccec..885709e38 100644 --- a/src/dba/models/AgentStatFactory.php +++ b/src/dba/models/AgentStatFactory.php @@ -52,7 +52,7 @@ function createObjectFromDict($pk, $dict): AgentStat { * @param bool $single * @return AgentStat|AgentStat[] */ - function filter(array $options, bool $single = false): AgentStat|array { + function filter(array $options, bool $single = false): AgentStat|array|null { $join = false; if (array_key_exists('join', $options)) { $join = true; diff --git a/src/dba/models/AgentZapFactory.php b/src/dba/models/AgentZapFactory.php index 9c6d9c47a..733672c98 100644 --- a/src/dba/models/AgentZapFactory.php +++ b/src/dba/models/AgentZapFactory.php @@ -52,7 +52,7 @@ function createObjectFromDict($pk, $dict): AgentZap { * @param bool $single * @return AgentZap|AgentZap[] */ - function filter(array $options, bool $single = false): AgentZap|array { + function filter(array $options, bool $single = false): AgentZap|array|null { $join = false; if (array_key_exists('join', $options)) { $join = true; diff --git a/src/dba/models/ApiGroupFactory.php b/src/dba/models/ApiGroupFactory.php index d168fbf02..abb121e19 100644 --- a/src/dba/models/ApiGroupFactory.php +++ b/src/dba/models/ApiGroupFactory.php @@ -52,7 +52,7 @@ function createObjectFromDict($pk, $dict): ApiGroup { * @param bool $single * @return ApiGroup|ApiGroup[] */ - function filter(array $options, bool $single = false): ApiGroup|array { + function filter(array $options, bool $single = false): ApiGroup|array|null { $join = false; if (array_key_exists('join', $options)) { $join = true; diff --git a/src/dba/models/ApiKeyFactory.php b/src/dba/models/ApiKeyFactory.php index 3c9a5a94f..e25395ace 100644 --- a/src/dba/models/ApiKeyFactory.php +++ b/src/dba/models/ApiKeyFactory.php @@ -52,7 +52,7 @@ function createObjectFromDict($pk, $dict): ApiKey { * @param bool $single * @return ApiKey|ApiKey[] */ - function filter(array $options, bool $single = false): ApiKey|array { + function filter(array $options, bool $single = false): ApiKey|array|null { $join = false; if (array_key_exists('join', $options)) { $join = true; diff --git a/src/dba/models/AssignmentFactory.php b/src/dba/models/AssignmentFactory.php index 6896e3788..577c4a848 100644 --- a/src/dba/models/AssignmentFactory.php +++ b/src/dba/models/AssignmentFactory.php @@ -52,7 +52,7 @@ function createObjectFromDict($pk, $dict): Assignment { * @param bool $single * @return Assignment|Assignment[] */ - function filter(array $options, bool $single = false): Assignment|array { + function filter(array $options, bool $single = false): Assignment|array|null { $join = false; if (array_key_exists('join', $options)) { $join = true; diff --git a/src/dba/models/ChunkFactory.php b/src/dba/models/ChunkFactory.php index 318491a5b..e5cd3fc91 100644 --- a/src/dba/models/ChunkFactory.php +++ b/src/dba/models/ChunkFactory.php @@ -52,7 +52,7 @@ function createObjectFromDict($pk, $dict): Chunk { * @param bool $single * @return Chunk|Chunk[] */ - function filter(array $options, bool $single = false): Chunk|array { + function filter(array $options, bool $single = false): Chunk|array|null { $join = false; if (array_key_exists('join', $options)) { $join = true; diff --git a/src/dba/models/ConfigFactory.php b/src/dba/models/ConfigFactory.php index 5c55c4a4c..7cbe8a640 100644 --- a/src/dba/models/ConfigFactory.php +++ b/src/dba/models/ConfigFactory.php @@ -52,7 +52,7 @@ function createObjectFromDict($pk, $dict): Config { * @param bool $single * @return Config|Config[] */ - function filter(array $options, bool $single = false): Config|array { + function filter(array $options, bool $single = false): Config|array|null { $join = false; if (array_key_exists('join', $options)) { $join = true; diff --git a/src/dba/models/ConfigSectionFactory.php b/src/dba/models/ConfigSectionFactory.php index 482ef4eed..ba9f2b137 100644 --- a/src/dba/models/ConfigSectionFactory.php +++ b/src/dba/models/ConfigSectionFactory.php @@ -52,7 +52,7 @@ function createObjectFromDict($pk, $dict): ConfigSection { * @param bool $single * @return ConfigSection|ConfigSection[] */ - function filter(array $options, bool $single = false): ConfigSection|array { + function filter(array $options, bool $single = false): ConfigSection|array|null { $join = false; if (array_key_exists('join', $options)) { $join = true; diff --git a/src/dba/models/CrackerBinaryFactory.php b/src/dba/models/CrackerBinaryFactory.php index 085f6e539..3a7f905f8 100644 --- a/src/dba/models/CrackerBinaryFactory.php +++ b/src/dba/models/CrackerBinaryFactory.php @@ -52,7 +52,7 @@ function createObjectFromDict($pk, $dict): CrackerBinary { * @param bool $single * @return CrackerBinary|CrackerBinary[] */ - function filter(array $options, bool $single = false): CrackerBinary|array { + function filter(array $options, bool $single = false): CrackerBinary|array|null { $join = false; if (array_key_exists('join', $options)) { $join = true; diff --git a/src/dba/models/CrackerBinaryTypeFactory.php b/src/dba/models/CrackerBinaryTypeFactory.php index 095885ade..40a04fe95 100644 --- a/src/dba/models/CrackerBinaryTypeFactory.php +++ b/src/dba/models/CrackerBinaryTypeFactory.php @@ -52,7 +52,7 @@ function createObjectFromDict($pk, $dict): CrackerBinaryType { * @param bool $single * @return CrackerBinaryType|CrackerBinaryType[] */ - function filter(array $options, bool $single = false): CrackerBinaryType|array { + function filter(array $options, bool $single = false): CrackerBinaryType|array|null { $join = false; if (array_key_exists('join', $options)) { $join = true; diff --git a/src/dba/models/FileDeleteFactory.php b/src/dba/models/FileDeleteFactory.php index 9986e902b..e8e7e69e0 100644 --- a/src/dba/models/FileDeleteFactory.php +++ b/src/dba/models/FileDeleteFactory.php @@ -52,7 +52,7 @@ function createObjectFromDict($pk, $dict): FileDelete { * @param bool $single * @return FileDelete|FileDelete[] */ - function filter(array $options, bool $single = false): FileDelete|array { + function filter(array $options, bool $single = false): FileDelete|array|null { $join = false; if (array_key_exists('join', $options)) { $join = true; diff --git a/src/dba/models/FileDownloadFactory.php b/src/dba/models/FileDownloadFactory.php index 6cceb5e91..b249fbfc0 100644 --- a/src/dba/models/FileDownloadFactory.php +++ b/src/dba/models/FileDownloadFactory.php @@ -52,7 +52,7 @@ function createObjectFromDict($pk, $dict): FileDownload { * @param bool $single * @return FileDownload|FileDownload[] */ - function filter(array $options, bool $single = false): FileDownload|array { + function filter(array $options, bool $single = false): FileDownload|array|null { $join = false; if (array_key_exists('join', $options)) { $join = true; diff --git a/src/dba/models/FileFactory.php b/src/dba/models/FileFactory.php index 90d9465c3..847e9da5f 100644 --- a/src/dba/models/FileFactory.php +++ b/src/dba/models/FileFactory.php @@ -52,7 +52,7 @@ function createObjectFromDict($pk, $dict): File { * @param bool $single * @return File|File[] */ - function filter(array $options, bool $single = false): File|array { + function filter(array $options, bool $single = false): File|array|null { $join = false; if (array_key_exists('join', $options)) { $join = true; diff --git a/src/dba/models/FilePretaskFactory.php b/src/dba/models/FilePretaskFactory.php index c570270fe..a75a13eeb 100644 --- a/src/dba/models/FilePretaskFactory.php +++ b/src/dba/models/FilePretaskFactory.php @@ -52,7 +52,7 @@ function createObjectFromDict($pk, $dict): FilePretask { * @param bool $single * @return FilePretask|FilePretask[] */ - function filter(array $options, bool $single = false): FilePretask|array { + function filter(array $options, bool $single = false): FilePretask|array|null { $join = false; if (array_key_exists('join', $options)) { $join = true; diff --git a/src/dba/models/FileTaskFactory.php b/src/dba/models/FileTaskFactory.php index e29d1c50f..7a3e1a97e 100644 --- a/src/dba/models/FileTaskFactory.php +++ b/src/dba/models/FileTaskFactory.php @@ -52,7 +52,7 @@ function createObjectFromDict($pk, $dict): FileTask { * @param bool $single * @return FileTask|FileTask[] */ - function filter(array $options, bool $single = false): FileTask|array { + function filter(array $options, bool $single = false): FileTask|array|null { $join = false; if (array_key_exists('join', $options)) { $join = true; diff --git a/src/dba/models/HashBinaryFactory.php b/src/dba/models/HashBinaryFactory.php index c2a8a9183..d4358abd0 100644 --- a/src/dba/models/HashBinaryFactory.php +++ b/src/dba/models/HashBinaryFactory.php @@ -52,7 +52,7 @@ function createObjectFromDict($pk, $dict): HashBinary { * @param bool $single * @return HashBinary|HashBinary[] */ - function filter(array $options, bool $single = false): HashBinary|array { + function filter(array $options, bool $single = false): HashBinary|array|null { $join = false; if (array_key_exists('join', $options)) { $join = true; diff --git a/src/dba/models/HashFactory.php b/src/dba/models/HashFactory.php index d9476addc..f30fc0eef 100644 --- a/src/dba/models/HashFactory.php +++ b/src/dba/models/HashFactory.php @@ -52,7 +52,7 @@ function createObjectFromDict($pk, $dict): Hash { * @param bool $single * @return Hash|Hash[] */ - function filter(array $options, bool $single = false): Hash|array { + function filter(array $options, bool $single = false): Hash|array|null { $join = false; if (array_key_exists('join', $options)) { $join = true; diff --git a/src/dba/models/HashTypeFactory.php b/src/dba/models/HashTypeFactory.php index 8737dabe3..afe6886b9 100644 --- a/src/dba/models/HashTypeFactory.php +++ b/src/dba/models/HashTypeFactory.php @@ -52,7 +52,7 @@ function createObjectFromDict($pk, $dict): HashType { * @param bool $single * @return HashType|HashType[] */ - function filter(array $options, bool $single = false): HashType|array { + function filter(array $options, bool $single = false): HashType|array|null { $join = false; if (array_key_exists('join', $options)) { $join = true; diff --git a/src/dba/models/HashlistFactory.php b/src/dba/models/HashlistFactory.php index 609d17ac8..56e567f0a 100644 --- a/src/dba/models/HashlistFactory.php +++ b/src/dba/models/HashlistFactory.php @@ -52,7 +52,7 @@ function createObjectFromDict($pk, $dict): Hashlist { * @param bool $single * @return Hashlist|Hashlist[] */ - function filter(array $options, bool $single = false): Hashlist|array { + function filter(array $options, bool $single = false): Hashlist|array|null { $join = false; if (array_key_exists('join', $options)) { $join = true; diff --git a/src/dba/models/HashlistHashlistFactory.php b/src/dba/models/HashlistHashlistFactory.php index e33c7e98f..379458f92 100644 --- a/src/dba/models/HashlistHashlistFactory.php +++ b/src/dba/models/HashlistHashlistFactory.php @@ -52,7 +52,7 @@ function createObjectFromDict($pk, $dict): HashlistHashlist { * @param bool $single * @return HashlistHashlist|HashlistHashlist[] */ - function filter(array $options, bool $single = false): HashlistHashlist|array { + function filter(array $options, bool $single = false): HashlistHashlist|array|null { $join = false; if (array_key_exists('join', $options)) { $join = true; diff --git a/src/dba/models/HealthCheckAgentFactory.php b/src/dba/models/HealthCheckAgentFactory.php index b97b2ae1f..d7f04abf0 100644 --- a/src/dba/models/HealthCheckAgentFactory.php +++ b/src/dba/models/HealthCheckAgentFactory.php @@ -53,7 +53,7 @@ function createObjectFromDict($pk, $dict): HealthCheckAgent { * @param bool $single * @return HealthCheckAgent|HealthCheckAgent[] */ - function filter(array $options, bool $single = false): HealthCheckAgent|array { + function filter(array $options, bool $single = false): HealthCheckAgent|array|null { $join = false; if (array_key_exists('join', $options)) { $join = true; diff --git a/src/dba/models/HealthCheckFactory.php b/src/dba/models/HealthCheckFactory.php index 9bef01cf7..817302082 100644 --- a/src/dba/models/HealthCheckFactory.php +++ b/src/dba/models/HealthCheckFactory.php @@ -52,7 +52,7 @@ function createObjectFromDict($pk, $dict): HealthCheck { * @param bool $single * @return HealthCheck|HealthCheck[] */ - function filter(array $options, bool $single = false): HealthCheck|array { + function filter(array $options, bool $single = false): HealthCheck|array|null { $join = false; if (array_key_exists('join', $options)) { $join = true; diff --git a/src/dba/models/LogEntryFactory.php b/src/dba/models/LogEntryFactory.php index dc9d806d6..ddcb4d849 100644 --- a/src/dba/models/LogEntryFactory.php +++ b/src/dba/models/LogEntryFactory.php @@ -52,7 +52,7 @@ function createObjectFromDict($pk, $dict): LogEntry { * @param bool $single * @return LogEntry|LogEntry[] */ - function filter(array $options, bool $single = false): LogEntry|array { + function filter(array $options, bool $single = false): LogEntry|array|null { $join = false; if (array_key_exists('join', $options)) { $join = true; diff --git a/src/dba/models/NotificationSettingFactory.php b/src/dba/models/NotificationSettingFactory.php index fc1aad035..d51485078 100644 --- a/src/dba/models/NotificationSettingFactory.php +++ b/src/dba/models/NotificationSettingFactory.php @@ -52,7 +52,7 @@ function createObjectFromDict($pk, $dict): NotificationSetting { * @param bool $single * @return NotificationSetting|NotificationSetting[] */ - function filter(array $options, bool $single = false): NotificationSetting|array { + function filter(array $options, bool $single = false): NotificationSetting|array|null { $join = false; if (array_key_exists('join', $options)) { $join = true; diff --git a/src/dba/models/PreprocessorFactory.php b/src/dba/models/PreprocessorFactory.php index 5b0fe7d3e..097ab22d7 100644 --- a/src/dba/models/PreprocessorFactory.php +++ b/src/dba/models/PreprocessorFactory.php @@ -52,7 +52,7 @@ function createObjectFromDict($pk, $dict): Preprocessor { * @param bool $single * @return Preprocessor|Preprocessor[] */ - function filter(array $options, bool $single = false): Preprocessor|array { + function filter(array $options, bool $single = false): Preprocessor|array|null { $join = false; if (array_key_exists('join', $options)) { $join = true; diff --git a/src/dba/models/PretaskFactory.php b/src/dba/models/PretaskFactory.php index 290a59093..07e37e930 100644 --- a/src/dba/models/PretaskFactory.php +++ b/src/dba/models/PretaskFactory.php @@ -52,7 +52,7 @@ function createObjectFromDict($pk, $dict): Pretask { * @param bool $single * @return Pretask|Pretask[] */ - function filter(array $options, bool $single = false): Pretask|array { + function filter(array $options, bool $single = false): Pretask|array|null { $join = false; if (array_key_exists('join', $options)) { $join = true; diff --git a/src/dba/models/RegVoucherFactory.php b/src/dba/models/RegVoucherFactory.php index 35de8cd1d..476ddf92f 100644 --- a/src/dba/models/RegVoucherFactory.php +++ b/src/dba/models/RegVoucherFactory.php @@ -52,7 +52,7 @@ function createObjectFromDict($pk, $dict): RegVoucher { * @param bool $single * @return RegVoucher|RegVoucher[] */ - function filter(array $options, bool $single = false): RegVoucher|array { + function filter(array $options, bool $single = false): RegVoucher|array|null { $join = false; if (array_key_exists('join', $options)) { $join = true; diff --git a/src/dba/models/RightGroupFactory.php b/src/dba/models/RightGroupFactory.php index 1b147e933..8ba2132ed 100644 --- a/src/dba/models/RightGroupFactory.php +++ b/src/dba/models/RightGroupFactory.php @@ -52,7 +52,7 @@ function createObjectFromDict($pk, $dict): RightGroup { * @param bool $single * @return RightGroup|RightGroup[] */ - function filter(array $options, bool $single = false): RightGroup|array { + function filter(array $options, bool $single = false): RightGroup|array|null { $join = false; if (array_key_exists('join', $options)) { $join = true; diff --git a/src/dba/models/SessionFactory.php b/src/dba/models/SessionFactory.php index 4b5fae2ef..9132e5a19 100644 --- a/src/dba/models/SessionFactory.php +++ b/src/dba/models/SessionFactory.php @@ -52,7 +52,7 @@ function createObjectFromDict($pk, $dict): Session { * @param bool $single * @return Session|Session[] */ - function filter(array $options, bool $single = false): Session|array { + function filter(array $options, bool $single = false): Session|array|null { $join = false; if (array_key_exists('join', $options)) { $join = true; diff --git a/src/dba/models/SpeedFactory.php b/src/dba/models/SpeedFactory.php index 825099377..4c9ccebdd 100644 --- a/src/dba/models/SpeedFactory.php +++ b/src/dba/models/SpeedFactory.php @@ -52,7 +52,7 @@ function createObjectFromDict($pk, $dict): Speed { * @param bool $single * @return Speed|Speed[] */ - function filter(array $options, bool $single = false): Speed|array { + function filter(array $options, bool $single = false): Speed|array|null { $join = false; if (array_key_exists('join', $options)) { $join = true; diff --git a/src/dba/models/StoredValueFactory.php b/src/dba/models/StoredValueFactory.php index 2775d96d2..df42fc923 100644 --- a/src/dba/models/StoredValueFactory.php +++ b/src/dba/models/StoredValueFactory.php @@ -52,7 +52,7 @@ function createObjectFromDict($pk, $dict): StoredValue { * @param bool $single * @return StoredValue|StoredValue[] */ - function filter(array $options, bool $single = false): StoredValue|array { + function filter(array $options, bool $single = false): StoredValue|array|null { $join = false; if (array_key_exists('join', $options)) { $join = true; diff --git a/src/dba/models/SupertaskFactory.php b/src/dba/models/SupertaskFactory.php index 6124ae48f..ff6fa36a5 100644 --- a/src/dba/models/SupertaskFactory.php +++ b/src/dba/models/SupertaskFactory.php @@ -52,7 +52,7 @@ function createObjectFromDict($pk, $dict): Supertask { * @param bool $single * @return Supertask|Supertask[] */ - function filter(array $options, bool $single = false): Supertask|array { + function filter(array $options, bool $single = false): Supertask|array|null { $join = false; if (array_key_exists('join', $options)) { $join = true; diff --git a/src/dba/models/SupertaskPretaskFactory.php b/src/dba/models/SupertaskPretaskFactory.php index 717fe2347..c1bb9298d 100644 --- a/src/dba/models/SupertaskPretaskFactory.php +++ b/src/dba/models/SupertaskPretaskFactory.php @@ -52,7 +52,7 @@ function createObjectFromDict($pk, $dict): SupertaskPretask { * @param bool $single * @return SupertaskPretask|SupertaskPretask[] */ - function filter(array $options, bool $single = false): SupertaskPretask|array { + function filter(array $options, bool $single = false): SupertaskPretask|array|null { $join = false; if (array_key_exists('join', $options)) { $join = true; diff --git a/src/dba/models/TaskDebugOutputFactory.php b/src/dba/models/TaskDebugOutputFactory.php index be8251d05..c10274a70 100644 --- a/src/dba/models/TaskDebugOutputFactory.php +++ b/src/dba/models/TaskDebugOutputFactory.php @@ -52,7 +52,7 @@ function createObjectFromDict($pk, $dict): TaskDebugOutput { * @param bool $single * @return TaskDebugOutput|TaskDebugOutput[] */ - function filter(array $options, bool $single = false): TaskDebugOutput|array { + function filter(array $options, bool $single = false): TaskDebugOutput|array|null { $join = false; if (array_key_exists('join', $options)) { $join = true; diff --git a/src/dba/models/TaskFactory.php b/src/dba/models/TaskFactory.php index 9f1dddb0d..b0e4b6ce8 100644 --- a/src/dba/models/TaskFactory.php +++ b/src/dba/models/TaskFactory.php @@ -52,7 +52,7 @@ function createObjectFromDict($pk, $dict): Task { * @param bool $single * @return Task|Task[] */ - function filter(array $options, bool $single = false): Task|array { + function filter(array $options, bool $single = false): Task|array|null { $join = false; if (array_key_exists('join', $options)) { $join = true; diff --git a/src/dba/models/TaskWrapperFactory.php b/src/dba/models/TaskWrapperFactory.php index 24dc6dec2..c546d049f 100644 --- a/src/dba/models/TaskWrapperFactory.php +++ b/src/dba/models/TaskWrapperFactory.php @@ -52,7 +52,7 @@ function createObjectFromDict($pk, $dict): TaskWrapper { * @param bool $single * @return TaskWrapper|TaskWrapper[] */ - function filter(array $options, bool $single = false): TaskWrapper|array { + function filter(array $options, bool $single = false): TaskWrapper|array|null { $join = false; if (array_key_exists('join', $options)) { $join = true; diff --git a/src/dba/models/UserFactory.php b/src/dba/models/UserFactory.php index 2d3c421cf..2dd6722e9 100644 --- a/src/dba/models/UserFactory.php +++ b/src/dba/models/UserFactory.php @@ -52,7 +52,7 @@ function createObjectFromDict($pk, $dict): User { * @param bool $single * @return User|User[] */ - function filter(array $options, bool $single = false): User|array { + function filter(array $options, bool $single = false): User|array|null { $join = false; if (array_key_exists('join', $options)) { $join = true; diff --git a/src/dba/models/ZapFactory.php b/src/dba/models/ZapFactory.php index 3d73442da..c8654fd22 100644 --- a/src/dba/models/ZapFactory.php +++ b/src/dba/models/ZapFactory.php @@ -52,7 +52,7 @@ function createObjectFromDict($pk, $dict): Zap { * @param bool $single * @return Zap|Zap[] */ - function filter(array $options, bool $single = false): Zap|array { + function filter(array $options, bool $single = false): Zap|array|null { $join = false; if (array_key_exists('join', $options)) { $join = true; diff --git a/src/inc/startup/include.php b/src/inc/startup/include.php index 06b6c72bf..961baad15 100755 --- a/src/inc/startup/include.php +++ b/src/inc/startup/include.php @@ -16,7 +16,7 @@ $baseDir = dirname(__FILE__) . "/.."; -require_once($baseDir . "/StartupConfig.class.php"); +require_once($baseDir . "/StartupConfig.php"); require_once($baseDir . "/../../vendor/autoload.php"); From cfc05a148c151a840f1e96feb79033f31f2474cd Mon Sep 17 00:00:00 2001 From: jessevz Date: Mon, 16 Feb 2026 12:44:23 +0100 Subject: [PATCH 429/691] Fixed copilot suggestions --- src/dba/AbstractModelFactory.class.php | 1 - src/inc/apiv2/common/AbstractBaseAPI.class.php | 8 ++++---- src/inc/apiv2/model/taskwrappers.routes.php | 1 - 3 files changed, 4 insertions(+), 6 deletions(-) diff --git a/src/dba/AbstractModelFactory.class.php b/src/dba/AbstractModelFactory.class.php index 7726ad3ce..c55f2780b 100755 --- a/src/dba/AbstractModelFactory.class.php +++ b/src/dba/AbstractModelFactory.class.php @@ -494,7 +494,6 @@ public function countFilter($options) { if (array_key_exists("filter", $options)) { $query .= $this->applyFilters($vals, $options['filter']); } - error_log($query); $dbh = self::getDB(); $stmt = $dbh->prepare($query); diff --git a/src/inc/apiv2/common/AbstractBaseAPI.class.php b/src/inc/apiv2/common/AbstractBaseAPI.class.php index e9596d92f..4d04821bd 100644 --- a/src/inc/apiv2/common/AbstractBaseAPI.class.php +++ b/src/inc/apiv2/common/AbstractBaseAPI.class.php @@ -1049,7 +1049,7 @@ function getFilters(Request $request): array { return $this->getQueryParameterFamily($request, 'filter'); } - protected static function checkJoinExists(array $joins, $modelName) { + protected static function checkJoinExists(array $joins, string $modelName) { foreach($joins as $join) { if ($join->getOtherFactory()->getModelName() === $modelName) { return true; @@ -1064,7 +1064,6 @@ protected static function checkJoinExists(array $joins, $modelName) { * @throws InternalError */ protected function makeFilter(array $filters, object $apiClass, array &$joinFilters = []): array { - // protected function makeFilter(array $filters, object $apiClass, array &$joinFilters): array { $qFs = []; $features = $apiClass->getAliasedFeatures(); $factory = $apiClass->getFactory(); @@ -1209,7 +1208,7 @@ protected function retrieveRelationKey(string $value): object { throw new HttpError("Invalid relation: " . $relationString); } } else { - throw new HttpError("Invalid key, multiple '.' found in key, but only relationships of one deep is allowed"); + throw new HttpForbidden("Invalid key, multiple '.' found in key, but only relationships of one deep is allowed"); } } @@ -1232,6 +1231,7 @@ protected function makeOrderFilterTemplates(Request $request, array $features, s if ($cast_key == $this->getPrimaryKey()) { $contains_primary_key = true; } + $factory = $joinKey = $key = null; if (strpos($cast_key, ".")) { $relationObject = $this->retrieveRelationKey($cast_key); $factory = $relationObject->factory; @@ -1246,7 +1246,7 @@ protected function makeOrderFilterTemplates(Request $request, array $features, s if ($reverseSort) { $type = ($type == "ASC") ? "DESC" : "ASC"; } - $orderTemplates[] = ['by' => $remappedKey, 'type' => $type, 'factory' => $factory ?? null, 'joinKey' => $joinKey ?? null, 'key' => $key ?? null]; + $orderTemplates[] = ['by' => $remappedKey, 'type' => $type, 'factory' => $factory, 'joinKey' => $joinKey, 'key' => $key]; } else { throw new HttpForbidden("Ordering parameter '" . $order . "' is not valid"); diff --git a/src/inc/apiv2/model/taskwrappers.routes.php b/src/inc/apiv2/model/taskwrappers.routes.php index 827773e5f..7ed5fb868 100644 --- a/src/inc/apiv2/model/taskwrappers.routes.php +++ b/src/inc/apiv2/model/taskwrappers.routes.php @@ -144,7 +144,6 @@ protected function parseFilters(array $filters) { foreach($filters[Factory::FILTER] as &$filter) { if ($filter instanceof LikeFilterInsensitive && $filter->getKey() == Task::TASK_NAME) { $concatColumns = [new ConcatColumn(TaskWrapper::TASK_WRAPPER_NAME, Factory::getTaskWrapperFactory()), new ConcatColumn(Task::TASK_NAME, Factory::getTaskFactory())]; - // $coalesceColumns = [new CoalesceColumn(Task::TASK_NAME, Factory::getTaskFactory()), new CoalesceColumn(TaskWrapper::TASK_WRAPPER_NAME, Factory::getTaskWrapperFactory())]; $newFilter = new ConcatLikeFilterInsensitive($concatColumns, $filter->getValue()); $filter = $newFilter; } From 8d759f2a620e0c9fc095752400541f6df1046d8c Mon Sep 17 00:00:00 2001 From: jessevz Date: Mon, 16 Feb 2026 15:16:05 +0100 Subject: [PATCH 430/691] Made both concat filters with the same order --- src/inc/apiv2/model/taskwrappers.routes.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/inc/apiv2/model/taskwrappers.routes.php b/src/inc/apiv2/model/taskwrappers.routes.php index 7ed5fb868..e9852f18e 100644 --- a/src/inc/apiv2/model/taskwrappers.routes.php +++ b/src/inc/apiv2/model/taskwrappers.routes.php @@ -132,7 +132,7 @@ protected function parseFilters(array $filters) { if (isset($filters[Factory::ORDER])) { foreach ($filters[Factory::ORDER] as &$orderfilter) { if ($orderfilter->getBy() == Task::TASK_NAME) { - $concatColumns = [new ConcatColumn(Task::TASK_NAME, Factory::getTaskFactory()), new ConcatColumn(TaskWrapper::TASK_WRAPPER_NAME, Factory::getTaskWrapperFactory())]; + $concatColumns = [new ConcatColumn(TaskWrapper::TASK_WRAPPER_NAME, Factory::getTaskWrapperFactory()), new ConcatColumn(Task::TASK_NAME, Factory::getTaskFactory())]; $newOrderFilter = new ConcatOrderFilter($concatColumns, $orderfilter->getType()); $orderfilter = $newOrderFilter; } From d4dfb80a3d9cd6dc39f8d69a205d5d7b27a4dd35 Mon Sep 17 00:00:00 2001 From: s3inlc Date: Mon, 16 Feb 2026 17:09:55 +0100 Subject: [PATCH 431/691] updated all namespaces to be correct now, most tests run properly now --- Dockerfile | 6 ++--- docker-compose.mysql.yml | 4 +-- docker-compose.postgres.yml | 4 +-- src/api/v2/index.php | 8 +++--- ...{Auth_Yubico.class.php => Auth_Yubico.php} | 6 +++++ src/inc/Login.php | 2 +- src/inc/UI.php | 14 +++++----- src/inc/api/APIBasic.php | 10 +++---- src/inc/api/APICheckClientVersion.php | 12 ++++----- src/inc/api/APIClientError.php | 16 ++++++------ src/inc/api/APIDeRegisterAgent.php | 10 +++---- src/inc/api/APIDownloadBinary.php | 12 ++++----- src/inc/api/APIGetChunk.php | 18 ++++++------- src/inc/api/APIGetFile.php | 8 +++--- src/inc/api/APIGetFileStatus.php | 6 ++--- src/inc/api/APIGetFound.php | 8 +++--- src/inc/api/APIGetHashlist.php | 8 +++--- src/inc/api/APIGetHealthCheck.php | 10 +++---- src/inc/api/APIGetTask.php | 12 ++++----- src/inc/api/APILogin.php | 10 +++---- src/inc/api/APIRegisterAgent.php | 14 +++++----- src/inc/api/APISendBenchmark.php | 16 ++++++------ src/inc/api/APISendHealthCheck.php | 10 +++---- src/inc/api/APISendKeyspace.php | 14 +++++----- src/inc/api/APISendProgress.php | 24 ++++++++--------- src/inc/api/APITestConnection.php | 7 ++--- src/inc/api/APIUpdateClientInformation.php | 10 +++---- .../apiv2/auth/HashtopolisAuthenticator.php | 5 ++-- src/inc/apiv2/auth/token.routes.php | 2 +- src/inc/apiv2/common/AbstractBaseAPI.php | 5 +++- src/inc/apiv2/common/AbstractHelperAPI.php | 2 ++ src/inc/apiv2/common/AbstractModelAPI.php | 8 ++++-- src/inc/apiv2/common/OpenAPISchemaUtils.php | 4 +-- src/inc/apiv2/common/openAPISchema.routes.php | 2 +- src/inc/apiv2/error/ErrorHandler.php | 2 +- src/inc/apiv2/error/HttpConflict.php | 2 +- src/inc/apiv2/error/HttpError.php | 2 +- src/inc/apiv2/error/HttpForbidden.php | 2 +- src/inc/apiv2/error/InternalError.php | 2 +- src/inc/apiv2/error/ResourceNotFoundError.php | 2 +- src/inc/apiv2/helper/AssignAgentHelperAPI.php | 2 +- .../helper/CreateSuperHashlistHelperAPI.php | 2 +- .../apiv2/helper/CreateSupertaskHelperAPI.php | 2 +- src/inc/apiv2/helper/CurrentUserHelperAPI.php | 6 ++--- .../apiv2/helper/GetAccessGroupsHelperAPI.php | 4 +-- .../apiv2/helper/GetAgentBinaryHelperAPI.php | 2 +- .../apiv2/helper/GetCracksOfTaskHelper.php | 6 ++--- src/inc/apiv2/helper/GetFileHelperAPI.php | 4 +-- .../helper/GetTaskProgressImageHelperAPI.php | 9 ++++--- .../helper/GetUserPermissionHelperAPI.php | 4 +-- src/inc/apiv2/helper/ImportFileHelperAPI.php | 6 ++--- .../apiv2/helper/SearchHashesHelperAPI.php | 2 +- .../apiv2/helper/TaskExtraDetailsHelper.php | 6 ++--- .../apiv2/helper/UnassignAgentHelperAPI.php | 2 +- src/inc/apiv2/model/AgentAPI.php | 2 +- src/inc/apiv2/model/AgentAssignmentAPI.php | 6 ++--- src/inc/apiv2/model/AgentBinaryAPI.php | 2 +- src/inc/apiv2/model/AgentErrorAPI.php | 2 +- src/inc/apiv2/model/AgentStatAPI.php | 2 +- src/inc/apiv2/model/ChunkAPI.php | 2 +- src/inc/apiv2/model/ConfigAPI.php | 2 +- src/inc/apiv2/model/ConfigSectionAPI.php | 2 +- src/inc/apiv2/model/CrackerBinaryAPI.php | 2 +- src/inc/apiv2/model/CrackerBinaryTypeAPI.php | 4 +-- src/inc/apiv2/model/FileAPI.php | 4 +-- .../apiv2/model/GlobalPermissionGroupAPI.php | 8 +++--- src/inc/apiv2/model/HashAPI.php | 2 +- src/inc/apiv2/model/HashTypeAPI.php | 2 +- src/inc/apiv2/model/HashlistAPI.php | 2 +- src/inc/apiv2/model/HealthCheckAPI.php | 2 +- src/inc/apiv2/model/HealthCheckAgentAPI.php | 2 +- src/inc/apiv2/model/LogEntryAPI.php | 2 +- .../apiv2/model/NotificationSettingAPI.php | 7 +++-- src/inc/apiv2/model/PreTaskAPI.php | 2 +- src/inc/apiv2/model/PreprocessorAPI.php | 4 +-- src/inc/apiv2/model/SpeedAPI.php | 2 +- src/inc/apiv2/model/SupertaskAPI.php | 2 +- src/inc/apiv2/model/TaskAPI.php | 6 ++--- src/inc/apiv2/model/TaskWrapperAPI.php | 5 ++-- src/inc/apiv2/model/UserAPI.php | 4 +-- src/inc/apiv2/model/VoucherAPI.php | 2 +- src/inc/apiv2/util/CorsHackMiddleware.php | 2 +- .../apiv2/util/JsonBodyParserMiddleware.php | 2 +- .../apiv2/util/TokenAsParameterMiddleware.php | 2 +- src/inc/handlers/PretaskHandler.php | 1 - .../notifications/HashtopolisNotification.php | 26 ++++++++++++++++--- .../HashtopolisNotificationChatBot.php | 2 -- .../HashtopolisNotificationDiscordWebhook.php | 2 -- .../HashtopolisNotificationEmail.php | 2 -- .../HashtopolisNotificationExample.php | 2 -- .../HashtopolisNotificationSlack.php | 2 -- .../HashtopolisNotificationTelegram.php | 2 -- src/inc/startup/include.php | 4 +-- src/inc/templating/Template.php | 1 - src/inc/user_api/UserAPIBasic.php | 11 ++++---- src/inc/utils/AccessControlUtils.php | 4 +-- src/inc/utils/AccessGroupUtils.php | 8 ++---- src/inc/utils/AccessUtils.php | 1 - src/inc/utils/AgentBinaryUtils.php | 2 +- src/inc/utils/AgentUtils.php | 4 +-- src/inc/utils/ConfigUtils.php | 1 - src/inc/utils/CrackerUtils.php | 4 +-- src/inc/utils/FileUtils.php | 2 +- src/inc/utils/HashlistUtils.php | 3 +-- src/inc/utils/HashtypeUtils.php | 2 +- src/inc/utils/HealthUtils.php | 2 +- src/inc/utils/LockUtils.php | 2 +- src/inc/utils/NotificationUtils.php | 4 +-- src/inc/utils/PreprocessorUtils.php | 4 +-- src/inc/utils/PretaskUtils.php | 3 +-- src/inc/utils/RunnerUtils.php | 1 + src/inc/utils/SupertaskUtils.php | 3 +-- src/inc/utils/TaskUtils.php | 4 +-- src/inc/utils/TaskWrapperUtils.php | 2 +- src/inc/utils/UserUtils.php | 4 +-- 115 files changed, 297 insertions(+), 284 deletions(-) rename src/inc/{Auth_Yubico.class.php => Auth_Yubico.php} (99%) diff --git a/Dockerfile b/Dockerfile index b87a3e8ec..8dad1aa2f 100644 --- a/Dockerfile +++ b/Dockerfile @@ -43,8 +43,8 @@ RUN if [ -n "${CONTAINER_USER_CMD_PRE}" ]; then echo "${CONTAINER_USER_CMD_PRE}" # Configure apt and install packages RUN apt-get update \ && apt-get -y install --no-install-recommends apt-utils zip unzip nano ncdu gettext-base 2>&1 \ - # - # Install git, procps, lsb-release (useful for CLI installs) + \ + # Install git, procps, lsb-release (useful for CLI installs) \ && apt-get -y install git iproute2 procps lsb-release \ && apt-get -y install mariadb-client postgresql-client libpq-dev \ && apt-get -y install libpng-dev \ @@ -120,7 +120,7 @@ RUN yes | pecl install xdebug && docker-php-ext-enable xdebug \ && echo "xdebug.client_port = 9003" >> /usr/local/etc/php/conf.d/xdebug.ini \ && echo "xdebug.idekey = PHPSTORM" >> /usr/local/etc/php/conf.d/xdebug.ini \ \ - # Configuring PHP + # Configuring PHP \ && touch "/usr/local/etc/php/conf.d/custom.ini" \ && echo "display_errors = on" >> /usr/local/etc/php/conf.d/custom.ini \ && echo "memory_limit = 256m" >> /usr/local/etc/php/conf.d/custom.ini \ diff --git a/docker-compose.mysql.yml b/docker-compose.mysql.yml index d28928764..2da6916de 100644 --- a/docker-compose.mysql.yml +++ b/docker-compose.mysql.yml @@ -21,7 +21,7 @@ services: depends_on: - db ports: - - 8080:80 + - "8080:80" db: container_name: db image: mysql:8.4 @@ -42,7 +42,7 @@ services: depends_on: - hashtopolis-backend ports: - - 4200:80 + - "4200:80" volumes: db: hashtopolis: diff --git a/docker-compose.postgres.yml b/docker-compose.postgres.yml index 2b5bdc56d..5186a2eb4 100644 --- a/docker-compose.postgres.yml +++ b/docker-compose.postgres.yml @@ -20,7 +20,7 @@ services: depends_on: - db ports: - - 8080:80 + - "8080:80" db: container_name: db image: postgres:13 @@ -40,7 +40,7 @@ services: depends_on: - hashtopolis-backend ports: - - 4200:80 + - "4200:80" volumes: db: hashtopolis: diff --git a/src/api/v2/index.php b/src/api/v2/index.php index e3f1cf5ef..05b076af8 100644 --- a/src/api/v2/index.php +++ b/src/api/v2/index.php @@ -24,10 +24,10 @@ use Hashtopolis\inc\apiv2\auth\HashtopolisAuthenticator; use Hashtopolis\inc\apiv2\auth\JWTBeforeHandler; use Hashtopolis\inc\apiv2\common\ClassMapper; -use Hashtopolis\inc\apiv2\common\error\ErrorHandler; -use Hashtopolis\inc\apiv2\common\util\CorsHackMiddleware; -use Hashtopolis\inc\apiv2\common\util\JsonBodyParserMiddleware; -use Hashtopolis\inc\apiv2\common\util\TokenAsParameterMiddleware; +use Hashtopolis\inc\apiv2\error\ErrorHandler; +use Hashtopolis\inc\apiv2\util\CorsHackMiddleware; +use Hashtopolis\inc\apiv2\util\JsonBodyParserMiddleware; +use Hashtopolis\inc\apiv2\util\TokenAsParameterMiddleware; use Hashtopolis\inc\apiv2\helper\AbortChunkHelperAPI; use Hashtopolis\inc\apiv2\helper\AssignAgentHelperAPI; use Hashtopolis\inc\apiv2\helper\BulkSupertaskBuilderHelperAPI; diff --git a/src/inc/Auth_Yubico.class.php b/src/inc/Auth_Yubico.php similarity index 99% rename from src/inc/Auth_Yubico.class.php rename to src/inc/Auth_Yubico.php index 2bdd3606c..82533819e 100644 --- a/src/inc/Auth_Yubico.class.php +++ b/src/inc/Auth_Yubico.php @@ -10,7 +10,12 @@ * @version 2.0 * @link http://www.yubico.com */ + +namespace Hashtopolis\inc; + require_once 'PEAR.php'; +use PEAR; + /** * Class for verifying Yubico One-Time-Passcodes * @@ -435,4 +440,5 @@ function verify($token, $use_timestamp=null, $wait_for_all=False, //return PEAR::raiseError($ans); } } + ?> \ No newline at end of file diff --git a/src/inc/Login.php b/src/inc/Login.php index f73e399e4..fe84d2a49 100755 --- a/src/inc/Login.php +++ b/src/inc/Login.php @@ -2,7 +2,7 @@ namespace Hashtopolis\inc; -use Auth_Yubico; +use Hashtopolis\inc\Auth_Yubico; use Hashtopolis\dba\QueryFilter; use Hashtopolis\dba\models\Session; use Hashtopolis\dba\models\User; diff --git a/src/inc/UI.php b/src/inc/UI.php index 1354df22f..6e04fd9a0 100644 --- a/src/inc/UI.php +++ b/src/inc/UI.php @@ -7,7 +7,7 @@ class UI { private static $objects = []; - public static function printError($level, $message) { + public static function printError($level, $message): void { Template::loadInstance("errors/error"); UI::add('message', $message); UI::add('level', $level); @@ -27,27 +27,27 @@ public static function get($key) { return self::$objects[$key]; } - public static function getObjects() { + public static function getObjects(): array { return self::$objects; } - public static function permissionError() { + public static function permissionError(): void { Template::loadInstance("errors/restricted"); UI::add('pageTitle', "Restricted"); echo Template::getInstance()->render(UI::getObjects()); die(); } - public static function printFatalError($message) { + public static function printFatalError($message): void { echo $message; die(); } - public static function addMessage($type, $message) { + public static function addMessage($type, $message): void { self::$objects['messages'][] = new DataSet(['type' => $type, 'message' => $message]); } - public static function getNumMessages($type = "ALL") { + public static function getNumMessages($type = "ALL"): int { $count = 0; foreach (self::$objects['messages'] as $message) { /** @var $message DataSet */ @@ -58,7 +58,7 @@ public static function getNumMessages($type = "ALL") { return $count; } - public static function setForward($url, $delay) { + public static function setForward($url, $delay): void { UI::add('autorefresh', $delay); UI::add('autorefreshUrl', $url); } diff --git a/src/inc/api/APIBasic.php b/src/inc/api/APIBasic.php index f1a8746ec..b863d6d0b 100644 --- a/src/inc/api/APIBasic.php +++ b/src/inc/api/APIBasic.php @@ -2,14 +2,14 @@ namespace Hashtopolis\inc\api; +use Hashtopolis\inc\agent\PResponseErrorMessage; +use Hashtopolis\inc\agent\PValues; use Hashtopolis\inc\defines\DServerLog; use Hashtopolis\dba\models\Agent; use Hashtopolis\dba\QueryFilter; use Hashtopolis\dba\Factory; use Hashtopolis\inc\HTException; use Hashtopolis\inc\agent\PQuery; -use PResponseErrorMessage; -use PValues; use Hashtopolis\inc\Util; abstract class APIBasic { @@ -28,11 +28,11 @@ protected function sendResponse($RESPONSE) { die(); } - protected function updateAgent($action) { + protected function updateAgent($action): void { Factory::getAgentFactory()->mset($this->agent, [Agent::LAST_IP => Util::getIP(), Agent::LAST_ACT => $action, Agent::LAST_TIME => time()]); } - public function sendErrorResponse($action, $msg) { + public function sendErrorResponse($action, $msg): void { $ANS = array(); $ANS[PResponseErrorMessage::ACTION] = $action; $ANS[PResponseErrorMessage::RESPONSE] = PValues::ERROR; @@ -42,7 +42,7 @@ public function sendErrorResponse($action, $msg) { die(); } - public function checkToken($action, $QUERY) { + public function checkToken($action, $QUERY): void { $qF = new QueryFilter(Agent::TOKEN, $QUERY[PQuery::TOKEN], "="); $agent = Factory::getAgentFactory()->filter([Factory::FILTER => array($qF)], true); if ($agent == null) { diff --git a/src/inc/api/APICheckClientVersion.php b/src/inc/api/APICheckClientVersion.php index 8d186d6b7..f7017b92a 100644 --- a/src/inc/api/APICheckClientVersion.php +++ b/src/inc/api/APICheckClientVersion.php @@ -2,17 +2,17 @@ namespace Hashtopolis\inc\api; -use DConfig; +use Hashtopolis\inc\agent\PActions; +use Hashtopolis\inc\agent\PQueryCheckClientVersion; +use Hashtopolis\inc\agent\PResponseClientUpdate; +use Hashtopolis\inc\agent\PValues; +use Hashtopolis\inc\agent\PValuesUpdateVersion; +use Hashtopolis\inc\defines\DConfig; use Hashtopolis\inc\defines\DServerLog; use Hashtopolis\dba\models\AgentBinary; use Hashtopolis\dba\QueryFilter; use Hashtopolis\dba\Factory; use Composer\Semver\Comparator; -use PActions; -use PQueryCheckClientVersion; -use PResponseClientUpdate; -use PValues; -use PValuesUpdateVersion; use Hashtopolis\inc\SConfig; use Hashtopolis\inc\Util; diff --git a/src/inc/api/APIClientError.php b/src/inc/api/APIClientError.php index 8c9c7ffdb..614540b59 100644 --- a/src/inc/api/APIClientError.php +++ b/src/inc/api/APIClientError.php @@ -2,11 +2,15 @@ namespace Hashtopolis\inc\api; -use DAgentIgnoreErrors; +use Hashtopolis\inc\agent\PActions; +use Hashtopolis\inc\agent\PQueryClientError; +use Hashtopolis\inc\agent\PResponseError; +use Hashtopolis\inc\agent\PValues; use Hashtopolis\inc\DataSet; -use DConfig; -use DNotificationType; -use DPayloadKeys; +use Hashtopolis\inc\defines\DAgentIgnoreErrors; +use Hashtopolis\inc\defines\DConfig; +use Hashtopolis\inc\defines\DNotificationType; +use Hashtopolis\inc\defines\DPayloadKeys; use Hashtopolis\inc\defines\DServerLog; use Hashtopolis\dba\models\Agent; use Hashtopolis\dba\models\AgentError; @@ -14,10 +18,6 @@ use Hashtopolis\dba\QueryFilter; use Hashtopolis\dba\Factory; use Hashtopolis\inc\handlers\NotificationHandler; -use PActions; -use PQueryClientError; -use PResponseError; -use PValues; use Hashtopolis\inc\SConfig; class APIClientError extends APIBasic { diff --git a/src/inc/api/APIDeRegisterAgent.php b/src/inc/api/APIDeRegisterAgent.php index 82d1e02c2..14e92dc9e 100644 --- a/src/inc/api/APIDeRegisterAgent.php +++ b/src/inc/api/APIDeRegisterAgent.php @@ -2,13 +2,13 @@ namespace Hashtopolis\inc\api; +use Hashtopolis\inc\agent\PActions; +use Hashtopolis\inc\agent\PQueryDeRegister; +use Hashtopolis\inc\agent\PResponseDeRegister; +use Hashtopolis\inc\agent\PValues; +use Hashtopolis\inc\defines\DConfig; use Hashtopolis\inc\utils\AgentUtils; -use DConfig; use Hashtopolis\inc\HTException; -use PActions; -use PQueryDeRegister; -use PResponseDeRegister; -use PValues; use Hashtopolis\inc\SConfig; class APIDeRegisterAgent extends APIBasic { diff --git a/src/inc/api/APIDownloadBinary.php b/src/inc/api/APIDownloadBinary.php index 25885c5ea..278a1f4fc 100644 --- a/src/inc/api/APIDownloadBinary.php +++ b/src/inc/api/APIDownloadBinary.php @@ -2,14 +2,14 @@ namespace Hashtopolis\inc\api; -use DConfig; +use Hashtopolis\inc\agent\PActions; +use Hashtopolis\inc\agent\PQueryDownloadBinary; +use Hashtopolis\inc\agent\PResponseBinaryDownload; +use Hashtopolis\inc\agent\PValues; +use Hashtopolis\inc\agent\PValuesDownloadBinaryType; +use Hashtopolis\inc\defines\DConfig; use Hashtopolis\inc\defines\DServerLog; use Hashtopolis\dba\Factory; -use PActions; -use PQueryDownloadBinary; -use PResponseBinaryDownload; -use PValues; -use PValuesDownloadBinaryType; use Hashtopolis\inc\SConfig; use Hashtopolis\inc\Util; diff --git a/src/inc/api/APIGetChunk.php b/src/inc/api/APIGetChunk.php index 6dd6bf872..614fb12c0 100644 --- a/src/inc/api/APIGetChunk.php +++ b/src/inc/api/APIGetChunk.php @@ -2,12 +2,17 @@ namespace Hashtopolis\inc\api; +use Hashtopolis\inc\agent\PActions; +use Hashtopolis\inc\agent\PQueryGetChunk; +use Hashtopolis\inc\agent\PResponseGetChunk; +use Hashtopolis\inc\agent\PValues; +use Hashtopolis\inc\agent\PValuesChunkType; +use Hashtopolis\inc\defines\DConfig; +use Hashtopolis\inc\defines\DTaskStaticChunking; use Hashtopolis\inc\utils\AccessUtils; use Hashtopolis\inc\utils\ChunkUtils; -use DConfig; use Hashtopolis\inc\defines\DHashcatStatus; use Hashtopolis\inc\defines\DServerLog; -use DTaskStaticChunking; use Exception; use Hashtopolis\dba\models\Assignment; use Hashtopolis\dba\models\Chunk; @@ -16,13 +21,8 @@ use Hashtopolis\dba\Factory; use Hashtopolis\inc\utils\HealthUtils; use Hashtopolis\inc\HTException; -use Hashtopolis\inc\utils\LOCK; +use Hashtopolis\inc\utils\Lock; use Hashtopolis\inc\utils\LockUtils; -use PActions; -use PQueryGetChunk; -use PResponseGetChunk; -use PValues; -use PValuesChunkType; use Hashtopolis\inc\SConfig; use Hashtopolis\inc\utils\TaskUtils; @@ -87,7 +87,7 @@ public function execute($QUERY = array()) { $this->sendErrorResponse(PActions::GET_CHUNK, "Agent is inactive!"); } - $LOCKFILE = LOCK::CHUNKING . $task->getId(); + $LOCKFILE = Lock::CHUNKING . $task->getId(); LockUtils::get($LOCKFILE); DServerLog::log(DServerLog::TRACE, "Retrieved lock for chunking!", [$this->agent]); diff --git a/src/inc/api/APIGetFile.php b/src/inc/api/APIGetFile.php index dc287b803..6bffb5bc0 100644 --- a/src/inc/api/APIGetFile.php +++ b/src/inc/api/APIGetFile.php @@ -2,16 +2,16 @@ namespace Hashtopolis\inc\api; +use Hashtopolis\inc\agent\PActions; +use Hashtopolis\inc\agent\PQueryGetFile; +use Hashtopolis\inc\agent\PResponseGetFile; +use Hashtopolis\inc\agent\PValues; use Hashtopolis\inc\defines\DServerLog; use Hashtopolis\dba\models\Assignment; use Hashtopolis\dba\models\File; use Hashtopolis\dba\models\FileTask; use Hashtopolis\dba\QueryFilter; use Hashtopolis\dba\Factory; -use PActions; -use PQueryGetFile; -use PResponseGetFile; -use PValues; class APIGetFile extends APIBasic { public function execute($QUERY = array()) { diff --git a/src/inc/api/APIGetFileStatus.php b/src/inc/api/APIGetFileStatus.php index 165acf49b..185092295 100644 --- a/src/inc/api/APIGetFileStatus.php +++ b/src/inc/api/APIGetFileStatus.php @@ -3,9 +3,9 @@ namespace Hashtopolis\inc\api; use Hashtopolis\dba\Factory; -use PActions; -use PResponseGetFileStatus; -use PValues; +use Hashtopolis\inc\agent\PActions; +use Hashtopolis\inc\agent\PResponseGetFileStatus; +use Hashtopolis\inc\agent\PValues; class APIGetFileStatus extends APIBasic { public function execute($QUERY = array()) { diff --git a/src/inc/api/APIGetFound.php b/src/inc/api/APIGetFound.php index 790f2b3a0..bcb54c8e9 100644 --- a/src/inc/api/APIGetFound.php +++ b/src/inc/api/APIGetFound.php @@ -2,14 +2,14 @@ namespace Hashtopolis\inc\api; +use Hashtopolis\inc\agent\PActions; +use Hashtopolis\inc\agent\PQueryGetFound; +use Hashtopolis\inc\agent\PResponseGetFound; +use Hashtopolis\inc\agent\PValues; use Hashtopolis\inc\defines\DServerLog; use Hashtopolis\dba\Factory; use Hashtopolis\dba\QueryFilter; use Hashtopolis\dba\models\Assignment; -use PActions; -use PQueryGetFound; -use PResponseGetFound; -use PValues; use Hashtopolis\inc\Util; class APIGetFound extends APIBasic { diff --git a/src/inc/api/APIGetHashlist.php b/src/inc/api/APIGetHashlist.php index 432a1a1b7..7aadfa235 100644 --- a/src/inc/api/APIGetHashlist.php +++ b/src/inc/api/APIGetHashlist.php @@ -2,14 +2,14 @@ namespace Hashtopolis\inc\api; +use Hashtopolis\inc\agent\PActions; +use Hashtopolis\inc\agent\PQueryGetHashlist; +use Hashtopolis\inc\agent\PResponseGetHashlist; +use Hashtopolis\inc\agent\PValues; use Hashtopolis\inc\defines\DServerLog; use Hashtopolis\dba\models\Assignment; use Hashtopolis\dba\QueryFilter; use Hashtopolis\dba\Factory; -use PActions; -use PQueryGetHashlist; -use PResponseGetHashlist; -use PValues; use Hashtopolis\inc\Util; class APIGetHashlist extends APIBasic { diff --git a/src/inc/api/APIGetHealthCheck.php b/src/inc/api/APIGetHealthCheck.php index 2abaf95be..1f7e76801 100644 --- a/src/inc/api/APIGetHealthCheck.php +++ b/src/inc/api/APIGetHealthCheck.php @@ -2,14 +2,14 @@ namespace Hashtopolis\inc\api; -use DConfig; +use Hashtopolis\inc\agent\PActions; +use Hashtopolis\inc\agent\PQueryGetHealthCheck; +use Hashtopolis\inc\agent\PResponseGetHealthCheck; +use Hashtopolis\inc\agent\PValues; +use Hashtopolis\inc\defines\DConfig; use Hashtopolis\inc\defines\DServerLog; use Hashtopolis\dba\Factory; use Hashtopolis\inc\utils\HealthUtils; -use PActions; -use PQueryGetHealthCheck; -use PResponseGetHealthCheck; -use PValues; use Hashtopolis\inc\SConfig; class APIGetHealthCheck extends APIBasic { diff --git a/src/inc/api/APIGetTask.php b/src/inc/api/APIGetTask.php index a0e4fb4ba..4c0b85eff 100644 --- a/src/inc/api/APIGetTask.php +++ b/src/inc/api/APIGetTask.php @@ -2,7 +2,12 @@ namespace Hashtopolis\inc\api; -use DConfig; +use Hashtopolis\inc\agent\PActions; +use Hashtopolis\inc\agent\PQueryGetTask; +use Hashtopolis\inc\agent\PResponseGetTask; +use Hashtopolis\inc\agent\PValues; +use Hashtopolis\inc\agent\PValuesTask; +use Hashtopolis\inc\defines\DConfig; use Hashtopolis\inc\defines\DServerLog; use Hashtopolis\dba\models\Assignment; use Hashtopolis\dba\models\File; @@ -12,11 +17,6 @@ use Hashtopolis\dba\models\Task; use Hashtopolis\dba\Factory; use Hashtopolis\inc\utils\HealthUtils; -use PActions; -use PQueryGetTask; -use PResponseGetTask; -use PValues; -use PValuesTask; use Hashtopolis\inc\SConfig; use Hashtopolis\inc\utils\TaskUtils; diff --git a/src/inc/api/APILogin.php b/src/inc/api/APILogin.php index 33dc5e55f..8289c929f 100644 --- a/src/inc/api/APILogin.php +++ b/src/inc/api/APILogin.php @@ -2,14 +2,14 @@ namespace Hashtopolis\inc\api; -use DConfig; +use Hashtopolis\inc\agent\PActions; +use Hashtopolis\inc\agent\PQueryLogin; +use Hashtopolis\inc\agent\PResponseLogin; +use Hashtopolis\inc\agent\PValues; +use Hashtopolis\inc\defines\DConfig; use Hashtopolis\inc\defines\DServerLog; use Hashtopolis\dba\models\Agent; use Hashtopolis\dba\Factory; -use PActions; -use PQueryLogin; -use PResponseLogin; -use PValues; use Hashtopolis\inc\SConfig; use Hashtopolis\inc\StartupConfig; use Hashtopolis\inc\Util; diff --git a/src/inc/api/APIRegisterAgent.php b/src/inc/api/APIRegisterAgent.php index 6f1eaf6f1..3b3aed3f2 100644 --- a/src/inc/api/APIRegisterAgent.php +++ b/src/inc/api/APIRegisterAgent.php @@ -2,11 +2,15 @@ namespace Hashtopolis\inc\api; +use Hashtopolis\inc\agent\PActions; +use Hashtopolis\inc\agent\PQueryRegister; +use Hashtopolis\inc\agent\PResponseRegister; +use Hashtopolis\inc\agent\PValues; +use Hashtopolis\inc\defines\DConfig; +use Hashtopolis\inc\defines\DNotificationType; +use Hashtopolis\inc\defines\DPayloadKeys; use Hashtopolis\inc\utils\AccessUtils; use Hashtopolis\inc\DataSet; -use DConfig; -use DNotificationType; -use DPayloadKeys; use Hashtopolis\inc\defines\DServerLog; use Hashtopolis\dba\models\AccessGroupAgent; use Hashtopolis\dba\models\Agent; @@ -14,10 +18,6 @@ use Hashtopolis\dba\models\RegVoucher; use Hashtopolis\dba\Factory; use Hashtopolis\inc\handlers\NotificationHandler; -use PActions; -use PQueryRegister; -use PResponseRegister; -use PValues; use Hashtopolis\inc\SConfig; use Hashtopolis\inc\Util; diff --git a/src/inc/api/APISendBenchmark.php b/src/inc/api/APISendBenchmark.php index 138ce6e0a..6ea9cbe8d 100644 --- a/src/inc/api/APISendBenchmark.php +++ b/src/inc/api/APISendBenchmark.php @@ -2,22 +2,22 @@ namespace Hashtopolis\inc\api; +use Hashtopolis\inc\agent\PActions; +use Hashtopolis\inc\agent\PQuerySendBenchmark; +use Hashtopolis\inc\agent\PResponseSendBenchmark; +use Hashtopolis\inc\agent\PValues; +use Hashtopolis\inc\agent\PValuesBenchmarkType; +use Hashtopolis\inc\defines\DConfig; +use Hashtopolis\inc\defines\DDirectories; +use Hashtopolis\inc\defines\DTaskTypes; use Hashtopolis\inc\utils\AccessUtils; -use DConfig; -use DDirectories; use Hashtopolis\inc\defines\DFileType; use Hashtopolis\inc\defines\DServerLog; -use DTaskTypes; use Hashtopolis\dba\models\Agent; use Hashtopolis\dba\models\Assignment; use Hashtopolis\dba\QueryFilter; use Hashtopolis\dba\Factory; use Hashtopolis\dba\models\File; -use PActions; -use PQuerySendBenchmark; -use PResponseSendBenchmark; -use PValues; -use PValuesBenchmarkType; use Hashtopolis\inc\SConfig; use Hashtopolis\inc\utils\TaskUtils; use Hashtopolis\inc\Util; diff --git a/src/inc/api/APISendHealthCheck.php b/src/inc/api/APISendHealthCheck.php index 38d350522..06987e7d6 100644 --- a/src/inc/api/APISendHealthCheck.php +++ b/src/inc/api/APISendHealthCheck.php @@ -2,17 +2,17 @@ namespace Hashtopolis\inc\api; -use DAgentIgnoreErrors; +use Hashtopolis\inc\agent\PActions; +use Hashtopolis\inc\agent\PQuerySendHealthCheck; +use Hashtopolis\inc\agent\PResponseSendHealthCheck; +use Hashtopolis\inc\agent\PValues; +use Hashtopolis\inc\defines\DAgentIgnoreErrors; use Hashtopolis\inc\defines\DHealthCheckAgentStatus; use Hashtopolis\inc\defines\DServerLog; use Hashtopolis\dba\Factory; use Hashtopolis\dba\models\HealthCheckAgent; use Hashtopolis\dba\QueryFilter; use Hashtopolis\inc\utils\HealthUtils; -use PActions; -use PQuerySendHealthCheck; -use PResponseSendHealthCheck; -use PValues; class APISendHealthCheck extends APIBasic { public function execute($QUERY = array()) { diff --git a/src/inc/api/APISendKeyspace.php b/src/inc/api/APISendKeyspace.php index 08382f3c5..9f71f1f2d 100644 --- a/src/inc/api/APISendKeyspace.php +++ b/src/inc/api/APISendKeyspace.php @@ -2,18 +2,18 @@ namespace Hashtopolis\inc\api; -use DLogEntry; -use DLogEntryIssuer; -use DPrince; +use Hashtopolis\inc\agent\PActions; +use Hashtopolis\inc\agent\PQuerySendKeyspace; +use Hashtopolis\inc\agent\PResponseSendKeyspace; +use Hashtopolis\inc\agent\PValues; +use Hashtopolis\inc\defines\DLogEntry; +use Hashtopolis\inc\defines\DLogEntryIssuer; +use Hashtopolis\inc\defines\DPrince; use Hashtopolis\inc\defines\DServerLog; use Hashtopolis\dba\models\Assignment; use Hashtopolis\dba\QueryFilter; use Hashtopolis\dba\Factory; use Hashtopolis\dba\models\Task; -use PActions; -use PQuerySendKeyspace; -use PResponseSendKeyspace; -use PValues; use Hashtopolis\inc\Util; class APISendKeyspace extends APIBasic { diff --git a/src/inc/api/APISendProgress.php b/src/inc/api/APISendProgress.php index 0cafb00f9..ee653b8b9 100644 --- a/src/inc/api/APISendProgress.php +++ b/src/inc/api/APISendProgress.php @@ -2,17 +2,20 @@ namespace Hashtopolis\inc\api; -use DAgentStatsType; +use Hashtopolis\inc\agent\PActions; +use Hashtopolis\inc\agent\PQuerySendProgress; +use Hashtopolis\inc\agent\PResponseSendProgress; +use Hashtopolis\inc\agent\PValues; use Hashtopolis\inc\DataSet; -use DConfig; +use Hashtopolis\inc\defines\DAgentStatsType; +use Hashtopolis\inc\defines\DConfig; use Hashtopolis\inc\defines\DHashcatStatus; -use DHashlistFormat; -use DLogEntry; -use DLogEntryIssuer; -use DNotificationType; -use DPayloadKeys; +use Hashtopolis\inc\defines\DHashlistFormat; +use Hashtopolis\inc\defines\DLogEntry; +use Hashtopolis\inc\defines\DLogEntryIssuer; +use Hashtopolis\inc\defines\DNotificationType; +use Hashtopolis\inc\defines\DPayloadKeys; use Hashtopolis\inc\defines\DServerLog; -use DTaskTypes; use Hashtopolis\dba\models\Agent; use Hashtopolis\dba\models\AgentZap; use Hashtopolis\dba\models\Assignment; @@ -34,11 +37,8 @@ use Hashtopolis\dba\models\TaskWrapper; use Hashtopolis\dba\models\Speed; use Hashtopolis\dba\UpdateSet; +use Hashtopolis\inc\defines\DTaskTypes; use Hashtopolis\inc\handlers\NotificationHandler; -use PActions; -use PQuerySendProgress; -use PResponseSendProgress; -use PValues; use Hashtopolis\inc\SConfig; use Hashtopolis\inc\utils\TaskUtils; use Hashtopolis\inc\Util; diff --git a/src/inc/api/APITestConnection.php b/src/inc/api/APITestConnection.php index 8330e0c73..1dcda9c44 100644 --- a/src/inc/api/APITestConnection.php +++ b/src/inc/api/APITestConnection.php @@ -2,9 +2,10 @@ namespace Hashtopolis\inc\api; -use PActions; -use PResponse; -use PValues; + +use Hashtopolis\inc\agent\PActions; +use Hashtopolis\inc\agent\PResponse; +use Hashtopolis\inc\agent\PValues; class APITestConnection extends APIBasic { public function execute($QUERY = array()) { diff --git a/src/inc/api/APIUpdateClientInformation.php b/src/inc/api/APIUpdateClientInformation.php index 0c49ee799..373fe12e8 100644 --- a/src/inc/api/APIUpdateClientInformation.php +++ b/src/inc/api/APIUpdateClientInformation.php @@ -2,13 +2,13 @@ namespace Hashtopolis\inc\api; +use Hashtopolis\inc\agent\PActions; +use Hashtopolis\inc\agent\PQueryUpdateInformation; +use Hashtopolis\inc\agent\PResponse; +use Hashtopolis\inc\agent\PValues; use Hashtopolis\inc\defines\DServerLog; use Hashtopolis\dba\models\Agent; use Hashtopolis\dba\Factory; -use PActions; -use PQueryUpdateInformation; -use PResponse; -use PValues; class APIUpdateClientInformation extends APIBasic { public function execute($QUERY = array()) { @@ -26,7 +26,7 @@ public function execute($QUERY = array()) { $cpuOnly = 1; foreach ($devices as $device) { $device = strtolower($device); - if ((strpos($device, "amd") !== false) || (strpos($device, "ati ") !== false) || (strpos($device, "radeon") !== false) || strpos($device, "nvidia") !== false || strpos($device, "gtx") !== false || strpos($device, "ti") !== false || strpos($device, "microsoft") != false) { + if (str_contains($device, "amd") || str_contains($device, "ati ") || str_contains($device, "radeon") || str_contains($device, "nvidia") || str_contains($device, "gtx") || str_contains($device, "ti") || strpos($device, "microsoft")) { $cpuOnly = 0; } } diff --git a/src/inc/apiv2/auth/HashtopolisAuthenticator.php b/src/inc/apiv2/auth/HashtopolisAuthenticator.php index 235fefbfc..6db3726eb 100644 --- a/src/inc/apiv2/auth/HashtopolisAuthenticator.php +++ b/src/inc/apiv2/auth/HashtopolisAuthenticator.php @@ -4,8 +4,9 @@ /* Authentication middleware for token retrival */ namespace Hashtopolis\inc\apiv2\auth; -use DLogEntry; -use DLogEntryIssuer; + +use Hashtopolis\inc\defines\DLogEntry; +use Hashtopolis\inc\defines\DLogEntryIssuer; use Hashtopolis\inc\Encryption; use Hashtopolis\dba\Factory; use Hashtopolis\dba\models\User; diff --git a/src/inc/apiv2/auth/token.routes.php b/src/inc/apiv2/auth/token.routes.php index 992cc5a91..11078b066 100644 --- a/src/inc/apiv2/auth/token.routes.php +++ b/src/inc/apiv2/auth/token.routes.php @@ -2,7 +2,7 @@ use Firebase\JWT\JWT; -use Hashtopolis\inc\apiv2\common\error\HttpError; +use Hashtopolis\inc\apiv2\error\HttpError; use Hashtopolis\inc\StartupConfig; use Psr\Http\Message\ResponseInterface as Response; use Psr\Http\Message\ServerRequestInterface as Request; diff --git a/src/inc/apiv2/common/AbstractBaseAPI.php b/src/inc/apiv2/common/AbstractBaseAPI.php index 5a2717778..a74fc5ad2 100644 --- a/src/inc/apiv2/common/AbstractBaseAPI.php +++ b/src/inc/apiv2/common/AbstractBaseAPI.php @@ -2,11 +2,14 @@ namespace Hashtopolis\inc\apiv2\common; +use Hashtopolis\inc\apiv2\error\HttpError; +use Hashtopolis\inc\apiv2\error\HttpForbidden; +use Hashtopolis\inc\apiv2\error\InternalError; +use Hashtopolis\inc\apiv2\error\ResourceNotFoundError; use Hashtopolis\inc\utils\AccessControl; use Hashtopolis\inc\utils\AccessUtils; use Hashtopolis\inc\defines\DAccessControl; use Hashtopolis\inc\utils\HashlistUtils; -use Hashtopolis; use Hashtopolis\dba\JoinFilter; use Hashtopolis\inc\HTException; use JsonException; diff --git a/src/inc/apiv2/common/AbstractHelperAPI.php b/src/inc/apiv2/common/AbstractHelperAPI.php index fe570e70c..b42a7823c 100644 --- a/src/inc/apiv2/common/AbstractHelperAPI.php +++ b/src/inc/apiv2/common/AbstractHelperAPI.php @@ -2,6 +2,8 @@ namespace Hashtopolis\inc\apiv2\common; +use Hashtopolis\inc\apiv2\error\HttpError; +use Hashtopolis\inc\apiv2\error\HttpForbidden; use Hashtopolis\inc\HTException; use InvalidArgumentException; use JsonException; diff --git a/src/inc/apiv2/common/AbstractModelAPI.php b/src/inc/apiv2/common/AbstractModelAPI.php index daf259006..c629945bd 100644 --- a/src/inc/apiv2/common/AbstractModelAPI.php +++ b/src/inc/apiv2/common/AbstractModelAPI.php @@ -3,6 +3,10 @@ namespace Hashtopolis\inc\apiv2\common; use Hashtopolis\dba\MassUpdateSet; +use Hashtopolis\inc\apiv2\error\HttpError; +use Hashtopolis\inc\apiv2\error\HttpForbidden; +use Hashtopolis\inc\apiv2\error\InternalError; +use Hashtopolis\inc\apiv2\error\ResourceNotFoundError; use Hashtopolis\inc\HTException; use JsonException; use PDOException; @@ -514,10 +518,10 @@ protected static function build_cursor($primaryFilter, $primaryId, $hasSecondary * * @param string $encoded_cursor in base64 format * - * @return string the decoded cursor in a json string format + * @return array the decoded cursor in a json string format * @throws HttpError */ - protected static function decode_cursor(string $encoded_cursor): string { + protected static function decode_cursor(string $encoded_cursor): array { $json = base64_decode($encoded_cursor); if ($json == false) { throw new HttpError("Invallid pagination cursor, cursor has to be base64 encoded"); diff --git a/src/inc/apiv2/common/OpenAPISchemaUtils.php b/src/inc/apiv2/common/OpenAPISchemaUtils.php index 8acb876d3..ae6ac950e 100644 --- a/src/inc/apiv2/common/OpenAPISchemaUtils.php +++ b/src/inc/apiv2/common/OpenAPISchemaUtils.php @@ -189,7 +189,7 @@ static function makeExpandables($class, $container): array { ], "attributes" => [ "type" => "object", - "properties" => makeProperties($expandApiClass->getAliasedFeatures()) + "properties" => self::makeProperties($expandApiClass->getAliasedFeatures()) ] ] ]; @@ -222,7 +222,7 @@ static function makeProperties($features, $skipPK = false): array { if ($skipPK && $feature['pk']) { continue; } - $ret = typeLookup($feature); + $ret = self::typeLookup($feature); $propertyVal[$feature['alias']]["type"] = $ret["type"]; if ($ret["type_format"] !== null) { $propertyVal[$feature['alias']]["format"] = $ret["type_format"]; diff --git a/src/inc/apiv2/common/openAPISchema.routes.php b/src/inc/apiv2/common/openAPISchema.routes.php index 871fab62b..d0be97d92 100644 --- a/src/inc/apiv2/common/openAPISchema.routes.php +++ b/src/inc/apiv2/common/openAPISchema.routes.php @@ -1,6 +1,6 @@ options($baseUri, function (Request $request, Response $response): Response { return $response; }); - $app->get($baseUri, "CurrentUserHelperAPI:handleGet"); - $app->patch($baseUri, "CurrentUserHelperAPI:actionPatch"); + $app->get($baseUri, "Hashtopolis\\inc\\apiv2\\helper\\CurrentUserHelperAPI:handleGet"); + $app->patch($baseUri, "Hashtopolis\\inc\\apiv2\\helper\\CurrentUserHelperAPI:actionPatch"); } /** diff --git a/src/inc/apiv2/helper/GetAccessGroupsHelperAPI.php b/src/inc/apiv2/helper/GetAccessGroupsHelperAPI.php index 33f670bb1..1a265adba 100644 --- a/src/inc/apiv2/helper/GetAccessGroupsHelperAPI.php +++ b/src/inc/apiv2/helper/GetAccessGroupsHelperAPI.php @@ -4,7 +4,7 @@ use Hashtopolis\inc\utils\AccessUtils; use Hashtopolis\inc\apiv2\common\AbstractHelperAPI; -use Hashtopolis\inc\apiv2\common\error\HttpError; +use Hashtopolis\inc\apiv2\error\HttpError; use Hashtopolis\inc\HTException; use JsonException; use Psr\Container\ContainerExceptionInterface; @@ -70,7 +70,7 @@ static public function register($app): void { $app->options($baseUri, function (Request $request, Response $response): Response { return $response; }); - $app->get($baseUri, "GetAccessGroupsHelperAPI:handleGet"); + $app->get($baseUri, "Hashtopolis\\inc\\apiv2\\helper\\GetAccessGroupsHelperAPI:handleGet"); } /** diff --git a/src/inc/apiv2/helper/GetAgentBinaryHelperAPI.php b/src/inc/apiv2/helper/GetAgentBinaryHelperAPI.php index db305f77a..6874b40c1 100644 --- a/src/inc/apiv2/helper/GetAgentBinaryHelperAPI.php +++ b/src/inc/apiv2/helper/GetAgentBinaryHelperAPI.php @@ -101,6 +101,6 @@ static public function register($app): void { $app->options($baseUri, function (Request $request, Response $response): Response { return $response; }); - $app->get($baseUri, "getAgentBinaryHelperAPI:handleGet"); + $app->get($baseUri, "Hashtopolis\\inc\\apiv2\\helper\\GetAgentBinaryHelperAPI:handleGet"); } } \ No newline at end of file diff --git a/src/inc/apiv2/helper/GetCracksOfTaskHelper.php b/src/inc/apiv2/helper/GetCracksOfTaskHelper.php index 4bb8f94bb..fe97ddf5e 100644 --- a/src/inc/apiv2/helper/GetCracksOfTaskHelper.php +++ b/src/inc/apiv2/helper/GetCracksOfTaskHelper.php @@ -2,11 +2,11 @@ namespace Hashtopolis\inc\apiv2\helper; -use DHashlistFormat; use Hashtopolis\dba\models\Chunk; use Hashtopolis\dba\ContainFilter; use Hashtopolis\inc\apiv2\common\AbstractHelperAPI; -use Hashtopolis\inc\apiv2\common\error\HttpError; +use Hashtopolis\inc\apiv2\error\HttpError; +use Hashtopolis\inc\defines\DHashlistFormat; use Hashtopolis\inc\HTException; use JsonException; use Psr\Container\ContainerExceptionInterface; @@ -119,6 +119,6 @@ static public function register($app): void { $app->options($baseUri, function (Request $request, Response $response): Response { return $response; }); - $app->get($baseUri, "getCracksOfTaskHelper:handleGet"); + $app->get($baseUri, "Hashtopolis\\inc\\apiv2\\helper\\GetCracksOfTaskHelper:handleGet"); } } diff --git a/src/inc/apiv2/helper/GetFileHelperAPI.php b/src/inc/apiv2/helper/GetFileHelperAPI.php index 4880fa4fc..88adeb95e 100644 --- a/src/inc/apiv2/helper/GetFileHelperAPI.php +++ b/src/inc/apiv2/helper/GetFileHelperAPI.php @@ -2,9 +2,9 @@ namespace Hashtopolis\inc\apiv2\helper; -use DDirectories; use Hashtopolis\dba\models\File; use Hashtopolis\inc\apiv2\common\AbstractHelperAPI; +use Hashtopolis\inc\defines\DDirectories; use Hashtopolis\inc\HTException; use Psr\Http\Message\ResponseInterface as Response; use Psr\Http\Message\ServerRequestInterface as Request; @@ -108,6 +108,6 @@ static public function register($app): void { $app->options($baseUri, function (Request $request, Response $response): Response { return $response; }); - $app->get($baseUri, "getFileHelperAPI:handleGet"); + $app->get($baseUri, "Hashtopolis\\inc\\apiv2\\helper\\GetFileHelperAPI:handleGet"); } } diff --git a/src/inc/apiv2/helper/GetTaskProgressImageHelperAPI.php b/src/inc/apiv2/helper/GetTaskProgressImageHelperAPI.php index 674f7bf3a..c5bf08665 100644 --- a/src/inc/apiv2/helper/GetTaskProgressImageHelperAPI.php +++ b/src/inc/apiv2/helper/GetTaskProgressImageHelperAPI.php @@ -2,11 +2,11 @@ namespace Hashtopolis\inc\apiv2\helper; -use DTaskTypes; use Hashtopolis\dba\models\Chunk; use Hashtopolis\inc\apiv2\common\AbstractHelperAPI; -use Hashtopolis\inc\apiv2\common\error\HttpError; -use Hashtopolis\inc\apiv2\common\error\HttpForbidden; +use Hashtopolis\inc\apiv2\error\HttpError; +use Hashtopolis\inc\apiv2\error\HttpForbidden; +use Hashtopolis\inc\defines\DTaskTypes; use Hashtopolis\inc\HTException; use Psr\Http\Message\ResponseInterface as Response; use Psr\Http\Message\ServerRequestInterface as Request; @@ -82,6 +82,7 @@ public function getParamsSwagger(): array { * @return Response * @throws HTException * @throws HttpError + * @throws HttpForbidden */ public function handleGet(Request $request, Response $response): Response { $this->preCommon($request); @@ -225,6 +226,6 @@ static public function register($app): void { $app->options($baseUri, function (Request $request, Response $response): Response { return $response; }); - $app->get($baseUri, "GetTaskProgressImageHelperAPI:handleGet"); + $app->get($baseUri, "Hashtopolis\\inc\\apiv2\\helper\\GetTaskProgressImageHelperAPI:handleGet"); } } diff --git a/src/inc/apiv2/helper/GetUserPermissionHelperAPI.php b/src/inc/apiv2/helper/GetUserPermissionHelperAPI.php index b14d18a34..7fc1b380f 100644 --- a/src/inc/apiv2/helper/GetUserPermissionHelperAPI.php +++ b/src/inc/apiv2/helper/GetUserPermissionHelperAPI.php @@ -4,7 +4,7 @@ use Hashtopolis\dba\Factory; use Hashtopolis\inc\apiv2\common\AbstractHelperAPI; -use Hashtopolis\inc\apiv2\common\error\HttpError; +use Hashtopolis\inc\apiv2\error\HttpError; use Hashtopolis\inc\HTException; use JsonException; use Psr\Container\ContainerExceptionInterface; @@ -64,7 +64,7 @@ static public function register($app): void { $app->options($baseUri, function (Request $request, Response $response): Response { return $response; }); - $app->get($baseUri, "GetUserPermissionHelperAPI:handleGet"); + $app->get($baseUri, "Hashtopolis\\inc\\apiv2\\helper\\GetUserPermissionHelperAPI:handleGet"); } /** diff --git a/src/inc/apiv2/helper/ImportFileHelperAPI.php b/src/inc/apiv2/helper/ImportFileHelperAPI.php index 280cdf4d0..680c955a1 100644 --- a/src/inc/apiv2/helper/ImportFileHelperAPI.php +++ b/src/inc/apiv2/helper/ImportFileHelperAPI.php @@ -5,9 +5,9 @@ use DateTime; use DateTimeImmutable; use DateTimeInterface; -use DDirectories; use Hashtopolis\inc\apiv2\common\AbstractHelperAPI; -use Hashtopolis\inc\apiv2\common\error\HttpError; +use Hashtopolis\inc\apiv2\error\HttpError; +use Hashtopolis\inc\defines\DDirectories; use Psr\Http\Message\ResponseInterface as Response; use Psr\Http\Message\ServerRequestInterface as Request; @@ -228,7 +228,7 @@ function processPost(Request $request, Response $response, array $args): Respons /** * Given the offset in the 'Upload Offset' header, the user can use this PATCH endpoint in order to resume the upload. - * @throws \Hashtopolis\inc\apiv2\common\HttpError + * @throws HttpError */ function processPatch(Request $request, Response $response, array $args): Response { // Check for Content-Type: application/offset+octet-stream or return 415 diff --git a/src/inc/apiv2/helper/SearchHashesHelperAPI.php b/src/inc/apiv2/helper/SearchHashesHelperAPI.php index a648dd694..1c950748c 100644 --- a/src/inc/apiv2/helper/SearchHashesHelperAPI.php +++ b/src/inc/apiv2/helper/SearchHashesHelperAPI.php @@ -11,7 +11,7 @@ use Hashtopolis\dba\LikeFilterInsensitive; use Hashtopolis\dba\QueryFilter; use Hashtopolis\inc\apiv2\common\AbstractHelperAPI; -use Hashtopolis\inc\apiv2\common\error\HttpError; +use Hashtopolis\inc\apiv2\error\HttpError; use Psr\Container\ContainerExceptionInterface; use Psr\Container\NotFoundExceptionInterface; use Slim\App; diff --git a/src/inc/apiv2/helper/TaskExtraDetailsHelper.php b/src/inc/apiv2/helper/TaskExtraDetailsHelper.php index e766855fe..c0ddc8aa4 100644 --- a/src/inc/apiv2/helper/TaskExtraDetailsHelper.php +++ b/src/inc/apiv2/helper/TaskExtraDetailsHelper.php @@ -2,12 +2,12 @@ namespace Hashtopolis\inc\apiv2\helper; -use DConfig; use Hashtopolis\dba\models\Chunk; use Hashtopolis\dba\Factory; use Hashtopolis\dba\QueryFilter; use Hashtopolis\inc\apiv2\common\AbstractHelperAPI; -use Hashtopolis\inc\apiv2\common\error\HttpError; +use Hashtopolis\inc\apiv2\error\HttpError; +use Hashtopolis\inc\defines\DConfig; use Hashtopolis\inc\HTException; use JsonException; use Middlewares\Utils\HttpErrorException; @@ -107,7 +107,7 @@ static public function register($app): void { $app->options($baseUri, function (Request $request, Response $response): Response { return $response; }); - $app->get($baseUri, "TaskExtraDetailsHelper:handleGet"); + $app->get($baseUri, "Hashtopolis\\inc\\apiv2\\helper\\TaskExtraDetailsHelper:handleGet"); } /** diff --git a/src/inc/apiv2/helper/UnassignAgentHelperAPI.php b/src/inc/apiv2/helper/UnassignAgentHelperAPI.php index 071ed1f9a..a1e3d897c 100644 --- a/src/inc/apiv2/helper/UnassignAgentHelperAPI.php +++ b/src/inc/apiv2/helper/UnassignAgentHelperAPI.php @@ -6,7 +6,7 @@ use Hashtopolis\dba\models\Agent; use Hashtopolis\dba\models\Task; use Hashtopolis\inc\apiv2\common\AbstractHelperAPI; -use Hashtopolis\inc\apiv2\common\error\HttpError; +use Hashtopolis\inc\apiv2\error\HttpError; use Hashtopolis\inc\HTException; class UnassignAgentHelperAPI extends AbstractHelperAPI { diff --git a/src/inc/apiv2/model/AgentAPI.php b/src/inc/apiv2/model/AgentAPI.php index f361d3d68..67888868f 100644 --- a/src/inc/apiv2/model/AgentAPI.php +++ b/src/inc/apiv2/model/AgentAPI.php @@ -20,7 +20,7 @@ use Hashtopolis\dba\models\Task; use Hashtopolis\dba\models\User; use Hashtopolis\inc\apiv2\common\AbstractModelAPI; -use Hashtopolis\inc\apiv2\common\error\HttpError; +use Hashtopolis\inc\apiv2\error\HttpError; use Hashtopolis\inc\HTException; use Hashtopolis\inc\Util; diff --git a/src/inc/apiv2/model/AgentAssignmentAPI.php b/src/inc/apiv2/model/AgentAssignmentAPI.php index f47be5ca8..24f1ab2a5 100644 --- a/src/inc/apiv2/model/AgentAssignmentAPI.php +++ b/src/inc/apiv2/model/AgentAssignmentAPI.php @@ -4,7 +4,7 @@ use Hashtopolis\inc\utils\AccessUtils; use Hashtopolis\inc\utils\AgentUtils; -use Hashtopolis\inc\utils\assignmentUtils; +use Hashtopolis\inc\utils\AssignmentUtils; use Hashtopolis\dba\models\AccessGroupAgent; use Hashtopolis\dba\ContainFilter; use Hashtopolis\dba\Factory; @@ -17,7 +17,7 @@ use Hashtopolis\dba\models\TaskWrapper; use Hashtopolis\dba\models\User; use Hashtopolis\inc\apiv2\common\AbstractModelAPI; -use Hashtopolis\inc\apiv2\common\error\HttpError; +use Hashtopolis\inc\apiv2\error\HttpError; use Hashtopolis\inc\HTException; use Hashtopolis\inc\Util; @@ -91,7 +91,7 @@ protected function createObject(array $data): int { protected function getUpdateHandlers($id, $current_user): array { return [ - Assignment::BENCHMARK => fn($value) => assignmentUtils::setBenchmark($id, $value, $current_user) + Assignment::BENCHMARK => fn($value) => AssignmentUtils::setBenchmark($id, $value, $current_user) ]; } diff --git a/src/inc/apiv2/model/AgentBinaryAPI.php b/src/inc/apiv2/model/AgentBinaryAPI.php index 219e8ab9a..44bfd0def 100644 --- a/src/inc/apiv2/model/AgentBinaryAPI.php +++ b/src/inc/apiv2/model/AgentBinaryAPI.php @@ -6,7 +6,7 @@ use Hashtopolis\dba\models\AgentBinary; use Hashtopolis\inc\apiv2\common\AbstractModelAPI; -use Hashtopolis\inc\apiv2\common\error\HttpError; +use Hashtopolis\inc\apiv2\error\HttpError; use Hashtopolis\inc\HTException; diff --git a/src/inc/apiv2/model/AgentErrorAPI.php b/src/inc/apiv2/model/AgentErrorAPI.php index c3babca0e..a9f941ec3 100644 --- a/src/inc/apiv2/model/AgentErrorAPI.php +++ b/src/inc/apiv2/model/AgentErrorAPI.php @@ -13,7 +13,7 @@ use Hashtopolis\dba\models\TaskWrapper; use Hashtopolis\dba\models\User; use Hashtopolis\inc\apiv2\common\AbstractModelAPI; -use Hashtopolis\inc\apiv2\common\error\HttpError; +use Hashtopolis\inc\apiv2\error\HttpError; use Hashtopolis\inc\Util; diff --git a/src/inc/apiv2/model/AgentStatAPI.php b/src/inc/apiv2/model/AgentStatAPI.php index 221385efa..44766b42b 100644 --- a/src/inc/apiv2/model/AgentStatAPI.php +++ b/src/inc/apiv2/model/AgentStatAPI.php @@ -11,7 +11,7 @@ use Hashtopolis\dba\JoinFilter; use Hashtopolis\dba\models\User; use Hashtopolis\inc\apiv2\common\AbstractModelAPI; -use Hashtopolis\inc\apiv2\common\error\HttpError; +use Hashtopolis\inc\apiv2\error\HttpError; use Hashtopolis\inc\Util; diff --git a/src/inc/apiv2/model/ChunkAPI.php b/src/inc/apiv2/model/ChunkAPI.php index afb271c61..3d1c5b1f5 100644 --- a/src/inc/apiv2/model/ChunkAPI.php +++ b/src/inc/apiv2/model/ChunkAPI.php @@ -16,7 +16,7 @@ use Hashtopolis\dba\models\TaskWrapper; use Hashtopolis\dba\models\User; use Hashtopolis\inc\apiv2\common\AbstractModelAPI; -use Hashtopolis\inc\apiv2\common\error\HttpError; +use Hashtopolis\inc\apiv2\error\HttpError; use Hashtopolis\inc\Util; diff --git a/src/inc/apiv2/model/ConfigAPI.php b/src/inc/apiv2/model/ConfigAPI.php index dda8f6285..8534033e5 100644 --- a/src/inc/apiv2/model/ConfigAPI.php +++ b/src/inc/apiv2/model/ConfigAPI.php @@ -6,7 +6,7 @@ use Hashtopolis\dba\models\Config; use Hashtopolis\dba\models\ConfigSection; use Hashtopolis\inc\apiv2\common\AbstractModelAPI; -use Hashtopolis\inc\apiv2\common\error\HttpError; +use Hashtopolis\inc\apiv2\error\HttpError; use Hashtopolis\inc\HTException; diff --git a/src/inc/apiv2/model/ConfigSectionAPI.php b/src/inc/apiv2/model/ConfigSectionAPI.php index 1f42947a2..bedb00d92 100644 --- a/src/inc/apiv2/model/ConfigSectionAPI.php +++ b/src/inc/apiv2/model/ConfigSectionAPI.php @@ -4,7 +4,7 @@ use Hashtopolis\dba\models\ConfigSection; use Hashtopolis\inc\apiv2\common\AbstractModelAPI; -use Hashtopolis\inc\apiv2\common\error\HttpError; +use Hashtopolis\inc\apiv2\error\HttpError; class ConfigSectionAPI extends AbstractModelAPI { diff --git a/src/inc/apiv2/model/CrackerBinaryAPI.php b/src/inc/apiv2/model/CrackerBinaryAPI.php index 60b0ffffa..6cf28315a 100644 --- a/src/inc/apiv2/model/CrackerBinaryAPI.php +++ b/src/inc/apiv2/model/CrackerBinaryAPI.php @@ -8,7 +8,7 @@ use Hashtopolis\dba\models\CrackerBinaryType; use Hashtopolis\dba\models\Task; use Hashtopolis\inc\apiv2\common\AbstractModelAPI; -use Hashtopolis\inc\apiv2\common\error\HttpError; +use Hashtopolis\inc\apiv2\error\HttpError; use Hashtopolis\inc\HTException; diff --git a/src/inc/apiv2/model/CrackerBinaryTypeAPI.php b/src/inc/apiv2/model/CrackerBinaryTypeAPI.php index 7d9a7abb6..2ce086c99 100644 --- a/src/inc/apiv2/model/CrackerBinaryTypeAPI.php +++ b/src/inc/apiv2/model/CrackerBinaryTypeAPI.php @@ -8,8 +8,8 @@ use Hashtopolis\dba\models\CrackerBinaryType; use Hashtopolis\dba\models\Task; use Hashtopolis\inc\apiv2\common\AbstractModelAPI; -use Hashtopolis\inc\apiv2\common\error\HttpConflict; -use Hashtopolis\inc\apiv2\common\error\HttpError; +use Hashtopolis\inc\apiv2\error\HttpConflict; +use Hashtopolis\inc\apiv2\error\HttpError; use Hashtopolis\inc\HTException; diff --git a/src/inc/apiv2/model/FileAPI.php b/src/inc/apiv2/model/FileAPI.php index ef030bc0b..19233fe57 100644 --- a/src/inc/apiv2/model/FileAPI.php +++ b/src/inc/apiv2/model/FileAPI.php @@ -2,8 +2,8 @@ namespace Hashtopolis\inc\apiv2\model; +use Hashtopolis\inc\defines\DDirectories; use Hashtopolis\inc\utils\AccessUtils; -use DDirectories; use Hashtopolis\inc\defines\DFileType; use Exception; use Hashtopolis\inc\utils\FileUtils; @@ -16,7 +16,7 @@ use Hashtopolis\dba\models\File; use Hashtopolis\dba\models\User; use Hashtopolis\inc\apiv2\common\AbstractModelAPI; -use Hashtopolis\inc\apiv2\common\error\HttpError; +use Hashtopolis\inc\apiv2\error\HttpError; use Hashtopolis\inc\HTException; use Hashtopolis\inc\Util; diff --git a/src/inc/apiv2/model/GlobalPermissionGroupAPI.php b/src/inc/apiv2/model/GlobalPermissionGroupAPI.php index 9c67f63b9..f4555fec5 100644 --- a/src/inc/apiv2/model/GlobalPermissionGroupAPI.php +++ b/src/inc/apiv2/model/GlobalPermissionGroupAPI.php @@ -7,10 +7,10 @@ use Hashtopolis\dba\models\User; use Hashtopolis\dba\models\RightGroup; use Hashtopolis\inc\apiv2\common\AbstractModelAPI; -use Hashtopolis\inc\apiv2\common\error\HttpConflict; -use Hashtopolis\inc\apiv2\common\error\HttpError; -use Hashtopolis\inc\apiv2\common\error\HttpForbidden; -use Hashtopolis\inc\apiv2\common\error\ResourceNotFoundError; +use Hashtopolis\inc\apiv2\error\HttpConflict; +use Hashtopolis\inc\apiv2\error\HttpError; +use Hashtopolis\inc\apiv2\error\HttpForbidden; +use Hashtopolis\inc\apiv2\error\ResourceNotFoundError; use Hashtopolis\inc\HTException; diff --git a/src/inc/apiv2/model/HashAPI.php b/src/inc/apiv2/model/HashAPI.php index 39d35078a..f7986a4dd 100644 --- a/src/inc/apiv2/model/HashAPI.php +++ b/src/inc/apiv2/model/HashAPI.php @@ -12,7 +12,7 @@ use Hashtopolis\dba\JoinFilter; use Hashtopolis\dba\models\User; use Hashtopolis\inc\apiv2\common\AbstractModelAPI; -use Hashtopolis\inc\apiv2\common\error\HttpError; +use Hashtopolis\inc\apiv2\error\HttpError; use Hashtopolis\inc\Util; diff --git a/src/inc/apiv2/model/HashTypeAPI.php b/src/inc/apiv2/model/HashTypeAPI.php index 4af9f7ea5..b377d3c69 100644 --- a/src/inc/apiv2/model/HashTypeAPI.php +++ b/src/inc/apiv2/model/HashTypeAPI.php @@ -4,7 +4,7 @@ use Hashtopolis\dba\models\HashType; use Hashtopolis\inc\apiv2\common\AbstractModelAPI; -use Hashtopolis\inc\apiv2\common\error\HttpError; +use Hashtopolis\inc\apiv2\error\HttpError; use Hashtopolis\inc\utils\HashtypeUtils; use Hashtopolis\inc\HTException; diff --git a/src/inc/apiv2/model/HashlistAPI.php b/src/inc/apiv2/model/HashlistAPI.php index 9d11ff130..caf356dea 100644 --- a/src/inc/apiv2/model/HashlistAPI.php +++ b/src/inc/apiv2/model/HashlistAPI.php @@ -2,6 +2,7 @@ namespace Hashtopolis\inc\apiv2\model; +use Hashtopolis\inc\defines\UQueryHashlist; use Hashtopolis\inc\utils\AccessUtils; use Hashtopolis\inc\utils\HashlistUtils; use Hashtopolis\dba\models\AccessGroup; @@ -19,7 +20,6 @@ use Hashtopolis\inc\apiv2\common\AbstractModelAPI; use Hashtopolis\inc\HTException; use Middlewares\Utils\HttpErrorException; -use UQueryHashlist; use Hashtopolis\inc\Util; diff --git a/src/inc/apiv2/model/HealthCheckAPI.php b/src/inc/apiv2/model/HealthCheckAPI.php index ed6de5abb..242252d9a 100644 --- a/src/inc/apiv2/model/HealthCheckAPI.php +++ b/src/inc/apiv2/model/HealthCheckAPI.php @@ -7,7 +7,7 @@ use Hashtopolis\dba\models\HealthCheck; use Hashtopolis\dba\models\HealthCheckAgent; use Hashtopolis\inc\apiv2\common\AbstractModelAPI; -use Hashtopolis\inc\apiv2\common\error\HttpError; +use Hashtopolis\inc\apiv2\error\HttpError; use Hashtopolis\inc\utils\HealthUtils; use Hashtopolis\inc\HTException; diff --git a/src/inc/apiv2/model/HealthCheckAgentAPI.php b/src/inc/apiv2/model/HealthCheckAgentAPI.php index 3ebb71414..0493c3a32 100644 --- a/src/inc/apiv2/model/HealthCheckAgentAPI.php +++ b/src/inc/apiv2/model/HealthCheckAgentAPI.php @@ -13,7 +13,7 @@ use Hashtopolis\dba\JoinFilter; use Hashtopolis\dba\models\User; use Hashtopolis\inc\apiv2\common\AbstractModelAPI; -use Hashtopolis\inc\apiv2\common\error\HttpError; +use Hashtopolis\inc\apiv2\error\HttpError; use Hashtopolis\inc\Util; diff --git a/src/inc/apiv2/model/LogEntryAPI.php b/src/inc/apiv2/model/LogEntryAPI.php index a24202291..b7a840c9e 100644 --- a/src/inc/apiv2/model/LogEntryAPI.php +++ b/src/inc/apiv2/model/LogEntryAPI.php @@ -4,7 +4,7 @@ use Hashtopolis\dba\models\LogEntry; use Hashtopolis\inc\apiv2\common\AbstractModelAPI; -use Hashtopolis\inc\apiv2\common\error\HttpError; +use Hashtopolis\inc\apiv2\error\HttpError; class LogEntryAPI extends AbstractModelAPI { diff --git a/src/inc/apiv2/model/NotificationSettingAPI.php b/src/inc/apiv2/model/NotificationSettingAPI.php index ee8348f50..ca4a26541 100644 --- a/src/inc/apiv2/model/NotificationSettingAPI.php +++ b/src/inc/apiv2/model/NotificationSettingAPI.php @@ -2,13 +2,12 @@ namespace Hashtopolis\inc\apiv2\model; -use DNotificationObjectType; -use DNotificationType; - use Hashtopolis\dba\models\NotificationSetting; use Hashtopolis\dba\models\User; use Hashtopolis\inc\apiv2\common\AbstractModelAPI; -use Hashtopolis\inc\apiv2\common\error\HttpError; +use Hashtopolis\inc\apiv2\error\HttpError; +use Hashtopolis\inc\defines\DNotificationObjectType; +use Hashtopolis\inc\defines\DNotificationType; use Hashtopolis\inc\HTException; use Hashtopolis\inc\utils\NotificationUtils; diff --git a/src/inc/apiv2/model/PreTaskAPI.php b/src/inc/apiv2/model/PreTaskAPI.php index bedd69e47..9ae5fa327 100644 --- a/src/inc/apiv2/model/PreTaskAPI.php +++ b/src/inc/apiv2/model/PreTaskAPI.php @@ -10,7 +10,7 @@ use Hashtopolis\dba\JoinFilter; use Hashtopolis\dba\models\Pretask; use Hashtopolis\inc\apiv2\common\AbstractModelAPI; -use Hashtopolis\inc\apiv2\common\error\HttpError; +use Hashtopolis\inc\apiv2\error\HttpError; use Hashtopolis\inc\HTException; use Hashtopolis\inc\utils\PretaskUtils; diff --git a/src/inc/apiv2/model/PreprocessorAPI.php b/src/inc/apiv2/model/PreprocessorAPI.php index 80ea95a59..e5e02ccf5 100644 --- a/src/inc/apiv2/model/PreprocessorAPI.php +++ b/src/inc/apiv2/model/PreprocessorAPI.php @@ -4,8 +4,8 @@ use Hashtopolis\dba\models\Preprocessor; use Hashtopolis\inc\apiv2\common\AbstractModelAPI; -use Hashtopolis\inc\apiv2\common\error\HttpConflict; -use Hashtopolis\inc\apiv2\common\error\HttpError; +use Hashtopolis\inc\apiv2\error\HttpConflict; +use Hashtopolis\inc\apiv2\error\HttpError; use Hashtopolis\inc\utils\PreprocessorUtils; diff --git a/src/inc/apiv2/model/SpeedAPI.php b/src/inc/apiv2/model/SpeedAPI.php index 2da8cdb28..97d435ee9 100644 --- a/src/inc/apiv2/model/SpeedAPI.php +++ b/src/inc/apiv2/model/SpeedAPI.php @@ -16,7 +16,7 @@ use Hashtopolis\dba\models\TaskWrapper; use Hashtopolis\dba\models\User; use Hashtopolis\inc\apiv2\common\AbstractModelAPI; -use Hashtopolis\inc\apiv2\common\error\HttpError; +use Hashtopolis\inc\apiv2\error\HttpError; use Hashtopolis\inc\Util; diff --git a/src/inc/apiv2/model/SupertaskAPI.php b/src/inc/apiv2/model/SupertaskAPI.php index f3f9f9634..26b8d00ac 100644 --- a/src/inc/apiv2/model/SupertaskAPI.php +++ b/src/inc/apiv2/model/SupertaskAPI.php @@ -8,7 +8,7 @@ use Hashtopolis\inc\apiv2\common\AbstractModelAPI; -use Hashtopolis\inc\apiv2\common\error\HttpError; +use Hashtopolis\inc\apiv2\error\HttpError; use Hashtopolis\inc\HTException; use Psr\Http\Message\ServerRequestInterface as Request; use Hashtopolis\inc\utils\SupertaskUtils; diff --git a/src/inc/apiv2/model/TaskAPI.php b/src/inc/apiv2/model/TaskAPI.php index 815da2c59..36869b718 100644 --- a/src/inc/apiv2/model/TaskAPI.php +++ b/src/inc/apiv2/model/TaskAPI.php @@ -2,9 +2,9 @@ namespace Hashtopolis\inc\apiv2\model; +use Hashtopolis\inc\defines\DConfig; +use Hashtopolis\inc\defines\DPrince; use Hashtopolis\inc\utils\AccessUtils; -use DConfig; -use DPrince; use Hashtopolis\dba\ContainFilter; use Hashtopolis\dba\Factory; @@ -24,7 +24,7 @@ use Hashtopolis\dba\models\TaskWrapper; use Hashtopolis\dba\models\User; use Hashtopolis\inc\apiv2\common\AbstractModelAPI; -use Hashtopolis\inc\apiv2\common\error\HttpError; +use Hashtopolis\inc\apiv2\error\HttpError; use Hashtopolis\inc\SConfig; use Hashtopolis\inc\utils\TaskUtils; use Hashtopolis\inc\Util; diff --git a/src/inc/apiv2/model/TaskWrapperAPI.php b/src/inc/apiv2/model/TaskWrapperAPI.php index 5988ce474..9112d57be 100644 --- a/src/inc/apiv2/model/TaskWrapperAPI.php +++ b/src/inc/apiv2/model/TaskWrapperAPI.php @@ -2,8 +2,8 @@ namespace Hashtopolis\inc\apiv2\model; +use Hashtopolis\inc\defines\DTaskTypes; use Hashtopolis\inc\utils\AccessUtils; -use DTaskTypes; use Hashtopolis\dba\models\AccessGroup; use Hashtopolis\dba\CoalesceOrderFilter; use Hashtopolis\dba\ContainFilter; @@ -17,10 +17,11 @@ use Hashtopolis\dba\models\TaskWrapper; use Hashtopolis\dba\models\User; use Hashtopolis\inc\apiv2\common\AbstractModelAPI; -use Hashtopolis\inc\apiv2\common\error\HttpError; +use Hashtopolis\inc\apiv2\error\HttpError; use Hashtopolis\inc\HTException; use Hashtopolis\inc\utils\TaskUtils; use Hashtopolis\inc\Util; +use Hashtopolis\inc\utils\TaskWrapperUtils; class TaskWrapperAPI extends AbstractModelAPI { diff --git a/src/inc/apiv2/model/UserAPI.php b/src/inc/apiv2/model/UserAPI.php index 103a21740..bb9c8d48e 100644 --- a/src/inc/apiv2/model/UserAPI.php +++ b/src/inc/apiv2/model/UserAPI.php @@ -11,8 +11,8 @@ use Hashtopolis\dba\models\RightGroup; use Hashtopolis\dba\models\User; use Hashtopolis\inc\apiv2\common\AbstractModelAPI; -use Hashtopolis\inc\apiv2\common\error\HttpConflict; -use Hashtopolis\inc\apiv2\common\error\HttpError; +use Hashtopolis\inc\apiv2\error\HttpConflict; +use Hashtopolis\inc\apiv2\error\HttpError; use Hashtopolis\inc\HTException; use Hashtopolis\inc\utils\UserUtils; diff --git a/src/inc/apiv2/model/VoucherAPI.php b/src/inc/apiv2/model/VoucherAPI.php index 6b52e126a..c0ce87920 100644 --- a/src/inc/apiv2/model/VoucherAPI.php +++ b/src/inc/apiv2/model/VoucherAPI.php @@ -6,7 +6,7 @@ use Hashtopolis\dba\models\RegVoucher; use Hashtopolis\inc\apiv2\common\AbstractModelAPI; -use Hashtopolis\inc\apiv2\common\error\HttpConflict; +use Hashtopolis\inc\apiv2\error\HttpConflict; use Hashtopolis\inc\HTException; diff --git a/src/inc/apiv2/util/CorsHackMiddleware.php b/src/inc/apiv2/util/CorsHackMiddleware.php index f2f1f8684..b5b079785 100644 --- a/src/inc/apiv2/util/CorsHackMiddleware.php +++ b/src/inc/apiv2/util/CorsHackMiddleware.php @@ -1,6 +1,6 @@ checkPermission(DPretaskAction::SET_CPU_TASK_PERM); PretaskUtils::setCpuOnlyTask($_POST['pretaskId'], $_POST['isCpu']); diff --git a/src/inc/notifications/HashtopolisNotification.php b/src/inc/notifications/HashtopolisNotification.php index b9cb7f724..d0a53c04f 100644 --- a/src/inc/notifications/HashtopolisNotification.php +++ b/src/inc/notifications/HashtopolisNotification.php @@ -21,14 +21,34 @@ abstract class HashtopolisNotification { private static $instances = []; - public static function add($name, $instance) { - self::$instances[$name] = $instance; + private static function loadInstances(): void { + // TODO: find a better way to load these automatically, failed to do it with the classloader and scanning + $inst = new HashtopolisNotificationChatBot(); + self::$instances[$inst::$name] = $inst; + + $inst = new HashtopolisNotificationDiscordWebhook(); + self::$instances[$inst::$name] = $inst; + + $inst = new HashtopolisNotificationEmail(); + self::$instances[$inst::$name] = $inst; + + $inst = new HashtopolisNotificationExample(); + self::$instances[$inst::$name] = $inst; + + $inst = new HashtopolisNotificationSlack(); + self::$instances[$inst::$name] = $inst; + + $inst = new HashtopolisNotificationTelegram(); + self::$instances[$inst::$name] = $inst; } /** * @return HashtopolisNotification[] */ - public static function getInstances() { + public static function getInstances(): array { + if (sizeof(self::$instances) == 0){ + self::loadInstances(); + } return self::$instances; } diff --git a/src/inc/notifications/HashtopolisNotificationChatBot.php b/src/inc/notifications/HashtopolisNotificationChatBot.php index ead377ad6..c5bdffaf5 100644 --- a/src/inc/notifications/HashtopolisNotificationChatBot.php +++ b/src/inc/notifications/HashtopolisNotificationChatBot.php @@ -57,5 +57,3 @@ function sendMessage($message, $subject = "") { } } -HashtopolisNotification::add('ChatBot', new HashtopolisNotificationChatBot()); - diff --git a/src/inc/notifications/HashtopolisNotificationDiscordWebhook.php b/src/inc/notifications/HashtopolisNotificationDiscordWebhook.php index 10a578cf1..93f2c7c82 100644 --- a/src/inc/notifications/HashtopolisNotificationDiscordWebhook.php +++ b/src/inc/notifications/HashtopolisNotificationDiscordWebhook.php @@ -57,5 +57,3 @@ function sendMessage($message, $subject = "") { } } - -HashtopolisNotification::add('Discord Webhook', new HashtopolisNotificationDiscordWebhook()); diff --git a/src/inc/notifications/HashtopolisNotificationEmail.php b/src/inc/notifications/HashtopolisNotificationEmail.php index 38d005e15..71dc9f451 100644 --- a/src/inc/notifications/HashtopolisNotificationEmail.php +++ b/src/inc/notifications/HashtopolisNotificationEmail.php @@ -23,5 +23,3 @@ function sendMessage($message, $subject) { Util::sendMail($this->receiver, $subject, $message[0], $message[1]); } } - -HashtopolisNotification::add('Email', new HashtopolisNotificationEmail()); diff --git a/src/inc/notifications/HashtopolisNotificationExample.php b/src/inc/notifications/HashtopolisNotificationExample.php index 8a4f665fe..39bafa40b 100644 --- a/src/inc/notifications/HashtopolisNotificationExample.php +++ b/src/inc/notifications/HashtopolisNotificationExample.php @@ -19,5 +19,3 @@ function sendMessage($message, $subject = "") { } } -HashtopolisNotification::add('Example', new HashtopolisNotificationExample()); - diff --git a/src/inc/notifications/HashtopolisNotificationSlack.php b/src/inc/notifications/HashtopolisNotificationSlack.php index f80c0c228..77a831873 100644 --- a/src/inc/notifications/HashtopolisNotificationSlack.php +++ b/src/inc/notifications/HashtopolisNotificationSlack.php @@ -52,5 +52,3 @@ function sendMessage($message, $subject = "") { } } -HashtopolisNotification::add('Slack', new HashtopolisNotificationSlack()); - diff --git a/src/inc/notifications/HashtopolisNotificationTelegram.php b/src/inc/notifications/HashtopolisNotificationTelegram.php index 0f829a5d2..879a6a1f0 100644 --- a/src/inc/notifications/HashtopolisNotificationTelegram.php +++ b/src/inc/notifications/HashtopolisNotificationTelegram.php @@ -56,5 +56,3 @@ function sendMessage($message, $subject = "") { } } -HashtopolisNotification::add('Telegram', new HashtopolisNotificationTelegram()); - diff --git a/src/inc/startup/include.php b/src/inc/startup/include.php index 961baad15..807b492d5 100755 --- a/src/inc/startup/include.php +++ b/src/inc/startup/include.php @@ -21,7 +21,7 @@ require_once($baseDir . "/../../vendor/autoload.php"); // include all .class.php files in inc dir -$dir = scandir($baseDir); +/*$dir = scandir($baseDir); foreach ($dir as $entry) { if (str_contains($entry, ".class.php")) { require_once($baseDir . "/" . $entry); @@ -43,7 +43,7 @@ require_once($baseDir . "/$directory/" . $entry); } } -} +}*/ // legacy, but needed for email sending $LANG = new Lang(); diff --git a/src/inc/templating/Template.php b/src/inc/templating/Template.php index 02e8831c5..4e7a6814f 100644 --- a/src/inc/templating/Template.php +++ b/src/inc/templating/Template.php @@ -336,7 +336,6 @@ private function resolveDependencies() { break; default: return false; - break; } } return true; diff --git a/src/inc/user_api/UserAPIBasic.php b/src/inc/user_api/UserAPIBasic.php index e3fd1cef5..d544bc5a8 100644 --- a/src/inc/user_api/UserAPIBasic.php +++ b/src/inc/user_api/UserAPIBasic.php @@ -11,7 +11,6 @@ use Hashtopolis\inc\defines\UResponse; use Hashtopolis\inc\defines\UResponseErrorMessage; use Hashtopolis\inc\defines\UValues; -use PValues; abstract class UserAPIBasic { /** @var User */ @@ -24,13 +23,13 @@ abstract class UserAPIBasic { */ public abstract function execute($QUERY = array()); - protected function sendResponse($RESPONSE) { + protected function sendResponse($RESPONSE): void { header("Content-Type: application/json"); echo json_encode($RESPONSE); die(); } - protected function checkForError($QUERY, $error, $response = null) { + protected function checkForError($QUERY, $error, $response = null): void { if ($error !== false) { $this->sendErrorResponse($QUERY[UQueryTask::SECTION], $QUERY[UQueryTask::REQUEST], $error); } @@ -44,7 +43,7 @@ protected function checkForError($QUERY, $error, $response = null) { * Used to send a generic success response if no additional data is sent * @param array $QUERY original query */ - protected function sendSuccessResponse($QUERY) { + protected function sendSuccessResponse($QUERY): void { $this->sendResponse(array( UResponse::SECTION => $QUERY[UQuery::SECTION], UResponse::REQUEST => $QUERY[UQuery::REQUEST], @@ -53,12 +52,12 @@ protected function sendSuccessResponse($QUERY) { ); } - protected function updateApi() { + protected function updateApi(): void { $this->apiKey->setAccessCount($this->apiKey->getAccessCount() + 1); Factory::getApiKeyFactory()->update($this->apiKey); } - public function sendErrorResponse($section, $request, $msg) { + public function sendErrorResponse($section, $request, $msg): void { $ANS = array(); $ANS[UResponseErrorMessage::SECTION] = $section; $ANS[UResponseErrorMessage::REQUEST] = $request; diff --git a/src/inc/utils/AccessControlUtils.php b/src/inc/utils/AccessControlUtils.php index 921aa918f..ce1715387 100644 --- a/src/inc/utils/AccessControlUtils.php +++ b/src/inc/utils/AccessControlUtils.php @@ -6,8 +6,8 @@ use Hashtopolis\dba\QueryFilter; use Hashtopolis\dba\models\RightGroup; use Hashtopolis\dba\Factory; -use Hashtopolis\inc\apiv2\common\error\HttpConflict; -use Hashtopolis\inc\apiv2\common\error\HttpError; +use Hashtopolis\inc\apiv2\error\HttpConflict; +use Hashtopolis\inc\apiv2\error\HttpError; use Hashtopolis\inc\defines\DAccessControl; use Hashtopolis\inc\defines\DLimits; use Hashtopolis\inc\HTException; diff --git a/src/inc/utils/AccessGroupUtils.php b/src/inc/utils/AccessGroupUtils.php index 8b3dc9290..5f76ba115 100644 --- a/src/inc/utils/AccessGroupUtils.php +++ b/src/inc/utils/AccessGroupUtils.php @@ -2,8 +2,6 @@ namespace Hashtopolis\inc\utils; -use Hashtopolis\inc\utils\AccessUtils; -use Hashtopolis\inc\utils\AgentUtils; use Hashtopolis\dba\models\AccessGroup; use Hashtopolis\dba\models\Chunk; use Hashtopolis\dba\ContainFilter; @@ -15,13 +13,11 @@ use Hashtopolis\dba\models\Hashlist; use Hashtopolis\dba\Factory; use Hashtopolis\dba\models\File; -use Hashtopolis\inc\apiv2\common\error\HttpConflict; -use Hashtopolis\inc\apiv2\common\error\HttpError; +use Hashtopolis\inc\apiv2\error\HttpConflict; +use Hashtopolis\inc\apiv2\error\HttpError; use Hashtopolis\inc\defines\DHashcatStatus; use Hashtopolis\inc\defines\DLimits; use Hashtopolis\inc\HTException; -use Hashtopolis\inc\utils\TaskUtils; -use Hashtopolis\inc\utils\UserUtils; use Hashtopolis\inc\Util; class AccessGroupUtils { diff --git a/src/inc/utils/AccessUtils.php b/src/inc/utils/AccessUtils.php index 00b08e162..144db3954 100644 --- a/src/inc/utils/AccessUtils.php +++ b/src/inc/utils/AccessUtils.php @@ -15,7 +15,6 @@ use Hashtopolis\dba\Factory; use Hashtopolis\dba\models\File; use Hashtopolis\inc\apiv2\common\AbstractBaseAPI; -use Hashtopolis\inc\utils\TaskUtils; use Hashtopolis\inc\Util; class AccessUtils { diff --git a/src/inc/utils/AgentBinaryUtils.php b/src/inc/utils/AgentBinaryUtils.php index 5200c91d1..1c9631e56 100644 --- a/src/inc/utils/AgentBinaryUtils.php +++ b/src/inc/utils/AgentBinaryUtils.php @@ -7,7 +7,7 @@ use Hashtopolis\dba\models\User; use Hashtopolis\dba\Factory; use Composer\Semver\Comparator; -use Hashtopolis\inc\apiv2\common\error\HttpError; +use Hashtopolis\inc\apiv2\error\HttpError; use Hashtopolis\inc\defines\DLogEntry; use Hashtopolis\inc\defines\DLogEntryIssuer; use Hashtopolis\inc\HTException; diff --git a/src/inc/utils/AgentUtils.php b/src/inc/utils/AgentUtils.php index fe2b01066..d407ae12b 100644 --- a/src/inc/utils/AgentUtils.php +++ b/src/inc/utils/AgentUtils.php @@ -21,8 +21,8 @@ use Hashtopolis\dba\Factory; use Hashtopolis\dba\models\HealthCheckAgent; use Hashtopolis\dba\models\Speed; -use Hashtopolis\inc\apiv2\common\error\HttpConflict; -use Hashtopolis\inc\apiv2\common\error\HttpError; +use Hashtopolis\inc\apiv2\error\HttpConflict; +use Hashtopolis\inc\apiv2\error\HttpError; use Hashtopolis\inc\defines\DAgentStatsType; use Hashtopolis\inc\defines\DConfig; use Hashtopolis\inc\defines\DLogEntry; diff --git a/src/inc/utils/ConfigUtils.php b/src/inc/utils/ConfigUtils.php index bac5cab9d..fce182f54 100644 --- a/src/inc/utils/ConfigUtils.php +++ b/src/inc/utils/ConfigUtils.php @@ -19,7 +19,6 @@ use Hashtopolis\inc\defines\DLogEntry; use Hashtopolis\inc\HTException; use Hashtopolis\inc\HTMessages; -use Hashtopolis\inc\utils\RunnerUtils; use Hashtopolis\inc\SConfig; use Hashtopolis\inc\UI; use Hashtopolis\inc\Util; diff --git a/src/inc/utils/CrackerUtils.php b/src/inc/utils/CrackerUtils.php index 56aafc041..2ef945112 100644 --- a/src/inc/utils/CrackerUtils.php +++ b/src/inc/utils/CrackerUtils.php @@ -9,8 +9,8 @@ use Hashtopolis\dba\ContainFilter; use Hashtopolis\dba\Factory; use Hashtopolis\dba\models\Pretask; -use Hashtopolis\inc\apiv2\common\error\HttpConflict; -use Hashtopolis\inc\apiv2\common\error\HttpError; +use Hashtopolis\inc\apiv2\error\HttpConflict; +use Hashtopolis\inc\apiv2\error\HttpError; use Hashtopolis\inc\HTException; use Hashtopolis\inc\Util; diff --git a/src/inc/utils/FileUtils.php b/src/inc/utils/FileUtils.php index 25571cdc6..3d307e0e2 100644 --- a/src/inc/utils/FileUtils.php +++ b/src/inc/utils/FileUtils.php @@ -15,7 +15,7 @@ use Hashtopolis\dba\ContainFilter; use Hashtopolis\dba\models\FileDelete; use Hashtopolis\dba\Factory; -use Hashtopolis\inc\apiv2\common\error\HttpError; +use Hashtopolis\inc\apiv2\error\HttpError; use Hashtopolis\inc\defines\DDirectories; use Hashtopolis\inc\defines\DFileType; use Hashtopolis\inc\HTException; diff --git a/src/inc/utils/HashlistUtils.php b/src/inc/utils/HashlistUtils.php index bc78cb451..0f0e27dac 100644 --- a/src/inc/utils/HashlistUtils.php +++ b/src/inc/utils/HashlistUtils.php @@ -26,7 +26,7 @@ use Hashtopolis\dba\models\AgentZap; use Hashtopolis\dba\Factory; use Hashtopolis\dba\models\Speed; -use Hashtopolis\inc\apiv2\common\error\HttpError; +use Hashtopolis\inc\apiv2\error\HttpError; use Hashtopolis\inc\defines\DConfig; use Hashtopolis\inc\defines\DDirectories; use Hashtopolis\inc\defines\DFileType; @@ -39,7 +39,6 @@ use Hashtopolis\inc\handlers\NotificationHandler; use Hashtopolis\inc\HTException; use Hashtopolis\inc\SConfig; -use Hashtopolis\inc\utils\TaskUtils; use Hashtopolis\inc\UI; use Hashtopolis\inc\Util; diff --git a/src/inc/utils/HashtypeUtils.php b/src/inc/utils/HashtypeUtils.php index e3b8787c9..ae00875fe 100644 --- a/src/inc/utils/HashtypeUtils.php +++ b/src/inc/utils/HashtypeUtils.php @@ -7,7 +7,7 @@ use Hashtopolis\dba\models\Hashlist; use Hashtopolis\dba\QueryFilter; use Hashtopolis\dba\Factory; -use Hashtopolis\inc\apiv2\common\error\HttpError; +use Hashtopolis\inc\apiv2\error\HttpError; use Hashtopolis\inc\defines\DLogEntry; use Hashtopolis\inc\HTException; use Hashtopolis\inc\Util; diff --git a/src/inc/utils/HealthUtils.php b/src/inc/utils/HealthUtils.php index d1c7429ca..62904eae4 100644 --- a/src/inc/utils/HealthUtils.php +++ b/src/inc/utils/HealthUtils.php @@ -7,7 +7,7 @@ use Hashtopolis\dba\models\HealthCheckAgent; use Hashtopolis\dba\Factory; use Hashtopolis\dba\models\HealthCheck; -use Hashtopolis\inc\apiv2\common\error\HttpError; +use Hashtopolis\inc\apiv2\error\HttpError; use Hashtopolis\inc\defines\DConfig; use Hashtopolis\inc\defines\DHealthCheck; use Hashtopolis\inc\defines\DHealthCheckAgentStatus; diff --git a/src/inc/utils/LockUtils.php b/src/inc/utils/LockUtils.php index e1acf942a..3da4fb669 100644 --- a/src/inc/utils/LockUtils.php +++ b/src/inc/utils/LockUtils.php @@ -54,7 +54,7 @@ public static function release($lockFile) { * @return void */ public static function deleteLockFile($taskId) { - $lockFile = dirname(__FILE__) . "/locks/" . LOCK::CHUNKING . $taskId; + $lockFile = dirname(__FILE__) . "/locks/" . Lock::CHUNKING . $taskId; if (file_exists($lockFile)) { unlink($lockFile); } diff --git a/src/inc/utils/NotificationUtils.php b/src/inc/utils/NotificationUtils.php index df81a6c5d..314f21c71 100644 --- a/src/inc/utils/NotificationUtils.php +++ b/src/inc/utils/NotificationUtils.php @@ -5,15 +5,13 @@ use Hashtopolis\dba\models\NotificationSetting; use Hashtopolis\dba\models\User; use Hashtopolis\dba\Factory; -use Hashtopolis\inc\apiv2\common\error\HttpError; +use Hashtopolis\inc\apiv2\error\HttpError; use Hashtopolis\inc\defines\DAccessControl; use Hashtopolis\inc\defines\DNotificationObjectType; use Hashtopolis\inc\defines\DNotificationType; use Hashtopolis\inc\notifications\HashtopolisNotification; use Hashtopolis\inc\HTException; use Hashtopolis\inc\Login; -use Hashtopolis\inc\utils\TaskUtils; -use Hashtopolis\inc\utils\UserUtils; class NotificationUtils { /** diff --git a/src/inc/utils/PreprocessorUtils.php b/src/inc/utils/PreprocessorUtils.php index 90954e644..3dab2b497 100644 --- a/src/inc/utils/PreprocessorUtils.php +++ b/src/inc/utils/PreprocessorUtils.php @@ -6,8 +6,8 @@ use Hashtopolis\dba\models\Preprocessor; use Hashtopolis\dba\QueryFilter; use Hashtopolis\dba\models\Task; -use Hashtopolis\inc\apiv2\common\error\HttpConflict; -use Hashtopolis\inc\apiv2\common\error\HttpError; +use Hashtopolis\inc\apiv2\error\HttpConflict; +use Hashtopolis\inc\apiv2\error\HttpError; use Hashtopolis\inc\HTException; use Hashtopolis\inc\Util; diff --git a/src/inc/utils/PretaskUtils.php b/src/inc/utils/PretaskUtils.php index 77a934e2a..a36480415 100644 --- a/src/inc/utils/PretaskUtils.php +++ b/src/inc/utils/PretaskUtils.php @@ -11,7 +11,7 @@ use Hashtopolis\dba\QueryFilter; use Hashtopolis\dba\models\SupertaskPretask; use Hashtopolis\dba\Factory; -use Hashtopolis\inc\apiv2\common\error\HttpError; +use Hashtopolis\inc\apiv2\error\HttpError; use Hashtopolis\inc\defines\DConfig; use Hashtopolis\inc\defines\DNotificationType; use Hashtopolis\inc\defines\DPayloadKeys; @@ -19,7 +19,6 @@ use Hashtopolis\inc\handlers\NotificationHandler; use Hashtopolis\inc\HTException; use Hashtopolis\inc\SConfig; -use Hashtopolis\inc\utils\TaskUtils; use Hashtopolis\inc\Util; class PretaskUtils { diff --git a/src/inc/utils/RunnerUtils.php b/src/inc/utils/RunnerUtils.php index 110ed8248..a9b0f4108 100644 --- a/src/inc/utils/RunnerUtils.php +++ b/src/inc/utils/RunnerUtils.php @@ -1,6 +1,7 @@ Date: Mon, 16 Feb 2026 17:13:57 +0100 Subject: [PATCH 432/691] made prefix into use statement --- ci/phpunit/dba/AbstractModelFactoryTest.php | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/ci/phpunit/dba/AbstractModelFactoryTest.php b/ci/phpunit/dba/AbstractModelFactoryTest.php index fee2a8feb..44e431485 100644 --- a/ci/phpunit/dba/AbstractModelFactoryTest.php +++ b/ci/phpunit/dba/AbstractModelFactoryTest.php @@ -7,6 +7,7 @@ use Hashtopolis\dba\OrderFilter; use Exception; use Hashtopolis\inc\defines\DHashlistFormat; +use Hashtopolis\inc\utils\AccessUtils; use PHPUnit\Framework\TestCase; use Hashtopolis\dba\Factory; use Hashtopolis\dba\QueryFilter; @@ -47,9 +48,9 @@ public function testSimpleFilter(): void { */ public function testColumnFilter(): void { // add some data - $hashlist_1 = new Hashlist(null, "hashlist 1", DHashlistFormat::PLAIN, 0, 0, ':', 0, 0, 0, 0, \Hashtopolis\inc\utils\AccessUtils::getOrCreateDefaultAccessGroup()->getId(), "", 0, 0, 0); - $hashlist_2 = new Hashlist(null, "hashlist 2", DHashlistFormat::PLAIN, 0, 0, ':', 0, 0, 0, 1, \Hashtopolis\inc\utils\AccessUtils::getOrCreateDefaultAccessGroup()->getId(), "", 0, 0, 0); - $hashlist_3 = new Hashlist(null, "hashlist 3", DHashlistFormat::PLAIN, 0, 0, ':', 0, 0, 0, 0, \Hashtopolis\inc\utils\AccessUtils::getOrCreateDefaultAccessGroup()->getId(), "", 0, 0, 0); + $hashlist_1 = new Hashlist(null, "hashlist 1", DHashlistFormat::PLAIN, 0, 0, ':', 0, 0, 0, 0, AccessUtils::getOrCreateDefaultAccessGroup()->getId(), "", 0, 0, 0); + $hashlist_2 = new Hashlist(null, "hashlist 2", DHashlistFormat::PLAIN, 0, 0, ':', 0, 0, 0, 1, AccessUtils::getOrCreateDefaultAccessGroup()->getId(), "", 0, 0, 0); + $hashlist_3 = new Hashlist(null, "hashlist 3", DHashlistFormat::PLAIN, 0, 0, ':', 0, 0, 0, 0, AccessUtils::getOrCreateDefaultAccessGroup()->getId(), "", 0, 0, 0); $hashlist_1 = Factory::getHashlistFactory()->save($hashlist_1); $hashlist_2 = Factory::getHashlistFactory()->save($hashlist_2); $hashlist_3 = Factory::getHashlistFactory()->save($hashlist_3); From 423598a62e22c4dbb0850fce3f306a12081f49ca Mon Sep 17 00:00:00 2001 From: s3inlc Date: Tue, 17 Feb 2026 09:01:01 +0100 Subject: [PATCH 433/691] fixed some things after merge --- src/api/v2/index.php | 2 +- src/dba/CoalesceOrderFilter.php | 0 src/dba/{ConcatColumn.class.php => ConcatColumn.php} | 2 +- ...Insensitive.class.php => ConcatLikeFilterInsensitive.php} | 4 ++-- .../{ConcatOrderFilter.class.php => ConcatOrderFilter.php} | 2 +- src/inc/apiv2/common/AbstractBaseAPI.php | 1 + src/inc/apiv2/common/AbstractModelAPI.php | 4 +++- src/inc/apiv2/model/TaskWrapperAPI.php | 5 ++++- 8 files changed, 13 insertions(+), 7 deletions(-) delete mode 100644 src/dba/CoalesceOrderFilter.php rename src/dba/{ConcatColumn.class.php => ConcatColumn.php} (92%) rename src/dba/{ConcatLikeFilterInsensitive.class.php => ConcatLikeFilterInsensitive.php} (82%) rename src/dba/{ConcatOrderFilter.class.php => ConcatOrderFilter.php} (81%) diff --git a/src/api/v2/index.php b/src/api/v2/index.php index 05b076af8..79be56d86 100644 --- a/src/api/v2/index.php +++ b/src/api/v2/index.php @@ -10,7 +10,7 @@ error_reporting(E_ALL ^ E_DEPRECATED); ini_set("display_errors", '1'); /** - * Treat warnings as error, very usefull during unit testing. + * Treat warnings as error, very useful during unit testing. * TODO: How-ever during Xdebug debugging under VS Code, this is very * TODO: slightly annoying since the last call stack is not very interesting. * TODO: Thus for the time-being do not-enable by default. diff --git a/src/dba/CoalesceOrderFilter.php b/src/dba/CoalesceOrderFilter.php deleted file mode 100644 index e69de29bb..000000000 diff --git a/src/dba/ConcatColumn.class.php b/src/dba/ConcatColumn.php similarity index 92% rename from src/dba/ConcatColumn.class.php rename to src/dba/ConcatColumn.php index 458cd0d23..959bd71df 100644 --- a/src/dba/ConcatColumn.class.php +++ b/src/dba/ConcatColumn.php @@ -1,6 +1,6 @@ columns as $column) { $columnFactory = $column->getFactory(); - array_push($mapped_columns, $columnFactory->getMappedModelTable() . "." . AbstractModelFactory::getMappedModelKey($columnFactory->getNullObject(), $column->getValue())); + $mapped_columns[] = $columnFactory->getMappedModelTable() . "." . AbstractModelFactory::getMappedModelKey($columnFactory->getNullObject(), $column->getValue()); } return "LOWER(" . "CONCAT(" . implode(", ", $mapped_columns) . ")" . ") LIKE LOWER(?)"; } diff --git a/src/dba/ConcatOrderFilter.class.php b/src/dba/ConcatOrderFilter.php similarity index 81% rename from src/dba/ConcatOrderFilter.class.php rename to src/dba/ConcatOrderFilter.php index 2dc003ea4..18f9d0bef 100644 --- a/src/dba/ConcatOrderFilter.class.php +++ b/src/dba/ConcatOrderFilter.php @@ -21,7 +21,7 @@ function __construct(array $columns, string $type) { function getQueryString(AbstractModelFactory $factory, bool $includeTable = false): string { $mapped_columns = []; foreach($this->columns as $column) { - array_push($mapped_columns, AbstractModelFactory::getMappedModelKey($column->getFactory()->getNullObject(), $column->getValue())); + $mapped_columns[] = AbstractModelFactory::getMappedModelKey($column->getFactory()->getNullObject(), $column->getValue()); } return "CONCAT(" . implode(", ", $mapped_columns) . ") " . $this->type; } diff --git a/src/inc/apiv2/common/AbstractBaseAPI.php b/src/inc/apiv2/common/AbstractBaseAPI.php index e0847df36..e38d02ddb 100644 --- a/src/inc/apiv2/common/AbstractBaseAPI.php +++ b/src/inc/apiv2/common/AbstractBaseAPI.php @@ -2,6 +2,7 @@ namespace Hashtopolis\inc\apiv2\common; +use Hashtopolis\dba\AbstractModelFactory; use Hashtopolis\inc\apiv2\error\HttpError; use Hashtopolis\inc\apiv2\error\HttpForbidden; use Hashtopolis\inc\apiv2\error\InternalError; diff --git a/src/inc/apiv2/common/AbstractModelAPI.php b/src/inc/apiv2/common/AbstractModelAPI.php index 7985b6bcc..2e90471ab 100644 --- a/src/inc/apiv2/common/AbstractModelAPI.php +++ b/src/inc/apiv2/common/AbstractModelAPI.php @@ -3,6 +3,8 @@ namespace Hashtopolis\inc\apiv2\common; use Hashtopolis\dba\MassUpdateSet; +use Hashtopolis\inc\apiv2\error\ErrorHandler; +use Hashtopolis\inc\apiv2\error\HttpConflict; use Hashtopolis\inc\apiv2\error\HttpError; use Hashtopolis\inc\apiv2\error\HttpForbidden; use Hashtopolis\inc\apiv2\error\InternalError; @@ -1039,7 +1041,7 @@ public function getOne(Request $request, Response $response, array $args): Respo */ public function patchSingleObject(Request $request, Response $response, mixed $object, mixed $data): Response { if (!$this->validateResourceRecord($data)) { - return errorResponse($response, "No valid resource identifier object was given as data!", 403); + return ErrorHandler::errorResponse($response, "No valid resource identifier object was given as data!", 403); } $attributes = $data['attributes']; diff --git a/src/inc/apiv2/model/TaskWrapperAPI.php b/src/inc/apiv2/model/TaskWrapperAPI.php index 97cb376e4..54a4e3918 100644 --- a/src/inc/apiv2/model/TaskWrapperAPI.php +++ b/src/inc/apiv2/model/TaskWrapperAPI.php @@ -2,10 +2,13 @@ namespace Hashtopolis\inc\apiv2\model; +use Hashtopolis\dba\ConcatColumn; +use Hashtopolis\dba\ConcatLikeFilterInsensitive; +use Hashtopolis\dba\ConcatOrderFilter; +use Hashtopolis\dba\LikeFilterInsensitive; use Hashtopolis\inc\defines\DTaskTypes; use Hashtopolis\inc\utils\AccessUtils; use Hashtopolis\dba\models\AccessGroup; -use Hashtopolis\dba\CoalesceOrderFilter; use Hashtopolis\dba\ContainFilter; use Hashtopolis\dba\Factory; use Hashtopolis\dba\models\Hashlist; From 01ad7cf85cbe7252b72bb6918fd0351a28a240d7 Mon Sep 17 00:00:00 2001 From: s3inlc Date: Tue, 17 Feb 2026 09:41:16 +0100 Subject: [PATCH 434/691] fixes to run legacy UI properly --- src/account.php | 2 +- src/api.php | 2 +- src/inc/templating/Statement.php | 155 ++++++++++++++++++++++++++++++- 3 files changed, 152 insertions(+), 7 deletions(-) diff --git a/src/account.php b/src/account.php index 7edfc658e..dbe5e52e1 100755 --- a/src/account.php +++ b/src/account.php @@ -1,7 +1,7 @@ statementType) { case 'IF': //setting -> array(condition, else position) $condition = $this->renderContent($this->setting[0], $objects, true); - if (eval("return $condition;")) { + if (eval(EVAL_PREFIX . "return $condition;")) { //if statement is true for ($x = 0; $x < sizeof($this->content); $x++) { if ($x == $this->setting[1]) { @@ -162,7 +307,7 @@ private function evalResult($value, $objects, $inner) { return "\$objects['$varname']$calls"; } else { - return eval("return \$objects['$varname']$calls;"); + return eval(EVAL_PREFIX . "return \$objects['$varname']$calls;"); } } else if (isset($objects[preg_replace('/\[.*\] /', "", $value)])) { @@ -172,7 +317,7 @@ private function evalResult($value, $objects, $inner) { return "\$objects['$varname']" . str_replace($varname . "[", "", str_replace("] ", "", $value)); } else { - return eval("return \$objects['$varname'][" . str_replace($varname . "[", "", str_replace("] ", "", $value)) . "];"); + return eval(EVAL_PREFIX . "return \$objects['$varname'][" . str_replace($varname . "[", "", str_replace("] ", "", $value)) . "];"); } } else if (is_callable(preg_replace('/\(.*\)/', "", $value))) { @@ -181,7 +326,7 @@ private function evalResult($value, $objects, $inner) { return "$value"; } else { - return eval("return $value;"); + return eval(EVAL_PREFIX . "return $value;"); } } else if (strpos($value, '$') === 0) { @@ -190,7 +335,7 @@ private function evalResult($value, $objects, $inner) { return substr($value, 1); } else { - return eval("return " . substr($value, 1) . ";"); + return eval(EVAL_PREFIX . "return " . substr($value, 1) . ";"); } } else { From 149fc2639afd73b9c0b81c6b0c0e3ccc048687f2 Mon Sep 17 00:00:00 2001 From: s3inlc Date: Tue, 17 Feb 2026 09:55:02 +0100 Subject: [PATCH 435/691] fixing phpstan issues --- src/inc/apiv2/common/openAPISchema.routes.php | 2 +- src/inc/apiv2/helper/BulkSupertaskBuilderHelperAPI.php | 1 + src/inc/apiv2/helper/CurrentUserHelperAPI.php | 2 +- src/inc/apiv2/helper/SearchHashesHelperAPI.php | 1 + src/inc/apiv2/util/JsonBodyParserMiddleware.php | 2 +- src/inc/apiv2/util/TokenAsParameterMiddleware.php | 3 +-- 6 files changed, 6 insertions(+), 5 deletions(-) diff --git a/src/inc/apiv2/common/openAPISchema.routes.php b/src/inc/apiv2/common/openAPISchema.routes.php index d0be97d92..a25542c36 100644 --- a/src/inc/apiv2/common/openAPISchema.routes.php +++ b/src/inc/apiv2/common/openAPISchema.routes.php @@ -124,7 +124,7 @@ if (!($class instanceof AbstractModelAPI)) { $name = $class::class; - $apiMethod = ($apiMethod == "processPost" && $name !== "ImportFileHelperAPI") ? "actionPost" : $apiMethod; + $apiMethod = ($apiMethod == "processPost" && $name != "ImportFileHelperAPI") ? "actionPost" : $apiMethod; $reflectionApiMethod = new ReflectionMethod($name, $apiMethod); $paths[$path][$method]["description"] = OpenAPISchemaUtils::parsePhpDoc($reflectionApiMethod->getDocComment()); $parameters = $class->getCreateValidFeatures(); diff --git a/src/inc/apiv2/helper/BulkSupertaskBuilderHelperAPI.php b/src/inc/apiv2/helper/BulkSupertaskBuilderHelperAPI.php index ec9b7b9ef..58192d4a6 100644 --- a/src/inc/apiv2/helper/BulkSupertaskBuilderHelperAPI.php +++ b/src/inc/apiv2/helper/BulkSupertaskBuilderHelperAPI.php @@ -6,6 +6,7 @@ use Hashtopolis\dba\models\Supertask; use Hashtopolis\inc\apiv2\common\AbstractHelperAPI; use Hashtopolis\inc\HTException; +use Hashtopolis\inc\Login; use Hashtopolis\inc\utils\SupertaskUtils; class BulkSupertaskBuilderHelperAPI extends AbstractHelperAPI { diff --git a/src/inc/apiv2/helper/CurrentUserHelperAPI.php b/src/inc/apiv2/helper/CurrentUserHelperAPI.php index 4bbe959a2..9be34f565 100644 --- a/src/inc/apiv2/helper/CurrentUserHelperAPI.php +++ b/src/inc/apiv2/helper/CurrentUserHelperAPI.php @@ -73,7 +73,7 @@ public function actionPatch(Request $request, Response $response, array $args): } static public function register($app): void { - $baseUri = currentUserHelperAPI::getBaseUri(); + $baseUri = CurrentUserHelperAPI::getBaseUri(); /* Allow CORS preflight requests */ $app->options($baseUri, function (Request $request, Response $response): Response { diff --git a/src/inc/apiv2/helper/SearchHashesHelperAPI.php b/src/inc/apiv2/helper/SearchHashesHelperAPI.php index 1c950748c..6a96b4ed6 100644 --- a/src/inc/apiv2/helper/SearchHashesHelperAPI.php +++ b/src/inc/apiv2/helper/SearchHashesHelperAPI.php @@ -2,6 +2,7 @@ namespace Hashtopolis\inc\apiv2\helper; +use Hashtopolis\inc\Util; use Hashtopolis\inc\utils\HashlistUtils; use Hashtopolis\dba\ContainFilter; use Hashtopolis\dba\Factory; diff --git a/src/inc/apiv2/util/JsonBodyParserMiddleware.php b/src/inc/apiv2/util/JsonBodyParserMiddleware.php index c5d441e3a..82678aa4f 100644 --- a/src/inc/apiv2/util/JsonBodyParserMiddleware.php +++ b/src/inc/apiv2/util/JsonBodyParserMiddleware.php @@ -2,7 +2,7 @@ namespace Hashtopolis\inc\apiv2\util; -use Hashtopolis\inc\apiv2\common\error\ErrorHandler; +use Hashtopolis\inc\apiv2\error\ErrorHandler; use Psr\Http\Server\MiddlewareInterface; use Psr\Http\Server\RequestHandlerInterface as RequestHandler; use Psr\Http\Message\ServerRequestInterface as Request; diff --git a/src/inc/apiv2/util/TokenAsParameterMiddleware.php b/src/inc/apiv2/util/TokenAsParameterMiddleware.php index a3dcf7337..460aa149b 100644 --- a/src/inc/apiv2/util/TokenAsParameterMiddleware.php +++ b/src/inc/apiv2/util/TokenAsParameterMiddleware.php @@ -5,8 +5,7 @@ use Psr\Http\Server\MiddlewareInterface; use Psr\Http\Server\RequestHandlerInterface as RequestHandler; use Psr\Http\Message\ServerRequestInterface as Request; - -use Slim\Psr7\Response; +use Psr\Http\Message\ResponseInterface as Response; /* Quirk to map token as parameter (useful for debugging) to 'Authorization Header (for JWT input) */ class TokenAsParameterMiddleware implements MiddlewareInterface { From 13e4d624b7544d33666a283bb3588a8f90511513 Mon Sep 17 00:00:00 2001 From: s3inlc Date: Tue, 17 Feb 2026 09:58:43 +0100 Subject: [PATCH 436/691] fixing phpstan issues --- src/inc/apiv2/util/JsonBodyParserMiddleware.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/inc/apiv2/util/JsonBodyParserMiddleware.php b/src/inc/apiv2/util/JsonBodyParserMiddleware.php index 82678aa4f..d2da6ea30 100644 --- a/src/inc/apiv2/util/JsonBodyParserMiddleware.php +++ b/src/inc/apiv2/util/JsonBodyParserMiddleware.php @@ -12,7 +12,7 @@ /* Pre-parse incoming request body */ class JsonBodyParserMiddleware implements MiddlewareInterface { - public function process(Request $request, RequestHandler $handler): Response { + public function process(Request $request, RequestHandler $handler): \Psr\Http\Message\ResponseInterface { $contentType = $request->getHeaderLine('Content-Type'); if (strstr($contentType, 'application/json') || strstr($contentType, 'application/vnd.api+json')) { From ea504969bd5d3e29d3745227555ae4aa454e4cd5 Mon Sep 17 00:00:00 2001 From: jessevz Date: Tue, 17 Feb 2026 11:23:13 +0100 Subject: [PATCH 437/691] Add the postgress update to the docker-compose --- docker-compose.postgres.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docker-compose.postgres.yml b/docker-compose.postgres.yml index 2b5bdc56d..8760adb43 100644 --- a/docker-compose.postgres.yml +++ b/docker-compose.postgres.yml @@ -23,7 +23,7 @@ services: - 8080:80 db: container_name: db - image: postgres:13 + image: postgres:18 restart: always volumes: - db:/var/lib/postgresql/data From e6c1bb205e6e8b13a993d9ed4934b3f3b1f48824 Mon Sep 17 00:00:00 2001 From: s3inlc Date: Tue, 17 Feb 2026 14:30:46 +0100 Subject: [PATCH 438/691] sanitize hashes also in cracks.php view --- src/templates/cracks.template.html | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/templates/cracks.template.html b/src/templates/cracks.template.html index 889ca178c..269661fae 100644 --- a/src/templates/cracks.template.html +++ b/src/templates/cracks.template.html @@ -32,10 +32,10 @@

      Number of cracked hashes: [[count]]

      [[date([[config.getVal(DConfig::TIME_FORMAT)]], [[crackDetailsPrimary.getVal([[crack.getId()]]).getTimeCracked()]])]]
    Type
    Operating Systems
    [[binary.getId()]][[binary.getType()]][[binary.getBinaryType()]] [[binary.getOperatingSystems()]] [[binary.getFilename()]] [[binary.getVersion()]] - [[crackDetailsPrimary.getVal([[crack.getId()]]).getPlaintext()]] + [[htmlentities([[crackDetailsPrimary.getVal([[crack.getId()]]).getPlaintext()]], ENT_QUOTES, "UTF-8")]] - [[crackDetailsPrimary.getVal([[crack.getId()]]).getHash()]] + [[htmlentities([[crackDetailsPrimary.getVal([[crack.getId()]]).getHash()]], ENT_QUOTES, "UTF-8")]] {{IF [[accessControl.hasPermission([[$DAccessControl::VIEW_HASHLIST_ACCESS]])]]}} From 5c8f12dabe3397916636de90ebdf2fbb784a3c5b Mon Sep 17 00:00:00 2001 From: s3inlc Date: Tue, 17 Feb 2026 15:12:39 +0100 Subject: [PATCH 439/691] updated workaround to make namespaces working in the old templating --- src/inc/templating/Statement.php | 339 +++++++++++++++++-------------- 1 file changed, 189 insertions(+), 150 deletions(-) diff --git a/src/inc/templating/Statement.php b/src/inc/templating/Statement.php index e6289d6c0..270fecad1 100644 --- a/src/inc/templating/Statement.php +++ b/src/inc/templating/Statement.php @@ -4,150 +4,6 @@ use Hashtopolis\inc\UI; -/** - * current hack and easy way to make sure we have everything we need, we just include all. As it's legacy code it will - * be removed on refactoring to get rid of any eval code. - */ -define("EVAL_PREFIX", "use Hashtopolis\inc\{ - CSRF, - DataSet, - Encryption, - Lang, - Login, - Menu, - SConfig, - StartupConfig, - UI, - Util, -}; -use Hashtopolis\inc\defines\{ - DAccessControlAction, - DAccessControl, - DAccessGroupAction, - DAccessLevel, - DAccountAction, - DAgentAction, - DAgentBinaryAction, - DAgentIgnoreErrors, - DAgentStatsType, - DApiAction, - DCleaning, - DConfigAction, - DConfig, - DConfigType, - DCrackerBinaryAction, - DDeviceCompress, - DDirectories, - DFileAction, - DFileDownloadStatus, - DFileType, - DForgotAction, - DHashcatStatus, - DHashlistAction, - DHashlistFormat, - DHashtypeAction, - DHealthCheckAction, - DHealthCheckAgentStatus, - DHealthCheckMode, - DHealthCheck, - DHealthCheckStatus, - DHealthCheckType, - DLimits, - DLogEntryIssuer, - DLogEntry, - DNotificationAction, - DNotificationObjectType, - DNotificationType, - DOperatingSystem, - DPayloadKeys, - DPlatforms, - DPreprocessorAction, - DPretaskAction, - DPrince, - DProxyTypes, - DSearchAction, - DServerLog, - DStats, - DSupertaskAction, - DTaskAction, - DTaskStaticChunking, - DTaskTypes, - DUserAction, - DViewControl, - UApi, - UQueryAccess, - UQueryAccount, - UQueryAgent, - UQueryConfig, - UQueryCracker, - UQueryFile, - UQueryGroup, - UQueryHashlist, - UQuery, - UQuerySuperhashlist, - UQueryTask, - UQueryUser, - UResponseAccess, - UResponseAccount, - UResponseAgent, - UResponseConfig, - UResponseCracker, - UResponseErrorMessage, - UResponseFile, - UResponseGroup, - UResponseHashlist, - UResponse, - UResponseSuperhashlist, - UResponseTask, - UResponseUser, - USectionAccess, - USectionAccount, - USectionAgent, - USectionConfig, - USectionCracker, - USectionFile, - USectionGroup, - USectionHashlist, - USection, - USectionPretask, - USectionSuperhashlist, - USectionSupertask, - USectionTask, - USectionTest, - USectionUser, - UValues, -}; -use Hashtopolis\inc\utils\{ - AccessControl, - AccessControlUtils, - AccessGroupUtils, - AccessUtils, - AccountUtils, - AgentBinaryUtils, - AgentUtils, - ApiUtils, - AssignmentUtils, - ChunkUtils, - ConfigUtils, - CrackerBinaryUtils, - CrackerUtils, - FileDownloadUtils, - FileUtils, - HashlistUtils, - HashtypeUtils, - HealthUtils, - Lock, - LockUtils, - NotificationUtils, - PreprocessorUtils, - PretaskUtils, - RunnerUtils, - SupertaskUtils, - TaskUtils, - TaskWrapperUtils, - UserUtils, -};"); - class Statement { private $statementType; //if, for, foreach, content /** @@ -162,6 +18,152 @@ public function __construct($type, $content, $setting) { $this->statementType = $type; } + /** + * current hack and easy way to make sure we have everything we need, we just include all. As it's legacy code it will + * be removed on refactoring to get rid of any eval code. + */ + private static array $useStatements = [ + 'Hashtopolis\\inc\\utils\\AccessControl', + 'Hashtopolis\\inc\\utils\\AccessControlUtils', + 'Hashtopolis\\inc\\utils\\AccessGroupUtils', + 'Hashtopolis\\inc\\utils\\AccessUtils', + 'Hashtopolis\\inc\\utils\\AccountUtils', + 'Hashtopolis\\inc\\utils\\AgentBinaryUtils', + 'Hashtopolis\\inc\\utils\\AgentUtils', + 'Hashtopolis\\inc\\utils\\ApiUtils', + 'Hashtopolis\\inc\\utils\\AssignmentUtils', + 'Hashtopolis\\inc\\utils\\ChunkUtils', + 'Hashtopolis\\inc\\utils\\ConfigUtils', + 'Hashtopolis\\inc\\utils\\CrackerBinaryUtils', + 'Hashtopolis\\inc\\utils\\CrackerUtils', + 'Hashtopolis\\inc\\utils\\FileDownloadUtils', + 'Hashtopolis\\inc\\utils\\FileUtils', + 'Hashtopolis\\inc\\utils\\HashlistUtils', + 'Hashtopolis\\inc\\utils\\HashtypeUtils', + 'Hashtopolis\\inc\\utils\\HealthUtils', + 'Hashtopolis\\inc\\utils\\Lock', + 'Hashtopolis\\inc\\utils\\LockUtils', + 'Hashtopolis\\inc\\utils\\NotificationUtils', + 'Hashtopolis\\inc\\utils\\PreprocessorUtils', + 'Hashtopolis\\inc\\utils\\PretaskUtils', + 'Hashtopolis\\inc\\utils\\RunnerUtils', + 'Hashtopolis\\inc\\utils\\SupertaskUtils', + 'Hashtopolis\\inc\\utils\\TaskUtils', + 'Hashtopolis\\inc\\utils\\TaskWrapperUtils', + 'Hashtopolis\\inc\\utils\\UserUtils', + 'Hashtopolis\\inc\\defines\\DAccessControl', + 'Hashtopolis\\inc\\defines\\DAccessControlAction', + 'Hashtopolis\\inc\\defines\\DAccessGroupAction', + 'Hashtopolis\\inc\\defines\\DAccessLevel', + 'Hashtopolis\\inc\\defines\\DAccountAction', + 'Hashtopolis\\inc\\defines\\DAgentAction', + 'Hashtopolis\\inc\\defines\\DAgentBinaryAction', + 'Hashtopolis\\inc\\defines\\DAgentIgnoreErrors', + 'Hashtopolis\\inc\\defines\\DAgentStatsType', + 'Hashtopolis\\inc\\defines\\DApiAction', + 'Hashtopolis\\inc\\defines\\DCleaning', + 'Hashtopolis\\inc\\defines\\DConfig', + 'Hashtopolis\\inc\\defines\\DConfigAction', + 'Hashtopolis\\inc\\defines\\DConfigType', + 'Hashtopolis\\inc\\defines\\DCrackerBinaryAction', + 'Hashtopolis\\inc\\defines\\DDeviceCompress', + 'Hashtopolis\\inc\\defines\\DDirectories', + 'Hashtopolis\\inc\\defines\\DFileAction', + 'Hashtopolis\\inc\\defines\\DFileDownloadStatus', + 'Hashtopolis\\inc\\defines\\DFileType', + 'Hashtopolis\\inc\\defines\\DForgotAction', + 'Hashtopolis\\inc\\defines\\DHashcatStatus', + 'Hashtopolis\\inc\\defines\\DHashlistAction', + 'Hashtopolis\\inc\\defines\\DHashlistFormat', + 'Hashtopolis\\inc\\defines\\DHashtypeAction', + 'Hashtopolis\\inc\\defines\\DHealthCheck', + 'Hashtopolis\\inc\\defines\\DHealthCheckAction', + 'Hashtopolis\\inc\\defines\\DHealthCheckAgentStatus', + 'Hashtopolis\\inc\\defines\\DHealthCheckMode', + 'Hashtopolis\\inc\\defines\\DHealthCheckStatus', + 'Hashtopolis\\inc\\defines\\DHealthCheckType', + 'Hashtopolis\\inc\\defines\\DLimits', + 'Hashtopolis\\inc\\defines\\DLogEntry', + 'Hashtopolis\\inc\\defines\\DLogEntryIssuer', + 'Hashtopolis\\inc\\defines\\DNotificationAction', + 'Hashtopolis\\inc\\defines\\DNotificationObjectType', + 'Hashtopolis\\inc\\defines\\DNotificationType', + 'Hashtopolis\\inc\\defines\\DOperatingSystem', + 'Hashtopolis\\inc\\defines\\DPayloadKeys', + 'Hashtopolis\\inc\\defines\\DPlatforms', + 'Hashtopolis\\inc\\defines\\DPreprocessorAction', + 'Hashtopolis\\inc\\defines\\DPretaskAction', + 'Hashtopolis\\inc\\defines\\DPrince', + 'Hashtopolis\\inc\\defines\\DProxyTypes', + 'Hashtopolis\\inc\\defines\\DSearchAction', + 'Hashtopolis\\inc\\defines\\DServerLog', + 'Hashtopolis\\inc\\defines\\DStats', + 'Hashtopolis\\inc\\defines\\DSupertaskAction', + 'Hashtopolis\\inc\\defines\\DTaskAction', + 'Hashtopolis\\inc\\defines\\DTaskStaticChunking', + 'Hashtopolis\\inc\\defines\\DTaskTypes', + 'Hashtopolis\\inc\\defines\\DUserAction', + 'Hashtopolis\\inc\\defines\\DViewControl', + 'Hashtopolis\\inc\\defines\\UApi', + 'Hashtopolis\\inc\\defines\\UQuery', + 'Hashtopolis\\inc\\defines\\UQueryAccess', + 'Hashtopolis\\inc\\defines\\UQueryAccount', + 'Hashtopolis\\inc\\defines\\UQueryAgent', + 'Hashtopolis\\inc\\defines\\UQueryConfig', + 'Hashtopolis\\inc\\defines\\UQueryCracker', + 'Hashtopolis\\inc\\defines\\UQueryFile', + 'Hashtopolis\\inc\\defines\\UQueryGroup', + 'Hashtopolis\\inc\\defines\\UQueryHashlist', + 'Hashtopolis\\inc\\defines\\UQuerySuperhashlist', + 'Hashtopolis\\inc\\defines\\UQueryTask', + 'Hashtopolis\\inc\\defines\\UQueryUser', + 'Hashtopolis\\inc\\defines\\UResponse', + 'Hashtopolis\\inc\\defines\\UResponseAccess', + 'Hashtopolis\\inc\\defines\\UResponseAccount', + 'Hashtopolis\\inc\\defines\\UResponseAgent', + 'Hashtopolis\\inc\\defines\\UResponseConfig', + 'Hashtopolis\\inc\\defines\\UResponseCracker', + 'Hashtopolis\\inc\\defines\\UResponseErrorMessage', + 'Hashtopolis\\inc\\defines\\UResponseFile', + 'Hashtopolis\\inc\\defines\\UResponseGroup', + 'Hashtopolis\\inc\\defines\\UResponseHashlist', + 'Hashtopolis\\inc\\defines\\UResponseSuperhashlist', + 'Hashtopolis\\inc\\defines\\UResponseTask', + 'Hashtopolis\\inc\\defines\\UResponseUser', + 'Hashtopolis\\inc\\defines\\USection', + 'Hashtopolis\\inc\\defines\\USectionAccess', + 'Hashtopolis\\inc\\defines\\USectionAccount', + 'Hashtopolis\\inc\\defines\\USectionAgent', + 'Hashtopolis\\inc\\defines\\USectionConfig', + 'Hashtopolis\\inc\\defines\\USectionCracker', + 'Hashtopolis\\inc\\defines\\USectionFile', + 'Hashtopolis\\inc\\defines\\USectionGroup', + 'Hashtopolis\\inc\\defines\\USectionHashlist', + 'Hashtopolis\\inc\\defines\\USectionPretask', + 'Hashtopolis\\inc\\defines\\USectionSuperhashlist', + 'Hashtopolis\\inc\\defines\\USectionSupertask', + 'Hashtopolis\\inc\\defines\\USectionTask', + 'Hashtopolis\\inc\\defines\\USectionTest', + 'Hashtopolis\\inc\\defines\\USectionUser', + 'Hashtopolis\\inc\\defines\\UValues', + 'Hashtopolis\\inc\\CSRF', + 'Hashtopolis\\inc\\DataSet', + 'Hashtopolis\\inc\\Encryption', + 'Hashtopolis\\inc\\Lang', + 'Hashtopolis\\inc\\Login', + 'Hashtopolis\\inc\\Menu', + 'Hashtopolis\\inc\\SConfig', + 'Hashtopolis\\inc\\StartupConfig', + 'Hashtopolis\\inc\\UI', + 'Hashtopolis\\inc\\Util', + ]; + + private static array $namespaces = [ + 'Hashtopolis\\inc', + 'Hashtopolis\\inc\\defines', + 'Hashtopolis\\inc\\utils', + ]; + public function render($objects) { global $LANG; @@ -169,7 +171,7 @@ public function render($objects) { switch ($this->statementType) { case 'IF': //setting -> array(condition, else position) $condition = $this->renderContent($this->setting[0], $objects, true); - if (eval(EVAL_PREFIX . "return $condition;")) { + if (eval(Statement::getPrefix() . "return $condition;")) { //if statement is true for ($x = 0; $x < sizeof($this->content); $x++) { if ($x == $this->setting[1]) { @@ -293,6 +295,43 @@ private function renderVariable($content, $objects, $inner = false) { return array($output, $pos); } + // The functions getPrefix() and isCallable() are needed as a workaround for the templating to work with the current + // way of namespaces + private static function getPrefix(): string { + $statements = ""; + foreach (self::$useStatements as $s) { + $statements .= "use " . $s . ";"; + } + return $statements; + } + + private static function isCallable(string $methodString) { + // split into class and method parts + if (!strpos($methodString, '::')) { + return is_callable($methodString); // global methods + } + [$classPart, $method] = explode('::', $methodString, 2); + + $makeFQ = fn($cls) => '\\' . trim($cls, '\\'); + + $fqClass = $makeFQ($classPart); + $candidate = $fqClass . '::' . $method; + if (is_callable($candidate)) { + return true; + } + + foreach (Statement::$namespaces as $ns) { + $fqClass = $makeFQ($ns . '\\' . $classPart); + $candidate = $fqClass . '::' . $method; + if (is_callable($candidate)) { + return true; + } + } + + // nothing matched + return false; + } + private function evalResult($value, $objects, $inner) { $vals = explode(".", $value); $varname = $vals[0]; @@ -307,7 +346,7 @@ private function evalResult($value, $objects, $inner) { return "\$objects['$varname']$calls"; } else { - return eval(EVAL_PREFIX . "return \$objects['$varname']$calls;"); + return eval(Statement::getPrefix() . "return \$objects['$varname']$calls;"); } } else if (isset($objects[preg_replace('/\[.*\] /', "", $value)])) { @@ -317,16 +356,16 @@ private function evalResult($value, $objects, $inner) { return "\$objects['$varname']" . str_replace($varname . "[", "", str_replace("] ", "", $value)); } else { - return eval(EVAL_PREFIX . "return \$objects['$varname'][" . str_replace($varname . "[", "", str_replace("] ", "", $value)) . "];"); + return eval(Statement::getPrefix() . "return \$objects['$varname'][" . str_replace($varname . "[", "", str_replace("] ", "", $value)) . "];"); } } - else if (is_callable(preg_replace('/\(.*\)/', "", $value))) { + else if (Statement::isCallable(preg_replace('/\(.*\)/', "", $value))) { //is a static function call if ($inner) { return "$value"; } else { - return eval(EVAL_PREFIX . "return $value;"); + return eval(Statement::getPrefix() . "return $value;"); } } else if (strpos($value, '$') === 0) { @@ -335,7 +374,7 @@ private function evalResult($value, $objects, $inner) { return substr($value, 1); } else { - return eval(EVAL_PREFIX . "return " . substr($value, 1) . ";"); + return eval(Statement::getPrefix() . "return " . substr($value, 1) . ";"); } } else { From b4257958cb88f8dabfab61eff4a305a36dfa891f Mon Sep 17 00:00:00 2001 From: jessevz Date: Wed, 18 Feb 2026 08:47:43 +0100 Subject: [PATCH 440/691] Upgraded packages --- composer.json | 2 +- composer.lock | 78 +++++++++++++++++++++++++-------------------------- 2 files changed, 40 insertions(+), 40 deletions(-) diff --git a/composer.json b/composer.json index ca0852321..0a652188a 100644 --- a/composer.json +++ b/composer.json @@ -22,7 +22,7 @@ "ext-pdo": "*", "composer/semver": "^3.4", "crell/api-problem": "^3.6", - "jimtools/jwt-auth": "^2.3", + "jimtools/jwt-auth": "^3.0", "middlewares/encoder": "^2.1", "middlewares/negotiation": "^2.1", "monolog/monolog": "^2.8", diff --git a/composer.lock b/composer.lock index e1928b805..160844b48 100644 --- a/composer.lock +++ b/composer.lock @@ -4,7 +4,7 @@ "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies", "This file is @generated automatically" ], - "content-hash": "d707b8562d3314e500ae1bba0dc702ad", + "content-hash": "8e561ebf11be4bc46b585d70c42f2d0a", "packages": [ { "name": "composer/semver", @@ -212,16 +212,16 @@ }, { "name": "firebase/php-jwt", - "version": "v6.11.1", + "version": "v7.0.2", "source": { "type": "git", "url": "https://github.com/firebase/php-jwt.git", - "reference": "d1e91ecf8c598d073d0995afa8cd5c75c6e19e66" + "reference": "5645b43af647b6947daac1d0f659dd1fbe8d3b65" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/firebase/php-jwt/zipball/d1e91ecf8c598d073d0995afa8cd5c75c6e19e66", - "reference": "d1e91ecf8c598d073d0995afa8cd5c75c6e19e66", + "url": "https://api.github.com/repos/firebase/php-jwt/zipball/5645b43af647b6947daac1d0f659dd1fbe8d3b65", + "reference": "5645b43af647b6947daac1d0f659dd1fbe8d3b65", "shasum": "" }, "require": { @@ -269,26 +269,26 @@ ], "support": { "issues": "https://github.com/firebase/php-jwt/issues", - "source": "https://github.com/firebase/php-jwt/tree/v6.11.1" + "source": "https://github.com/firebase/php-jwt/tree/v7.0.2" }, - "time": "2025-04-09T20:32:01+00:00" + "time": "2025-12-16T22:17:28+00:00" }, { "name": "jimtools/jwt-auth", - "version": "2.3.1", + "version": "3.0.0", "source": { "type": "git", "url": "https://github.com/JimTools/jwt-auth.git", - "reference": "433da5594eb26c349472142a08c1bfe336bdd708" + "reference": "266a02352ee5df57107c653827aab3d91a76857e" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/JimTools/jwt-auth/zipball/433da5594eb26c349472142a08c1bfe336bdd708", - "reference": "433da5594eb26c349472142a08c1bfe336bdd708", + "url": "https://api.github.com/repos/JimTools/jwt-auth/zipball/266a02352ee5df57107c653827aab3d91a76857e", + "reference": "266a02352ee5df57107c653827aab3d91a76857e", "shasum": "" }, "require": { - "firebase/php-jwt": "^6.0", + "firebase/php-jwt": "^7.0", "php": "~8.2 || ~8.3 || ~8.4 || ~8.5", "psr/http-message": "^1.0 || ^2.0", "psr/http-server-middleware": "^1.0" @@ -298,6 +298,7 @@ }, "require-dev": { "equip/dispatch": "^2.0", + "ext-openssl": "*", "friendsofphp/php-cs-fixer": "^3.89", "laminas/laminas-diactoros": "^3.7", "phpstan/phpstan": "^2.1", @@ -322,7 +323,7 @@ "role": "Developer" } ], - "description": "Drop in replacement for tuupola/slim-jwt-auth", + "description": "PSR-15 JWT Authentication middleware, A replacement for tuupola/slim-jwt-auth", "homepage": "https://github.com/jimtools/jwt-auth", "keywords": [ "auth", @@ -334,7 +335,7 @@ ], "support": { "issues": "https://github.com/JimTools/jwt-auth/issues", - "source": "https://github.com/JimTools/jwt-auth/tree/2.3.1" + "source": "https://github.com/JimTools/jwt-auth/tree/3.0.0" }, "funding": [ { @@ -342,7 +343,7 @@ "type": "github" } ], - "time": "2025-11-30T15:18:13+00:00" + "time": "2025-12-20T14:28:36+00:00" }, { "name": "laravel/serializable-closure", @@ -1718,30 +1719,29 @@ }, { "name": "doctrine/instantiator", - "version": "2.0.0", + "version": "2.1.0", "source": { "type": "git", "url": "https://github.com/doctrine/instantiator.git", - "reference": "c6222283fa3f4ac679f8b9ced9a4e23f163e80d0" + "reference": "23da848e1a2308728fe5fdddabf4be17ff9720c7" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/doctrine/instantiator/zipball/c6222283fa3f4ac679f8b9ced9a4e23f163e80d0", - "reference": "c6222283fa3f4ac679f8b9ced9a4e23f163e80d0", + "url": "https://api.github.com/repos/doctrine/instantiator/zipball/23da848e1a2308728fe5fdddabf4be17ff9720c7", + "reference": "23da848e1a2308728fe5fdddabf4be17ff9720c7", "shasum": "" }, "require": { - "php": "^8.1" + "php": "^8.4" }, "require-dev": { - "doctrine/coding-standard": "^11", + "doctrine/coding-standard": "^14", "ext-pdo": "*", "ext-phar": "*", "phpbench/phpbench": "^1.2", - "phpstan/phpstan": "^1.9.4", - "phpstan/phpstan-phpunit": "^1.3", - "phpunit/phpunit": "^9.5.27", - "vimeo/psalm": "^5.4" + "phpstan/phpstan": "^2.1", + "phpstan/phpstan-phpunit": "^2.0", + "phpunit/phpunit": "^10.5.58" }, "type": "library", "autoload": { @@ -1768,7 +1768,7 @@ ], "support": { "issues": "https://github.com/doctrine/instantiator/issues", - "source": "https://github.com/doctrine/instantiator/tree/2.0.0" + "source": "https://github.com/doctrine/instantiator/tree/2.1.0" }, "funding": [ { @@ -1784,7 +1784,7 @@ "type": "tidelift" } ], - "time": "2022-12-30T00:23:10+00:00" + "time": "2026-01-05T06:47:08+00:00" }, { "name": "myclabs/deep-copy", @@ -2819,16 +2819,16 @@ }, { "name": "phpunit/phpunit", - "version": "12.5.11", + "version": "12.5.12", "source": { "type": "git", "url": "https://github.com/sebastianbergmann/phpunit.git", - "reference": "9b518cb40f9474572c9f0178e96ff3dc1cf02bf1" + "reference": "418e06b3b46b0d54bad749ff4907fc7dfb530199" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/sebastianbergmann/phpunit/zipball/9b518cb40f9474572c9f0178e96ff3dc1cf02bf1", - "reference": "9b518cb40f9474572c9f0178e96ff3dc1cf02bf1", + "url": "https://api.github.com/repos/sebastianbergmann/phpunit/zipball/418e06b3b46b0d54bad749ff4907fc7dfb530199", + "reference": "418e06b3b46b0d54bad749ff4907fc7dfb530199", "shasum": "" }, "require": { @@ -2897,7 +2897,7 @@ "support": { "issues": "https://github.com/sebastianbergmann/phpunit/issues", "security": "https://github.com/sebastianbergmann/phpunit/security/policy", - "source": "https://github.com/sebastianbergmann/phpunit/tree/12.5.11" + "source": "https://github.com/sebastianbergmann/phpunit/tree/12.5.12" }, "funding": [ { @@ -2921,7 +2921,7 @@ "type": "tidelift" } ], - "time": "2026-02-10T12:32:02+00:00" + "time": "2026-02-16T08:34:36+00:00" }, { "name": "sebastian/cli-parser", @@ -4070,16 +4070,16 @@ }, { "name": "webmozart/assert", - "version": "2.1.2", + "version": "2.1.4", "source": { "type": "git", "url": "https://github.com/webmozarts/assert.git", - "reference": "ce6a2f100c404b2d32a1dd1270f9b59ad4f57649" + "reference": "b39f1870fc7c3e9e4a26106df5053354b9260a33" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/webmozarts/assert/zipball/ce6a2f100c404b2d32a1dd1270f9b59ad4f57649", - "reference": "ce6a2f100c404b2d32a1dd1270f9b59ad4f57649", + "url": "https://api.github.com/repos/webmozarts/assert/zipball/b39f1870fc7c3e9e4a26106df5053354b9260a33", + "reference": "b39f1870fc7c3e9e4a26106df5053354b9260a33", "shasum": "" }, "require": { @@ -4126,9 +4126,9 @@ ], "support": { "issues": "https://github.com/webmozarts/assert/issues", - "source": "https://github.com/webmozarts/assert/tree/2.1.2" + "source": "https://github.com/webmozarts/assert/tree/2.1.4" }, - "time": "2026-01-13T14:02:24+00:00" + "time": "2026-02-17T12:17:51+00:00" } ], "aliases": [], From 91b2de2fc66a297627c12dea53ca429ce0e6ac7b Mon Sep 17 00:00:00 2001 From: Eric Wasson <229096365+Eric-Wasson@users.noreply.github.com> Date: Wed, 18 Feb 2026 11:36:31 +0100 Subject: [PATCH 441/691] Added dynamic CORS handling based on HASHTOPOLIS_BACKEND_URL --- doc/installation_guidelines/tls.md | 2 +- docker-compose.mysql.yml | 2 +- docker-compose.postgres.yml | 1 + env.mysql.example | 1 - src/api/v2/index.php | 38 ++++++++++++++++++++++++------ 5 files changed, 34 insertions(+), 10 deletions(-) diff --git a/doc/installation_guidelines/tls.md b/doc/installation_guidelines/tls.md index 662fd2633..0debb3089 100644 --- a/doc/installation_guidelines/tls.md +++ b/doc/installation_guidelines/tls.md @@ -97,7 +97,7 @@ http { } ``` -3. Update the value of `HASHTOPOLIS_BACKEND_URL` in the `.env` file to reflect the changes done above. If your server name isn't localhost, be sure to also update the comma-separated list of `HASHTOPOLIS_FRONTEND_URLS` to include new https frontend. +3. Update the value of `HASHTOPOLIS_BACKEND_URL` in the `.env` file to reflect the changes done above. 4. Start the containers ``` diff --git a/docker-compose.mysql.yml b/docker-compose.mysql.yml index 29e35d0d1..165baaa5e 100644 --- a/docker-compose.mysql.yml +++ b/docker-compose.mysql.yml @@ -17,7 +17,7 @@ services: HASHTOPOLIS_ADMIN_USER: $HASHTOPOLIS_ADMIN_USER HASHTOPOLIS_ADMIN_PASSWORD: $HASHTOPOLIS_ADMIN_PASSWORD HASHTOPOLIS_APIV2_ENABLE: $HASHTOPOLIS_APIV2_ENABLE - HASHTOPOLIS_FRONTEND_URLS: $HASHTOPOLIS_FRONTEND_URLS + HASHTOPOLIS_BACKEND_URL: $HASHTOPOLIS_BACKEND_URL depends_on: - db ports: diff --git a/docker-compose.postgres.yml b/docker-compose.postgres.yml index 8760adb43..cfce76e9b 100644 --- a/docker-compose.postgres.yml +++ b/docker-compose.postgres.yml @@ -17,6 +17,7 @@ services: HASHTOPOLIS_ADMIN_USER: $HASHTOPOLIS_ADMIN_USER HASHTOPOLIS_ADMIN_PASSWORD: $HASHTOPOLIS_ADMIN_PASSWORD HASHTOPOLIS_APIV2_ENABLE: $HASHTOPOLIS_APIV2_ENABLE + HASHTOPOLIS_BACKEND_URL: $HASHTOPOLIS_BACKEND_URL depends_on: - db ports: diff --git a/env.mysql.example b/env.mysql.example index dc2e81434..f8d3ba184 100644 --- a/env.mysql.example +++ b/env.mysql.example @@ -9,4 +9,3 @@ HASHTOPOLIS_DB_HOST=db HASHTOPOLIS_APIV2_ENABLE=0 HASHTOPOLIS_BACKEND_URL=http://localhost:8080/api/v2 -HASHTOPOLIS_FRONTEND_URLS=http://127.0.0.1:4200,http://localhost:4200,http://127.0.0.1:8080,http://localhost:8080,https://127.0.0.1,https://localhost diff --git a/src/api/v2/index.php b/src/api/v2/index.php index 0c558b591..cfd8bad56 100644 --- a/src/api/v2/index.php +++ b/src/api/v2/index.php @@ -205,22 +205,46 @@ public static function addCORSheaders(Request $request, $response) { $routeContext = RouteContext::fromRequest($request); $routingResults = $routeContext->getRoutingResults(); $methods = $routingResults->getAllowedMethods(); + $requestHeaders = $request->getHeaderLine('Access-Control-Request-Headers'); + $requestHttpOrigin = $request->getHeaderLine('HTTP_ORIGIN'); + + $envBackend = getenv('HASHTOPOLIS_BACKEND_URL'); - $frontend_urls = getenv('HASHTOPOLIS_FRONTEND_URLS'); - if ($frontend_urls !== false) { - if(in_array($request->getHeaderLine('Origin'), explode(',', $frontend_urls), true)) { - $response = $response->withHeader('Access-Control-Allow-Origin', $request->getHeaderLine('Origin')); + if ($envBackend !== false) { + $requestHttpOrigin = explode('://', $requestHttpOrigin)[1]; + $envBackend = explode('://', $envBackend)[1]; + + $envBackend = explode('/', $envBackend)[0]; + + $requestHttpOriginUrl = substr($requestHttpOrigin, 0, strrpos($requestHttpOrigin, ":")); //Needs to use strrpos in case of ipv6 because of multiple ':' characters + $envBackendUrl = substr($envBackend, 0, strrpos($envBackend, ":")); + + $localhostSynonyms = ["localhost", "127.0.0.1", "[::1]"]; + + if ($requestHttpOriginUrl === $envBackendUrl || (in_array($requestHttpOriginUrl, $localhostSynonyms) && in_array($envBackendUrl, $localhostSynonyms))) { + //Origin URL matches, now check the port too + $requestHttpOriginPort = substr($envBackend, strrpos($envBackend, ":")); //Needs to use strrpos in case of ipv6 because of multiple ':' characters + $envBackendPort = substr($envBackend, strrpos($envBackend, ":")); + + if ($requestHttpOriginPort === $envBackendPort || $requestHttpOriginPort === "4200") { + $response = $response->withHeader('Access-Control-Allow-Origin', $request->getHeaderLine('HTTP_ORIGIN')); + } + else { + error_log("CORS error: Allow-Origin port doesn't match. Try switching the frontend port back to the default value (4200) in the docker-compose."); + die(); + } } else { - error_log("CORS error: Allow-Origin doesn't match. Please make sure to include the used frontend in the .env file."); + error_log("CORS error: Allow-Origin URL doesn't match. Is the HASHTOPOLIS_BACKEND_URL in the .env file the correct one?"); + die(); } } else { - //No frontend URLs given in .env file, switch to default allow all + //No backend URL given in .env file, switch to default allow all $response = $response->withHeader('Access-Control-Allow-Origin', '*'); } - + $response = $response->withHeader('Access-Control-Allow-Methods', implode(',', $methods)); $response = $response->withHeader('Access-Control-Allow-Headers', $requestHeaders); From 74053f52cf9b93cd2e2a7f26038289387c8cf711 Mon Sep 17 00:00:00 2001 From: Eric Wasson <229096365+Eric-Wasson@users.noreply.github.com> Date: Wed, 18 Feb 2026 12:34:29 +0100 Subject: [PATCH 442/691] Improved CORS port handling --- docker-compose.mysql.yml | 3 ++- docker-compose.postgres.yml | 3 ++- src/api/v2/index.php | 9 +++++---- 3 files changed, 9 insertions(+), 6 deletions(-) diff --git a/docker-compose.mysql.yml b/docker-compose.mysql.yml index 165baaa5e..0c79101b7 100644 --- a/docker-compose.mysql.yml +++ b/docker-compose.mysql.yml @@ -18,6 +18,7 @@ services: HASHTOPOLIS_ADMIN_PASSWORD: $HASHTOPOLIS_ADMIN_PASSWORD HASHTOPOLIS_APIV2_ENABLE: $HASHTOPOLIS_APIV2_ENABLE HASHTOPOLIS_BACKEND_URL: $HASHTOPOLIS_BACKEND_URL + HASHTOPOLIS_FRONTEND_PORT: 4200 depends_on: - db ports: @@ -42,7 +43,7 @@ services: depends_on: - hashtopolis-backend ports: - - 4200:80 + - 4200:80 # When changing the host port don't forget to also update the HASHTOPOLIS_FRONTEND_PORT variable above volumes: db: hashtopolis: diff --git a/docker-compose.postgres.yml b/docker-compose.postgres.yml index cfce76e9b..4c189b7af 100644 --- a/docker-compose.postgres.yml +++ b/docker-compose.postgres.yml @@ -18,6 +18,7 @@ services: HASHTOPOLIS_ADMIN_PASSWORD: $HASHTOPOLIS_ADMIN_PASSWORD HASHTOPOLIS_APIV2_ENABLE: $HASHTOPOLIS_APIV2_ENABLE HASHTOPOLIS_BACKEND_URL: $HASHTOPOLIS_BACKEND_URL + HASHTOPOLIS_FRONTEND_PORT: 4200 depends_on: - db ports: @@ -41,7 +42,7 @@ services: depends_on: - hashtopolis-backend ports: - - 4200:80 + - 4200:80 # When changing the host port don't forget to also update the HASHTOPOLIS_FRONTEND_PORT variable above volumes: db: hashtopolis: diff --git a/src/api/v2/index.php b/src/api/v2/index.php index cfd8bad56..6bb341b0d 100644 --- a/src/api/v2/index.php +++ b/src/api/v2/index.php @@ -210,8 +210,9 @@ public static function addCORSheaders(Request $request, $response) { $requestHttpOrigin = $request->getHeaderLine('HTTP_ORIGIN'); $envBackend = getenv('HASHTOPOLIS_BACKEND_URL'); + $envFrontendPort = getenv('HASHTOPOLIS_FRONTEND_PORT'); - if ($envBackend !== false) { + if ($envBackend !== false || $envFrontendPort !== false) { $requestHttpOrigin = explode('://', $requestHttpOrigin)[1]; $envBackend = explode('://', $envBackend)[1]; @@ -224,10 +225,10 @@ public static function addCORSheaders(Request $request, $response) { if ($requestHttpOriginUrl === $envBackendUrl || (in_array($requestHttpOriginUrl, $localhostSynonyms) && in_array($envBackendUrl, $localhostSynonyms))) { //Origin URL matches, now check the port too - $requestHttpOriginPort = substr($envBackend, strrpos($envBackend, ":")); //Needs to use strrpos in case of ipv6 because of multiple ':' characters - $envBackendPort = substr($envBackend, strrpos($envBackend, ":")); + $requestHttpOriginPort = substr($requestHttpOrigin, strrpos($requestHttpOrigin, ":") + 1); //Needs to use strrpos in case of ipv6 because of multiple ':' characters + $envBackendPort = substr($envBackend, strrpos($envBackend, ":") + 1); - if ($requestHttpOriginPort === $envBackendPort || $requestHttpOriginPort === "4200") { + if ($requestHttpOriginPort === $envFrontendPort || $requestHttpOriginPort === $envBackendPort) { $response = $response->withHeader('Access-Control-Allow-Origin', $request->getHeaderLine('HTTP_ORIGIN')); } else { From bf1af7ae156a8b4e14405fea4fad392df0c7dbe3 Mon Sep 17 00:00:00 2001 From: jessevz Date: Wed, 18 Feb 2026 14:32:37 +0100 Subject: [PATCH 443/691] Able to sort on userid by changing the alias in the user features (#1935) * Able to sort on userid by changing the alias in the user features --------- Co-authored-by: jessevz --- src/dba/models/User.class.php | 2 +- src/inc/apiv2/common/AbstractBaseAPI.class.php | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/dba/models/User.class.php b/src/dba/models/User.class.php index 16c812510..841a75c7c 100644 --- a/src/dba/models/User.class.php +++ b/src/dba/models/User.class.php @@ -63,7 +63,7 @@ function getKeyValueDict(): array { static function getFeatures(): array { $dict = array(); - $dict['userId'] = ['read_only' => True, "type" => "int", "subtype" => "unset", "choices" => "unset", "null" => False, "pk" => True, "protected" => True, "private" => False, "alias" => "id", "public" => True, "dba_mapping" => False]; + $dict['userId'] = ['read_only' => True, "type" => "int", "subtype" => "unset", "choices" => "unset", "null" => False, "pk" => True, "protected" => True, "private" => False, "alias" => "userId", "public" => True, "dba_mapping" => False]; $dict['username'] = ['read_only' => True, "type" => "str(100)", "subtype" => "unset", "choices" => "unset", "null" => False, "pk" => False, "protected" => False, "private" => False, "alias" => "name", "public" => True, "dba_mapping" => False]; $dict['email'] = ['read_only' => False, "type" => "str(150)", "subtype" => "unset", "choices" => "unset", "null" => False, "pk" => False, "protected" => False, "private" => False, "alias" => "email", "public" => False, "dba_mapping" => False]; $dict['passwordHash'] = ['read_only' => True, "type" => "str(256)", "subtype" => "unset", "choices" => "unset", "null" => False, "pk" => False, "protected" => True, "private" => True, "alias" => "passwordHash", "public" => False, "dba_mapping" => False]; diff --git a/src/inc/apiv2/common/AbstractBaseAPI.class.php b/src/inc/apiv2/common/AbstractBaseAPI.class.php index 4d04821bd..fccb7cc0f 100644 --- a/src/inc/apiv2/common/AbstractBaseAPI.class.php +++ b/src/inc/apiv2/common/AbstractBaseAPI.class.php @@ -1226,7 +1226,7 @@ protected function makeOrderFilterTemplates(Request $request, array $features, s foreach ($orderings as $order) { $features_sort = $features; if (preg_match('/^(?P[-])?(?P[_a-zA-Z.]+)$/', $order, $matches)) { - // Special filtering of _id to use for uniform access to model primary key + // Special filtering of id to use for uniform access to model primary key $cast_key = $matches['key'] == 'id' ? $this->getPrimaryKey() : $matches['key']; if ($cast_key == $this->getPrimaryKey()) { $contains_primary_key = true; From b3be8422635d5dcb196fe6f2319eb537e604defb Mon Sep 17 00:00:00 2001 From: s3inlc Date: Wed, 18 Feb 2026 15:34:41 +0100 Subject: [PATCH 444/691] added --locked to cargo install to avoid dependency problems --- Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index b87a3e8ec..753d58eca 100644 --- a/Dockerfile +++ b/Dockerfile @@ -2,7 +2,7 @@ FROM rust:1.91-slim-trixie AS prebuild RUN apt-get update && apt-get install -y pkg-config libssl-dev -RUN cargo install sqlx-cli --no-default-features --features native-tls,mysql,postgres +RUN cargo install --locked sqlx-cli --no-default-features --features native-tls,mysql,postgres FROM alpine/git AS preprocess From dc3278efef976e4b6c9699a3a153934ae9dfe56b Mon Sep 17 00:00:00 2001 From: Eric Wasson <229096365+Eric-Wasson@users.noreply.github.com> Date: Wed, 18 Feb 2026 15:53:00 +0100 Subject: [PATCH 445/691] fixed php stantests --- src/inc/apiv2/helper/importCrackedHashes.routes.php | 4 +++- src/inc/apiv2/model/hashlists.routes.php | 2 +- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/src/inc/apiv2/helper/importCrackedHashes.routes.php b/src/inc/apiv2/helper/importCrackedHashes.routes.php index a16fa922b..41d2ba037 100644 --- a/src/inc/apiv2/helper/importCrackedHashes.routes.php +++ b/src/inc/apiv2/helper/importCrackedHashes.routes.php @@ -3,6 +3,8 @@ use DBA\Hash; use DBA\Hashlist; +use Middlewares\Utils\HttpErrorException; + require_once(dirname(__FILE__) . "/../common/AbstractHelperAPI.class.php"); class ImportCrackedHashesHelperAPI extends AbstractHelperAPI { @@ -74,7 +76,7 @@ public function actionPost($data): object|array|null { if (strlen($data["sourceData"]) == 0) { throw new HttpError("sourceType=paste, requires sourceData to be non-empty"); } - else if ($dummyPost["hashfield"] === false) { + else if ($dummyPost["hashfield"] == false) { throw new HttpError("sourceData not valid base64 encoding"); } } diff --git a/src/inc/apiv2/model/hashlists.routes.php b/src/inc/apiv2/model/hashlists.routes.php index a3df60c5c..1e752dfd8 100644 --- a/src/inc/apiv2/model/hashlists.routes.php +++ b/src/inc/apiv2/model/hashlists.routes.php @@ -127,7 +127,7 @@ protected function createObject(array $data): int { if (strlen($data["sourceData"]) == 0) { throw new HttpError("sourceType=paste, requires sourceData to be non-empty"); } - else if ($dummyPost["hashfield"] === false) { + else if ($dummyPost["hashfield"] == false) { throw new HttpError("sourceData not valid base64 encoding"); } } From 82e6f2b83571e388ecbc891a711ec7dfcb24fa05 Mon Sep 17 00:00:00 2001 From: Eric Wasson <229096365+Eric-Wasson@users.noreply.github.com> Date: Fri, 20 Feb 2026 10:02:26 +0100 Subject: [PATCH 446/691] Fixed ipv6 handling on about page --- src/inc/StartupConfig.class.php | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/src/inc/StartupConfig.class.php b/src/inc/StartupConfig.class.php index b8a8bda85..b7332d075 100644 --- a/src/inc/StartupConfig.class.php +++ b/src/inc/StartupConfig.class.php @@ -240,13 +240,12 @@ public function getBuild(): string { } public function getHost(): string { - $host = @$_SERVER['HTTP_HOST']; - if (str_contains($host, ":")) { - $host = substr($host, 0, strpos($host, ":")); - } + $host = @$_SERVER['SERVER_NAME']; + if ($host === null){ $host = ""; } + return $host; } } \ No newline at end of file From e29ebe84ecc09e57b0f69dcd5792bbeea9410454 Mon Sep 17 00:00:00 2001 From: Eric Wasson <229096365+Eric-Wasson@users.noreply.github.com> Date: Fri, 20 Feb 2026 14:18:29 +0100 Subject: [PATCH 447/691] Removed taskExtraDetails endpoint --- src/api/v2/index.php | 1 - .../apiv2/helper/taskExtraDetails.routes.php | 112 ------------------ src/inc/apiv2/model/tasks.routes.php | 39 ++++++ 3 files changed, 39 insertions(+), 113 deletions(-) delete mode 100644 src/inc/apiv2/helper/taskExtraDetails.routes.php diff --git a/src/api/v2/index.php b/src/api/v2/index.php index 6bb341b0d..017c73a7b 100644 --- a/src/api/v2/index.php +++ b/src/api/v2/index.php @@ -392,7 +392,6 @@ public static function addCORSheaders(Request $request, $response) { require_once($helperDir . "/resetUserPassword.routes.php"); require_once($helperDir . "/searchHashes.routes.php"); require_once($helperDir . "/setUserPassword.routes.php"); -require_once($helperDir . "/taskExtraDetails.routes.php"); require_once($helperDir . "/unassignAgent.routes.php"); $app->run(); diff --git a/src/inc/apiv2/helper/taskExtraDetails.routes.php b/src/inc/apiv2/helper/taskExtraDetails.routes.php deleted file mode 100644 index a939f606f..000000000 --- a/src/inc/apiv2/helper/taskExtraDetails.routes.php +++ /dev/null @@ -1,112 +0,0 @@ -preCommon($request); - - $taskId = $request->getQueryParams()['task']; - if ($taskId === null) { - throw new HttpErrorException("No task query param has been provided"); - } - $taskId = intval($taskId); - if ($taskId === 0) { - throw new HttpErrorException("No valid integer provided as task"); - } - $task = Factory::getTaskFactory()->get($taskId); - if ($task === null) { - throw new HttpErrorException("No task found for provided task ID"); - } - - $qF = new QueryFilter(Chunk::TASK_ID, $taskId, "="); - $chunks = Factory::getChunkFactory()->filter([Factory::FILTER => $qF]); - $currentSpeed = 0; - $cProgress = 0; - foreach ($chunks as $chunk) { - $cProgress += $chunk->getCheckpoint() - $chunk->getSkip(); - if (time() - max($chunk->getSolveTime(), $chunk->getDispatchTime()) < SConfig::getInstance()->getVal(DConfig::CHUNK_TIMEOUT) && $chunk->getProgress() < 10000) { - $currentSpeed += $chunk->getSpeed(); - } - } - - $timeChunks = $chunks; - usort($timeChunks, "Util::compareChunksTime"); - $timeSpent = 0; - $current = 0; - foreach ($timeChunks as $c) { - if ($c->getDispatchTime() > $current) { - $timeSpent += $c->getSolveTime() - $c->getDispatchTime(); - $current = $c->getSolveTime(); - } - else if ($c->getSolveTime() > $current) { - $timeSpent += $c->getSolveTime() - $current; - $current = $c->getSolveTime(); - } - } - $keyspace = $task->getKeyspace(); - $estimatedTime = ($keyspace > 0 && $cProgress > 0) ? round($timeSpent / ($cProgress / $keyspace) - $timeSpent) : 0; - $responseObject = [ - "estimatedTime" => $estimatedTime, - "timeSpent" => $timeSpent, - "currentSpeed" => $currentSpeed, - "cprogress" => $cProgress, - ]; - - return self::getMetaResponse($responseObject, $request, $response); - } - - public function actionPost($data): object|array|null { - throw new HttpError("TaskExtraDetails has no POST"); - } - - static public function register($app): void { - $baseUri = TaskExtraDetailsHelper::getBaseUri(); - - /* Allow CORS preflight requests */ - $app->options($baseUri, function (Request $request, Response $response): Response { - return $response; - }); - $app->get($baseUri, "TaskExtraDetailsHelper:handleGet"); - } - - /** - * getAccessGroups is different because it returns via another function - */ - public static function getResponse(): array|string|null { - return null; - } -} - -use Slim\App; -/** @var App $app */ -TaskExtraDetailsHelper::register($app); diff --git a/src/inc/apiv2/model/tasks.routes.php b/src/inc/apiv2/model/tasks.routes.php index c2ed6bb35..1079c906c 100644 --- a/src/inc/apiv2/model/tasks.routes.php +++ b/src/inc/apiv2/model/tasks.routes.php @@ -211,6 +211,45 @@ static function aggregateData(object $object, array &$included_data = [], ?array $aggregatedData["status"] = $status; } + + if (is_null($aggregateFieldsets) || in_array("taskExtraDetails", $aggregateFieldsets['task'])) { + $qF = new QueryFilter(Chunk::TASK_ID, $object->getId(), "="); + $chunks = Factory::getChunkFactory()->filter([Factory::FILTER => $qF]); + + $currentSpeed = 0; + $cProgress = 0; + + foreach ($chunks as $chunk) { + $cProgress += $chunk->getCheckpoint() - $chunk->getSkip(); + if (time() - max($chunk->getSolveTime(), $chunk->getDispatchTime()) < SConfig::getInstance()->getVal(DConfig::CHUNK_TIMEOUT) && $chunk->getProgress() < 10000) { + $currentSpeed += $chunk->getSpeed(); + } + } + + $timeChunks = $chunks; + usort($timeChunks, "Util::compareChunksTime"); + $timeSpent = 0; + $current = 0; + + foreach ($timeChunks as $c) { + if ($c->getDispatchTime() > $current) { + $timeSpent += $c->getSolveTime() - $c->getDispatchTime(); + $current = $c->getSolveTime(); + } + else if ($c->getSolveTime() > $current) { + $timeSpent += $c->getSolveTime() - $current; + $current = $c->getSolveTime(); + } + } + + $keyspace = $object->getKeyspace(); + $estimatedTime = ($keyspace > 0 && $cProgress > 0) ? round($timeSpent / ($cProgress / $keyspace) - $timeSpent) : 0; + + $aggregatedData["estimatedTime"] = $estimatedTime; + $aggregatedData["timeSpent"] = $timeSpent; + $aggregatedData["currentSpeed"] = $currentSpeed; + $aggregatedData["cprogress"] = $cProgress; + } } return $aggregatedData; From 383989f63665dbfe028ec091d64b966365e260c3 Mon Sep 17 00:00:00 2001 From: s3inlc Date: Fri, 20 Feb 2026 14:26:44 +0100 Subject: [PATCH 448/691] prepare for release --- doc/changelog.md | 22 ++++++++++++++++++++++ src/inc/StartupConfig.class.php | 2 +- src/inc/info.php | 0 3 files changed, 23 insertions(+), 1 deletion(-) delete mode 100644 src/inc/info.php diff --git a/doc/changelog.md b/doc/changelog.md index d1dbf1c5b..39071db63 100644 --- a/doc/changelog.md +++ b/doc/changelog.md @@ -6,6 +6,28 @@ - Replace random function for random string generation fixing a critical vulnerability (#1944). Thanks to Philipp Tekeser-Glasz from HvS-Consulting GmbH for finding and reporting this vulnerability. +- Fixed bug that included errors where not added to response (#1752) +- Fix statement building in DBA on empty filters (#1760) +- Fixed bug in legacy agentbinary update (#1802) +- Added additional check to avoid log entries if a hash just was already cracked (#1858) + +## Enhancements + +- Add `hashtopolis-` prefix to db Docker container name (#1572) +- Made responses smaller by not pretty printing the json (#1733) +- DBA mapping rework (#1762) +- Upgraded deprecated jwt library to maintained jwt library (#1785) +- Added index for timeCracked on Hash table (#1786) +- Added an improved CORS implementation(#1725) +- Implemented sparse fieldsets support on the backend (#1715) +- DBA migrations and postgres support (#1795) +- Made dockerfile smaller by using smaller slim base image (#1826) +- Refactored load.php into different use case startup parts (#1853) +- Added OAUTH authentication to backend (#1859) +- Added helper to retrieve files in the import directory (#1877) + +**Full Changelog**: https://github.com/hashtopolis/server/compare/v1.0.0-rainbow4...v1.0.0-rainbow5 + ## v1.0.0-rainbow3 -> v1.0.0-rainbow4 **Bugfixes** diff --git a/src/inc/StartupConfig.class.php b/src/inc/StartupConfig.class.php index b8a8bda85..f9145efec 100644 --- a/src/inc/StartupConfig.class.php +++ b/src/inc/StartupConfig.class.php @@ -232,7 +232,7 @@ public function getPepper(int $index): string { } public function getVersion(): string { - return "v1.0.0-rainbow4"; + return "v1.0.0-rainbow5"; } public function getBuild(): string { diff --git a/src/inc/info.php b/src/inc/info.php deleted file mode 100644 index e69de29bb..000000000 From 4d0555982da0a8469c8c241f40aec695ac917b6a Mon Sep 17 00:00:00 2001 From: coiseiw Date: Fri, 20 Feb 2026 15:55:58 +0100 Subject: [PATCH 449/691] Update the basic install manual according to the latest release --- doc/installation_guidelines/basic_install.md | 19 +++++++++++++++---- 1 file changed, 15 insertions(+), 4 deletions(-) diff --git a/doc/installation_guidelines/basic_install.md b/doc/installation_guidelines/basic_install.md index a9e1cf445..8e9ade169 100644 --- a/doc/installation_guidelines/basic_install.md +++ b/doc/installation_guidelines/basic_install.md @@ -32,12 +32,23 @@ A docker-compose file allowing to configure the docker containers for Hashtopoli mkdir hashtopolis cd hashtopolis ``` -2. Download docker-compose.yml and env.example + +Hashtopolis supports MySQL and PostgreSQL since v.1.0.0-rainbow5. You can choose between both databases: + +2. Download docker-compose.mysql.yml and env.mysql.example for MySQL ``` -wget https://raw.githubusercontent.com/hashtopolis/server/master/docker-compose.yml -wget https://raw.githubusercontent.com/hashtopolis/server/master/env.example -O .env +wget https://raw.githubusercontent.com/hashtopolis/server/dev/docker-compose.mysql.yml +wget https://raw.githubusercontent.com/hashtopolis/server/dev/env.mysql.example -O .env ``` -3. Edit the .env file and change the settings to your likings. + +**or** + +Download docker-compose.postgres.yml and env.postgres.example for PostgreSQL + ``` +wget https://raw.githubusercontent.com/hashtopolis/server/dev/docker-compose.postgres.yml +wget https://raw.githubusercontent.com/hashtopolis/server/dev/env.postgres.example -O .env +``` +3. . Edit the .env file and change the settings to your likings (for the pre-release you have to change the tag of the . ``` nano .env From bf0f9259bae502f1e4820017d89a3eca8429593f Mon Sep 17 00:00:00 2001 From: coiseiw Date: Wed, 25 Feb 2026 08:47:11 +0100 Subject: [PATCH 450/691] Update ofhe manual- - fixing style --- doc/installation_guidelines/basic_install.md | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/doc/installation_guidelines/basic_install.md b/doc/installation_guidelines/basic_install.md index 8e9ade169..649469534 100644 --- a/doc/installation_guidelines/basic_install.md +++ b/doc/installation_guidelines/basic_install.md @@ -37,7 +37,7 @@ Hashtopolis supports MySQL and PostgreSQL since v.1.0.0-rainbow5. You can choose 2. Download docker-compose.mysql.yml and env.mysql.example for MySQL ``` -wget https://raw.githubusercontent.com/hashtopolis/server/dev/docker-compose.mysql.yml +wget https://raw.githubusercontent.com/hashtopolis/server/dev/docker-compose.mysql.yml -O docker-compose.yml wget https://raw.githubusercontent.com/hashtopolis/server/dev/env.mysql.example -O .env ``` @@ -45,10 +45,10 @@ wget https://raw.githubusercontent.com/hashtopolis/server/dev/env.mysql.example Download docker-compose.postgres.yml and env.postgres.example for PostgreSQL ``` -wget https://raw.githubusercontent.com/hashtopolis/server/dev/docker-compose.postgres.yml +wget https://raw.githubusercontent.com/hashtopolis/server/dev/docker-compose.postgres.yml -O docker-compose.yml wget https://raw.githubusercontent.com/hashtopolis/server/dev/env.postgres.example -O .env -``` -3. . Edit the .env file and change the settings to your likings (for the pre-release you have to change the tag of the . + ``` +3. Edit the .env file and change the settings to your likings ``` nano .env From 1b9cdc651dd53c0a42a9c7bc632979e2562c2387 Mon Sep 17 00:00:00 2001 From: Eric Wasson <229096365+Eric-Wasson@users.noreply.github.com> Date: Wed, 25 Feb 2026 13:36:41 +0100 Subject: [PATCH 451/691] Fixed tusFileCleaning error --- src/inc/Util.class.php | 44 +++++++++++++++++++++++------------------- 1 file changed, 24 insertions(+), 20 deletions(-) diff --git a/src/inc/Util.class.php b/src/inc/Util.class.php index bc4ebce66..803858734 100755 --- a/src/inc/Util.class.php +++ b/src/inc/Util.class.php @@ -680,31 +680,35 @@ public static function zapCleaning() { * system operations and may delete files on disk. */ public static function tusFileCleaning() { - $tusDirectory = Factory::getStoredValueFactory()->get(DDirectories::TUS)->getVal(); - $uploadDirectory = $tusDirectory . DIRECTORY_SEPARATOR . "uploads" . DIRECTORY_SEPARATOR; - $metaDirectory = $tusDirectory . DIRECTORY_SEPARATOR . "meta" . DIRECTORY_SEPARATOR; - $expiration_time = time() + 3600; - if (file_exists($metaDirectory) && is_dir($metaDirectory)) { - if ($metaDirectoryHandler = opendir($metaDirectory)){ - while ($file = readdir($metaDirectoryHandler)) { - if (str_ends_with($file, ".meta")) { - $metaFile = $metaDirectory . $file; - $metadata = (array)json_decode(file_get_contents($metaFile), true) ; - if (!isset($metadata['upload_expires'])) { - continue; - } - if ($metadata['upload_expires'] > $expiration_time) { - $uploadFile = $uploadDirectory . pathinfo($file, PATHINFO_FILENAME) . ".part"; - if (file_exists($metaFile)) { - unlink($metaFile); + $tusDirectory = Factory::getStoredValueFactory()->get(DDirectories::TUS); + + if ($tusDirectory !== null) { + $tusDirectory = $tusDirectory->getVal(); + $uploadDirectory = $tusDirectory . DIRECTORY_SEPARATOR . "uploads" . DIRECTORY_SEPARATOR; + $metaDirectory = $tusDirectory . DIRECTORY_SEPARATOR . "meta" . DIRECTORY_SEPARATOR; + $expiration_time = time() + 3600; + if (file_exists($metaDirectory) && is_dir($metaDirectory)) { + if ($metaDirectoryHandler = opendir($metaDirectory)){ + while ($file = readdir($metaDirectoryHandler)) { + if (str_ends_with($file, ".meta")) { + $metaFile = $metaDirectory . $file; + $metadata = (array)json_decode(file_get_contents($metaFile), true) ; + if (!isset($metadata['upload_expires'])) { + continue; } - if (file_exists($uploadFile)){ - unlink($uploadFile); + if ($metadata['upload_expires'] > $expiration_time) { + $uploadFile = $uploadDirectory . pathinfo($file, PATHINFO_FILENAME) . ".part"; + if (file_exists($metaFile)) { + unlink($metaFile); + } + if (file_exists($uploadFile)){ + unlink($uploadFile); + } } } } + closedir($metaDirectoryHandler); } - closedir($metaDirectoryHandler); } } } From 6d0e1d745c623ead6be8df70947a97d5ce4de694 Mon Sep 17 00:00:00 2001 From: Eric Wasson <229096365+Eric-Wasson@users.noreply.github.com> Date: Wed, 25 Feb 2026 14:56:37 +0100 Subject: [PATCH 452/691] Made CrackerBinaryType.typeName unique --- src/migrations/mysql/20260225143600_crackerBinaryType.sql | 1 + src/migrations/postgres/20260225143600_crackerBinaryType.sql | 1 + 2 files changed, 2 insertions(+) create mode 100644 src/migrations/mysql/20260225143600_crackerBinaryType.sql create mode 100644 src/migrations/postgres/20260225143600_crackerBinaryType.sql diff --git a/src/migrations/mysql/20260225143600_crackerBinaryType.sql b/src/migrations/mysql/20260225143600_crackerBinaryType.sql new file mode 100644 index 000000000..751ff514d --- /dev/null +++ b/src/migrations/mysql/20260225143600_crackerBinaryType.sql @@ -0,0 +1 @@ +ALTER TABLE CrackerBinaryType ADD UNIQUE (typeName); diff --git a/src/migrations/postgres/20260225143600_crackerBinaryType.sql b/src/migrations/postgres/20260225143600_crackerBinaryType.sql new file mode 100644 index 000000000..751ff514d --- /dev/null +++ b/src/migrations/postgres/20260225143600_crackerBinaryType.sql @@ -0,0 +1 @@ +ALTER TABLE CrackerBinaryType ADD UNIQUE (typeName); From d95d157fe2b3c564a4f8579ac99c314515df3d98 Mon Sep 17 00:00:00 2001 From: s3inlc Date: Mon, 2 Mar 2026 11:23:17 +0100 Subject: [PATCH 453/691] merged changes from dev --- src/inc/apiv2/util/CorsHackMiddleware.php | 37 +++++++++++++++++++---- 1 file changed, 31 insertions(+), 6 deletions(-) diff --git a/src/inc/apiv2/util/CorsHackMiddleware.php b/src/inc/apiv2/util/CorsHackMiddleware.php index b5b079785..e7c9d2b83 100644 --- a/src/inc/apiv2/util/CorsHackMiddleware.php +++ b/src/inc/apiv2/util/CorsHackMiddleware.php @@ -21,19 +21,44 @@ public static function addCORSHeaders(Request $request, $response) { $routeContext = RouteContext::fromRequest($request); $routingResults = $routeContext->getRoutingResults(); $methods = $routingResults->getAllowedMethods(); + $requestHeaders = $request->getHeaderLine('Access-Control-Request-Headers'); + $requestHttpOrigin = $request->getHeaderLine('HTTP_ORIGIN'); + + $envBackend = getenv('HASHTOPOLIS_BACKEND_URL'); + $envFrontendPort = getenv('HASHTOPOLIS_FRONTEND_PORT'); - $frontend_urls = getenv('HASHTOPOLIS_FRONTEND_URLS'); - if ($frontend_urls !== false) { - if (in_array($request->getHeaderLine('Origin'), explode(',', $frontend_urls), true)) { - $response = $response->withHeader('Access-Control-Allow-Origin', $request->getHeaderLine('Origin')); + if ($envBackend !== false || $envFrontendPort !== false) { + $requestHttpOrigin = explode('://', $requestHttpOrigin)[1]; + $envBackend = explode('://', $envBackend)[1]; + + $envBackend = explode('/', $envBackend)[0]; + + $requestHttpOriginUrl = substr($requestHttpOrigin, 0, strrpos($requestHttpOrigin, ":")); //Needs to use strrpos in case of ipv6 because of multiple ':' characters + $envBackendUrl = substr($envBackend, 0, strrpos($envBackend, ":")); + + $localhostSynonyms = ["localhost", "127.0.0.1", "[::1]"]; + + if ($requestHttpOriginUrl === $envBackendUrl || (in_array($requestHttpOriginUrl, $localhostSynonyms) && in_array($envBackendUrl, $localhostSynonyms))) { + //Origin URL matches, now check the port too + $requestHttpOriginPort = substr($requestHttpOrigin, strrpos($requestHttpOrigin, ":") + 1); //Needs to use strrpos in case of ipv6 because of multiple ':' characters + $envBackendPort = substr($envBackend, strrpos($envBackend, ":") + 1); + + if ($requestHttpOriginPort === $envFrontendPort || $requestHttpOriginPort === $envBackendPort) { + $response = $response->withHeader('Access-Control-Allow-Origin', $request->getHeaderLine('HTTP_ORIGIN')); + } + else { + error_log("CORS error: Allow-Origin port doesn't match. Try switching the frontend port back to the default value (4200) in the docker-compose."); + die(); + } } else { - error_log("CORS error: Allow-Origin doesn't match. Please make sure to include the used frontend in the .env file."); + error_log("CORS error: Allow-Origin URL doesn't match. Is the HASHTOPOLIS_BACKEND_URL in the .env file the correct one?"); + die(); } } else { - //No frontend URLs given in .env file, switch to default allow all + //No backend URL given in .env file, switch to default allow all $response = $response->withHeader('Access-Control-Allow-Origin', '*'); } From c42a46bc642aa0806f3a776a12a3aa3c31dbcad0 Mon Sep 17 00:00:00 2001 From: s3inlc Date: Mon, 2 Mar 2026 11:27:26 +0100 Subject: [PATCH 454/691] added missing import statement --- src/inc/apiv2/model/HashlistAPI.php | 1 + 1 file changed, 1 insertion(+) diff --git a/src/inc/apiv2/model/HashlistAPI.php b/src/inc/apiv2/model/HashlistAPI.php index 9d6a8009b..27a581d79 100644 --- a/src/inc/apiv2/model/HashlistAPI.php +++ b/src/inc/apiv2/model/HashlistAPI.php @@ -2,6 +2,7 @@ namespace Hashtopolis\inc\apiv2\model; +use Hashtopolis\inc\apiv2\error\HttpError; use Hashtopolis\inc\defines\UQueryHashlist; use Hashtopolis\inc\utils\AccessUtils; use Hashtopolis\inc\utils\HashlistUtils; From bcf15d80a33cfdef378c06b0110672683c811987 Mon Sep 17 00:00:00 2001 From: s3inlc Date: Mon, 2 Mar 2026 14:27:19 +0100 Subject: [PATCH 455/691] fixed merge overwrite --- src/inc/StartupConfig.php | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/src/inc/StartupConfig.php b/src/inc/StartupConfig.php index cb79124e6..f8fe7f3ea 100644 --- a/src/inc/StartupConfig.php +++ b/src/inc/StartupConfig.php @@ -242,10 +242,7 @@ public function getBuild(): string { } public function getHost(): string { - $host = @$_SERVER['HTTP_HOST']; - if (str_contains($host, ":")) { - $host = substr($host, 0, strpos($host, ":")); - } + $host = @$_SERVER['SERVER_NAME']; if ($host === null) { $host = ""; } From 505730af2fd382ebb8837fa11f973d4c461edec4 Mon Sep 17 00:00:00 2001 From: s3inlc Date: Mon, 2 Mar 2026 14:41:12 +0100 Subject: [PATCH 456/691] renamed migrations to actual dates on pre-merge --- ...ackerBinaryType.sql => 20260302144000_cracker-binary-type.sql} | 0 ...ackerBinaryType.sql => 20260302144000_cracker-binary-type.sql} | 0 2 files changed, 0 insertions(+), 0 deletions(-) rename src/migrations/mysql/{20260225143600_crackerBinaryType.sql => 20260302144000_cracker-binary-type.sql} (100%) rename src/migrations/postgres/{20260225143600_crackerBinaryType.sql => 20260302144000_cracker-binary-type.sql} (100%) diff --git a/src/migrations/mysql/20260225143600_crackerBinaryType.sql b/src/migrations/mysql/20260302144000_cracker-binary-type.sql similarity index 100% rename from src/migrations/mysql/20260225143600_crackerBinaryType.sql rename to src/migrations/mysql/20260302144000_cracker-binary-type.sql diff --git a/src/migrations/postgres/20260225143600_crackerBinaryType.sql b/src/migrations/postgres/20260302144000_cracker-binary-type.sql similarity index 100% rename from src/migrations/postgres/20260225143600_crackerBinaryType.sql rename to src/migrations/postgres/20260302144000_cracker-binary-type.sql From 3ef9d1e0e672385ceebaed0c18aa939d8b14aaee Mon Sep 17 00:00:00 2001 From: s3inlc Date: Mon, 2 Mar 2026 14:52:56 +0100 Subject: [PATCH 457/691] catch a migration running error and prevent docker-entrypoint to continue further on failure --- docker-entrypoint.sh | 5 +++++ src/inc/startup/setup.php | 4 +++- 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/docker-entrypoint.sh b/docker-entrypoint.sh index 367142e97..fca641e31 100755 --- a/docker-entrypoint.sh +++ b/docker-entrypoint.sh @@ -70,6 +70,11 @@ done # required to trigger the initialization echo "Start initialization process..." php -f ${HASHTOPOLIS_DOCUMENT_ROOT}/inc/startup/setup.php +rc=$? # capture the status +if (( rc != 0 )); then + echo "Hashtopolis setup.php failed (exit code $rc)" >&2 + exit $rc # propagate the failure to stop docker continuing +fi echo "Initialization complete!" diff --git a/src/inc/startup/setup.php b/src/inc/startup/setup.php index 72c776d74..a7013b3a2 100755 --- a/src/inc/startup/setup.php +++ b/src/inc/startup/setup.php @@ -54,10 +54,12 @@ include(dirname(__FILE__) . "/../../install/updates/update.php"); } +$output = []; $database_uri = StartupConfig::getInstance()->getDatabaseType() . "://" . StartupConfig::getInstance()->getDatabaseUser() . ":" . StartupConfig::getInstance()->getDatabasePassword() . "@" . StartupConfig::getInstance()->getDatabaseServer() . ":" . StartupConfig::getInstance()->getDatabasePort() . "/" . StartupConfig::getInstance()->getDatabaseDB(); exec('/usr/bin/sqlx migrate run --source ' . dirname(__FILE__) . '/../../migrations/' . StartupConfig::getInstance()->getDatabaseType() . '/ -D ' . $database_uri, $output, $retval); if ($retval !== 0) { - die("Failed to run migrations: \n" . implode("\n", $output)); + echo "Failed to run migrations: \n" . implode("\n", $output); + exit(-1); } if ($initialSetup === true) { From f4ab9adf9baadfb77f8718e91b17dc6a36f6bd40 Mon Sep 17 00:00:00 2001 From: s3inlc Date: Mon, 2 Mar 2026 14:57:06 +0100 Subject: [PATCH 458/691] added classpath to usort() argument --- src/inc/apiv2/model/TaskAPI.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/inc/apiv2/model/TaskAPI.php b/src/inc/apiv2/model/TaskAPI.php index 403fd114a..9bc429ef8 100644 --- a/src/inc/apiv2/model/TaskAPI.php +++ b/src/inc/apiv2/model/TaskAPI.php @@ -235,7 +235,7 @@ static function aggregateData(object $object, array &$included_data = [], ?array } $timeChunks = $chunks; - usort($timeChunks, "Util::compareChunksTime"); + usort($timeChunks, "\Hashtopolis\inc\Util::compareChunksTime"); $timeSpent = 0; $current = 0; From c43b0a2fddf9c461ad68c54b02345303dd34dddb Mon Sep 17 00:00:00 2001 From: s3inlc Date: Tue, 3 Mar 2026 15:58:00 +0100 Subject: [PATCH 459/691] made classpath calls to usort consistent --- src/inc/apiv2/model/TaskAPI.php | 2 +- src/tasks.php | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/inc/apiv2/model/TaskAPI.php b/src/inc/apiv2/model/TaskAPI.php index 9bc429ef8..93a61c25d 100644 --- a/src/inc/apiv2/model/TaskAPI.php +++ b/src/inc/apiv2/model/TaskAPI.php @@ -235,7 +235,7 @@ static function aggregateData(object $object, array &$included_data = [], ?array } $timeChunks = $chunks; - usort($timeChunks, "\Hashtopolis\inc\Util::compareChunksTime"); + usort($timeChunks, ["Hashtopolis\inc\Util", "compareChunksTime"]); $timeSpent = 0; $current = 0; diff --git a/src/tasks.php b/src/tasks.php index 31e434449..008e9150c 100755 --- a/src/tasks.php +++ b/src/tasks.php @@ -162,7 +162,7 @@ UI::add('cProgress', $cProgress); $timeChunks = $chunks; - usort($timeChunks, "Hashtopolis\inc\Util"); + usort($timeChunks, ["Hashtopolis\inc\Util", "compareChunksTime"]); $timeSpent = 0; $current = 0; foreach ($timeChunks as $c) { From a8ba26ddc661d735e81115d613daca6132fa81dc Mon Sep 17 00:00:00 2001 From: jessevz Date: Thu, 5 Mar 2026 15:08:07 +0100 Subject: [PATCH 460/691] Fixed bug where PATCHING and POST was not checked for permissions when the object has a public attribute (#1957) Co-authored-by: jessevz --- src/inc/apiv2/common/AbstractBaseAPI.php | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/src/inc/apiv2/common/AbstractBaseAPI.php b/src/inc/apiv2/common/AbstractBaseAPI.php index 8d4d015ea..b2f4ab45a 100644 --- a/src/inc/apiv2/common/AbstractBaseAPI.php +++ b/src/inc/apiv2/common/AbstractBaseAPI.php @@ -1063,7 +1063,7 @@ protected function makeExpandables(Request $request, array $validExpandables): a } array_push($required_perms, ...$expandedPerms); } - $permissionResponse = $this->validatePermissions($required_perms, $permsExpandMatching); + $permissionResponse = $this->validatePermissions($required_perms, $request->getMethod(), $permsExpandMatching); $expands_to_remove = []; // remove expands with missing permissions @@ -1399,7 +1399,7 @@ protected function validateHashlistAccess(Request $request, User $user, string $ /** * Validate permissions */ - protected function validatePermissions(array $required_perms, array $permsExpandMatching = []): bool|array { + protected function validatePermissions(array $required_perms, string $method, array $permsExpandMatching = []): bool|array { // Retrieve permissions from RightGroup part of the User $group = Factory::getRightGroupFactory()->get($this->user->getRightGroupId()); @@ -1430,7 +1430,9 @@ protected function validatePermissions(array $required_perms, array $permsExpand // Find if all permissions are matched $missing_permissions = array_diff($required_perms, $user_available_perms); if (count($missing_permissions) > 0) { - if ($this instanceof AbstractModelAPI) { + // When there are public attributes, only these will be returned when creating the get response and the non public + // attributes are stripped away. + if ($method === "GET" && $this instanceof AbstractModelAPI) { $features = $this->getFeatures(); foreach ($features as $key => $arr) { if ($arr['public']) { @@ -1530,7 +1532,7 @@ protected function preCommon(Request $request): void { ); } - if ($this->validatePermissions($required_perms) === FALSE) { + if ($this->validatePermissions($required_perms, $request->getMethod()) === FALSE) { throw new HttpForbidden(join('||', $this->permissionErrors)); } } From 1be0103094865b725efec929b40f27e49a095a96 Mon Sep 17 00:00:00 2001 From: jessevz Date: Thu, 5 Mar 2026 15:54:23 +0100 Subject: [PATCH 461/691] Added helper for getting available tasks for agent (#1953) * Added helper for getting available tasks for agent --------- Co-authored-by: jessevz --- src/api/v2/index.php | 3 +- src/inc/apiv2/helper/GetBestTasksAgent.php | 99 ++++++++++++++++++++++ 2 files changed, 101 insertions(+), 1 deletion(-) create mode 100644 src/inc/apiv2/helper/GetBestTasksAgent.php diff --git a/src/api/v2/index.php b/src/api/v2/index.php index 3a438dadc..245d28f4d 100644 --- a/src/api/v2/index.php +++ b/src/api/v2/index.php @@ -41,6 +41,7 @@ use Hashtopolis\inc\apiv2\helper\GetAccessGroupsHelperAPI; use Hashtopolis\inc\apiv2\helper\GetAgentBinaryHelperAPI; use Hashtopolis\inc\apiv2\helper\GetCracksOfTaskHelper; +use Hashtopolis\inc\apiv2\helper\GetBestTasksAgent; use Hashtopolis\inc\apiv2\helper\GetFileHelperAPI; use Hashtopolis\inc\apiv2\helper\GetTaskProgressImageHelperAPI; use Hashtopolis\inc\apiv2\helper\GetUserPermissionHelperAPI; @@ -55,7 +56,6 @@ use Hashtopolis\inc\apiv2\helper\ResetUserPasswordHelperAPI; use Hashtopolis\inc\apiv2\helper\SearchHashesHelperAPI; use Hashtopolis\inc\apiv2\helper\SetUserPasswordHelperAPI; -use Hashtopolis\inc\apiv2\helper\TaskExtraDetailsHelper; use Hashtopolis\inc\apiv2\helper\UnassignAgentHelperAPI; use Hashtopolis\inc\apiv2\model\AccessGroupAPI; use Hashtopolis\inc\apiv2\model\AgentAPI; @@ -270,6 +270,7 @@ ExportWordlistHelperAPI::register($app); GetAccessGroupsHelperAPI::register($app); GetAgentBinaryHelperAPI::register($app); +GetBestTasksAgent::register($app); GetCracksOfTaskHelper::register($app); GetFileHelperAPI::register($app); GetTaskProgressImageHelperAPI::register($app); diff --git a/src/inc/apiv2/helper/GetBestTasksAgent.php b/src/inc/apiv2/helper/GetBestTasksAgent.php new file mode 100644 index 000000000..35b343125 --- /dev/null +++ b/src/inc/apiv2/helper/GetBestTasksAgent.php @@ -0,0 +1,99 @@ + "query", + "name" => "agent", + "schema" => [ + "type" => "integer", + "format" => "int32" + ], + "required" => true, + "example" => 1, + "description" => "The ID of the agent." + ] + ]; + } + + /** + * Endpoint to get the tasks a agent can work on + * @param Request $request + * @param Response $response + * @return Response + * @throws HttpErrorException + */ + public function handleGet(Request $request, Response $response): Response { + $this->preCommon($request); + $queryParams = $request->getQueryParams(); + $agentParam = $queryParams['agent'] ?? null; + if ($agentParam === null || !is_numeric($agentParam)) { + throw new HttpError("Invalid or missing 'agent' query parameter"); + } + $agentId = (int) $agentParam; + $agent = Factory::getAgentFactory()->get($agentId); + if ($agent == null) { + throw new HttpError("No agent has been found with provided agent id"); + } + $tasks = TaskUtils::getBestTask($agent, true); + $converted = []; + + foreach ($tasks as $task) { + $converted[] = self::obj2Resource($task); + } + $ret = self::createJsonResponse(data: $converted); + + $body = $response->getBody(); + $body->write($this->ret2json($ret)); + + return $response->withStatus(200) + ->withHeader("Content-Type", 'application/vnd.api+json;'); + } + + static public function register($app): void { + $baseUri = GetBestTasksAgent::getBaseUri(); + + /* Allow CORS preflight requests */ + $app->options($baseUri, function (Request $request, Response $response): Response { + return $response; + }); + $app->get($baseUri, "Hashtopolis\\inc\\apiv2\\helper\\GetBestTasksAgent:handleGet"); + } +} \ No newline at end of file From a93b207706bf95ebbe9736c538b3d6eb72a3fa18 Mon Sep 17 00:00:00 2001 From: jessevz Date: Tue, 10 Mar 2026 15:02:33 +0100 Subject: [PATCH 462/691] Fixed patch currentuser to change own user without permissions (#1958) * Fixed patch currentuser to change own user without permissions * Simplified the currentUser helper --------- Co-authored-by: jessevz --- src/inc/apiv2/common/AbstractBaseAPI.php | 3 +-- src/inc/apiv2/helper/CurrentUserHelperAPI.php | 12 +++++++----- 2 files changed, 8 insertions(+), 7 deletions(-) diff --git a/src/inc/apiv2/common/AbstractBaseAPI.php b/src/inc/apiv2/common/AbstractBaseAPI.php index b2f4ab45a..608f11bef 100644 --- a/src/inc/apiv2/common/AbstractBaseAPI.php +++ b/src/inc/apiv2/common/AbstractBaseAPI.php @@ -1628,8 +1628,7 @@ static function createJsonResponse(array $data = [], array $links = [], array $i * Get single Resource */ protected static function getOneResource(object $apiClass, object $object, Request $request, Response $response, int $statusCode = 200): Response { - $apiClass->preCommon($request); - + $apiClass->preCommon($request); $validExpandables = $apiClass->getExpandables(); $expands = $apiClass->makeExpandables($request, $validExpandables); diff --git a/src/inc/apiv2/helper/CurrentUserHelperAPI.php b/src/inc/apiv2/helper/CurrentUserHelperAPI.php index 9be34f565..a51b2c6ff 100644 --- a/src/inc/apiv2/helper/CurrentUserHelperAPI.php +++ b/src/inc/apiv2/helper/CurrentUserHelperAPI.php @@ -11,6 +11,9 @@ use Psr\Http\Message\ResponseInterface as Response; use Psr\Http\Message\ServerRequestInterface as Request; use Hashtopolis\inc\apiv2\model\UserAPI; +use Hashtopolis\inc\utils\AccountUtils; +use Hashtopolis\inc\utils\UserUtils; +use Slim\Routing\RouteContext; class CurrentUserHelperAPI extends AbstractHelperAPI { public static function getBaseUri(): string { @@ -59,17 +62,16 @@ public function actionPost($data): object|array|null { } // PATCH endpoint in order to patch attributes of own user, even when user doesnt have permissions to alter users - /** * @throws HTException */ public function actionPatch(Request $request, Response $response, array $args): Response { - $data = $request->getParsedBody()['data']; $this->preCommon($request); $user = $this->getCurrentUser(); - $userRoute = new UserAPI($this->container); - $userRoute->setCurrentUser($user); - return $userRoute->patchSingleObject($request, $response, $user, $data); + $data = $request->getParsedBody()['data']; + + AccountUtils::setEmail($data["attributes"]["email"], $user); + return $response->withStatus(204); } static public function register($app): void { From 792b996d908f78fcc861f7cd3acc7157cea0fb2b Mon Sep 17 00:00:00 2001 From: jessevz Date: Mon, 16 Mar 2026 08:01:11 +0100 Subject: [PATCH 463/691] Api tokens (#1965) * Added an endpoint for longer valid JWT tokens to be used as API keys --------- Co-authored-by: jessevz --- src/api/v2/index.php | 2 + src/dba/Factory.php | 12 ++ src/dba/models/JwtApiKey.php | 110 +++++++++++++++ src/dba/models/JwtApiKeyFactory.php | 92 ++++++++++++ src/dba/models/generator.php | 9 ++ src/inc/apiv2/auth/JWTBeforeHandler.php | 15 ++ src/inc/apiv2/auth/token.routes.php | 61 +++++--- src/inc/apiv2/common/AbstractBaseAPI.php | 59 ++++---- src/inc/apiv2/model/AgentAPI.php | 2 +- src/inc/apiv2/model/ApiTokenAPI.php | 131 ++++++++++++++++++ src/inc/apiv2/model/PreTaskAPI.php | 2 +- src/inc/apiv2/model/TaskAPI.php | 2 +- src/inc/utils/JwtTokenUtils.php | 31 +++++ src/inc/utils/UserUtils.php | 7 + .../mysql/20260309164000_api-key.sql | 11 ++ .../postgres/20260309164000_api-key.sql | 10 ++ 16 files changed, 496 insertions(+), 60 deletions(-) create mode 100644 src/dba/models/JwtApiKey.php create mode 100644 src/dba/models/JwtApiKeyFactory.php create mode 100644 src/inc/apiv2/model/ApiTokenAPI.php create mode 100644 src/inc/utils/JwtTokenUtils.php create mode 100644 src/migrations/mysql/20260309164000_api-key.sql create mode 100644 src/migrations/postgres/20260309164000_api-key.sql diff --git a/src/api/v2/index.php b/src/api/v2/index.php index 245d28f4d..50f06de1f 100644 --- a/src/api/v2/index.php +++ b/src/api/v2/index.php @@ -63,6 +63,7 @@ use Hashtopolis\inc\apiv2\model\AgentBinaryAPI; use Hashtopolis\inc\apiv2\model\AgentErrorAPI; use Hashtopolis\inc\apiv2\model\AgentStatAPI; +use Hashtopolis\inc\apiv2\model\ApiTokenAPI; use Hashtopolis\inc\apiv2\model\ChunkAPI; use Hashtopolis\inc\apiv2\model\ConfigAPI; use Hashtopolis\inc\apiv2\model\ConfigSectionAPI; @@ -234,6 +235,7 @@ AgentBinaryAPI::register($app); AgentErrorAPI::register($app); AgentStatAPI::register($app); +ApiTokenAPI::register($app); ChunkAPI::register($app); ConfigAPI::register($app); ConfigSectionAPI::register($app); diff --git a/src/dba/Factory.php b/src/dba/Factory.php index 1debfb909..b495cbdb3 100644 --- a/src/dba/Factory.php +++ b/src/dba/Factory.php @@ -25,6 +25,7 @@ use Hashtopolis\dba\models\HashTypeFactory; use Hashtopolis\dba\models\HealthCheckFactory; use Hashtopolis\dba\models\HealthCheckAgentFactory; +use Hashtopolis\dba\models\JwtApiKeyFactory; use Hashtopolis\dba\models\LogEntryFactory; use Hashtopolis\dba\models\NotificationSettingFactory; use Hashtopolis\dba\models\PreprocessorFactory; @@ -71,6 +72,7 @@ class Factory { private static ?HashTypeFactory $hashTypeFactory = null; private static ?HealthCheckFactory $healthCheckFactory = null; private static ?HealthCheckAgentFactory $healthCheckAgentFactory = null; + private static ?JwtApiKeyFactory $jwtApiKeyFactory = null; private static ?LogEntryFactory $logEntryFactory = null; private static ?NotificationSettingFactory $notificationSettingFactory = null; private static ?PreprocessorFactory $preprocessorFactory = null; @@ -323,6 +325,16 @@ public static function getHealthCheckAgentFactory(): HealthCheckAgentFactory { } } + public static function getJwtApiKeyFactory(): JwtApiKeyFactory { + if (self::$jwtApiKeyFactory == null) { + $f = new JwtApiKeyFactory(); + self::$jwtApiKeyFactory = $f; + return $f; + } else { + return self::$jwtApiKeyFactory; + } + } + public static function getLogEntryFactory(): LogEntryFactory { if (self::$logEntryFactory == null) { $f = new LogEntryFactory(); diff --git a/src/dba/models/JwtApiKey.php b/src/dba/models/JwtApiKey.php new file mode 100644 index 000000000..3beac6a98 --- /dev/null +++ b/src/dba/models/JwtApiKey.php @@ -0,0 +1,110 @@ +jwtApiKeyId = $jwtApiKeyId; + $this->startValid = $startValid; + $this->endValid = $endValid; + $this->userId = $userId; + $this->isRevoked = $isRevoked; + } + + function getKeyValueDict(): array { + $dict = array(); + $dict['jwtApiKeyId'] = $this->jwtApiKeyId; + $dict['startValid'] = $this->startValid; + $dict['endValid'] = $this->endValid; + $dict['userId'] = $this->userId; + $dict['isRevoked'] = $this->isRevoked; + + return $dict; + } + + static function getFeatures(): array { + $dict = array(); + $dict['jwtApiKeyId'] = ['read_only' => True, "type" => "int", "subtype" => "unset", "choices" => "unset", "null" => False, "pk" => True, "protected" => True, "private" => False, "alias" => "jwtApiKeyId", "public" => False, "dba_mapping" => False]; + $dict['startValid'] = ['read_only' => True, "type" => "int64", "subtype" => "unset", "choices" => "unset", "null" => False, "pk" => False, "protected" => False, "private" => False, "alias" => "startValid", "public" => False, "dba_mapping" => False]; + $dict['endValid'] = ['read_only' => True, "type" => "int64", "subtype" => "unset", "choices" => "unset", "null" => False, "pk" => False, "protected" => False, "private" => False, "alias" => "endValid", "public" => False, "dba_mapping" => False]; + $dict['userId'] = ['read_only' => True, "type" => "int", "subtype" => "unset", "choices" => "unset", "null" => True, "pk" => False, "protected" => False, "private" => False, "alias" => "userId", "public" => False, "dba_mapping" => False]; + $dict['isRevoked'] = ['read_only' => False, "type" => "bool", "subtype" => "unset", "choices" => "unset", "null" => True, "pk" => False, "protected" => False, "private" => False, "alias" => "isRevoked", "public" => False, "dba_mapping" => False]; + + return $dict; + } + + function getPrimaryKey(): string { + return "jwtApiKeyId"; + } + + function getPrimaryKeyValue(): ?int { + return $this->jwtApiKeyId; + } + + function getId(): ?int { + return $this->jwtApiKeyId; + } + + function setId($id): void { + $this->jwtApiKeyId = $id; + } + + /** + * Used to serialize the data contained in the model + * @return array + */ + public function expose(): array { + return get_object_vars($this); + } + + function getStartValid(): ?int { + return $this->startValid; + } + + function setStartValid(?int $startValid): void { + $this->startValid = $startValid; + } + + function getEndValid(): ?int { + return $this->endValid; + } + + function setEndValid(?int $endValid): void { + $this->endValid = $endValid; + } + + function getUserId(): ?int { + return $this->userId; + } + + function setUserId(?int $userId): void { + $this->userId = $userId; + } + + function getIsRevoked(): ?int { + return $this->isRevoked; + } + + function setIsRevoked(?int $isRevoked): void { + $this->isRevoked = $isRevoked; + } + + const JWT_API_KEY_ID = "jwtApiKeyId"; + const START_VALID = "startValid"; + const END_VALID = "endValid"; + const USER_ID = "userId"; + const IS_REVOKED = "isRevoked"; + + const PERM_CREATE = "permJwtApiKeyCreate"; + const PERM_READ = "permJwtApiKeyRead"; + const PERM_UPDATE = "permJwtApiKeyUpdate"; + const PERM_DELETE = "permJwtApiKeyDelete"; +} diff --git a/src/dba/models/JwtApiKeyFactory.php b/src/dba/models/JwtApiKeyFactory.php new file mode 100644 index 000000000..8ba88d68e --- /dev/null +++ b/src/dba/models/JwtApiKeyFactory.php @@ -0,0 +1,92 @@ + $val) { + $conv[strtolower($key)] = $val; + } + $dict = $conv; + return new JwtApiKey($dict['jwtapikeyid'], $dict['startvalid'], $dict['endvalid'], $dict['userid'], $dict['isrevoked']); + } + + /** + * @param array $options + * @param bool $single + * @return JwtApiKey|JwtApiKey[] + */ + function filter(array $options, bool $single = false): JwtApiKey|array|null { + $join = false; + if (array_key_exists('join', $options)) { + $join = true; + } + if ($single) { + if ($join) { + return parent::filter($options, $single); + } + return Util::cast(parent::filter($options, $single), JwtApiKey::class); + } + $objects = parent::filter($options, $single); + if ($join) { + return $objects; + } + $models = array(); + foreach ($objects as $object) { + $models[] = Util::cast($object, JwtApiKey::class); + } + return $models; + } + + /** + * @param string $pk + * @return ?JwtApiKey + */ + function get($pk): ?JwtApiKey { + return Util::cast(parent::get($pk), JwtApiKey::class); + } + + /** + * @param JwtApiKey $model + * @return JwtApiKey + */ + function save($model): JwtApiKey { + return Util::cast(parent::save($model), JwtApiKey::class); + } +} diff --git a/src/dba/models/generator.php b/src/dba/models/generator.php index 104055066..726e57ba7 100644 --- a/src/dba/models/generator.php +++ b/src/dba/models/generator.php @@ -287,6 +287,15 @@ ['name' => 'errors', 'read_only' => True, 'type' => 'str(65535)', 'protected' => True], ], ]; +$CONF['JwtApiKey'] = [ + 'columns' => [ + ['name' => 'jwtApiKeyId', 'read_only' => True, 'type' => 'int', 'protected' => True], + ['name' => 'startValid', 'read_only' => True, 'type' => 'int64'], + ['name' => 'endValid', 'read_only' => True, 'type' => 'int64'], + ['name' => 'userId', 'read_only' => True, 'type' => 'int', 'relation' => 'User'], + ['name' => 'isRevoked', 'read_only' => False, 'type' => 'bool'], + ], +]; $CONF['LogEntry'] = [ 'columns' => [ ['name' => 'logEntryId', 'read_only' => True, 'type' => 'int', 'protected' => True], diff --git a/src/inc/apiv2/auth/JWTBeforeHandler.php b/src/inc/apiv2/auth/JWTBeforeHandler.php index 2a4092338..1eaf318d4 100644 --- a/src/inc/apiv2/auth/JWTBeforeHandler.php +++ b/src/inc/apiv2/auth/JWTBeforeHandler.php @@ -2,6 +2,10 @@ namespace Hashtopolis\inc\apiv2\auth; +use Hashtopolis\dba\Factory; +use Hashtopolis\inc\apiv2\error\HttpError; +use Hashtopolis\inc\apiv2\error\HttpForbidden; +use Hashtopolis\inc\apiv2\model\ApiTokenAPI; use JimTools\JwtAuth\Handlers\BeforeHandlerInterface; use Psr\Http\Message\ServerRequestInterface; @@ -10,6 +14,17 @@ class JWTBeforeHandler implements BeforeHandlerInterface { * @param array{decoded: array, token: string} $arguments */ public function __invoke(ServerRequestInterface $request, array $arguments): ServerRequestInterface { + if (isset ($arguments["decoded"]["aud"]) && $arguments["decoded"]["aud"] == ApiTokenAPI::API_AUD) { + $apiTokenId = $arguments["decoded"]["jti"]; + $token = Factory::getJwtApiKeyFactory()->get($apiTokenId); + if ($token === null) { + // Should not happen + throw new HttpError("Token doesn't exists in the database"); + } + if ($token->getIsRevoked() === 1) { + throw new HttpForbidden("Token is revoked"); + } + } // adds the decoded userId and scope to the request attributes return $request->withAttribute("userId", $arguments["decoded"]["userId"])->withAttribute("scope", $arguments["decoded"]["scope"]); } diff --git a/src/inc/apiv2/auth/token.routes.php b/src/inc/apiv2/auth/token.routes.php index 11078b066..956d0b1e2 100644 --- a/src/inc/apiv2/auth/token.routes.php +++ b/src/inc/apiv2/auth/token.routes.php @@ -13,34 +13,50 @@ use Hashtopolis\dba\models\User; use Hashtopolis\dba\Factory; use Firebase\JWT\JWK; +use Hashtopolis\dba\JoinFilter; +use Hashtopolis\dba\models\RightGroup; +use Hashtopolis\inc\apiv2\error\HttpForbidden; require_once(dirname(__FILE__) . "/../../startup/include.php"); +const USER_AUD = "user_hashtopolis"; function generateTokenForUser(Request $request, string $userName, int $expires) { $jti = bin2hex(random_bytes(16)); - $requested_scopes = $request->getParsedBody() ?: ["todo.all"]; - - $valid_scopes = [ - "todo.create", - "todo.read", - "todo.update", - "todo.delete", - "todo.list", - "todo.all" - ]; - - $scopes = array_filter($requested_scopes, function ($needle) use ($valid_scopes) { - return in_array($needle, $valid_scopes); - }); - // FIXME: This is duplicated and should be passed by HttpBasicMiddleware $filter = new QueryFilter(User::USERNAME, $userName, "="); - $check = Factory::getUserFactory()->filter([Factory::FILTER => $filter]); + $jF = new JoinFilter(Factory::getRightGroupFactory(), User::RIGHT_GROUP_ID, RightGroup::RIGHT_GROUP_ID); + $joined = Factory::getUserFactory()->filter([Factory::FILTER => $filter, Factory::JOIN => $jF]); + /** @var User[] $check */ + $check = $joined[Factory::getUserFactory()->getModelName()]; + if (count($check) === 0) { + throw new HttpError("No user with this userName in the database"); + } $user = $check[0]; + if ($user->getIsValid() !== 1) { + throw new HttpForbidden("User is set to invalid"); + } - if (empty($user)) { - throw new HttpError("No user with this userName in the database"); + /** @var RightGroup[] $groupArray */ + $groupArray = $joined[Factory::getRightGroupFactory()->getModelName()]; + if (count($groupArray) === 0) { + throw new HttpError("No rightgroup found for this user"); } + $group = $groupArray[0]; + $scopes = $group->getPermissions(); + + // $requested_scopes = $request->getParsedBody() ?: ["todo.all"]; + // $valid_scopes = [ + // "todo.create", + // "todo.read", + // "todo.update", + // "todo.delete", + // "todo.list", + // "todo.all" + // ]; + + // $scopes = array_filter($requested_scopes, function ($needle) use ($valid_scopes) { + // return in_array($needle, $valid_scopes); + // }); $secret = StartupConfig::getInstance()->getPepper(0); $now = new DateTime(); @@ -52,7 +68,8 @@ function generateTokenForUser(Request $request, string $userName, int $expires) "userId" => $user->getId(), "scope" => $scopes, "iss" => "Hashtopolis", - "kid" => hash("sha256", $secret) + "kid" => hash("sha256", $secret), + "aud" => USER_AUD ]; $token = JWT::encode($payload, $secret, "HS256"); @@ -75,8 +92,7 @@ function extractBearerToken(Request $request): ?string { } // Exchanges an oauth token for a application JWT token -use Slim\App; -/** @var App $app */ +/** @var \Slim\App $app */ $app->group("/api/v2/auth/oauth-token", function (RouteCollectorProxy $group) { $group->post('', function (Request $request, Response $response, array $args): Response { @@ -159,7 +175,8 @@ function extractBearerToken(Request $request): ?string { "userId" => $request->getAttribute(('userId')), "scope" => $request->getAttribute("scope"), "iss" => "Hashtopolis", - "kid" => hash("sha256", $secret) + "kid" => hash("sha256", $secret), + "aud" => USER_AUD ]; $token = JWT::encode($payload, $secret, "HS256"); diff --git a/src/inc/apiv2/common/AbstractBaseAPI.php b/src/inc/apiv2/common/AbstractBaseAPI.php index 608f11bef..be3eae61e 100644 --- a/src/inc/apiv2/common/AbstractBaseAPI.php +++ b/src/inc/apiv2/common/AbstractBaseAPI.php @@ -59,6 +59,7 @@ use Hashtopolis\dba\ContainFilter; use Hashtopolis\dba\LikeFilter; use Hashtopolis\dba\LikeFilterInsensitive; +use Hashtopolis\dba\models\JwtApiKey; use Hashtopolis\dba\models\LogEntry; use Hashtopolis\dba\models\Preprocessor; use Hashtopolis\dba\QueryFilter; @@ -182,7 +183,7 @@ protected function getUpdateHandlers($id, $current_user): array { * Implementations should use $includedData to collect related resources that should be included * in the API response, such as related entities or additional data. */ - public static function aggregateData(object $object, array &$includedData = [], ?array $aggregateFieldsets = null): array { + public function aggregateData(object $object, array &$includedData = [], ?array $aggregateFieldsets = null): array { return []; } @@ -307,6 +308,8 @@ protected static function getModelFactory(string $model): AbstractModelFactory { return Factory::getTaskWrapperFactory(); case User::class: return Factory::getUserFactory(); + case JwtApiKey::class: + return Factory::getJwtApiKeyFactory(); } throw new HttpError("Model '$model' cannot be mapped to Factory"); } @@ -546,6 +549,7 @@ protected static function getExpandPermissions(string $expand): array { // src/inc/defines/notifications.php DAccessControl::LOGIN_ACCESS => array(NotificationSetting::PERM_CREATE, NotificationSetting::PERM_READ, NotificationSetting::PERM_UPDATE, NotificationSetting::PERM_DELETE, LogEntry::PERM_CREATE, LogEntry::PERM_DELETE, LogEntry::PERM_UPDATE), + "ApiTokenAccess" => array(JwtApiKey::PERM_CREATE, JwtApiKey::PERM_DELETE, JwtApiKey::PERM_READ, JwtApiKey::PERM_UPDATE), ); /** @@ -594,7 +598,7 @@ protected static function json2db(array $feature, mixed $obj): ?string { elseif (str_starts_with($feature['type'], 'str')) { $val = htmlentities($obj, ENT_QUOTES, "UTF-8"); } - elseif ($feature['type'] == 'array' && $feature['subtype'] == 'int') { + elseif ($feature['type'] == 'array' && ($feature['subtype'] == 'int' || $feature['subtype'] == 'string')) { $val = implode(",", $obj); } elseif ($feature['type'] == 'dict' && $feature['subtype'] == 'bool') { @@ -679,7 +683,14 @@ protected function obj2Resource(object $obj, array &$expandResult = [], ?array $ $attributes[$feature['alias']] = $apiClass::db2json($feature, $kv[$name]); } - $aggregatedData = $apiClass::aggregateData($obj, $expandResult, $aggregateFieldsets); + if ($this instanceof AbstractModelAPI && get_class($obj) !== $this->getDBAClass()) { + $apiClassObject = new $apiClass($this->container); + } else { + // use instance of this when the object is of the dba class of this api endpoint. + // This way its possible to set object attributes in the post to be used in the aggregateData function. + $apiClassObject = $this; + } + $aggregatedData = $apiClassObject->aggregateData($obj, $expandResult, $aggregateFieldsets); $attributes = array_merge($attributes, $aggregatedData); /* Build JSON::API relationship resource */ @@ -1063,7 +1074,7 @@ protected function makeExpandables(Request $request, array $validExpandables): a } array_push($required_perms, ...$expandedPerms); } - $permissionResponse = $this->validatePermissions($required_perms, $request->getMethod(), $permsExpandMatching); + $permissionResponse = $this->validatePermissions($request->getAttribute("scope"), $required_perms, $request->getMethod(), $permsExpandMatching); $expands_to_remove = []; // remove expands with missing permissions @@ -1372,44 +1383,19 @@ protected function processExpands( return $includedResources; } - /** - * Validate if user is allowed to access hashlist - * @throws HttpForbidden - * @throws ResourceNotFoundError - */ - protected function validateHashlistAccess(Request $request, User $user, string $hashlistId): Hashlist { - // TODO: Fix permissions - if (!AccessControl::getInstance($user)->hasPermission(DAccessControl::MANAGE_HASHLIST_ACCESS)) { - throw new HttpForbidden("No '" . DAccessControl::getDescription(DAccessControl::MANAGE_HASHLIST_ACCESS) . "' permission"); - } - - try { - $hashlist = HashlistUtils::getHashlist($hashlistId); - } - catch (HTException $ex) { - throw new ResourceNotFoundError($ex->getMessage()); - } - if (!AccessUtils::userCanAccessHashlists($hashlist, $user)) { - throw new HttpForbidden("No access to hashlist!"); - } - - return $hashlist; - } - /** * Validate permissions */ - protected function validatePermissions(array $required_perms, string $method, array $permsExpandMatching = []): bool|array { + protected function validatePermissions(string $permissions, array $required_perms, string $method, array $permsExpandMatching = []): bool|array { // Retrieve permissions from RightGroup part of the User - $group = Factory::getRightGroupFactory()->get($this->user->getRightGroupId()); - if ($group->getPermissions() == 'ALL') { + if ($permissions == 'ALL') { // Special (legacy) case for administrative access, enable all available permissions $all_perms = array_keys(self::$acl_mapping); $rightgroup_perms = array_combine($all_perms, array_fill(0, count($all_perms), true)); } else { - $rightgroup_perms = json_decode($group->getPermissions(), true); + $rightgroup_perms = json_decode($permissions, true); } // Validate if no undefined permissions are set in $acl_mapping @@ -1508,8 +1494,11 @@ protected function addPublicAttributeClass($class): void { */ protected function preCommon(Request $request): void { $userId = $request->getAttribute(('userId')); - $this->user = UserUtils::getUser($userId); - + $user = UserUtils::getUser($userId); + if ($user->getIsValid() != 1) { + throw new HttpForbidden("User is set to invalid"); + } + $this->user = $user; # 'Initiate' AccessControl class, by requesting instance with parameter of logged-in user. # This will cause the AccessControl class to initiate it's static 'instance' parameter, # which is in turn used at later stages (e.g. src/inc/utils/NotificationUtils.class.php) to @@ -1532,7 +1521,7 @@ protected function preCommon(Request $request): void { ); } - if ($this->validatePermissions($required_perms, $request->getMethod()) === FALSE) { + if ($this->validatePermissions($request->getAttribute("scope"), $required_perms, $request->getMethod()) === FALSE) { throw new HttpForbidden(join('||', $this->permissionErrors)); } } diff --git a/src/inc/apiv2/model/AgentAPI.php b/src/inc/apiv2/model/AgentAPI.php index 67888868f..917eeac53 100644 --- a/src/inc/apiv2/model/AgentAPI.php +++ b/src/inc/apiv2/model/AgentAPI.php @@ -54,7 +54,7 @@ protected function getUpdateHandlers($id, $current_user): array { * @param array|null $aggregateFieldsets * @return array not used here */ - static function aggregateData(object $object, array &$included_data = [], ?array $aggregateFieldsets = null): array { + function aggregateData(object $object, array &$included_data = [], ?array $aggregateFieldsets = null): array { $agentId = $object->getId(); $qFs = []; $qFs[] = new QueryFilter(Chunk::AGENT_ID, $agentId, "="); diff --git a/src/inc/apiv2/model/ApiTokenAPI.php b/src/inc/apiv2/model/ApiTokenAPI.php new file mode 100644 index 000000000..601eaea13 --- /dev/null +++ b/src/inc/apiv2/model/ApiTokenAPI.php @@ -0,0 +1,131 @@ +jwtToken = $token; + } + + private function getJwtToken(): ?string { + return $this->jwtToken; + } + + public static function getBaseUri(): string { + return "/api/v2/ui/apiTokens"; + } + + public static function getAvailableMethods(): array { + return ['GET', 'POST', 'PATCH', 'DELETE']; + } + + public static function getDBAclass(): string { + return JwtApiKey::class; + } + + public static function getToOneRelationships(): array { + return [ + 'user' => [ + 'key' => JwtApiKey::USER_ID, + + 'relationType' => User::class, + 'relationKey' => User::USER_ID, + ] + ]; + } + + public function getFormFields(): array { + // TODO Form declarations in more generic class to allow auto-generated OpenAPI specifications + return [ + "scopes" => ['type' => 'array', 'subtype' => 'string'] + ]; + } + + protected function getSingleACL(User $user, object $object): bool { + return ($object->getUserId() === $user->getId()); + } + + protected function getFilterACL(): array { + $userId = $this->getCurrentUser()->getId(); + return [ + Factory::FILTER => [ + new QueryFilter(User::USER_ID, $userId, "=") + ] + ]; + } + /** + * @throws HttpError + */ + protected function createObject(array $data): int { + //Scopes is an array of permissions in format [permFileTaskUpdate, permAgentDelete] + $scopes = explode(",", $data["scopes"]); + + $allPermissions = $this->getRightGroup($this->getCurrentUser()->getRightGroupId())->getPermissions(); + if ($allPermissions == 'ALL') { + // Special (legacy) case for administrative access, enable all available permissions + $all_perms = array_keys(self::$acl_mapping); + $rightgroup_perms = array_combine($all_perms, array_fill(0, count($all_perms), true)); + } + else { + $rightgroup_perms = json_decode($allPermissions, true); + } + $NotAllowedPerms = array_filter($rightgroup_perms, fn($v) => $v === false); + $allowedPerms = array_intersect_key($rightgroup_perms, array_flip($scopes)); + + $requestedScopes = $allowedPerms + $NotAllowedPerms; + + $secret = StartupConfig::getInstance()->getPepper(0); + $iat = $data[JwtApiKey::START_VALID]; + $expires = $data[JwtApiKey::END_VALID]; + $token = JwtTokenUtils::createKey($this->getCurrentUser()->getId(), $iat, $expires); + $jti = $token->getId(); + + $payload = [ + "iat" => $iat, + "exp" => $expires, + "jti" => $jti, + "userId" => $this->getCurrentUser()->getId(), + "scope" => json_encode($requestedScopes), + "iss" => "Hashtopolis", + "aud" => $this::API_AUD, + "kid" => hash("sha256", $secret) + ]; + + $tokenEncoded = JWT::encode($payload, $secret, "HS256"); + $this->setJwtToken($tokenEncoded); + + return $token->getId(); + } + + function aggregateData(object $object, array &$included_data = [], ?array $aggregateFieldsets = null): array { + // $token is only set in POST, this way the actual token is only returned after creation. + $aggregatedData = []; + $token = $this->getJwtToken(); + if ($token !== null) { + $aggregatedData["token"] = $token; + } + + return $aggregatedData; + } + + /** + * @throws HttpError + */ + protected function deleteObject(object $object): void { + JwtTokenUtils::deleteKey($object); + } +} \ No newline at end of file diff --git a/src/inc/apiv2/model/PreTaskAPI.php b/src/inc/apiv2/model/PreTaskAPI.php index 9ae5fa327..17b87cc72 100644 --- a/src/inc/apiv2/model/PreTaskAPI.php +++ b/src/inc/apiv2/model/PreTaskAPI.php @@ -69,7 +69,7 @@ protected function createObject(array $data): int { } //TODO make aggregate data queryable and not included by default - static function aggregateData(object $object, array &$included_data = [], ?array $aggregateFieldsets = null): array { + function aggregateData(object $object, array &$included_data = [], ?array $aggregateFieldsets = null): array { $aggregatedData = []; if (is_null($aggregateFieldsets) || array_key_exists('pretask', $aggregateFieldsets)) { diff --git a/src/inc/apiv2/model/TaskAPI.php b/src/inc/apiv2/model/TaskAPI.php index 93a61c25d..7753ea0b2 100644 --- a/src/inc/apiv2/model/TaskAPI.php +++ b/src/inc/apiv2/model/TaskAPI.php @@ -170,7 +170,7 @@ protected function createObject(array $data): int { } //TODO make aggregate data queryable and not included by default - static function aggregateData(object $object, array &$included_data = [], ?array $aggregateFieldsets = null): array { + function aggregateData(object $object, array &$included_data = [], ?array $aggregateFieldsets = null): array { $aggregatedData = []; if (is_null($aggregateFieldsets) || array_key_exists('task', $aggregateFieldsets)) { diff --git a/src/inc/utils/JwtTokenUtils.php b/src/inc/utils/JwtTokenUtils.php new file mode 100644 index 000000000..5e3b4d30d --- /dev/null +++ b/src/inc/utils/JwtTokenUtils.php @@ -0,0 +1,31 @@ +get($userId); + if ($user == null) { + throw new HttpError("Invalid user ID"); + } + + $key = new JwtApiKey(null, $startValid, $endValid, $userId, 0); + Factory::getJwtApiKeyFactory()->save($key); + return $key; + } + + public static function deleteKey(JwtApiKey $JwtToken) { + $expireTime = $JwtToken->getEndValid(); + if (time() < $expireTime) { + throw new HttpForbidden("Cannot delete API key before it expires; revoke it instead."); + } + Factory::getJwtApiKeyFactory()->delete($JwtToken); + + } +} \ No newline at end of file diff --git a/src/inc/utils/UserUtils.php b/src/inc/utils/UserUtils.php index 0bdb7230b..28e455520 100644 --- a/src/inc/utils/UserUtils.php +++ b/src/inc/utils/UserUtils.php @@ -12,6 +12,7 @@ use Hashtopolis\dba\models\NotificationSetting; use Hashtopolis\dba\models\Agent; use Hashtopolis\dba\Factory; +use Hashtopolis\dba\models\JwtApiKey; use Hashtopolis\inc\apiv2\error\HttpConflict; use Hashtopolis\inc\apiv2\error\HttpError; use Hashtopolis\inc\defines\DConfig; @@ -62,6 +63,12 @@ public static function deleteUser($userId, $adminUser) { Factory::getSessionFactory()->massDeletion([Factory::FILTER => $qF]); $qF = new QueryFilter(AccessGroupUser::USER_ID, $user->getId(), "="); Factory::getAccessGroupUserFactory()->massDeletion([Factory::FILTER => $qF]); + $qF = new QueryFilter(JwtApiKey::USER_ID, $user->getId(), "="); + $uS1 = new UpdateSet(JwtApiKey::IS_REVOKED, 1); + $uS2 = new UpdateSet(JwtApiKey::USER_ID, null); + + // Revoke all of the API keys of the user + Factory::getJwtApiKeyFactory()->massUpdate([Factory::FILTER => $qF, Factory::UPDATE => [$uS1, $uS2]]); Factory::getUserFactory()->delete($user); } diff --git a/src/migrations/mysql/20260309164000_api-key.sql b/src/migrations/mysql/20260309164000_api-key.sql new file mode 100644 index 000000000..1e937f2c5 --- /dev/null +++ b/src/migrations/mysql/20260309164000_api-key.sql @@ -0,0 +1,11 @@ +CREATE TABLE JwtApiKey ( + jwtApiKeyId INT NOT NULL AUTO_INCREMENT, + userId INTEGER, + startValid bigint NOT NULL, + endValid bigint NOT NULL, + isRevoked BOOLEAN NOT NULL DEFAULT FALSE, + PRIMARY KEY (`jwtApiKeyId`), + KEY `idx_jwtApiKey_userId` (`userId`), + CONSTRAINT `fk_jwtApiKey_user` + FOREIGN KEY (`userId`) REFERENCES `htp_User`(`userId`) +); \ No newline at end of file diff --git a/src/migrations/postgres/20260309164000_api-key.sql b/src/migrations/postgres/20260309164000_api-key.sql new file mode 100644 index 000000000..40a5d2fd4 --- /dev/null +++ b/src/migrations/postgres/20260309164000_api-key.sql @@ -0,0 +1,10 @@ +CREATE TABLE JwtApiKey ( + jwtApiKeyId SERIAL NOT NULL PRIMARY KEY, + userId INTEGER, + startValid bigint NOT NULL, + endValid bigint NOT NULL, + isRevoked BOOLEAN NOT NULL DEFAULT FALSE, + CONSTRAINT fk_JwtApiKey_user + FOREIGN KEY (userId) REFERENCES htp_User(userId) +); +CREATE INDEX idx_jwtApiKey_userId ON JwtApiKey (userId); \ No newline at end of file From b057c02d9db6f00f73c5caf4c4de1d2de62ad1d2 Mon Sep 17 00:00:00 2001 From: jessevz Date: Mon, 16 Mar 2026 09:37:58 +0100 Subject: [PATCH 464/691] Removed not working transaction for updating hash length (#1979) Co-authored-by: jessevz --- src/inc/Util.php | 2 -- 1 file changed, 2 deletions(-) diff --git a/src/inc/Util.php b/src/inc/Util.php index 75863d6f5..e5597293e 100755 --- a/src/inc/Util.php +++ b/src/inc/Util.php @@ -1442,7 +1442,6 @@ public static function setMaxHashLength($limit) { } $DB = Factory::getAgentFactory()->getDB(); - $DB->beginTransaction(); $result = $DB->query("SELECT MAX(LENGTH(" . Hash::HASH . ")) as maxLength FROM " . Factory::getHashFactory()->getModelTable()); $maxLength = $result->fetch()['maxLength']; if ($limit >= $maxLength) { @@ -1457,7 +1456,6 @@ public static function setMaxHashLength($limit) { else { return false; } - $DB->commit(); return true; } From 5435032385e86c2f019980e9054f3e87477576ea Mon Sep 17 00:00:00 2001 From: jessevz Date: Mon, 16 Mar 2026 14:22:15 +0100 Subject: [PATCH 465/691] Made it possible to update a single config (#1981) * Made it possible to update a single config --------- Co-authored-by: jessevz --- src/inc/apiv2/model/ConfigAPI.php | 4 +++ src/inc/utils/ConfigUtils.php | 60 ++++++++++++++++--------------- 2 files changed, 36 insertions(+), 28 deletions(-) diff --git a/src/inc/apiv2/model/ConfigAPI.php b/src/inc/apiv2/model/ConfigAPI.php index 8534033e5..d324b946d 100644 --- a/src/inc/apiv2/model/ConfigAPI.php +++ b/src/inc/apiv2/model/ConfigAPI.php @@ -47,6 +47,10 @@ protected function createObject(array $data): int { protected function deleteObject(object $object): void { throw new HttpError("Configs cannot be deleted via API"); } + + protected function updateObject(int $objectId, array $data): void { + ConfigUtils::updateSingleConfig($objectId, $data); + } /** * @throws HTException diff --git a/src/inc/utils/ConfigUtils.php b/src/inc/utils/ConfigUtils.php index fce182f54..c7a3ea490 100644 --- a/src/inc/utils/ConfigUtils.php +++ b/src/inc/utils/ConfigUtils.php @@ -76,6 +76,37 @@ public static function getAll() { } const DEFAULT_CONFIG_SECTION = 5; + + public static function updateSingleConfig($id, $attributes) { + $currentConfig = Factory::getConfigFactory()->get($id); + if (is_null($currentConfig)) { + throw new HTException("No config with this ID!"); + } + $newValue = $attributes[Config::VALUE] ?? null; + $name = $currentConfig->getItem(); + + if (is_null($newValue)) { + throw new HTException("No new config value provided"); + } + if ($currentConfig->getValue() === $newValue) { + return; //The value was not changed so we don't need to update it. + } + + $lengthLimits = [ + DConfig::HASH_MAX_LENGTH => 'setMaxHashLength', + DConfig::PLAINTEXT_MAX_LENGTH => 'setPlaintextMaxLength' + ]; + if (isset($lengthLimits[$name])) { + $limit = intval($newValue); + if (!Util::{$lengthLimits[$name]}($limit)) { + throw new HTException("Failed to update {$name}!"); + } + } + + SConfig::getInstance()->addValue($name, $newValue); + $currentConfig->setValue($newValue); + ConfigUtils::set($currentConfig, false); + } /** * @param array $arr id => [attributes] @@ -86,34 +117,7 @@ public static function getAll() { */ public static function updateConfigs($arr) { foreach ($arr as $id => $attributes) { - $currentConfig = Factory::getConfigFactory()->get($id); - $newValue = $attributes[Config::VALUE] ?? null; - $name = $currentConfig->getItem(); - - if (is_null($newValue)) { - throw new HTException("No new config value provided"); - } - if (is_null($currentConfig)) { - throw new HTException("No config with this ID!"); - } - if ($currentConfig->getValue() === $newValue) { - continue; //The value was not changed so we dont need to update it - } - - $lengthLimits = [ - DConfig::HASH_MAX_LENGTH => 'setMaxHashLength', - DConfig::PLAINTEXT_MAX_LENGTH => 'setPlaintextMaxLength' - ]; - if (isset($lengthLimits[$name])) { - $limit = intval($newValue); - if (!Util::{$lengthLimits[$name]}($limit)) { - throw new HTException("Failed to update {$name}!"); - } - } - - SConfig::getInstance()->addValue($name, $newValue); - $currentConfig->setValue($newValue); - ConfigUtils::set($currentConfig, false); + self::updateSingleConfig($id, $attributes); } SConfig::reload(); From 474b2406b03b4a2a4d946f71aafdd067a1f22813 Mon Sep 17 00:00:00 2001 From: jessevz Date: Mon, 16 Mar 2026 14:48:47 +0100 Subject: [PATCH 466/691] Fixed bug where content length was caclculated before compressing of payload (#1984) Co-authored-by: jessevz --- src/api/v2/index.php | 2 +- src/inc/apiv2/common/openAPISchema.routes.php | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/api/v2/index.php b/src/api/v2/index.php index 50f06de1f..668eb0054 100644 --- a/src/api/v2/index.php +++ b/src/api/v2/index.php @@ -170,11 +170,11 @@ $app->add("HttpBasicAuthentication"); $app->add("JwtAuthentication"); $app->add(new TokenAsParameterMiddleware()); -$app->add(new ContentLengthMiddleware()); // NOTE: Add any middleware which may modify the response body before adding the ContentLengthMiddleware $app->add((new DeflateEncoder())->contentType( '/^(image\/svg\\+xml|text\/.*|application\/json|"application\/vnd\.api+json)(;.*)?$/' ) ); +$app->add(new ContentLengthMiddleware()); // NOTE: Add any middleware which may modify the response body before adding the ContentLengthMiddleware $app->add(new CorsHackMiddleware()); // NOTE: The RoutingMiddleware should be added after our CORS middleware so routing is performed first // NOTE: The ErrorMiddleware should be added after any middleware which may modify the response body diff --git a/src/inc/apiv2/common/openAPISchema.routes.php b/src/inc/apiv2/common/openAPISchema.routes.php index a25542c36..dd6470242 100644 --- a/src/inc/apiv2/common/openAPISchema.routes.php +++ b/src/inc/apiv2/common/openAPISchema.routes.php @@ -949,7 +949,7 @@ ]; $body = $response->getBody(); - $body->write(json_encode($result, JSON_UNESCAPED_SLASHES | JSON_PRETTY_PRINT | JSON_THROW_ON_ERROR)); + $body->write(json_encode($result, JSON_UNESCAPED_SLASHES | JSON_THROW_ON_ERROR)); return $response->withStatus(200) ->withHeader("Content-Type", "application/json"); From bcd46ca80be95ce65bb75908e15d3f9797e8c678 Mon Sep 17 00:00:00 2001 From: jessevz Date: Tue, 17 Mar 2026 11:58:50 +0100 Subject: [PATCH 467/691] Better error message when login in with invalid user (#1991) * Better error message when login in with invalid user --------- Co-authored-by: jessevz --- ci/apiv2/test_user.py | 4 ++-- src/inc/apiv2/auth/HashtopolisAuthenticator.php | 3 ++- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/ci/apiv2/test_user.py b/ci/apiv2/test_user.py index cdbb3c9fb..2bc411a51 100644 --- a/ci/apiv2/test_user.py +++ b/ci/apiv2/test_user.py @@ -49,8 +49,8 @@ def test_disable_enable_user(self): helper = Helper() with self.assertRaises(HashtopolisError) as e: helper._test_authentication(user.name, password) - self.assertEqual(e.exception.status_code, 401) - self.assertEqual(e.exception.title, f"Authentication failed") + self.assertEqual(e.exception.status_code, 403) + self.assertEqual(e.exception.title, f"Cannot log in. Please contact your administrator for further information") # Enable user user.isValid = True diff --git a/src/inc/apiv2/auth/HashtopolisAuthenticator.php b/src/inc/apiv2/auth/HashtopolisAuthenticator.php index 6db3726eb..763f3168d 100644 --- a/src/inc/apiv2/auth/HashtopolisAuthenticator.php +++ b/src/inc/apiv2/auth/HashtopolisAuthenticator.php @@ -11,6 +11,7 @@ use Hashtopolis\dba\Factory; use Hashtopolis\dba\models\User; use Hashtopolis\dba\QueryFilter; +use Hashtopolis\inc\apiv2\error\HttpForbidden; use Tuupola\Middleware\HttpBasicAuthentication\AuthenticatorInterface; use Hashtopolis\inc\Util; @@ -27,7 +28,7 @@ public function __invoke(array $arguments): bool { } if ($user->getIsValid() != 1) { - return false; + throw new HttpForbidden("Cannot log in. Please contact your administrator for further information"); } else if (!Encryption::passwordVerify($password, $user->getPasswordSalt(), $user->getPasswordHash())) { Util::createLogEntry(DLogEntryIssuer::USER, $user->getId(), DLogEntry::WARN, "Failed login attempt due to wrong password!"); From df991e26dc2c058f1cedd6a9bf99753493ea67a6 Mon Sep 17 00:00:00 2001 From: jessevz Date: Tue, 17 Mar 2026 13:34:09 +0100 Subject: [PATCH 468/691] Removed rule splitting --- src/inc/api/APISendBenchmark.php | 21 ----- src/inc/defines/DConfig.php | 6 -- src/inc/utils/TaskUtils.php | 90 ------------------- .../20260317120000_remove-rule-split.sql | 2 + .../20260317120000_remove-rule-split.sql | 2 + 5 files changed, 4 insertions(+), 117 deletions(-) create mode 100644 src/migrations/mysql/20260317120000_remove-rule-split.sql create mode 100644 src/migrations/postgres/20260317120000_remove-rule-split.sql diff --git a/src/inc/api/APISendBenchmark.php b/src/inc/api/APISendBenchmark.php index 6ea9cbe8d..eb96182d4 100644 --- a/src/inc/api/APISendBenchmark.php +++ b/src/inc/api/APISendBenchmark.php @@ -34,7 +34,6 @@ public function execute($QUERY = array()) { if ($task == null) { $this->sendErrorResponse(PActions::SEND_BENCHMARK, "Invalid task ID!"); } - $taskWrapper = Factory::getTaskWrapperFactory()->get($task->getTaskWrapperId()); $qF1 = new QueryFilter(Assignment::AGENT_ID, $this->agent->getId(), "="); $qF2 = new QueryFilter(Assignment::TASK_ID, $task->getId(), "="); @@ -56,26 +55,6 @@ public function execute($QUERY = array()) { DServerLog::log(DServerLog::ERROR, "Invalid speed test benchmark result!", [$this->agent, $benchmark]); $this->sendErrorResponse(PActions::SEND_BENCHMARK, "Invalid benchmark result!"); } - - // Here we check if the benchmark result would require to split the task and check if the task can be split - if (SConfig::getInstance()->getVal(DConfig::RULE_SPLIT_DISABLE) == 0 && $task->getUsePreprocessor() == 0 && $split[1] > $task->getChunkTime() * 1000 * 2 && $taskWrapper->getTaskType() == DTaskTypes::NORMAL) { - // test if we have a large rule file - DServerLog::log(DServerLog::INFO, "Potential rule split required", [$this->agent, $task]); - /** @var $files File[] */ - $files = Util::getFileInfo($task, AccessUtils::getAccessGroupsOfAgent($this->agent))[3]; - foreach ($files as $file) { - if ($file->getFileType() == DFileType::RULE) { - // test if splitting makes sense here - if (Util::countLines(Factory::getStoredValueFactory()->get(DDirectories::FILES)->getVal() . "/" . $file->getFilename()) > $split[1] / 1000 / $task->getChunkTime() || SConfig::getInstance()->getVal(DConfig::RULE_SPLIT_ALWAYS)) { - // --> split - DServerLog::log(DServerLog::INFO, "Rule splitting possible on file", [$this->agent, $task, $file]); - TaskUtils::splitByRules($task, $taskWrapper, $files, $file, $split); - $this->sendErrorResponse(PActions::SEND_BENCHMARK, "Task was split due to benchmark!"); - } - } - } - } - break; case PValuesBenchmarkType::RUN_TIME: if (!is_numeric($benchmark) || $benchmark <= 0) { diff --git a/src/inc/defines/DConfig.php b/src/inc/defines/DConfig.php index 8fd9df13f..8b6cd5af2 100644 --- a/src/inc/defines/DConfig.php +++ b/src/inc/defines/DConfig.php @@ -158,9 +158,6 @@ public static function getConfigType($config) { DConfig::EMAIL_SENDER_NAME => DConfigType::STRING_INPUT, DConfig::DEFAULT_BENCH => DConfigType::TICKBOX, DConfig::SHOW_TASK_PERFORMANCE => DConfigType::TICKBOX, - DConfig::RULE_SPLIT_ALWAYS => DConfigType::TICKBOX, - DConfig::RULE_SPLIT_SMALL_TASKS => DConfigType::TICKBOX, - DConfig::RULE_SPLIT_DISABLE => DConfigType::TICKBOX, DConfig::AGENT_STAT_LIMIT => DConfigType::NUMBER_INPUT, DConfig::AGENT_DATA_LIFETIME => DConfigType::NUMBER_INPUT, DConfig::AGENT_STAT_TENSION => DConfigType::TICKBOX, @@ -232,9 +229,6 @@ public static function getConfigDescription($config) { DConfig::EMAIL_SENDER_NAME => "Sender's name on emails sent from " . APP_NAME . ".", DConfig::DEFAULT_BENCH => "Use speed benchmark as default.", DConfig::SHOW_TASK_PERFORMANCE => "Show cracks/minute for tasks which are running.", - DConfig::RULE_SPLIT_SMALL_TASKS => "When rule splitting is applied for tasks, always make them a small task.", - DConfig::RULE_SPLIT_ALWAYS => "Even do rule splitting when there are not enough rules but just the benchmark is too high.
    Can result in subtasks with just one rule.", - DConfig::RULE_SPLIT_DISABLE => "Disable automatic task splitting with large rule files.", DConfig::AGENT_STAT_LIMIT => "Maximal number of data points showing of agent gpu data.", DConfig::AGENT_DATA_LIFETIME => "Minimum time in seconds how long agent gpu/cpu utilisation and gpu temperature data is kept on the server.", DConfig::AGENT_STAT_TENSION => "Draw straigth lines in agent data graph instead of bezier curves.", diff --git a/src/inc/utils/TaskUtils.php b/src/inc/utils/TaskUtils.php index c2ab206f5..93a369601 100644 --- a/src/inc/utils/TaskUtils.php +++ b/src/inc/utils/TaskUtils.php @@ -912,96 +912,6 @@ public static function createTask($hashlistId, $name, $attackCmd, $chunkTime, $s return $task; } - /** - * Splits a given task into subtasks within a supertask by splitting the rule file - * @param Task $task - * @param TaskWrapper $taskWrapper - * @param File[] $files - * @param File $splitFile - * @param array $split - */ - public static function splitByRules($task, $taskWrapper, $files, $splitFile, $split) { - // calculate how much we need to split - $numSplits = floor($split[1] / 1000 / $task->getChunkTime()); - // replace countLines with fileLineCount? Could be a better option: not OS-dependent - $numLines = Util::countLines(Factory::getStoredValueFactory()->get(DDirectories::FILES)->getVal() . "/" . $splitFile->getFilename()); - $linesPerFile = floor($numLines / $numSplits) + 1; - - // create the temporary rule files - $newFiles = []; - $content = explode("\n", str_replace("\r\n", "\n", file_get_contents(Factory::getStoredValueFactory()->get(DDirectories::FILES)->getVal() . "/" . $splitFile->getFilename()))); - $count = 0; - $taskId = $task->getId(); - for ($i = 0; $i < $numLines; $i += $linesPerFile, $count++) { - $copy = []; - for ($j = $i; $j < $i + $linesPerFile && $j < sizeof($content); $j++) { - $copy[] = $content[$j]; - } - $filename = $splitFile->getFilename() . "_p$taskId-$count"; - $path = Factory::getStoredValueFactory()->get(DDirectories::FILES)->getVal() . "/" . $splitFile->getFilename() . "_p$taskId-$count"; - file_put_contents($path, implode("\n", $copy) . "\n"); - $f = new File(null, $filename, Util::filesize($path), $splitFile->getIsSecret(), DFileType::TEMPORARY, $taskWrapper->getAccessGroupId(), Util::fileLineCount($path)); - $f = Factory::getFileFactory()->save($f); - $newFiles[] = $f; - } - - // take out the split file from the file list - for ($i = 0; $i < sizeof($files); $i++) { - if ($files[$i]->getId() == $splitFile->getId()) { - unset($files[$i]); - break; - } - } - - // create new tasks as supertask - $newWrapper = new TaskWrapper(null, 0, 0, DTaskTypes::SUPERTASK, $taskWrapper->getHashlistId(), $taskWrapper->getAccessGroupId(), $task->getTaskName() . " (From Rule Split)", 0, 0); - $newWrapper = Factory::getTaskWrapperFactory()->save($newWrapper); - $prio = sizeof($newFiles) + 1; - foreach ($newFiles as $newFile) { - $newTask = new Task(null, - "Part " . (sizeof($newFiles) + 2 - $prio), - str_replace($splitFile->getFilename(), $newFile->getFilename(), $task->getAttackCmd()), - $task->getChunkTime(), - $task->getStatusTimer(), - 0, - 0, - $prio, - $task->getMaxAgents(), - $task->getColor(), - (SConfig::getInstance()->getVal(DConfig::RULE_SPLIT_SMALL_TASKS) == 0) ? 0 : 1, - $task->getIsCpuTask(), - $task->getUseNewBench(), - $task->getSkipKeyspace(), - $task->getCrackerBinaryId(), - $task->getCrackerBinaryTypeId(), - $newWrapper->getId(), - 0, - '', - 0, - 0, - 0, - 0, - '' - ); - $newTask = Factory::getTaskFactory()->save($newTask); - $taskFiles = []; - $taskFiles[] = new FileTask(null, $newFile->getId(), $newTask->getId()); - foreach ($files as $f) { - $taskFiles[] = new FileTask(null, $f->getId(), $newTask->getId()); - FileDownloadUtils::addDownload($f->getId()); - } - Factory::getFileTaskFactory()->massSave($taskFiles); - $prio--; - } - $newWrapper->setPriority($taskWrapper->getPriority()); - $newWrapper->setMaxAgents($taskWrapper->getMaxAgents()); - Factory::getTaskWrapperFactory()->update($newWrapper); - - // cleanup - TaskUtils::deleteTask($task); - Factory::getTaskWrapperFactory()->delete($taskWrapper); - } - /** * @param $agent Agent * @param bool $all set true to get all matching tasks for this agent diff --git a/src/migrations/mysql/20260317120000_remove-rule-split.sql b/src/migrations/mysql/20260317120000_remove-rule-split.sql new file mode 100644 index 000000000..aa9e389d0 --- /dev/null +++ b/src/migrations/mysql/20260317120000_remove-rule-split.sql @@ -0,0 +1,2 @@ +DELETE FROM Config +where item in ('ruleSplitSmallTasks', 'ruleSplitAlways', 'ruleSplitDisable'); \ No newline at end of file diff --git a/src/migrations/postgres/20260317120000_remove-rule-split.sql b/src/migrations/postgres/20260317120000_remove-rule-split.sql new file mode 100644 index 000000000..aa9e389d0 --- /dev/null +++ b/src/migrations/postgres/20260317120000_remove-rule-split.sql @@ -0,0 +1,2 @@ +DELETE FROM Config +where item in ('ruleSplitSmallTasks', 'ruleSplitAlways', 'ruleSplitDisable'); \ No newline at end of file From 29c0cffc018bc6cacc7a162985c90cec86e65358 Mon Sep 17 00:00:00 2001 From: jessevz Date: Tue, 17 Mar 2026 13:41:57 +0100 Subject: [PATCH 469/691] Fixed copilot review --- src/inc/api/APISendBenchmark.php | 7 ------- 1 file changed, 7 deletions(-) diff --git a/src/inc/api/APISendBenchmark.php b/src/inc/api/APISendBenchmark.php index eb96182d4..e63a479f3 100644 --- a/src/inc/api/APISendBenchmark.php +++ b/src/inc/api/APISendBenchmark.php @@ -8,19 +8,12 @@ use Hashtopolis\inc\agent\PValues; use Hashtopolis\inc\agent\PValuesBenchmarkType; use Hashtopolis\inc\defines\DConfig; -use Hashtopolis\inc\defines\DDirectories; -use Hashtopolis\inc\defines\DTaskTypes; -use Hashtopolis\inc\utils\AccessUtils; -use Hashtopolis\inc\defines\DFileType; use Hashtopolis\inc\defines\DServerLog; use Hashtopolis\dba\models\Agent; use Hashtopolis\dba\models\Assignment; use Hashtopolis\dba\QueryFilter; use Hashtopolis\dba\Factory; -use Hashtopolis\dba\models\File; use Hashtopolis\inc\SConfig; -use Hashtopolis\inc\utils\TaskUtils; -use Hashtopolis\inc\Util; class APISendBenchmark extends APIBasic { public function execute($QUERY = array()) { From 43467c5d1f86a529758a11beebc5c62ffcc729fc Mon Sep 17 00:00:00 2001 From: jessevz Date: Tue, 17 Mar 2026 14:41:27 +0100 Subject: [PATCH 470/691] Fixed classnames by removing the package from the name (#1987) Co-authored-by: jessevz --- src/inc/apiv2/common/AbstractBaseAPI.php | 4 +++- src/inc/apiv2/common/openAPISchema.routes.php | 11 ++++++----- 2 files changed, 9 insertions(+), 6 deletions(-) diff --git a/src/inc/apiv2/common/AbstractBaseAPI.php b/src/inc/apiv2/common/AbstractBaseAPI.php index be3eae61e..2eae1d2d1 100644 --- a/src/inc/apiv2/common/AbstractBaseAPI.php +++ b/src/inc/apiv2/common/AbstractBaseAPI.php @@ -421,7 +421,9 @@ final protected function getObjectTypeName(mixed $obj): string { } /* Use the API class Name as type identifier written in camelCase*/ - return lcfirst(substr($apiClass, 0, -3)); + $name_parts = explode('\\', $apiClass); + $name = end($name_parts); + return lcfirst(substr($name, 0, -3)); } /** diff --git a/src/inc/apiv2/common/openAPISchema.routes.php b/src/inc/apiv2/common/openAPISchema.routes.php index dd6470242..0ad869c81 100644 --- a/src/inc/apiv2/common/openAPISchema.routes.php +++ b/src/inc/apiv2/common/openAPISchema.routes.php @@ -102,7 +102,6 @@ /* Quirk to receive className, since it is hidden in a protected variable */ $reflectionOfRoute = new \ReflectionObject($route); $protectedCallable = $reflectionOfRoute->getProperty('callable'); - $protectedCallable->setAccessible(true); $reflectionCallable = ($protectedCallable->getValue($route)); /* Assume only one method per route call */ @@ -123,9 +122,10 @@ $class = new $apiClassName($app->getContainer()); if (!($class instanceof AbstractModelAPI)) { - $name = $class::class; + $name_parts = explode('\\', $class::class); + $name = end($name_parts); $apiMethod = ($apiMethod == "processPost" && $name != "ImportFileHelperAPI") ? "actionPost" : $apiMethod; - $reflectionApiMethod = new ReflectionMethod($name, $apiMethod); + $reflectionApiMethod = new ReflectionMethod($class::class, $apiMethod); $paths[$path][$method]["description"] = OpenAPISchemaUtils::parsePhpDoc($reflectionApiMethod->getDocComment()); $parameters = $class->getCreateValidFeatures(); $properties = OpenAPISchemaUtils::makeProperties($parameters); @@ -135,7 +135,7 @@ "properties" => $properties, ]; if ($method == "post") { - $reflectionMethodFormFields = new ReflectionMethod($name, "getFormFields"); + $reflectionMethodFormFields = new ReflectionMethod($class::class, "getFormFields"); $bodyDescription = OpenAPISchemaUtils::parsePhpDoc($reflectionMethodFormFields->getDocComment()); $paths[$path][$method]["requestBody"] = [ "description" => $bodyDescription, @@ -188,7 +188,8 @@ /* Quick to find out if single parameter object is used */ $singleObject = ((strstr($path, '/{id:')) !== false); - $name = substr($class->getDBAClass(), 4); + $name_parts = explode('\\', $class->getDBAClass()); + $name = end($name_parts); $uri = $class->getBaseUri(); $isRelation = (strstr($path, "/relationships/")) !== false; From 4379d4fe60cbdcdb53d647125aefeae427bf2668 Mon Sep 17 00:00:00 2001 From: jessevz Date: Tue, 17 Mar 2026 14:44:08 +0100 Subject: [PATCH 471/691] Parse comma in filter (#1985) * Made it possible to use a ',' for filters with 1 value * Fixed bug in pagination filter when used at tasks table, becasause of ambigious keys because taskwrapper and task share columns with the same name --------- Co-authored-by: jessevz --- src/dba/PaginationFilter.php | 4 ++-- src/inc/apiv2/common/AbstractBaseAPI.php | 7 +++++-- 2 files changed, 7 insertions(+), 4 deletions(-) diff --git a/src/dba/PaginationFilter.php b/src/dba/PaginationFilter.php index 9687860ce..e4e3a619e 100644 --- a/src/dba/PaginationFilter.php +++ b/src/dba/PaginationFilter.php @@ -40,8 +40,8 @@ function getQueryString(AbstractModelFactory $factory, bool $includeTable = fals //ex. SELECT hashTypeId, description, isSalted, isSlowHash FROM HashType // where (HashType.isSalted < 1) OR (HashType.isSalted = 1 and HashType.hashTypeId < 12600) // ORDER BY HashType.isSalted DESC, HashType.hashTypeId DESC LIMIT 25; - $queryString = "(" . $table . AbstractModelFactory::getMappedModelKey($factory->getNullObject(), $this->key) . $this->operator . "?" . ") OR (" . AbstractModelFactory::getMappedModelKey($factory->getNullObject(), $this->key) . "=" . "?" - . " AND " . AbstractModelFactory::getMappedModelKey($factory->getNullObject(), $this->tieBreakerKey) . $this->operator . "?"; + $queryString = "(" . $table . AbstractModelFactory::getMappedModelKey($factory->getNullObject(), $this->key) . $this->operator . "?" . ") OR (" . $table . AbstractModelFactory::getMappedModelKey($factory->getNullObject(), $this->key) . "=" . "?" + . " AND " . $table . AbstractModelFactory::getMappedModelKey($factory->getNullObject(), $this->tieBreakerKey) . $this->operator . "?"; if (count($this->filters) > 0) { $queryString = $queryString . " AND " . implode(" AND ", $parts); } diff --git a/src/inc/apiv2/common/AbstractBaseAPI.php b/src/inc/apiv2/common/AbstractBaseAPI.php index 2eae1d2d1..52baa3d13 100644 --- a/src/inc/apiv2/common/AbstractBaseAPI.php +++ b/src/inc/apiv2/common/AbstractBaseAPI.php @@ -1152,7 +1152,11 @@ protected function makeFilter(array $filters, object $apiClass, array &$joinFilt throw new HttpForbidden("Filter parameter '" . $filter . "' is not valid (key not valid field)"); }; - $valueList = explode(",", $value); + // Only __in and __nin support comma-separated multiple values; + // all other operators treat the value as a literal string. + $operator = $matches['operator']; + $isListOperator = in_array($operator, ['__in', '__nin']); + $valueList = $isListOperator ? explode(",", $value) : [$value]; // TODO Merge/Combine with validate parameters foreach ($valueList as &$value) { @@ -1180,7 +1184,6 @@ protected function makeFilter(array $filters, object $apiClass, array &$joinFilt $amount_values = count($valueList); $single_val = $valueList[0]; - $operator = $matches['operator']; $query_operator = ""; switch (true) { case (($operator == '__eq' | $operator == '') && $amount_values == 1): From d8defb2b66e789d1775643cda45f648bcab89150 Mon Sep 17 00:00:00 2001 From: jessevz Date: Tue, 17 Mar 2026 14:50:12 +0100 Subject: [PATCH 472/691] Removed rulesplit constants --- src/inc/defines/DConfig.php | 3 --- 1 file changed, 3 deletions(-) diff --git a/src/inc/defines/DConfig.php b/src/inc/defines/DConfig.php index 8b6cd5af2..4372b061f 100644 --- a/src/inc/defines/DConfig.php +++ b/src/inc/defines/DConfig.php @@ -18,9 +18,6 @@ class DConfig { const BLACKLIST_CHARS = "blacklistChars"; const DISP_TOLERANCE = "disptolerance"; const DEFAULT_BENCH = "defaultBenchmark"; - const RULE_SPLIT_SMALL_TASKS = "ruleSplitSmallTasks"; - const RULE_SPLIT_ALWAYS = "ruleSplitAlways"; - const RULE_SPLIT_DISABLE = "ruleSplitDisable"; const AGENT_DATA_LIFETIME = "agentDataLifetime"; const DISABLE_TRIMMING = "disableTrimming"; const PRIORITY_0_START = "priority0Start"; From 72d390a9679a0d43e26a4a813dd37d768ce7d479 Mon Sep 17 00:00:00 2001 From: Eric Wasson <229096365+Eric-Wasson@users.noreply.github.com> Date: Wed, 18 Mar 2026 09:49:06 +0100 Subject: [PATCH 473/691] Moved display error handling to dockerfile --- Dockerfile | 5 +++-- ci/server/setup.php | 4 ---- src/api/v2/index.php | 2 +- src/inc/startup/include.php | 3 --- src/inc/startup/load.php | 3 --- src/inc/startup/setup.php | 3 --- 6 files changed, 4 insertions(+), 16 deletions(-) diff --git a/Dockerfile b/Dockerfile index 77393a70d..84fc05343 100644 --- a/Dockerfile +++ b/Dockerfile @@ -122,7 +122,7 @@ RUN yes | pecl install xdebug && docker-php-ext-enable xdebug \ \ # Configuring PHP \ && touch "/usr/local/etc/php/conf.d/custom.ini" \ - && echo "display_errors = on" >> /usr/local/etc/php/conf.d/custom.ini \ + && echo "display_errors = 1" >> /usr/local/etc/php/conf.d/custom.ini \ && echo "memory_limit = 256m" >> /usr/local/etc/php/conf.d/custom.ini \ && echo "upload_max_filesize = 256m" >> /usr/local/etc/php/conf.d/custom.ini \ && echo "max_execution_time = 60" >> /usr/local/etc/php/conf.d/custom.ini \ @@ -163,7 +163,8 @@ RUN mv "$PHP_INI_DIR/php.ini-production" "$PHP_INI_DIR/php.ini" \ && touch "/usr/local/etc/php/conf.d/custom.ini" \ && echo "memory_limit = 256m" >> /usr/local/etc/php/conf.d/custom.ini \ && echo "upload_max_filesize = 256m" >> /usr/local/etc/php/conf.d/custom.ini \ - && echo "max_execution_time = 60" >> /usr/local/etc/php/conf.d/custom.ini + && echo "max_execution_time = 60" >> /usr/local/etc/php/conf.d/custom.ini \ + && echo "display_errors = 0" >> /usr/local/etc/php/conf.d/custom.ini USER www-data # ----END---- diff --git a/ci/server/setup.php b/ci/server/setup.php index 46c93037a..8eb4b7911 100644 --- a/ci/server/setup.php +++ b/ci/server/setup.php @@ -38,7 +38,3 @@ fwrite(STDERR, "Failed to initialize database: " . $e->getMessage()); exit(-1); } - -$load = file_get_contents($envPath . "src/inc/startup/load.php"); -$load = str_replace('ini_set("display_errors", "0");', 'ini_set("display_errors", "1");', $load); -file_put_contents($envPath . "src/inc/startup/load.php", $load); diff --git a/src/api/v2/index.php b/src/api/v2/index.php index 668eb0054..40731655c 100644 --- a/src/api/v2/index.php +++ b/src/api/v2/index.php @@ -8,7 +8,7 @@ date_default_timezone_set("UTC"); error_reporting(E_ALL ^ E_DEPRECATED); -ini_set("display_errors", '1'); + /** * Treat warnings as error, very useful during unit testing. * TODO: How-ever during Xdebug debugging under VS Code, this is very diff --git a/src/inc/startup/include.php b/src/inc/startup/include.php index 807b492d5..71bd49b74 100755 --- a/src/inc/startup/include.php +++ b/src/inc/startup/include.php @@ -1,10 +1,7 @@ Date: Wed, 18 Mar 2026 10:55:32 +0100 Subject: [PATCH 474/691] Fixed faq and tests --- doc/faq_tips/faq.md | 3 ++- src/inc/Util.php | 3 +++ 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/doc/faq_tips/faq.md b/doc/faq_tips/faq.md index ce50884fc..110d4b560 100644 --- a/doc/faq_tips/faq.md +++ b/doc/faq_tips/faq.md @@ -303,7 +303,7 @@ If there is enough RAM available, it is possible to raise PHP's memory limit in 1. **Create a file `custom.ini` next to your `docker-compose.yml`** Adjust your desired memory limit (`M` for Megabytes, or `G` for Gigabytes). - The other two values are optional to adjust, but need to remain in there, as otherwise they are overwritten with the new `custom.ini` not containing them. + The other three values are optional to adjust, but need to remain in there, as otherwise they are overwritten with the new `custom.ini` not containing them. ```ini @@ -311,6 +311,7 @@ If there is enough RAM available, it is possible to raise PHP's memory limit in memory_limit = 256M upload_max_filesize = 256M max_execution_time = 60 +display_errors = 0 ``` diff --git a/src/inc/Util.php b/src/inc/Util.php index e5597293e..e899be49d 100755 --- a/src/inc/Util.php +++ b/src/inc/Util.php @@ -1371,9 +1371,12 @@ public static function sendMail($address, $subject, $text, $plaintext) { $htmlMessage .= $text; $htmlMessage .= "\r\n\r\n--" . $boundary . "--"; + set_error_handler(function() { error_log("Error sending mail"); }); if (!mail($address, $subject, $plainMessage . $htmlMessage, $headers)) { + restore_error_handler(); return false; } + restore_error_handler(); return true; } From b4bcdc6e7225e8029bc51e49bc53a5a1b4186077 Mon Sep 17 00:00:00 2001 From: Eric Wasson <229096365+Eric-Wasson@users.noreply.github.com> Date: Wed, 18 Mar 2026 11:29:54 +0100 Subject: [PATCH 475/691] Fixed array error --- src/inc/apiv2/common/AbstractModelAPI.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/inc/apiv2/common/AbstractModelAPI.php b/src/inc/apiv2/common/AbstractModelAPI.php index 2e90471ab..e5de681bb 100644 --- a/src/inc/apiv2/common/AbstractModelAPI.php +++ b/src/inc/apiv2/common/AbstractModelAPI.php @@ -740,7 +740,7 @@ public static function getManyResources(object $apiClass, Request $request, Resp $primary_cursor_key = key($primary_cursor); // Special filtering of id to use for uniform access to model primary key $primary_cursor_key = $primary_cursor_key == 'id' ? array_column($aliasedfeatures, 'alias', 'dbname')[$apiClass->getPrimaryKey()] : $primary_cursor_key; - $secondary_cursor = $decoded_cursor["secondary"]; + $secondary_cursor = array_key_exists("secondary", $decoded_cursor) ? $decoded_cursor["secondary"] : null; if ($secondary_cursor) { $secondary_cursor_key = key($secondary_cursor); $secondary_cursor_key = $secondary_cursor_key == '_id' ? array_column($aliasedfeatures, 'alias', 'dbname')[$apiClass->getPrimaryKey()] : $secondary_cursor_key; From ca5232f322781c4ed19772a5751c914794f68f4b Mon Sep 17 00:00:00 2001 From: jessevz Date: Wed, 18 Mar 2026 14:19:23 +0100 Subject: [PATCH 476/691] Added a flag isActive to tasks api response to show wether a task is active --- src/inc/apiv2/model/TaskAPI.php | 18 +++++++++++++++++- 1 file changed, 17 insertions(+), 1 deletion(-) diff --git a/src/inc/apiv2/model/TaskAPI.php b/src/inc/apiv2/model/TaskAPI.php index 7753ea0b2..c24dcaf50 100644 --- a/src/inc/apiv2/model/TaskAPI.php +++ b/src/inc/apiv2/model/TaskAPI.php @@ -184,6 +184,20 @@ function aggregateData(object $object, array &$included_data = [], ?array $aggre $activeAgents = Factory::getAssignmentFactory()->countFilter([Factory::FILTER => $qF]); $aggregatedData["activeAgents"] = $activeAgents; } + + $chunks = null; + if (is_null($aggregateFieldsets) || in_array("isActive", $aggregateFieldsets['task'])) { + $qF = new QueryFilter(Chunk::TASK_ID, $object->getId(), "="); + $chunks = Factory::getChunkFactory()->filter([Factory::FILTER => $qF]); + $isActive = 0; + foreach ($chunks as $chunk) { + if (time() - max($chunk->getSolveTime(), $chunk->getDispatchTime()) < SConfig::getInstance()->getVal(DConfig::CHUNK_TIMEOUT) && $chunk->getProgress() < 10000) { + $isActive = 1; + break; + } + } + $aggregatedData["isActive"] = $isActive; + } $keyspace = $object->getKeyspace(); $keyspaceProgress = $object->getKeyspaceProgress(); @@ -222,7 +236,9 @@ function aggregateData(object $object, array &$included_data = [], ?array $aggre if (is_null($aggregateFieldsets) || in_array("taskExtraDetails", $aggregateFieldsets['task'])) { $qF = new QueryFilter(Chunk::TASK_ID, $object->getId(), "="); - $chunks = Factory::getChunkFactory()->filter([Factory::FILTER => $qF]); + if (!isset($chunk)){ + $chunks = Factory::getChunkFactory()->filter([Factory::FILTER => $qF]); + } $currentSpeed = 0; $cProgress = 0; From d1c388d703c59b3adf077b31773cbead4ba7c45e Mon Sep 17 00:00:00 2001 From: jessevz Date: Wed, 18 Mar 2026 14:22:24 +0100 Subject: [PATCH 477/691] changed flag to boolean --- src/inc/apiv2/model/TaskAPI.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/inc/apiv2/model/TaskAPI.php b/src/inc/apiv2/model/TaskAPI.php index c24dcaf50..08a7c81ee 100644 --- a/src/inc/apiv2/model/TaskAPI.php +++ b/src/inc/apiv2/model/TaskAPI.php @@ -189,10 +189,10 @@ function aggregateData(object $object, array &$included_data = [], ?array $aggre if (is_null($aggregateFieldsets) || in_array("isActive", $aggregateFieldsets['task'])) { $qF = new QueryFilter(Chunk::TASK_ID, $object->getId(), "="); $chunks = Factory::getChunkFactory()->filter([Factory::FILTER => $qF]); - $isActive = 0; + $isActive = false; foreach ($chunks as $chunk) { if (time() - max($chunk->getSolveTime(), $chunk->getDispatchTime()) < SConfig::getInstance()->getVal(DConfig::CHUNK_TIMEOUT) && $chunk->getProgress() < 10000) { - $isActive = 1; + $isActive = true; break; } } From 98c599fc7aac3aa79433ac399605f66211fbac3d Mon Sep 17 00:00:00 2001 From: jessevz Date: Wed, 18 Mar 2026 14:47:35 +0100 Subject: [PATCH 478/691] Fixed wrong used variable --- src/inc/apiv2/model/TaskAPI.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/inc/apiv2/model/TaskAPI.php b/src/inc/apiv2/model/TaskAPI.php index 08a7c81ee..de630dd44 100644 --- a/src/inc/apiv2/model/TaskAPI.php +++ b/src/inc/apiv2/model/TaskAPI.php @@ -236,7 +236,7 @@ function aggregateData(object $object, array &$included_data = [], ?array $aggre if (is_null($aggregateFieldsets) || in_array("taskExtraDetails", $aggregateFieldsets['task'])) { $qF = new QueryFilter(Chunk::TASK_ID, $object->getId(), "="); - if (!isset($chunk)){ + if (!isset($chunks)){ $chunks = Factory::getChunkFactory()->filter([Factory::FILTER => $qF]); } From 10436714c6aa9d2b6cc00ad6a69564cc6fad252d Mon Sep 17 00:00:00 2001 From: jessevz Date: Wed, 18 Mar 2026 14:50:42 +0100 Subject: [PATCH 479/691] Moved unnesesary logic outside loop --- src/inc/apiv2/model/TaskAPI.php | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/src/inc/apiv2/model/TaskAPI.php b/src/inc/apiv2/model/TaskAPI.php index de630dd44..e2926c697 100644 --- a/src/inc/apiv2/model/TaskAPI.php +++ b/src/inc/apiv2/model/TaskAPI.php @@ -190,8 +190,11 @@ function aggregateData(object $object, array &$included_data = [], ?array $aggre $qF = new QueryFilter(Chunk::TASK_ID, $object->getId(), "="); $chunks = Factory::getChunkFactory()->filter([Factory::FILTER => $qF]); $isActive = false; + $now = time(); + $chunkTimeOut = SConfig::getInstance()->getVal(DConfig::CHUNK_TIMEOUT); + foreach ($chunks as $chunk) { - if (time() - max($chunk->getSolveTime(), $chunk->getDispatchTime()) < SConfig::getInstance()->getVal(DConfig::CHUNK_TIMEOUT) && $chunk->getProgress() < 10000) { + if ($now - max($chunk->getSolveTime(), $chunk->getDispatchTime()) < $chunkTimeOut && $chunk->getProgress() < 10000) { $isActive = true; break; } From 438c174574768113b79b2a3ec4144dd203da1adb Mon Sep 17 00:00:00 2001 From: jessevz Date: Wed, 18 Mar 2026 16:29:50 +0100 Subject: [PATCH 480/691] Use the original status variable for the task status --- src/inc/apiv2/model/TaskAPI.php | 60 +++++++++++---------------------- 1 file changed, 20 insertions(+), 40 deletions(-) diff --git a/src/inc/apiv2/model/TaskAPI.php b/src/inc/apiv2/model/TaskAPI.php index e2926c697..2d2ca6162 100644 --- a/src/inc/apiv2/model/TaskAPI.php +++ b/src/inc/apiv2/model/TaskAPI.php @@ -178,30 +178,12 @@ function aggregateData(object $object, array &$included_data = [], ?array $aggre $aggregateFieldsets['task'] = explode(",", $aggregateFieldsets['task']); } - $activeAgents = []; - if (is_null($aggregateFieldsets) || in_array("activeAgents", $aggregateFieldsets['task'])) { + $assignedAgents = []; + if (is_null($aggregateFieldsets) || in_array("assignedAgents", $aggregateFieldsets['task'])) { $qF = new QueryFilter(Assignment::TASK_ID, $object->getId(), "="); - $activeAgents = Factory::getAssignmentFactory()->countFilter([Factory::FILTER => $qF]); - $aggregatedData["activeAgents"] = $activeAgents; + $assignedAgents = Factory::getAssignmentFactory()->countFilter([Factory::FILTER => $qF]); + $aggregatedData["totalAssignedAgents"] = $assignedAgents; } - - $chunks = null; - if (is_null($aggregateFieldsets) || in_array("isActive", $aggregateFieldsets['task'])) { - $qF = new QueryFilter(Chunk::TASK_ID, $object->getId(), "="); - $chunks = Factory::getChunkFactory()->filter([Factory::FILTER => $qF]); - $isActive = false; - $now = time(); - $chunkTimeOut = SConfig::getInstance()->getVal(DConfig::CHUNK_TIMEOUT); - - foreach ($chunks as $chunk) { - if ($now - max($chunk->getSolveTime(), $chunk->getDispatchTime()) < $chunkTimeOut && $chunk->getProgress() < 10000) { - $isActive = true; - break; - } - } - $aggregatedData["isActive"] = $isActive; - } - $keyspace = $object->getKeyspace(); $keyspaceProgress = $object->getKeyspaceProgress(); @@ -212,28 +194,26 @@ function aggregateData(object $object, array &$included_data = [], ?array $aggre if (is_null($aggregateFieldsets) || in_array("searched", $aggregateFieldsets['task'])) { $aggregatedData["searched"] = Util::showperc(TaskUtils::getTaskProgress($object), $keyspace); } - - if (is_null($aggregateFieldsets) || in_array("status", $aggregateFieldsets['task'])) { - $qF1 = new QueryFilter(Chunk::TASK_ID, $object->getId(), "="); - $agg1 = new Aggregation(Chunk::CHECKPOINT, Aggregation::SUM); - $agg2 = new Aggregation(Chunk::SKIP, Aggregation::SUM); - $agg3 = new Aggregation(Chunk::DISPATCH_TIME, Aggregation::MAX); - $agg4 = new Aggregation(Chunk::SOLVE_TIME, Aggregation::MAX); - $results = Factory::getChunkFactory()->multicolAggregationFilter([Factory::FILTER => $qF1], [$agg1, $agg2, $agg3, $agg4]); - - $progress = $results[$agg1->getName()] - $results[$agg2->getName()]; - $maxTime = max($results[$agg3->getName()], $results[$agg4->getName()]); - - //status 1 is running, 2 is idle and 3 is completed + + $chunks = null; + if (is_null($aggregateFieldsets) || in_array("isActive", $aggregateFieldsets['task'])) { + $qF = new QueryFilter(Chunk::TASK_ID, $object->getId(), "="); + $chunks = Factory::getChunkFactory()->filter([Factory::FILTER => $qF]); + //status 1 is running, 2 is idle and 3 is completed. $status = 2; - if (time() - $maxTime < SConfig::getInstance()->getVal(DConfig::CHUNK_TIMEOUT) && ($progress < $keyspace || $object->getUsePreprocessor() && $keyspace == DPrince::PRINCE_KEYSPACE)) { - $status = 1; - } - if ($keyspaceProgress >= $keyspace && $keyspaceProgress > 0) { $status = 3; + } else { + $now = time(); + $chunkTimeOut = SConfig::getInstance()->getVal(DConfig::CHUNK_TIMEOUT); + + foreach ($chunks as $chunk) { + if ($now - max($chunk->getSolveTime(), $chunk->getDispatchTime()) < $chunkTimeOut && $chunk->getProgress() < 10000) { + $status = 1; + break; + } + } } - $aggregatedData["status"] = $status; } From 115dca9a65159a673246c8d701f64a54adff0aed Mon Sep 17 00:00:00 2001 From: jessevz Date: Thu, 19 Mar 2026 10:25:48 +0100 Subject: [PATCH 481/691] Updated nginx docs to recent syntax and status code 308 for redirect (#2003) Co-authored-by: jessevz --- doc/installation_guidelines/tls.md | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/doc/installation_guidelines/tls.md b/doc/installation_guidelines/tls.md index 0debb3089..14158a0d8 100644 --- a/doc/installation_guidelines/tls.md +++ b/doc/installation_guidelines/tls.md @@ -55,12 +55,13 @@ http { server { listen 80; server_name localhost; - return 301 https://$host$request_uri; + return 308 https://$host$request_uri; } server { client_max_body_size 2G; - listen 443 ssl http2; + listen 443 ssl; + http2 on; server_name localhost; ssl_certificate /etc/nginx/ssl/nginx.crt; From 4d482480d727f94aabb38e1ba4959bedb873cbf3 Mon Sep 17 00:00:00 2001 From: jessevz Date: Thu, 19 Mar 2026 15:51:30 +0100 Subject: [PATCH 482/691] Fixed creation of task by using corretc parameter for cracker binary (#2012) * Fixed creation of task by using corretc parameter for cracker binary * Added enforce pipe to task creation in api * Made crackerBinaryTypeId not be required anymore --------- Co-authored-by: jessevz --- src/dba/models/Task.php | 2 +- src/inc/apiv2/model/TaskAPI.php | 5 +++-- src/inc/utils/TaskUtils.php | 6 ++++-- 3 files changed, 8 insertions(+), 5 deletions(-) diff --git a/src/dba/models/Task.php b/src/dba/models/Task.php index 42e7dc550..5d4b139aa 100644 --- a/src/dba/models/Task.php +++ b/src/dba/models/Task.php @@ -104,7 +104,7 @@ static function getFeatures(): array { $dict['useNewBench'] = ['read_only' => True, "type" => "bool", "subtype" => "unset", "choices" => "unset", "null" => False, "pk" => False, "protected" => False, "private" => False, "alias" => "useNewBench", "public" => False, "dba_mapping" => False]; $dict['skipKeyspace'] = ['read_only' => True, "type" => "int64", "subtype" => "unset", "choices" => "unset", "null" => False, "pk" => False, "protected" => False, "private" => False, "alias" => "skipKeyspace", "public" => False, "dba_mapping" => False]; $dict['crackerBinaryId'] = ['read_only' => True, "type" => "int", "subtype" => "unset", "choices" => "unset", "null" => False, "pk" => False, "protected" => False, "private" => False, "alias" => "crackerBinaryId", "public" => False, "dba_mapping" => False]; - $dict['crackerBinaryTypeId'] = ['read_only' => True, "type" => "int", "subtype" => "unset", "choices" => "unset", "null" => False, "pk" => False, "protected" => False, "private" => False, "alias" => "crackerBinaryTypeId", "public" => False, "dba_mapping" => False]; + $dict['crackerBinaryTypeId'] = ['read_only' => True, "type" => "int", "subtype" => "unset", "choices" => "unset", "null" => True, "pk" => False, "protected" => False, "private" => False, "alias" => "crackerBinaryTypeId", "public" => False, "dba_mapping" => False]; $dict['taskWrapperId'] = ['read_only' => True, "type" => "int", "subtype" => "unset", "choices" => "unset", "null" => False, "pk" => False, "protected" => True, "private" => False, "alias" => "taskWrapperId", "public" => False, "dba_mapping" => False]; $dict['isArchived'] = ['read_only' => False, "type" => "bool", "subtype" => "unset", "choices" => "unset", "null" => False, "pk" => False, "protected" => False, "private" => False, "alias" => "isArchived", "public" => False, "dba_mapping" => False]; $dict['notes'] = ['read_only' => False, "type" => "str(65535)", "subtype" => "unset", "choices" => "unset", "null" => False, "pk" => False, "protected" => False, "private" => False, "alias" => "notes", "public" => False, "dba_mapping" => False]; diff --git a/src/inc/apiv2/model/TaskAPI.php b/src/inc/apiv2/model/TaskAPI.php index 7753ea0b2..6756e7459 100644 --- a/src/inc/apiv2/model/TaskAPI.php +++ b/src/inc/apiv2/model/TaskAPI.php @@ -159,11 +159,12 @@ protected function createObject(array $data): int { $data[Task::PRIORITY], $data[Task::MAX_AGENTS], $this->db2json($this->getFeatures()['files'], $data["files"]), - $data[Task::CRACKER_BINARY_TYPE_ID], + $data[Task::CRACKER_BINARY_ID], $this->getCurrentUser(), $data[Task::NOTES], $data[Task::STATIC_CHUNKS], - $data[Task::CHUNK_SIZE] + $data[Task::CHUNK_SIZE], + $data[Task::FORCE_PIPE] ); return $task->getId(); diff --git a/src/inc/utils/TaskUtils.php b/src/inc/utils/TaskUtils.php index c2ab206f5..5d4b60279 100644 --- a/src/inc/utils/TaskUtils.php +++ b/src/inc/utils/TaskUtils.php @@ -793,7 +793,7 @@ public static function updateMaxAgents($taskId, $maxAgents, $user) { * @return Task * @throws HttpError */ - public static function createTask($hashlistId, $name, $attackCmd, $chunkTime, $status, $benchtype, $color, $isCpuOnly, $isSmall, $usePreprocessor, $preprocessorCommand, $skip, $priority, $maxAgents, $files, $crackerVersionId, $user, $notes = "", $staticChunking = DTaskStaticChunking::NORMAL, $chunkSize = 0) { + public static function createTask($hashlistId, $name, $attackCmd, $chunkTime, $status, $benchtype, $color, $isCpuOnly, $isSmall, $usePreprocessor, $preprocessorCommand, $skip, $priority, $maxAgents, $files, $crackerVersionId, $user, $notes = "", $staticChunking = DTaskStaticChunking::NORMAL, $chunkSize = 0, $enforcePipe = 0) { $hashlist = Factory::getHashlistFactory()->get($hashlistId); if ($hashlist == null) { throw new HttpError("Invalid hashlist ID!"); @@ -842,6 +842,8 @@ public static function createTask($hashlistId, $name, $attackCmd, $chunkTime, $s } else if ($benchtype != 'speed' && $benchtype != 'runtime') { throw new HttpError("Invalid benchmark type!"); + } else if ($enforcePipe < 0 || $enforcePipe > 1) { + throw new HttpError("Invalid enforce pipe value"); } $benchtype = ($benchtype == 'speed') ? 1 : 0; if (preg_match("/[0-9A-Za-z]{6}/", $color) != 1) { @@ -892,7 +894,7 @@ public static function createTask($hashlistId, $name, $attackCmd, $chunkTime, $s $notes, $staticChunking, $chunkSize, - 0, + $enforcePipe, ($usePreprocessor > 0) ? $preprocessor->getId() : 0, ($usePreprocessor > 0) ? $preprocessorCommand : '' ); From 831bb96f8cedfd56422d1d82d06fb5818c005cfa Mon Sep 17 00:00:00 2001 From: jessevz Date: Mon, 23 Mar 2026 11:47:46 +0100 Subject: [PATCH 483/691] Removed unused field in task creation --- ci/apiv2/testfiles/task/create_task_001.json | 1 - ci/apiv2/testfiles/task/create_task_002.json | 1 - ci/apiv2/testfiles/task/create_task_003.json | 1 - 3 files changed, 3 deletions(-) diff --git a/ci/apiv2/testfiles/task/create_task_001.json b/ci/apiv2/testfiles/task/create_task_001.json index b46adde09..e0a0e4607 100644 --- a/ci/apiv2/testfiles/task/create_task_001.json +++ b/ci/apiv2/testfiles/task/create_task_001.json @@ -4,7 +4,6 @@ "chunkTime": 600, "color": "7C6EFF", "crackerBinaryId": 1, - "crackerBinaryTypeId": 1, "forcePipe": true, "files": [], "isArchived": false, diff --git a/ci/apiv2/testfiles/task/create_task_002.json b/ci/apiv2/testfiles/task/create_task_002.json index a8c594331..2999b99dd 100644 --- a/ci/apiv2/testfiles/task/create_task_002.json +++ b/ci/apiv2/testfiles/task/create_task_002.json @@ -4,7 +4,6 @@ "chunkTime": 600, "color": "7C6EFF", "crackerBinaryId": 1, - "crackerBinaryTypeId": 1, "forcePipe": true, "files": [], "isArchived": false, diff --git a/ci/apiv2/testfiles/task/create_task_003.json b/ci/apiv2/testfiles/task/create_task_003.json index b6cfdd3ac..7c3ce08d0 100644 --- a/ci/apiv2/testfiles/task/create_task_003.json +++ b/ci/apiv2/testfiles/task/create_task_003.json @@ -4,7 +4,6 @@ "chunkTime": 600, "color": "7C6EFF", "crackerBinaryId": 1, - "crackerBinaryTypeId": 1, "forcePipe": true, "files": [], "isArchived": false, From f9a0b517e9b60b17485e7f5579b63a25c923abaf Mon Sep 17 00:00:00 2001 From: s3inlc Date: Fri, 10 Apr 2026 14:48:49 +0200 Subject: [PATCH 484/691] fix user object argument for supertask builder helper --- src/inc/apiv2/helper/BulkSupertaskBuilderHelperAPI.php | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/src/inc/apiv2/helper/BulkSupertaskBuilderHelperAPI.php b/src/inc/apiv2/helper/BulkSupertaskBuilderHelperAPI.php index 58192d4a6..779336924 100644 --- a/src/inc/apiv2/helper/BulkSupertaskBuilderHelperAPI.php +++ b/src/inc/apiv2/helper/BulkSupertaskBuilderHelperAPI.php @@ -6,7 +6,6 @@ use Hashtopolis\dba\models\Supertask; use Hashtopolis\inc\apiv2\common\AbstractHelperAPI; use Hashtopolis\inc\HTException; -use Hashtopolis\inc\Login; use Hashtopolis\inc\utils\SupertaskUtils; class BulkSupertaskBuilderHelperAPI extends AbstractHelperAPI { @@ -45,6 +44,6 @@ public static function getResponse(): string { * @throws HTException */ public function actionPost($data): object|array|null { - return SupertaskUtils::bulkSupertask($data['name'], $data['command'], $data['isCpu'], $data['maxAgents'], $data['isSmall'], $data['crackerBinaryTypeId'], $data['benchtype'], $data['basefiles'], $data['iterfiles'], Login::getInstance()->getUser()); + return SupertaskUtils::bulkSupertask($data['name'], $data['command'], $data['isCpu'], $data['maxAgents'], $data['isSmall'], $data['crackerBinaryTypeId'], $data['benchtype'], $data['basefiles'], $data['iterfiles'], $this->getCurrentUser()); } } From bdba6b7477d154bd108f24af2f2f21ba8291f1f9 Mon Sep 17 00:00:00 2001 From: s3inlc Date: Fri, 10 Apr 2026 14:50:24 +0200 Subject: [PATCH 485/691] also check if the total hash count of a hashlist needs to be fixed --- src/inc/utils/ConfigUtils.php | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/src/inc/utils/ConfigUtils.php b/src/inc/utils/ConfigUtils.php index c7a3ea490..92fa74d49 100644 --- a/src/inc/utils/ConfigUtils.php +++ b/src/inc/utils/ConfigUtils.php @@ -207,11 +207,20 @@ public static function rebuildCache() { if ($hashlist->getFormat() != DHashlistFormat::PLAIN) { $hashFactory = Factory::getHashBinaryFactory(); } + $counted = false; $count = $hashFactory->countFilter([Factory::FILTER => [$qF1, $qF2]]); if ($count != $hashlist->getCracked()) { $correctedHashlists++; + $counted = true; Factory::getHashlistFactory()->set($hashlist, Hashlist::CRACKED, $count); } + $count = $hashFactory->countFilter([Factory::FILTER => $qF1]); + if ($count != $hashlist->getHashCount()) { + if (!$counted) { + $correctedHashlists++; + } + Factory::getHashlistFactory()->set($hashlist, Hashlist::HASH_COUNT, $count); + } } Factory::getAgentFactory()->getDB()->commit(); From 536df766d64d741107cc0b34ff2c652a5995a2f3 Mon Sep 17 00:00:00 2001 From: jessevz Date: Mon, 13 Apr 2026 16:43:59 +0200 Subject: [PATCH 486/691] Made a taskwrapperview to be able to properly sort in the taskwrapper overview --- src/api/v2/index.php | 2 + src/dba/Factory.php | 12 + src/dba/models/TaskWrapperDisplay.php | 344 ++++++++++++++++++ src/dba/models/TaskWrapperDisplayFactory.php | 92 +++++ src/dba/models/generator.php | 27 ++ src/inc/apiv2/common/AbstractBaseAPI.php | 3 + src/inc/apiv2/model/TaskWrapperDisplayAPI.php | 92 +++++ .../mysql/20260413140000_task-view.sql | 11 + .../postgres/20260413140000_task-view.sql | 11 + 9 files changed, 594 insertions(+) create mode 100644 src/dba/models/TaskWrapperDisplay.php create mode 100644 src/dba/models/TaskWrapperDisplayFactory.php create mode 100644 src/inc/apiv2/model/TaskWrapperDisplayAPI.php create mode 100644 src/migrations/mysql/20260413140000_task-view.sql create mode 100644 src/migrations/postgres/20260413140000_task-view.sql diff --git a/src/api/v2/index.php b/src/api/v2/index.php index 668eb0054..146322d94 100644 --- a/src/api/v2/index.php +++ b/src/api/v2/index.php @@ -84,6 +84,7 @@ use Hashtopolis\inc\apiv2\model\SupertaskAPI; use Hashtopolis\inc\apiv2\model\TaskAPI; use Hashtopolis\inc\apiv2\model\TaskWrapperAPI; +use Hashtopolis\inc\apiv2\model\TaskWrapperDisplayAPI; use Hashtopolis\inc\apiv2\model\UserAPI; use Hashtopolis\inc\apiv2\model\VoucherAPI; @@ -256,6 +257,7 @@ SupertaskAPI::register($app); TaskAPI::register($app); TaskWrapperAPI::register($app); +TaskWrapperDisplayAPI::register($app); UserAPI::register($app); VoucherAPI::register($app); diff --git a/src/dba/Factory.php b/src/dba/Factory.php index b495cbdb3..142e122d5 100644 --- a/src/dba/Factory.php +++ b/src/dba/Factory.php @@ -39,6 +39,7 @@ use Hashtopolis\dba\models\TaskFactory; use Hashtopolis\dba\models\TaskDebugOutputFactory; use Hashtopolis\dba\models\TaskWrapperFactory; +use Hashtopolis\dba\models\TaskWrapperDisplayFactory; use Hashtopolis\dba\models\UserFactory; use Hashtopolis\dba\models\ZapFactory; use Hashtopolis\dba\models\AccessGroupUserFactory; @@ -86,6 +87,7 @@ class Factory { private static ?TaskFactory $taskFactory = null; private static ?TaskDebugOutputFactory $taskDebugOutputFactory = null; private static ?TaskWrapperFactory $taskWrapperFactory = null; + private static ?TaskWrapperDisplayFactory $taskWrapperDisplayFactory = null; private static ?UserFactory $userFactory = null; private static ?ZapFactory $zapFactory = null; private static ?AccessGroupUserFactory $accessGroupUserFactory = null; @@ -465,6 +467,16 @@ public static function getTaskWrapperFactory(): TaskWrapperFactory { } } + public static function getTaskWrapperDisplayFactory(): TaskWrapperDisplayFactory { + if (self::$taskWrapperDisplayFactory == null) { + $f = new TaskWrapperDisplayFactory(); + self::$taskWrapperDisplayFactory = $f; + return $f; + } else { + return self::$taskWrapperDisplayFactory; + } + } + public static function getUserFactory(): UserFactory { if (self::$userFactory == null) { $f = new UserFactory(); diff --git a/src/dba/models/TaskWrapperDisplay.php b/src/dba/models/TaskWrapperDisplay.php new file mode 100644 index 000000000..bba48f99f --- /dev/null +++ b/src/dba/models/TaskWrapperDisplay.php @@ -0,0 +1,344 @@ +taskWrapperId = $taskWrapperId; + $this->taskWrapperPriority = $taskWrapperPriority; + $this->taskWrapperMaxAgents = $taskWrapperMaxAgents; + $this->taskType = $taskType; + $this->hashlistId = $hashlistId; + $this->accessGroupId = $accessGroupId; + $this->taskWrapperName = $taskWrapperName; + $this->displayName = $displayName; + $this->taskWrapperIsArchived = $taskWrapperIsArchived; + $this->cracked = $cracked; + $this->taskId = $taskId; + $this->taskName = $taskName; + $this->attackCmd = $attackCmd; + $this->chunkTime = $chunkTime; + $this->statusTimer = $statusTimer; + $this->keyspace = $keyspace; + $this->keyspaceProgress = $keyspaceProgress; + $this->taskPriority = $taskPriority; + $this->taskMaxAgents = $taskMaxAgents; + $this->isSmall = $isSmall; + $this->isCpuTask = $isCpuTask; + $this->taskIsArchived = $taskIsArchived; + $this->taskUsePreprocessor = $taskUsePreprocessor; + } + + function getKeyValueDict(): array { + $dict = array(); + $dict['taskWrapperId'] = $this->taskWrapperId; + $dict['taskWrapperPriority'] = $this->taskWrapperPriority; + $dict['taskWrapperMaxAgents'] = $this->taskWrapperMaxAgents; + $dict['taskType'] = $this->taskType; + $dict['hashlistId'] = $this->hashlistId; + $dict['accessGroupId'] = $this->accessGroupId; + $dict['taskWrapperName'] = $this->taskWrapperName; + $dict['displayName'] = $this->displayName; + $dict['taskWrapperIsArchived'] = $this->taskWrapperIsArchived; + $dict['cracked'] = $this->cracked; + $dict['taskId'] = $this->taskId; + $dict['taskName'] = $this->taskName; + $dict['attackCmd'] = $this->attackCmd; + $dict['chunkTime'] = $this->chunkTime; + $dict['statusTimer'] = $this->statusTimer; + $dict['keyspace'] = $this->keyspace; + $dict['keyspaceProgress'] = $this->keyspaceProgress; + $dict['taskPriority'] = $this->taskPriority; + $dict['taskMaxAgents'] = $this->taskMaxAgents; + $dict['isSmall'] = $this->isSmall; + $dict['isCpuTask'] = $this->isCpuTask; + $dict['taskIsArchived'] = $this->taskIsArchived; + $dict['taskUsePreprocessor'] = $this->taskUsePreprocessor; + + return $dict; + } + + static function getFeatures(): array { + $dict = array(); + $dict['taskWrapperId'] = ['read_only' => True, "type" => "int", "subtype" => "unset", "choices" => "unset", "null" => False, "pk" => True, "protected" => True, "private" => False, "alias" => "taskWrapperId", "public" => False, "dba_mapping" => False]; + $dict['taskWrapperPriority'] = ['read_only' => False, "type" => "int", "subtype" => "unset", "choices" => "unset", "null" => False, "pk" => False, "protected" => False, "private" => False, "alias" => "taskWrapperPriority", "public" => False, "dba_mapping" => False]; + $dict['taskWrapperMaxAgents'] = ['read_only' => False, "type" => "int", "subtype" => "unset", "choices" => "unset", "null" => False, "pk" => False, "protected" => False, "private" => False, "alias" => "taskWrapperMaxAgents", "public" => False, "dba_mapping" => False]; + $dict['taskType'] = ['read_only' => True, "type" => "int", "subtype" => "unset", "choices" => [0 => "TaskType is Task", 1 => "TaskType is Supertask", ], "null" => False, "pk" => False, "protected" => True, "private" => False, "alias" => "taskType", "public" => False, "dba_mapping" => False]; + $dict['hashlistId'] = ['read_only' => True, "type" => "int", "subtype" => "unset", "choices" => "unset", "null" => False, "pk" => False, "protected" => True, "private" => False, "alias" => "hashlistId", "public" => False, "dba_mapping" => False]; + $dict['accessGroupId'] = ['read_only' => False, "type" => "int", "subtype" => "unset", "choices" => "unset", "null" => False, "pk" => False, "protected" => False, "private" => False, "alias" => "accessGroupId", "public" => False, "dba_mapping" => False]; + $dict['taskWrapperName'] = ['read_only' => False, "type" => "str(100)", "subtype" => "unset", "choices" => "unset", "null" => False, "pk" => False, "protected" => False, "private" => False, "alias" => "taskWrapperName", "public" => False, "dba_mapping" => False]; + $dict['displayName'] = ['read_only' => False, "type" => "str(100)", "subtype" => "unset", "choices" => "unset", "null" => False, "pk" => False, "protected" => False, "private" => False, "alias" => "displayName", "public" => False, "dba_mapping" => False]; + $dict['taskWrapperIsArchived'] = ['read_only' => False, "type" => "bool", "subtype" => "unset", "choices" => "unset", "null" => False, "pk" => False, "protected" => False, "private" => False, "alias" => "taskWrapperIsArchived", "public" => False, "dba_mapping" => False]; + $dict['cracked'] = ['read_only' => True, "type" => "int", "subtype" => "unset", "choices" => "unset", "null" => False, "pk" => False, "protected" => True, "private" => False, "alias" => "cracked", "public" => False, "dba_mapping" => False]; + $dict['taskId'] = ['read_only' => True, "type" => "int", "subtype" => "unset", "choices" => "unset", "null" => False, "pk" => False, "protected" => True, "private" => False, "alias" => "taskId", "public" => False, "dba_mapping" => False]; + $dict['taskName'] = ['read_only' => False, "type" => "str(256)", "subtype" => "unset", "choices" => "unset", "null" => False, "pk" => False, "protected" => False, "private" => False, "alias" => "taskName", "public" => False, "dba_mapping" => False]; + $dict['attackCmd'] = ['read_only' => False, "type" => "str(65535)", "subtype" => "unset", "choices" => "unset", "null" => False, "pk" => False, "protected" => False, "private" => False, "alias" => "attackCmd", "public" => False, "dba_mapping" => False]; + $dict['chunkTime'] = ['read_only' => False, "type" => "int", "subtype" => "unset", "choices" => "unset", "null" => False, "pk" => False, "protected" => False, "private" => False, "alias" => "chunkTime", "public" => False, "dba_mapping" => False]; + $dict['statusTimer'] = ['read_only' => False, "type" => "int", "subtype" => "unset", "choices" => "unset", "null" => False, "pk" => False, "protected" => False, "private" => False, "alias" => "statusTimer", "public" => False, "dba_mapping" => False]; + $dict['keyspace'] = ['read_only' => True, "type" => "int64", "subtype" => "unset", "choices" => "unset", "null" => False, "pk" => False, "protected" => True, "private" => False, "alias" => "keyspace", "public" => False, "dba_mapping" => False]; + $dict['keyspaceProgress'] = ['read_only' => True, "type" => "int64", "subtype" => "unset", "choices" => "unset", "null" => False, "pk" => False, "protected" => True, "private" => False, "alias" => "keyspaceProgress", "public" => False, "dba_mapping" => False]; + $dict['taskPriority'] = ['read_only' => False, "type" => "int", "subtype" => "unset", "choices" => "unset", "null" => False, "pk" => False, "protected" => False, "private" => False, "alias" => "taskPriority", "public" => False, "dba_mapping" => False]; + $dict['taskMaxAgents'] = ['read_only' => False, "type" => "int", "subtype" => "unset", "choices" => "unset", "null" => False, "pk" => False, "protected" => False, "private" => False, "alias" => "taskMaxAgents", "public" => False, "dba_mapping" => False]; + $dict['isSmall'] = ['read_only' => False, "type" => "bool", "subtype" => "unset", "choices" => "unset", "null" => False, "pk" => False, "protected" => False, "private" => False, "alias" => "isSmall", "public" => False, "dba_mapping" => False]; + $dict['isCpuTask'] = ['read_only' => False, "type" => "bool", "subtype" => "unset", "choices" => "unset", "null" => False, "pk" => False, "protected" => False, "private" => False, "alias" => "isCpuTask", "public" => False, "dba_mapping" => False]; + $dict['taskIsArchived'] = ['read_only' => False, "type" => "bool", "subtype" => "unset", "choices" => "unset", "null" => False, "pk" => False, "protected" => False, "private" => False, "alias" => "taskIsArchived", "public" => False, "dba_mapping" => False]; + $dict['taskUsePreprocessor'] = ['read_only' => True, "type" => "int", "subtype" => "unset", "choices" => "unset", "null" => False, "pk" => False, "protected" => False, "private" => False, "alias" => "preprocessorId", "public" => False, "dba_mapping" => False]; + + return $dict; + } + + function getPrimaryKey(): string { + return "taskWrapperId"; + } + + function getPrimaryKeyValue(): ?int { + return $this->taskWrapperId; + } + + function getId(): ?int { + return $this->taskWrapperId; + } + + function setId($id): void { + $this->taskWrapperId = $id; + } + + /** + * Used to serialize the data contained in the model + * @return array + */ + public function expose(): array { + return get_object_vars($this); + } + + function getTaskWrapperPriority(): ?int { + return $this->taskWrapperPriority; + } + + function setTaskWrapperPriority(?int $taskWrapperPriority): void { + $this->taskWrapperPriority = $taskWrapperPriority; + } + + function getTaskWrapperMaxAgents(): ?int { + return $this->taskWrapperMaxAgents; + } + + function setTaskWrapperMaxAgents(?int $taskWrapperMaxAgents): void { + $this->taskWrapperMaxAgents = $taskWrapperMaxAgents; + } + + function getTaskType(): ?int { + return $this->taskType; + } + + function setTaskType(?int $taskType): void { + $this->taskType = $taskType; + } + + function getHashlistId(): ?int { + return $this->hashlistId; + } + + function setHashlistId(?int $hashlistId): void { + $this->hashlistId = $hashlistId; + } + + function getAccessGroupId(): ?int { + return $this->accessGroupId; + } + + function setAccessGroupId(?int $accessGroupId): void { + $this->accessGroupId = $accessGroupId; + } + + function getTaskWrapperName(): ?string { + return $this->taskWrapperName; + } + + function setTaskWrapperName(?string $taskWrapperName): void { + $this->taskWrapperName = $taskWrapperName; + } + + function getDisplayName(): ?string { + return $this->displayName; + } + + function setDisplayName(?string $displayName): void { + $this->displayName = $displayName; + } + + function getTaskWrapperIsArchived(): ?int { + return $this->taskWrapperIsArchived; + } + + function setTaskWrapperIsArchived(?int $taskWrapperIsArchived): void { + $this->taskWrapperIsArchived = $taskWrapperIsArchived; + } + + function getCracked(): ?int { + return $this->cracked; + } + + function setCracked(?int $cracked): void { + $this->cracked = $cracked; + } + + function getTaskId(): ?int { + return $this->taskId; + } + + function setTaskId(?int $taskId): void { + $this->taskId = $taskId; + } + + function getTaskName(): ?string { + return $this->taskName; + } + + function setTaskName(?string $taskName): void { + $this->taskName = $taskName; + } + + function getAttackCmd(): ?string { + return $this->attackCmd; + } + + function setAttackCmd(?string $attackCmd): void { + $this->attackCmd = $attackCmd; + } + + function getChunkTime(): ?int { + return $this->chunkTime; + } + + function setChunkTime(?int $chunkTime): void { + $this->chunkTime = $chunkTime; + } + + function getStatusTimer(): ?int { + return $this->statusTimer; + } + + function setStatusTimer(?int $statusTimer): void { + $this->statusTimer = $statusTimer; + } + + function getKeyspace(): ?int { + return $this->keyspace; + } + + function setKeyspace(?int $keyspace): void { + $this->keyspace = $keyspace; + } + + function getKeyspaceProgress(): ?int { + return $this->keyspaceProgress; + } + + function setKeyspaceProgress(?int $keyspaceProgress): void { + $this->keyspaceProgress = $keyspaceProgress; + } + + function getTaskPriority(): ?int { + return $this->taskPriority; + } + + function setTaskPriority(?int $taskPriority): void { + $this->taskPriority = $taskPriority; + } + + function getTaskMaxAgents(): ?int { + return $this->taskMaxAgents; + } + + function setTaskMaxAgents(?int $taskMaxAgents): void { + $this->taskMaxAgents = $taskMaxAgents; + } + + function getIsSmall(): ?int { + return $this->isSmall; + } + + function setIsSmall(?int $isSmall): void { + $this->isSmall = $isSmall; + } + + function getIsCpuTask(): ?int { + return $this->isCpuTask; + } + + function setIsCpuTask(?int $isCpuTask): void { + $this->isCpuTask = $isCpuTask; + } + + function getTaskIsArchived(): ?int { + return $this->taskIsArchived; + } + + function setTaskIsArchived(?int $taskIsArchived): void { + $this->taskIsArchived = $taskIsArchived; + } + + function getTaskUsePreprocessor(): ?int { + return $this->taskUsePreprocessor; + } + + function setTaskUsePreprocessor(?int $taskUsePreprocessor): void { + $this->taskUsePreprocessor = $taskUsePreprocessor; + } + + const TASK_WRAPPER_ID = "taskWrapperId"; + const TASK_WRAPPER_PRIORITY = "taskWrapperPriority"; + const TASK_WRAPPER_MAX_AGENTS = "taskWrapperMaxAgents"; + const TASK_TYPE = "taskType"; + const HASHLIST_ID = "hashlistId"; + const ACCESS_GROUP_ID = "accessGroupId"; + const TASK_WRAPPER_NAME = "taskWrapperName"; + const DISPLAY_NAME = "displayName"; + const TASK_WRAPPER_IS_ARCHIVED = "taskWrapperIsArchived"; + const CRACKED = "cracked"; + const TASK_ID = "taskId"; + const TASK_NAME = "taskName"; + const ATTACK_CMD = "attackCmd"; + const CHUNK_TIME = "chunkTime"; + const STATUS_TIMER = "statusTimer"; + const KEYSPACE = "keyspace"; + const KEYSPACE_PROGRESS = "keyspaceProgress"; + const TASK_PRIORITY = "taskPriority"; + const TASK_MAX_AGENTS = "taskMaxAgents"; + const IS_SMALL = "isSmall"; + const IS_CPU_TASK = "isCpuTask"; + const TASK_IS_ARCHIVED = "taskIsArchived"; + const TASK_USE_PREPROCESSOR = "taskUsePreprocessor"; + + const PERM_CREATE = "permTaskWrapperDisplayCreate"; + const PERM_READ = "permTaskWrapperDisplayRead"; + const PERM_UPDATE = "permTaskWrapperDisplayUpdate"; + const PERM_DELETE = "permTaskWrapperDisplayDelete"; +} diff --git a/src/dba/models/TaskWrapperDisplayFactory.php b/src/dba/models/TaskWrapperDisplayFactory.php new file mode 100644 index 000000000..323ea044a --- /dev/null +++ b/src/dba/models/TaskWrapperDisplayFactory.php @@ -0,0 +1,92 @@ + $val) { + $conv[strtolower($key)] = $val; + } + $dict = $conv; + return new TaskWrapperDisplay($dict['taskwrapperid'], $dict['taskwrapperpriority'], $dict['taskwrappermaxagents'], $dict['tasktype'], $dict['hashlistid'], $dict['accessgroupid'], $dict['taskwrappername'], $dict['displayname'], $dict['taskwrapperisarchived'], $dict['cracked'], $dict['taskid'], $dict['taskname'], $dict['attackcmd'], $dict['chunktime'], $dict['statustimer'], $dict['keyspace'], $dict['keyspaceprogress'], $dict['taskpriority'], $dict['taskmaxagents'], $dict['issmall'], $dict['iscputask'], $dict['taskisarchived'], $dict['taskusepreprocessor']); + } + + /** + * @param array $options + * @param bool $single + * @return TaskWrapperDisplay|TaskWrapperDisplay[] + */ + function filter(array $options, bool $single = false): TaskWrapperDisplay|array|null { + $join = false; + if (array_key_exists('join', $options)) { + $join = true; + } + if ($single) { + if ($join) { + return parent::filter($options, $single); + } + return Util::cast(parent::filter($options, $single), TaskWrapperDisplay::class); + } + $objects = parent::filter($options, $single); + if ($join) { + return $objects; + } + $models = array(); + foreach ($objects as $object) { + $models[] = Util::cast($object, TaskWrapperDisplay::class); + } + return $models; + } + + /** + * @param string $pk + * @return ?TaskWrapperDisplay + */ + function get($pk): ?TaskWrapperDisplay { + return Util::cast(parent::get($pk), TaskWrapperDisplay::class); + } + + /** + * @param TaskWrapperDisplay $model + * @return TaskWrapperDisplay + */ + function save($model): TaskWrapperDisplay { + return Util::cast(parent::save($model), TaskWrapperDisplay::class); + } +} diff --git a/src/dba/models/generator.php b/src/dba/models/generator.php index 726e57ba7..c02a57ce8 100644 --- a/src/dba/models/generator.php +++ b/src/dba/models/generator.php @@ -439,6 +439,33 @@ ['name' => 'cracked', 'read_only' => True, 'type' => 'int', 'protected' => True], ], ]; +$CONF['TaskWrapperDisplay'] = [ + 'columns' => [ + ['name' => 'taskWrapperId', 'read_only' => True, 'type' => 'int', 'protected' => True], + ['name' => 'taskWrapperPriority', 'read_only' => False, 'type' => 'int'], + ['name' => 'taskWrapperMaxAgents', 'read_only' => False, 'type' => 'int'], + ['name' => 'taskType', 'read_only' => True, 'type' => 'int', 'protected' => True, 'choices' => $FieldTaskTypeChoices], + ['name' => 'hashlistId', 'read_only' => True, 'type' => 'int', 'protected' => True, 'relation' => 'Hashlist'], + ['name' => 'accessGroupId', 'read_only' => False, 'type' => 'int', 'relation' => 'AccessGroup'], + ['name' => 'taskWrapperName', 'read_only' => False, 'type' => 'str(100)'], + ['name' => 'displayName', 'read_only' => False, 'type' => 'str(100)'], + ['name' => 'taskWrapperIsArchived', 'read_only' => False, 'type' => 'bool'], + ['name' => 'cracked', 'read_only' => True, 'type' => 'int', 'protected' => True], + ['name' => 'taskId', 'read_only' => True, 'type' => 'int', 'protected' => True], + ['name' => 'taskName', 'read_only' => False, 'type' => 'str(256)'], + ['name' => 'attackCmd', 'read_only' => False, 'type' => 'str(65535)'], + ['name' => 'chunkTime', 'read_only' => False, 'type' => 'int'], + ['name' => 'statusTimer', 'read_only' => False, 'type' => 'int'], + ['name' => 'keyspace', 'read_only' => True, 'type' => 'int64', 'protected' => True], + ['name' => 'keyspaceProgress', 'read_only' => True, 'type' => 'int64', 'protected' => True], + ['name' => 'taskPriority', 'read_only' => False, 'type' => 'int'], + ['name' => 'taskMaxAgents', 'read_only' => False, 'type' => 'int'], + ['name' => 'isSmall', 'read_only' => False, 'type' => 'bool'], + ['name' => 'isCpuTask', 'read_only' => False, 'type' => 'bool'], + ['name' => 'taskIsArchived', 'read_only' => False, 'type' => 'bool'], + ['name' => 'taskUsePreprocessor', 'read_only' => True, 'type' => 'int', 'alias' => 'preprocessorId'], + ], +]; $CONF['User'] = [ 'columns' => [ ['name' => 'userId', 'read_only' => True, 'type' => 'int', 'protected' => True, 'alias' => 'id', 'public' => True], diff --git a/src/inc/apiv2/common/AbstractBaseAPI.php b/src/inc/apiv2/common/AbstractBaseAPI.php index 52baa3d13..49671e6ca 100644 --- a/src/inc/apiv2/common/AbstractBaseAPI.php +++ b/src/inc/apiv2/common/AbstractBaseAPI.php @@ -64,6 +64,7 @@ use Hashtopolis\dba\models\Preprocessor; use Hashtopolis\dba\QueryFilter; use Hashtopolis\dba\models\SupertaskPretask; +use Hashtopolis\dba\models\TaskWrapperDisplay; use Psr\Container\ContainerInterface; use Hashtopolis\inc\utils\UserUtils; @@ -310,6 +311,8 @@ protected static function getModelFactory(string $model): AbstractModelFactory { return Factory::getUserFactory(); case JwtApiKey::class: return Factory::getJwtApiKeyFactory(); + case TaskWrapperDisplay::class: + return Factory::getTaskWrapperDisplayFactory(); } throw new HttpError("Model '$model' cannot be mapped to Factory"); } diff --git a/src/inc/apiv2/model/TaskWrapperDisplayAPI.php b/src/inc/apiv2/model/TaskWrapperDisplayAPI.php new file mode 100644 index 000000000..e695ba612 --- /dev/null +++ b/src/inc/apiv2/model/TaskWrapperDisplayAPI.php @@ -0,0 +1,92 @@ +getId(), "="); + $jF = new JoinFilter(Factory::getHashlistFactory(), TaskWrapper::HASHLIST_ID, Hashlist::HASHLIST_ID); + $wrappers = Factory::getTaskWrapperFactory()->filter([Factory::FILTER => [$qF1, $qF2], Factory::JOIN => $jF])[Factory::getTaskWrapperFactory()->getModelName()]; + return count($wrappers) > 0; + } + + protected function getFilterACL(): array { + + $accessGroups = Util::arrayOfIds(AccessUtils::getAccessGroupsOfUser($this->getCurrentUser())); + + return [ + Factory::JOIN => [ + new JoinFilter(Factory::getHashlistFactory(), TaskWrapperDisplay::HASHLIST_ID, Hashlist::HASHLIST_ID), + ], + Factory::FILTER => [ + new ContainFilter(Hashlist::ACCESS_GROUP_ID, $accessGroups, Factory::getHashlistFactory()), + ] + ]; + } + + /** + * @throws HttpError + */ + protected function createObject(array $data): int { + throw new HttpError("TaskWrapperDisplays cannot be created via API"); + } + + /** + * @throws HttpError + */ + public function updateObject(int $objectId, array $data): void { + throw new HttpError("TaskWrapperDisplays cannot be updated via API"); + } + + /** + * @throws HttpError + */ + protected function deleteObject(object $object): void { + throw new HttpError("TaskWrapperDisplays cannot be deleted via API"); + } + + public static function getToManyRelationships(): array { + return [ + 'tasks' => [ + 'key' => TaskWrapperDisplay::TASK_WRAPPER_ID, + + 'relationType' => Task::class, + 'relationKey' => Task::TASK_WRAPPER_ID, + 'readonly' => true // Not allowed to change tasks of a taskwrapper + ], + ]; + } +} diff --git a/src/migrations/mysql/20260413140000_task-view.sql b/src/migrations/mysql/20260413140000_task-view.sql new file mode 100644 index 000000000..eee7a1d7e --- /dev/null +++ b/src/migrations/mysql/20260413140000_task-view.sql @@ -0,0 +1,11 @@ +create view TaskWrapperDisplay as select + tw.taskWrapperId as taskWrapperId, tw.priority as taskWrapperPriority, tw.maxAgents as TaskWrapperMaxAgents, + tw.taskType as taskType, tw.hashlistId as hashlistId, tw.accessGroupId as accessGroupId, + tw.taskWrapperName as taskWrapperName, tw.isArchived as taskWrapperIsArchived, tw.cracked as cracked, + t.taskId as taskId, t.taskName as taskName, t.attackCmd as attackCmd, t.chunkTime as chunkTime, + t.statusTimer as statusTimer, t.keyspace as keyspace, t.keyspaceProgress as keyspaceProgress, + t.priority as taskPriority, t.maxAgents as taskMaxAgents, t.isArchived as taskIsArchived, + t.crackerBinaryId as crackerBinaryId, t.isSmall as isSmall, t.isCpuTask as isCpuTask, + t.usePreprocessor as taskUsePreprocessor, + CASE WHEN tw.taskType = 0 THEN t.taskName ELSE tw.taskWrapperName END as displayName +FROM TaskWrapper tw LEFT JOIN Task t on tw.taskType = 0 AND t.taskWrapperId = tw.taskWrapperId; \ No newline at end of file diff --git a/src/migrations/postgres/20260413140000_task-view.sql b/src/migrations/postgres/20260413140000_task-view.sql new file mode 100644 index 000000000..bcb18288c --- /dev/null +++ b/src/migrations/postgres/20260413140000_task-view.sql @@ -0,0 +1,11 @@ +create view TaskWrapperDisplay as select + tw.taskWrapperId as taskWrapperId, tw.priority as taskWrapperPriority, tw.maxAgents as TaskWrapperMaxAgents, + tw.taskType as taskType, tw.hashlistId as hashlistId, tw.accessGroupId as accessGroupId, + tw.taskWrapperName as taskWrapperName, tw.isArchived as taskWrapperIsArchived, tw.cracked as cracked, + t.taskId as taskId, t.taskName as taskName, t.attackCmd as attackCmd, t.chunkTime as chunkTime, + t.statusTimer as statusTimer, t.keyspace as keyspace, t.keyspaceProgress as keyspaceProgress, + t.priority as taskPriority, t.maxAgents as taskMaxAgents, t.isArchived as taskIsArchived, + t.crackerBinaryId as crackerBinaryId, t.isSmall as isSmall, t.isCpuTask as isCpuTask, + t.usePreprocessor as taskUsePreprocessor, + CASE WHEN tw.taskType = 0 THEN t.taskName ELSE tw.taskWrapperName END as displayName +FROM TaskWrapper tw LEFT JOIN Task t on tw.taskType = 0 AND t.taskWrapperId = tw.taskWrapperId; From 1bc8caf296cc2ad8119f6306dbc768be5e54f873 Mon Sep 17 00:00:00 2001 From: jessevz Date: Tue, 14 Apr 2026 09:26:58 +0200 Subject: [PATCH 487/691] Fixed copilot review --- src/migrations/mysql/20260413140000_task-view.sql | 5 ++--- src/migrations/postgres/20260413140000_task-view.sql | 5 ++--- 2 files changed, 4 insertions(+), 6 deletions(-) diff --git a/src/migrations/mysql/20260413140000_task-view.sql b/src/migrations/mysql/20260413140000_task-view.sql index eee7a1d7e..7fcea7ef5 100644 --- a/src/migrations/mysql/20260413140000_task-view.sql +++ b/src/migrations/mysql/20260413140000_task-view.sql @@ -1,11 +1,10 @@ create view TaskWrapperDisplay as select - tw.taskWrapperId as taskWrapperId, tw.priority as taskWrapperPriority, tw.maxAgents as TaskWrapperMaxAgents, + tw.taskWrapperId as taskWrapperId, tw.priority as taskWrapperPriority, tw.maxAgents as taskWrapperMaxAgents, tw.taskType as taskType, tw.hashlistId as hashlistId, tw.accessGroupId as accessGroupId, tw.taskWrapperName as taskWrapperName, tw.isArchived as taskWrapperIsArchived, tw.cracked as cracked, t.taskId as taskId, t.taskName as taskName, t.attackCmd as attackCmd, t.chunkTime as chunkTime, t.statusTimer as statusTimer, t.keyspace as keyspace, t.keyspaceProgress as keyspaceProgress, t.priority as taskPriority, t.maxAgents as taskMaxAgents, t.isArchived as taskIsArchived, - t.crackerBinaryId as crackerBinaryId, t.isSmall as isSmall, t.isCpuTask as isCpuTask, - t.usePreprocessor as taskUsePreprocessor, + t.isSmall as isSmall, t.isCpuTask as isCpuTask, t.usePreprocessor as taskUsePreprocessor, CASE WHEN tw.taskType = 0 THEN t.taskName ELSE tw.taskWrapperName END as displayName FROM TaskWrapper tw LEFT JOIN Task t on tw.taskType = 0 AND t.taskWrapperId = tw.taskWrapperId; \ No newline at end of file diff --git a/src/migrations/postgres/20260413140000_task-view.sql b/src/migrations/postgres/20260413140000_task-view.sql index bcb18288c..94b746e1d 100644 --- a/src/migrations/postgres/20260413140000_task-view.sql +++ b/src/migrations/postgres/20260413140000_task-view.sql @@ -1,11 +1,10 @@ create view TaskWrapperDisplay as select - tw.taskWrapperId as taskWrapperId, tw.priority as taskWrapperPriority, tw.maxAgents as TaskWrapperMaxAgents, + tw.taskWrapperId as taskWrapperId, tw.priority as taskWrapperPriority, tw.maxAgents as taskWrapperMaxAgents, tw.taskType as taskType, tw.hashlistId as hashlistId, tw.accessGroupId as accessGroupId, tw.taskWrapperName as taskWrapperName, tw.isArchived as taskWrapperIsArchived, tw.cracked as cracked, t.taskId as taskId, t.taskName as taskName, t.attackCmd as attackCmd, t.chunkTime as chunkTime, t.statusTimer as statusTimer, t.keyspace as keyspace, t.keyspaceProgress as keyspaceProgress, t.priority as taskPriority, t.maxAgents as taskMaxAgents, t.isArchived as taskIsArchived, - t.crackerBinaryId as crackerBinaryId, t.isSmall as isSmall, t.isCpuTask as isCpuTask, - t.usePreprocessor as taskUsePreprocessor, + t.isSmall as isSmall, t.isCpuTask as isCpuTask, t.usePreprocessor as taskUsePreprocessor, CASE WHEN tw.taskType = 0 THEN t.taskName ELSE tw.taskWrapperName END as displayName FROM TaskWrapper tw LEFT JOIN Task t on tw.taskType = 0 AND t.taskWrapperId = tw.taskWrapperId; From 5f77a3a7a95751f553a03b58a38631d106d9f21d Mon Sep 17 00:00:00 2001 From: jessevz Date: Tue, 14 Apr 2026 10:16:49 +0200 Subject: [PATCH 488/691] Made sql keywords to uppercase --- .../mysql/20260413140000_task-view.sql | 20 +++++++++---------- .../postgres/20260413140000_task-view.sql | 20 +++++++++---------- 2 files changed, 20 insertions(+), 20 deletions(-) diff --git a/src/migrations/mysql/20260413140000_task-view.sql b/src/migrations/mysql/20260413140000_task-view.sql index 7fcea7ef5..3bf1b5503 100644 --- a/src/migrations/mysql/20260413140000_task-view.sql +++ b/src/migrations/mysql/20260413140000_task-view.sql @@ -1,10 +1,10 @@ -create view TaskWrapperDisplay as select - tw.taskWrapperId as taskWrapperId, tw.priority as taskWrapperPriority, tw.maxAgents as taskWrapperMaxAgents, - tw.taskType as taskType, tw.hashlistId as hashlistId, tw.accessGroupId as accessGroupId, - tw.taskWrapperName as taskWrapperName, tw.isArchived as taskWrapperIsArchived, tw.cracked as cracked, - t.taskId as taskId, t.taskName as taskName, t.attackCmd as attackCmd, t.chunkTime as chunkTime, - t.statusTimer as statusTimer, t.keyspace as keyspace, t.keyspaceProgress as keyspaceProgress, - t.priority as taskPriority, t.maxAgents as taskMaxAgents, t.isArchived as taskIsArchived, - t.isSmall as isSmall, t.isCpuTask as isCpuTask, t.usePreprocessor as taskUsePreprocessor, - CASE WHEN tw.taskType = 0 THEN t.taskName ELSE tw.taskWrapperName END as displayName -FROM TaskWrapper tw LEFT JOIN Task t on tw.taskType = 0 AND t.taskWrapperId = tw.taskWrapperId; \ No newline at end of file +CREATE VIEW TaskWrapperDisplay AS SELECT + tw.taskWrapperId AS taskWrapperId, tw.priority AS taskWrapperPriority, tw.maxAgents AS taskWrapperMaxAgents, + tw.taskType AS taskType, tw.hashlistId AS hashlistId, tw.accessGroupId AS accessGroupId, + tw.taskWrapperName AS taskWrapperName, tw.isArchived AS taskWrapperIsArchived, tw.cracked AS cracked, + t.taskId AS taskId, t.taskName AS taskName, t.attackCmd AS attackCmd, t.chunkTime AS chunkTime, + t.statusTimer AS statusTimer, t.keyspace AS keyspace, t.keyspaceProgress AS keyspaceProgress, + t.priority AS taskPriority, t.maxAgents AS taskMaxAgents, t.isArchived AS taskIsArchived, + t.isSmall AS isSmall, t.isCpuTask AS isCpuTask, t.usePreprocessor AS taskUsePreprocessor, + CASE WHEN tw.taskType = 0 THEN t.taskName ELSE tw.taskWrapperName END AS displayName +FROM TaskWrapper tw LEFT JOIN Task t ON tw.taskType = 0 AND t.taskWrapperId = tw.taskWrapperId; \ No newline at end of file diff --git a/src/migrations/postgres/20260413140000_task-view.sql b/src/migrations/postgres/20260413140000_task-view.sql index 94b746e1d..16c3591fb 100644 --- a/src/migrations/postgres/20260413140000_task-view.sql +++ b/src/migrations/postgres/20260413140000_task-view.sql @@ -1,10 +1,10 @@ -create view TaskWrapperDisplay as select - tw.taskWrapperId as taskWrapperId, tw.priority as taskWrapperPriority, tw.maxAgents as taskWrapperMaxAgents, - tw.taskType as taskType, tw.hashlistId as hashlistId, tw.accessGroupId as accessGroupId, - tw.taskWrapperName as taskWrapperName, tw.isArchived as taskWrapperIsArchived, tw.cracked as cracked, - t.taskId as taskId, t.taskName as taskName, t.attackCmd as attackCmd, t.chunkTime as chunkTime, - t.statusTimer as statusTimer, t.keyspace as keyspace, t.keyspaceProgress as keyspaceProgress, - t.priority as taskPriority, t.maxAgents as taskMaxAgents, t.isArchived as taskIsArchived, - t.isSmall as isSmall, t.isCpuTask as isCpuTask, t.usePreprocessor as taskUsePreprocessor, - CASE WHEN tw.taskType = 0 THEN t.taskName ELSE tw.taskWrapperName END as displayName -FROM TaskWrapper tw LEFT JOIN Task t on tw.taskType = 0 AND t.taskWrapperId = tw.taskWrapperId; +CREATE VIEW TaskWrapperDisplay AS SELECT + tw.taskWrapperId AS taskWrapperId, tw.priority AS taskWrapperPriority, tw.maxAgents AS taskWrapperMaxAgents, + tw.taskType AS taskType, tw.hashlistId AS hashlistId, tw.accessGroupId AS accessGroupId, + tw.taskWrapperName AS taskWrapperName, tw.isArchived AS taskWrapperIsArchived, tw.cracked AS cracked, + t.taskId AS taskId, t.taskName AS taskName, t.attackCmd AS attackCmd, t.chunkTime AS chunkTime, + t.statusTimer AS statusTimer, t.keyspace AS keyspace, t.keyspaceProgress AS keyspaceProgress, + t.priority AS taskPriority, t.maxAgents AS taskMaxAgents, t.isArchived AS taskIsArchived, + t.isSmall AS isSmall, t.isCpuTask AS isCpuTask, t.usePreprocessor AS taskUsePreprocessor, + CASE WHEN tw.taskType = 0 THEN t.taskName ELSE tw.taskWrapperName END AS displayName +FROM TaskWrapper tw LEFT JOIN Task t ON tw.taskType = 0 AND t.taskWrapperId = tw.taskWrapperId; From 7c036ac19280ae04b7a805ce4a249fdde3dd1499 Mon Sep 17 00:00:00 2001 From: jessevz Date: Tue, 14 Apr 2026 10:39:25 +0200 Subject: [PATCH 489/691] Removed parseFilters() function because it is not needed now that we use the view --- src/inc/apiv2/common/AbstractModelAPI.php | 8 ---- src/inc/apiv2/model/TaskWrapperAPI.php | 49 ----------------------- 2 files changed, 57 deletions(-) diff --git a/src/inc/apiv2/common/AbstractModelAPI.php b/src/inc/apiv2/common/AbstractModelAPI.php index 2e90471ab..44f2d9bb2 100644 --- a/src/inc/apiv2/common/AbstractModelAPI.php +++ b/src/inc/apiv2/common/AbstractModelAPI.php @@ -587,14 +587,6 @@ protected static function getMinMaxCursor($apiClass, string $sort, array $filter return $result[0]; } - /** - * overridable function to parse filters, currently only needed for taskWrapper endpoint - * to handle the taskWrapper -> task relation, to be able to treat it as a to one relationship - */ - protected function parseFilters(array $filters): array { - return $filters; - } - /** * API entry point for requesting multiple objects * @throws HttpError diff --git a/src/inc/apiv2/model/TaskWrapperAPI.php b/src/inc/apiv2/model/TaskWrapperAPI.php index 54a4e3918..13aa284d9 100644 --- a/src/inc/apiv2/model/TaskWrapperAPI.php +++ b/src/inc/apiv2/model/TaskWrapperAPI.php @@ -2,10 +2,6 @@ namespace Hashtopolis\inc\apiv2\model; -use Hashtopolis\dba\ConcatColumn; -use Hashtopolis\dba\ConcatLikeFilterInsensitive; -use Hashtopolis\dba\ConcatOrderFilter; -use Hashtopolis\dba\LikeFilterInsensitive; use Hashtopolis\inc\defines\DTaskTypes; use Hashtopolis\inc\utils\AccessUtils; use Hashtopolis\dba\models\AccessGroup; @@ -115,51 +111,6 @@ public static function getToManyRelationships(): array { ]; } - protected function parseFilters(array $filters): array { - //This is in order to handle filters and sorting on columns - if (isset($filters[Factory::JOIN])) { - $joinFilters = $filters[Factory::JOIN]; - foreach ($joinFilters as $joinFilter) { - if ($joinFilter->getOtherTableName() == Task::class) { - // This is a leftjoin where the task type is 0 which means not a supertask. This is in order to - // create a to 1 relationship where the taskwrapper will have the normal task as a relation and a supertask will have null - // This way it becomes possible to filter or sort on the included single task. - $joinFilter->setJoinType(JoinFilter::LEFT); - $qf = new QueryFilter(TaskWrapper::TASK_TYPE, DTaskTypes::NORMAL, "="); - $joinFilter->setQueryFilters([$qf]); - } - } - - // parse the order and filter - // Because the frontend shows taskwrappername for supertasks and taskname for normaltasks, the orders and filters for the - // name needs to be changed to coalesce filters to get the correct value between these 2. - // Another possibility where this hack is not needed would be to also store the taskname of normal tasks in the - // taskwrapper - if (isset($filters[Factory::ORDER])) { - foreach ($filters[Factory::ORDER] as &$orderfilter) { - if ($orderfilter->getBy() == Task::TASK_NAME) { - $concatColumns = [new ConcatColumn(TaskWrapper::TASK_WRAPPER_NAME, Factory::getTaskWrapperFactory()), new ConcatColumn(Task::TASK_NAME, Factory::getTaskFactory())]; - $newOrderFilter = new ConcatOrderFilter($concatColumns, $orderfilter->getType()); - $orderfilter = $newOrderFilter; - } - } - unset($orderfilter); - } - - if (isset($filters[Factory::FILTER])) { - foreach($filters[Factory::FILTER] as &$filter) { - if ($filter instanceof LikeFilterInsensitive && $filter->getKey() == Task::TASK_NAME) { - $concatColumns = [new ConcatColumn(TaskWrapper::TASK_WRAPPER_NAME, Factory::getTaskWrapperFactory()), new ConcatColumn(Task::TASK_NAME, Factory::getTaskFactory())]; - $newFilter = new ConcatLikeFilterInsensitive($concatColumns, $filter->getValue()); - $filter = $newFilter; - } - } - unset($filter); - } - } - return $filters; - } - /** * @throws HttpError */ From 7bf0e22d58bdc4169f5f44b48e3181e50f227656 Mon Sep 17 00:00:00 2001 From: jessevz Date: Tue, 14 Apr 2026 10:54:57 +0200 Subject: [PATCH 490/691] Remover references to parseFilters() --- src/inc/apiv2/common/AbstractModelAPI.php | 2 -- 1 file changed, 2 deletions(-) diff --git a/src/inc/apiv2/common/AbstractModelAPI.php b/src/inc/apiv2/common/AbstractModelAPI.php index 44f2d9bb2..4d33054ef 100644 --- a/src/inc/apiv2/common/AbstractModelAPI.php +++ b/src/inc/apiv2/common/AbstractModelAPI.php @@ -574,7 +574,6 @@ protected static function getMinMaxCursor($apiClass, string $sort, array $filter } } $filters[Factory::ORDER] = $orderFilters; - $filters = $apiClass->parseFilters($filters); $factory = $apiClass->getFactory(); $result = $factory->filter($filters); //handle joined queries @@ -716,7 +715,6 @@ public static function getManyResources(object $apiClass, Request $request, Resp /* Include relation filters */ $finalFs = array_merge($aFs, $relationFs); - $finalFs = $apiClass->parseFilters($finalFs); //TODO it would be even better if its possible to see if the primary filter is unique, instead of primary key. //But this probably needs to be added in getFeatures() then. From 11c22f1d52f88dab80f0dd93b7743fd5ef97ddb6 Mon Sep 17 00:00:00 2001 From: jessevz Date: Tue, 14 Apr 2026 11:52:02 +0200 Subject: [PATCH 491/691] Fixed phpstan --- src/inc/apiv2/common/AbstractModelAPI.php | 8 +------- 1 file changed, 1 insertion(+), 7 deletions(-) diff --git a/src/inc/apiv2/common/AbstractModelAPI.php b/src/inc/apiv2/common/AbstractModelAPI.php index 4d33054ef..5d15a0754 100644 --- a/src/inc/apiv2/common/AbstractModelAPI.php +++ b/src/inc/apiv2/common/AbstractModelAPI.php @@ -745,14 +745,8 @@ public static function getManyResources(object $apiClass, Request $request, Resp /* Request objects */ $filterObjects = $factory->filter($finalFs); - /* JOIN statements will return related modules as well, discard for now */ - if (array_key_exists(Factory::JOIN, $finalFs)) { - $objects = $filterObjects[$factory->getModelname()]; - } - else { - $objects = $filterObjects; - } + $objects = $filterObjects[$factory->getModelname()]; if ($reverseArray) { $objects = array_reverse($objects); } From 156ae877af8c04072e6ab415cf740f47c430fbe0 Mon Sep 17 00:00:00 2001 From: jessevz Date: Tue, 14 Apr 2026 14:30:50 +0200 Subject: [PATCH 492/691] Added missing fields --- src/dba/models/TaskWrapperDisplay.php | 82 ++++++++++++++++++- src/dba/models/TaskWrapperDisplayFactory.php | 4 +- src/dba/models/generator.php | 6 ++ src/inc/apiv2/model/TaskAPI.php | 19 +---- src/inc/apiv2/model/TaskWrapperDisplayAPI.php | 36 +++++++- src/inc/utils/TaskUtils.php | 21 +++++ .../mysql/20260413140000_task-view.sql | 10 ++- .../postgres/20260413140000_task-view.sql | 12 ++- 8 files changed, 163 insertions(+), 27 deletions(-) diff --git a/src/dba/models/TaskWrapperDisplay.php b/src/dba/models/TaskWrapperDisplay.php index bba48f99f..18ebdee3e 100644 --- a/src/dba/models/TaskWrapperDisplay.php +++ b/src/dba/models/TaskWrapperDisplay.php @@ -28,8 +28,14 @@ class TaskWrapperDisplay extends AbstractModel { private ?int $isCpuTask; private ?int $taskIsArchived; private ?int $taskUsePreprocessor; - - function __construct(?int $taskWrapperId, ?int $taskWrapperPriority, ?int $taskWrapperMaxAgents, ?int $taskType, ?int $hashlistId, ?int $accessGroupId, ?string $taskWrapperName, ?string $displayName, ?int $taskWrapperIsArchived, ?int $cracked, ?int $taskId, ?string $taskName, ?string $attackCmd, ?int $chunkTime, ?int $statusTimer, ?int $keyspace, ?int $keyspaceProgress, ?int $taskPriority, ?int $taskMaxAgents, ?int $isSmall, ?int $isCpuTask, ?int $taskIsArchived, ?int $taskUsePreprocessor) { + private ?string $hashlistName; + private ?int $hashCount; + private ?int $hashlistCracked; + private ?int $hashTypeId; + private ?string $hashTypeDescription; + private ?string $groupName; + + function __construct(?int $taskWrapperId, ?int $taskWrapperPriority, ?int $taskWrapperMaxAgents, ?int $taskType, ?int $hashlistId, ?int $accessGroupId, ?string $taskWrapperName, ?string $displayName, ?int $taskWrapperIsArchived, ?int $cracked, ?int $taskId, ?string $taskName, ?string $attackCmd, ?int $chunkTime, ?int $statusTimer, ?int $keyspace, ?int $keyspaceProgress, ?int $taskPriority, ?int $taskMaxAgents, ?int $isSmall, ?int $isCpuTask, ?int $taskIsArchived, ?int $taskUsePreprocessor, ?string $hashlistName, ?int $hashCount, ?int $hashlistCracked, ?int $hashTypeId, ?string $hashTypeDescription, ?string $groupName) { $this->taskWrapperId = $taskWrapperId; $this->taskWrapperPriority = $taskWrapperPriority; $this->taskWrapperMaxAgents = $taskWrapperMaxAgents; @@ -53,6 +59,12 @@ function __construct(?int $taskWrapperId, ?int $taskWrapperPriority, ?int $taskW $this->isCpuTask = $isCpuTask; $this->taskIsArchived = $taskIsArchived; $this->taskUsePreprocessor = $taskUsePreprocessor; + $this->hashlistName = $hashlistName; + $this->hashCount = $hashCount; + $this->hashlistCracked = $hashlistCracked; + $this->hashTypeId = $hashTypeId; + $this->hashTypeDescription = $hashTypeDescription; + $this->groupName = $groupName; } function getKeyValueDict(): array { @@ -80,6 +92,12 @@ function getKeyValueDict(): array { $dict['isCpuTask'] = $this->isCpuTask; $dict['taskIsArchived'] = $this->taskIsArchived; $dict['taskUsePreprocessor'] = $this->taskUsePreprocessor; + $dict['hashlistName'] = $this->hashlistName; + $dict['hashCount'] = $this->hashCount; + $dict['hashlistCracked'] = $this->hashlistCracked; + $dict['hashTypeId'] = $this->hashTypeId; + $dict['hashTypeDescription'] = $this->hashTypeDescription; + $dict['groupName'] = $this->groupName; return $dict; } @@ -109,6 +127,12 @@ static function getFeatures(): array { $dict['isCpuTask'] = ['read_only' => False, "type" => "bool", "subtype" => "unset", "choices" => "unset", "null" => False, "pk" => False, "protected" => False, "private" => False, "alias" => "isCpuTask", "public" => False, "dba_mapping" => False]; $dict['taskIsArchived'] = ['read_only' => False, "type" => "bool", "subtype" => "unset", "choices" => "unset", "null" => False, "pk" => False, "protected" => False, "private" => False, "alias" => "taskIsArchived", "public" => False, "dba_mapping" => False]; $dict['taskUsePreprocessor'] = ['read_only' => True, "type" => "int", "subtype" => "unset", "choices" => "unset", "null" => False, "pk" => False, "protected" => False, "private" => False, "alias" => "preprocessorId", "public" => False, "dba_mapping" => False]; + $dict['hashlistName'] = ['read_only' => True, "type" => "str(100)", "subtype" => "unset", "choices" => "unset", "null" => False, "pk" => False, "protected" => True, "private" => False, "alias" => "hashlistName", "public" => False, "dba_mapping" => False]; + $dict['hashCount'] = ['read_only' => True, "type" => "int", "subtype" => "unset", "choices" => "unset", "null" => False, "pk" => False, "protected" => True, "private" => False, "alias" => "hashCount", "public" => False, "dba_mapping" => False]; + $dict['hashlistCracked'] = ['read_only' => True, "type" => "int", "subtype" => "unset", "choices" => "unset", "null" => False, "pk" => False, "protected" => True, "private" => False, "alias" => "hashlistCracked", "public" => False, "dba_mapping" => False]; + $dict['hashTypeId'] = ['read_only' => True, "type" => "int", "subtype" => "unset", "choices" => "unset", "null" => False, "pk" => False, "protected" => True, "private" => False, "alias" => "hashTypeId", "public" => False, "dba_mapping" => False]; + $dict['hashTypeDescription'] = ['read_only' => True, "type" => "str(256)", "subtype" => "unset", "choices" => "unset", "null" => False, "pk" => False, "protected" => True, "private" => False, "alias" => "hashTypeDescription", "public" => False, "dba_mapping" => False]; + $dict['groupName'] = ['read_only' => True, "type" => "str(50)", "subtype" => "unset", "choices" => "unset", "null" => False, "pk" => False, "protected" => True, "private" => False, "alias" => "groupName", "public" => False, "dba_mapping" => False]; return $dict; } @@ -313,6 +337,54 @@ function setTaskUsePreprocessor(?int $taskUsePreprocessor): void { $this->taskUsePreprocessor = $taskUsePreprocessor; } + function getHashlistName(): ?string { + return $this->hashlistName; + } + + function setHashlistName(?string $hashlistName): void { + $this->hashlistName = $hashlistName; + } + + function getHashCount(): ?int { + return $this->hashCount; + } + + function setHashCount(?int $hashCount): void { + $this->hashCount = $hashCount; + } + + function getHashlistCracked(): ?int { + return $this->hashlistCracked; + } + + function setHashlistCracked(?int $hashlistCracked): void { + $this->hashlistCracked = $hashlistCracked; + } + + function getHashTypeId(): ?int { + return $this->hashTypeId; + } + + function setHashTypeId(?int $hashTypeId): void { + $this->hashTypeId = $hashTypeId; + } + + function getHashTypeDescription(): ?string { + return $this->hashTypeDescription; + } + + function setHashTypeDescription(?string $hashTypeDescription): void { + $this->hashTypeDescription = $hashTypeDescription; + } + + function getGroupName(): ?string { + return $this->groupName; + } + + function setGroupName(?string $groupName): void { + $this->groupName = $groupName; + } + const TASK_WRAPPER_ID = "taskWrapperId"; const TASK_WRAPPER_PRIORITY = "taskWrapperPriority"; const TASK_WRAPPER_MAX_AGENTS = "taskWrapperMaxAgents"; @@ -336,6 +408,12 @@ function setTaskUsePreprocessor(?int $taskUsePreprocessor): void { const IS_CPU_TASK = "isCpuTask"; const TASK_IS_ARCHIVED = "taskIsArchived"; const TASK_USE_PREPROCESSOR = "taskUsePreprocessor"; + const HASHLIST_NAME = "hashlistName"; + const HASH_COUNT = "hashCount"; + const HASHLIST_CRACKED = "hashlistCracked"; + const HASH_TYPE_ID = "hashTypeId"; + const HASH_TYPE_DESCRIPTION = "hashTypeDescription"; + const GROUP_NAME = "groupName"; const PERM_CREATE = "permTaskWrapperDisplayCreate"; const PERM_READ = "permTaskWrapperDisplayRead"; diff --git a/src/dba/models/TaskWrapperDisplayFactory.php b/src/dba/models/TaskWrapperDisplayFactory.php index 323ea044a..50552a138 100644 --- a/src/dba/models/TaskWrapperDisplayFactory.php +++ b/src/dba/models/TaskWrapperDisplayFactory.php @@ -30,7 +30,7 @@ function getCacheValidTime(): int { * @return TaskWrapperDisplay */ function getNullObject(): TaskWrapperDisplay { - return new TaskWrapperDisplay(-1, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null); + return new TaskWrapperDisplay(-1, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null); } /** @@ -44,7 +44,7 @@ function createObjectFromDict($pk, $dict): TaskWrapperDisplay { $conv[strtolower($key)] = $val; } $dict = $conv; - return new TaskWrapperDisplay($dict['taskwrapperid'], $dict['taskwrapperpriority'], $dict['taskwrappermaxagents'], $dict['tasktype'], $dict['hashlistid'], $dict['accessgroupid'], $dict['taskwrappername'], $dict['displayname'], $dict['taskwrapperisarchived'], $dict['cracked'], $dict['taskid'], $dict['taskname'], $dict['attackcmd'], $dict['chunktime'], $dict['statustimer'], $dict['keyspace'], $dict['keyspaceprogress'], $dict['taskpriority'], $dict['taskmaxagents'], $dict['issmall'], $dict['iscputask'], $dict['taskisarchived'], $dict['taskusepreprocessor']); + return new TaskWrapperDisplay($dict['taskwrapperid'], $dict['taskwrapperpriority'], $dict['taskwrappermaxagents'], $dict['tasktype'], $dict['hashlistid'], $dict['accessgroupid'], $dict['taskwrappername'], $dict['displayname'], $dict['taskwrapperisarchived'], $dict['cracked'], $dict['taskid'], $dict['taskname'], $dict['attackcmd'], $dict['chunktime'], $dict['statustimer'], $dict['keyspace'], $dict['keyspaceprogress'], $dict['taskpriority'], $dict['taskmaxagents'], $dict['issmall'], $dict['iscputask'], $dict['taskisarchived'], $dict['taskusepreprocessor'], $dict['hashlistname'], $dict['hashcount'], $dict['hashlistcracked'], $dict['hashtypeid'], $dict['hashtypedescription'], $dict['groupname']); } /** diff --git a/src/dba/models/generator.php b/src/dba/models/generator.php index c02a57ce8..f92957560 100644 --- a/src/dba/models/generator.php +++ b/src/dba/models/generator.php @@ -464,6 +464,12 @@ ['name' => 'isCpuTask', 'read_only' => False, 'type' => 'bool'], ['name' => 'taskIsArchived', 'read_only' => False, 'type' => 'bool'], ['name' => 'taskUsePreprocessor', 'read_only' => True, 'type' => 'int', 'alias' => 'preprocessorId'], + ['name' => 'hashlistName', 'read_only' => True, 'type' => 'str(100)', 'protected' => True], + ['name' => 'hashCount', 'read_only' => True, 'type' => 'int', 'protected' => True], + ['name' => 'hashlistCracked', 'read_only' => True, 'type' => 'int', 'protected' => True], + ['name' => 'hashTypeId', 'read_only' => True, 'type' => 'int', 'protected' => True], + ['name' => 'hashTypeDescription', 'read_only' => True, 'type' => 'str(256)', 'protected' => True], + ['name' => 'groupName', 'read_only' => True, 'type' => 'str(50)', 'protected' => True], ], ]; $CONF['User'] = [ diff --git a/src/inc/apiv2/model/TaskAPI.php b/src/inc/apiv2/model/TaskAPI.php index 6827b9141..b04671a92 100644 --- a/src/inc/apiv2/model/TaskAPI.php +++ b/src/inc/apiv2/model/TaskAPI.php @@ -200,22 +200,7 @@ function aggregateData(object $object, array &$included_data = [], ?array $aggre if (is_null($aggregateFieldsets) || in_array("isActive", $aggregateFieldsets['task'])) { $qF = new QueryFilter(Chunk::TASK_ID, $object->getId(), "="); $chunks = Factory::getChunkFactory()->filter([Factory::FILTER => $qF]); - //status 1 is running, 2 is idle and 3 is completed. - $status = 2; - if ($keyspaceProgress >= $keyspace && $keyspaceProgress > 0) { - $status = 3; - } else { - $now = time(); - $chunkTimeOut = SConfig::getInstance()->getVal(DConfig::CHUNK_TIMEOUT); - - foreach ($chunks as $chunk) { - if ($now - max($chunk->getSolveTime(), $chunk->getDispatchTime()) < $chunkTimeOut && $chunk->getProgress() < 10000) { - $status = 1; - break; - } - } - } - $aggregatedData["status"] = $status; + $aggregatedData["status"] = TaskUtils::getStatus($chunks, $keyspace, $keyspaceProgress); } if (is_null($aggregateFieldsets) || in_array("taskExtraDetails", $aggregateFieldsets['task'])) { @@ -259,7 +244,7 @@ function aggregateData(object $object, array &$included_data = [], ?array $aggre $aggregatedData["cprogress"] = $cProgress; } } - + return $aggregatedData; } diff --git a/src/inc/apiv2/model/TaskWrapperDisplayAPI.php b/src/inc/apiv2/model/TaskWrapperDisplayAPI.php index e695ba612..e31fca1fe 100644 --- a/src/inc/apiv2/model/TaskWrapperDisplayAPI.php +++ b/src/inc/apiv2/model/TaskWrapperDisplayAPI.php @@ -6,6 +6,7 @@ use Hashtopolis\dba\ContainFilter; use Hashtopolis\dba\Factory; use Hashtopolis\dba\JoinFilter; +use Hashtopolis\dba\models\Chunk; use Hashtopolis\dba\models\Hashlist; use Hashtopolis\dba\models\Task; use Hashtopolis\dba\models\TaskWrapper; @@ -14,8 +15,9 @@ use Hashtopolis\dba\QueryFilter; use Hashtopolis\inc\apiv2\common\AbstractModelAPI; use Hashtopolis\inc\apiv2\error\HttpError; +use Hashtopolis\inc\defines\DTaskTypes; use Hashtopolis\inc\Util; - +use Hashtopolis\inc\utils\TaskUtils; class TaskWrapperDisplayAPI extends AbstractModelAPI { public static function getBaseUri(): string { @@ -57,6 +59,38 @@ protected function getFilterACL(): array { ]; } + //TODO make aggregate data queryable and not included by default + function aggregateData(object $object, array &$included_data = [], ?array $aggregateFieldsets = null): array { + $aggregatedData = []; + if (is_null($aggregateFieldsets) || array_key_exists('taskwrapperdisplay', $aggregateFieldsets)) { + $tasks = TaskUtils::getTasksOfWrapper($object->getId()); + $completed = 0; + $total = 0; + $status = 0; + foreach($tasks as $task) { + $qF = new QueryFilter(Chunk::TASK_ID, $task->getId(), "="); + $chunks = Factory::getChunkFactory()->filter([Factory::FILTER => $qF]); + $taskStatus = TaskUtils::getStatus($chunks, $task->getKeyspace(), $task->getKeyspaceProgress()); + // if one task of the wrapper is running, it is running + if ($taskStatus === 1) { + $status = 1; + break; + } + if ($taskStatus === 3) { + $completed++; + } + $total++; + } + if ($status !== 1 && $total > 0 && $completed === $total) { + $status = 3; + } else { + $status = 2; + } + $aggregatedData['status'] = $status; + } + return $aggregatedData; + } + /** * @throws HttpError */ diff --git a/src/inc/utils/TaskUtils.php b/src/inc/utils/TaskUtils.php index 5d4b60279..0971649b6 100644 --- a/src/inc/utils/TaskUtils.php +++ b/src/inc/utils/TaskUtils.php @@ -124,6 +124,27 @@ public static function editNotes($taskId, $notes, $user) { $task = TaskUtils::getTask($taskId, $user); Factory::getTaskFactory()->set($task, Task::NOTES, $notes); } + + // Function for taskwrapper api to determine based on the chunks if a task is running, idle or completed. + // Status 1 is running, 2 is idle and 3 is completed. + public static function getStatus($chunks, $keyspace, $keyspaceProgress) { + //status 1 is running, 2 is idle and 3 is completed. + $status = 2; + if ($keyspaceProgress >= $keyspace && $keyspaceProgress > 0) { + $status = 3; + } else { + $now = time(); + $chunkTimeOut = SConfig::getInstance()->getVal(DConfig::CHUNK_TIMEOUT); + + foreach ($chunks as $chunk) { + if ($now - max($chunk->getSolveTime(), $chunk->getDispatchTime()) < $chunkTimeOut && $chunk->getProgress() < 10000) { + $status = 1; + break; + } + } + } + return $status; + } /** * @param User $user diff --git a/src/migrations/mysql/20260413140000_task-view.sql b/src/migrations/mysql/20260413140000_task-view.sql index 3bf1b5503..6d0422f7d 100644 --- a/src/migrations/mysql/20260413140000_task-view.sql +++ b/src/migrations/mysql/20260413140000_task-view.sql @@ -6,5 +6,11 @@ CREATE VIEW TaskWrapperDisplay AS SELECT t.statusTimer AS statusTimer, t.keyspace AS keyspace, t.keyspaceProgress AS keyspaceProgress, t.priority AS taskPriority, t.maxAgents AS taskMaxAgents, t.isArchived AS taskIsArchived, t.isSmall AS isSmall, t.isCpuTask AS isCpuTask, t.usePreprocessor AS taskUsePreprocessor, - CASE WHEN tw.taskType = 0 THEN t.taskName ELSE tw.taskWrapperName END AS displayName -FROM TaskWrapper tw LEFT JOIN Task t ON tw.taskType = 0 AND t.taskWrapperId = tw.taskWrapperId; \ No newline at end of file + CASE WHEN tw.taskType = 0 THEN t.taskName ELSE tw.taskWrapperName END AS displayName, + h.hashlistName AS hashlistName, h.hashCount AS hashCount, h.cracked as hashlistCracked, + ht.hashTypeId AS hashTypeId, ht.description AS hashTypeDescription, ag.groupName AS groupName +FROM TaskWrapper tw + LEFT JOIN Task t ON tw.taskType = 0 AND t.taskWrapperId = tw.taskWrapperId + INNER JOIN Hashlist h ON tw.hashlistId = h.hashlistId + INNER JOIN HashType ht on h.hashTypeId = ht.hashTypeId + INNER JOIN AccessGroup ag on tw.accessGroupId = ag.accessGroupId; \ No newline at end of file diff --git a/src/migrations/postgres/20260413140000_task-view.sql b/src/migrations/postgres/20260413140000_task-view.sql index 16c3591fb..6d0422f7d 100644 --- a/src/migrations/postgres/20260413140000_task-view.sql +++ b/src/migrations/postgres/20260413140000_task-view.sql @@ -1,4 +1,4 @@ -CREATE VIEW TaskWrapperDisplay AS SELECT +CREATE VIEW TaskWrapperDisplay AS SELECT tw.taskWrapperId AS taskWrapperId, tw.priority AS taskWrapperPriority, tw.maxAgents AS taskWrapperMaxAgents, tw.taskType AS taskType, tw.hashlistId AS hashlistId, tw.accessGroupId AS accessGroupId, tw.taskWrapperName AS taskWrapperName, tw.isArchived AS taskWrapperIsArchived, tw.cracked AS cracked, @@ -6,5 +6,11 @@ CREATE VIEW TaskWrapperDisplay AS SELECT t.statusTimer AS statusTimer, t.keyspace AS keyspace, t.keyspaceProgress AS keyspaceProgress, t.priority AS taskPriority, t.maxAgents AS taskMaxAgents, t.isArchived AS taskIsArchived, t.isSmall AS isSmall, t.isCpuTask AS isCpuTask, t.usePreprocessor AS taskUsePreprocessor, - CASE WHEN tw.taskType = 0 THEN t.taskName ELSE tw.taskWrapperName END AS displayName -FROM TaskWrapper tw LEFT JOIN Task t ON tw.taskType = 0 AND t.taskWrapperId = tw.taskWrapperId; + CASE WHEN tw.taskType = 0 THEN t.taskName ELSE tw.taskWrapperName END AS displayName, + h.hashlistName AS hashlistName, h.hashCount AS hashCount, h.cracked as hashlistCracked, + ht.hashTypeId AS hashTypeId, ht.description AS hashTypeDescription, ag.groupName AS groupName +FROM TaskWrapper tw + LEFT JOIN Task t ON tw.taskType = 0 AND t.taskWrapperId = tw.taskWrapperId + INNER JOIN Hashlist h ON tw.hashlistId = h.hashlistId + INNER JOIN HashType ht on h.hashTypeId = ht.hashTypeId + INNER JOIN AccessGroup ag on tw.accessGroupId = ag.accessGroupId; \ No newline at end of file From 393d6c418604e6a0494c9649b31607a80bdc9491 Mon Sep 17 00:00:00 2001 From: jessevz Date: Wed, 15 Apr 2026 08:59:58 +0200 Subject: [PATCH 493/691] Fixed bug in status calculation taskwrapper display --- src/inc/apiv2/model/TaskWrapperDisplayAPI.php | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/src/inc/apiv2/model/TaskWrapperDisplayAPI.php b/src/inc/apiv2/model/TaskWrapperDisplayAPI.php index e31fca1fe..5fe477678 100644 --- a/src/inc/apiv2/model/TaskWrapperDisplayAPI.php +++ b/src/inc/apiv2/model/TaskWrapperDisplayAPI.php @@ -81,10 +81,12 @@ function aggregateData(object $object, array &$included_data = [], ?array $aggre } $total++; } - if ($status !== 1 && $total > 0 && $completed === $total) { - $status = 3; - } else { - $status = 2; + if ($status !== 1) { + if ($total > 0 && $completed === $total) { + $status = 3; + } else { + $status = 2; + } } $aggregatedData['status'] = $status; } From 6b44a274d32006562f01fc50d2d5eedf2de2f140 Mon Sep 17 00:00:00 2001 From: s3inlc Date: Wed, 15 Apr 2026 09:24:31 +0200 Subject: [PATCH 494/691] fix subtask loading where wrong use statement was used --- src/ajax/get_subtasks.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/ajax/get_subtasks.php b/src/ajax/get_subtasks.php index fd80aedf6..8c0bbba3b 100644 --- a/src/ajax/get_subtasks.php +++ b/src/ajax/get_subtasks.php @@ -2,7 +2,7 @@ use Hashtopolis\dba\OrderFilter; use Hashtopolis\dba\QueryFilter; -use Hashtopolis\dba\Task; +use Hashtopolis\dba\models\Task; use Hashtopolis\dba\Factory; use Hashtopolis\inc\DataSet; use Hashtopolis\inc\Login; From 57172e9413278053c1a4b924b9a94f9759cec7ef Mon Sep 17 00:00:00 2001 From: s3inlc Date: Wed, 15 Apr 2026 09:44:00 +0200 Subject: [PATCH 495/691] also correct cracked count of task wrappers if needed --- src/inc/utils/ConfigUtils.php | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/src/inc/utils/ConfigUtils.php b/src/inc/utils/ConfigUtils.php index 92fa74d49..002dc55da 100644 --- a/src/inc/utils/ConfigUtils.php +++ b/src/inc/utils/ConfigUtils.php @@ -3,6 +3,7 @@ namespace Hashtopolis\inc\utils; use Hashtopolis\dba\models\File; +use Hashtopolis\dba\models\TaskWrapper; use Hashtopolis\dba\models\User; use Hashtopolis\dba\models\Task; use Hashtopolis\dba\models\Chunk; @@ -76,7 +77,7 @@ public static function getAll() { } const DEFAULT_CONFIG_SECTION = 5; - + public static function updateSingleConfig($id, $attributes) { $currentConfig = Factory::getConfigFactory()->get($id); if (is_null($currentConfig)) { @@ -167,7 +168,7 @@ public static function updateConfig($arr) { /** * @return int[] */ - public static function rebuildCache() { + public static function rebuildCache(): array { $correctedChunks = 0; $correctedHashlists = 0; @@ -183,16 +184,21 @@ public static function rebuildCache() { /** @var $chunks Chunk[] */ $chunks = $joined[Factory::getChunkFactory()->getModelName()]; + $total_cracked = 0; foreach ($chunks as $chunk) { $hashFactory = ($hashlists[0]->getFormat() == DHashlistFormat::PLAIN) ? Factory::getHashFactory() : Factory::getHashBinaryFactory(); $qF1 = new QueryFilter(Hash::CHUNK_ID, $chunk->getId(), "="); $qF2 = new QueryFilter(Hash::IS_CRACKED, "1", "="); $count = $hashFactory->countFilter([Factory::FILTER => [$qF1, $qF2]]); + $total_cracked += $count; if ($count != $chunk->getCracked()) { $correctedChunks++; Factory::getChunkFactory()->set($chunk, Chunk::CRACKED, $count); } } + if ($total_cracked != $taskWrapper->getCracked()) { + Factory::getTaskWrapperFactory()->set($taskWrapper, TaskWrapper::CRACKED, $total_cracked); + } } Factory::getAgentFactory()->getDB()->commit(); From 2caa18edb99caee87c78e07935c3afb4edeb82d2 Mon Sep 17 00:00:00 2001 From: s3inlc Date: Wed, 15 Apr 2026 14:56:11 +0200 Subject: [PATCH 496/691] fixed missing includes --- src/chunks.php | 2 ++ src/hashes.php | 1 + 2 files changed, 3 insertions(+) diff --git a/src/chunks.php b/src/chunks.php index 32f765619..e3fb4c40c 100755 --- a/src/chunks.php +++ b/src/chunks.php @@ -13,8 +13,10 @@ use Hashtopolis\inc\defines\DViewControl; use Hashtopolis\inc\Login; use Hashtopolis\inc\Menu; +use Hashtopolis\inc\Util; use Hashtopolis\inc\templating\Template; use Hashtopolis\inc\UI; +use Hashtopolis\inc\utils\AccessUtils; use Hashtopolis\inc\utils\AccessControl; require_once(dirname(__FILE__) . "/inc/startup/load.php"); diff --git a/src/hashes.php b/src/hashes.php index 1de1621cc..17a5e8693 100755 --- a/src/hashes.php +++ b/src/hashes.php @@ -19,6 +19,7 @@ use Hashtopolis\inc\templating\Template; use Hashtopolis\inc\UI; use Hashtopolis\inc\Util; +use Hashtopolis\inc\utils\AccessUtils; use Hashtopolis\inc\utils\AccessControl; require_once(dirname(__FILE__) . "/inc/startup/load.php"); From 08d317fad24e7b2e3ddd36cedfedc7339ee4357c Mon Sep 17 00:00:00 2001 From: s3inlc Date: Thu, 16 Apr 2026 15:09:12 +0200 Subject: [PATCH 497/691] prepare for release --- doc/changelog.md | 37 +++++++++++++++++++++++++++++++++++++ src/inc/StartupConfig.php | 4 ++-- 2 files changed, 39 insertions(+), 2 deletions(-) diff --git a/doc/changelog.md b/doc/changelog.md index af9ae54d7..55192bf28 100644 --- a/doc/changelog.md +++ b/doc/changelog.md @@ -1,5 +1,42 @@ # Changelog +## v1.0.0-rainbow5 -> v1.0.0-rainbow6 + +**Bugfixes** + +- Fixed tusFileCleaning error (#1949) +- Catch a migration running error and prevent docker-entrypoint to continue further on failure (#1951) +- Fixed bug where PATCHING and POST was not checked for permissions (#1957) +- Fixed patch current user to change own user without permissions (#1958) +- Fixed bug in content length calculation (#1984) +- Parse comma in filter (#1985) +- Fixed creation of task by using correct parameter for cracker binary (#2012) +- fix user object argument for supertask builder helper (#2032) +- Fixed access issues where users could access chunk and hash info from other access groups they were not member of. Thanks to Mateo Hahn from the Red Team Ops of Bureau Veritas Cybersecurity for finding and reporting this issue. (#2031) +- Fix subtask loading where wrong use statement was used (#2036) +- Correct cracked count of task wrappers if needed (#2037) +- Made a taskwrapperview to be able to properly sort in the task view (#2034) + +**Enhancements** + + +- Update the basic install manual according to the latest release (#1946) +- Update of the manual- - fixing style (#1947) +- Large Rework on Codebase (#1929) +- Made CrackerBinaryType.typeName unique (#1950) +- Improve IPv6 handling on about page (#1943) +- Removed taskExtraDetails endpoint (#1945) +- made classpath calls to usort consistent (#1952) +- Added helper for getting available tasks for agent (#1953) +- Api tokens (#1965) +- Removed not working transaction for updating hash length (#1979) +- Made it possible to update a single config (#1981) +- Better error message when login in with invalid user (#1991) +- Fixed class names by removing the package from the name (#1987) +- Updated nginx docs to recent syntax and status code 308 for redirect (#2003) +- Added a flag isActive to tasks api response to show whether a task is active (#2005) +- Check if the total hash count of a hashlist needs to be fixed (#2033) + ## v1.0.0-rainbow4 -> v1.0.0-rainbow5 **Bugfixes** diff --git a/src/inc/StartupConfig.php b/src/inc/StartupConfig.php index f8fe7f3ea..6c2621ab6 100644 --- a/src/inc/StartupConfig.php +++ b/src/inc/StartupConfig.php @@ -234,7 +234,7 @@ public function getPepper(int $index): string { } public function getVersion(): string { - return "v1.0.0-rainbow5"; + return "v1.0.0-rainbow6"; } public function getBuild(): string { @@ -249,4 +249,4 @@ public function getHost(): string { return $host; } -} \ No newline at end of file +} From 277c18fafa59b9b02da131849c2129c71285cced Mon Sep 17 00:00:00 2001 From: jessevz Date: Wed, 29 Apr 2026 13:45:03 +0200 Subject: [PATCH 498/691] Added more tests --- ci/apiv2/test_agent.py | 4 ++ ci/apiv2/test_agentassignment.py | 5 +- ci/apiv2/test_agentstat.py | 7 +++ ci/apiv2/test_apitoken.py | 60 +++++++++++++++++++ ci/apiv2/test_file.py | 4 ++ ci/apiv2/test_hash.py | 2 +- ci/apiv2/test_hashlist.py | 4 ++ ci/apiv2/test_pretask.py | 2 +- ci/apiv2/test_task.py | 4 ++ ci/apiv2/test_taskwrapper.py | 4 ++ .../apitoken/create_apitoken_001.json | 3 + ci/apiv2/utils.py | 40 +++++++++++++ 12 files changed, 136 insertions(+), 3 deletions(-) create mode 100644 ci/apiv2/test_apitoken.py create mode 100644 ci/apiv2/testfiles/apitoken/create_apitoken_001.json diff --git a/ci/apiv2/test_agent.py b/ci/apiv2/test_agent.py index e60b37f7d..3c83fd3dc 100644 --- a/ci/apiv2/test_agent.py +++ b/ci/apiv2/test_agent.py @@ -84,3 +84,7 @@ def test_bulk_activate(self): agents = [self.create_agent() for i in range(5)] active_attributes = [True for i in range(5)] Agent.objects.patch_many(agents, active_attributes, "isActive") + + def test_acl(self): + model_obj = self.create_test_object() + self._test_acl_list(model_obj, {'permAgentRead': True}) diff --git a/ci/apiv2/test_agentassignment.py b/ci/apiv2/test_agentassignment.py index 6c3810a9a..d2af3ad75 100644 --- a/ci/apiv2/test_agentassignment.py +++ b/ci/apiv2/test_agentassignment.py @@ -1,6 +1,5 @@ from hashtopolis import AgentAssignment -from hashtopolis_agent import DummyAgent from utils import BaseTest, do_create_dummy_agent @@ -47,3 +46,7 @@ def test_agent_assign_task(self): self.assertEqual(len(check), 1) self.assertEqual(check[0].agentId, agent.id) self.assertEqual(check[0].taskId, task.id) + + def test_acl(self): + model_obj = self.create_test_object() + self._test_acl_list(model_obj, {'permAgentAssignmentRead': True}) diff --git a/ci/apiv2/test_agentstat.py b/ci/apiv2/test_agentstat.py index 6baa2dce9..9c7271484 100644 --- a/ci/apiv2/test_agentstat.py +++ b/ci/apiv2/test_agentstat.py @@ -33,3 +33,10 @@ def test_cpu_utilisation(self): objs = AgentStat.objects.filter(agentId=agent.id, statType=3) self.assertEqual(len(objs), 1) self.assertListEqual(objs[0].value, cpu_utilisations) + + def test_acl(self): + retval = self.create_agent_with_task() + agent = retval['agent'] + stats = list(AgentStat.objects.filter(agentId=agent.id)) + self.assertGreater(len(stats), 0, "Expected agent stats to exist for ACL test") + self._test_acl_list(stats[0], {'permAgentStatRead': True}) diff --git a/ci/apiv2/test_apitoken.py b/ci/apiv2/test_apitoken.py new file mode 100644 index 000000000..1dbe89f20 --- /dev/null +++ b/ci/apiv2/test_apitoken.py @@ -0,0 +1,60 @@ +from hashtopolis import ApiToken, HashtopolisError +from utils import BaseTest + + +class ApiTokenTest(BaseTest): + model_class = ApiToken + + def create_test_object(self, *nargs, **kwargs): + return self.create_apitoken(*nargs, **kwargs) + + def test_create(self): + model_obj = self.create_test_object() + self._test_create(model_obj) + + def test_token_returned_on_create(self): + model_obj = self.create_test_object() + # The JWT token string is only present in the POST response + self.assertTrue(hasattr(model_obj, 'token')) + self.assertIsNotNone(model_obj.token) + self.assertIsInstance(model_obj.token, str) + self.assertGreater(len(model_obj.token), 0) + + def test_token_not_in_get(self): + model_obj = self.create_test_object() + # Retrieve the object via GET and verify the token field is absent + obj = self.model_class.objects.get(pk=model_obj.id) + self.assertFalse(hasattr(obj, 'token') and obj.token is not None) + + def test_delete(self): + model_obj = self.create_test_object(delete=False) + self._test_delete(model_obj) + + def test_revoke(self): + model_obj = self.create_test_object() + self._test_patch(model_obj, 'isRevoked', True) + + def test_expand_user(self): + model_obj = self.create_test_object() + self._test_expandables(model_obj, ['user']) + + def test_patch_readonly_startValid(self): + model_obj = self.create_test_object() + model_obj.startValid = 0 + with self.assertRaises(HashtopolisError) as e: + model_obj.save() + self.assertEqual(e.exception.status_code, 403) + self.assertIn('startValid', e.exception.title) + + def test_patch_readonly_endValid(self): + model_obj = self.create_test_object() + model_obj.endValid = 9999999999 + with self.assertRaises(HashtopolisError) as e: + model_obj.save() + self.assertEqual(e.exception.status_code, 403) + self.assertIn('endValid', e.exception.title) + + def test_acl(self): + # Admin's token should not be visible to a different user + model_obj = self.create_test_object() + self._test_acl_list(model_obj, {'permJwtApiKeyRead': True}) diff --git a/ci/apiv2/test_file.py b/ci/apiv2/test_file.py index aabba0f2c..b0f37dede 100644 --- a/ci/apiv2/test_file.py +++ b/ci/apiv2/test_file.py @@ -58,6 +58,10 @@ def test_bulk_delete(self): files = [self.create_test_object(delete=False) for i in range(5)] File.objects.delete_many(files) + def test_acl(self): + model_obj = self.create_test_object() + self._test_acl_list(model_obj, {'permFileRead': True}) + def test_helper_rescan_global_files(self): model_obj1 = self.create_test_object() model_obj2 = self.create_test_object() diff --git a/ci/apiv2/test_hash.py b/ci/apiv2/test_hash.py index 4eabf03da..a4340f817 100644 --- a/ci/apiv2/test_hash.py +++ b/ci/apiv2/test_hash.py @@ -1,4 +1,4 @@ -from hashtopolis import Hash, HashtopolisResponseError, HashtopolisError +from hashtopolis import Hash, HashtopolisResponseError from utils import BaseTest diff --git a/ci/apiv2/test_hashlist.py b/ci/apiv2/test_hashlist.py index 186c0a25b..1a86cad2e 100644 --- a/ci/apiv2/test_hashlist.py +++ b/ci/apiv2/test_hashlist.py @@ -158,3 +158,7 @@ def test_bulk_archive(self): def test_bulk_delete(self): hashlists = [self.create_test_object(delete=False) for i in range(5)] Hashlist.objects.delete_many(hashlists) + + def test_acl(self): + model_obj = self.create_test_object() + self._test_acl_list(model_obj, {'permHashlistRead': True}) diff --git a/ci/apiv2/test_pretask.py b/ci/apiv2/test_pretask.py index 2d0c2590c..2606eeb6e 100644 --- a/ci/apiv2/test_pretask.py +++ b/ci/apiv2/test_pretask.py @@ -1,5 +1,5 @@ from hashtopolis import Pretask, HashtopolisError -from utils import BaseTest,do_create_pretask +from utils import BaseTest class PretaskTest(BaseTest): diff --git a/ci/apiv2/test_task.py b/ci/apiv2/test_task.py index af55f83d0..cf0463143 100644 --- a/ci/apiv2/test_task.py +++ b/ci/apiv2/test_task.py @@ -237,6 +237,10 @@ def test_toggle_archive_task_supertask_type(self): # UPDATE tasks SET isArchived = $taskState WHERE taskWrapperId = $wrapper->getId() # This test validates that the query pattern works correctly. + def test_acl(self): + model_obj = self.create_test_object() + self._test_acl_list(model_obj, {'permTaskRead': True}) + def test_toggle_archive_task_invalid_type_error(self): """Test that toggleArchiveTask throws an error for invalid task types""" # Create a normal task diff --git a/ci/apiv2/test_taskwrapper.py b/ci/apiv2/test_taskwrapper.py index 51421a40b..8cb15ae92 100644 --- a/ci/apiv2/test_taskwrapper.py +++ b/ci/apiv2/test_taskwrapper.py @@ -71,3 +71,7 @@ def test_helper_create_supertask_generic_cracker(self): self.assertEqual(len(objs), 1, "Should only create 1 TaskWrapper") self.assertEqual(taskwrapper, objs[0], "Returned create_supertask object != object found by filter") + + def test_acl(self): + model_obj = self.create_test_object() + self._test_acl_list(model_obj, {'permTaskWrapperRead': True}) diff --git a/ci/apiv2/testfiles/apitoken/create_apitoken_001.json b/ci/apiv2/testfiles/apitoken/create_apitoken_001.json new file mode 100644 index 000000000..52043fc69 --- /dev/null +++ b/ci/apiv2/testfiles/apitoken/create_apitoken_001.json @@ -0,0 +1,3 @@ +{ + "scopes": "permHashlistRead" +} diff --git a/ci/apiv2/utils.py b/ci/apiv2/utils.py index dc0e2ba0a..c29893c19 100644 --- a/ci/apiv2/utils.py +++ b/ci/apiv2/utils.py @@ -11,7 +11,9 @@ import confidence +from hashtopolis import ApiToken from hashtopolis import AccessGroup +from hashtopolis import Helper from hashtopolis import Agent from hashtopolis import AgentAssignment from hashtopolis import AgentBinary @@ -102,6 +104,12 @@ def do_create_agentbinary(**kwargs): return _do_create_obj_from_file(AgentBinary, 'create_agentbinary', **kwargs) +def do_create_apitoken(extra_payload={}, **kwargs): + now = int(time.time()) + extra_payload = {**extra_payload, 'startValid': now, 'endValid': now + 3600} + return _do_create_obj_from_file(ApiToken, 'create_apitoken', extra_payload, **kwargs) + + def do_create_accessgroup(**kwargs): return _do_create_obj_from_file(AccessGroup, 'create_accessgroup', **kwargs) @@ -202,6 +210,27 @@ def do_create_voucher(): return Voucher(voucher=f'dummy-test-{stamp}').save() +def create_restricted_user(base_test, permissions): + """Create a non-admin user with the given permissions and no access groups, then log in as them.""" + password = 'acl-test-pass-123!' + group = do_create_globalpermissiongroup(permissions=permissions) + base_test.delete_after_test(group) + user = do_create_user(global_permission_group_id=group.id) + base_test.delete_after_test(user) + Helper().set_user_password(user, password) + + # New users are auto-added to the default access group (ID 1). Remove the user so + # they have no access group membership, which is required for ACL tests to be meaningful. + connector = AccessGroup.objects.get_conn() + connector.authenticate() + uri = connector._api_endpoint + '/ui/accessgroups/1/relationships/userMembers' + headers = {**connector._headers, 'Content-Type': 'application/json'} + payload = {"data": [{"type": "User", "id": user.id}]} + r = requests.delete(uri, headers=headers, data=json.dumps(payload)) + assert r.status_code in [201], f"Failed to remove user from default access group: status={r.status_code} body={r.text}" + + return (user.name, password) + def find_stale_test_objects(): # Order matters, for example a Task needs to be removed before Hashlist can be removed # Note: we are not removing default database objects @@ -281,6 +310,9 @@ def _create_test_object(self, model_create_func, *nargs, delete=True, **kwargs): def create_test_object(self, *nargs, **kwargs): raise NotImplementedError("Implement class specific create_test_object mapping function") + def create_apitoken(self, **kwargs): + return self._create_test_object(do_create_apitoken, **kwargs) + def create_accessgroup(self, **kwargs): return self._create_test_object(do_create_accessgroup, **kwargs) @@ -384,6 +416,14 @@ def _test_exception(self, func_create, *args, **kwargs): # checks len of both old and new exceptions style, TODO: old can be removed when ervything has been refactored. self.assertTrue(len(e.exception.exception_details) >= 1 or len(e.exception.title) >= 1) + def _test_acl_list(self, model_obj, permissions): + """Test that a restricted user (with no access groups) cannot see the object in list results.""" + auth = create_restricted_user(self, permissions) + objs = list(self.model_class.objects.filter(id=model_obj.id).authenticate(auth)) + self.assertEqual(len(objs), 0, "Restricted user should not see this object in list results") + objs = list(self.model_class.objects.filter(id=model_obj.id)) + self.assertGreater(len(objs), 0, "Admin user should see this object in list results") + def _test_patch(self, model_obj, attr, new_attr_value=None): """ Generic test worker to PATCH object""" # Create new value From f76ba3eaffd8e1b90a404115e7035baa9350542f Mon Sep 17 00:00:00 2001 From: jessevz Date: Wed, 29 Apr 2026 14:45:35 +0200 Subject: [PATCH 499/691] Fixed apitoken tests --- ci/apiv2/test_apitoken.py | 20 ++++++++----------- .../apitoken/create_apitoken_001.json | 2 +- 2 files changed, 9 insertions(+), 13 deletions(-) diff --git a/ci/apiv2/test_apitoken.py b/ci/apiv2/test_apitoken.py index 1dbe89f20..6e61e585e 100644 --- a/ci/apiv2/test_apitoken.py +++ b/ci/apiv2/test_apitoken.py @@ -9,11 +9,11 @@ def create_test_object(self, *nargs, **kwargs): return self.create_apitoken(*nargs, **kwargs) def test_create(self): - model_obj = self.create_test_object() + model_obj = self.create_test_object(delete=False) self._test_create(model_obj) def test_token_returned_on_create(self): - model_obj = self.create_test_object() + model_obj = self.create_test_object(delete=False) # The JWT token string is only present in the POST response self.assertTrue(hasattr(model_obj, 'token')) self.assertIsNotNone(model_obj.token) @@ -21,25 +21,21 @@ def test_token_returned_on_create(self): self.assertGreater(len(model_obj.token), 0) def test_token_not_in_get(self): - model_obj = self.create_test_object() + model_obj = self.create_test_object(delete=False) # Retrieve the object via GET and verify the token field is absent obj = self.model_class.objects.get(pk=model_obj.id) self.assertFalse(hasattr(obj, 'token') and obj.token is not None) - def test_delete(self): - model_obj = self.create_test_object(delete=False) - self._test_delete(model_obj) - def test_revoke(self): - model_obj = self.create_test_object() + model_obj = self.create_test_object(delete=False) self._test_patch(model_obj, 'isRevoked', True) def test_expand_user(self): - model_obj = self.create_test_object() + model_obj = self.create_test_object(delete=False) self._test_expandables(model_obj, ['user']) def test_patch_readonly_startValid(self): - model_obj = self.create_test_object() + model_obj = self.create_test_object(delete=False) model_obj.startValid = 0 with self.assertRaises(HashtopolisError) as e: model_obj.save() @@ -47,7 +43,7 @@ def test_patch_readonly_startValid(self): self.assertIn('startValid', e.exception.title) def test_patch_readonly_endValid(self): - model_obj = self.create_test_object() + model_obj = self.create_test_object(delete=False) model_obj.endValid = 9999999999 with self.assertRaises(HashtopolisError) as e: model_obj.save() @@ -56,5 +52,5 @@ def test_patch_readonly_endValid(self): def test_acl(self): # Admin's token should not be visible to a different user - model_obj = self.create_test_object() + model_obj = self.create_test_object(delete=False) self._test_acl_list(model_obj, {'permJwtApiKeyRead': True}) diff --git a/ci/apiv2/testfiles/apitoken/create_apitoken_001.json b/ci/apiv2/testfiles/apitoken/create_apitoken_001.json index 52043fc69..d934f5388 100644 --- a/ci/apiv2/testfiles/apitoken/create_apitoken_001.json +++ b/ci/apiv2/testfiles/apitoken/create_apitoken_001.json @@ -1,3 +1,3 @@ { - "scopes": "permHashlistRead" + "scopes": ["permHashlistRead"] } From d768cf127ed6c0169bf2ceed765f187722960a74 Mon Sep 17 00:00:00 2001 From: jessevz Date: Wed, 6 May 2026 08:55:14 +0200 Subject: [PATCH 500/691] Fixed copilot suggestion --- ci/apiv2/utils.py | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/ci/apiv2/utils.py b/ci/apiv2/utils.py index c29893c19..863e3a378 100644 --- a/ci/apiv2/utils.py +++ b/ci/apiv2/utils.py @@ -106,7 +106,9 @@ def do_create_agentbinary(**kwargs): def do_create_apitoken(extra_payload={}, **kwargs): now = int(time.time()) - extra_payload = {**extra_payload, 'startValid': now, 'endValid': now + 3600} + extra_payload = dict(extra_payload or {}) + extra_payload.setdefault('startValid', now) + extra_payload.setdefault('endValid', now + 3600) return _do_create_obj_from_file(ApiToken, 'create_apitoken', extra_payload, **kwargs) From d21feb916253a49172005c510962d942f52820b4 Mon Sep 17 00:00:00 2001 From: andreas Date: Wed, 6 May 2026 12:05:33 +0000 Subject: [PATCH 501/691] 2050 Configured sendmail in dev / ci environments to return immediately instead of trying to send mail --- .devcontainer/docker-compose.mysql.yml | 1 + .devcontainer/docker-compose.postgres.yml | 1 + .github/docker-compose.mysql.yml | 1 + .github/docker-compose.postgres.yml | 1 + ci/php/zz-mail-disable.ini | 2 ++ 5 files changed, 6 insertions(+) create mode 100644 ci/php/zz-mail-disable.ini diff --git a/.devcontainer/docker-compose.mysql.yml b/.devcontainer/docker-compose.mysql.yml index 0c6817f97..52adc52d7 100644 --- a/.devcontainer/docker-compose.mysql.yml +++ b/.devcontainer/docker-compose.mysql.yml @@ -25,6 +25,7 @@ services: - ..:/var/www/html - hashtopolis-server-dev:/usr/local/share/hashtopolis:Z # - ./jwks.json:/keys/jwks.json:ro + - ../ci/php/zz-mail-disable.ini:/usr/local/etc/php/conf.d/zz-mail-disable.ini:ro networks: - hashtopolis_dev hashtopolis-db-dev: diff --git a/.devcontainer/docker-compose.postgres.yml b/.devcontainer/docker-compose.postgres.yml index ed985a0d0..e807ef60f 100644 --- a/.devcontainer/docker-compose.postgres.yml +++ b/.devcontainer/docker-compose.postgres.yml @@ -25,6 +25,7 @@ services: - ..:/var/www/html - hashtopolis-server-dev:/usr/local/share/hashtopolis:Z # - ./jwks.json:/keys/jwks.json:ro + - ../ci/php/zz-mail-disable.ini:/usr/local/etc/php/conf.d/zz-mail-disable.ini:ro networks: - hashtopolis_dev hashtopolis-db-dev: diff --git a/.github/docker-compose.mysql.yml b/.github/docker-compose.mysql.yml index f8b016f2f..8bbd5eb7a 100644 --- a/.github/docker-compose.mysql.yml +++ b/.github/docker-compose.mysql.yml @@ -21,6 +21,7 @@ services: - "8080:80" volumes: - hashtopolis-server-dev:/usr/local/share/hashtopolis:Z + - ../ci/php/zz-mail-disable.ini:/usr/local/etc/php/conf.d/zz-mail-disable.ini:ro networks: - hashtopolis_dev hashtopolis-db-dev: diff --git a/.github/docker-compose.postgres.yml b/.github/docker-compose.postgres.yml index d52312acf..95d56968d 100644 --- a/.github/docker-compose.postgres.yml +++ b/.github/docker-compose.postgres.yml @@ -21,6 +21,7 @@ services: - "8080:80" volumes: - hashtopolis-server-dev:/usr/local/share/hashtopolis:Z + - ../ci/php/zz-mail-disable.ini:/usr/local/etc/php/conf.d/zz-mail-disable.ini:ro networks: - hashtopolis_dev hashtopolis-db-dev: diff --git a/ci/php/zz-mail-disable.ini b/ci/php/zz-mail-disable.ini new file mode 100644 index 000000000..d5ca294ae --- /dev/null +++ b/ci/php/zz-mail-disable.ini @@ -0,0 +1,2 @@ +# Make the send mail function return properly in non-mail configured environments +sendmail_path = /bin/true \ No newline at end of file From fc1d718291860c57d48948cf3d6e3ecfc998b591 Mon Sep 17 00:00:00 2001 From: jessevz Date: Wed, 6 May 2026 19:05:31 +0200 Subject: [PATCH 502/691] Upgrade composer packages --- composer.json | 7 +- composer.lock | 330 +++++++++++++++++++++++++------------------------- 2 files changed, 168 insertions(+), 169 deletions(-) diff --git a/composer.json b/composer.json index 31ee80ed9..4d4c48a74 100644 --- a/composer.json +++ b/composer.json @@ -18,19 +18,20 @@ ], "require": { "php": "^8.2", + "ext-gd": "*", "ext-json": "*", "ext-pdo": "*", - "ext-gd" : "*", "composer/semver": "^3.4", "crell/api-problem": "^3.6", + "firebase/php-jwt": "7.0.2", + "jimtools/basic-auth": "^1.0", "jimtools/jwt-auth": "^3.0", "middlewares/encoder": "^2.1", "middlewares/negotiation": "^2.1", "monolog/monolog": "^2.8", "php-di/php-di": "7.0.7", "slim/psr7": "^1.5", - "slim/slim": "^4.10", - "tuupola/slim-basic-auth": "^3.3" + "slim/slim": "^4.10" }, "require-dev": { "phpspec/prophecy-phpunit": "^2.0", diff --git a/composer.lock b/composer.lock index 160844b48..58b16b6f3 100644 --- a/composer.lock +++ b/composer.lock @@ -4,7 +4,7 @@ "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies", "This file is @generated automatically" ], - "content-hash": "8e561ebf11be4bc46b585d70c42f2d0a", + "content-hash": "f79a8ed206218eeeefbc541ed3ff19a9", "packages": [ { "name": "composer/semver", @@ -215,12 +215,12 @@ "version": "v7.0.2", "source": { "type": "git", - "url": "https://github.com/firebase/php-jwt.git", + "url": "https://github.com/googleapis/php-jwt.git", "reference": "5645b43af647b6947daac1d0f659dd1fbe8d3b65" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/firebase/php-jwt/zipball/5645b43af647b6947daac1d0f659dd1fbe8d3b65", + "url": "https://api.github.com/repos/googleapis/php-jwt/zipball/5645b43af647b6947daac1d0f659dd1fbe8d3b65", "reference": "5645b43af647b6947daac1d0f659dd1fbe8d3b65", "shasum": "" }, @@ -268,23 +268,93 @@ "php" ], "support": { - "issues": "https://github.com/firebase/php-jwt/issues", - "source": "https://github.com/firebase/php-jwt/tree/v7.0.2" + "issues": "https://github.com/googleapis/php-jwt/issues", + "source": "https://github.com/googleapis/php-jwt/tree/v7.0.2" }, "time": "2025-12-16T22:17:28+00:00" }, + { + "name": "jimtools/basic-auth", + "version": "v1.0.0", + "source": { + "type": "git", + "url": "https://github.com/JimTools/basic-auth.git", + "reference": "29488cce4694773997b67b535ce9d6bf353d3acc" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/JimTools/basic-auth/zipball/29488cce4694773997b67b535ce9d6bf353d3acc", + "reference": "29488cce4694773997b67b535ce9d6bf353d3acc", + "shasum": "" + }, + "require": { + "php": "^7.2|^8.0", + "psr/http-message": "^1.0.1|^2.0", + "psr/http-server-middleware": "^1.0", + "tuupola/callable-handler": "^0.3.0|^0.4.0|^1.0", + "tuupola/http-factory": "^0.4.0|^1.0.2" + }, + "replace": { + "tuupola/slim-basic-auth": "*" + }, + "require-dev": { + "equip/dispatch": "^2.0", + "laminas/laminas-diactoros": "^1.3|^2.0|^3.0", + "overtrue/phplint": "^3.0|^4.0|^5.0|^6.0", + "phpstan/phpstan": "^1.11", + "phpunit/phpunit": "^8.5.30|^9.0", + "rector/rector": "^0.14.5", + "symplify/easy-coding-standard": "^11.1" + }, + "type": "library", + "autoload": { + "psr-4": { + "Tuupola\\Middleware\\": "src" + } + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "authors": [ + { + "name": "Mika Tuupola", + "email": "tuupola@appelsiini.net", + "homepage": "https://appelsiini.net/", + "role": "Creator" + }, + { + "name": "James Read", + "email": "james.read.18@gmail.com", + "role": "Maintainer" + } + ], + "description": "PSR-7 and PSR-15 HTTP Basic Authentication Middleware", + "homepage": "https://appelsiini.net/projects/slim-basic-auth", + "keywords": [ + "auth", + "middleware", + "psr-15", + "psr-7" + ], + "support": { + "issues": "https://github.com/JimTools/basic-auth/issues", + "source": "https://github.com/JimTools/basic-auth/tree/v1.0.0" + }, + "time": "2026-03-31T18:51:01+00:00" + }, { "name": "jimtools/jwt-auth", - "version": "3.0.0", + "version": "3.0.1", "source": { "type": "git", "url": "https://github.com/JimTools/jwt-auth.git", - "reference": "266a02352ee5df57107c653827aab3d91a76857e" + "reference": "9e116b1e976b91d60c701bc37ee4c7c2a9fcadb9" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/JimTools/jwt-auth/zipball/266a02352ee5df57107c653827aab3d91a76857e", - "reference": "266a02352ee5df57107c653827aab3d91a76857e", + "url": "https://api.github.com/repos/JimTools/jwt-auth/zipball/9e116b1e976b91d60c701bc37ee4c7c2a9fcadb9", + "reference": "9e116b1e976b91d60c701bc37ee4c7c2a9fcadb9", "shasum": "" }, "require": { @@ -335,7 +405,7 @@ ], "support": { "issues": "https://github.com/JimTools/jwt-auth/issues", - "source": "https://github.com/JimTools/jwt-auth/tree/3.0.0" + "source": "https://github.com/JimTools/jwt-auth/tree/3.0.1" }, "funding": [ { @@ -343,7 +413,7 @@ "type": "github" } ], - "time": "2025-12-20T14:28:36+00:00" + "time": "2026-03-17T23:38:37+00:00" }, { "name": "laravel/serializable-closure", @@ -1550,67 +1620,6 @@ ], "time": "2021-09-14T12:46:25+00:00" }, - { - "name": "tuupola/slim-basic-auth", - "version": "3.4.0", - "source": { - "type": "git", - "url": "https://github.com/tuupola/slim-basic-auth.git", - "reference": "4f3061cd1632a28aa7342495011b3467fe0fe1d1" - }, - "dist": { - "type": "zip", - "url": "https://api.github.com/repos/tuupola/slim-basic-auth/zipball/4f3061cd1632a28aa7342495011b3467fe0fe1d1", - "reference": "4f3061cd1632a28aa7342495011b3467fe0fe1d1", - "shasum": "" - }, - "require": { - "php": "^7.2|^8.0", - "psr/http-message": "^1.0.1|^2.0", - "psr/http-server-middleware": "^1.0", - "tuupola/callable-handler": "^0.3.0|^0.4.0|^1.0", - "tuupola/http-factory": "^0.4.0|^1.0.2" - }, - "require-dev": { - "equip/dispatch": "^2.0", - "laminas/laminas-diactoros": "^1.3|^2.0|^3.0", - "overtrue/phplint": "^3.0|^4.0|^5.0|^6.0", - "phpstan/phpstan": "^1.11", - "phpunit/phpunit": "^8.5.30|^9.0", - "rector/rector": "^0.14.5", - "symplify/easy-coding-standard": "^11.1" - }, - "type": "library", - "autoload": { - "psr-4": { - "Tuupola\\Middleware\\": "src" - } - }, - "notification-url": "https://packagist.org/downloads/", - "license": [ - "MIT" - ], - "authors": [ - { - "name": "Mika Tuupola", - "email": "tuupola@appelsiini.net", - "homepage": "https://appelsiini.net/" - } - ], - "description": "PSR-7 and PSR-15 HTTP Basic Authentication Middleware", - "homepage": "https://appelsiini.net/projects/slim-basic-auth", - "keywords": [ - "auth", - "middleware", - "psr-15", - "psr-7" - ], - "support": { - "issues": "https://github.com/tuupola/slim-basic-auth/issues", - "source": "https://github.com/tuupola/slim-basic-auth/tree/3.4.0" - }, - "time": "2024-10-01T09:13:06+00:00" - }, { "name": "willdurand/negotiation", "version": "3.1.0", @@ -2077,16 +2086,16 @@ }, { "name": "phpdocumentor/reflection-docblock", - "version": "5.6.6", + "version": "6.0.3", "source": { "type": "git", "url": "https://github.com/phpDocumentor/ReflectionDocBlock.git", - "reference": "5cee1d3dfc2d2aa6599834520911d246f656bcb8" + "reference": "7bae67520aa9f5ecc506d646810bd40d9da54582" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/phpDocumentor/ReflectionDocBlock/zipball/5cee1d3dfc2d2aa6599834520911d246f656bcb8", - "reference": "5cee1d3dfc2d2aa6599834520911d246f656bcb8", + "url": "https://api.github.com/repos/phpDocumentor/ReflectionDocBlock/zipball/7bae67520aa9f5ecc506d646810bd40d9da54582", + "reference": "7bae67520aa9f5ecc506d646810bd40d9da54582", "shasum": "" }, "require": { @@ -2094,8 +2103,8 @@ "ext-filter": "*", "php": "^7.4 || ^8.0", "phpdocumentor/reflection-common": "^2.2", - "phpdocumentor/type-resolver": "^1.7", - "phpstan/phpdoc-parser": "^1.7|^2.0", + "phpdocumentor/type-resolver": "^2.0", + "phpstan/phpdoc-parser": "^2.0", "webmozart/assert": "^1.9.1 || ^2" }, "require-dev": { @@ -2105,7 +2114,8 @@ "phpstan/phpstan-mockery": "^1.1", "phpstan/phpstan-webmozart-assert": "^1.2", "phpunit/phpunit": "^9.5", - "psalm/phar": "^5.26" + "psalm/phar": "^5.26", + "shipmonk/dead-code-detector": "^0.5.1" }, "type": "library", "extra": { @@ -2135,44 +2145,44 @@ "description": "With this component, a library can provide support for annotations via DocBlocks or otherwise retrieve information that is embedded in a DocBlock.", "support": { "issues": "https://github.com/phpDocumentor/ReflectionDocBlock/issues", - "source": "https://github.com/phpDocumentor/ReflectionDocBlock/tree/5.6.6" + "source": "https://github.com/phpDocumentor/ReflectionDocBlock/tree/6.0.3" }, - "time": "2025-12-22T21:13:58+00:00" + "time": "2026-03-18T20:49:53+00:00" }, { "name": "phpdocumentor/type-resolver", - "version": "1.12.0", + "version": "2.0.0", "source": { "type": "git", "url": "https://github.com/phpDocumentor/TypeResolver.git", - "reference": "92a98ada2b93d9b201a613cb5a33584dde25f195" + "reference": "327a05bbee54120d4786a0dc67aad30226ad4cf9" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/phpDocumentor/TypeResolver/zipball/92a98ada2b93d9b201a613cb5a33584dde25f195", - "reference": "92a98ada2b93d9b201a613cb5a33584dde25f195", + "url": "https://api.github.com/repos/phpDocumentor/TypeResolver/zipball/327a05bbee54120d4786a0dc67aad30226ad4cf9", + "reference": "327a05bbee54120d4786a0dc67aad30226ad4cf9", "shasum": "" }, "require": { "doctrine/deprecations": "^1.0", - "php": "^7.3 || ^8.0", + "php": "^7.4 || ^8.0", "phpdocumentor/reflection-common": "^2.0", - "phpstan/phpdoc-parser": "^1.18|^2.0" + "phpstan/phpdoc-parser": "^2.0" }, "require-dev": { "ext-tokenizer": "*", "phpbench/phpbench": "^1.2", - "phpstan/extension-installer": "^1.1", - "phpstan/phpstan": "^1.8", - "phpstan/phpstan-phpunit": "^1.1", + "phpstan/extension-installer": "^1.4", + "phpstan/phpstan": "^2.1", + "phpstan/phpstan-phpunit": "^2.0", "phpunit/phpunit": "^9.5", - "rector/rector": "^0.13.9", - "vimeo/psalm": "^4.25" + "psalm/phar": "^4" }, "type": "library", "extra": { "branch-alias": { - "dev-1.x": "1.x-dev" + "dev-1.x": "1.x-dev", + "dev-2.x": "2.x-dev" } }, "autoload": { @@ -2193,28 +2203,28 @@ "description": "A PSR-5 based resolver of Class names, Types and Structural Element Names", "support": { "issues": "https://github.com/phpDocumentor/TypeResolver/issues", - "source": "https://github.com/phpDocumentor/TypeResolver/tree/1.12.0" + "source": "https://github.com/phpDocumentor/TypeResolver/tree/2.0.0" }, - "time": "2025-11-21T15:09:14+00:00" + "time": "2026-01-06T21:53:42+00:00" }, { "name": "phpspec/prophecy", - "version": "v1.25.0", + "version": "v1.26.1", "source": { "type": "git", "url": "https://github.com/phpspec/prophecy.git", - "reference": "7ab965042096282307992f1b9abff020095757f0" + "reference": "09c2e5949d676286358a62af818f8407167a9dd6" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/phpspec/prophecy/zipball/7ab965042096282307992f1b9abff020095757f0", - "reference": "7ab965042096282307992f1b9abff020095757f0", + "url": "https://api.github.com/repos/phpspec/prophecy/zipball/09c2e5949d676286358a62af818f8407167a9dd6", + "reference": "09c2e5949d676286358a62af818f8407167a9dd6", "shasum": "" }, "require": { "doctrine/instantiator": "^1.2 || ^2.0", "php": "8.2.* || 8.3.* || 8.4.* || 8.5.*", - "phpdocumentor/reflection-docblock": "^5.2", + "phpdocumentor/reflection-docblock": "^5.2 || ^6.0", "sebastian/comparator": "^3.0 || ^4.0 || ^5.0 || ^6.0 || ^7.0 || ^8.0", "sebastian/recursion-context": "^3.0 || ^4.0 || ^5.0 || ^6.0 || ^7.0 || ^8.0", "symfony/deprecation-contracts": "^2.5 || ^3.1" @@ -2264,9 +2274,9 @@ ], "support": { "issues": "https://github.com/phpspec/prophecy/issues", - "source": "https://github.com/phpspec/prophecy/tree/v1.25.0" + "source": "https://github.com/phpspec/prophecy/tree/v1.26.1" }, - "time": "2026-02-09T11:58:00+00:00" + "time": "2026-04-13T14:35:16+00:00" }, { "name": "phpspec/prophecy-phpunit", @@ -2420,11 +2430,11 @@ }, { "name": "phpstan/phpstan", - "version": "2.1.39", + "version": "2.1.54", "dist": { "type": "zip", - "url": "https://api.github.com/repos/phpstan/phpstan/zipball/c6f73a2af4cbcd99c931d0fb8f08548cc0fa8224", - "reference": "c6f73a2af4cbcd99c931d0fb8f08548cc0fa8224", + "url": "https://api.github.com/repos/phpstan/phpstan/zipball/8be50c3992107dc837b17da4d140fbbdf9a5c5bd", + "reference": "8be50c3992107dc837b17da4d140fbbdf9a5c5bd", "shasum": "" }, "require": { @@ -2469,20 +2479,20 @@ "type": "github" } ], - "time": "2026-02-11T14:48:56+00:00" + "time": "2026-04-29T13:31:09+00:00" }, { "name": "phpunit/php-code-coverage", - "version": "12.5.3", + "version": "12.5.6", "source": { "type": "git", "url": "https://github.com/sebastianbergmann/php-code-coverage.git", - "reference": "b015312f28dd75b75d3422ca37dff2cd1a565e8d" + "reference": "876099a072646c7745f673d7aeab5382c4439691" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/sebastianbergmann/php-code-coverage/zipball/b015312f28dd75b75d3422ca37dff2cd1a565e8d", - "reference": "b015312f28dd75b75d3422ca37dff2cd1a565e8d", + "url": "https://api.github.com/repos/sebastianbergmann/php-code-coverage/zipball/876099a072646c7745f673d7aeab5382c4439691", + "reference": "876099a072646c7745f673d7aeab5382c4439691", "shasum": "" }, "require": { @@ -2491,7 +2501,6 @@ "ext-xmlwriter": "*", "nikic/php-parser": "^5.7.0", "php": ">=8.3", - "phpunit/php-file-iterator": "^6.0", "phpunit/php-text-template": "^5.0", "sebastian/complexity": "^5.0", "sebastian/environment": "^8.0.3", @@ -2538,7 +2547,7 @@ "support": { "issues": "https://github.com/sebastianbergmann/php-code-coverage/issues", "security": "https://github.com/sebastianbergmann/php-code-coverage/security/policy", - "source": "https://github.com/sebastianbergmann/php-code-coverage/tree/12.5.3" + "source": "https://github.com/sebastianbergmann/php-code-coverage/tree/12.5.6" }, "funding": [ { @@ -2558,7 +2567,7 @@ "type": "tidelift" } ], - "time": "2026-02-06T06:01:44+00:00" + "time": "2026-04-15T08:23:17+00:00" }, { "name": "phpunit/php-file-iterator", @@ -2819,16 +2828,16 @@ }, { "name": "phpunit/phpunit", - "version": "12.5.12", + "version": "12.5.24", "source": { "type": "git", "url": "https://github.com/sebastianbergmann/phpunit.git", - "reference": "418e06b3b46b0d54bad749ff4907fc7dfb530199" + "reference": "d75dd30597caa80e72fad2ef7904601a30ef1046" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/sebastianbergmann/phpunit/zipball/418e06b3b46b0d54bad749ff4907fc7dfb530199", - "reference": "418e06b3b46b0d54bad749ff4907fc7dfb530199", + "url": "https://api.github.com/repos/sebastianbergmann/phpunit/zipball/d75dd30597caa80e72fad2ef7904601a30ef1046", + "reference": "d75dd30597caa80e72fad2ef7904601a30ef1046", "shasum": "" }, "require": { @@ -2842,15 +2851,15 @@ "phar-io/manifest": "^2.0.4", "phar-io/version": "^3.2.1", "php": ">=8.3", - "phpunit/php-code-coverage": "^12.5.3", + "phpunit/php-code-coverage": "^12.5.6", "phpunit/php-file-iterator": "^6.0.1", "phpunit/php-invoker": "^6.0.0", "phpunit/php-text-template": "^5.0.0", "phpunit/php-timer": "^8.0.0", "sebastian/cli-parser": "^4.2.0", - "sebastian/comparator": "^7.1.4", + "sebastian/comparator": "^7.1.6", "sebastian/diff": "^7.0.0", - "sebastian/environment": "^8.0.3", + "sebastian/environment": "^8.1.0", "sebastian/exporter": "^7.0.2", "sebastian/global-state": "^8.0.2", "sebastian/object-enumerator": "^7.0.0", @@ -2897,31 +2906,15 @@ "support": { "issues": "https://github.com/sebastianbergmann/phpunit/issues", "security": "https://github.com/sebastianbergmann/phpunit/security/policy", - "source": "https://github.com/sebastianbergmann/phpunit/tree/12.5.12" + "source": "https://github.com/sebastianbergmann/phpunit/tree/12.5.24" }, "funding": [ { - "url": "https://phpunit.de/sponsors.html", - "type": "custom" - }, - { - "url": "https://github.com/sebastianbergmann", - "type": "github" - }, - { - "url": "https://liberapay.com/sebastianbergmann", - "type": "liberapay" - }, - { - "url": "https://thanks.dev/u/gh/sebastianbergmann", - "type": "thanks_dev" - }, - { - "url": "https://tidelift.com/funding/github/packagist/phpunit/phpunit", - "type": "tidelift" + "url": "https://phpunit.de/sponsoring.html", + "type": "other" } ], - "time": "2026-02-16T08:34:36+00:00" + "time": "2026-05-01T04:21:04+00:00" }, { "name": "sebastian/cli-parser", @@ -2994,16 +2987,16 @@ }, { "name": "sebastian/comparator", - "version": "7.1.4", + "version": "7.1.6", "source": { "type": "git", "url": "https://github.com/sebastianbergmann/comparator.git", - "reference": "6a7de5df2e094f9a80b40a522391a7e6022df5f6" + "reference": "c769009dee98f494e0edc3fd4f4087501688f11e" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/sebastianbergmann/comparator/zipball/6a7de5df2e094f9a80b40a522391a7e6022df5f6", - "reference": "6a7de5df2e094f9a80b40a522391a7e6022df5f6", + "url": "https://api.github.com/repos/sebastianbergmann/comparator/zipball/c769009dee98f494e0edc3fd4f4087501688f11e", + "reference": "c769009dee98f494e0edc3fd4f4087501688f11e", "shasum": "" }, "require": { @@ -3062,7 +3055,7 @@ "support": { "issues": "https://github.com/sebastianbergmann/comparator/issues", "security": "https://github.com/sebastianbergmann/comparator/security/policy", - "source": "https://github.com/sebastianbergmann/comparator/tree/7.1.4" + "source": "https://github.com/sebastianbergmann/comparator/tree/7.1.6" }, "funding": [ { @@ -3082,7 +3075,7 @@ "type": "tidelift" } ], - "time": "2026-01-24T09:28:48+00:00" + "time": "2026-04-14T08:23:15+00:00" }, { "name": "sebastian/complexity", @@ -3211,16 +3204,16 @@ }, { "name": "sebastian/environment", - "version": "8.0.3", + "version": "8.1.0", "source": { "type": "git", "url": "https://github.com/sebastianbergmann/environment.git", - "reference": "24a711b5c916efc6d6e62aa65aa2ec98fef77f68" + "reference": "b121608b28a13f721e76ffbbd386d08eff58f3f6" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/sebastianbergmann/environment/zipball/24a711b5c916efc6d6e62aa65aa2ec98fef77f68", - "reference": "24a711b5c916efc6d6e62aa65aa2ec98fef77f68", + "url": "https://api.github.com/repos/sebastianbergmann/environment/zipball/b121608b28a13f721e76ffbbd386d08eff58f3f6", + "reference": "b121608b28a13f721e76ffbbd386d08eff58f3f6", "shasum": "" }, "require": { @@ -3235,7 +3228,7 @@ "type": "library", "extra": { "branch-alias": { - "dev-main": "8.0-dev" + "dev-main": "8.1-dev" } }, "autoload": { @@ -3263,7 +3256,7 @@ "support": { "issues": "https://github.com/sebastianbergmann/environment/issues", "security": "https://github.com/sebastianbergmann/environment/security/policy", - "source": "https://github.com/sebastianbergmann/environment/tree/8.0.3" + "source": "https://github.com/sebastianbergmann/environment/tree/8.1.0" }, "funding": [ { @@ -3283,7 +3276,7 @@ "type": "tidelift" } ], - "time": "2025-08-12T14:11:56+00:00" + "time": "2026-04-15T12:13:01+00:00" }, { "name": "sebastian/exporter", @@ -3953,16 +3946,16 @@ }, { "name": "symfony/deprecation-contracts", - "version": "v3.6.0", + "version": "v3.7.0", "source": { "type": "git", "url": "https://github.com/symfony/deprecation-contracts.git", - "reference": "63afe740e99a13ba87ec199bb07bbdee937a5b62" + "reference": "50f59d1f3ca46d41ac911f97a78626b6756af35b" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/deprecation-contracts/zipball/63afe740e99a13ba87ec199bb07bbdee937a5b62", - "reference": "63afe740e99a13ba87ec199bb07bbdee937a5b62", + "url": "https://api.github.com/repos/symfony/deprecation-contracts/zipball/50f59d1f3ca46d41ac911f97a78626b6756af35b", + "reference": "50f59d1f3ca46d41ac911f97a78626b6756af35b", "shasum": "" }, "require": { @@ -3975,7 +3968,7 @@ "name": "symfony/contracts" }, "branch-alias": { - "dev-main": "3.6-dev" + "dev-main": "3.7-dev" } }, "autoload": { @@ -4000,7 +3993,7 @@ "description": "A generic function and convention to trigger deprecation notices", "homepage": "https://symfony.com", "support": { - "source": "https://github.com/symfony/deprecation-contracts/tree/v3.6.0" + "source": "https://github.com/symfony/deprecation-contracts/tree/v3.7.0" }, "funding": [ { @@ -4011,12 +4004,16 @@ "url": "https://github.com/fabpot", "type": "github" }, + { + "url": "https://github.com/nicolas-grekas", + "type": "github" + }, { "url": "https://tidelift.com/funding/github/packagist/symfony/symfony", "type": "tidelift" } ], - "time": "2024-09-25T14:21:43+00:00" + "time": "2026-04-13T15:52:40+00:00" }, { "name": "theseer/tokenizer", @@ -4070,16 +4067,16 @@ }, { "name": "webmozart/assert", - "version": "2.1.4", + "version": "2.3.0", "source": { "type": "git", "url": "https://github.com/webmozarts/assert.git", - "reference": "b39f1870fc7c3e9e4a26106df5053354b9260a33" + "reference": "eb0d790f735ba6cff25c683a85a1da0eadeff9e4" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/webmozarts/assert/zipball/b39f1870fc7c3e9e4a26106df5053354b9260a33", - "reference": "b39f1870fc7c3e9e4a26106df5053354b9260a33", + "url": "https://api.github.com/repos/webmozarts/assert/zipball/eb0d790f735ba6cff25c683a85a1da0eadeff9e4", + "reference": "eb0d790f735ba6cff25c683a85a1da0eadeff9e4", "shasum": "" }, "require": { @@ -4126,9 +4123,9 @@ ], "support": { "issues": "https://github.com/webmozarts/assert/issues", - "source": "https://github.com/webmozarts/assert/tree/2.1.4" + "source": "https://github.com/webmozarts/assert/tree/2.3.0" }, - "time": "2026-02-17T12:17:51+00:00" + "time": "2026-04-11T10:33:05+00:00" } ], "aliases": [], @@ -4138,6 +4135,7 @@ "prefer-lowest": false, "platform": { "php": "^8.2", + "ext-gd": "*", "ext-json": "*", "ext-pdo": "*" }, From 21a41b66351becb90c43eedb45fd3913038ca22e Mon Sep 17 00:00:00 2001 From: jessevz Date: Thu, 7 May 2026 19:31:31 +0200 Subject: [PATCH 503/691] Removed not properly working phpstan rule after update --- phpstan.neon | 1 + 1 file changed, 1 insertion(+) diff --git a/phpstan.neon b/phpstan.neon index 3d3f345fd..87dfaba23 100644 --- a/phpstan.neon +++ b/phpstan.neon @@ -2,6 +2,7 @@ parameters: paths: - src/inc/apiv2 level: 4 + treatPhpDocTypesAsCertain: false scanDirectories: - src/dba - src/inc \ No newline at end of file From 8e67d425730ad268eaaa2d03285b13e0df780178 Mon Sep 17 00:00:00 2001 From: jessevz Date: Thu, 7 May 2026 19:52:42 +0200 Subject: [PATCH 504/691] Fixed not properly created agentstat in test --- ci/apiv2/test_agentstat.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/ci/apiv2/test_agentstat.py b/ci/apiv2/test_agentstat.py index 9c7271484..848f66bbd 100644 --- a/ci/apiv2/test_agentstat.py +++ b/ci/apiv2/test_agentstat.py @@ -35,7 +35,8 @@ def test_cpu_utilisation(self): self.assertListEqual(objs[0].value, cpu_utilisations) def test_acl(self): - retval = self.create_agent_with_task() + cpu_utilisations = [60, 70] + retval = self.create_agent_with_task(cpu_utilisations=cpu_utilisations) agent = retval['agent'] stats = list(AgentStat.objects.filter(agentId=agent.id)) self.assertGreater(len(stats), 0, "Expected agent stats to exist for ACL test") From 2be0f8ff3c5680b13350f7baead1c504b42d518f Mon Sep 17 00:00:00 2001 From: andreas Date: Tue, 12 May 2026 11:18:02 +0200 Subject: [PATCH 505/691] 2050: Using ssmtp.conf existence that mail is configured --- .devcontainer/docker-compose.mysql.yml | 2 +- .devcontainer/docker-compose.postgres.yml | 1 - .github/docker-compose.mysql.yml | 1 - .github/docker-compose.postgres.yml | 1 - Dockerfile | 1 + ci/php/zz-mail-disable.ini | 2 - ci/phpunit/inc/UtilTest.php | 73 ++++++ .../HashtopolisNotificationEmailTest.php | 159 +++++++++++++ ci/phpunit/inc/utils/UserUtilsTest.php | 213 ++++++++++++++++++ src/inc/Util.php | 10 + .../HashtopolisNotificationEmail.php | 4 +- src/inc/utils/UserUtils.php | 6 +- 12 files changed, 465 insertions(+), 8 deletions(-) delete mode 100644 ci/php/zz-mail-disable.ini create mode 100644 ci/phpunit/inc/UtilTest.php create mode 100644 ci/phpunit/inc/notifications/HashtopolisNotificationEmailTest.php create mode 100644 ci/phpunit/inc/utils/UserUtilsTest.php diff --git a/.devcontainer/docker-compose.mysql.yml b/.devcontainer/docker-compose.mysql.yml index 52adc52d7..1d33de159 100644 --- a/.devcontainer/docker-compose.mysql.yml +++ b/.devcontainer/docker-compose.mysql.yml @@ -24,8 +24,8 @@ services: # and the value of "workspaceFolder" in .devcontainer/devcontainer.json - ..:/var/www/html - hashtopolis-server-dev:/usr/local/share/hashtopolis:Z + - ../.xdebug:/tmp/xdebug # - ./jwks.json:/keys/jwks.json:ro - - ../ci/php/zz-mail-disable.ini:/usr/local/etc/php/conf.d/zz-mail-disable.ini:ro networks: - hashtopolis_dev hashtopolis-db-dev: diff --git a/.devcontainer/docker-compose.postgres.yml b/.devcontainer/docker-compose.postgres.yml index e807ef60f..ed985a0d0 100644 --- a/.devcontainer/docker-compose.postgres.yml +++ b/.devcontainer/docker-compose.postgres.yml @@ -25,7 +25,6 @@ services: - ..:/var/www/html - hashtopolis-server-dev:/usr/local/share/hashtopolis:Z # - ./jwks.json:/keys/jwks.json:ro - - ../ci/php/zz-mail-disable.ini:/usr/local/etc/php/conf.d/zz-mail-disable.ini:ro networks: - hashtopolis_dev hashtopolis-db-dev: diff --git a/.github/docker-compose.mysql.yml b/.github/docker-compose.mysql.yml index 8bbd5eb7a..f8b016f2f 100644 --- a/.github/docker-compose.mysql.yml +++ b/.github/docker-compose.mysql.yml @@ -21,7 +21,6 @@ services: - "8080:80" volumes: - hashtopolis-server-dev:/usr/local/share/hashtopolis:Z - - ../ci/php/zz-mail-disable.ini:/usr/local/etc/php/conf.d/zz-mail-disable.ini:ro networks: - hashtopolis_dev hashtopolis-db-dev: diff --git a/.github/docker-compose.postgres.yml b/.github/docker-compose.postgres.yml index 95d56968d..d52312acf 100644 --- a/.github/docker-compose.postgres.yml +++ b/.github/docker-compose.postgres.yml @@ -21,7 +21,6 @@ services: - "8080:80" volumes: - hashtopolis-server-dev:/usr/local/share/hashtopolis:Z - - ../ci/php/zz-mail-disable.ini:/usr/local/etc/php/conf.d/zz-mail-disable.ini:ro networks: - hashtopolis_dev hashtopolis-db-dev: diff --git a/Dockerfile b/Dockerfile index 77393a70d..b406d3cd3 100644 --- a/Dockerfile +++ b/Dockerfile @@ -49,6 +49,7 @@ RUN apt-get update \ && apt-get -y install mariadb-client postgresql-client libpq-dev \ && apt-get -y install libpng-dev \ && apt-get -y install ssmtp \ + && rm -f /etc/ssmtp/ssmtp.conf \ \ # Install extensions (optional) && docker-php-ext-install pdo_mysql pgsql pdo_pgsql gd \ diff --git a/ci/php/zz-mail-disable.ini b/ci/php/zz-mail-disable.ini deleted file mode 100644 index d5ca294ae..000000000 --- a/ci/php/zz-mail-disable.ini +++ /dev/null @@ -1,2 +0,0 @@ -# Make the send mail function return properly in non-mail configured environments -sendmail_path = /bin/true \ No newline at end of file diff --git a/ci/phpunit/inc/UtilTest.php b/ci/phpunit/inc/UtilTest.php new file mode 100644 index 000000000..c37b3ae49 --- /dev/null +++ b/ci/phpunit/inc/UtilTest.php @@ -0,0 +1,73 @@ +assertFalse(Util::isMailConfigured()); + } + finally { + unset($GLOBALS['util_is_file_mock']); + } + } + + public function testIsMailConfiguredReturnsTrueWithSsmtpConfig(): void { + $GLOBALS['util_is_file_mock'] = static function ($path): bool { + return true; + }; + + try { + $this->assertTrue(Util::isMailConfigured()); + } + finally { + unset($GLOBALS['util_is_file_mock']); + } + } + + public function testSendMailReturnsFalseAndLogsWhenMailIsNotConfigured(): void { + $loggedMessage = null; + $GLOBALS['util_is_file_mock'] = static function ($path): bool { + return false; + }; + $GLOBALS['util_error_log_mock'] = static function ($message) use (&$loggedMessage): bool { + $loggedMessage = $message; + return true; + }; + + try { + $this->assertFalse(Util::sendMail('user@example.com', 'subject', '

    body

    ', 'body')); + $this->assertSame('Mail notification is not configured. No message sent.', $loggedMessage); + } + finally { + unset($GLOBALS['util_is_file_mock'], $GLOBALS['util_error_log_mock']); + } + } + } + + +} diff --git a/ci/phpunit/inc/notifications/HashtopolisNotificationEmailTest.php b/ci/phpunit/inc/notifications/HashtopolisNotificationEmailTest.php new file mode 100644 index 000000000..953aaab86 --- /dev/null +++ b/ci/phpunit/inc/notifications/HashtopolisNotificationEmailTest.php @@ -0,0 +1,159 @@ +createNotification(); + $notification->sendMessage('

    html

    ##########plain', 'Subject'); + + $this->assertSame(0, $mailCallCount); + $this->assertSame([], $errorLogMessages); + } + + public function testSendMessageCallsSendMailWhenMailIsConfigured(): void { + $mailCalls = []; + $errorLogMessages = []; + + $GLOBALS['notification_email_is_file_mock'] = static function ($path): bool { + return true; + }; + $GLOBALS['notification_email_mail_mock'] = static function ($to, $subject, $message, $additionalHeaders = null, $additionalParams = null) use (&$mailCalls): bool { + $mailCalls[] = [$to, $subject, $message, $additionalHeaders, $additionalParams]; + return true; + }; + $GLOBALS['notification_email_error_log_mock'] = static function ($message) use (&$errorLogMessages): bool { + $errorLogMessages[] = $message; + return true; + }; + + $notification = $this->createNotification(); + $notification->sendMessage('

    html

    ##########plain', 'Subject'); + + $this->assertCount(1, $mailCalls); + $this->assertSame('receiver@example.com', $mailCalls[0][0]); + $this->assertSame('Subject', $mailCalls[0][1]); + $this->assertStringContainsString('

    html

    ', $mailCalls[0][2]); + $this->assertStringContainsString('plain', $mailCalls[0][2]); + } + + public function testSendMessageLogsWhenConfiguredSendMailFails(): void { + $mailCallCount = 0; + $errorLogMessages = []; + + $GLOBALS['notification_email_is_file_mock'] = static function ($path): bool { + return true; + }; + $GLOBALS['notification_email_mail_mock'] = static function () use (&$mailCallCount): bool { + $mailCallCount++; + return false; + }; + $GLOBALS['notification_email_error_log_mock'] = static function ($message) use (&$errorLogMessages): bool { + $errorLogMessages[] = $message; + return true; + }; + + $notification = $this->createNotification(); + $notification->sendMessage('

    html

    ##########plain', 'Subject'); + + $this->assertSame(1, $mailCallCount); + $this->assertSame([ + 'Unable to send notification mail with subject: Subject', + ], $errorLogMessages); + } + + private function createNotification(): HashtopolisNotificationEmail { + $notification = new HashtopolisNotificationEmail(); + $receiverProperty = new \ReflectionProperty($notification, 'receiver'); + $receiverProperty->setValue($notification, 'receiver@example.com'); + return $notification; + } + } +} diff --git a/ci/phpunit/inc/utils/UserUtilsTest.php b/ci/phpunit/inc/utils/UserUtilsTest.php new file mode 100644 index 000000000..46eb828d3 --- /dev/null +++ b/ci/phpunit/inc/utils/UserUtilsTest.php @@ -0,0 +1,213 @@ +name = $name; + } + + public function render($data): string { + return $this->name . ':' . json_encode($data); + } + } +} + +namespace Tests\Inc\Utils { + +use Hashtopolis\dba\Factory; +use Hashtopolis\dba\QueryFilter; +use Hashtopolis\dba\models\AccessGroupUser; +use Hashtopolis\dba\models\RightGroup; +use Hashtopolis\dba\models\User; +use Hashtopolis\inc\utils\UserUtils; +use PHPUnit\Framework\TestCase; + +require_once(dirname(__FILE__) . '/../../../../src/inc/startup/include.php'); + +final class UserUtilsTest extends TestCase { + /** @var string[] */ + private array $createdUsernames = []; + + /** @var int[] */ + private array $createdRightGroupIds = []; + + protected function setUp(): void { + parent::setUp(); + + $_SERVER['HTTP_HOST'] = $_SERVER['HTTP_HOST'] ?? 'localhost'; + $_SERVER['SERVER_PORT'] = $_SERVER['SERVER_PORT'] ?? 80; + unset( + $GLOBALS['user_utils_is_file_mock'], + $GLOBALS['user_utils_mail_mock'], + $GLOBALS['user_utils_util_error_log_mock'], + $GLOBALS['user_utils_error_log_mock'] + ); + } + + protected function tearDown(): void { + foreach ($this->createdUsernames as $username) { + $qF = new QueryFilter(User::USERNAME, $username, '='); + $users = Factory::getUserFactory()->filter([Factory::FILTER => $qF]); + foreach ($users as $user) { + $memberFilter = new QueryFilter(AccessGroupUser::USER_ID, $user->getId(), '='); + Factory::getAccessGroupUserFactory()->massDeletion([Factory::FILTER => $memberFilter]); + Factory::getUserFactory()->delete($user); + } + } + + foreach ($this->createdRightGroupIds as $rightGroupId) { + $group = Factory::getRightGroupFactory()->get($rightGroupId); + if ($group !== null) { + Factory::getRightGroupFactory()->delete($group); + } + } + + unset( + $GLOBALS['user_utils_is_file_mock'], + $GLOBALS['user_utils_mail_mock'], + $GLOBALS['user_utils_util_error_log_mock'], + $GLOBALS['user_utils_error_log_mock'] + ); + + parent::tearDown(); + } + + public function testCreateUserDoesNotCallSendMailWhenMailIsNotConfigured(): void { + $mailCallCount = 0; + $utilErrorLogMessages = []; + $username = $this->uniqueUsername('mail_disabled'); + + $GLOBALS['user_utils_is_file_mock'] = static function ($path): bool { + return false; + }; + $GLOBALS['user_utils_mail_mock'] = static function () use (&$mailCallCount): bool { + $mailCallCount++; + return true; + }; + $GLOBALS['user_utils_util_error_log_mock'] = static function ($message) use (&$utilErrorLogMessages): bool { + $utilErrorLogMessages[] = $message; + return true; + }; + + $createdUser = UserUtils::createUser($username, $username . '@example.com', $this->createRightGroup()->getId(), $this->createAdminUser()); + $this->createdUsernames[] = $username; + + $this->assertSame($username, $createdUser->getUsername()); + $this->assertSame(0, $mailCallCount); + $this->assertSame([], $utilErrorLogMessages); + } + + public function testCreateUserCallsSendMailWhenMailIsConfigured(): void { + $mailCalls = []; + $userUtilsErrorLogMessages = []; + $username = $this->uniqueUsername('mail_enabled'); + + $GLOBALS['user_utils_is_file_mock'] = static function ($path): bool { + return true; + }; + $GLOBALS['user_utils_mail_mock'] = static function ($to, $subject, $message, $additionalHeaders = null, $additionalParams = null) use (&$mailCalls): bool { + $mailCalls[] = [$to, $subject, $message, $additionalHeaders, $additionalParams]; + return true; + }; + $GLOBALS['user_utils_error_log_mock'] = static function ($message) use (&$userUtilsErrorLogMessages): bool { + $userUtilsErrorLogMessages[] = $message; + return true; + }; + + UserUtils::createUser($username, $username . '@example.com', $this->createRightGroup()->getId(), $this->createAdminUser()); + $this->createdUsernames[] = $username; + + $this->assertCount(1, $mailCalls); + $this->assertSame($username . '@example.com', $mailCalls[0][0]); + $this->assertSame('Account at ' . APP_NAME, $mailCalls[0][1]); + $this->assertSame([], $userUtilsErrorLogMessages); + } + + public function testCreateUserLogsWhenConfiguredSendMailFails(): void { + $mailCallCount = 0; + $userUtilsErrorLogMessages = []; + $username = $this->uniqueUsername('mail_failure'); + + $GLOBALS['user_utils_is_file_mock'] = static function ($path): bool { + return true; + }; + $GLOBALS['user_utils_mail_mock'] = static function () use (&$mailCallCount): bool { + $mailCallCount++; + return false; + }; + $GLOBALS['user_utils_error_log_mock'] = static function ($message) use (&$userUtilsErrorLogMessages): bool { + $userUtilsErrorLogMessages[] = $message; + return true; + }; + + UserUtils::createUser($username, $username . '@example.com', $this->createRightGroup()->getId(), $this->createAdminUser()); + $this->createdUsernames[] = $username; + + $this->assertSame(1, $mailCallCount); + $this->assertSame(['Unable to send mail to user with subject: Account at ' . APP_NAME], $userUtilsErrorLogMessages); + } + + private function createAdminUser(): User { + return new User(1, 'admin', 'admin@example.com', 'hash', 'salt', 1, 0, 0, time(), 3600, 1, '', '', '', '', ''); + } + + private function createRightGroup(): RightGroup { + $group = Factory::getRightGroupFactory()->save(new RightGroup(null, 'phpunit-' . uniqid('', true), '[]')); + $this->createdRightGroupIds[] = $group->getId(); + return $group; + } + + private function uniqueUsername(string $prefix): string { + return $prefix . '_' . uniqid(); + } +} +} diff --git a/src/inc/Util.php b/src/inc/Util.php index e5597293e..82f0de05b 100755 --- a/src/inc/Util.php +++ b/src/inc/Util.php @@ -1343,6 +1343,11 @@ public static function compareChunksTime($a, $b) { return ($a->getDispatchTime() < $b->getDispatchTime()) ? -1 : 1; } + public static function isMailConfigured(): bool { + $path = '/etc/ssmtp/ssmtp.conf'; + return is_file($path); + } + /** * This sends a given email with text and subject to the address. * @@ -1356,6 +1361,11 @@ public static function compareChunksTime($a, $b) { * @return bool true on success, false on failure */ public static function sendMail($address, $subject, $text, $plaintext) { + if (!self::isMailConfigured()) { + error_log(("Mail notification is not configured. No message sent.")); + return false; + } + $boundary = uniqid('np'); $headers = "MIME-Version: 1.0\r\n"; diff --git a/src/inc/notifications/HashtopolisNotificationEmail.php b/src/inc/notifications/HashtopolisNotificationEmail.php index 71dc9f451..a5f6388a4 100644 --- a/src/inc/notifications/HashtopolisNotificationEmail.php +++ b/src/inc/notifications/HashtopolisNotificationEmail.php @@ -20,6 +20,8 @@ function getObjects() { function sendMessage($message, $subject) { $message = explode("##########", $message); - Util::sendMail($this->receiver, $subject, $message[0], $message[1]); + if (Util::isMailConfigured() && !Util::sendMail($this->receiver, $subject, $message[0], $message[1])) { + error_log("Unable to send notification mail with subject: " . $subject); + } } } diff --git a/src/inc/utils/UserUtils.php b/src/inc/utils/UserUtils.php index 28e455520..078a12602 100644 --- a/src/inc/utils/UserUtils.php +++ b/src/inc/utils/UserUtils.php @@ -241,7 +241,11 @@ public static function createUser(string $username, string $email, int $rightGro $tmpl = new Template("email/creation"); $tmplPlain = new Template("email/creation.plain"); $obj = array('username' => $username, 'password' => $newPass, 'url' => Util::buildServerUrl() . SConfig::getInstance()->getVal(DConfig::BASE_URL)); - Util::sendMail($email, "Account at " . APP_NAME, $tmpl->render($obj), $tmplPlain->render($obj)); + + $subject = "Account at " . APP_NAME; + if (Util::isMailConfigured() && !Util::sendMail($email, $subject, $tmpl->render($obj), $tmplPlain->render($obj))) { + error_log("Unable to send mail to user with subject: " . $subject); + } // create log entry and check if notification sending is needed Util::createLogEntry("User", $adminUser->getId(), DLogEntry::INFO, "New User created: " . $user->getUsername()); From 666381bfb8cb9ebd9ea065b609314ccd639a4980 Mon Sep 17 00:00:00 2001 From: andreas Date: Tue, 12 May 2026 11:23:53 +0200 Subject: [PATCH 506/691] 2050 Cleaned up --- .devcontainer/docker-compose.mysql.yml | 1 - 1 file changed, 1 deletion(-) diff --git a/.devcontainer/docker-compose.mysql.yml b/.devcontainer/docker-compose.mysql.yml index 1d33de159..0c6817f97 100644 --- a/.devcontainer/docker-compose.mysql.yml +++ b/.devcontainer/docker-compose.mysql.yml @@ -24,7 +24,6 @@ services: # and the value of "workspaceFolder" in .devcontainer/devcontainer.json - ..:/var/www/html - hashtopolis-server-dev:/usr/local/share/hashtopolis:Z - - ../.xdebug:/tmp/xdebug # - ./jwks.json:/keys/jwks.json:ro networks: - hashtopolis_dev From 3aa741434a65387638ec0adb3500d407cd930992 Mon Sep 17 00:00:00 2001 From: andreas Date: Tue, 12 May 2026 11:37:02 +0200 Subject: [PATCH 507/691] Docker image build problem --- Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index b406d3cd3..1190f91fa 100644 --- a/Dockerfile +++ b/Dockerfile @@ -95,7 +95,7 @@ COPY --from=prebuild /usr/local/cargo/bin/sqlx /usr/bin/ COPY --from=preprocess /HEA[D] ${HASHTOPOLIS_DOCUMENT_ROOT}/../.git/ # Install composer -COPY composer.json ${HASHTOPOLIS_DOCUMENT_ROOT}/../ +COPY composer.json composer.lock ${HASHTOPOLIS_DOCUMENT_ROOT}/../ RUN composer install --working-dir=${HASHTOPOLIS_DOCUMENT_ROOT}/.. ENV DEBIAN_FRONTEND=dialog From c2a072788cdf0a16ead158ddc844d5093c6322ad Mon Sep 17 00:00:00 2001 From: correct-horse-battery-bench Date: Tue, 12 May 2026 14:28:03 +0200 Subject: [PATCH 508/691] Get correct intersection of legacy api permissions instead of new CRUD permissions with legacy permissions --- src/inc/apiv2/model/ApiTokenAPI.php | 21 +++++++++------------ 1 file changed, 9 insertions(+), 12 deletions(-) diff --git a/src/inc/apiv2/model/ApiTokenAPI.php b/src/inc/apiv2/model/ApiTokenAPI.php index 601eaea13..9c2a244da 100644 --- a/src/inc/apiv2/model/ApiTokenAPI.php +++ b/src/inc/apiv2/model/ApiTokenAPI.php @@ -11,6 +11,7 @@ use Hashtopolis\inc\apiv2\error\HttpError; use Hashtopolis\inc\StartupConfig; +use Hashtopolis\inc\utils\AccessUtils; use Hashtopolis\inc\utils\JwtTokenUtils; class ApiTokenAPI extends AbstractModelAPI { @@ -74,19 +75,15 @@ protected function createObject(array $data): int { //Scopes is an array of permissions in format [permFileTaskUpdate, permAgentDelete] $scopes = explode(",", $data["scopes"]); - $allPermissions = $this->getRightGroup($this->getCurrentUser()->getRightGroupId())->getPermissions(); - if ($allPermissions == 'ALL') { - // Special (legacy) case for administrative access, enable all available permissions - $all_perms = array_keys(self::$acl_mapping); - $rightgroup_perms = array_combine($all_perms, array_fill(0, count($all_perms), true)); - } - else { - $rightgroup_perms = json_decode($allPermissions, true); - } - $NotAllowedPerms = array_filter($rightgroup_perms, fn($v) => $v === false); - $allowedPerms = array_intersect_key($rightgroup_perms, array_flip($scopes)); + $userCrudPerms = AccessUtils::getPermissionArrayConverted( + $this->getRightGroup($this->getCurrentUser()->getRightGroupId())->getPermissions() + ); - $requestedScopes = $allowedPerms + $NotAllowedPerms; + // Modern CRUD scope dict: true iff the perm was requested AND the user has it. + $requestedScopes = []; + foreach ($userCrudPerms as $perm => $granted) { + $requestedScopes[$perm] = $granted && in_array($perm, $scopes, true); + } $secret = StartupConfig::getInstance()->getPepper(0); $iat = $data[JwtApiKey::START_VALID]; From 1ca85affac3953618697e706fb873f6e2d53f993 Mon Sep 17 00:00:00 2001 From: correct-horse-battery-bench Date: Tue, 12 May 2026 14:43:19 +0200 Subject: [PATCH 509/691] Add tests regarding jwt api token permission intersection --- ci/apiv2/test_apitoken.py | 115 +++++++++++++++++++++++++++++++++++++- 1 file changed, 113 insertions(+), 2 deletions(-) diff --git a/ci/apiv2/test_apitoken.py b/ci/apiv2/test_apitoken.py index 6e61e585e..e680ac004 100644 --- a/ci/apiv2/test_apitoken.py +++ b/ci/apiv2/test_apitoken.py @@ -1,5 +1,23 @@ -from hashtopolis import ApiToken, HashtopolisError -from utils import BaseTest +import base64 +import json +import time + +import requests + +from hashtopolis import ApiToken, HashtopolisConfig, HashtopolisConnector, HashtopolisError +from utils import BaseTest, create_restricted_user + + +def _decode_jwt_scope(jwt_token): + """Decode a JWT and return its `scope` claim as a parsed dict. + + The `scope` claim is a JSON-encoded string keyed by modern CRUD + permission names (e.g. `permHashlistRead`). + """ + payload_b64 = jwt_token.split('.')[1] + padded = payload_b64 + '=' * (-len(payload_b64) % 4) + payload = json.loads(base64.urlsafe_b64decode(padded)) + return json.loads(payload['scope']) class ApiTokenTest(BaseTest): @@ -54,3 +72,96 @@ def test_acl(self): # Admin's token should not be visible to a different user model_obj = self.create_test_object(delete=False) self._test_acl_list(model_obj, {'permJwtApiKeyRead': True}) + + def test_scope_admin_grants_requested_crud_perm(self): + # Admin requests one CRUD scope; the JWT scope must grant exactly that + # perm (and nothing else) and must NOT be empty (the original admin bug). + model_obj = self.create_test_object( + delete=False, + extra_payload={'scopes': ['permHashlistRead']}, + ) + scope = _decode_jwt_scope(model_obj.token) + + self.assertIn('permHashlistRead', scope) + self.assertTrue(scope['permHashlistRead']) + + # Other CRUD perms must be False + self.assertFalse(scope['permAgentCreate']) + self.assertFalse(scope['permFileUpdate']) + self.assertFalse(scope['permJwtApiKeyRead']) + + # And the scope dict is NOT empty (the bug symptom for admin) + self.assertTrue(any(scope.values()), "Admin scope must not be empty after requesting a valid CRUD perm") + + def test_scope_multiple_scopes_union(self): + # Multiple CRUD scopes are all granted + model_obj = self.create_test_object( + delete=False, + extra_payload={'scopes': ['permHashlistRead', 'permAgentCreate']}, + ) + scope = _decode_jwt_scope(model_obj.token) + + self.assertTrue(scope['permHashlistRead']) + self.assertTrue(scope['permAgentCreate']) + self.assertFalse(scope['permFileUpdate']) + self.assertFalse(scope['permJwtApiKeyRead']) + + def test_scope_unknown_scope_yields_no_grants(self): + # An unrecognised scope must not error and must not flip any key + model_obj = self.create_test_object( + delete=False, + extra_payload={'scopes': ['definitelyNotARealPermission']}, + ) + scope = _decode_jwt_scope(model_obj.token) + + # Every key is False — and the dict still has the full keyset + self.assertGreater(len(scope), 0) + self.assertTrue(all(v is False for v in scope.values()), + f"Unknown scope must not grant anything, got: {scope}") + + def test_scope_drops_perms_user_lacks(self): + # A restricted user with only permHashlistRead must NOT be able to mint + # a token that grants permAgentCreate, even if they ask for it. + auth = create_restricted_user(self, {'permHashlistRead': True}) + + config = HashtopolisConfig() + conn = HashtopolisConnector('/auth/token', config) + r = requests.post(conn._api_endpoint + '/auth/token', auth=auth) + self.assertEqual(r.status_code, 200, f"Login failed: {r.text}") + user_jwt = r.json()['token'] + + # Create an API token as this restricted user requesting BOTH a perm + # they have AND a perm they don't. + now = int(time.time()) + payload = {'scopes': ['permHashlistRead', 'permAgentCreate'], 'startValid': now, 'endValid': now + 3600} + r = requests.post( + conn._api_endpoint + '/ui/apiTokens', + headers={'Authorization': 'Bearer ' + user_jwt, 'Content-Type': 'application/json'}, + data=json.dumps(payload), + ) + self.assertEqual(r.status_code, 201, f"Restricted-user token creation failed: {r.text}") + body = r.json() + token = body['data']['attributes']['token'] if 'data' in body else body.get('token') + self.assertIsNotNone(token, f"Expected token in response, got: {body}") + + scope = _decode_jwt_scope(token) + # Hashlist-read is granted (user has it) + self.assertTrue(scope['permHashlistRead']) + # Agent-create is NOT granted (user lacks it) + self.assertFalse(scope['permAgentCreate']) + + def test_scope_intersection_token_works_as_bearer(self): + # End-to-end: a token issued for permHashlistRead must successfully + # authorise GET /ui/hashlists for the admin caller. + model_obj = self.create_test_object( + delete=False, + extra_payload={'scopes': ['permHashlistRead']}, + ) + config = HashtopolisConfig() + conn = HashtopolisConnector('/ui/hashlists', config) + r = requests.get( + conn._api_endpoint + '/ui/hashlists', + headers={'Authorization': 'Bearer ' + model_obj.token}, + ) + self.assertEqual(r.status_code, 200, + f"Bearer with permHashlistRead should authorise listing hashlists; got {r.status_code}: {r.text}") From 5a0f5390c003de58caac202df04c726c8e1db21e Mon Sep 17 00:00:00 2001 From: correct-horse-battery-bench Date: Tue, 12 May 2026 16:58:22 +0200 Subject: [PATCH 510/691] Fix test_apitoken tests --- ci/apiv2/test_apitoken.py | 60 +++++++++++++++++++++++---------------- 1 file changed, 35 insertions(+), 25 deletions(-) diff --git a/ci/apiv2/test_apitoken.py b/ci/apiv2/test_apitoken.py index e680ac004..ad7c285bb 100644 --- a/ci/apiv2/test_apitoken.py +++ b/ci/apiv2/test_apitoken.py @@ -11,8 +11,9 @@ def _decode_jwt_scope(jwt_token): """Decode a JWT and return its `scope` claim as a parsed dict. - The `scope` claim is a JSON-encoded string keyed by modern CRUD - permission names (e.g. `permHashlistRead`). + The `scope` claim is a JSON-encoded string keyed by legacy DAccessControl + permission names (e.g. `viewHashlistAccess`) — that's what + AbstractBaseAPI::validatePermissions asserts on. """ payload_b64 = jwt_token.split('.')[1] padded = payload_b64 + '=' * (-len(payload_b64) % 4) @@ -73,53 +74,61 @@ def test_acl(self): model_obj = self.create_test_object(delete=False) self._test_acl_list(model_obj, {'permJwtApiKeyRead': True}) - def test_scope_admin_grants_requested_crud_perm(self): - # Admin requests one CRUD scope; the JWT scope must grant exactly that - # perm (and nothing else) and must NOT be empty (the original admin bug). + def test_scope_intersection_admin_maps_to_legacy_keys(self): + # Admin requests one CRUD scope. The JWT scope claim must be keyed by + # the legacy DAccessControl names whose CRUD set contains that perm, + # and every such legacy key must be True. Hashlist::PERM_READ + # (permHashlistRead) lives in both viewHashlistAccess and + # manageHashlistAccess in $acl_mapping. model_obj = self.create_test_object( delete=False, extra_payload={'scopes': ['permHashlistRead']}, ) scope = _decode_jwt_scope(model_obj.token) - self.assertIn('permHashlistRead', scope) - self.assertTrue(scope['permHashlistRead']) + self.assertIn('viewHashlistAccess', scope) + self.assertTrue(scope['viewHashlistAccess']) + self.assertTrue(scope['manageHashlistAccess']) - # Other CRUD perms must be False - self.assertFalse(scope['permAgentCreate']) - self.assertFalse(scope['permFileUpdate']) - self.assertFalse(scope['permJwtApiKeyRead']) + # Legacy keys whose CRUD set does NOT contain permHashlistRead must be False + self.assertFalse(scope['createAgentAccess']) + self.assertFalse(scope['manageFileAccess']) + self.assertFalse(scope['ApiTokenAccess']) # And the scope dict is NOT empty (the bug symptom for admin) self.assertTrue(any(scope.values()), "Admin scope must not be empty after requesting a valid CRUD perm") - def test_scope_multiple_scopes_union(self): - # Multiple CRUD scopes are all granted + def test_scope_intersection_multiple_scopes_union(self): + # Multiple CRUD scopes union into the matching legacy keys model_obj = self.create_test_object( delete=False, extra_payload={'scopes': ['permHashlistRead', 'permAgentCreate']}, ) scope = _decode_jwt_scope(model_obj.token) - self.assertTrue(scope['permHashlistRead']) - self.assertTrue(scope['permAgentCreate']) - self.assertFalse(scope['permFileUpdate']) - self.assertFalse(scope['permJwtApiKeyRead']) - - def test_scope_unknown_scope_yields_no_grants(self): - # An unrecognised scope must not error and must not flip any key + # permHashlistRead -> viewHashlistAccess, manageHashlistAccess + self.assertTrue(scope['viewHashlistAccess']) + self.assertTrue(scope['manageHashlistAccess']) + # permAgentCreate -> createAgentAccess + self.assertTrue(scope['createAgentAccess']) + # Unrelated legacy keys stay False + self.assertFalse(scope['manageFileAccess']) + self.assertFalse(scope['ApiTokenAccess']) + + def test_scope_intersection_unknown_scope_yields_no_grants(self): + # An unrecognised scope must not error and must not flip any legacy key model_obj = self.create_test_object( delete=False, extra_payload={'scopes': ['definitelyNotARealPermission']}, ) scope = _decode_jwt_scope(model_obj.token) - # Every key is False — and the dict still has the full keyset + # Every legacy key is False — and the dict still has the full keyset self.assertGreater(len(scope), 0) self.assertTrue(all(v is False for v in scope.values()), f"Unknown scope must not grant anything, got: {scope}") - def test_scope_drops_perms_user_lacks(self): + def test_scope_intersection_drops_perms_user_lacks(self): # A restricted user with only permHashlistRead must NOT be able to mint # a token that grants permAgentCreate, even if they ask for it. auth = create_restricted_user(self, {'permHashlistRead': True}) @@ -127,7 +136,7 @@ def test_scope_drops_perms_user_lacks(self): config = HashtopolisConfig() conn = HashtopolisConnector('/auth/token', config) r = requests.post(conn._api_endpoint + '/auth/token', auth=auth) - self.assertEqual(r.status_code, 200, f"Login failed: {r.text}") + self.assertEqual(r.status_code, 201, f"Login failed: {r.text}") user_jwt = r.json()['token'] # Create an API token as this restricted user requesting BOTH a perm @@ -146,9 +155,10 @@ def test_scope_drops_perms_user_lacks(self): scope = _decode_jwt_scope(token) # Hashlist-read is granted (user has it) - self.assertTrue(scope['permHashlistRead']) + self.assertTrue(scope['viewHashlistAccess']) + self.assertTrue(scope['manageHashlistAccess']) # Agent-create is NOT granted (user lacks it) - self.assertFalse(scope['permAgentCreate']) + self.assertFalse(scope['createAgentAccess']) def test_scope_intersection_token_works_as_bearer(self): # End-to-end: a token issued for permHashlistRead must successfully From d294374ef3ce63c4be7d04eb8d47e325f7765196 Mon Sep 17 00:00:00 2001 From: andreas Date: Wed, 13 May 2026 11:18:30 +0200 Subject: [PATCH 511/691] 2050 Fixed test problem with re-declaring functions --- ci/phpunit/inc/UtilTest.php | 39 +++----- .../HashtopolisNotificationEmailTest.php | 96 ++++-------------- ci/phpunit/inc/utils/UserUtilsTest.php | 98 ++++--------------- 3 files changed, 54 insertions(+), 179 deletions(-) diff --git a/ci/phpunit/inc/UtilTest.php b/ci/phpunit/inc/UtilTest.php index c37b3ae49..84db95f11 100644 --- a/ci/phpunit/inc/UtilTest.php +++ b/ci/phpunit/inc/UtilTest.php @@ -1,70 +1,55 @@ assertFalse(Util::isMailConfigured()); } finally { - unset($GLOBALS['util_is_file_mock']); + \hashtopolis_clear_test_mocks(['Hashtopolis\\inc\\is_file']); } } public function testIsMailConfiguredReturnsTrueWithSsmtpConfig(): void { - $GLOBALS['util_is_file_mock'] = static function ($path): bool { + \hashtopolis_set_test_mock('Hashtopolis\\inc\\is_file', static function ($path): bool { return true; - }; + }); try { $this->assertTrue(Util::isMailConfigured()); } finally { - unset($GLOBALS['util_is_file_mock']); + \hashtopolis_clear_test_mocks(['Hashtopolis\\inc\\is_file']); } } public function testSendMailReturnsFalseAndLogsWhenMailIsNotConfigured(): void { $loggedMessage = null; - $GLOBALS['util_is_file_mock'] = static function ($path): bool { + \hashtopolis_set_test_mock('Hashtopolis\\inc\\is_file', static function ($path): bool { return false; - }; - $GLOBALS['util_error_log_mock'] = static function ($message) use (&$loggedMessage): bool { + }); + \hashtopolis_set_test_mock('Hashtopolis\\inc\\error_log', static function ($message) use (&$loggedMessage): bool { $loggedMessage = $message; return true; - }; + }); try { $this->assertFalse(Util::sendMail('user@example.com', 'subject', '

    body

    ', 'body')); $this->assertSame('Mail notification is not configured. No message sent.', $loggedMessage); } finally { - unset($GLOBALS['util_is_file_mock'], $GLOBALS['util_error_log_mock']); + \hashtopolis_clear_test_mocks(['Hashtopolis\\inc\\is_file', 'Hashtopolis\\inc\\error_log']); } } } diff --git a/ci/phpunit/inc/notifications/HashtopolisNotificationEmailTest.php b/ci/phpunit/inc/notifications/HashtopolisNotificationEmailTest.php index 953aaab86..02400f914 100644 --- a/ci/phpunit/inc/notifications/HashtopolisNotificationEmailTest.php +++ b/ci/phpunit/inc/notifications/HashtopolisNotificationEmailTest.php @@ -1,76 +1,22 @@ createNotification(); $notification->sendMessage('

    html

    ##########plain', 'Subject'); @@ -102,17 +48,17 @@ public function testSendMessageCallsSendMailWhenMailIsConfigured(): void { $mailCalls = []; $errorLogMessages = []; - $GLOBALS['notification_email_is_file_mock'] = static function ($path): bool { + \hashtopolis_set_test_mock('Hashtopolis\\inc\\is_file', static function ($path): bool { return true; - }; - $GLOBALS['notification_email_mail_mock'] = static function ($to, $subject, $message, $additionalHeaders = null, $additionalParams = null) use (&$mailCalls): bool { + }); + \hashtopolis_set_test_mock('Hashtopolis\\inc\\mail', static function ($to, $subject, $message, $additionalHeaders = null, $additionalParams = null) use (&$mailCalls): bool { $mailCalls[] = [$to, $subject, $message, $additionalHeaders, $additionalParams]; return true; - }; - $GLOBALS['notification_email_error_log_mock'] = static function ($message) use (&$errorLogMessages): bool { + }); + \hashtopolis_set_test_mock('Hashtopolis\\inc\\notifications\\error_log', static function ($message) use (&$errorLogMessages): bool { $errorLogMessages[] = $message; return true; - }; + }); $notification = $this->createNotification(); $notification->sendMessage('

    html

    ##########plain', 'Subject'); @@ -128,17 +74,17 @@ public function testSendMessageLogsWhenConfiguredSendMailFails(): void { $mailCallCount = 0; $errorLogMessages = []; - $GLOBALS['notification_email_is_file_mock'] = static function ($path): bool { + \hashtopolis_set_test_mock('Hashtopolis\\inc\\is_file', static function ($path): bool { return true; - }; - $GLOBALS['notification_email_mail_mock'] = static function () use (&$mailCallCount): bool { + }); + \hashtopolis_set_test_mock('Hashtopolis\\inc\\mail', static function () use (&$mailCallCount): bool { $mailCallCount++; return false; - }; - $GLOBALS['notification_email_error_log_mock'] = static function ($message) use (&$errorLogMessages): bool { + }); + \hashtopolis_set_test_mock('Hashtopolis\\inc\\notifications\\error_log', static function ($message) use (&$errorLogMessages): bool { $errorLogMessages[] = $message; return true; - }; + }); $notification = $this->createNotification(); $notification->sendMessage('

    html

    ##########plain', 'Subject'); diff --git a/ci/phpunit/inc/utils/UserUtilsTest.php b/ci/phpunit/inc/utils/UserUtilsTest.php index 46eb828d3..9ad6ede6e 100644 --- a/ci/phpunit/inc/utils/UserUtilsTest.php +++ b/ci/phpunit/inc/utils/UserUtilsTest.php @@ -1,52 +1,5 @@ uniqueUsername('mail_disabled'); - $GLOBALS['user_utils_is_file_mock'] = static function ($path): bool { + \hashtopolis_set_test_mock('Hashtopolis\\inc\\is_file', static function ($path): bool { return false; - }; - $GLOBALS['user_utils_mail_mock'] = static function () use (&$mailCallCount): bool { + }); + \hashtopolis_set_test_mock('Hashtopolis\\inc\\mail', static function () use (&$mailCallCount): bool { $mailCallCount++; return true; - }; - $GLOBALS['user_utils_util_error_log_mock'] = static function ($message) use (&$utilErrorLogMessages): bool { + }); + \hashtopolis_set_test_mock('Hashtopolis\\inc\\error_log', static function ($message) use (&$utilErrorLogMessages): bool { $utilErrorLogMessages[] = $message; return true; - }; + }); $createdUser = UserUtils::createUser($username, $username . '@example.com', $this->createRightGroup()->getId(), $this->createAdminUser()); $this->createdUsernames[] = $username; @@ -151,17 +95,17 @@ public function testCreateUserCallsSendMailWhenMailIsConfigured(): void { $userUtilsErrorLogMessages = []; $username = $this->uniqueUsername('mail_enabled'); - $GLOBALS['user_utils_is_file_mock'] = static function ($path): bool { + \hashtopolis_set_test_mock('Hashtopolis\\inc\\is_file', static function ($path): bool { return true; - }; - $GLOBALS['user_utils_mail_mock'] = static function ($to, $subject, $message, $additionalHeaders = null, $additionalParams = null) use (&$mailCalls): bool { + }); + \hashtopolis_set_test_mock('Hashtopolis\\inc\\mail', static function ($to, $subject, $message, $additionalHeaders = null, $additionalParams = null) use (&$mailCalls): bool { $mailCalls[] = [$to, $subject, $message, $additionalHeaders, $additionalParams]; return true; - }; - $GLOBALS['user_utils_error_log_mock'] = static function ($message) use (&$userUtilsErrorLogMessages): bool { + }); + \hashtopolis_set_test_mock('Hashtopolis\\inc\\utils\\error_log', static function ($message) use (&$userUtilsErrorLogMessages): bool { $userUtilsErrorLogMessages[] = $message; return true; - }; + }); UserUtils::createUser($username, $username . '@example.com', $this->createRightGroup()->getId(), $this->createAdminUser()); $this->createdUsernames[] = $username; @@ -177,17 +121,17 @@ public function testCreateUserLogsWhenConfiguredSendMailFails(): void { $userUtilsErrorLogMessages = []; $username = $this->uniqueUsername('mail_failure'); - $GLOBALS['user_utils_is_file_mock'] = static function ($path): bool { + \hashtopolis_set_test_mock('Hashtopolis\\inc\\is_file', static function ($path): bool { return true; - }; - $GLOBALS['user_utils_mail_mock'] = static function () use (&$mailCallCount): bool { + }); + \hashtopolis_set_test_mock('Hashtopolis\\inc\\mail', static function () use (&$mailCallCount): bool { $mailCallCount++; return false; - }; - $GLOBALS['user_utils_error_log_mock'] = static function ($message) use (&$userUtilsErrorLogMessages): bool { + }); + \hashtopolis_set_test_mock('Hashtopolis\\inc\\utils\\error_log', static function ($message) use (&$userUtilsErrorLogMessages): bool { $userUtilsErrorLogMessages[] = $message; return true; - }; + }); UserUtils::createUser($username, $username . '@example.com', $this->createRightGroup()->getId(), $this->createAdminUser()); $this->createdUsernames[] = $username; From f3110f97e749d5970f0934718a28010d06d20982 Mon Sep 17 00:00:00 2001 From: andreas Date: Wed, 13 May 2026 11:23:00 +0200 Subject: [PATCH 512/691] 2050 Added missing TestMocks.php --- ci/phpunit/inc/TestMocks.php | 104 +++++++++++++++++++++++++++++++++++ 1 file changed, 104 insertions(+) create mode 100644 ci/phpunit/inc/TestMocks.php diff --git a/ci/phpunit/inc/TestMocks.php b/ci/phpunit/inc/TestMocks.php new file mode 100644 index 000000000..4e3cc248c --- /dev/null +++ b/ci/phpunit/inc/TestMocks.php @@ -0,0 +1,104 @@ + Date: Wed, 13 May 2026 11:25:22 +0200 Subject: [PATCH 513/691] update test_apitoken test --- ci/apiv2/test_apitoken.py | 204 +++++++++++--------------------------- 1 file changed, 57 insertions(+), 147 deletions(-) diff --git a/ci/apiv2/test_apitoken.py b/ci/apiv2/test_apitoken.py index ad7c285bb..23b6f3fad 100644 --- a/ci/apiv2/test_apitoken.py +++ b/ci/apiv2/test_apitoken.py @@ -4,23 +4,38 @@ import requests -from hashtopolis import ApiToken, HashtopolisConfig, HashtopolisConnector, HashtopolisError -from utils import BaseTest, create_restricted_user +from hashtopolis import ApiToken +from utils import BaseTest, create_restricted_user -def _decode_jwt_scope(jwt_token): - """Decode a JWT and return its `scope` claim as a parsed dict. - The `scope` claim is a JSON-encoded string keyed by legacy DAccessControl - permission names (e.g. `viewHashlistAccess`) — that's what - AbstractBaseAPI::validatePermissions asserts on. - """ - payload_b64 = jwt_token.split('.')[1] - padded = payload_b64 + '=' * (-len(payload_b64) % 4) - payload = json.loads(base64.urlsafe_b64decode(padded)) +def _decode_jwt_scope(token): + """Decode the JWT payload (without signature verification) and return the parsed scope dict.""" + payload_b64 = token.split('.')[1] + payload_b64 += '=' * (-len(payload_b64) % 4) + payload = json.loads(base64.urlsafe_b64decode(payload_b64)) return json.loads(payload['scope']) +def _create_apitoken_raw(test, auth, scopes): + """POST /ui/apiTokens as the given user and register the resulting token for cleanup.""" + connector = ApiToken.objects.get_conn() + connector.authenticate(auth=auth) + uri = connector._api_endpoint + '/ui/apiTokens' + headers = {**connector._headers, 'Content-Type': 'application/json'} + now = int(time.time()) + payload = { + 'scopes': scopes, + 'startValid': now, + 'endValid': now + 3600, + } + r = requests.post(uri, headers=headers, data=json.dumps(payload)) + assert r.status_code == 201, f"Failed to create apitoken: status={r.status_code} body={r.text}" + obj = ApiToken(**r.json()['data']) + test.delete_after_test(obj) + return obj + + class ApiTokenTest(BaseTest): model_class = ApiToken @@ -28,150 +43,45 @@ def create_test_object(self, *nargs, **kwargs): return self.create_apitoken(*nargs, **kwargs) def test_create(self): - model_obj = self.create_test_object(delete=False) + model_obj = self.create_test_object() self._test_create(model_obj) - def test_token_returned_on_create(self): + def test_delete(self): model_obj = self.create_test_object(delete=False) - # The JWT token string is only present in the POST response - self.assertTrue(hasattr(model_obj, 'token')) - self.assertIsNotNone(model_obj.token) - self.assertIsInstance(model_obj.token, str) - self.assertGreater(len(model_obj.token), 0) + self._test_delete(model_obj) - def test_token_not_in_get(self): - model_obj = self.create_test_object(delete=False) - # Retrieve the object via GET and verify the token field is absent - obj = self.model_class.objects.get(pk=model_obj.id) - self.assertFalse(hasattr(obj, 'token') and obj.token is not None) - - def test_revoke(self): - model_obj = self.create_test_object(delete=False) - self._test_patch(model_obj, 'isRevoked', True) - - def test_expand_user(self): - model_obj = self.create_test_object(delete=False) - self._test_expandables(model_obj, ['user']) - - def test_patch_readonly_startValid(self): - model_obj = self.create_test_object(delete=False) - model_obj.startValid = 0 - with self.assertRaises(HashtopolisError) as e: - model_obj.save() - self.assertEqual(e.exception.status_code, 403) - self.assertIn('startValid', e.exception.title) - - def test_patch_readonly_endValid(self): - model_obj = self.create_test_object(delete=False) - model_obj.endValid = 9999999999 - with self.assertRaises(HashtopolisError) as e: - model_obj.save() - self.assertEqual(e.exception.status_code, 403) - self.assertIn('endValid', e.exception.title) + def test_expandables(self): + model_obj = self.create_test_object() + expandables = ['user'] + self._test_expandables(model_obj, expandables) def test_acl(self): - # Admin's token should not be visible to a different user - model_obj = self.create_test_object(delete=False) + model_obj = self.create_test_object() self._test_acl_list(model_obj, {'permJwtApiKeyRead': True}) - def test_scope_intersection_admin_maps_to_legacy_keys(self): - # Admin requests one CRUD scope. The JWT scope claim must be keyed by - # the legacy DAccessControl names whose CRUD set contains that perm, - # and every such legacy key must be True. Hashlist::PERM_READ - # (permHashlistRead) lives in both viewHashlistAccess and - # manageHashlistAccess in $acl_mapping. - model_obj = self.create_test_object( - delete=False, - extra_payload={'scopes': ['permHashlistRead']}, - ) + def test_token_scope_admin_grants_requested(self): + """Admin holds every legacy permission, so any requested scope must be granted in the JWT.""" + model_obj = self.create_test_object() scope = _decode_jwt_scope(model_obj.token) - - self.assertIn('viewHashlistAccess', scope) - self.assertTrue(scope['viewHashlistAccess']) - self.assertTrue(scope['manageHashlistAccess']) - - # Legacy keys whose CRUD set does NOT contain permHashlistRead must be False - self.assertFalse(scope['createAgentAccess']) - self.assertFalse(scope['manageFileAccess']) - self.assertFalse(scope['ApiTokenAccess']) - - # And the scope dict is NOT empty (the bug symptom for admin) - self.assertTrue(any(scope.values()), "Admin scope must not be empty after requesting a valid CRUD perm") - - def test_scope_intersection_multiple_scopes_union(self): - # Multiple CRUD scopes union into the matching legacy keys - model_obj = self.create_test_object( - delete=False, - extra_payload={'scopes': ['permHashlistRead', 'permAgentCreate']}, - ) + self.assertTrue(scope.get('permHashlistRead')) + + def test_token_scope_intersection_grants_permitted(self): + """A restricted user is granted a requested scope they hold via the legacy permission mapping.""" + auth = create_restricted_user(self, { + 'permHashlistRead': True, + 'permJwtApiKeyCreate': True, + }) + model_obj = _create_apitoken_raw(self, auth, ['permHashlistRead']) scope = _decode_jwt_scope(model_obj.token) - - # permHashlistRead -> viewHashlistAccess, manageHashlistAccess - self.assertTrue(scope['viewHashlistAccess']) - self.assertTrue(scope['manageHashlistAccess']) - # permAgentCreate -> createAgentAccess - self.assertTrue(scope['createAgentAccess']) - # Unrelated legacy keys stay False - self.assertFalse(scope['manageFileAccess']) - self.assertFalse(scope['ApiTokenAccess']) - - def test_scope_intersection_unknown_scope_yields_no_grants(self): - # An unrecognised scope must not error and must not flip any legacy key - model_obj = self.create_test_object( - delete=False, - extra_payload={'scopes': ['definitelyNotARealPermission']}, - ) + self.assertTrue(scope.get('permHashlistRead')) + + def test_token_scope_intersection_denies_unpermitted(self): + """A restricted user must NOT receive a scope they do not have, even if they request it.""" + auth = create_restricted_user(self, { + 'permHashlistRead': True, + 'permJwtApiKeyCreate': True, + }) + model_obj = _create_apitoken_raw(self, auth, ['permHashlistRead', 'permFileRead']) scope = _decode_jwt_scope(model_obj.token) - - # Every legacy key is False — and the dict still has the full keyset - self.assertGreater(len(scope), 0) - self.assertTrue(all(v is False for v in scope.values()), - f"Unknown scope must not grant anything, got: {scope}") - - def test_scope_intersection_drops_perms_user_lacks(self): - # A restricted user with only permHashlistRead must NOT be able to mint - # a token that grants permAgentCreate, even if they ask for it. - auth = create_restricted_user(self, {'permHashlistRead': True}) - - config = HashtopolisConfig() - conn = HashtopolisConnector('/auth/token', config) - r = requests.post(conn._api_endpoint + '/auth/token', auth=auth) - self.assertEqual(r.status_code, 201, f"Login failed: {r.text}") - user_jwt = r.json()['token'] - - # Create an API token as this restricted user requesting BOTH a perm - # they have AND a perm they don't. - now = int(time.time()) - payload = {'scopes': ['permHashlistRead', 'permAgentCreate'], 'startValid': now, 'endValid': now + 3600} - r = requests.post( - conn._api_endpoint + '/ui/apiTokens', - headers={'Authorization': 'Bearer ' + user_jwt, 'Content-Type': 'application/json'}, - data=json.dumps(payload), - ) - self.assertEqual(r.status_code, 201, f"Restricted-user token creation failed: {r.text}") - body = r.json() - token = body['data']['attributes']['token'] if 'data' in body else body.get('token') - self.assertIsNotNone(token, f"Expected token in response, got: {body}") - - scope = _decode_jwt_scope(token) - # Hashlist-read is granted (user has it) - self.assertTrue(scope['viewHashlistAccess']) - self.assertTrue(scope['manageHashlistAccess']) - # Agent-create is NOT granted (user lacks it) - self.assertFalse(scope['createAgentAccess']) - - def test_scope_intersection_token_works_as_bearer(self): - # End-to-end: a token issued for permHashlistRead must successfully - # authorise GET /ui/hashlists for the admin caller. - model_obj = self.create_test_object( - delete=False, - extra_payload={'scopes': ['permHashlistRead']}, - ) - config = HashtopolisConfig() - conn = HashtopolisConnector('/ui/hashlists', config) - r = requests.get( - conn._api_endpoint + '/ui/hashlists', - headers={'Authorization': 'Bearer ' + model_obj.token}, - ) - self.assertEqual(r.status_code, 200, - f"Bearer with permHashlistRead should authorise listing hashlists; got {r.status_code}: {r.text}") + self.assertTrue(scope.get('permHashlistRead')) + self.assertFalse(scope.get('permFileRead')) From 337b1a60ab9e0e6989a0c0184a351a67f764fbad Mon Sep 17 00:00:00 2001 From: jessevz Date: Wed, 13 May 2026 18:19:14 +0200 Subject: [PATCH 514/691] Fix api docs (#2024) * Fixed openapi doc errors * Added openapi validation to pipeline * Added aggregated data to get request openapi docs * Use redocly to check if openapi compliant (spectral checks only json+api format), checkin spectral yaml, only use read permissions in workflow --------- Co-authored-by: jessevz Co-authored-by: correct-horse-battery-bench --- .github/openapi/spectral-jsonapi.yml | 1543 +++++++++++++++++ .github/workflows/openapi-lint.yml | 43 + redocly.yaml | 2 + src/inc/apiv2/common/AbstractBaseAPI.php | 12 + src/inc/apiv2/common/OpenAPISchemaUtils.php | 69 +- src/inc/apiv2/common/openAPISchema.routes.php | 270 ++- src/inc/apiv2/helper/CurrentUserHelperAPI.php | 5 +- .../apiv2/helper/GetAccessGroupsHelperAPI.php | 4 +- src/inc/apiv2/helper/GetBestTasksAgent.php | 4 +- .../apiv2/helper/GetCracksOfTaskHelper.php | 4 +- .../helper/GetUserPermissionHelperAPI.php | 4 +- src/inc/apiv2/helper/ImportFileHelperAPI.php | 8 +- src/inc/apiv2/model/LogEntryAPI.php | 5 + src/inc/apiv2/model/TaskAPI.php | 12 + 14 files changed, 1848 insertions(+), 137 deletions(-) create mode 100644 .github/openapi/spectral-jsonapi.yml create mode 100644 .github/workflows/openapi-lint.yml create mode 100644 redocly.yaml diff --git a/.github/openapi/spectral-jsonapi.yml b/.github/openapi/spectral-jsonapi.yml new file mode 100644 index 000000000..fcaf15a2b --- /dev/null +++ b/.github/openapi/spectral-jsonapi.yml @@ -0,0 +1,1543 @@ +description: "# [{json:api}](https://jsonapi.org/) - [v1.0](https://jsonapi.org/format/1.0/)\r\n> + A Specification for Building APIs in JSON\r\n\r\nJSON:API is a specification for + how a client should request that resources be fetched or modified, and how a server + should respond to those requests.\r\n\r\nJSON:API is designed to minimize both the + number of requests and the amount of data transmitted between clients and servers. + This efficiency is achieved without compromising readability, flexibility, or discoverability.\r\n\r\nJSON:API + requires use of the JSON:API media type `application/vnd.api+json` for exchanging + data.\r\n\r\n\r\n---\r\nThis styleguide ruleset can be found on GitHub: [spectral-jsonapi-ruleset](https://github.com/jmlue42/spectral-jsonapi-ruleset) " + +extends: + - spectral:oas +formats: + - oas3.1 + +aliases: + AllContentSchemas: + - "$.paths..content['application/vnd.api+json'].schema" + + ResourceObjects: + - "$.paths..responses..content[application/vnd.api+json].schema.properties.data.properties" + - "$.paths..responses..content[application/vnd.api+json].schema.properties.data.allOf[*].properties" + - "$.paths..responses..content[application/vnd.api+json].schema.properties.data.items.properties" + - "$.paths..responses..content[application/vnd.api+json].schema.properties.data.items.allOf[*].properties" + - "$.paths..content[application/vnd.api+json].schema.properties.included.items.properties" + - "$.paths..content[application/vnd.api+json].schema.properties.included.items.allOf[*].properties" + - "$.paths..patch.requestBody.content[application/vnd.api+json].schema.properties.data.properties" + - "$.paths..patch.requestBody.content[application/vnd.api+json].schema.properties.data.allOf[*].properties" + + POSTResourceObjects: + - "$.paths..post.requestBody.content[application/vnd.api+json].schema.properties.data.properties" + - "$.paths..post.requestBody.content[application/vnd.api+json].schema.properties.data.allOf[*].properties" + + LinkObjects: + - "#AllContentSchemas..properties[links]" + + MetaObjects: + - "#AllContentSchemas..properties[meta]" + + Relationships: + - "#AllContentSchemas..properties[relationships]" + + RelationshipData: + - "#Relationships..data" + + POSTRelationships: + - "$.paths..post.requestBody.content[application/vnd.api+json].schema.properties.data.properties[relationships].properties[*]" + - "$.paths..post.requestBody.content[application/vnd.api+json].schema.properties.data.allOf[*].properties[relationships].properties[*]" + + PATCHRelationships: + - "$.paths..patch.requestBody.content[application/vnd.api+json].schema.properties.data.properties[relationships].properties[*]" + - "$.paths..patch.requestBody.content[application/vnd.api+json].schema.properties.data.allOf[*].properties[relationships].properties[*]" + + SingleErrorResponses: + - "$.paths..responses[?(@property > '400' && @property < '500')].content[application/vnd.api+json].schema.properties.errors" + - "$.paths..responses[?(@property > '500' && @property < '600')].content[application/vnd.api+json].schema.properties.errors" + - "$.paths..responses[default].content[application/vnd.api+json].schema.properties.errors" + + ErrorObjects: + - "$.paths..responses[default,400,500].content[application/vnd.api+json].schema.properties.errors.items.properties" + - "$.paths..responses[default,400,500].content[application/vnd.api+json].schema.properties.errors.items.allOf[*].properties" + - "$.paths..responses[?(@property > '400' && @property < '500')].content[application/vnd.api+json].schema.properties.errors.items.properties" + - "$.paths..responses[?(@property > '400' && @property < '500')].content[application/vnd.api+json].schema.properties.errors.items.allOf[*].properties" + - "$.paths..responses[?(@property > '500' && @property < '600')].content[application/vnd.api+json].schema.properties.errors.items.properties" + - "$.paths..responses[?(@property > '500' && @property < '600')].content[application/vnd.api+json].schema.properties.errors.items.allOf[*].properties" + +rules: + +# --------------------------------------------------------------------------- +# Section 4 Content Negotiation +# --------------------------------------------------------------------------- + + content-type: + description: "Clients and Servers **MUST** send all JSON:API data as Content-Type: + `application/vnd.api+json` without any media type parameters.\r\n\r\n**Invalid + Examples:**\r\n```YAML\r\nrequestBody:\r\n content:\r\n application/json\r\n\r\nresponses:\r\n + \ '200':\r\n content:\r\n application/json\r\n```\r\n\r\n**Valid Examples:**\r\n```YAML\r\nrequestBody:\r\n + \ content:\r\n application/vnd.api+json\r\n\r\nresponses:\r\n '200':\r\n + \ content:\r\n application/vnd.api+json\r\n```\r\n\r\nRelated specification + information can be found [here](https://jsonapi.org/format/1.0/#content-negotiation-servers)." + documentationUrl: "https://jsonapi.org/format/1.0/#content-negotiation" + message: "content MUST be 'application/vnd.api+json'" + severity: error + given: + - "$.paths..requestBody.content" + - "$.paths..responses..content" + then: + field: "@key" + function: enumeration + functionOptions: + values: + - application/vnd.api+json + + 406-response-code: + description: "Servers **MUST** document and support response code **406** paths + in case of invalid `ACCEPT` media values.\r\n\r\n**Invalid Example:**\r\n```YAML\r\npaths:\r\n + \ /myResources:\r\n get:\r\n responses:\r\n '200':\r\n $ref: + '#/components/responses/MyResource_Collection'\r\n```\r\n\r\n**Valid Example:**\r\n```YAML\r\npaths:\r\n + \ /myResources:\r\n get:\r\n responses:\r\n '200':\r\n $ref: + '#/components/responses/MyResource_Collection'\r\n '406':\r\n $ref: + '#/components/responses/406Error'\r\n```\r\n\r\nRelated specification information + can be found [here](https://jsonapi.org/format/1.0/#content-negotiation-servers)." + documentationUrl: "https://jsonapi.org/format/1.0/#content-negotiation-servers" + message: "All paths must support response codes: 406" + severity: error + given: "$.paths..responses" + then: + field: "406" + function: truthy + + 415-response-code: + description: "Servers **MUST** document and support response code **415** on `POST` + or `PATCH` paths in case of invalid `Content-Type` media values.\r\n\r\n**Invalid + Example:**\r\n```YAML\r\npaths:\r\n /myResources:\r\n post:\r\n responses:\r\n + \ '200':\r\n $ref: '#/components/responses/MyResource_Collection'\r\n```\r\n\r\n**Valid + Example:**\r\n```YAML\r\npaths:\r\n /myResources:\r\n post:\r\n responses:\r\n + \ '200':\r\n $ref: '#/components/responses/MyResource_Collection'\r\n + \ '415':\r\n $ref: '#/components/responses/415Error'\r\n```\r\n\r\nRelated + specification information can be found [here](https://jsonapi.org/format/1.0/#content-negotiation-servers)." + documentationUrl: "https://jsonapi.org/format/1.0/#content-negotiation-servers" + message: "POST and PATCH paths must support response code: 415" + severity: error + given: "$.paths[*][post,patch].responses" + then: + field: "415" + function: truthy + +# --------------------------------------------------------------------------- +# Section 5 Document Structure +# Section 5.1 Top Level Object Schema +# --------------------------------------------------------------------------- + + top-level-json-object: + description: "A JSON object **MUST** be at the root of every JSON:API request/response + body containing data\r\n\r\nValid Examples:\r\n```YAML\r\ncontent:\r\n application/vnd.api+json:\r\n + \ schema:\r\n type: object\r\n```\r\n\r\nRelated specification information + can be found [here](https://jsonapi.org/format/1.0/#document-top-level)." + documentationUrl: "https://jsonapi.org/format/1.0/#document-top-level" + message: "Request/response body must be wrapped in root level JSON object" + severity: error + given: "#AllContentSchemas" + then: + field: type + function: enumeration + functionOptions: + values: + - object + + top-level-json-properties: + description: "Root JSON object **MUST** follow the jsonapi schema\r\n\r\n**Schema + Rules:**\r\n- **MUST** contain at least one of: `data`, `errors`, `meta` properties\r\n- + `data` and `errors` **MAY NOT** coexist in the same document\r\n- **MAY** contain: + `jsonapi`,`links`,`included`\r\n- if `included` exists, `data` is **REQUIRED**\r\n\r\n**Invalid + Examples:**\r\n```YAML\r\ntype: object\r\nproperties:\r\n data:\r\n type: + object\r\n errors:\r\n type: array\r\n\r\ntype: object\r\nproperties:\r\n + \ links:\r\n type: object\r\n included:\r\n type: array\r\n```\r\n\r\n**Valid + Examples:**\r\n```YAML\r\ntype: object\r\nproperties:\r\n jsonapi:\r\n type: + object\r\n links:\r\n type: object\r\n meta:\r\n type: object\r\n + \ data:\r\n type: object\r\n included:\r\n type: array\r\n\r\n\r\ntype: + object\r\nproperties:\r\n errors:\r\n type: array\r\n```\r\n\r\nRelated + specification information can be found [here](https://jsonapi.org/format/1.0/#document-top-level)." + documentationUrl: "https://jsonapi.org/format/1.0/#document-top-level" + message: "Root JSON object MUST follow the jsonapi schema" + severity: error + given: "#AllContentSchemas" + then: + field: "properties" + function: schema + functionOptions: + dialect: "draft2020-12" + schema: + type: object + anyOf: + - required: ["data"] + - required: ["errors"] + - required: ["meta"] + not: + anyOf: + - required: ["data","errors"] + dependentRequired: + included: ["data"] + properties: + data: + type: object + properties: + type: + type: string + enum: + - object + - array + - "null" + errors: + type: object + properties: + type: + type: string + enum: + - array + meta: + type: object + properties: + type: + type: string + enum: + - object + jsonapi: + type: object + properties: + type: + type: string + enum: + - object + links: + type: object + properties: + type: + type: string + enum: + - object + included: + type: object + properties: + type: + type: string + enum: + - array + +# --------------------------------------------------------------------------- +# Section 5.2 Resource Objects +# --------------------------------------------------------------------------- + + resource-object-properties: + description: "Verify allowed properties in Resource Objects\r\n\r\n**Allowed properties:** + `id`,`type`,`attributes`,`relationships`,`links`,`meta`\r\n\r\n**Invalid Example:**\r\n```YAML\r\ntype: + object\r\nproperties:\r\n id:\r\n type: string\r\n format: uri\r\n example: + 4257c52f-6c78-4747-8106-e185c081436b\r\n type:\r\n type: string\r\n enum:\r\n + \ - resources\r\n name:\r\n type: string\r\n```\r\n\r\n**Valid Example:**\r\n```YAML\r\ntype: + object\r\nrequired:\r\n - id\r\n - type\r\n - attributes\r\n - relationships\r\nproperties:\r\n + \ id:\r\n type: string\r\n format: uri\r\n example: 4257c52f-6c78-4747-8106-e185c081436b\r\n + \ type:\r\n type: string\r\n enum:\r\n - resources\r\n attributes:\r\n + \ type: object\r\n relationships:\r\n type: object\r\n meta:\r\n type: + object\r\n links:\r\n type: object\r\n```\r\n\r\nRelated specification information + can be found [here](https://jsonapi.org/format/1.0/#document-resource-objects)." + documentationUrl: "https://jsonapi.org/format/1.0/#document-resource-objects" + message: "'data' objects/items MUST meet Resource Object restrictions" + severity: error + given: + - "#ResourceObjects" + - "#POSTResourceObjects" + then: + - field: type + function: truthy + - field: "@key" + function: enumeration + functionOptions: + values: + - id + - type + - attributes + - relationships + - links + - meta + +# TODO:// Error throws incorrectly (too much) in an allOf scenario where one item is valid, but the other does not. Changed to warn for now. + resource-object-id-required: + description: "Verify `id` property exists in Resource Object (except POST requestBody)\r\n\r\n**Valid + Example:**\r\n```YAML\r\n# path..responses...\r\n# path.patch.requestBody...\r\n\r\ntype: + object\r\nrequired:\r\n - id\r\n - type\r\nproperties:\r\n id:\r\n type: + string\r\n format: uuid\r\n example: 4257c52f-6c78-4747-8106-e185c081436b\r\n + \ type:\r\n type: string\r\n meta:\r\n type: object\r\n```\r\n**NOTE:** + Currently this rule triggers against `allOf` structures unless all items have + `id`. Until this is corrected it is set as a warning.\r\n\r\n\r\nRelated specification + information can be found [here](https://jsonapi.org/format/1.0/#document-resource-objects)." + documentationUrl: "https://jsonapi.org/format/1.0/#document-resource-objects" + message: "Could be missing 'id' property. Please verify the resource." + severity: warn + given: "#ResourceObjects" + then: + field: id + function: truthy + +# --------------------------------------------------------------------------- +# Section 5.2.1 Resource Objects - Identification +# --------------------------------------------------------------------------- + + resource-object-property-types: + description: "`id` and `type` **MUST** be of type `string`\r\n\r\n**Invalid Example:**\r\n```YAML\r\ntype: + object\r\nproperties:\r\n id:\r\n type: number\r\n type:\r\n type: string\r\n + \ enum:\r\n - resources\r\n```\r\n\r\n**Valid Example:**\r\n```YAML\r\ntype: + object\r\nrequired:\r\n - id\r\n - type\r\nproperties:\r\n id:\r\n type: + string\r\n format: uri\r\n example: 4257c52f-6c78-4747-8106-e185c081436b\r\n + \ type:\r\n type: string\r\n enum:\r\n - resources\r\n```\r\n\r\nRelated + specification information can be found [here](https://jsonapi.org/format/1.0/#document-resource-object-identification)." + documentationUrl: "https://jsonapi.org/format/1.0/#document-resource-object-identification" + message: "'id' and 'type' MUST be of type 'string'" + severity: error + given: + - "#ResourceObjects.id" + - "#ResourceObjects.type" + - "#POSTResourceObjects.type" + then: + field: type + function: enumeration + functionOptions: + values: + - string + +# --------------------------------------------------------------------------- +# Section 5.2.2 Resource Objects - Fields +# --------------------------------------------------------------------------- + + resource-object-reserved-fields: + description: "`id` and `type` **MUST NOT** exist in `attributes` or `relationships`\r\n\r\n**Invalid + Example:**\r\n```YAML\r\ntype: object\r\nrequired:\r\n - id\r\n - type\r\n + \ - attributes\r\nproperties:\r\n id:\r\n type: string\r\n format: uri\r\n + \ example: 4257c52f-6c78-4747-8106-e185c081436b\r\n type:\r\n type: string\r\n + \ enum:\r\n - resources\r\n attributes:\r\n type: object\r\n properties:\r\n + \ id:\r\n type: number\r\n type:\r\n type: string\r\n```\r\n\r\n**Valid + Example:**\r\n```YAML\r\ntype: object\r\nrequired:\r\n - id\r\n - type\r\n + \ - attributes\r\nproperties:\r\n id:\r\n type: string\r\n format: uri\r\n + \ example: 4257c52f-6c78-4747-8106-e185c081436b\r\n type:\r\n type: string\r\n + \ enum:\r\n - resources\r\n attributes:\r\n type: object\r\n properties:\r\n + \ name:\r\n type: string\r\n descrpition:\r\n type: + string\r\n meta:\r\n type: object\r\n links:\r\n type: object\r\n```\r\n\r\nRelated + specification information can be found [here](https://jsonapi.org/format/1.0/#document-resource-object-fields)." + documentationUrl: "https://jsonapi.org/format/1.0/#document-resource-object-fields" + message: "'id' and 'type' MUST NOT exist in 'attributes' or 'relationships'" + severity: error + given: "#AllContentSchemas..properties[attributes,relationships].properties" + then: + - field: id + function: falsy + - field: type + function: falsy + +# --------------------------------------------------------------------------- +# Section 5.2.3 Resource Objects - Attributes +# --------------------------------------------------------------------------- + + attributes-object-type: + description: "`attributes` property **MUST** be an `object`\r\n\r\n**Invalid Examples:**\r\n```YAML\r\n# + data (Resource Object)\r\n# ... \r\nproperties:\r\n attributes:\r\n type: + array \r\n```\r\n\r\n**Valid Example:**\r\n```YAML\r\n# data (Resource Object)\r\n# + ... \r\nproperties:\r\n attributes:\r\n type: object\r\n```\r\n\r\nRelated + specification information can be found [here](https://jsonapi.org/format/1.0/#document-resource-object-attributes)." + documentationUrl: "https://jsonapi.org/format/1.0/#document-resource-object-attributes" + message: "The value of 'attributes' property MUST be an object" + severity: error + given: "#AllContentSchemas..properties[attributes]" + then: + field: type + function: enumeration + functionOptions: + values: + - object + + attributes-object-properties: + description: "`attributes` object **MUST NOT** contain a `relationships` or `links` + property\r\n\r\n**Invalid Example:**\r\n```YAML\r\n# data (Resource Object)\r\n# + ... \r\nproperties:\r\n attributes:\r\n type: object\r\n required:\r\n + \ - name\r\n properties:\r\n name:\r\n type: string\r\n example: + do-hickey\r\n description:\r\n type: string\r\n example: + thing that does stuff\r\n links:\r\n type: array\r\n items:\r\n + \ type: string\r\n relationships:\r\n type: array\r\n + \ items:\r\n type: string\r\n```\r\n\r\n**Valid Example:**\r\n```YAML\r\n# + data (Resource Object)\r\n# ... \r\nproperties:\r\n attributes:\r\n type: + object\r\n required:\r\n - name\r\n properties:\r\n name:\r\n + \ type: string\r\n example: do-hickey\r\n description:\r\n + \ type: string\r\n example: thing that does stuff\r\n```\r\n\r\nRelated + specification information can be found [here](https://jsonapi.org/format/1.0/#document-resource-object-attributes)." + documentationUrl: "https://jsonapi.org/format/1.0/#document-resource-object-attributes" + message: "Attributes object MUST NOT contain a 'relationships' or 'links' property" + severity: error + given: "#AllContentSchemas..properties[attributes]..properties" + then: + - field: relationships + function: falsy + - field: links + function: falsy + + attributes-object-foreign-keys: + description: "Foreign Keys **SHOULD NOT** appear in `attributes`. **RECOMMEND** + using `relationships`\r\n\r\nAlthough has-one foreign keys (e.g. author_id) + are often stored internally alongside other information to be represented in + a resource object, these keys **SHOULD NOT** appear as attributes.\r\n\r\nForiegn + keys are supported through the use of [relationships](https://jsonapi.org/format/1.0/#document-resource-object-relationships) + and [related resource links](https://jsonapi.org/format/1.0/#document-resource-object-related-resource-links).\r\n\r\n**Example:** + Use relationship primary data rather than foreign key.\r\n```YAML\r\ntype: object\r\nproperties:\r\n + \ id:\r\n type: string\r\n format: uuid\r\n type:\r\n type: string\r\n + \ enum:\r\n - widgets\r\n attributes:\r\n type: object\r\n required:\r\n + \ - name\r\n properties:\r\n account_id:\r\n type: + string\r\n name:\r\n type: string\r\n example: do-hickey\r\n + \ description:\r\n type: string\r\n example: thing that + does stuff\r\n relationships:\r\n type: object\r\n properties:\r\n manufacturer: + #<------ a widget has a relationship with a manufacturer\r\n type: object\r\n + \ required:\r\n - links\r\n - data\r\n properties:\r\n + \ data:\r\n type: object\r\n properties:\r\n + \ id: #<---------- primary/foreign key value\r\n type: + string\r\n format: uuid\r\n type:\r\n type: + string\r\n enum:\r\n - businesses\r\n```\r\n**NOTE:** + This would normally be a severity of `hint`, though this can be missed visually + in vscode. Until this changes it will be a severity of `info`.\r\n\r\nRelated + specification information can be found [here](https://jsonapi.org/format/1.0/#document-resource-object-attributes)." + documentationUrl: "https://jsonapi.org/format/1.0/#document-resource-object-attributes" + message: "Foreign key? If so, it would be better to remove and use a relationship." + severity: info + given: "#AllContentSchemas..properties[attributes]..properties[*]~" + then: + function: pattern + functionOptions: + notMatch: ".*_id$" + +# --------------------------------------------------------------------------- +# Section 5.2.4 Resource Objects - Relationships (Addresses 5.2.6 and 5.3) +# --------------------------------------------------------------------------- + + relationships-object-type: + description: "relationships **MUST** be an `object`\r\n\r\n**Invalid Example:**\r\n```YAML\r\nrelationships:\r\n + \ type: array\r\n```\r\n\r\n**Valid Example:**\r\n```YAML\r\nrelationships:\r\n + \ type: object\r\n```\r\n\r\nRelated specification information can be found + [here](https://jsonapi.org/format/1.0/#document-resource-object-relationships)." + documentationUrl: "https://jsonapi.org/format/1.0/#document-resource-object-relationships" + message: "Relationships MUST be an object" + severity: error + given: "#Relationships" + then: + field: type + function: enumeration + functionOptions: + values: + - object + + relationship-schema: + description: "relationship object **MUST** follow the schema\r\n\r\n**Schema Rules:**\r\n- + **MUST** contain at least one of: `links`,`data`,`meta`\r\n- `links` object + **MUST** contain at least one of: `self`, `related`\r\n- `data` **MAY** be `null`, + single or array of resource identifiers\r\n- `meta` **MUST** be an `object`\r\n\r\n**Valid + Example:**\r\n```YAML\r\n'relationshipNameSingle':\r\n type: object\r\n required:\r\n + \ - links\r\n - data\r\n properties:\r\n links:\r\n type: object\r\n + \ required:\r\n - self\r\n - related\r\n properties:\r\n + \ self:\r\n $ref: '#/components/schemas/Link'\r\n example: + http://api.domain.com/v1/myResources/{id}/relationships/manufacturers\r\n related:\r\n + \ type: string\r\n example: http://api.domain.com/v1/manufacturers/{id}\r\n + \ data:\r\n type: object\r\n required:\r\n - id\r\n - + type\r\n properties:\r\n id:\r\n type: string\r\n format: + uri\r\n example: 4257c52f-6c78-4747-8106-e185c081436b\r\n type:\r\n + \ type: string\r\n enum:\r\n - 'relationshipNamePlural'\r\n```\r\n\r\nRelated + specification information can be found [here](https://jsonapi.org/format/1.0/#document-resource-object-relationships)." + documentationUrl: "https://jsonapi.org/format/1.0/#document-resource-object-relationships" + message: "relationship object MUST follow the schema" + severity: error + given: "#Relationships.properties[*]" + then: + - field: type + function: enumeration + functionOptions: + values: + - object + - field: properties + function: schema + functionOptions: + dialect: "draft2020-12" + schema: + type: object + anyOf: + - required: ["links"] + - required: ["data"] + - required: ["meta"] + properties: + links: + type: object + properties: + type: + type: string + enum: + - object + properties: + type: object + anyOf: + - required: ["self"] + - required: ["related"] + properties: + self: + type: object + related: + type: object + data: + type: object + properties: + type: + type: string + enum: + - object + - array + - "null" + meta: + type: object + properties: + type: + type: string + enum: + - object + additionalProperties: false + + relationship-data-properties: + description: "relationship `data` **MAY** only contain: `id`, `type` and `meta`\r\n\r\nInvalid + Example:\r\n```YAML\r\ntype: object\r\nrequired:\r\n - id\r\n - type\r\nproperties:\r\n + \ id:\r\n type: string\r\n format: uuid\r\n example: 2357c52f-6c78-4747-8106-e185c08143aa\r\n + \ type:\r\n type: string\r\n attributes:\r\n type: object\r\n meta:\r\n + \ type: object\r\n```\r\n\r\nValid Example:\r\n```YAML\r\ntype: object\r\nrequired:\r\n + \ - id\r\n - type\r\nproperties:\r\n id:\r\n type: string\r\n format: + uuid\r\n example: 2357c52f-6c78-4747-8106-e185c08143aa\r\n type:\r\n type: + string\r\n meta:\r\n type: object\r\n```\r\n\r\nRelated specification information + can be found [here](https://jsonapi.org/format/1.0/#document-resource-identifier-objects)." + documentationUrl: "https://jsonapi.org/format/1.0/#document-resource-identifier-objects" + message: "relationship data May only contain: 'id', 'type' and 'meta'" + severity: error + given: + - "#RelationshipData.properties" + - "#RelationshipData.allOf[*].properties" + - "#RelationshipData.items.properties" + - "#RelationshipData.items.allOf[*].properties" + then: + field: "@key" + function: enumeration + functionOptions: + values: + - id + - type + - meta + + relationship-data-schema: + description: "relationship data items **MUST** follow schema\r\n\r\n**Schema Rules:**\r\n- + `id` **MUST** be a `string`\r\n- `type` **MUST** be a `string`\r\n- `meta` **MUST** + be an `object`\r\n\r\n**Invalid Examples:**\r\n```YAML\r\ntype: object\r\nrequired:\r\n + \ - id\r\n - type\r\nproperties:\r\n id:\r\n type: number\r\n type:\r\n + \ type: number\r\n meta:\r\n type: object\r\n```\r\n\r\n**Valid Example:**\r\n```YAML\r\ntype: + object\r\nrequired:\r\n - id\r\n - type\r\nproperties:\r\n id:\r\n type: + string\r\n format: uuid\r\n example: 2357c52f-6c78-4747-8106-e185c08143aa\r\n + \ type:\r\n type: string\r\n meta:\r\n type: object \r\n```\r\n\r\nRelated + specification information can be found [here](https://jsonapi.org/format/1.0/#document-resource-identifier-objects)." + documentationUrl: "https://jsonapi.org/format/1.0/#document-resource-identifier-objects" + message: "relationship data items MUST follow schema" + severity: error + given: + - "#RelationshipData.properties" + - "#RelationshipData.allOf[0].properties" + - "#RelationshipData.items.properties" + - "#RelationshipData.items.allOf[0].properties" + then: + function: schema + functionOptions: + dialect: "draft2020-12" + schema: + type: object + required: ["id","type"] + properties: + id: + type: object + properties: + type: + type: string + enum: + - string + type: + type: object + properties: + type: + type: string + enum: + - string + meta: + type: object + properties: + type: + type: string + enum: + - object + +# --------------------------------------------------------------------------- +# Section 5.5 Resource Objects - Meta Information +# --------------------------------------------------------------------------- + + meta-object: + description: "`meta` property **MUST** be of type `object`\r\n\r\n**Invalid Examples:**\r\n```YAML\r\nproperties:\r\n + \ meta:\r\n type: string \r\n```\r\n\r\n**Valid Example:**\r\n```YAML\r\nproperties:\r\n + \ meta:\r\n type: object\r\n```\r\n\r\nRelated specification information + can be found [here](https://jsonapi.org/format/1.0/#document-meta)." + documentationUrl: "https://jsonapi.org/format/1.0/#document-meta" + message: "'meta' property MUST be of type object" + severity: error + given: "#MetaObjects" + then: + field: type + function: enumeration + functionOptions: + values: + - object + +# --------------------------------------------------------------------------- +# Section 5.6 Resource Objects - Links +# --------------------------------------------------------------------------- + + links-object: + description: "`links` property **MUST** be an `object`\r\n\r\n**Invalid Examples:**\r\n```YAML\r\nproperties:\r\n + \ links:\r\n type: array \r\n```\r\n\r\n**Valid Example:**\r\n```YAML\r\nproperties:\r\n + \ links:\r\n type: object\r\n```\r\n\r\nRelated specification information + can be found [here](https://jsonapi.org/format/1.0/#document-links)." + documentationUrl: "https://jsonapi.org/format/1.0/#document-links" + message: "'links' property MUST be an object" + severity: error + given: "#LinkObjects" + then: + field: type + function: enumeration + functionOptions: + values: + - object + + links-object-schema: + description: "A link **MUST** be represented as either a `string` containing the + link's URL or an `object`.\r\n\r\n**Invalid Examples:**\r\n```YAML\r\nproperties:\r\n + \ links:\r\n type: object\r\n properties:\r\n self:\r\n type: + number\r\n```\r\n\r\n**Valid Example:**\r\n```YAML\r\nproperties:\r\n links:\r\n + \ type: object\r\n properties:\r\n self:\r\n oneOf:\r\n + \ - type: string\r\n format: uri\r\n - type: + object\r\n required:\r\n - href\r\n properties:\r\n + \ href:\r\n type: string\r\n format: + uri\r\n meta:\r\n type: object \r\n```\r\n\r\nRelated + specification information can be found [here](https://jsonapi.org/format/1.0/#document-links)." + documentationUrl: "https://jsonapi.org/format/1.0/#document-links" + message: "'link' properties must be of type string or object" + severity: error + given: "#LinkObjects.properties[*]..[?(@property === 'type')]^" + then: + field: type + function: enumeration + functionOptions: + values: + - string + - object + + links-object-schema-properties: + description: "objects contained within a `links` object **MUST** contain `href` + (string) and **MAY** contain `meta`\r\n\r\nA link **MUST** be represented as + either a `string` containing the link's URL or an `object`.\r\n\r\n**Invalid + Examples:**\r\n```YAML\r\nproperties:\r\n links:\r\n type: object\r\n properties:\r\n + \ self:\r\n oneOf:\r\n - type: string\r\n format: + uri\r\n - type: object\r\n properties:\r\n url:\r\n + \ type: string\r\n format: uri\r\n meta:\r\n + \ type: object \r\n```\r\n\r\n**Valid Example:**\r\n```YAML\r\nproperties:\r\n + \ links:\r\n type: object\r\n properties:\r\n self:\r\n oneOf:\r\n + \ - type: string\r\n format: uri\r\n - type: + object\r\n required:\r\n - href\r\n properties:\r\n + \ href:\r\n type: string\r\n format: + uri\r\n meta:\r\n type: object \r\n```\r\n\r\nRelated + specification information can be found [here](https://jsonapi.org/format/1.0/#document-links)." + documentationUrl: "https://jsonapi.org/format/1.0/#document-links" + message: "objects contained within a links object MUST contain 'href' (string) and MAY contain 'meta'" + severity: error + given: "#LinkObjects.properties..properties" + then: + - field: "@key" + function: enumeration + functionOptions: + values: + - href + - meta + - field: href + function: truthy + - field: href.type + function: enumeration + functionOptions: + values: + - string + +# --------------------------------------------------------------------------- +# Section 5.7 Resource Objects - JSON:API Object +# --------------------------------------------------------------------------- + + jsonapi-object: + description: "`jsonapi` object **MUST** match schema\r\n\r\n**Schema Rules:**\r\n- + `jsonapi` **MUST** be an `object`\r\n- **MUST** contain `string` `version`\r\n\r\n**Valid + Example:**\r\n```YAML\r\nproperties:\r\n jsonapi:\r\n type: object\r\n properties:\r\n + \ version:\r\n type: string\r\n example: '1.0'\r\n```\r\n\r\nRelated + specification information can be found [here](https://jsonapi.org/format/1.0/#document-jsonapi-object)." + documentationUrl: "https://jsonapi.org/format/1.0/#document-jsonapi-object" + message: "jsonapi object MUST match schema" + severity: error + given: "#AllContentSchemas..properties[?(@property === 'jsonapi')]" + then: + - field: type + function: enumeration + functionOptions: + values: + - object + - field: "properties[*]~" + function: enumeration + functionOptions: + values: + - version + - field: properties.version + function: truthy + - field: properties.version.type + function: enumeration + functionOptions: + values: + - string + +# --------------------------------------------------------------------------- +# Section 6 Fetching Data +# Section 6.1 +# Section 6.2 Responses Codes - 200, 404 +# --------------------------------------------------------------------------- + + get-200-response-code: + description: "`GET` requests **MUST** support response code 200\r\n\r\n**Invalid + Example:**\r\n```YAML\r\npaths:\r\n /myResources/{id}:\r\n get:\r\n responses:\r\n + \ '404':\r\n $ref: '#/components/responses/404Error'\r\n```\r\n\r\n**Valid + Examples:**\r\n```YAML\r\npaths:\r\n /myResources/{id}:\r\n get:\r\n responses:\r\n + \ '200':\r\n $ref: '#/components/responses/MyResource_Single'\r\n + \ '404':\r\n $ref: '#/components/responses/404Error'\r\n```\r\n\r\nRelated + specification information can be found [here](https://jsonapi.org/format/1.0/#fetching-resources-responses)." + documentationUrl: "https://jsonapi.org/format/1.0/#fetching-resources-responses" + message: "GET paths must support response code: 200" + severity: error + given: "$.paths[*][get].responses" + then: + field: "200" + function: truthy + +# TODO:// verify a 404 response exists on a GET request that returns a single resource + +# --------------------------------------------------------------------------- +# Section 6.3 Fetching Resources - Inclusion of Related Resources +# --------------------------------------------------------------------------- + + 400-response-code: + description: "Servers **MUST** document and support response code **400** for + all paths\r\n\r\n**Invalid Example:**\r\n```YAML\r\npaths:\r\n /myResources:\r\n + \ get:\r\n responses:\r\n '200':\r\n $ref: '#/components/responses/MyResource_Collection'\r\n```\r\n\r\n**Valid + Example:**\r\n```YAML\r\npaths:\r\n /myResources:\r\n get:\r\n responses:\r\n + \ '200':\r\n $ref: '#/components/responses/MyResource_Collection'\r\n + \ '400':\r\n $ref: '#/components/responses/400Error'\r\n```" + message: "All paths must support response codes: 400" + severity: error + given: "$.paths..responses" + then: + field: "400" + function: truthy + + include-parameter: + description: "`include` query param **MUST** be a string array (csv)\r\n\r\n**Valid + Example:**\r\n```YAML\r\nname: include\r\ndescription: csv formatted parameter + of relationship names to include in response\r\nin: query\r\nstyle: form\r\nexplode: + false\r\nschema:\r\ntype: array\r\nitems:\r\n type: string\r\nexample: [\"ratings\",\"comments.author\"]\r\n```\r\nExample + query string: `/articles/1?include=comments.author,ratings`\r\n\r\nRelated specification + information can be found [here](https://jsonapi.org/format/1.0/#fetching-includes)." + documentationUrl: "https://jsonapi.org/format/1.0/#fetching-includes" + message: "'include' query param MUST be a string array (csv)" + severity: error + given: "$.paths..parameters[*][?(@property === 'name' && @ === 'include')]^" + then: + - field: in + function: enumeration + functionOptions: + values: + - query + - field: style + function: truthy + - field: style + function: enumeration + functionOptions: + values: + - form + - field: explode + function: defined + - field: explode + function: falsy + - field: schema + function: schema + functionOptions: + dialect: "draft2020-12" + schema: + type: object + properties: + type: + type: string + enum: + - array + items: + type: object + properties: + type: + type: string + enum: + - string + +# --------------------------------------------------------------------------- +# Section 6.4 Fetching Resources - Sparse Fieldsets +# --------------------------------------------------------------------------- + + fields-parameter: + description: "`fields` query param **MUST** be a `deepObject`\r\n\r\n**Valid Example:**\r\n```YAML\r\nname: + fields\r\ndescription: schema for 'fields' query parameter\r\nin: query\r\nschema:\r\n + \ type: object\r\nstyle: deepObject\r\nexample:\r\n people: \"name\"\r\n articles: + \"title,body\"\r\n```\r\nExample query string: `/articles?fields[articles]=title,body&fields[people]=name`\r\n\r\nRelated + specification information can be found [here](https://jsonapi.org/format/1.0/#fetching-sparse-fieldsets)." + documentationUrl: "https://jsonapi.org/format/1.0/#fetching-sparse-fieldsets" + message: "'fields' query param MUST be a deepObject" + severity: error + given: "$.paths..parameters[*][?(@property === 'name' && @ === 'fields')]^" + then: + - field: in + function: enumeration + functionOptions: + values: + - query + - field: style + function: truthy + - field: style + function: enumeration + functionOptions: + values: + - deepObject + - field: schema + function: schema + functionOptions: + dialect: "draft2020-12" + schema: + type: object + properties: + type: + type: string + enum: + - object + +# --------------------------------------------------------------------------- +# Section 6.5 Fetching Resources - Sorting +# --------------------------------------------------------------------------- + + sort-parameter: + description: "`sort` query param **MUST** be a string array (csv)\r\n\r\n**Valid + Example:**\r\n```YAML\r\nname: sort\r\ndescription: csv formatted parameter + of fields to sort by\r\nin: query\r\nstyle: form\r\nexplode: false\r\nschema:\r\n + \ type: array\r\n items:\r\n type: string\r\nexample: [\"-age\",\"name\"]\r\n```\r\nExample + query string: `/people?sort=-age,name`\r\n\r\nRelated specification information + can be found [here](https://jsonapi.org/format/1.0/#fetching-sorting)." + documentationUrl: "https://jsonapi.org/format/1.0/#fetching-sorting" + message: "'sort' query param MUST be a string array (csv)" + severity: error + given: "$.paths..parameters[*][?(@property === 'name' && @ === 'sort')]^" + then: + - field: in + function: enumeration + functionOptions: + values: + - query + - field: style + function: truthy + - field: style + function: enumeration + functionOptions: + values: + - form + - field: explode + function: defined + - field: explode + function: falsy + - field: schema + function: schema + functionOptions: + dialect: "draft2020-12" + schema: + type: object + properties: + type: + type: string + enum: + - array + items: + type: object + properties: + type: + type: string + enum: + - string + +# --------------------------------------------------------------------------- +# Section 6.6 Fetching Resources - Pagination +# --------------------------------------------------------------------------- + +# TODO:// verify 'page' param only on collections + page-parameter: + description: "`page` query param **MUST** follow schema\r\n\r\n**Schema Rules:**\r\n- + **MUST** be type `object`\r\n- **MUST** be style `deepObject`\r\n- contents + depend on strategy:\r\n - cursor: `string` `cursor` and `int32` `limit`\r\n + \ - offset: `int32` `offset` and `int32` `limit`\r\n\r\n**Valid Examples:**\r\n```YAML\r\nname: + page\r\ndescription: Paging parameter, cursor based.\r\nin: query\r\nschema:\r\n + \ type: object\r\n required: [\"cursor\",\"limit\"]\r\n properties:\r\n cursor:\r\n + \ type: string\r\n limit:\r\n type: integer\r\n format: int32\r\nstyle: + deepObject\r\n\r\nname: page\r\ndescription: Paging parameter, offset based.\r\nin: + query\r\nschema:\r\n type: object\r\n required: [\"offset\",\"limit\"]\r\n + \ properties:\r\n cursor:\r\n type: integer\r\n format: int32\r\n + \ limit:\r\n type: integer\r\n format: int32\r\nstyle: deepObject\r\n```\r\nExample + query string: \r\n- `/myResources?page[cursor]=fdsJ34lkjSfjsdfk&page[limit]=10`\r\n- + `/myResources?page[offset]=2&page[limit]=10`\r\n\r\nRelated specification information + can be found [here](https://jsonapi.org/format/1.0/#fetching-pagination)." + documentationUrl: "https://jsonapi.org/format/1.0/#fetching-pagination" + message: "'page' query param MUST follow schema" + severity: error + given: "$.paths..parameters[*][?(@property === 'name' && @ === 'page')]^" + then: + - field: in + function: enumeration + functionOptions: + values: + - query + - field: style + function: truthy + - field: style + function: enumeration + functionOptions: + values: + - deepObject + - field: schema + function: schema + functionOptions: + dialect: "draft2020-12" + schema: + type: object + properties: + type: + type: string + enum: + - object + properties: + type: object + additionalProperties: false + properties: + cursor: + type: object + properties: + type: + type: string + enum: ["string"] + offset: + type: object + properties: + type: + type: string + enum: ["integer"] + format: + type: string + enum: ["int32"] + minimum: + type: integer + minimum: 0 + limit: + type: object + properties: + type: + type: string + enum: ["integer"] + format: + type: string + enum: ["int32"] + +# TODO:// verify first,last,prev,next links only on collections + +# --------------------------------------------------------------------------- +# Section 6.7 Fetching Resources - Filtering +# --------------------------------------------------------------------------- + +# TODO:// verify 'filter' param only on collections + +# --------------------------------------------------------------------------- +# Section 7.1 Creating Resources +# --------------------------------------------------------------------------- + +# TODO:// support x-http-method-override: PATCH + + post-requests-single-object: + description: "POST requests **MUST** only contain a single resource object\r\n\r\n**Invalid + Example:**\r\n```YAML\r\ncontent:\r\n application/vnd.api+json:\r\n schema:\r\n + \ type: object\r\n required:\r\n - data\r\n properties:\r\n + \ data:\r\n type: array\r\n items: \r\n $ref: + '#/components/schemas/MyResourcePostObject'\r\n```\r\n\r\n**Valid Example:**\r\n```YAML\r\ncontent:\r\n + \ application/vnd.api+json:\r\n schema:\r\n type: object\r\n required:\r\n + \ - data\r\n properties:\r\n data:\r\n $ref: '#/components/schemas/MyResourcePostObject'\r\n```\r\n\r\nRelated + specification information can be found [here](https://jsonapi.org/format/1.0/#crud-creating)." + documentationUrl: "https://jsonapi.org/format/1.0/#crud-creating" + message: "POST requests MAY only contain a single resource object" + severity: error + given: "$.paths..post.requestBody.content[application/vnd.api+json].schema.properties.data[?(@property==='type' && @ === 'array')]" + then: + function: falsy + + post-relationships: + description: "If relationships exist in POST request, `data` is REQUIRED\r\n\r\n**Invalid + Example:**\r\n```YAML\r\nrelationships:\r\n type: object\r\n properties:\r\n + \ manufacturer:\r\n type: object\r\n properties:\r\n links:\r\n + \ type: object\r\n```\r\n\r\n**Valid Example:**\r\n```YAML\r\nrelationships:\r\n + \ type: object\r\n properties:\r\n manufacturer:\r\n type: object\r\n + \ properties:\r\n data:\r\n type: object\r\n links:\r\n + \ type: object\r\n```\r\n\r\nRelated specification information can be + found [here](https://jsonapi.org/format/1.0/#crud-creating)." + documentationUrl: "https://jsonapi.org/format/1.0/#crud-creating" + message: "If relationships exist in POST request, 'data' is REQUIRED" + severity: error + given: "#POSTRelationships" + then: + field: required + function: schema + functionOptions: + schema: + type: array + items: + type: string + anyOf: + - enum: + - data + - enum: + - data + - links + - meta + + 403-response-code: + description: "Servers **MUST** document and support response code **403** for + all paths\r\n\r\n**Invalid Example:**\r\n```YAML\r\npaths:\r\n /myResources:\r\n + \ get:\r\n responses:\r\n '200':\r\n $ref: '#/components/responses/MyResource_Collection'\r\n```\r\n\r\n**Valid + Example:**\r\n```YAML\r\npaths:\r\n /myResources:\r\n get:\r\n responses:\r\n + \ '200':\r\n $ref: '#/components/responses/MyResource_Collection'\r\n + \ '403':\r\n $ref: '#/components/responses/403Error'\r\n```" + message: "All paths must support response codes: 403" + severity: error + given: "$.paths..responses" + then: + field: "403" + function: truthy + + 201-response-location-header: + description: "A POST 201 response **SHOULD** return a `Location` header identifying + the location of the newly created resource.\r\n\r\n**Valid Example:**\r\n```YAML\r\nheaders:\r\n + \ Location:\r\n schema:\r\n type: string\r\n format: uri\r\n example: + 'http://example.com/photos/550e8400-e29b-41d4-a716-446655440000'\r\ncontent:\r\n + \ application/vnd.api+json:\r\n schema:\r\n type: object\r\n```\r\n\r\nRelated + specification information can be found [here](https://jsonapi.org/format/1.0/#crud-creating-responses)." + documentationUrl: "https://jsonapi.org/format/1.0/#crud-creating-responses" + message: "A POST 201 response SHOULD return a Location header" + severity: info + given: "$.paths[*][post].responses.201.headers" + then: + field: Location + function: defined + + post-201-response: + description: "A POST 201 response **MUST** return the primary resource\r\n\r\nRelated + specification information can be found [here](https://jsonapi.org/format/1.0/#crud-creating-responses)." + documentationUrl: "https://jsonapi.org/format/1.0/#crud-creating-responses" + message: "A POST 201 response MUST return the primary resource" + severity: info + given: "$.paths[*][post].responses.201.content[application/vnd.api+json].schema" + then: + field: required + function: schema + functionOptions: + schema: + type: array + items: + type: string + anyOf: + - enum: + - data + - enum: + - data + - meta + - jsonapi + - links + + post-2xx-response-codes: + description: "`POST` requests **MUST** support one Of the following 2xx codes: + 201, 202 or 204\r\n\r\n**Invalid Example:**\r\n```YAML\r\npaths:\r\n /myResources:\r\n + \ post:\r\n responses:\r\n '404':\r\n $ref: '#/components/responses/404Error'\r\n```\r\n\r\n**Valid + Examples:**\r\n```YAML\r\npaths:\r\n /myResources:\r\n post:\r\n responses:\r\n + \ '201':\r\n $ref: '#/components/responses/MyResource_Single'\r\n + \ '404':\r\n $ref: '#/components/responses/404Error'\r\n\r\npaths:\r\n + \ /myResources:\r\n post:\r\n responses:\r\n '202':\r\n description: + Accepted.\r\n '404':\r\n $ref: '#/components/responses/404Error'\r\n\r\npaths:\r\n + \ /myResources:\r\n post:\r\n responses:\r\n '204':\r\n description: + Successful Operation. No Content.\r\n '404':\r\n $ref: '#/components/responses/404Error' + \ \r\n```\r\n\r\nRelated specification information can be found [here](https://jsonapi.org/format/1.0/#crud-creating-responses)." + documentationUrl: "https://jsonapi.org/format/1.0/#crud-creating-responses" + message: "POST requests MUST support one Of the following 2xx codes: 201, 202 or 204" + severity: error + given: "$.paths[*][post].responses" + then: + function: schema + functionOptions: + dialect: "draft2020-12" + schema: + type: object + anyOf: + - required: ["201"] + - required: ["202"] + - required: ["204"] + + post-409-response-code: + description: "`POST` requests **MUST** document and support response code 409\r\n\r\n**Invalid + Example:**\r\n```YAML\r\npaths:\r\n /myResources:\r\n post:\r\n responses:\r\n + \ '201':\r\n $ref: '#/components/responses/MyResource_Single'\r\n```\r\n\r\n**Valid + Examples:**\r\n```YAML\r\npaths:\r\n /myResources:\r\n post:\r\n responses:\r\n + \ '201':\r\n $ref: '#/components/responses/MyResource_Single'\r\n + \ '409':\r\n $ref: '#/components/responses/409Error'\r\n```\r\n\r\nRelated + specification information can be found [here](https://jsonapi.org/format/1.0/#crud-creating-responses)." + documentationUrl: "https://jsonapi.org/format/1.0/#crud-creating-responses" + message: "POST paths must support response codes: 409" + severity: error + given: "$.paths[*][post].responses" + then: + field: "409" + function: truthy + + post-409-response: + description: "POST 409 response **SHOULD** return `source` property to identify + conflict\r\n\r\n**Example:**\r\n```YAML\r\n# Example showing use of source in + error object.\r\n\r\ntype: array\r\nitems:\r\n type: object\r\n properties:\r\n + \ id:\r\n type: string\r\n status:\r\n type: string\r\n + \ enum:\r\n - 409\r\n title:\r\n type: string\r\n + \ enum:\r\n - Conflict\r\n source:\r\n type: object\r\n + \ properties:\r\n pointer:\r\n oneOf:\r\n - + type: string\r\n format: json-pointer\r\n example: + /data/attributes/id\r\n - type: array\r\n items:\r\n + \ type: string\r\n format: json-pointer\r\nmaxItems:1\r\n```\r\n\r\nRelated + specification information can be found [here](https://jsonapi.org/format/1.0/#crud-creating-responses)." + documentationUrl: "https://jsonapi.org/format/1.0/#crud-creating-responses" + message: "POST 409 response SHOULD return 'source' property to identify conflict" + severity: info + given: "$.paths[*][post].responses" + then: + field: "409" + function: falsy + +# --------------------------------------------------------------------------- +# Section 7.2 Updating Resources +# --------------------------------------------------------------------------- + +# TODO:// support x-http-method-override: PATCH + + put-disallowed: + description: "`PUT` verb is not allowed in jsonapi, use `PATCH` instead.\r\n\r\n**Invalid + Example:**\r\n```YAML\r\n/myResources/{id}:\r\n put:\r\n```\r\n\r\n**Valid + Example:**\r\n```YAML\r\n/myResources/{id}:\r\n patch:\r\n```\r\n\r\nRelated + specification information can be found [here](https://jsonapi.org/format/1.0/#crud-updating)." + documentationUrl: "https://jsonapi.org/format/1.0/#crud-updating" + message: "PUT verb is not allowed in jsonapi, use PATCH instead." + severity: error + given: "$.paths[*][put]" + then: + - function: falsy + + patch-requests-single-object: + description: "PATCH requests **MUST** only contain a single resource object\r\n\r\n**Invalid + Example:**\r\n```YAML\r\ncontent:\r\n application/vnd.api+json:\r\n schema:\r\n + \ type: object\r\n required:\r\n - data\r\n properties:\r\n + \ data:\r\n type: array\r\n items: \r\n $ref: + '#/components/schemas/MyResourcePostObject'\r\n```\r\n\r\n**Valid Example:**\r\n```YAML\r\ncontent:\r\n + \ application/vnd.api+json:\r\n schema:\r\n type: object\r\n required:\r\n + \ - data\r\n properties:\r\n data:\r\n $ref: '#/components/schemas/MyResourcePostObject'\r\n```\r\n\r\nRelated + specification information can be found [here](https://jsonapi.org/format/1.0/#crud-updating)." + documentationUrl: "https://jsonapi.org/format/1.0/#crud-creating" + message: "PATCH requests MAY only contain a single resource object" + severity: error + given: "$.paths..patch.requestBody.content[application/vnd.api+json].schema.properties.data[?(@property==='type' && @ === 'array')]" + then: + function: falsy + + patch-relationships: + description: "If relationships exist in PATCH request, `data` is REQUIRED\r\n\r\n**Invalid + Example:**\r\n```YAML\r\nrelationships:\r\n type: object\r\n properties:\r\n + \ manufacturer:\r\n type: object\r\n properties:\r\n links:\r\n + \ type: object\r\n```\r\n\r\n**Valid Example:**\r\n```YAML\r\nrelationships:\r\n + \ type: object\r\n properties:\r\n manufacturer:\r\n type: object\r\n + \ properties:\r\n data:\r\n type: object\r\n links:\r\n + \ type: object\r\n```\r\n\r\nRelated specification information can be + found [here](https://jsonapi.org/format/1.0/#crud-updating-resource-relationships)." + documentationUrl: "https://jsonapi.org/format/1.0/#crud-creating" + message: "If relationships exist in PAST request, 'data' is REQUIRED" + severity: error + given: "#PATCHRelationships" + then: + field: required + function: schema + functionOptions: + schema: + type: array + items: + type: string + anyOf: + - enum: + - data + - enum: + - data + - links + - meta + + patch-2xx-response-codes: + description: "`PATCH` requests **MUST** support at least one of the following + 2xx codes: 200, 202 or 204\r\n\r\n**Invalid Example:**\r\n```YAML\r\npaths:\r\n + \ /myResources/{id}:\r\n patch:\r\n responses:\r\n '404':\r\n + \ $ref: '#/components/responses/404Error'\r\n```\r\n\r\n**Valid Examples:**\r\n```YAML\r\npaths:\r\n + \ /myResources/{id}:\r\n patch:\r\n responses:\r\n '200':\r\n + \ $ref: '#/components/responses/MyResource_Single'\r\n '404':\r\n + \ $ref: '#/components/responses/404Error'\r\n\r\npaths:\r\n /myResources/{id}:\r\n + \ patch:\r\n responses:\r\n '202':\r\n description: Accepted.\r\n + \ '404':\r\n $ref: '#/components/responses/404Error'\r\n\r\npaths:\r\n + \ /myResources/{id}:\r\n patch:\r\n responses:\r\n '204':\r\n + \ description: Successful Operation. No Content.\r\n '404':\r\n + \ $ref: '#/components/responses/404Error' \r\n```\r\n\r\nRelated specification + information can be found [here](https://jsonapi.org/format/1.0/#crud-updating-responses)." + documentationUrl: "https://jsonapi.org/format/1.0/#crud-updating-responses" + message: "POST requests MUST support at least one of the following 2xx codes: 200, 202 or 204" + severity: error + given: "$.paths[*][patch].responses" + then: + function: schema + functionOptions: + dialect: "draft2020-12" + schema: + type: object + anyOf: + - required: ["200"] + - required: ["202"] + - required: ["204"] + + patch-404-response-code: + description: "`PATCH` requests **MUST** support response code 404\r\n\r\n**Invalid + Example:**\r\n```YAML\r\npaths:\r\n /myResources/{id}:\r\n patch:\r\n responses:\r\n + \ '200':\r\n $ref: '#/components/responses/MyResource_Single'\r\n```\r\n\r\n**Valid + Examples:**\r\n```YAML\r\npaths:\r\n /myResources/{id}:\r\n patch:\r\n responses:\r\n + \ '200':\r\n $ref: '#/components/responses/MyResource_Single'\r\n + \ '404':\r\n $ref: '#/components/responses/404Error'\r\n```\r\n\r\nRelated + specification information can be found [here](https://jsonapi.org/format/1.0/#crud-updating-responses)." + documentationUrl: "https://jsonapi.org/format/1.0/#crud-updating-responses" + message: "PATCH requests MUST support response code 404" + severity: error + given: "$.paths[*][patch].responses" + then: + field: "404" + function: truthy + + patch-409-response-code: + description: "`PATCH` requests **MUST** document and support response code 409\r\n\r\n**Invalid + Example:**\r\n```YAML\r\npaths:\r\n /myResources/{id}:\r\n patch:\r\n responses:\r\n + \ '200':\r\n $ref: '#/components/responses/MyResource_Single'\r\n```\r\n\r\n**Valid + Examples:**\r\n```YAML\r\npaths:\r\n /myResources/{id}:\r\n patch:\r\n responses:\r\n + \ '200':\r\n $ref: '#/components/responses/MyResource_Single'\r\n + \ '409':\r\n $ref: '#/components/responses/409Error'\r\n```\r\n\r\nRelated + specification information can be found [here](https://jsonapi.org/format/1.0/#crud-updating-responses)." + documentationUrl: "https://jsonapi.org/format/1.0/#crud-updating-responses" + message: "PATCH requests MUST support response codes: 409" + severity: error + given: "$.paths[*][patch].responses" + then: + field: "409" + function: truthy + + patch-409-response: + description: "PATCH 409 response **SHOULD** return `source` property to identify + conflict\r\n\r\n**Example:**\r\n```YAML\r\n# Example showing use of source in + error object.\r\n# Examples describe a conflict between the {id} parameter and + the id field in the request body.\r\n\r\ntype: array\r\nitems:\r\n type: + object\r\n properties:\r\n id:\r\n type: string\r\n status:\r\n + \ type: string\r\n enum:\r\n - 409\r\n title:\r\n + \ type: string\r\n enum:\r\n - Conflict\r\n source:\r\n + \ type: object\r\n properties:\r\n pointer:\r\n oneOf:\r\n + \ - type: string\r\n format: json-pointer\r\n example: + /data/attributes/id\r\n - type: array\r\n items:\r\n + \ type: string\r\n format: json-pointer\r\n + \ parameter:\r\n type: string\r\n example: id\r\nmaxItems:1\r\n```\r\n\r\nRelated + specification information can be found [here](https://jsonapi.org/format/1.0/#crud-updating-responses)." + documentationUrl: "https://jsonapi.org/format/1.0/#crud-updating-responses" + message: "PATCH 409 response SHOULD return 'source' property to identify conflict" + severity: info + given: "$.paths[*][patch].responses" + then: + field: "409" + function: falsy + +# --------------------------------------------------------------------------- +# Section 7.3 Updating Relationships +# --------------------------------------------------------------------------- + +# TODO:// Revisit if/when updating relationships becomes needed + +# --------------------------------------------------------------------------- +# Section 7.4 Deleting Resources +# --------------------------------------------------------------------------- + + delete-2xx-response-codes: + description: "`DELETE` requests **MUST** support at least one of the following + 2xx codes: 200, 202, or 204\r\n\r\n**Invalid Example:**\r\n```YAML\r\npaths:\r\n + \ /myResources/{id}:\r\n delete:\r\n responses:\r\n '404':\r\n + \ $ref: '#/components/responses/404Error'\r\n```\r\n\r\n**Valid Examples:**\r\n```YAML\r\npaths:\r\n + \ /myResources/{id}:\r\n delete:\r\n responses:\r\n '200':\r\n + \ $ref: '#/components/responses/delete_meta_data'\r\n '404':\r\n + \ $ref: '#/components/responses/404Error'\r\n\r\npaths:\r\n /myResources/{id}:\r\n + \ delete:\r\n responses:\r\n '202':\r\n description: + Accepted.\r\n '404':\r\n $ref: '#/components/responses/404Error'\r\n\r\npaths:\r\n + \ /myResources/{id}:\r\n delete:\r\n responses:\r\n '204':\r\n + \ description: Successful Operation. No Content.\r\n '404':\r\n + \ $ref: '#/components/responses/404Error' \r\n```\r\n\r\nRelated specification + information can be found [here](https://jsonapi.org/format/1.0/#crud-deleting-responses)." + documentationUrl: "https://jsonapi.org/format/1.0/#crud-deleting-responses" + message: "DELETE requests MUST support at least one of the following 2xx codes: 200, 202 or 204" + severity: error + given: "$.paths[*][delete].responses" + then: + function: schema + functionOptions: + dialect: "draft2020-12" + schema: + type: object + anyOf: + - required: ["200"] + - required: ["202"] + - required: ["204"] + + delete-404-response-code: + description: "`DELETE` requests **MUST** support response code 404\r\n\r\n**Invalid + Example:**\r\n```YAML\r\npaths:\r\n /myResources/{id}:\r\n delete:\r\n responses:\r\n + \ '204':\r\n description: Successful Operation. No Content.\r\n```\r\n\r\n**Valid + Examples:**\r\n```YAML\r\npaths:\r\n /myResources/{id}:\r\n delete:\r\n + \ responses:\r\n '204':\r\n description: Successful Operation. + No Content.\r\n '404':\r\n $ref: '#/components/responses/404Error'\r\n```\r\n\r\nRelated + specification information can be found [here](https://jsonapi.org/format/1.0/#crud-deleting-responses)." + documentationUrl: "https://jsonapi.org/format/1.0/#crud-deleting-responses" + message: "DELETE requests MUST support response code 404" + severity: error + given: "$.paths[*][delete].responses" + then: + field: "404" + function: truthy + +# --------------------------------------------------------------------------- +# Section 9 Errors +# Section 9.1 Errors - Processing Errors +# --------------------------------------------------------------------------- + + error-processing: + description: "When returning multiple errors choose the most generally available + response code '400' or '500'. Other error response codes **MUST** return only + a single error.\r\n\r\n**Valid Example:** 400 Multiple errors\r\n```YAML\r\n400Error:\r\n + \ description: 'Bad Request'\r\n content:\r\n application/vnd.api+json:\r\n + \ schema:\r\n type: object\r\n required:\r\n - errors\r\n + \ properties:\r\n errors:\r\n type: array\r\n items:\r\n + \ $ref: '#/components/schemas/BaseErrorObject'\r\n description: + 'Bad Request'\r\n```\r\n\r\n**Valid Example:** 401 error - `maxItems: 1`\r\n```YAML\r\n401Error:\r\n + \ description: 'Unauthorized: Invalid or Expired Authentication'\r\n headers:\r\n + \ WWWAuthenticate:\r\n $ref: '#/components/headers/WWWAuthenticate'\r\n + \ content:\r\n application/vnd.api+json:\r\n schema:\r\n type: + object\r\n required:\r\n - errors\r\n properties:\r\n + \ errors:\r\n type: array\r\n items:\r\n allOf:\r\n + \ - $ref: '#/components/schemas/BaseErrorObject'\r\n - + type: object\r\n description: 'Unauthorized: Invalid or Expired + Authentication'\r\n properties:\r\n status:\r\n + \ enum: \r\n - \"401\"\r\n title:\r\n + \ enum:\r\n - \"Unauthorized\"\r\n + \ maxItems: 1\r\n```\r\n\r\nRelated specification information can + be found [here](https://jsonapi.org/format/1.0/#errors-processing)." + documentationUrl: "https://jsonapi.org/format/1.0/#errors-processing" + message: "Error Codes != 400 and != 500 MUST set maxItems to 1" + severity: error + given: "#SingleErrorResponses" + then: + - field: maxItems + function: truthy + - field: maxItems + function: enumeration + functionOptions: + values: + - 1 + +# --------------------------------------------------------------------------- +# Section 9.2 Errors - Error Object +# --------------------------------------------------------------------------- + + error-object-schema: + description: "error objects **MUST** follow schema\r\n\r\n**Schema Rules:**\r\n- + **MAY** contain the following fields: `id`,`links`,`status`,`code`,`title`,`detail`,`source`,`meta`\r\n- + `id`,`status`,`code`,`title`,`detail` **MUST** be an `object`\r\n- `links`,`source`,`meta` + **MUST** be an `object`\r\n\r\n**Valid Example:** Using all fields\r\n```YAML\r\ntype: + object\r\ndescription: JSON:API Error Object\r\nproperties:\r\n id:\r\n type: + string\r\n description: a unique identifier for this particular occurrence + of the problem\r\n links:\r\n type: object\r\n description: links that + lead to further detail about the particular occurrence of the problem\r\n properties:\r\n + \ about:\r\n $ref: '#/components/schemas/Link'\r\n status:\r\n type: + string\r\n description: the HTTP status code applicable to this problem\r\n + \ code:\r\n type: string\r\n description: an application-specific error + code\r\n title:\r\n type: string\r\n description: a human-readable summary + specific of the problem. Usually the http status friendly name.\r\n detail:\r\n + \ type: string\r\n description: a human-readable explanation specific + to this occurrence of the problem\r\n source:\r\n type: object\r\n description: + an object containing references to the source of the error\r\n properties:\r\n + \ pointer:\r\n description: a JSON Pointer [RFC6901] to the associated + entity in the request document\r\n oneOf:\r\n - type: string\r\n + \ format: json-pointer\r\n - type: array\r\n items:\r\n + \ type: string\r\n format: json-pointer\r\n parameter:\r\n + \ description: a string indicating which URI query parameter caused the + error\r\n type: string\r\n meta:\r\n type: object\r\n```\r\n\r\nRelated + specification information can be found [here](https://jsonapi.org/format/1.0/#error-objects)." + documentationUrl: "https://jsonapi.org/format/1.0/#error-objects" + message: "Error objects (item object) MUST follow schema" + severity: error + given: "#ErrorObjects" + then: + - field: "@key" + function: enumeration + functionOptions: + values: + - id + - links + - status + - code + - title + - detail + - source + - meta + - field: "links.type" + function: enumeration + functionOptions: + values: + - object + - field: "source.type" + function: enumeration + functionOptions: + values: + - object + - field: "meta.type" + function: enumeration + functionOptions: + values: + - object + - field: "status.type" + function: enumeration + functionOptions: + values: + - string + - field: "code.type" + function: enumeration + functionOptions: + values: + - string + - field: "title.type" + function: enumeration + functionOptions: + values: + - string + - field: "detail.type" + function: enumeration + functionOptions: + values: + - string + + error-object-links: + description: "error object `links` property **MUST** contain an `about` link.\r\n\r\n**Invalid + Example:**\r\n```YAML\r\n# Error Object\r\n# ...\r\nlinks:\r\n type: object\r\n + \ description: links that lead to further detail about the particular occurrence + of the problem\r\n properties:\r\n self:\r\n $ref: '#/components/schemas/Link'\r\n```\r\n\r\n**Valid + Example:**\r\n```YAML\r\n# Error Object\r\n# ...\r\nlinks:\r\n type: object\r\n + \ description: links that lead to further detail about the particular occurrence + of the problem\r\n properties:\r\n about:\r\n $ref: '#/components/schemas/Link'\r\n```\r\n\r\nRelated + specification information can be found [here](https://jsonapi.org/format/1.0/#error-objects)." + documentationUrl: "https://jsonapi.org/format/1.0/#error-objects" + message: "Error object links property MUST contain 'about'" + severity: error + given: "#ErrorObjects.links.properties" + then: + - field: "about" + function: truthy + + error-object-source-schema: + description: "error object `source` **MUST** follow schema\r\n\r\n**Schema Rules:**\r\n- + `source` **MUST** be an `object`\r\n- **MUST** contain at least one of: `pointer` + or `parameter`\r\n- `parameter` **MUST** be a `string`\r\n- `pointer` **MUST** + be a single json-pointer[[RFC6901]](https://tools.ietf.org/html/rfc6901) string + or array of json-pointer strings\r\n\r\n**Valid Example:**\r\n```YAML\r\ntype: + object\r\ndescription: an object containing references to the source of the + error\r\nproperties:\r\n pointer:\r\n description: a JSON Pointer [RFC6901] + to the associated entity in the request document\r\n oneOf:\r\n - type: + string\r\n format: json-pointer\r\n - type: array\r\n items:\r\n + \ type: string\r\n format: json-pointer\r\n parameter:\r\n + \ description: a string indicating which URI query parameter caused the error\r\n + \ type: string\r\n```\r\n\r\nRelated specification information can be found + [here](https://jsonapi.org/format/1.0/#error-objects)." + documentationUrl: "https://jsonapi.org/format/1.0/#error-objects" + message: "Error object source MUST follow schema" + severity: error + given: "#ErrorObjects.source" + then: + field: "properties" + function: schema + functionOptions: + dialect: "draft2020-12" + schema: + type: object + properties: + parameter: + type: object + properties: + type: + type: string + enum: ["string"] + pointer: + type: object + properties: + "oneOf": + type: array + items: + oneOf: + - type: object + required: [type,format] + properties: + type: + type: string + enum: ["string"] + format: + type: string + enum: ["json-pointer"] + - type: object + properties: + type: + type: string + enum: ["array"] + items: + type: object + required: [type,format] + properties: + type: + type: string + enum: ["string"] + format: + type: string + enum: ["json-pointer"] \ No newline at end of file diff --git a/.github/workflows/openapi-lint.yml b/.github/workflows/openapi-lint.yml new file mode 100644 index 000000000..ee6db38ba --- /dev/null +++ b/.github/workflows/openapi-lint.yml @@ -0,0 +1,43 @@ +name: OpenAPI Lint + +on: + push: + branches: + - master + - dev + pull_request: + branches: + - master + - dev + +permissions: + contents: read + +jobs: + openapi-lint: + runs-on: ubuntu-latest + steps: + - name: Checkout repository + uses: actions/checkout@v6 + - name: Start Hashtopolis server + uses: ./.github/actions/start-hashtopolis + with: + db_system: mysql + - name: Setup Node.js + uses: actions/setup-node@v4 + with: + node-version: '20' + - name: Cache npm downloads + uses: actions/cache@v4 + with: + path: ~/.npm + key: ${{ runner.os }}-npm-openapi-spectral6.15.1-redocly2.24.0 + - name: Install OpenAPI tooling + run: npm install -g @stoplight/spectral-cli@6.15.1 @redocly/cli@2.24.0 + - name: Download OpenAPI schema + run: wget -q http://localhost:8080/api/v2/openapi.json -O openapi.json + - name: Lint OpenAPI schema with Redocly + continue-on-error: true + run: redocly lint openapi.json + - name: Lint OpenAPI schema with Spectral + run: spectral lint openapi.json --ruleset .github/openapi/spectral-jsonapi.yml -D diff --git a/redocly.yaml b/redocly.yaml new file mode 100644 index 000000000..c2373f577 --- /dev/null +++ b/redocly.yaml @@ -0,0 +1,2 @@ +extends: + - recommended diff --git a/src/inc/apiv2/common/AbstractBaseAPI.php b/src/inc/apiv2/common/AbstractBaseAPI.php index 49671e6ca..ad512b51d 100644 --- a/src/inc/apiv2/common/AbstractBaseAPI.php +++ b/src/inc/apiv2/common/AbstractBaseAPI.php @@ -187,6 +187,18 @@ protected function getUpdateHandlers($id, $current_user): array { public function aggregateData(object $object, array &$includedData = [], ?array $aggregateFieldsets = null): array { return []; } + + /** + * Return supported aggregate fieldsets/options for this endpoint. + * + * Format: + * [ + * 'resourceKey' => ['option1', 'option2'] + * ] + */ + public function getAggregateFieldsets(): array { + return []; + } /** * Take all the dba features and converts them to a list. diff --git a/src/inc/apiv2/common/OpenAPISchemaUtils.php b/src/inc/apiv2/common/OpenAPISchemaUtils.php index ae6ac950e..322a7e774 100644 --- a/src/inc/apiv2/common/OpenAPISchemaUtils.php +++ b/src/inc/apiv2/common/OpenAPISchemaUtils.php @@ -126,16 +126,13 @@ static function makeLinks($uri): array { } //TODO relationship array is unnecessarily indexed in the swagger UI - static function makeRelationships($class, $uri): array { + static function makeRelationships($relationshipsNames, $uri): array { $properties = []; - $relationshipsNames = array_merge(array_keys($class->getToOneRelationships()), array_keys($class->getToManyRelationships())); sort($relationshipsNames); foreach ($relationshipsNames as $relationshipName) { $self = $uri . "/relationships/" . $relationshipName; $related = $uri . "/" . $relationshipName; - $properties[] = [ - "properties" => [ - $relationshipName => [ + $properties[$relationshipName] = [ "type" => "object", "properties" => [ "links" => [ @@ -152,9 +149,6 @@ static function makeRelationships($class, $uri): array { ] ] ] - ] - - ] ]; } return $properties; @@ -166,19 +160,18 @@ static function getTUSHeader(): array { Must always be set to `1.0.0` in compliant servers.", "schema" => [ "type" => "string", - "enum" => "enum: ['1.0.0']" + "enum" => ['1.0.0'] ] ]; } //TODO expandables array is unnecessarily indexed in the swagger UI - static function makeExpandables($class, $container): array { + static function makeExpandables($expandables, $container): array { $properties = []; - $expandables = array_merge($class->getToOneRelationships(), $class->getToManyRelationships()); foreach ($expandables as $expand => $expandVal) { $expandClass = $expandVal["relationType"]; $expandApiClass = new ($container->get('classMapper')->get($expandClass))($container); - $properties[] = [ + $properties[$expand] = [ "properties" => [ "id" => [ "type" => "integer" @@ -197,20 +190,44 @@ static function makeExpandables($class, $container): array { return $properties; } - static function mapToProperties($map): array { - $properties = array_map(function ($value) { - return [ - "type" => "string", - "default" => $value, - ]; - }, $map); - return [ - "type" => "array", - "items" => [ - "type" => "object", - "properties" => $properties - ] - ]; + static function mapToProperties(mixed $value): array { + if (is_null($value)) { + return ["nullable" => true, "type" => "string"]; + } elseif (is_bool($value)) { + return ["type" => "boolean", "example" => $value]; + } elseif (is_int($value)) { + return ["type" => "integer", "example" => $value]; + } elseif (is_float($value)) { + return ["type" => "number", "example" => $value]; + } elseif (is_string($value)) { + return ["type" => "string", "example" => $value]; + } elseif (is_array($value)) { + if (empty($value)) { + return ["type" => "array"]; + } + if (array_is_list($value)) { + /* Merge properties from all items to capture the most complete schema */ + $mergedProperties = []; + foreach ($value as $item) { + $itemSchema = self::mapToProperties($item); + if (isset($itemSchema['properties'])) { + $mergedProperties = array_merge($mergedProperties, $itemSchema['properties']); + } + } + $itemSchema = self::mapToProperties($value[0]); + if (!empty($mergedProperties)) { + $itemSchema['properties'] = $mergedProperties; + } + return ["type" => "array", "items" => $itemSchema]; + } else { + $properties = []; + foreach ($value as $key => $val) { + $properties[$key] = self::mapToProperties($val); + } + return ["type" => "object", "properties" => $properties]; + } + } + return ["type" => "string"]; } /** diff --git a/src/inc/apiv2/common/openAPISchema.routes.php b/src/inc/apiv2/common/openAPISchema.routes.php index 0ad869c81..dc38f880f 100644 --- a/src/inc/apiv2/common/openAPISchema.routes.php +++ b/src/inc/apiv2/common/openAPISchema.routes.php @@ -120,7 +120,9 @@ $apiClassName = $explodedCallable[0]; $apiMethod = $explodedCallable[1]; $class = new $apiClassName($app->getContainer()); + + $path = preg_replace('/\{([^:}]+):(.+)\}/', '{$1}', $path); if (!($class instanceof AbstractModelAPI)) { $name_parts = explode('\\', $class::class); $name = end($name_parts); @@ -129,12 +131,15 @@ $paths[$path][$method]["description"] = OpenAPISchemaUtils::parsePhpDoc($reflectionApiMethod->getDocComment()); $parameters = $class->getCreateValidFeatures(); $properties = OpenAPISchemaUtils::makeProperties($parameters); - $components[$name] = - [ - "type" => "object", - "properties" => $properties, - ]; - if ($method == "post") { + $amountProperties = count($properties); + if ($amountProperties > 0) { + $components[$name] = + [ + "type" => "object", + "properties" => $properties, + ]; + } + if ($method == "post" && $amountProperties > 0) { $reflectionMethodFormFields = new ReflectionMethod($class::class, "getFormFields"); $bodyDescription = OpenAPISchemaUtils::parsePhpDoc($reflectionMethodFormFields->getDocComment()); $paths[$path][$method]["requestBody"] = [ @@ -162,10 +167,6 @@ else if (is_string($request_response)) { $ref = "#/components/schemas/" . $request_response . "SingleResponse"; } - else if ($name == "ImportFileHelperAPI") { - //ImportFileHelperAPI is hardcoded, because its different than other helpers. - continue; - } if (isset($ref)) { $paths[$path][$method]["responses"]["200"] = [ "description" => "successful operation", @@ -187,7 +188,7 @@ }; /* Quick to find out if single parameter object is used */ - $singleObject = ((strstr($path, '/{id:')) !== false); + $singleObject = ((strstr($path, '/{id}')) !== false); $name_parts = explode('\\', $class->getDBAClass()); $name = end($name_parts); $uri = $class->getBaseUri(); @@ -199,6 +200,11 @@ $isToOne = array_key_exists($relation, $class::getToOneRelationships()); assert(!($isToMany && $isToOne), "An relationship cant be a to one and to many at the same time."); } else { + $availableMethods = $class->getAvailableMethods(); + $method_to_check = strtoupper($method); + if ($method_to_check != "GET" && !in_array($method_to_check, $availableMethods)) { + continue; + } $isToMany = $isToOne = false; $relation = null; } @@ -230,42 +236,54 @@ ] ]; - $relationships = ["relationships" => [ - "type" => "object", - "properties" => OpenAPISchemaUtils::makeRelationships($class, $uri) - ] - ]; - $included = ["included" => [ - "type" => "array", - "items" => [ + $relationshipsNames = array_merge(array_keys($class->getToOneRelationships()), array_keys($class->getToManyRelationships())); + $relationships = []; + if (count($relationshipsNames) > 0) { + $relationships = ["relationships" => [ "type" => "object", - "properties" => OpenAPISchemaUtils::makeExpandables($class, $app->getContainer()) - ], - ] + "properties" => OpenAPISchemaUtils::makeRelationships($relationshipsNames, $uri) + ] + ]; + } + $expandables_array = array_merge($class->getToOneRelationships(), $class->getToManyRelationships()); + $included = []; + if (count($expandables_array) > 0) { + $included = ["included" => [ + "type" => "array", + "items" => [ + "type" => "object", + "properties" => OpenAPISchemaUtils::makeExpandables($expandables_array, $app->getContainer()) + ], + ] ]; + } $properties_get_single = array_merge($properties_return_post_patch, $relationships, $included); $json_api_header = OpenAPISchemaUtils::makeJsonApiHeader(); $links = OpenAPISchemaUtils::makeLinks($uri); $properties_return_post_patch = array_merge($json_api_header, $properties_return_post_patch); - $properties_create = OpenAPISchemaUtils::buildPatchPost(OpenAPISchemaUtils::makeProperties($class->getAllPostParameters($class->getCreateValidFeatures())), $name); + $postProperties = OpenAPISchemaUtils::makeProperties($class->getAllPostParameters($class->getCreateValidFeatures())); $properties_get = array_merge($json_api_header, $links, $properties_get_single, $included); - $properties_patch = OpenAPISchemaUtils::buildPatchPost(OpenAPISchemaUtils::makeProperties($class->getPatchValidFeatures(), true), $name); - $properties_patch_post_relation = OpenAPISchemaUtils::buildPostPatchRelation($relation, ($isToMany && !$isToOne)); - $responseGetRelation = $properties_patch_post_relation; + $patch_properties = OpenAPISchemaUtils::makeProperties($class->getPatchValidFeatures()); - $components[$name . "Create"] = - [ - "type" => "object", - "properties" => $properties_create, - ]; + if (count($postProperties) > 0) { + $properties_create = OpenAPISchemaUtils::buildPatchPost(OpenAPISchemaUtils::makeProperties($class->getAllPostParameters($class->getCreateValidFeatures())), $name); + $components[$name . "Create"] = + [ + "type" => "object", + "properties" => $properties_create, + ]; + } - $components[$name . "Patch"] = - [ - "type" => "object", - "properties" => $properties_patch, - ]; + if (count($patch_properties) > 0) { + $properties_patch = OpenAPISchemaUtils::buildPatchPost($patch_properties, $name); + $components[$name . "Patch"] = + [ + "type" => "object", + "properties" => $properties_patch, + ]; + } $components[$name . "Response"] = [ @@ -273,17 +291,20 @@ "properties" => $properties_get, ]; - $components[$name . "Relation" . ucfirst($relation)] = - [ - "type" => "object", - "properties" => $properties_patch_post_relation, - ]; - - $components[$name . "Relation" . ucfirst($relation) . "GetResponse"] = - [ - "type" => "object", - "properties" => $responseGetRelation - ]; + if ($relation) { + $properties_patch_post_relation = OpenAPISchemaUtils::buildPostPatchRelation($relation, ($isToMany && !$isToOne)); + $responseGetRelation = $properties_patch_post_relation; + $components[$name . "Relation" . ucfirst($relation)] = + [ + "type" => "object", + "properties" => $properties_patch_post_relation, + ]; + $components[$name . "Relation" . ucfirst($relation) . "GetResponse"] = + [ + "type" => "object", + "properties" => $responseGetRelation + ]; + } $components[$name . "SingleResponse"] = [ @@ -355,9 +376,7 @@ ], "security" => [ [ - "bearerAuth" => [ - $required_scopes - ] + "bearerAuth" => $required_scopes ] ] ]; @@ -481,26 +500,18 @@ } else { /* Empty JSON object required */ - $paths[$path][$method]["requestBody"] = [ - "required" => true, - "content" => [ - "application/json" => [], - ] - ]; + // $paths[$path][$method]["requestBody"] = [ + // "required" => false, + // "content" => [ + // "application/json" => [], + // ] + // ]; } } elseif ($method == 'post') { $paths[$path][$method]["responses"]["204"] = [ "description" => "successfully created", ]; - - /* Empty JSON object required */ - $paths[$path][$method]["requestBody"] = [ - "required" => true, - "content" => [ - "application/json" => [], - ] - ]; } else { throw new HttpErrorException("Method '$method' not implemented"); @@ -574,17 +585,21 @@ } elseif ($method == 'patch') { - // TODO add patch many here + $paths[$path][$method]["responses"]["204"] = [ + "description" => "successfully patched", + ]; } elseif ($method == 'delete') { - // TODO add delete many here + $paths[$path][$method]["responses"]["200"] = [ + "description" => "successfully deleted", + ]; } else { throw new HttpErrorException("Method '$method' not implemented"); } } - if ($singleObject && $method == 'get') { + if ($singleObject) { $parameters = [ [ "name" => "id", @@ -614,54 +629,89 @@ $parameters = [ [ "name" => "page[after]", - "in" => "path", + "in" => "query", "schema" => [ "type" => "integer", "format" => "int32" ], "example" => 0, + "required" => false, "description" => "Pointer to paginate to retrieve the data after the value provided" ], [ "name" => "page[before]", - "in" => "path", + "in" => "query", "schema" => [ "type" => "integer", "format" => "int32" ], "example" => 0, + "required" => false, "description" => "Pointer to paginate to retrieve the data before the value provided" ], [ "name" => "page[size]", - "in" => "path", + "in" => "query", "schema" => [ "type" => "integer", "format" => "int32" ], + "required" => false, "example" => 100, "description" => "Amout of data to retrieve inside a single page" ], [ "name" => "filter", - "in" => "path", - "style" => "deepobject", + "in" => "query", + "style" => "deepObject", "explode" => true, "schema" => [ - "type" => "object", + "type" => "string", ], "description" => "Filters results using a query", "example" => '"filter[hashlistId__gt]": 200' ], [ "name" => "include", - "in" => "path", + "in" => "query", "schema" => [ "type" => "string" ], + "required" => false, "description" => "Items to include, comma seperated. Possible options: " . $expandables ] ]; + + $aggregateFieldsets = $class->getAggregateFieldsets(); + if (!empty($aggregateFieldsets)) { + $aggregateExamples = []; + $aggregateDescriptionParts = []; + foreach ($aggregateFieldsets as $fieldset => $options) { + if (empty($options)) { + continue; + } + $aggregateExamples["aggregate[" . $fieldset . "]"] = implode(",", $options); + $aggregateDescriptionParts[] = $fieldset . ": " . implode(", ", $options); + } + + if (!empty($aggregateExamples)) { + $parameters[] = [ + "name" => "aggregate", + "in" => "query", + "style" => "deepObject", + "explode" => true, + "schema" => [ + "type" => "object", + "additionalProperties" => [ + "type" => "string" + ] + ], + "required" => false, + "description" => "Aggregated fields to include by type (comma separated values). Possible options: " . implode(" | ", $aggregateDescriptionParts), + "example" => $aggregateExamples + ]; + } + } } else { $parameters = []; @@ -782,7 +832,7 @@ [ "name" => "Upload-Metadata", "in" => "header", - "required" => "true", + "required" => true, "schema" => [ "type" => "string", "pattern" => '^([a-zA-Z0-9]+ [A-Za-z0-9+/=]+)(,[a-zA-Z0-9]+ [A-Za-z0-9+/=]+)*$' @@ -816,43 +866,72 @@ ] ]; - $paths["/api/v2/helper/importFile/{id:[0-9]{14}-[0-9a-f]{32}}"]["patch"]["parameters"] = [ + $paths["/api/v2/helper/importFile/{id}"]["head"]["parameters"] = [ + [ + "name" => "id", + "in" => "path", + "required" => true, + "schema" => [ + "type"=> "string", + "pattern"=> "^[0-9]{14}-[0-9a-f]{32}$" + ] + ] + ]; + $paths["/api/v2/helper/importFile/{id}"]["delete"]["parameters"] = [ + [ + "name" => "id", + "in" => "path", + "required" => true, + "schema" => [ + "type"=> "string", + "pattern"=> "^[0-9]{14}-[0-9a-f]{32}$" + ] + ] + ]; + $paths["/api/v2/helper/importFile/{id}"]["patch"]["parameters"] = [ [ "name" => "Upload-Offset", "in" => "header", - "required" => "true", + "required" => true, "schema" => [ "type" => "integer", ], - "example" => "512", + "example" => 512, "description" => " The Upload-Offset header’s value MUST be equal to the current offset of the resource" ], + [ + "name" => "id", + "in" => "path", + "required" => true, + "schema" => [ + "type"=> "string", + "pattern"=> "^[0-9]{14}-[0-9a-f]{32}$" + ] + ], [ "name" => "Content-Type", "in" => "header", - "required" => "true", + "required" => true, "schema" => [ "type" => "string", "enum" => ["application/offset+octet-stream"] ], ], ]; - $paths["/api/v2/helper/importFile/{id:[0-9]{14}-[0-9a-f]{32}}"]["patch"]["requestBody"] = [ - [ - "required" => "true", - "description" => "The binary data to push to the file", - "content" => [ - "application/offset+octet-stream" => [ - "schema" => [ - "type" => "string", - "format" => "binary" - ] + $paths["/api/v2/helper/importFile/{id}"]["patch"]["requestBody"] = [ + "required" => true, + "description" => "The binary data to push to the file", + "content" => [ + "application/offset+octet-stream" => [ + "schema" => [ + "type" => "string", + "format" => "binary" ] ] ] ]; - $paths["/api/v2/helper/importFile/{id:[0-9]{14}-[0-9a-f]{32}}"]["head"]["responses"]["200"] = [ + $paths["/api/v2/helper/importFile/{id}"]["head"]["responses"]["200"] = [ "description" => "successful request", "headers" => [ "Tus-Resumable" => OpenAPISchemaUtils::getTUSHeader(), @@ -882,6 +961,9 @@ ] ] ]; + $paths["/api/v2/helper/importFile/{id}"]["delete"]["responses"]["204"] = [ + "description" => "successful operation" + ]; $paths["/api/v2/helper/importFile"]["post"]["responses"]["201"] = [ "description" => "successful operation", @@ -896,12 +978,14 @@ ], "content" => [ "application/pdf" => [ - "type" => "string", - "format" => "binary" + "schema" => [ + "type" => "string", + "format" => "binary" + ] ] ] ]; - $paths["/api/v2/helper/importFile/{id:[0-9]{14}-[0-9a-f]{32}}"]["patch"]["responses"]["204"] = [ + $paths["/api/v2/helper/importFile/{id}"]["patch"]["responses"]["204"] = [ "description" => "Chunk accepted", "headers" => [ "Tus-Resumable" => OpenAPISchemaUtils::getTUSHeader(), diff --git a/src/inc/apiv2/helper/CurrentUserHelperAPI.php b/src/inc/apiv2/helper/CurrentUserHelperAPI.php index a51b2c6ff..6da458fe2 100644 --- a/src/inc/apiv2/helper/CurrentUserHelperAPI.php +++ b/src/inc/apiv2/helper/CurrentUserHelperAPI.php @@ -85,10 +85,7 @@ static public function register($app): void { $app->patch($baseUri, "Hashtopolis\\inc\\apiv2\\helper\\CurrentUserHelperAPI:actionPatch"); } - /** - * getCurrentUser is different because it returns via another function - */ public static function getResponse(): array|string|null { - return null; + return "User"; } } diff --git a/src/inc/apiv2/helper/GetAccessGroupsHelperAPI.php b/src/inc/apiv2/helper/GetAccessGroupsHelperAPI.php index 1a265adba..9d3231bc7 100644 --- a/src/inc/apiv2/helper/GetAccessGroupsHelperAPI.php +++ b/src/inc/apiv2/helper/GetAccessGroupsHelperAPI.php @@ -76,7 +76,7 @@ static public function register($app): void { /** * getAccessGroups is different because it returns via another function */ - public static function getResponse(): array|string|null { - return null; + public static function getResponse(): string { + return "AccessGroup"; } } diff --git a/src/inc/apiv2/helper/GetBestTasksAgent.php b/src/inc/apiv2/helper/GetBestTasksAgent.php index 35b343125..be9945d2a 100644 --- a/src/inc/apiv2/helper/GetBestTasksAgent.php +++ b/src/inc/apiv2/helper/GetBestTasksAgent.php @@ -25,8 +25,8 @@ public function getRequiredPermissions(string $method): array { return [Agent::PERM_READ, Task::PERM_READ]; } - public static function getResponse(): null { - return null; + public static function getResponse(): string { + return "Task"; } diff --git a/src/inc/apiv2/helper/GetCracksOfTaskHelper.php b/src/inc/apiv2/helper/GetCracksOfTaskHelper.php index fe97ddf5e..8245f1825 100644 --- a/src/inc/apiv2/helper/GetCracksOfTaskHelper.php +++ b/src/inc/apiv2/helper/GetCracksOfTaskHelper.php @@ -34,8 +34,8 @@ public function getRequiredPermissions(string $method): array { return [Hashlist::PERM_READ, Hash::PERM_READ, Task::PERM_READ]; } - public static function getResponse(): null { - return null; + public static function getResponse(): string { + return "Hash"; } diff --git a/src/inc/apiv2/helper/GetUserPermissionHelperAPI.php b/src/inc/apiv2/helper/GetUserPermissionHelperAPI.php index 7fc1b380f..e568114da 100644 --- a/src/inc/apiv2/helper/GetUserPermissionHelperAPI.php +++ b/src/inc/apiv2/helper/GetUserPermissionHelperAPI.php @@ -70,8 +70,8 @@ static public function register($app): void { /** * getAccessGroups is different because it returns via another function */ - public static function getResponse(): array|string|null { - return null; + public static function getResponse(): string { + return "RightGroup"; } } diff --git a/src/inc/apiv2/helper/ImportFileHelperAPI.php b/src/inc/apiv2/helper/ImportFileHelperAPI.php index 680c955a1..6651768ea 100644 --- a/src/inc/apiv2/helper/ImportFileHelperAPI.php +++ b/src/inc/apiv2/helper/ImportFileHelperAPI.php @@ -130,11 +130,8 @@ function processHead(Request $request, Response $response, array $args): Respons } } - /** - * getfile is different because it returns actual binary data. - */ - public static function getResponse(): null { - return null; + public static function getResponse(): array { + return ["file" => "abc.txt", "size" => 123]; } /** File import API @@ -423,7 +420,6 @@ function processGet(Request $request, Response $response, array $args): Response return self::getMetaResponse($importFiles, $request, $response); } - static public function register(App $app): void { $me = get_called_class(); $baseUri = $me::getBaseUri(); diff --git a/src/inc/apiv2/model/LogEntryAPI.php b/src/inc/apiv2/model/LogEntryAPI.php index b7a840c9e..479c263c9 100644 --- a/src/inc/apiv2/model/LogEntryAPI.php +++ b/src/inc/apiv2/model/LogEntryAPI.php @@ -29,4 +29,9 @@ protected function createObject(array $data): int { protected function deleteObject(object $object): void { throw new HttpError("Logentries cannot be deleted via API"); } + + public static function getAvailableMethods(): array { + return ['GET']; + } + } diff --git a/src/inc/apiv2/model/TaskAPI.php b/src/inc/apiv2/model/TaskAPI.php index b04671a92..f78b2a9e5 100644 --- a/src/inc/apiv2/model/TaskAPI.php +++ b/src/inc/apiv2/model/TaskAPI.php @@ -136,6 +136,18 @@ public function getFormFields(): array { "files" => ['type' => 'array', 'subtype' => 'int'], ]; } + + public function getAggregateFieldsets(): array { + return [ + 'task' => [ + 'assignedAgents', + 'dispatched', + 'searched', + 'isActive', + 'taskExtraDetails', + ] + ]; + } /** * @throws HttpError From afebd3b0c63790717aa6abe24dfaac9c7471984d Mon Sep 17 00:00:00 2001 From: Eric Wasson <229096365+Eric-Wasson@users.noreply.github.com> Date: Mon, 18 May 2026 11:33:36 +0200 Subject: [PATCH 515/691] Removed isChunkingAvilable references --- src/dba/models/CrackerBinaryType.php | 2 +- src/inc/apiv2/model/CrackerBinaryTypeAPI.php | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/dba/models/CrackerBinaryType.php b/src/dba/models/CrackerBinaryType.php index 2648eaefc..d21c3f071 100644 --- a/src/dba/models/CrackerBinaryType.php +++ b/src/dba/models/CrackerBinaryType.php @@ -28,7 +28,7 @@ static function getFeatures(): array { $dict = array(); $dict['crackerBinaryTypeId'] = ['read_only' => True, "type" => "int", "subtype" => "unset", "choices" => "unset", "null" => False, "pk" => True, "protected" => True, "private" => False, "alias" => "crackerBinaryTypeId", "public" => False, "dba_mapping" => False]; $dict['typeName'] = ['read_only' => False, "type" => "str(30)", "subtype" => "unset", "choices" => "unset", "null" => False, "pk" => False, "protected" => False, "private" => False, "alias" => "typeName", "public" => False, "dba_mapping" => False]; - $dict['isChunkingAvailable'] = ['read_only' => False, "type" => "bool", "subtype" => "unset", "choices" => "unset", "null" => False, "pk" => False, "protected" => False, "private" => False, "alias" => "isChunkingAvailable", "public" => False, "dba_mapping" => False]; + $dict['isChunkingAvailable'] = ['read_only' => False, "type" => "bool", "subtype" => "unset", "choices" => "unset", "null" => True, "pk" => False, "protected" => False, "private" => False, "alias" => "isChunkingAvailable", "public" => False, "dba_mapping" => False]; return $dict; } diff --git a/src/inc/apiv2/model/CrackerBinaryTypeAPI.php b/src/inc/apiv2/model/CrackerBinaryTypeAPI.php index 2ce086c99..bfcaa9afd 100644 --- a/src/inc/apiv2/model/CrackerBinaryTypeAPI.php +++ b/src/inc/apiv2/model/CrackerBinaryTypeAPI.php @@ -43,7 +43,7 @@ public static function getToManyRelationships(): array { function getAllPostParameters(array $features): array { //for documentation purposes isChunkingAvailable has to be removed - // because it is currently not settable by the user + // because it is currently not settable by the user and not fully supported yet $features = parent::getAllPostParameters($features); unset($features[CrackerBinaryType::IS_CHUNKING_AVAILABLE]); return $features; From 4b812f5dc7b954117ffbd7430d573c77b1961e8e Mon Sep 17 00:00:00 2001 From: Eric Wasson <229096365+Eric-Wasson@users.noreply.github.com> Date: Mon, 18 May 2026 13:21:55 +0200 Subject: [PATCH 516/691] Removed isChunkingAvailable from the docs --- doc/user_manual/crackers_binary.md | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/doc/user_manual/crackers_binary.md b/doc/user_manual/crackers_binary.md index 343ecd4a1..110256bd5 100644 --- a/doc/user_manual/crackers_binary.md +++ b/doc/user_manual/crackers_binary.md @@ -16,7 +16,7 @@ This page displays some basic information about all the crackers configured in h As mentioned above, Hashtopolis supports other crackers than Hashcat. To deploy a new cracker, two steps are required, first the creation of the type of cracker and then adding a version for it. -By clicking on the ``*New Cracker*'' button, a new page opens in which you can set the name for the new cracker and declare if the chunking is available for this cracker. In order to be compatible with chunking, a cracker must have the following features: +By clicking on the ``*New Cracker*'' button, a new page opens in which you can set the name for the new cracker. A cracker must have the following features in order to split the work into chunks: - **--keyspace**: calculate the size of the task to be distributed. - **--skip**: define the starting point from where the hashcat instance should start working on the keyspace. @@ -24,7 +24,8 @@ By clicking on the ``*New Cracker*'' button, a new page opens in which you can s In other words, the keyspace is the total amount of work related to a task. The combination of skip and limit will define a portion of the keyspace, also called chunk, on wich an agent will be working. That is the main features required to distribute a task among the several agents. -If chunking is not available for a cracker, then a task cannot be split and it must be run by a single agent. WHen selecting such type of cracker during the task creation, the ["small task"](./tasks.md#advanced-parameters) flag will be enabled by default. + > [!CAUTION] > Creating a new type of cracker is not a simple plug-and-play process with Hashtopolis. In addition to defining the new cracker type, you must also modify the agent itself. Specifically, this involves writing a dedicated Python handler file for your cracker. From cc3d1dda77a50b1b2e52a23723beb1f65ac65dad Mon Sep 17 00:00:00 2001 From: andreas Date: Mon, 18 May 2026 14:47:54 +0200 Subject: [PATCH 517/691] 2050 Removed error logs in favour of exceptions --- ci/phpunit/inc/TestMocks.php | 52 ---- ci/phpunit/inc/UtilTest.php | 13 +- .../HashtopolisNotificationEmailTest.php | 28 +- ci/phpunit/inc/utils/UserUtilsTest.php | 255 +++++++++--------- .../HashtopolisNotificationEmail.php | 4 +- src/inc/utils/UserUtils.php | 3 +- 6 files changed, 136 insertions(+), 219 deletions(-) diff --git a/ci/phpunit/inc/TestMocks.php b/ci/phpunit/inc/TestMocks.php index 4e3cc248c..a2d8778c6 100644 --- a/ci/phpunit/inc/TestMocks.php +++ b/ci/phpunit/inc/TestMocks.php @@ -49,56 +49,4 @@ function mail($to, $subject, $message, $additionalHeaders = null, $additionalPar }); } } - - if (!function_exists(__NAMESPACE__ . '\\error_log')) { - function error_log($message, $messageType = 0, $destination = null, $additionalHeaders = null) { - return \hashtopolis_invoke_test_mock(__FUNCTION__, [$message, $messageType, $destination, $additionalHeaders], static function ($message, $messageType = 0, $destination = null, $additionalHeaders = null) { - if ($destination === null) { - return \error_log($message, $messageType); - } - - if ($additionalHeaders === null) { - return \error_log($message, $messageType, $destination); - } - - return \error_log($message, $messageType, $destination, $additionalHeaders); - }); - } - } -} - -namespace Hashtopolis\inc\notifications { - if (!function_exists(__NAMESPACE__ . '\\error_log')) { - function error_log($message, $messageType = 0, $destination = null, $additionalHeaders = null) { - return \hashtopolis_invoke_test_mock(__FUNCTION__, [$message, $messageType, $destination, $additionalHeaders], static function ($message, $messageType = 0, $destination = null, $additionalHeaders = null) { - if ($destination === null) { - return \error_log($message, $messageType); - } - - if ($additionalHeaders === null) { - return \error_log($message, $messageType, $destination); - } - - return \error_log($message, $messageType, $destination, $additionalHeaders); - }); - } - } -} - -namespace Hashtopolis\inc\utils { - if (!function_exists(__NAMESPACE__ . '\\error_log')) { - function error_log($message, $messageType = 0, $destination = null, $additionalHeaders = null) { - return \hashtopolis_invoke_test_mock(__FUNCTION__, [$message, $messageType, $destination, $additionalHeaders], static function ($message, $messageType = 0, $destination = null, $additionalHeaders = null) { - if ($destination === null) { - return \error_log($message, $messageType); - } - - if ($additionalHeaders === null) { - return \error_log($message, $messageType, $destination); - } - - return \error_log($message, $messageType, $destination, $additionalHeaders); - }); - } - } } diff --git a/ci/phpunit/inc/UtilTest.php b/ci/phpunit/inc/UtilTest.php index 84db95f11..b6aa20bcb 100644 --- a/ci/phpunit/inc/UtilTest.php +++ b/ci/phpunit/inc/UtilTest.php @@ -34,25 +34,18 @@ public function testIsMailConfiguredReturnsTrueWithSsmtpConfig(): void { } } - public function testSendMailReturnsFalseAndLogsWhenMailIsNotConfigured(): void { + public function testSendMailReturnsFalseWhenMailIsNotConfigured(): void { $loggedMessage = null; \hashtopolis_set_test_mock('Hashtopolis\\inc\\is_file', static function ($path): bool { return false; }); - \hashtopolis_set_test_mock('Hashtopolis\\inc\\error_log', static function ($message) use (&$loggedMessage): bool { - $loggedMessage = $message; - return true; - }); try { $this->assertFalse(Util::sendMail('user@example.com', 'subject', '

    body

    ', 'body')); - $this->assertSame('Mail notification is not configured. No message sent.', $loggedMessage); } finally { - \hashtopolis_clear_test_mocks(['Hashtopolis\\inc\\is_file', 'Hashtopolis\\inc\\error_log']); + \hashtopolis_clear_test_mocks(['Hashtopolis\\inc\\is_file']); } } - } - - + } } diff --git a/ci/phpunit/inc/notifications/HashtopolisNotificationEmailTest.php b/ci/phpunit/inc/notifications/HashtopolisNotificationEmailTest.php index 02400f914..4965b28dc 100644 --- a/ci/phpunit/inc/notifications/HashtopolisNotificationEmailTest.php +++ b/ci/phpunit/inc/notifications/HashtopolisNotificationEmailTest.php @@ -32,16 +32,11 @@ public function testSendMessageDoesNotCallSendMailWhenMailIsNotConfigured(): voi $mailCallCount++; return true; }); - \hashtopolis_set_test_mock('Hashtopolis\\inc\\notifications\\error_log', static function ($message) use (&$errorLogMessages): bool { - $errorLogMessages[] = $message; - return true; - }); $notification = $this->createNotification(); $notification->sendMessage('

    html

    ##########plain', 'Subject'); $this->assertSame(0, $mailCallCount); - $this->assertSame([], $errorLogMessages); } public function testSendMessageCallsSendMailWhenMailIsConfigured(): void { @@ -55,10 +50,6 @@ public function testSendMessageCallsSendMailWhenMailIsConfigured(): void { $mailCalls[] = [$to, $subject, $message, $additionalHeaders, $additionalParams]; return true; }); - \hashtopolis_set_test_mock('Hashtopolis\\inc\\notifications\\error_log', static function ($message) use (&$errorLogMessages): bool { - $errorLogMessages[] = $message; - return true; - }); $notification = $this->createNotification(); $notification->sendMessage('

    html

    ##########plain', 'Subject'); @@ -70,9 +61,8 @@ public function testSendMessageCallsSendMailWhenMailIsConfigured(): void { $this->assertStringContainsString('plain', $mailCalls[0][2]); } - public function testSendMessageLogsWhenConfiguredSendMailFails(): void { + public function testSendMessageThrowsWhenConfiguredSendMailFails(): void { $mailCallCount = 0; - $errorLogMessages = []; \hashtopolis_set_test_mock('Hashtopolis\\inc\\is_file', static function ($path): bool { return true; @@ -81,18 +71,14 @@ public function testSendMessageLogsWhenConfiguredSendMailFails(): void { $mailCallCount++; return false; }); - \hashtopolis_set_test_mock('Hashtopolis\\inc\\notifications\\error_log', static function ($message) use (&$errorLogMessages): bool { - $errorLogMessages[] = $message; - return true; - }); $notification = $this->createNotification(); - $notification->sendMessage('

    html

    ##########plain', 'Subject'); - - $this->assertSame(1, $mailCallCount); - $this->assertSame([ - 'Unable to send notification mail with subject: Subject', - ], $errorLogMessages); + $this->expectException(\Exception::class); + try { + $notification->sendMessage('

    html

    ##########plain', 'Subject'); + } finally { + $this->assertSame(1, $mailCallCount); + } } private function createNotification(): HashtopolisNotificationEmail { diff --git a/ci/phpunit/inc/utils/UserUtilsTest.php b/ci/phpunit/inc/utils/UserUtilsTest.php index 9ad6ede6e..53dda634d 100644 --- a/ci/phpunit/inc/utils/UserUtilsTest.php +++ b/ci/phpunit/inc/utils/UserUtilsTest.php @@ -1,17 +1,17 @@ name = $name; - } + public function __construct(string $name) { + $this->name = $name; + } - public function render($data): string { - return $this->name . ':' . json_encode($data); - } - } + public function render($data): string { + return $this->name . ':' . json_encode($data); + } + } } namespace Tests\Inc\Utils { @@ -28,130 +28,117 @@ public function render($data): string { require_once(dirname(__FILE__) . '/../../../../src/inc/startup/include.php'); final class UserUtilsTest extends TestCase { - /** @var string[] */ - private array $createdUsernames = []; - - /** @var int[] */ - private array $createdRightGroupIds = []; - - protected function setUp(): void { - parent::setUp(); - - $_SERVER['HTTP_HOST'] = $_SERVER['HTTP_HOST'] ?? 'localhost'; - $_SERVER['SERVER_PORT'] = $_SERVER['SERVER_PORT'] ?? 80; - \hashtopolis_clear_test_mocks(); - } - - protected function tearDown(): void { - foreach ($this->createdUsernames as $username) { - $qF = new QueryFilter(User::USERNAME, $username, '='); - $users = Factory::getUserFactory()->filter([Factory::FILTER => $qF]); - foreach ($users as $user) { - $memberFilter = new QueryFilter(AccessGroupUser::USER_ID, $user->getId(), '='); - Factory::getAccessGroupUserFactory()->massDeletion([Factory::FILTER => $memberFilter]); - Factory::getUserFactory()->delete($user); - } - } - - foreach ($this->createdRightGroupIds as $rightGroupId) { - $group = Factory::getRightGroupFactory()->get($rightGroupId); - if ($group !== null) { - Factory::getRightGroupFactory()->delete($group); - } - } - - \hashtopolis_clear_test_mocks(); - - parent::tearDown(); - } - - public function testCreateUserDoesNotCallSendMailWhenMailIsNotConfigured(): void { - $mailCallCount = 0; - $utilErrorLogMessages = []; - $username = $this->uniqueUsername('mail_disabled'); - - \hashtopolis_set_test_mock('Hashtopolis\\inc\\is_file', static function ($path): bool { - return false; - }); - \hashtopolis_set_test_mock('Hashtopolis\\inc\\mail', static function () use (&$mailCallCount): bool { - $mailCallCount++; - return true; - }); - \hashtopolis_set_test_mock('Hashtopolis\\inc\\error_log', static function ($message) use (&$utilErrorLogMessages): bool { - $utilErrorLogMessages[] = $message; - return true; - }); - - $createdUser = UserUtils::createUser($username, $username . '@example.com', $this->createRightGroup()->getId(), $this->createAdminUser()); - $this->createdUsernames[] = $username; - - $this->assertSame($username, $createdUser->getUsername()); - $this->assertSame(0, $mailCallCount); - $this->assertSame([], $utilErrorLogMessages); - } - - public function testCreateUserCallsSendMailWhenMailIsConfigured(): void { - $mailCalls = []; - $userUtilsErrorLogMessages = []; - $username = $this->uniqueUsername('mail_enabled'); - - \hashtopolis_set_test_mock('Hashtopolis\\inc\\is_file', static function ($path): bool { - return true; - }); - \hashtopolis_set_test_mock('Hashtopolis\\inc\\mail', static function ($to, $subject, $message, $additionalHeaders = null, $additionalParams = null) use (&$mailCalls): bool { - $mailCalls[] = [$to, $subject, $message, $additionalHeaders, $additionalParams]; - return true; - }); - \hashtopolis_set_test_mock('Hashtopolis\\inc\\utils\\error_log', static function ($message) use (&$userUtilsErrorLogMessages): bool { - $userUtilsErrorLogMessages[] = $message; - return true; - }); - - UserUtils::createUser($username, $username . '@example.com', $this->createRightGroup()->getId(), $this->createAdminUser()); - $this->createdUsernames[] = $username; - - $this->assertCount(1, $mailCalls); - $this->assertSame($username . '@example.com', $mailCalls[0][0]); - $this->assertSame('Account at ' . APP_NAME, $mailCalls[0][1]); - $this->assertSame([], $userUtilsErrorLogMessages); - } - - public function testCreateUserLogsWhenConfiguredSendMailFails(): void { - $mailCallCount = 0; - $userUtilsErrorLogMessages = []; - $username = $this->uniqueUsername('mail_failure'); - - \hashtopolis_set_test_mock('Hashtopolis\\inc\\is_file', static function ($path): bool { - return true; - }); - \hashtopolis_set_test_mock('Hashtopolis\\inc\\mail', static function () use (&$mailCallCount): bool { - $mailCallCount++; - return false; - }); - \hashtopolis_set_test_mock('Hashtopolis\\inc\\utils\\error_log', static function ($message) use (&$userUtilsErrorLogMessages): bool { - $userUtilsErrorLogMessages[] = $message; - return true; - }); - - UserUtils::createUser($username, $username . '@example.com', $this->createRightGroup()->getId(), $this->createAdminUser()); - $this->createdUsernames[] = $username; - - $this->assertSame(1, $mailCallCount); - $this->assertSame(['Unable to send mail to user with subject: Account at ' . APP_NAME], $userUtilsErrorLogMessages); - } - - private function createAdminUser(): User { - return new User(1, 'admin', 'admin@example.com', 'hash', 'salt', 1, 0, 0, time(), 3600, 1, '', '', '', '', ''); - } - - private function createRightGroup(): RightGroup { - $group = Factory::getRightGroupFactory()->save(new RightGroup(null, 'phpunit-' . uniqid('', true), '[]')); - $this->createdRightGroupIds[] = $group->getId(); - return $group; - } - - private function uniqueUsername(string $prefix): string { - return $prefix . '_' . uniqid(); - } + /** @var string[] */ + private array $createdUsernames = []; + + /** @var int[] */ + private array $createdRightGroupIds = []; + + protected function setUp(): void { + parent::setUp(); + + $_SERVER['HTTP_HOST'] = $_SERVER['HTTP_HOST'] ?? 'localhost'; + $_SERVER['SERVER_PORT'] = $_SERVER['SERVER_PORT'] ?? 80; + \hashtopolis_clear_test_mocks(); + } + + protected function tearDown(): void { + foreach ($this->createdUsernames as $username) { + $qF = new QueryFilter(User::USERNAME, $username, '='); + $users = Factory::getUserFactory()->filter([Factory::FILTER => $qF]); + foreach ($users as $user) { + $memberFilter = new QueryFilter(AccessGroupUser::USER_ID, $user->getId(), '='); + Factory::getAccessGroupUserFactory()->massDeletion([Factory::FILTER => $memberFilter]); + Factory::getUserFactory()->delete($user); + } + } + + foreach ($this->createdRightGroupIds as $rightGroupId) { + $group = Factory::getRightGroupFactory()->get($rightGroupId); + if ($group !== null) { + Factory::getRightGroupFactory()->delete($group); + } + } + + \hashtopolis_clear_test_mocks(); + + parent::tearDown(); + } + + public function testCreateUserDoesNotCallSendMailWhenMailIsNotConfigured(): void { + $mailCallCount = 0; + $username = $this->uniqueUsername('mail_disabled'); + + \hashtopolis_set_test_mock('Hashtopolis\\inc\\is_file', static function ($path): bool { + return false; + }); + \hashtopolis_set_test_mock('Hashtopolis\\inc\\mail', static function () use (&$mailCallCount): bool { + $mailCallCount++; + return true; + }); + + $createdUser = UserUtils::createUser($username, $username . '@example.com', $this->createRightGroup()->getId(), $this->createAdminUser()); + $this->createdUsernames[] = $username; + + $this->assertSame($username, $createdUser->getUsername()); + $this->assertSame(0, $mailCallCount); + } + + public function testCreateUserCallsSendMailWhenMailIsConfigured(): void { + $mailCalls = []; + $username = $this->uniqueUsername('mail_enabled'); + + \hashtopolis_set_test_mock('Hashtopolis\\inc\\is_file', static function ($path): bool { + return true; + }); + \hashtopolis_set_test_mock('Hashtopolis\\inc\\mail', static function ($to, $subject, $message, $additionalHeaders = null, $additionalParams = null) use (&$mailCalls): bool { + $mailCalls[] = [$to, $subject, $message, $additionalHeaders, $additionalParams]; + return true; + }); + + UserUtils::createUser($username, $username . '@example.com', $this->createRightGroup()->getId(), $this->createAdminUser()); + $this->createdUsernames[] = $username; + + $this->assertCount(1, $mailCalls); + $this->assertSame($username . '@example.com', $mailCalls[0][0]); + $this->assertSame('Account at ' . APP_NAME, $mailCalls[0][1]); + } + + public function testCreateUserThrowsWhenConfiguredSendMailFails(): void { + $mailCallCount = 0; + $username = $this->uniqueUsername('mail_failure'); + + \hashtopolis_set_test_mock('Hashtopolis\\inc\\is_file', static function ($path): bool { + return true; + }); + \hashtopolis_set_test_mock('Hashtopolis\\inc\\mail', static function () use (&$mailCallCount): bool { + $mailCallCount++; + return false; + }); + + //TODO: Check if the user is still created + $this->createdUsernames[] = $username; + + $this->expectException(\Exception::class); + try { + UserUtils::createUser($username, $username . '@example.com', $this->createRightGroup()->getId(), $this->createAdminUser()); + } finally { + $this->assertSame(1, $mailCallCount); + } + } + + private function createAdminUser(): User { + return new User(1, 'admin', 'admin@example.com', 'hash', 'salt', 1, 0, 0, time(), 3600, 1, '', '', '', '', ''); + } + + private function createRightGroup(): RightGroup { + $group = Factory::getRightGroupFactory()->save(new RightGroup(null, 'phpunit-' . uniqid('', true), '[]')); + $this->createdRightGroupIds[] = $group->getId(); + return $group; + } + + private function uniqueUsername(string $prefix): string { + return $prefix . '_' . uniqid(); + } } } diff --git a/src/inc/notifications/HashtopolisNotificationEmail.php b/src/inc/notifications/HashtopolisNotificationEmail.php index a5f6388a4..65be4126a 100644 --- a/src/inc/notifications/HashtopolisNotificationEmail.php +++ b/src/inc/notifications/HashtopolisNotificationEmail.php @@ -3,6 +3,8 @@ namespace Hashtopolis\inc\notifications; use Hashtopolis\inc\Util; +use PHPUnit\Event\Runtime\Runtime; +use RuntimeException; class HashtopolisNotificationEmail extends HashtopolisNotification { protected $receiver; @@ -21,7 +23,7 @@ function getObjects() { function sendMessage($message, $subject) { $message = explode("##########", $message); if (Util::isMailConfigured() && !Util::sendMail($this->receiver, $subject, $message[0], $message[1])) { - error_log("Unable to send notification mail with subject: " . $subject); + throw new RuntimeException("Unable to send notification mail with subject: " . $subject); } } } diff --git a/src/inc/utils/UserUtils.php b/src/inc/utils/UserUtils.php index 078a12602..47c6d771a 100644 --- a/src/inc/utils/UserUtils.php +++ b/src/inc/utils/UserUtils.php @@ -25,6 +25,7 @@ use Hashtopolis\inc\HTException; use Hashtopolis\inc\SConfig; use Hashtopolis\inc\Util; +use RuntimeException; class UserUtils { /** @@ -244,7 +245,7 @@ public static function createUser(string $username, string $email, int $rightGro $subject = "Account at " . APP_NAME; if (Util::isMailConfigured() && !Util::sendMail($email, $subject, $tmpl->render($obj), $tmplPlain->render($obj))) { - error_log("Unable to send mail to user with subject: " . $subject); + throw new RuntimeException("Unable to send mail to user with subject: " . $subject); } // create log entry and check if notification sending is needed From 8176aef018ec784c6d6902def3caaeb9351d7f4a Mon Sep 17 00:00:00 2001 From: andreas Date: Mon, 18 May 2026 15:33:20 +0200 Subject: [PATCH 518/691] 2050 Converted tabs to spaces --- ci/phpunit/inc/TestMocks.php | 90 ++++++++++++++++++------------------ 1 file changed, 45 insertions(+), 45 deletions(-) diff --git a/ci/phpunit/inc/TestMocks.php b/ci/phpunit/inc/TestMocks.php index a2d8778c6..c1ff3e4f5 100644 --- a/ci/phpunit/inc/TestMocks.php +++ b/ci/phpunit/inc/TestMocks.php @@ -1,52 +1,52 @@ Date: Mon, 18 May 2026 15:37:39 +0200 Subject: [PATCH 519/691] Fixed CORS errors for scripts without origins and for origins without ports --- src/inc/apiv2/util/CorsHackMiddleware.php | 28 ++++++++++++++--------- 1 file changed, 17 insertions(+), 11 deletions(-) diff --git a/src/inc/apiv2/util/CorsHackMiddleware.php b/src/inc/apiv2/util/CorsHackMiddleware.php index e7c9d2b83..c9eb56f74 100644 --- a/src/inc/apiv2/util/CorsHackMiddleware.php +++ b/src/inc/apiv2/util/CorsHackMiddleware.php @@ -28,10 +28,10 @@ public static function addCORSHeaders(Request $request, $response) { $envBackend = getenv('HASHTOPOLIS_BACKEND_URL'); $envFrontendPort = getenv('HASHTOPOLIS_FRONTEND_PORT'); - if ($envBackend !== false || $envFrontendPort !== false) { + if (($envBackend !== false || $envFrontendPort !== false) && $requestHttpOrigin != "") { $requestHttpOrigin = explode('://', $requestHttpOrigin)[1]; + $envBackend = explode('://', $envBackend)[1]; - $envBackend = explode('/', $envBackend)[0]; $requestHttpOriginUrl = substr($requestHttpOrigin, 0, strrpos($requestHttpOrigin, ":")); //Needs to use strrpos in case of ipv6 because of multiple ':' characters @@ -41,24 +41,30 @@ public static function addCORSHeaders(Request $request, $response) { if ($requestHttpOriginUrl === $envBackendUrl || (in_array($requestHttpOriginUrl, $localhostSynonyms) && in_array($envBackendUrl, $localhostSynonyms))) { //Origin URL matches, now check the port too - $requestHttpOriginPort = substr($requestHttpOrigin, strrpos($requestHttpOrigin, ":") + 1); //Needs to use strrpos in case of ipv6 because of multiple ':' characters - $envBackendPort = substr($envBackend, strrpos($envBackend, ":") + 1); - - if ($requestHttpOriginPort === $envFrontendPort || $requestHttpOriginPort === $envBackendPort) { - $response = $response->withHeader('Access-Control-Allow-Origin', $request->getHeaderLine('HTTP_ORIGIN')); + if (substr($requestHttpOrigin, -1) !== "]" && str_contains($requestHttpOrigin, ":")) { + $requestHttpOriginPort = substr($requestHttpOrigin, strrpos($requestHttpOrigin, ":") + 1); //Needs to use strrpos in case of ipv6 because of multiple ':' characters + $envBackendPort = substr($envBackend, strrpos($envBackend, ":") + 1); + + if ($requestHttpOriginPort === $envFrontendPort || $requestHttpOriginPort === $envBackendPort) { + $response = $response->withHeader('Access-Control-Allow-Origin', $request->getHeaderLine('HTTP_ORIGIN')); + } + else { + error_log("CORS error: Allow-Origin port doesn't match: the value from the request is {$requestHttpOriginPort} but expected {$envFrontendPort} or {$envBackendPort}. Try switching the frontend port back to the default value (4200) in the docker-compose."); + die(); + } } else { - error_log("CORS error: Allow-Origin port doesn't match. Try switching the frontend port back to the default value (4200) in the docker-compose."); - die(); + //No port given in the request origin, all checks passed + $response = $response->withHeader('Access-Control-Allow-Origin', $request->getHeaderLine('HTTP_ORIGIN')); } } else { - error_log("CORS error: Allow-Origin URL doesn't match. Is the HASHTOPOLIS_BACKEND_URL in the .env file the correct one?"); + error_log("CORS error: Allow-Origin URL doesn't match: the value from the request is {$requestHttpOriginUrl} but expected {$envBackendUrl}. Is the HASHTOPOLIS_BACKEND_URL in the .env file the correct one?"); die(); } } else { - //No backend URL given in .env file, switch to default allow all + //No backend URL given in .env file or no origin supplied in the request, switch to default allow all $response = $response->withHeader('Access-Control-Allow-Origin', '*'); } From 6c93f0db97b539d9ff71828c548885dbc41b5a21 Mon Sep 17 00:00:00 2001 From: andreas Date: Mon, 18 May 2026 15:58:46 +0200 Subject: [PATCH 520/691] 2050 Throw Internal error instead of generic exception --- ci/phpunit/inc/utils/UserUtilsTest.php | 4 ++-- src/inc/utils/UserUtils.php | 3 ++- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/ci/phpunit/inc/utils/UserUtilsTest.php b/ci/phpunit/inc/utils/UserUtilsTest.php index 53dda634d..15981d51b 100644 --- a/ci/phpunit/inc/utils/UserUtilsTest.php +++ b/ci/phpunit/inc/utils/UserUtilsTest.php @@ -22,6 +22,7 @@ public function render($data): string { use Hashtopolis\dba\models\RightGroup; use Hashtopolis\dba\models\User; use Hashtopolis\inc\utils\UserUtils; +use Hashtopolis\inc\apiv2\error\InternalError; use PHPUnit\Framework\TestCase; require_once(dirname(__FILE__) . '/../TestMocks.php'); @@ -116,10 +117,9 @@ public function testCreateUserThrowsWhenConfiguredSendMailFails(): void { return false; }); - //TODO: Check if the user is still created $this->createdUsernames[] = $username; - $this->expectException(\Exception::class); + $this->expectException(InternalError::class); try { UserUtils::createUser($username, $username . '@example.com', $this->createRightGroup()->getId(), $this->createAdminUser()); } finally { diff --git a/src/inc/utils/UserUtils.php b/src/inc/utils/UserUtils.php index 47c6d771a..53c258580 100644 --- a/src/inc/utils/UserUtils.php +++ b/src/inc/utils/UserUtils.php @@ -15,6 +15,7 @@ use Hashtopolis\dba\models\JwtApiKey; use Hashtopolis\inc\apiv2\error\HttpConflict; use Hashtopolis\inc\apiv2\error\HttpError; +use Hashtopolis\inc\apiv2\error\InternalError; use Hashtopolis\inc\defines\DConfig; use Hashtopolis\inc\defines\DLogEntry; use Hashtopolis\inc\defines\DNotificationObjectType; @@ -245,7 +246,7 @@ public static function createUser(string $username, string $email, int $rightGro $subject = "Account at " . APP_NAME; if (Util::isMailConfigured() && !Util::sendMail($email, $subject, $tmpl->render($obj), $tmplPlain->render($obj))) { - throw new RuntimeException("Unable to send mail to user with subject: " . $subject); + throw new InternalError("User account created but unable to send mail to user with subject: " . $subject); } // create log entry and check if notification sending is needed From 19af4361dea870c39d3f41b576cff1d92f365ebe Mon Sep 17 00:00:00 2001 From: s3inlc Date: Mon, 18 May 2026 16:02:58 +0200 Subject: [PATCH 521/691] apitoken needs an override to skip delete, fixed post to create api token --- ci/apiv2/test_apitoken.py | 27 ++++++++++++++------------- ci/apiv2/utils.py | 5 ++++- 2 files changed, 18 insertions(+), 14 deletions(-) diff --git a/ci/apiv2/test_apitoken.py b/ci/apiv2/test_apitoken.py index 23b6f3fad..1bf050174 100644 --- a/ci/apiv2/test_apitoken.py +++ b/ci/apiv2/test_apitoken.py @@ -4,9 +4,9 @@ import requests -from hashtopolis import ApiToken +from hashtopolis import Model -from utils import BaseTest, create_restricted_user +from utils import BaseTest, create_restricted_user, ApiToken def _decode_jwt_scope(token): @@ -25,9 +25,14 @@ def _create_apitoken_raw(test, auth, scopes): headers = {**connector._headers, 'Content-Type': 'application/json'} now = int(time.time()) payload = { - 'scopes': scopes, - 'startValid': now, - 'endValid': now + 3600, + 'data': { + 'attributes': { + 'scopes': scopes, + 'startValid': now, + 'endValid': now + 3600, + }, + 'type': 'ApiToken', + }, } r = requests.post(uri, headers=headers, data=json.dumps(payload)) assert r.status_code == 201, f"Failed to create apitoken: status={r.status_code} body={r.text}" @@ -46,10 +51,6 @@ def test_create(self): model_obj = self.create_test_object() self._test_create(model_obj) - def test_delete(self): - model_obj = self.create_test_object(delete=False) - self._test_delete(model_obj) - def test_expandables(self): model_obj = self.create_test_object() expandables = ['user'] @@ -63,7 +64,7 @@ def test_token_scope_admin_grants_requested(self): """Admin holds every legacy permission, so any requested scope must be granted in the JWT.""" model_obj = self.create_test_object() scope = _decode_jwt_scope(model_obj.token) - self.assertTrue(scope.get('permHashlistRead')) + self.assertTrue('permHashlistRead' in scope) def test_token_scope_intersection_grants_permitted(self): """A restricted user is granted a requested scope they hold via the legacy permission mapping.""" @@ -73,7 +74,7 @@ def test_token_scope_intersection_grants_permitted(self): }) model_obj = _create_apitoken_raw(self, auth, ['permHashlistRead']) scope = _decode_jwt_scope(model_obj.token) - self.assertTrue(scope.get('permHashlistRead')) + self.assertTrue('permHashlistRead' in scope) def test_token_scope_intersection_denies_unpermitted(self): """A restricted user must NOT receive a scope they do not have, even if they request it.""" @@ -83,5 +84,5 @@ def test_token_scope_intersection_denies_unpermitted(self): }) model_obj = _create_apitoken_raw(self, auth, ['permHashlistRead', 'permFileRead']) scope = _decode_jwt_scope(model_obj.token) - self.assertTrue(scope.get('permHashlistRead')) - self.assertFalse(scope.get('permFileRead')) + self.assertTrue('permHashlistRead' in scope) + self.assertFalse('permFileRead' not in scope) diff --git a/ci/apiv2/utils.py b/ci/apiv2/utils.py index 863e3a378..64c4116f2 100644 --- a/ci/apiv2/utils.py +++ b/ci/apiv2/utils.py @@ -11,7 +11,7 @@ import confidence -from hashtopolis import ApiToken +from hashtopolis import Model from hashtopolis import AccessGroup from hashtopolis import Helper from hashtopolis import Agent @@ -36,6 +36,9 @@ from hashtopolis_agent import DummyAgent +class ApiToken(Model, uri="/ui/apiTokens"): + def delete(obj): + pass # we override the delete function for the tests as tokens cannot be deleted, but the teardown always calls delete after a test def _do_create_obj_from_file(model_class, file_prefix, extra_payload={}, **kwargs): file_id = kwargs.get('file_id') or '001' From cff48a1ddd45bda28b3f1222593529e4692a4bdb Mon Sep 17 00:00:00 2001 From: s3inlc Date: Mon, 18 May 2026 16:24:15 +0200 Subject: [PATCH 522/691] fixed typo --- src/inc/apiv2/model/ApiTokenAPI.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/inc/apiv2/model/ApiTokenAPI.php b/src/inc/apiv2/model/ApiTokenAPI.php index 9c2a244da..3b9e6a624 100644 --- a/src/inc/apiv2/model/ApiTokenAPI.php +++ b/src/inc/apiv2/model/ApiTokenAPI.php @@ -79,7 +79,7 @@ protected function createObject(array $data): int { $this->getRightGroup($this->getCurrentUser()->getRightGroupId())->getPermissions() ); - // Modern CRUD scope dict: true iff the perm was requested AND the user has it. + // Modern CRUD scope dict: true if the perm was requested AND the user has it. $requestedScopes = []; foreach ($userCrudPerms as $perm => $granted) { $requestedScopes[$perm] = $granted && in_array($perm, $scopes, true); @@ -125,4 +125,4 @@ function aggregateData(object $object, array &$included_data = [], ?array $aggre protected function deleteObject(object $object): void { JwtTokenUtils::deleteKey($object); } -} \ No newline at end of file +} From faeeb3a7684ca990a56d34b56154e3b0a87cbc04 Mon Sep 17 00:00:00 2001 From: s3inlc Date: Mon, 18 May 2026 17:05:58 +0200 Subject: [PATCH 523/691] incorporated changes into generator --- src/dba/models/generator.php | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/dba/models/generator.php b/src/dba/models/generator.php index f92957560..59869f18d 100644 --- a/src/dba/models/generator.php +++ b/src/dba/models/generator.php @@ -292,8 +292,8 @@ ['name' => 'jwtApiKeyId', 'read_only' => True, 'type' => 'int', 'protected' => True], ['name' => 'startValid', 'read_only' => True, 'type' => 'int64'], ['name' => 'endValid', 'read_only' => True, 'type' => 'int64'], - ['name' => 'userId', 'read_only' => True, 'type' => 'int', 'relation' => 'User'], - ['name' => 'isRevoked', 'read_only' => False, 'type' => 'bool'], + ['name' => 'userId', 'read_only' => True, 'null' => True, 'type' => 'int', 'relation' => 'User'], + ['name' => 'isRevoked', 'read_only' => False, 'null' => True, 'type' => 'bool'], ], ]; $CONF['LogEntry'] = [ @@ -408,7 +408,7 @@ ['name' => 'useNewBench', 'read_only' => True, 'type' => 'bool'], ['name' => 'skipKeyspace', 'read_only' => True, 'type' => 'int64'], ['name' => 'crackerBinaryId', 'read_only' => True, 'type' => 'int', 'relation' => 'CrackerBinary'], - ['name' => 'crackerBinaryTypeId', 'read_only' => True, 'type' => 'int', 'relation' => 'CrackerBinaryType'], + ['name' => 'crackerBinaryTypeId', 'read_only' => True, 'null' => True, 'type' => 'int', 'relation' => 'CrackerBinaryType'], // TODO: this will be removed in the future as it's redundant ['name' => 'taskWrapperId', 'read_only' => True, 'type' => 'int', 'protected' => True, 'relation' => 'TaskWrapper'], ['name' => 'isArchived', 'read_only' => False, 'type' => 'bool'], ['name' => 'notes', 'read_only' => False, 'type' => 'str(65535)'], @@ -474,7 +474,7 @@ ]; $CONF['User'] = [ 'columns' => [ - ['name' => 'userId', 'read_only' => True, 'type' => 'int', 'protected' => True, 'alias' => 'id', 'public' => True], + ['name' => 'userId', 'read_only' => True, 'type' => 'int', 'protected' => True, 'alias' => 'userId', 'public' => True], ['name' => 'username', 'read_only' => True, 'type' => 'str(100)', 'alias' => 'name', 'public' => True], ['name' => 'email', 'read_only' => False, 'type' => 'str(150)'], ['name' => 'passwordHash', 'read_only' => True, 'type' => 'str(256)', 'protected' => True, 'private' => True], From df0bc60b3dc260ffbb1a8d32d444de9ff4ba2397 Mon Sep 17 00:00:00 2001 From: andreas Date: Mon, 18 May 2026 17:11:32 +0200 Subject: [PATCH 524/691] 2050 Cleaned up after review --- src/inc/Util.php | 4 ++++ src/inc/notifications/HashtopolisNotificationEmail.php | 1 - src/inc/utils/UserUtils.php | 2 +- 3 files changed, 5 insertions(+), 2 deletions(-) diff --git a/src/inc/Util.php b/src/inc/Util.php index 82f0de05b..cd3c8c2ad 100755 --- a/src/inc/Util.php +++ b/src/inc/Util.php @@ -1343,6 +1343,10 @@ public static function compareChunksTime($a, $b) { return ($a->getDispatchTime() < $b->getDispatchTime()) ? -1 : 1; } + /** + * Check if email sending is configured by looking for config file + * @return bool true if configured, false if not. + */ public static function isMailConfigured(): bool { $path = '/etc/ssmtp/ssmtp.conf'; return is_file($path); diff --git a/src/inc/notifications/HashtopolisNotificationEmail.php b/src/inc/notifications/HashtopolisNotificationEmail.php index 65be4126a..0e7897f57 100644 --- a/src/inc/notifications/HashtopolisNotificationEmail.php +++ b/src/inc/notifications/HashtopolisNotificationEmail.php @@ -3,7 +3,6 @@ namespace Hashtopolis\inc\notifications; use Hashtopolis\inc\Util; -use PHPUnit\Event\Runtime\Runtime; use RuntimeException; class HashtopolisNotificationEmail extends HashtopolisNotification { diff --git a/src/inc/utils/UserUtils.php b/src/inc/utils/UserUtils.php index 53c258580..c7e0fcd9e 100644 --- a/src/inc/utils/UserUtils.php +++ b/src/inc/utils/UserUtils.php @@ -26,7 +26,6 @@ use Hashtopolis\inc\HTException; use Hashtopolis\inc\SConfig; use Hashtopolis\inc\Util; -use RuntimeException; class UserUtils { /** @@ -210,6 +209,7 @@ public static function setPassword($userId, $password, $adminUser) { * @throws HTException * @throws HttpConflict * @throws HttpError + * @throws InternalError */ public static function createUser(string $username, string $email, int $rightGroupId, User $adminUser, bool $isValid = true, int $session_lifetime = 3600): User { $username = htmlentities($username, ENT_QUOTES, "UTF-8"); From 40ade2b79b13c4694d2f041412c9c6eb3013c629 Mon Sep 17 00:00:00 2001 From: s3inlc Date: Mon, 18 May 2026 17:21:23 +0200 Subject: [PATCH 525/691] setting alias properly for right group primary key --- src/dba/models/RightGroup.php | 2 +- src/dba/models/generator.php | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/dba/models/RightGroup.php b/src/dba/models/RightGroup.php index bfb54b381..a4e7a86e2 100644 --- a/src/dba/models/RightGroup.php +++ b/src/dba/models/RightGroup.php @@ -26,7 +26,7 @@ function getKeyValueDict(): array { static function getFeatures(): array { $dict = array(); - $dict['rightGroupId'] = ['read_only' => True, "type" => "int", "subtype" => "unset", "choices" => "unset", "null" => False, "pk" => True, "protected" => True, "private" => False, "alias" => "id", "public" => False, "dba_mapping" => False]; + $dict['rightGroupId'] = ['read_only' => True, "type" => "int", "subtype" => "unset", "choices" => "unset", "null" => False, "pk" => True, "protected" => True, "private" => False, "alias" => "rightGroupId", "public" => False, "dba_mapping" => False]; $dict['groupName'] = ['read_only' => False, "type" => "str(50)", "subtype" => "unset", "choices" => "unset", "null" => False, "pk" => False, "protected" => False, "private" => False, "alias" => "name", "public" => False, "dba_mapping" => False]; $dict['permissions'] = ['read_only' => False, "type" => "dict", "subtype" => "bool", "choices" => "unset", "null" => True, "pk" => False, "protected" => False, "private" => False, "alias" => "permissions", "public" => False, "dba_mapping" => False]; diff --git a/src/dba/models/generator.php b/src/dba/models/generator.php index f92957560..e2de12658 100644 --- a/src/dba/models/generator.php +++ b/src/dba/models/generator.php @@ -354,7 +354,7 @@ ]; $CONF['RightGroup'] = [ 'columns' => [ - ['name' => 'rightGroupId', 'read_only' => True, 'type' => 'int', 'protected' => True, 'alias' => 'id'], + ['name' => 'rightGroupId', 'read_only' => True, 'type' => 'int', 'protected' => True, 'alias' => 'rightGroupId'], ['name' => 'groupName', 'read_only' => False, 'type' => 'str(50)', 'alias' => 'name'], ['name' => 'permissions', 'read_only' => False, 'type' => 'dict', 'subtype' => 'bool', 'null' => True], ], From 05ec137dbd1e78d0fffaaa41989dc8cc2a8d401a Mon Sep 17 00:00:00 2001 From: Inadequate Immortal jellyfish Date: Tue, 19 May 2026 08:02:52 +0200 Subject: [PATCH 526/691] 2044 bug missing color labeling of tasks (#2053) * updated color fields for takwrapper display --- ci/apiv2/test_taskwrapperdisplay.py | 18 ++++++++++++++++++ src/dba/models/TaskWrapperDisplay.php | 15 ++++++++++++++- src/dba/models/TaskWrapperDisplayFactory.php | 4 ++-- src/dba/models/generator.php | 1 + ...0260518102000_task-view-add-color-field.sql | 17 +++++++++++++++++ ...0260518102000_task-view-add-color-field.sql | 17 +++++++++++++++++ 6 files changed, 69 insertions(+), 3 deletions(-) create mode 100644 ci/apiv2/test_taskwrapperdisplay.py create mode 100644 src/migrations/mysql/20260518102000_task-view-add-color-field.sql create mode 100644 src/migrations/postgres/20260518102000_task-view-add-color-field.sql diff --git a/ci/apiv2/test_taskwrapperdisplay.py b/ci/apiv2/test_taskwrapperdisplay.py new file mode 100644 index 000000000..c98cdaa08 --- /dev/null +++ b/ci/apiv2/test_taskwrapperdisplay.py @@ -0,0 +1,18 @@ +from hashtopolis import TaskWrapperDisplay +from utils import BaseTest +class TaskWrapperDisplayTest(BaseTest): + model_class = TaskWrapperDisplay + + def create_test_object(self, *nargs, delete=True, **kwargs): + # Always cleanup hashlist when done, this is potentially confusing, + # since it will also remove the related task + hashlist = self.create_hashlist() + task = self.create_task(hashlist, delete=delete) + return TaskWrapperDisplay.objects.get(pk=task.taskWrapperId) + + def test_task_wrapper_display_should_return_color_field(self): + task_wrapper_display_object = self.create_test_object() + expected_color_value = str(task_wrapper_display_object.color) + self.assertIsNotNone(task_wrapper_display_object.color) + self.assertEqual(task_wrapper_display_object.color, expected_color_value) + self.assertNotEqual("FFFFFF", task_wrapper_display_object.color) \ No newline at end of file diff --git a/src/dba/models/TaskWrapperDisplay.php b/src/dba/models/TaskWrapperDisplay.php index 18ebdee3e..98e8b17f1 100644 --- a/src/dba/models/TaskWrapperDisplay.php +++ b/src/dba/models/TaskWrapperDisplay.php @@ -17,6 +17,7 @@ class TaskWrapperDisplay extends AbstractModel { private ?int $cracked; private ?int $taskId; private ?string $taskName; + private ?string $color; private ?string $attackCmd; private ?int $chunkTime; private ?int $statusTimer; @@ -35,7 +36,7 @@ class TaskWrapperDisplay extends AbstractModel { private ?string $hashTypeDescription; private ?string $groupName; - function __construct(?int $taskWrapperId, ?int $taskWrapperPriority, ?int $taskWrapperMaxAgents, ?int $taskType, ?int $hashlistId, ?int $accessGroupId, ?string $taskWrapperName, ?string $displayName, ?int $taskWrapperIsArchived, ?int $cracked, ?int $taskId, ?string $taskName, ?string $attackCmd, ?int $chunkTime, ?int $statusTimer, ?int $keyspace, ?int $keyspaceProgress, ?int $taskPriority, ?int $taskMaxAgents, ?int $isSmall, ?int $isCpuTask, ?int $taskIsArchived, ?int $taskUsePreprocessor, ?string $hashlistName, ?int $hashCount, ?int $hashlistCracked, ?int $hashTypeId, ?string $hashTypeDescription, ?string $groupName) { + function __construct(?int $taskWrapperId, ?int $taskWrapperPriority, ?int $taskWrapperMaxAgents, ?int $taskType, ?int $hashlistId, ?int $accessGroupId, ?string $taskWrapperName, ?string $displayName, ?int $taskWrapperIsArchived, ?int $cracked, ?int $taskId, ?string $taskName, ?string $color, ?string $attackCmd, ?int $chunkTime, ?int $statusTimer, ?int $keyspace, ?int $keyspaceProgress, ?int $taskPriority, ?int $taskMaxAgents, ?int $isSmall, ?int $isCpuTask, ?int $taskIsArchived, ?int $taskUsePreprocessor, ?string $hashlistName, ?int $hashCount, ?int $hashlistCracked, ?int $hashTypeId, ?string $hashTypeDescription, ?string $groupName) { $this->taskWrapperId = $taskWrapperId; $this->taskWrapperPriority = $taskWrapperPriority; $this->taskWrapperMaxAgents = $taskWrapperMaxAgents; @@ -48,6 +49,7 @@ function __construct(?int $taskWrapperId, ?int $taskWrapperPriority, ?int $taskW $this->cracked = $cracked; $this->taskId = $taskId; $this->taskName = $taskName; + $this->color = $color; $this->attackCmd = $attackCmd; $this->chunkTime = $chunkTime; $this->statusTimer = $statusTimer; @@ -81,6 +83,7 @@ function getKeyValueDict(): array { $dict['cracked'] = $this->cracked; $dict['taskId'] = $this->taskId; $dict['taskName'] = $this->taskName; + $dict['color'] = $this->color; $dict['attackCmd'] = $this->attackCmd; $dict['chunkTime'] = $this->chunkTime; $dict['statusTimer'] = $this->statusTimer; @@ -116,6 +119,7 @@ static function getFeatures(): array { $dict['cracked'] = ['read_only' => True, "type" => "int", "subtype" => "unset", "choices" => "unset", "null" => False, "pk" => False, "protected" => True, "private" => False, "alias" => "cracked", "public" => False, "dba_mapping" => False]; $dict['taskId'] = ['read_only' => True, "type" => "int", "subtype" => "unset", "choices" => "unset", "null" => False, "pk" => False, "protected" => True, "private" => False, "alias" => "taskId", "public" => False, "dba_mapping" => False]; $dict['taskName'] = ['read_only' => False, "type" => "str(256)", "subtype" => "unset", "choices" => "unset", "null" => False, "pk" => False, "protected" => False, "private" => False, "alias" => "taskName", "public" => False, "dba_mapping" => False]; + $dict['color'] = ['read_only' => False, "type" => "str(50)", "subtype" => "unset", "choices" => "unset", "null" => True, "pk" => False, "protected" => False, "private" => False, "alias" => "color", "public" => False, "dba_mapping" => False]; $dict['attackCmd'] = ['read_only' => False, "type" => "str(65535)", "subtype" => "unset", "choices" => "unset", "null" => False, "pk" => False, "protected" => False, "private" => False, "alias" => "attackCmd", "public" => False, "dba_mapping" => False]; $dict['chunkTime'] = ['read_only' => False, "type" => "int", "subtype" => "unset", "choices" => "unset", "null" => False, "pk" => False, "protected" => False, "private" => False, "alias" => "chunkTime", "public" => False, "dba_mapping" => False]; $dict['statusTimer'] = ['read_only' => False, "type" => "int", "subtype" => "unset", "choices" => "unset", "null" => False, "pk" => False, "protected" => False, "private" => False, "alias" => "statusTimer", "public" => False, "dba_mapping" => False]; @@ -249,6 +253,14 @@ function setTaskName(?string $taskName): void { $this->taskName = $taskName; } + function getColor(): ?string { + return $this->color; + } + + function setColor(?string $color): void { + $this->color = $color; + } + function getAttackCmd(): ?string { return $this->attackCmd; } @@ -397,6 +409,7 @@ function setGroupName(?string $groupName): void { const CRACKED = "cracked"; const TASK_ID = "taskId"; const TASK_NAME = "taskName"; + const COLOR = "color"; const ATTACK_CMD = "attackCmd"; const CHUNK_TIME = "chunkTime"; const STATUS_TIMER = "statusTimer"; diff --git a/src/dba/models/TaskWrapperDisplayFactory.php b/src/dba/models/TaskWrapperDisplayFactory.php index 50552a138..b32d0250f 100644 --- a/src/dba/models/TaskWrapperDisplayFactory.php +++ b/src/dba/models/TaskWrapperDisplayFactory.php @@ -30,7 +30,7 @@ function getCacheValidTime(): int { * @return TaskWrapperDisplay */ function getNullObject(): TaskWrapperDisplay { - return new TaskWrapperDisplay(-1, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null); + return new TaskWrapperDisplay(-1, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null); } /** @@ -44,7 +44,7 @@ function createObjectFromDict($pk, $dict): TaskWrapperDisplay { $conv[strtolower($key)] = $val; } $dict = $conv; - return new TaskWrapperDisplay($dict['taskwrapperid'], $dict['taskwrapperpriority'], $dict['taskwrappermaxagents'], $dict['tasktype'], $dict['hashlistid'], $dict['accessgroupid'], $dict['taskwrappername'], $dict['displayname'], $dict['taskwrapperisarchived'], $dict['cracked'], $dict['taskid'], $dict['taskname'], $dict['attackcmd'], $dict['chunktime'], $dict['statustimer'], $dict['keyspace'], $dict['keyspaceprogress'], $dict['taskpriority'], $dict['taskmaxagents'], $dict['issmall'], $dict['iscputask'], $dict['taskisarchived'], $dict['taskusepreprocessor'], $dict['hashlistname'], $dict['hashcount'], $dict['hashlistcracked'], $dict['hashtypeid'], $dict['hashtypedescription'], $dict['groupname']); + return new TaskWrapperDisplay($dict['taskwrapperid'], $dict['taskwrapperpriority'], $dict['taskwrappermaxagents'], $dict['tasktype'], $dict['hashlistid'], $dict['accessgroupid'], $dict['taskwrappername'], $dict['displayname'], $dict['taskwrapperisarchived'], $dict['cracked'], $dict['taskid'], $dict['taskname'], $dict['color'], $dict['attackcmd'], $dict['chunktime'], $dict['statustimer'], $dict['keyspace'], $dict['keyspaceprogress'], $dict['taskpriority'], $dict['taskmaxagents'], $dict['issmall'], $dict['iscputask'], $dict['taskisarchived'], $dict['taskusepreprocessor'], $dict['hashlistname'], $dict['hashcount'], $dict['hashlistcracked'], $dict['hashtypeid'], $dict['hashtypedescription'], $dict['groupname']); } /** diff --git a/src/dba/models/generator.php b/src/dba/models/generator.php index 79cdbe3e3..7724bb132 100644 --- a/src/dba/models/generator.php +++ b/src/dba/models/generator.php @@ -453,6 +453,7 @@ ['name' => 'cracked', 'read_only' => True, 'type' => 'int', 'protected' => True], ['name' => 'taskId', 'read_only' => True, 'type' => 'int', 'protected' => True], ['name' => 'taskName', 'read_only' => False, 'type' => 'str(256)'], + ['name' => 'color', 'read_only' => False, 'type' => 'str(50)', 'null' => True], ['name' => 'attackCmd', 'read_only' => False, 'type' => 'str(65535)'], ['name' => 'chunkTime', 'read_only' => False, 'type' => 'int'], ['name' => 'statusTimer', 'read_only' => False, 'type' => 'int'], diff --git a/src/migrations/mysql/20260518102000_task-view-add-color-field.sql b/src/migrations/mysql/20260518102000_task-view-add-color-field.sql new file mode 100644 index 000000000..9a2c3ae68 --- /dev/null +++ b/src/migrations/mysql/20260518102000_task-view-add-color-field.sql @@ -0,0 +1,17 @@ +CREATE OR REPLACE VIEW TaskWrapperDisplay AS SELECT + tw.taskWrapperId AS taskWrapperId, tw.priority AS taskWrapperPriority, tw.maxAgents AS taskWrapperMaxAgents, + tw.taskType AS taskType, tw.hashlistId AS hashlistId, tw.accessGroupId AS accessGroupId, + tw.taskWrapperName AS taskWrapperName, tw.isArchived AS taskWrapperIsArchived, tw.cracked AS cracked, + t.taskId AS taskId, t.taskName AS taskName, t.attackCmd AS attackCmd, t.chunkTime AS chunkTime, + t.statusTimer AS statusTimer, t.keyspace AS keyspace, t.keyspaceProgress AS keyspaceProgress, + t.priority AS taskPriority, t.maxAgents AS taskMaxAgents, t.isArchived AS taskIsArchived, + t.isSmall AS isSmall, t.isCpuTask AS isCpuTask, t.usePreprocessor AS taskUsePreprocessor, + CASE WHEN tw.taskType = 0 THEN t.taskName ELSE tw.taskWrapperName END AS displayName, + h.hashlistName AS hashlistName, h.hashCount AS hashCount, h.cracked as hashlistCracked, + ht.hashTypeId AS hashTypeId, ht.description AS hashTypeDescription, ag.groupName AS groupName, + t.color AS color +FROM TaskWrapper tw + LEFT JOIN Task t ON tw.taskType = 0 AND t.taskWrapperId = tw.taskWrapperId + INNER JOIN Hashlist h ON tw.hashlistId = h.hashlistId + INNER JOIN HashType ht on h.hashTypeId = ht.hashTypeId + INNER JOIN AccessGroup ag on tw.accessGroupId = ag.accessGroupId; \ No newline at end of file diff --git a/src/migrations/postgres/20260518102000_task-view-add-color-field.sql b/src/migrations/postgres/20260518102000_task-view-add-color-field.sql new file mode 100644 index 000000000..9a2c3ae68 --- /dev/null +++ b/src/migrations/postgres/20260518102000_task-view-add-color-field.sql @@ -0,0 +1,17 @@ +CREATE OR REPLACE VIEW TaskWrapperDisplay AS SELECT + tw.taskWrapperId AS taskWrapperId, tw.priority AS taskWrapperPriority, tw.maxAgents AS taskWrapperMaxAgents, + tw.taskType AS taskType, tw.hashlistId AS hashlistId, tw.accessGroupId AS accessGroupId, + tw.taskWrapperName AS taskWrapperName, tw.isArchived AS taskWrapperIsArchived, tw.cracked AS cracked, + t.taskId AS taskId, t.taskName AS taskName, t.attackCmd AS attackCmd, t.chunkTime AS chunkTime, + t.statusTimer AS statusTimer, t.keyspace AS keyspace, t.keyspaceProgress AS keyspaceProgress, + t.priority AS taskPriority, t.maxAgents AS taskMaxAgents, t.isArchived AS taskIsArchived, + t.isSmall AS isSmall, t.isCpuTask AS isCpuTask, t.usePreprocessor AS taskUsePreprocessor, + CASE WHEN tw.taskType = 0 THEN t.taskName ELSE tw.taskWrapperName END AS displayName, + h.hashlistName AS hashlistName, h.hashCount AS hashCount, h.cracked as hashlistCracked, + ht.hashTypeId AS hashTypeId, ht.description AS hashTypeDescription, ag.groupName AS groupName, + t.color AS color +FROM TaskWrapper tw + LEFT JOIN Task t ON tw.taskType = 0 AND t.taskWrapperId = tw.taskWrapperId + INNER JOIN Hashlist h ON tw.hashlistId = h.hashlistId + INNER JOIN HashType ht on h.hashTypeId = ht.hashTypeId + INNER JOIN AccessGroup ag on tw.accessGroupId = ag.accessGroupId; \ No newline at end of file From 8887c66e548a17813f548395e63c29546edc3a7d Mon Sep 17 00:00:00 2001 From: Eric Wasson <229096365+Eric-Wasson@users.noreply.github.com> Date: Tue, 19 May 2026 08:56:11 +0200 Subject: [PATCH 527/691] Removed mail error handling --- src/inc/Util.php | 3 --- 1 file changed, 3 deletions(-) diff --git a/src/inc/Util.php b/src/inc/Util.php index e899be49d..e5597293e 100755 --- a/src/inc/Util.php +++ b/src/inc/Util.php @@ -1371,12 +1371,9 @@ public static function sendMail($address, $subject, $text, $plaintext) { $htmlMessage .= $text; $htmlMessage .= "\r\n\r\n--" . $boundary . "--"; - set_error_handler(function() { error_log("Error sending mail"); }); if (!mail($address, $subject, $plainMessage . $htmlMessage, $headers)) { - restore_error_handler(); return false; } - restore_error_handler(); return true; } From 1986d006e954fa72ff2fac8fe21cb2bbd56a551e Mon Sep 17 00:00:00 2001 From: Eric Wasson <229096365+Eric-Wasson@users.noreply.github.com> Date: Wed, 18 Mar 2026 09:49:06 +0100 Subject: [PATCH 528/691] Moved display error handling to dockerfile --- Dockerfile | 5 +++-- ci/server/setup.php | 4 ---- src/api/v2/index.php | 2 +- src/inc/startup/include.php | 3 --- src/inc/startup/load.php | 3 --- src/inc/startup/setup.php | 3 --- 6 files changed, 4 insertions(+), 16 deletions(-) diff --git a/Dockerfile b/Dockerfile index 1190f91fa..a022084e2 100644 --- a/Dockerfile +++ b/Dockerfile @@ -123,7 +123,7 @@ RUN yes | pecl install xdebug && docker-php-ext-enable xdebug \ \ # Configuring PHP \ && touch "/usr/local/etc/php/conf.d/custom.ini" \ - && echo "display_errors = on" >> /usr/local/etc/php/conf.d/custom.ini \ + && echo "display_errors = 1" >> /usr/local/etc/php/conf.d/custom.ini \ && echo "memory_limit = 256m" >> /usr/local/etc/php/conf.d/custom.ini \ && echo "upload_max_filesize = 256m" >> /usr/local/etc/php/conf.d/custom.ini \ && echo "max_execution_time = 60" >> /usr/local/etc/php/conf.d/custom.ini \ @@ -164,7 +164,8 @@ RUN mv "$PHP_INI_DIR/php.ini-production" "$PHP_INI_DIR/php.ini" \ && touch "/usr/local/etc/php/conf.d/custom.ini" \ && echo "memory_limit = 256m" >> /usr/local/etc/php/conf.d/custom.ini \ && echo "upload_max_filesize = 256m" >> /usr/local/etc/php/conf.d/custom.ini \ - && echo "max_execution_time = 60" >> /usr/local/etc/php/conf.d/custom.ini + && echo "max_execution_time = 60" >> /usr/local/etc/php/conf.d/custom.ini \ + && echo "display_errors = 0" >> /usr/local/etc/php/conf.d/custom.ini USER www-data # ----END---- diff --git a/ci/server/setup.php b/ci/server/setup.php index 46c93037a..8eb4b7911 100644 --- a/ci/server/setup.php +++ b/ci/server/setup.php @@ -38,7 +38,3 @@ fwrite(STDERR, "Failed to initialize database: " . $e->getMessage()); exit(-1); } - -$load = file_get_contents($envPath . "src/inc/startup/load.php"); -$load = str_replace('ini_set("display_errors", "0");', 'ini_set("display_errors", "1");', $load); -file_put_contents($envPath . "src/inc/startup/load.php", $load); diff --git a/src/api/v2/index.php b/src/api/v2/index.php index 146322d94..6aed83be9 100644 --- a/src/api/v2/index.php +++ b/src/api/v2/index.php @@ -8,7 +8,7 @@ date_default_timezone_set("UTC"); error_reporting(E_ALL ^ E_DEPRECATED); -ini_set("display_errors", '1'); + /** * Treat warnings as error, very useful during unit testing. * TODO: How-ever during Xdebug debugging under VS Code, this is very diff --git a/src/inc/startup/include.php b/src/inc/startup/include.php index 807b492d5..71bd49b74 100755 --- a/src/inc/startup/include.php +++ b/src/inc/startup/include.php @@ -1,10 +1,7 @@ Date: Wed, 18 Mar 2026 10:55:32 +0100 Subject: [PATCH 529/691] Fixed faq and tests --- doc/faq_tips/faq.md | 3 ++- src/inc/Util.php | 3 +++ 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/doc/faq_tips/faq.md b/doc/faq_tips/faq.md index ce50884fc..110d4b560 100644 --- a/doc/faq_tips/faq.md +++ b/doc/faq_tips/faq.md @@ -303,7 +303,7 @@ If there is enough RAM available, it is possible to raise PHP's memory limit in 1. **Create a file `custom.ini` next to your `docker-compose.yml`** Adjust your desired memory limit (`M` for Megabytes, or `G` for Gigabytes). - The other two values are optional to adjust, but need to remain in there, as otherwise they are overwritten with the new `custom.ini` not containing them. + The other three values are optional to adjust, but need to remain in there, as otherwise they are overwritten with the new `custom.ini` not containing them. ```ini @@ -311,6 +311,7 @@ If there is enough RAM available, it is possible to raise PHP's memory limit in memory_limit = 256M upload_max_filesize = 256M max_execution_time = 60 +display_errors = 0 ``` diff --git a/src/inc/Util.php b/src/inc/Util.php index cd3c8c2ad..4b1aef543 100755 --- a/src/inc/Util.php +++ b/src/inc/Util.php @@ -1385,9 +1385,12 @@ public static function sendMail($address, $subject, $text, $plaintext) { $htmlMessage .= $text; $htmlMessage .= "\r\n\r\n--" . $boundary . "--"; + set_error_handler(function() { error_log("Error sending mail"); }); if (!mail($address, $subject, $plainMessage . $htmlMessage, $headers)) { + restore_error_handler(); return false; } + restore_error_handler(); return true; } From 13939cbcbf379ef0d388bab12fc07715f288c0c4 Mon Sep 17 00:00:00 2001 From: Eric Wasson <229096365+Eric-Wasson@users.noreply.github.com> Date: Wed, 18 Mar 2026 11:29:54 +0100 Subject: [PATCH 530/691] Fixed array error --- src/inc/apiv2/common/AbstractModelAPI.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/inc/apiv2/common/AbstractModelAPI.php b/src/inc/apiv2/common/AbstractModelAPI.php index 5d15a0754..eebe9120b 100644 --- a/src/inc/apiv2/common/AbstractModelAPI.php +++ b/src/inc/apiv2/common/AbstractModelAPI.php @@ -730,7 +730,7 @@ public static function getManyResources(object $apiClass, Request $request, Resp $primary_cursor_key = key($primary_cursor); // Special filtering of id to use for uniform access to model primary key $primary_cursor_key = $primary_cursor_key == 'id' ? array_column($aliasedfeatures, 'alias', 'dbname')[$apiClass->getPrimaryKey()] : $primary_cursor_key; - $secondary_cursor = $decoded_cursor["secondary"]; + $secondary_cursor = array_key_exists("secondary", $decoded_cursor) ? $decoded_cursor["secondary"] : null; if ($secondary_cursor) { $secondary_cursor_key = key($secondary_cursor); $secondary_cursor_key = $secondary_cursor_key == '_id' ? array_column($aliasedfeatures, 'alias', 'dbname')[$apiClass->getPrimaryKey()] : $secondary_cursor_key; From 244b62b062e947bf784cd91d53e9df3ab0aeb835 Mon Sep 17 00:00:00 2001 From: Eric Wasson <229096365+Eric-Wasson@users.noreply.github.com> Date: Tue, 19 May 2026 08:56:11 +0200 Subject: [PATCH 531/691] Removed mail error handling --- src/inc/Util.php | 3 --- 1 file changed, 3 deletions(-) diff --git a/src/inc/Util.php b/src/inc/Util.php index 4b1aef543..cd3c8c2ad 100755 --- a/src/inc/Util.php +++ b/src/inc/Util.php @@ -1385,12 +1385,9 @@ public static function sendMail($address, $subject, $text, $plaintext) { $htmlMessage .= $text; $htmlMessage .= "\r\n\r\n--" . $boundary . "--"; - set_error_handler(function() { error_log("Error sending mail"); }); if (!mail($address, $subject, $plainMessage . $htmlMessage, $headers)) { - restore_error_handler(); return false; } - restore_error_handler(); return true; } From 3d38d33d51b8cea68086dd88cbfd16b9bae1f37b Mon Sep 17 00:00:00 2001 From: Sein Coray Date: Tue, 19 May 2026 09:51:39 +0200 Subject: [PATCH 532/691] Change PostgreSQL data volume path in Docker Compose This got forgotten on the change to postgres 18. --- docker-compose.postgres.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docker-compose.postgres.yml b/docker-compose.postgres.yml index b509e4396..47c00031f 100644 --- a/docker-compose.postgres.yml +++ b/docker-compose.postgres.yml @@ -28,7 +28,7 @@ services: image: postgres:18 restart: always volumes: - - db:/var/lib/postgresql/data + - db:/var/lib/postgresql environment: POSTGRES_DB: $POSTGRES_DATABASE POSTGRES_USER: $POSTGRES_USER From bca43684ec716d6e0d31400090d57dc4f0412e96 Mon Sep 17 00:00:00 2001 From: Eric Wasson <229096365+Eric-Wasson@users.noreply.github.com> Date: Tue, 19 May 2026 13:07:32 +0200 Subject: [PATCH 533/691] Fixed float cast warnings on the old UI for dev builds --- Dockerfile | 2 +- src/inc/Encryption.php | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/Dockerfile b/Dockerfile index 84fc05343..12597d89f 100644 --- a/Dockerfile +++ b/Dockerfile @@ -51,7 +51,7 @@ RUN apt-get update \ && apt-get -y install ssmtp \ \ # Install extensions (optional) - && docker-php-ext-install pdo_mysql pgsql pdo_pgsql gd \ + && docker-php-ext-install pdo_mysql pgsql pdo_pgsql gd bcmath \ \ # Install Composer && curl -sS https://getcomposer.org/installer | php \ diff --git a/src/inc/Encryption.php b/src/inc/Encryption.php index fc32e077a..be0179cb7 100755 --- a/src/inc/Encryption.php +++ b/src/inc/Encryption.php @@ -93,7 +93,7 @@ public static function passwordVerify($password, $salt, $hash) { private static function getCount($string, $mincycles = 3000, $maxcycles = 5000) { $count = 0; for ($x = 0; $x < strlen($string); $x++) { - $count += $x * ord($string[$x]) * pow($x, 15); + $count += $x * ord($string[$x]) * bcpowmod($x, 15, 10000); $count = $count % 10000; } return $count % $maxcycles + $mincycles; From d382243cd3096ed91b62a43a34c04f6eff3b6bf7 Mon Sep 17 00:00:00 2001 From: Sein Coray Date: Tue, 19 May 2026 13:48:28 +0200 Subject: [PATCH 534/691] Phpunit Tests refactoring (#2091) * restructured namespaces to be psr-4 compatible and moved mocks to root dir of test sources * rewrite of the testbase class to allow some support in cleaning up database objects --- ci/phpunit/TestBase.php | 56 +++++++++ ci/phpunit/{inc => }/TestMocks.php | 14 +++ ci/phpunit/dba/AbstractModelFactoryTest.php | 21 ++-- ci/phpunit/inc/UtilTest.php | 91 +++++++-------- .../HashtopolisNotificationEmailTest.php | 21 +--- ci/phpunit/inc/utils/UserUtilsTest.php | 106 +++++------------- 6 files changed, 157 insertions(+), 152 deletions(-) create mode 100644 ci/phpunit/TestBase.php rename ci/phpunit/{inc => }/TestMocks.php (85%) diff --git a/ci/phpunit/TestBase.php b/ci/phpunit/TestBase.php new file mode 100644 index 000000000..a2fa4e465 --- /dev/null +++ b/ci/phpunit/TestBase.php @@ -0,0 +1,56 @@ +databaseObjects = []; + $this->adminUser = new User(1, 'admin', 'admin@example.com', 'hash', 'salt', 1, 0, 0, time(), 3600, 1, '', '', '', '', ''); + + \hashtopolis_clear_test_mocks(); + } + + protected function tearDown(): void { + \hashtopolis_clear_test_mocks(); + + $numObjects = sizeof($this->databaseObjects); + for ($i = $numObjects - 1; $i >= 0; $i--) { + $factory = $this->databaseObjects[$i]["factory"]; + $object = $this->databaseObjects[$i]["object"]; + // we cover special complex objects here and just use utils functions for these to avoid too complex dependency problems on deletion + if ($factory instanceof UserFactory) { + UserUtils::deleteUser($object->getId(), $this->adminUser); + } + else { + $factory->delete($object); + } + } + + parent::tearDown(); + } + + public function createDatabaseObject(AbstractModelFactory $factory, AbstractModel $obj): AbstractModel { + $obj = $factory->save($obj); + $this->registerDatabaseObject($factory, $obj); + return $obj; + } + + public function registerDatabaseObject(AbstractModelFactory $factory, AbstractModel $obj): void { + $this->databaseObjects[] = ["factory" => $factory, "object" => $obj]; + } +} diff --git a/ci/phpunit/inc/TestMocks.php b/ci/phpunit/TestMocks.php similarity index 85% rename from ci/phpunit/inc/TestMocks.php rename to ci/phpunit/TestMocks.php index c1ff3e4f5..554bf4f31 100644 --- a/ci/phpunit/inc/TestMocks.php +++ b/ci/phpunit/TestMocks.php @@ -1,5 +1,19 @@ name = $name; + } + + public function render($data): string { + return $this->name . ':' . json_encode($data); + } + } +} + namespace { function hashtopolis_set_test_mock(string $name, callable $mock): void { $GLOBALS['hashtopolis_test_mocks'][$name] = $mock; diff --git a/ci/phpunit/dba/AbstractModelFactoryTest.php b/ci/phpunit/dba/AbstractModelFactoryTest.php index 44e431485..91a98e232 100644 --- a/ci/phpunit/dba/AbstractModelFactoryTest.php +++ b/ci/phpunit/dba/AbstractModelFactoryTest.php @@ -1,21 +1,20 @@ getId(), "", 0, 0, 0); - $hashlist_2 = new Hashlist(null, "hashlist 2", DHashlistFormat::PLAIN, 0, 0, ':', 0, 0, 0, 1, AccessUtils::getOrCreateDefaultAccessGroup()->getId(), "", 0, 0, 0); - $hashlist_3 = new Hashlist(null, "hashlist 3", DHashlistFormat::PLAIN, 0, 0, ':', 0, 0, 0, 0, AccessUtils::getOrCreateDefaultAccessGroup()->getId(), "", 0, 0, 0); - $hashlist_1 = Factory::getHashlistFactory()->save($hashlist_1); - $hashlist_2 = Factory::getHashlistFactory()->save($hashlist_2); - $hashlist_3 = Factory::getHashlistFactory()->save($hashlist_3); + $hashlist_1 = $this->createDatabaseObject(Factory::getHashlistFactory(), new Hashlist(null, "hashlist 1", DHashlistFormat::PLAIN, 0, 0, ':', 0, 0, 0, 0, AccessUtils::getOrCreateDefaultAccessGroup()->getId(), "", 0, 0, 0)); + $this->createDatabaseObject(Factory::getHashlistFactory(), new Hashlist(null, "hashlist 2", DHashlistFormat::PLAIN, 0, 0, ':', 0, 0, 0, 1, AccessUtils::getOrCreateDefaultAccessGroup()->getId(), "", 0, 0, 0)); + $hashlist_3 = $this->createDatabaseObject(Factory::getHashlistFactory(), new Hashlist(null, "hashlist 3", DHashlistFormat::PLAIN, 0, 0, ':', 0, 0, 0, 0, AccessUtils::getOrCreateDefaultAccessGroup()->getId(), "", 0, 0, 0)); $oF = new OrderFilter(Hashlist::HASHLIST_ID, "ASC"); @@ -67,8 +63,5 @@ public function testColumnFilter(): void { $qF = new QueryFilter(Hashlist::CRACKED, 0, ">"); $ids = Factory::getHashlistFactory()->columnFilter([Factory::FILTER => $qF, Factory::ORDER => $oF], Hashlist::HASHLIST_ID); $this->assertSame([], $ids); - - // clean up - Factory::getHashlistFactory()->massDeletion([Factory::FILTER => new ContainFilter(Hashlist::HASHLIST_ID, [$hashlist_1->getId(), $hashlist_2->getId(), $hashlist_3->getId()])]); } } diff --git a/ci/phpunit/inc/UtilTest.php b/ci/phpunit/inc/UtilTest.php index b6aa20bcb..6b6245d78 100644 --- a/ci/phpunit/inc/UtilTest.php +++ b/ci/phpunit/inc/UtilTest.php @@ -1,51 +1,52 @@ assertFalse(Util::isMailConfigured()); - } - finally { - \hashtopolis_clear_test_mocks(['Hashtopolis\\inc\\is_file']); - } +namespace inc; + +use Hashtopolis\inc\Util; +use PHPUnit\Framework\TestCase; + +require_once(dirname(__FILE__) . '/../TestMocks.php'); +require_once(dirname(__FILE__) . '/../../../src/inc/startup/include.php'); + +final class UtilTest extends TestCase { + public function testIsMailConfiguredReturnsFalseWithoutSsmtpConfig(): void { + \hashtopolis_set_test_mock('Hashtopolis\\inc\\is_file', static function ($path): bool { + return false; + }); + + try { + $this->assertFalse(Util::isMailConfigured()); } - - public function testIsMailConfiguredReturnsTrueWithSsmtpConfig(): void { - \hashtopolis_set_test_mock('Hashtopolis\\inc\\is_file', static function ($path): bool { - return true; - }); - - try { - $this->assertTrue(Util::isMailConfigured()); - } - finally { - \hashtopolis_clear_test_mocks(['Hashtopolis\\inc\\is_file']); - } + finally { + \hashtopolis_clear_test_mocks(['Hashtopolis\\inc\\is_file']); } - - public function testSendMailReturnsFalseWhenMailIsNotConfigured(): void { - $loggedMessage = null; - \hashtopolis_set_test_mock('Hashtopolis\\inc\\is_file', static function ($path): bool { - return false; - }); - - try { - $this->assertFalse(Util::sendMail('user@example.com', 'subject', '

    body

    ', 'body')); - } - finally { - \hashtopolis_clear_test_mocks(['Hashtopolis\\inc\\is_file']); - } + } + + public function testIsMailConfiguredReturnsTrueWithSsmtpConfig(): void { + \hashtopolis_set_test_mock('Hashtopolis\\inc\\is_file', static function ($path): bool { + return true; + }); + + try { + $this->assertTrue(Util::isMailConfigured()); + } + finally { + \hashtopolis_clear_test_mocks(['Hashtopolis\\inc\\is_file']); + } + } + + public function testSendMailReturnsFalseWhenMailIsNotConfigured(): void { + $loggedMessage = null; + \hashtopolis_set_test_mock('Hashtopolis\\inc\\is_file', static function ($path): bool { + return false; + }); + + try { + $this->assertFalse(Util::sendMail('user@example.com', 'subject', '

    body

    ', 'body')); } - } + finally { + \hashtopolis_clear_test_mocks(['Hashtopolis\\inc\\is_file']); + } + } } + diff --git a/ci/phpunit/inc/notifications/HashtopolisNotificationEmailTest.php b/ci/phpunit/inc/notifications/HashtopolisNotificationEmailTest.php index 4965b28dc..f94e6ebd2 100644 --- a/ci/phpunit/inc/notifications/HashtopolisNotificationEmailTest.php +++ b/ci/phpunit/inc/notifications/HashtopolisNotificationEmailTest.php @@ -1,25 +1,14 @@ name = $name; - } - - public function render($data): string { - return $this->name . ':' . json_encode($data); - } - } -} - -namespace Tests\Inc\Utils { +namespace inc\utils; use Hashtopolis\dba\Factory; -use Hashtopolis\dba\QueryFilter; -use Hashtopolis\dba\models\AccessGroupUser; use Hashtopolis\dba\models\RightGroup; use Hashtopolis\dba\models\User; +use Hashtopolis\dba\QueryFilter; use Hashtopolis\inc\utils\UserUtils; use Hashtopolis\inc\apiv2\error\InternalError; -use PHPUnit\Framework\TestCase; +use TestBase; -require_once(dirname(__FILE__) . '/../TestMocks.php'); +require_once(dirname(__FILE__) . '/../../TestBase.php'); require_once(dirname(__FILE__) . '/../../../../src/inc/startup/include.php'); -final class UserUtilsTest extends TestCase { - /** @var string[] */ - private array $createdUsernames = []; - - /** @var int[] */ - private array $createdRightGroupIds = []; - +final class UserUtilsTest extends TestBase { protected function setUp(): void { parent::setUp(); - + $_SERVER['HTTP_HOST'] = $_SERVER['HTTP_HOST'] ?? 'localhost'; $_SERVER['SERVER_PORT'] = $_SERVER['SERVER_PORT'] ?? 80; \hashtopolis_clear_test_mocks(); } - - protected function tearDown(): void { - foreach ($this->createdUsernames as $username) { - $qF = new QueryFilter(User::USERNAME, $username, '='); - $users = Factory::getUserFactory()->filter([Factory::FILTER => $qF]); - foreach ($users as $user) { - $memberFilter = new QueryFilter(AccessGroupUser::USER_ID, $user->getId(), '='); - Factory::getAccessGroupUserFactory()->massDeletion([Factory::FILTER => $memberFilter]); - Factory::getUserFactory()->delete($user); - } - } - - foreach ($this->createdRightGroupIds as $rightGroupId) { - $group = Factory::getRightGroupFactory()->get($rightGroupId); - if ($group !== null) { - Factory::getRightGroupFactory()->delete($group); - } - } - - \hashtopolis_clear_test_mocks(); - - parent::tearDown(); - } - + public function testCreateUserDoesNotCallSendMailWhenMailIsNotConfigured(): void { $mailCallCount = 0; $username = $this->uniqueUsername('mail_disabled'); - + \hashtopolis_set_test_mock('Hashtopolis\\inc\\is_file', static function ($path): bool { return false; }); @@ -77,18 +33,18 @@ public function testCreateUserDoesNotCallSendMailWhenMailIsNotConfigured(): void $mailCallCount++; return true; }); - - $createdUser = UserUtils::createUser($username, $username . '@example.com', $this->createRightGroup()->getId(), $this->createAdminUser()); - $this->createdUsernames[] = $username; - + + $createdUser = UserUtils::createUser($username, $username . '@example.com', $this->createRightGroup()->getId(), $this->adminUser); + $this->registerDatabaseObject(Factory::getUserFactory(), $createdUser); + $this->assertSame($username, $createdUser->getUsername()); $this->assertSame(0, $mailCallCount); } - + public function testCreateUserCallsSendMailWhenMailIsConfigured(): void { $mailCalls = []; $username = $this->uniqueUsername('mail_enabled'); - + \hashtopolis_set_test_mock('Hashtopolis\\inc\\is_file', static function ($path): bool { return true; }); @@ -96,19 +52,19 @@ public function testCreateUserCallsSendMailWhenMailIsConfigured(): void { $mailCalls[] = [$to, $subject, $message, $additionalHeaders, $additionalParams]; return true; }); - - UserUtils::createUser($username, $username . '@example.com', $this->createRightGroup()->getId(), $this->createAdminUser()); - $this->createdUsernames[] = $username; - + + $createdUser = UserUtils::createUser($username, $username . '@example.com', $this->createRightGroup()->getId(), $this->adminUser); + $this->registerDatabaseObject(Factory::getUserFactory(), $createdUser); + $this->assertCount(1, $mailCalls); $this->assertSame($username . '@example.com', $mailCalls[0][0]); $this->assertSame('Account at ' . APP_NAME, $mailCalls[0][1]); } - + public function testCreateUserThrowsWhenConfiguredSendMailFails(): void { $mailCallCount = 0; $username = $this->uniqueUsername('mail_failure'); - + \hashtopolis_set_test_mock('Hashtopolis\\inc\\is_file', static function ($path): bool { return true; }); @@ -116,29 +72,25 @@ public function testCreateUserThrowsWhenConfiguredSendMailFails(): void { $mailCallCount++; return false; }); - - $this->createdUsernames[] = $username; $this->expectException(InternalError::class); try { - UserUtils::createUser($username, $username . '@example.com', $this->createRightGroup()->getId(), $this->createAdminUser()); - } finally { + $createdUser = UserUtils::createUser($username, $username . '@example.com', $this->createRightGroup()->getId(), $this->adminUser); + $this->registerDatabaseObject(Factory::getUserFactory(), $createdUser); + } + finally { $this->assertSame(1, $mailCallCount); + $this->registerDatabaseObject(Factory::getUserFactory(), Factory::getUserFactory()->filter([Factory::FILTER => new QueryFilter(User::USERNAME, $username, "=")], true)); } } - - private function createAdminUser(): User { - return new User(1, 'admin', 'admin@example.com', 'hash', 'salt', 1, 0, 0, time(), 3600, 1, '', '', '', '', ''); - } - + private function createRightGroup(): RightGroup { - $group = Factory::getRightGroupFactory()->save(new RightGroup(null, 'phpunit-' . uniqid('', true), '[]')); - $this->createdRightGroupIds[] = $group->getId(); + $group = $this->createDatabaseObject(Factory::getRightGroupFactory(), new RightGroup(null, 'phpunit-' . uniqid('', true), '[]')); + $this->assertTrue($group instanceof RightGroup); return $group; } - + private function uniqueUsername(string $prefix): string { return $prefix . '_' . uniqid(); } } -} From 189f587c691bb1dc9a0e36e7b5d60a58bac42609 Mon Sep 17 00:00:00 2001 From: jessevz Date: Wed, 20 May 2026 09:03:38 +0200 Subject: [PATCH 535/691] added estimated time, timepsent, currentspeed and currentprogress to taskwrapper display --- src/inc/apiv2/model/TaskWrapperDisplayAPI.php | 55 +++++++++++++++++++ 1 file changed, 55 insertions(+) diff --git a/src/inc/apiv2/model/TaskWrapperDisplayAPI.php b/src/inc/apiv2/model/TaskWrapperDisplayAPI.php index 5fe477678..731318657 100644 --- a/src/inc/apiv2/model/TaskWrapperDisplayAPI.php +++ b/src/inc/apiv2/model/TaskWrapperDisplayAPI.php @@ -15,7 +15,9 @@ use Hashtopolis\dba\QueryFilter; use Hashtopolis\inc\apiv2\common\AbstractModelAPI; use Hashtopolis\inc\apiv2\error\HttpError; +use Hashtopolis\inc\defines\DConfig; use Hashtopolis\inc\defines\DTaskTypes; +use Hashtopolis\inc\SConfig; use Hashtopolis\inc\Util; use Hashtopolis\inc\utils\TaskUtils; @@ -88,7 +90,60 @@ function aggregateData(object $object, array &$included_data = [], ?array $aggre $status = 2; } } + $aggregatedData['status'] = $status; + + $keyspace = $object->getKeyspace(); + $keyspaceProgress = $object->getKeyspaceProgress(); + + if ($object->getTaskType() === DTaskTypes::NORMAL) { + if (is_null($aggregateFieldsets) || in_array("dispatched", $aggregateFieldsets['taskwrapperdisplay'])) { + $aggregatedData["dispatched"] = Util::showperc($keyspaceProgress, $keyspace); + } + + if (is_null($aggregateFieldsets) || in_array("searched", $aggregateFieldsets['taskwrapperdisplay'])) { + $aggregatedData["searched"] = Util::showperc(TaskUtils::getTaskProgress($object), $keyspace); + } + + if (!isset($chunks)){ + $qF = new QueryFilter(Chunk::TASK_ID, $object->getId(), "="); + $chunks = Factory::getChunkFactory()->filter([Factory::FILTER => $qF]); + } + + if (is_null($aggregateFieldsets) || in_array("taskExtraDetails", $aggregateFieldsets['taskwrapperdisplay'])) { + $currentSpeed = 0; + $cProgress = 0; + + foreach ($chunks as $chunk) { + $cProgress += $chunk->getCheckpoint() - $chunk->getSkip(); + if (time() - max($chunk->getSolveTime(), $chunk->getDispatchTime()) < SConfig::getInstance()->getVal(DConfig::CHUNK_TIMEOUT) && $chunk->getProgress() < 10000) { + $currentSpeed += $chunk->getSpeed(); + } + } + $timeChunks = $chunks; + usort($timeChunks, ["Hashtopolis\inc\Util", "compareChunksTime"]); + $timeSpent = 0; + $current = 0; + + foreach ($timeChunks as $c) { + if ($c->getDispatchTime() > $current) { + $timeSpent += $c->getSolveTime() - $c->getDispatchTime(); + $current = $c->getSolveTime(); + } + else if ($c->getSolveTime() > $current) { + $timeSpent += $c->getSolveTime() - $current; + $current = $c->getSolveTime(); + } + } + + $keyspace = $object->getKeyspace(); + $estimatedTime = ($keyspace > 0 && $cProgress > 0) ? round($timeSpent / ($cProgress / $keyspace) - $timeSpent) : 0; + $aggregatedData["estimatedTime"] = $estimatedTime; + $aggregatedData["timeSpent"] = $timeSpent; + $aggregatedData["currentSpeed"] = $currentSpeed; + $aggregatedData["cprogress"] = $cProgress; + } + } } return $aggregatedData; } From a74da8185d656ec0f4d5e5a616fbe2d0d9dfe050 Mon Sep 17 00:00:00 2001 From: Inadequate Immortal jellyfish Date: Wed, 20 May 2026 09:11:13 +0200 Subject: [PATCH 536/691] 2074 bug chunk count missing on task details and percentage sign missing (#2099) * added chunk count --- ci/apiv2/test_task.py | 16 ++++++++++++++++ src/inc/apiv2/model/TaskAPI.php | 5 ++++- 2 files changed, 20 insertions(+), 1 deletion(-) diff --git a/ci/apiv2/test_task.py b/ci/apiv2/test_task.py index cf0463143..00c50b9d3 100644 --- a/ci/apiv2/test_task.py +++ b/ci/apiv2/test_task.py @@ -1,10 +1,22 @@ from hashtopolis import Task, TaskWrapper from utils import BaseTest +from hashtopolis_agent import ProcessState class TaskTest(BaseTest): model_class = Task + def create_test_agent_object(self, *nargs, delete=True, **kwargs): + retval = self.create_agent_with_task(*nargs, **kwargs) + dummy_agent = retval['dummy_agent'] + # add two more chunks to the task, so that we have more than one chunk to test with + dummy_agent.send_process(progress=100, state=ProcessState.EXHAUSTED) + dummy_agent.get_chunk() + dummy_agent.send_process(progress=50) + dummy_agent.send_process(progress=100, state=ProcessState.EXHAUSTED) + dummy_agent.get_chunk() + return Task.objects.get(taskId=retval['task'].id) + def create_test_object(self, **kwargs): hashlist_kwargs = kwargs.copy() hashlist_kwargs['file_id'] = kwargs.get('hashlist_file_id', '001') @@ -26,6 +38,10 @@ def test_patch(self): model_obj = self.create_test_object() self._test_patch(model_obj, 'taskName') + def test_number_of_chunks(self): + task_containing_chunks = self.create_test_agent_object() + self.assertEqual(task_containing_chunks.totalNumberOfChunks, 3) + def test_patch_color_null(self): task = self.create_test_object() diff --git a/src/inc/apiv2/model/TaskAPI.php b/src/inc/apiv2/model/TaskAPI.php index f78b2a9e5..124cfa495 100644 --- a/src/inc/apiv2/model/TaskAPI.php +++ b/src/inc/apiv2/model/TaskAPI.php @@ -214,7 +214,10 @@ function aggregateData(object $object, array &$included_data = [], ?array $aggre $chunks = Factory::getChunkFactory()->filter([Factory::FILTER => $qF]); $aggregatedData["status"] = TaskUtils::getStatus($chunks, $keyspace, $keyspaceProgress); } - + if (is_null($aggregateFieldsets) || in_array("totalNumberOfChunks", $aggregateFieldsets['task'])) { + $qF = new QueryFilter(Chunk::TASK_ID, $object->getId(), "="); + $aggregatedData["totalNumberOfChunks"] = Factory::getChunkFactory()->countFilter([Factory::FILTER => $qF]); + } if (is_null($aggregateFieldsets) || in_array("taskExtraDetails", $aggregateFieldsets['task'])) { $qF = new QueryFilter(Chunk::TASK_ID, $object->getId(), "="); if (!isset($chunks)){ From 23834e58c740cf0e70246c63dcfdaf86f9eda33e Mon Sep 17 00:00:00 2001 From: Eric Wasson <229096365+Eric-Wasson@users.noreply.github.com> Date: Wed, 20 May 2026 09:16:16 +0200 Subject: [PATCH 537/691] Added phpunit tests for CORS --- .../inc/apiv2/util/CorsHackMiddlewareTest.php | 184 ++++++++++++++++++ src/inc/apiv2/util/CorsHackMiddleware.php | 29 +-- 2 files changed, 202 insertions(+), 11 deletions(-) create mode 100644 ci/phpunit/inc/apiv2/util/CorsHackMiddlewareTest.php diff --git a/ci/phpunit/inc/apiv2/util/CorsHackMiddlewareTest.php b/ci/phpunit/inc/apiv2/util/CorsHackMiddlewareTest.php new file mode 100644 index 000000000..f8b03ac8f --- /dev/null +++ b/ci/phpunit/inc/apiv2/util/CorsHackMiddlewareTest.php @@ -0,0 +1,184 @@ +http_origin = $headerLine; + } + + public function getHeaderLine($headerLine): string { + return $this->http_origin; + } +} + +final class CorsHackMiddlewareTest extends TestCase { + /** + * Tests all possible valid localhost variations with different ports. + * + * @return void + */ + public function testValidLocalhostVariations(): void { + $this->expectNotToPerformAssertions(); + + putenv("HASHTOPOLIS_BACKEND_URL=http://localhost:8080/api/v2"); + putenv("HASHTOPOLIS_FRONTEND_PORT=4200"); + + $app = AppFactory::create(); + + $request = new DummyRequest(); + + $response = $app->getResponseFactory()->createResponse(); + + $request->setHeaderLine("http://127.0.0.1:4200"); + CorsHackMiddleware::CheckCORS($request, $response); + + $request->setHeaderLine("http://localhost:4200"); + CorsHackMiddleware::CheckCORS($request, $response); + + $request->setHeaderLine("http://[::1]:4200"); + CorsHackMiddleware::CheckCORS($request, $response); + + $request->setHeaderLine("http://127.0.0.1:8080"); + CorsHackMiddleware::CheckCORS($request, $response); + + $request->setHeaderLine("http://localhost:8080"); + CorsHackMiddleware::CheckCORS($request, $response); + + $request->setHeaderLine("http://[::1]:8080"); + CorsHackMiddleware::CheckCORS($request, $response); + + //Test the same but with https: + $request->setHeaderLine("https://127.0.0.1:4200"); + CorsHackMiddleware::CheckCORS($request, $response); + + $request->setHeaderLine("https://localhost:4200"); + CorsHackMiddleware::CheckCORS($request, $response); + + $request->setHeaderLine("https://[::1]:4200"); + CorsHackMiddleware::CheckCORS($request, $response); + + $request->setHeaderLine("https://127.0.0.1:8080"); + CorsHackMiddleware::CheckCORS($request, $response); + + $request->setHeaderLine("https://localhost:8080"); + CorsHackMiddleware::CheckCORS($request, $response); + + $request->setHeaderLine("https://[::1]:8080"); + CorsHackMiddleware::CheckCORS($request, $response); + } + + /** + * Tests an invalid origin port for localhost. + * + * @throws HttpForbidden + */ + public function testInvalidLocalhostPort(): void { + $this->expectException(HttpForbidden::class); + + putenv("HASHTOPOLIS_BACKEND_URL=http://localhost:8080/api/v2"); + putenv("HASHTOPOLIS_FRONTEND_PORT=4200"); + + $app = AppFactory::create(); + + $request = new DummyRequest(); + + $response = $app->getResponseFactory()->createResponse(); + + $request->setHeaderLine("http://127.0.0.1:4201"); + $this->expectException(CorsHackMiddleware::CheckCORS($request, $response)); + } + + /** + * Tests an evil origin making requests to localhost. + * + * @throws HttpForbidden + */ + public function testEvilDomainForLocalhost(): void { + $this->expectException(HttpForbidden::class); + + putenv("HASHTOPOLIS_BACKEND_URL=http://localhost:8080/api/v2"); + putenv("HASHTOPOLIS_FRONTEND_PORT=4200"); + + $app = AppFactory::create(); + + $request = new DummyRequest(); + + $response = $app->getResponseFactory()->createResponse(); + + $request->setHeaderLine("http://evil.com:4200"); + $this->expectException(CorsHackMiddleware::CheckCORS($request, $response)); + } + + /** + * Tests an evil ip address making requests to localhost. + * + * @throws HttpForbidden + */ + public function testEvilIPForLocalhost(): void { + $this->expectException(HttpForbidden::class); + + putenv("HASHTOPOLIS_BACKEND_URL=http://localhost:8080/api/v2"); + putenv("HASHTOPOLIS_FRONTEND_PORT=4200"); + + $app = AppFactory::create(); + + $request = new DummyRequest(); + + $response = $app->getResponseFactory()->createResponse(); + + $request->setHeaderLine("http://137.137.137.1:4200"); + $this->expectException(CorsHackMiddleware::CheckCORS($request, $response)); + } + + /** + * Tests an invalid origin port on a correct hashtopolis domain. + * + * @throws HttpForbidden + */ + public function testInvalidDomainPort(): void { + $this->expectException(HttpForbidden::class); + + putenv("HASHTOPOLIS_BACKEND_URL=http://hashtopolis-cluster.com:8080/api/v2"); + putenv("HASHTOPOLIS_FRONTEND_PORT=4200"); + + $app = AppFactory::create(); + + $request = new DummyRequest(); + + $response = $app->getResponseFactory()->createResponse(); + + $request->setHeaderLine("http://hashtopolis-cluster.com:4201"); + $this->expectException(CorsHackMiddleware::CheckCORS($request, $response)); + } +} diff --git a/src/inc/apiv2/util/CorsHackMiddleware.php b/src/inc/apiv2/util/CorsHackMiddleware.php index c9eb56f74..bb9bdfc31 100644 --- a/src/inc/apiv2/util/CorsHackMiddleware.php +++ b/src/inc/apiv2/util/CorsHackMiddleware.php @@ -9,12 +9,14 @@ use Slim\Psr7\Response; use Slim\Routing\RouteContext; +use Hashtopolis\inc\apiv2\error\HttpForbidden; + /* This middleware will append the response header Access-Control-Allow-Methods with all allowed methods */ class CorsHackMiddleware implements MiddlewareInterface { public function process(Request $request, RequestHandler $handler): Response { $response = $handler->handle($request); - return $this::addCORSHeaders($request, $response); + return CorsHackMiddleware::addCORSHeaders($request, $response); } public static function addCORSHeaders(Request $request, $response) { @@ -23,6 +25,18 @@ public static function addCORSHeaders(Request $request, $response) { $methods = $routingResults->getAllowedMethods(); $requestHeaders = $request->getHeaderLine('Access-Control-Request-Headers'); + + $response = CorsHackMiddleware::CheckCORS($request, $response); + + $response = $response->withHeader('Access-Control-Allow-Methods', implode(',', $methods)); + $response = $response->withHeader('Access-Control-Allow-Headers', $requestHeaders); + + // Optional: Allow Ajax CORS requests with Authorization header + // $response = $response->withHeader('Access-Control-Allow-Credentials', 'true'); + return $response; + } + + public static function CheckCORS($request, $response): Response { $requestHttpOrigin = $request->getHeaderLine('HTTP_ORIGIN'); $envBackend = getenv('HASHTOPOLIS_BACKEND_URL'); @@ -49,8 +63,7 @@ public static function addCORSHeaders(Request $request, $response) { $response = $response->withHeader('Access-Control-Allow-Origin', $request->getHeaderLine('HTTP_ORIGIN')); } else { - error_log("CORS error: Allow-Origin port doesn't match: the value from the request is {$requestHttpOriginPort} but expected {$envFrontendPort} or {$envBackendPort}. Try switching the frontend port back to the default value (4200) in the docker-compose."); - die(); + throw new HttpForbidden("CORS error: Allow-Origin port doesn't match: the value from the request is {$requestHttpOriginPort} but expected {$envFrontendPort} or {$envBackendPort}. Try switching the frontend port back to the default value (4200) in the docker-compose."); } } else { @@ -59,20 +72,14 @@ public static function addCORSHeaders(Request $request, $response) { } } else { - error_log("CORS error: Allow-Origin URL doesn't match: the value from the request is {$requestHttpOriginUrl} but expected {$envBackendUrl}. Is the HASHTOPOLIS_BACKEND_URL in the .env file the correct one?"); - die(); + throw new HttpForbidden("CORS error: Allow-Origin URL doesn't match: the value from the request is {$requestHttpOriginUrl} but expected {$envBackendUrl}. Is the HASHTOPOLIS_BACKEND_URL in the .env file the correct one?"); } } else { //No backend URL given in .env file or no origin supplied in the request, switch to default allow all $response = $response->withHeader('Access-Control-Allow-Origin', '*'); } - - $response = $response->withHeader('Access-Control-Allow-Methods', implode(',', $methods)); - $response = $response->withHeader('Access-Control-Allow-Headers', $requestHeaders); - - // Optional: Allow Ajax CORS requests with Authorization header - // $response = $response->withHeader('Access-Control-Allow-Credentials', 'true'); + return $response; } } \ No newline at end of file From 76747aaf65abe7b0ead83fa69db5f4c13b88cc51 Mon Sep 17 00:00:00 2001 From: Eric Wasson <229096365+Eric-Wasson@users.noreply.github.com> Date: Wed, 20 May 2026 09:27:58 +0200 Subject: [PATCH 538/691] small cleanups --- .../inc/apiv2/util/CorsHackMiddlewareTest.php | 23 ++----------------- 1 file changed, 2 insertions(+), 21 deletions(-) diff --git a/ci/phpunit/inc/apiv2/util/CorsHackMiddlewareTest.php b/ci/phpunit/inc/apiv2/util/CorsHackMiddlewareTest.php index f8b03ac8f..4b2e897a4 100644 --- a/ci/phpunit/inc/apiv2/util/CorsHackMiddlewareTest.php +++ b/ci/phpunit/inc/apiv2/util/CorsHackMiddlewareTest.php @@ -2,33 +2,14 @@ namespace Tests\inc\apiv2\util; -use Hashtopolis\dba\ContainFilter; -use Hashtopolis\dba\models\Hashlist; -use Hashtopolis\dba\OrderFilter; -use Hashtopolis\inc\defines\DHashlistFormat; -use Hashtopolis\inc\utils\AccessUtils; -use Hashtopolis\dba\Factory; -use Hashtopolis\dba\QueryFilter; -use Hashtopolis\dba\models\User; - +use PHPUnit\Framework\TestCase; use Exception; use Hashtopolis\inc\apiv2\error\HttpForbidden; -use PHPUnit\Framework\TestCase; use Slim\Factory\AppFactory; -use Hashtopolis\inc\apiv2\util\CorsHackMiddleware; - -use Psr\Http\Message\ServerRequestInterface as Request2; - use Slim\Psr7\Request; - -//Remove later: -use Psr\Http\Server\MiddlewareInterface; -use Psr\Http\Server\RequestHandlerInterface as RequestHandler; -use Slim\Psr7\Response; -use Slim\Routing\RouteContext; - +use Hashtopolis\inc\apiv2\util\CorsHackMiddleware; class DummyRequest { private string $http_origin; From 41ece2cbf276770dd0f4f805e5cf8b0efe7a32fb Mon Sep 17 00:00:00 2001 From: jessevz Date: Wed, 20 May 2026 09:29:20 +0200 Subject: [PATCH 539/691] 2019 enhancement backend endpoint for hash heatmap (#2068) * Added a backend helper for the cracks heathmap * moved timeseries filter into abstractmodelfactory and created unittest for it * fix inconsistency between generator and models --------- Co-authored-by: jessevz Co-authored-by: s3inlc --- ci/apiv2/test_cracks_per_day.py | 51 ++++++++++++ ci/phpunit/dba/AbstractModelFactoryTest.php | 63 ++++++++++++++ src/api/v2/index.php | 2 + src/dba/AbstractModelFactory.php | 31 +++++++ src/dba/models/generator.php | 2 +- .../apiv2/helper/GetCracksPerDayHelperAPI.php | 82 +++++++++++++++++++ 6 files changed, 230 insertions(+), 1 deletion(-) create mode 100644 ci/apiv2/test_cracks_per_day.py create mode 100644 src/inc/apiv2/helper/GetCracksPerDayHelperAPI.php diff --git a/ci/apiv2/test_cracks_per_day.py b/ci/apiv2/test_cracks_per_day.py new file mode 100644 index 000000000..7b64510a8 --- /dev/null +++ b/ci/apiv2/test_cracks_per_day.py @@ -0,0 +1,51 @@ +from datetime import date + +from hashtopolis import Hashlist, Helper +from utils import BaseTest + + +class CracksPerDayTest(BaseTest): + model_class = Hashlist + + def test_returns_dict(self): + helper = Helper() + result = helper.get_cracks_per_day() + self.assertIsInstance(result, dict) + + def test_keys_are_current_year(self): + hashlist = self.create_hashlist() + helper = Helper() + helper.import_cracked_hashes(hashlist, 'paste', 'cc03e747a6afbbcbf8be7668acfebee5:test123', ':', 0) + + result = helper.get_cracks_per_day() + current_year = str(date.today().year) + for key in result.keys(): + self.assertRegex(key, r'^\d{4}-\d{2}-\d{2}$', f"Key '{key}' is not in YYYY-MM-DD format") + self.assertTrue(key.startswith(current_year), f"Key '{key}' is not in the current year") + + def test_today_count_after_import(self): + hashlist = self.create_hashlist() + helper = Helper() + helper.import_cracked_hashes(hashlist, 'paste', 'cc03e747a6afbbcbf8be7668acfebee5:test123', ':', 0) + + result = helper.get_cracks_per_day() + today = date.today().strftime('%Y-%m-%d') + self.assertIn(today, result, f"Today's date '{today}' not found in result") + self.assertGreaterEqual(result[today], 1) + + def test_count_increases_with_more_cracks(self): + hashlist1 = self.create_hashlist() + hashlist2 = self.create_hashlist() + helper = Helper() + + result_before = helper.get_cracks_per_day() + today = date.today().strftime('%Y-%m-%d') + count_before = result_before.get(today, 0) + + helper.import_cracked_hashes(hashlist1, 'paste', 'cc03e747a6afbbcbf8be7668acfebee5:test123', ':', 0) + helper.import_cracked_hashes(hashlist2, 'paste', 'cc03e747a6afbbcbf8be7668acfebee5:test123', ':', 0) + + result_after = helper.get_cracks_per_day() + count_after = result_after.get(today, 0) + + self.assertEqual(count_after, count_before + 2) diff --git a/ci/phpunit/dba/AbstractModelFactoryTest.php b/ci/phpunit/dba/AbstractModelFactoryTest.php index 91a98e232..10528ece5 100644 --- a/ci/phpunit/dba/AbstractModelFactoryTest.php +++ b/ci/phpunit/dba/AbstractModelFactoryTest.php @@ -2,6 +2,8 @@ namespace dba; +use Hashtopolis\dba\models\Hash; +use Hashtopolis\inc\utils\AccessGroupUtils; use TestBase; use Hashtopolis\dba\models\Hashlist; use Hashtopolis\dba\OrderFilter; @@ -64,4 +66,65 @@ public function testColumnFilter(): void { $ids = Factory::getHashlistFactory()->columnFilter([Factory::FILTER => $qF, Factory::ORDER => $oF], Hashlist::HASHLIST_ID); $this->assertSame([], $ids); } + + public function testTimeseriesFilterEmpty(): void { + $counts = Factory::getHashFactory()->columnTimeseriesFilter([], Hash::TIME_CRACKED); + + $this->assertSame([], $counts); + } + + public function testTimeseriesFilterNoneCracked(): void { + $timeLimit = time() - 3600*24*30; // one month back + + $hashlist = $this->createDatabaseObject(Factory::getHashlistFactory(), new Hashlist(null, 'hashlist', DHashlistFormat::PLAIN, 0, 100, ':', 0, 0, 0, 0, 1, '', 0, 0, 0)); + $hashTemplate = new Hash(null, $hashlist->getId(), 'hash', 'salt', '', 0, null, 0, 0); + + for($i = 0; $i < 1000; $i++) { + $this->createDatabaseObject(Factory::getHashFactory(), clone $hashTemplate); + } + + $qF1 = new QueryFilter(Hash::IS_CRACKED, 1, "="); + $qF2 = new QueryFilter(Hash::TIME_CRACKED, $timeLimit, ">"); + $counts = Factory::getHashFactory()->columnTimeseriesFilter([Factory::FILTER => [$qF1, $qF2]], Hash::TIME_CRACKED); + + $this->assertSame([], $counts); + } + + public function testTimeseriesFilter(): void { + $timeLimit = time() - 3600*24*30; // one month back + + $hashlist = $this->createDatabaseObject(Factory::getHashlistFactory(), new Hashlist(null, 'hashlist', DHashlistFormat::PLAIN, 0, 100, ':', 0, 0, 0, 0, 1, '', 0, 0, 0)); + $hashTemplate = new Hash(null, $hashlist->getId(), 'hash', 'salt', 'plaintext', 0, null, 1, 0); + + $hashes = []; + for($i = 0, $j = 0; $i < 1000; $i++) { + $hash = clone $hashTemplate; + $hash->setTimeCracked($timeLimit + $i - 10 + $j * 3600 * 24); // 10 hashes will fall out of the tested timeseries range + $hash->setIsCracked(($i % 10) > 0); // every tenth hash is not cracked + $hashes[] = $this->createDatabaseObject(Factory::getHashFactory(), $hash); + if ($i % 23 == 0){ + $j++; + } + } + + $qF1 = new QueryFilter(Hash::IS_CRACKED, 1, "="); + $qF2 = new QueryFilter(Hash::TIME_CRACKED, $timeLimit, ">"); + $counts = Factory::getHashFactory()->columnTimeseriesFilter([Factory::FILTER => [$qF1, $qF2]], Hash::TIME_CRACKED); + + // build the array on our own to compare + $expected = []; + foreach($hashes as $hash) { + if($hash->getisCracked() != 1) { + continue; + } + $day = date('Y-m-d', $hash->getTimeCracked()); + if(!isset($expected[$day])){ + $expected[$day] = 0; + } + $expected[$day]++; + } + + $this->assertEquals(array_sum($expected), array_sum($counts)); + $this->assertSame($expected, $counts); + } } diff --git a/src/api/v2/index.php b/src/api/v2/index.php index 6aed83be9..4fde02e83 100644 --- a/src/api/v2/index.php +++ b/src/api/v2/index.php @@ -41,6 +41,7 @@ use Hashtopolis\inc\apiv2\helper\GetAccessGroupsHelperAPI; use Hashtopolis\inc\apiv2\helper\GetAgentBinaryHelperAPI; use Hashtopolis\inc\apiv2\helper\GetCracksOfTaskHelper; +use Hashtopolis\inc\apiv2\helper\GetCracksPerDayHelperAPI; use Hashtopolis\inc\apiv2\helper\GetBestTasksAgent; use Hashtopolis\inc\apiv2\helper\GetFileHelperAPI; use Hashtopolis\inc\apiv2\helper\GetTaskProgressImageHelperAPI; @@ -276,6 +277,7 @@ GetAgentBinaryHelperAPI::register($app); GetBestTasksAgent::register($app); GetCracksOfTaskHelper::register($app); +GetCracksPerDayHelperAPI::register($app); GetFileHelperAPI::register($app); GetTaskProgressImageHelperAPI::register($app); GetUserPermissionHelperAPI::register($app); diff --git a/src/dba/AbstractModelFactory.php b/src/dba/AbstractModelFactory.php index 1cb127854..4f9c89aed 100755 --- a/src/dba/AbstractModelFactory.php +++ b/src/dba/AbstractModelFactory.php @@ -506,6 +506,37 @@ public function sumFilter($options, $sumColumn) { return $row['sum']; } + /** + * Create a timeseries with counts per day for a given table. + * + * @param array $options can contain FILTER options to select which entries should match to be counted (e.g. also if the timeseries should only be over a certain amount of day) + * @param string $timeColumn table column which should be used to be use for the 'day' grouping + * @return array list of [day => count] entries + * @throws Exception + */ + public function columnTimeseriesFilter(array $options, string $timeColumn): array { + $dbType = StartupConfig::getInstance()->getDatabaseType(); + $to_timestamp = ($dbType == "postgres") ? "TO_TIMESTAMP" : "FROM_UNIXTIME"; + + $query = "SELECT DATE(" . $to_timestamp . "(". self::getMappedModelKey($this->getNullObject(), $timeColumn) . ")) AS day, COUNT(*) AS total"; + + $query .= " FROM ". $this->getMappedModelTable(); + + $vals = array(); + + if (array_key_exists(Factory::FILTER, $options)) { + $query .= $this->applyFilters($vals, $options[Factory::FILTER]); + } + + $query .= " GROUP BY day ORDER BY day"; + + $dbh = self::getDB(); + $stmt = $dbh->prepare($query); + $stmt->execute($vals); + + return $stmt->fetchAll(PDO::FETCH_GROUP|PDO::FETCH_KEY_PAIR); + } + public function countFilter($options) { $query = "SELECT COUNT(*) AS count "; $query = $query . " FROM " . $this->getMappedModelTable(); diff --git a/src/dba/models/generator.php b/src/dba/models/generator.php index 7724bb132..f8198f16e 100644 --- a/src/dba/models/generator.php +++ b/src/dba/models/generator.php @@ -180,7 +180,7 @@ 'columns' => [ ['name' => 'crackerBinaryTypeId', 'read_only' => True, 'type' => 'int', 'protected' => True], ['name' => 'typeName', 'read_only' => False, 'type' => 'str(30)'], - ['name' => 'isChunkingAvailable', 'read_only' => False, 'type' => 'bool'], + ['name' => 'isChunkingAvailable', 'read_only' => False, 'null' => True, 'type' => 'bool'], ], ]; $CONF['File'] = [ diff --git a/src/inc/apiv2/helper/GetCracksPerDayHelperAPI.php b/src/inc/apiv2/helper/GetCracksPerDayHelperAPI.php new file mode 100644 index 000000000..7c4580c69 --- /dev/null +++ b/src/inc/apiv2/helper/GetCracksPerDayHelperAPI.php @@ -0,0 +1,82 @@ + crack count for days with at least one crack from + * January 1st of the current year up to and including today. Days with no + * cracks are omitted from the response. + * @throws Exception + */ + public function handleGet(Request $request, Response $response): Response { + $this->preCommon($request); + + $yearStart = mktime(0, 0, 0, 1, 1, (int) date('Y')); + $qF1 = new QueryFilter(Hash::IS_CRACKED, 1, "="); + $qF2 = new QueryFilter(Hash::TIME_CRACKED, $yearStart, ">"); + $counts = Factory::getHashFactory()->columnTimeseriesFilter([Factory::FILTER => [$qF1, $qF2]], Hash::TIME_CRACKED); + $counts2 = Factory::getHashBinaryFactory()->columnTimeseriesFilter([Factory::FILTER => [$qF1, $qF2]], Hash::TIME_CRACKED); + foreach ($counts2 as $key => $value) { + $counts[$key] = ($counts[$key] ?? 0) + $value; + } + + $ret = self::createJsonResponse(meta: $counts); + if(empty($counts)) { + $ret["meta"] = new stdClass(); + } + + $body = $response->getBody(); + $body->write($this->ret2json($ret)); + + return $response->withStatus(200) + ->withHeader("Content-Type", 'application/vnd.api+json;'); + } + + public static function register($app): void { + $baseUri = self::getBaseUri(); + + $app->options($baseUri, function (Request $request, Response $response): Response { + return $response; + }); + $app->get($baseUri, self::class . ":handleGet"); + } +} From 41891b12d2fcf9063418ad2d2c5b3f22559c3c0f Mon Sep 17 00:00:00 2001 From: ObsidianOracle Date: Wed, 20 May 2026 09:34:32 +0200 Subject: [PATCH 540/691] reworked api reference --- doc/api.md | 81 +----------------------------------------------------- mkdocs.yml | 1 + 2 files changed, 2 insertions(+), 80 deletions(-) diff --git a/doc/api.md b/doc/api.md index a22c0cb52..2f3be094b 100644 --- a/doc/api.md +++ b/doc/api.md @@ -1,82 +1,3 @@ # API Reference -Note: We recommend the display in light mode, as the framework for API visualization only supports dark mode in a very cumbersome way. - -
    - - - + diff --git a/mkdocs.yml b/mkdocs.yml index 95abf97e8..40b76faae 100644 --- a/mkdocs.yml +++ b/mkdocs.yml @@ -77,6 +77,7 @@ extra: code: Fira Code plugins: + - swagger-ui-tag - search - minify: minify_html: true From 6e5fdeba52af73829742f0a98c46e990d9774503 Mon Sep 17 00:00:00 2001 From: Sein Coray Date: Wed, 20 May 2026 09:38:00 +0200 Subject: [PATCH 541/691] generating coverage report output on ci runs (#2102) * generating coverage report output on ci runs --- .github/workflows/ci.yml | 2 +- phpunit.xml | 17 +++++++++++++++++ 2 files changed, 18 insertions(+), 1 deletion(-) create mode 100644 phpunit.xml diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 73c4f46c7..94ccabb6b 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -28,7 +28,7 @@ jobs: - name: Give Apache permissions on necessary directories # for the tests, only src/files and src/inc/utils/locks seem necessary run: docker exec -u root hashtopolis-server-dev bash -c "chown -R www-data:www-data /var/www/html/src && chmod -R g+w /var/www/html/src" - name: PHPUnittest Run - run: docker exec -w /var/www/html/ hashtopolis-server-dev ./vendor/bin/phpunit ci/phpunit --display-warnings --display-deprecations + run: docker exec -w /var/www/html/ hashtopolis-server-dev php -d xdebug.mode=coverage ./vendor/bin/phpunit --coverage-text --display-warnings --display-deprecations ./ci/phpunit/ - name: Test with pytest run: docker exec -w /var/www/html/ci/apiv2 hashtopolis-server-dev pytest - name: Test if pytest is removing all test objects diff --git a/phpunit.xml b/phpunit.xml new file mode 100644 index 000000000..1f69f108e --- /dev/null +++ b/phpunit.xml @@ -0,0 +1,17 @@ + + + + + + src/ + + + + + + ci/phpunit/ + + + \ No newline at end of file From 4491aab2b961580cd7c048ca3317a9542b3f2d1a Mon Sep 17 00:00:00 2001 From: s3inlc Date: Wed, 20 May 2026 09:49:49 +0200 Subject: [PATCH 542/691] added some more comments and style adjustments --- ci/phpunit/dba/AbstractModelFactoryTest.php | 36 +++++++++++++++------ src/dba/AbstractModelFactory.php | 7 ++++ 2 files changed, 34 insertions(+), 9 deletions(-) diff --git a/ci/phpunit/dba/AbstractModelFactoryTest.php b/ci/phpunit/dba/AbstractModelFactoryTest.php index 10528ece5..edb46ed09 100644 --- a/ci/phpunit/dba/AbstractModelFactoryTest.php +++ b/ci/phpunit/dba/AbstractModelFactoryTest.php @@ -3,7 +3,6 @@ namespace dba; use Hashtopolis\dba\models\Hash; -use Hashtopolis\inc\utils\AccessGroupUtils; use TestBase; use Hashtopolis\dba\models\Hashlist; use Hashtopolis\dba\OrderFilter; @@ -67,19 +66,31 @@ public function testColumnFilter(): void { $this->assertSame([], $ids); } + /** + * Tests the case with no entries in a timeseries filter. + * + * @return void + * @throws Exception + */ public function testTimeseriesFilterEmpty(): void { $counts = Factory::getHashFactory()->columnTimeseriesFilter([], Hash::TIME_CRACKED); $this->assertSame([], $counts); } + /** + * Tests the case with entries but none of them matching to the timeseries filter used so the counts array is empty. + * + * @return void + * @throws Exception + */ public function testTimeseriesFilterNoneCracked(): void { - $timeLimit = time() - 3600*24*30; // one month back + $timeLimit = time() - 3600 * 24 * 30; // one month back $hashlist = $this->createDatabaseObject(Factory::getHashlistFactory(), new Hashlist(null, 'hashlist', DHashlistFormat::PLAIN, 0, 100, ':', 0, 0, 0, 0, 1, '', 0, 0, 0)); $hashTemplate = new Hash(null, $hashlist->getId(), 'hash', 'salt', '', 0, null, 0, 0); - for($i = 0; $i < 1000; $i++) { + for ($i = 0; $i < 1000; $i++) { $this->createDatabaseObject(Factory::getHashFactory(), clone $hashTemplate); } @@ -90,19 +101,26 @@ public function testTimeseriesFilterNoneCracked(): void { $this->assertSame([], $counts); } + /** + * Tests with entries existing (both matching and not matching the filters) to return the correct amount of counts + * per day. + * + * @return void + * @throws Exception + */ public function testTimeseriesFilter(): void { - $timeLimit = time() - 3600*24*30; // one month back + $timeLimit = time() - 3600 * 24 * 30; // one month back $hashlist = $this->createDatabaseObject(Factory::getHashlistFactory(), new Hashlist(null, 'hashlist', DHashlistFormat::PLAIN, 0, 100, ':', 0, 0, 0, 0, 1, '', 0, 0, 0)); $hashTemplate = new Hash(null, $hashlist->getId(), 'hash', 'salt', 'plaintext', 0, null, 1, 0); $hashes = []; - for($i = 0, $j = 0; $i < 1000; $i++) { + for ($i = 0, $j = 0; $i < 1000; $i++) { $hash = clone $hashTemplate; $hash->setTimeCracked($timeLimit + $i - 10 + $j * 3600 * 24); // 10 hashes will fall out of the tested timeseries range $hash->setIsCracked(($i % 10) > 0); // every tenth hash is not cracked $hashes[] = $this->createDatabaseObject(Factory::getHashFactory(), $hash); - if ($i % 23 == 0){ + if ($i % 23 == 0) { $j++; } } @@ -113,12 +131,12 @@ public function testTimeseriesFilter(): void { // build the array on our own to compare $expected = []; - foreach($hashes as $hash) { - if($hash->getisCracked() != 1) { + foreach ($hashes as $hash) { + if ($hash->getisCracked() != 1) { continue; } $day = date('Y-m-d', $hash->getTimeCracked()); - if(!isset($expected[$day])){ + if (!isset($expected[$day])) { $expected[$day] = 0; } $expected[$day]++; diff --git a/src/dba/AbstractModelFactory.php b/src/dba/AbstractModelFactory.php index 4f9c89aed..3e848f90e 100755 --- a/src/dba/AbstractModelFactory.php +++ b/src/dba/AbstractModelFactory.php @@ -87,6 +87,13 @@ public function getMappedModelTable(): string { return $this->getModelName(); } + /** + * Get all the attribute keys of a model prepared with the mapping prefix where needed. The returned keys are then named + * exactly how they are present in the database. + * + * @param AbstractModel $model + * @return array list of keys of the model (mapped where needed) + */ private static function getMappedModelKeys(AbstractModel $model): array { // check the keys of the table for required mapping from features $keys = []; From 020c45a51591a3e3737d68a89ee3abc403d91f1e Mon Sep 17 00:00:00 2001 From: Eric Wasson <229096365+Eric-Wasson@users.noreply.github.com> Date: Wed, 20 May 2026 10:04:04 +0200 Subject: [PATCH 543/691] Added more CORS phpunit tests --- .../inc/apiv2/util/CorsHackMiddlewareTest.php | 81 +++++++++++++++++++ 1 file changed, 81 insertions(+) diff --git a/ci/phpunit/inc/apiv2/util/CorsHackMiddlewareTest.php b/ci/phpunit/inc/apiv2/util/CorsHackMiddlewareTest.php index 4b2e897a4..17dd123c0 100644 --- a/ci/phpunit/inc/apiv2/util/CorsHackMiddlewareTest.php +++ b/ci/phpunit/inc/apiv2/util/CorsHackMiddlewareTest.php @@ -162,4 +162,85 @@ public function testInvalidDomainPort(): void { $request->setHeaderLine("http://hashtopolis-cluster.com:4201"); $this->expectException(CorsHackMiddleware::CheckCORS($request, $response)); } + + /** + * Tests a valid domain without port as origin. + * + */ + public function testValidDomainWithoutPort(): void { + $this->expectNotToPerformAssertions(); + + putenv("HASHTOPOLIS_BACKEND_URL=http://hashtopolis-cluster.com/api/v2"); + putenv("HASHTOPOLIS_FRONTEND_PORT=4200"); + + $app = AppFactory::create(); + + $request = new DummyRequest(); + + $response = $app->getResponseFactory()->createResponse(); + + $request->setHeaderLine("http://hashtopolis-cluster.com"); + CorsHackMiddleware::CheckCORS($request, $response); + } + + /** + * Tests a valid https-domain without port as origin. + * + */ + public function testValidHttpsDomainWithoutPort(): void { + $this->expectNotToPerformAssertions(); + + putenv("HASHTOPOLIS_BACKEND_URL=https://hashtopolis-cluster.com/api/v2"); + putenv("HASHTOPOLIS_FRONTEND_PORT=4200"); + + $app = AppFactory::create(); + + $request = new DummyRequest(); + + $response = $app->getResponseFactory()->createResponse(); + + $request->setHeaderLine("https://hashtopolis-cluster.com"); + CorsHackMiddleware::CheckCORS($request, $response); + } + + /** + * Tests a valid https-domain with port as origin but configured http-backend-url. + * The http:// or https:// are not part of the CORS checks. + * + */ + public function testValidHttpsDomainWithPortWithHttpConfig(): void { + $this->expectNotToPerformAssertions(); + + putenv("HASHTOPOLIS_BACKEND_URL=http://hashtopolis-cluster.com:8080/api/v2"); + putenv("HASHTOPOLIS_FRONTEND_PORT=4200"); + + $app = AppFactory::create(); + + $request = new DummyRequest(); + + $response = $app->getResponseFactory()->createResponse(); + + $request->setHeaderLine("https://hashtopolis-cluster.com:8080"); + CorsHackMiddleware::CheckCORS($request, $response); + } + + /** + * Tests a valid domain with a differnt frontend port as origin. + * + */ + public function testValidDomainWithoutDifferentFrontendPort(): void { + $this->expectNotToPerformAssertions(); + + putenv("HASHTOPOLIS_BACKEND_URL=http://hashtopolis-cluster.com:8080/api/v2"); + putenv("HASHTOPOLIS_FRONTEND_PORT=5000"); + + $app = AppFactory::create(); + + $request = new DummyRequest(); + + $response = $app->getResponseFactory()->createResponse(); + + $request->setHeaderLine("https://hashtopolis-cluster.com:5000"); + CorsHackMiddleware::CheckCORS($request, $response); + } } From 28f4051efcda4fedb4d405afb58eb1783dc178e3 Mon Sep 17 00:00:00 2001 From: s3inlc Date: Wed, 20 May 2026 10:21:15 +0200 Subject: [PATCH 544/691] added unit tests for mapping functions of AbstractModelFactory --- ci/phpunit/dba/AbstractModelFactoryTest.php | 70 +++++++++++++++++++++ src/dba/AbstractModelFactory.php | 10 ++- 2 files changed, 79 insertions(+), 1 deletion(-) diff --git a/ci/phpunit/dba/AbstractModelFactoryTest.php b/ci/phpunit/dba/AbstractModelFactoryTest.php index edb46ed09..0ce35e64c 100644 --- a/ci/phpunit/dba/AbstractModelFactoryTest.php +++ b/ci/phpunit/dba/AbstractModelFactoryTest.php @@ -2,7 +2,10 @@ namespace dba; +use Hashtopolis\dba\AbstractModelFactory; use Hashtopolis\dba\models\Hash; +use Hashtopolis\dba\models\HashType; +use Hashtopolis\dba\models\HealthCheckAgent; use TestBase; use Hashtopolis\dba\models\Hashlist; use Hashtopolis\dba\OrderFilter; @@ -25,6 +28,73 @@ public function testGetDBWithTest(): void { $this->assertNotNull($db); } + /** + * For non-mapped tables, the mapped table should be the same. + * + * @return void + */ + public function testGetMappedModelTableWithoutMapping(): void { + $agentFactory = Factory::getAgentFactory(); + $this->assertEquals($agentFactory->getModelTable(), $agentFactory->getMappedModelTable()); + } + + /** + * For mapped tables, the mapped table should have the prefix + * + * @return void + */ + public function testGetMappedModelTableWithMapping(): void { + $userFactory = Factory::getUserFactory(); + $this->assertEquals("htp_" . $userFactory->getModelTable(), $userFactory->getMappedModelTable()); + } + + /** + * Test with a normal model where no remapping is needed. + * + * @return void + */ + public function testGetMappedModelKeysWithoutRemapping(): void { + $hashType = new HashType(null, 'placeholder', 0, 0); + $dict = $hashType->getKeyValueDict(); + $dict_mapped = AbstractModelFactory::getMappedModelKeys($hashType); + $this->assertEquals(array_keys($dict), $dict_mapped); + } + + /** + * Test with a model where remapping is needed on a column + * + * @return void + */ + public function testGetMappedModelKeysWithRemapping(): void { + $healthCheckAgent = new HealthCheckAgent(null, 1, 1, 0, 0, 0, 0, 5, ''); + $dict = $healthCheckAgent->getKeyValueDict(); + $dict_mapped = AbstractModelFactory::getMappedModelKeys($healthCheckAgent); + $this->assertNotEquals(array_keys($dict), $dict_mapped); + $this->assertContains("htp_end", $dict_mapped); + } + + /** + * Test that for a non-mapped key the return value just remains the same as it was before + * + * @return void + */ + public function testGetMappedModelKeyWithoutRemapping(): void { + $hashType = new HashType(null, 'placeholder', 0, 0); + $key_mapped = AbstractModelFactory::getMappedModelKey($hashType, HashType::IS_SALTED); + $this->assertEquals(HashType::IS_SALTED, $key_mapped); + } + + /** + * Test that for a aapped key the return value gets mapped + * + * @return void + */ + public function testGetMappedModelKeyWithRemapping(): void { + $healthCheckAgent = new HealthCheckAgent(null, 1, 1, 0, 0, 0, 0, 5, ''); + $key_mapped = AbstractModelFactory::getMappedModelKey($healthCheckAgent, HealthCheckAgent::END); + $this->assertEquals("htp_end", $key_mapped); + } + /** * Tests both cases to be used on a simple QueryFilter with no result. * When single is true, null must be returned if no matching entry was found, empty array otherwise diff --git a/src/dba/AbstractModelFactory.php b/src/dba/AbstractModelFactory.php index 3e848f90e..0217c8598 100755 --- a/src/dba/AbstractModelFactory.php +++ b/src/dba/AbstractModelFactory.php @@ -80,6 +80,12 @@ abstract function getNullObject(): AbstractModel; */ abstract function createObjectFromDict(string $pk, array $dict): AbstractModel; + /** + * Return the model name in the table, which is the same normally, unless mapping is required. In a mapping case, + * the configured prefix is added. + * + * @return string + */ public function getMappedModelTable(): string { if ($this->isMapping()) { return self::MAPPING_PREFIX . $this->getModelName(); @@ -94,7 +100,7 @@ public function getMappedModelTable(): string { * @param AbstractModel $model * @return array list of keys of the model (mapped where needed) */ - private static function getMappedModelKeys(AbstractModel $model): array { + public static function getMappedModelKeys(AbstractModel $model): array { // check the keys of the table for required mapping from features $keys = []; $features = $model->getFeatures(); @@ -110,6 +116,8 @@ private static function getMappedModelKeys(AbstractModel $model): array { } /** + * Get the key for a model how it's represented in the database itself. For non-mapped keys the value just remains. + * * @param AbstractModel $model * @param string $key * @return string From faec68d664fb6f9f8960caf37306134692b0e7bc Mon Sep 17 00:00:00 2001 From: s3inlc Date: Wed, 20 May 2026 11:24:35 +0200 Subject: [PATCH 545/691] added tests for AbstractModelFactory save() --- ci/phpunit/dba/AbstractModelFactoryTest.php | 24 +++++++++++++++++++++ src/dba/AbstractModelFactory.php | 1 + 2 files changed, 25 insertions(+) diff --git a/ci/phpunit/dba/AbstractModelFactoryTest.php b/ci/phpunit/dba/AbstractModelFactoryTest.php index 0ce35e64c..0dbf4693f 100644 --- a/ci/phpunit/dba/AbstractModelFactoryTest.php +++ b/ci/phpunit/dba/AbstractModelFactoryTest.php @@ -148,6 +148,30 @@ public function testTimeseriesFilterEmpty(): void { $this->assertSame([], $counts); } + /** + * Test creating a hash type object and saving it. + * + * @return void + */ + public function testSaveModelSuccessStaticId(): void { + $hashType = new HashType(100000, 'placeholder', 0, 0); + $hashType = Factory::getHashTypeFactory()->save($hashType); + $this->registerDatabaseObject(Factory::getHashTypeFactory(), $hashType); + $this->assertEquals(100000, $hashType->getId()); + } + + /** + * Test creating a hash type object without providing an id and let it auto increment. + * + * @return void + */ + public function testSaveModelSuccessNoId(): void { + $hashType = new HashType(null, 'placeholder', 0, 0); + $hashType = Factory::getHashTypeFactory()->save($hashType); + $this->registerDatabaseObject(Factory::getHashTypeFactory(), $hashType); + $this->assertNotEquals(null, $hashType->getId()); + } + /** * Tests the case with entries but none of them matching to the timeseries filter used so the counts array is empty. * diff --git a/src/dba/AbstractModelFactory.php b/src/dba/AbstractModelFactory.php index 0217c8598..91d6f4e05 100755 --- a/src/dba/AbstractModelFactory.php +++ b/src/dba/AbstractModelFactory.php @@ -142,6 +142,7 @@ public static function getMappedModelKey(AbstractModel $model, string $key): str * database * @param $model AbstractModel model to save * @return AbstractModel|null + * @throws Exception */ public function save(AbstractModel $model): ?AbstractModel { $dict = $model->getKeyValueDict(); From 267858b0b166d9564d563c2102f2180e2abded07 Mon Sep 17 00:00:00 2001 From: s3inlc Date: Wed, 20 May 2026 11:38:21 +0200 Subject: [PATCH 546/691] made timeseries tests using hashlist filtering to avoid less problems testing on existing setups --- ci/phpunit/dba/AbstractModelFactoryTest.php | 13 +++++++++---- 1 file changed, 9 insertions(+), 4 deletions(-) diff --git a/ci/phpunit/dba/AbstractModelFactoryTest.php b/ci/phpunit/dba/AbstractModelFactoryTest.php index 0dbf4693f..c78dc3255 100644 --- a/ci/phpunit/dba/AbstractModelFactoryTest.php +++ b/ci/phpunit/dba/AbstractModelFactoryTest.php @@ -6,6 +6,7 @@ use Hashtopolis\dba\models\Hash; use Hashtopolis\dba\models\HashType; use Hashtopolis\dba\models\HealthCheckAgent; +use Random\RandomException; use TestBase; use Hashtopolis\dba\models\Hashlist; use Hashtopolis\dba\OrderFilter; @@ -152,12 +153,14 @@ public function testTimeseriesFilterEmpty(): void { * Test creating a hash type object and saving it. * * @return void + * @throws RandomException */ public function testSaveModelSuccessStaticId(): void { - $hashType = new HashType(100000, 'placeholder', 0, 0); + $id = 100000 + random_int(10,999); + $hashType = new HashType($id, 'placeholder', 0, 0); $hashType = Factory::getHashTypeFactory()->save($hashType); $this->registerDatabaseObject(Factory::getHashTypeFactory(), $hashType); - $this->assertEquals(100000, $hashType->getId()); + $this->assertEquals($id, $hashType->getId()); } /** @@ -190,7 +193,8 @@ public function testTimeseriesFilterNoneCracked(): void { $qF1 = new QueryFilter(Hash::IS_CRACKED, 1, "="); $qF2 = new QueryFilter(Hash::TIME_CRACKED, $timeLimit, ">"); - $counts = Factory::getHashFactory()->columnTimeseriesFilter([Factory::FILTER => [$qF1, $qF2]], Hash::TIME_CRACKED); + $qF3 = new QueryFilter(Hash::HASHLIST_ID, $hashlist->getId(), "="); + $counts = Factory::getHashFactory()->columnTimeseriesFilter([Factory::FILTER => [$qF1, $qF2, $qF3]], Hash::TIME_CRACKED); $this->assertSame([], $counts); } @@ -221,7 +225,8 @@ public function testTimeseriesFilter(): void { $qF1 = new QueryFilter(Hash::IS_CRACKED, 1, "="); $qF2 = new QueryFilter(Hash::TIME_CRACKED, $timeLimit, ">"); - $counts = Factory::getHashFactory()->columnTimeseriesFilter([Factory::FILTER => [$qF1, $qF2]], Hash::TIME_CRACKED); + $qF3 = new QueryFilter(Hash::HASHLIST_ID, $hashlist->getId(), "="); + $counts = Factory::getHashFactory()->columnTimeseriesFilter([Factory::FILTER => [$qF1, $qF2, $qF3]], Hash::TIME_CRACKED); // build the array on our own to compare $expected = []; From d3b551e8cd8c35ea3259448f5b5fd42626796520 Mon Sep 17 00:00:00 2001 From: andreas Date: Wed, 20 May 2026 13:13:50 +0200 Subject: [PATCH 547/691] Unit tests and type information AccessControl --- ci/phpunit/inc/utils/AccessControlTest.php | 232 +++++++++++++++++++++ src/inc/utils/AccessControl.php | 24 ++- 2 files changed, 246 insertions(+), 10 deletions(-) create mode 100644 ci/phpunit/inc/utils/AccessControlTest.php diff --git a/ci/phpunit/inc/utils/AccessControlTest.php b/ci/phpunit/inc/utils/AccessControlTest.php new file mode 100644 index 000000000..ced76c7c6 --- /dev/null +++ b/ci/phpunit/inc/utils/AccessControlTest.php @@ -0,0 +1,232 @@ +resetAccessControlInstance(); + $this->resetLoginInstance(); + } + + protected function tearDown(): void { + parent::tearDown(); + } + + public function testGetInstanceWithoutArgsReusesSameObject(): void { + $first = AccessControl::getInstance(); + $second = AccessControl::getInstance(); + + $this->assertInstanceOf(AccessControl::class, $first); + $this->assertNull($first->getUser()); + + $this->assertSame($first, $second); + } + + public function testGetInstanceWithGroupIdOverwritesInstance(): void { + $first = AccessControl::getInstance(); + $second = AccessControl::getInstance(null, 1); + + $this->assertInstanceOf(AccessControl::class, $first); + $this->assertNull($first->getUser()); + + $this->assertInstanceOf(AccessControl::class, $second); + $this->assertNull($second->getUser()); + + $this->assertNotSame($first, $second); + } + + public function testGetInstanceWithUserOverwritesInstance(): void { + $first = AccessControl::getInstance(); + $second = AccessControl::getInstance($this->adminUser); + + $this->assertInstanceOf(AccessControl::class, $first); + $this->assertNull($first->getUser()); + + $this->assertInstanceOf(AccessControl::class, $second); + $this->assertEquals($this->adminUser, $second->getUser()); + + $this->assertNotSame($first, $second); + } + + public function testReloadReloadsTheRightsGroupForUser(): void { + //TODO: Check code style ok, (calling with one arg per line, instead of long lines?) + $group = $this->createDatabaseObject( + Factory::getRightGroupFactory(), + new RightGroup(null, 'phpunit-' . uniqid('', true), '{}') + ); + + $user = $this->createDatabaseObject( + Factory::getUserFactory(), + new User(null, 'phpunit_' . uniqid(), 'phpunit_' . uniqid() . '@example.com', 'hash', 'salt', 1, 0, 0, time(), 3600, $group->getId(), '', '', '', '', '') + ); + + $accessControl = AccessControl::getInstance($user); + $this->assertFalse($accessControl->hasPermission(DAccessControl::MANAGE_TASK_ACCESS)); + Factory::getRightGroupFactory()->set( + $group, + RightGroup::PERMISSIONS, + json_encode([DAccessControl::MANAGE_TASK_ACCESS => true]) + ); + $this->assertFalse($accessControl->hasPermission(DAccessControl::MANAGE_TASK_ACCESS)); + + $accessControl->reload(); + $this->assertTrue($accessControl->hasPermission(DAccessControl::MANAGE_TASK_ACCESS)); + } + + public function testReloadDoesNotReloadTheRightsGroupWithoutUser(): void { + $group = $this->createDatabaseObject( + Factory::getRightGroupFactory(), + new RightGroup(null, 'phpunit-' . uniqid('', true), '{}') + ); + + $accessControl = AccessControl::getInstance(null, $group->getId()); + $this->assertFalse($accessControl->hasPermission(DAccessControl::MANAGE_TASK_ACCESS)); + + Factory::getRightGroupFactory()->set( + $group, + RightGroup::PERMISSIONS, + json_encode([DAccessControl::MANAGE_TASK_ACCESS => true]) + ); + + $this->assertFalse($accessControl->hasPermission(DAccessControl::MANAGE_TASK_ACCESS)); + + $accessControl->reload(); + + // TODO: Check if this is the desired behavour, ie not reloading if a groupId only. + $this->assertFalse($accessControl->hasPermission(DAccessControl::MANAGE_TASK_ACCESS)); + } + + public function testPermissionPublicAccessAlwaysPermit(): void { + $accessControl = AccessControl::getInstance(); + $this->assertTrue($accessControl->hasPermission(DAccessControl::PUBLIC_ACCESS)); + } + + public function testPermissionLoginWithLoggedInUserPermit(): void { + $this->setLoginState(true, $this->adminUser); + $accessControl = AccessControl::getInstance(); + $this->assertTrue($accessControl->hasPermission(DAccessControl::LOGIN_ACCESS)); + } + + public function testPermissionLoginWithoutLoggedInUserDenies(): void { + $accessControl = AccessControl::getInstance(); + $this->assertFalse($accessControl->hasPermission(DAccessControl::LOGIN_ACCESS)); + } + + public function testUninitializedAccessControlDenies() { + $accessControl = AccessControl::getInstance(); + foreach(DAccessControl::getConstants() as $constant) { + $permission = is_array($constant) ? $constant[0] : $constant; + if ($permission != DAccessControl::PUBLIC_ACCESS) { + $this->assertFalse($accessControl->hasPermission($permission)); + } + } + } + + public function testRegularUserWithPermissionPermits(): void { + $group = $this->createDatabaseObject( + Factory::getRightGroupFactory(), + new RightGroup(null, 'phpunit-' . uniqid('', true), json_encode([DAccessControl::MANAGE_TASK_ACCESS => true])) + ); + + $user = $this->createDatabaseObject( + Factory::getUserFactory(), + new User(null, 'phpunit_' . uniqid(), 'phpunit_' . uniqid() . '@example.com', 'hash', 'salt', 1, 0, 0, time(), 3600, $group->getId(), '', '', '', '', '') + ); + + $accessControl = AccessControl::getInstance($user); + $this->assertTrue($accessControl->hasPermission(DAccessControl::MANAGE_TASK_ACCESS)); + } + + public function testRegularUserWithoutPermissionDenies(): void { + $group = $this->createDatabaseObject( + Factory::getRightGroupFactory(), + new RightGroup(null, 'phpunit-' . uniqid('', true), json_encode([DAccessControl::VIEW_HASHES_ACCESS => true])) + ); + + $user = $this->createDatabaseObject( + Factory::getUserFactory(), + new User(null, 'phpunit_' . uniqid(), 'phpunit_' . uniqid() . '@example.com', 'hash', 'salt', 1, 0, 0, time(), 3600, $group->getId(), '', '', '', '', '') + ); + + $accessControl = AccessControl::getInstance($user); + $this->assertFalse($accessControl->hasPermission(DAccessControl::MANAGE_TASK_ACCESS)); + } + + public function testALLUserPermissionPermitsAllPermissions(): void { + $accessControl = AccessControl::getInstance($this->adminUser); + foreach(DAccessControl::getConstants() as $constant) { + $permission = is_array($constant) ? $constant[0] : $constant; + $this->assertTrue($accessControl->hasPermission($permission)); + } + } + + public function testGivenByDependencyImplied(): void { + $group = $this->createDatabaseObject( + Factory::getRightGroupFactory(), + new RightGroup(null, 'phpunit-' . uniqid('', true), json_encode([DAccessControl::MANAGE_AGENT_ACCESS => true])) + ); + + $accessControl = AccessControl::getInstance(null, $group->getId()); + + $this->assertTrue($accessControl->givenByDependency(DAccessControl::VIEW_AGENT_ACCESS[0])); + } + + public function testGivenByDependencyDirect(): void { + $group = $this->createDatabaseObject( + Factory::getRightGroupFactory(), + new RightGroup( + null, + 'phpunit-' . uniqid('', true), + json_encode([DAccessControl::MANAGE_TASK_ACCESS => true]) + ) + ); + + $accessControl = AccessControl::getInstance(null, $group->getId()); + + $this->assertTrue($accessControl->givenByDependency(DAccessControl::MANAGE_TASK_ACCESS)); + } + + /* + Local test helpers + */ + private function resetAccessControlInstance(): void { + $reflection = new ReflectionClass(AccessControl::class); + $instanceProperty = $reflection->getProperty('instance'); + $instanceProperty->setValue(null, null); + } + + private function setLoginState(bool $valid, ?User $user = null): void { + $reflection = new ReflectionClass(\Hashtopolis\inc\Login::class); + $instanceProperty = $reflection->getProperty('instance'); + $instance = $instanceProperty->getValue(); + + if ($instance === null) { + \Hashtopolis\inc\Login::getInstance(); + $instance = $instanceProperty->getValue(); + } + + $validProperty = $reflection->getProperty('valid'); + $validProperty->setValue($instance, $valid); + + $userProperty = $reflection->getProperty('user'); + $userProperty->setValue($instance, $user); + } + + private function resetLoginInstance(): void { + $reflection = new ReflectionClass(\Hashtopolis\inc\Login::class); + $instanceProperty = $reflection->getProperty('instance'); + $instanceProperty->setValue(null, null); + } +} \ No newline at end of file diff --git a/src/inc/utils/AccessControl.php b/src/inc/utils/AccessControl.php index 42866aaf2..aa4e1e0ad 100644 --- a/src/inc/utils/AccessControl.php +++ b/src/inc/utils/AccessControl.php @@ -4,22 +4,25 @@ use Hashtopolis\dba\models\User; use Hashtopolis\dba\Factory; +use Hashtopolis\dba\models\RightGroup; use Hashtopolis\inc\defines\DAccessControl; use Hashtopolis\inc\Login; use Hashtopolis\inc\UI; class AccessControl { - private $user; - private $rightGroup; + //TODO: Changed because of AccessControlTest.testPermissionLoginWithoutLoggedInUserDenies, + //Access to rightGroup will throw if accessed before initialized. + private ?User $user = null; + private ?RightGroup $rightGroup = null; - private static $instance = null; + private static ?self $instance = null; /** * @param User $user * @param int $groupId * @return AccessControl */ - public static function getInstance($user = null, $groupId = 0) { + public static function getInstance(?User $user = null, int $groupId = 0): self { if ($user != null || $groupId != 0) { self::$instance = new AccessControl($user, $groupId); } @@ -32,7 +35,7 @@ public static function getInstance($user = null, $groupId = 0) { /** * @return User */ - public function getUser() { + public function getUser(): ?User { return $this->user; } @@ -41,7 +44,7 @@ public function getUser() { * @param $user User * @param $groupId int */ - private function __construct($user = null, $groupId = 0) { + private function __construct(?User $user = null, int $groupId = 0) { $this->user = $user; if ($this->user != null) { $this->rightGroup = Factory::getRightGroupFactory()->get($this->user->getRightGroupId()); @@ -54,7 +57,7 @@ private function __construct($user = null, $groupId = 0) { /** * Force a reload of the permissions from the database */ - public function reload() { + public function reload(): void { if ($this->user != null) { $this->rightGroup = Factory::getRightGroupFactory()->get($this->user->getRightGroupId()); } @@ -64,7 +67,8 @@ public function reload() { * If access is not granted, permission denied page will be shown * @param $perm string|string[] */ - public function checkPermission($perm) { + public function checkPermission(string|array $perm): void { + //TODO: This one seems a bit off here? Throw an exception to be handled appropriate by the caller? if (!$this->hasPermission($perm)) { UI::permissionError(); } @@ -74,7 +78,7 @@ public function checkPermission($perm) { * @param $singlePerm string * @return bool */ - public function givenByDependency($singlePerm) { + public function givenByDependency(string $singlePerm): bool { $constants = DAccessControl::getConstants(); foreach ($constants as $constant) { if (is_array($constant) && $singlePerm == $constant[0] && $this->hasPermission($constant)) { @@ -91,7 +95,7 @@ public function givenByDependency($singlePerm) { * @param $perm string|string[] * @return bool true if access is granted */ - public function hasPermission($perm) { + public function hasPermission(string|array $perm): bool { if ($perm == DAccessControl::PUBLIC_ACCESS) { return true; } From ceedf3256b1d82fca846954c9c1f093835b0725d Mon Sep 17 00:00:00 2001 From: s3inlc Date: Wed, 20 May 2026 13:22:15 +0200 Subject: [PATCH 548/691] completed tests for update() and save() --- ci/phpunit/dba/AbstractModelFactoryTest.php | 151 ++++++++++++++++---- src/dba/AbstractModelFactory.php | 1 + 2 files changed, 126 insertions(+), 26 deletions(-) diff --git a/ci/phpunit/dba/AbstractModelFactoryTest.php b/ci/phpunit/dba/AbstractModelFactoryTest.php index c78dc3255..1a2149b95 100644 --- a/ci/phpunit/dba/AbstractModelFactoryTest.php +++ b/ci/phpunit/dba/AbstractModelFactoryTest.php @@ -3,8 +3,12 @@ namespace dba; use Hashtopolis\dba\AbstractModelFactory; +use Hashtopolis\dba\models\Agent; +use Hashtopolis\dba\models\CrackerBinary; +use Hashtopolis\dba\models\CrackerBinaryType; use Hashtopolis\dba\models\Hash; use Hashtopolis\dba\models\HashType; +use Hashtopolis\dba\models\HealthCheck; use Hashtopolis\dba\models\HealthCheckAgent; use Random\RandomException; use TestBase; @@ -96,6 +100,127 @@ public function testGetMappedModelKeyWithRemapping(): void { $this->assertEquals("htp_end", $key_mapped); } + /** + * Test creating a hash type object and saving it. + * + * @return void + * @throws RandomException + */ + public function testSaveModelSuccessStaticId(): void { + $id = 100000 + random_int(10, 999); + $hashType = new HashType($id, 'placeholder', 0, 0); + $hashType = Factory::getHashTypeFactory()->save($hashType); + $this->registerDatabaseObject(Factory::getHashTypeFactory(), $hashType); + $this->assertEquals($id, $hashType->getId()); + } + + /** + * Test creating a hash type object without providing an id and let it auto increment. + * + * @return void + */ + public function testSaveModelSuccessNoId(): void { + $hashType = new HashType(null, 'placeholder', 0, 0); + $hashType = Factory::getHashTypeFactory()->save($hashType); + $this->registerDatabaseObject(Factory::getHashTypeFactory(), $hashType); + $this->assertNotEquals(null, $hashType->getId()); + } + + /** + * Test just updating a model without any change, should remain the same in the database. + * + * @return void + * @throws Exception + */ + public function testUpdateModelSuccessNoChanges(): void { + $hashType = new HashType(null, 'placeholder', 0, 0); + $hashType = $this->createDatabaseObject(Factory::getHashTypeFactory(), $hashType); + $this->assertNotNull($hashType->getId()); + + Factory::getHashTypeFactory()->update($hashType); + $hashTypeUpdated = Factory::getHashTypeFactory()->get($hashType->getId()); + $this->assertEquals($hashType->getKeyValueDict(), $hashTypeUpdated->getKeyValueDict()); + } + + /** + * Test updating a model with a single change. + * + * @return void + * @throws Exception + */ + public function testUpdateModelSuccessSingleChange(): void { + $hashType = new HashType(null, 'placeholder', 0, 0); + $hashType = $this->createDatabaseObject(Factory::getHashTypeFactory(), $hashType); + $this->assertNotNull($hashType->getId()); + $this->assertTrue($hashType instanceof HashType); + + $hashType->setDescription('HashType X'); + Factory::getHashTypeFactory()->update($hashType); + + $hashTypeUpdated = Factory::getHashTypeFactory()->get($hashType->getId()); + $this->assertEquals('HashType X', $hashTypeUpdated->getDescription()); + } + + /** + * Test updating a model with a single change on a column which needs to be mapped to check mapping functionality. + * We have to create some objects first and then be able to create a HealthCheckAgent relation where the column + * 'end' needs to be mapped in the database as it is a reserved keyword. We check that we get the update from a + * re-read from the database + * + * @return void + * @throws Exception + */ + public function testUpdateModelSuccessSingleChangeOnMappedColumn(): void { + $agent = new Agent(null, '', '', 0, '', '', 0, 0, 0, '', '', 0, '', null, 0, ''); + $agent = $this->createDatabaseObject(Factory::getAgentFactory(), $agent); + + $hashType = new HashType(null, 'placeholder', 0, 0); + $hashType = $this->createDatabaseObject(Factory::getHashTypeFactory(), $hashType); + + $crackerBinaryType = new CrackerBinaryType(null, '', 0); + $crackerBinaryType = $this->createDatabaseObject(Factory::getCrackerBinaryTypeFactory(), $crackerBinaryType); + + $crackerBinary = new CrackerBinary(null, $crackerBinaryType->getId(), '', '', ''); + $crackerBinary = $this->createDatabaseObject(Factory::getCrackerBinaryFactory(), $crackerBinary); + + $healthCheck = new HealthCheck(null, 0, 0, 0, $hashType->getId(), $crackerBinary->getId(), 0, ''); + $healthCheck = $this->createDatabaseObject(Factory::getHealthCheckFactory(), $healthCheck); + + $healthCheckAgent = new HealthCheckAgent(null, $healthCheck->getId(), $agent->getId(), 0, 0, 0, 0, 0, ''); + $healthCheckAgent = $this->createDatabaseObject(Factory::getHealthCheckAgentFactory(), $healthCheckAgent); + $this->assertNotNull($healthCheckAgent->getId()); + $this->assertTrue($healthCheckAgent instanceof HealthCheckAgent); + + $healthCheckAgent->setEnd(9999); + Factory::getHealthCheckAgentFactory()->update($healthCheckAgent); + + $healthCheckAgentUpdated = Factory::getHealthCheckAgentFactory()->get($healthCheckAgent->getId()); + $this->assertEquals(9999, $healthCheckAgentUpdated->getEnd()); + } + + /** + * Test updating a model with multiple changed columns. + * + * @return void + * @throws Exception + */ + public function testUpdateModelSuccessMultipleChanges(): void { + $hashType = new HashType(null, 'placeholder', 0, 0); + $hashType = $this->createDatabaseObject(Factory::getHashTypeFactory(), $hashType); + $this->assertNotNull($hashType->getId()); + $this->assertTrue($hashType instanceof HashType); + + $hashType->setDescription('HashType X'); + $hashType->setIsSalted(1); + $hashType->setIsSlowHash(1); + Factory::getHashTypeFactory()->update($hashType); + + $hashTypeUpdated = Factory::getHashTypeFactory()->get($hashType->getId()); + $this->assertEquals('HashType X', $hashTypeUpdated->getDescription()); + $this->assertEquals(1, $hashType->getIsSalted()); + $this->assertEquals(1, $hashType->getIsSlowHash()); + } + /** * Tests both cases to be used on a simple QueryFilter with no result. * When single is true, null must be returned if no matching entry was found, empty array otherwise @@ -149,32 +274,6 @@ public function testTimeseriesFilterEmpty(): void { $this->assertSame([], $counts); } - /** - * Test creating a hash type object and saving it. - * - * @return void - * @throws RandomException - */ - public function testSaveModelSuccessStaticId(): void { - $id = 100000 + random_int(10,999); - $hashType = new HashType($id, 'placeholder', 0, 0); - $hashType = Factory::getHashTypeFactory()->save($hashType); - $this->registerDatabaseObject(Factory::getHashTypeFactory(), $hashType); - $this->assertEquals($id, $hashType->getId()); - } - - /** - * Test creating a hash type object without providing an id and let it auto increment. - * - * @return void - */ - public function testSaveModelSuccessNoId(): void { - $hashType = new HashType(null, 'placeholder', 0, 0); - $hashType = Factory::getHashTypeFactory()->save($hashType); - $this->registerDatabaseObject(Factory::getHashTypeFactory(), $hashType); - $this->assertNotEquals(null, $hashType->getId()); - } - /** * Tests the case with entries but none of them matching to the timeseries filter used so the counts array is empty. * diff --git a/src/dba/AbstractModelFactory.php b/src/dba/AbstractModelFactory.php index 91d6f4e05..9f90ee8e5 100755 --- a/src/dba/AbstractModelFactory.php +++ b/src/dba/AbstractModelFactory.php @@ -248,6 +248,7 @@ private function getJoins(array $arr): array { * Returns the return of PDO::execute() * @param $model AbstractModel model to update * @return PDOStatement + * @throws Exception */ public function update(AbstractModel $model): PDOStatement { $dict = $model->getKeyValueDict(); From 3723cec49ba91fcabe604b8dec5ac7f3768e619c Mon Sep 17 00:00:00 2001 From: s3inlc Date: Wed, 20 May 2026 14:18:31 +0200 Subject: [PATCH 549/691] adjusting the namespace structure for the tests, so the tests are in the same namespace as the source classes --- ci/phpunit/TestBase.php | 2 + ci/phpunit/dba/AbstractModelFactoryTest.php | 8 +- ci/phpunit/inc/UtilTest.php | 6 +- .../HashtopolisNotificationEmailTest.php | 139 +++++++++--------- ci/phpunit/inc/utils/UserUtilsTest.php | 26 +++- composer.json | 2 +- src/inc/utils/UserUtils.php | 13 +- 7 files changed, 105 insertions(+), 91 deletions(-) diff --git a/ci/phpunit/TestBase.php b/ci/phpunit/TestBase.php index a2fa4e465..0514b8c6a 100644 --- a/ci/phpunit/TestBase.php +++ b/ci/phpunit/TestBase.php @@ -1,6 +1,8 @@ createNotification(); - $notification->sendMessage('

    html

    ##########plain', 'Subject'); +use Hashtopolis\TestBase; - $this->assertSame(0, $mailCallCount); - } - - public function testSendMessageCallsSendMailWhenMailIsConfigured(): void { - $mailCalls = []; - $errorLogMessages = []; - - \hashtopolis_set_test_mock('Hashtopolis\\inc\\is_file', static function ($path): bool { - return true; - }); - \hashtopolis_set_test_mock('Hashtopolis\\inc\\mail', static function ($to, $subject, $message, $additionalHeaders = null, $additionalParams = null) use (&$mailCalls): bool { - $mailCalls[] = [$to, $subject, $message, $additionalHeaders, $additionalParams]; - return true; - }); +require_once(dirname(__FILE__) . '/../../TestBase.php'); - $notification = $this->createNotification(); +final class HashtopolisNotificationEmailTest extends TestBase { + + public function testSendMessageDoesNotCallSendMailWhenMailIsNotConfigured(): void { + $mailCallCount = 0; + $errorLogMessages = []; + + \hashtopolis_set_test_mock('Hashtopolis\\inc\\is_file', static function ($path): bool { + return false; + }); + \hashtopolis_set_test_mock('Hashtopolis\\inc\\mail', static function () use (&$mailCallCount): bool { + $mailCallCount++; + return true; + }); + + $notification = $this->createNotification(); + $notification->sendMessage('

    html

    ##########plain', 'Subject'); + + $this->assertSame(0, $mailCallCount); + } + + public function testSendMessageCallsSendMailWhenMailIsConfigured(): void { + $mailCalls = []; + $errorLogMessages = []; + + \hashtopolis_set_test_mock('Hashtopolis\\inc\\is_file', static function ($path): bool { + return true; + }); + \hashtopolis_set_test_mock('Hashtopolis\\inc\\mail', static function ($to, $subject, $message, $additionalHeaders = null, $additionalParams = null) use (&$mailCalls): bool { + $mailCalls[] = [$to, $subject, $message, $additionalHeaders, $additionalParams]; + return true; + }); + + $notification = $this->createNotification(); + $notification->sendMessage('

    html

    ##########plain', 'Subject'); + + $this->assertCount(1, $mailCalls); + $this->assertSame('receiver@example.com', $mailCalls[0][0]); + $this->assertSame('Subject', $mailCalls[0][1]); + $this->assertStringContainsString('

    html

    ', $mailCalls[0][2]); + $this->assertStringContainsString('plain', $mailCalls[0][2]); + } + + public function testSendMessageThrowsWhenConfiguredSendMailFails(): void { + $mailCallCount = 0; + + \hashtopolis_set_test_mock('Hashtopolis\\inc\\is_file', static function ($path): bool { + return true; + }); + \hashtopolis_set_test_mock('Hashtopolis\\inc\\mail', static function () use (&$mailCallCount): bool { + $mailCallCount++; + return false; + }); + + $notification = $this->createNotification(); + $this->expectException(\Exception::class); + try { $notification->sendMessage('

    html

    ##########plain', 'Subject'); - - $this->assertCount(1, $mailCalls); - $this->assertSame('receiver@example.com', $mailCalls[0][0]); - $this->assertSame('Subject', $mailCalls[0][1]); - $this->assertStringContainsString('

    html

    ', $mailCalls[0][2]); - $this->assertStringContainsString('plain', $mailCalls[0][2]); } - - public function testSendMessageThrowsWhenConfiguredSendMailFails(): void { - $mailCallCount = 0; - - \hashtopolis_set_test_mock('Hashtopolis\\inc\\is_file', static function ($path): bool { - return true; - }); - \hashtopolis_set_test_mock('Hashtopolis\\inc\\mail', static function () use (&$mailCallCount): bool { - $mailCallCount++; - return false; - }); - - $notification = $this->createNotification(); - $this->expectException(\Exception::class); - try { - $notification->sendMessage('

    html

    ##########plain', 'Subject'); - } finally { - $this->assertSame(1, $mailCallCount); - } - } - - private function createNotification(): HashtopolisNotificationEmail { - $notification = new HashtopolisNotificationEmail(); - $receiverProperty = new \ReflectionProperty($notification, 'receiver'); - $receiverProperty->setValue($notification, 'receiver@example.com'); - return $notification; + finally { + $this->assertSame(1, $mailCallCount); } } + + private function createNotification(): HashtopolisNotificationEmail { + $notification = new HashtopolisNotificationEmail(); + $receiverProperty = new \ReflectionProperty($notification, 'receiver'); + $receiverProperty->setValue($notification, 'receiver@example.com'); + return $notification; + } } + diff --git a/ci/phpunit/inc/utils/UserUtilsTest.php b/ci/phpunit/inc/utils/UserUtilsTest.php index db29d6ee8..e1c7b9a9b 100644 --- a/ci/phpunit/inc/utils/UserUtilsTest.php +++ b/ci/phpunit/inc/utils/UserUtilsTest.php @@ -1,17 +1,18 @@ uniqueUsername('mail_disabled'); @@ -41,6 +48,12 @@ public function testCreateUserDoesNotCallSendMailWhenMailIsNotConfigured(): void $this->assertSame(0, $mailCallCount); } + /** + * @throws InternalError + * @throws HTException + * @throws HttpError + * @throws HttpConflict + */ public function testCreateUserCallsSendMailWhenMailIsConfigured(): void { $mailCalls = []; $username = $this->uniqueUsername('mail_enabled'); @@ -61,6 +74,11 @@ public function testCreateUserCallsSendMailWhenMailIsConfigured(): void { $this->assertSame('Account at ' . APP_NAME, $mailCalls[0][1]); } + /** + * @throws HTException + * @throws HttpError + * @throws HttpConflict + */ public function testCreateUserThrowsWhenConfiguredSendMailFails(): void { $mailCallCount = 0; $username = $this->uniqueUsername('mail_failure'); diff --git a/composer.json b/composer.json index 4d4c48a74..e830b353a 100644 --- a/composer.json +++ b/composer.json @@ -57,7 +57,7 @@ }, "autoload-dev": { "psr-4": { - "Tests\\DBA\\": "ci/phpunit/dba/" + "Hashtopolis\\": "ci/phpunit/" } }, "scripts": { diff --git a/src/inc/utils/UserUtils.php b/src/inc/utils/UserUtils.php index c7e0fcd9e..330f82d72 100644 --- a/src/inc/utils/UserUtils.php +++ b/src/inc/utils/UserUtils.php @@ -40,7 +40,7 @@ public static function getUsers() { * @param User $adminUser * @throws HTException */ - public static function deleteUser($userId, $adminUser) { + public static function deleteUser(int $userId, User $adminUser): void { $user = UserUtils::getUser($userId); if ($user->getId() == $adminUser->getId()) { throw new HTException("You cannot delete yourself!"); @@ -103,7 +103,7 @@ public static function userForgotPassword($username, $email) { * @param int $userId * @throws HTException */ - public static function enableUser($userId) { + public static function enableUser(int $userId): void { $user = UserUtils::getUser($userId); Factory::getUserFactory()->set($user, User::IS_VALID, 1); } @@ -131,7 +131,7 @@ public static function disableUser($userId, $adminUser) { * @param User $adminUser * @throws HTException */ - public static function setRights($userId, $groupId, $adminUser) { + public static function setRights(int $userId, int $groupId, User $adminUser): void { $group = AccessControlUtils::getGroup($groupId); $user = UserUtils::getUser($userId); if ($user->getId() == $adminUser->getId()) { @@ -159,7 +159,7 @@ public static function setRights($userId, $groupId, $adminUser) { * 5. Generates a new salt and hash for the new password. * 6. Updates the user's password hash, salt, and resets the computed password flag. */ - public static function changePassword($user, $oldPassword, $newPassword, $confirmPassword) { + public static function changePassword(User $user, string $oldPassword, string $newPassword, string $confirmPassword): void { if (!Encryption::passwordVerify($oldPassword, $user->getPasswordSalt(), $user->getPasswordHash())) { throw new HttpError("Your old password is wrong!"); } @@ -184,7 +184,7 @@ public static function changePassword($user, $oldPassword, $newPassword, $confir * @param User $adminUser * @throws HTException */ - public static function setPassword($userId, $password, $adminUser) { + public static function setPassword(int $userId, string $password, User $adminUser): void { $user = UserUtils::getUser($userId); if ($user->getId() == $adminUser->getId()) { throw new HTException("To change your own password go to your settings!"); @@ -205,6 +205,7 @@ public static function setPassword($userId, $password, $adminUser) { * @param int $rightGroupId * @param User $adminUser * @param bool $isValid + * @param int $session_lifetime * @return User * @throws HTException * @throws HttpConflict @@ -262,7 +263,7 @@ public static function createUser(string $username, string $email, int $rightGro * @return User * @throws HTException */ - public static function getUser($userId) { + public static function getUser(int $userId): User { $user = Factory::getUserFactory()->get($userId); if ($user == null) { throw new HTException("Invalid user ID!"); From 6a0087ef9a5a2052a922aa67cef8b192c92f086f Mon Sep 17 00:00:00 2001 From: s3inlc Date: Wed, 20 May 2026 14:28:21 +0200 Subject: [PATCH 550/691] fixed some issues in the CORS tests --- .../inc/apiv2/util/CorsHackMiddlewareTest.php | 39 +++++++++++-------- 1 file changed, 22 insertions(+), 17 deletions(-) diff --git a/ci/phpunit/inc/apiv2/util/CorsHackMiddlewareTest.php b/ci/phpunit/inc/apiv2/util/CorsHackMiddlewareTest.php index 17dd123c0..57cace8e5 100644 --- a/ci/phpunit/inc/apiv2/util/CorsHackMiddlewareTest.php +++ b/ci/phpunit/inc/apiv2/util/CorsHackMiddlewareTest.php @@ -1,15 +1,12 @@ expectNotToPerformAssertions(); @@ -97,7 +95,8 @@ public function testInvalidLocalhostPort(): void { $response = $app->getResponseFactory()->createResponse(); $request->setHeaderLine("http://127.0.0.1:4201"); - $this->expectException(CorsHackMiddleware::CheckCORS($request, $response)); + + CorsHackMiddleware::CheckCORS($request, $response); } /** @@ -118,7 +117,8 @@ public function testEvilDomainForLocalhost(): void { $response = $app->getResponseFactory()->createResponse(); $request->setHeaderLine("http://evil.com:4200"); - $this->expectException(CorsHackMiddleware::CheckCORS($request, $response)); + + CorsHackMiddleware::CheckCORS($request, $response); } /** @@ -139,7 +139,8 @@ public function testEvilIPForLocalhost(): void { $response = $app->getResponseFactory()->createResponse(); $request->setHeaderLine("http://137.137.137.1:4200"); - $this->expectException(CorsHackMiddleware::CheckCORS($request, $response)); + + CorsHackMiddleware::CheckCORS($request, $response); } /** @@ -160,13 +161,15 @@ public function testInvalidDomainPort(): void { $response = $app->getResponseFactory()->createResponse(); $request->setHeaderLine("http://hashtopolis-cluster.com:4201"); - $this->expectException(CorsHackMiddleware::CheckCORS($request, $response)); + + CorsHackMiddleware::CheckCORS($request, $response); } - + /** * Tests a valid domain without port as origin. - * - */ + * + * @throws HttpForbidden + */ public function testValidDomainWithoutPort(): void { $this->expectNotToPerformAssertions(); @@ -202,12 +205,13 @@ public function testValidHttpsDomainWithoutPort(): void { $request->setHeaderLine("https://hashtopolis-cluster.com"); CorsHackMiddleware::CheckCORS($request, $response); } - + /** * Tests a valid https-domain with port as origin but configured http-backend-url. * The http:// or https:// are not part of the CORS checks. - * - */ + * + * @throws HttpForbidden + */ public function testValidHttpsDomainWithPortWithHttpConfig(): void { $this->expectNotToPerformAssertions(); @@ -223,11 +227,12 @@ public function testValidHttpsDomainWithPortWithHttpConfig(): void { $request->setHeaderLine("https://hashtopolis-cluster.com:8080"); CorsHackMiddleware::CheckCORS($request, $response); } - + /** * Tests a valid domain with a differnt frontend port as origin. - * - */ + * + * @throws HttpForbidden + */ public function testValidDomainWithoutDifferentFrontendPort(): void { $this->expectNotToPerformAssertions(); From 19b7fc48a1660e79f6bda0bb6454a7a7a4b6ffa2 Mon Sep 17 00:00:00 2001 From: andreas Date: Wed, 20 May 2026 14:49:17 +0200 Subject: [PATCH 551/691] Added unit tests and type for parameters and returns --- ci/phpunit/TestBase.php | 2 + .../inc/utils/AccessControlUtilsTest.php | 268 ++++++++++++++++++ src/inc/utils/AccessControlUtils.php | 14 +- 3 files changed, 277 insertions(+), 7 deletions(-) create mode 100644 ci/phpunit/inc/utils/AccessControlUtilsTest.php diff --git a/ci/phpunit/TestBase.php b/ci/phpunit/TestBase.php index a2fa4e465..b4701b278 100644 --- a/ci/phpunit/TestBase.php +++ b/ci/phpunit/TestBase.php @@ -16,6 +16,7 @@ class TestBase extends TestCase { private array $databaseObjects; protected User $adminUser; + #[Override] protected function setUp(): void { parent::setUp(); @@ -25,6 +26,7 @@ protected function setUp(): void { \hashtopolis_clear_test_mocks(); } + #[Override] protected function tearDown(): void { \hashtopolis_clear_test_mocks(); diff --git a/ci/phpunit/inc/utils/AccessControlUtilsTest.php b/ci/phpunit/inc/utils/AccessControlUtilsTest.php new file mode 100644 index 000000000..eb843f448 --- /dev/null +++ b/ci/phpunit/inc/utils/AccessControlUtilsTest.php @@ -0,0 +1,268 @@ +group = $this->createDatabaseObject( + Factory::getRightGroupFactory(), + new RightGroup(null, 'phpunit-' . uniqid('', true), '[]') + ); + + $this->otherGroup = $this->createDatabaseObject( + Factory::getRightGroupFactory(), + new RightGroup(null, 'phpunit-' . uniqid('', true), '[]') + ); + } + + #[Override] + protected function tearDown(): void{ + parent::tearDown(); + } + + + + public function testGetMembersOfGroupReturnsOnlyMembersOfGroup(): void { + $firstMember = $this->createDatabaseObject( + Factory::getUserFactory(), + new User(null, 'phpunit_' . uniqid(), 'phpunit_' . uniqid() . '@example.com', 'hash', 'salt', 1, 0, 0, time(), 3600, $this->group->getId(), '', '', '', '', '') + ); + + $secondMember = $this->createDatabaseObject( + Factory::getUserFactory(), + new User(null, 'phpunit_' . uniqid(), 'phpunit_' . uniqid() . '@example.com', 'hash', 'salt', 1, 0, 0, time(), 3600, $this->group->getId(), '', '', '', '', '') + ); + + $otherMember = $this->createDatabaseObject( + Factory::getUserFactory(), + new User(null, 'phpunit_' . uniqid(), 'phpunit_' . uniqid() . '@example.com', 'hash', 'salt', 1, 0, 0, time(), 3600, $this->otherGroup->getId(), '', '', '', '', '') + ); + + $members = AccessControlUtils::getMembers($this->group->getId()); + $memberIds = array_map(static fn (User $user): int => $user->getId(), $members); + + $this->assertCount(2, $members); + $this->assertContains($firstMember->getId(), $memberIds); + $this->assertContains($secondMember->getId(), $memberIds); + $this->assertNotContains($otherMember->getId(), $memberIds); + } + + public function testThatAdminGroupPermissionCanNotBeAltered(): void { + $this->expectException(HTException::class); + AccessControlUtils::addToPermissions( + $this->adminUser->getRightGroupId(), + [DAccessControl::MANAGE_TASK_ACCESS => true] + ); + } + + public function testAddPermissionsToNonExistentGroup(): void { + $this->expectException(HTException::class); + AccessControlUtils::addToPermissions( + -3, + [DAccessControl::MANAGE_TASK_ACCESS => true] + ); + } + + public function testGetGroupLoadsExistingGroup(): void { + $loadedGroup = AccessControlUtils::getGroup($this->group->getId()); + + $this->assertInstanceOf(RightGroup::class, $loadedGroup); + $this->assertSame($this->group->getId(), $loadedGroup->getId()); + $this->assertSame($this->group->getGroupName(), $loadedGroup->getGroupName()); + } + + public function testGetGroupThrowsForNonExistentGroup(): void { + $this->expectException(HTException::class); + AccessControlUtils::getGroup(-3); + } + + public function testAddToPermissionThrowsOnNonExistentGroup(): void { + $this->expectException(HTException::class); + AccessControlUtils::addToPermissions( + -3, + [DAccessControl::MANAGE_TASK_ACCESS => true], + ); + } + + public function testAddPermissionToGroup(): void { + AccessControlUtils::addToPermissions( + $this->group->getId(), + [DAccessControl::MANAGE_TASK_ACCESS => true], + ); + + $updatedGroup = Factory::getRightGroupFactory()->get($this->group->getId()); + $permissions = json_decode($updatedGroup->getPermissions(), true); + + $this->assertIsArray($permissions); + $this->assertArrayHasKey(DAccessControl::MANAGE_TASK_ACCESS, $permissions); + $this->assertTrue($permissions[DAccessControl::MANAGE_TASK_ACCESS]); + } + + //TODO: This seems off, we can write stuff in the permissions, we maybe should check that the permission is actually valid or throw. + public function testAddNonExistentPermissionToGroup(): void { + $nonexistentPermission = "nonexistent"; + AccessControlUtils::addToPermissions( + $this->group->getId(), + [$nonexistentPermission => true], + ); + + $updatedGroup = Factory::getRightGroupFactory()->get($this->group->getId()); + $permissions = json_decode($updatedGroup->getPermissions(), true); + + $this->assertIsArray($permissions); + $this->assertArrayHasKey($nonexistentPermission, $permissions); + } + + public function testUpdateNonexistentGroupThrowsException() { + $this->expectException(HTException::class); + AccessControlUtils::updateGroupPermissions( + -3, + [DAccessControl::CRACKER_BINARY_ACCESS => true], + ); + } + + public function testUpdateAdminPermissionsIsNotAllowed(): void { + $this->expectException(HTException::class); + AccessControlUtils::updateGroupPermissions( + $this->adminUser->getRightGroupId(), + [DAccessControl::CRACKER_BINARY_ACCESS => true], + ); + } + + public function testUpdatePermission() { + $changed = AccessControlUtils::updateGroupPermissions( + $this->group->getId(), + [DAccessControl::MANAGE_TASK_ACCESS . '-1'] + ); + + $updatedGroup = Factory::getRightGroupFactory()->get($this->group->getId()); + $permissions = json_decode($updatedGroup->getPermissions(), true); + + $this->assertFalse($changed); + $this->assertIsArray($permissions); + $this->assertArrayHasKey(DAccessControl::MANAGE_TASK_ACCESS, $permissions); + $this->assertTrue($permissions[DAccessControl::MANAGE_TASK_ACCESS]); + } + + public function testUpdatePermissionIgnoresValidPermissionWithInvalidInteger(): void { + $changed = AccessControlUtils::updateGroupPermissions( + $this->group->getId(), + [DAccessControl::MANAGE_TASK_ACCESS . '-2'] + ); + + $updatedGroup = Factory::getRightGroupFactory()->get($this->group->getId()); + $permissions = json_decode($updatedGroup->getPermissions(), true); + + $this->assertFalse($changed); + $this->assertSame([], $permissions); + } + + public function testUpdatePermissionIgnoresInvalidPermissionWithValidInteger(): void { + $changed = AccessControlUtils::updateGroupPermissions( + $this->group->getId(), + ['nonexistentPermission-1'] + ); + + $updatedGroup = Factory::getRightGroupFactory()->get($this->group->getId()); + $permissions = json_decode($updatedGroup->getPermissions(), true); + + $this->assertFalse($changed); + $this->assertSame([], $permissions); + } + + public function testUpdatePermissionAppliesDependencyOverride(): void { + $changed = AccessControlUtils::updateGroupPermissions( + $this->group->getId(), + [ + DAccessControl::MANAGE_AGENT_ACCESS . '-1', + DAccessControl::VIEW_AGENT_ACCESS[0] . '-0' + ] + ); + + $updatedGroup = Factory::getRightGroupFactory()->get($this->group->getId()); + $permissions = json_decode($updatedGroup->getPermissions(), true); + + $this->assertTrue($changed); + $this->assertIsArray($permissions); + $this->assertArrayHasKey(DAccessControl::MANAGE_AGENT_ACCESS, $permissions); + $this->assertTrue($permissions[DAccessControl::MANAGE_AGENT_ACCESS]); + $this->assertArrayHasKey(DAccessControl::VIEW_AGENT_ACCESS[0], $permissions); + $this->assertTrue($permissions[DAccessControl::VIEW_AGENT_ACCESS[0]]); + } + + public function testCreateGroupThrowsForEmptyName(): void { + $this->expectException(HttpError::class); + + AccessControlUtils::createGroup(''); + } + + public function testCreateGroupThrowsForNameLongerThanMaxLength(): void { + $this->expectException(HttpError::class); + + AccessControlUtils::createGroup(str_repeat('a', DLimits::ACCESS_GROUP_MAX_LENGTH + 1)); + } + + public function testCreateGroupAllowsNameAtMaxLength(): void { + $group = AccessControlUtils::createGroup(str_repeat('a', DLimits::ACCESS_GROUP_MAX_LENGTH)); + $this->registerDatabaseObject(Factory::getRightGroupFactory(), $group); + + $this->assertInstanceOf(RightGroup::class, $group); + $this->assertSame(DLimits::ACCESS_GROUP_MAX_LENGTH, strlen($group->getGroupName())); + } + + public function testCreateGroupThrowsForExistingGroupName(): void { + $this->expectException(HttpConflict::class); + + AccessControlUtils::createGroup($this->group->getGroupName()); + } + + public function testDeleteGroupThrowsForNonExistentGroup(): void { + $this->expectException(HTException::class); + + AccessControlUtils::deleteGroup(-3); + } + + public function testDeleteGroupThrowsWhenGroupHasUsers(): void { + $this->createDatabaseObject( + Factory::getUserFactory(), + new User(null, 'phpunit_' . uniqid(), 'phpunit_' . uniqid() . '@example.com', 'hash', 'salt', 1, 0, 0, time(), 3600, $this->group->getId(), '', '', '', '', '') + ); + + $this->expectException(HttpError::class); + + AccessControlUtils::deleteGroup($this->group->getId()); + } + + public function testDeleteGroupDeletesEmptyGroup(): void { + $groupId = $this->group->getId(); + + AccessControlUtils::deleteGroup($groupId); + + $this->expectException(HTException::class); + AccessControlUtils::getGroup($groupId); + } + +} \ No newline at end of file diff --git a/src/inc/utils/AccessControlUtils.php b/src/inc/utils/AccessControlUtils.php index ce1715387..d82d30464 100644 --- a/src/inc/utils/AccessControlUtils.php +++ b/src/inc/utils/AccessControlUtils.php @@ -17,7 +17,7 @@ class AccessControlUtils { * @param int $groupId * @return User[] */ - public static function getMembers($groupId) { + public static function getMembers($groupId): ?array { $qF = new QueryFilter(User::RIGHT_GROUP_ID, $groupId, "="); return Factory::getUserFactory()->filter([Factory::FILTER => $qF]); } @@ -25,14 +25,14 @@ public static function getMembers($groupId) { /** * @return RightGroup[] */ - public static function getGroups() { + public static function getGroups(): ?array { return Factory::getRightGroupFactory()->filter([]); } /** * @throws HTException */ - public static function addToPermissions($groupId, $perm) { + public static function addToPermissions(int $groupId, array $perm): void { $group = AccessControlUtils::getGroup($groupId); $current_permissions = $group->getPermissions(); if ($current_permissions == 'ALL') { @@ -46,11 +46,11 @@ public static function addToPermissions($groupId, $perm) { /** * @param int $groupId - * @param array $perm + * @param array $perm - Array of strings, permission-1|0 * @return boolean * @throws HTException */ - public static function updateGroupPermissions($groupId, $perm) { + public static function updateGroupPermissions(int $groupId, array $perm): bool { $group = AccessControlUtils::getGroup($groupId); if ($group->getPermissions() == 'ALL') { throw new HTException("Administrator group cannot be changed!"); @@ -116,7 +116,7 @@ public static function createGroup(string $groupName): RightGroup { * @throws HttpError * @throws HTException */ - public static function deleteGroup($groupId) { + public static function deleteGroup(int $groupId): void { $group = AccessControlUtils::getGroup($groupId); $qF = new QueryFilter(User::RIGHT_GROUP_ID, $group->getId(), "="); $count = Factory::getUserFactory()->countFilter([Factory::FILTER => $qF]); @@ -133,7 +133,7 @@ public static function deleteGroup($groupId) { * @return RightGroup * @throws HTException */ - public static function getGroup($groupId) { + public static function getGroup(int $groupId): RightGroup { $group = Factory::getRightGroupFactory()->get($groupId); if ($group === null) { throw new HTException("Invalid group!"); From f41b62c63dc53f914c129569b84739ef540be466 Mon Sep 17 00:00:00 2001 From: s3inlc Date: Wed, 20 May 2026 14:59:10 +0200 Subject: [PATCH 552/691] adding migration to fix inconsistency on the HashType table --- src/migrations/mysql/20260520145000_mysql-autoincrement.sql | 5 +++++ .../postgres/20260520145000_mysql-autoincrement.sql | 1 + 2 files changed, 6 insertions(+) create mode 100644 src/migrations/mysql/20260520145000_mysql-autoincrement.sql create mode 100644 src/migrations/postgres/20260520145000_mysql-autoincrement.sql diff --git a/src/migrations/mysql/20260520145000_mysql-autoincrement.sql b/src/migrations/mysql/20260520145000_mysql-autoincrement.sql new file mode 100644 index 000000000..0b84e4d65 --- /dev/null +++ b/src/migrations/mysql/20260520145000_mysql-autoincrement.sql @@ -0,0 +1,5 @@ +-- Make that HashtType also uses AUTO_INCREMENT to be consistent with the SERIAL we have in postgres. +-- But it is set to higher than you would ever have in hc modes to avoid collisions. +ALTER TABLE `HashType` + MODIFY `hashTypeId` INT NOT NULL AUTO_INCREMENT, + AUTO_INCREMENT = 100000; \ No newline at end of file diff --git a/src/migrations/postgres/20260520145000_mysql-autoincrement.sql b/src/migrations/postgres/20260520145000_mysql-autoincrement.sql new file mode 100644 index 000000000..5c12d9e57 --- /dev/null +++ b/src/migrations/postgres/20260520145000_mysql-autoincrement.sql @@ -0,0 +1 @@ +-- This migration is only a placeholder to keep migrations parallel From 48ee7346b73026dbfa7f852b65e63aaf81b72120 Mon Sep 17 00:00:00 2001 From: s3inlc Date: Wed, 20 May 2026 15:05:23 +0200 Subject: [PATCH 553/691] do not change the type to avoid migration problems --- src/migrations/mysql/20260520145000_mysql-autoincrement.sql | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/migrations/mysql/20260520145000_mysql-autoincrement.sql b/src/migrations/mysql/20260520145000_mysql-autoincrement.sql index 0b84e4d65..9d59bda51 100644 --- a/src/migrations/mysql/20260520145000_mysql-autoincrement.sql +++ b/src/migrations/mysql/20260520145000_mysql-autoincrement.sql @@ -1,5 +1,5 @@ -- Make that HashtType also uses AUTO_INCREMENT to be consistent with the SERIAL we have in postgres. -- But it is set to higher than you would ever have in hc modes to avoid collisions. ALTER TABLE `HashType` - MODIFY `hashTypeId` INT NOT NULL AUTO_INCREMENT, + MODIFY `hashTypeId` AUTO_INCREMENT, AUTO_INCREMENT = 100000; \ No newline at end of file From e91166ed719c3944af26379ab05725fdf5f54686 Mon Sep 17 00:00:00 2001 From: s3inlc Date: Wed, 20 May 2026 15:12:09 +0200 Subject: [PATCH 554/691] do not change the type to avoid migration problems --- src/migrations/mysql/20260520145000_mysql-autoincrement.sql | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/migrations/mysql/20260520145000_mysql-autoincrement.sql b/src/migrations/mysql/20260520145000_mysql-autoincrement.sql index 9d59bda51..0ffdb6b10 100644 --- a/src/migrations/mysql/20260520145000_mysql-autoincrement.sql +++ b/src/migrations/mysql/20260520145000_mysql-autoincrement.sql @@ -1,5 +1,5 @@ --- Make that HashtType also uses AUTO_INCREMENT to be consistent with the SERIAL we have in postgres. +-- Make that HashType also uses AUTO_INCREMENT to be consistent with the SERIAL we have in postgres. -- But it is set to higher than you would ever have in hc modes to avoid collisions. ALTER TABLE `HashType` - MODIFY `hashTypeId` AUTO_INCREMENT, + MODIFY `hashTypeId` INT(11) NOT NULL AUTO_INCREMENT, AUTO_INCREMENT = 100000; \ No newline at end of file From 16d0c74b7f28cd6a250fa0cee66c5757922f2dbe Mon Sep 17 00:00:00 2001 From: s3inlc Date: Wed, 20 May 2026 15:18:03 +0200 Subject: [PATCH 555/691] disable checks for the change --- src/migrations/mysql/20260520145000_mysql-autoincrement.sql | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/src/migrations/mysql/20260520145000_mysql-autoincrement.sql b/src/migrations/mysql/20260520145000_mysql-autoincrement.sql index 0ffdb6b10..81d9133bb 100644 --- a/src/migrations/mysql/20260520145000_mysql-autoincrement.sql +++ b/src/migrations/mysql/20260520145000_mysql-autoincrement.sql @@ -1,5 +1,7 @@ -- Make that HashType also uses AUTO_INCREMENT to be consistent with the SERIAL we have in postgres. -- But it is set to higher than you would ever have in hc modes to avoid collisions. +SET FOREIGN_KEY_CHECKS = 0; ALTER TABLE `HashType` MODIFY `hashTypeId` INT(11) NOT NULL AUTO_INCREMENT, - AUTO_INCREMENT = 100000; \ No newline at end of file + AUTO_INCREMENT = 100000; +SET FOREIGN_KEY_CHECKS = 1; \ No newline at end of file From e365c898a516accc004aa6781c16823e49d601d3 Mon Sep 17 00:00:00 2001 From: s3inlc Date: Wed, 20 May 2026 16:03:37 +0200 Subject: [PATCH 556/691] fixed required changes --- ci/phpunit/dba/AbstractModelFactoryTest.php | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/ci/phpunit/dba/AbstractModelFactoryTest.php b/ci/phpunit/dba/AbstractModelFactoryTest.php index dd23c8fe5..b5db944c4 100644 --- a/ci/phpunit/dba/AbstractModelFactoryTest.php +++ b/ci/phpunit/dba/AbstractModelFactoryTest.php @@ -86,7 +86,7 @@ public function testGetMappedModelKeyWithoutRemapping(): void { } /** - * Test that for a aapped key the return value gets mapped + * Test that for a mapped key the return value gets mapped * * @return void */ @@ -213,8 +213,8 @@ public function testUpdateModelSuccessMultipleChanges(): void { $hashTypeUpdated = Factory::getHashTypeFactory()->get($hashType->getId()); $this->assertEquals('HashType X', $hashTypeUpdated->getDescription()); - $this->assertEquals(1, $hashType->getIsSalted()); - $this->assertEquals(1, $hashType->getIsSlowHash()); + $this->assertEquals(1, $hashTypeUpdated->getIsSalted()); + $this->assertEquals(1, $hashTypeUpdated->getIsSlowHash()); } /** From 334aa3335ed9f796d065c6b817846bab7bde5e37 Mon Sep 17 00:00:00 2001 From: s3inlc Date: Wed, 20 May 2026 16:14:14 +0200 Subject: [PATCH 557/691] access groups also should be enforced on admin permissions --- src/inc/apiv2/common/AbstractModelAPI.php | 19 ++++++++----------- 1 file changed, 8 insertions(+), 11 deletions(-) diff --git a/src/inc/apiv2/common/AbstractModelAPI.php b/src/inc/apiv2/common/AbstractModelAPI.php index eebe9120b..2e1adcb66 100644 --- a/src/inc/apiv2/common/AbstractModelAPI.php +++ b/src/inc/apiv2/common/AbstractModelAPI.php @@ -622,17 +622,14 @@ public static function getManyResources(object $apiClass, Request $request, Resp /* Generate filters */ $filters = $apiClass->getFilters($request); $qFs_Filter = $apiClass->makeFilter($filters, $apiClass, $joinFilters); - $group = Factory::getRightGroupFactory()->get($apiClass->getCurrentUser()->getRightGroupId()); - if ($group->getPermissions() !== 'ALL') { // Only add permission filters when no admin user - $aFs_ACL = $apiClass->getFilterACL(); - if (isset($aFs_ACL[Factory::FILTER])) { - $qFs_Filter = array_merge($aFs_ACL[Factory::FILTER], $qFs_Filter); - } - if (isset($aFs_ACL[Factory::JOIN])) { - foreach($aFs_ACL[Factory::JOIN] as $filter) { - if(!$apiClass::checkJoinExists($joinFilters, $filter->getOtherFactory()->getModelName())) { - $joinFilters[] = $filter; - } + $aFs_ACL = $apiClass->getFilterACL(); + if (isset($aFs_ACL[Factory::FILTER])) { + $qFs_Filter = array_merge($aFs_ACL[Factory::FILTER], $qFs_Filter); + } + if (isset($aFs_ACL[Factory::JOIN])) { + foreach($aFs_ACL[Factory::JOIN] as $filter) { + if(!$apiClass::checkJoinExists($joinFilters, $filter->getOtherFactory()->getModelName())) { + $joinFilters[] = $filter; } } } From 5a1b8d3ad4f86c70af824a9905e001005778d897 Mon Sep 17 00:00:00 2001 From: s3inlc Date: Wed, 20 May 2026 16:34:11 +0200 Subject: [PATCH 558/691] try to cover the tests with phpstan also --- phpstan.neon | 3 +++ 1 file changed, 3 insertions(+) diff --git a/phpstan.neon b/phpstan.neon index 87dfaba23..84e02c712 100644 --- a/phpstan.neon +++ b/phpstan.neon @@ -1,6 +1,9 @@ parameters: paths: - src/inc/apiv2 + - ci/phpunit/dba + - ci/phpunit/inc + - ci/phpunit/TestBase.php level: 4 treatPhpDocTypesAsCertain: false scanDirectories: From 7f9efc32cd5d2fb93d8f8192f78c444196ad9677 Mon Sep 17 00:00:00 2001 From: s3inlc Date: Wed, 20 May 2026 16:37:05 +0200 Subject: [PATCH 559/691] include everything --- phpstan.neon | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/phpstan.neon b/phpstan.neon index 84e02c712..2bec3ecf0 100644 --- a/phpstan.neon +++ b/phpstan.neon @@ -1,9 +1,7 @@ parameters: paths: - src/inc/apiv2 - - ci/phpunit/dba - - ci/phpunit/inc - - ci/phpunit/TestBase.php + - ci/phpunit level: 4 treatPhpDocTypesAsCertain: false scanDirectories: From c39fadbc807dd30a4b62061bff3b916427f4b6bc Mon Sep 17 00:00:00 2001 From: s3inlc Date: Wed, 20 May 2026 16:41:16 +0200 Subject: [PATCH 560/691] assert to make sure phpstan knows the type --- ci/phpunit/dba/AbstractModelFactoryTest.php | 1 + 1 file changed, 1 insertion(+) diff --git a/ci/phpunit/dba/AbstractModelFactoryTest.php b/ci/phpunit/dba/AbstractModelFactoryTest.php index b5db944c4..41ac634ed 100644 --- a/ci/phpunit/dba/AbstractModelFactoryTest.php +++ b/ci/phpunit/dba/AbstractModelFactoryTest.php @@ -326,6 +326,7 @@ public function testTimeseriesFilter(): void { // build the array on our own to compare $expected = []; foreach ($hashes as $hash) { + $this->assertTrue($hash instanceof Hash); if ($hash->getisCracked() != 1) { continue; } From 88649c5b646b6058ba3305a2bf7a24f7cbd358a2 Mon Sep 17 00:00:00 2001 From: s3inlc Date: Thu, 21 May 2026 08:49:53 +0200 Subject: [PATCH 561/691] check for existing of array key before accessing it --- src/inc/apiv2/common/AbstractModelAPI.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/inc/apiv2/common/AbstractModelAPI.php b/src/inc/apiv2/common/AbstractModelAPI.php index 2e1adcb66..4af1cc4b2 100644 --- a/src/inc/apiv2/common/AbstractModelAPI.php +++ b/src/inc/apiv2/common/AbstractModelAPI.php @@ -1617,7 +1617,7 @@ public function postToManyRelationshipLink(Request $request, Response $response, if ($relationKey == null) { throw new HttpError('Relation does not exist!'); } - if ($relation['readonly'] === true) { + if (isset($relation["readonly"]) && $relation['readonly'] === true) { throw new HttpError('This relationship is readonly'); } From 19ac1b56295be6d98a06df689b941cfec77006e3 Mon Sep 17 00:00:00 2001 From: andreas Date: Thu, 21 May 2026 09:02:03 +0200 Subject: [PATCH 562/691] Added tests for AccessGroupUtils --- ci/phpunit/inc/utils/AccessGroupUtilsTest.php | 349 ++++++++++++++++++ src/inc/utils/AccessGroupUtils.php | 7 +- 2 files changed, 353 insertions(+), 3 deletions(-) create mode 100644 ci/phpunit/inc/utils/AccessGroupUtilsTest.php diff --git a/ci/phpunit/inc/utils/AccessGroupUtilsTest.php b/ci/phpunit/inc/utils/AccessGroupUtilsTest.php new file mode 100644 index 000000000..f996114da --- /dev/null +++ b/ci/phpunit/inc/utils/AccessGroupUtilsTest.php @@ -0,0 +1,349 @@ +firstGroup = $this->createAccessGroup('group_one'); + $this->secondGroup = $this->createAccessGroup('group_two'); + $this->firstUser = $this->createUser('user_one'); + $this->secondUser = $this->createUser('user_two'); + $this->firstAgent = $this->createAgent('agent_one'); + $this->secondAgent = $this->createAgent('agent_two'); + + $this->createDatabaseObject( + Factory::getAccessGroupUserFactory(), + new AccessGroupUser(null, $this->firstGroup->getId(), $this->firstUser->getId()) + ); + $this->createDatabaseObject( + Factory::getAccessGroupUserFactory(), + new AccessGroupUser(null, $this->secondGroup->getId(), $this->secondUser->getId()) + ); + $this->createDatabaseObject( + Factory::getAccessGroupAgentFactory(), + new AccessGroupAgent(null, $this->firstGroup->getId(), $this->firstAgent->getId()) + ); + $this->createDatabaseObject( + Factory::getAccessGroupAgentFactory(), + new AccessGroupAgent(null, $this->secondGroup->getId(), $this->secondAgent->getId()) + ); + } + + #[Override] + protected function tearDown(): void { + parent::tearDown(); + } + + public function testGetUsersReturnsUsersAssignedToRequestedGroup(): void { + $users = AccessGroupUtils::getUsers($this->firstGroup->getId()); + + $this->assertCount(1, $users); + $this->assertSame($this->firstGroup->getId(), $users[0]->getAccessGroupId()); + $this->assertSame($this->firstUser->getId(), $users[0]->getUserId()); + } + + public function testGetAgentsReturnsAgentsAssignedToRequestedGroup(): void { + $agents = AccessGroupUtils::getAgents($this->firstGroup->getId()); + + $this->assertCount(1, $agents); + $this->assertSame($this->firstGroup->getId(), $agents[0]->getAccessGroupId()); + $this->assertSame($this->firstAgent->getId(), $agents[0]->getAgentId()); + } + + public function testGetGroupsReturnsAtLeastCreatedGroups(): void { + $groups = AccessGroupUtils::getGroups(); + $groupIds = array_map( + fn (AccessGroup $group) => $group->getId(), + $groups + ); + + $this->assertContains($this->firstGroup->getId(), $groupIds); + $this->assertContains($this->secondGroup->getId(), $groupIds); + } + + public function testCreateGroupThrowsForEmptyName(): void { + $this->expectException(HttpError::class); + AccessGroupUtils::createGroup(''); + } + + public function testCreateGroupThrowsForNameLongerThanMaxLength(): void { + $this->expectException(HttpError::class); + AccessGroupUtils::createGroup(str_repeat('a', DLimits::ACCESS_GROUP_MAX_LENGTH + 1)); + } + + public function testCreateGroupThrowsForExistingGroupName(): void { + $this->expectException(HttpConflict::class); + AccessGroupUtils::createGroup($this->firstGroup->getGroupName()); + } + + public function testCreateGroupCreatesGroupWithValidUniqueName(): void { + $groupName = 'created_group_' . uniqid(); + + $group = AccessGroupUtils::createGroup($groupName); + $this->registerDatabaseObject(Factory::getAccessGroupFactory(), $group); + + $this->assertInstanceOf(AccessGroup::class, $group); + $this->assertSame($groupName, $group->getGroupName()); + $this->assertNotNull($group->getId()); + $this->assertSame($groupName, Factory::getAccessGroupFactory()->get($group->getId())->getGroupName()); + } + + public function testRenameThrowsForNonExistentGroup(): void { + $this->expectException(HTException::class); + AccessGroupUtils::rename(-1, 'renamed_group'); + } + + public function testRenameThrowsForEmptyName(): void { + $this->expectException(HTException::class); + AccessGroupUtils::rename($this->firstGroup->getId(), ''); + } + + public function testAbortChunksGroupThrowsForNonExistentGroup(): void { + $this->expectException(HTException::class); + AccessGroupUtils::abortChunksGroup(-1, $this->firstUser); + } + + public function testAbortChunksGroupOnlyAbortsInitAndRunningChunks(): void { + $hashlist = $this->createHashlist($this->firstGroup); + $crackerBinaryType = $this->createCrackerBinaryType(); + $crackerBinary = $this->createCrackerBinary($crackerBinaryType); + $taskWrapper = $this->createTaskWrapper($this->firstGroup, $hashlist); + $task = $this->createTask($taskWrapper, $crackerBinary, $crackerBinaryType); + $statusCases = [ + DHashcatStatus::INIT => DHashcatStatus::ABORTED, + DHashcatStatus::AUTOTUNE => DHashcatStatus::AUTOTUNE, + DHashcatStatus::RUNNING => DHashcatStatus::ABORTED, + DHashcatStatus::PAUSED => DHashcatStatus::PAUSED, + DHashcatStatus::EXHAUSTED => DHashcatStatus::EXHAUSTED, + DHashcatStatus::CRACKED => DHashcatStatus::CRACKED, + DHashcatStatus::ABORTED => DHashcatStatus::ABORTED, + DHashcatStatus::QUIT => DHashcatStatus::QUIT, + DHashcatStatus::BYPASS => DHashcatStatus::BYPASS, + DHashcatStatus::ABORTED_CHECKPOINT => DHashcatStatus::ABORTED_CHECKPOINT, + DHashcatStatus::STATUS_ABORTED_RUNTIME => DHashcatStatus::STATUS_ABORTED_RUNTIME, + ]; + + + $chunksByState = []; + foreach ($statusCases as $initialState => $expectedState) { + $chunksByState[$initialState] = $this->createChunk($task, $this->firstAgent, $initialState); + } + + AccessGroupUtils::abortChunksGroup($this->firstGroup->getId(), $this->firstUser); + + foreach ($statusCases as $initialState => $expectedState) { + $updatedChunk = Factory::getChunkFactory()->get($chunksByState[$initialState]->getId()); + + $this->assertInstanceOf(Chunk::class, $updatedChunk); + $this->assertSame($expectedState, $updatedChunk->getState()); + } + } + + public function testAddAgentAddsAgentToGroup(): void { + AccessGroupUtils::addAgent($this->secondAgent->getId(), $this->firstGroup->getId()); + + $qF1 = new QueryFilter(AccessGroupAgent::ACCESS_GROUP_ID, $this->firstGroup->getId(), '='); + $qF2 = new QueryFilter(AccessGroupAgent::AGENT_ID, $this->secondAgent->getId(), '='); + $addedMembership = Factory::getAccessGroupAgentFactory()->filter([Factory::FILTER => [$qF1, $qF2]], true); + + $this->assertInstanceOf(AccessGroupAgent::class, $addedMembership); + $this->assertSame($this->firstGroup->getId(), $addedMembership->getAccessGroupId()); + $this->assertSame($this->secondAgent->getId(), $addedMembership->getAgentId()); + $this->registerDatabaseObject(Factory::getAccessGroupAgentFactory(), $addedMembership); + } + + public function testAddAgentThrowsWhenAgentAlreadyInGroup(): void { + $this->expectException(HTException::class); + AccessGroupUtils::addAgent($this->firstAgent->getId(), $this->firstGroup->getId()); + } + + public function testAddUserAddsUserToGroup(): void { + AccessGroupUtils::addUser($this->secondUser->getId(), $this->firstGroup->getId()); + + $qF1 = new QueryFilter(AccessGroupUser::ACCESS_GROUP_ID, $this->firstGroup->getId(), '='); + $qF2 = new QueryFilter(AccessGroupUser::USER_ID, $this->secondUser->getId(), '='); + $addedMembership = Factory::getAccessGroupUserFactory()->filter([Factory::FILTER => [$qF1, $qF2]], true); + + $this->assertInstanceOf(AccessGroupUser::class, $addedMembership); + $this->assertSame($this->firstGroup->getId(), $addedMembership->getAccessGroupId()); + $this->assertSame($this->secondUser->getId(), $addedMembership->getUserId()); + $this->registerDatabaseObject(Factory::getAccessGroupUserFactory(), $addedMembership); + } + + public function testAddUserThrowsWhenUserAlreadyInGroup(): void { + $this->expectException(HTException::class); + AccessGroupUtils::addUser($this->firstUser->getId(), $this->firstGroup->getId()); + } + + public function testRemoveAgentRemovesAgentFromGroup(): void { + AccessGroupUtils::removeAgent($this->firstAgent->getId(), $this->firstGroup->getId()); + + $qF1 = new QueryFilter(AccessGroupAgent::ACCESS_GROUP_ID, $this->firstGroup->getId(), '='); + $qF2 = new QueryFilter(AccessGroupAgent::AGENT_ID, $this->firstAgent->getId(), '='); + $removedMembership = Factory::getAccessGroupAgentFactory()->filter([Factory::FILTER => [$qF1, $qF2]], true); + + $this->assertNull($removedMembership); + } + + public function testRemoveAgentThrowsWhenAgentIsNotInGroup(): void { + $this->expectException(HTException::class); + AccessGroupUtils::removeAgent($this->secondAgent->getId(), $this->firstGroup->getId()); + } + + public function testRemoveUserRemovesUserFromGroup(): void { + AccessGroupUtils::removeUser($this->firstUser->getId(), $this->firstGroup->getId()); + + $qF1 = new QueryFilter(AccessGroupUser::ACCESS_GROUP_ID, $this->firstGroup->getId(), '='); + $qF2 = new QueryFilter(AccessGroupUser::USER_ID, $this->firstUser->getId(), '='); + $removedMembership = Factory::getAccessGroupUserFactory()->filter([Factory::FILTER => [$qF1, $qF2]], true); + + $this->assertNull($removedMembership); + } + + public function testRemoveUserThrowsWhenUserIsNotInGroup(): void { + $this->expectException(HTException::class); + AccessGroupUtils::removeUser($this->secondUser->getId(), $this->firstGroup->getId()); + } + + public function testDeleteGroupThrowsForDefaultGroup(): void { + $defaultGroup = AccessUtils::getOrCreateDefaultAccessGroup(); + + $this->expectException(HTException::class); + AccessGroupUtils::deleteGroup($defaultGroup->getId()); + } + + + + + + + + /* + * Local test helpers + */ + private function createAccessGroup(string $prefix): AccessGroup { + $group = $this->createDatabaseObject( + Factory::getAccessGroupFactory(), + new AccessGroup(null, $prefix . '_' . uniqid()) + ); + $this->assertTrue($group instanceof AccessGroup); + return $group; + } + + private function createAgent(string $prefix): Agent { + $suffix = uniqid('', true); + $agent = $this->createDatabaseObject( + Factory::getAgentFactory(), + new Agent(null, $prefix . '_' . $suffix, 'uid_' . $suffix, 0, '[]', '', 0, 1, 1, 'token_' . uniqid(), 'idle', time(), '127.0.0.1', null, 0, 'sig_' . uniqid()) + ); + $this->assertTrue($agent instanceof Agent); + return $agent; + } + + private function createRightGroup(): RightGroup { + $group = $this->createDatabaseObject(Factory::getRightGroupFactory(), new RightGroup(null, 'phpunit-' . uniqid('', true), '[]')); + $this->assertTrue($group instanceof RightGroup); + return $group; + } + + private function createUser(string $prefix): User { + $username = $prefix . '_' . uniqid(); + $user = UserUtils::createUser($username, $username . '@example.com', $this->createRightGroup()->getId(), $this->adminUser); + $this->registerDatabaseObject(Factory::getUserFactory(), $user); + return $user; + } + + private function createHashlist(AccessGroup $group): Hashlist { + $hashlist = $this->createDatabaseObject( + Factory::getHashlistFactory(), + new Hashlist(null, 'hashlist_' . uniqid(), DHashlistFormat::PLAIN, 0, 1, ':', 0, 0, 0, 0, $group->getId(), '', 0, 0, 0) + ); + $this->assertTrue($hashlist instanceof Hashlist); + return $hashlist; + } + + private function createCrackerBinaryType(): CrackerBinaryType { + $crackerBinaryType = $this->createDatabaseObject( + Factory::getCrackerBinaryTypeFactory(), + new CrackerBinaryType(null, 'type_' . uniqid(), 1) + ); + $this->assertTrue($crackerBinaryType instanceof CrackerBinaryType); + return $crackerBinaryType; + } + + private function createCrackerBinary(CrackerBinaryType $crackerBinaryType): CrackerBinary { + $crackerBinary = $this->createDatabaseObject( + Factory::getCrackerBinaryFactory(), + new CrackerBinary(null, $crackerBinaryType->getId(), '1.0.' . uniqid(), 'https://example.invalid/' . uniqid(), 'binary_' . uniqid()) + ); + $this->assertTrue($crackerBinary instanceof CrackerBinary); + return $crackerBinary; + } + + private function createTaskWrapper(AccessGroup $group, Hashlist $hashlist): TaskWrapper { + $taskWrapper = $this->createDatabaseObject( + Factory::getTaskWrapperFactory(), + new TaskWrapper(null, 1, 1, DTaskTypes::NORMAL, $hashlist->getId(), $group->getId(), 'wrapper_' . uniqid(), 0, 0) + ); + $this->assertTrue($taskWrapper instanceof TaskWrapper); + return $taskWrapper; + } + + private function createTask(TaskWrapper $taskWrapper, CrackerBinary $crackerBinary, CrackerBinaryType $crackerBinaryType): Task { + $task = $this->createDatabaseObject( + Factory::getTaskFactory(), + new Task(null, 'task_' . uniqid(), '--attack-mode 0', 60, 30, 0, 0, 1, 1, '#ffffff', 0, 0, 0, 0, $crackerBinary->getId(), $crackerBinaryType->getId(), $taskWrapper->getId(), 0, '', 0, 0, 0, 0, '') + ); + $this->assertTrue($task instanceof Task); + return $task; + } + + private function createChunk(Task $task, Agent $agent, int $state): Chunk { + $chunk = $this->createDatabaseObject( + Factory::getChunkFactory(), + new Chunk(null, $task->getId(), 0, 100, $agent->getId(), time(), 0, 0, 0, $state, 0, 0) + ); + $this->assertTrue($chunk instanceof Chunk); + return $chunk; + } +} \ No newline at end of file diff --git a/src/inc/utils/AccessGroupUtils.php b/src/inc/utils/AccessGroupUtils.php index 5f76ba115..fbcbe7506 100644 --- a/src/inc/utils/AccessGroupUtils.php +++ b/src/inc/utils/AccessGroupUtils.php @@ -13,6 +13,7 @@ use Hashtopolis\dba\models\Hashlist; use Hashtopolis\dba\Factory; use Hashtopolis\dba\models\File; +use Hashtopolis\dba\models\User; use Hashtopolis\inc\apiv2\error\HttpConflict; use Hashtopolis\inc\apiv2\error\HttpError; use Hashtopolis\inc\defines\DHashcatStatus; @@ -42,7 +43,7 @@ public static function getAgents($groupId) { /** * @return AccessGroup[] */ - public static function getGroups() { + public static function getGroups(): ?array { return Factory::getAccessGroupFactory()->filter([]); } @@ -84,7 +85,7 @@ public static function rename($accessGroupId, $newname) { * @param $user * @throws HTException */ - public static function abortChunksGroup($groupId, $user) { + public static function abortChunksGroup(int $groupId, User $user): void { $accessGroups = Util::arrayOfIds(AccessUtils::getAccessGroupsOfUser($user)); if (!in_array($groupId, $accessGroups)) { throw new HTException("User is not a member of this access group!"); @@ -107,7 +108,7 @@ public static function abortChunksGroup($groupId, $user) { * @param int $groupId * @throws HTException */ - public static function addAgent($agentId, $groupId) { + public static function addAgent(int $agentId, int $groupId): void { $group = AccessGroupUtils::getGroup($groupId); $agent = AgentUtils::getAgent($agentId); From aa4d32ba11d56d82d8c9ca1ca9ed6a1a70a8a29c Mon Sep 17 00:00:00 2001 From: andreas Date: Thu, 21 May 2026 10:02:31 +0200 Subject: [PATCH 563/691] Merged dev, added tets --- ci/phpunit/inc/utils/AccessControlTest.php | 4 +- .../inc/utils/AccessControlUtilsTest.php | 6 +- ci/phpunit/inc/utils/AccessGroupUtilsTest.php | 66 ++++++++++++++++--- 3 files changed, 60 insertions(+), 16 deletions(-) diff --git a/ci/phpunit/inc/utils/AccessControlTest.php b/ci/phpunit/inc/utils/AccessControlTest.php index ced76c7c6..a2740d484 100644 --- a/ci/phpunit/inc/utils/AccessControlTest.php +++ b/ci/phpunit/inc/utils/AccessControlTest.php @@ -1,6 +1,6 @@ createHashlist($this->firstGroup); + $hashType = $this->createHashType(); + $hashlist = $this->createHashlist($this->firstGroup, $hashType); $crackerBinaryType = $this->createCrackerBinaryType(); $crackerBinary = $this->createCrackerBinary($crackerBinaryType); $taskWrapper = $this->createTaskWrapper($this->firstGroup, $hashlist); @@ -252,11 +255,36 @@ public function testDeleteGroupThrowsForDefaultGroup(): void { AccessGroupUtils::deleteGroup($defaultGroup->getId()); } - - - - - + public function testDeleteGroupReassignsDependentEntitiesToDefaultGroup(): void { + $defaultGroup = AccessUtils::getOrCreateDefaultAccessGroup(); + $groupToDelete = Factory::getAccessGroupFactory()->save(new AccessGroup(null, 'delete_group_' . uniqid())); + Factory::getAccessGroupUserFactory()->save(new AccessGroupUser(null, $groupToDelete->getId(), $this->firstUser->getId())); + Factory::getAccessGroupAgentFactory()->save(new AccessGroupAgent(null, $groupToDelete->getId(), $this->firstAgent->getId())); + + $hashType = $this->createHashType(); + $hashlist = $this->createHashlist($groupToDelete, $hashType); + $taskWrapper = $this->createTaskWrapper($groupToDelete, $hashlist); + $file = $this->createFile($groupToDelete); + + AccessGroupUtils::deleteGroup($groupToDelete->getId()); + + $updatedHashlist = Factory::getHashlistFactory()->get($hashlist->getId()); + $updatedTaskWrapper = Factory::getTaskWrapperFactory()->get($taskWrapper->getId()); + $updatedFile = Factory::getFileFactory()->get($file->getId()); + $deletedGroup = Factory::getAccessGroupFactory()->get($groupToDelete->getId()); + $remainingUsers = AccessGroupUtils::getUsers($groupToDelete->getId()); + $remainingAgents = AccessGroupUtils::getAgents($groupToDelete->getId()); + + $this->assertInstanceOf(Hashlist::class, $updatedHashlist); + $this->assertSame($defaultGroup->getId(), $updatedHashlist->getAccessGroupId()); + $this->assertInstanceOf(TaskWrapper::class, $updatedTaskWrapper); + $this->assertSame($defaultGroup->getId(), $updatedTaskWrapper->getAccessGroupId()); + $this->assertInstanceOf(File::class, $updatedFile); + $this->assertSame($defaultGroup->getId(), $updatedFile->getAccessGroupId()); + $this->assertNull($deletedGroup); + $this->assertSame([], $remainingUsers); + $this->assertSame([], $remainingAgents); + } /* * Local test helpers @@ -293,10 +321,19 @@ private function createUser(string $prefix): User { return $user; } - private function createHashlist(AccessGroup $group): Hashlist { + private function createHashType(): HashType { + $hashType = $this->createDatabaseObject( + Factory::getHashTypeFactory(), + new HashType(null, 'hash_type_' . uniqid(), 0, 0) + ); + $this->assertTrue($hashType instanceof HashType); + return $hashType; + } + + private function createHashlist(AccessGroup $group, HashType $hashType): Hashlist { $hashlist = $this->createDatabaseObject( Factory::getHashlistFactory(), - new Hashlist(null, 'hashlist_' . uniqid(), DHashlistFormat::PLAIN, 0, 1, ':', 0, 0, 0, 0, $group->getId(), '', 0, 0, 0) + new Hashlist(null, 'hashlist_' . uniqid(), DHashlistFormat::PLAIN, $hashType->getId(), 1, ':', 0, 0, 0, 0, $group->getId(), '', 0, 0, 0) ); $this->assertTrue($hashlist instanceof Hashlist); return $hashlist; @@ -346,4 +383,13 @@ private function createChunk(Task $task, Agent $agent, int $state): Chunk { $this->assertTrue($chunk instanceof Chunk); return $chunk; } + + private function createFile(AccessGroup $group): File { + $file = $this->createDatabaseObject( + Factory::getFileFactory(), + new File(null, 'file_' . uniqid(), 0, 0, 0, $group->getId(), 0) + ); + $this->assertTrue($file instanceof File); + return $file; + } } \ No newline at end of file From 1aa78f2f7c9d4e8f4020377bac16c698952c6c0d Mon Sep 17 00:00:00 2001 From: andreas Date: Thu, 21 May 2026 10:15:24 +0200 Subject: [PATCH 564/691] 2120: Silent test warnings from util.php reading server variables --- ci/phpunit/TestBase.php | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/ci/phpunit/TestBase.php b/ci/phpunit/TestBase.php index fa1329854..00122580e 100644 --- a/ci/phpunit/TestBase.php +++ b/ci/phpunit/TestBase.php @@ -9,6 +9,7 @@ use Hashtopolis\dba\models\UserFactory; use Hashtopolis\inc\utils\UserUtils; use PHPUnit\Framework\TestCase; +use Override; require_once(dirname(__FILE__) . '/TestMocks.php'); require_once(dirname(__FILE__) . '/../../src/inc/startup/include.php'); @@ -25,6 +26,10 @@ protected function setUp(): void { $this->databaseObjects = []; $this->adminUser = new User(1, 'admin', 'admin@example.com', 'hash', 'salt', 1, 0, 0, time(), 3600, 1, '', '', '', '', ''); + //TODO: Avoid test warnings, is this right or should it rather be solved in code? + $_SERVER['HTTP_HOST'] = $_SERVER['HTTP_HOST'] ?? 'localhost'; + $_SERVER['SERVER_PORT'] = $_SERVER['SERVER_PORT'] ?? 80; + \hashtopolis_clear_test_mocks(); } From 675c63f46295a093ef683203cbac464bb74bc8b6 Mon Sep 17 00:00:00 2001 From: Eric Wasson <229096365+Eric-Wasson@users.noreply.github.com> Date: Thu, 21 May 2026 11:01:28 +0200 Subject: [PATCH 565/691] Fixed file upload metadata handling --- src/inc/apiv2/helper/ImportFileHelperAPI.php | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/src/inc/apiv2/helper/ImportFileHelperAPI.php b/src/inc/apiv2/helper/ImportFileHelperAPI.php index 6651768ea..8362fdf22 100644 --- a/src/inc/apiv2/helper/ImportFileHelperAPI.php +++ b/src/inc/apiv2/helper/ImportFileHelperAPI.php @@ -162,11 +162,14 @@ function processPost(Request $request, Response $response, array $args): Respons $update_metadata = []; $list = explode(",", $update["upload_metadata_raw"]); foreach ($list as $item) { - list($key, $b64val) = explode(" ", $item, 2); - if ($b64val == null) { + if (!str_contains($item, " ")) { // Some keys dont have a value - $update_metadata[$key] = null; + $update_metadata[$item] = null; + continue; } + + list($key, $b64val) = explode(" ", $item, 2); + if (($val = base64_decode($b64val, true)) === false) { $response->getBody()->write("Error Upload-Metadata '$key' invalid base64 encoding"); return $response->withStatus(400); From 4d2d230800bb960f279eefbc789a2e2cb357153b Mon Sep 17 00:00:00 2001 From: andreas Date: Thu, 21 May 2026 11:23:39 +0200 Subject: [PATCH 566/691] 2120 Fixed review comments --- ci/phpunit/TestBase.php | 2 +- ci/phpunit/inc/utils/AccessControlTest.php | 1 - ci/phpunit/inc/utils/AccessControlUtilsTest.php | 2 +- ci/phpunit/inc/utils/AccessGroupUtilsTest.php | 13 ++++++++++--- src/inc/utils/AccessControl.php | 3 --- src/inc/utils/AccessControlUtils.php | 4 ++-- src/inc/utils/AccessGroupUtils.php | 4 ++-- 7 files changed, 16 insertions(+), 13 deletions(-) diff --git a/ci/phpunit/TestBase.php b/ci/phpunit/TestBase.php index 00122580e..f3284af1b 100644 --- a/ci/phpunit/TestBase.php +++ b/ci/phpunit/TestBase.php @@ -26,7 +26,7 @@ protected function setUp(): void { $this->databaseObjects = []; $this->adminUser = new User(1, 'admin', 'admin@example.com', 'hash', 'salt', 1, 0, 0, time(), 3600, 1, '', '', '', '', ''); - //TODO: Avoid test warnings, is this right or should it rather be solved in code? + // Avoid test warnings $_SERVER['HTTP_HOST'] = $_SERVER['HTTP_HOST'] ?? 'localhost'; $_SERVER['SERVER_PORT'] = $_SERVER['SERVER_PORT'] ?? 80; diff --git a/ci/phpunit/inc/utils/AccessControlTest.php b/ci/phpunit/inc/utils/AccessControlTest.php index a2740d484..32e06fdd4 100644 --- a/ci/phpunit/inc/utils/AccessControlTest.php +++ b/ci/phpunit/inc/utils/AccessControlTest.php @@ -61,7 +61,6 @@ public function testGetInstanceWithUserOverwritesInstance(): void { } public function testReloadReloadsTheRightsGroupForUser(): void { - //TODO: Check code style ok, (calling with one arg per line, instead of long lines?) $group = $this->createDatabaseObject( Factory::getRightGroupFactory(), new RightGroup(null, 'phpunit-' . uniqid('', true), '{}') diff --git a/ci/phpunit/inc/utils/AccessControlUtilsTest.php b/ci/phpunit/inc/utils/AccessControlUtilsTest.php index 7039c1c44..13a362682 100644 --- a/ci/phpunit/inc/utils/AccessControlUtilsTest.php +++ b/ci/phpunit/inc/utils/AccessControlUtilsTest.php @@ -119,7 +119,7 @@ public function testAddPermissionToGroup(): void { $this->assertTrue($permissions[DAccessControl::MANAGE_TASK_ACCESS]); } - //TODO: This seems off, we can write stuff in the permissions, we maybe should check that the permission is actually valid or throw. + //Note: We do not enforce what to write in the permissions public function testAddNonExistentPermissionToGroup(): void { $nonexistentPermission = "nonexistent"; AccessControlUtils::addToPermissions( diff --git a/ci/phpunit/inc/utils/AccessGroupUtilsTest.php b/ci/phpunit/inc/utils/AccessGroupUtilsTest.php index 9a008616d..b479f2a08 100644 --- a/ci/phpunit/inc/utils/AccessGroupUtilsTest.php +++ b/ci/phpunit/inc/utils/AccessGroupUtilsTest.php @@ -257,9 +257,16 @@ public function testDeleteGroupThrowsForDefaultGroup(): void { public function testDeleteGroupReassignsDependentEntitiesToDefaultGroup(): void { $defaultGroup = AccessUtils::getOrCreateDefaultAccessGroup(); - $groupToDelete = Factory::getAccessGroupFactory()->save(new AccessGroup(null, 'delete_group_' . uniqid())); - Factory::getAccessGroupUserFactory()->save(new AccessGroupUser(null, $groupToDelete->getId(), $this->firstUser->getId())); - Factory::getAccessGroupAgentFactory()->save(new AccessGroupAgent(null, $groupToDelete->getId(), $this->firstAgent->getId())); + $groupToDelete = $this->createAccessGroup('delete_group_'); + + $this->createDatabaseObject( + Factory::getAccessGroupUserFactory(), + new AccessGroupUser(null, $groupToDelete->getId(), $this->firstUser->getId()), + ); + $this->createDatabaseObject( + Factory::getAccessGroupAgentFactory(), + new AccessGroupAgent(null, $groupToDelete->getId(), $this->firstAgent->getId()), + ); $hashType = $this->createHashType(); $hashlist = $this->createHashlist($groupToDelete, $hashType); diff --git a/src/inc/utils/AccessControl.php b/src/inc/utils/AccessControl.php index aa4e1e0ad..fc07b50ad 100644 --- a/src/inc/utils/AccessControl.php +++ b/src/inc/utils/AccessControl.php @@ -10,8 +10,6 @@ use Hashtopolis\inc\UI; class AccessControl { - //TODO: Changed because of AccessControlTest.testPermissionLoginWithoutLoggedInUserDenies, - //Access to rightGroup will throw if accessed before initialized. private ?User $user = null; private ?RightGroup $rightGroup = null; @@ -68,7 +66,6 @@ public function reload(): void { * @param $perm string|string[] */ public function checkPermission(string|array $perm): void { - //TODO: This one seems a bit off here? Throw an exception to be handled appropriate by the caller? if (!$this->hasPermission($perm)) { UI::permissionError(); } diff --git a/src/inc/utils/AccessControlUtils.php b/src/inc/utils/AccessControlUtils.php index d82d30464..16ca6eba1 100644 --- a/src/inc/utils/AccessControlUtils.php +++ b/src/inc/utils/AccessControlUtils.php @@ -17,7 +17,7 @@ class AccessControlUtils { * @param int $groupId * @return User[] */ - public static function getMembers($groupId): ?array { + public static function getMembers($groupId): array { $qF = new QueryFilter(User::RIGHT_GROUP_ID, $groupId, "="); return Factory::getUserFactory()->filter([Factory::FILTER => $qF]); } @@ -25,7 +25,7 @@ public static function getMembers($groupId): ?array { /** * @return RightGroup[] */ - public static function getGroups(): ?array { + public static function getGroups(): array { return Factory::getRightGroupFactory()->filter([]); } diff --git a/src/inc/utils/AccessGroupUtils.php b/src/inc/utils/AccessGroupUtils.php index fbcbe7506..cd884fbec 100644 --- a/src/inc/utils/AccessGroupUtils.php +++ b/src/inc/utils/AccessGroupUtils.php @@ -43,7 +43,7 @@ public static function getAgents($groupId) { /** * @return AccessGroup[] */ - public static function getGroups(): ?array { + public static function getGroups(): array { return Factory::getAccessGroupFactory()->filter([]); } @@ -128,7 +128,7 @@ public static function addAgent(int $agentId, int $groupId): void { * @param int $groupId * @throws HTException */ - public static function addUser($userId, $groupId) { + public static function addUser(int $userId, int $groupId): void { $group = AccessGroupUtils::getGroup($groupId); $user = UserUtils::getUser($userId); From 4e562234838b2978261f324f46a0732890fc7224 Mon Sep 17 00:00:00 2001 From: andreas Date: Thu, 21 May 2026 11:38:54 +0200 Subject: [PATCH 567/691] 2120 Missed type info on functions --- src/inc/utils/AccessControlUtils.php | 2 +- src/inc/utils/AccessGroupUtils.php | 16 ++++++++-------- 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/src/inc/utils/AccessControlUtils.php b/src/inc/utils/AccessControlUtils.php index 16ca6eba1..0af5f35f3 100644 --- a/src/inc/utils/AccessControlUtils.php +++ b/src/inc/utils/AccessControlUtils.php @@ -17,7 +17,7 @@ class AccessControlUtils { * @param int $groupId * @return User[] */ - public static function getMembers($groupId): array { + public static function getMembers(int $groupId): array { $qF = new QueryFilter(User::RIGHT_GROUP_ID, $groupId, "="); return Factory::getUserFactory()->filter([Factory::FILTER => $qF]); } diff --git a/src/inc/utils/AccessGroupUtils.php b/src/inc/utils/AccessGroupUtils.php index cd884fbec..abfa14b08 100644 --- a/src/inc/utils/AccessGroupUtils.php +++ b/src/inc/utils/AccessGroupUtils.php @@ -26,7 +26,7 @@ class AccessGroupUtils { * @param int $groupId * @return AccessGroupUser[] */ - public static function getUsers($groupId) { + public static function getUsers(int $groupId): array { $qF = new QueryFilter(AccessGroupUser::ACCESS_GROUP_ID, $groupId, "="); return Factory::getAccessGroupUserFactory()->filter([Factory::FILTER => $qF]); } @@ -35,7 +35,7 @@ public static function getUsers($groupId) { * @param int $groupId * @return AccessGroupAgent[] */ - public static function getAgents($groupId) { + public static function getAgents(int $groupId): array { $qF = new QueryFilter(AccessGroupAgent::ACCESS_GROUP_ID, $groupId, "="); return Factory::getAccessGroupAgentFactory()->filter([Factory::FILTER => $qF]); } @@ -53,7 +53,7 @@ public static function getGroups(): array { * @throws HttpError * @throws HttpConflict */ - public static function createGroup($groupName) { + public static function createGroup(string $groupName): AccessGroup { if (strlen($groupName) == 0 || strlen($groupName) > DLimits::ACCESS_GROUP_MAX_LENGTH) { throw new HttpError("Access group name is too short or too long!"); } @@ -71,7 +71,7 @@ public static function createGroup($groupName) { /** * @throws HTException */ - public static function rename($accessGroupId, $newname) { + public static function rename(int $accessGroupId, string $newname): void { $accessGroup = AccessGroupUtils::getGroup($accessGroupId); $name = htmlentities($newname, ENT_QUOTES, "UTF-8"); if (strlen($name) == 0) { @@ -148,7 +148,7 @@ public static function addUser(int $userId, int $groupId): void { * @param int $groupId * @throws HTException */ - public static function removeAgent($agentId, $groupId) { + public static function removeAgent(int $agentId, int $groupId): void { $group = AccessGroupUtils::getGroup($groupId); $agent = AgentUtils::getAgent($agentId); @@ -166,7 +166,7 @@ public static function removeAgent($agentId, $groupId) { * @param int $groupId * @throws HTException */ - public static function removeUser($userId, $groupId) { + public static function removeUser(int $userId, int $groupId): void { $group = AccessGroupUtils::getGroup($groupId); $user = UserUtils::getUser($userId); @@ -183,7 +183,7 @@ public static function removeUser($userId, $groupId) { * @param int $groupId * @throws HTException */ - public static function deleteGroup($groupId) { + public static function deleteGroup(int $groupId): void { $group = AccessGroupUtils::getGroup($groupId); $default = AccessUtils::getOrCreateDefaultAccessGroup(); if ($default->getId() == $group->getId()) { @@ -222,7 +222,7 @@ public static function deleteGroup($groupId) { * @return AccessGroup * @throws HTException */ - public static function getGroup($groupId) { + public static function getGroup(int $groupId): AccessGroup { $group = Factory::getAccessGroupFactory()->get($groupId); if ($group === null) { throw new HTException("Invalid group!"); From 9f91fcd0fd74a30a20332244679cc86ca7a9eed5 Mon Sep 17 00:00:00 2001 From: jessevz Date: Thu, 21 May 2026 11:46:31 +0200 Subject: [PATCH 568/691] Fixed pagination with reverse sort on no unique keys --- src/inc/apiv2/common/AbstractModelAPI.php | 21 ++++++++++++++++----- 1 file changed, 16 insertions(+), 5 deletions(-) diff --git a/src/inc/apiv2/common/AbstractModelAPI.php b/src/inc/apiv2/common/AbstractModelAPI.php index 2e1adcb66..a3988dffc 100644 --- a/src/inc/apiv2/common/AbstractModelAPI.php +++ b/src/inc/apiv2/common/AbstractModelAPI.php @@ -554,11 +554,10 @@ protected static function compare_keys($key1, $key2, $isNegativeSort): bool|int } } - protected static function getMinMaxCursor($apiClass, string $sort, array $filters, $request, $aliasedfeatures) { + protected static function getMinMaxCursor($apiClass, string $sort, array $filters, $request, $aliasedfeatures, bool $reverseSort) { $filters[Factory::LIMIT] = new LimitFilter(1); // Descending queries are used to retrieve the last element. For this all sorts have to be reversed, since // if all order queries are reversed and limit to 1, you will retrieve the last element. - $reverseSort = $sort == "DESC"; $orderTemplates = $apiClass->makeOrderFilterTemplates($request, $aliasedfeatures, $sort, $reverseSort); $orderFilters = []; // TODO this logic is now done twice, once for the max and once for the min, this should be moved outside this function @@ -622,6 +621,10 @@ public static function getManyResources(object $apiClass, Request $request, Resp /* Generate filters */ $filters = $apiClass->getFilters($request); $qFs_Filter = $apiClass->makeFilter($filters, $apiClass, $joinFilters); + + //only need the normal filters for pagination + $pagination_filters = $qFs_Filter; + $aFs_ACL = $apiClass->getFilterACL(); if (isset($aFs_ACL[Factory::FILTER])) { $qFs_Filter = array_merge($aFs_ACL[Factory::FILTER], $qFs_Filter); @@ -648,9 +651,17 @@ public static function getManyResources(object $apiClass, Request $request, Resp //this is used to reverse the array to show the data correctly for the user $reverseArray = false; + if ($isNegativeSort) { + $firstCursorSort = "DESC"; + $lastCursorSort = "ASC"; + } else { + $firstCursorSort = "ASC"; + $lastCursorSort = "DESC"; + } + $aFs[Factory::JOIN] = $joinFilters; - $firstCursorObject = $apiClass->getMinMaxCursor($apiClass, "ASC", $aFs, $request, $aliasedfeatures); - $lastCursorObject = $apiClass->getMinMaxCursor($apiClass, "DESC", $aFs, $request, $aliasedfeatures); + $firstCursorObject = $apiClass->getMinMaxCursor($apiClass, $firstCursorSort, $aFs, $request, $aliasedfeatures, false); + $lastCursorObject = $apiClass->getMinMaxCursor($apiClass, $lastCursorSort, $aFs, $request, $aliasedfeatures, true); if (!$isNegativeSort && !isset($pageBefore) && isset($pageAfter)) { // this happens when going to the next page while having an ascending sort @@ -732,7 +743,7 @@ public static function getManyResources(object $apiClass, Request $request, Resp $secondary_cursor_key = key($secondary_cursor); $secondary_cursor_key = $secondary_cursor_key == '_id' ? array_column($aliasedfeatures, 'alias', 'dbname')[$apiClass->getPrimaryKey()] : $secondary_cursor_key; $finalFs[Factory::FILTER][] = new PaginationFilter($primary_cursor_key, current($primary_cursor), - $operator, $secondary_cursor_key, current($secondary_cursor), $qFs_Filter + $operator, $secondary_cursor_key, current($secondary_cursor), $pagination_filters ); } else { From bb33a2219fb80f471e9aca2f65fb8dbe764c2299 Mon Sep 17 00:00:00 2001 From: s3inlc Date: Thu, 21 May 2026 12:46:30 +0200 Subject: [PATCH 569/691] half way through abstract model factory tests --- ci/phpunit/TestBase.php | 6 + ci/phpunit/dba/AbstractModelFactoryTest.php | 437 +++++++++++++++++++- src/dba/AbstractModelFactory.php | 42 +- 3 files changed, 459 insertions(+), 26 deletions(-) diff --git a/ci/phpunit/TestBase.php b/ci/phpunit/TestBase.php index 0514b8c6a..883c77a3b 100644 --- a/ci/phpunit/TestBase.php +++ b/ci/phpunit/TestBase.php @@ -55,4 +55,10 @@ public function createDatabaseObject(AbstractModelFactory $factory, AbstractMode public function registerDatabaseObject(AbstractModelFactory $factory, AbstractModel $obj): void { $this->databaseObjects[] = ["factory" => $factory, "object" => $obj]; } + + public function registerDatabaseObjects(AbstractModelFactory $factory, array $objects): void { + foreach ($objects as $object) { + $this->databaseObjects[] = ["factory" => $factory, "object" => $object]; + } + } } diff --git a/ci/phpunit/dba/AbstractModelFactoryTest.php b/ci/phpunit/dba/AbstractModelFactoryTest.php index b5db944c4..4e444b199 100644 --- a/ci/phpunit/dba/AbstractModelFactoryTest.php +++ b/ci/phpunit/dba/AbstractModelFactoryTest.php @@ -167,20 +167,7 @@ public function testUpdateModelSuccessSingleChange(): void { * @throws Exception */ public function testUpdateModelSuccessSingleChangeOnMappedColumn(): void { - $agent = new Agent(null, '', '', 0, '', '', 0, 0, 0, '', '', 0, '', null, 0, ''); - $agent = $this->createDatabaseObject(Factory::getAgentFactory(), $agent); - - $hashType = new HashType(null, 'placeholder', 0, 0); - $hashType = $this->createDatabaseObject(Factory::getHashTypeFactory(), $hashType); - - $crackerBinaryType = new CrackerBinaryType(null, '', 0); - $crackerBinaryType = $this->createDatabaseObject(Factory::getCrackerBinaryTypeFactory(), $crackerBinaryType); - - $crackerBinary = new CrackerBinary(null, $crackerBinaryType->getId(), '', '', ''); - $crackerBinary = $this->createDatabaseObject(Factory::getCrackerBinaryFactory(), $crackerBinary); - - $healthCheck = new HealthCheck(null, 0, 0, 0, $hashType->getId(), $crackerBinary->getId(), 0, ''); - $healthCheck = $this->createDatabaseObject(Factory::getHealthCheckFactory(), $healthCheck); + [$agent, $healthCheck] = $this->setupHealthCheck(); $healthCheckAgent = new HealthCheckAgent(null, $healthCheck->getId(), $agent->getId(), 0, 0, 0, 0, 0, ''); $healthCheckAgent = $this->createDatabaseObject(Factory::getHealthCheckAgentFactory(), $healthCheckAgent); @@ -217,6 +204,406 @@ public function testUpdateModelSuccessMultipleChanges(): void { $this->assertEquals(1, $hashTypeUpdated->getIsSlowHash()); } + /** + * Tests if values with mset() are set properly + * + * @return void + * @throws Exception + */ + public function testMsetSuccess(): void { + $hashType = $this->createDatabaseObject(Factory::getHashTypeFactory(), new HashType(null, 'placeholder', 0, 0)); + Factory::getHashTypeFactory()->mset($hashType, [HashType::IS_SALTED => 1, HashType::IS_SLOW_HASH => 1]); + $hashTypeUpdated = Factory::getHashTypeFactory()->get($hashType->getId()); + $this->assertEquals(1, $hashTypeUpdated->getIsSalted()); + $this->assertEquals(1, $hashTypeUpdated->getIsSlowHash()); + } + + /** + * Tests two separate mset requests on different objects and make sure that both changes survive if they are not on the same column + * + * @return void + * @throws Exception + */ + public function testMsetSuccessTwoObjects(): void { + $hashType1 = $this->createDatabaseObject(Factory::getHashTypeFactory(), new HashType(null, 'placeholder', 0, 0)); + $hashType2 = clone $hashType1; + $this->assertTrue($hashType1 instanceof HashType); + $this->assertTrue($hashType2 instanceof HashType); + + $hashType1->setDescription('something else'); + Factory::getHashTypeFactory()->mset($hashType1, [HashType::DESCRIPTION => 'something else']); + + $this->assertEquals('something else', $hashType1->getDescription()); + $this->assertEquals('placeholder', $hashType2->getDescription()); + + $hashType2->setIsSalted(1); + Factory::getHashTypeFactory()->mset($hashType2, [HashType::IS_SALTED => 1]); + + $this->assertEquals(0, $hashType1->getIsSalted()); + $this->assertEquals(1, $hashType2->getIsSalted()); + + $hashTypeUpdated = Factory::getHashTypeFactory()->get($hashType1->getId()); + $this->assertEquals(1, $hashTypeUpdated->getIsSalted()); + $this->assertEquals('something else', $hashTypeUpdated->getDescription()); + } + + /** + * Tests if values with set() are set properly + * + * @return void + * @throws Exception + */ + public function testSetSuccess(): void { + $hashType = $this->createDatabaseObject(Factory::getHashTypeFactory(), new HashType(null, 'placeholder', 0, 0)); + Factory::getHashTypeFactory()->set($hashType, HashType::IS_SALTED, 1); + $hashTypeUpdated = Factory::getHashTypeFactory()->get($hashType->getId()); + $this->assertEquals(1, $hashTypeUpdated->getIsSalted()); + $this->assertEquals(0, $hashTypeUpdated->getIsSlowHash()); + } + + /** + * Tests two separate set requests on different objects and make sure that both changes survive if they are not on the same column + * + * @return void + * @throws Exception + */ + public function testSetSuccessTwoObjects(): void { + $hashType1 = $this->createDatabaseObject(Factory::getHashTypeFactory(), new HashType(null, 'placeholder', 0, 0)); + $hashType2 = clone $hashType1; + $this->assertTrue($hashType1 instanceof HashType); + $this->assertTrue($hashType2 instanceof HashType); + + $hashType1->setDescription('something else'); + Factory::getHashTypeFactory()->set($hashType1, HashType::DESCRIPTION, 'something else'); + + $this->assertEquals('something else', $hashType1->getDescription()); + $this->assertEquals('placeholder', $hashType2->getDescription()); + + $hashType2->setIsSalted(1); + Factory::getHashTypeFactory()->set($hashType2, HashType::IS_SALTED, 1); + + $this->assertEquals(0, $hashType1->getIsSalted()); + $this->assertEquals(1, $hashType2->getIsSalted()); + + $hashTypeUpdated = Factory::getHashTypeFactory()->get($hashType1->getId()); + $this->assertEquals(1, $hashTypeUpdated->getIsSalted()); + $this->assertEquals('something else', $hashTypeUpdated->getDescription()); + } + + /** + * Tests if values with inc() are set properly + * + * @return void + * @throws Exception + */ + public function testIncSuccess(): void { + $hashType = $this->createDatabaseObject(Factory::getHashTypeFactory(), new HashType(null, 'placeholder', 1, 0)); + Factory::getHashTypeFactory()->inc($hashType, HashType::IS_SALTED); + $hashTypeUpdated = Factory::getHashTypeFactory()->get($hashType->getId()); + $this->assertEquals(2, $hashTypeUpdated->getIsSalted()); + } + + /** + * Tests if values with inc() are set properly when incrementing more than 1 at a step + * + * @return void + * @throws Exception + */ + public function testIncSuccessValue(): void { + $hashType = $this->createDatabaseObject(Factory::getHashTypeFactory(), new HashType(null, 'placeholder', 1, 0)); + Factory::getHashTypeFactory()->inc($hashType, HashType::IS_SALTED, 5); + $hashTypeUpdated = Factory::getHashTypeFactory()->get($hashType->getId()); + $this->assertEquals(6, $hashTypeUpdated->getIsSalted()); + } + + /** + * Test if we increment on different instances of the same database objects, the value at the end matches all increments together + * + * @return void + * @throws Exception + */ + public function testIncSuccessTwoObjects(): void { + $hashType1 = $this->createDatabaseObject(Factory::getHashTypeFactory(), new HashType(null, 'placeholder', 1, 0)); + $hashType2 = Factory::getHashTypeFactory()->get($hashType1->getId()); // retrieve an independent copy + $this->assertTrue($hashType1 instanceof HashType); + + Factory::getHashTypeFactory()->inc($hashType1, HashType::IS_SALTED, 2); + + $this->assertEquals(3, $hashType1->getIsSalted()); + $this->assertEquals(1, $hashType2->getIsSalted()); + + Factory::getHashTypeFactory()->inc($hashType2, HashType::IS_SALTED, 20); + + $this->assertEquals(23, $hashType2->getIsSalted()); + + $hashTypeUpdated = Factory::getHashTypeFactory()->get($hashType1->getId()); + $this->assertEquals(23, $hashTypeUpdated->getIsSalted()); + } + + /** + * Tests that inc() is not accepting negative values (should be done with dec()) + * + * @return void + * @throws Exception + */ + public function testIncFailNegative(): void { + $this->expectException(Exception::class); + $hashType = $this->createDatabaseObject(Factory::getHashTypeFactory(), new HashType(null, 'placeholder', 10, 0)); + Factory::getHashTypeFactory()->inc($hashType, HashType::IS_SALTED, -5); + } + + /** + * Tests that inc() is not accepting zero value + * + * @return void + * @throws Exception + */ + public function testIncFailZero(): void { + $this->expectException(Exception::class); + $hashType = $this->createDatabaseObject(Factory::getHashTypeFactory(), new HashType(null, 'placeholder', 10, 0)); + Factory::getHashTypeFactory()->inc($hashType, HashType::IS_SALTED, 0); + } + + /** + * Tests if values with dec() are set properly + * + * @return void + * @throws Exception + */ + public function testDecSuccess(): void { + $hashType = $this->createDatabaseObject(Factory::getHashTypeFactory(), new HashType(null, 'placeholder', 10, 0)); + Factory::getHashTypeFactory()->dec($hashType, HashType::IS_SALTED); + $hashTypeUpdated = Factory::getHashTypeFactory()->get($hashType->getId()); + $this->assertEquals(9, $hashTypeUpdated->getIsSalted()); + } + + /** + * Tests if values with dec() are set properly when decrementing more than 1 at a step + * + * @return void + * @throws Exception + */ + public function testDecSuccessValue(): void { + $hashType = $this->createDatabaseObject(Factory::getHashTypeFactory(), new HashType(null, 'placeholder', 10, 0)); + Factory::getHashTypeFactory()->dec($hashType, HashType::IS_SALTED, 6); + $hashTypeUpdated = Factory::getHashTypeFactory()->get($hashType->getId()); + $this->assertEquals(4, $hashTypeUpdated->getIsSalted()); + } + + /** + * Test if we decrement on different instances of the same database objects, the value at the end matches all decrements together + * + * @return void + * @throws Exception + */ + public function testDecSuccessTwoObjects(): void { + $hashType1 = $this->createDatabaseObject(Factory::getHashTypeFactory(), new HashType(null, 'placeholder', 50, 0)); + $hashType2 = Factory::getHashTypeFactory()->get($hashType1->getId()); // retrieve an independent copy + $this->assertTrue($hashType1 instanceof HashType); + + Factory::getHashTypeFactory()->dec($hashType1, HashType::IS_SALTED, 2); + + $this->assertEquals(48, $hashType1->getIsSalted()); + $this->assertEquals(50, $hashType2->getIsSalted()); + + Factory::getHashTypeFactory()->dec($hashType2, HashType::IS_SALTED, 20); + + $this->assertEquals(28, $hashType2->getIsSalted()); + + $hashTypeUpdated = Factory::getHashTypeFactory()->get($hashType1->getId()); + $this->assertEquals(28, $hashTypeUpdated->getIsSalted()); + } + + /** + * Tests that dec() is not accepting negative values (should be done with inc()) + * + * @return void + * @throws Exception + */ + public function testDecFailNegative(): void { + $this->expectException(Exception::class); + $hashType = $this->createDatabaseObject(Factory::getHashTypeFactory(), new HashType(null, 'placeholder', 10, 0)); + Factory::getHashTypeFactory()->dec($hashType, HashType::IS_SALTED, -5); + } + + /** + * Tests that dec() is not accepting zero value + * + * @return void + * @throws Exception + */ + public function testDecFailZero(): void { + $this->expectException(Exception::class); + $hashType = $this->createDatabaseObject(Factory::getHashTypeFactory(), new HashType(null, 'placeholder', 10, 0)); + Factory::getHashTypeFactory()->dec($hashType, HashType::IS_SALTED, 0); + } + + /** + * Test creation of multiple objects with massSave() and check that they are existing afterwards + * + * @throws Exception + */ + public function testMassSaveSuccess(): void { + $testid = uniqid(); + $this->createDatabaseObject(Factory::getHashTypeFactory(), new HashType(null, 'hashtype1' . $testid, 1, 0)); + $this->createDatabaseObject(Factory::getHashTypeFactory(), new HashType(null, 'hashtype2' . $testid, 2, 0)); + $this->createDatabaseObject(Factory::getHashTypeFactory(), new HashType(null, 'hashtype3' . $testid, 3, 0)); + + $qF = new LikeFilter(HashType::DESCRIPTION, "%" . $testid); + $list = Factory::getHashTypeFactory()->filter([Factory::FILTER => $qF]); + $this->assertEquals(3, count($list)); + foreach ($list as $hashType) { + $this->assertNotNull($hashType->getId()); + } + $this->registerDatabaseObjects(Factory::getHashTypeFactory(), $list); + } + + /** + * Test creation of multiple objects with massSave() with objects already providing primary keys + * + * @throws Exception + */ + public function testMassSaveSuccessWithPKs(): void { + $testid = uniqid(); + $idOffset = random_int(123456, 999999); + $this->createDatabaseObject(Factory::getHashTypeFactory(), new HashType($idOffset + 0, 'hashtype1' . $testid, 1, 0)); + $this->createDatabaseObject(Factory::getHashTypeFactory(), new HashType($idOffset + 1, 'hashtype2' . $testid, 125, 0)); + $this->createDatabaseObject(Factory::getHashTypeFactory(), new HashType($idOffset + 2, 'hashtype3' . $testid, 72, 0)); + + $qF = new LikeFilter(HashType::DESCRIPTION, "%" . $testid); + $list = Factory::getHashTypeFactory()->filter([Factory::FILTER => $qF, Factory::ORDER => new OrderFilter(HashType::HASH_TYPE_ID, "ASC")]); + $this->assertEquals(3, count($list)); + foreach ($list as $hashType) { + $this->assertNotNull($hashType->getId()); + $this->assertEquals($idOffset, $hashType->getId()); + $idOffset++; + } + $this->registerDatabaseObjects(Factory::getHashTypeFactory(), $list); + } + + /** + * Test that massSave() returns false if no models are given + * + * @return void + * @throws Exception + */ + public function testMassSaveFailEmpty(): void { + $ret = Factory::getHashTypeFactory()->massSave([]); + $this->assertFalse($ret); + } + + /** + * Test if the max operation if giving the correct max values for two different columns + * + * @return void + * @throws Exception + */ + public function testMinMaxFilterSuccessMax(): void { + $testid = uniqid(); + $this->createDatabaseObject(Factory::getHashTypeFactory(), new HashType(null, 'hashtype1' . $testid, 1, 0)); + $this->createDatabaseObject(Factory::getHashTypeFactory(), new HashType(null, 'hashtype2' . $testid, 125, 0)); + $this->createDatabaseObject(Factory::getHashTypeFactory(), new HashType(null, 'hashtype3' . $testid, 72, 0)); + + $qF = new LikeFilter(HashType::DESCRIPTION, "%" . $testid); + $max_1 = Factory::getHashTypeFactory()->minMaxFilter([Factory::FILTER => $qF], HashType::IS_SALTED, "MAX"); + $max_2 = Factory::getHashTypeFactory()->minMaxFilter([Factory::FILTER => $qF], HashType::IS_SLOW_HASH, "MAX"); + + $this->assertEquals(125, $max_1); + $this->assertEquals(0, $max_2); + } + + /** + * Test if the min operation if giving the correct min values for two different columns + * + * @return void + * @throws Exception + */ + public function testMinMaxFilterSuccessMin(): void { + $testid = uniqid(); + $this->createDatabaseObject(Factory::getHashTypeFactory(), new HashType(null, 'hashtype1' . $testid, 1, 0)); + $this->createDatabaseObject(Factory::getHashTypeFactory(), new HashType(null, 'hashtype2' . $testid, 125, 0)); + $this->createDatabaseObject(Factory::getHashTypeFactory(), new HashType(null, 'hashtype3' . $testid, 72, 0)); + + $qF = new LikeFilter(HashType::DESCRIPTION, "%" . $testid); + $min_1 = Factory::getHashTypeFactory()->minMaxFilter([Factory::FILTER => $qF], HashType::IS_SALTED, "MIN"); + $min_2 = Factory::getHashTypeFactory()->minMaxFilter([Factory::FILTER => $qF], HashType::IS_SLOW_HASH, "MIN"); + + $this->assertEquals(1, $min_1); + $this->assertEquals(0, $min_2); + } + + /** + * Test if the min operation works on a mapped column + * + * @return void + * @throws Exception + */ + public function testMinMaxFilterSuccessMappedColumn(): void { + $min = Factory::getHealthCheckAgentFactory()->minMaxFilter([], HealthCheckAgent::END, "MIN"); + $this->assertEquals(0, $min); + } + + /** + * Test if we can retrieve the MIN and MAX of a column with one multicolumn aggregation. + * + * @throws Exception + */ + public function testMulticolAggregationFilterSuccess(): void { + $testid = uniqid(); + $this->createDatabaseObject(Factory::getHashTypeFactory(), new HashType(null, 'hashtype1' . $testid, 1, 0)); + $this->createDatabaseObject(Factory::getHashTypeFactory(), new HashType(null, 'hashtype2' . $testid, 125, 0)); + $this->createDatabaseObject(Factory::getHashTypeFactory(), new HashType(null, 'hashtype3' . $testid, 72, 0)); + + $qF = new LikeFilter(HashType::DESCRIPTION, "%" . $testid); + $aggregations = []; + $aggregations[] = new Aggregation(HashType::IS_SALTED, "MAX"); + $aggregations[] = new Aggregation(HashType::IS_SALTED, "MIN"); + + $results = Factory::getHashTypeFactory()->multicolAggregationFilter([Factory::FILTER => $qF], $aggregations); + foreach ($aggregations as $aggregation) { + $this->assertArrayHasKey($aggregation->getName(), $results); + } + $this->assertEquals(125, $results[$aggregations[0]->getName()]); + $this->assertEquals(1, $results[$aggregations[1]->getName()]); + } + + // TODO: create tests for multicolAggregationFilter using JOINS + + /** + * Test receiving the column of a query. + * + * @return void + * @throws Exception + */ + public function testColumnFilterSuccess(): void { + $testid = uniqid(); + $this->createDatabaseObject(Factory::getHashTypeFactory(), new HashType(null, 'hashtype1' . $testid, 1, 0)); + $this->createDatabaseObject(Factory::getHashTypeFactory(), new HashType(null, 'hashtype2' . $testid, 125, 0)); + $this->createDatabaseObject(Factory::getHashTypeFactory(), new HashType(null, 'hashtype3' . $testid, 72, 0)); + + $qF = new LikeFilter(HashType::DESCRIPTION, "%" . $testid); + $column = Factory::getHashTypeFactory()->columnFilter([Factory::FILTER => $qF], HashType::IS_SALTED); + $this->assertEquals([1, 125, 72], $column); + } + + /** + * Test receiving the column of a query on a mapped column + * + * @return void + * @throws Exception + */ + public function testColumnFilterSuccessMappedColumn(): void { + [$agent, $healthCheck] = $this->setupHealthCheck(); + + $this->createDatabaseObject(Factory::getHealthCheckAgentFactory(), new HealthCheckAgent(null, $healthCheck->getId(), $agent->getId(), 0, 0, 0, 0, 0, '')); + $this->createDatabaseObject(Factory::getHealthCheckAgentFactory(), new HealthCheckAgent(null, $healthCheck->getId(), $agent->getId(), 0, 0, 0, 0, 345, '')); + $this->createDatabaseObject(Factory::getHealthCheckAgentFactory(), new HealthCheckAgent(null, $healthCheck->getId(), $agent->getId(), 0, 0, 0, 0, 7, '')); + + $qF = new QueryFilter(HealthCheckAgent::AGENT_ID, $agent->getId(), "="); + $column = Factory::getHealthCheckAgentFactory()->columnFilter([Factory::FILTER => $qF], HealthCheckAgent::END); + $this->assertEquals([0, 345, 7], $column); + } + /** * Tests both cases to be used on a simple QueryFilter with no result. * When single is true, null must be returned if no matching entry was found, empty array otherwise @@ -339,4 +726,26 @@ public function testTimeseriesFilter(): void { $this->assertEquals(array_sum($expected), array_sum($counts)); $this->assertSame($expected, $counts); } + + /** + * @return array[Agent, HealthCheck] + */ + private function setUpHealthCheck(): array { + $agent = new Agent(null, '', '', 0, '', '', 0, 0, 0, '', '', 0, '', null, 0, ''); + $agent = $this->createDatabaseObject(Factory::getAgentFactory(), $agent); + + $hashType = new HashType(null, 'placeholder', 0, 0); + $hashType = $this->createDatabaseObject(Factory::getHashTypeFactory(), $hashType); + + $crackerBinaryType = new CrackerBinaryType(null, '', 0); + $crackerBinaryType = $this->createDatabaseObject(Factory::getCrackerBinaryTypeFactory(), $crackerBinaryType); + + $crackerBinary = new CrackerBinary(null, $crackerBinaryType->getId(), '', '', ''); + $crackerBinary = $this->createDatabaseObject(Factory::getCrackerBinaryFactory(), $crackerBinary); + + $healthCheck = new HealthCheck(null, 0, 0, 0, $hashType->getId(), $crackerBinary->getId(), 0, ''); + $healthCheck = $this->createDatabaseObject(Factory::getHealthCheckFactory(), $healthCheck); + + return [$agent, $healthCheck]; + } } diff --git a/src/dba/AbstractModelFactory.php b/src/dba/AbstractModelFactory.php index 9f90ee8e5..3a558020f 100755 --- a/src/dba/AbstractModelFactory.php +++ b/src/dba/AbstractModelFactory.php @@ -276,12 +276,13 @@ public function update(AbstractModel $model): PDOStatement { } /** - * Atomically sets the given keys of this model to the given values + * Atomically sets the given keys of this model to the given values without setting all other values (like ->update() does) * * Returns the return of PDO::execute() * @param $model AbstractModel primary key of model * @param $arr array key-value associations for update * @return PDOStatement + * @throws Exception */ public function mset(AbstractModel &$model, array $arr): PDOStatement { $query = "UPDATE " . $this->getMappedModelTable() . " SET "; @@ -304,13 +305,14 @@ public function mset(AbstractModel &$model, array $arr): PDOStatement { } /** - * Atomically sets the given key of this model to the given value + * Atomically sets the given key of this model to the given value without altering other values * * Returns the return of PDO::execute() * @param $model AbstractModel primary key of model * @param $key string key of the column to update * @param $value * @return PDOStatement + * @throws Exception */ public function set(AbstractModel &$model, string $key, $value): PDOStatement { $query = "UPDATE " . $this->getMappedModelTable() . " SET " . self::getMappedModelKey($model, $key) . "=?"; @@ -328,15 +330,20 @@ public function set(AbstractModel &$model, string $key, $value): PDOStatement { } /** - * Increments the given key of this model by the given value + * Increments the given key of this model by the given value atomically * * Returns the return of PDO::execute() * @param $model AbstractModel primary key of model * @param $key string key of the column to update * @param $value int amount of increment * @return PDOStatement + * @throws Exception */ public function inc(AbstractModel &$model, string $key, int $value = 1): PDOStatement { + if ($value <= 0) { + throw new Exception("Cannot increment by zero or negative values!"); + } + $mapped_key = self::getMappedModelKey($model, $key); $query = "UPDATE " . $this->getMappedModelTable() . " SET " . $mapped_key . "=" . $mapped_key . "+?"; @@ -360,8 +367,13 @@ public function inc(AbstractModel &$model, string $key, int $value = 1): PDOStat * @param $key string key of the column to update * @param $value int amount of increment * @return PDOStatement + * @throws Exception */ public function dec(AbstractModel &$model, string $key, int $value = 1): PDOStatement { + if ($value <= 0) { + throw new Exception("Cannot decrement by zero or negative values!"); + } + $mapped_key = self::getMappedModelKey($model, $key); $query = "UPDATE " . $this->getMappedModelTable() . " SET " . $mapped_key . "=" . $mapped_key . "-?"; @@ -380,6 +392,7 @@ public function dec(AbstractModel &$model, string $key, int $value = 1): PDOStat /** * @param $models AbstractModel[] * @return bool|PDOStatement + * @throws Exception */ public function massSave(array $models): bool|PDOStatement { if (sizeof($models) == 0) { @@ -427,6 +440,7 @@ public function massSave(array $models): bool|PDOStatement { * @param $sumColumn string column to apply OP to * @param $op string either min or max * @return mixed + * @throws Exception */ public function minMaxFilter(array $options, string $sumColumn, string $op): mixed { if (strtolower($op) == "min") { @@ -452,10 +466,13 @@ public function minMaxFilter(array $options, string $sumColumn, string $op): mix return $row['column_' . strtolower($op)]; } - public function multicolAggregationFilter($options, $aggregations) { - //$options: as usual - //$columns: array of Aggregation objects - + /** + * @param $options array as usual, to filter and join + * @param $aggregations array of Aggregation objects + * @return mixed + * @throws Exception + */ + public function multicolAggregationFilter(array $options, array $aggregations): mixed { $elements = []; foreach ($aggregations as $aggregation) { $elements[] = $aggregation->getQueryString($this); @@ -484,6 +501,7 @@ public function multicolAggregationFilter($options, $aggregations) { * @param $options array options of query (filters and joins) * @param $column string single column key which should be retrieved * @return array of the column entries returned from this query + * @throws Exception */ public function columnFilter(array $options, string $column): array { $query = "SELECT " . Util::createPrefixedString($this->getMappedModelTable(), [self::getMappedModelKey($this->getNullObject(), $column)]); @@ -534,10 +552,10 @@ public function sumFilter($options, $sumColumn) { public function columnTimeseriesFilter(array $options, string $timeColumn): array { $dbType = StartupConfig::getInstance()->getDatabaseType(); $to_timestamp = ($dbType == "postgres") ? "TO_TIMESTAMP" : "FROM_UNIXTIME"; - - $query = "SELECT DATE(" . $to_timestamp . "(". self::getMappedModelKey($this->getNullObject(), $timeColumn) . ")) AS day, COUNT(*) AS total"; - $query .= " FROM ". $this->getMappedModelTable(); + $query = "SELECT DATE(" . $to_timestamp . "(" . self::getMappedModelKey($this->getNullObject(), $timeColumn) . ")) AS day, COUNT(*) AS total"; + + $query .= " FROM " . $this->getMappedModelTable(); $vals = array(); @@ -546,12 +564,12 @@ public function columnTimeseriesFilter(array $options, string $timeColumn): arra } $query .= " GROUP BY day ORDER BY day"; - + $dbh = self::getDB(); $stmt = $dbh->prepare($query); $stmt->execute($vals); - return $stmt->fetchAll(PDO::FETCH_GROUP|PDO::FETCH_KEY_PAIR); + return $stmt->fetchAll(PDO::FETCH_GROUP | PDO::FETCH_KEY_PAIR); } public function countFilter($options) { From d30943723c0615f6ce34bbc99684e96452b37241 Mon Sep 17 00:00:00 2001 From: Sein Coray Date: Thu, 21 May 2026 13:51:02 +0200 Subject: [PATCH 570/691] Update time filter to use one year from current time (#2133) --- src/inc/apiv2/helper/GetCracksPerDayHelperAPI.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/inc/apiv2/helper/GetCracksPerDayHelperAPI.php b/src/inc/apiv2/helper/GetCracksPerDayHelperAPI.php index 7c4580c69..426ef4355 100644 --- a/src/inc/apiv2/helper/GetCracksPerDayHelperAPI.php +++ b/src/inc/apiv2/helper/GetCracksPerDayHelperAPI.php @@ -50,9 +50,9 @@ public function getParamsSwagger(): array { public function handleGet(Request $request, Response $response): Response { $this->preCommon($request); - $yearStart = mktime(0, 0, 0, 1, 1, (int) date('Y')); + $start = time() - 3600 * 24 * 365; $qF1 = new QueryFilter(Hash::IS_CRACKED, 1, "="); - $qF2 = new QueryFilter(Hash::TIME_CRACKED, $yearStart, ">"); + $qF2 = new QueryFilter(Hash::TIME_CRACKED, $start, ">"); $counts = Factory::getHashFactory()->columnTimeseriesFilter([Factory::FILTER => [$qF1, $qF2]], Hash::TIME_CRACKED); $counts2 = Factory::getHashBinaryFactory()->columnTimeseriesFilter([Factory::FILTER => [$qF1, $qF2]], Hash::TIME_CRACKED); foreach ($counts2 as $key => $value) { From f014aaa2979d8a26700d5e3ad8632fe35dc93fbd Mon Sep 17 00:00:00 2001 From: andreas Date: Thu, 21 May 2026 13:57:49 +0200 Subject: [PATCH 571/691] Changed handlers to handle Throwables instead of Exception --- src/inc/handlers/AccessControlHandler.php | 4 ++-- src/inc/handlers/AccessGroupHandler.php | 4 ++-- src/inc/handlers/AccountHandler.php | 4 ++-- src/inc/handlers/AgentBinaryHandler.php | 4 ++-- src/inc/handlers/AgentHandler.php | 4 ++-- src/inc/handlers/ApiHandler.php | 4 ++-- src/inc/handlers/ConfigHandler.php | 4 ++-- src/inc/handlers/CrackerHandler.php | 4 ++-- src/inc/handlers/FileHandler.php | 4 ++-- src/inc/handlers/ForgotHandler.php | 4 ++-- src/inc/handlers/HashlistHandler.php | 4 ++-- src/inc/handlers/HashtypeHandler.php | 4 ++-- src/inc/handlers/HealthHandler.php | 4 ++-- src/inc/handlers/NotificationHandler.php | 3 +-- src/inc/handlers/PreprocessorHandler.php | 4 ++-- src/inc/handlers/PretaskHandler.php | 4 ++-- src/inc/handlers/SearchHandler.php | 4 ++-- src/inc/handlers/SupertaskHandler.php | 4 ++-- src/inc/handlers/TaskHandler.php | 4 ++-- src/inc/handlers/UsersHandler.php | 4 ++-- 20 files changed, 39 insertions(+), 40 deletions(-) diff --git a/src/inc/handlers/AccessControlHandler.php b/src/inc/handlers/AccessControlHandler.php index c20d79d1b..eb1f05677 100644 --- a/src/inc/handlers/AccessControlHandler.php +++ b/src/inc/handlers/AccessControlHandler.php @@ -4,7 +4,7 @@ use Hashtopolis\inc\utils\AccessControl; use Hashtopolis\inc\utils\AccessControlUtils; -use Exception; +use Throwable; use Hashtopolis\inc\defines\DAccessControlAction; use Hashtopolis\inc\UI; @@ -37,7 +37,7 @@ public function handle($action) { break; } } - catch (Exception $e) { + catch (Throwable $e) { UI::addMessage(UI::ERROR, $e->getMessage()); } } diff --git a/src/inc/handlers/AccessGroupHandler.php b/src/inc/handlers/AccessGroupHandler.php index fbc2a8dbb..cbf7a8295 100644 --- a/src/inc/handlers/AccessGroupHandler.php +++ b/src/inc/handlers/AccessGroupHandler.php @@ -4,7 +4,7 @@ use Hashtopolis\inc\utils\AccessControl; use Hashtopolis\inc\utils\AccessGroupUtils; -use Exception; +use Throwable; use Hashtopolis\inc\defines\DAccessGroupAction; use Hashtopolis\inc\UI; @@ -46,7 +46,7 @@ public function handle($action) { break; } } - catch (Exception $e) { + catch (Throwable $e) { UI::addMessage(UI::ERROR, $e->getMessage()); } } diff --git a/src/inc/handlers/AccountHandler.php b/src/inc/handlers/AccountHandler.php index a4b86f491..601420f2c 100644 --- a/src/inc/handlers/AccountHandler.php +++ b/src/inc/handlers/AccountHandler.php @@ -4,7 +4,7 @@ use Hashtopolis\inc\utils\AccessControl; use Hashtopolis\inc\utils\AccountUtils; -use Exception; +use Throwable; use Hashtopolis\dba\Factory; use Hashtopolis\inc\defines\DAccountAction; use Hashtopolis\inc\Login; @@ -78,7 +78,7 @@ public function handle($action) { break; } } - catch (Exception $e) { + catch (Throwable $e) { UI::addMessage(UI::ERROR, $e->getMessage()); } diff --git a/src/inc/handlers/AgentBinaryHandler.php b/src/inc/handlers/AgentBinaryHandler.php index 130d3c234..e394d5bbb 100644 --- a/src/inc/handlers/AgentBinaryHandler.php +++ b/src/inc/handlers/AgentBinaryHandler.php @@ -4,7 +4,7 @@ use Hashtopolis\inc\utils\AccessControl; use Hashtopolis\inc\utils\AgentBinaryUtils; -use Exception; +use Throwable; use Hashtopolis\inc\defines\DAgentBinaryAction; use Hashtopolis\inc\Login; use Hashtopolis\inc\UI; @@ -52,7 +52,7 @@ public function handle($action) { break; } } - catch (Exception $e) { + catch (Throwable $e) { UI::addMessage(UI::ERROR, $e->getMessage()); } } diff --git a/src/inc/handlers/AgentHandler.php b/src/inc/handlers/AgentHandler.php index d9f97a270..793c1001d 100644 --- a/src/inc/handlers/AgentHandler.php +++ b/src/inc/handlers/AgentHandler.php @@ -4,7 +4,7 @@ use Hashtopolis\inc\utils\AccessControl; use Hashtopolis\inc\utils\AgentUtils; -use Exception; +use Throwable; use Hashtopolis\dba\Factory; use Hashtopolis\inc\defines\DAgentAction; use Hashtopolis\inc\HTException; @@ -104,7 +104,7 @@ public function handle($action) { break; } } - catch (Exception $e) { + catch (Throwable $e) { UI::addMessage(UI::ERROR, $e->getMessage()); } } diff --git a/src/inc/handlers/ApiHandler.php b/src/inc/handlers/ApiHandler.php index c42129a10..b0289b2ad 100644 --- a/src/inc/handlers/ApiHandler.php +++ b/src/inc/handlers/ApiHandler.php @@ -3,7 +3,7 @@ namespace Hashtopolis\inc\handlers; use Hashtopolis\inc\utils\ApiUtils; -use Exception; +use Throwable; use Hashtopolis\inc\defines\DApiAction; use Hashtopolis\inc\UI; @@ -46,7 +46,7 @@ public function handle($action) { break; } } - catch (Exception $e) { + catch (Throwable $e) { UI::addMessage(UI::ERROR, $e->getMessage()); } } diff --git a/src/inc/handlers/ConfigHandler.php b/src/inc/handlers/ConfigHandler.php index 5026b14c5..719fd9578 100644 --- a/src/inc/handlers/ConfigHandler.php +++ b/src/inc/handlers/ConfigHandler.php @@ -4,7 +4,7 @@ use Hashtopolis\inc\utils\AccessControl; use Hashtopolis\inc\utils\ConfigUtils; -use Exception; +use Throwable; use Hashtopolis\inc\defines\DConfigAction; use Hashtopolis\inc\Login; use Hashtopolis\inc\UI; @@ -41,7 +41,7 @@ public function handle($action) { break; } } - catch (Exception $e) { + catch (Throwable $e) { UI::addMessage(UI::ERROR, $e->getMessage()); } } diff --git a/src/inc/handlers/CrackerHandler.php b/src/inc/handlers/CrackerHandler.php index 774854386..5509b608e 100644 --- a/src/inc/handlers/CrackerHandler.php +++ b/src/inc/handlers/CrackerHandler.php @@ -4,7 +4,7 @@ use Hashtopolis\inc\utils\AccessControl; use Hashtopolis\inc\utils\CrackerUtils; -use Exception; +use Throwable; use Hashtopolis\inc\defines\DCrackerBinaryAction; use Hashtopolis\inc\UI; @@ -45,7 +45,7 @@ public function handle($action) { break; } } - catch (Exception $e) { + catch (Throwable $e) { UI::addMessage(UI::ERROR, $e->getMessage()); } } diff --git a/src/inc/handlers/FileHandler.php b/src/inc/handlers/FileHandler.php index fc0b948f1..54c34410c 100644 --- a/src/inc/handlers/FileHandler.php +++ b/src/inc/handlers/FileHandler.php @@ -3,7 +3,7 @@ namespace Hashtopolis\inc\handlers; use Hashtopolis\inc\utils\AccessControl; -use Exception; +use Throwable; use Hashtopolis\inc\utils\FileUtils; use Hashtopolis\inc\defines\DFileAction; use Hashtopolis\inc\UI; @@ -45,7 +45,7 @@ public function handle($action) { break; } } - catch (Exception $e) { + catch (Throwable $e) { UI::addMessage(UI::ERROR, $e->getMessage()); } } diff --git a/src/inc/handlers/ForgotHandler.php b/src/inc/handlers/ForgotHandler.php index 045539a06..9ea309004 100644 --- a/src/inc/handlers/ForgotHandler.php +++ b/src/inc/handlers/ForgotHandler.php @@ -2,7 +2,7 @@ namespace Hashtopolis\inc\handlers; -use Exception; +use Throwable; use Hashtopolis\inc\defines\DForgotAction; use Hashtopolis\inc\UI; use Hashtopolis\inc\utils\UserUtils; @@ -24,7 +24,7 @@ public function handle($action) { break; } } - catch (Exception $e) { + catch (Throwable $e) { UI::addMessage(UI::ERROR, $e->getMessage()); } } diff --git a/src/inc/handlers/HashlistHandler.php b/src/inc/handlers/HashlistHandler.php index e15dce832..d53bd33af 100644 --- a/src/inc/handlers/HashlistHandler.php +++ b/src/inc/handlers/HashlistHandler.php @@ -4,7 +4,7 @@ use Hashtopolis\inc\utils\AccessControl; use Hashtopolis\inc\DataSet; -use Exception; +use Throwable; use Hashtopolis\inc\utils\HashlistUtils; use Hashtopolis\dba\models\Hashlist; use Hashtopolis\dba\Factory; @@ -130,7 +130,7 @@ public function handle($action) { break; } } - catch (Exception $e) { + catch (Throwable $e) { UI::addMessage(UI::ERROR, $e->getMessage()); } } diff --git a/src/inc/handlers/HashtypeHandler.php b/src/inc/handlers/HashtypeHandler.php index 0eeb344aa..ddbba4950 100644 --- a/src/inc/handlers/HashtypeHandler.php +++ b/src/inc/handlers/HashtypeHandler.php @@ -2,7 +2,7 @@ namespace Hashtopolis\inc\handlers; -use Exception; +use Throwable; use Hashtopolis\inc\defines\DHashtypeAction; use Hashtopolis\inc\utils\HashtypeUtils; use Hashtopolis\inc\Login; @@ -29,7 +29,7 @@ public function handle($action) { break; } } - catch (Exception $e) { + catch (Throwable $e) { UI::addMessage(UI::ERROR, $e->getMessage()); } } diff --git a/src/inc/handlers/HealthHandler.php b/src/inc/handlers/HealthHandler.php index 80762997c..3e5235d0b 100644 --- a/src/inc/handlers/HealthHandler.php +++ b/src/inc/handlers/HealthHandler.php @@ -3,7 +3,7 @@ namespace Hashtopolis\inc\handlers; use Hashtopolis\inc\utils\AccessControl; -use Exception; +use Throwable; use Hashtopolis\inc\defines\DHealthCheckAction; use Hashtopolis\inc\utils\HealthUtils; use Hashtopolis\inc\HTException; @@ -33,7 +33,7 @@ public function handle($action) { throw new HTException("Invalid action!"); } } - catch (Exception $e) { + catch (Throwable $e) { UI::addMessage(UI::ERROR, $e->getMessage()); } } diff --git a/src/inc/handlers/NotificationHandler.php b/src/inc/handlers/NotificationHandler.php index 6500430a2..37233f904 100644 --- a/src/inc/handlers/NotificationHandler.php +++ b/src/inc/handlers/NotificationHandler.php @@ -5,7 +5,6 @@ use Hashtopolis\inc\utils\AccessControl; use Hashtopolis\inc\utils\AccessUtils; use Hashtopolis\inc\DataSet; -use Exception; use Hashtopolis\dba\models\NotificationSetting; use Hashtopolis\dba\QueryFilter; use Hashtopolis\dba\Factory; @@ -48,7 +47,7 @@ public function handle($action) { break; } } - catch (Exception $e) { + catch (Throwable $e) { UI::addMessage(UI::ERROR, $e->getMessage()); } } diff --git a/src/inc/handlers/PreprocessorHandler.php b/src/inc/handlers/PreprocessorHandler.php index 19e5a9af7..53243dfca 100644 --- a/src/inc/handlers/PreprocessorHandler.php +++ b/src/inc/handlers/PreprocessorHandler.php @@ -3,7 +3,7 @@ namespace Hashtopolis\inc\handlers; use Hashtopolis\inc\utils\AccessControl; -use Exception; +use Throwable; use Hashtopolis\inc\defines\DPreprocessorAction; use Hashtopolis\inc\utils\PreprocessorUtils; use Hashtopolis\inc\UI; @@ -36,7 +36,7 @@ public function handle($action) { break; } } - catch (Exception $e) { + catch (Throwable $e) { UI::addMessage(UI::ERROR, $e->getMessage()); } } diff --git a/src/inc/handlers/PretaskHandler.php b/src/inc/handlers/PretaskHandler.php index 5ceb16218..addc22f3a 100644 --- a/src/inc/handlers/PretaskHandler.php +++ b/src/inc/handlers/PretaskHandler.php @@ -3,7 +3,7 @@ namespace Hashtopolis\inc\handlers; use Hashtopolis\inc\utils\AccessControl; -use Exception; +use Throwable; use Hashtopolis\inc\defines\DPretaskAction; use Hashtopolis\inc\utils\PretaskUtils; use Hashtopolis\inc\UI; @@ -71,7 +71,7 @@ public function handle($action) { break; } } - catch (Exception $e) { + catch (Throwable $e) { UI::addMessage(UI::ERROR, $e->getMessage()); } } diff --git a/src/inc/handlers/SearchHandler.php b/src/inc/handlers/SearchHandler.php index 976b5549f..4f5a31d43 100644 --- a/src/inc/handlers/SearchHandler.php +++ b/src/inc/handlers/SearchHandler.php @@ -4,7 +4,7 @@ use Hashtopolis\inc\utils\AccessControl; use Hashtopolis\inc\DataSet; -use Exception; +use Throwable; use Hashtopolis\inc\utils\HashlistUtils; use Hashtopolis\dba\ContainFilter; use Hashtopolis\dba\models\Hash; @@ -36,7 +36,7 @@ public function handle($action) { break; } } - catch (Exception $e) { + catch (Throwable $e) { UI::addMessage(UI::ERROR, $e->getMessage()); } } diff --git a/src/inc/handlers/SupertaskHandler.php b/src/inc/handlers/SupertaskHandler.php index bc9a4ae8e..34152ca34 100644 --- a/src/inc/handlers/SupertaskHandler.php +++ b/src/inc/handlers/SupertaskHandler.php @@ -3,7 +3,7 @@ namespace Hashtopolis\inc\handlers; use Hashtopolis\inc\utils\AccessControl; -use Exception; +use Throwable; use Hashtopolis\inc\defines\DSupertaskAction; use Hashtopolis\inc\Login; use Hashtopolis\inc\utils\SupertaskUtils; @@ -51,7 +51,7 @@ public function handle($action) { break; } } - catch (Exception $e) { + catch (Throwable $e) { UI::addMessage(UI::ERROR, $e->getMessage()); } } diff --git a/src/inc/handlers/TaskHandler.php b/src/inc/handlers/TaskHandler.php index 11738ede3..cafe856ac 100644 --- a/src/inc/handlers/TaskHandler.php +++ b/src/inc/handlers/TaskHandler.php @@ -4,7 +4,7 @@ use Hashtopolis\inc\utils\AccessControl; use Hashtopolis\inc\DataSet; -use Exception; +use Throwable; use Hashtopolis\inc\utils\FileDownloadUtils; use Hashtopolis\dba\models\AccessGroupUser; use Hashtopolis\dba\models\FileTask; @@ -150,7 +150,7 @@ public function handle($action) { break; } } - catch (Exception $e) { + catch (Throwable $e) { UI::addMessage(UI::ERROR, $e->getMessage()); } } diff --git a/src/inc/handlers/UsersHandler.php b/src/inc/handlers/UsersHandler.php index 7a8ef469c..885160ec9 100644 --- a/src/inc/handlers/UsersHandler.php +++ b/src/inc/handlers/UsersHandler.php @@ -3,7 +3,7 @@ namespace Hashtopolis\inc\handlers; use Hashtopolis\inc\utils\AccessControl; -use Exception; +use Throwable; use Hashtopolis\inc\defines\DUserAction; use Hashtopolis\inc\Login; use Hashtopolis\inc\UI; @@ -52,7 +52,7 @@ public function handle($action) { break; } } - catch (Exception $e) { + catch (Throwable $e) { UI::addMessage(UI::ERROR, $e->getMessage()); } } From d5205e7855ebc422e89bf905851c1647a0a321c7 Mon Sep 17 00:00:00 2001 From: MLdev Date: Thu, 21 May 2026 12:03:00 +0000 Subject: [PATCH 572/691] First test unit --- ci/phpunit/utils/ChunkUtilsTest.php | 143 ++++++++++++++++++++++++++++ 1 file changed, 143 insertions(+) create mode 100644 ci/phpunit/utils/ChunkUtilsTest.php diff --git a/ci/phpunit/utils/ChunkUtilsTest.php b/ci/phpunit/utils/ChunkUtilsTest.php new file mode 100644 index 000000000..a5b67ddfa --- /dev/null +++ b/ci/phpunit/utils/ChunkUtilsTest.php @@ -0,0 +1,143 @@ +getProperty('instance'); + $p->setValue(null, new DataSet($v)); + } + + // Resets the SConfig singleton to null after every test so a mocked config + // from one test never leaks into the next. + protected function tearDown(): void { + $p = (new \ReflectionClass(SConfig::class))->getProperty('instance'); + $p->setValue(null, null); + } + + // Verifies that CHUNK_SIZE static mode bypasses all benchmark math and + // returns the configured chunk size value directly. + public function testStaticChunkSize_ReturnsValueDirectly(): void { + $this->assertSame(25000, ChunkUtils::calculateChunkSize(1000000, '5000:1000', 60, 1.0, DTaskStaticChunking::CHUNK_SIZE, 25000)); + } + + // Verifies that NUM_CHUNKS static mode divides the keyspace evenly and + // rounds up (ceil) so no candidates are left out. + // Result is cast to int because PHP ceil() returns float. + public function testStaticNumChunks_ReturnsCeilDivision(): void { + $this->assertSame((int) ceil(1000000 / 3), (int) ChunkUtils::calculateChunkSize(1000000, '5000:1000', 60, 1.0, DTaskStaticChunking::NUM_CHUNKS, 3)); + } + + // Verifies that misconfigured static chunking inputs always throw HTException. + // Four cases via data provider: CHUNK_SIZE=0, NUM_CHUNKS=0, + // NUM_CHUNKS>10000 (flood protection), and an unknown mode constant. + // PHPUnit 12 requires the #[DataProvider] attribute — @dataProvider docblock no longer works. + #[DataProvider('staticExceptionCases')] + public function testStaticChunking_InvalidInput_ThrowsHTException(int $mode, int $size): void { + $this->expectException(HTException::class); + ChunkUtils::calculateChunkSize(1000000, '5000:1000', 60, 1.0, $mode, $size); + } + + public static function staticExceptionCases(): array { + return [ + 'CHUNK_SIZE zero' => [DTaskStaticChunking::CHUNK_SIZE, 0], + 'NUM_CHUNKS zero' => [DTaskStaticChunking::NUM_CHUNKS, 0], + 'NUM_CHUNKS too large' => [DTaskStaticChunking::NUM_CHUNKS, 10001], + 'unknown mode' => [99, 0], + ]; + } + + // Verifies the old benchmark special case: benchmark=0 means the agent + // reported no speed, so the entire keyspace is returned as one chunk. + public function testOldBenchmark_ZeroValue_ReturnsFullKeyspace(): void { + $this->assertSame(500, ChunkUtils::calculateChunkSize(500, '0', 60)); + } + + // Verifies the old benchmark formula: floor(keyspace * benchmark * chunkTime / 100). + // Result is cast to int because PHP floor() returns float. + public function testOldBenchmark_Normal_ReturnsCorrectFormula(): void { + $this->assertSame((int) floor(1000000 * 50 * 60 / 100), (int) ChunkUtils::calculateChunkSize(1000000, '50', 60)); + } + + // Verifies the new benchmark formula using "speed:time" format. + // factor = chunkTime / time * 1000, size = floor(factor * speed). + // Result is cast to int because PHP floor() returns float. + public function testNewBenchmark_ValidFormat_ReturnsCorrectFormula(): void { + $this->assertSame((int) floor(30.0 * 5000000), (int) ChunkUtils::calculateChunkSize(999999999, '5000000:1000', 30)); + } + + // Verifies that new-format benchmarks with zero speed or zero time return 0 + // instead of crashing — the guard in calculateChunkSize() catches both. + #[DataProvider('invalidBenchmarkCases')] + public function testNewBenchmark_InvalidInput_ReturnsZero(string $benchmark): void { + $this->assertSame(0, ChunkUtils::calculateChunkSize(1000000, $benchmark, 60)); + } + + public static function invalidBenchmarkCases(): array { + return [ + 'zero speed' => ['0:1000'], + 'zero time' => ['5000000:0'], + ]; + } + + // Verifies that a benchmark string with no colon routes to the old-benchmark + // path and PHP 8 throws TypeError on arithmetic with a non-numeric string. + public function testOldBenchmark_NonNumericString_ThrowsTypeError(): void { + $this->expectException(\TypeError::class); + ChunkUtils::calculateChunkSize(1000000, 'invalid', 60); + } + + // Verifies the safety floor: when the formula produces a size <= 0 the result + // is clamped to 1 so dispatching never stalls on an infinite zero-size loop. + // $QUERY must be set because the clamp path calls Util::createLogEntry which + // reads $QUERY['token'] as a non-null TEXT value for the log entry. + public function testSizeClampedToOne_WhenCalculationProducesZero(): void { + $GLOBALS['QUERY'] = ['token' => 'test']; + $this->assertSame(1, (int) ChunkUtils::calculateChunkSize(1000000, '1:999999999', 1)); + } + + // Verifies that the tolerance multiplier correctly scales the chunk size up. + // Both sides are cast to int because float arithmetic (30000000.0 * 1.1) + // produces 33000000.000000004 due to IEEE 754 precision — int cast aligns them. + public function testTolerance_ScalesChunkSizeUp(): void { + $base = (int) ChunkUtils::calculateChunkSize(1000000, '50', 60, 1.0); + $this->assertSame((int) ($base * 1.1), (int) ChunkUtils::calculateChunkSize(1000000, '50', 60, 1.1)); + } + + // Verifies that chunkTime=0 triggers the SConfig fallback: the server-wide + // CHUNK_DURATION value is used instead of the per-task setting. + // Result is cast to int because PHP floor() returns float. + public function testZeroChunkTime_FallsBackToSConfigValue(): void { + $this->mockSConfig([DConfig::CHUNK_DURATION => 120]); + $this->assertSame((int) floor(1000000 * 50 * 120 / 100), (int) ChunkUtils::calculateChunkSize(1000000, '50', 0)); + } + + // Verifies that createNewChunk() returns null when the full keyspace has been + // consumed (keyspace == keyspaceProgress). A mocked Task is used so no DB + // records are needed; the mock returns getKeyspace()=1000 and + // getKeyspaceProgress()=1000, making remaining=0 and triggering the null path. + public function testCreateNewChunk_ReturnsNullWhenKeyspaceExhausted(): void { + $this->mockSConfig([DConfig::DISP_TOLERANCE => 0, DConfig::CHUNK_DURATION => 600]); + $task = $this->createMock(Task::class); + $task->method('getSkipKeyspace')->willReturn(0); + $task->method('getKeyspaceProgress')->willReturn(1000); + $task->method('getKeyspace')->willReturn(1000); + $this->assertNull(ChunkUtils::createNewChunk($task, $this->createMock(Assignment::class))); + } +} From d406e30be47be0b2fdf2b5f94277c510d8874b98 Mon Sep 17 00:00:00 2001 From: MLdev Date: Thu, 21 May 2026 12:04:39 +0000 Subject: [PATCH 573/691] First unit test --- ci/phpunit/utils/ConfigUtilsTest.php | 66 +++++++++++++ ci/phpunit/utils/CrackerBinaryUtilsTest.php | 87 +++++++++++++++++ ci/phpunit/utils/CrackerUtilsTest.php | 101 ++++++++++++++++++++ 3 files changed, 254 insertions(+) create mode 100644 ci/phpunit/utils/ConfigUtilsTest.php create mode 100644 ci/phpunit/utils/CrackerBinaryUtilsTest.php create mode 100644 ci/phpunit/utils/CrackerUtilsTest.php diff --git a/ci/phpunit/utils/ConfigUtilsTest.php b/ci/phpunit/utils/ConfigUtilsTest.php new file mode 100644 index 000000000..18464f9d2 --- /dev/null +++ b/ci/phpunit/utils/ConfigUtilsTest.php @@ -0,0 +1,66 @@ +existingConfig = ConfigUtils::get('chunktime'); + } + + // Verifies that get() returns the correct Config object when the item exists. + // Uses "chunktime" which is always present in the default database. + public function testGet_KnownItem_ReturnsConfig(): void { + $config = ConfigUtils::get('chunktime'); + $this->assertSame('chunktime', $config->getItem()); + } + + // Verifies that get() throws HTException when the item does not exist. + // Uses a deliberately nonsensical key that will never be in the database. + public function testGet_UnknownItem_ThrowsHTException(): void { + $this->expectException(HTException::class); + ConfigUtils::get('nonexistent_item_xyz_999'); + } + + // Verifies that updateSingleConfig() throws HTException when the attributes + // array contains no VALUE key, meaning no new value was provided. + public function testUpdateSingleConfig_MissingValue_ThrowsHTException(): void { + $this->expectException(HTException::class); + // Empty attributes array — Config::VALUE key is absent, triggering the guard. + ConfigUtils::updateSingleConfig($this->existingConfig->getId(), []); + } + + // Verifies that updateSingleConfig() returns early without performing any + // database write when the provided value is identical to the stored value. + // This is the no-op path that avoids unnecessary DB updates. + public function testUpdateSingleConfig_SameValue_ReturnsEarlyWithoutException(): void { + $sameValue = $this->existingConfig->getValue(); + // Passing the same value back — the method must detect no change and return. + ConfigUtils::updateSingleConfig($this->existingConfig->getId(), [Config::VALUE => $sameValue]); + $this->assertTrue(true); // reaching here confirms no exception was thrown + } + + // Verifies that updateSingleConfig() throws HTException when the given ID + // does not match any row in the Config table. + public function testUpdateSingleConfig_InvalidId_ThrowsHTException(): void { + $this->expectException(HTException::class); + ConfigUtils::updateSingleConfig(99999, [Config::VALUE => 'anything']); + } +} diff --git a/ci/phpunit/utils/CrackerBinaryUtilsTest.php b/ci/phpunit/utils/CrackerBinaryUtilsTest.php new file mode 100644 index 000000000..ccda7352b --- /dev/null +++ b/ci/phpunit/utils/CrackerBinaryUtilsTest.php @@ -0,0 +1,87 @@ +type = Factory::getCrackerBinaryTypeFactory()->save( + new CrackerBinaryType(null, 'test-crackerbinaryutils-type', 1) + ); + } + + // Deletes every CrackerBinary created during the test, then the type itself. + // Order matters: binaries must go first due to the FK constraint. + protected function tearDown(): void { + foreach ($this->binaries as $b) { + Factory::getCrackerBinaryFactory()->delete($b); + } + Factory::getCrackerBinaryTypeFactory()->delete($this->type); + $this->binaries = []; + } + + // Helper: saves a CrackerBinary with the given version under the shared type + // and registers it for cleanup so tearDown always removes it. + private function addBinary(string $version): CrackerBinary { + $b = Factory::getCrackerBinaryFactory()->save( + new CrackerBinary(null, $this->type->getId(), $version, 'http://example.com', 'testcracker') + ); + $this->binaries[] = $b; + return $b; + } + + // Verifies that getNewestVersion() throws HTException when no CrackerBinary + // rows exist for the given type — there is nothing to pick the newest from. + public function testGetNewestVersion_NoBinaries_ThrowsHTException(): void { + $this->expectException(HTException::class); + CrackerBinaryUtils::getNewestVersion($this->type->getId()); + } + + // Verifies that getNewestVersion() returns the only available binary when + // exactly one version is registered under the type. + public function testGetNewestVersion_SingleBinary_ReturnsThatBinary(): void { + $binary = $this->addBinary('1.0.0'); + $result = CrackerBinaryUtils::getNewestVersion($this->type->getId()); + $this->assertSame($binary->getId(), $result->getId()); + } + + // Verifies that getNewestVersion() correctly picks the highest semantic version + // when multiple binaries are registered. The comparison uses Composer\Semver + // so "2.5.0" must beat "1.9.9" even though 1.9.9 was added after 2.5.0. + public function testGetNewestVersion_MultipleBinaries_ReturnsHighestVersion(): void { + $this->addBinary('1.0.0'); + $newest = $this->addBinary('2.5.0'); + $this->addBinary('1.9.9'); + $result = CrackerBinaryUtils::getNewestVersion($this->type->getId()); + $this->assertSame($newest->getId(), $result->getId()); + } + + // Verifies that getNewestVersion() handles non-sequential insertion order + // correctly — the oldest version added last must not be chosen as newest. + public function testGetNewestVersion_OutOfOrderInsert_StillReturnsHighest(): void { + $newest = $this->addBinary('3.0.0'); + $this->addBinary('1.0.0'); + $this->addBinary('2.0.0'); + $result = CrackerBinaryUtils::getNewestVersion($this->type->getId()); + $this->assertSame($newest->getId(), $result->getId()); + } +} diff --git a/ci/phpunit/utils/CrackerUtilsTest.php b/ci/phpunit/utils/CrackerUtilsTest.php new file mode 100644 index 000000000..6ea2b8ef5 --- /dev/null +++ b/ci/phpunit/utils/CrackerUtilsTest.php @@ -0,0 +1,101 @@ +type = Factory::getCrackerBinaryTypeFactory()->save( + new CrackerBinaryType(null, 'test-crackerutils-type', 1) + ); + $this->binary = Factory::getCrackerBinaryFactory()->save( + new CrackerBinary(null, $this->type->getId(), '1.0.0', 'http://example.com', 'testcracker') + ); + } + + // Removes the binary first (FK), then the type so no constraint violations occur. + protected function tearDown(): void { + if ($this->binary) { Factory::getCrackerBinaryFactory()->delete($this->binary); } + if ($this->type) { Factory::getCrackerBinaryTypeFactory()->delete($this->type); } + } + + // Verifies that getBinary() throws HTException when the ID does not match + // any row — the caller must handle the "binary not found" case. + public function testGetBinary_InvalidId_ThrowsHTException(): void { + $this->expectException(HTException::class); + CrackerUtils::getBinary(99999); + } + + // Verifies that getBinaryType() throws HTException when the ID does not match + // any row — the caller must handle the "type not found" case. + public function testGetBinaryType_InvalidId_ThrowsHTException(): void { + $this->expectException(HTException::class); + CrackerUtils::getBinaryType(99999); + } + + // Verifies that getBinary() returns the correct CrackerBinary when the ID + // matches the record created in setUp. + public function testGetBinary_ValidId_ReturnsBinary(): void { + $result = CrackerUtils::getBinary($this->binary->getId()); + $this->assertSame($this->binary->getId(), $result->getId()); + } + + // Verifies that getBinaryType() returns the correct CrackerBinaryType when + // the ID matches the record created in setUp. + public function testGetBinaryType_ValidId_ReturnsBinaryType(): void { + $result = CrackerUtils::getBinaryType($this->type->getId()); + $this->assertSame($this->type->getId(), $result->getId()); + } + + // Verifies that createBinaryType() throws HttpError when an empty string is + // passed as the type name — an empty name is not a valid cracker identifier. + public function testCreateBinaryType_EmptyName_ThrowsHttpError(): void { + $this->expectException(HttpError::class); + CrackerUtils::createBinaryType(''); + } + + // Verifies that createBinaryType() throws HttpConflict when a type with the + // same name already exists in the database (setUp created "test-crackerutils-type"). + public function testCreateBinaryType_DuplicateName_ThrowsHttpConflict(): void { + $this->expectException(HttpConflict::class); + CrackerUtils::createBinaryType('test-crackerutils-type'); + } + + // Verifies that createBinary() throws HttpError when any required field is + // empty. Uses a valid type ID so the method reaches the field validation. + public function testCreateBinary_EmptyVersion_ThrowsHttpError(): void { + $this->expectException(HttpError::class); + CrackerUtils::createBinary('', 'testcracker', 'http://example.com', $this->type->getId()); + } + + // Verifies the full happy path: createBinary() creates and returns a new + // CrackerBinary when all fields are valid. The binary is deleted immediately + // after the assertion so it does not interfere with tearDown. + public function testCreateBinary_ValidInput_CreatesBinary(): void { + $b = CrackerUtils::createBinary('9.9.9', 'newcracker', 'http://example.com/dl', $this->type->getId()); + $this->assertSame('9.9.9', $b->getVersion()); + Factory::getCrackerBinaryFactory()->delete($b); + } +} From 1c8734be344c7b3a6082b61b674f34e2fbfd42b0 Mon Sep 17 00:00:00 2001 From: andreas Date: Thu, 21 May 2026 14:07:36 +0200 Subject: [PATCH 574/691] Changed errorhandling to throwables for old user_api --- src/inc/user_api/UserAPIAccess.php | 4 ++-- src/inc/user_api/UserAPIAccount.php | 4 ++-- src/inc/user_api/UserAPIAgent.php | 4 ++-- src/inc/user_api/UserAPIConfig.php | 3 ++- src/inc/user_api/UserAPICracker.php | 4 ++-- src/inc/user_api/UserAPIFile.php | 4 ++-- src/inc/user_api/UserAPIGroup.php | 4 ++-- src/inc/user_api/UserAPIHashlist.php | 4 ++-- src/inc/user_api/UserAPIPretask.php | 4 ++-- src/inc/user_api/UserAPISuperhashlist.php | 4 ++-- src/inc/user_api/UserAPISupertask.php | 4 ++-- src/inc/user_api/UserAPITask.php | 4 ++-- src/inc/user_api/UserAPIUser.php | 4 ++-- 13 files changed, 26 insertions(+), 25 deletions(-) diff --git a/src/inc/user_api/UserAPIAccess.php b/src/inc/user_api/UserAPIAccess.php index 218bdf744..f13e26fdf 100644 --- a/src/inc/user_api/UserAPIAccess.php +++ b/src/inc/user_api/UserAPIAccess.php @@ -3,7 +3,7 @@ namespace Hashtopolis\inc\user_api; use Hashtopolis\inc\utils\AccessControlUtils; -use Exception; +use Throwable; use Hashtopolis\inc\apiv2\common\error\HttpConflict; use Hashtopolis\inc\apiv2\common\error\HttpError; use Hashtopolis\inc\defines\UQuery; @@ -38,7 +38,7 @@ public function execute($QUERY = array()) { $this->sendErrorResponse($QUERY[UQuery::SECTION], "INV", "Invalid section request!"); } } - catch (Exception $e) { + catch (Throwable $e) { $this->sendErrorResponse($QUERY[UQueryTask::SECTION], $QUERY[UQueryTask::REQUEST], $e->getMessage()); } } diff --git a/src/inc/user_api/UserAPIAccount.php b/src/inc/user_api/UserAPIAccount.php index fb80dec77..9393f4522 100644 --- a/src/inc/user_api/UserAPIAccount.php +++ b/src/inc/user_api/UserAPIAccount.php @@ -3,7 +3,7 @@ namespace Hashtopolis\inc\user_api; use Hashtopolis\inc\utils\AccountUtils; -use Exception; +use Throwable; use Hashtopolis\inc\defines\UQuery; use Hashtopolis\inc\defines\UQueryAccount; use Hashtopolis\inc\defines\UQueryTask; @@ -33,7 +33,7 @@ public function execute($QUERY = array()) { $this->sendErrorResponse($QUERY[UQuery::SECTION], "INV", "Invalid section request!"); } } - catch (Exception $e) { + catch (Throwable $e) { $this->sendErrorResponse($QUERY[UQueryTask::SECTION], $QUERY[UQueryTask::REQUEST], $e->getMessage()); } } diff --git a/src/inc/user_api/UserAPIAgent.php b/src/inc/user_api/UserAPIAgent.php index dacf12bd5..2d4b26526 100644 --- a/src/inc/user_api/UserAPIAgent.php +++ b/src/inc/user_api/UserAPIAgent.php @@ -4,7 +4,7 @@ use Hashtopolis\inc\utils\AccessUtils; use Hashtopolis\inc\utils\AgentUtils; -use Exception; +use Throwable; use Hashtopolis\dba\models\Agent; use Hashtopolis\dba\ContainFilter; use Hashtopolis\dba\models\AccessGroupAgent; @@ -72,7 +72,7 @@ public function execute($QUERY = array()) { $this->sendErrorResponse($QUERY[UQuery::SECTION], "INV", "Invalid section request!"); } } - catch (Exception $e) { + catch (Throwable $e) { $this->sendErrorResponse($QUERY[UQuery::SECTION], $QUERY[UQuery::REQUEST], $e->getMessage()); } } diff --git a/src/inc/user_api/UserAPIConfig.php b/src/inc/user_api/UserAPIConfig.php index 201a17da9..19fe58ecc 100644 --- a/src/inc/user_api/UserAPIConfig.php +++ b/src/inc/user_api/UserAPIConfig.php @@ -4,6 +4,7 @@ use Hashtopolis\inc\utils\ConfigUtils; use Exception; +use Throwable; use Hashtopolis\dba\models\Config; use Hashtopolis\inc\defines\DConfig; use Hashtopolis\inc\defines\DConfigType; @@ -36,7 +37,7 @@ public function execute($QUERY = array()) { $this->sendErrorResponse($QUERY[UQuery::SECTION], "INV", "Invalid section request!"); } } - catch (Exception $e) { + catch (Throwable $e) { $this->sendErrorResponse($QUERY[UQueryTask::SECTION], $QUERY[UQueryTask::REQUEST], $e->getMessage()); } } diff --git a/src/inc/user_api/UserAPICracker.php b/src/inc/user_api/UserAPICracker.php index 3fd2e671c..fedf9e936 100644 --- a/src/inc/user_api/UserAPICracker.php +++ b/src/inc/user_api/UserAPICracker.php @@ -3,7 +3,7 @@ namespace Hashtopolis\inc\user_api; use Hashtopolis\inc\utils\CrackerUtils; -use Exception; +use Throwable; use Hashtopolis\inc\defines\UQuery; use Hashtopolis\inc\defines\UQueryCracker; use Hashtopolis\inc\defines\UQueryTask; @@ -41,7 +41,7 @@ public function execute($QUERY = array()) { $this->sendErrorResponse($QUERY[UQuery::SECTION], "INV", "Invalid section request!"); } } - catch (Exception $e) { + catch (Throwable $e) { $this->sendErrorResponse($QUERY[UQueryTask::SECTION], $QUERY[UQueryTask::REQUEST], $e->getMessage()); } } diff --git a/src/inc/user_api/UserAPIFile.php b/src/inc/user_api/UserAPIFile.php index 9e01767ca..4e0acb8eb 100644 --- a/src/inc/user_api/UserAPIFile.php +++ b/src/inc/user_api/UserAPIFile.php @@ -2,7 +2,7 @@ namespace Hashtopolis\inc\user_api; -use Exception; +use Throwable; use Hashtopolis\inc\utils\FileUtils; use Hashtopolis\inc\defines\DFileType; use Hashtopolis\inc\defines\UQuery; @@ -42,7 +42,7 @@ public function execute($QUERY = array()) { $this->sendErrorResponse($QUERY[UQuery::SECTION], "INV", "Invalid section request!"); } } - catch (Exception $e) { + catch (Throwable $e) { $this->sendErrorResponse($QUERY[UQueryTask::SECTION], $QUERY[UQueryTask::REQUEST], $e->getMessage()); } } diff --git a/src/inc/user_api/UserAPIGroup.php b/src/inc/user_api/UserAPIGroup.php index c3be346b1..a50f1c56e 100644 --- a/src/inc/user_api/UserAPIGroup.php +++ b/src/inc/user_api/UserAPIGroup.php @@ -3,7 +3,7 @@ namespace Hashtopolis\inc\user_api; use Hashtopolis\inc\utils\AccessGroupUtils; -use Exception; +use Throwable; use Hashtopolis\inc\defines\UQuery; use Hashtopolis\inc\defines\UQueryGroup; use Hashtopolis\inc\defines\UQueryTask; @@ -47,7 +47,7 @@ public function execute($QUERY = array()) { $this->sendErrorResponse($QUERY[UQuery::SECTION], "INV", "Invalid section request!"); } } - catch (Exception $e) { + catch (Throwable $e) { $this->sendErrorResponse($QUERY[UQueryTask::SECTION], $QUERY[UQueryTask::REQUEST], $e->getMessage()); } } diff --git a/src/inc/user_api/UserAPIHashlist.php b/src/inc/user_api/UserAPIHashlist.php index ca3191c33..22083e5a5 100644 --- a/src/inc/user_api/UserAPIHashlist.php +++ b/src/inc/user_api/UserAPIHashlist.php @@ -2,7 +2,7 @@ namespace Hashtopolis\inc\user_api; -use Exception; +use Throwable; use Hashtopolis\inc\utils\HashlistUtils; use Hashtopolis\dba\models\File; use Hashtopolis\inc\defines\DHashlistFormat; @@ -61,7 +61,7 @@ public function execute($QUERY = array()) { $this->sendErrorResponse($QUERY[UQuery::SECTION], "INV", "Invalid section request!"); } } - catch (Exception $e) { + catch (Throwable $e) { $this->sendErrorResponse($QUERY[UQueryTask::SECTION], $QUERY[UQueryTask::REQUEST], $e->getMessage()); } } diff --git a/src/inc/user_api/UserAPIPretask.php b/src/inc/user_api/UserAPIPretask.php index bbbc8ae3a..b8230d5ca 100644 --- a/src/inc/user_api/UserAPIPretask.php +++ b/src/inc/user_api/UserAPIPretask.php @@ -2,7 +2,7 @@ namespace Hashtopolis\inc\user_api; -use Exception; +use Throwable; use Hashtopolis\inc\defines\UQuery; use Hashtopolis\inc\defines\UQueryTask; use Hashtopolis\inc\defines\UResponseTask; @@ -53,7 +53,7 @@ public function execute($QUERY = array()) { $this->sendErrorResponse($QUERY[UQuery::SECTION], "INV", "Invalid section request!"); } } - catch (Exception $e) { + catch (Throwable $e) { $this->sendErrorResponse($QUERY[UQueryTask::SECTION], $QUERY[UQueryTask::REQUEST], $e->getMessage()); } } diff --git a/src/inc/user_api/UserAPISuperhashlist.php b/src/inc/user_api/UserAPISuperhashlist.php index a31ae07ff..6d4339277 100644 --- a/src/inc/user_api/UserAPISuperhashlist.php +++ b/src/inc/user_api/UserAPISuperhashlist.php @@ -3,7 +3,7 @@ namespace Hashtopolis\inc\user_api; use Hashtopolis\inc\utils\AccessUtils; -use Exception; +use Throwable; use Hashtopolis\inc\utils\HashlistUtils; use Hashtopolis\inc\defines\DHashlistFormat; use Hashtopolis\inc\defines\UQuery; @@ -36,7 +36,7 @@ public function execute($QUERY = array()) { $this->sendErrorResponse($QUERY[UQuery::SECTION], "INV", "Invalid section request!"); } } - catch (Exception $e) { + catch (Throwable $e) { $this->sendErrorResponse($QUERY[UQueryTask::SECTION], $QUERY[UQueryTask::REQUEST], $e->getMessage()); } } diff --git a/src/inc/user_api/UserAPISupertask.php b/src/inc/user_api/UserAPISupertask.php index 54d4a4305..9bbc9d952 100644 --- a/src/inc/user_api/UserAPISupertask.php +++ b/src/inc/user_api/UserAPISupertask.php @@ -2,7 +2,7 @@ namespace Hashtopolis\inc\user_api; -use Exception; +use Throwable; use Hashtopolis\inc\defines\UQuery; use Hashtopolis\inc\defines\UQueryTask; use Hashtopolis\inc\defines\UResponseTask; @@ -40,7 +40,7 @@ public function execute($QUERY = array()) { $this->sendErrorResponse($QUERY[UQuery::SECTION], "INV", "Invalid section request!"); } } - catch (Exception $e) { + catch (Throwable $e) { $this->sendErrorResponse($QUERY[UQueryTask::SECTION], $QUERY[UQueryTask::REQUEST], $e->getMessage()); } } diff --git a/src/inc/user_api/UserAPITask.php b/src/inc/user_api/UserAPITask.php index f6aeb69bb..6e77f6692 100644 --- a/src/inc/user_api/UserAPITask.php +++ b/src/inc/user_api/UserAPITask.php @@ -3,7 +3,7 @@ namespace Hashtopolis\inc\user_api; use Hashtopolis\inc\utils\AgentUtils; -use Exception; +use Throwable; use Hashtopolis\inc\utils\HashlistUtils; use Hashtopolis\inc\defines\DConfig; use Hashtopolis\inc\defines\DTaskTypes; @@ -105,7 +105,7 @@ public function execute($QUERY = array()) { $this->sendErrorResponse($QUERY[UQuery::SECTION], "INV", "Invalid section request!"); } } - catch (Exception $e) { + catch (Throwable $e) { $this->sendErrorResponse($QUERY[UQueryTask::SECTION], $QUERY[UQueryTask::REQUEST], $e->getMessage()); } } diff --git a/src/inc/user_api/UserAPIUser.php b/src/inc/user_api/UserAPIUser.php index 554e57239..0973ebd54 100644 --- a/src/inc/user_api/UserAPIUser.php +++ b/src/inc/user_api/UserAPIUser.php @@ -2,7 +2,7 @@ namespace Hashtopolis\inc\user_api; -use Exception; +use Throwable; use Hashtopolis\inc\defines\UQuery; use Hashtopolis\inc\defines\UQueryTask; use Hashtopolis\inc\defines\UQueryUser; @@ -41,7 +41,7 @@ public function execute($QUERY = array()) { $this->sendErrorResponse($QUERY[UQuery::SECTION], "INV", "Invalid section request!"); } } - catch (Exception $e) { + catch (Throwable $e) { $this->sendErrorResponse($QUERY[UQueryTask::SECTION], $QUERY[UQueryTask::REQUEST], $e->getMessage()); } } From 748afdaafe47d0960d292985ef8eb4fe8afc02a1 Mon Sep 17 00:00:00 2001 From: s3inlc Date: Thu, 21 May 2026 14:52:30 +0200 Subject: [PATCH 575/691] completed all functions to test except two remaining filters --- ci/phpunit/dba/AbstractModelFactoryTest.php | 242 +++++++++++++++++--- src/dba/AbstractModelFactory.php | 54 ++++- 2 files changed, 261 insertions(+), 35 deletions(-) diff --git a/ci/phpunit/dba/AbstractModelFactoryTest.php b/ci/phpunit/dba/AbstractModelFactoryTest.php index 4e444b199..cc8d72848 100644 --- a/ci/phpunit/dba/AbstractModelFactoryTest.php +++ b/ci/phpunit/dba/AbstractModelFactoryTest.php @@ -10,6 +10,7 @@ use Hashtopolis\dba\models\HealthCheck; use Hashtopolis\dba\models\HealthCheckAgent; use Hashtopolis\TestBase; +use phpDocumentor\Reflection\Types\Integer; use Random\RandomException; use Hashtopolis\dba\models\Hashlist; use Exception; @@ -605,44 +606,32 @@ public function testColumnFilterSuccessMappedColumn(): void { } /** - * Tests both cases to be used on a simple QueryFilter with no result. - * When single is true, null must be returned if no matching entry was found, empty array otherwise + * Test summing up over a column * * @return void + * @throws Exception */ - public function testSimpleFilter(): void { - $qF = new QueryFilter(User::USER_ID, 99999, "="); - - $user = Factory::getUserFactory()->filter([Factory::FILTER => $qF], true); - $this->assertSame(null, $user); + public function testSumFilter(): void { + $testid = uniqid(); + $this->createDatabaseObject(Factory::getHashTypeFactory(), new HashType(null, 'hashtype1' . $testid, 1, 0)); + $this->createDatabaseObject(Factory::getHashTypeFactory(), new HashType(null, 'hashtype2' . $testid, 125, 0)); + $this->createDatabaseObject(Factory::getHashTypeFactory(), new HashType(null, 'hashtype3' . $testid, 72, 0)); - $user = Factory::getUserFactory()->filter([Factory::FILTER => $qF]); - $this->assertSame([], $user); + $qF = new LikeFilter(HashType::DESCRIPTION, "%" . $testid); + $sum = Factory::getHashTypeFactory()->sumFilter([Factory::FILTER => $qF], HashType::IS_SALTED); + $this->assertEquals(198, $sum); } /** - * Tests the columnFilter function which returns an array of values of the given column of matching rows + * Test summing up over a an empty list of objects * * @return void + * @throws Exception */ - public function testColumnFilter(): void { - // add some data - $hashlist_1 = $this->createDatabaseObject(Factory::getHashlistFactory(), new Hashlist(null, "hashlist 1", DHashlistFormat::PLAIN, 0, 0, ':', 0, 0, 0, 0, AccessUtils::getOrCreateDefaultAccessGroup()->getId(), "", 0, 0, 0)); - $this->createDatabaseObject(Factory::getHashlistFactory(), new Hashlist(null, "hashlist 2", DHashlistFormat::PLAIN, 0, 0, ':', 0, 0, 0, 1, AccessUtils::getOrCreateDefaultAccessGroup()->getId(), "", 0, 0, 0)); - $hashlist_3 = $this->createDatabaseObject(Factory::getHashlistFactory(), new Hashlist(null, "hashlist 3", DHashlistFormat::PLAIN, 0, 0, ':', 0, 0, 0, 0, AccessUtils::getOrCreateDefaultAccessGroup()->getId(), "", 0, 0, 0)); - - $oF = new OrderFilter(Hashlist::HASHLIST_ID, "ASC"); - - // test column filter to retrieve some of their IDs - $qF = new QueryFilter(Hashlist::IS_SALTED, 0, "="); - $ids = Factory::getHashlistFactory()->columnFilter([Factory::FILTER => $qF, Factory::ORDER => $oF], Hashlist::HASHLIST_ID); - - // hashlist 1 and 3 should be returned - $this->assertSame([$hashlist_1->getId(), $hashlist_3->getId()], $ids); - - $qF = new QueryFilter(Hashlist::CRACKED, 0, ">"); - $ids = Factory::getHashlistFactory()->columnFilter([Factory::FILTER => $qF, Factory::ORDER => $oF], Hashlist::HASHLIST_ID); - $this->assertSame([], $ids); + public function testSumFilterEmpty(): void { + $qF = new QueryFilter(HashType::DESCRIPTION, "This value will not match anywhere aaaaaaaaaaaaaaaaaaaaaaaaa", "="); + $sum = Factory::getHashTypeFactory()->sumFilter([Factory::FILTER => $qF], HashType::IS_SALTED); + $this->assertEquals(null, $sum); } /** @@ -652,7 +641,8 @@ public function testColumnFilter(): void { * @throws Exception */ public function testTimeseriesFilterEmpty(): void { - $counts = Factory::getHashFactory()->columnTimeseriesFilter([], Hash::TIME_CRACKED); + $qF = new QueryFilter(Hash::HASHLIST_ID, 9999999, "="); + $counts = Factory::getHashFactory()->columnTimeseriesFilter([Factory::FILTER => $qF], Hash::TIME_CRACKED); $this->assertSame([], $counts); } @@ -727,6 +717,200 @@ public function testTimeseriesFilter(): void { $this->assertSame($expected, $counts); } + /** + * Test counting matching objects with a normal filter. + * + * @throws Exception + */ + public function testCountFilter(): void { + $testid = uniqid(); + $this->createDatabaseObject(Factory::getHashTypeFactory(), new HashType(null, 'hashtype1' . $testid, 1, 0)); + $this->createDatabaseObject(Factory::getHashTypeFactory(), new HashType(null, 'hashtype2' . $testid, 125, 0)); + $this->createDatabaseObject(Factory::getHashTypeFactory(), new HashType(null, 'hashtype3' . $testid, 72, 0)); + + $qF = new LikeFilter(HashType::DESCRIPTION, "%" . $testid); + $sum = Factory::getHashTypeFactory()->countFilter([Factory::FILTER => $qF]); + $this->assertEquals(3, $sum); + } + + /** + * Test successfully retrieving an object. + * + * @throws Exception + */ + public function testGetFromDBSuccess(): void { + $hashtype = $this->createDatabaseObject(Factory::getHashTypeFactory(), new HashType(null, 'hashtype1' . uniqid(), 1, 0)); + $this->assertTrue($hashtype instanceof HashType); + $hashtypeCheck = Factory::getHashTypeFactory()->getFromDB($hashtype->getId()); + + $this->assertInstanceOf(HashType::class, $hashtypeCheck); + $this->assertEquals($hashtype->getDescription(), $hashtypeCheck->getDescription()); + } + + /** + * Test retrieving an unknown ID + * + * @throws Exception + */ + public function testGetFromDBInvalidID(): void { + $result = Factory::getHashTypeFactory()->getFromDB(999999999); + $this->assertNull($result); + } + + /** + * Test retrieving an unknown ID from a mapped table + * + * @throws Exception + */ + public function testGetFromDBInvalidIDMapped(): void { + $result = Factory::getUserFactory()->getFromDB(999999999); + $this->assertNull($result); + } + + /** + * Test creating some db objects and then massDelete them with a filter. + * + * @throws Exception + */ + public function testMassDeletionSuccess(): void { + $testid = uniqid(); + Factory::getHashTypeFactory()->save(new HashType(null, 'hashtype1' . $testid, 1, 0)); + Factory::getHashTypeFactory()->save(new HashType(null, 'hashtype2' . $testid, 125, 0)); + Factory::getHashTypeFactory()->save(new HashType(null, 'hashtype3' . $testid, 72, 0)); + + $qF = new LikeFilter(HashType::DESCRIPTION, "%" . $testid); + Factory::getHashTypeFactory()->massDeletion([Factory::FILTER => $qF]); + + $count = Factory::getHashTypeFactory()->countFilter([Factory::FILTER => $qF]); + $this->assertEquals(0, $count); + } + + /** + * Test if we can update two of three entries within one query with different values. + * + * @throws Exception + */ + public function testMassSingleUpdate(): void { + $testid = uniqid(); + $hashtype1 = $this->createDatabaseObject(Factory::getHashTypeFactory(), new HashType(null, 'hashtype1' . $testid, 1, 0)); + $this->createDatabaseObject(Factory::getHashTypeFactory(), new HashType(null, 'hashtype2' . $testid, 125, 0)); + $hashtype3 = $this->createDatabaseObject(Factory::getHashTypeFactory(), new HashType(null, 'hashtype3' . $testid, 72, 0)); + + $updates = []; + $updates[] = new MassUpdateSet($hashtype1->getId(), 5); + $updates[] = new MassUpdateSet($hashtype3->getId(), 9); + + Factory::getHashTypeFactory()->massSingleUpdate(HashType::HASH_TYPE_ID, HashType::IS_SALTED, $updates); + + $qF = new LikeFilter(HashType::DESCRIPTION, "%" . $testid); + $sum = Factory::getHashTypeFactory()->sumFilter([Factory::FILTER => $qF], HashType::IS_SALTED); + $this->assertEquals(139, $sum); + } + + /** + * Test if we apply a useless update and check that it still can be executed + * + * @throws Exception + */ + public function testMassSingleUpdateNoEffect(): void { + $testid = uniqid(); + $this->createDatabaseObject(Factory::getHashTypeFactory(), new HashType(null, 'hashtype1' . $testid, 1, 0)); + $this->createDatabaseObject(Factory::getHashTypeFactory(), new HashType(null, 'hashtype2' . $testid, 125, 0)); + $this->createDatabaseObject(Factory::getHashTypeFactory(), new HashType(null, 'hashtype3' . $testid, 72, 0)); + + $updates = []; + $updates[] = new MassUpdateSet(999999, 5); + $updates[] = new MassUpdateSet(999998, 9); + + Factory::getHashTypeFactory()->massSingleUpdate(HashType::HASH_TYPE_ID, HashType::IS_SALTED, $updates); + + $qF = new LikeFilter(HashType::DESCRIPTION, "%" . $testid); + $sum = Factory::getHashTypeFactory()->sumFilter([Factory::FILTER => $qF], HashType::IS_SALTED); + $this->assertEquals(198, $sum); + } + + /** + * Test updating multiple objects at once and check that all got this value set. + * + * @throws Exception + */ + public function testMassUpdateSuccess(): void { + $testid = uniqid(); + $this->createDatabaseObject(Factory::getHashTypeFactory(), new HashType(null, 'hashtype1' . $testid, 1, 0)); + $this->createDatabaseObject(Factory::getHashTypeFactory(), new HashType(null, 'hashtype2' . $testid, 125, 0)); + $this->createDatabaseObject(Factory::getHashTypeFactory(), new HashType(null, 'hashtype3' . $testid, 72, 0)); + + $uS = new UpdateSet(HashType::IS_SALTED, 1); + $qF = new LikeFilter(HashType::DESCRIPTION, "%" . $testid); + Factory::getHashTypeFactory()->massUpdate([Factory::UPDATE => $uS, Factory::FILTER => $qF]); + + $sum = Factory::getHashTypeFactory()->sumFilter([Factory::FILTER => $qF], HashType::IS_SALTED); + $this->assertEquals(3, $sum); + } + + /** + * Test updating multiple objects at once but with a filter not matching, so it should have no effect. + * + * @throws Exception + */ + public function testMassUpdateNoEffect(): void { + $testid = uniqid(); + $this->createDatabaseObject(Factory::getHashTypeFactory(), new HashType(null, 'hashtype1' . $testid, 1, 0)); + $this->createDatabaseObject(Factory::getHashTypeFactory(), new HashType(null, 'hashtype2' . $testid, 125, 0)); + $this->createDatabaseObject(Factory::getHashTypeFactory(), new HashType(null, 'hashtype3' . $testid, 72, 0)); + + $uS = new UpdateSet(HashType::IS_SALTED, 1); + $qF = new LikeFilter(HashType::DESCRIPTION, "%aaaa" . $testid); + Factory::getHashTypeFactory()->massUpdate([Factory::UPDATE => $uS, Factory::FILTER => $qF]); + + $qF = new LikeFilter(HashType::DESCRIPTION, "%" . $testid); + $sum = Factory::getHashTypeFactory()->sumFilter([Factory::FILTER => $qF], HashType::IS_SALTED); + $this->assertEquals(198, $sum); + } + + /** + * Tests both cases to be used on a simple QueryFilter with no result. + * When single is true, null must be returned if no matching entry was found, empty array otherwise + * + * @return void + */ + public function testSimpleFilter(): void { + $qF = new QueryFilter(User::USER_ID, 99999, "="); + + $user = Factory::getUserFactory()->filter([Factory::FILTER => $qF], true); + $this->assertSame(null, $user); + + $user = Factory::getUserFactory()->filter([Factory::FILTER => $qF]); + $this->assertSame([], $user); + } + + /** + * Tests the columnFilter function which returns an array of values of the given column of matching rows + * + * @return void + * @throws Exception + */ + public function testColumnFilter(): void { + $isSalted = random_int(9999, 999999); + + $hashlist_1 = $this->createDatabaseObject(Factory::getHashlistFactory(), new Hashlist(null, "hashlist 1", DHashlistFormat::PLAIN, 0, 0, ':', 0, 0, 0, $isSalted, AccessUtils::getOrCreateDefaultAccessGroup()->getId(), "", 0, 0, 0)); + $this->createDatabaseObject(Factory::getHashlistFactory(), new Hashlist(null, "hashlist 2", DHashlistFormat::PLAIN, 0, 0, ':', 0, 0, 0, 1, AccessUtils::getOrCreateDefaultAccessGroup()->getId(), "", 0, 0, 0)); + $hashlist_3 = $this->createDatabaseObject(Factory::getHashlistFactory(), new Hashlist(null, "hashlist 3", DHashlistFormat::PLAIN, 0, 0, ':', 0, 0, 0, $isSalted, AccessUtils::getOrCreateDefaultAccessGroup()->getId(), "", 0, 0, 0)); + + $oF = new OrderFilter(Hashlist::HASHLIST_ID, "ASC"); + + // test column filter to retrieve some of their IDs + $qF = new QueryFilter(Hashlist::IS_SALTED, $isSalted, "="); + $ids = Factory::getHashlistFactory()->columnFilter([Factory::FILTER => $qF, Factory::ORDER => $oF], Hashlist::HASHLIST_ID); + + // hashlist 1 and 3 should be returned + $this->assertSame([$hashlist_1->getId(), $hashlist_3->getId()], $ids); + + $qF = new QueryFilter(Hashlist::CRACKED, 5000, ">"); + $ids = Factory::getHashlistFactory()->columnFilter([Factory::FILTER => $qF, Factory::ORDER => $oF], Hashlist::HASHLIST_ID); + $this->assertSame([], $ids); + } + /** * @return array[Agent, HealthCheck] */ diff --git a/src/dba/AbstractModelFactory.php b/src/dba/AbstractModelFactory.php index 3a558020f..36768064d 100755 --- a/src/dba/AbstractModelFactory.php +++ b/src/dba/AbstractModelFactory.php @@ -523,7 +523,13 @@ public function columnFilter(array $options, string $column): array { return $stmt->fetchAll(PDO::FETCH_COLUMN); } - public function sumFilter($options, $sumColumn) { + /** + * @param $options array options with filters + * @param $sumColumn string column to sum up + * @return int + * @throws Exception + */ + public function sumFilter(array $options, string $sumColumn): int { $query = "SELECT SUM(" . self::getMappedModelKey($this->getNullObject(), $sumColumn) . ") AS sum "; $query = $query . " FROM " . $this->getMappedModelTable(); @@ -538,6 +544,9 @@ public function sumFilter($options, $sumColumn) { $stmt->execute($vals); $row = $stmt->fetch(PDO::FETCH_ASSOC); + if ($row['sum'] == null) { + return 0; + } return $row['sum']; } @@ -572,7 +581,12 @@ public function columnTimeseriesFilter(array $options, string $timeColumn): arra return $stmt->fetchAll(PDO::FETCH_GROUP | PDO::FETCH_KEY_PAIR); } - public function countFilter($options) { + /** + * @param $options array options with filter and join + * @return int + * @throws Exception + */ + public function countFilter(array $options): int { $query = "SELECT COUNT(*) AS count "; $query = $query . " FROM " . $this->getMappedModelTable(); @@ -591,6 +605,9 @@ public function countFilter($options) { $stmt->execute($vals); $row = $stmt->fetch(PDO::FETCH_ASSOC); + if ($row['count'] === null) { + return 0; + } return $row['count']; } @@ -618,6 +635,7 @@ public function get($pk) { * * @param $pk string primary key * @return AbstractModel|null the with pk associated model or Null + * @throws Exception */ public function getFromDB($pk): ?AbstractModel { $keys = self::getMappedModelKeys($this->getNullObject()); @@ -651,6 +669,7 @@ public function getFromDB($pk): ?AbstractModel { * * @param $options array containing option settings * @return AbstractModel[]|AbstractModel Returns a list of matching objects or Null + * @throws Exception */ private function filterWithJoin(array $options): array|AbstractModel { $vals = array(); @@ -801,6 +820,7 @@ public function filter(array $options, bool $single = false) { /** * @param $vals * @param $filters Filter|Filter[] + * @param bool $isJoinFilter * @return string */ private function applyFilters(&$vals, Filter|array $filters, bool $isJoinFilter = false): string { @@ -845,6 +865,10 @@ private function applyOrder(Order|array $orders): string { return " ORDER BY " . implode(", ", $orderQueries); } + /** + * @param $joins + * @return string + */ private function applyJoins($joins): string { $query = ""; foreach ($joins as $join) { @@ -860,12 +884,21 @@ private function applyJoins($joins): string { return $query; } - //applylimit is slightly different than the other apply functions, since you can only limit by a single value - //the $limit argument is a single object LimitFilter object instead of an array of objects. + /** + * applylimit is slightly different than the other apply functions, since you can only limit by a single value + * the $limit argument is a single object LimitFilter object instead of an array of objects. + * + * @param $limit + * @return string + */ private function applyLimit($limit): string { return " LIMIT " . $limit->getQueryString($this); } + /** + * @param $groups + * @return string + */ private function applyGroups($groups): string { $groupsQueries = array(); if (!is_array($groups)) { @@ -884,6 +917,7 @@ private function applyGroups($groups): string { * It returns the return of the execute query. * @param $model AbstractModel * @return bool + * @throws Exception */ public function delete($model): bool { if ($model != null) { @@ -900,6 +934,7 @@ public function delete($model): bool { /** * @param $options array * @return PDOStatement + * @throws Exception */ public function massDeletion(array $options): PDOStatement { $query = "DELETE FROM " . $this->getMappedModelTable(); @@ -920,9 +955,10 @@ public function massDeletion(array $options): PDOStatement { * @param $matchingColumn * @param $updateColumn * @param $updates MassUpdateSet[] - * @return null + * @return bool|null + * @throws Exception */ - public function massSingleUpdate($matchingColumn, $updateColumn, array $updates) { + public function massSingleUpdate($matchingColumn, $updateColumn, array $updates): ?bool { $query = "UPDATE " . $this->getMappedModelTable(); if (sizeof($updates) == 0) { @@ -957,6 +993,11 @@ public function massSingleUpdate($matchingColumn, $updateColumn, array $updates) return $stmt->execute($vals); } + /** + * @param $options + * @return bool + * @throws Exception + */ public function massUpdate($options): bool { $query = "UPDATE " . $this->getMappedModelTable(); @@ -997,6 +1038,7 @@ public function massUpdate($options): bool { /** * Returns the DB connection if possible * @param bool $test + * @param array $testProperties * @return ?PDO * @throws Exception */ From 7dcf071998ee685db781e03e5b3e55d83a0ac196 Mon Sep 17 00:00:00 2001 From: s3inlc Date: Thu, 21 May 2026 14:58:29 +0200 Subject: [PATCH 576/691] fixed type mismatch on test discovered by phpstan --- ci/phpunit/inc/utils/AccessControlUtilsTest.php | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) diff --git a/ci/phpunit/inc/utils/AccessControlUtilsTest.php b/ci/phpunit/inc/utils/AccessControlUtilsTest.php index 13a362682..9491c80d2 100644 --- a/ci/phpunit/inc/utils/AccessControlUtilsTest.php +++ b/ci/phpunit/inc/utils/AccessControlUtilsTest.php @@ -13,7 +13,6 @@ use Hashtopolis\inc\defines\DLimits; use Hashtopolis\inc\HTException; use Hashtopolis\inc\defines\DAccessControl; -use Hashtopolis\inc\utils\AccessControlUtils; use Hashtopolis\TestBase; use Override; @@ -25,15 +24,19 @@ final class AccessControlUtilsTest extends TestBase { protected function setUp(): void { parent::setUp(); - $this->group = $this->createDatabaseObject( + $group = $this->createDatabaseObject( Factory::getRightGroupFactory(), new RightGroup(null, 'phpunit-' . uniqid('', true), '[]') ); + $this->assertTrue($group instanceof RightGroup); + $this->group = $group; - $this->otherGroup = $this->createDatabaseObject( + $otherGroup = $this->createDatabaseObject( Factory::getRightGroupFactory(), new RightGroup(null, 'phpunit-' . uniqid('', true), '[]') ); + $this->assertTrue($otherGroup instanceof RightGroup); + $this->otherGroup = $otherGroup; } #[Override] @@ -137,7 +140,7 @@ public function testAddNonExistentPermissionToGroup(): void { public function testUpdateNonexistentGroupThrowsException() { $this->expectException(HTException::class); AccessControlUtils::updateGroupPermissions( - -3, + -3, [DAccessControl::CRACKER_BINARY_ACCESS => true], ); } @@ -145,7 +148,7 @@ public function testUpdateNonexistentGroupThrowsException() { public function testUpdateAdminPermissionsIsNotAllowed(): void { $this->expectException(HTException::class); AccessControlUtils::updateGroupPermissions( - $this->adminUser->getRightGroupId(), + $this->adminUser->getRightGroupId(), [DAccessControl::CRACKER_BINARY_ACCESS => true], ); } From 38c332c4673b526d606c0cf78dfd85fd839793c2 Mon Sep 17 00:00:00 2001 From: s3inlc Date: Thu, 21 May 2026 16:35:47 +0200 Subject: [PATCH 577/691] added tests for ->filter() --- ci/phpunit/dba/AbstractModelFactoryTest.php | 102 +++++++++++++++++++- src/dba/AbstractModelFactory.php | 26 +---- src/dba/Factory.php | 1 - src/dba/Group.php | 7 -- src/dba/GroupFilter.php | 27 ------ src/dba/models/Factory.template.txt | 1 - 6 files changed, 104 insertions(+), 60 deletions(-) delete mode 100644 src/dba/Group.php delete mode 100644 src/dba/GroupFilter.php diff --git a/ci/phpunit/dba/AbstractModelFactoryTest.php b/ci/phpunit/dba/AbstractModelFactoryTest.php index 6939b2858..262ec5712 100644 --- a/ci/phpunit/dba/AbstractModelFactoryTest.php +++ b/ci/phpunit/dba/AbstractModelFactoryTest.php @@ -10,7 +10,6 @@ use Hashtopolis\dba\models\HealthCheck; use Hashtopolis\dba\models\HealthCheckAgent; use Hashtopolis\TestBase; -use phpDocumentor\Reflection\Types\Integer; use Random\RandomException; use Hashtopolis\dba\models\Hashlist; use Exception; @@ -768,6 +767,107 @@ public function testGetFromDBInvalidIDMapped(): void { $this->assertNull($result); } + /** + * Test with no filtering at all, check if the correct objects are returned and the expected number. + * + * @return void + * @throws Exception + */ + public function testFilterNoFilter(): void { + $users = Factory::getUserFactory()->filter([]); + + // to avoid having issues if the database is not empty, we cross check with the count filter that the same amount of objects is returned + $count = Factory::getUserFactory()->countFilter([]); + $this->assertEquals($count, count($users)); + + foreach ($users as $user) { + $this->assertTrue($user instanceof User); + } + } + + /** + * Test retrieving some matching entries of entries in the table with a normal filter. + * + * @return void + */ + public function testFilterNormalFilter(): void { + $testid = uniqid(); + $this->createDatabaseObject(Factory::getHashTypeFactory(), new HashType(null, 'hashtype1' . $testid, 1, 0)); + $this->createDatabaseObject(Factory::getHashTypeFactory(), new HashType(null, 'hashtype2' . $testid, 125, 0)); + $this->createDatabaseObject(Factory::getHashTypeFactory(), new HashType(null, 'hashtype3' . $testid, 72, 0)); + + $qF1 = new QueryFilter(HashType::IS_SALTED, 50, ">"); + $qF2 = new LikeFilter(HashType::DESCRIPTION, "%" . $testid); + $hashtypes = Factory::getHashTypeFactory()->filter([Factory::FILTER => [$qF1, $qF2]]); + $this->assertCount(2, $hashtypes); + foreach ($hashtypes as $hashtype) { + $this->assertTrue($hashtype instanceof HashType); + $this->assertTrue($hashtype->getIsSalted() > 50); + } + } + + /** + * Test retrieving some matching entries of entries in the table with a normal filter with specific sorting. + * + * @return void + */ + public function testFilterNormalFilterWithOrderDesc(): void { + $testid = uniqid(); + $this->createDatabaseObject(Factory::getHashTypeFactory(), new HashType(null, 'hashtype1' . $testid, 1, 0)); + $this->createDatabaseObject(Factory::getHashTypeFactory(), new HashType(null, 'hashtype2' . $testid, 125, 0)); + $this->createDatabaseObject(Factory::getHashTypeFactory(), new HashType(null, 'hashtype3' . $testid, 72, 0)); + + $qF1 = new QueryFilter(HashType::IS_SALTED, 50, ">"); + $qF2 = new LikeFilter(HashType::DESCRIPTION, "%" . $testid); + $oF = new OrderFilter(HashType::IS_SALTED, "DESC"); + $hashtypes = Factory::getHashTypeFactory()->filter([Factory::FILTER => [$qF1, $qF2], Factory::ORDER => $oF]); + $this->assertCount(2, $hashtypes); + $this->assertEquals(125, $hashtypes[0]->getIsSalted()); + $this->assertEquals(72, $hashtypes[1]->getIsSalted()); + } + + /** + * Test retrieving some matching entries of entries in the table with a normal filter but limit entries + * + * @return void + */ + public function testFilterNormalFilterWithLimit(): void { + $testid = uniqid(); + $this->createDatabaseObject(Factory::getHashTypeFactory(), new HashType(null, 'hashtype1' . $testid, 1, 0)); + $this->createDatabaseObject(Factory::getHashTypeFactory(), new HashType(null, 'hashtype2' . $testid, 125, 0)); + $this->createDatabaseObject(Factory::getHashTypeFactory(), new HashType(null, 'hashtype3' . $testid, 72, 0)); + $this->createDatabaseObject(Factory::getHashTypeFactory(), new HashType(null, 'hashtype3' . $testid, 3, 0)); + + $qF = new QueryFilter(HashType::IS_SLOW_HASH, 0, "="); + $lF = new LimitFilter(2); + $hashtypes = Factory::getHashTypeFactory()->filter([Factory::FILTER => $qF, Factory::LIMIT => $lF]); + $this->assertCount(2, $hashtypes); + foreach ($hashtypes as $hashtype) { + $this->assertTrue($hashtype instanceof HashType); + $this->assertTrue($hashtype->getIsSlowHash() == 0); + } + } + + /** + * Test retrieving some matching entries of entries but only request one single. + * + * @return void + */ + public function testFilterNormalFilterSingle(): void { + $testid = uniqid(); + $this->createDatabaseObject(Factory::getHashTypeFactory(), new HashType(null, 'hashtype1' . $testid, 1, 0)); + $this->createDatabaseObject(Factory::getHashTypeFactory(), new HashType(null, 'hashtype2' . $testid, 125, 0)); + $this->createDatabaseObject(Factory::getHashTypeFactory(), new HashType(null, 'hashtype3' . $testid, 72, 0)); + + $qF1 = new QueryFilter(HashType::IS_SLOW_HASH, 0, "="); + $qF2 = new LikeFilter(HashType::DESCRIPTION, "%" . $testid); + $oF = new OrderFilter(HashType::HASH_TYPE_ID, "ASC"); + $hashtype = Factory::getHashTypeFactory()->filter([Factory::FILTER => [$qF1, $qF2], Factory::ORDER => $oF], true); + $this->assertTrue($hashtype instanceof HashType); + $this->assertEquals(1, $hashtype->getIsSalted()); + $this->assertEquals('hashtype1' . $testid, $hashtype->getDescription()); + } + /** * Test creating some db objects and then massDelete them with a filter. * diff --git a/src/dba/AbstractModelFactory.php b/src/dba/AbstractModelFactory.php index 36768064d..247796e42 100755 --- a/src/dba/AbstractModelFactory.php +++ b/src/dba/AbstractModelFactory.php @@ -212,20 +212,6 @@ private function getOrders(array $arr): array { return array(); } - /** - * @param $arr array - * @return Group[] - */ - private function getGroups(array $arr): array { - if (!is_array($arr[Factory::GROUP])) { - $arr[Factory::GROUP] = array($arr[Factory::GROUP]); - } - if (isset($arr[Factory::GROUP])) { - return $arr[Factory::GROUP]; - } - return array(); - } - /** * @param $arr array * @return Join[] @@ -621,6 +607,7 @@ public function countFilter(array $options): int { * * @param $pk string primary key * @return AbstractModel|null the with pk associated model or Null + * @throws Exception */ public function get($pk) { return $this->getFromDB($pk); @@ -703,10 +690,6 @@ private function filterWithJoin(array $options): array|AbstractModel { $query .= $this->applyFilters($vals, $options[Factory::FILTER]); } - if (array_key_exists(Factory::GROUP, $options)) { - $query .= $this->applyGroups($this->getGroups($options)); - } - // Apply order filter if (!array_key_exists(Factory::ORDER, $options)) { // Add a asc order on the primary keys as a standard @@ -754,8 +737,9 @@ private function filterWithJoin(array $options): array|AbstractModel { * @param array $options * @param bool $single * @return array|AbstractModel|null + * @throws Exception */ - public function filter(array $options, bool $single = false) { + public function filter(array $options, bool $single = false): array|AbstractModel|null { // Check if we need to join and if so pass on to internal Function if (array_key_exists(Factory::JOIN, $options)) { return $this->filterWithJoin($options); @@ -769,10 +753,6 @@ public function filter(array $options, bool $single = false) { $query .= $this->applyFilters($vals, $options[Factory::FILTER]); } - if (array_key_exists(Factory::GROUP, $options)) { - $query .= $this->applyGroups($this->getGroups($options)); - } - if (!array_key_exists(Factory::ORDER, $options)) { // Add a asc order on the primary keys as a standard $oF = new OrderFilter($this->getNullObject()->getPrimaryKey(), "ASC"); diff --git a/src/dba/Factory.php b/src/dba/Factory.php index 142e122d5..b2bb7f63f 100644 --- a/src/dba/Factory.php +++ b/src/dba/Factory.php @@ -561,6 +561,5 @@ public static function getHashlistHashlistFactory(): HashlistHashlistFactory { const JOIN = "join"; const ORDER = "order"; const UPDATE = "update"; - const GROUP = "group"; const LIMIT = "limit"; } diff --git a/src/dba/Group.php b/src/dba/Group.php deleted file mode 100644 index 341d281da..000000000 --- a/src/dba/Group.php +++ /dev/null @@ -1,7 +0,0 @@ -by = $by; - $this->overrideFactory = $overrideFactory; - } - - function getQueryString(AbstractModelFactory $factory, bool $includeTable = false): string { - if ($this->overrideFactory != null) { - $factory = $this->overrideFactory; - } - $table = ""; - if ($includeTable) { - $table = $factory->getMappedModelTable() . "."; - } - - return $table . AbstractModelFactory::getMappedModelKey($factory->getNullObject(), $this->by) . " "; - } -} - - diff --git a/src/dba/models/Factory.template.txt b/src/dba/models/Factory.template.txt index 9a51e87d9..28cb2be4c 100644 --- a/src/dba/models/Factory.template.txt +++ b/src/dba/models/Factory.template.txt @@ -13,6 +13,5 @@ class Factory { const JOIN = "join"; const ORDER = "order"; const UPDATE = "update"; - const GROUP = "group"; const LIMIT = "limit"; } From 3e10bb59a4501d24971349187266f5c506097972 Mon Sep 17 00:00:00 2001 From: inadequate777 Date: Fri, 22 May 2026 06:58:49 +0000 Subject: [PATCH 578/691] rust 1.94 in dockerfile --- Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index d2d6687e8..75da6e5a2 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,4 +1,4 @@ -FROM rust:1.91-slim-trixie AS prebuild +FROM rust:1.94-slim-trixie AS prebuild RUN apt-get update && apt-get install -y pkg-config libssl-dev From 990dfcdb758ce2a5336b7570cc4feab25c24ec36 Mon Sep 17 00:00:00 2001 From: s3inlc Date: Fri, 22 May 2026 09:04:04 +0200 Subject: [PATCH 579/691] completed AbstractModelFactory tests --- ci/phpunit/dba/AbstractModelFactoryTest.php | 128 ++++++++++++++++++++ 1 file changed, 128 insertions(+) diff --git a/ci/phpunit/dba/AbstractModelFactoryTest.php b/ci/phpunit/dba/AbstractModelFactoryTest.php index 262ec5712..bfe3c7b55 100644 --- a/ci/phpunit/dba/AbstractModelFactoryTest.php +++ b/ci/phpunit/dba/AbstractModelFactoryTest.php @@ -2,9 +2,12 @@ namespace Hashtopolis\dba; +use Hashtopolis\dba\models\AccessGroup; +use Hashtopolis\dba\models\AccessGroupUser; use Hashtopolis\dba\models\Agent; use Hashtopolis\dba\models\CrackerBinary; use Hashtopolis\dba\models\CrackerBinaryType; +use Hashtopolis\dba\models\File; use Hashtopolis\dba\models\Hash; use Hashtopolis\dba\models\HashType; use Hashtopolis\dba\models\HealthCheck; @@ -868,6 +871,131 @@ public function testFilterNormalFilterSingle(): void { $this->assertEquals('hashtype1' . $testid, $hashtype->getDescription()); } + /** + * Test with no filtering at all, check if the correct objects are returned and the expected number. + * + * @return void + * @throws Exception + */ + public function testFilterWithJoinsNoFilter(): void { + $jF = new JoinFilter(Factory::getAccessGroupFactory(), File::ACCESS_GROUP_ID, AccessGroup::ACCESS_GROUP_ID); + $joined = Factory::getFileFactory()->filter([Factory::JOIN => $jF]); + + // to avoid having issues if the database is not empty, we cross check with the count filter that the same amount of objects is returned + $count = Factory::getFileFactory()->countFilter([]); + $this->assertEquals($count, count($joined[Factory::getFileFactory()->getModelName()])); + $this->assertEquals(count($joined[Factory::getFileFactory()->getModelName()]), count($joined[Factory::getAccessGroupFactory()->getModelName()])); + + foreach ($joined[Factory::getFileFactory()->getModelName()] as $file) { + $this->assertTrue($file instanceof File); + } + foreach ($joined[Factory::getAccessGroupFactory()->getModelName()] as $accessGroup) { + $this->assertTrue($accessGroup instanceof AccessGroup); + } + } + + /** + * Test retrieving some matching entries of entries in the table with a normal filter. + * + * @return void + */ + public function testFilterWithJoinsNormalFilter(): void { + $testid = uniqid(); + + $accessGroup1 = $this->createDatabaseObject(Factory::getAccessGroupFactory(), new AccessGroup(null, 'testgroup1' . $testid)); + $accessGroup2 = $this->createDatabaseObject(Factory::getAccessGroupFactory(), new AccessGroup(null, 'testgroup2' . $testid)); + $this->assertTrue($accessGroup1 instanceof AccessGroup); + + $this->createDatabaseObject(Factory::getFileFactory(), new File(null, 'file1' . $testid, 1, 0, 0, $accessGroup1->getId(), 1)); + $this->createDatabaseObject(Factory::getFileFactory(), new File(null, 'file2' . $testid, 1, 0, 0, $accessGroup2->getId(), 1)); + $this->createDatabaseObject(Factory::getFileFactory(), new File(null, 'file3' . $testid, 1, 0, 0, $accessGroup1->getId(), 1)); + + $qF = new QueryFilter(AccessGroup::GROUP_NAME, $accessGroup1->getGroupName(), "=", Factory::getAccessGroupFactory()); + $jF = new JoinFilter(Factory::getAccessGroupFactory(), File::ACCESS_GROUP_ID, AccessGroupUser::ACCESS_GROUP_ID); + $joined = Factory::getFileFactory()->filter([Factory::FILTER => $qF, Factory::JOIN => $jF]); + $this->assertCount(2, $joined[Factory::getFileFactory()->getModelName()]); + + $this->assertTrue($joined[Factory::getFileFactory()->getModelName()][0] instanceof File); + $this->assertTrue($joined[Factory::getFileFactory()->getModelName()][1] instanceof File); + + $this->assertEquals('file1' . $testid, $joined[Factory::getFileFactory()->getModelName()][0]->getFilename()); + $this->assertEquals('file3' . $testid, $joined[Factory::getFileFactory()->getModelName()][1]->getFilename()); + + $this->assertTrue($joined[Factory::getAccessGroupFactory()->getModelName()][0] instanceof AccessGroup); + $this->assertTrue($joined[Factory::getAccessGroupFactory()->getModelName()][1] instanceof AccessGroup); + + $this->assertEquals($joined[Factory::getAccessGroupFactory()->getModelName()][0]->getId(), $joined[Factory::getAccessGroupFactory()->getModelName()][1]->getId()); + } + + /** + * Test retrieving some matching entries of entries in the table with a normal filter with specific sorting. + * + * @return void + */ + public function testFilterWithJoinsNormalFilterWithOrderDesc(): void { + $testid = uniqid(); + + $accessGroup1 = $this->createDatabaseObject(Factory::getAccessGroupFactory(), new AccessGroup(null, 'testgroup1' . $testid)); + $accessGroup2 = $this->createDatabaseObject(Factory::getAccessGroupFactory(), new AccessGroup(null, 'testgroup2' . $testid)); + $this->assertTrue($accessGroup1 instanceof AccessGroup); + + $this->createDatabaseObject(Factory::getFileFactory(), new File(null, 'file1' . $testid, 1, 0, 0, $accessGroup1->getId(), 1)); + $this->createDatabaseObject(Factory::getFileFactory(), new File(null, 'file2' . $testid, 2, 0, 0, $accessGroup2->getId(), 1)); + $this->createDatabaseObject(Factory::getFileFactory(), new File(null, 'file3' . $testid, 3, 0, 0, $accessGroup1->getId(), 1)); + + $qF = new QueryFilter(AccessGroup::GROUP_NAME, $accessGroup1->getGroupName(), "=", Factory::getAccessGroupFactory()); + $jF = new JoinFilter(Factory::getAccessGroupFactory(), File::ACCESS_GROUP_ID, AccessGroupUser::ACCESS_GROUP_ID); + $oF = new OrderFilter(File::SIZE, "DESC"); + $joined = Factory::getFileFactory()->filter([Factory::FILTER => $qF, Factory::JOIN => $jF, Factory::ORDER => $oF]); + $this->assertCount(2, $joined[Factory::getFileFactory()->getModelName()]); + + $this->assertTrue($joined[Factory::getFileFactory()->getModelName()][0] instanceof File); + $this->assertTrue($joined[Factory::getFileFactory()->getModelName()][1] instanceof File); + + $this->assertEquals('file3' . $testid, $joined[Factory::getFileFactory()->getModelName()][0]->getFilename()); + $this->assertEquals('file1' . $testid, $joined[Factory::getFileFactory()->getModelName()][1]->getFilename()); + + $this->assertTrue($joined[Factory::getAccessGroupFactory()->getModelName()][0] instanceof AccessGroup); + $this->assertTrue($joined[Factory::getAccessGroupFactory()->getModelName()][1] instanceof AccessGroup); + + $this->assertEquals($joined[Factory::getAccessGroupFactory()->getModelName()][0]->getId(), $joined[Factory::getAccessGroupFactory()->getModelName()][1]->getId()); + } + + /** + * Test retrieving some matching entries of entries in the table with a normal filter but limit entries + * + * @return void + */ + public function testFilterWithJoinsNormalFilterWithLimit(): void { + $testid = uniqid(); + + $accessGroup1 = $this->createDatabaseObject(Factory::getAccessGroupFactory(), new AccessGroup(null, 'testgroup1' . $testid)); + $accessGroup2 = $this->createDatabaseObject(Factory::getAccessGroupFactory(), new AccessGroup(null, 'testgroup2' . $testid)); + $this->assertTrue($accessGroup1 instanceof AccessGroup); + + $this->createDatabaseObject(Factory::getFileFactory(), new File(null, 'file1' . $testid, 1, 0, 0, $accessGroup1->getId(), 1)); + $this->createDatabaseObject(Factory::getFileFactory(), new File(null, 'file2' . $testid, 2, 0, 0, $accessGroup2->getId(), 1)); + $this->createDatabaseObject(Factory::getFileFactory(), new File(null, 'file3' . $testid, 3, 0, 0, $accessGroup1->getId(), 1)); + $this->createDatabaseObject(Factory::getFileFactory(), new File(null, 'file4' . $testid, 4, 0, 0, $accessGroup1->getId(), 1)); + + $qF = new QueryFilter(AccessGroup::GROUP_NAME, $accessGroup1->getGroupName(), "=", Factory::getAccessGroupFactory()); + $jF = new JoinFilter(Factory::getAccessGroupFactory(), File::ACCESS_GROUP_ID, AccessGroupUser::ACCESS_GROUP_ID); + $lF = new LimitFilter(2); + $joined = Factory::getFileFactory()->filter([Factory::FILTER => $qF, Factory::JOIN => $jF, Factory::LIMIT => $lF]); + $this->assertCount(2, $joined[Factory::getFileFactory()->getModelName()]); + + $this->assertTrue($joined[Factory::getFileFactory()->getModelName()][0] instanceof File); + $this->assertTrue($joined[Factory::getFileFactory()->getModelName()][1] instanceof File); + + $this->assertEquals('file1' . $testid, $joined[Factory::getFileFactory()->getModelName()][0]->getFilename()); + $this->assertEquals('file3' . $testid, $joined[Factory::getFileFactory()->getModelName()][1]->getFilename()); + + $this->assertTrue($joined[Factory::getAccessGroupFactory()->getModelName()][0] instanceof AccessGroup); + $this->assertTrue($joined[Factory::getAccessGroupFactory()->getModelName()][1] instanceof AccessGroup); + + $this->assertEquals($joined[Factory::getAccessGroupFactory()->getModelName()][0]->getId(), $joined[Factory::getAccessGroupFactory()->getModelName()][1]->getId()); + } + /** * Test creating some db objects and then massDelete them with a filter. * From 909a59b578faea78d6e24ded4daed1769818f4d1 Mon Sep 17 00:00:00 2001 From: s3inlc Date: Fri, 22 May 2026 09:26:10 +0200 Subject: [PATCH 580/691] check for null value before strlen --- src/inc/Util.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/inc/Util.php b/src/inc/Util.php index cd3c8c2ad..c0850aca7 100755 --- a/src/inc/Util.php +++ b/src/inc/Util.php @@ -582,7 +582,7 @@ public static function loadTasks($archived = false) { $hashlist = Factory::getHashlistFactory()->get($taskWrapper->getHashlistId()); $set->addValue('taskId', $task->getId()); $set->addValue('color', $task->getColor()); - $set->addValue('hasColor', (strlen($task->getColor()) == 0) ? false : true); + $set->addValue('hasColor', !(($task->getColor() == null || strlen($task->getColor()) == 0))); $set->addValue('attackCmd', $task->getAttackCmd()); $set->addValue('taskName', $task->getTaskName()); $set->addValue('isCpu', $task->getIsCpuTask()); From 40a471a4e05756bd19718ae2629a7d24a7f135ad Mon Sep 17 00:00:00 2001 From: s3inlc Date: Fri, 22 May 2026 09:39:53 +0200 Subject: [PATCH 581/691] fixed failing tests, check phpstan possibility --- ci/phpunit/dba/AbstractModelFactoryTest.php | 19 ++++++++++++------- 1 file changed, 12 insertions(+), 7 deletions(-) diff --git a/ci/phpunit/dba/AbstractModelFactoryTest.php b/ci/phpunit/dba/AbstractModelFactoryTest.php index bfe3c7b55..51596132c 100644 --- a/ci/phpunit/dba/AbstractModelFactoryTest.php +++ b/ci/phpunit/dba/AbstractModelFactoryTest.php @@ -224,6 +224,9 @@ public function testMsetSuccess(): void { /** * Tests two separate mset requests on different objects and make sure that both changes survive if they are not on the same column * + * @var HashType $hashType1 + * @var HashType $hashType2 + * * @return void * @throws Exception */ @@ -1120,17 +1123,19 @@ public function testSimpleFilter(): void { * @throws Exception */ public function testColumnFilter(): void { - $isSalted = random_int(9999, 999999); + $isSalted = random_int(1, 100); + $testid = uniqid(); - $hashlist_1 = $this->createDatabaseObject(Factory::getHashlistFactory(), new Hashlist(null, "hashlist 1", DHashlistFormat::PLAIN, 0, 0, ':', 0, 0, 0, $isSalted, AccessUtils::getOrCreateDefaultAccessGroup()->getId(), "", 0, 0, 0)); - $this->createDatabaseObject(Factory::getHashlistFactory(), new Hashlist(null, "hashlist 2", DHashlistFormat::PLAIN, 0, 0, ':', 0, 0, 0, 1, AccessUtils::getOrCreateDefaultAccessGroup()->getId(), "", 0, 0, 0)); - $hashlist_3 = $this->createDatabaseObject(Factory::getHashlistFactory(), new Hashlist(null, "hashlist 3", DHashlistFormat::PLAIN, 0, 0, ':', 0, 0, 0, $isSalted, AccessUtils::getOrCreateDefaultAccessGroup()->getId(), "", 0, 0, 0)); + $hashlist_1 = $this->createDatabaseObject(Factory::getHashlistFactory(), new Hashlist(null, "hashlist 1" . $testid, DHashlistFormat::PLAIN, 0, 0, ':', 0, 0, 0, $isSalted, AccessUtils::getOrCreateDefaultAccessGroup()->getId(), "", 0, 0, 0)); + $this->createDatabaseObject(Factory::getHashlistFactory(), new Hashlist(null, "hashlist 2" . $testid, DHashlistFormat::PLAIN, 0, 0, ':', 0, 0, 0, 1, AccessUtils::getOrCreateDefaultAccessGroup()->getId(), "", 0, 0, 0)); + $hashlist_3 = $this->createDatabaseObject(Factory::getHashlistFactory(), new Hashlist(null, "hashlist 3" . $testid, DHashlistFormat::PLAIN, 0, 0, ':', 0, 0, 0, $isSalted, AccessUtils::getOrCreateDefaultAccessGroup()->getId(), "", 0, 0, 0)); $oF = new OrderFilter(Hashlist::HASHLIST_ID, "ASC"); // test column filter to retrieve some of their IDs - $qF = new QueryFilter(Hashlist::IS_SALTED, $isSalted, "="); - $ids = Factory::getHashlistFactory()->columnFilter([Factory::FILTER => $qF, Factory::ORDER => $oF], Hashlist::HASHLIST_ID); + $qF1 = new QueryFilter(Hashlist::IS_SALTED, $isSalted, "="); + $qF2 = new LikeFilter(Hashlist::HASHLIST_NAME, "%" . $testid); + $ids = Factory::getHashlistFactory()->columnFilter([Factory::FILTER => [$qF1, $qF2], Factory::ORDER => $oF], Hashlist::HASHLIST_ID); // hashlist 1 and 3 should be returned $this->assertSame([$hashlist_1->getId(), $hashlist_3->getId()], $ids); @@ -1141,7 +1146,7 @@ public function testColumnFilter(): void { } /** - * @return array[Agent, HealthCheck] + * @return array */ private function setUpHealthCheck(): array { $agent = new Agent(null, '', '', 0, '', '', 0, 0, 0, '', '', 0, '', null, 0, ''); From 4bb95e42e981d669df95cb7a4a2a0e45313689c1 Mon Sep 17 00:00:00 2001 From: jessevz Date: Fri, 22 May 2026 09:40:25 +0200 Subject: [PATCH 582/691] Added assigned agents to taskwrapperdisplay --- src/inc/apiv2/model/TaskWrapperDisplayAPI.php | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/src/inc/apiv2/model/TaskWrapperDisplayAPI.php b/src/inc/apiv2/model/TaskWrapperDisplayAPI.php index 731318657..c10b2398b 100644 --- a/src/inc/apiv2/model/TaskWrapperDisplayAPI.php +++ b/src/inc/apiv2/model/TaskWrapperDisplayAPI.php @@ -6,6 +6,7 @@ use Hashtopolis\dba\ContainFilter; use Hashtopolis\dba\Factory; use Hashtopolis\dba\JoinFilter; +use Hashtopolis\dba\models\Assignment; use Hashtopolis\dba\models\Chunk; use Hashtopolis\dba\models\Hashlist; use Hashtopolis\dba\models\Task; @@ -142,6 +143,13 @@ function aggregateData(object $object, array &$included_data = [], ?array $aggre $aggregatedData["timeSpent"] = $timeSpent; $aggregatedData["currentSpeed"] = $currentSpeed; $aggregatedData["cprogress"] = $cProgress; + + $assignedAgents = []; + if (is_null($aggregateFieldsets) || in_array("assignedAgents", $aggregateFieldsets['task'])) { + $qF = new QueryFilter(Assignment::TASK_ID, $object->getTaskId(), "="); + $assignedAgents = Factory::getAssignmentFactory()->countFilter([Factory::FILTER => $qF]); + $aggregatedData["totalAssignedAgents"] = $assignedAgents; + } } } } From 639e92b944c0172c307192310d36a654e333e57b Mon Sep 17 00:00:00 2001 From: s3inlc Date: Fri, 22 May 2026 09:57:24 +0200 Subject: [PATCH 583/691] try to make phpstan happy --- ci/phpunit/dba/AbstractModelFactoryTest.php | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/ci/phpunit/dba/AbstractModelFactoryTest.php b/ci/phpunit/dba/AbstractModelFactoryTest.php index 51596132c..7077f1351 100644 --- a/ci/phpunit/dba/AbstractModelFactoryTest.php +++ b/ci/phpunit/dba/AbstractModelFactoryTest.php @@ -224,15 +224,12 @@ public function testMsetSuccess(): void { /** * Tests two separate mset requests on different objects and make sure that both changes survive if they are not on the same column * - * @var HashType $hashType1 - * @var HashType $hashType2 - * * @return void * @throws Exception */ public function testMsetSuccessTwoObjects(): void { $hashType1 = $this->createDatabaseObject(Factory::getHashTypeFactory(), new HashType(null, 'placeholder', 0, 0)); - $hashType2 = clone $hashType1; + $hashType2 = Factory::getHashTypeFactory()->get($hashType1->getId()); $this->assertTrue($hashType1 instanceof HashType); $this->assertTrue($hashType2 instanceof HashType); From 661db8abf68e4e819c8cc52ef9ba0dca8964d925 Mon Sep 17 00:00:00 2001 From: s3inlc Date: Fri, 22 May 2026 10:43:36 +0200 Subject: [PATCH 584/691] skipping phpstan on dba factory test --- phpstan.neon | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/phpstan.neon b/phpstan.neon index 2bec3ecf0..2be365de4 100644 --- a/phpstan.neon +++ b/phpstan.neon @@ -6,4 +6,7 @@ parameters: treatPhpDocTypesAsCertain: false scanDirectories: - src/dba - - src/inc \ No newline at end of file + - src/inc + excludePaths: + # Exclude the DBA tests due PHPStan doing weird complaints + - ci/phpunit/dba/AbstractModelFactoryTest.php \ No newline at end of file From ef846a2f8f28ab539d1ad5a7c789e73d4a787934 Mon Sep 17 00:00:00 2001 From: s3inlc Date: Fri, 22 May 2026 10:44:27 +0200 Subject: [PATCH 585/691] checking to only do ->inc() calls on values needed --- ci/phpunit/TestBase.php | 23 +++++++++++++++++++++++ src/inc/api/APISendProgress.php | 16 ++++++++++++---- src/inc/utils/HashlistUtils.php | 12 ++++++++---- 3 files changed, 43 insertions(+), 8 deletions(-) diff --git a/ci/phpunit/TestBase.php b/ci/phpunit/TestBase.php index d2f35aa1d..cc5042057 100644 --- a/ci/phpunit/TestBase.php +++ b/ci/phpunit/TestBase.php @@ -3,6 +3,7 @@ namespace Hashtopolis; +use Exception; use Hashtopolis\dba\AbstractModel; use Hashtopolis\dba\AbstractModelFactory; use Hashtopolis\dba\models\User; @@ -53,16 +54,38 @@ protected function tearDown(): void { parent::tearDown(); } + /** + * used to create an object in the database and then register it directly for deletion to be cleaned up after the test + * + * @param AbstractModelFactory $factory + * @param AbstractModel $obj + * @return AbstractModel + * @throws Exception + */ public function createDatabaseObject(AbstractModelFactory $factory, AbstractModel $obj): AbstractModel { $obj = $factory->save($obj); $this->registerDatabaseObject($factory, $obj); return $obj; } + /** + * used to just register an already existing database object during the tests to be deleted at the end + * + * @param AbstractModelFactory $factory + * @param AbstractModel $obj + * @return void + */ public function registerDatabaseObject(AbstractModelFactory $factory, AbstractModel $obj): void { $this->databaseObjects[] = ["factory" => $factory, "object" => $obj]; } + /** + * used to just register already existing database objects during the tests to be deleted at the end + * + * @param AbstractModelFactory $factory + * @param array $objects + * @return void + */ public function registerDatabaseObjects(AbstractModelFactory $factory, array $objects): void { foreach ($objects as $object) { $this->databaseObjects[] = ["factory" => $factory, "object" => $object]; diff --git a/src/inc/api/APISendProgress.php b/src/inc/api/APISendProgress.php index ee653b8b9..ef3073d43 100644 --- a/src/inc/api/APISendProgress.php +++ b/src/inc/api/APISendProgress.php @@ -393,20 +393,28 @@ public function execute($QUERY = array()) { $sumCracked = 0; foreach ($cracked as $listId => $cracks) { $list = Factory::getHashlistFactory()->get($listId); - Factory::getHashlistFactory()->inc($list, Hashlist::CRACKED, $cracks); + if ($cracks > 0) { + Factory::getHashlistFactory()->inc($list, Hashlist::CRACKED, $cracks); + } if (!$isSuperhashlist) { // check if it is part of one or more superhashlists and if yes, update the count there as well $superHashlists = Util::getParentSuperHashlists($list); foreach ($superHashlists as $superHashlist) { - Factory::getHashlistFactory()->inc($superHashlist, Hashlist::CRACKED, $cracks); + if ($cracks > 0) { + Factory::getHashlistFactory()->inc($superHashlist, Hashlist::CRACKED, $cracks); + } } } $sumCracked += $cracks; } - Factory::getChunkFactory()->inc($chunk, Chunk::CRACKED, $sumCracked); - if ($isSuperhashlist) { + + if ($sumCracked > 0) { + Factory::getChunkFactory()->inc($chunk, Chunk::CRACKED, $sumCracked); + } + + if ($isSuperhashlist && $sumCracked > 0) { // if it's a superhashlist, we need to update the count for the superhashlist as well $hashlist = Factory::getHashlistFactory()->get($taskWrapper->getHashlistId()); Factory::getHashlistFactory()->inc($hashlist, Hashlist::CRACKED, $sumCracked); diff --git a/src/inc/utils/HashlistUtils.php b/src/inc/utils/HashlistUtils.php index 28f740686..2a497d081 100644 --- a/src/inc/utils/HashlistUtils.php +++ b/src/inc/utils/HashlistUtils.php @@ -525,7 +525,9 @@ public static function processZap($hashlistId, $separator, $source, $post, $file if ($bufferCount > 1000) { foreach ($hashlists as $l) { $ll = Factory::getHashlistFactory()->get($l->getId()); - Factory::getHashlistFactory()->inc($ll, Hashlist::CRACKED, $crackedIn[$ll->getId()]); + if ($crackedIn[$ll->getId()] > 0) { + Factory::getHashlistFactory()->inc($ll, Hashlist::CRACKED, $crackedIn[$ll->getId()]); + } } foreach ($hashlists as $l) { $crackedIn[$l->getId()] = 0; @@ -546,17 +548,19 @@ public static function processZap($hashlistId, $separator, $source, $post, $file //finish foreach ($hashlists as $l) { $ll = Factory::getHashlistFactory()->get($l->getId()); - Factory::getHashlistFactory()->inc($ll, Hashlist::CRACKED, $crackedIn[$ll->getId()]); + if ($crackedIn[$ll->getId()] > 0) { + Factory::getHashlistFactory()->inc($ll, Hashlist::CRACKED, $crackedIn[$ll->getId()]); + } } if (sizeof($zaps) > 0) { Factory::getZapFactory()->massSave($zaps); } - if ($hashlist->getFormat() == DHashlistFormat::SUPERHASHLIST) { + if ($hashlist->getFormat() == DHashlistFormat::SUPERHASHLIST && array_sum($crackedIn) > 0) { $hashlist = Factory::getHashlistFactory()->get($hashlist->getId()); Factory::getHashlistFactory()->inc($hashlist, Hashlist::CRACKED, array_sum($crackedIn)); } - if (sizeof($inSuperHashlists) > 0) { + if (sizeof($inSuperHashlists) > 0 && array_sum($crackedIn) > 0) { $total = array_sum($crackedIn); foreach ($inSuperHashlists as $super) { $superHashlist = Factory::getHashlistFactory()->get($super->getParentHashlistId()); From caa683efb74aa91090eb3846a8267636a40cc052 Mon Sep 17 00:00:00 2001 From: andreas Date: Fri, 22 May 2026 10:48:38 +0200 Subject: [PATCH 586/691] 2120 Added tests and type info for AccessUtils --- ci/phpunit/inc/utils/AccessUtilsTest.php | 550 +++++++++++++++++++++++ src/inc/utils/AccessUtils.php | 21 +- 2 files changed, 561 insertions(+), 10 deletions(-) create mode 100644 ci/phpunit/inc/utils/AccessUtilsTest.php diff --git a/ci/phpunit/inc/utils/AccessUtilsTest.php b/ci/phpunit/inc/utils/AccessUtilsTest.php new file mode 100644 index 000000000..4f3c69c33 --- /dev/null +++ b/ci/phpunit/inc/utils/AccessUtilsTest.php @@ -0,0 +1,550 @@ +createAccessGroup('hashlist_access_group'); + $user = $this->createUser('hashlist_access_user'); + $hashType = $this->createHashType(); + $firstHashlist = $this->createHashlist($group, $hashType); + $secondHashlist = $this->createHashlist($group, $hashType); + + $this->createDatabaseObject( + Factory::getAccessGroupUserFactory(), + new AccessGroupUser(null, $group->getId(), $user->getId()) + ); + + $this->assertTrue(AccessUtils::userCanAccessHashlists([$firstHashlist, $secondHashlist], $user)); + } + + public function testUserCanAccessSingleHashlistsWhenSharesHashlistAccessGroups(): void { + $group = $this->createAccessGroup('hashlist_access_group'); + $user = $this->createUser('hashlist_access_user'); + $hashType = $this->createHashType(); + $firstHashlist = $this->createHashlist($group, $hashType); + + $this->createDatabaseObject( + Factory::getAccessGroupUserFactory(), + new AccessGroupUser(null, $group->getId(), $user->getId()) + ); + + $this->assertTrue(AccessUtils::userCanAccessHashlists($firstHashlist, $user)); + } + + public function testUserCanAccessTheEmptyHashlist(): void { + $user = $this->createUser('hashlist_access_user'); + $this->assertTrue(AccessUtils::userCanAccessHashlists([], $user)); + } + + /* + TODO: Passing null in an array will dereference it and throw an error. + One can fix that by filtering the array before checking, or maybe throw an Illegal arg exception. + public function testUserCanAccessHashlistsThrowsWhenArrayContainsNull(): void { + $user = $this->createUser('hashlist_access_user'); + + //$this->expectException(\Error::class); + + AccessUtils::userCanAccessHashlists([null], $user); + } + */ + + public function testGetPermissionArrayConvertedReturnsAllPermissionsAsTrueForAdmin(): void { + $permissions = AccessUtils::getPermissionArrayConverted('ALL'); + $expectedPermissions = array_unique(array_merge(...array_values(AbstractBaseAPI::$acl_mapping))); + + sort($expectedPermissions); + + $this->assertSame($expectedPermissions, array_keys($permissions)); + $this->assertNotEmpty($permissions); + foreach ($permissions as $permission => $isAllowed) { + $this->assertIsString($permission); + $this->assertTrue($isAllowed); + } + } + + /* + Sampled some cases to verify the actual mapping function, not that every permission is mapped correctly + */ + public function testGetPermissionArrayConvertedForUserPermissions(): void { + $cases = [ + 'view hashlists' => [ + 'legacyPermission' => DAccessControl::VIEW_HASHLIST_ACCESS[0], + 'expectedTrue' => [Hashlist::PERM_READ], + 'expectedFalse' => [Hashlist::PERM_CREATE, Hashlist::PERM_UPDATE, Hashlist::PERM_DELETE], + ], + 'create hashlists' => [ + 'legacyPermission' => DAccessControl::CREATE_HASHLIST_ACCESS, + 'expectedTrue' => [Hashlist::PERM_CREATE, Hash::PERM_CREATE], + 'expectedFalse' => [Hashlist::PERM_READ, Hash::PERM_READ], + ], + 'manage files' => [ + 'legacyPermission' => DAccessControl::MANAGE_FILE_ACCESS, + 'expectedTrue' => [File::PERM_READ, File::PERM_UPDATE, File::PERM_DELETE], + 'expectedFalse' => [File::PERM_CREATE], + ], + 'public access' => [ + 'legacyPermission' => DAccessControl::PUBLIC_ACCESS, + 'expectedTrue' => [LogEntry::PERM_READ], + 'expectedFalse' => [LogEntry::PERM_CREATE, LogEntry::PERM_UPDATE, LogEntry::PERM_DELETE], + ], + ]; + + foreach ($cases as $label => $case) { + $permissions = AccessUtils::getPermissionArrayConverted(json_encode([$case['legacyPermission'] => true])); + + foreach ($case['expectedTrue'] as $crudPermission) { + $this->assertArrayHasKey($crudPermission, $permissions, $label); + $this->assertTrue($permissions[$crudPermission], sprintf('%s should enable %s.', $label, $crudPermission)); + } + + foreach ($case['expectedFalse'] as $crudPermission) { + $this->assertArrayHasKey($crudPermission, $permissions, $label); + $this->assertFalse($permissions[$crudPermission], sprintf('%s should not enable %s.', $label, $crudPermission)); + } + } + } + + public function testUserCannotAccessManyHashlistsWhenOneHashlistIsInDifferentAccessGroup(): void { + $allowedGroup = $this->createAccessGroup('hashlist_access_group_allowed'); + $deniedGroup = $this->createAccessGroup('hashlist_access_group_denied'); + $user = $this->createUser('hashlist_access_user'); + $hashType = $this->createHashType(); + $allowedHashlist = $this->createHashlist($allowedGroup, $hashType); + $deniedHashlist = $this->createHashlist($deniedGroup, $hashType); + + $this->createDatabaseObject( + Factory::getAccessGroupUserFactory(), + new AccessGroupUser(null, $allowedGroup->getId(), $user->getId()) + ); + + $this->assertFalse(AccessUtils::userCanAccessHashlists([$allowedHashlist, $deniedHashlist], $user)); + } + + public function testUserCanAccessAgentWhenTheyShareAnAccessGroup(): void { + $group = $this->createAccessGroup('agent_access_group'); + $user = $this->createUser('agent_access_user'); + $agent = $this->createAgent('shared_access_agent'); + + $this->createDatabaseObject( + Factory::getAccessGroupUserFactory(), + new AccessGroupUser(null, $group->getId(), $user->getId()) + ); + + $this->createDatabaseObject( + Factory::getAccessGroupAgentFactory(), + new AccessGroupAgent(null, $group->getId(), $agent->getId()) + ); + + $this->assertTrue(AccessUtils::userCanAccessAgent($agent, $user)); + } + + public function testUserCannotAccessAgentWhenTheyDoNotShareAnAccessGroup(): void { + $userGroup = $this->createAccessGroup('user_access_group'); + $agentGroup = $this->createAccessGroup('agent_access_group'); + $user = $this->createUser('agent_access_user'); + $agent = $this->createAgent('isolated_access_agent'); + + $this->createDatabaseObject( + Factory::getAccessGroupUserFactory(), + new AccessGroupUser(null, $userGroup->getId(), $user->getId()) + ); + + $this->createDatabaseObject( + Factory::getAccessGroupAgentFactory(), + new AccessGroupAgent(null, $agentGroup->getId(), $agent->getId()) + ); + + $this->assertFalse(AccessUtils::userCanAccessAgent($agent, $user)); + } + + public function testUserCanAccessTaskWhenTheyShareAnAccessGroup(): void { + $group = $this->createAccessGroup('task_access_group'); + $user = $this->createUser('task_access_user'); + $hashType = $this->createHashType(); + $hashlist = $this->createHashlist($group, $hashType); + $taskWrapper = $this->createTaskWrapper($group, $hashlist); + + $this->createDatabaseObject( + Factory::getAccessGroupUserFactory(), + new AccessGroupUser(null, $group->getId(), $user->getId()) + ); + + $this->assertTrue(AccessUtils::userCanAccessTask($taskWrapper, $user)); + } + + public function testUserCannotAccessTaskWhenTheyDoNotShareAnAccessGroup(): void { + $userGroup = $this->createAccessGroup('user_task_access_group'); + $taskGroup = $this->createAccessGroup('wrapper_access_group'); + $user = $this->createUser('task_access_user'); + $hashType = $this->createHashType(); + $hashlist = $this->createHashlist($taskGroup, $hashType); + $taskWrapper = $this->createTaskWrapper($taskGroup, $hashlist); + + $this->createDatabaseObject( + Factory::getAccessGroupUserFactory(), + new AccessGroupUser(null, $userGroup->getId(), $user->getId()) + ); + + $this->assertFalse(AccessUtils::userCanAccessTask($taskWrapper, $user)); + } + + public function testUserCanAccessFileWhenTheyShareAnAccessGroup(): void { + $group = $this->createAccessGroup('file_access_group'); + $user = $this->createUser('file_access_user'); + $file = $this->createFile($group); + + $this->createDatabaseObject( + Factory::getAccessGroupUserFactory(), + new AccessGroupUser(null, $group->getId(), $user->getId()) + ); + + $this->assertTrue(AccessUtils::userCanAccessFile($file, $user)); + } + + public function testUserCannotAccessFileWhenTheyDoNotShareAnAccessGroup(): void { + $userGroup = $this->createAccessGroup('user_file_access_group'); + $fileGroup = $this->createAccessGroup('file_access_group'); + $user = $this->createUser('file_access_user'); + $file = $this->createFile($fileGroup); + + $this->createDatabaseObject( + Factory::getAccessGroupUserFactory(), + new AccessGroupUser(null, $userGroup->getId(), $user->getId()) + ); + + $this->assertFalse(AccessUtils::userCanAccessFile($file, $user)); + } + + public function testIntersectionReturnsSharedAccessGroups(): void { + $firstOnlyGroup = $this->createAccessGroup('first_only_group'); + $sharedGroup = $this->createAccessGroup('shared_group'); + $secondOnlyGroup = $this->createAccessGroup('second_only_group'); + + $intersection = AccessUtils::intersection( + [$firstOnlyGroup, $sharedGroup], + [$sharedGroup, $secondOnlyGroup] + ); + + $this->assertSame([$sharedGroup], $intersection); + } + + public function testIntersectionReturnsEmptyArrayWhenOneSideIsEmpty(): void { + $group = $this->createAccessGroup('non_empty_group'); + + $this->assertSame([], AccessUtils::intersection([], [$group])); + $this->assertSame([], AccessUtils::intersection([$group], [])); + } + + public function testGetAccessGroupsOfUserReturnsAssignedGroups(): void { + $firstGroup = $this->createAccessGroup('user_group_one'); + $secondGroup = $this->createAccessGroup('user_group_two'); + $user = $this->createUser('grouped_user'); + $defaultGroup = AccessUtils::getOrCreateDefaultAccessGroup(); + + $this->createDatabaseObject( + Factory::getAccessGroupUserFactory(), + new AccessGroupUser(null, $firstGroup->getId(), $user->getId()) + ); + $this->createDatabaseObject( + Factory::getAccessGroupUserFactory(), + new AccessGroupUser(null, $secondGroup->getId(), $user->getId()) + ); + + $groups = AccessUtils::getAccessGroupsOfUser($user); + + $this->assertEqualsCanonicalizing( + [$defaultGroup->getId(), $firstGroup->getId(), $secondGroup->getId()], + array_map(static fn (AccessGroup $group): ?int => $group->getId(), $groups) + ); + } + + public function testGetAccessGroupsOfUserReturnsDefaultGroupWhenUserHasNoAdditionalAssignments(): void { + $user = $this->createUser('ungrouped_user'); + $defaultGroup = AccessUtils::getOrCreateDefaultAccessGroup(); + $groups = AccessUtils::getAccessGroupsOfUser($user); + + $this->assertEqualsCanonicalizing( + [$defaultGroup->getId()], + array_map(static fn (AccessGroup $group): ?int => $group->getId(), $groups) + ); + } + + public function testGetAccessGroupsOfAgentReturnsAssignedGroups(): void { + $firstGroup = $this->createAccessGroup('agent_group_one'); + $secondGroup = $this->createAccessGroup('agent_group_two'); + $agent = $this->createAgent('grouped_agent'); + + $this->createDatabaseObject( + Factory::getAccessGroupAgentFactory(), + new AccessGroupAgent(null, $firstGroup->getId(), $agent->getId()) + ); + $this->createDatabaseObject( + Factory::getAccessGroupAgentFactory(), + new AccessGroupAgent(null, $secondGroup->getId(), $agent->getId()) + ); + + $groups = AccessUtils::getAccessGroupsOfAgent($agent); + + $this->assertEqualsCanonicalizing( + [$firstGroup->getId(), $secondGroup->getId()], + array_map(static fn (AccessGroup $group): ?int => $group->getId(), $groups) + ); + } + + public function testGetAccessGroupsOfAgentReturnsEmptyArrayWhenAgentHasNoAssignments(): void { + $agent = $this->createAgent('ungrouped_agent'); + $this->assertSame([], AccessUtils::getAccessGroupsOfAgent($agent)); + } + + public function testGetOrCreateDefaultAccessGroupReturnsExistingDefaultGroup(): void { + $defaultGroup = AccessUtils::getOrCreateDefaultAccessGroup(); + + $this->assertInstanceOf(AccessGroup::class, $defaultGroup); + $this->assertSame(1, $defaultGroup->getId()); + $this->assertNotNull(Factory::getAccessGroupFactory()->get(1)); + } + + public function testAgentCannotAccessTaskWhenItCannotAccessTaskWrapper(): void { + $agentGroup = $this->createAccessGroup('agent_task_group'); + $taskGroup = $this->createAccessGroup('task_wrapper_group'); + $agent = $this->createAgent('restricted_agent'); + $hashType = $this->createHashType(); + $hashlist = $this->createHashlist($taskGroup, $hashType); + $taskWrapper = $this->createTaskWrapper($taskGroup, $hashlist); + $crackerBinaryType = $this->createCrackerBinaryType(); + $crackerBinary = $this->createCrackerBinary($crackerBinaryType); + $task = $this->createTask($taskWrapper, $crackerBinary, $crackerBinaryType); + + $this->createDatabaseObject( + Factory::getAccessGroupAgentFactory(), + new AccessGroupAgent(null, $agentGroup->getId(), $agent->getId()) + ); + + $this->assertFalse(AccessUtils::agentCanAccessTask($agent, $task)); + } + + public function testAgentCannotAccessTaskWhenHashlistIsSecretAndAgentIsNotTrusted(): void { + $group = $this->createAccessGroup('secret_hashlist_group'); + $agent = $this->createAgent('untrusted_agent', 0); + $hashType = $this->createHashType(); + $hashlist = $this->createHashlist($group, $hashType, 1); + $taskWrapper = $this->createTaskWrapper($group, $hashlist); + $crackerBinaryType = $this->createCrackerBinaryType(); + $crackerBinary = $this->createCrackerBinary($crackerBinaryType); + $task = $this->createTask($taskWrapper, $crackerBinary, $crackerBinaryType); + + $this->createDatabaseObject( + Factory::getAccessGroupAgentFactory(), + new AccessGroupAgent(null, $group->getId(), $agent->getId()) + ); + + $this->assertFalse(AccessUtils::agentCanAccessTask($agent, $task)); + } + + public function testAgentCannotAccessTaskWhenHashlistIsInDifferentAccessGroup(): void { + $sharedTaskGroup = $this->createAccessGroup('shared_task_group'); + $otherHashlistGroup = $this->createAccessGroup('other_hashlist_group'); + $agent = $this->createAgent('untrusted_but_allowed_agent', 0); + $hashType = $this->createHashType(); + $hashlist = $this->createHashlist($otherHashlistGroup, $hashType); + $taskWrapper = $this->createTaskWrapper($sharedTaskGroup, $hashlist); + $crackerBinaryType = $this->createCrackerBinaryType(); + $crackerBinary = $this->createCrackerBinary($crackerBinaryType); + $task = $this->createTask($taskWrapper, $crackerBinary, $crackerBinaryType); + + $this->createDatabaseObject( + Factory::getAccessGroupAgentFactory(), + new AccessGroupAgent(null, $sharedTaskGroup->getId(), $agent->getId()) + ); + + $this->assertFalse(AccessUtils::agentCanAccessTask($agent, $task)); + } + + public function testAgentCannotAccessTaskWhenFileIsSecretAndAgentIsNotTrusted(): void { + $group = $this->createAccessGroup('secret_file_group'); + $agent = $this->createAgent('untrusted_file_agent', 0); + $hashType = $this->createHashType(); + $hashlist = $this->createHashlist($group, $hashType); + $taskWrapper = $this->createTaskWrapper($group, $hashlist); + $crackerBinaryType = $this->createCrackerBinaryType(); + $crackerBinary = $this->createCrackerBinary($crackerBinaryType); + $task = $this->createTask($taskWrapper, $crackerBinary, $crackerBinaryType); + $file = $this->createFile($group, 1); + + $this->createDatabaseObject( + Factory::getAccessGroupAgentFactory(), + new AccessGroupAgent(null, $group->getId(), $agent->getId()) + ); + $this->createFileTask($file, $task); + + $this->assertFalse(AccessUtils::agentCanAccessTask($agent, $task)); + } + + public function testAgentCanAccessTaskWhenWrapperHashlistAndFilesAreAllowed(): void { + $group = $this->createAccessGroup('allowed_task_group'); + $agent = $this->createAgent('allowed_agent', 0); + $hashType = $this->createHashType(); + $hashlist = $this->createHashlist($group, $hashType); + $taskWrapper = $this->createTaskWrapper($group, $hashlist); + $crackerBinaryType = $this->createCrackerBinaryType(); + $crackerBinary = $this->createCrackerBinary($crackerBinaryType); + $task = $this->createTask($taskWrapper, $crackerBinary, $crackerBinaryType); + $file = $this->createFile($group); + + $this->createDatabaseObject( + Factory::getAccessGroupAgentFactory(), + new AccessGroupAgent(null, $group->getId(), $agent->getId()) + ); + $this->createFileTask($file, $task); + + $this->assertTrue(AccessUtils::agentCanAccessTask($agent, $task)); + } + + /* + * Local test helpers + */ + //TODO: Should we try refactor common methods to base? + private function createAccessGroup(string $prefix): AccessGroup { + $group = $this->createDatabaseObject( + Factory::getAccessGroupFactory(), + new AccessGroup(null, $prefix . '_' . uniqid()) + ); + $this->assertTrue($group instanceof AccessGroup); + return $group; + } + + private function createRightGroup(): RightGroup { + $group = $this->createDatabaseObject( + Factory::getRightGroupFactory(), + new RightGroup(null, 'phpunit-' . uniqid('', true), '[]') + ); + $this->assertTrue($group instanceof RightGroup); + return $group; + } + + private function createUser(string $prefix): User { + $username = $prefix . '_' . uniqid(); + $user = UserUtils::createUser($username, $username . '@example.com', $this->createRightGroup()->getId(), $this->adminUser); + $this->registerDatabaseObject(Factory::getUserFactory(), $user); + return $user; + } + + private function createHashType(): HashType { + $hashType = $this->createDatabaseObject( + Factory::getHashTypeFactory(), + new HashType(null, 'hash_type_' . uniqid(), 0, 0) + ); + $this->assertTrue($hashType instanceof HashType); + return $hashType; + } + + private function createHashlist(AccessGroup $group, HashType $hashType, int $isSecret = 0): Hashlist { + $hashlist = $this->createDatabaseObject( + Factory::getHashlistFactory(), + new Hashlist(null, 'hashlist_' . uniqid(), DHashlistFormat::PLAIN, $hashType->getId(), 1, ':', 0, $isSecret, 0, 0, $group->getId(), '', 0, 0, 0) + ); + $this->assertTrue($hashlist instanceof Hashlist); + return $hashlist; + } + + private function createTaskWrapper(AccessGroup $group, Hashlist $hashlist): TaskWrapper { + $taskWrapper = $this->createDatabaseObject( + Factory::getTaskWrapperFactory(), + new TaskWrapper(null, 1, 1, 0, $hashlist->getId(), $group->getId(), 'wrapper_' . uniqid(), 0, 0) + ); + $this->assertTrue($taskWrapper instanceof TaskWrapper); + return $taskWrapper; + } + + private function createCrackerBinaryType(): CrackerBinaryType { + $crackerBinaryType = $this->createDatabaseObject( + Factory::getCrackerBinaryTypeFactory(), + new CrackerBinaryType(null, 'type_' . uniqid(), 1) + ); + $this->assertTrue($crackerBinaryType instanceof CrackerBinaryType); + return $crackerBinaryType; + } + + private function createCrackerBinary(CrackerBinaryType $crackerBinaryType): CrackerBinary { + $crackerBinary = $this->createDatabaseObject( + Factory::getCrackerBinaryFactory(), + new CrackerBinary(null, $crackerBinaryType->getId(), '1.0.' . uniqid(), 'https://example.invalid/' . uniqid(), 'binary_' . uniqid()) + ); + $this->assertTrue($crackerBinary instanceof CrackerBinary); + return $crackerBinary; + } + + private function createTask(TaskWrapper $taskWrapper, CrackerBinary $crackerBinary, CrackerBinaryType $crackerBinaryType): Task { + $task = $this->createDatabaseObject( + Factory::getTaskFactory(), + new Task(null, 'task_' . uniqid(), '--attack-mode 0', 60, 30, 0, 0, 1, 1, '#ffffff', 0, 0, 0, 0, $crackerBinary->getId(), $crackerBinaryType->getId(), $taskWrapper->getId(), 0, '', 0, 0, 0, 0, '') + ); + $this->assertTrue($task instanceof Task); + return $task; + } + + private function createFile(AccessGroup $group, int $isSecret = 0): File { + $file = $this->createDatabaseObject( + Factory::getFileFactory(), + new File(null, 'file_' . uniqid(), 0, $isSecret, 0, $group->getId(), 0) + ); + $this->assertTrue($file instanceof File); + return $file; + } + + private function createFileTask(File $file, Task $task): FileTask { + $fileTask = $this->createDatabaseObject( + Factory::getFileTaskFactory(), + new FileTask(null, $file->getId(), $task->getId()) + ); + $this->assertTrue($fileTask instanceof FileTask); + return $fileTask; + } + + private function createAgent(string $prefix, int $isTrusted = 1): Agent { + $suffix = uniqid(); + $agent = $this->createDatabaseObject( + Factory::getAgentFactory(), + new Agent(null, $prefix . '_' . $suffix, 'uid_' . $suffix, 0, '[]', '', 0, 1, $isTrusted, 'token_' . $suffix, 'idle', time(), '127.0.0.1', null, 0, 'sig_' . $suffix) + ); + $this->assertTrue($agent instanceof Agent); + return $agent; + } +} \ No newline at end of file diff --git a/src/inc/utils/AccessUtils.php b/src/inc/utils/AccessUtils.php index 144db3954..81929d40a 100644 --- a/src/inc/utils/AccessUtils.php +++ b/src/inc/utils/AccessUtils.php @@ -2,18 +2,19 @@ namespace Hashtopolis\inc\utils; +use Hashtopolis\dba\AbstractModel; use Hashtopolis\dba\models\AccessGroup; use Hashtopolis\dba\models\AccessGroupAgent; use Hashtopolis\dba\models\AccessGroupUser; use Hashtopolis\dba\models\Agent; use Hashtopolis\dba\JoinFilter; use Hashtopolis\dba\QueryFilter; -use Hashtopolis\dba\models\Task; use Hashtopolis\dba\models\User; use Hashtopolis\dba\models\TaskWrapper; use Hashtopolis\dba\models\Hashlist; use Hashtopolis\dba\Factory; use Hashtopolis\dba\models\File; +use Hashtopolis\dba\models\Task; use Hashtopolis\inc\apiv2\common\AbstractBaseAPI; use Hashtopolis\inc\Util; @@ -23,7 +24,7 @@ class AccessUtils { * @param User $user * @return boolean */ - public static function userCanAccessHashlists($hashlists, $user) { + public static function userCanAccessHashlists(Hashlist|array $hashlists, User $user): bool { if (!is_array($hashlists)) { $hashlists = array($hashlists); } @@ -41,7 +42,7 @@ public static function userCanAccessHashlists($hashlists, $user) { * @param $val string permission as they are stored in the legacy way in the DB in the RightGroup table * @return array */ - public static function getPermissionArrayConverted($val) { + public static function getPermissionArrayConverted(string $val): array { $all_perms = array_unique(array_merge(...array_values(AbstractBaseAPI::$acl_mapping))); if ($val == 'ALL') { @@ -73,7 +74,7 @@ public static function getPermissionArrayConverted($val) { * @param $user User * @return bool true if user has access to agent */ - public static function userCanAccessAgent($agent, $user) { + public static function userCanAccessAgent(Agent $agent, User $user): bool { $qF = new QueryFilter(AccessGroupAgent::AGENT_ID, $agent->getId(), "=", Factory::getAccessGroupAgentFactory()); $jF = new JoinFilter(Factory::getAccessGroupAgentFactory(), AccessGroup::ACCESS_GROUP_ID, AccessGroupAgent::ACCESS_GROUP_ID); $joined = Factory::getAccessGroupFactory()->filter([Factory::FILTER => $qF, Factory::JOIN => $jF]); @@ -94,7 +95,7 @@ public static function userCanAccessAgent($agent, $user) { * @param User $user * @return boolean */ - public static function userCanAccessTask($taskWrapper, $user) { + public static function userCanAccessTask(TaskWrapper $taskWrapper, User $user): bool { $accessGroupIds = Util::getAccessGroupIds($user->getId()); if (!in_array($taskWrapper->getAccessGroupId(), $accessGroupIds)) { return false; @@ -107,7 +108,7 @@ public static function userCanAccessTask($taskWrapper, $user) { * @param User $user * @return boolean */ - public static function userCanAccessFile($file, $user) { + public static function userCanAccessFile(File $file, User $user): bool { $accessGroupIds = Util::getAccessGroupIds($user->getId()); if (!in_array($file->getAccessGroupId(), $accessGroupIds)) { return false; @@ -120,7 +121,7 @@ public static function userCanAccessFile($file, $user) { * @param $accessGroupsUser AccessGroup[] * @return AccessGroup[] */ - public static function intersection($accessGroupsAgent, $accessGroupsUser) { + public static function intersection(array $accessGroupsAgent, array $accessGroupsUser): array { if (sizeof($accessGroupsUser) == 0 || sizeof($accessGroupsAgent) == 0) { return array(); } @@ -140,7 +141,7 @@ public static function intersection($accessGroupsAgent, $accessGroupsUser) { * @param $user User * @return AccessGroup[] */ - public static function getAccessGroupsOfUser($user) { + public static function getAccessGroupsOfUser(User $user): array { $qF = new QueryFilter(AccessGroupUser::USER_ID, $user->getId(), "=", Factory::getAccessGroupUserFactory()); $jF = new JoinFilter(Factory::getAccessGroupUserFactory(), AccessGroup::ACCESS_GROUP_ID, AccessGroupUser::ACCESS_GROUP_ID); $joined = Factory::getAccessGroupFactory()->filter([Factory::FILTER => $qF, Factory::JOIN => $jF]); @@ -165,7 +166,7 @@ public static function getAccessGroupsOfAgent(Agent $agent): array { * * @return AccessGroup */ - public static function getOrCreateDefaultAccessGroup() { + public static function getOrCreateDefaultAccessGroup(): AccessGroup { $accessGroup = Factory::getAccessGroupFactory()->get(1); if ($accessGroup == null) { // this should never happen anymore (unless someone deleted access group with ID 1) @@ -180,7 +181,7 @@ public static function getOrCreateDefaultAccessGroup() { * @param $task Task * @return bool true if agent is allowed to access task */ - public static function agentCanAccessTask($agent, $task) { + public static function agentCanAccessTask(Agent $agent, Task $task): bool { // load access groups of agent $accessGroups = AccessUtils::getAccessGroupsOfAgent($agent); $accessGroupsIds = Util::arrayOfIds($accessGroups); From 85331bc5a3b98682171e61b97fbf4159973dfd77 Mon Sep 17 00:00:00 2001 From: coiseiw Date: Fri, 22 May 2026 11:27:39 +0200 Subject: [PATCH 587/691] Adressing issue #1928 --- doc/user_manual/tasks.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/doc/user_manual/tasks.md b/doc/user_manual/tasks.md index a71859728..057a6153d 100644 --- a/doc/user_manual/tasks.md +++ b/doc/user_manual/tasks.md @@ -26,7 +26,7 @@ To create a new task, click on the button "+ New Task" on the *Tasks > Show Task These additional task configuration options allow greater control over execution and resource usage. -8. **Chunk size**: Defines the expected processing time for each chunkℹ️ of this task. Default value is set in [Settings](./settings_and_configuration.md#benchmark-chunk). +8. **Chunk time**: Defines the expected processing time for each chunkℹ️ of this task. Default value is set in [Settings](./settings_and_configuration.md#benchmark-chunk). 9. **Status timer**: How often agents report task progress to the server. Default value is set in [Settings](./settings_and_configuration.md#activity-registration). From 8f8dccae81651f48d5b8d1193cef8d2d502f83df Mon Sep 17 00:00:00 2001 From: andreas Date: Fri, 22 May 2026 13:19:03 +0200 Subject: [PATCH 588/691] 2120 Added tests and parameter types for AccountUtils --- ci/phpunit/inc/utils/AccountUtilsTest.php | 310 ++++++++++++++++++++++ src/inc/utils/AccountUtils.php | 10 +- 2 files changed, 315 insertions(+), 5 deletions(-) create mode 100644 ci/phpunit/inc/utils/AccountUtilsTest.php diff --git a/ci/phpunit/inc/utils/AccountUtilsTest.php b/ci/phpunit/inc/utils/AccountUtilsTest.php new file mode 100644 index 000000000..fc658a44d --- /dev/null +++ b/ci/phpunit/inc/utils/AccountUtilsTest.php @@ -0,0 +1,310 @@ +createUser('invalid_yubikey_user'); + $user->setYubikey(1); + $user->setOtp1('short'); + $user->setOtp2(''); + $user->setOtp3('12345678901'); + $user->setOtp4('1234567890123'); + + AccountUtils::checkOTP($user); + + $reloadedUser = Factory::getUserFactory()->filter([ + Factory::FILTER => new QueryFilter(User::USERNAME, $user->getUsername(), '=') + ], true); + + $this->assertInstanceOf(User::class, $reloadedUser); + $this->assertSame('0', $reloadedUser->getYubikey()); + $this->assertSame('short', $reloadedUser->getOtp1()); + $this->assertSame('', $reloadedUser->getOtp2()); + $this->assertSame('12345678901', $reloadedUser->getOtp3()); + $this->assertSame('1234567890123', $reloadedUser->getOtp4()); + } + + public function testCheckOTPKeepsYubikeyEnabledWhenOtp1HasAValidPrefix(): void { + $this->assertCheckOTPKeepsYubikeyEnabledForValidSlot(1); + } + + public function testCheckOTPKeepsYubikeyEnabledWhenOtp2HasAValidPrefix(): void { + $this->assertCheckOTPKeepsYubikeyEnabledForValidSlot(2); + } + + public function testCheckOTPKeepsYubikeyEnabledWhenOtp3HasAValidPrefix(): void { + $this->assertCheckOTPKeepsYubikeyEnabledForValidSlot(3); + } + + public function testCheckOTPKeepsYubikeyEnabledWhenOtp4HasAValidPrefix(): void { + $this->assertCheckOTPKeepsYubikeyEnabledForValidSlot(4); + } + + public function testSetOTPThrowsWhenEnablingWithoutAValidConfiguredKey(): void { + $user = $this->createUser('setotp_invalid_enable_user'); + $user->setOtp1('short'); + $user->setOtp2(''); + $user->setOtp3('12345678901'); + $user->setOtp4('1234567890123'); + + try { + AccountUtils::setOTP(0, DAccountAction::YUBIKEY_ENABLE, $user, ['', '', '', '']); + $this->fail('Expected setOTP to reject enabling Yubikey without a valid configured key.'); + } + catch (HTException $exception) { + $this->assertSame('Configure OTP KEY first!', $exception->getMessage()); + } + + $this->assertPersistedOtpState($user, '0', '', '', '', ''); + } + + public function testSetOTPDisableResetsYubikeyToZero(): void { + $user = $this->createUser('setotp_disable_user'); + $user->setYubikey(1); + $user->setOtp1('validyubikey'); + $user->setOtp2('backupyubico'); + $user->setOtp3('reservekey12'); + $user->setOtp4('lastresort12'); + + AccountUtils::setOTP(-1, DAccountAction::YUBIKEY_DISABLE, $user, ['', '', '', '']); + + $this->assertPersistedOtpState($user, '0', 'validyubikey', 'backupyubico', 'reservekey12', 'lastresort12'); + } + + public function testSetOTPYubikeyActivationWithoutValidKeysDisabledAfterCheckOTP(): void { + $user = $this->createUser('setotp_activate_without_valid_keys_user'); + $user->setYubikey(0); + $user->setOtp1('short'); + $user->setOtp2(''); + $user->setOtp3('12345678901'); + $user->setOtp4('1234567890123'); + + AccountUtils::setOTP(0, DAccountAction::SET_OTP1, $user, ['', '', '', '']); + + $this->assertPersistedOtpState($user, '0', 'short', '', '12345678901', '1234567890123'); + } + + public function testSetOTPStoresValidPrefixThenActivatesYubikey(): void { + foreach ([1, 2, 3, 4] as $slot) { + $this->assertSetOTPStoresValidPrefixThenActivatesYubikeyForSlot($slot); + } + } + + public function testSetEmailThrowsOnInvalidEmailFormat(): void { + $user = $this->createUser('invalid_email_user'); + $this->expectException(HTException::class); + AccountUtils::setEmail('invalid-email-address', $user); + } + + public function testSetEmailUpdatesEmailOnValidAddress(): void { + $user = $this->createUser('valid_email_user'); + $newEmail = 'updated_' . uniqid() . '@example.com'; + + AccountUtils::setEmail($newEmail, $user); + + $reloadedUser = Factory::getUserFactory()->filter([ + Factory::FILTER => new QueryFilter(User::USERNAME, $user->getUsername(), '=') + ], true); + + $this->assertInstanceOf(User::class, $reloadedUser); + $this->assertSame($newEmail, $reloadedUser->getEmail()); + } + + public function testUpdateSessionLifetimeThrowsWhenBelowMinimum(): void { + $user = $this->createUser('invalid_lifetime_user'); + $this->expectException(HTException::class); + + AccountUtils::updateSessionLifetime(59, $user); + } + + public function testUpdateSessionLifetimeUpdatesPersistedValue(): void { + $user = $this->createUser('valid_lifetime_user'); + $newLifetime = 60; + + AccountUtils::updateSessionLifetime($newLifetime, $user); + + $reloadedUser = Factory::getUserFactory()->filter([ + Factory::FILTER => new QueryFilter(User::USERNAME, $user->getUsername(), '=') + ], true); + + $this->assertInstanceOf(User::class, $reloadedUser); + $this->assertSame($newLifetime, $reloadedUser->getSessionLifetime()); + } + + public function testChangePasswordThrowsWhenOldPasswordIsWrong(): void { + $user = $this->createUserWithPassword('wrong_old_password_user', 'oldpass'); + $this->expectException(HTException::class); + $this->expectExceptionMessage('Your old password is wrong!'); + + AccountUtils::changePassword('wrongpass', 'newpass', 'newpass', $user); + } + + public function testChangePasswordThrowsWhenNewPasswordIsTooShort(): void { + $user = $this->createUserWithPassword('short_new_password_user', 'oldpass'); + $this->expectException(HTException::class); + $this->expectExceptionMessage('Your password is too short!'); + + AccountUtils::changePassword('oldpass', 'abc', 'abc', $user); + } + + public function testChangePasswordThrowsWhenNewPasswordsDoNotMatch(): void { + $user = $this->createUserWithPassword('mismatch_password_user', 'oldpass'); + $this->expectException(HTException::class); + $this->expectExceptionMessage('Your new passwords do not match!'); + + AccountUtils::changePassword('oldpass', 'newpass', 'otherpass', $user); + } + + public function testChangePasswordThrowsWhenNewPasswordMatchesOldPassword(): void { + $user = $this->createUserWithPassword('same_password_user', 'oldpass'); + $this->expectException(HTException::class); + $this->expectExceptionMessage('Your new password is the same as the old one!'); + + AccountUtils::changePassword('oldpass', 'oldpass', 'oldpass', $user); + } + + public function testChangePasswordUpdatesPersistedPasswordData(): void { + $user = $this->createUserWithPassword('happy_password_user', 'oldpass'); + $oldSalt = $user->getPasswordSalt(); + $oldHash = $user->getPasswordHash(); + + AccountUtils::changePassword('oldpass', 'newpass', 'newpass', $user); + + $reloadedUser = $this->reloadUser($user); + + $this->assertNotSame($oldSalt, $reloadedUser->getPasswordSalt()); + $this->assertNotSame($oldHash, $reloadedUser->getPasswordHash()); + $this->assertFalse(Encryption::passwordVerify('oldpass', $reloadedUser->getPasswordSalt(), $reloadedUser->getPasswordHash())); + $this->assertTrue(Encryption::passwordVerify('newpass', $reloadedUser->getPasswordSalt(), $reloadedUser->getPasswordHash())); + $this->assertSame(0, $reloadedUser->getIsComputedPassword()); + } + + + + + + + private function assertCheckOTPKeepsYubikeyEnabledForValidSlot(int $validSlot): void { + $user = $this->createUser('valid_yubikey_user_' . $validSlot); + $user->setYubikey(1); + + $otpValues = [ + 1 => '', + 2 => '', + 3 => '', + 4 => '', + ]; + $otpValues[$validSlot] = 'validyubikey'; + + $user->setOtp1($otpValues[1]); + $user->setOtp2($otpValues[2]); + $user->setOtp3($otpValues[3]); + $user->setOtp4($otpValues[4]); + + AccountUtils::checkOTP($user); + + $reloadedUser = Factory::getUserFactory()->filter([ + Factory::FILTER => new QueryFilter(User::USERNAME, $user->getUsername(), '=') + ], true); + + $this->assertInstanceOf(User::class, $reloadedUser); + $this->assertSame('1', $reloadedUser->getYubikey()); + $this->assertSame($otpValues[1], $reloadedUser->getOtp1()); + $this->assertSame($otpValues[2], $reloadedUser->getOtp2()); + $this->assertSame($otpValues[3], $reloadedUser->getOtp3()); + $this->assertSame($otpValues[4], $reloadedUser->getOtp4()); + } + + private function assertPersistedOtpState(User $user, string $expectedYubikey, string $expectedOtp1, string $expectedOtp2, string $expectedOtp3, string $expectedOtp4): void { + $reloadedUser = Factory::getUserFactory()->filter([ + Factory::FILTER => new QueryFilter(User::USERNAME, $user->getUsername(), '=') + ], true); + + $this->assertInstanceOf(User::class, $reloadedUser); + $this->assertSame($expectedYubikey, $reloadedUser->getYubikey()); + $this->assertSame($expectedOtp1, $reloadedUser->getOtp1()); + $this->assertSame($expectedOtp2, $reloadedUser->getOtp2()); + $this->assertSame($expectedOtp3, $reloadedUser->getOtp3()); + $this->assertSame($expectedOtp4, $reloadedUser->getOtp4()); + } + + private function assertSetOTPStoresValidPrefixThenActivatesYubikeyForSlot(int $slot): void { + $user = $this->createUser('setotp_happy_path_user_' . $slot); + $fullOtp = 'ccccccdefghdefghdefghdefghdefghdefghdefghi'; + $actions = [ + 1 => DAccountAction::SET_OTP1, + 2 => DAccountAction::SET_OTP2, + 3 => DAccountAction::SET_OTP3, + 4 => DAccountAction::SET_OTP4, + ]; + $expectedOtpValues = [ + 1 => '', + 2 => '', + 3 => '', + 4 => '', + ]; + $expectedOtpValues[$slot] = 'ccccccdefghd'; + + $otpArr = ['', '', '', '']; + $otpArr[$slot - 1] = $fullOtp; + + AccountUtils::setOTP($slot, $actions[$slot], $user, $otpArr); + $this->assertPersistedOtpState($user, '0', $expectedOtpValues[1], $expectedOtpValues[2], $expectedOtpValues[3], $expectedOtpValues[4]); + + AccountUtils::setOTP(0, DAccountAction::YUBIKEY_ENABLE, $user, ['', '', '', '']); + $this->assertPersistedOtpState($user, '1', $expectedOtpValues[1], $expectedOtpValues[2], $expectedOtpValues[3], $expectedOtpValues[4]); + } + + + + /* + Local test helpers + */ + private function createRightGroup(): RightGroup { + $group = $this->createDatabaseObject( + Factory::getRightGroupFactory(), + new RightGroup(null, 'phpunit-' . uniqid('', true), '[]') + ); + $this->assertTrue($group instanceof RightGroup); + return $group; + } + + private function createUser(string $prefix): User { + $username = $prefix . '_' . uniqid(); + $user = UserUtils::createUser($username, $username . '@example.com', $this->createRightGroup()->getId(), $this->adminUser); + $this->registerDatabaseObject(Factory::getUserFactory(), $user); + return $user; + } + + private function createUserWithPassword(string $prefix, string $password): User { + $user = $this->createUser($prefix); + UserUtils::setPassword($user->getId(), $password, $this->adminUser); + return $this->reloadUser($user); + } + + private function reloadUser(User $user): User { + $reloadedUser = Factory::getUserFactory()->filter([ + Factory::FILTER => new QueryFilter(User::USERNAME, $user->getUsername(), '=') + ], true); + + $this->assertInstanceOf(User::class, $reloadedUser); + return $reloadedUser; + } + + + +} \ No newline at end of file diff --git a/src/inc/utils/AccountUtils.php b/src/inc/utils/AccountUtils.php index a1dfc6055..6ddc8ac42 100644 --- a/src/inc/utils/AccountUtils.php +++ b/src/inc/utils/AccountUtils.php @@ -17,7 +17,7 @@ class AccountUtils { /** * @param User $user */ - public static function checkOTP($user) { + public static function checkOTP(User $user): void { $isValid = false; if (strlen($user->getOtp1()) == 12) { @@ -45,7 +45,7 @@ public static function checkOTP($user) { * @param $otpArr * @throws HTException */ - public static function setOTP($num, $action, $user, $otpArr) { + public static function setOTP(int $num, string $action, User $user, array $otpArr): void { if ($action == DAccountAction::YUBIKEY_ENABLE) { $isValid = false; @@ -104,7 +104,7 @@ public static function setOTP($num, $action, $user, $otpArr) { * @param User $user * @throws HTException */ - public static function setEmail($email, $user) { + public static function setEmail(string $email, User $user): void { if (!filter_var($email, FILTER_VALIDATE_EMAIL)) { throw new HTException("Invalid email address!"); } @@ -118,7 +118,7 @@ public static function setEmail($email, $user) { * @param User $user * @throws HTException */ - public static function updateSessionLifetime($lifetime, $user) { + public static function updateSessionLifetime(int $lifetime, User $user): void { $lifetime = intval($lifetime); if ($lifetime < 60 || $lifetime > SConfig::getInstance()->getVal(DConfig::MAX_SESSION_LENGTH) * 3600) { throw new HTException("Lifetime must be larger than 1 minute and smaller than " . SConfig::getInstance()->getVal(DConfig::MAX_SESSION_LENGTH) . " hours!"); @@ -134,7 +134,7 @@ public static function updateSessionLifetime($lifetime, $user) { * @param User $user * @throws HTException */ - public static function changePassword($oldPassword, $newPassword, $repeatedPassword, $user) { + public static function changePassword(string $oldPassword, string $newPassword, string $repeatedPassword, User $user): void { if (!Encryption::passwordVerify($oldPassword, $user->getPasswordSalt(), $user->getPasswordHash())) { throw new HTException("Your old password is wrong!"); } From 62985e5b144e0a53ba9d92ada7e4a42c1b66f57e Mon Sep 17 00:00:00 2001 From: s3inlc Date: Fri, 22 May 2026 13:37:31 +0200 Subject: [PATCH 589/691] added first aggregation tests and fixes --- ci/phpunit/dba/AggregationTest.php | 115 +++++++++++++++++++++++++++++ src/dba/AbstractModelFactory.php | 13 +++- src/dba/Aggregation.php | 14 +++- 3 files changed, 137 insertions(+), 5 deletions(-) create mode 100644 ci/phpunit/dba/AggregationTest.php diff --git a/ci/phpunit/dba/AggregationTest.php b/ci/phpunit/dba/AggregationTest.php new file mode 100644 index 000000000..b1b9f9aa6 --- /dev/null +++ b/ci/phpunit/dba/AggregationTest.php @@ -0,0 +1,115 @@ +createDatabaseObject(Factory::getHashTypeFactory(), new HashType(null, 'hashtype1' . $testid, 1, 0)); + $this->createDatabaseObject(Factory::getHashTypeFactory(), new HashType(null, 'hashtype2' . $testid, 125, 0)); + $this->createDatabaseObject(Factory::getHashTypeFactory(), new HashType(null, 'hashtype3' . $testid, 72, 0)); + + $qF = new LikeFilter(HashType::DESCRIPTION, "%" . $testid); + $aggregations = []; + $aggregations[] = new Aggregation(HashType::IS_SALTED, Aggregation::MAX); + $aggregations[] = new Aggregation(HashType::IS_SALTED, Aggregation::MIN); + $aggregations[] = new Aggregation(HashType::IS_SALTED, Aggregation::SUM); + $aggregations[] = new Aggregation(HashType::IS_SALTED, Aggregation::COUNT); + + $results = Factory::getHashTypeFactory()->multicolAggregationFilter([Factory::FILTER => $qF], $aggregations); + foreach ($aggregations as $aggregation) { + $this->assertArrayHasKey($aggregation->getName(), $results); + } + $this->assertEquals(125, $results[$aggregations[0]->getName()]); + $this->assertEquals(1, $results[$aggregations[1]->getName()]); + $this->assertEquals(198, $results[$aggregations[2]->getName()]); + $this->assertEquals(3, $results[$aggregations[3]->getName()]); + } + + /** + * Test using different columns in one request to aggregate on. + * + * @throws Exception + */ + public function testAggregationSuccessMixedColumns(): void { + $testid = uniqid(); + $this->createDatabaseObject(Factory::getHashTypeFactory(), new HashType(null, 'hashtype1' . $testid, 1, 0)); + $this->createDatabaseObject(Factory::getHashTypeFactory(), new HashType(null, 'hashtype2' . $testid, 0, 5)); + $this->createDatabaseObject(Factory::getHashTypeFactory(), new HashType(null, 'hashtype3' . $testid, 72, 9)); + + $qF = new LikeFilter(HashType::DESCRIPTION, "%" . $testid); + $aggregations = []; + $aggregations[] = new Aggregation(HashType::IS_SALTED, Aggregation::MAX); + $aggregations[] = new Aggregation(HashType::IS_SLOW_HASH, Aggregation::MIN); + $aggregations[] = new Aggregation(HashType::IS_SALTED, Aggregation::SUM); + + $results = Factory::getHashTypeFactory()->multicolAggregationFilter([Factory::FILTER => $qF], $aggregations); + foreach ($aggregations as $aggregation) { + $this->assertArrayHasKey($aggregation->getName(), $results); + } + $this->assertEquals(72, $results[$aggregations[0]->getName()]); + $this->assertEquals(0, $results[$aggregations[1]->getName()]); + $this->assertEquals(73, $results[$aggregations[2]->getName()]); + } + + /** + * Test an aggregation with a join. + * + * @throws Exception + */ + public function testAggregationSuccessWithJoin(): void { + $testid = uniqid(); + $hashtype1 = $this->createDatabaseObject(Factory::getHashTypeFactory(), new HashType(null, 'hashtype1' . $testid, 1, 10)); + $this->createDatabaseObject(Factory::getHashTypeFactory(), new HashType(null, 'hashtype2' . $testid, 0, 5)); + $this->createDatabaseObject(Factory::getHashTypeFactory(), new HashType(null, 'hashtype3' . $testid, 72, 9)); + + $accessGroup = $this->createDatabaseObject(Factory::getAccessGroupFactory(), new AccessGroup(null, 'testgroup1' . $testid)); + + $this->createDatabaseObject(Factory::getHashlistFactory(), new Hashlist(null, 'hashlist1' . $testid, 0, $hashtype1->getId(), 0, 0, 0, 0, 0, 0, $accessGroup->getId(), '', 0, 0, 0)); + + $qF = new LikeFilter(HASHLIST::HASHLIST_NAME, "%" . $testid, Factory::getHashlistFactory()); + $jF = new JoinFilter(Factory::getHashlistFactory(), HashType::HASH_TYPE_ID, Hashlist::HASH_TYPE_ID); + + $aggregations = []; + $aggregations[] = new Aggregation(HashType::HASH_TYPE_ID, Aggregation::COUNT); + $aggregations[] = new Aggregation(HashType::IS_SLOW_HASH, Aggregation::SUM); + + $results = Factory::getHashTypeFactory()->multicolAggregationFilter([Factory::FILTER => $qF, Factory::JOIN => $jF], $aggregations); + $this->assertEquals(1, $results[$aggregations[0]->getName()]); + $this->assertEquals(10, $results[$aggregations[1]->getName()]); + } + + /** + * Test providing an invalid aggregation function + * + * @return void + */ + public function testAggregationInvalidFunction(): void { + $this->expectException(RuntimeException::class); + new Aggregation(HashType::IS_SLOW_HASH, "INVALID"); + } + + /** + * Test providing an overrideFactory which does not have the column aggregating on. + * + * @return void + */ + public function testAggregationInvalidColumn(): void { + $this->expectException(RuntimeException::class); + new Aggregation(HashType::IS_SLOW_HASH, Aggregation::MAX, Factory::getFileFactory()); + } +} \ No newline at end of file diff --git a/src/dba/AbstractModelFactory.php b/src/dba/AbstractModelFactory.php index 247796e42..dadc16847 100755 --- a/src/dba/AbstractModelFactory.php +++ b/src/dba/AbstractModelFactory.php @@ -461,11 +461,12 @@ public function minMaxFilter(array $options, string $sumColumn, string $op): mix public function multicolAggregationFilter(array $options, array $aggregations): mixed { $elements = []; foreach ($aggregations as $aggregation) { - $elements[] = $aggregation->getQueryString($this); + $elements[] = $aggregation->getQueryString($this, isset($options[Factory::JOIN])); } $query = "SELECT " . join(",", $elements); - $query = $query . " FROM " . $this->getMappedModelTable(); + + $query .= " FROM " . $this->getMappedModelTable(); $vals = array(); @@ -846,11 +847,15 @@ private function applyOrder(Order|array $orders): string { } /** - * @param $joins + * @param array|Join $joins * @return string */ - private function applyJoins($joins): string { + private function applyJoins(Join|array $joins): string { $query = ""; + if (!is_array($joins)) { + $joins = array($joins); + } + foreach ($joins as $join) { $joinFactory = $join->getOtherFactory(); $localFactory = $this; diff --git a/src/dba/Aggregation.php b/src/dba/Aggregation.php index 66f615e3b..05119dbbb 100755 --- a/src/dba/Aggregation.php +++ b/src/dba/Aggregation.php @@ -2,6 +2,8 @@ namespace Hashtopolis\dba; +use RuntimeException; + class Aggregation { private string $column; private string $function; @@ -15,8 +17,18 @@ class Aggregation { function __construct(string $column, string $function, ?AbstractModelFactory $overrideFactory = null) { $this->column = $column; - $this->function = $function; + $this->function = strtoupper($function); $this->overrideFactory = $overrideFactory; + + // test for function validity + if (!in_array($this->function, [Aggregation::SUM, Aggregation::MAX, Aggregation::MIN, Aggregation::COUNT])) { + throw new RuntimeException("Invalid function for aggregation!"); + } + + // in case an overrideFactory used, check that the column is matching + if ($this->overrideFactory != null && !in_array($this->column, array_keys($this->overrideFactory->getNullObject()->getKeyValueDict()))) { + throw new RuntimeException("Provided column for aggregation does not match to overrideFactory!"); + } } function getName(): string { From d194bfd825525faf1455f646e87a0ce48a502708 Mon Sep 17 00:00:00 2001 From: s3inlc Date: Fri, 22 May 2026 13:38:19 +0200 Subject: [PATCH 590/691] fixed random range to avoid potential errors --- ci/phpunit/dba/AbstractModelFactoryTest.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ci/phpunit/dba/AbstractModelFactoryTest.php b/ci/phpunit/dba/AbstractModelFactoryTest.php index 7077f1351..ee8437505 100644 --- a/ci/phpunit/dba/AbstractModelFactoryTest.php +++ b/ci/phpunit/dba/AbstractModelFactoryTest.php @@ -1120,7 +1120,7 @@ public function testSimpleFilter(): void { * @throws Exception */ public function testColumnFilter(): void { - $isSalted = random_int(1, 100); + $isSalted = random_int(2, 100); $testid = uniqid(); $hashlist_1 = $this->createDatabaseObject(Factory::getHashlistFactory(), new Hashlist(null, "hashlist 1" . $testid, DHashlistFormat::PLAIN, 0, 0, ':', 0, 0, 0, $isSalted, AccessUtils::getOrCreateDefaultAccessGroup()->getId(), "", 0, 0, 0)); From 3d473b76a08727a6d38b8d09631a932440bc6819 Mon Sep 17 00:00:00 2001 From: s3inlc Date: Fri, 22 May 2026 14:15:50 +0200 Subject: [PATCH 591/691] completed aggregation tests --- ci/phpunit/dba/AggregationTest.php | 39 +++++++++++++++++++++++++++++- src/dba/Aggregation.php | 4 +++ 2 files changed, 42 insertions(+), 1 deletion(-) diff --git a/ci/phpunit/dba/AggregationTest.php b/ci/phpunit/dba/AggregationTest.php index b1b9f9aa6..dedf79911 100644 --- a/ci/phpunit/dba/AggregationTest.php +++ b/ci/phpunit/dba/AggregationTest.php @@ -6,6 +6,8 @@ use Hashtopolis\dba\models\AccessGroup; use Hashtopolis\dba\models\Hashlist; use Hashtopolis\dba\models\HashType; +use Hashtopolis\dba\models\HealthCheckAgent; +use Hashtopolis\dba\models\User; use Hashtopolis\TestBase; use RuntimeException; @@ -100,6 +102,8 @@ public function testAggregationSuccessWithJoin(): void { */ public function testAggregationInvalidFunction(): void { $this->expectException(RuntimeException::class); + $this->expectExceptionMessage("Invalid function for aggregation!"); + new Aggregation(HashType::IS_SLOW_HASH, "INVALID"); } @@ -108,8 +112,41 @@ public function testAggregationInvalidFunction(): void { * * @return void */ - public function testAggregationInvalidColumn(): void { + public function testAggregationInvalidColumnOverride(): void { $this->expectException(RuntimeException::class); + $this->expectExceptionMessage("Provided column for aggregation does not match to overrideFactory!"); + new Aggregation(HashType::IS_SLOW_HASH, Aggregation::MAX, Factory::getFileFactory()); } + + /** + * Test providing an invalid factory with the aggregation. + * + * @throws Exception + */ + public function testAggregationInvalidColumn(): void { + $this->expectException(RuntimeException::class); + $this->expectExceptionMessage("Provided column for aggregation does not match to factory!"); + + $aggregation = new Aggregation(HashType::IS_SLOW_HASH, Aggregation::MAX); + $aggregation->getQueryString(Factory::getFileFactory()); + } + + /** + * Test include table functionality. + */ + public function testAggregationTableInclude(): void { + $aggregation = new Aggregation(HashType::HASH_TYPE_ID, Aggregation::COUNT); + $query = $aggregation->getQueryString(Factory::getHashTypeFactory(), true); + $this->assertEquals("COUNT(HashType.hashTypeId) AS count_hashtypeid", $query); + } + + /** + * Test if the mapping of a table happens when needed. + */ + public function testAggregationTableMapping(): void { + $aggregation = new Aggregation(User::USERNAME, Aggregation::COUNT); + $query = $aggregation->getQueryString(Factory::getUserFactory(), true); + $this->assertEquals("COUNT(htp_User.username) AS count_username", $query); + } } \ No newline at end of file diff --git a/src/dba/Aggregation.php b/src/dba/Aggregation.php index 05119dbbb..02f262591 100755 --- a/src/dba/Aggregation.php +++ b/src/dba/Aggregation.php @@ -39,6 +39,10 @@ function getQueryString(AbstractModelFactory $factory, bool $includeTable = fals if ($this->overrideFactory != null) { $factory = $this->overrideFactory; } + else if (!in_array($this->column, array_keys($factory->getNullObject()->getKeyValueDict()))) { + throw new RuntimeException("Provided column for aggregation does not match to factory!"); + } + $table = ""; if ($includeTable) { $table = $factory->getMappedModelTable() . "."; From e00ebcfe77d7843bf2574ada49532c5f01a262af Mon Sep 17 00:00:00 2001 From: coiseiw Date: Fri, 22 May 2026 14:26:10 +0200 Subject: [PATCH 592/691] Integration of the manual to setup smtp server in hashtopolis --- .../advanced_install.md | 177 ++++++++++++++++++ doc/user_manual/settings_and_configuration.md | 2 +- doc/user_manual/user-settings.md | 2 +- 3 files changed, 179 insertions(+), 2 deletions(-) diff --git a/doc/installation_guidelines/advanced_install.md b/doc/installation_guidelines/advanced_install.md index d16ac76dd..6e38d652d 100644 --- a/doc/installation_guidelines/advanced_install.md +++ b/doc/installation_guidelines/advanced_install.md @@ -261,3 +261,180 @@ Afterwards, you can start up the containers again which should then be in a comp ``` docker compose up -d ``` + +## Hashtopolis Mail Setup (Sendmail or Postfix) + +This guide gives the fastest ways to make mail sending work in Hashtopolis to be used for sending notifications + +### Important Hashtopolis-specific requirement + +Current backend logic considers mail "configured" only if this file exists: + +- /etc/ssmtp/ssmtp.conf + +Even when using sendmail or postfix, you should still provide this file (it can be minimal) so Hashtopolis enables email sending. + +### Recommended easiest path: Postfix relay + existing backend image + +This is the easiest because the backend image already supports an ssmtp config mount. + +#### 1. Prepare a postfix relay (host or separate container) + +Configure postfix as a null client / relay host. Typical key setting in postfix main.cf: + +- relayhost = [smtp.your-provider.tld]:587 + +Also configure SASL and TLS as needed by your provider. + +#### 2. Create ssmtp.conf in your project root + +Use the provided template as base: + +- copy ssmtp.conf.example to ssmtp.conf + +Example values: + +- root=admin@your-domain.tld +- mailhub=host.docker.internal:25 +- rewriteDomain=your-domain.tld +- UseTLS=No +- UseSTARTTLS=No +- FromLineOverride=yes + +If your postfix relay requires auth/TLS on another port, set mailhub and TLS/auth values accordingly. + +#### 3. Mount ssmtp.conf into Hashtopolis backend container + +In docker-compose.mysql.yml or docker-compose.postgres.yml, enable this volume: + +```yaml +services: + hashtopolis-backend: + volumes: + - hashtopolis:/usr/local/share/hashtopolis:Z + - ./ssmtp.conf:/etc/ssmtp/ssmtp.conf +``` + +#### 4. Configure sender identity in Hashtopolis + +In Hashtopolis config, set: + +- emailSender +- emailSenderName + +These values are used in From headers. + +#### 5. Restart and test + +- Restart backend container. +- Trigger a password reset or user creation mail. +- If it fails, inspect backend logs and postfix logs. + +--- + +### Alternative path: direct sendmail/postfix inside backend container + +Use this only if you specifically need local MTA delivery from the backend container. + +#### 1. Build a custom backend image + +Install postfix or sendmail package and ensure /usr/sbin/sendmail exists. + +#### 2. Keep Hashtopolis mail gate satisfied + +Create the file below inside the container (even if unused by your MTA logic): + +- /etc/ssmtp/ssmtp.conf + +A minimal placeholder is enough: + +```conf +root=postmaster@localhost +mailhub=localhost +FromLineOverride=yes +``` + +#### 3. Ensure PHP uses sendmail interface + +Set php sendmail_path appropriately (commonly default is already fine): + +- sendmail_path = "/usr/sbin/sendmail -t -i" + +#### 4. Test sendmail manually, then from Hashtopolis + +Manual test example: + +```bash +printf "Subject: test\n\nhello" | /usr/sbin/sendmail you@example.com +``` + +Then test Hashtopolis-triggered mail events. + +--- + +### Troubleshooting checklist + +- /etc/ssmtp/ssmtp.conf exists inside backend container. +- emailSender and emailSenderName are set in Hashtopolis config. +- DNS/network from backend to relay is reachable. +- Relay accepts sender domain and authentication method. +- PHP can execute /usr/sbin/sendmail successfully. + +--- + +### Gmail quick test example (no own SMTP server) + +Use this section to test mail locally with a Gmail account. + +#### Prerequisites + +- Enable 2-Step Verification on your Google account. +- Create a Google App Password (do not use your normal Gmail password). + +#### Example ssmtp.conf for Gmail + +Create or update ssmtp.conf in your project root with values like: + +```conf +root=youraddress@gmail.com +mailhub=smtp.gmail.com:587 +rewriteDomain=gmail.com +UseTLS=Yes +UseSTARTTLS=Yes +AuthUser=youraddress@gmail.com +AuthPass=your_16_char_google_app_password +AuthMethod=LOGIN +FromLineOverride=yes +``` + +#### Mount the file in Docker Compose + +Make sure the backend service has this volume enabled: + +```yaml +services: + hashtopolis-backend: + volumes: + - hashtopolis:/usr/local/share/hashtopolis:Z + - ./ssmtp.conf:/etc/ssmtp/ssmtp.conf +``` + +#### Hashtopolis sender settings + +In Hashtopolis server config: + +- emailSender = youraddress@gmail.com +- emailSenderName = Hashtopolis Local Test + +#### Local test flow + +1. Restart the backend container. +2. Trigger a password reset email for a user with your Gmail address. +3. Check your inbox (and spam folder). + +#### If Gmail test fails + +- Verify AuthPass is an App Password, not your account password. +- Verify port 587 outbound is allowed from your Docker environment. +- Check backend container logs for mail/sendmail errors. +- Confirm /etc/ssmtp/ssmtp.conf exists inside the backend container. diff --git a/doc/user_manual/settings_and_configuration.md b/doc/user_manual/settings_and_configuration.md index ed5182695..93ce7f4a2 100644 --- a/doc/user_manual/settings_and_configuration.md +++ b/doc/user_manual/settings_and_configuration.md @@ -87,7 +87,7 @@ ## Notification Settings -- **Notification Sender Email**: Email address used as the sender for outgoing notifications. +- **Notification Sender Email**: Email address used as the sender for outgoing notifications (check how to setup the smtp server in the [Advanced Installation / Hashtopolis mail setup](../installation_guidelines/advanced_install.md#hashtopolis-mail-setup-sendmail-or-postfix)). - **Sender's Display Name**: The name displayed as the sender in notification emails. diff --git a/doc/user_manual/user-settings.md b/doc/user_manual/user-settings.md index 100ee292d..473bc6abf 100644 --- a/doc/user_manual/user-settings.md +++ b/doc/user_manual/user-settings.md @@ -15,7 +15,7 @@ It is possible to be informed about various events via different channels. The f - Chatbot - Discord -- Email +- Email (check how to setup the smtp server in the [Advanced Installation / Hashtopolis mail setup](../installation_guidelines/advanced_install.md#hashtopolis-mail-setup-sendmail-or-postfix)) - Telegram - Slack From 726a24cb48d8b84d5adb6e2fac729d57f14bd4a5 Mon Sep 17 00:00:00 2001 From: MLdev2026 Date: Fri, 22 May 2026 12:37:56 +0000 Subject: [PATCH 593/691] changes on classes begins with "C" --- .phpunit.result.cache | 1 + ci/phpunit/{ => inc}/utils/ChunkUtilsTest.php | 9 +++-- .../{ => inc}/utils/ConfigUtilsTest.php | 11 +++--- .../utils/CrackerBinaryUtilsTest.php | 36 +++++++------------ .../{ => inc}/utils/CrackerUtilsTest.php | 27 +++++++------- 5 files changed, 39 insertions(+), 45 deletions(-) create mode 100644 .phpunit.result.cache rename ci/phpunit/{ => inc}/utils/ChunkUtilsTest.php (95%) rename ci/phpunit/{ => inc}/utils/ConfigUtilsTest.php (90%) rename ci/phpunit/{ => inc}/utils/CrackerBinaryUtilsTest.php (70%) rename ci/phpunit/{ => inc}/utils/CrackerUtilsTest.php (80%) diff --git a/.phpunit.result.cache b/.phpunit.result.cache new file mode 100644 index 000000000..540f4a3a5 --- /dev/null +++ b/.phpunit.result.cache @@ -0,0 +1 @@ +{"version":2,"defects":{"Hashtopolis\\dba\\AbstractModelFactoryTest::testColumnFilter":8,"Hashtopolis\\dba\\AbstractModelFactoryTest::testTimeseriesFilterNoneCracked":8,"Hashtopolis\\dba\\AbstractModelFactoryTest::testTimeseriesFilter":8,"Tests\\Utils\\ConfigUtilsTest::testGet_KnownItem_ReturnsConfig":8,"Tests\\Utils\\ConfigUtilsTest::testGet_UnknownItem_ThrowsHTException":8,"Tests\\Utils\\ConfigUtilsTest::testUpdateSingleConfig_MissingValue_ThrowsHTException":8,"Tests\\Utils\\ConfigUtilsTest::testUpdateSingleConfig_SameValue_ReturnsEarlyWithoutException":5,"Tests\\Utils\\ConfigUtilsTest::testUpdateSingleConfig_InvalidId_ThrowsHTException":8},"times":{"Hashtopolis\\dba\\AbstractModelFactoryTest::testGetDBWithTest":0.003,"Hashtopolis\\dba\\AbstractModelFactoryTest::testGetMappedModelTableWithoutMapping":0,"Hashtopolis\\dba\\AbstractModelFactoryTest::testGetMappedModelTableWithMapping":0,"Hashtopolis\\dba\\AbstractModelFactoryTest::testGetMappedModelKeysWithoutRemapping":0,"Hashtopolis\\dba\\AbstractModelFactoryTest::testGetMappedModelKeysWithRemapping":0,"Hashtopolis\\dba\\AbstractModelFactoryTest::testGetMappedModelKeyWithoutRemapping":0,"Hashtopolis\\dba\\AbstractModelFactoryTest::testGetMappedModelKeyWithRemapping":0,"Hashtopolis\\dba\\AbstractModelFactoryTest::testSaveModelSuccessStaticId":0.012,"Hashtopolis\\dba\\AbstractModelFactoryTest::testSaveModelSuccessNoId":0.01,"Hashtopolis\\dba\\AbstractModelFactoryTest::testUpdateModelSuccessNoChanges":0.008,"Hashtopolis\\dba\\AbstractModelFactoryTest::testUpdateModelSuccessSingleChange":0.01,"Hashtopolis\\dba\\AbstractModelFactoryTest::testUpdateModelSuccessSingleChangeOnMappedColumn":0.044,"Hashtopolis\\dba\\AbstractModelFactoryTest::testUpdateModelSuccessMultipleChanges":0.009,"Hashtopolis\\dba\\AbstractModelFactoryTest::testSimpleFilter":0.001,"Hashtopolis\\dba\\AbstractModelFactoryTest::testColumnFilter":0.004,"Hashtopolis\\dba\\AbstractModelFactoryTest::testTimeseriesFilterEmpty":0.001,"Hashtopolis\\dba\\AbstractModelFactoryTest::testTimeseriesFilterNoneCracked":0.002,"Hashtopolis\\dba\\AbstractModelFactoryTest::testTimeseriesFilter":0.002,"Hashtopolis\\inc\\UtilTest::testIsMailConfiguredReturnsFalseWithoutSsmtpConfig":0.001,"Hashtopolis\\inc\\UtilTest::testIsMailConfiguredReturnsTrueWithSsmtpConfig":0,"Hashtopolis\\inc\\UtilTest::testSendMailReturnsFalseWhenMailIsNotConfigured":0,"Hashtopolis\\inc\\apiv2\\util\\CorsHackMiddlewareTest::testValidLocalhostVariations":0.003,"Hashtopolis\\inc\\apiv2\\util\\CorsHackMiddlewareTest::testInvalidLocalhostPort":0,"Hashtopolis\\inc\\apiv2\\util\\CorsHackMiddlewareTest::testEvilDomainForLocalhost":0,"Hashtopolis\\inc\\apiv2\\util\\CorsHackMiddlewareTest::testEvilIPForLocalhost":0,"Hashtopolis\\inc\\apiv2\\util\\CorsHackMiddlewareTest::testInvalidDomainPort":0,"Hashtopolis\\inc\\apiv2\\util\\CorsHackMiddlewareTest::testValidDomainWithoutPort":0,"Hashtopolis\\inc\\apiv2\\util\\CorsHackMiddlewareTest::testValidHttpsDomainWithoutPort":0,"Hashtopolis\\inc\\apiv2\\util\\CorsHackMiddlewareTest::testValidHttpsDomainWithPortWithHttpConfig":0,"Hashtopolis\\inc\\apiv2\\util\\CorsHackMiddlewareTest::testValidDomainWithoutDifferentFrontendPort":0.001,"Hashtopolis\\inc\\notifications\\HashtopolisNotificationEmailTest::testSendMessageDoesNotCallSendMailWhenMailIsNotConfigured":0.001,"Hashtopolis\\inc\\notifications\\HashtopolisNotificationEmailTest::testSendMessageCallsSendMailWhenMailIsConfigured":0.002,"Hashtopolis\\inc\\notifications\\HashtopolisNotificationEmailTest::testSendMessageThrowsWhenConfiguredSendMailFails":0,"Hashtopolis\\inc\\utils\\AccessControlTest::testGetInstanceWithoutArgsReusesSameObject":0.001,"Hashtopolis\\inc\\utils\\AccessControlTest::testGetInstanceWithGroupIdOverwritesInstance":0.001,"Hashtopolis\\inc\\utils\\AccessControlTest::testGetInstanceWithUserOverwritesInstance":0.001,"Hashtopolis\\inc\\utils\\AccessControlTest::testReloadReloadsTheRightsGroupForUser":0.02,"Hashtopolis\\inc\\utils\\AccessControlTest::testReloadDoesNotReloadTheRightsGroupWithoutUser":0.011,"Hashtopolis\\inc\\utils\\AccessControlTest::testPermissionPublicAccessAlwaysPermit":0,"Hashtopolis\\inc\\utils\\AccessControlTest::testPermissionLoginWithLoggedInUserPermit":0,"Hashtopolis\\inc\\utils\\AccessControlTest::testPermissionLoginWithoutLoggedInUserDenies":0,"Hashtopolis\\inc\\utils\\AccessControlTest::testUninitializedAccessControlDenies":0,"Hashtopolis\\inc\\utils\\AccessControlTest::testRegularUserWithPermissionPermits":0.014,"Hashtopolis\\inc\\utils\\AccessControlTest::testRegularUserWithoutPermissionDenies":0.014,"Hashtopolis\\inc\\utils\\AccessControlTest::testALLUserPermissionPermitsAllPermissions":0.001,"Hashtopolis\\inc\\utils\\AccessControlTest::testGivenByDependencyImplied":0.006,"Hashtopolis\\inc\\utils\\AccessControlTest::testGivenByDependencyDirect":0.01,"Hashtopolis\\inc\\utils\\AccessControlUtilsTest::testGetMembersOfGroupReturnsOnlyMembersOfGroup":0.032,"Hashtopolis\\inc\\utils\\AccessControlUtilsTest::testThatAdminGroupPermissionCanNotBeAltered":0.008,"Hashtopolis\\inc\\utils\\AccessControlUtilsTest::testAddPermissionsToNonExistentGroup":0.01,"Hashtopolis\\inc\\utils\\AccessControlUtilsTest::testGetGroupLoadsExistingGroup":0.007,"Hashtopolis\\inc\\utils\\AccessControlUtilsTest::testGetGroupThrowsForNonExistentGroup":0.007,"Hashtopolis\\inc\\utils\\AccessControlUtilsTest::testAddToPermissionThrowsOnNonExistentGroup":0.007,"Hashtopolis\\inc\\utils\\AccessControlUtilsTest::testAddPermissionToGroup":0.009,"Hashtopolis\\inc\\utils\\AccessControlUtilsTest::testAddNonExistentPermissionToGroup":0.013,"Hashtopolis\\inc\\utils\\AccessControlUtilsTest::testUpdateNonexistentGroupThrowsException":0.007,"Hashtopolis\\inc\\utils\\AccessControlUtilsTest::testUpdateAdminPermissionsIsNotAllowed":0.007,"Hashtopolis\\inc\\utils\\AccessControlUtilsTest::testUpdatePermission":0.01,"Hashtopolis\\inc\\utils\\AccessControlUtilsTest::testUpdatePermissionIgnoresValidPermissionWithInvalidInteger":0.01,"Hashtopolis\\inc\\utils\\AccessControlUtilsTest::testUpdatePermissionIgnoresInvalidPermissionWithValidInteger":0.009,"Hashtopolis\\inc\\utils\\AccessControlUtilsTest::testUpdatePermissionAppliesDependencyOverride":0.016,"Hashtopolis\\inc\\utils\\AccessControlUtilsTest::testCreateGroupThrowsForEmptyName":0.007,"Hashtopolis\\inc\\utils\\AccessControlUtilsTest::testCreateGroupThrowsForNameLongerThanMaxLength":0.006,"Hashtopolis\\inc\\utils\\AccessControlUtilsTest::testCreateGroupAllowsNameAtMaxLength":0.015,"Hashtopolis\\inc\\utils\\AccessControlUtilsTest::testCreateGroupThrowsForExistingGroupName":0.009,"Hashtopolis\\inc\\utils\\AccessControlUtilsTest::testDeleteGroupThrowsForNonExistentGroup":0.007,"Hashtopolis\\inc\\utils\\AccessControlUtilsTest::testDeleteGroupThrowsWhenGroupHasUsers":0.017,"Hashtopolis\\inc\\utils\\AccessControlUtilsTest::testDeleteGroupDeletesEmptyGroup":0.009,"Hashtopolis\\inc\\utils\\AccessGroupUtilsTest::testGetUsersReturnsUsersAssignedToRequestedGroup":0.048,"Hashtopolis\\inc\\utils\\AccessGroupUtilsTest::testGetAgentsReturnsAgentsAssignedToRequestedGroup":0.047,"Hashtopolis\\inc\\utils\\AccessGroupUtilsTest::testGetGroupsReturnsAtLeastCreatedGroups":0.059,"Hashtopolis\\inc\\utils\\AccessGroupUtilsTest::testCreateGroupThrowsForEmptyName":0.045,"Hashtopolis\\inc\\utils\\AccessGroupUtilsTest::testCreateGroupThrowsForNameLongerThanMaxLength":0.053,"Hashtopolis\\inc\\utils\\AccessGroupUtilsTest::testCreateGroupThrowsForExistingGroupName":0.044,"Hashtopolis\\inc\\utils\\AccessGroupUtilsTest::testCreateGroupCreatesGroupWithValidUniqueName":0.051,"Hashtopolis\\inc\\utils\\AccessGroupUtilsTest::testRenameThrowsForNonExistentGroup":0.052,"Hashtopolis\\inc\\utils\\AccessGroupUtilsTest::testRenameThrowsForEmptyName":0.067,"Hashtopolis\\inc\\utils\\AccessGroupUtilsTest::testAbortChunksGroupThrowsForNonExistentGroup":0.051,"Hashtopolis\\inc\\utils\\AccessGroupUtilsTest::testAbortChunksGroupOnlyAbortsInitAndRunningChunks":0.169,"Hashtopolis\\inc\\utils\\AccessGroupUtilsTest::testAddAgentAddsAgentToGroup":0.06,"Hashtopolis\\inc\\utils\\AccessGroupUtilsTest::testAddAgentThrowsWhenAgentAlreadyInGroup":0.047,"Hashtopolis\\inc\\utils\\AccessGroupUtilsTest::testAddUserAddsUserToGroup":0.05,"Hashtopolis\\inc\\utils\\AccessGroupUtilsTest::testAddUserThrowsWhenUserAlreadyInGroup":0.05,"Hashtopolis\\inc\\utils\\AccessGroupUtilsTest::testRemoveAgentRemovesAgentFromGroup":0.059,"Hashtopolis\\inc\\utils\\AccessGroupUtilsTest::testRemoveAgentThrowsWhenAgentIsNotInGroup":0.07,"Hashtopolis\\inc\\utils\\AccessGroupUtilsTest::testRemoveUserRemovesUserFromGroup":0.045,"Hashtopolis\\inc\\utils\\AccessGroupUtilsTest::testRemoveUserThrowsWhenUserIsNotInGroup":0.043,"Hashtopolis\\inc\\utils\\AccessGroupUtilsTest::testDeleteGroupThrowsForDefaultGroup":0.045,"Hashtopolis\\inc\\utils\\AccessGroupUtilsTest::testDeleteGroupReassignsDependentEntitiesToDefaultGroup":0.095,"Tests\\Utils\\ChunkUtilsTest::testStaticChunkSize_ReturnsValueDirectly":0.001,"Tests\\Utils\\ChunkUtilsTest::testStaticNumChunks_ReturnsCeilDivision":0,"Tests\\Utils\\ChunkUtilsTest::testStaticChunking_InvalidInput_ThrowsHTException with data set \"CHUNK_SIZE zero\"":0,"Tests\\Utils\\ChunkUtilsTest::testStaticChunking_InvalidInput_ThrowsHTException with data set \"NUM_CHUNKS zero\"":0,"Tests\\Utils\\ChunkUtilsTest::testStaticChunking_InvalidInput_ThrowsHTException with data set \"NUM_CHUNKS too large\"":0,"Tests\\Utils\\ChunkUtilsTest::testStaticChunking_InvalidInput_ThrowsHTException with data set \"unknown mode\"":0,"Tests\\Utils\\ChunkUtilsTest::testOldBenchmark_ZeroValue_ReturnsFullKeyspace":0,"Tests\\Utils\\ChunkUtilsTest::testOldBenchmark_Normal_ReturnsCorrectFormula":0,"Tests\\Utils\\ChunkUtilsTest::testNewBenchmark_ValidFormat_ReturnsCorrectFormula":0,"Tests\\Utils\\ChunkUtilsTest::testNewBenchmark_InvalidInput_ReturnsZero with data set \"zero speed\"":0.007,"Tests\\Utils\\ChunkUtilsTest::testNewBenchmark_InvalidInput_ReturnsZero with data set \"zero time\"":0.001,"Tests\\Utils\\ChunkUtilsTest::testOldBenchmark_NonNumericString_ThrowsTypeError":0,"Tests\\Utils\\ChunkUtilsTest::testSizeClampedToOne_WhenCalculationProducesZero":0.012,"Tests\\Utils\\ChunkUtilsTest::testTolerance_ScalesChunkSizeUp":0,"Tests\\Utils\\ChunkUtilsTest::testZeroChunkTime_FallsBackToSConfigValue":0,"Tests\\Utils\\ChunkUtilsTest::testCreateNewChunk_ReturnsNullWhenKeyspaceExhausted":0.005,"Tests\\Utils\\ConfigUtilsTest::testGet_KnownItem_ReturnsConfig":0.001,"Tests\\Utils\\ConfigUtilsTest::testGet_UnknownItem_ThrowsHTException":0.001,"Tests\\Utils\\ConfigUtilsTest::testUpdateSingleConfig_MissingValue_ThrowsHTException":0.001,"Tests\\Utils\\ConfigUtilsTest::testUpdateSingleConfig_SameValue_ReturnsEarlyWithoutException":0.001,"Tests\\Utils\\ConfigUtilsTest::testUpdateSingleConfig_InvalidId_ThrowsHTException":0.001,"Tests\\Utils\\CrackerBinaryUtilsTest::testGetNewestVersion_NoBinaries_ThrowsHTException":0.006,"Tests\\Utils\\CrackerBinaryUtilsTest::testGetNewestVersion_SingleBinary_ReturnsThatBinary":0.012,"Tests\\Utils\\CrackerBinaryUtilsTest::testGetNewestVersion_MultipleBinaries_ReturnsHighestVersion":0.024,"Tests\\Utils\\CrackerBinaryUtilsTest::testGetNewestVersion_OutOfOrderInsert_StillReturnsHighest":0.023,"Tests\\Utils\\CrackerUtilsTest::testGetBinary_InvalidId_ThrowsHTException":0.007,"Tests\\Utils\\CrackerUtilsTest::testGetBinaryType_InvalidId_ThrowsHTException":0.007,"Tests\\Utils\\CrackerUtilsTest::testGetBinary_ValidId_ReturnsBinary":0.009,"Tests\\Utils\\CrackerUtilsTest::testGetBinaryType_ValidId_ReturnsBinaryType":0.007,"Tests\\Utils\\CrackerUtilsTest::testCreateBinaryType_EmptyName_ThrowsHttpError":0.007,"Tests\\Utils\\CrackerUtilsTest::testCreateBinaryType_DuplicateName_ThrowsHttpConflict":0.008,"Tests\\Utils\\CrackerUtilsTest::testCreateBinary_EmptyVersion_ThrowsHttpError":0.008,"Tests\\Utils\\CrackerUtilsTest::testCreateBinary_ValidInput_CreatesBinary":0.014,"Hashtopolis\\inc\\utils\\UserUtilsTest::testCreateUserDoesNotCallSendMailWhenMailIsNotConfigured":0.202,"Hashtopolis\\inc\\utils\\UserUtilsTest::testCreateUserCallsSendMailWhenMailIsConfigured":0.214,"Hashtopolis\\inc\\utils\\UserUtilsTest::testCreateUserThrowsWhenConfiguredSendMailFails":0.194,"Tests\\Utils\\CrackerBinaryUtilsTest2::testGetNewestVersion_NoBinaries_ThrowsHTException":0.005,"Tests\\Utils\\CrackerBinaryUtilsTest2::testGetNewestVersion_SingleBinary_ReturnsThatBinary":0.009,"Tests\\Utils\\CrackerBinaryUtilsTest2::testGetNewestVersion_MultipleBinaries_ReturnsHighestVersion":0.024,"Tests\\Utils\\CrackerBinaryUtilsTest2::testGetNewestVersion_OutOfOrderInsert_StillReturnsHighest":0.023}} \ No newline at end of file diff --git a/ci/phpunit/utils/ChunkUtilsTest.php b/ci/phpunit/inc/utils/ChunkUtilsTest.php similarity index 95% rename from ci/phpunit/utils/ChunkUtilsTest.php rename to ci/phpunit/inc/utils/ChunkUtilsTest.php index a5b67ddfa..300778346 100644 --- a/ci/phpunit/utils/ChunkUtilsTest.php +++ b/ci/phpunit/inc/utils/ChunkUtilsTest.php @@ -11,11 +11,12 @@ use Hashtopolis\inc\SConfig; use Hashtopolis\inc\utils\ChunkUtils; use PHPUnit\Framework\Attributes\DataProvider; -use PHPUnit\Framework\TestCase; +use Hashtopolis\TestBase; -require_once dirname(__FILE__) . '/../../../src/inc/startup/include.php'; +require_once(dirname(__FILE__) . '/../../TestBase.php'); +require_once(dirname(__FILE__) . '/../../../../src/inc/startup/include.php'); -final class ChunkUtilsTest extends TestCase { +final class ChunkUtilsTest extends TestBase { // Injects a fake DataSet into the SConfig singleton via Reflection, // so tests can control config values without touching the database. @@ -140,4 +141,6 @@ public function testCreateNewChunk_ReturnsNullWhenKeyspaceExhausted(): void { $task->method('getKeyspace')->willReturn(1000); $this->assertNull(ChunkUtils::createNewChunk($task, $this->createMock(Assignment::class))); } + + // TODO: handleExistingChunk() and createNewChunk() require further test coverage. } diff --git a/ci/phpunit/utils/ConfigUtilsTest.php b/ci/phpunit/inc/utils/ConfigUtilsTest.php similarity index 90% rename from ci/phpunit/utils/ConfigUtilsTest.php rename to ci/phpunit/inc/utils/ConfigUtilsTest.php index 18464f9d2..ebc0a794b 100644 --- a/ci/phpunit/utils/ConfigUtilsTest.php +++ b/ci/phpunit/inc/utils/ConfigUtilsTest.php @@ -5,16 +5,17 @@ use Hashtopolis\dba\models\Config; use Hashtopolis\inc\HTException; use Hashtopolis\inc\utils\ConfigUtils; -use PHPUnit\Framework\TestCase; +use Hashtopolis\TestBase; -require_once dirname(__FILE__) . '/../../../src/inc/startup/include.php'; +require_once(dirname(__FILE__) . '/../../TestBase.php'); +require_once(dirname(__FILE__) . '/../../../../src/inc/startup/include.php'); /** * Unit tests for ConfigUtils. * Uses the pre-seeded "chunktime" config row that every Hashtopolis install * has, so no fixture creation is needed and tearDown is not required. */ -final class ConfigUtilsTest extends TestCase { +final class ConfigUtilsTest extends TestBase { // Fetched once per test — holds the live "chunktime" Config record from DB. private ?Config $existingConfig = null; @@ -22,6 +23,7 @@ final class ConfigUtilsTest extends TestCase { // Loads the "chunktime" config before every test so tests have a real // Config object with a known item name and a valid database ID. protected function setUp(): void { + parent::setUp(); $this->existingConfig = ConfigUtils::get('chunktime'); } @@ -51,10 +53,11 @@ public function testUpdateSingleConfig_MissingValue_ThrowsHTException(): void { // database write when the provided value is identical to the stored value. // This is the no-op path that avoids unnecessary DB updates. public function testUpdateSingleConfig_SameValue_ReturnsEarlyWithoutException(): void { + $this->expectNotToPerformAssertions(); $sameValue = $this->existingConfig->getValue(); // Passing the same value back — the method must detect no change and return. ConfigUtils::updateSingleConfig($this->existingConfig->getId(), [Config::VALUE => $sameValue]); - $this->assertTrue(true); // reaching here confirms no exception was thrown + } // Verifies that updateSingleConfig() throws HTException when the given ID diff --git a/ci/phpunit/utils/CrackerBinaryUtilsTest.php b/ci/phpunit/inc/utils/CrackerBinaryUtilsTest.php similarity index 70% rename from ci/phpunit/utils/CrackerBinaryUtilsTest.php rename to ci/phpunit/inc/utils/CrackerBinaryUtilsTest.php index ccda7352b..05e031b5a 100644 --- a/ci/phpunit/utils/CrackerBinaryUtilsTest.php +++ b/ci/phpunit/inc/utils/CrackerBinaryUtilsTest.php @@ -7,46 +7,36 @@ use Hashtopolis\dba\models\CrackerBinaryType; use Hashtopolis\inc\HTException; use Hashtopolis\inc\utils\CrackerBinaryUtils; -use PHPUnit\Framework\TestCase; +use Hashtopolis\TestBase; -require_once dirname(__FILE__) . '/../../../src/inc/startup/include.php'; + +require_once(dirname(__FILE__) . '/../../TestBase.php'); +require_once(dirname(__FILE__) . '/../../../../src/inc/startup/include.php'); /** * Unit tests for CrackerBinaryUtils. * setUp creates a dedicated CrackerBinaryType so tests are isolated. - * tearDown removes all binaries and the type created during the test. + * TestBase::tearDown() cleans up all registered objects in reverse order (binaries before type). */ -final class CrackerBinaryUtilsTest extends TestCase { +final class CrackerBinaryUtilsTest extends TestBase { - private ?CrackerBinaryType $type = null; - private array $binaries = []; + private ?CrackerBinaryType $type = null; - // Creates a fresh CrackerBinaryType before each test so every test starts - // with an empty set of binaries registered under that type. protected function setUp(): void { - $this->type = Factory::getCrackerBinaryTypeFactory()->save( + parent::setUp(); + $this->type = $this->createDatabaseObject( + Factory::getCrackerBinaryTypeFactory(), new CrackerBinaryType(null, 'test-crackerbinaryutils-type', 1) ); } - // Deletes every CrackerBinary created during the test, then the type itself. - // Order matters: binaries must go first due to the FK constraint. - protected function tearDown(): void { - foreach ($this->binaries as $b) { - Factory::getCrackerBinaryFactory()->delete($b); - } - Factory::getCrackerBinaryTypeFactory()->delete($this->type); - $this->binaries = []; - } - // Helper: saves a CrackerBinary with the given version under the shared type - // and registers it for cleanup so tearDown always removes it. + // and registers it for automatic cleanup via TestBase. private function addBinary(string $version): CrackerBinary { - $b = Factory::getCrackerBinaryFactory()->save( + return $this->createDatabaseObject( + Factory::getCrackerBinaryFactory(), new CrackerBinary(null, $this->type->getId(), $version, 'http://example.com', 'testcracker') ); - $this->binaries[] = $b; - return $b; } // Verifies that getNewestVersion() throws HTException when no CrackerBinary diff --git a/ci/phpunit/utils/CrackerUtilsTest.php b/ci/phpunit/inc/utils/CrackerUtilsTest.php similarity index 80% rename from ci/phpunit/utils/CrackerUtilsTest.php rename to ci/phpunit/inc/utils/CrackerUtilsTest.php index 6ea2b8ef5..9f8fca5f4 100644 --- a/ci/phpunit/utils/CrackerUtilsTest.php +++ b/ci/phpunit/inc/utils/CrackerUtilsTest.php @@ -9,16 +9,17 @@ use Hashtopolis\inc\apiv2\error\HttpError; use Hashtopolis\inc\HTException; use Hashtopolis\inc\utils\CrackerUtils; -use PHPUnit\Framework\TestCase; +use Hashtopolis\TestBase; -require_once dirname(__FILE__) . '/../../../src/inc/startup/include.php'; +require_once(dirname(__FILE__) . '/../../TestBase.php'); +require_once(dirname(__FILE__) . '/../../../../src/inc/startup/include.php'); /** * Unit tests for CrackerUtils. * setUp creates a CrackerBinaryType and one CrackerBinary to use as fixtures. - * tearDown removes them so the database is left clean after every test. + * TestBase::tearDown() cleans them up in reverse registration order (binary before type). */ -final class CrackerUtilsTest extends TestCase { +final class CrackerUtilsTest extends TestBase { private ?CrackerBinaryType $type = null; private ?CrackerBinary $binary = null; @@ -27,20 +28,17 @@ final class CrackerUtilsTest extends TestCase { // These records provide valid IDs for the "happy path" tests and a known // duplicate name for the conflict test. protected function setUp(): void { - $this->type = Factory::getCrackerBinaryTypeFactory()->save( + parent::setUp(); + $this->type = $this->createDatabaseObject( + Factory::getCrackerBinaryTypeFactory(), new CrackerBinaryType(null, 'test-crackerutils-type', 1) ); - $this->binary = Factory::getCrackerBinaryFactory()->save( + $this->binary = $this->createDatabaseObject( + Factory::getCrackerBinaryFactory(), new CrackerBinary(null, $this->type->getId(), '1.0.0', 'http://example.com', 'testcracker') ); } - // Removes the binary first (FK), then the type so no constraint violations occur. - protected function tearDown(): void { - if ($this->binary) { Factory::getCrackerBinaryFactory()->delete($this->binary); } - if ($this->type) { Factory::getCrackerBinaryTypeFactory()->delete($this->type); } - } - // Verifies that getBinary() throws HTException when the ID does not match // any row — the caller must handle the "binary not found" case. public function testGetBinary_InvalidId_ThrowsHTException(): void { @@ -91,11 +89,10 @@ public function testCreateBinary_EmptyVersion_ThrowsHttpError(): void { } // Verifies the full happy path: createBinary() creates and returns a new - // CrackerBinary when all fields are valid. The binary is deleted immediately - // after the assertion so it does not interfere with tearDown. + // CrackerBinary when all fields are valid. public function testCreateBinary_ValidInput_CreatesBinary(): void { $b = CrackerUtils::createBinary('9.9.9', 'newcracker', 'http://example.com/dl', $this->type->getId()); + $this->registerDatabaseObject(Factory::getCrackerBinaryFactory(), $b); $this->assertSame('9.9.9', $b->getVersion()); - Factory::getCrackerBinaryFactory()->delete($b); } } From 40fe5605f8e9f6c6dfac7e9d2d7f51ef51ace2fc Mon Sep 17 00:00:00 2001 From: s3inlc Date: Fri, 22 May 2026 15:02:26 +0200 Subject: [PATCH 594/691] testing name construction function --- ci/phpunit/dba/AggregationTest.php | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/ci/phpunit/dba/AggregationTest.php b/ci/phpunit/dba/AggregationTest.php index dedf79911..67bbcb6e2 100644 --- a/ci/phpunit/dba/AggregationTest.php +++ b/ci/phpunit/dba/AggregationTest.php @@ -149,4 +149,12 @@ public function testAggregationTableMapping(): void { $query = $aggregation->getQueryString(Factory::getUserFactory(), true); $this->assertEquals("COUNT(htp_User.username) AS count_username", $query); } + + /** + * Test that the name is correctly constructed and all is lowercase. + */ + public function testAggregationGetName(): void { + $aggregation = new Aggregation(User::IS_COMPUTED_PASSWORD, Aggregation::COUNT); + $this->assertEquals("count_iscomputedpassword", $aggregation->getName()); + } } \ No newline at end of file From 9db442424994e17c4f5309a0755639d8d29b66fc Mon Sep 17 00:00:00 2001 From: andreas Date: Fri, 22 May 2026 15:02:46 +0200 Subject: [PATCH 595/691] 2120 Cleaned up --- ci/phpunit/inc/utils/AccountUtilsTest.php | 5 ----- 1 file changed, 5 deletions(-) diff --git a/ci/phpunit/inc/utils/AccountUtilsTest.php b/ci/phpunit/inc/utils/AccountUtilsTest.php index fc658a44d..2f9790dbb 100644 --- a/ci/phpunit/inc/utils/AccountUtilsTest.php +++ b/ci/phpunit/inc/utils/AccountUtilsTest.php @@ -193,11 +193,6 @@ public function testChangePasswordUpdatesPersistedPasswordData(): void { $this->assertSame(0, $reloadedUser->getIsComputedPassword()); } - - - - - private function assertCheckOTPKeepsYubikeyEnabledForValidSlot(int $validSlot): void { $user = $this->createUser('valid_yubikey_user_' . $validSlot); $user->setYubikey(1); From 4122eb6f1864058f819f0c5c0fc3657a689fbf3d Mon Sep 17 00:00:00 2001 From: andreas Date: Fri, 22 May 2026 15:35:33 +0200 Subject: [PATCH 596/691] Fixed phpstan complaints, added php unit cache file to ignore --- .gitignore | 33 +------------------ .phpunit.result.cache | 1 - .../inc/utils/CrackerBinaryUtilsTest.php | 5 +-- ci/phpunit/inc/utils/CrackerUtilsTest.php | 5 +-- 4 files changed, 7 insertions(+), 37 deletions(-) delete mode 100644 .phpunit.result.cache diff --git a/.gitignore b/.gitignore index 3efd096c0..165765a1f 100755 --- a/.gitignore +++ b/.gitignore @@ -1,32 +1 @@ -/.buildpath -/.project -/.settings/ -query.log -.idea/ -*.iml -src/files/* -!src/files/.htaccess -/ci/db-backups/ -.vs/ -*.phpproj -*.sln -*.phpproj.user -*.lock* - -# the public keys for oauth -jwks.json - -# dynamically created by installer -src/install/.htaccess - -# for docker stuff -.env - -# for composer stuff -vendor - -# For python cache files -__pycache__ -.pytest_cache - -site/ +.phpunit.result.cache diff --git a/.phpunit.result.cache b/.phpunit.result.cache deleted file mode 100644 index 540f4a3a5..000000000 --- a/.phpunit.result.cache +++ /dev/null @@ -1 +0,0 @@ -{"version":2,"defects":{"Hashtopolis\\dba\\AbstractModelFactoryTest::testColumnFilter":8,"Hashtopolis\\dba\\AbstractModelFactoryTest::testTimeseriesFilterNoneCracked":8,"Hashtopolis\\dba\\AbstractModelFactoryTest::testTimeseriesFilter":8,"Tests\\Utils\\ConfigUtilsTest::testGet_KnownItem_ReturnsConfig":8,"Tests\\Utils\\ConfigUtilsTest::testGet_UnknownItem_ThrowsHTException":8,"Tests\\Utils\\ConfigUtilsTest::testUpdateSingleConfig_MissingValue_ThrowsHTException":8,"Tests\\Utils\\ConfigUtilsTest::testUpdateSingleConfig_SameValue_ReturnsEarlyWithoutException":5,"Tests\\Utils\\ConfigUtilsTest::testUpdateSingleConfig_InvalidId_ThrowsHTException":8},"times":{"Hashtopolis\\dba\\AbstractModelFactoryTest::testGetDBWithTest":0.003,"Hashtopolis\\dba\\AbstractModelFactoryTest::testGetMappedModelTableWithoutMapping":0,"Hashtopolis\\dba\\AbstractModelFactoryTest::testGetMappedModelTableWithMapping":0,"Hashtopolis\\dba\\AbstractModelFactoryTest::testGetMappedModelKeysWithoutRemapping":0,"Hashtopolis\\dba\\AbstractModelFactoryTest::testGetMappedModelKeysWithRemapping":0,"Hashtopolis\\dba\\AbstractModelFactoryTest::testGetMappedModelKeyWithoutRemapping":0,"Hashtopolis\\dba\\AbstractModelFactoryTest::testGetMappedModelKeyWithRemapping":0,"Hashtopolis\\dba\\AbstractModelFactoryTest::testSaveModelSuccessStaticId":0.012,"Hashtopolis\\dba\\AbstractModelFactoryTest::testSaveModelSuccessNoId":0.01,"Hashtopolis\\dba\\AbstractModelFactoryTest::testUpdateModelSuccessNoChanges":0.008,"Hashtopolis\\dba\\AbstractModelFactoryTest::testUpdateModelSuccessSingleChange":0.01,"Hashtopolis\\dba\\AbstractModelFactoryTest::testUpdateModelSuccessSingleChangeOnMappedColumn":0.044,"Hashtopolis\\dba\\AbstractModelFactoryTest::testUpdateModelSuccessMultipleChanges":0.009,"Hashtopolis\\dba\\AbstractModelFactoryTest::testSimpleFilter":0.001,"Hashtopolis\\dba\\AbstractModelFactoryTest::testColumnFilter":0.004,"Hashtopolis\\dba\\AbstractModelFactoryTest::testTimeseriesFilterEmpty":0.001,"Hashtopolis\\dba\\AbstractModelFactoryTest::testTimeseriesFilterNoneCracked":0.002,"Hashtopolis\\dba\\AbstractModelFactoryTest::testTimeseriesFilter":0.002,"Hashtopolis\\inc\\UtilTest::testIsMailConfiguredReturnsFalseWithoutSsmtpConfig":0.001,"Hashtopolis\\inc\\UtilTest::testIsMailConfiguredReturnsTrueWithSsmtpConfig":0,"Hashtopolis\\inc\\UtilTest::testSendMailReturnsFalseWhenMailIsNotConfigured":0,"Hashtopolis\\inc\\apiv2\\util\\CorsHackMiddlewareTest::testValidLocalhostVariations":0.003,"Hashtopolis\\inc\\apiv2\\util\\CorsHackMiddlewareTest::testInvalidLocalhostPort":0,"Hashtopolis\\inc\\apiv2\\util\\CorsHackMiddlewareTest::testEvilDomainForLocalhost":0,"Hashtopolis\\inc\\apiv2\\util\\CorsHackMiddlewareTest::testEvilIPForLocalhost":0,"Hashtopolis\\inc\\apiv2\\util\\CorsHackMiddlewareTest::testInvalidDomainPort":0,"Hashtopolis\\inc\\apiv2\\util\\CorsHackMiddlewareTest::testValidDomainWithoutPort":0,"Hashtopolis\\inc\\apiv2\\util\\CorsHackMiddlewareTest::testValidHttpsDomainWithoutPort":0,"Hashtopolis\\inc\\apiv2\\util\\CorsHackMiddlewareTest::testValidHttpsDomainWithPortWithHttpConfig":0,"Hashtopolis\\inc\\apiv2\\util\\CorsHackMiddlewareTest::testValidDomainWithoutDifferentFrontendPort":0.001,"Hashtopolis\\inc\\notifications\\HashtopolisNotificationEmailTest::testSendMessageDoesNotCallSendMailWhenMailIsNotConfigured":0.001,"Hashtopolis\\inc\\notifications\\HashtopolisNotificationEmailTest::testSendMessageCallsSendMailWhenMailIsConfigured":0.002,"Hashtopolis\\inc\\notifications\\HashtopolisNotificationEmailTest::testSendMessageThrowsWhenConfiguredSendMailFails":0,"Hashtopolis\\inc\\utils\\AccessControlTest::testGetInstanceWithoutArgsReusesSameObject":0.001,"Hashtopolis\\inc\\utils\\AccessControlTest::testGetInstanceWithGroupIdOverwritesInstance":0.001,"Hashtopolis\\inc\\utils\\AccessControlTest::testGetInstanceWithUserOverwritesInstance":0.001,"Hashtopolis\\inc\\utils\\AccessControlTest::testReloadReloadsTheRightsGroupForUser":0.02,"Hashtopolis\\inc\\utils\\AccessControlTest::testReloadDoesNotReloadTheRightsGroupWithoutUser":0.011,"Hashtopolis\\inc\\utils\\AccessControlTest::testPermissionPublicAccessAlwaysPermit":0,"Hashtopolis\\inc\\utils\\AccessControlTest::testPermissionLoginWithLoggedInUserPermit":0,"Hashtopolis\\inc\\utils\\AccessControlTest::testPermissionLoginWithoutLoggedInUserDenies":0,"Hashtopolis\\inc\\utils\\AccessControlTest::testUninitializedAccessControlDenies":0,"Hashtopolis\\inc\\utils\\AccessControlTest::testRegularUserWithPermissionPermits":0.014,"Hashtopolis\\inc\\utils\\AccessControlTest::testRegularUserWithoutPermissionDenies":0.014,"Hashtopolis\\inc\\utils\\AccessControlTest::testALLUserPermissionPermitsAllPermissions":0.001,"Hashtopolis\\inc\\utils\\AccessControlTest::testGivenByDependencyImplied":0.006,"Hashtopolis\\inc\\utils\\AccessControlTest::testGivenByDependencyDirect":0.01,"Hashtopolis\\inc\\utils\\AccessControlUtilsTest::testGetMembersOfGroupReturnsOnlyMembersOfGroup":0.032,"Hashtopolis\\inc\\utils\\AccessControlUtilsTest::testThatAdminGroupPermissionCanNotBeAltered":0.008,"Hashtopolis\\inc\\utils\\AccessControlUtilsTest::testAddPermissionsToNonExistentGroup":0.01,"Hashtopolis\\inc\\utils\\AccessControlUtilsTest::testGetGroupLoadsExistingGroup":0.007,"Hashtopolis\\inc\\utils\\AccessControlUtilsTest::testGetGroupThrowsForNonExistentGroup":0.007,"Hashtopolis\\inc\\utils\\AccessControlUtilsTest::testAddToPermissionThrowsOnNonExistentGroup":0.007,"Hashtopolis\\inc\\utils\\AccessControlUtilsTest::testAddPermissionToGroup":0.009,"Hashtopolis\\inc\\utils\\AccessControlUtilsTest::testAddNonExistentPermissionToGroup":0.013,"Hashtopolis\\inc\\utils\\AccessControlUtilsTest::testUpdateNonexistentGroupThrowsException":0.007,"Hashtopolis\\inc\\utils\\AccessControlUtilsTest::testUpdateAdminPermissionsIsNotAllowed":0.007,"Hashtopolis\\inc\\utils\\AccessControlUtilsTest::testUpdatePermission":0.01,"Hashtopolis\\inc\\utils\\AccessControlUtilsTest::testUpdatePermissionIgnoresValidPermissionWithInvalidInteger":0.01,"Hashtopolis\\inc\\utils\\AccessControlUtilsTest::testUpdatePermissionIgnoresInvalidPermissionWithValidInteger":0.009,"Hashtopolis\\inc\\utils\\AccessControlUtilsTest::testUpdatePermissionAppliesDependencyOverride":0.016,"Hashtopolis\\inc\\utils\\AccessControlUtilsTest::testCreateGroupThrowsForEmptyName":0.007,"Hashtopolis\\inc\\utils\\AccessControlUtilsTest::testCreateGroupThrowsForNameLongerThanMaxLength":0.006,"Hashtopolis\\inc\\utils\\AccessControlUtilsTest::testCreateGroupAllowsNameAtMaxLength":0.015,"Hashtopolis\\inc\\utils\\AccessControlUtilsTest::testCreateGroupThrowsForExistingGroupName":0.009,"Hashtopolis\\inc\\utils\\AccessControlUtilsTest::testDeleteGroupThrowsForNonExistentGroup":0.007,"Hashtopolis\\inc\\utils\\AccessControlUtilsTest::testDeleteGroupThrowsWhenGroupHasUsers":0.017,"Hashtopolis\\inc\\utils\\AccessControlUtilsTest::testDeleteGroupDeletesEmptyGroup":0.009,"Hashtopolis\\inc\\utils\\AccessGroupUtilsTest::testGetUsersReturnsUsersAssignedToRequestedGroup":0.048,"Hashtopolis\\inc\\utils\\AccessGroupUtilsTest::testGetAgentsReturnsAgentsAssignedToRequestedGroup":0.047,"Hashtopolis\\inc\\utils\\AccessGroupUtilsTest::testGetGroupsReturnsAtLeastCreatedGroups":0.059,"Hashtopolis\\inc\\utils\\AccessGroupUtilsTest::testCreateGroupThrowsForEmptyName":0.045,"Hashtopolis\\inc\\utils\\AccessGroupUtilsTest::testCreateGroupThrowsForNameLongerThanMaxLength":0.053,"Hashtopolis\\inc\\utils\\AccessGroupUtilsTest::testCreateGroupThrowsForExistingGroupName":0.044,"Hashtopolis\\inc\\utils\\AccessGroupUtilsTest::testCreateGroupCreatesGroupWithValidUniqueName":0.051,"Hashtopolis\\inc\\utils\\AccessGroupUtilsTest::testRenameThrowsForNonExistentGroup":0.052,"Hashtopolis\\inc\\utils\\AccessGroupUtilsTest::testRenameThrowsForEmptyName":0.067,"Hashtopolis\\inc\\utils\\AccessGroupUtilsTest::testAbortChunksGroupThrowsForNonExistentGroup":0.051,"Hashtopolis\\inc\\utils\\AccessGroupUtilsTest::testAbortChunksGroupOnlyAbortsInitAndRunningChunks":0.169,"Hashtopolis\\inc\\utils\\AccessGroupUtilsTest::testAddAgentAddsAgentToGroup":0.06,"Hashtopolis\\inc\\utils\\AccessGroupUtilsTest::testAddAgentThrowsWhenAgentAlreadyInGroup":0.047,"Hashtopolis\\inc\\utils\\AccessGroupUtilsTest::testAddUserAddsUserToGroup":0.05,"Hashtopolis\\inc\\utils\\AccessGroupUtilsTest::testAddUserThrowsWhenUserAlreadyInGroup":0.05,"Hashtopolis\\inc\\utils\\AccessGroupUtilsTest::testRemoveAgentRemovesAgentFromGroup":0.059,"Hashtopolis\\inc\\utils\\AccessGroupUtilsTest::testRemoveAgentThrowsWhenAgentIsNotInGroup":0.07,"Hashtopolis\\inc\\utils\\AccessGroupUtilsTest::testRemoveUserRemovesUserFromGroup":0.045,"Hashtopolis\\inc\\utils\\AccessGroupUtilsTest::testRemoveUserThrowsWhenUserIsNotInGroup":0.043,"Hashtopolis\\inc\\utils\\AccessGroupUtilsTest::testDeleteGroupThrowsForDefaultGroup":0.045,"Hashtopolis\\inc\\utils\\AccessGroupUtilsTest::testDeleteGroupReassignsDependentEntitiesToDefaultGroup":0.095,"Tests\\Utils\\ChunkUtilsTest::testStaticChunkSize_ReturnsValueDirectly":0.001,"Tests\\Utils\\ChunkUtilsTest::testStaticNumChunks_ReturnsCeilDivision":0,"Tests\\Utils\\ChunkUtilsTest::testStaticChunking_InvalidInput_ThrowsHTException with data set \"CHUNK_SIZE zero\"":0,"Tests\\Utils\\ChunkUtilsTest::testStaticChunking_InvalidInput_ThrowsHTException with data set \"NUM_CHUNKS zero\"":0,"Tests\\Utils\\ChunkUtilsTest::testStaticChunking_InvalidInput_ThrowsHTException with data set \"NUM_CHUNKS too large\"":0,"Tests\\Utils\\ChunkUtilsTest::testStaticChunking_InvalidInput_ThrowsHTException with data set \"unknown mode\"":0,"Tests\\Utils\\ChunkUtilsTest::testOldBenchmark_ZeroValue_ReturnsFullKeyspace":0,"Tests\\Utils\\ChunkUtilsTest::testOldBenchmark_Normal_ReturnsCorrectFormula":0,"Tests\\Utils\\ChunkUtilsTest::testNewBenchmark_ValidFormat_ReturnsCorrectFormula":0,"Tests\\Utils\\ChunkUtilsTest::testNewBenchmark_InvalidInput_ReturnsZero with data set \"zero speed\"":0.007,"Tests\\Utils\\ChunkUtilsTest::testNewBenchmark_InvalidInput_ReturnsZero with data set \"zero time\"":0.001,"Tests\\Utils\\ChunkUtilsTest::testOldBenchmark_NonNumericString_ThrowsTypeError":0,"Tests\\Utils\\ChunkUtilsTest::testSizeClampedToOne_WhenCalculationProducesZero":0.012,"Tests\\Utils\\ChunkUtilsTest::testTolerance_ScalesChunkSizeUp":0,"Tests\\Utils\\ChunkUtilsTest::testZeroChunkTime_FallsBackToSConfigValue":0,"Tests\\Utils\\ChunkUtilsTest::testCreateNewChunk_ReturnsNullWhenKeyspaceExhausted":0.005,"Tests\\Utils\\ConfigUtilsTest::testGet_KnownItem_ReturnsConfig":0.001,"Tests\\Utils\\ConfigUtilsTest::testGet_UnknownItem_ThrowsHTException":0.001,"Tests\\Utils\\ConfigUtilsTest::testUpdateSingleConfig_MissingValue_ThrowsHTException":0.001,"Tests\\Utils\\ConfigUtilsTest::testUpdateSingleConfig_SameValue_ReturnsEarlyWithoutException":0.001,"Tests\\Utils\\ConfigUtilsTest::testUpdateSingleConfig_InvalidId_ThrowsHTException":0.001,"Tests\\Utils\\CrackerBinaryUtilsTest::testGetNewestVersion_NoBinaries_ThrowsHTException":0.006,"Tests\\Utils\\CrackerBinaryUtilsTest::testGetNewestVersion_SingleBinary_ReturnsThatBinary":0.012,"Tests\\Utils\\CrackerBinaryUtilsTest::testGetNewestVersion_MultipleBinaries_ReturnsHighestVersion":0.024,"Tests\\Utils\\CrackerBinaryUtilsTest::testGetNewestVersion_OutOfOrderInsert_StillReturnsHighest":0.023,"Tests\\Utils\\CrackerUtilsTest::testGetBinary_InvalidId_ThrowsHTException":0.007,"Tests\\Utils\\CrackerUtilsTest::testGetBinaryType_InvalidId_ThrowsHTException":0.007,"Tests\\Utils\\CrackerUtilsTest::testGetBinary_ValidId_ReturnsBinary":0.009,"Tests\\Utils\\CrackerUtilsTest::testGetBinaryType_ValidId_ReturnsBinaryType":0.007,"Tests\\Utils\\CrackerUtilsTest::testCreateBinaryType_EmptyName_ThrowsHttpError":0.007,"Tests\\Utils\\CrackerUtilsTest::testCreateBinaryType_DuplicateName_ThrowsHttpConflict":0.008,"Tests\\Utils\\CrackerUtilsTest::testCreateBinary_EmptyVersion_ThrowsHttpError":0.008,"Tests\\Utils\\CrackerUtilsTest::testCreateBinary_ValidInput_CreatesBinary":0.014,"Hashtopolis\\inc\\utils\\UserUtilsTest::testCreateUserDoesNotCallSendMailWhenMailIsNotConfigured":0.202,"Hashtopolis\\inc\\utils\\UserUtilsTest::testCreateUserCallsSendMailWhenMailIsConfigured":0.214,"Hashtopolis\\inc\\utils\\UserUtilsTest::testCreateUserThrowsWhenConfiguredSendMailFails":0.194,"Tests\\Utils\\CrackerBinaryUtilsTest2::testGetNewestVersion_NoBinaries_ThrowsHTException":0.005,"Tests\\Utils\\CrackerBinaryUtilsTest2::testGetNewestVersion_SingleBinary_ReturnsThatBinary":0.009,"Tests\\Utils\\CrackerBinaryUtilsTest2::testGetNewestVersion_MultipleBinaries_ReturnsHighestVersion":0.024,"Tests\\Utils\\CrackerBinaryUtilsTest2::testGetNewestVersion_OutOfOrderInsert_StillReturnsHighest":0.023}} \ No newline at end of file diff --git a/ci/phpunit/inc/utils/CrackerBinaryUtilsTest.php b/ci/phpunit/inc/utils/CrackerBinaryUtilsTest.php index 05e031b5a..fc7dae9a3 100644 --- a/ci/phpunit/inc/utils/CrackerBinaryUtilsTest.php +++ b/ci/phpunit/inc/utils/CrackerBinaryUtilsTest.php @@ -2,6 +2,7 @@ namespace Tests\Utils; +use Hashtopolis\dba\AbstractModel; use Hashtopolis\dba\Factory; use Hashtopolis\dba\models\CrackerBinary; use Hashtopolis\dba\models\CrackerBinaryType; @@ -20,7 +21,7 @@ */ final class CrackerBinaryUtilsTest extends TestBase { - private ?CrackerBinaryType $type = null; + private ?AbstractModel $type = null; protected function setUp(): void { parent::setUp(); @@ -32,7 +33,7 @@ protected function setUp(): void { // Helper: saves a CrackerBinary with the given version under the shared type // and registers it for automatic cleanup via TestBase. - private function addBinary(string $version): CrackerBinary { + private function addBinary(string $version): AbstractModel { return $this->createDatabaseObject( Factory::getCrackerBinaryFactory(), new CrackerBinary(null, $this->type->getId(), $version, 'http://example.com', 'testcracker') diff --git a/ci/phpunit/inc/utils/CrackerUtilsTest.php b/ci/phpunit/inc/utils/CrackerUtilsTest.php index 9f8fca5f4..f1185bb33 100644 --- a/ci/phpunit/inc/utils/CrackerUtilsTest.php +++ b/ci/phpunit/inc/utils/CrackerUtilsTest.php @@ -2,6 +2,7 @@ namespace Tests\Utils; +use Hashtopolis\dba\AbstractModel; use Hashtopolis\dba\Factory; use Hashtopolis\dba\models\CrackerBinary; use Hashtopolis\dba\models\CrackerBinaryType; @@ -21,8 +22,8 @@ */ final class CrackerUtilsTest extends TestBase { - private ?CrackerBinaryType $type = null; - private ?CrackerBinary $binary = null; + private ?AbstractModel $type = null; + private ?AbstractModel $binary = null; // Creates a CrackerBinaryType and one CrackerBinary before each test. // These records provide valid IDs for the "happy path" tests and a known From 7cd9c5a66b0da62fcd7ffb0b87562441f9599903 Mon Sep 17 00:00:00 2001 From: Eric Wasson <229096365+Eric-Wasson@users.noreply.github.com> Date: Fri, 22 May 2026 15:38:48 +0200 Subject: [PATCH 597/691] added some TaskUtil tests --- ci/phpunit/inc/utils/TaskUtilsTest.php | 339 +++++++++++++++++++++++++ 1 file changed, 339 insertions(+) create mode 100644 ci/phpunit/inc/utils/TaskUtilsTest.php diff --git a/ci/phpunit/inc/utils/TaskUtilsTest.php b/ci/phpunit/inc/utils/TaskUtilsTest.php new file mode 100644 index 000000000..91157f8ef --- /dev/null +++ b/ci/phpunit/inc/utils/TaskUtilsTest.php @@ -0,0 +1,339 @@ +rightGroup1 = $this->createRightGroup(); + + $this->user1 = $this->createUser(); + $this->user1->setRightGroupId($this->rightGroup1->getId()); + + $this->accessGroup1 = $this->createAccessGroup("1_"); + + $this->hashlist1 = $this->createHashlist($this->accessGroup1->getId()); + + $this->taskWrapper1 = $this->createTaskWrapper(99999, 0, 0, DTaskTypes::NORMAL, $this->hashlist1->getId()); + $this->taskWrapper1->setHashlistId($this->hashlist1->getId()); + $this->taskWrapper1->setAccessGroupId($this->accessGroup1->getId()); + + $this->taskWrapper2 = $this->createTaskWrapper(99998, 0, 0, DTaskTypes::NORMAL, $this->hashlist1->getId()); + $this->taskWrapper2->setHashlistId($this->hashlist1->getId()); + $this->taskWrapper2->setAccessGroupId($this->accessGroup1->getId()); + + $this->taskWrapper3 = $this->createTaskWrapper(99997, 0, 0, DTaskTypes::NORMAL, $this->hashlist1->getId()); + $this->taskWrapper3->setHashlistId($this->hashlist1->getId()); + $this->taskWrapper3->setAccessGroupId($this->accessGroup1->getId()); + + $this->task1 = $this->createTask(99999, 'phpunit-' . uniqid(), '', 600, 5, 1000, 0, 0, 0, '', 0, 0, 1, 0, 1, 1, $this->taskWrapper1->getId()); + $this->task1->setTaskWrapperId($this->taskWrapper1->getId()); + + $this->task2 = $this->createTask(99998, 'phpunit-' . uniqid(), '', 600, 5, 1000, 0, 0, 0, '', 0, 0, 1, 0, 1, 1, $this->taskWrapper1->getId()); + $this->task2->setTaskWrapperId($this->taskWrapper1->getId()); + + $this->task3 = $this->createTask(99997, 'phpunit-' . uniqid(), '', 600, 5, 1000, 0, 0, 0, '', 0, 0, 1, 0, 1, 1, $this->taskWrapper3->getId()); + $this->task3->setTaskWrapperId($this->taskWrapper3->getId()); + } + + /** + * Test editing the notes of a task. + * + * @return void + * @throws Exception + */ + public function testEditNotes(): void { + TaskUtils::editNotes($this->task1->getId(), 'task note', $this->user1); + + $taskUpdated = Factory::getTaskFactory()->get($this->task1->getId()); + $this->assertEquals('task note', $taskUpdated->getNotes()); + } + + /** + * Test the status calculation of a task. + * + * @return void + * @throws Exception + */ + public function testGetStatus(): void { + $this->assertEquals(3, TaskUtils::getStatus([], 100, 100)); + $this->assertEquals(3, TaskUtils::getStatus([], 100, 101)); + + //TODO test status 1 (running) and 2 (idle) too + } + + /** + * Test the deletion of archived tasks. + * + * @return void + * @throws Exception + */ + /*public function testDeleteArchived(): void { + $this->task1->setIsArchived(1); + + //TODO filter for specific user too on $numberOfArchivedTasks and $numberOfArchivedTasksUpdated + $numberOfArchivedTasks = Factory::getTaskFactory()->filter(['isArchived' => true, ]); + + TaskUtil::deleteArchived($this->user1); + $numberOfArchivedTasksUpdated = Factory::getTaskFactory()->filter(['isArchived' => true, ]); + + $this->assertEquals(0, $numberOfArchivedTasksUpdated); + $this->assertNotEquals($numberOfArchivedTasks, $numberOfArchivedTasksUpdated); + }*/ + + /** + * Test changing the attack command. + * + * @return void + * @throws Exception + */ + public function testChangeAttackCmd(): void { + TaskUtils::changeAttackCmd($this->task1->getId(), '#HL# custom attack cmd', $this->user1); + + $taskUpdated = Factory::getTaskFactory()->get($this->task1->getId()); + $this->assertEquals('#HL# custom attack cmd', $taskUpdated->getAttackCmd()); + } + + /** + * Test archiving a supertask. + * + * @return void + * @throws Exception + */ + /*public function testArchiveSupertask(): void { + $supertask; + $supertaskWrapper; + $user; + + TaskUtils::archiveSupertask($supertask->getId(), $user); + + //TODO filter all task wrappers with the id of the $supertaskWrapper (using taskfactory?) and check if they're archived + + $supertaskWrapperUpdated = Factory::getTaskWrapperFactory()->get($supertaskWrapper); + $this->assertEquals(1, $supertaskWrapperUpdated->getIsArchived()); + }*/ + + /** + * Test archiving a task. + * + * @return void + * @throws Exception + */ + public function testArchiveTask(): void { + TaskUtils::archiveTask($this->task1->getId(), $this->user1); + + $taskWrapperUpdated = TaskUtils::getTaskWrapper($this->task1->getTaskWrapperId(), $this->user1); + $this->assertEquals(1, $taskWrapperUpdated->getIsArchived()); + + $taskUpdated = Factory::getTaskFactory()->get($this->task1->getId()); + $this->assertEquals(1, $taskUpdated->getIsArchived()); + } + + /** + * Test toggle of archiving a normal task and a supertask. + * + * @return void + * @throws Exception + */ + /*public function testToggleArchiveTask(): void { + $task; + $taskTaskWrapper; + $supertask; + $supertaskWrapper; + $user; + + //Archive task + TaskUtils::toggleArchiveTask($task->getId(), 1, $user); + + $taskWrapperUpdated = TaskUtils::getTaskWrapper($task->getTaskWrapperId(), $user); + $this->assertEquals(1, $taskWrapperUpdated->getIsArchived()); + + $taskUpdated = Factory::getTaskFactory()->get($task->getId()); + $this->assertEquals(1, $taskUpdated->getIsArchived()); + + + //Un-archive task again + TaskUtils::toggleArchiveTask($task->getId(), 0, $user); + + $taskWrapperUpdated = TaskUtils::getTaskWrapper($task->getTaskWrapperId(), $user); + $this->assertEquals(0, $taskWrapperUpdated->getIsArchived()); + + $taskUpdated = Factory::getTaskFactory()->get($task->getId()); + $this->assertEquals(0, $taskUpdated->getIsArchived()); + + + //Archive supertask + TaskUtils::toggleArchiveTask($supertask->getId(), 1, $user); + + //TODO filter all task wrappers with the id of the $supertaskWrapper (using taskfactory?) and check if they're archived + + $supertaskWrapperUpdated = Factory::getTaskWrapperFactory()->get($supertaskWrapper); + $this->assertEquals(1, $supertaskWrapperUpdated->getIsArchived()); + + + //Un-archive supertask again + TaskUtils::toggleArchiveTask($supertask->getId(), 0, $user); + + //TODO filter all task wrappers with the id of the $supertaskWrapper (using taskfactory?) and check if they're archived + + $supertaskWrapperUpdated = Factory::getTaskWrapperFactory()->get($supertaskWrapper); + $this->assertEquals(0, $supertaskWrapperUpdated->getIsArchived()); + }*/ + + /** + * Test renaming a running supertask. + * + * @return void + * @throws Exception + */ + /*public function testRenameSupertask(): void { + $supertask; + $supertaskWrapper; + $user; + + TaskUtils::renameSupertask($supertaskWrapper->getId(), 'custom new supertask name', $user); + + $supertaskWrapperUpdated = TaskUtils::getTaskWrapper($supertaskWrapper->getId(), $user); + $this->assertEquals('custom new supertask name', $supertaskWrapperUpdated->getTaskWrapperName()); + }*/ + + + /** + * Test getting the task of wrapper. + * + * @return void + * @throws Exception + */ + public function testGetTaskOfWrapper(): void { + $this->assertEquals($this->task3->getId(), TaskUtils::getTaskOfWrapper($this->taskWrapper3->getId())->getId()); + } + + /** + * Test getting tasks of wrapper. + * + * @return void + * @throws Exception + */ + public function testGetTasksOfWrapper(): void { + $this->assertEquals(2, count(TaskUtils::getTasksOfWrapper($this->taskWrapper1->getId()))); + } + + /** + * Test getting task wrappers for a user. + * + * @return void + * @throws Exception + */ + public function testGetTaskWrappersForUser(): void { + $this->assertEquals(3, count(TaskUtils::getTaskWrappersForUser($this->user1))); + } + + + /** + * Test setting the CPU only flag for a task. + * + * @return void + * @throws Exception + */ + public function testSetCpuTask(): void { + //Set to CPU-only + TaskUtils::setCpuTask($this->task1->getId(), 1, $this->user1); + $taskUpdated = Factory::getTaskFactory()->get($this->task1->getId()); + $this->assertEquals(1, $taskUpdated->getIsCpuTask()); + + //Set to use GPU and CPU + TaskUtils::setCpuTask($this->task1->getId(), 0, $this->user1); + $taskUpdated = Factory::getTaskFactory()->get($this->task1->getId()); + $this->assertEquals(0, $taskUpdated->getIsCpuTask()); + } + + + + + + + + + + + + //TODO write more functions for creating test data like task wrappers, chunks, ... + //TODO use createObjectFromDict like functionality to create test data for more flexibility? + + public function createTask($taskId = 99999, $taskName = 'phpunit-task1', $attackCmd = '', $chunkTime = 600, $statusTimer = 5, $keyspace = 1000, $keyspaceProgress = 0, $priority = 0, $maxAgents = 0, $color = '', $isSmall = 0, $isCpuTask = 0, $useNewBench = 1, $skipKeyspace = 0, $crackerBinaryId = 1, $crackerBinaryTypeId = 1, $taskWrapperId = 999, $isArchived = 0, $notes = '', $staticChunks = 0, $chunkSize = 0, $forcePipe = 0, $usePreprocessor = 1, $preprocessorCommand = ''): Task { + $task = $this->createDatabaseObject(Factory::getTaskFactory(), new Task($taskId, $taskName, $attackCmd, $chunkTime, $statusTimer, $keyspace, $keyspaceProgress, $priority, $maxAgents, $color, $isSmall, $isCpuTask, $useNewBench, $skipKeyspace, $crackerBinaryId, $crackerBinaryTypeId, $taskWrapperId, $isArchived, $notes, $staticChunks, $chunkSize, $forcePipe, $usePreprocessor, $preprocessorCommand)); + $this->assertTrue($task instanceof Task); + return $task; + } + + public function createTaskWrapper($taskWrapperId = 99999, $priority = 0, $maxAgents = 0, $taskType = DTaskTypes::NORMAL, $hashlistId = 1, $accessGroupId = 1, $taskWrapperName = 'phpunit-taskwrapper1', $isArchived = 0, $cracked = 0): TaskWrapper { + $taskWrapper = $this->createDatabaseObject(Factory::getTaskWrapperFactory(), new TaskWrapper($taskWrapperId, $priority, $maxAgents, $taskType, $hashlistId, $accessGroupId, $taskWrapperName, $isArchived, $cracked)); + $this->assertTrue($taskWrapper instanceof TaskWrapper); + return $taskWrapper; + } + + //TODO make use of the hashlist-create function that will be in the HashlistUtilsTest + public function createHashlist($accessGroupId): Hashlist { + $hashlist = $this->createDatabaseObject(Factory::getHashlistFactory(), new Hashlist(null, 'phpunit-' . uniqid(), DHashlistFormat::PLAIN, 0, 1, '', 0, 0, 0, 0, $accessGroupId, '', 0, 0, 0)); + $this->assertTrue($hashlist instanceof Hashlist); + return $hashlist; + } + + //TODO make use of the user-create function that will be in the UserUtilsTest + public function createUser(): User { + $user = UserUtils::createUser('phpunit-' . uniqid(), 'phpunit-' . uniqid() . '@example.com', 1, UserUtils::getUser(1)); + $this->assertTrue($user instanceof User); + return $user; + } + + //TODO make use of the create function that will be in the AccessGroupUtilsTest + public function createAccessGroup(string $prefix): AccessGroup { + $group = $this->createDatabaseObject( + Factory::getAccessGroupFactory(), + new AccessGroup(null, $prefix . '_' . uniqid()) + ); + $this->assertTrue($group instanceof AccessGroup); + return $group; + } + + //TODO make use of the rightgroup-create function that will be in the UserUtilsTest + public function createRightGroup(): RightGroup { + $group = $this->createDatabaseObject(Factory::getRightGroupFactory(), new RightGroup(null, 'phpunit-' . uniqid('', true), '[]')); + $this->assertTrue($group instanceof RightGroup); + return $group; + } +} From 15812584ea2b95e7ca81d6eb15c85081d6af7b6e Mon Sep 17 00:00:00 2001 From: Eric Wasson <229096365+Eric-Wasson@users.noreply.github.com> Date: Fri, 22 May 2026 15:44:59 +0200 Subject: [PATCH 598/691] fixed a phpstan error --- ci/phpunit/inc/utils/TaskUtilsTest.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ci/phpunit/inc/utils/TaskUtilsTest.php b/ci/phpunit/inc/utils/TaskUtilsTest.php index 91157f8ef..f522ea906 100644 --- a/ci/phpunit/inc/utils/TaskUtilsTest.php +++ b/ci/phpunit/inc/utils/TaskUtilsTest.php @@ -16,7 +16,7 @@ use Hashtopolis\inc\defines\DHashlistFormat; use Hashtopolis\inc\defines\DTaskTypes; -use TestBase; +use Hashtopolis\TestBase; //TODO remove: use Hashtopolis\dba\models\RightGroup; From e78a08e077c97503d90bf2695c1bad05ec29b341 Mon Sep 17 00:00:00 2001 From: coiseiw Date: Fri, 22 May 2026 15:49:13 +0200 Subject: [PATCH 599/691] including references and location of tabs for more details --- doc/installation_guidelines/advanced_install.md | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/doc/installation_guidelines/advanced_install.md b/doc/installation_guidelines/advanced_install.md index 6e38d652d..a8bfcca38 100644 --- a/doc/installation_guidelines/advanced_install.md +++ b/doc/installation_guidelines/advanced_install.md @@ -317,7 +317,7 @@ services: #### 4. Configure sender identity in Hashtopolis -In Hashtopolis config, set: +In Hashtopolis Config - Notifications / Sender Settings, set: - emailSender - emailSenderName @@ -327,7 +327,8 @@ These values are used in From headers. #### 5. Restart and test - Restart backend container. -- Trigger a password reset or user creation mail. +- Create a 'New Notification' in your user notification page (see [Notifications page](../user_manual/user-settings.md#notifications) for more details) for example for a 'newTask'. +- Trigger the notification accordingly, e.g. by creating a new task. - If it fails, inspect backend logs and postfix logs. --- From e9430ea363599680adf844193cc15f38bfed645c Mon Sep 17 00:00:00 2001 From: Eric Wasson <229096365+Eric-Wasson@users.noreply.github.com> Date: Fri, 22 May 2026 15:50:15 +0200 Subject: [PATCH 600/691] fixed phpstan mistakes --- ci/phpunit/inc/utils/TaskUtilsTest.php | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/ci/phpunit/inc/utils/TaskUtilsTest.php b/ci/phpunit/inc/utils/TaskUtilsTest.php index f522ea906..1806e5f44 100644 --- a/ci/phpunit/inc/utils/TaskUtilsTest.php +++ b/ci/phpunit/inc/utils/TaskUtilsTest.php @@ -5,6 +5,8 @@ use Hashtopolis\inc\utils\UserUtils; use Hashtopolis\inc\utils\TaskUtils; +use Exception; + use Hashtopolis\dba\Factory; use Hashtopolis\dba\models\Task; use Hashtopolis\dba\models\TaskWrapper; @@ -316,7 +318,7 @@ public function createHashlist($accessGroupId): Hashlist { //TODO make use of the user-create function that will be in the UserUtilsTest public function createUser(): User { $user = UserUtils::createUser('phpunit-' . uniqid(), 'phpunit-' . uniqid() . '@example.com', 1, UserUtils::getUser(1)); - $this->assertTrue($user instanceof User); + $this->registerDatabaseObject(Factory::getUserFactory(), $user); return $user; } From 707ee2ba7861c285f07f9f909cfabef0b2e69940 Mon Sep 17 00:00:00 2001 From: MLdev2026 Date: Fri, 22 May 2026 15:56:23 +0200 Subject: [PATCH 601/691] deleted the underscores --- ci/phpunit/inc/utils/ChunkUtilsTest.php | 24 +++++++++---------- ci/phpunit/inc/utils/ConfigUtilsTest.php | 10 ++++---- .../inc/utils/CrackerBinaryUtilsTest.php | 8 +++---- ci/phpunit/inc/utils/CrackerUtilsTest.php | 16 ++++++------- 4 files changed, 29 insertions(+), 29 deletions(-) diff --git a/ci/phpunit/inc/utils/ChunkUtilsTest.php b/ci/phpunit/inc/utils/ChunkUtilsTest.php index 300778346..946ba2215 100644 --- a/ci/phpunit/inc/utils/ChunkUtilsTest.php +++ b/ci/phpunit/inc/utils/ChunkUtilsTest.php @@ -34,14 +34,14 @@ protected function tearDown(): void { // Verifies that CHUNK_SIZE static mode bypasses all benchmark math and // returns the configured chunk size value directly. - public function testStaticChunkSize_ReturnsValueDirectly(): void { + public function testStaticChunkSizeReturnsValueDirectly(): void { $this->assertSame(25000, ChunkUtils::calculateChunkSize(1000000, '5000:1000', 60, 1.0, DTaskStaticChunking::CHUNK_SIZE, 25000)); } // Verifies that NUM_CHUNKS static mode divides the keyspace evenly and // rounds up (ceil) so no candidates are left out. // Result is cast to int because PHP ceil() returns float. - public function testStaticNumChunks_ReturnsCeilDivision(): void { + public function testStaticNumChunksReturnsCeilDivision(): void { $this->assertSame((int) ceil(1000000 / 3), (int) ChunkUtils::calculateChunkSize(1000000, '5000:1000', 60, 1.0, DTaskStaticChunking::NUM_CHUNKS, 3)); } @@ -50,7 +50,7 @@ public function testStaticNumChunks_ReturnsCeilDivision(): void { // NUM_CHUNKS>10000 (flood protection), and an unknown mode constant. // PHPUnit 12 requires the #[DataProvider] attribute — @dataProvider docblock no longer works. #[DataProvider('staticExceptionCases')] - public function testStaticChunking_InvalidInput_ThrowsHTException(int $mode, int $size): void { + public function testStaticChunkingInvalidInputThrowsHTException(int $mode, int $size): void { $this->expectException(HTException::class); ChunkUtils::calculateChunkSize(1000000, '5000:1000', 60, 1.0, $mode, $size); } @@ -66,27 +66,27 @@ public static function staticExceptionCases(): array { // Verifies the old benchmark special case: benchmark=0 means the agent // reported no speed, so the entire keyspace is returned as one chunk. - public function testOldBenchmark_ZeroValue_ReturnsFullKeyspace(): void { + public function testOldBenchmarkZeroValueReturnsFullKeyspace(): void { $this->assertSame(500, ChunkUtils::calculateChunkSize(500, '0', 60)); } // Verifies the old benchmark formula: floor(keyspace * benchmark * chunkTime / 100). // Result is cast to int because PHP floor() returns float. - public function testOldBenchmark_Normal_ReturnsCorrectFormula(): void { + public function testOldBenchmarkNormalReturnsCorrectFormula(): void { $this->assertSame((int) floor(1000000 * 50 * 60 / 100), (int) ChunkUtils::calculateChunkSize(1000000, '50', 60)); } // Verifies the new benchmark formula using "speed:time" format. // factor = chunkTime / time * 1000, size = floor(factor * speed). // Result is cast to int because PHP floor() returns float. - public function testNewBenchmark_ValidFormat_ReturnsCorrectFormula(): void { + public function testNewBenchmarkValidFormatReturnsCorrectFormula(): void { $this->assertSame((int) floor(30.0 * 5000000), (int) ChunkUtils::calculateChunkSize(999999999, '5000000:1000', 30)); } // Verifies that new-format benchmarks with zero speed or zero time return 0 // instead of crashing — the guard in calculateChunkSize() catches both. #[DataProvider('invalidBenchmarkCases')] - public function testNewBenchmark_InvalidInput_ReturnsZero(string $benchmark): void { + public function testNewBenchmarkInvalidInputReturnsZero(string $benchmark): void { $this->assertSame(0, ChunkUtils::calculateChunkSize(1000000, $benchmark, 60)); } @@ -99,7 +99,7 @@ public static function invalidBenchmarkCases(): array { // Verifies that a benchmark string with no colon routes to the old-benchmark // path and PHP 8 throws TypeError on arithmetic with a non-numeric string. - public function testOldBenchmark_NonNumericString_ThrowsTypeError(): void { + public function testOldBenchmarkNonNumericStringThrowsTypeError(): void { $this->expectException(\TypeError::class); ChunkUtils::calculateChunkSize(1000000, 'invalid', 60); } @@ -108,7 +108,7 @@ public function testOldBenchmark_NonNumericString_ThrowsTypeError(): void { // is clamped to 1 so dispatching never stalls on an infinite zero-size loop. // $QUERY must be set because the clamp path calls Util::createLogEntry which // reads $QUERY['token'] as a non-null TEXT value for the log entry. - public function testSizeClampedToOne_WhenCalculationProducesZero(): void { + public function testSizeClampedToOneWhenCalculationProducesZero(): void { $GLOBALS['QUERY'] = ['token' => 'test']; $this->assertSame(1, (int) ChunkUtils::calculateChunkSize(1000000, '1:999999999', 1)); } @@ -116,7 +116,7 @@ public function testSizeClampedToOne_WhenCalculationProducesZero(): void { // Verifies that the tolerance multiplier correctly scales the chunk size up. // Both sides are cast to int because float arithmetic (30000000.0 * 1.1) // produces 33000000.000000004 due to IEEE 754 precision — int cast aligns them. - public function testTolerance_ScalesChunkSizeUp(): void { + public function testToleranceScalesChunkSizeUp(): void { $base = (int) ChunkUtils::calculateChunkSize(1000000, '50', 60, 1.0); $this->assertSame((int) ($base * 1.1), (int) ChunkUtils::calculateChunkSize(1000000, '50', 60, 1.1)); } @@ -124,7 +124,7 @@ public function testTolerance_ScalesChunkSizeUp(): void { // Verifies that chunkTime=0 triggers the SConfig fallback: the server-wide // CHUNK_DURATION value is used instead of the per-task setting. // Result is cast to int because PHP floor() returns float. - public function testZeroChunkTime_FallsBackToSConfigValue(): void { + public function testZeroChunkTimeFallsBackToSConfigValue(): void { $this->mockSConfig([DConfig::CHUNK_DURATION => 120]); $this->assertSame((int) floor(1000000 * 50 * 120 / 100), (int) ChunkUtils::calculateChunkSize(1000000, '50', 0)); } @@ -133,7 +133,7 @@ public function testZeroChunkTime_FallsBackToSConfigValue(): void { // consumed (keyspace == keyspaceProgress). A mocked Task is used so no DB // records are needed; the mock returns getKeyspace()=1000 and // getKeyspaceProgress()=1000, making remaining=0 and triggering the null path. - public function testCreateNewChunk_ReturnsNullWhenKeyspaceExhausted(): void { + public function testCreateNewChunkReturnsNullWhenKeyspaceExhausted(): void { $this->mockSConfig([DConfig::DISP_TOLERANCE => 0, DConfig::CHUNK_DURATION => 600]); $task = $this->createMock(Task::class); $task->method('getSkipKeyspace')->willReturn(0); diff --git a/ci/phpunit/inc/utils/ConfigUtilsTest.php b/ci/phpunit/inc/utils/ConfigUtilsTest.php index ebc0a794b..f71a66416 100644 --- a/ci/phpunit/inc/utils/ConfigUtilsTest.php +++ b/ci/phpunit/inc/utils/ConfigUtilsTest.php @@ -29,21 +29,21 @@ protected function setUp(): void { // Verifies that get() returns the correct Config object when the item exists. // Uses "chunktime" which is always present in the default database. - public function testGet_KnownItem_ReturnsConfig(): void { + public function testGetKnownItemReturnsConfig(): void { $config = ConfigUtils::get('chunktime'); $this->assertSame('chunktime', $config->getItem()); } // Verifies that get() throws HTException when the item does not exist. // Uses a deliberately nonsensical key that will never be in the database. - public function testGet_UnknownItem_ThrowsHTException(): void { + public function testGetUnknownItemThrowsHTException(): void { $this->expectException(HTException::class); ConfigUtils::get('nonexistent_item_xyz_999'); } // Verifies that updateSingleConfig() throws HTException when the attributes // array contains no VALUE key, meaning no new value was provided. - public function testUpdateSingleConfig_MissingValue_ThrowsHTException(): void { + public function testUpdateSingleConfigMissingValueThrowsHTException(): void { $this->expectException(HTException::class); // Empty attributes array — Config::VALUE key is absent, triggering the guard. ConfigUtils::updateSingleConfig($this->existingConfig->getId(), []); @@ -52,7 +52,7 @@ public function testUpdateSingleConfig_MissingValue_ThrowsHTException(): void { // Verifies that updateSingleConfig() returns early without performing any // database write when the provided value is identical to the stored value. // This is the no-op path that avoids unnecessary DB updates. - public function testUpdateSingleConfig_SameValue_ReturnsEarlyWithoutException(): void { + public function testUpdateSingleConfigSameValueReturnsEarlyWithoutException(): void { $this->expectNotToPerformAssertions(); $sameValue = $this->existingConfig->getValue(); // Passing the same value back — the method must detect no change and return. @@ -62,7 +62,7 @@ public function testUpdateSingleConfig_SameValue_ReturnsEarlyWithoutException(): // Verifies that updateSingleConfig() throws HTException when the given ID // does not match any row in the Config table. - public function testUpdateSingleConfig_InvalidId_ThrowsHTException(): void { + public function testUpdateSingleConfigInvalidIdThrowsHTException(): void { $this->expectException(HTException::class); ConfigUtils::updateSingleConfig(99999, [Config::VALUE => 'anything']); } diff --git a/ci/phpunit/inc/utils/CrackerBinaryUtilsTest.php b/ci/phpunit/inc/utils/CrackerBinaryUtilsTest.php index 05e031b5a..90cccf58b 100644 --- a/ci/phpunit/inc/utils/CrackerBinaryUtilsTest.php +++ b/ci/phpunit/inc/utils/CrackerBinaryUtilsTest.php @@ -41,14 +41,14 @@ private function addBinary(string $version): CrackerBinary { // Verifies that getNewestVersion() throws HTException when no CrackerBinary // rows exist for the given type — there is nothing to pick the newest from. - public function testGetNewestVersion_NoBinaries_ThrowsHTException(): void { + public function testGetNewestVersionNoBinariesThrowsHTException(): void { $this->expectException(HTException::class); CrackerBinaryUtils::getNewestVersion($this->type->getId()); } // Verifies that getNewestVersion() returns the only available binary when // exactly one version is registered under the type. - public function testGetNewestVersion_SingleBinary_ReturnsThatBinary(): void { + public function testGetNewestVersionSingleBinaryReturnsThatBinary(): void { $binary = $this->addBinary('1.0.0'); $result = CrackerBinaryUtils::getNewestVersion($this->type->getId()); $this->assertSame($binary->getId(), $result->getId()); @@ -57,7 +57,7 @@ public function testGetNewestVersion_SingleBinary_ReturnsThatBinary(): void { // Verifies that getNewestVersion() correctly picks the highest semantic version // when multiple binaries are registered. The comparison uses Composer\Semver // so "2.5.0" must beat "1.9.9" even though 1.9.9 was added after 2.5.0. - public function testGetNewestVersion_MultipleBinaries_ReturnsHighestVersion(): void { + public function testGetNewestVersionMultipleBinariesReturnsHighestVersion(): void { $this->addBinary('1.0.0'); $newest = $this->addBinary('2.5.0'); $this->addBinary('1.9.9'); @@ -67,7 +67,7 @@ public function testGetNewestVersion_MultipleBinaries_ReturnsHighestVersion(): v // Verifies that getNewestVersion() handles non-sequential insertion order // correctly — the oldest version added last must not be chosen as newest. - public function testGetNewestVersion_OutOfOrderInsert_StillReturnsHighest(): void { + public function testGetNewestVersionOutOfOrderInsertStillReturnsHighest(): void { $newest = $this->addBinary('3.0.0'); $this->addBinary('1.0.0'); $this->addBinary('2.0.0'); diff --git a/ci/phpunit/inc/utils/CrackerUtilsTest.php b/ci/phpunit/inc/utils/CrackerUtilsTest.php index 9f8fca5f4..d55814043 100644 --- a/ci/phpunit/inc/utils/CrackerUtilsTest.php +++ b/ci/phpunit/inc/utils/CrackerUtilsTest.php @@ -41,56 +41,56 @@ protected function setUp(): void { // Verifies that getBinary() throws HTException when the ID does not match // any row — the caller must handle the "binary not found" case. - public function testGetBinary_InvalidId_ThrowsHTException(): void { + public function testGetBinaryInvalidIdThrowsHTException(): void { $this->expectException(HTException::class); CrackerUtils::getBinary(99999); } // Verifies that getBinaryType() throws HTException when the ID does not match // any row — the caller must handle the "type not found" case. - public function testGetBinaryType_InvalidId_ThrowsHTException(): void { + public function testGetBinaryTypeInvalidIdThrowsHTException(): void { $this->expectException(HTException::class); CrackerUtils::getBinaryType(99999); } // Verifies that getBinary() returns the correct CrackerBinary when the ID // matches the record created in setUp. - public function testGetBinary_ValidId_ReturnsBinary(): void { + public function testGetBinaryValidIdReturnsBinary(): void { $result = CrackerUtils::getBinary($this->binary->getId()); $this->assertSame($this->binary->getId(), $result->getId()); } // Verifies that getBinaryType() returns the correct CrackerBinaryType when // the ID matches the record created in setUp. - public function testGetBinaryType_ValidId_ReturnsBinaryType(): void { + public function testGetBinaryTypeValidIdReturnsBinaryType(): void { $result = CrackerUtils::getBinaryType($this->type->getId()); $this->assertSame($this->type->getId(), $result->getId()); } // Verifies that createBinaryType() throws HttpError when an empty string is // passed as the type name — an empty name is not a valid cracker identifier. - public function testCreateBinaryType_EmptyName_ThrowsHttpError(): void { + public function testCreateBinaryTypeEmptyNameThrowsHttpError(): void { $this->expectException(HttpError::class); CrackerUtils::createBinaryType(''); } // Verifies that createBinaryType() throws HttpConflict when a type with the // same name already exists in the database (setUp created "test-crackerutils-type"). - public function testCreateBinaryType_DuplicateName_ThrowsHttpConflict(): void { + public function testCreateBinaryTypeDuplicateNameThrowsHttpConflict(): void { $this->expectException(HttpConflict::class); CrackerUtils::createBinaryType('test-crackerutils-type'); } // Verifies that createBinary() throws HttpError when any required field is // empty. Uses a valid type ID so the method reaches the field validation. - public function testCreateBinary_EmptyVersion_ThrowsHttpError(): void { + public function testCreateBinaryEmptyVersionThrowsHttpError(): void { $this->expectException(HttpError::class); CrackerUtils::createBinary('', 'testcracker', 'http://example.com', $this->type->getId()); } // Verifies the full happy path: createBinary() creates and returns a new // CrackerBinary when all fields are valid. - public function testCreateBinary_ValidInput_CreatesBinary(): void { + public function testCreateBinaryValidInputCreatesBinary(): void { $b = CrackerUtils::createBinary('9.9.9', 'newcracker', 'http://example.com/dl', $this->type->getId()); $this->registerDatabaseObject(Factory::getCrackerBinaryFactory(), $b); $this->assertSame('9.9.9', $b->getVersion()); From 32fcb7b2c096188133217d8b777af75c37289d08 Mon Sep 17 00:00:00 2001 From: jessevz Date: Fri, 22 May 2026 16:03:12 +0200 Subject: [PATCH 602/691] Fixed redocly open api errors (#2164) * Fixed redocly open api errors --------- Co-authored-by: jessevz --- .github/workflows/openapi-lint.yml | 1 - src/inc/apiv2/common/OpenAPISchemaUtils.php | 12 ++++++++++++ src/inc/apiv2/common/openAPISchema.routes.php | 13 +++++++++++-- src/inc/apiv2/helper/ImportFileHelperAPI.php | 6 ++++++ 4 files changed, 29 insertions(+), 3 deletions(-) diff --git a/.github/workflows/openapi-lint.yml b/.github/workflows/openapi-lint.yml index ee6db38ba..a70d41ac6 100644 --- a/.github/workflows/openapi-lint.yml +++ b/.github/workflows/openapi-lint.yml @@ -37,7 +37,6 @@ jobs: - name: Download OpenAPI schema run: wget -q http://localhost:8080/api/v2/openapi.json -O openapi.json - name: Lint OpenAPI schema with Redocly - continue-on-error: true run: redocly lint openapi.json - name: Lint OpenAPI schema with Spectral run: spectral lint openapi.json --ruleset .github/openapi/spectral-jsonapi.yml -D diff --git a/src/inc/apiv2/common/OpenAPISchemaUtils.php b/src/inc/apiv2/common/OpenAPISchemaUtils.php index 322a7e774..001890336 100644 --- a/src/inc/apiv2/common/OpenAPISchemaUtils.php +++ b/src/inc/apiv2/common/OpenAPISchemaUtils.php @@ -355,6 +355,18 @@ static function makeDescription($isRelation, $method, $singleObject): string { else { $description = "PATCH request to update attributes of a single object."; } + case "delete": + if ($isRelation) { + if ($singleObject) { + $description = "DELETE request to update a to one relationship."; + } + else { + $description = "DELETE request to update a to-many relationship link."; + } + } + else { + $description = "DELETE request to update attributes of a single object."; + } } return $description; } diff --git a/src/inc/apiv2/common/openAPISchema.routes.php b/src/inc/apiv2/common/openAPISchema.routes.php index dc38f880f..ae59d2f9b 100644 --- a/src/inc/apiv2/common/openAPISchema.routes.php +++ b/src/inc/apiv2/common/openAPISchema.routes.php @@ -129,6 +129,7 @@ $apiMethod = ($apiMethod == "processPost" && $name != "ImportFileHelperAPI") ? "actionPost" : $apiMethod; $reflectionApiMethod = new ReflectionMethod($class::class, $apiMethod); $paths[$path][$method]["description"] = OpenAPISchemaUtils::parsePhpDoc($reflectionApiMethod->getDocComment()); + $paths[$path][$method]["summary"] = OpenAPISchemaUtils::parsePhpDoc($reflectionApiMethod->getDocComment()); $parameters = $class->getCreateValidFeatures(); $properties = OpenAPISchemaUtils::makeProperties($parameters); $amountProperties = count($properties); @@ -154,6 +155,7 @@ ] ]; } + elseif ($method == "get") { $paths[$path][$method]["parameters"] = $class->getParamsSwagger(); } @@ -184,6 +186,12 @@ "description" => "successful operation", ]; } + $required_scopes = $class->getRequiredPermissions($method); + $paths[$path][$method]["security"] = [ + [ + "bearerAuth" => $required_scopes + ] + ]; continue; }; @@ -382,6 +390,7 @@ ]; $paths[$path][$method]["description"] = OpenAPISchemaUtils::makeDescription($isRelation, $method, $singleObject); + $paths[$path][$method]["summary"] = OpenAPISchemaUtils::makeDescription($isRelation, $method, $singleObject); if ($isRelation && in_array($method, ["post", "patch", "delete"], true)) { $paths[$path][$method]["responses"]["204"] = @@ -728,6 +737,7 @@ "tags" => [ "Login" ], + "summary" => "Obtain an authentication token", "requestBody" => [ "required" => true, "content" => [ @@ -1019,10 +1029,9 @@ "securitySchemes" => [ "bearerAuth" => [ "type" => "http", - "description" => "JWT Authorization header using the Bearer scheme.", + "description" => "JWT Authorization header using the Bearer scheme. Allowing the following scopes: " . implode(",
    ", $unique_all_scopes), "scheme" => "bearer", "bearerFormat" => "JWT", - "scopes" => array_values($unique_all_scopes), ], "basicAuth" => [ "type" => "http", diff --git a/src/inc/apiv2/helper/ImportFileHelperAPI.php b/src/inc/apiv2/helper/ImportFileHelperAPI.php index 8362fdf22..e990f93f4 100644 --- a/src/inc/apiv2/helper/ImportFileHelperAPI.php +++ b/src/inc/apiv2/helper/ImportFileHelperAPI.php @@ -372,6 +372,9 @@ function processPatch(Request $request, Response $response, array $args): Respon ->WithHeader("Access-Control-Expose-Headers", "Tus-Resumable, Upload-Length, Upload-Offset"); } + /** + * Deletes the upload and meta file, if they exist. This can be used by the client to cancel an upload. + */ function processDelete(Request $request, Response $response, array $args): Response { /* Return 404 if entry is not found */ $filename_upload = self::getUploadPath($args['id']); @@ -418,6 +421,9 @@ function scanImportDirectory(): array { return array(); } + /** + * Retrieves the file and its size + */ function processGet(Request $request, Response $response, array $args): Response { $importFiles = $this->scanImportDirectory(); return self::getMetaResponse($importFiles, $request, $response); From d29c50bd7dc4ca46086372d950f1e68dfe911795 Mon Sep 17 00:00:00 2001 From: s3inlc Date: Fri, 22 May 2026 16:55:44 +0200 Subject: [PATCH 603/691] merged tests to use functions in testbase --- ci/phpunit/TestBase.php | 142 ++++- ci/phpunit/inc/utils/AccessGroupUtilsTest.php | 117 ---- ci/phpunit/inc/utils/AccessUtilsTest.php | 121 ---- ci/phpunit/inc/utils/AccountUtilsTest.php | 546 +++++++++--------- ci/phpunit/inc/utils/TaskUtilsTest.php | 115 +--- ci/phpunit/inc/utils/UserUtilsTest.php | 7 - 6 files changed, 422 insertions(+), 626 deletions(-) diff --git a/ci/phpunit/TestBase.php b/ci/phpunit/TestBase.php index cc5042057..ec24393ad 100644 --- a/ci/phpunit/TestBase.php +++ b/ci/phpunit/TestBase.php @@ -1,13 +1,28 @@ createDatabaseObject( + Factory::getChunkFactory(), + new Chunk(null, $task->getId(), 0, 100, $agent->getId(), time(), 0, 0, 0, $state, 0, 0) + ); + $this->assertTrue($chunk instanceof Chunk); + return $chunk; + } + + protected function createAccessGroup(string $prefix): AccessGroup { + $group = $this->createDatabaseObject( + Factory::getAccessGroupFactory(), + new AccessGroup(null, $prefix . '_' . uniqid()) + ); + $this->assertTrue($group instanceof AccessGroup); + return $group; + } + + protected function createAccessGroupUser(User $user, AccessGroup $accessGroup): AccessGroupUser { + $relation = $this->createDatabaseObject( + Factory::getAccessGroupUserFactory(), + new AccessGroupUser(null, $accessGroup->getId(), $user->getId()) + ); + $this->assertTrue($relation instanceof AccessGroupUser); + return $relation; + } + + protected function createRightGroup(): RightGroup { + $group = $this->createDatabaseObject( + Factory::getRightGroupFactory(), + new RightGroup(null, 'phpunit-' . uniqid('', true), '[]') + ); + $this->assertTrue($group instanceof RightGroup); + return $group; + } + + protected function createUser(string $prefix): User { + $username = $prefix . '_' . uniqid(); + $user = UserUtils::createUser($username, $username . '@example.com', $this->createRightGroup()->getId(), $this->adminUser); + $this->registerDatabaseObject(Factory::getUserFactory(), $user); + return $user; + } + + protected function createHashType(): HashType { + $hashType = $this->createDatabaseObject( + Factory::getHashTypeFactory(), + new HashType(null, 'hash_type_' . uniqid(), 0, 0) + ); + $this->assertTrue($hashType instanceof HashType); + return $hashType; + } + + protected function createHashlist(AccessGroup $group, HashType $hashType, int $isSecret = 0): Hashlist { + $hashlist = $this->createDatabaseObject( + Factory::getHashlistFactory(), + new Hashlist(null, 'hashlist_' . uniqid(), DHashlistFormat::PLAIN, $hashType->getId(), 1, ':', 0, $isSecret, 0, 0, $group->getId(), '', 0, 0, 0) + ); + $this->assertTrue($hashlist instanceof Hashlist); + return $hashlist; + } + + protected function createTaskWrapper(AccessGroup $group, Hashlist $hashlist, int $taskType = DTaskTypes::NORMAL): TaskWrapper { + $taskWrapper = $this->createDatabaseObject( + Factory::getTaskWrapperFactory(), + new TaskWrapper(null, 1, 1, $taskType, $hashlist->getId(), $group->getId(), 'wrapper_' . uniqid(), 0, 0) + ); + $this->assertTrue($taskWrapper instanceof TaskWrapper); + return $taskWrapper; + } + + protected function createCrackerBinaryType(): CrackerBinaryType { + $crackerBinaryType = $this->createDatabaseObject( + Factory::getCrackerBinaryTypeFactory(), + new CrackerBinaryType(null, 'type_' . uniqid(), 1) + ); + $this->assertTrue($crackerBinaryType instanceof CrackerBinaryType); + return $crackerBinaryType; + } + + protected function createCrackerBinary(CrackerBinaryType $crackerBinaryType): CrackerBinary { + $crackerBinary = $this->createDatabaseObject( + Factory::getCrackerBinaryFactory(), + new CrackerBinary(null, $crackerBinaryType->getId(), '1.0.' . uniqid(), 'https://example.invalid/' . uniqid(), 'binary_' . uniqid()) + ); + $this->assertTrue($crackerBinary instanceof CrackerBinary); + return $crackerBinary; + } + + protected function createTask(TaskWrapper $taskWrapper, CrackerBinary $crackerBinary, CrackerBinaryType $crackerBinaryType): Task { + $task = $this->createDatabaseObject( + Factory::getTaskFactory(), + new Task(null, 'task_' . uniqid(), '--attack-mode 0', 60, 30, 0, 0, 1, 1, '#ffffff', 0, 0, 0, 0, $crackerBinary->getId(), $crackerBinaryType->getId(), $taskWrapper->getId(), 0, '', 0, 0, 0, 0, '') + ); + $this->assertTrue($task instanceof Task); + return $task; + } + + protected function createFile(AccessGroup $group, int $isSecret = 0): File { + $file = $this->createDatabaseObject( + Factory::getFileFactory(), + new File(null, 'file_' . uniqid(), 0, $isSecret, 0, $group->getId(), 0) + ); + $this->assertTrue($file instanceof File); + return $file; + } + + protected function createFileTask(File $file, Task $task): FileTask { + $fileTask = $this->createDatabaseObject( + Factory::getFileTaskFactory(), + new FileTask(null, $file->getId(), $task->getId()) + ); + $this->assertTrue($fileTask instanceof FileTask); + return $fileTask; + } + + protected function createAgent(string $prefix, int $isTrusted = 1): Agent { + $suffix = uniqid(); + $agent = $this->createDatabaseObject( + Factory::getAgentFactory(), + new Agent(null, $prefix . '_' . $suffix, 'uid_' . $suffix, 0, '[]', '', 0, 1, $isTrusted, 'token_' . $suffix, 'idle', time(), '127.0.0.1', null, 0, 'sig_' . $suffix) + ); + $this->assertTrue($agent instanceof Agent); + return $agent; + } + /** * used to create an object in the database and then register it directly for deletion to be cleaned up after the test * diff --git a/ci/phpunit/inc/utils/AccessGroupUtilsTest.php b/ci/phpunit/inc/utils/AccessGroupUtilsTest.php index b479f2a08..e91f3b6a2 100644 --- a/ci/phpunit/inc/utils/AccessGroupUtilsTest.php +++ b/ci/phpunit/inc/utils/AccessGroupUtilsTest.php @@ -8,26 +8,16 @@ use Hashtopolis\dba\models\AccessGroupUser; use Hashtopolis\dba\models\Agent; use Hashtopolis\dba\models\Chunk; -use Hashtopolis\dba\models\CrackerBinary; -use Hashtopolis\dba\models\CrackerBinaryType; use Hashtopolis\dba\models\File; use Hashtopolis\dba\models\Hashlist; -use Hashtopolis\dba\models\HashType; -use Hashtopolis\dba\models\RightGroup; -use Hashtopolis\dba\models\Task; use Hashtopolis\dba\models\TaskWrapper; use Hashtopolis\dba\models\User; use Hashtopolis\dba\QueryFilter; use Hashtopolis\inc\apiv2\error\HttpConflict; use Hashtopolis\inc\apiv2\error\HttpError; use Hashtopolis\inc\defines\DHashcatStatus; -use Hashtopolis\inc\defines\DHashlistFormat; use Hashtopolis\inc\defines\DLimits; -use Hashtopolis\inc\defines\DTaskTypes; use Hashtopolis\inc\HTException; -use Hashtopolis\inc\utils\AccessUtils; -use Hashtopolis\inc\utils\AccessGroupUtils; -use Hashtopolis\inc\utils\UserUtils; use Hashtopolis\TestBase; use Override; @@ -292,111 +282,4 @@ public function testDeleteGroupReassignsDependentEntitiesToDefaultGroup(): void $this->assertSame([], $remainingUsers); $this->assertSame([], $remainingAgents); } - - /* - * Local test helpers - */ - private function createAccessGroup(string $prefix): AccessGroup { - $group = $this->createDatabaseObject( - Factory::getAccessGroupFactory(), - new AccessGroup(null, $prefix . '_' . uniqid()) - ); - $this->assertTrue($group instanceof AccessGroup); - return $group; - } - - private function createAgent(string $prefix): Agent { - $suffix = uniqid('', true); - $agent = $this->createDatabaseObject( - Factory::getAgentFactory(), - new Agent(null, $prefix . '_' . $suffix, 'uid_' . $suffix, 0, '[]', '', 0, 1, 1, 'token_' . uniqid(), 'idle', time(), '127.0.0.1', null, 0, 'sig_' . uniqid()) - ); - $this->assertTrue($agent instanceof Agent); - return $agent; - } - - private function createRightGroup(): RightGroup { - $group = $this->createDatabaseObject(Factory::getRightGroupFactory(), new RightGroup(null, 'phpunit-' . uniqid('', true), '[]')); - $this->assertTrue($group instanceof RightGroup); - return $group; - } - - private function createUser(string $prefix): User { - $username = $prefix . '_' . uniqid(); - $user = UserUtils::createUser($username, $username . '@example.com', $this->createRightGroup()->getId(), $this->adminUser); - $this->registerDatabaseObject(Factory::getUserFactory(), $user); - return $user; - } - - private function createHashType(): HashType { - $hashType = $this->createDatabaseObject( - Factory::getHashTypeFactory(), - new HashType(null, 'hash_type_' . uniqid(), 0, 0) - ); - $this->assertTrue($hashType instanceof HashType); - return $hashType; - } - - private function createHashlist(AccessGroup $group, HashType $hashType): Hashlist { - $hashlist = $this->createDatabaseObject( - Factory::getHashlistFactory(), - new Hashlist(null, 'hashlist_' . uniqid(), DHashlistFormat::PLAIN, $hashType->getId(), 1, ':', 0, 0, 0, 0, $group->getId(), '', 0, 0, 0) - ); - $this->assertTrue($hashlist instanceof Hashlist); - return $hashlist; - } - - private function createCrackerBinaryType(): CrackerBinaryType { - $crackerBinaryType = $this->createDatabaseObject( - Factory::getCrackerBinaryTypeFactory(), - new CrackerBinaryType(null, 'type_' . uniqid(), 1) - ); - $this->assertTrue($crackerBinaryType instanceof CrackerBinaryType); - return $crackerBinaryType; - } - - private function createCrackerBinary(CrackerBinaryType $crackerBinaryType): CrackerBinary { - $crackerBinary = $this->createDatabaseObject( - Factory::getCrackerBinaryFactory(), - new CrackerBinary(null, $crackerBinaryType->getId(), '1.0.' . uniqid(), 'https://example.invalid/' . uniqid(), 'binary_' . uniqid()) - ); - $this->assertTrue($crackerBinary instanceof CrackerBinary); - return $crackerBinary; - } - - private function createTaskWrapper(AccessGroup $group, Hashlist $hashlist): TaskWrapper { - $taskWrapper = $this->createDatabaseObject( - Factory::getTaskWrapperFactory(), - new TaskWrapper(null, 1, 1, DTaskTypes::NORMAL, $hashlist->getId(), $group->getId(), 'wrapper_' . uniqid(), 0, 0) - ); - $this->assertTrue($taskWrapper instanceof TaskWrapper); - return $taskWrapper; - } - - private function createTask(TaskWrapper $taskWrapper, CrackerBinary $crackerBinary, CrackerBinaryType $crackerBinaryType): Task { - $task = $this->createDatabaseObject( - Factory::getTaskFactory(), - new Task(null, 'task_' . uniqid(), '--attack-mode 0', 60, 30, 0, 0, 1, 1, '#ffffff', 0, 0, 0, 0, $crackerBinary->getId(), $crackerBinaryType->getId(), $taskWrapper->getId(), 0, '', 0, 0, 0, 0, '') - ); - $this->assertTrue($task instanceof Task); - return $task; - } - - private function createChunk(Task $task, Agent $agent, int $state): Chunk { - $chunk = $this->createDatabaseObject( - Factory::getChunkFactory(), - new Chunk(null, $task->getId(), 0, 100, $agent->getId(), time(), 0, 0, 0, $state, 0, 0) - ); - $this->assertTrue($chunk instanceof Chunk); - return $chunk; - } - - private function createFile(AccessGroup $group): File { - $file = $this->createDatabaseObject( - Factory::getFileFactory(), - new File(null, 'file_' . uniqid(), 0, 0, 0, $group->getId(), 0) - ); - $this->assertTrue($file instanceof File); - return $file; - } } \ No newline at end of file diff --git a/ci/phpunit/inc/utils/AccessUtilsTest.php b/ci/phpunit/inc/utils/AccessUtilsTest.php index 4f3c69c33..d0ea3f8e5 100644 --- a/ci/phpunit/inc/utils/AccessUtilsTest.php +++ b/ci/phpunit/inc/utils/AccessUtilsTest.php @@ -6,22 +6,12 @@ use Hashtopolis\dba\models\AccessGroup; use Hashtopolis\dba\models\AccessGroupAgent; use Hashtopolis\dba\models\AccessGroupUser; -use Hashtopolis\dba\models\Agent; -use Hashtopolis\dba\models\CrackerBinary; -use Hashtopolis\dba\models\CrackerBinaryType; use Hashtopolis\dba\models\File; -use Hashtopolis\dba\models\FileTask; use Hashtopolis\dba\models\Hash; -use Hashtopolis\dba\models\HashType; use Hashtopolis\dba\models\Hashlist; use Hashtopolis\dba\models\LogEntry; -use Hashtopolis\dba\models\RightGroup; -use Hashtopolis\dba\models\Task; -use Hashtopolis\dba\models\TaskWrapper; -use Hashtopolis\dba\models\User; use Hashtopolis\inc\apiv2\common\AbstractBaseAPI; use Hashtopolis\inc\defines\DAccessControl; -use Hashtopolis\inc\defines\DHashlistFormat; use Hashtopolis\TestBase; use Override; @@ -436,115 +426,4 @@ public function testAgentCanAccessTaskWhenWrapperHashlistAndFilesAreAllowed(): v $this->assertTrue(AccessUtils::agentCanAccessTask($agent, $task)); } - - /* - * Local test helpers - */ - //TODO: Should we try refactor common methods to base? - private function createAccessGroup(string $prefix): AccessGroup { - $group = $this->createDatabaseObject( - Factory::getAccessGroupFactory(), - new AccessGroup(null, $prefix . '_' . uniqid()) - ); - $this->assertTrue($group instanceof AccessGroup); - return $group; - } - - private function createRightGroup(): RightGroup { - $group = $this->createDatabaseObject( - Factory::getRightGroupFactory(), - new RightGroup(null, 'phpunit-' . uniqid('', true), '[]') - ); - $this->assertTrue($group instanceof RightGroup); - return $group; - } - - private function createUser(string $prefix): User { - $username = $prefix . '_' . uniqid(); - $user = UserUtils::createUser($username, $username . '@example.com', $this->createRightGroup()->getId(), $this->adminUser); - $this->registerDatabaseObject(Factory::getUserFactory(), $user); - return $user; - } - - private function createHashType(): HashType { - $hashType = $this->createDatabaseObject( - Factory::getHashTypeFactory(), - new HashType(null, 'hash_type_' . uniqid(), 0, 0) - ); - $this->assertTrue($hashType instanceof HashType); - return $hashType; - } - - private function createHashlist(AccessGroup $group, HashType $hashType, int $isSecret = 0): Hashlist { - $hashlist = $this->createDatabaseObject( - Factory::getHashlistFactory(), - new Hashlist(null, 'hashlist_' . uniqid(), DHashlistFormat::PLAIN, $hashType->getId(), 1, ':', 0, $isSecret, 0, 0, $group->getId(), '', 0, 0, 0) - ); - $this->assertTrue($hashlist instanceof Hashlist); - return $hashlist; - } - - private function createTaskWrapper(AccessGroup $group, Hashlist $hashlist): TaskWrapper { - $taskWrapper = $this->createDatabaseObject( - Factory::getTaskWrapperFactory(), - new TaskWrapper(null, 1, 1, 0, $hashlist->getId(), $group->getId(), 'wrapper_' . uniqid(), 0, 0) - ); - $this->assertTrue($taskWrapper instanceof TaskWrapper); - return $taskWrapper; - } - - private function createCrackerBinaryType(): CrackerBinaryType { - $crackerBinaryType = $this->createDatabaseObject( - Factory::getCrackerBinaryTypeFactory(), - new CrackerBinaryType(null, 'type_' . uniqid(), 1) - ); - $this->assertTrue($crackerBinaryType instanceof CrackerBinaryType); - return $crackerBinaryType; - } - - private function createCrackerBinary(CrackerBinaryType $crackerBinaryType): CrackerBinary { - $crackerBinary = $this->createDatabaseObject( - Factory::getCrackerBinaryFactory(), - new CrackerBinary(null, $crackerBinaryType->getId(), '1.0.' . uniqid(), 'https://example.invalid/' . uniqid(), 'binary_' . uniqid()) - ); - $this->assertTrue($crackerBinary instanceof CrackerBinary); - return $crackerBinary; - } - - private function createTask(TaskWrapper $taskWrapper, CrackerBinary $crackerBinary, CrackerBinaryType $crackerBinaryType): Task { - $task = $this->createDatabaseObject( - Factory::getTaskFactory(), - new Task(null, 'task_' . uniqid(), '--attack-mode 0', 60, 30, 0, 0, 1, 1, '#ffffff', 0, 0, 0, 0, $crackerBinary->getId(), $crackerBinaryType->getId(), $taskWrapper->getId(), 0, '', 0, 0, 0, 0, '') - ); - $this->assertTrue($task instanceof Task); - return $task; - } - - private function createFile(AccessGroup $group, int $isSecret = 0): File { - $file = $this->createDatabaseObject( - Factory::getFileFactory(), - new File(null, 'file_' . uniqid(), 0, $isSecret, 0, $group->getId(), 0) - ); - $this->assertTrue($file instanceof File); - return $file; - } - - private function createFileTask(File $file, Task $task): FileTask { - $fileTask = $this->createDatabaseObject( - Factory::getFileTaskFactory(), - new FileTask(null, $file->getId(), $task->getId()) - ); - $this->assertTrue($fileTask instanceof FileTask); - return $fileTask; - } - - private function createAgent(string $prefix, int $isTrusted = 1): Agent { - $suffix = uniqid(); - $agent = $this->createDatabaseObject( - Factory::getAgentFactory(), - new Agent(null, $prefix . '_' . $suffix, 'uid_' . $suffix, 0, '[]', '', 0, 1, $isTrusted, 'token_' . $suffix, 'idle', time(), '127.0.0.1', null, 0, 'sig_' . $suffix) - ); - $this->assertTrue($agent instanceof Agent); - return $agent; - } } \ No newline at end of file diff --git a/ci/phpunit/inc/utils/AccountUtilsTest.php b/ci/phpunit/inc/utils/AccountUtilsTest.php index 2f9790dbb..3ff14c38c 100644 --- a/ci/phpunit/inc/utils/AccountUtilsTest.php +++ b/ci/phpunit/inc/utils/AccountUtilsTest.php @@ -1,14 +1,13 @@ createUser('invalid_yubikey_user'); - $user->setYubikey(1); - $user->setOtp1('short'); - $user->setOtp2(''); - $user->setOtp3('12345678901'); - $user->setOtp4('1234567890123'); - - AccountUtils::checkOTP($user); - - $reloadedUser = Factory::getUserFactory()->filter([ - Factory::FILTER => new QueryFilter(User::USERNAME, $user->getUsername(), '=') - ], true); - - $this->assertInstanceOf(User::class, $reloadedUser); - $this->assertSame('0', $reloadedUser->getYubikey()); - $this->assertSame('short', $reloadedUser->getOtp1()); - $this->assertSame('', $reloadedUser->getOtp2()); - $this->assertSame('12345678901', $reloadedUser->getOtp3()); - $this->assertSame('1234567890123', $reloadedUser->getOtp4()); - } - - public function testCheckOTPKeepsYubikeyEnabledWhenOtp1HasAValidPrefix(): void { - $this->assertCheckOTPKeepsYubikeyEnabledForValidSlot(1); - } - - public function testCheckOTPKeepsYubikeyEnabledWhenOtp2HasAValidPrefix(): void { - $this->assertCheckOTPKeepsYubikeyEnabledForValidSlot(2); - } - - public function testCheckOTPKeepsYubikeyEnabledWhenOtp3HasAValidPrefix(): void { - $this->assertCheckOTPKeepsYubikeyEnabledForValidSlot(3); - } - - public function testCheckOTPKeepsYubikeyEnabledWhenOtp4HasAValidPrefix(): void { - $this->assertCheckOTPKeepsYubikeyEnabledForValidSlot(4); - } - - public function testSetOTPThrowsWhenEnablingWithoutAValidConfiguredKey(): void { - $user = $this->createUser('setotp_invalid_enable_user'); - $user->setOtp1('short'); - $user->setOtp2(''); - $user->setOtp3('12345678901'); - $user->setOtp4('1234567890123'); - - try { - AccountUtils::setOTP(0, DAccountAction::YUBIKEY_ENABLE, $user, ['', '', '', '']); - $this->fail('Expected setOTP to reject enabling Yubikey without a valid configured key.'); - } - catch (HTException $exception) { - $this->assertSame('Configure OTP KEY first!', $exception->getMessage()); - } - - $this->assertPersistedOtpState($user, '0', '', '', '', ''); - } - - public function testSetOTPDisableResetsYubikeyToZero(): void { - $user = $this->createUser('setotp_disable_user'); - $user->setYubikey(1); - $user->setOtp1('validyubikey'); - $user->setOtp2('backupyubico'); - $user->setOtp3('reservekey12'); - $user->setOtp4('lastresort12'); - - AccountUtils::setOTP(-1, DAccountAction::YUBIKEY_DISABLE, $user, ['', '', '', '']); - - $this->assertPersistedOtpState($user, '0', 'validyubikey', 'backupyubico', 'reservekey12', 'lastresort12'); - } - - public function testSetOTPYubikeyActivationWithoutValidKeysDisabledAfterCheckOTP(): void { - $user = $this->createUser('setotp_activate_without_valid_keys_user'); - $user->setYubikey(0); - $user->setOtp1('short'); - $user->setOtp2(''); - $user->setOtp3('12345678901'); - $user->setOtp4('1234567890123'); - - AccountUtils::setOTP(0, DAccountAction::SET_OTP1, $user, ['', '', '', '']); - - $this->assertPersistedOtpState($user, '0', 'short', '', '12345678901', '1234567890123'); - } - - public function testSetOTPStoresValidPrefixThenActivatesYubikey(): void { - foreach ([1, 2, 3, 4] as $slot) { - $this->assertSetOTPStoresValidPrefixThenActivatesYubikeyForSlot($slot); - } - } - - public function testSetEmailThrowsOnInvalidEmailFormat(): void { - $user = $this->createUser('invalid_email_user'); - $this->expectException(HTException::class); - AccountUtils::setEmail('invalid-email-address', $user); - } - - public function testSetEmailUpdatesEmailOnValidAddress(): void { - $user = $this->createUser('valid_email_user'); - $newEmail = 'updated_' . uniqid() . '@example.com'; - - AccountUtils::setEmail($newEmail, $user); - - $reloadedUser = Factory::getUserFactory()->filter([ - Factory::FILTER => new QueryFilter(User::USERNAME, $user->getUsername(), '=') - ], true); - - $this->assertInstanceOf(User::class, $reloadedUser); - $this->assertSame($newEmail, $reloadedUser->getEmail()); - } - - public function testUpdateSessionLifetimeThrowsWhenBelowMinimum(): void { - $user = $this->createUser('invalid_lifetime_user'); - $this->expectException(HTException::class); - - AccountUtils::updateSessionLifetime(59, $user); - } - - public function testUpdateSessionLifetimeUpdatesPersistedValue(): void { - $user = $this->createUser('valid_lifetime_user'); - $newLifetime = 60; - - AccountUtils::updateSessionLifetime($newLifetime, $user); - - $reloadedUser = Factory::getUserFactory()->filter([ - Factory::FILTER => new QueryFilter(User::USERNAME, $user->getUsername(), '=') - ], true); - - $this->assertInstanceOf(User::class, $reloadedUser); - $this->assertSame($newLifetime, $reloadedUser->getSessionLifetime()); - } - - public function testChangePasswordThrowsWhenOldPasswordIsWrong(): void { - $user = $this->createUserWithPassword('wrong_old_password_user', 'oldpass'); - $this->expectException(HTException::class); - $this->expectExceptionMessage('Your old password is wrong!'); - - AccountUtils::changePassword('wrongpass', 'newpass', 'newpass', $user); - } - - public function testChangePasswordThrowsWhenNewPasswordIsTooShort(): void { - $user = $this->createUserWithPassword('short_new_password_user', 'oldpass'); - $this->expectException(HTException::class); - $this->expectExceptionMessage('Your password is too short!'); - - AccountUtils::changePassword('oldpass', 'abc', 'abc', $user); - } - - public function testChangePasswordThrowsWhenNewPasswordsDoNotMatch(): void { - $user = $this->createUserWithPassword('mismatch_password_user', 'oldpass'); - $this->expectException(HTException::class); - $this->expectExceptionMessage('Your new passwords do not match!'); - - AccountUtils::changePassword('oldpass', 'newpass', 'otherpass', $user); - } - - public function testChangePasswordThrowsWhenNewPasswordMatchesOldPassword(): void { - $user = $this->createUserWithPassword('same_password_user', 'oldpass'); - $this->expectException(HTException::class); - $this->expectExceptionMessage('Your new password is the same as the old one!'); - - AccountUtils::changePassword('oldpass', 'oldpass', 'oldpass', $user); - } - - public function testChangePasswordUpdatesPersistedPasswordData(): void { - $user = $this->createUserWithPassword('happy_password_user', 'oldpass'); - $oldSalt = $user->getPasswordSalt(); - $oldHash = $user->getPasswordHash(); - - AccountUtils::changePassword('oldpass', 'newpass', 'newpass', $user); - - $reloadedUser = $this->reloadUser($user); - - $this->assertNotSame($oldSalt, $reloadedUser->getPasswordSalt()); - $this->assertNotSame($oldHash, $reloadedUser->getPasswordHash()); - $this->assertFalse(Encryption::passwordVerify('oldpass', $reloadedUser->getPasswordSalt(), $reloadedUser->getPasswordHash())); - $this->assertTrue(Encryption::passwordVerify('newpass', $reloadedUser->getPasswordSalt(), $reloadedUser->getPasswordHash())); - $this->assertSame(0, $reloadedUser->getIsComputedPassword()); - } - + public function testCheckOTPDisablesYubikeyWhenNoValidPrefixExists(): void { + $user = $this->createUser('invalid_yubikey_user'); + $user->setYubikey(1); + $user->setOtp1('short'); + $user->setOtp2(''); + $user->setOtp3('12345678901'); + $user->setOtp4('1234567890123'); + + AccountUtils::checkOTP($user); + + $reloadedUser = Factory::getUserFactory()->filter([ + Factory::FILTER => new QueryFilter(User::USERNAME, $user->getUsername(), '=') + ], true); + + $this->assertInstanceOf(User::class, $reloadedUser); + $this->assertSame('0', $reloadedUser->getYubikey()); + $this->assertSame('short', $reloadedUser->getOtp1()); + $this->assertSame('', $reloadedUser->getOtp2()); + $this->assertSame('12345678901', $reloadedUser->getOtp3()); + $this->assertSame('1234567890123', $reloadedUser->getOtp4()); + } + + public function testCheckOTPKeepsYubikeyEnabledWhenOtp1HasAValidPrefix(): void { + $this->assertCheckOTPKeepsYubikeyEnabledForValidSlot(1); + } + + public function testCheckOTPKeepsYubikeyEnabledWhenOtp2HasAValidPrefix(): void { + $this->assertCheckOTPKeepsYubikeyEnabledForValidSlot(2); + } + + public function testCheckOTPKeepsYubikeyEnabledWhenOtp3HasAValidPrefix(): void { + $this->assertCheckOTPKeepsYubikeyEnabledForValidSlot(3); + } + + public function testCheckOTPKeepsYubikeyEnabledWhenOtp4HasAValidPrefix(): void { + $this->assertCheckOTPKeepsYubikeyEnabledForValidSlot(4); + } + + public function testSetOTPThrowsWhenEnablingWithoutAValidConfiguredKey(): void { + $user = $this->createUser('setotp_invalid_enable_user'); + $user->setOtp1('short'); + $user->setOtp2(''); + $user->setOtp3('12345678901'); + $user->setOtp4('1234567890123'); + + try { + AccountUtils::setOTP(0, DAccountAction::YUBIKEY_ENABLE, $user, ['', '', '', '']); + $this->fail('Expected setOTP to reject enabling Yubikey without a valid configured key.'); + } + catch (HTException $exception) { + $this->assertSame('Configure OTP KEY first!', $exception->getMessage()); + } + + $this->assertPersistedOtpState($user, '0', '', '', '', ''); + } + + public function testSetOTPDisableResetsYubikeyToZero(): void { + $user = $this->createUser('setotp_disable_user'); + $user->setYubikey(1); + $user->setOtp1('validyubikey'); + $user->setOtp2('backupyubico'); + $user->setOtp3('reservekey12'); + $user->setOtp4('lastresort12'); + + AccountUtils::setOTP(-1, DAccountAction::YUBIKEY_DISABLE, $user, ['', '', '', '']); + + $this->assertPersistedOtpState($user, '0', 'validyubikey', 'backupyubico', 'reservekey12', 'lastresort12'); + } + + public function testSetOTPYubikeyActivationWithoutValidKeysDisabledAfterCheckOTP(): void { + $user = $this->createUser('setotp_activate_without_valid_keys_user'); + $user->setYubikey(0); + $user->setOtp1('short'); + $user->setOtp2(''); + $user->setOtp3('12345678901'); + $user->setOtp4('1234567890123'); + + AccountUtils::setOTP(0, DAccountAction::SET_OTP1, $user, ['', '', '', '']); + + $this->assertPersistedOtpState($user, '0', 'short', '', '12345678901', '1234567890123'); + } + + public function testSetOTPStoresValidPrefixThenActivatesYubikey(): void { + foreach ([1, 2, 3, 4] as $slot) { + $this->assertSetOTPStoresValidPrefixThenActivatesYubikeyForSlot($slot); + } + } + + public function testSetEmailThrowsOnInvalidEmailFormat(): void { + $user = $this->createUser('invalid_email_user'); + $this->expectException(HTException::class); + AccountUtils::setEmail('invalid-email-address', $user); + } + + public function testSetEmailUpdatesEmailOnValidAddress(): void { + $user = $this->createUser('valid_email_user'); + $newEmail = 'updated_' . uniqid() . '@example.com'; + + AccountUtils::setEmail($newEmail, $user); + + $reloadedUser = Factory::getUserFactory()->filter([ + Factory::FILTER => new QueryFilter(User::USERNAME, $user->getUsername(), '=') + ], true); + + $this->assertInstanceOf(User::class, $reloadedUser); + $this->assertSame($newEmail, $reloadedUser->getEmail()); + } + + public function testUpdateSessionLifetimeThrowsWhenBelowMinimum(): void { + $user = $this->createUser('invalid_lifetime_user'); + $this->expectException(HTException::class); + + AccountUtils::updateSessionLifetime(59, $user); + } + + public function testUpdateSessionLifetimeUpdatesPersistedValue(): void { + $user = $this->createUser('valid_lifetime_user'); + $newLifetime = 60; + + AccountUtils::updateSessionLifetime($newLifetime, $user); + + $reloadedUser = Factory::getUserFactory()->filter([ + Factory::FILTER => new QueryFilter(User::USERNAME, $user->getUsername(), '=') + ], true); + + $this->assertInstanceOf(User::class, $reloadedUser); + $this->assertSame($newLifetime, $reloadedUser->getSessionLifetime()); + } + + public function testChangePasswordThrowsWhenOldPasswordIsWrong(): void { + $user = $this->createUserWithPassword('wrong_old_password_user', 'oldpass'); + $this->expectException(HTException::class); + $this->expectExceptionMessage('Your old password is wrong!'); + + AccountUtils::changePassword('wrongpass', 'newpass', 'newpass', $user); + } + + public function testChangePasswordThrowsWhenNewPasswordIsTooShort(): void { + $user = $this->createUserWithPassword('short_new_password_user', 'oldpass'); + $this->expectException(HTException::class); + $this->expectExceptionMessage('Your password is too short!'); + + AccountUtils::changePassword('oldpass', 'abc', 'abc', $user); + } + + public function testChangePasswordThrowsWhenNewPasswordsDoNotMatch(): void { + $user = $this->createUserWithPassword('mismatch_password_user', 'oldpass'); + $this->expectException(HTException::class); + $this->expectExceptionMessage('Your new passwords do not match!'); + + AccountUtils::changePassword('oldpass', 'newpass', 'otherpass', $user); + } + + public function testChangePasswordThrowsWhenNewPasswordMatchesOldPassword(): void { + $user = $this->createUserWithPassword('same_password_user', 'oldpass'); + $this->expectException(HTException::class); + $this->expectExceptionMessage('Your new password is the same as the old one!'); + + AccountUtils::changePassword('oldpass', 'oldpass', 'oldpass', $user); + } + + public function testChangePasswordUpdatesPersistedPasswordData(): void { + $user = $this->createUserWithPassword('happy_password_user', 'oldpass'); + $oldSalt = $user->getPasswordSalt(); + $oldHash = $user->getPasswordHash(); + + AccountUtils::changePassword('oldpass', 'newpass', 'newpass', $user); + + $reloadedUser = $this->reloadUser($user); + + $this->assertNotSame($oldSalt, $reloadedUser->getPasswordSalt()); + $this->assertNotSame($oldHash, $reloadedUser->getPasswordHash()); + $this->assertFalse(Encryption::passwordVerify('oldpass', $reloadedUser->getPasswordSalt(), $reloadedUser->getPasswordHash())); + $this->assertTrue(Encryption::passwordVerify('newpass', $reloadedUser->getPasswordSalt(), $reloadedUser->getPasswordHash())); + $this->assertSame(0, $reloadedUser->getIsComputedPassword()); + } + private function assertCheckOTPKeepsYubikeyEnabledForValidSlot(int $validSlot): void { - $user = $this->createUser('valid_yubikey_user_' . $validSlot); - $user->setYubikey(1); - - $otpValues = [ - 1 => '', - 2 => '', - 3 => '', - 4 => '', - ]; - $otpValues[$validSlot] = 'validyubikey'; - - $user->setOtp1($otpValues[1]); - $user->setOtp2($otpValues[2]); - $user->setOtp3($otpValues[3]); - $user->setOtp4($otpValues[4]); - - AccountUtils::checkOTP($user); - - $reloadedUser = Factory::getUserFactory()->filter([ - Factory::FILTER => new QueryFilter(User::USERNAME, $user->getUsername(), '=') - ], true); - - $this->assertInstanceOf(User::class, $reloadedUser); - $this->assertSame('1', $reloadedUser->getYubikey()); - $this->assertSame($otpValues[1], $reloadedUser->getOtp1()); - $this->assertSame($otpValues[2], $reloadedUser->getOtp2()); - $this->assertSame($otpValues[3], $reloadedUser->getOtp3()); - $this->assertSame($otpValues[4], $reloadedUser->getOtp4()); - } - - private function assertPersistedOtpState(User $user, string $expectedYubikey, string $expectedOtp1, string $expectedOtp2, string $expectedOtp3, string $expectedOtp4): void { - $reloadedUser = Factory::getUserFactory()->filter([ - Factory::FILTER => new QueryFilter(User::USERNAME, $user->getUsername(), '=') - ], true); - - $this->assertInstanceOf(User::class, $reloadedUser); - $this->assertSame($expectedYubikey, $reloadedUser->getYubikey()); - $this->assertSame($expectedOtp1, $reloadedUser->getOtp1()); - $this->assertSame($expectedOtp2, $reloadedUser->getOtp2()); - $this->assertSame($expectedOtp3, $reloadedUser->getOtp3()); - $this->assertSame($expectedOtp4, $reloadedUser->getOtp4()); - } - - private function assertSetOTPStoresValidPrefixThenActivatesYubikeyForSlot(int $slot): void { - $user = $this->createUser('setotp_happy_path_user_' . $slot); - $fullOtp = 'ccccccdefghdefghdefghdefghdefghdefghdefghi'; - $actions = [ - 1 => DAccountAction::SET_OTP1, - 2 => DAccountAction::SET_OTP2, - 3 => DAccountAction::SET_OTP3, - 4 => DAccountAction::SET_OTP4, - ]; - $expectedOtpValues = [ - 1 => '', - 2 => '', - 3 => '', - 4 => '', - ]; - $expectedOtpValues[$slot] = 'ccccccdefghd'; - - $otpArr = ['', '', '', '']; - $otpArr[$slot - 1] = $fullOtp; - - AccountUtils::setOTP($slot, $actions[$slot], $user, $otpArr); - $this->assertPersistedOtpState($user, '0', $expectedOtpValues[1], $expectedOtpValues[2], $expectedOtpValues[3], $expectedOtpValues[4]); - - AccountUtils::setOTP(0, DAccountAction::YUBIKEY_ENABLE, $user, ['', '', '', '']); - $this->assertPersistedOtpState($user, '1', $expectedOtpValues[1], $expectedOtpValues[2], $expectedOtpValues[3], $expectedOtpValues[4]); - } - - + $user = $this->createUser('valid_yubikey_user_' . $validSlot); + $user->setYubikey(1); + + $otpValues = [ + 1 => '', + 2 => '', + 3 => '', + 4 => '', + ]; + $otpValues[$validSlot] = 'validyubikey'; + + $user->setOtp1($otpValues[1]); + $user->setOtp2($otpValues[2]); + $user->setOtp3($otpValues[3]); + $user->setOtp4($otpValues[4]); + + AccountUtils::checkOTP($user); + + $reloadedUser = Factory::getUserFactory()->filter([ + Factory::FILTER => new QueryFilter(User::USERNAME, $user->getUsername(), '=') + ], true); + + $this->assertInstanceOf(User::class, $reloadedUser); + $this->assertSame('1', $reloadedUser->getYubikey()); + $this->assertSame($otpValues[1], $reloadedUser->getOtp1()); + $this->assertSame($otpValues[2], $reloadedUser->getOtp2()); + $this->assertSame($otpValues[3], $reloadedUser->getOtp3()); + $this->assertSame($otpValues[4], $reloadedUser->getOtp4()); + } + + private function assertPersistedOtpState(User $user, string $expectedYubikey, string $expectedOtp1, string $expectedOtp2, string $expectedOtp3, string $expectedOtp4): void { + $reloadedUser = Factory::getUserFactory()->filter([ + Factory::FILTER => new QueryFilter(User::USERNAME, $user->getUsername(), '=') + ], true); + + $this->assertInstanceOf(User::class, $reloadedUser); + $this->assertSame($expectedYubikey, $reloadedUser->getYubikey()); + $this->assertSame($expectedOtp1, $reloadedUser->getOtp1()); + $this->assertSame($expectedOtp2, $reloadedUser->getOtp2()); + $this->assertSame($expectedOtp3, $reloadedUser->getOtp3()); + $this->assertSame($expectedOtp4, $reloadedUser->getOtp4()); + } + + private function assertSetOTPStoresValidPrefixThenActivatesYubikeyForSlot(int $slot): void { + $user = $this->createUser('setotp_happy_path_user_' . $slot); + $fullOtp = 'ccccccdefghdefghdefghdefghdefghdefghdefghi'; + $actions = [ + 1 => DAccountAction::SET_OTP1, + 2 => DAccountAction::SET_OTP2, + 3 => DAccountAction::SET_OTP3, + 4 => DAccountAction::SET_OTP4, + ]; + $expectedOtpValues = [ + 1 => '', + 2 => '', + 3 => '', + 4 => '', + ]; + $expectedOtpValues[$slot] = 'ccccccdefghd'; + + $otpArr = ['', '', '', '']; + $otpArr[$slot - 1] = $fullOtp; + + AccountUtils::setOTP($slot, $actions[$slot], $user, $otpArr); + $this->assertPersistedOtpState($user, '0', $expectedOtpValues[1], $expectedOtpValues[2], $expectedOtpValues[3], $expectedOtpValues[4]); + + AccountUtils::setOTP(0, DAccountAction::YUBIKEY_ENABLE, $user, ['', '', '', '']); + $this->assertPersistedOtpState($user, '1', $expectedOtpValues[1], $expectedOtpValues[2], $expectedOtpValues[3], $expectedOtpValues[4]); + } /* Local test helpers */ - private function createRightGroup(): RightGroup { - $group = $this->createDatabaseObject( - Factory::getRightGroupFactory(), - new RightGroup(null, 'phpunit-' . uniqid('', true), '[]') - ); - $this->assertTrue($group instanceof RightGroup); - return $group; - } - - private function createUser(string $prefix): User { - $username = $prefix . '_' . uniqid(); - $user = UserUtils::createUser($username, $username . '@example.com', $this->createRightGroup()->getId(), $this->adminUser); - $this->registerDatabaseObject(Factory::getUserFactory(), $user); - return $user; - } - - private function createUserWithPassword(string $prefix, string $password): User { - $user = $this->createUser($prefix); - UserUtils::setPassword($user->getId(), $password, $this->adminUser); - return $this->reloadUser($user); - } - - private function reloadUser(User $user): User { - $reloadedUser = Factory::getUserFactory()->filter([ - Factory::FILTER => new QueryFilter(User::USERNAME, $user->getUsername(), '=') - ], true); - - $this->assertInstanceOf(User::class, $reloadedUser); - return $reloadedUser; - } - - - + private function createUserWithPassword(string $prefix, string $password): User { + $user = $this->createUser($prefix); + UserUtils::setPassword($user->getId(), $password, $this->adminUser); + return $this->reloadUser($user); + } + + private function reloadUser(User $user): User { + $reloadedUser = Factory::getUserFactory()->filter([ + Factory::FILTER => new QueryFilter(User::USERNAME, $user->getUsername(), '=') + ], true); + + $this->assertInstanceOf(User::class, $reloadedUser); + return $reloadedUser; + } } \ No newline at end of file diff --git a/ci/phpunit/inc/utils/TaskUtilsTest.php b/ci/phpunit/inc/utils/TaskUtilsTest.php index 1806e5f44..79fefde3a 100644 --- a/ci/phpunit/inc/utils/TaskUtilsTest.php +++ b/ci/phpunit/inc/utils/TaskUtilsTest.php @@ -2,36 +2,23 @@ namespace Hashtopolis\inc\utils; -use Hashtopolis\inc\utils\UserUtils; -use Hashtopolis\inc\utils\TaskUtils; - use Exception; use Hashtopolis\dba\Factory; use Hashtopolis\dba\models\Task; use Hashtopolis\dba\models\TaskWrapper; -use Hashtopolis\dba\models\AccessGroup; -use Hashtopolis\dba\models\Hashlist; - - -use Hashtopolis\inc\defines\DHashlistFormat; use Hashtopolis\inc\defines\DTaskTypes; - use Hashtopolis\TestBase; //TODO remove: -use Hashtopolis\dba\models\RightGroup; use Hashtopolis\dba\models\User; require_once(dirname(__FILE__) . '/../../TestBase.php'); final class TaskUtilsTest extends TestBase { - private RightGroup $rightGroup1; - private AccessGroup $accessGroup1; private User $user1; - private Hashlist $hashlist1; private TaskWrapper $taskWrapper1, $taskWrapper2, $taskWrapper3; private Task $task1, $task2, $task3; @@ -41,35 +28,27 @@ protected function setUp(): void { $_SERVER['HTTP_HOST'] = $_SERVER['HTTP_HOST'] ?? 'localhost'; $_SERVER['SERVER_PORT'] = $_SERVER['SERVER_PORT'] ?? 80; - $this->rightGroup1 = $this->createRightGroup(); - - $this->user1 = $this->createUser(); - $this->user1->setRightGroupId($this->rightGroup1->getId()); - - $this->accessGroup1 = $this->createAccessGroup("1_"); - - $this->hashlist1 = $this->createHashlist($this->accessGroup1->getId()); - - $this->taskWrapper1 = $this->createTaskWrapper(99999, 0, 0, DTaskTypes::NORMAL, $this->hashlist1->getId()); - $this->taskWrapper1->setHashlistId($this->hashlist1->getId()); - $this->taskWrapper1->setAccessGroupId($this->accessGroup1->getId()); + $this->user1 = $this->createUser("task_utils_test"); + $accessGroup1 = $this->createAccessGroup("task_utils_test"); + $this->createAccessGroupUser($this->user1, $accessGroup1); + + $hashtype = $this->createHashtype(); + $hashlist1 = $this->createHashlist($accessGroup1, $hashtype); - $this->taskWrapper2 = $this->createTaskWrapper(99998, 0, 0, DTaskTypes::NORMAL, $this->hashlist1->getId()); - $this->taskWrapper2->setHashlistId($this->hashlist1->getId()); - $this->taskWrapper2->setAccessGroupId($this->accessGroup1->getId()); + $this->taskWrapper1 = $this->createTaskWrapper($accessGroup1, $hashlist1, DTaskTypes::SUPERTASK); - $this->taskWrapper3 = $this->createTaskWrapper(99997, 0, 0, DTaskTypes::NORMAL, $this->hashlist1->getId()); - $this->taskWrapper3->setHashlistId($this->hashlist1->getId()); - $this->taskWrapper3->setAccessGroupId($this->accessGroup1->getId()); + $this->taskWrapper2 = $this->createTaskWrapper($accessGroup1, $hashlist1); - $this->task1 = $this->createTask(99999, 'phpunit-' . uniqid(), '', 600, 5, 1000, 0, 0, 0, '', 0, 0, 1, 0, 1, 1, $this->taskWrapper1->getId()); - $this->task1->setTaskWrapperId($this->taskWrapper1->getId()); + $this->taskWrapper3 = $this->createTaskWrapper($accessGroup1, $hashlist1); + + $crackerBinaryType = $this->createCrackerBinaryType(); + $crackerBinary = $this->createCrackerBinary($crackerBinaryType); + + $this->task1 = $this->createTask($this->taskWrapper1, $crackerBinary, $crackerBinaryType); - $this->task2 = $this->createTask(99998, 'phpunit-' . uniqid(), '', 600, 5, 1000, 0, 0, 0, '', 0, 0, 1, 0, 1, 1, $this->taskWrapper1->getId()); - $this->task2->setTaskWrapperId($this->taskWrapper1->getId()); + $this->task2 = $this->createTask($this->taskWrapper1, $crackerBinary, $crackerBinaryType); - $this->task3 = $this->createTask(99997, 'phpunit-' . uniqid(), '', 600, 5, 1000, 0, 0, 0, '', 0, 0, 1, 0, 1, 1, $this->taskWrapper3->getId()); - $this->task3->setTaskWrapperId($this->taskWrapper3->getId()); + $this->task3 = $this->createTask($this->taskWrapper3, $crackerBinary, $crackerBinaryType); } /** @@ -156,12 +135,12 @@ public function testChangeAttackCmd(): void { * @throws Exception */ public function testArchiveTask(): void { - TaskUtils::archiveTask($this->task1->getId(), $this->user1); + TaskUtils::archiveTask($this->task3->getId(), $this->user1); - $taskWrapperUpdated = TaskUtils::getTaskWrapper($this->task1->getTaskWrapperId(), $this->user1); + $taskWrapperUpdated = TaskUtils::getTaskWrapper($this->task3->getTaskWrapperId(), $this->user1); $this->assertEquals(1, $taskWrapperUpdated->getIsArchived()); - $taskUpdated = Factory::getTaskFactory()->get($this->task1->getId()); + $taskUpdated = Factory::getTaskFactory()->get($this->task3->getId()); $this->assertEquals(1, $taskUpdated->getIsArchived()); } @@ -282,60 +261,4 @@ public function testSetCpuTask(): void { $taskUpdated = Factory::getTaskFactory()->get($this->task1->getId()); $this->assertEquals(0, $taskUpdated->getIsCpuTask()); } - - - - - - - - - - - - //TODO write more functions for creating test data like task wrappers, chunks, ... - //TODO use createObjectFromDict like functionality to create test data for more flexibility? - - public function createTask($taskId = 99999, $taskName = 'phpunit-task1', $attackCmd = '', $chunkTime = 600, $statusTimer = 5, $keyspace = 1000, $keyspaceProgress = 0, $priority = 0, $maxAgents = 0, $color = '', $isSmall = 0, $isCpuTask = 0, $useNewBench = 1, $skipKeyspace = 0, $crackerBinaryId = 1, $crackerBinaryTypeId = 1, $taskWrapperId = 999, $isArchived = 0, $notes = '', $staticChunks = 0, $chunkSize = 0, $forcePipe = 0, $usePreprocessor = 1, $preprocessorCommand = ''): Task { - $task = $this->createDatabaseObject(Factory::getTaskFactory(), new Task($taskId, $taskName, $attackCmd, $chunkTime, $statusTimer, $keyspace, $keyspaceProgress, $priority, $maxAgents, $color, $isSmall, $isCpuTask, $useNewBench, $skipKeyspace, $crackerBinaryId, $crackerBinaryTypeId, $taskWrapperId, $isArchived, $notes, $staticChunks, $chunkSize, $forcePipe, $usePreprocessor, $preprocessorCommand)); - $this->assertTrue($task instanceof Task); - return $task; - } - - public function createTaskWrapper($taskWrapperId = 99999, $priority = 0, $maxAgents = 0, $taskType = DTaskTypes::NORMAL, $hashlistId = 1, $accessGroupId = 1, $taskWrapperName = 'phpunit-taskwrapper1', $isArchived = 0, $cracked = 0): TaskWrapper { - $taskWrapper = $this->createDatabaseObject(Factory::getTaskWrapperFactory(), new TaskWrapper($taskWrapperId, $priority, $maxAgents, $taskType, $hashlistId, $accessGroupId, $taskWrapperName, $isArchived, $cracked)); - $this->assertTrue($taskWrapper instanceof TaskWrapper); - return $taskWrapper; - } - - //TODO make use of the hashlist-create function that will be in the HashlistUtilsTest - public function createHashlist($accessGroupId): Hashlist { - $hashlist = $this->createDatabaseObject(Factory::getHashlistFactory(), new Hashlist(null, 'phpunit-' . uniqid(), DHashlistFormat::PLAIN, 0, 1, '', 0, 0, 0, 0, $accessGroupId, '', 0, 0, 0)); - $this->assertTrue($hashlist instanceof Hashlist); - return $hashlist; - } - - //TODO make use of the user-create function that will be in the UserUtilsTest - public function createUser(): User { - $user = UserUtils::createUser('phpunit-' . uniqid(), 'phpunit-' . uniqid() . '@example.com', 1, UserUtils::getUser(1)); - $this->registerDatabaseObject(Factory::getUserFactory(), $user); - return $user; - } - - //TODO make use of the create function that will be in the AccessGroupUtilsTest - public function createAccessGroup(string $prefix): AccessGroup { - $group = $this->createDatabaseObject( - Factory::getAccessGroupFactory(), - new AccessGroup(null, $prefix . '_' . uniqid()) - ); - $this->assertTrue($group instanceof AccessGroup); - return $group; - } - - //TODO make use of the rightgroup-create function that will be in the UserUtilsTest - public function createRightGroup(): RightGroup { - $group = $this->createDatabaseObject(Factory::getRightGroupFactory(), new RightGroup(null, 'phpunit-' . uniqid('', true), '[]')); - $this->assertTrue($group instanceof RightGroup); - return $group; - } } diff --git a/ci/phpunit/inc/utils/UserUtilsTest.php b/ci/phpunit/inc/utils/UserUtilsTest.php index e1c7b9a9b..8ee5264b3 100644 --- a/ci/phpunit/inc/utils/UserUtilsTest.php +++ b/ci/phpunit/inc/utils/UserUtilsTest.php @@ -3,7 +3,6 @@ namespace Hashtopolis\inc\utils; use Hashtopolis\dba\Factory; -use Hashtopolis\dba\models\RightGroup; use Hashtopolis\dba\models\User; use Hashtopolis\dba\QueryFilter; use Hashtopolis\inc\apiv2\error\HttpConflict; @@ -102,12 +101,6 @@ public function testCreateUserThrowsWhenConfiguredSendMailFails(): void { } } - private function createRightGroup(): RightGroup { - $group = $this->createDatabaseObject(Factory::getRightGroupFactory(), new RightGroup(null, 'phpunit-' . uniqid('', true), '[]')); - $this->assertTrue($group instanceof RightGroup); - return $group; - } - private function uniqueUsername(string $prefix): string { return $prefix . '_' . uniqid(); } From 10d55d2af5ded330b0604d8f7843291d7b3679f6 Mon Sep 17 00:00:00 2001 From: Eric Wasson <229096365+Eric-Wasson@users.noreply.github.com> Date: Tue, 26 May 2026 12:43:04 +0200 Subject: [PATCH 604/691] Refactored TaskUtils tests --- ci/phpunit/inc/utils/TaskUtilsTest.php | 93 ++++++++++++++------------ 1 file changed, 51 insertions(+), 42 deletions(-) diff --git a/ci/phpunit/inc/utils/TaskUtilsTest.php b/ci/phpunit/inc/utils/TaskUtilsTest.php index 79fefde3a..894393759 100644 --- a/ci/phpunit/inc/utils/TaskUtilsTest.php +++ b/ci/phpunit/inc/utils/TaskUtilsTest.php @@ -24,31 +24,6 @@ final class TaskUtilsTest extends TestBase { protected function setUp(): void { parent::setUp(); - - $_SERVER['HTTP_HOST'] = $_SERVER['HTTP_HOST'] ?? 'localhost'; - $_SERVER['SERVER_PORT'] = $_SERVER['SERVER_PORT'] ?? 80; - - $this->user1 = $this->createUser("task_utils_test"); - $accessGroup1 = $this->createAccessGroup("task_utils_test"); - $this->createAccessGroupUser($this->user1, $accessGroup1); - - $hashtype = $this->createHashtype(); - $hashlist1 = $this->createHashlist($accessGroup1, $hashtype); - - $this->taskWrapper1 = $this->createTaskWrapper($accessGroup1, $hashlist1, DTaskTypes::SUPERTASK); - - $this->taskWrapper2 = $this->createTaskWrapper($accessGroup1, $hashlist1); - - $this->taskWrapper3 = $this->createTaskWrapper($accessGroup1, $hashlist1); - - $crackerBinaryType = $this->createCrackerBinaryType(); - $crackerBinary = $this->createCrackerBinary($crackerBinaryType); - - $this->task1 = $this->createTask($this->taskWrapper1, $crackerBinary, $crackerBinaryType); - - $this->task2 = $this->createTask($this->taskWrapper1, $crackerBinary, $crackerBinaryType); - - $this->task3 = $this->createTask($this->taskWrapper3, $crackerBinary, $crackerBinaryType); } /** @@ -58,9 +33,11 @@ protected function setUp(): void { * @throws Exception */ public function testEditNotes(): void { - TaskUtils::editNotes($this->task1->getId(), 'task note', $this->user1); + $taskObjects = $this->createTaskHelper(); + + TaskUtils::editNotes($taskObjects["task"]->getId(), 'task note', $taskObjects["user"]); - $taskUpdated = Factory::getTaskFactory()->get($this->task1->getId()); + $taskUpdated = Factory::getTaskFactory()->get($taskObjects["task"]->getId()); $this->assertEquals('task note', $taskUpdated->getNotes()); } @@ -103,9 +80,10 @@ public function testGetStatus(): void { * @throws Exception */ public function testChangeAttackCmd(): void { - TaskUtils::changeAttackCmd($this->task1->getId(), '#HL# custom attack cmd', $this->user1); + $taskObjects = $this->createTaskHelper(); + TaskUtils::changeAttackCmd($taskObjects["task"]->getId(), '#HL# custom attack cmd', $taskObjects["user"]); - $taskUpdated = Factory::getTaskFactory()->get($this->task1->getId()); + $taskUpdated = Factory::getTaskFactory()->get($taskObjects["task"]->getId()); $this->assertEquals('#HL# custom attack cmd', $taskUpdated->getAttackCmd()); } @@ -135,12 +113,13 @@ public function testChangeAttackCmd(): void { * @throws Exception */ public function testArchiveTask(): void { - TaskUtils::archiveTask($this->task3->getId(), $this->user1); + $taskObjects = $this->createTaskHelper(); + TaskUtils::archiveTask($taskObjects["task"]->getId(), $taskObjects["user"]); - $taskWrapperUpdated = TaskUtils::getTaskWrapper($this->task3->getTaskWrapperId(), $this->user1); + $taskWrapperUpdated = TaskUtils::getTaskWrapper($taskObjects["task"]->getTaskWrapperId(), $taskObjects["user"]); $this->assertEquals(1, $taskWrapperUpdated->getIsArchived()); - $taskUpdated = Factory::getTaskFactory()->get($this->task3->getId()); + $taskUpdated = Factory::getTaskFactory()->get($taskObjects["task"]->getId()); $this->assertEquals(1, $taskUpdated->getIsArchived()); } @@ -220,7 +199,8 @@ public function testArchiveTask(): void { * @throws Exception */ public function testGetTaskOfWrapper(): void { - $this->assertEquals($this->task3->getId(), TaskUtils::getTaskOfWrapper($this->taskWrapper3->getId())->getId()); + $taskObjects = $this->createTaskHelper(); + $this->assertEquals($taskObjects["task"]->getId(), TaskUtils::getTaskOfWrapper($taskObjects["taskWrapper"]->getId())->getId()); } /** @@ -229,9 +209,10 @@ public function testGetTaskOfWrapper(): void { * @return void * @throws Exception */ - public function testGetTasksOfWrapper(): void { + /*public function testGetTasksOfWrapper(): void { + //TODO create supertask $this->assertEquals(2, count(TaskUtils::getTasksOfWrapper($this->taskWrapper1->getId()))); - } + }*/ /** * Test getting task wrappers for a user. @@ -239,9 +220,18 @@ public function testGetTasksOfWrapper(): void { * @return void * @throws Exception */ - public function testGetTaskWrappersForUser(): void { - $this->assertEquals(3, count(TaskUtils::getTaskWrappersForUser($this->user1))); - } + /*public function testGetTaskWrappersForUser(): void { + $taskObjects = $this->createTaskHelper(); + $taskObjects2 = $this->createTaskHelper(); + + $taskObjects2["taskWrapper"]->setAccessGroupId($taskObjects["accessGroup"]->getId()); + //$this->createAccessGroupUser($taskObjects2["user"], $taskObjects["accessGroup"]); + + //var_dump($taskObjects); + //var_dump($taskObjects2); + + $this->assertEquals(2, count(TaskUtils::getTaskWrappersForUser($taskObjects["user"]))); + }*/ /** @@ -251,14 +241,33 @@ public function testGetTaskWrappersForUser(): void { * @throws Exception */ public function testSetCpuTask(): void { + $taskObjects = $this->createTaskHelper(); + //Set to CPU-only - TaskUtils::setCpuTask($this->task1->getId(), 1, $this->user1); - $taskUpdated = Factory::getTaskFactory()->get($this->task1->getId()); + TaskUtils::setCpuTask($taskObjects["task"]->getId(), 1, $taskObjects["user"]); + $taskUpdated = Factory::getTaskFactory()->get($taskObjects["task"]->getId()); $this->assertEquals(1, $taskUpdated->getIsCpuTask()); //Set to use GPU and CPU - TaskUtils::setCpuTask($this->task1->getId(), 0, $this->user1); - $taskUpdated = Factory::getTaskFactory()->get($this->task1->getId()); + TaskUtils::setCpuTask($taskObjects["task"]->getId(), 0, $taskObjects["user"]); + $taskUpdated = Factory::getTaskFactory()->get($taskObjects["task"]->getId()); $this->assertEquals(0, $taskUpdated->getIsCpuTask()); } + + public function createTaskHelper(): array { + $user = $this->createUser("phpunit"); + $accessGroup = $this->createAccessGroup("phpunit"); + $this->createAccessGroupUser($user, $accessGroup); + + $hashType = $this->createHashType(); + $hashlist = $this->createHashlist($accessGroup, $hashType); + + $taskWrapper = $this->createTaskWrapper($accessGroup, $hashlist); + + $crackerBinaryType = $this->createCrackerBinaryType(); + $crackerBinary = $this->createCrackerBinary($crackerBinaryType); + $task = $this->createTask($taskWrapper, $crackerBinary, $crackerBinaryType); + + return array("user"=> $user, "accessGroup"=>$accessGroup, "hashType"=>$hashType, "hashlist"=>$hashlist, "taskWrapper"=>$taskWrapper, "crackerBinaryType"=>$crackerBinaryType, "crackerBinary"=>$crackerBinary, "task"=>$task); + } } From 9865693b466ed586660e7d9cf339fd429de7052f Mon Sep 17 00:00:00 2001 From: Sein Coray Date: Wed, 27 May 2026 11:41:58 +0200 Subject: [PATCH 605/691] Correctly use task object to aggregate task information For the aggregations instead of the task ID, the taskwrapper ID was used, causing wrong values for the resulting data. --- src/inc/apiv2/model/TaskWrapperDisplayAPI.php | 17 +++++++++-------- 1 file changed, 9 insertions(+), 8 deletions(-) diff --git a/src/inc/apiv2/model/TaskWrapperDisplayAPI.php b/src/inc/apiv2/model/TaskWrapperDisplayAPI.php index c10b2398b..6d81148c5 100644 --- a/src/inc/apiv2/model/TaskWrapperDisplayAPI.php +++ b/src/inc/apiv2/model/TaskWrapperDisplayAPI.php @@ -93,21 +93,23 @@ function aggregateData(object $object, array &$included_data = [], ?array $aggre } $aggregatedData['status'] = $status; - - $keyspace = $object->getKeyspace(); - $keyspaceProgress = $object->getKeyspaceProgress(); if ($object->getTaskType() === DTaskTypes::NORMAL) { + $task = $tasks[0]; + + $keyspace = $task->getKeyspace(); + $keyspaceProgress = $task->getKeyspaceProgress(); + if (is_null($aggregateFieldsets) || in_array("dispatched", $aggregateFieldsets['taskwrapperdisplay'])) { $aggregatedData["dispatched"] = Util::showperc($keyspaceProgress, $keyspace); - } + } if (is_null($aggregateFieldsets) || in_array("searched", $aggregateFieldsets['taskwrapperdisplay'])) { - $aggregatedData["searched"] = Util::showperc(TaskUtils::getTaskProgress($object), $keyspace); + $aggregatedData["searched"] = Util::showperc(TaskUtils::getTaskProgress($task), $keyspace); } if (!isset($chunks)){ - $qF = new QueryFilter(Chunk::TASK_ID, $object->getId(), "="); + $qF = new QueryFilter(Chunk::TASK_ID, $task->getId(), "="); $chunks = Factory::getChunkFactory()->filter([Factory::FILTER => $qF]); } @@ -137,7 +139,6 @@ function aggregateData(object $object, array &$included_data = [], ?array $aggre } } - $keyspace = $object->getKeyspace(); $estimatedTime = ($keyspace > 0 && $cProgress > 0) ? round($timeSpent / ($cProgress / $keyspace) - $timeSpent) : 0; $aggregatedData["estimatedTime"] = $estimatedTime; $aggregatedData["timeSpent"] = $timeSpent; @@ -146,7 +147,7 @@ function aggregateData(object $object, array &$included_data = [], ?array $aggre $assignedAgents = []; if (is_null($aggregateFieldsets) || in_array("assignedAgents", $aggregateFieldsets['task'])) { - $qF = new QueryFilter(Assignment::TASK_ID, $object->getTaskId(), "="); + $qF = new QueryFilter(Assignment::TASK_ID, $task->getId(), "="); $assignedAgents = Factory::getAssignmentFactory()->countFilter([Factory::FILTER => $qF]); $aggregatedData["totalAssignedAgents"] = $assignedAgents; } From 20a389765cd538000bdfda1fecf8a16351bc7fcb Mon Sep 17 00:00:00 2001 From: Eric Wasson <229096365+Eric-Wasson@users.noreply.github.com> Date: Wed, 27 May 2026 14:18:47 +0200 Subject: [PATCH 606/691] Fixed PHPStan errors --- ci/phpunit/inc/utils/TaskUtilsTest.php | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/ci/phpunit/inc/utils/TaskUtilsTest.php b/ci/phpunit/inc/utils/TaskUtilsTest.php index 894393759..92bf8012d 100644 --- a/ci/phpunit/inc/utils/TaskUtilsTest.php +++ b/ci/phpunit/inc/utils/TaskUtilsTest.php @@ -18,10 +18,7 @@ require_once(dirname(__FILE__) . '/../../TestBase.php'); final class TaskUtilsTest extends TestBase { - private User $user1; - private TaskWrapper $taskWrapper1, $taskWrapper2, $taskWrapper3; - private Task $task1, $task2, $task3; - + protected function setUp(): void { parent::setUp(); } From d58a96f6c2fa098102cd3e343d91f44281eefe8e Mon Sep 17 00:00:00 2001 From: Sein Coray Date: Thu, 28 May 2026 13:13:57 +0200 Subject: [PATCH 607/691] moved keyspace outside if --- src/inc/apiv2/model/TaskWrapperDisplayAPI.php | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/inc/apiv2/model/TaskWrapperDisplayAPI.php b/src/inc/apiv2/model/TaskWrapperDisplayAPI.php index 6d81148c5..5f4b724d4 100644 --- a/src/inc/apiv2/model/TaskWrapperDisplayAPI.php +++ b/src/inc/apiv2/model/TaskWrapperDisplayAPI.php @@ -94,12 +94,12 @@ function aggregateData(object $object, array &$included_data = [], ?array $aggre $aggregatedData['status'] = $status; + $keyspace = $object->getKeyspace(); + $keyspaceProgress = $object->getKeyspaceProgress(); + if ($object->getTaskType() === DTaskTypes::NORMAL) { $task = $tasks[0]; - $keyspace = $task->getKeyspace(); - $keyspaceProgress = $task->getKeyspaceProgress(); - if (is_null($aggregateFieldsets) || in_array("dispatched", $aggregateFieldsets['taskwrapperdisplay'])) { $aggregatedData["dispatched"] = Util::showperc($keyspaceProgress, $keyspace); } From 0f00226261a02c7658a709fa30fd4db66ef91923 Mon Sep 17 00:00:00 2001 From: Drew Blokzyl Date: Thu, 28 May 2026 08:31:48 -0400 Subject: [PATCH 608/691] fix: URL-encode and shell-escape sqlx migration DSN The migration DSN in src/inc/startup/setup.php was built by string concatenation and passed unquoted, non-URL-encoded into exec(). Database passwords/usernames containing URL-special (@ : / # ? [ ]) or shell-special ($ & ; | space etc.) characters corrupted the DSN and broke server startup. rawurlencode() the userinfo and escapeshellarg() the exec arguments. Affects both the mysql and postgres DSNs. --- src/inc/startup/setup.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/inc/startup/setup.php b/src/inc/startup/setup.php index 539d42a6b..13eb65ddb 100755 --- a/src/inc/startup/setup.php +++ b/src/inc/startup/setup.php @@ -52,8 +52,8 @@ } $output = []; -$database_uri = StartupConfig::getInstance()->getDatabaseType() . "://" . StartupConfig::getInstance()->getDatabaseUser() . ":" . StartupConfig::getInstance()->getDatabasePassword() . "@" . StartupConfig::getInstance()->getDatabaseServer() . ":" . StartupConfig::getInstance()->getDatabasePort() . "/" . StartupConfig::getInstance()->getDatabaseDB(); -exec('/usr/bin/sqlx migrate run --source ' . dirname(__FILE__) . '/../../migrations/' . StartupConfig::getInstance()->getDatabaseType() . '/ -D ' . $database_uri, $output, $retval); +$database_uri = StartupConfig::getInstance()->getDatabaseType() . "://" . rawurlencode(StartupConfig::getInstance()->getDatabaseUser()) . ":" . rawurlencode(StartupConfig::getInstance()->getDatabasePassword()) . "@" . StartupConfig::getInstance()->getDatabaseServer() . ":" . StartupConfig::getInstance()->getDatabasePort() . "/" . StartupConfig::getInstance()->getDatabaseDB(); +exec('/usr/bin/sqlx migrate run --source ' . escapeshellarg(dirname(__FILE__) . '/../../migrations/' . StartupConfig::getInstance()->getDatabaseType() . '/') . ' -D ' . escapeshellarg($database_uri), $output, $retval); if ($retval !== 0) { echo "Failed to run migrations: \n" . implode("\n", $output); exit(-1); From 66aaf62678680fa82b0981b6a9102618dffa1003 Mon Sep 17 00:00:00 2001 From: andreas Date: Mon, 1 Jun 2026 11:19:22 +0200 Subject: [PATCH 609/691] Restored .gitignore contents --- .gitignore | 32 ++++++++++++++++++++++++++++++++ 1 file changed, 32 insertions(+) diff --git a/.gitignore b/.gitignore index 165765a1f..957ba85ad 100755 --- a/.gitignore +++ b/.gitignore @@ -1 +1,33 @@ +/.buildpath +/.project +/.settings/ +query.log +.idea/ +*.iml +src/files/* +!src/files/.htaccess +/ci/db-backups/ +.vs/ +*.phpproj +*.sln +*.phpproj.user +*.lock* + +# the public keys for oauth +jwks.json + +# dynamically created by installer +src/install/.htaccess + +# for docker stuff +.env + +# for composer stuff +vendor + +# For python cache files +__pycache__ +.pytest_cache + +site/ .phpunit.result.cache From 761645775114291f4743ebaac15af24037c111f5 Mon Sep 17 00:00:00 2001 From: s3inlc Date: Tue, 2 Jun 2026 09:51:59 +0200 Subject: [PATCH 610/691] adding migration to fix mysql silently altering table entries on auto increment --- .../20260602074349_mysql-autoincrement-fix.sql | 13 +++++++++++++ .../20260602074349_mysql-autoincrement-fix.sql | 1 + 2 files changed, 14 insertions(+) create mode 100644 src/migrations/mysql/20260602074349_mysql-autoincrement-fix.sql create mode 100644 src/migrations/postgres/20260602074349_mysql-autoincrement-fix.sql diff --git a/src/migrations/mysql/20260602074349_mysql-autoincrement-fix.sql b/src/migrations/mysql/20260602074349_mysql-autoincrement-fix.sql new file mode 100644 index 000000000..a57a75f38 --- /dev/null +++ b/src/migrations/mysql/20260602074349_mysql-autoincrement-fix.sql @@ -0,0 +1,13 @@ +-- The previous migration could affect the HashType 0 to be changed due to mysql silently on autoincrement application. +UPDATE HashType +SET hashTypeId = 0 +WHERE hashTypeId = 100000 + AND description = 'MD5' + AND NOT EXISTS ( + SELECT 1 + FROM ( + SELECT 1 + FROM HashType + WHERE hashTypeId = 0 + ) AS temp_check +); \ No newline at end of file diff --git a/src/migrations/postgres/20260602074349_mysql-autoincrement-fix.sql b/src/migrations/postgres/20260602074349_mysql-autoincrement-fix.sql new file mode 100644 index 000000000..5c12d9e57 --- /dev/null +++ b/src/migrations/postgres/20260602074349_mysql-autoincrement-fix.sql @@ -0,0 +1 @@ +-- This migration is only a placeholder to keep migrations parallel From 38f094fb4c1259b7eaf4345644327f055f2a6409 Mon Sep 17 00:00:00 2001 From: jessevz Date: Tue, 2 Jun 2026 16:36:03 +0200 Subject: [PATCH 611/691] Fixed apitoken permission check by correctly parsing the permissions --- src/inc/apiv2/auth/JWTBeforeHandler.php | 3 ++- src/inc/apiv2/common/AbstractBaseAPI.php | 30 ++++++++++++++---------- 2 files changed, 19 insertions(+), 14 deletions(-) diff --git a/src/inc/apiv2/auth/JWTBeforeHandler.php b/src/inc/apiv2/auth/JWTBeforeHandler.php index 1eaf318d4..5336e5c34 100644 --- a/src/inc/apiv2/auth/JWTBeforeHandler.php +++ b/src/inc/apiv2/auth/JWTBeforeHandler.php @@ -26,6 +26,7 @@ public function __invoke(ServerRequestInterface $request, array $arguments): Ser } } // adds the decoded userId and scope to the request attributes - return $request->withAttribute("userId", $arguments["decoded"]["userId"])->withAttribute("scope", $arguments["decoded"]["scope"]); + return $request->withAttribute("userId", $arguments["decoded"]["userId"])->withAttribute("scope", $arguments["decoded"]["scope"]) + ->withAttribute("aud", $arguments["decoded"]["aud"]); } } \ No newline at end of file diff --git a/src/inc/apiv2/common/AbstractBaseAPI.php b/src/inc/apiv2/common/AbstractBaseAPI.php index ad512b51d..9a651211e 100644 --- a/src/inc/apiv2/common/AbstractBaseAPI.php +++ b/src/inc/apiv2/common/AbstractBaseAPI.php @@ -1091,7 +1091,7 @@ protected function makeExpandables(Request $request, array $validExpandables): a } array_push($required_perms, ...$expandedPerms); } - $permissionResponse = $this->validatePermissions($request->getAttribute("scope"), $required_perms, $request->getMethod(), $permsExpandMatching); + $permissionResponse = $this->validatePermissions($request->getAttribute("scope"), $required_perms, $request->getMethod(), $request->getAttribute("aud"), $permsExpandMatching); $expands_to_remove = []; // remove expands with missing permissions @@ -1406,7 +1406,7 @@ protected function processExpands( /** * Validate permissions */ - protected function validatePermissions(string $permissions, array $required_perms, string $method, array $permsExpandMatching = []): bool|array { + protected function validatePermissions(string $permissions, array $required_perms, string $method, string $aud, array $permsExpandMatching = []): bool|array { // Retrieve permissions from RightGroup part of the User if ($permissions == 'ALL') { @@ -1417,17 +1417,21 @@ protected function validatePermissions(string $permissions, array $required_perm else { $rightgroup_perms = json_decode($permissions, true); } + + if ($aud === "user_hashtopolis") { + // Validate if no undefined permissions are set in $acl_mapping for the legacy permissions + assert(count(array_diff(array_keys($rightgroup_perms), array_keys(self::$acl_mapping))) == 0); + // Create listing of available permissions for user + $user_available_perms = array(); + foreach ($rightgroup_perms as $rightgroup_perm => $permission_set) { + if ($permission_set) { + $user_available_perms = array_unique(array_merge($user_available_perms, self::$acl_mapping[$rightgroup_perm])); + } + }; + } else { + $user_available_perms = array_keys($rightgroup_perms, true, true); + } - // Validate if no undefined permissions are set in $acl_mapping - assert(count(array_diff(array_keys($rightgroup_perms), array_keys(self::$acl_mapping))) == 0); - - // Create listing of available permissions for user - $user_available_perms = array(); - foreach ($rightgroup_perms as $rightgroup_perm => $permission_set) { - if ($permission_set) { - $user_available_perms = array_unique(array_merge($user_available_perms, self::$acl_mapping[$rightgroup_perm])); - } - }; // Sort to display values in a unified format for user and debugging sort($required_perms); @@ -1541,7 +1545,7 @@ protected function preCommon(Request $request): void { ); } - if ($this->validatePermissions($request->getAttribute("scope"), $required_perms, $request->getMethod()) === FALSE) { + if ($this->validatePermissions($request->getAttribute("scope"), $required_perms, $request->getMethod(), $request->getAttribute("aud")) === FALSE) { throw new HttpForbidden(join('||', $this->permissionErrors)); } } From 7701b21ffebbe2d5719225cb0023cb30db72c00d Mon Sep 17 00:00:00 2001 From: jessevz Date: Tue, 2 Jun 2026 16:44:47 +0200 Subject: [PATCH 612/691] Fixed copilot suggestion --- src/inc/apiv2/auth/JWTBeforeHandler.php | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/src/inc/apiv2/auth/JWTBeforeHandler.php b/src/inc/apiv2/auth/JWTBeforeHandler.php index 5336e5c34..73fc512fc 100644 --- a/src/inc/apiv2/auth/JWTBeforeHandler.php +++ b/src/inc/apiv2/auth/JWTBeforeHandler.php @@ -25,8 +25,9 @@ public function __invoke(ServerRequestInterface $request, array $arguments): Ser throw new HttpForbidden("Token is revoked"); } } - // adds the decoded userId and scope to the request attributes + // adds the decoded userId, scope and aud to the request attributes + $aud = $arguments["decoded"]["aud"] ?? "user_hashtopolis"; return $request->withAttribute("userId", $arguments["decoded"]["userId"])->withAttribute("scope", $arguments["decoded"]["scope"]) - ->withAttribute("aud", $arguments["decoded"]["aud"]); + ->withAttribute("aud", $aud); } } \ No newline at end of file From 13cfac1ab01309d4f1bf3eee595eb3f6f59836b9 Mon Sep 17 00:00:00 2001 From: s3inlc Date: Thu, 4 Jun 2026 14:33:45 +0200 Subject: [PATCH 613/691] prepare for release --- doc/changelog.md | 32 ++++++++++++++++++++++++++++++++ src/inc/StartupConfig.php | 2 +- 2 files changed, 33 insertions(+), 1 deletion(-) diff --git a/doc/changelog.md b/doc/changelog.md index 55192bf28..0fac30952 100644 --- a/doc/changelog.md +++ b/doc/changelog.md @@ -1,5 +1,37 @@ # Changelog +## v1.0.0-rainbow6 -> v1.0.0-rc1 + +**Bugfixes** + +- Get correct intersection of legacy api permissions instead of new CRUD (#2067) +- Setting alias properly for right group primary key (#2085) +- Fixed missing color labeling of tasks (#2053) +- Fixed float cast warnings on the old UI for dev builds (#2087) +- Fixed chunk count missing on task details and percentage sign missing (#2099) +- Fixed CORS errors (#2080) +- Fixed file upload metadata handling (#2126) +- Check for existing of array key before accessing it (#2122) +- Fixed pagination with reverse sort on no unique keys (#2127) +- Check for null value before strlen (#2155) +- Correctly use task object to aggregate task information (#2169) +- Fixed URL-encode and shell-escape sqlx migration DSN (#2175) +- Adding migration to fix mysql silently altering table entries on autoincrement (#2192) +- Fixed apitoken permission check by correctly parsing the permissions (#2196) + +**Enhancements** + +- Removed rule splitting (#1992) +- Upgrade composer packages (#2056) +- Configured sendmail in dev/ci environments to return immediately (#2055) +- Removed isChunkingAvilable references (#2075) +- Moved display error handling to dockerfile (#2002) +- Added enhancement backend endpoint for hash heatmap (#2068) +- Added estimated time, timespent, currentspeed and currentprogress to taskwrapper view (#2101) +- Access groups also should be enforced on admin permissions (#2116) +- Update time filter to use one year from current time (#2133) +- Added assigned agents to taskwrapperdisplay (#2154) + ## v1.0.0-rainbow5 -> v1.0.0-rainbow6 **Bugfixes** diff --git a/src/inc/StartupConfig.php b/src/inc/StartupConfig.php index 6c2621ab6..d5bdcfa76 100644 --- a/src/inc/StartupConfig.php +++ b/src/inc/StartupConfig.php @@ -234,7 +234,7 @@ public function getPepper(int $index): string { } public function getVersion(): string { - return "v1.0.0-rainbow6"; + return "v1.0.0-rc1"; } public function getBuild(): string { From 0eebfa727db33d09080cf47bcc3632de05ace73f Mon Sep 17 00:00:00 2001 From: s3inlc Date: Tue, 16 Jun 2026 08:40:53 +0200 Subject: [PATCH 614/691] added crackingTime aggregated fieldset for agent to allow the frontend to query this efficiently --- src/inc/apiv2/model/AgentAPI.php | 36 ++++++++++++++++--- src/inc/apiv2/model/ApiTokenAPI.php | 2 +- src/inc/apiv2/model/PreTaskAPI.php | 2 +- src/inc/apiv2/model/TaskAPI.php | 2 +- src/inc/apiv2/model/TaskWrapperDisplayAPI.php | 2 +- 5 files changed, 36 insertions(+), 8 deletions(-) diff --git a/src/inc/apiv2/model/AgentAPI.php b/src/inc/apiv2/model/AgentAPI.php index 917eeac53..b6c832d8e 100644 --- a/src/inc/apiv2/model/AgentAPI.php +++ b/src/inc/apiv2/model/AgentAPI.php @@ -2,6 +2,8 @@ namespace Hashtopolis\inc\apiv2\model; +use Exception; +use Hashtopolis\dba\Aggregation; use Hashtopolis\inc\utils\AccessUtils; use Hashtopolis\inc\utils\AgentUtils; use Hashtopolis\inc\defines\DHashcatStatus; @@ -45,16 +47,27 @@ protected function getUpdateHandlers($id, $current_user): array { ]; } + public function getAggregateFieldsets(): array { + return [ + 'agent' => [ + 'crackingTime', + ] + ]; + } + /** * Overridable function to aggregate data in the object. active chunk of agent is appended to * $included_data. * * @param object $object the agent object were data is aggregated from - * @param array &$included_data + * @param array &$includedData * @param array|null $aggregateFieldsets * @return array not used here + * @throws Exception */ - function aggregateData(object $object, array &$included_data = [], ?array $aggregateFieldsets = null): array { + function aggregateData(object $object, array &$includedData = [], ?array $aggregateFieldsets = null): array { + $aggregatedData = []; + $agentId = $object->getId(); $qFs = []; $qFs[] = new QueryFilter(Chunk::AGENT_ID, $agentId, "="); @@ -62,10 +75,25 @@ function aggregateData(object $object, array &$included_data = [], ?array $aggre $active_chunk = Factory::getChunkFactory()->filter([Factory::FILTER => $qFs], true); if ($active_chunk !== NULL) { - $included_data["chunks"][$agentId] = [$active_chunk]; + $includedData["chunks"][$agentId] = [$active_chunk]; + } + + if (array_key_exists('agent', $aggregateFieldsets)) { + $aggregateFieldsets['agent'] = explode(",", $aggregateFieldsets['agent']); + + if (in_array("crackingTime", $aggregateFieldsets['agent'])) { + // in order to make sense of the diff, we need to make sure that both values solve time and dispatch time are set (i.e. >0). + $qF1 = new QueryFilter(Chunk::AGENT_ID, $agentId, "="); + $qF2 = new QueryFilter(Chunk::SOLVE_TIME, ">", 0); + $qF3 = new QueryFilter(Chunk::DISPATCH_TIME, ">", 0); + $agg1 = new Aggregation(Chunk::SOLVE_TIME, Aggregation::SUM); + $agg2 = new Aggregation(Chunk::DISPATCH_TIME, Aggregation::SUM); + $results = Factory::getChunkFactory()->multicolAggregationFilter([Factory::FILTER => [$qF1, $qF2, $qF3]], [$agg1, $agg2]); + $aggregatedData["crackingTime"] = $results[$agg1->getName()] - $results[$agg2->getName()]; + } } - return []; + return $aggregatedData; } protected function getSingleACL(User $user, object $object): bool { diff --git a/src/inc/apiv2/model/ApiTokenAPI.php b/src/inc/apiv2/model/ApiTokenAPI.php index 3b9e6a624..883a5886e 100644 --- a/src/inc/apiv2/model/ApiTokenAPI.php +++ b/src/inc/apiv2/model/ApiTokenAPI.php @@ -108,7 +108,7 @@ protected function createObject(array $data): int { return $token->getId(); } - function aggregateData(object $object, array &$included_data = [], ?array $aggregateFieldsets = null): array { + function aggregateData(object $object, array &$includedData = [], ?array $aggregateFieldsets = null): array { // $token is only set in POST, this way the actual token is only returned after creation. $aggregatedData = []; $token = $this->getJwtToken(); diff --git a/src/inc/apiv2/model/PreTaskAPI.php b/src/inc/apiv2/model/PreTaskAPI.php index 17b87cc72..39369724e 100644 --- a/src/inc/apiv2/model/PreTaskAPI.php +++ b/src/inc/apiv2/model/PreTaskAPI.php @@ -69,7 +69,7 @@ protected function createObject(array $data): int { } //TODO make aggregate data queryable and not included by default - function aggregateData(object $object, array &$included_data = [], ?array $aggregateFieldsets = null): array { + function aggregateData(object $object, array &$includedData = [], ?array $aggregateFieldsets = null): array { $aggregatedData = []; if (is_null($aggregateFieldsets) || array_key_exists('pretask', $aggregateFieldsets)) { diff --git a/src/inc/apiv2/model/TaskAPI.php b/src/inc/apiv2/model/TaskAPI.php index 124cfa495..4d301e4c7 100644 --- a/src/inc/apiv2/model/TaskAPI.php +++ b/src/inc/apiv2/model/TaskAPI.php @@ -183,7 +183,7 @@ protected function createObject(array $data): int { } //TODO make aggregate data queryable and not included by default - function aggregateData(object $object, array &$included_data = [], ?array $aggregateFieldsets = null): array { + function aggregateData(object $object, array &$includedData = [], ?array $aggregateFieldsets = null): array { $aggregatedData = []; if (is_null($aggregateFieldsets) || array_key_exists('task', $aggregateFieldsets)) { diff --git a/src/inc/apiv2/model/TaskWrapperDisplayAPI.php b/src/inc/apiv2/model/TaskWrapperDisplayAPI.php index 5f4b724d4..215588609 100644 --- a/src/inc/apiv2/model/TaskWrapperDisplayAPI.php +++ b/src/inc/apiv2/model/TaskWrapperDisplayAPI.php @@ -63,7 +63,7 @@ protected function getFilterACL(): array { } //TODO make aggregate data queryable and not included by default - function aggregateData(object $object, array &$included_data = [], ?array $aggregateFieldsets = null): array { + function aggregateData(object $object, array &$includedData = [], ?array $aggregateFieldsets = null): array { $aggregatedData = []; if (is_null($aggregateFieldsets) || array_key_exists('taskwrapperdisplay', $aggregateFieldsets)) { $tasks = TaskUtils::getTasksOfWrapper($object->getId()); From 664adc11c75282b2d8a2ee25dfb8c58c5b6992a3 Mon Sep 17 00:00:00 2001 From: s3inlc Date: Tue, 16 Jun 2026 08:52:09 +0200 Subject: [PATCH 615/691] fixed small issue --- src/inc/apiv2/model/AgentAPI.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/inc/apiv2/model/AgentAPI.php b/src/inc/apiv2/model/AgentAPI.php index b6c832d8e..66abb4f74 100644 --- a/src/inc/apiv2/model/AgentAPI.php +++ b/src/inc/apiv2/model/AgentAPI.php @@ -84,8 +84,8 @@ function aggregateData(object $object, array &$includedData = [], ?array $aggreg if (in_array("crackingTime", $aggregateFieldsets['agent'])) { // in order to make sense of the diff, we need to make sure that both values solve time and dispatch time are set (i.e. >0). $qF1 = new QueryFilter(Chunk::AGENT_ID, $agentId, "="); - $qF2 = new QueryFilter(Chunk::SOLVE_TIME, ">", 0); - $qF3 = new QueryFilter(Chunk::DISPATCH_TIME, ">", 0); + $qF2 = new QueryFilter(Chunk::SOLVE_TIME, 0, ">"); + $qF3 = new QueryFilter(Chunk::DISPATCH_TIME, 0, ">"); $agg1 = new Aggregation(Chunk::SOLVE_TIME, Aggregation::SUM); $agg2 = new Aggregation(Chunk::DISPATCH_TIME, Aggregation::SUM); $results = Factory::getChunkFactory()->multicolAggregationFilter([Factory::FILTER => [$qF1, $qF2, $qF3]], [$agg1, $agg2]); From 85a51c25b6f27d93a3725b6d1912b9e1818bb4b1 Mon Sep 17 00:00:00 2001 From: s3inlc Date: Tue, 16 Jun 2026 11:39:43 +0200 Subject: [PATCH 616/691] completed all aggregations for Task and PreTask, added columnFilter with multiple columns --- ci/phpunit/dba/AbstractModelFactoryTest.php | 48 ++++++++- src/dba/AbstractModelFactory.php | 22 +++- src/inc/apiv2/model/PreTaskAPI.php | 36 ++++--- src/inc/apiv2/model/TaskAPI.php | 112 +++++++++++--------- src/inc/utils/TaskUtils.php | 51 +++++++-- 5 files changed, 189 insertions(+), 80 deletions(-) diff --git a/ci/phpunit/dba/AbstractModelFactoryTest.php b/ci/phpunit/dba/AbstractModelFactoryTest.php index ee8437505..8eb27a644 100644 --- a/ci/phpunit/dba/AbstractModelFactoryTest.php +++ b/ci/phpunit/dba/AbstractModelFactoryTest.php @@ -589,6 +589,49 @@ public function testColumnFilterSuccess(): void { $this->assertEquals([1, 125, 72], $column); } + /** + * Test receiving the column of a query with an order + * + * @return void + * @throws Exception + */ + public function testColumnFilterSuccessOrdered(): void { + $testid = uniqid(); + $this->createDatabaseObject(Factory::getHashTypeFactory(), new HashType(null, 'hashtype1' . $testid, 1, 0)); + $this->createDatabaseObject(Factory::getHashTypeFactory(), new HashType(null, 'hashtype2' . $testid, 125, 0)); + $this->createDatabaseObject(Factory::getHashTypeFactory(), new HashType(null, 'hashtype3' . $testid, 72, 0)); + + $qF = new LikeFilter(HashType::DESCRIPTION, "%" . $testid); + $oF = new OrderFilter(HashType::IS_SALTED, "ASC"); + $column = Factory::getHashTypeFactory()->columnFilter([Factory::FILTER => $qF, Factory::ORDER => $oF], HashType::IS_SALTED); + $this->assertEquals([1, 72, 125], $column); + + $oF = new OrderFilter(HashType::IS_SALTED, "DESC"); + $column = Factory::getHashTypeFactory()->columnFilter([Factory::FILTER => $qF, Factory::ORDER => $oF], HashType::IS_SALTED); + $this->assertEquals([125, 72, 1], $column); + } + + /** + * Test querying multiple columns with the column filter + * + * @return void + * @throws Exception + */ + public function testColumnFilterSuccessMultiple(): void { + $testid = uniqid(); + $this->createDatabaseObject(Factory::getHashTypeFactory(), new HashType(null, 'hashtype1' . $testid, 1, 0)); + $this->createDatabaseObject(Factory::getHashTypeFactory(), new HashType(null, 'hashtype2' . $testid, 125, 0)); + $this->createDatabaseObject(Factory::getHashTypeFactory(), new HashType(null, 'hashtype3' . $testid, 72, 1)); + + $qF = new LikeFilter(HashType::DESCRIPTION, "%" . $testid); + $columns = Factory::getHashTypeFactory()->columnFilter([Factory::FILTER => $qF], [HashType::IS_SALTED, HashType::IS_SLOW_HASH]); + $this->assertEquals([[1, 0], [125, 0], [72, 1]], $columns); + + $oF = new OrderFilter(HashType::IS_SALTED, "ASC"); + $columns = Factory::getHashTypeFactory()->columnFilter([Factory::FILTER => $qF, Factory::ORDER => $oF], [HashType::IS_SALTED, HashType::IS_SLOW_HASH]); + $this->assertEquals([[1, 0], [72, 1], [125, 0]], $columns); + } + /** * Test receiving the column of a query on a mapped column * @@ -1137,8 +1180,9 @@ public function testColumnFilter(): void { // hashlist 1 and 3 should be returned $this->assertSame([$hashlist_1->getId(), $hashlist_3->getId()], $ids); - $qF = new QueryFilter(Hashlist::CRACKED, 5000, ">"); - $ids = Factory::getHashlistFactory()->columnFilter([Factory::FILTER => $qF, Factory::ORDER => $oF], Hashlist::HASHLIST_ID); + $qF1 = new QueryFilter(Hashlist::CRACKED, 5000, ">"); + $qF2 = new LikeFilter(Hashlist::HASHLIST_NAME, "%" . $testid); + $ids = Factory::getHashlistFactory()->columnFilter([Factory::FILTER => [$qF1, $qF2], Factory::ORDER => $oF], Hashlist::HASHLIST_ID); $this->assertSame([], $ids); } diff --git a/src/dba/AbstractModelFactory.php b/src/dba/AbstractModelFactory.php index dadc16847..87ccb9797 100755 --- a/src/dba/AbstractModelFactory.php +++ b/src/dba/AbstractModelFactory.php @@ -486,13 +486,19 @@ public function multicolAggregationFilter(array $options, array $aggregations): /** * @param $options array options of query (filters and joins) - * @param $column string single column key which should be retrieved + * @param $columns array|string single column key or array of column keys which should be retrieved * @return array of the column entries returned from this query * @throws Exception */ - public function columnFilter(array $options, string $column): array { - $query = "SELECT " . Util::createPrefixedString($this->getMappedModelTable(), [self::getMappedModelKey($this->getNullObject(), $column)]); - $query = $query . " FROM " . $this->getMappedModelTable(); + public function columnFilter(array $options, array|string $columns): array { + if (!is_array($columns)) { + $columns = [$columns]; + } + $elements = []; + foreach ($columns as $column) { + $elements[] = Util::createPrefixedString($this->getMappedModelTable(), [self::getMappedModelKey($this->getNullObject(), $column)]); + } + $query = "SELECT " . join(",", $elements) . " FROM " . $this->getMappedModelTable(); $vals = array(); @@ -502,12 +508,18 @@ public function columnFilter(array $options, string $column): array { if (array_key_exists(Factory::FILTER, $options)) { $query .= $this->applyFilters($vals, $options[Factory::FILTER]); } + if (array_key_exists(Factory::ORDER, $options)) { + $query .= $this->applyOrder($options[Factory::ORDER]); + } $dbh = self::getDB(); $stmt = $dbh->prepare($query); $stmt->execute($vals); - return $stmt->fetchAll(PDO::FETCH_COLUMN); + if (sizeof($elements) == 1) { + return $stmt->fetchAll(PDO::FETCH_COLUMN); + } + return $stmt->fetchAll(PDO::FETCH_NUM); } /** diff --git a/src/inc/apiv2/model/PreTaskAPI.php b/src/inc/apiv2/model/PreTaskAPI.php index 39369724e..75a9d4872 100644 --- a/src/inc/apiv2/model/PreTaskAPI.php +++ b/src/inc/apiv2/model/PreTaskAPI.php @@ -68,24 +68,34 @@ protected function createObject(array $data): int { return $pretask->getId(); } - //TODO make aggregate data queryable and not included by default + + /** + * @param object $object + * @param array $includedData + * @param array|null $aggregateFieldsets + * @return array + */ function aggregateData(object $object, array &$includedData = [], ?array $aggregateFieldsets = null): array { $aggregatedData = []; - if (is_null($aggregateFieldsets) || array_key_exists('pretask', $aggregateFieldsets)) { - - $qF1 = new QueryFilter(FilePretask::PRETASK_ID, $object->getId(), "=", Factory::getFilePretaskFactory()); - $jF1 = new JoinFilter(Factory::getFilePretaskFactory(), File::FILE_ID, FilePretask::FILE_ID); - $files = Factory::getFileFactory()->filter([Factory::FILTER => $qF1, Factory::JOIN => $jF1]); - $files = $files[Factory::getFileFactory()->getModelName()]; + + if (array_key_exists('pretask', $aggregateFieldsets)) { + $aggregateFieldsets['pretask'] = explode(",", $aggregateFieldsets['pretask']); - $lineCountProduct = 1; - foreach ($files as $file) { - $lineCount = $file->getLineCount(); - if ($lineCount !== null) { - $lineCountProduct = $lineCountProduct * $lineCount; + if (in_array("auxiliaryKeyspace", $aggregateFieldsets['pretask'])) { + $qF1 = new QueryFilter(FilePretask::PRETASK_ID, $object->getId(), "=", Factory::getFilePretaskFactory()); + $jF1 = new JoinFilter(Factory::getFilePretaskFactory(), File::FILE_ID, FilePretask::FILE_ID); + $files = Factory::getFileFactory()->filter([Factory::FILTER => $qF1, Factory::JOIN => $jF1]); + $files = $files[Factory::getFileFactory()->getModelName()]; + + $lineCountProduct = 1; + foreach ($files as $file) { + $lineCount = $file->getLineCount(); + if ($lineCount !== null) { + $lineCountProduct = $lineCountProduct * $lineCount; + } } + $aggregatedData["auxiliaryKeyspace"] = $lineCountProduct; } - $aggregatedData["auxiliaryKeyspace"] = $lineCountProduct; } return $aggregatedData; diff --git a/src/inc/apiv2/model/TaskAPI.php b/src/inc/apiv2/model/TaskAPI.php index 4d301e4c7..e03e61bf5 100644 --- a/src/inc/apiv2/model/TaskAPI.php +++ b/src/inc/apiv2/model/TaskAPI.php @@ -2,6 +2,8 @@ namespace Hashtopolis\inc\apiv2\model; +use Exception; +use Hashtopolis\dba\OrderFilter; use Hashtopolis\inc\defines\DConfig; use Hashtopolis\inc\defines\DPrince; use Hashtopolis\inc\utils\AccessUtils; @@ -136,15 +138,19 @@ public function getFormFields(): array { "files" => ['type' => 'array', 'subtype' => 'int'], ]; } - + public function getAggregateFieldsets(): array { return [ 'task' => [ - 'assignedAgents', + 'totalAssignedAgents', 'dispatched', 'searched', - 'isActive', - 'taskExtraDetails', + 'status', + 'totalNumberOfChunks', + 'currentSpeed', + 'estimatedTime', + 'cprogress', + 'timeSpent' ] ]; } @@ -182,88 +188,88 @@ protected function createObject(array $data): int { return $task->getId(); } - //TODO make aggregate data queryable and not included by default + /** + * @param object $object + * @param array $includedData + * @param array|null $aggregateFieldsets + * @return array + * @throws Exception + */ function aggregateData(object $object, array &$includedData = [], ?array $aggregateFieldsets = null): array { + /** @var $object Task */ $aggregatedData = []; - if (is_null($aggregateFieldsets) || array_key_exists('task', $aggregateFieldsets)) { - if (!is_null($aggregateFieldsets)) { - $aggregateFieldsets['task'] = explode(",", $aggregateFieldsets['task']); - } + if (array_key_exists('task', $aggregateFieldsets)) { + $aggregateFieldsets['task'] = explode(",", $aggregateFieldsets['task']); - $assignedAgents = []; - if (is_null($aggregateFieldsets) || in_array("assignedAgents", $aggregateFieldsets['task'])) { + if (in_array("assignedAgents", $aggregateFieldsets['task'])) { $qF = new QueryFilter(Assignment::TASK_ID, $object->getId(), "="); $assignedAgents = Factory::getAssignmentFactory()->countFilter([Factory::FILTER => $qF]); $aggregatedData["totalAssignedAgents"] = $assignedAgents; } + $keyspace = $object->getKeyspace(); $keyspaceProgress = $object->getKeyspaceProgress(); - if (is_null($aggregateFieldsets) || in_array("dispatched", $aggregateFieldsets['task'])) { + if (in_array("dispatched", $aggregateFieldsets['task'])) { $aggregatedData["dispatched"] = Util::showperc($keyspaceProgress, $keyspace); } - if (is_null($aggregateFieldsets) || in_array("searched", $aggregateFieldsets['task'])) { + if (in_array("searched", $aggregateFieldsets['task'])) { $aggregatedData["searched"] = Util::showperc(TaskUtils::getTaskProgress($object), $keyspace); } - - $chunks = null; - if (is_null($aggregateFieldsets) || in_array("isActive", $aggregateFieldsets['task'])) { - $qF = new QueryFilter(Chunk::TASK_ID, $object->getId(), "="); - $chunks = Factory::getChunkFactory()->filter([Factory::FILTER => $qF]); + + if (in_array("status", $aggregateFieldsets['task'])) { + // the filter for progress is needed so we reduce the checked chunks numbers by a lot + $qF1 = new QueryFilter(Chunk::TASK_ID, $object->getId(), "="); + $qF2 = new QueryFilter(Chunk::PROGRESS, 10000, "<"); + $chunks = Factory::getChunkFactory()->filter([Factory::FILTER => [$qF1, $qF2]]); $aggregatedData["status"] = TaskUtils::getStatus($chunks, $keyspace, $keyspaceProgress); } - if (is_null($aggregateFieldsets) || in_array("totalNumberOfChunks", $aggregateFieldsets['task'])) { + + if (in_array("totalNumberOfChunks", $aggregateFieldsets['task'])) { $qF = new QueryFilter(Chunk::TASK_ID, $object->getId(), "="); $aggregatedData["totalNumberOfChunks"] = Factory::getChunkFactory()->countFilter([Factory::FILTER => $qF]); } - if (is_null($aggregateFieldsets) || in_array("taskExtraDetails", $aggregateFieldsets['task'])) { - $qF = new QueryFilter(Chunk::TASK_ID, $object->getId(), "="); - if (!isset($chunks)){ - $chunks = Factory::getChunkFactory()->filter([Factory::FILTER => $qF]); + + if (in_array("currentSpeed", $aggregateFieldsets['task'])) { + $qF1 = new QueryFilter(Chunk::TASK_ID, $object->getId(), "="); + $qF2 = new QueryFilter(Chunk::SOLVE_TIME, time() - SConfig::getInstance()->getVal(DConfig::CHUNK_TIMEOUT), ">"); + $qF3 = new QueryFilter(Chunk::PROGRESS, 10000, "<"); + $agg = new Aggregation(Chunk::SPEED, Aggregation::SUM); + $speed = Factory::getChunkFactory()->multicolAggregationFilter([Factory::FILTER => [$qF1, $qF2, $qF3]], [$agg])[$agg->getName()]; + if ($speed == null) { + $speed = 0; } + $aggregatedData["currentSpeed"] = $speed; + } + + if (in_array("estimatedTime", $aggregateFieldsets['task']) || + in_array("timeSpent", $aggregateFieldsets['task']) || + in_array("cprogress", $aggregateFieldsets['task'])) { - $currentSpeed = 0; - $cProgress = 0; - - foreach ($chunks as $chunk) { - $cProgress += $chunk->getCheckpoint() - $chunk->getSkip(); - if (time() - max($chunk->getSolveTime(), $chunk->getDispatchTime()) < SConfig::getInstance()->getVal(DConfig::CHUNK_TIMEOUT) && $chunk->getProgress() < 10000) { - $currentSpeed += $chunk->getSpeed(); - } + $cProgress = TaskUtils::getTaskProgress($object); + if (in_array("cprogress", $aggregateFieldsets['task'])) { + $aggregatedData["cprogress"] = $cProgress; } - - $timeChunks = $chunks; - usort($timeChunks, ["Hashtopolis\inc\Util", "compareChunksTime"]); - $timeSpent = 0; - $current = 0; - foreach ($timeChunks as $c) { - if ($c->getDispatchTime() > $current) { - $timeSpent += $c->getSolveTime() - $c->getDispatchTime(); - $current = $c->getSolveTime(); - } - else if ($c->getSolveTime() > $current) { - $timeSpent += $c->getSolveTime() - $current; - $current = $c->getSolveTime(); - } + $timeSpent = TaskUtils::getTimeSpentOnTask($object); + + if (in_array("timeSpent", $aggregateFieldsets['task'])) { + $aggregatedData["timeSpent"] = $timeSpent; } - - $keyspace = $object->getKeyspace(); - $estimatedTime = ($keyspace > 0 && $cProgress > 0) ? round($timeSpent / ($cProgress / $keyspace) - $timeSpent) : 0; - $aggregatedData["estimatedTime"] = $estimatedTime; - $aggregatedData["timeSpent"] = $timeSpent; - $aggregatedData["currentSpeed"] = $currentSpeed; - $aggregatedData["cprogress"] = $cProgress; + if (in_array("estimatedTime", $aggregateFieldsets['task'])) { + $aggregatedData["estimatedTime"] = ($keyspace > 0 && $cProgress > 0) ? round($timeSpent / ($cProgress / $keyspace) - $timeSpent) : 0; + } } } - + return $aggregatedData; } protected function deleteObject(object $object): void { + /** @var $object Task */ TaskUtils::deleteTask($object); } diff --git a/src/inc/utils/TaskUtils.php b/src/inc/utils/TaskUtils.php index 19b8ea501..90b70224d 100644 --- a/src/inc/utils/TaskUtils.php +++ b/src/inc/utils/TaskUtils.php @@ -2,6 +2,7 @@ namespace Hashtopolis\inc\utils; +use Exception; use Hashtopolis\inc\DataSet; use Hashtopolis\dba\models\AccessGroup; use Hashtopolis\dba\models\AccessGroupAgent; @@ -124,7 +125,7 @@ public static function editNotes($taskId, $notes, $user) { $task = TaskUtils::getTask($taskId, $user); Factory::getTaskFactory()->set($task, Task::NOTES, $notes); } - + // Function for taskwrapper api to determine based on the chunks if a task is running, idle or completed. // Status 1 is running, 2 is idle and 3 is completed. public static function getStatus($chunks, $keyspace, $keyspaceProgress) { @@ -132,10 +133,11 @@ public static function getStatus($chunks, $keyspace, $keyspaceProgress) { $status = 2; if ($keyspaceProgress >= $keyspace && $keyspaceProgress > 0) { $status = 3; - } else { + } + else { $now = time(); $chunkTimeOut = SConfig::getInstance()->getVal(DConfig::CHUNK_TIMEOUT); - + foreach ($chunks as $chunk) { if ($now - max($chunk->getSolveTime(), $chunk->getDispatchTime()) < $chunkTimeOut && $chunk->getProgress() < 10000) { $status = 1; @@ -863,7 +865,8 @@ public static function createTask($hashlistId, $name, $attackCmd, $chunkTime, $s } else if ($benchtype != 'speed' && $benchtype != 'runtime') { throw new HttpError("Invalid benchmark type!"); - } else if ($enforcePipe < 0 || $enforcePipe > 1) { + } + else if ($enforcePipe < 0 || $enforcePipe > 1) { throw new HttpError("Invalid enforce pipe value"); } $benchtype = ($benchtype == 'speed') ? 1 : 0; @@ -1390,13 +1393,47 @@ public static function isSaturatedByOtherAgents($task, $agent) { ($task->getMaxAgents() > 0 && $numAssignments >= $task->getMaxAgents()); // at least maxAgents agents are already assigned } - public static function getTaskProgress($task) { + /** + * @param $task Task + * @return mixed + * @throws Exception + */ + public static function getTaskProgress(Task $task): int { $qF1 = new QueryFilter(Chunk::TASK_ID, $task->getId(), "="); $agg1 = new Aggregation(Chunk::CHECKPOINT, Aggregation::SUM); $agg2 = new Aggregation(Chunk::SKIP, Aggregation::SUM); $results = Factory::getChunkFactory()->multicolAggregationFilter([Factory::FILTER => $qF1], [$agg1, $agg2]); - $progress = $results[$agg1->getName()] - $results[$agg2->getName()]; - return $progress; + return $results[$agg1->getName()] - $results[$agg2->getName()]; + } + + /** + * Get the time spent on a task (not including parallel running). + * + * @param Task $task + * @return int + * @throws Exception + */ + public static function getTimeSpentOnTask(Task $task): int { + $qF1 = new QueryFilter(Chunk::TASK_ID, $task->getId(), "="); + $qF2 = new QueryFilter(Chunk::SOLVE_TIME, 0, ">"); + $qF3 = new QueryFilter(Chunk::DISPATCH_TIME, 0, ">"); + $oF = new OrderFilter(Chunk::DISPATCH_TIME, "ASC"); + $columnRows = Factory::getChunkFactory()->columnFilter([Factory::FILTER => [$qF1, $qF2, $qF3], Factory::ORDER => $oF], [Chunk::DISPATCH_TIME, Chunk::SOLVE_TIME]); + + $timeSpent = 0; + $current = 0; + + foreach ($columnRows as $row) { + if ($row[0] > $current) { + $timeSpent += $row[1] - $row[0]; + $current = $row[1]; + } + else if ($row[1] > $current) { + $timeSpent += $row[1] - $current; + $current = $row[1]; + } + } + return $timeSpent; } } From 50a150b795de371034d601c98c2c2e30246e610a Mon Sep 17 00:00:00 2001 From: s3inlc Date: Tue, 16 Jun 2026 11:59:25 +0200 Subject: [PATCH 617/691] completed all aggregated functions needed --- src/inc/apiv2/model/AgentAPI.php | 2 +- src/inc/apiv2/model/PreTaskAPI.php | 2 +- src/inc/apiv2/model/TaskAPI.php | 2 +- src/inc/apiv2/model/TaskWrapperDisplayAPI.php | 155 ++++++++++-------- 4 files changed, 93 insertions(+), 68 deletions(-) diff --git a/src/inc/apiv2/model/AgentAPI.php b/src/inc/apiv2/model/AgentAPI.php index 66abb4f74..a07686faa 100644 --- a/src/inc/apiv2/model/AgentAPI.php +++ b/src/inc/apiv2/model/AgentAPI.php @@ -78,7 +78,7 @@ function aggregateData(object $object, array &$includedData = [], ?array $aggreg $includedData["chunks"][$agentId] = [$active_chunk]; } - if (array_key_exists('agent', $aggregateFieldsets)) { + if (!is_null($aggregateFieldsets) && array_key_exists('agent', $aggregateFieldsets)) { $aggregateFieldsets['agent'] = explode(",", $aggregateFieldsets['agent']); if (in_array("crackingTime", $aggregateFieldsets['agent'])) { diff --git a/src/inc/apiv2/model/PreTaskAPI.php b/src/inc/apiv2/model/PreTaskAPI.php index 75a9d4872..3ed52d839 100644 --- a/src/inc/apiv2/model/PreTaskAPI.php +++ b/src/inc/apiv2/model/PreTaskAPI.php @@ -78,7 +78,7 @@ protected function createObject(array $data): int { function aggregateData(object $object, array &$includedData = [], ?array $aggregateFieldsets = null): array { $aggregatedData = []; - if (array_key_exists('pretask', $aggregateFieldsets)) { + if (!is_null($aggregateFieldsets) && array_key_exists('pretask', $aggregateFieldsets)) { $aggregateFieldsets['pretask'] = explode(",", $aggregateFieldsets['pretask']); if (in_array("auxiliaryKeyspace", $aggregateFieldsets['pretask'])) { diff --git a/src/inc/apiv2/model/TaskAPI.php b/src/inc/apiv2/model/TaskAPI.php index e03e61bf5..3b47b9869 100644 --- a/src/inc/apiv2/model/TaskAPI.php +++ b/src/inc/apiv2/model/TaskAPI.php @@ -199,7 +199,7 @@ function aggregateData(object $object, array &$includedData = [], ?array $aggreg /** @var $object Task */ $aggregatedData = []; - if (array_key_exists('task', $aggregateFieldsets)) { + if (!is_null($aggregateFieldsets) && array_key_exists('task', $aggregateFieldsets)) { $aggregateFieldsets['task'] = explode(",", $aggregateFieldsets['task']); if (in_array("assignedAgents", $aggregateFieldsets['task'])) { diff --git a/src/inc/apiv2/model/TaskWrapperDisplayAPI.php b/src/inc/apiv2/model/TaskWrapperDisplayAPI.php index 215588609..f007afecb 100644 --- a/src/inc/apiv2/model/TaskWrapperDisplayAPI.php +++ b/src/inc/apiv2/model/TaskWrapperDisplayAPI.php @@ -2,6 +2,8 @@ namespace Hashtopolis\inc\apiv2\model; +use Exception; +use Hashtopolis\dba\Aggregation; use Hashtopolis\inc\utils\AccessUtils; use Hashtopolis\dba\ContainFilter; use Hashtopolis\dba\Factory; @@ -61,95 +63,118 @@ protected function getFilterACL(): array { ] ]; } - - //TODO make aggregate data queryable and not included by default + + public function getAggregateFieldsets(): array { + return [ + 'taskwrapperdisplay' => [ + 'totalAssignedAgents', + 'dispatched', + 'searched', + 'status', + 'currentSpeed', + 'estimatedTime', + 'cprogress', + 'timeSpent' + ] + ]; + } + + /** + * @param object $object + * @param array $includedData + * @param array|null $aggregateFieldsets + * @return array + * @throws Exception + */ function aggregateData(object $object, array &$includedData = [], ?array $aggregateFieldsets = null): array { $aggregatedData = []; - if (is_null($aggregateFieldsets) || array_key_exists('taskwrapperdisplay', $aggregateFieldsets)) { - $tasks = TaskUtils::getTasksOfWrapper($object->getId()); - $completed = 0; - $total = 0; - $status = 0; - foreach($tasks as $task) { - $qF = new QueryFilter(Chunk::TASK_ID, $task->getId(), "="); - $chunks = Factory::getChunkFactory()->filter([Factory::FILTER => $qF]); - $taskStatus = TaskUtils::getStatus($chunks, $task->getKeyspace(), $task->getKeyspaceProgress()); - // if one task of the wrapper is running, it is running - if ($taskStatus === 1) { - $status = 1; - break; + + if (!is_null($aggregateFieldsets) && array_key_exists('taskwrapperdisplay', $aggregateFieldsets)) { + $aggregateFieldsets['taskwrapperdisplay'] = explode(",", $aggregateFieldsets['taskwrapperdisplay']); + + if (in_array("status", $aggregateFieldsets['taskwrapperdisplay'])) { + // TODO: this could be optimized by only requesting taskId, keyspace and keyspaceProgress of all tasks of that wrapper (columnFilter) + $tasks = TaskUtils::getTasksOfWrapper($object->getId()); + $completed = 0; + $total = 0; + $status = 0; + foreach($tasks as $task) { + $qF1 = new QueryFilter(Chunk::TASK_ID, $task->getId(), "="); + $qF2 = new QueryFilter(Chunk::PROGRESS, 10000, "<"); + $chunks = Factory::getChunkFactory()->filter([Factory::FILTER => [$qF1, $qF2]]); + $taskStatus = TaskUtils::getStatus($chunks, $task->getKeyspace(), $task->getKeyspaceProgress()); + // if one task of the wrapper is running, it is running + if ($taskStatus === 1) { + $status = 1; + break; + } + if ($taskStatus === 3) { + $completed++; + } + $total++; } - if ($taskStatus === 3) { - $completed++; + if ($status !== 1) { + if ($total > 0 && $completed === $total) { + $status = 3; + } else { + $status = 2; + } } - $total++; + $aggregatedData['status'] = $status; } - if ($status !== 1) { - if ($total > 0 && $completed === $total) { - $status = 3; - } else { - $status = 2; - } + + if (in_array("totalAssignedAgents", $aggregateFieldsets['taskwrapperdisplay'])) { + $qF = new QueryFilter(Task::TASK_WRAPPER_ID, $object->getId(), "=", Factory::getTaskFactory()); + $jF = new JoinFilter(Factory::getTaskFactory(), Assignment::TASK_ID, Task::TASK_ID); + + $assignedAgents = Factory::getAssignmentFactory()->countFilter([Factory::FILTER => $qF, Factory::JOIN => $jF]); + $aggregatedData["totalAssignedAgents"] = $assignedAgents; } - - $aggregatedData['status'] = $status; $keyspace = $object->getKeyspace(); $keyspaceProgress = $object->getKeyspaceProgress(); if ($object->getTaskType() === DTaskTypes::NORMAL) { + $tasks = TaskUtils::getTasksOfWrapper($object->getId()); $task = $tasks[0]; - if (is_null($aggregateFieldsets) || in_array("dispatched", $aggregateFieldsets['taskwrapperdisplay'])) { + if (in_array("dispatched", $aggregateFieldsets['taskwrapperdisplay'])) { $aggregatedData["dispatched"] = Util::showperc($keyspaceProgress, $keyspace); } - if (is_null($aggregateFieldsets) || in_array("searched", $aggregateFieldsets['taskwrapperdisplay'])) { + if (in_array("searched", $aggregateFieldsets['taskwrapperdisplay'])) { $aggregatedData["searched"] = Util::showperc(TaskUtils::getTaskProgress($task), $keyspace); } - - if (!isset($chunks)){ - $qF = new QueryFilter(Chunk::TASK_ID, $task->getId(), "="); - $chunks = Factory::getChunkFactory()->filter([Factory::FILTER => $qF]); + + if (in_array("currentSpeed", $aggregateFieldsets['taskwrapperdisplay'])) { + $qF1 = new QueryFilter(Chunk::TASK_ID, $task->getId(), "="); + $qF2 = new QueryFilter(Chunk::SOLVE_TIME, time() - SConfig::getInstance()->getVal(DConfig::CHUNK_TIMEOUT), ">"); + $qF3 = new QueryFilter(Chunk::PROGRESS, 10000, "<"); + $agg = new Aggregation(Chunk::SPEED, Aggregation::SUM); + $speed = Factory::getChunkFactory()->multicolAggregationFilter([Factory::FILTER => [$qF1, $qF2, $qF3]], [$agg])[$agg->getName()]; + if ($speed == null) { + $speed = 0; + } + $aggregatedData["currentSpeed"] = $speed; } - if (is_null($aggregateFieldsets) || in_array("taskExtraDetails", $aggregateFieldsets['taskwrapperdisplay'])) { - $currentSpeed = 0; - $cProgress = 0; + if (in_array("estimatedTime", $aggregateFieldsets['taskwrapperdisplay']) || + in_array("timeSpent", $aggregateFieldsets['taskwrapperdisplay']) || + in_array("cprogress", $aggregateFieldsets['taskwrapperdisplay'])) { - foreach ($chunks as $chunk) { - $cProgress += $chunk->getCheckpoint() - $chunk->getSkip(); - if (time() - max($chunk->getSolveTime(), $chunk->getDispatchTime()) < SConfig::getInstance()->getVal(DConfig::CHUNK_TIMEOUT) && $chunk->getProgress() < 10000) { - $currentSpeed += $chunk->getSpeed(); - } + $cProgress = TaskUtils::getTaskProgress($task); + if (in_array("cprogress", $aggregateFieldsets['taskwrapperdisplay'])) { + $aggregatedData["cprogress"] = $cProgress; } - $timeChunks = $chunks; - usort($timeChunks, ["Hashtopolis\inc\Util", "compareChunksTime"]); - $timeSpent = 0; - $current = 0; - foreach ($timeChunks as $c) { - if ($c->getDispatchTime() > $current) { - $timeSpent += $c->getSolveTime() - $c->getDispatchTime(); - $current = $c->getSolveTime(); - } - else if ($c->getSolveTime() > $current) { - $timeSpent += $c->getSolveTime() - $current; - $current = $c->getSolveTime(); - } + $timeSpent = TaskUtils::getTimeSpentOnTask($task); + + if (in_array("timeSpent", $aggregateFieldsets['taskwrapperdisplay'])) { + $aggregatedData["timeSpent"] = $timeSpent; } - - $estimatedTime = ($keyspace > 0 && $cProgress > 0) ? round($timeSpent / ($cProgress / $keyspace) - $timeSpent) : 0; - $aggregatedData["estimatedTime"] = $estimatedTime; - $aggregatedData["timeSpent"] = $timeSpent; - $aggregatedData["currentSpeed"] = $currentSpeed; - $aggregatedData["cprogress"] = $cProgress; - - $assignedAgents = []; - if (is_null($aggregateFieldsets) || in_array("assignedAgents", $aggregateFieldsets['task'])) { - $qF = new QueryFilter(Assignment::TASK_ID, $task->getId(), "="); - $assignedAgents = Factory::getAssignmentFactory()->countFilter([Factory::FILTER => $qF]); - $aggregatedData["totalAssignedAgents"] = $assignedAgents; + + if (in_array("estimatedTime", $aggregateFieldsets['taskwrapperdisplay'])) { + $aggregatedData["estimatedTime"] = ($keyspace > 0 && $cProgress > 0) ? round($timeSpent / ($cProgress / $keyspace) - $timeSpent) : 0; } } } From a7e2d0ba197056287fd998fc024539b88bd31012 Mon Sep 17 00:00:00 2001 From: s3inlc Date: Tue, 16 Jun 2026 12:07:30 +0200 Subject: [PATCH 618/691] changed annotations --- src/inc/apiv2/model/TaskAPI.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/inc/apiv2/model/TaskAPI.php b/src/inc/apiv2/model/TaskAPI.php index 3b47b9869..7cd3050c6 100644 --- a/src/inc/apiv2/model/TaskAPI.php +++ b/src/inc/apiv2/model/TaskAPI.php @@ -196,7 +196,7 @@ protected function createObject(array $data): int { * @throws Exception */ function aggregateData(object $object, array &$includedData = [], ?array $aggregateFieldsets = null): array { - /** @var $object Task */ + /** @var Task $object */ $aggregatedData = []; if (!is_null($aggregateFieldsets) && array_key_exists('task', $aggregateFieldsets)) { @@ -269,7 +269,7 @@ function aggregateData(object $object, array &$includedData = [], ?array $aggreg } protected function deleteObject(object $object): void { - /** @var $object Task */ + /** @var Task $object */ TaskUtils::deleteTask($object); } From 213934629506164b45825fe721ef5d897d8bc5ae Mon Sep 17 00:00:00 2001 From: s3inlc Date: Tue, 16 Jun 2026 14:44:43 +0200 Subject: [PATCH 619/691] fixed test to use aggregation for accessing totalNumberOfChunks --- ci/apiv2/test_task.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ci/apiv2/test_task.py b/ci/apiv2/test_task.py index 00c50b9d3..27d8596b3 100644 --- a/ci/apiv2/test_task.py +++ b/ci/apiv2/test_task.py @@ -15,7 +15,7 @@ def create_test_agent_object(self, *nargs, delete=True, **kwargs): dummy_agent.send_process(progress=50) dummy_agent.send_process(progress=100, state=ProcessState.EXHAUSTED) dummy_agent.get_chunk() - return Task.objects.get(taskId=retval['task'].id) + return Task.objects.params(**{"aggregate[task]": "totalNumberOfChunks"}).get(taskId=retval['task'].id) def create_test_object(self, **kwargs): hashlist_kwargs = kwargs.copy() From 36ac65a8a3d02e032e54721606f2d618a268e991 Mon Sep 17 00:00:00 2001 From: Eric Wasson <229096365+Eric-Wasson@users.noreply.github.com> Date: Tue, 16 Jun 2026 15:50:59 +0200 Subject: [PATCH 620/691] Fixed pagination bug --- src/dba/AbstractModelFactory.php | 29 +++++++++++++++++++---------- 1 file changed, 19 insertions(+), 10 deletions(-) diff --git a/src/dba/AbstractModelFactory.php b/src/dba/AbstractModelFactory.php index dadc16847..13dfd2274 100755 --- a/src/dba/AbstractModelFactory.php +++ b/src/dba/AbstractModelFactory.php @@ -690,7 +690,7 @@ private function filterWithJoin(array $options): array|AbstractModel { if (array_key_exists(Factory::FILTER, $options)) { $query .= $this->applyFilters($vals, $options[Factory::FILTER]); } - + // Apply order filter if (!array_key_exists(Factory::ORDER, $options)) { // Add a asc order on the primary keys as a standard @@ -706,7 +706,7 @@ private function filterWithJoin(array $options): array|AbstractModel { $dbh = self::getDB(); $stmt = $dbh->prepare($query); $stmt->execute($vals); - + $res = array(); $values = array(); foreach ($factories as $factory) { @@ -816,20 +816,29 @@ private function applyFilters(&$vals, Filter|array $filters, bool $isJoinFilter continue; } $v = $filter->getValue(); - if (is_array($v)) { - foreach ($v as $val) { - $vals[] = $val; - } - } - else { - $vals[] = $v; - } + $this->getAllArrayValues($vals, $v); } if ($isJoinFilter) { return " AND " . implode(" AND ", $parts); } return " WHERE " . implode(" AND ", $parts); } + + /** + * @param $vals + * @param $element + * @return array + */ + private function getAllArrayValues(&$vals, $element) { + if (!is_array($element)) { + $vals[] = $element; + return; + } + + foreach($element as $v) { + $this->getAllArrayValues($vals, $v); + } + } /** * @param $orders Order|Order[] From 73545a72851614942b96ef372362c14d789e5a3b Mon Sep 17 00:00:00 2001 From: jessevz Date: Wed, 17 Jun 2026 07:29:55 +0200 Subject: [PATCH 621/691] Added exists filter for acl check --- src/dba/ExistsFilter.php | 86 ++++++++++++++++++++++++++++++++ src/inc/apiv2/model/AgentAPI.php | 6 +-- 2 files changed, 89 insertions(+), 3 deletions(-) create mode 100644 src/dba/ExistsFilter.php diff --git a/src/dba/ExistsFilter.php b/src/dba/ExistsFilter.php new file mode 100644 index 000000000..eb4ca67e6 --- /dev/null +++ b/src/dba/ExistsFilter.php @@ -0,0 +1,86 @@ +subqueryFactory = $subqueryFactory; + $this->subqueryMatchKey = $subqueryMatchKey; + $this->outerMatchKey = $outerMatchKey; + $this->filters = $filters; + $this->inverse = $inverse; + } + + function getQueryString(AbstractModelFactory $factory, bool $includeTable = false): string { + $outerTable = $factory->getMappedModelTable(); + $subqueryTable = $this->subqueryFactory->getMappedModelTable(); + + $subqueryMatchColumn = AbstractModelFactory::getMappedModelKey($this->subqueryFactory->getNullObject(), $this->subqueryMatchKey); + $outerMatchColumn = AbstractModelFactory::getMappedModelKey($factory->getNullObject(), $this->outerMatchKey); + $existsPrefix = $this->inverse ? "NOT EXISTS" : "EXISTS"; + $parts = array_map(fn($filter) => $filter->getQueryString($this->subqueryFactory, true), $this->filters); + + $query = $existsPrefix . " (SELECT 1 FROM " . $subqueryTable + . " WHERE " . $subqueryTable . "." . $subqueryMatchColumn . "=" . $outerTable . "." . $outerMatchColumn; + + if (count($parts) > 0) { + $query .= " AND " . implode(" AND ", $parts); + } + $query .= ")"; + + return $query; + } + + function getValue(): array { + $values = []; + foreach ($this->filters as $filter) { + if (!$filter->getHasValue()) { + continue; + } + + $value = $filter->getValue(); + if (is_array($value)) { + foreach ($value as $v) { + $values[] = $v; + } + } + else { + $values[] = $value; + } + } + return $values; + } + + function getHasValue(): bool { + foreach ($this->filters as $filter) { + if ($filter->getHasValue()) { + return true; + } + } + return false; + } +} diff --git a/src/inc/apiv2/model/AgentAPI.php b/src/inc/apiv2/model/AgentAPI.php index 917eeac53..dfe48f5e5 100644 --- a/src/inc/apiv2/model/AgentAPI.php +++ b/src/inc/apiv2/model/AgentAPI.php @@ -6,6 +6,7 @@ use Hashtopolis\inc\utils\AgentUtils; use Hashtopolis\inc\defines\DHashcatStatus; use Hashtopolis\dba\ContainFilter; +use Hashtopolis\dba\ExistsFilter; use Hashtopolis\dba\Factory; use Hashtopolis\dba\models\AccessGroup; @@ -80,9 +81,8 @@ protected function getFilterACL(): array { $accessGroups = Util::arrayOfIds(AccessUtils::getAccessGroupsOfUser($this->getCurrentUser())); return [ - Factory::JOIN => [ - new JoinFilter(Factory::getAccessGroupAgentFactory(), Agent::AGENT_ID, AccessGroupAgent::AGENT_ID) - ], Factory::FILTER => [new ContainFilter(AccessGroupAgent::ACCESS_GROUP_ID, $accessGroups, Factory::getAccessGroupAgentFactory()), + Factory::FILTER => [ + new ExistsFilter(Factory::getAccessGroupAgentFactory(), AccessGroupAgent::AGENT_ID, Agent::AGENT_ID, [new ContainFilter(AccessGroupAgent::ACCESS_GROUP_ID, $accessGroups, Factory::getAccessGroupAgentFactory())]) ] ]; } From b714d5706227177551214d95bc686fb57b7de361 Mon Sep 17 00:00:00 2001 From: s3inlc Date: Wed, 17 Jun 2026 08:04:30 +0200 Subject: [PATCH 622/691] check aggregation fieldsets for validity --- src/inc/apiv2/common/AbstractBaseAPI.php | 58 ++++++++++++++++-------- 1 file changed, 39 insertions(+), 19 deletions(-) diff --git a/src/inc/apiv2/common/AbstractBaseAPI.php b/src/inc/apiv2/common/AbstractBaseAPI.php index 9a651211e..0a79130af 100644 --- a/src/inc/apiv2/common/AbstractBaseAPI.php +++ b/src/inc/apiv2/common/AbstractBaseAPI.php @@ -187,7 +187,7 @@ protected function getUpdateHandlers($id, $current_user): array { public function aggregateData(object $object, array &$includedData = [], ?array $aggregateFieldsets = null): array { return []; } - + /** * Return supported aggregate fieldsets/options for this endpoint. * @@ -658,6 +658,7 @@ protected function obj2Array(object $obj): array { * Convert DB object JSON:API Resource Object * @throws NotFoundExceptionInterface * @throws ContainerExceptionInterface + * @throws HttpError */ protected function obj2Resource(object $obj, array &$expandResult = [], ?array $sparseFieldsets = null, ?array $aggregateFieldsets = null): array { // Convert values to JSON supported types @@ -702,11 +703,27 @@ protected function obj2Resource(object $obj, array &$expandResult = [], ?array $ if ($this instanceof AbstractModelAPI && get_class($obj) !== $this->getDBAClass()) { $apiClassObject = new $apiClass($this->container); - } else { + } + else { // use instance of this when the object is of the dba class of this api endpoint. // This way its possible to set object attributes in the post to be used in the aggregateData function. $apiClassObject = $this; } + + if (is_array($aggregateFieldsets)) { + $availableFieldsets = $apiClassObject->getAggregateFieldsets(); + foreach ($aggregateFieldsets as $name => $aggregateFieldset) { + if (!array_key_exists($name, $availableFieldsets)) { + throw new HttpError("Invalid aggregation object requested!"); + } + foreach ($aggregateFieldset as $field) { + if (!in_array($field, $availableFieldsets[$name])) { + throw new HttpError("Invalid aggregation requested!"); + } + } + } + } + $aggregatedData = $apiClassObject->aggregateData($obj, $expandResult, $aggregateFieldsets); $attributes = array_merge($attributes, $aggregatedData); @@ -1124,9 +1141,9 @@ protected function getPrimaryKey(): string { function getFilters(Request $request): array { return $this->getQueryParameterFamily($request, 'filter'); } - + protected static function checkJoinExists(array $joins, string $modelName) { - foreach($joins as $join) { + foreach ($joins as $join) { if ($join->getOtherFactory()->getModelName() === $modelName) { return true; } @@ -1154,13 +1171,13 @@ protected function makeFilter(array $filters, object $apiClass, array &$joinFilt $cast_key = $matches['key'] == 'id' ? array_column($features, 'alias', 'dbname')[$this->getPrimaryKey()] : $matches['key']; if (strpos($cast_key, ".")) { //When the key contains a "." it should be a relation in format: "task.taskname" where task is the relation. - $relationObject = $this->retrieveRelationKey($cast_key); - $factory = $relationObject->factory; - $cast_key = $relationObject->cast_key; - if (!self::checkJoinExists($joinFilters, $factory->getModelName())) { - $joinFilters[] = new JoinFilter($factory, $relationObject->joinKey, $relationObject->key); - } - $features = $relationObject->features_relation; + $relationObject = $this->retrieveRelationKey($cast_key); + $factory = $relationObject->factory; + $cast_key = $relationObject->cast_key; + if (!self::checkJoinExists($joinFilters, $factory->getModelName())) { + $joinFilters[] = new JoinFilter($factory, $relationObject->joinKey, $relationObject->key); + } + $features = $relationObject->features_relation; } if (!array_key_exists($cast_key, $features)) { @@ -1259,7 +1276,7 @@ protected function makeFilter(array $filters, object $apiClass, array &$joinFilt } return $qFs; } - + /** * Retrieves the relation from a sort/filter value. ex task.taskName when task is a relation for the current * Model endpoint. This works only for relations of 1 deep @@ -1277,17 +1294,19 @@ protected function retrieveRelationKey(string $value): object { $key = $relations[$relationString]['key']; $features_relation = $relationFeatures; $value = $parts[1]; - return (object) [ + return (object)[ "factory" => $factory, "joinKey" => $joinKey, "key" => $key, "features_relation" => $features_relation, "cast_key" => $value ]; - } else { + } + else { throw new HttpError("Invalid relation: " . $relationString); } - } else { + } + else { throw new HttpForbidden("Invalid key, multiple '.' found in key, but only relationships of one deep is allowed"); } } @@ -1376,7 +1395,7 @@ protected function processExpands( $expandKeys = array_keys($expandResult); $diffs = array_diff($expandKeys, $expands); $expands = array_merge($expands, $diffs); - + foreach ($expands as $expand) { if (!array_key_exists($object->getId(), $expandResult[$expand])) { continue; @@ -1417,7 +1436,7 @@ protected function validatePermissions(string $permissions, array $required_perm else { $rightgroup_perms = json_decode($permissions, true); } - + if ($aud === "user_hashtopolis") { // Validate if no undefined permissions are set in $acl_mapping for the legacy permissions assert(count(array_diff(array_keys($rightgroup_perms), array_keys(self::$acl_mapping))) == 0); @@ -1428,7 +1447,8 @@ protected function validatePermissions(string $permissions, array $required_perm $user_available_perms = array_unique(array_merge($user_available_perms, self::$acl_mapping[$rightgroup_perm])); } }; - } else { + } + else { $user_available_perms = array_keys($rightgroup_perms, true, true); } @@ -1641,7 +1661,7 @@ static function createJsonResponse(array $data = [], array $links = [], array $i * Get single Resource */ protected static function getOneResource(object $apiClass, object $object, Request $request, Response $response, int $statusCode = 200): Response { - $apiClass->preCommon($request); + $apiClass->preCommon($request); $validExpandables = $apiClass->getExpandables(); $expands = $apiClass->makeExpandables($request, $validExpandables); From b0ba6011a21e8a86f7c8839fc7e46d68872cc0cd Mon Sep 17 00:00:00 2001 From: s3inlc Date: Wed, 17 Jun 2026 08:09:19 +0200 Subject: [PATCH 623/691] fixed check --- src/inc/apiv2/common/AbstractBaseAPI.php | 1 + 1 file changed, 1 insertion(+) diff --git a/src/inc/apiv2/common/AbstractBaseAPI.php b/src/inc/apiv2/common/AbstractBaseAPI.php index 0a79130af..4de3e6614 100644 --- a/src/inc/apiv2/common/AbstractBaseAPI.php +++ b/src/inc/apiv2/common/AbstractBaseAPI.php @@ -716,6 +716,7 @@ protected function obj2Resource(object $obj, array &$expandResult = [], ?array $ if (!array_key_exists($name, $availableFieldsets)) { throw new HttpError("Invalid aggregation object requested!"); } + $aggregateFieldset = explode(",", $aggregateFieldset); foreach ($aggregateFieldset as $field) { if (!in_array($field, $availableFieldsets[$name])) { throw new HttpError("Invalid aggregation requested!"); From 11185a5d270e9a5115941a19957aa7e247212498 Mon Sep 17 00:00:00 2001 From: s3inlc Date: Wed, 17 Jun 2026 11:38:41 +0200 Subject: [PATCH 624/691] made aggregations completely generic, so we can avoid having lots of hardcoded string keys --- src/inc/apiv2/common/AbstractBaseAPI.php | 41 +-- src/inc/apiv2/common/AbstractModelAPI.php | 2 +- src/inc/apiv2/common/openAPISchema.routes.php | 4 +- src/inc/apiv2/model/AgentAPI.php | 37 ++- src/inc/apiv2/model/ApiTokenAPI.php | 39 +-- src/inc/apiv2/model/PreTaskAPI.php | 61 ++--- src/inc/apiv2/model/TaskAPI.php | 187 ++++++------- src/inc/apiv2/model/TaskWrapperDisplayAPI.php | 250 ++++++++++-------- 8 files changed, 330 insertions(+), 291 deletions(-) diff --git a/src/inc/apiv2/common/AbstractBaseAPI.php b/src/inc/apiv2/common/AbstractBaseAPI.php index 4de3e6614..c2697594a 100644 --- a/src/inc/apiv2/common/AbstractBaseAPI.php +++ b/src/inc/apiv2/common/AbstractBaseAPI.php @@ -8,9 +8,7 @@ use Hashtopolis\inc\apiv2\error\InternalError; use Hashtopolis\inc\apiv2\error\ResourceNotFoundError; use Hashtopolis\inc\utils\AccessControl; -use Hashtopolis\inc\utils\AccessUtils; use Hashtopolis\inc\defines\DAccessControl; -use Hashtopolis\inc\utils\HashlistUtils; use Hashtopolis\dba\JoinFilter; use Hashtopolis\inc\HTException; use JsonException; @@ -183,17 +181,35 @@ protected function getUpdateHandlers($id, $current_user): array { * * Implementations should use $includedData to collect related resources that should be included * in the API response, such as related entities or additional data. + * @throws HttpError */ public function aggregateData(object $object, array &$includedData = [], ?array $aggregateFieldsets = null): array { - return []; + $aggregatedData = []; + + if (is_array($aggregateFieldsets)) { + $fieldsets = $this->getAggregateFieldsets(); + foreach ($fieldsets as $name => $fieldset) { + if (array_key_exists($name, $aggregateFieldsets)) { + $aggregateFieldsets[$name] = explode(",", $aggregateFieldsets[$name]); + foreach($aggregateFieldsets[$name] as $field) { + if(!array_key_exists($field, $fieldset)) { + throw new HttpError("Invalid aggregation requested!"); + } + $aggregatedData[$field] = $fieldset[$field]($object); + } + } + } + } + return $aggregatedData; } /** - * Return supported aggregate fieldsets/options for this endpoint. + * Return supported aggregate fieldsets/options for this endpoint, providing a callback to call to actually retrieve + * this aggregation on a specific object. All callbacks expect one argument being the api object. * * Format: * [ - * 'resourceKey' => ['option1', 'option2'] + * 'resourceKey' => ['option1' => [class, function], 'option2' => [class, function]] * ] */ public function getAggregateFieldsets(): array { @@ -710,21 +726,6 @@ protected function obj2Resource(object $obj, array &$expandResult = [], ?array $ $apiClassObject = $this; } - if (is_array($aggregateFieldsets)) { - $availableFieldsets = $apiClassObject->getAggregateFieldsets(); - foreach ($aggregateFieldsets as $name => $aggregateFieldset) { - if (!array_key_exists($name, $availableFieldsets)) { - throw new HttpError("Invalid aggregation object requested!"); - } - $aggregateFieldset = explode(",", $aggregateFieldset); - foreach ($aggregateFieldset as $field) { - if (!in_array($field, $availableFieldsets[$name])) { - throw new HttpError("Invalid aggregation requested!"); - } - } - } - } - $aggregatedData = $apiClassObject->aggregateData($obj, $expandResult, $aggregateFieldsets); $attributes = array_merge($attributes, $aggregatedData); diff --git a/src/inc/apiv2/common/AbstractModelAPI.php b/src/inc/apiv2/common/AbstractModelAPI.php index bf3ef423f..d95488af8 100644 --- a/src/inc/apiv2/common/AbstractModelAPI.php +++ b/src/inc/apiv2/common/AbstractModelAPI.php @@ -772,7 +772,7 @@ public static function getManyResources(object $apiClass, Request $request, Resp // Convert objects to data resources foreach ($objects as $object) { - // Create object + // Create object $newObject = $apiClass->obj2Resource($object, $expandResult, $request->getQueryParams()['fields'] ?? null, $request->getQueryParams()['aggregate'] ?? null); $includedResources = $apiClass->processExpands($apiClass, $expands, $object, $expandResult, $includedResources, $request->getQueryParams()['fields'] ?? null, $request->getQueryParams()['aggregate'] ?? null); diff --git a/src/inc/apiv2/common/openAPISchema.routes.php b/src/inc/apiv2/common/openAPISchema.routes.php index ae59d2f9b..e77f6abda 100644 --- a/src/inc/apiv2/common/openAPISchema.routes.php +++ b/src/inc/apiv2/common/openAPISchema.routes.php @@ -699,8 +699,8 @@ if (empty($options)) { continue; } - $aggregateExamples["aggregate[" . $fieldset . "]"] = implode(",", $options); - $aggregateDescriptionParts[] = $fieldset . ": " . implode(", ", $options); + $aggregateExamples["aggregate[" . $fieldset . "]"] = implode(",", array_keys($options)); + $aggregateDescriptionParts[] = $fieldset . ": " . implode(", ", array_keys($options)); } if (!empty($aggregateExamples)) { diff --git a/src/inc/apiv2/model/AgentAPI.php b/src/inc/apiv2/model/AgentAPI.php index a07686faa..363a961b1 100644 --- a/src/inc/apiv2/model/AgentAPI.php +++ b/src/inc/apiv2/model/AgentAPI.php @@ -50,11 +50,27 @@ protected function getUpdateHandlers($id, $current_user): array { public function getAggregateFieldsets(): array { return [ 'agent' => [ - 'crackingTime', + 'crackingTime' => [$this, 'getAggregateCrackingTime'], ] ]; } + /** + * @param object $object + * @return int + * @throws Exception + */ + protected function getAggregateCrackingTime(object $object): int { + // in order to make sense of the diff, we need to make sure that both values solve time and dispatch time are set (i.e. >0). + $qF1 = new QueryFilter(Chunk::AGENT_ID, $object->getId(), "="); + $qF2 = new QueryFilter(Chunk::SOLVE_TIME, 0, ">"); + $qF3 = new QueryFilter(Chunk::DISPATCH_TIME, 0, ">"); + $agg1 = new Aggregation(Chunk::SOLVE_TIME, Aggregation::SUM); + $agg2 = new Aggregation(Chunk::DISPATCH_TIME, Aggregation::SUM); + $results = Factory::getChunkFactory()->multicolAggregationFilter([Factory::FILTER => [$qF1, $qF2, $qF3]], [$agg1, $agg2]); + return $results[$agg1->getName()] - $results[$agg2->getName()]; + } + /** * Overridable function to aggregate data in the object. active chunk of agent is appended to * $included_data. @@ -66,8 +82,6 @@ public function getAggregateFieldsets(): array { * @throws Exception */ function aggregateData(object $object, array &$includedData = [], ?array $aggregateFieldsets = null): array { - $aggregatedData = []; - $agentId = $object->getId(); $qFs = []; $qFs[] = new QueryFilter(Chunk::AGENT_ID, $agentId, "="); @@ -78,22 +92,7 @@ function aggregateData(object $object, array &$includedData = [], ?array $aggreg $includedData["chunks"][$agentId] = [$active_chunk]; } - if (!is_null($aggregateFieldsets) && array_key_exists('agent', $aggregateFieldsets)) { - $aggregateFieldsets['agent'] = explode(",", $aggregateFieldsets['agent']); - - if (in_array("crackingTime", $aggregateFieldsets['agent'])) { - // in order to make sense of the diff, we need to make sure that both values solve time and dispatch time are set (i.e. >0). - $qF1 = new QueryFilter(Chunk::AGENT_ID, $agentId, "="); - $qF2 = new QueryFilter(Chunk::SOLVE_TIME, 0, ">"); - $qF3 = new QueryFilter(Chunk::DISPATCH_TIME, 0, ">"); - $agg1 = new Aggregation(Chunk::SOLVE_TIME, Aggregation::SUM); - $agg2 = new Aggregation(Chunk::DISPATCH_TIME, Aggregation::SUM); - $results = Factory::getChunkFactory()->multicolAggregationFilter([Factory::FILTER => [$qF1, $qF2, $qF3]], [$agg1, $agg2]); - $aggregatedData["crackingTime"] = $results[$agg1->getName()] - $results[$agg2->getName()]; - } - } - - return $aggregatedData; + return parent::aggregateData($object, $includedData, $aggregateFieldsets); } protected function getSingleACL(User $user, object $object): bool { diff --git a/src/inc/apiv2/model/ApiTokenAPI.php b/src/inc/apiv2/model/ApiTokenAPI.php index 883a5886e..d2e4703b5 100644 --- a/src/inc/apiv2/model/ApiTokenAPI.php +++ b/src/inc/apiv2/model/ApiTokenAPI.php @@ -9,6 +9,8 @@ use Hashtopolis\dba\QueryFilter; use Hashtopolis\inc\apiv2\common\AbstractModelAPI; use Hashtopolis\inc\apiv2\error\HttpError; +use Hashtopolis\inc\apiv2\error\HttpForbidden; +use Hashtopolis\inc\apiv2\error\ResourceNotFoundError; use Hashtopolis\inc\StartupConfig; use Hashtopolis\inc\utils\AccessUtils; @@ -17,15 +19,15 @@ class ApiTokenAPI extends AbstractModelAPI { const API_AUD = "api_hashtopolis"; private ?string $jwtToken = null; - + private function setJwtToken(string $token): void { - $this->jwtToken = $token; + $this->jwtToken = $token; } - + private function getJwtToken(): ?string { return $this->jwtToken; } - + public static function getBaseUri(): string { return "/api/v2/ui/apiTokens"; } @@ -48,14 +50,14 @@ public static function getToOneRelationships(): array { ] ]; } - + public function getFormFields(): array { // TODO Form declarations in more generic class to allow auto-generated OpenAPI specifications return [ "scopes" => ['type' => 'array', 'subtype' => 'string'] ]; } - + protected function getSingleACL(User $user, object $object): bool { return ($object->getUserId() === $user->getId()); } @@ -68,29 +70,31 @@ protected function getFilterACL(): array { ] ]; } + /** * @throws HttpError + * @throws ResourceNotFoundError */ protected function createObject(array $data): int { //Scopes is an array of permissions in format [permFileTaskUpdate, permAgentDelete] $scopes = explode(",", $data["scopes"]); - + $userCrudPerms = AccessUtils::getPermissionArrayConverted( $this->getRightGroup($this->getCurrentUser()->getRightGroupId())->getPermissions() ); - + // Modern CRUD scope dict: true if the perm was requested AND the user has it. $requestedScopes = []; foreach ($userCrudPerms as $perm => $granted) { $requestedScopes[$perm] = $granted && in_array($perm, $scopes, true); } - + $secret = StartupConfig::getInstance()->getPepper(0); $iat = $data[JwtApiKey::START_VALID]; $expires = $data[JwtApiKey::END_VALID]; $token = JwtTokenUtils::createKey($this->getCurrentUser()->getId(), $iat, $expires); $jti = $token->getId(); - + $payload = [ "iat" => $iat, "exp" => $expires, @@ -99,15 +103,15 @@ protected function createObject(array $data): int { "scope" => json_encode($requestedScopes), "iss" => "Hashtopolis", "aud" => $this::API_AUD, - "kid" => hash("sha256", $secret) + "kid" => hash("sha256", $secret) ]; - + $tokenEncoded = JWT::encode($payload, $secret, "HS256"); $this->setJwtToken($tokenEncoded); - + return $token->getId(); } - + function aggregateData(object $object, array &$includedData = [], ?array $aggregateFieldsets = null): array { // $token is only set in POST, this way the actual token is only returned after creation. $aggregatedData = []; @@ -115,12 +119,13 @@ function aggregateData(object $object, array &$includedData = [], ?array $aggreg if ($token !== null) { $aggregatedData["token"] = $token; } - - return $aggregatedData; + + return array_merge_recursive($aggregatedData, parent::aggregateData($object, $includedData, $aggregateFieldsets)); } /** - * @throws HttpError + * @param object $object + * @throws HttpForbidden */ protected function deleteObject(object $object): void { JwtTokenUtils::deleteKey($object); diff --git a/src/inc/apiv2/model/PreTaskAPI.php b/src/inc/apiv2/model/PreTaskAPI.php index 3ed52d839..1c4c90bba 100644 --- a/src/inc/apiv2/model/PreTaskAPI.php +++ b/src/inc/apiv2/model/PreTaskAPI.php @@ -46,6 +46,34 @@ public function getFormFields(): array { ]; } + public function getAggregateFieldsets(): array { + return [ + 'pretask' => [ + 'auxiliaryKeyspace' => [$this, 'getAggregateAuxiliaryKeyspace'], + ] + ]; + } + + /** + * @param object $object + * @return int + */ + protected function getAggregateAuxiliaryKeyspace(object $object): int { + $qF1 = new QueryFilter(FilePretask::PRETASK_ID, $object->getId(), "=", Factory::getFilePretaskFactory()); + $jF1 = new JoinFilter(Factory::getFilePretaskFactory(), File::FILE_ID, FilePretask::FILE_ID); + $files = Factory::getFileFactory()->filter([Factory::FILTER => $qF1, Factory::JOIN => $jF1]); + $files = $files[Factory::getFileFactory()->getModelName()]; + + $lineCountProduct = 1; + foreach ($files as $file) { + $lineCount = $file->getLineCount(); + if ($lineCount !== null) { + $lineCountProduct = $lineCountProduct * $lineCount; + } + } + return $lineCountProduct; + } + /** * @throws HttpError */ @@ -68,39 +96,6 @@ protected function createObject(array $data): int { return $pretask->getId(); } - - /** - * @param object $object - * @param array $includedData - * @param array|null $aggregateFieldsets - * @return array - */ - function aggregateData(object $object, array &$includedData = [], ?array $aggregateFieldsets = null): array { - $aggregatedData = []; - - if (!is_null($aggregateFieldsets) && array_key_exists('pretask', $aggregateFieldsets)) { - $aggregateFieldsets['pretask'] = explode(",", $aggregateFieldsets['pretask']); - - if (in_array("auxiliaryKeyspace", $aggregateFieldsets['pretask'])) { - $qF1 = new QueryFilter(FilePretask::PRETASK_ID, $object->getId(), "=", Factory::getFilePretaskFactory()); - $jF1 = new JoinFilter(Factory::getFilePretaskFactory(), File::FILE_ID, FilePretask::FILE_ID); - $files = Factory::getFileFactory()->filter([Factory::FILTER => $qF1, Factory::JOIN => $jF1]); - $files = $files[Factory::getFileFactory()->getModelName()]; - - $lineCountProduct = 1; - foreach ($files as $file) { - $lineCount = $file->getLineCount(); - if ($lineCount !== null) { - $lineCountProduct = $lineCountProduct * $lineCount; - } - } - $aggregatedData["auxiliaryKeyspace"] = $lineCountProduct; - } - } - - return $aggregatedData; - } - protected function getUpdateHandlers($id, $current_user): array { return [ Pretask::ATTACK_CMD => fn($value) => PretaskUtils::changeAttack($id, $value), diff --git a/src/inc/apiv2/model/TaskAPI.php b/src/inc/apiv2/model/TaskAPI.php index 7cd3050c6..355d6399c 100644 --- a/src/inc/apiv2/model/TaskAPI.php +++ b/src/inc/apiv2/model/TaskAPI.php @@ -142,19 +142,108 @@ public function getFormFields(): array { public function getAggregateFieldsets(): array { return [ 'task' => [ - 'totalAssignedAgents', - 'dispatched', - 'searched', - 'status', - 'totalNumberOfChunks', - 'currentSpeed', - 'estimatedTime', - 'cprogress', - 'timeSpent' + 'totalAssignedAgents' => [$this, 'getAggregateTotalAssignedAgents'], + 'dispatched' => [$this, 'getAggregateDispatched'], + 'searched' => [$this, 'getAggregateSearched'], + 'status' => [$this, 'getAggregateStatus'], + 'totalNumberOfChunks' => [$this, 'getAggregateTotalChunks'], + 'currentSpeed' => [$this, 'getAggregateCurrentSpeed'], + 'estimatedTime' => [$this, 'getAggregateEstimatedTime'], + 'cprogress' => [$this, 'getAggregateCProgress'], + 'timeSpent' => [$this, 'getAggregateTimeSpent'], ] ]; } + /** + * @throws Exception + */ + protected function getAggregateTotalAssignedAgents(object $object): int { + $qF = new QueryFilter(Assignment::TASK_ID, $object->getId(), "="); + return Factory::getAssignmentFactory()->countFilter([Factory::FILTER => $qF]); + } + + protected function getAggregateDispatched(object $object): string { + /** @var Task $object */ + $keyspace = $object->getKeyspace(); + $keyspaceProgress = $object->getKeyspaceProgress(); + return Util::showperc($keyspaceProgress, $keyspace); + } + + /** + * @throws Exception + */ + protected function getAggregateSearched(object $object): string { + /** @var Task $object */ + $keyspace = $object->getKeyspace(); + return Util::showperc(TaskUtils::getTaskProgress($object), $keyspace); + } + + protected function getAggregateStatus(object $object): int { + /** @var Task $object */ + $keyspace = $object->getKeyspace(); + $keyspaceProgress = $object->getKeyspaceProgress(); + + // the filter for progress is needed so we reduce the checked chunks numbers by a lot + $qF1 = new QueryFilter(Chunk::TASK_ID, $object->getId(), "="); + $qF2 = new QueryFilter(Chunk::PROGRESS, 10000, "<"); + $chunks = Factory::getChunkFactory()->filter([Factory::FILTER => [$qF1, $qF2]]); + return TaskUtils::getStatus($chunks, $keyspace, $keyspaceProgress); + } + + /** + * @throws Exception + */ + protected function getAggregateTotalChunks(object $object): int { + $qF = new QueryFilter(Chunk::TASK_ID, $object->getId(), "="); + return Factory::getChunkFactory()->countFilter([Factory::FILTER => $qF]); + } + + /** + * @throws Exception + */ + protected function getAggregateCurrentSpeed(object $object): int { + $qF1 = new QueryFilter(Chunk::TASK_ID, $object->getId(), "="); + $qF2 = new QueryFilter(Chunk::SOLVE_TIME, time() - SConfig::getInstance()->getVal(DConfig::CHUNK_TIMEOUT), ">"); + $qF3 = new QueryFilter(Chunk::PROGRESS, 10000, "<"); + $agg = new Aggregation(Chunk::SPEED, Aggregation::SUM); + $speed = Factory::getChunkFactory()->multicolAggregationFilter([Factory::FILTER => [$qF1, $qF2, $qF3]], [$agg])[$agg->getName()]; + if ($speed == null) { + $speed = 0; + } + return $speed; + } + + /** + * @throws Exception + */ + protected function getAggregateEstimatedTime(object $object): int { + /** @var Task $object */ + $keyspace = $object->getKeyspace(); + + // not a 100% efficient, but we would have to break up the nice generic handling of the aggregations to deal with this + $cProgress = $this->getAggregateCProgress($object); + $timeSpent = $this->getAggregateTimeSpent($object); + + return ($keyspace > 0 && $cProgress > 0) ? round($timeSpent / ($cProgress / $keyspace) - $timeSpent) : 0; + } + + /** + * @throws Exception + */ + protected function getAggregateCProgress(object $object): int { + /** @var Task $object */ + return TaskUtils::getTaskProgress($object); + } + + /** + * @throws Exception + */ + protected function getAggregateTimeSpent(object $object): int { + /** @var Task $object */ + return TaskUtils::getTimeSpentOnTask($object); + } + /** * @throws HttpError */ @@ -188,86 +277,6 @@ protected function createObject(array $data): int { return $task->getId(); } - /** - * @param object $object - * @param array $includedData - * @param array|null $aggregateFieldsets - * @return array - * @throws Exception - */ - function aggregateData(object $object, array &$includedData = [], ?array $aggregateFieldsets = null): array { - /** @var Task $object */ - $aggregatedData = []; - - if (!is_null($aggregateFieldsets) && array_key_exists('task', $aggregateFieldsets)) { - $aggregateFieldsets['task'] = explode(",", $aggregateFieldsets['task']); - - if (in_array("assignedAgents", $aggregateFieldsets['task'])) { - $qF = new QueryFilter(Assignment::TASK_ID, $object->getId(), "="); - $assignedAgents = Factory::getAssignmentFactory()->countFilter([Factory::FILTER => $qF]); - $aggregatedData["totalAssignedAgents"] = $assignedAgents; - } - - $keyspace = $object->getKeyspace(); - $keyspaceProgress = $object->getKeyspaceProgress(); - - if (in_array("dispatched", $aggregateFieldsets['task'])) { - $aggregatedData["dispatched"] = Util::showperc($keyspaceProgress, $keyspace); - } - - if (in_array("searched", $aggregateFieldsets['task'])) { - $aggregatedData["searched"] = Util::showperc(TaskUtils::getTaskProgress($object), $keyspace); - } - - if (in_array("status", $aggregateFieldsets['task'])) { - // the filter for progress is needed so we reduce the checked chunks numbers by a lot - $qF1 = new QueryFilter(Chunk::TASK_ID, $object->getId(), "="); - $qF2 = new QueryFilter(Chunk::PROGRESS, 10000, "<"); - $chunks = Factory::getChunkFactory()->filter([Factory::FILTER => [$qF1, $qF2]]); - $aggregatedData["status"] = TaskUtils::getStatus($chunks, $keyspace, $keyspaceProgress); - } - - if (in_array("totalNumberOfChunks", $aggregateFieldsets['task'])) { - $qF = new QueryFilter(Chunk::TASK_ID, $object->getId(), "="); - $aggregatedData["totalNumberOfChunks"] = Factory::getChunkFactory()->countFilter([Factory::FILTER => $qF]); - } - - if (in_array("currentSpeed", $aggregateFieldsets['task'])) { - $qF1 = new QueryFilter(Chunk::TASK_ID, $object->getId(), "="); - $qF2 = new QueryFilter(Chunk::SOLVE_TIME, time() - SConfig::getInstance()->getVal(DConfig::CHUNK_TIMEOUT), ">"); - $qF3 = new QueryFilter(Chunk::PROGRESS, 10000, "<"); - $agg = new Aggregation(Chunk::SPEED, Aggregation::SUM); - $speed = Factory::getChunkFactory()->multicolAggregationFilter([Factory::FILTER => [$qF1, $qF2, $qF3]], [$agg])[$agg->getName()]; - if ($speed == null) { - $speed = 0; - } - $aggregatedData["currentSpeed"] = $speed; - } - - if (in_array("estimatedTime", $aggregateFieldsets['task']) || - in_array("timeSpent", $aggregateFieldsets['task']) || - in_array("cprogress", $aggregateFieldsets['task'])) { - - $cProgress = TaskUtils::getTaskProgress($object); - if (in_array("cprogress", $aggregateFieldsets['task'])) { - $aggregatedData["cprogress"] = $cProgress; - } - - $timeSpent = TaskUtils::getTimeSpentOnTask($object); - - if (in_array("timeSpent", $aggregateFieldsets['task'])) { - $aggregatedData["timeSpent"] = $timeSpent; - } - - if (in_array("estimatedTime", $aggregateFieldsets['task'])) { - $aggregatedData["estimatedTime"] = ($keyspace > 0 && $cProgress > 0) ? round($timeSpent / ($cProgress / $keyspace) - $timeSpent) : 0; - } - } - } - - return $aggregatedData; - } - protected function deleteObject(object $object): void { /** @var Task $object */ TaskUtils::deleteTask($object); diff --git a/src/inc/apiv2/model/TaskWrapperDisplayAPI.php b/src/inc/apiv2/model/TaskWrapperDisplayAPI.php index f007afecb..9246c8881 100644 --- a/src/inc/apiv2/model/TaskWrapperDisplayAPI.php +++ b/src/inc/apiv2/model/TaskWrapperDisplayAPI.php @@ -28,18 +28,19 @@ class TaskWrapperDisplayAPI extends AbstractModelAPI { public static function getBaseUri(): string { return "/api/v2/ui/taskwrapperdisplays"; } - + public static function getAvailableMethods(): array { return ['GET']; } + public function getRequiredPermissions(string $method): array { return [Task::PERM_READ, TaskWrapper::PERM_READ]; } - + public static function getDBAclass(): string { return TaskWrapperDisplay::class; } - + protected function getSingleACL(User $user, object $object): bool { $accessGroupsUser = Util::arrayOfIds(AccessUtils::getAccessGroupsOfUser($user)); @@ -49,9 +50,9 @@ protected function getSingleACL(User $user, object $object): bool { $wrappers = Factory::getTaskWrapperFactory()->filter([Factory::FILTER => [$qF1, $qF2], Factory::JOIN => $jF])[Factory::getTaskWrapperFactory()->getModelName()]; return count($wrappers) > 0; } - + protected function getFilterACL(): array { - + $accessGroups = Util::arrayOfIds(AccessUtils::getAccessGroupsOfUser($this->getCurrentUser())); return [ @@ -67,142 +68,171 @@ protected function getFilterACL(): array { public function getAggregateFieldsets(): array { return [ 'taskwrapperdisplay' => [ - 'totalAssignedAgents', - 'dispatched', - 'searched', - 'status', - 'currentSpeed', - 'estimatedTime', - 'cprogress', - 'timeSpent' + 'totalAssignedAgents' => [$this, 'getAggregateTotalAssignedAgents'], + 'dispatched' => [$this, 'getAggregateDispatched'], + 'searched' => [$this, 'getAggregateSearched'], + 'status' => [$this, 'getAggregateStatus'], + 'currentSpeed' => [$this, 'getAggregateCurrentSpeed'], + 'estimatedTime' => [$this, 'getAggregateEstimatedTime'], + 'cprogress' => [$this, 'getAggregateCProgress'], + 'timeSpent' => [$this, 'getAggregateTimeSpent'], ] ]; } /** - * @param object $object - * @param array $includedData - * @param array|null $aggregateFieldsets - * @return array * @throws Exception */ - function aggregateData(object $object, array &$includedData = [], ?array $aggregateFieldsets = null): array { - $aggregatedData = []; + protected function getAggregateTotalAssignedAgents(object $object): int { + $qF = new QueryFilter(Task::TASK_WRAPPER_ID, $object->getId(), "=", Factory::getTaskFactory()); + $jF = new JoinFilter(Factory::getTaskFactory(), Assignment::TASK_ID, Task::TASK_ID); + + return Factory::getAssignmentFactory()->countFilter([Factory::FILTER => $qF, Factory::JOIN => $jF]); + } + + /** + * @throws HttpError + */ + protected function getAggregateDispatched(object $object): string { + if ($object->getTaskType() !== DTaskTypes::NORMAL) { + throw new HttpError("Not possible to aggregate dispatched on other types than normal task!"); + } - if (!is_null($aggregateFieldsets) && array_key_exists('taskwrapperdisplay', $aggregateFieldsets)) { - $aggregateFieldsets['taskwrapperdisplay'] = explode(",", $aggregateFieldsets['taskwrapperdisplay']); - - if (in_array("status", $aggregateFieldsets['taskwrapperdisplay'])) { - // TODO: this could be optimized by only requesting taskId, keyspace and keyspaceProgress of all tasks of that wrapper (columnFilter) - $tasks = TaskUtils::getTasksOfWrapper($object->getId()); - $completed = 0; - $total = 0; - $status = 0; - foreach($tasks as $task) { - $qF1 = new QueryFilter(Chunk::TASK_ID, $task->getId(), "="); - $qF2 = new QueryFilter(Chunk::PROGRESS, 10000, "<"); - $chunks = Factory::getChunkFactory()->filter([Factory::FILTER => [$qF1, $qF2]]); - $taskStatus = TaskUtils::getStatus($chunks, $task->getKeyspace(), $task->getKeyspaceProgress()); - // if one task of the wrapper is running, it is running - if ($taskStatus === 1) { - $status = 1; - break; - } - if ($taskStatus === 3) { - $completed++; - } - $total++; - } - if ($status !== 1) { - if ($total > 0 && $completed === $total) { - $status = 3; - } else { - $status = 2; - } - } - $aggregatedData['status'] = $status; + $keyspace = $object->getKeyspace(); + $keyspaceProgress = $object->getKeyspaceProgress(); + return Util::showperc($keyspaceProgress, $keyspace); + } + + /** + * @throws HttpError + * @throws Exception + */ + protected function getAggregateSearched(object $object): string { + if ($object->getTaskType() !== DTaskTypes::NORMAL) { + throw new HttpError("Not possible to aggregate searched on other types than normal task!"); + } + + $keyspace = $object->getKeyspace(); + $task = TaskUtils::getTasksOfWrapper($object->getId())[0]; + return Util::showperc(TaskUtils::getTaskProgress($task), $keyspace); + } + + protected function getAggregateStatus(object $object): int { + // TODO: this could be optimized by only requesting taskId, keyspace and keyspaceProgress of all tasks of that wrapper (columnFilter) + $tasks = TaskUtils::getTasksOfWrapper($object->getId()); + $completed = 0; + $total = 0; + $status = 0; + foreach ($tasks as $task) { + $qF1 = new QueryFilter(Chunk::TASK_ID, $task->getId(), "="); + $qF2 = new QueryFilter(Chunk::PROGRESS, 10000, "<"); + $chunks = Factory::getChunkFactory()->filter([Factory::FILTER => [$qF1, $qF2]]); + $taskStatus = TaskUtils::getStatus($chunks, $task->getKeyspace(), $task->getKeyspaceProgress()); + // if one task of the wrapper is running, it is running + if ($taskStatus === 1) { + $status = 1; + break; } - - if (in_array("totalAssignedAgents", $aggregateFieldsets['taskwrapperdisplay'])) { - $qF = new QueryFilter(Task::TASK_WRAPPER_ID, $object->getId(), "=", Factory::getTaskFactory()); - $jF = new JoinFilter(Factory::getTaskFactory(), Assignment::TASK_ID, Task::TASK_ID); - - $assignedAgents = Factory::getAssignmentFactory()->countFilter([Factory::FILTER => $qF, Factory::JOIN => $jF]); - $aggregatedData["totalAssignedAgents"] = $assignedAgents; + if ($taskStatus === 3) { + $completed++; } - - $keyspace = $object->getKeyspace(); - $keyspaceProgress = $object->getKeyspaceProgress(); - - if ($object->getTaskType() === DTaskTypes::NORMAL) { - $tasks = TaskUtils::getTasksOfWrapper($object->getId()); - $task = $tasks[0]; - - if (in_array("dispatched", $aggregateFieldsets['taskwrapperdisplay'])) { - $aggregatedData["dispatched"] = Util::showperc($keyspaceProgress, $keyspace); - } - - if (in_array("searched", $aggregateFieldsets['taskwrapperdisplay'])) { - $aggregatedData["searched"] = Util::showperc(TaskUtils::getTaskProgress($task), $keyspace); - } - - if (in_array("currentSpeed", $aggregateFieldsets['taskwrapperdisplay'])) { - $qF1 = new QueryFilter(Chunk::TASK_ID, $task->getId(), "="); - $qF2 = new QueryFilter(Chunk::SOLVE_TIME, time() - SConfig::getInstance()->getVal(DConfig::CHUNK_TIMEOUT), ">"); - $qF3 = new QueryFilter(Chunk::PROGRESS, 10000, "<"); - $agg = new Aggregation(Chunk::SPEED, Aggregation::SUM); - $speed = Factory::getChunkFactory()->multicolAggregationFilter([Factory::FILTER => [$qF1, $qF2, $qF3]], [$agg])[$agg->getName()]; - if ($speed == null) { - $speed = 0; - } - $aggregatedData["currentSpeed"] = $speed; - } - - if (in_array("estimatedTime", $aggregateFieldsets['taskwrapperdisplay']) || - in_array("timeSpent", $aggregateFieldsets['taskwrapperdisplay']) || - in_array("cprogress", $aggregateFieldsets['taskwrapperdisplay'])) { - - $cProgress = TaskUtils::getTaskProgress($task); - if (in_array("cprogress", $aggregateFieldsets['taskwrapperdisplay'])) { - $aggregatedData["cprogress"] = $cProgress; - } - - $timeSpent = TaskUtils::getTimeSpentOnTask($task); - - if (in_array("timeSpent", $aggregateFieldsets['taskwrapperdisplay'])) { - $aggregatedData["timeSpent"] = $timeSpent; - } - - if (in_array("estimatedTime", $aggregateFieldsets['taskwrapperdisplay'])) { - $aggregatedData["estimatedTime"] = ($keyspace > 0 && $cProgress > 0) ? round($timeSpent / ($cProgress / $keyspace) - $timeSpent) : 0; - } - } + $total++; + } + if ($status !== 1) { + if ($total > 0 && $completed === $total) { + $status = 3; + } + else { + $status = 2; } } - return $aggregatedData; + return $status; } - + + /** + * @throws HttpError + * @throws Exception + */ + protected function getAggregateCurrentSpeed(object $object): int { + if ($object->getTaskType() !== DTaskTypes::NORMAL) { + throw new HttpError("Not possible to aggregate currentSpeed on other types than normal task!"); + } + + $task = TaskUtils::getTasksOfWrapper($object->getId())[0]; + + $qF1 = new QueryFilter(Chunk::TASK_ID, $task->getId(), "="); + $qF2 = new QueryFilter(Chunk::SOLVE_TIME, time() - SConfig::getInstance()->getVal(DConfig::CHUNK_TIMEOUT), ">"); + $qF3 = new QueryFilter(Chunk::PROGRESS, 10000, "<"); + $agg = new Aggregation(Chunk::SPEED, Aggregation::SUM); + $speed = Factory::getChunkFactory()->multicolAggregationFilter([Factory::FILTER => [$qF1, $qF2, $qF3]], [$agg])[$agg->getName()]; + if ($speed == null) { + $speed = 0; + } + return $speed; + } + + /** + * @throws HttpError + * @throws Exception + */ + protected function getAggregateEstimatedTime(object $object): int { + if ($object->getTaskType() !== DTaskTypes::NORMAL) { + throw new HttpError("Not possible to aggregate estimatedTime on other types than normal task!"); + } + + $keyspace = $object->getKeyspace(); + $cProgress = $this->getAggregateCProgress($object); + $timeSpent = $this->getAggregateTimeSpent($object); + return ($keyspace > 0 && $cProgress > 0) ? round($timeSpent / ($cProgress / $keyspace) - $timeSpent) : 0; + } + + /** + * @throws HttpError + * @throws Exception + */ + protected function getAggregateCProgress(object $object): int { + if ($object->getTaskType() !== DTaskTypes::NORMAL) { + throw new HttpError("Not possible to aggregate cprogress on other types than normal task!"); + } + + $task = TaskUtils::getTasksOfWrapper($object->getId())[0]; + return TaskUtils::getTaskProgress($task); + } + + /** + * @throws HttpError + * @throws Exception + */ + protected function getAggregateTimeSpent(object $object): int { + if ($object->getTaskType() !== DTaskTypes::NORMAL) { + throw new HttpError("Not possible to aggregate timeSpent on other types than normal task!"); + } + + $task = TaskUtils::getTasksOfWrapper($object->getId())[0]; + return TaskUtils::getTimeSpentOnTask($task); + } + /** * @throws HttpError */ protected function createObject(array $data): int { throw new HttpError("TaskWrapperDisplays cannot be created via API"); } - + /** * @throws HttpError */ public function updateObject(int $objectId, array $data): void { throw new HttpError("TaskWrapperDisplays cannot be updated via API"); } - + /** * @throws HttpError */ protected function deleteObject(object $object): void { throw new HttpError("TaskWrapperDisplays cannot be deleted via API"); } - + public static function getToManyRelationships(): array { return [ 'tasks' => [ From d6bf65f3aea19af43a062f225e14bddb0499ebc2 Mon Sep 17 00:00:00 2001 From: s3inlc Date: Wed, 17 Jun 2026 12:01:24 +0200 Subject: [PATCH 625/691] removed outdated includes from dba init --- src/dba/init.php | 2 -- 1 file changed, 2 deletions(-) diff --git a/src/dba/init.php b/src/dba/init.php index 70f344f69..af1360c22 100644 --- a/src/dba/init.php +++ b/src/dba/init.php @@ -9,7 +9,6 @@ require_once(dirname(__FILE__) . "/ConcatOrderFilter.php"); require_once(dirname(__FILE__) . "/ConcatLikeFilterInsensitive.php"); require_once(dirname(__FILE__) . "/Join.php"); -require_once(dirname(__FILE__) . "/Group.php"); require_once(dirname(__FILE__) . "/Limit.php"); require_once(dirname(__FILE__) . "/ComparisonFilter.php"); require_once(dirname(__FILE__) . "/ContainFilter.php"); @@ -17,7 +16,6 @@ require_once(dirname(__FILE__) . "/OrderFilter.php"); require_once(dirname(__FILE__) . "/PaginationFilter.php"); require_once(dirname(__FILE__) . "/QueryFilter.php"); -require_once(dirname(__FILE__) . "/GroupFilter.php"); require_once(dirname(__FILE__) . "/LimitFilter.php"); require_once(dirname(__FILE__) . "/Util.php"); require_once(dirname(__FILE__) . "/UpdateSet.php"); From 0b5cdfdf87037f0c1af777a5385fc9a761619469 Mon Sep 17 00:00:00 2001 From: s3inlc Date: Wed, 17 Jun 2026 14:28:47 +0200 Subject: [PATCH 626/691] added some more unittests --- ci/phpunit/TestBase.php | 53 ++- .../inc/utils/FileDownloadUtilsTest.php | 80 ++++ ci/phpunit/inc/utils/FileUtilsTest.php | 146 +++++++ ci/phpunit/inc/utils/HashtypeUtilsTest.php | 74 ++++ ci/phpunit/inc/utils/HealthUtilsTest.php | 197 ++++++++++ ci/phpunit/inc/utils/JwtTokenUtilsTest.php | 60 +++ ci/phpunit/inc/utils/LockUtilsTest.php | 104 +++++ .../inc/utils/PreprocessorUtilsTest.php | 358 ++++++++++++++++++ 8 files changed, 1068 insertions(+), 4 deletions(-) create mode 100644 ci/phpunit/inc/utils/FileDownloadUtilsTest.php create mode 100644 ci/phpunit/inc/utils/FileUtilsTest.php create mode 100644 ci/phpunit/inc/utils/HashtypeUtilsTest.php create mode 100644 ci/phpunit/inc/utils/HealthUtilsTest.php create mode 100644 ci/phpunit/inc/utils/JwtTokenUtilsTest.php create mode 100644 ci/phpunit/inc/utils/LockUtilsTest.php create mode 100644 ci/phpunit/inc/utils/PreprocessorUtilsTest.php diff --git a/ci/phpunit/TestBase.php b/ci/phpunit/TestBase.php index ec24393ad..0baf738aa 100644 --- a/ci/phpunit/TestBase.php +++ b/ci/phpunit/TestBase.php @@ -13,14 +13,23 @@ use Hashtopolis\dba\models\CrackerBinary; use Hashtopolis\dba\models\CrackerBinaryType; use Hashtopolis\dba\models\File; +use Hashtopolis\dba\models\FileDownload; use Hashtopolis\dba\models\FileTask; use Hashtopolis\dba\models\Hashlist; use Hashtopolis\dba\models\HashType; +use Hashtopolis\dba\models\HealthCheck; +use Hashtopolis\dba\models\HealthCheckAgent; +use Hashtopolis\dba\models\JwtApiKey; use Hashtopolis\dba\models\RightGroup; use Hashtopolis\dba\models\Task; use Hashtopolis\dba\models\TaskWrapper; use Hashtopolis\dba\models\User; use Hashtopolis\dba\models\UserFactory; +use Hashtopolis\inc\defines\DHealthCheckAgentStatus; +use Hashtopolis\inc\defines\DHealthCheckMode; +use Hashtopolis\inc\defines\DHealthCheckStatus; +use Hashtopolis\inc\defines\DHealthCheckType; +use Hashtopolis\inc\defines\DFileDownloadStatus; use Hashtopolis\inc\defines\DHashlistFormat; use Hashtopolis\inc\defines\DTaskTypes; use Hashtopolis\inc\utils\UserUtils; @@ -157,19 +166,46 @@ protected function createCrackerBinary(CrackerBinaryType $crackerBinaryType): Cr return $crackerBinary; } - protected function createTask(TaskWrapper $taskWrapper, CrackerBinary $crackerBinary, CrackerBinaryType $crackerBinaryType): Task { + protected function createTask(TaskWrapper $taskWrapper, CrackerBinary $crackerBinary, CrackerBinaryType $crackerBinaryType, ?int $usePreprocessor = null, string $preprocessorCommand = ''): Task { $task = $this->createDatabaseObject( Factory::getTaskFactory(), - new Task(null, 'task_' . uniqid(), '--attack-mode 0', 60, 30, 0, 0, 1, 1, '#ffffff', 0, 0, 0, 0, $crackerBinary->getId(), $crackerBinaryType->getId(), $taskWrapper->getId(), 0, '', 0, 0, 0, 0, '') + new Task(null, 'task_' . uniqid(), '--attack-mode 0', 60, 30, 0, 0, 1, 1, '#ffffff', 0, 0, 0, 0, $crackerBinary->getId(), $crackerBinaryType->getId(), $taskWrapper->getId(), 0, '', 0, 0, 0, $usePreprocessor ?? 0, $preprocessorCommand) ); $this->assertTrue($task instanceof Task); return $task; } - protected function createFile(AccessGroup $group, int $isSecret = 0): File { + protected function createJwtApiKey(User $user, ?int $startValid = null, ?int $endValid = null, int $isRevoked = 0): JwtApiKey { + $key = $this->createDatabaseObject( + Factory::getJwtApiKeyFactory(), + new JwtApiKey(null, $startValid ?? time(), $endValid ?? time() + 3600, $user->getId(), $isRevoked) + ); + $this->assertTrue($key instanceof JwtApiKey); + return $key; + } + + protected function createHealthCheck(CrackerBinary $crackerBinary, int $status = DHealthCheckStatus::PENDING, int $checkType = DHealthCheckType::BRUTE_FORCE, int $hashtypeId = DHealthCheckMode::MD5, int $expectedCracks = 0, string $attackCmd = ''): HealthCheck { + $check = $this->createDatabaseObject( + Factory::getHealthCheckFactory(), + new HealthCheck(null, time(), $status, $checkType, $hashtypeId, $crackerBinary->getId(), $expectedCracks, $attackCmd) + ); + $this->assertTrue($check instanceof HealthCheck); + return $check; + } + + protected function createHealthCheckAgent(HealthCheck $healthCheck, Agent $agent, int $status = DHealthCheckAgentStatus::PENDING, int $cracked = 0, int $numGpus = 0, int $start = 0, int $end = 0, string $errors = ''): HealthCheckAgent { + $agentCheck = $this->createDatabaseObject( + Factory::getHealthCheckAgentFactory(), + new HealthCheckAgent(null, $healthCheck->getId(), $agent->getId(), $status, $cracked, $numGpus, $start, $end, $errors) + ); + $this->assertTrue($agentCheck instanceof HealthCheckAgent); + return $agentCheck; + } + + protected function createFile(AccessGroup $group, int $isSecret = 0, ?string $filename = null, int $size = 0, int $fileType = 0, int $lineCount = 0): File { $file = $this->createDatabaseObject( Factory::getFileFactory(), - new File(null, 'file_' . uniqid(), 0, $isSecret, 0, $group->getId(), 0) + new File(null, $filename ?? 'file_' . uniqid(), $size, $isSecret, $fileType, $group->getId(), $lineCount) ); $this->assertTrue($file instanceof File); return $file; @@ -183,6 +219,15 @@ protected function createFileTask(File $file, Task $task): FileTask { $this->assertTrue($fileTask instanceof FileTask); return $fileTask; } + + protected function createFileDownload(int $fileId, int $status = DFileDownloadStatus::PENDING): FileDownload { + $fileDownload = $this->createDatabaseObject( + Factory::getFileDownloadFactory(), + new FileDownload(null, time(), $fileId, $status) + ); + $this->assertTrue($fileDownload instanceof FileDownload); + return $fileDownload; + } protected function createAgent(string $prefix, int $isTrusted = 1): Agent { $suffix = uniqid(); diff --git a/ci/phpunit/inc/utils/FileDownloadUtilsTest.php b/ci/phpunit/inc/utils/FileDownloadUtilsTest.php new file mode 100644 index 000000000..f3f19ffe0 --- /dev/null +++ b/ci/phpunit/inc/utils/FileDownloadUtilsTest.php @@ -0,0 +1,80 @@ +createAccessGroup('fdl_group'); + $this->file = $this->createFile($group); + $this->fileDownload = $this->createFileDownload($this->file->getId(), DFileDownloadStatus::DONE); + } + + public function testAddDownloadCreatesPendingDownload(): void { + $group = $this->createAccessGroup('fdl_new'); + $newFile = $this->createFile($group); + + FileDownloadUtils::addDownload($newFile->getId()); + + $qF1 = new QueryFilter(FileDownload::FILE_ID, $newFile->getId(), '='); + $qF2 = new QueryFilter(FileDownload::STATUS, DFileDownloadStatus::PENDING, '='); + $result = Factory::getFileDownloadFactory()->filter([Factory::FILTER => [$qF1, $qF2]], true); + + $this->assertInstanceOf(FileDownload::class, $result); + $this->assertSame($newFile->getId(), $result->getFileId()); + $this->assertSame(DFileDownloadStatus::PENDING, $result->getStatus()); + $this->registerDatabaseObject(Factory::getFileDownloadFactory(), $result); + } + + public function testAddDownloadSkipsExistingPending(): void { + $this->createFileDownload($this->file->getId()); + + FileDownloadUtils::addDownload($this->file->getId()); + + $qF1 = new QueryFilter(FileDownload::FILE_ID, $this->file->getId(), '='); + $qF2 = new QueryFilter(FileDownload::STATUS, DFileDownloadStatus::PENDING, '='); + $pending = Factory::getFileDownloadFactory()->filter([Factory::FILTER => [$qF1, $qF2]]); + $this->assertCount(1, $pending); + } + + public function testAddDownloadCreatesNewForCompletedFile(): void { + FileDownloadUtils::addDownload($this->file->getId()); + + $qF1 = new QueryFilter(FileDownload::FILE_ID, $this->file->getId(), '='); + $qF2 = new QueryFilter(FileDownload::STATUS, DFileDownloadStatus::PENDING, '='); + $pending = Factory::getFileDownloadFactory()->filter([Factory::FILTER => [$qF1, $qF2]], true); + + $this->assertInstanceOf(FileDownload::class, $pending); + $this->assertSame($this->file->getId(), $pending->getFileId()); + $this->assertSame(DFileDownloadStatus::PENDING, $pending->getStatus()); + $this->registerDatabaseObject(Factory::getFileDownloadFactory(), $pending); + } + + public function testRemoveFileDeletesDownloads(): void { + FileDownloadUtils::removeFile($this->fileDownload->getFileId()); + + $qF = new QueryFilter(FileDownload::FILE_ID, $this->fileDownload->getFileId(), '='); + $remaining = Factory::getFileDownloadFactory()->filter([Factory::FILTER => $qF]); + $this->assertSame([], $remaining); + } + + public function testRemoveFileIsNoopForNonExistent(): void { + FileDownloadUtils::removeFile(-1); + $this->assertTrue(true); + } +} diff --git a/ci/phpunit/inc/utils/FileUtilsTest.php b/ci/phpunit/inc/utils/FileUtilsTest.php new file mode 100644 index 000000000..1febcbb5c --- /dev/null +++ b/ci/phpunit/inc/utils/FileUtilsTest.php @@ -0,0 +1,146 @@ +user = $this->createUser('fu_user'); + $this->group = $this->createAccessGroup('fu_group'); + $this->createAccessGroupUser($this->user, $this->group); + + $this->file = $this->createFile($this->group); + $this->ruleFile = $this->createFile($this->group, 0, 'test_rule_' . uniqid() . '.rule', 512, DFileType::RULE); + $this->wordlistFile = $this->createFile($this->group); + $this->otherFile = $this->createFile($this->group, 0, 'test_other_' . uniqid() . '.bin', 256, DFileType::OTHER); + } + + public function testGetFileReturnsFileForAuthorizedUser(): void { + $result = FileUtils::getFile($this->file->getId(), $this->user); + $this->assertInstanceOf(File::class, $result); + $this->assertSame($this->file->getId(), $result->getId()); + } + + public function testGetFileThrowsForInvalidId(): void { + $this->expectException(HTException::class); + FileUtils::getFile(-1, $this->user); + } + + public function testGetFileThrowsForUnauthorizedUser(): void { + $otherGroup = $this->createAccessGroup('fu_other'); + $otherFile = $this->createFile($otherGroup); + + $this->expectException(HTException::class); + FileUtils::getFile($otherFile->getId(), $this->user); + } + + public function testSetFileTypeUpdatesType(): void { + FileUtils::setFileType($this->file->getId(), DFileType::RULE, $this->user); + + $updated = Factory::getFileFactory()->get($this->file->getId()); + $this->assertSame(DFileType::RULE, $updated->getFileType()); + } + + public function testSetFileTypeThrowsForInvalidType(): void { + $this->expectException(HTException::class); + FileUtils::setFileType($this->file->getId(), 999, $this->user); + } + + public function testSwitchSecretTogglesSecret(): void { + FileUtils::switchSecret($this->file->getId(), 1, $this->user); + + $updated = Factory::getFileFactory()->get($this->file->getId()); + $this->assertSame(1, $updated->getIsSecret()); + + FileUtils::switchSecret($this->file->getId(), 0, $this->user); + + $updated = Factory::getFileFactory()->get($this->file->getId()); + $this->assertSame(0, $updated->getIsSecret()); + } + + public function testGetFilesReturnsFilesInUserAccessGroups(): void { + $files = FileUtils::getFiles($this->user); + $fileIds = array_map(fn(File $f) => $f->getId(), $files); + + $this->assertContains($this->file->getId(), $fileIds); + $this->assertContains($this->ruleFile->getId(), $fileIds); + $this->assertContains($this->wordlistFile->getId(), $fileIds); + $this->assertContains($this->otherFile->getId(), $fileIds); + } + + public function testGetFilesExcludesTemporaryFiles(): void { + $tempFile = $this->createFile($this->group, 0, 'temp_' . uniqid() . '.tmp', 0, DFileType::TEMPORARY); + + $files = FileUtils::getFiles($this->user); + $fileIds = array_map(fn(File $f) => $f->getId(), $files); + + $this->assertNotContains($tempFile->getId(), $fileIds); + } + + public function testLoadFilesByCategoryCategorizesFiles(): void { + [$rules, $wordlists, $other] = FileUtils::loadFilesByCategory($this->user, []); + + $ruleIds = array_map(fn($set) => $set->getAllValues()['file']->getId(), $rules); + $wlIds = array_map(fn($set) => $set->getAllValues()['file']->getId(), $wordlists); + $otherIds = array_map(fn($set) => $set->getAllValues()['file']->getId(), $other); + + $this->assertContains($this->ruleFile->getId(), $ruleIds); + $this->assertContains($this->file->getId(), $wlIds); + $this->assertContains($this->wordlistFile->getId(), $wlIds); + $this->assertContains($this->otherFile->getId(), $otherIds); + } + + public function testLoadFilesByCategoryMarksCheckedFiles(): void { + [$rules, $wordlists, $other] = FileUtils::loadFilesByCategory($this->user, [$this->file->getId()]); + + $checkedIds = []; + foreach (array_merge($rules, $wordlists, $other) as $set) { + $data = $set->getAllValues(); + if ($data['checked'] === '1') { + $checkedIds[] = $data['file']->getId(); + } + } + + $this->assertContains($this->file->getId(), $checkedIds); + } + + public function testDeleteThrowsForInvalidId(): void { + $this->expectException(HTException::class); + FileUtils::delete(-1, $this->user); + } + + public function testDeleteThrowsWhenFileInUseByTask(): void { + $this->expectException(HTException::class); + + $hashType = $this->createHashType(); + $hashlist = $this->createHashlist($this->group, $hashType); + $crackerBinaryType = $this->createCrackerBinaryType(); + $crackerBinary = $this->createCrackerBinary($crackerBinaryType); + $taskWrapper = $this->createTaskWrapper($this->group, $hashlist); + $task = $this->createTask($taskWrapper, $crackerBinary, $crackerBinaryType); + $this->createFileTask($this->file, $task); + + FileUtils::delete($this->file->getId(), $this->user); + } +} diff --git a/ci/phpunit/inc/utils/HashtypeUtilsTest.php b/ci/phpunit/inc/utils/HashtypeUtilsTest.php new file mode 100644 index 000000000..30ee5d4f2 --- /dev/null +++ b/ci/phpunit/inc/utils/HashtypeUtilsTest.php @@ -0,0 +1,74 @@ +user = $this->createUser('ht_user'); + } + + public function testAddHashtypeCreatesNewHashtype(): void { + $hashtypeId = 999001; + $description = 'test_hashtype_' . uniqid(); + + $hashtype = HashtypeUtils::addHashtype($hashtypeId, $description, 0, false, $this->user); + + $this->assertSame($hashtypeId, $hashtype->getId()); + $this->assertStringContainsString($description, $hashtype->getDescription()); + + Factory::getHashTypeFactory()->delete($hashtype); + } + + public function testAddHashtypeThrowsForDuplicateId(): void { + $existing = $this->createHashType(); + + $this->expectException(HttpError::class); + HashtypeUtils::addHashtype($existing->getId(), 'new_desc', 0, false, $this->user); + } + + public function testAddHashtypeThrowsForEmptyDescription(): void { + $this->expectException(HttpError::class); + HashtypeUtils::addHashtype(999003, '', 0, false, $this->user); + } + + public function testAddHashtypeThrowsForNegativeId(): void { + $this->expectException(HttpError::class); + HashtypeUtils::addHashtype(-1, 'desc', 0, false, $this->user); + } + + public function testDeleteHashtypeRemovesHashtype(): void { + $hashtype = $this->createHashType(); + + HashtypeUtils::deleteHashtype($hashtype->getId()); + + $this->assertNull(Factory::getHashTypeFactory()->get($hashtype->getId())); + } + + public function testDeleteHashtypeThrowsForInvalidId(): void { + $this->expectException(HTException::class); + HashtypeUtils::deleteHashtype(-1); + } + + public function testDeleteHashtypeThrowsWhenHashlistsExist(): void { + $hashtype = $this->createHashType(); + $accessGroup = $this->createAccessGroup('ht_del'); + $this->createHashlist($accessGroup, $hashtype); + + $this->expectException(HTException::class); + HashtypeUtils::deleteHashtype($hashtype->getId()); + } +} diff --git a/ci/phpunit/inc/utils/HealthUtilsTest.php b/ci/phpunit/inc/utils/HealthUtilsTest.php new file mode 100644 index 000000000..0301dc6d2 --- /dev/null +++ b/ci/phpunit/inc/utils/HealthUtilsTest.php @@ -0,0 +1,197 @@ +createCrackerBinaryType(); + $this->crackerBinary = $this->createCrackerBinary($crackerBinaryType); + $this->agent = $this->createAgent('hc_agent'); + $this->otherAgent = $this->createAgent('hc_other'); + + $this->healthCheck = $this->createHealthCheck($this->crackerBinary, DHealthCheckStatus::PENDING, DHealthCheckType::BRUTE_FORCE, DHealthCheckMode::MD5, 50, '-a 3 -1 ?l?u?d ?1?1?1?1?1'); + + $this->healthCheckAgent = $this->createHealthCheckAgent($this->healthCheck, $this->agent); + + $this->completedAgent = $this->createHealthCheckAgent($this->healthCheck, $this->otherAgent, DHealthCheckAgentStatus::COMPLETED, 10, 2, 100, 200); + } + + #[Override] + protected function tearDown(): void { + $tmpFile = '/tmp/health-check-' . ($this->healthCheck->getId() ?? 0) . '.txt'; + if (file_exists($tmpFile)) { + unlink($tmpFile); + } + parent::tearDown(); + } + + public function testGenerateHashMd5(): void { + $plain = 'testplain'; + $hash = HealthUtils::generateHash(DHealthCheckMode::MD5, $plain); + $this->assertSame(md5($plain), $hash); + } + + public function testGenerateHashBcrypt(): void { + $plain = 'abc'; + $hash = HealthUtils::generateHash(DHealthCheckMode::BCRYPT, $plain); + $this->assertNotFalse(password_verify($plain, $hash)); + } + + public function testGenerateHashThrowsForUnknownHashtype(): void { + $this->expectException(HTException::class); + HealthUtils::generateHash(999999, 'plain'); + } + + public function testGetAttackModeBruteForce(): void { + $mode = $this->callPrivateMethod('getAttackMode', DHealthCheckType::BRUTE_FORCE); + $this->assertSame(' -a 3', $mode); + } + + public function testGetAttackInputMd5BruteForce(): void { + $input = $this->callPrivateMethod('getAttackInput', DHealthCheckMode::MD5, DHealthCheckType::BRUTE_FORCE); + $this->assertSame(' -1 ?l?u?d ?1?1?1?1?1', $input); + } + + public function testGetAttackInputBcryptBruteForce(): void { + $input = $this->callPrivateMethod('getAttackInput', DHealthCheckMode::BCRYPT, DHealthCheckType::BRUTE_FORCE); + $this->assertSame(' ?l?l?l', $input); + } + + public function testGetAttackNumHashesMd5(): void { + $num = $this->callPrivateMethod('getAttackNumHashes', DHealthCheckMode::MD5); + $this->assertSame(100, $num); + } + + public function testGetAttackNumHashesBcrypt(): void { + $num = $this->callPrivateMethod('getAttackNumHashes', DHealthCheckMode::BCRYPT); + $this->assertSame(10, $num); + } + + public function testGetAttackNumHashesUnknown(): void { + $num = $this->callPrivateMethod('getAttackNumHashes', 999); + $this->assertSame(100, $num); + } + + public function testCheckNeededReturnsPendingAgentCheck(): void { + $result = HealthUtils::checkNeeded($this->agent); + $this->assertInstanceOf(HealthCheckAgent::class, $result); + $this->assertSame($this->healthCheckAgent->getId(), $result->getId()); + } + + public function testCheckNeededReturnsFalseWhenAgentHasNoPending(): void { + $freshAgent = $this->createAgent('hc_fresh'); + $result = HealthUtils::checkNeeded($freshAgent); + $this->assertFalse($result); + } + + public function testCheckNeededReturnsFalseWhenHealthCheckIsAborted(): void { + $abortedCheck = $this->createHealthCheck($this->crackerBinary, DHealthCheckStatus::ABORTED); + $isolatedAgent = $this->createAgent('hc_isolated'); + $pendingAgent = $this->createHealthCheckAgent($abortedCheck, $isolatedAgent); + + $result = HealthUtils::checkNeeded($isolatedAgent); + $this->assertFalse($result); + } + + public function testCheckCompletionMarksCompleteWhenAllAgentsDone(): void { + $allDoneCheck = $this->createHealthCheck($this->crackerBinary); + $this->createHealthCheckAgent($allDoneCheck, $this->agent, DHealthCheckAgentStatus::COMPLETED, 5, 1, 0, 10); + $this->createHealthCheckAgent($allDoneCheck, $this->otherAgent, DHealthCheckAgentStatus::FAILED, 0, 0, 0, 0, 'error'); + + HealthUtils::checkCompletion($allDoneCheck); + + $updated = Factory::getHealthCheckFactory()->get($allDoneCheck->getId()); + $this->assertSame(DHealthCheckStatus::COMPLETED, $updated->getStatus()); + } + + public function testCheckCompletionDoesNotCompleteWhenAgentPending(): void { + HealthUtils::checkCompletion($this->healthCheck); + + $updated = Factory::getHealthCheckFactory()->get($this->healthCheck->getId()); + $this->assertSame(DHealthCheckStatus::PENDING, $updated->getStatus()); + } + + public function testResetAgentCheckResetsPendingAgent(): void { + HealthUtils::resetAgentCheck($this->healthCheckAgent->getId()); + + $updated = Factory::getHealthCheckAgentFactory()->get($this->healthCheckAgent->getId()); + $this->assertSame(DHealthCheckAgentStatus::PENDING, $updated->getStatus()); + $this->assertSame(0, $updated->getStart()); + $this->assertSame(0, $updated->getEnd()); + $this->assertSame('', $updated->getErrors()); + $this->assertSame(0, $updated->getCracked()); + $this->assertSame(0, $updated->getNumGpus()); + } + + public function testResetAgentCheckReopensCompletedHealthCheck(): void { + $completedCheck = $this->createHealthCheck($this->crackerBinary, DHealthCheckStatus::COMPLETED); + $agentCheck = $this->createHealthCheckAgent($completedCheck, $this->agent, DHealthCheckAgentStatus::COMPLETED, 5, 1, 0, 10); + + HealthUtils::resetAgentCheck($agentCheck->getId()); + + $updatedCheck = Factory::getHealthCheckFactory()->get($completedCheck->getId()); + $this->assertSame(DHealthCheckStatus::PENDING, $updatedCheck->getStatus()); + } + + public function testResetAgentCheckThrowsForAbortedHealthCheck(): void { + $abortedCheck = $this->createHealthCheck($this->crackerBinary, DHealthCheckStatus::ABORTED); + $agentCheck = $this->createHealthCheckAgent($abortedCheck, $this->agent, DHealthCheckAgentStatus::FAILED, 5, 1, 0, 10); + + $this->expectException(HTException::class); + HealthUtils::resetAgentCheck($agentCheck->getId()); + } + + public function testResetAgentCheckThrowsForInvalidId(): void { + $this->expectException(HTException::class); + HealthUtils::resetAgentCheck(-1); + } + + public function testDeleteHealthCheckRemovesCheckAndAgents(): void { + HealthUtils::deleteHealthCheck($this->healthCheck->getId()); + + $this->assertNull(Factory::getHealthCheckFactory()->get($this->healthCheck->getId())); + + $qF = new QueryFilter(HealthCheckAgent::HEALTH_CHECK_ID, $this->healthCheck->getId(), '='); + $remaining = Factory::getHealthCheckAgentFactory()->filter([Factory::FILTER => $qF]); + $this->assertSame([], $remaining); + } + + public function testDeleteHealthCheckThrowsForInvalidId(): void { + $this->expectException(HTException::class); + HealthUtils::deleteHealthCheck(-1); + } + + private function callPrivateMethod(string $name, ...$args): mixed { + $ref = new ReflectionClass(HealthUtils::class); + $method = $ref->getMethod($name); + return $method->invoke(null, ...$args); + } +} diff --git a/ci/phpunit/inc/utils/JwtTokenUtilsTest.php b/ci/phpunit/inc/utils/JwtTokenUtilsTest.php new file mode 100644 index 000000000..ed8015531 --- /dev/null +++ b/ci/phpunit/inc/utils/JwtTokenUtilsTest.php @@ -0,0 +1,60 @@ +user = $this->createUser('jwt_user'); + } + + public function testCreateKeyCreatesValidKey(): void { + $start = time(); + $end = $start + 3600; + + $key = JwtTokenUtils::createKey($this->user->getId(), $start, $end); + + $this->assertInstanceOf(JwtApiKey::class, $key); + $this->assertSame($start, $key->getStartValid()); + $this->assertSame($end, $key->getEndValid()); + $this->assertSame($this->user->getId(), $key->getUserId()); + $this->assertNotNull($key->getId()); + $this->registerDatabaseObject(Factory::getJwtApiKeyFactory(), $key); + } + + public function testCreateKeyThrowsForInvalidUser(): void { + $this->expectException(HttpError::class); + JwtTokenUtils::createKey(-1, time(), time() + 3600); + } + + public function testDeleteKeyDeletesExpiredKey(): void { + $start = time() - 7200; + $end = time() - 3600; + $key = $this->createJwtApiKey($this->user, $start, $end); + + JwtTokenUtils::deleteKey($key); + + $this->assertNull(Factory::getJwtApiKeyFactory()->get($key->getId())); + } + + public function testDeleteKeyThrowsForUnexpiredKey(): void { + $key = $this->createJwtApiKey($this->user); + + $this->expectException(HttpForbidden::class); + JwtTokenUtils::deleteKey($key); + } +} diff --git a/ci/phpunit/inc/utils/LockUtilsTest.php b/ci/phpunit/inc/utils/LockUtilsTest.php new file mode 100644 index 000000000..f4fd36de8 --- /dev/null +++ b/ci/phpunit/inc/utils/LockUtilsTest.php @@ -0,0 +1,104 @@ +releaseTestLock(); + $this->cleanupLockFiles(); + } + + #[Override] + protected function tearDown(): void { + $this->releaseTestLock(); + $this->cleanupLockFiles(); + parent::tearDown(); + } + + private function releaseTestLock(): void { + LockUtils::release(self::TEST_LOCK); + } + + private function cleanupLockFiles(): void { + $prefixes = [Lock::CHUNKING, self::TEST_LOCK]; + foreach ($prefixes as $prefix) { + $path = self::LOCK_DIR . '/' . $prefix; + if (is_file($path)) { + unlink($path); + } + } + } + + public function testGetCreatesAndAcquiresLock(): void { + LockUtils::get(self::TEST_LOCK); + $lockFile = self::LOCK_DIR . '/' . self::TEST_LOCK; + $this->assertFileExists($lockFile); + LockUtils::release(self::TEST_LOCK); + } + + public function testGetReturnsCachedInstance(): void { + LockUtils::get(self::TEST_LOCK); + LockUtils::get(self::TEST_LOCK); + LockUtils::release(self::TEST_LOCK); + $this->assertTrue(true); + } + + public function testReleaseReleasesLockForReacquisition(): void { + LockUtils::get(self::TEST_LOCK); + LockUtils::release(self::TEST_LOCK); + + LockUtils::get(self::TEST_LOCK); + LockUtils::release(self::TEST_LOCK); + $this->assertTrue(true); + } + + public function testReleaseIsNoopForUnknownLock(): void { + LockUtils::release('nonexistent.lock'); + $this->assertTrue(true); + } + + public function testDeleteLockFileRemovesExistingLockFile(): void { + $taskId = 999001; + $lockFilePath = self::LOCK_DIR . '/' . Lock::CHUNKING . $taskId; + + touch($lockFilePath); + $this->assertFileExists($lockFilePath); + + LockUtils::deleteLockFile($taskId); + + $this->assertFileDoesNotExist($lockFilePath); + } + + public function testDeleteLockFileDoesNotThrowForMissingFile(): void { + LockUtils::deleteLockFile(999002); + $this->assertTrue(true); + } + + public function testDeleteLockFileCleansUpOnlySpecifiedTask(): void { + $taskIdA = 999003; + $taskIdB = 999004; + $pathA = self::LOCK_DIR . '/' . Lock::CHUNKING . $taskIdA; + $pathB = self::LOCK_DIR . '/' . Lock::CHUNKING . $taskIdB; + + touch($pathA); + touch($pathB); + + LockUtils::deleteLockFile($taskIdA); + + $this->assertFileDoesNotExist($pathA); + $this->assertFileExists($pathB); + + unlink($pathB); + } +} diff --git a/ci/phpunit/inc/utils/PreprocessorUtilsTest.php b/ci/phpunit/inc/utils/PreprocessorUtilsTest.php new file mode 100644 index 000000000..8b125d219 --- /dev/null +++ b/ci/phpunit/inc/utils/PreprocessorUtilsTest.php @@ -0,0 +1,358 @@ +preprocessor = PreprocessorUtils::addPreprocessor( + 'test_pp_' . uniqid(), + 'test_binary_' . uniqid(), + 'https://example.com/test.zip', + '--keyspace', + '--skip', + '--limit' + ); + } + + #[Override] + protected function tearDown(): void { + try { + PreprocessorUtils::delete($this->preprocessor->getId()); + } + catch (Exception) { + } + parent::tearDown(); + } + + private function createPreprocessor(string $suffix = ''): Preprocessor { + $suffix = $suffix ?: uniqid(); + $pp = PreprocessorUtils::addPreprocessor( + 'tmp_pp_' . $suffix, + 'tmp_binary_' . $suffix, + 'https://example.com/' . $suffix . '.zip', + '--ks', + '--sk', + '--lm' + ); + $this->registerDatabaseObject(Factory::getPreprocessorFactory(), $pp); + return $pp; + } + + public function testAddPreprocessorCreatesWithValidData(): void { + $name = 'add_create_' . uniqid(); + $binaryName = 'add_binary_' . uniqid(); + $url = 'https://example.com/add_create.zip'; + + $pp = PreprocessorUtils::addPreprocessor($name, $binaryName, $url, '--keyspace', '--skip', '--limit'); + $this->registerDatabaseObject(Factory::getPreprocessorFactory(), $pp); + + $this->assertInstanceOf(Preprocessor::class, $pp); + $this->assertSame($name, $pp->getName()); + $this->assertSame($binaryName, $pp->getBinaryName()); + $this->assertSame($url, $pp->getUrl()); + $this->assertSame('--keyspace', $pp->getKeyspaceCommand()); + $this->assertSame('--skip', $pp->getSkipCommand()); + $this->assertSame('--limit', $pp->getLimitCommand()); + $this->assertNotNull($pp->getId()); + } + + public function testAddPreprocessorConvertsEmptyCommandsToNull(): void { + $pp = PreprocessorUtils::addPreprocessor( + 'add_null_cmds_' . uniqid(), + 'binary_null', + 'https://example.com/null.zip', + '', '', '' + ); + $this->registerDatabaseObject(Factory::getPreprocessorFactory(), $pp); + + $this->assertNull($pp->getKeyspaceCommand()); + $this->assertNull($pp->getSkipCommand()); + $this->assertNull($pp->getLimitCommand()); + } + + public function testAddPreprocessorThrowsForDuplicateName(): void { + $this->expectException(HttpConflict::class); + PreprocessorUtils::addPreprocessor( + $this->preprocessor->getName(), + 'binary_dup', + 'https://example.com/dup.zip', + '', '', '' + ); + } + + public function testAddPreprocessorThrowsForEmptyName(): void { + $this->expectException(HttpError::class); + PreprocessorUtils::addPreprocessor('', 'binary', 'https://example.com/e.zip', '', '', ''); + } + + public function testAddPreprocessorThrowsForEmptyBinaryName(): void { + $this->expectException(HttpError::class); + PreprocessorUtils::addPreprocessor('name', '', 'https://example.com/e.zip', '', '', ''); + } + + public function testAddPreprocessorThrowsForEmptyUrl(): void { + $this->expectException(HttpError::class); + PreprocessorUtils::addPreprocessor('name', 'binary', '', '', '', ''); + } + + public function testAddPreprocessorThrowsForBlacklistedBinaryName(): void { + $this->expectException(HttpError::class); + PreprocessorUtils::addPreprocessor('name', 'bad|binary', 'https://example.com/b.zip', '', '', ''); + } + + public function testAddPreprocessorThrowsForBlacklistedKeyspace(): void { + $this->expectException(HttpError::class); + PreprocessorUtils::addPreprocessor( + 'name', 'binary', 'https://example.com/b.zip', + '--keyspace;rm', '--skip', '--limit' + ); + } + + public function testAddPreprocessorThrowsForBlacklistedSkip(): void { + $this->expectException(HttpError::class); + PreprocessorUtils::addPreprocessor( + 'name', 'binary', 'https://example.com/b.zip', + '--keyspace', '--skip$test', '--limit' + ); + } + + public function testAddPreprocessorThrowsForBlacklistedLimit(): void { + $this->expectException(HttpError::class); + PreprocessorUtils::addPreprocessor( + 'name', 'binary', 'https://example.com/b.zip', + '--keyspace', '--skip', '--limit`test`' + ); + } + + public function testGetPreprocessorReturnsPreprocessor(): void { + $retrieved = PreprocessorUtils::getPreprocessor($this->preprocessor->getId()); + $this->assertInstanceOf(Preprocessor::class, $retrieved); + $this->assertSame($this->preprocessor->getId(), $retrieved->getId()); + } + + public function testGetPreprocessorThrowsForInvalidId(): void { + $this->expectException(HTException::class); + PreprocessorUtils::getPreprocessor(-1); + } + + public function testDeleteRemovesPreprocessor(): void { + $pp = $this->createPreprocessor('del_test'); + $ppId = $pp->getId(); + + PreprocessorUtils::delete($ppId); + + $this->assertNull(Factory::getPreprocessorFactory()->get($ppId)); + } + + public function testDeleteThrowsForNonExistentPreprocessor(): void { + $this->expectException(HTException::class); + PreprocessorUtils::delete(-1); + } + + public function testDeleteThrowsWhenTaskUsesPreprocessor(): void { + $pp = $this->createPreprocessor('del_task'); + $hashType = $this->createHashType(); + $hashlist = $this->createHashlist($this->createAccessGroup('del_pp'), $hashType); + $crackerBinaryType = $this->createCrackerBinaryType(); + $crackerBinary = $this->createCrackerBinary($crackerBinaryType); + $taskWrapper = $this->createTaskWrapper($this->createAccessGroup('del_pp'), $hashlist); + $this->createDatabaseObject( + Factory::getTaskFactory(), + new Task( + null, 'task_with_pp_' . uniqid(), '--attack-mode 0', 60, 30, 0, 0, 1, 1, + '#ffffff', 0, 0, 0, 0, $crackerBinary->getId(), $crackerBinaryType->getId(), + $taskWrapper->getId(), 0, '', 0, 0, 0, $pp->getId(), '' + ) + ); + + $this->expectException(HttpError::class); + PreprocessorUtils::delete($pp->getId()); + } + + public function testEditNameUpdatesName(): void { + $newName = 'rename_pp_' . uniqid(); + PreprocessorUtils::editName($this->preprocessor->getId(), $newName); + + $updated = Factory::getPreprocessorFactory()->get($this->preprocessor->getId()); + $this->assertSame($newName, $updated->getName()); + } + + public function testEditNameThrowsForDuplicateName(): void { + $other = $this->createPreprocessor('rename_dup'); + + $this->expectException(HTException::class); + PreprocessorUtils::editName($this->preprocessor->getId(), $other->getName()); + } + + public function testEditBinaryNameUpdates(): void { + $newBinary = 'new_binary_' . uniqid(); + PreprocessorUtils::editBinaryName($this->preprocessor->getId(), $newBinary); + + $updated = Factory::getPreprocessorFactory()->get($this->preprocessor->getId()); + $this->assertSame($newBinary, $updated->getBinaryName()); + } + + public function testEditBinaryNameThrowsForEmpty(): void { + $this->expectException(HTException::class); + PreprocessorUtils::editBinaryName($this->preprocessor->getId(), ''); + } + + public function testEditBinaryNameThrowsForBlacklistedChars(): void { + $this->expectException(HTException::class); + PreprocessorUtils::editBinaryName($this->preprocessor->getId(), 'bad|binary'); + } + + public function testEditKeyspaceCommandUpdates(): void { + $newCmd = '--new-keyspace'; + PreprocessorUtils::editKeyspaceCommand($this->preprocessor->getId(), $newCmd); + + $updated = Factory::getPreprocessorFactory()->get($this->preprocessor->getId()); + $this->assertSame($newCmd, $updated->getKeyspaceCommand()); + } + + public function testEditKeyspaceCommandThrowsForBlacklistedChars(): void { + $this->expectException(HTException::class); + PreprocessorUtils::editKeyspaceCommand($this->preprocessor->getId(), 'keyspace;rm'); + } + + public function testEditSkipCommandUpdates(): void { + $newCmd = '--new-skip'; + PreprocessorUtils::editSkipCommand($this->preprocessor->getId(), $newCmd); + + $updated = Factory::getPreprocessorFactory()->get($this->preprocessor->getId()); + $this->assertSame($newCmd, $updated->getSkipCommand()); + } + + public function testEditSkipCommandThrowsForBlacklistedChars(): void { + $this->expectException(HTException::class); + PreprocessorUtils::editSkipCommand($this->preprocessor->getId(), 'skip$test'); + } + + public function testEditLimitCommandUpdates(): void { + $newCmd = '--new-limit'; + PreprocessorUtils::editLimitCommand($this->preprocessor->getId(), $newCmd); + + $updated = Factory::getPreprocessorFactory()->get($this->preprocessor->getId()); + $this->assertSame($newCmd, $updated->getLimitCommand()); + } + + public function testEditLimitCommandThrowsForBlacklistedChars(): void { + $this->expectException(HTException::class); + PreprocessorUtils::editLimitCommand($this->preprocessor->getId(), 'limit`test`'); + } + + public function testEditPreprocessorUpdatesAllFields(): void { + $newName = 'full_edit_' . uniqid(); + $newBinary = 'full_bin_' . uniqid(); + $newUrl = 'https://example.com/full.zip'; + + PreprocessorUtils::editPreprocessor( + $this->preprocessor->getId(), $newName, $newBinary, $newUrl, + '--ks', '--sk', '--lm' + ); + + $updated = Factory::getPreprocessorFactory()->get($this->preprocessor->getId()); + $this->assertSame($newName, $updated->getName()); + $this->assertSame($newBinary, $updated->getBinaryName()); + $this->assertSame($newUrl, $updated->getUrl()); + $this->assertSame('--ks', $updated->getKeyspaceCommand()); + $this->assertSame('--sk', $updated->getSkipCommand()); + $this->assertSame('--lm', $updated->getLimitCommand()); + } + + public function testEditPreprocessorThrowsForDuplicateName(): void { + $other = $this->createPreprocessor('full_dup'); + + $this->expectException(HTException::class); + PreprocessorUtils::editPreprocessor( + $this->preprocessor->getId(), $other->getName(), + 'binary', 'https://example.com/f.zip', + '', '', '' + ); + } + + public function testEditPreprocessorThrowsForEmptyName(): void { + $this->expectException(HTException::class); + PreprocessorUtils::editPreprocessor( + $this->preprocessor->getId(), '', 'binary', 'https://example.com/f.zip', + '', '', '' + ); + } + + public function testEditPreprocessorThrowsForEmptyBinaryName(): void { + $this->expectException(HTException::class); + PreprocessorUtils::editPreprocessor( + $this->preprocessor->getId(), 'name', '', 'https://example.com/f.zip', + '', '', '' + ); + } + + public function testEditPreprocessorThrowsForEmptyUrl(): void { + $this->expectException(HTException::class); + PreprocessorUtils::editPreprocessor( + $this->preprocessor->getId(), 'name', 'binary', '', + '', '', '' + ); + } + + public function testEditPreprocessorThrowsForBlacklistedBinaryName(): void { + $this->expectException(HTException::class); + PreprocessorUtils::editPreprocessor( + $this->preprocessor->getId(), 'name', 'bad|binary', 'https://example.com/f.zip', + '', '', '' + ); + } + + public function testEditPreprocessorThrowsForBlacklistedKeyspace(): void { + $this->expectException(HTException::class); + PreprocessorUtils::editPreprocessor( + $this->preprocessor->getId(), 'name', 'binary', 'https://example.com/f.zip', + 'keyspace;rm', '', '' + ); + } + + public function testEditPreprocessorThrowsForBlacklistedSkip(): void { + $this->expectException(HTException::class); + PreprocessorUtils::editPreprocessor( + $this->preprocessor->getId(), 'name', 'binary', 'https://example.com/f.zip', + '', 'skip$test', '' + ); + } + + public function testEditPreprocessorThrowsForBlacklistedLimit(): void { + $this->expectException(HTException::class); + PreprocessorUtils::editPreprocessor( + $this->preprocessor->getId(), 'name', 'binary', 'https://example.com/f.zip', + '', '', 'limit`test`' + ); + } + + public function testEditPreprocessorConvertsEmptyCommandsToNull(): void { + PreprocessorUtils::editPreprocessor( + $this->preprocessor->getId(), 'name', 'binary', 'https://example.com/f.zip', + '', '', '' + ); + + $updated = Factory::getPreprocessorFactory()->get($this->preprocessor->getId()); + $this->assertNull($updated->getKeyspaceCommand()); + $this->assertNull($updated->getSkipCommand()); + $this->assertNull($updated->getLimitCommand()); + } +} From 6bc2cb140125858ca0d65e7bde3dfb6e2844d7d9 Mon Sep 17 00:00:00 2001 From: s3inlc Date: Wed, 17 Jun 2026 14:33:02 +0200 Subject: [PATCH 627/691] adjusted styling and added additional test --- .../inc/utils/FileDownloadUtilsTest.php | 30 +++--- ci/phpunit/inc/utils/FileUtilsTest.php | 68 ++++++------- ci/phpunit/inc/utils/HashtypeUtilsTest.php | 30 +++--- ci/phpunit/inc/utils/HealthUtilsTest.php | 97 +++++++++++-------- ci/phpunit/inc/utils/JwtTokenUtilsTest.php | 20 ++-- ci/phpunit/inc/utils/LockUtilsTest.php | 40 ++++---- 6 files changed, 150 insertions(+), 135 deletions(-) diff --git a/ci/phpunit/inc/utils/FileDownloadUtilsTest.php b/ci/phpunit/inc/utils/FileDownloadUtilsTest.php index f3f19ffe0..c06ba1763 100644 --- a/ci/phpunit/inc/utils/FileDownloadUtilsTest.php +++ b/ci/phpunit/inc/utils/FileDownloadUtilsTest.php @@ -15,8 +15,8 @@ final class FileDownloadUtilsTest extends TestBase { private FileDownload $fileDownload; - private File $file; - + private File $file; + #[Override] protected function setUp(): void { parent::setUp(); @@ -24,55 +24,55 @@ protected function setUp(): void { $this->file = $this->createFile($group); $this->fileDownload = $this->createFileDownload($this->file->getId(), DFileDownloadStatus::DONE); } - + public function testAddDownloadCreatesPendingDownload(): void { $group = $this->createAccessGroup('fdl_new'); $newFile = $this->createFile($group); - + FileDownloadUtils::addDownload($newFile->getId()); - + $qF1 = new QueryFilter(FileDownload::FILE_ID, $newFile->getId(), '='); $qF2 = new QueryFilter(FileDownload::STATUS, DFileDownloadStatus::PENDING, '='); $result = Factory::getFileDownloadFactory()->filter([Factory::FILTER => [$qF1, $qF2]], true); - + $this->assertInstanceOf(FileDownload::class, $result); $this->assertSame($newFile->getId(), $result->getFileId()); $this->assertSame(DFileDownloadStatus::PENDING, $result->getStatus()); $this->registerDatabaseObject(Factory::getFileDownloadFactory(), $result); } - + public function testAddDownloadSkipsExistingPending(): void { $this->createFileDownload($this->file->getId()); - + FileDownloadUtils::addDownload($this->file->getId()); - + $qF1 = new QueryFilter(FileDownload::FILE_ID, $this->file->getId(), '='); $qF2 = new QueryFilter(FileDownload::STATUS, DFileDownloadStatus::PENDING, '='); $pending = Factory::getFileDownloadFactory()->filter([Factory::FILTER => [$qF1, $qF2]]); $this->assertCount(1, $pending); } - + public function testAddDownloadCreatesNewForCompletedFile(): void { FileDownloadUtils::addDownload($this->file->getId()); - + $qF1 = new QueryFilter(FileDownload::FILE_ID, $this->file->getId(), '='); $qF2 = new QueryFilter(FileDownload::STATUS, DFileDownloadStatus::PENDING, '='); $pending = Factory::getFileDownloadFactory()->filter([Factory::FILTER => [$qF1, $qF2]], true); - + $this->assertInstanceOf(FileDownload::class, $pending); $this->assertSame($this->file->getId(), $pending->getFileId()); $this->assertSame(DFileDownloadStatus::PENDING, $pending->getStatus()); $this->registerDatabaseObject(Factory::getFileDownloadFactory(), $pending); } - + public function testRemoveFileDeletesDownloads(): void { FileDownloadUtils::removeFile($this->fileDownload->getFileId()); - + $qF = new QueryFilter(FileDownload::FILE_ID, $this->fileDownload->getFileId(), '='); $remaining = Factory::getFileDownloadFactory()->filter([Factory::FILTER => $qF]); $this->assertSame([], $remaining); } - + public function testRemoveFileIsNoopForNonExistent(): void { FileDownloadUtils::removeFile(-1); $this->assertTrue(true); diff --git a/ci/phpunit/inc/utils/FileUtilsTest.php b/ci/phpunit/inc/utils/FileUtilsTest.php index 1febcbb5c..2c480090d 100644 --- a/ci/phpunit/inc/utils/FileUtilsTest.php +++ b/ci/phpunit/inc/utils/FileUtilsTest.php @@ -15,105 +15,105 @@ require_once(dirname(__FILE__) . '/../../../../src/inc/startup/include.php'); final class FileUtilsTest extends TestBase { - private User $user; + private User $user; private AccessGroup $group; - private File $file; - private File $ruleFile; - private File $wordlistFile; - private File $otherFile; - + private File $file; + private File $ruleFile; + private File $wordlistFile; + private File $otherFile; + #[Override] protected function setUp(): void { parent::setUp(); - + $this->user = $this->createUser('fu_user'); $this->group = $this->createAccessGroup('fu_group'); $this->createAccessGroupUser($this->user, $this->group); - + $this->file = $this->createFile($this->group); $this->ruleFile = $this->createFile($this->group, 0, 'test_rule_' . uniqid() . '.rule', 512, DFileType::RULE); $this->wordlistFile = $this->createFile($this->group); $this->otherFile = $this->createFile($this->group, 0, 'test_other_' . uniqid() . '.bin', 256, DFileType::OTHER); } - + public function testGetFileReturnsFileForAuthorizedUser(): void { $result = FileUtils::getFile($this->file->getId(), $this->user); $this->assertInstanceOf(File::class, $result); $this->assertSame($this->file->getId(), $result->getId()); } - + public function testGetFileThrowsForInvalidId(): void { $this->expectException(HTException::class); FileUtils::getFile(-1, $this->user); } - + public function testGetFileThrowsForUnauthorizedUser(): void { $otherGroup = $this->createAccessGroup('fu_other'); $otherFile = $this->createFile($otherGroup); - + $this->expectException(HTException::class); FileUtils::getFile($otherFile->getId(), $this->user); } - + public function testSetFileTypeUpdatesType(): void { FileUtils::setFileType($this->file->getId(), DFileType::RULE, $this->user); - + $updated = Factory::getFileFactory()->get($this->file->getId()); $this->assertSame(DFileType::RULE, $updated->getFileType()); } - + public function testSetFileTypeThrowsForInvalidType(): void { $this->expectException(HTException::class); FileUtils::setFileType($this->file->getId(), 999, $this->user); } - + public function testSwitchSecretTogglesSecret(): void { FileUtils::switchSecret($this->file->getId(), 1, $this->user); - + $updated = Factory::getFileFactory()->get($this->file->getId()); $this->assertSame(1, $updated->getIsSecret()); - + FileUtils::switchSecret($this->file->getId(), 0, $this->user); - + $updated = Factory::getFileFactory()->get($this->file->getId()); $this->assertSame(0, $updated->getIsSecret()); } - + public function testGetFilesReturnsFilesInUserAccessGroups(): void { $files = FileUtils::getFiles($this->user); $fileIds = array_map(fn(File $f) => $f->getId(), $files); - + $this->assertContains($this->file->getId(), $fileIds); $this->assertContains($this->ruleFile->getId(), $fileIds); $this->assertContains($this->wordlistFile->getId(), $fileIds); $this->assertContains($this->otherFile->getId(), $fileIds); } - + public function testGetFilesExcludesTemporaryFiles(): void { $tempFile = $this->createFile($this->group, 0, 'temp_' . uniqid() . '.tmp', 0, DFileType::TEMPORARY); - + $files = FileUtils::getFiles($this->user); $fileIds = array_map(fn(File $f) => $f->getId(), $files); - + $this->assertNotContains($tempFile->getId(), $fileIds); } - + public function testLoadFilesByCategoryCategorizesFiles(): void { [$rules, $wordlists, $other] = FileUtils::loadFilesByCategory($this->user, []); - + $ruleIds = array_map(fn($set) => $set->getAllValues()['file']->getId(), $rules); $wlIds = array_map(fn($set) => $set->getAllValues()['file']->getId(), $wordlists); $otherIds = array_map(fn($set) => $set->getAllValues()['file']->getId(), $other); - + $this->assertContains($this->ruleFile->getId(), $ruleIds); $this->assertContains($this->file->getId(), $wlIds); $this->assertContains($this->wordlistFile->getId(), $wlIds); $this->assertContains($this->otherFile->getId(), $otherIds); } - + public function testLoadFilesByCategoryMarksCheckedFiles(): void { [$rules, $wordlists, $other] = FileUtils::loadFilesByCategory($this->user, [$this->file->getId()]); - + $checkedIds = []; foreach (array_merge($rules, $wordlists, $other) as $set) { $data = $set->getAllValues(); @@ -121,18 +121,18 @@ public function testLoadFilesByCategoryMarksCheckedFiles(): void { $checkedIds[] = $data['file']->getId(); } } - + $this->assertContains($this->file->getId(), $checkedIds); } - + public function testDeleteThrowsForInvalidId(): void { $this->expectException(HTException::class); FileUtils::delete(-1, $this->user); } - + public function testDeleteThrowsWhenFileInUseByTask(): void { $this->expectException(HTException::class); - + $hashType = $this->createHashType(); $hashlist = $this->createHashlist($this->group, $hashType); $crackerBinaryType = $this->createCrackerBinaryType(); @@ -140,7 +140,7 @@ public function testDeleteThrowsWhenFileInUseByTask(): void { $taskWrapper = $this->createTaskWrapper($this->group, $hashlist); $task = $this->createTask($taskWrapper, $crackerBinary, $crackerBinaryType); $this->createFileTask($this->file, $task); - + FileUtils::delete($this->file->getId(), $this->user); } } diff --git a/ci/phpunit/inc/utils/HashtypeUtilsTest.php b/ci/phpunit/inc/utils/HashtypeUtilsTest.php index 30ee5d4f2..6f07e6c24 100644 --- a/ci/phpunit/inc/utils/HashtypeUtilsTest.php +++ b/ci/phpunit/inc/utils/HashtypeUtilsTest.php @@ -14,60 +14,60 @@ final class HashtypeUtilsTest extends TestBase { private User $user; - + #[Override] protected function setUp(): void { parent::setUp(); $this->user = $this->createUser('ht_user'); } - + public function testAddHashtypeCreatesNewHashtype(): void { $hashtypeId = 999001; $description = 'test_hashtype_' . uniqid(); - + $hashtype = HashtypeUtils::addHashtype($hashtypeId, $description, 0, false, $this->user); - + $this->assertSame($hashtypeId, $hashtype->getId()); $this->assertStringContainsString($description, $hashtype->getDescription()); - + Factory::getHashTypeFactory()->delete($hashtype); } - + public function testAddHashtypeThrowsForDuplicateId(): void { $existing = $this->createHashType(); - + $this->expectException(HttpError::class); HashtypeUtils::addHashtype($existing->getId(), 'new_desc', 0, false, $this->user); } - + public function testAddHashtypeThrowsForEmptyDescription(): void { $this->expectException(HttpError::class); HashtypeUtils::addHashtype(999003, '', 0, false, $this->user); } - + public function testAddHashtypeThrowsForNegativeId(): void { $this->expectException(HttpError::class); HashtypeUtils::addHashtype(-1, 'desc', 0, false, $this->user); } - + public function testDeleteHashtypeRemovesHashtype(): void { $hashtype = $this->createHashType(); - + HashtypeUtils::deleteHashtype($hashtype->getId()); - + $this->assertNull(Factory::getHashTypeFactory()->get($hashtype->getId())); } - + public function testDeleteHashtypeThrowsForInvalidId(): void { $this->expectException(HTException::class); HashtypeUtils::deleteHashtype(-1); } - + public function testDeleteHashtypeThrowsWhenHashlistsExist(): void { $hashtype = $this->createHashType(); $accessGroup = $this->createAccessGroup('ht_del'); $this->createHashlist($accessGroup, $hashtype); - + $this->expectException(HTException::class); HashtypeUtils::deleteHashtype($hashtype->getId()); } diff --git a/ci/phpunit/inc/utils/HealthUtilsTest.php b/ci/phpunit/inc/utils/HealthUtilsTest.php index 0301dc6d2..589d93cda 100644 --- a/ci/phpunit/inc/utils/HealthUtilsTest.php +++ b/ci/phpunit/inc/utils/HealthUtilsTest.php @@ -21,29 +21,29 @@ require_once(dirname(__FILE__) . '/../../../../src/inc/startup/include.php'); final class HealthUtilsTest extends TestBase { - private HealthCheck $healthCheck; + private HealthCheck $healthCheck; private HealthCheckAgent $healthCheckAgent; private HealthCheckAgent $completedAgent; - private Agent $agent; - private Agent $otherAgent; - private CrackerBinary $crackerBinary; - + private Agent $agent; + private Agent $otherAgent; + private CrackerBinary $crackerBinary; + #[Override] protected function setUp(): void { parent::setUp(); - + $crackerBinaryType = $this->createCrackerBinaryType(); $this->crackerBinary = $this->createCrackerBinary($crackerBinaryType); $this->agent = $this->createAgent('hc_agent'); $this->otherAgent = $this->createAgent('hc_other'); - + $this->healthCheck = $this->createHealthCheck($this->crackerBinary, DHealthCheckStatus::PENDING, DHealthCheckType::BRUTE_FORCE, DHealthCheckMode::MD5, 50, '-a 3 -1 ?l?u?d ?1?1?1?1?1'); - + $this->healthCheckAgent = $this->createHealthCheckAgent($this->healthCheck, $this->agent); - + $this->completedAgent = $this->createHealthCheckAgent($this->healthCheck, $this->otherAgent, DHealthCheckAgentStatus::COMPLETED, 10, 2, 100, 200); } - + #[Override] protected function tearDown(): void { $tmpFile = '/tmp/health-check-' . ($this->healthCheck->getId() ?? 0) . '.txt'; @@ -52,96 +52,96 @@ protected function tearDown(): void { } parent::tearDown(); } - + public function testGenerateHashMd5(): void { $plain = 'testplain'; $hash = HealthUtils::generateHash(DHealthCheckMode::MD5, $plain); $this->assertSame(md5($plain), $hash); } - + public function testGenerateHashBcrypt(): void { $plain = 'abc'; $hash = HealthUtils::generateHash(DHealthCheckMode::BCRYPT, $plain); $this->assertNotFalse(password_verify($plain, $hash)); } - + public function testGenerateHashThrowsForUnknownHashtype(): void { $this->expectException(HTException::class); HealthUtils::generateHash(999999, 'plain'); } - + public function testGetAttackModeBruteForce(): void { $mode = $this->callPrivateMethod('getAttackMode', DHealthCheckType::BRUTE_FORCE); $this->assertSame(' -a 3', $mode); } - + public function testGetAttackInputMd5BruteForce(): void { $input = $this->callPrivateMethod('getAttackInput', DHealthCheckMode::MD5, DHealthCheckType::BRUTE_FORCE); $this->assertSame(' -1 ?l?u?d ?1?1?1?1?1', $input); } - + public function testGetAttackInputBcryptBruteForce(): void { $input = $this->callPrivateMethod('getAttackInput', DHealthCheckMode::BCRYPT, DHealthCheckType::BRUTE_FORCE); $this->assertSame(' ?l?l?l', $input); } - + public function testGetAttackNumHashesMd5(): void { $num = $this->callPrivateMethod('getAttackNumHashes', DHealthCheckMode::MD5); $this->assertSame(100, $num); } - + public function testGetAttackNumHashesBcrypt(): void { $num = $this->callPrivateMethod('getAttackNumHashes', DHealthCheckMode::BCRYPT); $this->assertSame(10, $num); } - + public function testGetAttackNumHashesUnknown(): void { $num = $this->callPrivateMethod('getAttackNumHashes', 999); $this->assertSame(100, $num); } - + public function testCheckNeededReturnsPendingAgentCheck(): void { $result = HealthUtils::checkNeeded($this->agent); $this->assertInstanceOf(HealthCheckAgent::class, $result); $this->assertSame($this->healthCheckAgent->getId(), $result->getId()); } - + public function testCheckNeededReturnsFalseWhenAgentHasNoPending(): void { $freshAgent = $this->createAgent('hc_fresh'); $result = HealthUtils::checkNeeded($freshAgent); $this->assertFalse($result); } - + public function testCheckNeededReturnsFalseWhenHealthCheckIsAborted(): void { $abortedCheck = $this->createHealthCheck($this->crackerBinary, DHealthCheckStatus::ABORTED); $isolatedAgent = $this->createAgent('hc_isolated'); $pendingAgent = $this->createHealthCheckAgent($abortedCheck, $isolatedAgent); - + $result = HealthUtils::checkNeeded($isolatedAgent); $this->assertFalse($result); } - + public function testCheckCompletionMarksCompleteWhenAllAgentsDone(): void { $allDoneCheck = $this->createHealthCheck($this->crackerBinary); $this->createHealthCheckAgent($allDoneCheck, $this->agent, DHealthCheckAgentStatus::COMPLETED, 5, 1, 0, 10); $this->createHealthCheckAgent($allDoneCheck, $this->otherAgent, DHealthCheckAgentStatus::FAILED, 0, 0, 0, 0, 'error'); - + HealthUtils::checkCompletion($allDoneCheck); - + $updated = Factory::getHealthCheckFactory()->get($allDoneCheck->getId()); $this->assertSame(DHealthCheckStatus::COMPLETED, $updated->getStatus()); } - + public function testCheckCompletionDoesNotCompleteWhenAgentPending(): void { HealthUtils::checkCompletion($this->healthCheck); - + $updated = Factory::getHealthCheckFactory()->get($this->healthCheck->getId()); $this->assertSame(DHealthCheckStatus::PENDING, $updated->getStatus()); } - + public function testResetAgentCheckResetsPendingAgent(): void { HealthUtils::resetAgentCheck($this->healthCheckAgent->getId()); - + $updated = Factory::getHealthCheckAgentFactory()->get($this->healthCheckAgent->getId()); $this->assertSame(DHealthCheckAgentStatus::PENDING, $updated->getStatus()); $this->assertSame(0, $updated->getStart()); @@ -150,45 +150,60 @@ public function testResetAgentCheckResetsPendingAgent(): void { $this->assertSame(0, $updated->getCracked()); $this->assertSame(0, $updated->getNumGpus()); } - + + public function testResetAgentCheckResetsCompletedAgentUnderPendingCheck(): void { + HealthUtils::resetAgentCheck($this->completedAgent->getId()); + + $updated = Factory::getHealthCheckAgentFactory()->get($this->completedAgent->getId()); + $this->assertSame(DHealthCheckAgentStatus::PENDING, $updated->getStatus()); + $this->assertSame(0, $updated->getCracked()); + $this->assertSame(0, $updated->getNumGpus()); + $this->assertSame(0, $updated->getStart()); + $this->assertSame(0, $updated->getEnd()); + $this->assertSame('', $updated->getErrors()); + + $parentCheck = Factory::getHealthCheckFactory()->get($this->healthCheck->getId()); + $this->assertSame(DHealthCheckStatus::PENDING, $parentCheck->getStatus()); + } + public function testResetAgentCheckReopensCompletedHealthCheck(): void { $completedCheck = $this->createHealthCheck($this->crackerBinary, DHealthCheckStatus::COMPLETED); $agentCheck = $this->createHealthCheckAgent($completedCheck, $this->agent, DHealthCheckAgentStatus::COMPLETED, 5, 1, 0, 10); - + HealthUtils::resetAgentCheck($agentCheck->getId()); - + $updatedCheck = Factory::getHealthCheckFactory()->get($completedCheck->getId()); $this->assertSame(DHealthCheckStatus::PENDING, $updatedCheck->getStatus()); } - + public function testResetAgentCheckThrowsForAbortedHealthCheck(): void { $abortedCheck = $this->createHealthCheck($this->crackerBinary, DHealthCheckStatus::ABORTED); $agentCheck = $this->createHealthCheckAgent($abortedCheck, $this->agent, DHealthCheckAgentStatus::FAILED, 5, 1, 0, 10); - + $this->expectException(HTException::class); HealthUtils::resetAgentCheck($agentCheck->getId()); } - + public function testResetAgentCheckThrowsForInvalidId(): void { $this->expectException(HTException::class); HealthUtils::resetAgentCheck(-1); } - + public function testDeleteHealthCheckRemovesCheckAndAgents(): void { HealthUtils::deleteHealthCheck($this->healthCheck->getId()); - + $this->assertNull(Factory::getHealthCheckFactory()->get($this->healthCheck->getId())); - + $qF = new QueryFilter(HealthCheckAgent::HEALTH_CHECK_ID, $this->healthCheck->getId(), '='); $remaining = Factory::getHealthCheckAgentFactory()->filter([Factory::FILTER => $qF]); $this->assertSame([], $remaining); } - + public function testDeleteHealthCheckThrowsForInvalidId(): void { $this->expectException(HTException::class); HealthUtils::deleteHealthCheck(-1); } - + private function callPrivateMethod(string $name, ...$args): mixed { $ref = new ReflectionClass(HealthUtils::class); $method = $ref->getMethod($name); diff --git a/ci/phpunit/inc/utils/JwtTokenUtilsTest.php b/ci/phpunit/inc/utils/JwtTokenUtilsTest.php index ed8015531..cdd0201bc 100644 --- a/ci/phpunit/inc/utils/JwtTokenUtilsTest.php +++ b/ci/phpunit/inc/utils/JwtTokenUtilsTest.php @@ -15,19 +15,19 @@ final class JwtTokenUtilsTest extends TestBase { private User $user; - + #[Override] protected function setUp(): void { parent::setUp(); $this->user = $this->createUser('jwt_user'); } - + public function testCreateKeyCreatesValidKey(): void { $start = time(); $end = $start + 3600; - + $key = JwtTokenUtils::createKey($this->user->getId(), $start, $end); - + $this->assertInstanceOf(JwtApiKey::class, $key); $this->assertSame($start, $key->getStartValid()); $this->assertSame($end, $key->getEndValid()); @@ -35,25 +35,25 @@ public function testCreateKeyCreatesValidKey(): void { $this->assertNotNull($key->getId()); $this->registerDatabaseObject(Factory::getJwtApiKeyFactory(), $key); } - + public function testCreateKeyThrowsForInvalidUser(): void { $this->expectException(HttpError::class); JwtTokenUtils::createKey(-1, time(), time() + 3600); } - + public function testDeleteKeyDeletesExpiredKey(): void { $start = time() - 7200; $end = time() - 3600; $key = $this->createJwtApiKey($this->user, $start, $end); - + JwtTokenUtils::deleteKey($key); - + $this->assertNull(Factory::getJwtApiKeyFactory()->get($key->getId())); } - + public function testDeleteKeyThrowsForUnexpiredKey(): void { $key = $this->createJwtApiKey($this->user); - + $this->expectException(HttpForbidden::class); JwtTokenUtils::deleteKey($key); } diff --git a/ci/phpunit/inc/utils/LockUtilsTest.php b/ci/phpunit/inc/utils/LockUtilsTest.php index f4fd36de8..f0528ec66 100644 --- a/ci/phpunit/inc/utils/LockUtilsTest.php +++ b/ci/phpunit/inc/utils/LockUtilsTest.php @@ -10,26 +10,26 @@ final class LockUtilsTest extends TestBase { private const TEST_LOCK = 'phpunit_test.lock'; - private const LOCK_DIR = __DIR__ . '/../../../../src/inc/utils/locks'; - + private const LOCK_DIR = __DIR__ . '/../../../../src/inc/utils/locks'; + #[Override] protected function setUp(): void { parent::setUp(); $this->releaseTestLock(); $this->cleanupLockFiles(); } - + #[Override] protected function tearDown(): void { $this->releaseTestLock(); $this->cleanupLockFiles(); parent::tearDown(); } - + private function releaseTestLock(): void { LockUtils::release(self::TEST_LOCK); } - + private function cleanupLockFiles(): void { $prefixes = [Lock::CHUNKING, self::TEST_LOCK]; foreach ($prefixes as $prefix) { @@ -39,66 +39,66 @@ private function cleanupLockFiles(): void { } } } - + public function testGetCreatesAndAcquiresLock(): void { LockUtils::get(self::TEST_LOCK); $lockFile = self::LOCK_DIR . '/' . self::TEST_LOCK; $this->assertFileExists($lockFile); LockUtils::release(self::TEST_LOCK); } - + public function testGetReturnsCachedInstance(): void { LockUtils::get(self::TEST_LOCK); LockUtils::get(self::TEST_LOCK); LockUtils::release(self::TEST_LOCK); $this->assertTrue(true); } - + public function testReleaseReleasesLockForReacquisition(): void { LockUtils::get(self::TEST_LOCK); LockUtils::release(self::TEST_LOCK); - + LockUtils::get(self::TEST_LOCK); LockUtils::release(self::TEST_LOCK); $this->assertTrue(true); } - + public function testReleaseIsNoopForUnknownLock(): void { LockUtils::release('nonexistent.lock'); $this->assertTrue(true); } - + public function testDeleteLockFileRemovesExistingLockFile(): void { $taskId = 999001; $lockFilePath = self::LOCK_DIR . '/' . Lock::CHUNKING . $taskId; - + touch($lockFilePath); $this->assertFileExists($lockFilePath); - + LockUtils::deleteLockFile($taskId); - + $this->assertFileDoesNotExist($lockFilePath); } - + public function testDeleteLockFileDoesNotThrowForMissingFile(): void { LockUtils::deleteLockFile(999002); $this->assertTrue(true); } - + public function testDeleteLockFileCleansUpOnlySpecifiedTask(): void { $taskIdA = 999003; $taskIdB = 999004; $pathA = self::LOCK_DIR . '/' . Lock::CHUNKING . $taskIdA; $pathB = self::LOCK_DIR . '/' . Lock::CHUNKING . $taskIdB; - + touch($pathA); touch($pathB); - + LockUtils::deleteLockFile($taskIdA); - + $this->assertFileDoesNotExist($pathA); $this->assertFileExists($pathB); - + unlink($pathB); } } From 82511d565c0b6dd1be0e20cae27130853d8a24c6 Mon Sep 17 00:00:00 2001 From: s3inlc Date: Wed, 17 Jun 2026 14:38:27 +0200 Subject: [PATCH 628/691] removed phpstan suggestions (asserting true for tests just to pass) --- ci/phpunit/inc/utils/FileDownloadUtilsTest.php | 1 - ci/phpunit/inc/utils/LockUtilsTest.php | 4 ---- 2 files changed, 5 deletions(-) diff --git a/ci/phpunit/inc/utils/FileDownloadUtilsTest.php b/ci/phpunit/inc/utils/FileDownloadUtilsTest.php index c06ba1763..13cf156ac 100644 --- a/ci/phpunit/inc/utils/FileDownloadUtilsTest.php +++ b/ci/phpunit/inc/utils/FileDownloadUtilsTest.php @@ -75,6 +75,5 @@ public function testRemoveFileDeletesDownloads(): void { public function testRemoveFileIsNoopForNonExistent(): void { FileDownloadUtils::removeFile(-1); - $this->assertTrue(true); } } diff --git a/ci/phpunit/inc/utils/LockUtilsTest.php b/ci/phpunit/inc/utils/LockUtilsTest.php index f0528ec66..8267b71b5 100644 --- a/ci/phpunit/inc/utils/LockUtilsTest.php +++ b/ci/phpunit/inc/utils/LockUtilsTest.php @@ -51,7 +51,6 @@ public function testGetReturnsCachedInstance(): void { LockUtils::get(self::TEST_LOCK); LockUtils::get(self::TEST_LOCK); LockUtils::release(self::TEST_LOCK); - $this->assertTrue(true); } public function testReleaseReleasesLockForReacquisition(): void { @@ -60,12 +59,10 @@ public function testReleaseReleasesLockForReacquisition(): void { LockUtils::get(self::TEST_LOCK); LockUtils::release(self::TEST_LOCK); - $this->assertTrue(true); } public function testReleaseIsNoopForUnknownLock(): void { LockUtils::release('nonexistent.lock'); - $this->assertTrue(true); } public function testDeleteLockFileRemovesExistingLockFile(): void { @@ -82,7 +79,6 @@ public function testDeleteLockFileRemovesExistingLockFile(): void { public function testDeleteLockFileDoesNotThrowForMissingFile(): void { LockUtils::deleteLockFile(999002); - $this->assertTrue(true); } public function testDeleteLockFileCleansUpOnlySpecifiedTask(): void { From 9530220b9c0d4f12551daf31e905a3671002c9ff Mon Sep 17 00:00:00 2001 From: s3inlc Date: Wed, 17 Jun 2026 14:39:44 +0200 Subject: [PATCH 629/691] fixed phpdoc inconsistency --- src/inc/utils/TaskUtils.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/inc/utils/TaskUtils.php b/src/inc/utils/TaskUtils.php index 90b70224d..e3a7661d7 100644 --- a/src/inc/utils/TaskUtils.php +++ b/src/inc/utils/TaskUtils.php @@ -1395,7 +1395,7 @@ public static function isSaturatedByOtherAgents($task, $agent) { /** * @param $task Task - * @return mixed + * @return int * @throws Exception */ public static function getTaskProgress(Task $task): int { From a6378d522a6309b20c1dada7e2a5fa25ae03179f Mon Sep 17 00:00:00 2001 From: s3inlc Date: Wed, 17 Jun 2026 14:52:23 +0200 Subject: [PATCH 630/691] fixing tests and asserting some risky tests --- ci/phpunit/inc/utils/LockUtilsTest.php | 12 +++++++++--- ci/phpunit/inc/utils/PreprocessorUtilsTest.php | 18 +++++++++--------- src/inc/Util.php | 7 ++++--- 3 files changed, 22 insertions(+), 15 deletions(-) diff --git a/ci/phpunit/inc/utils/LockUtilsTest.php b/ci/phpunit/inc/utils/LockUtilsTest.php index 8267b71b5..e3c2f91a1 100644 --- a/ci/phpunit/inc/utils/LockUtilsTest.php +++ b/ci/phpunit/inc/utils/LockUtilsTest.php @@ -17,6 +17,7 @@ protected function setUp(): void { parent::setUp(); $this->releaseTestLock(); $this->cleanupLockFiles(); + $this->lockFile = self::LOCK_DIR . '/' . self::TEST_LOCK; } #[Override] @@ -42,8 +43,7 @@ private function cleanupLockFiles(): void { public function testGetCreatesAndAcquiresLock(): void { LockUtils::get(self::TEST_LOCK); - $lockFile = self::LOCK_DIR . '/' . self::TEST_LOCK; - $this->assertFileExists($lockFile); + $this->assertFileExists($this->lockFile); LockUtils::release(self::TEST_LOCK); } @@ -51,6 +51,7 @@ public function testGetReturnsCachedInstance(): void { LockUtils::get(self::TEST_LOCK); LockUtils::get(self::TEST_LOCK); LockUtils::release(self::TEST_LOCK); + $this->assertFileExists($this->lockFile); } public function testReleaseReleasesLockForReacquisition(): void { @@ -59,10 +60,12 @@ public function testReleaseReleasesLockForReacquisition(): void { LockUtils::get(self::TEST_LOCK); LockUtils::release(self::TEST_LOCK); + $this->assertFileExists($this->lockFile); } public function testReleaseIsNoopForUnknownLock(): void { LockUtils::release('nonexistent.lock'); + $this->assertFileDoesNotExist(self::LOCK_DIR . '/nonexistent.lock'); } public function testDeleteLockFileRemovesExistingLockFile(): void { @@ -78,7 +81,10 @@ public function testDeleteLockFileRemovesExistingLockFile(): void { } public function testDeleteLockFileDoesNotThrowForMissingFile(): void { - LockUtils::deleteLockFile(999002); + $taskId = 999002; + LockUtils::deleteLockFile($taskId); + $lockFilePath = self::LOCK_DIR . '/' . Lock::CHUNKING . $taskId; + $this->assertFileExists($lockFilePath); } public function testDeleteLockFileCleansUpOnlySpecifiedTask(): void { diff --git a/ci/phpunit/inc/utils/PreprocessorUtilsTest.php b/ci/phpunit/inc/utils/PreprocessorUtilsTest.php index 8b125d219..48de0df46 100644 --- a/ci/phpunit/inc/utils/PreprocessorUtilsTest.php +++ b/ci/phpunit/inc/utils/PreprocessorUtilsTest.php @@ -137,7 +137,7 @@ public function testAddPreprocessorThrowsForBlacklistedLimit(): void { $this->expectException(HttpError::class); PreprocessorUtils::addPreprocessor( 'name', 'binary', 'https://example.com/b.zip', - '--keyspace', '--skip', '--limit`test`' + '--keyspace', '--skip', '--limit&test&' ); } @@ -255,7 +255,7 @@ public function testEditLimitCommandUpdates(): void { public function testEditLimitCommandThrowsForBlacklistedChars(): void { $this->expectException(HTException::class); - PreprocessorUtils::editLimitCommand($this->preprocessor->getId(), 'limit`test`'); + PreprocessorUtils::editLimitCommand($this->preprocessor->getId(), 'limit&test&'); } public function testEditPreprocessorUpdatesAllFields(): void { @@ -299,7 +299,7 @@ public function testEditPreprocessorThrowsForEmptyName(): void { public function testEditPreprocessorThrowsForEmptyBinaryName(): void { $this->expectException(HTException::class); PreprocessorUtils::editPreprocessor( - $this->preprocessor->getId(), 'name', '', 'https://example.com/f.zip', + $this->preprocessor->getId(), 'name' . uniqid(), '', 'https://example.com/f.zip', '', '', '' ); } @@ -307,7 +307,7 @@ public function testEditPreprocessorThrowsForEmptyBinaryName(): void { public function testEditPreprocessorThrowsForEmptyUrl(): void { $this->expectException(HTException::class); PreprocessorUtils::editPreprocessor( - $this->preprocessor->getId(), 'name', 'binary', '', + $this->preprocessor->getId(), 'name' . uniqid(), 'binary', '', '', '', '' ); } @@ -315,7 +315,7 @@ public function testEditPreprocessorThrowsForEmptyUrl(): void { public function testEditPreprocessorThrowsForBlacklistedBinaryName(): void { $this->expectException(HTException::class); PreprocessorUtils::editPreprocessor( - $this->preprocessor->getId(), 'name', 'bad|binary', 'https://example.com/f.zip', + $this->preprocessor->getId(), 'name' . uniqid(), 'bad|binary', 'https://example.com/f.zip', '', '', '' ); } @@ -323,7 +323,7 @@ public function testEditPreprocessorThrowsForBlacklistedBinaryName(): void { public function testEditPreprocessorThrowsForBlacklistedKeyspace(): void { $this->expectException(HTException::class); PreprocessorUtils::editPreprocessor( - $this->preprocessor->getId(), 'name', 'binary', 'https://example.com/f.zip', + $this->preprocessor->getId(), 'name' . uniqid(), 'binary', 'https://example.com/f.zip', 'keyspace;rm', '', '' ); } @@ -331,7 +331,7 @@ public function testEditPreprocessorThrowsForBlacklistedKeyspace(): void { public function testEditPreprocessorThrowsForBlacklistedSkip(): void { $this->expectException(HTException::class); PreprocessorUtils::editPreprocessor( - $this->preprocessor->getId(), 'name', 'binary', 'https://example.com/f.zip', + $this->preprocessor->getId(), 'name' . uniqid(), 'binary', 'https://example.com/f.zip', '', 'skip$test', '' ); } @@ -339,14 +339,14 @@ public function testEditPreprocessorThrowsForBlacklistedSkip(): void { public function testEditPreprocessorThrowsForBlacklistedLimit(): void { $this->expectException(HTException::class); PreprocessorUtils::editPreprocessor( - $this->preprocessor->getId(), 'name', 'binary', 'https://example.com/f.zip', + $this->preprocessor->getId(), 'name' . uniqid(), 'binary', 'https://example.com/f.zip', '', '', 'limit`test`' ); } public function testEditPreprocessorConvertsEmptyCommandsToNull(): void { PreprocessorUtils::editPreprocessor( - $this->preprocessor->getId(), 'name', 'binary', 'https://example.com/f.zip', + $this->preprocessor->getId(), 'name' . uniqid(), 'binary', 'https://example.com/f.zip', '', '', '' ); diff --git a/src/inc/Util.php b/src/inc/Util.php index c0850aca7..3449c2cd2 100755 --- a/src/inc/Util.php +++ b/src/inc/Util.php @@ -967,9 +967,10 @@ public static function escapeSpecial($string) { * @param $string string * @return bool true if at least one character is in the blacklist */ - public static function containsBlacklistedChars($string) { - for ($i = 0; $i < strlen(SConfig::getInstance()->getVal(DConfig::BLACKLIST_CHARS)); $i++) { - if (strpos($string, SConfig::getInstance()->getVal(DConfig::BLACKLIST_CHARS)[$i]) !== false) { + public static function containsBlacklistedChars(string $string): bool { + $blacklisted = SConfig::getInstance()->getVal(DConfig::BLACKLIST_CHARS); + for ($i = 0; $i < strlen($blacklisted); $i++) { + if (str_contains($string, $blacklisted[$i])) { return true; } } From c67c9de2319f2dbc322c8df09c4fd2abbbdc55a5 Mon Sep 17 00:00:00 2001 From: s3inlc Date: Wed, 17 Jun 2026 15:02:44 +0200 Subject: [PATCH 631/691] fixed assertions, the backtick test will still fail due to postgres --- ci/phpunit/inc/utils/LockUtilsTest.php | 7 ++++--- ci/phpunit/inc/utils/PreprocessorUtilsTest.php | 2 +- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/ci/phpunit/inc/utils/LockUtilsTest.php b/ci/phpunit/inc/utils/LockUtilsTest.php index e3c2f91a1..5aa4b04ac 100644 --- a/ci/phpunit/inc/utils/LockUtilsTest.php +++ b/ci/phpunit/inc/utils/LockUtilsTest.php @@ -11,6 +11,7 @@ final class LockUtilsTest extends TestBase { private const TEST_LOCK = 'phpunit_test.lock'; private const LOCK_DIR = __DIR__ . '/../../../../src/inc/utils/locks'; + private string $lockFile; #[Override] protected function setUp(): void { @@ -51,7 +52,7 @@ public function testGetReturnsCachedInstance(): void { LockUtils::get(self::TEST_LOCK); LockUtils::get(self::TEST_LOCK); LockUtils::release(self::TEST_LOCK); - $this->assertFileExists($this->lockFile); + $this->assertFileDoesNotExist($this->lockFile); } public function testReleaseReleasesLockForReacquisition(): void { @@ -60,7 +61,7 @@ public function testReleaseReleasesLockForReacquisition(): void { LockUtils::get(self::TEST_LOCK); LockUtils::release(self::TEST_LOCK); - $this->assertFileExists($this->lockFile); + $this->assertFileDoesNotExist($this->lockFile); } public function testReleaseIsNoopForUnknownLock(): void { @@ -84,7 +85,7 @@ public function testDeleteLockFileDoesNotThrowForMissingFile(): void { $taskId = 999002; LockUtils::deleteLockFile($taskId); $lockFilePath = self::LOCK_DIR . '/' . Lock::CHUNKING . $taskId; - $this->assertFileExists($lockFilePath); + $this->assertFileDoesNotExist($lockFilePath); } public function testDeleteLockFileCleansUpOnlySpecifiedTask(): void { diff --git a/ci/phpunit/inc/utils/PreprocessorUtilsTest.php b/ci/phpunit/inc/utils/PreprocessorUtilsTest.php index 48de0df46..87f959aab 100644 --- a/ci/phpunit/inc/utils/PreprocessorUtilsTest.php +++ b/ci/phpunit/inc/utils/PreprocessorUtilsTest.php @@ -340,7 +340,7 @@ public function testEditPreprocessorThrowsForBlacklistedLimit(): void { $this->expectException(HTException::class); PreprocessorUtils::editPreprocessor( $this->preprocessor->getId(), 'name' . uniqid(), 'binary', 'https://example.com/f.zip', - '', '', 'limit`test`' + '', '', 'limit`test&' ); } From 3cefa0da59b7fc5c27122331c7a1406e090a18df Mon Sep 17 00:00:00 2001 From: s3inlc Date: Wed, 17 Jun 2026 15:08:48 +0200 Subject: [PATCH 632/691] added migration to add backtick to postgres default blacklist characters if needed --- .../mysql/20260617130352_blacklist-chars-sync.sql | 1 + .../postgres/20260617130352_blacklist-chars-sync.sql | 6 ++++++ 2 files changed, 7 insertions(+) create mode 100644 src/migrations/mysql/20260617130352_blacklist-chars-sync.sql create mode 100644 src/migrations/postgres/20260617130352_blacklist-chars-sync.sql diff --git a/src/migrations/mysql/20260617130352_blacklist-chars-sync.sql b/src/migrations/mysql/20260617130352_blacklist-chars-sync.sql new file mode 100644 index 000000000..d91c8d51b --- /dev/null +++ b/src/migrations/mysql/20260617130352_blacklist-chars-sync.sql @@ -0,0 +1 @@ +This migration is only a placeholder to keep migrations parallel \ No newline at end of file diff --git a/src/migrations/postgres/20260617130352_blacklist-chars-sync.sql b/src/migrations/postgres/20260617130352_blacklist-chars-sync.sql new file mode 100644 index 000000000..472658bbe --- /dev/null +++ b/src/migrations/postgres/20260617130352_blacklist-chars-sync.sql @@ -0,0 +1,6 @@ +-- the backtick as default blacklisted character got lost for postgres, so for the cases where people still have the default, we add it +UPDATE Config +SET value = '&|"'{}()[]$<>;`' +WHERE item = 'blacklistChars' + AND configSectionId=1 + AND value = '&|"'{}()[]$<>;'; \ No newline at end of file From 0aa1a5e7cd4d12073a66c36b20a98b68f916fa13 Mon Sep 17 00:00:00 2001 From: s3inlc Date: Wed, 17 Jun 2026 15:10:53 +0200 Subject: [PATCH 633/691] make one tests only having back ticks so that is specifically tested on postgres to see if migration is fixed --- ci/phpunit/inc/utils/PreprocessorUtilsTest.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ci/phpunit/inc/utils/PreprocessorUtilsTest.php b/ci/phpunit/inc/utils/PreprocessorUtilsTest.php index 87f959aab..48de0df46 100644 --- a/ci/phpunit/inc/utils/PreprocessorUtilsTest.php +++ b/ci/phpunit/inc/utils/PreprocessorUtilsTest.php @@ -340,7 +340,7 @@ public function testEditPreprocessorThrowsForBlacklistedLimit(): void { $this->expectException(HTException::class); PreprocessorUtils::editPreprocessor( $this->preprocessor->getId(), 'name' . uniqid(), 'binary', 'https://example.com/f.zip', - '', '', 'limit`test&' + '', '', 'limit`test`' ); } From a80b1e0bd9b7c176b84e68ff7dde7a6bf1784464 Mon Sep 17 00:00:00 2001 From: s3inlc Date: Wed, 17 Jun 2026 15:35:54 +0200 Subject: [PATCH 634/691] fixed unescaped character --- .../postgres/20260617130352_blacklist-chars-sync.sql | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/migrations/postgres/20260617130352_blacklist-chars-sync.sql b/src/migrations/postgres/20260617130352_blacklist-chars-sync.sql index 472658bbe..f94cdad5c 100644 --- a/src/migrations/postgres/20260617130352_blacklist-chars-sync.sql +++ b/src/migrations/postgres/20260617130352_blacklist-chars-sync.sql @@ -1,6 +1,6 @@ -- the backtick as default blacklisted character got lost for postgres, so for the cases where people still have the default, we add it UPDATE Config -SET value = '&|"'{}()[]$<>;`' +SET value = '&|"''{}()[]$<>;`' WHERE item = 'blacklistChars' AND configSectionId=1 - AND value = '&|"'{}()[]$<>;'; \ No newline at end of file + AND value = '&|"''{}()[]$<>;'; \ No newline at end of file From 17cda1d32ec1831c88c47a61a8de3c00c92d3d14 Mon Sep 17 00:00:00 2001 From: s3inlc Date: Wed, 17 Jun 2026 15:47:11 +0200 Subject: [PATCH 635/691] forgot the comments prefix for placeholder --- src/migrations/mysql/20260617130352_blacklist-chars-sync.sql | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/migrations/mysql/20260617130352_blacklist-chars-sync.sql b/src/migrations/mysql/20260617130352_blacklist-chars-sync.sql index d91c8d51b..5b011d454 100644 --- a/src/migrations/mysql/20260617130352_blacklist-chars-sync.sql +++ b/src/migrations/mysql/20260617130352_blacklist-chars-sync.sql @@ -1 +1 @@ -This migration is only a placeholder to keep migrations parallel \ No newline at end of file +-- This migration is only a placeholder to keep migrations parallel \ No newline at end of file From 310f2a100104c53dd122fb5e43029ac2564ffdd9 Mon Sep 17 00:00:00 2001 From: s3inlc Date: Thu, 18 Jun 2026 10:14:32 +0200 Subject: [PATCH 636/691] prepare for generations --- src/inc/Util.php | 27 ++++++++++++++++++++++++--- src/inc/startup/setup.php | 17 ++++++++++------- 2 files changed, 34 insertions(+), 10 deletions(-) diff --git a/src/inc/Util.php b/src/inc/Util.php index 3449c2cd2..abe49d2a6 100755 --- a/src/inc/Util.php +++ b/src/inc/Util.php @@ -706,7 +706,7 @@ public static function tusFileCleaning() { $metaDirectory = $tusDirectory . DIRECTORY_SEPARATOR . "meta" . DIRECTORY_SEPARATOR; $expiration_time = time() + 3600; if (file_exists($metaDirectory) && is_dir($metaDirectory)) { - if ($metaDirectoryHandler = opendir($metaDirectory)){ + if ($metaDirectoryHandler = opendir($metaDirectory)) { while ($file = readdir($metaDirectoryHandler)) { if (str_ends_with($file, ".meta")) { $metaFile = $metaDirectory . $file; @@ -719,7 +719,7 @@ public static function tusFileCleaning() { if (file_exists($metaFile)) { unlink($metaFile); } - if (file_exists($uploadFile)){ + if (file_exists($uploadFile)) { unlink($uploadFile); } } @@ -1352,7 +1352,7 @@ public static function isMailConfigured(): bool { $path = '/etc/ssmtp/ssmtp.conf'; return is_file($path); } - + /** * This sends a given email with text and subject to the address. * @@ -1577,4 +1577,25 @@ public static function checkDataDirectory($key, $dir) { } } } + + /** + * Run the migration on one generation (default is actual generation which is 0). + * + * @param int $generation + * @return void + */ + public static function runDatabaseMigration(int $generation = 0): void { + $generationPath = ""; + if ($generation > 0) { + $generationPath = ".$generation"; + } + + $output = []; + $database_uri = StartupConfig::getInstance()->getDatabaseType() . "://" . rawurlencode(StartupConfig::getInstance()->getDatabaseUser()) . ":" . rawurlencode(StartupConfig::getInstance()->getDatabasePassword()) . "@" . StartupConfig::getInstance()->getDatabaseServer() . ":" . StartupConfig::getInstance()->getDatabasePort() . "/" . StartupConfig::getInstance()->getDatabaseDB(); + exec('/usr/bin/sqlx migrate run --source ' . escapeshellarg(dirname(__FILE__) . '/../../migrations/' . StartupConfig::getInstance()->getDatabaseType() . $generationPath . '/') . ' -D ' . escapeshellarg($database_uri), $output, $retval); + if ($retval !== 0) { + echo "Failed to run migrations: \n" . implode("\n", $output); + exit(-1); + } + } } diff --git a/src/inc/startup/setup.php b/src/inc/startup/setup.php index 13eb65ddb..61edb7c7f 100755 --- a/src/inc/startup/setup.php +++ b/src/inc/startup/setup.php @@ -51,13 +51,16 @@ include(dirname(__FILE__) . "/../../install/updates/update.php"); } -$output = []; -$database_uri = StartupConfig::getInstance()->getDatabaseType() . "://" . rawurlencode(StartupConfig::getInstance()->getDatabaseUser()) . ":" . rawurlencode(StartupConfig::getInstance()->getDatabasePassword()) . "@" . StartupConfig::getInstance()->getDatabaseServer() . ":" . StartupConfig::getInstance()->getDatabasePort() . "/" . StartupConfig::getInstance()->getDatabaseDB(); -exec('/usr/bin/sqlx migrate run --source ' . escapeshellarg(dirname(__FILE__) . '/../../migrations/' . StartupConfig::getInstance()->getDatabaseType() . '/') . ' -D ' . escapeshellarg($database_uri), $output, $retval); -if ($retval !== 0) { - echo "Failed to run migrations: \n" . implode("\n", $output); - exit(-1); -} +/* + * Here we would have to check what current migrations branch the setup is on (if it's not $initialSetup): + * - check the oldest entry to identify which generation we are on + * - check the newest entry to see if still a migration on the current generation is needed + * - after that, we fake in the entry of the newer generation, run migration on this new generation + * - if needed (because there are more generations available), run the previous step again + */ + +// run database migration on current generation to be fully up-to-date +Util::runDatabaseMigration(); if ($initialSetup === true) { // if peppers are not set, generate them and save them From c751e37b903c2c5dfaad7f490766188ec7338d32 Mon Sep 17 00:00:00 2001 From: s3inlc Date: Thu, 18 Jun 2026 11:02:47 +0200 Subject: [PATCH 637/691] throwing an error on non-normal tasks is not correct to handle this, fields should be allowed to return null if it's only for certain objects. --- src/inc/apiv2/common/AbstractBaseAPI.php | 9 ++++--- src/inc/apiv2/model/TaskWrapperDisplayAPI.php | 24 +++++++++---------- 2 files changed, 18 insertions(+), 15 deletions(-) diff --git a/src/inc/apiv2/common/AbstractBaseAPI.php b/src/inc/apiv2/common/AbstractBaseAPI.php index c2697594a..7b31ebd65 100644 --- a/src/inc/apiv2/common/AbstractBaseAPI.php +++ b/src/inc/apiv2/common/AbstractBaseAPI.php @@ -191,11 +191,14 @@ public function aggregateData(object $object, array &$includedData = [], ?array foreach ($fieldsets as $name => $fieldset) { if (array_key_exists($name, $aggregateFieldsets)) { $aggregateFieldsets[$name] = explode(",", $aggregateFieldsets[$name]); - foreach($aggregateFieldsets[$name] as $field) { - if(!array_key_exists($field, $fieldset)) { + foreach ($aggregateFieldsets[$name] as $field) { + if (!array_key_exists($field, $fieldset)) { throw new HttpError("Invalid aggregation requested!"); } - $aggregatedData[$field] = $fieldset[$field]($object); + $data = $fieldset[$field]($object); + if ($data !== null) { + $aggregatedData[$field] = $data; + } } } } diff --git a/src/inc/apiv2/model/TaskWrapperDisplayAPI.php b/src/inc/apiv2/model/TaskWrapperDisplayAPI.php index 9246c8881..594606cab 100644 --- a/src/inc/apiv2/model/TaskWrapperDisplayAPI.php +++ b/src/inc/apiv2/model/TaskWrapperDisplayAPI.php @@ -93,9 +93,9 @@ protected function getAggregateTotalAssignedAgents(object $object): int { /** * @throws HttpError */ - protected function getAggregateDispatched(object $object): string { + protected function getAggregateDispatched(object $object): ?string { if ($object->getTaskType() !== DTaskTypes::NORMAL) { - throw new HttpError("Not possible to aggregate dispatched on other types than normal task!"); + return null; } $keyspace = $object->getKeyspace(); @@ -107,9 +107,9 @@ protected function getAggregateDispatched(object $object): string { * @throws HttpError * @throws Exception */ - protected function getAggregateSearched(object $object): string { + protected function getAggregateSearched(object $object): ?string { if ($object->getTaskType() !== DTaskTypes::NORMAL) { - throw new HttpError("Not possible to aggregate searched on other types than normal task!"); + return null; } $keyspace = $object->getKeyspace(); @@ -153,9 +153,9 @@ protected function getAggregateStatus(object $object): int { * @throws HttpError * @throws Exception */ - protected function getAggregateCurrentSpeed(object $object): int { + protected function getAggregateCurrentSpeed(object $object): ?int { if ($object->getTaskType() !== DTaskTypes::NORMAL) { - throw new HttpError("Not possible to aggregate currentSpeed on other types than normal task!"); + return null; } $task = TaskUtils::getTasksOfWrapper($object->getId())[0]; @@ -175,9 +175,9 @@ protected function getAggregateCurrentSpeed(object $object): int { * @throws HttpError * @throws Exception */ - protected function getAggregateEstimatedTime(object $object): int { + protected function getAggregateEstimatedTime(object $object): ?int { if ($object->getTaskType() !== DTaskTypes::NORMAL) { - throw new HttpError("Not possible to aggregate estimatedTime on other types than normal task!"); + return null; } $keyspace = $object->getKeyspace(); @@ -190,9 +190,9 @@ protected function getAggregateEstimatedTime(object $object): int { * @throws HttpError * @throws Exception */ - protected function getAggregateCProgress(object $object): int { + protected function getAggregateCProgress(object $object): ?int { if ($object->getTaskType() !== DTaskTypes::NORMAL) { - throw new HttpError("Not possible to aggregate cprogress on other types than normal task!"); + return null; } $task = TaskUtils::getTasksOfWrapper($object->getId())[0]; @@ -203,9 +203,9 @@ protected function getAggregateCProgress(object $object): int { * @throws HttpError * @throws Exception */ - protected function getAggregateTimeSpent(object $object): int { + protected function getAggregateTimeSpent(object $object): ?int { if ($object->getTaskType() !== DTaskTypes::NORMAL) { - throw new HttpError("Not possible to aggregate timeSpent on other types than normal task!"); + return null; } $task = TaskUtils::getTasksOfWrapper($object->getId())[0]; From 6563e5e7574d88bf0c0f7867d046f37761fbf848 Mon Sep 17 00:00:00 2001 From: s3inlc Date: Thu, 18 Jun 2026 11:04:35 +0200 Subject: [PATCH 638/691] fixed path --- src/inc/Util.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/inc/Util.php b/src/inc/Util.php index abe49d2a6..880c912ec 100755 --- a/src/inc/Util.php +++ b/src/inc/Util.php @@ -1592,7 +1592,7 @@ public static function runDatabaseMigration(int $generation = 0): void { $output = []; $database_uri = StartupConfig::getInstance()->getDatabaseType() . "://" . rawurlencode(StartupConfig::getInstance()->getDatabaseUser()) . ":" . rawurlencode(StartupConfig::getInstance()->getDatabasePassword()) . "@" . StartupConfig::getInstance()->getDatabaseServer() . ":" . StartupConfig::getInstance()->getDatabasePort() . "/" . StartupConfig::getInstance()->getDatabaseDB(); - exec('/usr/bin/sqlx migrate run --source ' . escapeshellarg(dirname(__FILE__) . '/../../migrations/' . StartupConfig::getInstance()->getDatabaseType() . $generationPath . '/') . ' -D ' . escapeshellarg($database_uri), $output, $retval); + exec('/usr/bin/sqlx migrate run --source ' . escapeshellarg(dirname(__FILE__) . '/../migrations/' . StartupConfig::getInstance()->getDatabaseType() . $generationPath . '/') . ' -D ' . escapeshellarg($database_uri), $output, $retval); if ($retval !== 0) { echo "Failed to run migrations: \n" . implode("\n", $output); exit(-1); From 33c9dc560f47036d9bf72c6ec172034f286a9f15 Mon Sep 17 00:00:00 2001 From: s3inlc Date: Thu, 18 Jun 2026 11:20:53 +0200 Subject: [PATCH 639/691] added test which does the check that an aggregation which is not possible on a running supertask will not set an attribute on the return --- ci/apiv2/test_taskwrapperdisplay.py | 21 +++++++++++++++++---- 1 file changed, 17 insertions(+), 4 deletions(-) diff --git a/ci/apiv2/test_taskwrapperdisplay.py b/ci/apiv2/test_taskwrapperdisplay.py index c98cdaa08..07d6042d2 100644 --- a/ci/apiv2/test_taskwrapperdisplay.py +++ b/ci/apiv2/test_taskwrapperdisplay.py @@ -1,18 +1,31 @@ -from hashtopolis import TaskWrapperDisplay +from hashtopolis import TaskWrapperDisplay, Helper, TaskWrapper + from utils import BaseTest class TaskWrapperDisplayTest(BaseTest): model_class = TaskWrapperDisplay - + def create_test_object(self, *nargs, delete=True, **kwargs): # Always cleanup hashlist when done, this is potentially confusing, # since it will also remove the related task hashlist = self.create_hashlist() task = self.create_task(hashlist, delete=delete) return TaskWrapperDisplay.objects.get(pk=task.taskWrapperId) - + + def test_task_wrapper_display_should_return_color_field(self): task_wrapper_display_object = self.create_test_object() expected_color_value = str(task_wrapper_display_object.color) self.assertIsNotNone(task_wrapper_display_object.color) self.assertEqual(task_wrapper_display_object.color, expected_color_value) - self.assertNotEqual("FFFFFF", task_wrapper_display_object.color) \ No newline at end of file + self.assertNotEqual("FFFFFF", task_wrapper_display_object.color) + + def test_number_of_chunks_on_supertask(self): + pretasks = [self.create_pretask() for _ in range(2)] + supertask = self.create_supertask(pretasks=pretasks) + cracker = self.create_cracker() + hashlist = self.create_hashlist() + + helper = Helper() + task_wrapper = helper.create_supertask(supertask, hashlist, cracker) + task_wrapper_display = TaskWrapperDisplay.objects.params(**{"aggregate[taskwrapperdisplay]": "timeSpent"}).get(taskWrapperId=task_wrapper.id) + assert not hasattr(task_wrapper_display, 'timeSpent'), "Attribute 'timeSpent' should not be set" \ No newline at end of file From 105d88352c6311c15aca3509a458eb49fef05eb3 Mon Sep 17 00:00:00 2001 From: Eric Wasson <229096365+Eric-Wasson@users.noreply.github.com> Date: Tue, 16 Jun 2026 15:50:59 +0200 Subject: [PATCH 640/691] Fixed pagination bug --- src/dba/AbstractModelFactory.php | 29 +++++++++++++++++++---------- 1 file changed, 19 insertions(+), 10 deletions(-) diff --git a/src/dba/AbstractModelFactory.php b/src/dba/AbstractModelFactory.php index 87ccb9797..fc07f6c67 100755 --- a/src/dba/AbstractModelFactory.php +++ b/src/dba/AbstractModelFactory.php @@ -702,7 +702,7 @@ private function filterWithJoin(array $options): array|AbstractModel { if (array_key_exists(Factory::FILTER, $options)) { $query .= $this->applyFilters($vals, $options[Factory::FILTER]); } - + // Apply order filter if (!array_key_exists(Factory::ORDER, $options)) { // Add a asc order on the primary keys as a standard @@ -718,7 +718,7 @@ private function filterWithJoin(array $options): array|AbstractModel { $dbh = self::getDB(); $stmt = $dbh->prepare($query); $stmt->execute($vals); - + $res = array(); $values = array(); foreach ($factories as $factory) { @@ -828,20 +828,29 @@ private function applyFilters(&$vals, Filter|array $filters, bool $isJoinFilter continue; } $v = $filter->getValue(); - if (is_array($v)) { - foreach ($v as $val) { - $vals[] = $val; - } - } - else { - $vals[] = $v; - } + $this->getAllArrayValues($vals, $v); } if ($isJoinFilter) { return " AND " . implode(" AND ", $parts); } return " WHERE " . implode(" AND ", $parts); } + + /** + * @param $vals + * @param $element + * @return array + */ + private function getAllArrayValues(&$vals, $element) { + if (!is_array($element)) { + $vals[] = $element; + return; + } + + foreach($element as $v) { + $this->getAllArrayValues($vals, $v); + } + } /** * @param $orders Order|Order[] From 44ab2d08a7ce07880307e43af54448cc46ab90c4 Mon Sep 17 00:00:00 2001 From: s3inlc Date: Fri, 19 Jun 2026 12:04:17 +0200 Subject: [PATCH 641/691] preparations for generation migrations --- src/dba/AbstractModelFactory.php | 56 ++++++-- src/dba/Factory.php | 12 ++ .../models/AbstractModelFactory.template.txt | 2 +- src/dba/models/_sqlx_migrations.php | 123 ++++++++++++++++++ src/dba/models/_sqlx_migrationsFactory.php | 97 ++++++++++++++ src/dba/models/generator.php | 31 ++++- src/inc/Util.php | 21 --- src/inc/startup/setup.php | 56 +++++++- src/inc/utils/MigrationUtils.php | 76 +++++++++++ 9 files changed, 436 insertions(+), 38 deletions(-) create mode 100644 src/dba/models/_sqlx_migrations.php create mode 100644 src/dba/models/_sqlx_migrationsFactory.php create mode 100644 src/inc/utils/MigrationUtils.php diff --git a/src/dba/AbstractModelFactory.php b/src/dba/AbstractModelFactory.php index dadc16847..9edb05f10 100755 --- a/src/dba/AbstractModelFactory.php +++ b/src/dba/AbstractModelFactory.php @@ -93,6 +93,25 @@ public function getMappedModelTable(): string { return $this->getModelName(); } + /** + * @param AbstractModel $model + * @param string $key unmapped column name + * @return bool + */ + private static function isBinaryColumn(AbstractModel $model, string $key): bool { + $features = $model->getFeatures(); + return isset($features[$key]['type']) && $features[$key]['type'] === 'binary'; + } + + /** + * @param AbstractModel $model + * @param string $key unmapped column name + * @return string placeholder SQL fragment ("?" or "decode(?, 'hex')") + */ + private static function binaryPlaceholder(AbstractModel $model, string $key): string { + return self::isBinaryColumn($model, $key) ? "decode(?, 'hex')" : "?"; + } + /** * Get all the attribute keys of a model prepared with the mapping prefix where needed. The returned keys are then named * exactly how they are present in the database. @@ -148,6 +167,7 @@ public function save(AbstractModel $model): ?AbstractModel { $dict = $model->getKeyValueDict(); $query = "INSERT INTO " . $this->getMappedModelTable(); + $origKeys = array_keys($dict); $vals = array_values($dict); $keys = self::getMappedModelKeys($model); @@ -155,12 +175,15 @@ public function save(AbstractModel $model): ?AbstractModel { if ($vals[0] === -1 || $vals[0] === null) { array_splice($vals, 0, 1); array_splice($keys, 0, 1); + array_splice($origKeys, 0, 1); } $query .= " (" . implode(",", $keys) . ") "; - $placeHolder = " (" . implode(",", array_fill(0, count($keys), "?")) . ")"; - - $query = $query . " VALUES " . $placeHolder; + $placeholders = []; + foreach ($origKeys as $k) { + $placeholders[] = self::binaryPlaceholder($model, $k); + } + $query = $query . " VALUES (" . implode(",", $placeholders) . ")"; $dbh = $this->getDB(); $stmt = $dbh->prepare($query); @@ -241,15 +264,14 @@ public function update(AbstractModel $model): PDOStatement { $query = "UPDATE " . $this->getMappedModelTable() . " SET "; + $origKeys = array_keys($dict); $values = array_values($dict); - $keys = self::getMappedModelKeys($model); + $mappedKeys = self::getMappedModelKeys($model); - for ($i = 0; $i < count($keys); $i++) { - if ($i != count($keys) - 1) { - $query .= $keys[$i] . "=?, "; - } - else { - $query .= $keys[$i] . "=?"; + for ($i = 0; $i < count($mappedKeys); $i++) { + $query .= $mappedKeys[$i] . "=" . self::binaryPlaceholder($model, $origKeys[$i]); + if ($i < count($mappedKeys) - 1) { + $query .= ", "; } } @@ -275,7 +297,7 @@ public function mset(AbstractModel &$model, array $arr): PDOStatement { $elements = []; $values = []; foreach ($arr as $key => $val) { - $elements[] = self::getMappedModelKey($model, $key) . "=? "; + $elements[] = self::getMappedModelKey($model, $key) . "=" . self::binaryPlaceholder($model, $key) . " "; $values[] = $val; } $query .= implode(", ", $elements); @@ -301,7 +323,7 @@ public function mset(AbstractModel &$model, array $arr): PDOStatement { * @throws Exception */ public function set(AbstractModel &$model, string $key, $value): PDOStatement { - $query = "UPDATE " . $this->getMappedModelTable() . " SET " . self::getMappedModelKey($model, $key) . "=?"; + $query = "UPDATE " . $this->getMappedModelTable() . " SET " . self::getMappedModelKey($model, $key) . "=" . self::binaryPlaceholder($model, $key); $values = []; $query = $query . " WHERE " . $model->getPrimaryKey() . "=?"; @@ -386,6 +408,7 @@ public function massSave(array $models): bool|PDOStatement { } $keys = self::getMappedModelKeys($models[0]); + $origKeys = array_keys($models[0]->getKeyValueDict()); $query = "INSERT INTO " . $this->getMappedModelTable(); $pkInclude = false; @@ -394,15 +417,20 @@ public function massSave(array $models): bool|PDOStatement { } else { array_splice($keys, 0, 1); + array_splice($origKeys, 0, 1); } $query .= " (" . implode(",", $keys) . ") "; - $placeHolder = " (" . implode(",", array_fill(0, count($keys), "?")) . ")"; + $placeholders = []; + foreach ($origKeys as $k) { + $placeholders[] = self::binaryPlaceholder($models[0], $k); + } + $placeHolderStr = " (" . implode(",", $placeholders) . ")"; $query = $query . " VALUES "; $vals = array(); for ($x = 0; $x < sizeof($models); $x++) { - $query .= $placeHolder; + $query .= $placeHolderStr; if ($x < sizeof($models) - 1) { $query .= ", "; } diff --git a/src/dba/Factory.php b/src/dba/Factory.php index b2bb7f63f..04e10ffa2 100644 --- a/src/dba/Factory.php +++ b/src/dba/Factory.php @@ -48,6 +48,7 @@ use Hashtopolis\dba\models\FilePretaskFactory; use Hashtopolis\dba\models\SupertaskPretaskFactory; use Hashtopolis\dba\models\HashlistHashlistFactory; +use Hashtopolis\dba\models\_sqlx_migrationsFactory; class Factory { private static ?AccessGroupFactory $accessGroupFactory = null; @@ -96,6 +97,7 @@ class Factory { private static ?FilePretaskFactory $filePretaskFactory = null; private static ?SupertaskPretaskFactory $supertaskPretaskFactory = null; private static ?HashlistHashlistFactory $hashlistHashlistFactory = null; + private static ?_sqlx_migrationsFactory $_sqlx_migrationsFactory = null; public static function getAccessGroupFactory(): AccessGroupFactory { if (self::$accessGroupFactory == null) { @@ -557,6 +559,16 @@ public static function getHashlistHashlistFactory(): HashlistHashlistFactory { } } + public static function get_sqlx_migrationsFactory(): _sqlx_migrationsFactory { + if (self::$_sqlx_migrationsFactory == null) { + $f = new _sqlx_migrationsFactory(); + self::$_sqlx_migrationsFactory = $f; + return $f; + } else { + return self::$_sqlx_migrationsFactory; + } + } + const FILTER = "filter"; const JOIN = "join"; const ORDER = "order"; diff --git a/src/dba/models/AbstractModelFactory.template.txt b/src/dba/models/AbstractModelFactory.template.txt index a1d9c0bef..5ee16a9c1 100644 --- a/src/dba/models/AbstractModelFactory.template.txt +++ b/src/dba/models/AbstractModelFactory.template.txt @@ -43,7 +43,7 @@ class __MODEL_NAME__Factory extends AbstractModelFactory { foreach ($dict as $key => $val) { $conv[strtolower($key)] = $val; } - $dict = $conv;__MODEL_MAPPING_DICT__ + $dict = $conv;__MODEL_MAPPING_DICT____MODEL_STREAMING_DICT__ return new __MODEL_NAME__(__MODEL__DICT2__); } diff --git a/src/dba/models/_sqlx_migrations.php b/src/dba/models/_sqlx_migrations.php new file mode 100644 index 000000000..56ea78d9b --- /dev/null +++ b/src/dba/models/_sqlx_migrations.php @@ -0,0 +1,123 @@ +version = $version; + $this->description = $description; + $this->installed_on = $installed_on; + $this->success = $success; + $this->checksum = $checksum; + $this->execution_time = $execution_time; + } + + function getKeyValueDict(): array { + $dict = array(); + $dict['version'] = $this->version; + $dict['description'] = $this->description; + $dict['installed_on'] = $this->installed_on; + $dict['success'] = $this->success; + $dict['checksum'] = $this->checksum; + $dict['execution_time'] = $this->execution_time; + + return $dict; + } + + static function getFeatures(): array { + $dict = array(); + $dict['version'] = ['read_only' => True, "type" => "str(256)", "subtype" => "unset", "choices" => "unset", "null" => False, "pk" => True, "protected" => True, "private" => False, "alias" => "version", "public" => False, "dba_mapping" => False]; + $dict['description'] = ['read_only' => True, "type" => "str(65535)", "subtype" => "unset", "choices" => "unset", "null" => False, "pk" => False, "protected" => True, "private" => False, "alias" => "description", "public" => False, "dba_mapping" => False]; + $dict['installed_on'] = ['read_only' => True, "type" => "datetime", "subtype" => "unset", "choices" => "unset", "null" => False, "pk" => False, "protected" => True, "private" => False, "alias" => "installed_on", "public" => False, "dba_mapping" => False]; + $dict['success'] = ['read_only' => True, "type" => "bool", "subtype" => "unset", "choices" => "unset", "null" => False, "pk" => False, "protected" => True, "private" => False, "alias" => "success", "public" => False, "dba_mapping" => False]; + $dict['checksum'] = ['read_only' => True, "type" => "binary", "subtype" => "unset", "choices" => "unset", "null" => False, "pk" => False, "protected" => True, "private" => False, "alias" => "checksum", "public" => False, "dba_mapping" => False]; + $dict['execution_time'] = ['read_only' => True, "type" => "int", "subtype" => "unset", "choices" => "unset", "null" => False, "pk" => False, "protected" => True, "private" => False, "alias" => "execution_time", "public" => False, "dba_mapping" => False]; + + return $dict; + } + + function getPrimaryKey(): string { + return "version"; + } + + function getPrimaryKeyValue(): ?string { + return $this->version; + } + + function getId(): ?string { + return $this->version; + } + + function setId($id): void { + $this->version = $id; + } + + /** + * Used to serialize the data contained in the model + * @return array + */ + public function expose(): array { + return get_object_vars($this); + } + + function getDescription(): ?string { + return $this->description; + } + + function setDescription(?string $description): void { + $this->description = $description; + } + + function getInstalled_on(): ?string { + return $this->installed_on; + } + + function setInstalled_on(?string $installed_on): void { + $this->installed_on = $installed_on; + } + + function getSuccess(): ?int { + return $this->success; + } + + function setSuccess(?int $success): void { + $this->success = $success; + } + + function getChecksum(): ?string { + return $this->checksum; + } + + function setChecksum(?string $checksum): void { + $this->checksum = $checksum; + } + + function getExecution_time(): ?int { + return $this->execution_time; + } + + function setExecution_time(?int $execution_time): void { + $this->execution_time = $execution_time; + } + + const VERSION = "version"; + const DESCRIPTION = "description"; + const INSTALLED__ON = "installed_on"; + const SUCCESS = "success"; + const CHECKSUM = "checksum"; + const EXECUTION__TIME = "execution_time"; + + const PERM_CREATE = "perm_sqlx_migrationsCreate"; + const PERM_READ = "perm_sqlx_migrationsRead"; + const PERM_UPDATE = "perm_sqlx_migrationsUpdate"; + const PERM_DELETE = "perm_sqlx_migrationsDelete"; +} diff --git a/src/dba/models/_sqlx_migrationsFactory.php b/src/dba/models/_sqlx_migrationsFactory.php new file mode 100644 index 000000000..d2f7037b9 --- /dev/null +++ b/src/dba/models/_sqlx_migrationsFactory.php @@ -0,0 +1,97 @@ + $val) { + $conv[strtolower($key)] = $val; + } + $dict = $conv; + if (is_resource($dict['checksum'])) { + $t = stream_get_contents($dict['checksum']); + fclose($dict['checksum']); + $dict['checksum'] = bin2hex($t); + } + return new _sqlx_migrations($dict['version'], $dict['description'], $dict['installed_on'], $dict['success'], $dict['checksum'], $dict['execution_time']); + } + + /** + * @param array $options + * @param bool $single + * @return _sqlx_migrations|_sqlx_migrations[] + */ + function filter(array $options, bool $single = false): _sqlx_migrations|array|null { + $join = false; + if (array_key_exists('join', $options)) { + $join = true; + } + if ($single) { + if ($join) { + return parent::filter($options, $single); + } + return Util::cast(parent::filter($options, $single), _sqlx_migrations::class); + } + $objects = parent::filter($options, $single); + if ($join) { + return $objects; + } + $models = array(); + foreach ($objects as $object) { + $models[] = Util::cast($object, _sqlx_migrations::class); + } + return $models; + } + + /** + * @param string $pk + * @return ?_sqlx_migrations + */ + function get($pk): ?_sqlx_migrations { + return Util::cast(parent::get($pk), _sqlx_migrations::class); + } + + /** + * @param _sqlx_migrations $model + * @return _sqlx_migrations + */ + function save($model): _sqlx_migrations { + return Util::cast(parent::save($model), _sqlx_migrations::class); + } +} diff --git a/src/dba/models/generator.php b/src/dba/models/generator.php index f8198f16e..1de8aa7a7 100644 --- a/src/dba/models/generator.php +++ b/src/dba/models/generator.php @@ -97,7 +97,7 @@ $CONF['AgentStat'] = [ 'columns' => [ ['name' => 'agentStatId', 'read_only' => True, 'type' => 'int', 'protected' => True], - ['name' => 'agentId', 'read_only' => True, 'protected' => True, 'type' => 'int', 'relation' => 'Agent'], + ['name' => 'agentId', 'read_only' => True, 'protected' => True, 'type' => 'int', 'relation' => 'Agent'], ['name' => 'statType', 'read_only' => True, 'protected' => True, 'type' => 'int'], ['name' => 'time', 'read_only' => True, 'protected' => True, 'type' => 'int64'], ['name' => 'value', 'read_only' => True, 'protected' => True, 'type' => 'array', 'subtype' => 'int'], @@ -549,6 +549,17 @@ ], ]; +$CONF['_sqlx_migrations'] = [ + 'columns' => [ + ['name' => 'version', 'read_only' => True, 'type' => 'str(256)', 'protected' => True], + ['name' => 'description', 'read_only' => True, 'type' => 'str(65535)', 'protected' => True], + ['name' => 'installed_on', 'read_only' => True, 'type' => 'datetime', 'protected' => True], + ['name' => 'success', 'read_only' => True, 'type' => 'bool', 'protected' => True], + ['name' => 'checksum', 'read_only' => True, 'type' => 'binary', 'protected' => True], + ['name' => 'execution_time', 'read_only' => True, 'type' => 'int', 'protected' => True], + ] +]; + /** * @throws Exception */ @@ -565,6 +576,12 @@ function getTypingType($str, $nullable = false): string { if ($str == 'array' || $str == 'dict') { return ($nullable ? '?' : '') . 'string'; } + if ($str == 'datetime') { + return ($nullable ? '?' : '') . 'string'; + } + if ($str == 'binary') { + return ($nullable ? '?' : '') . 'string'; + } throw new Exception("Cannot convert type " . $str); } @@ -646,6 +663,7 @@ function getTypingType($str, $nullable = false): string { $dict = []; $dict2 = []; $mapping = []; + $streaming = []; foreach ($COLUMNS as $COLUMN) { $col = strtolower($COLUMN['name']); if (sizeof($dict) == 0) { @@ -658,10 +676,14 @@ function getTypingType($str, $nullable = false): string { if (array_key_exists("dba_mapping", $COLUMN) && $COLUMN['dba_mapping']) { $mapping[] = "\$dict['$col'] = \$dict['htp_$col'];"; } + if (array_key_exists("type", $COLUMN) && $COLUMN['type'] == 'binary') { + $streaming[] = "if (is_resource(\$dict['$col'])) {\n \$t = stream_get_contents(\$dict['$col']);\n fclose(\$dict['$col']);\n \$dict['$col'] = bin2hex(\$t);\n }"; + } } } $class = str_replace("__MODEL_DICT__", implode(", ", $dict), $class); $class = str_replace("__MODEL__DICT2__", implode(", ", $dict2), $class); + if (count($mapping) > 0) { $class = str_replace("__MODEL_MAPPING_DICT__", "\n " . implode("\n ", $mapping), $class); } @@ -669,6 +691,13 @@ function getTypingType($str, $nullable = false): string { $class = str_replace("__MODEL_MAPPING_DICT__", "", $class); } + if (count($streaming) > 0) { + $class = str_replace("__MODEL_STREAMING_DICT__", "\n " . implode("\n ", $streaming), $class); + } + else { + $class = str_replace("__MODEL_STREAMING_DICT__", "", $class); + } + file_put_contents(dirname(__FILE__) . "/" . $NAME . "Factory.php", $class); } diff --git a/src/inc/Util.php b/src/inc/Util.php index 880c912ec..96ff8f3c5 100755 --- a/src/inc/Util.php +++ b/src/inc/Util.php @@ -1577,25 +1577,4 @@ public static function checkDataDirectory($key, $dir) { } } } - - /** - * Run the migration on one generation (default is actual generation which is 0). - * - * @param int $generation - * @return void - */ - public static function runDatabaseMigration(int $generation = 0): void { - $generationPath = ""; - if ($generation > 0) { - $generationPath = ".$generation"; - } - - $output = []; - $database_uri = StartupConfig::getInstance()->getDatabaseType() . "://" . rawurlencode(StartupConfig::getInstance()->getDatabaseUser()) . ":" . rawurlencode(StartupConfig::getInstance()->getDatabasePassword()) . "@" . StartupConfig::getInstance()->getDatabaseServer() . ":" . StartupConfig::getInstance()->getDatabasePort() . "/" . StartupConfig::getInstance()->getDatabaseDB(); - exec('/usr/bin/sqlx migrate run --source ' . escapeshellarg(dirname(__FILE__) . '/../migrations/' . StartupConfig::getInstance()->getDatabaseType() . $generationPath . '/') . ' -D ' . escapeshellarg($database_uri), $output, $retval); - if ($retval !== 0) { - echo "Failed to run migrations: \n" . implode("\n", $output); - exit(-1); - } - } } diff --git a/src/inc/startup/setup.php b/src/inc/startup/setup.php index 61edb7c7f..7edc45556 100755 --- a/src/inc/startup/setup.php +++ b/src/inc/startup/setup.php @@ -5,15 +5,18 @@ **/ use Hashtopolis\dba\Factory; +use Hashtopolis\dba\models\_sqlx_migrations; use Hashtopolis\dba\models\AccessGroupUser; use Hashtopolis\dba\models\RightGroup; use Hashtopolis\dba\models\StoredValue; use Hashtopolis\dba\models\User; +use Hashtopolis\dba\OrderFilter; use Hashtopolis\dba\QueryFilter; use Hashtopolis\inc\defines\DDirectories; use Hashtopolis\inc\StartupConfig; use Hashtopolis\inc\Util; use Hashtopolis\inc\utils\AccessUtils; +use Hashtopolis\inc\utils\MigrationUtils; session_start(); @@ -59,8 +62,59 @@ * - if needed (because there are more generations available), run the previous step again */ +if (!$initialSetup) { + // retrieve the oldest migration + $oF = new OrderFilter(_sqlx_migrations::VERSION, "ASC"); + $firstEntry = Factory::get_sqlx_migrationsFactory()->filter([Factory::ORDER => $oF], true); + + // identify the generation we are on + $allGenerations = MigrationUtils::getAllGenerations(StartupConfig::getInstance()->getDatabaseType()); + $generation = -1; + foreach ($allGenerations as $gen => $migrations) { + if (sizeof($migrations) == 0) { + continue; + } + if (explode("_", $migrations[0])[0] == $firstEntry->getId()) { + $generation = $gen; + break; + } + } + + if ($generation == -1) { + echo "Could not determine current migrations generation, aborting...\n"; + exit(-1); + } + + try { + while ($generation > 0) { + echo "Upgrading to a new sqlx migrations generation (current $generation)...\n"; + + // we are on an older generation branch, we need to migrate + // make sure we are up-to-date on this generation + MigrationUtils::runDatabaseMigration($generation); + + // jump to next migration + $generation--; + $entry = MigrationUtils::getMigrationStartEntry($generation); + if ($entry === null) { + throw new Exception("Failed to retrieve initial migration information for generation $generation!"); + } + + // clear migration table + Factory::get_sqlx_migrationsFactory()->massDeletion([]); + + // add first entry + Factory::get_sqlx_migrationsFactory()->save($entry); + } + } + catch(Exception $e) { + echo "Failed to run generation upgrade: $e\n"; + exit(-1); + } +} + // run database migration on current generation to be fully up-to-date -Util::runDatabaseMigration(); +MigrationUtils::runDatabaseMigration(); if ($initialSetup === true) { // if peppers are not set, generate them and save them diff --git a/src/inc/utils/MigrationUtils.php b/src/inc/utils/MigrationUtils.php new file mode 100644 index 000000000..2877bbb23 --- /dev/null +++ b/src/inc/utils/MigrationUtils.php @@ -0,0 +1,76 @@ + 0) { + $generationPath = ".$generation"; + } + + $output = []; + $database_uri = StartupConfig::getInstance()->getDatabaseType() . "://" . rawurlencode(StartupConfig::getInstance()->getDatabaseUser()) . ":" . rawurlencode(StartupConfig::getInstance()->getDatabasePassword()) . "@" . StartupConfig::getInstance()->getDatabaseServer() . ":" . StartupConfig::getInstance()->getDatabasePort() . "/" . StartupConfig::getInstance()->getDatabaseDB(); + exec('/usr/bin/sqlx migrate run --source ' . escapeshellarg(dirname(__FILE__) . '/../../migrations/' . StartupConfig::getInstance()->getDatabaseType() . $generationPath . '/') . ' -D ' . escapeshellarg($database_uri), $output, $retval); + if ($retval !== 0) { + echo "Failed to run migrations: \n" . implode("\n", $output); + exit(-1); + } + } + + /** + * Get an array with all existing generations and their migrations steps existing. + * + * @param string $databaseType + * @return array the generation count is the key and the value is the list of all migrations ordered ascending + */ + public static function getAllGenerations(string $databaseType): array { + $generations = []; + $basePath = __DIR__ . "/../../migrations/" . $databaseType; + $current = $basePath; + $count = 0; + while (is_dir($current)) { + // scanning ascending should work as all are prefixed with the timestamp + $migrations = scandir($current); + $generations[$count] = []; + foreach ($migrations as $migration) { + if (str_contains($migration, "_")) { + $generations[$count][] = $migration; + } + } + $count++; + $current = $basePath . ".$count"; + } + return $generations; + } + + /** + * Get the first migration entry of a given generation. This is needed to start with a new initial migration on an + * already existing database from an earlier migration. + * + * @param int $generation + * @return _sqlx_migrations|null + */ + public static function getMigrationStartEntry(int $generation): ?_sqlx_migrations { + $generationPath = ""; + if ($generation > 0) { + $generationPath = ".$generation"; + } + $configPath = dirname(__FILE__) . '/../../migrations/' . StartupConfig::getInstance()->getDatabaseType() . $generationPath . '/config.json'; + if (!file_exists($configPath)) { + return null; + } + $data = json_decode(file_get_contents($configPath), true); + return new _sqlx_migrations($data['version'], $data['description'], $data['installed_on'], 1, $data['checksum'], 1); + } +} \ No newline at end of file From abe0c71865ec6f18e63da94a8a714a4efb4f737d Mon Sep 17 00:00:00 2001 From: s3inlc Date: Fri, 19 Jun 2026 13:46:21 +0200 Subject: [PATCH 642/691] fix handling of binary element also for mysql --- src/dba/AbstractModelFactory.php | 8 ++++++-- src/inc/startup/setup.php | 7 ++++++- 2 files changed, 12 insertions(+), 3 deletions(-) diff --git a/src/dba/AbstractModelFactory.php b/src/dba/AbstractModelFactory.php index 9edb05f10..53bdf2041 100755 --- a/src/dba/AbstractModelFactory.php +++ b/src/dba/AbstractModelFactory.php @@ -106,10 +106,14 @@ private static function isBinaryColumn(AbstractModel $model, string $key): bool /** * @param AbstractModel $model * @param string $key unmapped column name - * @return string placeholder SQL fragment ("?" or "decode(?, 'hex')") + * @return string placeholder SQL fragment ("?" or db-specific hex-to-binary function) */ private static function binaryPlaceholder(AbstractModel $model, string $key): string { - return self::isBinaryColumn($model, $key) ? "decode(?, 'hex')" : "?"; + if (!self::isBinaryColumn($model, $key)) { + return "?"; + } + $dbType = StartupConfig::getInstance()->getDatabaseType(); + return $dbType === 'mysql' ? "UNHEX(?)" : "decode(?, 'hex')"; } /** diff --git a/src/inc/startup/setup.php b/src/inc/startup/setup.php index 7edc45556..3b1eb4b27 100755 --- a/src/inc/startup/setup.php +++ b/src/inc/startup/setup.php @@ -67,6 +67,11 @@ $oF = new OrderFilter(_sqlx_migrations::VERSION, "ASC"); $firstEntry = Factory::get_sqlx_migrationsFactory()->filter([Factory::ORDER => $oF], true); + if ($firstEntry == null) { + echo "Unable to identify migrations position!\n"; + exit(-1); + } + // identify the generation we are on $allGenerations = MigrationUtils::getAllGenerations(StartupConfig::getInstance()->getDatabaseType()); $generation = -1; @@ -107,7 +112,7 @@ Factory::get_sqlx_migrationsFactory()->save($entry); } } - catch(Exception $e) { + catch (Exception $e) { echo "Failed to run generation upgrade: $e\n"; exit(-1); } From 705ef59197b30828d05453b7d534e5f04b7c312f Mon Sep 17 00:00:00 2001 From: s3inlc Date: Fri, 19 Jun 2026 13:55:55 +0200 Subject: [PATCH 643/691] switching to new migration generation, added worflow for upgrade tests --- .github/workflows/upgrade-test.yml | 110 + .../20251127000000_initial.sql | 0 .../20251209091723_postgres-index-fix.sql | 0 .../20260116140300_bigint-keys-stats.sql | 0 .../20260212113000_indexes.sql | 0 .../20260302144000_cracker-binary-type.sql | 0 .../20260309164000_api-key.sql | 0 .../20260317120000_remove-rule-split.sql | 0 .../20260413140000_task-view.sql | 0 ...260518102000_task-view-add-color-field.sql | 0 .../20260520145000_mysql-autoincrement.sql | 0 ...20260602074349_mysql-autoincrement-fix.sql | 0 .../20260617130352_blacklist-chars-sync.sql | 0 src/migrations/mysql.1/config.json | 6 + .../mysql/20260619090219_initial.sql | 1430 +++++++ src/migrations/mysql/config.json | 6 + .../20251127000000_initial.sql | 0 .../20251209091723_postgres-index-fix.sql | 0 .../20260116140300_bigint-keys-stats.sql | 0 .../20260212113000_indexes.sql | 0 .../20260302144000_cracker-binary-type.sql | 0 .../20260309164000_api-key.sql | 0 .../20260317120000_remove-rule-split.sql | 0 .../20260413140000_task-view.sql | 0 ...260518102000_task-view-add-color-field.sql | 0 .../20260520145000_mysql-autoincrement.sql | 0 ...20260602074349_mysql-autoincrement-fix.sql | 0 .../20260617130352_blacklist-chars-sync.sql | 0 src/migrations/postgres.1/config.json | 6 + .../postgres/20260619090219_initial.sql | 3432 +++++++++++++++++ src/migrations/postgres/config.json | 6 + 31 files changed, 4996 insertions(+) create mode 100644 .github/workflows/upgrade-test.yml rename src/migrations/{mysql => mysql.1}/20251127000000_initial.sql (100%) rename src/migrations/{mysql => mysql.1}/20251209091723_postgres-index-fix.sql (100%) rename src/migrations/{mysql => mysql.1}/20260116140300_bigint-keys-stats.sql (100%) rename src/migrations/{mysql => mysql.1}/20260212113000_indexes.sql (100%) rename src/migrations/{mysql => mysql.1}/20260302144000_cracker-binary-type.sql (100%) rename src/migrations/{mysql => mysql.1}/20260309164000_api-key.sql (100%) rename src/migrations/{mysql => mysql.1}/20260317120000_remove-rule-split.sql (100%) rename src/migrations/{mysql => mysql.1}/20260413140000_task-view.sql (100%) rename src/migrations/{mysql => mysql.1}/20260518102000_task-view-add-color-field.sql (100%) rename src/migrations/{mysql => mysql.1}/20260520145000_mysql-autoincrement.sql (100%) rename src/migrations/{mysql => mysql.1}/20260602074349_mysql-autoincrement-fix.sql (100%) rename src/migrations/{mysql => mysql.1}/20260617130352_blacklist-chars-sync.sql (100%) create mode 100644 src/migrations/mysql.1/config.json create mode 100644 src/migrations/mysql/20260619090219_initial.sql create mode 100644 src/migrations/mysql/config.json rename src/migrations/{postgres => postgres.1}/20251127000000_initial.sql (100%) rename src/migrations/{postgres => postgres.1}/20251209091723_postgres-index-fix.sql (100%) rename src/migrations/{postgres => postgres.1}/20260116140300_bigint-keys-stats.sql (100%) rename src/migrations/{postgres => postgres.1}/20260212113000_indexes.sql (100%) rename src/migrations/{postgres => postgres.1}/20260302144000_cracker-binary-type.sql (100%) rename src/migrations/{postgres => postgres.1}/20260309164000_api-key.sql (100%) rename src/migrations/{postgres => postgres.1}/20260317120000_remove-rule-split.sql (100%) rename src/migrations/{postgres => postgres.1}/20260413140000_task-view.sql (100%) rename src/migrations/{postgres => postgres.1}/20260518102000_task-view-add-color-field.sql (100%) rename src/migrations/{postgres => postgres.1}/20260520145000_mysql-autoincrement.sql (100%) rename src/migrations/{postgres => postgres.1}/20260602074349_mysql-autoincrement-fix.sql (100%) rename src/migrations/{postgres => postgres.1}/20260617130352_blacklist-chars-sync.sql (100%) create mode 100644 src/migrations/postgres.1/config.json create mode 100644 src/migrations/postgres/20260619090219_initial.sql create mode 100644 src/migrations/postgres/config.json diff --git a/.github/workflows/upgrade-test.yml b/.github/workflows/upgrade-test.yml new file mode 100644 index 000000000..7949e568b --- /dev/null +++ b/.github/workflows/upgrade-test.yml @@ -0,0 +1,110 @@ +name: Upgrade Test + +on: + push: + branches: [master, dev] + pull_request: + branches: [master, dev] + workflow_dispatch: + +env: + DB_NAME: hashtopolis + DB_USER: hashtopolis + DB_PASS: hashtopolis + +jobs: + upgrade-test: + runs-on: ubuntu-latest + strategy: + matrix: + start-tag: [v0.14.0, v1.0.0-rainbow] + db-type: [postgres, mysql] + fail-fast: false + + steps: + - uses: actions/checkout@v4 + + - name: Build new image from repository + run: docker build -t hashtopolis/backend:test . + + - name: Set up Docker network and volumes + run: | + docker network create ht-test-net + docker volume create ht-data + docker volume create ht-db + + - name: Start database container + run: | + if [ "${{ matrix.db-type }}" = "postgres" ]; then + docker run -d --network ht-test-net --name db \ + -e POSTGRES_DB=${{ env.DB_NAME }} \ + -e POSTGRES_USER=${{ env.DB_USER }} \ + -e POSTGRES_PASSWORD=${{ env.DB_PASS }} \ + -v ht-db:/var/lib/postgresql/data \ + postgres:18 + else + docker run -d --network ht-test-net --name db \ + -e MYSQL_ROOT_PASSWORD=${{ env.DB_PASS }} \ + -e MYSQL_DATABASE=${{ env.DB_NAME }} \ + -e MYSQL_USER=${{ env.DB_USER }} \ + -e MYSQL_PASSWORD=${{ env.DB_PASS }} \ + -v ht-db:/var/lib/mysql \ + mysql:8.4 + fi + + - name: Wait for database to be ready + run: | + if [ "${{ matrix.db-type }}" = "postgres" ]; then + until docker exec db pg_isready -U ${{ env.DB_USER }}; do sleep 2; done + else + until docker exec db mysqladmin ping -u root -p${{ env.DB_PASS }} --silent; do sleep 2; done + fi + echo "Database ready" + + - name: Start old backend (${{ matrix.start-tag }}) + run: | + docker run -d --network ht-test-net --name backend \ + -e HASHTOPOLIS_DB_TYPE=${{ matrix.db-type }} \ + -e HASHTOPOLIS_DB_USER=${{ env.DB_USER }} \ + -e HASHTOPOLIS_DB_PASS=${{ env.DB_PASS }} \ + -e HASHTOPOLIS_DB_HOST=db \ + -e HASHTOPOLIS_DB_DATABASE=${{ env.DB_NAME }} \ + -e HASHTOPOLIS_ADMIN_USER=admin \ + -e HASHTOPOLIS_ADMIN_PASSWORD=hashtopolis \ + -v ht-data:/usr/local/share/hashtopolis \ + hashtopolis/backend:${{ matrix.start-tag }} + + - name: Wait for old backend initialization + run: | + timeout 180 bash -c 'until docker logs backend 2>&1 | grep -q "Initialization complete!"; do sleep 3; done' + echo "Old backend initialized" + + - name: Stop old backend and start new backend + run: | + docker stop backend + docker rm backend + docker run -d --network ht-test-net --name backend \ + -e HASHTOPOLIS_DB_TYPE=${{ matrix.db-type }} \ + -e HASHTOPOLIS_DB_USER=${{ env.DB_USER }} \ + -e HASHTOPOLIS_DB_PASS=${{ env.DB_PASS }} \ + -e HASHTOPOLIS_DB_HOST=db \ + -e HASHTOPOLIS_DB_DATABASE=${{ env.DB_NAME }} \ + -e HASHTOPOLIS_ADMIN_USER=admin \ + -e HASHTOPOLIS_ADMIN_PASSWORD=hashtopolis \ + -v ht-data:/usr/local/share/hashtopolis \ + hashtopolis/backend:test + + - name: Wait for new backend initialization + run: | + timeout 180 bash -c 'until docker logs backend 2>&1 | grep -q "Initialization complete!"; do sleep 3; done' + echo "New backend initialized - upgrade test passed" + + - name: Cleanup + if: always() + run: | + docker stop backend 2>/dev/null || true + docker rm backend 2>/dev/null || true + docker stop db 2>/dev/null || true + docker rm db 2>/dev/null || true + docker network rm ht-test-net 2>/dev/null || true + docker volume rm ht-db ht-data 2>/dev/null || true diff --git a/src/migrations/mysql/20251127000000_initial.sql b/src/migrations/mysql.1/20251127000000_initial.sql similarity index 100% rename from src/migrations/mysql/20251127000000_initial.sql rename to src/migrations/mysql.1/20251127000000_initial.sql diff --git a/src/migrations/mysql/20251209091723_postgres-index-fix.sql b/src/migrations/mysql.1/20251209091723_postgres-index-fix.sql similarity index 100% rename from src/migrations/mysql/20251209091723_postgres-index-fix.sql rename to src/migrations/mysql.1/20251209091723_postgres-index-fix.sql diff --git a/src/migrations/mysql/20260116140300_bigint-keys-stats.sql b/src/migrations/mysql.1/20260116140300_bigint-keys-stats.sql similarity index 100% rename from src/migrations/mysql/20260116140300_bigint-keys-stats.sql rename to src/migrations/mysql.1/20260116140300_bigint-keys-stats.sql diff --git a/src/migrations/mysql/20260212113000_indexes.sql b/src/migrations/mysql.1/20260212113000_indexes.sql similarity index 100% rename from src/migrations/mysql/20260212113000_indexes.sql rename to src/migrations/mysql.1/20260212113000_indexes.sql diff --git a/src/migrations/mysql/20260302144000_cracker-binary-type.sql b/src/migrations/mysql.1/20260302144000_cracker-binary-type.sql similarity index 100% rename from src/migrations/mysql/20260302144000_cracker-binary-type.sql rename to src/migrations/mysql.1/20260302144000_cracker-binary-type.sql diff --git a/src/migrations/mysql/20260309164000_api-key.sql b/src/migrations/mysql.1/20260309164000_api-key.sql similarity index 100% rename from src/migrations/mysql/20260309164000_api-key.sql rename to src/migrations/mysql.1/20260309164000_api-key.sql diff --git a/src/migrations/mysql/20260317120000_remove-rule-split.sql b/src/migrations/mysql.1/20260317120000_remove-rule-split.sql similarity index 100% rename from src/migrations/mysql/20260317120000_remove-rule-split.sql rename to src/migrations/mysql.1/20260317120000_remove-rule-split.sql diff --git a/src/migrations/mysql/20260413140000_task-view.sql b/src/migrations/mysql.1/20260413140000_task-view.sql similarity index 100% rename from src/migrations/mysql/20260413140000_task-view.sql rename to src/migrations/mysql.1/20260413140000_task-view.sql diff --git a/src/migrations/mysql/20260518102000_task-view-add-color-field.sql b/src/migrations/mysql.1/20260518102000_task-view-add-color-field.sql similarity index 100% rename from src/migrations/mysql/20260518102000_task-view-add-color-field.sql rename to src/migrations/mysql.1/20260518102000_task-view-add-color-field.sql diff --git a/src/migrations/mysql/20260520145000_mysql-autoincrement.sql b/src/migrations/mysql.1/20260520145000_mysql-autoincrement.sql similarity index 100% rename from src/migrations/mysql/20260520145000_mysql-autoincrement.sql rename to src/migrations/mysql.1/20260520145000_mysql-autoincrement.sql diff --git a/src/migrations/mysql/20260602074349_mysql-autoincrement-fix.sql b/src/migrations/mysql.1/20260602074349_mysql-autoincrement-fix.sql similarity index 100% rename from src/migrations/mysql/20260602074349_mysql-autoincrement-fix.sql rename to src/migrations/mysql.1/20260602074349_mysql-autoincrement-fix.sql diff --git a/src/migrations/mysql/20260617130352_blacklist-chars-sync.sql b/src/migrations/mysql.1/20260617130352_blacklist-chars-sync.sql similarity index 100% rename from src/migrations/mysql/20260617130352_blacklist-chars-sync.sql rename to src/migrations/mysql.1/20260617130352_blacklist-chars-sync.sql diff --git a/src/migrations/mysql.1/config.json b/src/migrations/mysql.1/config.json new file mode 100644 index 000000000..a0013d423 --- /dev/null +++ b/src/migrations/mysql.1/config.json @@ -0,0 +1,6 @@ +{ + "version": 20251127000000, + "description": "initial", + "installed_on": "2025-11-28 14:29:13", + "checksum": "a5a8f03aad0827c86c4a380d935bf1ccb3b5d5f174d7fc40b3d267fd0b6bb7dd4181a9c25efc5cfce24df760f4c2d881" +} \ No newline at end of file diff --git a/src/migrations/mysql/20260619090219_initial.sql b/src/migrations/mysql/20260619090219_initial.sql new file mode 100644 index 000000000..7b3ead013 --- /dev/null +++ b/src/migrations/mysql/20260619090219_initial.sql @@ -0,0 +1,1430 @@ +/*!40101 SET @OLD_CHARACTER_SET_CLIENT=@@CHARACTER_SET_CLIENT */; +/*!40101 SET @OLD_CHARACTER_SET_RESULTS=@@CHARACTER_SET_RESULTS */; +/*!40101 SET @OLD_COLLATION_CONNECTION=@@COLLATION_CONNECTION */; +/*!50503 SET NAMES utf8mb4 */; +/*!40103 SET @OLD_TIME_ZONE=@@TIME_ZONE */; +/*!40103 SET TIME_ZONE='+00:00' */; +/*!40014 SET @OLD_UNIQUE_CHECKS=@@UNIQUE_CHECKS, UNIQUE_CHECKS=0 */; +/*!40014 SET @OLD_FOREIGN_KEY_CHECKS=@@FOREIGN_KEY_CHECKS, FOREIGN_KEY_CHECKS=0 */; +/*!40101 SET @OLD_SQL_MODE=@@SQL_MODE, SQL_MODE='NO_AUTO_VALUE_ON_ZERO' */; +/*!40111 SET @OLD_SQL_NOTES=@@SQL_NOTES, SQL_NOTES=0 */; + +-- +-- Table structure for table `AccessGroup` +-- + +DROP TABLE IF EXISTS `AccessGroup`; +/*!40101 SET @saved_cs_client = @@character_set_client */; +/*!50503 SET character_set_client = utf8mb4 */; +CREATE TABLE `AccessGroup` ( + `accessGroupId` int NOT NULL AUTO_INCREMENT, + `groupName` varchar(50) NOT NULL, + PRIMARY KEY (`accessGroupId`) +) ENGINE=InnoDB AUTO_INCREMENT=2 DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_0900_ai_ci; +/*!40101 SET character_set_client = @saved_cs_client */; + +-- +-- Dumping data for table `AccessGroup` +-- + +LOCK TABLES `AccessGroup` WRITE; +/*!40000 ALTER TABLE `AccessGroup` DISABLE KEYS */; +INSERT INTO `AccessGroup` VALUES (1,'Default Group'); +/*!40000 ALTER TABLE `AccessGroup` ENABLE KEYS */; +UNLOCK TABLES; + +-- +-- Table structure for table `AccessGroupAgent` +-- + +DROP TABLE IF EXISTS `AccessGroupAgent`; +/*!40101 SET @saved_cs_client = @@character_set_client */; +/*!50503 SET character_set_client = utf8mb4 */; +CREATE TABLE `AccessGroupAgent` ( + `accessGroupAgentId` int NOT NULL AUTO_INCREMENT, + `accessGroupId` int NOT NULL, + `agentId` int NOT NULL, + PRIMARY KEY (`accessGroupAgentId`), + KEY `accessGroupId` (`accessGroupId`), + KEY `agentId` (`agentId`), + CONSTRAINT `AccessGroupAgent_ibfk_1` FOREIGN KEY (`accessGroupId`) REFERENCES `AccessGroup` (`accessGroupId`), + CONSTRAINT `AccessGroupAgent_ibfk_2` FOREIGN KEY (`agentId`) REFERENCES `Agent` (`agentId`) +) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_0900_ai_ci; +/*!40101 SET character_set_client = @saved_cs_client */; + +-- +-- Dumping data for table `AccessGroupAgent` +-- + +LOCK TABLES `AccessGroupAgent` WRITE; +/*!40000 ALTER TABLE `AccessGroupAgent` DISABLE KEYS */; +/*!40000 ALTER TABLE `AccessGroupAgent` ENABLE KEYS */; +UNLOCK TABLES; + +-- +-- Table structure for table `AccessGroupUser` +-- + +DROP TABLE IF EXISTS `AccessGroupUser`; +/*!40101 SET @saved_cs_client = @@character_set_client */; +/*!50503 SET character_set_client = utf8mb4 */; +CREATE TABLE `AccessGroupUser` ( + `accessGroupUserId` int NOT NULL AUTO_INCREMENT, + `accessGroupId` int NOT NULL, + `userId` int NOT NULL, + PRIMARY KEY (`accessGroupUserId`), + KEY `accessGroupId` (`accessGroupId`), + KEY `userId` (`userId`), + CONSTRAINT `AccessGroupUser_ibfk_1` FOREIGN KEY (`accessGroupId`) REFERENCES `AccessGroup` (`accessGroupId`), + CONSTRAINT `AccessGroupUser_ibfk_2` FOREIGN KEY (`userId`) REFERENCES `htp_User` (`userId`) +) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_0900_ai_ci; +/*!40101 SET character_set_client = @saved_cs_client */; + +-- +-- Dumping data for table `AccessGroupUser` +-- + +LOCK TABLES `AccessGroupUser` WRITE; +/*!40000 ALTER TABLE `AccessGroupUser` DISABLE KEYS */; +/*!40000 ALTER TABLE `AccessGroupUser` ENABLE KEYS */; +UNLOCK TABLES; + +-- +-- Table structure for table `Agent` +-- + +DROP TABLE IF EXISTS `Agent`; +/*!40101 SET @saved_cs_client = @@character_set_client */; +/*!50503 SET character_set_client = utf8mb4 */; +CREATE TABLE `Agent` ( + `agentId` int NOT NULL AUTO_INCREMENT, + `agentName` varchar(100) NOT NULL, + `uid` varchar(100) NOT NULL, + `os` int NOT NULL, + `devices` text NOT NULL, + `cmdPars` text NOT NULL, + `ignoreErrors` tinyint NOT NULL, + `isActive` tinyint NOT NULL, + `isTrusted` tinyint NOT NULL, + `token` varchar(30) NOT NULL, + `lastAct` varchar(50) NOT NULL, + `lastTime` bigint NOT NULL, + `lastIp` varchar(50) NOT NULL, + `userId` int DEFAULT NULL, + `cpuOnly` tinyint NOT NULL, + `clientSignature` varchar(50) NOT NULL, + PRIMARY KEY (`agentId`), + KEY `userId` (`userId`), + CONSTRAINT `Agent_ibfk_1` FOREIGN KEY (`userId`) REFERENCES `htp_User` (`userId`) +) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_0900_ai_ci; +/*!40101 SET character_set_client = @saved_cs_client */; + +-- +-- Dumping data for table `Agent` +-- + +LOCK TABLES `Agent` WRITE; +/*!40000 ALTER TABLE `Agent` DISABLE KEYS */; +/*!40000 ALTER TABLE `Agent` ENABLE KEYS */; +UNLOCK TABLES; + +-- +-- Table structure for table `AgentBinary` +-- + +DROP TABLE IF EXISTS `AgentBinary`; +/*!40101 SET @saved_cs_client = @@character_set_client */; +/*!50503 SET character_set_client = utf8mb4 */; +CREATE TABLE `AgentBinary` ( + `agentBinaryId` int NOT NULL AUTO_INCREMENT, + `binaryType` varchar(20) NOT NULL, + `version` varchar(20) NOT NULL, + `operatingSystems` varchar(50) NOT NULL, + `filename` varchar(50) NOT NULL, + `updateTrack` varchar(20) NOT NULL, + `updateAvailable` varchar(20) NOT NULL, + PRIMARY KEY (`agentBinaryId`) +) ENGINE=InnoDB AUTO_INCREMENT=2 DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_0900_ai_ci; +/*!40101 SET character_set_client = @saved_cs_client */; + +-- +-- Dumping data for table `AgentBinary` +-- + +LOCK TABLES `AgentBinary` WRITE; +/*!40000 ALTER TABLE `AgentBinary` DISABLE KEYS */; +INSERT INTO `AgentBinary` VALUES (1,'python','0.7.4','Windows, Linux, OS X','hashtopolis.zip','stable',''); +/*!40000 ALTER TABLE `AgentBinary` ENABLE KEYS */; +UNLOCK TABLES; + +-- +-- Table structure for table `AgentError` +-- + +DROP TABLE IF EXISTS `AgentError`; +/*!40101 SET @saved_cs_client = @@character_set_client */; +/*!50503 SET character_set_client = utf8mb4 */; +CREATE TABLE `AgentError` ( + `agentErrorId` int NOT NULL AUTO_INCREMENT, + `agentId` int NOT NULL, + `taskId` int DEFAULT NULL, + `time` bigint NOT NULL, + `error` text NOT NULL, + `chunkId` int DEFAULT NULL, + PRIMARY KEY (`agentErrorId`), + KEY `agentId` (`agentId`), + KEY `taskId` (`taskId`), + CONSTRAINT `AgentError_ibfk_1` FOREIGN KEY (`agentId`) REFERENCES `Agent` (`agentId`), + CONSTRAINT `AgentError_ibfk_2` FOREIGN KEY (`taskId`) REFERENCES `Task` (`taskId`) +) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_0900_ai_ci; +/*!40101 SET character_set_client = @saved_cs_client */; + +-- +-- Dumping data for table `AgentError` +-- + +LOCK TABLES `AgentError` WRITE; +/*!40000 ALTER TABLE `AgentError` DISABLE KEYS */; +/*!40000 ALTER TABLE `AgentError` ENABLE KEYS */; +UNLOCK TABLES; + +-- +-- Table structure for table `AgentStat` +-- + +DROP TABLE IF EXISTS `AgentStat`; +/*!40101 SET @saved_cs_client = @@character_set_client */; +/*!50503 SET character_set_client = utf8mb4 */; +CREATE TABLE `AgentStat` ( + `agentStatId` bigint NOT NULL AUTO_INCREMENT, + `agentId` int NOT NULL, + `statType` int NOT NULL, + `time` bigint NOT NULL, + `value` varchar(128) NOT NULL, + PRIMARY KEY (`agentStatId`), + KEY `agentId` (`agentId`), + CONSTRAINT `AgentStat_ibfk_1` FOREIGN KEY (`agentId`) REFERENCES `Agent` (`agentId`) +) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_0900_ai_ci; +/*!40101 SET character_set_client = @saved_cs_client */; + +-- +-- Dumping data for table `AgentStat` +-- + +LOCK TABLES `AgentStat` WRITE; +/*!40000 ALTER TABLE `AgentStat` DISABLE KEYS */; +/*!40000 ALTER TABLE `AgentStat` ENABLE KEYS */; +UNLOCK TABLES; + +-- +-- Table structure for table `AgentZap` +-- + +DROP TABLE IF EXISTS `AgentZap`; +/*!40101 SET @saved_cs_client = @@character_set_client */; +/*!50503 SET character_set_client = utf8mb4 */; +CREATE TABLE `AgentZap` ( + `agentZapId` int NOT NULL AUTO_INCREMENT, + `agentId` int NOT NULL, + `lastZapId` int DEFAULT NULL, + PRIMARY KEY (`agentZapId`), + KEY `agentId` (`agentId`), + KEY `lastZapId` (`lastZapId`), + CONSTRAINT `AgentZap_ibfk_1` FOREIGN KEY (`agentId`) REFERENCES `Agent` (`agentId`), + CONSTRAINT `AgentZap_ibfk_2` FOREIGN KEY (`lastZapId`) REFERENCES `Zap` (`zapId`) +) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_0900_ai_ci; +/*!40101 SET character_set_client = @saved_cs_client */; + +-- +-- Dumping data for table `AgentZap` +-- + +LOCK TABLES `AgentZap` WRITE; +/*!40000 ALTER TABLE `AgentZap` DISABLE KEYS */; +/*!40000 ALTER TABLE `AgentZap` ENABLE KEYS */; +UNLOCK TABLES; + +-- +-- Table structure for table `ApiGroup` +-- + +DROP TABLE IF EXISTS `ApiGroup`; +/*!40101 SET @saved_cs_client = @@character_set_client */; +/*!50503 SET character_set_client = utf8mb4 */; +CREATE TABLE `ApiGroup` ( + `apiGroupId` int NOT NULL AUTO_INCREMENT, + `name` varchar(100) NOT NULL, + `permissions` text NOT NULL, + PRIMARY KEY (`apiGroupId`) +) ENGINE=InnoDB AUTO_INCREMENT=2 DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_0900_ai_ci; +/*!40101 SET character_set_client = @saved_cs_client */; + +-- +-- Dumping data for table `ApiGroup` +-- + +LOCK TABLES `ApiGroup` WRITE; +/*!40000 ALTER TABLE `ApiGroup` DISABLE KEYS */; +INSERT INTO `ApiGroup` VALUES (1,'Administrators','ALL'); +/*!40000 ALTER TABLE `ApiGroup` ENABLE KEYS */; +UNLOCK TABLES; + +-- +-- Table structure for table `ApiKey` +-- + +DROP TABLE IF EXISTS `ApiKey`; +/*!40101 SET @saved_cs_client = @@character_set_client */; +/*!50503 SET character_set_client = utf8mb4 */; +CREATE TABLE `ApiKey` ( + `apiKeyId` int NOT NULL AUTO_INCREMENT, + `startValid` bigint NOT NULL, + `endValid` bigint NOT NULL, + `accessKey` varchar(256) NOT NULL, + `accessCount` int NOT NULL, + `userId` int NOT NULL, + `apiGroupId` int NOT NULL, + PRIMARY KEY (`apiKeyId`), + KEY `ApiKey_ibfk_1` (`userId`), + KEY `ApiKey_ibfk_2` (`apiGroupId`), + CONSTRAINT `ApiKey_ibfk_1` FOREIGN KEY (`userId`) REFERENCES `htp_User` (`userId`), + CONSTRAINT `ApiKey_ibfk_2` FOREIGN KEY (`apiGroupId`) REFERENCES `ApiGroup` (`apiGroupId`) +) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_0900_ai_ci; +/*!40101 SET character_set_client = @saved_cs_client */; + +-- +-- Dumping data for table `ApiKey` +-- + +LOCK TABLES `ApiKey` WRITE; +/*!40000 ALTER TABLE `ApiKey` DISABLE KEYS */; +/*!40000 ALTER TABLE `ApiKey` ENABLE KEYS */; +UNLOCK TABLES; + +-- +-- Table structure for table `Assignment` +-- + +DROP TABLE IF EXISTS `Assignment`; +/*!40101 SET @saved_cs_client = @@character_set_client */; +/*!50503 SET character_set_client = utf8mb4 */; +CREATE TABLE `Assignment` ( + `assignmentId` int NOT NULL AUTO_INCREMENT, + `taskId` int NOT NULL, + `agentId` int NOT NULL, + `benchmark` varchar(50) NOT NULL, + PRIMARY KEY (`assignmentId`), + KEY `taskId` (`taskId`), + KEY `agentId` (`agentId`), + CONSTRAINT `Assignment_ibfk_1` FOREIGN KEY (`taskId`) REFERENCES `Task` (`taskId`), + CONSTRAINT `Assignment_ibfk_2` FOREIGN KEY (`agentId`) REFERENCES `Agent` (`agentId`) +) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_0900_ai_ci; +/*!40101 SET character_set_client = @saved_cs_client */; + +-- +-- Dumping data for table `Assignment` +-- + +LOCK TABLES `Assignment` WRITE; +/*!40000 ALTER TABLE `Assignment` DISABLE KEYS */; +/*!40000 ALTER TABLE `Assignment` ENABLE KEYS */; +UNLOCK TABLES; + +-- +-- Table structure for table `Chunk` +-- + +DROP TABLE IF EXISTS `Chunk`; +/*!40101 SET @saved_cs_client = @@character_set_client */; +/*!50503 SET character_set_client = utf8mb4 */; +CREATE TABLE `Chunk` ( + `chunkId` int NOT NULL AUTO_INCREMENT, + `taskId` int NOT NULL, + `skip` bigint unsigned NOT NULL, + `length` bigint unsigned NOT NULL, + `agentId` int DEFAULT NULL, + `dispatchTime` bigint NOT NULL, + `solveTime` bigint NOT NULL, + `checkpoint` bigint unsigned NOT NULL, + `progress` int DEFAULT NULL, + `state` int NOT NULL, + `cracked` int NOT NULL, + `speed` bigint NOT NULL, + PRIMARY KEY (`chunkId`), + KEY `taskId` (`taskId`), + KEY `progress` (`progress`), + KEY `agentId` (`agentId`), + KEY `idx_task_progress_length` (`taskId`,`progress`,`length`), + CONSTRAINT `Chunk_ibfk_1` FOREIGN KEY (`taskId`) REFERENCES `Task` (`taskId`), + CONSTRAINT `Chunk_ibfk_2` FOREIGN KEY (`agentId`) REFERENCES `Agent` (`agentId`) +) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_0900_ai_ci; +/*!40101 SET character_set_client = @saved_cs_client */; + +-- +-- Dumping data for table `Chunk` +-- + +LOCK TABLES `Chunk` WRITE; +/*!40000 ALTER TABLE `Chunk` DISABLE KEYS */; +/*!40000 ALTER TABLE `Chunk` ENABLE KEYS */; +UNLOCK TABLES; + +-- +-- Table structure for table `Config` +-- + +DROP TABLE IF EXISTS `Config`; +/*!40101 SET @saved_cs_client = @@character_set_client */; +/*!50503 SET character_set_client = utf8mb4 */; +CREATE TABLE `Config` ( + `configId` int NOT NULL AUTO_INCREMENT, + `configSectionId` int NOT NULL, + `item` varchar(80) NOT NULL, + `value` text NOT NULL, + PRIMARY KEY (`configId`), + KEY `configSectionId` (`configSectionId`), + CONSTRAINT `Config_ibfk_1` FOREIGN KEY (`configSectionId`) REFERENCES `ConfigSection` (`configSectionId`) +) ENGINE=InnoDB AUTO_INCREMENT=80 DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_0900_ai_ci; +/*!40101 SET character_set_client = @saved_cs_client */; + +-- +-- Dumping data for table `Config` +-- + +LOCK TABLES `Config` WRITE; +/*!40000 ALTER TABLE `Config` DISABLE KEYS */; +INSERT INTO `Config` VALUES (1,1,'agenttimeout','30'),(2,1,'benchtime','30'),(3,1,'chunktime','600'),(4,1,'chunktimeout','30'),(9,1,'fieldseparator',':'),(10,1,'hashlistAlias','#HL#'),(11,1,'statustimer','5'),(12,4,'timefmt','d.m.Y, H:i:s'),(13,1,'blacklistChars','&|`\"\'{}()[]$<>;'),(14,3,'numLogEntries','5000'),(15,1,'disptolerance','20'),(16,3,'batchSize','50000'),(18,2,'yubikey_id',''),(19,2,'yubikey_key',''),(20,2,'yubikey_url','https://api.yubico.com/wsapi/2.0/verify'),(22,3,'pagingSize','5000'),(23,3,'plainTextMaxLength','200'),(24,3,'hashMaxLength','1024'),(25,5,'emailSender','hashtopolis@example.org'),(26,5,'emailSenderName','Hashtopolis'),(27,5,'baseHost',''),(28,3,'maxHashlistSize','5000000'),(29,4,'hideImportMasks','1'),(30,7,'telegramBotToken',''),(31,5,'contactEmail',''),(32,5,'voucherDeletion','0'),(33,4,'hashesPerPage','1000'),(34,4,'hideIpInfo','0'),(35,1,'defaultBenchmark','1'),(36,4,'showTaskPerformance','0'),(41,4,'agentStatLimit','100'),(42,1,'agentDataLifetime','3600'),(43,4,'agentStatTension','0'),(44,6,'multicastEnable','0'),(45,6,'multicastDevice','eth0'),(46,6,'multicastTransferRateEnable','0'),(47,6,'multicastTranserRate','500000'),(48,1,'disableTrimming','0'),(49,5,'serverLogLevel','20'),(50,7,'notificationsProxyEnable','0'),(60,7,'notificationsProxyServer',''),(61,7,'notificationsProxyPort','8080'),(62,7,'notificationsProxyType','HTTP'),(63,1,'priority0Start','0'),(64,5,'baseUrl',''),(65,4,'maxSessionLength','48'),(66,1,'hashcatBrainEnable','0'),(67,1,'hashcatBrainHost',''),(68,1,'hashcatBrainPort','0'),(69,1,'hashcatBrainPass',''),(70,1,'hashlistImportCheck','0'),(71,5,'allowDeregister','0'),(72,4,'agentTempThreshold1','70'),(73,4,'agentTempThreshold2','80'),(74,4,'agentUtilThreshold1','90'),(75,4,'agentUtilThreshold2','75'),(76,3,'uApiSendTaskIsComplete','0'),(77,1,'hcErrorIgnore','DeviceGetFanSpeed'),(78,3,'defaultPageSize','10000'),(79,3,'maxPageSize','50000'); +/*!40000 ALTER TABLE `Config` ENABLE KEYS */; +UNLOCK TABLES; + +-- +-- Table structure for table `ConfigSection` +-- + +DROP TABLE IF EXISTS `ConfigSection`; +/*!40101 SET @saved_cs_client = @@character_set_client */; +/*!50503 SET character_set_client = utf8mb4 */; +CREATE TABLE `ConfigSection` ( + `configSectionId` int NOT NULL AUTO_INCREMENT, + `sectionName` varchar(100) NOT NULL, + PRIMARY KEY (`configSectionId`) +) ENGINE=InnoDB AUTO_INCREMENT=8 DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_0900_ai_ci; +/*!40101 SET character_set_client = @saved_cs_client */; + +-- +-- Dumping data for table `ConfigSection` +-- + +LOCK TABLES `ConfigSection` WRITE; +/*!40000 ALTER TABLE `ConfigSection` DISABLE KEYS */; +INSERT INTO `ConfigSection` VALUES (1,'Cracking/Tasks'),(2,'Yubikey'),(3,'Finetuning'),(4,'UI'),(5,'Server'),(6,'Multicast'),(7,'Notifications'); +/*!40000 ALTER TABLE `ConfigSection` ENABLE KEYS */; +UNLOCK TABLES; + +-- +-- Table structure for table `CrackerBinary` +-- + +DROP TABLE IF EXISTS `CrackerBinary`; +/*!40101 SET @saved_cs_client = @@character_set_client */; +/*!50503 SET character_set_client = utf8mb4 */; +CREATE TABLE `CrackerBinary` ( + `crackerBinaryId` int NOT NULL AUTO_INCREMENT, + `crackerBinaryTypeId` int NOT NULL, + `version` varchar(20) NOT NULL, + `downloadUrl` varchar(150) NOT NULL, + `binaryName` varchar(50) NOT NULL, + PRIMARY KEY (`crackerBinaryId`), + KEY `crackerBinaryTypeId` (`crackerBinaryTypeId`), + CONSTRAINT `CrackerBinary_ibfk_1` FOREIGN KEY (`crackerBinaryTypeId`) REFERENCES `CrackerBinaryType` (`crackerBinaryTypeId`) +) ENGINE=InnoDB AUTO_INCREMENT=2 DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_0900_ai_ci; +/*!40101 SET character_set_client = @saved_cs_client */; + +-- +-- Dumping data for table `CrackerBinary` +-- + +LOCK TABLES `CrackerBinary` WRITE; +/*!40000 ALTER TABLE `CrackerBinary` DISABLE KEYS */; +INSERT INTO `CrackerBinary` VALUES (1,1,'7.1.2','https://hashcat.net/files/hashcat-7.1.2.7z','hashcat'); +/*!40000 ALTER TABLE `CrackerBinary` ENABLE KEYS */; +UNLOCK TABLES; + +-- +-- Table structure for table `CrackerBinaryType` +-- + +DROP TABLE IF EXISTS `CrackerBinaryType`; +/*!40101 SET @saved_cs_client = @@character_set_client */; +/*!50503 SET character_set_client = utf8mb4 */; +CREATE TABLE `CrackerBinaryType` ( + `crackerBinaryTypeId` int NOT NULL AUTO_INCREMENT, + `typeName` varchar(30) NOT NULL, + `isChunkingAvailable` tinyint NOT NULL, + PRIMARY KEY (`crackerBinaryTypeId`), + UNIQUE KEY `typeName` (`typeName`) +) ENGINE=InnoDB AUTO_INCREMENT=2 DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_0900_ai_ci; +/*!40101 SET character_set_client = @saved_cs_client */; + +-- +-- Dumping data for table `CrackerBinaryType` +-- + +LOCK TABLES `CrackerBinaryType` WRITE; +/*!40000 ALTER TABLE `CrackerBinaryType` DISABLE KEYS */; +INSERT INTO `CrackerBinaryType` VALUES (1,'hashcat',1); +/*!40000 ALTER TABLE `CrackerBinaryType` ENABLE KEYS */; +UNLOCK TABLES; + +-- +-- Table structure for table `File` +-- + +DROP TABLE IF EXISTS `File`; +/*!40101 SET @saved_cs_client = @@character_set_client */; +/*!50503 SET character_set_client = utf8mb4 */; +CREATE TABLE `File` ( + `fileId` int NOT NULL AUTO_INCREMENT, + `filename` varchar(100) NOT NULL, + `size` bigint NOT NULL, + `isSecret` tinyint NOT NULL, + `fileType` int NOT NULL, + `accessGroupId` int NOT NULL, + `lineCount` bigint DEFAULT NULL, + PRIMARY KEY (`fileId`), + KEY `File_ibfk_1` (`accessGroupId`), + CONSTRAINT `File_ibfk_1` FOREIGN KEY (`accessGroupId`) REFERENCES `AccessGroup` (`accessGroupId`) +) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_0900_ai_ci; +/*!40101 SET character_set_client = @saved_cs_client */; + +-- +-- Dumping data for table `File` +-- + +LOCK TABLES `File` WRITE; +/*!40000 ALTER TABLE `File` DISABLE KEYS */; +/*!40000 ALTER TABLE `File` ENABLE KEYS */; +UNLOCK TABLES; + +-- +-- Table structure for table `FileDelete` +-- + +DROP TABLE IF EXISTS `FileDelete`; +/*!40101 SET @saved_cs_client = @@character_set_client */; +/*!50503 SET character_set_client = utf8mb4 */; +CREATE TABLE `FileDelete` ( + `fileDeleteId` int NOT NULL AUTO_INCREMENT, + `filename` varchar(256) NOT NULL, + `time` bigint NOT NULL, + PRIMARY KEY (`fileDeleteId`) +) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_0900_ai_ci; +/*!40101 SET character_set_client = @saved_cs_client */; + +-- +-- Dumping data for table `FileDelete` +-- + +LOCK TABLES `FileDelete` WRITE; +/*!40000 ALTER TABLE `FileDelete` DISABLE KEYS */; +/*!40000 ALTER TABLE `FileDelete` ENABLE KEYS */; +UNLOCK TABLES; + +-- +-- Table structure for table `FileDownload` +-- + +DROP TABLE IF EXISTS `FileDownload`; +/*!40101 SET @saved_cs_client = @@character_set_client */; +/*!50503 SET character_set_client = utf8mb4 */; +CREATE TABLE `FileDownload` ( + `fileDownloadId` int NOT NULL AUTO_INCREMENT, + `time` bigint NOT NULL, + `fileId` int NOT NULL, + `status` int NOT NULL, + PRIMARY KEY (`fileDownloadId`), + KEY `FileDownload_ibkf_1` (`fileId`), + CONSTRAINT `FileDownload_ibkf_1` FOREIGN KEY (`fileId`) REFERENCES `File` (`fileId`) +) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_0900_ai_ci; +/*!40101 SET character_set_client = @saved_cs_client */; + +-- +-- Dumping data for table `FileDownload` +-- + +LOCK TABLES `FileDownload` WRITE; +/*!40000 ALTER TABLE `FileDownload` DISABLE KEYS */; +/*!40000 ALTER TABLE `FileDownload` ENABLE KEYS */; +UNLOCK TABLES; + +-- +-- Table structure for table `FilePretask` +-- + +DROP TABLE IF EXISTS `FilePretask`; +/*!40101 SET @saved_cs_client = @@character_set_client */; +/*!50503 SET character_set_client = utf8mb4 */; +CREATE TABLE `FilePretask` ( + `filePretaskId` int NOT NULL AUTO_INCREMENT, + `fileId` int NOT NULL, + `pretaskId` int NOT NULL, + PRIMARY KEY (`filePretaskId`), + KEY `fileId` (`fileId`), + KEY `pretaskId` (`pretaskId`), + CONSTRAINT `FilePretask_ibfk_1` FOREIGN KEY (`fileId`) REFERENCES `File` (`fileId`), + CONSTRAINT `FilePretask_ibfk_2` FOREIGN KEY (`pretaskId`) REFERENCES `Pretask` (`pretaskId`) +) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_0900_ai_ci; +/*!40101 SET character_set_client = @saved_cs_client */; + +-- +-- Dumping data for table `FilePretask` +-- + +LOCK TABLES `FilePretask` WRITE; +/*!40000 ALTER TABLE `FilePretask` DISABLE KEYS */; +/*!40000 ALTER TABLE `FilePretask` ENABLE KEYS */; +UNLOCK TABLES; + +-- +-- Table structure for table `FileTask` +-- + +DROP TABLE IF EXISTS `FileTask`; +/*!40101 SET @saved_cs_client = @@character_set_client */; +/*!50503 SET character_set_client = utf8mb4 */; +CREATE TABLE `FileTask` ( + `fileTaskId` int NOT NULL AUTO_INCREMENT, + `fileId` int NOT NULL, + `taskId` int NOT NULL, + PRIMARY KEY (`fileTaskId`), + KEY `fileId` (`fileId`), + KEY `taskId` (`taskId`), + CONSTRAINT `FileTask_ibfk_1` FOREIGN KEY (`fileId`) REFERENCES `File` (`fileId`), + CONSTRAINT `FileTask_ibfk_2` FOREIGN KEY (`taskId`) REFERENCES `Task` (`taskId`) +) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_0900_ai_ci; +/*!40101 SET character_set_client = @saved_cs_client */; + +-- +-- Dumping data for table `FileTask` +-- + +LOCK TABLES `FileTask` WRITE; +/*!40000 ALTER TABLE `FileTask` DISABLE KEYS */; +/*!40000 ALTER TABLE `FileTask` ENABLE KEYS */; +UNLOCK TABLES; + +-- +-- Table structure for table `Hash` +-- + +DROP TABLE IF EXISTS `Hash`; +/*!40101 SET @saved_cs_client = @@character_set_client */; +/*!50503 SET character_set_client = utf8mb4 */; +CREATE TABLE `Hash` ( + `hashId` int NOT NULL AUTO_INCREMENT, + `hashlistId` int NOT NULL, + `hash` mediumtext NOT NULL, + `salt` varchar(256) DEFAULT NULL, + `plaintext` varchar(256) DEFAULT NULL, + `timeCracked` bigint DEFAULT NULL, + `chunkId` int DEFAULT NULL, + `isCracked` tinyint NOT NULL, + `crackPos` bigint NOT NULL, + PRIMARY KEY (`hashId`), + KEY `hashlistId` (`hashlistId`), + KEY `chunkId` (`chunkId`), + KEY `isCracked` (`isCracked`), + KEY `hash` (`hash`(500)), + KEY `timeCracked` (`timeCracked`), + CONSTRAINT `Hash_ibfk_1` FOREIGN KEY (`hashlistId`) REFERENCES `Hashlist` (`hashlistId`), + CONSTRAINT `Hash_ibfk_2` FOREIGN KEY (`chunkId`) REFERENCES `Chunk` (`chunkId`) +) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_0900_ai_ci; +/*!40101 SET character_set_client = @saved_cs_client */; + +-- +-- Dumping data for table `Hash` +-- + +LOCK TABLES `Hash` WRITE; +/*!40000 ALTER TABLE `Hash` DISABLE KEYS */; +/*!40000 ALTER TABLE `Hash` ENABLE KEYS */; +UNLOCK TABLES; + +-- +-- Table structure for table `HashBinary` +-- + +DROP TABLE IF EXISTS `HashBinary`; +/*!40101 SET @saved_cs_client = @@character_set_client */; +/*!50503 SET character_set_client = utf8mb4 */; +CREATE TABLE `HashBinary` ( + `hashBinaryId` int NOT NULL AUTO_INCREMENT, + `hashlistId` int NOT NULL, + `essid` varchar(100) NOT NULL, + `hash` longtext NOT NULL, + `plaintext` varchar(1024) DEFAULT NULL, + `timeCracked` bigint DEFAULT NULL, + `chunkId` int DEFAULT NULL, + `isCracked` tinyint NOT NULL, + `crackPos` bigint NOT NULL, + PRIMARY KEY (`hashBinaryId`), + KEY `hashlistId` (`hashlistId`), + KEY `chunkId` (`chunkId`), + CONSTRAINT `HashBinary_ibfk_1` FOREIGN KEY (`hashlistId`) REFERENCES `Hashlist` (`hashlistId`), + CONSTRAINT `HashBinary_ibfk_2` FOREIGN KEY (`chunkId`) REFERENCES `Chunk` (`chunkId`) +) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_0900_ai_ci; +/*!40101 SET character_set_client = @saved_cs_client */; + +-- +-- Dumping data for table `HashBinary` +-- + +LOCK TABLES `HashBinary` WRITE; +/*!40000 ALTER TABLE `HashBinary` DISABLE KEYS */; +/*!40000 ALTER TABLE `HashBinary` ENABLE KEYS */; +UNLOCK TABLES; + +-- +-- Table structure for table `HashType` +-- + +DROP TABLE IF EXISTS `HashType`; +/*!40101 SET @saved_cs_client = @@character_set_client */; +/*!50503 SET character_set_client = utf8mb4 */; +CREATE TABLE `HashType` ( + `hashTypeId` int NOT NULL AUTO_INCREMENT, + `description` varchar(256) NOT NULL, + `isSalted` tinyint NOT NULL, + `isSlowHash` tinyint NOT NULL, + PRIMARY KEY (`hashTypeId`) +) ENGINE=InnoDB AUTO_INCREMENT=100000 DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_0900_ai_ci; +/*!40101 SET character_set_client = @saved_cs_client */; + +-- +-- Dumping data for table `HashType` +-- + +LOCK TABLES `HashType` WRITE; +/*!40000 ALTER TABLE `HashType` DISABLE KEYS */; +INSERT INTO `HashType` VALUES (0,'MD5',0,0),(10,'md5($pass.$salt)',1,0),(11,'Joomla < 2.5.18',1,0),(12,'PostgreSQL',1,0),(20,'md5($salt.$pass)',1,0),(21,'osCommerce, xt:Commerce',1,0),(22,'Juniper Netscreen/SSG (ScreenOS)',1,0),(23,'Skype',1,0),(24,'SolarWinds Serv-U',0,0),(30,'md5(utf16le($pass).$salt)',1,0),(40,'md5($salt.utf16le($pass))',1,0),(50,'HMAC-MD5 (key = $pass)',1,0),(60,'HMAC-MD5 (key = $salt)',1,0),(70,'md5(utf16le($pass))',0,0),(100,'SHA1',0,0),(101,'nsldap, SHA-1(Base64), Netscape LDAP SHA',0,0),(110,'sha1($pass.$salt)',1,0),(111,'nsldaps, SSHA-1(Base64), Netscape LDAP SSHA',0,0),(112,'Oracle S: Type (Oracle 11+)',1,0),(120,'sha1($salt.$pass)',1,0),(121,'SMF >= v1.1',1,0),(122,'OS X v10.4, v10.5, v10.6',0,0),(124,'Django (SHA-1)',0,0),(125,'ArubaOS',0,0),(130,'sha1(utf16le($pass).$salt)',1,0),(131,'MSSQL(2000)',0,0),(132,'MSSQL(2005)',0,0),(133,'PeopleSoft',0,0),(140,'sha1($salt.utf16le($pass))',1,0),(141,'EPiServer 6.x < v4',0,0),(150,'HMAC-SHA1 (key = $pass)',1,0),(160,'HMAC-SHA1 (key = $salt)',1,0),(170,'sha1(utf16le($pass))',0,0),(200,'MySQL323',0,0),(300,'MySQL4.1/MySQL5+',0,0),(400,'phpass, MD5(Wordpress), MD5(Joomla), MD5(phpBB3)',0,0),(500,'md5crypt, MD5(Unix), FreeBSD MD5, Cisco-IOS MD5 2',0,0),(501,'Juniper IVE',0,0),(600,'BLAKE2b-512',0,0),(610,'BLAKE2b-512($pass.$salt)',1,0),(620,'BLAKE2b-512($salt.$pass)',1,0),(900,'MD4',0,0),(1000,'NTLM',0,0),(1100,'Domain Cached Credentials (DCC), MS Cache',1,0),(1300,'SHA-224',0,0),(1310,'sha224($pass.$salt)',1,0),(1320,'sha224($salt.$pass)',1,0),(1400,'SHA256',0,0),(1410,'sha256($pass.$salt)',1,0),(1411,'SSHA-256(Base64), LDAP {SSHA256}',0,0),(1420,'sha256($salt.$pass)',1,0),(1421,'hMailServer',0,0),(1430,'sha256(utf16le($pass).$salt)',1,0),(1440,'sha256($salt.utf16le($pass))',1,0),(1441,'EPiServer 6.x >= v4',0,0),(1450,'HMAC-SHA256 (key = $pass)',1,0),(1460,'HMAC-SHA256 (key = $salt)',1,0),(1470,'sha256(utf16le($pass))',0,0),(1500,'descrypt, DES(Unix), Traditional DES',0,0),(1600,'md5apr1, MD5(APR), Apache MD5',0,0),(1700,'SHA512',0,0),(1710,'sha512($pass.$salt)',1,0),(1711,'SSHA-512(Base64), LDAP {SSHA512}',0,0),(1720,'sha512($salt.$pass)',1,0),(1722,'OS X v10.7',0,0),(1730,'sha512(utf16le($pass).$salt)',1,0),(1731,'MSSQL(2012), MSSQL(2014)',0,0),(1740,'sha512($salt.utf16le($pass))',1,0),(1750,'HMAC-SHA512 (key = $pass)',1,0),(1760,'HMAC-SHA512 (key = $salt)',1,0),(1770,'sha512(utf16le($pass))',0,0),(1800,'sha512crypt, SHA512(Unix)',0,0),(2000,'STDOUT',0,0),(2100,'Domain Cached Credentials 2 (DCC2), MS Cache',0,1),(2400,'Cisco-PIX MD5',0,0),(2410,'Cisco-ASA MD5',1,0),(2500,'WPA/WPA2',0,1),(2501,'WPA-EAPOL-PMK',0,1),(2600,'md5(md5($pass))',0,0),(2611,'vBulletin < v3.8.5',1,0),(2612,'PHPS',0,0),(2630,'md5(md5($pass.$salt))',1,0),(2711,'vBulletin >= v3.8.5',1,0),(2811,'IPB2+, MyBB1.2+',1,0),(3000,'LM',0,0),(3100,'Oracle H: Type (Oracle 7+), DES(Oracle)',1,0),(3200,'bcrypt, Blowfish(OpenBSD)',0,0),(3500,'md5(md5(md5($pass)))',0,0),(3610,'md5(md5(md5($pass)).$salt)',1,0),(3710,'md5($salt.md5($pass))',1,0),(3711,'Mediawiki B type',0,0),(3730,'md5($salt1.strtoupper(md5($salt2.$pass)))',0,0),(3800,'md5($salt.$pass.$salt)',1,0),(3910,'md5(md5($pass).md5($salt))',1,0),(4010,'md5($salt.md5($salt.$pass))',1,0),(4110,'md5($salt.md5($pass.$salt))',1,0),(4300,'md5(strtoupper(md5($pass)))',0,0),(4400,'md5(sha1($pass))',0,0),(4410,'md5(sha1($pass).$salt)',1,0),(4420,'md5(sha1($pass.$salt))',1,0),(4430,'md5(sha1($salt.$pass))',1,0),(4500,'sha1(sha1($pass))',0,0),(4510,'sha1(sha1($pass).$salt)',1,0),(4520,'sha1($salt.sha1($pass))',1,0),(4521,'Redmine Project Management Web App',0,0),(4522,'PunBB',0,0),(4700,'sha1(md5($pass))',0,0),(4710,'sha1(md5($pass).$salt)',1,0),(4711,'Huawei sha1(md5($pass).$salt)',1,0),(4800,'MD5(Chap), iSCSI CHAP authentication',1,0),(4900,'sha1($salt.$pass.$salt)',1,0),(5000,'SHA-3(Keccak)',0,0),(5100,'Half MD5',0,0),(5200,'Password Safe v3',0,1),(5300,'IKE-PSK MD5',0,0),(5400,'IKE-PSK SHA1',0,0),(5500,'NetNTLMv1-VANILLA / NetNTLMv1+ESS',0,0),(5600,'NetNTLMv2',0,0),(5700,'Cisco-IOS SHA256',0,0),(5720,'Cisco-ISE Hashed Password (SHA256)',0,0),(5800,'Samsung Android Password/PIN',1,0),(6000,'RipeMD160',0,0),(6050,'HMAC-RIPEMD160 (key = $pass)',1,0),(6060,'HMAC-RIPEMD160 (key = $salt)',1,0),(6100,'Whirlpool',0,0),(6211,'TrueCrypt 5.0+ PBKDF2-HMAC-RipeMD160 + AES/Serpent/Twofish',0,1),(6212,'TrueCrypt 5.0+ PBKDF2-HMAC-RipeMD160 + AES-Twofish/Serpent-AES/Twofish-Serpent',0,1),(6213,'TrueCrypt 5.0+ PBKDF2-HMAC-RipeMD160 + AES-Twofish-Serpent/Serpent-Twofish-AES',0,1),(6221,'TrueCrypt 5.0+ SHA512 + AES/Serpent/Twofish',0,1),(6222,'TrueCrypt 5.0+ SHA512 + AES-Twofish/Serpent-AES/Twofish-Serpent',0,1),(6223,'TrueCrypt 5.0+ SHA512 + AES-Twofish-Serpent/Serpent-Twofish-AES',0,1),(6231,'TrueCrypt 5.0+ Whirlpool + AES/Serpent/Twofish',0,1),(6232,'TrueCrypt 5.0+ Whirlpool + AES-Twofish/Serpent-AES/Twofish-Serpent',0,1),(6233,'TrueCrypt 5.0+ Whirlpool + AES-Twofish-Serpent/Serpent-Twofish-AES',0,1),(6241,'TrueCrypt 5.0+ PBKDF2-HMAC-RipeMD160 + AES/Serpent/Twofish + boot',0,1),(6242,'TrueCrypt 5.0+ PBKDF2-HMAC-RipeMD160 + AES-Twofish/Serpent-AES/Twofish-Serpent + boot',0,1),(6243,'TrueCrypt 5.0+ PBKDF2-HMAC-RipeMD160 + AES-Twofish-Serpent/Serpent-Twofish-AES + boot',0,1),(6300,'AIX {smd5}',0,0),(6400,'AIX {ssha256}',0,1),(6500,'AIX {ssha512}',0,1),(6600,'1Password, Agile Keychain',0,1),(6700,'AIX {ssha1}',0,1),(6800,'Lastpass',1,1),(6900,'GOST R 34.11-94',0,0),(7000,'Fortigate (FortiOS)',0,0),(7100,'OS X v10.8 / v10.9',0,1),(7200,'GRUB 2',0,1),(7300,'IPMI2 RAKP HMAC-SHA1',1,0),(7350,'IPMI2 RAKP HMAC-MD5',0,0),(7400,'sha256crypt, SHA256(Unix)',0,0),(7401,'MySQL $A$ (sha256crypt)',0,0),(7500,'Kerberos 5 AS-REQ Pre-Auth',0,0),(7700,'SAP CODVN B (BCODE)',0,0),(7701,'SAP CODVN B (BCODE) from RFC_READ_TABLE',0,0),(7800,'SAP CODVN F/G (PASSCODE)',0,0),(7801,'SAP CODVN F/G (PASSCODE) from RFC_READ_TABLE',0,0),(7900,'Drupal7',0,0),(8000,'Sybase ASE',0,0),(8100,'Citrix Netscaler',0,0),(8200,'1Password, Cloud Keychain',0,1),(8300,'DNSSEC (NSEC3)',1,0),(8400,'WBB3, Woltlab Burning Board 3',1,0),(8500,'RACF',0,0),(8501,'AS/400 DES',0,0),(8600,'Lotus Notes/Domino 5',0,0),(8700,'Lotus Notes/Domino 6',0,0),(8800,'Android FDE <= 4.3',0,1),(8900,'scrypt',1,0),(9000,'Password Safe v2',0,0),(9100,'Lotus Notes/Domino',0,1),(9200,'Cisco $8$',0,1),(9300,'Cisco $9$',0,0),(9400,'Office 2007',0,1),(9500,'Office 2010',0,1),(9600,'Office 2013',0,1),(9700,'MS Office ⇐ 2003 MD5 + RC4, oldoffice$0, oldoffice$1',0,0),(9710,'MS Office <= 2003 $0/$1, MD5 + RC4, collider #1',0,0),(9720,'MS Office <= 2003 $0/$1, MD5 + RC4, collider #2',0,0),(9800,'MS Office ⇐ 2003 SHA1 + RC4, oldoffice$3, oldoffice$4',0,0),(9810,'MS Office <= 2003 $3, SHA1 + RC4, collider #1',0,0),(9820,'MS Office <= 2003 $3, SHA1 + RC4, collider #2',0,0),(9900,'Radmin2',0,0),(10000,'Django (PBKDF2-SHA256)',0,1),(10100,'SipHash',1,0),(10200,'Cram MD5',0,0),(10300,'SAP CODVN H (PWDSALTEDHASH) iSSHA-1',0,0),(10400,'PDF 1.1 - 1.3 (Acrobat 2 - 4)',0,0),(10410,'PDF 1.1 - 1.3 (Acrobat 2 - 4), collider #1',0,0),(10420,'PDF 1.1 - 1.3 (Acrobat 2 - 4), collider #2',0,0),(10500,'PDF 1.4 - 1.6 (Acrobat 5 - 8)',0,0),(10510,'PDF 1.3 - 1.6 (Acrobat 4 - 8) w/ RC4-40',0,1),(10600,'PDF 1.7 Level 3 (Acrobat 9)',0,0),(10700,'PDF 1.7 Level 8 (Acrobat 10 - 11)',0,0),(10800,'SHA384',0,0),(10810,'sha384($pass.$salt)',1,0),(10820,'sha384($salt.$pass)',1,0),(10830,'sha384(utf16le($pass).$salt)',1,0),(10840,'sha384($salt.utf16le($pass))',1,0),(10870,'sha384(utf16le($pass))',0,0),(10900,'PBKDF2-HMAC-SHA256',0,1),(10901,'RedHat 389-DS LDAP (PBKDF2-HMAC-SHA256)',0,1),(11000,'PrestaShop',1,0),(11100,'PostgreSQL Challenge-Response Authentication (MD5)',0,0),(11200,'MySQL Challenge-Response Authentication (SHA1)',0,0),(11300,'Bitcoin/Litecoin wallet.dat',0,1),(11400,'SIP digest authentication (MD5)',0,0),(11500,'CRC32',1,0),(11600,'7-Zip',0,0),(11700,'GOST R 34.11-2012 (Streebog) 256-bit',0,0),(11750,'HMAC-Streebog-256 (key = $pass), big-endian',0,0),(11760,'HMAC-Streebog-256 (key = $salt), big-endian',0,0),(11800,'GOST R 34.11-2012 (Streebog) 512-bit',0,0),(11850,'HMAC-Streebog-512 (key = $pass), big-endian',0,0),(11860,'HMAC-Streebog-512 (key = $salt), big-endian',0,0),(11900,'PBKDF2-HMAC-MD5',0,1),(12000,'PBKDF2-HMAC-SHA1',0,1),(12001,'Atlassian (PBKDF2-HMAC-SHA1)',0,1),(12100,'PBKDF2-HMAC-SHA512',0,1),(12150,'Apache Shiro 1 SHA-512',0,1),(12200,'eCryptfs',0,1),(12300,'Oracle T: Type (Oracle 12+)',0,1),(12400,'BSDiCrypt, Extended DES',0,0),(12500,'RAR3-hp',0,0),(12600,'ColdFusion 10+',1,0),(12700,'Blockchain, My Wallet',0,1),(12800,'MS-AzureSync PBKDF2-HMAC-SHA256',0,1),(12900,'Android FDE (Samsung DEK)',0,1),(13000,'RAR5',0,1),(13100,'Kerberos 5 TGS-REP etype 23',0,0),(13200,'AxCrypt',0,0),(13300,'AxCrypt in memory SHA1',0,0),(13400,'Keepass 1/2 AES/Twofish with/without keyfile',0,0),(13500,'PeopleSoft PS_TOKEN',1,0),(13600,'WinZip',0,1),(13711,'VeraCrypt PBKDF2-HMAC-RIPEMD160 + AES, Serpent, Twofish',0,1),(13712,'VeraCrypt PBKDF2-HMAC-RIPEMD160 + AES-Twofish, Serpent-AES, Twofish-Serpent',0,1),(13713,'VeraCrypt PBKDF2-HMAC-RIPEMD160 + Serpent-Twofish-AES',0,1),(13721,'VeraCrypt PBKDF2-HMAC-SHA512 + AES, Serpent, Twofish',0,1),(13722,'VeraCrypt PBKDF2-HMAC-SHA512 + AES-Twofish, Serpent-AES, Twofish-Serpent',0,1),(13723,'VeraCrypt PBKDF2-HMAC-SHA512 + Serpent-Twofish-AES',0,1),(13731,'VeraCrypt PBKDF2-HMAC-Whirlpool + AES, Serpent, Twofish',0,1),(13732,'VeraCrypt PBKDF2-HMAC-Whirlpool + AES-Twofish, Serpent-AES, Twofish-Serpent',0,1),(13733,'VeraCrypt PBKDF2-HMAC-Whirlpool + Serpent-Twofish-AES',0,1),(13741,'VeraCrypt PBKDF2-HMAC-RIPEMD160 + boot-mode + AES',0,1),(13742,'VeraCrypt PBKDF2-HMAC-RIPEMD160 + boot-mode + AES-Twofish',0,1),(13743,'VeraCrypt PBKDF2-HMAC-RIPEMD160 + boot-mode + AES-Twofish-Serpent',0,1),(13751,'VeraCrypt PBKDF2-HMAC-SHA256 + AES, Serpent, Twofish',0,1),(13752,'VeraCrypt PBKDF2-HMAC-SHA256 + AES-Twofish, Serpent-AES, Twofish-Serpent',0,1),(13753,'VeraCrypt PBKDF2-HMAC-SHA256 + Serpent-Twofish-AES',0,1),(13761,'VeraCrypt PBKDF2-HMAC-SHA256 + boot-mode (PIM + AES | Twofish)',0,1),(13762,'VeraCrypt PBKDF2-HMAC-SHA256 + boot-mode + Serpent-AES',0,1),(13763,'VeraCrypt PBKDF2-HMAC-SHA256 + boot-mode + Serpent-Twofish-AES',0,1),(13771,'VeraCrypt Streebog-512 + XTS 512 bit',0,1),(13772,'VeraCrypt Streebog-512 + XTS 1024 bit',0,1),(13773,'VeraCrypt Streebog-512 + XTS 1536 bit',0,1),(13781,'VeraCrypt Streebog-512 + XTS 512 bit + boot-mode (legacy)',0,1),(13782,'VeraCrypt Streebog-512 + XTS 1024 bit + boot-mode (legacy)',0,1),(13783,'VeraCrypt Streebog-512 + XTS 1536 bit + boot-mode (legacy)',0,1),(13800,'Windows 8+ phone PIN/Password',1,0),(13900,'OpenCart',1,0),(14000,'DES (PT = $salt, key = $pass)',1,0),(14100,'3DES (PT = $salt, key = $pass)',1,0),(14200,'RACF KDFAES',0,1),(14400,'sha1(CX)',1,0),(14500,'Linux Kernel Crypto API (2.4)',0,0),(14600,'LUKS 10',0,1),(14700,'iTunes Backup < 10.0 11',0,1),(14800,'iTunes Backup >= 10.0 11',0,1),(14900,'Skip32 12',1,0),(15000,'FileZilla Server >= 0.9.55',1,0),(15100,'Juniper/NetBSD sha1crypt',0,1),(15200,'Blockchain, My Wallet, V2',0,0),(15300,'DPAPI masterkey file v1 and v2',0,1),(15310,'DPAPI masterkey file v1 (context 3)',0,1),(15400,'ChaCha20',0,0),(15500,'JKS Java Key Store Private Keys (SHA1)',0,0),(15600,'Ethereum Wallet, PBKDF2-HMAC-SHA256',0,1),(15700,'Ethereum Wallet, SCRYPT',0,0),(15900,'DPAPI master key file version 2 + Active Directory domain context',0,1),(15910,'DPAPI masterkey file v2 (context 3)',0,1),(16000,'Tripcode',0,0),(16100,'TACACS+',0,0),(16200,'Apple Secure Notes',0,1),(16300,'Ethereum Pre-Sale Wallet, PBKDF2-HMAC-SHA256',0,1),(16400,'CRAM-MD5 Dovecot',0,0),(16500,'JWT (JSON Web Token)',0,0),(16501,'Perl Mojolicious session cookie (HMAC-SHA256, >= v9.19)',0,0),(16600,'Electrum Wallet (Salt-Type 1-3)',0,0),(16700,'FileVault 2',0,1),(16800,'WPA-PMKID-PBKDF2',0,1),(16801,'WPA-PMKID-PMK',0,1),(16900,'Ansible Vault',0,1),(17010,'GPG (AES-128/AES-256 (SHA-1($pass)))',0,1),(17020,'GPG (AES-128/AES-256 (SHA-512($pass)))',0,1),(17030,'GPG (AES-128/AES-256 (SHA-256($pass)))',0,1),(17040,'GPG (CAST5 (SHA-1($pass)))',0,1),(17200,'PKZIP (Compressed)',0,0),(17210,'PKZIP (Uncompressed)',0,0),(17220,'PKZIP (Compressed Multi-File)',0,0),(17225,'PKZIP (Mixed Multi-File)',0,0),(17230,'PKZIP (Compressed Multi-File Checksum-Only)',0,0),(17300,'SHA3-224',0,0),(17400,'SHA3-256',0,0),(17500,'SHA3-384',0,0),(17600,'SHA3-512',0,0),(17700,'Keccak-224',0,0),(17800,'Keccak-256',0,0),(17900,'Keccak-384',0,0),(18000,'Keccak-512',0,0),(18100,'TOTP (HMAC-SHA1)',1,0),(18200,'Kerberos 5 AS-REP etype 23',0,1),(18300,'Apple File System (APFS)',0,1),(18400,'Open Document Format (ODF) 1.2 (SHA-256, AES)',0,1),(18500,'sha1(md5(md5($pass)))',0,0),(18600,'Open Document Format (ODF) 1.1 (SHA-1, Blowfish)',0,1),(18700,'Java Object hashCode()',0,1),(18800,'Blockchain, My Wallet, Second Password (SHA256)',0,1),(18900,'Android Backup',0,1),(19000,'QNX /etc/shadow (MD5)',0,1),(19100,'QNX /etc/shadow (SHA256)',0,1),(19200,'QNX /etc/shadow (SHA512)',0,1),(19210,'QNX 7 /etc/shadow (SHA512)',0,1),(19300,'sha1($salt1.$pass.$salt2)',0,0),(19500,'Ruby on Rails Restful-Authentication',0,0),(19600,'Kerberos 5 TGS-REP etype 17 (AES128-CTS-HMAC-SHA1-96)',0,1),(19700,'Kerberos 5 TGS-REP etype 18 (AES256-CTS-HMAC-SHA1-96)',0,1),(19800,'Kerberos 5, etype 17, Pre-Auth',0,1),(19900,'Kerberos 5, etype 18, Pre-Auth',0,1),(20011,'DiskCryptor SHA512 + XTS 512 bit (AES) / DiskCryptor SHA512 + XTS 512 bit (Twofish) / DiskCryptor SHA512 + XTS 512 bit (Serpent)',0,1),(20012,'DiskCryptor SHA512 + XTS 1024 bit (AES-Twofish) / DiskCryptor SHA512 + XTS 1024 bit (Twofish-Serpent) / DiskCryptor SHA512 + XTS 1024 bit (Serpent-AES)',0,1),(20013,'DiskCryptor SHA512 + XTS 1536 bit (AES-Twofish-Serpent)',0,1),(20200,'Python passlib pbkdf2-sha512',0,1),(20300,'Python passlib pbkdf2-sha256',0,1),(20400,'Python passlib pbkdf2-sha1',0,0),(20500,'PKZIP Master Key',0,0),(20510,'PKZIP Master Key (6 byte optimization)',0,0),(20600,'Oracle Transportation Management (SHA256)',0,0),(20710,'sha256(sha256($pass).$salt)',1,0),(20711,'AuthMe sha256',0,0),(20712,'RSA Security Analytics / NetWitness (sha256)',1,0),(20720,'sha256($salt.sha256($pass))',1,0),(20730,'sha256(sha256($pass.$salt))',1,0),(20800,'sha256(md5($pass))',0,0),(20900,'md5(sha1($pass).md5($pass).sha1($pass))',0,0),(21000,'BitShares v0.x - sha512(sha512_bin(pass))',0,0),(21100,'sha1(md5($pass.$salt))',1,0),(21200,'md5(sha1($salt).md5($pass))',1,0),(21300,'md5($salt.sha1($salt.$pass))',1,0),(21310,'md5($salt1.sha1($salt2.$pass))',1,0),(21400,'sha256(sha256_bin(pass))',0,0),(21420,'sha256($salt.sha256_bin($pass))',1,0),(21500,'SolarWinds Orion',0,0),(21501,'SolarWinds Orion v2',0,0),(21600,'Web2py pbkdf2-sha512',0,0),(21700,'Electrum Wallet (Salt-Type 4)',0,0),(21800,'Electrum Wallet (Salt-Type 5)',0,0),(21900,'md5(md5(md5($pass.$salt1)).$salt2)',0,0),(22000,'WPA-PBKDF2-PMKID+EAPOL',0,0),(22001,'WPA-PMK-PMKID+EAPOL',0,0),(22100,'BitLocker',0,0),(22200,'Citrix NetScaler (SHA512)',0,0),(22300,'sha256($salt.$pass.$salt)',1,0),(22301,'Telegram client app passcode (SHA256)',0,0),(22400,'AES Crypt (SHA256)',0,0),(22500,'MultiBit Classic .key (MD5)',0,0),(22600,'Telegram Desktop App Passcode (PBKDF2-HMAC-SHA1)',0,0),(22700,'MultiBit HD (scrypt)',0,1),(22800,'Simpla CMS - md5($salt.$pass.md5($pass))',1,0),(22911,'RSA/DSA/EC/OPENSSH Private Keys ($0$)',0,0),(22921,'RSA/DSA/EC/OPENSSH Private Keys ($6$)',0,0),(22931,'RSA/DSA/EC/OPENSSH Private Keys ($1, $3$)',0,0),(22941,'RSA/DSA/EC/OPENSSH Private Keys ($4$)',0,0),(22951,'RSA/DSA/EC/OPENSSH Private Keys ($5$)',0,0),(23001,'SecureZIP AES-128',0,0),(23002,'SecureZIP AES-192',0,0),(23003,'SecureZIP AES-256',0,0),(23100,'Apple Keychain',0,1),(23200,'XMPP SCRAM PBKDF2-SHA1',0,0),(23300,'Apple iWork',0,0),(23400,'Bitwarden',0,0),(23500,'AxCrypt 2 AES-128',0,0),(23600,'AxCrypt 2 AES-256',0,0),(23700,'RAR3-p (Uncompressed)',0,0),(23800,'RAR3-p (Compressed)',0,0),(23900,'BestCrypt v3 Volume Encryption',0,0),(24000,'BestCrypt v4 Volume Encryption',0,1),(24100,'MongoDB ServerKey SCRAM-SHA-1',0,0),(24200,'MongoDB ServerKey SCRAM-SHA-256',0,0),(24300,'sha1($salt.sha1($pass.$salt))',1,0),(24410,'PKCS#8 Private Keys (PBKDF2-HMAC-SHA1 + 3DES/AES)',0,0),(24420,'PKCS#8 Private Keys (PBKDF2-HMAC-SHA256 + 3DES/AES)',0,0),(24500,'Telegram Desktop >= v2.1.14 (PBKDF2-HMAC-SHA512)',0,0),(24600,'SQLCipher',0,0),(24700,'Stuffit5',0,0),(24800,'Umbraco HMAC-SHA1',0,0),(24900,'Dahua Authentication MD5',0,0),(25000,'SNMPv3 HMAC-MD5-96/HMAC-SHA1-96',0,1),(25100,'SNMPv3 HMAC-MD5-96',0,1),(25200,'SNMPv3 HMAC-SHA1-96',0,1),(25300,'MS Office 2016 - SheetProtection',0,0),(25400,'PDF 1.4 - 1.6 (Acrobat 5 - 8) - edit password',0,0),(25500,'Stargazer Stellar Wallet XLM',0,0),(25600,'bcrypt(md5($pass)) / bcryptmd5',0,1),(25700,'MurmurHash',1,0),(25800,'bcrypt(sha1($pass)) / bcryptsha1',0,1),(25900,'KNX IP Secure - Device Authentication Code',0,0),(26000,'Mozilla key3.db',0,0),(26100,'Mozilla key4.db',0,0),(26200,'OpenEdge Progress Encode',0,0),(26300,'FortiGate256 (FortiOS256)',0,0),(26401,'AES-128-ECB NOKDF (PT = $salt, key = $pass)',0,0),(26402,'AES-192-ECB NOKDF (PT = $salt, key = $pass)',0,0),(26403,'AES-256-ECB NOKDF (PT = $salt, key = $pass)',0,0),(26500,'iPhone passcode (UID key + System Keybag)',0,0),(26600,'MetaMask Wallet',0,1),(26610,'MetaMask Wallet (short hash, plaintext check)',0,1),(26700,'SNMPv3 HMAC-SHA224-128',0,0),(26800,'SNMPv3 HMAC-SHA256-192',0,0),(26900,'SNMPv3 HMAC-SHA384-256',0,0),(27000,'NetNTLMv1 / NetNTLMv1+ESS (NT)',0,0),(27100,'NetNTLMv2 (NT)',0,0),(27200,'Ruby on Rails Restful Auth (one round, no sitekey)',1,0),(27300,'SNMPv3 HMAC-SHA512-384',0,0),(27400,'VMware VMX (PBKDF2-HMAC-SHA1 + AES-256-CBC)',0,0),(27500,'VirtualBox (PBKDF2-HMAC-SHA256 & AES-128-XTS)',0,1),(27600,'VirtualBox (PBKDF2-HMAC-SHA256 & AES-256-XTS)',0,1),(27700,'MultiBit Classic .wallet (scrypt)',0,0),(27800,'MurmurHash3',1,0),(27900,'CRC32C',1,0),(28000,'CRC64Jones',1,0),(28100,'Windows Hello PIN/Password',0,1),(28200,'Exodus Desktop Wallet (scrypt)',0,0),(28300,'Teamspeak 3 (channel hash)',0,0),(28400,'bcrypt(sha512($pass)) / bcryptsha512',0,0),(28501,'Bitcoin WIF private key (P2PKH), compressed',0,0),(28502,'Bitcoin WIF private key (P2PKH), uncompressed',0,0),(28503,'Bitcoin WIF private key (P2WPKH, Bech32), compressed',0,0),(28504,'Bitcoin WIF private key (P2WPKH, Bech32), uncompressed',0,0),(28505,'Bitcoin WIF private key (P2SH(P2WPKH)), compressed',0,0),(28506,'Bitcoin WIF private key (P2SH(P2WPKH)), uncompressed',0,0),(28600,'PostgreSQL SCRAM-SHA-256',0,1),(28700,'Amazon AWS4-HMAC-SHA256',0,0),(28800,'Kerberos 5, etype 17, DB',0,1),(28900,'Kerberos 5, etype 18, DB',0,1),(29000,'sha1($salt.sha1(utf16le($username).\':\'.utf16le($pass)))',0,0),(29100,'Flask Session Cookie ($salt.$salt.$pass)',0,0),(29200,'Radmin3',0,0),(29311,'TrueCrypt RIPEMD160 + XTS 512 bit',0,0),(29312,'TrueCrypt RIPEMD160 + XTS 1024 bit',0,0),(29313,'TrueCrypt RIPEMD160 + XTS 1536 bit',0,0),(29321,'TrueCrypt SHA512 + XTS 512 bit',0,0),(29322,'TrueCrypt SHA512 + XTS 1024 bit',0,0),(29323,'TrueCrypt SHA512 + XTS 1536 bit',0,0),(29331,'TrueCrypt Whirlpool + XTS 512 bit',0,0),(29332,'TrueCrypt Whirlpool + XTS 1024 bit',0,0),(29333,'TrueCrypt Whirlpool + XTS 1536 bit',0,0),(29341,'TrueCrypt RIPEMD160 + XTS 512 bit + boot-mode',0,0),(29342,'TrueCrypt RIPEMD160 + XTS 1024 bit + boot-mode',0,0),(29343,'TrueCrypt RIPEMD160 + XTS 1536 bit + boot-mode',0,0),(29411,'VeraCrypt RIPEMD160 + XTS 512 bit',0,0),(29412,'VeraCrypt RIPEMD160 + XTS 1024 bit',0,0),(29413,'VeraCrypt RIPEMD160 + XTS 1536 bit',0,0),(29421,'VeraCrypt SHA512 + XTS 512 bit',0,0),(29422,'VeraCrypt SHA512 + XTS 1024 bit',0,0),(29423,'VeraCrypt SHA512 + XTS 1536 bit',0,0),(29431,'VeraCrypt Whirlpool + XTS 512 bit',0,0),(29432,'VeraCrypt Whirlpool + XTS 1024 bit',0,0),(29433,'VeraCrypt Whirlpool + XTS 1536 bit',0,0),(29441,'VeraCrypt RIPEMD160 + XTS 512 bit + boot-mode',0,0),(29442,'VeraCrypt RIPEMD160 + XTS 1024 bit + boot-mode',0,0),(29443,'VeraCrypt RIPEMD160 + XTS 1536 bit + boot-mode',0,0),(29451,'VeraCrypt SHA256 + XTS 512 bit',0,0),(29452,'VeraCrypt SHA256 + XTS 1024 bit',0,0),(29453,'VeraCrypt SHA256 + XTS 1536 bit',0,0),(29461,'VeraCrypt SHA256 + XTS 512 bit + boot-mode',0,0),(29462,'VeraCrypt SHA256 + XTS 1024 bit + boot-mode',0,0),(29463,'VeraCrypt SHA256 + XTS 1536 bit + boot-mode',0,0),(29471,'VeraCrypt Streebog-512 + XTS 512 bit',0,0),(29472,'VeraCrypt Streebog-512 + XTS 1024 bit',0,0),(29473,'VeraCrypt Streebog-512 + XTS 1536 bit',0,0),(29481,'VeraCrypt Streebog-512 + XTS 512 bit + boot-mode',0,0),(29482,'VeraCrypt Streebog-512 + XTS 1024 bit + boot-mode',0,0),(29483,'VeraCrypt Streebog-512 + XTS 1536 bit + boot-mode',0,0),(29511,'LUKS v1 SHA-1 + AES',0,1),(29512,'LUKS v1 SHA-1 + Serpent',0,1),(29513,'LUKS v1 SHA-1 + Twofish',0,1),(29521,'LUKS v1 SHA-256 + AES',0,1),(29522,'LUKS v1 SHA-256 + Serpent',0,1),(29523,'LUKS v1 SHA-256 + Twofish',0,1),(29531,'LUKS v1 SHA-512 + AES',0,1),(29532,'LUKS v1 SHA-512 + Serpent',0,1),(29533,'LUKS v1 SHA-512 + Twofish',0,1),(29541,'LUKS v1 RIPEMD-160 + AES',0,1),(29542,'LUKS v1 RIPEMD-160 + Serpent',0,1),(29543,'LUKS v1 RIPEMD-160 + Twofish',0,1),(29600,'Terra Station Wallet (AES256-CBC(PBKDF2($pass)))',0,1),(29700,'KeePass 1 (AES/Twofish) and KeePass 2 (AES) - keyfile only mode',0,1),(29800,'Bisq .wallet (scrypt)',0,1),(29910,'ENCsecurity Datavault (PBKDF2/no keychain)',0,1),(29920,'ENCsecurity Datavault (PBKDF2/keychain)',0,1),(29930,'ENCsecurity Datavault (MD5/no keychain)',0,1),(29940,'ENCsecurity Datavault (MD5/keychain)',0,1),(30000,'Python Werkzeug MD5 (HMAC-MD5 (key = $salt))',0,0),(30120,'Python Werkzeug SHA256 (HMAC-SHA256 (key = $salt))',0,0),(30420,'DANE RFC7929/RFC8162 SHA2-256',0,0),(30500,'md5(md5($salt).md5(md5($pass)))',1,0),(30600,'bcrypt(sha256($pass))',0,1),(30601,'bcrypt(HMAC-SHA256($pass))',0,1),(30700,'Anope IRC Services (enc_sha256)',0,0),(30901,'Bitcoin raw private key (P2PKH), compressed',0,0),(30902,'Bitcoin raw private key (P2PKH), uncompressed',0,0),(30903,'Bitcoin raw private key (P2WPKH, Bech32), compressed',0,0),(30904,'Bitcoin raw private key (P2WPKH, Bech32), uncompressed',0,0),(30905,'Bitcoin raw private key (P2SH(P2WPKH)), compressed',0,0),(30906,'Bitcoin raw private key (P2SH(P2WPKH)), uncompressed',0,0),(31000,'BLAKE2s-256',0,0),(31100,'ShangMi 3 (SM3)',0,0),(31200,'Veeam VBK',0,1),(31300,'MS SNTP',0,0),(31400,'SecureCRT MasterPassphrase v2',0,0),(31500,'Domain Cached Credentials (DCC), MS Cache (NT)',1,1),(31600,'Domain Cached Credentials 2 (DCC2), MS Cache 2, (NT)',0,1),(31700,'md5(md5(md5($pass).$salt1).$salt2)',1,0),(31800,'1Password, mobilekeychain (1Password 8)',0,1),(31900,'MetaMask Mobile Wallet',0,1),(32000,'NetIQ SSPR (MD5)',0,1),(32010,'NetIQ SSPR (SHA1)',0,1),(32020,'NetIQ SSPR (SHA-1 with Salt)',0,1),(32030,'NetIQ SSPR (SHA-256 with Salt)',0,1),(32031,'Adobe AEM (SSPR, SHA-256 with Salt)',0,1),(32040,'NetIQ SSPR (SHA-512 with Salt)',0,1),(32041,'Adobe AEM (SSPR, SHA-512 with Salt)',0,1),(32050,'NetIQ SSPR (PBKDF2WithHmacSHA1)',0,1),(32060,'NetIQ SSPR (PBKDF2WithHmacSHA256)',0,1),(32070,'NetIQ SSPR (PBKDF2WithHmacSHA512)',0,1),(32100,'Kerberos 5, etype 17, AS-REP',0,1),(32200,'Kerberos 5, etype 18, AS-REP',0,1),(32300,'Empire CMS (Admin password)',1,0),(32410,'sha512(sha512($pass).$salt)',1,0),(32420,'sha512(sha512_bin($pass).$salt)',1,0),(32500,'Dogechain.info Wallet',0,1),(32600,'CubeCart (whirlpool($salt.$pass.$salt))',1,0),(32700,'Kremlin Encrypt 3.0 w/NewDES',0,1),(32800,'md5(sha1(md5($pass)))',0,0),(32900,'PBKDF1-SHA1',1,1),(33000,'md5($salt1.$pass.$salt2)',1,0),(33100,'md5($salt.md5($pass).$salt)',1,0),(33300,'HMAC-BLAKE2S (key = $pass)',1,0),(33400,'mega.nz password-protected link (PBKDF2-HMAC-SHA512)',0,1),(33500,'RC4 40-bit DropN',0,0),(33501,'RC4 72-bit DropN',0,0),(33502,'RC4 104-bit DropN',0,0),(33600,'RIPEMD-320',0,0),(33650,'HMAC-RIPEMD320 (key = $pass)',1,0),(33660,'HMAC-RIPEMD320 (key = $salt)',1,0),(33700,'Microsoft Online Account (PBKDF2-HMAC-SHA256 + AES256)',0,1),(33800,'WBB4 (Woltlab Burning Board) [bcrypt(bcrypt($pass))]',0,1),(33900,'Citrix NetScaler (PBKDF2-HMAC-SHA256)',0,1),(34000,'Argon2',0,1),(34100,'LUKS v2 argon2 + SHA-256 + AES',0,1),(34200,'MurmurHash64A',1,0),(34201,'MurmurHash64A (zero seed)',0,0),(34211,'MurmurHash64A truncated (zero seed)',0,0),(34300,'KeePass (KDBX v4)',0,1),(34400,'sha224(sha224($pass))',0,0),(34500,'sha224(sha1($pass))',0,0),(34600,'MD6 (256)',0,0),(34700,'Blockchain, My Wallet, Legacy Wallets',0,0),(34800,'BLAKE2b-256',0,0),(34810,'BLAKE2b-256($pass.$salt)',1,0),(34820,'BLAKE2b-256($salt.$pass)',1,0),(35000,'SAP CODVN H (PWDSALTEDHASH) isSHA512',1,1),(35100,'sm3crypt $sm3$, SM3 (Unix)',1,1),(35200,'AS/400 SSHA1',1,0),(70000,'Argon2id [Bridged: reference implementation + tunings]',0,1),(70100,'scrypt [Bridged: Scrypt-Jane SMix]',0,1),(70200,'scrypt [Bridged: Scrypt-Yescrypt]',0,1),(72000,'Generic Hash [Bridged: Python Interpreter free-threading]',0,1),(73000,'Generic Hash [Bridged: Python Interpreter with GIL]',0,1),(99999,'Plaintext',0,0); +/*!40000 ALTER TABLE `HashType` ENABLE KEYS */; +UNLOCK TABLES; + +-- +-- Table structure for table `Hashlist` +-- + +DROP TABLE IF EXISTS `Hashlist`; +/*!40101 SET @saved_cs_client = @@character_set_client */; +/*!50503 SET character_set_client = utf8mb4 */; +CREATE TABLE `Hashlist` ( + `hashlistId` int NOT NULL AUTO_INCREMENT, + `hashlistName` varchar(100) NOT NULL, + `format` int NOT NULL, + `hashTypeId` int NOT NULL, + `hashCount` int NOT NULL, + `saltSeparator` varchar(10) DEFAULT NULL, + `cracked` int NOT NULL, + `isSecret` tinyint NOT NULL, + `hexSalt` tinyint NOT NULL, + `isSalted` tinyint NOT NULL, + `accessGroupId` int NOT NULL, + `notes` text NOT NULL, + `brainId` int NOT NULL, + `brainFeatures` tinyint NOT NULL, + `isArchived` tinyint NOT NULL, + PRIMARY KEY (`hashlistId`), + KEY `hashTypeId` (`hashTypeId`), + KEY `Hashlist_ibfk_2` (`accessGroupId`), + KEY `isArchived` (`isArchived`,`hashlistId`), + CONSTRAINT `Hashlist_ibfk_1` FOREIGN KEY (`hashTypeId`) REFERENCES `HashType` (`hashTypeId`), + CONSTRAINT `Hashlist_ibfk_2` FOREIGN KEY (`accessGroupId`) REFERENCES `AccessGroup` (`accessGroupId`) +) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_0900_ai_ci; +/*!40101 SET character_set_client = @saved_cs_client */; + +-- +-- Dumping data for table `Hashlist` +-- + +LOCK TABLES `Hashlist` WRITE; +/*!40000 ALTER TABLE `Hashlist` DISABLE KEYS */; +/*!40000 ALTER TABLE `Hashlist` ENABLE KEYS */; +UNLOCK TABLES; + +-- +-- Table structure for table `HashlistHashlist` +-- + +DROP TABLE IF EXISTS `HashlistHashlist`; +/*!40101 SET @saved_cs_client = @@character_set_client */; +/*!50503 SET character_set_client = utf8mb4 */; +CREATE TABLE `HashlistHashlist` ( + `hashlistHashlistId` int NOT NULL AUTO_INCREMENT, + `parentHashlistId` int NOT NULL, + `hashlistId` int NOT NULL, + PRIMARY KEY (`hashlistHashlistId`), + KEY `parentHashlistId` (`parentHashlistId`), + KEY `hashlistId` (`hashlistId`), + CONSTRAINT `HashlistHashlist_ibfk_1` FOREIGN KEY (`parentHashlistId`) REFERENCES `Hashlist` (`hashlistId`), + CONSTRAINT `HashlistHashlist_ibfk_2` FOREIGN KEY (`hashlistId`) REFERENCES `Hashlist` (`hashlistId`) +) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_0900_ai_ci; +/*!40101 SET character_set_client = @saved_cs_client */; + +-- +-- Dumping data for table `HashlistHashlist` +-- + +LOCK TABLES `HashlistHashlist` WRITE; +/*!40000 ALTER TABLE `HashlistHashlist` DISABLE KEYS */; +/*!40000 ALTER TABLE `HashlistHashlist` ENABLE KEYS */; +UNLOCK TABLES; + +-- +-- Table structure for table `HealthCheck` +-- + +DROP TABLE IF EXISTS `HealthCheck`; +/*!40101 SET @saved_cs_client = @@character_set_client */; +/*!50503 SET character_set_client = utf8mb4 */; +CREATE TABLE `HealthCheck` ( + `healthCheckId` int NOT NULL AUTO_INCREMENT, + `time` bigint NOT NULL, + `status` int NOT NULL, + `checkType` int NOT NULL, + `hashtypeId` int NOT NULL, + `crackerBinaryId` int NOT NULL, + `expectedCracks` int NOT NULL, + `attackCmd` text NOT NULL, + PRIMARY KEY (`healthCheckId`), + KEY `HealthCheck_ibfk_1` (`crackerBinaryId`), + CONSTRAINT `HealthCheck_ibfk_1` FOREIGN KEY (`crackerBinaryId`) REFERENCES `CrackerBinary` (`crackerBinaryId`) +) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_0900_ai_ci; +/*!40101 SET character_set_client = @saved_cs_client */; + +-- +-- Dumping data for table `HealthCheck` +-- + +LOCK TABLES `HealthCheck` WRITE; +/*!40000 ALTER TABLE `HealthCheck` DISABLE KEYS */; +/*!40000 ALTER TABLE `HealthCheck` ENABLE KEYS */; +UNLOCK TABLES; + +-- +-- Table structure for table `HealthCheckAgent` +-- + +DROP TABLE IF EXISTS `HealthCheckAgent`; +/*!40101 SET @saved_cs_client = @@character_set_client */; +/*!50503 SET character_set_client = utf8mb4 */; +CREATE TABLE `HealthCheckAgent` ( + `healthCheckAgentId` int NOT NULL AUTO_INCREMENT, + `healthCheckId` int NOT NULL, + `agentId` int NOT NULL, + `status` int NOT NULL, + `cracked` int NOT NULL, + `numGpus` int NOT NULL, + `start` bigint NOT NULL, + `htp_end` bigint NOT NULL, + `errors` text NOT NULL, + PRIMARY KEY (`healthCheckAgentId`), + KEY `HealthCheckAgent_ibfk_1` (`agentId`), + KEY `HealthCheckAgent_ibfk_2` (`healthCheckId`), + CONSTRAINT `HealthCheckAgent_ibfk_1` FOREIGN KEY (`agentId`) REFERENCES `Agent` (`agentId`), + CONSTRAINT `HealthCheckAgent_ibfk_2` FOREIGN KEY (`healthCheckId`) REFERENCES `HealthCheck` (`healthCheckId`) +) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_0900_ai_ci; +/*!40101 SET character_set_client = @saved_cs_client */; + +-- +-- Dumping data for table `HealthCheckAgent` +-- + +LOCK TABLES `HealthCheckAgent` WRITE; +/*!40000 ALTER TABLE `HealthCheckAgent` DISABLE KEYS */; +/*!40000 ALTER TABLE `HealthCheckAgent` ENABLE KEYS */; +UNLOCK TABLES; + +-- +-- Table structure for table `JwtApiKey` +-- + +DROP TABLE IF EXISTS `JwtApiKey`; +/*!40101 SET @saved_cs_client = @@character_set_client */; +/*!50503 SET character_set_client = utf8mb4 */; +CREATE TABLE `JwtApiKey` ( + `jwtApiKeyId` int NOT NULL AUTO_INCREMENT, + `userId` int DEFAULT NULL, + `startValid` bigint NOT NULL, + `endValid` bigint NOT NULL, + `isRevoked` tinyint(1) NOT NULL DEFAULT '0', + PRIMARY KEY (`jwtApiKeyId`), + KEY `idx_jwtApiKey_userId` (`userId`), + CONSTRAINT `fk_jwtApiKey_user` FOREIGN KEY (`userId`) REFERENCES `htp_User` (`userId`) +) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_0900_ai_ci; +/*!40101 SET character_set_client = @saved_cs_client */; + +-- +-- Dumping data for table `JwtApiKey` +-- + +LOCK TABLES `JwtApiKey` WRITE; +/*!40000 ALTER TABLE `JwtApiKey` DISABLE KEYS */; +/*!40000 ALTER TABLE `JwtApiKey` ENABLE KEYS */; +UNLOCK TABLES; + +-- +-- Table structure for table `LogEntry` +-- + +DROP TABLE IF EXISTS `LogEntry`; +/*!40101 SET @saved_cs_client = @@character_set_client */; +/*!50503 SET character_set_client = utf8mb4 */; +CREATE TABLE `LogEntry` ( + `logEntryId` bigint NOT NULL AUTO_INCREMENT, + `issuer` varchar(50) NOT NULL, + `issuerId` varchar(50) NOT NULL, + `level` varchar(50) NOT NULL, + `message` text NOT NULL, + `time` bigint NOT NULL, + PRIMARY KEY (`logEntryId`) +) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_0900_ai_ci; +/*!40101 SET character_set_client = @saved_cs_client */; + +-- +-- Dumping data for table `LogEntry` +-- + +LOCK TABLES `LogEntry` WRITE; +/*!40000 ALTER TABLE `LogEntry` DISABLE KEYS */; +/*!40000 ALTER TABLE `LogEntry` ENABLE KEYS */; +UNLOCK TABLES; + +-- +-- Table structure for table `NotificationSetting` +-- + +DROP TABLE IF EXISTS `NotificationSetting`; +/*!40101 SET @saved_cs_client = @@character_set_client */; +/*!50503 SET character_set_client = utf8mb4 */; +CREATE TABLE `NotificationSetting` ( + `notificationSettingId` int NOT NULL AUTO_INCREMENT, + `action` varchar(50) NOT NULL, + `objectId` int DEFAULT NULL, + `notification` varchar(50) NOT NULL, + `userId` int NOT NULL, + `receiver` varchar(256) NOT NULL, + `isActive` tinyint NOT NULL, + PRIMARY KEY (`notificationSettingId`), + KEY `userId` (`userId`), + CONSTRAINT `NotificationSetting_ibfk_1` FOREIGN KEY (`userId`) REFERENCES `htp_User` (`userId`) +) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_0900_ai_ci; +/*!40101 SET character_set_client = @saved_cs_client */; + +-- +-- Dumping data for table `NotificationSetting` +-- + +LOCK TABLES `NotificationSetting` WRITE; +/*!40000 ALTER TABLE `NotificationSetting` DISABLE KEYS */; +/*!40000 ALTER TABLE `NotificationSetting` ENABLE KEYS */; +UNLOCK TABLES; + +-- +-- Table structure for table `Preprocessor` +-- + +DROP TABLE IF EXISTS `Preprocessor`; +/*!40101 SET @saved_cs_client = @@character_set_client */; +/*!50503 SET character_set_client = utf8mb4 */; +CREATE TABLE `Preprocessor` ( + `preprocessorId` int NOT NULL AUTO_INCREMENT, + `name` varchar(256) NOT NULL, + `url` varchar(512) NOT NULL, + `binaryName` varchar(256) NOT NULL, + `keyspaceCommand` varchar(256) DEFAULT NULL, + `skipCommand` varchar(256) DEFAULT NULL, + `limitCommand` varchar(256) DEFAULT NULL, + PRIMARY KEY (`preprocessorId`) +) ENGINE=InnoDB AUTO_INCREMENT=2 DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_0900_ai_ci; +/*!40101 SET character_set_client = @saved_cs_client */; + +-- +-- Dumping data for table `Preprocessor` +-- + +LOCK TABLES `Preprocessor` WRITE; +/*!40000 ALTER TABLE `Preprocessor` DISABLE KEYS */; +INSERT INTO `Preprocessor` VALUES (1,'Prince','https://github.com/hashcat/princeprocessor/releases/download/v0.22/princeprocessor-0.22.7z','pp','--keyspace','--skip','--limit'); +/*!40000 ALTER TABLE `Preprocessor` ENABLE KEYS */; +UNLOCK TABLES; + +-- +-- Table structure for table `Pretask` +-- + +DROP TABLE IF EXISTS `Pretask`; +/*!40101 SET @saved_cs_client = @@character_set_client */; +/*!50503 SET character_set_client = utf8mb4 */; +CREATE TABLE `Pretask` ( + `pretaskId` int NOT NULL AUTO_INCREMENT, + `taskName` varchar(100) NOT NULL, + `attackCmd` text NOT NULL, + `chunkTime` int NOT NULL, + `statusTimer` int NOT NULL, + `color` varchar(20) DEFAULT NULL, + `isSmall` tinyint NOT NULL, + `isCpuTask` tinyint NOT NULL, + `useNewBench` tinyint NOT NULL, + `priority` int NOT NULL, + `maxAgents` int NOT NULL, + `isMaskImport` tinyint NOT NULL, + `crackerBinaryTypeId` int NOT NULL, + PRIMARY KEY (`pretaskId`), + KEY `Pretask_ibfk_1` (`crackerBinaryTypeId`), + CONSTRAINT `Pretask_ibfk_1` FOREIGN KEY (`crackerBinaryTypeId`) REFERENCES `CrackerBinaryType` (`crackerBinaryTypeId`) +) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_0900_ai_ci; +/*!40101 SET character_set_client = @saved_cs_client */; + +-- +-- Dumping data for table `Pretask` +-- + +LOCK TABLES `Pretask` WRITE; +/*!40000 ALTER TABLE `Pretask` DISABLE KEYS */; +/*!40000 ALTER TABLE `Pretask` ENABLE KEYS */; +UNLOCK TABLES; + +-- +-- Table structure for table `RegVoucher` +-- + +DROP TABLE IF EXISTS `RegVoucher`; +/*!40101 SET @saved_cs_client = @@character_set_client */; +/*!50503 SET character_set_client = utf8mb4 */; +CREATE TABLE `RegVoucher` ( + `regVoucherId` int NOT NULL AUTO_INCREMENT, + `voucher` varchar(100) NOT NULL, + `time` bigint NOT NULL, + PRIMARY KEY (`regVoucherId`) +) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_0900_ai_ci; +/*!40101 SET character_set_client = @saved_cs_client */; + +-- +-- Dumping data for table `RegVoucher` +-- + +LOCK TABLES `RegVoucher` WRITE; +/*!40000 ALTER TABLE `RegVoucher` DISABLE KEYS */; +/*!40000 ALTER TABLE `RegVoucher` ENABLE KEYS */; +UNLOCK TABLES; + +-- +-- Table structure for table `RightGroup` +-- + +DROP TABLE IF EXISTS `RightGroup`; +/*!40101 SET @saved_cs_client = @@character_set_client */; +/*!50503 SET character_set_client = utf8mb4 */; +CREATE TABLE `RightGroup` ( + `rightGroupId` int NOT NULL AUTO_INCREMENT, + `groupName` varchar(50) NOT NULL, + `permissions` text NOT NULL, + PRIMARY KEY (`rightGroupId`) +) ENGINE=InnoDB AUTO_INCREMENT=2 DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_0900_ai_ci; +/*!40101 SET character_set_client = @saved_cs_client */; + +-- +-- Dumping data for table `RightGroup` +-- + +LOCK TABLES `RightGroup` WRITE; +/*!40000 ALTER TABLE `RightGroup` DISABLE KEYS */; +INSERT INTO `RightGroup` VALUES (1,'Administrator','ALL'); +/*!40000 ALTER TABLE `RightGroup` ENABLE KEYS */; +UNLOCK TABLES; + +-- +-- Table structure for table `Session` +-- + +DROP TABLE IF EXISTS `Session`; +/*!40101 SET @saved_cs_client = @@character_set_client */; +/*!50503 SET character_set_client = utf8mb4 */; +CREATE TABLE `Session` ( + `sessionId` int NOT NULL AUTO_INCREMENT, + `userId` int NOT NULL, + `sessionStartDate` bigint NOT NULL, + `lastActionDate` bigint NOT NULL, + `isOpen` tinyint NOT NULL, + `sessionLifetime` int NOT NULL, + `sessionKey` varchar(256) NOT NULL, + PRIMARY KEY (`sessionId`), + KEY `userId` (`userId`), + CONSTRAINT `Session_ibfk_1` FOREIGN KEY (`userId`) REFERENCES `htp_User` (`userId`) +) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_0900_ai_ci; +/*!40101 SET character_set_client = @saved_cs_client */; + +-- +-- Dumping data for table `Session` +-- + +LOCK TABLES `Session` WRITE; +/*!40000 ALTER TABLE `Session` DISABLE KEYS */; +/*!40000 ALTER TABLE `Session` ENABLE KEYS */; +UNLOCK TABLES; + +-- +-- Table structure for table `Speed` +-- + +DROP TABLE IF EXISTS `Speed`; +/*!40101 SET @saved_cs_client = @@character_set_client */; +/*!50503 SET character_set_client = utf8mb4 */; +CREATE TABLE `Speed` ( + `speedId` bigint NOT NULL AUTO_INCREMENT, + `agentId` int NOT NULL, + `taskId` int NOT NULL, + `speed` bigint NOT NULL, + `time` bigint NOT NULL, + PRIMARY KEY (`speedId`), + KEY `agentId` (`agentId`), + KEY `taskId` (`taskId`), + CONSTRAINT `Speed_ibfk_1` FOREIGN KEY (`agentId`) REFERENCES `Agent` (`agentId`), + CONSTRAINT `Speed_ibfk_2` FOREIGN KEY (`taskId`) REFERENCES `Task` (`taskId`) +) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_0900_ai_ci; +/*!40101 SET character_set_client = @saved_cs_client */; + +-- +-- Dumping data for table `Speed` +-- + +LOCK TABLES `Speed` WRITE; +/*!40000 ALTER TABLE `Speed` DISABLE KEYS */; +/*!40000 ALTER TABLE `Speed` ENABLE KEYS */; +UNLOCK TABLES; + +-- +-- Table structure for table `StoredValue` +-- + +DROP TABLE IF EXISTS `StoredValue`; +/*!40101 SET @saved_cs_client = @@character_set_client */; +/*!50503 SET character_set_client = utf8mb4 */; +CREATE TABLE `StoredValue` ( + `storedValueId` varchar(50) NOT NULL, + `val` varchar(256) NOT NULL, + PRIMARY KEY (`storedValueId`) +) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_0900_ai_ci; +/*!40101 SET character_set_client = @saved_cs_client */; + +-- +-- Dumping data for table `StoredValue` +-- + +LOCK TABLES `StoredValue` WRITE; +/*!40000 ALTER TABLE `StoredValue` DISABLE KEYS */; +/*!40000 ALTER TABLE `StoredValue` ENABLE KEYS */; +UNLOCK TABLES; + +-- +-- Table structure for table `Supertask` +-- + +DROP TABLE IF EXISTS `Supertask`; +/*!40101 SET @saved_cs_client = @@character_set_client */; +/*!50503 SET character_set_client = utf8mb4 */; +CREATE TABLE `Supertask` ( + `supertaskId` int NOT NULL AUTO_INCREMENT, + `supertaskName` varchar(50) NOT NULL, + PRIMARY KEY (`supertaskId`) +) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_0900_ai_ci; +/*!40101 SET character_set_client = @saved_cs_client */; + +-- +-- Dumping data for table `Supertask` +-- + +LOCK TABLES `Supertask` WRITE; +/*!40000 ALTER TABLE `Supertask` DISABLE KEYS */; +/*!40000 ALTER TABLE `Supertask` ENABLE KEYS */; +UNLOCK TABLES; + +-- +-- Table structure for table `SupertaskPretask` +-- + +DROP TABLE IF EXISTS `SupertaskPretask`; +/*!40101 SET @saved_cs_client = @@character_set_client */; +/*!50503 SET character_set_client = utf8mb4 */; +CREATE TABLE `SupertaskPretask` ( + `supertaskPretaskId` int NOT NULL AUTO_INCREMENT, + `supertaskId` int NOT NULL, + `pretaskId` int NOT NULL, + PRIMARY KEY (`supertaskPretaskId`), + KEY `supertaskId` (`supertaskId`), + KEY `pretaskId` (`pretaskId`), + CONSTRAINT `SupertaskPretask_ibfk_1` FOREIGN KEY (`supertaskId`) REFERENCES `Supertask` (`supertaskId`), + CONSTRAINT `SupertaskPretask_ibfk_2` FOREIGN KEY (`pretaskId`) REFERENCES `Pretask` (`pretaskId`) +) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_0900_ai_ci; +/*!40101 SET character_set_client = @saved_cs_client */; + +-- +-- Dumping data for table `SupertaskPretask` +-- + +LOCK TABLES `SupertaskPretask` WRITE; +/*!40000 ALTER TABLE `SupertaskPretask` DISABLE KEYS */; +/*!40000 ALTER TABLE `SupertaskPretask` ENABLE KEYS */; +UNLOCK TABLES; + +-- +-- Table structure for table `Task` +-- + +DROP TABLE IF EXISTS `Task`; +/*!40101 SET @saved_cs_client = @@character_set_client */; +/*!50503 SET character_set_client = utf8mb4 */; +CREATE TABLE `Task` ( + `taskId` int NOT NULL AUTO_INCREMENT, + `taskName` varchar(256) NOT NULL, + `attackCmd` text NOT NULL, + `chunkTime` int NOT NULL, + `statusTimer` int NOT NULL, + `keyspace` bigint NOT NULL, + `keyspaceProgress` bigint NOT NULL, + `priority` int NOT NULL, + `maxAgents` int NOT NULL, + `color` varchar(20) DEFAULT NULL, + `isSmall` tinyint NOT NULL, + `isCpuTask` tinyint NOT NULL, + `useNewBench` tinyint NOT NULL, + `skipKeyspace` bigint NOT NULL, + `crackerBinaryId` int DEFAULT NULL, + `crackerBinaryTypeId` int DEFAULT NULL, + `taskWrapperId` int NOT NULL, + `isArchived` tinyint NOT NULL, + `notes` text NOT NULL, + `staticChunks` int NOT NULL, + `chunkSize` bigint NOT NULL, + `forcePipe` tinyint NOT NULL, + `usePreprocessor` tinyint NOT NULL, + `preprocessorCommand` varchar(256) NOT NULL, + PRIMARY KEY (`taskId`), + KEY `crackerBinaryId` (`crackerBinaryId`), + KEY `Task_ibfk_2` (`crackerBinaryTypeId`), + KEY `Task_ibfk_3` (`taskWrapperId`), + KEY `isArchived_priority_taskId` (`isArchived`,`priority` DESC,`taskId`), + CONSTRAINT `Task_ibfk_1` FOREIGN KEY (`crackerBinaryId`) REFERENCES `CrackerBinary` (`crackerBinaryId`), + CONSTRAINT `Task_ibfk_2` FOREIGN KEY (`crackerBinaryTypeId`) REFERENCES `CrackerBinaryType` (`crackerBinaryTypeId`), + CONSTRAINT `Task_ibfk_3` FOREIGN KEY (`taskWrapperId`) REFERENCES `TaskWrapper` (`taskWrapperId`) +) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_0900_ai_ci; +/*!40101 SET character_set_client = @saved_cs_client */; + +-- +-- Dumping data for table `Task` +-- + +LOCK TABLES `Task` WRITE; +/*!40000 ALTER TABLE `Task` DISABLE KEYS */; +/*!40000 ALTER TABLE `Task` ENABLE KEYS */; +UNLOCK TABLES; + +-- +-- Table structure for table `TaskDebugOutput` +-- + +DROP TABLE IF EXISTS `TaskDebugOutput`; +/*!40101 SET @saved_cs_client = @@character_set_client */; +/*!50503 SET character_set_client = utf8mb4 */; +CREATE TABLE `TaskDebugOutput` ( + `taskDebugOutputId` int NOT NULL AUTO_INCREMENT, + `taskId` int NOT NULL, + `output` varchar(256) NOT NULL, + PRIMARY KEY (`taskDebugOutputId`), + KEY `TaskDebugOutput_ibfk_1` (`taskId`), + CONSTRAINT `TaskDebugOutput_ibfk_1` FOREIGN KEY (`taskId`) REFERENCES `Task` (`taskId`) +) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_0900_ai_ci; +/*!40101 SET character_set_client = @saved_cs_client */; + +-- +-- Dumping data for table `TaskDebugOutput` +-- + +LOCK TABLES `TaskDebugOutput` WRITE; +/*!40000 ALTER TABLE `TaskDebugOutput` DISABLE KEYS */; +/*!40000 ALTER TABLE `TaskDebugOutput` ENABLE KEYS */; +UNLOCK TABLES; + +-- +-- Table structure for table `TaskWrapper` +-- + +DROP TABLE IF EXISTS `TaskWrapper`; +/*!40101 SET @saved_cs_client = @@character_set_client */; +/*!50503 SET character_set_client = utf8mb4 */; +CREATE TABLE `TaskWrapper` ( + `taskWrapperId` int NOT NULL AUTO_INCREMENT, + `priority` int NOT NULL, + `maxAgents` int NOT NULL, + `taskType` int NOT NULL, + `hashlistId` int NOT NULL, + `accessGroupId` int DEFAULT NULL, + `taskWrapperName` varchar(100) NOT NULL, + `isArchived` tinyint NOT NULL, + `cracked` int NOT NULL, + PRIMARY KEY (`taskWrapperId`), + KEY `hashlistId` (`hashlistId`), + KEY `priority` (`priority`), + KEY `accessGroupId` (`accessGroupId`), + KEY `isArchived_priority_taskWrapperId` (`isArchived`,`priority` DESC,`taskWrapperId`), + CONSTRAINT `TaskWrapper_ibfk_1` FOREIGN KEY (`hashlistId`) REFERENCES `Hashlist` (`hashlistId`), + CONSTRAINT `TaskWrapper_ibfk_2` FOREIGN KEY (`accessGroupId`) REFERENCES `AccessGroup` (`accessGroupId`) +) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_0900_ai_ci; +/*!40101 SET character_set_client = @saved_cs_client */; + +-- +-- Dumping data for table `TaskWrapper` +-- + +LOCK TABLES `TaskWrapper` WRITE; +/*!40000 ALTER TABLE `TaskWrapper` DISABLE KEYS */; +/*!40000 ALTER TABLE `TaskWrapper` ENABLE KEYS */; +UNLOCK TABLES; + +-- +-- Temporary view structure for view `TaskWrapperDisplay` +-- + +DROP TABLE IF EXISTS `TaskWrapperDisplay`; +/*!50001 DROP VIEW IF EXISTS `TaskWrapperDisplay`*/; +SET @saved_cs_client = @@character_set_client; +/*!50503 SET character_set_client = utf8mb4 */; +/*!50001 CREATE VIEW `TaskWrapperDisplay` AS SELECT + 1 AS `taskWrapperId`, + 1 AS `taskWrapperPriority`, + 1 AS `taskWrapperMaxAgents`, + 1 AS `taskType`, + 1 AS `hashlistId`, + 1 AS `accessGroupId`, + 1 AS `taskWrapperName`, + 1 AS `taskWrapperIsArchived`, + 1 AS `cracked`, + 1 AS `taskId`, + 1 AS `taskName`, + 1 AS `attackCmd`, + 1 AS `chunkTime`, + 1 AS `statusTimer`, + 1 AS `keyspace`, + 1 AS `keyspaceProgress`, + 1 AS `taskPriority`, + 1 AS `taskMaxAgents`, + 1 AS `taskIsArchived`, + 1 AS `isSmall`, + 1 AS `isCpuTask`, + 1 AS `taskUsePreprocessor`, + 1 AS `displayName`, + 1 AS `hashlistName`, + 1 AS `hashCount`, + 1 AS `hashlistCracked`, + 1 AS `hashTypeId`, + 1 AS `hashTypeDescription`, + 1 AS `groupName`, + 1 AS `color`*/; +SET character_set_client = @saved_cs_client; + +-- +-- Table structure for table `Zap` +-- + +DROP TABLE IF EXISTS `Zap`; +/*!40101 SET @saved_cs_client = @@character_set_client */; +/*!50503 SET character_set_client = utf8mb4 */; +CREATE TABLE `Zap` ( + `zapId` int NOT NULL AUTO_INCREMENT, + `hash` mediumtext NOT NULL, + `solveTime` bigint NOT NULL, + `agentId` int DEFAULT NULL, + `hashlistId` int NOT NULL, + PRIMARY KEY (`zapId`), + KEY `agentId` (`agentId`), + KEY `hashlistId` (`hashlistId`), + CONSTRAINT `Zap_ibfk_1` FOREIGN KEY (`agentId`) REFERENCES `Agent` (`agentId`), + CONSTRAINT `Zap_ibfk_2` FOREIGN KEY (`hashlistId`) REFERENCES `Hashlist` (`hashlistId`) +) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_0900_ai_ci; +/*!40101 SET character_set_client = @saved_cs_client */; + +-- +-- Dumping data for table `Zap` +-- + +LOCK TABLES `Zap` WRITE; +/*!40000 ALTER TABLE `Zap` DISABLE KEYS */; +/*!40000 ALTER TABLE `Zap` ENABLE KEYS */; +UNLOCK TABLES; + +-- +-- Table structure for table `htp_User` +-- + +DROP TABLE IF EXISTS `htp_User`; +/*!40101 SET @saved_cs_client = @@character_set_client */; +/*!50503 SET character_set_client = utf8mb4 */; +CREATE TABLE `htp_User` ( + `userId` int NOT NULL AUTO_INCREMENT, + `username` varchar(100) NOT NULL, + `email` varchar(150) NOT NULL, + `passwordHash` varchar(256) NOT NULL, + `passwordSalt` varchar(256) NOT NULL, + `isValid` tinyint NOT NULL, + `isComputedPassword` tinyint NOT NULL, + `lastLoginDate` bigint NOT NULL, + `registeredSince` bigint NOT NULL, + `sessionLifetime` int NOT NULL, + `rightGroupId` int NOT NULL, + `yubikey` varchar(256) DEFAULT NULL, + `otp1` varchar(256) DEFAULT NULL, + `otp2` varchar(256) DEFAULT NULL, + `otp3` varchar(256) DEFAULT NULL, + `otp4` varchar(256) DEFAULT NULL, + PRIMARY KEY (`userId`), + UNIQUE KEY `username` (`username`), + KEY `rightGroupId` (`rightGroupId`), + CONSTRAINT `User_ibfk_1` FOREIGN KEY (`rightGroupId`) REFERENCES `RightGroup` (`rightGroupId`) +) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_0900_ai_ci; +/*!40101 SET character_set_client = @saved_cs_client */; + +-- +-- Dumping data for table `htp_User` +-- + +LOCK TABLES `htp_User` WRITE; +/*!40000 ALTER TABLE `htp_User` DISABLE KEYS */; +/*!40000 ALTER TABLE `htp_User` ENABLE KEYS */; +UNLOCK TABLES; + +-- +-- Final view structure for view `TaskWrapperDisplay` +-- + +/*!50001 DROP VIEW IF EXISTS `TaskWrapperDisplay`*/; +/*!50001 SET @saved_cs_client = @@character_set_client */; +/*!50001 SET @saved_cs_results = @@character_set_results */; +/*!50001 SET @saved_col_connection = @@collation_connection */; +/*!50001 SET character_set_client = utf8mb4 */; +/*!50001 SET character_set_results = utf8mb4 */; +/*!50001 SET collation_connection = utf8mb4_0900_ai_ci */; +/*!50001 CREATE ALGORITHM=UNDEFINED */ +/*!50013 DEFINER=`hashtopolis`@`%` SQL SECURITY DEFINER */ +/*!50001 VIEW `TaskWrapperDisplay` AS select `tw`.`taskWrapperId` AS `taskWrapperId`,`tw`.`priority` AS `taskWrapperPriority`,`tw`.`maxAgents` AS `taskWrapperMaxAgents`,`tw`.`taskType` AS `taskType`,`tw`.`hashlistId` AS `hashlistId`,`tw`.`accessGroupId` AS `accessGroupId`,`tw`.`taskWrapperName` AS `taskWrapperName`,`tw`.`isArchived` AS `taskWrapperIsArchived`,`tw`.`cracked` AS `cracked`,`t`.`taskId` AS `taskId`,`t`.`taskName` AS `taskName`,`t`.`attackCmd` AS `attackCmd`,`t`.`chunkTime` AS `chunkTime`,`t`.`statusTimer` AS `statusTimer`,`t`.`keyspace` AS `keyspace`,`t`.`keyspaceProgress` AS `keyspaceProgress`,`t`.`priority` AS `taskPriority`,`t`.`maxAgents` AS `taskMaxAgents`,`t`.`isArchived` AS `taskIsArchived`,`t`.`isSmall` AS `isSmall`,`t`.`isCpuTask` AS `isCpuTask`,`t`.`usePreprocessor` AS `taskUsePreprocessor`,(case when (`tw`.`taskType` = 0) then `t`.`taskName` else `tw`.`taskWrapperName` end) AS `displayName`,`h`.`hashlistName` AS `hashlistName`,`h`.`hashCount` AS `hashCount`,`h`.`cracked` AS `hashlistCracked`,`ht`.`hashTypeId` AS `hashTypeId`,`ht`.`description` AS `hashTypeDescription`,`ag`.`groupName` AS `groupName`,`t`.`color` AS `color` from ((((`TaskWrapper` `tw` left join `Task` `t` on(((`tw`.`taskType` = 0) and (`t`.`taskWrapperId` = `tw`.`taskWrapperId`)))) join `Hashlist` `h` on((`tw`.`hashlistId` = `h`.`hashlistId`))) join `HashType` `ht` on((`h`.`hashTypeId` = `ht`.`hashTypeId`))) join `AccessGroup` `ag` on((`tw`.`accessGroupId` = `ag`.`accessGroupId`))) */; +/*!50001 SET character_set_client = @saved_cs_client */; +/*!50001 SET character_set_results = @saved_cs_results */; +/*!50001 SET collation_connection = @saved_col_connection */; +/*!40103 SET TIME_ZONE=@OLD_TIME_ZONE */; + +/*!40101 SET SQL_MODE=@OLD_SQL_MODE */; +/*!40014 SET FOREIGN_KEY_CHECKS=@OLD_FOREIGN_KEY_CHECKS */; +/*!40014 SET UNIQUE_CHECKS=@OLD_UNIQUE_CHECKS */; +/*!40101 SET CHARACTER_SET_CLIENT=@OLD_CHARACTER_SET_CLIENT */; +/*!40101 SET CHARACTER_SET_RESULTS=@OLD_CHARACTER_SET_RESULTS */; +/*!40101 SET COLLATION_CONNECTION=@OLD_COLLATION_CONNECTION */; +/*!40111 SET SQL_NOTES=@OLD_SQL_NOTES */; diff --git a/src/migrations/mysql/config.json b/src/migrations/mysql/config.json new file mode 100644 index 000000000..d0b2d0983 --- /dev/null +++ b/src/migrations/mysql/config.json @@ -0,0 +1,6 @@ +{ + "version": 20260619090219, + "description": "initial", + "installed_on": "2026-06-19 10:29:13", + "checksum": "4376accd2c364333534991027e5d8c44a358dfd55415a5bc363c5bc74667d6c4b5146c29cd417ca61f680ab7695502e2" +} \ No newline at end of file diff --git a/src/migrations/postgres/20251127000000_initial.sql b/src/migrations/postgres.1/20251127000000_initial.sql similarity index 100% rename from src/migrations/postgres/20251127000000_initial.sql rename to src/migrations/postgres.1/20251127000000_initial.sql diff --git a/src/migrations/postgres/20251209091723_postgres-index-fix.sql b/src/migrations/postgres.1/20251209091723_postgres-index-fix.sql similarity index 100% rename from src/migrations/postgres/20251209091723_postgres-index-fix.sql rename to src/migrations/postgres.1/20251209091723_postgres-index-fix.sql diff --git a/src/migrations/postgres/20260116140300_bigint-keys-stats.sql b/src/migrations/postgres.1/20260116140300_bigint-keys-stats.sql similarity index 100% rename from src/migrations/postgres/20260116140300_bigint-keys-stats.sql rename to src/migrations/postgres.1/20260116140300_bigint-keys-stats.sql diff --git a/src/migrations/postgres/20260212113000_indexes.sql b/src/migrations/postgres.1/20260212113000_indexes.sql similarity index 100% rename from src/migrations/postgres/20260212113000_indexes.sql rename to src/migrations/postgres.1/20260212113000_indexes.sql diff --git a/src/migrations/postgres/20260302144000_cracker-binary-type.sql b/src/migrations/postgres.1/20260302144000_cracker-binary-type.sql similarity index 100% rename from src/migrations/postgres/20260302144000_cracker-binary-type.sql rename to src/migrations/postgres.1/20260302144000_cracker-binary-type.sql diff --git a/src/migrations/postgres/20260309164000_api-key.sql b/src/migrations/postgres.1/20260309164000_api-key.sql similarity index 100% rename from src/migrations/postgres/20260309164000_api-key.sql rename to src/migrations/postgres.1/20260309164000_api-key.sql diff --git a/src/migrations/postgres/20260317120000_remove-rule-split.sql b/src/migrations/postgres.1/20260317120000_remove-rule-split.sql similarity index 100% rename from src/migrations/postgres/20260317120000_remove-rule-split.sql rename to src/migrations/postgres.1/20260317120000_remove-rule-split.sql diff --git a/src/migrations/postgres/20260413140000_task-view.sql b/src/migrations/postgres.1/20260413140000_task-view.sql similarity index 100% rename from src/migrations/postgres/20260413140000_task-view.sql rename to src/migrations/postgres.1/20260413140000_task-view.sql diff --git a/src/migrations/postgres/20260518102000_task-view-add-color-field.sql b/src/migrations/postgres.1/20260518102000_task-view-add-color-field.sql similarity index 100% rename from src/migrations/postgres/20260518102000_task-view-add-color-field.sql rename to src/migrations/postgres.1/20260518102000_task-view-add-color-field.sql diff --git a/src/migrations/postgres/20260520145000_mysql-autoincrement.sql b/src/migrations/postgres.1/20260520145000_mysql-autoincrement.sql similarity index 100% rename from src/migrations/postgres/20260520145000_mysql-autoincrement.sql rename to src/migrations/postgres.1/20260520145000_mysql-autoincrement.sql diff --git a/src/migrations/postgres/20260602074349_mysql-autoincrement-fix.sql b/src/migrations/postgres.1/20260602074349_mysql-autoincrement-fix.sql similarity index 100% rename from src/migrations/postgres/20260602074349_mysql-autoincrement-fix.sql rename to src/migrations/postgres.1/20260602074349_mysql-autoincrement-fix.sql diff --git a/src/migrations/postgres/20260617130352_blacklist-chars-sync.sql b/src/migrations/postgres.1/20260617130352_blacklist-chars-sync.sql similarity index 100% rename from src/migrations/postgres/20260617130352_blacklist-chars-sync.sql rename to src/migrations/postgres.1/20260617130352_blacklist-chars-sync.sql diff --git a/src/migrations/postgres.1/config.json b/src/migrations/postgres.1/config.json new file mode 100644 index 000000000..54663c351 --- /dev/null +++ b/src/migrations/postgres.1/config.json @@ -0,0 +1,6 @@ +{ + "version": 20251127000000, + "description": "initial", + "installed_on": "2025-11-28 14:29:13", + "checksum": "c6b69a409a71bdaead2cc094d71bcf15d41e697777362ed5eb8278db8630e153dbb0f17daebaf3238c2d300659868977" +} \ No newline at end of file diff --git a/src/migrations/postgres/20260619090219_initial.sql b/src/migrations/postgres/20260619090219_initial.sql new file mode 100644 index 000000000..2252ead19 --- /dev/null +++ b/src/migrations/postgres/20260619090219_initial.sql @@ -0,0 +1,3432 @@ +-- initial db for this generation + +-- +-- Name: accessgroup; Type: TABLE; +-- + +CREATE TABLE accessgroup ( + accessgroupid integer NOT NULL, + groupname text NOT NULL +); + +-- +-- Name: accessgroup_accessgroupid_seq; Type: SEQUENCE; +-- + +CREATE SEQUENCE accessgroup_accessgroupid_seq + AS integer + START WITH 1 + INCREMENT BY 1 + NO MINVALUE + NO MAXVALUE + CACHE 1; + +-- +-- Name: accessgroupagent; Type: TABLE; +-- + +CREATE TABLE accessgroupagent ( + accessgroupagentid integer NOT NULL, + accessgroupid integer NOT NULL, + agentid integer NOT NULL +); + +-- +-- Name: accessgroupagent_accessgroupagentid_seq; Type: SEQUENCE; +-- + +CREATE SEQUENCE accessgroupagent_accessgroupagentid_seq + AS integer + START WITH 1 + INCREMENT BY 1 + NO MINVALUE + NO MAXVALUE + CACHE 1; + +-- +-- Name: accessgroupuser; Type: TABLE; +-- + +CREATE TABLE accessgroupuser ( + accessgroupuserid integer NOT NULL, + accessgroupid integer NOT NULL, + userid integer NOT NULL +); + +-- +-- Name: accessgroupuser_accessgroupuserid_seq; Type: SEQUENCE; +-- + +CREATE SEQUENCE accessgroupuser_accessgroupuserid_seq + AS integer + START WITH 1 + INCREMENT BY 1 + NO MINVALUE + NO MAXVALUE + CACHE 1; + +-- +-- Name: agent; Type: TABLE; +-- + +CREATE TABLE agent ( + agentid integer NOT NULL, + agentname text NOT NULL, + uid text NOT NULL, + os integer NOT NULL, + devices text NOT NULL, + cmdpars text NOT NULL, + ignoreerrors integer NOT NULL, + isactive integer NOT NULL, + istrusted integer NOT NULL, + token text NOT NULL, + lastact text NOT NULL, + lasttime bigint NOT NULL, + lastip text NOT NULL, + userid integer, + cpuonly integer NOT NULL, + clientsignature text NOT NULL +); + +-- +-- Name: agent_agentid_seq; Type: SEQUENCE; +-- + +CREATE SEQUENCE agent_agentid_seq + AS integer + START WITH 1 + INCREMENT BY 1 + NO MINVALUE + NO MAXVALUE + CACHE 1; + +-- +-- Name: agentbinary; Type: TABLE; +-- + +CREATE TABLE agentbinary ( + agentbinaryid integer NOT NULL, + binarytype text NOT NULL, + version text NOT NULL, + operatingsystems text NOT NULL, + filename text NOT NULL, + updatetrack text NOT NULL, + updateavailable text NOT NULL +); + +-- +-- Name: agentbinary_agentbinaryid_seq; Type: SEQUENCE; +-- + +CREATE SEQUENCE agentbinary_agentbinaryid_seq + AS integer + START WITH 1 + INCREMENT BY 1 + NO MINVALUE + NO MAXVALUE + CACHE 1; + +-- +-- Name: agenterror; Type: TABLE; +-- + +CREATE TABLE agenterror ( + agenterrorid integer NOT NULL, + agentid integer NOT NULL, + taskid integer, + "time" bigint NOT NULL, + error text NOT NULL, + chunkid integer +); + +-- +-- Name: agenterror_agenterrorid_seq; Type: SEQUENCE; +-- + +CREATE SEQUENCE agenterror_agenterrorid_seq + AS integer + START WITH 1 + INCREMENT BY 1 + NO MINVALUE + NO MAXVALUE + CACHE 1; + +-- +-- Name: agentstat; Type: TABLE; +-- + +CREATE TABLE agentstat ( + agentstatid bigint NOT NULL, + agentid integer NOT NULL, + stattype integer NOT NULL, + "time" bigint NOT NULL, + value text NOT NULL +); + +-- +-- Name: agentstat_agentstatid_seq; Type: SEQUENCE; +-- + +CREATE SEQUENCE agentstat_agentstatid_seq + START WITH 1 + INCREMENT BY 1 + NO MINVALUE + NO MAXVALUE + CACHE 1; + +-- +-- Name: agentzap; Type: TABLE; +-- + +CREATE TABLE agentzap ( + agentzapid integer NOT NULL, + agentid integer NOT NULL, + lastzapid integer +); + +-- +-- Name: agentzap_agentzapid_seq; Type: SEQUENCE; +-- + +CREATE SEQUENCE agentzap_agentzapid_seq + AS integer + START WITH 1 + INCREMENT BY 1 + NO MINVALUE + NO MAXVALUE + CACHE 1; + +-- +-- Name: apigroup; Type: TABLE; +-- + +CREATE TABLE apigroup ( + apigroupid integer NOT NULL, + name text NOT NULL, + permissions text NOT NULL +); + +-- +-- Name: apigroup_apigroupid_seq; Type: SEQUENCE; +-- + +CREATE SEQUENCE apigroup_apigroupid_seq + AS integer + START WITH 1 + INCREMENT BY 1 + NO MINVALUE + NO MAXVALUE + CACHE 1; + +-- +-- Name: apikey; Type: TABLE; +-- + +CREATE TABLE apikey ( + apikeyid integer NOT NULL, + startvalid bigint NOT NULL, + endvalid bigint NOT NULL, + accesskey text NOT NULL, + accesscount integer NOT NULL, + userid integer NOT NULL, + apigroupid integer NOT NULL +); + +-- +-- Name: apikey_apikeyid_seq; Type: SEQUENCE; +-- + +CREATE SEQUENCE apikey_apikeyid_seq + AS integer + START WITH 1 + INCREMENT BY 1 + NO MINVALUE + NO MAXVALUE + CACHE 1; + +-- +-- Name: assignment; Type: TABLE; +-- + +CREATE TABLE assignment ( + assignmentid integer NOT NULL, + taskid integer NOT NULL, + agentid integer NOT NULL, + benchmark text NOT NULL +); + +-- +-- Name: assignment_assignmentid_seq; Type: SEQUENCE; +-- + +CREATE SEQUENCE assignment_assignmentid_seq + AS integer + START WITH 1 + INCREMENT BY 1 + NO MINVALUE + NO MAXVALUE + CACHE 1; + +-- +-- Name: chunk; Type: TABLE; +-- + +CREATE TABLE chunk ( + chunkid integer NOT NULL, + taskid integer NOT NULL, + skip bigint NOT NULL, + length bigint NOT NULL, + agentid integer, + dispatchtime bigint NOT NULL, + solvetime bigint NOT NULL, + checkpoint bigint NOT NULL, + progress integer, + state integer NOT NULL, + cracked integer NOT NULL, + speed bigint NOT NULL +); + +-- +-- Name: chunk_chunkid_seq; Type: SEQUENCE; +-- + +CREATE SEQUENCE chunk_chunkid_seq + AS integer + START WITH 1 + INCREMENT BY 1 + NO MINVALUE + NO MAXVALUE + CACHE 1; + +-- +-- Name: config; Type: TABLE; +-- + +CREATE TABLE config ( + configid integer NOT NULL, + configsectionid integer NOT NULL, + item text NOT NULL, + value text NOT NULL +); + +-- +-- Name: config_configid_seq; Type: SEQUENCE; +-- + +CREATE SEQUENCE config_configid_seq + AS integer + START WITH 1 + INCREMENT BY 1 + NO MINVALUE + NO MAXVALUE + CACHE 1; + +-- +-- Name: configsection; Type: TABLE; +-- + +CREATE TABLE configsection ( + configsectionid integer NOT NULL, + sectionname text NOT NULL +); + +-- +-- Name: configsection_configsectionid_seq; Type: SEQUENCE; +-- + +CREATE SEQUENCE configsection_configsectionid_seq + AS integer + START WITH 1 + INCREMENT BY 1 + NO MINVALUE + NO MAXVALUE + CACHE 1; + +-- +-- Name: crackerbinary; Type: TABLE; +-- + +CREATE TABLE crackerbinary ( + crackerbinaryid integer NOT NULL, + crackerbinarytypeid integer NOT NULL, + version text NOT NULL, + downloadurl text NOT NULL, + binaryname text NOT NULL +); + +-- +-- Name: crackerbinary_crackerbinaryid_seq; Type: SEQUENCE; +-- + +CREATE SEQUENCE crackerbinary_crackerbinaryid_seq + AS integer + START WITH 1 + INCREMENT BY 1 + NO MINVALUE + NO MAXVALUE + CACHE 1; + +-- +-- Name: crackerbinarytype; Type: TABLE; +-- + +CREATE TABLE crackerbinarytype ( + crackerbinarytypeid integer NOT NULL, + typename text NOT NULL, + ischunkingavailable integer NOT NULL +); + +-- +-- Name: crackerbinarytype_crackerbinarytypeid_seq; Type: SEQUENCE; +-- + +CREATE SEQUENCE crackerbinarytype_crackerbinarytypeid_seq + AS integer + START WITH 1 + INCREMENT BY 1 + NO MINVALUE + NO MAXVALUE + CACHE 1; + +-- +-- Name: file; Type: TABLE; +-- + +CREATE TABLE file ( + fileid integer NOT NULL, + filename text NOT NULL, + size bigint NOT NULL, + issecret integer NOT NULL, + filetype integer NOT NULL, + accessgroupid integer NOT NULL, + linecount bigint +); + +-- +-- Name: file_fileid_seq; Type: SEQUENCE; +-- + +CREATE SEQUENCE file_fileid_seq + AS integer + START WITH 1 + INCREMENT BY 1 + NO MINVALUE + NO MAXVALUE + CACHE 1; + +-- +-- Name: filedelete; Type: TABLE; +-- + +CREATE TABLE filedelete ( + filedeleteid integer NOT NULL, + filename text NOT NULL, + "time" bigint NOT NULL +); + +-- +-- Name: filedelete_filedeleteid_seq; Type: SEQUENCE; +-- + +CREATE SEQUENCE filedelete_filedeleteid_seq + AS integer + START WITH 1 + INCREMENT BY 1 + NO MINVALUE + NO MAXVALUE + CACHE 1; + +-- +-- Name: filedownload; Type: TABLE; +-- + +CREATE TABLE filedownload ( + filedownloadid integer NOT NULL, + "time" bigint NOT NULL, + fileid integer NOT NULL, + status integer NOT NULL +); + +-- +-- Name: filedownload_filedownloadid_seq; Type: SEQUENCE; +-- + +CREATE SEQUENCE filedownload_filedownloadid_seq + AS integer + START WITH 1 + INCREMENT BY 1 + NO MINVALUE + NO MAXVALUE + CACHE 1; + +-- +-- Name: filepretask; Type: TABLE; +-- + +CREATE TABLE filepretask ( + filepretaskid integer NOT NULL, + fileid integer NOT NULL, + pretaskid integer NOT NULL +); + +-- +-- Name: filepretask_filepretaskid_seq; Type: SEQUENCE; +-- + +CREATE SEQUENCE filepretask_filepretaskid_seq + AS integer + START WITH 1 + INCREMENT BY 1 + NO MINVALUE + NO MAXVALUE + CACHE 1; + +-- +-- Name: filetask; Type: TABLE; +-- + +CREATE TABLE filetask ( + filetaskid integer NOT NULL, + fileid integer NOT NULL, + taskid integer NOT NULL +); + +-- +-- Name: filetask_filetaskid_seq; Type: SEQUENCE; +-- + +CREATE SEQUENCE filetask_filetaskid_seq + AS integer + START WITH 1 + INCREMENT BY 1 + NO MINVALUE + NO MAXVALUE + CACHE 1; + +-- +-- Name: hash; Type: TABLE; +-- + +CREATE TABLE hash ( + hashid integer NOT NULL, + hashlistid integer NOT NULL, + hash text NOT NULL, + salt text, + plaintext text, + timecracked bigint, + chunkid integer, + iscracked integer NOT NULL, + crackpos bigint NOT NULL +); + +-- +-- Name: hash_hashid_seq; Type: SEQUENCE; +-- + +CREATE SEQUENCE hash_hashid_seq + AS integer + START WITH 1 + INCREMENT BY 1 + NO MINVALUE + NO MAXVALUE + CACHE 1; + +-- +-- Name: hashbinary; Type: TABLE; +-- + +CREATE TABLE hashbinary ( + hashbinaryid integer NOT NULL, + hashlistid integer NOT NULL, + essid text NOT NULL, + hash text NOT NULL, + plaintext text, + timecracked bigint, + chunkid integer, + iscracked integer NOT NULL, + crackpos bigint NOT NULL +); + +-- +-- Name: hashbinary_hashbinaryid_seq; Type: SEQUENCE; +-- + +CREATE SEQUENCE hashbinary_hashbinaryid_seq + AS integer + START WITH 1 + INCREMENT BY 1 + NO MINVALUE + NO MAXVALUE + CACHE 1; + +-- +-- Name: hashlist; Type: TABLE; +-- + +CREATE TABLE hashlist ( + hashlistid integer NOT NULL, + hashlistname text NOT NULL, + format integer NOT NULL, + hashtypeid integer NOT NULL, + hashcount integer NOT NULL, + saltseparator text, + cracked integer NOT NULL, + issecret integer NOT NULL, + hexsalt integer NOT NULL, + issalted integer NOT NULL, + accessgroupid integer NOT NULL, + notes text NOT NULL, + brainid integer NOT NULL, + brainfeatures integer NOT NULL, + isarchived integer NOT NULL +); + +-- +-- Name: hashlist_hashlistid_seq; Type: SEQUENCE; +-- + +CREATE SEQUENCE hashlist_hashlistid_seq + AS integer + START WITH 1 + INCREMENT BY 1 + NO MINVALUE + NO MAXVALUE + CACHE 1; + +-- +-- Name: hashlisthashlist; Type: TABLE; +-- + +CREATE TABLE hashlisthashlist ( + hashlisthashlistid integer NOT NULL, + parenthashlistid integer NOT NULL, + hashlistid integer NOT NULL +); + +-- +-- Name: hashlisthashlist_hashlisthashlistid_seq; Type: SEQUENCE; +-- + +CREATE SEQUENCE hashlisthashlist_hashlisthashlistid_seq + AS integer + START WITH 1 + INCREMENT BY 1 + NO MINVALUE + NO MAXVALUE + CACHE 1; + +-- +-- Name: hashtype; Type: TABLE; +-- + +CREATE TABLE hashtype ( + hashtypeid integer NOT NULL, + description text NOT NULL, + issalted integer NOT NULL, + isslowhash integer NOT NULL +); + +-- +-- Name: hashtype_hashtypeid_seq; Type: SEQUENCE; +-- + +CREATE SEQUENCE hashtype_hashtypeid_seq + AS integer + START WITH 1 + INCREMENT BY 1 + NO MINVALUE + NO MAXVALUE + CACHE 1; + +-- +-- Name: healthcheck; Type: TABLE; +-- + +CREATE TABLE healthcheck ( + healthcheckid integer NOT NULL, + "time" bigint NOT NULL, + status integer NOT NULL, + checktype integer NOT NULL, + hashtypeid integer NOT NULL, + crackerbinaryid integer NOT NULL, + expectedcracks integer NOT NULL, + attackcmd text NOT NULL +); + +-- +-- Name: healthcheck_healthcheckid_seq; Type: SEQUENCE; +-- + +CREATE SEQUENCE healthcheck_healthcheckid_seq + AS integer + START WITH 1 + INCREMENT BY 1 + NO MINVALUE + NO MAXVALUE + CACHE 1; + +-- +-- Name: healthcheckagent; Type: TABLE; +-- + +CREATE TABLE healthcheckagent ( + healthcheckagentid integer NOT NULL, + healthcheckid integer NOT NULL, + agentid integer NOT NULL, + status integer NOT NULL, + cracked integer NOT NULL, + numgpus integer NOT NULL, + start bigint NOT NULL, + htp_end bigint NOT NULL, + errors text NOT NULL +); + +-- +-- Name: healthcheckagent_healthcheckagentid_seq; Type: SEQUENCE; +-- + +CREATE SEQUENCE healthcheckagent_healthcheckagentid_seq + AS integer + START WITH 1 + INCREMENT BY 1 + NO MINVALUE + NO MAXVALUE + CACHE 1; + +-- +-- Name: htp_user; Type: TABLE; +-- + +CREATE TABLE htp_user ( + userid integer NOT NULL, + username text NOT NULL, + email text NOT NULL, + passwordhash text NOT NULL, + passwordsalt text NOT NULL, + isvalid integer NOT NULL, + iscomputedpassword integer NOT NULL, + lastlogindate bigint NOT NULL, + registeredsince bigint NOT NULL, + sessionlifetime integer NOT NULL, + rightgroupid integer NOT NULL, + yubikey text, + otp1 text, + otp2 text, + otp3 text, + otp4 text +); + +-- +-- Name: htp_user_userid_seq; Type: SEQUENCE; +-- + +CREATE SEQUENCE htp_user_userid_seq + AS integer + START WITH 1 + INCREMENT BY 1 + NO MINVALUE + NO MAXVALUE + CACHE 1; + +-- +-- Name: jwtapikey; Type: TABLE; +-- + +CREATE TABLE jwtapikey ( + jwtapikeyid integer NOT NULL, + userid integer, + startvalid bigint NOT NULL, + endvalid bigint NOT NULL, + isrevoked boolean DEFAULT false NOT NULL +); + +-- +-- Name: jwtapikey_jwtapikeyid_seq; Type: SEQUENCE; +-- + +CREATE SEQUENCE jwtapikey_jwtapikeyid_seq + AS integer + START WITH 1 + INCREMENT BY 1 + NO MINVALUE + NO MAXVALUE + CACHE 1; + +-- +-- Name: logentry; Type: TABLE; +-- + +CREATE TABLE logentry ( + logentryid bigint NOT NULL, + issuer text NOT NULL, + issuerid text NOT NULL, + level text NOT NULL, + message text NOT NULL, + "time" bigint NOT NULL +); + +-- +-- Name: logentry_logentryid_seq; Type: SEQUENCE; +-- + +CREATE SEQUENCE logentry_logentryid_seq + START WITH 1 + INCREMENT BY 1 + NO MINVALUE + NO MAXVALUE + CACHE 1; + +-- +-- Name: notificationsetting; Type: TABLE; +-- + +CREATE TABLE notificationsetting ( + notificationsettingid integer NOT NULL, + action text NOT NULL, + objectid integer, + notification text NOT NULL, + userid integer NOT NULL, + receiver text NOT NULL, + isactive integer NOT NULL +); + +-- +-- Name: notificationsetting_notificationsettingid_seq; Type: SEQUENCE; +-- + +CREATE SEQUENCE notificationsetting_notificationsettingid_seq + AS integer + START WITH 1 + INCREMENT BY 1 + NO MINVALUE + NO MAXVALUE + CACHE 1; + +-- +-- Name: preprocessor; Type: TABLE; +-- + +CREATE TABLE preprocessor ( + preprocessorid integer NOT NULL, + name text NOT NULL, + url text NOT NULL, + binaryname text NOT NULL, + keyspacecommand text, + skipcommand text, + limitcommand text +); + +-- +-- Name: preprocessor_preprocessorid_seq; Type: SEQUENCE; +-- + +CREATE SEQUENCE preprocessor_preprocessorid_seq + AS integer + START WITH 1 + INCREMENT BY 1 + NO MINVALUE + NO MAXVALUE + CACHE 1; + +-- +-- Name: pretask; Type: TABLE; +-- + +CREATE TABLE pretask ( + pretaskid integer NOT NULL, + taskname text NOT NULL, + attackcmd text NOT NULL, + chunktime integer NOT NULL, + statustimer integer NOT NULL, + color text, + issmall integer NOT NULL, + iscputask integer NOT NULL, + usenewbench integer NOT NULL, + priority integer NOT NULL, + maxagents integer NOT NULL, + ismaskimport integer NOT NULL, + crackerbinarytypeid integer NOT NULL +); + +-- +-- Name: pretask_pretaskid_seq; Type: SEQUENCE; +-- + +CREATE SEQUENCE pretask_pretaskid_seq + AS integer + START WITH 1 + INCREMENT BY 1 + NO MINVALUE + NO MAXVALUE + CACHE 1; + +-- +-- Name: regvoucher; Type: TABLE; +-- + +CREATE TABLE regvoucher ( + regvoucherid integer NOT NULL, + voucher text NOT NULL, + "time" bigint NOT NULL +); + +-- +-- Name: regvoucher_regvoucherid_seq; Type: SEQUENCE; +-- + +CREATE SEQUENCE regvoucher_regvoucherid_seq + AS integer + START WITH 1 + INCREMENT BY 1 + NO MINVALUE + NO MAXVALUE + CACHE 1; + +-- +-- Name: rightgroup; Type: TABLE; +-- + +CREATE TABLE rightgroup ( + rightgroupid integer NOT NULL, + groupname text NOT NULL, + permissions text NOT NULL +); + +-- +-- Name: rightgroup_rightgroupid_seq; Type: SEQUENCE; +-- + +CREATE SEQUENCE rightgroup_rightgroupid_seq + AS integer + START WITH 1 + INCREMENT BY 1 + NO MINVALUE + NO MAXVALUE + CACHE 1; + +-- +-- Name: session; Type: TABLE; +-- + +CREATE TABLE session ( + sessionid integer NOT NULL, + userid integer NOT NULL, + sessionstartdate bigint NOT NULL, + lastactiondate bigint NOT NULL, + isopen integer NOT NULL, + sessionlifetime integer NOT NULL, + sessionkey text NOT NULL +); + +-- +-- Name: session_sessionid_seq; Type: SEQUENCE; +-- + +CREATE SEQUENCE session_sessionid_seq + AS integer + START WITH 1 + INCREMENT BY 1 + NO MINVALUE + NO MAXVALUE + CACHE 1; + +-- +-- Name: speed; Type: TABLE; +-- + +CREATE TABLE speed ( + speedid bigint NOT NULL, + agentid integer NOT NULL, + taskid integer NOT NULL, + speed bigint NOT NULL, + "time" bigint NOT NULL +); + +-- +-- Name: speed_speedid_seq; Type: SEQUENCE; +-- + +CREATE SEQUENCE speed_speedid_seq + START WITH 1 + INCREMENT BY 1 + NO MINVALUE + NO MAXVALUE + CACHE 1; + +-- +-- Name: storedvalue; Type: TABLE; +-- + +CREATE TABLE storedvalue ( + storedvalueid text NOT NULL, + val text NOT NULL +); + +-- +-- Name: supertask; Type: TABLE; +-- + +CREATE TABLE supertask ( + supertaskid integer NOT NULL, + supertaskname text NOT NULL +); + +-- +-- Name: supertask_supertaskid_seq; Type: SEQUENCE; +-- + +CREATE SEQUENCE supertask_supertaskid_seq + AS integer + START WITH 1 + INCREMENT BY 1 + NO MINVALUE + NO MAXVALUE + CACHE 1; + +-- +-- Name: supertaskpretask; Type: TABLE; +-- + +CREATE TABLE supertaskpretask ( + supertaskpretaskid integer NOT NULL, + supertaskid integer NOT NULL, + pretaskid integer NOT NULL +); + +-- +-- Name: supertaskpretask_supertaskpretaskid_seq; Type: SEQUENCE; +-- + +CREATE SEQUENCE supertaskpretask_supertaskpretaskid_seq + AS integer + START WITH 1 + INCREMENT BY 1 + NO MINVALUE + NO MAXVALUE + CACHE 1; + +-- +-- Name: task; Type: TABLE; +-- + +CREATE TABLE task ( + taskid integer NOT NULL, + taskname text NOT NULL, + attackcmd text NOT NULL, + chunktime integer NOT NULL, + statustimer integer NOT NULL, + keyspace bigint NOT NULL, + keyspaceprogress bigint NOT NULL, + priority integer NOT NULL, + maxagents integer NOT NULL, + color text, + issmall integer NOT NULL, + iscputask integer NOT NULL, + usenewbench integer NOT NULL, + skipkeyspace bigint NOT NULL, + crackerbinaryid integer, + crackerbinarytypeid integer, + taskwrapperid integer NOT NULL, + isarchived integer NOT NULL, + notes text NOT NULL, + staticchunks integer NOT NULL, + chunksize bigint NOT NULL, + forcepipe integer NOT NULL, + usepreprocessor integer NOT NULL, + preprocessorcommand text NOT NULL +); + +-- +-- Name: task_taskid_seq; Type: SEQUENCE; +-- + +CREATE SEQUENCE task_taskid_seq + AS integer + START WITH 1 + INCREMENT BY 1 + NO MINVALUE + NO MAXVALUE + CACHE 1; + +-- +-- Name: taskdebugoutput; Type: TABLE; +-- + +CREATE TABLE taskdebugoutput ( + taskdebugoutputid integer NOT NULL, + taskid integer NOT NULL, + output text NOT NULL +); + +-- +-- Name: taskdebugoutput_taskdebugoutputid_seq; Type: SEQUENCE; +-- + +CREATE SEQUENCE taskdebugoutput_taskdebugoutputid_seq + AS integer + START WITH 1 + INCREMENT BY 1 + NO MINVALUE + NO MAXVALUE + CACHE 1; + +-- +-- Name: taskwrapper; Type: TABLE; +-- + +CREATE TABLE taskwrapper ( + taskwrapperid integer NOT NULL, + priority integer NOT NULL, + maxagents integer NOT NULL, + tasktype integer NOT NULL, + hashlistid integer NOT NULL, + accessgroupid integer, + taskwrappername text NOT NULL, + isarchived integer NOT NULL, + cracked integer NOT NULL +); + +-- +-- Name: taskwrapper_taskwrapperid_seq; Type: SEQUENCE; +-- + +CREATE SEQUENCE taskwrapper_taskwrapperid_seq + AS integer + START WITH 1 + INCREMENT BY 1 + NO MINVALUE + NO MAXVALUE + CACHE 1; + +-- +-- Name: taskwrapperdisplay; Type: VIEW; +-- + +CREATE VIEW taskwrapperdisplay AS + SELECT tw.taskwrapperid, + tw.priority AS taskwrapperpriority, + tw.maxagents AS taskwrappermaxagents, + tw.tasktype, + tw.hashlistid, + tw.accessgroupid, + tw.taskwrappername, + tw.isarchived AS taskwrapperisarchived, + tw.cracked, + t.taskid, + t.taskname, + t.attackcmd, + t.chunktime, + t.statustimer, + t.keyspace, + t.keyspaceprogress, + t.priority AS taskpriority, + t.maxagents AS taskmaxagents, + t.isarchived AS taskisarchived, + t.issmall, + t.iscputask, + t.usepreprocessor AS taskusepreprocessor, + CASE + WHEN (tw.tasktype = 0) THEN t.taskname + ELSE tw.taskwrappername + END AS displayname, + h.hashlistname, + h.hashcount, + h.cracked AS hashlistcracked, + ht.hashtypeid, + ht.description AS hashtypedescription, + ag.groupname, + t.color + FROM ((((taskwrapper tw + LEFT JOIN task t ON (((tw.tasktype = 0) AND (t.taskwrapperid = tw.taskwrapperid)))) + JOIN hashlist h ON ((tw.hashlistid = h.hashlistid))) + JOIN hashtype ht ON ((h.hashtypeid = ht.hashtypeid))) + JOIN accessgroup ag ON ((tw.accessgroupid = ag.accessgroupid))); + +-- +-- Name: zap; Type: TABLE; +-- + +CREATE TABLE zap ( + zapid integer NOT NULL, + hash text NOT NULL, + solvetime bigint NOT NULL, + agentid integer, + hashlistid integer NOT NULL +); + +-- +-- Name: zap_zapid_seq; Type: SEQUENCE; +-- + +CREATE SEQUENCE zap_zapid_seq + AS integer + START WITH 1 + INCREMENT BY 1 + NO MINVALUE + NO MAXVALUE + CACHE 1; + +-- +-- Name: accessgroup accessgroupid; Type: DEFAULT; +-- + +ALTER TABLE ONLY accessgroup ALTER COLUMN accessgroupid SET DEFAULT nextval('accessgroup_accessgroupid_seq'::regclass); + +-- +-- Name: accessgroupagent accessgroupagentid; Type: DEFAULT; +-- + +ALTER TABLE ONLY accessgroupagent ALTER COLUMN accessgroupagentid SET DEFAULT nextval('accessgroupagent_accessgroupagentid_seq'::regclass); + +-- +-- Name: accessgroupuser accessgroupuserid; Type: DEFAULT; +-- + +ALTER TABLE ONLY accessgroupuser ALTER COLUMN accessgroupuserid SET DEFAULT nextval('accessgroupuser_accessgroupuserid_seq'::regclass); + +-- +-- Name: agent agentid; Type: DEFAULT; +-- + +ALTER TABLE ONLY agent ALTER COLUMN agentid SET DEFAULT nextval('agent_agentid_seq'::regclass); + +-- +-- Name: agentbinary agentbinaryid; Type: DEFAULT; +-- + +ALTER TABLE ONLY agentbinary ALTER COLUMN agentbinaryid SET DEFAULT nextval('agentbinary_agentbinaryid_seq'::regclass); + +-- +-- Name: agenterror agenterrorid; Type: DEFAULT; +-- + +ALTER TABLE ONLY agenterror ALTER COLUMN agenterrorid SET DEFAULT nextval('agenterror_agenterrorid_seq'::regclass); + +-- +-- Name: agentstat agentstatid; Type: DEFAULT; +-- + +ALTER TABLE ONLY agentstat ALTER COLUMN agentstatid SET DEFAULT nextval('agentstat_agentstatid_seq'::regclass); + +-- +-- Name: agentzap agentzapid; Type: DEFAULT; +-- + +ALTER TABLE ONLY agentzap ALTER COLUMN agentzapid SET DEFAULT nextval('agentzap_agentzapid_seq'::regclass); + +-- +-- Name: apigroup apigroupid; Type: DEFAULT; +-- + +ALTER TABLE ONLY apigroup ALTER COLUMN apigroupid SET DEFAULT nextval('apigroup_apigroupid_seq'::regclass); + +-- +-- Name: apikey apikeyid; Type: DEFAULT; +-- + +ALTER TABLE ONLY apikey ALTER COLUMN apikeyid SET DEFAULT nextval('apikey_apikeyid_seq'::regclass); + +-- +-- Name: assignment assignmentid; Type: DEFAULT; +-- + +ALTER TABLE ONLY assignment ALTER COLUMN assignmentid SET DEFAULT nextval('assignment_assignmentid_seq'::regclass); + +-- +-- Name: chunk chunkid; Type: DEFAULT; +-- + +ALTER TABLE ONLY chunk ALTER COLUMN chunkid SET DEFAULT nextval('chunk_chunkid_seq'::regclass); + +-- +-- Name: config configid; Type: DEFAULT; +-- + +ALTER TABLE ONLY config ALTER COLUMN configid SET DEFAULT nextval('config_configid_seq'::regclass); + +-- +-- Name: configsection configsectionid; Type: DEFAULT; +-- + +ALTER TABLE ONLY configsection ALTER COLUMN configsectionid SET DEFAULT nextval('configsection_configsectionid_seq'::regclass); + +-- +-- Name: crackerbinary crackerbinaryid; Type: DEFAULT; +-- + +ALTER TABLE ONLY crackerbinary ALTER COLUMN crackerbinaryid SET DEFAULT nextval('crackerbinary_crackerbinaryid_seq'::regclass); + +-- +-- Name: crackerbinarytype crackerbinarytypeid; Type: DEFAULT; +-- + +ALTER TABLE ONLY crackerbinarytype ALTER COLUMN crackerbinarytypeid SET DEFAULT nextval('crackerbinarytype_crackerbinarytypeid_seq'::regclass); + +-- +-- Name: file fileid; Type: DEFAULT; +-- + +ALTER TABLE ONLY file ALTER COLUMN fileid SET DEFAULT nextval('file_fileid_seq'::regclass); + +-- +-- Name: filedelete filedeleteid; Type: DEFAULT; +-- + +ALTER TABLE ONLY filedelete ALTER COLUMN filedeleteid SET DEFAULT nextval('filedelete_filedeleteid_seq'::regclass); + +-- +-- Name: filedownload filedownloadid; Type: DEFAULT; +-- + +ALTER TABLE ONLY filedownload ALTER COLUMN filedownloadid SET DEFAULT nextval('filedownload_filedownloadid_seq'::regclass); + +-- +-- Name: filepretask filepretaskid; Type: DEFAULT; +-- + +ALTER TABLE ONLY filepretask ALTER COLUMN filepretaskid SET DEFAULT nextval('filepretask_filepretaskid_seq'::regclass); + +-- +-- Name: filetask filetaskid; Type: DEFAULT; +-- + +ALTER TABLE ONLY filetask ALTER COLUMN filetaskid SET DEFAULT nextval('filetask_filetaskid_seq'::regclass); + +-- +-- Name: hash hashid; Type: DEFAULT; +-- + +ALTER TABLE ONLY hash ALTER COLUMN hashid SET DEFAULT nextval('hash_hashid_seq'::regclass); + +-- +-- Name: hashbinary hashbinaryid; Type: DEFAULT; +-- + +ALTER TABLE ONLY hashbinary ALTER COLUMN hashbinaryid SET DEFAULT nextval('hashbinary_hashbinaryid_seq'::regclass); + +-- +-- Name: hashlist hashlistid; Type: DEFAULT; +-- + +ALTER TABLE ONLY hashlist ALTER COLUMN hashlistid SET DEFAULT nextval('hashlist_hashlistid_seq'::regclass); + +-- +-- Name: hashlisthashlist hashlisthashlistid; Type: DEFAULT; +-- + +ALTER TABLE ONLY hashlisthashlist ALTER COLUMN hashlisthashlistid SET DEFAULT nextval('hashlisthashlist_hashlisthashlistid_seq'::regclass); + +-- +-- Name: hashtype hashtypeid; Type: DEFAULT; +-- + +ALTER TABLE ONLY hashtype ALTER COLUMN hashtypeid SET DEFAULT nextval('hashtype_hashtypeid_seq'::regclass); + +-- +-- Name: healthcheck healthcheckid; Type: DEFAULT; +-- + +ALTER TABLE ONLY healthcheck ALTER COLUMN healthcheckid SET DEFAULT nextval('healthcheck_healthcheckid_seq'::regclass); + +-- +-- Name: healthcheckagent healthcheckagentid; Type: DEFAULT; +-- + +ALTER TABLE ONLY healthcheckagent ALTER COLUMN healthcheckagentid SET DEFAULT nextval('healthcheckagent_healthcheckagentid_seq'::regclass); + +-- +-- Name: htp_user userid; Type: DEFAULT; +-- + +ALTER TABLE ONLY htp_user ALTER COLUMN userid SET DEFAULT nextval('htp_user_userid_seq'::regclass); + +-- +-- Name: jwtapikey jwtapikeyid; Type: DEFAULT; +-- + +ALTER TABLE ONLY jwtapikey ALTER COLUMN jwtapikeyid SET DEFAULT nextval('jwtapikey_jwtapikeyid_seq'::regclass); + +-- +-- Name: logentry logentryid; Type: DEFAULT; +-- + +ALTER TABLE ONLY logentry ALTER COLUMN logentryid SET DEFAULT nextval('logentry_logentryid_seq'::regclass); + +-- +-- Name: notificationsetting notificationsettingid; Type: DEFAULT; +-- + +ALTER TABLE ONLY notificationsetting ALTER COLUMN notificationsettingid SET DEFAULT nextval('notificationsetting_notificationsettingid_seq'::regclass); + +-- +-- Name: preprocessor preprocessorid; Type: DEFAULT; +-- + +ALTER TABLE ONLY preprocessor ALTER COLUMN preprocessorid SET DEFAULT nextval('preprocessor_preprocessorid_seq'::regclass); + +-- +-- Name: pretask pretaskid; Type: DEFAULT; +-- + +ALTER TABLE ONLY pretask ALTER COLUMN pretaskid SET DEFAULT nextval('pretask_pretaskid_seq'::regclass); + +-- +-- Name: regvoucher regvoucherid; Type: DEFAULT; +-- + +ALTER TABLE ONLY regvoucher ALTER COLUMN regvoucherid SET DEFAULT nextval('regvoucher_regvoucherid_seq'::regclass); + +-- +-- Name: rightgroup rightgroupid; Type: DEFAULT; +-- + +ALTER TABLE ONLY rightgroup ALTER COLUMN rightgroupid SET DEFAULT nextval('rightgroup_rightgroupid_seq'::regclass); + +-- +-- Name: session sessionid; Type: DEFAULT; +-- + +ALTER TABLE ONLY session ALTER COLUMN sessionid SET DEFAULT nextval('session_sessionid_seq'::regclass); + +-- +-- Name: speed speedid; Type: DEFAULT; +-- + +ALTER TABLE ONLY speed ALTER COLUMN speedid SET DEFAULT nextval('speed_speedid_seq'::regclass); + +-- +-- Name: supertask supertaskid; Type: DEFAULT; +-- + +ALTER TABLE ONLY supertask ALTER COLUMN supertaskid SET DEFAULT nextval('supertask_supertaskid_seq'::regclass); + +-- +-- Name: supertaskpretask supertaskpretaskid; Type: DEFAULT; +-- + +ALTER TABLE ONLY supertaskpretask ALTER COLUMN supertaskpretaskid SET DEFAULT nextval('supertaskpretask_supertaskpretaskid_seq'::regclass); + +-- +-- Name: task taskid; Type: DEFAULT; +-- + +ALTER TABLE ONLY task ALTER COLUMN taskid SET DEFAULT nextval('task_taskid_seq'::regclass); + +-- +-- Name: taskdebugoutput taskdebugoutputid; Type: DEFAULT; +-- + +ALTER TABLE ONLY taskdebugoutput ALTER COLUMN taskdebugoutputid SET DEFAULT nextval('taskdebugoutput_taskdebugoutputid_seq'::regclass); + +-- +-- Name: taskwrapper taskwrapperid; Type: DEFAULT; +-- + +ALTER TABLE ONLY taskwrapper ALTER COLUMN taskwrapperid SET DEFAULT nextval('taskwrapper_taskwrapperid_seq'::regclass); + +-- +-- Name: zap zapid; Type: DEFAULT; +-- + +ALTER TABLE ONLY zap ALTER COLUMN zapid SET DEFAULT nextval('zap_zapid_seq'::regclass); + +-- +-- Data for Name: accessgroup; Type: TABLE DATA; +-- + +INSERT INTO accessgroup (accessgroupid, groupname) VALUES (1, 'Default Group'); + +-- +-- Data for Name: agentbinary; Type: TABLE DATA; +-- + +INSERT INTO agentbinary (agentbinaryid, binarytype, version, operatingsystems, filename, updatetrack, updateavailable) VALUES (1, 'python', '0.7.4', 'Windows, Linux, OS X', 'hashtopolis.zip', 'stable', ''); + +-- +-- Data for Name: apigroup; Type: TABLE DATA; +-- + +INSERT INTO apigroup (apigroupid, name, permissions) VALUES (1, 'Administrators', 'ALL'); + +-- +-- Data for Name: config; Type: TABLE DATA; +-- + +INSERT INTO config (configid, configsectionid, item, value) VALUES (1, 1, 'agenttimeout', '30'); +INSERT INTO config (configid, configsectionid, item, value) VALUES (2, 1, 'benchtime', '30'); +INSERT INTO config (configid, configsectionid, item, value) VALUES (3, 1, 'chunktime', '600'); +INSERT INTO config (configid, configsectionid, item, value) VALUES (4, 1, 'chunktimeout', '30'); +INSERT INTO config (configid, configsectionid, item, value) VALUES (9, 1, 'fieldseparator', ':'); +INSERT INTO config (configid, configsectionid, item, value) VALUES (10, 1, 'hashlistAlias', '#HL#'); +INSERT INTO config (configid, configsectionid, item, value) VALUES (11, 1, 'statustimer', '5'); +INSERT INTO config (configid, configsectionid, item, value) VALUES (12, 4, 'timefmt', 'd.m.Y, H:i:s'); +INSERT INTO config (configid, configsectionid, item, value) VALUES (14, 3, 'numLogEntries', '5000'); +INSERT INTO config (configid, configsectionid, item, value) VALUES (15, 1, 'disptolerance', '20'); +INSERT INTO config (configid, configsectionid, item, value) VALUES (16, 3, 'batchSize', '50000'); +INSERT INTO config (configid, configsectionid, item, value) VALUES (18, 2, 'yubikey_id', ''); +INSERT INTO config (configid, configsectionid, item, value) VALUES (19, 2, 'yubikey_key', ''); +INSERT INTO config (configid, configsectionid, item, value) VALUES (20, 2, 'yubikey_url', 'https://api.yubico.com/wsapi/2.0/verify'); +INSERT INTO config (configid, configsectionid, item, value) VALUES (22, 3, 'pagingSize', '5000'); +INSERT INTO config (configid, configsectionid, item, value) VALUES (23, 3, 'plainTextMaxLength', '200'); +INSERT INTO config (configid, configsectionid, item, value) VALUES (24, 3, 'hashMaxLength', '1024'); +INSERT INTO config (configid, configsectionid, item, value) VALUES (25, 5, 'emailSender', 'hashtopolis@example.org'); +INSERT INTO config (configid, configsectionid, item, value) VALUES (26, 5, 'emailSenderName', 'Hashtopolis'); +INSERT INTO config (configid, configsectionid, item, value) VALUES (27, 5, 'baseHost', ''); +INSERT INTO config (configid, configsectionid, item, value) VALUES (28, 3, 'maxHashlistSize', '5000000'); +INSERT INTO config (configid, configsectionid, item, value) VALUES (29, 4, 'hideImportMasks', '1'); +INSERT INTO config (configid, configsectionid, item, value) VALUES (30, 7, 'telegramBotToken', ''); +INSERT INTO config (configid, configsectionid, item, value) VALUES (31, 5, 'contactEmail', ''); +INSERT INTO config (configid, configsectionid, item, value) VALUES (32, 5, 'voucherDeletion', '0'); +INSERT INTO config (configid, configsectionid, item, value) VALUES (33, 4, 'hashesPerPage', '1000'); +INSERT INTO config (configid, configsectionid, item, value) VALUES (34, 4, 'hideIpInfo', '0'); +INSERT INTO config (configid, configsectionid, item, value) VALUES (35, 1, 'defaultBenchmark', '1'); +INSERT INTO config (configid, configsectionid, item, value) VALUES (36, 4, 'showTaskPerformance', '0'); +INSERT INTO config (configid, configsectionid, item, value) VALUES (41, 4, 'agentStatLimit', '100'); +INSERT INTO config (configid, configsectionid, item, value) VALUES (42, 1, 'agentDataLifetime', '3600'); +INSERT INTO config (configid, configsectionid, item, value) VALUES (43, 4, 'agentStatTension', '0'); +INSERT INTO config (configid, configsectionid, item, value) VALUES (44, 6, 'multicastEnable', '0'); +INSERT INTO config (configid, configsectionid, item, value) VALUES (45, 6, 'multicastDevice', 'eth0'); +INSERT INTO config (configid, configsectionid, item, value) VALUES (46, 6, 'multicastTransferRateEnable', '0'); +INSERT INTO config (configid, configsectionid, item, value) VALUES (47, 6, 'multicastTranserRate', '500000'); +INSERT INTO config (configid, configsectionid, item, value) VALUES (48, 1, 'disableTrimming', '0'); +INSERT INTO config (configid, configsectionid, item, value) VALUES (49, 5, 'serverLogLevel', '20'); +INSERT INTO config (configid, configsectionid, item, value) VALUES (50, 7, 'notificationsProxyEnable', '0'); +INSERT INTO config (configid, configsectionid, item, value) VALUES (60, 7, 'notificationsProxyServer', ''); +INSERT INTO config (configid, configsectionid, item, value) VALUES (61, 7, 'notificationsProxyPort', '8080'); +INSERT INTO config (configid, configsectionid, item, value) VALUES (62, 7, 'notificationsProxyType', 'HTTP'); +INSERT INTO config (configid, configsectionid, item, value) VALUES (63, 1, 'priority0Start', '0'); +INSERT INTO config (configid, configsectionid, item, value) VALUES (64, 5, 'baseUrl', ''); +INSERT INTO config (configid, configsectionid, item, value) VALUES (65, 4, 'maxSessionLength', '48'); +INSERT INTO config (configid, configsectionid, item, value) VALUES (66, 1, 'hashcatBrainEnable', '0'); +INSERT INTO config (configid, configsectionid, item, value) VALUES (67, 1, 'hashcatBrainHost', ''); +INSERT INTO config (configid, configsectionid, item, value) VALUES (68, 1, 'hashcatBrainPort', '0'); +INSERT INTO config (configid, configsectionid, item, value) VALUES (69, 1, 'hashcatBrainPass', ''); +INSERT INTO config (configid, configsectionid, item, value) VALUES (70, 1, 'hashlistImportCheck', '0'); +INSERT INTO config (configid, configsectionid, item, value) VALUES (71, 5, 'allowDeregister', '0'); +INSERT INTO config (configid, configsectionid, item, value) VALUES (72, 4, 'agentTempThreshold1', '70'); +INSERT INTO config (configid, configsectionid, item, value) VALUES (73, 4, 'agentTempThreshold2', '80'); +INSERT INTO config (configid, configsectionid, item, value) VALUES (74, 4, 'agentUtilThreshold1', '90'); +INSERT INTO config (configid, configsectionid, item, value) VALUES (75, 4, 'agentUtilThreshold2', '75'); +INSERT INTO config (configid, configsectionid, item, value) VALUES (76, 3, 'uApiSendTaskIsComplete', '0'); +INSERT INTO config (configid, configsectionid, item, value) VALUES (77, 1, 'hcErrorIgnore', 'DeviceGetFanSpeed'); +INSERT INTO config (configid, configsectionid, item, value) VALUES (78, 3, 'defaultPageSize', '10000'); +INSERT INTO config (configid, configsectionid, item, value) VALUES (79, 3, 'maxPageSize', '50000'); +INSERT INTO config (configid, configsectionid, item, value) VALUES (13, 1, 'blacklistChars', '&|"''{}()[]$<>;`'); + +-- +-- Data for Name: configsection; Type: TABLE DATA; +-- + +INSERT INTO configsection (configsectionid, sectionname) VALUES (1, 'Cracking/Tasks'); +INSERT INTO configsection (configsectionid, sectionname) VALUES (2, 'Yubikey'); +INSERT INTO configsection (configsectionid, sectionname) VALUES (3, 'Finetuning'); +INSERT INTO configsection (configsectionid, sectionname) VALUES (4, 'UI'); +INSERT INTO configsection (configsectionid, sectionname) VALUES (5, 'Server'); +INSERT INTO configsection (configsectionid, sectionname) VALUES (6, 'Multicast'); +INSERT INTO configsection (configsectionid, sectionname) VALUES (7, 'Notifications'); + +-- +-- Data for Name: crackerbinary; Type: TABLE DATA; +-- + +INSERT INTO crackerbinary (crackerbinaryid, crackerbinarytypeid, version, downloadurl, binaryname) VALUES (1, 1, '7.1.2', 'https://hashcat.net/files/hashcat-7.1.2.7z', 'hashcat'); + +-- +-- Data for Name: crackerbinarytype; Type: TABLE DATA; +-- + +INSERT INTO crackerbinarytype (crackerbinarytypeid, typename, ischunkingavailable) VALUES (1, 'hashcat', 1); + +-- +-- Data for Name: hashtype; Type: TABLE DATA; +-- + +INSERT INTO hashtype (hashtypeid, description, issalted, isslowhash) VALUES (0, 'MD5', 0, 0); +INSERT INTO hashtype (hashtypeid, description, issalted, isslowhash) VALUES (10, 'md5($pass.$salt)', 1, 0); +INSERT INTO hashtype (hashtypeid, description, issalted, isslowhash) VALUES (11, 'Joomla < 2.5.18', 1, 0); +INSERT INTO hashtype (hashtypeid, description, issalted, isslowhash) VALUES (12, 'PostgreSQL', 1, 0); +INSERT INTO hashtype (hashtypeid, description, issalted, isslowhash) VALUES (20, 'md5($salt.$pass)', 1, 0); +INSERT INTO hashtype (hashtypeid, description, issalted, isslowhash) VALUES (21, 'osCommerce, xt:Commerce', 1, 0); +INSERT INTO hashtype (hashtypeid, description, issalted, isslowhash) VALUES (22, 'Juniper Netscreen/SSG (ScreenOS)', 1, 0); +INSERT INTO hashtype (hashtypeid, description, issalted, isslowhash) VALUES (23, 'Skype', 1, 0); +INSERT INTO hashtype (hashtypeid, description, issalted, isslowhash) VALUES (24, 'SolarWinds Serv-U', 0, 0); +INSERT INTO hashtype (hashtypeid, description, issalted, isslowhash) VALUES (30, 'md5(utf16le($pass).$salt)', 1, 0); +INSERT INTO hashtype (hashtypeid, description, issalted, isslowhash) VALUES (40, 'md5($salt.utf16le($pass))', 1, 0); +INSERT INTO hashtype (hashtypeid, description, issalted, isslowhash) VALUES (50, 'HMAC-MD5 (key = $pass)', 1, 0); +INSERT INTO hashtype (hashtypeid, description, issalted, isslowhash) VALUES (60, 'HMAC-MD5 (key = $salt)', 1, 0); +INSERT INTO hashtype (hashtypeid, description, issalted, isslowhash) VALUES (70, 'md5(utf16le($pass))', 0, 0); +INSERT INTO hashtype (hashtypeid, description, issalted, isslowhash) VALUES (100, 'SHA1', 0, 0); +INSERT INTO hashtype (hashtypeid, description, issalted, isslowhash) VALUES (101, 'nsldap, SHA-1(Base64), Netscape LDAP SHA', 0, 0); +INSERT INTO hashtype (hashtypeid, description, issalted, isslowhash) VALUES (110, 'sha1($pass.$salt)', 1, 0); +INSERT INTO hashtype (hashtypeid, description, issalted, isslowhash) VALUES (111, 'nsldaps, SSHA-1(Base64), Netscape LDAP SSHA', 0, 0); +INSERT INTO hashtype (hashtypeid, description, issalted, isslowhash) VALUES (112, 'Oracle S: Type (Oracle 11+)', 1, 0); +INSERT INTO hashtype (hashtypeid, description, issalted, isslowhash) VALUES (120, 'sha1($salt.$pass)', 1, 0); +INSERT INTO hashtype (hashtypeid, description, issalted, isslowhash) VALUES (121, 'SMF >= v1.1', 1, 0); +INSERT INTO hashtype (hashtypeid, description, issalted, isslowhash) VALUES (122, 'OS X v10.4, v10.5, v10.6', 0, 0); +INSERT INTO hashtype (hashtypeid, description, issalted, isslowhash) VALUES (124, 'Django (SHA-1)', 0, 0); +INSERT INTO hashtype (hashtypeid, description, issalted, isslowhash) VALUES (125, 'ArubaOS', 0, 0); +INSERT INTO hashtype (hashtypeid, description, issalted, isslowhash) VALUES (130, 'sha1(utf16le($pass).$salt)', 1, 0); +INSERT INTO hashtype (hashtypeid, description, issalted, isslowhash) VALUES (131, 'MSSQL(2000)', 0, 0); +INSERT INTO hashtype (hashtypeid, description, issalted, isslowhash) VALUES (132, 'MSSQL(2005)', 0, 0); +INSERT INTO hashtype (hashtypeid, description, issalted, isslowhash) VALUES (133, 'PeopleSoft', 0, 0); +INSERT INTO hashtype (hashtypeid, description, issalted, isslowhash) VALUES (140, 'sha1($salt.utf16le($pass))', 1, 0); +INSERT INTO hashtype (hashtypeid, description, issalted, isslowhash) VALUES (141, 'EPiServer 6.x < v4', 0, 0); +INSERT INTO hashtype (hashtypeid, description, issalted, isslowhash) VALUES (150, 'HMAC-SHA1 (key = $pass)', 1, 0); +INSERT INTO hashtype (hashtypeid, description, issalted, isslowhash) VALUES (160, 'HMAC-SHA1 (key = $salt)', 1, 0); +INSERT INTO hashtype (hashtypeid, description, issalted, isslowhash) VALUES (170, 'sha1(utf16le($pass))', 0, 0); +INSERT INTO hashtype (hashtypeid, description, issalted, isslowhash) VALUES (200, 'MySQL323', 0, 0); +INSERT INTO hashtype (hashtypeid, description, issalted, isslowhash) VALUES (300, 'MySQL4.1/MySQL5+', 0, 0); +INSERT INTO hashtype (hashtypeid, description, issalted, isslowhash) VALUES (400, 'phpass, MD5(Wordpress), MD5(Joomla), MD5(phpBB3)', 0, 0); +INSERT INTO hashtype (hashtypeid, description, issalted, isslowhash) VALUES (500, 'md5crypt, MD5(Unix), FreeBSD MD5, Cisco-IOS MD5 2', 0, 0); +INSERT INTO hashtype (hashtypeid, description, issalted, isslowhash) VALUES (501, 'Juniper IVE', 0, 0); +INSERT INTO hashtype (hashtypeid, description, issalted, isslowhash) VALUES (600, 'BLAKE2b-512', 0, 0); +INSERT INTO hashtype (hashtypeid, description, issalted, isslowhash) VALUES (610, 'BLAKE2b-512($pass.$salt)', 1, 0); +INSERT INTO hashtype (hashtypeid, description, issalted, isslowhash) VALUES (620, 'BLAKE2b-512($salt.$pass)', 1, 0); +INSERT INTO hashtype (hashtypeid, description, issalted, isslowhash) VALUES (900, 'MD4', 0, 0); +INSERT INTO hashtype (hashtypeid, description, issalted, isslowhash) VALUES (1000, 'NTLM', 0, 0); +INSERT INTO hashtype (hashtypeid, description, issalted, isslowhash) VALUES (1100, 'Domain Cached Credentials (DCC), MS Cache', 1, 0); +INSERT INTO hashtype (hashtypeid, description, issalted, isslowhash) VALUES (1300, 'SHA-224', 0, 0); +INSERT INTO hashtype (hashtypeid, description, issalted, isslowhash) VALUES (1310, 'sha224($pass.$salt)', 1, 0); +INSERT INTO hashtype (hashtypeid, description, issalted, isslowhash) VALUES (1320, 'sha224($salt.$pass)', 1, 0); +INSERT INTO hashtype (hashtypeid, description, issalted, isslowhash) VALUES (1400, 'SHA256', 0, 0); +INSERT INTO hashtype (hashtypeid, description, issalted, isslowhash) VALUES (1410, 'sha256($pass.$salt)', 1, 0); +INSERT INTO hashtype (hashtypeid, description, issalted, isslowhash) VALUES (1411, 'SSHA-256(Base64), LDAP {SSHA256}', 0, 0); +INSERT INTO hashtype (hashtypeid, description, issalted, isslowhash) VALUES (1420, 'sha256($salt.$pass)', 1, 0); +INSERT INTO hashtype (hashtypeid, description, issalted, isslowhash) VALUES (1421, 'hMailServer', 0, 0); +INSERT INTO hashtype (hashtypeid, description, issalted, isslowhash) VALUES (1430, 'sha256(utf16le($pass).$salt)', 1, 0); +INSERT INTO hashtype (hashtypeid, description, issalted, isslowhash) VALUES (1440, 'sha256($salt.utf16le($pass))', 1, 0); +INSERT INTO hashtype (hashtypeid, description, issalted, isslowhash) VALUES (1441, 'EPiServer 6.x >= v4', 0, 0); +INSERT INTO hashtype (hashtypeid, description, issalted, isslowhash) VALUES (1450, 'HMAC-SHA256 (key = $pass)', 1, 0); +INSERT INTO hashtype (hashtypeid, description, issalted, isslowhash) VALUES (1460, 'HMAC-SHA256 (key = $salt)', 1, 0); +INSERT INTO hashtype (hashtypeid, description, issalted, isslowhash) VALUES (1470, 'sha256(utf16le($pass))', 0, 0); +INSERT INTO hashtype (hashtypeid, description, issalted, isslowhash) VALUES (1500, 'descrypt, DES(Unix), Traditional DES', 0, 0); +INSERT INTO hashtype (hashtypeid, description, issalted, isslowhash) VALUES (1600, 'md5apr1, MD5(APR), Apache MD5', 0, 0); +INSERT INTO hashtype (hashtypeid, description, issalted, isslowhash) VALUES (1700, 'SHA512', 0, 0); +INSERT INTO hashtype (hashtypeid, description, issalted, isslowhash) VALUES (1710, 'sha512($pass.$salt)', 1, 0); +INSERT INTO hashtype (hashtypeid, description, issalted, isslowhash) VALUES (1711, 'SSHA-512(Base64), LDAP {SSHA512}', 0, 0); +INSERT INTO hashtype (hashtypeid, description, issalted, isslowhash) VALUES (1720, 'sha512($salt.$pass)', 1, 0); +INSERT INTO hashtype (hashtypeid, description, issalted, isslowhash) VALUES (1722, 'OS X v10.7', 0, 0); +INSERT INTO hashtype (hashtypeid, description, issalted, isslowhash) VALUES (1730, 'sha512(utf16le($pass).$salt)', 1, 0); +INSERT INTO hashtype (hashtypeid, description, issalted, isslowhash) VALUES (1731, 'MSSQL(2012), MSSQL(2014)', 0, 0); +INSERT INTO hashtype (hashtypeid, description, issalted, isslowhash) VALUES (1740, 'sha512($salt.utf16le($pass))', 1, 0); +INSERT INTO hashtype (hashtypeid, description, issalted, isslowhash) VALUES (1750, 'HMAC-SHA512 (key = $pass)', 1, 0); +INSERT INTO hashtype (hashtypeid, description, issalted, isslowhash) VALUES (1760, 'HMAC-SHA512 (key = $salt)', 1, 0); +INSERT INTO hashtype (hashtypeid, description, issalted, isslowhash) VALUES (1770, 'sha512(utf16le($pass))', 0, 0); +INSERT INTO hashtype (hashtypeid, description, issalted, isslowhash) VALUES (1800, 'sha512crypt, SHA512(Unix)', 0, 0); +INSERT INTO hashtype (hashtypeid, description, issalted, isslowhash) VALUES (2000, 'STDOUT', 0, 0); +INSERT INTO hashtype (hashtypeid, description, issalted, isslowhash) VALUES (2100, 'Domain Cached Credentials 2 (DCC2), MS Cache', 0, 1); +INSERT INTO hashtype (hashtypeid, description, issalted, isslowhash) VALUES (2400, 'Cisco-PIX MD5', 0, 0); +INSERT INTO hashtype (hashtypeid, description, issalted, isslowhash) VALUES (2410, 'Cisco-ASA MD5', 1, 0); +INSERT INTO hashtype (hashtypeid, description, issalted, isslowhash) VALUES (2500, 'WPA/WPA2', 0, 1); +INSERT INTO hashtype (hashtypeid, description, issalted, isslowhash) VALUES (2501, 'WPA-EAPOL-PMK', 0, 1); +INSERT INTO hashtype (hashtypeid, description, issalted, isslowhash) VALUES (2600, 'md5(md5($pass))', 0, 0); +INSERT INTO hashtype (hashtypeid, description, issalted, isslowhash) VALUES (2611, 'vBulletin < v3.8.5', 1, 0); +INSERT INTO hashtype (hashtypeid, description, issalted, isslowhash) VALUES (2612, 'PHPS', 0, 0); +INSERT INTO hashtype (hashtypeid, description, issalted, isslowhash) VALUES (2630, 'md5(md5($pass.$salt))', 1, 0); +INSERT INTO hashtype (hashtypeid, description, issalted, isslowhash) VALUES (2711, 'vBulletin >= v3.8.5', 1, 0); +INSERT INTO hashtype (hashtypeid, description, issalted, isslowhash) VALUES (2811, 'IPB2+, MyBB1.2+', 1, 0); +INSERT INTO hashtype (hashtypeid, description, issalted, isslowhash) VALUES (3000, 'LM', 0, 0); +INSERT INTO hashtype (hashtypeid, description, issalted, isslowhash) VALUES (3100, 'Oracle H: Type (Oracle 7+), DES(Oracle)', 1, 0); +INSERT INTO hashtype (hashtypeid, description, issalted, isslowhash) VALUES (3200, 'bcrypt, Blowfish(OpenBSD)', 0, 0); +INSERT INTO hashtype (hashtypeid, description, issalted, isslowhash) VALUES (3500, 'md5(md5(md5($pass)))', 0, 0); +INSERT INTO hashtype (hashtypeid, description, issalted, isslowhash) VALUES (3610, 'md5(md5(md5($pass)).$salt)', 1, 0); +INSERT INTO hashtype (hashtypeid, description, issalted, isslowhash) VALUES (3710, 'md5($salt.md5($pass))', 1, 0); +INSERT INTO hashtype (hashtypeid, description, issalted, isslowhash) VALUES (3711, 'Mediawiki B type', 0, 0); +INSERT INTO hashtype (hashtypeid, description, issalted, isslowhash) VALUES (3730, 'md5($salt1.strtoupper(md5($salt2.$pass)))', 0, 0); +INSERT INTO hashtype (hashtypeid, description, issalted, isslowhash) VALUES (3800, 'md5($salt.$pass.$salt)', 1, 0); +INSERT INTO hashtype (hashtypeid, description, issalted, isslowhash) VALUES (3910, 'md5(md5($pass).md5($salt))', 1, 0); +INSERT INTO hashtype (hashtypeid, description, issalted, isslowhash) VALUES (4010, 'md5($salt.md5($salt.$pass))', 1, 0); +INSERT INTO hashtype (hashtypeid, description, issalted, isslowhash) VALUES (4110, 'md5($salt.md5($pass.$salt))', 1, 0); +INSERT INTO hashtype (hashtypeid, description, issalted, isslowhash) VALUES (4300, 'md5(strtoupper(md5($pass)))', 0, 0); +INSERT INTO hashtype (hashtypeid, description, issalted, isslowhash) VALUES (4400, 'md5(sha1($pass))', 0, 0); +INSERT INTO hashtype (hashtypeid, description, issalted, isslowhash) VALUES (4410, 'md5(sha1($pass).$salt)', 1, 0); +INSERT INTO hashtype (hashtypeid, description, issalted, isslowhash) VALUES (4420, 'md5(sha1($pass.$salt))', 1, 0); +INSERT INTO hashtype (hashtypeid, description, issalted, isslowhash) VALUES (4430, 'md5(sha1($salt.$pass))', 1, 0); +INSERT INTO hashtype (hashtypeid, description, issalted, isslowhash) VALUES (4500, 'sha1(sha1($pass))', 0, 0); +INSERT INTO hashtype (hashtypeid, description, issalted, isslowhash) VALUES (4510, 'sha1(sha1($pass).$salt)', 1, 0); +INSERT INTO hashtype (hashtypeid, description, issalted, isslowhash) VALUES (4520, 'sha1($salt.sha1($pass))', 1, 0); +INSERT INTO hashtype (hashtypeid, description, issalted, isslowhash) VALUES (4521, 'Redmine Project Management Web App', 0, 0); +INSERT INTO hashtype (hashtypeid, description, issalted, isslowhash) VALUES (4522, 'PunBB', 0, 0); +INSERT INTO hashtype (hashtypeid, description, issalted, isslowhash) VALUES (4700, 'sha1(md5($pass))', 0, 0); +INSERT INTO hashtype (hashtypeid, description, issalted, isslowhash) VALUES (4710, 'sha1(md5($pass).$salt)', 1, 0); +INSERT INTO hashtype (hashtypeid, description, issalted, isslowhash) VALUES (4711, 'Huawei sha1(md5($pass).$salt)', 1, 0); +INSERT INTO hashtype (hashtypeid, description, issalted, isslowhash) VALUES (4800, 'MD5(Chap), iSCSI CHAP authentication', 1, 0); +INSERT INTO hashtype (hashtypeid, description, issalted, isslowhash) VALUES (4900, 'sha1($salt.$pass.$salt)', 1, 0); +INSERT INTO hashtype (hashtypeid, description, issalted, isslowhash) VALUES (5000, 'SHA-3(Keccak)', 0, 0); +INSERT INTO hashtype (hashtypeid, description, issalted, isslowhash) VALUES (5100, 'Half MD5', 0, 0); +INSERT INTO hashtype (hashtypeid, description, issalted, isslowhash) VALUES (5200, 'Password Safe v3', 0, 1); +INSERT INTO hashtype (hashtypeid, description, issalted, isslowhash) VALUES (5300, 'IKE-PSK MD5', 0, 0); +INSERT INTO hashtype (hashtypeid, description, issalted, isslowhash) VALUES (5400, 'IKE-PSK SHA1', 0, 0); +INSERT INTO hashtype (hashtypeid, description, issalted, isslowhash) VALUES (5500, 'NetNTLMv1-VANILLA / NetNTLMv1+ESS', 0, 0); +INSERT INTO hashtype (hashtypeid, description, issalted, isslowhash) VALUES (5600, 'NetNTLMv2', 0, 0); +INSERT INTO hashtype (hashtypeid, description, issalted, isslowhash) VALUES (5700, 'Cisco-IOS SHA256', 0, 0); +INSERT INTO hashtype (hashtypeid, description, issalted, isslowhash) VALUES (5720, 'Cisco-ISE Hashed Password (SHA256)', 0, 0); +INSERT INTO hashtype (hashtypeid, description, issalted, isslowhash) VALUES (5800, 'Samsung Android Password/PIN', 1, 0); +INSERT INTO hashtype (hashtypeid, description, issalted, isslowhash) VALUES (6000, 'RipeMD160', 0, 0); +INSERT INTO hashtype (hashtypeid, description, issalted, isslowhash) VALUES (6050, 'HMAC-RIPEMD160 (key = $pass)', 1, 0); +INSERT INTO hashtype (hashtypeid, description, issalted, isslowhash) VALUES (6060, 'HMAC-RIPEMD160 (key = $salt)', 1, 0); +INSERT INTO hashtype (hashtypeid, description, issalted, isslowhash) VALUES (6100, 'Whirlpool', 0, 0); +INSERT INTO hashtype (hashtypeid, description, issalted, isslowhash) VALUES (6211, 'TrueCrypt 5.0+ PBKDF2-HMAC-RipeMD160 + AES/Serpent/Twofish', 0, 1); +INSERT INTO hashtype (hashtypeid, description, issalted, isslowhash) VALUES (6212, 'TrueCrypt 5.0+ PBKDF2-HMAC-RipeMD160 + AES-Twofish/Serpent-AES/Twofish-Serpent', 0, 1); +INSERT INTO hashtype (hashtypeid, description, issalted, isslowhash) VALUES (6213, 'TrueCrypt 5.0+ PBKDF2-HMAC-RipeMD160 + AES-Twofish-Serpent/Serpent-Twofish-AES', 0, 1); +INSERT INTO hashtype (hashtypeid, description, issalted, isslowhash) VALUES (6221, 'TrueCrypt 5.0+ SHA512 + AES/Serpent/Twofish', 0, 1); +INSERT INTO hashtype (hashtypeid, description, issalted, isslowhash) VALUES (6222, 'TrueCrypt 5.0+ SHA512 + AES-Twofish/Serpent-AES/Twofish-Serpent', 0, 1); +INSERT INTO hashtype (hashtypeid, description, issalted, isslowhash) VALUES (6223, 'TrueCrypt 5.0+ SHA512 + AES-Twofish-Serpent/Serpent-Twofish-AES', 0, 1); +INSERT INTO hashtype (hashtypeid, description, issalted, isslowhash) VALUES (6231, 'TrueCrypt 5.0+ Whirlpool + AES/Serpent/Twofish', 0, 1); +INSERT INTO hashtype (hashtypeid, description, issalted, isslowhash) VALUES (6232, 'TrueCrypt 5.0+ Whirlpool + AES-Twofish/Serpent-AES/Twofish-Serpent', 0, 1); +INSERT INTO hashtype (hashtypeid, description, issalted, isslowhash) VALUES (6233, 'TrueCrypt 5.0+ Whirlpool + AES-Twofish-Serpent/Serpent-Twofish-AES', 0, 1); +INSERT INTO hashtype (hashtypeid, description, issalted, isslowhash) VALUES (6241, 'TrueCrypt 5.0+ PBKDF2-HMAC-RipeMD160 + AES/Serpent/Twofish + boot', 0, 1); +INSERT INTO hashtype (hashtypeid, description, issalted, isslowhash) VALUES (6242, 'TrueCrypt 5.0+ PBKDF2-HMAC-RipeMD160 + AES-Twofish/Serpent-AES/Twofish-Serpent + boot', 0, 1); +INSERT INTO hashtype (hashtypeid, description, issalted, isslowhash) VALUES (6243, 'TrueCrypt 5.0+ PBKDF2-HMAC-RipeMD160 + AES-Twofish-Serpent/Serpent-Twofish-AES + boot', 0, 1); +INSERT INTO hashtype (hashtypeid, description, issalted, isslowhash) VALUES (6300, 'AIX {smd5}', 0, 0); +INSERT INTO hashtype (hashtypeid, description, issalted, isslowhash) VALUES (6400, 'AIX {ssha256}', 0, 1); +INSERT INTO hashtype (hashtypeid, description, issalted, isslowhash) VALUES (6500, 'AIX {ssha512}', 0, 1); +INSERT INTO hashtype (hashtypeid, description, issalted, isslowhash) VALUES (6600, '1Password, Agile Keychain', 0, 1); +INSERT INTO hashtype (hashtypeid, description, issalted, isslowhash) VALUES (6700, 'AIX {ssha1}', 0, 1); +INSERT INTO hashtype (hashtypeid, description, issalted, isslowhash) VALUES (6800, 'Lastpass', 1, 1); +INSERT INTO hashtype (hashtypeid, description, issalted, isslowhash) VALUES (6900, 'GOST R 34.11-94', 0, 0); +INSERT INTO hashtype (hashtypeid, description, issalted, isslowhash) VALUES (7000, 'Fortigate (FortiOS)', 0, 0); +INSERT INTO hashtype (hashtypeid, description, issalted, isslowhash) VALUES (7100, 'OS X v10.8 / v10.9', 0, 1); +INSERT INTO hashtype (hashtypeid, description, issalted, isslowhash) VALUES (7200, 'GRUB 2', 0, 1); +INSERT INTO hashtype (hashtypeid, description, issalted, isslowhash) VALUES (7300, 'IPMI2 RAKP HMAC-SHA1', 1, 0); +INSERT INTO hashtype (hashtypeid, description, issalted, isslowhash) VALUES (7350, 'IPMI2 RAKP HMAC-MD5', 0, 0); +INSERT INTO hashtype (hashtypeid, description, issalted, isslowhash) VALUES (7400, 'sha256crypt, SHA256(Unix)', 0, 0); +INSERT INTO hashtype (hashtypeid, description, issalted, isslowhash) VALUES (7401, 'MySQL $A$ (sha256crypt)', 0, 0); +INSERT INTO hashtype (hashtypeid, description, issalted, isslowhash) VALUES (7500, 'Kerberos 5 AS-REQ Pre-Auth', 0, 0); +INSERT INTO hashtype (hashtypeid, description, issalted, isslowhash) VALUES (7700, 'SAP CODVN B (BCODE)', 0, 0); +INSERT INTO hashtype (hashtypeid, description, issalted, isslowhash) VALUES (7701, 'SAP CODVN B (BCODE) from RFC_READ_TABLE', 0, 0); +INSERT INTO hashtype (hashtypeid, description, issalted, isslowhash) VALUES (7800, 'SAP CODVN F/G (PASSCODE)', 0, 0); +INSERT INTO hashtype (hashtypeid, description, issalted, isslowhash) VALUES (7801, 'SAP CODVN F/G (PASSCODE) from RFC_READ_TABLE', 0, 0); +INSERT INTO hashtype (hashtypeid, description, issalted, isslowhash) VALUES (7900, 'Drupal7', 0, 0); +INSERT INTO hashtype (hashtypeid, description, issalted, isslowhash) VALUES (8000, 'Sybase ASE', 0, 0); +INSERT INTO hashtype (hashtypeid, description, issalted, isslowhash) VALUES (8100, 'Citrix Netscaler', 0, 0); +INSERT INTO hashtype (hashtypeid, description, issalted, isslowhash) VALUES (8200, '1Password, Cloud Keychain', 0, 1); +INSERT INTO hashtype (hashtypeid, description, issalted, isslowhash) VALUES (8300, 'DNSSEC (NSEC3)', 1, 0); +INSERT INTO hashtype (hashtypeid, description, issalted, isslowhash) VALUES (8400, 'WBB3, Woltlab Burning Board 3', 1, 0); +INSERT INTO hashtype (hashtypeid, description, issalted, isslowhash) VALUES (8500, 'RACF', 0, 0); +INSERT INTO hashtype (hashtypeid, description, issalted, isslowhash) VALUES (8501, 'AS/400 DES', 0, 0); +INSERT INTO hashtype (hashtypeid, description, issalted, isslowhash) VALUES (8600, 'Lotus Notes/Domino 5', 0, 0); +INSERT INTO hashtype (hashtypeid, description, issalted, isslowhash) VALUES (8700, 'Lotus Notes/Domino 6', 0, 0); +INSERT INTO hashtype (hashtypeid, description, issalted, isslowhash) VALUES (8800, 'Android FDE <= 4.3', 0, 1); +INSERT INTO hashtype (hashtypeid, description, issalted, isslowhash) VALUES (8900, 'scrypt', 1, 0); +INSERT INTO hashtype (hashtypeid, description, issalted, isslowhash) VALUES (9000, 'Password Safe v2', 0, 0); +INSERT INTO hashtype (hashtypeid, description, issalted, isslowhash) VALUES (9100, 'Lotus Notes/Domino', 0, 1); +INSERT INTO hashtype (hashtypeid, description, issalted, isslowhash) VALUES (9200, 'Cisco $8$', 0, 1); +INSERT INTO hashtype (hashtypeid, description, issalted, isslowhash) VALUES (9300, 'Cisco $9$', 0, 0); +INSERT INTO hashtype (hashtypeid, description, issalted, isslowhash) VALUES (9400, 'Office 2007', 0, 1); +INSERT INTO hashtype (hashtypeid, description, issalted, isslowhash) VALUES (9500, 'Office 2010', 0, 1); +INSERT INTO hashtype (hashtypeid, description, issalted, isslowhash) VALUES (9600, 'Office 2013', 0, 1); +INSERT INTO hashtype (hashtypeid, description, issalted, isslowhash) VALUES (9700, 'MS Office ⇐ 2003 MD5 + RC4, oldoffice$0, oldoffice$1', 0, 0); +INSERT INTO hashtype (hashtypeid, description, issalted, isslowhash) VALUES (9710, 'MS Office <= 2003 $0/$1, MD5 + RC4, collider #1', 0, 0); +INSERT INTO hashtype (hashtypeid, description, issalted, isslowhash) VALUES (9720, 'MS Office <= 2003 $0/$1, MD5 + RC4, collider #2', 0, 0); +INSERT INTO hashtype (hashtypeid, description, issalted, isslowhash) VALUES (9800, 'MS Office ⇐ 2003 SHA1 + RC4, oldoffice$3, oldoffice$4', 0, 0); +INSERT INTO hashtype (hashtypeid, description, issalted, isslowhash) VALUES (9810, 'MS Office <= 2003 $3, SHA1 + RC4, collider #1', 0, 0); +INSERT INTO hashtype (hashtypeid, description, issalted, isslowhash) VALUES (9820, 'MS Office <= 2003 $3, SHA1 + RC4, collider #2', 0, 0); +INSERT INTO hashtype (hashtypeid, description, issalted, isslowhash) VALUES (9900, 'Radmin2', 0, 0); +INSERT INTO hashtype (hashtypeid, description, issalted, isslowhash) VALUES (10000, 'Django (PBKDF2-SHA256)', 0, 1); +INSERT INTO hashtype (hashtypeid, description, issalted, isslowhash) VALUES (10100, 'SipHash', 1, 0); +INSERT INTO hashtype (hashtypeid, description, issalted, isslowhash) VALUES (10200, 'Cram MD5', 0, 0); +INSERT INTO hashtype (hashtypeid, description, issalted, isslowhash) VALUES (10300, 'SAP CODVN H (PWDSALTEDHASH) iSSHA-1', 0, 0); +INSERT INTO hashtype (hashtypeid, description, issalted, isslowhash) VALUES (10400, 'PDF 1.1 - 1.3 (Acrobat 2 - 4)', 0, 0); +INSERT INTO hashtype (hashtypeid, description, issalted, isslowhash) VALUES (10410, 'PDF 1.1 - 1.3 (Acrobat 2 - 4), collider #1', 0, 0); +INSERT INTO hashtype (hashtypeid, description, issalted, isslowhash) VALUES (10420, 'PDF 1.1 - 1.3 (Acrobat 2 - 4), collider #2', 0, 0); +INSERT INTO hashtype (hashtypeid, description, issalted, isslowhash) VALUES (10500, 'PDF 1.4 - 1.6 (Acrobat 5 - 8)', 0, 0); +INSERT INTO hashtype (hashtypeid, description, issalted, isslowhash) VALUES (10510, 'PDF 1.3 - 1.6 (Acrobat 4 - 8) w/ RC4-40', 0, 1); +INSERT INTO hashtype (hashtypeid, description, issalted, isslowhash) VALUES (10600, 'PDF 1.7 Level 3 (Acrobat 9)', 0, 0); +INSERT INTO hashtype (hashtypeid, description, issalted, isslowhash) VALUES (10700, 'PDF 1.7 Level 8 (Acrobat 10 - 11)', 0, 0); +INSERT INTO hashtype (hashtypeid, description, issalted, isslowhash) VALUES (10800, 'SHA384', 0, 0); +INSERT INTO hashtype (hashtypeid, description, issalted, isslowhash) VALUES (10810, 'sha384($pass.$salt)', 1, 0); +INSERT INTO hashtype (hashtypeid, description, issalted, isslowhash) VALUES (10820, 'sha384($salt.$pass)', 1, 0); +INSERT INTO hashtype (hashtypeid, description, issalted, isslowhash) VALUES (10830, 'sha384(utf16le($pass).$salt)', 1, 0); +INSERT INTO hashtype (hashtypeid, description, issalted, isslowhash) VALUES (10840, 'sha384($salt.utf16le($pass))', 1, 0); +INSERT INTO hashtype (hashtypeid, description, issalted, isslowhash) VALUES (10870, 'sha384(utf16le($pass))', 0, 0); +INSERT INTO hashtype (hashtypeid, description, issalted, isslowhash) VALUES (10900, 'PBKDF2-HMAC-SHA256', 0, 1); +INSERT INTO hashtype (hashtypeid, description, issalted, isslowhash) VALUES (10901, 'RedHat 389-DS LDAP (PBKDF2-HMAC-SHA256)', 0, 1); +INSERT INTO hashtype (hashtypeid, description, issalted, isslowhash) VALUES (11000, 'PrestaShop', 1, 0); +INSERT INTO hashtype (hashtypeid, description, issalted, isslowhash) VALUES (11100, 'PostgreSQL Challenge-Response Authentication (MD5)', 0, 0); +INSERT INTO hashtype (hashtypeid, description, issalted, isslowhash) VALUES (11200, 'MySQL Challenge-Response Authentication (SHA1)', 0, 0); +INSERT INTO hashtype (hashtypeid, description, issalted, isslowhash) VALUES (11300, 'Bitcoin/Litecoin wallet.dat', 0, 1); +INSERT INTO hashtype (hashtypeid, description, issalted, isslowhash) VALUES (11400, 'SIP digest authentication (MD5)', 0, 0); +INSERT INTO hashtype (hashtypeid, description, issalted, isslowhash) VALUES (11500, 'CRC32', 1, 0); +INSERT INTO hashtype (hashtypeid, description, issalted, isslowhash) VALUES (11600, '7-Zip', 0, 0); +INSERT INTO hashtype (hashtypeid, description, issalted, isslowhash) VALUES (11700, 'GOST R 34.11-2012 (Streebog) 256-bit', 0, 0); +INSERT INTO hashtype (hashtypeid, description, issalted, isslowhash) VALUES (11750, 'HMAC-Streebog-256 (key = $pass), big-endian', 0, 0); +INSERT INTO hashtype (hashtypeid, description, issalted, isslowhash) VALUES (11760, 'HMAC-Streebog-256 (key = $salt), big-endian', 0, 0); +INSERT INTO hashtype (hashtypeid, description, issalted, isslowhash) VALUES (11800, 'GOST R 34.11-2012 (Streebog) 512-bit', 0, 0); +INSERT INTO hashtype (hashtypeid, description, issalted, isslowhash) VALUES (11850, 'HMAC-Streebog-512 (key = $pass), big-endian', 0, 0); +INSERT INTO hashtype (hashtypeid, description, issalted, isslowhash) VALUES (11860, 'HMAC-Streebog-512 (key = $salt), big-endian', 0, 0); +INSERT INTO hashtype (hashtypeid, description, issalted, isslowhash) VALUES (11900, 'PBKDF2-HMAC-MD5', 0, 1); +INSERT INTO hashtype (hashtypeid, description, issalted, isslowhash) VALUES (12000, 'PBKDF2-HMAC-SHA1', 0, 1); +INSERT INTO hashtype (hashtypeid, description, issalted, isslowhash) VALUES (12001, 'Atlassian (PBKDF2-HMAC-SHA1)', 0, 1); +INSERT INTO hashtype (hashtypeid, description, issalted, isslowhash) VALUES (12100, 'PBKDF2-HMAC-SHA512', 0, 1); +INSERT INTO hashtype (hashtypeid, description, issalted, isslowhash) VALUES (12150, 'Apache Shiro 1 SHA-512', 0, 1); +INSERT INTO hashtype (hashtypeid, description, issalted, isslowhash) VALUES (12200, 'eCryptfs', 0, 1); +INSERT INTO hashtype (hashtypeid, description, issalted, isslowhash) VALUES (12300, 'Oracle T: Type (Oracle 12+)', 0, 1); +INSERT INTO hashtype (hashtypeid, description, issalted, isslowhash) VALUES (12400, 'BSDiCrypt, Extended DES', 0, 0); +INSERT INTO hashtype (hashtypeid, description, issalted, isslowhash) VALUES (12500, 'RAR3-hp', 0, 0); +INSERT INTO hashtype (hashtypeid, description, issalted, isslowhash) VALUES (12600, 'ColdFusion 10+', 1, 0); +INSERT INTO hashtype (hashtypeid, description, issalted, isslowhash) VALUES (12700, 'Blockchain, My Wallet', 0, 1); +INSERT INTO hashtype (hashtypeid, description, issalted, isslowhash) VALUES (12800, 'MS-AzureSync PBKDF2-HMAC-SHA256', 0, 1); +INSERT INTO hashtype (hashtypeid, description, issalted, isslowhash) VALUES (12900, 'Android FDE (Samsung DEK)', 0, 1); +INSERT INTO hashtype (hashtypeid, description, issalted, isslowhash) VALUES (13000, 'RAR5', 0, 1); +INSERT INTO hashtype (hashtypeid, description, issalted, isslowhash) VALUES (13100, 'Kerberos 5 TGS-REP etype 23', 0, 0); +INSERT INTO hashtype (hashtypeid, description, issalted, isslowhash) VALUES (13200, 'AxCrypt', 0, 0); +INSERT INTO hashtype (hashtypeid, description, issalted, isslowhash) VALUES (13300, 'AxCrypt in memory SHA1', 0, 0); +INSERT INTO hashtype (hashtypeid, description, issalted, isslowhash) VALUES (13400, 'Keepass 1/2 AES/Twofish with/without keyfile', 0, 0); +INSERT INTO hashtype (hashtypeid, description, issalted, isslowhash) VALUES (13500, 'PeopleSoft PS_TOKEN', 1, 0); +INSERT INTO hashtype (hashtypeid, description, issalted, isslowhash) VALUES (13600, 'WinZip', 0, 1); +INSERT INTO hashtype (hashtypeid, description, issalted, isslowhash) VALUES (13711, 'VeraCrypt PBKDF2-HMAC-RIPEMD160 + AES, Serpent, Twofish', 0, 1); +INSERT INTO hashtype (hashtypeid, description, issalted, isslowhash) VALUES (13712, 'VeraCrypt PBKDF2-HMAC-RIPEMD160 + AES-Twofish, Serpent-AES, Twofish-Serpent', 0, 1); +INSERT INTO hashtype (hashtypeid, description, issalted, isslowhash) VALUES (13713, 'VeraCrypt PBKDF2-HMAC-RIPEMD160 + Serpent-Twofish-AES', 0, 1); +INSERT INTO hashtype (hashtypeid, description, issalted, isslowhash) VALUES (20730, 'sha256(sha256($pass.$salt))', 1, 0); +INSERT INTO hashtype (hashtypeid, description, issalted, isslowhash) VALUES (13721, 'VeraCrypt PBKDF2-HMAC-SHA512 + AES, Serpent, Twofish', 0, 1); +INSERT INTO hashtype (hashtypeid, description, issalted, isslowhash) VALUES (13722, 'VeraCrypt PBKDF2-HMAC-SHA512 + AES-Twofish, Serpent-AES, Twofish-Serpent', 0, 1); +INSERT INTO hashtype (hashtypeid, description, issalted, isslowhash) VALUES (13723, 'VeraCrypt PBKDF2-HMAC-SHA512 + Serpent-Twofish-AES', 0, 1); +INSERT INTO hashtype (hashtypeid, description, issalted, isslowhash) VALUES (13731, 'VeraCrypt PBKDF2-HMAC-Whirlpool + AES, Serpent, Twofish', 0, 1); +INSERT INTO hashtype (hashtypeid, description, issalted, isslowhash) VALUES (13732, 'VeraCrypt PBKDF2-HMAC-Whirlpool + AES-Twofish, Serpent-AES, Twofish-Serpent', 0, 1); +INSERT INTO hashtype (hashtypeid, description, issalted, isslowhash) VALUES (13733, 'VeraCrypt PBKDF2-HMAC-Whirlpool + Serpent-Twofish-AES', 0, 1); +INSERT INTO hashtype (hashtypeid, description, issalted, isslowhash) VALUES (13741, 'VeraCrypt PBKDF2-HMAC-RIPEMD160 + boot-mode + AES', 0, 1); +INSERT INTO hashtype (hashtypeid, description, issalted, isslowhash) VALUES (13742, 'VeraCrypt PBKDF2-HMAC-RIPEMD160 + boot-mode + AES-Twofish', 0, 1); +INSERT INTO hashtype (hashtypeid, description, issalted, isslowhash) VALUES (13743, 'VeraCrypt PBKDF2-HMAC-RIPEMD160 + boot-mode + AES-Twofish-Serpent', 0, 1); +INSERT INTO hashtype (hashtypeid, description, issalted, isslowhash) VALUES (13751, 'VeraCrypt PBKDF2-HMAC-SHA256 + AES, Serpent, Twofish', 0, 1); +INSERT INTO hashtype (hashtypeid, description, issalted, isslowhash) VALUES (13752, 'VeraCrypt PBKDF2-HMAC-SHA256 + AES-Twofish, Serpent-AES, Twofish-Serpent', 0, 1); +INSERT INTO hashtype (hashtypeid, description, issalted, isslowhash) VALUES (13753, 'VeraCrypt PBKDF2-HMAC-SHA256 + Serpent-Twofish-AES', 0, 1); +INSERT INTO hashtype (hashtypeid, description, issalted, isslowhash) VALUES (13761, 'VeraCrypt PBKDF2-HMAC-SHA256 + boot-mode (PIM + AES | Twofish)', 0, 1); +INSERT INTO hashtype (hashtypeid, description, issalted, isslowhash) VALUES (13762, 'VeraCrypt PBKDF2-HMAC-SHA256 + boot-mode + Serpent-AES', 0, 1); +INSERT INTO hashtype (hashtypeid, description, issalted, isslowhash) VALUES (13763, 'VeraCrypt PBKDF2-HMAC-SHA256 + boot-mode + Serpent-Twofish-AES', 0, 1); +INSERT INTO hashtype (hashtypeid, description, issalted, isslowhash) VALUES (13771, 'VeraCrypt Streebog-512 + XTS 512 bit', 0, 1); +INSERT INTO hashtype (hashtypeid, description, issalted, isslowhash) VALUES (13772, 'VeraCrypt Streebog-512 + XTS 1024 bit', 0, 1); +INSERT INTO hashtype (hashtypeid, description, issalted, isslowhash) VALUES (13773, 'VeraCrypt Streebog-512 + XTS 1536 bit', 0, 1); +INSERT INTO hashtype (hashtypeid, description, issalted, isslowhash) VALUES (13781, 'VeraCrypt Streebog-512 + XTS 512 bit + boot-mode (legacy)', 0, 1); +INSERT INTO hashtype (hashtypeid, description, issalted, isslowhash) VALUES (13782, 'VeraCrypt Streebog-512 + XTS 1024 bit + boot-mode (legacy)', 0, 1); +INSERT INTO hashtype (hashtypeid, description, issalted, isslowhash) VALUES (13783, 'VeraCrypt Streebog-512 + XTS 1536 bit + boot-mode (legacy)', 0, 1); +INSERT INTO hashtype (hashtypeid, description, issalted, isslowhash) VALUES (13800, 'Windows 8+ phone PIN/Password', 1, 0); +INSERT INTO hashtype (hashtypeid, description, issalted, isslowhash) VALUES (13900, 'OpenCart', 1, 0); +INSERT INTO hashtype (hashtypeid, description, issalted, isslowhash) VALUES (14000, 'DES (PT = $salt, key = $pass)', 1, 0); +INSERT INTO hashtype (hashtypeid, description, issalted, isslowhash) VALUES (14100, '3DES (PT = $salt, key = $pass)', 1, 0); +INSERT INTO hashtype (hashtypeid, description, issalted, isslowhash) VALUES (14200, 'RACF KDFAES', 0, 1); +INSERT INTO hashtype (hashtypeid, description, issalted, isslowhash) VALUES (14400, 'sha1(CX)', 1, 0); +INSERT INTO hashtype (hashtypeid, description, issalted, isslowhash) VALUES (14500, 'Linux Kernel Crypto API (2.4)', 0, 0); +INSERT INTO hashtype (hashtypeid, description, issalted, isslowhash) VALUES (14600, 'LUKS 10', 0, 1); +INSERT INTO hashtype (hashtypeid, description, issalted, isslowhash) VALUES (14700, 'iTunes Backup < 10.0 11', 0, 1); +INSERT INTO hashtype (hashtypeid, description, issalted, isslowhash) VALUES (14800, 'iTunes Backup >= 10.0 11', 0, 1); +INSERT INTO hashtype (hashtypeid, description, issalted, isslowhash) VALUES (14900, 'Skip32 12', 1, 0); +INSERT INTO hashtype (hashtypeid, description, issalted, isslowhash) VALUES (15000, 'FileZilla Server >= 0.9.55', 1, 0); +INSERT INTO hashtype (hashtypeid, description, issalted, isslowhash) VALUES (15100, 'Juniper/NetBSD sha1crypt', 0, 1); +INSERT INTO hashtype (hashtypeid, description, issalted, isslowhash) VALUES (15200, 'Blockchain, My Wallet, V2', 0, 0); +INSERT INTO hashtype (hashtypeid, description, issalted, isslowhash) VALUES (15300, 'DPAPI masterkey file v1 and v2', 0, 1); +INSERT INTO hashtype (hashtypeid, description, issalted, isslowhash) VALUES (15310, 'DPAPI masterkey file v1 (context 3)', 0, 1); +INSERT INTO hashtype (hashtypeid, description, issalted, isslowhash) VALUES (15400, 'ChaCha20', 0, 0); +INSERT INTO hashtype (hashtypeid, description, issalted, isslowhash) VALUES (15500, 'JKS Java Key Store Private Keys (SHA1)', 0, 0); +INSERT INTO hashtype (hashtypeid, description, issalted, isslowhash) VALUES (15600, 'Ethereum Wallet, PBKDF2-HMAC-SHA256', 0, 1); +INSERT INTO hashtype (hashtypeid, description, issalted, isslowhash) VALUES (15700, 'Ethereum Wallet, SCRYPT', 0, 0); +INSERT INTO hashtype (hashtypeid, description, issalted, isslowhash) VALUES (15900, 'DPAPI master key file version 2 + Active Directory domain context', 0, 1); +INSERT INTO hashtype (hashtypeid, description, issalted, isslowhash) VALUES (15910, 'DPAPI masterkey file v2 (context 3)', 0, 1); +INSERT INTO hashtype (hashtypeid, description, issalted, isslowhash) VALUES (16000, 'Tripcode', 0, 0); +INSERT INTO hashtype (hashtypeid, description, issalted, isslowhash) VALUES (16100, 'TACACS+', 0, 0); +INSERT INTO hashtype (hashtypeid, description, issalted, isslowhash) VALUES (16200, 'Apple Secure Notes', 0, 1); +INSERT INTO hashtype (hashtypeid, description, issalted, isslowhash) VALUES (16300, 'Ethereum Pre-Sale Wallet, PBKDF2-HMAC-SHA256', 0, 1); +INSERT INTO hashtype (hashtypeid, description, issalted, isslowhash) VALUES (16400, 'CRAM-MD5 Dovecot', 0, 0); +INSERT INTO hashtype (hashtypeid, description, issalted, isslowhash) VALUES (16500, 'JWT (JSON Web Token)', 0, 0); +INSERT INTO hashtype (hashtypeid, description, issalted, isslowhash) VALUES (16501, 'Perl Mojolicious session cookie (HMAC-SHA256, >= v9.19)', 0, 0); +INSERT INTO hashtype (hashtypeid, description, issalted, isslowhash) VALUES (16600, 'Electrum Wallet (Salt-Type 1-3)', 0, 0); +INSERT INTO hashtype (hashtypeid, description, issalted, isslowhash) VALUES (16700, 'FileVault 2', 0, 1); +INSERT INTO hashtype (hashtypeid, description, issalted, isslowhash) VALUES (16800, 'WPA-PMKID-PBKDF2', 0, 1); +INSERT INTO hashtype (hashtypeid, description, issalted, isslowhash) VALUES (16801, 'WPA-PMKID-PMK', 0, 1); +INSERT INTO hashtype (hashtypeid, description, issalted, isslowhash) VALUES (16900, 'Ansible Vault', 0, 1); +INSERT INTO hashtype (hashtypeid, description, issalted, isslowhash) VALUES (17010, 'GPG (AES-128/AES-256 (SHA-1($pass)))', 0, 1); +INSERT INTO hashtype (hashtypeid, description, issalted, isslowhash) VALUES (17020, 'GPG (AES-128/AES-256 (SHA-512($pass)))', 0, 1); +INSERT INTO hashtype (hashtypeid, description, issalted, isslowhash) VALUES (17030, 'GPG (AES-128/AES-256 (SHA-256($pass)))', 0, 1); +INSERT INTO hashtype (hashtypeid, description, issalted, isslowhash) VALUES (17040, 'GPG (CAST5 (SHA-1($pass)))', 0, 1); +INSERT INTO hashtype (hashtypeid, description, issalted, isslowhash) VALUES (17200, 'PKZIP (Compressed)', 0, 0); +INSERT INTO hashtype (hashtypeid, description, issalted, isslowhash) VALUES (17210, 'PKZIP (Uncompressed)', 0, 0); +INSERT INTO hashtype (hashtypeid, description, issalted, isslowhash) VALUES (17220, 'PKZIP (Compressed Multi-File)', 0, 0); +INSERT INTO hashtype (hashtypeid, description, issalted, isslowhash) VALUES (17225, 'PKZIP (Mixed Multi-File)', 0, 0); +INSERT INTO hashtype (hashtypeid, description, issalted, isslowhash) VALUES (17230, 'PKZIP (Compressed Multi-File Checksum-Only)', 0, 0); +INSERT INTO hashtype (hashtypeid, description, issalted, isslowhash) VALUES (17300, 'SHA3-224', 0, 0); +INSERT INTO hashtype (hashtypeid, description, issalted, isslowhash) VALUES (17400, 'SHA3-256', 0, 0); +INSERT INTO hashtype (hashtypeid, description, issalted, isslowhash) VALUES (17500, 'SHA3-384', 0, 0); +INSERT INTO hashtype (hashtypeid, description, issalted, isslowhash) VALUES (17600, 'SHA3-512', 0, 0); +INSERT INTO hashtype (hashtypeid, description, issalted, isslowhash) VALUES (17700, 'Keccak-224', 0, 0); +INSERT INTO hashtype (hashtypeid, description, issalted, isslowhash) VALUES (17800, 'Keccak-256', 0, 0); +INSERT INTO hashtype (hashtypeid, description, issalted, isslowhash) VALUES (17900, 'Keccak-384', 0, 0); +INSERT INTO hashtype (hashtypeid, description, issalted, isslowhash) VALUES (18000, 'Keccak-512', 0, 0); +INSERT INTO hashtype (hashtypeid, description, issalted, isslowhash) VALUES (18100, 'TOTP (HMAC-SHA1)', 1, 0); +INSERT INTO hashtype (hashtypeid, description, issalted, isslowhash) VALUES (18200, 'Kerberos 5 AS-REP etype 23', 0, 1); +INSERT INTO hashtype (hashtypeid, description, issalted, isslowhash) VALUES (18300, 'Apple File System (APFS)', 0, 1); +INSERT INTO hashtype (hashtypeid, description, issalted, isslowhash) VALUES (18400, 'Open Document Format (ODF) 1.2 (SHA-256, AES)', 0, 1); +INSERT INTO hashtype (hashtypeid, description, issalted, isslowhash) VALUES (18500, 'sha1(md5(md5($pass)))', 0, 0); +INSERT INTO hashtype (hashtypeid, description, issalted, isslowhash) VALUES (18600, 'Open Document Format (ODF) 1.1 (SHA-1, Blowfish)', 0, 1); +INSERT INTO hashtype (hashtypeid, description, issalted, isslowhash) VALUES (18700, 'Java Object hashCode()', 0, 1); +INSERT INTO hashtype (hashtypeid, description, issalted, isslowhash) VALUES (18800, 'Blockchain, My Wallet, Second Password (SHA256)', 0, 1); +INSERT INTO hashtype (hashtypeid, description, issalted, isslowhash) VALUES (18900, 'Android Backup', 0, 1); +INSERT INTO hashtype (hashtypeid, description, issalted, isslowhash) VALUES (19000, 'QNX /etc/shadow (MD5)', 0, 1); +INSERT INTO hashtype (hashtypeid, description, issalted, isslowhash) VALUES (19100, 'QNX /etc/shadow (SHA256)', 0, 1); +INSERT INTO hashtype (hashtypeid, description, issalted, isslowhash) VALUES (19200, 'QNX /etc/shadow (SHA512)', 0, 1); +INSERT INTO hashtype (hashtypeid, description, issalted, isslowhash) VALUES (19210, 'QNX 7 /etc/shadow (SHA512)', 0, 1); +INSERT INTO hashtype (hashtypeid, description, issalted, isslowhash) VALUES (19300, 'sha1($salt1.$pass.$salt2)', 0, 0); +INSERT INTO hashtype (hashtypeid, description, issalted, isslowhash) VALUES (19500, 'Ruby on Rails Restful-Authentication', 0, 0); +INSERT INTO hashtype (hashtypeid, description, issalted, isslowhash) VALUES (19600, 'Kerberos 5 TGS-REP etype 17 (AES128-CTS-HMAC-SHA1-96)', 0, 1); +INSERT INTO hashtype (hashtypeid, description, issalted, isslowhash) VALUES (19700, 'Kerberos 5 TGS-REP etype 18 (AES256-CTS-HMAC-SHA1-96)', 0, 1); +INSERT INTO hashtype (hashtypeid, description, issalted, isslowhash) VALUES (19800, 'Kerberos 5, etype 17, Pre-Auth', 0, 1); +INSERT INTO hashtype (hashtypeid, description, issalted, isslowhash) VALUES (19900, 'Kerberos 5, etype 18, Pre-Auth', 0, 1); +INSERT INTO hashtype (hashtypeid, description, issalted, isslowhash) VALUES (20011, 'DiskCryptor SHA512 + XTS 512 bit (AES) / DiskCryptor SHA512 + XTS 512 bit (Twofish) / DiskCryptor SHA512 + XTS 512 bit (Serpent)', 0, 1); +INSERT INTO hashtype (hashtypeid, description, issalted, isslowhash) VALUES (20012, 'DiskCryptor SHA512 + XTS 1024 bit (AES-Twofish) / DiskCryptor SHA512 + XTS 1024 bit (Twofish-Serpent) / DiskCryptor SHA512 + XTS 1024 bit (Serpent-AES)', 0, 1); +INSERT INTO hashtype (hashtypeid, description, issalted, isslowhash) VALUES (20013, 'DiskCryptor SHA512 + XTS 1536 bit (AES-Twofish-Serpent)', 0, 1); +INSERT INTO hashtype (hashtypeid, description, issalted, isslowhash) VALUES (20200, 'Python passlib pbkdf2-sha512', 0, 1); +INSERT INTO hashtype (hashtypeid, description, issalted, isslowhash) VALUES (20300, 'Python passlib pbkdf2-sha256', 0, 1); +INSERT INTO hashtype (hashtypeid, description, issalted, isslowhash) VALUES (20400, 'Python passlib pbkdf2-sha1', 0, 0); +INSERT INTO hashtype (hashtypeid, description, issalted, isslowhash) VALUES (20500, 'PKZIP Master Key', 0, 0); +INSERT INTO hashtype (hashtypeid, description, issalted, isslowhash) VALUES (20510, 'PKZIP Master Key (6 byte optimization)', 0, 0); +INSERT INTO hashtype (hashtypeid, description, issalted, isslowhash) VALUES (20600, 'Oracle Transportation Management (SHA256)', 0, 0); +INSERT INTO hashtype (hashtypeid, description, issalted, isslowhash) VALUES (20710, 'sha256(sha256($pass).$salt)', 1, 0); +INSERT INTO hashtype (hashtypeid, description, issalted, isslowhash) VALUES (20711, 'AuthMe sha256', 0, 0); +INSERT INTO hashtype (hashtypeid, description, issalted, isslowhash) VALUES (20712, 'RSA Security Analytics / NetWitness (sha256)', 1, 0); +INSERT INTO hashtype (hashtypeid, description, issalted, isslowhash) VALUES (20720, 'sha256($salt.sha256($pass))', 1, 0); +INSERT INTO hashtype (hashtypeid, description, issalted, isslowhash) VALUES (20800, 'sha256(md5($pass))', 0, 0); +INSERT INTO hashtype (hashtypeid, description, issalted, isslowhash) VALUES (20900, 'md5(sha1($pass).md5($pass).sha1($pass))', 0, 0); +INSERT INTO hashtype (hashtypeid, description, issalted, isslowhash) VALUES (21000, 'BitShares v0.x - sha512(sha512_bin(pass))', 0, 0); +INSERT INTO hashtype (hashtypeid, description, issalted, isslowhash) VALUES (21100, 'sha1(md5($pass.$salt))', 1, 0); +INSERT INTO hashtype (hashtypeid, description, issalted, isslowhash) VALUES (21200, 'md5(sha1($salt).md5($pass))', 1, 0); +INSERT INTO hashtype (hashtypeid, description, issalted, isslowhash) VALUES (21300, 'md5($salt.sha1($salt.$pass))', 1, 0); +INSERT INTO hashtype (hashtypeid, description, issalted, isslowhash) VALUES (21310, 'md5($salt1.sha1($salt2.$pass))', 1, 0); +INSERT INTO hashtype (hashtypeid, description, issalted, isslowhash) VALUES (21400, 'sha256(sha256_bin(pass))', 0, 0); +INSERT INTO hashtype (hashtypeid, description, issalted, isslowhash) VALUES (21420, 'sha256($salt.sha256_bin($pass))', 1, 0); +INSERT INTO hashtype (hashtypeid, description, issalted, isslowhash) VALUES (21500, 'SolarWinds Orion', 0, 0); +INSERT INTO hashtype (hashtypeid, description, issalted, isslowhash) VALUES (21501, 'SolarWinds Orion v2', 0, 0); +INSERT INTO hashtype (hashtypeid, description, issalted, isslowhash) VALUES (21600, 'Web2py pbkdf2-sha512', 0, 0); +INSERT INTO hashtype (hashtypeid, description, issalted, isslowhash) VALUES (21700, 'Electrum Wallet (Salt-Type 4)', 0, 0); +INSERT INTO hashtype (hashtypeid, description, issalted, isslowhash) VALUES (21800, 'Electrum Wallet (Salt-Type 5)', 0, 0); +INSERT INTO hashtype (hashtypeid, description, issalted, isslowhash) VALUES (21900, 'md5(md5(md5($pass.$salt1)).$salt2)', 0, 0); +INSERT INTO hashtype (hashtypeid, description, issalted, isslowhash) VALUES (22000, 'WPA-PBKDF2-PMKID+EAPOL', 0, 0); +INSERT INTO hashtype (hashtypeid, description, issalted, isslowhash) VALUES (22001, 'WPA-PMK-PMKID+EAPOL', 0, 0); +INSERT INTO hashtype (hashtypeid, description, issalted, isslowhash) VALUES (22100, 'BitLocker', 0, 0); +INSERT INTO hashtype (hashtypeid, description, issalted, isslowhash) VALUES (22200, 'Citrix NetScaler (SHA512)', 0, 0); +INSERT INTO hashtype (hashtypeid, description, issalted, isslowhash) VALUES (22300, 'sha256($salt.$pass.$salt)', 1, 0); +INSERT INTO hashtype (hashtypeid, description, issalted, isslowhash) VALUES (22301, 'Telegram client app passcode (SHA256)', 0, 0); +INSERT INTO hashtype (hashtypeid, description, issalted, isslowhash) VALUES (22400, 'AES Crypt (SHA256)', 0, 0); +INSERT INTO hashtype (hashtypeid, description, issalted, isslowhash) VALUES (22500, 'MultiBit Classic .key (MD5)', 0, 0); +INSERT INTO hashtype (hashtypeid, description, issalted, isslowhash) VALUES (22600, 'Telegram Desktop App Passcode (PBKDF2-HMAC-SHA1)', 0, 0); +INSERT INTO hashtype (hashtypeid, description, issalted, isslowhash) VALUES (22700, 'MultiBit HD (scrypt)', 0, 1); +INSERT INTO hashtype (hashtypeid, description, issalted, isslowhash) VALUES (22800, 'Simpla CMS - md5($salt.$pass.md5($pass))', 1, 0); +INSERT INTO hashtype (hashtypeid, description, issalted, isslowhash) VALUES (22911, 'RSA/DSA/EC/OPENSSH Private Keys ($0$)', 0, 0); +INSERT INTO hashtype (hashtypeid, description, issalted, isslowhash) VALUES (22921, 'RSA/DSA/EC/OPENSSH Private Keys ($6$)', 0, 0); +INSERT INTO hashtype (hashtypeid, description, issalted, isslowhash) VALUES (22931, 'RSA/DSA/EC/OPENSSH Private Keys ($1, $3$)', 0, 0); +INSERT INTO hashtype (hashtypeid, description, issalted, isslowhash) VALUES (22941, 'RSA/DSA/EC/OPENSSH Private Keys ($4$)', 0, 0); +INSERT INTO hashtype (hashtypeid, description, issalted, isslowhash) VALUES (22951, 'RSA/DSA/EC/OPENSSH Private Keys ($5$)', 0, 0); +INSERT INTO hashtype (hashtypeid, description, issalted, isslowhash) VALUES (23001, 'SecureZIP AES-128', 0, 0); +INSERT INTO hashtype (hashtypeid, description, issalted, isslowhash) VALUES (23002, 'SecureZIP AES-192', 0, 0); +INSERT INTO hashtype (hashtypeid, description, issalted, isslowhash) VALUES (23003, 'SecureZIP AES-256', 0, 0); +INSERT INTO hashtype (hashtypeid, description, issalted, isslowhash) VALUES (23100, 'Apple Keychain', 0, 1); +INSERT INTO hashtype (hashtypeid, description, issalted, isslowhash) VALUES (23200, 'XMPP SCRAM PBKDF2-SHA1', 0, 0); +INSERT INTO hashtype (hashtypeid, description, issalted, isslowhash) VALUES (23300, 'Apple iWork', 0, 0); +INSERT INTO hashtype (hashtypeid, description, issalted, isslowhash) VALUES (23400, 'Bitwarden', 0, 0); +INSERT INTO hashtype (hashtypeid, description, issalted, isslowhash) VALUES (23500, 'AxCrypt 2 AES-128', 0, 0); +INSERT INTO hashtype (hashtypeid, description, issalted, isslowhash) VALUES (23600, 'AxCrypt 2 AES-256', 0, 0); +INSERT INTO hashtype (hashtypeid, description, issalted, isslowhash) VALUES (23700, 'RAR3-p (Uncompressed)', 0, 0); +INSERT INTO hashtype (hashtypeid, description, issalted, isslowhash) VALUES (23800, 'RAR3-p (Compressed)', 0, 0); +INSERT INTO hashtype (hashtypeid, description, issalted, isslowhash) VALUES (23900, 'BestCrypt v3 Volume Encryption', 0, 0); +INSERT INTO hashtype (hashtypeid, description, issalted, isslowhash) VALUES (24000, 'BestCrypt v4 Volume Encryption', 0, 1); +INSERT INTO hashtype (hashtypeid, description, issalted, isslowhash) VALUES (24100, 'MongoDB ServerKey SCRAM-SHA-1', 0, 0); +INSERT INTO hashtype (hashtypeid, description, issalted, isslowhash) VALUES (24200, 'MongoDB ServerKey SCRAM-SHA-256', 0, 0); +INSERT INTO hashtype (hashtypeid, description, issalted, isslowhash) VALUES (24300, 'sha1($salt.sha1($pass.$salt))', 1, 0); +INSERT INTO hashtype (hashtypeid, description, issalted, isslowhash) VALUES (24410, 'PKCS#8 Private Keys (PBKDF2-HMAC-SHA1 + 3DES/AES)', 0, 0); +INSERT INTO hashtype (hashtypeid, description, issalted, isslowhash) VALUES (24420, 'PKCS#8 Private Keys (PBKDF2-HMAC-SHA256 + 3DES/AES)', 0, 0); +INSERT INTO hashtype (hashtypeid, description, issalted, isslowhash) VALUES (24500, 'Telegram Desktop >= v2.1.14 (PBKDF2-HMAC-SHA512)', 0, 0); +INSERT INTO hashtype (hashtypeid, description, issalted, isslowhash) VALUES (24600, 'SQLCipher', 0, 0); +INSERT INTO hashtype (hashtypeid, description, issalted, isslowhash) VALUES (24700, 'Stuffit5', 0, 0); +INSERT INTO hashtype (hashtypeid, description, issalted, isslowhash) VALUES (24800, 'Umbraco HMAC-SHA1', 0, 0); +INSERT INTO hashtype (hashtypeid, description, issalted, isslowhash) VALUES (24900, 'Dahua Authentication MD5', 0, 0); +INSERT INTO hashtype (hashtypeid, description, issalted, isslowhash) VALUES (25000, 'SNMPv3 HMAC-MD5-96/HMAC-SHA1-96', 0, 1); +INSERT INTO hashtype (hashtypeid, description, issalted, isslowhash) VALUES (25100, 'SNMPv3 HMAC-MD5-96', 0, 1); +INSERT INTO hashtype (hashtypeid, description, issalted, isslowhash) VALUES (25200, 'SNMPv3 HMAC-SHA1-96', 0, 1); +INSERT INTO hashtype (hashtypeid, description, issalted, isslowhash) VALUES (25300, 'MS Office 2016 - SheetProtection', 0, 0); +INSERT INTO hashtype (hashtypeid, description, issalted, isslowhash) VALUES (25400, 'PDF 1.4 - 1.6 (Acrobat 5 - 8) - edit password', 0, 0); +INSERT INTO hashtype (hashtypeid, description, issalted, isslowhash) VALUES (25500, 'Stargazer Stellar Wallet XLM', 0, 0); +INSERT INTO hashtype (hashtypeid, description, issalted, isslowhash) VALUES (25600, 'bcrypt(md5($pass)) / bcryptmd5', 0, 1); +INSERT INTO hashtype (hashtypeid, description, issalted, isslowhash) VALUES (25700, 'MurmurHash', 1, 0); +INSERT INTO hashtype (hashtypeid, description, issalted, isslowhash) VALUES (25800, 'bcrypt(sha1($pass)) / bcryptsha1', 0, 1); +INSERT INTO hashtype (hashtypeid, description, issalted, isslowhash) VALUES (25900, 'KNX IP Secure - Device Authentication Code', 0, 0); +INSERT INTO hashtype (hashtypeid, description, issalted, isslowhash) VALUES (26000, 'Mozilla key3.db', 0, 0); +INSERT INTO hashtype (hashtypeid, description, issalted, isslowhash) VALUES (26100, 'Mozilla key4.db', 0, 0); +INSERT INTO hashtype (hashtypeid, description, issalted, isslowhash) VALUES (26200, 'OpenEdge Progress Encode', 0, 0); +INSERT INTO hashtype (hashtypeid, description, issalted, isslowhash) VALUES (26300, 'FortiGate256 (FortiOS256)', 0, 0); +INSERT INTO hashtype (hashtypeid, description, issalted, isslowhash) VALUES (26401, 'AES-128-ECB NOKDF (PT = $salt, key = $pass)', 0, 0); +INSERT INTO hashtype (hashtypeid, description, issalted, isslowhash) VALUES (26402, 'AES-192-ECB NOKDF (PT = $salt, key = $pass)', 0, 0); +INSERT INTO hashtype (hashtypeid, description, issalted, isslowhash) VALUES (26403, 'AES-256-ECB NOKDF (PT = $salt, key = $pass)', 0, 0); +INSERT INTO hashtype (hashtypeid, description, issalted, isslowhash) VALUES (26500, 'iPhone passcode (UID key + System Keybag)', 0, 0); +INSERT INTO hashtype (hashtypeid, description, issalted, isslowhash) VALUES (26600, 'MetaMask Wallet', 0, 1); +INSERT INTO hashtype (hashtypeid, description, issalted, isslowhash) VALUES (26610, 'MetaMask Wallet (short hash, plaintext check)', 0, 1); +INSERT INTO hashtype (hashtypeid, description, issalted, isslowhash) VALUES (26700, 'SNMPv3 HMAC-SHA224-128', 0, 0); +INSERT INTO hashtype (hashtypeid, description, issalted, isslowhash) VALUES (26800, 'SNMPv3 HMAC-SHA256-192', 0, 0); +INSERT INTO hashtype (hashtypeid, description, issalted, isslowhash) VALUES (26900, 'SNMPv3 HMAC-SHA384-256', 0, 0); +INSERT INTO hashtype (hashtypeid, description, issalted, isslowhash) VALUES (27000, 'NetNTLMv1 / NetNTLMv1+ESS (NT)', 0, 0); +INSERT INTO hashtype (hashtypeid, description, issalted, isslowhash) VALUES (27100, 'NetNTLMv2 (NT)', 0, 0); +INSERT INTO hashtype (hashtypeid, description, issalted, isslowhash) VALUES (27200, 'Ruby on Rails Restful Auth (one round, no sitekey)', 1, 0); +INSERT INTO hashtype (hashtypeid, description, issalted, isslowhash) VALUES (27300, 'SNMPv3 HMAC-SHA512-384', 0, 0); +INSERT INTO hashtype (hashtypeid, description, issalted, isslowhash) VALUES (27400, 'VMware VMX (PBKDF2-HMAC-SHA1 + AES-256-CBC)', 0, 0); +INSERT INTO hashtype (hashtypeid, description, issalted, isslowhash) VALUES (27500, 'VirtualBox (PBKDF2-HMAC-SHA256 & AES-128-XTS)', 0, 1); +INSERT INTO hashtype (hashtypeid, description, issalted, isslowhash) VALUES (27600, 'VirtualBox (PBKDF2-HMAC-SHA256 & AES-256-XTS)', 0, 1); +INSERT INTO hashtype (hashtypeid, description, issalted, isslowhash) VALUES (27700, 'MultiBit Classic .wallet (scrypt)', 0, 0); +INSERT INTO hashtype (hashtypeid, description, issalted, isslowhash) VALUES (27800, 'MurmurHash3', 1, 0); +INSERT INTO hashtype (hashtypeid, description, issalted, isslowhash) VALUES (27900, 'CRC32C', 1, 0); +INSERT INTO hashtype (hashtypeid, description, issalted, isslowhash) VALUES (28000, 'CRC64Jones', 1, 0); +INSERT INTO hashtype (hashtypeid, description, issalted, isslowhash) VALUES (28100, 'Windows Hello PIN/Password', 0, 1); +INSERT INTO hashtype (hashtypeid, description, issalted, isslowhash) VALUES (28200, 'Exodus Desktop Wallet (scrypt)', 0, 0); +INSERT INTO hashtype (hashtypeid, description, issalted, isslowhash) VALUES (28300, 'Teamspeak 3 (channel hash)', 0, 0); +INSERT INTO hashtype (hashtypeid, description, issalted, isslowhash) VALUES (28400, 'bcrypt(sha512($pass)) / bcryptsha512', 0, 0); +INSERT INTO hashtype (hashtypeid, description, issalted, isslowhash) VALUES (28501, 'Bitcoin WIF private key (P2PKH), compressed', 0, 0); +INSERT INTO hashtype (hashtypeid, description, issalted, isslowhash) VALUES (28502, 'Bitcoin WIF private key (P2PKH), uncompressed', 0, 0); +INSERT INTO hashtype (hashtypeid, description, issalted, isslowhash) VALUES (28503, 'Bitcoin WIF private key (P2WPKH, Bech32), compressed', 0, 0); +INSERT INTO hashtype (hashtypeid, description, issalted, isslowhash) VALUES (28504, 'Bitcoin WIF private key (P2WPKH, Bech32), uncompressed', 0, 0); +INSERT INTO hashtype (hashtypeid, description, issalted, isslowhash) VALUES (28505, 'Bitcoin WIF private key (P2SH(P2WPKH)), compressed', 0, 0); +INSERT INTO hashtype (hashtypeid, description, issalted, isslowhash) VALUES (28506, 'Bitcoin WIF private key (P2SH(P2WPKH)), uncompressed', 0, 0); +INSERT INTO hashtype (hashtypeid, description, issalted, isslowhash) VALUES (28600, 'PostgreSQL SCRAM-SHA-256', 0, 1); +INSERT INTO hashtype (hashtypeid, description, issalted, isslowhash) VALUES (28700, 'Amazon AWS4-HMAC-SHA256', 0, 0); +INSERT INTO hashtype (hashtypeid, description, issalted, isslowhash) VALUES (28800, 'Kerberos 5, etype 17, DB', 0, 1); +INSERT INTO hashtype (hashtypeid, description, issalted, isslowhash) VALUES (28900, 'Kerberos 5, etype 18, DB', 0, 1); +INSERT INTO hashtype (hashtypeid, description, issalted, isslowhash) VALUES (29000, 'sha1($salt.sha1(utf16le($username).'':''.utf16le($pass)))', 0, 0); +INSERT INTO hashtype (hashtypeid, description, issalted, isslowhash) VALUES (29100, 'Flask Session Cookie ($salt.$salt.$pass)', 0, 0); +INSERT INTO hashtype (hashtypeid, description, issalted, isslowhash) VALUES (29200, 'Radmin3', 0, 0); +INSERT INTO hashtype (hashtypeid, description, issalted, isslowhash) VALUES (29311, 'TrueCrypt RIPEMD160 + XTS 512 bit', 0, 0); +INSERT INTO hashtype (hashtypeid, description, issalted, isslowhash) VALUES (29312, 'TrueCrypt RIPEMD160 + XTS 1024 bit', 0, 0); +INSERT INTO hashtype (hashtypeid, description, issalted, isslowhash) VALUES (29313, 'TrueCrypt RIPEMD160 + XTS 1536 bit', 0, 0); +INSERT INTO hashtype (hashtypeid, description, issalted, isslowhash) VALUES (29321, 'TrueCrypt SHA512 + XTS 512 bit', 0, 0); +INSERT INTO hashtype (hashtypeid, description, issalted, isslowhash) VALUES (29322, 'TrueCrypt SHA512 + XTS 1024 bit', 0, 0); +INSERT INTO hashtype (hashtypeid, description, issalted, isslowhash) VALUES (29323, 'TrueCrypt SHA512 + XTS 1536 bit', 0, 0); +INSERT INTO hashtype (hashtypeid, description, issalted, isslowhash) VALUES (29331, 'TrueCrypt Whirlpool + XTS 512 bit', 0, 0); +INSERT INTO hashtype (hashtypeid, description, issalted, isslowhash) VALUES (29332, 'TrueCrypt Whirlpool + XTS 1024 bit', 0, 0); +INSERT INTO hashtype (hashtypeid, description, issalted, isslowhash) VALUES (29333, 'TrueCrypt Whirlpool + XTS 1536 bit', 0, 0); +INSERT INTO hashtype (hashtypeid, description, issalted, isslowhash) VALUES (29341, 'TrueCrypt RIPEMD160 + XTS 512 bit + boot-mode', 0, 0); +INSERT INTO hashtype (hashtypeid, description, issalted, isslowhash) VALUES (29342, 'TrueCrypt RIPEMD160 + XTS 1024 bit + boot-mode', 0, 0); +INSERT INTO hashtype (hashtypeid, description, issalted, isslowhash) VALUES (29343, 'TrueCrypt RIPEMD160 + XTS 1536 bit + boot-mode', 0, 0); +INSERT INTO hashtype (hashtypeid, description, issalted, isslowhash) VALUES (29411, 'VeraCrypt RIPEMD160 + XTS 512 bit', 0, 0); +INSERT INTO hashtype (hashtypeid, description, issalted, isslowhash) VALUES (29412, 'VeraCrypt RIPEMD160 + XTS 1024 bit', 0, 0); +INSERT INTO hashtype (hashtypeid, description, issalted, isslowhash) VALUES (29413, 'VeraCrypt RIPEMD160 + XTS 1536 bit', 0, 0); +INSERT INTO hashtype (hashtypeid, description, issalted, isslowhash) VALUES (29421, 'VeraCrypt SHA512 + XTS 512 bit', 0, 0); +INSERT INTO hashtype (hashtypeid, description, issalted, isslowhash) VALUES (29422, 'VeraCrypt SHA512 + XTS 1024 bit', 0, 0); +INSERT INTO hashtype (hashtypeid, description, issalted, isslowhash) VALUES (29423, 'VeraCrypt SHA512 + XTS 1536 bit', 0, 0); +INSERT INTO hashtype (hashtypeid, description, issalted, isslowhash) VALUES (29431, 'VeraCrypt Whirlpool + XTS 512 bit', 0, 0); +INSERT INTO hashtype (hashtypeid, description, issalted, isslowhash) VALUES (29432, 'VeraCrypt Whirlpool + XTS 1024 bit', 0, 0); +INSERT INTO hashtype (hashtypeid, description, issalted, isslowhash) VALUES (29433, 'VeraCrypt Whirlpool + XTS 1536 bit', 0, 0); +INSERT INTO hashtype (hashtypeid, description, issalted, isslowhash) VALUES (29441, 'VeraCrypt RIPEMD160 + XTS 512 bit + boot-mode', 0, 0); +INSERT INTO hashtype (hashtypeid, description, issalted, isslowhash) VALUES (29442, 'VeraCrypt RIPEMD160 + XTS 1024 bit + boot-mode', 0, 0); +INSERT INTO hashtype (hashtypeid, description, issalted, isslowhash) VALUES (29443, 'VeraCrypt RIPEMD160 + XTS 1536 bit + boot-mode', 0, 0); +INSERT INTO hashtype (hashtypeid, description, issalted, isslowhash) VALUES (29451, 'VeraCrypt SHA256 + XTS 512 bit', 0, 0); +INSERT INTO hashtype (hashtypeid, description, issalted, isslowhash) VALUES (29452, 'VeraCrypt SHA256 + XTS 1024 bit', 0, 0); +INSERT INTO hashtype (hashtypeid, description, issalted, isslowhash) VALUES (29453, 'VeraCrypt SHA256 + XTS 1536 bit', 0, 0); +INSERT INTO hashtype (hashtypeid, description, issalted, isslowhash) VALUES (29461, 'VeraCrypt SHA256 + XTS 512 bit + boot-mode', 0, 0); +INSERT INTO hashtype (hashtypeid, description, issalted, isslowhash) VALUES (29462, 'VeraCrypt SHA256 + XTS 1024 bit + boot-mode', 0, 0); +INSERT INTO hashtype (hashtypeid, description, issalted, isslowhash) VALUES (29463, 'VeraCrypt SHA256 + XTS 1536 bit + boot-mode', 0, 0); +INSERT INTO hashtype (hashtypeid, description, issalted, isslowhash) VALUES (29471, 'VeraCrypt Streebog-512 + XTS 512 bit', 0, 0); +INSERT INTO hashtype (hashtypeid, description, issalted, isslowhash) VALUES (29472, 'VeraCrypt Streebog-512 + XTS 1024 bit', 0, 0); +INSERT INTO hashtype (hashtypeid, description, issalted, isslowhash) VALUES (29473, 'VeraCrypt Streebog-512 + XTS 1536 bit', 0, 0); +INSERT INTO hashtype (hashtypeid, description, issalted, isslowhash) VALUES (29481, 'VeraCrypt Streebog-512 + XTS 512 bit + boot-mode', 0, 0); +INSERT INTO hashtype (hashtypeid, description, issalted, isslowhash) VALUES (29482, 'VeraCrypt Streebog-512 + XTS 1024 bit + boot-mode', 0, 0); +INSERT INTO hashtype (hashtypeid, description, issalted, isslowhash) VALUES (29483, 'VeraCrypt Streebog-512 + XTS 1536 bit + boot-mode', 0, 0); +INSERT INTO hashtype (hashtypeid, description, issalted, isslowhash) VALUES (29511, 'LUKS v1 SHA-1 + AES', 0, 1); +INSERT INTO hashtype (hashtypeid, description, issalted, isslowhash) VALUES (29512, 'LUKS v1 SHA-1 + Serpent', 0, 1); +INSERT INTO hashtype (hashtypeid, description, issalted, isslowhash) VALUES (29513, 'LUKS v1 SHA-1 + Twofish', 0, 1); +INSERT INTO hashtype (hashtypeid, description, issalted, isslowhash) VALUES (29521, 'LUKS v1 SHA-256 + AES', 0, 1); +INSERT INTO hashtype (hashtypeid, description, issalted, isslowhash) VALUES (29522, 'LUKS v1 SHA-256 + Serpent', 0, 1); +INSERT INTO hashtype (hashtypeid, description, issalted, isslowhash) VALUES (29523, 'LUKS v1 SHA-256 + Twofish', 0, 1); +INSERT INTO hashtype (hashtypeid, description, issalted, isslowhash) VALUES (29531, 'LUKS v1 SHA-512 + AES', 0, 1); +INSERT INTO hashtype (hashtypeid, description, issalted, isslowhash) VALUES (29532, 'LUKS v1 SHA-512 + Serpent', 0, 1); +INSERT INTO hashtype (hashtypeid, description, issalted, isslowhash) VALUES (29533, 'LUKS v1 SHA-512 + Twofish', 0, 1); +INSERT INTO hashtype (hashtypeid, description, issalted, isslowhash) VALUES (29541, 'LUKS v1 RIPEMD-160 + AES', 0, 1); +INSERT INTO hashtype (hashtypeid, description, issalted, isslowhash) VALUES (29542, 'LUKS v1 RIPEMD-160 + Serpent', 0, 1); +INSERT INTO hashtype (hashtypeid, description, issalted, isslowhash) VALUES (29543, 'LUKS v1 RIPEMD-160 + Twofish', 0, 1); +INSERT INTO hashtype (hashtypeid, description, issalted, isslowhash) VALUES (29600, 'Terra Station Wallet (AES256-CBC(PBKDF2($pass)))', 0, 1); +INSERT INTO hashtype (hashtypeid, description, issalted, isslowhash) VALUES (29700, 'KeePass 1 (AES/Twofish) and KeePass 2 (AES) - keyfile only mode', 0, 1); +INSERT INTO hashtype (hashtypeid, description, issalted, isslowhash) VALUES (29800, 'Bisq .wallet (scrypt)', 0, 1); +INSERT INTO hashtype (hashtypeid, description, issalted, isslowhash) VALUES (29910, 'ENCsecurity Datavault (PBKDF2/no keychain)', 0, 1); +INSERT INTO hashtype (hashtypeid, description, issalted, isslowhash) VALUES (29920, 'ENCsecurity Datavault (PBKDF2/keychain)', 0, 1); +INSERT INTO hashtype (hashtypeid, description, issalted, isslowhash) VALUES (29930, 'ENCsecurity Datavault (MD5/no keychain)', 0, 1); +INSERT INTO hashtype (hashtypeid, description, issalted, isslowhash) VALUES (29940, 'ENCsecurity Datavault (MD5/keychain)', 0, 1); +INSERT INTO hashtype (hashtypeid, description, issalted, isslowhash) VALUES (30000, 'Python Werkzeug MD5 (HMAC-MD5 (key = $salt))', 0, 0); +INSERT INTO hashtype (hashtypeid, description, issalted, isslowhash) VALUES (30120, 'Python Werkzeug SHA256 (HMAC-SHA256 (key = $salt))', 0, 0); +INSERT INTO hashtype (hashtypeid, description, issalted, isslowhash) VALUES (30420, 'DANE RFC7929/RFC8162 SHA2-256', 0, 0); +INSERT INTO hashtype (hashtypeid, description, issalted, isslowhash) VALUES (30500, 'md5(md5($salt).md5(md5($pass)))', 1, 0); +INSERT INTO hashtype (hashtypeid, description, issalted, isslowhash) VALUES (30600, 'bcrypt(sha256($pass))', 0, 1); +INSERT INTO hashtype (hashtypeid, description, issalted, isslowhash) VALUES (30601, 'bcrypt(HMAC-SHA256($pass))', 0, 1); +INSERT INTO hashtype (hashtypeid, description, issalted, isslowhash) VALUES (30700, 'Anope IRC Services (enc_sha256)', 0, 0); +INSERT INTO hashtype (hashtypeid, description, issalted, isslowhash) VALUES (30901, 'Bitcoin raw private key (P2PKH), compressed', 0, 0); +INSERT INTO hashtype (hashtypeid, description, issalted, isslowhash) VALUES (30902, 'Bitcoin raw private key (P2PKH), uncompressed', 0, 0); +INSERT INTO hashtype (hashtypeid, description, issalted, isslowhash) VALUES (30903, 'Bitcoin raw private key (P2WPKH, Bech32), compressed', 0, 0); +INSERT INTO hashtype (hashtypeid, description, issalted, isslowhash) VALUES (30904, 'Bitcoin raw private key (P2WPKH, Bech32), uncompressed', 0, 0); +INSERT INTO hashtype (hashtypeid, description, issalted, isslowhash) VALUES (30905, 'Bitcoin raw private key (P2SH(P2WPKH)), compressed', 0, 0); +INSERT INTO hashtype (hashtypeid, description, issalted, isslowhash) VALUES (30906, 'Bitcoin raw private key (P2SH(P2WPKH)), uncompressed', 0, 0); +INSERT INTO hashtype (hashtypeid, description, issalted, isslowhash) VALUES (31000, 'BLAKE2s-256', 0, 0); +INSERT INTO hashtype (hashtypeid, description, issalted, isslowhash) VALUES (31100, 'ShangMi 3 (SM3)', 0, 0); +INSERT INTO hashtype (hashtypeid, description, issalted, isslowhash) VALUES (31200, 'Veeam VBK', 0, 1); +INSERT INTO hashtype (hashtypeid, description, issalted, isslowhash) VALUES (31300, 'MS SNTP', 0, 0); +INSERT INTO hashtype (hashtypeid, description, issalted, isslowhash) VALUES (31400, 'SecureCRT MasterPassphrase v2', 0, 0); +INSERT INTO hashtype (hashtypeid, description, issalted, isslowhash) VALUES (31500, 'Domain Cached Credentials (DCC), MS Cache (NT)', 1, 1); +INSERT INTO hashtype (hashtypeid, description, issalted, isslowhash) VALUES (31600, 'Domain Cached Credentials 2 (DCC2), MS Cache 2, (NT)', 0, 1); +INSERT INTO hashtype (hashtypeid, description, issalted, isslowhash) VALUES (31700, 'md5(md5(md5($pass).$salt1).$salt2)', 1, 0); +INSERT INTO hashtype (hashtypeid, description, issalted, isslowhash) VALUES (31800, '1Password, mobilekeychain (1Password 8)', 0, 1); +INSERT INTO hashtype (hashtypeid, description, issalted, isslowhash) VALUES (31900, 'MetaMask Mobile Wallet', 0, 1); +INSERT INTO hashtype (hashtypeid, description, issalted, isslowhash) VALUES (32000, 'NetIQ SSPR (MD5)', 0, 1); +INSERT INTO hashtype (hashtypeid, description, issalted, isslowhash) VALUES (32010, 'NetIQ SSPR (SHA1)', 0, 1); +INSERT INTO hashtype (hashtypeid, description, issalted, isslowhash) VALUES (32020, 'NetIQ SSPR (SHA-1 with Salt)', 0, 1); +INSERT INTO hashtype (hashtypeid, description, issalted, isslowhash) VALUES (32030, 'NetIQ SSPR (SHA-256 with Salt)', 0, 1); +INSERT INTO hashtype (hashtypeid, description, issalted, isslowhash) VALUES (32031, 'Adobe AEM (SSPR, SHA-256 with Salt)', 0, 1); +INSERT INTO hashtype (hashtypeid, description, issalted, isslowhash) VALUES (32040, 'NetIQ SSPR (SHA-512 with Salt)', 0, 1); +INSERT INTO hashtype (hashtypeid, description, issalted, isslowhash) VALUES (32041, 'Adobe AEM (SSPR, SHA-512 with Salt)', 0, 1); +INSERT INTO hashtype (hashtypeid, description, issalted, isslowhash) VALUES (32050, 'NetIQ SSPR (PBKDF2WithHmacSHA1)', 0, 1); +INSERT INTO hashtype (hashtypeid, description, issalted, isslowhash) VALUES (32060, 'NetIQ SSPR (PBKDF2WithHmacSHA256)', 0, 1); +INSERT INTO hashtype (hashtypeid, description, issalted, isslowhash) VALUES (32070, 'NetIQ SSPR (PBKDF2WithHmacSHA512)', 0, 1); +INSERT INTO hashtype (hashtypeid, description, issalted, isslowhash) VALUES (32100, 'Kerberos 5, etype 17, AS-REP', 0, 1); +INSERT INTO hashtype (hashtypeid, description, issalted, isslowhash) VALUES (32200, 'Kerberos 5, etype 18, AS-REP', 0, 1); +INSERT INTO hashtype (hashtypeid, description, issalted, isslowhash) VALUES (32300, 'Empire CMS (Admin password)', 1, 0); +INSERT INTO hashtype (hashtypeid, description, issalted, isslowhash) VALUES (32410, 'sha512(sha512($pass).$salt)', 1, 0); +INSERT INTO hashtype (hashtypeid, description, issalted, isslowhash) VALUES (32420, 'sha512(sha512_bin($pass).$salt)', 1, 0); +INSERT INTO hashtype (hashtypeid, description, issalted, isslowhash) VALUES (32500, 'Dogechain.info Wallet', 0, 1); +INSERT INTO hashtype (hashtypeid, description, issalted, isslowhash) VALUES (32600, 'CubeCart (whirlpool($salt.$pass.$salt))', 1, 0); +INSERT INTO hashtype (hashtypeid, description, issalted, isslowhash) VALUES (32700, 'Kremlin Encrypt 3.0 w/NewDES', 0, 1); +INSERT INTO hashtype (hashtypeid, description, issalted, isslowhash) VALUES (32800, 'md5(sha1(md5($pass)))', 0, 0); +INSERT INTO hashtype (hashtypeid, description, issalted, isslowhash) VALUES (32900, 'PBKDF1-SHA1', 1, 1); +INSERT INTO hashtype (hashtypeid, description, issalted, isslowhash) VALUES (33000, 'md5($salt1.$pass.$salt2)', 1, 0); +INSERT INTO hashtype (hashtypeid, description, issalted, isslowhash) VALUES (33100, 'md5($salt.md5($pass).$salt)', 1, 0); +INSERT INTO hashtype (hashtypeid, description, issalted, isslowhash) VALUES (33300, 'HMAC-BLAKE2S (key = $pass)', 1, 0); +INSERT INTO hashtype (hashtypeid, description, issalted, isslowhash) VALUES (33400, 'mega.nz password-protected link (PBKDF2-HMAC-SHA512)', 0, 1); +INSERT INTO hashtype (hashtypeid, description, issalted, isslowhash) VALUES (33500, 'RC4 40-bit DropN', 0, 0); +INSERT INTO hashtype (hashtypeid, description, issalted, isslowhash) VALUES (33501, 'RC4 72-bit DropN', 0, 0); +INSERT INTO hashtype (hashtypeid, description, issalted, isslowhash) VALUES (33502, 'RC4 104-bit DropN', 0, 0); +INSERT INTO hashtype (hashtypeid, description, issalted, isslowhash) VALUES (33600, 'RIPEMD-320', 0, 0); +INSERT INTO hashtype (hashtypeid, description, issalted, isslowhash) VALUES (33650, 'HMAC-RIPEMD320 (key = $pass)', 1, 0); +INSERT INTO hashtype (hashtypeid, description, issalted, isslowhash) VALUES (33660, 'HMAC-RIPEMD320 (key = $salt)', 1, 0); +INSERT INTO hashtype (hashtypeid, description, issalted, isslowhash) VALUES (33700, 'Microsoft Online Account (PBKDF2-HMAC-SHA256 + AES256)', 0, 1); +INSERT INTO hashtype (hashtypeid, description, issalted, isslowhash) VALUES (33800, 'WBB4 (Woltlab Burning Board) [bcrypt(bcrypt($pass))]', 0, 1); +INSERT INTO hashtype (hashtypeid, description, issalted, isslowhash) VALUES (33900, 'Citrix NetScaler (PBKDF2-HMAC-SHA256)', 0, 1); +INSERT INTO hashtype (hashtypeid, description, issalted, isslowhash) VALUES (34000, 'Argon2', 0, 1); +INSERT INTO hashtype (hashtypeid, description, issalted, isslowhash) VALUES (34100, 'LUKS v2 argon2 + SHA-256 + AES', 0, 1); +INSERT INTO hashtype (hashtypeid, description, issalted, isslowhash) VALUES (34200, 'MurmurHash64A', 1, 0); +INSERT INTO hashtype (hashtypeid, description, issalted, isslowhash) VALUES (34201, 'MurmurHash64A (zero seed)', 0, 0); +INSERT INTO hashtype (hashtypeid, description, issalted, isslowhash) VALUES (34211, 'MurmurHash64A truncated (zero seed)', 0, 0); +INSERT INTO hashtype (hashtypeid, description, issalted, isslowhash) VALUES (34300, 'KeePass (KDBX v4)', 0, 1); +INSERT INTO hashtype (hashtypeid, description, issalted, isslowhash) VALUES (34400, 'sha224(sha224($pass))', 0, 0); +INSERT INTO hashtype (hashtypeid, description, issalted, isslowhash) VALUES (34500, 'sha224(sha1($pass))', 0, 0); +INSERT INTO hashtype (hashtypeid, description, issalted, isslowhash) VALUES (34600, 'MD6 (256)', 0, 0); +INSERT INTO hashtype (hashtypeid, description, issalted, isslowhash) VALUES (34700, 'Blockchain, My Wallet, Legacy Wallets', 0, 0); +INSERT INTO hashtype (hashtypeid, description, issalted, isslowhash) VALUES (34800, 'BLAKE2b-256', 0, 0); +INSERT INTO hashtype (hashtypeid, description, issalted, isslowhash) VALUES (34810, 'BLAKE2b-256($pass.$salt)', 1, 0); +INSERT INTO hashtype (hashtypeid, description, issalted, isslowhash) VALUES (34820, 'BLAKE2b-256($salt.$pass)', 1, 0); +INSERT INTO hashtype (hashtypeid, description, issalted, isslowhash) VALUES (35000, 'SAP CODVN H (PWDSALTEDHASH) isSHA512', 1, 1); +INSERT INTO hashtype (hashtypeid, description, issalted, isslowhash) VALUES (35100, 'sm3crypt $sm3$, SM3 (Unix)', 1, 1); +INSERT INTO hashtype (hashtypeid, description, issalted, isslowhash) VALUES (35200, 'AS/400 SSHA1', 1, 0); +INSERT INTO hashtype (hashtypeid, description, issalted, isslowhash) VALUES (70000, 'Argon2id [Bridged: reference implementation + tunings]', 0, 1); +INSERT INTO hashtype (hashtypeid, description, issalted, isslowhash) VALUES (70100, 'scrypt [Bridged: Scrypt-Jane SMix]', 0, 1); +INSERT INTO hashtype (hashtypeid, description, issalted, isslowhash) VALUES (70200, 'scrypt [Bridged: Scrypt-Yescrypt]', 0, 1); +INSERT INTO hashtype (hashtypeid, description, issalted, isslowhash) VALUES (72000, 'Generic Hash [Bridged: Python Interpreter free-threading]', 0, 1); +INSERT INTO hashtype (hashtypeid, description, issalted, isslowhash) VALUES (73000, 'Generic Hash [Bridged: Python Interpreter with GIL]', 0, 1); +INSERT INTO hashtype (hashtypeid, description, issalted, isslowhash) VALUES (99999, 'Plaintext', 0, 0); + +-- +-- Data for Name: preprocessor; Type: TABLE DATA; +-- + +INSERT INTO preprocessor (preprocessorid, name, url, binaryname, keyspacecommand, skipcommand, limitcommand) VALUES (1, 'Prince', 'https://github.com/hashcat/princeprocessor/releases/download/v0.22/princeprocessor-0.22.7z', 'pp', '--keyspace', '--skip', '--limit'); + +-- +-- Data for Name: rightgroup; Type: TABLE DATA; +-- + +INSERT INTO rightgroup (rightgroupid, groupname, permissions) VALUES (1, 'Administrator', 'ALL'); + +-- +-- Name: accessgroup_accessgroupid_seq; Type: SEQUENCE SET; +-- + +SELECT pg_catalog.setval('accessgroup_accessgroupid_seq', 1, true); + +-- +-- Name: accessgroupagent_accessgroupagentid_seq; Type: SEQUENCE SET; +-- + +SELECT pg_catalog.setval('accessgroupagent_accessgroupagentid_seq', 1, false); + +-- +-- Name: accessgroupuser_accessgroupuserid_seq; Type: SEQUENCE SET; +-- + +SELECT pg_catalog.setval('accessgroupuser_accessgroupuserid_seq', 1, false); + +-- +-- Name: agent_agentid_seq; Type: SEQUENCE SET; +-- + +SELECT pg_catalog.setval('agent_agentid_seq', 1, false); + +-- +-- Name: agentbinary_agentbinaryid_seq; Type: SEQUENCE SET; +-- + +SELECT pg_catalog.setval('agentbinary_agentbinaryid_seq', 1, true); + +-- +-- Name: agenterror_agenterrorid_seq; Type: SEQUENCE SET; +-- + +SELECT pg_catalog.setval('agenterror_agenterrorid_seq', 1, false); + +-- +-- Name: agentstat_agentstatid_seq; Type: SEQUENCE SET; +-- + +SELECT pg_catalog.setval('agentstat_agentstatid_seq', 1, false); + +-- +-- Name: agentzap_agentzapid_seq; Type: SEQUENCE SET; +-- + +SELECT pg_catalog.setval('agentzap_agentzapid_seq', 1, false); + +-- +-- Name: apigroup_apigroupid_seq; Type: SEQUENCE SET; +-- + +SELECT pg_catalog.setval('apigroup_apigroupid_seq', 1, true); + +-- +-- Name: apikey_apikeyid_seq; Type: SEQUENCE SET; +-- + +SELECT pg_catalog.setval('apikey_apikeyid_seq', 1, false); + +-- +-- Name: assignment_assignmentid_seq; Type: SEQUENCE SET; +-- + +SELECT pg_catalog.setval('assignment_assignmentid_seq', 1, false); + +-- +-- Name: chunk_chunkid_seq; Type: SEQUENCE SET; +-- + +SELECT pg_catalog.setval('chunk_chunkid_seq', 1, false); + +-- +-- Name: config_configid_seq; Type: SEQUENCE SET; +-- + +SELECT pg_catalog.setval('config_configid_seq', 79, true); + +-- +-- Name: configsection_configsectionid_seq; Type: SEQUENCE SET; +-- + +SELECT pg_catalog.setval('configsection_configsectionid_seq', 7, true); + +-- +-- Name: crackerbinary_crackerbinaryid_seq; Type: SEQUENCE SET; +-- + +SELECT pg_catalog.setval('crackerbinary_crackerbinaryid_seq', 1, true); + +-- +-- Name: crackerbinarytype_crackerbinarytypeid_seq; Type: SEQUENCE SET; +-- + +SELECT pg_catalog.setval('crackerbinarytype_crackerbinarytypeid_seq', 1, true); + +-- +-- Name: file_fileid_seq; Type: SEQUENCE SET; +-- + +SELECT pg_catalog.setval('file_fileid_seq', 1, false); + +-- +-- Name: filedelete_filedeleteid_seq; Type: SEQUENCE SET; +-- + +SELECT pg_catalog.setval('filedelete_filedeleteid_seq', 1, false); + +-- +-- Name: filedownload_filedownloadid_seq; Type: SEQUENCE SET; +-- + +SELECT pg_catalog.setval('filedownload_filedownloadid_seq', 1, false); + +-- +-- Name: filepretask_filepretaskid_seq; Type: SEQUENCE SET; +-- + +SELECT pg_catalog.setval('filepretask_filepretaskid_seq', 1, false); + +-- +-- Name: filetask_filetaskid_seq; Type: SEQUENCE SET; +-- + +SELECT pg_catalog.setval('filetask_filetaskid_seq', 1, false); + +-- +-- Name: hash_hashid_seq; Type: SEQUENCE SET; +-- + +SELECT pg_catalog.setval('hash_hashid_seq', 1, false); + +-- +-- Name: hashbinary_hashbinaryid_seq; Type: SEQUENCE SET; +-- + +SELECT pg_catalog.setval('hashbinary_hashbinaryid_seq', 1, false); + +-- +-- Name: hashlist_hashlistid_seq; Type: SEQUENCE SET; +-- + +SELECT pg_catalog.setval('hashlist_hashlistid_seq', 1, false); + +-- +-- Name: hashlisthashlist_hashlisthashlistid_seq; Type: SEQUENCE SET; +-- + +SELECT pg_catalog.setval('hashlisthashlist_hashlisthashlistid_seq', 1, false); + +-- +-- Name: hashtype_hashtypeid_seq; Type: SEQUENCE SET; +-- + +SELECT pg_catalog.setval('hashtype_hashtypeid_seq', 99999, true); + +-- +-- Name: healthcheck_healthcheckid_seq; Type: SEQUENCE SET; +-- + +SELECT pg_catalog.setval('healthcheck_healthcheckid_seq', 1, false); + +-- +-- Name: healthcheckagent_healthcheckagentid_seq; Type: SEQUENCE SET; +-- + +SELECT pg_catalog.setval('healthcheckagent_healthcheckagentid_seq', 1, false); + +-- +-- Name: htp_user_userid_seq; Type: SEQUENCE SET; +-- + +SELECT pg_catalog.setval('htp_user_userid_seq', 1, false); + +-- +-- Name: jwtapikey_jwtapikeyid_seq; Type: SEQUENCE SET; +-- + +SELECT pg_catalog.setval('jwtapikey_jwtapikeyid_seq', 1, false); + +-- +-- Name: logentry_logentryid_seq; Type: SEQUENCE SET; +-- + +SELECT pg_catalog.setval('logentry_logentryid_seq', 1, false); + +-- +-- Name: notificationsetting_notificationsettingid_seq; Type: SEQUENCE SET; +-- + +SELECT pg_catalog.setval('notificationsetting_notificationsettingid_seq', 1, false); + +-- +-- Name: preprocessor_preprocessorid_seq; Type: SEQUENCE SET; +-- + +SELECT pg_catalog.setval('preprocessor_preprocessorid_seq', 1, true); + +-- +-- Name: pretask_pretaskid_seq; Type: SEQUENCE SET; +-- + +SELECT pg_catalog.setval('pretask_pretaskid_seq', 1, false); + +-- +-- Name: regvoucher_regvoucherid_seq; Type: SEQUENCE SET; +-- + +SELECT pg_catalog.setval('regvoucher_regvoucherid_seq', 1, false); + +-- +-- Name: rightgroup_rightgroupid_seq; Type: SEQUENCE SET; +-- + +SELECT pg_catalog.setval('rightgroup_rightgroupid_seq', 1, true); + +-- +-- Name: session_sessionid_seq; Type: SEQUENCE SET; +-- + +SELECT pg_catalog.setval('session_sessionid_seq', 1, false); + +-- +-- Name: speed_speedid_seq; Type: SEQUENCE SET; +-- + +SELECT pg_catalog.setval('speed_speedid_seq', 1, false); + +-- +-- Name: supertask_supertaskid_seq; Type: SEQUENCE SET; +-- + +SELECT pg_catalog.setval('supertask_supertaskid_seq', 1, false); + +-- +-- Name: supertaskpretask_supertaskpretaskid_seq; Type: SEQUENCE SET; +-- + +SELECT pg_catalog.setval('supertaskpretask_supertaskpretaskid_seq', 1, false); + +-- +-- Name: task_taskid_seq; Type: SEQUENCE SET; +-- + +SELECT pg_catalog.setval('task_taskid_seq', 1, false); + +-- +-- Name: taskdebugoutput_taskdebugoutputid_seq; Type: SEQUENCE SET; +-- + +SELECT pg_catalog.setval('taskdebugoutput_taskdebugoutputid_seq', 1, false); + +-- +-- Name: taskwrapper_taskwrapperid_seq; Type: SEQUENCE SET; +-- + +SELECT pg_catalog.setval('taskwrapper_taskwrapperid_seq', 1, false); + +-- +-- Name: zap_zapid_seq; Type: SEQUENCE SET; +-- + +SELECT pg_catalog.setval('zap_zapid_seq', 1, false); + +-- +-- Name: accessgroup accessgroup_pkey; Type: CONSTRAINT; +-- + +ALTER TABLE ONLY accessgroup + ADD CONSTRAINT accessgroup_pkey PRIMARY KEY (accessgroupid); + +-- +-- Name: accessgroupagent accessgroupagent_pkey; Type: CONSTRAINT; +-- + +ALTER TABLE ONLY accessgroupagent + ADD CONSTRAINT accessgroupagent_pkey PRIMARY KEY (accessgroupagentid); + +-- +-- Name: accessgroupuser accessgroupuser_pkey; Type: CONSTRAINT; +-- + +ALTER TABLE ONLY accessgroupuser + ADD CONSTRAINT accessgroupuser_pkey PRIMARY KEY (accessgroupuserid); + +-- +-- Name: agent agent_pkey; Type: CONSTRAINT; +-- + +ALTER TABLE ONLY agent + ADD CONSTRAINT agent_pkey PRIMARY KEY (agentid); + +-- +-- Name: agentbinary agentbinary_pkey; Type: CONSTRAINT; +-- + +ALTER TABLE ONLY agentbinary + ADD CONSTRAINT agentbinary_pkey PRIMARY KEY (agentbinaryid); + +-- +-- Name: agenterror agenterror_pkey; Type: CONSTRAINT; +-- + +ALTER TABLE ONLY agenterror + ADD CONSTRAINT agenterror_pkey PRIMARY KEY (agenterrorid); + +-- +-- Name: agentstat agentstat_pkey; Type: CONSTRAINT; +-- + +ALTER TABLE ONLY agentstat + ADD CONSTRAINT agentstat_pkey PRIMARY KEY (agentstatid); + +-- +-- Name: agentzap agentzap_pkey; Type: CONSTRAINT; +-- + +ALTER TABLE ONLY agentzap + ADD CONSTRAINT agentzap_pkey PRIMARY KEY (agentzapid); + +-- +-- Name: apigroup apigroup_pkey; Type: CONSTRAINT; +-- + +ALTER TABLE ONLY apigroup + ADD CONSTRAINT apigroup_pkey PRIMARY KEY (apigroupid); + +-- +-- Name: apikey apikey_pkey; Type: CONSTRAINT; +-- + +ALTER TABLE ONLY apikey + ADD CONSTRAINT apikey_pkey PRIMARY KEY (apikeyid); + +-- +-- Name: assignment assignment_pkey; Type: CONSTRAINT; +-- + +ALTER TABLE ONLY assignment + ADD CONSTRAINT assignment_pkey PRIMARY KEY (assignmentid); + +-- +-- Name: chunk chunk_pkey; Type: CONSTRAINT; +-- + +ALTER TABLE ONLY chunk + ADD CONSTRAINT chunk_pkey PRIMARY KEY (chunkid); + +-- +-- Name: config config_pkey; Type: CONSTRAINT; +-- + +ALTER TABLE ONLY config + ADD CONSTRAINT config_pkey PRIMARY KEY (configid); + +-- +-- Name: configsection configsection_pkey; Type: CONSTRAINT; +-- + +ALTER TABLE ONLY configsection + ADD CONSTRAINT configsection_pkey PRIMARY KEY (configsectionid); + +-- +-- Name: crackerbinary crackerbinary_pkey; Type: CONSTRAINT; +-- + +ALTER TABLE ONLY crackerbinary + ADD CONSTRAINT crackerbinary_pkey PRIMARY KEY (crackerbinaryid); + +-- +-- Name: crackerbinarytype crackerbinarytype_pkey; Type: CONSTRAINT; +-- + +ALTER TABLE ONLY crackerbinarytype + ADD CONSTRAINT crackerbinarytype_pkey PRIMARY KEY (crackerbinarytypeid); + +-- +-- Name: crackerbinarytype crackerbinarytype_typename_key; Type: CONSTRAINT; +-- + +ALTER TABLE ONLY crackerbinarytype + ADD CONSTRAINT crackerbinarytype_typename_key UNIQUE (typename); + +-- +-- Name: file file_pkey; Type: CONSTRAINT; +-- + +ALTER TABLE ONLY file + ADD CONSTRAINT file_pkey PRIMARY KEY (fileid); + +-- +-- Name: filedelete filedelete_pkey; Type: CONSTRAINT; +-- + +ALTER TABLE ONLY filedelete + ADD CONSTRAINT filedelete_pkey PRIMARY KEY (filedeleteid); + +-- +-- Name: filedownload filedownload_pkey; Type: CONSTRAINT; +-- + +ALTER TABLE ONLY filedownload + ADD CONSTRAINT filedownload_pkey PRIMARY KEY (filedownloadid); + +-- +-- Name: filepretask filepretask_pkey; Type: CONSTRAINT; +-- + +ALTER TABLE ONLY filepretask + ADD CONSTRAINT filepretask_pkey PRIMARY KEY (filepretaskid); + +-- +-- Name: filetask filetask_pkey; Type: CONSTRAINT; +-- + +ALTER TABLE ONLY filetask + ADD CONSTRAINT filetask_pkey PRIMARY KEY (filetaskid); + +-- +-- Name: hash hash_pkey; Type: CONSTRAINT; +-- + +ALTER TABLE ONLY hash + ADD CONSTRAINT hash_pkey PRIMARY KEY (hashid); + +-- +-- Name: hashbinary hashbinary_pkey; Type: CONSTRAINT; +-- + +ALTER TABLE ONLY hashbinary + ADD CONSTRAINT hashbinary_pkey PRIMARY KEY (hashbinaryid); + +-- +-- Name: hashlist hashlist_pkey; Type: CONSTRAINT; +-- + +ALTER TABLE ONLY hashlist + ADD CONSTRAINT hashlist_pkey PRIMARY KEY (hashlistid); + +-- +-- Name: hashlisthashlist hashlisthashlist_pkey; Type: CONSTRAINT; +-- + +ALTER TABLE ONLY hashlisthashlist + ADD CONSTRAINT hashlisthashlist_pkey PRIMARY KEY (hashlisthashlistid); + +-- +-- Name: hashtype hashtype_pkey; Type: CONSTRAINT; +-- + +ALTER TABLE ONLY hashtype + ADD CONSTRAINT hashtype_pkey PRIMARY KEY (hashtypeid); + +-- +-- Name: healthcheck healthcheck_pkey; Type: CONSTRAINT; +-- + +ALTER TABLE ONLY healthcheck + ADD CONSTRAINT healthcheck_pkey PRIMARY KEY (healthcheckid); + +-- +-- Name: healthcheckagent healthcheckagent_pkey; Type: CONSTRAINT; +-- + +ALTER TABLE ONLY healthcheckagent + ADD CONSTRAINT healthcheckagent_pkey PRIMARY KEY (healthcheckagentid); + +-- +-- Name: htp_user htp_user_pkey; Type: CONSTRAINT; +-- + +ALTER TABLE ONLY htp_user + ADD CONSTRAINT htp_user_pkey PRIMARY KEY (userid); + +-- +-- Name: jwtapikey jwtapikey_pkey; Type: CONSTRAINT; +-- + +ALTER TABLE ONLY jwtapikey + ADD CONSTRAINT jwtapikey_pkey PRIMARY KEY (jwtapikeyid); + +-- +-- Name: logentry logentry_pkey; Type: CONSTRAINT; +-- + +ALTER TABLE ONLY logentry + ADD CONSTRAINT logentry_pkey PRIMARY KEY (logentryid); + +-- +-- Name: notificationsetting notificationsetting_pkey; Type: CONSTRAINT; +-- + +ALTER TABLE ONLY notificationsetting + ADD CONSTRAINT notificationsetting_pkey PRIMARY KEY (notificationsettingid); + +-- +-- Name: preprocessor preprocessor_pkey; Type: CONSTRAINT; +-- + +ALTER TABLE ONLY preprocessor + ADD CONSTRAINT preprocessor_pkey PRIMARY KEY (preprocessorid); + +-- +-- Name: pretask pretask_pkey; Type: CONSTRAINT; +-- + +ALTER TABLE ONLY pretask + ADD CONSTRAINT pretask_pkey PRIMARY KEY (pretaskid); + +-- +-- Name: regvoucher regvoucher_pkey; Type: CONSTRAINT; +-- + +ALTER TABLE ONLY regvoucher + ADD CONSTRAINT regvoucher_pkey PRIMARY KEY (regvoucherid); + +-- +-- Name: rightgroup rightgroup_pkey; Type: CONSTRAINT; +-- + +ALTER TABLE ONLY rightgroup + ADD CONSTRAINT rightgroup_pkey PRIMARY KEY (rightgroupid); + +-- +-- Name: session session_pkey; Type: CONSTRAINT; +-- + +ALTER TABLE ONLY session + ADD CONSTRAINT session_pkey PRIMARY KEY (sessionid); + +-- +-- Name: speed speed_pkey; Type: CONSTRAINT; +-- + +ALTER TABLE ONLY speed + ADD CONSTRAINT speed_pkey PRIMARY KEY (speedid); + +-- +-- Name: storedvalue storedvalue_pkey; Type: CONSTRAINT; +-- + +ALTER TABLE ONLY storedvalue + ADD CONSTRAINT storedvalue_pkey PRIMARY KEY (storedvalueid); + +-- +-- Name: supertask supertask_pkey; Type: CONSTRAINT; +-- + +ALTER TABLE ONLY supertask + ADD CONSTRAINT supertask_pkey PRIMARY KEY (supertaskid); + +-- +-- Name: supertaskpretask supertaskpretask_pkey; Type: CONSTRAINT; +-- + +ALTER TABLE ONLY supertaskpretask + ADD CONSTRAINT supertaskpretask_pkey PRIMARY KEY (supertaskpretaskid); + +-- +-- Name: task task_pkey; Type: CONSTRAINT; +-- + +ALTER TABLE ONLY task + ADD CONSTRAINT task_pkey PRIMARY KEY (taskid); + +-- +-- Name: taskdebugoutput taskdebugoutput_pkey; Type: CONSTRAINT; +-- + +ALTER TABLE ONLY taskdebugoutput + ADD CONSTRAINT taskdebugoutput_pkey PRIMARY KEY (taskdebugoutputid); + +-- +-- Name: taskwrapper taskwrapper_pkey; Type: CONSTRAINT; +-- + +ALTER TABLE ONLY taskwrapper + ADD CONSTRAINT taskwrapper_pkey PRIMARY KEY (taskwrapperid); + +-- +-- Name: zap zap_pkey; Type: CONSTRAINT; +-- + +ALTER TABLE ONLY zap + ADD CONSTRAINT zap_pkey PRIMARY KEY (zapid); + +-- +-- Name: accessgroupagent_accessgroupid_idx; Type: INDEX; +-- + +CREATE INDEX accessgroupagent_accessgroupid_idx ON accessgroupagent USING btree (accessgroupid); + +-- +-- Name: accessgroupagent_agentid_idx; Type: INDEX; +-- + +CREATE INDEX accessgroupagent_agentid_idx ON accessgroupagent USING btree (agentid); + +-- +-- Name: accessgroupuser_accessgroupid_idx; Type: INDEX; +-- + +CREATE INDEX accessgroupuser_accessgroupid_idx ON accessgroupuser USING btree (accessgroupid); + +-- +-- Name: accessgroupuser_userid_idx; Type: INDEX; +-- + +CREATE INDEX accessgroupuser_userid_idx ON accessgroupuser USING btree (userid); + +-- +-- Name: agent_userid_idx; Type: INDEX; +-- + +CREATE INDEX agent_userid_idx ON agent USING btree (userid); + +-- +-- Name: agenterror_agentid_idx; Type: INDEX; +-- + +CREATE INDEX agenterror_agentid_idx ON agenterror USING btree (agentid); + +-- +-- Name: agenterror_taskid_idx; Type: INDEX; +-- + +CREATE INDEX agenterror_taskid_idx ON agenterror USING btree (taskid); + +-- +-- Name: agentstat_agentid_idx; Type: INDEX; +-- + +CREATE INDEX agentstat_agentid_idx ON agentstat USING btree (agentid); + +-- +-- Name: agentzap_agentid_idx; Type: INDEX; +-- + +CREATE INDEX agentzap_agentid_idx ON agentzap USING btree (agentid); + +-- +-- Name: agentzap_lastzapid_idx; Type: INDEX; +-- + +CREATE INDEX agentzap_lastzapid_idx ON agentzap USING btree (lastzapid); + +-- +-- Name: apikey_apigroupid_idx; Type: INDEX; +-- + +CREATE INDEX apikey_apigroupid_idx ON apikey USING btree (apigroupid); + +-- +-- Name: apikey_userid_idx; Type: INDEX; +-- + +CREATE INDEX apikey_userid_idx ON apikey USING btree (userid); + +-- +-- Name: assignment_agentid_idx; Type: INDEX; +-- + +CREATE INDEX assignment_agentid_idx ON assignment USING btree (agentid); + +-- +-- Name: assignment_taskid_idx; Type: INDEX; +-- + +CREATE INDEX assignment_taskid_idx ON assignment USING btree (taskid); + +-- +-- Name: chunk_agentid_idx; Type: INDEX; +-- + +CREATE INDEX chunk_agentid_idx ON chunk USING btree (agentid); + +-- +-- Name: chunk_progress_idx; Type: INDEX; +-- + +CREATE INDEX chunk_progress_idx ON chunk USING btree (progress); + +-- +-- Name: chunk_taskid_idx; Type: INDEX; +-- + +CREATE INDEX chunk_taskid_idx ON chunk USING btree (taskid); + +-- +-- Name: config_configsectionid_idx; Type: INDEX; +-- + +CREATE INDEX config_configsectionid_idx ON config USING btree (configsectionid); + +-- +-- Name: crackerbinary_crackerbinarytypeid_idx; Type: INDEX; +-- + +CREATE INDEX crackerbinary_crackerbinarytypeid_idx ON crackerbinary USING btree (crackerbinarytypeid); + +-- +-- Name: file_accessgroupid_idx; Type: INDEX; +-- + +CREATE INDEX file_accessgroupid_idx ON file USING btree (accessgroupid); + +-- +-- Name: filepretask_fileid_idx; Type: INDEX; +-- + +CREATE INDEX filepretask_fileid_idx ON filepretask USING btree (fileid); + +-- +-- Name: filepretask_pretaskid_idx; Type: INDEX; +-- + +CREATE INDEX filepretask_pretaskid_idx ON filepretask USING btree (pretaskid); + +-- +-- Name: filetask_fileid_idx; Type: INDEX; +-- + +CREATE INDEX filetask_fileid_idx ON filetask USING btree (fileid); + +-- +-- Name: filetask_taskid_idx; Type: INDEX; +-- + +CREATE INDEX filetask_taskid_idx ON filetask USING btree (taskid); + +-- +-- Name: hash_chunkid_idx; Type: INDEX; +-- + +CREATE INDEX hash_chunkid_idx ON hash USING btree (chunkid); + +-- +-- Name: hash_hash_idx; Type: INDEX; +-- + +CREATE INDEX hash_hash_idx ON hash USING btree (hashtext(hash)); + +-- +-- Name: hash_hashlistid_idx; Type: INDEX; +-- + +CREATE INDEX hash_hashlistid_idx ON hash USING btree (hashlistid); + +-- +-- Name: hash_iscracked_idx; Type: INDEX; +-- + +CREATE INDEX hash_iscracked_idx ON hash USING btree (iscracked); + +-- +-- Name: hash_timecracked_idx; Type: INDEX; +-- + +CREATE INDEX hash_timecracked_idx ON hash USING btree (timecracked); + +-- +-- Name: hashbinary_chunkid_idx; Type: INDEX; +-- + +CREATE INDEX hashbinary_chunkid_idx ON hashbinary USING btree (chunkid); + +-- +-- Name: hashbinary_hashlistid_idx; Type: INDEX; +-- + +CREATE INDEX hashbinary_hashlistid_idx ON hashbinary USING btree (hashlistid); + +-- +-- Name: hashlist_accessgroupid_idx; Type: INDEX; +-- + +CREATE INDEX hashlist_accessgroupid_idx ON hashlist USING btree (accessgroupid); + +-- +-- Name: hashlist_hashtypeid_idx; Type: INDEX; +-- + +CREATE INDEX hashlist_hashtypeid_idx ON hashlist USING btree (hashtypeid); + +-- +-- Name: hashlist_isarchived_idx; Type: INDEX; +-- + +CREATE INDEX hashlist_isarchived_idx ON hashlist USING btree (isarchived, hashlistid); + +-- +-- Name: hashlisthashlist_hashlistid_idx; Type: INDEX; +-- + +CREATE INDEX hashlisthashlist_hashlistid_idx ON hashlisthashlist USING btree (hashlistid); + +-- +-- Name: hashlisthashlist_parenthashlistid_idx; Type: INDEX; +-- + +CREATE INDEX hashlisthashlist_parenthashlistid_idx ON hashlisthashlist USING btree (parenthashlistid); + +-- +-- Name: healthcheck_crackerbinaryid_idx; Type: INDEX; +-- + +CREATE INDEX healthcheck_crackerbinaryid_idx ON healthcheck USING btree (crackerbinaryid); + +-- +-- Name: healthcheckagent_agentid_idx; Type: INDEX; +-- + +CREATE INDEX healthcheckagent_agentid_idx ON healthcheckagent USING btree (agentid); + +-- +-- Name: healthcheckagent_healthcheckid_idx; Type: INDEX; +-- + +CREATE INDEX healthcheckagent_healthcheckid_idx ON healthcheckagent USING btree (healthcheckid); + +-- +-- Name: htp_user_rightgroupid_idx; Type: INDEX; +-- + +CREATE INDEX htp_user_rightgroupid_idx ON htp_user USING btree (rightgroupid); + +-- +-- Name: idx_jwtapikey_userid; Type: INDEX; +-- + +CREATE INDEX idx_jwtapikey_userid ON jwtapikey USING btree (userid); + +-- +-- Name: notificationsetting_userid_idx; Type: INDEX; +-- + +CREATE INDEX notificationsetting_userid_idx ON notificationsetting USING btree (userid); + +-- +-- Name: pretask_crackerbinarytypeid_idx; Type: INDEX; +-- + +CREATE INDEX pretask_crackerbinarytypeid_idx ON pretask USING btree (crackerbinarytypeid); + +-- +-- Name: session_userid_idx; Type: INDEX; +-- + +CREATE INDEX session_userid_idx ON session USING btree (userid); + +-- +-- Name: speed_agentid_idx; Type: INDEX; +-- + +CREATE INDEX speed_agentid_idx ON speed USING btree (agentid); + +-- +-- Name: speed_taskid_idx; Type: INDEX; +-- + +CREATE INDEX speed_taskid_idx ON speed USING btree (taskid); + +-- +-- Name: supertaskpretask_pretaskid_idx; Type: INDEX; +-- + +CREATE INDEX supertaskpretask_pretaskid_idx ON supertaskpretask USING btree (pretaskid); + +-- +-- Name: supertaskpretask_supertaskid_idx; Type: INDEX; +-- + +CREATE INDEX supertaskpretask_supertaskid_idx ON supertaskpretask USING btree (supertaskid); + +-- +-- Name: task_crackerbinaryid_idx; Type: INDEX; +-- + +CREATE INDEX task_crackerbinaryid_idx ON task USING btree (crackerbinaryid); + +-- +-- Name: task_crackerbinarytypeid_idx; Type: INDEX; +-- + +CREATE INDEX task_crackerbinarytypeid_idx ON task USING btree (crackerbinarytypeid); + +-- +-- Name: task_isarchived_priority_taskid_idx; Type: INDEX; +-- + +CREATE INDEX task_isarchived_priority_taskid_idx ON task USING btree (isarchived, priority DESC, taskid); + +-- +-- Name: task_taskwrapperid_idx; Type: INDEX; +-- + +CREATE INDEX task_taskwrapperid_idx ON task USING btree (taskwrapperid); + +-- +-- Name: taskdebugoutput_taskid_idx; Type: INDEX; +-- + +CREATE INDEX taskdebugoutput_taskid_idx ON taskdebugoutput USING btree (taskid); + +-- +-- Name: taskwrapper_accessgroupid_idx; Type: INDEX; +-- + +CREATE INDEX taskwrapper_accessgroupid_idx ON taskwrapper USING btree (accessgroupid); + +-- +-- Name: taskwrapper_hashlistid_idx; Type: INDEX; +-- + +CREATE INDEX taskwrapper_hashlistid_idx ON taskwrapper USING btree (hashlistid); + +-- +-- Name: taskwrapper_isarchived_priority_taskwrapperid_idx; Type: INDEX; +-- + +CREATE INDEX taskwrapper_isarchived_priority_taskwrapperid_idx ON taskwrapper USING btree (isarchived, priority DESC, taskwrapperid); + +-- +-- Name: taskwrapper_priority_idx; Type: INDEX; +-- + +CREATE INDEX taskwrapper_priority_idx ON taskwrapper USING btree (priority); + +-- +-- Name: zap_agentid_idx; Type: INDEX; +-- + +CREATE INDEX zap_agentid_idx ON zap USING btree (agentid); + +-- +-- Name: zap_hashlistid_idx; Type: INDEX; +-- + +CREATE INDEX zap_hashlistid_idx ON zap USING btree (hashlistid); + +-- +-- Name: accessgroupagent accessgroupagent_ibfk_1; Type: FK CONSTRAINT; +-- + +ALTER TABLE ONLY accessgroupagent + ADD CONSTRAINT accessgroupagent_ibfk_1 FOREIGN KEY (accessgroupid) REFERENCES accessgroup(accessgroupid); + +-- +-- Name: accessgroupagent accessgroupagent_ibfk_2; Type: FK CONSTRAINT; +-- + +ALTER TABLE ONLY accessgroupagent + ADD CONSTRAINT accessgroupagent_ibfk_2 FOREIGN KEY (agentid) REFERENCES agent(agentid); + +-- +-- Name: accessgroupuser accessgroupuser_ibfk_1; Type: FK CONSTRAINT; +-- + +ALTER TABLE ONLY accessgroupuser + ADD CONSTRAINT accessgroupuser_ibfk_1 FOREIGN KEY (accessgroupid) REFERENCES accessgroup(accessgroupid); + +-- +-- Name: accessgroupuser accessgroupuser_ibfk_2; Type: FK CONSTRAINT; +-- + +ALTER TABLE ONLY accessgroupuser + ADD CONSTRAINT accessgroupuser_ibfk_2 FOREIGN KEY (userid) REFERENCES htp_user(userid); + +-- +-- Name: agent agent_ibfk_1; Type: FK CONSTRAINT; +-- + +ALTER TABLE ONLY agent + ADD CONSTRAINT agent_ibfk_1 FOREIGN KEY (userid) REFERENCES htp_user(userid); + +-- +-- Name: agenterror agenterror_ibfk_1; Type: FK CONSTRAINT; +-- + +ALTER TABLE ONLY agenterror + ADD CONSTRAINT agenterror_ibfk_1 FOREIGN KEY (agentid) REFERENCES agent(agentid); + +-- +-- Name: agenterror agenterror_ibfk_2; Type: FK CONSTRAINT; +-- + +ALTER TABLE ONLY agenterror + ADD CONSTRAINT agenterror_ibfk_2 FOREIGN KEY (taskid) REFERENCES task(taskid); + +-- +-- Name: agentstat agentstat_ibfk_1; Type: FK CONSTRAINT; +-- + +ALTER TABLE ONLY agentstat + ADD CONSTRAINT agentstat_ibfk_1 FOREIGN KEY (agentid) REFERENCES agent(agentid); + +-- +-- Name: agentzap agentzap_ibfk_1; Type: FK CONSTRAINT; +-- + +ALTER TABLE ONLY agentzap + ADD CONSTRAINT agentzap_ibfk_1 FOREIGN KEY (agentid) REFERENCES agent(agentid); + +-- +-- Name: agentzap agentzap_ibfk_2; Type: FK CONSTRAINT; +-- + +ALTER TABLE ONLY agentzap + ADD CONSTRAINT agentzap_ibfk_2 FOREIGN KEY (lastzapid) REFERENCES zap(zapid); + +-- +-- Name: apikey apikey_ibfk_1; Type: FK CONSTRAINT; +-- + +ALTER TABLE ONLY apikey + ADD CONSTRAINT apikey_ibfk_1 FOREIGN KEY (userid) REFERENCES htp_user(userid); + +-- +-- Name: apikey apikey_ibfk_2; Type: FK CONSTRAINT; +-- + +ALTER TABLE ONLY apikey + ADD CONSTRAINT apikey_ibfk_2 FOREIGN KEY (apigroupid) REFERENCES apigroup(apigroupid); + +-- +-- Name: assignment assignment_ibfk_1; Type: FK CONSTRAINT; +-- + +ALTER TABLE ONLY assignment + ADD CONSTRAINT assignment_ibfk_1 FOREIGN KEY (taskid) REFERENCES task(taskid); + +-- +-- Name: assignment assignment_ibfk_2; Type: FK CONSTRAINT; +-- + +ALTER TABLE ONLY assignment + ADD CONSTRAINT assignment_ibfk_2 FOREIGN KEY (agentid) REFERENCES agent(agentid); + +-- +-- Name: chunk chunk_ibfk_1; Type: FK CONSTRAINT; +-- + +ALTER TABLE ONLY chunk + ADD CONSTRAINT chunk_ibfk_1 FOREIGN KEY (taskid) REFERENCES task(taskid); + +-- +-- Name: chunk chunk_ibfk_2; Type: FK CONSTRAINT; +-- + +ALTER TABLE ONLY chunk + ADD CONSTRAINT chunk_ibfk_2 FOREIGN KEY (agentid) REFERENCES agent(agentid); + +-- +-- Name: config config_ibfk_1; Type: FK CONSTRAINT; +-- + +ALTER TABLE ONLY config + ADD CONSTRAINT config_ibfk_1 FOREIGN KEY (configsectionid) REFERENCES configsection(configsectionid); + +-- +-- Name: crackerbinary crackerbinary_ibfk_1; Type: FK CONSTRAINT; +-- + +ALTER TABLE ONLY crackerbinary + ADD CONSTRAINT crackerbinary_ibfk_1 FOREIGN KEY (crackerbinarytypeid) REFERENCES crackerbinarytype(crackerbinarytypeid); + +-- +-- Name: file file_ibfk_1; Type: FK CONSTRAINT; +-- + +ALTER TABLE ONLY file + ADD CONSTRAINT file_ibfk_1 FOREIGN KEY (accessgroupid) REFERENCES accessgroup(accessgroupid); + +-- +-- Name: filepretask filepretask_ibfk_1; Type: FK CONSTRAINT; +-- + +ALTER TABLE ONLY filepretask + ADD CONSTRAINT filepretask_ibfk_1 FOREIGN KEY (fileid) REFERENCES file(fileid); + +-- +-- Name: filepretask filepretask_ibfk_2; Type: FK CONSTRAINT; +-- + +ALTER TABLE ONLY filepretask + ADD CONSTRAINT filepretask_ibfk_2 FOREIGN KEY (pretaskid) REFERENCES pretask(pretaskid); + +-- +-- Name: filetask filetask_ibfk_1; Type: FK CONSTRAINT; +-- + +ALTER TABLE ONLY filetask + ADD CONSTRAINT filetask_ibfk_1 FOREIGN KEY (fileid) REFERENCES file(fileid); + +-- +-- Name: filetask filetask_ibfk_2; Type: FK CONSTRAINT; +-- + +ALTER TABLE ONLY filetask + ADD CONSTRAINT filetask_ibfk_2 FOREIGN KEY (taskid) REFERENCES task(taskid); + +-- +-- Name: jwtapikey fk_jwtapikey_user; Type: FK CONSTRAINT; +-- + +ALTER TABLE ONLY jwtapikey + ADD CONSTRAINT fk_jwtapikey_user FOREIGN KEY (userid) REFERENCES htp_user(userid); + +-- +-- Name: hash hash_ibfk_1; Type: FK CONSTRAINT; +-- + +ALTER TABLE ONLY hash + ADD CONSTRAINT hash_ibfk_1 FOREIGN KEY (hashlistid) REFERENCES hashlist(hashlistid); + +-- +-- Name: hash hash_ibfk_2; Type: FK CONSTRAINT; +-- + +ALTER TABLE ONLY hash + ADD CONSTRAINT hash_ibfk_2 FOREIGN KEY (chunkid) REFERENCES chunk(chunkid); + +-- +-- Name: hashbinary hashbinary_ibfk_1; Type: FK CONSTRAINT; +-- + +ALTER TABLE ONLY hashbinary + ADD CONSTRAINT hashbinary_ibfk_1 FOREIGN KEY (hashlistid) REFERENCES hashlist(hashlistid); + +-- +-- Name: hashbinary hashbinary_ibfk_2; Type: FK CONSTRAINT; +-- + +ALTER TABLE ONLY hashbinary + ADD CONSTRAINT hashbinary_ibfk_2 FOREIGN KEY (chunkid) REFERENCES chunk(chunkid); + +-- +-- Name: hashlist hashlist_ibfk_1; Type: FK CONSTRAINT; +-- + +ALTER TABLE ONLY hashlist + ADD CONSTRAINT hashlist_ibfk_1 FOREIGN KEY (hashtypeid) REFERENCES hashtype(hashtypeid); + +-- +-- Name: hashlist hashlist_ibfk_2; Type: FK CONSTRAINT; +-- + +ALTER TABLE ONLY hashlist + ADD CONSTRAINT hashlist_ibfk_2 FOREIGN KEY (accessgroupid) REFERENCES accessgroup(accessgroupid); + +-- +-- Name: hashlisthashlist hashlisthashlist_ibfk_1; Type: FK CONSTRAINT; +-- + +ALTER TABLE ONLY hashlisthashlist + ADD CONSTRAINT hashlisthashlist_ibfk_1 FOREIGN KEY (parenthashlistid) REFERENCES hashlist(hashlistid); + +-- +-- Name: hashlisthashlist hashlisthashlist_ibfk_2; Type: FK CONSTRAINT; +-- + +ALTER TABLE ONLY hashlisthashlist + ADD CONSTRAINT hashlisthashlist_ibfk_2 FOREIGN KEY (hashlistid) REFERENCES hashlist(hashlistid); + +-- +-- Name: healthcheck healthcheck_ibfk_1; Type: FK CONSTRAINT; +-- + +ALTER TABLE ONLY healthcheck + ADD CONSTRAINT healthcheck_ibfk_1 FOREIGN KEY (crackerbinaryid) REFERENCES crackerbinary(crackerbinaryid); + +-- +-- Name: healthcheckagent healthcheckagent_ibfk_1; Type: FK CONSTRAINT; +-- + +ALTER TABLE ONLY healthcheckagent + ADD CONSTRAINT healthcheckagent_ibfk_1 FOREIGN KEY (agentid) REFERENCES agent(agentid); + +-- +-- Name: healthcheckagent healthcheckagent_ibfk_2; Type: FK CONSTRAINT; +-- + +ALTER TABLE ONLY healthcheckagent + ADD CONSTRAINT healthcheckagent_ibfk_2 FOREIGN KEY (healthcheckid) REFERENCES healthcheck(healthcheckid); + +-- +-- Name: notificationsetting notificationsetting_ibfk_1; Type: FK CONSTRAINT; +-- + +ALTER TABLE ONLY notificationsetting + ADD CONSTRAINT notificationsetting_ibfk_1 FOREIGN KEY (userid) REFERENCES htp_user(userid); + +-- +-- Name: pretask pretask_ibfk_1; Type: FK CONSTRAINT; +-- + +ALTER TABLE ONLY pretask + ADD CONSTRAINT pretask_ibfk_1 FOREIGN KEY (crackerbinarytypeid) REFERENCES crackerbinarytype(crackerbinarytypeid); + +-- +-- Name: session session_ibfk_1; Type: FK CONSTRAINT; +-- + +ALTER TABLE ONLY session + ADD CONSTRAINT session_ibfk_1 FOREIGN KEY (userid) REFERENCES htp_user(userid); + +-- +-- Name: speed speed_ibfk_1; Type: FK CONSTRAINT; +-- + +ALTER TABLE ONLY speed + ADD CONSTRAINT speed_ibfk_1 FOREIGN KEY (agentid) REFERENCES agent(agentid); + +-- +-- Name: speed speed_ibfk_2; Type: FK CONSTRAINT; +-- + +ALTER TABLE ONLY speed + ADD CONSTRAINT speed_ibfk_2 FOREIGN KEY (taskid) REFERENCES task(taskid); + +-- +-- Name: supertaskpretask supertaskpretask_ibfk_1; Type: FK CONSTRAINT; +-- + +ALTER TABLE ONLY supertaskpretask + ADD CONSTRAINT supertaskpretask_ibfk_1 FOREIGN KEY (supertaskid) REFERENCES supertask(supertaskid); + +-- +-- Name: supertaskpretask supertaskpretask_ibfk_2; Type: FK CONSTRAINT; +-- + +ALTER TABLE ONLY supertaskpretask + ADD CONSTRAINT supertaskpretask_ibfk_2 FOREIGN KEY (pretaskid) REFERENCES pretask(pretaskid); + +-- +-- Name: task task_ibfk_1; Type: FK CONSTRAINT; +-- + +ALTER TABLE ONLY task + ADD CONSTRAINT task_ibfk_1 FOREIGN KEY (crackerbinaryid) REFERENCES crackerbinary(crackerbinaryid); + +-- +-- Name: task task_ibfk_2; Type: FK CONSTRAINT; +-- + +ALTER TABLE ONLY task + ADD CONSTRAINT task_ibfk_2 FOREIGN KEY (crackerbinarytypeid) REFERENCES crackerbinarytype(crackerbinarytypeid); + +-- +-- Name: task task_ibfk_3; Type: FK CONSTRAINT; +-- + +ALTER TABLE ONLY task + ADD CONSTRAINT task_ibfk_3 FOREIGN KEY (taskwrapperid) REFERENCES taskwrapper(taskwrapperid); + +-- +-- Name: taskdebugoutput taskdebugoutput_ibfk_1; Type: FK CONSTRAINT; +-- + +ALTER TABLE ONLY taskdebugoutput + ADD CONSTRAINT taskdebugoutput_ibfk_1 FOREIGN KEY (taskid) REFERENCES task(taskid); + +-- +-- Name: taskwrapper taskwrapper_ibfk_1; Type: FK CONSTRAINT; +-- + +ALTER TABLE ONLY taskwrapper + ADD CONSTRAINT taskwrapper_ibfk_1 FOREIGN KEY (hashlistid) REFERENCES hashlist(hashlistid); + +-- +-- Name: taskwrapper taskwrapper_ibfk_2; Type: FK CONSTRAINT; +-- + +ALTER TABLE ONLY taskwrapper + ADD CONSTRAINT taskwrapper_ibfk_2 FOREIGN KEY (accessgroupid) REFERENCES accessgroup(accessgroupid); + +-- +-- Name: htp_user user_ibfk_1; Type: FK CONSTRAINT; +-- + +ALTER TABLE ONLY htp_user + ADD CONSTRAINT user_ibfk_1 FOREIGN KEY (rightgroupid) REFERENCES rightgroup(rightgroupid); + +-- +-- Name: zap zap_ibfk_1; Type: FK CONSTRAINT; +-- + +ALTER TABLE ONLY zap + ADD CONSTRAINT zap_ibfk_1 FOREIGN KEY (agentid) REFERENCES agent(agentid); + +-- +-- Name: zap zap_ibfk_2; Type: FK CONSTRAINT; +-- + +ALTER TABLE ONLY zap + ADD CONSTRAINT zap_ibfk_2 FOREIGN KEY (hashlistid) REFERENCES hashlist(hashlistid); diff --git a/src/migrations/postgres/config.json b/src/migrations/postgres/config.json new file mode 100644 index 000000000..79aa4a86b --- /dev/null +++ b/src/migrations/postgres/config.json @@ -0,0 +1,6 @@ +{ + "version": 20260619090219, + "description": "initial", + "installed_on": "2026-06-19 10:29:13", + "checksum": "9396106f7214da268af8fc27689ae18af35c5e8938cbbb0dc3db63aa31640e84ad662d7685a5c7e933c65e79cf119b51" +} \ No newline at end of file From 95038dd7df9dfdc011fab34c1c6eff1b4ff524a3 Mon Sep 17 00:00:00 2001 From: s3inlc Date: Fri, 19 Jun 2026 13:59:52 +0200 Subject: [PATCH 644/691] fixed to oldest docker version available --- .github/workflows/upgrade-test.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/upgrade-test.yml b/.github/workflows/upgrade-test.yml index 7949e568b..af5479058 100644 --- a/.github/workflows/upgrade-test.yml +++ b/.github/workflows/upgrade-test.yml @@ -17,7 +17,7 @@ jobs: runs-on: ubuntu-latest strategy: matrix: - start-tag: [v0.14.0, v1.0.0-rainbow] + start-tag: [v0.14.1, v1.0.0-rainbow] db-type: [postgres, mysql] fail-fast: false From 7e0e8532ec772685b9f3df55f7d3d15314757ae5 Mon Sep 17 00:00:00 2001 From: s3inlc Date: Fri, 19 Jun 2026 14:06:05 +0200 Subject: [PATCH 645/691] fixed and logging added --- .github/workflows/upgrade-test.yml | 32 +++++++++++++++++++++++++----- 1 file changed, 27 insertions(+), 5 deletions(-) diff --git a/.github/workflows/upgrade-test.yml b/.github/workflows/upgrade-test.yml index af5479058..3b3b07bd7 100644 --- a/.github/workflows/upgrade-test.yml +++ b/.github/workflows/upgrade-test.yml @@ -52,12 +52,21 @@ jobs: mysql:8.4 fi - - name: Wait for database to be ready + - name: Wait for database container to be running + run: | + timeout 120 bash -c ' + until [ "$(docker container inspect -f "{{.State.Status}}" db 2>/dev/null)" = "running" ]; do + sleep 2 + done + ' + echo "Database container is running" + + - name: Wait for database to accept connections run: | if [ "${{ matrix.db-type }}" = "postgres" ]; then - until docker exec db pg_isready -U ${{ env.DB_USER }}; do sleep 2; done + timeout 120 bash -c 'until docker exec db pg_isready -U ${{ env.DB_USER }} 2>/dev/null; do sleep 2; done' else - until docker exec db mysqladmin ping -u root -p${{ env.DB_PASS }} --silent; do sleep 2; done + timeout 120 bash -c 'until docker exec db mysqladmin ping -u root -p${{ env.DB_PASS }} --silent 2>/dev/null; do sleep 2; done' fi echo "Database ready" @@ -79,10 +88,19 @@ jobs: timeout 180 bash -c 'until docker logs backend 2>&1 | grep -q "Initialization complete!"; do sleep 3; done' echo "Old backend initialized" - - name: Stop old backend and start new backend + - name: Stop old backend run: | docker stop backend - docker rm backend + + - name: Show old backend logs + if: always() + run: docker logs backend + + - name: Remove old backend + run: docker rm backend + + - name: Start new backend + run: | docker run -d --network ht-test-net --name backend \ -e HASHTOPOLIS_DB_TYPE=${{ matrix.db-type }} \ -e HASHTOPOLIS_DB_USER=${{ env.DB_USER }} \ @@ -99,6 +117,10 @@ jobs: timeout 180 bash -c 'until docker logs backend 2>&1 | grep -q "Initialization complete!"; do sleep 3; done' echo "New backend initialized - upgrade test passed" + - name: Show new backend logs + if: always() + run: docker logs backend + - name: Cleanup if: always() run: | From d952dc0cacd7cc58f53b7d40ebc869ed7aec3363 Mon Sep 17 00:00:00 2001 From: s3inlc Date: Fri, 19 Jun 2026 14:14:36 +0200 Subject: [PATCH 646/691] fix path for postgres test data --- .github/workflows/upgrade-test.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/upgrade-test.yml b/.github/workflows/upgrade-test.yml index 3b3b07bd7..eb06241de 100644 --- a/.github/workflows/upgrade-test.yml +++ b/.github/workflows/upgrade-test.yml @@ -40,7 +40,7 @@ jobs: -e POSTGRES_DB=${{ env.DB_NAME }} \ -e POSTGRES_USER=${{ env.DB_USER }} \ -e POSTGRES_PASSWORD=${{ env.DB_PASS }} \ - -v ht-db:/var/lib/postgresql/data \ + -v ht-db:/var/lib/postgresql \ postgres:18 else docker run -d --network ht-test-net --name db \ From cc0e30dfa2a944b480427df4c58f7fb87c71ac23 Mon Sep 17 00:00:00 2001 From: s3inlc Date: Fri, 19 Jun 2026 14:16:20 +0200 Subject: [PATCH 647/691] remove wrong outdated include --- src/install/updates/update_v0.14.3_v0.14.x.php | 2 -- 1 file changed, 2 deletions(-) diff --git a/src/install/updates/update_v0.14.3_v0.14.x.php b/src/install/updates/update_v0.14.3_v0.14.x.php index 13d4aeb70..c14109541 100644 --- a/src/install/updates/update_v0.14.3_v0.14.x.php +++ b/src/install/updates/update_v0.14.3_v0.14.x.php @@ -5,8 +5,6 @@ use Hashtopolis\dba\QueryFilter; use Hashtopolis\inc\defines\DConfig; -require_once(dirname(__FILE__) . "/../../inc/defines/Dconfig.php"); - if (!isset($PRESENT["v0.14.x_pagination"])) { $qF = new QueryFilter(Config::ITEM, DConfig::DEFAULT_PAGE_SIZE, "="); $item = Factory::getConfigFactory()->filter([Factory::FILTER => $qF], true); From 065cea51ac91a7a1446519c53ad97bfb6c32aff1 Mon Sep 17 00:00:00 2001 From: s3inlc Date: Fri, 19 Jun 2026 14:36:24 +0200 Subject: [PATCH 648/691] extended workflow to give more debug info, also only run postgres where available, added some additional info prints on generation update. --- .github/workflows/upgrade-test.yml | 36 ++++++++++++++++++++++-------- src/inc/startup/setup.php | 4 ++++ 2 files changed, 31 insertions(+), 9 deletions(-) diff --git a/.github/workflows/upgrade-test.yml b/.github/workflows/upgrade-test.yml index eb06241de..5448ebde1 100644 --- a/.github/workflows/upgrade-test.yml +++ b/.github/workflows/upgrade-test.yml @@ -2,9 +2,13 @@ name: Upgrade Test on: push: - branches: [master, dev] + branches: + - master + - dev pull_request: - branches: [master, dev] + branches: + - master + - dev workflow_dispatch: env: @@ -17,12 +21,17 @@ jobs: runs-on: ubuntu-latest strategy: matrix: - start-tag: [v0.14.1, v1.0.0-rainbow] - db-type: [postgres, mysql] + include: + - start-tag: v0.14.1 + db-type: mysql + - start-tag: v1.0.0-rainbow5 + db-type: mysql + - start-tag: v1.0.0-rainbow5 + db-type: postgres fail-fast: false steps: - - uses: actions/checkout@v4 + - uses: actions/checkout@v6 - name: Build new image from repository run: docker build -t hashtopolis/backend:test . @@ -64,9 +73,9 @@ jobs: - name: Wait for database to accept connections run: | if [ "${{ matrix.db-type }}" = "postgres" ]; then - timeout 120 bash -c 'until docker exec db pg_isready -U ${{ env.DB_USER }} 2>/dev/null; do sleep 2; done' + timeout 60 bash -c 'until docker exec db pg_isready -U ${{ env.DB_USER }} 2>/dev/null; do sleep 2; done' else - timeout 120 bash -c 'until docker exec db mysqladmin ping -u root -p${{ env.DB_PASS }} --silent 2>/dev/null; do sleep 2; done' + timeout 60 bash -c 'until docker exec db mysqladmin ping -u root -p${{ env.DB_PASS }} --silent 2>/dev/null; do sleep 2; done' fi echo "Database ready" @@ -85,7 +94,7 @@ jobs: - name: Wait for old backend initialization run: | - timeout 180 bash -c 'until docker logs backend 2>&1 | grep -q "Initialization complete!"; do sleep 3; done' + timeout 60 bash -c 'until docker logs backend 2>&1 | grep -q "Initialization complete!"; do sleep 3; done' echo "Old backend initialized" - name: Stop old backend @@ -114,13 +123,22 @@ jobs: - name: Wait for new backend initialization run: | - timeout 180 bash -c 'until docker logs backend 2>&1 | grep -q "Initialization complete!"; do sleep 3; done' + timeout 60 bash -c 'until docker logs backend 2>&1 | grep -q "Initialization complete!"; do sleep 3; done' echo "New backend initialized - upgrade test passed" - name: Show new backend logs if: always() run: docker logs backend + - name: Show migration state + if: always() + run: | + if [ "${{ matrix.db-type }}" = "postgres" ]; then + docker exec db psql -U ${{ env.DB_USER }} -d ${{ env.DB_NAME }} -c "SELECT * FROM _sqlx_migrations;" + else + docker exec db mysql -u ${{ env.DB_USER }} -p${{ env.DB_PASS }} ${{ env.DB_NAME }} -e "SELECT * FROM _sqlx_migrations;" + fi + - name: Cleanup if: always() run: | diff --git a/src/inc/startup/setup.php b/src/inc/startup/setup.php index 3b1eb4b27..d6d0a8057 100755 --- a/src/inc/startup/setup.php +++ b/src/inc/startup/setup.php @@ -96,6 +96,7 @@ // we are on an older generation branch, we need to migrate // make sure we are up-to-date on this generation + echo "Running migration on current generation to be up-to-date...\n"; MigrationUtils::runDatabaseMigration($generation); // jump to next migration @@ -106,10 +107,13 @@ } // clear migration table + echo "Clearing migration table...\n"; Factory::get_sqlx_migrationsFactory()->massDeletion([]); // add first entry + echo "Add initial migration entry...\n"; Factory::get_sqlx_migrationsFactory()->save($entry); + echo "Generation switch from " . ($generation + 1) . " to $generation completed!\n"; } } catch (Exception $e) { From c1e6ae5cba6d4d0951a3386a7592165b3da9d4dc Mon Sep 17 00:00:00 2001 From: s3inlc Date: Fri, 19 Jun 2026 14:49:56 +0200 Subject: [PATCH 649/691] print checksums in hex on log --- .github/workflows/upgrade-test.yml | 4 ++-- src/inc/utils/MigrationUtils.php | 1 - 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/.github/workflows/upgrade-test.yml b/.github/workflows/upgrade-test.yml index 5448ebde1..e1243e316 100644 --- a/.github/workflows/upgrade-test.yml +++ b/.github/workflows/upgrade-test.yml @@ -134,9 +134,9 @@ jobs: if: always() run: | if [ "${{ matrix.db-type }}" = "postgres" ]; then - docker exec db psql -U ${{ env.DB_USER }} -d ${{ env.DB_NAME }} -c "SELECT * FROM _sqlx_migrations;" + docker exec db psql -U ${{ env.DB_USER }} -d ${{ env.DB_NAME }} -c "SELECT version, description, installed_on, success, encode(checksum, 'hex') AS checksum, execution_time FROM _sqlx_migrations ORDER BY version;" else - docker exec db mysql -u ${{ env.DB_USER }} -p${{ env.DB_PASS }} ${{ env.DB_NAME }} -e "SELECT * FROM _sqlx_migrations;" + docker exec db mysql -u ${{ env.DB_USER }} -p${{ env.DB_PASS }} ${{ env.DB_NAME }} -e "SELECT version, description, installed_on, success, HEX(checksum) AS checksum, execution_time FROM _sqlx_migrations ORDER BY version;" fi - name: Cleanup diff --git a/src/inc/utils/MigrationUtils.php b/src/inc/utils/MigrationUtils.php index 2877bbb23..83e91beac 100644 --- a/src/inc/utils/MigrationUtils.php +++ b/src/inc/utils/MigrationUtils.php @@ -2,7 +2,6 @@ namespace Hashtopolis\inc\utils; -use DateTime; use Hashtopolis\dba\models\_sqlx_migrations; use Hashtopolis\inc\StartupConfig; From 0577210a177efe4026d0df2a4524f62db9fbfdda Mon Sep 17 00:00:00 2001 From: s3inlc Date: Fri, 19 Jun 2026 15:00:01 +0200 Subject: [PATCH 650/691] fix checksum to non CRLF version --- src/migrations/mysql/config.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/migrations/mysql/config.json b/src/migrations/mysql/config.json index d0b2d0983..66f53d2df 100644 --- a/src/migrations/mysql/config.json +++ b/src/migrations/mysql/config.json @@ -2,5 +2,5 @@ "version": 20260619090219, "description": "initial", "installed_on": "2026-06-19 10:29:13", - "checksum": "4376accd2c364333534991027e5d8c44a358dfd55415a5bc363c5bc74667d6c4b5146c29cd417ca61f680ab7695502e2" + "checksum": "a3da4ecaccb3fc09079d415aa4796b664b74ba626735da17a1961c28339f71df25689d7fb33faed41fd15ba82370577a" } \ No newline at end of file From cbc11f5c5f416b719d8502d1484481789718b9b8 Mon Sep 17 00:00:00 2001 From: s3inlc Date: Mon, 22 Jun 2026 09:12:43 +0200 Subject: [PATCH 651/691] added some more useful upgrade test steps and unified workflow syntax --- .github/workflows/ci.yml | 2 +- .github/workflows/docs-build.yml | 4 +++- .github/workflows/docs.yml | 1 + .github/workflows/upgrade-test.yml | 20 +++++++++++++------- 4 files changed, 18 insertions(+), 9 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 94ccabb6b..90d0765e6 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -1,4 +1,4 @@ -name: Hashtopolis +name: Test Run (PyTest, PHPUnittest) on: push: diff --git a/.github/workflows/docs-build.yml b/.github/workflows/docs-build.yml index 30b4bd52b..a44212cbf 100644 --- a/.github/workflows/docs-build.yml +++ b/.github/workflows/docs-build.yml @@ -2,7 +2,9 @@ name: Generate MkDocs on: pull_request: - branches: ["dev"] + branches: + - master + - dev jobs: build: diff --git a/.github/workflows/docs.yml b/.github/workflows/docs.yml index c48e26091..e21244b4b 100644 --- a/.github/workflows/docs.yml +++ b/.github/workflows/docs.yml @@ -4,6 +4,7 @@ on: push: branches: - dev + jobs: build: runs-on: ubuntu-latest diff --git a/.github/workflows/upgrade-test.yml b/.github/workflows/upgrade-test.yml index e1243e316..c88efef0f 100644 --- a/.github/workflows/upgrade-test.yml +++ b/.github/workflows/upgrade-test.yml @@ -24,10 +24,16 @@ jobs: include: - start-tag: v0.14.1 db-type: mysql + - start-tag: v0.14.8 + db-type: mysql - start-tag: v1.0.0-rainbow5 db-type: mysql - start-tag: v1.0.0-rainbow5 db-type: postgres + - start-tag: v1.0.0-rc1 + db-type: mysql + - start-tag: v1.0.0-rc1 + db-type: postgres fail-fast: false steps: @@ -42,7 +48,7 @@ jobs: docker volume create ht-data docker volume create ht-db - - name: Start database container + - name: Start database container with ${{ matrix.db-type }} run: | if [ "${{ matrix.db-type }}" = "postgres" ]; then docker run -d --network ht-test-net --name db \ @@ -79,7 +85,7 @@ jobs: fi echo "Database ready" - - name: Start old backend (${{ matrix.start-tag }}) + - name: Start backend version ${{ matrix.start-tag }} run: | docker run -d --network ht-test-net --name backend \ -e HASHTOPOLIS_DB_TYPE=${{ matrix.db-type }} \ @@ -92,20 +98,20 @@ jobs: -v ht-data:/usr/local/share/hashtopolis \ hashtopolis/backend:${{ matrix.start-tag }} - - name: Wait for old backend initialization + - name: Wait for backend initialization run: | timeout 60 bash -c 'until docker logs backend 2>&1 | grep -q "Initialization complete!"; do sleep 3; done' - echo "Old backend initialized" + echo "Backend initialized" - - name: Stop old backend + - name: Stop backend ${{ matrix.start-tag }} run: | docker stop backend - - name: Show old backend logs + - name: Show backend ${{ matrix.start-tag }} logs if: always() run: docker logs backend - - name: Remove old backend + - name: Remove backend run: docker rm backend - name: Start new backend From 722ebf2391ba6367d9acb8e35e22faff1d6cd3f2 Mon Sep 17 00:00:00 2001 From: s3inlc Date: Mon, 22 Jun 2026 09:21:40 +0200 Subject: [PATCH 652/691] basic contribution guidelines added --- CONTRIBUTING.md | 37 +++++++++++++++++++++++++++++++++++++ 1 file changed, 37 insertions(+) create mode 100644 CONTRIBUTING.md diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md new file mode 100644 index 000000000..564e28fc6 --- /dev/null +++ b/CONTRIBUTING.md @@ -0,0 +1,37 @@ +# Contributing to Hashtopolis + +## Opening Issues + +- **Existing issues** — Before opening a new issue, check if a similar issue or feature request already exists. + +- **Expected behavior** — If you are unsure whether the behavior you are encountering is expected, check the documentation at https://docs.hashtopolis.org. You can also check the FAQ to see if your problem is already addressed there. + +## Code Contributions + +- **Coding style** — Follow the existing coding style and conventions used throughout the project. + +- **Test coverage** — Include tests for your changes. Depending on the case this means PHPUnit tests, pytest tests for the API, or both if necessary. + +- **Documentation** — Document your code using PHPDoc for PHP code or inline comments where necessary. + +## Pull Requests + +- **PR titles** should be phrased as an imperative sentence describing what was added, fixed, or changed (e.g., "Add user authentication", "Fix memory leak in worker pool", "Update dependency versions"). + +- **Issues** — Every pull request that resolves an issue must reference it in the description using a closing keyword (e.g., `closes #123`, `fixes #456`). + +- **Branch cleanup** — The person merging the pull request is responsible for deleting the branch after the merge. + +## Pull Requests — Backend + +When submitting a pull request that includes database migration scripts, adhere to the following: + +- **Never alter an existing migration script** that has been released or lived on `dev`/`master` for any amount of time. Changing a released migration will leave setups that already applied the unaltered script in an inconsistent state that cannot be recovered without manual intervention or deletion. + +- **One migration per atomic change** — Create a new migration script for each distinct feature or change. The database must be in a healthy, consistent state between every migration. + +- **Dual database support** — New migration scripts must be provided for **both** MySQL and PostgreSQL in their respective directories (`src/migrations/mysql/` and `src/migrations/postgres/`). + +- **Timestamp ordering** — Right before a PR with new migration scripts is merged, the script file names must be updated to reflect the actual merge date prefix. This ensures correct ordering across concurrent PRs. Commit this rename into the PR branch before merging. + + From 903ddf6dfd52bf73e68806867293f741066a24cb Mon Sep 17 00:00:00 2001 From: s3inlc Date: Mon, 22 Jun 2026 09:30:33 +0200 Subject: [PATCH 653/691] added some simple tests for migration utils where possible --- ci/phpunit/inc/utils/MigrationUtilsTest.php | 67 +++++++++++++++++++++ 1 file changed, 67 insertions(+) create mode 100644 ci/phpunit/inc/utils/MigrationUtilsTest.php diff --git a/ci/phpunit/inc/utils/MigrationUtilsTest.php b/ci/phpunit/inc/utils/MigrationUtilsTest.php new file mode 100644 index 000000000..9a3930b0d --- /dev/null +++ b/ci/phpunit/inc/utils/MigrationUtilsTest.php @@ -0,0 +1,67 @@ +assertArrayHasKey(0, $result); + $this->assertArrayHasKey(1, $result); + $this->assertStringEndsWith('.sql', $result[0][0]); + } + + public function testGetAllGenerationsPostgresHasExpectedGenerations(): void { + $result = MigrationUtils::getAllGenerations('postgres'); + $this->assertArrayHasKey(0, $result); + $this->assertArrayHasKey(1, $result); + $this->assertStringEndsWith('.sql', $result[0][0]); + } + + public function testGetAllGenerationsUnknownTypeReturnsEmptyArray(): void { + $result = MigrationUtils::getAllGenerations('nonexistent'); + $this->assertSame([], $result); + } + + public function testGetMigrationStartEntryGeneration0ReturnsModel(): void { + putenv('HASHTOPOLIS_DB_TYPE=mysql'); + StartupConfig::getInstance(true); + $result = MigrationUtils::getMigrationStartEntry(0); + $this->assertNotNull($result); + $dict = $result->getKeyValueDict(); + $this->assertArrayHasKey('version', $dict); + $this->assertArrayHasKey('checksum', $dict); + } + + public function testGetMigrationStartEntryGeneration1ReturnsModel(): void { + putenv('HASHTOPOLIS_DB_TYPE=mysql'); + StartupConfig::getInstance(true); + $result = MigrationUtils::getMigrationStartEntry(1); + $this->assertNotNull($result); + } + + public function testGetMigrationStartEntryUnknownGenerationReturnsNull(): void { + putenv('HASHTOPOLIS_DB_TYPE=mysql'); + StartupConfig::getInstance(true); + $result = MigrationUtils::getMigrationStartEntry(999); + $this->assertNull($result); + } +} From e500af20f023013e0bf07219955e5c3b197044de Mon Sep 17 00:00:00 2001 From: s3inlc Date: Mon, 22 Jun 2026 09:43:15 +0200 Subject: [PATCH 654/691] setting the default admin email to a valid address --- src/inc/startup/setup.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/inc/startup/setup.php b/src/inc/startup/setup.php index 13eb65ddb..ca342987a 100755 --- a/src/inc/startup/setup.php +++ b/src/inc/startup/setup.php @@ -91,7 +91,7 @@ if (getenv('HASHTOPOLIS_ADMIN_PASSWORD') !== false) { $password = getenv('HASHTOPOLIS_ADMIN_PASSWORD'); } - $email = "admin@localhost"; + $email = "htp-admin@localhost.local"; Factory::getAgentFactory()->getDB()->beginTransaction(); From a8fc57cea9541c498a826b23efc4d7ba839d4506 Mon Sep 17 00:00:00 2001 From: s3inlc Date: Mon, 22 Jun 2026 09:50:39 +0200 Subject: [PATCH 655/691] useNewBench is patchable as required in #2211 --- ci/apiv2/test_pretask.py | 14 ++++++++++++++ src/dba/models/Pretask.php | 2 +- src/dba/models/generator.php | 2 +- 3 files changed, 16 insertions(+), 2 deletions(-) diff --git a/ci/apiv2/test_pretask.py b/ci/apiv2/test_pretask.py index 2606eeb6e..17b1c8738 100644 --- a/ci/apiv2/test_pretask.py +++ b/ci/apiv2/test_pretask.py @@ -100,6 +100,20 @@ def test_patch_invalid_isCpuTask(self): self.assertEqual(e.exception.status_code, 400) self.assertEqual(e.exception.title, "Key 'isCpuTask' is not of type boolean") + def test_patch_useNewBench(self): + model_obj = self.create_test_object() + self._test_patch(model_obj, 'useNewBench', 1) + model_obj = self.create_test_object() + self._test_patch(model_obj, 'useNewBench', True) + + def test_patch_invalid_useNewBench(self): + model_obj = self.create_test_object() + model_obj.useNewBench = "test" + with self.assertRaises(HashtopolisError) as e: + model_obj.save() + self.assertEqual(e.exception.status_code, 400) + self.assertEqual(e.exception.title, "Key 'useNewBench' is not of type boolean") + def test_delete(self): model_obj = self.create_test_object(delete=False) self._test_delete(model_obj) diff --git a/src/dba/models/Pretask.php b/src/dba/models/Pretask.php index 7e91f2643..7c4d65827 100644 --- a/src/dba/models/Pretask.php +++ b/src/dba/models/Pretask.php @@ -64,7 +64,7 @@ static function getFeatures(): array { $dict['color'] = ['read_only' => False, "type" => "str(20)", "subtype" => "unset", "choices" => "unset", "null" => False, "pk" => False, "protected" => False, "private" => False, "alias" => "color", "public" => False, "dba_mapping" => False]; $dict['isSmall'] = ['read_only' => False, "type" => "bool", "subtype" => "unset", "choices" => "unset", "null" => False, "pk" => False, "protected" => False, "private" => False, "alias" => "isSmall", "public" => False, "dba_mapping" => False]; $dict['isCpuTask'] = ['read_only' => False, "type" => "bool", "subtype" => "unset", "choices" => "unset", "null" => False, "pk" => False, "protected" => False, "private" => False, "alias" => "isCpuTask", "public" => False, "dba_mapping" => False]; - $dict['useNewBench'] = ['read_only' => True, "type" => "bool", "subtype" => "unset", "choices" => "unset", "null" => False, "pk" => False, "protected" => False, "private" => False, "alias" => "useNewBench", "public" => False, "dba_mapping" => False]; + $dict['useNewBench'] = ['read_only' => False, "type" => "bool", "subtype" => "unset", "choices" => "unset", "null" => False, "pk" => False, "protected" => False, "private" => False, "alias" => "useNewBench", "public" => False, "dba_mapping" => False]; $dict['priority'] = ['read_only' => False, "type" => "int", "subtype" => "unset", "choices" => "unset", "null" => False, "pk" => False, "protected" => False, "private" => False, "alias" => "priority", "public" => False, "dba_mapping" => False]; $dict['maxAgents'] = ['read_only' => False, "type" => "int", "subtype" => "unset", "choices" => "unset", "null" => False, "pk" => False, "protected" => False, "private" => False, "alias" => "maxAgents", "public" => False, "dba_mapping" => False]; $dict['isMaskImport'] = ['read_only' => False, "type" => "bool", "subtype" => "unset", "choices" => "unset", "null" => False, "pk" => False, "protected" => False, "private" => False, "alias" => "isMaskImport", "public" => False, "dba_mapping" => False]; diff --git a/src/dba/models/generator.php b/src/dba/models/generator.php index f8198f16e..e61b60f10 100644 --- a/src/dba/models/generator.php +++ b/src/dba/models/generator.php @@ -338,7 +338,7 @@ ['name' => 'color', 'read_only' => False, 'type' => 'str(20)'], ['name' => 'isSmall', 'read_only' => False, 'type' => 'bool'], ['name' => 'isCpuTask', 'read_only' => False, 'type' => 'bool'], - ['name' => 'useNewBench', 'read_only' => True, 'type' => 'bool'], + ['name' => 'useNewBench', 'read_only' => False, 'type' => 'bool'], ['name' => 'priority', 'read_only' => False, 'type' => 'int'], ['name' => 'maxAgents', 'read_only' => False, 'type' => 'int'], ['name' => 'isMaskImport', 'read_only' => False, 'type' => 'bool'], From 8fa9a6f4f824022dbbfb6d7e29af8b54b384ae69 Mon Sep 17 00:00:00 2001 From: s3inlc Date: Mon, 22 Jun 2026 10:24:59 +0200 Subject: [PATCH 656/691] added unittests for ComparisonFilter and ConcatColumn --- ci/phpunit/dba/ComparisonFilterTest.php | 181 ++++++++++++++++++++++++ ci/phpunit/dba/ConcatColumnTest.php | 37 +++++ 2 files changed, 218 insertions(+) create mode 100644 ci/phpunit/dba/ComparisonFilterTest.php create mode 100644 ci/phpunit/dba/ConcatColumnTest.php diff --git a/ci/phpunit/dba/ComparisonFilterTest.php b/ci/phpunit/dba/ComparisonFilterTest.php new file mode 100644 index 000000000..717143e00 --- /dev/null +++ b/ci/phpunit/dba/ComparisonFilterTest.php @@ -0,0 +1,181 @@ +assertEquals('hashlistId=hashTypeId', $filter->getQueryString(Factory::getHashlistFactory())); + } + + public function testWithTablePrefix(): void { + $filter = new ComparisonFilter(Hashlist::HASHLIST_ID, Hashlist::HASH_TYPE_ID, '='); + $this->assertEquals( + 'Hashlist.hashlistId=Hashlist.hashTypeId', + $filter->getQueryString(Factory::getHashlistFactory(), true) + ); + } + + public function testWithMappedTable(): void { + $filter = new ComparisonFilter(User::USERNAME, User::EMAIL, '='); + $this->assertEquals( + 'htp_User.username=htp_User.email', + $filter->getQueryString(Factory::getUserFactory(), true) + ); + } + + public function testDifferentOperators(): void { + $factory = Factory::getHashlistFactory(); + $ops = ['!=', '<', '>', '<=', '>=']; + foreach ($ops as $op) { + $filter = new ComparisonFilter(Hashlist::HASHLIST_ID, Hashlist::HASH_TYPE_ID, $op); + $this->assertEquals( + "hashlistId{$op}hashTypeId", + $filter->getQueryString($factory), + "Operator {$op} should produce hashlistId{$op}hashTypeId" + ); + } + } + + public function testOverrideFactory(): void { + $filter = new ComparisonFilter(Hashlist::HASHLIST_ID, Hashlist::HASH_TYPE_ID, '=', Factory::getHashlistFactory()); + $this->assertEquals( + 'hashlistId=hashTypeId', + $filter->getQueryString(Factory::getUserFactory(), false) + ); + } + + public function testOverrideFactoryWithTable(): void { + $filter = new ComparisonFilter(Hashlist::HASHLIST_ID, Hashlist::HASH_TYPE_ID, '=', Factory::getHashlistFactory()); + $this->assertEquals( + 'Hashlist.hashlistId=Hashlist.hashTypeId', + $filter->getQueryString(Factory::getUserFactory(), true) + ); + } + + public function testGetValueReturnsNull(): void { + $filter = new ComparisonFilter(Hashlist::HASHLIST_ID, Hashlist::HASH_TYPE_ID, '='); + $this->assertNull($filter->getValue()); + } + + public function testGetHasValueReturnsFalse(): void { + $filter = new ComparisonFilter(Hashlist::HASHLIST_ID, Hashlist::HASH_TYPE_ID, '='); + $this->assertFalse($filter->getHasValue()); + } + + /** + * @throws Exception + */ + public function testFilterEquality(): void { + $testid = uniqid(); + $this->createDatabaseObject(Factory::getHashTypeFactory(), new HashType(null, 'ht1' . $testid, 5, 5)); + $this->createDatabaseObject(Factory::getHashTypeFactory(), new HashType(null, 'ht2' . $testid, 5, 10)); + $this->createDatabaseObject(Factory::getHashTypeFactory(), new HashType(null, 'ht3' . $testid, 0, 0)); + + $lF = new LikeFilter(HashType::DESCRIPTION, '%' . $testid); + $cF = new ComparisonFilter(HashType::IS_SALTED, HashType::IS_SLOW_HASH, '='); + $result = Factory::getHashTypeFactory()->filter([Factory::FILTER => [$lF, $cF]]); + + $this->assertCount(2, $result); + foreach ($result as $ht) { + $this->assertEquals($ht->getIsSalted(), $ht->getIsSlowHash()); + } + } + + /** + * @throws Exception + */ + public function testFilterNotEqual(): void { + $testid = uniqid(); + $this->createDatabaseObject(Factory::getHashTypeFactory(), new HashType(null, 'ht1' . $testid, 5, 5)); + $this->createDatabaseObject(Factory::getHashTypeFactory(), new HashType(null, 'ht2' . $testid, 5, 10)); + $this->createDatabaseObject(Factory::getHashTypeFactory(), new HashType(null, 'ht3' . $testid, 0, 0)); + + $lF = new LikeFilter(HashType::DESCRIPTION, '%' . $testid); + $cF = new ComparisonFilter(HashType::IS_SALTED, HashType::IS_SLOW_HASH, '!='); + $result = Factory::getHashTypeFactory()->filter([Factory::FILTER => [$lF, $cF]]); + + $this->assertCount(1, $result); + foreach ($result as $ht) { + $this->assertNotEquals($ht->getIsSalted(), $ht->getIsSlowHash()); + } + } + + /** + * @throws Exception + */ + public function testFilterGreaterThan(): void { + $testid = uniqid(); + $this->createDatabaseObject(Factory::getHashTypeFactory(), new HashType(null, 'ht1' . $testid, 3, 1)); + $this->createDatabaseObject(Factory::getHashTypeFactory(), new HashType(null, 'ht2' . $testid, 0, 5)); + $this->createDatabaseObject(Factory::getHashTypeFactory(), new HashType(null, 'ht3' . $testid, 10, 0)); + + $lF = new LikeFilter(HashType::DESCRIPTION, '%' . $testid); + $cF = new ComparisonFilter(HashType::IS_SALTED, HashType::IS_SLOW_HASH, '>'); + $result = Factory::getHashTypeFactory()->filter([Factory::FILTER => [$lF, $cF]]); + + $this->assertCount(2, $result); + foreach ($result as $ht) { + $this->assertGreaterThan($ht->getIsSlowHash(), $ht->getIsSalted()); + } + } + + /** + * @throws Exception + */ + public function testFilterLessThan(): void { + $testid = uniqid(); + $this->createDatabaseObject(Factory::getHashTypeFactory(), new HashType(null, 'ht1' . $testid, 1, 3)); + $this->createDatabaseObject(Factory::getHashTypeFactory(), new HashType(null, 'ht2' . $testid, 5, 0)); + $this->createDatabaseObject(Factory::getHashTypeFactory(), new HashType(null, 'ht3' . $testid, 0, 10)); + + $lF = new LikeFilter(HashType::DESCRIPTION, '%' . $testid); + $cF = new ComparisonFilter(HashType::IS_SALTED, HashType::IS_SLOW_HASH, '<'); + $result = Factory::getHashTypeFactory()->filter([Factory::FILTER => [$lF, $cF]]); + + $this->assertCount(2, $result); + foreach ($result as $ht) { + $this->assertLessThan($ht->getIsSlowHash(), $ht->getIsSalted()); + } + } + + /** + * @throws Exception + */ + public function testFilterNoMatch(): void { + $testid = uniqid(); + $this->createDatabaseObject(Factory::getHashTypeFactory(), new HashType(null, 'ht1' . $testid, 1, 3)); + $this->createDatabaseObject(Factory::getHashTypeFactory(), new HashType(null, 'ht2' . $testid, 5, 10)); + + $lF = new LikeFilter(HashType::DESCRIPTION, '%' . $testid); + $cF = new ComparisonFilter(HashType::IS_SALTED, HashType::IS_SLOW_HASH, '='); + $result = Factory::getHashTypeFactory()->filter([Factory::FILTER => [$lF, $cF]]); + + $this->assertCount(0, $result); + } + + /** + * @throws Exception + */ + public function testFilterWithColumnFilter(): void { + $testid = uniqid(); + $ht1 = $this->createDatabaseObject(Factory::getHashTypeFactory(), new HashType(null, 'ht1' . $testid, 50, 0)); + $this->createDatabaseObject(Factory::getHashTypeFactory(), new HashType(null, 'ht2' . $testid, 0, 50)); + $ht3 = $this->createDatabaseObject(Factory::getHashTypeFactory(), new HashType(null, 'ht3' . $testid, 50, 0)); + + $lF = new LikeFilter(HashType::DESCRIPTION, '%' . $testid); + $cF = new ComparisonFilter(HashType::IS_SALTED, HashType::IS_SLOW_HASH, '>'); + $ids = Factory::getHashTypeFactory()->columnFilter([Factory::FILTER => [$lF, $cF]], HashType::HASH_TYPE_ID); + + $this->assertCount(2, $ids); + $this->assertEqualsCanonicalizing([$ht1->getId(), $ht3->getId()], $ids); + } +} diff --git a/ci/phpunit/dba/ConcatColumnTest.php b/ci/phpunit/dba/ConcatColumnTest.php new file mode 100644 index 000000000..37b8be493 --- /dev/null +++ b/ci/phpunit/dba/ConcatColumnTest.php @@ -0,0 +1,37 @@ +assertEquals('hashlistId', $col->getValue()); + } + + public function testReturnsFactory(): void { + $factory = Factory::getHashlistFactory(); + $col = new ConcatColumn(Hashlist::HASHLIST_NAME, $factory); + $this->assertSame($factory, $col->getFactory()); + } + + public function testNullValue(): void { + $col = new ConcatColumn(null, Factory::getHashlistFactory()); + $this->assertNull($col->getValue()); + } + + public function testUserColumn(): void { + $col = new ConcatColumn(User::USERNAME, Factory::getUserFactory()); + $this->assertEquals('username', $col->getValue()); + } + + public function testFactoryIsAbstractModelFactory(): void { + $col = new ConcatColumn(Hashlist::HASH_TYPE_ID, Factory::getHashlistFactory()); + $this->assertInstanceOf(AbstractModelFactory::class, $col->getFactory()); + } +} From 4988b9c0fb29017e86b7de681b3323feba10c80a Mon Sep 17 00:00:00 2001 From: s3inlc Date: Mon, 22 Jun 2026 11:17:52 +0200 Subject: [PATCH 657/691] added unittests for ConcatLikeFilterInsensitive and ConcatOrderFilter --- .../dba/ConcatLikeFilterInsensitiveTest.php | 83 +++++++++++++++++ ci/phpunit/dba/ConcatOrderFilterTest.php | 90 +++++++++++++++++++ src/dba/ConcatOrderFilter.php | 6 +- 3 files changed, 176 insertions(+), 3 deletions(-) create mode 100644 ci/phpunit/dba/ConcatLikeFilterInsensitiveTest.php create mode 100644 ci/phpunit/dba/ConcatOrderFilterTest.php diff --git a/ci/phpunit/dba/ConcatLikeFilterInsensitiveTest.php b/ci/phpunit/dba/ConcatLikeFilterInsensitiveTest.php new file mode 100644 index 000000000..a2d916e0d --- /dev/null +++ b/ci/phpunit/dba/ConcatLikeFilterInsensitiveTest.php @@ -0,0 +1,83 @@ +assertEquals( + 'LOWER(CONCAT(Hashlist.hashlistId)) LIKE LOWER(?)', + $filter->getQueryString(Factory::getHashlistFactory()) + ); + } + + public function testQueryStringMultipleColumns(): void { + $col1 = new ConcatColumn(Hashlist::HASHLIST_ID, Factory::getHashlistFactory()); + $col2 = new ConcatColumn(Hashlist::HASHLIST_NAME, Factory::getHashlistFactory()); + $filter = new ConcatLikeFilterInsensitive([$col1, $col2], '%test%'); + $this->assertEquals( + 'LOWER(CONCAT(Hashlist.hashlistId, Hashlist.hashlistName)) LIKE LOWER(?)', + $filter->getQueryString(Factory::getHashlistFactory()) + ); + } + + public function testQueryStringMappedTable(): void { + $col = new ConcatColumn(User::USERNAME, Factory::getUserFactory()); + $filter = new ConcatLikeFilterInsensitive([$col], '%test%'); + $this->assertEquals( + 'LOWER(CONCAT(htp_User.username)) LIKE LOWER(?)', + $filter->getQueryString(Factory::getUserFactory()) + ); + } + + public function testGetValue(): void { + $col = new ConcatColumn(Hashlist::HASHLIST_ID, Factory::getHashlistFactory()); + $filter = new ConcatLikeFilterInsensitive([$col], '%search%'); + $this->assertEquals('%search%', $filter->getValue()); + } + + public function testGetHasValue(): void { + $col = new ConcatColumn(Hashlist::HASHLIST_ID, Factory::getHashlistFactory()); + $filter = new ConcatLikeFilterInsensitive([$col], '%test%'); + $this->assertTrue($filter->getHasValue()); + } + + /** + * @throws Exception + */ + public function testFilterCaseInsensitive(): void { + $testid = uniqid(); + $this->createDatabaseObject(Factory::getHashTypeFactory(), new HashType(null, 'HelloWorld' . $testid, 1, 0)); + $this->createDatabaseObject(Factory::getHashTypeFactory(), new HashType(null, 'helloworld' . $testid, 0, 0)); + $this->createDatabaseObject(Factory::getHashTypeFactory(), new HashType(null, 'other' . $testid, 0, 0)); + + $col = new ConcatColumn(HashType::DESCRIPTION, Factory::getHashTypeFactory()); + $filter = new ConcatLikeFilterInsensitive([$col], '%helloworld' . $testid); + $result = Factory::getHashTypeFactory()->filter([Factory::FILTER => $filter]); + + $this->assertCount(2, $result); + } + + /** + * @throws Exception + */ + public function testFilterCaseInsensitiveNoMatch(): void { + $testid = uniqid(); + $this->createDatabaseObject(Factory::getHashTypeFactory(), new HashType(null, 'HelloWorld' . $testid, 1, 0)); + + $col = new ConcatColumn(HashType::DESCRIPTION, Factory::getHashTypeFactory()); + $filter = new ConcatLikeFilterInsensitive([$col], '%nonexistent' . $testid); + $result = Factory::getHashTypeFactory()->filter([Factory::FILTER => $filter]); + + $this->assertCount(0, $result); + } +} diff --git a/ci/phpunit/dba/ConcatOrderFilterTest.php b/ci/phpunit/dba/ConcatOrderFilterTest.php new file mode 100644 index 000000000..3e5fbf623 --- /dev/null +++ b/ci/phpunit/dba/ConcatOrderFilterTest.php @@ -0,0 +1,90 @@ +assertEquals( + 'CONCAT(hashlistId) ASC', + $order->getQueryString(Factory::getHashlistFactory()) + ); + } + + public function testQueryStringSingleColumnDesc(): void { + $col = new ConcatColumn(Hashlist::HASHLIST_NAME, Factory::getHashlistFactory()); + $order = new ConcatOrderFilter([$col], 'DESC'); + $this->assertEquals( + 'CONCAT(hashlistName) DESC', + $order->getQueryString(Factory::getHashlistFactory()) + ); + } + + public function testQueryStringMultipleColumns(): void { + $col1 = new ConcatColumn(Hashlist::HASHLIST_ID, Factory::getHashlistFactory()); + $col2 = new ConcatColumn(Hashlist::HASHLIST_NAME, Factory::getHashlistFactory()); + $order = new ConcatOrderFilter([$col1, $col2], 'ASC'); + $this->assertEquals( + 'CONCAT(hashlistId, hashlistName) ASC', + $order->getQueryString(Factory::getHashlistFactory()) + ); + } + + public function testQueryStringMappedColumn(): void { + $col = new ConcatColumn(User::USERNAME, Factory::getUserFactory()); + $order = new ConcatOrderFilter([$col], 'ASC'); + $this->assertEquals( + 'CONCAT(username) ASC', + $order->getQueryString(Factory::getUserFactory()) + ); + } + + /** + * @throws Exception + */ + public function testOrderAsc(): void { + $testid = uniqid(); + $ht1 = $this->createDatabaseObject(Factory::getHashTypeFactory(), new HashType(null, 'a' . $testid, 1, 0)); + $ht2 = $this->createDatabaseObject(Factory::getHashTypeFactory(), new HashType(null, 'b' . $testid, 5, 0)); + $ht3 = $this->createDatabaseObject(Factory::getHashTypeFactory(), new HashType(null, 'c' . $testid, 3, 0)); + + $lF = new LikeFilter(HashType::DESCRIPTION, '%' . $testid); + $col = new ConcatColumn(HashType::IS_SALTED, Factory::getHashTypeFactory()); + $oF = new ConcatOrderFilter([$col], 'ASC'); + $result = Factory::getHashTypeFactory()->filter([Factory::FILTER => $lF, Factory::ORDER => $oF]); + + $this->assertCount(3, $result); + $this->assertEquals($ht1->getId(), $result[0]->getId()); + $this->assertEquals($ht3->getId(), $result[1]->getId()); + $this->assertEquals($ht2->getId(), $result[2]->getId()); + } + + /** + * @throws Exception + */ + public function testOrderDesc(): void { + $testid = uniqid(); + $ht1 = $this->createDatabaseObject(Factory::getHashTypeFactory(), new HashType(null, 'a' . $testid, 1, 0)); + $ht2 = $this->createDatabaseObject(Factory::getHashTypeFactory(), new HashType(null, 'b' . $testid, 5, 0)); + $ht3 = $this->createDatabaseObject(Factory::getHashTypeFactory(), new HashType(null, 'c' . $testid, 3, 0)); + + $lF = new LikeFilter(HashType::DESCRIPTION, '%' . $testid); + $col = new ConcatColumn(HashType::IS_SALTED, Factory::getHashTypeFactory()); + $oF = new ConcatOrderFilter([$col], 'DESC'); + $result = Factory::getHashTypeFactory()->filter([Factory::FILTER => $lF, Factory::ORDER => $oF]); + + $this->assertCount(3, $result); + $this->assertEquals($ht2->getId(), $result[0]->getId()); + $this->assertEquals($ht3->getId(), $result[1]->getId()); + $this->assertEquals($ht1->getId(), $result[2]->getId()); + } +} diff --git a/src/dba/ConcatOrderFilter.php b/src/dba/ConcatOrderFilter.php index 18f9d0bef..56824d151 100644 --- a/src/dba/ConcatOrderFilter.php +++ b/src/dba/ConcatOrderFilter.php @@ -6,11 +6,11 @@ class ConcatOrderFilter extends Order { /** * @var ConcatColumn[] $columns */ - private $columns; - private $type; + private array $columns; + private string $type; /** - * @param string[] $columns + * @param ConcatColumn[] $columns * @param string $type */ function __construct(array $columns, string $type) { From 457af3ceef872a66a5339ab76bdc85ad005b2709 Mon Sep 17 00:00:00 2001 From: s3inlc Date: Mon, 22 Jun 2026 11:23:23 +0200 Subject: [PATCH 658/691] added unittests for ContainFilter --- ci/phpunit/dba/ContainFilterTest.php | 206 +++++++++++++++++++++++++++ 1 file changed, 206 insertions(+) create mode 100644 ci/phpunit/dba/ContainFilterTest.php diff --git a/ci/phpunit/dba/ContainFilterTest.php b/ci/phpunit/dba/ContainFilterTest.php new file mode 100644 index 000000000..ebd5800b2 --- /dev/null +++ b/ci/phpunit/dba/ContainFilterTest.php @@ -0,0 +1,206 @@ +assertEquals( + 'hashlistId IN (?)', + $filter->getQueryString(Factory::getHashlistFactory()) + ); + } + + public function testQueryStringMultipleValues(): void { + $filter = new ContainFilter(Hashlist::HASHLIST_ID, [1, 2, 3]); + $this->assertEquals( + 'hashlistId IN (?,?,?)', + $filter->getQueryString(Factory::getHashlistFactory()) + ); + } + + public function testQueryStringWithTable(): void { + $filter = new ContainFilter(Hashlist::HASHLIST_ID, [1]); + $this->assertEquals( + 'Hashlist.hashlistId IN (?)', + $filter->getQueryString(Factory::getHashlistFactory(), true) + ); + } + + public function testQueryStringNotIn(): void { + $filter = new ContainFilter(Hashlist::HASHLIST_ID, [1, 2], null, true); + $this->assertEquals( + 'hashlistId NOT IN (?,?)', + $filter->getQueryString(Factory::getHashlistFactory()) + ); + } + + public function testQueryStringNotInWithTable(): void { + $filter = new ContainFilter(Hashlist::HASHLIST_ID, [1, 2], null, true); + $this->assertEquals( + 'Hashlist.hashlistId NOT IN (?,?)', + $filter->getQueryString(Factory::getHashlistFactory(), true) + ); + } + + public function testQueryStringEmptyValues(): void { + $filter = new ContainFilter(Hashlist::HASHLIST_ID, []); + $this->assertEquals( + 'FALSE', + $filter->getQueryString(Factory::getHashlistFactory()) + ); + } + + public function testQueryStringEmptyValuesInverse(): void { + $filter = new ContainFilter(Hashlist::HASHLIST_ID, [], null, true); + $this->assertEquals( + 'TRUE', + $filter->getQueryString(Factory::getHashlistFactory()) + ); + } + + public function testQueryStringMappedTable(): void { + $filter = new ContainFilter(User::USER_ID, [1]); + $this->assertEquals( + 'htp_User.userId IN (?)', + $filter->getQueryString(Factory::getUserFactory(), true) + ); + } + + public function testQueryStringOverrideFactory(): void { + $filter = new ContainFilter(Hashlist::HASHLIST_ID, [1], Factory::getHashlistFactory()); + $this->assertEquals( + 'hashlistId IN (?)', + $filter->getQueryString(Factory::getUserFactory()) + ); + } + + public function testQueryStringMappedColumn(): void { + $filter = new ContainFilter(HealthCheckAgent::END, [1, 2]); + $this->assertEquals( + 'htp_end IN (?,?)', + $filter->getQueryString(Factory::getHealthCheckAgentFactory()) + ); + } + + public function testQueryStringMappedColumnWithTable(): void { + $filter = new ContainFilter(HealthCheckAgent::END, [1]); + $this->assertEquals( + 'HealthCheckAgent.htp_end IN (?)', + $filter->getQueryString(Factory::getHealthCheckAgentFactory(), true) + ); + } + + public function testQueryStringMappedColumnNotIn(): void { + $filter = new ContainFilter(HealthCheckAgent::END, [1], null, true); + $this->assertEquals( + 'htp_end NOT IN (?)', + $filter->getQueryString(Factory::getHealthCheckAgentFactory()) + ); + } + + public function testGetValue(): void { + $filter = new ContainFilter(Hashlist::HASHLIST_ID, [1, 2, 3]); + $this->assertEquals([1, 2, 3], $filter->getValue()); + } + + public function testGetHasValue(): void { + $filter = new ContainFilter(Hashlist::HASHLIST_ID, [1]); + $this->assertTrue($filter->getHasValue()); + } + + /** + * @throws Exception + */ + public function testFilterIn(): void { + $testid = uniqid(); + $this->createDatabaseObject(Factory::getHashTypeFactory(), new HashType(null, 'ht1' . $testid, 1, 0)); + $this->createDatabaseObject(Factory::getHashTypeFactory(), new HashType(null, 'ht2' . $testid, 5, 0)); + $this->createDatabaseObject(Factory::getHashTypeFactory(), new HashType(null, 'ht3' . $testid, 10, 0)); + $this->createDatabaseObject(Factory::getHashTypeFactory(), new HashType(null, 'ht4' . $testid, 20, 0)); + + $lF = new LikeFilter(HashType::DESCRIPTION, '%' . $testid); + $cF = new ContainFilter(HashType::IS_SALTED, [1, 10]); + $result = Factory::getHashTypeFactory()->filter([Factory::FILTER => [$lF, $cF]]); + + $this->assertCount(2, $result); + foreach ($result as $ht) { + $this->assertContains($ht->getIsSalted(), [1, 10]); + } + } + + /** + * @throws Exception + */ + public function testFilterNotIn(): void { + $testid = uniqid(); + $this->createDatabaseObject(Factory::getHashTypeFactory(), new HashType(null, 'ht1' . $testid, 1, 0)); + $this->createDatabaseObject(Factory::getHashTypeFactory(), new HashType(null, 'ht2' . $testid, 5, 0)); + $this->createDatabaseObject(Factory::getHashTypeFactory(), new HashType(null, 'ht3' . $testid, 10, 0)); + $this->createDatabaseObject(Factory::getHashTypeFactory(), new HashType(null, 'ht4' . $testid, 20, 0)); + + $lF = new LikeFilter(HashType::DESCRIPTION, '%' . $testid); + $cF = new ContainFilter(HashType::IS_SALTED, [1, 10], null, true); + $result = Factory::getHashTypeFactory()->filter([Factory::FILTER => [$lF, $cF]]); + + $this->assertCount(2, $result); + foreach ($result as $ht) { + $this->assertContains($ht->getIsSalted(), [5, 20]); + } + } + + /** + * @throws Exception + */ + public function testFilterEmptyValues(): void { + $testid = uniqid(); + $this->createDatabaseObject(Factory::getHashTypeFactory(), new HashType(null, 'ht1' . $testid, 1, 0)); + + $lF = new LikeFilter(HashType::DESCRIPTION, '%' . $testid); + $cF = new ContainFilter(HashType::IS_SALTED, []); + $result = Factory::getHashTypeFactory()->filter([Factory::FILTER => [$lF, $cF]]); + + $this->assertCount(0, $result); + } + + /** + * @throws Exception + */ + public function testFilterEmptyValuesInverse(): void { + $testid = uniqid(); + $this->createDatabaseObject(Factory::getHashTypeFactory(), new HashType(null, 'ht1' . $testid, 1, 0)); + $this->createDatabaseObject(Factory::getHashTypeFactory(), new HashType(null, 'ht2' . $testid, 5, 0)); + + $lF = new LikeFilter(HashType::DESCRIPTION, '%' . $testid); + $cF = new ContainFilter(HashType::IS_SALTED, [], null, true); + $result = Factory::getHashTypeFactory()->filter([Factory::FILTER => [$lF, $cF]]); + + $this->assertCount(2, $result); + } + + /** + * @throws Exception + */ + public function testFilterInWithColumnFilter(): void { + $testid = uniqid(); + $ht1 = $this->createDatabaseObject(Factory::getHashTypeFactory(), new HashType(null, 'ht1' . $testid, 1, 0)); + $this->createDatabaseObject(Factory::getHashTypeFactory(), new HashType(null, 'ht2' . $testid, 5, 0)); + $ht3 = $this->createDatabaseObject(Factory::getHashTypeFactory(), new HashType(null, 'ht3' . $testid, 10, 0)); + + $lF = new LikeFilter(HashType::DESCRIPTION, '%' . $testid); + $cF = new ContainFilter(HashType::IS_SALTED, [1, 10]); + $ids = Factory::getHashTypeFactory()->columnFilter([Factory::FILTER => [$lF, $cF]], HashType::HASH_TYPE_ID); + + $this->assertCount(2, $ids); + $this->assertEqualsCanonicalizing([$ht1->getId(), $ht3->getId()], $ids); + } +} From 53b5ce29320e6159b13857844161e51ccac0a662 Mon Sep 17 00:00:00 2001 From: s3inlc Date: Mon, 22 Jun 2026 11:47:32 +0200 Subject: [PATCH 659/691] added unittests for JoinFilter LikeFilterInsensitive and LikeFilter --- ci/phpunit/dba/JoinFilterTest.php | 267 +++++++++++++++++++ ci/phpunit/dba/LikeFilterInsensitiveTest.php | 157 +++++++++++ ci/phpunit/dba/LikeFilterTest.php | 264 ++++++++++++++++++ 3 files changed, 688 insertions(+) create mode 100644 ci/phpunit/dba/JoinFilterTest.php create mode 100644 ci/phpunit/dba/LikeFilterInsensitiveTest.php create mode 100644 ci/phpunit/dba/LikeFilterTest.php diff --git a/ci/phpunit/dba/JoinFilterTest.php b/ci/phpunit/dba/JoinFilterTest.php new file mode 100644 index 000000000..5a10ff247 --- /dev/null +++ b/ci/phpunit/dba/JoinFilterTest.php @@ -0,0 +1,267 @@ +assertSame($other, $filter->getOtherFactory()); + $this->assertEquals(Hashlist::HASHLIST_ID, $filter->getMatch1()); + $this->assertEquals(Hashlist::HASH_TYPE_ID, $filter->getMatch2()); + $this->assertEquals(JoinFilter::INNER, $filter->getJoinType()); + $this->assertEquals([], $filter->getQueryFilters()); + $this->assertNull($filter->getOverrideOwnFactory()); + } + + /** Verify LEFT join type is stored in the constructor. */ + public function testJoinTypeLeft(): void { + $filter = new JoinFilter(Factory::getHashlistFactory(), Hashlist::HASHLIST_ID, Hashlist::HASH_TYPE_ID, null, JoinFilter::LEFT); + $this->assertEquals(JoinFilter::LEFT, $filter->getJoinType()); + } + + /** Verify RIGHT join type is stored in the constructor. */ + public function testJoinTypeRight(): void { + $filter = new JoinFilter(Factory::getHashlistFactory(), Hashlist::HASHLIST_ID, Hashlist::HASH_TYPE_ID, null, JoinFilter::RIGHT); + $this->assertEquals(JoinFilter::RIGHT, $filter->getJoinType()); + } + + /** Verify join type can be changed after construction via setJoinType. */ + public function testSetJoinType(): void { + $filter = new JoinFilter(Factory::getHashlistFactory(), Hashlist::HASHLIST_ID, Hashlist::HASH_TYPE_ID); + $filter->setJoinType(JoinFilter::LEFT); + $this->assertEquals(JoinFilter::LEFT, $filter->getJoinType()); + } + + /** Verify overrideOwnFactory is stored and returned. */ + public function testWithOverrideOwnFactory(): void { + $override = Factory::getHashlistFactory(); + $filter = new JoinFilter(Factory::getUserFactory(), User::USER_ID, Hashlist::HASHLIST_ID, $override); + $this->assertSame($override, $filter->getOverrideOwnFactory()); + } + + /** Verify queryFilters array is stored in the constructor. */ + public function testWithQueryFilters(): void { + $qF = new QueryFilter(Hashlist::CRACKED, 0, '='); + $filter = new JoinFilter(Factory::getHashlistFactory(), Hashlist::HASHLIST_ID, Hashlist::HASH_TYPE_ID, null, JoinFilter::INNER, [$qF]); + $this->assertCount(1, $filter->getQueryFilters()); + $this->assertSame($qF, $filter->getQueryFilters()[0]); + } + + /** Verify queryFilters can be replaced after construction via setQueryFilters. */ + public function testSetQueryFilters(): void { + $filter = new JoinFilter(Factory::getHashlistFactory(), Hashlist::HASHLIST_ID, Hashlist::HASH_TYPE_ID); + $filter->setQueryFilters([new QueryFilter(Hashlist::CRACKED, 0, '=')]); + $this->assertCount(1, $filter->getQueryFilters()); + } + + /** Verify getOtherTableName returns the unmapped table name (Hashlist) for a non-mapped factory. */ + public function testOtherTableNameNonMapped(): void { + $filter = new JoinFilter(Factory::getHashlistFactory(), Hashlist::HASHLIST_ID, Hashlist::HASH_TYPE_ID); + $this->assertEquals('Hashlist', $filter->getOtherTableName()); + } + + /** Verify getOtherTableName returns the mapped table name (htp_User) for a mapped factory. */ + public function testOtherTableNameMapped(): void { + $filter = new JoinFilter(Factory::getUserFactory(), User::USER_ID, User::USER_ID); + $this->assertEquals('htp_User', $filter->getOtherTableName()); + } + + /** + * INNER JOIN File with AccessGroup on accessGroupId. + * Creates 3 files across 2 groups — all rows match, so both result + * arrays contain 3 entries. + */ + public function testJoinInner(): void { + $testid = uniqid(); + $ag1 = $this->createAccessGroup('ag1_' . $testid); + $ag2 = $this->createAccessGroup('ag2_' . $testid); + + $this->createFile($ag1, 0, 'file1_' . $testid, 10); + $this->createFile($ag2, 0, 'file2_' . $testid, 20); + $this->createFile($ag1, 0, 'file3_' . $testid, 30); + + $jF = new JoinFilter(Factory::getAccessGroupFactory(), File::ACCESS_GROUP_ID, AccessGroup::ACCESS_GROUP_ID); + $joined = Factory::getFileFactory()->filter([Factory::JOIN => $jF]); + + $this->assertCount(3, $joined[Factory::getFileFactory()->getModelName()]); + $this->assertCount(3, $joined[Factory::getAccessGroupFactory()->getModelName()]); + foreach ($joined[Factory::getFileFactory()->getModelName()] as $file) { + $this->assertInstanceOf(File::class, $file); + } + foreach ($joined[Factory::getAccessGroupFactory()->getModelName()] as $ag) { + $this->assertInstanceOf(AccessGroup::class, $ag); + } + } + + /** + * INNER JOIN combined with a QueryFilter on the joined table (AccessGroup). + * Only files belonging to ag1 should be returned. + */ + public function testJoinWithFilter(): void { + $testid = uniqid(); + $ag1 = $this->createAccessGroup('ag1_' . $testid); + $ag2 = $this->createAccessGroup('ag2_' . $testid); + + $this->createFile($ag1, 0, 'file1_' . $testid, 10); + $this->createFile($ag2, 0, 'file2_' . $testid, 20); + $this->createFile($ag1, 0, 'file3_' . $testid, 30); + + $qF = new QueryFilter(AccessGroup::GROUP_NAME, $ag1->getGroupName(), '=', Factory::getAccessGroupFactory()); + $jF = new JoinFilter(Factory::getAccessGroupFactory(), File::ACCESS_GROUP_ID, AccessGroup::ACCESS_GROUP_ID); + $joined = Factory::getFileFactory()->filter([Factory::FILTER => $qF, Factory::JOIN => $jF]); + + $this->assertCount(2, $joined[Factory::getFileFactory()->getModelName()]); + $this->assertEquals('file1_' . $testid, $joined[Factory::getFileFactory()->getModelName()][0]->getFilename()); + $this->assertEquals('file3_' . $testid, $joined[Factory::getFileFactory()->getModelName()][1]->getFilename()); + } + + /** + * INNER JOIN combined with a filter and ORDER BY DESC on File::SIZE. + * Files belonging to ag1 should be returned in descending size order. + */ + public function testJoinWithOrder(): void { + $testid = uniqid(); + $ag1 = $this->createAccessGroup('ag1_' . $testid); + $ag2 = $this->createAccessGroup('ag2_' . $testid); + + $this->createFile($ag1, 0, 'file1_' . $testid, 10); + $this->createFile($ag2, 0, 'file2_' . $testid, 20); + $this->createFile($ag1, 0, 'file3_' . $testid, 30); + + $qF = new QueryFilter(AccessGroup::GROUP_NAME, $ag1->getGroupName(), '=', Factory::getAccessGroupFactory()); + $jF = new JoinFilter(Factory::getAccessGroupFactory(), File::ACCESS_GROUP_ID, AccessGroup::ACCESS_GROUP_ID); + $oF = new OrderFilter(File::SIZE, 'DESC'); + $joined = Factory::getFileFactory()->filter([Factory::FILTER => $qF, Factory::JOIN => $jF, Factory::ORDER => $oF]); + + $this->assertCount(2, $joined[Factory::getFileFactory()->getModelName()]); + $this->assertEquals('file3_' . $testid, $joined[Factory::getFileFactory()->getModelName()][0]->getFilename()); + $this->assertEquals('file1_' . $testid, $joined[Factory::getFileFactory()->getModelName()][1]->getFilename()); + } + + /** + * INNER JOIN with the filter pushed directly into JoinFilter's + * queryFilters parameter instead of via Factory::FILTER. + * Same expected result as testJoinWithFilter. + */ + public function testJoinWithQueryFilters(): void { + $testid = uniqid(); + $ag1 = $this->createAccessGroup('ag1_' . $testid); + $ag2 = $this->createAccessGroup('ag2_' . $testid); + + $this->createFile($ag1, 0, 'file1_' . $testid, 10); + $this->createFile($ag2, 0, 'file2_' . $testid, 20); + $this->createFile($ag1, 0, 'file3_' . $testid, 30); + + $qFJoin = new QueryFilter(AccessGroup::GROUP_NAME, $ag1->getGroupName(), '=', Factory::getAccessGroupFactory()); + $jF = new JoinFilter(Factory::getAccessGroupFactory(), File::ACCESS_GROUP_ID, AccessGroup::ACCESS_GROUP_ID, null, JoinFilter::INNER, [$qFJoin]); + $joined = Factory::getFileFactory()->filter([Factory::JOIN => $jF]); + + $this->assertCount(2, $joined[Factory::getFileFactory()->getModelName()]); + $this->assertEquals('file1_' . $testid, $joined[Factory::getFileFactory()->getModelName()][0]->getFilename()); + $this->assertEquals('file3_' . $testid, $joined[Factory::getFileFactory()->getModelName()][1]->getFilename()); + } + + /** + * INNER JOIN AccessGroupUser with User on userId. + * UserFactory has isMapping() = True, so the join table is htp_User. + * Verifies the mapped table name works correctly in a real query. + */ + public function testJoinMappedTable(): void { + $testid = uniqid(); + $user = $this->createUser('user_' . $testid); + $ag = $this->createAccessGroup('ag_' . $testid); + $this->createAccessGroupUser($user, $ag); + + $jF = new JoinFilter(Factory::getUserFactory(), AccessGroupUser::USER_ID, User::USER_ID); + $joined = Factory::getAccessGroupUserFactory()->filter([Factory::JOIN => $jF]); + + $this->assertCount(1, $joined[Factory::getAccessGroupUserFactory()->getModelName()]); + $this->assertCount(1, $joined[Factory::getUserFactory()->getModelName()]); + $this->assertInstanceOf(AccessGroupUser::class, $joined[Factory::getAccessGroupUserFactory()->getModelName()][0]); + $this->assertInstanceOf(User::class, $joined[Factory::getUserFactory()->getModelName()][0]); + $this->assertEquals($user->getId(), $joined[Factory::getUserFactory()->getModelName()][0]->getId()); + } + + /** + * Two simultaneous INNER JOINs: AccessGroupUser joined with User + * (on userId) AND with AccessGroup (on accessGroupId). + * Verifies multiple joins are applied correctly. + */ + public function testJoinMultipleInner(): void { + $testid = uniqid(); + $user = $this->createUser('user_' . $testid); + $ag = $this->createAccessGroup('ag_' . $testid); + $this->createAccessGroupUser($user, $ag); + + $jF1 = new JoinFilter(Factory::getUserFactory(), AccessGroupUser::USER_ID, User::USER_ID); + $jF2 = new JoinFilter(Factory::getAccessGroupFactory(), AccessGroupUser::ACCESS_GROUP_ID, AccessGroup::ACCESS_GROUP_ID); + $joined = Factory::getAccessGroupUserFactory()->filter([Factory::JOIN => [$jF1, $jF2]]); + + $this->assertCount(1, $joined[Factory::getAccessGroupUserFactory()->getModelName()]); + $this->assertCount(1, $joined[Factory::getUserFactory()->getModelName()]); + $this->assertCount(1, $joined[Factory::getAccessGroupFactory()->getModelName()]); + $this->assertInstanceOf(AccessGroupUser::class, $joined[Factory::getAccessGroupUserFactory()->getModelName()][0]); + $this->assertInstanceOf(User::class, $joined[Factory::getUserFactory()->getModelName()][0]); + $this->assertInstanceOf(AccessGroup::class, $joined[Factory::getAccessGroupFactory()->getModelName()][0]); + } + + /** + * LEFT JOIN AccessGroup (main) → File (joined) on accessGroupId. + * ag2 has no files, so the third row has a File with null ID, + * confirming LEFT JOIN preserves all rows from the main table. + */ + public function testJoinLeft(): void { + $testid = uniqid(); + $ag1 = $this->createAccessGroup('ag1_' . $testid); + $ag2 = $this->createAccessGroup('ag2_' . $testid); + $this->createFile($ag1, 0, 'file1_' . $testid, 10); + $this->createFile($ag1, 0, 'file2_' . $testid, 20); + + $jF = new JoinFilter(Factory::getFileFactory(), AccessGroup::ACCESS_GROUP_ID, File::ACCESS_GROUP_ID, null, JoinFilter::LEFT); + $joined = Factory::getAccessGroupFactory()->filter([Factory::JOIN => $jF]); + + $this->assertCount(3, $joined[Factory::getAccessGroupFactory()->getModelName()]); + $this->assertCount(3, $joined[Factory::getFileFactory()->getModelName()]); + $this->assertEquals($ag1->getId(), $joined[Factory::getAccessGroupFactory()->getModelName()][0]->getId()); + $this->assertEquals($ag1->getId(), $joined[Factory::getAccessGroupFactory()->getModelName()][1]->getId()); + $this->assertEquals($ag2->getId(), $joined[Factory::getAccessGroupFactory()->getModelName()][2]->getId()); + $this->assertNull($joined[Factory::getFileFactory()->getModelName()][2]->getId()); + } + + /** + * RIGHT JOIN File (main) ← AccessGroup (joined) on accessGroupId. + * ag2 has no files, so the third row has a File with null ID, + * confirming RIGHT JOIN preserves all rows from the joined table. + */ + public function testJoinRight(): void { + $testid = uniqid(); + $ag1 = $this->createAccessGroup('ag1_' . $testid); + $ag2 = $this->createAccessGroup('ag2_' . $testid); + $this->createFile($ag1, 0, 'file1_' . $testid, 10); + $this->createFile($ag1, 0, 'file2_' . $testid, 20); + + $jF = new JoinFilter(Factory::getAccessGroupFactory(), File::ACCESS_GROUP_ID, AccessGroup::ACCESS_GROUP_ID, null, JoinFilter::RIGHT); + $joined = Factory::getFileFactory()->filter([Factory::JOIN => $jF]); + + $this->assertCount(3, $joined[Factory::getFileFactory()->getModelName()]); + $this->assertCount(3, $joined[Factory::getAccessGroupFactory()->getModelName()]); + $this->assertEquals($ag1->getId(), $joined[Factory::getAccessGroupFactory()->getModelName()][0]->getId()); + $this->assertEquals($ag1->getId(), $joined[Factory::getAccessGroupFactory()->getModelName()][1]->getId()); + $this->assertEquals($ag2->getId(), $joined[Factory::getAccessGroupFactory()->getModelName()][2]->getId()); + $this->assertNull($joined[Factory::getFileFactory()->getModelName()][2]->getId()); + } +} diff --git a/ci/phpunit/dba/LikeFilterInsensitiveTest.php b/ci/phpunit/dba/LikeFilterInsensitiveTest.php new file mode 100644 index 000000000..95bf07e25 --- /dev/null +++ b/ci/phpunit/dba/LikeFilterInsensitiveTest.php @@ -0,0 +1,157 @@ +assertEquals( + 'LOWER(hashlistId) LIKE LOWER(?)', + $filter->getQueryString(Factory::getHashlistFactory()) + ); + } + + /** Verify query string with includeTable=true prefixes the table name. */ + public function testQueryStringWithTable(): void { + $filter = new LikeFilterInsensitive(Hashlist::HASHLIST_ID, '%test%'); + $this->assertEquals( + 'LOWER(Hashlist.hashlistId) LIKE LOWER(?)', + $filter->getQueryString(Factory::getHashlistFactory(), true) + ); + } + + /** Verify overrideFactory forces column resolution from the override, ignoring the passed factory. */ + public function testQueryStringOverrideFactory(): void { + $filter = new LikeFilterInsensitive(Hashlist::HASHLIST_ID, '%test%', Factory::getHashlistFactory()); + $this->assertEquals( + 'LOWER(hashlistId) LIKE LOWER(?)', + $filter->getQueryString(Factory::getUserFactory()) + ); + } + + /** Verify mapped table name (htp_User) is used when factory has isMapping() = True. */ + public function testQueryStringMappedTable(): void { + $filter = new LikeFilterInsensitive(User::USERNAME, '%admin%'); + $this->assertEquals( + 'LOWER(htp_User.username) LIKE LOWER(?)', + $filter->getQueryString(Factory::getUserFactory(), true) + ); + } + + /** Verify mapped column name (htp_end) is used when the column has dba_mapping = True. */ + public function testQueryStringMappedColumn(): void { + $filter = new LikeFilterInsensitive(HealthCheckAgent::END, '%5%'); + $this->assertEquals( + 'LOWER(HealthCheckAgent.htp_end) LIKE LOWER(?)', + $filter->getQueryString(Factory::getHealthCheckAgentFactory(), true) + ); + } + + /** Verify getValue returns the pattern passed to the constructor. */ + public function testGetValue(): void { + $filter = new LikeFilterInsensitive(Hashlist::HASHLIST_ID, '%search%'); + $this->assertEquals('%search%', $filter->getValue()); + } + + /** Verify getHasValue always returns true. */ + public function testGetHasValue(): void { + $filter = new LikeFilterInsensitive(Hashlist::HASHLIST_ID, '%test%'); + $this->assertTrue($filter->getHasValue()); + } + + /** Verify getKey returns the column key passed to the constructor. */ + public function testGetKey(): void { + $filter = new LikeFilterInsensitive(Hashlist::HASHLIST_NAME, '%test%'); + $this->assertEquals(Hashlist::HASHLIST_NAME, $filter->getKey()); + } + + /** + * Create 3 hashlists and filter on hashlistName with a matching prefix. + * Only the 2 hashlists whose name contains the prefix should be returned. + */ + public function testFilterLikeBasic(): void { + $testid = uniqid(); + $hashType = $this->createHashType(); + $ag = $this->createAccessGroup('ag_' . $testid); + $this->createHashlist($ag, $hashType); + $this->createHashlist($ag, $hashType); + $this->createHashlist($ag, $hashType); + + $filter = new LikeFilterInsensitive(Hashlist::HASHLIST_NAME, 'hashlist_%'); + $results = Factory::getHashlistFactory()->filter([Factory::FILTER => $filter]); + + $this->assertCount(3, $results[Factory::getHashlistFactory()->getModelName()]); + foreach ($results[Factory::getHashlistFactory()->getModelName()] as $hl) { + $this->assertInstanceOf(Hashlist::class, $hl); + } + } + + /** + * Create 2 hashlists with names that have the same content but different + * casing (e.g. "FindMe_xxx" and "findme_yyy") and filter with a case- + * insensitive LIKE — both should match. + * @throws Exception + */ + public function testFilterLikeCaseInsensitive(): void { + $testid = uniqid(); + $hashType = $this->createHashType(); + $ag = $this->createAccessGroup('ag_' . $testid); + + $this->createDatabaseObject( + Factory::getHashlistFactory(), + new Hashlist(null, 'TestCase_' . $testid, DHashlistFormat::PLAIN, $hashType->getId(), 1, ':', 0, 0, 0, 0, $ag->getId(), '', 0, 0, 0) + ); + $this->createDatabaseObject( + Factory::getHashlistFactory(), + new Hashlist(null, 'testcase_' . $testid, DHashlistFormat::PLAIN, $hashType->getId(), 1, ':', 0, 0, 0, 0, $ag->getId(), '', 0, 0, 0) + ); + + $filter = new LikeFilterInsensitive(Hashlist::HASHLIST_NAME, '%testcase_' . $testid . '%'); + $results = Factory::getHashlistFactory()->filter([Factory::FILTER => $filter]); + + $this->assertCount(2, $results[Factory::getHashlistFactory()->getModelName()]); + } + + /** + * Filter on hashlistName with a pattern that matches none of the existing + * hashlists — the result array should be empty. + */ + public function testFilterLikeNoMatch(): void { + $testid = uniqid(); + $hashType = $this->createHashType(); + $ag = $this->createAccessGroup('ag_' . $testid); + $this->createHashlist($ag, $hashType); + $this->createHashlist($ag, $hashType); + + $filter = new LikeFilterInsensitive(Hashlist::HASHLIST_NAME, '%nomatch_' . $testid . '%'); + $results = Factory::getHashlistFactory()->filter([Factory::FILTER => $filter]); + + $this->assertCount(0, $results[Factory::getHashlistFactory()->getModelName()]); + } + + /** + * Filter User::USERNAME using UserFactory (isMapping() = True). + * Verifies the mapped table name (htp_User) resolves correctly in an actual query. + */ + public function testFilterLikeMappedTable(): void { + $testid = uniqid(); + $user = $this->createUser('mapped_' . $testid); + + $filter = new LikeFilterInsensitive(User::USERNAME, '%mapped_' . $testid . '%'); + $results = Factory::getUserFactory()->filter([Factory::FILTER => $filter]); + + $this->assertCount(1, $results[Factory::getUserFactory()->getModelName()]); + $this->assertInstanceOf(User::class, $results[Factory::getUserFactory()->getModelName()][0]); + $this->assertEquals($user->getId(), $results[Factory::getUserFactory()->getModelName()][0]->getId()); + } +} diff --git a/ci/phpunit/dba/LikeFilterTest.php b/ci/phpunit/dba/LikeFilterTest.php new file mode 100644 index 000000000..8dc3cdc6f --- /dev/null +++ b/ci/phpunit/dba/LikeFilterTest.php @@ -0,0 +1,264 @@ +assertEquals( + 'hashlistId LIKE BINARY ?', + $filter->getQueryString(Factory::getHashlistFactory()) + ); + } + + /** Verify MySQL: `Table.column LIKE BINARY ?` when includeTable=true. */ + public function testQueryStringWithTable(): void { + putenv('HASHTOPOLIS_DB_TYPE=mysql'); + StartupConfig::getInstance(true); + $filter = new LikeFilter(Hashlist::HASHLIST_ID, '%test%'); + $this->assertEquals( + 'Hashlist.hashlistId LIKE BINARY ?', + $filter->getQueryString(Factory::getHashlistFactory(), true) + ); + } + + /** Verify MySQL: `column NOT LIKE BINARY ?` when setMatch(false). */ + public function testQueryStringNotMatch(): void { + putenv('HASHTOPOLIS_DB_TYPE=mysql'); + StartupConfig::getInstance(true); + $filter = new LikeFilter(Hashlist::HASHLIST_ID, '%test%'); + $filter->setMatch(false); + $this->assertEquals( + 'hashlistId NOT LIKE BINARY ?', + $filter->getQueryString(Factory::getHashlistFactory()) + ); + } + + /** Verify MySQL: `Table.column NOT LIKE BINARY ?` when includeTable=true and setMatch(false). */ + public function testQueryStringNotMatchWithTable(): void { + putenv('HASHTOPOLIS_DB_TYPE=mysql'); + StartupConfig::getInstance(true); + $filter = new LikeFilter(Hashlist::HASHLIST_ID, '%test%'); + $filter->setMatch(false); + $this->assertEquals( + 'Hashlist.hashlistId NOT LIKE BINARY ?', + $filter->getQueryString(Factory::getHashlistFactory(), true) + ); + } + + /** Verify MySQL: overrideFactory forces column resolution from the override regardless of the passed factory. */ + public function testQueryStringOverrideFactory(): void { + putenv('HASHTOPOLIS_DB_TYPE=mysql'); + StartupConfig::getInstance(true); + $filter = new LikeFilter(Hashlist::HASHLIST_ID, '%test%', Factory::getHashlistFactory()); + $this->assertEquals( + 'hashlistId LIKE BINARY ?', + $filter->getQueryString(Factory::getUserFactory()) + ); + } + + /** Verify MySQL: mapped table name (htp_User) is used when factory has isMapping() = True. */ + public function testQueryStringMappedTable(): void { + putenv('HASHTOPOLIS_DB_TYPE=mysql'); + StartupConfig::getInstance(true); + $filter = new LikeFilter(User::USERNAME, '%admin%'); + $this->assertEquals( + 'htp_User.username LIKE BINARY ?', + $filter->getQueryString(Factory::getUserFactory(), true) + ); + } + + /** Verify MySQL: mapped column name (htp_end) is used when the column has dba_mapping = True. */ + public function testQueryStringMappedColumn(): void { + putenv('HASHTOPOLIS_DB_TYPE=mysql'); + StartupConfig::getInstance(true); + $filter = new LikeFilter(HealthCheckAgent::END, '%5%'); + $this->assertEquals( + 'HealthCheckAgent.htp_end LIKE BINARY ?', + $filter->getQueryString(Factory::getHealthCheckAgentFactory(), true) + ); + } + + /** Verify Postgres: `column LIKE ? COLLATE "C"` without table prefix. */ + public function testQueryStringPostgres(): void { + putenv('HASHTOPOLIS_DB_TYPE=postgres'); + StartupConfig::getInstance(true); + $filter = new LikeFilter(Hashlist::HASHLIST_ID, '%test%'); + $this->assertEquals( + 'hashlistId LIKE ? COLLATE "C"', + $filter->getQueryString(Factory::getHashlistFactory()) + ); + } + + /** Verify Postgres: `Table.column LIKE ? COLLATE "C"` with includeTable=true. */ + public function testQueryStringWithTablePostgres(): void { + putenv('HASHTOPOLIS_DB_TYPE=postgres'); + StartupConfig::getInstance(true); + $filter = new LikeFilter(Hashlist::HASHLIST_ID, '%test%'); + $this->assertEquals( + 'Hashlist.hashlistId LIKE ? COLLATE "C"', + $filter->getQueryString(Factory::getHashlistFactory(), true) + ); + } + + /** Verify Postgres: `column NOT LIKE ? COLLATE "C"` when setMatch(false). */ + public function testQueryStringNotMatchPostgres(): void { + putenv('HASHTOPOLIS_DB_TYPE=postgres'); + StartupConfig::getInstance(true); + $filter = new LikeFilter(Hashlist::HASHLIST_ID, '%test%'); + $filter->setMatch(false); + $this->assertEquals( + 'hashlistId NOT LIKE ? COLLATE "C"', + $filter->getQueryString(Factory::getHashlistFactory()) + ); + } + + /** Verify Postgres: `Table.column NOT LIKE ? COLLATE "C"` with includeTable=true and setMatch(false). */ + public function testQueryStringNotMatchWithTablePostgres(): void { + putenv('HASHTOPOLIS_DB_TYPE=postgres'); + StartupConfig::getInstance(true); + $filter = new LikeFilter(Hashlist::HASHLIST_ID, '%test%'); + $filter->setMatch(false); + $this->assertEquals( + 'Hashlist.hashlistId NOT LIKE ? COLLATE "C"', + $filter->getQueryString(Factory::getHashlistFactory(), true) + ); + } + + /** Verify Postgres: overrideFactory forces column resolution from the override regardless of the passed factory. */ + public function testQueryStringOverrideFactoryPostgres(): void { + putenv('HASHTOPOLIS_DB_TYPE=postgres'); + StartupConfig::getInstance(true); + $filter = new LikeFilter(Hashlist::HASHLIST_ID, '%test%', Factory::getHashlistFactory()); + $this->assertEquals( + 'hashlistId LIKE ? COLLATE "C"', + $filter->getQueryString(Factory::getUserFactory()) + ); + } + + /** Verify Postgres: mapped table name (htp_User) with LIKE ? COLLATE "C". */ + public function testQueryStringMappedTablePostgres(): void { + putenv('HASHTOPOLIS_DB_TYPE=postgres'); + StartupConfig::getInstance(true); + $filter = new LikeFilter(User::USERNAME, '%admin%'); + $this->assertEquals( + 'htp_User.username LIKE ? COLLATE "C"', + $filter->getQueryString(Factory::getUserFactory(), true) + ); + } + + /** Verify Postgres: mapped column name (htp_end) with LIKE ? COLLATE "C". */ + public function testQueryStringMappedColumnPostgres(): void { + putenv('HASHTOPOLIS_DB_TYPE=postgres'); + StartupConfig::getInstance(true); + $filter = new LikeFilter(HealthCheckAgent::END, '%5%'); + $this->assertEquals( + 'HealthCheckAgent.htp_end LIKE ? COLLATE "C"', + $filter->getQueryString(Factory::getHealthCheckAgentFactory(), true) + ); + } + + /** Verify getValue returns the pattern passed to the constructor. */ + public function testGetValue(): void { + $filter = new LikeFilter(Hashlist::HASHLIST_ID, '%search%'); + $this->assertEquals('%search%', $filter->getValue()); + } + + /** Verify getHasValue always returns true. */ + public function testGetHasValue(): void { + $filter = new LikeFilter(Hashlist::HASHLIST_ID, '%test%'); + $this->assertTrue($filter->getHasValue()); + } + + /** + * Create 3 hashlists and filter on hashlistName with a matching prefix. + * All 3 hashlists whose name contains the prefix should be returned. + */ + public function testFilterLikeBasic(): void { + $hashType = $this->createHashType(); + $ag = $this->createAccessGroup('ag_' . uniqid()); + $this->createHashlist($ag, $hashType); + $this->createHashlist($ag, $hashType); + $this->createHashlist($ag, $hashType); + + $filter = new LikeFilter(Hashlist::HASHLIST_NAME, 'hashlist_%'); + $results = Factory::getHashlistFactory()->filter([Factory::FILTER => $filter]); + + $this->assertCount(3, $results[Factory::getHashlistFactory()->getModelName()]); + foreach ($results[Factory::getHashlistFactory()->getModelName()] as $hl) { + $this->assertInstanceOf(Hashlist::class, $hl); + } + } + + /** + * Create 3 hashlists and use setMatch(false) to exclude those matching + * the pattern. Only the non-matching hashlists should be returned. + * @throws Exception + */ + public function testFilterLikeNotMatch(): void { + $testid = uniqid(); + $hashType = $this->createHashType(); + $ag = $this->createAccessGroup('ag_' . $testid); + $hl1 = $this->createDatabaseObject( + Factory::getHashlistFactory(), + new Hashlist(null, 'keep_' . $testid, DHashlistFormat::PLAIN, $hashType->getId(), 1, ':', 0, 0, 0, 0, $ag->getId(), '', 0, 0, 0) + ); + $hl2 = $this->createDatabaseObject( + Factory::getHashlistFactory(), + new Hashlist(null, 'exclude_' . $testid, DHashlistFormat::PLAIN, $hashType->getId(), 1, ':', 0, 0, 0, 0, $ag->getId(), '', 0, 0, 0) + ); + + $filter = new LikeFilter(Hashlist::HASHLIST_NAME, '%exclude_' . $testid . '%'); + $filter->setMatch(false); + $results = Factory::getHashlistFactory()->filter([Factory::FILTER => $filter]); + + $this->assertCount(1, $results[Factory::getHashlistFactory()->getModelName()]); + $this->assertEquals('keep_' . $testid, $results[Factory::getHashlistFactory()->getModelName()][0]->getHashlistName()); + } + + /** + * Filter on hashlistName with a pattern that matches none of the existing + * hashlists — the result array should be empty. + */ + public function testFilterLikeNoMatch(): void { + $testid = uniqid(); + $hashType = $this->createHashType(); + $ag = $this->createAccessGroup('ag_' . $testid); + $this->createHashlist($ag, $hashType); + $this->createHashlist($ag, $hashType); + + $filter = new LikeFilter(Hashlist::HASHLIST_NAME, '%nomatch_' . $testid . '%'); + $results = Factory::getHashlistFactory()->filter([Factory::FILTER => $filter]); + + $this->assertCount(0, $results[Factory::getHashlistFactory()->getModelName()]); + } + + /** + * Filter User::USERNAME using UserFactory (isMapping() = True). + * Verifies the mapped table name (htp_User) resolves correctly in an actual query. + */ + public function testFilterLikeMappedTable(): void { + $testid = uniqid(); + $user = $this->createUser('mapped_' . $testid); + + $filter = new LikeFilter(User::USERNAME, '%mapped_' . $testid . '%'); + $results = Factory::getUserFactory()->filter([Factory::FILTER => $filter]); + + $this->assertCount(1, $results[Factory::getUserFactory()->getModelName()]); + $this->assertInstanceOf(User::class, $results[Factory::getUserFactory()->getModelName()][0]); + $this->assertEquals($user->getId(), $results[Factory::getUserFactory()->getModelName()][0]->getId()); + } +} From 1b72e0e931a68d35029df3f08561662fb3c2fde7 Mon Sep 17 00:00:00 2001 From: s3inlc Date: Mon, 22 Jun 2026 12:04:11 +0200 Subject: [PATCH 660/691] fixed tests --- ci/phpunit/dba/JoinFilterTest.php | 14 +++++---- ci/phpunit/dba/LikeFilterInsensitiveTest.php | 14 ++++----- ci/phpunit/dba/LikeFilterTest.php | 31 ++++++++++---------- 3 files changed, 32 insertions(+), 27 deletions(-) diff --git a/ci/phpunit/dba/JoinFilterTest.php b/ci/phpunit/dba/JoinFilterTest.php index 5a10ff247..a02a9ff92 100644 --- a/ci/phpunit/dba/JoinFilterTest.php +++ b/ci/phpunit/dba/JoinFilterTest.php @@ -184,10 +184,11 @@ public function testJoinMappedTable(): void { $testid = uniqid(); $user = $this->createUser('user_' . $testid); $ag = $this->createAccessGroup('ag_' . $testid); - $this->createAccessGroupUser($user, $ag); + $agu = $this->createAccessGroupUser($user, $ag); $jF = new JoinFilter(Factory::getUserFactory(), AccessGroupUser::USER_ID, User::USER_ID); - $joined = Factory::getAccessGroupUserFactory()->filter([Factory::JOIN => $jF]); + $qF = new QueryFilter(AccessGroupUser::ACCESS_GROUP_ID, $ag->getId(), '='); + $joined = Factory::getAccessGroupUserFactory()->filter([Factory::FILTER => $qF, Factory::JOIN => $jF]); $this->assertCount(1, $joined[Factory::getAccessGroupUserFactory()->getModelName()]); $this->assertCount(1, $joined[Factory::getUserFactory()->getModelName()]); @@ -209,7 +210,8 @@ public function testJoinMultipleInner(): void { $jF1 = new JoinFilter(Factory::getUserFactory(), AccessGroupUser::USER_ID, User::USER_ID); $jF2 = new JoinFilter(Factory::getAccessGroupFactory(), AccessGroupUser::ACCESS_GROUP_ID, AccessGroup::ACCESS_GROUP_ID); - $joined = Factory::getAccessGroupUserFactory()->filter([Factory::JOIN => [$jF1, $jF2]]); + $qF = new QueryFilter(AccessGroupUser::ACCESS_GROUP_ID, $ag->getId(), '='); + $joined = Factory::getAccessGroupUserFactory()->filter([Factory::FILTER => $qF, Factory::JOIN => [$jF1, $jF2]]); $this->assertCount(1, $joined[Factory::getAccessGroupUserFactory()->getModelName()]); $this->assertCount(1, $joined[Factory::getUserFactory()->getModelName()]); @@ -232,7 +234,8 @@ public function testJoinLeft(): void { $this->createFile($ag1, 0, 'file2_' . $testid, 20); $jF = new JoinFilter(Factory::getFileFactory(), AccessGroup::ACCESS_GROUP_ID, File::ACCESS_GROUP_ID, null, JoinFilter::LEFT); - $joined = Factory::getAccessGroupFactory()->filter([Factory::JOIN => $jF]); + $qF = new LikeFilter(AccessGroup::GROUP_NAME, '%' . $testid . '%', Factory::getAccessGroupFactory()); + $joined = Factory::getAccessGroupFactory()->filter([Factory::FILTER => $qF, Factory::JOIN => $jF]); $this->assertCount(3, $joined[Factory::getAccessGroupFactory()->getModelName()]); $this->assertCount(3, $joined[Factory::getFileFactory()->getModelName()]); @@ -255,7 +258,8 @@ public function testJoinRight(): void { $this->createFile($ag1, 0, 'file2_' . $testid, 20); $jF = new JoinFilter(Factory::getAccessGroupFactory(), File::ACCESS_GROUP_ID, AccessGroup::ACCESS_GROUP_ID, null, JoinFilter::RIGHT); - $joined = Factory::getFileFactory()->filter([Factory::JOIN => $jF]); + $qF = new LikeFilter(AccessGroup::GROUP_NAME, '%' . $testid . '%', Factory::getAccessGroupFactory()); + $joined = Factory::getFileFactory()->filter([Factory::FILTER => $qF, Factory::JOIN => $jF]); $this->assertCount(3, $joined[Factory::getFileFactory()->getModelName()]); $this->assertCount(3, $joined[Factory::getAccessGroupFactory()->getModelName()]); diff --git a/ci/phpunit/dba/LikeFilterInsensitiveTest.php b/ci/phpunit/dba/LikeFilterInsensitiveTest.php index 95bf07e25..8488dcc6b 100644 --- a/ci/phpunit/dba/LikeFilterInsensitiveTest.php +++ b/ci/phpunit/dba/LikeFilterInsensitiveTest.php @@ -90,8 +90,8 @@ public function testFilterLikeBasic(): void { $filter = new LikeFilterInsensitive(Hashlist::HASHLIST_NAME, 'hashlist_%'); $results = Factory::getHashlistFactory()->filter([Factory::FILTER => $filter]); - $this->assertCount(3, $results[Factory::getHashlistFactory()->getModelName()]); - foreach ($results[Factory::getHashlistFactory()->getModelName()] as $hl) { + $this->assertCount(3, $results); + foreach ($results as $hl) { $this->assertInstanceOf(Hashlist::class, $hl); } } @@ -119,7 +119,7 @@ public function testFilterLikeCaseInsensitive(): void { $filter = new LikeFilterInsensitive(Hashlist::HASHLIST_NAME, '%testcase_' . $testid . '%'); $results = Factory::getHashlistFactory()->filter([Factory::FILTER => $filter]); - $this->assertCount(2, $results[Factory::getHashlistFactory()->getModelName()]); + $this->assertCount(2, $results); } /** @@ -136,7 +136,7 @@ public function testFilterLikeNoMatch(): void { $filter = new LikeFilterInsensitive(Hashlist::HASHLIST_NAME, '%nomatch_' . $testid . '%'); $results = Factory::getHashlistFactory()->filter([Factory::FILTER => $filter]); - $this->assertCount(0, $results[Factory::getHashlistFactory()->getModelName()]); + $this->assertCount(0, $results); } /** @@ -150,8 +150,8 @@ public function testFilterLikeMappedTable(): void { $filter = new LikeFilterInsensitive(User::USERNAME, '%mapped_' . $testid . '%'); $results = Factory::getUserFactory()->filter([Factory::FILTER => $filter]); - $this->assertCount(1, $results[Factory::getUserFactory()->getModelName()]); - $this->assertInstanceOf(User::class, $results[Factory::getUserFactory()->getModelName()][0]); - $this->assertEquals($user->getId(), $results[Factory::getUserFactory()->getModelName()][0]->getId()); + $this->assertCount(1, $results); + $this->assertInstanceOf(User::class, $results[0]); + $this->assertEquals($user->getId(), $results[0]->getId()); } } diff --git a/ci/phpunit/dba/LikeFilterTest.php b/ci/phpunit/dba/LikeFilterTest.php index 8dc3cdc6f..826eb22f3 100644 --- a/ci/phpunit/dba/LikeFilterTest.php +++ b/ci/phpunit/dba/LikeFilterTest.php @@ -196,9 +196,9 @@ public function testFilterLikeBasic(): void { $filter = new LikeFilter(Hashlist::HASHLIST_NAME, 'hashlist_%'); $results = Factory::getHashlistFactory()->filter([Factory::FILTER => $filter]); - - $this->assertCount(3, $results[Factory::getHashlistFactory()->getModelName()]); - foreach ($results[Factory::getHashlistFactory()->getModelName()] as $hl) { + + $this->assertCount(3, $results); + foreach ($results as $hl) { $this->assertInstanceOf(Hashlist::class, $hl); } } @@ -221,12 +221,13 @@ public function testFilterLikeNotMatch(): void { new Hashlist(null, 'exclude_' . $testid, DHashlistFormat::PLAIN, $hashType->getId(), 1, ':', 0, 0, 0, 0, $ag->getId(), '', 0, 0, 0) ); - $filter = new LikeFilter(Hashlist::HASHLIST_NAME, '%exclude_' . $testid . '%'); - $filter->setMatch(false); - $results = Factory::getHashlistFactory()->filter([Factory::FILTER => $filter]); - - $this->assertCount(1, $results[Factory::getHashlistFactory()->getModelName()]); - $this->assertEquals('keep_' . $testid, $results[Factory::getHashlistFactory()->getModelName()][0]->getHashlistName()); + $scope = new LikeFilter(Hashlist::HASHLIST_NAME, '%' . $testid . '%'); + $exclude = new LikeFilter(Hashlist::HASHLIST_NAME, '%exclude_' . $testid . '%'); + $exclude->setMatch(false); + $results = Factory::getHashlistFactory()->filter([Factory::FILTER => [$scope, $exclude]]); + + $this->assertCount(1, $results); + $this->assertEquals('keep_' . $testid, $results[0]->getHashlistName()); } /** @@ -242,8 +243,8 @@ public function testFilterLikeNoMatch(): void { $filter = new LikeFilter(Hashlist::HASHLIST_NAME, '%nomatch_' . $testid . '%'); $results = Factory::getHashlistFactory()->filter([Factory::FILTER => $filter]); - - $this->assertCount(0, $results[Factory::getHashlistFactory()->getModelName()]); + + $this->assertCount(0, $results); } /** @@ -256,9 +257,9 @@ public function testFilterLikeMappedTable(): void { $filter = new LikeFilter(User::USERNAME, '%mapped_' . $testid . '%'); $results = Factory::getUserFactory()->filter([Factory::FILTER => $filter]); - - $this->assertCount(1, $results[Factory::getUserFactory()->getModelName()]); - $this->assertInstanceOf(User::class, $results[Factory::getUserFactory()->getModelName()][0]); - $this->assertEquals($user->getId(), $results[Factory::getUserFactory()->getModelName()][0]->getId()); + + $this->assertCount(1, $results); + $this->assertInstanceOf(User::class, $results[0]); + $this->assertEquals($user->getId(), $results[0]->getId()); } } From 5283d04e55b7c86d1a97e758de257fca04d9f526 Mon Sep 17 00:00:00 2001 From: s3inlc Date: Mon, 22 Jun 2026 12:23:01 +0200 Subject: [PATCH 661/691] updated all phpdocs to document exceptions --- ci/phpunit/TestBase.php | 74 +++++++++++++++++-- ci/phpunit/dba/AbstractModelFactoryTest.php | 8 ++ ci/phpunit/dba/ComparisonFilterTest.php | 30 +++++++- ci/phpunit/dba/ConcatColumnTest.php | 5 ++ .../dba/ConcatLikeFilterInsensitiveTest.php | 12 +++ ci/phpunit/dba/ConcatOrderFilterTest.php | 10 +++ ci/phpunit/dba/ContainFilterTest.php | 29 ++++++++ ci/phpunit/dba/JoinFilterTest.php | 19 ++++- ci/phpunit/dba/LikeFilterInsensitiveTest.php | 7 ++ ci/phpunit/dba/LikeFilterTest.php | 18 +++-- 10 files changed, 198 insertions(+), 14 deletions(-) diff --git a/ci/phpunit/TestBase.php b/ci/phpunit/TestBase.php index 0baf738aa..4136ed5f5 100644 --- a/ci/phpunit/TestBase.php +++ b/ci/phpunit/TestBase.php @@ -25,6 +25,9 @@ use Hashtopolis\dba\models\TaskWrapper; use Hashtopolis\dba\models\User; use Hashtopolis\dba\models\UserFactory; +use Hashtopolis\inc\apiv2\error\HttpConflict; +use Hashtopolis\inc\apiv2\error\HttpError; +use Hashtopolis\inc\apiv2\error\InternalError; use Hashtopolis\inc\defines\DHealthCheckAgentStatus; use Hashtopolis\inc\defines\DHealthCheckMode; use Hashtopolis\inc\defines\DHealthCheckStatus; @@ -32,6 +35,7 @@ use Hashtopolis\inc\defines\DFileDownloadStatus; use Hashtopolis\inc\defines\DHashlistFormat; use Hashtopolis\inc\defines\DTaskTypes; +use Hashtopolis\inc\HTException; use Hashtopolis\inc\utils\UserUtils; use PHPUnit\Framework\TestCase; use Override; @@ -54,10 +58,13 @@ protected function setUp(): void { // Avoid test warnings $_SERVER['HTTP_HOST'] = $_SERVER['HTTP_HOST'] ?? 'localhost'; $_SERVER['SERVER_PORT'] = $_SERVER['SERVER_PORT'] ?? 80; - + \hashtopolis_clear_test_mocks(); } + /** + * @throws HTException + */ #[Override] protected function tearDown(): void { \hashtopolis_clear_test_mocks(); @@ -78,6 +85,9 @@ protected function tearDown(): void { parent::tearDown(); } + /** + * @throws Exception + */ protected function createChunk(Task $task, Agent $agent, int $state): Chunk { $chunk = $this->createDatabaseObject( Factory::getChunkFactory(), @@ -87,6 +97,9 @@ protected function createChunk(Task $task, Agent $agent, int $state): Chunk { return $chunk; } + /** + * @throws Exception + */ protected function createAccessGroup(string $prefix): AccessGroup { $group = $this->createDatabaseObject( Factory::getAccessGroupFactory(), @@ -96,6 +109,9 @@ protected function createAccessGroup(string $prefix): AccessGroup { return $group; } + /** + * @throws Exception + */ protected function createAccessGroupUser(User $user, AccessGroup $accessGroup): AccessGroupUser { $relation = $this->createDatabaseObject( Factory::getAccessGroupUserFactory(), @@ -105,6 +121,9 @@ protected function createAccessGroupUser(User $user, AccessGroup $accessGroup): return $relation; } + /** + * @throws Exception + */ protected function createRightGroup(): RightGroup { $group = $this->createDatabaseObject( Factory::getRightGroupFactory(), @@ -114,6 +133,12 @@ protected function createRightGroup(): RightGroup { return $group; } + /** + * @throws InternalError + * @throws HTException + * @throws HttpError + * @throws HttpConflict + */ protected function createUser(string $prefix): User { $username = $prefix . '_' . uniqid(); $user = UserUtils::createUser($username, $username . '@example.com', $this->createRightGroup()->getId(), $this->adminUser); @@ -121,6 +146,9 @@ protected function createUser(string $prefix): User { return $user; } + /** + * @throws Exception + */ protected function createHashType(): HashType { $hashType = $this->createDatabaseObject( Factory::getHashTypeFactory(), @@ -130,6 +158,9 @@ protected function createHashType(): HashType { return $hashType; } + /** + * @throws Exception + */ protected function createHashlist(AccessGroup $group, HashType $hashType, int $isSecret = 0): Hashlist { $hashlist = $this->createDatabaseObject( Factory::getHashlistFactory(), @@ -139,6 +170,9 @@ protected function createHashlist(AccessGroup $group, HashType $hashType, int $i return $hashlist; } + /** + * @throws Exception + */ protected function createTaskWrapper(AccessGroup $group, Hashlist $hashlist, int $taskType = DTaskTypes::NORMAL): TaskWrapper { $taskWrapper = $this->createDatabaseObject( Factory::getTaskWrapperFactory(), @@ -148,6 +182,9 @@ protected function createTaskWrapper(AccessGroup $group, Hashlist $hashlist, int return $taskWrapper; } + /** + * @throws Exception + */ protected function createCrackerBinaryType(): CrackerBinaryType { $crackerBinaryType = $this->createDatabaseObject( Factory::getCrackerBinaryTypeFactory(), @@ -157,6 +194,9 @@ protected function createCrackerBinaryType(): CrackerBinaryType { return $crackerBinaryType; } + /** + * @throws Exception + */ protected function createCrackerBinary(CrackerBinaryType $crackerBinaryType): CrackerBinary { $crackerBinary = $this->createDatabaseObject( Factory::getCrackerBinaryFactory(), @@ -166,6 +206,9 @@ protected function createCrackerBinary(CrackerBinaryType $crackerBinaryType): Cr return $crackerBinary; } + /** + * @throws Exception + */ protected function createTask(TaskWrapper $taskWrapper, CrackerBinary $crackerBinary, CrackerBinaryType $crackerBinaryType, ?int $usePreprocessor = null, string $preprocessorCommand = ''): Task { $task = $this->createDatabaseObject( Factory::getTaskFactory(), @@ -175,6 +218,9 @@ protected function createTask(TaskWrapper $taskWrapper, CrackerBinary $crackerBi return $task; } + /** + * @throws Exception + */ protected function createJwtApiKey(User $user, ?int $startValid = null, ?int $endValid = null, int $isRevoked = 0): JwtApiKey { $key = $this->createDatabaseObject( Factory::getJwtApiKeyFactory(), @@ -183,7 +229,10 @@ protected function createJwtApiKey(User $user, ?int $startValid = null, ?int $en $this->assertTrue($key instanceof JwtApiKey); return $key; } - + + /** + * @throws Exception + */ protected function createHealthCheck(CrackerBinary $crackerBinary, int $status = DHealthCheckStatus::PENDING, int $checkType = DHealthCheckType::BRUTE_FORCE, int $hashtypeId = DHealthCheckMode::MD5, int $expectedCracks = 0, string $attackCmd = ''): HealthCheck { $check = $this->createDatabaseObject( Factory::getHealthCheckFactory(), @@ -192,7 +241,10 @@ protected function createHealthCheck(CrackerBinary $crackerBinary, int $status = $this->assertTrue($check instanceof HealthCheck); return $check; } - + + /** + * @throws Exception + */ protected function createHealthCheckAgent(HealthCheck $healthCheck, Agent $agent, int $status = DHealthCheckAgentStatus::PENDING, int $cracked = 0, int $numGpus = 0, int $start = 0, int $end = 0, string $errors = ''): HealthCheckAgent { $agentCheck = $this->createDatabaseObject( Factory::getHealthCheckAgentFactory(), @@ -201,7 +253,10 @@ protected function createHealthCheckAgent(HealthCheck $healthCheck, Agent $agent $this->assertTrue($agentCheck instanceof HealthCheckAgent); return $agentCheck; } - + + /** + * @throws Exception + */ protected function createFile(AccessGroup $group, int $isSecret = 0, ?string $filename = null, int $size = 0, int $fileType = 0, int $lineCount = 0): File { $file = $this->createDatabaseObject( Factory::getFileFactory(), @@ -211,6 +266,9 @@ protected function createFile(AccessGroup $group, int $isSecret = 0, ?string $fi return $file; } + /** + * @throws Exception + */ protected function createFileTask(File $file, Task $task): FileTask { $fileTask = $this->createDatabaseObject( Factory::getFileTaskFactory(), @@ -219,7 +277,10 @@ protected function createFileTask(File $file, Task $task): FileTask { $this->assertTrue($fileTask instanceof FileTask); return $fileTask; } - + + /** + * @throws Exception + */ protected function createFileDownload(int $fileId, int $status = DFileDownloadStatus::PENDING): FileDownload { $fileDownload = $this->createDatabaseObject( Factory::getFileDownloadFactory(), @@ -229,6 +290,9 @@ protected function createFileDownload(int $fileId, int $status = DFileDownloadSt return $fileDownload; } + /** + * @throws Exception + */ protected function createAgent(string $prefix, int $isTrusted = 1): Agent { $suffix = uniqid(); $agent = $this->createDatabaseObject( diff --git a/ci/phpunit/dba/AbstractModelFactoryTest.php b/ci/phpunit/dba/AbstractModelFactoryTest.php index 8eb27a644..e1f57a51c 100644 --- a/ci/phpunit/dba/AbstractModelFactoryTest.php +++ b/ci/phpunit/dba/AbstractModelFactoryTest.php @@ -835,6 +835,7 @@ public function testFilterNoFilter(): void { * Test retrieving some matching entries of entries in the table with a normal filter. * * @return void + * @throws Exception */ public function testFilterNormalFilter(): void { $testid = uniqid(); @@ -856,6 +857,7 @@ public function testFilterNormalFilter(): void { * Test retrieving some matching entries of entries in the table with a normal filter with specific sorting. * * @return void + * @throws Exception */ public function testFilterNormalFilterWithOrderDesc(): void { $testid = uniqid(); @@ -876,6 +878,7 @@ public function testFilterNormalFilterWithOrderDesc(): void { * Test retrieving some matching entries of entries in the table with a normal filter but limit entries * * @return void + * @throws Exception */ public function testFilterNormalFilterWithLimit(): void { $testid = uniqid(); @@ -898,6 +901,7 @@ public function testFilterNormalFilterWithLimit(): void { * Test retrieving some matching entries of entries but only request one single. * * @return void + * @throws Exception */ public function testFilterNormalFilterSingle(): void { $testid = uniqid(); @@ -941,6 +945,7 @@ public function testFilterWithJoinsNoFilter(): void { * Test retrieving some matching entries of entries in the table with a normal filter. * * @return void + * @throws Exception */ public function testFilterWithJoinsNormalFilter(): void { $testid = uniqid(); @@ -974,6 +979,7 @@ public function testFilterWithJoinsNormalFilter(): void { * Test retrieving some matching entries of entries in the table with a normal filter with specific sorting. * * @return void + * @throws Exception */ public function testFilterWithJoinsNormalFilterWithOrderDesc(): void { $testid = uniqid(); @@ -1008,6 +1014,7 @@ public function testFilterWithJoinsNormalFilterWithOrderDesc(): void { * Test retrieving some matching entries of entries in the table with a normal filter but limit entries * * @return void + * @throws Exception */ public function testFilterWithJoinsNormalFilterWithLimit(): void { $testid = uniqid(); @@ -1188,6 +1195,7 @@ public function testColumnFilter(): void { /** * @return array + * @throws Exception */ private function setUpHealthCheck(): array { $agent = new Agent(null, '', '', 0, '', '', 0, 0, 0, '', '', 0, '', null, 0, ''); diff --git a/ci/phpunit/dba/ComparisonFilterTest.php b/ci/phpunit/dba/ComparisonFilterTest.php index 717143e00..c2aaadad6 100644 --- a/ci/phpunit/dba/ComparisonFilterTest.php +++ b/ci/phpunit/dba/ComparisonFilterTest.php @@ -11,11 +11,13 @@ require_once(dirname(__FILE__) . '/../TestBase.php'); final class ComparisonFilterTest extends TestBase { + /** Verify column-vs-column equality produces 'col1=col2'. */ public function testBasicEquality(): void { $filter = new ComparisonFilter(Hashlist::HASHLIST_ID, Hashlist::HASH_TYPE_ID, '='); $this->assertEquals('hashlistId=hashTypeId', $filter->getQueryString(Factory::getHashlistFactory())); } + /** Verify table prefix is included: 'Table.col1=Table.col2'. */ public function testWithTablePrefix(): void { $filter = new ComparisonFilter(Hashlist::HASHLIST_ID, Hashlist::HASH_TYPE_ID, '='); $this->assertEquals( @@ -24,6 +26,7 @@ public function testWithTablePrefix(): void { ); } + /** Verify mapped table name (htp_User) is used in both column references. */ public function testWithMappedTable(): void { $filter = new ComparisonFilter(User::USERNAME, User::EMAIL, '='); $this->assertEquals( @@ -32,6 +35,7 @@ public function testWithMappedTable(): void { ); } + /** Verify all operators (!=, <, >, <=, >=) produce the correct query string. */ public function testDifferentOperators(): void { $factory = Factory::getHashlistFactory(); $ops = ['!=', '<', '>', '<=', '>=']; @@ -40,19 +44,21 @@ public function testDifferentOperators(): void { $this->assertEquals( "hashlistId{$op}hashTypeId", $filter->getQueryString($factory), - "Operator {$op} should produce hashlistId{$op}hashTypeId" + "Operator $op should produce hashlistId{$op}hashTypeId" ); } } + /** Verify overrideFactory resolves columns from the override regardless of the passed factory. */ public function testOverrideFactory(): void { $filter = new ComparisonFilter(Hashlist::HASHLIST_ID, Hashlist::HASH_TYPE_ID, '=', Factory::getHashlistFactory()); $this->assertEquals( 'hashlistId=hashTypeId', - $filter->getQueryString(Factory::getUserFactory(), false) + $filter->getQueryString(Factory::getUserFactory()) ); } + /** Verify overrideFactory with table prefix uses the override's table name. */ public function testOverrideFactoryWithTable(): void { $filter = new ComparisonFilter(Hashlist::HASHLIST_ID, Hashlist::HASH_TYPE_ID, '=', Factory::getHashlistFactory()); $this->assertEquals( @@ -61,17 +67,22 @@ public function testOverrideFactoryWithTable(): void { ); } + /** Verify getValue returns null (comparison filters have no bound value). */ public function testGetValueReturnsNull(): void { $filter = new ComparisonFilter(Hashlist::HASHLIST_ID, Hashlist::HASH_TYPE_ID, '='); $this->assertNull($filter->getValue()); } + /** Verify getHasValue returns false (comparison filters have no bound value). */ public function testGetHasValueReturnsFalse(): void { $filter = new ComparisonFilter(Hashlist::HASHLIST_ID, Hashlist::HASH_TYPE_ID, '='); $this->assertFalse($filter->getHasValue()); } /** + * Create 3 hash types and filter where isSalted = isSlowHash. + * 2 out of 3 rows should match. + * * @throws Exception */ public function testFilterEquality(): void { @@ -91,6 +102,9 @@ public function testFilterEquality(): void { } /** + * Create 3 hash types and filter where isSalted != isSlowHash. + * Only 1 row (5 vs 10) should match. + * * @throws Exception */ public function testFilterNotEqual(): void { @@ -110,6 +124,9 @@ public function testFilterNotEqual(): void { } /** + * Create 3 hash types and filter where isSalted > isSlowHash. + * 2 rows (3>1, 10>0) should match. + * * @throws Exception */ public function testFilterGreaterThan(): void { @@ -129,6 +146,9 @@ public function testFilterGreaterThan(): void { } /** + * Create 3 hash types and filter where isSalted < isSlowHash. + * 2 rows (1<3, 0<10) should match. + * * @throws Exception */ public function testFilterLessThan(): void { @@ -148,6 +168,9 @@ public function testFilterLessThan(): void { } /** + * Create 2 hash types where isSalted != isSlowHash and filter with '='. + * No rows should match. + * * @throws Exception */ public function testFilterNoMatch(): void { @@ -163,6 +186,9 @@ public function testFilterNoMatch(): void { } /** + * Use columnFilter with ComparisonFilter (isSalted > isSlowHash). + * Only IDs of the 2 matching rows should be returned. + * * @throws Exception */ public function testFilterWithColumnFilter(): void { diff --git a/ci/phpunit/dba/ConcatColumnTest.php b/ci/phpunit/dba/ConcatColumnTest.php index 37b8be493..d4e06c092 100644 --- a/ci/phpunit/dba/ConcatColumnTest.php +++ b/ci/phpunit/dba/ConcatColumnTest.php @@ -9,27 +9,32 @@ require_once(dirname(__FILE__) . '/../TestBase.php'); final class ConcatColumnTest extends TestBase { + /** Verify getValue returns the column key string. */ public function testReturnsValue(): void { $col = new ConcatColumn(Hashlist::HASHLIST_ID, Factory::getHashlistFactory()); $this->assertEquals('hashlistId', $col->getValue()); } + /** Verify getFactory returns the factory passed to the constructor. */ public function testReturnsFactory(): void { $factory = Factory::getHashlistFactory(); $col = new ConcatColumn(Hashlist::HASHLIST_NAME, $factory); $this->assertSame($factory, $col->getFactory()); } + /** Verify getValue returns null when null is passed as the column key. */ public function testNullValue(): void { $col = new ConcatColumn(null, Factory::getHashlistFactory()); $this->assertNull($col->getValue()); } + /** Verify getValue returns the correct column key for a mapped-table factory (User). */ public function testUserColumn(): void { $col = new ConcatColumn(User::USERNAME, Factory::getUserFactory()); $this->assertEquals('username', $col->getValue()); } + /** Verify getFactory returns an AbstractModelFactory instance. */ public function testFactoryIsAbstractModelFactory(): void { $col = new ConcatColumn(Hashlist::HASH_TYPE_ID, Factory::getHashlistFactory()); $this->assertInstanceOf(AbstractModelFactory::class, $col->getFactory()); diff --git a/ci/phpunit/dba/ConcatLikeFilterInsensitiveTest.php b/ci/phpunit/dba/ConcatLikeFilterInsensitiveTest.php index a2d916e0d..2fcd7e56f 100644 --- a/ci/phpunit/dba/ConcatLikeFilterInsensitiveTest.php +++ b/ci/phpunit/dba/ConcatLikeFilterInsensitiveTest.php @@ -11,6 +11,7 @@ require_once(dirname(__FILE__) . '/../TestBase.php'); final class ConcatLikeFilterInsensitiveTest extends TestBase { + /** Verify single-column CONCAT produces 'LOWER(CONCAT(Table.col)) LIKE LOWER(?)'. */ public function testQueryStringSingleColumn(): void { $col = new ConcatColumn(Hashlist::HASHLIST_ID, Factory::getHashlistFactory()); $filter = new ConcatLikeFilterInsensitive([$col], '%test%'); @@ -20,6 +21,7 @@ public function testQueryStringSingleColumn(): void { ); } + /** Verify multiple columns produce 'LOWER(CONCAT(col1, col2)) LIKE LOWER(?)'. */ public function testQueryStringMultipleColumns(): void { $col1 = new ConcatColumn(Hashlist::HASHLIST_ID, Factory::getHashlistFactory()); $col2 = new ConcatColumn(Hashlist::HASHLIST_NAME, Factory::getHashlistFactory()); @@ -30,6 +32,7 @@ public function testQueryStringMultipleColumns(): void { ); } + /** Verify mapped table name (htp_User) appears in the CONCAT expression. */ public function testQueryStringMappedTable(): void { $col = new ConcatColumn(User::USERNAME, Factory::getUserFactory()); $filter = new ConcatLikeFilterInsensitive([$col], '%test%'); @@ -39,12 +42,14 @@ public function testQueryStringMappedTable(): void { ); } + /** Verify getValue returns the pattern passed to the constructor. */ public function testGetValue(): void { $col = new ConcatColumn(Hashlist::HASHLIST_ID, Factory::getHashlistFactory()); $filter = new ConcatLikeFilterInsensitive([$col], '%search%'); $this->assertEquals('%search%', $filter->getValue()); } + /** Verify getHasValue always returns true. */ public function testGetHasValue(): void { $col = new ConcatColumn(Hashlist::HASHLIST_ID, Factory::getHashlistFactory()); $filter = new ConcatLikeFilterInsensitive([$col], '%test%'); @@ -52,6 +57,10 @@ public function testGetHasValue(): void { } /** + * Create 3 hash types: "HelloWorld_*", "helloworld_*", "other_*". + * Filter with case-insensitive CONCAT LIKE for "%helloworld_*" — + * both "HelloWorld_*" and "helloworld_*" should match. + * * @throws Exception */ public function testFilterCaseInsensitive(): void { @@ -68,6 +77,9 @@ public function testFilterCaseInsensitive(): void { } /** + * Create a hash type and filter with a pattern that does not match — + * result should be empty. + * * @throws Exception */ public function testFilterCaseInsensitiveNoMatch(): void { diff --git a/ci/phpunit/dba/ConcatOrderFilterTest.php b/ci/phpunit/dba/ConcatOrderFilterTest.php index 3e5fbf623..7a146ef1f 100644 --- a/ci/phpunit/dba/ConcatOrderFilterTest.php +++ b/ci/phpunit/dba/ConcatOrderFilterTest.php @@ -11,6 +11,7 @@ require_once(dirname(__FILE__) . '/../TestBase.php'); final class ConcatOrderFilterTest extends TestBase { + /** Verify ASC ordering with a single column produces 'CONCAT(col) ASC'. */ public function testQueryStringSingleColumnAsc(): void { $col = new ConcatColumn(Hashlist::HASHLIST_ID, Factory::getHashlistFactory()); $order = new ConcatOrderFilter([$col], 'ASC'); @@ -20,6 +21,7 @@ public function testQueryStringSingleColumnAsc(): void { ); } + /** Verify DESC ordering with a single column produces 'CONCAT(col) DESC'. */ public function testQueryStringSingleColumnDesc(): void { $col = new ConcatColumn(Hashlist::HASHLIST_NAME, Factory::getHashlistFactory()); $order = new ConcatOrderFilter([$col], 'DESC'); @@ -29,6 +31,7 @@ public function testQueryStringSingleColumnDesc(): void { ); } + /** Verify multiple columns produce 'CONCAT(col1, col2) ASC'. */ public function testQueryStringMultipleColumns(): void { $col1 = new ConcatColumn(Hashlist::HASHLIST_ID, Factory::getHashlistFactory()); $col2 = new ConcatColumn(Hashlist::HASHLIST_NAME, Factory::getHashlistFactory()); @@ -39,6 +42,7 @@ public function testQueryStringMultipleColumns(): void { ); } + /** Verify column from a mapped-table factory returns 'CONCAT(col) ASC'. */ public function testQueryStringMappedColumn(): void { $col = new ConcatColumn(User::USERNAME, Factory::getUserFactory()); $order = new ConcatOrderFilter([$col], 'ASC'); @@ -49,6 +53,9 @@ public function testQueryStringMappedColumn(): void { } /** + * Create 3 hash types and order them ASC by isSalted. + * Verifies the correct sort order (1, 3, 5). + * * @throws Exception */ public function testOrderAsc(): void { @@ -69,6 +76,9 @@ public function testOrderAsc(): void { } /** + * Create 3 hash types and order them DESC by isSalted. + * Verifies the correct sort order (5, 3, 1). + * * @throws Exception */ public function testOrderDesc(): void { diff --git a/ci/phpunit/dba/ContainFilterTest.php b/ci/phpunit/dba/ContainFilterTest.php index ebd5800b2..4708de92a 100644 --- a/ci/phpunit/dba/ContainFilterTest.php +++ b/ci/phpunit/dba/ContainFilterTest.php @@ -12,6 +12,7 @@ require_once(dirname(__FILE__) . '/../TestBase.php'); final class ContainFilterTest extends TestBase { + /** Verify single-element array produces 'col IN (?)'. */ public function testQueryStringSingleValue(): void { $filter = new ContainFilter(Hashlist::HASHLIST_ID, [1]); $this->assertEquals( @@ -20,6 +21,7 @@ public function testQueryStringSingleValue(): void { ); } + /** Verify multi-element array produces 'col IN (?,?,?)'. */ public function testQueryStringMultipleValues(): void { $filter = new ContainFilter(Hashlist::HASHLIST_ID, [1, 2, 3]); $this->assertEquals( @@ -28,6 +30,7 @@ public function testQueryStringMultipleValues(): void { ); } + /** Verify table prefix is included when includeTable=true. */ public function testQueryStringWithTable(): void { $filter = new ContainFilter(Hashlist::HASHLIST_ID, [1]); $this->assertEquals( @@ -36,6 +39,7 @@ public function testQueryStringWithTable(): void { ); } + /** Verify NOT IN (?,?) with the notIn flag set to true. */ public function testQueryStringNotIn(): void { $filter = new ContainFilter(Hashlist::HASHLIST_ID, [1, 2], null, true); $this->assertEquals( @@ -44,6 +48,7 @@ public function testQueryStringNotIn(): void { ); } + /** Verify NOT IN with table prefix produces 'Table.col NOT IN (?,?)'. */ public function testQueryStringNotInWithTable(): void { $filter = new ContainFilter(Hashlist::HASHLIST_ID, [1, 2], null, true); $this->assertEquals( @@ -52,6 +57,7 @@ public function testQueryStringNotInWithTable(): void { ); } + /** Verify empty value array produces 'FALSE' (match nothing). */ public function testQueryStringEmptyValues(): void { $filter = new ContainFilter(Hashlist::HASHLIST_ID, []); $this->assertEquals( @@ -60,6 +66,7 @@ public function testQueryStringEmptyValues(): void { ); } + /** Verify empty value array with notIn=true produces 'TRUE' (match everything). */ public function testQueryStringEmptyValuesInverse(): void { $filter = new ContainFilter(Hashlist::HASHLIST_ID, [], null, true); $this->assertEquals( @@ -68,6 +75,7 @@ public function testQueryStringEmptyValuesInverse(): void { ); } + /** Verify mapped table name (htp_User) is used with IN. */ public function testQueryStringMappedTable(): void { $filter = new ContainFilter(User::USER_ID, [1]); $this->assertEquals( @@ -76,6 +84,7 @@ public function testQueryStringMappedTable(): void { ); } + /** Verify overrideFactory forces column resolution from the override regardless of the passed factory. */ public function testQueryStringOverrideFactory(): void { $filter = new ContainFilter(Hashlist::HASHLIST_ID, [1], Factory::getHashlistFactory()); $this->assertEquals( @@ -84,6 +93,7 @@ public function testQueryStringOverrideFactory(): void { ); } + /** Verify mapped column name (htp_end) is used when the column has dba_mapping=True. */ public function testQueryStringMappedColumn(): void { $filter = new ContainFilter(HealthCheckAgent::END, [1, 2]); $this->assertEquals( @@ -92,6 +102,7 @@ public function testQueryStringMappedColumn(): void { ); } + /** Verify mapped column name (htp_end) with table prefix produces 'Table.htp_end IN (?)'. */ public function testQueryStringMappedColumnWithTable(): void { $filter = new ContainFilter(HealthCheckAgent::END, [1]); $this->assertEquals( @@ -100,6 +111,7 @@ public function testQueryStringMappedColumnWithTable(): void { ); } + /** Verify NOT IN (?) with mapped column and notIn=true. */ public function testQueryStringMappedColumnNotIn(): void { $filter = new ContainFilter(HealthCheckAgent::END, [1], null, true); $this->assertEquals( @@ -108,17 +120,22 @@ public function testQueryStringMappedColumnNotIn(): void { ); } + /** Verify getValue returns the array passed to the constructor. */ public function testGetValue(): void { $filter = new ContainFilter(Hashlist::HASHLIST_ID, [1, 2, 3]); $this->assertEquals([1, 2, 3], $filter->getValue()); } + /** Verify getHasValue returns true for a non-empty array. */ public function testGetHasValue(): void { $filter = new ContainFilter(Hashlist::HASHLIST_ID, [1]); $this->assertTrue($filter->getHasValue()); } /** + * Create 4 hash types with isSalted 1, 5, 10, 20 and filter IN (1, 10). + * Only the 2 matching rows should be returned. + * * @throws Exception */ public function testFilterIn(): void { @@ -139,6 +156,9 @@ public function testFilterIn(): void { } /** + * Create 4 hash types with isSalted 1, 5, 10, 20 and filter NOT IN (1, 10). + * Only the 2 non-matching rows (5, 20) should be returned. + * * @throws Exception */ public function testFilterNotIn(): void { @@ -159,6 +179,9 @@ public function testFilterNotIn(): void { } /** + * Create a hash type and filter with IN ([]) — empty values produce + * 'FALSE', so the result should be empty. + * * @throws Exception */ public function testFilterEmptyValues(): void { @@ -173,6 +196,9 @@ public function testFilterEmptyValues(): void { } /** + * Create 2 hash types and filter with NOT IN ([]) — empty inverse + * produces 'TRUE', so all scoped rows should be returned. + * * @throws Exception */ public function testFilterEmptyValuesInverse(): void { @@ -188,6 +214,9 @@ public function testFilterEmptyValuesInverse(): void { } /** + * Use columnFilter with IN (1, 10) — only the 2 matching hash type IDs + * should be returned. + * * @throws Exception */ public function testFilterInWithColumnFilter(): void { diff --git a/ci/phpunit/dba/JoinFilterTest.php b/ci/phpunit/dba/JoinFilterTest.php index a02a9ff92..330aa19a0 100644 --- a/ci/phpunit/dba/JoinFilterTest.php +++ b/ci/phpunit/dba/JoinFilterTest.php @@ -2,6 +2,7 @@ namespace Hashtopolis\dba; +use Exception; use Hashtopolis\dba\models\AccessGroup; use Hashtopolis\dba\models\AccessGroupUser; use Hashtopolis\dba\models\File; @@ -84,6 +85,8 @@ public function testOtherTableNameMapped(): void { * INNER JOIN File with AccessGroup on accessGroupId. * Creates 3 files across 2 groups — all rows match, so both result * arrays contain 3 entries. + * + * @throws Exception */ public function testJoinInner(): void { $testid = uniqid(); @@ -110,6 +113,8 @@ public function testJoinInner(): void { /** * INNER JOIN combined with a QueryFilter on the joined table (AccessGroup). * Only files belonging to ag1 should be returned. + * + * @throws Exception */ public function testJoinWithFilter(): void { $testid = uniqid(); @@ -132,6 +137,8 @@ public function testJoinWithFilter(): void { /** * INNER JOIN combined with a filter and ORDER BY DESC on File::SIZE. * Files belonging to ag1 should be returned in descending size order. + * + * @throws Exception */ public function testJoinWithOrder(): void { $testid = uniqid(); @@ -156,6 +163,8 @@ public function testJoinWithOrder(): void { * INNER JOIN with the filter pushed directly into JoinFilter's * queryFilters parameter instead of via Factory::FILTER. * Same expected result as testJoinWithFilter. + * + * @throws Exception */ public function testJoinWithQueryFilters(): void { $testid = uniqid(); @@ -179,12 +188,14 @@ public function testJoinWithQueryFilters(): void { * INNER JOIN AccessGroupUser with User on userId. * UserFactory has isMapping() = True, so the join table is htp_User. * Verifies the mapped table name works correctly in a real query. + * + * @throws Exception */ public function testJoinMappedTable(): void { $testid = uniqid(); $user = $this->createUser('user_' . $testid); $ag = $this->createAccessGroup('ag_' . $testid); - $agu = $this->createAccessGroupUser($user, $ag); + $this->createAccessGroupUser($user, $ag); $jF = new JoinFilter(Factory::getUserFactory(), AccessGroupUser::USER_ID, User::USER_ID); $qF = new QueryFilter(AccessGroupUser::ACCESS_GROUP_ID, $ag->getId(), '='); @@ -201,6 +212,8 @@ public function testJoinMappedTable(): void { * Two simultaneous INNER JOINs: AccessGroupUser joined with User * (on userId) AND with AccessGroup (on accessGroupId). * Verifies multiple joins are applied correctly. + * + * @throws Exception */ public function testJoinMultipleInner(): void { $testid = uniqid(); @@ -225,6 +238,8 @@ public function testJoinMultipleInner(): void { * LEFT JOIN AccessGroup (main) → File (joined) on accessGroupId. * ag2 has no files, so the third row has a File with null ID, * confirming LEFT JOIN preserves all rows from the main table. + * + * @throws Exception */ public function testJoinLeft(): void { $testid = uniqid(); @@ -249,6 +264,8 @@ public function testJoinLeft(): void { * RIGHT JOIN File (main) ← AccessGroup (joined) on accessGroupId. * ag2 has no files, so the third row has a File with null ID, * confirming RIGHT JOIN preserves all rows from the joined table. + * + * @throws Exception */ public function testJoinRight(): void { $testid = uniqid(); diff --git a/ci/phpunit/dba/LikeFilterInsensitiveTest.php b/ci/phpunit/dba/LikeFilterInsensitiveTest.php index 8488dcc6b..60e678d5e 100644 --- a/ci/phpunit/dba/LikeFilterInsensitiveTest.php +++ b/ci/phpunit/dba/LikeFilterInsensitiveTest.php @@ -78,6 +78,8 @@ public function testGetKey(): void { /** * Create 3 hashlists and filter on hashlistName with a matching prefix. * Only the 2 hashlists whose name contains the prefix should be returned. + * + * @throws Exception */ public function testFilterLikeBasic(): void { $testid = uniqid(); @@ -100,6 +102,7 @@ public function testFilterLikeBasic(): void { * Create 2 hashlists with names that have the same content but different * casing (e.g. "FindMe_xxx" and "findme_yyy") and filter with a case- * insensitive LIKE — both should match. + * * @throws Exception */ public function testFilterLikeCaseInsensitive(): void { @@ -125,6 +128,8 @@ public function testFilterLikeCaseInsensitive(): void { /** * Filter on hashlistName with a pattern that matches none of the existing * hashlists — the result array should be empty. + * + * @throws Exception */ public function testFilterLikeNoMatch(): void { $testid = uniqid(); @@ -142,6 +147,8 @@ public function testFilterLikeNoMatch(): void { /** * Filter User::USERNAME using UserFactory (isMapping() = True). * Verifies the mapped table name (htp_User) resolves correctly in an actual query. + * + * @throws Exception */ public function testFilterLikeMappedTable(): void { $testid = uniqid(); diff --git a/ci/phpunit/dba/LikeFilterTest.php b/ci/phpunit/dba/LikeFilterTest.php index 826eb22f3..7425be675 100644 --- a/ci/phpunit/dba/LikeFilterTest.php +++ b/ci/phpunit/dba/LikeFilterTest.php @@ -186,6 +186,8 @@ public function testGetHasValue(): void { /** * Create 3 hashlists and filter on hashlistName with a matching prefix. * All 3 hashlists whose name contains the prefix should be returned. + * + * @throws Exception */ public function testFilterLikeBasic(): void { $hashType = $this->createHashType(); @@ -196,7 +198,7 @@ public function testFilterLikeBasic(): void { $filter = new LikeFilter(Hashlist::HASHLIST_NAME, 'hashlist_%'); $results = Factory::getHashlistFactory()->filter([Factory::FILTER => $filter]); - + $this->assertCount(3, $results); foreach ($results as $hl) { $this->assertInstanceOf(Hashlist::class, $hl); @@ -212,11 +214,11 @@ public function testFilterLikeNotMatch(): void { $testid = uniqid(); $hashType = $this->createHashType(); $ag = $this->createAccessGroup('ag_' . $testid); - $hl1 = $this->createDatabaseObject( + $this->createDatabaseObject( Factory::getHashlistFactory(), new Hashlist(null, 'keep_' . $testid, DHashlistFormat::PLAIN, $hashType->getId(), 1, ':', 0, 0, 0, 0, $ag->getId(), '', 0, 0, 0) ); - $hl2 = $this->createDatabaseObject( + $this->createDatabaseObject( Factory::getHashlistFactory(), new Hashlist(null, 'exclude_' . $testid, DHashlistFormat::PLAIN, $hashType->getId(), 1, ':', 0, 0, 0, 0, $ag->getId(), '', 0, 0, 0) ); @@ -225,7 +227,7 @@ public function testFilterLikeNotMatch(): void { $exclude = new LikeFilter(Hashlist::HASHLIST_NAME, '%exclude_' . $testid . '%'); $exclude->setMatch(false); $results = Factory::getHashlistFactory()->filter([Factory::FILTER => [$scope, $exclude]]); - + $this->assertCount(1, $results); $this->assertEquals('keep_' . $testid, $results[0]->getHashlistName()); } @@ -233,6 +235,8 @@ public function testFilterLikeNotMatch(): void { /** * Filter on hashlistName with a pattern that matches none of the existing * hashlists — the result array should be empty. + * + * @throws Exception */ public function testFilterLikeNoMatch(): void { $testid = uniqid(); @@ -243,13 +247,15 @@ public function testFilterLikeNoMatch(): void { $filter = new LikeFilter(Hashlist::HASHLIST_NAME, '%nomatch_' . $testid . '%'); $results = Factory::getHashlistFactory()->filter([Factory::FILTER => $filter]); - + $this->assertCount(0, $results); } /** * Filter User::USERNAME using UserFactory (isMapping() = True). * Verifies the mapped table name (htp_User) resolves correctly in an actual query. + * + * @throws Exception */ public function testFilterLikeMappedTable(): void { $testid = uniqid(); @@ -257,7 +263,7 @@ public function testFilterLikeMappedTable(): void { $filter = new LikeFilter(User::USERNAME, '%mapped_' . $testid . '%'); $results = Factory::getUserFactory()->filter([Factory::FILTER => $filter]); - + $this->assertCount(1, $results); $this->assertInstanceOf(User::class, $results[0]); $this->assertEquals($user->getId(), $results[0]->getId()); From 326e1b3adac445977657d043c0fc373e45c128a4 Mon Sep 17 00:00:00 2001 From: s3inlc Date: Mon, 22 Jun 2026 12:29:18 +0200 Subject: [PATCH 662/691] changed $testid to $testId to use camel case naming as usual --- ci/phpunit/dba/AbstractModelFactoryTest.php | 256 +++++++++--------- ci/phpunit/dba/AggregationTest.php | 35 ++- ci/phpunit/dba/ComparisonFilterTest.php | 58 ++-- .../dba/ConcatLikeFilterInsensitiveTest.php | 16 +- ci/phpunit/dba/ConcatOrderFilterTest.php | 20 +- ci/phpunit/dba/ContainFilterTest.php | 94 +++---- ci/phpunit/dba/JoinFilterTest.php | 96 +++---- ci/phpunit/dba/LikeFilterInsensitiveTest.php | 26 +- ci/phpunit/dba/LikeFilterTest.php | 26 +- 9 files changed, 313 insertions(+), 314 deletions(-) diff --git a/ci/phpunit/dba/AbstractModelFactoryTest.php b/ci/phpunit/dba/AbstractModelFactoryTest.php index e1f57a51c..1da6df8c5 100644 --- a/ci/phpunit/dba/AbstractModelFactoryTest.php +++ b/ci/phpunit/dba/AbstractModelFactoryTest.php @@ -447,12 +447,12 @@ public function testDecFailZero(): void { * @throws Exception */ public function testMassSaveSuccess(): void { - $testid = uniqid(); - $this->createDatabaseObject(Factory::getHashTypeFactory(), new HashType(null, 'hashtype1' . $testid, 1, 0)); - $this->createDatabaseObject(Factory::getHashTypeFactory(), new HashType(null, 'hashtype2' . $testid, 2, 0)); - $this->createDatabaseObject(Factory::getHashTypeFactory(), new HashType(null, 'hashtype3' . $testid, 3, 0)); + $testId = uniqid(); + $this->createDatabaseObject(Factory::getHashTypeFactory(), new HashType(null, 'hashtype1' . $testId, 1, 0)); + $this->createDatabaseObject(Factory::getHashTypeFactory(), new HashType(null, 'hashtype2' . $testId, 2, 0)); + $this->createDatabaseObject(Factory::getHashTypeFactory(), new HashType(null, 'hashtype3' . $testId, 3, 0)); - $qF = new LikeFilter(HashType::DESCRIPTION, "%" . $testid); + $qF = new LikeFilter(HashType::DESCRIPTION, "%" . $testId); $list = Factory::getHashTypeFactory()->filter([Factory::FILTER => $qF]); $this->assertEquals(3, count($list)); foreach ($list as $hashType) { @@ -467,13 +467,13 @@ public function testMassSaveSuccess(): void { * @throws Exception */ public function testMassSaveSuccessWithPKs(): void { - $testid = uniqid(); + $testId = uniqid(); $idOffset = random_int(123456, 999999); - $this->createDatabaseObject(Factory::getHashTypeFactory(), new HashType($idOffset + 0, 'hashtype1' . $testid, 1, 0)); - $this->createDatabaseObject(Factory::getHashTypeFactory(), new HashType($idOffset + 1, 'hashtype2' . $testid, 125, 0)); - $this->createDatabaseObject(Factory::getHashTypeFactory(), new HashType($idOffset + 2, 'hashtype3' . $testid, 72, 0)); + $this->createDatabaseObject(Factory::getHashTypeFactory(), new HashType($idOffset + 0, 'hashtype1' . $testId, 1, 0)); + $this->createDatabaseObject(Factory::getHashTypeFactory(), new HashType($idOffset + 1, 'hashtype2' . $testId, 125, 0)); + $this->createDatabaseObject(Factory::getHashTypeFactory(), new HashType($idOffset + 2, 'hashtype3' . $testId, 72, 0)); - $qF = new LikeFilter(HashType::DESCRIPTION, "%" . $testid); + $qF = new LikeFilter(HashType::DESCRIPTION, "%" . $testId); $list = Factory::getHashTypeFactory()->filter([Factory::FILTER => $qF, Factory::ORDER => new OrderFilter(HashType::HASH_TYPE_ID, "ASC")]); $this->assertEquals(3, count($list)); foreach ($list as $hashType) { @@ -502,12 +502,12 @@ public function testMassSaveFailEmpty(): void { * @throws Exception */ public function testMinMaxFilterSuccessMax(): void { - $testid = uniqid(); - $this->createDatabaseObject(Factory::getHashTypeFactory(), new HashType(null, 'hashtype1' . $testid, 1, 0)); - $this->createDatabaseObject(Factory::getHashTypeFactory(), new HashType(null, 'hashtype2' . $testid, 125, 0)); - $this->createDatabaseObject(Factory::getHashTypeFactory(), new HashType(null, 'hashtype3' . $testid, 72, 0)); + $testId = uniqid(); + $this->createDatabaseObject(Factory::getHashTypeFactory(), new HashType(null, 'hashtype1' . $testId, 1, 0)); + $this->createDatabaseObject(Factory::getHashTypeFactory(), new HashType(null, 'hashtype2' . $testId, 125, 0)); + $this->createDatabaseObject(Factory::getHashTypeFactory(), new HashType(null, 'hashtype3' . $testId, 72, 0)); - $qF = new LikeFilter(HashType::DESCRIPTION, "%" . $testid); + $qF = new LikeFilter(HashType::DESCRIPTION, "%" . $testId); $max_1 = Factory::getHashTypeFactory()->minMaxFilter([Factory::FILTER => $qF], HashType::IS_SALTED, "MAX"); $max_2 = Factory::getHashTypeFactory()->minMaxFilter([Factory::FILTER => $qF], HashType::IS_SLOW_HASH, "MAX"); @@ -522,12 +522,12 @@ public function testMinMaxFilterSuccessMax(): void { * @throws Exception */ public function testMinMaxFilterSuccessMin(): void { - $testid = uniqid(); - $this->createDatabaseObject(Factory::getHashTypeFactory(), new HashType(null, 'hashtype1' . $testid, 1, 0)); - $this->createDatabaseObject(Factory::getHashTypeFactory(), new HashType(null, 'hashtype2' . $testid, 125, 0)); - $this->createDatabaseObject(Factory::getHashTypeFactory(), new HashType(null, 'hashtype3' . $testid, 72, 0)); + $testId = uniqid(); + $this->createDatabaseObject(Factory::getHashTypeFactory(), new HashType(null, 'hashtype1' . $testId, 1, 0)); + $this->createDatabaseObject(Factory::getHashTypeFactory(), new HashType(null, 'hashtype2' . $testId, 125, 0)); + $this->createDatabaseObject(Factory::getHashTypeFactory(), new HashType(null, 'hashtype3' . $testId, 72, 0)); - $qF = new LikeFilter(HashType::DESCRIPTION, "%" . $testid); + $qF = new LikeFilter(HashType::DESCRIPTION, "%" . $testId); $min_1 = Factory::getHashTypeFactory()->minMaxFilter([Factory::FILTER => $qF], HashType::IS_SALTED, "MIN"); $min_2 = Factory::getHashTypeFactory()->minMaxFilter([Factory::FILTER => $qF], HashType::IS_SLOW_HASH, "MIN"); @@ -552,12 +552,12 @@ public function testMinMaxFilterSuccessMappedColumn(): void { * @throws Exception */ public function testMulticolAggregationFilterSuccess(): void { - $testid = uniqid(); - $this->createDatabaseObject(Factory::getHashTypeFactory(), new HashType(null, 'hashtype1' . $testid, 1, 0)); - $this->createDatabaseObject(Factory::getHashTypeFactory(), new HashType(null, 'hashtype2' . $testid, 125, 0)); - $this->createDatabaseObject(Factory::getHashTypeFactory(), new HashType(null, 'hashtype3' . $testid, 72, 0)); + $testId = uniqid(); + $this->createDatabaseObject(Factory::getHashTypeFactory(), new HashType(null, 'hashtype1' . $testId, 1, 0)); + $this->createDatabaseObject(Factory::getHashTypeFactory(), new HashType(null, 'hashtype2' . $testId, 125, 0)); + $this->createDatabaseObject(Factory::getHashTypeFactory(), new HashType(null, 'hashtype3' . $testId, 72, 0)); - $qF = new LikeFilter(HashType::DESCRIPTION, "%" . $testid); + $qF = new LikeFilter(HashType::DESCRIPTION, "%" . $testId); $aggregations = []; $aggregations[] = new Aggregation(HashType::IS_SALTED, "MAX"); $aggregations[] = new Aggregation(HashType::IS_SALTED, "MIN"); @@ -579,12 +579,12 @@ public function testMulticolAggregationFilterSuccess(): void { * @throws Exception */ public function testColumnFilterSuccess(): void { - $testid = uniqid(); - $this->createDatabaseObject(Factory::getHashTypeFactory(), new HashType(null, 'hashtype1' . $testid, 1, 0)); - $this->createDatabaseObject(Factory::getHashTypeFactory(), new HashType(null, 'hashtype2' . $testid, 125, 0)); - $this->createDatabaseObject(Factory::getHashTypeFactory(), new HashType(null, 'hashtype3' . $testid, 72, 0)); + $testId = uniqid(); + $this->createDatabaseObject(Factory::getHashTypeFactory(), new HashType(null, 'hashtype1' . $testId, 1, 0)); + $this->createDatabaseObject(Factory::getHashTypeFactory(), new HashType(null, 'hashtype2' . $testId, 125, 0)); + $this->createDatabaseObject(Factory::getHashTypeFactory(), new HashType(null, 'hashtype3' . $testId, 72, 0)); - $qF = new LikeFilter(HashType::DESCRIPTION, "%" . $testid); + $qF = new LikeFilter(HashType::DESCRIPTION, "%" . $testId); $column = Factory::getHashTypeFactory()->columnFilter([Factory::FILTER => $qF], HashType::IS_SALTED); $this->assertEquals([1, 125, 72], $column); } @@ -596,12 +596,12 @@ public function testColumnFilterSuccess(): void { * @throws Exception */ public function testColumnFilterSuccessOrdered(): void { - $testid = uniqid(); - $this->createDatabaseObject(Factory::getHashTypeFactory(), new HashType(null, 'hashtype1' . $testid, 1, 0)); - $this->createDatabaseObject(Factory::getHashTypeFactory(), new HashType(null, 'hashtype2' . $testid, 125, 0)); - $this->createDatabaseObject(Factory::getHashTypeFactory(), new HashType(null, 'hashtype3' . $testid, 72, 0)); + $testId = uniqid(); + $this->createDatabaseObject(Factory::getHashTypeFactory(), new HashType(null, 'hashtype1' . $testId, 1, 0)); + $this->createDatabaseObject(Factory::getHashTypeFactory(), new HashType(null, 'hashtype2' . $testId, 125, 0)); + $this->createDatabaseObject(Factory::getHashTypeFactory(), new HashType(null, 'hashtype3' . $testId, 72, 0)); - $qF = new LikeFilter(HashType::DESCRIPTION, "%" . $testid); + $qF = new LikeFilter(HashType::DESCRIPTION, "%" . $testId); $oF = new OrderFilter(HashType::IS_SALTED, "ASC"); $column = Factory::getHashTypeFactory()->columnFilter([Factory::FILTER => $qF, Factory::ORDER => $oF], HashType::IS_SALTED); $this->assertEquals([1, 72, 125], $column); @@ -618,12 +618,12 @@ public function testColumnFilterSuccessOrdered(): void { * @throws Exception */ public function testColumnFilterSuccessMultiple(): void { - $testid = uniqid(); - $this->createDatabaseObject(Factory::getHashTypeFactory(), new HashType(null, 'hashtype1' . $testid, 1, 0)); - $this->createDatabaseObject(Factory::getHashTypeFactory(), new HashType(null, 'hashtype2' . $testid, 125, 0)); - $this->createDatabaseObject(Factory::getHashTypeFactory(), new HashType(null, 'hashtype3' . $testid, 72, 1)); + $testId = uniqid(); + $this->createDatabaseObject(Factory::getHashTypeFactory(), new HashType(null, 'hashtype1' . $testId, 1, 0)); + $this->createDatabaseObject(Factory::getHashTypeFactory(), new HashType(null, 'hashtype2' . $testId, 125, 0)); + $this->createDatabaseObject(Factory::getHashTypeFactory(), new HashType(null, 'hashtype3' . $testId, 72, 1)); - $qF = new LikeFilter(HashType::DESCRIPTION, "%" . $testid); + $qF = new LikeFilter(HashType::DESCRIPTION, "%" . $testId); $columns = Factory::getHashTypeFactory()->columnFilter([Factory::FILTER => $qF], [HashType::IS_SALTED, HashType::IS_SLOW_HASH]); $this->assertEquals([[1, 0], [125, 0], [72, 1]], $columns); @@ -657,12 +657,12 @@ public function testColumnFilterSuccessMappedColumn(): void { * @throws Exception */ public function testSumFilter(): void { - $testid = uniqid(); - $this->createDatabaseObject(Factory::getHashTypeFactory(), new HashType(null, 'hashtype1' . $testid, 1, 0)); - $this->createDatabaseObject(Factory::getHashTypeFactory(), new HashType(null, 'hashtype2' . $testid, 125, 0)); - $this->createDatabaseObject(Factory::getHashTypeFactory(), new HashType(null, 'hashtype3' . $testid, 72, 0)); + $testId = uniqid(); + $this->createDatabaseObject(Factory::getHashTypeFactory(), new HashType(null, 'hashtype1' . $testId, 1, 0)); + $this->createDatabaseObject(Factory::getHashTypeFactory(), new HashType(null, 'hashtype2' . $testId, 125, 0)); + $this->createDatabaseObject(Factory::getHashTypeFactory(), new HashType(null, 'hashtype3' . $testId, 72, 0)); - $qF = new LikeFilter(HashType::DESCRIPTION, "%" . $testid); + $qF = new LikeFilter(HashType::DESCRIPTION, "%" . $testId); $sum = Factory::getHashTypeFactory()->sumFilter([Factory::FILTER => $qF], HashType::IS_SALTED); $this->assertEquals(198, $sum); } @@ -769,12 +769,12 @@ public function testTimeseriesFilter(): void { * @throws Exception */ public function testCountFilter(): void { - $testid = uniqid(); - $this->createDatabaseObject(Factory::getHashTypeFactory(), new HashType(null, 'hashtype1' . $testid, 1, 0)); - $this->createDatabaseObject(Factory::getHashTypeFactory(), new HashType(null, 'hashtype2' . $testid, 125, 0)); - $this->createDatabaseObject(Factory::getHashTypeFactory(), new HashType(null, 'hashtype3' . $testid, 72, 0)); + $testId = uniqid(); + $this->createDatabaseObject(Factory::getHashTypeFactory(), new HashType(null, 'hashtype1' . $testId, 1, 0)); + $this->createDatabaseObject(Factory::getHashTypeFactory(), new HashType(null, 'hashtype2' . $testId, 125, 0)); + $this->createDatabaseObject(Factory::getHashTypeFactory(), new HashType(null, 'hashtype3' . $testId, 72, 0)); - $qF = new LikeFilter(HashType::DESCRIPTION, "%" . $testid); + $qF = new LikeFilter(HashType::DESCRIPTION, "%" . $testId); $sum = Factory::getHashTypeFactory()->countFilter([Factory::FILTER => $qF]); $this->assertEquals(3, $sum); } @@ -838,13 +838,13 @@ public function testFilterNoFilter(): void { * @throws Exception */ public function testFilterNormalFilter(): void { - $testid = uniqid(); - $this->createDatabaseObject(Factory::getHashTypeFactory(), new HashType(null, 'hashtype1' . $testid, 1, 0)); - $this->createDatabaseObject(Factory::getHashTypeFactory(), new HashType(null, 'hashtype2' . $testid, 125, 0)); - $this->createDatabaseObject(Factory::getHashTypeFactory(), new HashType(null, 'hashtype3' . $testid, 72, 0)); + $testId = uniqid(); + $this->createDatabaseObject(Factory::getHashTypeFactory(), new HashType(null, 'hashtype1' . $testId, 1, 0)); + $this->createDatabaseObject(Factory::getHashTypeFactory(), new HashType(null, 'hashtype2' . $testId, 125, 0)); + $this->createDatabaseObject(Factory::getHashTypeFactory(), new HashType(null, 'hashtype3' . $testId, 72, 0)); $qF1 = new QueryFilter(HashType::IS_SALTED, 50, ">"); - $qF2 = new LikeFilter(HashType::DESCRIPTION, "%" . $testid); + $qF2 = new LikeFilter(HashType::DESCRIPTION, "%" . $testId); $hashtypes = Factory::getHashTypeFactory()->filter([Factory::FILTER => [$qF1, $qF2]]); $this->assertCount(2, $hashtypes); foreach ($hashtypes as $hashtype) { @@ -860,13 +860,13 @@ public function testFilterNormalFilter(): void { * @throws Exception */ public function testFilterNormalFilterWithOrderDesc(): void { - $testid = uniqid(); - $this->createDatabaseObject(Factory::getHashTypeFactory(), new HashType(null, 'hashtype1' . $testid, 1, 0)); - $this->createDatabaseObject(Factory::getHashTypeFactory(), new HashType(null, 'hashtype2' . $testid, 125, 0)); - $this->createDatabaseObject(Factory::getHashTypeFactory(), new HashType(null, 'hashtype3' . $testid, 72, 0)); + $testId = uniqid(); + $this->createDatabaseObject(Factory::getHashTypeFactory(), new HashType(null, 'hashtype1' . $testId, 1, 0)); + $this->createDatabaseObject(Factory::getHashTypeFactory(), new HashType(null, 'hashtype2' . $testId, 125, 0)); + $this->createDatabaseObject(Factory::getHashTypeFactory(), new HashType(null, 'hashtype3' . $testId, 72, 0)); $qF1 = new QueryFilter(HashType::IS_SALTED, 50, ">"); - $qF2 = new LikeFilter(HashType::DESCRIPTION, "%" . $testid); + $qF2 = new LikeFilter(HashType::DESCRIPTION, "%" . $testId); $oF = new OrderFilter(HashType::IS_SALTED, "DESC"); $hashtypes = Factory::getHashTypeFactory()->filter([Factory::FILTER => [$qF1, $qF2], Factory::ORDER => $oF]); $this->assertCount(2, $hashtypes); @@ -881,11 +881,11 @@ public function testFilterNormalFilterWithOrderDesc(): void { * @throws Exception */ public function testFilterNormalFilterWithLimit(): void { - $testid = uniqid(); - $this->createDatabaseObject(Factory::getHashTypeFactory(), new HashType(null, 'hashtype1' . $testid, 1, 0)); - $this->createDatabaseObject(Factory::getHashTypeFactory(), new HashType(null, 'hashtype2' . $testid, 125, 0)); - $this->createDatabaseObject(Factory::getHashTypeFactory(), new HashType(null, 'hashtype3' . $testid, 72, 0)); - $this->createDatabaseObject(Factory::getHashTypeFactory(), new HashType(null, 'hashtype3' . $testid, 3, 0)); + $testId = uniqid(); + $this->createDatabaseObject(Factory::getHashTypeFactory(), new HashType(null, 'hashtype1' . $testId, 1, 0)); + $this->createDatabaseObject(Factory::getHashTypeFactory(), new HashType(null, 'hashtype2' . $testId, 125, 0)); + $this->createDatabaseObject(Factory::getHashTypeFactory(), new HashType(null, 'hashtype3' . $testId, 72, 0)); + $this->createDatabaseObject(Factory::getHashTypeFactory(), new HashType(null, 'hashtype3' . $testId, 3, 0)); $qF = new QueryFilter(HashType::IS_SLOW_HASH, 0, "="); $lF = new LimitFilter(2); @@ -904,18 +904,18 @@ public function testFilterNormalFilterWithLimit(): void { * @throws Exception */ public function testFilterNormalFilterSingle(): void { - $testid = uniqid(); - $this->createDatabaseObject(Factory::getHashTypeFactory(), new HashType(null, 'hashtype1' . $testid, 1, 0)); - $this->createDatabaseObject(Factory::getHashTypeFactory(), new HashType(null, 'hashtype2' . $testid, 125, 0)); - $this->createDatabaseObject(Factory::getHashTypeFactory(), new HashType(null, 'hashtype3' . $testid, 72, 0)); + $testId = uniqid(); + $this->createDatabaseObject(Factory::getHashTypeFactory(), new HashType(null, 'hashtype1' . $testId, 1, 0)); + $this->createDatabaseObject(Factory::getHashTypeFactory(), new HashType(null, 'hashtype2' . $testId, 125, 0)); + $this->createDatabaseObject(Factory::getHashTypeFactory(), new HashType(null, 'hashtype3' . $testId, 72, 0)); $qF1 = new QueryFilter(HashType::IS_SLOW_HASH, 0, "="); - $qF2 = new LikeFilter(HashType::DESCRIPTION, "%" . $testid); + $qF2 = new LikeFilter(HashType::DESCRIPTION, "%" . $testId); $oF = new OrderFilter(HashType::HASH_TYPE_ID, "ASC"); $hashtype = Factory::getHashTypeFactory()->filter([Factory::FILTER => [$qF1, $qF2], Factory::ORDER => $oF], true); $this->assertTrue($hashtype instanceof HashType); $this->assertEquals(1, $hashtype->getIsSalted()); - $this->assertEquals('hashtype1' . $testid, $hashtype->getDescription()); + $this->assertEquals('hashtype1' . $testId, $hashtype->getDescription()); } /** @@ -948,15 +948,15 @@ public function testFilterWithJoinsNoFilter(): void { * @throws Exception */ public function testFilterWithJoinsNormalFilter(): void { - $testid = uniqid(); + $testId = uniqid(); - $accessGroup1 = $this->createDatabaseObject(Factory::getAccessGroupFactory(), new AccessGroup(null, 'testgroup1' . $testid)); - $accessGroup2 = $this->createDatabaseObject(Factory::getAccessGroupFactory(), new AccessGroup(null, 'testgroup2' . $testid)); + $accessGroup1 = $this->createDatabaseObject(Factory::getAccessGroupFactory(), new AccessGroup(null, 'testgroup1' . $testId)); + $accessGroup2 = $this->createDatabaseObject(Factory::getAccessGroupFactory(), new AccessGroup(null, 'testgroup2' . $testId)); $this->assertTrue($accessGroup1 instanceof AccessGroup); - $this->createDatabaseObject(Factory::getFileFactory(), new File(null, 'file1' . $testid, 1, 0, 0, $accessGroup1->getId(), 1)); - $this->createDatabaseObject(Factory::getFileFactory(), new File(null, 'file2' . $testid, 1, 0, 0, $accessGroup2->getId(), 1)); - $this->createDatabaseObject(Factory::getFileFactory(), new File(null, 'file3' . $testid, 1, 0, 0, $accessGroup1->getId(), 1)); + $this->createDatabaseObject(Factory::getFileFactory(), new File(null, 'file1' . $testId, 1, 0, 0, $accessGroup1->getId(), 1)); + $this->createDatabaseObject(Factory::getFileFactory(), new File(null, 'file2' . $testId, 1, 0, 0, $accessGroup2->getId(), 1)); + $this->createDatabaseObject(Factory::getFileFactory(), new File(null, 'file3' . $testId, 1, 0, 0, $accessGroup1->getId(), 1)); $qF = new QueryFilter(AccessGroup::GROUP_NAME, $accessGroup1->getGroupName(), "=", Factory::getAccessGroupFactory()); $jF = new JoinFilter(Factory::getAccessGroupFactory(), File::ACCESS_GROUP_ID, AccessGroupUser::ACCESS_GROUP_ID); @@ -966,8 +966,8 @@ public function testFilterWithJoinsNormalFilter(): void { $this->assertTrue($joined[Factory::getFileFactory()->getModelName()][0] instanceof File); $this->assertTrue($joined[Factory::getFileFactory()->getModelName()][1] instanceof File); - $this->assertEquals('file1' . $testid, $joined[Factory::getFileFactory()->getModelName()][0]->getFilename()); - $this->assertEquals('file3' . $testid, $joined[Factory::getFileFactory()->getModelName()][1]->getFilename()); + $this->assertEquals('file1' . $testId, $joined[Factory::getFileFactory()->getModelName()][0]->getFilename()); + $this->assertEquals('file3' . $testId, $joined[Factory::getFileFactory()->getModelName()][1]->getFilename()); $this->assertTrue($joined[Factory::getAccessGroupFactory()->getModelName()][0] instanceof AccessGroup); $this->assertTrue($joined[Factory::getAccessGroupFactory()->getModelName()][1] instanceof AccessGroup); @@ -982,15 +982,15 @@ public function testFilterWithJoinsNormalFilter(): void { * @throws Exception */ public function testFilterWithJoinsNormalFilterWithOrderDesc(): void { - $testid = uniqid(); + $testId = uniqid(); - $accessGroup1 = $this->createDatabaseObject(Factory::getAccessGroupFactory(), new AccessGroup(null, 'testgroup1' . $testid)); - $accessGroup2 = $this->createDatabaseObject(Factory::getAccessGroupFactory(), new AccessGroup(null, 'testgroup2' . $testid)); + $accessGroup1 = $this->createDatabaseObject(Factory::getAccessGroupFactory(), new AccessGroup(null, 'testgroup1' . $testId)); + $accessGroup2 = $this->createDatabaseObject(Factory::getAccessGroupFactory(), new AccessGroup(null, 'testgroup2' . $testId)); $this->assertTrue($accessGroup1 instanceof AccessGroup); - $this->createDatabaseObject(Factory::getFileFactory(), new File(null, 'file1' . $testid, 1, 0, 0, $accessGroup1->getId(), 1)); - $this->createDatabaseObject(Factory::getFileFactory(), new File(null, 'file2' . $testid, 2, 0, 0, $accessGroup2->getId(), 1)); - $this->createDatabaseObject(Factory::getFileFactory(), new File(null, 'file3' . $testid, 3, 0, 0, $accessGroup1->getId(), 1)); + $this->createDatabaseObject(Factory::getFileFactory(), new File(null, 'file1' . $testId, 1, 0, 0, $accessGroup1->getId(), 1)); + $this->createDatabaseObject(Factory::getFileFactory(), new File(null, 'file2' . $testId, 2, 0, 0, $accessGroup2->getId(), 1)); + $this->createDatabaseObject(Factory::getFileFactory(), new File(null, 'file3' . $testId, 3, 0, 0, $accessGroup1->getId(), 1)); $qF = new QueryFilter(AccessGroup::GROUP_NAME, $accessGroup1->getGroupName(), "=", Factory::getAccessGroupFactory()); $jF = new JoinFilter(Factory::getAccessGroupFactory(), File::ACCESS_GROUP_ID, AccessGroupUser::ACCESS_GROUP_ID); @@ -1001,8 +1001,8 @@ public function testFilterWithJoinsNormalFilterWithOrderDesc(): void { $this->assertTrue($joined[Factory::getFileFactory()->getModelName()][0] instanceof File); $this->assertTrue($joined[Factory::getFileFactory()->getModelName()][1] instanceof File); - $this->assertEquals('file3' . $testid, $joined[Factory::getFileFactory()->getModelName()][0]->getFilename()); - $this->assertEquals('file1' . $testid, $joined[Factory::getFileFactory()->getModelName()][1]->getFilename()); + $this->assertEquals('file3' . $testId, $joined[Factory::getFileFactory()->getModelName()][0]->getFilename()); + $this->assertEquals('file1' . $testId, $joined[Factory::getFileFactory()->getModelName()][1]->getFilename()); $this->assertTrue($joined[Factory::getAccessGroupFactory()->getModelName()][0] instanceof AccessGroup); $this->assertTrue($joined[Factory::getAccessGroupFactory()->getModelName()][1] instanceof AccessGroup); @@ -1017,16 +1017,16 @@ public function testFilterWithJoinsNormalFilterWithOrderDesc(): void { * @throws Exception */ public function testFilterWithJoinsNormalFilterWithLimit(): void { - $testid = uniqid(); + $testId = uniqid(); - $accessGroup1 = $this->createDatabaseObject(Factory::getAccessGroupFactory(), new AccessGroup(null, 'testgroup1' . $testid)); - $accessGroup2 = $this->createDatabaseObject(Factory::getAccessGroupFactory(), new AccessGroup(null, 'testgroup2' . $testid)); + $accessGroup1 = $this->createDatabaseObject(Factory::getAccessGroupFactory(), new AccessGroup(null, 'testgroup1' . $testId)); + $accessGroup2 = $this->createDatabaseObject(Factory::getAccessGroupFactory(), new AccessGroup(null, 'testgroup2' . $testId)); $this->assertTrue($accessGroup1 instanceof AccessGroup); - $this->createDatabaseObject(Factory::getFileFactory(), new File(null, 'file1' . $testid, 1, 0, 0, $accessGroup1->getId(), 1)); - $this->createDatabaseObject(Factory::getFileFactory(), new File(null, 'file2' . $testid, 2, 0, 0, $accessGroup2->getId(), 1)); - $this->createDatabaseObject(Factory::getFileFactory(), new File(null, 'file3' . $testid, 3, 0, 0, $accessGroup1->getId(), 1)); - $this->createDatabaseObject(Factory::getFileFactory(), new File(null, 'file4' . $testid, 4, 0, 0, $accessGroup1->getId(), 1)); + $this->createDatabaseObject(Factory::getFileFactory(), new File(null, 'file1' . $testId, 1, 0, 0, $accessGroup1->getId(), 1)); + $this->createDatabaseObject(Factory::getFileFactory(), new File(null, 'file2' . $testId, 2, 0, 0, $accessGroup2->getId(), 1)); + $this->createDatabaseObject(Factory::getFileFactory(), new File(null, 'file3' . $testId, 3, 0, 0, $accessGroup1->getId(), 1)); + $this->createDatabaseObject(Factory::getFileFactory(), new File(null, 'file4' . $testId, 4, 0, 0, $accessGroup1->getId(), 1)); $qF = new QueryFilter(AccessGroup::GROUP_NAME, $accessGroup1->getGroupName(), "=", Factory::getAccessGroupFactory()); $jF = new JoinFilter(Factory::getAccessGroupFactory(), File::ACCESS_GROUP_ID, AccessGroupUser::ACCESS_GROUP_ID); @@ -1037,8 +1037,8 @@ public function testFilterWithJoinsNormalFilterWithLimit(): void { $this->assertTrue($joined[Factory::getFileFactory()->getModelName()][0] instanceof File); $this->assertTrue($joined[Factory::getFileFactory()->getModelName()][1] instanceof File); - $this->assertEquals('file1' . $testid, $joined[Factory::getFileFactory()->getModelName()][0]->getFilename()); - $this->assertEquals('file3' . $testid, $joined[Factory::getFileFactory()->getModelName()][1]->getFilename()); + $this->assertEquals('file1' . $testId, $joined[Factory::getFileFactory()->getModelName()][0]->getFilename()); + $this->assertEquals('file3' . $testId, $joined[Factory::getFileFactory()->getModelName()][1]->getFilename()); $this->assertTrue($joined[Factory::getAccessGroupFactory()->getModelName()][0] instanceof AccessGroup); $this->assertTrue($joined[Factory::getAccessGroupFactory()->getModelName()][1] instanceof AccessGroup); @@ -1052,12 +1052,12 @@ public function testFilterWithJoinsNormalFilterWithLimit(): void { * @throws Exception */ public function testMassDeletionSuccess(): void { - $testid = uniqid(); - Factory::getHashTypeFactory()->save(new HashType(null, 'hashtype1' . $testid, 1, 0)); - Factory::getHashTypeFactory()->save(new HashType(null, 'hashtype2' . $testid, 125, 0)); - Factory::getHashTypeFactory()->save(new HashType(null, 'hashtype3' . $testid, 72, 0)); + $testId = uniqid(); + Factory::getHashTypeFactory()->save(new HashType(null, 'hashtype1' . $testId, 1, 0)); + Factory::getHashTypeFactory()->save(new HashType(null, 'hashtype2' . $testId, 125, 0)); + Factory::getHashTypeFactory()->save(new HashType(null, 'hashtype3' . $testId, 72, 0)); - $qF = new LikeFilter(HashType::DESCRIPTION, "%" . $testid); + $qF = new LikeFilter(HashType::DESCRIPTION, "%" . $testId); Factory::getHashTypeFactory()->massDeletion([Factory::FILTER => $qF]); $count = Factory::getHashTypeFactory()->countFilter([Factory::FILTER => $qF]); @@ -1070,10 +1070,10 @@ public function testMassDeletionSuccess(): void { * @throws Exception */ public function testMassSingleUpdate(): void { - $testid = uniqid(); - $hashtype1 = $this->createDatabaseObject(Factory::getHashTypeFactory(), new HashType(null, 'hashtype1' . $testid, 1, 0)); - $this->createDatabaseObject(Factory::getHashTypeFactory(), new HashType(null, 'hashtype2' . $testid, 125, 0)); - $hashtype3 = $this->createDatabaseObject(Factory::getHashTypeFactory(), new HashType(null, 'hashtype3' . $testid, 72, 0)); + $testId = uniqid(); + $hashtype1 = $this->createDatabaseObject(Factory::getHashTypeFactory(), new HashType(null, 'hashtype1' . $testId, 1, 0)); + $this->createDatabaseObject(Factory::getHashTypeFactory(), new HashType(null, 'hashtype2' . $testId, 125, 0)); + $hashtype3 = $this->createDatabaseObject(Factory::getHashTypeFactory(), new HashType(null, 'hashtype3' . $testId, 72, 0)); $updates = []; $updates[] = new MassUpdateSet($hashtype1->getId(), 5); @@ -1081,7 +1081,7 @@ public function testMassSingleUpdate(): void { Factory::getHashTypeFactory()->massSingleUpdate(HashType::HASH_TYPE_ID, HashType::IS_SALTED, $updates); - $qF = new LikeFilter(HashType::DESCRIPTION, "%" . $testid); + $qF = new LikeFilter(HashType::DESCRIPTION, "%" . $testId); $sum = Factory::getHashTypeFactory()->sumFilter([Factory::FILTER => $qF], HashType::IS_SALTED); $this->assertEquals(139, $sum); } @@ -1092,10 +1092,10 @@ public function testMassSingleUpdate(): void { * @throws Exception */ public function testMassSingleUpdateNoEffect(): void { - $testid = uniqid(); - $this->createDatabaseObject(Factory::getHashTypeFactory(), new HashType(null, 'hashtype1' . $testid, 1, 0)); - $this->createDatabaseObject(Factory::getHashTypeFactory(), new HashType(null, 'hashtype2' . $testid, 125, 0)); - $this->createDatabaseObject(Factory::getHashTypeFactory(), new HashType(null, 'hashtype3' . $testid, 72, 0)); + $testId = uniqid(); + $this->createDatabaseObject(Factory::getHashTypeFactory(), new HashType(null, 'hashtype1' . $testId, 1, 0)); + $this->createDatabaseObject(Factory::getHashTypeFactory(), new HashType(null, 'hashtype2' . $testId, 125, 0)); + $this->createDatabaseObject(Factory::getHashTypeFactory(), new HashType(null, 'hashtype3' . $testId, 72, 0)); $updates = []; $updates[] = new MassUpdateSet(999999, 5); @@ -1103,7 +1103,7 @@ public function testMassSingleUpdateNoEffect(): void { Factory::getHashTypeFactory()->massSingleUpdate(HashType::HASH_TYPE_ID, HashType::IS_SALTED, $updates); - $qF = new LikeFilter(HashType::DESCRIPTION, "%" . $testid); + $qF = new LikeFilter(HashType::DESCRIPTION, "%" . $testId); $sum = Factory::getHashTypeFactory()->sumFilter([Factory::FILTER => $qF], HashType::IS_SALTED); $this->assertEquals(198, $sum); } @@ -1114,13 +1114,13 @@ public function testMassSingleUpdateNoEffect(): void { * @throws Exception */ public function testMassUpdateSuccess(): void { - $testid = uniqid(); - $this->createDatabaseObject(Factory::getHashTypeFactory(), new HashType(null, 'hashtype1' . $testid, 1, 0)); - $this->createDatabaseObject(Factory::getHashTypeFactory(), new HashType(null, 'hashtype2' . $testid, 125, 0)); - $this->createDatabaseObject(Factory::getHashTypeFactory(), new HashType(null, 'hashtype3' . $testid, 72, 0)); + $testId = uniqid(); + $this->createDatabaseObject(Factory::getHashTypeFactory(), new HashType(null, 'hashtype1' . $testId, 1, 0)); + $this->createDatabaseObject(Factory::getHashTypeFactory(), new HashType(null, 'hashtype2' . $testId, 125, 0)); + $this->createDatabaseObject(Factory::getHashTypeFactory(), new HashType(null, 'hashtype3' . $testId, 72, 0)); $uS = new UpdateSet(HashType::IS_SALTED, 1); - $qF = new LikeFilter(HashType::DESCRIPTION, "%" . $testid); + $qF = new LikeFilter(HashType::DESCRIPTION, "%" . $testId); Factory::getHashTypeFactory()->massUpdate([Factory::UPDATE => $uS, Factory::FILTER => $qF]); $sum = Factory::getHashTypeFactory()->sumFilter([Factory::FILTER => $qF], HashType::IS_SALTED); @@ -1133,16 +1133,16 @@ public function testMassUpdateSuccess(): void { * @throws Exception */ public function testMassUpdateNoEffect(): void { - $testid = uniqid(); - $this->createDatabaseObject(Factory::getHashTypeFactory(), new HashType(null, 'hashtype1' . $testid, 1, 0)); - $this->createDatabaseObject(Factory::getHashTypeFactory(), new HashType(null, 'hashtype2' . $testid, 125, 0)); - $this->createDatabaseObject(Factory::getHashTypeFactory(), new HashType(null, 'hashtype3' . $testid, 72, 0)); + $testId = uniqid(); + $this->createDatabaseObject(Factory::getHashTypeFactory(), new HashType(null, 'hashtype1' . $testId, 1, 0)); + $this->createDatabaseObject(Factory::getHashTypeFactory(), new HashType(null, 'hashtype2' . $testId, 125, 0)); + $this->createDatabaseObject(Factory::getHashTypeFactory(), new HashType(null, 'hashtype3' . $testId, 72, 0)); $uS = new UpdateSet(HashType::IS_SALTED, 1); - $qF = new LikeFilter(HashType::DESCRIPTION, "%aaaa" . $testid); + $qF = new LikeFilter(HashType::DESCRIPTION, "%aaaa" . $testId); Factory::getHashTypeFactory()->massUpdate([Factory::UPDATE => $uS, Factory::FILTER => $qF]); - $qF = new LikeFilter(HashType::DESCRIPTION, "%" . $testid); + $qF = new LikeFilter(HashType::DESCRIPTION, "%" . $testId); $sum = Factory::getHashTypeFactory()->sumFilter([Factory::FILTER => $qF], HashType::IS_SALTED); $this->assertEquals(198, $sum); } @@ -1171,24 +1171,24 @@ public function testSimpleFilter(): void { */ public function testColumnFilter(): void { $isSalted = random_int(2, 100); - $testid = uniqid(); + $testId = uniqid(); - $hashlist_1 = $this->createDatabaseObject(Factory::getHashlistFactory(), new Hashlist(null, "hashlist 1" . $testid, DHashlistFormat::PLAIN, 0, 0, ':', 0, 0, 0, $isSalted, AccessUtils::getOrCreateDefaultAccessGroup()->getId(), "", 0, 0, 0)); - $this->createDatabaseObject(Factory::getHashlistFactory(), new Hashlist(null, "hashlist 2" . $testid, DHashlistFormat::PLAIN, 0, 0, ':', 0, 0, 0, 1, AccessUtils::getOrCreateDefaultAccessGroup()->getId(), "", 0, 0, 0)); - $hashlist_3 = $this->createDatabaseObject(Factory::getHashlistFactory(), new Hashlist(null, "hashlist 3" . $testid, DHashlistFormat::PLAIN, 0, 0, ':', 0, 0, 0, $isSalted, AccessUtils::getOrCreateDefaultAccessGroup()->getId(), "", 0, 0, 0)); + $hashlist_1 = $this->createDatabaseObject(Factory::getHashlistFactory(), new Hashlist(null, "hashlist 1" . $testId, DHashlistFormat::PLAIN, 0, 0, ':', 0, 0, 0, $isSalted, AccessUtils::getOrCreateDefaultAccessGroup()->getId(), "", 0, 0, 0)); + $this->createDatabaseObject(Factory::getHashlistFactory(), new Hashlist(null, "hashlist 2" . $testId, DHashlistFormat::PLAIN, 0, 0, ':', 0, 0, 0, 1, AccessUtils::getOrCreateDefaultAccessGroup()->getId(), "", 0, 0, 0)); + $hashlist_3 = $this->createDatabaseObject(Factory::getHashlistFactory(), new Hashlist(null, "hashlist 3" . $testId, DHashlistFormat::PLAIN, 0, 0, ':', 0, 0, 0, $isSalted, AccessUtils::getOrCreateDefaultAccessGroup()->getId(), "", 0, 0, 0)); $oF = new OrderFilter(Hashlist::HASHLIST_ID, "ASC"); // test column filter to retrieve some of their IDs $qF1 = new QueryFilter(Hashlist::IS_SALTED, $isSalted, "="); - $qF2 = new LikeFilter(Hashlist::HASHLIST_NAME, "%" . $testid); + $qF2 = new LikeFilter(Hashlist::HASHLIST_NAME, "%" . $testId); $ids = Factory::getHashlistFactory()->columnFilter([Factory::FILTER => [$qF1, $qF2], Factory::ORDER => $oF], Hashlist::HASHLIST_ID); // hashlist 1 and 3 should be returned $this->assertSame([$hashlist_1->getId(), $hashlist_3->getId()], $ids); $qF1 = new QueryFilter(Hashlist::CRACKED, 5000, ">"); - $qF2 = new LikeFilter(Hashlist::HASHLIST_NAME, "%" . $testid); + $qF2 = new LikeFilter(Hashlist::HASHLIST_NAME, "%" . $testId); $ids = Factory::getHashlistFactory()->columnFilter([Factory::FILTER => [$qF1, $qF2], Factory::ORDER => $oF], Hashlist::HASHLIST_ID); $this->assertSame([], $ids); } diff --git a/ci/phpunit/dba/AggregationTest.php b/ci/phpunit/dba/AggregationTest.php index 67bbcb6e2..f702ce71a 100644 --- a/ci/phpunit/dba/AggregationTest.php +++ b/ci/phpunit/dba/AggregationTest.php @@ -6,7 +6,6 @@ use Hashtopolis\dba\models\AccessGroup; use Hashtopolis\dba\models\Hashlist; use Hashtopolis\dba\models\HashType; -use Hashtopolis\dba\models\HealthCheckAgent; use Hashtopolis\dba\models\User; use Hashtopolis\TestBase; use RuntimeException; @@ -20,12 +19,12 @@ final class AggregationTest extends TestBase { * @throws Exception */ public function testAggregationSuccessAllFunctions(): void { - $testid = uniqid(); - $this->createDatabaseObject(Factory::getHashTypeFactory(), new HashType(null, 'hashtype1' . $testid, 1, 0)); - $this->createDatabaseObject(Factory::getHashTypeFactory(), new HashType(null, 'hashtype2' . $testid, 125, 0)); - $this->createDatabaseObject(Factory::getHashTypeFactory(), new HashType(null, 'hashtype3' . $testid, 72, 0)); + $testId = uniqid(); + $this->createDatabaseObject(Factory::getHashTypeFactory(), new HashType(null, 'hashtype1' . $testId, 1, 0)); + $this->createDatabaseObject(Factory::getHashTypeFactory(), new HashType(null, 'hashtype2' . $testId, 125, 0)); + $this->createDatabaseObject(Factory::getHashTypeFactory(), new HashType(null, 'hashtype3' . $testId, 72, 0)); - $qF = new LikeFilter(HashType::DESCRIPTION, "%" . $testid); + $qF = new LikeFilter(HashType::DESCRIPTION, "%" . $testId); $aggregations = []; $aggregations[] = new Aggregation(HashType::IS_SALTED, Aggregation::MAX); $aggregations[] = new Aggregation(HashType::IS_SALTED, Aggregation::MIN); @@ -48,12 +47,12 @@ public function testAggregationSuccessAllFunctions(): void { * @throws Exception */ public function testAggregationSuccessMixedColumns(): void { - $testid = uniqid(); - $this->createDatabaseObject(Factory::getHashTypeFactory(), new HashType(null, 'hashtype1' . $testid, 1, 0)); - $this->createDatabaseObject(Factory::getHashTypeFactory(), new HashType(null, 'hashtype2' . $testid, 0, 5)); - $this->createDatabaseObject(Factory::getHashTypeFactory(), new HashType(null, 'hashtype3' . $testid, 72, 9)); + $testId = uniqid(); + $this->createDatabaseObject(Factory::getHashTypeFactory(), new HashType(null, 'hashtype1' . $testId, 1, 0)); + $this->createDatabaseObject(Factory::getHashTypeFactory(), new HashType(null, 'hashtype2' . $testId, 0, 5)); + $this->createDatabaseObject(Factory::getHashTypeFactory(), new HashType(null, 'hashtype3' . $testId, 72, 9)); - $qF = new LikeFilter(HashType::DESCRIPTION, "%" . $testid); + $qF = new LikeFilter(HashType::DESCRIPTION, "%" . $testId); $aggregations = []; $aggregations[] = new Aggregation(HashType::IS_SALTED, Aggregation::MAX); $aggregations[] = new Aggregation(HashType::IS_SLOW_HASH, Aggregation::MIN); @@ -74,16 +73,16 @@ public function testAggregationSuccessMixedColumns(): void { * @throws Exception */ public function testAggregationSuccessWithJoin(): void { - $testid = uniqid(); - $hashtype1 = $this->createDatabaseObject(Factory::getHashTypeFactory(), new HashType(null, 'hashtype1' . $testid, 1, 10)); - $this->createDatabaseObject(Factory::getHashTypeFactory(), new HashType(null, 'hashtype2' . $testid, 0, 5)); - $this->createDatabaseObject(Factory::getHashTypeFactory(), new HashType(null, 'hashtype3' . $testid, 72, 9)); + $testId = uniqid(); + $hashtype1 = $this->createDatabaseObject(Factory::getHashTypeFactory(), new HashType(null, 'hashtype1' . $testId, 1, 10)); + $this->createDatabaseObject(Factory::getHashTypeFactory(), new HashType(null, 'hashtype2' . $testId, 0, 5)); + $this->createDatabaseObject(Factory::getHashTypeFactory(), new HashType(null, 'hashtype3' . $testId, 72, 9)); - $accessGroup = $this->createDatabaseObject(Factory::getAccessGroupFactory(), new AccessGroup(null, 'testgroup1' . $testid)); + $accessGroup = $this->createDatabaseObject(Factory::getAccessGroupFactory(), new AccessGroup(null, 'testgroup1' . $testId)); - $this->createDatabaseObject(Factory::getHashlistFactory(), new Hashlist(null, 'hashlist1' . $testid, 0, $hashtype1->getId(), 0, 0, 0, 0, 0, 0, $accessGroup->getId(), '', 0, 0, 0)); + $this->createDatabaseObject(Factory::getHashlistFactory(), new Hashlist(null, 'hashlist1' . $testId, 0, $hashtype1->getId(), 0, 0, 0, 0, 0, 0, $accessGroup->getId(), '', 0, 0, 0)); - $qF = new LikeFilter(HASHLIST::HASHLIST_NAME, "%" . $testid, Factory::getHashlistFactory()); + $qF = new LikeFilter(HASHLIST::HASHLIST_NAME, "%" . $testId, Factory::getHashlistFactory()); $jF = new JoinFilter(Factory::getHashlistFactory(), HashType::HASH_TYPE_ID, Hashlist::HASH_TYPE_ID); $aggregations = []; diff --git a/ci/phpunit/dba/ComparisonFilterTest.php b/ci/phpunit/dba/ComparisonFilterTest.php index c2aaadad6..eaaf5987b 100644 --- a/ci/phpunit/dba/ComparisonFilterTest.php +++ b/ci/phpunit/dba/ComparisonFilterTest.php @@ -86,12 +86,12 @@ public function testGetHasValueReturnsFalse(): void { * @throws Exception */ public function testFilterEquality(): void { - $testid = uniqid(); - $this->createDatabaseObject(Factory::getHashTypeFactory(), new HashType(null, 'ht1' . $testid, 5, 5)); - $this->createDatabaseObject(Factory::getHashTypeFactory(), new HashType(null, 'ht2' . $testid, 5, 10)); - $this->createDatabaseObject(Factory::getHashTypeFactory(), new HashType(null, 'ht3' . $testid, 0, 0)); + $testId = uniqid(); + $this->createDatabaseObject(Factory::getHashTypeFactory(), new HashType(null, 'ht1' . $testId, 5, 5)); + $this->createDatabaseObject(Factory::getHashTypeFactory(), new HashType(null, 'ht2' . $testId, 5, 10)); + $this->createDatabaseObject(Factory::getHashTypeFactory(), new HashType(null, 'ht3' . $testId, 0, 0)); - $lF = new LikeFilter(HashType::DESCRIPTION, '%' . $testid); + $lF = new LikeFilter(HashType::DESCRIPTION, '%' . $testId); $cF = new ComparisonFilter(HashType::IS_SALTED, HashType::IS_SLOW_HASH, '='); $result = Factory::getHashTypeFactory()->filter([Factory::FILTER => [$lF, $cF]]); @@ -108,12 +108,12 @@ public function testFilterEquality(): void { * @throws Exception */ public function testFilterNotEqual(): void { - $testid = uniqid(); - $this->createDatabaseObject(Factory::getHashTypeFactory(), new HashType(null, 'ht1' . $testid, 5, 5)); - $this->createDatabaseObject(Factory::getHashTypeFactory(), new HashType(null, 'ht2' . $testid, 5, 10)); - $this->createDatabaseObject(Factory::getHashTypeFactory(), new HashType(null, 'ht3' . $testid, 0, 0)); + $testId = uniqid(); + $this->createDatabaseObject(Factory::getHashTypeFactory(), new HashType(null, 'ht1' . $testId, 5, 5)); + $this->createDatabaseObject(Factory::getHashTypeFactory(), new HashType(null, 'ht2' . $testId, 5, 10)); + $this->createDatabaseObject(Factory::getHashTypeFactory(), new HashType(null, 'ht3' . $testId, 0, 0)); - $lF = new LikeFilter(HashType::DESCRIPTION, '%' . $testid); + $lF = new LikeFilter(HashType::DESCRIPTION, '%' . $testId); $cF = new ComparisonFilter(HashType::IS_SALTED, HashType::IS_SLOW_HASH, '!='); $result = Factory::getHashTypeFactory()->filter([Factory::FILTER => [$lF, $cF]]); @@ -130,12 +130,12 @@ public function testFilterNotEqual(): void { * @throws Exception */ public function testFilterGreaterThan(): void { - $testid = uniqid(); - $this->createDatabaseObject(Factory::getHashTypeFactory(), new HashType(null, 'ht1' . $testid, 3, 1)); - $this->createDatabaseObject(Factory::getHashTypeFactory(), new HashType(null, 'ht2' . $testid, 0, 5)); - $this->createDatabaseObject(Factory::getHashTypeFactory(), new HashType(null, 'ht3' . $testid, 10, 0)); + $testId = uniqid(); + $this->createDatabaseObject(Factory::getHashTypeFactory(), new HashType(null, 'ht1' . $testId, 3, 1)); + $this->createDatabaseObject(Factory::getHashTypeFactory(), new HashType(null, 'ht2' . $testId, 0, 5)); + $this->createDatabaseObject(Factory::getHashTypeFactory(), new HashType(null, 'ht3' . $testId, 10, 0)); - $lF = new LikeFilter(HashType::DESCRIPTION, '%' . $testid); + $lF = new LikeFilter(HashType::DESCRIPTION, '%' . $testId); $cF = new ComparisonFilter(HashType::IS_SALTED, HashType::IS_SLOW_HASH, '>'); $result = Factory::getHashTypeFactory()->filter([Factory::FILTER => [$lF, $cF]]); @@ -152,12 +152,12 @@ public function testFilterGreaterThan(): void { * @throws Exception */ public function testFilterLessThan(): void { - $testid = uniqid(); - $this->createDatabaseObject(Factory::getHashTypeFactory(), new HashType(null, 'ht1' . $testid, 1, 3)); - $this->createDatabaseObject(Factory::getHashTypeFactory(), new HashType(null, 'ht2' . $testid, 5, 0)); - $this->createDatabaseObject(Factory::getHashTypeFactory(), new HashType(null, 'ht3' . $testid, 0, 10)); + $testId = uniqid(); + $this->createDatabaseObject(Factory::getHashTypeFactory(), new HashType(null, 'ht1' . $testId, 1, 3)); + $this->createDatabaseObject(Factory::getHashTypeFactory(), new HashType(null, 'ht2' . $testId, 5, 0)); + $this->createDatabaseObject(Factory::getHashTypeFactory(), new HashType(null, 'ht3' . $testId, 0, 10)); - $lF = new LikeFilter(HashType::DESCRIPTION, '%' . $testid); + $lF = new LikeFilter(HashType::DESCRIPTION, '%' . $testId); $cF = new ComparisonFilter(HashType::IS_SALTED, HashType::IS_SLOW_HASH, '<'); $result = Factory::getHashTypeFactory()->filter([Factory::FILTER => [$lF, $cF]]); @@ -174,11 +174,11 @@ public function testFilterLessThan(): void { * @throws Exception */ public function testFilterNoMatch(): void { - $testid = uniqid(); - $this->createDatabaseObject(Factory::getHashTypeFactory(), new HashType(null, 'ht1' . $testid, 1, 3)); - $this->createDatabaseObject(Factory::getHashTypeFactory(), new HashType(null, 'ht2' . $testid, 5, 10)); + $testId = uniqid(); + $this->createDatabaseObject(Factory::getHashTypeFactory(), new HashType(null, 'ht1' . $testId, 1, 3)); + $this->createDatabaseObject(Factory::getHashTypeFactory(), new HashType(null, 'ht2' . $testId, 5, 10)); - $lF = new LikeFilter(HashType::DESCRIPTION, '%' . $testid); + $lF = new LikeFilter(HashType::DESCRIPTION, '%' . $testId); $cF = new ComparisonFilter(HashType::IS_SALTED, HashType::IS_SLOW_HASH, '='); $result = Factory::getHashTypeFactory()->filter([Factory::FILTER => [$lF, $cF]]); @@ -192,12 +192,12 @@ public function testFilterNoMatch(): void { * @throws Exception */ public function testFilterWithColumnFilter(): void { - $testid = uniqid(); - $ht1 = $this->createDatabaseObject(Factory::getHashTypeFactory(), new HashType(null, 'ht1' . $testid, 50, 0)); - $this->createDatabaseObject(Factory::getHashTypeFactory(), new HashType(null, 'ht2' . $testid, 0, 50)); - $ht3 = $this->createDatabaseObject(Factory::getHashTypeFactory(), new HashType(null, 'ht3' . $testid, 50, 0)); + $testId = uniqid(); + $ht1 = $this->createDatabaseObject(Factory::getHashTypeFactory(), new HashType(null, 'ht1' . $testId, 50, 0)); + $this->createDatabaseObject(Factory::getHashTypeFactory(), new HashType(null, 'ht2' . $testId, 0, 50)); + $ht3 = $this->createDatabaseObject(Factory::getHashTypeFactory(), new HashType(null, 'ht3' . $testId, 50, 0)); - $lF = new LikeFilter(HashType::DESCRIPTION, '%' . $testid); + $lF = new LikeFilter(HashType::DESCRIPTION, '%' . $testId); $cF = new ComparisonFilter(HashType::IS_SALTED, HashType::IS_SLOW_HASH, '>'); $ids = Factory::getHashTypeFactory()->columnFilter([Factory::FILTER => [$lF, $cF]], HashType::HASH_TYPE_ID); diff --git a/ci/phpunit/dba/ConcatLikeFilterInsensitiveTest.php b/ci/phpunit/dba/ConcatLikeFilterInsensitiveTest.php index 2fcd7e56f..9bed61ffc 100644 --- a/ci/phpunit/dba/ConcatLikeFilterInsensitiveTest.php +++ b/ci/phpunit/dba/ConcatLikeFilterInsensitiveTest.php @@ -64,13 +64,13 @@ public function testGetHasValue(): void { * @throws Exception */ public function testFilterCaseInsensitive(): void { - $testid = uniqid(); - $this->createDatabaseObject(Factory::getHashTypeFactory(), new HashType(null, 'HelloWorld' . $testid, 1, 0)); - $this->createDatabaseObject(Factory::getHashTypeFactory(), new HashType(null, 'helloworld' . $testid, 0, 0)); - $this->createDatabaseObject(Factory::getHashTypeFactory(), new HashType(null, 'other' . $testid, 0, 0)); + $testId = uniqid(); + $this->createDatabaseObject(Factory::getHashTypeFactory(), new HashType(null, 'HelloWorld' . $testId, 1, 0)); + $this->createDatabaseObject(Factory::getHashTypeFactory(), new HashType(null, 'helloworld' . $testId, 0, 0)); + $this->createDatabaseObject(Factory::getHashTypeFactory(), new HashType(null, 'other' . $testId, 0, 0)); $col = new ConcatColumn(HashType::DESCRIPTION, Factory::getHashTypeFactory()); - $filter = new ConcatLikeFilterInsensitive([$col], '%helloworld' . $testid); + $filter = new ConcatLikeFilterInsensitive([$col], '%helloworld' . $testId); $result = Factory::getHashTypeFactory()->filter([Factory::FILTER => $filter]); $this->assertCount(2, $result); @@ -83,11 +83,11 @@ public function testFilterCaseInsensitive(): void { * @throws Exception */ public function testFilterCaseInsensitiveNoMatch(): void { - $testid = uniqid(); - $this->createDatabaseObject(Factory::getHashTypeFactory(), new HashType(null, 'HelloWorld' . $testid, 1, 0)); + $testId = uniqid(); + $this->createDatabaseObject(Factory::getHashTypeFactory(), new HashType(null, 'HelloWorld' . $testId, 1, 0)); $col = new ConcatColumn(HashType::DESCRIPTION, Factory::getHashTypeFactory()); - $filter = new ConcatLikeFilterInsensitive([$col], '%nonexistent' . $testid); + $filter = new ConcatLikeFilterInsensitive([$col], '%nonexistent' . $testId); $result = Factory::getHashTypeFactory()->filter([Factory::FILTER => $filter]); $this->assertCount(0, $result); diff --git a/ci/phpunit/dba/ConcatOrderFilterTest.php b/ci/phpunit/dba/ConcatOrderFilterTest.php index 7a146ef1f..ed80cc244 100644 --- a/ci/phpunit/dba/ConcatOrderFilterTest.php +++ b/ci/phpunit/dba/ConcatOrderFilterTest.php @@ -59,12 +59,12 @@ public function testQueryStringMappedColumn(): void { * @throws Exception */ public function testOrderAsc(): void { - $testid = uniqid(); - $ht1 = $this->createDatabaseObject(Factory::getHashTypeFactory(), new HashType(null, 'a' . $testid, 1, 0)); - $ht2 = $this->createDatabaseObject(Factory::getHashTypeFactory(), new HashType(null, 'b' . $testid, 5, 0)); - $ht3 = $this->createDatabaseObject(Factory::getHashTypeFactory(), new HashType(null, 'c' . $testid, 3, 0)); + $testId = uniqid(); + $ht1 = $this->createDatabaseObject(Factory::getHashTypeFactory(), new HashType(null, 'a' . $testId, 1, 0)); + $ht2 = $this->createDatabaseObject(Factory::getHashTypeFactory(), new HashType(null, 'b' . $testId, 5, 0)); + $ht3 = $this->createDatabaseObject(Factory::getHashTypeFactory(), new HashType(null, 'c' . $testId, 3, 0)); - $lF = new LikeFilter(HashType::DESCRIPTION, '%' . $testid); + $lF = new LikeFilter(HashType::DESCRIPTION, '%' . $testId); $col = new ConcatColumn(HashType::IS_SALTED, Factory::getHashTypeFactory()); $oF = new ConcatOrderFilter([$col], 'ASC'); $result = Factory::getHashTypeFactory()->filter([Factory::FILTER => $lF, Factory::ORDER => $oF]); @@ -82,12 +82,12 @@ public function testOrderAsc(): void { * @throws Exception */ public function testOrderDesc(): void { - $testid = uniqid(); - $ht1 = $this->createDatabaseObject(Factory::getHashTypeFactory(), new HashType(null, 'a' . $testid, 1, 0)); - $ht2 = $this->createDatabaseObject(Factory::getHashTypeFactory(), new HashType(null, 'b' . $testid, 5, 0)); - $ht3 = $this->createDatabaseObject(Factory::getHashTypeFactory(), new HashType(null, 'c' . $testid, 3, 0)); + $testId = uniqid(); + $ht1 = $this->createDatabaseObject(Factory::getHashTypeFactory(), new HashType(null, 'a' . $testId, 1, 0)); + $ht2 = $this->createDatabaseObject(Factory::getHashTypeFactory(), new HashType(null, 'b' . $testId, 5, 0)); + $ht3 = $this->createDatabaseObject(Factory::getHashTypeFactory(), new HashType(null, 'c' . $testId, 3, 0)); - $lF = new LikeFilter(HashType::DESCRIPTION, '%' . $testid); + $lF = new LikeFilter(HashType::DESCRIPTION, '%' . $testId); $col = new ConcatColumn(HashType::IS_SALTED, Factory::getHashTypeFactory()); $oF = new ConcatOrderFilter([$col], 'DESC'); $result = Factory::getHashTypeFactory()->filter([Factory::FILTER => $lF, Factory::ORDER => $oF]); diff --git a/ci/phpunit/dba/ContainFilterTest.php b/ci/phpunit/dba/ContainFilterTest.php index 4708de92a..5c90c8d55 100644 --- a/ci/phpunit/dba/ContainFilterTest.php +++ b/ci/phpunit/dba/ContainFilterTest.php @@ -20,7 +20,7 @@ public function testQueryStringSingleValue(): void { $filter->getQueryString(Factory::getHashlistFactory()) ); } - + /** Verify multi-element array produces 'col IN (?,?,?)'. */ public function testQueryStringMultipleValues(): void { $filter = new ContainFilter(Hashlist::HASHLIST_ID, [1, 2, 3]); @@ -29,7 +29,7 @@ public function testQueryStringMultipleValues(): void { $filter->getQueryString(Factory::getHashlistFactory()) ); } - + /** Verify table prefix is included when includeTable=true. */ public function testQueryStringWithTable(): void { $filter = new ContainFilter(Hashlist::HASHLIST_ID, [1]); @@ -38,7 +38,7 @@ public function testQueryStringWithTable(): void { $filter->getQueryString(Factory::getHashlistFactory(), true) ); } - + /** Verify NOT IN (?,?) with the notIn flag set to true. */ public function testQueryStringNotIn(): void { $filter = new ContainFilter(Hashlist::HASHLIST_ID, [1, 2], null, true); @@ -47,7 +47,7 @@ public function testQueryStringNotIn(): void { $filter->getQueryString(Factory::getHashlistFactory()) ); } - + /** Verify NOT IN with table prefix produces 'Table.col NOT IN (?,?)'. */ public function testQueryStringNotInWithTable(): void { $filter = new ContainFilter(Hashlist::HASHLIST_ID, [1, 2], null, true); @@ -56,7 +56,7 @@ public function testQueryStringNotInWithTable(): void { $filter->getQueryString(Factory::getHashlistFactory(), true) ); } - + /** Verify empty value array produces 'FALSE' (match nothing). */ public function testQueryStringEmptyValues(): void { $filter = new ContainFilter(Hashlist::HASHLIST_ID, []); @@ -65,7 +65,7 @@ public function testQueryStringEmptyValues(): void { $filter->getQueryString(Factory::getHashlistFactory()) ); } - + /** Verify empty value array with notIn=true produces 'TRUE' (match everything). */ public function testQueryStringEmptyValuesInverse(): void { $filter = new ContainFilter(Hashlist::HASHLIST_ID, [], null, true); @@ -74,7 +74,7 @@ public function testQueryStringEmptyValuesInverse(): void { $filter->getQueryString(Factory::getHashlistFactory()) ); } - + /** Verify mapped table name (htp_User) is used with IN. */ public function testQueryStringMappedTable(): void { $filter = new ContainFilter(User::USER_ID, [1]); @@ -83,7 +83,7 @@ public function testQueryStringMappedTable(): void { $filter->getQueryString(Factory::getUserFactory(), true) ); } - + /** Verify overrideFactory forces column resolution from the override regardless of the passed factory. */ public function testQueryStringOverrideFactory(): void { $filter = new ContainFilter(Hashlist::HASHLIST_ID, [1], Factory::getHashlistFactory()); @@ -92,7 +92,7 @@ public function testQueryStringOverrideFactory(): void { $filter->getQueryString(Factory::getUserFactory()) ); } - + /** Verify mapped column name (htp_end) is used when the column has dba_mapping=True. */ public function testQueryStringMappedColumn(): void { $filter = new ContainFilter(HealthCheckAgent::END, [1, 2]); @@ -101,7 +101,7 @@ public function testQueryStringMappedColumn(): void { $filter->getQueryString(Factory::getHealthCheckAgentFactory()) ); } - + /** Verify mapped column name (htp_end) with table prefix produces 'Table.htp_end IN (?)'. */ public function testQueryStringMappedColumnWithTable(): void { $filter = new ContainFilter(HealthCheckAgent::END, [1]); @@ -110,7 +110,7 @@ public function testQueryStringMappedColumnWithTable(): void { $filter->getQueryString(Factory::getHealthCheckAgentFactory(), true) ); } - + /** Verify NOT IN (?) with mapped column and notIn=true. */ public function testQueryStringMappedColumnNotIn(): void { $filter = new ContainFilter(HealthCheckAgent::END, [1], null, true); @@ -119,13 +119,13 @@ public function testQueryStringMappedColumnNotIn(): void { $filter->getQueryString(Factory::getHealthCheckAgentFactory()) ); } - + /** Verify getValue returns the array passed to the constructor. */ public function testGetValue(): void { $filter = new ContainFilter(Hashlist::HASHLIST_ID, [1, 2, 3]); $this->assertEquals([1, 2, 3], $filter->getValue()); } - + /** Verify getHasValue returns true for a non-empty array. */ public function testGetHasValue(): void { $filter = new ContainFilter(Hashlist::HASHLIST_ID, [1]); @@ -139,16 +139,16 @@ public function testGetHasValue(): void { * @throws Exception */ public function testFilterIn(): void { - $testid = uniqid(); - $this->createDatabaseObject(Factory::getHashTypeFactory(), new HashType(null, 'ht1' . $testid, 1, 0)); - $this->createDatabaseObject(Factory::getHashTypeFactory(), new HashType(null, 'ht2' . $testid, 5, 0)); - $this->createDatabaseObject(Factory::getHashTypeFactory(), new HashType(null, 'ht3' . $testid, 10, 0)); - $this->createDatabaseObject(Factory::getHashTypeFactory(), new HashType(null, 'ht4' . $testid, 20, 0)); - - $lF = new LikeFilter(HashType::DESCRIPTION, '%' . $testid); + $testId = uniqid(); + $this->createDatabaseObject(Factory::getHashTypeFactory(), new HashType(null, 'ht1' . $testId, 1, 0)); + $this->createDatabaseObject(Factory::getHashTypeFactory(), new HashType(null, 'ht2' . $testId, 5, 0)); + $this->createDatabaseObject(Factory::getHashTypeFactory(), new HashType(null, 'ht3' . $testId, 10, 0)); + $this->createDatabaseObject(Factory::getHashTypeFactory(), new HashType(null, 'ht4' . $testId, 20, 0)); + + $lF = new LikeFilter(HashType::DESCRIPTION, '%' . $testId); $cF = new ContainFilter(HashType::IS_SALTED, [1, 10]); $result = Factory::getHashTypeFactory()->filter([Factory::FILTER => [$lF, $cF]]); - + $this->assertCount(2, $result); foreach ($result as $ht) { $this->assertContains($ht->getIsSalted(), [1, 10]); @@ -162,16 +162,16 @@ public function testFilterIn(): void { * @throws Exception */ public function testFilterNotIn(): void { - $testid = uniqid(); - $this->createDatabaseObject(Factory::getHashTypeFactory(), new HashType(null, 'ht1' . $testid, 1, 0)); - $this->createDatabaseObject(Factory::getHashTypeFactory(), new HashType(null, 'ht2' . $testid, 5, 0)); - $this->createDatabaseObject(Factory::getHashTypeFactory(), new HashType(null, 'ht3' . $testid, 10, 0)); - $this->createDatabaseObject(Factory::getHashTypeFactory(), new HashType(null, 'ht4' . $testid, 20, 0)); - - $lF = new LikeFilter(HashType::DESCRIPTION, '%' . $testid); + $testId = uniqid(); + $this->createDatabaseObject(Factory::getHashTypeFactory(), new HashType(null, 'ht1' . $testId, 1, 0)); + $this->createDatabaseObject(Factory::getHashTypeFactory(), new HashType(null, 'ht2' . $testId, 5, 0)); + $this->createDatabaseObject(Factory::getHashTypeFactory(), new HashType(null, 'ht3' . $testId, 10, 0)); + $this->createDatabaseObject(Factory::getHashTypeFactory(), new HashType(null, 'ht4' . $testId, 20, 0)); + + $lF = new LikeFilter(HashType::DESCRIPTION, '%' . $testId); $cF = new ContainFilter(HashType::IS_SALTED, [1, 10], null, true); $result = Factory::getHashTypeFactory()->filter([Factory::FILTER => [$lF, $cF]]); - + $this->assertCount(2, $result); foreach ($result as $ht) { $this->assertContains($ht->getIsSalted(), [5, 20]); @@ -185,13 +185,13 @@ public function testFilterNotIn(): void { * @throws Exception */ public function testFilterEmptyValues(): void { - $testid = uniqid(); - $this->createDatabaseObject(Factory::getHashTypeFactory(), new HashType(null, 'ht1' . $testid, 1, 0)); - - $lF = new LikeFilter(HashType::DESCRIPTION, '%' . $testid); + $testId = uniqid(); + $this->createDatabaseObject(Factory::getHashTypeFactory(), new HashType(null, 'ht1' . $testId, 1, 0)); + + $lF = new LikeFilter(HashType::DESCRIPTION, '%' . $testId); $cF = new ContainFilter(HashType::IS_SALTED, []); $result = Factory::getHashTypeFactory()->filter([Factory::FILTER => [$lF, $cF]]); - + $this->assertCount(0, $result); } @@ -202,14 +202,14 @@ public function testFilterEmptyValues(): void { * @throws Exception */ public function testFilterEmptyValuesInverse(): void { - $testid = uniqid(); - $this->createDatabaseObject(Factory::getHashTypeFactory(), new HashType(null, 'ht1' . $testid, 1, 0)); - $this->createDatabaseObject(Factory::getHashTypeFactory(), new HashType(null, 'ht2' . $testid, 5, 0)); - - $lF = new LikeFilter(HashType::DESCRIPTION, '%' . $testid); + $testId = uniqid(); + $this->createDatabaseObject(Factory::getHashTypeFactory(), new HashType(null, 'ht1' . $testId, 1, 0)); + $this->createDatabaseObject(Factory::getHashTypeFactory(), new HashType(null, 'ht2' . $testId, 5, 0)); + + $lF = new LikeFilter(HashType::DESCRIPTION, '%' . $testId); $cF = new ContainFilter(HashType::IS_SALTED, [], null, true); $result = Factory::getHashTypeFactory()->filter([Factory::FILTER => [$lF, $cF]]); - + $this->assertCount(2, $result); } @@ -220,15 +220,15 @@ public function testFilterEmptyValuesInverse(): void { * @throws Exception */ public function testFilterInWithColumnFilter(): void { - $testid = uniqid(); - $ht1 = $this->createDatabaseObject(Factory::getHashTypeFactory(), new HashType(null, 'ht1' . $testid, 1, 0)); - $this->createDatabaseObject(Factory::getHashTypeFactory(), new HashType(null, 'ht2' . $testid, 5, 0)); - $ht3 = $this->createDatabaseObject(Factory::getHashTypeFactory(), new HashType(null, 'ht3' . $testid, 10, 0)); - - $lF = new LikeFilter(HashType::DESCRIPTION, '%' . $testid); + $testId = uniqid(); + $ht1 = $this->createDatabaseObject(Factory::getHashTypeFactory(), new HashType(null, 'ht1' . $testId, 1, 0)); + $this->createDatabaseObject(Factory::getHashTypeFactory(), new HashType(null, 'ht2' . $testId, 5, 0)); + $ht3 = $this->createDatabaseObject(Factory::getHashTypeFactory(), new HashType(null, 'ht3' . $testId, 10, 0)); + + $lF = new LikeFilter(HashType::DESCRIPTION, '%' . $testId); $cF = new ContainFilter(HashType::IS_SALTED, [1, 10]); $ids = Factory::getHashTypeFactory()->columnFilter([Factory::FILTER => [$lF, $cF]], HashType::HASH_TYPE_ID); - + $this->assertCount(2, $ids); $this->assertEqualsCanonicalizing([$ht1->getId(), $ht3->getId()], $ids); } diff --git a/ci/phpunit/dba/JoinFilterTest.php b/ci/phpunit/dba/JoinFilterTest.php index 330aa19a0..6df3c158d 100644 --- a/ci/phpunit/dba/JoinFilterTest.php +++ b/ci/phpunit/dba/JoinFilterTest.php @@ -89,13 +89,13 @@ public function testOtherTableNameMapped(): void { * @throws Exception */ public function testJoinInner(): void { - $testid = uniqid(); - $ag1 = $this->createAccessGroup('ag1_' . $testid); - $ag2 = $this->createAccessGroup('ag2_' . $testid); + $testId = uniqid(); + $ag1 = $this->createAccessGroup('ag1_' . $testId); + $ag2 = $this->createAccessGroup('ag2_' . $testId); - $this->createFile($ag1, 0, 'file1_' . $testid, 10); - $this->createFile($ag2, 0, 'file2_' . $testid, 20); - $this->createFile($ag1, 0, 'file3_' . $testid, 30); + $this->createFile($ag1, 0, 'file1_' . $testId, 10); + $this->createFile($ag2, 0, 'file2_' . $testId, 20); + $this->createFile($ag1, 0, 'file3_' . $testId, 30); $jF = new JoinFilter(Factory::getAccessGroupFactory(), File::ACCESS_GROUP_ID, AccessGroup::ACCESS_GROUP_ID); $joined = Factory::getFileFactory()->filter([Factory::JOIN => $jF]); @@ -117,21 +117,21 @@ public function testJoinInner(): void { * @throws Exception */ public function testJoinWithFilter(): void { - $testid = uniqid(); - $ag1 = $this->createAccessGroup('ag1_' . $testid); - $ag2 = $this->createAccessGroup('ag2_' . $testid); + $testId = uniqid(); + $ag1 = $this->createAccessGroup('ag1_' . $testId); + $ag2 = $this->createAccessGroup('ag2_' . $testId); - $this->createFile($ag1, 0, 'file1_' . $testid, 10); - $this->createFile($ag2, 0, 'file2_' . $testid, 20); - $this->createFile($ag1, 0, 'file3_' . $testid, 30); + $this->createFile($ag1, 0, 'file1_' . $testId, 10); + $this->createFile($ag2, 0, 'file2_' . $testId, 20); + $this->createFile($ag1, 0, 'file3_' . $testId, 30); $qF = new QueryFilter(AccessGroup::GROUP_NAME, $ag1->getGroupName(), '=', Factory::getAccessGroupFactory()); $jF = new JoinFilter(Factory::getAccessGroupFactory(), File::ACCESS_GROUP_ID, AccessGroup::ACCESS_GROUP_ID); $joined = Factory::getFileFactory()->filter([Factory::FILTER => $qF, Factory::JOIN => $jF]); $this->assertCount(2, $joined[Factory::getFileFactory()->getModelName()]); - $this->assertEquals('file1_' . $testid, $joined[Factory::getFileFactory()->getModelName()][0]->getFilename()); - $this->assertEquals('file3_' . $testid, $joined[Factory::getFileFactory()->getModelName()][1]->getFilename()); + $this->assertEquals('file1_' . $testId, $joined[Factory::getFileFactory()->getModelName()][0]->getFilename()); + $this->assertEquals('file3_' . $testId, $joined[Factory::getFileFactory()->getModelName()][1]->getFilename()); } /** @@ -141,13 +141,13 @@ public function testJoinWithFilter(): void { * @throws Exception */ public function testJoinWithOrder(): void { - $testid = uniqid(); - $ag1 = $this->createAccessGroup('ag1_' . $testid); - $ag2 = $this->createAccessGroup('ag2_' . $testid); + $testId = uniqid(); + $ag1 = $this->createAccessGroup('ag1_' . $testId); + $ag2 = $this->createAccessGroup('ag2_' . $testId); - $this->createFile($ag1, 0, 'file1_' . $testid, 10); - $this->createFile($ag2, 0, 'file2_' . $testid, 20); - $this->createFile($ag1, 0, 'file3_' . $testid, 30); + $this->createFile($ag1, 0, 'file1_' . $testId, 10); + $this->createFile($ag2, 0, 'file2_' . $testId, 20); + $this->createFile($ag1, 0, 'file3_' . $testId, 30); $qF = new QueryFilter(AccessGroup::GROUP_NAME, $ag1->getGroupName(), '=', Factory::getAccessGroupFactory()); $jF = new JoinFilter(Factory::getAccessGroupFactory(), File::ACCESS_GROUP_ID, AccessGroup::ACCESS_GROUP_ID); @@ -155,8 +155,8 @@ public function testJoinWithOrder(): void { $joined = Factory::getFileFactory()->filter([Factory::FILTER => $qF, Factory::JOIN => $jF, Factory::ORDER => $oF]); $this->assertCount(2, $joined[Factory::getFileFactory()->getModelName()]); - $this->assertEquals('file3_' . $testid, $joined[Factory::getFileFactory()->getModelName()][0]->getFilename()); - $this->assertEquals('file1_' . $testid, $joined[Factory::getFileFactory()->getModelName()][1]->getFilename()); + $this->assertEquals('file3_' . $testId, $joined[Factory::getFileFactory()->getModelName()][0]->getFilename()); + $this->assertEquals('file1_' . $testId, $joined[Factory::getFileFactory()->getModelName()][1]->getFilename()); } /** @@ -167,21 +167,21 @@ public function testJoinWithOrder(): void { * @throws Exception */ public function testJoinWithQueryFilters(): void { - $testid = uniqid(); - $ag1 = $this->createAccessGroup('ag1_' . $testid); - $ag2 = $this->createAccessGroup('ag2_' . $testid); + $testId = uniqid(); + $ag1 = $this->createAccessGroup('ag1_' . $testId); + $ag2 = $this->createAccessGroup('ag2_' . $testId); - $this->createFile($ag1, 0, 'file1_' . $testid, 10); - $this->createFile($ag2, 0, 'file2_' . $testid, 20); - $this->createFile($ag1, 0, 'file3_' . $testid, 30); + $this->createFile($ag1, 0, 'file1_' . $testId, 10); + $this->createFile($ag2, 0, 'file2_' . $testId, 20); + $this->createFile($ag1, 0, 'file3_' . $testId, 30); $qFJoin = new QueryFilter(AccessGroup::GROUP_NAME, $ag1->getGroupName(), '=', Factory::getAccessGroupFactory()); $jF = new JoinFilter(Factory::getAccessGroupFactory(), File::ACCESS_GROUP_ID, AccessGroup::ACCESS_GROUP_ID, null, JoinFilter::INNER, [$qFJoin]); $joined = Factory::getFileFactory()->filter([Factory::JOIN => $jF]); $this->assertCount(2, $joined[Factory::getFileFactory()->getModelName()]); - $this->assertEquals('file1_' . $testid, $joined[Factory::getFileFactory()->getModelName()][0]->getFilename()); - $this->assertEquals('file3_' . $testid, $joined[Factory::getFileFactory()->getModelName()][1]->getFilename()); + $this->assertEquals('file1_' . $testId, $joined[Factory::getFileFactory()->getModelName()][0]->getFilename()); + $this->assertEquals('file3_' . $testId, $joined[Factory::getFileFactory()->getModelName()][1]->getFilename()); } /** @@ -192,9 +192,9 @@ public function testJoinWithQueryFilters(): void { * @throws Exception */ public function testJoinMappedTable(): void { - $testid = uniqid(); - $user = $this->createUser('user_' . $testid); - $ag = $this->createAccessGroup('ag_' . $testid); + $testId = uniqid(); + $user = $this->createUser('user_' . $testId); + $ag = $this->createAccessGroup('ag_' . $testId); $this->createAccessGroupUser($user, $ag); $jF = new JoinFilter(Factory::getUserFactory(), AccessGroupUser::USER_ID, User::USER_ID); @@ -216,9 +216,9 @@ public function testJoinMappedTable(): void { * @throws Exception */ public function testJoinMultipleInner(): void { - $testid = uniqid(); - $user = $this->createUser('user_' . $testid); - $ag = $this->createAccessGroup('ag_' . $testid); + $testId = uniqid(); + $user = $this->createUser('user_' . $testId); + $ag = $this->createAccessGroup('ag_' . $testId); $this->createAccessGroupUser($user, $ag); $jF1 = new JoinFilter(Factory::getUserFactory(), AccessGroupUser::USER_ID, User::USER_ID); @@ -242,14 +242,14 @@ public function testJoinMultipleInner(): void { * @throws Exception */ public function testJoinLeft(): void { - $testid = uniqid(); - $ag1 = $this->createAccessGroup('ag1_' . $testid); - $ag2 = $this->createAccessGroup('ag2_' . $testid); - $this->createFile($ag1, 0, 'file1_' . $testid, 10); - $this->createFile($ag1, 0, 'file2_' . $testid, 20); + $testId = uniqid(); + $ag1 = $this->createAccessGroup('ag1_' . $testId); + $ag2 = $this->createAccessGroup('ag2_' . $testId); + $this->createFile($ag1, 0, 'file1_' . $testId, 10); + $this->createFile($ag1, 0, 'file2_' . $testId, 20); $jF = new JoinFilter(Factory::getFileFactory(), AccessGroup::ACCESS_GROUP_ID, File::ACCESS_GROUP_ID, null, JoinFilter::LEFT); - $qF = new LikeFilter(AccessGroup::GROUP_NAME, '%' . $testid . '%', Factory::getAccessGroupFactory()); + $qF = new LikeFilter(AccessGroup::GROUP_NAME, '%' . $testId . '%', Factory::getAccessGroupFactory()); $joined = Factory::getAccessGroupFactory()->filter([Factory::FILTER => $qF, Factory::JOIN => $jF]); $this->assertCount(3, $joined[Factory::getAccessGroupFactory()->getModelName()]); @@ -268,14 +268,14 @@ public function testJoinLeft(): void { * @throws Exception */ public function testJoinRight(): void { - $testid = uniqid(); - $ag1 = $this->createAccessGroup('ag1_' . $testid); - $ag2 = $this->createAccessGroup('ag2_' . $testid); - $this->createFile($ag1, 0, 'file1_' . $testid, 10); - $this->createFile($ag1, 0, 'file2_' . $testid, 20); + $testId = uniqid(); + $ag1 = $this->createAccessGroup('ag1_' . $testId); + $ag2 = $this->createAccessGroup('ag2_' . $testId); + $this->createFile($ag1, 0, 'file1_' . $testId, 10); + $this->createFile($ag1, 0, 'file2_' . $testId, 20); $jF = new JoinFilter(Factory::getAccessGroupFactory(), File::ACCESS_GROUP_ID, AccessGroup::ACCESS_GROUP_ID, null, JoinFilter::RIGHT); - $qF = new LikeFilter(AccessGroup::GROUP_NAME, '%' . $testid . '%', Factory::getAccessGroupFactory()); + $qF = new LikeFilter(AccessGroup::GROUP_NAME, '%' . $testId . '%', Factory::getAccessGroupFactory()); $joined = Factory::getFileFactory()->filter([Factory::FILTER => $qF, Factory::JOIN => $jF]); $this->assertCount(3, $joined[Factory::getFileFactory()->getModelName()]); diff --git a/ci/phpunit/dba/LikeFilterInsensitiveTest.php b/ci/phpunit/dba/LikeFilterInsensitiveTest.php index 60e678d5e..bb0124e8f 100644 --- a/ci/phpunit/dba/LikeFilterInsensitiveTest.php +++ b/ci/phpunit/dba/LikeFilterInsensitiveTest.php @@ -82,9 +82,9 @@ public function testGetKey(): void { * @throws Exception */ public function testFilterLikeBasic(): void { - $testid = uniqid(); + $testId = uniqid(); $hashType = $this->createHashType(); - $ag = $this->createAccessGroup('ag_' . $testid); + $ag = $this->createAccessGroup('ag_' . $testId); $this->createHashlist($ag, $hashType); $this->createHashlist($ag, $hashType); $this->createHashlist($ag, $hashType); @@ -106,20 +106,20 @@ public function testFilterLikeBasic(): void { * @throws Exception */ public function testFilterLikeCaseInsensitive(): void { - $testid = uniqid(); + $testId = uniqid(); $hashType = $this->createHashType(); - $ag = $this->createAccessGroup('ag_' . $testid); + $ag = $this->createAccessGroup('ag_' . $testId); $this->createDatabaseObject( Factory::getHashlistFactory(), - new Hashlist(null, 'TestCase_' . $testid, DHashlistFormat::PLAIN, $hashType->getId(), 1, ':', 0, 0, 0, 0, $ag->getId(), '', 0, 0, 0) + new Hashlist(null, 'TestCase_' . $testId, DHashlistFormat::PLAIN, $hashType->getId(), 1, ':', 0, 0, 0, 0, $ag->getId(), '', 0, 0, 0) ); $this->createDatabaseObject( Factory::getHashlistFactory(), - new Hashlist(null, 'testcase_' . $testid, DHashlistFormat::PLAIN, $hashType->getId(), 1, ':', 0, 0, 0, 0, $ag->getId(), '', 0, 0, 0) + new Hashlist(null, 'testcase_' . $testId, DHashlistFormat::PLAIN, $hashType->getId(), 1, ':', 0, 0, 0, 0, $ag->getId(), '', 0, 0, 0) ); - $filter = new LikeFilterInsensitive(Hashlist::HASHLIST_NAME, '%testcase_' . $testid . '%'); + $filter = new LikeFilterInsensitive(Hashlist::HASHLIST_NAME, '%testcase_' . $testId . '%'); $results = Factory::getHashlistFactory()->filter([Factory::FILTER => $filter]); $this->assertCount(2, $results); @@ -132,13 +132,13 @@ public function testFilterLikeCaseInsensitive(): void { * @throws Exception */ public function testFilterLikeNoMatch(): void { - $testid = uniqid(); + $testId = uniqid(); $hashType = $this->createHashType(); - $ag = $this->createAccessGroup('ag_' . $testid); + $ag = $this->createAccessGroup('ag_' . $testId); $this->createHashlist($ag, $hashType); $this->createHashlist($ag, $hashType); - $filter = new LikeFilterInsensitive(Hashlist::HASHLIST_NAME, '%nomatch_' . $testid . '%'); + $filter = new LikeFilterInsensitive(Hashlist::HASHLIST_NAME, '%nomatch_' . $testId . '%'); $results = Factory::getHashlistFactory()->filter([Factory::FILTER => $filter]); $this->assertCount(0, $results); @@ -151,10 +151,10 @@ public function testFilterLikeNoMatch(): void { * @throws Exception */ public function testFilterLikeMappedTable(): void { - $testid = uniqid(); - $user = $this->createUser('mapped_' . $testid); + $testId = uniqid(); + $user = $this->createUser('mapped_' . $testId); - $filter = new LikeFilterInsensitive(User::USERNAME, '%mapped_' . $testid . '%'); + $filter = new LikeFilterInsensitive(User::USERNAME, '%mapped_' . $testId . '%'); $results = Factory::getUserFactory()->filter([Factory::FILTER => $filter]); $this->assertCount(1, $results); diff --git a/ci/phpunit/dba/LikeFilterTest.php b/ci/phpunit/dba/LikeFilterTest.php index 7425be675..37e896218 100644 --- a/ci/phpunit/dba/LikeFilterTest.php +++ b/ci/phpunit/dba/LikeFilterTest.php @@ -211,25 +211,25 @@ public function testFilterLikeBasic(): void { * @throws Exception */ public function testFilterLikeNotMatch(): void { - $testid = uniqid(); + $testId = uniqid(); $hashType = $this->createHashType(); - $ag = $this->createAccessGroup('ag_' . $testid); + $ag = $this->createAccessGroup('ag_' . $testId); $this->createDatabaseObject( Factory::getHashlistFactory(), - new Hashlist(null, 'keep_' . $testid, DHashlistFormat::PLAIN, $hashType->getId(), 1, ':', 0, 0, 0, 0, $ag->getId(), '', 0, 0, 0) + new Hashlist(null, 'keep_' . $testId, DHashlistFormat::PLAIN, $hashType->getId(), 1, ':', 0, 0, 0, 0, $ag->getId(), '', 0, 0, 0) ); $this->createDatabaseObject( Factory::getHashlistFactory(), - new Hashlist(null, 'exclude_' . $testid, DHashlistFormat::PLAIN, $hashType->getId(), 1, ':', 0, 0, 0, 0, $ag->getId(), '', 0, 0, 0) + new Hashlist(null, 'exclude_' . $testId, DHashlistFormat::PLAIN, $hashType->getId(), 1, ':', 0, 0, 0, 0, $ag->getId(), '', 0, 0, 0) ); - $scope = new LikeFilter(Hashlist::HASHLIST_NAME, '%' . $testid . '%'); - $exclude = new LikeFilter(Hashlist::HASHLIST_NAME, '%exclude_' . $testid . '%'); + $scope = new LikeFilter(Hashlist::HASHLIST_NAME, '%' . $testId . '%'); + $exclude = new LikeFilter(Hashlist::HASHLIST_NAME, '%exclude_' . $testId . '%'); $exclude->setMatch(false); $results = Factory::getHashlistFactory()->filter([Factory::FILTER => [$scope, $exclude]]); $this->assertCount(1, $results); - $this->assertEquals('keep_' . $testid, $results[0]->getHashlistName()); + $this->assertEquals('keep_' . $testId, $results[0]->getHashlistName()); } /** @@ -239,13 +239,13 @@ public function testFilterLikeNotMatch(): void { * @throws Exception */ public function testFilterLikeNoMatch(): void { - $testid = uniqid(); + $testId = uniqid(); $hashType = $this->createHashType(); - $ag = $this->createAccessGroup('ag_' . $testid); + $ag = $this->createAccessGroup('ag_' . $testId); $this->createHashlist($ag, $hashType); $this->createHashlist($ag, $hashType); - $filter = new LikeFilter(Hashlist::HASHLIST_NAME, '%nomatch_' . $testid . '%'); + $filter = new LikeFilter(Hashlist::HASHLIST_NAME, '%nomatch_' . $testId . '%'); $results = Factory::getHashlistFactory()->filter([Factory::FILTER => $filter]); $this->assertCount(0, $results); @@ -258,10 +258,10 @@ public function testFilterLikeNoMatch(): void { * @throws Exception */ public function testFilterLikeMappedTable(): void { - $testid = uniqid(); - $user = $this->createUser('mapped_' . $testid); + $testId = uniqid(); + $user = $this->createUser('mapped_' . $testId); - $filter = new LikeFilter(User::USERNAME, '%mapped_' . $testid . '%'); + $filter = new LikeFilter(User::USERNAME, '%mapped_' . $testId . '%'); $results = Factory::getUserFactory()->filter([Factory::FILTER => $filter]); $this->assertCount(1, $results); From 35515dd1717aff4da5ab1fa9b1b384fe0408883c Mon Sep 17 00:00:00 2001 From: s3inlc Date: Mon, 22 Jun 2026 13:55:46 +0200 Subject: [PATCH 663/691] removed test which phpstan did not like due to being too obvious. --- ci/phpunit/dba/ComparisonFilterTest.php | 6 ------ 1 file changed, 6 deletions(-) diff --git a/ci/phpunit/dba/ComparisonFilterTest.php b/ci/phpunit/dba/ComparisonFilterTest.php index eaaf5987b..33158dc77 100644 --- a/ci/phpunit/dba/ComparisonFilterTest.php +++ b/ci/phpunit/dba/ComparisonFilterTest.php @@ -67,12 +67,6 @@ public function testOverrideFactoryWithTable(): void { ); } - /** Verify getValue returns null (comparison filters have no bound value). */ - public function testGetValueReturnsNull(): void { - $filter = new ComparisonFilter(Hashlist::HASHLIST_ID, Hashlist::HASH_TYPE_ID, '='); - $this->assertNull($filter->getValue()); - } - /** Verify getHasValue returns false (comparison filters have no bound value). */ public function testGetHasValueReturnsFalse(): void { $filter = new ComparisonFilter(Hashlist::HASHLIST_ID, Hashlist::HASH_TYPE_ID, '='); From d7a393835666cc127e3bb36e482dd9b2550ee925 Mon Sep 17 00:00:00 2001 From: s3inlc Date: Mon, 22 Jun 2026 14:13:03 +0200 Subject: [PATCH 664/691] added tests for LimitFilter and MassUpdateSet --- ci/phpunit/dba/LimitFilterTest.php | 166 +++++++++++++++++++++++++++ ci/phpunit/dba/MassUpdateSetTest.php | 133 +++++++++++++++++++++ src/dba/LimitFilter.php | 8 +- 3 files changed, 304 insertions(+), 3 deletions(-) create mode 100644 ci/phpunit/dba/LimitFilterTest.php create mode 100644 ci/phpunit/dba/MassUpdateSetTest.php diff --git a/ci/phpunit/dba/LimitFilterTest.php b/ci/phpunit/dba/LimitFilterTest.php new file mode 100644 index 000000000..9e115f030 --- /dev/null +++ b/ci/phpunit/dba/LimitFilterTest.php @@ -0,0 +1,166 @@ +assertEquals('10', $filter->getQueryString()); + } + + /** Verify limit with offset produces ' OFFSET '. */ + public function testQueryStringWithOffset(): void { + $filter = new LimitFilter(10, 5); + $this->assertEquals('10 OFFSET 5', $filter->getQueryString()); + } + + /** Verify zero limit is accepted. */ + public function testQueryStringZeroLimit(): void { + $filter = new LimitFilter(0); + $this->assertEquals('0', $filter->getQueryString()); + } + + /** Verify zero offset is treated as null (loose comparison quirk). */ + public function testQueryStringZeroOffset(): void { + $filter = new LimitFilter(5, 0); + $this->assertEquals('5', $filter->getQueryString()); + } + + /** Verify numeric string limit is cast to int. */ + public function testQueryStringStringIntLimit(): void { + $filter = new LimitFilter("5"); + $this->assertEquals('5', $filter->getQueryString()); + } + + /** Verify numeric string limit and offset both work. */ + public function testQueryStringWithBothStringInt(): void { + $filter = new LimitFilter("5", "3"); + $this->assertEquals('5 OFFSET 3', $filter->getQueryString()); + } + + /** Verify null offset produces only limit. */ + public function testNullOffset(): void { + $filter = new LimitFilter(10, null); + $this->assertEquals('10', $filter->getQueryString()); + } + + /** Verify negative limit throws. */ + public function testInvalidLimitThrows(): void { + $this->expectException(InvalidArgumentException::class); + new LimitFilter(-1); + } + + /** Verify non-numeric limit string throws. */ + public function testInvalidLimitStringThrows(): void { + $this->expectException(InvalidArgumentException::class); + new LimitFilter("abc"); + } + + /** Verify negative offset throws. */ + public function testInvalidOffsetThrows(): void { + $this->expectException(InvalidArgumentException::class); + new LimitFilter(5, -1); + } + + /** Verify non-numeric offset string throws. */ + public function testInvalidOffsetStringThrows(): void { + $this->expectException(InvalidArgumentException::class); + new LimitFilter(5, "xyz"); + } + + /** + * Create 5 hash types, limit to 2 — only 2 returned. + * + * @throws Exception + */ + public function testLimitRestrictsResults(): void { + $testId = uniqid(); + for ($i = 0; $i < 5; $i++) { + $this->createDatabaseObject(Factory::getHashTypeFactory(), new HashType(null, 'ht' . $i . '_' . $testId, 0, 0)); + } + + $scope = new LikeFilter(HashType::DESCRIPTION, '%' . $testId); + $limit = new LimitFilter(2); + $results = Factory::getHashTypeFactory()->filter([ + Factory::FILTER => $scope, + Factory::LIMIT => $limit, + ]); + + $this->assertCount(2, $results); + } + + /** + * Create 3 hash types, limit to 10 — all 3 returned. + * + * @throws Exception + */ + public function testLimitLargerThanResults(): void { + $testId = uniqid(); + for ($i = 0; $i < 3; $i++) { + $this->createDatabaseObject(Factory::getHashTypeFactory(), new HashType(null, 'ht' . $i . '_' . $testId, 0, 0)); + } + + $scope = new LikeFilter(HashType::DESCRIPTION, '%' . $testId); + $limit = new LimitFilter(10); + $results = Factory::getHashTypeFactory()->filter([ + Factory::FILTER => $scope, + Factory::LIMIT => $limit, + ]); + + $this->assertCount(3, $results); + } + + /** + * Create 3 hash types, limit to 0 — 0 results. + * + * @throws Exception + */ + public function testLimitZeroResults(): void { + $testId = uniqid(); + for ($i = 0; $i < 3; $i++) { + $this->createDatabaseObject(Factory::getHashTypeFactory(), new HashType(null, 'ht' . $i . '_' . $testId, 0, 0)); + } + + $scope = new LikeFilter(HashType::DESCRIPTION, '%' . $testId); + $limit = new LimitFilter(0); + $results = Factory::getHashTypeFactory()->filter([ + Factory::FILTER => $scope, + Factory::LIMIT => $limit, + ]); + + $this->assertCount(0, $results); + } + + /** + * 3 hash types (isSalted 10, 5, 1). ORDER ASC, LIMIT 1 OFFSET 1 → + * expect 1 result with isSalted = 5. + * + * @throws Exception + */ + public function testLimitWithOffsetAndOrder(): void { + $testId = uniqid(); + $this->createDatabaseObject(Factory::getHashTypeFactory(), new HashType(null, 'ht1_' . $testId, 10, 0)); + $this->createDatabaseObject(Factory::getHashTypeFactory(), new HashType(null, 'ht2_' . $testId, 5, 0)); + $this->createDatabaseObject(Factory::getHashTypeFactory(), new HashType(null, 'ht3_' . $testId, 1, 0)); + + $scope = new LikeFilter(HashType::DESCRIPTION, '%' . $testId); + $order = new OrderFilter(HashType::IS_SALTED, 'ASC'); + $limit = new LimitFilter(1, 1); + $results = Factory::getHashTypeFactory()->filter([ + Factory::FILTER => $scope, + Factory::ORDER => $order, + Factory::LIMIT => $limit, + ]); + + $this->assertCount(1, $results); + $this->assertEquals(5, $results[0]->getIsSalted()); + } +} diff --git a/ci/phpunit/dba/MassUpdateSetTest.php b/ci/phpunit/dba/MassUpdateSetTest.php new file mode 100644 index 000000000..cd3ce12da --- /dev/null +++ b/ci/phpunit/dba/MassUpdateSetTest.php @@ -0,0 +1,133 @@ +assertEquals('key1', $set->getMatchValue()); + } + + /** Verify getUpdateValue returns the update string. */ + public function testGetUpdateValueString(): void { + $set = new MassUpdateSet('key1', 'val1'); + $this->assertEquals('val1', $set->getUpdateValue()); + } + + /** Verify getUpdateValue returns the update int. */ + public function testGetUpdateValueInt(): void { + $set = new MassUpdateSet('key1', 42); + $this->assertSame(42, $set->getUpdateValue()); + } + + /** Verify getUpdateValue returns null. */ + public function testGetUpdateValueNull(): void { + $set = new MassUpdateSet('key1', null); + $this->assertNull($set->getUpdateValue()); + } + + /** Verify getMassQuery returns the correct SQL fragment. */ + public function testGetMassQuery(): void { + $set = new MassUpdateSet('key1', 'val1'); + $this->assertEquals( + 'WHEN columnName = ? THEN ? ', + $set->getMassQuery('columnName') + ); + } + + /** + * Create 3 hash types, mass-update 2 with string values. + * Verify updates took effect and the untouched row is unchanged. + * + * @throws Exception + */ + public function testMassSingleUpdateString(): void { + $testId = uniqid(); + $ht1 = $this->createDatabaseObject(Factory::getHashTypeFactory(), new HashType(null, 'ht1_' . $testId, 0, 0)); + $ht2 = $this->createDatabaseObject(Factory::getHashTypeFactory(), new HashType(null, 'ht2_' . $testId, 0, 0)); + $this->createDatabaseObject(Factory::getHashTypeFactory(), new HashType(null, 'ht3_' . $testId, 0, 0)); + + $updates = [ + new MassUpdateSet($ht1->getDescription(), 99), + new MassUpdateSet($ht2->getDescription(), 88), + ]; + + $result = Factory::getHashTypeFactory()->massSingleUpdate( + HashType::DESCRIPTION, HashType::IS_SALTED, $updates + ); + + $this->assertTrue($result); + + $scope = new LikeFilter(HashType::DESCRIPTION, '%' . $testId); + $results = Factory::getHashTypeFactory()->filter([Factory::FILTER => $scope]); + + $this->assertCount(3, $results); + foreach ($results as $ht) { + if ($ht->getDescription() === $ht1->getDescription()) { + $this->assertEquals(99, $ht->getIsSalted()); + } + elseif ($ht->getDescription() === $ht2->getDescription()) { + $this->assertEquals(88, $ht->getIsSalted()); + } + else { + $this->assertEquals(0, $ht->getIsSalted()); + } + } + } + + /** + * Create 3 hash types, mass-update 1 with an integer value. + * The ELSE 2147483648 clause is triggered for integer updates. + * Only the matched row should change; the other 2 keep their value. + * + * @throws Exception + */ + public function testMassSingleUpdateIntValue(): void { + $testId = uniqid(); + $ht1 = $this->createDatabaseObject(Factory::getHashTypeFactory(), new HashType(null, 'ht1_' . $testId, 0, 0)); + $this->createDatabaseObject(Factory::getHashTypeFactory(), new HashType(null, 'ht2_' . $testId, 0, 0)); + $this->createDatabaseObject(Factory::getHashTypeFactory(), new HashType(null, 'ht3_' . $testId, 0, 0)); + + $updates = [ + new MassUpdateSet($ht1->getDescription(), 999), + ]; + + $result = Factory::getHashTypeFactory()->massSingleUpdate( + HashType::DESCRIPTION, HashType::IS_SALTED, $updates + ); + + $this->assertTrue($result); + + $scope = new LikeFilter(HashType::DESCRIPTION, '%' . $testId); + $results = Factory::getHashTypeFactory()->filter([Factory::FILTER => $scope]); + + $this->assertCount(3, $results); + foreach ($results as $ht) { + if ($ht->getDescription() === $ht1->getDescription()) { + $this->assertEquals(999, $ht->getIsSalted()); + } + else { + $this->assertEquals(0, $ht->getIsSalted()); + } + } + } + + /** + * Empty updates array should return null. + * + * @throws Exception + */ + public function testMassSingleUpdateEmptyReturnsNull(): void { + $result = Factory::getHashTypeFactory()->massSingleUpdate( + HashType::DESCRIPTION, HashType::IS_SALTED, [] + ); + $this->assertNull($result); + } +} diff --git a/src/dba/LimitFilter.php b/src/dba/LimitFilter.php index 57bd007e4..85caac56d 100644 --- a/src/dba/LimitFilter.php +++ b/src/dba/LimitFilter.php @@ -2,19 +2,21 @@ namespace Hashtopolis\dba; +use InvalidArgumentException; + class LimitFilter extends Limit { - private int $limit; + private int $limit; private int|null $offset; function __construct(int|string $limit, int|string|null $offset = null) { // Enforce that limit is an integer if (!is_numeric($limit) || intval($limit) < 0) { - throw new \InvalidArgumentException("Limit must be a non-negative integer."); + throw new InvalidArgumentException("Limit must be a non-negative integer."); } // Enforce that offset, if provided, is an integer if ($offset !== null && (!is_numeric($offset) || intval($offset) < 0)) { - throw new \InvalidArgumentException("Offset must be a non-negative integer."); + throw new InvalidArgumentException("Offset must be a non-negative integer."); } // Cast the inputs to ensure they are integers From c7dff76b9c31fbd81518d91680fca88fb1267a41 Mon Sep 17 00:00:00 2001 From: s3inlc Date: Mon, 22 Jun 2026 14:29:38 +0200 Subject: [PATCH 665/691] added tests for OrderFilter, PaginationFilter and UpdateSet fixed problems with the LikeFilter causing the env variable for database type to survive tearDown in tests --- ci/phpunit/TestBase.php | 13 +++ ci/phpunit/dba/OrderFilterTest.php | 129 +++++++++++++++++++++++ ci/phpunit/dba/PaginationFilterTest.php | 132 ++++++++++++++++++++++++ ci/phpunit/dba/UpdateSetTest.php | 118 +++++++++++++++++++++ 4 files changed, 392 insertions(+) create mode 100644 ci/phpunit/dba/OrderFilterTest.php create mode 100644 ci/phpunit/dba/PaginationFilterTest.php create mode 100644 ci/phpunit/dba/UpdateSetTest.php diff --git a/ci/phpunit/TestBase.php b/ci/phpunit/TestBase.php index 4136ed5f5..cdc22de4b 100644 --- a/ci/phpunit/TestBase.php +++ b/ci/phpunit/TestBase.php @@ -36,6 +36,7 @@ use Hashtopolis\inc\defines\DHashlistFormat; use Hashtopolis\inc\defines\DTaskTypes; use Hashtopolis\inc\HTException; +use Hashtopolis\inc\StartupConfig; use Hashtopolis\inc\utils\UserUtils; use PHPUnit\Framework\TestCase; use Override; @@ -46,6 +47,7 @@ class TestBase extends TestCase { private array $databaseObjects; + private string $savedDbType; protected User $adminUser; #[Override] @@ -53,6 +55,7 @@ protected function setUp(): void { parent::setUp(); $this->databaseObjects = []; + $this->savedDbType = (string)getenv('HASHTOPOLIS_DB_TYPE'); $this->adminUser = new User(1, 'admin', 'admin@example.com', 'hash', 'salt', 1, 0, 0, time(), 3600, 1, '', '', '', '', ''); // Avoid test warnings @@ -82,6 +85,16 @@ protected function tearDown(): void { } } + // Restore the DB type environment variable so putenv() in one test + // does not leak into the next test (affects LikeFilter etc.) + if ($this->savedDbType !== '') { + putenv('HASHTOPOLIS_DB_TYPE=' . $this->savedDbType); + } + else { + putenv('HASHTOPOLIS_DB_TYPE'); + } + StartupConfig::getInstance(true); + parent::tearDown(); } diff --git a/ci/phpunit/dba/OrderFilterTest.php b/ci/phpunit/dba/OrderFilterTest.php new file mode 100644 index 000000000..f1a83b024 --- /dev/null +++ b/ci/phpunit/dba/OrderFilterTest.php @@ -0,0 +1,129 @@ +assertEquals(HashType::IS_SALTED, $order->getBy()); + } + + /** Verify getType returns the sort direction. */ + public function testGetType(): void { + $order = new OrderFilter(HashType::IS_SALTED, 'DESC'); + $this->assertEquals('DESC', $order->getType()); + } + + /** Verify basic query string without table prefix. */ + public function testQueryStringBasic(): void { + $order = new OrderFilter(HashType::IS_SALTED, 'ASC'); + $this->assertEquals( + 'isSalted ASC', + $order->getQueryString(Factory::getHashlistFactory()) + ); + } + + /** Verify table prefix is included when includeTable=true. */ + public function testQueryStringWithTable(): void { + $order = new OrderFilter(HashType::IS_SALTED, 'ASC'); + $this->assertEquals( + 'Hashlist.isSalted ASC', + $order->getQueryString(Factory::getHashlistFactory(), true) + ); + } + + /** Verify mapped table name (htp_User) appears in the query string. */ + public function testQueryStringMappedTable(): void { + $order = new OrderFilter(User::USERNAME, 'ASC'); + $this->assertEquals( + 'htp_User.username ASC', + $order->getQueryString(Factory::getUserFactory(), true) + ); + } + + /** Verify DESC sort direction works. */ + public function testQueryStringDesc(): void { + $order = new OrderFilter(HashType::HASH_TYPE_ID, 'DESC'); + $this->assertEquals( + 'Hashlist.hashTypeId DESC', + $order->getQueryString(Factory::getHashlistFactory(), true) + ); + } + + /** Verify overrideFactory is used regardless of passed factory. */ + public function testQueryStringOverrideFactory(): void { + $order = new OrderFilter(HashType::IS_SALTED, 'ASC', Factory::getHashlistFactory()); + $this->assertEquals( + 'Hashlist.isSalted ASC', + $order->getQueryString(Factory::getUserFactory(), true) + ); + } + + /** Verify mapped column (htp_end) resolves correctly. */ + public function testQueryStringMappedColumn(): void { + $order = new OrderFilter(HealthCheckAgent::END, 'ASC'); + $this->assertEquals( + 'HealthCheckAgent.htp_end ASC', + $order->getQueryString(Factory::getHealthCheckAgentFactory(), true) + ); + } + + /** + * Create 3 hash types with isSalted 1, 5, 10 and order ASC. + * Expect results in order 1, 5, 10. + * + * @throws Exception + */ + public function testOrderAsc(): void { + $testId = uniqid(); + $this->createDatabaseObject(Factory::getHashTypeFactory(), new HashType(null, 'c_' . $testId, 10, 0)); + $this->createDatabaseObject(Factory::getHashTypeFactory(), new HashType(null, 'a_' . $testId, 1, 0)); + $this->createDatabaseObject(Factory::getHashTypeFactory(), new HashType(null, 'b_' . $testId, 5, 0)); + + $scope = new LikeFilter(HashType::DESCRIPTION, '%' . $testId); + $order = new OrderFilter(HashType::IS_SALTED, 'ASC'); + $results = Factory::getHashTypeFactory()->filter([ + Factory::FILTER => $scope, + Factory::ORDER => $order, + ]); + + $this->assertCount(3, $results); + $this->assertEquals(1, $results[0]->getIsSalted()); + $this->assertEquals(5, $results[1]->getIsSalted()); + $this->assertEquals(10, $results[2]->getIsSalted()); + } + + /** + * Create 3 hash types with isSalted 1, 5, 10 and order DESC. + * Expect results in order 10, 5, 1. + * + * @throws Exception + */ + public function testOrderDesc(): void { + $testId = uniqid(); + $this->createDatabaseObject(Factory::getHashTypeFactory(), new HashType(null, 'c_' . $testId, 10, 0)); + $this->createDatabaseObject(Factory::getHashTypeFactory(), new HashType(null, 'a_' . $testId, 1, 0)); + $this->createDatabaseObject(Factory::getHashTypeFactory(), new HashType(null, 'b_' . $testId, 5, 0)); + + $scope = new LikeFilter(HashType::DESCRIPTION, '%' . $testId); + $order = new OrderFilter(HashType::IS_SALTED, 'DESC'); + $results = Factory::getHashTypeFactory()->filter([ + Factory::FILTER => $scope, + Factory::ORDER => $order, + ]); + + $this->assertCount(3, $results); + $this->assertEquals(10, $results[0]->getIsSalted()); + $this->assertEquals(5, $results[1]->getIsSalted()); + $this->assertEquals(1, $results[2]->getIsSalted()); + } +} diff --git a/ci/phpunit/dba/PaginationFilterTest.php b/ci/phpunit/dba/PaginationFilterTest.php new file mode 100644 index 000000000..46b0c5462 --- /dev/null +++ b/ci/phpunit/dba/PaginationFilterTest.php @@ -0,0 +1,132 @@ +', HashType::HASH_TYPE_ID, 0); + $this->assertEquals( + '(isSalted>?) OR (isSalted=? AND hashTypeId>?)', + $filter->getQueryString(Factory::getHashlistFactory()) + ); + } + + /** Verify table prefix is included when includeTable=true. */ + public function testQueryStringWithTable(): void { + $filter = new PaginationFilter(HashType::IS_SALTED, 5, '>', HashType::HASH_TYPE_ID, 0); + $this->assertEquals( + '(Hashlist.isSalted>?) OR (Hashlist.isSalted=? AND Hashlist.hashTypeId>?)', + $filter->getQueryString(Factory::getHashlistFactory(), true) + ); + } + + /** Verify extra filters are AND-ed inside the second OR branch. */ + public function testQueryStringWithFilters(): void { + putenv('HASHTOPOLIS_DB_TYPE=mysql'); + StartupConfig::getInstance(true); + $inner = new LikeFilter(Hashlist::HASHLIST_NAME, '%test%'); + $filter = new PaginationFilter(Hashlist::IS_SALTED, 5, '>', Hashlist::HASH_TYPE_ID, 0, [$inner]); + $result = $filter->getQueryString(Factory::getHashlistFactory(), true); + $this->assertStringContainsString('(Hashlist.isSalted>?)', $result); + $this->assertStringContainsString('OR (Hashlist.isSalted=?', $result); + $this->assertStringContainsString('AND Hashlist.hashTypeId>?', $result); + $this->assertStringContainsString('AND Hashlist.hashlistName LIKE BINARY ?', $result); + } + + /** Verify mapped table name (htp_User) is used. */ + public function testQueryStringMappedTable(): void { + $filter = new PaginationFilter(User::USER_ID, 1, '>', User::USERNAME, ''); + $this->assertEquals( + '(htp_User.userId>?) OR (htp_User.userId=? AND htp_User.username>?)', + $filter->getQueryString(Factory::getUserFactory(), true) + ); + } + + /** Verify overrideFactory resolves columns from the override. */ + public function testQueryStringOverrideFactory(): void { + $filter = new PaginationFilter(HashType::IS_SALTED, 5, '>', HashType::HASH_TYPE_ID, 0, [], Factory::getHashlistFactory()); + $this->assertEquals( + '(Hashlist.isSalted>?) OR (Hashlist.isSalted=? AND Hashlist.hashTypeId>?)', + $filter->getQueryString(Factory::getUserFactory(), true) + ); + } + + /** Verify getValue returns [value, value, tieBreakerValue]. */ + public function testGetValue(): void { + $filter = new PaginationFilter(HashType::IS_SALTED, 5, '>', HashType::HASH_TYPE_ID, 10); + $this->assertEquals([5, 5, 10], $filter->getValue()); + } + + /** Verify getValue includes inner filter values. */ + public function testGetValueWithFilters(): void { + $inner = new LikeFilter(HashType::DESCRIPTION, '%search%'); + $filter = new PaginationFilter(HashType::IS_SALTED, 5, '>', HashType::HASH_TYPE_ID, 10, [$inner]); + $this->assertEquals([5, 5, 10, '%search%'], $filter->getValue()); + } + + /** Verify getHasValue returns true when value is not null. */ + public function testGetHasValueTrue(): void { + $filter = new PaginationFilter(HashType::IS_SALTED, 5, '>', HashType::HASH_TYPE_ID, 0); + $this->assertTrue($filter->getHasValue()); + } + + /** Verify getHasValue returns false when value is null. */ + public function testGetHasValueFalse(): void { + $filter = new PaginationFilter(HashType::IS_SALTED, null, '>', HashType::HASH_TYPE_ID, 0); + $this->assertFalse($filter->getHasValue()); + } + + /** + * Create 3 hash types with isSalted 1, 5, 10. Paginate with cursor 3. + * Expect rows with isSalted > 3 (5 and 10). + * + * @throws Exception + */ + public function testFilterPaginationGt(): void { + $testId = uniqid(); + $this->createDatabaseObject(Factory::getHashTypeFactory(), new HashType(null, 'ht1_' . $testId, 1, 0)); + $this->createDatabaseObject(Factory::getHashTypeFactory(), new HashType(null, 'ht2_' . $testId, 5, 0)); + $this->createDatabaseObject(Factory::getHashTypeFactory(), new HashType(null, 'ht3_' . $testId, 10, 0)); + + $scope = new LikeFilter(HashType::DESCRIPTION, '%' . $testId); + $pf = new PaginationFilter(HashType::IS_SALTED, 3, '>', HashType::HASH_TYPE_ID, 0, [$scope]); + $results = Factory::getHashTypeFactory()->filter([Factory::FILTER => [$scope, $pf]]); + + $this->assertGreaterThanOrEqual(2, count($results)); + foreach ($results as $ht) { + $this->assertGreaterThan(3, $ht->getIsSalted()); + } + } + + /** + * Create 3 hash types with isSalted 1, 5, 10 and use '<' operator + * with cursor 6. Expect rows with isSalted < 6 (1 and 5). + * + * @throws Exception + */ + public function testFilterPaginationLt(): void { + $testId = uniqid(); + $this->createDatabaseObject(Factory::getHashTypeFactory(), new HashType(null, 'ht1_' . $testId, 1, 0)); + $this->createDatabaseObject(Factory::getHashTypeFactory(), new HashType(null, 'ht2_' . $testId, 5, 0)); + $this->createDatabaseObject(Factory::getHashTypeFactory(), new HashType(null, 'ht3_' . $testId, 10, 0)); + + $scope = new LikeFilter(HashType::DESCRIPTION, '%' . $testId); + $pf = new PaginationFilter(HashType::IS_SALTED, 6, '<', HashType::HASH_TYPE_ID, 0, [$scope]); + $results = Factory::getHashTypeFactory()->filter([Factory::FILTER => [$scope, $pf]]); + + $this->assertGreaterThanOrEqual(2, count($results)); + foreach ($results as $ht) { + $this->assertLessThan(6, $ht->getIsSalted()); + } + } +} diff --git a/ci/phpunit/dba/UpdateSetTest.php b/ci/phpunit/dba/UpdateSetTest.php new file mode 100644 index 000000000..e8a163373 --- /dev/null +++ b/ci/phpunit/dba/UpdateSetTest.php @@ -0,0 +1,118 @@ +assertEquals( + 'isSalted=?', + $set->getQuery(Factory::getHashlistFactory()) + ); + } + + /** Verify getQuery includes table prefix when includeTable=true. */ + public function testGetQueryWithTable(): void { + $set = new UpdateSet(HashType::IS_SALTED, 1); + $this->assertEquals( + 'Hashlist.isSalted=?', + $set->getQuery(Factory::getHashlistFactory(), true) + ); + } + + /** Verify mapped column name (htp_end) resolves correctly. */ + public function testGetQueryMappedColumn(): void { + $set = new UpdateSet(HealthCheckAgent::END, 5); + $this->assertEquals( + 'HealthCheckAgent.htp_end=?', + $set->getQuery(Factory::getHealthCheckAgentFactory(), true) + ); + } + + /** Verify getValue returns the constructor value (string). */ + public function testGetValueString(): void { + $set = new UpdateSet(HashType::DESCRIPTION, 'new_desc'); + $this->assertEquals('new_desc', $set->getValue()); + } + + /** Verify getValue returns the constructor value (int). */ + public function testGetValueInt(): void { + $set = new UpdateSet(HashType::IS_SALTED, 99); + $this->assertSame(99, $set->getValue()); + } + + /** Verify getValue returns null. */ + public function testGetValueNull(): void { + $set = new UpdateSet(HashType::IS_SALTED, null); + $this->assertNull($set->getValue()); + } + + /** + * Create 3 hash types with isSalted = 0, then mass-update isSalted to 99. + * Verify all 3 rows are updated. + * + * @throws Exception + */ + public function testMassUpdateSingleSet(): void { + $testId = uniqid(); + $this->createDatabaseObject(Factory::getHashTypeFactory(), new HashType(null, 'ht1_' . $testId, 0, 0)); + $this->createDatabaseObject(Factory::getHashTypeFactory(), new HashType(null, 'ht2_' . $testId, 0, 0)); + $this->createDatabaseObject(Factory::getHashTypeFactory(), new HashType(null, 'ht3_' . $testId, 0, 0)); + + $scope = new LikeFilter(HashType::DESCRIPTION, '%' . $testId); + $update = new UpdateSet(HashType::IS_SALTED, 99); + + $result = Factory::getHashTypeFactory()->massUpdate([ + Factory::UPDATE => $update, + Factory::FILTER => $scope, + ]); + + $this->assertTrue($result); + + $results = Factory::getHashTypeFactory()->filter([Factory::FILTER => $scope]); + $this->assertCount(3, $results); + foreach ($results as $ht) { + $this->assertEquals(99, $ht->getIsSalted()); + } + } + + /** + * Create 3 hash types, then mass-update with 2 UpdateSets on different + * columns. Verify both columns are updated. + * + * @throws Exception + */ + public function testMassUpdateMultipleSets(): void { + $testId = uniqid(); + $this->createDatabaseObject(Factory::getHashTypeFactory(), new HashType(null, 'ht1_' . $testId, 0, 0)); + $this->createDatabaseObject(Factory::getHashTypeFactory(), new HashType(null, 'ht2_' . $testId, 0, 0)); + + $scope = new LikeFilter(HashType::DESCRIPTION, '%' . $testId); + $updates = [ + new UpdateSet(HashType::IS_SALTED, 77), + new UpdateSet(HashType::IS_SLOW_HASH, 88), + ]; + + $result = Factory::getHashTypeFactory()->massUpdate([ + Factory::UPDATE => $updates, + Factory::FILTER => $scope, + ]); + + $this->assertTrue($result); + + $results = Factory::getHashTypeFactory()->filter([Factory::FILTER => $scope]); + $this->assertCount(2, $results); + foreach ($results as $ht) { + $this->assertEquals(77, $ht->getIsSalted()); + $this->assertEquals(88, $ht->getIsSlowHash()); + } + } +} From f34e25e39627813e9e16f40bbefb5a89212e7031 Mon Sep 17 00:00:00 2001 From: s3inlc Date: Mon, 22 Jun 2026 14:32:11 +0200 Subject: [PATCH 666/691] added assertions to make Stan happy --- ci/phpunit/dba/MassUpdateSetTest.php | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/ci/phpunit/dba/MassUpdateSetTest.php b/ci/phpunit/dba/MassUpdateSetTest.php index cd3ce12da..7c06f62d1 100644 --- a/ci/phpunit/dba/MassUpdateSetTest.php +++ b/ci/phpunit/dba/MassUpdateSetTest.php @@ -54,6 +54,9 @@ public function testMassSingleUpdateString(): void { $ht2 = $this->createDatabaseObject(Factory::getHashTypeFactory(), new HashType(null, 'ht2_' . $testId, 0, 0)); $this->createDatabaseObject(Factory::getHashTypeFactory(), new HashType(null, 'ht3_' . $testId, 0, 0)); + $this->assertTrue($ht1 instanceof HashType); + $this->assertTrue($ht2 instanceof HashType); + $updates = [ new MassUpdateSet($ht1->getDescription(), 99), new MassUpdateSet($ht2->getDescription(), 88), @@ -95,6 +98,8 @@ public function testMassSingleUpdateIntValue(): void { $this->createDatabaseObject(Factory::getHashTypeFactory(), new HashType(null, 'ht2_' . $testId, 0, 0)); $this->createDatabaseObject(Factory::getHashTypeFactory(), new HashType(null, 'ht3_' . $testId, 0, 0)); + $this->assertTrue($ht1 instanceof HashType); + $updates = [ new MassUpdateSet($ht1->getDescription(), 999), ]; From e8af88a7775b265480164b031bd01489392e202f Mon Sep 17 00:00:00 2001 From: s3inlc Date: Mon, 22 Jun 2026 14:36:48 +0200 Subject: [PATCH 667/691] added tests for dba Util --- ci/phpunit/dba/UtilTest.php | 100 ++++++++++++++++++++++++++++++++++++ 1 file changed, 100 insertions(+) create mode 100644 ci/phpunit/dba/UtilTest.php diff --git a/ci/phpunit/dba/UtilTest.php b/ci/phpunit/dba/UtilTest.php new file mode 100644 index 000000000..5df9fc34d --- /dev/null +++ b/ci/phpunit/dba/UtilTest.php @@ -0,0 +1,100 @@ +assertNull(Util::cast(null, 'SomeClass')); + } + + /** Verify cast returns null when target class does not exist. */ + public function testCastNonExistentClassReturnsNull(): void { + $obj = new UtilTestCastSource(); + $this->assertNull(Util::cast($obj, 'DoesNotExist\\FakeClass')); + } + + /** Verify cast to the same class produces an equivalent object. */ + public function testCastToSameClass(): void { + $obj = new UtilTestCastSource(); + $result = Util::cast($obj, UtilTestCastSource::class); + $this->assertInstanceOf(UtilTestCastSource::class, $result); + $this->assertEquals('hello', $result->a); + $this->assertEquals(42, $result->b); + $this->assertEquals([1, 2, 3], $result->c); + } + + /** Verify cast transfers all public properties to the target class. */ + public function testCastToDifferentClass(): void { + $obj = new UtilTestCastSource(); + $result = Util::cast($obj, UtilTestCastTarget::class); + $this->assertInstanceOf(UtilTestCastTarget::class, $result); + $this->assertEquals('hello', $result->a); + $this->assertEquals(42, $result->b); + $this->assertEquals([1, 2, 3], $result->c); + } + + /** Verify cast preserves null property values. */ + public function testCastWithNullProperty(): void { + $src = new UtilTestCastSource(); + $src->a = ''; + $src->b = 0; + $src->c = []; + $result = Util::cast($src, UtilTestCastTarget::class); + $this->assertInstanceOf(UtilTestCastTarget::class, $result); + $this->assertSame('', $result->a); + $this->assertSame(0, $result->b); + $this->assertSame([], $result->c); + } + + /** Verify cast works with stdClass input. */ + public function testCastStdClass(): void { + $obj = new \stdClass(); + $obj->a = 'foo'; + $obj->b = 99; + $result = Util::cast($obj, UtilTestCastTarget::class); + $this->assertInstanceOf(UtilTestCastTarget::class, $result); + $this->assertEquals('foo', $result->a); + $this->assertEquals(99, $result->b); + } + + /** Verify createPrefixedString returns correct format for multiple keys. */ + public function testCreatePrefixedStringBasic(): void { + $result = Util::createPrefixedString('hashlist', ['hashlist_id', 'name']); + $this->assertEquals('hashlist.hashlist_id AS hashlist_hashlist_id, hashlist.name AS hashlist_name', $result); + } + + /** Verify createPrefixedString handles a single key. */ + public function testCreatePrefixedStringSingleKey(): void { + $result = Util::createPrefixedString('t', ['id']); + $this->assertEquals('t.id AS t_id', $result); + } + + /** Verify createPrefixedString returns empty string for empty keys. */ + public function testCreatePrefixedStringEmptyKeys(): void { + $result = Util::createPrefixedString('t', []); + $this->assertEquals('', $result); + } + + /** Verify createPrefixedString handles table names with underscores. */ + public function testCreatePrefixedStringWithUnderscoreTable(): void { + $result = Util::createPrefixedString('my_table', ['col_a', 'col_b']); + $this->assertEquals('my_table.col_a AS my_table_col_a, my_table.col_b AS my_table_col_b', $result); + } +} From d9f9d3c0347587ed40a9e6ce2932328af3fe73a8 Mon Sep 17 00:00:00 2001 From: s3inlc Date: Mon, 22 Jun 2026 14:38:44 +0200 Subject: [PATCH 668/691] fixing value to be below limit in mysql --- ci/phpunit/dba/MassUpdateSetTest.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/ci/phpunit/dba/MassUpdateSetTest.php b/ci/phpunit/dba/MassUpdateSetTest.php index 7c06f62d1..06d54c041 100644 --- a/ci/phpunit/dba/MassUpdateSetTest.php +++ b/ci/phpunit/dba/MassUpdateSetTest.php @@ -101,7 +101,7 @@ public function testMassSingleUpdateIntValue(): void { $this->assertTrue($ht1 instanceof HashType); $updates = [ - new MassUpdateSet($ht1->getDescription(), 999), + new MassUpdateSet($ht1->getDescription(), 444), ]; $result = Factory::getHashTypeFactory()->massSingleUpdate( @@ -116,7 +116,7 @@ public function testMassSingleUpdateIntValue(): void { $this->assertCount(3, $results); foreach ($results as $ht) { if ($ht->getDescription() === $ht1->getDescription()) { - $this->assertEquals(999, $ht->getIsSalted()); + $this->assertEquals(444, $ht->getIsSalted()); } else { $this->assertEquals(0, $ht->getIsSalted()); From 0835a9baf5741d97008759ba84e4b71e1ea88c7a Mon Sep 17 00:00:00 2001 From: s3inlc Date: Mon, 22 Jun 2026 14:45:45 +0200 Subject: [PATCH 669/691] added tests for QueryFilter, QueryFilterNoCase and QueryFilterWithNull --- ci/phpunit/dba/QueryFilterNoCaseTest.php | 155 ++++++++++++++++ ci/phpunit/dba/QueryFilterTest.php | 205 +++++++++++++++++++++ ci/phpunit/dba/QueryFilterWithNullTest.php | 180 ++++++++++++++++++ 3 files changed, 540 insertions(+) create mode 100644 ci/phpunit/dba/QueryFilterNoCaseTest.php create mode 100644 ci/phpunit/dba/QueryFilterTest.php create mode 100644 ci/phpunit/dba/QueryFilterWithNullTest.php diff --git a/ci/phpunit/dba/QueryFilterNoCaseTest.php b/ci/phpunit/dba/QueryFilterNoCaseTest.php new file mode 100644 index 000000000..65c631777 --- /dev/null +++ b/ci/phpunit/dba/QueryFilterNoCaseTest.php @@ -0,0 +1,155 @@ +assertEquals( + '(LOWER(description) =? OR description=?)', + $filter->getQueryString(Factory::getHashTypeFactory()) + ); + } + + /** Verify table prefix wraps both column references. */ + public function testGetQueryStringWithTable(): void { + $filter = new QueryFilterNoCase(HashType::DESCRIPTION, 'test', '='); + $this->assertEquals( + '(LOWER(HashType.description) =? OR HashType.description=?)', + $filter->getQueryString(Factory::getHashTypeFactory(), true) + ); + } + + /** Verify null value with '=' produces 'col IS NULL'. */ + public function testGetQueryStringNullIsNull(): void { + $filter = new QueryFilterNoCase(HashType::DESCRIPTION, null, '='); + $this->assertEquals( + 'description IS NULL ', + $filter->getQueryString(Factory::getHashTypeFactory()) + ); + } + + /** Verify null value with '<>' produces 'col IS NOT NULL'. */ + public function testGetQueryStringNullIsNotNull(): void { + $filter = new QueryFilterNoCase(HashType::DESCRIPTION, null, '<>'); + $this->assertEquals( + 'description IS NOT NULL ', + $filter->getQueryString(Factory::getHashTypeFactory()) + ); + } + + /** Verify '>' operator produces '(LOWER(col) >? OR col>?)'. */ + public function testGetQueryStringGreaterThan(): void { + $filter = new QueryFilterNoCase(HashType::DESCRIPTION, 'test', '>'); + $this->assertEquals( + '(LOWER(description) >? OR description>?)', + $filter->getQueryString(Factory::getHashTypeFactory()) + ); + } + + /** Verify overrideFactory changes column resolution. */ + public function testGetQueryStringOverrideFactory(): void { + $filter = new QueryFilterNoCase(AccessGroup::GROUP_NAME, 'test', '=', Factory::getAccessGroupFactory()); + $this->assertEquals( + '(LOWER(groupName) =? OR groupName=?)', + $filter->getQueryString(Factory::getHashTypeFactory()) + ); + } + + /** Verify overrideFactory with table prefix uses the override's table name. */ + public function testGetQueryStringOverrideFactoryWithTable(): void { + $filter = new QueryFilterNoCase(AccessGroup::GROUP_NAME, 'test', '=', Factory::getAccessGroupFactory()); + $this->assertEquals( + '(LOWER(AccessGroup.groupName) =? OR AccessGroup.groupName=?)', + $filter->getQueryString(Factory::getHashTypeFactory(), true) + ); + } + + /** Verify getValue returns [value, value] for non-null input. */ + public function testGetValue(): void { + $filter = new QueryFilterNoCase(HashType::DESCRIPTION, 'hello', '='); + $this->assertSame(['hello', 'hello'], $filter->getValue()); + } + + /** Verify getValue returns null for null input. */ + public function testGetValueNull(): void { + $filter = new QueryFilterNoCase(HashType::DESCRIPTION, null, '='); + $this->assertNull($filter->getValue()); + } + + /** Verify getHasValue returns true for non-null value. */ + public function testGetHasValueTrue(): void { + $filter = new QueryFilterNoCase(HashType::DESCRIPTION, 'test', '='); + $this->assertTrue($filter->getHasValue()); + } + + /** Verify getHasValue returns false for null value. */ + public function testGetHasValueFalse(): void { + $filter = new QueryFilterNoCase(HashType::DESCRIPTION, null, '='); + $this->assertFalse($filter->getHasValue()); + } + + /** Verify mapped column resolves to 'htp_end' in both LOWER and bare form. */ + public function testGetQueryStringMappedColumn(): void { + $filter = new QueryFilterNoCase(HealthCheckAgent::END, 'test', '='); + $this->assertEquals( + '(LOWER(htp_end) =? OR htp_end=?)', + $filter->getQueryString(Factory::getHealthCheckAgentFactory()) + ); + } + + /** Verify mapped column with table prefix wraps 'HealthCheckAgent.htp_end'. */ + public function testGetQueryStringMappedColumnWithTable(): void { + $filter = new QueryFilterNoCase(HealthCheckAgent::END, 'test', '='); + $this->assertEquals( + '(LOWER(HealthCheckAgent.htp_end) =? OR HealthCheckAgent.htp_end=?)', + $filter->getQueryString(Factory::getHealthCheckAgentFactory(), true) + ); + } + + /** + * Create 2 hash types with mixed-case descriptions, filter with lowercase. + * Case-insensitive match should find both. + * + * @throws Exception + */ + public function testFilterCaseInsensitive(): void { + $testId = uniqid(); + $label1 = 'FOO_' . $testId; + $label2 = 'foo_' . $testId; + $label3 = 'bar_' . $testId; + $this->createDatabaseObject(Factory::getHashTypeFactory(), new HashType(null, $label1, 0, 0)); + $this->createDatabaseObject(Factory::getHashTypeFactory(), new HashType(null, $label2, 0, 0)); + $this->createDatabaseObject(Factory::getHashTypeFactory(), new HashType(null, $label3, 0, 0)); + + $qF = new QueryFilterNoCase(HashType::DESCRIPTION, 'foo_' . $testId, '='); + $results = Factory::getHashTypeFactory()->filter([Factory::FILTER => $qF]); + + $this->assertCount(2, $results); + } + + /** + * Filter with a value that matches no rows — expect 0 results. + * + * @throws Exception + */ + public function testFilterNoMatch(): void { + $testId = uniqid(); + $this->createDatabaseObject(Factory::getHashTypeFactory(), new HashType(null, 'match_' . $testId, 0, 0)); + $this->createDatabaseObject(Factory::getHashTypeFactory(), new HashType(null, 'other_' . $testId, 0, 0)); + + $qF = new QueryFilterNoCase(HashType::DESCRIPTION, 'nonexistent_' . $testId, '='); + $results = Factory::getHashTypeFactory()->filter([Factory::FILTER => $qF]); + + $this->assertCount(0, $results); + } +} diff --git a/ci/phpunit/dba/QueryFilterTest.php b/ci/phpunit/dba/QueryFilterTest.php new file mode 100644 index 000000000..46bc6ad72 --- /dev/null +++ b/ci/phpunit/dba/QueryFilterTest.php @@ -0,0 +1,205 @@ +assertEquals('isSalted=?', $filter->getQueryString(Factory::getHashTypeFactory())); + } + + /** Verify table prefix is prepended when includeTable is true. */ + public function testGetQueryStringWithTable(): void { + $filter = new QueryFilter(HashType::IS_SALTED, 5, '='); + $this->assertEquals( + 'HashType.isSalted=?', + $filter->getQueryString(Factory::getHashTypeFactory(), true) + ); + } + + /** Verify null value with '=' produces 'col IS NULL'. */ + public function testGetQueryStringNullIsNull(): void { + $filter = new QueryFilter(HashType::IS_SALTED, null, '='); + $this->assertEquals('isSalted IS NULL ', $filter->getQueryString(Factory::getHashTypeFactory())); + } + + /** Verify null value with '<>' produces 'col IS NOT NULL'. */ + public function testGetQueryStringNullIsNotNull(): void { + $filter = new QueryFilter(HashType::IS_SALTED, null, '<>'); + $this->assertEquals('isSalted IS NOT NULL ', $filter->getQueryString(Factory::getHashTypeFactory())); + } + + /** Verify '>' operator produces 'col>?'. */ + public function testGetQueryStringGreaterThan(): void { + $filter = new QueryFilter(HashType::IS_SALTED, 5, '>'); + $this->assertEquals('isSalted>?', $filter->getQueryString(Factory::getHashTypeFactory())); + } + + /** Verify '<>' operator with non-null value produces 'col<>?'. */ + public function testGetQueryStringNotEqual(): void { + $filter = new QueryFilter(HashType::IS_SALTED, 5, '<>'); + $this->assertEquals('isSalted<>?', $filter->getQueryString(Factory::getHashTypeFactory())); + } + + /** Verify overrideFactory resolves columns from override regardless of the passed factory. */ + public function testGetQueryStringOverrideFactory(): void { + $filter = new QueryFilter(AccessGroup::GROUP_NAME, 'test', '=', Factory::getAccessGroupFactory()); + $this->assertEquals( + 'groupName=?', + $filter->getQueryString(Factory::getHashTypeFactory()) + ); + } + + /** Verify overrideFactory with table prefix uses the override's table name. */ + public function testGetQueryStringOverrideFactoryWithTable(): void { + $filter = new QueryFilter(AccessGroup::GROUP_NAME, 'test', '=', Factory::getAccessGroupFactory()); + $this->assertEquals( + 'AccessGroup.groupName=?', + $filter->getQueryString(Factory::getHashTypeFactory(), true) + ); + } + + /** Verify getValue returns the constructor value for non-null input. */ + public function testGetValue(): void { + $filter = new QueryFilter(HashType::IS_SALTED, 42, '='); + $this->assertSame(42, $filter->getValue()); + } + + /** Verify getValue returns null for null input. */ + public function testGetValueNull(): void { + $filter = new QueryFilter(HashType::IS_SALTED, null, '='); + $this->assertNull($filter->getValue()); + } + + /** Verify getHasValue returns true for non-null value. */ + public function testGetHasValueTrue(): void { + $filter = new QueryFilter(HashType::IS_SALTED, 5, '='); + $this->assertTrue($filter->getHasValue()); + } + + /** Verify getHasValue returns false for null value. */ + public function testGetHasValueFalse(): void { + $filter = new QueryFilter(HashType::IS_SALTED, null, '='); + $this->assertFalse($filter->getHasValue()); + } + + /** Verify mapped column resolves to 'htp_end' without table prefix. */ + public function testGetQueryStringMappedColumn(): void { + $filter = new QueryFilter(HealthCheckAgent::END, 1, '='); + $this->assertEquals( + 'htp_end=?', + $filter->getQueryString(Factory::getHealthCheckAgentFactory()) + ); + } + + /** Verify mapped column with table prefix resolves to 'HealthCheckAgent.htp_end'. */ + public function testGetQueryStringMappedColumnWithTable(): void { + $filter = new QueryFilter(HealthCheckAgent::END, 1, '='); + $this->assertEquals( + 'HealthCheckAgent.htp_end=?', + $filter->getQueryString(Factory::getHealthCheckAgentFactory(), true) + ); + } + + /** + * Create 3 hash types, filter with '=' — expect 1 matching row. + * + * @throws Exception + */ + public function testFilterEquals(): void { + $testId = uniqid(); + $this->createDatabaseObject(Factory::getHashTypeFactory(), new HashType(null, 'ht1_' . $testId, 5, 0)); + $this->createDatabaseObject(Factory::getHashTypeFactory(), new HashType(null, 'ht2_' . $testId, 5, 0)); + $this->createDatabaseObject(Factory::getHashTypeFactory(), new HashType(null, 'ht3_' . $testId, 0, 0)); + + $lF = new LikeFilter(HashType::DESCRIPTION, '%' . $testId); + $qF = new QueryFilter(HashType::IS_SLOW_HASH, 0, '='); + $results = Factory::getHashTypeFactory()->filter([Factory::FILTER => [$lF, $qF]]); + + $this->assertCount(3, $results); + } + + /** + * Create 3 hash types, filter with '<>' (is_slow_hash != 0) — expect 2 rows. + * + * @throws Exception + */ + public function testFilterNotEqual(): void { + $testId = uniqid(); + $this->createDatabaseObject(Factory::getHashTypeFactory(), new HashType(null, 'ht1_' . $testId, 0, 1)); + $this->createDatabaseObject(Factory::getHashTypeFactory(), new HashType(null, 'ht2_' . $testId, 0, 5)); + $this->createDatabaseObject(Factory::getHashTypeFactory(), new HashType(null, 'ht3_' . $testId, 0, 0)); + + $lF = new LikeFilter(HashType::DESCRIPTION, '%' . $testId); + $qF = new QueryFilter(HashType::IS_SLOW_HASH, 0, '<>'); + $results = Factory::getHashTypeFactory()->filter([Factory::FILTER => [$lF, $qF]]); + + $this->assertCount(2, $results); + } + + /** + * Create 3 hash types, filter with '>' (isSalted > 3) — expect 2 rows. + * + * @throws Exception + */ + public function testFilterGreaterThan(): void { + $testId = uniqid(); + $this->createDatabaseObject(Factory::getHashTypeFactory(), new HashType(null, 'ht1_' . $testId, 5, 0)); + $this->createDatabaseObject(Factory::getHashTypeFactory(), new HashType(null, 'ht2_' . $testId, 10, 0)); + $this->createDatabaseObject(Factory::getHashTypeFactory(), new HashType(null, 'ht3_' . $testId, 1, 0)); + + $lF = new LikeFilter(HashType::DESCRIPTION, '%' . $testId); + $qF = new QueryFilter(HashType::IS_SALTED, 3, '>'); + $results = Factory::getHashTypeFactory()->filter([Factory::FILTER => [$lF, $qF]]); + + $this->assertCount(2, $results); + } + + /** + * Create 2 hash types, filter with '=' that matches none — expect 0 rows. + * + * @throws Exception + */ + public function testFilterNoMatch(): void { + $testId = uniqid(); + $this->createDatabaseObject(Factory::getHashTypeFactory(), new HashType(null, 'ht1_' . $testId, 5, 0)); + $this->createDatabaseObject(Factory::getHashTypeFactory(), new HashType(null, 'ht2_' . $testId, 10, 0)); + + $lF = new LikeFilter(HashType::DESCRIPTION, '%' . $testId); + $qF = new QueryFilter(HashType::IS_SALTED, 444, '='); + $results = Factory::getHashTypeFactory()->filter([Factory::FILTER => [$lF, $qF]]); + + $this->assertCount(0, $results); + } + + /** + * Use columnFilter with QueryFilter (isSalted > 3). + * Only IDs of the 2 matching rows should be returned. + * + * @throws Exception + */ + public function testFilterWithColumnFilter(): void { + $testId = uniqid(); + $ht1 = $this->createDatabaseObject(Factory::getHashTypeFactory(), new HashType(null, 'ht1_' . $testId, 10, 0)); + $ht2 = $this->createDatabaseObject(Factory::getHashTypeFactory(), new HashType(null, 'ht2_' . $testId, 1, 0)); + $ht3 = $this->createDatabaseObject(Factory::getHashTypeFactory(), new HashType(null, 'ht3_' . $testId, 7, 0)); + + $lF = new LikeFilter(HashType::DESCRIPTION, '%' . $testId); + $qF = new QueryFilter(HashType::IS_SALTED, 3, '>'); + $ids = Factory::getHashTypeFactory()->columnFilter( + [Factory::FILTER => [$lF, $qF]], HashType::HASH_TYPE_ID + ); + + $this->assertCount(2, $ids); + $this->assertEqualsCanonicalizing([$ht1->getId(), $ht3->getId()], $ids); + } +} diff --git a/ci/phpunit/dba/QueryFilterWithNullTest.php b/ci/phpunit/dba/QueryFilterWithNullTest.php new file mode 100644 index 000000000..418d9e848 --- /dev/null +++ b/ci/phpunit/dba/QueryFilterWithNullTest.php @@ -0,0 +1,180 @@ +assertEquals( + '(isSalted=? OR isSalted IS NULL)', + $filter->getQueryString(Factory::getHashTypeFactory()) + ); + } + + /** Verify basic '=' with matchNull=false produces '(col=? OR col IS NOT NULL)'. */ + public function testGetQueryStringMatchNullFalse(): void { + $filter = new QueryFilterWithNull(HashType::IS_SALTED, 5, '=', false); + $this->assertEquals( + '(isSalted=? OR isSalted IS NOT NULL)', + $filter->getQueryString(Factory::getHashTypeFactory()) + ); + } + + /** Verify '>' with matchNull=true produces '(col>? OR col IS NULL)'. */ + public function testGetQueryStringMatchNullTrueGreaterThan(): void { + $filter = new QueryFilterWithNull(HashType::IS_SALTED, 5, '>', true); + $this->assertEquals( + '(isSalted>? OR isSalted IS NULL)', + $filter->getQueryString(Factory::getHashTypeFactory()) + ); + } + + /** Verify table prefix wraps both column references. */ + public function testGetQueryStringWithTable(): void { + $filter = new QueryFilterWithNull(HashType::IS_SALTED, 5, '=', true); + $this->assertEquals( + '(HashType.isSalted=? OR HashType.isSalted IS NULL)', + $filter->getQueryString(Factory::getHashTypeFactory(), true) + ); + } + + /** Verify null value with '=' produces IS NULL regardless of matchNull. */ + public function testGetQueryStringNullValueIsNull(): void { + $filter = new QueryFilterWithNull(HashType::IS_SALTED, null, '=', true); + $this->assertEquals( + 'isSalted IS NULL ', + $filter->getQueryString(Factory::getHashTypeFactory()) + ); + } + + /** Verify null value with '<>' produces IS NOT NULL regardless of matchNull. */ + public function testGetQueryStringNullValueIsNotNull(): void { + $filter = new QueryFilterWithNull(HashType::IS_SALTED, null, '<>', false); + $this->assertEquals( + 'isSalted IS NOT NULL ', + $filter->getQueryString(Factory::getHashTypeFactory()) + ); + } + + /** Verify overrideFactory changes column resolution. */ + public function testGetQueryStringOverrideFactory(): void { + $filter = new QueryFilterWithNull( + AccessGroup::GROUP_NAME, 'test', '=', true, Factory::getAccessGroupFactory() + ); + $this->assertEquals( + '(groupName=? OR groupName IS NULL)', + $filter->getQueryString(Factory::getHashTypeFactory()) + ); + } + + /** Verify overrideFactory with table prefix uses the override's table name. */ + public function testGetQueryStringOverrideFactoryWithTable(): void { + $filter = new QueryFilterWithNull( + AccessGroup::GROUP_NAME, 'test', '=', true, Factory::getAccessGroupFactory() + ); + $this->assertEquals( + '(AccessGroup.groupName=? OR AccessGroup.groupName IS NULL)', + $filter->getQueryString(Factory::getHashTypeFactory(), true) + ); + } + + /** Verify getValue returns the constructor value for non-null input. */ + public function testGetValue(): void { + $filter = new QueryFilterWithNull(HashType::IS_SALTED, 42, '=', true); + $this->assertSame(42, $filter->getValue()); + } + + /** Verify getValue returns null for null input. */ + public function testGetValueNull(): void { + $filter = new QueryFilterWithNull(HashType::IS_SALTED, null, '=', true); + $this->assertNull($filter->getValue()); + } + + /** Verify getHasValue returns true for non-null value. */ + public function testGetHasValueTrue(): void { + $filter = new QueryFilterWithNull(HashType::IS_SALTED, 5, '=', true); + $this->assertTrue($filter->getHasValue()); + } + + /** Verify getHasValue returns false for null value. */ + public function testGetHasValueFalse(): void { + $filter = new QueryFilterWithNull(HashType::IS_SALTED, null, '=', true); + $this->assertFalse($filter->getHasValue()); + } + + /** Verify mapped column with matchNull=true resolves to '(htp_end=? OR htp_end IS NULL)'. */ + public function testGetQueryStringMappedColumnMatchNullTrue(): void { + $filter = new QueryFilterWithNull(HealthCheckAgent::END, 1, '=', true); + $this->assertEquals( + '(htp_end=? OR htp_end IS NULL)', + $filter->getQueryString(Factory::getHealthCheckAgentFactory()) + ); + } + + /** Verify mapped column with matchNull=false resolves to '(htp_end=? OR htp_end IS NOT NULL)'. */ + public function testGetQueryStringMappedColumnMatchNullFalse(): void { + $filter = new QueryFilterWithNull(HealthCheckAgent::END, 1, '=', false); + $this->assertEquals( + '(htp_end=? OR htp_end IS NOT NULL)', + $filter->getQueryString(Factory::getHealthCheckAgentFactory()) + ); + } + + /** Verify mapped column with table prefix uses 'HealthCheckAgent.htp_end'. */ + public function testGetQueryStringMappedColumnWithTable(): void { + $filter = new QueryFilterWithNull(HealthCheckAgent::END, 1, '=', true); + $this->assertEquals( + '(HealthCheckAgent.htp_end=? OR HealthCheckAgent.htp_end IS NULL)', + $filter->getQueryString(Factory::getHealthCheckAgentFactory(), true) + ); + } + + /** + * Create 3 hash types, filter with matchNull=false and '=' + * (col=? OR col IS NOT NULL). Since all rows have non-null isSalted, + * the expected-matching rows (isSalted=5) should be returned. + * + * @throws Exception + */ + public function testFilterMatchNullFalse(): void { + $testId = uniqid(); + $this->createDatabaseObject(Factory::getHashTypeFactory(), new HashType(null, 'ht1_' . $testId, 5, 0)); + $this->createDatabaseObject(Factory::getHashTypeFactory(), new HashType(null, 'ht2_' . $testId, 5, 0)); + $this->createDatabaseObject(Factory::getHashTypeFactory(), new HashType(null, 'ht3_' . $testId, 0, 0)); + + $lF = new LikeFilter(HashType::DESCRIPTION, '%' . $testId); + $qF = new QueryFilterWithNull(HashType::IS_SLOW_HASH, 0, '=', false); + $results = Factory::getHashTypeFactory()->filter([Factory::FILTER => [$lF, $qF]]); + + $this->assertCount(3, $results); + } + + /** + * Create 3 hash types, filter with matchNull=true and '>' + * (col>? OR col IS NULL). Since all rows have non-null isSalted, + * only the matching rows (isSalted > 3) should be returned. + * + * @throws Exception + */ + public function testFilterMatchNullTrueGreaterThan(): void { + $testId = uniqid(); + $this->createDatabaseObject(Factory::getHashTypeFactory(), new HashType(null, 'ht1_' . $testId, 10, 0)); + $this->createDatabaseObject(Factory::getHashTypeFactory(), new HashType(null, 'ht2_' . $testId, 1, 0)); + $this->createDatabaseObject(Factory::getHashTypeFactory(), new HashType(null, 'ht3_' . $testId, 7, 0)); + + $lF = new LikeFilter(HashType::DESCRIPTION, '%' . $testId); + $qF = new QueryFilterWithNull(HashType::IS_SALTED, 3, '>', true); + $results = Factory::getHashTypeFactory()->filter([Factory::FILTER => [$lF, $qF]]); + + $this->assertCount(2, $results); + } +} From 00ec799374bb51b382c9c960a992e5514eb4849e Mon Sep 17 00:00:00 2001 From: s3inlc Date: Mon, 22 Jun 2026 14:51:24 +0200 Subject: [PATCH 670/691] fixed numeric value issue correctly for mysql --- ci/phpunit/dba/MassUpdateSetTest.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/ci/phpunit/dba/MassUpdateSetTest.php b/ci/phpunit/dba/MassUpdateSetTest.php index 06d54c041..071c43442 100644 --- a/ci/phpunit/dba/MassUpdateSetTest.php +++ b/ci/phpunit/dba/MassUpdateSetTest.php @@ -101,7 +101,7 @@ public function testMassSingleUpdateIntValue(): void { $this->assertTrue($ht1 instanceof HashType); $updates = [ - new MassUpdateSet($ht1->getDescription(), 444), + new MassUpdateSet($ht1->getDescription(), 200), ]; $result = Factory::getHashTypeFactory()->massSingleUpdate( @@ -116,7 +116,7 @@ public function testMassSingleUpdateIntValue(): void { $this->assertCount(3, $results); foreach ($results as $ht) { if ($ht->getDescription() === $ht1->getDescription()) { - $this->assertEquals(444, $ht->getIsSalted()); + $this->assertEquals(200, $ht->getIsSalted()); } else { $this->assertEquals(0, $ht->getIsSalted()); From eb05373101a41ffbc48ad8563dac5e56fbb8711a Mon Sep 17 00:00:00 2001 From: s3inlc Date: Mon, 22 Jun 2026 14:57:13 +0200 Subject: [PATCH 671/691] fixed numeric value issue correctly for mysql (signed...) --- ci/phpunit/dba/AbstractModelFactoryTest.php | 169 +++++++++++++++++++- ci/phpunit/dba/MassUpdateSetTest.php | 53 +++++- 2 files changed, 218 insertions(+), 4 deletions(-) diff --git a/ci/phpunit/dba/AbstractModelFactoryTest.php b/ci/phpunit/dba/AbstractModelFactoryTest.php index 1da6df8c5..bc30d0124 100644 --- a/ci/phpunit/dba/AbstractModelFactoryTest.php +++ b/ci/phpunit/dba/AbstractModelFactoryTest.php @@ -19,6 +19,7 @@ use Hashtopolis\inc\defines\DHashlistFormat; use Hashtopolis\inc\utils\AccessUtils; use Hashtopolis\dba\models\User; +use Hashtopolis\inc\StartupConfig; require_once(dirname(__FILE__) . '/../TestBase.php'); @@ -570,8 +571,6 @@ public function testMulticolAggregationFilterSuccess(): void { $this->assertEquals(1, $results[$aggregations[1]->getName()]); } - // TODO: create tests for multicolAggregationFilter using JOINS - /** * Test receiving the column of a query. * @@ -1193,6 +1192,172 @@ public function testColumnFilter(): void { $this->assertSame([], $ids); } + /** + * Create a HashType, save it, delete it, verify it is gone. + * + * @throws Exception + */ + public function testDeleteSuccess(): void { + $hashType = $this->createDatabaseObject(Factory::getHashTypeFactory(), new HashType(null, 'delete_test_' . uniqid(), 0, 0)); + $this->assertNotNull($hashType->getId()); + + $result = Factory::getHashTypeFactory()->delete($hashType); + $this->assertTrue($result); + + $deleted = Factory::getHashTypeFactory()->getFromDB($hashType->getId()); + $this->assertNull($deleted); + } + + /** + * Pass a valid 6-element testProperties to getDB(true, ...). + * Without a real DB driver the connection fails and null is returned. + * + * @throws Exception + */ + public function testGetDBWithTestProperties(): void { + $properties = [ + 'user' => 'testuser', + 'pass' => 'testpass', + 'type' => 'mysql', + 'server' => 'localhost', + 'port' => '3306', + 'db' => 'testdb', + ]; + $db = Factory::getHashTypeFactory()->getDB(true, $properties); + $this->assertNull($db); + } + + /** + * Set an unknown DB type and call getDB(true) — should return null. + * + * @throws Exception + */ + public function testGetDBUnknownTypeReturnsNull(): void { + putenv('HASHTOPOLIS_DB_TYPE=sqlite'); + StartupConfig::getInstance(true); + $db = Factory::getHashTypeFactory()->getDB(true); + $this->assertNull($db); + } + + /** + * Use columnFilter with a JOIN to retrieve filenames scoped by group. + * + * @throws Exception + */ + public function testColumnFilterWithJoin(): void { + $testId = uniqid(); + + $accessGroup1 = $this->createDatabaseObject(Factory::getAccessGroupFactory(), new AccessGroup(null, 'ag1_' . $testId)); + $this->createDatabaseObject(Factory::getAccessGroupFactory(), new AccessGroup(null, 'ag2_' . $testId)); + + $this->createDatabaseObject(Factory::getFileFactory(), new File(null, 'file1_' . $testId, 1, 0, 0, $accessGroup1->getId(), 1)); + $this->createDatabaseObject(Factory::getFileFactory(), new File(null, 'file2_' . $testId, 2, 0, 0, $accessGroup1->getId(), 1)); + + $jF = new JoinFilter(Factory::getAccessGroupFactory(), File::ACCESS_GROUP_ID, AccessGroup::ACCESS_GROUP_ID); + $filenames = Factory::getFileFactory()->columnFilter( + [Factory::JOIN => $jF], File::FILENAME + ); + + $this->assertCount(2, $filenames); + foreach ($filenames as $name) { + $this->assertStringContainsString($testId, $name); + } + } + + /** + * multicolAggregationFilter combined with a JoinFilter. + * + * @throws Exception + */ + public function testMulticolAggregationWithJoin(): void { + $testId = uniqid(); + + $accessGroup1 = $this->createDatabaseObject(Factory::getAccessGroupFactory(), new AccessGroup(null, 'ag1_' . $testId)); + $this->createDatabaseObject(Factory::getAccessGroupFactory(), new AccessGroup(null, 'ag2_' . $testId)); + + $this->createDatabaseObject(Factory::getFileFactory(), new File(null, 'file1_' . $testId, 10, 0, 0, $accessGroup1->getId(), 1)); + $this->createDatabaseObject(Factory::getFileFactory(), new File(null, 'file2_' . $testId, 20, 0, 0, $accessGroup1->getId(), 1)); + + $jF = new JoinFilter(Factory::getAccessGroupFactory(), File::ACCESS_GROUP_ID, AccessGroup::ACCESS_GROUP_ID); + $aggregations = [ + new Aggregation(File::SIZE, 'MAX'), + new Aggregation(File::SIZE, 'MIN'), + ]; + + $results = Factory::getFileFactory()->multicolAggregationFilter( + [Factory::JOIN => $jF], $aggregations + ); + + $this->assertEquals(20, $results[$aggregations[0]->getName()]); + $this->assertEquals(10, $results[$aggregations[1]->getName()]); + } + + /** + * JoinFilter with overrideOwnFactory set to a non-null factory. + * The override resolves match1 through the override's model. + * + * @throws Exception + */ + public function testFilterWithJoinOverrideOwnFactory(): void { + $testId = uniqid(); + + $accessGroup = $this->createDatabaseObject(Factory::getAccessGroupFactory(), new AccessGroup(null, 'ag_' . $testId)); + $this->createDatabaseObject(Factory::getFileFactory(), new File(null, 'file_' . $testId, 1, 0, 0, $accessGroup->getId(), 1)); + + $qF = new QueryFilter(AccessGroup::GROUP_NAME, $accessGroup->getGroupName(), '=', Factory::getAccessGroupFactory()); + $jF = new JoinFilter( + Factory::getAccessGroupFactory(), + AccessGroup::ACCESS_GROUP_ID, + AccessGroup::ACCESS_GROUP_ID, + Factory::getAccessGroupFactory() + ); + $joined = Factory::getFileFactory()->filter([Factory::JOIN => $jF, Factory::FILTER => $qF]); + + $fileModelName = Factory::getFileFactory()->getModelName(); + $this->assertCount(1, $joined[$fileModelName]); + $this->assertEquals('file_' . $testId, $joined[$fileModelName][0]->getFilename()); + } + + /** + * JoinFilter with query filters applied as AND in the JOIN's ON clause. + * + * @throws Exception + */ + public function testFilterWithJoinQueryFilters(): void { + $testId = uniqid(); + + $accessGroup = $this->createDatabaseObject(Factory::getAccessGroupFactory(), new AccessGroup(null, 'ag_' . $testId)); + $this->createDatabaseObject(Factory::getFileFactory(), new File(null, 'file1_' . $testId, 1, 0, 0, $accessGroup->getId(), 1)); + $this->createDatabaseObject(Factory::getFileFactory(), new File(null, 'file2_' . $testId, 2, 0, 0, $accessGroup->getId(), 1)); + + $qF = new QueryFilter(AccessGroup::GROUP_NAME, $accessGroup->getGroupName(), '=', Factory::getAccessGroupFactory()); + $jF = new JoinFilter( + Factory::getAccessGroupFactory(), + File::ACCESS_GROUP_ID, + AccessGroup::ACCESS_GROUP_ID, + null, + JoinFilter::INNER, + [$qF] + ); + $joined = Factory::getFileFactory()->filter([Factory::JOIN => $jF]); + + $fileModelName = Factory::getFileFactory()->getModelName(); + $this->assertCount(2, $joined[$fileModelName]); + foreach ($joined[$fileModelName] as $file) { + $this->assertStringContainsString($testId, $file->getFilename()); + } + } + + /** + * Pass an invalid op string to minMaxFilter — it defaults to MAX. + * + * @throws Exception + */ + public function testMinMaxFilterWithInvalidOp(): void { + $result = Factory::getHealthCheckAgentFactory()->minMaxFilter([], HealthCheckAgent::END, 'INVALID'); + $this->assertEquals(0, $result ?? 0); + } + /** * @return array * @throws Exception diff --git a/ci/phpunit/dba/MassUpdateSetTest.php b/ci/phpunit/dba/MassUpdateSetTest.php index 071c43442..1a847b6b2 100644 --- a/ci/phpunit/dba/MassUpdateSetTest.php +++ b/ci/phpunit/dba/MassUpdateSetTest.php @@ -3,7 +3,12 @@ namespace Hashtopolis\dba; use Exception; +use Hashtopolis\dba\models\Agent; +use Hashtopolis\dba\models\CrackerBinary; +use Hashtopolis\dba\models\CrackerBinaryType; use Hashtopolis\dba\models\HashType; +use Hashtopolis\dba\models\HealthCheck; +use Hashtopolis\dba\models\HealthCheckAgent; use Hashtopolis\TestBase; require_once(dirname(__FILE__) . '/../TestBase.php'); @@ -101,7 +106,7 @@ public function testMassSingleUpdateIntValue(): void { $this->assertTrue($ht1 instanceof HashType); $updates = [ - new MassUpdateSet($ht1->getDescription(), 200), + new MassUpdateSet($ht1->getDescription(), 100), ]; $result = Factory::getHashTypeFactory()->massSingleUpdate( @@ -116,7 +121,7 @@ public function testMassSingleUpdateIntValue(): void { $this->assertCount(3, $results); foreach ($results as $ht) { if ($ht->getDescription() === $ht1->getDescription()) { - $this->assertEquals(200, $ht->getIsSalted()); + $this->assertEquals(100, $ht->getIsSalted()); } else { $this->assertEquals(0, $ht->getIsSalted()); @@ -135,4 +140,48 @@ public function testMassSingleUpdateEmptyReturnsNull(): void { ); $this->assertNull($result); } + + /** + * massSingleUpdate with a mapped update column (HealthCheckAgent::END → htp_end). + * Create 3 HealthCheckAgent rows, update 2, verify the changes. + * + * @throws Exception + */ + public function testMassSingleUpdateWithMappedColumn(): void { + $testId = uniqid(); + $prefix = 'hca_' . $testId; + $agent = $this->createDatabaseObject(Factory::getAgentFactory(), new Agent(null, '', '', 0, '', '', 0, 0, 0, '', '', 0, '', null, 0, '')); + $hashType = $this->createDatabaseObject(Factory::getHashTypeFactory(), new HashType(null, $prefix . '_ht', 0, 0)); + $cbt = $this->createDatabaseObject(Factory::getCrackerBinaryTypeFactory(), new CrackerBinaryType(null, '', 0)); + $cb = $this->createDatabaseObject(Factory::getCrackerBinaryFactory(), new CrackerBinary(null, $cbt->getId(), '', '', '')); + $healthCheck = $this->createDatabaseObject(Factory::getHealthCheckFactory(), new HealthCheck(null, 0, 0, 0, $hashType->getId(), $cb->getId(), 0, '')); + + $hca1 = $this->createDatabaseObject(Factory::getHealthCheckAgentFactory(), new HealthCheckAgent(null, $healthCheck->getId(), $agent->getId(), 0, 0, 0, 0, 100, '')); + $hca2 = $this->createDatabaseObject(Factory::getHealthCheckAgentFactory(), new HealthCheckAgent(null, $healthCheck->getId(), $agent->getId(), 0, 0, 0, 0, 200, '')); + $this->createDatabaseObject(Factory::getHealthCheckAgentFactory(), new HealthCheckAgent(null, $healthCheck->getId(), $agent->getId(), 0, 0, 0, 0, 300, '')); + + $this->assertTrue($hca1 instanceof HealthCheckAgent); + $this->assertTrue($hca2 instanceof HealthCheckAgent); + + $updates = [ + new MassUpdateSet($hca1->getId(), 999), + new MassUpdateSet($hca2->getId(), 888), + ]; + + $result = Factory::getHealthCheckAgentFactory()->massSingleUpdate( + HealthCheckAgent::HEALTH_CHECK_AGENT_ID, HealthCheckAgent::END, $updates + ); + + $this->assertTrue($result); + + $scope1 = new QueryFilter(HealthCheckAgent::HEALTH_CHECK_AGENT_ID, $hca1->getId(), '='); + $updated1 = Factory::getHealthCheckAgentFactory()->filter([Factory::FILTER => $scope1], true); + $this->assertInstanceOf(HealthCheckAgent::class, $updated1); + $this->assertEquals(999, $updated1->getEnd()); + + $scope2 = new QueryFilter(HealthCheckAgent::HEALTH_CHECK_AGENT_ID, $hca2->getId(), '='); + $updated2 = Factory::getHealthCheckAgentFactory()->filter([Factory::FILTER => $scope2], true); + $this->assertInstanceOf(HealthCheckAgent::class, $updated2); + $this->assertEquals(888, $updated2->getEnd()); + } } From f98dc2a5bf7c70a0d6c3f4ec880c9f621722740f Mon Sep 17 00:00:00 2001 From: jessevz Date: Mon, 22 Jun 2026 15:07:42 +0200 Subject: [PATCH 672/691] Replaced all instance off innerjoins to agents accessgorup with exist query to not retrieve duplicate objects anymore --- src/inc/apiv2/model/AgentAPI.php | 1 - src/inc/apiv2/model/AgentAssignmentAPI.php | 4 ++-- src/inc/apiv2/model/AgentErrorAPI.php | 7 +++++-- src/inc/apiv2/model/AgentStatAPI.php | 7 +++---- src/inc/apiv2/model/ChunkAPI.php | 6 ++++-- 5 files changed, 14 insertions(+), 11 deletions(-) diff --git a/src/inc/apiv2/model/AgentAPI.php b/src/inc/apiv2/model/AgentAPI.php index dfe48f5e5..e6b295926 100644 --- a/src/inc/apiv2/model/AgentAPI.php +++ b/src/inc/apiv2/model/AgentAPI.php @@ -16,7 +16,6 @@ use Hashtopolis\dba\models\AgentStat; use Hashtopolis\dba\models\Assignment; use Hashtopolis\dba\models\Chunk; -use Hashtopolis\dba\JoinFilter; use Hashtopolis\dba\QueryFilter; use Hashtopolis\dba\models\Task; use Hashtopolis\dba\models\User; diff --git a/src/inc/apiv2/model/AgentAssignmentAPI.php b/src/inc/apiv2/model/AgentAssignmentAPI.php index 24f1ab2a5..5ba6b21c4 100644 --- a/src/inc/apiv2/model/AgentAssignmentAPI.php +++ b/src/inc/apiv2/model/AgentAssignmentAPI.php @@ -6,6 +6,7 @@ use Hashtopolis\inc\utils\AgentUtils; use Hashtopolis\inc\utils\AssignmentUtils; use Hashtopolis\dba\models\AccessGroupAgent; +use Hashtopolis\dba\ExistsFilter; use Hashtopolis\dba\ContainFilter; use Hashtopolis\dba\Factory; use Hashtopolis\dba\models\Hashlist; @@ -48,13 +49,12 @@ protected function getFilterACL(): array { return [ Factory::JOIN => [ - new JoinFilter(Factory::getAccessGroupAgentFactory(), Assignment::AGENT_ID, AccessGroupAgent::AGENT_ID), new JoinFilter(Factory::getTaskFactory(), Assignment::TASK_ID, Task::TASK_ID), new JoinFilter(Factory::getTaskWrapperFactory(), Task::TASK_WRAPPER_ID, TaskWrapper::TASK_WRAPPER_ID, Factory::getTaskFactory()), new JoinFilter(Factory::getHashlistFactory(), TaskWrapper::HASHLIST_ID, Hashlist::HASHLIST_ID, Factory::getTaskWrapperFactory()), ], Factory::FILTER => [ - new ContainFilter(AccessGroupAgent::ACCESS_GROUP_ID, $accessGroups, Factory::getAccessGroupAgentFactory()), + new ExistsFilter(Factory::getAccessGroupAgentFactory(), AccessGroupAgent::AGENT_ID, Agent::AGENT_ID, [new ContainFilter(AccessGroupAgent::ACCESS_GROUP_ID, $accessGroups, Factory::getAccessGroupAgentFactory())]), new ContainFilter(Hashlist::ACCESS_GROUP_ID, $accessGroups, Factory::getHashlistFactory()), ] ]; diff --git a/src/inc/apiv2/model/AgentErrorAPI.php b/src/inc/apiv2/model/AgentErrorAPI.php index a9f941ec3..4a4155339 100644 --- a/src/inc/apiv2/model/AgentErrorAPI.php +++ b/src/inc/apiv2/model/AgentErrorAPI.php @@ -4,6 +4,7 @@ use Hashtopolis\inc\utils\AccessUtils; use Hashtopolis\dba\models\AccessGroupAgent; +use Hashtopolis\dba\models\Agent; use Hashtopolis\dba\ContainFilter; use Hashtopolis\dba\models\Hashlist; use Hashtopolis\dba\JoinFilter; @@ -15,6 +16,7 @@ use Hashtopolis\inc\apiv2\common\AbstractModelAPI; use Hashtopolis\inc\apiv2\error\HttpError; use Hashtopolis\inc\Util; +use Hashtopolis\dba\ExistsFilter; class AgentErrorAPI extends AbstractModelAPI { @@ -56,14 +58,15 @@ protected function getFilterACL(): array { return [ Factory::JOIN => [ - new JoinFilter(Factory::getAccessGroupAgentFactory(), AgentError::AGENT_ID, AccessGroupAgent::AGENT_ID), + // new JoinFilter(Factory::getAccessGroupAgentFactory(), AgentError::AGENT_ID, AccessGroupAgent::AGENT_ID), new JoinFilter(Factory::getTaskFactory(), AgentError::TASK_ID, Task::TASK_ID), new JoinFilter(Factory::getTaskWrapperFactory(), Task::TASK_WRAPPER_ID, TaskWrapper::TASK_WRAPPER_ID, Factory::getTaskFactory()), new JoinFilter(Factory::getHashlistFactory(), TaskWrapper::HASHLIST_ID, Hashlist::HASHLIST_ID, Factory::getTaskWrapperFactory()), ], Factory::FILTER => [ - new ContainFilter(AccessGroupAgent::ACCESS_GROUP_ID, $accessGroups, Factory::getAccessGroupAgentFactory()), + // new ContainFilter(AccessGroupAgent::ACCESS_GROUP_ID, $accessGroups, Factory::getAccessGroupAgentFactory()), new ContainFilter(Hashlist::ACCESS_GROUP_ID, $accessGroups, Factory::getHashlistFactory()), + new ExistsFilter(Factory::getAccessGroupAgentFactory(), AccessGroupAgent::AGENT_ID, Agent::AGENT_ID, [new ContainFilter(AccessGroupAgent::ACCESS_GROUP_ID, $accessGroups, Factory::getAccessGroupAgentFactory())]), ] ]; } diff --git a/src/inc/apiv2/model/AgentStatAPI.php b/src/inc/apiv2/model/AgentStatAPI.php index 44766b42b..f5c508c42 100644 --- a/src/inc/apiv2/model/AgentStatAPI.php +++ b/src/inc/apiv2/model/AgentStatAPI.php @@ -7,8 +7,10 @@ use Hashtopolis\dba\ContainFilter; use Hashtopolis\dba\Factory; +use Hashtopolis\dba\models\Agent; use Hashtopolis\dba\models\AgentStat; use Hashtopolis\dba\JoinFilter; +use Hashtopolis\dba\ExistsFilter; use Hashtopolis\dba\models\User; use Hashtopolis\inc\apiv2\common\AbstractModelAPI; use Hashtopolis\inc\apiv2\error\HttpError; @@ -40,11 +42,8 @@ protected function getFilterACL(): array { $accessGroups = Util::arrayOfIds(AccessUtils::getAccessGroupsOfUser($this->getCurrentUser())); return [ - Factory::JOIN => [ - new JoinFilter(Factory::getAccessGroupAgentFactory(), AgentStat::AGENT_ID, AccessGroupAgent::AGENT_ID), - ], Factory::FILTER => [ - new ContainFilter(AccessGroupAgent::ACCESS_GROUP_ID, $accessGroups, Factory::getAccessGroupAgentFactory()), + new ExistsFilter(Factory::getAccessGroupAgentFactory(), AccessGroupAgent::AGENT_ID, Agent::AGENT_ID, [new ContainFilter(AccessGroupAgent::ACCESS_GROUP_ID, $accessGroups, Factory::getAccessGroupAgentFactory())]), ] ]; } diff --git a/src/inc/apiv2/model/ChunkAPI.php b/src/inc/apiv2/model/ChunkAPI.php index 3d1c5b1f5..9d5337938 100644 --- a/src/inc/apiv2/model/ChunkAPI.php +++ b/src/inc/apiv2/model/ChunkAPI.php @@ -5,6 +5,7 @@ use Hashtopolis\inc\utils\AccessUtils; use Hashtopolis\dba\models\AccessGroupAgent; use Hashtopolis\dba\ContainFilter; +use Hashtopolis\dba\ExistsFilter; use Hashtopolis\dba\Factory; use Hashtopolis\dba\models\Agent; @@ -51,13 +52,14 @@ protected function getFilterACL(): array { return [ Factory::JOIN => [ - new JoinFilter(Factory::getAccessGroupAgentFactory(), Chunk::AGENT_ID, AccessGroupAgent::AGENT_ID), new JoinFilter(Factory::getTaskFactory(), Chunk::TASK_ID, Task::TASK_ID), new JoinFilter(Factory::getTaskWrapperFactory(), Task::TASK_WRAPPER_ID, TaskWrapper::TASK_WRAPPER_ID, Factory::getTaskFactory()), new JoinFilter(Factory::getHashlistFactory(), TaskWrapper::HASHLIST_ID, Hashlist::HASHLIST_ID, Factory::getTaskWrapperFactory()), ], Factory::FILTER => [ - new ContainFilter(AccessGroupAgent::ACCESS_GROUP_ID, $accessGroups, Factory::getAccessGroupAgentFactory()), + // Exists filter is needed because user and agent can match in multiple accessgroups, + // Making an inner join return too much elements, which would result in duplicate chunks being returned + new ExistsFilter(Factory::getAccessGroupAgentFactory(), AccessGroupAgent::AGENT_ID, Agent::AGENT_ID, [new ContainFilter(AccessGroupAgent::ACCESS_GROUP_ID, $accessGroups, Factory::getAccessGroupAgentFactory())]), new ContainFilter(Hashlist::ACCESS_GROUP_ID, $accessGroups, Factory::getHashlistFactory()), ] ]; From cd50141825c078d390b71d89cd34865cb6a164ce Mon Sep 17 00:00:00 2001 From: s3inlc Date: Mon, 22 Jun 2026 15:15:41 +0200 Subject: [PATCH 673/691] finished AbstractModelFactory tests --- ci/phpunit/dba/AbstractModelFactoryTest.php | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/ci/phpunit/dba/AbstractModelFactoryTest.php b/ci/phpunit/dba/AbstractModelFactoryTest.php index bc30d0124..132edc28f 100644 --- a/ci/phpunit/dba/AbstractModelFactoryTest.php +++ b/ci/phpunit/dba/AbstractModelFactoryTest.php @@ -1215,6 +1215,10 @@ public function testDeleteSuccess(): void { * @throws Exception */ public function testGetDBWithTestProperties(): void { + $ref = new \ReflectionProperty(AbstractModelFactory::class, 'dbh'); + $orig = $ref->getValue(null); + $ref->setValue(null, null); + $properties = [ 'user' => 'testuser', 'pass' => 'testpass', @@ -1225,6 +1229,8 @@ public function testGetDBWithTestProperties(): void { ]; $db = Factory::getHashTypeFactory()->getDB(true, $properties); $this->assertNull($db); + + $ref->setValue(null, $orig); } /** @@ -1233,10 +1239,16 @@ public function testGetDBWithTestProperties(): void { * @throws Exception */ public function testGetDBUnknownTypeReturnsNull(): void { + $ref = new \ReflectionProperty(AbstractModelFactory::class, 'dbh'); + $orig = $ref->getValue(null); + $ref->setValue(null, null); + putenv('HASHTOPOLIS_DB_TYPE=sqlite'); StartupConfig::getInstance(true); $db = Factory::getHashTypeFactory()->getDB(true); $this->assertNull($db); + + $ref->setValue(null, $orig); } /** From 194b5a64d65fb92cb893ffaf5d3402e8a28cbb5b Mon Sep 17 00:00:00 2001 From: s3inlc Date: Mon, 22 Jun 2026 15:39:18 +0200 Subject: [PATCH 674/691] updated failing tests to do not cause issues with mysql's different behavior on default sorting on left/right joins --- ci/phpunit/dba/JoinFilterTest.php | 34 ++++++++++++++++++++----------- 1 file changed, 22 insertions(+), 12 deletions(-) diff --git a/ci/phpunit/dba/JoinFilterTest.php b/ci/phpunit/dba/JoinFilterTest.php index 6df3c158d..8e2a365c8 100644 --- a/ci/phpunit/dba/JoinFilterTest.php +++ b/ci/phpunit/dba/JoinFilterTest.php @@ -252,12 +252,18 @@ public function testJoinLeft(): void { $qF = new LikeFilter(AccessGroup::GROUP_NAME, '%' . $testId . '%', Factory::getAccessGroupFactory()); $joined = Factory::getAccessGroupFactory()->filter([Factory::FILTER => $qF, Factory::JOIN => $jF]); - $this->assertCount(3, $joined[Factory::getAccessGroupFactory()->getModelName()]); - $this->assertCount(3, $joined[Factory::getFileFactory()->getModelName()]); - $this->assertEquals($ag1->getId(), $joined[Factory::getAccessGroupFactory()->getModelName()][0]->getId()); - $this->assertEquals($ag1->getId(), $joined[Factory::getAccessGroupFactory()->getModelName()][1]->getId()); - $this->assertEquals($ag2->getId(), $joined[Factory::getAccessGroupFactory()->getModelName()][2]->getId()); - $this->assertNull($joined[Factory::getFileFactory()->getModelName()][2]->getId()); + $agTable = Factory::getAccessGroupFactory()->getModelTable(); + $fileTable = Factory::getFileFactory()->getModelTable(); + + $this->assertCount(3, $joined[$agTable]); + $this->assertCount(3, $joined[$fileTable]); + $agIds = array_map(fn($ag) => $ag->getId(), $joined[$agTable]); + $this->assertContainsEquals($ag1->getId(), $agIds); + $this->assertContainsEquals($ag2->getId(), $agIds); + $this->assertEquals($ag1->getId(), $agIds[0]); + $this->assertEquals($ag1->getId(), $agIds[1]); + $nullFiles = array_filter($joined[$fileTable], fn($f) => $f->getId() === null); + $this->assertCount(1, $nullFiles); } /** @@ -278,11 +284,15 @@ public function testJoinRight(): void { $qF = new LikeFilter(AccessGroup::GROUP_NAME, '%' . $testId . '%', Factory::getAccessGroupFactory()); $joined = Factory::getFileFactory()->filter([Factory::FILTER => $qF, Factory::JOIN => $jF]); - $this->assertCount(3, $joined[Factory::getFileFactory()->getModelName()]); - $this->assertCount(3, $joined[Factory::getAccessGroupFactory()->getModelName()]); - $this->assertEquals($ag1->getId(), $joined[Factory::getAccessGroupFactory()->getModelName()][0]->getId()); - $this->assertEquals($ag1->getId(), $joined[Factory::getAccessGroupFactory()->getModelName()][1]->getId()); - $this->assertEquals($ag2->getId(), $joined[Factory::getAccessGroupFactory()->getModelName()][2]->getId()); - $this->assertNull($joined[Factory::getFileFactory()->getModelName()][2]->getId()); + $agTable = Factory::getAccessGroupFactory()->getModelTable(); + $fileTable = Factory::getFileFactory()->getModelTable(); + + $this->assertCount(3, $joined[$fileTable]); + $this->assertCount(3, $joined[$agTable]); + $agIds = array_map(fn($ag) => $ag->getId(), $joined[$agTable]); + $this->assertContainsEquals($ag1->getId(), $agIds); + $this->assertContainsEquals($ag2->getId(), $agIds); + $nullFiles = array_filter($joined[$fileTable], fn($f) => $f->getId() === null); + $this->assertCount(1, $nullFiles); } } From cfcf5781f9306eaf8493cc116ff8b2391c6c2898 Mon Sep 17 00:00:00 2001 From: jessevz Date: Mon, 22 Jun 2026 17:57:08 +0200 Subject: [PATCH 675/691] Fixed review suggestions --- src/inc/apiv2/model/AgentAssignmentAPI.php | 2 +- src/inc/apiv2/model/AgentErrorAPI.php | 4 +--- src/inc/apiv2/model/AgentStatAPI.php | 3 +-- src/inc/apiv2/model/ChunkAPI.php | 2 +- 4 files changed, 4 insertions(+), 7 deletions(-) diff --git a/src/inc/apiv2/model/AgentAssignmentAPI.php b/src/inc/apiv2/model/AgentAssignmentAPI.php index 5ba6b21c4..237455026 100644 --- a/src/inc/apiv2/model/AgentAssignmentAPI.php +++ b/src/inc/apiv2/model/AgentAssignmentAPI.php @@ -54,7 +54,7 @@ protected function getFilterACL(): array { new JoinFilter(Factory::getHashlistFactory(), TaskWrapper::HASHLIST_ID, Hashlist::HASHLIST_ID, Factory::getTaskWrapperFactory()), ], Factory::FILTER => [ - new ExistsFilter(Factory::getAccessGroupAgentFactory(), AccessGroupAgent::AGENT_ID, Agent::AGENT_ID, [new ContainFilter(AccessGroupAgent::ACCESS_GROUP_ID, $accessGroups, Factory::getAccessGroupAgentFactory())]), + new ExistsFilter(Factory::getAccessGroupAgentFactory(), AccessGroupAgent::AGENT_ID, Assignment::AGENT_ID, [new ContainFilter(AccessGroupAgent::ACCESS_GROUP_ID, $accessGroups, Factory::getAccessGroupAgentFactory())]), new ContainFilter(Hashlist::ACCESS_GROUP_ID, $accessGroups, Factory::getHashlistFactory()), ] ]; diff --git a/src/inc/apiv2/model/AgentErrorAPI.php b/src/inc/apiv2/model/AgentErrorAPI.php index 4a4155339..6ab9babbb 100644 --- a/src/inc/apiv2/model/AgentErrorAPI.php +++ b/src/inc/apiv2/model/AgentErrorAPI.php @@ -58,15 +58,13 @@ protected function getFilterACL(): array { return [ Factory::JOIN => [ - // new JoinFilter(Factory::getAccessGroupAgentFactory(), AgentError::AGENT_ID, AccessGroupAgent::AGENT_ID), new JoinFilter(Factory::getTaskFactory(), AgentError::TASK_ID, Task::TASK_ID), new JoinFilter(Factory::getTaskWrapperFactory(), Task::TASK_WRAPPER_ID, TaskWrapper::TASK_WRAPPER_ID, Factory::getTaskFactory()), new JoinFilter(Factory::getHashlistFactory(), TaskWrapper::HASHLIST_ID, Hashlist::HASHLIST_ID, Factory::getTaskWrapperFactory()), ], Factory::FILTER => [ - // new ContainFilter(AccessGroupAgent::ACCESS_GROUP_ID, $accessGroups, Factory::getAccessGroupAgentFactory()), new ContainFilter(Hashlist::ACCESS_GROUP_ID, $accessGroups, Factory::getHashlistFactory()), - new ExistsFilter(Factory::getAccessGroupAgentFactory(), AccessGroupAgent::AGENT_ID, Agent::AGENT_ID, [new ContainFilter(AccessGroupAgent::ACCESS_GROUP_ID, $accessGroups, Factory::getAccessGroupAgentFactory())]), + new ExistsFilter(Factory::getAccessGroupAgentFactory(), AccessGroupAgent::AGENT_ID, AgentError::AGENT_ID, [new ContainFilter(AccessGroupAgent::ACCESS_GROUP_ID, $accessGroups, Factory::getAccessGroupAgentFactory())]), ] ]; } diff --git a/src/inc/apiv2/model/AgentStatAPI.php b/src/inc/apiv2/model/AgentStatAPI.php index f5c508c42..1e2219956 100644 --- a/src/inc/apiv2/model/AgentStatAPI.php +++ b/src/inc/apiv2/model/AgentStatAPI.php @@ -9,7 +9,6 @@ use Hashtopolis\dba\models\Agent; use Hashtopolis\dba\models\AgentStat; -use Hashtopolis\dba\JoinFilter; use Hashtopolis\dba\ExistsFilter; use Hashtopolis\dba\models\User; use Hashtopolis\inc\apiv2\common\AbstractModelAPI; @@ -43,7 +42,7 @@ protected function getFilterACL(): array { return [ Factory::FILTER => [ - new ExistsFilter(Factory::getAccessGroupAgentFactory(), AccessGroupAgent::AGENT_ID, Agent::AGENT_ID, [new ContainFilter(AccessGroupAgent::ACCESS_GROUP_ID, $accessGroups, Factory::getAccessGroupAgentFactory())]), + new ExistsFilter(Factory::getAccessGroupAgentFactory(), AccessGroupAgent::AGENT_ID, AgentStat::AGENT_ID, [new ContainFilter(AccessGroupAgent::ACCESS_GROUP_ID, $accessGroups, Factory::getAccessGroupAgentFactory())]), ] ]; } diff --git a/src/inc/apiv2/model/ChunkAPI.php b/src/inc/apiv2/model/ChunkAPI.php index 9d5337938..47e1b7f31 100644 --- a/src/inc/apiv2/model/ChunkAPI.php +++ b/src/inc/apiv2/model/ChunkAPI.php @@ -59,7 +59,7 @@ protected function getFilterACL(): array { Factory::FILTER => [ // Exists filter is needed because user and agent can match in multiple accessgroups, // Making an inner join return too much elements, which would result in duplicate chunks being returned - new ExistsFilter(Factory::getAccessGroupAgentFactory(), AccessGroupAgent::AGENT_ID, Agent::AGENT_ID, [new ContainFilter(AccessGroupAgent::ACCESS_GROUP_ID, $accessGroups, Factory::getAccessGroupAgentFactory())]), + new ExistsFilter(Factory::getAccessGroupAgentFactory(), AccessGroupAgent::AGENT_ID, Chunk::AGENT_ID, [new ContainFilter(AccessGroupAgent::ACCESS_GROUP_ID, $accessGroups, Factory::getAccessGroupAgentFactory())]), new ContainFilter(Hashlist::ACCESS_GROUP_ID, $accessGroups, Factory::getHashlistFactory()), ] ]; From 0fc08335992759f65476cd2938a6efb5093efc3b Mon Sep 17 00:00:00 2001 From: jessevz Date: Tue, 23 Jun 2026 09:40:24 +0200 Subject: [PATCH 676/691] Fixed bug where chunks wont be returned if agentId is null --- src/dba/ExistsFilter.php | 7 +++++++ src/inc/apiv2/model/ChunkAPI.php | 4 ++-- 2 files changed, 9 insertions(+), 2 deletions(-) diff --git a/src/dba/ExistsFilter.php b/src/dba/ExistsFilter.php index eb4ca67e6..3d80267d6 100644 --- a/src/dba/ExistsFilter.php +++ b/src/dba/ExistsFilter.php @@ -7,6 +7,7 @@ class ExistsFilter extends Filter { private string $subqueryMatchKey; private string $outerMatchKey; private array $filters; + private ?QueryFilter $baseFilter; private bool $inverse; /** @@ -25,6 +26,7 @@ function __construct( string $subqueryMatchKey, string $outerMatchKey, array $filters = [], + ?QueryFilter $baseFilter = null, bool $inverse = false ) { /** @var Filter[] $filters */ @@ -32,6 +34,7 @@ function __construct( $this->subqueryMatchKey = $subqueryMatchKey; $this->outerMatchKey = $outerMatchKey; $this->filters = $filters; + $this->baseFilter = $baseFilter; $this->inverse = $inverse; } @@ -52,6 +55,10 @@ function getQueryString(AbstractModelFactory $factory, bool $includeTable = fals } $query .= ")"; + if ($this->baseFilter !== null) { + $query = "(" . $query . " OR " . $this->baseFilter->getQueryString($factory, true) . ")"; + } + return $query; } diff --git a/src/inc/apiv2/model/ChunkAPI.php b/src/inc/apiv2/model/ChunkAPI.php index 47e1b7f31..3d0fe2617 100644 --- a/src/inc/apiv2/model/ChunkAPI.php +++ b/src/inc/apiv2/model/ChunkAPI.php @@ -49,7 +49,7 @@ protected function getSingleACL(User $user, object $object): bool { protected function getFilterACL(): array { $accessGroups = Util::arrayOfIds(AccessUtils::getAccessGroupsOfUser($this->getCurrentUser())); - + $baseFilter = new QueryFilter(Chunk::AGENT_ID, null, "IS"); return [ Factory::JOIN => [ new JoinFilter(Factory::getTaskFactory(), Chunk::TASK_ID, Task::TASK_ID), @@ -59,7 +59,7 @@ protected function getFilterACL(): array { Factory::FILTER => [ // Exists filter is needed because user and agent can match in multiple accessgroups, // Making an inner join return too much elements, which would result in duplicate chunks being returned - new ExistsFilter(Factory::getAccessGroupAgentFactory(), AccessGroupAgent::AGENT_ID, Chunk::AGENT_ID, [new ContainFilter(AccessGroupAgent::ACCESS_GROUP_ID, $accessGroups, Factory::getAccessGroupAgentFactory())]), + new ExistsFilter(Factory::getAccessGroupAgentFactory(), AccessGroupAgent::AGENT_ID, Chunk::AGENT_ID, [new ContainFilter(AccessGroupAgent::ACCESS_GROUP_ID, $accessGroups, Factory::getAccessGroupAgentFactory())], $baseFilter), new ContainFilter(Hashlist::ACCESS_GROUP_ID, $accessGroups, Factory::getHashlistFactory()), ] ]; From fa8c0126f06c45cc909332420f37dd5908bf2951 Mon Sep 17 00:00:00 2001 From: jessevz Date: Tue, 23 Jun 2026 09:51:02 +0200 Subject: [PATCH 677/691] Changed to '=' operator to be consistent --- src/inc/apiv2/model/ChunkAPI.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/inc/apiv2/model/ChunkAPI.php b/src/inc/apiv2/model/ChunkAPI.php index 3d0fe2617..a4117eb5c 100644 --- a/src/inc/apiv2/model/ChunkAPI.php +++ b/src/inc/apiv2/model/ChunkAPI.php @@ -49,7 +49,7 @@ protected function getSingleACL(User $user, object $object): bool { protected function getFilterACL(): array { $accessGroups = Util::arrayOfIds(AccessUtils::getAccessGroupsOfUser($this->getCurrentUser())); - $baseFilter = new QueryFilter(Chunk::AGENT_ID, null, "IS"); + $baseFilter = new QueryFilter(Chunk::AGENT_ID, null, "="); return [ Factory::JOIN => [ new JoinFilter(Factory::getTaskFactory(), Chunk::TASK_ID, Task::TASK_ID), From 387ebe1a347e40f1b670fe00a526571f89f5f13e Mon Sep 17 00:00:00 2001 From: jessevz Date: Tue, 23 Jun 2026 10:50:47 +0200 Subject: [PATCH 678/691] Added importing exists filter which was forgotten --- src/dba/init.php | 1 + 1 file changed, 1 insertion(+) diff --git a/src/dba/init.php b/src/dba/init.php index af1360c22..47dceca91 100644 --- a/src/dba/init.php +++ b/src/dba/init.php @@ -3,6 +3,7 @@ require_once(dirname(__FILE__) . "/AbstractModel.php"); require_once(dirname(__FILE__) . "/AbstractModelFactory.php"); require_once(dirname(__FILE__) . "/Aggregation.php"); +require_once(dirname(__FILE__) . "/ExistFilter.php"); require_once(dirname(__FILE__) . "/Filter.php"); require_once(dirname(__FILE__) . "/Order.php"); require_once(dirname(__FILE__) . "/ConcatColumn.php"); From d361a62162d2f67623e3890d3c1c4d5c2609dede Mon Sep 17 00:00:00 2001 From: s3inlc Date: Tue, 23 Jun 2026 11:16:54 +0200 Subject: [PATCH 679/691] added tests for the ExistsFilter --- ci/phpunit/dba/ExistsFilterTest.php | 461 ++++++++++++++++++++++++++++ 1 file changed, 461 insertions(+) create mode 100644 ci/phpunit/dba/ExistsFilterTest.php diff --git a/ci/phpunit/dba/ExistsFilterTest.php b/ci/phpunit/dba/ExistsFilterTest.php new file mode 100644 index 000000000..f466ce968 --- /dev/null +++ b/ci/phpunit/dba/ExistsFilterTest.php @@ -0,0 +1,461 @@ +assertEquals( + 'EXISTS (SELECT 1 FROM File WHERE File.accessGroupId=AccessGroup.accessGroupId)', + $filter->getQueryString(Factory::getAccessGroupFactory()) + ); + } + + /** + * Verify NOT EXISTS is generated when inverse=true. + * Expected: NOT EXISTS (SELECT 1 FROM File WHERE File.accessGroupId=AccessGroup.accessGroupId) + */ + public function testNotExists(): void { + $filter = new ExistsFilter( + Factory::getFileFactory(), + File::ACCESS_GROUP_ID, + AccessGroup::ACCESS_GROUP_ID, + [], + null, + true + ); + $this->assertEquals( + 'NOT EXISTS (SELECT 1 FROM File WHERE File.accessGroupId=AccessGroup.accessGroupId)', + $filter->getQueryString(Factory::getAccessGroupFactory()) + ); + } + + /** + * Verify a single subquery filter is AND-ed into the WHERE clause. + * Expected: ... AND File.size>? + */ + public function testExistsWithSubqueryFilter(): void { + $subFilter = new QueryFilter(File::SIZE, 100, '>'); + $filter = new ExistsFilter( + Factory::getFileFactory(), + File::ACCESS_GROUP_ID, + AccessGroup::ACCESS_GROUP_ID, + [$subFilter] + ); + $this->assertEquals( + 'EXISTS (SELECT 1 FROM File WHERE File.accessGroupId=AccessGroup.accessGroupId AND File.size>?)', + $filter->getQueryString(Factory::getAccessGroupFactory()) + ); + } + + /** + * Verify multiple subquery filters are joined with AND. + * Expected: ... AND File.size>? AND File.isSecret=? + */ + public function testExistsWithMultipleSubqueryFilters(): void { + $subFilter1 = new QueryFilter(File::SIZE, 100, '>'); + $subFilter2 = new QueryFilter(File::IS_SECRET, 1, '='); + $filter = new ExistsFilter( + Factory::getFileFactory(), + File::ACCESS_GROUP_ID, + AccessGroup::ACCESS_GROUP_ID, + [$subFilter1, $subFilter2] + ); + $this->assertEquals( + 'EXISTS (SELECT 1 FROM File WHERE File.accessGroupId=AccessGroup.accessGroupId AND File.size>? AND File.isSecret=?)', + $filter->getQueryString(Factory::getAccessGroupFactory()) + ); + } + + /** + * Verify baseFilter wraps the EXISTS in an OR with a null-check. + * Expected: (EXISTS (...) OR AccessGroup.accessGroupId IS NULL ) + */ + public function testExistsWithBaseFilter(): void { + $baseFilter = new QueryFilter(AccessGroup::ACCESS_GROUP_ID, null, '='); + $filter = new ExistsFilter( + Factory::getFileFactory(), + File::ACCESS_GROUP_ID, + AccessGroup::ACCESS_GROUP_ID, + [], + $baseFilter + ); + $this->assertEquals( + '(EXISTS (SELECT 1 FROM File WHERE File.accessGroupId=AccessGroup.accessGroupId) OR AccessGroup.accessGroupId IS NULL )', + $filter->getQueryString(Factory::getAccessGroupFactory()) + ); + } + + /** + * Verify subquery filter and baseFilter are combined. + * Expected: (EXISTS (... AND File.size>?) OR AccessGroup.accessGroupId IS NULL ) + */ + public function testExistsWithSubqueryFilterAndBaseFilter(): void { + $subFilter = new QueryFilter(File::SIZE, 100, '>'); + $baseFilter = new QueryFilter(AccessGroup::ACCESS_GROUP_ID, null, '='); + $filter = new ExistsFilter( + Factory::getFileFactory(), + File::ACCESS_GROUP_ID, + AccessGroup::ACCESS_GROUP_ID, + [$subFilter], + $baseFilter + ); + $this->assertEquals( + '(EXISTS (SELECT 1 FROM File WHERE File.accessGroupId=AccessGroup.accessGroupId AND File.size>?) OR AccessGroup.accessGroupId IS NULL )', + $filter->getQueryString(Factory::getAccessGroupFactory()) + ); + } + + /** + * Verify the subquery uses the factory's mapped table name (htp_User). + * Expected: EXISTS (SELECT 1 FROM htp_User WHERE htp_User.userId=AccessGroupUser.userId) + */ + public function testExistsWithMappedTable(): void { + $filter = new ExistsFilter( + Factory::getUserFactory(), + User::USER_ID, + AccessGroupUser::USER_ID + ); + $this->assertEquals( + 'EXISTS (SELECT 1 FROM htp_User WHERE htp_User.userId=AccessGroupUser.userId)', + $filter->getQueryString(Factory::getAccessGroupUserFactory()) + ); + } + + // --- getValue unit tests --- + + /** + * getValue() returns an empty array when there are no sub-filters. + */ + public function testGetValueNoFilters(): void { + $filter = new ExistsFilter( + Factory::getFileFactory(), + File::ACCESS_GROUP_ID, + AccessGroup::ACCESS_GROUP_ID + ); + $this->assertSame([], $filter->getValue()); + } + + /** + * getValue() returns the sub-filter's parameter value. + */ + public function testGetValueWithQueryFilter(): void { + $subFilter = new QueryFilter(File::SIZE, 100, '>'); + $filter = new ExistsFilter( + Factory::getFileFactory(), + File::ACCESS_GROUP_ID, + AccessGroup::ACCESS_GROUP_ID, + [$subFilter] + ); + $this->assertSame([100], $filter->getValue()); + } + + /** + * getValue() flattens array values from a ContainFilter sub-filter. + */ + public function testGetValueWithContainFilter(): void { + $subFilter = new ContainFilter(File::ACCESS_GROUP_ID, [1, 2, 3]); + $filter = new ExistsFilter( + Factory::getFileFactory(), + File::ACCESS_GROUP_ID, + AccessGroup::ACCESS_GROUP_ID, + [$subFilter] + ); + $this->assertSame([1, 2, 3], $filter->getValue()); + } + + /** + * getValue() concatenates values from multiple sub-filters. + */ + public function testGetValueWithMultipleFilters(): void { + $subFilter1 = new QueryFilter(File::SIZE, 100, '>'); + $subFilter2 = new QueryFilter(File::IS_SECRET, 1, '='); + $filter = new ExistsFilter( + Factory::getFileFactory(), + File::ACCESS_GROUP_ID, + AccessGroup::ACCESS_GROUP_ID, + [$subFilter1, $subFilter2] + ); + $this->assertSame([100, 1], $filter->getValue()); + } + + /** + * getValue() skips sub-filters whose getHasValue() is false (e.g. null-value filters). + */ + public function testGetValueSkipsValuelessFilters(): void { + $subFilter1 = new QueryFilter(File::SIZE, 100, '>'); + $subFilter2 = new QueryFilter(File::IS_SECRET, null, '='); + $filter = new ExistsFilter( + Factory::getFileFactory(), + File::ACCESS_GROUP_ID, + AccessGroup::ACCESS_GROUP_ID, + [$subFilter1, $subFilter2] + ); + $this->assertSame([100], $filter->getValue()); + } + + /** + * getHasValue() returns false when there are no sub-filters. + */ + public function testGetHasValueNoFilters(): void { + $filter = new ExistsFilter( + Factory::getFileFactory(), + File::ACCESS_GROUP_ID, + AccessGroup::ACCESS_GROUP_ID + ); + $this->assertFalse($filter->getHasValue()); + } + + /** + * getHasValue() returns true when a sub-filter has a value. + */ + public function testGetHasValueTrue(): void { + $subFilter = new QueryFilter(File::SIZE, 100, '>'); + $filter = new ExistsFilter( + Factory::getFileFactory(), + File::ACCESS_GROUP_ID, + AccessGroup::ACCESS_GROUP_ID, + [$subFilter] + ); + $this->assertTrue($filter->getHasValue()); + } + + /** + * getHasValue() returns false when all sub-filters are valueless. + */ + public function testGetHasValueWithOnlyValuelessFilters(): void { + $subFilter = new QueryFilter(File::IS_SECRET, null, '='); + $filter = new ExistsFilter( + Factory::getFileFactory(), + File::ACCESS_GROUP_ID, + AccessGroup::ACCESS_GROUP_ID, + [$subFilter] + ); + $this->assertFalse($filter->getHasValue()); + } + + /** + * Integration test: filter AccessGroups by existence of a File, verifying partial joins. + * Only ag1 (which has a File) should match. + * + * @throws Exception + */ + public function testExistsFilterIntegration(): void { + $testId = uniqid(); + $ag1 = $this->createAccessGroup('ag1_' . $testId); + $this->createAccessGroup('ag2_' . $testId); + $this->createFile($ag1, 0, 'file_' . $testId, 10); + + $existsFilter = new ExistsFilter( + Factory::getFileFactory(), + File::ACCESS_GROUP_ID, + AccessGroup::ACCESS_GROUP_ID + ); + $qF = new LikeFilter(AccessGroup::GROUP_NAME, '%' . $testId . '%', Factory::getAccessGroupFactory()); + $result = Factory::getAccessGroupFactory()->filter([Factory::FILTER => [$qF, $existsFilter]]); + + $this->assertCount(1, $result); + $this->assertEquals($ag1->getId(), $result[0]->getId()); + } + + /** + * Integration test: NOT EXISTS filter returns AccessGroups without any File. + * ag1 has a file, ag2 has none. Only ag2 should match. + * + * @throws Exception + */ + public function testNotExistsFilterIntegration(): void { + $testId = uniqid(); + $ag1 = $this->createAccessGroup('ag1_' . $testId); + $ag2 = $this->createAccessGroup('ag2_' . $testId); + $this->createFile($ag1, 0, 'file_' . $testId, 10); + + $notExists = new ExistsFilter( + Factory::getFileFactory(), + File::ACCESS_GROUP_ID, + AccessGroup::ACCESS_GROUP_ID, + [], + null, + true + ); + $qF = new LikeFilter(AccessGroup::GROUP_NAME, '%' . $testId . '%', Factory::getAccessGroupFactory()); + $result = Factory::getAccessGroupFactory()->filter([Factory::FILTER => [$qF, $notExists]]); + + $this->assertCount(1, $result); + $this->assertEquals($ag2->getId(), $result[0]->getId()); + } + + /** + * Integration test: EXISTS with a sub-filter on File.size. + * ag1 has a 10-byte file, ag2 has a 100-byte file. Filter for size > 50 should match ag2 only. + * + * @throws Exception + */ + public function testExistsFilterWithSubFilterIntegration(): void { + $testId = uniqid(); + $ag1 = $this->createAccessGroup('ag1_' . $testId); + $ag2 = $this->createAccessGroup('ag2_' . $testId); + $this->createFile($ag1, 0, 'small_' . $testId, 10); + $this->createFile($ag2, 0, 'large_' . $testId, 100); + + $existsFilter = new ExistsFilter( + Factory::getFileFactory(), + File::ACCESS_GROUP_ID, + AccessGroup::ACCESS_GROUP_ID, + [new QueryFilter(File::SIZE, 50, '>')] + ); + $qF = new LikeFilter(AccessGroup::GROUP_NAME, '%' . $testId . '%', Factory::getAccessGroupFactory()); + $result = Factory::getAccessGroupFactory()->filter([Factory::FILTER => [$qF, $existsFilter]]); + + $this->assertCount(1, $result); + $this->assertEquals($ag2->getId(), $result[0]->getId()); + } + + /** + * Integration test: EXISTS with multiple sub-filters (size AND isSecret). + * ag1 has file(size=10, non-secret), ag2 has file(size=100, secret). + * Filter for size > 50 AND isSecret = 1 should match ag2 only. + * + * @throws Exception + */ + public function testExistsFilterMultipleCriterionIntegration(): void { + $testId = uniqid(); + $ag1 = $this->createAccessGroup('ag1_' . $testId); + $ag2 = $this->createAccessGroup('ag2_' . $testId); + $this->createFile($ag1, 0, 'small_' . $testId, 10); + $this->createFile($ag2, 1, 'large_' . $testId, 100); + + $existsFilter = new ExistsFilter( + Factory::getFileFactory(), + File::ACCESS_GROUP_ID, + AccessGroup::ACCESS_GROUP_ID, + [new QueryFilter(File::SIZE, 50, '>'), new QueryFilter(File::IS_SECRET, 1, '=')] + ); + $qF = new LikeFilter(AccessGroup::GROUP_NAME, '%' . $testId . '%', Factory::getAccessGroupFactory()); + $result = Factory::getAccessGroupFactory()->filter([Factory::FILTER => [$qF, $existsFilter]]); + + $this->assertCount(1, $result); + $this->assertEquals($ag2->getId(), $result[0]->getId()); + } + + /** + * Integration test: EXISTS returns empty when no child records exist. + * Two AccessGroups, no Files at all. Should return no groups. + * + * @throws Exception + */ + public function testExistsFilterEmptyResult(): void { + $testId = uniqid(); + $this->createAccessGroup('ag1_' . $testId); + $this->createAccessGroup('ag2_' . $testId); + + $existsFilter = new ExistsFilter( + Factory::getFileFactory(), + File::ACCESS_GROUP_ID, + AccessGroup::ACCESS_GROUP_ID + ); + $qF = new LikeFilter(AccessGroup::GROUP_NAME, '%' . $testId . '%', Factory::getAccessGroupFactory()); + $result = Factory::getAccessGroupFactory()->filter([Factory::FILTER => [$qF, $existsFilter]]); + + $this->assertCount(0, $result); + } + + /** + * Integration test: NOT EXISTS returns all rows when no child records exist. + * Two AccessGroups, no Files at all. Both should match. + * + * @throws Exception + */ + public function testNotExistsFilterReturnsAllWhenNoneHaveFiles(): void { + $testId = uniqid(); + $this->createAccessGroup('ag1_' . $testId); + $this->createAccessGroup('ag2_' . $testId); + + $notExists = new ExistsFilter( + Factory::getFileFactory(), + File::ACCESS_GROUP_ID, + AccessGroup::ACCESS_GROUP_ID, + [], + null, + true + ); + $qF = new LikeFilter(AccessGroup::GROUP_NAME, '%' . $testId . '%', Factory::getAccessGroupFactory()); + $result = Factory::getAccessGroupFactory()->filter([Factory::FILTER => [$qF, $notExists]]); + + $this->assertCount(2, $result); + } + + /** + * Integration test: EXISTS across User -> AccessGroupUser constrained to a specific group. + * createUser() automatically adds every user to the default access group, + * so the EXISTS subquery must also filter by the test group's accessGroupId + * to correctly distinguish the linked user from the unlinked one. + * + * @throws Exception + */ + public function testExistsFilterUserBelongsToGroup(): void { + $testId = uniqid(); + $user1 = $this->createUser('u1_' . $testId); + $this->createUser('u2_' . $testId); + $group = $this->createAccessGroup('ag_' . $testId); + $this->createAccessGroupUser($user1, $group); + + $existsFilter = new ExistsFilter( + Factory::getAccessGroupUserFactory(), + AccessGroupUser::USER_ID, + User::USER_ID, + [new QueryFilter(AccessGroupUser::ACCESS_GROUP_ID, $group->getId(), '=')] + ); + $qF = new LikeFilter(User::USERNAME, '%' . $testId . '%', Factory::getUserFactory()); + $result = Factory::getUserFactory()->filter([Factory::FILTER => [$qF, $existsFilter]]); + + $this->assertCount(1, $result); + $this->assertEquals($user1->getId(), $result[0]->getId()); + } + + /** + * Integration test: NOT EXISTS across User -> AccessGroupUser constrained to a specific group. + * createUser() adds every user to the default access group, so we constrain + * the NOT EXISTS subquery to the test group to find the unlinked user. + * + * @throws Exception + */ + public function testNotExistsFilterUserWithoutGroup(): void { + $testId = uniqid(); + $user1 = $this->createUser('u1_' . $testId); + $user2 = $this->createUser('u2_' . $testId); + $group = $this->createAccessGroup('ag_' . $testId); + $this->createAccessGroupUser($user1, $group); + + $notExists = new ExistsFilter( + Factory::getAccessGroupUserFactory(), + AccessGroupUser::USER_ID, + User::USER_ID, + [new QueryFilter(AccessGroupUser::ACCESS_GROUP_ID, $group->getId(), '=')], + null, + true + ); + $qF = new LikeFilter(User::USERNAME, '%' . $testId . '%', Factory::getUserFactory()); + $result = Factory::getUserFactory()->filter([Factory::FILTER => [$qF, $notExists]]); + + $this->assertCount(1, $result); + $this->assertEquals($user2->getId(), $result[0]->getId()); + } +} From d30233573af345b335a2942de34c3d25e42dae02 Mon Sep 17 00:00:00 2001 From: Eric Wasson <229096365+Eric-Wasson@users.noreply.github.com> Date: Tue, 23 Jun 2026 11:37:33 +0200 Subject: [PATCH 680/691] Added test for pagination bug --- ci/apiv2/test_pagination.py | 16 +++++++++++++++- 1 file changed, 15 insertions(+), 1 deletion(-) diff --git a/ci/apiv2/test_pagination.py b/ci/apiv2/test_pagination.py index dd0b794cc..323c4ae24 100644 --- a/ci/apiv2/test_pagination.py +++ b/ci/apiv2/test_pagination.py @@ -1,4 +1,4 @@ -from hashtopolis import HashType +from hashtopolis import Hashlist, HashType from utils import BaseTest import json from base64 import b64encode @@ -22,8 +22,22 @@ def pagination_test_helper(self, after, size): self.assertEqual(objs, all_objs[index:index+size]) pass + def pagination_with_ordering_helper(self): + hashlist1 = self.create_hashlist() + hashlist2 = self.create_hashlist() + + after_dict = {"primary": {"cracked": 0}, "secondary": {"hashlistId": hashlist1.id}} + after_param = b64encode(json.dumps(after_dict).encode('utf-8')).decode('utf-8') + + objs = Hashlist.objects.paginate(size=1, after=after_param).filter(format__nin=3).order_by('cracked').get_pagination() + self.assertEqual(objs[0].id, hashlist2.id) + + pass + def test_get_page(self): # TODO test can be randomised to get more coverage self.pagination_test_helper(1200, 25) self.pagination_test_helper(2500, 50) self.pagination_test_helper(20, 10) + + self.pagination_with_ordering_helper() From 074924432b83e5aa45a0db8ab203627ce53ce87d Mon Sep 17 00:00:00 2001 From: s3inlc Date: Tue, 23 Jun 2026 12:29:14 +0200 Subject: [PATCH 681/691] completed test for Util.php class, some may drop out on refactoring later again --- ci/phpunit/inc/UtilTest.php | 825 ++++++++++++++++++++++++++++++++++-- 1 file changed, 789 insertions(+), 36 deletions(-) diff --git a/ci/phpunit/inc/UtilTest.php b/ci/phpunit/inc/UtilTest.php index 1337ead28..401fe481f 100644 --- a/ci/phpunit/inc/UtilTest.php +++ b/ci/phpunit/inc/UtilTest.php @@ -2,49 +2,802 @@ namespace Hashtopolis\inc; -use PHPUnit\Framework\TestCase; +use Exception; +use Hashtopolis\dba\Factory; +use Hashtopolis\dba\models\StoredValue; +use Hashtopolis\TestBase; require_once(dirname(__FILE__) . '/../TestBase.php'); -final class UtilTest extends TestCase { - public function testIsMailConfiguredReturnsFalseWithoutSsmtpConfig(): void { - \hashtopolis_set_test_mock('Hashtopolis\\inc\\is_file', static function ($path): bool { - return false; - }); - - try { - $this->assertFalse(Util::isMailConfigured()); - } - finally { - \hashtopolis_clear_test_mocks(['Hashtopolis\\inc\\is_file']); - } +final class UtilTest extends TestBase { + /** + * extractFileExtension returns empty string when no dot is present. + */ + public function testExtractFileExtensionNoExtension(): void { + $this->assertEquals("", Util::extractFileExtension("filename")); } - public function testIsMailConfiguredReturnsTrueWithSsmtpConfig(): void { - \hashtopolis_set_test_mock('Hashtopolis\\inc\\is_file', static function ($path): bool { - return true; - }); - - try { - $this->assertTrue(Util::isMailConfigured()); - } - finally { - \hashtopolis_clear_test_mocks(['Hashtopolis\\inc\\is_file']); - } + /** + * extractFileExtension returns the substring after the last dot. + */ + public function testExtractFileExtensionSimple(): void { + $this->assertEquals("txt", Util::extractFileExtension("file.txt")); } - public function testSendMailReturnsFalseWhenMailIsNotConfigured(): void { - $loggedMessage = null; - \hashtopolis_set_test_mock('Hashtopolis\\inc\\is_file', static function ($path): bool { - return false; - }); - - try { - $this->assertFalse(Util::sendMail('user@example.com', 'subject', '

    body

    ', 'body')); - } - finally { - \hashtopolis_clear_test_mocks(['Hashtopolis\\inc\\is_file']); + /** + * extractFileExtension handles multiple dots (returns last segment). + */ + public function testExtractFileExtensionMultipleDots(): void { + $this->assertEquals("gz", Util::extractFileExtension("archive.tar.gz")); + } + + /** + * extractFileExtension returns the full name after the dot for hidden files. + */ + public function testExtractFileExtensionHiddenFile(): void { + $this->assertEquals("htaccess", Util::extractFileExtension(".htaccess")); + } + + /** + * extractFileExtension returns empty string for empty input. + */ + public function testExtractFileExtensionEmpty(): void { + $this->assertEquals("", Util::extractFileExtension("")); + } + + /** + * texEscape leaves normal text unchanged. + */ + public function testTexEscapeNormalText(): void { + $this->assertEquals("hello world", Util::texEscape("hello world")); + } + + /** + * texEscape escapes hash characters. + */ + public function testTexEscapeHash(): void { + $this->assertEquals("\\#", Util::texEscape("#")); + } + + /** + * texEscape escapes backslashes. + */ + public function testTexEscapeBackslash(): void { + $this->assertEquals("\\textbackslash", Util::texEscape("\\")); + } + + /** + * texEscape escapes underscores. + */ + public function testTexEscapeUnderscore(): void { + $this->assertEquals("\\_", Util::texEscape("_")); + } + + /** + * texEscape handles mixed special characters. + */ + public function testTexEscapeMixed(): void { + $this->assertEquals("\\_\\#\\textbackslash", Util::texEscape("_#\\")); + } + + /** + * texEscape returns empty string for empty input. + */ + public function testTexEscapeEmpty(): void { + $this->assertEquals("", Util::texEscape("")); + } + + /** + * bintohex converts binary string to hex pairs. + */ + public function testBintohex(): void { + $this->assertEquals("48656c6c6f", Util::bintohex("Hello")); + } + + /** + * bintohex returns empty string for empty input. + */ + public function testBintohexEmpty(): void { + $this->assertEquals("", Util::bintohex("")); + } + + /** + * bintohex zero-pads single-digit hex values. + */ + public function testBintohexZeroPad(): void { + $this->assertEquals("00ff", Util::bintohex("\x00\xff")); + } + + /** + * tickdone returns empty string when progress is less than total. + */ + public function testTickdoneIncomplete(): void { + $this->assertEquals("", Util::tickdone(5, 10)); + } + + /** + * tickdone returns check span when progress equals total. + */ + public function testTickdoneComplete(): void { + $this->assertEquals(' ', Util::tickdone(10, 10)); + } + + /** + * tickdone returns check span when progress exceeds total. + */ + public function testTickdoneOverflow(): void { + $this->assertEquals(' ', Util::tickdone(15, 10)); + } + + /** + * tickdone returns empty string when total is zero (avoid division by zero). + */ + public function testTickdoneZeroTotal(): void { + $this->assertEquals("", Util::tickdone(0, 0)); + } + + /** + * sectotime formats zero seconds. + */ + public function testSectotimeZero(): void { + $this->assertEquals("00:00:00", Util::sectotime(0)); + } + + /** + * sectotime formats less than one day. + */ + public function testSectotimeLessThanDay(): void { + $this->assertEquals("12:34:56", Util::sectotime(12 * 3600 + 34 * 60 + 56)); + } + + /** + * sectotime formats exactly one day (condition uses > 86400, so 86401 triggers it). + */ + public function testSectotimeJustOverOneDay(): void { + $this->assertEquals("1d 00:00:01", Util::sectotime(86401)); + } + + /** + * sectotime formats more than one day. + */ + public function testSectotimeMultipleDays(): void { + $this->assertEquals("3d 05:30:00", Util::sectotime(3 * 86400 + 5 * 3600 + 1800)); + } + + /** + * escapeSpecial escapes double quotes to HTML entity (htmlentities converts " to " first). + */ + public function testEscapeSpecialDoubleQuote(): void { + $this->assertStringContainsString(""", Util::escapeSpecial('"')); + } + + /** + * escapeSpecial escapes single quotes to HTML entity (htmlentities converts ' to ' first). + */ + public function testEscapeSpecialSingleQuote(): void { + $this->assertStringContainsString("'", Util::escapeSpecial("'")); + } + + /** + * escapeSpecial escapes backticks to HTML entity. + */ + public function testEscapeSpecialBacktick(): void { + $this->assertStringContainsString("`", Util::escapeSpecial("`")); + } + + /** + * escapeSpecial returns htmlentities for normal text. + */ + public function testEscapeSpecialNormal(): void { + $this->assertEquals("a & b", Util::escapeSpecial("a & b")); + } + + /** + * nicenum returns 0.00 with default scale (always rounded to 2 decimals). + */ + public function testNicenumZero(): void { + $this->assertEquals("0.00 ", Util::nicenum(0)); + } + + /** + * nicenum stays in base unit below threshold (condition uses >, not >=). + */ + public function testNicenumBelowThreshold(): void { + $this->assertEquals("1023.00 ", Util::nicenum(1023)); + } + + /** + * nicenum stays in base unit at exact threshold because condition is > not >=. + */ + public function testNicenumAtThreshold(): void { + $this->assertEquals("1024.00 ", Util::nicenum(1024)); + } + + /** + * nicenum switches to k above threshold. + */ + public function testNicenumK(): void { + $this->assertEquals("1.00 k", Util::nicenum(1025)); + } + + /** + * nicenum switches to M. + */ + public function testNicenumM(): void { + $this->assertEquals("1.00 M", Util::nicenum(1048576 + 1)); + } + + /** + * nicenum switches to G. + */ + public function testNicenumG(): void { + $this->assertEquals("1.00 G", Util::nicenum(1073741824 + 1)); + } + + /** + * nicenum uses optional threshold and divider (e.g., 1000-based). + */ + public function testNicenumCustomScale(): void { + $this->assertEquals("1.00 k", Util::nicenum(1001, 1000, 1000)); + } + + /** + * showperc returns 0.00 for zero total. + */ + public function testShowpercZeroTotal(): void { + $this->assertEquals("0.00", Util::showperc(0, 0)); + } + + /** + * showperc returns 100.00 for equal values. + */ + public function testShowpercFull(): void { + $this->assertEquals("100.00", Util::showperc(100, 100)); + } + + /** + * showperc clamps below 100% when part < total due to rounding. + */ + public function testShowpercClampHigh(): void { + $percent = Util::showperc(99, 100); + $this->assertNotEquals("100.00", $percent); + $this->assertEquals("99.00", $percent); + } + + /** + * showperc clamps above 0% when part > 0 due to rounding. + */ + public function testShowpercClampLow(): void { + $percent = Util::showperc(1, 10000); + $this->assertNotEquals("0.00", $percent); + $this->assertEquals("0.01", $percent); + } + + /** + * showperc handles normal values. + */ + public function testShowpercNormal(): void { + $this->assertEquals("50.00", Util::showperc(50, 100)); + } + + /** + * showperc uses custom decimal places. + */ + public function testShowpercCustomDecimals(): void { + $this->assertEquals("33.333", Util::showperc(1, 3, 3)); + } + + /** + * niceround rounds normally. + */ + public function testNiceroundNormal(): void { + $this->assertEquals("3.14", Util::niceround(3.14159, 2)); + } + + /** + * niceround with zero decimals rounds to integer. + */ + public function testNiceroundZeroDecimals(): void { + $this->assertEquals("3", Util::niceround(3.14159, 0)); + } + + /** + * niceround pads trailing zeros. + */ + public function testNiceroundPadZeros(): void { + $this->assertEquals("5.000", Util::niceround(5, 3)); + } + + /** + * niceround handles non-rounding values that still need padding. + */ + public function testNiceroundExactDecimal(): void { + $this->assertEquals("2.5", Util::niceround(2.5, 1)); + } + + /** + * shortenstring returns the full string if shorter than limit. + */ + public function testShortenstringShort(): void { + $this->assertEquals("hello", Util::shortenstring("hello", 10)); + } + + /** + * shortenstring truncates with ellipsis if longer than limit. + */ + public function testShortenstringLong(): void { + $result = Util::shortenstring("hello world this is long", 10); + $this->assertStringContainsString("...", $result); + $this->assertStringContainsString("assertEquals("hello", Util::shortenstring("hello", 5)); + } + + /** + * prefixNum pads with leading zeros. + */ + public function testPrefixNumPad(): void { + $this->assertEquals("005", Util::prefixNum(5, 3)); + } + + /** + * prefixNum does not pad when already at length. + */ + public function testPrefixNumExact(): void { + $this->assertEquals("100", Util::prefixNum(100, 3)); + } + + /** + * prefixNum does not truncate when longer than size. + */ + public function testPrefixNumLonger(): void { + $this->assertEquals("1000", Util::prefixNum(1000, 3)); + } + + /** + * prefixNum pads zero. + */ + public function testPrefixNumZero(): void { + $this->assertEquals("000", Util::prefixNum(0, 3)); + } + + /** + * strToHex converts a string to hex. + */ + public function testStrToHex(): void { + $this->assertEquals("48656c6c6f", Util::strToHex("Hello")); + } + + /** + * strToHex returns empty string for empty input. + */ + public function testStrToHexEmpty(): void { + $this->assertEquals("", Util::strToHex("")); + } + + /** + * hextobin converts hex back to binary string. + */ + public function testHextobin(): void { + $this->assertEquals("Hello", Util::hextobin("48656c6c6f")); + } + + /** + * hextobin handles odd-length hex strings by skipping the last character. + */ + public function testHextobinOddLength(): void { + $this->assertEquals("\x48\x65", Util::hextobin("4865l")); + } + + /** + * hextobin returns empty for empty input. + */ + public function testHextobinEmpty(): void { + $this->assertEquals("", Util::hextobin("")); + } + + /** + * startsWith returns true for an exact prefix match. + */ + public function testStartsWithExact(): void { + $this->assertTrue(Util::startsWith("hello world", "hello")); + } + + /** + * startsWith returns false when the pattern is not at the start. + */ + public function testStartsWithNoMatch(): void { + $this->assertFalse(Util::startsWith("hello world", "world")); + } + + /** + * startsWith returns true for an empty pattern. + */ + public function testStartsWithEmptyPattern(): void { + $this->assertTrue(Util::startsWith("hello", "")); + } + + /** + * startsWith is case-sensitive. + */ + public function testStartsWithCaseSensitive(): void { + $this->assertFalse(Util::startsWith("Hello", "hello")); + } + + /** + * endsWith returns true for an exact suffix match. + */ + public function testEndsWithExact(): void { + $this->assertTrue(Util::endsWith("hello world", "world")); + } + + /** + * endsWith returns false when the pattern is not at the end. + */ + public function testEndsWithNoMatch(): void { + $this->assertFalse(Util::endsWith("hello world", "hello")); + } + + /** + * endsWith returns true for an empty pattern. + */ + public function testEndsWithEmptyPattern(): void { + $this->assertTrue(Util::endsWith("hello", "")); + } + + /** + * endsWith is case-sensitive. + */ + public function testEndsWithCaseSensitive(): void { + $this->assertFalse(Util::endsWith("Hello", "hello")); + } + + /** + * getMinorVersion extracts major.minor from a full semver string. + */ + public function testGetMinorVersion(): void { + $this->assertEquals("1.2", Util::getMinorVersion("1.2.3")); + } + + /** + * getMinorVersion handles two-part versions. + */ + public function testGetMinorVersionTwoParts(): void { + $this->assertEquals("1.0", Util::getMinorVersion("1.0")); + } + + /** + * getMinorVersion handles larger numbers. + */ + public function testGetMinorVersionLarge(): void { + $this->assertEquals("10.20", Util::getMinorVersion("10.20.30")); + } + + /** + * randomString generates a string of the requested length. + */ + public function testRandomStringLength(): void { + $result = Util::randomString(15); + $this->assertEquals(15, strlen($result)); + } + + /** + * randomString generates characters only from the given charset. + */ + public function testRandomStringCharset(): void { + $charset = "ABC"; + $result = Util::randomString(100, $charset); + for ($i = 0; $i < strlen($result); $i++) { + $this->assertStringContainsString($result[$i], $charset); } } + + /** + * randomString with empty length returns empty string. + */ + public function testRandomStringZeroLength(): void { + $this->assertEquals("", Util::randomString(0)); + } + + /** + * randomString with default charset uses alphanumeric characters. + */ + public function testRandomStringDefaultCharset(): void { + $result = Util::randomString(50); + $this->assertMatchesRegularExpression('/^[a-zA-Z0-9]+$/', $result); + } + + /** + * compressDevices returns an empty array for empty input. + */ + public function testCompressDevicesEmpty(): void { + $this->assertSame([], Util::compressDevices([])); + } + + /** + * compressDevices replaces known patterns via str_replace (only the matched portion). + */ + public function testCompressDevicesPatterns(): void { + $input = [ + "NVIDIA GeForce RTX 3080", + "Intel(R) Core(TM) i7-10700K CPU @ 3.80GHz", + "Generic Device" + ]; + $result = Util::compressDevices($input); + $this->assertSame(["NVIDIA RTX 3080", "Core i7-10700K 3.80GHz", "Generic Device"], $result); + } + + /** + * getFileExtension returns .bin for Linux. + */ + public function testGetFileExtensionLinux(): void { + $this->assertEquals(".bin", Util::getFileExtension(0)); + } + + /** + * getFileExtension returns .exe for Windows. + */ + public function testGetFileExtensionWindows(): void { + $this->assertEquals(".exe", Util::getFileExtension(1)); + } + + /** + * getFileExtension returns .osx for OSX. + */ + public function testGetFileExtensionOsx(): void { + $this->assertEquals(".osx", Util::getFileExtension(2)); + } + + /** + * getFileExtension returns empty string for unknown OS. + */ + public function testGetFileExtensionUnknown(): void { + $this->assertEquals("", Util::getFileExtension(99)); + } + + /** + * getStaticArray returns the OS icon for each OS enum value. + */ + public function testGetStaticArrayOs(): void { + $this->assertStringContainsString("fa-linux", Util::getStaticArray("0", "os")); + $this->assertStringContainsString("fa-windows", Util::getStaticArray("1", "os")); + $this->assertStringContainsString("fa-apple", Util::getStaticArray("2", "os")); + } + + /** + * getStaticArray returns "unknown" for OS with val -1. + */ + public function testGetStaticArrayOsUnknown(): void { + $this->assertEquals("unknown", Util::getStaticArray("-1", "os")); + } + + /** + * getStaticArray returns the state label for each chunk state. + */ + public function testGetStaticArrayStates(): void { + $this->assertEquals("New", Util::getStaticArray("0", "states")); + $this->assertEquals("Running", Util::getStaticArray("2", "states")); + $this->assertEquals("Cracked", Util::getStaticArray("5", "states")); + } + + /** + * getStaticArray returns the format label for each format enum. + */ + public function testGetStaticArrayFormats(): void { + $this->assertEquals("Text", Util::getStaticArray("0", "formats")); + $this->assertEquals("Superhashlist", Util::getStaticArray("3", "formats")); + } + + /** + * getStaticArray returns the format table name. + */ + public function testGetStaticArrayFormatTables(): void { + $this->assertEquals("hashes", Util::getStaticArray("0", "formattables")); + $this->assertEquals("hashes_binary", Util::getStaticArray("1", "formattables")); + } + + /** + * getStaticArray returns the platform label. + */ + public function testGetStaticArrayPlatforms(): void { + $this->assertEquals("unknown", Util::getStaticArray("-1", "platforms")); + $this->assertEquals("NVidia", Util::getStaticArray("1", "platforms")); + } + + /** + * getStaticArray returns empty string for unknown ID. + */ + public function testGetStaticArrayUnknown(): void { + $this->assertEquals("", Util::getStaticArray("0", "nonexistent")); + } + + /** + * updateVersionComparison returns 1 when version2 is newer. + */ + public function testUpdateVersionComparisonNewer(): void { + $this->assertEquals(1, Util::updateVersionComparison("update_v0.13.0_v0.14.0", "update_v0.14.0_v0.15.0")); + } + + /** + * updateVersionComparison returns -1 when version2 is older. + */ + public function testUpdateVersionComparisonOlder(): void { + $this->assertEquals(-1, Util::updateVersionComparison("update_v0.14.0_v0.15.0", "update_v0.13.0_v0.14.0")); + } + + /** + * updateVersionComparison returns 0 for equal versions. + */ + public function testUpdateVersionComparisonEqual(): void { + $this->assertEquals(0, Util::updateVersionComparison("update_v0.14.0_v0.15.0", "update_v0.14.0_v0.15.0")); + } + + /** + * updateVersionComparison treats an invalid prefix as older than a valid one. + */ + public function testUpdateVersionComparisonInvalidPrefix(): void { + $this->assertEquals(1, Util::updateVersionComparison("invalid_v0.14.0_v0.15.0", "update_v0.14.0_v0.15.0")); + } + + /** + * updateVersionComparison handles single-digit version components. + */ + public function testUpdateVersionComparisonSingleDigit(): void { + $this->assertEquals(1, Util::updateVersionComparison("update_v1.0.0_v1.1.0", "update_v1.1.0_v2.0.0")); + } + + /** + * updateVersionComparison extracts and compares versions with +dev build metadata. + * Composer's semver library considers 1.0.0 > 1.0.0+dev, so the release version + * sorts after the +dev build. + */ + public function testUpdateVersionComparisonWithDevBuildMetadata(): void { + $this->assertEquals(1, Util::updateVersionComparison("update_v1.0.0+dev_v1.1.0", "update_v1.0.0_v1.1.0")); + } + + /** + * updateVersionComparison treats a +dev migration as older than the next release. + * 1.0.0+dev < 1.1.0 (build metadata ignored, then minor bump). + */ + public function testUpdateVersionComparisonDevIsOlderThanNext(): void { + $this->assertEquals(1, Util::updateVersionComparison("update_v1.0.0+dev_v1.0.1", "update_v1.0.1_v1.1.0")); + } + + /** + * updateVersionComparison treats a pre-release (e.g. -rc1) as older than the final release. + * Per semver: 1.0.0-rc1 < 1.0.0. + */ + public function testUpdateVersionComparisonPrereleaseOlderThanFinal(): void { + $this->assertEquals(1, Util::updateVersionComparison("update_v1.0.0-rc1_v1.0.0", "update_v1.0.0_v1.0.1")); + } + + /** + * updateVersionComparison treats an older pre-release as older than a newer pre-release. + */ + public function testUpdateVersionComparisonPrereleaseNewer(): void { + $this->assertEquals(1, Util::updateVersionComparison("update_v1.0.0-beta_v1.0.0-rc1", "update_v1.0.0-rc1_v1.0.0")); + } + + /** + * updateVersionComparison treats a +dev version as different from a -rc pre-release + * even when the numeric portion is the same (dev < rc in semver convention). + */ + public function testUpdateVersionComparisonDevVsPrerelease(): void { + $this->assertEquals(1, Util::updateVersionComparison("update_v1.0.0+dev_v1.0.0-rc1", "update_v1.0.0-rc1_v1.0.0")); + } + + /** + * arrayOfIds extracts IDs from an array of models created in the database. + */ + public function testArrayOfIds(): void { + $ag1 = $this->createAccessGroup('ids_test'); + $ag2 = $this->createAccessGroup('ids_test'); + $result = Util::arrayOfIds([$ag1, $ag2]); + $this->assertCount(2, $result); + $this->assertContains($ag1->getId(), $result); + $this->assertContains($ag2->getId(), $result); + } + + /** + * arrayOfIds returns an empty array for an empty input. + */ + public function testArrayOfIdsEmpty(): void { + $this->assertSame([], Util::arrayOfIds([])); + } + + /** + * calculate returns the input unchanged (identity function). + */ + public function testCalculate(): void { + $this->assertSame(42, Util::calculate(42)); + $this->assertSame("hello", Util::calculate("hello")); + $this->assertSame(null, Util::calculate(null)); + $this->assertSame([1, 2, 3], Util::calculate([1, 2, 3])); + } + + /** + * getHashtypeById returns the description for an existing hashtype. + */ + public function testGetHashtypeById(): void { + $hashtype = $this->createHashType(); + $result = Util::getHashtypeById($hashtype->getId()); + $this->assertEquals($hashtype->getDescription(), $result); + } + + /** + * getHashtypeById returns "N/A" for a non-existent ID. + */ + public function testGetHashtypeByIdNotFound(): void { + $this->assertEquals("N/A", Util::getHashtypeById(99999999)); + } + + /** + * getUsernameById returns the username for an existing user. + */ + public function testGetUsernameById(): void { + $user = $this->createUser('util_test'); + $result = Util::getUsernameById($user->getId()); + $this->assertEquals($user->getUsername(), $result); + } + + /** + * getUsernameById returns just the ID (with dash prefix) for a non-existent ID + * due to ternary operator precedence: "Unknown" . (strlen($id) > 0) is evaluated + * first (truthy string), then the ternary returns "-$id". + */ + public function testGetUsernameByIdNotFound(): void { + $result = Util::getUsernameById(99999999); + $this->assertEquals("-99999999", $result); + } + + /** + * checkDataDirectory creates a new StoredValue if the key does not exist. + * + * @throws Exception + */ + public function testCheckDataDirectoryCreatesNew(): void { + $key = 'test_dir_' . uniqid(); + $dir = '/tmp/test_hashtopolis'; + Util::checkDataDirectory($key, $dir); + $stored = Factory::getStoredValueFactory()->get($key); + $this->assertNotNull($stored); + $this->assertEquals($dir, $stored->getVal()); + Factory::getStoredValueFactory()->delete($stored); + } + + /** + * checkDataDirectory updates an existing StoredValue if the value changed. + * + * @throws Exception + */ + public function testCheckDataDirectoryUpdatesOnChange(): void { + $key = 'test_dir_upd_' . uniqid(); + $oldDir = '/tmp/test_old'; + Factory::getStoredValueFactory()->save(new StoredValue($key, $oldDir)); + $newDir = '/tmp/test_new'; + Util::checkDataDirectory($key, $newDir); + $stored = Factory::getStoredValueFactory()->get($key); + $this->assertEquals($newDir, $stored->getVal()); + Factory::getStoredValueFactory()->delete($stored); + } + + /** + * checkDataDirectory does not update if the value is already correct. + * + * @throws Exception + */ + public function testCheckDataDirectoryNoChange(): void { + $key = 'test_dir_stable_' . uniqid(); + $dir = '/tmp/test_stable'; + Factory::getStoredValueFactory()->save(new StoredValue($key, $dir)); + Util::checkDataDirectory($key, $dir); + $stored = Factory::getStoredValueFactory()->get($key); + $this->assertEquals($dir, $stored->getVal()); + Factory::getStoredValueFactory()->delete($stored); + } } - From d4454b47f7eeef783f0da876af5f38b015b644de Mon Sep 17 00:00:00 2001 From: s3inlc Date: Tue, 23 Jun 2026 14:07:22 +0200 Subject: [PATCH 682/691] added tests for Encryption, SConfig and StartupConfig removed openssl functions with blowfish as they returned empty strings with blowfish --- ci/phpunit/inc/EncryptionTest.php | 173 ++++++++++++++++++++ ci/phpunit/inc/SConfigTest.php | 148 +++++++++++++++++ ci/phpunit/inc/StartupConfigTest.php | 232 +++++++++++++++++++++++++++ src/inc/Encryption.php | 34 ++-- 4 files changed, 570 insertions(+), 17 deletions(-) create mode 100644 ci/phpunit/inc/EncryptionTest.php create mode 100644 ci/phpunit/inc/SConfigTest.php create mode 100644 ci/phpunit/inc/StartupConfigTest.php diff --git a/ci/phpunit/inc/EncryptionTest.php b/ci/phpunit/inc/EncryptionTest.php new file mode 100644 index 000000000..0c8ef3981 --- /dev/null +++ b/ci/phpunit/inc/EncryptionTest.php @@ -0,0 +1,173 @@ +getProperty('instance'); + $p->setValue(null, null); + parent::tearDown(); + } + + /** + * validPassword returns false when the input is shorter than 8 characters. + */ + public function testValidPasswordTooShort(): void { + $this->assertFalse(Encryption::validPassword("Ab1!")); + } + + /** + * validPassword returns false when the input contains no uppercase letter. + */ + public function testValidPasswordMissingUppercase(): void { + $this->assertFalse(Encryption::validPassword("abc1!defg")); + } + + /** + * validPassword returns false when the input contains no lowercase letter. + */ + public function testValidPasswordMissingLowercase(): void { + $this->assertFalse(Encryption::validPassword("ABC1!DEFG")); + } + + /** + * validPassword returns false when the input contains no digit. + */ + public function testValidPasswordMissingDigit(): void { + $this->assertFalse(Encryption::validPassword("Abc!defgh")); + } + + /** + * validPassword returns false when the input contains no special character. + */ + public function testValidPasswordMissingSpecial(): void { + $this->assertFalse(Encryption::validPassword("Abc1defgh")); + } + + /** + * validPassword returns true when the input meets all complexity requirements. + */ + public function testValidPasswordValid(): void { + $this->assertTrue(Encryption::validPassword("Abc1!defg")); + } + + /** + * validPassword returns true with exactly 8 characters containing all required types. + */ + public function testValidPasswordMinLength(): void { + $this->assertTrue(Encryption::validPassword("Ab1!xxxx")); + } + + /** + * passwordHash produces a bcrypt hash that passwordVerify accepts with matching password and salt. + */ + public function testPasswordHashAndVerify(): void { + $hash = Encryption::passwordHash("MySecureP@ss1", "salt123"); + $this->assertTrue(Encryption::passwordVerify("MySecureP@ss1", "salt123", $hash)); + } + + /** + * passwordVerify returns false when the wrong password is supplied. + */ + public function testPasswordVerifyWrongPassword(): void { + $hash = Encryption::passwordHash("RealP@ss1", "salt123"); + $this->assertFalse(Encryption::passwordVerify("WrongP@ss1", "salt123", $hash)); + } + + /** + * passwordVerify returns false when the wrong salt is supplied, even if the password is correct. + */ + public function testPasswordVerifyWrongSalt(): void { + $hash = Encryption::passwordHash("RealP@ss1", "salt123"); + $this->assertFalse(Encryption::passwordVerify("RealP@ss1", "wrongsalt", $hash)); + } + + /** + * passwordVerify returns false when given a malformed or corrupt hash string. + */ + public function testPasswordVerifyCorruptHash(): void { + $this->assertFalse(Encryption::passwordVerify("any", "salt", '$2y$12$notarealhash')); + } + + /** + * sessionHash is deterministic: identical inputs produce the same output. + * Requires bcmath extension for bcpowmod in getCount(). + */ + public function testSessionHashDeterministic(): void { + if (!extension_loaded('bcmath')) { + $this->markTestSkipped('bcmath extension required for sessionHash'); + } + $h1 = Encryption::sessionHash(1, 1000000, "admin"); + $h2 = Encryption::sessionHash(1, 1000000, "admin"); + $this->assertSame($h1, $h2); + } + + /** + * sessionHash produces different output when the session ID changes. + * Requires bcmath extension for bcpowmod in getCount(). + */ + public function testSessionHashChangesOnDifferentId(): void { + if (!extension_loaded('bcmath')) { + $this->markTestSkipped('bcmath extension required for sessionHash'); + } + $h1 = Encryption::sessionHash(1, 1000000, "admin"); + $h2 = Encryption::sessionHash(2, 1000000, "admin"); + $this->assertNotSame($h1, $h2); + } + + /** + * sessionHash produces different output when the username changes. + * Requires bcmath extension for bcpowmod in getCount(). + */ + public function testSessionHashChangesOnDifferentUsername(): void { + if (!extension_loaded('bcmath')) { + $this->markTestSkipped('bcmath extension required for sessionHash'); + } + $h1 = Encryption::sessionHash(1, 1000000, "admin"); + $h2 = Encryption::sessionHash(1, 1000000, "user2"); + $this->assertNotSame($h1, $h2); + } + + /** + * validationHash is deterministic: identical inputs produce the same output. + * Requires bcmath extension for bcpowmod in getCount(). + */ + public function testValidationHashDeterministic(): void { + if (!extension_loaded('bcmath')) { + $this->markTestSkipped('bcmath extension required for validationHash'); + } + $h1 = Encryption::validationHash(1, "admin"); + $h2 = Encryption::validationHash(1, "admin"); + $this->assertSame($h1, $h2); + } + + /** + * validationHash produces different output when the user ID changes. + * Requires bcmath extension for bcpowmod in getCount(). + */ + public function testValidationHashChangesOnDifferentId(): void { + if (!extension_loaded('bcmath')) { + $this->markTestSkipped('bcmath extension required for validationHash'); + } + $h1 = Encryption::validationHash(1, "admin"); + $h2 = Encryption::validationHash(2, "admin"); + $this->assertNotSame($h1, $h2); + } + + /** + * validationHash produces different output when the username changes. + * Requires bcmath extension for bcpowmod in getCount(). + */ + public function testValidationHashChangesOnDifferentUsername(): void { + if (!extension_loaded('bcmath')) { + $this->markTestSkipped('bcmath extension required for validationHash'); + } + $h1 = Encryption::validationHash(1, "admin"); + $h2 = Encryption::validationHash(1, "user2"); + $this->assertNotSame($h1, $h2); + } +} diff --git a/ci/phpunit/inc/SConfigTest.php b/ci/phpunit/inc/SConfigTest.php new file mode 100644 index 000000000..2b222e133 --- /dev/null +++ b/ci/phpunit/inc/SConfigTest.php @@ -0,0 +1,148 @@ +getProperty('instance'); + $p->setValue(null, null); + parent::tearDown(); + } + + /** + * getInstance returns a DataSet object when called for the first time. + */ + public function testGetInstanceReturnsDataSet(): void { + try { + $ds = SConfig::getInstance(); + $this->assertInstanceOf(DataSet::class, $ds); + } + catch (Exception $e) { + $this->markTestSkipped('DB not available: ' . $e->getMessage()); + } + } + + /** + * Consecutive calls to getInstance return the same DataSet object (singleton). + */ + public function testSingletonReturnsSameInstance(): void { + try { + $i1 = SConfig::getInstance(); + $i2 = SConfig::getInstance(); + $this->assertSame($i1, $i2); + } + catch (Exception $e) { + $this->markTestSkipped('DB not available: ' . $e->getMessage()); + } + } + + /** + * getInstance(true) discards the cached singleton and loads fresh data from the database. + */ + public function testGetInstanceWithForceReturnsNewInstance(): void { + try { + $p = (new ReflectionClass(SConfig::class))->getProperty('instance'); + $p->setValue(null, new DataSet(['test' => 'value'])); + + $fresh = SConfig::getInstance(true); + $this->assertInstanceOf(DataSet::class, $fresh); + } + catch (Exception $e) { + $this->markTestSkipped('DB not available: ' . $e->getMessage()); + } + } + + /** + * reload() forces a fresh load from the database, replacing the current singleton. + */ + public function testReloadForcesNewLoad(): void { + try { + $i1 = SConfig::getInstance(); + SConfig::reload(); + $i2 = SConfig::getInstance(); + $this->assertNotSame($i1, $i2); + } + catch (Exception $e) { + $this->markTestSkipped('DB not available: ' . $e->getMessage()); + } + } + + /** + * A Config row saved to the database is accessible via SConfig after a reload. + */ + public function testGetInstanceLoadsConfigFromDatabase(): void { + try { + $key = 'test_config_' . uniqid(); + $value = 'test_value_' . uniqid(); + + Factory::getConfigFactory()->save(new Config(null, 1, $key, $value)); + + SConfig::reload(); + $result = SConfig::getInstance()->getVal($key); + $this->assertSame($value, $result); + } + catch (Exception $e) { + $this->markTestSkipped('DB not available: ' . $e->getMessage()); + } + } + + /** + * Multiple Config rows saved to the database are all loaded into the DataSet. + */ + public function testGetInstanceLoadsMultipleConfigValues(): void { + try { + $key1 = 'multi_test_1_' . uniqid(); + $key2 = 'multi_test_2_' . uniqid(); + + Factory::getConfigFactory()->save(new Config(null, 1, $key1, 'val1')); + Factory::getConfigFactory()->save(new Config(null, 1, $key2, 'val2')); + + SConfig::reload(); + $ds = SConfig::getInstance(); + $this->assertSame('val1', $ds->getVal($key1)); + $this->assertSame('val2', $ds->getVal($key2)); + } + catch (Exception $e) { + $this->markTestSkipped('DB not available: ' . $e->getMessage()); + } + } + + /** + * getVal returns false for a key that does not exist in the loaded config. + */ + public function testGetValReturnsFalseForUnknownKey(): void { + try { + $result = SConfig::getInstance()->getVal('nonexistent_key_' . uniqid()); + $this->assertFalse($result); + } + catch (Exception $e) { + $this->markTestSkipped('DB not available: ' . $e->getMessage()); + } + } + + /** + * getKeys returns an array of all config keys loaded from the database. + */ + public function testConfigSectionHasExpectedKeys(): void { + try { + $ds = SConfig::getInstance(); + $keys = $ds->getKeys(); + $this->assertIsArray($keys); + } + catch (Exception $e) { + $this->markTestSkipped('DB not available: ' . $e->getMessage()); + } + } +} diff --git a/ci/phpunit/inc/StartupConfigTest.php b/ci/phpunit/inc/StartupConfigTest.php new file mode 100644 index 000000000..560ec04e2 --- /dev/null +++ b/ci/phpunit/inc/StartupConfigTest.php @@ -0,0 +1,232 @@ +getProperty('instance'); + $p->setValue(null, null); + parent::tearDown(); + } + + /** + * getInstance returns a StartupConfig object. + */ + public function testGetInstanceReturnsStartupConfig(): void { + $this->assertInstanceOf(StartupConfig::class, StartupConfig::getInstance()); + } + + /** + * getInstance returns the same instance on consecutive calls (singleton). + */ + public function testGetInstanceIsSingleton(): void { + $i1 = StartupConfig::getInstance(); + $i2 = StartupConfig::getInstance(); + $this->assertSame($i1, $i2); + } + + /** + * getInstance(true) forces creation of a new instance. + */ + public function testGetInstanceWithForceCreatesNewInstance(): void { + $i1 = StartupConfig::getInstance(); + $i2 = StartupConfig::getInstance(true); + $this->assertNotSame($i1, $i2); + } + + /** + * reload() forces creation of a new instance via getInstance(true). + */ + public function testReloadCreatesNewInstance(): void { + $i1 = StartupConfig::getInstance(); + StartupConfig::reload(); + $i2 = StartupConfig::getInstance(); + $this->assertNotSame($i1, $i2); + } + + /** + * getDirectories returns an array with all five expected keys. + */ + public function testGetDirectoriesReturnsArray(): void { + $dirs = StartupConfig::getInstance()->getDirectories(); + $this->assertIsArray($dirs); + $this->assertArrayHasKey('files', $dirs); + $this->assertArrayHasKey('import', $dirs); + $this->assertArrayHasKey('log', $dirs); + $this->assertArrayHasKey('config', $dirs); + $this->assertArrayHasKey('tus', $dirs); + } + + /** + * getDirectoryFiles returns a string path. + */ + public function testGetDirectoryFilesReturnsString(): void { + $this->assertIsString(StartupConfig::getInstance()->getDirectoryFiles()); + } + + /** + * getDirectoryImport returns a string path. + */ + public function testGetDirectoryImportReturnsString(): void { + $this->assertIsString(StartupConfig::getInstance()->getDirectoryImport()); + } + + /** + * getDirectoryLog returns a string path. + */ + public function testGetDirectoryLogReturnsString(): void { + $this->assertIsString(StartupConfig::getInstance()->getDirectoryLog()); + } + + /** + * getDirectoryConfig returns a string path. + */ + public function testGetDirectoryConfigReturnsString(): void { + $this->assertIsString(StartupConfig::getInstance()->getDirectoryConfig()); + } + + /** + * getDirectoryTus returns a string path. + */ + public function testGetDirectoryTusReturnsString(): void { + $this->assertIsString(StartupConfig::getInstance()->getDirectoryTus()); + } + + /** + * getDatabaseType returns a string (empty by default or set from env). + */ + public function testGetDatabaseTypeReturnsString(): void { + $this->assertIsString(StartupConfig::getInstance()->getDatabaseType()); + } + + /** + * getDatabaseUser returns a string (empty by default or set from env). + */ + public function testGetDatabaseUserReturnsString(): void { + $this->assertIsString(StartupConfig::getInstance()->getDatabaseUser()); + } + + /** + * getDatabasePassword returns a string (empty by default or set from env). + */ + public function testGetDatabasePasswordReturnsString(): void { + $this->assertIsString(StartupConfig::getInstance()->getDatabasePassword()); + } + + /** + * getDatabaseDB returns a string (empty by default or set from env). + */ + public function testGetDatabaseDBReturnsString(): void { + $this->assertIsString(StartupConfig::getInstance()->getDatabaseDB()); + } + + /** + * getDatabaseServer returns a string (empty by default or set from env). + */ + public function testGetDatabaseServerReturnsString(): void { + $this->assertIsString(StartupConfig::getInstance()->getDatabaseServer()); + } + + /** + * getDatabasePort returns a string (defaults to "0" or set from env). + */ + public function testGetDatabasePortReturnsString(): void { + $this->assertIsString(StartupConfig::getInstance()->getDatabasePort()); + } + + /** + * getPepper returns empty string for a negative index. + */ + public function testGetPepperNegativeIndexReturnsEmpty(): void { + $this->assertSame("", StartupConfig::getInstance()->getPepper(-1)); + } + + /** + * getPepper returns empty string for an index equal to the array length (out of bounds). + */ + public function testGetPepperOutOfBoundsReturnsEmpty(): void { + $this->assertSame("", StartupConfig::getInstance()->getPepper(4)); + } + + /** + * getPepper returns empty string for a very large out-of-bounds index. + */ + public function testGetPepperVeryLargeIndexReturnsEmpty(): void { + $this->assertSame("", StartupConfig::getInstance()->getPepper(999)); + } + + /** + * getPepper returns a string (possibly empty) for each valid index 0-3. + */ + public function testGetPepperValidIndexReturnsString(): void { + $this->assertIsString(StartupConfig::getInstance()->getPepper(0)); + $this->assertIsString(StartupConfig::getInstance()->getPepper(1)); + $this->assertIsString(StartupConfig::getInstance()->getPepper(2)); + $this->assertIsString(StartupConfig::getInstance()->getPepper(3)); + } + + /** + * getVersion returns a non-empty string starting with "v". + */ + public function testGetVersionReturnsString(): void { + $v = StartupConfig::getInstance()->getVersion(); + $this->assertIsString($v); + $this->assertNotEmpty($v); + $this->assertStringStartsWith('v', $v); + } + + /** + * getBuild returns a non-empty string. + */ + public function testGetBuildReturnsString(): void { + $this->assertIsString(StartupConfig::getInstance()->getBuild()); + } + + /** + * getHost returns the value of $_SERVER['SERVER_NAME'] when it is set. + */ + public function testGetHostReturnsStringWhenServerNameSet(): void { + $original = $_SERVER['SERVER_NAME'] ?? null; + $_SERVER['SERVER_NAME'] = 'test.example.com'; + $this->assertSame('test.example.com', StartupConfig::getInstance()->getHost()); + if ($original !== null) { + $_SERVER['SERVER_NAME'] = $original; + } + else { + unset($_SERVER['SERVER_NAME']); + } + } + + /** + * getHost returns an empty string when $_SERVER['SERVER_NAME'] is not set. + */ + public function testGetHostReturnsEmptyStringWhenServerNameNotSet(): void { + $original = $_SERVER['SERVER_NAME'] ?? null; + unset($_SERVER['SERVER_NAME']); + $this->assertSame("", StartupConfig::getInstance()->getHost()); + if ($original !== null) { + $_SERVER['SERVER_NAME'] = $original; + } + } + + /** + * getHost returns an empty string when $_SERVER['SERVER_NAME'] is explicitly null. + */ + public function testGetHostReturnsEmptyStringWhenServerNameIsNull(): void { + $original = $_SERVER['SERVER_NAME'] ?? null; + $_SERVER['SERVER_NAME'] = null; + $this->assertSame("", StartupConfig::getInstance()->getHost()); + if ($original !== null) { + $_SERVER['SERVER_NAME'] = $original; + } + } +} diff --git a/src/inc/Encryption.php b/src/inc/Encryption.php index be0179cb7..a29ad36ce 100755 --- a/src/inc/Encryption.php +++ b/src/inc/Encryption.php @@ -2,9 +2,6 @@ namespace Hashtopolis\inc; -use Hashtopolis\inc\StartupConfig; -use Hashtopolis\inc\Util; - /** * Bundle of static functions to generate password hashes, session keys, random strings * and other crypt functions @@ -16,13 +13,12 @@ class Encryption { * @param int $id sessionID * @param int $startTime time of the session start * @param string $username username of the user the session belongs to - * @return string base64 encoded hash + * @return string hex encoded hash */ - public static function sessionHash($id, $startTime, $username) { + public static function sessionHash(int $id, int $startTime, string $username): string { $KEY = pack('H*', hash("sha256", $startTime)); $cycles = Encryption::getCount($username . $startTime, 500, 1000); $CIPHER = $username . $startTime; - $CIPHER = openssl_encrypt($CIPHER, 'blowfish', $KEY, 0, substr(StartupConfig::getInstance()->getPepper(0), 0, 8)); for ($x = 0; $x < $cycles; $x++) { $KEY = pack('H*', hash("sha256", $CIPHER . $id . StartupConfig::getInstance()->getPepper(0) . $KEY)); } @@ -35,7 +31,7 @@ public static function sessionHash($id, $startTime, $username) { * @param string $string password to check * @return boolean true if password is complex enough, false if not */ - public static function validPassword($string) { + public static function validPassword(string $string): bool { if (strlen($string) < 8) { return false; } @@ -67,14 +63,19 @@ public static function validPassword($string) { * @param string $salt salt which belongs to the password * @return string hash */ - public static function passwordHash($password, $salt) { + public static function passwordHash(string $password, string $salt): string { $CIPHER = StartupConfig::getInstance()->getPepper(1) . $password . $salt; $options = array('cost' => 12); - $CIPHER = password_hash($CIPHER, PASSWORD_BCRYPT, $options); - return $CIPHER; + return password_hash($CIPHER, PASSWORD_BCRYPT, $options); } - public static function passwordVerify($password, $salt, $hash) { + /** + * @param string $password + * @param string $salt + * @param string $hash + * @return bool + */ + public static function passwordVerify(string $password, string $salt, string $hash): bool { $CIPHER = StartupConfig::getInstance()->getPepper(1) . $password . $salt; if (!password_verify($CIPHER, $hash)) { return false; @@ -86,17 +87,17 @@ public static function passwordVerify($password, $salt, $hash) { * Get the number of cycles for a given string * * @param string $string - * @param int $mincycles - * @param int $maxcycles + * @param int $minCycles + * @param int $maxCycles * @return int num cycles */ - private static function getCount($string, $mincycles = 3000, $maxcycles = 5000) { + private static function getCount(string $string, int $minCycles = 3000, int $maxCycles = 5000): int { $count = 0; for ($x = 0; $x < strlen($string); $x++) { $count += $x * ord($string[$x]) * bcpowmod($x, 15, 10000); $count = $count % 10000; } - return $count % $maxcycles + $mincycles; + return $count % $maxCycles + $minCycles; } /** @@ -106,11 +107,10 @@ private static function getCount($string, $mincycles = 3000, $maxcycles = 5000) * @param string $username username to validate * @return string base64 encoded hash */ - public static function validationHash($id, $username) { + public static function validationHash(int $id, string $username): string { $KEY = pack('H*', hash("sha256", $id)); $cycles = Encryption::getCount($username . StartupConfig::getInstance()->getPepper(2), 500, 1000); $CIPHER = $id . $username; - $CIPHER = openssl_encrypt($CIPHER, 'blowfish', $KEY, 0, substr(StartupConfig::getInstance()->getPepper(2), 0, 8)); for ($x = 0; $x < $cycles; $x++) { $KEY = pack('H*', hash("sha256", $CIPHER . $id . StartupConfig::getInstance()->getPepper(2) . $username . $KEY)); } From 01ca57223814b2d004173b5b795e03ac3735b887 Mon Sep 17 00:00:00 2001 From: s3inlc Date: Tue, 23 Jun 2026 14:24:12 +0200 Subject: [PATCH 683/691] removed assertion tests which are solved with typing --- ci/phpunit/inc/StartupConfigTest.php | 96 ---------------------------- 1 file changed, 96 deletions(-) diff --git a/ci/phpunit/inc/StartupConfigTest.php b/ci/phpunit/inc/StartupConfigTest.php index 560ec04e2..6ce7f03e9 100644 --- a/ci/phpunit/inc/StartupConfigTest.php +++ b/ci/phpunit/inc/StartupConfigTest.php @@ -58,7 +58,6 @@ public function testReloadCreatesNewInstance(): void { */ public function testGetDirectoriesReturnsArray(): void { $dirs = StartupConfig::getInstance()->getDirectories(); - $this->assertIsArray($dirs); $this->assertArrayHasKey('files', $dirs); $this->assertArrayHasKey('import', $dirs); $this->assertArrayHasKey('log', $dirs); @@ -66,83 +65,6 @@ public function testGetDirectoriesReturnsArray(): void { $this->assertArrayHasKey('tus', $dirs); } - /** - * getDirectoryFiles returns a string path. - */ - public function testGetDirectoryFilesReturnsString(): void { - $this->assertIsString(StartupConfig::getInstance()->getDirectoryFiles()); - } - - /** - * getDirectoryImport returns a string path. - */ - public function testGetDirectoryImportReturnsString(): void { - $this->assertIsString(StartupConfig::getInstance()->getDirectoryImport()); - } - - /** - * getDirectoryLog returns a string path. - */ - public function testGetDirectoryLogReturnsString(): void { - $this->assertIsString(StartupConfig::getInstance()->getDirectoryLog()); - } - - /** - * getDirectoryConfig returns a string path. - */ - public function testGetDirectoryConfigReturnsString(): void { - $this->assertIsString(StartupConfig::getInstance()->getDirectoryConfig()); - } - - /** - * getDirectoryTus returns a string path. - */ - public function testGetDirectoryTusReturnsString(): void { - $this->assertIsString(StartupConfig::getInstance()->getDirectoryTus()); - } - - /** - * getDatabaseType returns a string (empty by default or set from env). - */ - public function testGetDatabaseTypeReturnsString(): void { - $this->assertIsString(StartupConfig::getInstance()->getDatabaseType()); - } - - /** - * getDatabaseUser returns a string (empty by default or set from env). - */ - public function testGetDatabaseUserReturnsString(): void { - $this->assertIsString(StartupConfig::getInstance()->getDatabaseUser()); - } - - /** - * getDatabasePassword returns a string (empty by default or set from env). - */ - public function testGetDatabasePasswordReturnsString(): void { - $this->assertIsString(StartupConfig::getInstance()->getDatabasePassword()); - } - - /** - * getDatabaseDB returns a string (empty by default or set from env). - */ - public function testGetDatabaseDBReturnsString(): void { - $this->assertIsString(StartupConfig::getInstance()->getDatabaseDB()); - } - - /** - * getDatabaseServer returns a string (empty by default or set from env). - */ - public function testGetDatabaseServerReturnsString(): void { - $this->assertIsString(StartupConfig::getInstance()->getDatabaseServer()); - } - - /** - * getDatabasePort returns a string (defaults to "0" or set from env). - */ - public function testGetDatabasePortReturnsString(): void { - $this->assertIsString(StartupConfig::getInstance()->getDatabasePort()); - } - /** * getPepper returns empty string for a negative index. */ @@ -164,33 +86,15 @@ public function testGetPepperVeryLargeIndexReturnsEmpty(): void { $this->assertSame("", StartupConfig::getInstance()->getPepper(999)); } - /** - * getPepper returns a string (possibly empty) for each valid index 0-3. - */ - public function testGetPepperValidIndexReturnsString(): void { - $this->assertIsString(StartupConfig::getInstance()->getPepper(0)); - $this->assertIsString(StartupConfig::getInstance()->getPepper(1)); - $this->assertIsString(StartupConfig::getInstance()->getPepper(2)); - $this->assertIsString(StartupConfig::getInstance()->getPepper(3)); - } - /** * getVersion returns a non-empty string starting with "v". */ public function testGetVersionReturnsString(): void { $v = StartupConfig::getInstance()->getVersion(); - $this->assertIsString($v); $this->assertNotEmpty($v); $this->assertStringStartsWith('v', $v); } - /** - * getBuild returns a non-empty string. - */ - public function testGetBuildReturnsString(): void { - $this->assertIsString(StartupConfig::getInstance()->getBuild()); - } - /** * getHost returns the value of $_SERVER['SERVER_NAME'] when it is set. */ From 0f0a36066990458c1e770b083d21313901e4da41 Mon Sep 17 00:00:00 2001 From: novasam23 <291755769+novasam23@users.noreply.github.com> Date: Tue, 23 Jun 2026 14:32:01 +0200 Subject: [PATCH 684/691] Refactor queries in order to fetch Chunk and Hash entities at once (#2258) * Refactored queries in order to fetch Chunk and Hash entities at once * Fix bug that Copilot caught, where accessing a joined query result with getModelName() is safer. Also remove unused import. --- src/inc/apiv2/helper/GetCracksOfTaskHelper.php | 16 +++++----------- 1 file changed, 5 insertions(+), 11 deletions(-) diff --git a/src/inc/apiv2/helper/GetCracksOfTaskHelper.php b/src/inc/apiv2/helper/GetCracksOfTaskHelper.php index 8245f1825..a318398f6 100644 --- a/src/inc/apiv2/helper/GetCracksOfTaskHelper.php +++ b/src/inc/apiv2/helper/GetCracksOfTaskHelper.php @@ -2,8 +2,8 @@ namespace Hashtopolis\inc\apiv2\helper; +use Hashtopolis\dba\JoinFilter; use Hashtopolis\dba\models\Chunk; -use Hashtopolis\dba\ContainFilter; use Hashtopolis\inc\apiv2\common\AbstractHelperAPI; use Hashtopolis\inc\apiv2\error\HttpError; use Hashtopolis\inc\defines\DHashlistFormat; @@ -89,18 +89,12 @@ public function handleGet(Request $request, Response $response): Response { else { $hashFactory = Factory::getHashBinaryFactory(); } - $qF = new QueryFilter(Chunk::TASK_ID, $task->getId(), "="); - $chunks = Factory::getChunkFactory()->filter([Factory::FILTER => $qF]); - $chunkIds = array(); - foreach ($chunks as $chunk) { - $chunkIds[] = $chunk->getId(); - } - $queryFilters[] = new ContainFilter(Hash::CHUNK_ID, $chunkIds); + $queryFilters[] = new QueryFilter(Chunk::TASK_ID, $task->getId(), "=", Factory::getChunkFactory()); $queryFilters[] = new QueryFilter(Hash::IS_CRACKED, 1, "="); - $hashes = $hashFactory->filter([Factory::FILTER => $queryFilters]); + $jF = new JoinFilter(Factory::getChunkFactory(), Hash::CHUNK_ID, Chunk::CHUNK_ID); + $joined = $hashFactory->filter([Factory::FILTER => $queryFilters, Factory::JOIN => $jF]); $converted = []; - - foreach ($hashes as $hash) { + foreach ($joined[$hashFactory->getModelName()] as $hash) { $converted[] = self::obj2Resource($hash); } $ret = self::createJsonResponse(data: $converted); From 24b7236841f5fd0c5aea47cbc7028e7741bbd881 Mon Sep 17 00:00:00 2001 From: Sein Coray Date: Tue, 23 Jun 2026 15:11:20 +0200 Subject: [PATCH 685/691] Potential fix for pull request finding Co-authored-by: Copilot Autofix powered by AI <175728472+Copilot@users.noreply.github.com> --- src/inc/Encryption.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/inc/Encryption.php b/src/inc/Encryption.php index a29ad36ce..d7f40698d 100755 --- a/src/inc/Encryption.php +++ b/src/inc/Encryption.php @@ -105,7 +105,7 @@ private static function getCount(string $string, int $minCycles = 3000, int $max * * @param int $id userID to validate * @param string $username username to validate - * @return string base64 encoded hash + * @return string hex encoded hash */ public static function validationHash(int $id, string $username): string { $KEY = pack('H*', hash("sha256", $id)); From 38fc4b2b440f1ec30e62c2f167c31b4529737086 Mon Sep 17 00:00:00 2001 From: novasam23 <291755769+novasam23@users.noreply.github.com> Date: Tue, 23 Jun 2026 15:29:20 +0200 Subject: [PATCH 686/691] Add and extend tests for aggregate fields of Task and SuperTask (#2260) * Add and extend tests for aggregate fields of Task and SuperTask * Accept suggestions Copilot made for pull request Co-authored-by: Copilot Autofix powered by AI <175728472+Copilot@users.noreply.github.com> * Fix unused imports Co-authored-by: Copilot Autofix powered by AI <175728472+Copilot@users.noreply.github.com> * Accept suggestions from Copilot, also avoid repeating attribute names --------- Co-authored-by: Copilot Autofix powered by AI <175728472+Copilot@users.noreply.github.com> --- ci/apiv2/test_taskwrapperdisplay.py | 22 +++++++++++++++++----- 1 file changed, 17 insertions(+), 5 deletions(-) diff --git a/ci/apiv2/test_taskwrapperdisplay.py b/ci/apiv2/test_taskwrapperdisplay.py index 07d6042d2..b0fcbd7c0 100644 --- a/ci/apiv2/test_taskwrapperdisplay.py +++ b/ci/apiv2/test_taskwrapperdisplay.py @@ -1,4 +1,5 @@ -from hashtopolis import TaskWrapperDisplay, Helper, TaskWrapper +from hashtopolis import TaskWrapperDisplay, Helper +import re from utils import BaseTest class TaskWrapperDisplayTest(BaseTest): @@ -11,7 +12,6 @@ def create_test_object(self, *nargs, delete=True, **kwargs): task = self.create_task(hashlist, delete=delete) return TaskWrapperDisplay.objects.get(pk=task.taskWrapperId) - def test_task_wrapper_display_should_return_color_field(self): task_wrapper_display_object = self.create_test_object() expected_color_value = str(task_wrapper_display_object.color) @@ -19,7 +19,7 @@ def test_task_wrapper_display_should_return_color_field(self): self.assertEqual(task_wrapper_display_object.color, expected_color_value) self.assertNotEqual("FFFFFF", task_wrapper_display_object.color) - def test_number_of_chunks_on_supertask(self): + def test_aggregate_data_on_supertask(self): pretasks = [self.create_pretask() for _ in range(2)] supertask = self.create_supertask(pretasks=pretasks) cracker = self.create_cracker() @@ -27,5 +27,17 @@ def test_number_of_chunks_on_supertask(self): helper = Helper() task_wrapper = helper.create_supertask(supertask, hashlist, cracker) - task_wrapper_display = TaskWrapperDisplay.objects.params(**{"aggregate[taskwrapperdisplay]": "timeSpent"}).get(taskWrapperId=task_wrapper.id) - assert not hasattr(task_wrapper_display, 'timeSpent'), "Attribute 'timeSpent' should not be set" \ No newline at end of file + aggregate_attrs = ['timeSpent', 'searched', 'dispatched', 'currentSpeed', 'cprogress'] + task_wrapper_display = TaskWrapperDisplay.objects.params(**{"aggregate[taskwrapperdisplay]": ','.join(aggregate_attrs)}).get(taskWrapperId=task_wrapper.id) + self.assertFalse(any(hasattr(task_wrapper_display, attr) for attr in aggregate_attrs), f"Aggregate attributes should not be set: {', '.join(aggregate_attrs)}") + + def test_aggregate_data_on_normal_task(self): + task_wrapper_display_object = self.create_test_object() + aggregate_attrs = ['totalAssignedAgents', 'searched', 'dispatched', 'status', 'currentSpeed'] + task_wrapper_display = TaskWrapperDisplay.objects.params(**{"aggregate[taskwrapperdisplay]": ','.join(aggregate_attrs)}).get(taskWrapperId=task_wrapper_display_object.id) + self.assertTrue(all(hasattr(task_wrapper_display, a) for a in aggregate_attrs), f"Aggregate attributes should be set: {', '.join(aggregate_attrs)}") + self.assertIsNotNone(re.fullmatch(r"\d+", str(task_wrapper_display.totalAssignedAgents)), "Attribute 'totalAssignedAgents' should be numeric") + self.assertIsNotNone(re.fullmatch(r"\d?\d?\d\.\d{2}", str(task_wrapper_display.searched)), "Attribute 'searched' should be a decimal string") + self.assertIsNotNone(re.fullmatch(r"\d?\d?\d\.\d{2}", str(task_wrapper_display.dispatched)), "Attribute 'dispatched' should be a decimal string") + self.assertIsInstance(task_wrapper_display.status, int, "Attribute 'status' should be of type int") + self.assertIsInstance(task_wrapper_display.currentSpeed, int, "Attribute 'currentSpeed' should be of type int") \ No newline at end of file From 98711dc7ac790d58c43538ce7aa5b6382434dbe9 Mon Sep 17 00:00:00 2001 From: s3inlc Date: Tue, 23 Jun 2026 16:10:34 +0200 Subject: [PATCH 687/691] added documentation for versioning, branch handling and release process --- RELEASE.md | 83 +++++++++++++++++++++++++++++++++++++++++++++++++++ VERSIONING.md | 82 ++++++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 165 insertions(+) create mode 100644 RELEASE.md create mode 100644 VERSIONING.md diff --git a/RELEASE.md b/RELEASE.md new file mode 100644 index 000000000..57b3f4d98 --- /dev/null +++ b/RELEASE.md @@ -0,0 +1,83 @@ +# Release Process + +## Planning a Release + +1. Create a **milestone** named after the target version (e.g., `v1.1.0`). +2. Assign all issues and pull requests that should be part of this release to the milestone. +3. Create a **release issue** from the [template below](#release-issue-template) with the relevant checklist items for this specific release. Select only the steps that actually apply — delete the rest. + +## Release Issue Template + +When cutting a release, create an issue under this repository with the version as the title (e.g., `Release v1.1.0`). Attach it to the corresponding milestone. Copy the applicable items from the checklist below, delete the ones that are not needed. + +### Release Preparations + +#### Agent + +- [ ] Update agent release notes and version in [hashtopolis-agent-python](https://github.com/hashtopolis/hashtopolis-agent-python) if needed +- [ ] Release the agent + +#### Backend + +- [ ] Start branch for release preparations +- [ ] Update hashcat modes in the database schema (`hashtopolis.sql` and update scripts) — see [Hashcat Modes Diff](#hashcat-modes-diff) below +- [ ] Build the agent via `./build.sh` in [hashtopolis-agent-python](https://github.com/hashtopolis/hashtopolis-agent-python), copy the resulting zip to `src/bin/` +- [ ] Update agent version references in migration for initial setups +- [ ] Insert newest hashcat version as a migration for initial setups +- [ ] Adjust server release notes (`changelog.md`) _(legacy)_ +- [ ] Update `StartupConfig::getVersion()` from `"vMAJOR.MINOR.PATCH+dev"` to `"vMAJOR.MINOR.PATCH"` +- [ ] Ensure `master` is in sync with any long-running feature branches +- [ ] Create PR for merging +- [ ] Run the full test suite (PHPUnit + pytest if applicable) +- [ ] Run the build process + +#### Frontend + +- [ ] Start branch for release preparations +- [ ] Update the version of the frontend (`src/config/default/app/main.ts`) if it changed +- [ ] Create PR for merging +- [ ] Run the full test suite +- [ ] Run the build process + +### Release + +- [ ] Backend: merge the release PR to `master` +- [ ] Backend: release the server with the appropriate tag for the version +- [ ] Frontend: merge the release PR to `master` +- [ ] Frontend: release the frontend with the appropriate tag for the version + +### Docker + +- [ ] Pull, tag, and push backend image: + ``` + docker pull hashtopolis/backend:vMAJOR.MINOR.PATCH + docker tag hashtopolis/backend:vMAJOR.MINOR.PATCH hashtopolis/backend:latest + docker push hashtopolis/backend:latest + ``` +- [ ] Pull, tag, and push frontend image: + ``` + docker pull hashtopolis/frontend:vMAJOR.MINOR.PATCH + docker tag hashtopolis/frontend:vMAJOR.MINOR.PATCH hashtopolis/frontend:latest + docker push hashtopolis/frontend:latest + ``` + +### Post-Release + +- [ ] **Bump version to `+dev` on `master`**: update backend `StartupConfig::getVersion()` to `"vMAJOR.MINOR.PATCH+dev"` (e.g., `v1.1.0+dev` after releasing `v1.1.0`). +- [ ] **Bump version to `+dev` on `master`**: update frontend (`src/config/default/app/main.ts`) + +## Hashcat Modes Diff + +To check whether hashcat added or removed modes since the last release: + +``` +cat dbmodes | grep -Eo '\([0-9]+,' | tr -d '(,' > dbmodes.num +cat hcmodes | cut -d'|' -f 1 | tr -d ' ' | sort -n > hcmodes.num +comm -32 hcmodes.num dbmodes.num | tee diff +``` + +Where `dbmodes` contains the current SQL entries and `hcmodes` is a dump of the hashcat wiki mode table. + +## Version Schema + +See [VERSIONING.md](VERSIONING.md) for the full versioning and branching model. diff --git a/VERSIONING.md b/VERSIONING.md new file mode 100644 index 000000000..7a98ee88b --- /dev/null +++ b/VERSIONING.md @@ -0,0 +1,82 @@ +# Versioning + +## Semantic Versioning + +Hashtopolis follows [Semantic Versioning 2.0.0](https://semver.org/). Given a version number `MAJOR.MINOR.PATCH`: + +- **MAJOR:** incompatible API or database schema changes. +- **MINOR:** new functionality added in a backward-compatible manner. +- **PATCH:** backward-compatible bug fixes. + +Pre-release versions may be suffixed (e.g., `v1.0.0-beta`, `v1.1.0-rc1`). They sort before the final release per the +semver specification. + +## Branch Model — GitHub Flow + +``` +master ← feature branches (via PR) + ↑ + └── release/vMAJOR.MINOR.x (short-lived, only for hotfixes) +``` + +### Master branch + +`master` is always stable and deployable. Its version string indicates the last released version with a `+dev` suffix: + +```php +// src/inc/StartupConfig.php +public function getVersion(): string { + return "v1.0.0+dev"; +} +``` + +The `+dev` part is [semver build metadata](https://semver.org/#spec-item-10) — it is ignored for precedence and stripped +by existing migration logic (`explode("+", $version)[0]`). This means anyone building from `master` gets a version that: + +- Is clearly distinguishable from a release. +- Will not collide with any future release. +- Triggers migrations correctly when the next release ships (since `v1.1.0 > v1.0.0`). + +### Feature branches + +Branch from `master`, merge back via pull request. Bug fixes follow the same flow. + +### Making a release + +1. Create a **release PR** that bumps `getVersion()` from `"v1.0.0+dev"` to `"v1.1.0"`. +2. Merge the release PR to `master`. +3. **Tag** the merge commit: + ``` + git tag v1.1.0 && git push origin v1.1.0 + ``` +4. **Immediately follow up** with a commit on `master` bumping the version to `"v1.1.0+dev"` (the `+dev` marker for the + next cycle). There is no need to guess whether the next release will be `v1.2.0` or `v1.1.1` — `+dev` does not commit + to either. + +### Hotfixes for a released version + +If a critical bug needs a patch for a released version while `master` has already moved on: + +1. Create a short-lived branch from the tag: + ``` + git checkout -b release/v1.0.x v1.0.0 + ``` +2. Apply the fix (cherry-pick from `master` if it already contains the fix). +3. Bump the version to `"v1.0.1"`, commit, tag: + ``` + git tag v1.0.1 && git push origin v1.0.1 + ``` +4. Delete the `release/v1.0.x` branch after tagging, or keep it if more patches are expected for that line. Only the + latest two minor release lines are actively supported. + +## Docker Images + +Docker images are built automatically and pushed to the container registry. Three image tags are maintained: + +| Tag | Source | Description | +|----------|-------------------------------------------------|-----------------------------------------------------------------------------------------------------| +| `master` | `master` branch HEAD | Latest build from the main branch. May contain unreleased changes. Not intended for production use. | +| `latest` | Most recent stable tag (excluding pre-releases) | Newest production-ready release. Updated whenever a new stable version is tagged. | +| `vX.Y.Z` | Corresponding git tag | Exact release. Immutable once published. | + +Pre-release tags (e.g., `v1.1.0-rc1`) also get their own Docker image tag but do **not** update `latest`. From 962fff9c0363e1e7a383f8cd877d5dc938f4be57 Mon Sep 17 00:00:00 2001 From: s3inlc Date: Wed, 24 Jun 2026 08:04:32 +0200 Subject: [PATCH 688/691] release preparations --- doc/changelog.md | 19 +++++++++++++++++++ src/inc/StartupConfig.php | 2 +- 2 files changed, 20 insertions(+), 1 deletion(-) diff --git a/doc/changelog.md b/doc/changelog.md index 0fac30952..f6d1c4232 100644 --- a/doc/changelog.md +++ b/doc/changelog.md @@ -1,5 +1,24 @@ # Changelog +## v1.0.0-rc1 -> v1.0.0-rc2 + +**Bugfixes** + +- Removed outdated includes from dba init (#2234) +- Added migration to add backtick to postgres default blacklist charaters (#2236) +- Fixed pagination bug (#2231) +- Setting the default admin email to a valid address (#2244) +- Fixed filter ACL returning duplicate elements for agents (#2250) + +**Enhancements** + +- Aggregation improvements (#2230) +- Added basic contribution guidelines (#2243) +- Attribute useNewBench is made patchable (#2245) +- Refactored queries in order to fetch Chunk and Hash entities at once (#2258) +- Additional unittests and removal of legacy openssl calls (#2259) +- Added documentation for versioning, branch handling and release process (#2263) + ## v1.0.0-rainbow6 -> v1.0.0-rc1 **Bugfixes** diff --git a/src/inc/StartupConfig.php b/src/inc/StartupConfig.php index d5bdcfa76..7e530565e 100644 --- a/src/inc/StartupConfig.php +++ b/src/inc/StartupConfig.php @@ -234,7 +234,7 @@ public function getPepper(int $index): string { } public function getVersion(): string { - return "v1.0.0-rc1"; + return "v1.0.0-rc2"; } public function getBuild(): string { From fdf69c74bd2fff95adf19d681fb11c78b6f8396b Mon Sep 17 00:00:00 2001 From: s3inlc Date: Wed, 24 Jun 2026 14:09:47 +0200 Subject: [PATCH 689/691] after release version adjust --- src/inc/StartupConfig.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/inc/StartupConfig.php b/src/inc/StartupConfig.php index 7e530565e..0465f9e1d 100644 --- a/src/inc/StartupConfig.php +++ b/src/inc/StartupConfig.php @@ -234,7 +234,7 @@ public function getPepper(int $index): string { } public function getVersion(): string { - return "v1.0.0-rc2"; + return "v1.0.0+dev"; } public function getBuild(): string { From 49e0a31c4d560339df73ab5633dd129f50f75678 Mon Sep 17 00:00:00 2001 From: s3inlc Date: Wed, 24 Jun 2026 14:57:38 +0200 Subject: [PATCH 690/691] update with typo fix done in master --- src/inc/defines/DConfig.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/inc/defines/DConfig.php b/src/inc/defines/DConfig.php index 4372b061f..62a04599f 100644 --- a/src/inc/defines/DConfig.php +++ b/src/inc/defines/DConfig.php @@ -228,7 +228,7 @@ public static function getConfigDescription($config) { DConfig::SHOW_TASK_PERFORMANCE => "Show cracks/minute for tasks which are running.", DConfig::AGENT_STAT_LIMIT => "Maximal number of data points showing of agent gpu data.", DConfig::AGENT_DATA_LIFETIME => "Minimum time in seconds how long agent gpu/cpu utilisation and gpu temperature data is kept on the server.", - DConfig::AGENT_STAT_TENSION => "Draw straigth lines in agent data graph instead of bezier curves.", + DConfig::AGENT_STAT_TENSION => "Draw straight lines in agent data graph instead of bezier curves.", DConfig::MULTICAST_ENABLE => "Enable UDP multicast distribution of files to agents. (Make sure you did all the preparation before activating)
    You can read more informations here: https://github.com/hashtopolis/runner", DConfig::MULTICAST_DEVICE => "Network device of the server to be used for the multicast distribution.", DConfig::MULTICAST_TR_ENABLE => "Instead of the built in UFTP flow control, use a static set transfer rate
    (Important: Setting this value wrong can affect the functionality, only use this if you are sure this transfer rate is feasible)", @@ -258,4 +258,4 @@ public static function getConfigDescription($config) { default => $config, }; } -} \ No newline at end of file +} From 03f0352c4b4aee01addcbade89c37c59caeb6b86 Mon Sep 17 00:00:00 2001 From: Sein Coray Date: Wed, 24 Jun 2026 16:13:23 +0200 Subject: [PATCH 691/691] Fix include in dba/init --- src/dba/init.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/dba/init.php b/src/dba/init.php index 47dceca91..87402f527 100644 --- a/src/dba/init.php +++ b/src/dba/init.php @@ -3,7 +3,7 @@ require_once(dirname(__FILE__) . "/AbstractModel.php"); require_once(dirname(__FILE__) . "/AbstractModelFactory.php"); require_once(dirname(__FILE__) . "/Aggregation.php"); -require_once(dirname(__FILE__) . "/ExistFilter.php"); +require_once(dirname(__FILE__) . "/ExistsFilter.php"); require_once(dirname(__FILE__) . "/Filter.php"); require_once(dirname(__FILE__) . "/Order.php"); require_once(dirname(__FILE__) . "/ConcatColumn.php");
    + + GitHub + + + Docker + + + Discord + +

    Y0_VglXX>AeT}6T!ttt06fq!O4XEEaLSB9 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 XG_kA5tKIN><6g+is7RMf8VCOmq>cuD literal 0 HcmV?d00001 diff --git a/doc/assets/images/create_hashlist.png b/doc/assets/images/create_hashlist.png new file mode 100644 index 0000000000000000000000000000000000000000..085a07794590232e1cbb8e3e1296d9c25b4787ef GIT binary patch literal 38634 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 literal 0 HcmV?d00001 diff --git a/doc/assets/images/manage_files.png b/doc/assets/images/manage_files.png new file mode 100644 index 0000000000000000000000000000000000000000..632ab288d8a12412480371e3e9aa0015d6e89480 GIT binary patch literal 47886 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�|w0|flSef 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,@ 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 literal 0 HcmV?d00001 diff --git a/doc/assets/images/rules_files.png b/doc/assets/images/rules_files.png new file mode 100644 index 0000000000000000000000000000000000000000..d426f3dc2c0a0363828ec9451147dd8db694f619 GIT binary patch literal 42999 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 literal 0 HcmV?d00001 diff --git a/doc/assets/images/search_hash_2.png b/doc/assets/images/search_hash_2.png new file mode 100644 index 0000000000000000000000000000000000000000..f66e4bbfd1fcaa2b8eabe32c2e4ddfdb2e8f36ee GIT binary patch literal 44454 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 literal 0 HcmV?d00001 diff --git a/doc/assets/images/supertasks_showtasks.png b/doc/assets/images/supertasks_showtasks.png new file mode 100644 index 0000000000000000000000000000000000000000..4c526b853e82505f6adbb2aa8f052323821b325f GIT binary patch literal 28737 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 literal 0 HcmV?d00001 diff --git a/doc/assets/images/supertasks_subtasks.png b/doc/assets/images/supertasks_subtasks.png new file mode 100644 index 0000000000000000000000000000000000000000..1b140e405d662b2db419d62f5a6f9cfddf1c015c GIT binary patch literal 104520 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%0Dr&?8(ck4b2 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 literal 0 HcmV?d00001 diff --git a/doc/installation_guidelines/advanced_install.md b/doc/installation_guidelines/advanced_install.md index 5e29aa0ca..d4c617b15 100644 --- a/doc/installation_guidelines/advanced_install.md +++ b/doc/installation_guidelines/advanced_install.md @@ -140,119 +140,3 @@ docker compose up ``` Remember to copy the contents back into the folders. - -## Upgrading to 0.14.0 (from non-Docker to Docker) -There are multiple ways to migrate the data from your non-docker setup to docker. You can of course completely start fresh; but if you want to migrate your data there are multiple ways to do this. - -### Existing database (**formerly called New database**) -You can reuse your old database server or also migrate the database to a docker container. - -1. Install docker to your system (https://docs.docker.com/engine/install/ubuntu/) -2. Create a database backup mysqldump > hashtopolis-backup.sql -3. Make copies of the following folders, can be found in the hashtopolis folder along side the index.php: - - files - - import - - log -4. Download the docker compose file: wget https://raw.githubusercontent.com/hashtopolis/server/master/docker-compose.yml -5. Edit the docker compose file -``` -[...] - hashtopolis-server: -[...] - volumes: - - :/usr/local/share/hashtopolis:Z -[...] -``` - -6. Download the env file -``` -wget https://raw.githubusercontent.com/hashtopolis/server/master/env.example -O .env -``` - -7. Edit the .env file and change the settings to your likings nano .env - - Optional: if you want to test the new API and new UI, set the HASHTOPOLIS_APIV2_ENABLE to 1 inside the .env file. NOTE: The APIv2 and UIv2 are a technical preview. Currently when enable everyone through the new API will be fully admin! - - The HASHTOPOLIS_ADMIN_USER is only used during setup time and once you import the database backup will be replaced with your old data. -8. Create the folder which to referred to in the docker-compose, in our example we will use /usr/local/share/hashtopolis -``` -sudo mkdir -p /usr/local/share/hashtopolis -``` - -9. Copy the files, import, and log to the new location you refered to in the docker-compose file. -``` -sudo cp -r files/ import/ log/ /usr/local/share/hashtopolis -``` - -10. In the same folder create a config folder: -``` -mkdir /usr/local/share/hashtopolis/config -``` - -11. Start the docker container docker compose up -12. Stop the backend container so that agents don't mess up the database mid migration docker -``` -stop hashtopolis-backend -``` - -13. To migrate the data, first copy the database backup towards the db container: -``` -docker cp hashtopolis-backup.sql db:. -``` - -14. Login on the container: -``` -docker exec -it db /bin/bash -``` - -15. Import the data: -``` -mysql -Dhashtopolis -p < hashtopolis-backup.sql -``` - -16. Exit the container -17. Copy the content of the PEPPER from the *inc/conf.php* file and place them into *config/config*.json` -Example */var/www/hashtopolis/inc/conf.php*: -``` -[...] -$PEPPER = [..., ..., ..., ...]; -[...] -``` -Becomes */usr/local/share/hashtopolis/config/config.json*: -``` -{ - "PEPPER": [..., ..., ..., ...], -} -``` - -18. Restart the compose docker compose down && docker compose up - -### New database (**formerly called Existing database**) - -Repeat all the steps above, but you don't need to export/import the database. Only make sure that you point the settings inside the .env file to your database server and that the database server is reachable from your container. - -## Upgrading from docker to docker (version 0.14.0 and up) -1. Stop your docker compose docker compose down -2. docker compose pull -3. docker compose up - -## Upgrading from docker to docker (version 0.14.0 and up) - Offline System(s) - -***To be done*** - - -## New user interface: technical preview - -> [!NOTE] -> The APIv2 and UIv2 are a technical preview. Currently, when enabled, everyone through the new API will be fully admin! - -To enable 'version 2' of the API: - -1. Stop your containers - -2. set the HASHTOPOLIS_APIV2_ENABLE to 1 inside the .env file. - -3. Relaunch the containers -``` -docker compose up --detach -``` - -4. Access the technical preview via: ```http://127.0.0.1:4200``` using the credentials user=admin and password=hashtopolis, unless modified in the .env file. diff --git a/doc/installation_guidelines/update.md b/doc/installation_guidelines/update.md new file mode 100644 index 000000000..deb4a87b6 --- /dev/null +++ b/doc/installation_guidelines/update.md @@ -0,0 +1,118 @@ + +# Updating Hashtopolis + +## Upgrading to 0.14.0 (from non-Docker to Docker) +There are multiple ways to migrate the data from your non-docker setup to docker. You can of course completely start fresh; but if you want to migrate your data there are multiple ways to do this. + +### Existing database (**formerly called New database**) +You can reuse your old database server or also migrate the database to a docker container. + +1. Install docker to your system (https://docs.docker.com/engine/install/ubuntu/) +2. Create a database backup mysqldump > hashtopolis-backup.sql +3. Make copies of the following folders, can be found in the hashtopolis folder along side the index.php: + - files + - import + - log +4. Download the docker compose file: wget https://raw.githubusercontent.com/hashtopolis/server/master/docker-compose.yml +5. Edit the docker compose file +``` +[...] + hashtopolis-server: +[...] + volumes: + - :/usr/local/share/hashtopolis:Z +[...] +``` + +6. Download the env file +``` +wget https://raw.githubusercontent.com/hashtopolis/server/master/env.example -O .env +``` + +7. Edit the .env file and change the settings to your likings nano .env + - Optional: if you want to test the new API and new UI, set the HASHTOPOLIS_APIV2_ENABLE to 1 inside the .env file. NOTE: The APIv2 and UIv2 are a technical preview. Currently when enable everyone through the new API will be fully admin! + - The HASHTOPOLIS_ADMIN_USER is only used during setup time and once you import the database backup will be replaced with your old data. +8. Create the folder which to referred to in the docker-compose, in our example we will use /usr/local/share/hashtopolis +``` +sudo mkdir -p /usr/local/share/hashtopolis +``` + +9. Copy the files, import, and log to the new location you refered to in the docker-compose file. +``` +sudo cp -r files/ import/ log/ /usr/local/share/hashtopolis +``` + +10. In the same folder create a config folder: +``` +mkdir /usr/local/share/hashtopolis/config +``` + +11. Start the docker container docker compose up +12. Stop the backend container so that agents don't mess up the database mid migration docker +``` +stop hashtopolis-backend +``` + +13. To migrate the data, first copy the database backup towards the db container: +``` +docker cp hashtopolis-backup.sql db:. +``` + +14. Login on the container: +``` +docker exec -it db /bin/bash +``` + +15. Import the data: +``` +mysql -Dhashtopolis -p < hashtopolis-backup.sql +``` + +16. Exit the container +17. Copy the content of the PEPPER from the *inc/conf.php* file and place them into *config/config*.json` +Example */var/www/hashtopolis/inc/conf.php*: +``` +[...] +$PEPPER = [..., ..., ..., ...]; +[...] +``` +Becomes */usr/local/share/hashtopolis/config/config.json*: +``` +{ + "PEPPER": [..., ..., ..., ...], +} +``` + +18. Restart the compose docker compose down && docker compose up + +### New database (**formerly called Existing database**) + +Repeat all the steps above, but you don't need to export/import the database. Only make sure that you point the settings inside the .env file to your database server and that the database server is reachable from your container. + +## Upgrading from docker to docker (version 0.14.0 and up) +1. Stop your docker compose docker compose down +2. docker compose pull +3. docker compose up + +## Upgrading from docker to docker (version 0.14.0 and up) - Offline System(s) + +***To be done*** + + +## New user interface: technical preview + +> [!NOTE] +> The APIv2 and UIv2 are a technical preview. Currently, when enabled, everyone through the new API will be fully admin! + +To enable 'version 2' of the API: + +1. Stop your containers + +2. set the HASHTOPOLIS_APIV2_ENABLE to 1 inside the .env file. + +3. Relaunch the containers +``` +docker compose up --detach +``` + +4. Access the technical preview via: ```http://127.0.0.1:4200``` using the credentials user=admin and password=hashtopolis, unless modified in the .env file. diff --git a/doc/user_manual/agents.md b/doc/user_manual/agents.md index 4bf4db738..12d10d262 100644 --- a/doc/user_manual/agents.md +++ b/doc/user_manual/agents.md @@ -35,6 +35,7 @@ This page provides a visual overview of the status of all agents, including real - Temperature readings for each device, helping detect overheating or hardware issues. In those visuals, the following colour code is used: + - **Green**: All good - **Orange**: Warning - **Red**: Value too low @@ -66,6 +67,7 @@ Clicking on an individual agent from the lists above brings you to the **Agent O - **Time Spent Cracking**: Total time the agent has spent actively cracking hashes. Similar to the ***Agent Status*** page, visuals of the recent temperature evolution and utilisation evolution of all devices associated to this agent are displayed here. + - **Device(s) Temperatures**: Current temperatures of GPUs and/or CPUs. - **Device(s) Utilisation**: Current utilization percentages for each device. - **Agent Average CPU Utilisation**: Average CPU usage over a recent period. diff --git a/doc/user_manual/files.md b/doc/user_manual/files.md index 64cc9ac8e..28e0632d5 100644 --- a/doc/user_manual/files.md +++ b/doc/user_manual/files.md @@ -15,31 +15,32 @@ When creating a password recovery task in Hashtopolis, you may need to upload ad 3. **Others:** This category includes any additional files required for specific attack types or configurations. Examples include charset files or any files needed by preprocessors. These files vary depending on the nature of the task and the tools being used. -Files can be uploaded to the Hashtopolis server from the Files page. To begin, select the appropriate file category by clicking on one of the tabs: Rules, Wordlists, or Other. The following figure illustrates the selection of the Rules category. + +Each type of file has a dedicated page containing similar informations. The figure below displays the rule page.